diff --git a/.circleci/config.yml b/.circleci/config.yml
index bfd6c04e3..5d558e64f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,7 +28,7 @@ jobs:
           path: coverage
       - run:
           name: install sonar scanner
-          command: sudo npm install -g sonarqube-scanner@2.5.0
+          command: sudo npm install -g sonarqube-scanner@2.7.0
       - run:
           name: Run SonarScan
           command: sonar-scanner
diff --git a/.gitignore b/.gitignore
index 85a916599..a7cd50b8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,8 @@ UserInterfaceState.xcuserstate
 /src/assets/data/
 
 google-services.json
+GoogleService-Info.plist
 
 #sonarcloud
 .scannerwork
+
diff --git a/Build target Sunbird_2021-07-13T10-21-07.txt b/Build target Sunbird_2021-07-13T10-21-07.txt
new file mode 100644
index 000000000..059764b06
--- /dev/null
+++ b/Build target Sunbird_2021-07-13T10-21-07.txt	
@@ -0,0 +1,3355 @@
+
+Showing Recent Messages
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird.xcodeproj AddressBook is deprecated. Consider migrating to Contacts instead.
+
+MkDir /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    /bin/mkdir -p /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app
+
+WriteAuxiliaryFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/Entitlements.plist (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    write-file /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/Entitlements.plist
+
+WriteAuxiliaryFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/Entitlements-Simulated.plist (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    write-file /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/Entitlements-Simulated.plist
+
+ProcessProductPackaging "" /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird.app.xcent (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    
+
+Entitlements:
+
+{
+    "com.apple.security.get-task-allow" = 1;
+}
+
+
+    builtin-productPackagingUtility -entitlements -format xml -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird.app.xcent
+
+ProcessProductPackaging "" /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird.app-Simulated.xcent (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    
+
+Entitlements:
+
+{
+    "application-identifier" = "MQN53K8HQT.org.sunbird.app";
+    "aps-environment" = development;
+}
+
+
+    builtin-productPackagingUtility -entitlements -format xml -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird.app-Simulated.xcent
+
+WriteAuxiliaryFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    write-file /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml
+
+WriteAuxiliaryFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird.hmap (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    write-file /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird.hmap
+
+WriteAuxiliaryFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    write-file /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap
+
+WriteAuxiliaryFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    write-file /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap
+
+WriteAuxiliaryFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    write-file /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap
+
+WriteAuxiliaryFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-target-headers.hmap (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    write-file /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-target-headers.hmap
+
+WriteAuxiliaryFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    write-file /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap
+
+WriteAuxiliaryFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Script-427336DC5DE2C9F3CCBCD585.sh (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    write-file /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Script-427336DC5DE2C9F3CCBCD585.sh
+
+PhaseScriptExecution [CP]\ Check\ Pods\ Manifest.lock /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Script-427336DC5DE2C9F3CCBCD585.sh (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    /bin/sh -c /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Script-427336DC5DE2C9F3CCBCD585.sh
+
+WriteAuxiliaryFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Script-304B58A110DAC018002A0835.sh (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    write-file /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Script-304B58A110DAC018002A0835.sh
+
+PhaseScriptExecution Copy\ www\ directory /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Script-304B58A110DAC018002A0835.sh (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    /bin/sh -c /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Script-304B58A110DAC018002A0835.sh
+
+CpResource /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/zh-Hans.lproj /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/zh-Hans.lproj (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    builtin-copy -exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -resolve-src-symlinks /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/zh-Hans.lproj /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app
+
+CpResource /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/pt.lproj /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/pt.lproj (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    builtin-copy -exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -resolve-src-symlinks /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/pt.lproj /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app
+
+CpResource /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/pl.lproj /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/pl.lproj (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    builtin-copy -exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -resolve-src-symlinks /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/pl.lproj /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app
+
+CpResource /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/it.lproj /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/it.lproj (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    builtin-copy -exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -resolve-src-symlinks /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/it.lproj /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app
+
+CpResource /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/fr.lproj /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/fr.lproj (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    builtin-copy -exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -resolve-src-symlinks /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/fr.lproj /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app
+
+CpResource /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/es.lproj /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/es.lproj (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    builtin-copy -exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -resolve-src-symlinks /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/es.lproj /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app
+
+CpResource /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/en.lproj /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/en.lproj (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    builtin-copy -exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -resolve-src-symlinks /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/en.lproj /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app
+
+CpResource /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/de.lproj /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/de.lproj (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    builtin-copy -exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -resolve-src-symlinks /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/de.lproj /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app
+
+CpResource /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/ca.lproj /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/ca.lproj (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    builtin-copy -exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -resolve-src-symlinks /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/ca.lproj /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app
+
+CpResource /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/SAMKeychain.bundle /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/SAMKeychain.bundle (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    builtin-copy -exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -resolve-src-symlinks /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/SAMKeychain.bundle /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app
+
+CpResource /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/CDVNotification.bundle /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/CDVNotification.bundle (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    builtin-copy -exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -resolve-src-symlinks /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/CDVNotification.bundle /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app
+
+CopyPlistFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/GoogleService-Info.plist /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Resources/GoogleService-Info.plist (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    builtin-copyPlist --convert binary1 --outdir /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app -- /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Resources/GoogleService-Info.plist
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/SDVReader-SinglePage@2x.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/SDVReader-SinglePage@2x.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/SDVReader-SinglePage@2x.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/SDVReader-SinglePage@2x.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/SDVReader-SinglePage.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/SDVReader-SinglePage.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/SDVReader-SinglePage.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/SDVReader-SinglePage.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/SDVReader-Outline@2x.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/SDVReader-Outline@2x.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/SDVReader-Outline@2x.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/SDVReader-Outline@2x.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/SDVReader-Outline.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/SDVReader-Outline.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/SDVReader-Outline.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/SDVReader-Outline.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/SDVReader-DoublePage@2x.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/SDVReader-DoublePage@2x.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/SDVReader-DoublePage@2x.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/SDVReader-DoublePage@2x.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/SDVReader-DoublePage.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/SDVReader-DoublePage.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/SDVReader-DoublePage.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/SDVReader-DoublePage.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/SDVReader-CoverPage@2x.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/SDVReader-CoverPage@2x.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/SDVReader-CoverPage@2x.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/SDVReader-CoverPage@2x.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/SDVReader-CoverPage.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/SDVReader-CoverPage.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/SDVReader-CoverPage.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/SDVReader-CoverPage.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Thumbs@2x.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Thumbs@2x.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Thumbs@2x.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Thumbs@2x.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Thumbs.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Thumbs.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Thumbs.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Thumbs.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Print@2x.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Print@2x.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Print@2x.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Print@2x.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Print.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Print.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Print.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Print.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Mark-Y@2x.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Mark-Y@2x.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Mark-Y@2x.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Mark-Y@2x.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Mark-Y.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Mark-Y.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Mark-Y.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Mark-Y.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Mark-N@2x.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Mark-N@2x.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Mark-N@2x.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Mark-N@2x.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Mark-N.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Mark-N.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Mark-N.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Mark-N.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Export.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Export.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Export.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Export.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Export@2x.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Export@2x.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Export@2x.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Export@2x.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Email@2x.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Email@2x.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Email@2x.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Email@2x.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Email.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Email.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Email.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Email.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Button-N@2x.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Button-N@2x.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Button-N@2x.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Button-N@2x.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Button-N.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Button-N.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Button-N.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Button-N.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Button-H@2x.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Button-H@2x.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Button-H@2x.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Button-H@2x.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Button-H.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Button-H.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Reader-Button-H.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Reader-Button-H.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/GMVideoIcon@2x.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/GMVideoIcon@2x.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/GMVideoIcon@2x.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/GMVideoIcon@2x.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/GMVideoIcon.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/GMVideoIcon.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/GMVideoIcon.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/GMVideoIcon.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/GMSelected@2x.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/GMSelected@2x.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/GMSelected@2x.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/GMSelected@2x.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/GMSelected.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/GMSelected.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/GMSelected.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/GMSelected.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/GMEmptyFolder@2x.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/GMEmptyFolder@2x.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/GMEmptyFolder@2x.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/GMEmptyFolder@2x.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/GMEmptyFolder@1x.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/GMEmptyFolder@1x.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/GMEmptyFolder@1x.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/GMEmptyFolder@1x.png
+
+CopyPNGFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Default-568h@2x.png /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Default-568h@2x.png (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    export TOOLCHAINS\=
+    /Applications/Xcode.app/Contents/Developer/usr/bin/copypng -compress -strip-PNG-text /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Resources/Default-568h@2x.png /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Default-568h@2x.png
+
+CompileXIB /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Classes/MainViewController.xib (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export XCODE_DEVELOPER_USR_PATH\=/Applications/Xcode.app/Contents/Developer/usr/bin/..
+    /Applications/Xcode.app/Contents/Developer/usr/bin/ibtool --errors --warnings --notices --module Sunbird --output-partial-info-plist /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/MainViewController-PartialInfo.plist --auto-activate-custom-fonts --target-device iphone --target-device ipad --minimum-deployment-target 11.0 --output-format human-readable-text --compile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/MainViewController.nib /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Classes/MainViewController.xib
+
+CompileStoryboard /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/CDVLaunchScreen.storyboard (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export XCODE_DEVELOPER_USR_PATH\=/Applications/Xcode.app/Contents/Developer/usr/bin/..
+    /Applications/Xcode.app/Contents/Developer/usr/bin/ibtool --errors --warnings --notices --module Sunbird --output-partial-info-plist /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/CDVLaunchScreen-SBPartialInfo.plist --auto-activate-custom-fonts --target-device iphone --target-device ipad --minimum-deployment-target 11.0 --output-format human-readable-text --compilation-directory /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/CDVLaunchScreen.storyboard
+
+CompileAssetCatalog /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Images.xcassets (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    /Applications/Xcode.app/Contents/Developer/usr/bin/actool --output-format human-readable-text --notices --warnings --export-dependency-info /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/assetcatalog_dependencies --output-partial-info-plist /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/assetcatalog_generated_info.plist --app-icon AppIcon --launch-image LaunchImage --compress-pngs --enable-on-demand-resources YES --filter-for-device-model iPhone13,4 --filter-for-device-os-version 14.4 --development-region English --target-device iphone --target-device ipad --minimum-deployment-target 11.0 --platform iphonesimulator --compile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Images.xcassets
+
+2021-07-13 10:22:18.421 ibtoold[2922:71769] DEBUG: Added to environment: {
+    TMPDIR = "/var/folders/rp/ph9xyvqx1015vzz87hlqg6580000gn/T/B81D3C38-2076-493E-A436-930E9CC586F3";
+}
+/* com.apple.actool.document.warnings */
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Images.xcassets:./LaunchImage.launchimage: warning: Launch images are deprecated in iOS 13.0. Use a launch storyboard or XIB instead.
+/* com.apple.actool.document.notices */
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Images.xcassets:./AppIcon.appiconset/[][iphone][57x57][][][1x][][]: notice: 57x57 app icons only apply to iPhone apps targeting releases of iOS prior to 7.0
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Images.xcassets:./AppIcon.appiconset/[][iphone][57x57][][][2x][][]: notice: 57x57@2x app icons only apply to iPhone apps targeting releases of iOS prior to 7.0
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Images.xcassets:./AppIcon.appiconset/[][ipad][50x50][][][1x][][]: notice: 50x50 iPad spotlight icons only apply to iPad apps targeting releases of iOS prior to 7.0
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Images.xcassets:./AppIcon.appiconset/[][ipad][50x50][][][2x][][]: notice: 50x50 iPad spotlight icons only apply to iPad apps targeting releases of iOS prior to 7.0
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Images.xcassets:./AppIcon.appiconset/[][ipad][72x72][][][1x][][]: notice: 72x72 app icons only apply to iPad apps targeting releases of iOS prior to 7.0
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Images.xcassets:./AppIcon.appiconset/[][ipad][72x72][][][2x][][]: notice: 72x72@2x app icons only apply to iPad apps targeting releases of iOS prior to 7.0
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Images.xcassets:./AppIcon.appiconset/[][ipad][76x76][][][1x][][]: notice: 76x76@1x app icons only apply to iPad apps targeting releases of iOS prior to 10.0.
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Images.xcassets:./LaunchImage.launchimage/[iphone][retina4][2x][portrait][full-screen][]: notice: This launch image only applies to iOS 6.x and prior but the minimum deployment is 7.0 or later.
+/* com.apple.actool.compilation-results */
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/assetcatalog_generated_info.plist
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/AppIcon60x60@2x.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/AppIcon76x76@2x~ipad.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Assets.car
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/LaunchImage-1100-Landscape-2436h@3x.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/LaunchImage-1100-Portrait-2436h@3x.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/LaunchImage-568h@2x.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/LaunchImage-700-568h@2x.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/LaunchImage-700-Landscape@2x~ipad.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/LaunchImage-700-Landscape~ipad.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/LaunchImage-700-Portrait@2x~ipad.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/LaunchImage-700-Portrait~ipad.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/LaunchImage-700@2x.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/LaunchImage-800-667h@2x.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/LaunchImage-800-Landscape-736h@3x.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/LaunchImage-800-Portrait-736h@3x.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/LaunchImage-Landscape@2x~ipad.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/LaunchImage-Landscape~ipad.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/LaunchImage-Portrait@2x~ipad.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/LaunchImage-Portrait~ipad.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/LaunchImage.png
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/LaunchImage@2x.png
+
+
+LinkStoryboards (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export XCODE_DEVELOPER_USR_PATH\=/Applications/Xcode.app/Contents/Developer/usr/bin/..
+    /Applications/Xcode.app/Contents/Developer/usr/bin/ibtool --errors --warnings --notices --module Sunbird --target-device iphone --target-device ipad --minimum-deployment-target 11.0 --output-format human-readable-text --link /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/CDVLaunchScreen.storyboardc
+
+ProcessInfoPlistFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Info.plist /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Sunbird-Info.plist (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    builtin-infoPlistUtility /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Sunbird-Info.plist -producttype com.apple.product-type.application -genpkginfo /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/PkgInfo -expandbuildsettings -format binary -platform iphonesimulator -additionalcontentfile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/MainViewController-PartialInfo.plist -additionalcontentfile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/CDVLaunchScreen-SBPartialInfo.plist -additionalcontentfile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/assetcatalog_generated_info.plist -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Info.plist
+
+warning: 'UILaunchImages' has been deprecated, use launch storyboards instead. (in target 'Sunbird' from project 'Sunbird')
+
+WriteAuxiliaryFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.SwiftFileList (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    write-file /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.SwiftFileList
+
+WriteAuxiliaryFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.LinkFileList (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    write-file /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.LinkFileList
+
+WriteAuxiliaryFile /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird-OutputFileMap.json (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    write-file /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird-OutputFileMap.json
+
+CompileSwiftSources normal x86_64 com.apple.xcode.tools.swift.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export DEVELOPER_DIR\=/Applications/Xcode.app/Contents/Developer
+    export SDKROOT\=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc -incremental -module-name Sunbird -Onone -enable-batch-mode -enforce-exclusivity\=checked @/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.SwiftFileList -D COCOAPODS -Xcc -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -sdk /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -target x86_64-apple-ios11.0-simulator -g -module-cache-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -Xfrontend -serialize-debugging-options -enable-testing -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -swift-version 5 -I /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -F Sunbird/Plugins/cordova-plugin-sunbirdsplash -F Sunbird/Plugins/sb-cordova-plugin-customtabs -F Sunbird/Plugins/sb-cordova-plugin-utility -c -j4 -output-file-map /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird-OutputFileMap.json -parseable-output -serialize-diagnostics -emit-dependencies -emit-module -emit-module-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.swiftmodule -Xcc -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/swift-overrides.hmap -Xcc -iquote -Xcc /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -Xcc -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -Xcc -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -Xcc -ivfsoverlay -Xcc /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -Xcc -iquote -Xcc /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -Xcc -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -Xcc -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -Xcc -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -Xcc -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -Xcc -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -Xcc -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -Xcc -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -Xcc -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -Xcc -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -Xcc -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -Xcc -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -Xcc -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -Xcc -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -Xcc -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -Xcc -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -Xcc -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -Xcc -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -Xcc -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -Xcc -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -Xcc -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -Xcc -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -Xcc -I/Sources/FBLPromises/include -Xcc -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -Xcc -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -Xcc -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -Xcc -DWK_WEB_VIEW_ONLY\=1 -Xcc -DWK_WEB_VIEW_ONLY\=1 -Xcc -DDEBUG\=1 -Xcc -DCOCOAPODS\=1 -Xcc -DWK_WEB_VIEW_ONLY\=1 -Xcc -DWK_WEB_VIEW_ONLY\=1 -Xcc -DDEBUG\=1 -Xcc -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -Xcc -DWK_WEB_VIEW_ONLY\=1 -Xcc -DWK_WEB_VIEW_ONLY\=1 -Xcc -DDEBUG\=1 -Xcc -DPB_FIELD_32BIT\=1 -Xcc -DPB_NO_PACKED_STRUCTS\=1 -Xcc -DPB_ENABLE_MALLOC\=1 -emit-objc-header -emit-objc-header-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird-Swift.h -import-objc-header /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Bridging-Header.h -pch-output-dir /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders -working-directory /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+
+Ditto /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.swiftmodule/x86_64.swiftmodule /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.swiftmodule (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    /usr/bin/ditto -rsrc /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.swiftmodule /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.swiftmodule/x86_64.swiftmodule
+
+Ditto /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.swiftmodule/x86_64.swiftdoc /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.swiftdoc (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    /usr/bin/ditto -rsrc /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.swiftdoc /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.swiftmodule/x86_64.swiftdoc
+
+Ditto /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.swiftmodule/x86_64-apple-ios-simulator.swiftmodule /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.swiftmodule (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    /usr/bin/ditto -rsrc /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.swiftmodule /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.swiftmodule/x86_64-apple-ios-simulator.swiftmodule
+
+Ditto /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.swiftmodule/x86_64-apple-ios-simulator.swiftdoc /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.swiftdoc (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    /usr/bin/ditto -rsrc /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.swiftdoc /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.swiftmodule/x86_64-apple-ios-simulator.swiftdoc
+
+Ditto /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.swiftmodule/Project/x86_64.swiftsourceinfo /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.swiftsourceinfo (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    /usr/bin/ditto -rsrc /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.swiftsourceinfo /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.swiftmodule/Project/x86_64.swiftsourceinfo
+
+Ditto /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.swiftsourceinfo (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    /usr/bin/ditto -rsrc /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.swiftsourceinfo /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo
+
+Ditto /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/Sunbird-Swift.h /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird-Swift.h (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    /usr/bin/ditto -rsrc /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird-Swift.h /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/Sunbird-Swift.h
+
+ProcessPCH /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch.gch /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Sunbird-Prefix.pch normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c-header -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Sunbird-Prefix.pch -MD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch.d -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch.gch --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch.dia
+
+ProcessPCH /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/15043707817059800937/Sunbird-Prefix.pch.gch /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Sunbird-Prefix.pch normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c-header -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Sunbird-Prefix.pch -MD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/15043707817059800937/Sunbird-Prefix.pch.d -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/15043707817059800937/Sunbird-Prefix.pch.gch --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/15043707817059800937/Sunbird-Prefix.pch.dia
+
+ProcessPCH /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/12881369839262162095/Sunbird-Prefix.pch.gch /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Sunbird-Prefix.pch normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c-header -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Sunbird-Prefix.pch -w -DSQLITE_THREADSAFE\=1 -DSQLITE_DEFAULT_SYNCHRONOUS\=3 -DSQLITE_DEFAULT_MEMSTATUS\=0 -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_TEMP_STORE\=2 -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE -DSQLITE_DEFAULT_PAGE_SIZE\=4096 -MD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/12881369839262162095/Sunbird-Prefix.pch.d -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/12881369839262162095/Sunbird-Prefix.pch.gch --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/12881369839262162095/Sunbird-Prefix.pch.dia
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/zip.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/minizip/zip.c normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/15043707817059800937/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/zip.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/zip.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/minizip/zip.c -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/zip.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/minizip/zip.c:182:64: warning: this function declaration is not a prototype [-Wstrict-prototypes]
+local linkedlist_datablock_internal *allocate_new_datablock OF(());
+                                                               ^
+                                                                void
+In module 'zlib' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/minizip/zip.c:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/usr/include/zconf.h:290:23: note: expanded from macro 'OF'
+#    define OF(args)  args
+                      ^
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/unzip.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/minizip/unzip.c normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/15043707817059800937/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/unzip.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/unzip.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/minizip/unzip.c -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/unzip.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/minizip/unzip.c:943:52: warning: possible misuse of comma operator here [-Wcomma]
+        pfile_info->tmu_date = file_info64.tmu_date,
+                                                   ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/minizip/unzip.c:943:9: note: cast expression to void to silence warning
+        pfile_info->tmu_date = file_info64.tmu_date,
+        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        (void)(                                    )
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/sha1.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/aes/sha1.c normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/15043707817059800937/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/sha1.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/sha1.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/aes/sha1.c -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/sha1.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/sqlite3.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-sqlite-storage/sqlite3.c normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -w -DSQLITE_THREADSAFE\=1 -DSQLITE_DEFAULT_SYNCHRONOUS\=3 -DSQLITE_DEFAULT_MEMSTATUS\=0 -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_TEMP_STORE\=2 -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE -DSQLITE_DEFAULT_PAGE_SIZE\=4096 -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/12881369839262162095/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/sqlite3.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/sqlite3.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-sqlite-storage/sqlite3.c -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/sqlite3.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/pwd2key.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/aes/pwd2key.c normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/15043707817059800937/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/pwd2key.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/pwd2key.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/aes/pwd2key.c -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/pwd2key.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/prng.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/aes/prng.c normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/15043707817059800937/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/prng.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/prng.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/aes/prng.c -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/prng.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/mztools.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/minizip/mztools.c normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/15043707817059800937/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/mztools.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/mztools.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/minizip/mztools.c -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/mztools.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ioapi.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/minizip/ioapi.c normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/15043707817059800937/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ioapi.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ioapi.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/minizip/ioapi.c -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ioapi.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/hmac.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/aes/hmac.c normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/15043707817059800937/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/hmac.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/hmac.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/aes/hmac.c -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/hmac.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/fileenc.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/aes/fileenc.c normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/15043707817059800937/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/fileenc.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/fileenc.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/aes/fileenc.c -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/fileenc.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/entropy.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/aes/entropy.c normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/15043707817059800937/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/entropy.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/entropy.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/aes/entropy.c -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/entropy.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/aestab.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/aes/aestab.c normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/15043707817059800937/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/aestab.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/aestab.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/aes/aestab.c -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/aestab.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/aeskey.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/aes/aeskey.c normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/15043707817059800937/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/aeskey.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/aeskey.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/aes/aeskey.c -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/aeskey.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/aescrypt.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/aes/aescrypt.c normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/15043707817059800937/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/aescrypt.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/aescrypt.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/aes/aescrypt.c -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/aescrypt.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Reminders.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Reminders.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Reminders.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Reminders.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Reminders.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Reminders.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Wifi.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Wifi.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Wifi.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Wifi.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Wifi.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Wifi.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/IonicKeyboard.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/ionic-plugin-keyboard/IonicKeyboard.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/IonicKeyboard.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/IonicKeyboard.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/ionic-plugin-keyboard/IonicKeyboard.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/IonicKeyboard.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/main.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/main.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/main.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/main.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/main.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/main.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ZipPlugin.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/ZipPlugin.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ZipPlugin.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ZipPlugin.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/ZipPlugin.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ZipPlugin.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Utilities.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/Utilities.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Utilities.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Utilities.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/Utilities.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Utilities.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UpdateHashUtils.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/UpdateHashUtils.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UpdateHashUtils.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UpdateHashUtils.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/UpdateHashUtils.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UpdateHashUtils.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UNUserNotificationCenter+APPLocalNotification.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/UNUserNotificationCenter+APPLocalNotification.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UNUserNotificationCenter+APPLocalNotification.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UNUserNotificationCenter+APPLocalNotification.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/UNUserNotificationCenter+APPLocalNotification.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UNUserNotificationCenter+APPLocalNotification.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UNNotificationRequest+APPLocalNotification.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/UNNotificationRequest+APPLocalNotification.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UNNotificationRequest+APPLocalNotification.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UNNotificationRequest+APPLocalNotification.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/UNNotificationRequest+APPLocalNotification.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UNNotificationRequest+APPLocalNotification.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UIXToolbarView.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/UIXToolbarView.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UIXToolbarView.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UIXToolbarView.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/UIXToolbarView.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UIXToolbarView.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UIPrintInteractionController+APPPrinter.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/UIPrintInteractionController+APPPrinter.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UIPrintInteractionController+APPPrinter.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UIPrintInteractionController+APPPrinter.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/UIPrintInteractionController+APPPrinter.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UIPrintInteractionController+APPPrinter.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UIImage+fixOrientation.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/UIImage+fixOrientation.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UIImage+fixOrientation.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UIImage+fixOrientation.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/UIImage+fixOrientation.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UIImage+fixOrientation.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UIImage+CropScaleOrientation.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/UIImage+CropScaleOrientation.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UIImage+CropScaleOrientation.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UIImage+CropScaleOrientation.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/UIImage+CropScaleOrientation.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/UIImage+CropScaleOrientation.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ThumbsViewController.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsViewController.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ThumbsViewController.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ThumbsViewController.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsViewController.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ThumbsViewController.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsViewController.m:164:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (void)viewDidUnload
+^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsViewController.h:26:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIViewController.h:117:1: note: method 'viewDidUnload' declared here
+- (void)viewDidUnload API_DEPRECATED("", ios(3.0, 6.0)) API_UNAVAILABLE(tvos); // Called after the view controller's view is released and set to nil. For example, a memory warning which causes the view to be purged. Not invoked as a result of -dealloc.
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsViewController.m:185:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsViewController.h:26:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIViewController.h:301:1: note: method 'shouldAutorotateToInterfaceOrientation:' declared here
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation API_DEPRECATED("", ios(2.0, 6.0)) API_UNAVAILABLE(tvos);
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsViewController.m:285:44: warning: unused variable 'phrase' [-Wunused-variable]
+        NSString *guid = document.guid; NSString *phrase = document.password; // Document info
+                                                  ^
+3 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ThumbsViewController+SDVThumbsViewControllerPassThrough.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsViewController+SDVThumbsViewControllerPassThrough.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ThumbsViewController+SDVThumbsViewControllerPassThrough.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ThumbsViewController+SDVThumbsViewControllerPassThrough.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsViewController+SDVThumbsViewControllerPassThrough.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ThumbsViewController+SDVThumbsViewControllerPassThrough.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ThumbsMainToolbar.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsMainToolbar.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ThumbsMainToolbar.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ThumbsMainToolbar.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsMainToolbar.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ThumbsMainToolbar.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ThumbsMainToolbar+SDVThumbsMainToolbarPassThrough.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsMainToolbar+SDVThumbsMainToolbarPassThrough.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ThumbsMainToolbar+SDVThumbsMainToolbarPassThrough.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ThumbsMainToolbar+SDVThumbsMainToolbarPassThrough.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsMainToolbar+SDVThumbsMainToolbarPassThrough.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ThumbsMainToolbar+SDVThumbsMainToolbarPassThrough.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsMainToolbar+SDVThumbsMainToolbarPassThrough.m:17:1: warning: category is implementing a method which will also be implemented by its primary class [-Wobjc-protocol-method-implementation]
+- (instancetype)initWithFrame:(CGRect)frame title:(NSString *)title
+^
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsMainToolbar+SDVThumbsMainToolbarPassThrough.m:10:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsMainToolbar+SDVThumbsMainToolbarPassThrough.h:10:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsMainToolbar.h:45:1: note: method 'initWithFrame:title:' declared here
+- (instancetype)initWithFrame:(CGRect)frame title:(NSString *)title;
+^
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/TextResponseSerializer.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/TextResponseSerializer.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/TextResponseSerializer.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/TextResponseSerializer.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/TextResponseSerializer.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/TextResponseSerializer.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/TextRequestSerializer.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/TextRequestSerializer.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/TextRequestSerializer.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/TextRequestSerializer.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/TextRequestSerializer.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/TextRequestSerializer.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/StreamingMedia.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-streaming-media/StreamingMedia.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/StreamingMedia.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/StreamingMedia.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-streaming-media/StreamingMedia.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/StreamingMedia.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-streaming-media/StreamingMedia.m:230:10: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+        [moviePlayer.player play];
+         ^
+         self->
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/StatusReport.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/StatusReport.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/StatusReport.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/StatusReport.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/StatusReport.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/StatusReport.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SocialSharing.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SocialSharing.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SocialSharing.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SocialSharing.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:17:3: warning: 'UIPopoverController' is deprecated: first deprecated in iOS 9.0 - UIPopoverController is deprecated. Popovers are now implemented as UIViewController presentations. Use a modal presentation style of UIModalPresentationPopover and UIPopoverPresentationController. [-Wdeprecated-declarations]
+  UIPopoverController *_popover;
+  ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIPopoverController.h:26:12: note: 'UIPopoverController' has been explicitly marked deprecated here
+@interface UIPopoverController : NSObject <UIAppearanceContainer> {}
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:837:28: warning: 'UIPopoverController' is deprecated: first deprecated in iOS 9.0 - UIPopoverController is deprecated. Popovers are now implemented as UIViewController presentations. Use a modal presentation style of UIModalPresentationPopover and UIPopoverPresentationController. [-Wdeprecated-declarations]
+- (void)popoverController:(UIPopoverController *)popoverController willRepositionPopoverToRect:(inout CGRect *)rect inView:(inout UIView **)view {
+                           ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIPopoverController.h:26:12: note: 'UIPopoverController' has been explicitly marked deprecated here
+@interface UIPopoverController : NSObject <UIAppearanceContainer> {}
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:843:45: warning: 'UIPopoverController' is deprecated: first deprecated in iOS 9.0 - UIPopoverController is deprecated. Popovers are now implemented as UIViewController presentations. Use a modal presentation style of UIModalPresentationPopover and UIPopoverPresentationController. [-Wdeprecated-declarations]
+- (void)popoverControllerDidDismissPopover:(UIPopoverController *)popoverController {
+                                            ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIPopoverController.h:26:12: note: 'UIPopoverController' has been explicitly marked deprecated here
+@interface UIPopoverController : NSObject <UIAppearanceContainer> {}
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:85:51: warning: comparison of distinct pointer types ('NSString *' and 'NSNull * _Nonnull') [-Wcompare-distinct-pointer-types]
+    if (iPadCoordString != nil && iPadCoordString != [NSNull null]) {
+                                  ~~~~~~~~~~~~~~~ ^  ~~~~~~~~~~~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:175:46: warning: 'UIPopoverController' is deprecated: first deprecated in iOS 9.0 - UIPopoverController is deprecated. Popovers are now implemented as UIViewController presentations. Use a modal presentation style of UIModalPresentationPopover and UIPopoverPresentationController. [-Wdeprecated-declarations]
+            _popover = [[UIPopoverController alloc] initWithContentViewController:activityVC];
+                                             ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIPopoverController.h:26:12: note: 'UIPopoverController' has been explicitly marked deprecated here
+@interface UIPopoverController : NSObject <UIAppearanceContainer> {}
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:185:64: warning: values of type 'NSInteger' should not be used as format arguments; add an explicit cast to 'long' instead [-Wformat]
+            NSLog([[NSString alloc] initWithFormat:@"test %d", [[iPadCoordinates objectAtIndex:0] integerValue]]);
+                                                          ~~   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                                          %ld  (long)
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:185:19: warning: format string is not a string literal (potentially insecure) [-Wformat-security]
+            NSLog([[NSString alloc] initWithFormat:@"test %d", [[iPadCoordinates objectAtIndex:0] integerValue]]);
+                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:185:19: note: treat the string as an argument to avoid this
+            NSLog([[NSString alloc] initWithFormat:@"test %d", [[iPadCoordinates objectAtIndex:0] integerValue]]);
+                  ^
+                  @"%@", 
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:175:13: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+            _popover = [[UIPopoverController alloc] initWithContentViewController:activityVC];
+            ^
+            self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:176:13: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+            _popover.delegate = self;
+            ^
+            self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:177:14: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+            [_popover presentPopoverFromRect:rect inView:self.webView permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
+             ^
+             self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:205:39: warning: 'SLServiceTypeTwitter' is deprecated: first deprecated in iOS 11.0 [-Wdeprecated-declarations]
+  [self shareViaInternal:command type:SLServiceTypeTwitter];
+                                      ^
+In module 'Social' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:4:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Social.framework/Headers/SLServiceTypes.h:11:31: note: 'SLServiceTypeTwitter' has been explicitly marked deprecated here
+SOCIAL_EXTERN NSString *const SLServiceTypeTwitter NS_DEPRECATED(10_8, 10_13, 6_0, 11_0);
+                              ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:209:39: warning: 'SLServiceTypeFacebook' is deprecated: first deprecated in iOS 11.0 [-Wdeprecated-declarations]
+  [self shareViaInternal:command type:SLServiceTypeFacebook];
+                                      ^
+In module 'Social' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:4:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Social.framework/Headers/SLServiceTypes.h:12:31: note: 'SLServiceTypeFacebook' has been explicitly marked deprecated here
+SOCIAL_EXTERN NSString *const SLServiceTypeFacebook NS_DEPRECATED(10_8, 10_13, 6_0, 11_0);
+                              ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:223:9: warning: 'UIAlertView' is deprecated: first deprecated in iOS 9.0 - UIAlertView is deprecated. Use UIAlertController with a preferredStyle of UIAlertControllerStyleAlert instead [-Wdeprecated-declarations]
+        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"" message:hint delegate:nil cancelButtonTitle:nil otherButtonTitles:nil];
+        ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIAlertView.h:27:12: note: 'UIAlertView' has been explicitly marked deprecated here
+@interface UIAlertView : UIView
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:223:44: warning: 'UIAlertView' is deprecated: first deprecated in iOS 9.0 - UIAlertView is deprecated. Use UIAlertController with a preferredStyle of UIAlertControllerStyleAlert instead [-Wdeprecated-declarations]
+        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"" message:hint delegate:nil cancelButtonTitle:nil otherButtonTitles:nil];
+                                           ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIAlertView.h:27:12: note: 'UIAlertView' has been explicitly marked deprecated here
+@interface UIAlertView : UIView
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:231:39: warning: 'SLServiceTypeFacebook' is deprecated: first deprecated in iOS 11.0 [-Wdeprecated-declarations]
+  [self shareViaInternal:command type:SLServiceTypeFacebook];
+                                      ^
+In module 'Social' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:4:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Social.framework/Headers/SLServiceTypes.h:12:31: note: 'SLServiceTypeFacebook' has been explicitly marked deprecated here
+SOCIAL_EXTERN NSString *const SLServiceTypeFacebook NS_DEPRECATED(10_8, 10_13, 6_0, 11_0);
+                              ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:281:30: warning: 'SLServiceTypeFacebook' is deprecated: first deprecated in iOS 11.0 [-Wdeprecated-declarations]
+  if(!([type isEqualToString:SLServiceTypeFacebook]
+                             ^
+In module 'Social' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:4:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Social.framework/Headers/SLServiceTypes.h:12:31: note: 'SLServiceTypeFacebook' has been explicitly marked deprecated here
+SOCIAL_EXTERN NSString *const SLServiceTypeFacebook NS_DEPRECATED(10_8, 10_13, 6_0, 11_0);
+                              ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:282:33: warning: 'SLServiceTypeTwitter' is deprecated: first deprecated in iOS 11.0 [-Wdeprecated-declarations]
+       || [type isEqualToString:SLServiceTypeTwitter]
+                                ^
+In module 'Social' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:4:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Social.framework/Headers/SLServiceTypes.h:11:31: note: 'SLServiceTypeTwitter' has been explicitly marked deprecated here
+SOCIAL_EXTERN NSString *const SLServiceTypeTwitter NS_DEPRECATED(10_8, 10_13, 6_0, 11_0);
+                              ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:283:33: warning: 'SLServiceTypeTencentWeibo' is deprecated: first deprecated in iOS 11.0 [-Wdeprecated-declarations]
+       || [type isEqualToString:SLServiceTypeTencentWeibo]
+                                ^
+In module 'Social' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:4:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Social.framework/Headers/SLServiceTypes.h:14:31: note: 'SLServiceTypeTencentWeibo' has been explicitly marked deprecated here
+SOCIAL_EXTERN NSString *const SLServiceTypeTencentWeibo NS_DEPRECATED(10_8, 10_13, 6_0, 11_0);
+                              ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:284:33: warning: 'SLServiceTypeSinaWeibo' is deprecated: first deprecated in iOS 11.0 [-Wdeprecated-declarations]
+       || [type isEqualToString:SLServiceTypeSinaWeibo])) {
+                                ^
+In module 'Social' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:4:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Social.framework/Headers/SLServiceTypes.h:13:31: note: 'SLServiceTypeSinaWeibo' has been explicitly marked deprecated here
+SOCIAL_EXTERN NSString *const SLServiceTypeSinaWeibo NS_DEPRECATED(10_8, 10_13, 6_0, 11_0);
+                              ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:342:7: warning: 'UIAlertView' is deprecated: first deprecated in iOS 9.0 - UIAlertView is deprecated. Use UIAlertController with a preferredStyle of UIAlertControllerStyleAlert instead [-Wdeprecated-declarations]
+      UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"SocialSharing plugin"
+      ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIAlertView.h:27:12: note: 'UIAlertView' has been explicitly marked deprecated here
+@interface UIAlertView : UIView
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:342:42: warning: 'UIAlertView' is deprecated: first deprecated in iOS 9.0 - UIAlertView is deprecated. Use UIAlertController with a preferredStyle of UIAlertControllerStyleAlert instead [-Wdeprecated-declarations]
+      UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"SocialSharing plugin"
+                                         ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIAlertView.h:27:12: note: 'UIAlertView' has been explicitly marked deprecated here
+@interface UIAlertView : UIView
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:619:6: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+    [_documentInteractionController presentOpenInMenuFromRect:CGRectZero inView:self.webView animated:YES];
+     ^
+     self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:673:49: warning: 'stringByAddingPercentEscapesUsingEncoding:' is deprecated: first deprecated in iOS 9.0 - Use -stringByAddingPercentEncodingWithAllowedCharacters: instead, which always uses the recommended UTF-8 encoding, and which encodes for a specific URL component or subcomponent since each URL component or subcomponent has different rules for what characters are valid. [-Wdeprecated-declarations]
+    NSString *encodedShareString = [shareString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+                                                ^
+In module 'Foundation' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAppDelegate.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSURL.h:595:1: note: 'stringByAddingPercentEscapesUsingEncoding:' has been explicitly marked deprecated here
+- (nullable NSString *)stringByAddingPercentEscapesUsingEncoding:(NSStringEncoding)enc API_DEPRECATED("Use -stringByAddingPercentEncodingWithAllowedCharacters: instead, which always uses the recommended UTF-8 encoding, and which encodes for a specific URL component or subcomponent since each URL component or subcomponent has different rules for what characters are valid.", macos(10.0,10.11), ios(2.0,9.0), watchos(2.0,2.0), tvos(9.0,9.0));
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:688:40: warning: 'openURL:' is deprecated: first deprecated in iOS 10.0 [-Wdeprecated-declarations]
+    [[UIApplication sharedApplication] openURL: whatsappURL];
+                                       ^~~~~~~
+                                       openURL:options:completionHandler:
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:123:1: note: 'openURL:' has been explicitly marked deprecated here
+- (BOOL)openURL:(NSURL*)url API_DEPRECATED_WITH_REPLACEMENT("openURL:options:completionHandler:", ios(2.0, 10.0)) NS_EXTENSION_UNAVAILABLE_IOS("");
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:761:24: warning: 'sendSynchronousRequest:returningResponse:error:' is deprecated: first deprecated in iOS 9.0 - Use [NSURLSession dataTaskWithRequest:completionHandler:] (see NSURLSession.h [-Wdeprecated-declarations]
+      [NSURLConnection sendSynchronousRequest: request returningResponse: &response error: nil];
+                       ^
+In module 'Foundation' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAppDelegate.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSURLConnection.h:405:1: note: 'sendSynchronousRequest:returningResponse:error:' has been explicitly marked deprecated here
++ (nullable NSData *)sendSynchronousRequest:(NSURLRequest *)request returningResponse:(NSURLResponse * _Nullable * _Nullable)response error:(NSError **)error API_DEPRECATED("Use [NSURLSession dataTaskWithRequest:completionHandler:] (see NSURLSession.h", macos(10.3,10.11), ios(2.0,9.0), tvos(9.0,9.0)) API_UNAVAILABLE(watchos);
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:764:15: warning: format string is not a string literal (potentially insecure) [-Wformat-security]
+        NSLog([dictionary description]);
+              ^~~~~~~~~~~~~~~~~~~~~~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:764:15: note: treat the string as an argument to avoid this
+        NSLog([dictionary description]);
+              ^
+              @"%@", 
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:837:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (void)popoverController:(UIPopoverController *)popoverController willRepositionPopoverToRect:(inout CGRect *)rect inView:(inout UIView **)view {
+^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIPopoverController.h:95:1: note: method 'popoverController:willRepositionPopoverToRect:inView:' declared here
+- (void)popoverController:(UIPopoverController *)popoverController willRepositionPopoverToRect:(inout CGRect *)rect inView:(inout UIView * __nonnull * __nonnull)view API_DEPRECATED("", ios(7.0, 9.0));
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/SocialSharing.m:843:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (void)popoverControllerDidDismissPopover:(UIPopoverController *)popoverController {
+^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIPopoverController.h:91:1: note: method 'popoverControllerDidDismissPopover:' declared here
+- (void)popoverControllerDidDismissPopover:(UIPopoverController *)popoverController API_DEPRECATED("", ios(3.2, 9.0));
+^
+28 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SitewaertsDocumentViewer.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SitewaertsDocumentViewer.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SitewaertsDocumentViewer.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SitewaertsDocumentViewer.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SitewaertsDocumentViewer.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SitewaertsDocumentViewer.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SitewaertsDocumentViewer.m:71:30: warning: null passed to a callee that requires a non-null argument [-Wnonnull]
+                             initWithObjectsAndKeys :
+                             ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SitewaertsDocumentViewer.m:182:32: warning: comparison between pointer and integer ('NSInteger' (aka 'long') and 'void *') [-Wpointer-integer-compare]
+                if (pageNumber != nil && pageNumber >= 1) {
+                    ~~~~~~~~~~ ^  ~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SitewaertsDocumentViewer.m:183:52: warning: values of type 'NSInteger' should not be used as format arguments; add an explicit cast to 'long' instead [-Wformat]
+                    NSLog(@"[pdfviewer] page: %i", pageNumber);
+                                              ~~   ^~~~~~~~~~
+                                              %li  (long)
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SitewaertsDocumentViewer.m:164:34: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                                [readerViewController closeDocument];
+                                 ^
+                                 self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SitewaertsDocumentViewer.m:191:49: warning: null passed to a callee that requires a non-null argument [-Wnonnull]
+                                                initWithObjectsAndKeys :
+                                                ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SitewaertsDocumentViewer.m:224:37: warning: null passed to a callee that requires a non-null argument [-Wnonnull]
+                                    initWithObjectsAndKeys :
+                                    ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SitewaertsDocumentViewer.m:240:37: warning: null passed to a callee that requires a non-null argument [-Wnonnull]
+                                    initWithObjectsAndKeys :
+                                    ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SitewaertsDocumentViewer.m:258:37: warning: null passed to a callee that requires a non-null argument [-Wnonnull]
+                                    initWithObjectsAndKeys :
+                                    ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SitewaertsDocumentViewer.m:278:37: warning: null passed to a callee that requires a non-null argument [-Wnonnull]
+                                    initWithObjectsAndKeys :
+                                    ^
+9 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SecureStorage.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-secure-storage-echo/SecureStorage.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SecureStorage.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SecureStorage.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-secure-storage-echo/SecureStorage.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SecureStorage.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SSZipArchive.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/minizip/SSZipArchive.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SSZipArchive.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SSZipArchive.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-zip/Plugins/minizip/SSZipArchive.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SSZipArchive.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SQLitePlugin.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-sqlite-storage/SQLitePlugin.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SQLitePlugin.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SQLitePlugin.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-sqlite-storage/SQLitePlugin.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SQLitePlugin.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SOSPicker.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/SOSPicker.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SOSPicker.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SOSPicker.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/SOSPicker.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SOSPicker.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVThumbsViewController.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVThumbsViewController.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVThumbsViewController.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVThumbsViewController.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVThumbsViewController.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVThumbsViewController.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVThumbsViewController.m:43:111: warning: incompatible pointer types sending 'CGPDFDocumentRef *' (aka 'struct CGPDFDocument **') to parameter of type 'CGPDFDocumentRef' (aka 'struct CGPDFDocument *'); dereference with * [-Wincompatible-pointer-types]
+    self.documentOutline = [SDVThumbsViewController flattenOutline:[ReaderDocumentOutline outlineFromDocument:object.pdfDocumentRef]];
+                                                                                                              ^~~~~~~~~~~~~~~~~~~~~
+                                                                                                              *(                   )
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVThumbsViewController.m:16:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderDocumentOutline.h:30:52: note: passing argument to parameter 'pdfDocumentRef' here
++ (NSArray *)outlineFromDocument:(CGPDFDocumentRef)pdfDocumentRef;
+                                                   ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVThumbsViewController.m:92:26: warning: assigning to 'id<ThumbsMainToolbarDelegate>' from incompatible type 'SDVThumbsViewController *const __strong'
+    mainToolbar.delegate = self; // ThumbsMainToolbarDelegate
+                         ^ ~~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVThumbsViewController.m:113:28: warning: assigning to 'id<ReaderThumbsViewDelegate>' from incompatible type 'SDVThumbsViewController *const __strong'
+    theThumbsView.delegate = self; // ReaderThumbsViewDelegate
+                           ^ ~~~~
+3 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVThumbsMainToolbar.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVThumbsMainToolbar.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVThumbsMainToolbar.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVThumbsMainToolbar.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVThumbsMainToolbar.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVThumbsMainToolbar.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVThumbsMainToolbar.m:68:49: warning: 'sizeWithFont:' is deprecated: first deprecated in iOS 7.0 [-Wdeprecated-declarations]
+        CGSize doneButtonSize = [doneButtonText sizeWithFont:doneButtonFont];
+                                                ^~~~~~~~~~~~
+                                                sizeWithAttributes
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsMainToolbar.h:26:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIStringDrawing.h:60:1: note: 'sizeWithFont:' has been explicitly marked deprecated here
+- (CGSize)sizeWithFont:(UIFont *)font API_DEPRECATED_WITH_REPLACEMENT("sizeWithAttributes:", ios(2.0, 7.0)) API_UNAVAILABLE(tvos);
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVThumbsMainToolbar.m:76:44: warning: undeclared selector 'doneButtonTapped:' [-Wundeclared-selector]
+        [doneButton addTarget:self action:@selector(doneButtonTapped:) forControlEvents:UIControlEventTouchUpInside];
+                                           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVThumbsMainToolbar.m:102:21: warning: 'segmentedControlStyle' is deprecated: first deprecated in iOS 7.0 - The segmentedControlStyle property no longer has any effect [-Wdeprecated-declarations]
+        showControl.segmentedControlStyle = UISegmentedControlStyleBar;
+                    ^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsMainToolbar.h:26:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UISegmentedControl.h:62:46: note: 'segmentedControlStyle' has been explicitly marked deprecated here
+@property(nonatomic) UISegmentedControlStyle segmentedControlStyle API_DEPRECATED("The segmentedControlStyle property no longer has any effect", ios(2.0, 7.0)) API_UNAVAILABLE(tvos);
+                                             ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVThumbsMainToolbar.m:102:45: warning: 'UISegmentedControlStyleBar' is deprecated: first deprecated in iOS 7.0 - The segmentedControlStyle property no longer has any effect [-Wdeprecated-declarations]
+        showControl.segmentedControlStyle = UISegmentedControlStyleBar;
+                                            ^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ThumbsMainToolbar.h:26:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UISegmentedControl.h:21:28: note: 'UISegmentedControlStyle' has been explicitly marked deprecated here
+typedef NS_ENUM(NSInteger, UISegmentedControlStyle) {
+                           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVThumbsMainToolbar.m:135:45: warning: undeclared selector 'showControlTapped:' [-Wundeclared-selector]
+        [showControl addTarget:self action:@selector(showControlTapped:) forControlEvents:UIControlEventValueChanged];
+                                            ^
+5 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVReaderViewController.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVReaderViewController.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVReaderViewController.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVReaderViewController.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.m:259:25: warning: assigning to 'id<ReaderContentViewDelegate>' from incompatible type 'SDVReaderViewController *const __strong'
+    contentView.message = self;
+                        ^ ~~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.m:179:15: warning: unused variable 'phrase' [-Wunused-variable]
+    NSString *phrase = document.password; NSString *guid = document.guid; // Document properties
+              ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.m:1080:82: warning: assigning to 'id<UIScrollViewDelegate> _Nullable' from incompatible type 'SDVReaderViewController *const __strong'
+    theScrollView.backgroundColor = [UIColor clearColor]; theScrollView.delegate = self;
+                                                                                 ^ ~~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.m:1086:26: warning: assigning to 'id<ReaderMainToolbarDelegate>' from incompatible type 'SDVReaderViewController *const __strong'
+    mainToolbar.delegate = self; // ReaderMainToolbarDelegate
+                         ^ ~~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.m:1097:26: warning: assigning to 'id<ReaderMainPagebarDelegate>' from incompatible type 'SDVReaderViewController *const __strong'
+    mainPagebar.delegate = self; // ReaderMainPagebarDelegate
+                         ^ ~~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.m:1108:108: warning: assigning to 'id<UIGestureRecognizerDelegate> _Nullable' from incompatible type 'SDVReaderViewController *const __strong'
+    singleTapOne.numberOfTouchesRequired = 1; singleTapOne.numberOfTapsRequired = 1; singleTapOne.delegate = self;
+                                                                                                           ^ ~~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.m:1112:108: warning: assigning to 'id<UIGestureRecognizerDelegate> _Nullable' from incompatible type 'SDVReaderViewController *const __strong'
+    doubleTapOne.numberOfTouchesRequired = 1; doubleTapOne.numberOfTapsRequired = 2; doubleTapOne.delegate = self;
+                                                                                                           ^ ~~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.m:1116:108: warning: assigning to 'id<UIGestureRecognizerDelegate> _Nullable' from incompatible type 'SDVReaderViewController *const __strong'
+    doubleTapTwo.numberOfTouchesRequired = 2; doubleTapTwo.numberOfTapsRequired = 2; doubleTapTwo.delegate = self;
+                                                                                                           ^ ~~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.m:1153:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation duration:(NSTimeInterval)duration
+^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.h:26:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIViewController.h:319:1: note: method 'willAnimateRotationToInterfaceOrientation:duration:' declared here
+- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration API_DEPRECATED("Implement viewWillTransitionToSize:withTransitionCoordinator: instead", ios(3.0, 8.0)) API_UNAVAILABLE(tvos);
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.m:1327:64: warning: 'openURL:' is deprecated: first deprecated in iOS 10.0 [-Wdeprecated-declarations]
+                        if ([[UIApplication sharedApplication] openURL:url] == NO)
+                                                               ^~~~~~~
+                                                               openURL:options:completionHandler:
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.h:26:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:123:1: note: 'openURL:' has been explicitly marked deprecated here
+- (BOOL)openURL:(NSURL*)url API_DEPRECATED_WITH_REPLACEMENT("openURL:options:completionHandler:", ios(2.0, 10.0)) NS_EXTENSION_UNAVAILABLE_IOS("");
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.m:1467:76: warning: assigning to 'id<ThumbsViewControllerDelegate>' from incompatible type 'SDVReaderViewController *const __strong'
+    thumbsViewController.title = self.title; thumbsViewController.delegate = self; // ThumbsViewControllerDelegate
+                                                                           ^ ~~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.m:20:17: warning: method definition for 'layoutContentViews:' not found [-Wincomplete-implementation]
+@implementation SDVReaderViewController {
+                ^
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.m:12:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.h:29:1: note: method 'layoutContentViews:' declared here
+- (void)layoutContentViews:(UIScrollView *)scrollView;
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.m:20:17: warning: method definition for 'updateContentSize:' not found [-Wincomplete-implementation]
+@implementation SDVReaderViewController {
+                ^
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.m:12:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderViewController.h:31:1: note: method 'updateContentSize:' declared here
+- (void)updateContentSize:(UIScrollView *)scrollView;
+^
+13 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVReaderMainToolbar.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderMainToolbar.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVReaderMainToolbar.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVReaderMainToolbar.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderMainToolbar.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVReaderMainToolbar.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderMainToolbar.m:124:49: warning: 'sizeWithFont:' is deprecated: first deprecated in iOS 7.0 [-Wdeprecated-declarations]
+        CGSize doneButtonSize = [doneButtonText sizeWithFont:doneButtonFont];
+                                                ^~~~~~~~~~~~
+                                                sizeWithAttributes
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderMainToolbar.h:26:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIStringDrawing.h:60:1: note: 'sizeWithFont:' has been explicitly marked deprecated here
+- (CGSize)sizeWithFont:(UIFont *)font API_DEPRECATED_WITH_REPLACEMENT("sizeWithAttributes:", ios(2.0, 7.0)) API_UNAVAILABLE(tvos);
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderMainToolbar.m:132:44: warning: undeclared selector 'doneButtonTapped:' [-Wundeclared-selector]
+        [doneButton addTarget:self action:@selector(doneButtonTapped:) forControlEvents:UIControlEventTouchUpInside];
+                                           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderMainToolbar.m:152:50: warning: undeclared selector 'thumbsButtonTapped:' [-Wundeclared-selector]
+            [thumbsButton addTarget:self action:@selector(thumbsButtonTapped:) forControlEvents:UIControlEventTouchUpInside];
+                                                 ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderMainToolbar.m:178:48: warning: undeclared selector 'markButtonTapped:' [-Wundeclared-selector]
+            [flagButton addTarget:self action:@selector(markButtonTapped:) forControlEvents:UIControlEventTouchUpInside];
+                                               ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderMainToolbar.m:212:61: warning: undeclared selector 'emailButtonTapped:' [-Wundeclared-selector]
+                        [emailButton addTarget:self action:@selector(emailButtonTapped:) forControlEvents:UIControlEventTouchUpInside];
+                                                            ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderMainToolbar.m:240:57: warning: undeclared selector 'printButtonTapped:' [-Wundeclared-selector]
+                    [printButton addTarget:self action:@selector(printButtonTapped:) forControlEvents:UIControlEventTouchUpInside];
+                                                        ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderMainToolbar.m:263:54: warning: undeclared selector 'exportButtonTapped:' [-Wundeclared-selector]
+                [exportButton addTarget:self action:@selector(exportButtonTapped:) forControlEvents:UIControlEventTouchUpInside];
+                                                     ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderMainToolbar.m:291:21: warning: 'segmentedControlStyle' is deprecated: first deprecated in iOS 7.0 - The segmentedControlStyle property no longer has any effect [-Wdeprecated-declarations]
+        showControl.segmentedControlStyle = UISegmentedControlStyleBar;
+                    ^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderMainToolbar.h:26:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UISegmentedControl.h:62:46: note: 'segmentedControlStyle' has been explicitly marked deprecated here
+@property(nonatomic) UISegmentedControlStyle segmentedControlStyle API_DEPRECATED("The segmentedControlStyle property no longer has any effect", ios(2.0, 7.0)) API_UNAVAILABLE(tvos);
+                                             ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderMainToolbar.m:291:45: warning: 'UISegmentedControlStyleBar' is deprecated: first deprecated in iOS 7.0 - The segmentedControlStyle property no longer has any effect [-Wdeprecated-declarations]
+        showControl.segmentedControlStyle = UISegmentedControlStyleBar;
+                                            ^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderMainToolbar.h:26:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UISegmentedControl.h:21:28: note: 'UISegmentedControlStyle' has been explicitly marked deprecated here
+typedef NS_ENUM(NSInteger, UISegmentedControlStyle) {
+                           ^
+9 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVReaderMainPagebar.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderMainPagebar.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVReaderMainPagebar.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVReaderMainPagebar.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderMainPagebar.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVReaderMainPagebar.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVReaderContentViewDoublePage.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderContentViewDoublePage.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVReaderContentViewDoublePage.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVReaderContentViewDoublePage.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderContentViewDoublePage.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDVReaderContentViewDoublePage.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderContentViewDoublePage.m:104:23: warning: assigning to 'id<UIScrollViewDelegate> _Nullable' from incompatible type 'SDVReaderContentViewDoublePage *__strong'
+        self.delegate = self;
+                      ^ ~~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderContentViewDoublePage.m:120:70: warning: incompatible pointer types sending 'CGPDFDocumentRef *' (aka 'struct CGPDFDocument **') to parameter of type 'CGPDFDocumentRef' (aka 'struct CGPDFDocument *'); dereference with * [-Wincompatible-pointer-types]
+        theContentPage = [[ReaderContentPage alloc] initWithDocument:pdfDocumentRef page:page];
+                                                                     ^~~~~~~~~~~~~~
+                                                                     *
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderContentViewDoublePage.m:12:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderContentPage.h:30:52: note: passing argument to parameter 'pdfDocumentRef' here
+- (instancetype)initWithDocument:(CGPDFDocumentRef)pdfDocumentRef page:(NSInteger)page;
+                                                   ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderContentViewDoublePage.m:131:75: warning: incompatible pointer types sending 'CGPDFDocumentRef *' (aka 'struct CGPDFDocument **') to parameter of type 'CGPDFDocumentRef' (aka 'struct CGPDFDocument *'); dereference with * [-Wincompatible-pointer-types]
+            theContentPage1 = [[ReaderContentPage alloc] initWithDocument:pdfDocumentRef page:page+1];
+                                                                          ^~~~~~~~~~~~~~
+                                                                          *
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/SDVReaderContentViewDoublePage.m:12:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderContentPage.h:30:52: note: passing argument to parameter 'pdfDocumentRef' here
+- (instancetype)initWithDocument:(CGPDFDocumentRef)pdfDocumentRef page:(NSInteger)page;
+                                                   ^
+3 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDNetworkActivityIndicator.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/SDNetworkActivityIndicator.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDNetworkActivityIndicator.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDNetworkActivityIndicator.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/SDNetworkActivityIndicator.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SDNetworkActivityIndicator.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SAMKeychainQuery.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-secure-storage-echo/SAMKeychainQuery.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SAMKeychainQuery.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SAMKeychainQuery.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-secure-storage-echo/SAMKeychainQuery.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SAMKeychainQuery.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SAMKeychain.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-secure-storage-echo/SAMKeychain.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SAMKeychain.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SAMKeychain.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-secure-storage-echo/SAMKeychain.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SAMKeychain.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderViewController.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderViewController.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderViewController.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderViewController.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.m:107:9: warning: unused variable 'fileURL' [-Wunused-variable]
+        NSURL *fileURL = document.fileURL; NSString *phrase = document.password; NSString *guid = document.guid; // Document properties
+               ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.m:107:47: warning: unused variable 'phrase' [-Wunused-variable]
+        NSURL *fileURL = document.fileURL; NSString *phrase = document.password; NSString *guid = document.guid; // Document properties
+                                                     ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.m:421:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (void)viewDidUnload
+^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.h:26:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIViewController.h:117:1: note: method 'viewDidUnload' declared here
+- (void)viewDidUnload API_DEPRECATED("", ios(3.0, 6.0)) API_UNAVAILABLE(tvos); // Called after the view controller's view is released and set to nil. For example, a memory warning which causes the view to be purged. Not invoked as a result of -dealloc.
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.m:448:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.h:26:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIViewController.h:301:1: note: method 'shouldAutorotateToInterfaceOrientation:' declared here
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation API_DEPRECATED("", ios(2.0, 6.0)) API_UNAVAILABLE(tvos);
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.m:453:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.h:26:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIViewController.h:316:1: note: method 'willRotateToInterfaceOrientation:duration:' declared here
+- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration API_DEPRECATED("Implement viewWillTransitionToSize:withTransitionCoordinator: instead", ios(2.0, 8.0)) API_UNAVAILABLE(tvos);
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.m:460:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation duration:(NSTimeInterval)duration
+^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.h:26:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIViewController.h:319:1: note: method 'willAnimateRotationToInterfaceOrientation:duration:' declared here
+- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration API_DEPRECATED("Implement viewWillTransitionToSize:withTransitionCoordinator: instead", ios(3.0, 8.0)) API_UNAVAILABLE(tvos);
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.m:468:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.h:26:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIViewController.h:317:1: note: method 'didRotateFromInterfaceOrientation:' declared here
+- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation API_DEPRECATED("", ios(2.0, 8.0)) API_UNAVAILABLE(tvos);
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.m:570:45: warning: 'openURL:' is deprecated: first deprecated in iOS 10.0 [-Wdeprecated-declarations]
+                                        if ([[UIApplication sharedApplication] openURL:url] == NO)
+                                                                               ^~~~~~~
+                                                                               openURL:options:completionHandler:
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.h:26:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:123:1: note: 'openURL:' has been explicitly marked deprecated here
+- (BOOL)openURL:(NSURL*)url API_DEPRECATED_WITH_REPLACEMENT("openURL:options:completionHandler:", ios(2.0, 10.0)) NS_EXTENSION_UNAVAILABLE_IOS("");
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.m:753:21: warning: 'showsPageRange' is deprecated: first deprecated in iOS 10.0 - Pages can be removed from the print preview, so page range is always shown. [-Wdeprecated-declarations]
+                        printInteraction.showsPageRange = YES;
+                                         ^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.h:26:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIPrintInteractionController.h:44:70: note: 'showsPageRange' has been explicitly marked deprecated here
+@property(nonatomic)        BOOL                                     showsPageRange API_DEPRECATED("Pages can be removed from the print preview, so page range is always shown.", ios(4.2, 10.0));
+                                                                     ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.m:41:17: warning: class 'ReaderViewController' does not conform to protocol 'ReaderMainToolbarDelegate' [-Wprotocol]
+@implementation ReaderViewController
+                ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController.m:41:17: note: add stubs for missing protocol requirements
+@implementation ReaderViewController
+                ^
+10 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderViewController+SDVReaderViewControllerPassThrough.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController+SDVReaderViewControllerPassThrough.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderViewController+SDVReaderViewControllerPassThrough.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderViewController+SDVReaderViewControllerPassThrough.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderViewController+SDVReaderViewControllerPassThrough.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderViewController+SDVReaderViewControllerPassThrough.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbsView.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderThumbsView.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbsView.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbsView.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderThumbsView.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbsView.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbView.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderThumbView.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbView.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbView.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderThumbView.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbView.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbRequest.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderThumbRequest.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbRequest.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbRequest.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderThumbRequest.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbRequest.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbRender.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderThumbRender.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbRender.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbRender.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderThumbRender.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbRender.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderThumbRender.m:79:19: warning: incompatible pointer types initializing 'CGPDFDocumentRef' (aka 'struct CGPDFDocument *') with an expression of type 'CGPDFDocumentRef *' (aka 'struct CGPDFDocument **'); dereference with * [-Wincompatible-pointer-types]
+        CGPDFDocumentRef pdfDocumentRef = request.pdfDocumentRef;
+                         ^                ~~~~~~~~~~~~~~~~~~~~~~
+                                          *(                    )
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbQueue.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderThumbQueue.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbQueue.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbQueue.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderThumbQueue.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbQueue.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbFetch.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderThumbFetch.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbFetch.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbFetch.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderThumbFetch.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbFetch.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbCache.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderThumbCache.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbCache.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbCache.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderThumbCache.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderThumbCache.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderMainToolbar.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderMainToolbar.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderMainToolbar.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderMainToolbar.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderMainToolbar.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderMainToolbar.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderMainToolbar+SDVReaderMainToolbarPassThrough.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderMainToolbar+SDVReaderMainToolbarPassThrough.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderMainToolbar+SDVReaderMainToolbarPassThrough.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderMainToolbar+SDVReaderMainToolbarPassThrough.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderMainToolbar+SDVReaderMainToolbarPassThrough.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderMainToolbar+SDVReaderMainToolbarPassThrough.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderMainToolbar+SDVReaderMainToolbarPassThrough.m:17:1: warning: category is implementing a method which will also be implemented by its primary class [-Wobjc-protocol-method-implementation]
+- (instancetype)initWithFrame:(CGRect)frame document:(ReaderDocument *)document
+^
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderMainToolbar+SDVReaderMainToolbarPassThrough.m:10:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderMainToolbar+SDVReaderMainToolbarPassThrough.h:10:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderMainToolbar.h:58:1: note: method 'initWithFrame:document:' declared here
+- (instancetype)initWithFrame:(CGRect)frame document:(ReaderDocument *)document;
+^
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderMainPagebar.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderMainPagebar.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderMainPagebar.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderMainPagebar.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderMainPagebar.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderMainPagebar.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderMainPagebar.m:104:45: warning: unused variable 'phrase' [-Wunused-variable]
+                NSString *guid = document.guid; NSString *phrase = document.password;
+                                                          ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderMainPagebar.m:296:46: warning: unused variable 'phrase' [-Wunused-variable]
+                        NSString *guid = document.guid; NSString *phrase = document.password;
+                                                                  ^
+2 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderDocumentOutline.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderDocumentOutline.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderDocumentOutline.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderDocumentOutline.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderDocumentOutline.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderDocumentOutline.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderDocument.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderDocument.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderDocument.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderDocument.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderDocument.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderDocument.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderDocument.m:213:21: warning: incompatible pointer types initializing 'CGPDFDocumentRef' (aka 'struct CGPDFDocument *') with an expression of type 'CGPDFDocumentRef *' (aka 'struct CGPDFDocument **'); dereference with * [-Wincompatible-pointer-types]
+                        CGPDFDocumentRef thePDFDocRef = [self pdfDocumentRef];
+                                         ^              ~~~~~~~~~~~~~~~~~~~~~
+                                                        *
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderDocument.m:211:13: warning: unused variable 'docURLRef' [-Wunused-variable]
+                        CFURLRef docURLRef = (__bridge CFURLRef)[self fileURL]; // CFURLRef from NSURL
+                                 ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderDocument.m:282:25: warning: incompatible pointer types assigning to 'CGPDFDocumentRef *' (aka 'struct CGPDFDocument **') from 'CGPDFDocumentRef' (aka 'struct CGPDFDocument *') [-Wincompatible-pointer-types]
+        _pdfDocumentRef = CGPDFDocumentCreateUsingUrl(docURLRef, _password);
+                        ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderDocument.m:284:9: warning: incompatible pointer types returning 'CGPDFDocumentRef *' (aka 'struct CGPDFDocument **') from a function with result type 'CGPDFDocumentRef' (aka 'struct CGPDFDocument *'); dereference with * [-Wincompatible-pointer-types]
+        return _pdfDocumentRef;
+               ^~~~~~~~~~~~~~~
+               *(             )
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderDocument.m:306:37: warning: possible misuse of comma operator here [-Wcomma]
+                CGPDFDocumentRelease(thePDFDocRef),thePDFDocRef = NULL; // Cleanup
+                                                  ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderDocument.m:306:3: note: cast expression to void to silence warning
+                CGPDFDocumentRelease(thePDFDocRef),thePDFDocRef = NULL; // Cleanup
+                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                (void)(                           )
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderDocument.m:278:1: warning: conflicting return type in implementation of 'pdfDocumentRef': 'CGPDFDocumentRef *' (aka 'struct CGPDFDocument **') vs 'CGPDFDocumentRef' (aka 'struct CGPDFDocument *') [-Wmismatched-return-types]
+- (CGPDFDocumentRef)pdfDocumentRef
+^  ~~~~~~~~~~~~~~~~
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderDocument.m:26:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderDocument.h:41:51: note: previous definition is here
+@property (nonatomic, readonly) CGPDFDocumentRef *pdfDocumentRef;
+                                                  ^
+6 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderContentView.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderContentView.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderContentView.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderContentView.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderContentView.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderContentView.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderContentView.m:130:64: warning: incompatible pointer types sending 'CGPDFDocumentRef *' (aka 'struct CGPDFDocument **') to parameter of type 'CGPDFDocumentRef' (aka 'struct CGPDFDocument *'); dereference with * [-Wincompatible-pointer-types]
+                theContentPage = [[ReaderContentPage alloc] initWithDocument:pdfDocumentRef page:page];
+                                                                             ^~~~~~~~~~~~~~
+                                                                             *
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderContentView.m:28:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderContentPage.h:30:52: note: passing argument to parameter 'pdfDocumentRef' here
+- (instancetype)initWithDocument:(CGPDFDocumentRef)pdfDocumentRef page:(NSInteger)page;
+                                                   ^
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderContentTile.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderContentTile.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderContentTile.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderContentTile.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderContentTile.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderContentTile.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderContentPage.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderContentPage.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderContentPage.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderContentPage.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderContentPage.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderContentPage.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderContentPage.m:288:49: warning: 'stringByAddingPercentEscapesUsingEncoding:' is deprecated: first deprecated in iOS 9.0 - Use -stringByAddingPercentEncodingWithAllowedCharacters: instead, which always uses the recommended UTF-8 encoding, and which encodes for a specific URL component or subcomponent since each URL component or subcomponent has different rules for what characters are valid. [-Wdeprecated-declarations]
+                                                linkTarget = [NSURL URLWithString:[target stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
+                                                                                          ^
+In module 'Foundation' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderConstants.h:30:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSURL.h:595:1: note: 'stringByAddingPercentEscapesUsingEncoding:' has been explicitly marked deprecated here
+- (nullable NSString *)stringByAddingPercentEscapesUsingEncoding:(NSStringEncoding)enc API_DEPRECATED("Use -stringByAddingPercentEncodingWithAllowedCharacters: instead, which always uses the recommended UTF-8 encoding, and which encodes for a specific URL component or subcomponent since each URL component or subcomponent has different rules for what characters are valid.", macos(10.0,10.11), ios(2.0,9.0), watchos(2.0,2.0), tvos(9.0,9.0));
+^
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderConstants.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderConstants.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderConstants.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderConstants.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/ReaderConstants.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/ReaderConstants.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/PortraitVideo.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-streaming-media/PortraitVideo.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/PortraitVideo.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/PortraitVideo.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-streaming-media/PortraitVideo.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/PortraitVideo.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/PhotoViewer.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com-sarriaroman-photoviewer/PhotoViewer.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/PhotoViewer.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/PhotoViewer.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com-sarriaroman-photoviewer/PhotoViewer.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/PhotoViewer.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com-sarriaroman-photoviewer/PhotoViewer.m:119:25: warning: 'UIAlertView' is deprecated: first deprecated in iOS 9.0 - UIAlertView is deprecated. Use UIAlertController with a preferredStyle of UIAlertControllerStyleAlert instead [-Wdeprecated-declarations]
+                        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Photo viewer error"
+                        ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIAlertView.h:27:12: note: 'UIAlertView' has been explicitly marked deprecated here
+@interface UIAlertView : UIView
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com-sarriaroman-photoviewer/PhotoViewer.m:119:60: warning: 'UIAlertView' is deprecated: first deprecated in iOS 9.0 - UIAlertView is deprecated. Use UIAlertController with a preferredStyle of UIAlertControllerStyleAlert instead [-Wdeprecated-declarations]
+                        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Photo viewer error"
+                                                           ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIAlertView.h:27:12: note: 'UIAlertView' has been explicitly marked deprecated here
+@interface UIAlertView : UIView
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com-sarriaroman-photoviewer/PhotoViewer.m:314:37: warning: 'sendSynchronousRequest:returningResponse:error:' is deprecated: first deprecated in iOS 9.0 - Use [NSURLSession dataTaskWithRequest:completionHandler:] (see NSURLSession.h [-Wdeprecated-declarations]
+    NSData *data = [NSURLConnection sendSynchronousRequest:request
+                                    ^
+In module 'Foundation' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAppDelegate.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSURLConnection.h:405:1: note: 'sendSynchronousRequest:returningResponse:error:' has been explicitly marked deprecated here
++ (nullable NSData *)sendSynchronousRequest:(NSURLRequest *)request returningResponse:(NSURLResponse * _Nullable * _Nullable)response error:(NSError **)error API_DEPRECATED("Use [NSURLSession dataTaskWithRequest:completionHandler:] (see NSURLSession.h", macos(10.3,10.11), ios(2.0,9.0), tvos(9.0,9.0)) API_UNAVAILABLE(watchos);
+^
+3 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/PSYBlockTimer.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/PSYBlockTimer.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/PSYBlockTimer.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/PSYBlockTimer.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/PSYBlockTimer.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/PSYBlockTimer.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/NativePageTransitions.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/NativePageTransitions.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/NativePageTransitions.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/NativePageTransitions.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:225:78: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                            [self.transitionView.superview sendSubviewToBack:_screenShotImageView];
+                                                                             ^
+                                                                             self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:228:35: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                                 [_screenShotImageView setAlpha:0];
+                                  ^
+                                  self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:230:31: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                             [_screenShotImageView setFrame:CGRectMake(transitionToX/screenshotSlowdownFactor, slidePixels > 0 ? fixedPixelsTop+slidePixels : transitionToY, width, height)];
+                              ^
+                              self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:233:27: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                         [_screenShotImageView removeFromSuperview];
+                          ^
+                          self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:234:30: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                         if (_originalColor != nil) {
+                             ^
+                             self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:235:71: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                           self.viewController.view.backgroundColor = _originalColor;
+                                                                      ^
+                                                                      self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:238:89: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                         [self.commandDelegate sendPluginResult:pluginResult callbackId:_command.callbackId];
+                                                                                        ^
+                                                                                        self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:243:12: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+          [_screenShotImageView removeFromSuperview];
+           ^
+           self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:244:15: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+          if (_originalColor != nil) {
+              ^
+              self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:245:58: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+              self.viewController.view.backgroundColor = _originalColor;
+                                                         ^
+                                                         self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:248:74: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+          [self.commandDelegate sendPluginResult:pluginResult callbackId:_command.callbackId];
+                                                                         ^
+                                                                         self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:258:30: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                             _screenShotImageView.alpha = slidePixels > 0 ? 1.0f : lowerLayerAlpha;
+                             ^
+                             self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:288:94: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                       [self.transitionView setFrame:CGRectMake(0, webviewToY, width, height-_nonWebViewHeight)];
+                                                                                             ^
+                                                                                             self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:300:10: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+        [_screenShotImageViewTop removeFromSuperview];
+         ^
+         self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:301:10: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+        [_screenShotImageViewBottom removeFromSuperview];
+         ^
+         self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:410:8: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+      [_screenShotImageView removeFromSuperview];
+       ^
+       self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:421:86: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                      [self.commandDelegate sendPluginResult:pluginResult callbackId:_command.callbackId];
+                                                                                     ^
+                                                                                     self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:538:25: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                       [_screenShotImageView setFrame:CGRectMake(transitionToX, 0, width, height)];
+                        ^
+                        self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:542:26: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                         _screenShotImageView = nil;
+                         ^
+                         self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:546:87: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                       [self.commandDelegate sendPluginResult:pluginResult callbackId:_command.callbackId];
+                                                                                      ^
+                                                                                      self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:562:68: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                       [self.transitionView setFrame:CGRectMake(0, _nonWebViewHeight, width, height-_nonWebViewHeight)];
+                                                                   ^
+                                                                   self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:562:101: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                       [self.transitionView setFrame:CGRectMake(0, _nonWebViewHeight, width, height-_nonWebViewHeight)];
+                                                                                                    ^
+                                                                                                    self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:565:25: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                       [_screenShotImageView removeFromSuperview];
+                        ^
+                        self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:567:87: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                       [self.commandDelegate sendPluginResult:pluginResult callbackId:_command.callbackId];
+                                                                                      ^
+                                                                                      self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:618:12: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+          [_screenShotImageView removeFromSuperview];
+           ^
+           self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:626:90: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                          [self.commandDelegate sendPluginResult:pluginResult callbackId:_command.callbackId];
+                                                                                         ^
+                                                                                         self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:691:8: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+      [_screenShotImageView removeFromSuperview];
+       ^
+       self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/NativePageTransitions.m:699:86: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                      [self.commandDelegate sendPluginResult:pluginResult callbackId:_command.callbackId];
+                                                                                     ^
+                                                                                     self->
+28 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/NSUserDefaults+CDVSharedPreferences.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-awesome-shared-preferences/NSUserDefaults+CDVSharedPreferences.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/NSUserDefaults+CDVSharedPreferences.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/NSUserDefaults+CDVSharedPreferences.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-awesome-shared-preferences/NSUserDefaults+CDVSharedPreferences.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/NSUserDefaults+CDVSharedPreferences.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/NSString+SSURLEncoding.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/NSString+SSURLEncoding.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/NSString+SSURLEncoding.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/NSString+SSURLEncoding.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/NSString+SSURLEncoding.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/NSString+SSURLEncoding.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/NSString+SSURLEncoding.m:7:27: warning: 'CFURLCreateStringByAddingPercentEscapes' is deprecated: first deprecated in iOS 9.0 - Use [NSString stringByAddingPercentEncodingWithAllowedCharacters:] instead, which always uses the recommended UTF-8 encoding, and which encodes for a specific URL component or subcomponent (since each URL component or subcomponent has different rules for what characters are valid). [-Wdeprecated-declarations]
+                          CFURLCreateStringByAddingPercentEscapes(
+                          ^
+In module 'Foundation' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-x-socialsharing/NSString+SSURLEncoding.h:1:
+In module 'CoreFoundation' imported from /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h:6:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/CoreFoundation.framework/Headers/CFURL.h:408:13: note: 'CFURLCreateStringByAddingPercentEscapes' has been explicitly marked deprecated here
+CFStringRef CFURLCreateStringByAddingPercentEscapes(CFAllocatorRef allocator, CFStringRef originalString, CFStringRef charactersToLeaveUnescaped, CFStringRef legalURLCharactersToBeEscaped, CFStringEncoding encoding) API_DEPRECATED("Use [NSString stringByAddingPercentEncodingWithAllowedCharacters:] instead, which always uses the recommended UTF-8 encoding, and which encodes for a specific URL component or subcomponent (since each URL component or subcomponent has different rules for what characters are valid).", macos(10.0,10.11), ios(2.0,9.0), watchos(2.0,2.0), tvos(9.0,9.0));
+            ^
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/MainViewController.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Classes/MainViewController.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/MainViewController.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/MainViewController.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Classes/MainViewController.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/MainViewController.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Classes/MainViewController.m:80:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (void)viewDidUnload
+^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVViewController.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIViewController.h:117:1: note: method 'viewDidUnload' declared here
+- (void)viewDidUnload API_DEPRECATED("", ios(3.0, 6.0)) API_UNAVAILABLE(tvos); // Called after the view controller's view is released and set to nil. For example, a memory warning which causes the view to be purged. Not invoked as a result of -dealloc.
+^
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/LandscapeVideo.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-streaming-media/LandscapeVideo.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/LandscapeVideo.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/LandscapeVideo.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-streaming-media/LandscapeVideo.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/LandscapeVideo.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/InstallOptions.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/InstallOptions.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/InstallOptions.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/InstallOptions.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/InstallOptions.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/InstallOptions.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/IONAssetHandler.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-ionic-webview/IONAssetHandler.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/IONAssetHandler.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/IONAssetHandler.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-ionic-webview/IONAssetHandler.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/IONAssetHandler.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMPHAsset.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMPHAsset.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMPHAsset.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMPHAsset.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMPHAsset.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMPHAsset.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMImagePickerController.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMImagePickerController.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMImagePickerController.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMImagePickerController.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMImagePickerController.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMImagePickerController.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMGridViewController.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMGridViewController.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMGridViewController.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMGridViewController.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMGridViewController.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMGridViewController.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMGridViewController.m:179:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMAlbumsViewController.h:9:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIViewController.h:319:1: note: method 'willAnimateRotationToInterfaceOrientation:duration:' declared here
+- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration API_DEPRECATED("Implement viewWillTransitionToSize:withTransitionCoordinator: instead", ios(3.0, 8.0)) API_UNAVAILABLE(tvos);
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMGridViewController.m:400:102: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                                              filePath = [NSString stringWithFormat:@"%@/%@%03d.%@", docsPath, CDV_THUMB_PREFIX, doc_thumbCount++, @"jpg"];
+                                                                                                     ^
+                                                                                                     self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMGridViewController.m:400:130: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                                              filePath = [NSString stringWithFormat:@"%@/%@%03d.%@", docsPath, CDV_THUMB_PREFIX, doc_thumbCount++, @"jpg"];
+                                                                                                                                 ^
+                                                                                                                                 self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMGridViewController.m:401:53: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                                          } while ([fileMgr fileExistsAtPath:filePath]);
+                                                    ^
+                                                    self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMGridViewController.m:495:72: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                filePath = [NSString stringWithFormat:@"%@/%@%03d.%@", docsPath, CDV_PHOTO_PREFIX, docCount++, @"jpg"];
+                                                                       ^
+                                                                       self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMGridViewController.m:495:100: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                filePath = [NSString stringWithFormat:@"%@/%@%03d.%@", docsPath, CDV_PHOTO_PREFIX, docCount++, @"jpg"];
+                                                                                                   ^
+                                                                                                   self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMGridViewController.m:496:23: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+            } while ([fileMgr fileExistsAtPath:filePath]);
+                      ^
+                      self->
+7 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMGridViewCell.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMGridViewCell.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMGridViewCell.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMGridViewCell.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMGridViewCell.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMGridViewCell.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMFetchItem.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMFetchItem.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMFetchItem.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMFetchItem.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMFetchItem.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMFetchItem.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMFetchItem.m:27:5: warning: expression result unused [-Wunused-value]
+    be_saving_img_thumb;
+    ^~~~~~~~~~~~~~~~~~~
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMAlbumsViewController.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMAlbumsViewController.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMAlbumsViewController.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMAlbumsViewController.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMAlbumsViewController.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMAlbumsViewController.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMAlbumsViewController.m:232:1: warning: conflicting return type in implementation of 'supportedInterfaceOrientations': 'UIInterfaceOrientationMask' (aka 'enum UIInterfaceOrientationMask') vs 'NSUInteger' (aka 'unsigned long') [-Wmismatched-return-types]
+- (NSUInteger)supportedInterfaceOrientations
+^  ~~~~~~~~~~
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMAlbumsViewController.h:9:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIViewController.h:305:59: note: previous definition is here
+@property(nonatomic, readonly) UIInterfaceOrientationMask supportedInterfaceOrientations API_AVAILABLE(ios(6.0)) API_UNAVAILABLE(tvos);
+                                                          ^
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMAlbumsViewCell.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMAlbumsViewCell.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMAlbumsViewCell.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMAlbumsViewCell.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-telerik-imagepicker/GMAlbumsViewCell.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/GMAlbumsViewCell.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/FilePicker.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-filepicker/FilePicker.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/FilePicker.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/FilePicker.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-filepicker/FilePicker.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/FilePicker.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-filepicker/FilePicker.m:63:22: warning: 'UIDocumentMenuViewController' is deprecated: first deprecated in iOS 11.0 - UIDocumentMenuViewController is deprecated. Use UIDocumentPickerViewController directly. [-Wdeprecated-declarations]
+-(void)documentMenu:(UIDocumentMenuViewController *)documentMenu didPickDocumentPicker:(UIDocumentPickerViewController *)documentPicker
+                     ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIDocumentMenuViewController.h:31:34: note: 'UIDocumentMenuViewController' has been explicitly marked deprecated here
+API_UNAVAILABLE(tvos) @interface UIDocumentMenuViewController : UIViewController
+                                 ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-filepicker/FilePicker.m:70:34: warning: 'UIDocumentMenuViewController' is deprecated: first deprecated in iOS 11.0 - UIDocumentMenuViewController is deprecated. Use UIDocumentPickerViewController directly. [-Wdeprecated-declarations]
+-(void)documentMenuWasCancelled:(UIDocumentMenuViewController *)documentMenu
+                                 ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIDocumentMenuViewController.h:31:34: note: 'UIDocumentMenuViewController' has been explicitly marked deprecated here
+API_UNAVAILABLE(tvos) @interface UIDocumentMenuViewController : UIViewController
+                                 ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-filepicker/FilePicker.m:79:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentAtURL:(NSURL *)url {
+^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIDocumentPickerViewController.h:26:1: note: method 'documentPicker:didPickDocumentAtURL:' declared here
+- (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentAtURL:(NSURL *)url API_DEPRECATED_WITH_REPLACEMENT("documentPicker:didPickDocumentsAtURLs:", ios(8.0, 11.0));
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-filepicker/FilePicker.m:98:45: warning: 'UIDocumentMenuViewController' is deprecated: first deprecated in iOS 11.0 - UIDocumentMenuViewController is deprecated. Use UIDocumentPickerViewController directly. [-Wdeprecated-declarations]
+        vc = [[UIDocumentMenuViewController alloc] initWithDocumentTypes:UTIs inMode:UIDocumentPickerModeImport];
+                                            ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIDocumentMenuViewController.h:31:34: note: 'UIDocumentMenuViewController' has been explicitly marked deprecated here
+API_UNAVAILABLE(tvos) @interface UIDocumentMenuViewController : UIViewController
+                                 ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-filepicker/FilePicker.m:99:11: warning: 'UIDocumentMenuViewController' is deprecated: first deprecated in iOS 11.0 - UIDocumentMenuViewController is deprecated. Use UIDocumentPickerViewController directly. [-Wdeprecated-declarations]
+        ((UIDocumentMenuViewController *)vc).delegate = self;
+          ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIDocumentMenuViewController.h:31:34: note: 'UIDocumentMenuViewController' has been explicitly marked deprecated here
+API_UNAVAILABLE(tvos) @interface UIDocumentMenuViewController : UIViewController
+                                 ^
+5 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/FileOpener2.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file-opener2/FileOpener2.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/FileOpener2.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/FileOpener2.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file-opener2/FileOpener2.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/FileOpener2.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file-opener2/FileOpener2.m:66:3: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                localFile = fileURL.path;
+                ^
+                self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file-opener2/FileOpener2.m:70:31: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+            if(![fm fileExistsAtPath:localFile]) {
+                                     ^
+                                     self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file-opener2/FileOpener2.m:78:3: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                docController = [UIDocumentInteractionController  interactionControllerWithURL:fileURL];
+                ^
+                self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file-opener2/FileOpener2.m:79:3: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                docController.delegate = self;
+                ^
+                self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file-opener2/FileOpener2.m:80:3: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                docController.UTI = uti;
+                ^
+                self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file-opener2/FileOpener2.m:88:17: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                        wasOpened = [docController presentPreviewAnimated: NO];
+                                     ^
+                                     self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file-opener2/FileOpener2.m:92:17: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                        wasOpened = [docController presentOpenInMenuFromRect:rect inView:cont.view animated:YES];
+                                     ^
+                                     self->
+7 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/FCMPlugin.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-fcm-with-dependecy-updated/FCMPlugin.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/FCMPlugin.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/FCMPlugin.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-fcm-with-dependecy-updated/FCMPlugin.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/FCMPlugin.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Notifications.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Notifications.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Notifications.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Notifications.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Notifications.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Notifications.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Notifications.m:51:21: warning: 'UIUserNotificationSettings' is deprecated: first deprecated in iOS 10.0 - Use UserNotifications Framework's UNNotificationSettings [-Wdeprecated-declarations]
+                    UIUserNotificationSettings *userNotificationSettings = [UIApplication sharedApplication].currentUserNotificationSettings;
+                    ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIUserNotificationSettings.h:44:12: note: 'UIUserNotificationSettings' has been explicitly marked deprecated here
+@interface UIUserNotificationSettings : NSObject
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Notifications.m:51:110: warning: 'currentUserNotificationSettings' is deprecated: first deprecated in iOS 10.0 - Use UserNotifications Framework's -[UNUserNotificationCenter getNotificationSettingsWithCompletionHandler:] and -[UNUserNotificationCenter getNotificationCategoriesWithCompletionHandler:] [-Wdeprecated-declarations]
+                    UIUserNotificationSettings *userNotificationSettings = [UIApplication sharedApplication].currentUserNotificationSettings;
+                                                                                                             ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:253:70: note: 'currentUserNotificationSettings' has been explicitly marked deprecated here
+@property(nonatomic, readonly, nullable) UIUserNotificationSettings *currentUserNotificationSettings API_DEPRECATED("Use UserNotifications Framework's -[UNUserNotificationCenter getNotificationSettingsWithCompletionHandler:] and -[UNUserNotificationCenter getNotificationCategoriesWithCompletionHandler:]", ios(8.0, 10.0)) API_UNAVAILABLE(tvos);
+                                                                     ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Notifications.m:52:81: warning: 'UIUserNotificationTypeNone' is deprecated: first deprecated in iOS 10.0 - Use UserNotifications Framework's UNAuthorizationOptions [-Wdeprecated-declarations]
+                    BOOL userSettingEnabled = userNotificationSettings.types != UIUserNotificationTypeNone;
+                                                                                ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIUserNotificationSettings.h:17:32: note: 'UIUserNotificationType' has been explicitly marked deprecated here
+typedef NS_OPTIONS(NSUInteger, UIUserNotificationType) {
+                               ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Notifications.m:99:21: warning: 'UIUserNotificationSettings' is deprecated: first deprecated in iOS 10.0 - Use UserNotifications Framework's UNNotificationSettings [-Wdeprecated-declarations]
+                    UIUserNotificationSettings *userNotificationSettings = [UIApplication sharedApplication].currentUserNotificationSettings;
+                    ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIUserNotificationSettings.h:44:12: note: 'UIUserNotificationSettings' has been explicitly marked deprecated here
+@interface UIUserNotificationSettings : NSObject
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Notifications.m:99:110: warning: 'currentUserNotificationSettings' is deprecated: first deprecated in iOS 10.0 - Use UserNotifications Framework's -[UNUserNotificationCenter getNotificationSettingsWithCompletionHandler:] and -[UNUserNotificationCenter getNotificationCategoriesWithCompletionHandler:] [-Wdeprecated-declarations]
+                    UIUserNotificationSettings *userNotificationSettings = [UIApplication sharedApplication].currentUserNotificationSettings;
+                                                                                                             ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:253:70: note: 'currentUserNotificationSettings' has been explicitly marked deprecated here
+@property(nonatomic, readonly, nullable) UIUserNotificationSettings *currentUserNotificationSettings API_DEPRECATED("Use UserNotifications Framework's -[UNUserNotificationCenter getNotificationSettingsWithCompletionHandler:] and -[UNUserNotificationCenter getNotificationCategoriesWithCompletionHandler:]", ios(8.0, 10.0)) API_UNAVAILABLE(tvos);
+                                                                     ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Notifications.m:100:74: warning: 'UIUserNotificationTypeNone' is deprecated: first deprecated in iOS 10.0 - Use UserNotifications Framework's UNAuthorizationOptions [-Wdeprecated-declarations]
+                    BOOL noneEnabled = userNotificationSettings.types == UIUserNotificationTypeNone;
+                                                                         ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIUserNotificationSettings.h:17:32: note: 'UIUserNotificationType' has been explicitly marked deprecated here
+typedef NS_OPTIONS(NSUInteger, UIUserNotificationType) {
+                               ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Notifications.m:101:75: warning: 'UIUserNotificationTypeAlert' is deprecated: first deprecated in iOS 10.0 - Use UserNotifications Framework's UNAuthorizationOptions [-Wdeprecated-declarations]
+                    BOOL alertsEnabled = userNotificationSettings.types & UIUserNotificationTypeAlert;
+                                                                          ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIUserNotificationSettings.h:17:32: note: 'UIUserNotificationType' has been explicitly marked deprecated here
+typedef NS_OPTIONS(NSUInteger, UIUserNotificationType) {
+                               ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Notifications.m:102:75: warning: 'UIUserNotificationTypeBadge' is deprecated: first deprecated in iOS 10.0 - Use UserNotifications Framework's UNAuthorizationOptions [-Wdeprecated-declarations]
+                    BOOL badgesEnabled = userNotificationSettings.types & UIUserNotificationTypeBadge;
+                                                                          ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIUserNotificationSettings.h:17:32: note: 'UIUserNotificationType' has been explicitly marked deprecated here
+typedef NS_OPTIONS(NSUInteger, UIUserNotificationType) {
+                               ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Notifications.m:103:75: warning: 'UIUserNotificationTypeSound' is deprecated: first deprecated in iOS 10.0 - Use UserNotifications Framework's UNAuthorizationOptions [-Wdeprecated-declarations]
+                    BOOL soundsEnabled = userNotificationSettings.types & UIUserNotificationTypeSound;
+                                                                          ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIUserNotificationSettings.h:17:32: note: 'UIUserNotificationType' has been explicitly marked deprecated here
+typedef NS_OPTIONS(NSUInteger, UIUserNotificationType) {
+                               ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Notifications.m:274:17: warning: 'UIUserNotificationType' is deprecated: first deprecated in iOS 10.0 - Use UserNotifications Framework's UNAuthorizationOptions [-Wdeprecated-declarations]
+                UIUserNotificationType types = 0;
+                ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIUserNotificationSettings.h:17:32: note: 'UIUserNotificationType' has been explicitly marked deprecated here
+typedef NS_OPTIONS(NSUInteger, UIUserNotificationType) {
+                               ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Notifications.m:278:41: warning: 'UIUserNotificationTypeAlert' is deprecated: first deprecated in iOS 10.0 - Use UserNotifications Framework's UNAuthorizationOptions [-Wdeprecated-declarations]
+                        types = types + UIUserNotificationTypeAlert;
+                                        ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIUserNotificationSettings.h:17:32: note: 'UIUserNotificationType' has been explicitly marked deprecated here
+typedef NS_OPTIONS(NSUInteger, UIUserNotificationType) {
+                               ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Notifications.m:280:41: warning: 'UIUserNotificationTypeSound' is deprecated: first deprecated in iOS 10.0 - Use UserNotifications Framework's UNAuthorizationOptions [-Wdeprecated-declarations]
+                        types = types + UIUserNotificationTypeSound;
+                                        ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIUserNotificationSettings.h:17:32: note: 'UIUserNotificationType' has been explicitly marked deprecated here
+typedef NS_OPTIONS(NSUInteger, UIUserNotificationType) {
+                               ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Notifications.m:282:41: warning: 'UIUserNotificationTypeBadge' is deprecated: first deprecated in iOS 10.0 - Use UserNotifications Framework's UNAuthorizationOptions [-Wdeprecated-declarations]
+                        types = types + UIUserNotificationTypeBadge;
+                                        ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIUserNotificationSettings.h:17:32: note: 'UIUserNotificationType' has been explicitly marked deprecated here
+typedef NS_OPTIONS(NSUInteger, UIUserNotificationType) {
+                               ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Notifications.m:285:17: warning: 'UIUserNotificationSettings' is deprecated: first deprecated in iOS 10.0 - Use UserNotifications Framework's UNNotificationSettings [-Wdeprecated-declarations]
+                UIUserNotificationSettings *mySettings = [UIUserNotificationSettings settingsForTypes:types categories:nil];
+                ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIUserNotificationSettings.h:44:12: note: 'UIUserNotificationSettings' has been explicitly marked deprecated here
+@interface UIUserNotificationSettings : NSObject
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Notifications.m:285:86: warning: 'UIUserNotificationSettings' is deprecated: first deprecated in iOS 10.0 - Use UserNotifications Framework's UNNotificationSettings [-Wdeprecated-declarations]
+                UIUserNotificationSettings *mySettings = [UIUserNotificationSettings settingsForTypes:types categories:nil];
+                                                                                     ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIUserNotificationSettings.h:44:12: note: 'UIUserNotificationSettings' has been explicitly marked deprecated here
+@interface UIUserNotificationSettings : NSObject
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Notifications.m:288:56: warning: 'registerUserNotificationSettings:' is deprecated: first deprecated in iOS 10.0 - Use UserNotifications Framework's -[UNUserNotificationCenter requestAuthorizationWithOptions:completionHandler:] and -[UNUserNotificationCenter setNotificationCategories:] [-Wdeprecated-declarations]
+                    [[UIApplication sharedApplication] registerUserNotificationSettings:mySettings];
+                                                       ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:250:1: note: 'registerUserNotificationSettings:' has been explicitly marked deprecated here
+- (void)registerUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings API_DEPRECATED("Use UserNotifications Framework's -[UNUserNotificationCenter requestAuthorizationWithOptions:completionHandler:] and -[UNUserNotificationCenter setNotificationCategories:]", ios(8.0, 10.0)) API_UNAVAILABLE(tvos);
+^
+16 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Motion.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Motion.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Motion.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Motion.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Motion.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Motion.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Microphone.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Microphone.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Microphone.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Microphone.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Microphone.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Microphone.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Location.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Location.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Location.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Location.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Location.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Location.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Contacts.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Contacts.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Contacts.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Contacts.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Contacts.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Contacts.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Camera.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Camera.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Camera.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Camera.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Camera.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Camera.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Calendar.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Calendar.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Calendar.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Calendar.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Calendar.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Calendar.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Bluetooth.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Bluetooth.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Bluetooth.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Bluetooth.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic_Bluetooth.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic_Bluetooth.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Diagnostic.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova.plugins.diagnostic/Diagnostic.m:64:52: warning: 'openURL:' is deprecated: first deprecated in iOS 10.0 [-Wdeprecated-declarations]
+                [[UIApplication sharedApplication] openURL: [NSURL URLWithString: UIApplicationOpenSettingsURLString]];
+                                                   ^~~~~~~
+                                                   openURL:options:completionHandler:
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAvailabilityDeprecated.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:123:1: note: 'openURL:' has been explicitly marked deprecated here
+- (BOOL)openURL:(NSURL*)url API_DEPRECATED_WITH_REPLACEMENT("openURL:options:completionHandler:", ios(2.0, 10.0)) NS_EXTENSION_UNAVAILABLE_IOS("");
+^
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CustomPSPDFThreadSafeMutableDictionary.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-sqlite-storage/CustomPSPDFThreadSafeMutableDictionary.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -w -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CustomPSPDFThreadSafeMutableDictionary.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CustomPSPDFThreadSafeMutableDictionary.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-sqlite-storage/CustomPSPDFThreadSafeMutableDictionary.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CustomPSPDFThreadSafeMutableDictionary.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CordovaHttpPlugin.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/CordovaHttpPlugin.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CordovaHttpPlugin.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CordovaHttpPlugin.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/CordovaHttpPlugin.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CordovaHttpPlugin.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/CordovaHttpPlugin.m:343:17: warning: unused variable 'alias' [-Wunused-variable]
+      NSString *alias = [command.arguments objectAtIndex:1];
+                ^
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushReportingManager.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushReportingManager.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushReportingManager.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushReportingManager.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushReportingManager.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushReportingManager.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushPackageMetadata.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushPackageMetadata.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushPackageMetadata.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushPackageMetadata.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushPackageMetadata.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushPackageMetadata.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushPackageManager.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushPackageManager.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushPackageManager.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushPackageManager.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushPackageManager.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushPackageManager.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushMF_Base64Additions.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushMF_Base64Additions.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushMF_Base64Additions.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushMF_Base64Additions.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushMF_Base64Additions.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushMF_Base64Additions.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTErrorDescription.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTErrorDescription.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTErrorDescription.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTErrorDescription.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTErrorDescription.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTErrorDescription.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTErrorDescription.m:31:6: warning: possible misuse of comma operator here [-Wcomma]
+    }, userDescriptionsAndCodes);
+     ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTErrorDescription.m:14:41: note: cast expression to void to silence warning
+    return userDescriptionsAndCodes ?: (userDescriptionsAndCodes = @{
+                                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                        (void)(
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTErrorDescription.m:53:6: warning: possible misuse of comma operator here [-Wcomma]
+    }, errorDescriptionsAndCodes);
+     ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTErrorDescription.m:36:42: note: cast expression to void to silence warning
+    return errorDescriptionsAndCodes ?: (errorDescriptionsAndCodes = @{
+                                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                         (void)(
+2 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCryptoSecurity.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCryptoSecurity.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCryptoSecurity.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCryptoSecurity.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCryptoSecurity.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCryptoSecurity.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCryptoSecurity.m:39:6: warning: possible misuse of comma operator here [-Wcomma]
+    }, sizesAndTypes);
+     ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCryptoSecurity.m:37:30: note: cast expression to void to silence warning
+    return sizesAndTypes ?: (sizesAndTypes = @{
+                             ^~~~~~~~~~~~~~~~~~
+                             (void)(
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCryptoSecurity.m:72:9: warning: comparison of function 'SecKeyCreateWithData' not equal to a null pointer is always true [-Wtautological-pointer-compare]
+    if (SecKeyCreateWithData != NULL) {
+        ^~~~~~~~~~~~~~~~~~~~    ~~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCryptoSecurity.m:72:9: note: prefix with the address-of operator to silence this warning
+    if (SecKeyCreateWithData != NULL) {
+        ^
+        &
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCryptoSecurity.m:367:6: warning: possible misuse of comma operator here [-Wcomma]
+    },
+     ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCryptoSecurity.m:362:6: note: cast expression to void to silence warning
+    (publicHeaderStrippingMessagesAndCodes = @{
+     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+     (void)(
+3 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCryptoKeyExtractor.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCryptoKeyExtractor.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCryptoKeyExtractor.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCryptoKeyExtractor.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCryptoKeyExtractor.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCryptoKeyExtractor.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCryptoKeyExtractor.m:24:9: warning: Not Implemented [-W#pragma-messages]
+#pragma message "Not Implemented"
+        ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCryptoKeyExtractor.m:107:162: warning: possible misuse of comma operator here [-Wcomma]
+    return dictionary ?: (dictionary = [[NSDictionary alloc] initWithObjects:[self availableExtractors] forKeys:[[self availableExtractors] valueForKey:@"type"]],
+                                                                                                                                                                 ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCryptoKeyExtractor.m:107:27: note: cast expression to void to silence warning
+    return dictionary ?: (dictionary = [[NSDictionary alloc] initWithObjects:[self availableExtractors] forKeys:[[self availableExtractors] valueForKey:@"type"]],
+                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                          (void)(                                                                                                                                )
+2 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCryptoKey.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCryptoKey.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCryptoKey.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCryptoKey.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCryptoKey.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCryptoKey.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCryptoKey.m:117:10: warning: unused variable 'checked' [-Wunused-variable]
+    BOOL checked = self.key != NULL;
+         ^
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding+VersionTwo.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionTwo.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding+VersionTwo.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding+VersionTwo.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionTwo.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding+VersionTwo.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionTwo.m:68:119: warning: this block declaration is not a prototype [-Wstrict-prototypes]
+@property (copy, nonatomic, readwrite) JWTBuilder * (^constructDataHolder)(id<JWTAlgorithmDataHolderProtocol> (^block)());
+                                                                                                                      ^
+                                                                                                                       void
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionTwo.m:217:81: warning: this block declaration is not a prototype [-Wstrict-prototypes]
+        self.constructDataHolder = ^(id<JWTAlgorithmDataHolderProtocol> (^block)()) {
+                                                                                ^
+                                                                                 void
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionTwo.m:292:55: warning: 'encodePayload:withSecret:' is deprecated: deprecated. will be removed in release version: 3.0 [-Wdeprecated-declarations]
+        NSData *signedOutputData = [self.jwtAlgorithm encodePayload:signingInput withSecret:self.jwtSecret];
+                                                      ^
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionTwo.m:12:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTRSAlgorithm.h:7:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithm.h:40:82: note: 'encodePayload:withSecret:' has been explicitly marked deprecated here
+- (NSData *)encodePayload:(NSString *)theString withSecret:(NSString *)theSecret __deprecated_and_will_be_removed_in_release_version(JWTVersion_3_0_0);
+                                                                                 ^
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionTwo.m:12:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTRSAlgorithm.h:7:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithm.h:10:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTDeprecations.h:17:70: note: expanded from macro '__deprecated_and_will_be_removed_in_release_version'
+#define __deprecated_and_will_be_removed_in_release_version(version) __deprecated_msg("deprecated. will be removed in release version: "STR(version))
+                                                                     ^
+In module 'Foundation' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding.h:9:
+In module 'CoreFoundation' imported from /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h:6:
+In module 'Darwin' imported from /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/CoreFoundation.framework/Headers/CoreFoundation.h:16:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/usr/include/sys/cdefs.h:200:48: note: expanded from macro '__deprecated_msg'
+        #define __deprecated_msg(_msg) __attribute__((__deprecated__(_msg)))
+                                                      ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionTwo.m:421:41: warning: 'verifySignedInput:withSignature:verificationKey:' is deprecated: deprecated. will be removed in release version: 3.0 [-Wdeprecated-declarations]
+            signatureValid = [algorithm verifySignedInput:signingInput withSignature:signedPart verificationKey:theSecret];
+                                        ^
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionTwo.m:12:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTRSAlgorithm.h:7:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithm.h:49:125: note: 'verifySignedInput:withSignature:verificationKey:' has been explicitly marked deprecated here
+- (BOOL)verifySignedInput:(NSString *)input withSignature:(NSString *)signature verificationKey:(NSString *)verificationKey __deprecated_and_will_be_removed_in_release_version(JWTVersion_3_0_0);
+                                                                                                                            ^
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionTwo.m:12:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTRSAlgorithm.h:7:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithm.h:10:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTDeprecations.h:17:70: note: expanded from macro '__deprecated_and_will_be_removed_in_release_version'
+#define __deprecated_and_will_be_removed_in_release_version(version) __deprecated_msg("deprecated. will be removed in release version: "STR(version))
+                                                                     ^
+In module 'Foundation' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding.h:9:
+In module 'CoreFoundation' imported from /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h:6:
+In module 'Darwin' imported from /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/CoreFoundation.framework/Headers/CoreFoundation.h:16:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/usr/include/sys/cdefs.h:200:48: note: expanded from macro '__deprecated_msg'
+        #define __deprecated_msg(_msg) __attribute__((__deprecated__(_msg)))
+                                                      ^
+4 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding+VersionThree.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionThree.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding+VersionThree.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding+VersionThree.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionThree.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding+VersionThree.o
+
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionThree.m:9:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionThree.h:41:112: warning: this block declaration is not a prototype [-Wstrict-prototypes]
+@property (copy, nonatomic, readonly) JWTCodingBuilder *(^constructChain)(JWTAlgorithmDataHolderChain *(^block)());
+                                                                                                               ^
+                                                                                                                void
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionThree.m:41:113: warning: this block declaration is not a prototype [-Wstrict-prototypes]
+@property (copy, nonatomic, readwrite) JWTCodingBuilder *(^constructChain)(JWTAlgorithmDataHolderChain *(^block)());
+                                                                                                                ^
+                                                                                                                 void
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionThree.m:74:66: warning: this block declaration is not a prototype [-Wstrict-prototypes]
+    self.constructChain = ^(JWTAlgorithmDataHolderChain *(^block)()) {
+                                                                 ^
+                                                                  void
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionThree.m:112:81: warning: possible misuse of comma operator here [-Wcomma]
+    return _internalChain ?: (_internalChain = [JWTAlgorithmDataHolderChain new], _internalChain);
+                                                                                ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionThree.m:112:31: note: cast expression to void to silence warning
+    return _internalChain ?: (_internalChain = [JWTAlgorithmDataHolderChain new], _internalChain);
+                              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                              (void)(                                           )
+4 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding+VersionOne.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionOne.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding+VersionOne.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding+VersionOne.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionOne.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding+VersionOne.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionOne.m:131:46: warning: 'encodePayload:withSecret:' is deprecated: deprecated. will be removed in release version: 3.0 [-Wdeprecated-declarations]
+    NSData *signedOutputData = [theAlgorithm encodePayload:signingInput withSecret:theSecret];
+                                             ^
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionOne.m:12:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTRSAlgorithm.h:7:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithm.h:40:82: note: 'encodePayload:withSecret:' has been explicitly marked deprecated here
+- (NSData *)encodePayload:(NSString *)theString withSecret:(NSString *)theSecret __deprecated_and_will_be_removed_in_release_version(JWTVersion_3_0_0);
+                                                                                 ^
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionOne.m:12:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTRSAlgorithm.h:7:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithm.h:10:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTDeprecations.h:17:70: note: expanded from macro '__deprecated_and_will_be_removed_in_release_version'
+#define __deprecated_and_will_be_removed_in_release_version(version) __deprecated_msg("deprecated. will be removed in release version: "STR(version))
+                                                                     ^
+In module 'Foundation' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding.h:9:
+In module 'CoreFoundation' imported from /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h:6:
+In module 'Darwin' imported from /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/CoreFoundation.framework/Headers/CoreFoundation.h:16:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/usr/include/sys/cdefs.h:200:48: note: expanded from macro '__deprecated_msg'
+        #define __deprecated_msg(_msg) __attribute__((__deprecated__(_msg)))
+                                                      ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionOne.m:259:42: warning: 'verifySignedInput:withSignature:verificationKey:' is deprecated: deprecated. will be removed in release version: 3.0 [-Wdeprecated-declarations]
+        BOOL signatureValid = [algorithm verifySignedInput:signingInput withSignature:signedPart verificationKey:theSecret];
+                                         ^
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionOne.m:12:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTRSAlgorithm.h:7:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithm.h:49:125: note: 'verifySignedInput:withSignature:verificationKey:' has been explicitly marked deprecated here
+- (BOOL)verifySignedInput:(NSString *)input withSignature:(NSString *)signature verificationKey:(NSString *)verificationKey __deprecated_and_will_be_removed_in_release_version(JWTVersion_3_0_0);
+                                                                                                                            ^
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionOne.m:12:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTRSAlgorithm.h:7:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithm.h:10:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTDeprecations.h:17:70: note: expanded from macro '__deprecated_and_will_be_removed_in_release_version'
+#define __deprecated_and_will_be_removed_in_release_version(version) __deprecated_msg("deprecated. will be removed in release version: "STR(version))
+                                                                     ^
+In module 'Foundation' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding.h:9:
+In module 'CoreFoundation' imported from /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h:6:
+In module 'Darwin' imported from /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/CoreFoundation.framework/Headers/CoreFoundation.h:16:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/usr/include/sys/cdefs.h:200:48: note: expanded from macro '__deprecated_msg'
+        #define __deprecated_msg(_msg) __attribute__((__deprecated__(_msg)))
+                                                      ^
+2 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding+ResultTypes.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+ResultTypes.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding+ResultTypes.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding+ResultTypes.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+ResultTypes.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTCoding+ResultTypes.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTClaimsSetVerifier.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTClaimsSetVerifier.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTClaimsSetVerifier.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTClaimsSetVerifier.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTClaimsSetVerifier.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTClaimsSetVerifier.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTClaimsSetSerializer.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTClaimsSetSerializer.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTClaimsSetSerializer.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTClaimsSetSerializer.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTClaimsSetSerializer.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTClaimsSetSerializer.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTClaimsSet.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTClaimsSet.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTClaimsSet.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTClaimsSet.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTClaimsSet.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTClaimsSet.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTClaim.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTClaim.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTClaim.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTClaim.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTClaim.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTClaim.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTClaim.m:198:3: warning: possible misuse of comma operator here [-Wcomma]
+        }, dictionary);
+         ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTClaim.m:188:39: note: cast expression to void to silence warning
+    return dictionary ? dictionary : (dictionary = @{
+                                      ^~~~~~~~~~~~~~~
+                                      (void)(
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTBase64Coder.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTBase64Coder.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTBase64Coder.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTBase64Coder.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTBase64Coder.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTBase64Coder.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmRSBase.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmRSBase.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmRSBase.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmRSBase.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmRSBase.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmRSBase.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmRSBase.m:173:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (NSData *)encodePayload:(NSString *)theString withSecret:(NSString *)theSecret {
+^
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmRSBase.m:9:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmRSBase.h:10:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTRSAlgorithm.h:7:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithm.h:40:1: note: method 'encodePayload:withSecret:' declared here
+- (NSData *)encodePayload:(NSString *)theString withSecret:(NSString *)theSecret __deprecated_and_will_be_removed_in_release_version(JWTVersion_3_0_0);
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmRSBase.m:179:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (BOOL)verifySignedInput:(NSString *)input withSignature:(NSString *)signature verificationKey:(NSString *)verificationKey {
+^
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmRSBase.m:9:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmRSBase.h:10:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTRSAlgorithm.h:7:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithm.h:49:1: note: method 'verifySignedInput:withSignature:verificationKey:' declared here
+- (BOOL)verifySignedInput:(NSString *)input withSignature:(NSString *)signature verificationKey:(NSString *)verificationKey __deprecated_and_will_be_removed_in_release_version(JWTVersion_3_0_0);
+^
+2 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmNone.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmNone.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmNone.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmNone.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmNone.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmNone.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmNone.m:36:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (NSData *)encodePayload:(NSString *)theString withSecret:(NSString *)theSecret {
+^
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmNone.m:9:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmNone.h:10:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithm.h:40:1: note: method 'encodePayload:withSecret:' declared here
+- (NSData *)encodePayload:(NSString *)theString withSecret:(NSString *)theSecret __deprecated_and_will_be_removed_in_release_version(JWTVersion_3_0_0);
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmNone.m:45:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (BOOL)verifySignedInput:(NSString *)input withSignature:(NSString *)signature verificationKey:(NSString *)verificationKey
+^
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmNone.m:9:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmNone.h:10:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithm.h:49:1: note: method 'verifySignedInput:withSignature:verificationKey:' declared here
+- (BOOL)verifySignedInput:(NSString *)input withSignature:(NSString *)signature verificationKey:(NSString *)verificationKey __deprecated_and_will_be_removed_in_release_version(JWTVersion_3_0_0);
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmNone.m:47:86: warning: incompatible pointer types sending 'NSString *' to parameter of type 'NSData *' [-Wincompatible-pointer-types]
+    return [self verifySignedInput:input withSignature:signature verificationKeyData:verificationKey];
+                                                                                     ^~~~~~~~~~~~~~~
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmNone.m:9:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmNone.h:10:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithm.h:68:111: note: passing argument to parameter 'verificationKeyData' here
+- (BOOL)verifySignedInput:(NSString *)input withSignature:(NSString *)signature verificationKeyData:(NSData *)verificationKeyData;
+                                                                                                              ^
+3 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmHSBase.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmHSBase.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmHSBase.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmHSBase.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmHSBase.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmHSBase.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmHSBase.m:53:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (NSData *)encodePayload:(NSString *)theString withSecret:(NSString *)theSecret;
+^
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmHSBase.m:9:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmHSBase.h:10:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithm.h:40:1: note: method 'encodePayload:withSecret:' declared here
+- (NSData *)encodePayload:(NSString *)theString withSecret:(NSString *)theSecret __deprecated_and_will_be_removed_in_release_version(JWTVersion_3_0_0);
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmHSBase.m:89:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (BOOL)verifySignedInput:(NSString *)input withSignature:(NSString *)signature verificationKey:(NSString *)verificationKey
+^
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmHSBase.m:9:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmHSBase.h:10:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithm.h:49:1: note: method 'verifySignedInput:withSignature:verificationKey:' declared here
+- (BOOL)verifySignedInput:(NSString *)input withSignature:(NSString *)signature verificationKey:(NSString *)verificationKey __deprecated_and_will_be_removed_in_release_version(JWTVersion_3_0_0);
+^
+2 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmFactory.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmFactory.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmFactory.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmFactory.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmFactory.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmFactory.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmESBase.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmESBase.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmESBase.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmESBase.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmESBase.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmESBase.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmESBase.m:31:17: warning: category 'JWTAsymmetricKeysAlgorithm' does not conform to protocol 'JWTAlgorithm' [-Wprotocol]
+@implementation JWTAlgorithmESBase (JWTAsymmetricKeysAlgorithm)
+                ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmESBase.m:31:17: note: add stubs for missing protocol requirements
+@implementation JWTAlgorithmESBase (JWTAsymmetricKeysAlgorithm)
+                ^
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmDataHolderChain.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmDataHolderChain.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmDataHolderChain.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmDataHolderChain.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmDataHolderChain.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmDataHolderChain.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmDataHolder.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmDataHolder.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmDataHolder.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmDataHolder.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmDataHolder.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePushJWTAlgorithmDataHolder.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmDataHolder.m:237:61: warning: incompatible operand types ('id<JWTCryptoKeyProtocol>' and 'NSString *')
+                          @"signKey" : self.internalSignKey ?: @"unknown",
+                                       ~~~~~~~~~~~~~~~~~~~~ ^  ~~~~~~~~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTAlgorithmDataHolder.m:238:65: warning: incompatible operand types ('id<JWTCryptoKeyProtocol>' and 'NSString *')
+                          @"verifyKey" : self.internalVerifyKey ?: @"unknown"
+                                         ~~~~~~~~~~~~~~~~~~~~~~ ^  ~~~~~~~~~~
+2 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePush.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePush.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePush.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePush.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePush.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CodePush.o
+
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePush.m:13:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWT.h:24:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePushJWTCoding+VersionThree.h:41:112: warning: this block declaration is not a prototype [-Wstrict-prototypes]
+@property (copy, nonatomic, readonly) JWTCodingBuilder *(^constructChain)(JWTAlgorithmDataHolderChain *(^block)());
+                                                                                                               ^
+                                                                                                                void
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CodePush.m:185:78: warning: expression which evaluates to zero treated as a null pointer constant of type 'id' [-Wnon-literal-null-conversion]
+        NSString* installModeString = [command argumentAtIndex:1 withDefault:IMMEDIATE andClass:[NSString class]];
+                                                                             ^~~~~~~~~
+2 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CGPDFDocument.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/CGPDFDocument.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CGPDFDocument.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CGPDFDocument.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/CGPDFDocument.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CGPDFDocument.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/CGPDFDocument.m:67:40: warning: possible misuse of comma operator here [-Wcomma]
+                                        CGPDFDocumentRelease(thePDFDocRef), thePDFDocRef = NULL;
+                                                                          ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/CGPDFDocument.m:67:6: note: cast expression to void to silence warning
+                                        CGPDFDocumentRelease(thePDFDocRef), thePDFDocRef = NULL;
+                                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                        (void)(                           )
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/CGPDFDocument.m:121:40: warning: possible misuse of comma operator here [-Wcomma]
+                                        CGPDFDocumentRelease(thePDFDocRef), thePDFDocRef = NULL;
+                                                                          ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/CGPDFDocument.m:121:6: note: cast expression to void to silence warning
+                                        CGPDFDocumentRelease(thePDFDocRef), thePDFDocRef = NULL;
+                                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                                        (void)(                           )
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/CGPDFDocument.m:176:38: warning: possible misuse of comma operator here [-Wcomma]
+                        CGPDFDocumentRelease(thePDFDocRef),thePDFDocRef = NULL; // Cleanup CGPDFDocumentRef
+                                                          ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/CGPDFDocument.m:176:4: note: cast expression to void to silence warning
+                        CGPDFDocumentRelease(thePDFDocRef),thePDFDocRef = NULL; // Cleanup CGPDFDocumentRef
+                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        (void)(                           )
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/CGPDFDocument.m:229:38: warning: possible misuse of comma operator here [-Wcomma]
+                        CGPDFDocumentRelease(thePDFDocRef),thePDFDocRef = NULL; // Cleanup CGPDFDocumentRef
+                                                          ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-document-viewer/CGPDFDocument.m:229:4: note: cast expression to void to silence warning
+                        CGPDFDocumentRelease(thePDFDocRef),thePDFDocRef = NULL; // Cleanup CGPDFDocumentRef
+                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                        (void)(                           )
+4 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKWebViewUIDelegate.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-ionic-webview/CDVWKWebViewUIDelegate.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKWebViewUIDelegate.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKWebViewUIDelegate.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-ionic-webview/CDVWKWebViewUIDelegate.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKWebViewUIDelegate.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKWebViewEngine.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-ionic-webview/CDVWKWebViewEngine.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKWebViewEngine.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKWebViewEngine.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-ionic-webview/CDVWKWebViewEngine.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKWebViewEngine.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKWebViewEngine+CodePush.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CDVWKWebViewEngine+CodePush.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKWebViewEngine+CodePush.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKWebViewEngine+CodePush.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-code-push/CDVWKWebViewEngine+CodePush.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKWebViewEngine+CodePush.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKProcessPoolFactory.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-ionic-webview/CDVWKProcessPoolFactory.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKProcessPoolFactory.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKProcessPoolFactory.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-ionic-webview/CDVWKProcessPoolFactory.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKProcessPoolFactory.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKInAppBrowserUIDelegate.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowserUIDelegate.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKInAppBrowserUIDelegate.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKInAppBrowserUIDelegate.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowserUIDelegate.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKInAppBrowserUIDelegate.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKInAppBrowser.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowser.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKInAppBrowser.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKInAppBrowser.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowser.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVWKInAppBrowser.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowser.m:363:13: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+            _previousStatusBarStyle = -1;
+            ^
+            self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowser.m:389:40: warning: 'openURL:' is deprecated: first deprecated in iOS 10.0 [-Wdeprecated-declarations]
+    [[UIApplication sharedApplication] openURL:url];
+                                       ^~~~~~~
+                                       openURL:options:completionHandler:
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:123:1: note: 'openURL:' has been explicitly marked deprecated here
+- (BOOL)openURL:(NSURL*)url API_DEPRECATED_WITH_REPLACEMENT("openURL:options:completionHandler:", ios(2.0, 10.0)) NS_EXTENSION_UNAVAILABLE_IOS("");
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowser.m:559:15: warning: format string is not a string literal (potentially insecure) [-Wformat-security]
+        NSLog(errorMessage);
+              ^~~~~~~~~~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowser.m:559:15: note: treat the string as an argument to avoid this
+        NSLog(errorMessage);
+              ^
+              @"%@", 
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowser.m:709:48: warning: 'setStatusBarStyle:' is deprecated: first deprecated in iOS 9.0 - Use -[UIViewController preferredStatusBarStyle] [-Wdeprecated-declarations]
+            [[UIApplication sharedApplication] setStatusBarStyle:_previousStatusBarStyle];
+                                               ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:463:50: note: property 'statusBarStyle' is declared deprecated here
+@property(readwrite, nonatomic) UIStatusBarStyle statusBarStyle API_DEPRECATED("Use -[UIViewController preferredStatusBarStyle]", ios(2.0, 9.0)) API_UNAVAILABLE(tvos);
+                                                 ^
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:463:50: note: 'setStatusBarStyle:' has been explicitly marked deprecated here
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowser.m:774:23: warning: 'mediaPlaybackRequiresUserAction' is deprecated: first deprecated in iOS 9.0 [-Wdeprecated-declarations]
+        configuration.mediaPlaybackRequiresUserAction = _browserOptions.mediaplaybackrequiresuseraction;
+                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                      mediaTypesRequiringUserActionForPlayback
+In module 'WebKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowserUIDelegate.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/WebKit.framework/Headers/WKWebViewConfiguration.h:211:28: note: 'mediaPlaybackRequiresUserAction' has been explicitly marked deprecated here
+@property (nonatomic) BOOL mediaPlaybackRequiresUserAction API_DEPRECATED_WITH_REPLACEMENT("mediaTypesRequiringUserActionForPlayback", ios(8.0, 9.0));
+                           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowser.m:795:10: warning: 'automaticallyAdjustsScrollViewInsets' is deprecated: first deprecated in iOS 11.0 - Use UIScrollView's contentInsetAdjustmentBehavior instead [-Wdeprecated-declarations]
+    self.automaticallyAdjustsScrollViewInsets = YES ;
+         ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIViewController.h:252:34: note: 'automaticallyAdjustsScrollViewInsets' has been explicitly marked deprecated here
+@property(nonatomic,assign) BOOL automaticallyAdjustsScrollViewInsets API_DEPRECATED("Use UIScrollView's contentInsetAdjustmentBehavior instead", ios(7.0,11.0),tvos(7.0,11.0)); // Defaults to YES
+                                 ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowser.m:929:90: warning: 'UIBarButtonItemStyleBordered' is deprecated: first deprecated in iOS 8.0 - Use UIBarButtonItemStylePlain when minimum deployment target is iOS7 or later [-Wdeprecated-declarations]
+    self.closeButton = title != nil ? [[UIBarButtonItem alloc] initWithTitle:title style:UIBarButtonItemStyleBordered target:self action:@selector(close)] : [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(close)];
+                                                                                         ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIBarButtonItem.h:22:5: note: 'UIBarButtonItemStyleBordered' has been explicitly marked deprecated here
+    UIBarButtonItemStyleBordered NS_ENUM_DEPRECATED_IOS(2_0, 8_0, "Use UIBarButtonItemStylePlain when minimum deployment target is iOS7 or later"),
+    ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowser.m:1102:13: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+            _userAgentLockToken = lockToken;
+            ^
+            self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowser.m:1103:44: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+            [CDVUserAgentUtil setUserAgent:_userAgent lockToken:lockToken];
+                                           ^
+                                           self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowser.m:1127:44: warning: 'setStatusBarStyle:' is deprecated: first deprecated in iOS 9.0 - Use -[UIViewController preferredStatusBarStyle] [-Wdeprecated-declarations]
+        [[UIApplication sharedApplication] setStatusBarStyle:[self preferredStatusBarStyle]];
+                                           ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:463:50: note: property 'statusBarStyle' is declared deprecated here
+@property(readwrite, nonatomic) UIStatusBarStyle statusBarStyle API_DEPRECATED("Use -[UIViewController preferredStatusBarStyle]", ios(2.0, 9.0)) API_UNAVAILABLE(tvos);
+                                                 ^
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:463:50: note: 'setStatusBarStyle:' has been explicitly marked deprecated here
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowser.m:1269:1: warning: conflicting return type in implementation of 'supportedInterfaceOrientations': 'UIInterfaceOrientationMask' (aka 'enum UIInterfaceOrientationMask') vs 'NSUInteger' (aka 'unsigned long') [-Wmismatched-return-types]
+- (NSUInteger)supportedInterfaceOrientations
+^  ~~~~~~~~~~
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowser.m:20:
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVWKInAppBrowser.h:22:
+/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVScreenOrientationDelegate.h:27:1: note: previous definition is here
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations;
+^  ~~~~~~~~~~~~~~~~~~~~~~~~~~
+11 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVUIInAppBrowser.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVUIInAppBrowser.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVUIInAppBrowser.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVUIInAppBrowser.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVUIInAppBrowser.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVUIInAppBrowser.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVStatusBar.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-statusbar/CDVStatusBar.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVStatusBar.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVStatusBar.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-statusbar/CDVStatusBar.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVStatusBar.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-statusbar/CDVStatusBar.m:271:44: warning: 'setStatusBarStyle:' is deprecated: first deprecated in iOS 9.0 - Use -[UIViewController preferredStatusBarStyle] [-Wdeprecated-declarations]
+        [[UIApplication sharedApplication] setStatusBarStyle:style];
+                                           ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:463:50: note: property 'statusBarStyle' is declared deprecated here
+@property(readwrite, nonatomic) UIStatusBarStyle statusBarStyle API_DEPRECATED("Use -[UIViewController preferredStatusBarStyle]", ios(2.0, 9.0)) API_UNAVAILABLE(tvos);
+                                                 ^
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:463:50: note: 'setStatusBarStyle:' has been explicitly marked deprecated here
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-statusbar/CDVStatusBar.m:267:56: warning: implicit conversion loses integer precision: 'UIStatusBarStyle' (aka 'enum UIStatusBarStyle') to 'int' [-Wshorten-64-to-32]
+        vc.sb_statusBarStyle = [NSNumber numberWithInt:style];
+                               ~                       ^~~~~
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-statusbar/CDVStatusBar.m:358:14: warning: 'setStatusBarHidden:' is deprecated: first deprecated in iOS 9.0 - Use -[UIViewController prefersStatusBarHidden] [-Wdeprecated-declarations]
+        [app setStatusBarHidden:YES];
+             ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:467:63: note: property 'statusBarHidden' is declared deprecated here
+@property(readwrite, nonatomic,getter=isStatusBarHidden) BOOL statusBarHidden API_DEPRECATED("Use -[UIViewController prefersStatusBarHidden]", ios(2.0, 9.0)) API_UNAVAILABLE(tvos);
+                                                              ^
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:467:63: note: 'setStatusBarHidden:' has been explicitly marked deprecated here
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-statusbar/CDVStatusBar.m:389:14: warning: 'setStatusBarHidden:' is deprecated: first deprecated in iOS 9.0 - Use -[UIViewController prefersStatusBarHidden] [-Wdeprecated-declarations]
+        [app setStatusBarHidden:NO];
+             ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:467:63: note: property 'statusBarHidden' is declared deprecated here
+@property(readwrite, nonatomic,getter=isStatusBarHidden) BOOL statusBarHidden API_DEPRECATED("Use -[UIViewController prefersStatusBarHidden]", ios(2.0, 9.0)) API_UNAVAILABLE(tvos);
+                                                              ^
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:467:63: note: 'setStatusBarHidden:' has been explicitly marked deprecated here
+4 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVSound.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-media/CDVSound.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVSound.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVSound.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-media/CDVSound.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVSound.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-media/CDVSound.m:384:21: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                if (avPlayer.currentItem && avPlayer.currentItem.asset) {
+                    ^
+                    self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-media/CDVSound.m:384:45: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                if (avPlayer.currentItem && avPlayer.currentItem.asset) {
+                                            ^
+                                            self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-media/CDVSound.m:385:35: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                    CMTime time = avPlayer.currentItem.asset.duration;
+                                  ^
+                                  self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-media/CDVSound.m:395:26: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                        [avPlayer setRate:customRate];
+                         ^
+                         self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-media/CDVSound.m:398:26: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                        [avPlayer play];
+                         ^
+                         self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-media/CDVSound.m:524:35: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                   if (finished) [avPlayer pause];
+                                  ^
+                                  self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-media/CDVSound.m:593:36: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                   if (isPlaying) [avPlayer play];
+                                   ^
+                                   self->
+7 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVSharedPreferences.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-awesome-shared-preferences/CDVSharedPreferences.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVSharedPreferences.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVSharedPreferences.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-awesome-shared-preferences/CDVSharedPreferences.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVSharedPreferences.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVReachability.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-network-information/CDVReachability.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVReachability.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVReachability.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-network-information/CDVReachability.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVReachability.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVOrientation.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-screen-orientation/CDVOrientation.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVOrientation.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVOrientation.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-screen-orientation/CDVOrientation.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVOrientation.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-screen-orientation/CDVOrientation.m:76:80: warning: implicit conversion loses integer precision: 'UIInterfaceOrientation' (aka 'enum UIInterfaceOrientation') to 'int' [-Wshorten-64-to-32]
+                    [[UIDevice currentDevice] setValue:[NSNumber numberWithInt:_lastOrientation] forKey:@"orientation"];
+                                                       ~                       ^~~~~~~~~~~~~~~~
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVNotification.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-dialogs/CDVNotification.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVNotification.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVNotification.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-dialogs/CDVNotification.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVNotification.o
+
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-dialogs/CDVNotification.m:20:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-dialogs/CDVNotification.h:34:27: warning: 'UIAlertView' is deprecated: first deprecated in iOS 9.0 - UIAlertView is deprecated. Use UIAlertController with a preferredStyle of UIAlertControllerStyleAlert instead [-Wdeprecated-declarations]
+@interface CDVAlertView : UIAlertView {}
+                          ^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-dialogs/CDVNotification.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIAlertView.h:27:12: note: 'UIAlertView' has been explicitly marked deprecated here
+@interface UIAlertView : UIView
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-dialogs/CDVNotification.m:172:20: warning: 'UIAlertView' is deprecated: first deprecated in iOS 9.0 - UIAlertView is deprecated. Use UIAlertController with a preferredStyle of UIAlertControllerStyleAlert instead [-Wdeprecated-declarations]
+- (void)alertView:(UIAlertView*)alertView clickedButtonAtIndex:(NSInteger)buttonIndex
+                   ^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-dialogs/CDVNotification.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIAlertView.h:27:12: note: 'UIAlertView' has been explicitly marked deprecated here
+@interface UIAlertView : UIView
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-dialogs/CDVNotification.m:193:30: warning: 'UIAlertView' is deprecated: first deprecated in iOS 9.0 - UIAlertView is deprecated. Use UIAlertController with a preferredStyle of UIAlertControllerStyleAlert instead [-Wdeprecated-declarations]
+- (void)didPresentAlertView:(UIAlertView*)alertView
+                             ^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-dialogs/CDVNotification.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIAlertView.h:27:12: note: 'UIAlertView' has been explicitly marked deprecated here
+@interface UIAlertView : UIView
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-dialogs/CDVNotification.m:51:55: warning: 'applicationFrame' is deprecated: first deprecated in iOS 9.0 [-Wdeprecated-declarations]
+            CGRect alertFrame = [UIScreen mainScreen].applicationFrame;
+                                                      ^~~~~~~~~~~~~~~~
+                                                      bounds
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-dialogs/CDVNotification.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIScreen.h:83:38: note: 'applicationFrame' has been explicitly marked deprecated here
+@property(nonatomic,readonly) CGRect applicationFrame API_DEPRECATED_WITH_REPLACEMENT("bounds", ios(2.0, 9.0)) API_UNAVAILABLE(tvos);
+                                     ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-dialogs/CDVNotification.m:172:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (void)alertView:(UIAlertView*)alertView clickedButtonAtIndex:(NSInteger)buttonIndex
+^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-dialogs/CDVNotification.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIAlertView.h:71:1: note: method 'alertView:clickedButtonAtIndex:' declared here
+- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex API_DEPRECATED("Use UIAlertController instead.", ios(2.0, 9.0));
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-dialogs/CDVNotification.m:193:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (void)didPresentAlertView:(UIAlertView*)alertView
+^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-dialogs/CDVNotification.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIAlertView.h:78:1: note: method 'didPresentAlertView:' declared here
+- (void)didPresentAlertView:(UIAlertView *)alertView API_DEPRECATED("Use UIAlertController instead.", ios(2.0, 9.0));  // after animation
+^
+6 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVLocalFilesystem.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVLocalFilesystem.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVLocalFilesystem.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVLocalFilesystem.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVLocalFilesystem.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVLocalFilesystem.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVLocalFilesystem.m:128:43: warning: 'stringByAddingPercentEscapesUsingEncoding:' is deprecated: first deprecated in iOS 9.0 - Use -stringByAddingPercentEncodingWithAllowedCharacters: instead, which always uses the recommended UTF-8 encoding, and which encodes for a specific URL component or subcomponent since each URL component or subcomponent has different rules for what characters are valid. [-Wdeprecated-declarations]
+        NSString* escapedPath = [fullPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+                                          ^
+In module 'Foundation' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVFile.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSURL.h:595:1: note: 'stringByAddingPercentEscapesUsingEncoding:' has been explicitly marked deprecated here
+- (nullable NSString *)stringByAddingPercentEscapesUsingEncoding:(NSStringEncoding)enc API_DEPRECATED("Use -stringByAddingPercentEncodingWithAllowedCharacters: instead, which always uses the recommended UTF-8 encoding, and which encodes for a specific URL component or subcomponent since each URL component or subcomponent has different rules for what characters are valid.", macos(10.0,10.11), ios(2.0,9.0), watchos(2.0,2.0), tvos(9.0,9.0));
+^
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVJpegHeaderWriter.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVJpegHeaderWriter.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVJpegHeaderWriter.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVJpegHeaderWriter.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVJpegHeaderWriter.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVJpegHeaderWriter.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVIonicKeyboard.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-ionic-keyboard/CDVIonicKeyboard.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVIonicKeyboard.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVIonicKeyboard.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-ionic-keyboard/CDVIonicKeyboard.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVIonicKeyboard.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVInAppBrowserOptions.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVInAppBrowserOptions.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVInAppBrowserOptions.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVInAppBrowserOptions.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVInAppBrowserOptions.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVInAppBrowserOptions.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVInAppBrowserNavigationController.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVInAppBrowserNavigationController.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVInAppBrowserNavigationController.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVInAppBrowserNavigationController.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVInAppBrowserNavigationController.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVInAppBrowserNavigationController.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVInAppBrowserNavigationController.m:75:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+^
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Sunbird-Prefix.pch:25:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIViewController.h:301:1: note: method 'shouldAutorotateToInterfaceOrientation:' declared here
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation API_DEPRECATED("", ios(2.0, 6.0)) API_UNAVAILABLE(tvos);
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVInAppBrowserNavigationController.m:66:1: warning: conflicting return type in implementation of 'supportedInterfaceOrientations': 'UIInterfaceOrientationMask' (aka 'enum UIInterfaceOrientationMask') vs 'NSUInteger' (aka 'unsigned long') [-Wmismatched-return-types]
+- (NSUInteger)supportedInterfaceOrientations
+^  ~~~~~~~~~~
+In module 'UIKit' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Sunbird-Prefix.pch:25:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIViewController.h:305:59: note: previous definition is here
+@property(nonatomic, readonly) UIInterfaceOrientationMask supportedInterfaceOrientations API_AVAILABLE(ios(6.0)) API_UNAVAILABLE(tvos);
+                                                          ^
+2 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVInAppBrowser.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVInAppBrowser.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVInAppBrowser.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVInAppBrowser.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-inappbrowser/CDVInAppBrowser.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVInAppBrowser.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVFileTransfer.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file-transfer/CDVFileTransfer.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVFileTransfer.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVFileTransfer.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file-transfer/CDVFileTransfer.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVFileTransfer.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file-transfer/CDVFileTransfer.m:98:36: warning: 'stringByAddingPercentEscapesUsingEncoding:' is deprecated: first deprecated in iOS 9.0 - Use -stringByAddingPercentEncodingWithAllowedCharacters: instead, which always uses the recommended UTF-8 encoding, and which encodes for a specific URL component or subcomponent since each URL component or subcomponent has different rules for what characters are valid. [-Wdeprecated-declarations]
+    pathComponent = [pathComponent stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+                                   ^
+In module 'Foundation' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAppDelegate.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSURL.h:595:1: note: 'stringByAddingPercentEscapesUsingEncoding:' has been explicitly marked deprecated here
+- (nullable NSString *)stringByAddingPercentEscapesUsingEncoding:(NSStringEncoding)enc API_DEPRECATED("Use -stringByAddingPercentEncodingWithAllowedCharacters: instead, which always uses the recommended UTF-8 encoding, and which encodes for a specific URL component or subcomponent since each URL component or subcomponent has different rules for what characters are valid.", macos(10.0,10.11), ios(2.0,9.0), watchos(2.0,2.0), tvos(9.0,9.0));
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file-transfer/CDVFileTransfer.m:390:52: warning: 'initWithRequest:delegate:startImmediately:' is deprecated: first deprecated in iOS 9.0 - Use NSURLSession (see NSURLSession.h) [-Wdeprecated-declarations]
+    delegate.connection = [[NSURLConnection alloc] initWithRequest:req delegate:delegate startImmediately:NO];
+                                                   ^
+In module 'Foundation' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAppDelegate.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSURLConnection.h:115:1: note: 'initWithRequest:delegate:startImmediately:' has been explicitly marked deprecated here
+- (nullable instancetype)initWithRequest:(NSURLRequest *)request delegate:(nullable id)delegate startImmediately:(BOOL)startImmediately API_DEPRECATED("Use NSURLSession (see NSURLSession.h)", macos(10.5,10.11), ios(2.0,9.0), tvos(9.0,9.0)) API_UNAVAILABLE(watchos);
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file-transfer/CDVFileTransfer.m:491:52: warning: 'initWithRequest:delegate:startImmediately:' is deprecated: first deprecated in iOS 9.0 - Use NSURLSession (see NSURLSession.h) [-Wdeprecated-declarations]
+    delegate.connection = [[NSURLConnection alloc] initWithRequest:req delegate:delegate startImmediately:NO];
+                                                   ^
+In module 'Foundation' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAppDelegate.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSURLConnection.h:115:1: note: 'initWithRequest:delegate:startImmediately:' has been explicitly marked deprecated here
+- (nullable instancetype)initWithRequest:(NSURLRequest *)request delegate:(nullable id)delegate startImmediately:(BOOL)startImmediately API_DEPRECATED("Use NSURLSession (see NSURLSession.h)", macos(10.5,10.11), ios(2.0,9.0), tvos(9.0,9.0)) API_UNAVAILABLE(watchos);
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file-transfer/CDVFileTransfer.m:581:40: warning: 'connectionWithRequest:delegate:' is deprecated: first deprecated in iOS 9.0 - Use NSURLSession (see NSURLSession.h) [-Wdeprecated-declarations]
+        _connection = [NSURLConnection connectionWithRequest:req delegate:self];
+                                       ^
+In module 'Foundation' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAppDelegate.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSURLConnection.h:118:1: note: 'connectionWithRequest:delegate:' has been explicitly marked deprecated here
++ (nullable NSURLConnection*)connectionWithRequest:(NSURLRequest *)request delegate:(nullable id)delegate API_DEPRECATED("Use NSURLSession (see NSURLSession.h)", macos(10.3,10.11), ios(2.0,9.0), tvos(9.0,9.0)) API_UNAVAILABLE(watchos);
+^
+4 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVFile.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVFile.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVFile.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVFile.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVFile.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVFile.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVFile.m:589:35: warning: 'stringByReplacingPercentEscapesUsingEncoding:' is deprecated: first deprecated in iOS 9.0 - Use -stringByRemovingPercentEncoding instead, which always uses the recommended UTF-8 encoding. [-Wdeprecated-declarations]
+    NSString *decodedPath = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; //decode incase it's already encoded to avoid encoding twice
+                                  ^
+In module 'Foundation' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAppDelegate.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSURL.h:596:1: note: 'stringByReplacingPercentEscapesUsingEncoding:' has been explicitly marked deprecated here
+- (nullable NSString *)stringByReplacingPercentEscapesUsingEncoding:(NSStringEncoding)enc API_DEPRECATED("Use -stringByRemovingPercentEncoding instead, which always uses the recommended UTF-8 encoding.", macos(10.0,10.11), ios(2.0,9.0), watchos(2.0,2.0), tvos(9.0,9.0));
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVFile.m:590:25: warning: 'stringByAddingPercentEscapesUsingEncoding:' is deprecated: first deprecated in iOS 9.0 - Use -stringByAddingPercentEncodingWithAllowedCharacters: instead, which always uses the recommended UTF-8 encoding, and which encodes for a specific URL component or subcomponent since each URL component or subcomponent has different rules for what characters are valid. [-Wdeprecated-declarations]
+    return [decodedPath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+                        ^
+In module 'Foundation' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVAppDelegate.h:20:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSURL.h:595:1: note: 'stringByAddingPercentEscapesUsingEncoding:' has been explicitly marked deprecated here
+- (nullable NSString *)stringByAddingPercentEscapesUsingEncoding:(NSStringEncoding)enc API_DEPRECATED("Use -stringByAddingPercentEncodingWithAllowedCharacters: instead, which always uses the recommended UTF-8 encoding, and which encodes for a specific URL component or subcomponent since each URL component or subcomponent has different rules for what characters are valid.", macos(10.0,10.11), ios(2.0,9.0), watchos(2.0,2.0), tvos(9.0,9.0));
+^
+2 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVDevice.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-device/CDVDevice.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVDevice.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVDevice.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-device/CDVDevice.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVDevice.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVConnection.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-network-information/CDVConnection.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVConnection.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVConnection.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-network-information/CDVConnection.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVConnection.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVCamera.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVCamera.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVCamera.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVCamera.o
+
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:20:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.h:73:20: warning: 'UIPopoverController' is deprecated: first deprecated in iOS 9.0 - UIPopoverController is deprecated. Popovers are now implemented as UIViewController presentations. Use a modal presentation style of UIModalPresentationPopover and UIPopoverPresentationController. [-Wdeprecated-declarations]
+@property (strong) UIPopoverController* pickerPopoverController;
+                   ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIPopoverController.h:26:12: note: 'UIPopoverController' has been explicitly marked deprecated here
+@interface UIPopoverController : NSObject <UIAppearanceContainer> {}
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:171:65: warning: 'openURL:' is deprecated: first deprecated in iOS 10.0 [-Wdeprecated-declarations]
+                             [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+                                                                ^~~~~~~
+                                                                openURL:options:completionHandler:
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIApplication.h:123:1: note: 'openURL:' has been explicitly marked deprecated here
+- (BOOL)openURL:(NSURL*)url API_DEPRECATED_WITH_REPLACEMENT("openURL:options:completionHandler:", ios(2.0, 10.0)) NS_EXTENSION_UNAVAILABLE_IOS("");
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:338:1: warning: implementing deprecated method [-Wdeprecated-implementations]
+- (void)popoverControllerDidDismissPopover:(id)popoverController
+^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIPopoverController.h:91:1: note: method 'popoverControllerDidDismissPopover:' declared here
+- (void)popoverControllerDidDismissPopover:(UIPopoverController *)popoverController API_DEPRECATED("", ios(3.2, 9.0));
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:340:5: warning: 'UIPopoverController' is deprecated: first deprecated in iOS 9.0 - UIPopoverController is deprecated. Popovers are now implemented as UIViewController presentations. Use a modal presentation style of UIModalPresentationPopover and UIPopoverPresentationController. [-Wdeprecated-declarations]
+    UIPopoverController* pc = (UIPopoverController*)popoverController;
+    ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIPopoverController.h:26:12: note: 'UIPopoverController' has been explicitly marked deprecated here
+@interface UIPopoverController : NSObject <UIAppearanceContainer> {}
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:340:32: warning: 'UIPopoverController' is deprecated: first deprecated in iOS 9.0 - UIPopoverController is deprecated. Popovers are now implemented as UIViewController presentations. Use a modal presentation style of UIModalPresentationPopover and UIPopoverPresentationController. [-Wdeprecated-declarations]
+    UIPopoverController* pc = (UIPopoverController*)popoverController;
+                               ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIPopoverController.h:26:12: note: 'UIPopoverController' has been explicitly marked deprecated here
+@interface UIPopoverController : NSObject <UIAppearanceContainer> {}
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:448:45: warning: 'UIImagePickerControllerReferenceURL' is deprecated: first deprecated in iOS 11.0 - Will be removed in a future release, use PHPicker. [-Wdeprecated-declarations]
+            NSURL* url = [info objectForKey:UIImagePickerControllerReferenceURL];
+                                            ^
+In module 'UIKit' imported from /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include/Cordova/CDVPlugin.h:21:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/UIKit.framework/Headers/UIImagePickerController.h:62:51: note: 'UIImagePickerControllerReferenceURL' has been explicitly marked deprecated here
+UIKIT_EXTERN UIImagePickerControllerInfoKey const UIImagePickerControllerReferenceURL API_DEPRECATED("Will be removed in a future release, use PHPicker.", ios(4.1, 11.0)) API_UNAVAILABLE(tvos); // an NSURL that references an asset in the AssetsLibrary framework
+                                                  ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:454:17: warning: 'ALAssetsLibrary' is deprecated: first deprecated in iOS 9 - Use PHPhotoLibrary from the Photos framework instead [-Wdeprecated-declarations]
+                ALAssetsLibrary* library = [ALAssetsLibrary new];
+                ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:24:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:78:12: note: 'ALAssetsLibrary' has been explicitly marked deprecated here
+@interface ALAssetsLibrary : NSObject {
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:454:61: warning: 'ALAssetsLibrary' is deprecated: first deprecated in iOS 9 - Use PHPhotoLibrary from the Photos framework instead [-Wdeprecated-declarations]
+                ALAssetsLibrary* library = [ALAssetsLibrary new];
+                                                            ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:24:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:78:12: note: 'ALAssetsLibrary' has been explicitly marked deprecated here
+@interface ALAssetsLibrary : NSObject {
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:455:82: warning: 'ALAssetOrientation' is deprecated: first deprecated in iOS 9 - Use UIImageOrientation in the Photos framework instead [-Wdeprecated-declarations]
+                [library writeImageToSavedPhotosAlbum:image.CGImage orientation:(ALAssetOrientation)(image.imageOrientation) completionBlock:^(NSURL *assetURL, NSError *error) {
+                                                                                 ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:24:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:23:28: note: 'ALAssetOrientation' has been explicitly marked deprecated here
+typedef NS_ENUM(NSInteger, ALAssetOrientation) {
+                           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:455:26: warning: 'writeImageToSavedPhotosAlbum:orientation:completionBlock:' is deprecated: first deprecated in iOS 9 - Use creationRequestForAssetFromImage: on PHAssetChangeRequest from the Photos framework to create a new asset instead [-Wdeprecated-declarations]
+                [library writeImageToSavedPhotosAlbum:image.CGImage orientation:(ALAssetOrientation)(image.imageOrientation) completionBlock:^(NSURL *assetURL, NSError *error) {
+                         ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:24:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:110:1: note: 'writeImageToSavedPhotosAlbum:orientation:completionBlock:' has been explicitly marked deprecated here
+- (void)writeImageToSavedPhotosAlbum:(CGImageRef)imageRef orientation:(ALAssetOrientation)orientation completionBlock:(ALAssetsLibraryWriteImageCompletionBlock)completionBlock AL_DEPRECATED(4, "Use creationRequestForAssetFromImage: on PHAssetChangeRequest from the Photos framework to create a new asset instead");
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:505:9: warning: 'ALAssetsLibrary' is deprecated: first deprecated in iOS 9 - Use PHPhotoLibrary from the Photos framework instead [-Wdeprecated-declarations]
+        ALAssetsLibrary* library = [ALAssetsLibrary new];
+        ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:24:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:78:12: note: 'ALAssetsLibrary' has been explicitly marked deprecated here
+@interface ALAssetsLibrary : NSObject {
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:505:53: warning: 'ALAssetsLibrary' is deprecated: first deprecated in iOS 9 - Use PHPhotoLibrary from the Photos framework instead [-Wdeprecated-declarations]
+        ALAssetsLibrary* library = [ALAssetsLibrary new];
+                                                    ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:24:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:78:12: note: 'ALAssetsLibrary' has been explicitly marked deprecated here
+@interface ALAssetsLibrary : NSObject {
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:506:74: warning: 'ALAssetOrientation' is deprecated: first deprecated in iOS 9 - Use UIImageOrientation in the Photos framework instead [-Wdeprecated-declarations]
+        [library writeImageToSavedPhotosAlbum:image.CGImage orientation:(ALAssetOrientation)(image.imageOrientation) completionBlock:nil];
+                                                                         ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:24:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:23:28: note: 'ALAssetOrientation' has been explicitly marked deprecated here
+typedef NS_ENUM(NSInteger, ALAssetOrientation) {
+                           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:506:18: warning: 'writeImageToSavedPhotosAlbum:orientation:completionBlock:' is deprecated: first deprecated in iOS 9 - Use creationRequestForAssetFromImage: on PHAssetChangeRequest from the Photos framework to create a new asset instead [-Wdeprecated-declarations]
+        [library writeImageToSavedPhotosAlbum:image.CGImage orientation:(ALAssetOrientation)(image.imageOrientation) completionBlock:nil];
+                 ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:24:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:110:1: note: 'writeImageToSavedPhotosAlbum:orientation:completionBlock:' has been explicitly marked deprecated here
+- (void)writeImageToSavedPhotosAlbum:(CGImageRef)imageRef orientation:(ALAssetOrientation)orientation completionBlock:(ALAssetsLibraryWriteImageCompletionBlock)completionBlock AL_DEPRECATED(4, "Use creationRequestForAssetFromImage: on PHAssetChangeRequest from the Photos framework to create a new asset instead");
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:569:147: warning: 'ALAuthorizationStatusAuthorized' is deprecated: first deprecated in iOS 9 - Use PHAuthorizationStatus in the Photos framework instead [-Wdeprecated-declarations]
+        if (picker.sourceType == UIImagePickerControllerSourceTypeCamera && [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo] != ALAuthorizationStatusAuthorized) {
+                                                                                                                                                  ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:24:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:51:5: note: 'ALAuthorizationStatusAuthorized' has been explicitly marked deprecated here
+    ALAuthorizationStatusAuthorized AL_DEPRECATED(6, "Use PHAuthorizationStatus in the Photos framework instead")         // User has authorized this application to access photos data.
+    ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:571:135: warning: 'ALAssetsLibrary' is deprecated: first deprecated in iOS 9 - Use PHPhotoLibrary from the Photos framework instead [-Wdeprecated-declarations]
+        } else if (picker.sourceType != UIImagePickerControllerSourceTypeCamera && ! IsAtLeastiOSVersion(@"11.0") && [ALAssetsLibrary authorizationStatus] != ALAuthorizationStatusAuthorized) {
+                                                                                                                                      ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:24:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:78:12: note: 'ALAssetsLibrary' has been explicitly marked deprecated here
+@interface ALAssetsLibrary : NSObject {
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:571:135: warning: 'authorizationStatus' is deprecated: first deprecated in iOS 9 - Use authorizationStatus on the shared PHPhotoLibrary from the Photos framework instead [-Wdeprecated-declarations]
+        } else if (picker.sourceType != UIImagePickerControllerSourceTypeCamera && ! IsAtLeastiOSVersion(@"11.0") && [ALAssetsLibrary authorizationStatus] != ALAuthorizationStatusAuthorized) {
+                                                                                                                                      ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:24:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:122:1: note: 'authorizationStatus' has been explicitly marked deprecated here
++ (ALAuthorizationStatus)authorizationStatus AL_DEPRECATED(6, "Use authorizationStatus on the shared PHPhotoLibrary from the Photos framework instead");
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:571:159: warning: 'ALAuthorizationStatusAuthorized' is deprecated: first deprecated in iOS 9 - Use PHAuthorizationStatus in the Photos framework instead [-Wdeprecated-declarations]
+        } else if (picker.sourceType != UIImagePickerControllerSourceTypeCamera && ! IsAtLeastiOSVersion(@"11.0") && [ALAssetsLibrary authorizationStatus] != ALAuthorizationStatusAuthorized) {
+                                                                                                                                                              ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:24:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:51:5: note: 'ALAuthorizationStatusAuthorized' has been explicitly marked deprecated here
+    ALAuthorizationStatusAuthorized AL_DEPRECATED(6, "Use PHAuthorizationStatus in the Photos framework instead")         // User has authorized this application to access photos data.
+    ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:722:9: warning: 'ALAssetsLibrary' is deprecated: first deprecated in iOS 9 - Use PHPhotoLibrary from the Photos framework instead [-Wdeprecated-declarations]
+        ALAssetsLibrary *library = [ALAssetsLibrary new];
+        ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:24:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:78:12: note: 'ALAssetsLibrary' has been explicitly marked deprecated here
+@interface ALAssetsLibrary : NSObject {
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:722:53: warning: 'ALAssetsLibrary' is deprecated: first deprecated in iOS 9 - Use PHPhotoLibrary from the Photos framework instead [-Wdeprecated-declarations]
+        ALAssetsLibrary *library = [ALAssetsLibrary new];
+                                                    ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:24:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:78:12: note: 'ALAssetsLibrary' has been explicitly marked deprecated here
+@interface ALAssetsLibrary : NSObject {
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:723:18: warning: 'writeImageDataToSavedPhotosAlbum:metadata:completionBlock:' is deprecated: first deprecated in iOS 9 - Use creationRequestForAssetFromImageData: on PHAssetChangeRequest from the Photos framework to create a new asset instead [-Wdeprecated-declarations]
+        [library writeImageDataToSavedPhotosAlbum:self.data metadata:self.metadata completionBlock:nil];
+                 ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-camera/CDVCamera.m:24:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:116:1: note: 'writeImageDataToSavedPhotosAlbum:metadata:completionBlock:' has been explicitly marked deprecated here
+- (void)writeImageDataToSavedPhotosAlbum:(NSData *)imageData metadata:(NSDictionary *)metadata completionBlock:(ALAssetsLibraryWriteImageCompletionBlock)completionBlock AL_DEPRECATED(4.1, "Use creationRequestForAssetFromImageData: on PHAssetChangeRequest from the Photos framework to create a new asset instead");
+^
+21 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVAssetLibraryFilesystem.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVAssetLibraryFilesystem.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVAssetLibraryFilesystem.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/CDVAssetLibraryFilesystem.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:193:5: warning: 'ALAssetsLibraryAssetForURLResultBlock' is deprecated: first deprecated in iOS 9 - Use fetchAssetsWithLocalIdentifiers:options: on PHAsset to fetch assets by local identifier (or to lookup PHAssets by a previously known ALAssetPropertyAssetURL use fetchAssetsWithALAssetURLs:options:) from the Photos framework instead [-Wdeprecated-declarations]
+    ALAssetsLibraryAssetForURLResultBlock resultBlock = ^(ALAsset* asset) {
+    ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:62:16: note: 'ALAssetsLibraryAssetForURLResultBlock' has been explicitly marked deprecated here
+typedef void (^ALAssetsLibraryAssetForURLResultBlock)(ALAsset *asset) AL_DEPRECATED(4, "Use fetchAssetsWithLocalIdentifiers:options: on PHAsset to fetch assets by local identifier (or to lookup PHAssets by a previously known ALAssetPropertyAssetURL use fetchAssetsWithALAssetURLs:options:) from the Photos framework instead");
+               ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:196:65: warning: 'defaultRepresentation' is deprecated: first deprecated in iOS 9 - Use PHImageRequestOptions with the PHImageManager from the Photos framework instead [-Wdeprecated-declarations]
+            ALAssetRepresentation* assetRepresentation = [asset defaultRepresentation];
+                                                                ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAsset.h:49:1: note: 'defaultRepresentation' has been explicitly marked deprecated here
+- (ALAssetRepresentation *)defaultRepresentation AL_DEPRECATED(4, "Use PHImageRequestOptions with the PHImageManager from the Photos framework instead");
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:197:84: warning: 'size' is deprecated: first deprecated in iOS 9 - Use requestImageDataForAsset:options:resultHandler: on PHImageManager to request image data for a PHAsset from the Photos framework instead [-Wdeprecated-declarations]
+            NSUInteger size = (end > start) ? (end - start) : [assetRepresentation size];
+                                                                                   ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetRepresentation.h:32:1: note: 'size' has been explicitly marked deprecated here
+- (long long)size AL_DEPRECATED(4, "Use requestImageDataForAsset:options:resultHandler: on PHImageManager to request image data for a PHAsset from the Photos framework instead");
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:199:58: warning: 'getBytes:fromOffset:length:error:' is deprecated: first deprecated in iOS 9 - Use requestImageDataForAsset:options:resultHandler: on PHImageManager to request image data for a PHAsset from the Photos framework instead [-Wdeprecated-declarations]
+            NSUInteger bufferSize = [assetRepresentation getBytes:buffer fromOffset:start length:size error:nil];
+                                                         ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetRepresentation.h:38:1: note: 'getBytes:fromOffset:length:error:' has been explicitly marked deprecated here
+- (NSUInteger)getBytes:(uint8_t *)buffer fromOffset:(long long)offset length:(NSUInteger)length error:(NSError **)error AL_DEPRECATED(4, "Use requestImageDataForAsset:options:resultHandler: on PHImageManager to request image data for a PHAsset from the Photos framework instead");
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:201:138: warning: 'UTI' is deprecated: first deprecated in iOS 9 - Use requestImageDataForAsset:options:resultHandler: on PHImageManager for a PHAsset to request image data from the Photos framework and check the dataUTI passed to your result handler instead [-Wdeprecated-declarations]
+            NSString* MIMEType = (__bridge_transfer NSString*)UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)[assetRepresentation UTI], kUTTagClassMIMEType);
+                                                                                                                                         ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetRepresentation.h:26:1: note: 'UTI' has been explicitly marked deprecated here
+- (NSString *)UTI AL_DEPRECATED(4, "Use requestImageDataForAsset:options:resultHandler: on PHImageManager for a PHAsset to request image data from the Photos framework and check the dataUTI passed to your result handler instead");
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:193:59: warning: 'ALAsset' is deprecated: first deprecated in iOS 9 - Use PHAsset from the Photos framework instead [-Wdeprecated-declarations]
+    ALAssetsLibraryAssetForURLResultBlock resultBlock = ^(ALAsset* asset) {
+                                                          ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAsset.h:40:12: note: 'ALAsset' has been explicitly marked deprecated here
+@interface ALAsset : NSObject {
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:196:13: warning: 'ALAssetRepresentation' is deprecated: first deprecated in iOS 9 - Use PHImageRequestOptions with the PHImageManager from the Photos framework instead [-Wdeprecated-declarations]
+            ALAssetRepresentation* assetRepresentation = [asset defaultRepresentation];
+            ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetRepresentation.h:20:12: note: 'ALAssetRepresentation' has been explicitly marked deprecated here
+@interface ALAssetRepresentation : NSObject {
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:209:5: warning: 'ALAssetsLibraryAccessFailureBlock' is deprecated: first deprecated in iOS 9 - Use the Photos framework instead [-Wdeprecated-declarations]
+    ALAssetsLibraryAccessFailureBlock failureBlock = ^(NSError* error) {
+    ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:69:16: note: 'ALAssetsLibraryAccessFailureBlock' has been explicitly marked deprecated here
+typedef void (^ALAssetsLibraryAccessFailureBlock)(NSError *error) AL_DEPRECATED(4, "Use the Photos framework instead");
+               ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:215:5: warning: 'ALAssetsLibrary' is deprecated: first deprecated in iOS 9 - Use PHPhotoLibrary from the Photos framework instead [-Wdeprecated-declarations]
+    ALAssetsLibrary* assetsLibrary = [[ALAssetsLibrary alloc] init];
+    ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:78:12: note: 'ALAssetsLibrary' has been explicitly marked deprecated here
+@interface ALAssetsLibrary : NSObject {
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:215:56: warning: 'ALAssetsLibrary' is deprecated: first deprecated in iOS 9 - Use PHPhotoLibrary from the Photos framework instead [-Wdeprecated-declarations]
+    ALAssetsLibrary* assetsLibrary = [[ALAssetsLibrary alloc] init];
+                                                       ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:78:12: note: 'ALAssetsLibrary' has been explicitly marked deprecated here
+@interface ALAssetsLibrary : NSObject {
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:216:20: warning: 'assetForURL:resultBlock:failureBlock:' is deprecated: first deprecated in iOS 9 - Use fetchAssetsWithLocalIdentifiers:options: on PHAsset to fetch assets by local identifier (or to lookup PHAssets by a previously known ALAssetPropertyAssetURL use fetchAssetsWithALAssetURLs:options:) from the Photos framework instead [-Wdeprecated-declarations]
+    [assetsLibrary assetForURL:[self assetLibraryURLForLocalURL:localURL] resultBlock:resultBlock failureBlock:failureBlock];
+                   ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:93:1: note: 'assetForURL:resultBlock:failureBlock:' has been explicitly marked deprecated here
+- (void)assetForURL:(NSURL *)assetURL resultBlock:(ALAssetsLibraryAssetForURLResultBlock)resultBlock failureBlock:(ALAssetsLibraryAccessFailureBlock)failureBlock AL_DEPRECATED(4, "Use fetchAssetsWithLocalIdentifiers:options: on PHAsset to fetch assets by local identifier (or to lookup PHAssets by a previously known ALAssetPropertyAssetURL use fetchAssetsWithALAssetURLs:options:) from the Photos framework instead");
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:224:5: warning: 'ALAssetsLibraryAssetForURLResultBlock' is deprecated: first deprecated in iOS 9 - Use fetchAssetsWithLocalIdentifiers:options: on PHAsset to fetch assets by local identifier (or to lookup PHAssets by a previously known ALAssetPropertyAssetURL use fetchAssetsWithALAssetURLs:options:) from the Photos framework instead [-Wdeprecated-declarations]
+    ALAssetsLibraryAssetForURLResultBlock resultBlock = ^(ALAsset* asset) {
+    ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:62:16: note: 'ALAssetsLibraryAssetForURLResultBlock' has been explicitly marked deprecated here
+typedef void (^ALAssetsLibraryAssetForURLResultBlock)(ALAsset *asset) AL_DEPRECATED(4, "Use fetchAssetsWithLocalIdentifiers:options: on PHAsset to fetch assets by local identifier (or to lookup PHAssets by a previously known ALAssetPropertyAssetURL use fetchAssetsWithALAssetURLs:options:) from the Photos framework instead");
+               ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:228:65: warning: 'defaultRepresentation' is deprecated: first deprecated in iOS 9 - Use PHImageRequestOptions with the PHImageManager from the Photos framework instead [-Wdeprecated-declarations]
+            ALAssetRepresentation* assetRepresentation = [asset defaultRepresentation];
+                                                                ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAsset.h:49:1: note: 'defaultRepresentation' has been explicitly marked deprecated here
+- (ALAssetRepresentation *)defaultRepresentation AL_DEPRECATED(4, "Use PHImageRequestOptions with the PHImageManager from the Photos framework instead");
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:231:55: warning: 'filename' is deprecated: first deprecated in iOS 9 - Use the Photos framework instead [-Wdeprecated-declarations]
+            NSString* filename = [assetRepresentation filename];
+                                                      ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetRepresentation.h:66:1: note: 'filename' has been explicitly marked deprecated here
+- (NSString *)filename AL_DEPRECATED(5, "Use the Photos framework instead");
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:234:60: warning: 'ALAssetPropertyDate' is deprecated: first deprecated in iOS 9 - Use the creationDate property on a PHAsset from the Photos framework instead [-Wdeprecated-declarations]
+            NSDate* creationDate = [asset valueForProperty:ALAssetPropertyDate];
+                                                           ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAsset.h:25:24: note: 'ALAssetPropertyDate' has been explicitly marked deprecated here
+extern NSString *const ALAssetPropertyDate AL_DEPRECATED(4, "Use the creationDate property on a PHAsset from the Photos framework instead");             // An NSDate with the asset's creation date.
+                       ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:234:43: warning: 'valueForProperty:' is deprecated: first deprecated in iOS 9 - Use PHAsset class properties from the Photos framework instead [-Wdeprecated-declarations]
+            NSDate* creationDate = [asset valueForProperty:ALAssetPropertyDate];
+                                          ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAsset.h:46:1: note: 'valueForProperty:' has been explicitly marked deprecated here
+- (id)valueForProperty:(NSString *)property AL_DEPRECATED(4, "Use PHAsset class properties from the Photos framework instead");
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:224:59: warning: 'ALAsset' is deprecated: first deprecated in iOS 9 - Use PHAsset from the Photos framework instead [-Wdeprecated-declarations]
+    ALAssetsLibraryAssetForURLResultBlock resultBlock = ^(ALAsset* asset) {
+                                                          ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAsset.h:40:12: note: 'ALAsset' has been explicitly marked deprecated here
+@interface ALAsset : NSObject {
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:228:13: warning: 'ALAssetRepresentation' is deprecated: first deprecated in iOS 9 - Use PHImageRequestOptions with the PHImageManager from the Photos framework instead [-Wdeprecated-declarations]
+            ALAssetRepresentation* assetRepresentation = [asset defaultRepresentation];
+            ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetRepresentation.h:20:12: note: 'ALAssetRepresentation' has been explicitly marked deprecated here
+@interface ALAssetRepresentation : NSObject {
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:229:91: warning: 'size' is deprecated: first deprecated in iOS 9 - Use requestImageDataForAsset:options:resultHandler: on PHImageManager to request image data for a PHAsset from the Photos framework instead [-Wdeprecated-declarations]
+            [fileInfo setObject:[NSNumber numberWithUnsignedLongLong:[assetRepresentation size]] forKey:@"size"];
+                                                                                          ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetRepresentation.h:32:1: note: 'size' has been explicitly marked deprecated here
+- (long long)size AL_DEPRECATED(4, "Use requestImageDataForAsset:options:resultHandler: on PHImageManager to request image data for a PHAsset from the Photos framework instead");
+^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:244:5: warning: 'ALAssetsLibraryAccessFailureBlock' is deprecated: first deprecated in iOS 9 - Use the Photos framework instead [-Wdeprecated-declarations]
+    ALAssetsLibraryAccessFailureBlock failureBlock = ^(NSError* error) {
+    ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:69:16: note: 'ALAssetsLibraryAccessFailureBlock' has been explicitly marked deprecated here
+typedef void (^ALAssetsLibraryAccessFailureBlock)(NSError *error) AL_DEPRECATED(4, "Use the Photos framework instead");
+               ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:249:5: warning: 'ALAssetsLibrary' is deprecated: first deprecated in iOS 9 - Use PHPhotoLibrary from the Photos framework instead [-Wdeprecated-declarations]
+    ALAssetsLibrary* assetsLibrary = [[ALAssetsLibrary alloc] init];
+    ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:78:12: note: 'ALAssetsLibrary' has been explicitly marked deprecated here
+@interface ALAssetsLibrary : NSObject {
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:249:56: warning: 'ALAssetsLibrary' is deprecated: first deprecated in iOS 9 - Use PHPhotoLibrary from the Photos framework instead [-Wdeprecated-declarations]
+    ALAssetsLibrary* assetsLibrary = [[ALAssetsLibrary alloc] init];
+                                                       ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:78:12: note: 'ALAssetsLibrary' has been explicitly marked deprecated here
+@interface ALAssetsLibrary : NSObject {
+           ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:250:20: warning: 'assetForURL:resultBlock:failureBlock:' is deprecated: first deprecated in iOS 9 - Use fetchAssetsWithLocalIdentifiers:options: on PHAsset to fetch assets by local identifier (or to lookup PHAssets by a previously known ALAssetPropertyAssetURL use fetchAssetsWithALAssetURLs:options:) from the Photos framework instead [-Wdeprecated-declarations]
+    [assetsLibrary assetForURL:[self assetLibraryURLForLocalURL:localURL] resultBlock:resultBlock failureBlock:failureBlock];
+                   ^
+In module 'AssetsLibrary' imported from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-file/CDVAssetLibraryFilesystem.m:23:
+/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk/System/Library/Frameworks/AssetsLibrary.framework/Headers/ALAssetsLibrary.h:93:1: note: 'assetForURL:resultBlock:failureBlock:' has been explicitly marked deprecated here
+- (void)assetForURL:(NSURL *)assetURL resultBlock:(ALAssetsLibraryAssetForURLResultBlock)resultBlock failureBlock:(ALAssetsLibraryAccessFailureBlock)failureBlock AL_DEPRECATED(4, "Use fetchAssetsWithLocalIdentifiers:options: on PHAsset to fetch assets by local identifier (or to lookup PHAssets by a previously known ALAssetPropertyAssetURL use fetchAssetsWithALAssetURLs:options:) from the Photos framework instead");
+^
+23 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/BinaryResponseSerializer.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/BinaryResponseSerializer.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/BinaryResponseSerializer.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/BinaryResponseSerializer.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/BinaryResponseSerializer.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/BinaryResponseSerializer.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/BinaryResponseSerializer.m:3:18: warning: unused function 'AFErrorWithUnderlyingError' [-Wunused-function]
+static NSError * AFErrorWithUnderlyingError(NSError *error, NSError *underlyingError) {
+                 ^
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/BinaryRequestSerializer.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/BinaryRequestSerializer.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/BinaryRequestSerializer.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/BinaryRequestSerializer.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/BinaryRequestSerializer.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/BinaryRequestSerializer.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppVersion.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-app-version/AppVersion.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppVersion.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppVersion.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-app-version/AppVersion.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppVersion.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppDelegate.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Classes/AppDelegate.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppDelegate.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppDelegate.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Classes/AppDelegate.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppDelegate.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppDelegate+nativepagetransitions.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/AppDelegate+nativepagetransitions.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppDelegate+nativepagetransitions.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppDelegate+nativepagetransitions.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/com.telerik.plugins.nativepagetransitions/AppDelegate+nativepagetransitions.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppDelegate+nativepagetransitions.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppDelegate+FCMPlugin.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-fcm-with-dependecy-updated/AppDelegate+FCMPlugin.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppDelegate+FCMPlugin.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppDelegate+FCMPlugin.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-fcm-with-dependecy-updated/AppDelegate+FCMPlugin.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppDelegate+FCMPlugin.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppAvailability.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-appavailability/AppAvailability.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppAvailability.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppAvailability.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-appavailability/AppAvailability.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AppAvailability.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterUnit.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterUnit.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterUnit.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterUnit.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterUnit.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterUnit.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterRenderer.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterRenderer.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterRenderer.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterRenderer.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterRenderer.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterRenderer.o
+
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterRenderer.m:22:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterLayout.h:24:21: warning: pointer is missing a nullability type specifier (_Nonnull, _Nullable, or _Null_unspecified) [-Wnullability-completeness]
++ (UIPrintFormatter *) configureFormatter:(UIPrintFormatter *)formatter withSettings:(nullable NSDictionary *)settings;
+                    ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterLayout.h:24:21: note: insert '_Nullable' if the pointer may be null
++ (UIPrintFormatter *) configureFormatter:(UIPrintFormatter *)formatter withSettings:(nullable NSDictionary *)settings;
+                    ^
+                     _Nullable
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterLayout.h:24:21: note: insert '_Nonnull' if the pointer should never be null
++ (UIPrintFormatter *) configureFormatter:(UIPrintFormatter *)formatter withSettings:(nullable NSDictionary *)settings;
+                    ^
+                     _Nonnull
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterPaper.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterPaper.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterPaper.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterPaper.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterPaper.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterPaper.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterLayout.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterLayout.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterLayout.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterLayout.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterLayout.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterLayout.o
+
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterLayout.m:22:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterLayout.h:24:21: warning: pointer is missing a nullability type specifier (_Nonnull, _Nullable, or _Null_unspecified) [-Wnullability-completeness]
++ (UIPrintFormatter *) configureFormatter:(UIPrintFormatter *)formatter withSettings:(nullable NSDictionary *)settings;
+                    ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterLayout.h:24:21: note: insert '_Nullable' if the pointer may be null
++ (UIPrintFormatter *) configureFormatter:(UIPrintFormatter *)formatter withSettings:(nullable NSDictionary *)settings;
+                    ^
+                     _Nullable
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterLayout.h:24:21: note: insert '_Nonnull' if the pointer should never be null
++ (UIPrintFormatter *) configureFormatter:(UIPrintFormatter *)formatter withSettings:(nullable NSDictionary *)settings;
+                    ^
+                     _Nonnull
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterItem.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterItem.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterItem.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterItem.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterItem.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterItem.o
+
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterItem.m:22:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterItem.h:24:4: warning: pointer is missing a nullability type specifier (_Nonnull, _Nullable, or _Null_unspecified) [-Wnullability-completeness]
++ (id) ItemFromURL:(NSString *)url;
+   ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterItem.h:24:4: note: insert '_Nullable' if the pointer may be null
++ (id) ItemFromURL:(NSString *)url;
+   ^
+      _Nullable 
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterItem.h:24:4: note: insert '_Nonnull' if the pointer should never be null
++ (id) ItemFromURL:(NSString *)url;
+   ^
+      _Nonnull 
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterInfo.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterInfo.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterInfo.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterInfo.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterInfo.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterInfo.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterFont.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterFont.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterFont.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterFont.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterFont.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinterFont.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinter.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinter.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinter.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinter.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinter.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPPrinter.o
+
+In file included from /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinter.m:23:
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterItem.h:24:4: warning: pointer is missing a nullability type specifier (_Nonnull, _Nullable, or _Null_unspecified) [-Wnullability-completeness]
++ (id) ItemFromURL:(NSString *)url;
+   ^
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterItem.h:24:4: note: insert '_Nullable' if the pointer may be null
++ (id) ItemFromURL:(NSString *)url;
+   ^
+      _Nullable 
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-printer/APPPrinterItem.h:24:4: note: insert '_Nonnull' if the pointer should never be null
++ (id) ItemFromURL:(NSString *)url;
+   ^
+      _Nonnull 
+1 warning generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPNotificationOptions.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPNotificationOptions.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPNotificationOptions.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPNotificationOptions.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPNotificationOptions.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPNotificationOptions.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPNotificationContent.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPNotificationContent.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPNotificationContent.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPNotificationContent.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPNotificationContent.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPNotificationContent.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPNotificationCategory.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPNotificationCategory.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPNotificationCategory.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPNotificationCategory.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPNotificationCategory.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPNotificationCategory.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPLocalNotification.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPLocalNotification.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPLocalNotification.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPLocalNotification.o
+
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:85:30: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+        for (NSString* js in eventQueue) {
+                             ^
+                             self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:88:10: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+        [eventQueue removeAllObjects];
+         ^
+         self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:133:29: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+            notification = [_center getNotificationWithId:id];
+                            ^
+                            self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:161:29: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+            notification = [_center getNotificationWithId:id];
+                            ^
+                            self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:166:14: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+            [_center clearNotification:notification];
+             ^
+             self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:182:10: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+        [_center clearNotifications];
+         ^
+         self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:202:29: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+            notification = [_center getNotificationWithId:id];
+                            ^
+                            self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:207:14: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+            [_center cancelNotification:notification];
+             ^
+             self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:223:10: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+        [_center cancelNotifications];
+         ^
+         self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:243:18: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+        switch ([_center getTypeOfNotificationWithId:id]) {
+                 ^
+                 self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:286:25: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+        NSArray* ids = [_center getNotificationIdsByType:type];
+                        ^
+                        self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:310:26: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+        notifications = [_center getNotificationOptionsById:ids];
+                         ^
+                         self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:348:27: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                toasts = [_center getNotificationOptionsById:ids];
+                          ^
+                          self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:353:23: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+            toasts = [_center getNotificationOptionsByType:type];
+                      ^
+                      self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:413:18: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                [_center addActionGroup:group];
+                 ^
+                 self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:417:18: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                [_center removeActionGroup:identifier];
+                 ^
+                 self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:421:26: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                found = [_center hasActionGroup:identifier];
+                         ^
+                         self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:579:55: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                    usingBlock:^(NSNotification *e) { isActive = YES; }];
+                                                      ^
+                                                      self->
+/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-local-notification/APPLocalNotification.m:583:55: warning: block implicitly retains 'self'; explicitly mention 'self' to indicate this is intended behavior [-Wimplicit-retain-self]
+                    usingBlock:^(NSNotification *e) { isActive = NO; }];
+                                                      ^
+                                                      self->
+19 warnings generated.
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPBadge.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-badge/APPBadge.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPBadge.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPBadge.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-badge/APPBadge.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/APPBadge.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFURLSessionManager.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/AFURLSessionManager.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFURLSessionManager.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFURLSessionManager.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/AFURLSessionManager.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFURLSessionManager.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFURLResponseSerialization.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/AFURLResponseSerialization.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFURLResponseSerialization.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFURLResponseSerialization.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/AFURLResponseSerialization.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFURLResponseSerialization.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFURLRequestSerialization.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/AFURLRequestSerialization.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFURLRequestSerialization.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFURLRequestSerialization.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/AFURLRequestSerialization.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFURLRequestSerialization.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFSecurityPolicy.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/AFSecurityPolicy.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFSecurityPolicy.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFSecurityPolicy.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/AFSecurityPolicy.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFSecurityPolicy.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFNetworkReachabilityManager.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/AFNetworkReachabilityManager.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFNetworkReachabilityManager.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFNetworkReachabilityManager.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/AFNetworkReachabilityManager.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFNetworkReachabilityManager.o
+
+CompileC /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFHTTPSessionManager.o /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/AFHTTPSessionManager.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    export LANG\=en_US.US-ASCII
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x objective-c -target x86_64-apple-ios11.0-simulator -fmessage-length\=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -std\=c99 -fobjc-arc -fmodules -gmodules -fmodules-cache-path\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex -fmodules-prune-interval\=86400 -fmodules-prune-after\=345600 -fbuild-session-file\=/Users/pacewisdom/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/Session.modulevalidation -fmodules-validate-once-per-build-session -Wno-trigraphs -fpascal-strings -O0 -fno-common -Wno-missing-field-initializers -Wno-missing-prototypes -Wunreachable-code -Wno-implicit-atomic-properties -Wno-objc-interface-ivars -Wno-arc-repeated-use-of-weak -Wimplicit-retain-self -Wduplicate-method-match -Wno-missing-braces -Wparentheses -Wswitch -Wunused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wempty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wbool-conversion -Wenum-conversion -Wno-float-conversion -Wnon-literal-null-conversion -Wobjc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wno-selector -Wno-strict-selector-match -Wundeclared-selector -Wdeprecated-implementations -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DCOCOAPODS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DGPB_USE_PROTOBUF_FRAMEWORK_IMPORTS\=1 -DWK_WEB_VIEW_ONLY\=1 -DWK_WEB_VIEW_ONLY\=1 -DDEBUG\=1 -DPB_FIELD_32BIT\=1 -DPB_NO_PACKED_STRUCTS\=1 -DPB_ENABLE_MALLOC\=1 -DOBJC_OLD_DISPATCH_PROTOTYPES\=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -fasm-blocks -fstrict-aliasing -Wprotocol -Wdeprecated-declarations -g -Wno-sign-conversion -Winfinite-recursion -Wcomma -Wblock-capture-autoreleasing -Wstrict-prototypes -Wno-semicolon-before-method-body -fobjc-abi-version\=2 -fobjc-legacy-dispatch -index-store-path /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Index/DataStore -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-generated-files.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-own-target-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-all-non-framework-target-headers.hmap -ivfsoverlay /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/all-product-headers.yaml -iquote /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird-project-headers.hmap -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Firebase -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseAnalyticsInterop -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseCore -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseInstanceID -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/FirebaseMessaging -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/GoogleUtilities -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/PromisesObjC -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/Protobuf -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/nanopb -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/usr/local/lib/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/UninstalledProducts/iphonesimulator/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -I/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Firebase/CoreOnly/Sources -I/Sources/FBLPromises/include -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources-normal/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources/x86_64 -I/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/DerivedSources -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -fmodule-map-file\=/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/Headers/Public/SSZipArchive/SSZipArchive.modulemap -include /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/PrecompiledHeaders/SharedPrecompiledHeaders/3334595084919366706/Sunbird-Prefix.pch -MMD -MT dependencies -MF /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFHTTPSessionManager.d --serialize-diagnostics /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFHTTPSessionManager.dia -c /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Sunbird/Plugins/cordova-plugin-advanced-http/AFHTTPSessionManager.m -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/AFHTTPSessionManager.o
+
+Ld /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Sunbird normal (in target 'Sunbird' from project 'Sunbird')
+    cd /Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios
+    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -target x86_64-apple-ios11.0-simulator -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator14.4.sdk -L/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -L/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/FirebaseCore -L/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/FirebaseInstanceID -L/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/FirebaseMessaging -L/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/GoogleUtilities -L/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/PromisesObjC -L/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Protobuf -L/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/SSZipArchive -L/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/nanopb -F/Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/FirebaseAnalytics/Frameworks -F/Users/pacewisdom/Documents/SunbirdEd-mobile-app/platforms/ios/Pods/GoogleAppMeasurement/Frameworks -FSunbird/Plugins/cordova-plugin-sunbirdsplash -FSunbird/Plugins/sb-cordova-plugin-customtabs -FSunbird/Plugins/sb-cordova-plugin-utility -filelist /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.LinkFileList -Xlinker -rpath -Xlinker /usr/lib/swift -Xlinker -rpath -Xlinker @executable_path/Frameworks -dead_strip -Xlinker -object_path_lto -Xlinker /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird_lto.o -Xlinker -export_dynamic -Xlinker -no_deduplicate -Xlinker -objc_abi_version -Xlinker 2 -fobjc-arc -fobjc-link-runtime -L/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphonesimulator -L/usr/lib/swift -Xlinker -add_ast_path -Xlinker /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird.swiftmodule -ObjC -ObjC -lFirebaseCore -lFirebaseInstanceID -lFirebaseMessaging -lGoogleUtilities -lPromisesObjC -lProtobuf -lSSZipArchive -lc++ -liconv -lnanopb -lsqlite3 -lz -framework FIRAnalyticsConnector -framework FirebaseAnalytics -framework FirebaseCoreDiagnostics -framework Foundation -framework GoogleAppMeasurement -framework Security -framework StoreKit -framework SystemConfiguration -weak_framework UserNotifications -Xlinker -sectcreate -Xlinker __TEXT -Xlinker __entitlements -Xlinker /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Sunbird.app-Simulated.xcent /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/libCordova.a -framework Security -framework SystemConfiguration -weak_framework ImageIO -framework CoreLocation -framework AVFoundation -weak_framework AudioToolbox -lz -framework UIKit -framework Foundation -framework QuartzCore -framework MessageUI -lc++ -lz -framework AddressBook -lsqlite3.0 -weak_framework WebKit -framework UserNotifications -framework CoreTelephony -framework MediaPlayer -framework Accelerate -framework Photos -weak_framework Social -framework CoreBluetooth -framework Contacts -framework EventKit -framework CoreMotion -lPods-Sunbird -Xlinker -no_adhoc_codesign -Xlinker -dependency_info -Xlinker /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/Sunbird_dependency_info.dat -o /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/Sunbird.app/Sunbird
+
+duplicate symbol '_OBJC_IVAR_$_SSZipArchive._zip' in:
+    /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SSZipArchive.o
+    /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/SSZipArchive/libSSZipArchive.a(SSZipArchive.o)
+duplicate symbol '_OBJC_IVAR_$_SSZipArchive._path' in:
+    /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SSZipArchive.o
+    /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/SSZipArchive/libSSZipArchive.a(SSZipArchive.o)
+duplicate symbol '_OBJC_CLASS_$_SSZipArchive' in:
+    /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SSZipArchive.o
+    /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/SSZipArchive/libSSZipArchive.a(SSZipArchive.o)
+duplicate symbol '_OBJC_METACLASS_$_SSZipArchive' in:
+    /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Intermediates.noindex/Sunbird.build/Debug-iphonesimulator/Sunbird.build/Objects-normal/x86_64/SSZipArchive.o
+    /Users/pacewisdom/Library/Developer/Xcode/DerivedData/Sunbird-bcowqcmyeqnwqxhjjjvozwqzulab/Build/Products/Debug-iphonesimulator/SSZipArchive/libSSZipArchive.a(SSZipArchive.o)
+ld: 4 duplicate symbols for architecture x86_64
+clang: error: linker command failed with exit code 1 (use -v to see invocation)
+
diff --git a/README.md b/README.md
index 01a03f23b..a622423d9 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-[![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=Sunbird-Ed_SunbirdEd-mobile-app&metric=alert_status)](https://sonarcloud.io/dashboard?id=Sunbird-Ed_SunbirdEd-mobile-app)
-
 **Dependencies:**    
 NPM Version - above 6    
 Node JS Version - above 8    
@@ -36,3 +34,51 @@ Node JS Version - above 8
 **4. How to debug apk**    
     - Open chrome and enter `chrome://inspect`    
     - Select app    
+
+
+
+
+
+---------------------------------------
+
+# IOS Development setup
+
+## Prerequisites
+
+    1. Node js version 10.18.1
+    2. Ionic 5.4.16 using `npm i ionic@5.4.16 -g`
+    3. Cordova 9.0.0  using `npm i cordova@9.0.0 -g`
+    4. cordova-res 0.15.3 - using `npm install -g cordova-res`
+    5. ios-deploy  1.11.4 - using `brew install ios-deploy`
+
+    all of the above should be installed globally
+
+    Xcode 12.4 Build version 12D4e or above
+    
+## Steps
+
+    1. Checkout sunbird-sdk repo from https://github.com/shikshalokam/sunbird-mobile-sdk with branch release-3.9.0-ios
+    2. cd to <sunbird-mobile-sdk> && npm i && npm run build:prod
+    3. Checkout sunbird-mobile-app repo from https://github.com/shikshalokam/SunbirdEd-mobile-app with branch release-3.9.0-ios
+    4. Add `GoogleService-Info.plist` file
+    5. cd to <sunbird-mobile-app> local path
+    6. RUN npm i <sunbird-sdk repo local path>/dist
+    7. RUN npm i
+    8. RUN ./build-ios.sh
+    9. RUN cordova emulate ios
+
+
+## Possible Errors 
+
+1. error: Value for SWIFT_VERSION cannot be empty. (in target 'Sunbird' from project 'Sunbird') or Duplicate GoogleService-Info.plist file error
+
+### Solution
+    open platforms/ios/Sunbird.xcworkspace 
+
+    Select Sunbird 
+    Build setting Project, targets
+    update Swift language version to 4 
+    Inside Tagets -> Build phases -> Copy Bundle Resources -> remove duplicate GoogleService-Info.plist if present
+    and close Xcode then rerun the **cordova emulate ios**
+
+
diff --git a/angular.json b/angular.json
index 51c330b34..ddfaf9258 100644
--- a/angular.json
+++ b/angular.json
@@ -40,8 +40,28 @@
               },
               {
                 "glob": "**/*.*",
-                "input": "./node_modules/@project-sunbird/common-consumption/assets",
+                "input": "./node_modules/@project-sunbird/common-consumption-v8/assets",
                 "output": "./assets/common-consumption"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/@project-sunbird/sunbird-pdf-player-v8/lib/assets/",
+                "output": "/assets/"
+              },
+              {
+                "glob": "**/*.*",
+                "input": "./node_modules/@project-sunbird/discussions-ui-v8/assets",
+                "output": "./assets/discussion-ui"
+              },
+              {
+                "glob": "**/*",
+                "input": "./node_modules/@project-sunbird/sunbird-quml-player-v8/lib/assets/",
+                "output": "/assets/"
+              },
+              {
+                "glob": "**/*",
+                "input": "./node_modules/@project-sunbird/sunbird-video-player-v8/lib/assets/",
+                "output": "/assets/"
               }
             ],
 
@@ -51,12 +71,20 @@
               "vendor": true
             },
             "styles": [
-              "node_modules/common-consumption-styles/assets/_styles.scss",
+              "src/assets/styles/quml-styles/quml-carousel.css",
+              "node_modules/katex/dist/katex.min.css",
+              "node_modules/video.js/dist/video-js.min.css",
+              "node_modules/@project-sunbird/sb-styles/assets/_styles.scss",
+              "node_modules/@project-sunbird/discussions-ui-v8/assets/styles/global.scss",
               {
                 "input": "src/global.scss"
               }
             ],
-            "scripts": [],
+            "scripts": [
+              "node_modules/@project-sunbird/telemetry-sdk/index.js",
+              "node_modules/epubjs/dist/epub.js",
+              "node_modules/katex/dist/katex.min.js"
+            ],
             "es5BrowserSupport": true,
             "preserveSymlinks": true
           },
@@ -64,8 +92,8 @@
             "production": {
               "fileReplacements": [
                 {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
+                  "replace": "src/configuration/configuration.ts",
+                  "with": "src/configuration/configuration.prod.ts"
                 }
               ],
               "optimization": true,
@@ -81,15 +109,23 @@
                 {
                   "type": "initial",
                   "maximumWarning": "2mb",
-                  "maximumError": "7mb"
+                  "maximumError": "8mb"
                 }
               ]
             },
             "hmr": {
               "fileReplacements": [
                 {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.hmr.ts"
+                  "replace": "src/configuration/configuration.ts",
+                  "with": "src/configuration/configuration.hmr.ts"
+                }
+              ]
+            },
+            "debug": {
+              "fileReplacements": [
+                {
+                  "replace": "src/configuration/configuration.ts",
+                  "with": "src/configuration/configuration.debug.ts"
                 }
               ]
             },
@@ -218,6 +254,7 @@
     }
   },
   "cli": {
+    "analytics": "75c63db4-656e-490e-a5b9-bda28ceec150",
     "defaultCollection": "@ionic/angular-toolkit"
   },
   "schematics": {
diff --git a/build-ios.sh b/build-ios.sh
new file mode 100755
index 000000000..a988339ab
--- /dev/null
+++ b/build-ios.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# Accepted CLI arguments
+while getopts a: flag
+do
+    case "${flag}" in
+        a) angularConfiguration=${OPTARG};;
+    esac
+done
+
+# Simple script to clean install
+rm -rf node_modules
+rm -rf platforms
+rm -rf plugins
+rm -rf www
+
+CORDOVA_COUNTER=0
+SUNBIRD_CORDOVA_COUNTER=0
+
+# Pass build branch as input
+buildBranch="$1"
+rm package-lock.json && npm install
+export CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL="https\://services.gradle.org/distributions/gradle-6.5.1-all.zip"
+
+file="./build_config"
+while IFS="=" read -r key value; do
+  case "$key" in
+    '#'*) ;;
+    'cordova'*)
+      CORDOVA[$CORDOVA_COUNTER]=$value
+      CORDOVA_COUNTER=$((CORDOVA_COUNTER+1));;
+    'sunbird-cordova'*)
+      SUNBIRD_CORDOVA[$SUNBIRD_CORDOVA_COUNTER]=$value
+      SUNBIRD_CORDOVA_COUNTER=$((SUNBIRD_CORDOVA_COUNTER+1));
+  esac
+done < "$file"
+
+
+for cordova_plugin in "${CORDOVA[@]}"
+do
+  ionic cordova plugin add $cordova_plugin --force
+done
+
+for cordova_plugin in "${SUNBIRD_CORDOVA[@]}"
+do
+  ionic cordova plugin add $cordova_plugin
+done
+
+rm -rf platforms
+mkdir platforms
+
+
+
+#Temporary Workaround to generate build as webpack was complaining of Heap Space
+#need to inspect on webpack dependdencies at the earliest
+NODE_OPTIONS=--max-old-space-size=4096 ionic cordova platforms add ios
+
+NODE_OPTIONS=--max-old-space-size=4096 ionic cordova build ios
+
diff --git a/build.sh b/build.sh
index 73f4d6bf7..553900ede 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+# Accepted CLI arguments
+while getopts a: flag
+do
+    case "${flag}" in
+        a) angularConfiguration=${OPTARG};;
+    esac
+done
+
 # Simple script to clean install
 rm -rf node_modules
 rm -rf platforms
@@ -11,7 +19,8 @@ SUNBIRD_CORDOVA_COUNTER=0
 
 # Pass build branch as input
 buildBranch="$1"
-npm install
+rm package-lock.json && npm install
+export CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL="https\://services.gradle.org/distributions/gradle-6.5.1-all.zip"
 
 file="./build_config"
 while IFS="=" read -r key value; do
@@ -39,12 +48,16 @@ done
 
 
 rm -rf platforms
-
 #Temporary Workaround to generate build as webpack was complaining of Heap Space
 #need to inspect on webpack dependdencies at the earliest
-NODE_OPTIONS=--max-old-space-size=4096 ionic cordova platforms add android@8.1.0
+NODE_OPTIONS=--max-old-space-size=4096 ionic cordova platforms add android@9.0.0
 
 NODE_OPTIONS=--max-old-space-size=4096 ionic cordova build android --prod --release --buildConfig ./buildConfig/build.json
 
-npm run ionic-build
+if [ -n "$angularConfiguration" ]; then
+  echo "$angularConfiguration"
+  npm run ionic-build --angular-configuration=$angularConfiguration
+else
+  npm run ionic-build --angular-configuration=production
+fi
 
diff --git a/buildConfig/.gradle/5.5.1/fileChanges/last-build.bin b/buildConfig/.gradle/5.5.1/fileChanges/last-build.bin
new file mode 100644
index 000000000..f76dd238a
Binary files /dev/null and b/buildConfig/.gradle/5.5.1/fileChanges/last-build.bin differ
diff --git a/buildConfig/.gradle/5.5.1/fileHashes/fileHashes.lock b/buildConfig/.gradle/5.5.1/fileHashes/fileHashes.lock
new file mode 100644
index 000000000..96b236a23
Binary files /dev/null and b/buildConfig/.gradle/5.5.1/fileHashes/fileHashes.lock differ
diff --git a/src/app/components/popups/sb-popover/sb-popover.component.scss b/buildConfig/.gradle/5.5.1/gc.properties
similarity index 100%
rename from src/app/components/popups/sb-popover/sb-popover.component.scss
rename to buildConfig/.gradle/5.5.1/gc.properties
diff --git a/buildConfig/.project b/buildConfig/.project
new file mode 100644
index 000000000..e000d8b5a
--- /dev/null
+++ b/buildConfig/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>buildConfig_</name>
+	<comment>Project buildConfig_ created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/buildConfig/.settings/org.eclipse.buildship.core.prefs b/buildConfig/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..e74dfd192
--- /dev/null
+++ b/buildConfig/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(LOCAL_INSTALLATION(/Users/pacewisdom/.sdkman/candidates/gradle/current))
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=/Library/Java/JavaVirtualMachines/jdk-15.0.2.jdk/Contents/Home
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true
diff --git a/buildConfig/build-extras.gradle b/buildConfig/build-extras.gradle
index 5b000a4c8..377765cac 100644
--- a/buildConfig/build-extras.gradle
+++ b/buildConfig/build-extras.gradle
@@ -3,9 +3,9 @@ buildscript {
         maven {
             url 'https://maven.fabric.io/public'
         }
+        mavenCentral()
         google()
         jcenter()
-        mavenCentral()
     }
     dependencies {
         classpath 'io.fabric.tools:gradle:1.25.1'
@@ -13,10 +13,10 @@ buildscript {
 }
 
 repositories {
-    google()
     maven { 
         url 'https://maven.fabric.io/public' 
     }
+    google()
 }
 
 apply plugin: com.crashlytics.tools.gradle.CrashlyticsPlugin
@@ -60,9 +60,9 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 19
+        minSdkVersion 22
         ext.buildNumber = System.getenv("TRAVIS_BUILD_NUMBER") ?: "local"
-        versionName "2.10.$ext.buildNumber"
+        versionName "3.9.$ext.buildNumber"
         manifestPlaceholders = [fabricKey: "${release_fabric_api_key}", fabricSecret: "${release_fabric_api_secret}"]
         resValue("string", "_app_name", "${app_name}")
         multiDexEnabled true
@@ -107,18 +107,18 @@ android {
             resValue("string", "deeplink_ncert_url", "${dev_deeplink_ncert_url}")
             resValue("string", "deeplink_igot_url", "${dev_deeplink_igot_url}")
             resValue("string", "custom_scheme_url", "${dev_custom_scheme}")
-            //resValue("string", "app_code_push_id", "${dev_app_code_push_id}")
             buildConfigField 'String', 'BASE_URL', "\"${dev_base_url}\""
             buildConfigField 'String', 'MERGE_ACCOUNT_BASE_URL', "\"${dev_merge_account_base_url}\""
             buildConfigField 'String', 'PRODUCER_ID', "\"${dev_producer_id}\""
             buildConfigField 'String', 'CHANNEL_ID', "\"${dev_channel_id}\""
-            buildConfigField 'int', 'MAX_COMPATIBILITY_LEVEL', "4"
+            buildConfigField 'int', 'MAX_COMPATIBILITY_LEVEL', "5"
             buildConfigField 'String', 'MOBILE_APP_CONSUMER', '"mobile_device"'
             buildConfigField 'String', 'MOBILE_APP_KEY', "\"${dev_mobile_app_key}\""
             buildConfigField 'String', 'MOBILE_APP_SECRET', "\"${dev_mobile_app_secret}\""
-            buildConfigField 'String', 'OAUTH_SESSION', '"org.genie.KeycloakOAuthSessionService"'
             buildConfigField "String", "OAUTH_REDIRECT_URL","\"${dev_oauth_redirect_url}\""
             buildConfigField 'String', 'TOU_BASE_URL', "\"${dev_tou_base_url}\""
+            buildConfigField 'String', 'SURVEY_BASE_URL', "\"${dev_survey_base_url}\""
+            buildConfigField 'String', 'PROJECTS_BASE_URL', "\"${dev_projects_base_url}\""
         }
 
         staging {
@@ -126,20 +126,20 @@ android {
             flavorDimensions "default"
             resValue("string", "deeplink_base_url", "${staging_deeplink_base_url}")
             resValue("string", "deeplink_ncert_url", "${staging_deeplink_ncert_url}")
-            resValue("string", "deeplink_igot_url", "${dev_deeplink_igot_url}")
+            resValue("string", "deeplink_igot_url", "${staging_deeplink_igot_url}")
             resValue("string", "custom_scheme_url", "${staging_custom_scheme}")
-            // resValue("string", "app_code_push_id", "${staging_app_code_push_id}")
             buildConfigField 'String', 'BASE_URL', "\"${staging_base_url}\""
             buildConfigField 'String', 'MERGE_ACCOUNT_BASE_URL', "\"${staging_merge_account_base_url}\""
             buildConfigField 'String', 'PRODUCER_ID', "\"${staging_producer_id}\""
             buildConfigField 'String', 'CHANNEL_ID', "\"${staging_channel_id}\""
-            buildConfigField 'int', 'MAX_COMPATIBILITY_LEVEL', "4"
+            buildConfigField 'int', 'MAX_COMPATIBILITY_LEVEL', "5"
             buildConfigField 'String', 'MOBILE_APP_CONSUMER', '"mobile_device"'
             buildConfigField 'String', 'MOBILE_APP_KEY', "\"${staging_mobile_app_key}\""
             buildConfigField 'String', 'MOBILE_APP_SECRET', "\"${staging_mobile_app_secret}\""
-            buildConfigField 'String', 'OAUTH_SESSION', '"org.genie.KeycloakOAuthSessionService"'
             buildConfigField "String", "OAUTH_REDIRECT_URL","\"${staging_oauth_redirect_url}\""
             buildConfigField 'String', 'TOU_BASE_URL', "\"${staging_tou_base_url}\""
+            buildConfigField 'String', 'SURVEY_BASE_URL', "\"${staging_survey_base_url}\""
+            buildConfigField 'String', 'PROJECTS_BASE_URL', "\"${staging_projects_base_url}\""
         }
 
         production {
@@ -149,22 +149,22 @@ android {
             resValue("string", "deeplink_ncert_url", "${production_deeplink_ncert_url}")
             resValue("string", "deeplink_igot_url", "${dev_deeplink_igot_url}")
             resValue("string", "custom_scheme_url", "${production_custom_scheme}")
-            //resValue("string", "app_code_push_id", "${production_app_code_push_id}")
             buildConfigField 'String', 'BASE_URL', "\"${production_base_url}\""
             buildConfigField 'String', 'MERGE_ACCOUNT_BASE_URL', "\"${production_merge_account_base_url}\""
             buildConfigField 'String', 'PRODUCER_ID', "\"${production_producer_id}\""
             buildConfigField 'String', 'CHANNEL_ID', "\"${production_channel_id}\""
-            buildConfigField 'int', 'MAX_COMPATIBILITY_LEVEL', "4"
+            buildConfigField 'int', 'MAX_COMPATIBILITY_LEVEL', "5"
             buildConfigField 'String', 'MOBILE_APP_CONSUMER', '"mobile_device"'
             buildConfigField 'String', 'MOBILE_APP_KEY', "\"${production_mobile_app_key}\""
             buildConfigField 'String', 'MOBILE_APP_SECRET', "\"${production_mobile_app_secret}\""
-            buildConfigField 'String', 'OAUTH_SESSION', '"org.genie.KeycloakOAuthSessionService"'
             buildConfigField "String", "OAUTH_REDIRECT_URL","\"${production_oauth_redirect_url}\""
             buildConfigField 'String', 'TOU_BASE_URL', "\"${production_tou_base_url}\""
+            buildConfigField 'String', 'SURVEY_BASE_URL', "\"${production_survey_base_url}\""
+            buildConfigField 'String', 'PROJECTS_BASE_URL', "\"${production_projects_base_url}\""
         }
     }
 
-    task myclean(type: Delete,overwrite: true) {
+    task myclean(type: Delete) {
         def data
         if (System.properties['os.name'].toLowerCase().contains('windows')) {
             data = new File( "$rootDir\\app\\src\\main\\assets\\www\\assets\\data" )
@@ -178,7 +178,7 @@ android {
         }
     }
 
-    task copyDirNotificationConfig(type: Copy,overwrite: true) {
+    task copyDirNotificationConfig(type: Copy) {
         if (System.properties['os.name'].toLowerCase().contains('windows')){
             from "$rootDir\\app\\data\\notificationconfig"
             into "$rootDir\\app\\src\\main\\assets\\www\\assets\\data"
@@ -190,7 +190,7 @@ android {
         }
     }
 
-    task copyDirFaq(type: Copy,overwrite: true) {
+    task copyDirFaq(type: Copy) {
         if (System.properties['os.name'].toLowerCase().contains('windows')){
             from "$rootDir\\app\\data\\faq"
             into "$rootDir\\app\\src\\main\\assets\\www\\assets\\data\\faq"
@@ -202,7 +202,7 @@ android {
         }
     }
 
-    task copyDirContentRating(type: Copy,overwrite: true) {
+    task copyDirContentRating(type: Copy) {
         if (System.properties['os.name'].toLowerCase().contains('windows')){
             from "$rootDir\\app\\data\\content-rating"
             into "$rootDir\\app\\src\\main\\assets\\www\\assets\\data\\content-rating"
@@ -214,7 +214,7 @@ android {
         }
     }
 
-    task copyDirDev(type: Copy,overwrite: true) {
+    task copyDirDev(type: Copy) {
         if (System.properties['os.name'].toLowerCase().contains('windows')){
             from "$rootDir\\app\\data\\dev"
             into "$rootDir\\app\\src\\main\\assets\\www\\assets\\data"
@@ -226,7 +226,7 @@ android {
         }
     }
 
-    task copyDirStaging(type: Copy,overwrite: true) {
+    task copyDirStaging(type: Copy) {
         if (System.properties['os.name'].toLowerCase().contains('windows')){
             from "$rootDir\\app\\data\\staging"
             into "$rootDir\\app\\src\\main\\assets\\www\\assets\\data"
@@ -238,7 +238,7 @@ android {
         }
     }
 
-    task copyDirProd(type: Copy,overwrite: true) {
+    task copyDirProd(type: Copy) {
         if (System.properties['os.name'].toLowerCase().contains('windows')){
             from "$rootDir\\app\\data\\prod"
             into "$rootDir\\app\\src\\main\\assets\\www\\assets\\data"
@@ -267,15 +267,30 @@ android {
         def versionName = name
 
         if (flavorName.equals("dev")) {
-            preBuild.dependsOn(dev)
+            // preBuild.dependsOn(dev)
+            preBuild.dependsOn  myclean
+            preBuild.dependsOn  copyDirDev
+            preBuild.dependsOn  copyDirNotificationConfig
+            preBuild.dependsOn  copyDirFaq
+            preBuild.dependsOn  copyDirContentRating
             println "inside dev task"
         }
         if (flavorName.equals("staging")) {
-            preBuild.dependsOn(staging)
+            // preBuild.dependsOn(staging)
+            preBuild.dependsOn  myclean
+            preBuild.dependsOn  copyDirStaging
+            preBuild.dependsOn  copyDirNotificationConfig
+            preBuild.dependsOn  copyDirFaq
+            preBuild.dependsOn  copyDirContentRating
             println "inside staging task"
         }
         if (flavorName.equals("production")) {
-            preBuild.dependsOn(prod)
+            // preBuild.dependsOn(prod)
+            preBuild.dependsOn  myclean
+            preBuild.dependsOn  copyDirProd
+            preBuild.dependsOn  copyDirNotificationConfig
+            preBuild.dependsOn  copyDirFaq
+            preBuild.dependsOn  copyDirContentRating
             println "inside production task"
         }
 
@@ -285,7 +300,7 @@ android {
         if (variant.buildType.isDebuggable()) {
             versionName += '-debug';
         }
-        flavor.versionName = versionName;
+        // flavor.versionName = versionName;
         variant.buildConfigField("String", "REAL_VERSION_NAME", "\"${versionName}\"");
         variant.outputs.each { output ->
             // output.versionNameOverride = versionName
@@ -297,9 +312,8 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    // implementation 'com.google.android.gms:play-services-analytics:10.+'
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'androidx.multidex:multidex:2.0.1'
     implementation('com.crashlytics.sdk.android:crashlytics:2.9.4@aar') {
         transitive = true;
     }
-}
+}
\ No newline at end of file
diff --git a/buildConfig/build.gradle b/buildConfig/build.gradle
index 93902e351..78371c96c 100644
--- a/buildConfig/build.gradle
+++ b/buildConfig/build.gradle
@@ -27,7 +27,7 @@ buildscript {
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:4.0.1'
     }
 }
 
@@ -38,10 +38,10 @@ allprojects {
     }
     //This replaces project.properties w.r.t. build settings
     project.ext {
-      defaultBuildToolsVersion="28.0.3" //String
-      defaultMinSdkVersion=19 //Integer - Minimum requirement is Android 4.4
-      defaultTargetSdkVersion=28 //Integer - We ALWAYS target the latest by default
-      defaultCompileSdkVersion=28 //Integer - We ALWAYS compile with the latest by default
+      defaultBuildToolsVersion="29.0.3" //String
+      defaultMinSdkVersion=22 //Integer - Minimum requirement is Android 4.4
+      defaultTargetSdkVersion=29 //Integer - We ALWAYS target the latest by default
+      defaultCompileSdkVersion=30 //Integer - We ALWAYS compile with the latest by default
     }
 }
 
diff --git a/buildConfig/data/dev/system/system-setting-custodianOrgId.json b/buildConfig/data/dev/system/system-setting-custodianOrgId.json
deleted file mode 100644
index bec94fb6f..000000000
--- a/buildConfig/data/dev/system/system-setting-custodianOrgId.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":"api.system.settings.get.custodianOrgId","ver":"v1","ts":"2019-01-15 06:16:21:318+0000","params":{"resmsgid":null,"msgid":"9753967e-625f-4c1c-9e1b-df0cad826490","err":null,"status":"success","errmsg":null},"responseCode":"OK","result":{"response":{"id":"custodianOrgId","field":"custodianOrgId","value":"01246944855007232011"}}}
\ No newline at end of file
diff --git a/buildConfig/data/faq/faq-en.json b/buildConfig/data/faq/faq-en.json
index cb8b67d61..083d36cd5 100644
--- a/buildConfig/data/faq/faq-en.json
+++ b/buildConfig/data/faq/faq-en.json
@@ -1 +1 @@
-{"faqs":[{"topic":"A message \"Content Coming Soon\" is displayed on my screen and I cannot see any content for the QR code scanned","description":"Your State is currently creating content for this QR code. The delay is because there is a large number of textbooks for many classes, mediums and subjects. You will see the content  as soon as the State has created it."},{"topic":"I have an Android 4.4 device, I cannot play content on it","description":"Android version 4.4 does not support html5 and thus all content cannot be played. To play content on a device with Android version 4.4, try the following:\n<ul>\n<li>Update the Android version to the latest, preferably to a version greater than 5.1</li>\n<li>Update the {{APP_NAME}} mobile app to the latest version</li>\n</ul>\nThe app prompts to download and install Crosswalk when playing content on Android 4.4.version. Using Crosswalk enables playing most content on Android 4.4 version\n\n"},{"topic":"I cannot  see my board, medium, class and subject","description":"Your State does not currently support all boards, mediums, classes and subjects. As soon as your State adds them, you will see it in the list.  "},{"topic":"I am unable to sign in","description":"To use the {{APP_NAME}} mobile app, you must first Sign Up. You can sign up when you are connected to the Internet using any of these options:\n\t\t<ul>\n\t\t<li> Registered mobile number or email address </li>\n\t\t<li> State provided ID </li>\n\t\t<li> Existing Google(Gmail) ID </li>\n\t\t</ul>\nIf you have already Signed Up, check if you have proper Internet connectivity."},{"topic":"I cannot see content for my board, medium, class or subject ","description":"Your State has not yet created or added content for your medium, board, class or subject. If you see  books listed in the app library, you will most likely get the content in this academic year.   "},{"topic":"I want to play content when there is no Internet","description":"You can download content only when you are connected to the Internet. Only the downloaded content can be played later without the Internet. \nYou can play YouTube videos only when you are connected to the Internet because YouTube does not allow other apps to download videos."},{"topic":"Content takes up a lot of space on my phone","description":"You can delete the downloaded content from the downloads tab in the app to free up space"},{"topic":"I want to create and add content on {{APP_NAME}}","description":"Currently, the State appoints teachers to create and add content on {{APP_NAME}}. If you are interested in creating content,  send a request to your State authority to get creation rights"},{"topic":"I want to unenroll from a course","description":"Select the course you want to unenroll from, tap the options menu (three vertical dots) on the top right corner and tap 'Unenroll'"},{"topic":"I want to get the mobile app on iOS or desktop","description":"You can visit https://www.diksha.gov.in/explore/ using your browser on iOS or desktop devices to view content. We are currently working on a desktop application for offline use that is expected to be ready later this year"},{"topic":"I want to know the status of my course completion","description":"After you have successfully completed a course, the course name  will be displayed under the 'Trainings Attended' section in your profile page"},{"topic":"I am unable to see my profile settings","description":"This is caused by an outdated version of  <b>Android System WebView</b> component on your phone. To update the webview component:\n1. Go to Google Playstore\n2. Go to the android webview link. Use https://play.google.com/store/apps/details?id=com.google.android.webview\n\nNote: The Android WebView is a pre-installed component that allows Android apps to display web content.\nIt should be kept up to date to ensure the latest security updates."},{"topic":"I am unable to see the QR code scan button","description":"This is caused by an outdated version of <b>Android System WebView</b> component on your phone. To update the webview component:\n1. Go to Google Playstore\n2. Go to the android webview link. Use https://play.google.com/store/apps/details?id=com.google.android.webview.\n\nNote: The Android WebView is a pre-installed component that allows Android apps to display web content.\nIt should be kept up to date to ensure the latest security updates. "}],"constants":{"charactersLeft":"characters left","explainMsg":"Could you explain the problem?","faqMsg":"Frequently asked questions","help":"Help","helpMsg":"Did this answer help you?","initiateEmailButton":"Initiate email","knowMoreMsg":"What more would you like to know?","noMsg":"No","reportIssue":"Report an issue","reportIssueMsg":"Report other issue","resolveMsg":"Look through the list to resolve your issue","sorryMsg":"Sorry about that!","submitButton":"Submit","tellMoreMsg":"Tell us more about the problem you faced","thanksMsg":"Thank you for your response!","triggerEmailMsg":"After you add details in the text box and tap the Initiate email button, we will trigger an email on your behalf. You can add further details and/or attach files there.","typeHere":"Type Here...","yesMsg":"Yes"}}
\ No newline at end of file
+{"categories":[{"name":"Content (search)","videos":[],"faqs":[{"topic":"A message \"Content Coming Soon\" is displayed on my screen and I cannot see any content for the QR code scanned","description":"Your State is currently creating content for this QR code. The delay is because there is a large number of textbooks for many classes, mediums and subjects. You will see the content  as soon as the State has created it."},{"topic":"I cannot see content for my board, medium, class or subject ","description":"Your State has not yet created or added content for your medium, board, class or subject. If you see  books listed in the app library, you will most likely get the content in this academic year.   "},{"topic":"I want to get the mobile app on iOS or desktop","description":"You can visit https://www.diksha.gov.in/explore/ using your browser on iOS or desktop devices to view content. We are currently working on a desktop application for offline use that is expected to be ready later this year"},{"topic":"I am unable to see the QR code scan button","description":"This is caused by an outdated version of <b>Android System WebView</b> component on your phone. To update the webview component:\n1. Go to Google Playstore\n2. Go to the android webview link. Use https://play.google.com/store/apps/details?id=com.google.android.webview.\n\nNote: The Android WebView is a pre-installed component that allows Android apps to display web content.\nIt should be kept up to date to ensure the latest security updates. "},{"topic":"I want to access particular resources by type","description":"<ul><li>Click the <b>Resource type</b> tab on the home page </li><li>Select either Project, Observation, Survey or Course</li><li>A list of available resources of the selected resource type for your role and location is displayed</li><li>Click the required resource from the list to use or start it</li></ul>"}]},{"name":"Content play","videos":[],"faqs":[{"topic":"I have an Android 4.4 device, I cannot play content on it","description":"Android version 4.4 does not support html5 and thus all content cannot be played. To play content on a device with Android version 4.4, try the following:\n<ul>\n<li>Update the Android version to the latest, preferably to a version greater than 5.1</li>\n<li>Update the {{APP_NAME}} mobile app to the latest version</li>\n</ul>\nThe app prompts to download and install Crosswalk when playing content on Android 4.4.version. Using Crosswalk enables playing most content on Android 4.4 version\n\n"},{"topic":"I want to play content when there is no Internet","description":"You can download content only when you are connected to the Internet. Only the downloaded content can be played later without the Internet. \nYou can play YouTube videos only when you are connected to the Internet because YouTube does not allow other apps to download videos."},{"topic":"Content takes up a lot of space on my phone","description":"You can delete the downloaded content from the downloads tab in the app to free up space"},{"topic":"When I try to play a video, I get an error, \"The media could not be loaded\"","description":"If you get this error, you can either:\n<ul><li> Download the video and play it,</li></ul>\nOR\n<ul><li>If you do not see the download option, and if you have a SIM card from another network provider, switch to the other network and try again</li></ul>"},{"topic":"When I try to play a PDF, I get an error, \"Missing PDF\"","description":"If you get this error, you should:\n<ul><li>Upgrade the app (if an update is available)</ul></li>\nIf you still face this issue after the upgrade, then\n<ul><li>Delete the PDF if you've downloaded it</li>\n<li>Check your internet connection and try playing the content again</li></ul>"}]},{"name":"Profile","videos":[],"faqs":[{"topic":"I cannot  see my board, medium, class and subject","description":"Your State does not currently support all boards, mediums, classes and subjects. As soon as your State adds them, you will see it in the list.  "},{"topic":"I am unable to see my profile settings","description":"This is caused by an outdated version of  <b>Android System WebView</b> component on your phone. To update the webview component:\n1. Go to Google Playstore\n2. Go to the android webview link. Use https://play.google.com/store/apps/details?id=com.google.android.webview\n\nNote: The Android WebView is a pre-installed component that allows Android apps to display web content.\nIt should be kept up to date to ensure the latest security updates."},{"topic":"I am logged in as a Teacher or Other. I want to change my role","description":"<ul><li>Go to the <b>Profile</b> page</li><li>Click <b>Edit</b> below your role and location details</li><li>Modify your role</li><li><b> Note:</b> If you  to modify your role to <b>Leader</b>, select your sub-role and relevant location details</li><li>Click <b>Submit</b></li></ul>"},{"topic":"I want to view the programs and resources for my role and location","description":"<ul><li>Click <b>Programs</b> on home page</li><li> The list of programs for your role and location is displayed</li><li>Select a program to see all the resources for it</li><li>Click on the resource to use or start it</li></ul>"},{"topic":"My profile does not reflect my course progress correctly","description":"To update your course progress in your profile, go to <b>My learnings</b>. Click on the Course. After the course opens, go to the kebab menu (three vertical dots on the right)> click <b>Sync progress now</b>. Wait for a few minutes. Your profile should now reflect your correct course progress"}]},{"name":"Login","videos":[],"faqs":[{"topic":"I am unable to log in","description":"To use the {{APP_NAME}} mobile app, you must first register. You can register when you are connected to the Internet using any of these options:\n\t\t<ul>\n\t\t<li> Registered mobile number or email address </li>\n\t\t<li> State provided ID </li>\n\t\t<li> Existing Google(Gmail) ID </li>\n\t\t</ul>\nIf you have already Signed Up, check if you have proper Internet connectivity."}]},{"name":"Content creation","videos":[],"faqs":[{"topic":"I want to create and add content on {{APP_NAME}}","description":"Currently, the State appoints teachers to create and add content on {{APP_NAME}}. If you are interested in creating content,  send a request to your State authority to get creation rights"}]},{"name":"Course & certificates","videos":[],"faqs":[{"topic":"I want to unenroll from a course","description":"Select the course you want to unenroll from, tap the options menu (three vertical dots) on the top right corner and tap 'Unenroll'"},{"topic":"I want to know the status of my course completion","description":"After you have successfully completed a course, the course name  will be displayed under the 'Trainings Attended' section in your profile page"},{"topic":"I have completed the training but my progress is not 100%.","description":"DIKSHA marks training progress as 100% only after you view all the videos or read all the pdf documents completely. If you view a video partially or skip pages while reading a document, your progress is not marked as 100%."},{"topic":"I am unable to download my course certificate","description":"You may have an older version of the app. Go to <b>Play store > DIKSHA</b>. Click <b>Update</b> to get the latest version of the app. You should be able to download the certificate once you have successfully updated the app."}]},{"name":"Other","faqs":[{"topic":"I have completed my iGOT COVID training, but I have not received my certificate","description":"Your COVID training completion certificate will be issued within 7 working days after you complete any COVID training. You will be informed by email or SMS when the certificate is issued. If you do not get your certificate within 7 working days, contact <a href=\"mailto:support@i-got.freshdesk.com\">support@i-got.freshdesk.com</a>."},{"topic":"I want to download my iGOT COVID training completion certificate","description":"Your iGOT COVID training completion certificate will be issued within 7 working days after you complete any COVID training. You will be informed by email or SMS when the certificate is issued. After you receive the information, to download your certificate:<ul><li>Go to<b>Profile</b> > <b>Training attended</b></li><li>Click <b>Download</b></li><li> The certificate is downloaded in the background </li><li>View and open it from your android file manager</li></ul>\nIf you do not get your certificate within 7 working days, contact <a href=\"mailto:support@i-got.freshdesk.com\">support@i-got.freshdesk.com</a>."},{"topic":"I want to know if I have completed my training","description":"To know if you have completed the COVID training, check if:<ul><li>Your training progress status is 100%</li><li>The training name appears under <b>Profile</b> > <b>Training attended</b></li></ul>"}]},{"name":"Managing projects","videos":[],"faqs":[{"topic":"I want to edit the project details","description":"<ul><li>1. Open the project</li><li>2. Click on the 3 dots in top right corner</li><li>Click <b>Edit</b></li><li>Click on the <b>Edit</b> (pencil) icon to edit the details</li><li>Click <b>Save Edits</b> to save the changes</li></ul>"},{"topic":"I want to change the status of a task when no subtask is present","description":"<ul><li>Open the project</li><li>Click on the task</li><li>Click on the dropdown below the task</li><li>Modify the status and click OK</li></ul>"},{"topic":"I want to change the status of a task when a subtask is present","description":"<ul><li>Open the project</li><li>Click the required task</li><li>A list of subtasks is displayed</li><li>Click the subtask dropdown</li><li>Modify the status and click OK</li><li><b>Note:</b> The task status is marked as complete automatically only if the status of all its subtasks are complete.</li></ul>"},{"topic":"I want to add an evidence file to the project after the task is complete","description":"<ul><li>1. Open <b>Project</b></li><li>2. Click on the completed task</li><li>3. Click on <b>Add attachment</b> from the bottom right corner</li><li>4. Click on <b>Use camera</b> to click a picture</li> <li> 5. Click <b>Load from library</b> to select the image from your phone</li><li>6. You will see the message <b>Successfully attached</b> in the pop up at top of your screen </li></ul>"},{"topic":"I want to add an evidence file for the Observation or Survey (Only when a question has the files option)","description":"<ul><li>Start the observation/survey questionnaire</li><li>Click on the files option in the question</li><li>Select camera/upload image</li><li>An image icon is added to indicate evidence has been added.</li></ul>"},{"topic":"I want to access my Project reports on {{APP_NAME}}","description":"<ul><li>Click <b>Reports</b> on home page</li><li>Select the resource type as  Project</li><li>View the project, task and category overview report</li><li>Click on filter to select a particular program</li><li>Click ‘View report’ for detailed reports</li></ul>"},{"topic":"I want to access my Observation reports on  {{APP_NAME}}","description":"<ul><li>Click  <b>Reports</b> on the home page</li><li>Select the resource type as  <b>Observation</b></li><li>Select the observation form</li><li>Select the Entity</li><li>Click <b>View Entity report</b></li></ul>"}]}],"constants":{"charactersLeft":"characters left","explainMsg":"Could you explain the problem?","faqMsg":"Frequently asked questions","faqTitle":"Faq(s)","help":"Help","helpMsg":"Did this answer help you?","initiateEmailButton":"Initiate email","knowMoreMsg":"What more would you like to know?","noMsg":"No","reportIssue":"Report an issue","reportIssueMsg":"Report other issue","resolveMsg":"Get help with finding content, technical issues and more. Browse through the topics to find FAQs, help videos and more.","selectCategoryTitle":"Select category","sorryMsg":"Sorry about that!","submitButton":"Submit feedback","tellMoreMsg":"Tell us more about the problem you faced","thanksForFeedbackMsg":"Thanks for your feedback. We may not be able to respond to every suggestion sent to us, but your feedback is valuable. It helps make {{app_name}} better for everyone.","thanksMsg":"Thank you for your response!","triggerEmailMsg":"After you add details in the text box and tap the Initiate email button, we will trigger an email on your behalf. You can add further details and/or attach files there.","typeHere":"Type Here...","videoTitle":"Video(s)","yesMsg":"Yes"}}
\ No newline at end of file
diff --git a/buildConfig/data/staging/form/form-config_discover_get_app.json b/buildConfig/data/staging/form/form-config_discover_get_app.json
new file mode 100644
index 000000000..c6a1c8172
--- /dev/null
+++ b/buildConfig/data/staging/form/form-config_discover_get_app.json
@@ -0,0 +1,325 @@
+{
+  "id": "api.form.read",
+  "params": {
+    "resmsgid": "ba01ec9f-45c7-47a8-965b-b783e06913dc",
+    "msgid": "65aa2046-619c-496d-a539-7d3b417ca1f9",
+    "status": "successful"
+  },
+  "responseCode": "OK",
+  "result": {
+    "form": {
+      "type": "config",
+      "subType": "discoverContent",
+      "action": "get",
+      "component": "app",
+      "rootOrgId": "*",
+      "data": {
+        "templateName": "discover",
+        "action": "get",
+        "fields": [
+          {
+            "dataSrc": {
+              "type": "CONTENT_FACETS",
+              "request": {
+                "type": "POST",
+                "path": "/api/content/v1/search",
+                "withBearerToken": true,
+                "body": {
+                    "request": {
+                        "limit": 0,
+                        "offset": 0,
+                        "mode": "hard",
+                        "facets": [
+                        ],
+                        "filters": {
+                        }
+                    }
+                }
+              },
+              "values": [
+                {
+                  "facet": "Digital Textbook",
+                  "searchCriteria": {
+                    "facets": [],
+                    "primaryCategory": [
+                      "Digital Textbook"
+                    ],
+                    "mode": "soft",
+                    "searchType": "search"
+                  },
+                  "primaryFacetFilters": [
+                    {
+                      "code": "board",
+                      "translations": "{\"en\":\"Board/Syllabus\",\"hi\":\"बोर्ड\",\"te\":\"బోర్డు\",\"ta\":\"வாரியம்\",\"mr\":\"बोर्ड\"}",
+                      "values": [],
+                      "name": "Board/Syllabus",
+                      "index": 1
+                    },
+                    {
+                      "code": "gradeLevel",
+                      "translations": "{\"en\":\"Class\",\"hi\":\"कक्षा\",\"te\":\"క్లాసు\",\"ta\":\"வகுப்பு\",\"mr\":\"इयत्ता\"}",
+                      "values": [],
+                      "name": "Class",
+                      "index": 2
+                    }
+                  ],
+                  "aggregate": {
+                    "groupBy": "subject"
+                  }
+                },
+                {
+                  "facet": "Courses",
+                  "searchCriteria": {
+                    "facets": [],
+                    "primaryCategory": [
+                      "Course"
+                    ],
+                    "mode": "soft",
+                    "searchType": "search"
+                  },
+                  "primaryFacetFilters": [
+                    {
+                      "code": "board",
+                      "translations": "{\"en\":\"Board/Syllabus\",\"hi\":\"बोर्ड\",\"te\":\"బోర్డు\",\"ta\":\"வாரியம்\",\"mr\":\"बोर्ड\"}",
+                      "values": [],
+                      "name": "Board/Syllabus",
+                      "index": 1
+                    },
+                    {
+                      "code": "gradeLevel",
+                      "translations": "{\"en\":\"Class\",\"hi\":\"कक्षा\",\"te\":\"క్లాసు\",\"ta\":\"வகுப்பு\",\"mr\":\"इयत्ता\"}",
+                      "values": [],
+                      "name": "Class",
+                      "index": 2
+                    }
+                  ],
+                  "aggregate": {
+                    "groupBy": "subject"
+                  }
+                },
+                {
+                  "facet": "Tv Classes",
+                  "searchCriteria": {
+                    "facets": [],
+                    "primaryCategory": [
+                      "Explanation Content"
+                    ],
+                    "mode": "soft",
+                    "searchType": "search"
+                  },
+                  "primaryFacetFilters": [
+                    {
+                      "code": "board",
+                      "translations": "{\"en\":\"Board/Syllabus\",\"hi\":\"बोर्ड\",\"te\":\"బోర్డు\",\"ta\":\"வாரியம்\",\"mr\":\"बोर्ड\"}",
+                      "values": [],
+                      "name": "Board/Syllabus",
+                      "index": 1
+                    },
+                    {
+                      "code": "gradeLevel",
+                      "translations": "{\"en\":\"Class\",\"hi\":\"कक्षा\",\"te\":\"క్లాసు\",\"ta\":\"வகுப்பு\",\"mr\":\"इयत्ता\"}",
+                      "values": [],
+                      "name": "Class",
+                      "index": 2
+                    }
+                  ],
+                  "aggregate": {
+                    "groupBy": "subject"
+                  }
+                }
+              ],
+              "mapping": []
+            },
+            "sections": [
+              {
+                "index": 0,
+                "title": "{\"en\":\"Popular categories\"}",
+                "theme": {
+                  "component": "sb-pills-grid",
+                  "inputs": {
+                    "pillShape": "default"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "dataSrc": {
+              "type": "CONTENT_FACETS",
+              "request": {
+                "type": "POST",
+                "path": "/api/content/v1/search",
+                "withBearerToken": true,
+                "body": {
+                    "request": {
+                        "limit": 0,
+                        "offset": 0,
+                        "mode": "hard",
+                        "facets": [
+                        ],
+                        "filters": {
+                        }
+                    }
+                }
+              },
+              "values": [
+                {
+                  "facet": "{\"en\":\"AP\"}",
+                  "searchCriteria": {
+                    "facets": [
+                      "board"
+                    ],
+                    "filters": {
+                      "board": [
+                        "ts_k-12_2"
+                      ]
+                    }
+                  },
+                  "primaryFacetFilters": [
+                    {
+                      "code": "gradeLevel",
+                      "translations": "{\"en\":\"Class\",\"hi\":\"कक्षा\",\"te\":\"క్లాసు\",\"ta\":\"வகுப்பு\",\"mr\":\"इयत्ता\"}",
+                      "values": [],
+                      "name": "Class",
+                      "index": 2
+                    },
+                    {
+                      "code": "medium",
+                      "translations": "{\"en\":\"Medium\",\"hi\":\"माध्यम\",\"te\":\"మాధ్యమం\",\"ta\":\"மொழி\",\"mr\":\"माध्यम\"}",
+                      "values": [],
+                      "name": "Medium",
+                      "index": 4
+                    }
+                  ],
+                  "aggregate": {
+                    "groupBy": "subject"
+                  }
+                },
+                {
+                  "facet": "{\"en\":\"AS\"}",
+                  "searchCriteria": {
+                    "facets": [
+                      "board"
+                    ],
+                    "filters": {
+                      "board": [
+                        "as_k-12_5"
+                      ]
+                    }
+                  },
+                  "primaryFacetFilters": [
+                    {
+                      "code": "gradeLevel",
+                      "translations": "{\"en\":\"Class\",\"hi\":\"कक्षा\",\"te\":\"క్లాసు\",\"ta\":\"வகுப்பு\",\"mr\":\"इयत्ता\"}",
+                      "values": [],
+                      "name": "Class",
+                      "index": 2
+                    },
+                    {
+                      "code": "medium",
+                      "translations": "{\"en\":\"Medium\",\"hi\":\"माध्यम\",\"te\":\"మాధ్యమం\",\"ta\":\"மொழி\",\"mr\":\"माध्यम\"}",
+                      "values": [],
+                      "name": "Medium",
+                      "index": 4
+                    }
+                  ],
+                  "aggregate": {
+                    "groupBy": "subject"
+                  }
+                },
+                {
+                  "facet": "{\"en\":\"KA\"}",
+                  "searchCriteria": {
+                    "facets": [
+                      "board"
+                    ],
+                    "filters": {
+                      "board": [
+                        "ka_k-12_1"
+                      ]
+                    }
+                  },
+                  "primaryFacetFilters": [
+                    {
+                      "code": "gradeLevel",
+                      "translations": "{\"en\":\"Class\",\"hi\":\"कक्षा\",\"te\":\"క్లాసు\",\"ta\":\"வகுப்பு\",\"mr\":\"इयत्ता\"}",
+                      "values": [],
+                      "name": "Class",
+                      "index": 2
+                    },
+                    {
+                      "code": "medium",
+                      "translations": "{\"en\":\"Medium\",\"hi\":\"माध्यम\",\"te\":\"మాధ్యమం\",\"ta\":\"மொழி\",\"mr\":\"माध्यम\"}",
+                      "values": [],
+                      "name": "Medium",
+                      "index": 4
+                    }
+                  ],
+                  "aggregate": {
+                    "groupBy": "subject"
+                  }
+                }
+              ],
+              "mapping": []
+            },
+            "sections": [
+              {
+                "index": 1,
+                "title": "{\"en\":\"Search from other boards\"}",
+                "isEnabled": true,
+                "component": "tag",
+                "shape": "circle",
+                "theme": {
+                  "component": "sb-pills-grid",
+                  "inputs": {
+                    "pillShape": "circle",
+                    "pillsViewType": "scroll"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "dataSrc": {
+              "type": "CONTENTS",
+              "request": {
+                "type": "POST",
+                "path": "/api/content/v1/search",
+                "withBearerToken": true,
+                "body": {
+                  "request": {
+                    "facets": [
+                      "primaryCategory"
+                    ],
+                    "filters": {
+                      "primaryCategory": [
+                        "Course"
+                      ]
+                    }
+                  }
+                }
+              },
+              "mapping": []
+            },
+            "sections": [
+              {
+                "index": 2,
+                "title": "{\"en\":\"Trending courses from your state\"}",
+                "theme": {
+                  "component": "sb-course-cards-hlist",
+                  "inputs": {
+                    "type": "course_card_grid",
+                    "hideProgress": true,
+                    "viewMoreButtonText": "{\"en\":\"View all\"}"
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      }
+    }
+  },
+  "ts": "2019-12-13T07:50:01.901Z",
+  "ver": "1.0"
+}
\ No newline at end of file
diff --git a/buildConfig/data/staging/form/form-config_home_get_app.json b/buildConfig/data/staging/form/form-config_home_get_app.json
new file mode 100644
index 000000000..755592cdb
--- /dev/null
+++ b/buildConfig/data/staging/form/form-config_home_get_app.json
@@ -0,0 +1,230 @@
+{
+  "id": "api.form.read",
+  "params": {
+    "resmsgid": "ef8ad0bd-a6c3-4f62-abfa-7e75bc33057e",
+    "msgid": "ba747c0d-76d0-4ece-95bc-1eadec18956f",
+    "status": "successful"
+  },
+  "responseCode": "OK",
+  "result": {
+    "form": {
+      "type": "config",
+      "subtype": "home",
+      "action": "get",
+      "component": "app",
+      "framework": "*",
+      "data": {
+        "templateName": "home",
+        "action": "get",
+        "fields": [
+          {
+            "dataSrc": {
+              "type": "CONTENTS",
+              "request": {
+                "type": "POST",
+                "path": "/api/content/v1/search",
+                "withBearerToken": true,
+                "body": {
+                    "request": {
+                        "facets": [
+                          "primaryCategory"
+                        ],
+                        "filters": {
+                          "primaryCategory": [
+                            "Course"
+                          ]
+                        }
+                    }
+                }
+              },
+              "mapping": []
+            },
+            "sections": [
+              {
+                "index": 0,
+                "title": "{\"en\":\"Trending courses from your state\"}",
+                "isEnabled": true,
+                "theme": {
+                  "component": "sb-course-cards-hlist",
+                  "inputs": {
+                    "type": "course_card_grid",
+                    "hideProgress": true,
+                    "viewMoreButtonText": "{\"en\":\"View all\"}"
+                  }
+                }
+              },
+              {
+                "index": 1,
+                "title": "{\"en\":\"Trending courses from your state\"}",
+                "isEnabled": true,
+                "theme": {
+                  "component": "sb-course-cards-hlist",
+                  "inputs": {
+                    "type": "course_card_grid",
+                    "hideProgress": true,
+                    "viewMoreButtonText": "{\"en\":\"View all\"}"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "dataSrc": {
+              "type": "TRACKABLE_COLLECTIONS",
+              "request": {
+                "type": "GET",
+                "path": "/api/course/v1/user/enrollment/list/${userId}",
+                "parameters": {
+                  "orgdetails": "orgName,email",
+                  "fields": "contentType,topic,name,channel,pkgVersion,primaryCategory,trackable",
+                  "batchDetails": "name,endDate,startDate,status,enrollmentType,createdBy,certificates"
+                },
+                "withBearerToken": true,
+                "withUserToken": true
+              },
+              "mapping": []
+            },
+            "sections": [
+              {
+                "index": 0,
+                "title": "{\"en\":\"Continue learning\"}",
+                "isEnabled": true,
+                "theme": {
+                  "component": "sb-course-cards-hlist",
+                  "inputs": {
+                    "type": "my_course_recently_viewed_card_grid",
+                    "hideProgress": true,
+                    "viewMoreButtonText": "{\"en\":\"View all\"}",
+                    "maxCardCount": 10,
+                    "viewMoreButtonPosition": "right"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "dataSrc": {
+              "type": "CONTENT_FACETS",
+              "request": {
+                "type": "POST",
+                "path": "/api/content/v1/search",
+                "withBearerToken": true,
+                "body": {
+                    "request": {
+                        "limit": 0,
+                        "offset": 0,
+                        "mode": "hard",
+                        "facets": [
+                        ],
+                        "filters": {
+                        }
+                    }
+                }
+              },
+              "mapping": [
+                {
+                  "facet": "subject",
+                  "aggregate": {
+                    "groupBy": "primaryCategory"
+                  }
+                },
+                {
+                  "facet": "primaryCategory",
+                  "aggregate": {
+                    "groupBy": "subject"
+                  }
+                }
+              ]
+            },
+            "sections": [
+              {
+                "index": 2,
+                "title": "{\"en\":\"Browse by subject\"}",
+                "isEnabled": true,
+                "theme": {
+                  "component": "sb-pills-grid",
+                  "inputs": {
+                    "pillShape": "default",
+                    "pillsViewType": "scroll",
+                    "minDisplayCount": 10,
+                    "showMoreViewType": "new_screen",
+                    "viewMoreText": "{\"en\":\"View all subjects\"}",
+                    "viewLessText": "{\"en\":\"View Less\"}",
+                    "pillsMultiRow": "double_view_column"
+                  },
+                  "children": {
+                    "sb-pill-item": {
+                      "inputs": {
+                        "icon": "assets/imgs/book_default.svg"
+                      },
+                      "inputsMap": {
+                        "icon": {
+                          "english": "assets/imgs/book_english.svg",
+                          "mathematics": "assets/imgs/calculator.svg",
+                          "science": "assets/imgs/globe.svg"
+                        },
+                        "theme": {
+                          "english": {
+                            "iconBgColor": "rgba(255,139,46,1)",
+                            "pillBgColor": "rgba(255,139,46,0.3)"
+                          },
+                          "mathematics": {
+                            "iconBgColor": "rgba(163,99,255,1)",
+                            "pillBgColor": "rgba(163,99,255,0.3)"
+                          },
+                          "science": {
+                            "iconBgColor": "rgba(34,139,255,1)",
+                            "pillBgColor": "rgba(34,139,255,0.3)"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "index": 2,
+                "title": "{\"en\":\"Browse by category\"}",
+                "isEnabled": true,
+                "theme": {
+                  "component": "sb-pills-grid",
+                  "inputs": {
+                    "pillShape": "image_overlap",
+                    "pillsViewType": "scroll"
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "dataSrc": {
+              "type": "RECENTLY_VIEWED_CONTENTS",
+              "mapping": []
+            },
+            "sections": [
+              {
+                "index": 4,
+                "title": "{\"en\":\"Recently viewed\"}",
+                "isEnabled": true,
+                "theme": {
+                  "component": "sb-library-cards-hlist",
+                  "inputs": {
+                    "type": "mobile_textbook",
+                    "viewMoreButtonText": "{\"en\":\"View all\"}",
+                    "maxCardCount": 10,
+                    "viewMoreButtonPosition": "right"
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "created_on": "2020-12-09T06:11:50.319Z",
+      "last_modified_on": null,
+      "rootOrgId": "*"
+    }
+  },
+  "ts": "2021-01-11T05:27:33.009Z",
+  "ver": "1.0"
+}
\ No newline at end of file
diff --git a/buildConfig/data/staging/form/form-dynamicForm_contentRequest_submit.json b/buildConfig/data/staging/form/form-dynamicForm_contentRequest_submit.json
new file mode 100644
index 000000000..16e79c407
--- /dev/null
+++ b/buildConfig/data/staging/form/form-dynamicForm_contentRequest_submit.json
@@ -0,0 +1 @@
+{"request":{"type":"dynamicForm","subType":"contentRequest","action":"submit","component":"app","rootOrgId":"*","data":{"templateName":"dynamicForm","action":"submit","fields":[{"code":"board","type":"select","templateOptions":{"placeHolder":"Select Board","multiple":false,"dataSrc":{"marker":"ACTIVE_CHANNEL.SUGGESTED_FRAMEWORK_LIST.MAPPED_TO_FRAMEWORKCATEGORIES","params":{"relevantTerms":["CBSE"]}}},"validations":[{"type":"required"}]},{"code":"medium","type":"nested_select","context":"board","default":null,"templateOptions":{"placeHolder":"Select Medium","multiple":false,"dataSrc":{"marker":"FRAMEWORK_CATEGORY_TERMS","params":{"categoryCode":"medium"}}},"validations":[{"type":"required"}]},{"code":"grade","type":"nested_select","context":"medium","templateOptions":{"placeHolder":"Select Grade","multiple":false,"dataSrc":{"marker":"FRAMEWORK_CATEGORY_TERMS","params":{"categoryCode":"grade"}}},"validations":[{"type":"required"}]},{"code":"subject","type":"nested_select","context":"grade","templateOptions":{"placeHolder":"Select Subject","multiple":false,"dataSrc":{"marker":"FRAMEWORK_CATEGORY_TERMS","params":{"categoryCode":"subject"}}},"validations":[{"type":"required"}]},{"code":"contenttype","type":"select","templateOptions":{"placeHolder":"Select Content Type","multiple":false,"options":[{"value":"TextBook","label":"TextBook"},{"value":"digitextbbok","label":"Digital Textbook"},{"value":"Course","label":"Course"},{"value":"tvlesson","label":"TV Lesson"},{"value":"explaincontent","label":"Explanation content"},{"value":"practiceques","label":"Practice Questions"},{"value":"quiz","label":"Quiz"}]},"validations":[{"type":"required"}]}]}}}
\ No newline at end of file
diff --git a/buildConfig/data/staging/form/form-user_manageduser_create.json b/buildConfig/data/staging/form/form-user_manageduser_create.json
new file mode 100644
index 000000000..dff26f95b
--- /dev/null
+++ b/buildConfig/data/staging/form/form-user_manageduser_create.json
@@ -0,0 +1 @@
+{"id":"api.form.read","params":{"resmsgid":"e6af6255-4c10-440d-ba35-9fc870a04163","msgid":"573d138b-846d-4b26-9c21-a173433073c0","status":"successful"},"responseCode":"OK","result":{"form":{"type":"user","subType":"manageduser","action":"create","component":"app","framework":"*","rootOrgId":"*","data":{"templateName":"manageduser","action":"create","fields":[{"code":"name","type":"input","templateOptions":{"label":"FULL_NAME","placeholder":"ENTER_USER_NAME"},"validations":[{"type":"required","value":true,"message":"NAME_IS_REQUIRED"}]},{"code":"updatePreference","type":"label","templateOptions":{"label":"PREFERENCES_CAN_BE_UPDATED"}}]},"created_on":"2019-06-28T05:55:40.560Z","last_modified_on":null}},"ts":"2019-06-28T07:21:30.126Z","ver":"1.0"}
\ No newline at end of file
diff --git a/buildConfig/data/staging/system/system-setting-custodianOrgId.json b/buildConfig/data/staging/system/system-setting-custodianOrgId.json
deleted file mode 100644
index ac85e9b1f..000000000
--- a/buildConfig/data/staging/system/system-setting-custodianOrgId.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":"api.system.settings.get.custodianOrgId","ver":"v1","ts":"2020-02-26 07:41:44:736+0000","params":{"resmsgid":null,"msgid":null,"err":null,"status":"success","errmsg":null},"responseCode":"OK","result":{"response":{"id":"custodianOrgId","field":"custodianOrgId","value":"0126632859575746566"}}}
\ No newline at end of file
diff --git a/build_config b/build_config
index 6de99fb5d..8139b7e03 100644
--- a/build_config
+++ b/build_config
@@ -4,7 +4,8 @@ cordova-plugin=ionic-plugin-keyboard
 cordova-plugin=cordova-plugin-whitelist
 cordova-plugin=cordova-plugin-ionic-webview
 cordova-plugin=cordova-plugin-app-version
-cordova-plugin=cordova-plugin-x-socialsharing@5.6.5
+cordova-plugin=cordova-plugin-x-socialsharing
+cordova-plugin=cordova-plugin-androidx-adapter
 cordova-plugin=cordova-plugin-device
 cordova-plugin=cordova-plugin-file
 cordova-plugin=cordova-plugin-file-transfer
@@ -14,18 +15,33 @@ cordova-plugin=cordova-plugin-statusbar
 cordova-plugin=cordova-plugin-webview-checker
 cordova-plugin=https://github.com/adriano-di-giovanni/cordova-plugin-shared-preferences.git
 cordova-plugin=https://github.com/katzer/cordova-plugin-local-notifications.git
-cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-2.9.0
+cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-3.4.0
 cordova-plugin=cordova-plugin-advanced-http
 cordova-plugin=cordova-plugin-android-permissions
-cordova-plugin=cordova-plugin-media
 cordova-plugin=cordova.plugins.diagnostic
-cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-utility.git
-cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-downloadmanager.git#release-2.9.0
-cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-db.git
-cordova-plugin=cordova-android-support-gradle-release --variable ANDROID_SUPPORT_VERSION=28.0.0
+cordova-plugin=com.telerik.plugins.nativepagetransitions
+cordova-plugin=cordova-plugin-secure-storage-echo
+cordova-plugin=cordova-plugin-chooser
+cordova-plugin=cordova-plugin-appavailability
+cordova-plugin=cordova-plugin-filepicker
+cordova-plugin=cordova-plugin-document-viewer
+cordova-plugin=com-sarriaroman-photoviewer
+cordova-plugin=cordova-plugin-filepath
+cordova-plugin=https://github.com/greybax/cordova-plugin-proguard.git
+cordova-plugin=https://github.com/shikshalokam/sb-cordova-plugin-utility.git#release-3.9.0-ios
+cordova-plugin=https://github.com/shikshalokam/sb-cordova-plugin-downloadmanager.git#release-3.9.0-ios
+cordova-plugin=https://github.com/shikshalokam/sb-cordova-plugin-db.git --variable USESWIFTLANGUAGEVERSION=4
 cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-customtabs.git --variable URL_SCHEME=@string/custom_scheme_url --variable URL_HOST=mobile
+cordova-plugin=cordova-sqlite-storage@5.1.0
+cordova-plugin=cordova-plugin-camera@4.1.0
+cordova-plugin=cordova-plugin-telerik-imagepicker@2.3.3
+cordova-plugin=cordova-plugin-filechooser
+cordova-plugin=cordova-plugin-media
+cordova-plugin=cordova.plugins.diagnostic
 sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-openrap.git
-sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-qr-scanner.git
-sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git#release-2.10.0
+sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-qr-scanner.git#release-3.3.0
+sunbird-cordova-plugin=https://github.com/shikshalokam/cordova-plugin-sunbirdsplash.git#release-3.9.0-ios
 sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-file-support.git
-cordova-plugin=com.telerik.plugins.nativepagetransitions
+sunbird-cordova-plugin=https://github.com/shikshalokam/sb-cordova-plugin-sync.git#release-3.9.0-ios
+sunbird-cordova-plugin=https://github.com/subranil/cordova-plugin-inappupdatemanager.git#release-3.7.0
+cordova-plugin=cordova-plugin-add-swift-support@2.0.2
\ No newline at end of file
diff --git a/config.xml b/config.xml
index ad927b551..4125898d4 100644
--- a/config.xml
+++ b/config.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <widget android-versionCode="1" id="org.sunbird.app" version="staging-2.4.0.01" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android">
-    <name>@string/_app_name</name>
+    <name>Sunbird</name>
     <description>Sunbird mobile app</description>
     <author email="" href="">EkStep Team</author>
     <access origin="*" />
@@ -9,7 +9,7 @@
     <allow-intent href="mailto:*" />
     <allow-intent href="geo:*" />
     <preference name="ScrollEnabled" value="false" />
-    <preference name="android-minSdkVersion" value="19" />
+    <preference name="android-minSdkVersion" value="22" />
     <preference name="BackupWebStorage" value="none" />
     <preference name="SplashScreenDelay" value="5000" />
     <preference name="Orientation" value="portrait" />
@@ -17,14 +17,14 @@
     <preference name="KeyboardDisplayRequiresUserAction" value="false" />
     <hook src="scripts/copyContentPlayer.js" type="before_build" />
     <hook src="scripts/deleteUnUsableIosIcon.js" type="before_build" />
-    <hook src="scripts/copyGradleFiles.js" type="before_build" />
-    <hook src="scripts/copyBundledData.js" type="before_build" />
-    <hook src="scripts/application/add_application.js" type="before_run" />
-    <hook src="scripts/copyGradleFiles.js" type="before_run" />
-    <hook src="scripts/copyBundledData.js" type="before_run" />
     <hook src="scripts/copyContentPlayer.js" type="before_run" />
     <hook src="scripts/deleteUnUsableIosIcon.js" type="before_run" />
     <platform name="android">
+        <hook src="scripts/copyGradleFiles.js" type="before_build" />
+        <hook src="scripts/copyBundledData.js" type="before_build" />
+        <hook src="scripts/copyGradleFiles.js" type="before_run" />
+        <hook src="scripts/copyBundledData.js" type="before_run" />
+        <hook src="scripts/application/add_application.js" type="before_run" />
         <resource-file src="MainActivity.java" target="app/src/main/java/org/sunbird/app/MainActivity.java" />
         <config-file parent="/manifest/application" target="AndroidManifest.xml">
             <meta-data android:name="io.fabric.ApiKey" android:value="${fabricKey}" />
@@ -36,6 +36,7 @@
         </config-file>
         <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
             <application android:allowBackup="false" />
+            <application android:requestLegacyExternalStorage="true" />
             <application android:usesCleartextTraffic="true" />
         </edit-config>
         <preference name="android-manifest/@xmlns:tools" value="http://schemas.android.com/tools" />
@@ -43,6 +44,7 @@
         <preference name="android-manifest/application/@android:allowBackup" value="false" />
         <preference name="loadUrlTimeoutValue" value="700000" />
         <preference name="CodePushDeploymentKey" value="agojO-OZt4dZlt_pu9r9j2Ipy_jY90dbb065-3633-45a5-9c55-c0405eafaebb" />
+        <preference name="AndroidXEnabled" value="true" />
         <allow-intent href="market:*" />
         <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
         <icon density="mdpi" src="resources/android/icon/drawable-ldpi-icon.png" />
@@ -65,6 +67,11 @@
         <resource-file src="resources/android/icon/mipmap-hdpi-icon.png" target="app/src/main/res/mipmap-hdpi/n_icon.png" />
     </platform>
     <platform name="ios">
+        <preference name="WKWebViewOnly" value="true" />
+        <feature name="CDVWKWebViewEngine">
+            <param name="ios-package" value="CDVWKWebViewEngine" />
+        </feature>
+        <preference name="CordovaWebViewEngine" value="CDVWKWebViewEngine" />
         <allow-intent href="itms:*" />
         <allow-intent href="itms-apps:*" />
         <icon height="57" src="resources/ios/icon/icon.png" width="57" />
@@ -99,26 +106,33 @@
         <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
         <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
         <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
+        <icon height="20" src="resources/ios/icon/icon-20.png" width="20" />
+        <icon height="40" src="resources/ios/icon/icon-20@2x.png" width="40" />
+        <icon height="60" src="resources/ios/icon/icon-20@3x.png" width="60" />
+        <icon height="29" src="resources/ios/icon/icon-29.png" width="29" />
+        <icon height="58" src="resources/ios/icon/icon-29@2x.png" width="58" />
+        <icon height="87" src="resources/ios/icon/icon-29@3x.png" width="87" />
+        <icon height="48" src="resources/ios/icon/icon-24@2x.png" width="48" />
+        <icon height="55" src="resources/ios/icon/icon-27.5@2x.png" width="55" />
+        <icon height="88" src="resources/ios/icon/icon-44@2x.png" width="88" />
+        <icon height="172" src="resources/ios/icon/icon-86@2x.png" width="172" />
+        <icon height="196" src="resources/ios/icon/icon-98@2x.png" width="196" />
+        <icon height="216" src="resources/ios/icon/icon-108@2x.png" width="216" />
+        <splash height="2688" src="resources/ios/splash/Default-2688h~iphone.png" width="1242" />
+        <splash height="1792" src="resources/ios/splash/Default-1792h~iphone.png" width="828" />
+        <splash height="2436" src="resources/ios/splash/Default-2436h.png" width="1125" />
+        <preference name="UseSwiftLanguageVersion" value="5" />
+        <resource-file src="GoogleService-Info.plist" />
     </platform>
     <content src="index.html" />
     <plugin name="cordova-plugin-screen-orientation" spec="^3.0.1" />
-    <plugin name="cordova-plugin-zip" spec="^3.1.0" />
-    <plugin name="cordova-plugin-code-push" spec="^1.11.18" />
-    <plugin name="cordova-plugin-fcm-with-dependecy-updated" spec="https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-2.9.0">
-        <variable name="FCM_CORE_VERSION" value="16.0.9" />
-        <variable name="FCM_VERSION" value="18.0.0" />
-        <variable name="GRADLE_TOOLS_VERSION" value="3.5.0" />
-        <variable name="GOOGLE_SERVICES_VERSION" value="4.2.0" />
-        <variable name="ANDROID_DEFAULT_NOTIFICATION_ICON" value="@mipmap/ic_launcher" />
-    </plugin>
     <plugin name="cordova-plugin-file-opener2" spec="^2.2.0" />
     <plugin name="cordova-plugin-printer" spec="^0.8.0" />
-    <plugin name="com.jjdltc.cordova.plugin.zip" spec="https://github.com/swayangjit/jjdltc-cordova-plugin-zip.git" />
     <plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
     <plugin name="cordova-plugin-whitelist" spec="^1.3.4" />
-    <plugin name="cordova-plugin-ionic-webview" spec="^4.1.3" />
     <plugin name="cordova-plugin-app-version" spec="^0.1.9" />
-    <plugin name="cordova-plugin-x-socialsharing" spec="^5.6.4" />
+    <plugin name="cordova-plugin-x-socialsharing" spec="^6.0.2" />
+    <plugin name="cordova-plugin-androidx-adapter" spec="^1.1.3" />
     <plugin name="cordova-plugin-device" spec="^2.0.3" />
     <plugin name="cordova-plugin-file" spec="^6.0.2" />
     <plugin name="cordova-plugin-file-transfer" spec="^1.7.1" />
@@ -130,26 +144,23 @@
     <plugin name="cordova-plugin-local-notification" spec="https://github.com/katzer/cordova-plugin-local-notifications.git">
         <variable name="ANDROID_SUPPORT_V4_VERSION" value="26.+" />
     </plugin>
-    <plugin name="cordova-plugin-advanced-http" spec="^2.4.1" />
-    <plugin name="cordova-plugin-android-permissions" spec="^1.0.2" />
+    <plugin name="cordova-plugin-advanced-http" spec="^2.5.1" />
+    <plugin name="cordova-plugin-android-permissions" spec="^1.1.2" />
     <plugin name="cordova-plugin-media" spec="^5.0.3" />
-    <plugin name="cordova.plugins.diagnostic" spec="^5.0.1">
+    <plugin name="cordova.plugins.diagnostic" spec="^5.0.2">
         <variable name="ANDROID_SUPPORT_VERSION" value="28.+" />
     </plugin>
-    <plugin name="sb-cordova-plugin-utility" spec="https://github.com/Sunbird-Ed/sb-cordova-plugin-utility.git" />
-    <plugin name="cordova-plugin-android-downloadmanager" spec="https://github.com/Sunbird-Ed/sb-cordova-plugin-downloadmanager.git#release-2.9.0" />
-    <plugin name="sb-cordova-plugin-db" spec="https://github.com/Sunbird-Ed/sb-cordova-plugin-db.git" />
-    <plugin name="cordova-android-support-gradle-release" spec="^3.0.1">
-        <variable name="ANDROID_SUPPORT_VERSION" value="28.0.0" />
-    </plugin>
+    <plugin name="com.telerik.plugins.nativepagetransitions" spec="^0.6.5" />
+    <plugin name="cordova-plugin-proguard" spec="https://github.com/greybax/cordova-plugin-proguard.git" />
+    <plugin name="sb-cordova-plugin-db" spec="https://github.com/shikshalokam/sb-cordova-plugin-db.git" />
     <plugin name="sb-cordova-plugin-customtabs" spec="https://github.com/Sunbird-Ed/sb-cordova-plugin-customtabs.git">
         <variable name="URL_SCHEME" value="@string/custom_scheme_url" />
         <variable name="URL_HOST" value="mobile" />
     </plugin>
     <plugin name="cordova-plugin-openrap" spec="https://github.com/project-sunbird/cordova-plugin-openrap.git" />
-    <plugin name="cordova-plugin-qr-scanner" spec="https://github.com/project-sunbird/cordova-plugin-qr-scanner.git" />
-    <plugin name="cordova-plugin-sunbirdsplash" spec="https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git" />
+    <plugin name="cordova-plugin-qr-scanner" spec="https://github.com/project-sunbird/cordova-plugin-qr-scanner.git#release-3.3.0" />
+    <plugin name="cordova-plugin-sunbirdsplash" spec="https://github.com/shikshalokam/cordova-plugin-sunbirdsplash.git#release-3.9.0-ios" />
     <plugin name="cordova-plugin-file-support" spec="https://github.com/project-sunbird/cordova-plugin-file-support.git" />
-     <plugin name="com.telerik.plugins.nativepagetransitions" spec="^0.6.5" />
-    <engine name="android" spec="~8.1.0" />
+    <plugin name="cordova-plugin-inappupdatemanager" spec="https://github.com/subranil/cordova-plugin-inappupdatemanager.git" />
+    <plugin name="cordova-sqlite-storage" spec="^6.0.0" />
 </widget>
diff --git a/content-player/canvas-interface.js b/content-player/canvas-interface.js
index fcd76185e..81786ed61 100644
--- a/content-player/canvas-interface.js
+++ b/content-player/canvas-interface.js
@@ -56,6 +56,10 @@ if (!window.genieservice) {
     });
   };
 
+  var checkMaxLimit = function checkMaxLimit(request) {
+    return window.parent.handleAction('checkMaxLimit', [request]);
+  };
+
   var showExitConfirmPopup = function showExitConfirmPopup() {
     return window.parent.handleAction('showExitConfirmPopup');
   }
@@ -74,6 +78,7 @@ if (!window.genieservice) {
       endContent: endContent,
       launchContent: launchContent,
       sendTelemetry: sendTelemetry,
+      checkMaxLimit: checkMaxLimit,
       showExitConfirmPopup: showExitConfirmPopup
     };
   }();
diff --git a/faq.js b/faq.js
index 371536ca8..d155b6d42 100644
--- a/faq.js
+++ b/faq.js
@@ -2,20 +2,30 @@ var fs = require("fs");
 var fsextra = require('fs-extra');
 
 var languageList = [
+    "Assamese",
+    "Bengali",
     "English",
+    "Gujarati",
     "Hindi",
     "Kannada",
     "Marathi",
+    "Oriya",
+    "Punjabi",
     "Tamil",
     "Telugu",
     "Urdu"
 ];
 
 var languageCodeList = [
+    "as",
+    "bn",
     "en",
+    "gu",
     "hi",
     "kn",
     "mr",
+    "or",
+    "pa",
     "ta",
     "te",
     "ur"
diff --git a/main.js b/main.js
index f2ae57722..8f452c538 100644
--- a/main.js
+++ b/main.js
@@ -25,7 +25,7 @@ var formRequestArray = [{
     },
     {
         'type': 'config',
-        'subType': 'content',
+        'subType': 'content_v2',
         'action': 'filter'
     },
     {
@@ -36,8 +36,7 @@ var formRequestArray = [{
     {
         'type': 'user',
         'subType': 'externalIdVerification',
-        'action': 'onboarding',
-        'rootOrgId': '*'
+        'action': 'onboarding'
     },
     {
         'type':'contentfeedback',
@@ -48,6 +47,98 @@ var formRequestArray = [{
         'type': 'config',
         'subType': 'webview_version',
         'action': 'get'
+    },
+    {
+        'type': 'user',
+        'subType': 'manageduser',
+        'action': 'create',
+        'component': 'app'
+    },
+    {
+        'type': 'group',
+        'subType': 'activities_v2',
+        'action': 'list'
+    },
+    {
+        'type': 'dynamicform',
+        'subType': 'support_v2',
+        'action': 'get',
+        'component': 'app'
+    },
+    {
+        'type': 'form',
+        'subType': 'boardContactInfo',
+        'action': 'get',
+        'component': 'app'
+    },
+    {
+        'type': 'config',
+        'subType': 'notification',
+        'action': 'get',
+        'component': 'app'
+    },
+    {
+        'type': 'config',
+        'subType': 'boardAlias',
+        'action': 'get',
+        'component': 'app'
+    },
+    {
+        'type': 'dynamicform',
+        'subType': 'consentdeclaration_v2',
+        'action': 'submit',
+        'component': 'app'
+    },
+    {
+        'type': 'dynamicform',
+        'subType': 'contentrequest',
+        'action': 'submit',
+        'component': 'app'
+    },
+    {
+        'type': 'config',
+        'subType': 'library_v4',
+        'action': 'get',
+        'component': 'app'
+    },
+    {
+        'type': 'config',
+        'subType': 'course_v3',
+        'action': 'get',
+        'component': 'app'
+    },
+    {
+        'type': 'config',
+        'subType': 'pdfPlayer',
+        'action': 'get'
+    },
+    {
+        'type': 'config',
+        'subType': 'userType_v2',
+        'action': 'get',
+        'component': 'app'
+    },
+    {
+        'type': 'profileConfig',
+        'subType': 'default',
+        'action': 'get'
+    },
+    {
+        'type': 'config',
+        'subType': 'adminHome',
+        'action': 'get',
+        'component': 'app'
+    },
+    {
+        'type': 'config',
+        'subType': 'deeplink',
+        'action': 'get'
+    },
+    {
+        "type": "config",
+        "subType": "search",
+        "action": "filter_v3",
+        "component": "app"
     }
 ];
 
@@ -221,10 +312,13 @@ async function saveFrameworkResponse(apiKey, baseUrl, response, rootDir, apiFram
 async function saveFormResponse(apiKey, baseUrl, apiForm, rootDir) {
     for (var i = 0; i < formRequestArray.length; i++) {
         const formRequest = formRequestArray[i];
-        let fileName = formRequest.type + '_' + formRequest.subType + '_' + formRequest.action;;
+        let fileName = formRequest.type + '_' + formRequest.subType + '_' + formRequest.action;
         if (formRequest.rootOrgId) {
             fileName += ('_' + formRequest.rootOrgId);
         }
+        if (formRequest.component) {
+            fileName += ('_' + formRequest.component);
+        }
         await makeAPICallnSaveResponse({
             apiKey: apiKey,
             baseUrl: baseUrl,
diff --git a/package-lock.json b/package-lock.json
index 82ace02ce..931dc1d3f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,11 +5,13 @@
   "requires": true,
   "dependencies": {
     "@angular-builders/custom-webpack": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-7.5.2.tgz",
-      "integrity": "sha512-QvH/4cr8RYC7+A67/ASCoizrFdnMDhs05ZZ+3wrkWlj+nbKI9eKTJIdfBsDm0qP+zEx1d9Hr6oz6CXNNwuMA9g==",
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-8.4.1.tgz",
+      "integrity": "sha512-FbBt4mFbAxETdYLb6tTX869pIpm8nMiCpT34jROejuqLtsljymdqXhSCEWogWlel8ULAYus6BNdzZyRLyAkfqQ==",
       "requires": {
-        "lodash": "^4.17.10"
+        "lodash": "^4.17.10",
+        "ts-node": "^8.5.2",
+        "webpack-merge": "^4.2.1"
       }
     },
     "@angular-builders/dev-server": {
@@ -18,233 +20,589 @@
       "integrity": "sha512-rFr0NyFcwTb4RkkboYQN5JeR9ZraOkfUrQYljMSe/O01MM3SJvE8LYJbsyMwGtp71Rc8T6JrpdxaNEeYCV/4PA=="
     },
     "@angular-devkit/architect": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.9.tgz",
-      "integrity": "sha512-EAFtCs9dsGhpMRC45PoYsrkiExpWz9Ax15qXfzwdDRacz5DmdOVt+QpkLW1beUOwiyj/bhFyj23eaONK2RTn/w==",
+      "version": "0.803.29",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.29.tgz",
+      "integrity": "sha512-yHBud/fZHTelX24yjQg5lefZrfIebruoFTGeOwF0JdX8+KiHcTIxS4LOnUTYriasfHarcHRFXBAV/bRm+wv5ow==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "7.3.9",
-        "rxjs": "6.3.3"
+        "@angular-devkit/core": "8.3.29",
+        "rxjs": "6.4.0"
       },
       "dependencies": {
         "rxjs": {
-          "version": "6.3.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
           }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
         }
       }
     },
     "@angular-devkit/build-angular": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.13.9.tgz",
-      "integrity": "sha512-onh07LhdxotDFjja0KKsDWNCwgpM/ymuRr5h0e+vT4AgklP2Uioz1CpzVOgxPIKkdVdGR9QgDinVsWAmY90J8g==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/architect": "0.13.9",
-        "@angular-devkit/build-optimizer": "0.13.9",
-        "@angular-devkit/build-webpack": "0.13.9",
-        "@angular-devkit/core": "7.3.9",
-        "@ngtools/webpack": "7.3.9",
-        "ajv": "6.9.1",
-        "autoprefixer": "9.4.6",
-        "circular-dependency-plugin": "5.0.2",
+      "version": "0.803.29",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.803.29.tgz",
+      "integrity": "sha512-XAgfP1gi0rEJ3oVt+8ipvS5RfPNbeK5r2n8Ll2H3xkKjU0p1PN8+S6/0XVBtmMfeQ06SJWEAKFcAYqrxXhVTzw==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/architect": "0.803.29",
+        "@angular-devkit/build-optimizer": "0.803.29",
+        "@angular-devkit/build-webpack": "0.803.29",
+        "@angular-devkit/core": "8.3.29",
+        "@babel/core": "7.8.7",
+        "@babel/preset-env": "7.8.7",
+        "@ngtools/webpack": "8.3.29",
+        "ajv": "6.12.3",
+        "autoprefixer": "9.6.1",
+        "browserslist": "4.10.0",
+        "cacache": "12.0.2",
+        "caniuse-lite": "1.0.30001035",
+        "circular-dependency-plugin": "5.2.0",
         "clean-css": "4.2.1",
-        "copy-webpack-plugin": "4.6.0",
-        "file-loader": "3.0.1",
-        "glob": "7.1.3",
-        "istanbul-instrumenter-loader": "3.0.1",
-        "karma-source-map-support": "1.3.0",
+        "copy-webpack-plugin": "6.0.3",
+        "core-js": "3.6.4",
+        "coverage-istanbul-loader": "2.0.3",
+        "file-loader": "4.2.0",
+        "find-cache-dir": "3.0.0",
+        "glob": "7.1.4",
+        "jest-worker": "24.9.0",
+        "karma-source-map-support": "1.4.0",
         "less": "3.9.0",
-        "less-loader": "4.1.0",
-        "license-webpack-plugin": "2.1.0",
+        "less-loader": "5.0.0",
+        "license-webpack-plugin": "2.1.2",
         "loader-utils": "1.2.3",
-        "mini-css-extract-plugin": "0.5.0",
+        "mini-css-extract-plugin": "0.8.0",
         "minimatch": "3.0.4",
-        "node-sass": "4.12.0",
-        "open": "6.0.0",
+        "open": "6.4.0",
         "parse5": "4.0.0",
-        "postcss": "7.0.14",
+        "postcss": "7.0.17",
         "postcss-import": "12.0.1",
         "postcss-loader": "3.0.0",
-        "raw-loader": "1.0.0",
-        "rxjs": "6.3.3",
-        "sass-loader": "7.1.0",
-        "semver": "5.6.0",
+        "raw-loader": "3.1.0",
+        "regenerator-runtime": "0.13.3",
+        "rxjs": "6.4.0",
+        "sass": "1.22.9",
+        "sass-loader": "7.2.0",
+        "semver": "6.3.0",
+        "source-map": "0.7.3",
         "source-map-loader": "0.2.4",
-        "source-map-support": "0.5.10",
+        "source-map-support": "0.5.13",
         "speed-measure-webpack-plugin": "1.3.1",
-        "stats-webpack-plugin": "0.7.0",
-        "style-loader": "0.23.1",
+        "style-loader": "1.0.0",
         "stylus": "0.54.5",
         "stylus-loader": "3.0.2",
-        "terser-webpack-plugin": "1.2.2",
-        "tree-kill": "1.2.1",
-        "webpack": "4.29.0",
-        "webpack-dev-middleware": "3.5.1",
-        "webpack-dev-server": "3.1.14",
+        "terser": "4.6.3",
+        "terser-webpack-plugin": "3.0.3",
+        "tree-kill": "1.2.2",
+        "webpack": "4.39.2",
+        "webpack-dev-middleware": "3.7.2",
+        "webpack-dev-server": "3.11.0",
         "webpack-merge": "4.2.1",
-        "webpack-sources": "1.3.0",
-        "webpack-subresource-integrity": "1.1.0-rc.6"
+        "webpack-sources": "1.4.3",
+        "webpack-subresource-integrity": "1.1.0-rc.6",
+        "worker-plugin": "3.2.0"
       },
       "dependencies": {
+        "@babel/core": {
+          "version": "7.8.7",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz",
+          "integrity": "sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.8.3",
+            "@babel/generator": "^7.8.7",
+            "@babel/helpers": "^7.8.4",
+            "@babel/parser": "^7.8.7",
+            "@babel/template": "^7.8.6",
+            "@babel/traverse": "^7.8.6",
+            "@babel/types": "^7.8.7",
+            "convert-source-map": "^1.7.0",
+            "debug": "^4.1.0",
+            "gensync": "^1.0.0-beta.1",
+            "json5": "^2.1.0",
+            "lodash": "^4.17.13",
+            "resolve": "^1.3.2",
+            "semver": "^5.4.1",
+            "source-map": "^0.5.0"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "5.7.1",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+              "dev": true
+            },
+            "source-map": {
+              "version": "0.5.7",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+              "dev": true
+            }
+          }
+        },
+        "@babel/preset-env": {
+          "version": "7.8.7",
+          "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.8.7.tgz",
+          "integrity": "sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==",
+          "dev": true,
+          "requires": {
+            "@babel/compat-data": "^7.8.6",
+            "@babel/helper-compilation-targets": "^7.8.7",
+            "@babel/helper-module-imports": "^7.8.3",
+            "@babel/helper-plugin-utils": "^7.8.3",
+            "@babel/plugin-proposal-async-generator-functions": "^7.8.3",
+            "@babel/plugin-proposal-dynamic-import": "^7.8.3",
+            "@babel/plugin-proposal-json-strings": "^7.8.3",
+            "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
+            "@babel/plugin-proposal-object-rest-spread": "^7.8.3",
+            "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
+            "@babel/plugin-proposal-optional-chaining": "^7.8.3",
+            "@babel/plugin-proposal-unicode-property-regex": "^7.8.3",
+            "@babel/plugin-syntax-async-generators": "^7.8.0",
+            "@babel/plugin-syntax-dynamic-import": "^7.8.0",
+            "@babel/plugin-syntax-json-strings": "^7.8.0",
+            "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
+            "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+            "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
+            "@babel/plugin-syntax-optional-chaining": "^7.8.0",
+            "@babel/plugin-syntax-top-level-await": "^7.8.3",
+            "@babel/plugin-transform-arrow-functions": "^7.8.3",
+            "@babel/plugin-transform-async-to-generator": "^7.8.3",
+            "@babel/plugin-transform-block-scoped-functions": "^7.8.3",
+            "@babel/plugin-transform-block-scoping": "^7.8.3",
+            "@babel/plugin-transform-classes": "^7.8.6",
+            "@babel/plugin-transform-computed-properties": "^7.8.3",
+            "@babel/plugin-transform-destructuring": "^7.8.3",
+            "@babel/plugin-transform-dotall-regex": "^7.8.3",
+            "@babel/plugin-transform-duplicate-keys": "^7.8.3",
+            "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
+            "@babel/plugin-transform-for-of": "^7.8.6",
+            "@babel/plugin-transform-function-name": "^7.8.3",
+            "@babel/plugin-transform-literals": "^7.8.3",
+            "@babel/plugin-transform-member-expression-literals": "^7.8.3",
+            "@babel/plugin-transform-modules-amd": "^7.8.3",
+            "@babel/plugin-transform-modules-commonjs": "^7.8.3",
+            "@babel/plugin-transform-modules-systemjs": "^7.8.3",
+            "@babel/plugin-transform-modules-umd": "^7.8.3",
+            "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
+            "@babel/plugin-transform-new-target": "^7.8.3",
+            "@babel/plugin-transform-object-super": "^7.8.3",
+            "@babel/plugin-transform-parameters": "^7.8.7",
+            "@babel/plugin-transform-property-literals": "^7.8.3",
+            "@babel/plugin-transform-regenerator": "^7.8.7",
+            "@babel/plugin-transform-reserved-words": "^7.8.3",
+            "@babel/plugin-transform-shorthand-properties": "^7.8.3",
+            "@babel/plugin-transform-spread": "^7.8.3",
+            "@babel/plugin-transform-sticky-regex": "^7.8.3",
+            "@babel/plugin-transform-template-literals": "^7.8.3",
+            "@babel/plugin-transform-typeof-symbol": "^7.8.4",
+            "@babel/plugin-transform-unicode-regex": "^7.8.3",
+            "@babel/types": "^7.8.7",
+            "browserslist": "^4.8.5",
+            "core-js-compat": "^3.6.2",
+            "invariant": "^2.2.2",
+            "levenary": "^1.1.1",
+            "semver": "^5.5.0"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "5.7.1",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+              "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+              "dev": true
+            }
+          }
+        },
+        "ajv": {
+          "version": "6.12.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "core-js": {
+          "version": "3.6.4",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+          "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+          "dev": true
+        },
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "glob": {
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "json5": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "regenerator-runtime": {
+          "version": "0.13.3",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
+          "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==",
+          "dev": true
+        },
         "rxjs": {
-          "version": "6.3.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
           }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "dev": true
+        },
+        "source-map-support": {
+          "version": "0.5.13",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+          "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.6.1",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+              "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+              "dev": true
+            }
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        },
+        "webpack-merge": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz",
+          "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==",
+          "dev": true,
+          "requires": {
+            "lodash": "^4.17.5"
+          }
         }
       }
     },
     "@angular-devkit/build-optimizer": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.13.9.tgz",
-      "integrity": "sha512-GQtCntthQHSBv5l1ZY5p00JOECb/WcE1qUBo5kFjp84z0fszDkhOy52M1kcWCX4PFzJaY4DKk58hbUE/2UN0jw==",
+      "version": "0.803.29",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.803.29.tgz",
+      "integrity": "sha512-E/MXtKc3oaP7UvQm0g4ayfH8ImEoQnRWseKD4jjYG6TbTIqfIyHCZRcKIr3svY28hzASbro5IZI6SugG+llvFw==",
       "dev": true,
       "requires": {
         "loader-utils": "1.2.3",
-        "source-map": "0.5.6",
-        "typescript": "3.2.4",
-        "webpack-sources": "1.3.0"
+        "source-map": "0.7.3",
+        "tslib": "1.10.0",
+        "typescript": "3.5.3",
+        "webpack-sources": "1.4.3"
       },
       "dependencies": {
         "source-map": {
-          "version": "0.5.6",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "dev": true
+        },
+        "tslib": {
+          "version": "1.10.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+          "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
           "dev": true
         },
         "typescript": {
-          "version": "3.2.4",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz",
-          "integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==",
+          "version": "3.5.3",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz",
+          "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==",
           "dev": true
         }
       }
     },
     "@angular-devkit/build-webpack": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.13.9.tgz",
-      "integrity": "sha512-6ypu6pzNmQxzATF4rTWEhGSl5hyGQ8a/3aCZF/ux+XGc3d4hi2HW+NWlDm1UEna6ZjNtgEPlgfP4q8BKrjRmfA==",
+      "version": "0.803.29",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.803.29.tgz",
+      "integrity": "sha512-3dJ3iEGU6AFT8VFTe72T9uNLobfd18Sq5Hz22UCCYji9K3ZyVc/bn5uXVVX+/Yj91MFtXuhOjLj7Z+XDeNy+OQ==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.13.9",
-        "@angular-devkit/core": "7.3.9",
-        "rxjs": "6.3.3"
+        "@angular-devkit/architect": "0.803.29",
+        "@angular-devkit/core": "8.3.29",
+        "rxjs": "6.4.0"
       },
       "dependencies": {
         "rxjs": {
-          "version": "6.3.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
           }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
         }
       }
     },
     "@angular-devkit/core": {
-      "version": "7.3.9",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.9.tgz",
-      "integrity": "sha512-SaxD+nKFW3iCBKsxNR7+66J30EexW/y7tm8m5AvUH+GwSAgIj0ZYmRUzFEPggcaLVA4WnE/YWqIXZMJW5dT7gw==",
+      "version": "8.3.29",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.29.tgz",
+      "integrity": "sha512-4jdja9QPwR6XG14ZSunyyOWT3nE2WtZC5IMDIBZADxujXvhzOU0n4oWpy6/JVHLUAxYNNgzLz+/LQORRWndcPg==",
       "dev": true,
       "requires": {
-        "ajv": "6.9.1",
-        "chokidar": "2.0.4",
+        "ajv": "6.12.3",
         "fast-json-stable-stringify": "2.0.0",
-        "rxjs": "6.3.3",
+        "magic-string": "0.25.3",
+        "rxjs": "6.4.0",
         "source-map": "0.7.3"
       },
       "dependencies": {
+        "ajv": {
+          "version": "6.12.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
+          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "fast-json-stable-stringify": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+          "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+          "dev": true
+        },
         "rxjs": {
-          "version": "6.3.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
           }
+        },
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "dev": true
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
         }
       }
     },
     "@angular-devkit/schematics": {
-      "version": "7.3.9",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.9.tgz",
-      "integrity": "sha512-xzROGCYp7aQbeJ3V6YC0MND7wKEAdWqmm/GaCufEk0dDS8ZGe0sQhcM2oBRa2nQqGQNeThFIH51kx+FayrJP0w==",
+      "version": "8.3.29",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.29.tgz",
+      "integrity": "sha512-AFJ9EK0XbcNlO5Dm9vr0OlBo1Nw6AaFXPR+DmHGBdcDDHxqEmYYLWfT+JU/8U2YFIdgrtlwvdtf6UQ3V2jdz1g==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "7.3.9",
-        "rxjs": "6.3.3"
+        "@angular-devkit/core": "8.3.29",
+        "rxjs": "6.4.0"
       },
       "dependencies": {
         "rxjs": {
-          "version": "6.3.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
           }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
         }
       }
     },
     "@angular/animations": {
-      "version": "7.2.15",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.15.tgz",
-      "integrity": "sha512-8oBt3HLgd2+kyJHUgsd7OzKCCss67t2sch15XNoIWlOLfxclqU+EfFE6t/vCzpT8/+lpZS6LU9ZrTnb+UBj5jg==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.14.tgz",
+      "integrity": "sha512-3Vc9TnNpKdtvKIXcWDFINSsnwgEMiDmLzjceWg1iYKwpeZGQahUXPoesLwQazBMmxJzQiA4HOMj0TTXKZ+Jzkg==",
       "requires": {
         "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
       }
     },
     "@angular/cli": {
-      "version": "7.3.9",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-7.3.9.tgz",
-      "integrity": "sha512-7oJj7CKDlFUbQav1x1CV4xKKcbt0pnxY4unKcm7Q1tVXhu8bU2bc3cDA0aJnbofcYb6TJcd/C2qHgCt78q7edA==",
+      "version": "8.3.29",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-8.3.29.tgz",
+      "integrity": "sha512-pW+iU0eKHIae+A1b9W5g8DKefMQcehZ+drGKs4Hryh8G+XGFS00BIWkmh6c1mydWTEhdsFlhdjD/rXCem7MAQQ==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.13.9",
-        "@angular-devkit/core": "7.3.9",
-        "@angular-devkit/schematics": "7.3.9",
-        "@schematics/angular": "7.3.9",
-        "@schematics/update": "0.13.9",
+        "@angular-devkit/architect": "0.803.29",
+        "@angular-devkit/core": "8.3.29",
+        "@angular-devkit/schematics": "8.3.29",
+        "@schematics/angular": "8.3.29",
+        "@schematics/update": "0.803.29",
         "@yarnpkg/lockfile": "1.1.0",
+        "ansi-colors": "4.1.1",
+        "debug": "^4.1.1",
         "ini": "1.3.5",
-        "inquirer": "6.2.1",
+        "inquirer": "6.5.1",
         "npm-package-arg": "6.1.0",
-        "open": "6.0.0",
-        "pacote": "9.4.0",
-        "semver": "5.6.0",
-        "symbol-observable": "1.2.0"
+        "npm-pick-manifest": "3.0.2",
+        "open": "6.4.0",
+        "pacote": "9.5.5",
+        "read-package-tree": "5.3.1",
+        "rimraf": "3.0.0",
+        "semver": "6.3.0",
+        "symbol-observable": "1.2.0",
+        "universal-analytics": "^0.4.20",
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "ansi-colors": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+          "dev": true
+        },
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ini": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+          "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz",
+          "integrity": "sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
       }
     },
     "@angular/common": {
-      "version": "7.2.15",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.15.tgz",
-      "integrity": "sha512-2b5JY2HWVHCf3D1GZjmde7jdAXSTXkYtmjLtA9tQkjOOTr80eHpNSujQqnzb97dk9VT9OjfjqTQd7K3pxZz8jw==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.14.tgz",
+      "integrity": "sha512-Qmt+aX2quUW54kaNT7QH7WGXnFxr/cC2C6sf5SW5SdkZfDQSiz8IaItvieZfXVQUbBOQKFRJ7TlSkt0jI/yjvw==",
       "requires": {
         "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
       }
     },
     "@angular/compiler": {
-      "version": "7.2.15",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.15.tgz",
-      "integrity": "sha512-5yb4NcLk8GuXkYf7Dcor4XkGueYp4dgihzDmMjYDUrV0NPhubKlr+SwGtLOtzgRBWJ1I2bO0S3zwa0q0OgIPOw==",
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.0.3.tgz",
+      "integrity": "sha512-1/vF8D6l1O6IfWiDtaj6nC+B8CtkVtFgXgooDzLBO6XAkaCuJCnhKT1HnpWG5GtVsGaY9MGoTl1vE9ZMDbRQjg==",
       "dev": true,
       "requires": {
         "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        }
       }
     },
     "@angular/compiler-cli": {
-      "version": "7.2.15",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.15.tgz",
-      "integrity": "sha512-+AsfyKawmj/sa+m4Pz8VSRFbCfx/3IOjAuuEjhopbyr154YpPDSu8NTbcwzq3yfbVcPwK4/4exmbQzpsndaCTg==",
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-8.0.3.tgz",
+      "integrity": "sha512-6nckvBnnp1YnrxwCB8UKvhHAMcUa1WvGjbYMEqhgiBreiRT4ub+tKVPNzrRtQFPpcXtY1wlgOWqYHWhHRtcLlg==",
       "dev": true,
       "requires": {
         "canonical-path": "1.0.0",
@@ -257,7 +615,7 @@
         "shelljs": "^0.8.1",
         "source-map": "^0.6.1",
         "tslib": "^1.9.0",
-        "yargs": "9.0.1"
+        "yargs": "13.1.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -266,271 +624,202 @@
           "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
-        "camelcase": {
+        "cliui": {
           "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
-        "chokidar": {
-          "version": "2.1.5",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
-          "integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
-          }
-        },
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "execa": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
           "dev": true,
           "requires": {
-            "cross-spawn": "^5.0.1",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          },
+          "dependencies": {
+            "string-width": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+              "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+              "dev": true,
+              "requires": {
+                "is-fullwidth-code-point": "^2.0.0",
+                "strip-ansi": "^4.0.0"
+              }
+            }
           }
         },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "load-json-file": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+        "shelljs": {
+          "version": "0.8.4",
+          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
+          "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "strip-bom": "^3.0.0"
+            "glob": "^7.0.0",
+            "interpret": "^1.0.0",
+            "rechoir": "^0.6.2"
           }
         },
-        "mem": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-          "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "mimic-fn": "^1.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
-        "mimic-fn": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-          "dev": true
-        },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
           "dev": true
         },
-        "os-locale": {
+        "wrap-ansi": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
           "dev": true,
           "requires": {
-            "execa": "^0.7.0",
-            "lcid": "^1.0.0",
-            "mem": "^1.1.0"
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+              "dev": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+              "dev": true,
+              "requires": {
+                "number-is-nan": "^1.0.0"
+              }
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "dev": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^2.0.0"
+              }
+            }
           }
         },
-        "path-type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+        "yargs": {
+          "version": "13.1.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.1.0.tgz",
+          "integrity": "sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==",
           "dev": true,
           "requires": {
-            "pify": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-          "dev": true,
-          "requires": {
-            "load-json-file": "^2.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^2.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-          "dev": true,
-          "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^2.0.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        },
-        "which-module": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-          "dev": true
-        },
-        "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-          "dev": true
-        },
-        "yargs": {
-          "version": "9.0.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
-          "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^4.1.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^2.0.0",
-            "read-pkg-up": "^2.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^7.0.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
-          "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^4.1.0"
+            "cliui": "^4.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "os-locale": "^3.1.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.0.0"
           }
         }
       }
     },
     "@angular/core": {
-      "version": "7.2.15",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.15.tgz",
-      "integrity": "sha512-XsuYm0jEU/mOqwDOk2utThv8J9kESkAerfuCHClE9rB2TtHUOGCfekF7lJWqjjypu6/J9ygoPFo7hdAE058ZGg==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.14.tgz",
+      "integrity": "sha512-zeePkigi+hPh3rN7yoNENG/YUBUsIvUXdxx+AZq+QPaFeKEA2FBSrKn36ojHFrdJUjKzl0lPMEiGC2b6a6bo6g==",
       "requires": {
         "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
       }
     },
     "@angular/forms": {
-      "version": "7.2.15",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.15.tgz",
-      "integrity": "sha512-p0kcIQLtBBC1qeTA6M3nOuXf/k91E80FKquVM9zEsO2kDjI0oZJVfFYL2UMov5samlJOPN+t6lRHEIUa7ApPsw==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "@angular/http": {
-      "version": "7.2.15",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.15.tgz",
-      "integrity": "sha512-TR7PEdmLWNIre3Zn8lvyb4lSrvPUJhKLystLnp4hBMcWsJqq5iK8S3bnlR4viZ9HMlf7bW7+Hm4SI6aB3tdUtw==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.14.tgz",
+      "integrity": "sha512-zhyKL3CFIqcyHJ/TQF/h1OZztK611a6rxuPHCrt/5Sn1SuBTJJQ1pPTkOYIDy6IrCrtyANc8qB6P17Mao71DNQ==",
       "requires": {
         "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
       }
     },
     "@angular/language-service": {
-      "version": "7.2.15",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.2.15.tgz",
-      "integrity": "sha512-Ig5Jr7mnDelaZvSbUd9YhI5am3q1ku9xelAuwvtyDKvQJeKQj3BtTagcOgWrnQBfrJ/FsA/M5Zo48ncSsV0tqQ==",
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-8.0.3.tgz",
+      "integrity": "sha512-04XojOo9FJgEQE/rZafnaJQxPEU+//TSzTgpGoIVzCSMx+joCY/ZSSwJZPWxiHlOE57W/zX02ZY+TwcM81oTdw==",
       "dev": true
     },
     "@angular/platform-browser": {
-      "version": "7.2.15",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.15.tgz",
-      "integrity": "sha512-aYgmPsbC9Tvp9vmKWD8voeAp4crwCay7/D6lM3ClEe2EeK934LuEXq3/uczMrFVbnIX7BBIo8fh03Tl7wbiGPw==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.14.tgz",
+      "integrity": "sha512-MtJptptyKzsE37JZ2VB/tI4cvMrdAH+cT9pMBYZd66YSZfKjIj5s+AZo7z8ncoskQSB1o3HMfDjSK7QXGx1mLQ==",
       "requires": {
         "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "7.2.15",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.15.tgz",
-      "integrity": "sha512-UL2PqhzXMD769NQ6Lh6pxlBDKvN9Qol3XLRFil80lwJ1GRW16ITeYbCamcafIH2GOyd88IhmYcbMfUQ/6q4MMQ==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.14.tgz",
+      "integrity": "sha512-mO2JPR5kLU/A3AQngy9+R/Q5gaF9csMStBQjwsCRI0wNtlItOIGL6+wTYpiTuh/ux+WVN1F2sLcEYU4Zf1ud9A==",
       "requires": {
         "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
       }
     },
     "@angular/router": {
-      "version": "7.2.15",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.15.tgz",
-      "integrity": "sha512-qAubRJRQanguUqJQ76J9GSZ4JFtoyhJKRmX5P23ANZJXpB6YLzF2fJmOGi+E6cV8F0tKBMEq1pjxFTisx0MXwQ==",
+      "version": "8.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.14.tgz",
+      "integrity": "sha512-DHA2BhODqV7F0g6ZKgFaZgbsqzHHWRcfWchCOrOVKu2rYiKUTwwHVLBgZAhrpNeinq2pWanVYSIhMr7wy+LfEA==",
       "requires": {
         "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
       }
     },
     "@angularclass/hmr": {
@@ -540,113 +829,59 @@
       "dev": true
     },
     "@babel/code-frame": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
-      "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
+      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.0.0"
+        "@babel/highlight": "^7.14.5"
       }
     },
     "@babel/compat-data": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.0.tgz",
-      "integrity": "sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.9.1",
-        "invariant": "^2.2.4",
-        "semver": "^5.5.0"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
-          "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30001043",
-            "electron-to-chromium": "^1.3.413",
-            "node-releases": "^1.1.53",
-            "pkg-up": "^2.0.0"
-          }
-        },
-        "caniuse-lite": {
-          "version": "1.0.30001046",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001046.tgz",
-          "integrity": "sha512-CsGjBRYWG6FvgbyGy+hBbaezpwiqIOLkxQPY4A4Ea49g1eNsnQuESB+n4QM0BKii1j80MyJ26Ir5ywTQkbRE4g==",
-          "dev": true
-        },
-        "electron-to-chromium": {
-          "version": "1.3.415",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.415.tgz",
-          "integrity": "sha512-GbtYqKffx3sU8G0HxwXuJFfs58Q7+iwLa5rBwaULwET6jWW8IAQSrVnu7vEfiUIcMVfbYyFg7cw3zdm+EbBJmw==",
-          "dev": true
-        },
-        "node-releases": {
-          "version": "1.1.53",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz",
-          "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==",
-          "dev": true
-        }
-      }
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.7.tgz",
+      "integrity": "sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==",
+      "dev": true
     },
     "@babel/core": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.7.tgz",
-      "integrity": "sha512-jlSjuj/7z138NLZALxVgrx13AOtqip42ATZP7+kYl53GvDV6+4dCek1mVUo8z8c8Xnw/mx2q3d9HWh3griuesQ==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.5.5",
-        "@babel/generator": "^7.7.7",
-        "@babel/helpers": "^7.7.4",
-        "@babel/parser": "^7.7.7",
-        "@babel/template": "^7.7.4",
-        "@babel/traverse": "^7.7.4",
-        "@babel/types": "^7.7.4",
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.6.tgz",
+      "integrity": "sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.14.5",
+        "@babel/generator": "^7.14.5",
+        "@babel/helper-compilation-targets": "^7.14.5",
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helpers": "^7.14.6",
+        "@babel/parser": "^7.14.6",
+        "@babel/template": "^7.14.5",
+        "@babel/traverse": "^7.14.5",
+        "@babel/types": "^7.14.5",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
-        "json5": "^2.1.0",
-        "lodash": "^4.17.13",
-        "resolve": "^1.3.2",
-        "semver": "^5.4.1",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.1.2",
+        "semver": "^6.3.0",
         "source-map": "^0.5.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
-          "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.0.0"
-          }
-        },
-        "convert-source-map": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-          "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.1"
-          }
-        },
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "json5": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
-          "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.0"
+            "minimist": "^1.2.5"
           }
         },
         "ms": {
@@ -655,6 +890,12 @@
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -664,23 +905,16 @@
       }
     },
     "@babel/generator": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.7.tgz",
-      "integrity": "sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz",
+      "integrity": "sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.7.4",
+        "@babel/types": "^7.14.5",
         "jsesc": "^2.5.1",
-        "lodash": "^4.17.13",
         "source-map": "^0.5.0"
       },
       "dependencies": {
-        "jsesc": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -690,1362 +924,524 @@
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz",
-      "integrity": "sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz",
+      "integrity": "sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/types": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-          "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.5",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-          "dev": true
-        }
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz",
-      "integrity": "sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz",
+      "integrity": "sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==",
       "dev": true,
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.8.3",
-        "@babel/types": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/types": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-          "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.5",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-          "dev": true
-        }
+        "@babel/helper-explode-assignable-expression": "^7.14.5",
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.8.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz",
-      "integrity": "sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz",
+      "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.8.6",
-        "browserslist": "^4.9.1",
-        "invariant": "^2.2.4",
-        "levenary": "^1.1.1",
-        "semver": "^5.5.0"
+        "@babel/compat-data": "^7.14.5",
+        "@babel/helper-validator-option": "^7.14.5",
+        "browserslist": "^4.16.6",
+        "semver": "^6.3.0"
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
-          "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
+          "version": "4.16.6",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
+          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001043",
-            "electron-to-chromium": "^1.3.413",
-            "node-releases": "^1.1.53",
-            "pkg-up": "^2.0.0"
+            "caniuse-lite": "^1.0.30001219",
+            "colorette": "^1.2.2",
+            "electron-to-chromium": "^1.3.723",
+            "escalade": "^3.1.1",
+            "node-releases": "^1.1.71"
           }
         },
         "caniuse-lite": {
-          "version": "1.0.30001046",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001046.tgz",
-          "integrity": "sha512-CsGjBRYWG6FvgbyGy+hBbaezpwiqIOLkxQPY4A4Ea49g1eNsnQuESB+n4QM0BKii1j80MyJ26Ir5ywTQkbRE4g==",
+          "version": "1.0.30001239",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz",
+          "integrity": "sha512-cyBkXJDMeI4wthy8xJ2FvDU6+0dtcZSJW3voUF8+e9f1bBeuvyZfc3PNbkOETyhbR+dGCPzn9E7MA3iwzusOhQ==",
           "dev": true
         },
-        "electron-to-chromium": {
-          "version": "1.3.415",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.415.tgz",
-          "integrity": "sha512-GbtYqKffx3sU8G0HxwXuJFfs58Q7+iwLa5rBwaULwET6jWW8IAQSrVnu7vEfiUIcMVfbYyFg7cw3zdm+EbBJmw==",
-          "dev": true
-        },
-        "node-releases": {
-          "version": "1.1.53",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz",
-          "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==",
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         }
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.4.tgz",
-      "integrity": "sha512-l+OnKACG4uiDHQ/aJT8dwpR+LhCJALxL0mJ6nzjB25e5IPwqV1VOsY7ah6UB1DG+VOXAIMtuC54rFJGiHkxjgA==",
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz",
+      "integrity": "sha512-Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.7.4",
-        "@babel/helper-member-expression-to-functions": "^7.7.4",
-        "@babel/helper-optimise-call-expression": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.7.4",
-        "@babel/helper-split-export-declaration": "^7.7.4"
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-member-expression-to-functions": "^7.14.5",
+        "@babel/helper-optimise-call-expression": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5",
+        "@babel/helper-split-export-declaration": "^7.14.5"
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.8.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz",
-      "integrity": "sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz",
+      "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.8.3",
-        "@babel/helper-regex": "^7.8.3",
-        "regexpu-core": "^4.7.0"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-          "dev": true
-        },
-        "regexpu-core": {
-          "version": "4.7.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
-          "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
-          "dev": true,
-          "requires": {
-            "regenerate": "^1.4.0",
-            "regenerate-unicode-properties": "^8.2.0",
-            "regjsgen": "^0.5.1",
-            "regjsparser": "^0.6.4",
-            "unicode-match-property-ecmascript": "^1.0.4",
-            "unicode-match-property-value-ecmascript": "^1.2.0"
-          }
-        },
-        "regjsgen": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz",
-          "integrity": "sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==",
-          "dev": true
-        },
-        "regjsparser": {
-          "version": "0.6.4",
-          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
-          "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
-          "dev": true,
-          "requires": {
-            "jsesc": "~0.5.0"
-          }
-        }
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "regexpu-core": "^4.7.1"
       }
     },
-    "@babel/helper-define-map": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz",
-      "integrity": "sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==",
+    "@babel/helper-define-polyfill-provider": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz",
+      "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.8.3",
-        "@babel/types": "^7.8.3",
-        "lodash": "^4.17.13"
+        "@babel/helper-compilation-targets": "^7.13.0",
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/traverse": "^7.13.0",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.8.3"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
-          "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.8.3",
-            "@babel/template": "^7.8.3",
-            "@babel/types": "^7.9.5"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
-          "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.9.0",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.0",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.9.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
-          "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.8.6",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-          "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/parser": "^7.8.6",
-            "@babel/types": "^7.8.6"
-          }
-        },
-        "@babel/types": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-          "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.9.5",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
+            "ms": "2.1.2"
           }
         },
-        "js-tokens": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         }
       }
     },
     "@babel/helper-explode-assignable-expression": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz",
-      "integrity": "sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz",
+      "integrity": "sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==",
       "dev": true,
       "requires": {
-        "@babel/traverse": "^7.8.3",
-        "@babel/types": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.8.3"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz",
-          "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.9.5",
-            "jsesc": "^2.5.1",
-            "lodash": "^4.17.13",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
-          "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.8.3",
-            "@babel/template": "^7.8.3",
-            "@babel/types": "^7.9.5"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
-          "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
-          "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.9.0",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.0",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.9.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
-          "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.8.6",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-          "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/parser": "^7.8.6",
-            "@babel/types": "^7.8.6"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz",
-          "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/generator": "^7.9.5",
-            "@babel/helper-function-name": "^7.9.5",
-            "@babel/helper-split-export-declaration": "^7.8.3",
-            "@babel/parser": "^7.9.0",
-            "@babel/types": "^7.9.5",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.13"
-          }
-        },
-        "@babel/types": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-          "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.5",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "js-tokens": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-          "dev": true
-        },
-        "jsesc": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-          "dev": true
-        }
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz",
-      "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
+      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.7.4",
-        "@babel/template": "^7.7.4",
-        "@babel/types": "^7.7.4"
+        "@babel/helper-get-function-arity": "^7.14.5",
+        "@babel/template": "^7.14.5",
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-get-function-arity": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz",
-      "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
+      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.7.4"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz",
-      "integrity": "sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
+      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/types": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-          "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.5",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-          "dev": true
-        }
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz",
-      "integrity": "sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz",
+      "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.7.4"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz",
-      "integrity": "sha512-dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz",
+      "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.7.4"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz",
-      "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz",
+      "integrity": "sha512-iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/helper-replace-supers": "^7.8.6",
-        "@babel/helper-simple-access": "^7.8.3",
-        "@babel/helper-split-export-declaration": "^7.8.3",
-        "@babel/template": "^7.8.6",
-        "@babel/types": "^7.9.0",
-        "lodash": "^4.17.13"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.8.3"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz",
-          "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.9.5",
-            "jsesc": "^2.5.1",
-            "lodash": "^4.17.13",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
-          "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.8.3",
-            "@babel/template": "^7.8.3",
-            "@babel/types": "^7.9.5"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
-          "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz",
-          "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-module-imports": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz",
-          "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz",
-          "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.8.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz",
-          "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.8.3",
-            "@babel/helper-optimise-call-expression": "^7.8.3",
-            "@babel/traverse": "^7.8.6",
-            "@babel/types": "^7.8.6"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
-          "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.9.0",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.0",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.9.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
-          "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.8.6",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-          "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/parser": "^7.8.6",
-            "@babel/types": "^7.8.6"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz",
-          "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/generator": "^7.9.5",
-            "@babel/helper-function-name": "^7.9.5",
-            "@babel/helper-split-export-declaration": "^7.8.3",
-            "@babel/parser": "^7.9.0",
-            "@babel/types": "^7.9.5",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.13"
-          }
-        },
-        "@babel/types": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-          "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.5",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "js-tokens": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-          "dev": true
-        },
-        "jsesc": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-          "dev": true
-        }
+        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5",
+        "@babel/helper-simple-access": "^7.14.5",
+        "@babel/helper-split-export-declaration": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.14.5",
+        "@babel/template": "^7.14.5",
+        "@babel/traverse": "^7.14.5",
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz",
-      "integrity": "sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
+      "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.7.4"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz",
-      "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
+      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
       "dev": true
     },
-    "@babel/helper-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz",
-      "integrity": "sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==",
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz",
+      "integrity": "sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.13"
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-wrap-function": "^7.14.5",
+        "@babel/types": "^7.14.5"
       }
     },
-    "@babel/helper-remap-async-to-generator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz",
-      "integrity": "sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==",
+    "@babel/helper-replace-supers": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz",
+      "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.8.3",
-        "@babel/helper-wrap-function": "^7.8.3",
-        "@babel/template": "^7.8.3",
-        "@babel/traverse": "^7.8.3",
-        "@babel/types": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.8.3"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz",
-          "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.9.5",
-            "jsesc": "^2.5.1",
-            "lodash": "^4.17.13",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
-          "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.8.3",
-            "@babel/template": "^7.8.3",
-            "@babel/types": "^7.9.5"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
-          "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
-          "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.9.0",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.0",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.9.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
-          "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.8.6",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-          "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/parser": "^7.8.6",
-            "@babel/types": "^7.8.6"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz",
-          "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/generator": "^7.9.5",
-            "@babel/helper-function-name": "^7.9.5",
-            "@babel/helper-split-export-declaration": "^7.8.3",
-            "@babel/parser": "^7.9.0",
-            "@babel/types": "^7.9.5",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.13"
-          }
-        },
-        "@babel/types": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-          "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.5",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "js-tokens": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-          "dev": true
-        },
-        "jsesc": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-          "dev": true
-        }
+        "@babel/helper-member-expression-to-functions": "^7.14.5",
+        "@babel/helper-optimise-call-expression": "^7.14.5",
+        "@babel/traverse": "^7.14.5",
+        "@babel/types": "^7.14.5"
       }
     },
-    "@babel/helper-replace-supers": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz",
-      "integrity": "sha512-pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg==",
+    "@babel/helper-simple-access": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz",
+      "integrity": "sha512-nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw==",
       "dev": true,
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.7.4",
-        "@babel/helper-optimise-call-expression": "^7.7.4",
-        "@babel/traverse": "^7.7.4",
-        "@babel/types": "^7.7.4"
+        "@babel/types": "^7.14.5"
       }
     },
-    "@babel/helper-simple-access": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz",
-      "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==",
+    "@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz",
+      "integrity": "sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.8.3",
-        "@babel/types": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.8.3"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.9.0",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.0",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.9.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
-          "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.8.6",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-          "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/parser": "^7.8.6",
-            "@babel/types": "^7.8.6"
-          }
-        },
-        "@babel/types": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-          "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.5",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "js-tokens": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-          "dev": true
-        },
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-          "dev": true
-        }
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz",
-      "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
+      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.7.4"
+        "@babel/types": "^7.14.5"
       }
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
-      "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz",
+      "integrity": "sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==",
+      "dev": true
+    },
+    "@babel/helper-validator-option": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
+      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
       "dev": true
     },
     "@babel/helper-wrap-function": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz",
-      "integrity": "sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz",
+      "integrity": "sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/template": "^7.14.5",
+        "@babel/traverse": "^7.14.5",
+        "@babel/types": "^7.14.5"
+      }
+    },
+    "@babel/helpers": {
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.6.tgz",
+      "integrity": "sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.8.3",
-        "@babel/template": "^7.8.3",
-        "@babel/traverse": "^7.8.3",
-        "@babel/types": "^7.8.3"
+        "@babel/template": "^7.14.5",
+        "@babel/traverse": "^7.14.5",
+        "@babel/types": "^7.14.5"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.14.5",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.8.3"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz",
-          "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.9.5",
-            "jsesc": "^2.5.1",
-            "lodash": "^4.17.13",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
-          "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.8.3",
-            "@babel/template": "^7.8.3",
-            "@babel/types": "^7.9.5"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
-          "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
-          "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.9.0",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.0",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.9.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
-          "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.8.6",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-          "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/parser": "^7.8.6",
-            "@babel/types": "^7.8.6"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz",
-          "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/generator": "^7.9.5",
-            "@babel/helper-function-name": "^7.9.5",
-            "@babel/helper-split-export-declaration": "^7.8.3",
-            "@babel/parser": "^7.9.0",
-            "@babel/types": "^7.9.5",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.13"
+            "color-convert": "^1.9.0"
           }
         },
-        "@babel/types": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-          "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.9.5",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "has-flag": "^3.0.0"
           }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "js-tokens": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-          "dev": true
-        },
-        "jsesc": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-          "dev": true
         }
       }
     },
-    "@babel/helpers": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.7.4.tgz",
-      "integrity": "sha512-ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg==",
+    "@babel/parser": {
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.7.tgz",
+      "integrity": "sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==",
+      "dev": true
+    },
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz",
+      "integrity": "sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.7.4",
-        "@babel/traverse": "^7.7.4",
-        "@babel/types": "^7.7.4"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
+        "@babel/plugin-proposal-optional-chaining": "^7.14.5"
       }
     },
-    "@babel/highlight": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
-      "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+    "@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz",
+      "integrity": "sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q==",
       "dev": true,
       "requires": {
-        "chalk": "^2.0.0",
-        "esutils": "^2.0.2",
-        "js-tokens": "^4.0.0"
-      },
-      "dependencies": {
-        "js-tokens": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-remap-async-to-generator": "^7.14.5",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
     },
-    "@babel/parser": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz",
-      "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==",
-      "dev": true
-    },
-    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz",
-      "integrity": "sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==",
+    "@babel/plugin-proposal-class-properties": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz",
+      "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-remap-async-to-generator": "^7.8.3",
-        "@babel/plugin-syntax-async-generators": "^7.8.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.4.tgz",
-      "integrity": "sha512-EcuXeV4Hv1X3+Q1TsuOmyyxeTRiSqurGJ26+I/FW1WbymmRRapVORm6x1Zl3iDIHyRxEs+VXWp6qnlcfcJSbbw==",
+    "@babel/plugin-proposal-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
       }
     },
     "@babel/plugin-proposal-decorators": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.7.4.tgz",
-      "integrity": "sha512-GftcVDcLCwVdzKmwOBDjATd548+IE+mBo7ttgatqNDR7VG7GqIuZPtRWlMLHbhTXhcnFZiGER8iIYl1n/imtsg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.14.5.tgz",
+      "integrity": "sha512-LYz5nvQcvYeRVjui1Ykn28i+3aUiXwQ/3MGoEy0InTaz1pJo/lAzmIDXX+BQny/oufgHzJ6vnEEiXQ8KZjEVFg==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-decorators": "^7.7.4"
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-decorators": "^7.14.5"
       }
     },
     "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz",
+      "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-export-namespace-from": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz",
+      "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz",
-      "integrity": "sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz",
+      "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz",
+      "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       }
     },
     "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz",
+      "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz",
-      "integrity": "sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz",
+      "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.7.tgz",
-      "integrity": "sha512-3qp9I8lelgzNedI3hrhkvhaEYree6+WHnyA/q4Dza9z7iEIs1eyhWyJnetk3jJ69RT0AT4G0UhEGwyGFJ7GUuQ==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz",
+      "integrity": "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.7.4"
+        "@babel/compat-data": "^7.14.7",
+        "@babel/helper-compilation-targets": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.14.5"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz",
+      "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz",
-      "integrity": "sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz",
+      "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-private-methods": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz",
+      "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.8.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz",
-      "integrity": "sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz",
+      "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.8.8",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-syntax-async-generators": {
@@ -2055,14 +1451,6 @@
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-syntax-bigint": {
@@ -2072,40 +1460,33 @@
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-syntax-class-properties": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.8.3.tgz",
-      "integrity": "sha512-UcAyQWg2bAN647Q+O811tG9MrJ38Z10jjhQdKNAL8fsyPzE3cCN/uT+f55cFVY4aGO4jqJAvmqsuY3GQDwAoXg==",
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.12.13"
+      }
+    },
+    "@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-syntax-decorators": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.7.4.tgz",
-      "integrity": "sha512-0oNLWNH4k5ZbBVfAwiTU53rKFWIeTh6ZlaWOXWJc4ywxs0tjz5fc3uZ6jKAnZSxN98eXVgg7bJIuzjX+3SXY+A==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.14.5.tgz",
+      "integrity": "sha512-c4sZMRWL4GSvP1EXy0woIP7m4jkVcEuG8R1TOZxPBPtp4FSM/kiPZub9UIs/Jrb5ZAOzvTUSGYrWsrSu1JvoPw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-syntax-dynamic-import": {
@@ -2115,14 +1496,24 @@
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+      }
+    },
+    "@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-syntax-json-strings": {
@@ -2132,31 +1523,15 @@
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.8.3.tgz",
-      "integrity": "sha512-Zpg2Sgc++37kuFl6ppq2Q7Awc6E6AIW671x5PY8E/f7MCIyPPGK/EoeZXvvY3P42exZ3Q4/t3YOzP/HiN79jDg==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-syntax-nullish-coalescing-operator": {
@@ -2166,40 +1541,24 @@
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-syntax-numeric-separator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz",
-      "integrity": "sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==",
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz",
-      "integrity": "sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
     "@babel/plugin-syntax-optional-catch-binding": {
@@ -2209,14 +1568,6 @@
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-syntax-optional-chaining": {
@@ -2226,1585 +1577,564 @@
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+      }
+    },
+    "@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-syntax-top-level-await": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz",
-      "integrity": "sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-syntax-typescript": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz",
-      "integrity": "sha512-GO1MQ/SGGGoiEXY0e0bSpHimJvxqB7lktLLIq2pv8xG7WZ8IMEle74jIe1FhprHBWjwjZtXHkycDLZXIWM5Wfg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz",
+      "integrity": "sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz",
-      "integrity": "sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz",
+      "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz",
-      "integrity": "sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz",
+      "integrity": "sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-remap-async-to-generator": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-module-imports": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz",
-          "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-          "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.5",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-          "dev": true
-        }
+        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-remap-async-to-generator": "^7.14.5"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz",
-      "integrity": "sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz",
+      "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz",
-      "integrity": "sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz",
+      "integrity": "sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "lodash": "^4.17.13"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz",
-      "integrity": "sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.8.3",
-        "@babel/helper-define-map": "^7.8.3",
-        "@babel/helper-function-name": "^7.9.5",
-        "@babel/helper-optimise-call-expression": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-replace-supers": "^7.8.6",
-        "@babel/helper-split-export-declaration": "^7.8.3",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz",
+      "integrity": "sha512-J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-optimise-call-expression": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5",
+        "@babel/helper-split-export-declaration": "^7.14.5",
         "globals": "^11.1.0"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.8.3"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz",
-          "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.9.5",
-            "jsesc": "^2.5.1",
-            "lodash": "^4.17.13",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
-          "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.8.3",
-            "@babel/template": "^7.8.3",
-            "@babel/types": "^7.9.5"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
-          "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz",
-          "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz",
-          "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.8.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz",
-          "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.8.3",
-            "@babel/helper-optimise-call-expression": "^7.8.3",
-            "@babel/traverse": "^7.8.6",
-            "@babel/types": "^7.8.6"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
-          "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.9.0",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.0",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.9.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
-          "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.8.6",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-          "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/parser": "^7.8.6",
-            "@babel/types": "^7.8.6"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz",
-          "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/generator": "^7.9.5",
-            "@babel/helper-function-name": "^7.9.5",
-            "@babel/helper-split-export-declaration": "^7.8.3",
-            "@babel/parser": "^7.9.0",
-            "@babel/types": "^7.9.5",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.13"
-          }
-        },
-        "@babel/types": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-          "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.5",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "js-tokens": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-          "dev": true
-        },
-        "jsesc": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz",
-      "integrity": "sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz",
+      "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz",
-      "integrity": "sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
+      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz",
-      "integrity": "sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz",
+      "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz",
-      "integrity": "sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz",
+      "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz",
-      "integrity": "sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz",
+      "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz",
-      "integrity": "sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz",
+      "integrity": "sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz",
-      "integrity": "sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz",
+      "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.8.3"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
-          "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.8.3",
-            "@babel/template": "^7.8.3",
-            "@babel/types": "^7.9.5"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
-          "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.9.0",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.0",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.9.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
-          "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.8.6",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-          "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/parser": "^7.8.6",
-            "@babel/types": "^7.8.6"
-          }
-        },
-        "@babel/types": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-          "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.5",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "js-tokens": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-          "dev": true
-        },
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-          "dev": true
-        }
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz",
-      "integrity": "sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz",
+      "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz",
-      "integrity": "sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz",
+      "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz",
-      "integrity": "sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz",
+      "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.9.0",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "babel-plugin-dynamic-import-node": "^2.3.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz",
-      "integrity": "sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz",
+      "integrity": "sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.9.0",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-simple-access": "^7.8.3",
-        "babel-plugin-dynamic-import-node": "^2.3.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-simple-access": "^7.14.5",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz",
-      "integrity": "sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz",
+      "integrity": "sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.8.3",
-        "@babel/helper-module-transforms": "^7.9.0",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "babel-plugin-dynamic-import-node": "^2.3.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-hoist-variables": "^7.14.5",
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.14.5",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz",
-      "integrity": "sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz",
+      "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.9.0",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz",
-      "integrity": "sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz",
+      "integrity": "sha512-DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.8.3"
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz",
-      "integrity": "sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz",
+      "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz",
-      "integrity": "sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz",
+      "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-parameters": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz",
+      "integrity": "sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-property-literals": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz",
+      "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-regenerator": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz",
+      "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "^0.14.2"
+      }
+    },
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz",
+      "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-runtime": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz",
+      "integrity": "sha512-fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-replace-supers": "^7.8.3"
+        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "babel-plugin-polyfill-corejs2": "^0.2.2",
+        "babel-plugin-polyfill-corejs3": "^0.2.2",
+        "babel-plugin-polyfill-regenerator": "^0.2.2",
+        "semver": "^6.3.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.8.3"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz",
-          "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.9.5",
-            "jsesc": "^2.5.1",
-            "lodash": "^4.17.13",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
-          "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.8.3",
-            "@babel/template": "^7.8.3",
-            "@babel/types": "^7.9.5"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
-          "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz",
-          "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz",
-          "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.8.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz",
-          "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.8.3",
-            "@babel/helper-optimise-call-expression": "^7.8.3",
-            "@babel/traverse": "^7.8.6",
-            "@babel/types": "^7.8.6"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
-          "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.9.0",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.0",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.9.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
-          "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.8.6",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-          "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/parser": "^7.8.6",
-            "@babel/types": "^7.8.6"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz",
-          "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/generator": "^7.9.5",
-            "@babel/helper-function-name": "^7.9.5",
-            "@babel/helper-split-export-declaration": "^7.8.3",
-            "@babel/parser": "^7.9.0",
-            "@babel/types": "^7.9.5",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.13"
-          }
-        },
-        "@babel/types": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-          "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.5",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "js-tokens": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-          "dev": true
-        },
-        "jsesc": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         }
       }
     },
-    "@babel/plugin-transform-parameters": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz",
-      "integrity": "sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==",
+    "@babel/plugin-transform-shorthand-properties": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz",
+      "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-get-function-arity": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
-          "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-          "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.5",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-property-literals": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz",
-      "integrity": "sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==",
+    "@babel/plugin-transform-spread": {
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz",
+      "integrity": "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-regenerator": {
-      "version": "7.8.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz",
-      "integrity": "sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==",
+    "@babel/plugin-transform-sticky-regex": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz",
+      "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==",
       "dev": true,
       "requires": {
-        "regenerator-transform": "^0.14.2"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-reserved-words": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz",
-      "integrity": "sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==",
+    "@babel/plugin-transform-template-literals": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz",
+      "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-runtime": {
-      "version": "7.7.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.7.6.tgz",
-      "integrity": "sha512-tajQY+YmXR7JjTwRvwL4HePqoL3DYxpYXIHKVvrOIvJmeHe2y1w4tz5qz9ObUDC9m76rCzIMPyn4eERuwA4a4A==",
+    "@babel/plugin-transform-typeof-symbol": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz",
+      "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "resolve": "^1.8.1",
-        "semver": "^5.5.1"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz",
-      "integrity": "sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==",
+    "@babel/plugin-transform-typescript": {
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.6.tgz",
+      "integrity": "sha512-XlTdBq7Awr4FYIzqhmYY80WN0V0azF74DMPyFqVHBvf81ZUgc4X7ZOpx6O8eLDK6iM5cCQzeyJw0ynTaefixRA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-create-class-features-plugin": "^7.14.6",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-typescript": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz",
-      "integrity": "sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==",
+    "@babel/plugin-transform-unicode-escapes": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz",
+      "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-sticky-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz",
-      "integrity": "sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==",
+    "@babel/plugin-transform-unicode-regex": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz",
+      "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/helper-regex": "^7.8.3"
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/preset-env": {
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.7.tgz",
+      "integrity": "sha512-itOGqCKLsSUl0Y+1nSfhbuuOlTs0MJk2Iv7iSH+XT/mR8U1zRLO7NjWlYXB47yhK4J/7j+HYty/EhFZDYKa/VA==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.14.7",
+        "@babel/helper-compilation-targets": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-validator-option": "^7.14.5",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5",
+        "@babel/plugin-proposal-async-generator-functions": "^7.14.7",
+        "@babel/plugin-proposal-class-properties": "^7.14.5",
+        "@babel/plugin-proposal-class-static-block": "^7.14.5",
+        "@babel/plugin-proposal-dynamic-import": "^7.14.5",
+        "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
+        "@babel/plugin-proposal-json-strings": "^7.14.5",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
+        "@babel/plugin-proposal-numeric-separator": "^7.14.5",
+        "@babel/plugin-proposal-object-rest-spread": "^7.14.7",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
+        "@babel/plugin-proposal-optional-chaining": "^7.14.5",
+        "@babel/plugin-proposal-private-methods": "^7.14.5",
+        "@babel/plugin-proposal-private-property-in-object": "^7.14.5",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.14.5",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-transform-arrow-functions": "^7.14.5",
+        "@babel/plugin-transform-async-to-generator": "^7.14.5",
+        "@babel/plugin-transform-block-scoped-functions": "^7.14.5",
+        "@babel/plugin-transform-block-scoping": "^7.14.5",
+        "@babel/plugin-transform-classes": "^7.14.5",
+        "@babel/plugin-transform-computed-properties": "^7.14.5",
+        "@babel/plugin-transform-destructuring": "^7.14.7",
+        "@babel/plugin-transform-dotall-regex": "^7.14.5",
+        "@babel/plugin-transform-duplicate-keys": "^7.14.5",
+        "@babel/plugin-transform-exponentiation-operator": "^7.14.5",
+        "@babel/plugin-transform-for-of": "^7.14.5",
+        "@babel/plugin-transform-function-name": "^7.14.5",
+        "@babel/plugin-transform-literals": "^7.14.5",
+        "@babel/plugin-transform-member-expression-literals": "^7.14.5",
+        "@babel/plugin-transform-modules-amd": "^7.14.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.14.5",
+        "@babel/plugin-transform-modules-systemjs": "^7.14.5",
+        "@babel/plugin-transform-modules-umd": "^7.14.5",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.7",
+        "@babel/plugin-transform-new-target": "^7.14.5",
+        "@babel/plugin-transform-object-super": "^7.14.5",
+        "@babel/plugin-transform-parameters": "^7.14.5",
+        "@babel/plugin-transform-property-literals": "^7.14.5",
+        "@babel/plugin-transform-regenerator": "^7.14.5",
+        "@babel/plugin-transform-reserved-words": "^7.14.5",
+        "@babel/plugin-transform-shorthand-properties": "^7.14.5",
+        "@babel/plugin-transform-spread": "^7.14.6",
+        "@babel/plugin-transform-sticky-regex": "^7.14.5",
+        "@babel/plugin-transform-template-literals": "^7.14.5",
+        "@babel/plugin-transform-typeof-symbol": "^7.14.5",
+        "@babel/plugin-transform-unicode-escapes": "^7.14.5",
+        "@babel/plugin-transform-unicode-regex": "^7.14.5",
+        "@babel/preset-modules": "^0.1.4",
+        "@babel/types": "^7.14.5",
+        "babel-plugin-polyfill-corejs2": "^0.2.2",
+        "babel-plugin-polyfill-corejs3": "^0.2.2",
+        "babel-plugin-polyfill-regenerator": "^0.2.2",
+        "core-js-compat": "^3.15.0",
+        "semver": "^6.3.0"
       },
       "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         }
       }
     },
-    "@babel/plugin-transform-template-literals": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz",
-      "integrity": "sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==",
+    "@babel/preset-modules": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
+      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
       }
     },
-    "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz",
-      "integrity": "sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==",
+    "@babel/preset-typescript": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.14.5.tgz",
+      "integrity": "sha512-u4zO6CdbRKbS9TypMqrlGH7sd2TAJppZwn3c/ZRLeO/wGsbddxgbPDUZVNrie3JWYLQ9vpineKlsrWFvO6Pwkw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-validator-option": "^7.14.5",
+        "@babel/plugin-transform-typescript": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-typescript": {
-      "version": "7.9.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz",
-      "integrity": "sha512-yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w==",
+    "@babel/runtime": {
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
+      "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==",
+      "requires": {
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "@babel/runtime-corejs3": {
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.7.tgz",
+      "integrity": "sha512-Wvzcw4mBYbTagyBVZpAJWI06auSIj033T/yNE0Zn1xcup83MieCddZA7ls3kme17L4NOGBrQ09Q+nKB41RLWBA==",
+      "optional": true,
+      "requires": {
+        "core-js-pure": "^3.15.0",
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "@babel/template": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
+      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-typescript": "^7.8.3"
+        "@babel/code-frame": "^7.14.5",
+        "@babel/parser": "^7.14.5",
+        "@babel/types": "^7.14.5"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.7.tgz",
+      "integrity": "sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.14.5",
+        "@babel/generator": "^7.14.5",
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-hoist-variables": "^7.14.5",
+        "@babel/helper-split-export-declaration": "^7.14.5",
+        "@babel/parser": "^7.14.7",
+        "@babel/types": "^7.14.5",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.8.3"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz",
-          "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.9.5",
-            "jsesc": "^2.5.1",
-            "lodash": "^4.17.13",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-create-class-features-plugin": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.5.tgz",
-          "integrity": "sha512-IipaxGaQmW4TfWoXdqjY0TzoXQ1HRS0kPpEgvjosb3u7Uedcq297xFqDQiCcQtRRwzIMif+N1MLVI8C5a4/PAA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-function-name": "^7.9.5",
-            "@babel/helper-member-expression-to-functions": "^7.8.3",
-            "@babel/helper-optimise-call-expression": "^7.8.3",
-            "@babel/helper-plugin-utils": "^7.8.3",
-            "@babel/helper-replace-supers": "^7.8.6",
-            "@babel/helper-split-export-declaration": "^7.8.3"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
-          "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.8.3",
-            "@babel/template": "^7.8.3",
-            "@babel/types": "^7.9.5"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
-          "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz",
-          "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz",
-          "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.8.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz",
-          "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.8.3",
-            "@babel/helper-optimise-call-expression": "^7.8.3",
-            "@babel/traverse": "^7.8.6",
-            "@babel/types": "^7.8.6"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
-          "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.9.0",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.9.0",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
+            "ms": "2.1.2"
           }
         },
-        "@babel/parser": {
-          "version": "7.9.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
-          "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.8.6",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-          "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/parser": "^7.8.6",
-            "@babel/types": "^7.8.6"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz",
-          "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.8.3",
-            "@babel/generator": "^7.9.5",
-            "@babel/helper-function-name": "^7.9.5",
-            "@babel/helper-split-export-declaration": "^7.8.3",
-            "@babel/parser": "^7.9.0",
-            "@babel/types": "^7.9.5",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.13"
-          }
-        },
-        "@babel/types": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-          "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.5",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "js-tokens": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-          "dev": true
-        },
-        "jsesc": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-          "dev": true
-        }
-      }
-    },
-    "@babel/plugin-transform-unicode-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz",
-      "integrity": "sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/preset-env": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.5.tgz",
-      "integrity": "sha512-eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.9.0",
-        "@babel/helper-compilation-targets": "^7.8.7",
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-proposal-async-generator-functions": "^7.8.3",
-        "@babel/plugin-proposal-dynamic-import": "^7.8.3",
-        "@babel/plugin-proposal-json-strings": "^7.8.3",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-proposal-numeric-separator": "^7.8.3",
-        "@babel/plugin-proposal-object-rest-spread": "^7.9.5",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-proposal-optional-chaining": "^7.9.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.8.3",
-        "@babel/plugin-syntax-async-generators": "^7.8.0",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0",
-        "@babel/plugin-syntax-json-strings": "^7.8.0",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3",
-        "@babel/plugin-transform-arrow-functions": "^7.8.3",
-        "@babel/plugin-transform-async-to-generator": "^7.8.3",
-        "@babel/plugin-transform-block-scoped-functions": "^7.8.3",
-        "@babel/plugin-transform-block-scoping": "^7.8.3",
-        "@babel/plugin-transform-classes": "^7.9.5",
-        "@babel/plugin-transform-computed-properties": "^7.8.3",
-        "@babel/plugin-transform-destructuring": "^7.9.5",
-        "@babel/plugin-transform-dotall-regex": "^7.8.3",
-        "@babel/plugin-transform-duplicate-keys": "^7.8.3",
-        "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
-        "@babel/plugin-transform-for-of": "^7.9.0",
-        "@babel/plugin-transform-function-name": "^7.8.3",
-        "@babel/plugin-transform-literals": "^7.8.3",
-        "@babel/plugin-transform-member-expression-literals": "^7.8.3",
-        "@babel/plugin-transform-modules-amd": "^7.9.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.9.0",
-        "@babel/plugin-transform-modules-systemjs": "^7.9.0",
-        "@babel/plugin-transform-modules-umd": "^7.9.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
-        "@babel/plugin-transform-new-target": "^7.8.3",
-        "@babel/plugin-transform-object-super": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.9.5",
-        "@babel/plugin-transform-property-literals": "^7.8.3",
-        "@babel/plugin-transform-regenerator": "^7.8.7",
-        "@babel/plugin-transform-reserved-words": "^7.8.3",
-        "@babel/plugin-transform-shorthand-properties": "^7.8.3",
-        "@babel/plugin-transform-spread": "^7.8.3",
-        "@babel/plugin-transform-sticky-regex": "^7.8.3",
-        "@babel/plugin-transform-template-literals": "^7.8.3",
-        "@babel/plugin-transform-typeof-symbol": "^7.8.4",
-        "@babel/plugin-transform-unicode-regex": "^7.8.3",
-        "@babel/preset-modules": "^0.1.3",
-        "@babel/types": "^7.9.5",
-        "browserslist": "^4.9.1",
-        "core-js-compat": "^3.6.2",
-        "invariant": "^2.2.2",
-        "levenary": "^1.1.1",
-        "semver": "^5.5.0"
-      },
-      "dependencies": {
-        "@babel/helper-module-imports": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz",
-          "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.8.3"
-          }
-        },
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        },
-        "@babel/plugin-proposal-object-rest-spread": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz",
-          "integrity": "sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.8.3",
-            "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-            "@babel/plugin-transform-parameters": "^7.9.5"
-          }
-        },
-        "@babel/plugin-syntax-object-rest-spread": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-          "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.8.0"
-          }
-        },
-        "@babel/types": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-          "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.9.5",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "browserslist": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
-          "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30001043",
-            "electron-to-chromium": "^1.3.413",
-            "node-releases": "^1.1.53",
-            "pkg-up": "^2.0.0"
-          }
-        },
-        "caniuse-lite": {
-          "version": "1.0.30001046",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001046.tgz",
-          "integrity": "sha512-CsGjBRYWG6FvgbyGy+hBbaezpwiqIOLkxQPY4A4Ea49g1eNsnQuESB+n4QM0BKii1j80MyJ26Ir5ywTQkbRE4g==",
-          "dev": true
-        },
-        "electron-to-chromium": {
-          "version": "1.3.415",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.415.tgz",
-          "integrity": "sha512-GbtYqKffx3sU8G0HxwXuJFfs58Q7+iwLa5rBwaULwET6jWW8IAQSrVnu7vEfiUIcMVfbYyFg7cw3zdm+EbBJmw==",
-          "dev": true
-        },
-        "node-releases": {
-          "version": "1.1.53",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz",
-          "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==",
-          "dev": true
-        },
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-          "dev": true
-        }
-      }
-    },
-    "@babel/preset-modules": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz",
-      "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
-      }
-    },
-    "@babel/preset-typescript": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz",
-      "integrity": "sha512-S4cueFnGrIbvYJgwsVFKdvOmpiL0XGw9MFW9D0vgRys5g36PBhZRL8NX8Gr2akz8XRtzq6HuDXPD/1nniagNUg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-transform-typescript": "^7.9.0"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/runtime": {
-      "version": "7.9.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz",
-      "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==",
-      "dev": true,
-      "requires": {
-        "regenerator-runtime": "^0.13.4"
-      },
-      "dependencies": {
-        "regenerator-runtime": {
-          "version": "0.13.5",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
-          "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/template": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
-      "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.7.4",
-        "@babel/types": "^7.7.4"
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz",
-      "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.5.5",
-        "@babel/generator": "^7.7.4",
-        "@babel/helper-function-name": "^7.7.4",
-        "@babel/helper-split-export-declaration": "^7.7.4",
-        "@babel/parser": "^7.7.4",
-        "@babel/types": "^7.7.4",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.13"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
-          "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
     },
     "@babel/types": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz",
-      "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz",
+      "integrity": "sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==",
       "dev": true,
       "requires": {
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.13",
+        "@babel/helper-validator-identifier": "^7.14.5",
         "to-fast-properties": "^2.0.0"
-      },
-      "dependencies": {
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-          "dev": true
-        }
       }
     },
     "@bcoe/v8-coverage": {
@@ -3823,245 +2153,281 @@
         "minimist": "^1.2.0"
       }
     },
+    "@ionic-native/android-permissions": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/android-permissions/-/android-permissions-5.33.1.tgz",
+      "integrity": "sha512-IlyvC8KTwjKNZvVWYI6/sPPgFxgQscJPTBhv90qFH5QOt7DZQLoGviiQC6wXSvybEnbP3YvDdXTGKKrFbS9k4w==",
+      "requires": {
+        "@types/cordova": "^0.0.34"
+      }
+    },
     "@ionic-native/app-version": {
-      "version": "5.15.1",
-      "resolved": "https://registry.npmjs.org/@ionic-native/app-version/-/app-version-5.15.1.tgz",
-      "integrity": "sha512-j/OAXaWUK3a87GuZ0xJ3Yngmfz+RJlkLlPFcbw8318rgZEAoz36KmsS28NYl4ZhAUvv56dIDWKHTNz+n84rM0g==",
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/app-version/-/app-version-5.33.1.tgz",
+      "integrity": "sha512-Mx4zBq1RpMOrazPaN/B4ToJBxmOtzFVG5wGjeTSovVaOzFiz8Dct7H6hwVScifIABOEA0i2gtqtwuSylJzTGWA==",
+      "requires": {
+        "@types/cordova": "^0.0.34"
+      }
+    },
+    "@ionic-native/camera": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/camera/-/camera-5.33.1.tgz",
+      "integrity": "sha512-mu234nKCjVziPUFD4EYfz4XbCZqV4uKLQf1IEd4YtPAe9ooYt/1HLcvftK8+BNVfWm8JrDtWSmvvmHZalHxXuA==",
+      "requires": {
+        "@types/cordova": "^0.0.34"
+      }
+    },
+    "@ionic-native/chooser": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/chooser/-/chooser-5.33.1.tgz",
+      "integrity": "sha512-8MFiqkEe52BvRZa6kty8cEkTkdnAUpNzb4WS4oiSaMQucF99IGsTqx1bCdKkelkB2K2BekThaqzqFGr/bmU42Q==",
       "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/core": {
-      "version": "5.15.1",
-      "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.15.1.tgz",
-      "integrity": "sha512-Evgh4Y85PtSXV7jSvNM3TnY+YAqhpfhEzX5tKg64wKH1NVeHhPJAjxDJhy/9UVMsAENYXkPmFRTdsGRcINGBrg==",
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.33.1.tgz",
+      "integrity": "sha512-BmjQqMzm6JE2V9Kj07cTA27frm516KMAViSpRNi4MQxPm9lHp9mxBGFDa4pqS/C0G8lA2kVh40fEZA0nOH9w+g==",
       "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/device": {
-      "version": "5.15.1",
-      "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.15.1.tgz",
-      "integrity": "sha512-yDiHaIjDRVhn2wCpZghsFHoWmzFj/dzFPkd88LgrPYQhdKIzXU9t6XaMbDdqmurt+RbUpOfUp655dsDWWELsQw==",
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/device/-/device-5.33.1.tgz",
+      "integrity": "sha512-TupgwI9ys7baznAMVl75/giPSN/tgaC/AKzB6gOObEMWr9tzdmYxywstmsyVPCFy8MvXRO7KKfdmxG/Lg5FrWg==",
+      "requires": {
+        "@types/cordova": "^0.0.34"
+      }
+    },
+    "@ionic-native/diagnostic": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/diagnostic/-/diagnostic-5.33.1.tgz",
+      "integrity": "sha512-cYnwB/5YB64t8GUYXmJhwCHWmr1H4ryx+Sl3JEsfukDTdipXotpzaer4VAnQHi2RUF7fK33fGdxPOJ5obepAYA==",
       "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/file": {
-      "version": "5.15.1",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file/-/file-5.15.1.tgz",
-      "integrity": "sha512-/wGAefEQroNR+n9t01+tu47lHFrwSwlN5fs+YaFSW2yAFax7nuG9y2l047CAHZd9/4+SRKQjCgvrc4dtAaFYow==",
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file/-/file-5.33.1.tgz",
+      "integrity": "sha512-N6tvCmLBYnY+fDeEhI+7kYHuIVcZ/JtrhRIepJ9qpF82DTvMg0fXy5XToKZ5hqthbKAwci8//A8Etp0oBzjx+w==",
+      "requires": {
+        "@types/cordova": "^0.0.34"
+      }
+    },
+    "@ionic-native/file-chooser": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file-chooser/-/file-chooser-5.33.1.tgz",
+      "integrity": "sha512-I5BfFkRnVlUs/EFFhaP2ou854gih+wSHNbDxa6X2rx0KEgoqSSl0KtAHkUwpKcpvss1ZlsQ65kcs5bR93yZuvA==",
       "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/file-opener": {
-      "version": "5.15.1",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file-opener/-/file-opener-5.15.1.tgz",
-      "integrity": "sha512-fct5Ama+zj1uwq64rvKQPM9y1DvTGg17S8Kwz3iExkXBx4yth3r2TNB7fMMsv8MjYxrBH9wEYWQXP//PFMlGQg==",
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file-opener/-/file-opener-5.33.1.tgz",
+      "integrity": "sha512-GXcCIUXre3FNMTxmChE1wg2lMA2eEXrE9hG4UUGa1owXOniuOgfRAkVqawkNYYBX6Gi2HpjVU+jJr7zZ4eOx3w==",
+      "requires": {
+        "@types/cordova": "^0.0.34"
+      }
+    },
+    "@ionic-native/file-path": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file-path/-/file-path-5.33.1.tgz",
+      "integrity": "sha512-hFnvWsou1XRtt/OlxzpJos6Xii54oxCpnF6/pM2zQGBVMGaNoBgRnBsL+GtlycJmQqp/tZJAy4JDcanflHaTtg==",
       "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/file-transfer": {
-      "version": "5.15.1",
-      "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-5.15.1.tgz",
-      "integrity": "sha512-LPvEu+gHxn+cXkx8OWJX2A/bR97X0z39nR+X+gcpBkTm1T0CA4e41X8cXcF6fcyLriKNIxIlF1+vUGOQP03mvQ==",
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/file-transfer/-/file-transfer-5.33.1.tgz",
+      "integrity": "sha512-JGRv6v36sex0MlJmWLA60+PgawE7iN6D6fY/WfstxAh6Sk+E39p5QQE+K/3T1pwj5fGvaYlp1sgElnhgElBdmg==",
+      "requires": {
+        "@types/cordova": "^0.0.34"
+      }
+    },
+    "@ionic-native/image-picker": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/image-picker/-/image-picker-5.33.1.tgz",
+      "integrity": "sha512-18b5XYf6l0xu0AGGqsib1qgcMkxwssFMK5rz3Ih+DvLH0M9g+gPocofIpSko689KsBmAy/UDxJv8Nr81egPTJQ==",
       "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/ionic-webview": {
-      "version": "5.15.1",
-      "resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.15.1.tgz",
-      "integrity": "sha512-FZHea8nIeijL0/TmCGdzSZ+solAAHoL2fDoen7IP169mnUafVYI81DapfYkz0Ttfgl6vVqfGegSXc4eHjfUEPg==",
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/ionic-webview/-/ionic-webview-5.33.1.tgz",
+      "integrity": "sha512-rXvb2jT8W1dnY1bDHDjo2v2EIzcEExOgISKBnEN/7FO2U6vwT/GE89zrEYVq0Sw68vF61ZxbXdpCQ4a4BqsrLQ==",
       "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/keyboard": {
-      "version": "5.15.1",
-      "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.15.1.tgz",
-      "integrity": "sha512-fKrQXkjBNLi5IyWeyWPQ/5syUHNbny3NefZbVv9Pum+VYm3OmMITuxCP+ZSbFGy89oa7KiwuGPrM+nvJt5zeXA==",
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/keyboard/-/keyboard-5.33.1.tgz",
+      "integrity": "sha512-IDNcF2iJ+ze2qPyPgWJ5TkwP5txS6uv9gan8LkxK3zTBKznQvRhznZHbx5fXluehYa1gQZp43BOoXc/PwpT7UA==",
       "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/local-notifications": {
-      "version": "5.15.1",
-      "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.15.1.tgz",
-      "integrity": "sha512-cWcpXS8hm5IjzmaCRNlJmeRVlIt1MSrTamobYSX+1So/wiFXfr4h9P2vcwIyNrR0K834DfQXBCxJRRELoMdWWg==",
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-5.33.1.tgz",
+      "integrity": "sha512-XCf0WvOFysWhQmtZJnVJ+msNntQ+cN4rMAt1zLZDt3TkJwSLHUp90dkYbSNg/j1I4gjQURotHgEQYpNk+w46Ow==",
+      "requires": {
+        "@types/cordova": "^0.0.34"
+      }
+    },
+    "@ionic-native/media": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/media/-/media-5.33.1.tgz",
+      "integrity": "sha512-Xh5nUOX0c6ze+c4gth9C7OrliCfVoBd1KlAVhdRhaAPe1/vWBU/dmcljkdSw5WVI+LYKsy/rArTrwwR2iBd9Og==",
       "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/native-page-transitions": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@ionic-native/native-page-transitions/-/native-page-transitions-5.23.0.tgz",
-      "integrity": "sha512-QinT1OLDZvqKhgQqq7yoxtvfxlgWaOPEH91H8LyaDPJtqvbl1rshS4/x1ehj87ULbOW6kUv3IaU1xQSn+7MCYQ==",
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/native-page-transitions/-/native-page-transitions-5.33.1.tgz",
+      "integrity": "sha512-A2Q5XYO7tR0q5zbCSJuosWvaimv+DcDtJRa8bULE5pBNMzv8OCFClba1JzO4U8Exl+gthQ67lqTVGv/yE4vnDQ==",
       "requires": {
         "@types/cordova": "^0.0.34"
       }
     },
     "@ionic-native/network": {
-      "version": "5.15.1",
-      "resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.15.1.tgz",
-      "integrity": "sha512-ldZUzj+/5gzaN44VPcGEZiKM670px8VYRtahZ11idwgnFmSDmbW+dZYpqZxXRT0q6o3qgtl3FntNo9pftFNuQg==",
+      "version": "5.31.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/network/-/network-5.31.1.tgz",
+      "integrity": "sha512-dSN7jaiXXgm8kVcvxcD39wWPFg2NujWTrEnj9Fq7Fx2aGKkxPkocNsxoy02aFVyBp1LQZvp+uiDNmVIVRjrA7A==",
+      "requires": {
+        "@types/cordova": "^0.0.34"
+      }
+    },
+    "@ionic-native/photo-library": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/photo-library/-/photo-library-5.33.1.tgz",
+      "integrity": "sha512-xCbds9K0YGFcBg1Q8mp42XZFblyz7WwHKxjRd4OVdYylwJovpIAx1K+yxMeaAR3/Q6rNqY8URnmE3jQPrBsdxw==",
+      "requires": {
+        "@types/cordova": "^0.0.34"
+      }
+    },
+    "@ionic-native/photo-viewer": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/photo-viewer/-/photo-viewer-5.33.1.tgz",
+      "integrity": "sha512-e7RGMb9QV6bZ8Jq/nYzDk8hr/1WUHcTWGtw9GE8ACda3WHjmwrPoQxDY/5lbtmNI4pDNbQnM/GqLWlXcbYrR3Q==",
       "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/screen-orientation": {
-      "version": "5.15.1",
-      "resolved": "https://registry.npmjs.org/@ionic-native/screen-orientation/-/screen-orientation-5.15.1.tgz",
-      "integrity": "sha512-gjs48MMx5s1lSektXkXHty9SSGg9TsYq5gFJG6Z0y19iqKNHRSfs5OuiTl9ttHwsJfO73zi/AlyvO4MEZrF/9w==",
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/screen-orientation/-/screen-orientation-5.33.1.tgz",
+      "integrity": "sha512-H6lIcvNSwZgkOVM734DgTO22EcHkrPGPuRslN9jiC8kcvaDkJseIo755cyWmKTaNxnxUJAfNHBCgJCs5Wh7S3w==",
       "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/social-sharing": {
-      "version": "5.15.1",
-      "resolved": "https://registry.npmjs.org/@ionic-native/social-sharing/-/social-sharing-5.15.1.tgz",
-      "integrity": "sha512-ksua9AEYeVJbTCaQaiMIUABE18QpyNa0z+jT24xxwNqNsq3J2k66NwJydT+DClI+mbLv3Xarbsw9fSXkCFycIA==",
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/social-sharing/-/social-sharing-5.33.1.tgz",
+      "integrity": "sha512-tlBNgqESB0dxKoYY61DhTx+4oP25yAGpLynS8JZ3St0vD2VjfQ//2+uVxpo8G3E2A4mEcv7+TWQ1++STphXlRw==",
       "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/status-bar": {
-      "version": "5.15.1",
-      "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.15.1.tgz",
-      "integrity": "sha512-diuESXJsyuf/6ZqoAqs/oR1IuyXP+P4E9WOnPRjwM829JX0DRY2dFA08hpuZ+pLXGMEm82ctsn1HH+raNFNVcw==",
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/status-bar/-/status-bar-5.33.1.tgz",
+      "integrity": "sha512-fdmLSsPnZCZERjoxzeRTB1quxf7ntqD6xdt1zB0A9FaZ7zFgEq0+RibasWXqEi/oYzqNgN35rV0FvMyGXPzw3g==",
+      "requires": {
+        "@types/cordova": "^0.0.34"
+      }
+    },
+    "@ionic-native/streaming-media": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@ionic-native/streaming-media/-/streaming-media-5.33.1.tgz",
+      "integrity": "sha512-vloheVnbTr1aKq3be3k0lYQl2R5h5VohJDZ3KkI6eH5CWoYOd7RnP6uGFpt70Tr8tPC4BWXYePEZ0DJQRqHfbA==",
       "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/angular": {
-      "version": "4.11.2",
-      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-4.11.2.tgz",
-      "integrity": "sha512-8TqkRLmQl1cKmPrFHQiJUGX9UowOL/HKguZ4vd2xJg739/h+PfQswNc5M+sPnTfKItD+7xus8opBr9qKhJHemQ==",
+      "version": "5.6.10",
+      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.6.10.tgz",
+      "integrity": "sha512-0BQzMo5xVGEgBo7cS9POXxj20vbjzZcqe56NNxv33YaZoHrFwqFAMzoS9Lqro84j4ASW9PQegvY/guhfDiIeew==",
       "requires": {
-        "@ionic/core": "4.11.2",
+        "@ionic/core": "5.6.10",
         "tslib": "^1.9.3"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
       }
     },
     "@ionic/angular-toolkit": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-1.5.1.tgz",
-      "integrity": "sha512-B5LHuzEv/lgFP7yxfOA3/wggDM/X1mDkWFX8rZtaBRZBbC0vtZwdwDu73RnkfFZ0jTFyIgtoBW8qTrrCyd5MLA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@ionic/angular-toolkit/-/angular-toolkit-2.3.3.tgz",
+      "integrity": "sha512-r87mApDLWbLaUtd5LvNHrRlZWxjQhaBBM1yPlk9M98dHOxcX3jy7kv60ZurGZutuvbhXISGvHcvvR90yywDC1A==",
       "dev": true,
       "requires": {
-        "@schematics/angular": "^7.0.3",
+        "@schematics/angular": ">=8.0.0",
+        "cheerio": "1.0.0-rc.3",
+        "colorette": "1.1.0",
+        "copy-webpack-plugin": "^6.0.3",
         "tslib": "^1.9.0",
-        "typescript": "~3.3.3333",
-        "ws": "^6.1.4"
+        "ws": "^7.0.1"
       },
       "dependencies": {
-        "typescript": {
-          "version": "3.3.4000",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.4000.tgz",
-          "integrity": "sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==",
+        "colorette": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.1.0.tgz",
+          "integrity": "sha512-6S062WDQUXi6hOfkO/sBPVwE5ASXY4G2+b4atvhJfSsuUUhIaUKlkjLe9692Ipyt5/a+IPF5aVTu3V5gvXq5cg==",
+          "dev": true
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        },
+        "ws": {
+          "version": "7.5.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.0.tgz",
+          "integrity": "sha512-6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw==",
           "dev": true
         }
       }
     },
     "@ionic/core": {
-      "version": "4.11.2",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-4.11.2.tgz",
-      "integrity": "sha512-TQzOex1o9kdkI2gKFVGPHbZnSGDFnAdKMqLnN4qZg+WYZQj1/JRsn8l1qVD6z9Qb3ULxkHFfKGs6/RaTtlCh4w==",
+      "version": "5.6.10",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.6.10.tgz",
+      "integrity": "sha512-mjrfWa8ahCV8TYqJsWpop5kTyfr3NU1fYnoAhuqwZfuCLaMzYRYFPvSNoGynD4yfveZUyAfZM0NOuSquNZgfKQ==",
       "requires": {
-        "ionicons": "^4.6.3",
-        "tslib": "^1.10.0"
+        "@stencil/core": "^2.4.0",
+        "ionicons": "^5.5.1",
+        "tslib": "^2.1.0"
+      }
+    },
+    "@ionic/storage": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@ionic/storage/-/storage-2.2.0.tgz",
+      "integrity": "sha512-2pszrzmI+fAar2Rx0WmJDVpc15D1k5tvLkB49NLYWJ2pOMaO/3/vp7mg/mEbg3rdsPE9FRbYI6vdKjQ2pP1EWA==",
+      "requires": {
+        "localforage": "1.7.1",
+        "localforage-cordovasqlitedriver": "1.7.0",
+        "tslib": "^1.7.1"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
       }
     },
     "@ionic/v4-migration-tslint": {
@@ -4075,23 +2441,18 @@
       }
     },
     "@istanbuljs/load-nyc-config": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz",
-      "integrity": "sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
       "dev": true,
       "requires": {
         "camelcase": "^5.3.1",
         "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
         "js-yaml": "^3.13.1",
         "resolve-from": "^5.0.0"
       },
       "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
         "find-up": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -4111,15 +2472,6 @@
             "p-locate": "^4.1.0"
           }
         },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
         "p-locate": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
@@ -4129,12 +2481,6 @@
             "p-limit": "^2.2.0"
           }
         },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
         "path-exists": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -4150,31 +2496,30 @@
       }
     },
     "@istanbuljs/schema": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
-      "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true
     },
     "@jest/console": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.4.0.tgz",
-      "integrity": "sha512-CfE0erx4hdJ6t7RzAcE1wLG6ZzsHSmybvIBQDoCkDM1QaSeWL9wJMzID/2BbHHa7ll9SsbbK43HjbERbBaFX2A==",
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.5.0.tgz",
+      "integrity": "sha512-T48kZa6MK1Y6k4b89sexwmSF4YLeZS/Udqg3Jj3jG/cHH+N/sLFCEoXEDMOKugJQ9FxPN1osxIknvKkxt6MKyw==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.4.0",
+        "@jest/types": "^25.5.0",
         "chalk": "^3.0.0",
-        "jest-message-util": "^25.4.0",
-        "jest-util": "^25.4.0",
+        "jest-message-util": "^25.5.0",
+        "jest-util": "^25.5.0",
         "slash": "^3.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -4209,16 +2554,10 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -4227,33 +2566,33 @@
       }
     },
     "@jest/core": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-25.4.0.tgz",
-      "integrity": "sha512-h1x9WSVV0+TKVtATGjyQIMJENs8aF6eUjnCoi4jyRemYZmekLr8EJOGQqTWEX8W6SbZ6Skesy9pGXrKeAolUJw==",
+      "version": "25.5.4",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-25.5.4.tgz",
+      "integrity": "sha512-3uSo7laYxF00Dg/DMgbn4xMJKmDdWvZnf89n8Xj/5/AeQ2dOQmn6b6Hkj/MleyzZWXpwv+WSdYWl4cLsy2JsoA==",
       "dev": true,
       "requires": {
-        "@jest/console": "^25.4.0",
-        "@jest/reporters": "^25.4.0",
-        "@jest/test-result": "^25.4.0",
-        "@jest/transform": "^25.4.0",
-        "@jest/types": "^25.4.0",
+        "@jest/console": "^25.5.0",
+        "@jest/reporters": "^25.5.1",
+        "@jest/test-result": "^25.5.0",
+        "@jest/transform": "^25.5.1",
+        "@jest/types": "^25.5.0",
         "ansi-escapes": "^4.2.1",
         "chalk": "^3.0.0",
         "exit": "^0.1.2",
-        "graceful-fs": "^4.2.3",
-        "jest-changed-files": "^25.4.0",
-        "jest-config": "^25.4.0",
-        "jest-haste-map": "^25.4.0",
-        "jest-message-util": "^25.4.0",
+        "graceful-fs": "^4.2.4",
+        "jest-changed-files": "^25.5.0",
+        "jest-config": "^25.5.4",
+        "jest-haste-map": "^25.5.1",
+        "jest-message-util": "^25.5.0",
         "jest-regex-util": "^25.2.6",
-        "jest-resolve": "^25.4.0",
-        "jest-resolve-dependencies": "^25.4.0",
-        "jest-runner": "^25.4.0",
-        "jest-runtime": "^25.4.0",
-        "jest-snapshot": "^25.4.0",
-        "jest-util": "^25.4.0",
-        "jest-validate": "^25.4.0",
-        "jest-watcher": "^25.4.0",
+        "jest-resolve": "^25.5.1",
+        "jest-resolve-dependencies": "^25.5.4",
+        "jest-runner": "^25.5.4",
+        "jest-runtime": "^25.5.4",
+        "jest-snapshot": "^25.5.1",
+        "jest-util": "^25.5.0",
+        "jest-validate": "^25.5.0",
+        "jest-watcher": "^25.5.0",
         "micromatch": "^4.0.2",
         "p-each-series": "^2.1.0",
         "realpath-native": "^2.0.0",
@@ -4262,15 +2601,6 @@
         "strip-ansi": "^6.0.0"
       },
       "dependencies": {
-        "ansi-escapes": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-          "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.11.0"
-          }
-        },
         "ansi-regex": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -4278,12 +2608,11 @@
           "dev": true
         },
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -4330,12 +2659,6 @@
             "to-regex-range": "^5.0.1"
           }
         },
-        "graceful-fs": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
-          "dev": true
-        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -4349,13 +2672,13 @@
           "dev": true
         },
         "micromatch": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
           "dev": true,
           "requires": {
             "braces": "^3.0.1",
-            "picomatch": "^2.0.5"
+            "picomatch": "^2.2.3"
           }
         },
         "rimraf": {
@@ -4367,12 +2690,6 @@
             "glob": "^7.1.3"
           }
         },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        },
         "strip-ansi": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
@@ -4383,9 +2700,9 @@
           }
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -4399,63 +2716,69 @@
           "requires": {
             "is-number": "^7.0.0"
           }
-        },
-        "type-fest": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-          "dev": true
         }
       }
     },
     "@jest/environment": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.4.0.tgz",
-      "integrity": "sha512-KDctiak4mu7b4J6BIoN/+LUL3pscBzoUCP+EtSPd2tK9fqyDY5OF+CmkBywkFWezS9tyH5ACOQNtpjtueEDH6Q==",
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.5.0.tgz",
+      "integrity": "sha512-U2VXPEqL07E/V7pSZMSQCvV5Ea4lqOlT+0ZFijl/i316cRMHvZ4qC+jBdryd+lmRetjQo0YIQr6cVPNxxK87mA==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^25.4.0",
-        "@jest/types": "^25.4.0",
-        "jest-mock": "^25.4.0"
+        "@jest/fake-timers": "^25.5.0",
+        "@jest/types": "^25.5.0",
+        "jest-mock": "^25.5.0"
       }
     },
     "@jest/fake-timers": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.4.0.tgz",
-      "integrity": "sha512-lI9z+VOmVX4dPPFzyj0vm+UtaB8dCJJ852lcDnY0uCPRvZAaVGnMwBBc1wxtf+h7Vz6KszoOvKAt4QijDnHDkg==",
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.5.0.tgz",
+      "integrity": "sha512-9y2+uGnESw/oyOI3eww9yaxdZyHq7XvprfP/eeoCsjqKYts2yRlsHS/SgjPDV8FyMfn2nbMy8YzUk6nyvdLOpQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.4.0",
-        "jest-message-util": "^25.4.0",
-        "jest-mock": "^25.4.0",
-        "jest-util": "^25.4.0",
+        "@jest/types": "^25.5.0",
+        "jest-message-util": "^25.5.0",
+        "jest-mock": "^25.5.0",
+        "jest-util": "^25.5.0",
         "lolex": "^5.0.0"
       }
     },
+    "@jest/globals": {
+      "version": "25.5.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-25.5.2.tgz",
+      "integrity": "sha512-AgAS/Ny7Q2RCIj5kZ+0MuKM1wbF0WMLxbCVl/GOMoCNbODRdJ541IxJ98xnZdVSZXivKpJlNPIWa3QmY0l4CXA==",
+      "dev": true,
+      "requires": {
+        "@jest/environment": "^25.5.0",
+        "@jest/types": "^25.5.0",
+        "expect": "^25.5.0"
+      }
+    },
     "@jest/reporters": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-25.4.0.tgz",
-      "integrity": "sha512-bhx/buYbZgLZm4JWLcRJ/q9Gvmd3oUh7k2V7gA4ZYBx6J28pIuykIouclRdiAC6eGVX1uRZT+GK4CQJLd/PwPg==",
+      "version": "25.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-25.5.1.tgz",
+      "integrity": "sha512-3jbd8pPDTuhYJ7vqiHXbSwTJQNavczPs+f1kRprRDxETeE3u6srJ+f0NPuwvOmk+lmunZzPkYWIFZDLHQPkviw==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^25.4.0",
-        "@jest/test-result": "^25.4.0",
-        "@jest/transform": "^25.4.0",
-        "@jest/types": "^25.4.0",
+        "@jest/console": "^25.5.0",
+        "@jest/test-result": "^25.5.0",
+        "@jest/transform": "^25.5.1",
+        "@jest/types": "^25.5.0",
         "chalk": "^3.0.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
         "glob": "^7.1.2",
+        "graceful-fs": "^4.2.4",
         "istanbul-lib-coverage": "^3.0.0",
         "istanbul-lib-instrument": "^4.0.0",
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^25.4.0",
-        "jest-resolve": "^25.4.0",
-        "jest-util": "^25.4.0",
-        "jest-worker": "^25.4.0",
+        "jest-haste-map": "^25.5.1",
+        "jest-resolve": "^25.5.1",
+        "jest-util": "^25.5.0",
+        "jest-worker": "^25.5.0",
         "node-notifier": "^6.0.0",
         "slash": "^3.0.0",
         "source-map": "^0.6.0",
@@ -4465,12 +2788,11 @@
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -4505,49 +2827,26 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "istanbul-lib-coverage": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-          "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
-          "dev": true
-        },
-        "istanbul-lib-instrument": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz",
-          "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==",
+        "jest-worker": {
+          "version": "25.5.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz",
+          "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==",
           "dev": true,
           "requires": {
-            "@babel/core": "^7.7.5",
-            "@babel/parser": "^7.7.5",
-            "@babel/template": "^7.7.4",
-            "@babel/traverse": "^7.7.4",
-            "@istanbuljs/schema": "^0.1.2",
-            "istanbul-lib-coverage": "^3.0.0",
-            "semver": "^6.3.0"
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
           }
         },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "merge-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+          "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -4556,70 +2855,65 @@
       }
     },
     "@jest/source-map": {
-      "version": "25.2.6",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.2.6.tgz",
-      "integrity": "sha512-VuIRZF8M2zxYFGTEhkNSvQkUKafQro4y+mwUxy5ewRqs5N/ynSFUODYp3fy1zCnbCMy1pz3k+u57uCqx8QRSQQ==",
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.5.0.tgz",
+      "integrity": "sha512-eIGx0xN12yVpMcPaVpjXPnn3N30QGJCJQSkEDUt9x1fI1Gdvb07Ml6K5iN2hG7NmMP6FDmtPEssE3z6doOYUwQ==",
       "dev": true,
       "requires": {
         "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.3",
+        "graceful-fs": "^4.2.4",
         "source-map": "^0.6.0"
       },
       "dependencies": {
-        "graceful-fs": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "callsites": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
           "dev": true
         }
       }
     },
     "@jest/test-result": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.4.0.tgz",
-      "integrity": "sha512-8BAKPaMCHlL941eyfqhWbmp3MebtzywlxzV+qtngQ3FH+RBqnoSAhNEPj4MG7d2NVUrMOVfrwuzGpVIK+QnMAA==",
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.5.0.tgz",
+      "integrity": "sha512-oV+hPJgXN7IQf/fHWkcS99y0smKLU2czLBJ9WA0jHITLst58HpQMtzSYxzaBvYc6U5U6jfoMthqsUlUlbRXs0A==",
       "dev": true,
       "requires": {
-        "@jest/console": "^25.4.0",
-        "@jest/types": "^25.4.0",
+        "@jest/console": "^25.5.0",
+        "@jest/types": "^25.5.0",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       }
     },
     "@jest/test-sequencer": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.4.0.tgz",
-      "integrity": "sha512-240cI+nsM3attx2bMp9uGjjHrwrpvxxrZi8Tyqp/cfOzl98oZXVakXBgxODGyBYAy/UGXPKXLvNc2GaqItrsJg==",
+      "version": "25.5.4",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.5.4.tgz",
+      "integrity": "sha512-pTJGEkSeg1EkCO2YWq6hbFvKNXk8ejqlxiOg1jBNLnWrgXOkdY6UmqZpwGFXNnRt9B8nO1uWMzLLZ4eCmhkPNA==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^25.4.0",
-        "jest-haste-map": "^25.4.0",
-        "jest-runner": "^25.4.0",
-        "jest-runtime": "^25.4.0"
+        "@jest/test-result": "^25.5.0",
+        "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^25.5.1",
+        "jest-runner": "^25.5.4",
+        "jest-runtime": "^25.5.4"
       }
     },
     "@jest/transform": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.4.0.tgz",
-      "integrity": "sha512-t1w2S6V1sk++1HHsxboWxPEuSpN8pxEvNrZN+Ud/knkROWtf8LeUmz73A4ezE8476a5AM00IZr9a8FO9x1+j3g==",
+      "version": "25.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.5.1.tgz",
+      "integrity": "sha512-Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/types": "^25.4.0",
+        "@jest/types": "^25.5.0",
         "babel-plugin-istanbul": "^6.0.0",
         "chalk": "^3.0.0",
         "convert-source-map": "^1.4.0",
         "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.3",
-        "jest-haste-map": "^25.4.0",
+        "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^25.5.1",
         "jest-regex-util": "^25.2.6",
-        "jest-util": "^25.4.0",
+        "jest-util": "^25.5.0",
         "micromatch": "^4.0.2",
         "pirates": "^4.0.1",
         "realpath-native": "^2.0.0",
@@ -4629,12 +2923,11 @@
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -4681,12 +2974,6 @@
             "to-regex-range": "^5.0.1"
           }
         },
-        "graceful-fs": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
-          "dev": true
-        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -4700,31 +2987,19 @@
           "dev": true
         },
         "micromatch": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
           "dev": true,
           "requires": {
             "braces": "^3.0.1",
-            "picomatch": "^2.0.5"
+            "picomatch": "^2.2.3"
           }
         },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -4742,9 +3017,9 @@
       }
     },
     "@jest/types": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz",
-      "integrity": "sha512-XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw==",
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz",
+      "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.0",
@@ -4754,12 +3029,11 @@
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -4795,9 +3069,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -4805,27 +3079,43 @@
         }
       }
     },
+    "@netflix/nerror": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@netflix/nerror/-/nerror-1.1.3.tgz",
+      "integrity": "sha512-b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "extsprintf": "^1.4.0",
+        "lodash": "^4.17.15"
+      }
+    },
     "@ngtools/webpack": {
-      "version": "7.3.9",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.9.tgz",
-      "integrity": "sha512-+ROpqfCXLdQwfP+UNDLk4p959ZrocpStkdd2Iy9CeOJ8yDkityqpstTwQC3oHzzu/95BiyZ0hrHbM6AsPPIvJg==",
+      "version": "8.3.29",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.3.29.tgz",
+      "integrity": "sha512-7uB7dlAHR7RmxcQCYidnWRR1tFRJq7CzI+MM3725ibAvi4HnM5viC/HnKRTK7V+3iS1C0l0u0Gyo/769NsUDTQ==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "7.3.9",
+        "@angular-devkit/core": "8.3.29",
         "enhanced-resolve": "4.1.0",
-        "rxjs": "6.3.3",
-        "tree-kill": "1.2.1",
-        "webpack-sources": "1.3.0"
+        "rxjs": "6.4.0",
+        "tree-kill": "1.2.2",
+        "webpack-sources": "1.4.3"
       },
       "dependencies": {
         "rxjs": {
-          "version": "6.3.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
           }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
         }
       }
     },
@@ -4835,6 +3125,13 @@
       "integrity": "sha512-nBCa1ZD9fAUY/3eskP3Lql2fNg8OMrYIej1/5GRsfcutx9tG/5fZLCv9m6UCw1aS+u4uK/vXjv1ctG/FdMvaWg==",
       "requires": {
         "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
       }
     },
     "@ngx-translate/http-loader": {
@@ -4843,25 +3140,96 @@
       "integrity": "sha512-x8LumqydWD7eX9yQTAVeoCM9gFUIGVTUjZqbxdAUavAA3qVnk9wCQux7iHLPXpydl8vyQmLoPQR+fFU+DUDOMA==",
       "requires": {
         "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
+    },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "requires": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz",
+      "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==",
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      }
+    },
+    "@npmcli/move-file": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
+      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^1.0.4",
+        "rimraf": "^3.0.2"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "@project-sunbird/client-services": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/@project-sunbird/client-services/-/client-services-2.10.1.tgz",
-      "integrity": "sha512-dl+NvGG8ymuLjC5uNE/8d0kEszkhG/LbpqLPwAN0NbHxgL4nir2E56+7YXMFFe2ekKDmZxwYEIX2vQThHPrclw=="
+      "version": "3.9.7",
+      "resolved": "https://registry.npmjs.org/@project-sunbird/client-services/-/client-services-3.9.7.tgz",
+      "integrity": "sha512-bvbPx7p09ZmRqSJxmiu0JinjnV+zlRmlnXylmOYnZ1epYIfc7Pbaz7+Jd4Wswa7r4Z/Q2QeSzgYNKBUuUDms+g==",
+      "requires": {
+        "@project-sunbird/telemetry-sdk": "0.0.26",
+        "inversify": "^5.0.1",
+        "qs": "^6.9.4",
+        "reflect-metadata": "^0.1.13",
+        "whatwg-fetch": "^3.1.0"
+      }
     },
-    "@project-sunbird/common-consumption": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/@project-sunbird/common-consumption/-/common-consumption-2.10.1.tgz",
-      "integrity": "sha512-kjKeR6UwvfX4jLHPunEH5Did3UwHhPJX5UcYRypqJF4mUJ7qpdGIPf4dP/0clvBQ+r1cJ9U2SqQLhqUTxcNCIQ==",
+    "@project-sunbird/common-consumption-v8": {
+      "version": "3.9.4",
+      "resolved": "https://registry.npmjs.org/@project-sunbird/common-consumption-v8/-/common-consumption-v8-3.9.4.tgz",
+      "integrity": "sha512-KfUJkHqg0L1craKoYNWawb0kLBREs8NpcxFPbKC+IAD9J4am677bywG+Nod66UQluUFWJWc4d2finE2DtSjJvQ==",
       "requires": {
         "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
       }
     },
     "@project-sunbird/content-player": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/@project-sunbird/content-player/-/content-player-2.9.1.tgz",
-      "integrity": "sha512-nXlvobVLjCq/ZN1ERMPgXZ+11n3GQy7x3fB9Xwq0tY5zSv5uqwWmBsHMzs6LrMbkKvgFXGF+95x0AzkDiAqIwA==",
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/@project-sunbird/content-player/-/content-player-3.7.1.tgz",
+      "integrity": "sha512-0Jd5FSJocacKX/rRKa7lE7l6NdtDpX2fGhN6tReNKyOcguINadBwYBX2Aop9lRg12UmOkIzTpcgNb+ebILIXRA==",
       "requires": {
         "@project-sunbird/telemetry-sdk": "^0.0.14",
         "ajv": "^6.9.2",
@@ -4877,139 +3245,134 @@
         "xml2json": "*"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
-          "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "caw": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz",
-          "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=",
+        "@project-sunbird/telemetry-sdk": {
+          "version": "0.0.14",
+          "resolved": "https://registry.npmjs.org/@project-sunbird/telemetry-sdk/-/telemetry-sdk-0.0.14.tgz",
+          "integrity": "sha512-5Zx5nPXKedISn6LYytn2lwUK01rEwaxSYrwJaHiKm0CRBUMOh/VomqsTUN+P/Z5pO6ohv+UJJIx0y9MoDlHvAA==",
           "requires": {
-            "get-proxy": "^1.0.1",
-            "is-obj": "^1.0.0",
-            "object-assign": "^3.0.0",
-            "tunnel-agent": "^0.4.0"
-          },
-          "dependencies": {
-            "object-assign": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-              "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I="
-            }
-          }
-        },
-        "download": {
-          "version": "4.4.3",
-          "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz",
-          "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=",
-          "requires": {
-            "caw": "^1.0.1",
-            "concat-stream": "^1.4.7",
-            "each-async": "^1.0.0",
-            "filenamify": "^1.0.1",
-            "got": "^5.0.0",
-            "gulp-decompress": "^1.2.0",
-            "gulp-rename": "^1.2.0",
-            "is-url": "^1.2.0",
-            "object-assign": "^4.0.1",
-            "read-all-stream": "^3.0.0",
-            "readable-stream": "^2.0.2",
-            "stream-combiner2": "^1.1.1",
-            "vinyl": "^1.0.0",
-            "vinyl-fs": "^2.2.0",
-            "ware": "^1.2.0"
+            "grunt-karma": "^0.12.2",
+            "karma": "^3.0.0"
           }
-        },
-        "fast-deep-equal": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-          "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
-        },
-        "filename-reserved-regex": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
-          "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q="
-        },
-        "filenamify": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
-          "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=",
+        }
+      }
+    },
+    "@project-sunbird/discussions-ui-v8": {
+      "version": "2.1.0-beta.12",
+      "resolved": "https://registry.npmjs.org/@project-sunbird/discussions-ui-v8/-/discussions-ui-v8-2.1.0-beta.12.tgz",
+      "integrity": "sha512-a0O7HHO9TVpN/UtrSy0anOShyXqiXzc8B+Cf2lq2GhoVxKqf/0yvnWKgi3xnTPJtIDIBHjvUAmP/InY3okUydQ==",
+      "requires": {
+        "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
+    },
+    "@project-sunbird/sb-styles": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/@project-sunbird/sb-styles/-/sb-styles-0.0.7.tgz",
+      "integrity": "sha512-XirxDLdQnaKJC+tFh4IAD05ULHS7DE9ZkNsPRHglWzly8erTXe6M1DAL+XWKYVFLf+GK9U6HVKlvvxIUpRCiVw=="
+    },
+    "@project-sunbird/sb-themes": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@project-sunbird/sb-themes/-/sb-themes-0.0.6.tgz",
+      "integrity": "sha512-y7N/7asBoT++1jdyr0zxtPJJ4afQJrUUxMJlGXpPa+I7XRvjf+Tjhr3tkbHD29WjgRmCq4rO1annGs75SRIbLQ==",
+      "dev": true
+    },
+    "@project-sunbird/sunbird-epub-player-v8": {
+      "version": "3.9.3",
+      "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-epub-player-v8/-/sunbird-epub-player-v8-3.9.3.tgz",
+      "integrity": "sha512-XM0Liu3eHEe7iootYqv1utKccmoCFHVrq7X1qAO3HTplP0h6xs72wTizNiABmvVA7mL9e77gXKSES6+7hCNaLg==",
+      "requires": {
+        "@project-sunbird/sunbird-player-sdk-v8": "3.9.4",
+        "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "@project-sunbird/sunbird-player-sdk-v8": {
+          "version": "3.9.4",
+          "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-player-sdk-v8/-/sunbird-player-sdk-v8-3.9.4.tgz",
+          "integrity": "sha512-0xM/jfcAZ5cmLWoBHyVHqV0dGqifuY0bFC96T/yCQ8ldT3WYgBBjDHVWLBtCdYqcBWtPp5EjHrghKdM7GwoYNg==",
           "requires": {
-            "filename-reserved-regex": "^1.0.0",
-            "strip-outer": "^1.0.0",
-            "trim-repeated": "^1.0.0"
+            "tslib": "^1.9.0"
           }
         },
-        "get-proxy": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz",
-          "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=",
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
+    },
+    "@project-sunbird/sunbird-pdf-player-v8": {
+      "version": "3.9.3",
+      "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-pdf-player-v8/-/sunbird-pdf-player-v8-3.9.3.tgz",
+      "integrity": "sha512-4azv1HhAzwSy3jBZtFqry1kLb80a38zDKutRBclSPZX2BFvvvS5hSuAtmI6Wa65weedIhCGrvdH25CMMlWL0rw==",
+      "requires": {
+        "@project-sunbird/sunbird-player-sdk-v8": "3.9.4",
+        "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "@project-sunbird/sunbird-player-sdk-v8": {
+          "version": "3.9.4",
+          "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-player-sdk-v8/-/sunbird-player-sdk-v8-3.9.4.tgz",
+          "integrity": "sha512-0xM/jfcAZ5cmLWoBHyVHqV0dGqifuY0bFC96T/yCQ8ldT3WYgBBjDHVWLBtCdYqcBWtPp5EjHrghKdM7GwoYNg==",
           "requires": {
-            "rc": "^1.1.2"
+            "tslib": "^1.9.0"
           }
         },
-        "got": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz",
-          "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
+    },
+    "@project-sunbird/sunbird-player-sdk-v8": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-player-sdk-v8/-/sunbird-player-sdk-v8-3.8.0.tgz",
+      "integrity": "sha512-QKwmCfJBNYp13CcZ8xOnRMc22TGZmHWNyJNJR5k272ptYvWckxOb6cje+OEDOUKiqfRHA411ET8k76mZabdGgA==",
+      "requires": {
+        "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
+    },
+    "@project-sunbird/sunbird-quml-player-v8": {
+      "version": "3.9.29",
+      "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-quml-player-v8/-/sunbird-quml-player-v8-3.9.29.tgz",
+      "integrity": "sha512-ITKGJKOyS2M3weM9tkDtfxJ4Yy/oFqQHesm3AtmuJdJfi6Tgy/ub/1ir2xaslvDCyQfXmCLXPG9XKtzhFRf2Zw==",
+      "requires": {
+        "@project-sunbird/sunbird-player-sdk-v8": "3.9.4",
+        "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "@project-sunbird/sunbird-player-sdk-v8": {
+          "version": "3.9.4",
+          "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-player-sdk-v8/-/sunbird-player-sdk-v8-3.9.4.tgz",
+          "integrity": "sha512-0xM/jfcAZ5cmLWoBHyVHqV0dGqifuY0bFC96T/yCQ8ldT3WYgBBjDHVWLBtCdYqcBWtPp5EjHrghKdM7GwoYNg==",
           "requires": {
-            "create-error-class": "^3.0.1",
-            "duplexer2": "^0.1.4",
-            "is-redirect": "^1.0.0",
-            "is-retry-allowed": "^1.0.0",
-            "is-stream": "^1.0.0",
-            "lowercase-keys": "^1.0.0",
-            "node-status-codes": "^1.0.0",
-            "object-assign": "^4.0.1",
-            "parse-json": "^2.1.0",
-            "pinkie-promise": "^2.0.0",
-            "read-all-stream": "^3.0.0",
-            "readable-stream": "^2.0.5",
-            "timed-out": "^3.0.0",
-            "unzip-response": "^1.0.2",
-            "url-parse-lax": "^1.0.0"
+            "tslib": "^1.9.0"
           }
         },
-        "prepend-http": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-          "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
-        },
-        "timed-out": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
-          "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc="
-        },
-        "tunnel-agent": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
-        },
-        "url-parse-lax": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-          "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
-          "requires": {
-            "prepend-http": "^1.0.1"
-          }
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
         }
       }
     },
     "@project-sunbird/sunbird-sdk": {
-      "version": "2.10.13",
-      "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-sdk/-/sunbird-sdk-2.10.13.tgz",
-      "integrity": "sha512-NuCMwkejqfAPwSe6Sv5i872ll4dwHQ6Z3DkU0XfyT8pGjSc/k+GSjIAe+oGClzw+71DnkYoKyO5uvQ8wQ19UfA==",
+      "version": "file:../sunbird-mobile-sdk/dist",
       "requires": {
-        "@project-sunbird/client-services": "^2.10.1",
-        "crypto-js": "^3.1.9-1",
+        "crypto-js": "3.1.9-1",
         "dayjs": "^1.8.20",
         "inversify": "^5.0.1",
         "jsonwebtoken": "^8.5.1",
@@ -5021,102 +3384,323 @@
         "whatwg-fetch": "^3.0.0"
       },
       "dependencies": {
+        "buffer-equal-constant-time": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+          "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+        },
+        "call-bind": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+          "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+          "requires": {
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.0.2"
+          }
+        },
+        "crypto-js": {
+          "version": "3.1.9-1",
+          "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz",
+          "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg="
+        },
         "dayjs": {
-          "version": "1.8.27",
-          "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.27.tgz",
-          "integrity": "sha512-Jpa2acjWIeOkg8KURUHICk0EqnEFSSF5eMEscsOgyJ92ZukXwmpmRkPSUka7KHSfbj5eKH30ieosYip+ky9emQ=="
+          "version": "1.10.5",
+          "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.5.tgz",
+          "integrity": "sha512-BUFis41ikLz+65iH6LHQCDm4YPMj5r1YFLdupPIyM4SGcXMmtiLQ7U37i+hGS8urIuqe7I/ou3IS1jVc4nbN4g=="
         },
-        "pako": {
+        "ecdsa-sig-formatter": {
           "version": "1.0.11",
-          "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-          "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+          "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+          "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+          "requires": {
+            "safe-buffer": "^5.0.1"
+          }
         },
-        "qs": {
-          "version": "6.9.4",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
-          "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="
+        "function-bind": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+          "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
         },
-        "uuid": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
-        }
-      }
-    },
-    "@project-sunbird/telemetry-sdk": {
-      "version": "0.0.14",
-      "resolved": "https://registry.npmjs.org/@project-sunbird/telemetry-sdk/-/telemetry-sdk-0.0.14.tgz",
-      "integrity": "sha512-5Zx5nPXKedISn6LYytn2lwUK01rEwaxSYrwJaHiKm0CRBUMOh/VomqsTUN+P/Z5pO6ohv+UJJIx0y9MoDlHvAA==",
-      "requires": {
-        "grunt-karma": "^0.12.2",
-        "karma": "^3.0.0"
-      }
-    },
-    "@schematics/angular": {
-      "version": "7.3.9",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.9.tgz",
-      "integrity": "sha512-B3lytFtFeYNLfWdlrIzvy3ulFRccD2/zkoL0734J+DAGfUz7vbysJ50RwYL46sQUcKdZdvb48ktfu1S8yooP6Q==",
-      "dev": true,
+        "get-intrinsic": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+          "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+          "requires": {
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1"
+          }
+        },
+        "has": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+          "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+          "requires": {
+            "function-bind": "^1.1.1"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+          "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
+        },
+        "inversify": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/inversify/-/inversify-5.1.1.tgz",
+          "integrity": "sha512-j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ=="
+        },
+        "jsonwebtoken": {
+          "version": "8.5.1",
+          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
+          "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
+          "requires": {
+            "jws": "^3.2.2",
+            "lodash.includes": "^4.3.0",
+            "lodash.isboolean": "^3.0.3",
+            "lodash.isinteger": "^4.0.4",
+            "lodash.isnumber": "^3.0.3",
+            "lodash.isplainobject": "^4.0.6",
+            "lodash.isstring": "^4.0.1",
+            "lodash.once": "^4.0.0",
+            "ms": "^2.1.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "jwa": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
+          "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+          "requires": {
+            "buffer-equal-constant-time": "1.0.1",
+            "ecdsa-sig-formatter": "1.0.11",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "jws": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+          "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+          "requires": {
+            "jwa": "^1.4.1",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "lodash.includes": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
+          "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
+        },
+        "lodash.isboolean": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+          "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY="
+        },
+        "lodash.isinteger": {
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
+          "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M="
+        },
+        "lodash.isnumber": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
+          "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w="
+        },
+        "lodash.isplainobject": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+          "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
+        },
+        "lodash.isstring": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+          "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
+        },
+        "lodash.once": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+          "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+        },
+        "object-inspect": {
+          "version": "1.10.3",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
+          "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw=="
+        },
+        "pako": {
+          "version": "1.0.11",
+          "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+          "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+        },
+        "qs": {
+          "version": "6.10.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
+          "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
+        },
+        "reflect-metadata": {
+          "version": "0.1.13",
+          "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
+          "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        },
+        "side-channel": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+          "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+          "requires": {
+            "call-bind": "^1.0.0",
+            "get-intrinsic": "^1.0.2",
+            "object-inspect": "^1.9.0"
+          }
+        },
+        "typescript-collections": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/typescript-collections/-/typescript-collections-1.3.3.tgz",
+          "integrity": "sha512-7sI4e/bZijOzyURng88oOFZCISQPTHozfE2sUu5AviFYk5QV7fYGb6YiDl+vKjF/pICA354JImBImL9XJWUvdQ=="
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+        },
+        "whatwg-fetch": {
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
+          "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
+        }
+      }
+    },
+    "@project-sunbird/sunbird-video-player-v8": {
+      "version": "3.9.5",
+      "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-video-player-v8/-/sunbird-video-player-v8-3.9.5.tgz",
+      "integrity": "sha512-eKsQBi82/MyLRDgOEPBuvnPQS0yk7/Xw4bIPWgf0Emc5od6IT6nHTS0RmF6asrkgLqaen2e7CTIgmABBemBykg==",
       "requires": {
-        "@angular-devkit/core": "7.3.9",
-        "@angular-devkit/schematics": "7.3.9",
-        "typescript": "3.2.4"
+        "@project-sunbird/sunbird-player-sdk-v8": "3.9.4",
+        "tslib": "^1.9.0"
       },
       "dependencies": {
-        "typescript": {
-          "version": "3.2.4",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz",
-          "integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==",
-          "dev": true
+        "@project-sunbird/sunbird-player-sdk-v8": {
+          "version": "3.9.4",
+          "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-player-sdk-v8/-/sunbird-player-sdk-v8-3.9.4.tgz",
+          "integrity": "sha512-0xM/jfcAZ5cmLWoBHyVHqV0dGqifuY0bFC96T/yCQ8ldT3WYgBBjDHVWLBtCdYqcBWtPp5EjHrghKdM7GwoYNg==",
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
         }
       }
     },
+    "@project-sunbird/telemetry-sdk": {
+      "version": "0.0.26",
+      "resolved": "https://registry.npmjs.org/@project-sunbird/telemetry-sdk/-/telemetry-sdk-0.0.26.tgz",
+      "integrity": "sha512-8r8tf+YN+z8A4KHBmL8/wxDIKGkASDHMMxyhlI9/iWv83sueoN5qHB6QnqgtIRyEdFjt4Tum5u18/oB71Bb0PQ==",
+      "requires": {
+        "grunt-karma": "^0.12.2",
+        "karma": "^3.0.0"
+      }
+    },
+    "@scarf/scarf": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@scarf/scarf/-/scarf-1.1.1.tgz",
+      "integrity": "sha512-VGbKDbk1RFIaSmdVb0cNjjWJoRWRI/Weo23AjRCC2nryO0iAS8pzsToJfPVPtVs74WHw4L1UTADNdIYRLkirZQ=="
+    },
+    "@schematics/angular": {
+      "version": "8.3.29",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.29.tgz",
+      "integrity": "sha512-If+UhCsQzCgnQymiiF8dQRoic34+RgJ6rV0n4k7Tm4N2xNYJOG7ajjzKM7PIeafsF50FKnFP8dqaNGxCMyq5Ew==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "8.3.29",
+        "@angular-devkit/schematics": "8.3.29"
+      }
+    },
     "@schematics/update": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.13.9.tgz",
-      "integrity": "sha512-4MQcaKFxhMzZyE//+DknDh3h3duy3avg2oxSHxdwXlCZ8Q92+4lpegjJcSRiqlEwO4qeJ5XnrjrvzfIiaIZOmA==",
+      "version": "0.803.29",
+      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.803.29.tgz",
+      "integrity": "sha512-Syf6h6DYeu1WU9aLihMwIgVASpcHCxUYqhZyHfQABiK8NkdlZ+KAp4cOxihsZyDqIJNLWON+0/FLPAQF3BXh5Q==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "7.3.9",
-        "@angular-devkit/schematics": "7.3.9",
+        "@angular-devkit/core": "8.3.29",
+        "@angular-devkit/schematics": "8.3.29",
         "@yarnpkg/lockfile": "1.1.0",
         "ini": "1.3.5",
-        "pacote": "9.4.0",
-        "rxjs": "6.3.3",
-        "semver": "5.6.0",
+        "pacote": "9.5.5",
+        "rxjs": "6.4.0",
+        "semver": "6.3.0",
         "semver-intersect": "1.4.0"
       },
       "dependencies": {
+        "ini": {
+          "version": "1.3.5",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+          "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+          "dev": true
+        },
         "rxjs": {
-          "version": "6.3.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
           }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
         }
       }
     },
-    "@sindresorhus/is": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
-      "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==",
-      "dev": true
-    },
     "@sinonjs/commons": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.2.tgz",
-      "integrity": "sha512-+DUO6pnp3udV/v2VfUWgaY5BIE1IfT7lLfeDzPVeMT1XKkaAp9LgSI9x5RtrFQoZ9Oi0PgXQQHPaoKu7dCjVxw==",
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
       "dev": true,
       "requires": {
         "type-detect": "4.0.8"
       }
     },
+    "@stencil/core": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.6.0.tgz",
+      "integrity": "sha512-QsxWayZyusnqSZrlCl81R71rA3KqFjVVQSH4E0rGN15F1GdQaFonKlHLyCOLKLig1zzC+DQkLLiUuocexuvdeQ=="
+    },
+    "@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="
+    },
     "@types/babel__core": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.7.tgz",
-      "integrity": "sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==",
+      "version": "7.1.14",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.14.tgz",
+      "integrity": "sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -5127,18 +3711,18 @@
       }
     },
     "@types/babel__generator": {
-      "version": "7.6.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz",
-      "integrity": "sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==",
+      "version": "7.6.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
+      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.0.0"
       }
     },
     "@types/babel__template": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz",
-      "integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz",
+      "integrity": "sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -5146,29 +3730,56 @@
       }
     },
     "@types/babel__traverse": {
-      "version": "7.0.10",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.10.tgz",
-      "integrity": "sha512-74fNdUGrWsgIB/V9kTO5FGHPWYY6Eqn+3Z7L6Hc4e/BxjYV7puvBqp5HwsVYYfLm6iURYBNCx4Ut37OF9yitCw==",
+      "version": "7.11.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.1.tgz",
+      "integrity": "sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.3.0"
       }
     },
-    "@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-      "dev": true
+    "@types/chart.js": {
+      "version": "2.9.32",
+      "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.32.tgz",
+      "integrity": "sha512-d45JiRQwEOlZiKwukjqmqpbqbYzUX2yrXdH9qVn6kXpPDsTYCo6YbfFOlnUaJ8S/DhJwbBJiLsMjKpW5oP8B2A==",
+      "requires": {
+        "moment": "^2.10.2"
+      }
     },
     "@types/cordova": {
       "version": "0.0.34",
       "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
       "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ="
     },
+    "@types/glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
+      "dev": true,
+      "requires": {
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/graceful-fs": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
+      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/grecaptcha": {
+      "version": "2.0.36",
+      "resolved": "https://registry.npmjs.org/@types/grecaptcha/-/grecaptcha-2.0.36.tgz",
+      "integrity": "sha512-SfzcAJPls94/Lz1FznWe6Vm9NLkakhGmk3EO7g2QdkDDR2OU4FH63YILnDpGIU6l7gPnsf5WQ81Kr05JOYAlZw==",
+      "optional": true
+    },
     "@types/istanbul-lib-coverage": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
-      "integrity": "sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
       "dev": true
     },
     "@types/istanbul-lib-report": {
@@ -5181,9 +3792,9 @@
       }
     },
     "@types/istanbul-reports": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz",
-      "integrity": "sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz",
+      "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "*",
@@ -5191,15 +3802,35 @@
       }
     },
     "@types/jest": {
-      "version": "25.2.1",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.2.1.tgz",
-      "integrity": "sha512-msra1bCaAeEdkSyA0CZ6gW1ukMIvZ5YoJkdXw/qhQdsuuDlFTcEUrUw8CLCPt2rVRUfXlClVvK2gvPs9IokZaA==",
+      "version": "25.2.3",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.2.3.tgz",
+      "integrity": "sha512-JXc1nK/tXHiDhV55dvfzqtmP4S3sy3T3ouV2tkViZgxY/zeUkcpQcQPGRlgF4KmWzWW5oiWYSZwtCB+2RsE4Fw==",
       "dev": true,
       "requires": {
         "jest-diff": "^25.2.1",
         "pretty-format": "^25.2.1"
       }
     },
+    "@types/json-schema": {
+      "version": "7.0.7",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
+      "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
+      "dev": true
+    },
+    "@types/localforage": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/localforage/-/localforage-0.0.34.tgz",
+      "integrity": "sha1-XjHDLdh5HsS5/z70fJy1Wy0NlDg=",
+      "requires": {
+        "localforage": "*"
+      }
+    },
+    "@types/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==",
+      "dev": true
+    },
     "@types/node": {
       "version": "12.11.5",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-12.11.5.tgz",
@@ -5218,6 +3849,12 @@
       "integrity": "sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ==",
       "dev": true
     },
+    "@types/raf": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/@types/raf/-/raf-3.4.0.tgz",
+      "integrity": "sha512-taW5/WYqo36N7V39oYyHP9Ipfd5pNFvGTIQsNGj86xV88YQ7GnI30/yMfKDF7Zgin0m3e+ikX88FvImnK4RjGw==",
+      "optional": true
+    },
     "@types/source-list-map": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
@@ -5231,209 +3868,219 @@
       "dev": true
     },
     "@types/webpack-sources": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz",
-      "integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.8.tgz",
+      "integrity": "sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==",
       "dev": true,
       "requires": {
         "@types/node": "*",
         "@types/source-list-map": "*",
         "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
       }
     },
     "@types/yargs": {
-      "version": "15.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.4.tgz",
-      "integrity": "sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==",
+      "version": "15.0.13",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz",
+      "integrity": "sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==",
       "dev": true,
       "requires": {
         "@types/yargs-parser": "*"
       }
     },
     "@types/yargs-parser": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
-      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
+      "version": "20.2.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
+      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
       "dev": true
     },
+    "@videojs/http-streaming": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-1.9.3.tgz",
+      "integrity": "sha512-gNdqyvhxTU67optzxiywHXi/z2+Ju0b6hNth0V7BsL7YAH+R1StIKmmp6SsfFZQfrNW5ykYFoR95M/AT5cg9Ug==",
+      "requires": {
+        "aes-decrypter": "3.0.0",
+        "global": "^4.3.0",
+        "m3u8-parser": "4.3.0",
+        "mpd-parser": "0.7.0",
+        "mux.js": "5.1.1",
+        "url-toolkit": "^2.1.3",
+        "video.js": "^6.8.0 || ^7.0.0"
+      }
+    },
     "@webassemblyjs/ast": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.11.tgz",
-      "integrity": "sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
+      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/helper-module-context": "1.7.11",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
-        "@webassemblyjs/wast-parser": "1.7.11"
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5"
       }
     },
     "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz",
-      "integrity": "sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
+      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
       "dev": true
     },
     "@webassemblyjs/helper-api-error": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz",
-      "integrity": "sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
+      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
       "dev": true
     },
     "@webassemblyjs/helper-buffer": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz",
-      "integrity": "sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
+      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
       "dev": true
     },
     "@webassemblyjs/helper-code-frame": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz",
-      "integrity": "sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
+      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/wast-printer": "1.7.11"
+        "@webassemblyjs/wast-printer": "1.8.5"
       }
     },
     "@webassemblyjs/helper-fsm": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz",
-      "integrity": "sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
+      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
       "dev": true
     },
     "@webassemblyjs/helper-module-context": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz",
-      "integrity": "sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==",
-      "dev": true
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
+      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "mamacro": "^0.0.3"
+      }
     },
     "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz",
-      "integrity": "sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
+      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
       "dev": true
     },
     "@webassemblyjs/helper-wasm-section": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz",
-      "integrity": "sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
+      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.11",
-        "@webassemblyjs/helper-buffer": "1.7.11",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
-        "@webassemblyjs/wasm-gen": "1.7.11"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5"
       }
     },
     "@webassemblyjs/ieee754": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz",
-      "integrity": "sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
+      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
       "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.7.11.tgz",
-      "integrity": "sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
+      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
       "dev": true,
       "requires": {
-        "@xtuc/long": "4.2.1"
+        "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/utf8": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.7.11.tgz",
-      "integrity": "sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
+      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
       "dev": true
     },
     "@webassemblyjs/wasm-edit": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz",
-      "integrity": "sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
+      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.11",
-        "@webassemblyjs/helper-buffer": "1.7.11",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
-        "@webassemblyjs/helper-wasm-section": "1.7.11",
-        "@webassemblyjs/wasm-gen": "1.7.11",
-        "@webassemblyjs/wasm-opt": "1.7.11",
-        "@webassemblyjs/wasm-parser": "1.7.11",
-        "@webassemblyjs/wast-printer": "1.7.11"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/helper-wasm-section": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-opt": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "@webassemblyjs/wast-printer": "1.8.5"
       }
     },
     "@webassemblyjs/wasm-gen": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz",
-      "integrity": "sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
+      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.11",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
-        "@webassemblyjs/ieee754": "1.7.11",
-        "@webassemblyjs/leb128": "1.7.11",
-        "@webassemblyjs/utf8": "1.7.11"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
       }
     },
     "@webassemblyjs/wasm-opt": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz",
-      "integrity": "sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
+      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.11",
-        "@webassemblyjs/helper-buffer": "1.7.11",
-        "@webassemblyjs/wasm-gen": "1.7.11",
-        "@webassemblyjs/wasm-parser": "1.7.11"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5"
       }
     },
     "@webassemblyjs/wasm-parser": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz",
-      "integrity": "sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
+      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.11",
-        "@webassemblyjs/helper-api-error": "1.7.11",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.11",
-        "@webassemblyjs/ieee754": "1.7.11",
-        "@webassemblyjs/leb128": "1.7.11",
-        "@webassemblyjs/utf8": "1.7.11"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
       }
     },
     "@webassemblyjs/wast-parser": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz",
-      "integrity": "sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
+      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.11",
-        "@webassemblyjs/floating-point-hex-parser": "1.7.11",
-        "@webassemblyjs/helper-api-error": "1.7.11",
-        "@webassemblyjs/helper-code-frame": "1.7.11",
-        "@webassemblyjs/helper-fsm": "1.7.11",
-        "@xtuc/long": "4.2.1"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-code-frame": "1.8.5",
+        "@webassemblyjs/helper-fsm": "1.8.5",
+        "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/wast-printer": {
-      "version": "1.7.11",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz",
-      "integrity": "sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
+      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.11",
-        "@webassemblyjs/wast-parser": "1.7.11",
-        "@xtuc/long": "4.2.1"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5",
+        "@xtuc/long": "4.2.2"
       }
     },
     "@xtuc/ieee754": {
@@ -5443,9 +4090,9 @@
       "dev": true
     },
     "@xtuc/long": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.1.tgz",
-      "integrity": "sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true
     },
     "@yarnpkg/lockfile": {
@@ -5465,9 +4112,9 @@
       }
     },
     "abab": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
-      "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
       "dev": true
     },
     "abbrev": {
@@ -5475,6 +4122,33 @@
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
+    "abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "requires": {
+        "event-target-shim": "^5.0.0"
+      }
+    },
+    "abstract-leveldown": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz",
+      "integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==",
+      "requires": {
+        "buffer": "^5.5.0",
+        "immediate": "^3.2.3",
+        "level-concat-iterator": "~2.0.0",
+        "level-supports": "~1.0.0",
+        "xtend": "~4.0.0"
+      },
+      "dependencies": {
+        "immediate": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
+          "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q=="
+        }
+      }
+    },
     "accepts": {
       "version": "1.3.7",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
@@ -5485,15 +4159,9 @@
       }
     },
     "acorn": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
-      "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
-      "dev": true
-    },
-    "acorn-dynamic-import": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz",
-      "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==",
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
       "dev": true
     },
     "acorn-globals": {
@@ -5512,17 +4180,42 @@
       "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
       "dev": true
     },
+    "aes-decrypter": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.0.0.tgz",
+      "integrity": "sha1-eEihwUW5/b9Xrj4rWxvHzwZEqPs=",
+      "requires": {
+        "commander": "^2.9.0",
+        "global": "^4.3.2",
+        "pkcs7": "^1.0.2"
+      }
+    },
     "after": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
       "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8="
     },
     "agent-base": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
-      "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "requires": {
-        "es6-promisify": "^5.0.0"
+        "debug": "4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
       }
     },
     "agentkeepalive": {
@@ -5534,13 +4227,22 @@
         "humanize-ms": "^1.2.1"
       }
     },
-    "ajv": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
-      "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
+    "aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
       "dev": true,
       "requires": {
-        "fast-deep-equal": "^2.0.1",
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      }
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
         "json-schema-traverse": "^0.4.1",
         "uri-js": "^4.2.2"
@@ -5553,9 +4255,9 @@
       "dev": true
     },
     "ajv-keywords": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz",
-      "integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true
     },
     "amdefine": {
@@ -5565,11 +4267,18 @@
       "dev": true
     },
     "android-versions": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.5.0.tgz",
-      "integrity": "sha512-/GWUAqa2OJNlDF5VGSe3SR1QMHEPXxx54Ur56r0qQC0H9FlBr7kyBF2SgVEhzFCPbrW4UcYgVuWrq/2Ty3QvXg==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.7.0.tgz",
+      "integrity": "sha512-TCy4b8Dk8YS6A23ZPfhSKqK66JHFq0D8avGYiwvYpjno6HrrcI0DRgHx9+jtkvWYmrsE2vQWgbHJhvGGhhOb0g==",
       "requires": {
-        "semver": "^5.4.1"
+        "semver": "^5.7.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
       }
     },
     "ansi": {
@@ -5584,10 +4293,13 @@
       "dev": true
     },
     "ansi-escapes": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-      "dev": true
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.21.3"
+      }
     },
     "ansi-gray": {
       "version": "0.1.1",
@@ -5609,13 +4321,9 @@
       "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
     },
     "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
     },
     "ansi-wrap": {
       "version": "0.1.0",
@@ -5629,6 +4337,16 @@
       "requires": {
         "micromatch": "^3.1.4",
         "normalize-path": "^2.1.1"
+      },
+      "dependencies": {
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "requires": {
+            "remove-trailing-separator": "^1.0.1"
+          }
+        }
       }
     },
     "app-root-path": {
@@ -5649,31 +4367,12 @@
       "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=",
       "requires": {
         "file-type": "^3.1.0"
-      },
-      "dependencies": {
-        "file-type": {
-          "version": "3.9.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
-          "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek="
-        }
-      }
-    },
-    "are-we-there-yet": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
       }
     },
     "arg": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.1.tgz",
-      "integrity": "sha512-SlmP3fEA88MBv0PypnXZ8ZfJhwmDeIE3SP71j37AiXQBXYosPV0x6uISAaHYSlSVhmHOVkomen0tbGk6Anlebw==",
-      "dev": true
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
     },
     "argparse": {
       "version": "1.0.10",
@@ -5684,6 +4383,11 @@
         "sprintf-js": "~1.0.2"
       }
     },
+    "argsarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/argsarray/-/argsarray-0.0.1.tgz",
+      "integrity": "sha1-bnIHtOzbObCviDA/pa4ivajfYcs="
+    },
     "arr-diff": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -5710,23 +4414,10 @@
       "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
       "dev": true
     },
-    "array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true,
-      "optional": true
-    },
     "array-flatten": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-      "dev": true
-    },
-    "array-ify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
-      "integrity": "sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
     },
     "array-slice": {
       "version": "0.2.3",
@@ -5734,13 +4425,10 @@
       "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU="
     },
     "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "requires": {
-        "array-uniq": "^1.0.1"
-      }
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true
     },
     "array-uniq": {
       "version": "1.0.3",
@@ -5761,8 +4449,7 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "asn1": {
       "version": "0.2.4",
@@ -5774,14 +4461,23 @@
       }
     },
     "asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
       "dev": true,
       "requires": {
         "bn.js": "^4.0.0",
         "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
       }
     },
     "assert": {
@@ -5814,8 +4510,7 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -5823,9 +4518,12 @@
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
     },
     "ast-types": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.3.tgz",
-      "integrity": "sha512-XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA=="
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+      "requires": {
+        "tslib": "^2.0.1"
+      }
     },
     "astral-regex": {
       "version": "1.0.0",
@@ -5834,36 +4532,30 @@
       "dev": true
     },
     "async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
-      "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.11"
-      }
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+      "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0="
     },
     "async-each": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
       "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="
     },
-    "async-foreach": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
-      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
-      "dev": true,
-      "optional": true
-    },
     "async-limiter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
     },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
+    "at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
+    },
     "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
@@ -5882,11 +4574,6 @@
         "winston": "~1.0.0"
       },
       "dependencies": {
-        "async": {
-          "version": "0.9.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
-          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0="
-        },
         "glob": {
           "version": "6.0.4",
           "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
@@ -5907,115 +4594,85 @@
       }
     },
     "autoprefixer": {
-      "version": "9.4.6",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.4.6.tgz",
-      "integrity": "sha512-Yp51mevbOEdxDUy5WjiKtpQaecqYq9OqZSL04rSoCiry7Tc5I9FEyo3bfxiTJc1DfHeKwSFCUYbBAiOQ2VGfiw==",
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz",
+      "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.4.1",
-        "caniuse-lite": "^1.0.30000929",
+        "browserslist": "^4.6.3",
+        "caniuse-lite": "^1.0.30000980",
+        "chalk": "^2.4.2",
         "normalize-range": "^0.1.2",
         "num2fraction": "^1.2.2",
-        "postcss": "^7.0.13",
-        "postcss-value-parser": "^3.3.1"
-      }
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
-    },
-    "aws4": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
-      "dev": true
-    },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
+        "postcss": "^7.0.17",
+        "postcss-value-parser": "^4.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
         },
         "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
-    "babel-generator": {
-      "version": "6.26.1",
-      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
-      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
-      "dev": true,
-      "requires": {
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "detect-indent": "^4.0.0",
-        "jsesc": "^1.3.0",
-        "lodash": "^4.17.4",
-        "source-map": "^0.5.7",
-        "trim-right": "^1.0.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+      "dev": true
     },
     "babel-jest": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.4.0.tgz",
-      "integrity": "sha512-p+epx4K0ypmHuCnd8BapfyOwWwosNCYhedetQey1awddtfmEX0MmdxctGl956uwUmjwXR5VSS5xJcGX9DvdIog==",
+      "version": "25.5.1",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.5.1.tgz",
+      "integrity": "sha512-9dA9+GmMjIzgPnYtkhBg73gOo/RHqPmLruP3BaGL4KEX3Dwz6pI8auSN8G8+iuEG90+GSswyKvslN+JYSaacaQ==",
       "dev": true,
       "requires": {
-        "@jest/transform": "^25.4.0",
-        "@jest/types": "^25.4.0",
+        "@jest/transform": "^25.5.1",
+        "@jest/types": "^25.5.0",
         "@types/babel__core": "^7.1.7",
         "babel-plugin-istanbul": "^6.0.0",
-        "babel-preset-jest": "^25.4.0",
+        "babel-preset-jest": "^25.5.0",
         "chalk": "^3.0.0",
+        "graceful-fs": "^4.2.4",
         "slash": "^3.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -6050,16 +4707,10 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -6067,15 +4718,6 @@
         }
       }
     },
-    "babel-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
     "babel-plugin-dynamic-import-node": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
@@ -6096,29 +4738,30 @@
         "@istanbuljs/schema": "^0.1.2",
         "istanbul-lib-instrument": "^4.0.0",
         "test-exclude": "^6.0.0"
+      }
+    },
+    "babel-plugin-jest-hoist": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.5.0.tgz",
+      "integrity": "sha512-u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__traverse": "^7.0.6"
+      }
+    },
+    "babel-plugin-polyfill-corejs2": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz",
+      "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.13.11",
+        "@babel/helper-define-polyfill-provider": "^0.2.2",
+        "semver": "^6.1.1"
       },
       "dependencies": {
-        "istanbul-lib-coverage": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-          "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
-          "dev": true
-        },
-        "istanbul-lib-instrument": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz",
-          "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==",
-          "dev": true,
-          "requires": {
-            "@babel/core": "^7.7.5",
-            "@babel/parser": "^7.7.5",
-            "@babel/template": "^7.7.4",
-            "@babel/traverse": "^7.7.4",
-            "@istanbuljs/schema": "^0.1.2",
-            "istanbul-lib-coverage": "^3.0.0",
-            "semver": "^6.3.0"
-          }
-        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -6127,13 +4770,23 @@
         }
       }
     },
-    "babel-plugin-jest-hoist": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.4.0.tgz",
-      "integrity": "sha512-M3a10JCtTyKevb0MjuH6tU+cP/NVQZ82QPADqI1RQYY1OphztsCeIeQmTsHmF/NS6m0E51Zl4QNsI3odXSQF5w==",
+    "babel-plugin-polyfill-corejs3": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.3.tgz",
+      "integrity": "sha512-rCOFzEIJpJEAU14XCcV/erIf/wZQMmMT5l5vXOpL5uoznyOGfDIjPj6FVytMvtzaKSTSVKouOCTPJ5OMUZH30g==",
       "dev": true,
       "requires": {
-        "@types/babel__traverse": "^7.0.6"
+        "@babel/helper-define-polyfill-provider": "^0.2.2",
+        "core-js-compat": "^3.14.0"
+      }
+    },
+    "babel-plugin-polyfill-regenerator": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz",
+      "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-define-polyfill-provider": "^0.2.2"
       }
     },
     "babel-polyfill": {
@@ -6156,14 +4809,15 @@
       }
     },
     "babel-preset-current-node-syntax": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz",
-      "integrity": "sha512-u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz",
+      "integrity": "sha512-5/INNCYhUGqw7VbVjT/hb3ucjgkVHKXY7lX3ZjlN4gm565VyFmJUrJ/h+h16ECVB38R/9SF6aACydpKMLZ/c9w==",
       "dev": true,
       "requires": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-bigint": "^7.8.3",
         "@babel/plugin-syntax-class-properties": "^7.8.3",
+        "@babel/plugin-syntax-import-meta": "^7.8.3",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
@@ -6171,32 +4825,15 @@
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      },
-      "dependencies": {
-        "@babel/helper-plugin-utils": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
-          "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
-          "dev": true
-        },
-        "@babel/plugin-syntax-object-rest-spread": {
-          "version": "7.8.3",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-          "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-plugin-utils": "^7.8.0"
-          }
-        }
       }
     },
     "babel-preset-jest": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.4.0.tgz",
-      "integrity": "sha512-PwFiEWflHdu3JCeTr0Pb9NcHHE34qWFnPQRVPvqQITx4CsDCzs6o05923I10XvLvn9nNsRHuiVgB72wG/90ZHQ==",
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz",
+      "integrity": "sha512-8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw==",
       "dev": true,
       "requires": {
-        "babel-plugin-jest-hoist": "^25.4.0",
+        "babel-plugin-jest-hoist": "^25.5.0",
         "babel-preset-current-node-syntax": "^0.1.2"
       }
     },
@@ -6208,65 +4845,25 @@
       "requires": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+          "dev": true
+        }
       }
     },
-    "babel-template": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-traverse": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-types": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
-      }
-    },
-    "babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true
-    },
     "backo2": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
       "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc="
     },
     "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "base": {
       "version": "0.11.2",
@@ -6324,9 +4921,9 @@
       "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
     },
     "base64-js": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
-      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
     "base64id": {
       "version": "1.0.0",
@@ -6386,9 +4983,9 @@
       }
     },
     "bl": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
-      "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz",
+      "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==",
       "requires": {
         "readable-stream": "^2.3.5",
         "safe-buffer": "^5.1.1"
@@ -6399,42 +4996,39 @@
       "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
       "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="
     },
-    "block-stream": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "inherits": "~2.0.0"
-      }
-    },
     "bluebird": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
-      "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw=="
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
     },
     "bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
       "dev": true
     },
     "body-parser": {
-      "version": "1.18.3",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
-      "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
       "requires": {
-        "bytes": "3.0.0",
+        "bytes": "3.1.0",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
         "depd": "~1.1.2",
-        "http-errors": "~1.6.3",
-        "iconv-lite": "0.4.23",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
         "on-finished": "~2.3.0",
-        "qs": "6.5.2",
-        "raw-body": "2.3.3",
-        "type-is": "~1.6.16"
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+        }
       }
     },
     "bonjour": {
@@ -6449,14 +5043,36 @@
         "dns-txt": "^2.0.2",
         "multicast-dns": "^6.0.1",
         "multicast-dns-service-types": "^1.1.0"
+      },
+      "dependencies": {
+        "array-flatten": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+          "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+          "dev": true
+        }
+      }
+    },
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
+    },
+    "bplist-creator": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.8.tgz",
+      "integrity": "sha512-Za9JKzD6fjLC16oX2wsXfc+qBEhJBJB1YPInoAQpMLhDuj5aVOv1baGeIQSq1Fr3OCqzvsoQcSBSwGId/Ja2PA==",
+      "requires": {
+        "stream-buffers": "~2.2.0"
       }
     },
     "bplist-parser": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
-      "integrity": "sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz",
+      "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==",
       "requires": {
-        "big-integer": "^1.6.7"
+        "big-integer": "^1.6.44"
       }
     },
     "brace-expansion": {
@@ -6562,28 +5178,49 @@
       }
     },
     "browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.0",
+        "bn.js": "^5.0.0",
         "randombytes": "^2.0.1"
       }
     },
     "browserify-sign": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.3",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
       }
     },
     "browserify-zlib": {
@@ -6596,14 +5233,15 @@
       }
     },
     "browserslist": {
-      "version": "4.5.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.6.tgz",
-      "integrity": "sha512-o/hPOtbU9oX507lIqon+UvPYqpx3mHc8cV3QemSBTXwkG8gSQSK6UKvXcE/DcleU3+A59XTUHyCvZ5qGy8xVAg==",
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.10.0.tgz",
+      "integrity": "sha512-TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000963",
-        "electron-to-chromium": "^1.3.127",
-        "node-releases": "^1.1.17"
+        "caniuse-lite": "^1.0.30001035",
+        "electron-to-chromium": "^1.3.378",
+        "node-releases": "^1.1.52",
+        "pkg-up": "^3.1.0"
       }
     },
     "bser": {
@@ -6615,15 +5253,18 @@
         "node-int64": "^0.4.0"
       }
     },
+    "btoa": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
+      "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="
+    },
     "buffer": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-      "dev": true,
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
       "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
       }
     },
     "buffer-alloc": {
@@ -6677,11 +5318,6 @@
         "vinyl": "^1.0.0"
       },
       "dependencies": {
-        "file-type": {
-          "version": "3.9.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
-          "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek="
-        },
         "uuid": {
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
@@ -6714,29 +5350,48 @@
       "dev": true
     },
     "bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
     },
     "cacache": {
-      "version": "10.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
-      "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+      "version": "12.0.2",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.2.tgz",
+      "integrity": "sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.5.1",
-        "chownr": "^1.0.1",
-        "glob": "^7.1.2",
-        "graceful-fs": "^4.1.11",
-        "lru-cache": "^4.1.1",
-        "mississippi": "^2.0.0",
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
         "mkdirp": "^0.5.1",
         "move-concurrently": "^1.0.1",
         "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.2",
-        "ssri": "^5.2.4",
-        "unique-filename": "^1.1.0",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
         "y18n": "^4.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
+        }
       }
     },
     "cache-base": {
@@ -6755,27 +5410,31 @@
         "unset-value": "^1.0.0"
       }
     },
-    "cacheable-request": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz",
-      "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=",
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
+    "caller-callsite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
       "dev": true,
       "requires": {
-        "clone-response": "1.0.2",
-        "get-stream": "3.0.0",
-        "http-cache-semantics": "3.8.1",
-        "keyv": "3.0.0",
-        "lowercase-keys": "1.0.0",
-        "normalize-url": "2.0.1",
-        "responselike": "1.0.2"
-      },
-      "dependencies": {
-        "lowercase-keys": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
-          "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
-          "dev": true
-        }
+        "callsites": "^2.0.0"
+      }
+    },
+    "caller-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+      "dev": true,
+      "requires": {
+        "caller-callsite": "^2.0.0"
       }
     },
     "callsite": {
@@ -6784,33 +5443,21 @@
       "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA="
     },
     "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
       "dev": true
     },
     "camelcase": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-      "dev": true,
-      "optional": true
-    },
-    "camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
-      }
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30000967",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz",
-      "integrity": "sha512-rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ==",
+      "version": "1.0.30001035",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz",
+      "integrity": "sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==",
       "dev": true
     },
     "canonical-path": {
@@ -6819,6 +5466,20 @@
       "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==",
       "dev": true
     },
+    "canvg": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/canvg/-/canvg-3.0.7.tgz",
+      "integrity": "sha512-4sq6iL5Q4VOXS3PL1BapiXIZItpxYyANVzsAKpTPS5oq4u3SKbGfUcbZh2gdLCQ3jWpG/y5wRkMlBBAJhXeiZA==",
+      "optional": true,
+      "requires": {
+        "@babel/runtime-corejs3": "^7.9.6",
+        "@types/raf": "^3.4.0",
+        "raf": "^3.4.1",
+        "rgbcolor": "^1.0.1",
+        "stackblur-canvas": "^2.0.0",
+        "svg-pathdata": "^5.0.5"
+      }
+    },
     "capture-exit": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
@@ -6840,79 +5501,135 @@
       "dev": true
     },
     "caw": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz",
-      "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==",
-      "dev": true,
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz",
+      "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=",
       "requires": {
-        "get-proxy": "^2.0.0",
-        "isurl": "^1.0.0-alpha5",
-        "tunnel-agent": "^0.6.0",
-        "url-to-options": "^1.0.1"
+        "get-proxy": "^1.0.1",
+        "is-obj": "^1.0.0",
+        "object-assign": "^3.0.0",
+        "tunnel-agent": "^0.4.0"
+      },
+      "dependencies": {
+        "object-assign": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I="
+        }
       }
     },
     "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "requires": {
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
+      }
+    },
+    "chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "dev": true
+    },
+    "chart.js": {
+      "version": "2.9.4",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.4.tgz",
+      "integrity": "sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==",
+      "requires": {
+        "chartjs-color": "^2.1.0",
+        "moment": "^2.10.2"
+      }
+    },
+    "chartjs-color": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz",
+      "integrity": "sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==",
+      "requires": {
+        "chartjs-color-string": "^0.6.0",
+        "color-convert": "^1.9.3"
+      }
+    },
+    "chartjs-color-string": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz",
+      "integrity": "sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==",
+      "requires": {
+        "color-name": "^1.0.0"
+      }
+    },
+    "chartjs-plugin-datalabels": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-0.7.0.tgz",
+      "integrity": "sha512-PKVUX14nYhH0wcdCpgOoC39Gbzvn6cZ7O9n+bwc02yKD9FTnJ7/TSrBcfebmolFZp1Rcicr9xbT0a5HUbigS7g=="
+    },
+    "chartjs-plugin-stacked100": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/chartjs-plugin-stacked100/-/chartjs-plugin-stacked100-0.7.1.tgz",
+      "integrity": "sha512-3EoEXzKxJcRDrKe1dBYcPMbHpCppBgAsYApyEGiIXHaQS/SZRY+VEQsnyPTnIbewA792g19hTlkhpRLS1PVGzQ==",
+      "requires": {
+        "chart.js": "^2.4.0"
+      }
+    },
+    "cheerio": {
+      "version": "1.0.0-rc.3",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz",
+      "integrity": "sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "css-select": "~1.2.0",
+        "dom-serializer": "~0.1.1",
+        "entities": "~1.1.1",
+        "htmlparser2": "^3.9.1",
+        "lodash": "^4.15.0",
+        "parse5": "^3.0.1"
       },
       "dependencies": {
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+        "parse5": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
+          "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "@types/node": "*"
           }
         }
       }
     },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
-    },
     "chokidar": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-      "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
       "requires": {
         "anymatch": "^2.0.0",
-        "async-each": "^1.0.0",
-        "braces": "^2.3.0",
-        "fsevents": "^1.2.2",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "fsevents": "^1.2.7",
         "glob-parent": "^3.1.0",
-        "inherits": "^2.0.1",
+        "inherits": "^2.0.3",
         "is-binary-path": "^1.0.0",
         "is-glob": "^4.0.0",
-        "lodash.debounce": "^4.0.8",
-        "normalize-path": "^2.1.1",
+        "normalize-path": "^3.0.0",
         "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.0.0",
-        "upath": "^1.0.5"
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
       }
     },
     "chownr": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
-      "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
       "dev": true
     },
     "chrome-trace-event": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz",
-      "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.9.0"
-      }
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true
     },
     "ci-info": {
       "version": "2.0.0",
@@ -6931,9 +5648,9 @@
       }
     },
     "circular-dependency-plugin": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz",
-      "integrity": "sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz",
+      "integrity": "sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==",
       "dev": true
     },
     "circular-json": {
@@ -6969,67 +5686,76 @@
       "dev": true,
       "requires": {
         "source-map": "~0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
       }
     },
+    "clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true
+    },
     "cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
       "dev": true,
       "requires": {
-        "restore-cursor": "^2.0.0"
+        "restore-cursor": "^3.1.0"
       }
     },
     "cli-width": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
+      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
       "dev": true
     },
     "cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
       }
     },
     "clone": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
-      "dev": true
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
+    },
+    "clone-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg="
     },
     "clone-deep": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
-      "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "dev": true,
       "requires": {
-        "for-own": "^1.0.0",
         "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.0",
-        "shallow-clone": "^1.0.0"
-      }
-    },
-    "clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-      "dev": true,
-      "requires": {
-        "mimic-response": "^1.0.0"
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
       }
     },
     "clone-stats": {
@@ -7038,9 +5764,9 @@
       "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE="
     },
     "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz",
+      "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g="
     },
     "code-point-at": {
       "version": "1.1.0",
@@ -7059,13 +5785,6 @@
         "superagent": "^5.1.0",
         "superagent-proxy": "^2.0.0",
         "yazl": "^2.4.1"
-      },
-      "dependencies": {
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
-        }
       }
     },
     "codelyzer": {
@@ -7115,7 +5834,6 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
       "requires": {
         "color-name": "1.1.3"
       }
@@ -7123,22 +5841,28 @@
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
     "color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
       "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="
     },
+    "colorette": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+      "dev": true
+    },
     "colors": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM="
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="
     },
-    "com.jjdltc.cordova.plugin.zip": {
-      "version": "git+https://github.com/swayangjit/jjdltc-cordova-plugin-zip.git#31ba05a47d9ab27cdd9763afa155731bc3481b65",
-      "from": "git+https://github.com/swayangjit/jjdltc-cordova-plugin-zip.git"
+    "com-sarriaroman-photoviewer": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/com-sarriaroman-photoviewer/-/com-sarriaroman-photoviewer-1.2.5.tgz",
+      "integrity": "sha512-VH7Yo8O2qe1ZR7hiZqtiAwsv2FLztEXsA+ksXVIBGEDiY+o5IxOrMb+9g+nGCVMxfxmID3T8GZxpGxAAZXTv2A=="
     },
     "com.telerik.plugins.nativepagetransitions": {
       "version": "0.6.5",
@@ -7162,15 +5886,26 @@
       }
     },
     "commander": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
-      "dev": true
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
     },
-    "common-consumption-styles": {
-      "version": "0.0.14",
-      "resolved": "https://registry.npmjs.org/common-consumption-styles/-/common-consumption-styles-0.0.14.tgz",
-      "integrity": "sha512-+TLK8+8Bb6hX2a2dp0ZrT1snUCyORfV2295vzKfyl7Gr1xUZfkjcpRKRDSQBejZku9xgwnh/m0TxqZmOLVAxcg=="
+    "common-form-elements": {
+      "version": "3.9.17",
+      "resolved": "https://registry.npmjs.org/common-form-elements/-/common-form-elements-3.9.17.tgz",
+      "integrity": "sha512-s/KW1Bb5stBmqbkDnE8d6xpADnuhiAqNmh1ISESBYHNFviB7fXQ9EP3U41zteMIGtAJzIW3EMB5Aato+ZOPOug==",
+      "requires": {
+        "immutable": "^4.0.0-rc.12",
+        "moment": "^2.29.1",
+        "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
     },
     "commondir": {
       "version": "1.0.1",
@@ -7178,15 +5913,6 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
-    "compare-func": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz",
-      "integrity": "sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=",
-      "requires": {
-        "array-ify": "^1.0.0",
-        "dot-prop": "^3.0.0"
-      }
-    },
     "component-bind": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
@@ -7203,12 +5929,12 @@
       "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
     },
     "compressible": {
-      "version": "2.0.17",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
-      "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==",
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dev": true,
       "requires": {
-        "mime-db": ">= 1.40.0 < 2"
+        "mime-db": ">= 1.43.0 < 2"
       }
     },
     "compression": {
@@ -7224,6 +5950,20 @@
         "on-headers": "~1.0.2",
         "safe-buffer": "5.1.2",
         "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+          "dev": true
+        },
+        "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
+        }
       }
     },
     "concat-map": {
@@ -7243,9 +5983,9 @@
       }
     },
     "config-chain": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz",
-      "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
       "dev": true,
       "requires": {
         "ini": "^1.3.4",
@@ -7261,27 +6001,6 @@
         "finalhandler": "1.1.2",
         "parseurl": "~1.3.3",
         "utils-merge": "1.0.1"
-      },
-      "dependencies": {
-        "finalhandler": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-          "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-          "requires": {
-            "debug": "2.6.9",
-            "encodeurl": "~1.0.2",
-            "escape-html": "~1.0.3",
-            "on-finished": "~2.3.0",
-            "parseurl": "~1.3.3",
-            "statuses": "~1.5.0",
-            "unpipe": "~1.0.0"
-          }
-        },
-        "statuses": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-          "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
-        }
       }
     },
     "connect-history-api-fallback": {
@@ -7291,20 +6010,10 @@
       "dev": true
     },
     "console-browserify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-      "dev": true,
-      "requires": {
-        "date-now": "^0.1.4"
-      }
-    },
-    "console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true,
-      "optional": true
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+      "dev": true
     },
     "constants-browserify": {
       "version": "1.0.0",
@@ -7313,9 +6022,19 @@
       "dev": true
     },
     "content-disposition": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "requires": {
+        "safe-buffer": "5.1.2"
+      },
+      "dependencies": {
+        "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=="
+        }
+      }
     },
     "content-type": {
       "version": "1.0.4",
@@ -7323,11 +6042,18 @@
       "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
     },
     "convert-source-map": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
-      "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
       "requires": {
         "safe-buffer": "~5.1.1"
+      },
+      "dependencies": {
+        "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=="
+        }
       }
     },
     "cookie": {
@@ -7365,125 +6091,269 @@
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
     },
     "copy-webpack-plugin": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
-      "integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz",
+      "integrity": "sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==",
       "dev": true,
       "requires": {
-        "cacache": "^10.0.4",
-        "find-cache-dir": "^1.0.0",
-        "globby": "^7.1.1",
-        "is-glob": "^4.0.0",
-        "loader-utils": "^1.1.0",
-        "minimatch": "^3.0.4",
-        "p-limit": "^1.0.0",
-        "serialize-javascript": "^1.4.0"
-      }
-    },
-    "cordova-android": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-8.1.0.tgz",
-      "integrity": "sha512-eAY6g9q3raJ4P03wNdSWC5MOW1EfxoomWNXsPhi7T6Q9yAqmxqn0sLEUjLL1Ib0LCH3nKQWBXdxapQ5LgbHu+g==",
-      "requires": {
-        "android-versions": "^1.4.0",
-        "compare-func": "^1.3.2",
-        "cordova-common": "^3.2.0",
-        "nopt": "^4.0.1",
-        "properties-parser": "^0.3.1",
-        "q": "^1.5.1",
-        "shelljs": "^0.5.3"
+        "cacache": "^15.0.4",
+        "fast-glob": "^3.2.4",
+        "find-cache-dir": "^3.3.1",
+        "glob-parent": "^5.1.1",
+        "globby": "^11.0.1",
+        "loader-utils": "^2.0.0",
+        "normalize-path": "^3.0.0",
+        "p-limit": "^3.0.1",
+        "schema-utils": "^2.7.0",
+        "serialize-javascript": "^4.0.0",
+        "webpack-sources": "^1.4.3"
       },
       "dependencies": {
-        "nopt": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
-          "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
-          "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
+        "cacache": {
+          "version": "15.2.0",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz",
+          "integrity": "sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==",
+          "dev": true,
+          "requires": {
+            "@npmcli/move-file": "^1.0.1",
+            "chownr": "^2.0.0",
+            "fs-minipass": "^2.0.0",
+            "glob": "^7.1.4",
+            "infer-owner": "^1.0.4",
+            "lru-cache": "^6.0.0",
+            "minipass": "^3.1.1",
+            "minipass-collect": "^1.0.2",
+            "minipass-flush": "^1.0.5",
+            "minipass-pipeline": "^1.2.2",
+            "mkdirp": "^1.0.3",
+            "p-map": "^4.0.0",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^3.0.2",
+            "ssri": "^8.0.1",
+            "tar": "^6.0.2",
+            "unique-filename": "^1.1.1"
           }
         },
-        "q": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-          "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
+        "chownr": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+          "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+          "dev": true
         },
-        "shelljs": {
-          "version": "0.5.3",
-          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",
-          "integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM="
-        }
-      }
-    },
-    "cordova-android-support-gradle-release": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/cordova-android-support-gradle-release/-/cordova-android-support-gradle-release-3.0.1.tgz",
-      "integrity": "sha512-RSW55DkSckmqhX/kjj+a1YeVdy7s/AtlZn6Qa5XMQmmA4Iogq+IF2jvInZqzCF19DbI5YE95AP7VDbRk+DdDRw==",
-      "requires": {
-        "q": "^1.4.1",
-        "semver": "5.6.0"
-      }
-    },
-    "cordova-common": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-3.2.1.tgz",
-      "integrity": "sha512-xg0EnjnA6EipxXG8cupdlYQYeDA6+ghbN+Pjq88xN1LInwP6Bo7IyGBdSV5QnfjOvzShF9BBwSxBAv0FOO0C2Q==",
-      "requires": {
-        "ansi": "^0.3.1",
-        "bplist-parser": "^0.1.0",
-        "cross-spawn": "^6.0.5",
-        "elementtree": "0.1.7",
-        "endent": "^1.1.1",
-        "fs-extra": "^8.0.0",
-        "glob": "^7.1.2",
-        "minimatch": "^3.0.0",
-        "plist": "^3.0.1",
-        "q": "^1.4.1",
-        "strip-bom": "^3.0.0",
-        "underscore": "^1.8.3",
-        "which": "^1.3.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+          "dev": true
+        },
+        "find-cache-dir": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+          "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+          "dev": true,
           "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "commondir": "^1.0.1",
+            "make-dir": "^3.0.2",
+            "pkg-dir": "^4.1.0"
           }
         },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+        "glob-parent": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "json5": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+          "dev": true,
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        },
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "ssri": {
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+          "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
+          "dev": true,
+          "requires": {
+            "minipass": "^3.1.1"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
+    "cordova-android": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-9.0.0.tgz",
+      "integrity": "sha512-2ZEgApK4LPMYW0zh/mLAH3CabzCaKE0yxQTzA2wTf0Eo2HHTJnRtDCf9spGf3nPOkubyXS6+pvzz5QzNHpVTqQ==",
+      "requires": {
+        "android-versions": "^1.5.0",
+        "cordova-common": "^4.0.1",
+        "execa": "^4.0.2",
+        "fs-extra": "^9.0.1",
+        "nopt": "^4.0.3",
+        "properties-parser": "^0.3.1",
+        "which": "^2.0.2"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+          "requires": {
+            "at-least-node": "^1.0.0",
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        }
+      }
+    },
+    "cordova-common": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-4.0.2.tgz",
+      "integrity": "sha512-od7aNShyuBajzPY83mUEO8tERwwWdFklXETHiXP5Ft87CWeo/tSuwNPFztyTy8XYc74yXdogXKPTJeUHuVzB8Q==",
+      "requires": {
+        "@netflix/nerror": "^1.1.3",
+        "ansi": "^0.3.1",
+        "bplist-parser": "^0.2.0",
+        "cross-spawn": "^7.0.1",
+        "elementtree": "^0.1.7",
+        "endent": "^1.4.1",
+        "fast-glob": "^3.2.2",
+        "fs-extra": "^9.0.0",
+        "glob": "^7.1.6",
+        "plist": "^3.0.1",
+        "q": "^1.5.1",
+        "read-chunk": "^3.2.0",
+        "strip-bom": "^4.0.0",
+        "underscore": "^1.9.2"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+          "requires": {
+            "at-least-node": "^1.0.0",
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+          "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="
+        }
+      }
+    },
+    "cordova-plugin-add-swift-support": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-add-swift-support/-/cordova-plugin-add-swift-support-2.0.2.tgz",
+      "integrity": "sha512-K03WDnsD3GT+n7Od3BnS17D8rYnAFZbZjjQJa2r7qW8QLq8+h7hGbFaiF+w5+nUtyAqUNq+HT/d/MdqBGLNzxA==",
+      "requires": {
+        "glob": "^7.1.3",
+        "semver": "^6.0.0",
+        "xcode": "^2.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
         }
       }
     },
     "cordova-plugin-advanced-http": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-2.4.1.tgz",
-      "integrity": "sha512-6G8MTy/d02jE6n3Y9CVyCtD5hZGiBb+/dR2AIzhKN1RGGz38g1D2C8yE4MqHRvnmry6k/KHQWT1MsHNXrjouXQ=="
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-2.5.1.tgz",
+      "integrity": "sha512-KwCzjVEBpw6OyTjuUYRe9kGuDs1F5IzpsCXASxuIrV+YaXUTbKwU6mIQ+G4iG9Rs5SfPJSEE4ETx3XuP/Hor0Q=="
     },
     "cordova-plugin-android-downloadmanager": {
-      "version": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-downloadmanager.git#a7240399723758f8553cd0b26bd37f3ba7c55b17",
-      "from": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-downloadmanager.git#release-2.9.0",
+      "version": "git+https://github.com/shikshalokam/sb-cordova-plugin-downloadmanager.git#415b06b2d51c76cf9c00887cacaaafa88e6b754f",
+      "from": "git+https://github.com/shikshalokam/sb-cordova-plugin-downloadmanager.git#release-3.9.0-ios",
       "requires": {
         "nanoassert": "^1.1.0"
       }
     },
     "cordova-plugin-android-permissions": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-android-permissions/-/cordova-plugin-android-permissions-1.0.2.tgz",
-      "integrity": "sha512-Eb7Cf3lk9RydSYqmUzBAEVTT/EU+opV2yvyqkgZZAB/RVfHxsla/1wzHq0PBwAFjHIrxBAGZrOpJFVKc1SxtuA=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-android-permissions/-/cordova-plugin-android-permissions-1.1.2.tgz",
+      "integrity": "sha512-vJd56gLaSgQnB/4+uUjyVwVAii5TszBPAgjVkGvM8658cP5rjiNFAWmoOYkjeSe1I6dJk+MGrh/GbPkn0a+2OA=="
+    },
+    "cordova-plugin-androidx-adapter": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-androidx-adapter/-/cordova-plugin-androidx-adapter-1.1.3.tgz",
+      "integrity": "sha512-W1SImn0cCCvOSTSfWWp5TnanIQrSuh2Bch+dcZXIzEn0km3Qb7VryeAqHhgBQYwwzC5Ollk1DtUAk/AJSojuZA==",
+      "requires": {
+        "q": "^1.5.1",
+        "recursive-readdir": "^2.2.2"
+      }
     },
     "cordova-plugin-app-version": {
-      "version": "0.1.9",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-app-version/-/cordova-plugin-app-version-0.1.9.tgz",
-      "integrity": "sha1-nbBgeGMzenEEiTAuX1CpBPFEm9s="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-app-version/-/cordova-plugin-app-version-0.1.12.tgz",
+      "integrity": "sha512-P+0d9+h9HasanKuMd8tcEpuJJlsVmClie3Mbq16v3TV/VroDrgYB6Ea8Imkc/WjjMVSBCjWB+pji1LoupWlddA=="
+    },
+    "cordova-plugin-appavailability": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-appavailability/-/cordova-plugin-appavailability-0.4.2.tgz",
+      "integrity": "sha1-oBeq8PiCfuWZ3HeLYkXcwTULy6g="
     },
     "cordova-plugin-awesome-shared-preferences": {
       "version": "git+https://github.com/adriano-di-giovanni/cordova-plugin-shared-preferences.git#18b00aabc61b04b16f0f4ad309e352c5c26abbcb",
@@ -7494,10 +6364,20 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-badge/-/cordova-plugin-badge-0.8.8.tgz",
       "integrity": "sha512-RhIBtd5xhD/iLnxjt35jvOae28oNW/wtMZBOmQR3Rf0y4wirvA1bpAZEhBoFqL+rZGhsd6ddOdQXdex1T0DRyQ=="
     },
+    "cordova-plugin-camera": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-camera/-/cordova-plugin-camera-4.1.0.tgz",
+      "integrity": "sha512-fCLhWjWYn49q3X5xaypAPgTz6MAWSKFFQvD2Gpi5SuVlrRPRphtX2jIqR2zCBuDTBR082QVnlc+yUDXt65Mjgw=="
+    },
+    "cordova-plugin-chooser": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-chooser/-/cordova-plugin-chooser-1.3.2.tgz",
+      "integrity": "sha512-GfAibvrPdWe/ri+h3e3xkmq5bietY6yJRBIZawYDE7w600j2mtRsxgat7siWZtjRRhJuVsVwUG6H86Hyp3WKvA=="
+    },
     "cordova-plugin-code-push": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-code-push/-/cordova-plugin-code-push-1.12.1.tgz",
-      "integrity": "sha512-yQ6F1r4kVaO2fh/1dG/PS9PnRCv/ZRQdMnn/GDG4enBW6ztONLgtfbItW+Qo5YY7yNGFTivL3OEXZHBtKXjFag=="
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-code-push/-/cordova-plugin-code-push-1.13.1.tgz",
+      "integrity": "sha512-zJUEqPR+3xdFEHj5TB/Apt3ZkrkUTYCwO7z7hOfN7fbe3alUh6QDSj2dRp5g2K8yQqIWCFNx8zdjtpqMtMVyZg=="
     },
     "cordova-plugin-device": {
       "version": "2.0.3",
@@ -7509,9 +6389,10 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-dialogs/-/cordova-plugin-dialogs-2.0.2.tgz",
       "integrity": "sha512-FUHI6eEVeoz2VkxbF0P56QlUQLGzXcvw3i4xuXyM9gEct6Y+FA3Xzgl2pJTZcTg5wRqLWzN08kgNoHPkom15pw=="
     },
-    "cordova-plugin-fcm-with-dependecy-updated": {
-      "version": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#9ffa1ccb36f040e2c268092a23526298266044b3",
-      "from": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-2.9.0"
+    "cordova-plugin-document-viewer": {
+      "version": "0.9.13",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-document-viewer/-/cordova-plugin-document-viewer-0.9.13.tgz",
+      "integrity": "sha512-9Lem77mmvupHpejpn8mxhnoDVpy72U/nFxjvKKIJnBA70tb6TVxWXSwCmq2mfFp+fyppwwbqAU3x8NOCPiOaoQ=="
     },
     "cordova-plugin-file": {
       "version": "6.0.2",
@@ -7524,7 +6405,7 @@
       "integrity": "sha512-yeN242U6T+TDlrJ5m00br+lAKsf2fHXn1u1TsDxB5fFUGINZUYLKthEctCMFkQUnURWk+Nh6tc+WtdQjY581Uw=="
     },
     "cordova-plugin-file-support": {
-      "version": "git+https://github.com/project-sunbird/cordova-plugin-file-support.git#c54a96a455c28743d765f633e03109cc549c3b1e",
+      "version": "git+https://github.com/project-sunbird/cordova-plugin-file-support.git#55b2e4dbe9a4627b80bc7b2ddf1151b1e01ac34c",
       "from": "git+https://github.com/project-sunbird/cordova-plugin-file-support.git"
     },
     "cordova-plugin-file-transfer": {
@@ -7532,20 +6413,43 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-file-transfer/-/cordova-plugin-file-transfer-1.7.1.tgz",
       "integrity": "sha1-p12L4uvDu5sjxbG70ZkhTsJnWGs="
     },
+    "cordova-plugin-filechooser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-filechooser/-/cordova-plugin-filechooser-1.2.0.tgz",
+      "integrity": "sha512-ycL9ML3wlRQ8wfK7vCG8gobv1f3VIdO52m0LA9mPSzLblbu0AXJs89yCRxZB87+08/V96qBxrmkxMsMmVYu5wA=="
+    },
+    "cordova-plugin-filepath": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-filepath/-/cordova-plugin-filepath-1.6.0.tgz",
+      "integrity": "sha512-DwKuH5tXhZJImU/rHDzQhG3bY2ihAUw5QqdNllso96MZ9TQTAbFvKPLppuJwx21XxYS2g3uB9R17AXEEme+sKA=="
+    },
+    "cordova-plugin-filepicker": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-filepicker/-/cordova-plugin-filepicker-1.1.6.tgz",
+      "integrity": "sha512-nUlnFj22HImuF/sjB61qdNyzg/9wFbx1808ADly7QN6jDK1DoN18qg8POOroPCNG355v7mbh/nohxnEYz57tHg==",
+      "requires": {
+        "q": "^1.5.1",
+        "xcode": "^2.0.0"
+      }
+    },
     "cordova-plugin-inappbrowser": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-inappbrowser/-/cordova-plugin-inappbrowser-3.2.0.tgz",
       "integrity": "sha512-tYsK0H9M8POmJTVnfyIsiRgoOxnypa9IQIbf/Hsgi7vbgUYRHtBUfvXwq4RhMqLIVrCeJLXF2hTXTDNY0a/eTA=="
     },
+    "cordova-plugin-inappupdatemanager": {
+      "version": "git+https://github.com/subranil/cordova-plugin-inappupdatemanager.git#4b93183f4fcfe8f907b9b81f4fda4e8223964918",
+      "from": "git+https://github.com/subranil/cordova-plugin-inappupdatemanager.git#release-3.7.0"
+    },
     "cordova-plugin-ionic-keyboard": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-keyboard/-/cordova-plugin-ionic-keyboard-2.2.0.tgz",
       "integrity": "sha512-yDUG+9ieKVRitq5mGlNxjaZh/MgEhFFIgTIPhqSbUaQ8UuZbawy5mhJAVClqY97q8/rcQtL6dCDa7x2sEtCLcA=="
     },
     "cordova-plugin-ionic-webview": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-4.1.3.tgz",
-      "integrity": "sha512-hlrUF0kLjjEkZmpYlLJO0NnXmVjMmQ3MOZVXm1ytDihLPKHklYCOpCvjA5Wz3hJrPD1shFEsqi/SPnp873AsdQ=="
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-5.0.0.tgz",
+      "integrity": "sha512-Wq0kCanxubK/JroTW4Mp5soayScnRyiY1eCkbwiz1Dyt1xHOiOW/v+1miqtBHtnZhcXw25TulCKAVJzkNBdmyg=="
     },
     "cordova-plugin-local-notification": {
       "version": "git+https://github.com/katzer/cordova-plugin-local-notifications.git#caff55ec758fdf298029ae98aff7f6a8a097feac",
@@ -7570,23 +6474,42 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-printer/-/cordova-plugin-printer-0.8.0.tgz",
       "integrity": "sha512-Olu2SuCedztO6PtXoHwA4J/emOxZlj64Ya9aZhcxoXJITG+RDF6Nb3oThcpYPTa73+py+gPF7r19lv3Q8RR/Nw=="
     },
+    "cordova-plugin-proguard": {
+      "version": "git+https://github.com/greybax/cordova-plugin-proguard.git#e9d2fd9f3855efe983e5cfcb5d2831971ae9ea48",
+      "from": "git+https://github.com/greybax/cordova-plugin-proguard.git"
+    },
     "cordova-plugin-qr-scanner": {
-      "version": "git+https://github.com/project-sunbird/cordova-plugin-qr-scanner.git#321e74b7ad06f93ff3aad239882b99a6fad29cdf",
-      "from": "git+https://github.com/project-sunbird/cordova-plugin-qr-scanner.git"
+      "version": "git+https://github.com/project-sunbird/cordova-plugin-qr-scanner.git#b6e7dd42dcca7307fe49974b1f341ff8aea2cf64",
+      "from": "git+https://github.com/project-sunbird/cordova-plugin-qr-scanner.git#release-3.3.0"
     },
     "cordova-plugin-screen-orientation": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/cordova-plugin-screen-orientation/-/cordova-plugin-screen-orientation-3.0.2.tgz",
       "integrity": "sha512-2w6CMC+HGvbhogJetalwGurL2Fx8DQCCPy3wlSZHN1/W7WoQ5n9ujVozcoKrY4VaagK6bxrPFih+ElkO8Uqfzg=="
     },
+    "cordova-plugin-secure-storage-echo": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-secure-storage-echo/-/cordova-plugin-secure-storage-echo-5.1.1.tgz",
+      "integrity": "sha512-8TLY9ilM/K597vLKCEKwboJ0yjJqdlZAdc4GK67nqjaSbGOBso94uVNXQ6iAvrcXt+rnK1ZOFG3DI/n8S8aj/w=="
+    },
     "cordova-plugin-statusbar": {
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-2.4.3.tgz",
       "integrity": "sha512-ThmXzl6QIKWFXf4wWw7Q/zpB+VKkz3VM958+5A0sXD4jmR++u7KnGttLksXshVwWr6lvGwUebLYtIyXwS4Ovcg=="
     },
+    "cordova-plugin-streaming-media": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-streaming-media/-/cordova-plugin-streaming-media-2.3.0.tgz",
+      "integrity": "sha512-og7UmXbaWoSrOmo/mZu/c7vKDdUMu2eVrdRMvIJY6qqZ6Fv2BrJvOXm8prVt0xjWqWOMJpQs3DAajX8+N39Cqw=="
+    },
     "cordova-plugin-sunbirdsplash": {
-      "version": "git+https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git#6c501806b5fbb71e0ad8f3c8b311e77dab9b8c98",
-      "from": "git+https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git"
+      "version": "git+https://github.com/shikshalokam/cordova-plugin-sunbirdsplash.git#b28f6db1f9a415c9fba2a58cc5ea27095b3a5732",
+      "from": "git+https://github.com/shikshalokam/cordova-plugin-sunbirdsplash.git#release-3.9.0-ios"
+    },
+    "cordova-plugin-telerik-imagepicker": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-telerik-imagepicker/-/cordova-plugin-telerik-imagepicker-2.3.3.tgz",
+      "integrity": "sha512-eL16EIxDueDo+dky5lNuzC+bDbKHPLPDfd/mtNpaCTNoT6iZqFd9/qJwSMnidXqCeExJZkN4ACsEHmtUA+vQ7Q=="
     },
     "cordova-plugin-webview-checker": {
       "version": "1.0.1",
@@ -7599,72 +6522,81 @@
       "integrity": "sha512-EYC5eQFVkoYXq39l7tYKE6lEjHJ04mvTmKXxGL7quHLdFPfJMNzru/UYpn92AOfpl3PQaZmou78C7EgmFOwFQQ=="
     },
     "cordova-plugin-x-socialsharing": {
-      "version": "5.6.4",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-x-socialsharing/-/cordova-plugin-x-socialsharing-5.6.4.tgz",
-      "integrity": "sha512-bBjWY9TgoH1CMK4P26zLT1D9rVcvI9LoIEGUjmwdLGiBP+IWo7RXu90RM1xHmVjG5hVLgmic5XyWc665ye8aRQ=="
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-x-socialsharing/-/cordova-plugin-x-socialsharing-6.0.3.tgz",
+      "integrity": "sha512-pnrE2CXsz4G0n0WoFDAasLS1VT3nIsNpddvXgfpiqX3wyOlSjO2NdF+sjYaTvs1B+f7z8EWbYCHpCrgBQiMLIg=="
     },
     "cordova-plugin-zip": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/cordova-plugin-zip/-/cordova-plugin-zip-3.1.0.tgz",
       "integrity": "sha1-F2yCSOog058c+VnvXmFWrMqWshc="
     },
+    "cordova-sqlite-storage": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-sqlite-storage/-/cordova-sqlite-storage-5.1.0.tgz",
+      "integrity": "sha512-UmHe9yQiYblDBToh3z91WHuD6ZgmCm3VX+1QFseYQs4WVQ3+ndj22qyGby/NV0uyCgok91gB1obLjLM+9vYJEw==",
+      "requires": {
+        "cordova-sqlite-storage-dependencies": "3.0.0"
+      }
+    },
+    "cordova-sqlite-storage-dependencies": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cordova-sqlite-storage-dependencies/-/cordova-sqlite-storage-dependencies-3.0.0.tgz",
+      "integrity": "sha512-A7gV5lQZc0oPrJ/a+lsZmMZr7vYou4MXyQFOY+b/dwuCMsagLT0EsL7oY54tqzpvjtzLfh0aZGGm9i8DMAIFSA=="
+    },
     "cordova-zip-plugin": {
       "version": "git+https://github.com/swayangjit/jjdltc-cordova-plugin-zip.git#31ba05a47d9ab27cdd9763afa155731bc3481b65",
       "from": "git+https://github.com/swayangjit/jjdltc-cordova-plugin-zip.git"
     },
     "cordova.plugins.diagnostic": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/cordova.plugins.diagnostic/-/cordova.plugins.diagnostic-5.0.1.tgz",
-      "integrity": "sha512-nuHDm0EQZcoz1DIFLG7/cdxhFL2LHVi9hWZ+gLNO5GsMSvjMh1PRGuoBjOjvBjsqTFlYbWEetu1/tgZ/29qbfg==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/cordova.plugins.diagnostic/-/cordova.plugins.diagnostic-5.0.2.tgz",
+      "integrity": "sha512-H59o7YxJ2/COzvg+jyTpUqX8QoDcvti9dluJ9a+pHumE8lf3meWemwCl0QFa9GH+xgVd6X1Ikj/6P3+DKWd9eg==",
       "requires": {
         "colors": "^1.1.2",
         "elementtree": "^0.1.6",
         "minimist": "1.2.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
       }
     },
     "core-js": {
-      "version": "2.6.10",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz",
-      "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA=="
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
     },
     "core-js-compat": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
-      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
+      "version": "3.15.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.15.1.tgz",
+      "integrity": "sha512-xGhzYMX6y7oEGQGAJmP2TmtBLvR4nZmRGEcFa3ubHOq5YEp51gGN9AovVa0AoujGZIq+Wm6dISiYyGNfdflYww==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.8.5",
+        "browserslist": "^4.16.6",
         "semver": "7.0.0"
       },
       "dependencies": {
         "browserslist": {
-          "version": "4.12.0",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
-          "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
+          "version": "4.16.6",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
+          "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001043",
-            "electron-to-chromium": "^1.3.413",
-            "node-releases": "^1.1.53",
-            "pkg-up": "^2.0.0"
+            "caniuse-lite": "^1.0.30001219",
+            "colorette": "^1.2.2",
+            "electron-to-chromium": "^1.3.723",
+            "escalade": "^3.1.1",
+            "node-releases": "^1.1.71"
           }
         },
         "caniuse-lite": {
-          "version": "1.0.30001046",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001046.tgz",
-          "integrity": "sha512-CsGjBRYWG6FvgbyGy+hBbaezpwiqIOLkxQPY4A4Ea49g1eNsnQuESB+n4QM0BKii1j80MyJ26Ir5ywTQkbRE4g==",
-          "dev": true
-        },
-        "electron-to-chromium": {
-          "version": "1.3.415",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.415.tgz",
-          "integrity": "sha512-GbtYqKffx3sU8G0HxwXuJFfs58Q7+iwLa5rBwaULwET6jWW8IAQSrVnu7vEfiUIcMVfbYyFg7cw3zdm+EbBJmw==",
-          "dev": true
-        },
-        "node-releases": {
-          "version": "1.1.53",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz",
-          "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==",
+          "version": "1.0.30001239",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz",
+          "integrity": "sha512-cyBkXJDMeI4wthy8xJ2FvDU6+0dtcZSJW3voUF8+e9f1bBeuvyZfc3PNbkOETyhbR+dGCPzn9E7MA3iwzusOhQ==",
           "dev": true
         },
         "semver": {
@@ -7675,21 +6607,27 @@
         }
       }
     },
+    "core-js-pure": {
+      "version": "3.15.1",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.15.1.tgz",
+      "integrity": "sha512-OZuWHDlYcIda8sJLY4Ec6nWq2hRjlyCqCZ+jCflyleMkVt3tPedDVErvHslyS2nbO+SlBFMSBJYvtLMwxnrzjA==",
+      "optional": true
+    },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
-      "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
       "dev": true,
       "requires": {
+        "import-fresh": "^2.0.0",
         "is-directory": "^0.3.1",
-        "js-yaml": "^3.9.0",
-        "parse-json": "^4.0.0",
-        "require-from-string": "^2.0.1"
+        "js-yaml": "^3.13.1",
+        "parse-json": "^4.0.0"
       },
       "dependencies": {
         "parse-json": {
@@ -7704,14 +6642,35 @@
         }
       }
     },
+    "coverage-istanbul-loader": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/coverage-istanbul-loader/-/coverage-istanbul-loader-2.0.3.tgz",
+      "integrity": "sha512-LiGRvyIuzVYs3M1ZYK1tF0HekjH0DJ8zFdUwAZq378EJzqOgToyb1690dp3TAUlP6Y+82uu42LRjuROVeJ54CA==",
+      "dev": true,
+      "requires": {
+        "convert-source-map": "^1.7.0",
+        "istanbul-lib-instrument": "^4.0.0",
+        "loader-utils": "^1.2.3",
+        "merge-source-map": "^1.1.0",
+        "schema-utils": "^2.6.1"
+      }
+    },
     "create-ecdh": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
       "dev": true,
       "requires": {
         "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
+        "elliptic": "^6.5.3"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
       }
     },
     "create-error-class": {
@@ -7750,14 +6709,13 @@
       }
     },
     "cross-spawn": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
-      "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
-      "dev": true,
-      "optional": true,
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "requires": {
-        "lru-cache": "^4.0.1",
-        "which": "^1.2.9"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       }
     },
     "crypto-browserify": {
@@ -7784,23 +6742,57 @@
       "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
       "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
     },
+    "css-line-break": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-1.1.1.tgz",
+      "integrity": "sha512-1feNVaM4Fyzdj4mKPIQNL2n70MmuYzAXZ1aytlROFX1JsOo070OsugwGjj7nl6jnDJWHDM8zRZswkmeYVWZJQA==",
+      "optional": true,
+      "requires": {
+        "base64-arraybuffer": "^0.2.0"
+      },
+      "dependencies": {
+        "base64-arraybuffer": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz",
+          "integrity": "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ==",
+          "optional": true
+        }
+      }
+    },
     "css-parse": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz",
       "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=",
       "dev": true
     },
+    "css-select": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+      "dev": true,
+      "requires": {
+        "boolbase": "~1.0.0",
+        "css-what": "2.1",
+        "domutils": "1.5.1",
+        "nth-check": "~1.0.1"
+      }
+    },
     "css-selector-tokenizer": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz",
-      "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz",
+      "integrity": "sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==",
       "dev": true,
       "requires": {
-        "cssesc": "^0.1.0",
-        "fastparse": "^1.1.1",
-        "regexpu-core": "^1.0.0"
+        "cssesc": "^3.0.0",
+        "fastparse": "^1.1.2"
       }
     },
+    "css-what": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
+      "dev": true
+    },
     "cssauron": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz",
@@ -7811,9 +6803,9 @@
       }
     },
     "cssesc": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
-      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "dev": true
     },
     "cssom": {
@@ -7823,9 +6815,9 @@
       "dev": true
     },
     "cssstyle": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz",
-      "integrity": "sha512-sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
       "dev": true,
       "requires": {
         "cssom": "~0.3.6"
@@ -7839,16 +6831,6 @@
         }
       }
     },
-    "currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "array-find-index": "^1.0.1"
-      }
-    },
     "custom-event": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
@@ -7860,11 +6842,20 @@
       "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI="
     },
     "cyclist": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
-      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
       "dev": true
     },
+    "d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "requires": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -7875,9 +6866,9 @@
       }
     },
     "data-uri-to-buffer": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz",
-      "integrity": "sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz",
+      "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og=="
     },
     "data-urls": {
       "version": "1.1.0",
@@ -7895,21 +6886,15 @@
       "resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz",
       "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg="
     },
-    "date-now": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
-      "dev": true
-    },
     "dateformat": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
       "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI="
     },
     "dayjs": {
-      "version": "1.8.18",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.18.tgz",
-      "integrity": "sha512-JBMJZghNK8TtuoPnKNIzW9xavVVigld/zmZNpZSyQbkb2Opp55YIfZUpE4OEqPF/iyUVQTKcn1bC2HtC8B7s3g=="
+      "version": "1.9.8",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.9.8.tgz",
+      "integrity": "sha512-F42qBtJRa30FKF7XDnOQyNUTsaxDkuaZRj/i7BejSHC34LlLfPoIU4aeopvWfM+m1dJ6/DHKAWLg2ur+pLgq1w=="
     },
     "debug": {
       "version": "2.6.9",
@@ -7919,6 +6904,12 @@
         "ms": "2.0.0"
       }
     },
+    "debuglog": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
+      "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=",
+      "dev": true
+    },
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
@@ -7931,27 +6922,19 @@
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
     },
     "decompress": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz",
-      "integrity": "sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=",
-      "dev": true,
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz",
+      "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=",
       "requires": {
-        "decompress-tar": "^4.0.0",
-        "decompress-tarbz2": "^4.0.0",
-        "decompress-targz": "^4.0.0",
-        "decompress-unzip": "^4.0.1",
-        "graceful-fs": "^4.1.10",
-        "make-dir": "^1.0.0",
-        "pify": "^2.3.0",
-        "strip-dirs": "^2.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        }
+        "buffer-to-vinyl": "^1.0.0",
+        "concat-stream": "^1.4.6",
+        "decompress-tar": "^3.0.0",
+        "decompress-tarbz2": "^3.0.0",
+        "decompress-targz": "^3.0.0",
+        "decompress-unzip": "^3.0.0",
+        "stream-combiner2": "^1.1.1",
+        "vinyl-assign": "^1.0.1",
+        "vinyl-fs": "^2.2.0"
       }
     },
     "decompress-response": {
@@ -7964,97 +6947,130 @@
       }
     },
     "decompress-tar": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz",
-      "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==",
-      "dev": true,
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz",
+      "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=",
       "requires": {
-        "file-type": "^5.2.0",
-        "is-stream": "^1.1.0",
-        "tar-stream": "^1.5.2"
+        "is-tar": "^1.0.0",
+        "object-assign": "^2.0.0",
+        "strip-dirs": "^1.0.0",
+        "tar-stream": "^1.1.1",
+        "through2": "^0.6.1",
+        "vinyl": "^0.4.3"
       },
       "dependencies": {
-        "file-type": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
-          "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-          "dev": true
+        "clone": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8="
+        },
+        "object-assign": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
+          "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo="
+        },
+        "vinyl": {
+          "version": "0.4.6",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
+          "requires": {
+            "clone": "^0.2.0",
+            "clone-stats": "^0.0.1"
+          }
         }
       }
     },
     "decompress-tarbz2": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz",
-      "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==",
-      "dev": true,
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz",
+      "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=",
       "requires": {
-        "decompress-tar": "^4.1.0",
-        "file-type": "^6.1.0",
-        "is-stream": "^1.1.0",
-        "seek-bzip": "^1.0.5",
-        "unbzip2-stream": "^1.0.9"
+        "is-bzip2": "^1.0.0",
+        "object-assign": "^2.0.0",
+        "seek-bzip": "^1.0.3",
+        "strip-dirs": "^1.0.0",
+        "tar-stream": "^1.1.1",
+        "through2": "^0.6.1",
+        "vinyl": "^0.4.3"
       },
       "dependencies": {
-        "file-type": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz",
-          "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==",
-          "dev": true
-        }
-      }
-    },
-    "decompress-targz": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz",
-      "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==",
-      "dev": true,
+        "clone": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8="
+        },
+        "object-assign": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
+          "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo="
+        },
+        "vinyl": {
+          "version": "0.4.6",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
+          "requires": {
+            "clone": "^0.2.0",
+            "clone-stats": "^0.0.1"
+          }
+        }
+      }
+    },
+    "decompress-targz": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz",
+      "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=",
       "requires": {
-        "decompress-tar": "^4.1.1",
-        "file-type": "^5.2.0",
-        "is-stream": "^1.1.0"
+        "is-gzip": "^1.0.0",
+        "object-assign": "^2.0.0",
+        "strip-dirs": "^1.0.0",
+        "tar-stream": "^1.1.1",
+        "through2": "^0.6.1",
+        "vinyl": "^0.4.3"
       },
       "dependencies": {
-        "file-type": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
-          "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-          "dev": true
+        "clone": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8="
+        },
+        "object-assign": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
+          "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo="
+        },
+        "vinyl": {
+          "version": "0.4.6",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
+          "requires": {
+            "clone": "^0.2.0",
+            "clone-stats": "^0.0.1"
+          }
         }
       }
     },
     "decompress-unzip": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz",
-      "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=",
-      "dev": true,
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz",
+      "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=",
       "requires": {
-        "file-type": "^3.8.0",
-        "get-stream": "^2.2.0",
-        "pify": "^2.3.0",
-        "yauzl": "^2.4.2"
+        "is-zip": "^1.0.0",
+        "read-all-stream": "^3.0.0",
+        "stat-mode": "^0.2.0",
+        "strip-dirs": "^1.0.0",
+        "through2": "^2.0.0",
+        "vinyl": "^1.0.0",
+        "yauzl": "^2.2.1"
       },
       "dependencies": {
-        "file-type": {
-          "version": "3.9.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
-          "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-          "dev": true
-        },
-        "get-stream": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
-          "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
-          "dev": true,
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
           "requires": {
-            "object-assign": "^4.0.1",
-            "pinkie-promise": "^2.0.0"
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
           }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
         }
       }
     },
@@ -8064,10 +7080,18 @@
       "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
     },
     "deep-equal": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-      "dev": true
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
+      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+      "dev": true,
+      "requires": {
+        "is-arguments": "^1.0.4",
+        "is-date-object": "^1.0.1",
+        "is-regex": "^1.0.4",
+        "object-is": "^1.0.1",
+        "object-keys": "^1.1.1",
+        "regexp.prototype.flags": "^1.2.0"
+      }
     },
     "deep-extend": {
       "version": "0.6.0",
@@ -8086,13 +7110,106 @@
       "dev": true
     },
     "default-gateway": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz",
-      "integrity": "sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
       "dev": true,
       "requires": {
-        "execa": "^0.10.0",
+        "execa": "^1.0.0",
         "ip-regex": "^2.1.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "npm-run-path": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+          "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+          "dev": true,
+          "requires": {
+            "path-key": "^2.0.0"
+          }
+        },
+        "path-key": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^1.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+          "dev": true
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "deferred-leveldown": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.3.0.tgz",
+      "integrity": "sha512-a59VOT+oDy7vtAbLRCZwWgxu2BaCfd5Hk7wxJd48ei7I+nsg8Orlb9CLG0PMZienk9BSUKgeAqkO2+Lw+1+Ukw==",
+      "requires": {
+        "abstract-leveldown": "~6.2.1",
+        "inherits": "^2.0.3"
       }
     },
     "define-properties": {
@@ -8142,36 +7259,39 @@
       }
     },
     "degenerator": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz",
-      "integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-2.2.0.tgz",
+      "integrity": "sha512-aiQcQowF01RxFI4ZLFMpzyotbQonhNpBao6dkI8JPk5a+hmSjR5ErHp2CQySmQe8os3VBqLCIh87nDBgZXvsmg==",
       "requires": {
-        "ast-types": "0.x.x",
-        "escodegen": "1.x.x",
-        "esprima": "3.x.x"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
-        }
+        "ast-types": "^0.13.2",
+        "escodegen": "^1.8.1",
+        "esprima": "^4.0.0"
       }
     },
     "del": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
       "dev": true,
       "requires": {
+        "@types/glob": "^7.1.1",
         "globby": "^6.1.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "p-map": "^1.1.1",
-        "pify": "^3.0.0",
-        "rimraf": "^2.2.8"
+        "is-path-cwd": "^2.0.0",
+        "is-path-in-cwd": "^2.0.0",
+        "p-map": "^2.0.0",
+        "pify": "^4.0.1",
+        "rimraf": "^2.6.3"
       },
       "dependencies": {
+        "array-union": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+          "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+          "dev": true,
+          "requires": {
+            "array-uniq": "^1.0.1"
+          }
+        },
         "globby": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
@@ -8192,6 +7312,12 @@
               "dev": true
             }
           }
+        },
+        "p-map": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+          "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+          "dev": true
         }
       }
     },
@@ -8200,13 +7326,6 @@
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
-    "delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true,
-      "optional": true
-    },
     "depd": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -8219,9 +7338,9 @@
       "dev": true
     },
     "des.js": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
-      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
       "dev": true,
       "requires": {
         "inherits": "^2.0.1",
@@ -8233,15 +7352,6 @@
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
       "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
     },
-    "detect-indent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
-      "dev": true,
-      "requires": {
-        "repeating": "^2.0.0"
-      }
-    },
     "detect-newline": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
@@ -8249,21 +7359,30 @@
       "dev": true
     },
     "detect-node": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
-      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
       "dev": true
     },
+    "dezalgo": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
+      "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
+      "dev": true,
+      "requires": {
+        "asap": "^2.0.0",
+        "wrappy": "1"
+      }
+    },
     "di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
       "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw="
     },
     "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-      "dev": true
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
     },
     "diff-sequences": {
       "version": "25.2.6",
@@ -8280,15 +7399,23 @@
         "bn.js": "^4.1.0",
         "miller-rabin": "^4.0.0",
         "randombytes": "^2.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
       }
     },
     "dir-glob": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
-      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
       "requires": {
-        "path-type": "^3.0.0"
+        "path-type": "^4.0.0"
       }
     },
     "dns-equal": {
@@ -8298,9 +7425,9 @@
       "dev": true
     },
     "dns-packet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
+      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
       "dev": true,
       "requires": {
         "ip": "^1.1.0",
@@ -8327,12 +7454,38 @@
         "void-elements": "^2.0.0"
       }
     },
+    "dom-serializer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz",
+      "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^1.3.0",
+        "entities": "^1.1.1"
+      }
+    },
+    "dom-to-image": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/dom-to-image/-/dom-to-image-2.6.0.tgz",
+      "integrity": "sha1-ilA2CAiMh7HCL5A0rgMuGJiVWGc="
+    },
+    "dom-walk": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
+    },
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
       "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
       "dev": true
     },
+    "domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "dev": true
+    },
     "domexception": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
@@ -8342,31 +7495,56 @@
         "webidl-conversions": "^4.0.2"
       }
     },
-    "dot-prop": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
-      "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
+    "domhandler": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+      "dev": true,
       "requires": {
-        "is-obj": "^1.0.0"
+        "domelementtype": "1"
       }
     },
+    "dompurify": {
+      "version": "2.2.9",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.9.tgz",
+      "integrity": "sha512-+9MqacuigMIZ+1+EwoEltogyWGFTJZWU3258Rupxs+2CGs4H914G9er6pZbsme/bvb5L67o2rade9n21e4RW/w==",
+      "optional": true
+    },
+    "domutils": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "dev": true,
+      "requires": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "double-ended-queue": {
+      "version": "2.1.0-0",
+      "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz",
+      "integrity": "sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw="
+    },
     "download": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/download/-/download-7.0.0.tgz",
-      "integrity": "sha512-0Fe/CAjKycx12IG9We9gYlLP03BEcWTpttg7P5mwfOiQTg584kpuHqP7F61RkUJM+mfEdEU9TJonm0PJp5rQLw==",
-      "dev": true,
-      "requires": {
-        "caw": "^2.0.1",
-        "content-disposition": "^0.5.2",
-        "decompress": "^4.2.0",
-        "ext-name": "^5.0.0",
-        "file-type": "^7.7.1",
-        "filenamify": "^2.0.0",
-        "get-stream": "^3.0.0",
-        "got": "^8.3.1",
-        "make-dir": "^1.2.0",
-        "p-event": "^1.3.0",
-        "pify": "^3.0.0"
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz",
+      "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=",
+      "requires": {
+        "caw": "^1.0.1",
+        "concat-stream": "^1.4.7",
+        "each-async": "^1.0.0",
+        "filenamify": "^1.0.1",
+        "got": "^5.0.0",
+        "gulp-decompress": "^1.2.0",
+        "gulp-rename": "^1.2.0",
+        "is-url": "^1.2.0",
+        "object-assign": "^4.0.1",
+        "read-all-stream": "^3.0.0",
+        "readable-stream": "^2.0.2",
+        "stream-combiner2": "^1.1.1",
+        "vinyl": "^1.0.0",
+        "vinyl-fs": "^2.2.0",
+        "ware": "^1.2.0"
       }
     },
     "duplexer2": {
@@ -8401,13 +7579,6 @@
       "requires": {
         "onetime": "^1.0.0",
         "set-immediate-shim": "^1.0.0"
-      },
-      "dependencies": {
-        "onetime": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-          "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k="
-        }
       }
     },
     "ecc-jsbn": {
@@ -8434,14 +7605,17 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "ejs": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.0.2.tgz",
-      "integrity": "sha512-IncmUpn1yN84hy2shb0POJ80FWrfGNY0cxO9f4v+/sG7qcBvAtVWUA1IdzY/8EYUmOVhoKJVdJjNd3AZcnxOjA=="
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz",
+      "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==",
+      "requires": {
+        "jake": "^10.6.1"
+      }
     },
     "electron-to-chromium": {
-      "version": "1.3.133",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.133.tgz",
-      "integrity": "sha512-lyoC8aoqbbDqsprb6aPdt9n3DpOZZzdz/T4IZKsR0/dkZIxnJVUjjcpOSwA66jPRIOyDAamCTAUqweU05kKNSg==",
+      "version": "1.3.756",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.756.tgz",
+      "integrity": "sha512-WsmJym1TMeHVndjPjczTFbnRR/c4sbzg8fBFtuhlb2Sru3i/S1VGpzDSrv/It8ctMU2bj8G7g7/O3FzYMGw6eA==",
       "dev": true
     },
     "elementtree": {
@@ -8460,24 +7634,38 @@
       }
     },
     "elliptic": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
-      "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+          "dev": true
+        }
       }
     },
     "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
       "dev": true
     },
     "emojis-list": {
@@ -8492,23 +7680,53 @@
       "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
     },
     "encoding": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
-      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
       "dev": true,
       "requires": {
-        "iconv-lite": "~0.4.13"
+        "iconv-lite": "^0.6.2"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3.0.0"
+          }
+        }
       }
     },
-    "end-of-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+    "encoding-down": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-6.3.0.tgz",
+      "integrity": "sha512-QKrV0iKR6MZVJV08QY0wp1e7vF6QbhnbQhb07bwpEyuz4uZiZgPlEGdkCROuFkUwdxlFaiPIhjyarH1ee/3vhw==",
       "requires": {
-        "once": "^1.4.0"
+        "abstract-leveldown": "^6.2.1",
+        "inherits": "^2.0.3",
+        "level-codec": "^9.0.0",
+        "level-errors": "^2.0.0"
       }
     },
-    "endent": {
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "end-stream": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/end-stream/-/end-stream-0.1.0.tgz",
+      "integrity": "sha1-MgA/P0OKKwFDFoE3+PpumGbIHtU=",
+      "requires": {
+        "write-stream": "~0.4.3"
+      }
+    },
+    "endent": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/endent/-/endent-1.4.1.tgz",
       "integrity": "sha512-buHTb5c8AC9NshtP6dgmNLYkiT+olskbq1z6cEGvfGCF3Qphbu/1zz5Xu+yjTDln8RbxNhPoUyJ5H8MSrp1olQ==",
@@ -8538,16 +7756,6 @@
           "requires": {
             "ms": "2.0.0"
           }
-        },
-        "ws": {
-          "version": "3.3.3",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-          "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
-          "requires": {
-            "async-limiter": "~1.0.0",
-            "safe-buffer": "~5.1.0",
-            "ultron": "~1.1.0"
-          }
         }
       }
     },
@@ -8581,16 +7789,6 @@
           "requires": {
             "ms": "2.0.0"
           }
-        },
-        "ws": {
-          "version": "3.3.3",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-          "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
-          "requires": {
-            "async-limiter": "~1.0.0",
-            "safe-buffer": "~5.1.0",
-            "ultron": "~1.1.0"
-          }
         }
       }
     },
@@ -8622,6 +7820,48 @@
       "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
       "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0="
     },
+    "entities": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "dev": true
+    },
+    "epubjs": {
+      "version": "0.3.88",
+      "resolved": "https://registry.npmjs.org/epubjs/-/epubjs-0.3.88.tgz",
+      "integrity": "sha512-VRumULpUELYmYwzypyfbDwoSIqDp2LXOXCtY3o55o3YDW5Zm32UjtZuX/xaWFGqyZORNNMWWQ8VlMaY1djnDYg==",
+      "requires": {
+        "@types/localforage": "0.0.34",
+        "core-js": "^3.6.5",
+        "event-emitter": "^0.3.5",
+        "jszip": "^3.4.0",
+        "localforage": "^1.7.3",
+        "lodash": "^4.17.15",
+        "marks-pane": "^1.0.9",
+        "path-webpack": "0.0.3",
+        "xmldom": "^0.3.0"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "3.15.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.15.1.tgz",
+          "integrity": "sha512-h8VbZYnc9pDzueiS2610IULDkpFFPunHwIpl8yRwFahAEEdSpHlTy3h3z3rKq5h11CaUdBEeRViu9AYvbxiMeg=="
+        },
+        "localforage": {
+          "version": "1.9.0",
+          "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.9.0.tgz",
+          "integrity": "sha512-rR1oyNrKulpe+VM9cYmcFn6tsHuokyVHFaCM3+osEmxaHTbEk8oQu6eGDfS6DQLWi/N67XRmB8ECG37OES368g==",
+          "requires": {
+            "lie": "3.1.1"
+          }
+        },
+        "xmldom": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.3.0.tgz",
+          "integrity": "sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g=="
+        }
+      }
+    },
     "err-code": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
@@ -8629,10 +7869,9 @@
       "dev": true
     },
     "errno": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
-      "dev": true,
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
       "requires": {
         "prr": "~1.0.1"
       }
@@ -8645,10 +7884,66 @@
         "is-arrayish": "^0.2.1"
       }
     },
+    "es-abstract": {
+      "version": "1.18.3",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
+      "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.2",
+        "is-callable": "^1.2.3",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.3",
+        "is-string": "^1.0.6",
+        "object-inspect": "^1.10.3",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "es5-ext": {
+      "version": "0.10.53",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
+      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
+      "requires": {
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.3",
+        "next-tick": "~1.0.0"
+      }
+    },
+    "es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
     "es6-promise": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz",
-      "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q=="
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "dev": true
     },
     "es6-promise-plugin": {
       "version": "4.2.2",
@@ -8659,10 +7954,26 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
       "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+      "dev": true,
       "requires": {
         "es6-promise": "^4.0.3"
       }
     },
+    "es6-symbol": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "requires": {
+        "d": "^1.0.1",
+        "ext": "^1.1.2"
+      }
+    },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
+    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -8674,28 +7985,15 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz",
-      "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==",
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
       "requires": {
-        "esprima": "^3.1.3",
+        "esprima": "^4.0.1",
         "estraverse": "^4.2.0",
         "esutils": "^2.0.2",
         "optionator": "^0.8.1",
         "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "optional": true
-        }
       }
     },
     "eslint-scope": {
@@ -8711,48 +8009,69 @@
     "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
     "esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
       "requires": {
-        "estraverse": "^4.1.0"
+        "estraverse": "^5.2.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "dev": true
+        }
       }
     },
     "estraverse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
     },
     "esutils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
     },
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
     },
+    "event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14"
+      }
+    },
+    "event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
+    },
     "eventemitter3": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
-      "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "events": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
-      "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true
     },
     "eventsource": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz",
+      "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==",
       "dev": true,
       "requires": {
         "original": "^1.0.0"
@@ -8769,37 +8088,43 @@
       }
     },
     "exec-sh": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
-      "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
+      "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
       "dev": true
     },
     "execa": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
-      "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
-      "dev": true,
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
       "requires": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^3.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
+        "cross-spawn": "^7.0.0",
+        "get-stream": "^5.0.0",
+        "human-signals": "^1.1.1",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.0",
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2",
+        "strip-final-newline": "^2.0.0"
       },
       "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "dev": true,
+        "is-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
+        },
+        "merge-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+          "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+        },
+        "onetime": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+          "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
           "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "mimic-fn": "^2.1.0"
           }
         }
       }
@@ -8889,26 +8214,25 @@
       }
     },
     "expect": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-25.4.0.tgz",
-      "integrity": "sha512-7BDIX99BTi12/sNGJXA9KMRcby4iAmu1xccBOhyKCyEhjcVKS3hPmHdA/4nSI9QGIOkUropKqr3vv7WMDM5lvQ==",
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-25.5.0.tgz",
+      "integrity": "sha512-w7KAXo0+6qqZZhovCaBVPSIqQp7/UTcx4M9uKt2m6pd2VB1voyC8JizLRqeEqud3AAVP02g+hbErDu5gu64tlA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.4.0",
+        "@jest/types": "^25.5.0",
         "ansi-styles": "^4.0.0",
         "jest-get-type": "^25.2.6",
-        "jest-matcher-utils": "^25.4.0",
-        "jest-message-util": "^25.4.0",
+        "jest-matcher-utils": "^25.5.0",
+        "jest-message-util": "^25.5.0",
         "jest-regex-util": "^25.2.6"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -8930,46 +8254,71 @@
       }
     },
     "express": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-      "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
       "requires": {
-        "accepts": "~1.3.5",
+        "accepts": "~1.3.7",
         "array-flatten": "1.1.1",
-        "body-parser": "1.18.3",
-        "content-disposition": "0.5.2",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
         "content-type": "~1.0.4",
-        "cookie": "0.3.1",
+        "cookie": "0.4.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "~1.1.2",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.1.1",
+        "finalhandler": "~1.1.2",
         "fresh": "0.5.2",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
         "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
+        "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.4",
-        "qs": "6.5.2",
-        "range-parser": "~1.2.0",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
+        "range-parser": "~1.2.1",
         "safe-buffer": "5.1.2",
-        "send": "0.16.2",
-        "serve-static": "1.13.2",
-        "setprototypeof": "1.1.0",
-        "statuses": "~1.4.0",
-        "type-is": "~1.6.16",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
+        "statuses": "~1.5.0",
+        "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
       },
       "dependencies": {
-        "array-flatten": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+        "cookie": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+          "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
+        },
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+        },
+        "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=="
+        }
+      }
+    },
+    "ext": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
+      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
+      "requires": {
+        "type": "^2.0.0"
+      },
+      "dependencies": {
+        "type": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
+          "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw=="
         }
       }
     },
@@ -9017,25 +8366,14 @@
       }
     },
     "external-editor": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
-      "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
       "dev": true,
       "requires": {
         "chardet": "^0.7.0",
         "iconv-lite": "^0.4.24",
         "tmp": "^0.0.33"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.4.24",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-          "dev": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        }
       }
     },
     "extglob": {
@@ -9098,10 +8436,9 @@
       }
     },
     "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz",
+      "integrity": "sha1-4mifjzVvrWLMplo6kcXfX5VRaS8="
     },
     "eyes": {
       "version": "0.1.8",
@@ -9120,10 +8457,70 @@
       }
     },
     "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "dev": true
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+    },
+    "fast-glob": {
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
+      "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+      "requires": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.0",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.2",
+        "picomatch": "^2.2.1"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "glob-parent": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
+        },
+        "micromatch": {
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
     },
     "fast-json-parse": {
       "version": "1.0.3",
@@ -9131,9 +8528,9 @@
       "integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw=="
     },
     "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -9151,6 +8548,14 @@
       "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
       "dev": true
     },
+    "fastq": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
+      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+      "requires": {
+        "reusify": "^1.0.4"
+      }
+    },
     "faye-websocket": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
@@ -9177,60 +8582,78 @@
         "pend": "~1.2.0"
       }
     },
+    "fetch-cookie": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-0.10.1.tgz",
+      "integrity": "sha512-beB+VEd4cNeVG1PY+ee74+PkuCQnik78pgLi5Ah/7qdUfov8IctU0vLUbBT8/10Ma5GMBeI4wtxhGrEfKNYs2g==",
+      "requires": {
+        "tough-cookie": "^2.3.3 || ^3.0.1 || ^4.0.0"
+      }
+    },
+    "fflate": {
+      "version": "0.4.8",
+      "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.4.8.tgz",
+      "integrity": "sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA=="
+    },
     "figgy-pudding": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
-      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
+      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
       "dev": true
     },
     "figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
       "dev": true,
       "requires": {
         "escape-string-regexp": "^1.0.5"
       }
     },
     "file-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz",
-      "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.2.0.tgz",
+      "integrity": "sha512-+xZnaK5R8kBJrHK0/6HRlrKNamvVS5rjyuju+rnyxRGuwUJwpAMsVzUl5dz6rK8brkzjV6JpcFNjp6NqV0g1OQ==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.0.2",
-        "schema-utils": "^1.0.0"
+        "loader-utils": "^1.2.3",
+        "schema-utils": "^2.0.0"
       }
     },
     "file-type": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-7.7.1.tgz",
-      "integrity": "sha512-bTrKkzzZI6wH+NXhyD3SOXtb2zXTw2SbwI2RxUlRcXVsnN7jNL5hJzVQLYv7FOQhxFkK4XWdAflEaWFpaLLWpQ==",
-      "dev": true
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+      "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek="
     },
     "file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
     },
+    "filelist": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz",
+      "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==",
+      "requires": {
+        "minimatch": "^3.0.4"
+      }
+    },
     "filename-regex": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
       "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY="
     },
     "filename-reserved-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
-      "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=",
-      "dev": true
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz",
+      "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q="
     },
     "filenamify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz",
-      "integrity": "sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==",
-      "dev": true,
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz",
+      "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=",
       "requires": {
-        "filename-reserved-regex": "^2.0.0",
+        "filename-reserved-regex": "^1.0.0",
         "strip-outer": "^1.0.0",
         "trim-repeated": "^1.0.0"
       }
@@ -9257,43 +8680,43 @@
       }
     },
     "finalhandler": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
-      "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
-        "statuses": "~1.4.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
         "unpipe": "~1.0.0"
       }
     },
     "find-cache-dir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
-      "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.0.0.tgz",
+      "integrity": "sha512-t7ulV1fmbxh5G9l/492O1p5+EBbr3uwpt6odhFTMc+nWyhmbloe+ja9BZ8pIBtqFWhOmCWVjx+pTW4zDkFoclw==",
       "dev": true,
       "requires": {
         "commondir": "^1.0.1",
-        "make-dir": "^1.0.0",
-        "pkg-dir": "^2.0.0"
+        "make-dir": "^3.0.0",
+        "pkg-dir": "^4.1.0"
       }
     },
     "find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
       "dev": true,
       "requires": {
-        "locate-path": "^2.0.0"
+        "locate-path": "^3.0.0"
       }
     },
     "fingerprintjs2": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fingerprintjs2/-/fingerprintjs2-2.1.0.tgz",
-      "integrity": "sha512-H1k/ESTD2rJ3liupyqWBPjZC+LKfCGixQzz/NDN4dkgbmG1bVFyMOh7luKSkVDoyfhgvRm62pviNMPI+eJTZcQ=="
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/fingerprintjs2/-/fingerprintjs2-2.1.4.tgz",
+      "integrity": "sha512-veP2yVsnYvjDVkzZMyIEwpqCAQfsBLH+U4PK5MlFAnLjZrttbdRqEArE1fPcnJFz5oS5CrdONbsV7J6FGpIJEQ=="
     },
     "first-chunk-stream": {
       "version": "1.0.0",
@@ -9316,27 +8739,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
-      "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
-      "requires": {
-        "debug": "^3.2.6"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-        }
-      }
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
+      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg=="
     },
     "for-in": {
       "version": "1.0.2",
@@ -9344,10 +8749,9 @@
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
     },
     "for-own": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-      "dev": true,
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
       "requires": {
         "for-in": "^1.0.1"
       }
@@ -9359,13 +8763,12 @@
       "dev": true
     },
     "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
       "requires": {
         "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
+        "combined-stream": "^1.0.8",
         "mime-types": "^2.1.12"
       }
     },
@@ -9375,9 +8778,9 @@
       "integrity": "sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q=="
     },
     "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
     },
     "fragment-cache": {
       "version": "0.2.1",
@@ -9417,20 +8820,28 @@
         "universalify": "^0.1.0"
       },
       "dependencies": {
-        "graceful-fs": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
-        }
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "universalify": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+        }
       }
     },
     "fs-minipass": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
-      "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
       "dev": true,
       "requires": {
-        "minipass": "^2.2.1"
+        "minipass": "^3.0.0"
       }
     },
     "fs-write-stream-atomic": {
@@ -9451,2531 +8862,2597 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz",
-      "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==",
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
       "optional": true,
       "requires": {
         "bindings": "^1.5.0",
-        "nan": "^2.12.1",
-        "node-pre-gyp": "*"
+        "nan": "^2.12.1"
+      }
+    },
+    "ftp": {
+      "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
+      "integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
+      "requires": {
+        "readable-stream": "1.1.x",
+        "xregexp": "2.0.0"
       },
       "dependencies": {
-        "abbrev": {
-          "version": "1.1.1",
-          "bundled": true,
-          "optional": true
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "optional": true
-        },
-        "aproba": {
-          "version": "1.2.0",
-          "bundled": true,
-          "optional": true
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
         },
-        "are-we-there-yet": {
-          "version": "1.1.5",
-          "bundled": true,
-          "optional": true,
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
           "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
           }
         },
-        "balanced-match": {
-          "version": "1.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "bundled": true,
-          "optional": true,
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+        }
+      }
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "genfun": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
+      "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
+      "dev": true
+    },
+    "gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
+    },
+    "get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true
+    },
+    "get-proxy": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz",
+      "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=",
+      "requires": {
+        "rc": "^1.1.2"
+      }
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
+    },
+    "get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "get-uri": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-3.0.2.tgz",
+      "integrity": "sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==",
+      "requires": {
+        "@tootallnate/once": "1",
+        "data-uri-to-buffer": "3",
+        "debug": "4",
+        "file-uri-to-path": "2",
+        "fs-extra": "^8.1.0",
+        "ftp": "^0.3.10"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "requires": {
-            "balanced-match": "^1.0.0",
-            "concat-map": "0.0.1"
+            "ms": "2.1.2"
           }
         },
-        "chownr": {
-          "version": "1.1.3",
-          "bundled": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "optional": true
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "optional": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "optional": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
+        "file-uri-to-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz",
+          "integrity": "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg=="
         },
-        "debug": {
-          "version": "3.2.6",
-          "bundled": true,
-          "optional": true,
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "glob": {
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-base": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+      "requires": {
+        "glob-parent": "^2.0.0",
+        "is-glob": "^2.0.0"
+      },
+      "dependencies": {
+        "glob-parent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
           "requires": {
-            "ms": "^2.1.1"
+            "is-glob": "^2.0.0"
           }
         },
-        "deep-extend": {
-          "version": "0.6.0",
-          "bundled": true,
-          "optional": true
-        },
-        "delegates": {
+        "is-extglob": {
           "version": "1.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "detect-libc": {
-          "version": "1.0.3",
-          "bundled": true,
-          "optional": true
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
         },
-        "fs-minipass": {
-          "version": "1.2.7",
-          "bundled": true,
-          "optional": true,
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "requires": {
-            "minipass": "^2.6.0"
+            "is-extglob": "^1.0.0"
           }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "optional": true,
+        }
+      }
+    },
+    "glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "requires": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
+            "is-extglob": "^2.1.0"
           }
-        },
-        "glob": {
-          "version": "7.1.6",
-          "bundled": true,
-          "optional": true,
+        }
+      }
+    },
+    "glob-stream": {
+      "version": "5.3.5",
+      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
+      "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
+      "requires": {
+        "extend": "^3.0.0",
+        "glob": "^5.0.3",
+        "glob-parent": "^3.0.0",
+        "micromatch": "^2.3.7",
+        "ordered-read-streams": "^0.3.0",
+        "through2": "^0.6.0",
+        "to-absolute-glob": "^0.1.1",
+        "unique-stream": "^2.0.2"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "arr-flatten": "^1.0.1"
           }
         },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "optional": true
+        "array-unique": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM="
         },
-        "iconv-lite": {
-          "version": "0.4.24",
-          "bundled": true,
-          "optional": true,
+        "braces": {
+          "version": "1.8.5",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+          "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
           "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
+            "expand-range": "^1.8.1",
+            "preserve": "^0.2.0",
+            "repeat-element": "^1.1.2"
           }
         },
-        "ignore-walk": {
-          "version": "3.0.3",
-          "bundled": true,
-          "optional": true,
+        "expand-brackets": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+          "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
           "requires": {
-            "minimatch": "^3.0.4"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.4",
-          "bundled": true,
-          "optional": true
-        },
-        "ini": {
-          "version": "1.3.5",
-          "bundled": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "optional": true
-        },
-        "minipass": {
-          "version": "2.9.0",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
-          }
-        },
-        "minizlib": {
-          "version": "1.3.3",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.9.0"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "bundled": true,
-          "optional": true
-        },
-        "needle": {
-          "version": "2.4.0",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "debug": "^3.2.6",
-            "iconv-lite": "^0.4.4",
-            "sax": "^1.2.4"
-          }
-        },
-        "node-pre-gyp": {
-          "version": "0.14.0",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "detect-libc": "^1.0.2",
-            "mkdirp": "^0.5.1",
-            "needle": "^2.2.1",
-            "nopt": "^4.0.1",
-            "npm-packlist": "^1.1.6",
-            "npmlog": "^4.0.2",
-            "rc": "^1.2.7",
-            "rimraf": "^2.6.1",
-            "semver": "^5.3.0",
-            "tar": "^4.4.2"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
-          }
-        },
-        "npm-bundled": {
-          "version": "1.1.1",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "npm-normalize-package-bin": "^1.0.1"
+            "is-posix-bracket": "^0.1.0"
           }
         },
-        "npm-normalize-package-bin": {
-          "version": "1.0.1",
-          "bundled": true,
-          "optional": true
-        },
-        "npm-packlist": {
-          "version": "1.4.7",
-          "bundled": true,
-          "optional": true,
+        "expand-range": {
+          "version": "1.8.2",
+          "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+          "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
           "requires": {
-            "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
+            "fill-range": "^2.1.0"
           }
         },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
-          "optional": true,
+        "extglob": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+          "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
           "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
+            "is-extglob": "^1.0.0"
           }
         },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "optional": true,
+        "fill-range": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
           "requires": {
-            "wrappy": "1"
+            "is-number": "^2.1.0",
+            "isobject": "^2.0.0",
+            "randomatic": "^3.0.0",
+            "repeat-element": "^1.1.2",
+            "repeat-string": "^1.5.2"
           }
         },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.5",
-          "bundled": true,
-          "optional": true,
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
           "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "optional": true
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
         },
-        "process-nextick-args": {
+        "is-glob": {
           "version": "2.0.1",
-          "bundled": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.8",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "^0.6.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "bundled": true,
-          "optional": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "bundled": true,
-          "optional": true,
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "requires": {
-            "glob": "^7.1.3"
+            "is-extglob": "^1.0.0"
           }
         },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "bundled": true,
-          "optional": true
-        },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "bundled": true,
-          "optional": true
-        },
-        "sax": {
-          "version": "1.2.4",
-          "bundled": true,
-          "optional": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "bundled": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true,
+        "is-number": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+          "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "kind-of": "^3.0.2"
           }
         },
-        "string_decoder": {
-          "version": "1.1.1",
-          "bundled": true,
-          "optional": true,
+        "isobject": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+          "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "isarray": "1.0.0"
           }
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "optional": true,
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "is-buffer": "^1.1.5"
           }
         },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "4.4.13",
-          "bundled": true,
-          "optional": true,
+        "micromatch": {
+          "version": "2.3.11",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+          "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
           "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.8.6",
-            "minizlib": "^1.2.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.3"
+            "arr-diff": "^2.0.0",
+            "array-unique": "^0.2.1",
+            "braces": "^1.8.2",
+            "expand-brackets": "^0.1.4",
+            "extglob": "^0.3.1",
+            "filename-regex": "^2.0.0",
+            "is-extglob": "^1.0.0",
+            "is-glob": "^2.0.1",
+            "kind-of": "^3.0.2",
+            "normalize-path": "^2.0.1",
+            "object.omit": "^2.0.0",
+            "parse-glob": "^3.0.4",
+            "regex-cache": "^0.4.2"
           }
         },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "wide-align": {
-          "version": "1.1.3",
-          "bundled": true,
-          "optional": true,
+        "normalize-path": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
           "requires": {
-            "string-width": "^1.0.2 || 2"
+            "remove-trailing-separator": "^1.0.1"
           }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "optional": true
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "bundled": true,
-          "optional": true
         }
       }
     },
-    "fstream": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+    "global": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz",
+      "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
+      "requires": {
+        "min-document": "^2.19.0",
+        "process": "~0.5.1"
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true
+    },
+    "globby": {
+      "version": "11.0.4",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
+      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.1.1",
+        "ignore": "^5.1.4",
+        "merge2": "^1.3.0",
+        "slash": "^3.0.0"
       }
     },
-    "ftp": {
-      "version": "0.3.10",
-      "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
-      "integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
+    "glogg": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
+      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
       "requires": {
-        "readable-stream": "1.1.x",
-        "xregexp": "2.0.0"
+        "sparkles": "^1.0.0"
+      }
+    },
+    "got": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz",
+      "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
+      "requires": {
+        "create-error-class": "^3.0.1",
+        "duplexer2": "^0.1.4",
+        "is-redirect": "^1.0.0",
+        "is-retry-allowed": "^1.0.0",
+        "is-stream": "^1.0.0",
+        "lowercase-keys": "^1.0.0",
+        "node-status-codes": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "parse-json": "^2.1.0",
+        "pinkie-promise": "^2.0.0",
+        "read-all-stream": "^3.0.0",
+        "readable-stream": "^2.0.5",
+        "timed-out": "^3.0.0",
+        "unzip-response": "^1.0.2",
+        "url-parse-lax": "^1.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
+    },
+    "grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
+    },
+    "growly": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
+      "dev": true,
+      "optional": true
+    },
+    "grunt-contrib-concat": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-1.0.1.tgz",
+      "integrity": "sha1-YVCYYwhOhx1+ht5IwBUlntl3Rb0=",
+      "requires": {
+        "chalk": "^1.0.0",
+        "source-map": "^0.5.3"
       },
       "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        }
+      }
+    },
+    "grunt-karma": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/grunt-karma/-/grunt-karma-0.12.2.tgz",
+      "integrity": "sha1-1SZ2q5R3nksgBStfNRnrMmU9xWY=",
+      "requires": {
+        "lodash": "^3.10.1"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
+        }
+      }
+    },
+    "gulp-decompress": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz",
+      "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=",
+      "requires": {
+        "archive-type": "^3.0.0",
+        "decompress": "^3.0.0",
+        "gulp-util": "^3.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "gulp-rename": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.4.0.tgz",
+      "integrity": "sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg=="
+    },
+    "gulp-sourcemaps": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
+      "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
+      "requires": {
+        "convert-source-map": "^1.1.1",
+        "graceful-fs": "^4.1.2",
+        "strip-bom": "^2.0.0",
+        "through2": "^2.0.0",
+        "vinyl": "^1.0.0"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
           }
+        }
+      }
+    },
+    "gulp-util": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
+      "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
+      "requires": {
+        "array-differ": "^1.0.0",
+        "array-uniq": "^1.0.2",
+        "beeper": "^1.0.0",
+        "chalk": "^1.0.0",
+        "dateformat": "^2.0.0",
+        "fancy-log": "^1.1.0",
+        "gulplog": "^1.0.0",
+        "has-gulplog": "^0.1.0",
+        "lodash._reescape": "^3.0.0",
+        "lodash._reevaluate": "^3.0.0",
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.template": "^3.0.0",
+        "minimist": "^1.1.0",
+        "multipipe": "^0.1.2",
+        "object-assign": "^3.0.0",
+        "replace-ext": "0.0.1",
+        "through2": "^2.0.0",
+        "vinyl": "^0.5.0"
+      },
+      "dependencies": {
+        "object-assign": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I="
         },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
         },
-        "xregexp": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
-          "integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM="
+        "vinyl": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
+          "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
+          "requires": {
+            "clone": "^1.0.0",
+            "clone-stats": "^0.0.1",
+            "replace-ext": "0.0.1"
+          }
         }
       }
     },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+    "gulplog": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
+      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
+      "requires": {
+        "glogg": "^1.0.0"
+      }
+    },
+    "hammerjs": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
+    },
+    "handle-thing": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
+      "dev": true
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
       "dev": true
     },
-    "gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+    "har-validator": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
+        "ajv": "^6.12.3",
+        "har-schema": "^2.0.0"
       }
     },
-    "gaze": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
-      "dev": true,
-      "optional": true,
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "requires": {
-        "globule": "^1.0.0"
+        "function-bind": "^1.1.1"
       }
     },
-    "genfun": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
-      "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
-      "dev": true
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
     },
-    "get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+    "has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
       "dev": true
     },
-    "get-proxy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz",
-      "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==",
-      "dev": true,
+    "has-binary2": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
+      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
       "requires": {
-        "npm-conf": "^1.1.0"
+        "isarray": "2.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
+        }
       }
     },
-    "get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
+    "has-cors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
     },
-    "get-stream": {
+    "has-flag": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
-    "get-uri": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.4.tgz",
-      "integrity": "sha512-v7LT/s8kVjs+Tx0ykk1I+H/rbpzkHvuIq87LmeXptcf5sNWm9uQiwjNAt94SJPA1zOlCntmnOlJvVWKmzsxG8Q==",
+    "has-gulplog": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
+      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
       "requires": {
-        "data-uri-to-buffer": "1",
-        "debug": "2",
-        "extend": "~3.0.2",
-        "file-uri-to-path": "1",
-        "ftp": "~0.3.10",
-        "readable-stream": "2"
+        "sparkles": "^1.0.0"
       }
     },
-    "get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+    "has-symbol-support-x": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
+      "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
+      "dev": true
     },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+    "has-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
+    },
+    "has-to-string-tag-x": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
+      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0"
+        "has-symbol-support-x": "^1.4.1"
       }
     },
-    "glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
       }
     },
-    "glob-base": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "requires": {
-        "glob-parent": "^2.0.0",
-        "is-glob": "^2.0.0"
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
       },
       "dependencies": {
-        "glob-parent": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-          "requires": {
-            "is-glob": "^2.0.0"
-          }
-        },
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "requires": {
-            "is-extglob": "^1.0.0"
+            "is-buffer": "^1.1.5"
           }
         }
       }
     },
-    "glob-parent": {
+    "hash-base": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
       "requires": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
       },
       "dependencies": {
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
           "requires": {
-            "is-extglob": "^2.1.0"
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
           }
         }
       }
     },
-    "glob-stream": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
-      "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
       "requires": {
-        "extend": "^3.0.0",
-        "glob": "^5.0.3",
-        "glob-parent": "^3.0.0",
-        "micromatch": "^2.3.7",
-        "ordered-read-streams": "^0.3.0",
-        "through2": "^0.6.0",
-        "to-absolute-glob": "^0.1.1",
-        "unique-stream": "^2.0.2"
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "hoek": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
+      "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA=="
+    },
+    "hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true
+    },
+    "hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "html-encoding-sniffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
+      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+      "dev": true,
+      "requires": {
+        "whatwg-encoding": "^1.0.1"
+      }
+    },
+    "html-entities": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
+      "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
+      "dev": true
+    },
+    "html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
+    "html2canvas": {
+      "version": "1.0.0-rc.7",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-rc.7.tgz",
+      "integrity": "sha512-yvPNZGejB2KOyKleZspjK/NruXVQuowu8NnV2HYG7gW7ytzl+umffbtUI62v2dCHQLDdsK6HIDtyJZ0W3neerA==",
+      "optional": true,
+      "requires": {
+        "css-line-break": "1.1.1"
+      }
+    },
+    "htmlparser2": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^1.3.1",
+        "domhandler": "^2.3.0",
+        "domutils": "^1.5.1",
+        "entities": "^1.1.1",
+        "inherits": "^2.0.1",
+        "readable-stream": "^3.1.1"
       },
       "dependencies": {
-        "arr-diff": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-          "requires": {
-            "arr-flatten": "^1.0.1"
-          }
-        },
-        "array-unique": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM="
-        },
-        "braces": {
-          "version": "1.8.5",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-          "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
           "requires": {
-            "expand-range": "^1.8.1",
-            "preserve": "^0.2.0",
-            "repeat-element": "^1.1.2"
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
           }
-        },
-        "expand-brackets": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-          "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+        }
+      }
+    },
+    "http-cache-semantics": {
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
+      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
+      "dev": true
+    },
+    "http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+      "dev": true
+    },
+    "http-errors": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      }
+    },
+    "http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "requires": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "requires": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "requires": {
-            "is-posix-bracket": "^0.1.0"
+            "ms": "2.1.2"
           }
         },
-        "expand-range": {
-          "version": "1.8.2",
-          "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-          "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
+      }
+    },
+    "http-proxy-middleware": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
+      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
+      "dev": true,
+      "requires": {
+        "http-proxy": "^1.17.0",
+        "is-glob": "^4.0.0",
+        "lodash": "^4.17.11",
+        "micromatch": "^3.1.10"
+      }
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
+    "https-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "requires": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "requires": {
-            "fill-range": "^2.1.0"
+            "ms": "2.1.2"
           }
         },
-        "extglob": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-          "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-          "requires": {
-            "is-extglob": "^1.0.0"
-          }
-        },
-        "fill-range": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
-          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
-          "requires": {
-            "is-number": "^2.1.0",
-            "isobject": "^2.0.0",
-            "randomatic": "^3.0.0",
-            "repeat-element": "^1.1.2",
-            "repeat-string": "^1.5.2"
-          }
-        },
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "requires": {
-            "is-extglob": "^1.0.0"
-          }
-        },
-        "is-number": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-          "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        },
-        "isobject": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-          "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-          "requires": {
-            "isarray": "1.0.0"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        },
-        "micromatch": {
-          "version": "2.3.11",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-          "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-          "requires": {
-            "arr-diff": "^2.0.0",
-            "array-unique": "^0.2.1",
-            "braces": "^1.8.2",
-            "expand-brackets": "^0.1.4",
-            "extglob": "^0.3.1",
-            "filename-regex": "^2.0.0",
-            "is-extglob": "^1.0.0",
-            "is-glob": "^2.0.1",
-            "kind-of": "^3.0.2",
-            "normalize-path": "^2.0.1",
-            "object.omit": "^2.0.0",
-            "parse-glob": "^3.0.4",
-            "regex-cache": "^0.4.2"
-          }
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          },
-          "dependencies": {
-            "isarray": {
-              "version": "0.0.1",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-              "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-            }
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-        },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-          "requires": {
-            "readable-stream": ">=1.0.33-1 <1.1.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
-          }
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         }
       }
     },
-    "globals": {
-      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-      "dev": true
-    },
-    "globby": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
-      "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
-      "dev": true,
-      "requires": {
-        "array-union": "^1.0.1",
-        "dir-glob": "^2.0.0",
-        "glob": "^7.1.2",
-        "ignore": "^3.3.5",
-        "pify": "^3.0.0",
-        "slash": "^1.0.0"
-      }
+    "human-signals": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="
     },
-    "globule": {
+    "humanize-ms": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
-      "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
+      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
+      "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
       "dev": true,
-      "optional": true,
       "requires": {
-        "glob": "~7.1.1",
-        "lodash": "~4.17.10",
-        "minimatch": "~3.0.2"
+        "ms": "^2.0.0"
       }
     },
-    "glogg": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "requires": {
-        "sparkles": "^1.0.0"
+        "safer-buffer": ">= 2.1.2 < 3"
       }
     },
-    "got": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz",
-      "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==",
-      "dev": true,
-      "requires": {
-        "@sindresorhus/is": "^0.7.0",
-        "cacheable-request": "^2.1.1",
-        "decompress-response": "^3.3.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^3.0.0",
-        "into-stream": "^3.1.0",
-        "is-retry-allowed": "^1.1.0",
-        "isurl": "^1.0.0-alpha5",
-        "lowercase-keys": "^1.0.0",
-        "mimic-response": "^1.0.0",
-        "p-cancelable": "^0.4.0",
-        "p-timeout": "^2.0.1",
-        "pify": "^3.0.0",
-        "safe-buffer": "^5.1.1",
-        "timed-out": "^4.0.1",
-        "url-parse-lax": "^3.0.0",
-        "url-to-options": "^1.0.1"
-      }
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
     },
-    "graceful-fs": {
-      "version": "4.1.15",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
     },
-    "graceful-readlink": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
+    "ignore": {
+      "version": "5.1.8",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "dev": true
     },
-    "grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
+    "ignore-walk": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz",
+      "integrity": "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==",
+      "dev": true,
+      "requires": {
+        "minimatch": "^3.0.4"
+      }
     },
-    "growly": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
-      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
+    "image-size": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
+      "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
       "dev": true,
       "optional": true
     },
-    "grunt-contrib-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-1.0.1.tgz",
-      "integrity": "sha1-YVCYYwhOhx1+ht5IwBUlntl3Rb0=",
+    "immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
+    },
+    "immutable": {
+      "version": "4.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0-rc.12.tgz",
+      "integrity": "sha512-0M2XxkZLx/mi3t8NVwIm1g8nHoEmM9p9UBl/G9k4+hm0kBgOVdMV/B3CY5dQ8qG8qc80NN4gDV4HQv6FTJ5q7A=="
+    },
+    "import-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+      "dev": true,
       "requires": {
-        "chalk": "^1.0.0",
-        "source-map": "^0.5.3"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-        }
+        "import-from": "^2.1.0"
       }
     },
-    "grunt-karma": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/grunt-karma/-/grunt-karma-0.12.2.tgz",
-      "integrity": "sha1-1SZ2q5R3nksgBStfNRnrMmU9xWY=",
+    "import-fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+      "dev": true,
       "requires": {
-        "lodash": "^3.10.1"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
-        }
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
       }
     },
-    "gulp-decompress": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz",
-      "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=",
+    "import-from": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+      "dev": true,
       "requires": {
-        "archive-type": "^3.0.0",
-        "decompress": "^3.0.0",
-        "gulp-util": "^3.0.1",
-        "readable-stream": "^2.0.2"
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "import-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "dev": true,
+      "requires": {
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "clone": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8="
-        },
-        "decompress": {
+        "pkg-dir": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz",
-          "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "dev": true,
           "requires": {
-            "buffer-to-vinyl": "^1.0.0",
-            "concat-stream": "^1.4.6",
-            "decompress-tar": "^3.0.0",
-            "decompress-tarbz2": "^3.0.0",
-            "decompress-targz": "^3.0.0",
-            "decompress-unzip": "^3.0.0",
-            "stream-combiner2": "^1.1.1",
-            "vinyl-assign": "^1.0.1",
-            "vinyl-fs": "^2.2.0"
+            "find-up": "^3.0.0"
           }
+        }
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true
+    },
+    "indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
+    },
+    "individual": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/individual/-/individual-2.0.0.tgz",
+      "integrity": "sha1-gzsJfa0jKU52EXqY+zjg2a1hu5c="
+    },
+    "infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+    },
+    "inquirer": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.1.tgz",
+      "integrity": "sha512-uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^2.4.2",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.15",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.2.0",
+        "rxjs": "^6.4.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^5.1.0",
+        "through": "^2.3.6"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
         },
-        "decompress-tar": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz",
-          "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
           "requires": {
-            "is-tar": "^1.0.0",
-            "object-assign": "^2.0.0",
-            "strip-dirs": "^1.0.0",
-            "tar-stream": "^1.1.1",
-            "through2": "^0.6.1",
-            "vinyl": "^0.4.3"
+            "color-convert": "^1.9.0"
           }
         },
-        "decompress-tarbz2": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz",
-          "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=",
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
           "requires": {
-            "is-bzip2": "^1.0.0",
-            "object-assign": "^2.0.0",
-            "seek-bzip": "^1.0.3",
-            "strip-dirs": "^1.0.0",
-            "tar-stream": "^1.1.1",
-            "through2": "^0.6.1",
-            "vinyl": "^0.4.3"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
-        "decompress-targz": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz",
-          "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=",
-          "requires": {
-            "is-gzip": "^1.0.0",
-            "object-assign": "^2.0.0",
-            "strip-dirs": "^1.0.0",
-            "tar-stream": "^1.1.1",
-            "through2": "^0.6.1",
-            "vinyl": "^0.4.3"
-          }
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
         },
-        "decompress-unzip": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz",
-          "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=",
-          "requires": {
-            "is-zip": "^1.0.0",
-            "read-all-stream": "^3.0.0",
-            "stat-mode": "^0.2.0",
-            "strip-dirs": "^1.0.0",
-            "through2": "^2.0.0",
-            "vinyl": "^1.0.0",
-            "yauzl": "^2.2.1"
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
           },
           "dependencies": {
-            "clone": {
-              "version": "1.0.4",
-              "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-              "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
-            },
-            "through2": {
-              "version": "2.0.5",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-              "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-              "requires": {
-                "readable-stream": "~2.3.6",
-                "xtend": "~4.0.1"
-              }
-            },
-            "vinyl": {
-              "version": "1.2.0",
-              "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-              "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
+            "strip-ansi": {
+              "version": "6.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+              "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+              "dev": true,
               "requires": {
-                "clone": "^1.0.0",
-                "clone-stats": "^0.0.1",
-                "replace-ext": "0.0.1"
+                "ansi-regex": "^5.0.0"
               }
             }
           }
         },
-        "is-natural-number": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz",
-          "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec="
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-        },
-        "object-assign": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
-          "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo="
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-        },
-        "strip-dirs": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
-          "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=",
-          "requires": {
-            "chalk": "^1.0.0",
-            "get-stdin": "^4.0.1",
-            "is-absolute": "^0.1.5",
-            "is-natural-number": "^2.0.0",
-            "minimist": "^1.1.0",
-            "sum-up": "^1.0.1"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-        },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
           "requires": {
-            "readable-stream": ">=1.0.33-1 <1.1.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
+            "ansi-regex": "^4.1.0"
           },
           "dependencies": {
-            "readable-stream": {
-              "version": "1.0.34",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-              "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.1",
-                "isarray": "0.0.1",
-                "string_decoder": "~0.10.x"
-              }
+            "ansi-regex": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+              "dev": true
             }
           }
         },
-        "vinyl": {
-          "version": "0.4.6",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-          "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
           "requires": {
-            "clone": "^0.2.0",
-            "clone-stats": "^0.0.1"
+            "has-flag": "^3.0.0"
           }
         }
       }
     },
-    "gulp-rename": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.4.0.tgz",
-      "integrity": "sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg=="
-    },
-    "gulp-sourcemaps": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
-      "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
+    "internal-ip": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
+      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
+      "dev": true,
       "requires": {
-        "convert-source-map": "^1.1.1",
-        "graceful-fs": "^4.1.2",
-        "strip-bom": "^2.0.0",
-        "through2": "^2.0.0",
-        "vinyl": "^1.0.0"
+        "default-gateway": "^4.2.0",
+        "ipaddr.js": "^1.9.0"
       }
     },
-    "gulp-util": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-      "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
-      "requires": {
-        "array-differ": "^1.0.0",
-        "array-uniq": "^1.0.2",
-        "beeper": "^1.0.0",
-        "chalk": "^1.0.0",
-        "dateformat": "^2.0.0",
-        "fancy-log": "^1.1.0",
-        "gulplog": "^1.0.0",
-        "has-gulplog": "^0.1.0",
-        "lodash._reescape": "^3.0.0",
-        "lodash._reevaluate": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.template": "^3.0.0",
-        "minimist": "^1.1.0",
-        "multipipe": "^0.1.2",
-        "object-assign": "^3.0.0",
-        "replace-ext": "0.0.1",
-        "through2": "^2.0.0",
-        "vinyl": "^0.5.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "clone": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-          "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
-        },
-        "object-assign": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-          "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I="
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-        },
-        "vinyl": {
-          "version": "0.5.3",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-          "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-          "requires": {
-            "clone": "^1.0.0",
-            "clone-stats": "^0.0.1",
-            "replace-ext": "0.0.1"
-          }
-        }
-      }
+    "interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "dev": true
     },
-    "gulplog": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
       "requires": {
-        "glogg": "^1.0.0"
+        "loose-envify": "^1.0.0"
       }
     },
-    "handle-thing": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
-      "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
-      "dev": true
+    "inversify": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/inversify/-/inversify-5.1.1.tgz",
+      "integrity": "sha512-j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ=="
     },
-    "har-schema": {
+    "invert-kv": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
       "dev": true
     },
-    "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.5.5",
-        "har-schema": "^2.0.0"
-      }
+    "ionic-plugin-keyboard": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ionic-plugin-keyboard/-/ionic-plugin-keyboard-2.2.1.tgz",
+      "integrity": "sha1-8qnhabvptVIkADR8n9bTRn7j+hI="
     },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+    "ionic4-rating": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/ionic4-rating/-/ionic4-rating-1.0.9.tgz",
+      "integrity": "sha512-mv5z6IODHYC5J2caiowFEYYhXDUPzwGpfA0aSku0Fikpzcg418WOwZvfygW5NQ2/mX3jSZjwfxRuzSXcR+EDXw=="
+    },
+    "ionicons": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.2.tgz",
+      "integrity": "sha512-SHVBBtzNVQjY4jtcqKEHkqL5nIQwA/o2MIdU9JtMz8kQAB0NRVJFv5AxwmVbXXKDpxz57SiEjeLp8Uzt7jirpw==",
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "@stencil/core": "^2.5.0"
       }
     },
-    "has-binary2": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
-      "requires": {
-        "isarray": "2.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
-          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
-        }
-      }
-    },
-    "has-cors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
-      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
-    },
-    "has-gulplog": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-      "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
-      "requires": {
-        "sparkles": "^1.0.0"
-      }
+    "ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
     },
-    "has-symbol-support-x": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
-      "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
+    "ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
       "dev": true
     },
-    "has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
-      "dev": true
+    "ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
     },
-    "has-to-string-tag-x": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
-      "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
-      "dev": true,
+    "is-absolute": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
+      "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=",
       "requires": {
-        "has-symbol-support-x": "^1.4.1"
+        "is-relative": "^0.1.0"
       }
     },
-    "has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true,
-      "optional": true
-    },
-    "has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      }
+    "is-absolute-url": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
+      "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
+      "dev": true
     },
-    "has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
             "is-buffer": "^1.1.5"
           }
         }
       }
     },
-    "hash-base": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+    "is-arguments": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
+      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
       "dev": true,
       "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
+        "call-bind": "^1.0.0"
       }
     },
-    "hoek": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
-      "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA=="
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
     },
-    "hosted-git-info": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
-      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
+    "is-bigint": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
+      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==",
       "dev": true
     },
-    "hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-      "dev": true,
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "requires": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
+        "binary-extensions": "^1.0.0"
       }
     },
-    "html-encoding-sniffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
-      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+    "is-boolean-object": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
+      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
       "dev": true,
       "requires": {
-        "whatwg-encoding": "^1.0.1"
+        "call-bind": "^1.0.2"
       }
     },
-    "html-entities": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
-      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
-      "dev": true
-    },
-    "html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
-    "http-cache-semantics": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
-      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
-      "dev": true
+    "is-bzip2": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz",
+      "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w="
     },
-    "http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+    "is-callable": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
       "dev": true
     },
-    "http-errors": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+    "is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "dev": true,
       "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
+        "ci-info": "^2.0.0"
       }
     },
-    "http-parser-js": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
-      "integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
-      "dev": true
-    },
-    "http-proxy": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+    "is-core-module": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
+      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+      "dev": true,
       "requires": {
-        "eventemitter3": "^3.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
+        "has": "^1.0.3"
       }
     },
-    "http-proxy-agent": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
-      "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "requires": {
-        "agent-base": "4",
-        "debug": "3.1.0"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "ms": "2.0.0"
+            "is-buffer": "^1.1.5"
           }
         }
       }
     },
-    "http-proxy-middleware": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
-      "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
-      "dev": true,
-      "requires": {
-        "http-proxy": "^1.16.2",
-        "is-glob": "^4.0.0",
-        "lodash": "^4.17.5",
-        "micromatch": "^3.1.9"
-      }
+    "is-date-object": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
+      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==",
+      "dev": true
     },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+        }
       }
     },
-    "https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
       "dev": true
     },
-    "https-proxy-agent": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.3.tgz",
-      "integrity": "sha512-Ytgnz23gm2DVftnzqRRz2dOXZbGd2uiajSw/95bPp6v53zPRspQjLm/AfBgqbJ2qfeRXWIOMVLpp86+/5yX39Q==",
+    "is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
       "dev": true,
-      "requires": {
-        "agent-base": "^4.3.0",
-        "debug": "^3.1.0"
-      },
-      "dependencies": {
-        "agent-base": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-          "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
-          "dev": true,
-          "requires": {
-            "es6-promisify": "^5.0.0"
-          }
-        },
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
+      "optional": true
     },
-    "human-signals": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-      "dev": true
+    "is-dotfile": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE="
     },
-    "humanize-ms": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
-      "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
-      "dev": true,
+    "is-equal-shallow": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
       "requires": {
-        "ms": "^2.0.0"
+        "is-primitive": "^2.0.0"
       }
     },
-    "iconv-lite": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
-      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
     },
-    "ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
-      "dev": true
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
     },
-    "iferr": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
       "dev": true
     },
-    "ignore": {
-      "version": "3.3.10",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+    "is-function": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz",
+      "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="
+    },
+    "is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
       "dev": true
     },
-    "ignore-walk": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
-      "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
-      "dev": true,
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
       "requires": {
-        "minimatch": "^3.0.4"
+        "is-extglob": "^2.1.1"
       }
     },
-    "image-size": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
-      "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
-      "dev": true,
-      "optional": true
+    "is-gzip": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
+      "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM="
     },
-    "import-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
-      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
-      "dev": true,
-      "requires": {
-        "import-from": "^2.1.0"
-      }
+    "is-natural-number": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz",
+      "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec="
     },
-    "import-from": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
-      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
-      "dev": true,
+    "is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "dev": true
+    },
+    "is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "requires": {
-        "resolve-from": "^3.0.0"
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
       }
     },
-    "import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+    "is-number-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
+      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==",
+      "dev": true
+    },
+    "is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
+    },
+    "is-object": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
+      "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
+      "dev": true
+    },
+    "is-path-cwd": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+      "dev": true
+    },
+    "is-path-in-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
       "dev": true,
       "requires": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
+        "is-path-inside": "^2.1.0"
       },
       "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
-          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+        "is-path-inside": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+          "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
           "dev": true,
           "requires": {
-            "find-up": "^3.0.0"
+            "path-is-inside": "^1.0.2"
           }
         }
       }
     },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
       "dev": true
     },
-    "in-publish": {
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-posix-bracket": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q="
+    },
+    "is-primitive": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
-      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
-      "dev": true,
-      "optional": true
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
     },
-    "indent-string": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+    "is-redirect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ="
+    },
+    "is-regex": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
+      "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "repeating": "^2.0.0"
+        "call-bind": "^1.0.2",
+        "has-symbols": "^1.0.2"
       }
     },
-    "indexof": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
+    "is-relative": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
+      "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI="
     },
-    "inflight": {
+    "is-retry-allowed": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+    },
+    "is-string": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
+      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==",
+      "dev": true
+    },
+    "is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
       "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "has-symbols": "^1.0.2"
       }
     },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    "is-tar": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz",
+      "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0="
     },
-    "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
     },
-    "inquirer": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz",
-      "integrity": "sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==",
+    "is-url": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
+      "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+    },
+    "is-valid-glob": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
+      "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4="
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
+    },
+    "is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "dev": true
+    },
+    "is-zip": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz",
+      "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isbinaryfile": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
+      "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
+      "requires": {
+        "buffer-alloc": "^1.2.0"
+      }
+    },
+    "isemail": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/isemail/-/isemail-3.2.0.tgz",
+      "integrity": "sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg==",
+      "requires": {
+        "punycode": "2.x.x"
+      }
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "istanbul-lib-coverage": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
+      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
+      "dev": true
+    },
+    "istanbul-lib-instrument": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
       "dev": true,
       "requires": {
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.0",
-        "cli-cursor": "^2.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^3.0.0",
-        "figures": "^2.0.0",
-        "lodash": "^4.17.10",
-        "mute-stream": "0.0.7",
-        "run-async": "^2.2.0",
-        "rxjs": "^6.1.0",
-        "string-width": "^2.1.0",
-        "strip-ansi": "^5.0.0",
-        "through": "^2.3.6"
+        "@babel/core": "^7.7.5",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+        }
+      }
+    },
+    "istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "dev": true,
+      "requires": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^3.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.1.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "4.1.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-              "dev": true
-            }
+            "has-flag": "^4.0.0"
           }
         }
       }
     },
-    "internal-ip": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz",
-      "integrity": "sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==",
-      "dev": true,
-      "requires": {
-        "default-gateway": "^2.6.0",
-        "ipaddr.js": "^1.5.2"
-      }
-    },
-    "interpret": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
-      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
-      "dev": true
-    },
-    "into-stream": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
-      "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
+    "istanbul-lib-source-maps": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
+      "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
       "dev": true,
       "requires": {
-        "from2": "^2.1.1",
-        "p-is-promise": "^1.1.0"
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
       },
       "dependencies": {
-        "p-is-promise": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
-          "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
     },
-    "invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+    "istanbul-reports": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
+      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
       "dev": true,
       "requires": {
-        "loose-envify": "^1.0.0"
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
       }
     },
-    "inversify": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/inversify/-/inversify-5.0.1.tgz",
-      "integrity": "sha512-Ieh06s48WnEYGcqHepdsJUIJUXpwH5o5vodAX+DK2JA/gjy4EbEcQZxw+uFfzysmKjiLXGYwNG3qDZsKVMcINQ=="
-    },
-    "invert-kv": {
+    "isurl": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true
-    },
-    "ionic-plugin-keyboard": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ionic-plugin-keyboard/-/ionic-plugin-keyboard-2.2.1.tgz",
-      "integrity": "sha1-8qnhabvptVIkADR8n9bTRn7j+hI="
-    },
-    "ionic4-rating": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/ionic4-rating/-/ionic4-rating-1.0.9.tgz",
-      "integrity": "sha512-mv5z6IODHYC5J2caiowFEYYhXDUPzwGpfA0aSku0Fikpzcg418WOwZvfygW5NQ2/mX3jSZjwfxRuzSXcR+EDXw=="
-    },
-    "ionicons": {
-      "version": "4.6.3",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-4.6.3.tgz",
-      "integrity": "sha512-cgP+VIr2cTJpMfFyVHTerq6n2jeoiGboVoe3GlaAo5zoSBDAEXORwUZhv6m+lCyxlsHCS3nqPUE+MKyZU71t8Q=="
-    },
-    "ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
-    },
-    "ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
-      "dev": true
-    },
-    "ipaddr.js": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
-      "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="
-    },
-    "is-absolute": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz",
-      "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=",
+      "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
+      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
+      "dev": true,
       "requires": {
-        "is-relative": "^0.1.0"
+        "has-to-string-tag-x": "^1.2.0",
+        "is-object": "^1.0.1"
       }
     },
-    "is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+    "jake": {
+      "version": "10.8.2",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz",
+      "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==",
       "requires": {
-        "kind-of": "^3.0.2"
+        "async": "0.9.x",
+        "chalk": "^2.4.2",
+        "filelist": "^1.0.1",
+        "minimatch": "^3.0.4"
       },
       "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "requires": {
-            "is-buffer": "^1.1.5"
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "requires": {
+            "has-flag": "^3.0.0"
           }
         }
       }
     },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
-    },
-    "is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "requires": {
-        "binary-extensions": "^1.0.0"
-      }
-    },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-    },
-    "is-bzip2": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz",
-      "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w="
-    },
-    "is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+    "jest": {
+      "version": "25.5.4",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-25.5.4.tgz",
+      "integrity": "sha512-hHFJROBTqZahnO+X+PMtT6G2/ztqAZJveGqz//FnWWHurizkD05PQGzRZOhF3XP6z7SJmL+5tCfW8qV06JypwQ==",
       "dev": true,
       "requires": {
-        "ci-info": "^2.0.0"
-      }
-    },
-    "is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "requires": {
-        "kind-of": "^3.0.2"
+        "@jest/core": "^25.5.4",
+        "import-local": "^3.0.2",
+        "jest-cli": "^25.5.4"
       },
       "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "cliui": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^6.2.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "import-local": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
+          "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+          "dev": true,
+          "requires": {
+            "pkg-dir": "^4.2.0",
+            "resolve-cwd": "^3.0.0"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "jest-cli": {
+          "version": "25.5.4",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-25.5.4.tgz",
+          "integrity": "sha512-rG8uJkIiOUpnREh1768/N3n27Cm+xPFkSNFO91tgg+8o2rXeVLStz+vkXkGr4UtzH6t1SNbjwoiswd7p4AhHTw==",
+          "dev": true,
+          "requires": {
+            "@jest/core": "^25.5.4",
+            "@jest/test-result": "^25.5.0",
+            "@jest/types": "^25.5.0",
+            "chalk": "^3.0.0",
+            "exit": "^0.1.2",
+            "graceful-fs": "^4.2.4",
+            "import-local": "^3.0.2",
+            "is-ci": "^2.0.0",
+            "jest-config": "^25.5.4",
+            "jest-util": "^25.5.0",
+            "jest-validate": "^25.5.0",
+            "prompts": "^2.0.1",
+            "realpath-native": "^2.0.0",
+            "yargs": "^15.3.1"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "resolve-cwd": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+          "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+          "dev": true,
+          "requires": {
+            "resolve-from": "^5.0.0"
+          }
+        },
+        "resolve-from": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "yargs": {
+          "version": "15.4.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+          "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+          "dev": true,
+          "requires": {
+            "cliui": "^6.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^4.1.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^4.2.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^18.1.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "18.1.3",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
           }
         }
       }
     },
-    "is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+    "jest-changed-files": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-25.5.0.tgz",
+      "integrity": "sha512-EOw9QEqapsDT7mKF162m8HFzRPbmP8qJQny6ldVOdOVBz3ACgPm/1nAn5fPQ/NDaYhX/AHkrGwwkCncpAVSXcw==",
+      "dev": true,
       "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "@jest/types": "^25.5.0",
+        "execa": "^3.2.0",
+        "throat": "^5.0.0"
       },
       "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
-        }
-      }
-    },
-    "is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
-      "dev": true
-    },
-    "is-dotfile": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE="
-    },
-    "is-equal-shallow": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-      "requires": {
-        "is-primitive": "^2.0.0"
+        "execa": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
+          "integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^7.0.0",
+            "get-stream": "^5.0.0",
+            "human-signals": "^1.1.1",
+            "is-stream": "^2.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^4.0.0",
+            "onetime": "^5.1.0",
+            "p-finally": "^2.0.0",
+            "signal-exit": "^3.0.2",
+            "strip-final-newline": "^2.0.0"
+          }
+        },
+        "is-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+          "dev": true
+        },
+        "merge-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+          "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+          "dev": true
+        },
+        "onetime": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+          "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+          "dev": true,
+          "requires": {
+            "mimic-fn": "^2.1.0"
+          }
+        },
+        "p-finally": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
+          "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
+          "dev": true
+        }
       }
     },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
-    },
-    "is-finite": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+    "jest-config": {
+      "version": "25.5.4",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.5.4.tgz",
+      "integrity": "sha512-SZwR91SwcdK6bz7Gco8qL7YY2sx8tFJYzvg216DLihTWf+LKY/DoJXpM9nTzYakSyfblbqeU48p/p7Jzy05Atg==",
       "dev": true,
       "requires": {
-        "number-is-nan": "^1.0.0"
+        "@babel/core": "^7.1.0",
+        "@jest/test-sequencer": "^25.5.4",
+        "@jest/types": "^25.5.0",
+        "babel-jest": "^25.5.1",
+        "chalk": "^3.0.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.4",
+        "jest-environment-jsdom": "^25.5.0",
+        "jest-environment-node": "^25.5.0",
+        "jest-get-type": "^25.2.6",
+        "jest-jasmine2": "^25.5.4",
+        "jest-regex-util": "^25.2.6",
+        "jest-resolve": "^25.5.1",
+        "jest-util": "^25.5.0",
+        "jest-validate": "^25.5.0",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^25.5.0",
+        "realpath-native": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
       }
     },
-    "is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+    "jest-diff": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz",
+      "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==",
       "dev": true,
       "requires": {
-        "number-is-nan": "^1.0.0"
-      }
-    },
-    "is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-gzip": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
-      "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM="
-    },
-    "is-natural-number": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
-      "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=",
-      "dev": true
-    },
-    "is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "requires": {
-        "kind-of": "^3.0.2"
+        "chalk": "^3.0.0",
+        "diff-sequences": "^25.2.6",
+        "jest-get-type": "^25.2.6",
+        "pretty-format": "^25.5.0"
       },
       "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
           }
         }
       }
     },
-    "is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
-    },
-    "is-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
-      "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
-      "dev": true
-    },
-    "is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-      "dev": true
-    },
-    "is-path-in-cwd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+    "jest-docblock": {
+      "version": "25.3.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-25.3.0.tgz",
+      "integrity": "sha512-aktF0kCar8+zxRHxQZwxMy70stc9R1mOmrLsT5VO3pIT0uzGRSDAXxSlz4NqQWpuLjPpuMhPRl7H+5FRsvIQAg==",
       "dev": true,
       "requires": {
-        "is-path-inside": "^1.0.0"
+        "detect-newline": "^3.0.0"
       }
     },
-    "is-path-inside": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+    "jest-each": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.5.0.tgz",
+      "integrity": "sha512-QBogUxna3D8vtiItvn54xXde7+vuzqRrEeaw8r1s+1TG9eZLVJE5ZkKoSUlqFwRjnlaA4hyKGiu9OlkFIuKnjA==",
       "dev": true,
       "requires": {
-        "path-is-inside": "^1.0.1"
-      }
-    },
-    "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true
-    },
-    "is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "is-posix-bracket": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q="
-    },
-    "is-primitive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
-    },
-    "is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-      "dev": true
-    },
-    "is-redirect": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ="
-    },
-    "is-relative": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz",
-      "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI="
-    },
-    "is-retry-allowed": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
-      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-    },
-    "is-tar": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz",
-      "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0="
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
-    },
-    "is-url": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
-      "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
-    },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
-    },
-    "is-valid-glob": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
-      "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4="
-    },
-    "is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
-    },
-    "is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-      "dev": true
-    },
-    "is-zip": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz",
-      "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU="
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
-    "isbinaryfile": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
-      "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
-      "requires": {
-        "buffer-alloc": "^1.2.0"
-      }
-    },
-    "isemail": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/isemail/-/isemail-3.2.0.tgz",
-      "integrity": "sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg==",
-      "requires": {
-        "punycode": "2.x.x"
-      }
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-    },
-    "isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
-    "istanbul-instrumenter-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
-      "integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
-      "dev": true,
-      "requires": {
-        "convert-source-map": "^1.5.0",
-        "istanbul-lib-instrument": "^1.7.3",
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^0.3.0"
+        "@jest/types": "^25.5.0",
+        "chalk": "^3.0.0",
+        "jest-get-type": "^25.2.6",
+        "jest-util": "^25.5.0",
+        "pretty-format": "^25.5.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "5.5.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "co": "^4.6.0",
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
+            "color-convert": "^2.0.1"
           }
         },
-        "fast-deep-equal": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "json-schema-traverse": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "schema-utils": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
-          "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "ajv": "^5.0.0"
+            "has-flag": "^4.0.0"
           }
         }
       }
     },
-    "istanbul-lib-coverage": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
-      "integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==",
-      "dev": true
-    },
-    "istanbul-lib-instrument": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
-      "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
+    "jest-environment-jsdom": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.5.0.tgz",
+      "integrity": "sha512-7Jr02ydaq4jaWMZLY+Skn8wL5nVIYpWvmeatOHL3tOcV3Zw8sjnPpx+ZdeBfc457p8jCR9J6YCc+Lga0oIy62A==",
       "dev": true,
       "requires": {
-        "babel-generator": "^6.18.0",
-        "babel-template": "^6.16.0",
-        "babel-traverse": "^6.18.0",
-        "babel-types": "^6.18.0",
-        "babylon": "^6.18.0",
-        "istanbul-lib-coverage": "^1.2.1",
-        "semver": "^5.3.0"
+        "@jest/environment": "^25.5.0",
+        "@jest/fake-timers": "^25.5.0",
+        "@jest/types": "^25.5.0",
+        "jest-mock": "^25.5.0",
+        "jest-util": "^25.5.0",
+        "jsdom": "^15.2.1"
       }
     },
-    "istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+    "jest-environment-node": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.5.0.tgz",
+      "integrity": "sha512-iuxK6rQR2En9EID+2k+IBs5fCFd919gVVK5BeND82fYeLWPqvRcFNPKu9+gxTwfB5XwBGBvZ0HFQa+cHtIoslA==",
       "dev": true,
       "requires": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
-        "supports-color": "^7.1.0"
+        "@jest/environment": "^25.5.0",
+        "@jest/fake-timers": "^25.5.0",
+        "@jest/types": "^25.5.0",
+        "jest-mock": "^25.5.0",
+        "jest-util": "^25.5.0",
+        "semver": "^6.3.0"
       },
       "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "istanbul-lib-coverage": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-          "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
-          "dev": true
-        },
-        "make-dir": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-          "dev": true,
-          "requires": {
-            "semver": "^6.0.0"
-          }
-        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
-    "istanbul-lib-source-maps": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
-      "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
+    "jest-get-type": {
+      "version": "25.2.6",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
+      "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
+      "dev": true
+    },
+    "jest-haste-map": {
+      "version": "25.5.1",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.5.1.tgz",
+      "integrity": "sha512-dddgh9UZjV7SCDQUrQ+5t9yy8iEgKc1AKqZR9YDww8xsVOtzPQSMVLDChc21+g29oTRexb9/B0bIlZL+sWmvAQ==",
       "dev": true,
       "requires": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
+        "@jest/types": "^25.5.0",
+        "@types/graceful-fs": "^4.1.2",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "fsevents": "^2.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-serializer": "^25.5.0",
+        "jest-util": "^25.5.0",
+        "jest-worker": "^25.5.0",
+        "micromatch": "^4.0.2",
+        "sane": "^4.0.3",
+        "walker": "^1.0.7",
+        "which": "^2.0.2"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+        "anymatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+          "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
           }
         },
-        "istanbul-lib-coverage": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-          "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "istanbul-reports": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
-      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
-      "dev": true,
-      "requires": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      }
-    },
-    "isurl": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
-      "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
-      "dev": true,
-      "requires": {
-        "has-to-string-tag-x": "^1.2.0",
-        "is-object": "^1.0.1"
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "jest-worker": {
+          "version": "25.5.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz",
+          "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==",
+          "dev": true,
+          "requires": {
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
+          }
+        },
+        "merge-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+          "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
       }
     },
-    "jest": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-25.4.0.tgz",
-      "integrity": "sha512-XWipOheGB4wai5JfCYXd6vwsWNwM/dirjRoZgAa7H2wd8ODWbli2AiKjqG8AYhyx+8+5FBEdpO92VhGlBydzbw==",
+    "jest-jasmine2": {
+      "version": "25.5.4",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.5.4.tgz",
+      "integrity": "sha512-9acbWEfbmS8UpdcfqnDO+uBUgKa/9hcRh983IHdM+pKmJPL77G0sWAAK0V0kr5LK3a8cSBfkFSoncXwQlRZfkQ==",
       "dev": true,
       "requires": {
-        "@jest/core": "^25.4.0",
-        "import-local": "^3.0.2",
-        "jest-cli": "^25.4.0"
+        "@babel/traverse": "^7.1.0",
+        "@jest/environment": "^25.5.0",
+        "@jest/source-map": "^25.5.0",
+        "@jest/test-result": "^25.5.0",
+        "@jest/types": "^25.5.0",
+        "chalk": "^3.0.0",
+        "co": "^4.6.0",
+        "expect": "^25.5.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^25.5.0",
+        "jest-matcher-utils": "^25.5.0",
+        "jest-message-util": "^25.5.0",
+        "jest-runtime": "^25.5.4",
+        "jest-snapshot": "^25.5.1",
+        "jest-util": "^25.5.0",
+        "pretty-format": "^25.5.0",
+        "throat": "^5.0.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
         "chalk": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
@@ -11986,16 +11463,11 @@
             "supports-color": "^7.1.0"
           }
         },
-        "cliui": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.0",
-            "wrap-ansi": "^6.2.0"
-          }
+        "co": {
+          "version": "4.6.0",
+          "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+          "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+          "dev": true
         },
         "color-convert": {
           "version": "2.0.1",
@@ -12012,385 +11484,138 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "get-caller-file": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-          "dev": true
-        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "import-local": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
-          "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
-          "dev": true,
-          "requires": {
-            "pkg-dir": "^4.2.0",
-            "resolve-cwd": "^3.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "jest-cli": {
-          "version": "25.4.0",
-          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-25.4.0.tgz",
-          "integrity": "sha512-usyrj1lzCJZMRN1r3QEdnn8e6E6yCx/QN7+B1sLoA68V7f3WlsxSSQfy0+BAwRiF4Hz2eHauf11GZG3PIfWTXQ==",
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "@jest/core": "^25.4.0",
-            "@jest/test-result": "^25.4.0",
-            "@jest/types": "^25.4.0",
-            "chalk": "^3.0.0",
-            "exit": "^0.1.2",
-            "import-local": "^3.0.2",
-            "is-ci": "^2.0.0",
-            "jest-config": "^25.4.0",
-            "jest-util": "^25.4.0",
-            "jest-validate": "^25.4.0",
-            "prompts": "^2.0.1",
-            "realpath-native": "^2.0.0",
-            "yargs": "^15.3.1"
+            "has-flag": "^4.0.0"
           }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+        }
+      }
+    },
+    "jest-leak-detector": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.5.0.tgz",
+      "integrity": "sha512-rV7JdLsanS8OkdDpZtgBf61L5xZ4NnYLBq72r6ldxahJWWczZjXawRsoHyXzibM5ed7C2QRjpp6ypgwGdKyoVA==",
+      "dev": true,
+      "requires": {
+        "jest-get-type": "^25.2.6",
+        "pretty-format": "^25.5.0"
+      }
+    },
+    "jest-matcher-utils": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz",
+      "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^3.0.0",
+        "jest-diff": "^25.5.0",
+        "jest-get-type": "^25.2.6",
+        "pretty-format": "^25.5.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "p-locate": "^4.1.0"
+            "color-convert": "^2.0.1"
           }
         },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.2.0"
+            "color-name": "~1.1.4"
           }
         },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "path-exists": {
+        "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "pkg-dir": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "find-up": "^4.0.0"
+            "has-flag": "^4.0.0"
           }
-        },
-        "require-main-filename": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-          "dev": true
-        },
-        "resolve-cwd": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-          "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+        }
+      }
+    },
+    "jest-message-util": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz",
+      "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@jest/types": "^25.5.0",
+        "@types/stack-utils": "^1.0.1",
+        "chalk": "^3.0.0",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^1.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "resolve-from": "^5.0.0"
+            "color-convert": "^2.0.1"
           }
         },
-        "resolve-from": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
           "dev": true,
           "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
+            "fill-range": "^7.0.1"
           }
         },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "which-module": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-          "dev": true
-        },
-        "wrap-ansi": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "yargs": {
-          "version": "15.3.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
-          "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
-          "dev": true,
-          "requires": {
-            "cliui": "^6.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^4.1.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^4.2.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^18.1.1"
-          }
-        },
-        "yargs-parser": {
-          "version": "18.1.3",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
-        }
-      }
-    },
-    "jest-changed-files": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-25.4.0.tgz",
-      "integrity": "sha512-VR/rfJsEs4BVMkwOTuStRyS630fidFVekdw/lBaBQjx9KK3VZFOZ2c0fsom2fRp8pMCrCTP6LGna00o/DXGlqA==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^25.4.0",
-        "execa": "^3.2.0",
-        "throat": "^5.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "7.0.2",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz",
-          "integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==",
-          "dev": true,
-          "requires": {
-            "path-key": "^3.1.0",
-            "shebang-command": "^2.0.0",
-            "which": "^2.0.1"
-          }
-        },
-        "execa": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz",
-          "integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^7.0.0",
-            "get-stream": "^5.0.0",
-            "human-signals": "^1.1.1",
-            "is-stream": "^2.0.0",
-            "merge-stream": "^2.0.0",
-            "npm-run-path": "^4.0.0",
-            "onetime": "^5.1.0",
-            "p-finally": "^2.0.0",
-            "signal-exit": "^3.0.2",
-            "strip-final-newline": "^2.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "is-stream": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-          "dev": true
-        },
-        "npm-run-path": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-          "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-          "dev": true,
-          "requires": {
-            "path-key": "^3.0.0"
-          }
-        },
-        "onetime": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-          "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
-          "dev": true,
-          "requires": {
-            "mimic-fn": "^2.1.0"
-          }
-        },
-        "p-finally": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
-          "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
-          "dev": true
-        },
-        "path-key": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-          "dev": true
-        },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        },
-        "shebang-command": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-          "dev": true,
-          "requires": {
-            "shebang-regex": "^3.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-          "dev": true
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
-    "jest-config": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.4.0.tgz",
-      "integrity": "sha512-egT9aKYxMyMSQV1aqTgam0SkI5/I2P9qrKexN5r2uuM2+68ypnc+zPGmfUxK7p1UhE7dYH9SLBS7yb+TtmT1AA==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^25.4.0",
-        "@jest/types": "^25.4.0",
-        "babel-jest": "^25.4.0",
-        "chalk": "^3.0.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.1",
-        "jest-environment-jsdom": "^25.4.0",
-        "jest-environment-node": "^25.4.0",
-        "jest-get-type": "^25.2.6",
-        "jest-jasmine2": "^25.4.0",
-        "jest-regex-util": "^25.2.6",
-        "jest-resolve": "^25.4.0",
-        "jest-util": "^25.4.0",
-        "jest-validate": "^25.4.0",
-        "micromatch": "^4.0.2",
-        "pretty-format": "^25.4.0",
-        "realpath-native": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
         "color-convert": {
@@ -12430,19 +11655,19 @@
           "dev": true
         },
         "micromatch": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "version": "4.0.4",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
           "dev": true,
           "requires": {
             "braces": "^3.0.1",
-            "picomatch": "^2.0.5"
+            "picomatch": "^2.2.3"
           }
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -12459,25 +11684,50 @@
         }
       }
     },
-    "jest-diff": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.4.0.tgz",
-      "integrity": "sha512-kklLbJVXW0y8UKOWOdYhI6TH5MG6QAxrWiBMgQaPIuhj3dNFGirKCd+/xfplBXICQ7fI+3QcqHm9p9lWu1N6ug==",
+    "jest-mock": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.5.0.tgz",
+      "integrity": "sha512-eXWuTV8mKzp/ovHc5+3USJMYsTBhyQ+5A1Mak35dey/RG8GlM4YWVylZuGgVXinaW6tpvk/RSecmF37FKUlpXA==",
+      "dev": true,
+      "requires": {
+        "@jest/types": "^25.5.0"
+      }
+    },
+    "jest-pnp-resolver": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
+      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+      "dev": true
+    },
+    "jest-regex-util": {
+      "version": "25.2.6",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz",
+      "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==",
+      "dev": true
+    },
+    "jest-resolve": {
+      "version": "25.5.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.5.1.tgz",
+      "integrity": "sha512-Hc09hYch5aWdtejsUZhA+vSzcotf7fajSlPA6EZPE1RmPBAD39XtJhvHWFStid58iit4IPDLI/Da4cwdDmAHiQ==",
       "dev": true,
       "requires": {
+        "@jest/types": "^25.5.0",
+        "browser-resolve": "^1.11.3",
         "chalk": "^3.0.0",
-        "diff-sequences": "^25.2.6",
-        "jest-get-type": "^25.2.6",
-        "pretty-format": "^25.4.0"
+        "graceful-fs": "^4.2.4",
+        "jest-pnp-resolver": "^1.2.1",
+        "read-pkg-up": "^7.0.1",
+        "realpath-native": "^2.0.0",
+        "resolve": "^1.17.0",
+        "slash": "^3.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -12513,9 +11763,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -12523,35 +11773,50 @@
         }
       }
     },
-    "jest-docblock": {
-      "version": "25.3.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-25.3.0.tgz",
-      "integrity": "sha512-aktF0kCar8+zxRHxQZwxMy70stc9R1mOmrLsT5VO3pIT0uzGRSDAXxSlz4NqQWpuLjPpuMhPRl7H+5FRsvIQAg==",
+    "jest-resolve-dependencies": {
+      "version": "25.5.4",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-25.5.4.tgz",
+      "integrity": "sha512-yFmbPd+DAQjJQg88HveObcGBA32nqNZ02fjYmtL16t1xw9bAttSn5UGRRhzMHIQbsep7znWvAvnD4kDqOFM0Uw==",
       "dev": true,
       "requires": {
-        "detect-newline": "^3.0.0"
+        "@jest/types": "^25.5.0",
+        "jest-regex-util": "^25.2.6",
+        "jest-snapshot": "^25.5.1"
       }
     },
-    "jest-each": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.4.0.tgz",
-      "integrity": "sha512-lwRIJ8/vQU/6vq3nnSSUw1Y3nz5tkYSFIywGCZpUBd6WcRgpn8NmJoQICojbpZmsJOJNHm0BKdyuJ6Xdx+eDQQ==",
+    "jest-runner": {
+      "version": "25.5.4",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.5.4.tgz",
+      "integrity": "sha512-V/2R7fKZo6blP8E9BL9vJ8aTU4TH2beuqGNxHbxi6t14XzTb+x90B3FRgdvuHm41GY8ch4xxvf0ATH4hdpjTqg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.4.0",
+        "@jest/console": "^25.5.0",
+        "@jest/environment": "^25.5.0",
+        "@jest/test-result": "^25.5.0",
+        "@jest/types": "^25.5.0",
         "chalk": "^3.0.0",
-        "jest-get-type": "^25.2.6",
-        "jest-util": "^25.4.0",
-        "pretty-format": "^25.4.0"
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^25.5.4",
+        "jest-docblock": "^25.3.0",
+        "jest-haste-map": "^25.5.1",
+        "jest-jasmine2": "^25.5.4",
+        "jest-leak-detector": "^25.5.0",
+        "jest-message-util": "^25.5.0",
+        "jest-resolve": "^25.5.1",
+        "jest-runtime": "^25.5.4",
+        "jest-util": "^25.5.0",
+        "jest-worker": "^25.5.0",
+        "source-map-support": "^0.5.6",
+        "throat": "^5.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -12586,10 +11851,26 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "jest-worker": {
+          "version": "25.5.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz",
+          "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==",
+          "dev": true,
+          "requires": {
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
+          }
+        },
+        "merge-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+          "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+          "dev": true
+        },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -12597,183 +11878,258 @@
         }
       }
     },
-    "jest-environment-jsdom": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.4.0.tgz",
-      "integrity": "sha512-KTitVGMDrn2+pt7aZ8/yUTuS333w3pWt1Mf88vMntw7ZSBNDkRS6/4XLbFpWXYfWfp1FjcjQTOKzbK20oIehWQ==",
-      "dev": true,
-      "requires": {
-        "@jest/environment": "^25.4.0",
-        "@jest/fake-timers": "^25.4.0",
-        "@jest/types": "^25.4.0",
-        "jest-mock": "^25.4.0",
-        "jest-util": "^25.4.0",
-        "jsdom": "^15.2.1"
-      }
-    },
-    "jest-environment-node": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.4.0.tgz",
-      "integrity": "sha512-wryZ18vsxEAKFH7Z74zi/y/SyI1j6UkVZ6QsllBuT/bWlahNfQjLNwFsgh/5u7O957dYFoXj4yfma4n4X6kU9A==",
-      "dev": true,
-      "requires": {
-        "@jest/environment": "^25.4.0",
-        "@jest/fake-timers": "^25.4.0",
-        "@jest/types": "^25.4.0",
-        "jest-mock": "^25.4.0",
-        "jest-util": "^25.4.0",
-        "semver": "^6.3.0"
+    "jest-runtime": {
+      "version": "25.5.4",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.5.4.tgz",
+      "integrity": "sha512-RWTt8LeWh3GvjYtASH2eezkc8AehVoWKK20udV6n3/gC87wlTbE1kIA+opCvNWyyPeBs6ptYsc6nyHUb1GlUVQ==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^25.5.0",
+        "@jest/environment": "^25.5.0",
+        "@jest/globals": "^25.5.2",
+        "@jest/source-map": "^25.5.0",
+        "@jest/test-result": "^25.5.0",
+        "@jest/transform": "^25.5.1",
+        "@jest/types": "^25.5.0",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^3.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^25.5.4",
+        "jest-haste-map": "^25.5.1",
+        "jest-message-util": "^25.5.0",
+        "jest-mock": "^25.5.0",
+        "jest-regex-util": "^25.2.6",
+        "jest-resolve": "^25.5.1",
+        "jest-snapshot": "^25.5.1",
+        "jest-util": "^25.5.0",
+        "jest-validate": "^25.5.0",
+        "realpath-native": "^2.0.0",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0",
+        "yargs": "^15.3.1"
       },
       "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
-        }
-      }
-    },
-    "jest-get-type": {
-      "version": "25.2.6",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz",
-      "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==",
-      "dev": true
-    },
-    "jest-haste-map": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.4.0.tgz",
-      "integrity": "sha512-5EoCe1gXfGC7jmXbKzqxESrgRcaO3SzWXGCnvp9BcT0CFMyrB1Q6LIsjl9RmvmJGQgW297TCfrdgiy574Rl9HQ==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^25.4.0",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "fsevents": "^2.1.2",
-        "graceful-fs": "^4.2.3",
-        "jest-serializer": "^25.2.6",
-        "jest-util": "^25.4.0",
-        "jest-worker": "^25.4.0",
-        "micromatch": "^4.0.2",
-        "sane": "^4.0.3",
-        "walker": "^1.0.7",
-        "which": "^2.0.2"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "normalize-path": "^3.0.0",
-            "picomatch": "^2.0.4"
+            "color-convert": "^2.0.1"
           }
         },
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
           "dev": true,
           "requires": {
-            "fill-range": "^7.0.1"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+        "cliui": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
           "dev": true,
           "requires": {
-            "to-regex-range": "^5.0.1"
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^6.2.0"
           }
         },
-        "fsevents": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
-          "optional": true
+          "requires": {
+            "color-name": "~1.1.4"
+          }
         },
-        "graceful-fs": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
           "dev": true
         },
-        "micromatch": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
           "dev": true,
           "requires": {
-            "braces": "^3.0.1",
-            "picomatch": "^2.0.5"
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
           }
         },
-        "normalize-path": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
           "dev": true
         },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
           "dev": true,
           "requires": {
-            "is-number": "^7.0.0"
+            "p-locate": "^4.1.0"
           }
         },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
           "dev": true,
           "requires": {
-            "isexe": "^2.0.0"
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+          "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "yargs": {
+          "version": "15.4.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+          "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+          "dev": true,
+          "requires": {
+            "cliui": "^6.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^4.1.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^4.2.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^18.1.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "18.1.3",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
           }
         }
       }
     },
-    "jest-jasmine2": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.4.0.tgz",
-      "integrity": "sha512-QccxnozujVKYNEhMQ1vREiz859fPN/XklOzfQjm2j9IGytAkUbSwjFRBtQbHaNZ88cItMpw02JnHGsIdfdpwxQ==",
+    "jest-serializer": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.5.0.tgz",
+      "integrity": "sha512-LxD8fY1lByomEPflwur9o4e2a5twSQ7TaVNLlFUuToIdoJuBt8tzHfCsZ42Ok6LkKXWzFWf3AGmheuLAA7LcCA==",
       "dev": true,
       "requires": {
-        "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^25.4.0",
-        "@jest/source-map": "^25.2.6",
-        "@jest/test-result": "^25.4.0",
-        "@jest/types": "^25.4.0",
+        "graceful-fs": "^4.2.4"
+      }
+    },
+    "jest-snapshot": {
+      "version": "25.5.1",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.5.1.tgz",
+      "integrity": "sha512-C02JE1TUe64p2v1auUJ2ze5vcuv32tkv9PyhEb318e8XOKF7MOyXdJ7kdjbvrp3ChPLU2usI7Rjxs97Dj5P0uQ==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0",
+        "@jest/types": "^25.5.0",
+        "@types/prettier": "^1.19.0",
         "chalk": "^3.0.0",
-        "co": "^4.6.0",
-        "expect": "^25.4.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^25.4.0",
-        "jest-matcher-utils": "^25.4.0",
-        "jest-message-util": "^25.4.0",
-        "jest-runtime": "^25.4.0",
-        "jest-snapshot": "^25.4.0",
-        "jest-util": "^25.4.0",
-        "pretty-format": "^25.4.0",
-        "throat": "^5.0.0"
+        "expect": "^25.5.0",
+        "graceful-fs": "^4.2.4",
+        "jest-diff": "^25.5.0",
+        "jest-get-type": "^25.2.6",
+        "jest-matcher-utils": "^25.5.0",
+        "jest-message-util": "^25.5.0",
+        "jest-resolve": "^25.5.1",
+        "make-dir": "^3.0.0",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^25.5.0",
+        "semver": "^6.3.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -12808,10 +12164,16 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -12819,35 +12181,25 @@
         }
       }
     },
-    "jest-leak-detector": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.4.0.tgz",
-      "integrity": "sha512-7Y6Bqfv2xWsB+7w44dvZuLs5SQ//fzhETgOGG7Gq3TTGFdYvAgXGwV8z159RFZ6fXiCPm/szQ90CyfVos9JIFQ==",
-      "dev": true,
-      "requires": {
-        "jest-get-type": "^25.2.6",
-        "pretty-format": "^25.4.0"
-      }
-    },
-    "jest-matcher-utils": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.4.0.tgz",
-      "integrity": "sha512-yPMdtj7YDgXhnGbc66bowk8AkQ0YwClbbwk3Kzhn5GVDrciiCr27U4NJRbrqXbTdtxjImONITg2LiRIw650k5A==",
+    "jest-util": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz",
+      "integrity": "sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA==",
       "dev": true,
       "requires": {
+        "@jest/types": "^25.5.0",
         "chalk": "^3.0.0",
-        "jest-diff": "^25.4.0",
-        "jest-get-type": "^25.2.6",
-        "pretty-format": "^25.4.0"
+        "graceful-fs": "^4.2.4",
+        "is-ci": "^2.0.0",
+        "make-dir": "^3.0.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -12883,9 +12235,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -12893,40 +12245,29 @@
         }
       }
     },
-    "jest-message-util": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.4.0.tgz",
-      "integrity": "sha512-LYY9hRcVGgMeMwmdfh9tTjeux1OjZHMusq/E5f3tJN+dAoVVkJtq5ZUEPIcB7bpxDUt2zjUsrwg0EGgPQ+OhXQ==",
+    "jest-validate": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.5.0.tgz",
+      "integrity": "sha512-okUFKqhZIpo3jDdtUXUZ2LxGUZJIlfdYBvZb1aczzxrlyMlqdnnws9MOxezoLGhSaFc2XYaHNReNQfj5zPIWyQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@jest/types": "^25.4.0",
-        "@types/stack-utils": "^1.0.1",
+        "@jest/types": "^25.5.0",
+        "camelcase": "^5.3.1",
         "chalk": "^3.0.0",
-        "micromatch": "^4.0.2",
-        "slash": "^3.0.0",
-        "stack-utils": "^1.0.1"
+        "jest-get-type": "^25.2.6",
+        "leven": "^3.1.0",
+        "pretty-format": "^25.5.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
         "chalk": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
@@ -12952,107 +12293,43 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-          "dev": true,
-          "requires": {
-            "braces": "^3.0.1",
-            "picomatch": "^2.0.5"
-          }
-        },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
         }
       }
     },
-    "jest-mock": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.4.0.tgz",
-      "integrity": "sha512-MdazSfcYAUjJjuVTTnusLPzE0pE4VXpOUzWdj8sbM+q6abUjm3bATVPXFqTXrxSieR8ocpvQ9v/QaQCftioQFg==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^25.4.0"
-      }
-    },
-    "jest-pnp-resolver": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz",
-      "integrity": "sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==",
-      "dev": true
-    },
-    "jest-regex-util": {
-      "version": "25.2.6",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz",
-      "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==",
-      "dev": true
-    },
-    "jest-resolve": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.4.0.tgz",
-      "integrity": "sha512-wOsKqVDFWUiv8BtLMCC6uAJ/pHZkfFgoBTgPtmYlsprAjkxrr2U++ZnB3l5ykBMd2O24lXvf30SMAjJIW6k2aA==",
+    "jest-watcher": {
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-25.5.0.tgz",
+      "integrity": "sha512-XrSfJnVASEl+5+bb51V0Q7WQx65dTSk7NL4yDdVjPnRNpM0hG+ncFmDYJo9O8jaSRcAitVbuVawyXCRoxGrT5Q==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.4.0",
-        "browser-resolve": "^1.11.3",
+        "@jest/test-result": "^25.5.0",
+        "@jest/types": "^25.5.0",
+        "ansi-escapes": "^4.2.1",
         "chalk": "^3.0.0",
-        "jest-pnp-resolver": "^1.2.1",
-        "read-pkg-up": "^7.0.1",
-        "realpath-native": "^2.0.0",
-        "resolve": "^1.15.1",
-        "slash": "^3.0.0"
+        "jest-util": "^25.5.0",
+        "string-length": "^3.1.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -13081,3410 +12358,3697 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
-        "parse-json": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
-          "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1",
-            "lines-and-columns": "^1.1.6"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-          "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-          "dev": true,
-          "requires": {
-            "@types/normalize-package-data": "^2.4.0",
-            "normalize-package-data": "^2.5.0",
-            "parse-json": "^5.0.0",
-            "type-fest": "^0.6.0"
-          },
-          "dependencies": {
-            "type-fest": {
-              "version": "0.6.0",
-              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-              "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-              "dev": true
-            }
-          }
-        },
-        "read-pkg-up": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-          "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-          "dev": true,
-          "requires": {
-            "find-up": "^4.1.0",
-            "read-pkg": "^5.2.0",
-            "type-fest": "^0.8.1"
-          }
-        },
-        "resolve": {
-          "version": "1.17.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
-            "path-parse": "^1.0.6"
+            "has-flag": "^4.0.0"
           }
-        },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+        }
+      }
+    },
+    "jest-worker": {
+      "version": "24.9.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
+      "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
+      "dev": true,
+      "requires": {
+        "merge-stream": "^2.0.0",
+        "supports-color": "^6.1.0"
+      },
+      "dependencies": {
+        "merge-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+          "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
     },
-    "jest-resolve-dependencies": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-25.4.0.tgz",
-      "integrity": "sha512-A0eoZXx6kLiuG1Ui7wITQPl04HwjLErKIJTt8GR3c7UoDAtzW84JtCrgrJ6Tkw6c6MwHEyAaLk7dEPml5pf48A==",
+    "joi": {
+      "version": "13.7.0",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-13.7.0.tgz",
+      "integrity": "sha512-xuY5VkHfeOYK3Hdi91ulocfuFopwgbSORmIwzcwHKESQhC7w1kD5jaVSPnqDxS2I8t3RZ9omCKAxNwXN5zG1/Q==",
+      "requires": {
+        "hoek": "5.x.x",
+        "isemail": "3.x.x",
+        "topo": "3.x.x"
+      },
+      "dependencies": {
+        "hoek": {
+          "version": "5.0.4",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-5.0.4.tgz",
+          "integrity": "sha512-Alr4ZQgoMlnere5FZJsIyfIjORBqZll5POhDsF4q64dPuJR6rNxXdDxtHSQq8OXRurhmx+PWYEE8bXRROY8h0w=="
+        }
+      }
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.4.0",
-        "jest-regex-util": "^25.2.6",
-        "jest-snapshot": "^25.4.0"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
       }
     },
-    "jest-runner": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.4.0.tgz",
-      "integrity": "sha512-wWQSbVgj2e/1chFdMRKZdvlmA6p1IPujhpLT7TKNtCSl1B0PGBGvJjCaiBal/twaU2yfk8VKezHWexM8IliBfA==",
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true
+    },
+    "jsdom": {
+      "version": "15.2.1",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz",
+      "integrity": "sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==",
       "dev": true,
       "requires": {
-        "@jest/console": "^25.4.0",
-        "@jest/environment": "^25.4.0",
-        "@jest/test-result": "^25.4.0",
-        "@jest/types": "^25.4.0",
-        "chalk": "^3.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.3",
-        "jest-config": "^25.4.0",
-        "jest-docblock": "^25.3.0",
-        "jest-haste-map": "^25.4.0",
-        "jest-jasmine2": "^25.4.0",
-        "jest-leak-detector": "^25.4.0",
-        "jest-message-util": "^25.4.0",
-        "jest-resolve": "^25.4.0",
-        "jest-runtime": "^25.4.0",
-        "jest-util": "^25.4.0",
-        "jest-worker": "^25.4.0",
-        "source-map-support": "^0.5.6",
-        "throat": "^5.0.0"
+        "abab": "^2.0.0",
+        "acorn": "^7.1.0",
+        "acorn-globals": "^4.3.2",
+        "array-equal": "^1.0.0",
+        "cssom": "^0.4.1",
+        "cssstyle": "^2.0.0",
+        "data-urls": "^1.1.0",
+        "domexception": "^1.0.1",
+        "escodegen": "^1.11.1",
+        "html-encoding-sniffer": "^1.0.2",
+        "nwsapi": "^2.2.0",
+        "parse5": "5.1.0",
+        "pn": "^1.1.0",
+        "request": "^2.88.0",
+        "request-promise-native": "^1.0.7",
+        "saxes": "^3.1.9",
+        "symbol-tree": "^3.2.2",
+        "tough-cookie": "^3.0.1",
+        "w3c-hr-time": "^1.0.1",
+        "w3c-xmlserializer": "^1.1.2",
+        "webidl-conversions": "^4.0.2",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^7.0.0",
+        "ws": "^7.0.0",
+        "xml-name-validator": "^3.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "graceful-fs": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
+        "acorn": {
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
           "dev": true
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+        "parse5": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
+          "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+        "tough-cookie": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
+          "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "ip-regex": "^2.1.0",
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
           }
+        },
+        "ws": {
+          "version": "7.5.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.0.tgz",
+          "integrity": "sha512-6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw==",
+          "dev": true
         }
       }
     },
-    "jest-runtime": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.4.0.tgz",
-      "integrity": "sha512-lgNJlCDULtXu9FumnwCyWlOub8iytijwsPNa30BKrSNtgoT6NUMXOPrZvsH06U6v0wgD/Igwz13nKA2wEKU2VA==",
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "json3": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
+      "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
+      "dev": true
+    },
+    "json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
       "dev": true,
       "requires": {
-        "@jest/console": "^25.4.0",
-        "@jest/environment": "^25.4.0",
-        "@jest/source-map": "^25.2.6",
-        "@jest/test-result": "^25.4.0",
-        "@jest/transform": "^25.4.0",
-        "@jest/types": "^25.4.0",
-        "@types/yargs": "^15.0.0",
-        "chalk": "^3.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.3",
-        "jest-config": "^25.4.0",
-        "jest-haste-map": "^25.4.0",
-        "jest-message-util": "^25.4.0",
-        "jest-mock": "^25.4.0",
-        "jest-regex-util": "^25.2.6",
-        "jest-resolve": "^25.4.0",
-        "jest-snapshot": "^25.4.0",
-        "jest-util": "^25.4.0",
-        "jest-validate": "^25.4.0",
-        "realpath-native": "^2.0.0",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0",
-        "yargs": "^15.3.1"
+        "minimist": "^1.2.0"
+      }
+    },
+    "jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "requires": {
+        "graceful-fs": "^4.1.6",
+        "universalify": "^2.0.0"
+      }
+    },
+    "jsonparse": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
+      "dev": true
+    },
+    "jsonwebtoken": {
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
+      "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
+      "requires": {
+        "jws": "^3.2.2",
+        "lodash.includes": "^4.3.0",
+        "lodash.isboolean": "^3.0.3",
+        "lodash.isinteger": "^4.0.4",
+        "lodash.isnumber": "^3.0.3",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.isstring": "^4.0.1",
+        "lodash.once": "^4.0.0",
+        "ms": "^2.1.1",
+        "semver": "^5.6.0"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
         },
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
+      }
+    },
+    "jspdf": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-2.3.1.tgz",
+      "integrity": "sha512-1vp0USP1mQi1h7NKpwxjFgQkJ5ncZvtH858aLpycUc/M+r/RpWJT8PixAU7Cw/3fPd4fpC8eB/Bj42LnsR21YQ==",
+      "requires": {
+        "atob": "^2.1.2",
+        "btoa": "^1.2.1",
+        "canvg": "^3.0.6",
+        "core-js": "^3.6.0",
+        "dompurify": "^2.2.0",
+        "fflate": "^0.4.8",
+        "html2canvas": "^1.0.0-rc.5"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "3.15.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.15.1.tgz",
+          "integrity": "sha512-h8VbZYnc9pDzueiS2610IULDkpFFPunHwIpl8yRwFahAEEdSpHlTy3h3z3rKq5h11CaUdBEeRViu9AYvbxiMeg==",
+          "optional": true
+        }
+      }
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      },
+      "dependencies": {
+        "extsprintf": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+          "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+          "dev": true
+        }
+      }
+    },
+    "jszip": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.6.0.tgz",
+      "integrity": "sha512-jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ==",
+      "requires": {
+        "lie": "~3.3.0",
+        "pako": "~1.0.2",
+        "readable-stream": "~2.3.6",
+        "set-immediate-shim": "~1.0.1"
+      },
+      "dependencies": {
+        "lie": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+          "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
           "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
+            "immediate": "~3.0.5"
           }
-        },
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+        }
+      }
+    },
+    "jwa": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
+      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+      "requires": {
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "jws": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+      "requires": {
+        "jwa": "^1.4.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "jwt-decode": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz",
+      "integrity": "sha1-fYa9VmefWM5qhHBKZX3TkruoGnk="
+    },
+    "karma": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-3.1.4.tgz",
+      "integrity": "sha512-31Vo8Qr5glN+dZEVIpnPCxEGleqE0EY6CtC2X9TagRV3rRQ3SNrvfhddICkJgUK3AgqpeKSZau03QumTGhGoSw==",
+      "requires": {
+        "bluebird": "^3.3.0",
+        "body-parser": "^1.16.1",
+        "chokidar": "^2.0.3",
+        "colors": "^1.1.0",
+        "combine-lists": "^1.0.0",
+        "connect": "^3.6.0",
+        "core-js": "^2.2.0",
+        "di": "^0.0.1",
+        "dom-serialize": "^2.2.0",
+        "expand-braces": "^0.1.1",
+        "flatted": "^2.0.0",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.1.2",
+        "http-proxy": "^1.13.0",
+        "isbinaryfile": "^3.0.0",
+        "lodash": "^4.17.5",
+        "log4js": "^3.0.0",
+        "mime": "^2.3.1",
+        "minimatch": "^3.0.2",
+        "optimist": "^0.6.1",
+        "qjobs": "^1.1.4",
+        "range-parser": "^1.2.0",
+        "rimraf": "^2.6.0",
+        "safe-buffer": "^5.0.1",
+        "socket.io": "2.1.1",
+        "source-map": "^0.6.1",
+        "tmp": "0.0.33",
+        "useragent": "2.3.0"
+      }
+    },
+    "karma-source-map-support": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz",
+      "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==",
+      "dev": true,
+      "requires": {
+        "source-map-support": "^0.5.5"
+      }
+    },
+    "katex": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/katex/-/katex-0.12.0.tgz",
+      "integrity": "sha512-y+8btoc/CK70XqcHqjxiGWBOeIL8upbS0peTPXTvgrh21n1RiWWcIpSWM+4uXq+IAgNh9YYQWdc7LVDPDAEEAg==",
+      "requires": {
+        "commander": "^2.19.0"
+      }
+    },
+    "keycode": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz",
+      "integrity": "sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ="
+    },
+    "killable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
+      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
+      "dev": true
+    },
+    "kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+    },
+    "kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true
+    },
+    "lazystream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
+      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
+      "requires": {
+        "readable-stream": "^2.0.5"
+      }
+    },
+    "lcid": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+      "dev": true,
+      "requires": {
+        "invert-kv": "^2.0.0"
+      }
+    },
+    "less": {
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/less/-/less-3.9.0.tgz",
+      "integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==",
+      "dev": true,
+      "requires": {
+        "clone": "^2.1.2",
+        "errno": "^0.1.1",
+        "graceful-fs": "^4.1.2",
+        "image-size": "~0.5.0",
+        "mime": "^1.4.1",
+        "mkdirp": "^0.5.0",
+        "promise": "^7.1.1",
+        "request": "^2.83.0",
+        "source-map": "~0.6.0"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+          "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
           "dev": true
         },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+        "mime": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
           "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "cliui": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.0",
-            "wrap-ansi": "^6.2.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "get-caller-file": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-          "dev": true
-        },
-        "graceful-fs": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-          "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "require-main-filename": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-          "dev": true
-        },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-          "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "which-module": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-          "dev": true
-        },
-        "wrap-ansi": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "yargs": {
-          "version": "15.3.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
-          "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
-          "dev": true,
-          "requires": {
-            "cliui": "^6.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^4.1.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^4.2.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^18.1.1"
-          }
-        },
-        "yargs-parser": {
-          "version": "18.1.3",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
+          "optional": true
         }
       }
     },
-    "jest-serializer": {
-      "version": "25.2.6",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.2.6.tgz",
-      "integrity": "sha512-RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ==",
-      "dev": true
-    },
-    "jest-snapshot": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.4.0.tgz",
-      "integrity": "sha512-J4CJ0X2SaGheYRZdLz9CRHn9jUknVmlks4UBeu270hPAvdsauFXOhx9SQP2JtRzhnR3cvro/9N9KP83/uvFfRg==",
+    "less-loader": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-5.0.0.tgz",
+      "integrity": "sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.0.0",
-        "@jest/types": "^25.4.0",
-        "@types/prettier": "^1.19.0",
-        "chalk": "^3.0.0",
-        "expect": "^25.4.0",
-        "jest-diff": "^25.4.0",
-        "jest-get-type": "^25.2.6",
-        "jest-matcher-utils": "^25.4.0",
-        "jest-message-util": "^25.4.0",
-        "jest-resolve": "^25.4.0",
-        "make-dir": "^3.0.0",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^25.4.0",
-        "semver": "^6.3.0"
+        "clone": "^2.1.1",
+        "loader-utils": "^1.1.0",
+        "pify": "^4.0.1"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+        "clone": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+          "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
           "dev": true
+        }
+      }
+    },
+    "level": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/level/-/level-6.0.1.tgz",
+      "integrity": "sha512-psRSqJZCsC/irNhfHzrVZbmPYXDcEYhA5TVNwr+V92jF44rbf86hqGp8fiT702FyiArScYIlPSBTDUASCVNSpw==",
+      "requires": {
+        "level-js": "^5.0.0",
+        "level-packager": "^5.1.0",
+        "leveldown": "^5.4.0"
+      }
+    },
+    "level-codec": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-9.0.2.tgz",
+      "integrity": "sha512-UyIwNb1lJBChJnGfjmO0OR+ezh2iVu1Kas3nvBS/BzGnx79dv6g7unpKIDNPMhfdTEGoc7mC8uAu51XEtX+FHQ==",
+      "requires": {
+        "buffer": "^5.6.0"
+      }
+    },
+    "level-concat-iterator": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/level-concat-iterator/-/level-concat-iterator-2.0.1.tgz",
+      "integrity": "sha512-OTKKOqeav2QWcERMJR7IS9CUo1sHnke2C0gkSmcR7QuEtFNLLzHQAvnMw8ykvEcv0Qtkg0p7FOwP1v9e5Smdcw=="
+    },
+    "level-errors": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-2.0.1.tgz",
+      "integrity": "sha512-UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==",
+      "requires": {
+        "errno": "~0.1.1"
+      }
+    },
+    "level-iterator-stream": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-4.0.2.tgz",
+      "integrity": "sha512-ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q==",
+      "requires": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0",
+        "xtend": "^4.0.2"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
         },
-        "make-dir": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-          "dev": true,
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
           "requires": {
-            "semver": "^6.0.0"
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
           }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
+        }
+      }
+    },
+    "level-js": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/level-js/-/level-js-5.0.2.tgz",
+      "integrity": "sha512-SnBIDo2pdO5VXh02ZmtAyPP6/+6YTJg2ibLtl9C34pWvmtMEmRTWpra+qO/hifkUtBTOtfx6S9vLDjBsBK4gRg==",
+      "requires": {
+        "abstract-leveldown": "~6.2.3",
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.3",
+        "ltgt": "^2.1.2"
+      }
+    },
+    "level-packager": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/level-packager/-/level-packager-5.1.1.tgz",
+      "integrity": "sha512-HMwMaQPlTC1IlcwT3+swhqf/NUO+ZhXVz6TY1zZIIZlIR0YSn8GtAAWmIvKjNY16ZkEg/JcpAuQskxsXqC0yOQ==",
+      "requires": {
+        "encoding-down": "^6.3.0",
+        "levelup": "^4.3.2"
+      }
+    },
+    "level-supports": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/level-supports/-/level-supports-1.0.1.tgz",
+      "integrity": "sha512-rXM7GYnW8gsl1vedTJIbzOrRv85c/2uCMpiiCzO2fndd06U/kUXEEU9evYn4zFggBOg36IsBW8LzqIpETwwQzg==",
+      "requires": {
+        "xtend": "^4.0.2"
+      }
+    },
+    "level-write-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/level-write-stream/-/level-write-stream-1.0.0.tgz",
+      "integrity": "sha1-P3+7Z5pVE3wP6zA97nZuEu4Twdw=",
+      "requires": {
+        "end-stream": "~0.1.0"
+      }
+    },
+    "leveldown": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-5.6.0.tgz",
+      "integrity": "sha512-iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ==",
+      "requires": {
+        "abstract-leveldown": "~6.2.1",
+        "napi-macros": "~2.0.0",
+        "node-gyp-build": "~4.1.0"
+      }
+    },
+    "levelup": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/levelup/-/levelup-4.4.0.tgz",
+      "integrity": "sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ==",
+      "requires": {
+        "deferred-leveldown": "~5.3.0",
+        "level-errors": "~2.0.0",
+        "level-iterator-stream": "~4.0.0",
+        "level-supports": "~1.0.0",
+        "xtend": "~4.0.0"
+      }
+    },
+    "leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true
+    },
+    "levenary": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
+      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
+      "dev": true,
+      "requires": {
+        "leven": "^3.1.0"
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "license-webpack-plugin": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.1.2.tgz",
+      "integrity": "sha512-7poZHRla+ae0eEButlwMrPpkXyhNVBf2EHePYWT0jyLnI6311/OXJkTI2sOIRungRpQgU2oDMpro5bSFPT5F0A==",
+      "dev": true,
+      "requires": {
+        "@types/webpack-sources": "^0.1.5",
+        "webpack-sources": "^1.2.0"
+      }
+    },
+    "lie": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
+      "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
+      "requires": {
+        "immediate": "~3.0.5"
+      }
+    },
+    "lines-and-columns": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
+      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
+      "dev": true
+    },
+    "load-json-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "strip-bom": "^3.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        }
+      }
+    },
+    "loader-runner": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+      "dev": true
+    },
+    "loader-utils": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "dev": true,
+      "requires": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^2.0.0",
+        "json5": "^1.0.1"
+      }
+    },
+    "localforage": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.7.1.tgz",
+      "integrity": "sha1-5JJ+BCMCuGTbMPMhHxO1xvDell0=",
+      "requires": {
+        "lie": "3.1.1"
+      }
+    },
+    "localforage-cordovasqlitedriver": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/localforage-cordovasqlitedriver/-/localforage-cordovasqlitedriver-1.7.0.tgz",
+      "integrity": "sha1-i5OVd1nuaI06WNW6fAR39sy1ODg=",
+      "requires": {
+        "localforage": ">=1.5.0"
+      }
+    },
+    "locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "requires": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
+    "lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
+    },
+    "lodash._basetostring": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
+      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U="
+    },
+    "lodash._basevalues": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
+      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc="
+    },
+    "lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
+    },
+    "lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
+    },
+    "lodash._reescape": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
+      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo="
+    },
+    "lodash._reevaluate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
+      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0="
+    },
+    "lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
+    },
+    "lodash._root": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
+      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI="
+    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+      "dev": true
+    },
+    "lodash.escape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
+      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
+      "requires": {
+        "lodash._root": "^3.0.0"
+      }
+    },
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+      "dev": true
+    },
+    "lodash.includes": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
+      "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
+    },
+    "lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
+    },
+    "lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
+    },
+    "lodash.isboolean": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+      "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY="
+    },
+    "lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
+    },
+    "lodash.isinteger": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
+      "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M="
+    },
+    "lodash.isnumber": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
+      "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w="
+    },
+    "lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
+    },
+    "lodash.isstring": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
+    },
+    "lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+      "requires": {
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "lodash.once": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
+    },
+    "lodash.restparam": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
+    },
+    "lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+      "dev": true
+    },
+    "lodash.template": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
+      "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
+      "requires": {
+        "lodash._basecopy": "^3.0.0",
+        "lodash._basetostring": "^3.0.0",
+        "lodash._basevalues": "^3.0.0",
+        "lodash._isiterateecall": "^3.0.0",
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.escape": "^3.0.0",
+        "lodash.keys": "^3.0.0",
+        "lodash.restparam": "^3.0.0",
+        "lodash.templatesettings": "^3.0.0"
+      }
+    },
+    "lodash.templatesettings": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
+      "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
+      "requires": {
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.escape": "^3.0.0"
+      }
+    },
+    "lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
+      "dev": true
+    },
+    "log4js": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz",
+      "integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==",
+      "requires": {
+        "circular-json": "^0.5.5",
+        "date-format": "^1.2.0",
+        "debug": "^3.1.0",
+        "rfdc": "^1.1.2",
+        "streamroller": "0.7.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "requires": {
-            "has-flag": "^4.0.0"
+            "ms": "^2.1.1"
           }
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
         }
       }
     },
-    "jest-util": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.4.0.tgz",
-      "integrity": "sha512-WSZD59sBtAUjLv1hMeKbNZXmMcrLRWcYqpO8Dz8b4CeCTZpfNQw2q9uwrYAD+BbJoLJlu4ezVPwtAmM/9/SlZA==",
+    "loglevel": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz",
+      "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==",
+      "dev": true
+    },
+    "lolex": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz",
+      "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.4.0",
-        "chalk": "^3.0.0",
-        "is-ci": "^2.0.0",
-        "make-dir": "^3.0.0"
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
+    },
+    "lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "ltgt": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz",
+      "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU="
+    },
+    "m3u8-parser": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.3.0.tgz",
+      "integrity": "sha512-bVbjuBMoVIgFL1vpXVIxjeaoB5TPDJRb0m5qiTdM738SGqv/LAmsnVVPlKjM4fulm/rr1XZsKM+owHm+zvqxYA==",
+      "requires": {
+        "global": "^4.3.2"
+      }
+    },
+    "magic-string": {
+      "version": "0.25.3",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.3.tgz",
+      "integrity": "sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==",
+      "dev": true,
+      "requires": {
+        "sourcemap-codec": "^1.4.4"
+      }
+    },
+    "make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "requires": {
+        "semver": "^6.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "make-dir": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-          "dev": true,
-          "requires": {
-            "semver": "^6.0.0"
-          }
-        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
-    "jest-validate": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.4.0.tgz",
-      "integrity": "sha512-hvjmes/EFVJSoeP1yOl8qR8mAtMR3ToBkZeXrD/ZS9VxRyWDqQ/E1C5ucMTeSmEOGLipvdlyipiGbHJ+R1MQ0g==",
+    "make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
+    },
+    "make-fetch-happen": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz",
+      "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.4.0",
-        "camelcase": "^5.3.1",
-        "chalk": "^3.0.0",
-        "jest-get-type": "^25.2.6",
-        "leven": "^3.1.0",
-        "pretty-format": "^25.4.0"
+        "agentkeepalive": "^3.4.1",
+        "cacache": "^12.0.0",
+        "http-cache-semantics": "^3.8.1",
+        "http-proxy-agent": "^2.1.0",
+        "https-proxy-agent": "^2.2.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "node-fetch-npm": "^2.0.2",
+        "promise-retry": "^1.1.1",
+        "socks-proxy-agent": "^4.0.0",
+        "ssri": "^6.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "agent-base": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+          "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "es6-promisify": "^5.0.0"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-watcher": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-25.4.0.tgz",
-      "integrity": "sha512-36IUfOSRELsKLB7k25j/wutx0aVuHFN6wO94gPNjQtQqFPa2rkOymmx9rM5EzbF3XBZZ2oqD9xbRVoYa2w86gw==",
-      "dev": true,
-      "requires": {
-        "@jest/test-result": "^25.4.0",
-        "@jest/types": "^25.4.0",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^3.0.0",
-        "jest-util": "^25.4.0",
-        "string-length": "^3.1.0"
-      },
-      "dependencies": {
-        "ansi-escapes": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-          "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
-            "type-fest": "^0.11.0"
+            "ms": "2.0.0"
           }
         },
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+        "http-proxy-agent": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
+          "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
+            "agent-base": "4",
+            "debug": "3.1.0"
           }
         },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+        "https-proxy-agent": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+          "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "agent-base": "^4.3.0",
+            "debug": "^3.1.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "yallist": "^3.0.2"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+        "socks": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
+          "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "ip": "1.1.5",
+            "smart-buffer": "^4.1.0"
           }
         },
-        "type-fest": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-          "dev": true
-        }
-      }
-    },
-    "jest-worker": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.4.0.tgz",
-      "integrity": "sha512-ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw==",
-      "dev": true,
-      "requires": {
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+        "socks-proxy-agent": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
+          "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "agent-base": "~4.2.1",
+            "socks": "~2.3.2"
+          },
+          "dependencies": {
+            "agent-base": {
+              "version": "4.2.1",
+              "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
+              "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+              "dev": true,
+              "requires": {
+                "es6-promisify": "^5.0.0"
+              }
+            }
           }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
         }
       }
     },
-    "joi": {
-      "version": "13.7.0",
-      "resolved": "https://registry.npmjs.org/joi/-/joi-13.7.0.tgz",
-      "integrity": "sha512-xuY5VkHfeOYK3Hdi91ulocfuFopwgbSORmIwzcwHKESQhC7w1kD5jaVSPnqDxS2I8t3RZ9omCKAxNwXN5zG1/Q==",
+    "makeerror": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
+      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "dev": true,
       "requires": {
-        "hoek": "5.x.x",
-        "isemail": "3.x.x",
-        "topo": "3.x.x"
-      },
-      "dependencies": {
-        "hoek": {
-          "version": "5.0.4",
-          "resolved": "https://registry.npmjs.org/hoek/-/hoek-5.0.4.tgz",
-          "integrity": "sha512-Alr4ZQgoMlnere5FZJsIyfIjORBqZll5POhDsF4q64dPuJR6rNxXdDxtHSQq8OXRurhmx+PWYEE8bXRROY8h0w=="
-        }
+        "tmpl": "1.0.x"
       }
     },
-    "js-base64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
-      "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==",
-      "dev": true,
-      "optional": true
-    },
-    "js-tokens": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+    "mamacro": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
+      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
       "dev": true
     },
-    "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+    "map-age-cleaner": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
       "dev": true,
       "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "p-defer": "^1.0.0"
       }
     },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
     },
-    "jsdom": {
-      "version": "15.2.1",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz",
-      "integrity": "sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==",
-      "dev": true,
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
       "requires": {
-        "abab": "^2.0.0",
-        "acorn": "^7.1.0",
-        "acorn-globals": "^4.3.2",
-        "array-equal": "^1.0.0",
-        "cssom": "^0.4.1",
-        "cssstyle": "^2.0.0",
-        "data-urls": "^1.1.0",
-        "domexception": "^1.0.1",
-        "escodegen": "^1.11.1",
-        "html-encoding-sniffer": "^1.0.2",
-        "nwsapi": "^2.2.0",
-        "parse5": "5.1.0",
-        "pn": "^1.1.0",
-        "request": "^2.88.0",
-        "request-promise-native": "^1.0.7",
-        "saxes": "^3.1.9",
-        "symbol-tree": "^3.2.2",
-        "tough-cookie": "^3.0.1",
-        "w3c-hr-time": "^1.0.1",
-        "w3c-xmlserializer": "^1.1.2",
-        "webidl-conversions": "^4.0.2",
-        "whatwg-encoding": "^1.0.5",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^7.0.0",
-        "ws": "^7.0.0",
-        "xml-name-validator": "^3.0.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
-          "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
-          "dev": true
-        },
-        "parse5": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
-          "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==",
-          "dev": true
-        },
-        "tough-cookie": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
-          "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
-          "dev": true,
-          "requires": {
-            "ip-regex": "^2.1.0",
-            "psl": "^1.1.28",
-            "punycode": "^2.1.1"
-          }
-        },
-        "ws": {
-          "version": "7.2.3",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz",
-          "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==",
-          "dev": true
-        }
+        "object-visit": "^1.0.0"
       }
     },
-    "jsesc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-      "dev": true
-    },
-    "json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
-      "dev": true
+    "marks-pane": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/marks-pane/-/marks-pane-1.0.9.tgz",
+      "integrity": "sha512-Ahs4oeG90tbdPWwAJkAAoHg2lRR8lAs9mZXETNPO9hYg3AkjUJBKi1NQ4aaIQZVGrig7c/3NUV1jANl8rFTeMg=="
     },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
+    "material-design-icons": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/material-design-icons/-/material-design-icons-3.0.1.tgz",
+      "integrity": "sha1-mnHEh0chjrylHlGmbaaCA4zct78="
     },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
+    "math-random": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
+      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="
     },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
     },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
+    "mem": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+      "dev": true,
+      "requires": {
+        "map-age-cleaner": "^0.1.1",
+        "mimic-fn": "^2.0.0",
+        "p-is-promise": "^2.0.0"
+      }
     },
-    "json3": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-      "dev": true
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
     },
-    "json5": {
+    "merge-descriptors": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+    },
+    "merge-source-map": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
+      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.0"
+        "source-map": "^0.6.1"
       }
     },
-    "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+    "merge-stream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
+      "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
       "requires": {
-        "graceful-fs": "^4.1.6"
+        "readable-stream": "^2.0.1"
       }
     },
-    "jsonparse": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
-      "dev": true
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
     },
-    "jsonwebtoken": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
-      "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+    },
+    "micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "requires": {
-        "jws": "^3.2.2",
-        "lodash.includes": "^4.3.0",
-        "lodash.isboolean": "^3.0.3",
-        "lodash.isinteger": "^4.0.4",
-        "lodash.isnumber": "^3.0.3",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.isstring": "^4.0.1",
-        "lodash.once": "^4.0.0",
-        "ms": "^2.1.1",
-        "semver": "^5.6.0"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
       },
       "dependencies": {
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
         }
       }
     },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
+    "mime": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="
     },
-    "jwa": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
-      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
-      "requires": {
-        "buffer-equal-constant-time": "1.0.1",
-        "ecdsa-sig-formatter": "1.0.11",
-        "safe-buffer": "^5.0.1"
-      }
+    "mime-db": {
+      "version": "1.48.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
+      "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ=="
     },
-    "jws": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
-      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+    "mime-types": {
+      "version": "2.1.31",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
+      "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
       "requires": {
-        "jwa": "^1.4.1",
-        "safe-buffer": "^5.0.1"
+        "mime-db": "1.48.0"
       }
     },
-    "karma": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-3.1.4.tgz",
-      "integrity": "sha512-31Vo8Qr5glN+dZEVIpnPCxEGleqE0EY6CtC2X9TagRV3rRQ3SNrvfhddICkJgUK3AgqpeKSZau03QumTGhGoSw==",
-      "requires": {
-        "bluebird": "^3.3.0",
-        "body-parser": "^1.16.1",
-        "chokidar": "^2.0.3",
-        "colors": "^1.1.0",
-        "combine-lists": "^1.0.0",
-        "connect": "^3.6.0",
-        "core-js": "^2.2.0",
-        "di": "^0.0.1",
-        "dom-serialize": "^2.2.0",
-        "expand-braces": "^0.1.1",
-        "flatted": "^2.0.0",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.1.2",
-        "http-proxy": "^1.13.0",
-        "isbinaryfile": "^3.0.0",
-        "lodash": "^4.17.5",
-        "log4js": "^3.0.0",
-        "mime": "^2.3.1",
-        "minimatch": "^3.0.2",
-        "optimist": "^0.6.1",
-        "qjobs": "^1.1.4",
-        "range-parser": "^1.2.0",
-        "rimraf": "^2.6.0",
-        "safe-buffer": "^5.0.1",
-        "socket.io": "2.1.1",
-        "source-map": "^0.6.1",
-        "tmp": "0.0.33",
-        "useragent": "2.3.0"
-      },
-      "dependencies": {
-        "mime": {
-          "version": "2.4.4",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-          "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
+    "mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
     },
-    "karma-source-map-support": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz",
-      "integrity": "sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==",
-      "dev": true,
+    "mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true
+    },
+    "min-document": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
+      "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
       "requires": {
-        "source-map-support": "^0.5.5"
+        "dom-walk": "^0.1.0"
       }
     },
-    "keyv": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
-      "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==",
+    "mini-css-extract-plugin": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.0.tgz",
+      "integrity": "sha512-MNpRGbNA52q6U92i0qbVpQNsgk7LExy41MdAlG84FeytfDOtRIf/mCHdEgG8rpTKOaNKiqUnZdlptF469hxqOw==",
       "dev": true,
       "requires": {
-        "json-buffer": "3.0.0"
+        "loader-utils": "^1.1.0",
+        "normalize-url": "1.9.1",
+        "schema-utils": "^1.0.0",
+        "webpack-sources": "^1.1.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
       }
     },
-    "killable": {
+    "minimalistic-assert": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
-      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
       "dev": true
     },
-    "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
-    },
-    "kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
       "dev": true
     },
-    "lazystream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "requires": {
-        "readable-stream": "^2.0.5"
+        "brace-expansion": "^1.1.7"
       }
     },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
-      "requires": {
-        "invert-kv": "^1.0.0"
-      }
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
     },
-    "less": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/less/-/less-3.9.0.tgz",
-      "integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==",
+    "minipass": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
       "dev": true,
       "requires": {
-        "clone": "^2.1.2",
-        "errno": "^0.1.1",
-        "graceful-fs": "^4.1.2",
-        "image-size": "~0.5.0",
-        "mime": "^1.4.1",
-        "mkdirp": "^0.5.0",
-        "promise": "^7.1.1",
-        "request": "^2.83.0",
-        "source-map": "~0.6.0"
+        "yallist": "^4.0.0"
       },
       "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true,
-          "optional": true
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
         }
       }
     },
-    "less-loader": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.1.0.tgz",
-      "integrity": "sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==",
+    "minipass-collect": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
       "dev": true,
       "requires": {
-        "clone": "^2.1.1",
-        "loader-utils": "^1.1.0",
-        "pify": "^3.0.0"
+        "minipass": "^3.0.0"
       }
     },
-    "leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "dev": true
-    },
-    "levenary": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
-      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
+    "minipass-flush": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
       "dev": true,
       "requires": {
-        "leven": "^3.1.0"
+        "minipass": "^3.0.0"
       }
     },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+    "minipass-pipeline": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+      "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
+        "minipass": "^3.0.0"
       }
     },
-    "license-webpack-plugin": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.1.0.tgz",
-      "integrity": "sha512-vDiBeMWxjE9n6TabQ9J4FH8urFdsRK0Nvxn1cit9biCiR9aq1zBR0X2BlAkEiIG6qPamLeU0GzvIgLkrFc398A==",
+    "minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
       "dev": true,
       "requires": {
-        "@types/webpack-sources": "^0.1.5",
-        "webpack-sources": "^1.2.0"
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
       }
     },
-    "lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-      "dev": true
-    },
-    "load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+    "mississippi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^3.0.0",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
       },
       "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
           "dev": true,
-          "optional": true
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
         }
       }
     },
-    "loader-runner": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
-      "dev": true
-    },
-    "loader-utils": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
-      "dev": true,
+    "mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^2.0.0",
-        "json5": "^1.0.1"
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
       }
     },
-    "locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
       "requires": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
+        "minimist": "^1.2.5"
       }
     },
-    "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
-    },
-    "lodash._basecopy": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
-    },
-    "lodash._basetostring": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-      "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U="
-    },
-    "lodash._basevalues": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-      "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc="
-    },
-    "lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
-    },
-    "lodash._isiterateecall": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
+    "moment": {
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
     },
-    "lodash._reescape": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-      "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo="
+    "move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
+      }
     },
-    "lodash._reevaluate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-      "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0="
+    "mpd-parser": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.7.0.tgz",
+      "integrity": "sha512-nkzVIkecaDz3q7p4ToN3GR0FV2Odbh0w2sJ8ijsyw79JcBrJoUD3KHIiI8gL0hEDlex7mrVpTxXBsRHowUBmPw==",
+      "requires": {
+        "global": "^4.3.2",
+        "url-toolkit": "^2.1.1"
+      }
     },
-    "lodash._reinterpolate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
-    "lodash._root": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI="
+    "multicast-dns": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
+      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+      "dev": true,
+      "requires": {
+        "dns-packet": "^1.3.1",
+        "thunky": "^1.0.2"
+      }
     },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+    "multicast-dns-service-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
       "dev": true
     },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
-    },
-    "lodash.escape": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
+    "multipipe": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
       "requires": {
-        "lodash._root": "^3.0.0"
+        "duplexer2": "0.0.2"
+      },
+      "dependencies": {
+        "duplexer2": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+          "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
+          "requires": {
+            "readable-stream": "~1.1.9"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+        }
       }
     },
-    "lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+    "mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "dev": true
     },
-    "lodash.includes": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
-      "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
-    },
-    "lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
-    },
-    "lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
-    },
-    "lodash.isboolean": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
-      "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY="
-    },
-    "lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
-    },
-    "lodash.isinteger": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
-      "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M="
-    },
-    "lodash.isnumber": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
-      "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w="
+    "mux.js": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-5.1.1.tgz",
+      "integrity": "sha512-Mf/UYmh5b8jvUP+jmrTbETnyFZprMdbT0RxKm/lJ/4d2Q3xdc5GaHaRPI1zVV5D3+6uxArVPm78QEb1RsrmaQw=="
     },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
+    "nan": {
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="
     },
-    "lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
+    "nanoassert": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz",
+      "integrity": "sha1-TzFS4JVA/eKMdvRLGbvNHVpCR40="
     },
-    "lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "requires": {
-        "lodash._getnative": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       }
     },
-    "lodash.once": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
-    },
-    "lodash.restparam": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
+    "napi-macros": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/napi-macros/-/napi-macros-2.0.0.tgz",
+      "integrity": "sha512-A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg=="
     },
-    "lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
-    "lodash.tail": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
-      "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=",
+    "negotiator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
+    },
+    "neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
-    "lodash.template": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-      "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
+    "netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg=="
+    },
+    "next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
+    },
+    "ng-recaptcha": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ng-recaptcha/-/ng-recaptcha-5.0.0.tgz",
+      "integrity": "sha512-tUVMmHiCDgWSjqXddjRde9jTnyODwki/akixvFiYK8SaQhgW1aor1WKS8dnNtc+Spx7XFiurEXRVfgyd70G6Mw==",
       "requires": {
-        "lodash._basecopy": "^3.0.0",
-        "lodash._basetostring": "^3.0.0",
-        "lodash._basevalues": "^3.0.0",
-        "lodash._isiterateecall": "^3.0.0",
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0",
-        "lodash.keys": "^3.0.0",
-        "lodash.restparam": "^3.0.0",
-        "lodash.templatesettings": "^3.0.0"
+        "@types/grecaptcha": "^2.0.33",
+        "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
       }
     },
-    "lodash.templatesettings": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-      "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
+    "ng2-charts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/ng2-charts/-/ng2-charts-2.4.2.tgz",
+      "integrity": "sha512-mY3C2uKCaApHCQizS2YxEOqQ7sSZZLxdV6N1uM9u/VvUgVtYvlPtdcXbKpN52ak93ZE22I73DiLWVDnDNG4/AQ==",
       "requires": {
-        "lodash._reinterpolate": "^3.0.0",
-        "lodash.escape": "^3.0.0"
+        "@types/chart.js": "^2.9.24",
+        "lodash-es": "^4.17.15",
+        "tslib": "^2.0.0"
       }
     },
-    "lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-      "dev": true
-    },
-    "log4js": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz",
-      "integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==",
+    "ng2-material-dropdown": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/ng2-material-dropdown/-/ng2-material-dropdown-0.10.1.tgz",
+      "integrity": "sha512-dOmk4+T6Rbtk60Un7sxOOFU546z5JEYupSL+RiG0/rN4DmJvxPp297AvA2Qm9LSMNszUZMi55cRzj79zQYu85g==",
       "requires": {
-        "circular-json": "^0.5.5",
-        "date-format": "^1.2.0",
-        "debug": "^3.1.0",
-        "rfdc": "^1.1.2",
-        "streamroller": "0.7.0"
+        "tslib": "^1.9.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
         }
       }
     },
-    "loglevel": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
-      "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=",
-      "dev": true
+    "ngx-bootstrap": {
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-5.6.2.tgz",
+      "integrity": "sha512-6YHXtdXkGH3w0NQoaUgNYAcrj064Lv5RTO284ha/hvpNTrh55yQz2cVh0VvwBk3MjyY2tdmLH4SuCJDszYdYiw=="
     },
-    "lolex": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz",
-      "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==",
-      "dev": true,
+    "ngx-chips": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ngx-chips/-/ngx-chips-2.0.2.tgz",
+      "integrity": "sha512-r3XwfE9VCzdbXso1qWeR5AhWlluljOwef4MdpIIJ9wFVcTAHCAU11wO+K6dUVw7mNWeGOhLCMEmi2+tNrKOCpg==",
       "requires": {
-        "@sinonjs/commons": "^1.7.0"
+        "ng2-material-dropdown": "0.10.1",
+        "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
       }
     },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
+    "ngx-infinite-scroll": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/ngx-infinite-scroll/-/ngx-infinite-scroll-10.0.1.tgz",
+      "integrity": "sha512-7is0eJZ9kJPsaHohRmMhJ/QFHAW9jp9twO5HcHRvFM/Yl/R8QCiokgjwmH0/CR3MuxUanxfHZMfO3PbYTwlBEg==",
       "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
+        "@scarf/scarf": "^1.1.0",
+        "opencollective-postinstall": "^2.0.2"
       }
     },
-    "loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "dev": true,
-      "optional": true,
+    "ngx-moment": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ngx-moment/-/ngx-moment-5.0.0.tgz",
+      "integrity": "sha512-LPpGPo4ccdh8RWnDbJdLTLGGGcwbRYMbn/j4PXM24754J7MZ0tgnBM+ncaVbwefUSSEMme8yMkNIxFiVxgOOvQ==",
       "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
+        "tslib": "^2.0.0"
       }
     },
-    "lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
     },
-    "lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+    "node-expat": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/node-expat/-/node-expat-2.4.0.tgz",
+      "integrity": "sha512-X8Y/Zk/izfNgfayeOeUGqze7KlaOwVJ9SDTjHUMKd0hu0aFTRpLlLCBwmx79cTPiQWD24I1YOafF+U+rTvEMfQ==",
       "requires": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
+        "bindings": "^1.5.0",
+        "nan": "^2.13.2"
       }
     },
-    "magic-string": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.2.tgz",
-      "integrity": "sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==",
-      "dev": true,
-      "requires": {
-        "sourcemap-codec": "^1.4.4"
-      }
+    "node-fetch": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
     },
-    "make-dir": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+    "node-fetch-npm": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz",
+      "integrity": "sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==",
       "dev": true,
       "requires": {
-        "pify": "^3.0.0"
+        "encoding": "^0.1.11",
+        "json-parse-better-errors": "^1.0.0",
+        "safe-buffer": "^5.1.1"
       }
     },
-    "make-error": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz",
-      "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==",
+    "node-forge": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
+      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
       "dev": true
     },
-    "make-fetch-happen": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz",
-      "integrity": "sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==",
+    "node-gyp-build": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.1.1.tgz",
+      "integrity": "sha512-dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ=="
+    },
+    "node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+      "dev": true
+    },
+    "node-libs-browser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
       "dev": true,
       "requires": {
-        "agentkeepalive": "^3.4.1",
-        "cacache": "^11.0.1",
-        "http-cache-semantics": "^3.8.1",
-        "http-proxy-agent": "^2.1.0",
-        "https-proxy-agent": "^2.2.1",
-        "lru-cache": "^4.1.2",
-        "mississippi": "^3.0.0",
-        "node-fetch-npm": "^2.0.2",
-        "promise-retry": "^1.1.1",
-        "socks-proxy-agent": "^4.0.0",
-        "ssri": "^6.0.0"
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
       },
       "dependencies": {
-        "cacache": {
-          "version": "11.3.2",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
-          "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.3",
-            "chownr": "^1.1.1",
-            "figgy-pudding": "^3.5.1",
-            "glob": "^7.1.3",
-            "graceful-fs": "^4.1.15",
-            "lru-cache": "^5.1.1",
-            "mississippi": "^3.0.0",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.2",
-            "ssri": "^6.0.1",
-            "unique-filename": "^1.1.1",
-            "y18n": "^4.0.0"
-          },
-          "dependencies": {
-            "lru-cache": {
-              "version": "5.1.1",
-              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-              "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-              "dev": true,
-              "requires": {
-                "yallist": "^3.0.2"
-              }
-            }
-          }
-        },
-        "mississippi": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-          "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-          "dev": true,
-          "requires": {
-            "concat-stream": "^1.5.0",
-            "duplexify": "^3.4.2",
-            "end-of-stream": "^1.1.0",
-            "flush-write-stream": "^1.0.0",
-            "from2": "^2.1.0",
-            "parallel-transform": "^1.1.0",
-            "pump": "^3.0.0",
-            "pumpify": "^1.3.3",
-            "stream-each": "^1.1.0",
-            "through2": "^2.0.0"
-          }
-        },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+        "buffer": {
+          "version": "4.9.2",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+          "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
           "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "base64-js": "^1.0.2",
+            "ieee754": "^1.1.4",
+            "isarray": "^1.0.0"
           }
         },
-        "ssri": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-          "dev": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1"
-          }
+        "process": {
+          "version": "0.11.10",
+          "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+          "dev": true
         },
-        "yallist": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
           "dev": true
         }
       }
     },
-    "makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
-      "dev": true,
-      "requires": {
-        "tmpl": "1.0.x"
-      }
-    },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "dev": true,
-      "requires": {
-        "p-defer": "^1.0.0"
-      }
-    },
-    "map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
-    },
-    "map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true,
-      "optional": true
-    },
-    "map-visit": {
+    "node-modules-regexp": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "requires": {
-        "object-visit": "^1.0.0"
-      }
-    },
-    "math-random": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
-      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="
-    },
-    "md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
-    },
-    "mem": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-      "dev": true,
-      "requires": {
-        "map-age-cleaner": "^0.1.1",
-        "mimic-fn": "^2.0.0",
-        "p-is-promise": "^2.0.0"
-      }
-    },
-    "memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "dev": true,
-      "requires": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      }
+      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
+      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
+      "dev": true
     },
-    "meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+    "node-notifier": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-6.0.0.tgz",
+      "integrity": "sha512-SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw==",
       "dev": true,
       "optional": true,
       "requires": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
+        "growly": "^1.3.0",
+        "is-wsl": "^2.1.1",
+        "semver": "^6.3.0",
+        "shellwords": "^0.1.1",
+        "which": "^1.3.1"
+      },
+      "dependencies": {
+        "is-wsl": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+          "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "is-docker": "^2.0.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true,
+          "optional": true
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
       }
     },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
-    },
-    "merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+    "node-releases": {
+      "version": "1.1.73",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
+      "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
       "dev": true
     },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
-    },
-    "micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+    "node-rest-client": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/node-rest-client/-/node-rest-client-3.1.0.tgz",
+      "integrity": "sha1-4L623aeyDMC2enhHzxLF/EGcN8M=",
       "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
+        "debug": "~2.2.0",
+        "follow-redirects": ">=1.2.0",
+        "xml2js": ">=0.2.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg="
+        }
       }
     },
-    "miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
+    "node-status-codes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
+      "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8="
+    },
+    "nopt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
       "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
+        "abbrev": "1",
+        "osenv": "^0.1.4"
       }
     },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+    "normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "dev": true,
-      "optional": true
-    },
-    "mime-db": {
-      "version": "1.40.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
-    },
-    "mime-types": {
-      "version": "2.1.24",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
-      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
       "requires": {
-        "mime-db": "1.40.0"
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
     },
-    "mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
       "dev": true
     },
-    "mini-css-extract-plugin": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz",
-      "integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==",
+    "normalize-url": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
+      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^1.0.0",
-        "webpack-sources": "^1.1.0"
+        "object-assign": "^4.0.1",
+        "prepend-http": "^1.0.0",
+        "query-string": "^4.1.0",
+        "sort-keys": "^1.0.0"
       }
     },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-      "dev": true
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+    "npm-bundled": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
+      "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
+      "dev": true,
       "requires": {
-        "brace-expansion": "^1.1.7"
+        "npm-normalize-package-bin": "^1.0.1"
       }
     },
-    "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-    },
-    "minipass": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
-      "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
+    "npm-conf": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
+      "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.0"
+        "config-chain": "^1.1.11",
+        "pify": "^3.0.0"
       },
       "dependencies": {
-        "yallist": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
           "dev": true
         }
       }
     },
-    "minizlib": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
-      "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
-      "dev": true,
-      "requires": {
-        "minipass": "^2.2.1"
-      }
+    "npm-normalize-package-bin": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
+      "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
+      "dev": true
     },
-    "mississippi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
-      "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
+    "npm-package-arg": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz",
+      "integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
       "dev": true,
       "requires": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^2.0.1",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
-      }
-    },
-    "mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
+        "hosted-git-info": "^2.6.0",
+        "osenv": "^0.1.5",
+        "semver": "^5.5.0",
+        "validate-npm-package-name": "^3.0.0"
       },
       "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
         }
       }
     },
-    "mixin-object": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
-      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
+    "npm-packlist": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
+      "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
       "dev": true,
       "requires": {
-        "for-in": "^0.1.3",
-        "is-extendable": "^0.1.1"
+        "ignore-walk": "^3.0.1",
+        "npm-bundled": "^1.0.1",
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
+    "npm-pick-manifest": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz",
+      "integrity": "sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==",
+      "dev": true,
+      "requires": {
+        "figgy-pudding": "^3.5.1",
+        "npm-package-arg": "^6.0.0",
+        "semver": "^5.4.1"
       },
       "dependencies": {
-        "for-in": {
-          "version": "0.1.8",
-          "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
-          "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         }
       }
     },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+    "npm-registry-fetch": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz",
+      "integrity": "sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==",
+      "dev": true,
       "requires": {
-        "minimist": "0.0.8"
+        "JSONStream": "^1.3.4",
+        "bluebird": "^3.5.1",
+        "figgy-pudding": "^3.4.1",
+        "lru-cache": "^5.1.1",
+        "make-fetch-happen": "^5.0.0",
+        "npm-package-arg": "^6.1.0",
+        "safe-buffer": "^5.2.0"
       },
       "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
         }
       }
     },
-    "move-concurrently": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-      "dev": true,
+    "npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "requires": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
+        "path-key": "^3.0.0"
       }
     },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "multicast-dns": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+    "nth-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
       "dev": true,
       "requires": {
-        "dns-packet": "^1.3.1",
-        "thunky": "^1.0.2"
+        "boolbase": "~1.0.0"
       }
     },
-    "multicast-dns-service-types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
       "dev": true
     },
-    "multipipe": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-      "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
+    },
+    "nwsapi": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+      "dev": true
+    },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "object-component": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
+      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE="
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
       "requires": {
-        "duplexer2": "0.0.2"
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
       },
       "dependencies": {
-        "duplexer2": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-          "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "requires": {
-            "readable-stream": "~1.1.9"
+            "is-descriptor": "^0.1.0"
           }
         },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-        },
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
+            "is-buffer": "^1.1.5"
           }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
         }
       }
     },
-    "mute-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-      "dev": true
-    },
-    "nan": {
-      "version": "2.13.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
-      "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="
-    },
-    "nanoassert": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz",
-      "integrity": "sha1-TzFS4JVA/eKMdvRLGbvNHVpCR40="
+    "object-inspect": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
+      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw=="
     },
-    "nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+    "object-is": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+      "dev": true,
       "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       }
     },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
-    },
-    "neo-async": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true
     },
-    "netmask": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz",
-      "integrity": "sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU="
-    },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-    },
-    "node-expat": {
-      "version": "2.3.18",
-      "resolved": "https://registry.npmjs.org/node-expat/-/node-expat-2.3.18.tgz",
-      "integrity": "sha512-9dIrDxXePa9HSn+hhlAg1wXkvqOjxefEbMclGxk2cEnq/Y3U7Qo5HNNqeo3fQ4bVmLhcdt3YN1TZy7WMZy4MHw==",
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
       "requires": {
-        "bindings": "^1.5.0",
-        "nan": "^2.13.2"
+        "isobject": "^3.0.0"
       }
     },
-    "node-fetch-npm": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz",
-      "integrity": "sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==",
+    "object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
       "dev": true,
       "requires": {
-        "encoding": "^0.1.11",
-        "json-parse-better-errors": "^1.0.0",
-        "safe-buffer": "^5.1.1"
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
       }
     },
-    "node-forge": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz",
-      "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==",
-      "dev": true
-    },
-    "node-gyp": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
-      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
+    "object.getownpropertydescriptors": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz",
+      "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "fstream": "^1.0.0",
-        "glob": "^7.0.3",
-        "graceful-fs": "^4.1.2",
-        "mkdirp": "^0.5.0",
-        "nopt": "2 || 3",
-        "npmlog": "0 || 1 || 2 || 3 || 4",
-        "osenv": "0",
-        "request": "^2.87.0",
-        "rimraf": "2",
-        "semver": "~5.3.0",
-        "tar": "^2.0.0",
-        "which": "1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-          "dev": true,
-          "optional": true
-        }
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.2"
       }
     },
-    "node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
-      "dev": true
+    "object.omit": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+      "requires": {
+        "for-own": "^0.1.4",
+        "is-extendable": "^0.1.1"
+      }
     },
-    "node-libs-browser": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz",
-      "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==",
-      "dev": true,
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
       "requires": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.0",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "0.0.4"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        }
+        "isobject": "^3.0.1"
       }
     },
-    "node-modules-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
+    "objectorarray": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.5.tgz",
+      "integrity": "sha512-eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg=="
+    },
+    "obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
       "dev": true
     },
-    "node-notifier": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-6.0.0.tgz",
-      "integrity": "sha512-SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw==",
-      "dev": true,
-      "optional": true,
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "requires": {
-        "growly": "^1.3.0",
-        "is-wsl": "^2.1.1",
-        "semver": "^6.3.0",
-        "shellwords": "^0.1.1",
-        "which": "^1.3.1"
-      },
-      "dependencies": {
-        "is-wsl": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz",
-          "integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==",
-          "dev": true,
-          "optional": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true,
-          "optional": true
-        }
+        "wrappy": "1"
       }
     },
-    "node-releases": {
-      "version": "1.1.18",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.18.tgz",
-      "integrity": "sha512-/mnVgm6u/8OwlIsoyRXtTI0RfQcxZoAZbdwyXap0EeWwcOpDDymyCHM2/aR9XKmHXrvizHoPAOs0pcbiJ6RUaA==",
+    "onetime": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k="
+    },
+    "open": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
+      "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
       "dev": true,
       "requires": {
-        "semver": "^5.3.0"
+        "is-wsl": "^1.1.0"
       }
     },
-    "node-rest-client": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/node-rest-client/-/node-rest-client-3.1.0.tgz",
-      "integrity": "sha1-4L623aeyDMC2enhHzxLF/EGcN8M=",
+    "opencollective-postinstall": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
+      "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q=="
+    },
+    "opn": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
+      "dev": true,
       "requires": {
-        "debug": "~2.2.0",
-        "follow-redirects": ">=1.2.0",
-        "xml2js": ">=0.2.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-          "requires": {
-            "ms": "0.7.1"
-          }
-        },
-        "ms": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg="
-        }
+        "is-wsl": "^1.1.0"
       }
     },
-    "node-sass": {
-      "version": "4.12.0",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
-      "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
-      "dev": true,
-      "optional": true,
+    "optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
       "requires": {
-        "async-foreach": "^0.1.3",
-        "chalk": "^1.1.1",
-        "cross-spawn": "^3.0.0",
-        "gaze": "^1.0.0",
-        "get-stdin": "^4.0.1",
-        "glob": "^7.0.3",
-        "in-publish": "^2.0.0",
-        "lodash": "^4.17.11",
-        "meow": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "nan": "^2.13.2",
-        "node-gyp": "^3.8.0",
-        "npmlog": "^4.0.0",
-        "request": "^2.88.0",
-        "sass-graph": "^2.2.4",
-        "stdout-stream": "^1.4.0",
-        "true-case-path": "^1.0.2"
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "optional": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true,
-          "optional": true
+        "minimist": {
+          "version": "0.0.10",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
         }
       }
     },
-    "node-status-codes": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
-      "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8="
-    },
-    "nopt": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-      "dev": true,
-      "optional": true,
+    "optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
       "requires": {
-        "abbrev": "1"
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
       }
     },
-    "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
+    "ordered-read-streams": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
+      "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
       "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
+        "is-stream": "^1.0.1",
+        "readable-stream": "^2.0.1"
       }
     },
-    "normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+    "original": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
+      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
+      "dev": true,
       "requires": {
-        "remove-trailing-separator": "^1.0.1"
+        "url-parse": "^1.4.3"
       }
     },
-    "normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
       "dev": true
     },
-    "normalize-url": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
-      "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+    },
+    "os-locale": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
       "dev": true,
       "requires": {
-        "prepend-http": "^2.0.0",
-        "query-string": "^5.0.1",
-        "sort-keys": "^2.0.0"
+        "execa": "^1.0.0",
+        "lcid": "^2.0.0",
+        "mem": "^4.0.0"
       },
       "dependencies": {
-        "sort-keys": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
-          "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=",
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
           "dev": true,
           "requires": {
-            "is-plain-obj": "^1.0.0"
+            "pump": "^3.0.0"
+          }
+        },
+        "npm-run-path": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+          "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+          "dev": true,
+          "requires": {
+            "path-key": "^2.0.0"
+          }
+        },
+        "path-key": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^1.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+          "dev": true
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
           }
         }
       }
     },
-    "npm-bundled": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
-      "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
-      "dev": true
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
-    "npm-conf": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
-      "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
-      "dev": true,
+    "osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "requires": {
-        "config-chain": "^1.1.11",
-        "pify": "^3.0.0"
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
       }
     },
-    "npm-package-arg": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz",
-      "integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
+    "p-cancelable": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz",
+      "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==",
+      "dev": true
+    },
+    "p-defer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+      "dev": true
+    },
+    "p-each-series": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
+      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
+      "dev": true
+    },
+    "p-event": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-event/-/p-event-1.3.0.tgz",
+      "integrity": "sha1-jmtPT2XHK8W2/ii3XtqHT5akoIU=",
       "dev": true,
       "requires": {
-        "hosted-git-info": "^2.6.0",
-        "osenv": "^0.1.5",
-        "semver": "^5.5.0",
-        "validate-npm-package-name": "^3.0.0"
+        "p-timeout": "^1.1.1"
       }
     },
-    "npm-packlist": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
-      "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+    },
+    "p-is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
       "requires": {
-        "ignore-walk": "^3.0.1",
-        "npm-bundled": "^1.0.1"
+        "p-try": "^2.0.0"
       }
     },
-    "npm-pick-manifest": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz",
-      "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
+    "p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
       "dev": true,
       "requires": {
-        "figgy-pudding": "^3.5.1",
-        "npm-package-arg": "^6.0.0",
-        "semver": "^5.4.1"
+        "p-limit": "^2.0.0"
       }
     },
-    "npm-registry-fetch": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz",
-      "integrity": "sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw==",
+    "p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
       "dev": true,
       "requires": {
-        "JSONStream": "^1.3.4",
-        "bluebird": "^3.5.1",
-        "figgy-pudding": "^3.4.1",
-        "lru-cache": "^4.1.3",
-        "make-fetch-happen": "^4.0.1",
-        "npm-package-arg": "^6.1.0"
+        "aggregate-error": "^3.0.0"
       }
     },
-    "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+    "p-retry": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
+      "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
       "dev": true,
       "requires": {
-        "path-key": "^2.0.0"
+        "retry": "^0.12.0"
       }
     },
-    "npmlog": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+    "p-timeout": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz",
+      "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=",
       "dev": true,
-      "optional": true,
       "requires": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
+        "p-finally": "^1.0.0"
       }
     },
-    "num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-      "dev": true
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
-    },
-    "nwsapi": {
+    "p-try": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
-      "dev": true
-    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
     },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    "pac-proxy-agent": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-4.1.0.tgz",
+      "integrity": "sha512-ejNgYm2HTXSIYX9eFlkvqFp8hyJ374uDf0Zq5YUAifiSh1D6fo+iBivQZirGvVv8dCYUsLhmLBRhlAYvBKI5+Q==",
+      "requires": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4",
+        "get-uri": "3",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "5",
+        "pac-resolver": "^4.1.0",
+        "raw-body": "^2.2.0",
+        "socks-proxy-agent": "5"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
+      }
     },
-    "object-component": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
-      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE="
+    "pac-resolver": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-4.2.0.tgz",
+      "integrity": "sha512-rPACZdUyuxT5Io/gFKUeeZFfE5T7ve7cAkE5TUZRRfuKP0u5Hocwe48X7ZEm6mYB+bTB0Qf+xlVlA/RM/i6RCQ==",
+      "requires": {
+        "degenerator": "^2.2.0",
+        "ip": "^1.1.5",
+        "netmask": "^2.0.1"
+      }
     },
-    "object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+    "pacote": {
+      "version": "9.5.5",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.5.tgz",
+      "integrity": "sha512-jAEP+Nqj4kyMWyNpfTU/Whx1jA7jEc5cCOlurm0/0oL+v8TAp1QSsK83N7bYe+2bEdFzMAtPG5TBebjzzGV0cA==",
+      "dev": true,
       "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
+        "bluebird": "^3.5.3",
+        "cacache": "^12.0.2",
+        "figgy-pudding": "^3.5.1",
+        "get-stream": "^4.1.0",
+        "glob": "^7.1.3",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^5.1.1",
+        "make-fetch-happen": "^5.0.0",
+        "minimatch": "^3.0.4",
+        "minipass": "^2.3.5",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "normalize-package-data": "^2.4.0",
+        "npm-package-arg": "^6.1.0",
+        "npm-packlist": "^1.1.12",
+        "npm-pick-manifest": "^2.2.3",
+        "npm-registry-fetch": "^4.0.0",
+        "osenv": "^0.1.5",
+        "promise-inflight": "^1.0.1",
+        "promise-retry": "^1.1.1",
+        "protoduck": "^5.0.1",
+        "rimraf": "^2.6.2",
+        "safe-buffer": "^5.1.2",
+        "semver": "^5.6.0",
+        "ssri": "^6.0.1",
+        "tar": "^4.4.8",
+        "unique-filename": "^1.1.1",
+        "which": "^1.3.1"
       },
       "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+        "fs-minipass": {
+          "version": "1.2.7",
+          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+          "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+          "dev": true,
           "requires": {
-            "is-descriptor": "^0.1.0"
+            "minipass": "^2.6.0"
           }
         },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "dev": true,
           "requires": {
-            "is-buffer": "^1.1.5"
+            "pump": "^3.0.0"
+          }
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "minipass": {
+          "version": "2.9.0",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+          "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
+          }
+        },
+        "minizlib": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+          "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+          "dev": true,
+          "requires": {
+            "minipass": "^2.9.0"
+          }
+        },
+        "npm-pick-manifest": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz",
+          "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "npm-package-arg": "^6.0.0",
+            "semver": "^5.4.1"
+          }
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
+        "tar": {
+          "version": "4.4.13",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
+          "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+          "dev": true,
+          "requires": {
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.8.6",
+            "minizlib": "^1.2.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.3"
+          }
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
           }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
         }
       }
     },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true
+    "pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
     },
-    "object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+    "parallel-transform": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
+      "dev": true,
       "requires": {
-        "isobject": "^3.0.0"
+        "cyclist": "^1.0.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
       }
     },
-    "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+    "parse-asn1": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
       }
     },
-    "object.omit": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+    "parse-glob": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
       "requires": {
-        "for-own": "^0.1.4",
-        "is-extendable": "^0.1.1"
+        "glob-base": "^0.3.0",
+        "is-dotfile": "^1.0.0",
+        "is-extglob": "^1.0.0",
+        "is-glob": "^2.0.0"
       },
       "dependencies": {
-        "for-own": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-          "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
           "requires": {
-            "for-in": "^1.0.1"
+            "is-extglob": "^1.0.0"
           }
         }
       }
     },
-    "object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+    "parse-headers": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.3.tgz",
+      "integrity": "sha512-QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA=="
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
       "requires": {
-        "isobject": "^3.0.1"
+        "error-ex": "^1.2.0"
       }
     },
-    "objectorarray": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.4.tgz",
-      "integrity": "sha512-91k8bjcldstRz1bG6zJo8lWD7c6QXcB4nTDUqiEvIL1xAsLoZlOOZZG+nd6YPz+V7zY1580J4Xxh1vZtyv4i/w=="
+    "parse-node-version": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
+      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA=="
     },
-    "obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+    "parse5": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
       "dev": true
     },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+    "parseqs": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
+      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
       "requires": {
-        "ee-first": "1.1.1"
+        "better-assert": "~1.0.0"
       }
     },
-    "on-headers": {
+    "parseuri": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
+      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
+      "requires": {
+        "better-assert": "~1.0.0"
+      }
+    },
+    "parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
+    },
+    "path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+      "dev": true
+    },
+    "path-dirname": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA="
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
       "dev": true
     },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1"
-      }
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
-    "onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+    },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+    },
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true
+    },
+    "path-webpack": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/path-webpack/-/path-webpack-0.0.3.tgz",
+      "integrity": "sha1-/23sdJ7sWpRgXATV9j/FVgegOhY="
+    },
+    "pbkdf2": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
       "dev": true,
       "requires": {
-        "mimic-fn": "^1.0.0"
-      },
-      "dependencies": {
-        "mimic-fn": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-          "dev": true
-        }
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
       }
     },
-    "open": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-6.0.0.tgz",
-      "integrity": "sha512-/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw==",
-      "dev": true,
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+    },
+    "picomatch": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
+    },
+    "pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "requires": {
-        "is-wsl": "^1.1.0"
+        "pinkie": "^2.0.0"
       }
     },
-    "opn": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
-      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
+    "pirates": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
+      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
       "dev": true,
       "requires": {
-        "is-wsl": "^1.1.0"
+        "node-modules-regexp": "^1.0.0"
       }
     },
-    "optimist": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+    "pkcs7": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/pkcs7/-/pkcs7-1.0.4.tgz",
+      "integrity": "sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==",
       "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
-        }
+        "@babel/runtime": "^7.5.5"
       }
     },
-    "optionator": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+    "pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
       "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.4",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "wordwrap": "~1.0.0"
+        "find-up": "^4.0.0"
       },
       "dependencies": {
-        "wordwrap": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
         }
       }
     },
-    "ordered-read-streams": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
-      "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
-      "requires": {
-        "is-stream": "^1.0.1",
-        "readable-stream": "^2.0.1"
-      }
-    },
-    "original": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
-      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
-      "dev": true,
-      "requires": {
-        "url-parse": "^1.4.3"
-      }
-    },
-    "os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-      "dev": true
-    },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
-    },
-    "os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+    "pkg-up": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
+      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "lcid": "^1.0.0"
+        "find-up": "^3.0.0"
       }
     },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    "pkginfo": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
+      "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE="
     },
-    "osenv": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+    "plist": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz",
+      "integrity": "sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ==",
       "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
+        "base64-js": "^1.5.1",
+        "xmlbuilder": "^9.0.7",
+        "xmldom": "^0.5.0"
+      },
+      "dependencies": {
+        "xmlbuilder": {
+          "version": "9.0.7",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+          "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
+        }
       }
     },
-    "p-cancelable": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
-      "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==",
-      "dev": true
-    },
-    "p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
-      "dev": true
-    },
-    "p-each-series": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz",
-      "integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==",
+    "pn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
+      "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
       "dev": true
     },
-    "p-event": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-event/-/p-event-1.3.0.tgz",
-      "integrity": "sha1-jmtPT2XHK8W2/ii3XtqHT5akoIU=",
+    "portfinder": {
+      "version": "1.0.28",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
+      "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
       "dev": true,
       "requires": {
-        "p-timeout": "^1.1.1"
+        "async": "^2.6.2",
+        "debug": "^3.1.1",
+        "mkdirp": "^0.5.5"
       },
       "dependencies": {
-        "p-timeout": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz",
-          "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=",
+        "async": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+          "dev": true,
+          "requires": {
+            "lodash": "^4.17.14"
+          }
+        },
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
-            "p-finally": "^1.0.0"
+            "ms": "^2.1.1"
           }
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
         }
       }
     },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
-    },
-    "p-is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
-      "dev": true
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
     },
-    "p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+    "postcss": {
+      "version": "7.0.17",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz",
+      "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==",
       "dev": true,
       "requires": {
-        "p-try": "^1.0.0"
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
-    "p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+    "postcss-import": {
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz",
+      "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
       "dev": true,
       "requires": {
-        "p-limit": "^1.1.0"
+        "postcss": "^7.0.1",
+        "postcss-value-parser": "^3.2.3",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
-    "p-map": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
-      "dev": true
-    },
-    "p-timeout": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
-      "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
+    "postcss-load-config": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
+      "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
       "dev": true,
       "requires": {
-        "p-finally": "^1.0.0"
+        "cosmiconfig": "^5.0.0",
+        "import-cwd": "^2.0.0"
       }
     },
-    "p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true
-    },
-    "pac-proxy-agent": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-3.0.1.tgz",
-      "integrity": "sha512-44DUg21G/liUZ48dJpUSjZnFfZro/0K5JTyFYLBcmh9+T6Ooi4/i4efwUiEy0+4oQusCBqWdhv16XohIj1GqnQ==",
+    "postcss-loader": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
+      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+      "dev": true,
       "requires": {
-        "agent-base": "^4.2.0",
-        "debug": "^4.1.1",
-        "get-uri": "^2.0.0",
-        "http-proxy-agent": "^2.1.0",
-        "https-proxy-agent": "^3.0.0",
-        "pac-resolver": "^3.0.0",
-        "raw-body": "^2.2.0",
-        "socks-proxy-agent": "^4.0.1"
+        "loader-utils": "^1.1.0",
+        "postcss": "^7.0.0",
+        "postcss-load-config": "^2.0.0",
+        "schema-utils": "^1.0.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
           }
+        }
+      }
+    },
+    "postcss-value-parser": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
+      "dev": true
+    },
+    "pouchdb": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/pouchdb/-/pouchdb-7.2.2.tgz",
+      "integrity": "sha512-5gf5nw5XH/2H/DJj8b0YkvG9fhA/4Jt6kL0Y8QjtztVjb1y4J19Rg4rG+fUbXu96gsUrlyIvZ3XfM0b4mogGmw==",
+      "requires": {
+        "abort-controller": "3.0.0",
+        "argsarray": "0.0.1",
+        "buffer-from": "1.1.1",
+        "clone-buffer": "1.0.0",
+        "double-ended-queue": "2.1.0-0",
+        "fetch-cookie": "0.10.1",
+        "immediate": "3.3.0",
+        "inherits": "2.0.4",
+        "level": "6.0.1",
+        "level-codec": "9.0.2",
+        "level-write-stream": "1.0.0",
+        "leveldown": "5.6.0",
+        "levelup": "4.4.0",
+        "ltgt": "2.2.1",
+        "node-fetch": "2.6.0",
+        "readable-stream": "1.1.14",
+        "spark-md5": "3.0.1",
+        "through2": "3.0.2",
+        "uuid": "8.1.0",
+        "vuvuzela": "1.0.3"
+      },
+      "dependencies": {
+        "immediate": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
+          "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q=="
         },
-        "https-proxy-agent": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz",
-          "integrity": "sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==",
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
           "requires": {
-            "agent-base": "^4.3.0",
-            "debug": "^3.1.0"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+        },
+        "through2": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+          "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+          "requires": {
+            "inherits": "^2.0.4",
+            "readable-stream": "2 || 3"
           },
           "dependencies": {
-            "agent-base": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-              "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+            "readable-stream": {
+              "version": "3.6.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+              "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
               "requires": {
-                "es6-promisify": "^5.0.0"
+                "inherits": "^2.0.3",
+                "string_decoder": "^1.1.1",
+                "util-deprecate": "^1.0.1"
               }
             },
-            "debug": {
-              "version": "3.2.6",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-              "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+            "string_decoder": {
+              "version": "1.3.0",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+              "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
               "requires": {
-                "ms": "^2.1.1"
+                "safe-buffer": "~5.2.0"
               }
             }
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        "uuid": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz",
+          "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg=="
         }
       }
     },
-    "pac-resolver": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-3.0.0.tgz",
-      "integrity": "sha512-tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA==",
-      "requires": {
-        "co": "^4.6.0",
-        "degenerator": "^1.0.4",
-        "ip": "^1.1.5",
-        "netmask": "^1.0.6",
-        "thunkify": "^2.1.2"
-      }
-    },
-    "pacote": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz",
-      "integrity": "sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==",
-      "dev": true,
+    "pouchdb-abstract-mapreduce": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/pouchdb-abstract-mapreduce/-/pouchdb-abstract-mapreduce-7.2.2.tgz",
+      "integrity": "sha512-7HWN/2yV2JkwMnGnlp84lGvFtnm0Q55NiBUdbBcaT810+clCGKvhssBCrXnmwShD1SXTwT83aszsgiSfW+SnBA==",
       "requires": {
-        "bluebird": "^3.5.3",
-        "cacache": "^11.3.2",
-        "figgy-pudding": "^3.5.1",
-        "get-stream": "^4.1.0",
-        "glob": "^7.1.3",
-        "lru-cache": "^5.1.1",
-        "make-fetch-happen": "^4.0.1",
-        "minimatch": "^3.0.4",
-        "minipass": "^2.3.5",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "normalize-package-data": "^2.4.0",
-        "npm-package-arg": "^6.1.0",
-        "npm-packlist": "^1.1.12",
-        "npm-pick-manifest": "^2.2.3",
-        "npm-registry-fetch": "^3.8.0",
-        "osenv": "^0.1.5",
-        "promise-inflight": "^1.0.1",
-        "promise-retry": "^1.1.1",
-        "protoduck": "^5.0.1",
-        "rimraf": "^2.6.2",
-        "safe-buffer": "^5.1.2",
-        "semver": "^5.6.0",
-        "ssri": "^6.0.1",
-        "tar": "^4.4.8",
-        "unique-filename": "^1.1.1",
-        "which": "^1.3.1"
+        "pouchdb-binary-utils": "7.2.2",
+        "pouchdb-collate": "7.2.2",
+        "pouchdb-collections": "7.2.2",
+        "pouchdb-errors": "7.2.2",
+        "pouchdb-fetch": "7.2.2",
+        "pouchdb-mapreduce-utils": "7.2.2",
+        "pouchdb-md5": "7.2.2",
+        "pouchdb-utils": "7.2.2"
       },
       "dependencies": {
-        "cacache": {
-          "version": "11.3.2",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
-          "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.3",
-            "chownr": "^1.1.1",
-            "figgy-pudding": "^3.5.1",
-            "glob": "^7.1.3",
-            "graceful-fs": "^4.1.15",
-            "lru-cache": "^5.1.1",
-            "mississippi": "^3.0.0",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.2",
-            "ssri": "^6.0.1",
-            "unique-filename": "^1.1.1",
-            "y18n": "^4.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
+        "immediate": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
+          "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q=="
         },
-        "lru-cache": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "dev": true,
-          "requires": {
-            "yallist": "^3.0.2"
-          }
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
         },
-        "mississippi": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-          "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-          "dev": true,
+        "pouchdb-binary-utils": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-binary-utils/-/pouchdb-binary-utils-7.2.2.tgz",
+          "integrity": "sha512-shacxlmyHbUrNfE6FGYpfyAJx7Q0m91lDdEAaPoKZM3SzAmbtB1i+OaDNtYFztXjJl16yeudkDb3xOeokVL3Qw==",
           "requires": {
-            "concat-stream": "^1.5.0",
-            "duplexify": "^3.4.2",
-            "end-of-stream": "^1.1.0",
-            "flush-write-stream": "^1.0.0",
-            "from2": "^2.1.0",
-            "parallel-transform": "^1.1.0",
-            "pump": "^3.0.0",
-            "pumpify": "^1.3.3",
-            "stream-each": "^1.1.0",
-            "through2": "^2.0.0"
+            "buffer-from": "1.1.1"
           }
         },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-          "dev": true,
+        "pouchdb-collections": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-collections/-/pouchdb-collections-7.2.2.tgz",
+          "integrity": "sha512-6O9zyAYlp3UdtfneiMYuOCWdUCQNo2bgdjvNsMSacQX+3g8WvIoFQCYJjZZCpTttQGb+MHeRMr8m2U95lhJTew=="
+        },
+        "pouchdb-errors": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-errors/-/pouchdb-errors-7.2.2.tgz",
+          "integrity": "sha512-6GQsiWc+7uPfgEHeavG+7wuzH3JZW29Dnrvz8eVbDFE50kVFxNDVm3EkYHskvo5isG7/IkOx7PV7RPTA3keG3g==",
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "inherits": "2.0.4"
           }
         },
-        "ssri": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-          "dev": true,
+        "pouchdb-md5": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-md5/-/pouchdb-md5-7.2.2.tgz",
+          "integrity": "sha512-c/RvLp2oSh8PLAWU5vFBnp6ejJABIdKqboZwRRUrWcfGDf+oyX8RgmJFlYlzMMOh4XQLUT1IoaDV8cwlsuryZw==",
           "requires": {
-            "figgy-pudding": "^3.5.1"
+            "pouchdb-binary-utils": "7.2.2",
+            "spark-md5": "3.0.1"
           }
         },
-        "tar": {
-          "version": "4.4.8",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-          "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
-          "dev": true,
+        "pouchdb-utils": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-utils/-/pouchdb-utils-7.2.2.tgz",
+          "integrity": "sha512-XmeM5ioB4KCfyB2MGZXu1Bb2xkElNwF1qG+zVFbQsKQij0zvepdOUfGuWvLRHxTOmt4muIuSOmWZObZa3NOgzQ==",
           "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.3.4",
-            "minizlib": "^1.1.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.2"
+            "argsarray": "0.0.1",
+            "clone-buffer": "1.0.0",
+            "immediate": "3.3.0",
+            "inherits": "2.0.4",
+            "pouchdb-collections": "7.2.2",
+            "pouchdb-errors": "7.2.2",
+            "pouchdb-md5": "7.2.2",
+            "uuid": "8.1.0"
           }
         },
-        "yallist": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true
+        "uuid": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz",
+          "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg=="
         }
       }
     },
-    "pako": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
-      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
-      "dev": true
+    "pouchdb-adapter-cordova-sqlite": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/pouchdb-adapter-cordova-sqlite/-/pouchdb-adapter-cordova-sqlite-2.0.8.tgz",
+      "integrity": "sha512-7mGeloXHtpR0QEe+Q0XCombKx5BPfy+kk3Y9C2uX60WYf6cwygS+LsQWFnSgHJ/3PQCdHCNJ2n4QC4KneyZZXw==",
+      "requires": {
+        "pouchdb-adapter-websql-core": "^7.0.0"
+      }
     },
-    "parallel-transform": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
-      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
-      "dev": true,
+    "pouchdb-adapter-utils": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pouchdb-adapter-utils/-/pouchdb-adapter-utils-7.0.0.tgz",
+      "integrity": "sha512-UWKPC6jkz6mHUzZefrU7P5X8ZGvBC8LSNZ7BIp0hWvJE6c20cnpDwedTVDpZORcCbVJpDmFOHBYnOqEIblPtbA==",
       "requires": {
-        "cyclist": "~0.2.2",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
+        "pouchdb-binary-utils": "7.0.0",
+        "pouchdb-collections": "7.0.0",
+        "pouchdb-errors": "7.0.0",
+        "pouchdb-md5": "7.0.0",
+        "pouchdb-merge": "7.0.0",
+        "pouchdb-utils": "7.0.0"
       }
     },
-    "parse-asn1": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
-      "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
-      "dev": true,
+    "pouchdb-adapter-websql-core": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pouchdb-adapter-websql-core/-/pouchdb-adapter-websql-core-7.0.0.tgz",
+      "integrity": "sha512-NyMaH0bl20SdJdOCzd+fwXo8JZ15a48/MAwMcIbXzsRHE4DjFNlRcWAcjUP6uN4Ezc+Gx+r2tkBBMf71mIz1Aw==",
       "requires": {
-        "asn1.js": "^4.0.0",
-        "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
+        "pouchdb-adapter-utils": "7.0.0",
+        "pouchdb-binary-utils": "7.0.0",
+        "pouchdb-collections": "7.0.0",
+        "pouchdb-errors": "7.0.0",
+        "pouchdb-json": "7.0.0",
+        "pouchdb-merge": "7.0.0",
+        "pouchdb-utils": "7.0.0"
       }
     },
-    "parse-glob": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+    "pouchdb-binary-utils": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pouchdb-binary-utils/-/pouchdb-binary-utils-7.0.0.tgz",
+      "integrity": "sha512-yUktdOPIPvOVouCjJN3uop+bCcpdPwePrLm9eUAZNgEYnUFu0njdx7Q0WRsZ7UJ6l75HinL5ZHk4bnvEt86FLw==",
       "requires": {
-        "glob-base": "^0.3.0",
-        "is-dotfile": "^1.0.0",
-        "is-extglob": "^1.0.0",
-        "is-glob": "^2.0.0"
+        "buffer-from": "1.1.0"
       },
       "dependencies": {
-        "is-extglob": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
-        },
-        "is-glob": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-          "requires": {
-            "is-extglob": "^1.0.0"
-          }
+        "buffer-from": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz",
+          "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ=="
         }
       }
     },
-    "parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "requires": {
-        "error-ex": "^1.2.0"
-      }
-    },
-    "parse-node-version": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA=="
-    },
-    "parse5": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
-      "dev": true
-    },
-    "parseqs": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
-      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
-      "requires": {
-        "better-assert": "~1.0.0"
-      }
-    },
-    "parseuri": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
-      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
-      "requires": {
-        "better-assert": "~1.0.0"
-      }
-    },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
-    },
-    "pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
-    },
-    "path-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
-      "dev": true
-    },
-    "path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA="
-    },
-    "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-    },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-      "dev": true
-    },
-    "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
-    },
-    "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-      "dev": true
-    },
-    "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
-    },
-    "path-type": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-      "dev": true,
-      "requires": {
-        "pify": "^3.0.0"
-      }
-    },
-    "pbkdf2": {
-      "version": "3.0.17",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
-      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
-      "dev": true,
-      "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
-    },
-    "picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-      "dev": true
-    },
-    "pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true
+    "pouchdb-collate": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/pouchdb-collate/-/pouchdb-collate-7.2.2.tgz",
+      "integrity": "sha512-/SMY9GGasslknivWlCVwXMRMnQ8myKHs4WryQ5535nq1Wj/ehpqWloMwxEQGvZE1Sda3LOm7/5HwLTcB8Our+w=="
     },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
+    "pouchdb-collections": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pouchdb-collections/-/pouchdb-collections-7.0.0.tgz",
+      "integrity": "sha512-DaoUr/vU24Q3gM6ghj0va9j/oBanPwkbhkvnqSyC3Dm5dgf5pculNxueLF9PKMo3ycApoWzHMh6N2N8KJbDU2Q=="
     },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+    "pouchdb-errors": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pouchdb-errors/-/pouchdb-errors-7.0.0.tgz",
+      "integrity": "sha512-dTusY8nnTw4HIztCrNl7AoGgwvS1bVf/3/97hDaGc4ytn72V9/4dK8kTqlimi3UpaurohYRnqac0SGXYP8vgXA==",
       "requires": {
-        "pinkie": "^2.0.0"
+        "inherits": "2.0.3"
       }
     },
-    "pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-      "dev": true,
+    "pouchdb-fetch": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/pouchdb-fetch/-/pouchdb-fetch-7.2.2.tgz",
+      "integrity": "sha512-lUHmaG6U3zjdMkh8Vob9GvEiRGwJfXKE02aZfjiVQgew+9SLkuOxNw3y2q4d1B6mBd273y1k2Lm0IAziRNxQnA==",
       "requires": {
-        "node-modules-regexp": "^1.0.0"
+        "abort-controller": "3.0.0",
+        "fetch-cookie": "0.10.1",
+        "node-fetch": "2.6.0"
       }
     },
-    "pkg-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-      "dev": true,
+    "pouchdb-find": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/pouchdb-find/-/pouchdb-find-7.2.2.tgz",
+      "integrity": "sha512-BmFeFVQ0kHmDehvJxNZl9OmIztCjPlZlVSdpijuFbk/Fi1EFPU1BAv3kLC+6DhZuOqU/BCoaUBY9sn66pPY2ag==",
       "requires": {
-        "find-up": "^2.1.0"
+        "pouchdb-abstract-mapreduce": "7.2.2",
+        "pouchdb-collate": "7.2.2",
+        "pouchdb-errors": "7.2.2",
+        "pouchdb-fetch": "7.2.2",
+        "pouchdb-md5": "7.2.2",
+        "pouchdb-selector-core": "7.2.2",
+        "pouchdb-utils": "7.2.2"
+      },
+      "dependencies": {
+        "immediate": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
+          "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q=="
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+        },
+        "pouchdb-binary-utils": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-binary-utils/-/pouchdb-binary-utils-7.2.2.tgz",
+          "integrity": "sha512-shacxlmyHbUrNfE6FGYpfyAJx7Q0m91lDdEAaPoKZM3SzAmbtB1i+OaDNtYFztXjJl16yeudkDb3xOeokVL3Qw==",
+          "requires": {
+            "buffer-from": "1.1.1"
+          }
+        },
+        "pouchdb-collections": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-collections/-/pouchdb-collections-7.2.2.tgz",
+          "integrity": "sha512-6O9zyAYlp3UdtfneiMYuOCWdUCQNo2bgdjvNsMSacQX+3g8WvIoFQCYJjZZCpTttQGb+MHeRMr8m2U95lhJTew=="
+        },
+        "pouchdb-errors": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-errors/-/pouchdb-errors-7.2.2.tgz",
+          "integrity": "sha512-6GQsiWc+7uPfgEHeavG+7wuzH3JZW29Dnrvz8eVbDFE50kVFxNDVm3EkYHskvo5isG7/IkOx7PV7RPTA3keG3g==",
+          "requires": {
+            "inherits": "2.0.4"
+          }
+        },
+        "pouchdb-md5": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-md5/-/pouchdb-md5-7.2.2.tgz",
+          "integrity": "sha512-c/RvLp2oSh8PLAWU5vFBnp6ejJABIdKqboZwRRUrWcfGDf+oyX8RgmJFlYlzMMOh4XQLUT1IoaDV8cwlsuryZw==",
+          "requires": {
+            "pouchdb-binary-utils": "7.2.2",
+            "spark-md5": "3.0.1"
+          }
+        },
+        "pouchdb-utils": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-utils/-/pouchdb-utils-7.2.2.tgz",
+          "integrity": "sha512-XmeM5ioB4KCfyB2MGZXu1Bb2xkElNwF1qG+zVFbQsKQij0zvepdOUfGuWvLRHxTOmt4muIuSOmWZObZa3NOgzQ==",
+          "requires": {
+            "argsarray": "0.0.1",
+            "clone-buffer": "1.0.0",
+            "immediate": "3.3.0",
+            "inherits": "2.0.4",
+            "pouchdb-collections": "7.2.2",
+            "pouchdb-errors": "7.2.2",
+            "pouchdb-md5": "7.2.2",
+            "uuid": "8.1.0"
+          }
+        },
+        "uuid": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz",
+          "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg=="
+        }
       }
     },
-    "pkg-up": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
-      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
-      "dev": true,
+    "pouchdb-json": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pouchdb-json/-/pouchdb-json-7.0.0.tgz",
+      "integrity": "sha512-w0bNRu/7VmmCrFWMYAm62n30wvJJUT2SokyzeTyj3hRohj4GFwTRg1mSZ+iAmxgRKOFE8nzZstLG/WAB4Ymjew==",
       "requires": {
-        "find-up": "^2.1.0"
+        "vuvuzela": "1.0.3"
       }
     },
-    "pkginfo": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
-      "integrity": "sha1-Wyn2qB9wcXFC4J52W76rl7T4HiE="
-    },
-    "plist": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
-      "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
+    "pouchdb-mapreduce-utils": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/pouchdb-mapreduce-utils/-/pouchdb-mapreduce-utils-7.2.2.tgz",
+      "integrity": "sha512-rAllb73hIkU8rU2LJNbzlcj91KuulpwQu804/F6xF3fhZKC/4JQMClahk+N/+VATkpmLxp1zWmvmgdlwVU4HtQ==",
       "requires": {
-        "base64-js": "^1.2.3",
-        "xmlbuilder": "^9.0.7",
-        "xmldom": "0.1.x"
+        "argsarray": "0.0.1",
+        "inherits": "2.0.4",
+        "pouchdb-collections": "7.2.2",
+        "pouchdb-utils": "7.2.2"
+      },
+      "dependencies": {
+        "immediate": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
+          "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q=="
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+        },
+        "pouchdb-binary-utils": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-binary-utils/-/pouchdb-binary-utils-7.2.2.tgz",
+          "integrity": "sha512-shacxlmyHbUrNfE6FGYpfyAJx7Q0m91lDdEAaPoKZM3SzAmbtB1i+OaDNtYFztXjJl16yeudkDb3xOeokVL3Qw==",
+          "requires": {
+            "buffer-from": "1.1.1"
+          }
+        },
+        "pouchdb-collections": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-collections/-/pouchdb-collections-7.2.2.tgz",
+          "integrity": "sha512-6O9zyAYlp3UdtfneiMYuOCWdUCQNo2bgdjvNsMSacQX+3g8WvIoFQCYJjZZCpTttQGb+MHeRMr8m2U95lhJTew=="
+        },
+        "pouchdb-errors": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-errors/-/pouchdb-errors-7.2.2.tgz",
+          "integrity": "sha512-6GQsiWc+7uPfgEHeavG+7wuzH3JZW29Dnrvz8eVbDFE50kVFxNDVm3EkYHskvo5isG7/IkOx7PV7RPTA3keG3g==",
+          "requires": {
+            "inherits": "2.0.4"
+          }
+        },
+        "pouchdb-md5": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-md5/-/pouchdb-md5-7.2.2.tgz",
+          "integrity": "sha512-c/RvLp2oSh8PLAWU5vFBnp6ejJABIdKqboZwRRUrWcfGDf+oyX8RgmJFlYlzMMOh4XQLUT1IoaDV8cwlsuryZw==",
+          "requires": {
+            "pouchdb-binary-utils": "7.2.2",
+            "spark-md5": "3.0.1"
+          }
+        },
+        "pouchdb-utils": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-utils/-/pouchdb-utils-7.2.2.tgz",
+          "integrity": "sha512-XmeM5ioB4KCfyB2MGZXu1Bb2xkElNwF1qG+zVFbQsKQij0zvepdOUfGuWvLRHxTOmt4muIuSOmWZObZa3NOgzQ==",
+          "requires": {
+            "argsarray": "0.0.1",
+            "clone-buffer": "1.0.0",
+            "immediate": "3.3.0",
+            "inherits": "2.0.4",
+            "pouchdb-collections": "7.2.2",
+            "pouchdb-errors": "7.2.2",
+            "pouchdb-md5": "7.2.2",
+            "uuid": "8.1.0"
+          }
+        },
+        "uuid": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz",
+          "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg=="
+        }
       }
     },
-    "pn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
-      "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
-      "dev": true
-    },
-    "portfinder": {
-      "version": "1.0.20",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz",
-      "integrity": "sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==",
-      "dev": true,
+    "pouchdb-md5": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pouchdb-md5/-/pouchdb-md5-7.0.0.tgz",
+      "integrity": "sha512-yaSJKhLA3QlgloKUQeb2hLdT3KmUmPfoYdryfwHZuPTpXIRKTnMQTR9qCIRUszc0ruBpDe53DRslCgNUhAyTNQ==",
       "requires": {
-        "async": "^1.5.2",
-        "debug": "^2.2.0",
-        "mkdirp": "0.5.x"
+        "pouchdb-binary-utils": "7.0.0",
+        "spark-md5": "3.0.0"
       },
       "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
+        "spark-md5": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.0.tgz",
+          "integrity": "sha1-NyIifFTi+vJLHcbZM8wUTm9xv+8="
         }
       }
     },
-    "posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
+    "pouchdb-merge": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pouchdb-merge/-/pouchdb-merge-7.0.0.tgz",
+      "integrity": "sha512-tci5u6NpznQhGcPv4ho1h0miky9rs+ds/T9zQ9meQeDZbUojXNaX1Jxsb0uYEQQ+HMqdcQs3Akdl0/u0mgwPGg=="
     },
-    "postcss": {
-      "version": "7.0.14",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-      "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-      "dev": true,
+    "pouchdb-selector-core": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/pouchdb-selector-core/-/pouchdb-selector-core-7.2.2.tgz",
+      "integrity": "sha512-XYKCNv9oiNmSXV5+CgR9pkEkTFqxQGWplnVhO3W9P154H08lU0ZoNH02+uf+NjZ2kjse7Q1fxV4r401LEcGMMg==",
       "requires": {
-        "chalk": "^2.4.2",
-        "source-map": "^0.6.1",
-        "supports-color": "^6.1.0"
+        "pouchdb-collate": "7.2.2",
+        "pouchdb-utils": "7.2.2"
       },
       "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+        "immediate": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
+          "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q=="
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+        },
+        "pouchdb-binary-utils": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-binary-utils/-/pouchdb-binary-utils-7.2.2.tgz",
+          "integrity": "sha512-shacxlmyHbUrNfE6FGYpfyAJx7Q0m91lDdEAaPoKZM3SzAmbtB1i+OaDNtYFztXjJl16yeudkDb3xOeokVL3Qw==",
+          "requires": {
+            "buffer-from": "1.1.1"
+          }
+        },
+        "pouchdb-collections": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-collections/-/pouchdb-collections-7.2.2.tgz",
+          "integrity": "sha512-6O9zyAYlp3UdtfneiMYuOCWdUCQNo2bgdjvNsMSacQX+3g8WvIoFQCYJjZZCpTttQGb+MHeRMr8m2U95lhJTew=="
+        },
+        "pouchdb-errors": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-errors/-/pouchdb-errors-7.2.2.tgz",
+          "integrity": "sha512-6GQsiWc+7uPfgEHeavG+7wuzH3JZW29Dnrvz8eVbDFE50kVFxNDVm3EkYHskvo5isG7/IkOx7PV7RPTA3keG3g==",
+          "requires": {
+            "inherits": "2.0.4"
+          }
+        },
+        "pouchdb-md5": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-md5/-/pouchdb-md5-7.2.2.tgz",
+          "integrity": "sha512-c/RvLp2oSh8PLAWU5vFBnp6ejJABIdKqboZwRRUrWcfGDf+oyX8RgmJFlYlzMMOh4XQLUT1IoaDV8cwlsuryZw==",
+          "requires": {
+            "pouchdb-binary-utils": "7.2.2",
+            "spark-md5": "3.0.1"
+          }
+        },
+        "pouchdb-utils": {
+          "version": "7.2.2",
+          "resolved": "https://registry.npmjs.org/pouchdb-utils/-/pouchdb-utils-7.2.2.tgz",
+          "integrity": "sha512-XmeM5ioB4KCfyB2MGZXu1Bb2xkElNwF1qG+zVFbQsKQij0zvepdOUfGuWvLRHxTOmt4muIuSOmWZObZa3NOgzQ==",
+          "requires": {
+            "argsarray": "0.0.1",
+            "clone-buffer": "1.0.0",
+            "immediate": "3.3.0",
+            "inherits": "2.0.4",
+            "pouchdb-collections": "7.2.2",
+            "pouchdb-errors": "7.2.2",
+            "pouchdb-md5": "7.2.2",
+            "uuid": "8.1.0"
+          }
+        },
+        "uuid": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz",
+          "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg=="
         }
       }
     },
-    "postcss-import": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz",
-      "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.1",
-        "postcss-value-parser": "^3.2.3",
-        "read-cache": "^1.0.0",
-        "resolve": "^1.1.7"
-      }
-    },
-    "postcss-load-config": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.0.0.tgz",
-      "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "^4.0.0",
-        "import-cwd": "^2.0.0"
-      }
-    },
-    "postcss-loader": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
-      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
-      "dev": true,
+    "pouchdb-utils": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pouchdb-utils/-/pouchdb-utils-7.0.0.tgz",
+      "integrity": "sha512-1bnoX1KdZYHv9wicDIFdO0PLiVIMzNDUBUZ/yOJZ+6LW6niQCB8aCv09ZztmKfSQcU5nnN3fe656tScBgP6dOQ==",
       "requires": {
-        "loader-utils": "^1.1.0",
-        "postcss": "^7.0.0",
-        "postcss-load-config": "^2.0.0",
-        "schema-utils": "^1.0.0"
+        "argsarray": "0.0.1",
+        "clone-buffer": "1.0.0",
+        "immediate": "3.0.6",
+        "inherits": "2.0.3",
+        "pouchdb-collections": "7.0.0",
+        "pouchdb-errors": "7.0.0",
+        "pouchdb-md5": "7.0.0",
+        "uuid": "3.2.1"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
+          "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
+        }
       }
     },
-    "postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-      "dev": true
-    },
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
     },
     "prepend-http": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
-      "dev": true
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
     },
     "preserve": {
       "version": "0.2.0",
@@ -16492,12 +16056,12 @@
       "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks="
     },
     "pretty-format": {
-      "version": "25.4.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.4.0.tgz",
-      "integrity": "sha512-PI/2dpGjXK5HyXexLPZU/jw5T9Q6S1YVXxxVxco+LIqzUFHXIbKZKdUVt7GcX7QUCr31+3fzhi4gN4/wUYPVxQ==",
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz",
+      "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^25.4.0",
+        "@jest/types": "^25.5.0",
         "ansi-regex": "^5.0.0",
         "ansi-styles": "^4.0.0",
         "react-is": "^16.12.0"
@@ -16510,12 +16074,11 @@
           "dev": true
         },
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -16536,22 +16099,15 @@
         }
       }
     },
-    "private": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-      "dev": true
-    },
     "process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
+      "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8="
     },
     "process-nextick-args": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
     "progress": {
       "version": "2.0.3",
@@ -16583,16 +16139,24 @@
       "requires": {
         "err-code": "^1.0.0",
         "retry": "^0.10.0"
+      },
+      "dependencies": {
+        "retry": {
+          "version": "0.10.1",
+          "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
+          "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
+          "dev": true
+        }
       }
     },
     "prompts": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
-      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
+      "integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==",
       "dev": true,
       "requires": {
         "kleur": "^3.0.3",
-        "sisteransi": "^1.0.4"
+        "sisteransi": "^1.0.5"
       }
     },
     "properties-parser": {
@@ -16619,62 +16183,35 @@
       }
     },
     "proxy-addr": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
-      "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "requires": {
-        "forwarded": "~0.1.2",
-        "ipaddr.js": "1.9.0"
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
       }
     },
     "proxy-agent": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.1.1.tgz",
-      "integrity": "sha512-WudaR0eTsDx33O3EJE16PjBRZWcX8GqCEeERw1W3hZJgH/F2a46g7jty6UGty6NeJ4CKQy8ds2CJPMiyeqaTvw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA==",
       "requires": {
-        "agent-base": "^4.2.0",
+        "agent-base": "^6.0.0",
         "debug": "4",
-        "http-proxy-agent": "^2.1.0",
-        "https-proxy-agent": "^3.0.0",
+        "http-proxy-agent": "^4.0.0",
+        "https-proxy-agent": "^5.0.0",
         "lru-cache": "^5.1.1",
-        "pac-proxy-agent": "^3.0.1",
+        "pac-proxy-agent": "^4.1.0",
         "proxy-from-env": "^1.0.0",
-        "socks-proxy-agent": "^4.0.1"
+        "socks-proxy-agent": "^5.0.0"
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "https-proxy-agent": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz",
-          "integrity": "sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "requires": {
-            "agent-base": "^4.3.0",
-            "debug": "^3.1.0"
-          },
-          "dependencies": {
-            "agent-base": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-              "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
-              "requires": {
-                "es6-promisify": "^5.0.0"
-              }
-            },
-            "debug": {
-              "version": "3.2.6",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-              "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-              "requires": {
-                "ms": "^2.1.1"
-              }
-            }
+            "ms": "2.1.2"
           }
         },
         "lru-cache": {
@@ -16705,8 +16242,7 @@
     "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-      "dev": true
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
     },
     "pseudomap": {
       "version": "1.0.2",
@@ -16714,10 +16250,9 @@
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
     },
     "psl": {
-      "version": "1.1.31",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
-      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
-      "dev": true
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
     },
     "public-encrypt": {
       "version": "4.0.3",
@@ -16731,13 +16266,20 @@
         "parse-asn1": "^5.0.0",
         "randombytes": "^2.0.1",
         "safe-buffer": "^5.1.2"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
       }
     },
     "pump": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-      "dev": true,
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
       "requires": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -16752,6 +16294,18 @@
         "duplexify": "^3.6.0",
         "inherits": "^2.0.3",
         "pump": "^2.0.0"
+      },
+      "dependencies": {
+        "pump": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
       }
     },
     "punycode": {
@@ -16760,9 +16314,9 @@
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
     "q": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
-      "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4="
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
     },
     "qjobs": {
       "version": "1.2.0",
@@ -16770,17 +16324,19 @@
       "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg=="
     },
     "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+      "version": "6.10.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
+      "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
     },
     "query-string": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
-      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
+      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
       "dev": true,
       "requires": {
-        "decode-uri-component": "^0.2.0",
         "object-assign": "^4.1.0",
         "strict-uri-encode": "^1.0.0"
       }
@@ -16798,11 +16354,25 @@
       "dev": true
     },
     "querystringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
-      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
       "dev": true
     },
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
+    },
+    "raf": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
+      "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+      "optional": true,
+      "requires": {
+        "performance-now": "^2.1.0"
+      }
+    },
     "randomatic": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
@@ -16845,24 +16415,24 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "raw-body": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
-      "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
       "requires": {
-        "bytes": "3.0.0",
-        "http-errors": "1.6.3",
-        "iconv-lite": "0.4.23",
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       }
     },
     "raw-loader": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz",
-      "integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-3.1.0.tgz",
+      "integrity": "sha512-lzUVMuJ06HF4rYveaz9Tv0WRlUMxJ0Y1hgSkkgg+50iEdaI0TthyEDe08KIHb0XsF6rn8WYTqPCaGTZg3sX+qA==",
       "dev": true,
       "requires": {
         "loader-utils": "^1.1.0",
-        "schema-utils": "^1.0.0"
+        "schema-utils": "^2.0.1"
       }
     },
     "rc": {
@@ -16908,85 +16478,154 @@
         }
       }
     },
+    "read-chunk": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-3.2.0.tgz",
+      "integrity": "sha512-CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ==",
+      "requires": {
+        "pify": "^4.0.1",
+        "with-open-file": "^0.1.6"
+      }
+    },
+    "read-package-json": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz",
+      "integrity": "sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "normalize-package-data": "^2.0.0",
+        "npm-normalize-package-bin": "^1.0.0"
+      }
+    },
+    "read-package-tree": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz",
+      "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==",
+      "dev": true,
+      "requires": {
+        "read-package-json": "^2.0.0",
+        "readdir-scoped-modules": "^1.0.0",
+        "util-promisify": "^2.1.0"
+      }
+    },
     "read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^5.0.0",
+        "type-fest": "^0.6.0"
       },
       "dependencies": {
-        "path-type": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+        "parse-json": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+          "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "@babel/code-frame": "^7.0.0",
+            "error-ex": "^1.3.1",
+            "json-parse-even-better-errors": "^2.3.0",
+            "lines-and-columns": "^1.1.6"
           }
         },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true,
-          "optional": true
+        "type-fest": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+          "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+          "dev": true
         }
       }
     },
     "read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
+        "find-up": "^4.1.0",
+        "read-pkg": "^5.2.0",
+        "type-fest": "^0.8.1"
       },
       "dependencies": {
         "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
           }
         },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "pinkie-promise": "^2.0.0"
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
           }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true
         }
       }
     },
     "readable-stream": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      },
+      "dependencies": {
+        "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=="
+        }
+      }
+    },
+    "readdir-scoped-modules": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz",
+      "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
+      "dev": true,
       "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
+        "debuglog": "^1.0.1",
+        "dezalgo": "^1.0.0",
+        "graceful-fs": "^4.1.2",
+        "once": "^1.3.0"
       }
     },
     "readdirp": {
@@ -17019,15 +16658,12 @@
       "resolved": "https://registry.npmjs.org/recursive-fs/-/recursive-fs-1.1.2.tgz",
       "integrity": "sha512-QPFEt5EwzwlHoqYsZc+NkUSyDTQf1Hvq7c/kpQJHi77OSCAiDXI3wfB0J04ZG+ekGHmv37mdR8MDPEshD3/RlQ=="
     },
-    "redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "dev": true,
-      "optional": true,
+    "recursive-readdir": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
+      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
       "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
+        "minimatch": "3.0.4"
       }
     },
     "reflect-metadata": {
@@ -17036,9 +16672,9 @@
       "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="
     },
     "regenerate": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
-      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
       "dev": true
     },
     "regenerate-unicode-properties": {
@@ -17051,19 +16687,17 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-      "dev": true
+      "version": "0.13.7",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
     },
     "regenerator-transform": {
-      "version": "0.14.4",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz",
-      "integrity": "sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==",
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
+      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
       "dev": true,
       "requires": {
-        "@babel/runtime": "^7.8.4",
-        "private": "^0.1.8"
+        "@babel/runtime": "^7.8.4"
       }
     },
     "regex-cache": {
@@ -17083,27 +16717,40 @@
         "safe-regex": "^1.1.0"
       }
     },
+    "regexp.prototype.flags": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
+      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      }
+    },
     "regexpu-core": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
-      "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
+      "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
       "dev": true,
       "requires": {
-        "regenerate": "^1.2.1",
-        "regjsgen": "^0.2.0",
-        "regjsparser": "^0.1.4"
+        "regenerate": "^1.4.0",
+        "regenerate-unicode-properties": "^8.2.0",
+        "regjsgen": "^0.5.1",
+        "regjsparser": "^0.6.4",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.2.0"
       }
     },
     "regjsgen": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
+      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
       "dev": true
     },
     "regjsparser": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz",
+      "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==",
       "dev": true,
       "requires": {
         "jsesc": "~0.5.0"
@@ -17123,33 +16770,24 @@
       "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
     },
     "repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ=="
     },
     "repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
     },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
-      "requires": {
-        "is-finite": "^1.0.0"
-      }
-    },
     "replace-ext": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
       "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ="
     },
     "request": {
-      "version": "2.88.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
       "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
@@ -17159,7 +16797,7 @@
         "extend": "~3.0.2",
         "forever-agent": "~0.6.1",
         "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
+        "har-validator": "~5.1.3",
         "http-signature": "~1.2.0",
         "is-typedarray": "~1.0.0",
         "isstream": "~0.1.2",
@@ -17169,29 +16807,79 @@
         "performance-now": "^2.1.0",
         "qs": "~6.5.2",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
+        "tough-cookie": "~2.5.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "form-data": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+          "dev": true,
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "qs": {
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+          "dev": true
+        },
+        "tough-cookie": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+          "dev": true,
+          "requires": {
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "^5.0.1"
+          }
+        }
       }
     },
     "request-promise-core": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz",
-      "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
+      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.15"
+        "lodash": "^4.17.19"
       }
     },
     "request-promise-native": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz",
-      "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
+      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
       "dev": true,
       "requires": {
-        "request-promise-core": "1.1.3",
+        "request-promise-core": "1.1.4",
         "stealthy-require": "^1.1.1",
         "tough-cookie": "^2.3.3"
+      },
+      "dependencies": {
+        "tough-cookie": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+          "dev": true,
+          "requires": {
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
+        }
       }
     },
     "require-directory": {
@@ -17200,16 +16888,10 @@
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
       "dev": true
     },
-    "require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true
-    },
     "require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
       "dev": true
     },
     "requires-port": {
@@ -17218,11 +16900,12 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
     },
     "resolve": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.1.tgz",
-      "integrity": "sha512-KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA==",
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
       "dev": true,
       "requires": {
+        "is-core-module": "^2.2.0",
         "path-parse": "^1.0.6"
       }
     },
@@ -17246,23 +16929,25 @@
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
     },
-    "responselike": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
-      "dev": true,
-      "requires": {
-        "lowercase-keys": "^1.0.0"
-      }
-    },
     "restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
       "dev": true,
       "requires": {
-        "onetime": "^2.0.0",
+        "onetime": "^5.1.0",
         "signal-exit": "^3.0.2"
+      },
+      "dependencies": {
+        "onetime": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+          "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+          "dev": true,
+          "requires": {
+            "mimic-fn": "^2.1.0"
+          }
+        }
       }
     },
     "ret": {
@@ -17271,20 +16956,31 @@
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
     },
     "retry": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
-      "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
       "dev": true
     },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
+    },
     "rfdc": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
-      "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
+      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
+    },
+    "rgbcolor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz",
+      "integrity": "sha1-1lBezbMEplldom+ktDMHMGd1lF0=",
+      "optional": true
     },
     "rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
       "requires": {
         "glob": "^7.1.3"
       }
@@ -17306,12 +17002,17 @@
       "dev": true
     },
     "run-async": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-      "dev": true,
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+      "dev": true
+    },
+    "run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "requires": {
-        "is-promise": "^2.1.0"
+        "queue-microtask": "^1.2.2"
       }
     },
     "run-queue": {
@@ -17323,18 +17024,41 @@
         "aproba": "^1.1.1"
       }
     },
+    "rust-result": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rust-result/-/rust-result-1.0.0.tgz",
+      "integrity": "sha1-NMdbLm3Dn+WHXlveyFteD5FTb3I=",
+      "requires": {
+        "individual": "^2.0.0"
+      }
+    },
     "rxjs": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
-      "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "requires": {
         "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
       }
     },
     "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=="
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+    },
+    "safe-json-parse": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-4.0.0.tgz",
+      "integrity": "sha1-fA9XjPzNEtM6ccDgVBPi7KFx6qw=",
+      "requires": {
+        "rust-result": "^1.0.0"
+      }
     },
     "safe-regex": {
       "version": "1.1.0",
@@ -17403,50 +17127,87 @@
             "pump": "^3.0.0"
           }
         },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+        "npm-run-path": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+          "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
           "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "path-key": "^2.0.0"
+          }
+        },
+        "path-key": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+          "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+          "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^1.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+          "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+          "dev": true
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
           }
         }
       }
     },
-    "sass-graph": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
-      "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
+    "sass": {
+      "version": "1.22.9",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.22.9.tgz",
+      "integrity": "sha512-FzU1X2V8DlnqabrL4u7OBwD2vcOzNMongEJEx3xMEhWY/v26FFR3aG0hyeu2T965sfR0E9ufJwmG+Qjz78vFPQ==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "glob": "^7.0.0",
-        "lodash": "^4.0.0",
-        "scss-tokenizer": "^0.2.3",
-        "yargs": "^7.0.0"
+        "chokidar": ">=2.0.0 <4.0.0"
       }
     },
     "sass-loader": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz",
-      "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.2.0.tgz",
+      "integrity": "sha512-h8yUWaWtsbuIiOCgR9fd9c2lRXZ2uG+h8Dzg/AGNj+Hg/3TO8+BBAW9mEP+mh8ei+qBKqSJ0F1FLlYjNBc61OA==",
       "dev": true,
       "requires": {
-        "clone-deep": "^2.0.1",
+        "clone-deep": "^4.0.1",
         "loader-utils": "^1.0.1",
-        "lodash.tail": "^4.1.1",
         "neo-async": "^2.5.0",
-        "pify": "^3.0.0",
+        "pify": "^4.0.1",
         "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "sax": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
-      "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=",
-      "dev": true
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
     "saxes": {
       "version": "3.1.11",
@@ -17462,63 +17223,60 @@
       "from": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-customtabs.git"
     },
     "sb-cordova-plugin-db": {
-      "version": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-db.git#b43b49b4f4ff5b20d560e64dbc38e92db55e99b6",
-      "from": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-db.git"
+      "version": "git+https://github.com/shikshalokam/sb-cordova-plugin-db.git#889084d8e2da8e3a2e31f4c0c9e62f509ce5cd9a",
+      "from": "git+https://github.com/shikshalokam/sb-cordova-plugin-db.git"
+    },
+    "sb-cordova-plugin-sync": {
+      "version": "git+https://github.com/shikshalokam/sb-cordova-plugin-sync.git#5a98ec79a0d06283a3eeac07bed89e020d1d98a1",
+      "from": "git+https://github.com/shikshalokam/sb-cordova-plugin-sync.git#release-3.9.0-ios"
     },
     "sb-cordova-plugin-utility": {
-      "version": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-utility.git#faee7bb6dad0a227f38c02a5d2a8ab65486e57ad",
-      "from": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-utility.git"
+      "version": "git+https://github.com/shikshalokam/sb-cordova-plugin-utility.git#2d191f723fbd695d6e2ca6facdacf27ac360e675",
+      "from": "git+https://github.com/shikshalokam/sb-cordova-plugin-utility.git#release-3.9.0-ios"
     },
-    "schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
+    "sb-svg2pdf": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/sb-svg2pdf/-/sb-svg2pdf-0.0.10.tgz",
+      "integrity": "sha512-8Dy4XDBRfPGMhXLcG3ZuqpTvXZYlC3hv1V/lCg37Ga51yz2asecO41jkcrVathbJ8Lnu1Yo91Wz/IpBfXzA4Ig==",
       "requires": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
+        "tslib": "^1.9.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
       }
     },
-    "scss-tokenizer": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
-      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
+    "sb-tag-manager": {
+      "version": "3.9.19",
+      "resolved": "https://registry.npmjs.org/sb-tag-manager/-/sb-tag-manager-3.9.19.tgz",
+      "integrity": "sha512-0G/gpKcInDNXzTs68jBKIGdj6vZLWZJF1UJtWU8qZiRoIWVOUyUl4RKFuzobix6kvZuHvu2kww/j4IdJ3GYWLw==",
+      "requires": {
+        "inversify": "^5.0.1",
+        "qs": "^6.9.4",
+        "reflect-metadata": "^0.1.13",
+        "whatwg-fetch": "^3.1.0"
+      }
+    },
+    "schema-utils": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "js-base64": "^2.1.8",
-        "source-map": "^0.4.2"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        }
+        "@types/json-schema": "^7.0.5",
+        "ajv": "^6.12.4",
+        "ajv-keywords": "^3.5.2"
       }
     },
     "seek-bzip": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
-      "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz",
+      "integrity": "sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==",
       "requires": {
-        "commander": "~2.8.1"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.8.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
-          "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
-          "requires": {
-            "graceful-readlink": ">= 1.0.0"
-          }
-        }
+        "commander": "^2.8.1"
       }
     },
     "select-hose": {
@@ -17528,18 +17286,36 @@
       "dev": true
     },
     "selfsigned": {
-      "version": "1.10.4",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz",
-      "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==",
+      "version": "1.10.11",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz",
+      "integrity": "sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==",
       "dev": true,
       "requires": {
-        "node-forge": "0.7.5"
+        "node-forge": "^0.10.0"
       }
     },
     "semver": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "requires": {
+        "lru-cache": "^6.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+        }
+      }
     },
     "semver-dsl": {
       "version": "1.0.1",
@@ -17548,6 +17324,14 @@
       "dev": true,
       "requires": {
         "semver": "^5.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "semver-intersect": {
@@ -17557,12 +17341,20 @@
       "dev": true,
       "requires": {
         "semver": "^5.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "send": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
       "requires": {
         "debug": "2.6.9",
         "depd": "~1.1.2",
@@ -17571,26 +17363,34 @@
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.6.2",
-        "mime": "1.4.1",
-        "ms": "2.0.0",
+        "http-errors": "~1.7.2",
+        "mime": "1.6.0",
+        "ms": "2.1.1",
         "on-finished": "~2.3.0",
-        "range-parser": "~1.2.0",
-        "statuses": "~1.4.0"
+        "range-parser": "~1.2.1",
+        "statuses": "~1.5.0"
       },
       "dependencies": {
         "mime": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
         }
       }
     },
     "serialize-javascript": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz",
-      "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==",
-      "dev": true
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.1.0"
+      }
     },
     "serve-index": {
       "version": "1.9.1",
@@ -17605,17 +17405,37 @@
         "http-errors": "~1.6.2",
         "mime-types": "~2.1.17",
         "parseurl": "~1.3.2"
+      },
+      "dependencies": {
+        "http-errors": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "dev": true,
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.0",
+            "statuses": ">= 1.4.0 < 2"
+          }
+        },
+        "setprototypeof": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+          "dev": true
+        }
       }
     },
     "serve-static": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
-      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "parseurl": "~1.3.2",
-        "send": "0.16.2"
+        "parseurl": "~1.3.3",
+        "send": "0.17.1"
       }
     },
     "set-blocking": {
@@ -17657,9 +17477,9 @@
       "dev": true
     },
     "setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
     },
     "sha.js": {
       "version": "2.4.11",
@@ -17672,47 +17492,26 @@
       }
     },
     "shallow-clone": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
-      "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
       "dev": true,
       "requires": {
-        "is-extendable": "^0.1.1",
-        "kind-of": "^5.0.0",
-        "mixin-object": "^2.0.1"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
+        "kind-of": "^6.0.2"
       }
     },
     "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "requires": {
-        "shebang-regex": "^1.0.0"
+        "shebang-regex": "^3.0.0"
       }
     },
     "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
-    },
-    "shelljs": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz",
-      "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.0.0",
-        "interpret": "^1.0.0",
-        "rechoir": "^0.6.2"
-      }
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
     },
     "shellwords": {
       "version": "0.1.1",
@@ -17721,11 +17520,30 @@
       "dev": true,
       "optional": true
     },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
     "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+    },
+    "simple-plist": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/simple-plist/-/simple-plist-1.1.1.tgz",
+      "integrity": "sha512-pKMCVKvZbZTsqYR6RKgLfBHkh2cV89GXcA/0CVPje3sOiNOnXA8+rp/ciAMZ7JRaUdLzlEM6JFfUn+fS6Nt3hg==",
+      "requires": {
+        "bplist-creator": "0.0.8",
+        "bplist-parser": "0.2.0",
+        "plist": "^3.0.1"
+      }
     },
     "sisteransi": {
       "version": "1.0.5",
@@ -17734,21 +17552,20 @@
       "dev": true
     },
     "slash": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-      "dev": true
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
     },
     "slugify": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.3.1.tgz",
-      "integrity": "sha512-6BwyhjF5tG5P8s+0DPNyJmBSBePG6iMyhjvIW5zGdA3tFik9PtK+yNkZgTeiroCRGZYgkHftFA62tGVK1EI9Kw==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.5.3.tgz",
+      "integrity": "sha512-/HkjRdwPY3yHJReXu38NiusZw2+LLE2SrhkWJtmlPDB1fqFSvioYj62NkPcrKiNCgRLeGcGK7QBvr1iQwybeXw==",
       "dev": true
     },
     "smart-buffer": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.2.tgz",
-      "integrity": "sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw=="
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz",
+      "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw=="
     },
     "snapdragon": {
       "version": "0.8.2",
@@ -17947,19 +17764,20 @@
       }
     },
     "sockjs": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
-      "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+      "version": "0.3.20",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz",
+      "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==",
       "dev": true,
       "requires": {
         "faye-websocket": "^0.10.0",
-        "uuid": "^3.0.1"
+        "uuid": "^3.4.0",
+        "websocket-driver": "0.6.5"
       }
     },
     "sockjs-client": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
-      "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
+      "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
       "dev": true,
       "requires": {
         "debug": "^3.2.5",
@@ -17971,78 +17789,297 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
           }
         },
         "faye-websocket": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
-          "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+          "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"
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
           "dev": true
         }
       }
     },
     "socks": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz",
-      "integrity": "sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.1.tgz",
+      "integrity": "sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==",
       "requires": {
         "ip": "^1.1.5",
-        "smart-buffer": "4.0.2"
+        "smart-buffer": "^4.1.0"
       }
     },
     "socks-proxy-agent": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
-      "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==",
       "requires": {
-        "agent-base": "~4.2.1",
-        "socks": "~2.3.2"
+        "agent-base": "^6.0.2",
+        "debug": "4",
+        "socks": "^2.3.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
       }
     },
     "sonarqube-scanner": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/sonarqube-scanner/-/sonarqube-scanner-2.5.0.tgz",
-      "integrity": "sha512-8pDYXZSnCml0MFjBoeMjhAeV+AIS6XqWN0nkwFmwB/Md2WtDQgag4wDIvAnn5fjZzH1k92E2zWZwLi6sb6HveA==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/sonarqube-scanner/-/sonarqube-scanner-2.8.1.tgz",
+      "integrity": "sha512-TPeHnkegi0lbb46Jk6TBqiHz09kco2AUZQLOvLzs0/9pEknQQFwfoaYqSfW7GSOYAn+BBJaD271golJaqVGHyw==",
       "dev": true,
       "requires": {
-        "download": "7.0.0",
+        "download": "^6.2.5",
         "extend": "3.0.2",
-        "fancy-log": "^1.1.0",
+        "fancy-log": "^1.3.3",
         "lodash.get": "^4.4.2",
         "lodash.uniq": "^4.5.0",
-        "mkdirp": "0.5.1",
-        "progress": "^2.0.0",
+        "mkdirp": "^1.0.3",
+        "progress": "^2.0.3",
         "read-pkg": "2.0.0",
-        "slugify": "1.3.1"
+        "slugify": "^1.4.0"
       },
       "dependencies": {
-        "load-json-file": {
+        "caw": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz",
+          "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==",
+          "dev": true,
+          "requires": {
+            "get-proxy": "^2.0.0",
+            "isurl": "^1.0.0-alpha5",
+            "tunnel-agent": "^0.6.0",
+            "url-to-options": "^1.0.1"
+          }
+        },
+        "decompress": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz",
+          "integrity": "sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==",
+          "dev": true,
+          "requires": {
+            "decompress-tar": "^4.0.0",
+            "decompress-tarbz2": "^4.0.0",
+            "decompress-targz": "^4.0.0",
+            "decompress-unzip": "^4.0.1",
+            "graceful-fs": "^4.1.10",
+            "make-dir": "^1.0.0",
+            "pify": "^2.3.0",
+            "strip-dirs": "^2.0.0"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+              "dev": true
+            }
+          }
+        },
+        "decompress-tar": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz",
+          "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==",
+          "dev": true,
+          "requires": {
+            "file-type": "^5.2.0",
+            "is-stream": "^1.1.0",
+            "tar-stream": "^1.5.2"
+          }
+        },
+        "decompress-tarbz2": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz",
+          "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==",
+          "dev": true,
+          "requires": {
+            "decompress-tar": "^4.1.0",
+            "file-type": "^6.1.0",
+            "is-stream": "^1.1.0",
+            "seek-bzip": "^1.0.5",
+            "unbzip2-stream": "^1.0.9"
+          },
+          "dependencies": {
+            "file-type": {
+              "version": "6.2.0",
+              "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz",
+              "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==",
+              "dev": true
+            }
+          }
+        },
+        "decompress-targz": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz",
+          "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==",
+          "dev": true,
+          "requires": {
+            "decompress-tar": "^4.1.1",
+            "file-type": "^5.2.0",
+            "is-stream": "^1.1.0"
+          }
+        },
+        "decompress-unzip": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz",
+          "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=",
+          "dev": true,
+          "requires": {
+            "file-type": "^3.8.0",
+            "get-stream": "^2.2.0",
+            "pify": "^2.3.0",
+            "yauzl": "^2.4.2"
+          },
+          "dependencies": {
+            "file-type": {
+              "version": "3.9.0",
+              "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+              "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
+              "dev": true
+            },
+            "get-stream": {
+              "version": "2.3.1",
+              "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
+              "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
+              "dev": true,
+              "requires": {
+                "object-assign": "^4.0.1",
+                "pinkie-promise": "^2.0.0"
+              }
+            },
+            "pify": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+              "dev": true
+            }
+          }
+        },
+        "download": {
+          "version": "6.2.5",
+          "resolved": "https://registry.npmjs.org/download/-/download-6.2.5.tgz",
+          "integrity": "sha512-DpO9K1sXAST8Cpzb7kmEhogJxymyVUd5qz/vCOSyvwtp2Klj2XcDt5YUuasgxka44SxF0q5RriKIwJmQHG2AuA==",
+          "dev": true,
+          "requires": {
+            "caw": "^2.0.0",
+            "content-disposition": "^0.5.2",
+            "decompress": "^4.0.0",
+            "ext-name": "^5.0.0",
+            "file-type": "5.2.0",
+            "filenamify": "^2.0.0",
+            "get-stream": "^3.0.0",
+            "got": "^7.0.0",
+            "make-dir": "^1.0.0",
+            "p-event": "^1.0.0",
+            "pify": "^3.0.0"
+          }
+        },
+        "file-type": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
+          "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
+          "dev": true
+        },
+        "filename-reserved-regex": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
+          "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=",
+          "dev": true
+        },
+        "filenamify": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz",
+          "integrity": "sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "strip-bom": "^3.0.0"
+            "filename-reserved-regex": "^2.0.0",
+            "strip-outer": "^1.0.0",
+            "trim-repeated": "^1.0.0"
+          }
+        },
+        "get-proxy": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz",
+          "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==",
+          "dev": true,
+          "requires": {
+            "npm-conf": "^1.1.0"
+          }
+        },
+        "get-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+          "dev": true
+        },
+        "got": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
+          "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
+          "dev": true,
+          "requires": {
+            "decompress-response": "^3.2.0",
+            "duplexer3": "^0.1.4",
+            "get-stream": "^3.0.0",
+            "is-plain-obj": "^1.1.0",
+            "is-retry-allowed": "^1.0.0",
+            "is-stream": "^1.0.0",
+            "isurl": "^1.0.0-alpha5",
+            "lowercase-keys": "^1.0.0",
+            "p-cancelable": "^0.3.0",
+            "p-timeout": "^1.1.1",
+            "safe-buffer": "^5.0.1",
+            "timed-out": "^4.0.0",
+            "url-parse-lax": "^1.0.0",
+            "url-to-options": "^1.0.1"
+          }
+        },
+        "is-natural-number": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
+          "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=",
+          "dev": true
+        },
+        "make-dir": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+          "dev": true,
+          "requires": {
+            "pify": "^3.0.0"
           }
         },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
         "path-type": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
@@ -18050,12 +18087,20 @@
           "dev": true,
           "requires": {
             "pify": "^2.0.0"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+              "dev": true
+            }
           }
         },
         "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
           "dev": true
         },
         "read-pkg": {
@@ -18069,11 +18114,29 @@
             "path-type": "^2.0.0"
           }
         },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+        "strip-dirs": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz",
+          "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==",
+          "dev": true,
+          "requires": {
+            "is-natural-number": "^4.0.1"
+          }
+        },
+        "timed-out": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+          "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
           "dev": true
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+          "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "^5.0.1"
+          }
         }
       }
     },
@@ -18102,10 +18165,9 @@
       "dev": true
     },
     "source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
     },
     "source-map-loader": {
       "version": "0.2.4",
@@ -18115,14 +18177,25 @@
       "requires": {
         "async": "^2.5.0",
         "loader-utils": "^1.1.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+          "dev": true,
+          "requires": {
+            "lodash": "^4.17.14"
+          }
+        }
       }
     },
     "source-map-resolve": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
       "requires": {
-        "atob": "^2.1.1",
+        "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0",
         "resolve-url": "^0.2.1",
         "source-map-url": "^0.4.0",
@@ -18130,43 +18203,39 @@
       }
     },
     "source-map-support": {
-      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
-      "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==",
-      "dev": true,
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
       }
     },
     "source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="
     },
     "sourcemap-codec": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz",
-      "integrity": "sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==",
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
       "dev": true
     },
+    "spark-md5": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.1.tgz",
+      "integrity": "sha512-0tF3AGSD1ppQeuffsLDIOWlKUd3lS92tFxcsrh5Pe3ZphhnoK+oXIBTzOAThZCiuINZLvpiLH/1VS1/ANEJVig=="
+    },
     "sparkles": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
       "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw=="
     },
     "spdx-correct": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
       "dev": true,
       "requires": {
         "spdx-expression-parse": "^3.0.0",
@@ -18174,15 +18243,15 @@
       }
     },
     "spdx-exceptions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
       "dev": true
     },
     "spdx-expression-parse": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
       "dev": true,
       "requires": {
         "spdx-exceptions": "^2.1.0",
@@ -18190,15 +18259,15 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
-      "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==",
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz",
+      "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==",
       "dev": true
     },
     "spdy": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
-      "integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
       "dev": true,
       "requires": {
         "debug": "^4.1.0",
@@ -18209,18 +18278,18 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
@@ -18240,24 +18309,24 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
         "readable-stream": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz",
-          "integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==",
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
           "dev": true,
           "requires": {
             "inherits": "^2.0.3",
@@ -18274,6 +18343,37 @@
       "dev": true,
       "requires": {
         "chalk": "^2.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "split-string": {
@@ -18308,12 +18408,12 @@
       }
     },
     "ssri": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
-      "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.1.1"
+        "figgy-pudding": "^3.5.1"
       }
     },
     "stack-trace": {
@@ -18322,10 +18422,27 @@
       "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA="
     },
     "stack-utils": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
-      "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==",
-      "dev": true
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.5.tgz",
+      "integrity": "sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "dependencies": {
+        "escape-string-regexp": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+          "dev": true
+        }
+      }
+    },
+    "stackblur-canvas": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.5.0.tgz",
+      "integrity": "sha512-EeNzTVfj+1In7aSLPKDD03F/ly4RxEuF/EX0YcOG0cKoPXs+SLZxDawQbexQDBzwROs4VKLWTOaZQlZkGBFEIQ==",
+      "optional": true
     },
     "stat-mode": {
       "version": "0.2.2",
@@ -18351,29 +18468,10 @@
         }
       }
     },
-    "stats-webpack-plugin": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz",
-      "integrity": "sha512-NT0YGhwuQ0EOX+uPhhUcI6/+1Sq/pMzNuSCBVT4GbFl/ac6I/JZefBcjlECNfAb1t3GOx5dEj1Z7x0cAxeeVLQ==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.4"
-      }
-    },
     "statuses": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
-    },
-    "stdout-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
-      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "readable-stream": "^2.0.1"
-      }
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
     },
     "stealthy-require": {
       "version": "1.1.1",
@@ -18391,6 +18489,11 @@
         "readable-stream": "^2.0.2"
       }
     },
+    "stream-buffers": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz",
+      "integrity": "sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ="
+    },
     "stream-combiner2": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
@@ -18424,9 +18527,9 @@
       }
     },
     "stream-shift": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="
     },
     "streamroller": {
       "version": "0.7.0",
@@ -18440,17 +18543,17 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "requires": {
             "ms": "^2.1.1"
           }
         },
         "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
         }
       }
     },
@@ -18488,14 +18591,31 @@
       }
     },
     "string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
       "dev": true,
       "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
+        "emoji-regex": "^7.0.1",
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^5.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
       }
     },
     "string.prototype.codepointat": {
@@ -18503,12 +18623,39 @@
       "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz",
       "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="
     },
+    "string.prototype.trimend": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      }
+    },
     "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==",
       "requires": {
         "safe-buffer": "~5.1.0"
+      },
+      "dependencies": {
+        "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=="
+        }
       }
     },
     "strip-ansi": {
@@ -18537,12 +18684,16 @@
       }
     },
     "strip-dirs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz",
-      "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==",
-      "dev": true,
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz",
+      "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=",
       "requires": {
-        "is-natural-number": "^4.0.1"
+        "chalk": "^1.0.0",
+        "get-stdin": "^4.0.1",
+        "is-absolute": "^0.1.5",
+        "is-natural-number": "^2.0.0",
+        "minimist": "^1.1.0",
+        "sum-up": "^1.0.1"
       }
     },
     "strip-eof": {
@@ -18554,18 +18705,7 @@
     "strip-final-newline": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true
-    },
-    "strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "get-stdin": "^4.0.1"
-      }
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
     },
     "strip-json-comments": {
       "version": "2.0.1",
@@ -18581,13 +18721,13 @@
       }
     },
     "style-loader": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz",
-      "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.0.0.tgz",
+      "integrity": "sha512-B0dOCFwv7/eY31a5PCieNwMgMhVGFe9w+rh7s/Bx8kfFkrth9zfTZquoYvdw8URgiqxObQKcpW51Ugz1HjfdZw==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^1.0.0"
+        "loader-utils": "^1.2.3",
+        "schema-utils": "^2.0.1"
       }
     },
     "stylus": {
@@ -18618,6 +18758,12 @@
             "path-is-absolute": "^1.0.0"
           }
         },
+        "sax": {
+          "version": "0.5.8",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
+          "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=",
+          "dev": true
+        },
         "source-map": {
           "version": "0.1.43",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
@@ -18646,83 +18792,39 @@
       "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=",
       "requires": {
         "chalk": "^1.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-        }
       }
     },
     "superagent": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-5.2.2.tgz",
-      "integrity": "sha512-pMWBUnIllK4ZTw7p/UaobiQPwAO5w/1NRRTDpV0FTVNmECztsxKspj3ZWEordVEaqpZtmOQJJna4yTLyC/q7PQ==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-5.3.1.tgz",
+      "integrity": "sha512-wjJ/MoTid2/RuGCOFtlacyGNxN9QLMgcpYLDQlWFIhhdJ93kNscFonGvrpAHSCVjRVj++DGCglocF7Aej1KHvQ==",
       "requires": {
         "component-emitter": "^1.3.0",
         "cookiejar": "^2.1.2",
         "debug": "^4.1.1",
         "fast-safe-stringify": "^2.0.7",
         "form-data": "^3.0.0",
-        "formidable": "^1.2.1",
+        "formidable": "^1.2.2",
         "methods": "^1.1.2",
-        "mime": "^2.4.4",
-        "qs": "^6.9.1",
-        "readable-stream": "^3.4.0",
-        "semver": "^6.3.0"
+        "mime": "^2.4.6",
+        "qs": "^6.9.4",
+        "readable-stream": "^3.6.0",
+        "semver": "^7.3.2"
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "form-data": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
-          "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.8",
-            "mime-types": "^2.1.12"
+            "ms": "2.1.2"
           }
         },
-        "mime": {
-          "version": "2.4.4",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-          "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         },
-        "qs": {
-          "version": "6.9.3",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz",
-          "integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw=="
-        },
         "readable-stream": {
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -18732,51 +18834,42 @@
             "string_decoder": "^1.1.1",
             "util-deprecate": "^1.0.1"
           }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
         }
       }
     },
     "superagent-proxy": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.0.0.tgz",
-      "integrity": "sha512-TktJma5jPdiH1BNN+reF/RMW3b8aBTCV7KlLFV0uYcREgNf3pvo7Rdt564OcFHwkGb3mYEhHuWPBhSbOwiNaYw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.1.0.tgz",
+      "integrity": "sha512-DnarpKN6Xn8e3pYlFV4Yvsj9yxLY4q5FIsUe5JvN7vjzP+YCfzXv03dTkZSD2yzrSadsNYHf0IgOUJwKjX457A==",
       "requires": {
         "debug": "^3.1.0",
-        "proxy-agent": "3"
+        "proxy-agent": "^4.0.0"
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "requires": {
             "ms": "^2.1.1"
           }
         },
         "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
         }
       }
     },
     "supports-color": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
     },
     "supports-hyperlinks": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz",
-      "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
       "dev": true,
       "requires": {
         "has-flag": "^4.0.0",
@@ -18790,9 +18883,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -18800,6 +18893,12 @@
         }
       }
     },
+    "svg-pathdata": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-5.0.5.tgz",
+      "integrity": "sha512-TAAvLNSE3fEhyl/Da19JWfMAdhSXTYeviXsLSoDT1UM76ADj5ndwAPX1FKQEgB/gFMPavOy6tOqfalXKUiXrow==",
+      "optional": true
+    },
     "symbol-observable": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
@@ -18819,15 +18918,37 @@
       "dev": true
     },
     "tar": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
-      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
+      "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "block-stream": "*",
-        "fstream": "^1.0.12",
-        "inherits": "2"
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^3.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "chownr": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+          "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
       }
     },
     "tar-stream": {
@@ -18852,217 +18973,167 @@
       "requires": {
         "ansi-escapes": "^4.2.1",
         "supports-hyperlinks": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-escapes": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-          "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.11.0"
-          }
-        },
-        "type-fest": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-          "dev": true
-        }
       }
     },
     "terser": {
-      "version": "3.17.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
-      "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.3.tgz",
+      "integrity": "sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==",
       "dev": true,
       "requires": {
-        "commander": "^2.19.0",
+        "commander": "^2.20.0",
         "source-map": "~0.6.1",
-        "source-map-support": "~0.5.10"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "source-map-support": "~0.5.12"
       }
     },
     "terser-webpack-plugin": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz",
-      "integrity": "sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.3.tgz",
+      "integrity": "sha512-bZFnotuIKq5Rqzrs+qIwFzGdKdffV9epG5vDSEbYzvKAhPeR5RbbrQysfPgbIIMhNAQtZD2hGwBfSKUXjXZZZw==",
       "dev": true,
       "requires": {
-        "cacache": "^11.0.2",
-        "find-cache-dir": "^2.0.0",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^1.4.0",
+        "cacache": "^15.0.4",
+        "find-cache-dir": "^3.3.1",
+        "jest-worker": "^26.0.0",
+        "p-limit": "^2.3.0",
+        "schema-utils": "^2.6.6",
+        "serialize-javascript": "^3.1.0",
         "source-map": "^0.6.1",
-        "terser": "^3.16.1",
-        "webpack-sources": "^1.1.0",
-        "worker-farm": "^1.5.2"
+        "terser": "^4.6.13",
+        "webpack-sources": "^1.4.3"
       },
       "dependencies": {
         "cacache": {
-          "version": "11.3.2",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
-          "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.3",
-            "chownr": "^1.1.1",
-            "figgy-pudding": "^3.5.1",
-            "glob": "^7.1.3",
-            "graceful-fs": "^4.1.15",
-            "lru-cache": "^5.1.1",
-            "mississippi": "^3.0.0",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
+          "version": "15.2.0",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.2.0.tgz",
+          "integrity": "sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==",
+          "dev": true,
+          "requires": {
+            "@npmcli/move-file": "^1.0.1",
+            "chownr": "^2.0.0",
+            "fs-minipass": "^2.0.0",
+            "glob": "^7.1.4",
+            "infer-owner": "^1.0.4",
+            "lru-cache": "^6.0.0",
+            "minipass": "^3.1.1",
+            "minipass-collect": "^1.0.2",
+            "minipass-flush": "^1.0.5",
+            "minipass-pipeline": "^1.2.2",
+            "mkdirp": "^1.0.3",
+            "p-map": "^4.0.0",
             "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.2",
-            "ssri": "^6.0.1",
-            "unique-filename": "^1.1.1",
-            "y18n": "^4.0.0"
+            "rimraf": "^3.0.2",
+            "ssri": "^8.0.1",
+            "tar": "^6.0.2",
+            "unique-filename": "^1.1.1"
           }
         },
+        "chownr": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+          "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+          "dev": true
+        },
         "find-cache-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+          "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
           "dev": true,
           "requires": {
             "commondir": "^1.0.1",
-            "make-dir": "^2.0.0",
-            "pkg-dir": "^3.0.0"
-          }
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "lru-cache": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "dev": true,
-          "requires": {
-            "yallist": "^3.0.2"
-          }
-        },
-        "make-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-          "dev": true,
-          "requires": {
-            "pify": "^4.0.1",
-            "semver": "^5.6.0"
+            "make-dir": "^3.0.2",
+            "pkg-dir": "^4.1.0"
           }
         },
-        "mississippi": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-          "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-          "dev": true,
-          "requires": {
-            "concat-stream": "^1.5.0",
-            "duplexify": "^3.4.2",
-            "end-of-stream": "^1.1.0",
-            "flush-write-stream": "^1.0.0",
-            "from2": "^2.1.0",
-            "parallel-transform": "^1.1.0",
-            "pump": "^3.0.0",
-            "pumpify": "^1.3.3",
-            "stream-each": "^1.1.0",
-            "through2": "^2.0.0"
-          }
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
         },
-        "p-limit": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
-          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+        "jest-worker": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+          "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
           }
         },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "yallist": "^4.0.0"
           }
         },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+        "merge-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+          "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
           "dev": true
         },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
           "dev": true
         },
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
           "dev": true,
           "requires": {
-            "find-up": "^3.0.0"
+            "glob": "^7.1.3"
           }
         },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+        "serialize-javascript": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
+          "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
           "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "randombytes": "^2.1.0"
           }
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
         "ssri": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+          "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
+          "dev": true,
+          "requires": {
+            "minipass": "^3.1.1"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "terser": {
+          "version": "4.8.0",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
+          "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
           "dev": true,
           "requires": {
-            "figgy-pudding": "^3.5.1"
+            "commander": "^2.20.0",
+            "source-map": "~0.6.1",
+            "source-map-support": "~0.5.12"
           }
         },
         "yallist": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
           "dev": true
         }
       }
@@ -19076,22 +19147,6 @@
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
         "minimatch": "^3.0.4"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
       }
     },
     "throat": {
@@ -19107,12 +19162,35 @@
       "dev": true
     },
     "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+      "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
       "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
+        "readable-stream": ">=1.0.33-1 <1.1.0-0",
+        "xtend": ">=4.0.0 <4.1.0-0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+        }
       }
     },
     "through2-filter": {
@@ -19122,17 +19200,23 @@
       "requires": {
         "through2": "~2.0.0",
         "xtend": "~4.0.0"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        }
       }
     },
-    "thunkify": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz",
-      "integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0="
-    },
     "thunky": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
-      "integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
       "dev": true
     },
     "time-stamp": {
@@ -19141,15 +19225,14 @@
       "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM="
     },
     "timed-out": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
-      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
-      "dev": true
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
+      "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc="
     },
     "timers-browserify": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
-      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
       "dev": true,
       "requires": {
         "setimmediate": "^1.0.4"
@@ -19204,9 +19287,9 @@
       "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="
     },
     "to-fast-properties": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
       "dev": true
     },
     "to-object-path": {
@@ -19247,6 +19330,11 @@
         "repeat-string": "^1.6.1"
       }
     },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
+    },
     "topo": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/topo/-/topo-3.0.3.tgz",
@@ -19263,20 +19351,19 @@
       }
     },
     "tough-cookie": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-      "dev": true,
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
       "requires": {
-        "psl": "^1.1.24",
-        "punycode": "^1.4.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.1.2"
       },
       "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
+        "universalify": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
         }
       }
     },
@@ -19290,18 +19377,11 @@
       }
     },
     "tree-kill": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
-      "integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
       "dev": true
     },
-    "trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "dev": true,
-      "optional": true
-    },
     "trim-repeated": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
@@ -19310,47 +19390,22 @@
         "escape-string-regexp": "^1.0.2"
       }
     },
-    "trim-right": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-      "dev": true
-    },
-    "true-case-path": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
-      "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "glob": "^7.1.2"
-      }
-    },
     "ts-node": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.4.1.tgz",
-      "integrity": "sha512-5LpRN+mTiCs7lI5EtbXmF/HfMeCjzt7DH9CZwtkr6SywStrNQC723wG+aOWFiLNn7zT3kD/RnFqi3ZUfr4l5Qw==",
-      "dev": true,
+      "version": "8.10.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz",
+      "integrity": "sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==",
       "requires": {
         "arg": "^4.1.0",
         "diff": "^4.0.1",
         "make-error": "^1.1.1",
-        "source-map-support": "^0.5.6",
-        "yn": "^3.0.0"
-      },
-      "dependencies": {
-        "diff": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
-          "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
-          "dev": true
-        }
+        "source-map-support": "^0.5.17",
+        "yn": "3.1.1"
       }
     },
     "tslib": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
     },
     "tslint": {
       "version": "5.16.0",
@@ -19371,8 +19426,62 @@
         "semver": "^5.3.0",
         "tslib": "^1.8.0",
         "tsutils": "^2.29.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "diff": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+          "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        }
       }
     },
+    "tsml": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tsml/-/tsml-1.0.1.tgz",
+      "integrity": "sha1-ifghi52eJX9H1/a1bQHFpNLGj8M="
+    },
     "tsutils": {
       "version": "2.29.0",
       "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
@@ -19380,6 +19489,14 @@
       "dev": true,
       "requires": {
         "tslib": "^1.8.1"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        }
       }
     },
     "tty-browserify": {
@@ -19389,13 +19506,9 @@
       "dev": true
     },
     "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+      "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
     },
     "tweetnacl": {
       "version": "0.14.5",
@@ -19403,6 +19516,11 @@
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
       "dev": true
     },
+    "type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
+    },
     "type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -19418,9 +19536,9 @@
       "dev": true
     },
     "type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true
     },
     "type-is": {
@@ -19447,9 +19565,9 @@
       }
     },
     "typescript": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.6.tgz",
-      "integrity": "sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==",
+      "version": "3.4.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.5.tgz",
+      "integrity": "sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==",
       "dev": true
     },
     "typescript-collections": {
@@ -19462,32 +19580,32 @@
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
       "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
     },
+    "unbox-primitive": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
+      }
+    },
     "unbzip2-stream": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz",
-      "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
       "dev": true,
       "requires": {
         "buffer": "^5.2.1",
         "through": "^2.3.8"
-      },
-      "dependencies": {
-        "buffer": {
-          "version": "5.4.3",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.3.tgz",
-          "integrity": "sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==",
-          "dev": true,
-          "requires": {
-            "base64-js": "^1.0.2",
-            "ieee754": "^1.1.4"
-          }
-        }
       }
     },
     "underscore": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
-      "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
+      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
     },
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
@@ -19538,9 +19656,9 @@
       }
     },
     "unique-slug": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
-      "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
       "dev": true,
       "requires": {
         "imurmurhash": "^0.1.4"
@@ -19555,6 +19673,15 @@
         "through2-filter": "^3.0.0"
       },
       "dependencies": {
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        },
         "through2-filter": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
@@ -19566,10 +19693,38 @@
         }
       }
     },
+    "universal-analytics": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.23.tgz",
+      "integrity": "sha512-lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.1",
+        "request": "^2.88.2",
+        "uuid": "^3.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
+      }
+    },
     "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
     },
     "unpipe": {
       "version": "1.0.0",
@@ -19618,14 +19773,14 @@
       "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4="
     },
     "upath": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
-      "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
     },
     "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -19654,9 +19809,9 @@
       }
     },
     "url-parse": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
+      "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
       "dev": true,
       "requires": {
         "querystringify": "^2.1.1",
@@ -19664,12 +19819,11 @@
       }
     },
     "url-parse-lax": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
-      "dev": true,
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
       "requires": {
-        "prepend-http": "^2.0.0"
+        "prepend-http": "^1.0.1"
       }
     },
     "url-to-options": {
@@ -19678,6 +19832,11 @@
       "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
       "dev": true
     },
+    "url-toolkit": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.2.tgz",
+      "integrity": "sha512-l25w6Sy+Iy3/IbogunxhWwljPaDnqpiKvrQRoLBm6DfISco7NyRIS7Zf6+Oxhy1T8kHxWdwLND7ZZba6NjXMug=="
+    },
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -19706,26 +19865,42 @@
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
+    "util-promisify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz",
+      "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=",
+      "dev": true,
+      "requires": {
+        "object.getownpropertydescriptors": "^2.0.3"
+      }
+    },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
     "uuid": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
-      "dev": true
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
     },
     "v8-to-istanbul": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-4.1.3.tgz",
-      "integrity": "sha512-sAjOC+Kki6aJVbUOXJbcR0MnbfjvBzwKZazEJymA2IX49uoOdEdk+4fBq5cXgYgiyKtAyrrJNtBZdOeDIF+Fng==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz",
+      "integrity": "sha512-Rw6vJHj1mbdK8edjR7+zuJrpDtKIgNdAvTSAcpYfgMIw+u2dPDntD3dgN4XQFLU2/fvFQdzj+EeSGfd/jnY5fQ==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.1",
         "convert-source-map": "^1.6.0",
         "source-map": "^0.7.3"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "dev": true
+        }
       }
     },
     "vali-date": {
@@ -19768,6 +19943,35 @@
         "extsprintf": "^1.2.0"
       }
     },
+    "video.js": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.5.5.tgz",
+      "integrity": "sha512-25eZciVCBJrJe0lhr5hUT9fQfGSBIBek9FoFfFgJEyXDmPwRMR3NCxYarW+qpPAC1Re8V6MSgaCg1oIbZdqBpA==",
+      "requires": {
+        "@babel/runtime": "^7.2.0",
+        "@videojs/http-streaming": "1.9.3",
+        "global": "4.3.2",
+        "keycode": "^2.2.0",
+        "safe-json-parse": "4.0.0",
+        "tsml": "1.0.1",
+        "videojs-font": "3.1.0",
+        "videojs-vtt.js": "0.14.1",
+        "xhr": "2.4.0"
+      }
+    },
+    "videojs-font": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-3.1.0.tgz",
+      "integrity": "sha512-rxB68SVgbHD+kSwoNWNCHicKJuR2ga3bGfvGxmB+8fupsiLbnyCwTBVtrZUq4bZnD64mrKP1DxHiutxwrs59pQ=="
+    },
+    "videojs-vtt.js": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.14.1.tgz",
+      "integrity": "sha512-YxOiywx6N9t3J5nqsE5WN2Sw4CSqVe3zV+AZm2T4syOc2buNJaD6ZoexSdeszx2sHLU/RRo2r4BJAXFDQ7Qo2Q==",
+      "requires": {
+        "global": "^4.3.1"
+      }
+    },
     "vinyl": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
@@ -19776,13 +19980,6 @@
         "clone": "^1.0.0",
         "clone-stats": "^0.0.1",
         "replace-ext": "0.0.1"
-      },
-      "dependencies": {
-        "clone": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-          "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
-        }
       }
     },
     "vinyl-assign": {
@@ -19818,30 +20015,33 @@
         "vinyl": "^1.0.0"
       },
       "dependencies": {
-        "merge-stream": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
-          "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
           "requires": {
-            "readable-stream": "^2.0.1"
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
           }
         }
       }
     },
     "vm-browserify": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-      "dev": true,
-      "requires": {
-        "indexof": "0.0.1"
-      }
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+      "dev": true
     },
     "void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
       "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w="
     },
+    "vuvuzela": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/vuvuzela/-/vuvuzela-1.0.3.tgz",
+      "integrity": "sha1-O+FF5YJxxzylUnndhR8SpoIRSws="
+    },
     "w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
@@ -19880,421 +20080,379 @@
       }
     },
     "watchpack": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
+      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
       "dev": true,
       "requires": {
-        "chokidar": "^2.0.2",
+        "chokidar": "^3.4.1",
         "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
-      }
-    },
-    "wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dev": true,
-      "requires": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
-      "dev": true
-    },
-    "webpack": {
-      "version": "4.29.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.0.tgz",
-      "integrity": "sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.7.11",
-        "@webassemblyjs/helper-module-context": "1.7.11",
-        "@webassemblyjs/wasm-edit": "1.7.11",
-        "@webassemblyjs/wasm-parser": "1.7.11",
-        "acorn": "^6.0.5",
-        "acorn-dynamic-import": "^4.0.0",
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0",
-        "chrome-trace-event": "^1.0.0",
-        "enhanced-resolve": "^4.1.0",
-        "eslint-scope": "^4.0.0",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.3.0",
-        "loader-utils": "^1.1.0",
-        "memory-fs": "~0.4.1",
-        "micromatch": "^3.1.8",
-        "mkdirp": "~0.5.0",
         "neo-async": "^2.5.0",
-        "node-libs-browser": "^2.0.0",
-        "schema-utils": "^0.4.4",
-        "tapable": "^1.1.0",
-        "terser-webpack-plugin": "^1.1.0",
-        "watchpack": "^1.5.0",
-        "webpack-sources": "^1.3.0"
+        "watchpack-chokidar2": "^2.0.1"
       },
       "dependencies": {
-        "schema-utils": {
-          "version": "0.4.7",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
-          "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
+        "anymatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+          "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "ajv": "^6.1.0",
-            "ajv-keywords": "^3.1.0"
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
           }
-        }
-      }
-    },
-    "webpack-core": {
-      "version": "0.6.9",
-      "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
-      "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
-      "dev": true,
-      "requires": {
-        "source-list-map": "~0.1.7",
-        "source-map": "~0.4.1"
-      },
-      "dependencies": {
-        "source-list-map": {
-          "version": "0.1.8",
-          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
-          "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
-          "dev": true
         },
-        "source-map": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+        "binary-extensions": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+          "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
           "dev": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        }
-      }
-    },
-    "webpack-dev-middleware": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz",
-      "integrity": "sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==",
-      "dev": true,
-      "requires": {
-        "memory-fs": "~0.4.1",
-        "mime": "^2.3.1",
-        "range-parser": "^1.0.3",
-        "webpack-log": "^2.0.0"
-      },
-      "dependencies": {
-        "mime": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.2.tgz",
-          "integrity": "sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==",
-          "dev": true
-        }
-      }
-    },
-    "webpack-dev-server": {
-      "version": "3.1.14",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz",
-      "integrity": "sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==",
-      "dev": true,
-      "requires": {
-        "ansi-html": "0.0.7",
-        "bonjour": "^3.5.0",
-        "chokidar": "^2.0.0",
-        "compression": "^1.5.2",
-        "connect-history-api-fallback": "^1.3.0",
-        "debug": "^3.1.0",
-        "del": "^3.0.0",
-        "express": "^4.16.2",
-        "html-entities": "^1.2.0",
-        "http-proxy-middleware": "~0.18.0",
-        "import-local": "^2.0.0",
-        "internal-ip": "^3.0.1",
-        "ip": "^1.1.5",
-        "killable": "^1.0.0",
-        "loglevel": "^1.4.1",
-        "opn": "^5.1.0",
-        "portfinder": "^1.0.9",
-        "schema-utils": "^1.0.0",
-        "selfsigned": "^1.9.1",
-        "semver": "^5.6.0",
-        "serve-index": "^1.7.2",
-        "sockjs": "0.3.19",
-        "sockjs-client": "1.3.0",
-        "spdy": "^4.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^5.1.0",
-        "url": "^0.11.0",
-        "webpack-dev-middleware": "3.4.0",
-        "webpack-log": "^2.0.0",
-        "yargs": "12.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
+          "optional": true
         },
-        "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
-          },
-          "dependencies": {
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
+            "fill-range": "^7.0.1"
           }
         },
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+        "chokidar": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+          "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
+            "anymatch": "~3.1.2",
+            "braces": "~3.0.2",
+            "fsevents": "~2.3.2",
+            "glob-parent": "~5.1.2",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.6.0"
           }
         },
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "ms": "^2.1.1"
+            "to-regex-range": "^5.0.1"
           }
         },
-        "decamelize": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
-          "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
           "dev": true,
-          "requires": {
-            "xregexp": "4.0.0"
-          }
+          "optional": true
         },
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+        "glob-parent": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
+            "is-glob": "^4.0.1"
           }
         },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+        "is-binary-path": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "locate-path": "^3.0.0"
+            "binary-extensions": "^2.0.0"
           }
         },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true,
+          "optional": true
+        },
+        "readdirp": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+          "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "pump": "^3.0.0"
+            "picomatch": "^2.2.1"
           }
         },
-        "invert-kv": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "lcid": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "invert-kv": "^2.0.0"
+            "is-number": "^7.0.0"
           }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+        }
+      }
+    },
+    "watchpack-chokidar2": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
+      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chokidar": "^2.1.8"
+      }
+    },
+    "wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dev": true,
+      "requires": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "webidl-conversions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
+      "dev": true
+    },
+    "webpack": {
+      "version": "4.39.2",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.39.2.tgz",
+      "integrity": "sha512-AKgTfz3xPSsEibH00JfZ9sHXGUwIQ6eZ9tLN8+VLzachk1Cw2LVmy+4R7ZiwTa9cZZ15tzySjeMui/UnSCAZhA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/wasm-edit": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "acorn": "^6.2.1",
+        "ajv": "^6.10.2",
+        "ajv-keywords": "^3.4.1",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^4.1.0",
+        "eslint-scope": "^4.0.3",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.4.0",
+        "loader-utils": "^1.2.3",
+        "memory-fs": "^0.4.1",
+        "micromatch": "^3.1.10",
+        "mkdirp": "^0.5.1",
+        "neo-async": "^2.6.1",
+        "node-libs-browser": "^2.2.1",
+        "schema-utils": "^1.0.0",
+        "tapable": "^1.1.3",
+        "terser-webpack-plugin": "^1.4.1",
+        "watchpack": "^1.6.0",
+        "webpack-sources": "^1.4.1"
+      },
+      "dependencies": {
+        "find-cache-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
           "dev": true,
           "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
           }
         },
-        "mime": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.2.tgz",
-          "integrity": "sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
-        },
-        "os-locale": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
           "dev": true,
           "requires": {
-            "execa": "^1.0.0",
-            "lcid": "^2.0.0",
-            "mem": "^4.0.0"
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
           }
         },
-        "p-limit": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
-          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "find-up": "^3.0.0"
           }
         },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
           }
         },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+        "terser-webpack-plugin": {
+          "version": "1.4.5",
+          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
+          "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
           "dev": true,
           "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
+            "cacache": "^12.0.2",
+            "find-cache-dir": "^2.1.0",
+            "is-wsl": "^1.1.0",
+            "schema-utils": "^1.0.0",
+            "serialize-javascript": "^4.0.0",
+            "source-map": "^0.6.1",
+            "terser": "^4.1.2",
+            "webpack-sources": "^1.4.0",
+            "worker-farm": "^1.7.0"
           }
+        }
+      }
+    },
+    "webpack-core": {
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
+      "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
+      "dev": true,
+      "requires": {
+        "source-list-map": "~0.1.7",
+        "source-map": "~0.4.1"
+      },
+      "dependencies": {
+        "source-list-map": {
+          "version": "0.1.8",
+          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
+          "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
+          "dev": true
         },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
+            "amdefine": ">=0.0.4"
           }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+        }
+      }
+    },
+    "webpack-dev-middleware": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz",
+      "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==",
+      "dev": true,
+      "requires": {
+        "memory-fs": "^0.4.1",
+        "mime": "^2.4.4",
+        "mkdirp": "^0.5.1",
+        "range-parser": "^1.2.1",
+        "webpack-log": "^2.0.0"
+      }
+    },
+    "webpack-dev-server": {
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
+      "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
+      "dev": true,
+      "requires": {
+        "ansi-html": "0.0.7",
+        "bonjour": "^3.5.0",
+        "chokidar": "^2.1.8",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^1.6.0",
+        "debug": "^4.1.1",
+        "del": "^4.1.1",
+        "express": "^4.17.1",
+        "html-entities": "^1.3.1",
+        "http-proxy-middleware": "0.19.1",
+        "import-local": "^2.0.0",
+        "internal-ip": "^4.3.0",
+        "ip": "^1.1.5",
+        "is-absolute-url": "^3.0.3",
+        "killable": "^1.0.1",
+        "loglevel": "^1.6.8",
+        "opn": "^5.5.0",
+        "p-retry": "^3.0.1",
+        "portfinder": "^1.0.26",
+        "schema-utils": "^1.0.0",
+        "selfsigned": "^1.10.7",
+        "semver": "^6.3.0",
+        "serve-index": "^1.9.1",
+        "sockjs": "0.3.20",
+        "sockjs-client": "1.4.0",
+        "spdy": "^4.0.2",
+        "strip-ansi": "^3.0.1",
+        "supports-color": "^6.1.0",
+        "url": "^0.11.0",
+        "webpack-dev-middleware": "^3.7.2",
+        "webpack-log": "^2.0.0",
+        "ws": "^6.2.1",
+        "yargs": "^13.3.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "ms": "2.1.2"
           }
         },
-        "webpack-dev-middleware": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz",
-          "integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
           "dev": true,
           "requires": {
-            "memory-fs": "~0.4.1",
-            "mime": "^2.3.1",
-            "range-parser": "^1.0.3",
-            "webpack-log": "^2.0.0"
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
           }
         },
-        "which-module": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         },
-        "yargs": {
-          "version": "12.0.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
-          "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
           "dev": true,
           "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^2.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^3.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1 || ^4.0.0",
-            "yargs-parser": "^10.1.0"
+            "has-flag": "^3.0.0"
           }
         },
-        "yargs-parser": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
-          "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+        "ws": {
+          "version": "6.2.2",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
+          "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0"
+            "async-limiter": "~1.0.0"
           }
         }
       }
@@ -20310,30 +20468,21 @@
       }
     },
     "webpack-merge": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz",
-      "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==",
-      "dev": true,
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
+      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
       "requires": {
-        "lodash": "^4.17.5"
+        "lodash": "^4.17.15"
       }
     },
     "webpack-sources": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz",
-      "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
       "dev": true,
       "requires": {
         "source-list-map": "^2.0.0",
         "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
       }
     },
     "webpack-subresource-integrity": {
@@ -20346,19 +20495,18 @@
       }
     },
     "websocket-driver": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
-      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
+      "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
       "dev": true,
       "requires": {
-        "http-parser-js": ">=0.4.0",
         "websocket-extensions": ">=0.1.1"
       }
     },
     "websocket-extensions": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
-      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
+      "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
     },
     "whatwg-encoding": {
@@ -20368,23 +20516,12 @@
       "dev": true,
       "requires": {
         "iconv-lite": "0.4.24"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.4.24",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-          "dev": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        }
       }
     },
     "whatwg-fetch": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
-      "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
+      "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
     },
     "whatwg-mimetype": {
       "version": "2.3.0",
@@ -20410,30 +20547,32 @@
       "dev": true
     },
     "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "requires": {
         "isexe": "^2.0.0"
       }
     },
-    "which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-      "dev": true,
-      "optional": true
-    },
-    "wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+    "which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "string-width": "^1.0.2 || 2"
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
       }
     },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
     "winston": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/winston/-/winston-1.0.2.tgz",
@@ -20460,6 +20599,21 @@
         }
       }
     },
+    "with-open-file": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.7.tgz",
+      "integrity": "sha512-ecJS2/oHtESJ1t3ZfMI3B7KIDKyfN0O16miWxdn30zdh66Yd3LsRFebXZXq6GU4xfxLf6nVxp9kIqElb5fqczA==",
+      "requires": {
+        "p-finally": "^1.0.0",
+        "p-try": "^2.1.0",
+        "pify": "^4.0.1"
+      }
+    },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+    },
     "wordwrap": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
@@ -20474,14 +20628,50 @@
         "errno": "~0.1.7"
       }
     },
+    "worker-plugin": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-3.2.0.tgz",
+      "integrity": "sha512-W5nRkw7+HlbsEt3qRP6MczwDDISjiRj2GYt9+bpe8A2La00TmJdwzG5bpdMXhRt1qcWmwAvl1TiKaHRa+XDS9Q==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0"
+      }
+    },
     "wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
       }
     },
     "wrap-fn": {
@@ -20490,13 +20680,6 @@
       "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=",
       "requires": {
         "co": "3.1.0"
-      },
-      "dependencies": {
-        "co": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz",
-          "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g="
-        }
       }
     },
     "wrappy": {
@@ -20516,21 +20699,64 @@
         "typedarray-to-buffer": "^3.1.5"
       }
     },
+    "write-stream": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/write-stream/-/write-stream-0.4.3.tgz",
+      "integrity": "sha1-g8yMA0fQr2BXqThitOOuAd5cgcE=",
+      "requires": {
+        "readable-stream": "~0.0.2"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "0.0.4",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-0.0.4.tgz",
+          "integrity": "sha1-8y124/uGM0SlSNeZIwBxc2ZbO40="
+        }
+      }
+    },
     "ws": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
-      "dev": true,
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
       "requires": {
-        "async-limiter": "~1.0.0"
+        "async-limiter": "~1.0.0",
+        "safe-buffer": "~5.1.0",
+        "ultron": "~1.1.0"
+      },
+      "dependencies": {
+        "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=="
+        }
       }
     },
     "x2js": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/x2js/-/x2js-3.3.1.tgz",
-      "integrity": "sha512-UruP3F9pgFlGbgm/8i28AiNSLN4jlcu8GMBbzuqLqAzV3O49WQDtmJeLefYy8hmBnTEtQEUvPQG8EDFCDDyP6g==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/x2js/-/x2js-3.4.1.tgz",
+      "integrity": "sha512-RCMEmHNsyeyzF5NyGHbmCCZU9N8uMiz9FluAj3CpfVREHpgm3JB9Wr/dEWdPqGHmK3lRd2fm0ccOWtuJ2YUowQ==",
+      "requires": {
+        "xmldom": "^0.5.0"
+      }
+    },
+    "xcode": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/xcode/-/xcode-2.1.0.tgz",
+      "integrity": "sha512-uCrmPITrqTEzhn0TtT57fJaNaw8YJs1aCzs+P/QqxsDbvPZSv7XMPPwXrKvHtD6pLjBM/NaVwraWJm8q83Y4iQ==",
+      "requires": {
+        "simple-plist": "^1.0.0",
+        "uuid": "^3.3.2"
+      }
+    },
+    "xhr": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.4.0.tgz",
+      "integrity": "sha1-4W5mpF+GmGHu76tBbV7/ci3ECZM=",
       "requires": {
-        "xmldom": "^0.1.19"
+        "global": "~4.3.0",
+        "is-function": "^1.0.1",
+        "parse-headers": "^2.0.0",
+        "xtend": "^4.0.0"
       }
     },
     "xml-name-validator": {
@@ -20546,18 +20772,6 @@
       "requires": {
         "sax": ">=0.6.0",
         "xmlbuilder": "~11.0.0"
-      },
-      "dependencies": {
-        "sax": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-        },
-        "xmlbuilder": {
-          "version": "11.0.1",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-          "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
-        }
       }
     },
     "xml2json": {
@@ -20571,9 +20785,9 @@
       }
     },
     "xmlbuilder": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
     },
     "xmlchars": {
       "version": "2.2.0",
@@ -20582,9 +20796,9 @@
       "dev": true
     },
     "xmldom": {
-      "version": "0.1.27",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
-      "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
+      "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="
     },
     "xmlhttprequest-ssl": {
       "version": "1.5.5",
@@ -20592,20 +20806,19 @@
       "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4="
     },
     "xregexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
-      "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
+      "integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM="
     },
     "xtend": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
     },
     "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
       "dev": true
     },
     "yallist": {
@@ -20614,60 +20827,31 @@
       "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
     },
     "yargs": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-      "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+      "version": "13.3.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "camelcase": "^3.0.0",
-        "cliui": "^3.2.0",
-        "decamelize": "^1.1.1",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^1.4.0",
-        "read-pkg-up": "^1.0.1",
+        "cliui": "^5.0.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^2.0.1",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
+        "require-main-filename": "^2.0.0",
         "set-blocking": "^2.0.0",
-        "string-width": "^1.0.2",
-        "which-module": "^1.0.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "^5.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true,
-          "optional": true
-        },
-        "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-          "dev": true,
-          "optional": true
-        }
+        "string-width": "^3.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^13.1.2"
       }
     },
     "yargs-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "camelcase": "^3.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true,
-          "optional": true
-        }
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
       }
     },
     "yauzl": {
@@ -20695,13 +20879,18 @@
     "yn": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="
+    },
+    "yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true
     },
     "zone.js": {
-      "version": "0.8.29",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.29.tgz",
-      "integrity": "sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ=="
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.9.1.tgz",
+      "integrity": "sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag=="
     }
   }
 }
diff --git a/package.json b/package.json
index 01aceed2b..9c19c2a42 100644
--- a/package.json
+++ b/package.json
@@ -12,95 +12,156 @@
     "test": "jest",
     "test:coverage": "jest --coverage",
     "test:ci": "jest --ci --collectCoverage=true --coverageReporters=lcov --forceExit --detectOpenHandles --maxWorkers=2",
-    "ionic-build": "ng build --eval--source-map && cordova run android",
-    "ionic-build:prod": "ionic build --prod && ionic cordova run android --prod",
+    "ionic-build": "ng build --eval--source-map --configuration=$npm_config_angular_configuration && cordova run android",
+    "ionic-build:prod": "ionic cordova build android --configuration=$npm_config_angular_configuration --prod --release --buildConfig ./buildConfig/build.json",
     "ionic-serve": "ionic cordova run android --livereload --configuration=hmr",
     "sonar-scanner": "sonar-scanner",
     "sonar-scanner:scan": "sonar-scanner -Dsonar.host.url=http://127.0.0.1:9000 -Dsonar.login=$SONAR_LOGIN"
   },
   "private": true,
   "dependencies": {
-    "@angular-builders/custom-webpack": "^7.0.2",
+    "@angular-builders/custom-webpack": "^8.4.1",
     "@angular-builders/dev-server": "^7.3.1",
-    "@angular/animations": "^7.2.15",
-    "@angular/common": "^7.2.2",
-    "@angular/core": "^7.2.2",
-    "@angular/forms": "^7.2.2",
-    "@angular/http": "^7.2.2",
-    "@angular/platform-browser": "^7.2.2",
-    "@angular/platform-browser-dynamic": "^7.2.2",
-    "@angular/router": "^7.2.2",
+    "@angular/animations": "^8.0.0",
+    "@angular/common": "^8.0.0",
+    "@angular/core": "^8.0.0",
+    "@angular/forms": "^8.0.0",
+    "@angular/platform-browser": "^8.0.0",
+    "@angular/platform-browser-dynamic": "^8.0.0",
+    "@angular/router": "^8.0.0",
+    "@ionic-native/android-permissions": "^5.30.0",
     "@ionic-native/app-version": "^5.15.1",
+    "@ionic-native/camera": "^5.30.0",
+    "@ionic-native/chooser": "^5.30.0",
     "@ionic-native/core": "^5.15.1",
     "@ionic-native/device": "^5.15.1",
+    "@ionic-native/diagnostic": "^5.30.0",
     "@ionic-native/file": "^5.15.1",
+    "@ionic-native/file-chooser": "^5.30.0",
     "@ionic-native/file-opener": "^5.15.1",
+    "@ionic-native/file-path": "^5.30.0",
     "@ionic-native/file-transfer": "^5.15.1",
+    "@ionic-native/image-picker": "^5.30.0",
     "@ionic-native/ionic-webview": "^5.15.1",
     "@ionic-native/keyboard": "^5.15.1",
     "@ionic-native/local-notifications": "^5.15.1",
+    "@ionic-native/media": "^5.30.0",
     "@ionic-native/native-page-transitions": "^5.23.0",
-    "@ionic-native/network": "^5.15.1",
+    "@ionic-native/network": "5.31.1",
+    "@ionic-native/photo-library": "^5.30.0",
+    "@ionic-native/photo-viewer": "^5.30.0",
     "@ionic-native/screen-orientation": "^5.15.1",
     "@ionic-native/social-sharing": "^5.15.1",
     "@ionic-native/status-bar": "^5.15.1",
-    "@ionic/angular": "^4.11.2",
+    "@ionic-native/streaming-media": "^5.30.0",
+    "@ionic/angular": "^5.5.5",
+    "@ionic/storage": "2.2.0",
     "@ngx-translate/core": "^11.0.1",
     "@ngx-translate/http-loader": "^4.0.0",
-    "@project-sunbird/common-consumption": "^2.10.1",
-    "@project-sunbird/content-player": "2.9.1",
-    "@project-sunbird/sunbird-sdk": "~2.10.13",
+    "@project-sunbird/client-services": "3.9.7",
+    "@project-sunbird/common-consumption-v8": "3.9.4",
+    "@project-sunbird/content-player": "3.7.1",
+    "@project-sunbird/discussions-ui-v8": "2.1.0-beta.12",
+    "@project-sunbird/sb-styles": "0.0.7",
+    "@project-sunbird/sunbird-epub-player-v8": "3.9.3",
+    "@project-sunbird/sunbird-pdf-player-v8": "3.9.3",
+    "@project-sunbird/sunbird-player-sdk-v8": "3.8.0",
+    "@project-sunbird/sunbird-quml-player-v8": "3.9.29",
+    "@project-sunbird/sunbird-sdk": "file:../sunbird-mobile-sdk/dist",
+    "@project-sunbird/sunbird-video-player-v8": "3.9.5",
+    "chart.js": "^2.9.4",
+    "chartjs-plugin-datalabels": "^0.7.0",
+    "chartjs-plugin-stacked100": "^0.7.1",
     "code-push": "^3.0.1",
-    "com.jjdltc.cordova.plugin.zip": "https://github.com/swayangjit/jjdltc-cordova-plugin-zip.git",
+    "com-sarriaroman-photoviewer": "^1.2.5",
     "com.telerik.plugins.nativepagetransitions": "^0.6.5",
-    "common-consumption-styles": "0.0.14",
-    "cordova-android": "^8.1.0",
-    "cordova-android-support-gradle-release": "^3.0.1",
-    "cordova-plugin-advanced-http": "^2.4.1",
-    "cordova-plugin-android-downloadmanager": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-downloadmanager.git#release-2.9.0",
-    "cordova-plugin-android-permissions": "^1.0.2",
-    "cordova-plugin-app-version": "^0.1.9",
+    "common-form-elements": "^3.9.16",
+    "cordova-android": "^9.0.0",
+    "cordova-plugin-add-swift-support": "^2.0.2",
+    "cordova-plugin-advanced-http": "^2.5.1",
+    "cordova-plugin-android-downloadmanager": "git+https://github.com/shikshalokam/sb-cordova-plugin-downloadmanager.git#release-3.9.0-ios",
+    "cordova-plugin-android-permissions": "^1.1.2",
+    "cordova-plugin-androidx-adapter": "^1.1.3",
+    "cordova-plugin-app-version": "^0.1.12",
+    "cordova-plugin-appavailability": "^0.4.2",
     "cordova-plugin-awesome-shared-preferences": "git+https://github.com/adriano-di-giovanni/cordova-plugin-shared-preferences.git",
     "cordova-plugin-badge": "^0.8.8",
-    "cordova-plugin-code-push": "^1.12.1",
+    "cordova-plugin-camera": "^4.1.0",
+    "cordova-plugin-chooser": "^1.3.2",
+    "cordova-plugin-code-push": "^1.13.1",
     "cordova-plugin-device": "^2.0.3",
     "cordova-plugin-dialogs": "^2.0.2",
-    "cordova-plugin-fcm-with-dependecy-updated": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-2.9.0",
+    "cordova-plugin-document-viewer": "^0.9.13",
     "cordova-plugin-file": "^6.0.2",
     "cordova-plugin-file-opener2": "^2.2.1",
     "cordova-plugin-file-support": "git+https://github.com/project-sunbird/cordova-plugin-file-support.git",
     "cordova-plugin-file-transfer": "^1.7.1",
+    "cordova-plugin-filechooser": "^1.2.0",
+    "cordova-plugin-filepath": "^1.5.8",
+    "cordova-plugin-filepicker": "^1.1.6",
     "cordova-plugin-inappbrowser": "^3.2.0",
+    "cordova-plugin-inappupdatemanager": "git+https://github.com/subranil/cordova-plugin-inappupdatemanager.git#release-3.7.0",
     "cordova-plugin-ionic-keyboard": "^2.2.0",
-    "cordova-plugin-ionic-webview": "^4.1.3",
+    "cordova-plugin-ionic-webview": "^5.0.0",
     "cordova-plugin-local-notification": "git+https://github.com/katzer/cordova-plugin-local-notifications.git",
     "cordova-plugin-media": "^5.0.3",
     "cordova-plugin-network-information": "^2.0.2",
     "cordova-plugin-openrap": "git+https://github.com/project-sunbird/cordova-plugin-openrap.git",
     "cordova-plugin-printer": "^0.8.0",
-    "cordova-plugin-qr-scanner": "git+https://github.com/project-sunbird/cordova-plugin-qr-scanner.git",
+    "cordova-plugin-proguard": "git+https://github.com/greybax/cordova-plugin-proguard.git",
+    "cordova-plugin-qr-scanner": "git+https://github.com/project-sunbird/cordova-plugin-qr-scanner.git#release-3.3.0",
     "cordova-plugin-screen-orientation": "^3.0.2",
+    "cordova-plugin-secure-storage-echo": "^5.1.1",
     "cordova-plugin-statusbar": "^2.4.3",
-    "cordova-plugin-sunbirdsplash": "git+https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git",
+    "cordova-plugin-streaming-media": "^2.3.0",
+    "cordova-plugin-sunbirdsplash": "git+https://github.com/shikshalokam/cordova-plugin-sunbirdsplash.git#release-3.9.0-ios",
+    "cordova-plugin-telerik-imagepicker": "2.3.3",
     "cordova-plugin-webview-checker": "^1.0.1",
     "cordova-plugin-whitelist": "^1.3.4",
-    "cordova-plugin-x-socialsharing": "^5.6.4",
-    "cordova-plugin-zip": "^3.1.0",
+    "cordova-plugin-x-socialsharing": "^6.0.3",
+    "cordova-plugin-zip": "3.1.0",
+    "cordova-sqlite-storage": "^5.1.0",
     "cordova-zip-plugin": "git+https://github.com/swayangjit/jjdltc-cordova-plugin-zip.git",
-    "cordova.plugins.diagnostic": "^5.0.1",
+    "cordova.plugins.diagnostic": "^5.0.2",
     "core-js": "^2.6.10",
-    "dayjs": "^1.8.17",
+    "crypto-js": "^3.1.9-1",
+    "dayjs": "1.9.8",
+    "dom-to-image": "^2.6.0",
+    "epubjs": "^0.3.88",
     "es6-promise-plugin": "^4.2.2",
     "grapheme-splitter": "^1.0.4",
+    "hammerjs": "^2.0.8",
     "ionic-plugin-keyboard": "^2.2.1",
     "ionic4-rating": "^1.0.9",
-    "rxjs": "^6.5.3",
+    "jsonwebtoken": "^8.5.1",
+    "jspdf": "^2.0.0",
+    "jwt-decode": "^2.2.0",
+    "katex": "^0.12.0",
+    "lodash-es": "^4.17.20",
+    "material-design-icons": "^3.0.1",
+    "moment": "^2.29.1",
+    "ng-recaptcha": "^5.0.0",
+    "ng2-charts": "^2.4.2",
+    "ngx-bootstrap": "^5.6.2",
+    "ngx-chips": "2.0.2",
+    "ngx-infinite-scroll": "^10.0.1",
+    "ngx-moment": "^5.0.0",
+    "pouchdb": "^7.2.2",
+    "pouchdb-adapter-cordova-sqlite": "^2.0.7",
+    "pouchdb-find": "^7.2.2",
+    "rxjs": "^6.6.3",
     "sb-cordova-plugin-customtabs": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-customtabs.git",
-    "sb-cordova-plugin-db": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-db.git",
-    "sb-cordova-plugin-utility": "git+https://github.com/Sunbird-Ed/sb-cordova-plugin-utility.git",
-    "tslib": "^1.10.0",
+    "sb-cordova-plugin-db": "git+https://github.com/shikshalokam/sb-cordova-plugin-db.git",
+    "sb-cordova-plugin-sync": "git+https://github.com/shikshalokam/sb-cordova-plugin-sync.git#release-3.9.0-ios",
+    "sb-cordova-plugin-utility": "git+https://github.com/shikshalokam/sb-cordova-plugin-utility.git#release-3.9.0-ios",
+    "sb-svg2pdf": "0.0.10",
+    "sb-tag-manager": "^3.9.19",
+    "tslib": "^2.1.0",
+    "typescript-collections": "^1.3.3",
+    "uuid": "^3.4.0",
+    "video.js": "7.5.5",
     "x2js": "^3.3.0",
-    "zone.js": "~0.8.29"
+    "zone.js": "~0.9.1"
   },
   "config": {
     "ionic_source_map_type": "inline-source-map",
@@ -109,14 +170,11 @@
     "ionic_enable_lint": false
   },
   "devDependencies": {
-    "@angular-devkit/architect": "~0.13.8",
-    "@angular-devkit/build-angular": "~0.13.8",
-    "@angular-devkit/core": "~7.3.8",
-    "@angular-devkit/schematics": "~7.3.8",
-    "@angular/cli": "~7.3.8",
-    "@angular/compiler": "~7.2.2",
-    "@angular/compiler-cli": "~7.2.2",
-    "@angular/language-service": "~7.2.2",
+    "@angular-devkit/build-angular": "^0.803.29",
+    "@angular/cli": "~8.3.29",
+    "@angular/compiler": "~8.0.0",
+    "@angular/compiler-cli": "~8.0.0",
+    "@angular/language-service": "~8.0.0",
     "@angularclass/hmr": "^2.1.3",
     "@babel/core": "^7.5.5",
     "@babel/plugin-proposal-class-properties": "^7.5.5",
@@ -125,10 +183,12 @@
     "@babel/plugin-transform-runtime": "^7.5.5",
     "@babel/preset-env": "^7.9.5",
     "@babel/preset-typescript": "^7.9.0",
-    "@ionic/angular-toolkit": "~1.5.1",
+    "@ionic/angular-toolkit": "^2.3.1",
     "@ionic/v4-migration-tslint": "^1.7.1",
+    "@project-sunbird/sb-themes": "0.0.6",
+    "@project-sunbird/telemetry-sdk": "0.0.26",
     "@types/jest": "^25.2.1",
-    "@types/node": "^12.11.5",
+    "@types/node": "12.11.5",
     "babel-jest": "^25.4.0",
     "babel-polyfill": "^6.26.0",
     "fs-extra": "^8.1.0",
@@ -136,12 +196,14 @@
     "sonarqube-scanner": "^2.5.0",
     "ts-node": "^8.4.1",
     "tslint": "~5.16.0",
-    "typescript": "~3.1.6"
+    "typescript": "~3.4.3"
+  },
+  "browser": {
+    "crypto": false
   },
   "description": "An Ionic project",
   "cordova": {
     "plugins": {
-      "com.jjdltc.cordova.plugin.zip": {},
       "ionic-plugin-keyboard": {},
       "cordova-plugin-whitelist": {},
       "cordova-plugin-ionic-webview": {},
@@ -153,25 +215,24 @@
       "cordova-plugin-inappbrowser": {},
       "cordova-plugin-network-information": {},
       "cordova-plugin-statusbar": {},
+      "cordova-plugin-streaming-media": {},
       "cordova-plugin-awesome-shared-preferences": {},
-      "cordova-plugin-advanced-http": {},
+      "cordova-plugin-advanced-http": {
+        "OKHTTP_VERSION": "3.10.0"
+      },
       "cordova-plugin-android-permissions": {},
       "cordova-plugin-media": {},
-      "cordova-plugin-android-downloadmanager": {},
-      "sb-cordova-plugin-db": {},
       "sb-cordova-plugin-customtabs": {
         "URL_SCHEME": "@string/custom_scheme_url",
         "URL_HOST": "mobile"
       },
       "cordova-plugin-qr-scanner": {},
-      "cordova-plugin-sunbirdsplash": {},
       "cordova-plugin-file-support": {},
       "cordova-plugin-ionic-keyboard": {},
       "cordova-plugin-file-opener2": {
         "ANDROID_SUPPORT_V4_VERSION": "27.+"
       },
       "cordova-plugin-screen-orientation": {},
-      "cordova-plugin-zip": {},
       "cordova-plugin-local-notification": {
         "ANDROID_SUPPORT_V4_VERSION": "26.+"
       },
@@ -179,13 +240,11 @@
       "cordova.plugins.diagnostic": {
         "ANDROID_SUPPORT_VERSION": "28.+"
       },
-      "cordova-android-support-gradle-release": {
-        "ANDROID_SUPPORT_VERSION": "28.0.0"
-      },
       "cordova-plugin-openrap": {},
       "cordova-plugin-webview-checker": {},
-      "sb-cordova-plugin-utility": {},
-      "cordova-plugin-printer": {},
+      "cordova-plugin-printer": {
+        "ANDROID_SUPPORT_V4_VERSION": "28.+"
+      },
       "cordova-plugin-fcm-with-dependecy-updated": {
         "FCM_CORE_VERSION": "16.0.9",
         "FCM_VERSION": "18.0.0",
@@ -193,10 +252,36 @@
         "GOOGLE_SERVICES_VERSION": "4.2.0",
         "ANDROID_DEFAULT_NOTIFICATION_ICON": "@mipmap/ic_launcher"
       },
-      "com.telerik.plugins.nativepagetransitions": {}
+      "com.telerik.plugins.nativepagetransitions": {},
+      "cordova-plugin-proguard": {},
+      "cordova-plugin-androidx-adapter": {},
+      "cordova-plugin-secure-storage-echo": {},
+      "cordova-plugin-appavailability": {},
+      "cordova-plugin-camera": {
+        "ANDROID_SUPPORT_V4_VERSION": "27.+"
+      },
+      "cordova-plugin-filepath": {},
+      "cordova-plugin-chooser": {},
+      "cordova-plugin-filepicker": {},
+      "cordova-plugin-document-viewer": {},
+      "com-sarriaroman-photoviewer": {},
+      "cordova-sqlite-storage": {},
+      "cordova-plugin-telerik-imagepicker": {},
+      "cordova-plugin-filechooser": {},
+      "cordova-plugin-inappupdatemanager": {},
+      "sb-cordova-plugin-db": {
+        "USESWIFTLANGUAGEVERSION": "4"
+      },
+      "cordova-plugin-add-swift-support": {},
+      "sb-cordova-plugin-sync": {},
+      "cordova-plugin-sunbirdsplash": {},
+      "cordova-plugin-android-downloadmanager": {},
+      "sb-cordova-plugin-utility": {},
+      "cordova-plugin-zip": {}
     },
     "platforms": [
-      "android"
+      "android",
+      "ios"
     ]
   },
   "jest": {
@@ -242,8 +327,24 @@
     "moduleNameMapper": {
       "^@app/(.*)$": "<rootDir>/src/$1",
       "^sunbird-sdk": "<rootDir>/node_modules/@project-sunbird/sunbird-sdk",
-      "^sunbird-sdk/(.*)$": "<rootDir>/node_modules/@project-sunbird/sunbird-sdk/$1"
+      "^sunbird-sdk/(.*)$": "<rootDir>/node_modules/@project-sunbird/sunbird-sdk/$1",
+      "@project-sunbird/common-consumption": [
+        "<rootDir>/node_modules/@project-sunbird/common-consumption-v8"
+      ],
+      "@project-sunbird/common-consumption/*": [
+        "<rootDir>/node_modules/@project-sunbird/common-consumption-v8/*"
+      ],
+      "common-form-elements": [
+        "<rootDir>/node_modules/common-form-elements"
+      ],
+      "common-form-elements/*": [
+        "<rootDir>/node_modules/common-form-elements/*"
+      ]
     },
-    "transformIgnorePatterns": []
+    "transformIgnorePatterns": [],
+    "coveragePathIgnorePatterns": [
+      "<rootDir>/src/app/*/*.module.ts",
+      "<rootDir>/src/app/animations/*.ts"
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/proguard-custom.txt b/proguard-custom.txt
new file mode 100644
index 000000000..b0ab43df5
--- /dev/null
+++ b/proguard-custom.txt
@@ -0,0 +1,69 @@
+
+-dontwarn java.awt.**,javax.swing.**
+-dontwarn org.mozilla.javascript.tools.**
+-dontwarn com.nimbusds.jose.crypto.**
+-dontwarn com.nimbusds.jose.jwk.ECKey.**
+-dontwarn com.nimbusds.jose.**
+-dontwarn com.nimbusds.jwt.**
+-dontwarn okhttp3.**
+-dontwarn okio.**
+-dontwarn javax.annotation.**
+-dontwarn org.conscrypt.**
+#Keep ADAL classes
+-keep class com.microsoft.aad.adal.** { *; }
+-keep class com.microsoft.identity.common.** { *; }
+#Keep Gson for ADAL https://github.com/google/gson/blob/master/examples/android-proguard-example/proguard.cfg
+-keepattributes Signature
+-keepattributes *Annotation*
+-dontwarn sun.misc.**
+-keep class com.google.gson.examples.android.model.** { *; }
+-keep class * implements com.google.gson.** {*;}
+-dontwarn org.bouncycastle.**
+-keepnames class com.fasterxml.jackson.databind.** { *; }
+-dontwarn com.fasterxml.jackson.databind.*
+-keepattributes InnerClasses
+-keep class org.bouncycastle.** { *; }
+-keepnames class org.bouncycastle.* { *; }
+-dontwarn org.bouncycastle.*
+-keep class io.jsonwebtoken.** { *; }
+-keepnames class io.jsonwebtoken.* { *; }
+-keepnames interface io.jsonwebtoken.* { *; }
+-dontwarn javax.xml.bind.DatatypeConverter
+-dontwarn io.jsonwebtoken.impl.Base64Codec
+-keepnames class com.fasterxml.jackson.** { * ; }
+-keepnames interface com.fasterxml.jackson.** { *; }
+-keep class org.sunbird.app.BuildConfig { *;}
+-keep class android.webkit.WebViewFactory { *; }
+-dontnote android.net.http.*
+-dontnote org.apache.commons.codec.**
+-dontnote org.apache.http.**
+-keep class com.google.android.gms.** { *; }
+-keep,includedescriptorclasses class com.journeyapps.barcodescanner.** { *; }
+-keepclassmembers class com.journeyapps.barcodescanner.** { *; }
+-keep,includedescriptorclasses class androidx.mediaandroid.webkit.WebViewFactory.** { *; }
+-keepclassmembers class androidx.media.** { *; }
+-keep class androidx.versionedparcelable.VersionedParcel
+-dontnote android.webkit.WebViewFactory
+-dontnote me.leolin.shortcutbadger.impl.AsusHomeLauncher
+-dontnote me.leolin.shortcutbadger.impl.SolidHomeBadger
+-dontnote com.android.org.conscrypt.SSLParametersImpl
+-dontnote org.apache.harmony.xnet.provider.jsse.SSLParametersImpl
+-dontnote org.conscrypt.ConscryptEngineSocket
+-dontnote sun.security.ssl.SSLContextImpl
+-dontnote org.crosswalk.engine.XWalkWebViewEngine
+-dontnote com.google.firebase.crash.FirebaseCrash
+-dontnote me.leolin.shortcutbadger.impl.XiaomiHomeBadger
+-dontnote okhttp3.internal.platform.AndroidPlatform$CloseGuard
+-dontnote com.google.android.gms.internal.measurement.**
+
+-keepclassmembers class com.google.android.gms.** { *; }
+-dontnote android.os.**
+-dontnote com.google.android.gms.ads.AdView
+-dontnote com.google.android.gms.common.api.internal.BasePendingResult$ReleasableResultGuardian
+-dontnote com.google.android.gms.tagmanager.TagManagerService
+-dontnote com.google.android.gms.common.api.internal.BasePendingResult
+-dontnote com.google.android.gms.gcm.GcmListenerService
+
+-keep class com.google.android.gms.** { *; }
+-keep public class com.google.android.gms.* { public *; }
+-dontwarn com.google.android.gms.**
\ No newline at end of file
diff --git a/resources/ios/icon.png b/resources/ios/icon.png
new file mode 100644
index 000000000..315fe338d
Binary files /dev/null and b/resources/ios/icon.png differ
diff --git a/resources/ios/icon/icon-1024.png b/resources/ios/icon/icon-1024.png
new file mode 100644
index 000000000..4f045ac8a
Binary files /dev/null and b/resources/ios/icon/icon-1024.png differ
diff --git a/resources/ios/icon/icon-108@2x.png b/resources/ios/icon/icon-108@2x.png
new file mode 100644
index 000000000..7627ee2bb
Binary files /dev/null and b/resources/ios/icon/icon-108@2x.png differ
diff --git a/resources/ios/icon/icon-20.png b/resources/ios/icon/icon-20.png
new file mode 100644
index 000000000..ea590ef8d
Binary files /dev/null and b/resources/ios/icon/icon-20.png differ
diff --git a/resources/ios/icon/icon-20@1x.png b/resources/ios/icon/icon-20@1x.png
new file mode 100644
index 000000000..e46c07d6c
Binary files /dev/null and b/resources/ios/icon/icon-20@1x.png differ
diff --git a/resources/ios/icon/icon-20@2x.png b/resources/ios/icon/icon-20@2x.png
new file mode 100644
index 000000000..2a0aa532f
Binary files /dev/null and b/resources/ios/icon/icon-20@2x.png differ
diff --git a/resources/ios/icon/icon-20@3x.png b/resources/ios/icon/icon-20@3x.png
new file mode 100644
index 000000000..5fb9fe1b6
Binary files /dev/null and b/resources/ios/icon/icon-20@3x.png differ
diff --git a/resources/ios/icon/icon-24@2x.png b/resources/ios/icon/icon-24@2x.png
new file mode 100644
index 000000000..3b0c7f973
Binary files /dev/null and b/resources/ios/icon/icon-24@2x.png differ
diff --git a/resources/ios/icon/icon-27.5@2x.png b/resources/ios/icon/icon-27.5@2x.png
new file mode 100644
index 000000000..049fdff4c
Binary files /dev/null and b/resources/ios/icon/icon-27.5@2x.png differ
diff --git a/resources/ios/icon/icon-29.png b/resources/ios/icon/icon-29.png
new file mode 100644
index 000000000..f0c0b74e6
Binary files /dev/null and b/resources/ios/icon/icon-29.png differ
diff --git a/resources/ios/icon/icon-29@2x.png b/resources/ios/icon/icon-29@2x.png
new file mode 100644
index 000000000..198fab951
Binary files /dev/null and b/resources/ios/icon/icon-29@2x.png differ
diff --git a/resources/ios/icon/icon-29@3x.png b/resources/ios/icon/icon-29@3x.png
new file mode 100644
index 000000000..68bbb5b93
Binary files /dev/null and b/resources/ios/icon/icon-29@3x.png differ
diff --git a/resources/ios/icon/icon-40.png b/resources/ios/icon/icon-40.png
new file mode 100644
index 000000000..2a0aa532f
Binary files /dev/null and b/resources/ios/icon/icon-40.png differ
diff --git a/resources/ios/icon/icon-40@2x.png b/resources/ios/icon/icon-40@2x.png
new file mode 100644
index 000000000..663c1abe7
Binary files /dev/null and b/resources/ios/icon/icon-40@2x.png differ
diff --git a/resources/ios/icon/icon-40@3x.png b/resources/ios/icon/icon-40@3x.png
new file mode 100644
index 000000000..efd443141
Binary files /dev/null and b/resources/ios/icon/icon-40@3x.png differ
diff --git a/resources/ios/icon/icon-44@2x.png b/resources/ios/icon/icon-44@2x.png
new file mode 100644
index 000000000..5666bd640
Binary files /dev/null and b/resources/ios/icon/icon-44@2x.png differ
diff --git a/resources/ios/icon/icon-50.png b/resources/ios/icon/icon-50.png
new file mode 100644
index 000000000..fbd81a7bf
Binary files /dev/null and b/resources/ios/icon/icon-50.png differ
diff --git a/resources/ios/icon/icon-50@2x.png b/resources/ios/icon/icon-50@2x.png
new file mode 100644
index 000000000..d9d2e5ea9
Binary files /dev/null and b/resources/ios/icon/icon-50@2x.png differ
diff --git a/resources/ios/icon/icon-60.png b/resources/ios/icon/icon-60.png
new file mode 100644
index 000000000..5fb9fe1b6
Binary files /dev/null and b/resources/ios/icon/icon-60.png differ
diff --git a/resources/ios/icon/icon-60@2x.png b/resources/ios/icon/icon-60@2x.png
new file mode 100644
index 000000000..efd443141
Binary files /dev/null and b/resources/ios/icon/icon-60@2x.png differ
diff --git a/resources/ios/icon/icon-60@3x.png b/resources/ios/icon/icon-60@3x.png
new file mode 100644
index 000000000..0c4d1e64b
Binary files /dev/null and b/resources/ios/icon/icon-60@3x.png differ
diff --git a/resources/ios/icon/icon-72.png b/resources/ios/icon/icon-72.png
new file mode 100644
index 000000000..7ef1d5dbe
Binary files /dev/null and b/resources/ios/icon/icon-72.png differ
diff --git a/resources/ios/icon/icon-72@2x.png b/resources/ios/icon/icon-72@2x.png
new file mode 100644
index 000000000..0182a2d7a
Binary files /dev/null and b/resources/ios/icon/icon-72@2x.png differ
diff --git a/resources/ios/icon/icon-76.png b/resources/ios/icon/icon-76.png
new file mode 100644
index 000000000..a911ab676
Binary files /dev/null and b/resources/ios/icon/icon-76.png differ
diff --git a/resources/ios/icon/icon-76@2x.png b/resources/ios/icon/icon-76@2x.png
new file mode 100644
index 000000000..d99575cb0
Binary files /dev/null and b/resources/ios/icon/icon-76@2x.png differ
diff --git a/resources/ios/icon/icon-76@3x.png b/resources/ios/icon/icon-76@3x.png
new file mode 100644
index 000000000..00a30a3ce
Binary files /dev/null and b/resources/ios/icon/icon-76@3x.png differ
diff --git a/resources/ios/icon/icon-83.5@2x.png b/resources/ios/icon/icon-83.5@2x.png
new file mode 100644
index 000000000..547c471ff
Binary files /dev/null and b/resources/ios/icon/icon-83.5@2x.png differ
diff --git a/resources/ios/icon/icon-86@2x.png b/resources/ios/icon/icon-86@2x.png
new file mode 100644
index 000000000..c17da6b82
Binary files /dev/null and b/resources/ios/icon/icon-86@2x.png differ
diff --git a/resources/ios/icon/icon-98@2x.png b/resources/ios/icon/icon-98@2x.png
new file mode 100644
index 000000000..e2e24138b
Binary files /dev/null and b/resources/ios/icon/icon-98@2x.png differ
diff --git a/resources/ios/icon/icon-small.png b/resources/ios/icon/icon-small.png
new file mode 100644
index 000000000..f3da0e773
Binary files /dev/null and b/resources/ios/icon/icon-small.png differ
diff --git a/resources/ios/icon/icon-small@2x.png b/resources/ios/icon/icon-small@2x.png
new file mode 100644
index 000000000..969e7632c
Binary files /dev/null and b/resources/ios/icon/icon-small@2x.png differ
diff --git a/resources/ios/icon/icon-small@3x.png b/resources/ios/icon/icon-small@3x.png
new file mode 100644
index 000000000..b03a5b3bc
Binary files /dev/null and b/resources/ios/icon/icon-small@3x.png differ
diff --git a/resources/ios/icon/icon.png b/resources/ios/icon/icon.png
index 89f8c00f7..fcf937d4c 100644
Binary files a/resources/ios/icon/icon.png and b/resources/ios/icon/icon.png differ
diff --git a/resources/ios/icon/icon@2x.png b/resources/ios/icon/icon@2x.png
new file mode 100644
index 000000000..8cc7e2886
Binary files /dev/null and b/resources/ios/icon/icon@2x.png differ
diff --git a/resources/ios/icon/ionic-logo/icon-1024.png b/resources/ios/icon/ionic-logo/icon-1024.png
new file mode 100644
index 000000000..bee77667f
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon-1024.png differ
diff --git a/resources/ios/icon/ionic-logo/icon-40.png b/resources/ios/icon/ionic-logo/icon-40.png
new file mode 100644
index 000000000..76cc53c34
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon-40.png differ
diff --git a/resources/ios/icon/ionic-logo/icon-40@2x.png b/resources/ios/icon/ionic-logo/icon-40@2x.png
new file mode 100644
index 000000000..64b490691
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon-40@2x.png differ
diff --git a/resources/ios/icon/ionic-logo/icon-40@3x.png b/resources/ios/icon/ionic-logo/icon-40@3x.png
new file mode 100644
index 000000000..9f8c8f0f3
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon-40@3x.png differ
diff --git a/resources/ios/icon/ionic-logo/icon-50.png b/resources/ios/icon/ionic-logo/icon-50.png
new file mode 100644
index 000000000..8bd51dfd3
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon-50.png differ
diff --git a/resources/ios/icon/ionic-logo/icon-50@2x.png b/resources/ios/icon/ionic-logo/icon-50@2x.png
new file mode 100644
index 000000000..2676f8f69
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon-50@2x.png differ
diff --git a/resources/ios/icon/ionic-logo/icon-60.png b/resources/ios/icon/ionic-logo/icon-60.png
new file mode 100644
index 000000000..11f391244
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon-60.png differ
diff --git a/resources/ios/icon/ionic-logo/icon-60@2x.png b/resources/ios/icon/ionic-logo/icon-60@2x.png
new file mode 100644
index 000000000..b52104828
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon-60@2x.png differ
diff --git a/resources/ios/icon/ionic-logo/icon-60@3x.png b/resources/ios/icon/ionic-logo/icon-60@3x.png
new file mode 100644
index 000000000..dbc830308
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon-60@3x.png differ
diff --git a/resources/ios/icon/ionic-logo/icon-72.png b/resources/ios/icon/ionic-logo/icon-72.png
new file mode 100644
index 000000000..4e5a82761
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon-72.png differ
diff --git a/resources/ios/icon/ionic-logo/icon-72@2x.png b/resources/ios/icon/ionic-logo/icon-72@2x.png
new file mode 100644
index 000000000..56fb29e64
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon-72@2x.png differ
diff --git a/resources/ios/icon/ionic-logo/icon-76.png b/resources/ios/icon/ionic-logo/icon-76.png
new file mode 100644
index 000000000..e66a90ed6
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon-76.png differ
diff --git a/resources/ios/icon/ionic-logo/icon-76@2x.png b/resources/ios/icon/ionic-logo/icon-76@2x.png
new file mode 100644
index 000000000..3f5c942fa
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon-76@2x.png differ
diff --git a/resources/ios/icon/ionic-logo/icon-83.5@2x.png b/resources/ios/icon/ionic-logo/icon-83.5@2x.png
new file mode 100644
index 000000000..2b367cbc6
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon-83.5@2x.png differ
diff --git a/resources/ios/icon/ionic-logo/icon-small.png b/resources/ios/icon/ionic-logo/icon-small.png
new file mode 100644
index 000000000..de3146dc7
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon-small.png differ
diff --git a/resources/ios/icon/ionic-logo/icon-small@2x.png b/resources/ios/icon/ionic-logo/icon-small@2x.png
new file mode 100644
index 000000000..916a02ec4
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon-small@2x.png differ
diff --git a/resources/ios/icon/ionic-logo/icon-small@3x.png b/resources/ios/icon/ionic-logo/icon-small@3x.png
new file mode 100644
index 000000000..0efa99d86
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon-small@3x.png differ
diff --git a/resources/ios/icon/ionic-logo/icon.png b/resources/ios/icon/ionic-logo/icon.png
new file mode 100644
index 000000000..89f8c00f7
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon.png differ
diff --git a/resources/ios/icon/ionic-logo/icon@2x.png b/resources/ios/icon/ionic-logo/icon@2x.png
new file mode 100644
index 000000000..a6687a10c
Binary files /dev/null and b/resources/ios/icon/ionic-logo/icon@2x.png differ
diff --git a/resources/ios/splash.png b/resources/ios/splash.png
new file mode 100644
index 000000000..684e4c37a
Binary files /dev/null and b/resources/ios/splash.png differ
diff --git a/resources/ios/splash/Default-1792h~iphone.png b/resources/ios/splash/Default-1792h~iphone.png
new file mode 100644
index 000000000..fff5f4afb
Binary files /dev/null and b/resources/ios/splash/Default-1792h~iphone.png differ
diff --git a/resources/ios/splash/Default-2436h.png b/resources/ios/splash/Default-2436h.png
new file mode 100644
index 000000000..07823a435
Binary files /dev/null and b/resources/ios/splash/Default-2436h.png differ
diff --git a/resources/ios/splash/Default-2688h~iphone.png b/resources/ios/splash/Default-2688h~iphone.png
new file mode 100644
index 000000000..1ddda9e28
Binary files /dev/null and b/resources/ios/splash/Default-2688h~iphone.png differ
diff --git a/resources/ios/splash/Default-568h@2x~iphone.png b/resources/ios/splash/Default-568h@2x~iphone.png
new file mode 100644
index 000000000..8bf2f6c64
Binary files /dev/null and b/resources/ios/splash/Default-568h@2x~iphone.png differ
diff --git a/resources/ios/splash/Default-667h.png b/resources/ios/splash/Default-667h.png
new file mode 100644
index 000000000..2c92ebdc0
Binary files /dev/null and b/resources/ios/splash/Default-667h.png differ
diff --git a/resources/ios/splash/Default-736h.png b/resources/ios/splash/Default-736h.png
new file mode 100644
index 000000000..9489db0eb
Binary files /dev/null and b/resources/ios/splash/Default-736h.png differ
diff --git a/resources/ios/splash/Default-Landscape-1792h~iphone.png b/resources/ios/splash/Default-Landscape-1792h~iphone.png
new file mode 100644
index 000000000..273eabfa8
Binary files /dev/null and b/resources/ios/splash/Default-Landscape-1792h~iphone.png differ
diff --git a/resources/ios/splash/Default-Landscape-2436h.png b/resources/ios/splash/Default-Landscape-2436h.png
new file mode 100644
index 000000000..1f892a9ea
Binary files /dev/null and b/resources/ios/splash/Default-Landscape-2436h.png differ
diff --git a/resources/ios/splash/Default-Landscape-2688h~iphone.png b/resources/ios/splash/Default-Landscape-2688h~iphone.png
new file mode 100644
index 000000000..3c7b8bd0c
Binary files /dev/null and b/resources/ios/splash/Default-Landscape-2688h~iphone.png differ
diff --git a/resources/ios/splash/Default-Landscape-736h.png b/resources/ios/splash/Default-Landscape-736h.png
new file mode 100644
index 000000000..ca75d764b
Binary files /dev/null and b/resources/ios/splash/Default-Landscape-736h.png differ
diff --git a/resources/ios/splash/Default-Landscape@2x~ipad.png b/resources/ios/splash/Default-Landscape@2x~ipad.png
new file mode 100644
index 000000000..913e66781
Binary files /dev/null and b/resources/ios/splash/Default-Landscape@2x~ipad.png differ
diff --git a/resources/ios/splash/Default-Landscape@~ipadpro.png b/resources/ios/splash/Default-Landscape@~ipadpro.png
new file mode 100644
index 000000000..9910860f3
Binary files /dev/null and b/resources/ios/splash/Default-Landscape@~ipadpro.png differ
diff --git a/resources/ios/splash/Default-Landscape~ipad.png b/resources/ios/splash/Default-Landscape~ipad.png
new file mode 100644
index 000000000..b004356b8
Binary files /dev/null and b/resources/ios/splash/Default-Landscape~ipad.png differ
diff --git a/resources/ios/splash/Default-Portrait@2x~ipad.png b/resources/ios/splash/Default-Portrait@2x~ipad.png
new file mode 100644
index 000000000..9f9058be1
Binary files /dev/null and b/resources/ios/splash/Default-Portrait@2x~ipad.png differ
diff --git a/resources/ios/splash/Default-Portrait@~ipadpro.png b/resources/ios/splash/Default-Portrait@~ipadpro.png
new file mode 100644
index 000000000..6eb4fa8e0
Binary files /dev/null and b/resources/ios/splash/Default-Portrait@~ipadpro.png differ
diff --git a/resources/ios/splash/Default-Portrait~ipad.png b/resources/ios/splash/Default-Portrait~ipad.png
new file mode 100644
index 000000000..b03f74065
Binary files /dev/null and b/resources/ios/splash/Default-Portrait~ipad.png differ
diff --git a/resources/ios/splash/Default@2x~ipad~anyany.png b/resources/ios/splash/Default@2x~ipad~anyany.png
new file mode 100644
index 000000000..684e4c37a
Binary files /dev/null and b/resources/ios/splash/Default@2x~ipad~anyany.png differ
diff --git a/resources/ios/splash/Default@2x~ipad~comany.png b/resources/ios/splash/Default@2x~ipad~comany.png
new file mode 100644
index 000000000..1dd337cfe
Binary files /dev/null and b/resources/ios/splash/Default@2x~ipad~comany.png differ
diff --git a/resources/ios/splash/Default@2x~iphone.png b/resources/ios/splash/Default@2x~iphone.png
new file mode 100644
index 000000000..3a7e9f68e
Binary files /dev/null and b/resources/ios/splash/Default@2x~iphone.png differ
diff --git a/resources/ios/splash/Default@2x~iphone~anyany.png b/resources/ios/splash/Default@2x~iphone~anyany.png
new file mode 100644
index 000000000..5fdfc9a53
Binary files /dev/null and b/resources/ios/splash/Default@2x~iphone~anyany.png differ
diff --git a/resources/ios/splash/Default@2x~iphone~comany.png b/resources/ios/splash/Default@2x~iphone~comany.png
new file mode 100644
index 000000000..15e991917
Binary files /dev/null and b/resources/ios/splash/Default@2x~iphone~comany.png differ
diff --git a/resources/ios/splash/Default@2x~iphone~comcom.png b/resources/ios/splash/Default@2x~iphone~comcom.png
new file mode 100644
index 000000000..fa614f6d1
Binary files /dev/null and b/resources/ios/splash/Default@2x~iphone~comcom.png differ
diff --git a/resources/ios/splash/Default@2x~universal~anyany.png b/resources/ios/splash/Default@2x~universal~anyany.png
new file mode 100644
index 000000000..a0a215a5a
Binary files /dev/null and b/resources/ios/splash/Default@2x~universal~anyany.png differ
diff --git a/resources/ios/splash/Default@3x~iphone~anyany.png b/resources/ios/splash/Default@3x~iphone~anyany.png
new file mode 100644
index 000000000..cd4e28d5b
Binary files /dev/null and b/resources/ios/splash/Default@3x~iphone~anyany.png differ
diff --git a/resources/ios/splash/Default@3x~iphone~anycom.png b/resources/ios/splash/Default@3x~iphone~anycom.png
new file mode 100644
index 000000000..19df4b937
Binary files /dev/null and b/resources/ios/splash/Default@3x~iphone~anycom.png differ
diff --git a/resources/ios/splash/Default@3x~iphone~comany.png b/resources/ios/splash/Default@3x~iphone~comany.png
new file mode 100644
index 000000000..028de9424
Binary files /dev/null and b/resources/ios/splash/Default@3x~iphone~comany.png differ
diff --git a/resources/ios/splash/Default~iphone.png b/resources/ios/splash/Default~iphone.png
new file mode 100644
index 000000000..d3c0a94a3
Binary files /dev/null and b/resources/ios/splash/Default~iphone.png differ
diff --git a/scripts/application/SunbirdApplication.java b/scripts/application/SunbirdApplication.java
index 2e7bc6cc4..d84234d90 100644
--- a/scripts/application/SunbirdApplication.java
+++ b/scripts/application/SunbirdApplication.java
@@ -1,6 +1,6 @@
 package org.sunbird;
 
-import android.support.multidex.MultiDexApplication;
+import androidx.multidex.MultiDexApplication;
 
 import com.crashlytics.android.Crashlytics;
 
@@ -12,15 +12,17 @@
  * Created by swayangjit on 12/4/19.
  */
 public class SunbirdApplication extends MultiDexApplication {
-  public static final String PACKAGE_NAME = "org.sunbird.app";
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    initCrashlytics();
-  }
-  private void initCrashlytics() {
-    if (BuildConfigUtil.getBuildConfigValue(PACKAGE_NAME, "USE_CRASHLYTICS")) {
-      Fabric.with(this, new Crashlytics());
+    public static final String PACKAGE_NAME = "org.sunbird.app";
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        initCrashlytics();
+    }
+
+    private void initCrashlytics() {
+        if (BuildConfigUtil.getBuildConfigValue(PACKAGE_NAME, "USE_CRASHLYTICS")) {
+            Fabric.with(this, new Crashlytics());
+        }
     }
-  }
 }
diff --git a/scripts/deleteUnUsableIosIcon.js b/scripts/deleteUnUsableIosIcon.js
index 13089fea9..7d578cebe 100644
--- a/scripts/deleteUnUsableIosIcon.js
+++ b/scripts/deleteUnUsableIosIcon.js
@@ -6,78 +6,128 @@ function deleteUnUsableIosIcon(ionicIconFilePath) {
         const files = fs.readdirSync(ionicIconFilePath);
         files.forEach(function (file) {
             if (!([
-                'ios-add.svg',
-                'ios-close.svg',
-                'ios-arrow-dropright-circle.svg',
-                'ios-arrow-dropdown.svg',
-                'ios-arrow-dropup.svg',
-                'ios-arrow-up.svg',
-                'ios-arrow-down.svg',
-                'ios-alert.svg',
-                'ios-star.svg',
-                'ios-cloud-download.svg',
-                'ios-trash.svg',
-                'ios-share.svg',
-                'ios-information-circle-outline.svg',
-                'ios-star-outline.svg',
-                'ios-refresh.svg',
-                'ios-print.svg',
-                'ios-sad.svg',
-                'ios-warning.svg',
-                'ios-arrow-back.svg',
-                'ios-arrow-forward.svg',
-                'ios-albums.svg',
-                'ios-information-circle.svg',
-                'ios-settings.svg',
-                'ios-person.svg',
-                'ios-stats.svg',
-                'ios-checkmark.svg',
-                'ios-remove.svg',
-                'ios-play.svg',
-                'ios-notifications.svg',
-                'ios-notifications-outline.svg',
-                'md-add.svg',
-                'md-trash.svg',
-                'md-share.svg',
-                'md-arrow-back.svg',
-                'md-arrow-dropdown.svg',
-                'md-arrow-dropup.svg',
-                'md-cloud-download.svg',
-                'md-star.svg',
-                'md-star-outline.svg',
-                'md-close.svg',
-                'md-start.svg',
-                'md-arrow-dropright-circle.svg',
-                'md-alert.svg',
+                "add.svg",
+                "close.svg",
+                "caret-forward-circle", // ionic 4 -> 5, md replacement of "arrow-dropright-circle.svg",
+                "chevron-forward-circle", // ionic 4 -> 5, ios replacement of "arrow-dropright-circle.svg",
+                "caret-down-circle", // ionic 4 -> 5, md replacement of "arrow-dropdown.svg",
+                "chevron-down-circle", // ionic 4 -> 5, ios replacement of "arrow-dropdown.svg",
+                "caret-up", // ionic 4 -> 5, md replacement of "arrow-dropup.svg",
+                "chevron-up-circle-outline", // ionic 4 -> 5, ios replacement of "arrow-dropup.svg",
+                "arrow-up.svg",
+                "arrow-down.svg",
+                "alert.svg",
+                "star.svg",
+                "cloud-download.svg",
+                "trash.svg",
+                "share.svg",
+                "information-circle-outline.svg",
+                "star-outline.svg",
+                "refresh.svg",
+                "print.svg",
+                "sad.svg",
+                "warning.svg",
+                "arrow-back.svg",
+                "arrow-forward.svg",
+                "albums.svg",
+                "information-circle.svg",
+                "settings.svg",
+                "person.svg",
+                "stats-chart", // ionic 4 -> 5, renamed from stats.svg",
+                "checkmark.svg",
+                "remove.svg",
+                "play.svg",
+                "notifications.svg",
+                "notifications-circle-outline", // ionic 4 -> 5, replacement of "notifications-outline.svg",
+                "arrow-forward", // ionic 4 -> 5, replacement of "arrow-round-forward.svg",
+                "refresh-circle.svg",
+                "start.svg",
+                "ellipsis-horizontal.svg", // ionic 4 -> 5, ios replacement of "more.svg",
+                "ellipsis-vertical.svg", // ionic 4 -> 5, md replacement of "more.svg",
+                "time.svg",
+                "checkmark-circle.svg",
+                "create.svg",
+                "call.svg",
+                "mail.svg",
+                "arrow-down.svg", // ionic 4 -> 5, replacement of "arrow-round-down.svg",
+                "download.svg",
+                "search.svg",
+                "close-circle.svg",
+                "eye.svg",
+                "alert-circle-outline.svg",
+                'image-outline.svg',
+                'camera.svg',
+                'cloud-upload.svg',
+                'caret-down.svg',
+                'caret-forward.svg',
+                'cloud-done.svg',
+                'cloud-offline.svg',
+                'document.svg',
+                'radio-button-off-outline.svg',
+                'share-social.svg',
+                'calendar.svg',
+                'newspaper.svg',
+                'attach.svg',
+                'image.svg',
+                'map.svg',
+                'book.svg',
+                'checkmark-circle.svg',
+                'caret-down-outline.svg',
+                'caret-forward-outline.svg',
+                'location-outline.svg',
+                'link-outline.svg',
+                'caret-down.svg',
+                'radio-button-off.svg',
+                'md-location.svg',
+                'md-link.svg',
+                'funnel.svg',
+                'clipboard.svg',
+                'caret-down.svg',
+                'radio-button-off.svg',
+                'md-document.svg',
+                'volume-medium.svg',
                 'md-more.svg',
-                'md-time.svg',
-                'md-checkmark-circle.svg',
-                'md-refresh.svg',
-                'md-print.svg',
-                'md-create.svg',
-                'md-call.svg',
-                'md-mail.svg',
-                'md-arrow-round-down.svg',
-                'md-arrow-round-forward.svg',
-                'md-download.svg',
-                'md-search.svg',
+                'md-caret-down.svg',
+                'person.svg',
+                'calendar.svg',
+                'chevron-forward.svg',
+                'cloud-outline.svg',
+                'ellipsis-vertical.svg',
+                'caret-down.svg',
+                'arrow-dropup-circle.svg',
+                'add-circle.svg',
+                'arrow-dropdown.svg',
+                'arrow-dropright.svg',
+                'musical-notes.svg',
+                'videocam.svg',
                 'md-information-circle.svg',
-                'md-settings.svg',
-                'md-person.svg',
-                'md-stats.svg',
-                'md-checkmark.svg',
-                'md-remove.svg',
-                'md-play.svg',
-                'md-notifications.svg',
-                'md-notifications-outline.svg'
+                'bulb.svg',
+                'list.svg',
+                'checkmark-circle.svg',
+                'contrast.svg',
+                'cloud-done.svg',
+                'save.svg',
+                'chevron-up-circle.svg',
+                'cloud-upload.svg',
+                'options.svg',
+                'more.svg',
+                'ellipsis-vertical-outline.svg',
+                'document-text.svg',
+                'caret-down-circle.svg',
+                'file-tray-full.svg',
+                'close-sharp.svg',
+                'search-outline".svg',
+                'pricetag-outline.svg',
+                'play-skip-forward.svg',
+                'chckmark.svg',
+                'share-social.svg'
             ].includes(file))) {
-                fs.unlinkSync(ionicIconFilePath+'/'+file);
+                fs.unlinkSync(ionicIconFilePath + '/' + file);
             }
         });
     } catch (e) {
         console.error(e);
     }
-
 }
 
 module.exports = function (context) {
diff --git a/sonar-project.properties b/sonar-project.properties
index f8cc1cd4c..3554a571d 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -8,3 +8,4 @@ sonar.projectKey=Sunbird-Ed_SunbirdEd-mobile-app
 sonar.host.url=https://sonarcloud.io
 sonar.organization=sunbird-ed
 sonar.projectVersion=1.0
+sonar.coverage.exclusions=**/*.module.ts, src/app/animations/*.ts
diff --git a/src/__tests__/setup.js b/src/__tests__/setup.js
index c434e9135..2b346440c 100644
--- a/src/__tests__/setup.js
+++ b/src/__tests__/setup.js
@@ -6,6 +6,9 @@ window.dayjs = require('dayjs')
 
 global.cordova = {
     plugins: {
+        InAppUpdateManager: {
+            checkForImmediateUpdate: () => {}
+        },
         notification: {
             local: {
                 lanchDetails: {},
@@ -14,14 +17,24 @@ global.cordova = {
             }
         },
         diagnostic: {
-            switchToSettings: () => { }
+            switchToSettings: () => { },
+            getPermissionAuthorizationStatus: () => { },
+            permissionStatus: {
+                DENIED_ALWAYS: 'DENIED_ALWAYS'
+            }
         },
         printer: {
             print: () => { }
+        },
+        permissions: {
+            checkPermission: () => { },
+            requestPermissions: () => { },
+            checkPermission: () => { }
         }
     },
     file: {
-        applicationDirectory: "/path"
+        applicationDirectory: "/path",
+        externalRootDirectory: '/path'
     },
     InAppBrowser: {
         open: () => ({
@@ -58,6 +71,7 @@ global.splashscreen = {
     markImportDone: () => { },
     hide: () => { },
     clearPrefs: () => { },
+    setContent: () => { }
 }
 
 global.codePush = {
@@ -70,3 +84,31 @@ global.SyncStatus = {
     INSTALLING_UPDATE: 'INSTALLING_UPDATE',
     ERROR: 'ERROR'
 }
+
+global.plugins = {
+    webViewChecker: {
+        getCurrentWebViewPackageInfo: () => Promise.resolve({versionName: '0'}),
+        openGooglePlayPage: () => Promise.resolve()
+    }
+}
+global.FCMPlugin = {
+    getToken: () => {},
+    onNotification: () => {},
+    onTokenRefresh: () => {},
+    subscribeToTopic: () => {},
+    unsubscribeFromTopic: () => {}
+}
+
+global.sbsync = {
+    onSyncSucces: () => {}
+}
+
+global.qrScanner = {
+    startScanner: (screenTitle, displayText, displayTextColor, buttonText, showButton, isRTL, callback) => {},
+    stopScanner: () => {}
+}
+
+global.downloadManager = {
+    enqueue: () => { }
+}
+
diff --git a/src/app.scss b/src/app.scss
index 8d49b364e..cb2af13ec 100644
--- a/src/app.scss
+++ b/src/app.scss
@@ -16,7 +16,8 @@
 @import "./assets/styles/rtl_helper";
 @import "./assets/styles/details_page";
 @import "./assets/styles/fonts";
-@import "./assets/styles/variables";
+@import "./assets/styles/themeable";
+@import "./assets/styles/default-theme";
 
 :root {
   --ion-default-font: "NotoSans";
@@ -57,7 +58,7 @@ h6 {
   @extend .NotoSans;
 }
 .sb-legal-url {
-  color: #0a55a0;
+  color: map-get($colors, bright_blue_a0);
   font-size: 14px;
   text-decoration: underline;
 }
@@ -69,7 +70,7 @@ h6 {
 }
 
 .tool-icon {
-  width: 25px;
+  width: 27px;
   height: auto;
   // margin: 10px;
   float: right;
@@ -85,6 +86,9 @@ h6 {
 .padding-bottom-5 {
   padding-bottom: 5px;
 }
+.padding-16{
+  padding: 16px;
+}
 
 .text-align-end {
   text-align: end;
@@ -189,10 +193,10 @@ ul.rating .ion-md-star-outline:before {
   padding-right: 10px;
 }
 .popover-ratings ion-icon.filled {
-  color: #024f9d !important;
+  color: $blue !important;
 }
 .small-rating ion-icon.filled {
-  color: #024f9d !important;
+  color: $blue !important;
 }
 
 .select-box {
@@ -210,14 +214,14 @@ ul.rating .ion-md-star-outline:before {
 }
 
 .select-box.select-alert .alert-button:first-child:not(:only-child) {
-  background: transparent !important;
-  color: map-get($colors, primary) !important;
+  background: transparent;
+  color: map-get($colors, primary);
   // margin-right: 1%;
 }
 
 .select-box.select-alert .alert-button:last-child:not(:only-child) {
-  background: map-get($colors, primary) !important;
-  color: map-get($colors, white) !important;
+  background: map-get($colors, primary);
+  color: map-get($colors, white);
   // margin-left: 5%;
 }
 
@@ -234,7 +238,7 @@ ul.rating .ion-md-star-outline:before {
     text-transform: uppercase;
     border-style: solid;
     border-width: 1px;
-    border-radius: 4px !important;
+    border-radius: 4px;
     overflow: hidden;
     height: 2.8rem;
     font-size: 1rem;
@@ -430,7 +434,7 @@ ul.rating .ion-md-star-outline:before {
 .separator-dot {
   width: 4px;
   height: 4px;
-  background-color: #d8d8d8;
+  background-color: map-get($colors, light_silver);
   border-radius: 50%;
   display: inline-block;
   vertical-align: middle;
@@ -535,7 +539,7 @@ ion-toolbar {
   margin-top: 10px;
 }
 .error {
-  color: #e76026;
+  color: map-get($colors, bright_red_e7);
 }
 
 .flex-container {
@@ -613,7 +617,7 @@ ion-toolbar {
 }
 
 .lighter {
-  color: #9b9b9b;
+  color: map-get($colors, gray_9b);
 }
 
 .MR10 {
@@ -652,6 +656,10 @@ ion-toolbar {
   text-transform: lowercase;
 }
 
+.txt-uppercase {
+  text-transform: uppercase;
+}
+
 .txt-capitalize {
   text-transform: capitalize;
 }
@@ -678,7 +686,7 @@ ion-toolbar {
   vertical-align: sub;
   margin-right: 13px;
   font-size: 1.8em !important;
-  color: #a4a4a4;
+  color:map-get($colors, gray_solid);
 }
 .info-icon-text {
   font-size: 10px;
@@ -707,7 +715,7 @@ ion-toolbar {
   max-height: 100% !important;
 }
 .qr-alert-invalid ion-backdrop {
-  background-color: #000 !important;
+  background-color: map-get($colors, black) !important;
   opacity: 0.4 !important;
 }
 
@@ -767,7 +775,7 @@ ion-toast {
   --ion-safe-area-bottom: -8px;
 }
 ion-toast.redErrorToast {
-  --background: #ff0000;
+  --background: #{map-get($colors, vivid_red)};
 }
 
 ion-toast.sb-toast.available-later {
@@ -782,7 +790,7 @@ ion-toast.sb-toast.available-later {
   box-shadow: 0 -1px 1px 0 rgba(0, 0, 0, 0.16), 0 2px 1px 0 rgba(0, 0, 0, 0.24);
 }
 ion-toast.green-toast{
-  --background: #008000;
+  --background: #{map-get($colors, office_green)};
 }
 
 .btn-block {
@@ -803,7 +811,7 @@ ion-toast.green-toast{
   background: transparent;
   opacity: 1;
   z-index: 11;
-  color: #fff;
+  color: map-get($colors, white);
 
   .bg {
     position: absolute;
@@ -894,8 +902,8 @@ ion-toast.green-toast{
 }
 
 .no-net-popup {
-  --background: #e55a28 !important;
-  --color: #fff !important;
+  --background: #{$orange} !important;
+  --color: #{$white} !important;
 }
 
 .no-net-close-btn {
@@ -910,7 +918,23 @@ ion-split-pane {
   .popover-content {
     top: 168.273px !important;
     left: 220px !important;
-    --box-shadow: 0px 3px 6px 5px #eee;
+    --box-shadow: 0px 3px 6px 5px #{map-get($colors, empty_color)};
+    transform-origin: right top;
+    transform: scale(1);
+    width: 45% !important;
+    .list-md {
+      padding-top: 0px !important;
+      padding-bottom: 0px !important;
+    }
+    ion-backdrop {
+      opacity: 0;
+    }
+  }
+}
+.cd-leave-training-popup {
+  .popover-content {
+    top: 80px !important;
+    // --box-shadow: 0px 3px 6px 5px #eee;
     transform-origin: right top;
     transform: scale(1);
     width: 36% !important;
@@ -929,7 +953,7 @@ ion-split-pane {
     padding: 0 !important;
     height: 3.11%;
     width: 93.33%;
-    color: #999999;
+    color: $gray-300;
     font-size: 12px;
     line-height: 18px;
     font-weight: bold;
@@ -953,10 +977,10 @@ ion-split-pane {
   .sb-ftue-design {
     width: 100%;
     font-size: 1.4rem;
-    background: #fff;
+    background: map-get($colors, white);
     @include margin(10px 0px 0px 0px);
     border: 0.5px solid rgba(35, 97, 255, 0.5);
-    background-color: #ffffff;
+    background-color: map-get($colors, white);
     box-shadow: 0 3px 4px 0 rgba(2, 79, 157, 0.1);
     .sb-play-unselected {
       color: $blue;
@@ -1071,7 +1095,7 @@ ion-split-pane {
     text-transform: uppercase;
     border-style: solid;
     border-width: 1px;
-    border-radius: 4px !important;
+    border-radius: 4px;
     overflow: hidden;
     height: 2.8rem;
     font-size: 1rem;
@@ -1089,21 +1113,19 @@ ion-split-pane {
 
 
 .ftue-changes.select-alert .alert-button:last-child:not(:only-child) {
-  background: map-get($colors, primary) !important;
+  background: map-get($colors, primary);
   color: map-get($colors, white) !important;
   // margin-left: 5%;
 }
 
-.enrolled-course-bg > sb-course-cards-hlist > .layout-course > .header > .title{
-  color: white !important;
-}
-
 sb-course-cards-hlist > .layout-course > .header > .sb-btn-outline-secondary{
-    color: #024F9D;
+    color: $blue;
 }
 
-sb-course-cards-hlist > .layout-course > .header{
-  padding: 0 8px !important;
+sb-course-cards-hlist > .layout-course > .header > .title{
+  color: var(--app-gray) !important;
+  font-size: 16px !important;
+  height: auto !important;
 }
 
 app-courses{
@@ -1112,15 +1134,39 @@ app-courses{
       margin-top: 2px !important;
     }
   }
+  sb-course-cards-hlist{
+    .title{
+      height: auto !important;
+    }
+  }
+}
+
+sb-course-cards-hlist, sb-library-cards-hlist{
+  .view-all{
+    .sb-btn-oval{
+      color: var(--app-primary) !important;
+      border-radius: 50% !important;
+      border: none;
+    }
+  }
+}
+
+sb-library-cards-hlist {
+  .layout-course {
+    padding: 0 0.5rem;
+  }
+  .title {
+    font-size: 18px !important;
+  }
 }
 
 .card-section-secondary{
-  color: #666666;
+  color: map-get($colors, granite_gray);
   font-family: "Noto Sans";
 }
 
 .card-section-danger{
-  color: #E55A28;
+  color: $orange;
   font-family: "Noto Sans";
 }
 
@@ -1133,6 +1179,10 @@ sb-course-cards-hlist > .layout-course > .sb--scrolling-wrapper-flexbox {
   padding-left: 8px;
 }
 
+sb-course-cards-hlist > .layout-course > .sb--scrolling-wrapper-flexbox > .sb--card--container:last-child {
+  padding-right: 8px;
+}
+
 app-resources{
 
   .fixed-container{
@@ -1157,6 +1207,18 @@ app-resources{
     .title{
       font-size: 18px !important;
       font-weight: bold;
+      padding-left: 1rem;
+    }
+
+    .sbbtn{
+      border-radius: 3rem !important;
+      background-color: transparent !important;
+      color: var(--app-primary) !important;
+      border: 1px solid var(--app-primary-light-2) !important;
+      margin: 2%;
+      margin-bottom: 0;
+      width: 96% !important;
+      padding: 0.75rem !important;
     }
   }
 
@@ -1169,9 +1231,742 @@ app-resources{
     .sb--card__meta1{
       padding-top: 8px;
     }
+
+    .sb--card{
+      margin-top: 2px !important;
+      box-shadow: 0px 1px 4px 2px rgba(var(--rc-rgba-black),0.16) !important;
+    }
   }
 
 }
 .popover-viewport{
   animation-name: none !important;
 }
+
+.sb-btn-large {
+  background-color: $blue;
+  border: none;
+  color: white;
+  text-align: center;
+  text-decoration: none;
+  display: inline-block;
+  font-size: 16px;
+  margin: 4px 0px;
+  cursor: pointer;
+  outline: none;
+  margin-bottom: 8px;
+  width: 100%;
+  padding: 16px 0px 16px 0px;
+}
+.sb-btn-small{
+  padding: 8px;
+  width: auto;
+}
+
+.popover-my-groups {
+  .mg-popup-container{
+    height: 100%;
+  }
+  .mg-popup-content {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    justify-content: space-between;
+  }
+  .mg-popup-content-member{
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    justify-content: space-evenly;
+  }
+  .mg-popup-close{
+    position: absolute;
+    top: 0;
+    right: 0;
+    color: $blue;
+    font-size: 25px;
+  }
+  .mg-popup-title{
+    font-size: 18px;
+    font-weight: bold;
+    text-align: center;
+    padding-top: 16px;
+    .am-title{
+      font-size: 18px;
+    }
+    .am-desc{
+      font-size: 16px;
+      font-weight: normal;
+    }
+  }
+  .am-step{
+    font-weight: bold;
+    span{
+      color: $orange;
+    }
+  }
+  .mg-popup-content-body{
+    text-align: center;
+  }
+  .mg-popup-btn{
+    position: relative;
+    .mg-popup-btn-icon{
+      position: absolute;
+      right: 16px;
+      font-size: 32px;
+      top: 7px;
+    }
+  }
+}
+app-manage-user-profiles{
+  sb-member-card{
+    .members-list-item{
+      border: none !important;
+    }
+  }
+}
+
+app-application-header{
+  .add-manage-user{
+    sb-member-card{
+      .sb-member__img{
+        background-color: map-get($colors, light_grayish_green) !important;
+        color: $green !important;
+      }
+      .sb-member__name{
+        color: $green !important;
+      }
+    }
+  }
+
+  .more-manage-user{
+    sb-member-card{
+      .sb-member__img{
+        padding-bottom: 1rem !important;
+        color: map-get($colors, primary_black) !important;
+      }
+      .sb-member__name{
+        color: map-get($colors, primary_black) !important;
+      }
+    }
+  }
+
+  .managed-user-container{
+    sb-member-card{
+      .sb-members-list-item{
+        display: inline-flex !important;
+      }
+    }
+  }
+}
+
+app-manage-user-profiles{
+  .mu-selected-user{
+    sb-member-card{
+      .sb-member__name{
+        font-weight: bold !important;
+        color: $blue !important;
+      }
+    }
+  }
+}
+ion-modal.sb-progress-loader {
+  z-index: 50000 !important;
+}
+.tutorial-popover {
+  .popover-wrapper {
+    width: calc(100vw - 50px);
+    height: calc(100vh - 52px);
+    .popover-content {
+      width: calc(100vw - 50px);
+      height: calc(100vh - 52px);
+      max-height: calc(100vh - 52px);
+      overflow: visible;
+      border-radius: 6px;
+    }
+  }
+}
+.bold {
+  color: map-get($colors, strong_green);
+  font-weight: bold;
+}
+
+.group-option-popover {
+  padding: 16px;
+  ion-item {
+    font-size: 14px;
+    font-family: "Noto Sans";
+  }
+
+  ion-item:nth-child(1) {
+    color: map-get($colors, primary_black);
+  }
+  ion-item:last-child {
+    color: $red;
+  }
+}
+.group-option-popover-admin {
+  ion-item:nth-child(1) {
+    color: $red;
+  }
+}
+
+.group-option-popover .popover-content {
+  padding: 16px 8px;
+  width: auto;
+  margin-top: -30px;
+  ion-item {
+    --min-height: 16px !important;
+    padding-top: 16px;
+    &:first-child{
+      padding-top: 0;
+    }
+    label{
+      margin: 0;
+    }
+    .item-inner{
+      padding: 0;
+    }
+  }
+}
+.my-group-menu {
+  .popover-content{
+    margin-top: -30px;
+  }
+}
+.sb-course-completion-popover{
+  .popover-content{
+    left: 0 !important;
+    right: 0 !important;
+    margin: auto;
+    width: 250px !important;
+    padding: 16px;
+  }
+  .cc-popup-close{
+    font-size: 18px;
+  }
+  .course-completion-title{
+    color: $green;
+    font-size: 18px;
+    font-weight: bold;
+  }
+  .course-completion-info{
+    color: $green;
+    font-size: 14px;
+    padding-top: 8px;
+  }
+  .course-completion-cert{
+    padding-top: 16px;
+  }
+}
+.sb-profile-name-confirmation-popover{
+  .popover-content{
+    left: 0 !important;
+    right: 0 !important;
+    margin: auto;
+    width: 90% !important;
+    padding: 16px;
+    position: static;
+  }
+}
+.grecaptcha-badge {
+   position: absolute;
+   top: 70vh;
+  }
+
+body {
+  .unplanned-maintenance-banner {
+    display: none;
+    background-color: #F7B500;
+  }
+
+  .tabs-inner > ion-router-outlet > .ion-page {
+    padding-top: 0;
+    transition: padding-top 1s;
+  }
+
+  &.show-maintenance {
+    .unplanned-maintenance-banner {
+      display: block;
+    }
+
+    .tabs-inner > ion-router-outlet > .ion-page {
+      padding-top: 64px;
+    }
+    app-tabs ~ .ion-page {
+      padding-top: 64px ;
+    }
+  }
+}
+
+#timer {
+  width: 100vw;
+  text-align: center;
+  max-height: 48px;
+  display: inline-block;
+  list-style-type: none;
+  text-transform: uppercase;
+  color: map-get($colors, red);
+  font-size: 2.5rem;
+}
+
+#navigate-downloads {
+  --background: #{map-get($colors, facebook)};
+}
+#planned-maintenance-banner{
+  height: 100vh; z-index: 2000; background-color: white; display: inline-block
+}
+#planned-maintenance-text {
+  margin-top: 16px; text-align: center; margin-left: 4em; margin-right: 4em;
+}
+#maintenance-sub-text {
+  text-align: center; color: grey; padding-left: 4em; padding-right: 4em;
+}
+
+.required-asterisk {
+  color: map-get($colors, red);
+}
+
+.consent-info {
+  font-size: 12px;
+  padding-left: 4em;
+}
+
+.cd-license-card {
+  ion-card {
+    margin-left: 0;
+  }
+}
+
+ion-content {
+  --background: var(--app-primary-background);
+  background: var(--app-primary-background) !important;
+}
+
+app-collection-detail-etb{
+  sb-toc-item{
+    .sbchapter__play__btn{
+      padding: 0.75rem 0.5rem !important;
+      border-radius: 2rem !important;
+      max-width: 5.5rem;
+      width: 100%;
+    }
+    sb-toc-card{
+      .sbchapter__item__title{
+        padding-top: 0.3rem;
+        font-size: 1rem!important;
+      }
+      .sbchapter__img{
+        width: 2.5rem !important;
+        height: 2.5rem !important;
+        flex: 0 0 2.5rem !important;
+      }
+      .arrange-card-items{
+        align-items: center;
+      }
+    }
+  }
+}
+
+
+._flex-box {
+  display: flex;
+  align-items: center;
+}
+
+._justify-content-center {
+  justify-content: center;
+}
+
+._justify-content-end {
+  justify-content: flex-end;
+}
+
+._vertical-center {
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+
+._flex-direction-column {
+  flex-direction: column;
+}
+
+._justify-content-space-between {
+  justify-content: space-between;
+}
+
+._container {
+  flex-wrap: wrap;
+  padding-bottom: 60px;
+}
+
+._overlay {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  z-index: 2;
+  background: rgba(0, 0, 0, 0.2);
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+
+._cards {
+  width: calc(25% - 8px) !important;
+  margin: 4px;
+  background: $white-color;
+  position: relative;
+  height: 75px;
+  border: 1px solid #e8eaed;
+  border-radius: 3px;
+
+  .iconAdj {
+    font-size: 5rem;
+  }
+
+  overflow: hidden;
+}
+
+._footer {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  border-top: 1px solid #e8eaed;
+  background: white;
+  z-index: 10;
+  padding: 5px 16px;
+}
+
+._validQuestion {
+  color: green;
+}
+
+._cardBg {
+  background: #fff;
+}
+
+._tip {
+  color: #777;
+  font-size: 12px;
+  padding-left: 10px;
+}
+.disabled-toc-card {
+  background-color: $gray-100 !important;
+  border-color: $gray-100 !important;
+}
+
+sb-pills-grid{
+  .sb-view-more-less{
+    .view-all{
+      width: 90%;
+      height: 2.75rem;
+      background-color: transparent !important;
+      color: var(--app-primary) !important;
+      box-shadow: none !important
+    }
+  }
+
+  .size--lg {
+    .img{
+      padding:0.125em !important;
+    }
+    label {
+      font-weight: bold;
+    }
+  }
+  .size--lg.sb-label-grid.hscroll {
+    padding-left: 0.25em;
+  }
+  .sb-label-grid:not(.hscroll){
+    padding-left: 0.5rem;
+    padding-right: 0.5rem;
+  }
+
+  .sb-box-grid{
+    .img{
+      width: 3.5rem;
+      img {
+        margin-right: 0 !important;
+      }
+    }
+  }
+
+  .icon-header{
+    .item{
+      height: 5.875em !important;
+      width: 22% !important;
+      .img{
+        width: 70% !important;
+      }
+    }
+  }
+
+  .sb-label-grid.show-ellipsis--two .item label {
+    white-space: nowrap !important;
+    text-overflow: ellipsis !important;
+    overflow: hidden !important;
+  
+    @supports (-webkit-line-clamp: 2) {
+      overflow: hidden !important;
+      text-overflow: ellipsis !important;
+      white-space: initial !important;
+      display: -webkit-box !important;
+      -webkit-line-clamp: 2 !important;
+      -webkit-box-orient: vertical !important;
+    }
+  }
+
+  .sb-label-grid.icon-header .item{
+    position: relative !important;
+    .img{
+      position: absolute !important;
+      top: -1.5em !important;
+      margin-top: 0 !important;
+      width: 60% !important;
+    }
+  }
+}
+
+app-user-home{
+  sb-library-cards-hlist{
+    sb-library-card{
+      .sb--card__main-area{
+        height: 7.5rem !important;
+        .sb--card__img, .img-container{
+          height: 6.5rem !important;
+        }
+      }
+    }
+    .view-all{
+      .sb-btn-oval{
+        height: 60% !important;
+        top: 20% !important;
+      }
+    }
+  }
+}
+
+.subject-list-popup{
+  .popover-content{
+    height: 90%;
+    width: 90%;
+    top: 5%;
+    left: 5%;
+    border-radius: 2rem;
+  }
+}
+
+.form-api-components{
+  margin-top: 1rem;
+  sb-course-cards-hlist, sb-library-cards-hlist {
+    .title{
+      color: var(--app-gray) !important;
+      font-size: 16px !important;
+      font-weight: normal !important;
+      padding-left: 1rem;
+      hr{
+        display: inline !important;
+        background-color: var(--app-primary-header);
+      }
+    }
+  } 
+}
+
+.subject-list-popup{
+  .popover-content{
+    height: 90%;
+    width: 90%;
+    top: 5%;
+    left: 5%;
+    border-radius: 2rem;
+  }
+}
+
+
+._progressIcon {
+  font-size: 2rem;
+}
+
+._completed {
+  color: green;
+  font-size: 1rem;
+}
+
+._inProgress {
+  color: $orange;
+  font-size: 1rem;
+}
+
+._na {
+  font-size: 1.2rem;
+}
+
+._submitted {
+  color:$primary-color;
+  font-size: 1.2rem;
+}
+
+sb-form{
+  .multi-select-container{
+    .list-border{
+      ul{
+        width: 90%;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+      }
+    }
+  }
+  .label-html {
+    padding-left: 16px;
+}
+}
+
+.container-focus{
+  width: 100%;
+  border-bottom-left-radius: 20px;
+  background-color: var(--app-primary-header) !important;
+  padding-bottom: 1rem;
+}
+
+.heading-label {
+  font-size: 16px;
+  color: var(--app-gray);
+  padding-left: 1rem;
+  display: flex;
+  align-items: center;
+  hr{
+    flex: 1;
+    margin-left: 1rem;
+    background-color: var(--app-primary-header);
+  }
+}
+
+sb-library-card-v3 {
+  .sb--card__meta1 {
+    height: 3.2rem !important;
+  }
+  .sb--card__title {
+    bdi {
+      line-height: 1.3;
+      font-size: 1.2rem;
+    }
+  }
+}
+
+.certificate-popup {
+  .popover-content {
+    left: auto !important;
+    top: 150px !important;
+    right: 3rem;
+    width: 30% !important;
+  }
+}
+
+.sb-new-theme-popup{
+  .popover-content {
+    width: 90vw !important;
+    height: 26rem !important;
+    left: 5% !important;
+    border-radius: 16px;
+    position: initial
+  }
+}
+
+.sticky-header-pills{
+  sb-pills-grid{
+    .sb-label-grid{
+      margin: 0 !important;
+      .item{
+        text-align: center;
+        min-width: 5rem;
+      }
+    }
+    .sb-label-grid .item:hover{
+      background-color: var(--app-primary) !important;
+      color: var(--app-white) !important;
+    }
+  }
+}
+
+.sb-switch-new-experience-popup{
+  .popover-content {
+    width: 90vw !important;
+    height: auto !important;
+    left: 5% !important;
+    border-radius: 16px;
+    position: initial
+  }
+}
+
+.year-of-birth-popup{
+  .popover-content {
+    width: 80vw !important;
+    height: 26vh !important;
+    left: 5% !important;
+    border-radius: 16px;
+    position: initial
+  }
+}
+
+app-search {
+  .pills-filter{
+    sb-pills-grid{
+      .sb-label-grid{
+        .item{
+          text-align: center;
+          min-width: 5rem;
+        }
+      }
+    }
+  }
+}
+
+app-faq-help {
+  sb-list{
+    .listView-compt{
+      padding: 0.5rem;
+      section.mt-24{
+        text-align: center;
+        button{
+          width: 60vw;
+          height: 2.5rem !important;
+          margin: 0 !important;
+          background-color: var(--app-white) !important;
+          color: var(--app-primary) !important;
+          border: none !important;
+        }
+      }
+    }
+    .listView-compt__title{
+      padding-left: 0.5rem;
+    }
+    .listView-compt__item{
+      background-color: var(--app-white);
+      margin: 0.75rem 0.25rem;
+      padding: 0.75rem !important;
+      border-radius: 3rem;
+      box-shadow: var(--button-style-shadow);
+    }
+  }
+}
+
+sb-faq{
+  .panel-title{
+    color: var(--app-gray);
+  }
+}
+
+sb-carousel{
+  .carousel_title {
+    padding-left: 1rem;
+  }
+  .carousel-card{
+    margin: 0.5rem !important;
+  }
+}
diff --git a/src/app/active-downloads/active-downloads.page.html b/src/app/active-downloads/active-downloads.page.html
index 52bb45683..24a2891ba 100644
--- a/src/app/active-downloads/active-downloads.page.html
+++ b/src/app/active-downloads/active-downloads.page.html
@@ -13,7 +13,7 @@
           </ion-col>
           <ion-col class="ion-no-padding" size="3">
             <div class="ion-float-right ion-text-center" (click)="cancelAllDownloads()">
-              <ion-icon class="download-cancel-icon" ios="ios-close" md="md-close"></ion-icon>
+              <ion-icon class="download-cancel-icon" name="close"></ion-icon>
               <div class="download-page-info">{{'CANCEL_ALL' | translate}}</div>
             </div>
           </ion-col>
diff --git a/src/app/active-downloads/active-downloads.page.scss b/src/app/active-downloads/active-downloads.page.scss
index 7bac53af8..b5836facf 100644
--- a/src/app/active-downloads/active-downloads.page.scss
+++ b/src/app/active-downloads/active-downloads.page.scss
@@ -1,19 +1,21 @@
 @import "src/assets/styles/base/_variables.scss";
 @import "src/assets/styles/_custom-mixins.scss";
+@import "src/assets/styles/_variables.scss";
+
 // :host {
     .download-page-heading{
-        color: white;
+        color: map-get($colors, white);
         font-size: $font-size-base + 2;
     }
 
     .download-page-info{
-        color: white;
+        color: map-get($colors, white);
         font-size: $font-size-base - 2;
     }
 
     .download-cancel-icon{
         font-size: $font-size-base * 2;
-        color: white;
+        color: map-get($colors, white);
     }
 
     .ad-pt-4{
@@ -33,7 +35,7 @@
     }
 
     .ad-border-bottom-1{
-        border-bottom: 1px solid #EEE2E2;
+        border-bottom: 1px solid map-get($colors, light_grayish_red);
     }
 
     .ad-no-box-shadow{
@@ -60,7 +62,6 @@
             font-weight: 100;
             font-style: normal;
             font-stretch: normal;
-            line-height: normal;
             text-align: center;
             color:$white-color;
         }
diff --git a/src/app/animations/animation-grow-in-from-event.ts b/src/app/animations/animation-grow-in-from-event.ts
new file mode 100644
index 000000000..945a27e2d
--- /dev/null
+++ b/src/app/animations/animation-grow-in-from-event.ts
@@ -0,0 +1,32 @@
+import {Animation, AnimationBuilder, createAnimation} from '@ionic/core';
+
+export const animationGrowInFromEvent = (event) => {
+    return (baseEl: HTMLElement) => {
+        const baseAnimation = createAnimation();
+
+        const backdropAnimation = createAnimation();
+        backdropAnimation.addElement(baseEl.querySelector('ion-backdrop'));
+
+        const wrapperAnimation = createAnimation();
+        wrapperAnimation.addElement(baseEl.querySelector('.popover-wrapper'));
+
+        const transformOrigin = `${event.target.getBoundingClientRect().left + (event.target.getBoundingClientRect().width / 2)}px ${event.target.getBoundingClientRect().top + (event.target.getBoundingClientRect().height / 2)}px`;
+
+        wrapperAnimation
+            .beforeStyles({
+                'transform-origin': transformOrigin
+            })
+            .fromTo('transform', 'scaleX(0.1) scaleY(0.1)', 'translateX(0%) scaleX(1) scaleY(1)')
+            .fromTo('opacity', 0, 1);
+
+        backdropAnimation.fromTo('opacity', 0.01, 0.4);
+
+        return baseAnimation
+            .addElement(baseEl)
+            .easing('cubic-bezier(0.36,0.66,0.04,1)')
+            .duration(800)
+            .beforeAddClass('tutorial-popover')
+            .addAnimation(backdropAnimation)
+            .addAnimation(wrapperAnimation);
+    };
+};
diff --git a/src/app/animations/animation-grow-in-top-right.ts b/src/app/animations/animation-grow-in-top-right.ts
new file mode 100644
index 000000000..42b85aa37
--- /dev/null
+++ b/src/app/animations/animation-grow-in-top-right.ts
@@ -0,0 +1,29 @@
+import {AnimationBuilder, createAnimation} from '@ionic/core';
+
+export const animationGrowInTopRight: AnimationBuilder = (baseEl: HTMLElement) => {
+
+    const baseAnimation = createAnimation();
+
+    const backdropAnimation = createAnimation();
+    backdropAnimation.addElement(baseEl.querySelector('ion-backdrop'));
+
+    const wrapperAnimation = createAnimation();
+    wrapperAnimation.addElement(baseEl.querySelector('.popover-wrapper'));
+
+    wrapperAnimation
+        .beforeStyles({
+            'transform-origin': 'right top'
+        })
+        .fromTo('transform', 'scaleX(0.1) scaleY(0.1)', 'translateX(0%) scaleX(1) scaleY(1)')
+        .fromTo('opacity', 0, 1);
+
+    backdropAnimation.fromTo('opacity', 0.01, 0.4);
+
+    return baseAnimation
+        .addElement(baseEl)
+        .easing('cubic-bezier(0.36,0.66,0.04,1)')
+        .duration(800)
+        .beforeAddClass('tutorial-popover')
+        .addAnimation(backdropAnimation)
+        .addAnimation(wrapperAnimation);
+}
\ No newline at end of file
diff --git a/src/app/animations/animation-shrink-out-top-right.ts b/src/app/animations/animation-shrink-out-top-right.ts
new file mode 100644
index 000000000..35606675d
--- /dev/null
+++ b/src/app/animations/animation-shrink-out-top-right.ts
@@ -0,0 +1,31 @@
+import { AnimationBuilder, createAnimation } from '@ionic/core';
+
+export const animationShrinkOutTopRight: AnimationBuilder = (baseEl: HTMLElement) => {
+
+    const baseAnimation = createAnimation();
+
+    const backdropAnimation = createAnimation();
+    backdropAnimation.addElement(baseEl.querySelector('ion-backdrop'));
+
+    const wrapperAnimation = createAnimation();
+    const wrapperEl = baseEl.querySelector('.popover-wrapper');
+    wrapperAnimation.addElement(wrapperEl);
+    const wrapperElRect = wrapperEl!.getBoundingClientRect();
+
+    wrapperAnimation
+        .beforeStyles({
+            'transform-origin': 'right top'
+        })
+        .fromTo('transform', 'scaleX(1) scaleY(1)', 'scaleX(0.1) scaleY(0.1)')
+        .fromTo('opacity', 1, 0);
+
+    backdropAnimation.fromTo('opacity', 0.4, 0.0);
+
+    return baseAnimation
+        .addElement(baseEl)
+        .easing('cubic-bezier(0.36,0.66,0.04,1)')
+        .duration(800)
+        .addAnimation(backdropAnimation)
+        .addAnimation(wrapperAnimation);
+
+}
\ No newline at end of file
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index cb624bbf4..5bd6ec050 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -6,6 +6,7 @@ import { HasNotSelectedFrameworkGuard } from '@app/guards/has-not-selected-frame
 import { HasNotSelectedLanguageGuard } from '@app/guards/has-not-selected-language.guard';
 import { HasNotSelectedUserTypeGuard } from '@app/guards/has-not-selected-user-type.guard';
 import { IsGuestUserGuard } from '@app/guards/is-guest-user.guard';
+import { MlGuard } from './manage-learn/core/guards/ml.guard';
 
 const routes: Routes = [
   {
@@ -29,6 +30,10 @@ const routes: Routes = [
     canLoad: [HasNotBeenOnboardedGuard],
     resolve: { message: HasNotSelectedUserTypeGuard }
   },
+  {
+    path: `${RouterLinks.USER_TYPE_SELECTION_LOGGEDIN}`,
+    loadChildren: './user-type-selection/user-type-selection.module#UserTypeSelectionPageModule'
+  },
   {
     path: RouterLinks.PROFILE_SETTINGS,
     loadChildren: './profile-settings/profile-settings.module#ProfileSettingsPageModule',
@@ -39,15 +44,16 @@ const routes: Routes = [
     path: RouterLinks.TABS,
     loadChildren: './tabs/tabs.module#TabsPageModule'
   },
-
-  { path: RouterLinks.USER_AND_GROUPS, loadChildren: './user-and-groups/user-and-groups.module#UserAndGroupsPageModule' },
   {
     path: RouterLinks.RESOURCES,
     loadChildren: './resources/resources.module#ResourcesModule',
   },
+  {
+    path: RouterLinks.HOME,
+    loadChildren: './home/home.module#HomePageModule'
+  },
   { path: RouterLinks.VIEW_MORE_ACTIVITY, loadChildren: './view-more-activity/view-more-activity.module#ViewMoreActivityModule' },
   { path: RouterLinks.SETTINGS, loadChildren: './settings/settings.module#SettingsPageModule' },
-  { path: RouterLinks.REPORTS, loadChildren: './reports/reports.module#ReportsPageModule' },
   { path: RouterLinks.DOWNLOAD_MANAGER, loadChildren: './download-manager/download-manager.module#DownloadManagerPageModule' },
   { path: RouterLinks.STORAGE_SETTINGS, loadChildren: './storage-settings/storage-settings.module#StorageSettingsPageModule' },
   { path: RouterLinks.COURSES, loadChildren: './courses/courses.module#CoursesPageModule' },
@@ -87,7 +93,40 @@ const routes: Routes = [
   {
     path: RouterLinks.DISTRICT_MAPPING,
     loadChildren: './district-mapping/district-mapping.module#DistrictMappingPageModule'
-  }
+  },
+  { path: RouterLinks.MY_GROUPS, loadChildren: './my-groups/my-groups.module#MyGroupsPageModule' },
+  { path: RouterLinks.CURRICULUM_COURSES, loadChildren: './curriculum-courses/curriculum-courses.module#CurriculumCoursesPageModule' },
+  { path: RouterLinks.PROGRAM, loadChildren: './manage-learn/programs/programs.module#ProgramsModule', canActivate:[MlGuard] },
+  { path: RouterLinks.SURVEY, loadChildren: './manage-learn/survey/survey.module#SurveyModule', canActivate:[MlGuard] },
+  { path: RouterLinks.PROJECT, loadChildren: './manage-learn/project/project.module#ProjectModule'},
+  { path: RouterLinks.REPORTS, loadChildren: './manage-learn/reports/reports.module#ReportsModule',canActivate:[MlGuard] },
+  {
+    path: RouterLinks.QUESTIONNAIRE,
+    loadChildren: './manage-learn/questionnaire/questionnaire.module#QuestionnairePageModule'
+  },
+
+  { path: RouterLinks.OBSERVATION, loadChildren: './manage-learn/observation/observation.module#ObservationModule' , canActivate:[MlGuard]},
+  { path: RouterLinks.CATEGORY_LIST, loadChildren: './category-list/category-list-page.module#CategoryListPageModule' },
+  { path: RouterLinks.GUEST_PROFILE, loadChildren: './profile/guest-profile/guest-profile.module#GuestProfilePageModule' },
+  { path: RouterLinks.ECM_LISTING, loadChildren: './manage-learn/ecm-listing/ecm-listing.module#EcmListingPageModule' },
+  { path: RouterLinks.SECTION_LISTING, loadChildren: './manage-learn/section-listing/section-listing.module#SectionListingPageModule' },
+  { path: RouterLinks.SUBMISSION_PREVIEW, loadChildren: './manage-learn/submission-preview/submission-preview.module#SubmissionPreviewModule' },
+  { path: RouterLinks.IMAGE_LISTING, loadChildren: './manage-learn/image-listing/image-listing.module#ImageListingModule' },
+  { path: RouterLinks.ALL_EVIDENCE, loadChildren: './manage-learn/all-evidence-list/all-evidence-list.module#AllEvidenceListModule' },
+  { path: RouterLinks.PROJECT_REPORT, loadChildren: './manage-learn/project-report/project-report.module#ProjectReportModule' },
+  { path: RouterLinks.PROJECT_FULL_REPORT, loadChildren: './manage-learn/project-full-report/project-full-report.module#ProjectFullReportModule' },
+  { path: `${RouterLinks.DEEPLINK_REDIRECT}/:extra`, loadChildren: './manage-learn/deeplink-redirect/deeplink-redirect.module#DeeplinkRedirectModule', canActivate:[MlGuard] },
+  { path: RouterLinks.CATEGORY_LIST, loadChildren: './category-list/category-list-page.module#CategoryListPageModule'},
+  { path: RouterLinks.GUEST_PROFILE, loadChildren: './profile/guest-profile/guest-profile.module#GuestProfilePageModule' },
+  { path: RouterLinks.DISCUSSION, loadChildren: './discussion-forum/discussion-forum.module#DiscussionForumModule' },
+  { path: RouterLinks.SEARCH_FILTER, loadChildren: './search-filter/search-filter.module#SearchFilterPageModule' },
+  { path: RouterLinks.GENERIC_REPORT, loadChildren: './manage-learn/generic-reports/generic-reports.module#GenericReportsModule' , canActivate:[MlGuard]},
+  { path: RouterLinks.DOMAIN_ECM_LISTING, loadChildren: './manage-learn/domain-ecm-listing/domain-ecm-listing.module#DomainEcmListingModule' },
+  {
+    path: RouterLinks.IMP_SUGGESTIONS,
+    loadChildren:  './manage-learn/imp-suggestions/imp-suggestions.module#ImpSuggestionsPageModule'
+  },
+
 ];
 
 @NgModule({
diff --git a/src/app/app.component.html b/src/app/app.component.html
index d0f36a769..1e65f485b 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,43 +1,48 @@
 <ion-app>
 
-  <app-application-header [headerConfig]="headerConfig" (headerEvents)="handleHeaderEvents($event);"
-    (sideMenuItemEvent)="menuItemAction($event)"></app-application-header>
+  <div style="z-index: 1;" >
+    <app-application-header *ngIf="!isPlannedMaintenanceStarted" [headerConfig]="headerConfig" (headerEvents)="handleHeaderEvents($event);"
+                            (sideMenuItemEvent)="menuItemAction($event)"></app-application-header>
+
+    <div class="unplanned-maintenance-banner">
+      <ion-grid>
+        <ion-row class="ion-justify-content-between ion-align-items-center">
+          <ion-col size="1">
+            <img style="width: 18px; height: 18px;" src="assets/imgs/ic_info_white.svg" alt="">
+          </ion-col>
+          <ion-col style="color: white;" size="10">
+            {{'MAINTENANCE_MESSAGE' | translate:{'%timeLeft': '3'} }}
+          </ion-col>
+          <ion-col size="1">
+            <img (click)="closeUnPlannedMaintenanceBanner()" style="width: 18px; height: 18px;" src="assets/imgs/ic_action_close_white.svg" alt="">
+          </ion-col>
+        </ion-row>
+      </ion-grid>
+    </div>
+
+  </div>
 
   <ion-split-pane contentId="mainContent">
-    <ion-router-outlet *ngIf="toggleRouterOutlet" id="mainContent" main
+    <ion-router-outlet #ionRouterOutlet id="mainContent" main
       [ngClass]="{'need-header-space':headerConfig?.showHeader, '':!headerConfig?.showHeader}"></ion-router-outlet>
   </ion-split-pane>
-  <div id="backdrop"
-    (click)="$event.preventDefault(); $event.stopPropagation(); qrWalkthroughBackdropClicked(); showWalkthroughBackDrop = false"
-    [hidden]="!showWalkthroughBackDrop">
-    <div class="bg"></div>
-    <ion-grid style="height: 100%" class="gridClass ion-text-center">
-      <ion-row style="height: 100%" class="ion-align-items-end">
-        <ion-col style="padding-bottom: 7em; text-align: center">
-          <ion-row>
-            <ion-col>
-              <ion-row>
-                <div class="ion-text-center W100" style="font-size: 19px">{{'TAP_SCAN' | translate: {'%s': appName} }}
-                </div>
-              </ion-row>
-            </ion-col>
-          </ion-row>
-          <ion-row>
-            <ion-col style="padding-left: 50px; padding-right: 70px">
-              <ion-row>
-                <div class="ion-text-center W100">{{'COACH_SCREEN' | translate}}</div>
-              </ion-row>
-            </ion-col>
-          </ion-row>
-          <ion-row>
-            <ion-col>
-              <button class="sb-btn sb-btn-md sb-btn-outline-white text-uppercase" id="buttonColors"
-                (click)="onConfirmationClicked($event)">{{'GOT_IT' | translate}}</button>
-            </ion-col>
-          </ion-row>
-        </ion-col>
-      </ion-row>
-    </ion-grid>
+
+  <div id="planned-maintenance-banner" [hidden]="!isPlannedMaintenanceStarted">
+    <img style="float: right; padding: 16px;" src="assets/imgs/close_tutorial.svg" alt="" (click)="closePlannedMaintenanceBanner()">
+    <!--Image-->
+    <img src="../assets/imgs/ic_maintenance.svg" alt="maintenance" style="margin-top: 50%;">
+    <!-- some text -->
+    <div id="planned-maintenance-text">
+      <p *ngIf="!isTimeAvailable">{{'PLANNED_MAINTENANCE_TEXT' | translate}}</p>
+      <p *ngIf="isTimeAvailable">{{'PLANNED_MAINTENANCE_TEXT_WITH_TIME' | translate}}</p>
+    </div>
+    <!--Timer-->
+    <div id="timer"></div>
+    <!-- another text -->
+    <p id="maintenance-sub-text" *ngIf="isOnBoardingCompleted">{{'MAINTENANCE_SUB_TEXT' | translate}}</p>
+    <div class="text-center" *ngIf="isOnBoardingCompleted">
+      <ion-button id="navigate-downloads" (click)="navigateToDownloads()">{{'GO_TO_DOWNLOADS' | translate}}</ion-button>
+    </div>
   </div>
 
   <div id="update-webview-container"
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
index 7fae2dcce..801614b15 100644
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -4,7 +4,8 @@ import {
     FormAndFrameworkUtilService, AppGlobalService,
     CommonUtilService, TelemetryGeneratorService, UtilityService, AppHeaderService,
     LogoutHandlerService, AppRatingService, ActivePageService, SplashScreenService,
-    InteractType, InteractSubtype, Environment, PageId, LocalCourseService, ImpressionType, CorReleationDataType
+    InteractType, InteractSubtype, Environment, PageId,
+    LocalCourseService, ImpressionType, CorReleationDataType, LoginHandlerService
 } from '../services';
 import {
     EventsBusService, SharedPreferences,
@@ -12,21 +13,28 @@ import {
     CodePushExperimentService, SystemSettingsService, DeviceRegisterService,
     TelemetryAutoSyncService, SunbirdSdk, CorrelationData, ProfileService
 } from 'sunbird-sdk';
-import { Platform, Events, MenuController } from '@ionic/angular';
+import { Platform, MenuController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { StatusBar } from '@ionic-native/status-bar/ngx';
 import { TranslateService, LangChangeEvent } from '@ngx-translate/core';
 import { NgZone, EventEmitter } from '@angular/core';
 import { Network } from '@ionic-native/network/ngx';
 import { Router } from '@angular/router';
-import { NetworkAvailabilityToastService } from '@app/services/network-availability-toast/network-availability-toast.service';
+import {
+    NetworkAvailabilityToastService
+} from '@app/services/network-availability-toast/network-availability-toast.service';
 import { NotificationService as LocalNotification } from '@app/services/notification.service';
 import { TncUpdateHandlerService } from '@app/services/handlers/tnc-update-handler.service';
-import { of, Subject, EMPTY, Observable, Subscription } from 'rxjs';
-import { PreferenceKey, EventTopics } from './app.constant';
+import { of, Subject, EMPTY } from 'rxjs';
+import { PreferenceKey, EventTopics, RouterLinks } from './app.constant';
 import { BackButtonEmitter } from '@ionic/angular/dist/providers/platform';
 import { SplaschreenDeeplinkActionHandlerDelegate } from '../services/sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate';
+import { CsClientStorage } from '@project-sunbird/client-services/core';
+import { ProfileType } from '@project-sunbird/sunbird-sdk';
+import { SegmentationTagService } from '../services/segmentation-tag/segmentation-tag.service';
 
 declare const supportfile;
+declare const plugins;
 
 describe('AppComponent', () => {
     let appComponent: AppComponent;
@@ -35,11 +43,17 @@ describe('AppComponent', () => {
             local: {
                 launchDetails: {
                     action: 'click'
-                }
+                },
+                on: jest.fn()
             }
+        },
+        InAppUpdateManager: {
+            checkForImmediateUpdate: jest.fn()
         }
     };
-    const mockActivePageService: Partial<ActivePageService> = {};
+    const mockActivePageService: Partial<ActivePageService> = {
+        computePageId: jest.fn(() => 'sample-page-id')
+    };
     const mockAppGlobalService: Partial<AppGlobalService> = {
         getUserId: jest.fn(() => 'some_user_id'),
         getProfileSettingsStatus: jest.fn()
@@ -83,8 +97,7 @@ describe('AppComponent', () => {
         } as Partial<BackButtonEmitter> as BackButtonEmitter
     };
     const mockPreferences: Partial<SharedPreferences> = {
-        // getString: jest.fn(() => of(undefined)),
-        // putString: jest.fn(() => of(undefined))
+        addListener: jest.fn(() => { })
     };
     const mockRouter: Partial<Router> = {
         events: EMPTY,
@@ -130,16 +143,18 @@ describe('AppComponent', () => {
         cap: ['some_cap']
     };
     const mockUtilityService: Partial<UtilityService> = {
-        getUtmInfo: jest.fn(() => Promise.resolve({
-            'val': 'utm_source=googleplay&utm_content=https://diksha.gov.in/explore-course',
-            'code': '0',
-            'clk': '0',
-            'install': '0'
-        }))
+        clearUtmInfo: jest.fn(() => Promise.resolve())
     };
     const mockZone: Partial<NgZone> = {};
-    const mockLocalCourseService: Partial<LocalCourseService> = {};
+    const mockLocalCourseService: Partial<LocalCourseService> = {
+        checkCourseRedirect: jest.fn(() => Promise.resolve())
+    };
     const mockSplaschreenDeeplinkActionHandlerDelegate: Partial<SplaschreenDeeplinkActionHandlerDelegate> = {};
+    const mockLoginHandlerService: Partial<LoginHandlerService> = {};
+    const mockSegmentationTagService: Partial<SegmentationTagService> = {
+        getPersistedSegmentaion: jest.fn(),
+        persistSegmentation: jest.fn()
+    };
 
     beforeAll(() => {
         appComponent = new AppComponent(
@@ -174,12 +189,15 @@ describe('AppComponent', () => {
             mockNetworkAvailability as NetworkAvailabilityToastService,
             mockSplashScreenService as SplashScreenService,
             mockLocalCourseService as LocalCourseService,
-            mockSplaschreenDeeplinkActionHandlerDelegate as SplaschreenDeeplinkActionHandlerDelegate
+            mockSplaschreenDeeplinkActionHandlerDelegate as SplaschreenDeeplinkActionHandlerDelegate,
+            mockLoginHandlerService as LoginHandlerService,
+            mockSegmentationTagService as SegmentationTagService,
         );
     });
 
     beforeEach(() => {
         jest.clearAllMocks();
+        global.window.segmentation = null;
     });
 
     it('should be create a instance of appComponent', () => {
@@ -224,8 +242,24 @@ describe('AppComponent', () => {
                         return of('');
                     case PreferenceKey.SYNC_CONFIG:
                         return of('some_config');
+                    case PreferenceKey.CAMPAIGN_PARAMETERS:
+                        return of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]');
+                    case 'notification_received_at':
+                        return of('sample');
+                    case PreferenceKey.CURRENT_SELECTED_THEME:
+                        return of('JOYFUL');
+                    case PreferenceKey.SELECTED_USER_TYPE:
+                        return of(ProfileType.ADMIN);
+                }
+            });
+            mockPreferences.getBoolean = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.COACH_MARK_SEEN:
+                    return of(false);
                 }
             });
+            mockPreferences.putBoolean = jest.fn(() => of(false));
+            mockHeaderService.showStatusBar = jest.fn(() => Promise.resolve());
             mockPreferences.putString = jest.fn(() => EMPTY);
             mockFormAndFrameworkUtilService.checkNewAppVersion = jest.fn(() => Promise.resolve(''));
             jest.spyOn(appComponent, 'checkAndroidWebViewVersion').mockImplementation();
@@ -240,6 +274,7 @@ describe('AppComponent', () => {
         it('should subscribe and set header config', (done) => {
             // arrange
             mockCommonUtilService.networkAvailability$ = EMPTY;
+            mockCommonUtilService.populateGlobalCData = jest.fn();
             const mockConfig = {
                 showHeader: true,
                 showBurgerMenu: true,
@@ -247,6 +282,7 @@ describe('AppComponent', () => {
             };
             mockHeaderService.headerConfigEmitted$ = of(mockConfig);
             mockActivePageService.computePageId = jest.fn(() => 'some_page_id');
+            mockUtilityService.clearUtmInfo = jest.fn(() => Promise.resolve());
             // act
             jest.useFakeTimers();
             appComponent.ngOnInit();
@@ -256,12 +292,14 @@ describe('AppComponent', () => {
             // assert
             setTimeout(() => {
                 expect(appComponent.headerConfig).toBe(mockConfig);
+                expect(mockUtilityService.clearUtmInfo).toHaveBeenCalled();
                 done();
             }, 0);
         });
         it('should generate interact telemetry internet-connected in network availability is true', (done) => {
             // arrange
             mockHeaderService.headerConfigEmitted$ = EMPTY;
+            mockCommonUtilService.populateGlobalCData = jest.fn();
             mockCommonUtilService.networkAvailability$ = of(true);
             mockActivePageService.computePageId = jest.fn(() => 'some_page_id');
             // act
@@ -285,6 +323,7 @@ describe('AppComponent', () => {
             // arrange
             mockHeaderService.headerConfigEmitted$ = EMPTY;
             mockCommonUtilService.networkAvailability$ = of(false);
+            mockCommonUtilService.populateGlobalCData = jest.fn();
             mockActivePageService.computePageId = jest.fn(() => 'some_page_id');
             // act
             jest.useFakeTimers();
@@ -303,6 +342,25 @@ describe('AppComponent', () => {
                 done();
             }, 0);
         });
+        it('should listen if traceId is changed', (done) => {
+            // arrange
+            mockHeaderService.headerConfigEmitted$ = EMPTY;
+            mockCommonUtilService.networkAvailability$ = of(false);
+            mockCommonUtilService.populateGlobalCData = jest.fn();
+            mockActivePageService.computePageId = jest.fn(() => 'some_page_id');
+            mockPreferences.addListener = jest.fn(() => 'some_trace_id');
+            // act
+            jest.useFakeTimers();
+            appComponent.ngOnInit();
+            jest.advanceTimersByTime(2100);
+            jest.useRealTimers();
+            jest.clearAllTimers();
+            // assert
+            setTimeout(() => {
+                expect(mockPreferences.addListener).toHaveBeenCalledWith(CsClientStorage.TRACE_ID, expect.any(Function));
+                done();
+            }, 0);
+        });
     });
 
     describe('getUtmParameter', () => {
@@ -315,6 +373,7 @@ describe('AppComponent', () => {
             });
             mockHeaderService.headerConfigEmitted$ = EMPTY;
             mockCommonUtilService.networkAvailability$ = EMPTY;
+            mockCommonUtilService.populateGlobalCData = jest.fn();
             mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(true));
             mockEventsBusService.events = jest.fn(() => EMPTY);
             mockNotificationSrc.setupLocalNotification = jest.fn();
@@ -332,8 +391,23 @@ describe('AppComponent', () => {
                         return of('');
                     case PreferenceKey.SYNC_CONFIG:
                         return of('some_config');
+                    case PreferenceKey.CAMPAIGN_PARAMETERS:
+                        return of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]');
+                    case 'notification_received_at':
+                        return of('sample');
+                    case PreferenceKey.CURRENT_SELECTED_THEME:
+                        return of('DEFAULT');
+                    case PreferenceKey.SELECTED_USER_TYPE:
+                        return of(ProfileType.ADMIN);
                 }
             });
+            mockPreferences.getBoolean = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.COACH_MARK_SEEN:
+                    return of(true);
+                }
+            });
+            mockHeaderService.hideStatusBar = jest.fn();
             mockPreferences.putString = jest.fn(() => EMPTY);
             mockFormAndFrameworkUtilService.checkNewAppVersion = jest.fn(() => Promise.resolve(''));
             jest.spyOn(appComponent, 'checkAndroidWebViewVersion').mockImplementation();
@@ -346,20 +420,33 @@ describe('AppComponent', () => {
 
         it('should generate utm-info telemetry if utm source is available for first time', (done) => {
             // arrange
-            mockUtilityService.getUtmInfo = jest.fn(() => Promise.resolve({
-                'val': 'utm_source=googleplay&utm_content=https://diksha.gov.in/explore-course',
-                'code': '0',
-                'clk': '0',
-                'install': '0'
-            }));
-            mockUtilityService.clearUtmInfo = jest.fn(() => Promise.resolve());
             const value = new Map();
             mockSplaschreenDeeplinkActionHandlerDelegate.checkUtmContent = jest.fn();
+            mockActivePageService.computePageId = jest.fn(() => 'sample-page');
+            mockTelemetryGeneratorService.generateNotificationClickedTelemetry = jest.fn();
+            mockPreferences.getString = jest.fn(() => of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]'));
+            mockTranslate.use = jest.fn(() => of({}));
+            mockEvents.subscribe = jest.fn((_, fn) => fn({ skipRootNavigation: false }));
+            // mockPreferences.getString = jest.fn(() => of('sample-batch-details'));
+            mockAppGlobalService.limitedShareQuizContent = false;
+            mockZone.run = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            jest.spyOn(appComponent, 'reloadSigninEvents').mockImplementation(() => {
+                return;
+            });
             // act
             appComponent.ngOnInit();
             // assert
             setTimeout(() => {
-                expect(mockUtilityService.getUtmInfo).toHaveBeenCalled();
+                expect(mockActivePageService.computePageId).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateNotificationClickedTelemetry).toHaveBeenCalledWith(
+                    'local',
+                    'sample-page',
+                    undefined,
+                    [{ id: '', type: 'NotificationId' }]
+                );
+                expect(mockPreferences.getString).toHaveBeenCalledTimes(9);
+                expect(mockTranslate.use).toHaveBeenCalled();
                 expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
                     InteractType.OTHER,
                     'networkStatus',
@@ -368,19 +455,38 @@ describe('AppComponent', () => {
                     undefined,
                     value
                 );
+                expect(mockEvents.subscribe).toHaveBeenCalled();
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(1, PreferenceKey.BATCH_DETAIL_KEY);
+                expect(appComponent.toggleRouterOutlet).toBeTruthy();
+                expect(mockZone.run).toHaveBeenCalled();
                 done();
             }, 0);
         });
 
         it('should not generate utm-info telemetry if utm source is not available', (done) => {
             // arrange
-            mockUtilityService.getUtmInfo = jest.fn(() => Promise.resolve(''));
-            mockUtilityService.clearUtmInfo = jest.fn(() => Promise.resolve());
+            mockActivePageService.computePageId = jest.fn(() => 'sample-page');
+            mockTelemetryGeneratorService.generateNotificationClickedTelemetry = jest.fn();
+            mockEvents.subscribe = jest.fn((_, fn) => fn({ skipRootNavigation: false }));
+            mockPreferences.getString = jest.fn(() => of(undefined));
+            mockAppGlobalService.limitedShareQuizContent = false;
+            mockZone.run = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            jest.spyOn(appComponent, 'reloadSigninEvents').mockImplementation(() => {
+                return;
+            });
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
             // act
             appComponent.ngOnInit();
             // assert
             setTimeout(() => {
-                expect(mockUtilityService.getUtmInfo).toHaveBeenCalled();
+                expect(mockActivePageService.computePageId).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateNotificationClickedTelemetry).toHaveBeenCalledWith(
+                    InteractType.LOCAL,
+                    'sample-page',
+                    undefined,
+                    [{ id: '', type: 'NotificationId' }]
+                );
                 expect(mockTelemetryGeneratorService.generateInteractTelemetry).not.nthCalledWith(2,
                     InteractType.OTHER,
                     InteractSubtype.UTM_INFO,
@@ -389,19 +495,25 @@ describe('AppComponent', () => {
                     undefined,
                     { utm_data: { utm_source: 'sunbird' } }
                 );
-                expect(mockUtilityService.clearUtmInfo).not.toHaveBeenCalled();
                 done();
             }, 0);
         });
 
         it('should not generate utm-info telemetry for Error response', (done) => {
             // arrange
-            mockUtilityService.getUtmInfo = jest.fn(() => Promise.reject('some_error'));
+            mockActivePageService.computePageId = jest.fn(() => 'sample-page');
+            mockTelemetryGeneratorService.generateNotificationClickedTelemetry = jest.fn();
             // act
             appComponent.ngOnInit();
             // assert
             setTimeout(() => {
-                expect(mockUtilityService.getUtmInfo).toHaveBeenCalled();
+                expect(mockActivePageService.computePageId).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateNotificationClickedTelemetry).toHaveBeenCalledWith(
+                    InteractType.LOCAL,
+                    'sample-page',
+                    undefined,
+                    [{ id: '', type: 'NotificationId' }]
+                );
                 done();
             }, 0);
         });
@@ -434,8 +546,20 @@ describe('AppComponent', () => {
                         return of('');
                     case PreferenceKey.SYNC_CONFIG:
                         return of('some_config');
-                    default:
-                        return of('');
+                    case PreferenceKey.CAMPAIGN_PARAMETERS:
+                        return of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]');
+                    case 'notification_received_at':
+                        return of('sample');
+                    case PreferenceKey.CURRENT_SELECTED_THEME:
+                        return of('JOYFUL');
+                    case PreferenceKey.SELECTED_USER_TYPE:
+                        return of(ProfileType.ADMIN);
+                }
+            });
+            mockPreferences.getBoolean = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.COACH_MARK_SEEN:
+                    return of(true);
                 }
             });
             mockPreferences.putString = jest.fn(() => EMPTY);
@@ -546,8 +670,20 @@ describe('AppComponent', () => {
                         return of('');
                     case PreferenceKey.SYNC_CONFIG:
                         return of('some_config');
-                    default:
-                        return of('');
+                    case PreferenceKey.CAMPAIGN_PARAMETERS:
+                        return of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]');
+                    case 'notification_received_at':
+                        return of('sample');
+                    case PreferenceKey.CURRENT_SELECTED_THEME:
+                        return of('JOYFUL');
+                    case PreferenceKey.SELECTED_USER_TYPE:
+                        return of(ProfileType.ADMIN);
+                }
+            });
+            mockPreferences.getBoolean = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.COACH_MARK_SEEN:
+                    return of(true);
                 }
             });
             mockPreferences.putString = jest.fn(() => EMPTY);
@@ -574,18 +710,17 @@ describe('AppComponent', () => {
                 deploymentKey: ''
             };
             mockSystemSettingsService.getSystemSettings = jest.fn(() => of({ value: hotCodePushKey }));
-            mockCodePushExperimentService.setDefaultDeploymentKey = jest.fn(() => of());
 
             // act
             appComponent.ngOnInit();
             // assert
             setTimeout(() => {
                 expect(mockSystemSettingsService.getSystemSettings).toHaveBeenCalled();
-                expect(mockCodePushExperimentService.setDefaultDeploymentKey).not.toHaveBeenCalled();
+                // expect(mockPreferences.putString).not.toHaveBeenCalled();
                 done();
             });
         });
-        it('should not set setDefaultDeploymentKey if hotCodePushKey is empty', (done) => {
+        it('should not set DEPLOYMENT_KEY if hotCodePushKey is empty', (done) => {
             // arrange
             mockPlatform.ready = jest.fn(() => {
                 return {
@@ -593,18 +728,17 @@ describe('AppComponent', () => {
                 } as any;
             });
             mockSystemSettingsService.getSystemSettings = jest.fn(() => of({ value: '{ \"deploymentKey\": \"\"}' }));
-            mockCodePushExperimentService.setDefaultDeploymentKey = jest.fn(() => of());
 
             // act
             appComponent.ngOnInit();
             // assert
             setTimeout(() => {
                 expect(mockSystemSettingsService.getSystemSettings).toHaveBeenCalled();
-                expect(mockCodePushExperimentService.setDefaultDeploymentKey).not.toHaveBeenCalled();
+                // expect(mockPreferences.putString).not.toHaveBeenCalled();
                 done();
-            });
+            }, 0);
         });
-        it('should set setDefaultDeploymentKey if hotCodePushKey not empty', (done) => {
+        it('should set DEPLOYMENT_KEY if hotCodePushKey not empty', (done) => {
             // arrange
             mockPlatform.ready = jest.fn(() => {
                 return {
@@ -612,16 +746,17 @@ describe('AppComponent', () => {
                 } as any;
             });
             mockSystemSettingsService.getSystemSettings = jest.fn(() => of({ value: '{ \"deploymentKey\": \"some_key\"}' }));
-            mockCodePushExperimentService.setDefaultDeploymentKey = jest.fn(() => of());
+            mockPreferences.putString = jest.fn(() => of(undefined));
 
             // act
             appComponent.ngOnInit();
             // assert
             setTimeout(() => {
                 expect(mockSystemSettingsService.getSystemSettings).toHaveBeenCalled();
-                expect(mockCodePushExperimentService.setDefaultDeploymentKey).toHaveBeenCalled();
+                expect(mockPreferences.putString).toHaveBeenCalledWith(
+                    PreferenceKey.DEPLOYMENT_KEY, 'some_key');
                 done();
-            });
+            }, 0);
         });
     });
     describe('checkForCodeUpdates', () => {
@@ -651,8 +786,20 @@ describe('AppComponent', () => {
                         return of('some_deployment_key');
                     case PreferenceKey.SYNC_CONFIG:
                         return of('some_config');
-                    default:
-                        return of('');
+                    case PreferenceKey.CAMPAIGN_PARAMETERS:
+                        return of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]');
+                    case 'notification_received_at':
+                        return of('sample');
+                    case PreferenceKey.CURRENT_SELECTED_THEME:
+                        return of('JOYFUL');
+                    case PreferenceKey.SELECTED_USER_TYPE:
+                        return of(ProfileType.ADMIN);
+                }
+            });
+            mockPreferences.getBoolean = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.COACH_MARK_SEEN:
+                    return of(true);
                 }
             });
             mockPreferences.putString = jest.fn(() => EMPTY);
@@ -743,17 +890,41 @@ describe('AppComponent', () => {
                         return of('');
                     case PreferenceKey.SYNC_CONFIG:
                         return of('some_config');
+                    case PreferenceKey.CAMPAIGN_PARAMETERS:
+                        return of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]');
+                    case 'notification_received_at':
+                        return of('sample');
+                    case PreferenceKey.CURRENT_SELECTED_THEME:
+                        return of('DEFAULT');
+                    case PreferenceKey.SELECTED_USER_TYPE:
+                        return of(ProfileType.ADMIN);
                 }
             });
+            mockPreferences.getBoolean = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.COACH_MARK_SEEN:
+                    return of(true);
+                }
+            });
+            mockHeaderService.hideStatusBar = jest.fn();
             FCMPlugin.getToken = jest.fn((callback) => callback('some_token'));
             mockPreferences.putString = jest.fn(() => of(undefined));
             jest.spyOn(SunbirdSdk.instance, 'updateDeviceRegisterConfig').mockImplementation();
+            mockActivePageService.computePageId = jest.fn(() => 'sample-page');
+            mockTelemetryGeneratorService.generateNotificationClickedTelemetry = jest.fn();
 
             // act
             appComponent.ngOnInit();
             // assert
             setTimeout(() => {
                 expect(FCMPlugin.getToken).toHaveBeenCalled();
+                expect(mockActivePageService.computePageId).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateNotificationClickedTelemetry).toHaveBeenCalledWith(
+                    InteractType.LOCAL,
+                    'sample-page',
+                    undefined,
+                    [{ id: '', type: 'NotificationId' }]
+                );
                 expect(SunbirdSdk.instance.updateDeviceRegisterConfig).toHaveBeenCalledWith({ fcmToken: 'some_token' });
                 done();
             });
@@ -776,16 +947,40 @@ describe('AppComponent', () => {
                         return of('');
                     case PreferenceKey.SYNC_CONFIG:
                         return of('some_config');
+                    case PreferenceKey.CAMPAIGN_PARAMETERS:
+                        return of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]');
+                    case 'notification_received_at':
+                        return of('sample');
+                    case PreferenceKey.CURRENT_SELECTED_THEME:
+                        return of('DEFAULT');
+                    case PreferenceKey.SELECTED_USER_TYPE:
+                        return of(ProfileType.ADMIN);
+                }
+            });
+            mockPreferences.getBoolean = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.COACH_MARK_SEEN:
+                    return of(true);
                 }
             });
+            mockHeaderService.hideStatusBar = jest.fn();
             FCMPlugin.onTokenRefresh = jest.fn((callback) => callback('some_token'));
             mockPreferences.putString = jest.fn(() => of(undefined));
             jest.spyOn(SunbirdSdk.instance, 'updateDeviceRegisterConfig').mockImplementation();
+            mockActivePageService.computePageId = jest.fn(() => 'sample-page');
+            mockTelemetryGeneratorService.generateNotificationClickedTelemetry = jest.fn();
 
             // act
             appComponent.ngOnInit();
             // assert
             setTimeout(() => {
+                expect(mockActivePageService.computePageId).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateNotificationClickedTelemetry).toHaveBeenCalledWith(
+                    InteractType.LOCAL,
+                    'sample-page',
+                    undefined,
+                    [{ id: '', type: 'NotificationId' }]
+                );
                 expect(FCMPlugin.onTokenRefresh).toHaveBeenCalled();
                 expect(SunbirdSdk.instance.updateDeviceRegisterConfig).toHaveBeenCalledWith({ fcmToken: 'some_token' });
                 done();
@@ -812,9 +1007,23 @@ describe('AppComponent', () => {
                         return of('');
                     case PreferenceKey.SYNC_CONFIG:
                         return of('some_config');
+                    case PreferenceKey.CAMPAIGN_PARAMETERS:
+                        return of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]');
+                    case 'notification_received_at':
+                        return of('sample');
+                    case PreferenceKey.CURRENT_SELECTED_THEME:
+                        return of('JOFYUL');
+                    case PreferenceKey.SELECTED_USER_TYPE:
+                        return of(ProfileType.ADMIN);
                 }
             });
-
+            mockPreferences.getBoolean = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.COACH_MARK_SEEN:
+                    return of(true);
+                }
+            });
+            mockHeaderService.showStatusBar = jest.fn();
             mockHeaderService.headerConfigEmitted$ = EMPTY;
             mockCommonUtilService.networkAvailability$ = EMPTY;
             mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(true));
@@ -844,65 +1053,38 @@ describe('AppComponent', () => {
                 } as any;
             });
             const mockData = {
-                'id': 'some_id',
-                'wasTapped': true,
-                'actionData': '{\"key\":\"value\"}'
+                id: 'some_id',
+                wasTapped: true,
+                actionData: '{\"key\":\"value\"}'
             };
             FCMPlugin.onNotification = jest.fn((callback, success, error) => {
                 callback(mockData);
                 success({});
                 error('');
             });
+            mockNotificationSrc.handleNotification = jest.fn();
             mockActivePageService.computePageId = jest.fn(() => 'some_page_id');
             mockNotificationServices.addNotification = jest.fn(() => of(mockData as any));
-            mockNotificationSrc.setNotificationDetails = jest.fn();
-
+            mockNotificationSrc.setNotificationParams = jest.fn();
+            mockCommonUtilService.populateGlobalCData = jest.fn(() => Promise.resolve());
+            mockHeaderService.hideHeader = jest.fn();
             // act
             appComponent.ngOnInit();
             // assert
             setTimeout(() => {
+                expect(mockNotificationSrc.handleNotification).toHaveBeenCalled();
                 expect(FCMPlugin.onNotification).toHaveBeenCalled();
-                expect(mockTelemetryGeneratorService.generateNotificationClickedTelemetry).nthCalledWith(1,
+                expect(mockTelemetryGeneratorService.generateNotificationClickedTelemetry).nthCalledWith(2,
                     InteractType.FCM,
                     'some_page_id',
                     { notification_id: 'some_id' },
-                    [{"id": "some_id", "type": "NotificationID"}]
+                    [{ id: 'some_id', type: 'NotificationId' }]
                 );
-                done();
-            });
-        });
-
-        it('should receive notification data when notification was not tapped', (done) => {
-            // arrange
-            mockPlatform.ready = jest.fn(() => {
-                return {
-                    then: jest.fn((cb) => cb('ready'))
-                } as any;
-            });
-            const mockData = {
-                'id': 'some_id',
-                'wasTapped': false,
-                'actionData': '{\"key\":\"value\"}'
-            };
-            FCMPlugin.onNotification = jest.fn((callback, success, error) => {
-                callback(mockData);
-                success({});
-                error('');
-            });
-            mockActivePageService.computePageId = jest.fn(() => 'some_page_id');
-            mockNotificationServices.addNotification = jest.fn(() => of(mockData as any));
-            mockNotificationSrc.setNotificationDetails = jest.fn();
-
-            // act
-            appComponent.ngOnInit();
-            // assert
-            setTimeout(() => {
-                expect(FCMPlugin.onNotification).toHaveBeenCalled();
-                expect(mockTelemetryGeneratorService.generateNotificationClickedTelemetry).nthCalledWith(1,
-                    InteractType.FCM,
+                expect(mockTelemetryGeneratorService.generateNotificationClickedTelemetry).toBeCalledWith(
+                    InteractType.LOCAL,
                     'some_page_id',
-                    { notification_id: 'some_id' },
-                    [{"id": "some_id", "type": "NotificationID"}]
+                    undefined,
+                    [{ id: '', type: 'NotificationId' }]
                 );
                 done();
             });
@@ -928,9 +1110,23 @@ describe('AppComponent', () => {
                         return of('');
                     case PreferenceKey.SYNC_CONFIG:
                         return of('some_config');
+                    case PreferenceKey.CAMPAIGN_PARAMETERS:
+                        return of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]');
+                    case 'notification_received_at':
+                        return of('sample');
+                    case PreferenceKey.CURRENT_SELECTED_THEME:
+                        return of('DEFAULT');
+                    case PreferenceKey.SELECTED_USER_TYPE:
+                        return of(ProfileType.ADMIN);
                 }
             });
-
+            mockPreferences.getBoolean = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.COACH_MARK_SEEN:
+                    return of(true);
+                }
+            });
+            mockHeaderService.hideStatusBar = jest.fn();
             mockHeaderService.headerConfigEmitted$ = EMPTY;
             mockCommonUtilService.networkAvailability$ = EMPTY;
             mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(true));
@@ -958,6 +1154,14 @@ describe('AppComponent', () => {
                     then: jest.fn((cb) => cb('ready'))
                 } as any;
             });
+            mockRouter.events = of({
+                subscribe: jest.fn()
+            }) as any;
+            const subscribeWithPriorityData = jest.fn((_, fn) => fn());
+            mockPlatform.backButton = {
+                subscribeWithPriority: subscribeWithPriorityData
+            } as any;
+            mockRouter.url = RouterLinks.LIBRARY_TAB;
             const mockUpdateData = {
                 deploymentKey: 'some_key',
                 appVersion: 'some_app_name'
@@ -971,6 +1175,8 @@ describe('AppComponent', () => {
             mockCodePushExperimentService.getDefaultDeploymentKey = jest.fn(() => of('some_default_key'));
             mockCodePushExperimentService.setExperimentKey = jest.fn(() => of());
             mockCodePushExperimentService.setExperimentAppVersion = jest.fn(() => of());
+            mockMenuCtrl.isOpen = jest.fn(() => Promise.resolve(true));
+            mockMenuCtrl.close = jest.fn(() => Promise.resolve(true));
 
             // act
             appComponent.ngOnInit();
@@ -978,6 +1184,9 @@ describe('AppComponent', () => {
             setTimeout(() => {
                 expect(codePush.getCurrentPackage).toHaveBeenCalled();
                 expect(mockCodePushExperimentService.getDefaultDeploymentKey).toHaveBeenCalled();
+                expect(mockPlatform.backButton).not.toBeUndefined();
+                expect(mockMenuCtrl.isOpen).toHaveBeenCalled();
+                expect(mockMenuCtrl.close).toHaveBeenCalled();
                 done();
             });
         });
@@ -995,12 +1204,22 @@ describe('AppComponent', () => {
             codePush.getCurrentPackage = jest.fn((callback) => {
                 callback(mockUpdateData);
             });
+            mockRouter.events = of({
+                subscribe: jest.fn()
+            }) as any;
+            const subscribeWithPriorityData = jest.fn((_, fn) => fn());
+            mockPlatform.backButton = {
+                subscribeWithPriority: subscribeWithPriorityData
+            } as any;
+            mockRouter.url = RouterLinks.LIBRARY_TAB;
             // TODO:
             mockUtilityService.getBuildConfigValue = jest.fn(() => Promise.resolve('some_app_name'));
             appComponent.appVersion = 'some_app_name';
             mockCodePushExperimentService.getDefaultDeploymentKey = jest.fn(() => of('some_key'));
             mockCodePushExperimentService.setExperimentKey = jest.fn(() => of());
             mockCodePushExperimentService.setExperimentAppVersion = jest.fn(() => of());
+            mockMenuCtrl.isOpen = jest.fn(() => Promise.resolve(false));
+            mockCommonUtilService.showExitPopUp = jest.fn(() => Promise.resolve());
 
             // act
             appComponent.ngOnInit();
@@ -1008,6 +1227,9 @@ describe('AppComponent', () => {
             setTimeout(() => {
                 expect(codePush.getCurrentPackage).toHaveBeenCalled();
                 expect(mockCodePushExperimentService.getDefaultDeploymentKey).toHaveBeenCalled();
+                expect(mockPlatform.backButton).not.toBeUndefined();
+                expect(mockMenuCtrl.isOpen).toHaveBeenCalled();
+                expect(mockCommonUtilService.showExitPopUp).toHaveBeenCalled();
                 done();
             });
         });
@@ -1026,12 +1248,22 @@ describe('AppComponent', () => {
                 codePush.getCurrentPackage = jest.fn((callback) => {
                     callback(mockUpdateData);
                 });
+                mockRouter.events = of({
+                    subscribe: jest.fn()
+                }) as any;
+                const subscribeWithPriorityData = jest.fn((_, fn) => fn());
+                mockPlatform.backButton = {
+                    subscribeWithPriority: subscribeWithPriorityData
+                } as any;
+                mockRouter.url = 'sample-page';
+                appComponent.rootPageDisplayed = false;
                 // TODO:
                 mockUtilityService.getBuildConfigValue = jest.fn(() => Promise.resolve('some_current_app_name'));
                 appComponent.appVersion = 'some_current_app_name';
                 mockCodePushExperimentService.getDefaultDeploymentKey = jest.fn(() => of('some_default_key'));
                 mockCodePushExperimentService.setExperimentKey = jest.fn(() => of());
                 mockCodePushExperimentService.setExperimentAppVersion = jest.fn(() => of());
+                mockLocation.back = jest.fn();
 
                 // act
                 appComponent.ngOnInit();
@@ -1039,6 +1271,9 @@ describe('AppComponent', () => {
                 setTimeout(() => {
                     expect(codePush.getCurrentPackage).toHaveBeenCalled();
                     expect(mockCodePushExperimentService.getDefaultDeploymentKey).toHaveBeenCalled();
+                    expect(mockPlatform.backButton).not.toBeUndefined();
+                    expect(appComponent.rootPageDisplayed).toBeFalsy();
+                    expect(mockLocation.back).toHaveBeenCalled();
                     done();
                 });
             });
@@ -1088,7 +1323,9 @@ describe('AppComponent', () => {
             // mockCodePushExperimentService.getDefaultDeploymentKey = jest.fn(() => of());
             mockCodePushExperimentService.setExperimentKey = jest.fn(() => of());
             mockCodePushExperimentService.setExperimentAppVersion = jest.fn(() => of());
-
+            mockPreferences.getString = jest.fn(() => of(ProfileType.ADMIN));
+            mockAppGlobalService.isGuestUser = true;
+            mockLoginHandlerService.signIn = jest.fn(() => Promise.resolve());
             // act
             appComponent.ngOnInit();
             // assert
@@ -1119,9 +1356,23 @@ describe('AppComponent', () => {
                         return of('');
                     case PreferenceKey.SYNC_CONFIG:
                         return of('some_config');
+                    case PreferenceKey.CAMPAIGN_PARAMETERS:
+                        return of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]');
+                    case 'notification_received_at':
+                        return of('sample');
+                    case PreferenceKey.CURRENT_SELECTED_THEME:
+                        return of('DEFAULT');
+                    case PreferenceKey.SELECTED_USER_TYPE:
+                        return of(ProfileType.ADMIN);
                 }
             });
-
+            mockPreferences.getBoolean = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.COACH_MARK_SEEN:
+                    return of(true);
+                }
+            });
+            mockHeaderService.hideStatusBar = jest.fn();
             mockHeaderService.headerConfigEmitted$ = EMPTY;
             mockCommonUtilService.networkAvailability$ = EMPTY;
             mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(true));
@@ -1140,54 +1391,6 @@ describe('AppComponent', () => {
             jest.resetAllMocks();
             jest.restoreAllMocks();
         });
-
-        it('should subscribe coach_mark_seen event', (done) => {
-            // arrange
-            mockPlatform.ready = jest.fn(() => {
-                return {
-                    then: jest.fn((cb) => cb('ready'))
-                } as any;
-            });
-            const mockData = {
-                showWalkthroughBackDrop: true,
-                appName: 'some_app_name'
-            };
-            mockEvents.subscribe = jest.fn((topic, fn) => {
-                switch (topic) {
-                    case EventTopics.COACH_MARK_SEEN:
-                        return fn(mockData);
-                }
-            });
-            const getBoundingClientRect = {
-                getBoundingClientRect: jest.fn(() => {
-                    const left = 0;
-                    return left;
-                }),
-                getElementsByClassName: jest.fn(() => {
-                    return [{
-                        className: 'bg',
-                        setAttribute: jest.fn()
-                    }];
-                })
-            } as any;
-            jest.spyOn(document, 'getElementById').mockReturnValue(getBoundingClientRect);
-
-            // act
-            jest.useFakeTimers();
-            appComponent.ngOnInit();
-            // assert
-            jest.advanceTimersByTime(2100);
-            expect(mockEvents.subscribe).toHaveBeenCalled();
-            expect(document.getElementById).toHaveBeenCalled();
-            expect(document.getElementById('qrScannerIcon').getBoundingClientRect).toHaveBeenCalled();
-            expect(document.getElementById('qrScannerIcon').getElementsByClassName).toHaveBeenCalled();
-            // expect(document.getElementById('backdrop').getElementsByClassName('bg')[0].setAttribute).toHaveBeenCalled();
-            jest.useRealTimers();
-            jest.clearAllTimers();
-            setTimeout(() => {
-                done();
-            });
-        });
         it('should subscribe tab change event', (done) => {
             // arrange
             mockPlatform.ready = jest.fn(() => {
@@ -1272,7 +1475,7 @@ describe('AppComponent', () => {
                 done();
             });
         });
-        it('should subscribe tab change event with pageId resources '
+        it('should subscribe tab change event with pageId library '
             + 'and no board, medium and class is assigned to current profile', (done) => {
                 // arrange
                 mockPlatform.ready = jest.fn(() => {
@@ -1283,7 +1486,7 @@ describe('AppComponent', () => {
                 mockEvents.subscribe = jest.fn((topic, fn) => {
                     switch (topic) {
                         case EventTopics.TAB_CHANGE:
-                            return fn('resources');
+                            return fn('library');
                     }
                 });
                 mockZone.run = jest.fn((fn) => fn());
@@ -1310,11 +1513,11 @@ describe('AppComponent', () => {
                     InteractType.TOUCH,
                     InteractSubtype.TAB_CLICKED,
                     Environment.HOME,
-                    'resources');
-                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).nthCalledWith(1,
+                    'library');
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
                     ImpressionType.VIEW,
                     '',
-                    'resources',
+                    'library',
                     Environment.HOME,
                     undefined, undefined, undefined, undefined,
                     corRelationList);
@@ -1324,7 +1527,8 @@ describe('AppComponent', () => {
                     done();
                 });
             });
-        it('should subscribe tab change event with pageId library '
+
+        it('should subscribe tab change event with pageId courses '
             + 'and board, medium and class is assigned to current profile', (done) => {
                 // arrange
                 mockPlatform.ready = jest.fn(() => {
@@ -1335,7 +1539,7 @@ describe('AppComponent', () => {
                 mockEvents.subscribe = jest.fn((topic, fn) => {
                     switch (topic) {
                         case EventTopics.TAB_CHANGE:
-                            return fn('resources');
+                            return fn('courses');
                     }
                 });
                 mockZone.run = jest.fn((fn) => fn());
@@ -1347,32 +1551,22 @@ describe('AppComponent', () => {
                     grade: ['some_grade']
                 } as any;
                 mockAppGlobalService.getCurrentUser = jest.fn(() => mockCurrentProfile);
-
+                mockPreferences.getString = jest.fn(() => of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]'));
                 const corRelationList: Array<CorrelationData> = [];
-                corRelationList.push({ id: mockCurrentProfile.board.join(','), type: CorReleationDataType.BOARD });
-                corRelationList.push({ id: mockCurrentProfile.medium.join(','), type: CorReleationDataType.MEDIUM });
-                corRelationList.push({ id: mockCurrentProfile.grade.join(','), type: CorReleationDataType.CLASS });
-                corRelationList.push({ id: mockCurrentProfile.profileType, type: CorReleationDataType.USERTYPE });
+                corRelationList.push({ id: 'mock_channel_id', type: CorReleationDataType.SOURCE });
                 mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
-
+                mockTranslate.use = jest.fn();
                 // act
                 jest.useFakeTimers();
                 appComponent.ngOnInit();
                 // assert
                 jest.advanceTimersByTime(2100);
                 expect(mockEvents.subscribe).toHaveBeenCalled();
-                expect(mockTelemetryGeneratorService.generateInteractTelemetry).nthCalledWith(2,
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
                     InteractType.TOUCH,
                     InteractSubtype.TAB_CLICKED,
                     Environment.HOME,
-                    'resources');
-                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).nthCalledWith(1,
-                    ImpressionType.VIEW,
-                    '',
-                    'resources',
-                    Environment.HOME,
-                    undefined, undefined, undefined, undefined,
-                    corRelationList);
+                    'courses');
                 jest.useRealTimers();
                 jest.clearAllTimers();
                 setTimeout(() => {
@@ -1433,48 +1627,1339 @@ describe('AppComponent', () => {
                 done();
             });
         });
+
+        it('should get errorEvent for planned maintenance and display it ', (done) => {
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockEventsBusService.events = jest.fn(() => of({
+                type: 'PLANNED_MAINTENANCE_PERIOD',
+                payload: {}
+            }));
+            mockEvents.subscribe = jest.fn();
+            const mockButtonSubscription = {
+                unsubscribe: jest.fn()
+            };
+            const subscribeWithPriorityData = jest.fn((_, fn) => {
+                setTimeout(() => {
+                    fn();
+                });
+                return mockButtonSubscription;
+            });
+            mockPlatform.backButton = {
+                subscribeWithPriority: subscribeWithPriorityData
+            } as any;
+            // act
+            jest.useFakeTimers();
+            appComponent.ngOnInit();
+            // assert
+            jest.advanceTimersByTime(2100);
+            jest.useRealTimers();
+            jest.clearAllTimers();
+            setTimeout(() => {
+                expect(mockEventsBusService.events).toHaveBeenCalled();
+                expect(subscribeWithPriorityData).toBeTruthy();
+                done();
+            }, 0);
+        });
     });
 
     describe('checkDeviceLocation()', () => {
 
-        it('shouldn\'t show location selection page if location available', () => {
+        it('shouldn\'t show location selection page if location available', (done) => {
             // arrange
             mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(true));
+            mockPreferences.getString = jest.fn(() => of(ProfileType.ADMIN));
+            mockAppGlobalService.isGuestUser = true;
+            mockLoginHandlerService.signIn = jest.fn(() => Promise.resolve());
             // act
             appComponent.reloadGuestEvents();
             // assert
-            expect(mockRouter.navigate).not.toHaveBeenCalled();
+            setTimeout(() => {
+                expect(mockRouter.navigate).not.toHaveBeenCalled();
+                expect(mockPreferences.getString).toHaveBeenCalled();
+                expect(mockAppGlobalService.isGuestUser).toBeTruthy();
+                done();
+            }, 0);
         });
 
-        it('shouldn\'t show location selection page if BMC value is not selected', () => {
+        it('shouldn\'t show location selection page if BMC value is not selected', (done) => {
             // arrange
             mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
             mockProfileService.getActiveSessionProfile = jest.fn(() => of({} as any));
             mockAppGlobalService.getProfileSettingsStatus = jest.fn(() => Promise.resolve(false));
+            mockPreferences.getString = jest.fn(() => of(ProfileType.ADMIN));
+            mockAppGlobalService.isGuestUser = false;
             // act
             appComponent.reloadGuestEvents();
             // assert
-            expect(mockRouter.navigate).not.toHaveBeenCalled();
+            setTimeout(() => {
+                expect(mockRouter.navigate).not.toHaveBeenCalled();
+                expect(mockPreferences.getString).toHaveBeenCalled();
+                expect(mockAppGlobalService.isGuestUser).toBeFalsy();
+                done();
+            }, 0);
         });
 
-        it('should show location selection page if BMC value is not selected', () => {
+        it('should show location selection page if BMC value is not selected', (done) => {
             // arrange
             mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
             mockProfileService.getActiveSessionProfile = jest.fn(() => of({} as any));
             mockAppGlobalService.getProfileSettingsStatus = jest.fn(() => Promise.resolve(true));
+            mockSplashScreenService.handleSunbirdSplashScreenActions = jest.fn(() => Promise.resolve({})) as any;
+            mockPreferences.getString = jest.fn(() => of(ProfileType.ADMIN));
             // act
             appComponent.reloadGuestEvents();
             // assert
 
             setTimeout(() => {
+                expect(mockSplashScreenService.handleSunbirdSplashScreenActions).toHaveBeenCalled();
                 expect(mockRouter.navigate).toHaveBeenCalledWith(['/', 'district-mapping'], {
                     state: {
                         isShowBackButton: false
                     }
                 });
+                done();
+            }, 0);
+
+        });
+    });
+
+    describe('menuItemAction', () => {
+        it('should navigate to groups page when my group is clicked in menu', () => {
+            // arrange
+            const menuName = {
+                menuItem: 'MY_GROUPS'
+            };
+            const routeUrl = [`/${RouterLinks.MY_GROUPS}`];
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            // act
+            appComponent.menuItemAction(menuName);
+
+            // assert
+            expect(mockRouter.navigate).toHaveBeenCalledWith(routeUrl, expect.anything());
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.MY_GROUPS_CLICKED,
+                Environment.USER,
+                PageId.PROFILE
+            );
+        });
+
+        it('should navigate to SETTINGS page when settings is clicked in menu', () => {
+            // arrange
+            const menuName = {
+                menuItem: 'SETTINGS'
+            };
+            const routeUrl = [`/${RouterLinks.SETTINGS}`];
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            // act
+            appComponent.menuItemAction(menuName);
+
+            // assert
+            expect(mockRouter.navigate).toHaveBeenCalledWith(routeUrl);
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.SETTINGS_CLICKED,
+                Environment.USER,
+                PageId.PROFILE
+            );
+        });
+
+        it('should navigate to LANGUAGE page when language is clicked in menu', () => {
+            // arrange
+            const menuName = {
+                menuItem: 'LANGUAGE'
+            };
+            const routeUrl = [`/${RouterLinks.LANGUAGE_SETTING}`, true];
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            // act
+            appComponent.menuItemAction(menuName);
+
+            // assert
+            expect(mockRouter.navigate).toHaveBeenCalledWith(routeUrl);
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.LANGUAGE_CLICKED,
+                Environment.USER,
+                PageId.PROFILE
+            );
+        });
+
+        it('should navigate to HELP page when help is clicked in menu', () => {
+            // arrange
+            const menuName = {
+                menuItem: 'HELP'
+            };
+            const routeUrl = [`/${RouterLinks.FAQ_HELP}`];
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            // act
+            appComponent.menuItemAction(menuName);
+
+            // assert
+            expect(mockRouter.navigate).toHaveBeenCalledWith(routeUrl);
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.HELP_CLICKED,
+                Environment.USER,
+                PageId.PROFILE
+            );
+        });
+
+        it('should return a toast for internet changes', () => {
+            // arrange
+            const menuName = {
+                menuItem: 'LOGOUT'
+            };
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
+            };
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            appComponent.menuItemAction(menuName);
+            // assert
+            expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeFalsy();
+            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('NEED_INTERNET_TO_CHANGE');
+        });
+
+        it('should handle logout', () => {
+            // arrange
+            const menuName = {
+                menuItem: 'LOGOUT'
+            };
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockLogoutHandlerService.onLogout = jest.fn();
+            // act
+            appComponent.menuItemAction(menuName);
+            // assert
+            expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeTruthy();
+            expect(mockLogoutHandlerService.onLogout).toHaveBeenCalled();
+        });
+
+        it('should handle inappupdate', () => {
+            // arrange
+            const menuName = {
+                menuItem: 'UPDATE'
+            };
+            // act
+            appComponent.menuItemAction(menuName);
+            // assert
+            expect(cordova.plugins.InAppUpdateManager.checkForImmediateUpdate).toHaveBeenCalled();
+        });
+    });
+
+    describe('checkAndroidWebViewVersion', () => {
+        it('should generate a impression event for webviewConfig', (done) => {
+            mockFormAndFrameworkUtilService.getWebviewConfig = jest.fn(() => Promise.resolve(1));
+            document.getElementById = jest.fn(() => ({ style: { display: 'auto' } })) as any;
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            // act
+            appComponent.checkAndroidWebViewVersion();
+            // assert
+            setTimeout(() => {
+                expect(mockFormAndFrameworkUtilService.getWebviewConfig).toHaveBeenCalled();
+                expect(document.getElementById).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    ImpressionType.VIEW, '',
+                    PageId.UPDATE_WEBVIEW_POPUP,
+                    Environment.HOME
+                );
+                done();
             }, 0);
+        });
 
+        it('should generate a impression event for webviewConfig', (done) => {
+            mockFormAndFrameworkUtilService.getWebviewConfig = jest.fn(() => Promise.reject({ error: 'error' }));
+            document.getElementById = jest.fn(() => ({ style: { display: 'auto' } })) as any;
+            // act
+            appComponent.checkAndroidWebViewVersion();
+            // assert
+            setTimeout(() => {
+                expect(mockFormAndFrameworkUtilService.getWebviewConfig).toHaveBeenCalled();
+                expect(document.getElementById).toHaveBeenCalled();
+                done();
+            }, 0);
         });
     });
 
+    it('should return GooglePlayPage', () => {
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn(() => { });
+        appComponent.openPlaystore();
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH,
+            InteractSubtype.UPDATE_WEBVIEW_CLICKED,
+            Environment.HOME,
+            PageId.UPDATE_WEBVIEW_POPUP
+        );
+    });
+
+    describe('ngAfterViewInit', () => {
+        it('should return downloadProgress for platform resume', (done) => {
+            mockPlatform.resume = of({
+                subscribe: jest.fn()
+            }) as any;
+            const value = new Map();
+            mockTelemetryGeneratorService.generateInterruptTelemetry = jest.fn();
+            mockSplashScreenService.handleSunbirdSplashScreenActions = jest.fn(() => Promise.resolve()) as any;
+            mockPreferences.getString = jest.fn(() => of('{key: "sample-ke"}'));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockNotificationSrc.handleNotification = jest.fn(() => Promise.resolve());
+            // act
+            appComponent.ngAfterViewInit();
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInterruptTelemetry).toHaveBeenCalledWith('resume', '');
+                expect(mockSplashScreenService.handleSunbirdSplashScreenActions).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.OTHER,
+                    InteractSubtype.HOTCODE_PUSH_INITIATED,
+                    Environment.HOME, PageId.HOME, null, value);
+                expect(mockPreferences.getString).toHaveBeenCalledWith(PreferenceKey.DEPLOYMENT_KEY);
+                expect(mockNotificationSrc.handleNotification).toHaveBeenCalled();
+                expect(appComponent.isForeground).toBeTruthy();
+                done();
+            }, 0);
+        });
+
+        it('should generate a event for for platform pause', (done) => {
+            mockPlatform.pause = of({
+                subscribe: jest.fn()
+            }) as any;
+            const value = new Map();
+            mockTelemetryGeneratorService.generateInterruptTelemetry = jest.fn();
+            mockSplashScreenService.handleSunbirdSplashScreenActions = jest.fn(() => Promise.resolve()) as any;
+            mockPreferences.getString = jest.fn(() => of(undefined));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockNotificationSrc.handleNotification = jest.fn(() => Promise.resolve());
+            // act
+            appComponent.ngAfterViewInit();
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInterruptTelemetry).toHaveBeenCalledWith('background', '');
+                expect(mockSplashScreenService.handleSunbirdSplashScreenActions).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.OTHER,
+                    InteractSubtype.HOTCODE_PUSH_KEY_NOT_DEFINED,
+                    Environment.HOME, PageId.HOME);
+                expect(mockPreferences.getString).toHaveBeenCalledWith(PreferenceKey.DEPLOYMENT_KEY);
+                expect(mockNotificationSrc.handleNotification).toHaveBeenCalled();
+                expect(appComponent.isForeground).toBeFalsy();
+                done();
+            }, 0);
+        });
+
+        it('should not generate a event for for platform pause', (done) => {
+            mockPlatform.pause = of({
+                subscribe: jest.fn()
+            }) as any;
+            mockAppGlobalService.isNativePopupVisible = true;
+            const value = new Map();
+            mockTelemetryGeneratorService.generateInterruptTelemetry = jest.fn();
+            mockSplashScreenService.handleSunbirdSplashScreenActions = jest.fn(() => Promise.resolve()) as any;
+            mockPreferences.getString = jest.fn(() => of(undefined));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockNotificationSrc.handleNotification = jest.fn(() => Promise.resolve());
+            // act
+            appComponent.ngAfterViewInit();
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInterruptTelemetry).not.toHaveBeenCalledWith('background', '');
+                mockAppGlobalService.isNativePopupVisible = false;
+                done();
+            }, 0);
+        });
+    });
+
+    describe('startOpenrapDiscovery', () => {
+        beforeEach(() => {
+            // arrange
+            mockPlatform.ready = jest.fn(() => {
+                return new Promise((resolve) => {
+                    resolve('ready');
+                });
+            });
+            mockHeaderService.headerConfigEmitted$ = EMPTY;
+            mockCommonUtilService.networkAvailability$ = EMPTY;
+            mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(true));
+            mockEventsBusService.events = jest.fn(() => EMPTY);
+            mockNotificationSrc.setupLocalNotification = jest.fn();
+            mockSystemSettingsService.getSystemSettings = jest.fn(() => EMPTY);
+            mockUtilityService.getBuildConfigValue = jest.fn(() => Promise.resolve('some_app_name'));
+            mockTelemetryAutoSyncService.start = jest.fn(() => EMPTY);
+            mockEvents.subscribe = jest.fn();
+            mockPreferences.getString = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.SELECTED_LANGUAGE_CODE:
+                        return of('');
+                    case PreferenceKey.FCM_TOKEN:
+                        return of('some_token');
+                    case PreferenceKey.DEPLOYMENT_KEY:
+                        return of('');
+                    case PreferenceKey.SYNC_CONFIG:
+                        return of('some_config');
+                    case PreferenceKey.CAMPAIGN_PARAMETERS:
+                        return of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]');
+                    case 'notification_received_at':
+                        return of('sample');
+                    case PreferenceKey.SELECTED_USER_TYPE:
+                        return of(ProfileType.ADMIN);
+                }
+            });
+            mockPreferences.getBoolean = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.COACH_MARK_SEEN:
+                    return of(true);
+                }
+            });
+            mockPreferences.putString = jest.fn(() => EMPTY);
+            mockFormAndFrameworkUtilService.checkNewAppVersion = jest.fn(() => Promise.resolve(''));
+            jest.spyOn(appComponent, 'checkAndroidWebViewVersion').mockImplementation();
+            mockUtilityService.getDeviceSpec = jest.fn(() => Promise.resolve(mockDeviceSpec));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        });
+        afterEach(() => {
+            jest.resetAllMocks();
+        });
+
+        it('shouldreturn openRapDiscovery', (done) => {
+            // arrange
+            const value = new Map();
+            mockSplaschreenDeeplinkActionHandlerDelegate.checkUtmContent = jest.fn();
+            mockActivePageService.computePageId = jest.fn(() => 'sample-page');
+            mockTelemetryGeneratorService.generateNotificationClickedTelemetry = jest.fn();
+            mockPreferences.getString = jest.fn(() => of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]'));
+            mockTranslate.use = jest.fn(() => of({}));
+            mockEvents.subscribe = jest.fn((_, fn) => fn({ skipRootNavigation: false }));
+            mockPreferences.getString = jest.fn(() => of('sample-batch-details'));
+            mockAppGlobalService.limitedShareQuizContent = false;
+            mockZone.run = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            jest.spyOn(appComponent, 'reloadSigninEvents').mockImplementation(() => {
+                return;
+            });
+            mockAppGlobalService.OPEN_RAPDISCOVERY_ENABLED = true;
+            (window as any).openrap = {
+                startDiscovery: jest.fn((fn) => fn({}))
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(SunbirdSdk.instance, 'updateContentServiceConfig').mockImplementation();
+            jest.spyOn(SunbirdSdk.instance, 'updatePageServiceConfig').mockImplementation();
+            jest.spyOn(SunbirdSdk.instance, 'updateTelemetryConfig').mockImplementation();
+            mockTelemetryAutoSyncService.start = jest.fn(() => of(undefined));
+            mockTelemetryAutoSyncService.pause = jest.fn();
+            mockPlatform.pause = of(1, 2) as any;
+            mockPlatform.resume = of(1, 2) as any;
+            mockTelemetryAutoSyncService.continue = jest.fn();
+            // act
+            appComponent.ngOnInit();
+            // assert
+            setTimeout(() => {
+                expect(mockActivePageService.computePageId).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateNotificationClickedTelemetry).toHaveBeenCalledWith(
+                    'local',
+                    'sample-page',
+                    undefined,
+                    [{ id: '', type: 'NotificationId' }]
+                );
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(7, PreferenceKey.CAMPAIGN_PARAMETERS);
+                expect(mockTranslate.use).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    'networkStatus',
+                    Environment.HOME,
+                    'splash',
+                    undefined,
+                    value
+                );
+                expect(mockEvents.subscribe).toHaveBeenCalled();
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(1, PreferenceKey.BATCH_DETAIL_KEY);
+                expect(appComponent.toggleRouterOutlet).toBeTruthy();
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    InteractSubtype.OPENRAP_DEVICE_DISCONNECTED,
+                    Environment.HOME,
+                    Environment.HOME, undefined,
+                    new Map()
+                );
+                done();
+            }, 0);
+        });
+    });
+
+    it('should handle headerService and statusbar', () => {
+        // arrange
+        mockHeaderService.headerConfigEmitted$ = of({
+            subscribe: jest.fn(() => 'config')
+        });
+        mockPlatform.ready = jest.fn(() => Promise.resolve({})) as any;
+        mockStatusBar.styleDefault = jest.fn();
+        // act
+        appComponent.initializeApp();
+        // assert
+        expect(mockHeaderService.headerConfigEmitted$).not.toBeUndefined();
+        expect(mockPlatform.ready).toHaveBeenCalled();
+    });
+
+    describe('handleHeaderEvents', () => {
+        it('should return sidebarEvent', () => {
+            const request = {
+                name: 'back'
+            };
+            mockRouter.url = RouterLinks.USER_TYPE_SELECTION;
+            mockHeaderService.sidebarEvent = jest.fn();
+            // act
+            appComponent.handleHeaderEvents(request);
+            // assert
+            expect(mockRouter.url).toBeTruthy();
+            expect(mockHeaderService.sidebarEvent).toHaveBeenCalled();
+        });
+
+        it('should return ExitPopUp', () => {
+            const request = {
+                name: 'back'
+            };
+            mockRouter.url = RouterLinks.LIBRARY_TAB;
+            mockActivePageService.computePageId = jest.fn(() => 'sample-page-id');
+            mockCommonUtilService.showExitPopUp = jest.fn(() => Promise.resolve());
+            // act
+            appComponent.handleHeaderEvents(request);
+            // assert
+            expect(mockRouter.url).toBeTruthy();
+            expect(mockActivePageService.computePageId).toHaveBeenCalled();
+            expect(mockCommonUtilService.showExitPopUp).toHaveBeenCalled();
+        });
+
+        it('should back to previous page', () => {
+            const request = {
+                name: 'back'
+            };
+            mockRouter.url = 'sampl-url';
+            mockLocation.back = jest.fn();
+            // act
+            appComponent.handleHeaderEvents(request);
+            // assert
+            expect(mockRouter.url).toBeTruthy();
+            expect(mockLocation.back).toHaveBeenCalled();
+        });
+
+        it('should return sidebar event if request is not back', () => {
+            const request = {
+                name: 'go'
+            };
+            mockRouter.url = 'sampl-url';
+            mockHeaderService.sidebarEvent = jest.fn();
+            // act
+            appComponent.handleHeaderEvents(request);
+            // assert
+            expect(mockRouter.url).toBeTruthy();
+            expect(mockHeaderService.sidebarEvent).toHaveBeenCalled();
+        });
+    });
+
+    describe('handleAuthAutoMigrateEvents', () => {
+        beforeEach(() => {
+            // arrange
+            mockPlatform.ready = jest.fn(() => {
+                return new Promise((resolve) => {
+                    resolve('ready');
+                });
+            });
+            mockHeaderService.headerConfigEmitted$ = EMPTY;
+            mockCommonUtilService.networkAvailability$ = EMPTY;
+            mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(true));
+            mockEventsBusService.events = jest.fn(() => EMPTY);
+            mockNotificationSrc.setupLocalNotification = jest.fn();
+            mockSystemSettingsService.getSystemSettings = jest.fn(() => EMPTY);
+            mockUtilityService.getBuildConfigValue = jest.fn(() => Promise.resolve('some_app_name'));
+            mockTelemetryAutoSyncService.start = jest.fn(() => EMPTY);
+            mockEvents.subscribe = jest.fn();
+            mockPreferences.getString = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.SELECTED_LANGUAGE_CODE:
+                        return of('');
+                    case PreferenceKey.FCM_TOKEN:
+                        return of('some_token');
+                    case PreferenceKey.DEPLOYMENT_KEY:
+                        return of('');
+                    case PreferenceKey.SYNC_CONFIG:
+                        return of('some_config');
+                    case PreferenceKey.CAMPAIGN_PARAMETERS:
+                        return of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]');
+                    case 'notification_received_at':
+                        return of('sample');
+                    case PreferenceKey.SELECTED_USER_TYPE:
+                        return of(ProfileType.ADMIN);
+                }
+            });
+            mockPreferences.getBoolean = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.COACH_MARK_SEEN:
+                    return of(true);
+                }
+            });
+            mockPreferences.putString = jest.fn(() => EMPTY);
+            mockFormAndFrameworkUtilService.checkNewAppVersion = jest.fn(() => Promise.resolve(''));
+            jest.spyOn(appComponent, 'checkAndroidWebViewVersion').mockImplementation();
+            mockUtilityService.getDeviceSpec = jest.fn(() => Promise.resolve(mockDeviceSpec));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        });
+        afterEach(() => {
+            jest.resetAllMocks();
+        });
+
+        it('should return a toast for auto migrate success', (done) => {
+            // arrange
+            const value = new Map();
+            mockSplaschreenDeeplinkActionHandlerDelegate.checkUtmContent = jest.fn();
+            mockActivePageService.computePageId = jest.fn(() => 'sample-page');
+            mockTelemetryGeneratorService.generateNotificationClickedTelemetry = jest.fn();
+            mockPreferences.getString = jest.fn(() => of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]'));
+            mockTranslate.use = jest.fn(() => of({}));
+            mockEvents.subscribe = jest.fn((_, fn) => fn({ skipRootNavigation: false }));
+            mockPreferences.getString = jest.fn(() => of('sample-batch-details'));
+            mockAppGlobalService.limitedShareQuizContent = false;
+            mockZone.run = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            jest.spyOn(appComponent, 'reloadSigninEvents').mockImplementation(() => {
+                return;
+            });
+            mockAppGlobalService.OPEN_RAPDISCOVERY_ENABLED = true;
+            (window as any).openrap = {
+                startDiscovery: jest.fn((fn) => fn({}))
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(SunbirdSdk.instance, 'updateContentServiceConfig').mockImplementation();
+            jest.spyOn(SunbirdSdk.instance, 'updatePageServiceConfig').mockImplementation();
+            jest.spyOn(SunbirdSdk.instance, 'updateTelemetryConfig').mockImplementation();
+            mockTelemetryAutoSyncService.start = jest.fn(() => of(undefined));
+            mockTelemetryAutoSyncService.pause = jest.fn();
+            mockPlatform.pause = of(1, 2) as any;
+            mockPlatform.resume = of(1, 2) as any;
+            mockTelemetryAutoSyncService.continue = jest.fn();
+            mockEventsBusService.events = jest.fn(() => of({ type: 'AUTO_MIGRATE_SUCCESS' }));
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            appComponent.ngOnInit();
+            // assert
+            setTimeout(() => {
+                expect(mockActivePageService.computePageId).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateNotificationClickedTelemetry).toHaveBeenCalledWith(
+                    'local',
+                    'sample-page',
+                    undefined,
+                    [{ id: '', type: 'NotificationId' }]
+                );
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(7, PreferenceKey.CAMPAIGN_PARAMETERS);
+                expect(mockTranslate.use).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    'networkStatus',
+                    Environment.HOME,
+                    'splash',
+                    undefined,
+                    value
+                );
+                expect(mockEvents.subscribe).toHaveBeenCalled();
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(1, PreferenceKey.BATCH_DETAIL_KEY);
+                expect(appComponent.toggleRouterOutlet).toBeTruthy();
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    InteractSubtype.OPENRAP_DEVICE_DISCONNECTED,
+                    Environment.HOME,
+                    Environment.HOME, undefined,
+                    new Map()
+                );
+                expect(mockEventsBusService.events).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('AUTO_MIGRATION_SUCCESS_MESSAGE');
+                done();
+            }, 0);
+        });
+
+        it('should return a toast for auto migrate fail', (done) => {
+            // arrange
+            const value = new Map();
+            mockSplaschreenDeeplinkActionHandlerDelegate.checkUtmContent = jest.fn();
+            mockActivePageService.computePageId = jest.fn(() => 'sample-page');
+            mockTelemetryGeneratorService.generateNotificationClickedTelemetry = jest.fn();
+            mockPreferences.getString = jest.fn(() => of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]'));
+            mockTranslate.use = jest.fn(() => of({}));
+            mockEvents.subscribe = jest.fn((_, fn) => fn({ skipRootNavigation: false }));
+            // mockPreferences.getString = jest.fn(() => of('sample-batch-details'));
+            mockAppGlobalService.limitedShareQuizContent = false;
+            mockZone.run = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            jest.spyOn(appComponent, 'reloadSigninEvents').mockImplementation(() => {
+                return;
+            });
+            mockAppGlobalService.OPEN_RAPDISCOVERY_ENABLED = true;
+            (window as any).openrap = {
+                startDiscovery: jest.fn((fn) => fn({}))
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(SunbirdSdk.instance, 'updateContentServiceConfig').mockImplementation();
+            jest.spyOn(SunbirdSdk.instance, 'updatePageServiceConfig').mockImplementation();
+            jest.spyOn(SunbirdSdk.instance, 'updateTelemetryConfig').mockImplementation();
+            mockTelemetryAutoSyncService.start = jest.fn(() => of(undefined));
+            mockTelemetryAutoSyncService.pause = jest.fn();
+            mockPlatform.pause = of(1, 2) as any;
+            mockPlatform.resume = of(1, 2) as any;
+            mockTelemetryAutoSyncService.continue = jest.fn();
+            mockEventsBusService.events = jest.fn(() => of({ type: 'AUTO_MIGRATE_FAIL' }));
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            appComponent.ngOnInit();
+            // assert
+            setTimeout(() => {
+                expect(mockActivePageService.computePageId).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateNotificationClickedTelemetry).toHaveBeenCalledWith(
+                    'local',
+                    'sample-page',
+                    undefined,
+                    [{ id: '', type: 'NotificationId' }]
+                );
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(7, PreferenceKey.CAMPAIGN_PARAMETERS);
+                expect(mockTranslate.use).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    'networkStatus',
+                    Environment.HOME,
+                    'splash',
+                    undefined,
+                    value
+                );
+                expect(mockEvents.subscribe).toHaveBeenCalled();
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(1, PreferenceKey.BATCH_DETAIL_KEY);
+                expect(appComponent.toggleRouterOutlet).toBeTruthy();
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    InteractSubtype.OPENRAP_DEVICE_DISCONNECTED,
+                    Environment.HOME,
+                    Environment.HOME, undefined,
+                    new Map()
+                );
+                expect(mockEventsBusService.events).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('AUTO_MIGRATION_FAIL_MESSAGE');
+                done();
+            }, 0);
+        });
+
+        it('should return a toast for auto migrate fail', (done) => {
+            // arrange
+            const value = new Map();
+            mockSplaschreenDeeplinkActionHandlerDelegate.checkUtmContent = jest.fn();
+            mockActivePageService.computePageId = jest.fn(() => 'sample-page');
+            mockTelemetryGeneratorService.generateNotificationClickedTelemetry = jest.fn();
+            mockPreferences.getString = jest.fn(() => of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]'));
+            mockTranslate.use = jest.fn(() => of({}));
+            mockEvents.subscribe = jest.fn((_, fn) => fn({ skipRootNavigation: false }));
+            // mockPreferences.getString = jest.fn(() => of('sample-batch-details'));
+            mockAppGlobalService.limitedShareQuizContent = false;
+            mockZone.run = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            jest.spyOn(appComponent, 'reloadSigninEvents').mockImplementation(() => {
+                return;
+            });
+            mockAppGlobalService.OPEN_RAPDISCOVERY_ENABLED = true;
+            (window as any).openrap = {
+                startDiscovery: jest.fn((fn) => fn({}))
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(SunbirdSdk.instance, 'updateContentServiceConfig').mockImplementation();
+            jest.spyOn(SunbirdSdk.instance, 'updatePageServiceConfig').mockImplementation();
+            jest.spyOn(SunbirdSdk.instance, 'updateTelemetryConfig').mockImplementation();
+            mockTelemetryAutoSyncService.start = jest.fn(() => of(undefined));
+            mockTelemetryAutoSyncService.pause = jest.fn();
+            mockPlatform.pause = of(1, 2) as any;
+            mockPlatform.resume = of(1, 2) as any;
+            mockTelemetryAutoSyncService.continue = jest.fn();
+            mockEventsBusService.events = jest.fn(() => of({ type: 'AUTH_TOKEN_REFRESH_ERROR' }));
+            mockLogoutHandlerService.onLogout = jest.fn();
+            // act
+            appComponent.ngOnInit();
+            // assert
+            setTimeout(() => {
+                expect(mockActivePageService.computePageId).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateNotificationClickedTelemetry).toHaveBeenCalledWith(
+                    'local',
+                    'sample-page',
+                    undefined,
+                    [{ id: '', type: 'NotificationId' }]
+                );
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(7, PreferenceKey.CAMPAIGN_PARAMETERS);
+                expect(mockTranslate.use).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    'networkStatus',
+                    Environment.HOME,
+                    'splash',
+                    undefined,
+                    value
+                );
+                expect(mockEvents.subscribe).toHaveBeenCalled();
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(1, PreferenceKey.BATCH_DETAIL_KEY);
+                expect(appComponent.toggleRouterOutlet).toBeTruthy();
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    InteractSubtype.OPENRAP_DEVICE_DISCONNECTED,
+                    Environment.HOME,
+                    Environment.HOME, undefined,
+                    new Map()
+                );
+                expect(mockEventsBusService.events).toHaveBeenCalled();
+                expect(mockLogoutHandlerService.onLogout).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    it('should generate a event for walkthrough-backdrop-click', () => {
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        appComponent.qrWalkthroughBackdropClicked();
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH,
+            InteractSubtype.WALKTHROUGH_BACKDROP_CLICKED,
+            Environment.ONBOARDING,
+            PageId.LIBRARY,
+        );
+    });
+
+    it('should generate event for onConfirmationClicked on walkthrough', () => {
+        const event = {
+            stopPropagation: jest.fn(() => 'stop-propagation')
+        };
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        // act
+        appComponent.onConfirmationClicked(event);
+        // assert
+        expect(appComponent.showWalkthroughBackDrop).toBeFalsy();
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH,
+            InteractSubtype.WALKTHROUGH_CONFIRMATION_CLICKED,
+            Environment.ONBOARDING,
+            PageId.LIBRARY
+        );
+    });
+
+    describe('getDeviceProfile', () => {
+        beforeEach(() => {
+            // arrange
+            mockPlatform.ready = jest.fn(() => {
+                return new Promise((resolve) => {
+                    resolve('ready');
+                });
+            });
+            mockHeaderService.headerConfigEmitted$ = EMPTY;
+            mockCommonUtilService.networkAvailability$ = EMPTY;
+            mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(true));
+            mockEventsBusService.events = jest.fn(() => EMPTY);
+            mockNotificationSrc.setupLocalNotification = jest.fn();
+            mockSystemSettingsService.getSystemSettings = jest.fn(() => EMPTY);
+            mockUtilityService.getBuildConfigValue = jest.fn(() => Promise.resolve('some_app_name'));
+            mockTelemetryAutoSyncService.start = jest.fn(() => EMPTY);
+            mockEvents.subscribe = jest.fn();
+            mockPreferences.getString = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.SELECTED_LANGUAGE_CODE:
+                        return of('');
+                    case PreferenceKey.FCM_TOKEN:
+                        return of('some_token');
+                    case PreferenceKey.DEPLOYMENT_KEY:
+                        return of('');
+                    case PreferenceKey.SYNC_CONFIG:
+                        return of('some_config');
+                    case PreferenceKey.CAMPAIGN_PARAMETERS:
+                        return of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]');
+                    case 'notification_received_at':
+                        return of('sample');
+                    case PreferenceKey.SELECTED_USER_TYPE:
+                        return of(ProfileType.ADMIN);
+                }
+            });
+            mockPreferences.getBoolean = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.COACH_MARK_SEEN:
+                    return of(true);
+                }
+            });
+            mockPreferences.putString = jest.fn(() => EMPTY);
+            mockFormAndFrameworkUtilService.checkNewAppVersion = jest.fn(() => Promise.resolve(''));
+            jest.spyOn(appComponent, 'checkAndroidWebViewVersion').mockImplementation();
+            mockUtilityService.getDeviceSpec = jest.fn(() => Promise.resolve(mockDeviceSpec));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        });
+        afterEach(() => {
+            jest.resetAllMocks();
+        });
+
+        it('should return userDeclaredLocation', (done) => {
+            // arrange
+            const value = new Map();
+            mockSplaschreenDeeplinkActionHandlerDelegate.checkUtmContent = jest.fn();
+            mockActivePageService.computePageId = jest.fn(() => 'sample-page');
+            mockTelemetryGeneratorService.generateNotificationClickedTelemetry = jest.fn();
+            mockPreferences.getString = jest.fn(() => of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]'));
+            mockTranslate.use = jest.fn(() => of({}));
+            mockEvents.subscribe = jest.fn((_, fn) => fn({ skipRootNavigation: false }));
+            // mockPreferences.getString = jest.fn(() => of('sample-batch-details'));
+            mockAppGlobalService.limitedShareQuizContent = false;
+            mockZone.run = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            jest.spyOn(appComponent, 'reloadSigninEvents').mockImplementation(() => {
+                return;
+            });
+            mockAppGlobalService.OPEN_RAPDISCOVERY_ENABLED = true;
+            (window as any).openrap = {
+                startDiscovery: jest.fn((fn) => fn({}))
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(SunbirdSdk.instance, 'updateContentServiceConfig').mockImplementation();
+            jest.spyOn(SunbirdSdk.instance, 'updatePageServiceConfig').mockImplementation();
+            jest.spyOn(SunbirdSdk.instance, 'updateTelemetryConfig').mockImplementation();
+            mockTelemetryAutoSyncService.start = jest.fn(() => of(undefined));
+            mockTelemetryAutoSyncService.pause = jest.fn();
+            mockPlatform.pause = of(1, 2) as any;
+            mockPlatform.resume = of(1, 2) as any;
+            mockTelemetryAutoSyncService.continue = jest.fn();
+            mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
+            mockCommonUtilService.isIpLocationAvailable = jest.fn(() => Promise.resolve(false));
+            mockDeviceRegisterService.getDeviceProfile = jest.fn(() => of({
+                userDeclaredLocation: {
+                    state: 'karnataka',
+                    district: 'bangalore'
+                }
+            }));
+            mockPreferences.putString = jest.fn(() => of(undefined));
+            mockProfileService.getActiveSessionProfile = jest.fn(() => of({}));
+            // act
+            appComponent.ngOnInit();
+            // assert
+            setTimeout(() => {
+                expect(mockActivePageService.computePageId).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateNotificationClickedTelemetry).toHaveBeenCalledWith(
+                    'local',
+                    'sample-page',
+                    undefined,
+                    [{ id: '', type: 'NotificationId' }]
+                );
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(7, PreferenceKey.CAMPAIGN_PARAMETERS);
+                expect(mockTranslate.use).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    'networkStatus',
+                    Environment.HOME,
+                    'splash',
+                    undefined,
+                    value
+                );
+                expect(mockEvents.subscribe).toHaveBeenCalled();
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(1, PreferenceKey.BATCH_DETAIL_KEY);
+                expect(appComponent.toggleRouterOutlet).toBeTruthy();
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    InteractSubtype.OPENRAP_DEVICE_DISCONNECTED,
+                    Environment.HOME,
+                    Environment.HOME, undefined,
+                    new Map()
+                );
+                expect(mockPreferences.putString).toHaveBeenCalledWith(
+                    PreferenceKey.DEVICE_LOCATION,
+                    JSON.stringify({
+                        state: 'karnataka',
+                        district: 'bangalore'
+                    })
+                );
+                done();
+            }, 0);
+        });
+
+        it('should return ipLocation', (done) => {
+            // arrange
+            const value = new Map();
+            mockSplaschreenDeeplinkActionHandlerDelegate.checkUtmContent = jest.fn();
+            mockActivePageService.computePageId = jest.fn(() => 'sample-page');
+            mockTelemetryGeneratorService.generateNotificationClickedTelemetry = jest.fn();
+            mockPreferences.getString = jest.fn(() => of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]'));
+            mockTranslate.use = jest.fn(() => of({}));
+            mockEvents.subscribe = jest.fn((_, fn) => fn({ skipRootNavigation: false }));
+            // mockPreferences.getString = jest.fn(() => of('sample-batch-details'));
+            mockAppGlobalService.limitedShareQuizContent = false;
+            mockZone.run = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            jest.spyOn(appComponent, 'reloadSigninEvents').mockImplementation(() => {
+                return;
+            });
+            mockAppGlobalService.OPEN_RAPDISCOVERY_ENABLED = true;
+            (window as any).openrap = {
+                startDiscovery: jest.fn((fn) => fn({}))
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(SunbirdSdk.instance, 'updateContentServiceConfig').mockImplementation();
+            jest.spyOn(SunbirdSdk.instance, 'updatePageServiceConfig').mockImplementation();
+            jest.spyOn(SunbirdSdk.instance, 'updateTelemetryConfig').mockImplementation();
+            mockTelemetryAutoSyncService.start = jest.fn(() => of(undefined));
+            mockTelemetryAutoSyncService.pause = jest.fn();
+            mockPlatform.pause = of(1, 2) as any;
+            mockPlatform.resume = of(1, 2) as any;
+            mockTelemetryAutoSyncService.continue = jest.fn();
+            mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
+            mockCommonUtilService.isIpLocationAvailable = jest.fn(() => Promise.resolve(false));
+            mockDeviceRegisterService.getDeviceProfile = jest.fn(() => of({
+                userDeclaredLocation: undefined,
+                ipLocation: {
+                    state: 'karnataka',
+                    district: 'bangalore'
+                }
+            }));
+            mockPreferences.putString = jest.fn(() => of(undefined));
+            mockProfileService.getActiveSessionProfile = jest.fn(() => of({}));
+            // act
+            appComponent.ngOnInit();
+            // assert
+            setTimeout(() => {
+                expect(mockActivePageService.computePageId).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateNotificationClickedTelemetry).toHaveBeenCalledWith(
+                    'local',
+                    'sample-page',
+                    undefined,
+                    [{ id: '', type: 'NotificationId' }]
+                );
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(7, PreferenceKey.CAMPAIGN_PARAMETERS);
+                expect(mockTranslate.use).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    'networkStatus',
+                    Environment.HOME,
+                    'splash',
+                    undefined,
+                    value
+                );
+                expect(mockEvents.subscribe).toHaveBeenCalled();
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(1, PreferenceKey.BATCH_DETAIL_KEY);
+                expect(appComponent.toggleRouterOutlet).toBeTruthy();
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    InteractSubtype.OPENRAP_DEVICE_DISCONNECTED,
+                    Environment.HOME,
+                    Environment.HOME, undefined,
+                    new Map()
+                );
+                expect(mockPreferences.putString).toHaveBeenCalledWith(
+                    PreferenceKey.IP_LOCATION,
+                    '[]'
+                );
+                done();
+            }, 0);
+        });
+
+        it('should return ipLocation', (done) => {
+            // arrange
+            const value = new Map();
+            mockSplaschreenDeeplinkActionHandlerDelegate.checkUtmContent = jest.fn();
+            mockActivePageService.computePageId = jest.fn(() => 'sample-page');
+            mockTelemetryGeneratorService.generateNotificationClickedTelemetry = jest.fn();
+            mockPreferences.getString = jest.fn(() => of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]'));
+            mockTranslate.use = jest.fn(() => of({}));
+            mockEvents.subscribe = jest.fn((_, fn) => fn({ skipRootNavigation: false }));
+            // mockPreferences.getString = jest.fn(() => of('sample-batch-details'));
+            mockAppGlobalService.limitedShareQuizContent = false;
+            mockZone.run = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            jest.spyOn(appComponent, 'reloadSigninEvents').mockImplementation(() => {
+                return;
+            });
+            mockAppGlobalService.OPEN_RAPDISCOVERY_ENABLED = true;
+            (window as any).openrap = {
+                startDiscovery: jest.fn((fn) => fn({}))
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(SunbirdSdk.instance, 'updateContentServiceConfig').mockImplementation();
+            jest.spyOn(SunbirdSdk.instance, 'updatePageServiceConfig').mockImplementation();
+            jest.spyOn(SunbirdSdk.instance, 'updateTelemetryConfig').mockImplementation();
+            mockTelemetryAutoSyncService.start = jest.fn(() => of(undefined));
+            mockTelemetryAutoSyncService.pause = jest.fn();
+            mockPlatform.pause = of(1, 2) as any;
+            mockPlatform.resume = of(1, 2) as any;
+            mockTelemetryAutoSyncService.continue = jest.fn();
+            mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
+            mockCommonUtilService.isIpLocationAvailable = jest.fn(() => Promise.resolve(false));
+            mockDeviceRegisterService.getDeviceProfile = jest.fn(() => of({
+                userDeclaredLocation: undefined,
+                ipLocation: {
+                    state: 'karnataka'
+                }
+            }));
+            mockPreferences.putString = jest.fn(() => of(undefined));
+            mockProfileService.getActiveSessionProfile = jest.fn(() => of({}));
+            // act
+            appComponent.ngOnInit();
+            // assert
+            setTimeout(() => {
+                expect(mockActivePageService.computePageId).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateNotificationClickedTelemetry).toHaveBeenCalledWith(
+                    'local',
+                    'sample-page',
+                    undefined,
+                    [{ id: '', type: 'NotificationId' }]
+                );
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(7, PreferenceKey.CAMPAIGN_PARAMETERS);
+                expect(mockTranslate.use).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    'networkStatus',
+                    Environment.HOME,
+                    'splash',
+                    undefined,
+                    value
+                );
+                expect(mockEvents.subscribe).toHaveBeenCalled();
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(1, PreferenceKey.BATCH_DETAIL_KEY);
+                expect(appComponent.toggleRouterOutlet).toBeTruthy();
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    InteractSubtype.OPENRAP_DEVICE_DISCONNECTED,
+                    Environment.HOME,
+                    Environment.HOME, undefined,
+                    new Map()
+                );
+                expect(mockPreferences.putString).toHaveBeenCalledWith(
+                    PreferenceKey.IP_LOCATION,
+                    '[]'
+                );
+                done();
+            }, 0);
+        });
+
+        it('should not return ipLocation if state is undefined', (done) => {
+            // arrange
+            const value = new Map();
+            mockSplaschreenDeeplinkActionHandlerDelegate.checkUtmContent = jest.fn();
+            mockActivePageService.computePageId = jest.fn(() => 'sample-page');
+            mockTelemetryGeneratorService.generateNotificationClickedTelemetry = jest.fn();
+            mockPreferences.getString = jest.fn(() => of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]'));
+            mockTranslate.use = jest.fn(() => of({}));
+            mockEvents.subscribe = jest.fn((_, fn) => fn({ skipRootNavigation: false }));
+            // mockPreferences.getString = jest.fn(() => of('sample-batch-details'));
+            mockAppGlobalService.limitedShareQuizContent = false;
+            mockZone.run = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            jest.spyOn(appComponent, 'reloadSigninEvents').mockImplementation(() => {
+                return;
+            });
+            mockAppGlobalService.OPEN_RAPDISCOVERY_ENABLED = true;
+            (window as any).openrap = {
+                startDiscovery: jest.fn((fn) => fn({}))
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(SunbirdSdk.instance, 'updateContentServiceConfig').mockImplementation();
+            jest.spyOn(SunbirdSdk.instance, 'updatePageServiceConfig').mockImplementation();
+            jest.spyOn(SunbirdSdk.instance, 'updateTelemetryConfig').mockImplementation();
+            mockTelemetryAutoSyncService.start = jest.fn(() => of(undefined));
+            mockTelemetryAutoSyncService.pause = jest.fn();
+            mockPlatform.pause = of(1, 2) as any;
+            mockPlatform.resume = of(1, 2) as any;
+            mockTelemetryAutoSyncService.continue = jest.fn();
+            mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
+            mockCommonUtilService.isIpLocationAvailable = jest.fn(() => Promise.resolve(false));
+            mockDeviceRegisterService.getDeviceProfile = jest.fn(() => of({
+                userDeclaredLocation: undefined,
+                ipLocation: {
+                    state: undefined
+                }
+            }));
+            mockPreferences.putString = jest.fn(() => of(undefined));
+            mockProfileService.getActiveSessionProfile = jest.fn(() => of({}));
+            // act
+            appComponent.ngOnInit();
+            // assert
+            setTimeout(() => {
+                expect(mockActivePageService.computePageId).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateNotificationClickedTelemetry).toHaveBeenCalledWith(
+                    'local',
+                    'sample-page',
+                    undefined,
+                    [{ id: '', type: 'NotificationId' }]
+                );
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(7, PreferenceKey.CAMPAIGN_PARAMETERS);
+                expect(mockTranslate.use).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    'networkStatus',
+                    Environment.HOME,
+                    'splash',
+                    undefined,
+                    value
+                );
+                expect(mockEvents.subscribe).toHaveBeenCalled();
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(1, PreferenceKey.BATCH_DETAIL_KEY);
+                expect(appComponent.toggleRouterOutlet).toBeTruthy();
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    InteractSubtype.OPENRAP_DEVICE_DISCONNECTED,
+                    Environment.HOME,
+                    Environment.HOME, undefined,
+                    new Map()
+                );
+                expect(mockPreferences.putString).toHaveBeenCalledWith(
+                    PreferenceKey.IP_LOCATION,
+                    '[]'
+                );
+                done();
+            }, 0);
+        });
+
+
+        it('should not return ipLocation if its undefined', (done) => {
+            // arrange
+            const value = new Map();
+            mockSplaschreenDeeplinkActionHandlerDelegate.checkUtmContent = jest.fn();
+            mockActivePageService.computePageId = jest.fn(() => 'sample-page');
+            mockTelemetryGeneratorService.generateNotificationClickedTelemetry = jest.fn();
+            mockPreferences.getString = jest.fn(() => of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]'));
+            mockTranslate.use = jest.fn(() => of({}));
+            mockEvents.subscribe = jest.fn((_, fn) => fn({ skipRootNavigation: false }));
+            // mockPreferences.getString = jest.fn(() => of('sample-batch-details'));
+            mockAppGlobalService.limitedShareQuizContent = false;
+            mockZone.run = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            jest.spyOn(appComponent, 'reloadSigninEvents').mockImplementation(() => {
+                return;
+            });
+            mockAppGlobalService.OPEN_RAPDISCOVERY_ENABLED = true;
+            (window as any).openrap = {
+                startDiscovery: jest.fn((fn) => fn({}))
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(SunbirdSdk.instance, 'updateContentServiceConfig').mockImplementation();
+            jest.spyOn(SunbirdSdk.instance, 'updatePageServiceConfig').mockImplementation();
+            jest.spyOn(SunbirdSdk.instance, 'updateTelemetryConfig').mockImplementation();
+            mockTelemetryAutoSyncService.start = jest.fn(() => of(undefined));
+            mockTelemetryAutoSyncService.pause = jest.fn();
+            mockPlatform.pause = of(1, 2) as any;
+            mockPlatform.resume = of(1, 2) as any;
+            mockTelemetryAutoSyncService.continue = jest.fn();
+            mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
+            mockCommonUtilService.isIpLocationAvailable = jest.fn(() => Promise.resolve(false));
+            mockDeviceRegisterService.getDeviceProfile = jest.fn(() => of({
+                userDeclaredLocation: undefined,
+                ipLocation: undefined
+            }));
+            mockPreferences.putString = jest.fn(() => of(undefined));
+            mockProfileService.getActiveSessionProfile = jest.fn(() => of({}));
+            // act
+            appComponent.ngOnInit();
+            // assert
+            setTimeout(() => {
+                expect(mockActivePageService.computePageId).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateNotificationClickedTelemetry).toHaveBeenCalledWith(
+                    'local',
+                    'sample-page',
+                    undefined,
+                    [{ id: '', type: 'NotificationId' }]
+                );
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(7, PreferenceKey.CAMPAIGN_PARAMETERS);
+                expect(mockTranslate.use).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    'networkStatus',
+                    Environment.HOME,
+                    'splash',
+                    undefined,
+                    value
+                );
+                expect(mockEvents.subscribe).toHaveBeenCalled();
+                expect(mockPreferences.getString).toHaveBeenNthCalledWith(1, PreferenceKey.BATCH_DETAIL_KEY);
+                expect(appComponent.toggleRouterOutlet).toBeTruthy();
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    InteractSubtype.OPENRAP_DEVICE_DISCONNECTED,
+                    Environment.HOME,
+                    Environment.HOME, undefined,
+                    new Map()
+                );
+                expect(mockPreferences.putString).toHaveBeenCalledWith(
+                    'sunbirdcontent_context',
+                    ''
+                );
+                done();
+            }, 0);
+        });
+    });
+
+    it('should navigate to downloads if user clicked on it', () => {
+        // arrange
+        appComponent.isPlannedMaintenanceStarted = false;
+        mockRouter.navigate = jest.fn();
+        // act
+        appComponent.navigateToDownloads();
+        // assert
+        expect(appComponent.isPlannedMaintenanceStarted).toBeFalsy();
+        expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.DOWNLOAD_TAB]);
+    });
+
+    it('should set plannedMaintenanceBanner to false when user clicks on close icon', () => {
+        // arrange
+        appComponent.isPlannedMaintenanceStarted = false;
+        // act
+        appComponent.closePlannedMaintenanceBanner();
+        // assert
+        expect(appComponent.isPlannedMaintenanceStarted).toBeFalsy();
+    });
+
+    describe('checkTheme', () => {
+        beforeEach(() => {
+            // arrange
+            mockPlatform.ready = jest.fn(() => {
+                return new Promise((resolve) => {
+                    resolve('ready');
+                });
+            });
+            mockHeaderService.headerConfigEmitted$ = EMPTY;
+            mockCommonUtilService.networkAvailability$ = EMPTY;
+            mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(true));
+            mockEventsBusService.events = jest.fn(() => EMPTY);
+            mockNotificationSrc.setupLocalNotification = jest.fn();
+            mockSystemSettingsService.getSystemSettings = jest.fn(() => EMPTY);
+            mockUtilityService.getBuildConfigValue = jest.fn(() => Promise.resolve('some_app_name'));
+            mockTelemetryAutoSyncService.start = jest.fn(() => EMPTY);
+            mockEvents.subscribe = jest.fn();
+            mockPreferences.getString = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.SELECTED_LANGUAGE_CODE:
+                        return of('');
+                    case PreferenceKey.FCM_TOKEN:
+                        return of('some_token');
+                    case PreferenceKey.DEPLOYMENT_KEY:
+                        return of('');
+                    case PreferenceKey.SYNC_CONFIG:
+                        return of('some_config');
+                    case PreferenceKey.CAMPAIGN_PARAMETERS:
+                        return of('[{"utmSource": "playstore"}, {"utmMedium": "sample"}]');
+                    case PreferenceKey.CURRENT_SELECTED_THEME:
+                        return of('JOYFUL');
+                    case PreferenceKey.SELECTED_USER_TYPE:
+                        return of(ProfileType.ADMIN);
+                }
+            });
+            mockPreferences.putString = jest.fn(() => EMPTY);
+            mockFormAndFrameworkUtilService.checkNewAppVersion = jest.fn(() => Promise.resolve(''));
+            jest.spyOn(appComponent, 'checkAndroidWebViewVersion').mockImplementation();
+            mockUtilityService.getDeviceSpec = jest.fn(() => Promise.resolve(mockDeviceSpec));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        });
+        afterEach(() => {
+            jest.resetAllMocks();
+        });
+
+        it('should check for theme at start of application', () => {
+            expect(appComponent).toBeTruthy();
+        });
+    });
 });
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index e9d0774a5..71c912b7b 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,47 +1,53 @@
-import { Router, NavigationExtras, NavigationStart, Event } from '@angular/router';
 import { Location } from '@angular/common';
-import { AfterViewInit, Component, Inject, NgZone, OnInit, EventEmitter, ViewChild } from '@angular/core';
-import { Events, Platform, IonRouterOutlet, MenuController } from '@ionic/angular';
+import {
+  AfterViewInit, Component,
+  EventEmitter, Inject, NgZone,
+  OnInit, ViewChild
+} from '@angular/core';
+import { Event, NavigationExtras, NavigationStart, Router } from '@angular/router';
+import { ActivePageService } from '@app/services/active-page/active-page-service';
+import { LogoutHandlerService } from '@app/services/handlers/logout-handler.service';
+import { TncUpdateHandlerService } from '@app/services/handlers/tnc-update-handler.service';
+import { NetworkAvailabilityToastService } from '@app/services/network-availability-toast/network-availability-toast.service';
+import { NotificationService as LocalNotification } from '@app/services/notification.service';
+import { SplaschreenDeeplinkActionHandlerDelegate } from '@app/services/sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate';
+import {
+  CorReleationDataType, Environment,
+  ID, ImpressionType, InteractSubtype, InteractType,
+  PageId
+} from '@app/services/telemetry-constants';
+import { Network } from '@ionic-native/network/ngx';
 import { StatusBar } from '@ionic-native/status-bar/ngx';
+import { IonRouterOutlet, MenuController, Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, combineLatest } from 'rxjs';
-import { mergeMap, filter, tap, mapTo } from 'rxjs/operators';
-import { Network } from '@ionic-native/network/ngx';
+import { CsClientStorage } from '@project-sunbird/client-services/core';
+import { combineLatest, Observable, Subscription } from 'rxjs';
+import { filter, mapTo, mergeMap, take, tap } from 'rxjs/operators';
 import {
-  ErrorEventType, EventNamespace, EventsBusService, SharedPreferences,
-  SunbirdSdk, TelemetryAutoSyncService, TelemetryService, NotificationService,
-  GetSystemSettingsRequest, SystemSettings, SystemSettingsService,
-  CodePushExperimentService, AuthEventType, CorrelationData, Profile, DeviceRegisterService, ProfileService,
+  AuthEventType, CodePushExperimentService, CorrelationData,
+  DeviceRegisterService, ErrorEventType, EventNamespace, EventsBusService,
+  GetSystemSettingsRequest, NotificationService,
+  Profile, ProfileService, ProfileType, SharedPreferences,
+  SunbirdSdk,
+  SystemSettings, SystemSettingsService, TelemetryAutoSyncService, TelemetryService
 } from 'sunbird-sdk';
-import {
-  InteractType,
-  InteractSubtype,
-  Environment, PageId,
-  ImpressionType,
-  CorReleationDataType,
-  ID
-} from '@app/services/telemetry-constants';
-import { PreferenceKey, EventTopics, SystemSettingsIds, GenericAppConfig, ProfileConstants } from './app.constant';
-import { ActivePageService } from '@app/services/active-page/active-page-service';
 import {
   AppGlobalService,
-  CommonUtilService,
-  TelemetryGeneratorService,
-  UtilityService,
-  AppRatingService,
-  AppHeaderService,
+  AppHeaderService, AppRatingService, CommonUtilService,
   FormAndFrameworkUtilService,
-  SplashScreenService,
-  LocalCourseService
+  LocalCourseService,
+  LoginHandlerService, SplashScreenService, TelemetryGeneratorService,
+  UtilityService
 } from '../services';
-import { LogoutHandlerService } from '@app/services/handlers/logout-handler.service';
-import { NotificationService as LocalNotification } from '@app/services/notification.service';
-import { RouterLinks } from './app.constant';
-import { TncUpdateHandlerService } from '@app/services/handlers/tnc-update-handler.service';
-import { NetworkAvailabilityToastService } from '@app/services/network-availability-toast/network-availability-toast.service';
-import { SplaschreenDeeplinkActionHandlerDelegate } from '@app/services/sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate';
-import * as qs from 'qs';
-import { ContentUtil } from '@app/util/content-util';
+import {
+  AppThemes, EventTopics, GenericAppConfig,
+  PreferenceKey, ProfileConstants, RouterLinks, SystemSettingsIds
+} from './app.constant';
+import { EventParams } from './components/sign-in-card/event-params.interface';
+import { ApiUtilsService, DbService, LoaderService, LocalStorageService, NetworkService } from './manage-learn/core';
+import { SBTagModule } from 'sb-tag-manager';
+import { SegmentationTagService, TagPrefixConstants } from '@app/services/segmentation-tag/segmentation-tag.service';
 
 declare const cordova;
 
@@ -67,8 +73,15 @@ export class AppComponent implements OnInit, AfterViewInit {
   selectedLanguage: string;
   appName: string;
   appVersion: string;
-  @ViewChild('mainContent', { read: IonRouterOutlet }) routerOutlet: IonRouterOutlet;
+  @ViewChild('mainContent', { read: IonRouterOutlet, static: false }) routerOutlet: IonRouterOutlet;
   isForeground: boolean;
+  isPlannedMaintenanceStarted = false;
+  isUnplannedMaintenanceStarted = false;
+  timeLeft: string;
+  eventSubscription: Subscription;
+  isTimeAvailable = false;
+  isOnBoardingCompleted: boolean;
+  // tagManagerInstance:any;
 
   constructor(
     @Inject('TELEMETRY_SERVICE') private telemetryService: TelemetryService,
@@ -102,13 +115,25 @@ export class AppComponent implements OnInit, AfterViewInit {
     private networkAvailability: NetworkAvailabilityToastService,
     private splashScreenService: SplashScreenService,
     private localCourseService: LocalCourseService,
-    private splaschreenDeeplinkActionHandlerDelegate: SplaschreenDeeplinkActionHandlerDelegate
+    private splaschreenDeeplinkActionHandlerDelegate: SplaschreenDeeplinkActionHandlerDelegate,
+    private utils: ApiUtilsService,
+    private networkServ: NetworkService,
+    private localStorage: LocalStorageService,
+    private db: DbService,
+    private loginHandlerService: LoginHandlerService,
+    private segmentationTagService: SegmentationTagService,
+    private mlloader:LoaderService
   ) {
     this.telemetryAutoSync = this.telemetryService.autoSync;
   }
 
   ngOnInit() {
     this.platform.ready().then(async () => {
+      this.isForeground = true;
+      window['segmentation'] = SBTagModule.instance;
+      if (!window['segmentation'].isInitialised) {
+        window['segmentation'].init();
+      }
       this.formAndFrameworkUtilService.init();
       this.networkAvailability.init();
       this.fcmTokenWatcher(); // Notification related
@@ -121,6 +146,12 @@ export class AppComponent implements OnInit, AfterViewInit {
       this.receiveNotification();
       this.utilityService.getDeviceSpec()
         .then((deviceSpec) => {
+          let devSpec = {
+            id: deviceSpec.id,
+            os: deviceSpec.os,
+            make: deviceSpec.make
+          };
+          window['segmentation'].SBTagService.pushTag(devSpec, TagPrefixConstants.DEVICE_CONFIG, true);
           this.telemetryGeneratorService.genererateAppStartTelemetry(deviceSpec);
         });
       this.generateNetworkTelemetry();
@@ -130,6 +161,7 @@ export class AppComponent implements OnInit, AfterViewInit {
       this.saveDefaultSyncSetting();
       this.checkAppUpdateAvailable();
       this.makeEntryInSupportFolder();
+      await this.commonUtilService.populateGlobalCData();
       await this.getSelectedLanguage();
       await this.getDeviceProfile();
       if (this.appGlobalService.getUserId()) {
@@ -144,9 +176,16 @@ export class AppComponent implements OnInit, AfterViewInit {
       this.statusBar.styleBlackTranslucent();
       this.handleBackButton();
       this.appRatingService.checkInitialDate();
-      this.getUtmParameter();
+      this.getCampaignParameter();
       this.checkForCodeUpdates();
       this.checkAndroidWebViewVersion();
+      await this.checkForTheme();
+      this.onTraceIdUpdate();
+      this.utils.initilizeML();
+      this.networkServ.netWorkCheck();
+      await this.applyJoyfulTheme();
+      // this.tagManagerInstance = SBTagModule.instance;
+      // this.tagManagerInstance.init();
     });
 
     this.headerService.headerConfigEmitted$.subscribe(config => {
@@ -160,14 +199,22 @@ export class AppComponent implements OnInit, AfterViewInit {
       } else {
         this.addNetworkTelemetry(InteractSubtype.INTERNET_DISCONNECTED, pageId);
       }
+    })
+    cordova.plugins.notification.local.on("click", (notification) => {
+      var objects = notification.data;
+      // My data is now available in objects.heading, objects.subheading and so on.
+      this.segmentationTagService.localNotificationId = notification.id;
+      this.segmentationTagService.handleLocalNotificationTap();
     });
 
     if (cordova.plugins.notification && cordova.plugins.notification.local &&
       cordova.plugins.notification.local.launchDetails && cordova.plugins.notification.local.launchDetails.action === 'click') {
       const corRelationList: Array<CorrelationData> = [];
-      corRelationList.push({ id: cordova.plugins.notification.local.launchDetails.id, type: CorReleationDataType.NOTIFICATION_ID });
+      this.segmentationTagService.localNotificationId = cordova.plugins.notification.local.launchDetails.id;
+
+      corRelationList.push({ id: this.segmentationTagService.localNotificationId ? this.segmentationTagService.localNotificationId + '' : '', type: CorReleationDataType.NOTIFICATION_ID });
       this.telemetryGeneratorService.generateNotificationClickedTelemetry(
-        InteractType.LOCAL,
+        InteractType.LOCAL,   
         this.activePageService.computePageId(this.router.url),
         undefined,
         corRelationList
@@ -176,6 +223,7 @@ export class AppComponent implements OnInit, AfterViewInit {
     this.notificationSrc.setupLocalNotification();
 
     this.triggerSignInEvent();
+    this.segmentationTagService.getPersistedSegmentaion();
   }
 
   // TODO: make this as private
@@ -197,13 +245,17 @@ export class AppComponent implements OnInit, AfterViewInit {
           }
         });
       })
-      .catch(function (error) { });
+      .catch(function (error) { 
+        console.error(error);
+      });
   }
 
   openPlaystore() {
     plugins['webViewChecker'].openGooglePlayPage()
       .then(function () { })
-      .catch(function (error) { });
+      .catch(function (error) { 
+        console.error(error);
+      });
 
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
@@ -218,11 +270,10 @@ export class AppComponent implements OnInit, AfterViewInit {
     };
     this.systemSettingsService.getSystemSettings(getSystemSettingsRequest).toPromise()
       .then((res: SystemSettings) => {
-        //   res['deploymentKey'] = '6Xhfs4-WVV8dhYN9U5OkZw6PukglrykIsJ8-B';
         if (res && res.value) {
           const value = JSON.parse(res.value);
           if (value.deploymentKey) {
-            this.codePushExperimentService.setDefaultDeploymentKey(res.value).subscribe();
+            this.preferences.putString(PreferenceKey.DEPLOYMENT_KEY, value.deploymentKey).subscribe();
           }
         }
       }).catch(err => {
@@ -273,6 +324,9 @@ export class AppComponent implements OnInit, AfterViewInit {
   }
 
   private checkForExperiment() {
+    if (codePush === null) {
+      return;
+    }
     /**
      * TODO
      * call the update
@@ -327,36 +381,54 @@ export class AppComponent implements OnInit, AfterViewInit {
   /* Notification data will be received in data variable
    * can take action on data variable
    */
-  private receiveNotification() {
-    FCMPlugin.onNotification((data) => {
-      if (data.wasTapped) {
-        // Notification was received on device tray and tapped by the user.
-      } else {
-        // Notification was received in foreground. Maybe the user needs to be notified.
-      }
-
-      const value = {
-        notification_id: data.id
-      };
-      let corRelationList: Array<CorrelationData> = [];
-      corRelationList.push({ id: data.id, type: CorReleationDataType.NOTIFICATION_ID });
-      this.telemetryGeneratorService.generateNotificationClickedTelemetry(
+  private async receiveNotification() {
+    const val = await this.preferences.getString(PreferenceKey.NOTIFICAITON_RECEIVED_AT).toPromise();
+    if (val) {
+      const corRelationList: Array<CorrelationData> = [];
+      corRelationList.push({ id: val, type: CorReleationDataType.NOTIFICATION_RECEIVED_AT });
+      this.telemetryGeneratorService.generateInteractTelemetry(
         InteractType.FCM,
+        '',
+        Environment.HOME,
         this.activePageService.computePageId(this.router.url),
-        value,
-        corRelationList
+        undefined,
+        undefined,
+        undefined,
+        corRelationList,
+        ID.NOTIFICATION_RECEIVED
       );
-
+      await this.preferences.putString(PreferenceKey.NOTIFICAITON_RECEIVED_AT, '').toPromise();
+    }
+    FCMPlugin.onNotification((data) => {
       data['isRead'] = data.wasTapped ? 1 : 0;
       data['actionData'] = JSON.parse(data['actionData']);
       this.notificationServices.addNotification(data).subscribe((status) => {
         this.events.publish('notification:received');
         this.events.publish('notification-status:update', { isUnreadNotifications: true });
       });
-      this.notificationSrc.setNotificationDetails(data);
-      if (this.isForeground) {
-        this.notificationSrc.handleNotification();
+      if (data.wasTapped) {
+        // Notification was received on device tray and tapped by the user.
+        const value = {
+          notification_id: data.id
+        };
+        const corRelationList: Array<CorrelationData> = [];
+        const fcmId = data.id;
+        corRelationList.push({ id: fcmId ? fcmId + '' : '', type: CorReleationDataType.NOTIFICATION_ID });
+        this.telemetryGeneratorService.generateNotificationClickedTelemetry(
+          InteractType.FCM,
+          this.activePageService.computePageId(this.router.url),
+          value,
+          corRelationList
+        );
+        this.notificationSrc.notificationId = data.id || '';
+        this.notificationSrc.setNotificationParams(data);
+        if (this.isForeground) {
+          this.notificationSrc.handleNotification();
+        }
+      } else {
+        // Notification was received in foreground. Maybe the user needs to be notified.
       }
+
     },
       (success) => {
         console.log('Notification Sucess Callback', success);
@@ -370,27 +442,39 @@ export class AppComponent implements OnInit, AfterViewInit {
    * Initializing the event for reloading the Tabs on Signing-In.
    */
   private triggerSignInEvent() {
-    this.events.subscribe(EventTopics.SIGN_IN_RELOAD, async () => {
+    this.events.subscribe(EventTopics.SIGN_IN_RELOAD, async (skipNavigation) => {
       const batchDetails = await this.preferences.getString(PreferenceKey.BATCH_DETAIL_KEY).toPromise();
       const limitedSharingContentDetails = this.appGlobalService.limitedShareQuizContent;
 
       if (!batchDetails && !limitedSharingContentDetails) {
+        if (this.routerOutlet) {
+          this.routerOutlet.deactivate();
+        }
         this.toggleRouterOutlet = false;
       }
 
-      // this.toggleRouterOutlet = false;
       // This setTimeout is very important for reloading the Tabs page on SignIn.
       setTimeout(async () => {
-        this.events.publish(AppGlobalService.USER_INFO_UPDATED);
+        /* Medatory for login flow
+         * eventParams are essential parameters for avoiding duplicate calls to API
+         * skipSession & skipProfile should be true here
+         * until further change
+         */
+        const eventParams: EventParams = {
+          skipSession: true,
+          skipProfile: true
+        };
+        this.events.publish(AppGlobalService.USER_INFO_UPDATED, eventParams);
         this.toggleRouterOutlet = true;
         this.reloadSigninEvents();
-        this.events.publish('UPDATE_TABS');
+        this.db.createDb()
+        this.events.publish('UPDATE_TABS', skipNavigation);
         if (batchDetails) {
           await this.localCourseService.checkCourseRedirect();
-        } else {
+        } else if (!skipNavigation || !skipNavigation.skipRootNavigation) {
           this.router.navigate([RouterLinks.TABS]);
         }
-      }, 0);
+      }, 100);
     });
   }
 
@@ -403,6 +487,14 @@ export class AppComponent implements OnInit, AfterViewInit {
 
   reloadGuestEvents() {
     this.checkDeviceLocation();
+    this.checkGuestUserType();
+  }
+
+  private async checkGuestUserType() {
+    const isAdminUser = (await this.preferences.getString(PreferenceKey.SELECTED_USER_TYPE).toPromise() === ProfileType.ADMIN);
+    if (isAdminUser && this.appGlobalService.isGuestUser) {
+      this.loginHandlerService.signIn();
+    }
   }
 
   addNetworkTelemetry(subtype: string, pageId: string) {
@@ -415,39 +507,47 @@ export class AppComponent implements OnInit, AfterViewInit {
 
   ngAfterViewInit(): void {
     this.platform.resume.subscribe(() => {
-      this.telemetryGeneratorService.generateInterruptTelemetry('resume', '');
+      if (!this.appGlobalService.isNativePopupVisible) {
+        this.telemetryGeneratorService.generateInterruptTelemetry('resume', '');
+      }
       this.splashScreenService.handleSunbirdSplashScreenActions();
       this.checkForCodeUpdates();
       this.notificationSrc.handleNotification();
       this.isForeground = true;
+      this.segmentationTagService.getPersistedSegmentaion();
     });
 
     this.platform.pause.subscribe(() => {
-      this.telemetryGeneratorService.generateInterruptTelemetry('background', '');
+      if (!this.appGlobalService.isNativePopupVisible) {
+        this.telemetryGeneratorService.generateInterruptTelemetry('background', '');
+      }
       this.isForeground = false;
+      this.segmentationTagService.persistSegmentation();
     });
   }
 
   private handleBackButton() {
     this.router.events.subscribe((event: Event) => {
       if (event instanceof NavigationStart) {
-        // Show loading indicator
         this.rootPageDisplayed = event.url.indexOf('tabs') !== -1;
       }
     });
     this.platform.backButton.subscribeWithPriority(0, async () => {
       if (this.router.url === RouterLinks.LIBRARY_TAB || this.router.url === RouterLinks.COURSE_TAB
+        || this.router.url === RouterLinks.HOME_TAB || (this.router.url === RouterLinks.SEARCH && !this.appGlobalService.isDiscoverBackEnabled)
         || this.router.url === RouterLinks.DOWNLOAD_TAB || this.router.url === RouterLinks.PROFILE_TAB ||
         this.router.url === RouterLinks.GUEST_PROFILE_TAB || this.router.url === RouterLinks.ONBOARDING_DISTRICT_MAPPING
-      ) {
+        || this.router.url.startsWith(RouterLinks.HOME_TAB)) {
         if (await this.menuCtrl.isOpen()) {
           this.menuCtrl.close();
         } else {
           this.commonUtilService.showExitPopUp(this.activePageService.computePageId(this.router.url), Environment.HOME, false);
         }
+      } else if ((this.router.url === RouterLinks.SEARCH) && this.appGlobalService.isDiscoverBackEnabled) {
+        this.headerService.sidebarEvent('back');
       } else {
-        // this.routerOutlet.pop();
         if (this.location.back && !this.rootPageDisplayed) {
+          this.mlloader.stopLoader()
           this.location.back();
         }
       }
@@ -462,18 +562,6 @@ export class AppComponent implements OnInit, AfterViewInit {
   }
 
   private subscribeEvents() {
-    this.events.subscribe(EventTopics.COACH_MARK_SEEN, (data) => {
-      this.showWalkthroughBackDrop = data.showWalkthroughBackDrop;
-      setTimeout(() => {
-        const backdropClipCenter = document.getElementById('qrScannerIcon').getBoundingClientRect().left +
-          ((document.getElementById('qrScannerIcon').getBoundingClientRect().width) / 2);
-        (document.getElementById('backdrop').getElementsByClassName('bg')[0] as HTMLDivElement).setAttribute(
-          'style',
-          `background-image: radial-gradient(circle at ${backdropClipCenter}px 56px, rgba(0, 0, 0, 0) 30px, rgba(0, 0, 0, 0.9) 30px);`
-        );
-      }, 2000);
-      this.appName = data.appName;
-    });
     this.events.subscribe(EventTopics.TAB_CHANGE, (pageId) => {
       this.zone.run(() => {
         this.generateInteractEvent(pageId);
@@ -491,6 +579,59 @@ export class AppComponent implements OnInit, AfterViewInit {
         document.documentElement.dir = 'ltr';
       }
     });
+    // planned maintenance
+    this.eventSubscription = this.eventsBusService.events(EventNamespace.ERROR).pipe(
+      filter((event) => event.type === ErrorEventType.PLANNED_MAINTENANCE_PERIOD),
+      take(1)
+    ).subscribe(() => {
+      this.isPlannedMaintenanceStarted = true;
+      this.isOnBoardingCompleted = this.appGlobalService.isOnBoardingCompleted;
+      if (this.isPlannedMaintenanceStarted) {
+        this.telemetryGeneratorService.generateImpressionTelemetry(
+          ImpressionType.VIEW,
+          '',
+          PageId.PLANNED_MAINTENANCE_BANNER,
+          this.isOnBoardingCompleted ? Environment.HOME : Environment.ONBOARDING
+        );
+        let intervalRef;
+        const backButtonSubscription = this.platform.backButton.subscribeWithPriority(13, () => {
+          backButtonSubscription.unsubscribe();
+          this.isPlannedMaintenanceStarted = false;
+          if (intervalRef) {
+            clearInterval(intervalRef);
+            intervalRef = undefined;
+          }
+        });
+        // for timer optional
+        // const second = 1000,
+        //     minute = second * 60,
+        //     hour = minute * 60,
+        //     day = hour * 24;
+        //
+        // const countDown = new Date('Aug 14, 2020 00:00:00').getTime();
+        // intervalRef = setInterval(() => {
+        //   this.isTimeAvailable = true;
+        //   const now = new Date().getTime(),
+        //           distance = countDown - now;
+        //
+        //       document.getElementById('timer').innerText = `${Math.floor((distance % (day)) / (hour))} : ${Math.floor((distance % (hour)) / (minute))} : ${Math.floor((distance % (minute)) / second)}`;
+        //
+        //     }, second);
+      }
+    });
+    // unplanned maintenance
+    // this.events.subscribe('EventTopics:maintenance:unplanned', (data) => {
+    //   this.isUnplannedMaintenanceStarted = data.isUnplannedMaintenanceStarted;
+    //   if (this.isUnplannedMaintenanceStarted) {
+    //     this.timeLeft = '3';
+    //     window.document.body.classList.add('show-maintenance');
+    //   }
+    // });
+  }
+
+  closeUnPlannedMaintenanceBanner() {
+    window.document.body.classList.remove('show-maintenance');
+    this.isUnplannedMaintenanceStarted = false;
   }
 
   private generateInteractEvent(pageId: string) {
@@ -505,13 +646,13 @@ export class AppComponent implements OnInit, AfterViewInit {
     pageId = pageId.toLowerCase();
     const env = pageId.localeCompare(PageId.PROFILE) ? Environment.HOME : Environment.USER;
     const corRelationList: Array<CorrelationData> = [];
-    if (pageId === 'resources') {
+    if (pageId === PageId.LIBRARY) {
       const currentProfile: Profile = this.appGlobalService.getCurrentUser();
       corRelationList.push({ id: currentProfile.board ? currentProfile.board.join(',') : '', type: CorReleationDataType.BOARD });
       corRelationList.push({ id: currentProfile.medium ? currentProfile.medium.join(',') : '', type: CorReleationDataType.MEDIUM });
       corRelationList.push({ id: currentProfile.grade ? currentProfile.grade.join(',') : '', type: CorReleationDataType.CLASS });
       corRelationList.push({ id: currentProfile.profileType, type: CorReleationDataType.USERTYPE });
-    } else if (pageId === 'courses') {
+    } else if (pageId === PageId.COURSES) {
       const channelId = await this.preferences.getString(PreferenceKey.PAGE_ASSEMBLE_ORGANISATION_ID).toPromise();
       if (channelId) {
         corRelationList.push({ id: channelId, type: CorReleationDataType.SOURCE });
@@ -547,8 +688,9 @@ export class AppComponent implements OnInit, AfterViewInit {
 
   private async getSelectedLanguage() {
     const selectedLanguage = await this.preferences.getString(PreferenceKey.SELECTED_LANGUAGE_CODE).toPromise();
+    window['segmentation'].SBTagService.pushTag([selectedLanguage], TagPrefixConstants.USER_LANG, true);
     if (selectedLanguage) {
-      await this.translate.use(selectedLanguage).toPromise();
+      await this.translate.use(selectedLanguage);
     }
   }
 
@@ -647,6 +789,8 @@ export class AppComponent implements OnInit, AfterViewInit {
       const routeUrl = this.router.url;
 
       if ((routeUrl.indexOf(RouterLinks.USER_TYPE_SELECTION) !== -1)
+        || (routeUrl.indexOf(RouterLinks.CHAPTER_DETAILS) !== -1)
+        || (routeUrl.indexOf(RouterLinks.CURRICULUM_COURSES) !== -1)
         || (routeUrl.indexOf(RouterLinks.ACTIVE_DOWNLOADS) !== -1)
         || (routeUrl.indexOf(RouterLinks.COLLECTION_DETAIL_ETB) !== -1)
         || (routeUrl.indexOf(RouterLinks.COLLECTION_DETAILS) !== -1)
@@ -659,17 +803,20 @@ export class AppComponent implements OnInit, AfterViewInit {
         || (routeUrl.indexOf(RouterLinks.EXPLORE_BOOK) !== -1)
         || (routeUrl.indexOf(RouterLinks.PERMISSION) !== -1)
         || (routeUrl.indexOf(RouterLinks.LANGUAGE_SETTING) !== -1)
-        || (routeUrl.indexOf(RouterLinks.SHARE_USER_AND_GROUPS) !== -1)
+        || (routeUrl.indexOf(RouterLinks.MY_GROUPS) !== -1)
+        || (routeUrl.indexOf(`${RouterLinks.PROJECT}/${RouterLinks.DETAILS}`) !== -1)
       ) {
         this.headerService.sidebarEvent($event);
         return;
       } else {
         if (this.router.url === RouterLinks.LIBRARY_TAB || this.router.url === RouterLinks.COURSE_TAB
+          || this.router.url === RouterLinks.HOME_TAB || (this.router.url === RouterLinks.SEARCH_TAB && !this.appGlobalService.isDiscoverBackEnabled)
           || this.router.url === RouterLinks.DOWNLOAD_TAB || this.router.url === RouterLinks.PROFILE_TAB ||
-          this.router.url === RouterLinks.GUEST_PROFILE_TAB) {
+          this.router.url === RouterLinks.GUEST_PROFILE_TAB || this.router.url.startsWith(RouterLinks.HOME_TAB)) {
           this.commonUtilService.showExitPopUp(this.activePageService.computePageId(this.router.url), Environment.HOME, false).then();
+        } else if (this.router.url === RouterLinks.SEARCH_TAB && this.appGlobalService.isDiscoverBackEnabled) {
+          this.headerService.sidebarEvent($event);
         } else {
-          // this.routerOutlet.pop();
           if (this.location.back) {
             this.location.back();
           }
@@ -682,25 +829,15 @@ export class AppComponent implements OnInit, AfterViewInit {
 
   menuItemAction(menuName) {
     switch (menuName.menuItem) {
-      case 'USERS_AND_GROUPS':
+      case 'MY_GROUPS':
         this.telemetryGeneratorService.generateInteractTelemetry(
           InteractType.TOUCH,
-          InteractSubtype.USER_GROUP_CLICKED,
+          InteractSubtype.MY_GROUPS_CLICKED,
           Environment.USER,
           PageId.PROFILE
         );
         const navigationExtrasUG: NavigationExtras = { state: { profile: this.profile } };
-        this.router.navigate([`/${RouterLinks.USER_AND_GROUPS}`], navigationExtrasUG);
-        break;
-
-      case 'REPORTS':
-        this.telemetryGeneratorService.generateInteractTelemetry(
-          InteractType.TOUCH,
-          InteractSubtype.REPORTS_CLICKED,
-          Environment.USER,
-          PageId.PROFILE);
-        const navigationExtrasReports: NavigationExtras = { state: { profile: this.profile } };
-        this.router.navigate([`/${RouterLinks.REPORTS}`], navigationExtrasReports);
+        this.router.navigate([`/${RouterLinks.MY_GROUPS}`], navigationExtrasUG);
         break;
 
       case 'SETTINGS': {
@@ -736,9 +873,23 @@ export class AppComponent implements OnInit, AfterViewInit {
           this.commonUtilService.showToast('NEED_INTERNET_TO_CHANGE');
         } else {
           this.logoutHandlerService.onLogout();
+          this.localStorage.deleteAllStorage();
         }
         break;
 
+      case 'UPDATE':
+        cordova.plugins.InAppUpdateManager.checkForImmediateUpdate(
+          () => { },
+          () => { }
+        );
+        break;
+
+      case 'IMPORT':
+        this.utilityService.openFileManager().then((success) => {
+          console.log('-----openFileManager-----', success);
+        }).catch((err) => {
+          console.log('---------error------', err);
+        });
     }
   }
 
@@ -767,32 +918,28 @@ export class AppComponent implements OnInit, AfterViewInit {
     });
   }
 
-  private getUtmParameter() {
-    this.utilityService.getUtmInfo()
-      .then(response => {
-        if (response) {
-          let cData: CorrelationData[] = [];
-          const utmValue = response['val'];
-          const params: {[param: string]: string} = qs.parse(utmValue);
-          cData = ContentUtil.genrateUTMCData(params);
-          if (response.val && response.val.length) {
-            this.splaschreenDeeplinkActionHandlerDelegate.checkUtmContent(response.val);
-          }
-          const utmTelemetry = {
-            utm_data: utmValue
-          };
-          this.telemetryGeneratorService.generateInteractTelemetry(
-            InteractType.OTHER,
-            InteractSubtype.UTM_INFO,
-            Environment.HOME,
-            PageId.HOME,
-            undefined,
-            utmTelemetry,
-            undefined,
-            cData);
-          this.utilityService.clearUtmInfo();
+  private getCampaignParameter() {
+    this.preferences.getString(PreferenceKey.CAMPAIGN_PARAMETERS).toPromise().then((data) => {
+      if (data) {
+        const response = JSON.parse(data);
+        const utmValue = response['val'];
+        if (response.val && response.val.length) {
+          this.splaschreenDeeplinkActionHandlerDelegate.checkUtmContent(response.val);
+        }
+        const utmTelemetry = {
+          utm_data: utmValue
+        };
+        this.telemetryGeneratorService.generateInteractTelemetry(
+          InteractType.OTHER,
+          InteractSubtype.UTM_INFO,
+          Environment.HOME,
+          PageId.HOME,
+          undefined,
+          utmTelemetry,
+          undefined);
+        this.utilityService.clearUtmInfo();
       }
-      })
+    })
       .catch(error => {
         console.log('Error is', error);
       });
@@ -838,4 +985,37 @@ export class AppComponent implements OnInit, AfterViewInit {
     }
   }
 
+  navigateToDownloads() {
+    this.isPlannedMaintenanceStarted = false;
+    this.router.navigate([RouterLinks.DOWNLOAD_TAB]);
+  }
+
+
+  closePlannedMaintenanceBanner() {
+    this.isPlannedMaintenanceStarted = false;
+  }
+
+  private async checkForTheme() {
+    const selectedTheme = await this.preferences.getString(PreferenceKey.CURRENT_SELECTED_THEME).toPromise();
+    if (selectedTheme === AppThemes.JOYFUL) {
+      await this.headerService.showStatusBar();
+    } else {
+      this.headerService.hideStatusBar();
+    }
+  }
+
+  private onTraceIdUpdate() {
+    this.preferences.addListener(CsClientStorage.TRACE_ID, (value) => {
+      if (value) {
+        // show toast
+      } else {
+        // do not show the toast.
+      }
+    });
+  }
+
+  async applyJoyfulTheme() {
+      await this.preferences.putString('current_selected_theme', AppThemes.JOYFUL).toPromise();
+      this.headerService.showStatusBar();
+  }
 }
diff --git a/src/app/app.constant.ts b/src/app/app.constant.ts
index acd6a3285..d03d044f0 100644
--- a/src/app/app.constant.ts
+++ b/src/app/app.constant.ts
@@ -1,55 +1,34 @@
-export class ContentType {
-    public static readonly STORY = 'Story';
-    public static readonly WORKSHEET = 'Worksheet';
-    public static readonly GAME = 'Game';
-    public static readonly RESOURCE = 'Resource';
-    public static readonly COLLECTION = 'Collection';
-    public static readonly TEXTBOOK = 'TextBook';
-    public static readonly E_TEXTBOOK = 'eTextBook';
-    public static readonly LESSON_PLAN = 'LessonPlan';
-    public static readonly COURSE = 'Course';
-    public static readonly CERTIFICATE = 'Certificate';
-    public static readonly TEXTBOOK_UNIT = 'TextBookUnit';
-    public static readonly LESSON_PLAN_UNIT = 'LessonPlanUnit';
-    public static readonly COURSE_UNIT = 'CourseUnit';
-    public static readonly FOCUS_SPOT = 'FocusSpot';
-    public static readonly LEARNING_OUTCOME_DEFINITION = 'LearningOutcomeDefinition';
-    public static readonly PRACTICE_QUESTION_SET = 'PracticeQuestionSet';
-    public static readonly CURIOSITY_QUESTIONS = 'CuriosityQuestions';
-    public static readonly MARKING_SCHEME_RUBRIC = 'MarkingSchemeRubric';
-    public static readonly EXPLANATION_RESOURCE = 'ExplanationResource';
-    public static readonly EXPERIENTIAL_RESOURCE = 'ExperientialResource';
-    public static readonly SELF_ASSESS = 'SelfAssess';
+import { CsPrimaryCategory } from '@project-sunbird/client-services/services/content';
+export class PrimaryCategory {
 
     public static readonly FOR_COURSE_TAB = [
-        ContentType.COURSE
+        CsPrimaryCategory.COURSE,
+        CsPrimaryCategory.TEACHER_RESOURCE,
+        CsPrimaryCategory.LEARNING_RESOURCE,
+        CsPrimaryCategory.EXPLANATION_CONTENT,
+        CsPrimaryCategory.CONTENT_PLAYLIST,
+        CsPrimaryCategory.DIGITAL_TEXTBOOK,
+        CsPrimaryCategory.PRACTICE_QUESTION_SET,
+        CsPrimaryCategory.E_TEXTBOOK,
+        CsPrimaryCategory.COURSE_ASSESSMENT
     ];
     public static readonly FOR_LIBRARY_TAB = [
-        ContentType.STORY,
-        ContentType.WORKSHEET,
-        ContentType.GAME,
-        ContentType.RESOURCE,
-        ContentType.COLLECTION,
-        ContentType.TEXTBOOK,
-        ContentType.E_TEXTBOOK,
-        ContentType.LESSON_PLAN,
-        ContentType.FOCUS_SPOT,
-        ContentType.LEARNING_OUTCOME_DEFINITION,
-        ContentType.PRACTICE_QUESTION_SET,
-        ContentType.CURIOSITY_QUESTIONS,
-        ContentType.MARKING_SCHEME_RUBRIC,
-        ContentType.EXPLANATION_RESOURCE,
-        ContentType.EXPERIENTIAL_RESOURCE
-    ];
-    // TODO: not need to pass content types, by default all the content types should display
-    public static readonly FOR_DOWNLOADED_TAB = [
-        ...ContentType.FOR_LIBRARY_TAB,
-        ...ContentType.FOR_COURSE_TAB
+        CsPrimaryCategory.COURSE,
+        CsPrimaryCategory.TEACHER_RESOURCE,
+        CsPrimaryCategory.LEARNING_RESOURCE,
+        CsPrimaryCategory.EXPLANATION_CONTENT,
+        CsPrimaryCategory.CONTENT_PLAYLIST,
+        CsPrimaryCategory.DIGITAL_TEXTBOOK,
+        CsPrimaryCategory.PRACTICE_QUESTION_SET,
+        CsPrimaryCategory.E_TEXTBOOK,
+        CsPrimaryCategory.COURSE_ASSESSMENT
     ];
+    public static readonly FOR_DOWNLOADED_TAB = PrimaryCategory.FOR_LIBRARY_TAB;
+
     public static readonly FOR_DIAL_CODE_SEARCH = [
-        ContentType.TEXTBOOK,
-        ContentType.TEXTBOOK_UNIT,
-        ContentType.COURSE
+        CsPrimaryCategory.DIGITAL_TEXTBOOK,
+        CsPrimaryCategory.TEXTBOOK_UNIT,
+        CsPrimaryCategory.COURSE
     ];
 }
 
@@ -74,11 +53,14 @@ export class Search {
     ];
 
     public static readonly FACETS = [
-        'board',
-        'gradeLevel',
+        'se_boards',
+        'se_gradeLevels',
         'subject',
-        'medium',
-        'resourceType'
+        'se_mediums',
+        'primaryCategory',
+        'publisher',
+        'mimeType',
+        'audience'
     ];
 
     public static readonly FACETS_COURSE = [
@@ -88,6 +70,7 @@ export class Search {
         'subject',
         'medium',
         'contentType',
+        'primaryCategory',
         'channel'
     ];
 }
@@ -103,7 +86,6 @@ export class BatchConstants {
         'courseId',
         'status',
         'createdBy',
-        // 'creatorDetails',
         'startDate',
         'endDate',
         'enrollmentEndDate',
@@ -121,7 +103,8 @@ export class ProfileConstants {
         'topics',
         'organisations',
         'roles',
-        'locations'
+        'locations',
+        'declarations'
     ];
 
     public static readonly CONTACT_TYPE_PHONE = 'phone';
@@ -130,21 +113,35 @@ export class ProfileConstants {
 
 export class ExploreConstants {
     public static readonly REQUIRED_FIELDS = [
+        'identifier',
+        'pkgVersion',
         'name',
-        'downloadUrl',
-        'variants',
-        'mimeType',
-        'contentType',
-        'resourceType',
-        'board',
+        'appIcon',
+        'subject',
         'medium',
+        'board',
+        'framework',
         'gradeLevel',
-        'subject',
+        'channel',
+        'contentType',
+        'mimeType',
+        'resourceType',
+        'status',
+        'downloadUrl',
+        'variants',
+        'createdBy',
+        'originData',
+        'origin',
         'streamingUrl',
-        'framework',
-        'appIcon'
+        'dialecodes',
+        'size',
+        'batches',
+        'organisation',
+        'trackable',
+        'primaryCategory'
     ];
 }
+
 export class AudienceFilter {
     public static readonly GUEST_TEACHER = ['instructor', 'learner'];
     public static readonly GUEST_STUDENT = ['learner'];
@@ -177,14 +174,17 @@ export class ShareUrl {
 }
 
 export class MenuOverflow {
-    public static readonly MENU_GUEST = ['USERS_AND_GROUPS', 'REPORTS', 'SETTINGS'];
-    public static readonly MENU_LOGIN = ['USERS_AND_GROUPS', 'REPORTS', 'SETTINGS', 'LOGOUT'];
     public static readonly DOWNLOAD_FILTERS = ['CONTENT_SIZE', 'LAST_VIEWED'];
-}
-
-export class SideMenu {
-    public static readonly MENU_GUEST = ['USERS_AND_GROUPS', 'REPORTS', 'LANGUAGE', 'SETTINGS'];
-    public static readonly MENU_LOGIN = ['USERS_AND_GROUPS', 'REPORTS', 'LANGUAGE', 'SETTINGS', 'LOGOUT'];
+    public static readonly MENU_GROUP_CREATOR = ['MENU_EDIT_GROUP_DETAILS', 'FRMELEMENTS_LBL_DEACTIVATEGRP', 'ENABLE_DISCUSSION_FORUM', 'MENU_DELETE_GROUP'];
+    public static readonly MENU_GROUP_ADMIN = ['MENU_EDIT_GROUP_DETAILS', 'FRMELEMENTS_LBL_DEACTIVATEGRP', 'ENABLE_DISCUSSION_FORUM', 'MENU_LEAVE_GROUP'];
+    public static readonly MENU_GROUP_CREATOR_DISABLE_DF = ['MENU_EDIT_GROUP_DETAILS', 'FRMELEMENTS_LBL_DEACTIVATEGRP', 'DISABLE_DISCUSSION_FORUM', 'MENU_DELETE_GROUP'];
+    public static readonly MENU_GROUP_ADMIN_DISABLE_DF = ['MENU_EDIT_GROUP_DETAILS', 'FRMELEMENTS_LBL_DEACTIVATEGRP', 'DISABLE_DISCUSSION_FORUM', 'MENU_LEAVE_GROUP'];
+    public static readonly MENU_GROUP_CREATOR_SUSPENDED = ['FRMELEMENTS_LBL_ACTIVATEGRP', 'MENU_DELETE_GROUP'];
+    public static readonly MENU_GROUP_ADMIN__SUSPENDED = ['FRMELEMENTS_LBL_ACTIVATEGRP', 'MENU_LEAVE_GROUP'];
+    public static readonly MENU_GROUP_NON_ADMIN = ['MENU_LEAVE_GROUP'];
+    public static readonly MENU_GROUP_MEMBER_NON_ADMIN = ['MENU_MAKE_GROUP_ADMIN', 'MENU_REMOVE_FROM_GROUP'];
+    public static readonly MENU_GROUP_MEMBER_ADMIN = ['DISMISS_AS_GROUP_ADMIN', 'MENU_REMOVE_FROM_GROUP'];
+    public static readonly MENU_GROUP_ACTIVITY_ADMIN = ['MENU_REMOVE_ACTIVITY'];
 }
 
 export class FormConstant {
@@ -224,6 +224,20 @@ export class PreferenceKey {
     public static readonly SYNC_CONFIG = 'sync_config';
     public static readonly COACH_MARK_SEEN = 'coach_mark_seen';
     public static readonly PAGE_ASSEMBLE_ORGANISATION_ID = 'page_assemble_organisation_id';
+    public static readonly CAMPAIGN_PARAMETERS = 'campaign_parameters';
+    public static readonly CREATE_GROUP_INFO_POPUP = 'create_group_info_popup';
+    public static readonly ADD_MEMBER_TO_GROUP_INFO_POPUP = 'add_member_to_group_info_popup';
+    public static readonly NOTIFICAITON_RECEIVED_AT = 'notification_received_at';
+    public static readonly CURRENT_SELECTED_THEME = 'current_selected_theme';
+    public static readonly DO_NOT_SHOW_PROFILE_NAME_CONFIRMATION_POPUP = 'do_not_show_pnc_popup';
+    public static readonly IS_JOYFUL_THEME_POPUP_DISPLAYED = 'is_joyful_theme_popup_displayed';
+    public static readonly SELECTED_SWITCHABLE_TABS_CONFIG = 'selected_switchable_tabs_config';
+    public static readonly IS_NEW_USER = 'is_new_user';
+}
+
+export enum SwitchableTabsConfig {
+    RESOURCE_COURSE_TABS_CONFIG = 'RESOURCE_COURSE_TABS_CONFIG',
+    HOME_DISCOVER_TABS_CONFIG = 'HOME_DISCOVER_TABS_CONFIG'
 }
 
 export class GenericAppConfig {
@@ -334,21 +348,18 @@ export class ContentCard {
     public static readonly LAYOUT_SAVED_CONTENT = 'SavedContent';
 }
 
-export class CardSectionName {
-    public static readonly SECTION_SAVED_RESOURCES = 'Saved Resources';
-    public static readonly SECTION_RECENT_RESOURCES = 'Recently Viewed';
-}
-
 export class ViewMore {
     public static readonly PAGE_COURSE_ENROLLED = 'course.EnrolledCourses';
     public static readonly PAGE_COURSE_POPULAR = 'course.PopularContent';
-    public static readonly PAGE_RESOURCE_SAVED = 'resource.SavedResources';
-    public static readonly PAGE_RESOURCE_RECENTLY_VIEWED = 'resource.RecentlyViewed';
+    public static readonly PAGE_TV_PROGRAMS = 'library.TvPrograms';
 }
 
 export class Location {
     public static readonly TYPE_STATE = 'state';
     public static readonly TYPE_DISTRICT = 'district';
+    public static readonly TYPE_BLOCK = 'block';
+    public static readonly TYPE_CLUSTER = 'cluster';
+    public static readonly TYPE_SCHOOL = 'school';
 }
 
 export class FrameworkCategory {
@@ -381,6 +392,7 @@ export class SystemSettingsIds {
     public static readonly CONTENT_COMING_SOON_MSG = 'contentComingSoonMsg';
     public static readonly CONSUMPTION_FAQS = 'consumptionFaqs';
     public static readonly HOT_CODE_PUSH_KEY = 'hotCodePush';
+    public static readonly GROUPS_TNC = 'groupsTnc';
 }
 
 export class StoreRating {
@@ -404,6 +416,7 @@ export class ContentFilterConfig {
     public static readonly NAME_DOWNLOADS = 'downloads';
     public static readonly NAME_DIALCODE = 'dialcode';
     public static readonly CODE_CONTENT_TYPE = 'contentType';
+    public static readonly CODE_PRIMARY_CATEGORY = 'primaryCategory';
     public static readonly CONTENT_STATUS_UNLISTED = 'Unlisted';
 }
 
@@ -420,26 +433,25 @@ export class ActionType {
     public static readonly BOOK_UPDATE = 'bookUpdate';
     public static readonly UPDATE_APP = 'updateApp';
     public static readonly EXT_URL = 'extURL';
+    public static readonly CONTENT_URL = 'contentURL';
+    public static readonly CERTIFICATE = 'certificateUpdate';
 }
 
 export class RouterLinks {
     public static readonly TABS = 'tabs';
     public static readonly TABS_COURSE = 'tabs/courses';
 
-    // Users and Groups Routs
-    public static readonly USER_AND_GROUPS = 'user-and-groups';
-    public static readonly ADD_OR_REMOVE_GROUP_USER = 'add-or-remove-group-user';
-    public static readonly GROUP_DETAILS = 'group-details';
-    public static readonly CREATE_GROUP = 'create-group';
-    public static readonly GROUP_MEMBERS = 'group-members';
-    public static readonly SHARE_USER_AND_GROUPS = 'share-user-and-groups';
-
     // Profile Routs
     public static readonly PROFILE = 'profile';
     public static readonly GUEST_EDIT = 'guest-edit';
     public static readonly GUEST_PROFILE = 'guest-profile';
     public static readonly PERSONAL_DETAILS_EDIT = 'personal-details-edit';
     public static readonly CATEGORIES_EDIT = 'categories-edit';
+    public static readonly SUB_PROFILE_EDIT = 'sub-profile-edit';
+    public static readonly MANAGE_USER_PROFILES = 'manage-user-profiles';
+    public static readonly SELF_DECLARED_TEACHER_EDIT = 'self-declared-teacher-edit';
+    public static readonly FRAMEWORK_SELECTION = 'framework-selection';
+    public static readonly CERTIFICATE_VIEW = 'certificate-view';
 
     // Courses Routs
     public static readonly COURSES = 'courses';
@@ -448,6 +460,8 @@ export class RouterLinks {
 
     // Course Batch
     public static readonly COURSE_BATCHES = 'course-batches';
+    // ADMIN HOME Routes
+    public static readonly ADMIN_HOME = 'admin-home';
 
     // Resources Routs
     public static readonly RESOURCES = 'resources';
@@ -456,16 +470,14 @@ export class RouterLinks {
     public static readonly ENROLLMENT_DETAILS = 'enrollment-details';
     public static readonly TEXTBOOK_TOC = 'textbook-toc';
     public static readonly EXPLORE_BOOK = 'explore-book';
+    public static readonly RELEVANT_CONTENTS = 'relevant-contents';
+
+    // HOME Routes
+    public static readonly HOME = 'home';
 
     // DownloadManger Routs
     public static readonly ACTIVE_DOWNLOADS = 'active-downloads';
 
-    // Reports Routs
-    public static readonly REPORTS_LIST = 'reports-list';
-    public static readonly REPORTS = 'reports';
-    public static readonly GROUP_REPORT = 'group-report';
-    public static readonly USER_REPORT = 'user-report';
-
     // Player Routs
     public static readonly PLAYER = 'player';
 
@@ -485,6 +497,7 @@ export class RouterLinks {
 
     // User Type Selection Routes
     public static readonly USER_TYPE_SELECTION = 'user-type-selection';
+    public static readonly USER_TYPE_SELECTION_LOGGEDIN = 'user-type-selection-loggedin';
 
     // View more activity Routes
     public static readonly VIEW_MORE_ACTIVITY = 'view-more-activity';
@@ -517,12 +530,13 @@ export class RouterLinks {
 
     public static readonly LIBRARY_TAB = `/${RouterLinks.TABS}/${RouterLinks.RESOURCES}`;
     public static readonly COURSE_TAB = `/${RouterLinks.TABS}/${RouterLinks.COURSES}`;
+    public static readonly HOME_TAB = `/${RouterLinks.TABS}/${RouterLinks.HOME}`;
+    public static readonly SEARCH_TAB = `/${RouterLinks.TABS}/${RouterLinks.SEARCH}`;
     public static readonly PROFILE_TAB = `/${RouterLinks.TABS}/${RouterLinks.PROFILE}`;
     public static readonly GUEST_PROFILE_TAB = `/${RouterLinks.TABS}/${RouterLinks.GUEST_PROFILE}`;
     public static readonly DOWNLOAD_TAB = `/${RouterLinks.TABS}/${RouterLinks.DOWNLOAD_MANAGER}`;
     public static readonly ONBOARDING_DISTRICT_MAPPING = `/${RouterLinks.DISTRICT_MAPPING}`;
 
-
     // TEXTBOOK view more page Routes
     public static readonly TEXTBOOK_VIEW_MORE = 'textbook-view-more';
 
@@ -532,10 +546,70 @@ export class RouterLinks {
     // routing to Term of use Web Page
     public static readonly TERM_OF_USE = '/privacy-policy/terms-of-use.html';
 
-}
-
-export class LibraryCardTypes {
-    public static readonly QRCODE_RESULT = 'qrcode_result';
+    // My Groups
+    public static readonly MY_GROUPS = 'my-groups';
+    public static readonly CREATE_EDIT_GROUP = 'create-edit-group';
+    public static readonly MY_GROUP_DETAILS = 'group-details';
+    public static readonly ADD_MEMBER_TO_GROUP = 'add-member-to-group';
+    public static readonly ACTIVITY_DETAILS = 'activity-details';
+    public static readonly ACTIVITY_TOC = 'activity-toc';
+    public static readonly ADD_ACTIVITY_TO_GROUP = 'add-activity-to-group';
+    public static readonly ACTIVITY_VIEW_MORE = 'activity-view-more';
+
+    // Curriculum courses
+    public static readonly CURRICULUM_COURSES = 'curriculum-courses';
+    public static readonly CHAPTER_DETAILS = 'chapter-details';
+
+    //Manage learn router
+    public static readonly PROGRAM = 'program';
+    public static readonly SURVEY = 'survey';
+    public static readonly PROJECT = 'project';
+    public static readonly REPORTS = "reports";
+    public static readonly OBSERVATION_SOLUTION_LISTING = `observation-solution-listing`;
+    public static readonly OBSERVATION_SOLUTION_ENTITY_LISTING = `observation-solution-entity-listing`
+    public static readonly PROJECT_REPORT = "project-report";
+    public static readonly PROJECT_FULL_REPORT = "project-full-report";
+    public static readonly DEEPLINK_REDIRECT = "deeplink-redirect";
+    public static readonly DETAILS = 'details';
+    public static readonly TASK_VIEW = 'task-view';
+    public static readonly LEARNING_RESOURCES = 'learning-resources';
+    public static readonly SYNC = 'sync';
+    public static readonly ATTACHMENTS = 'attachments';
+    public static readonly PROJECT_EDIT = 'project-edit';
+    public static readonly PROJECT_OPERATION = `project-operation`;
+    public static readonly CREATE_PROJECT = `create-project`;
+    public static readonly PROJECT_OPERATION_PAGE = `/${RouterLinks.PROJECT}/${RouterLinks.PROJECT_OPERATION}`;
+    public static readonly CREATE_PROJECT_PAGE = `/${RouterLinks.PROJECT}/${RouterLinks.CREATE_PROJECT}`;
+    public static readonly ATTACHMENTS_LIST = `/${RouterLinks.PROJECT}/${RouterLinks.ATTACHMENTS}`;
+
+
+    public static readonly SOLUTIONS = 'solutions';
+    public static readonly QUESTIONNAIRE = 'questionnaire';
+    public static readonly OBSERVATION = 'observation';
+    public static readonly SECTION_LISTING = 'section-listing';
+    public static readonly ECM_LISTING = 'ecm-listing';
+    public static readonly SUBMISSION_PREVIEW = 'submission_preview';
+    public static readonly IMAGE_LISTING = 'image-listing';
+    public static readonly ALL_EVIDENCE = 'all-evidence';
+    public static readonly DOMAIN_ECM_LISTING = 'domain-ecm-listing';
+    public static readonly IMP_SUGGESTIONS = 'imp-suggestions';
+
+    // Observation routes
+    public static readonly OBSERVATION_DETAILS = 'observation-details';
+    public static readonly OBSERVATION_SUBMISSION = 'observation-submission';
+    public static readonly OBSERVATION_REPORTS = 'observation-reports';
+    public static readonly REPORT_WITH_SCORE = 'reports-with-score';
+    public static readonly SURVEY_REPORTS = 'survey-reports';
+    // category-list page
+    public static readonly CATEGORY_LIST = 'category-list';
+    public static readonly DISCUSSION = 'discussion-forum';
+
+    public static readonly HOME_USER = 'user';
+    public static readonly HOME_ADMIN = 'admin';
+    // filter page
+    public static readonly SEARCH_FILTER = 'search-filter';
+    //assessment
+    public static readonly GENERIC_REPORT = 'generic-report';
 }
 
 export class ShareItemType {
@@ -556,7 +630,141 @@ export class LaunchType {
     public static readonly SIDELOAD = 'sideload';
 }
 
+export class ProgressPopupContext {
+    public static readonly DEEPLINK = 'deeplink';
+}
+
 export class RegexPatterns {
     public static readonly SPECIALCHARECTERSANDEMOJIS =
-    /([-!$%^&*()_+÷|~=`{}[:;<>?,.×/£¥"'@#\]]|[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff]|[\u0023-\u0039]\ufe0f?\u20e3|\u3299|\u3297|\u303d|\u3030|\u24c2|\ud83c[\udd70-\udd71]|\ud83c[\udd7e-\udd7f]|\ud83c\udd8e|\ud83c[\udd91-\udd9a]|\ud83c[\udde6-\uddff]|\ud83c[\ude01-\ude02]|\ud83c\ude1a|\ud83c\ude2f|\ud83c[\ude32-\ude3a]|\ud83c[\ude50-\ude51]|\u203c|\u2049|[\u25aa-\u25ab]|\u25b6|\u25c0|[\u25fb-\u25fe]|\u00a9|\u00ae|\u2122|\u2139|\ud83c\udc04|[\u2600-\u26FF]|\u2b05|\u2b06|\u2b07|\u2b1b|\u2b1c|\u2b50|\u2b55|\u231a|\u231b|\u2328|\u23cf|[\u23e9-\u23f3]|[\u23f8-\u23fa]|\ud83c\udccf|\u2934|\u2935|[\u2190-\u21ff])/g;
+        /([-!$%^&*()_+÷|~=`{}[:;<>?,.×/£¥"'@#\]]|[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff]|[\u0023-\u0039]\ufe0f?\u20e3|\u3299|\u3297|\u303d|\u3030|\u24c2|\ud83c[\udd70-\udd71]|\ud83c[\udd7e-\udd7f]|\ud83c\udd8e|\ud83c[\udd91-\udd9a]|\ud83c[\udde6-\uddff]|\ud83c[\ude01-\ude02]|\ud83c\ude1a|\ud83c\ude2f|\ud83c[\ude32-\ude3a]|\ud83c[\ude50-\ude51]|\u203c|\u2049|[\u25aa-\u25ab]|\u25b6|\u25c0|[\u25fb-\u25fe]|\u00a9|\u00ae|\u2122|\u2139|\ud83c\udc04|[\u2600-\u26FF]|\u2b05|\u2b06|\u2b07|\u2b1b|\u2b1c|\u2b50|\u2b55|\u231a|\u231b|\u2328|\u23cf|[\u23e9-\u23f3]|[\u23f8-\u23fa]|\ud83c\udccf|\u2934|\u2935|[\u2190-\u21ff])/g;
 }
+
+export class IgnoreTelemetryPatters {
+    public static readonly IGNORE_DEEPLINK_PAGE_ID_EVENTS = /{"pageId":"resources"}|{"pageId":"library"}/;
+    public static readonly IGNORE_DIAL_CODE_PAGE_ID_EVENTS = /{"pageId":"resources"}|{"pageId":"library"}|{"pageId":"home"}|{"pageId":"search"}/;
+    public static readonly IGNORE_CHANNEL_IMPRESSION_EVENTS = /{"pageId":"resources"}|{"pageId":"library"}|{"pageId":"home"}|{"pageId":"onboarding-language-setting"}|{"pageId":"user-type-selection"}|{"pageId":profile-settings"}/;
+    public static readonly IGNORE_SIGN_IN_PAGE_ID_EVENTS = /{"pageId":"resources"}|{"pageId":"library"}|{"pageId":"home"}|{"pageId":"profile"}|{"pageId":"courses"}/;
+}
+
+export class FormConfigCategories {
+    public static readonly CONTENT = 'content';
+}
+export class FormConfigSubcategories {
+    public static readonly CONTENT_QUALITY = 'contentquality';
+    public static readonly CONTENT_AVAILABILITY = 'contentavailability';
+}
+
+export class GroupErrorCodes {
+    public static readonly EXCEEDED_GROUP_MAX_LIMIT = 'EXCEEDED_GROUP_MAX_LIMIT';
+    public static readonly EXCEEDED_MEMBER_MAX_LIMIT = 'EXCEEDED_MEMBER_MAX_LIMIT';
+    public static readonly EXCEEDED_ACTIVITY_MAX_LIMIT = 'EXCEEDED_ACTIVITY_MAX_LIMIT';
+}
+
+export class AppThemes {
+    public static readonly DEFAULT = 'DEFAULT';
+    public static readonly JOYFUL = 'JOYFUL';
+}
+export class AppMode {
+    public static readonly DEFAULT = 'DEFAULT';
+    public static readonly DARKMODE = 'DARKMODE';
+}
+
+export class StatusBarTheme {
+    public static readonly SET_DEFAULT = '#BB000000';
+}
+
+export class AssessmentConstant {
+    public static readonly MAX_ATTEMPTS = 25;
+}
+
+export const ColorMapping = [
+    {
+        primary: 'rgba(255,139,46,1)',
+        secondary: 'rgba(255,139,46,0.3)'
+    },
+    {
+        primary: 'rgba(163,99,255,1)',
+        secondary: 'rgba(163,99,255,0.3)'
+    },
+    {
+        primary: 'rgba(34,139,255,1)',
+        secondary: 'rgba(34,139,255,0.3)'
+    },
+    {
+        primary: 'rgba(95,192,32,1)',
+        secondary: 'rgba(95,192,32,0.3)'
+    },
+    {
+        primary: 'rgba(255,128,47,1)',
+        secondary: 'rgba(255,128,47,0.3)'
+    },
+    {
+        primary: 'rgba(251,70,70,1)',
+        secondary: 'rgba(251,70,70,0.3)'
+    },
+    {
+        primary: 'rgba(83,109,252,1)',
+        secondary: 'rgba(83,109,252,0.3)'
+    },
+    {
+        primary: 'rgba(15,186,208,1)',
+        secondary: 'rgba(15,186,208,0.3)'
+    }
+]
+
+export const SubjectMapping = {
+    english: {
+        icon: 'assets/imgs/book_english.svg',
+        theme: {
+            iconBgColor: ColorMapping[0].primary,
+            pillBgColor: ColorMapping[0].secondary
+        }
+    },
+    mathematics: {
+        icon: 'assets/imgs/calculator.svg',
+        theme: {
+            iconBgColor: ColorMapping[1].primary,
+            pillBgColor: ColorMapping[1].secondary
+        }
+    },
+    science: {
+        icon: 'assets/imgs/globe.svg',
+        theme: {
+            iconBgColor: ColorMapping[2].primary,
+            pillBgColor: ColorMapping[2].secondary
+        }
+    },
+    default: {
+        icon: 'assets/imgs/book_default.svg',
+        theme: null
+    }
+}
+
+export const PrimaryCaregoryMapping = {
+    "digital textbooks": {
+        icon: 'assets/imgs/textbook.svg'
+    },
+    "courses": {
+        icon: 'assets/imgs/course.svg'
+    },
+    "tv programs": {
+        icon: 'assets/imgs/tv.svg'
+    },
+    "documents": {
+        icon: 'assets/imgs/documents.svg'
+    },
+    "videos": {
+        icon: 'assets/imgs/videos.svg'
+    },
+    "default": {
+        icon: 'assets/imgs/all_content.svg'
+    }
+}
+
+export interface MaxAttempt {
+    isLastAttempt: boolean;
+    limitExceeded: boolean;
+    isCloseButtonClicked: boolean;
+}
+
+
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 7404d77d3..fccd106aa 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,61 +1,52 @@
 // Angular dependencies
-import { NgModule, Provider, ErrorHandler, APP_INITIALIZER, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { RouteReuseStrategy } from '@angular/router';
 import { HttpClient, HttpClientModule } from '@angular/common/http';
+import { APP_INITIALIZER, CUSTOM_ELEMENTS_SCHEMA, ErrorHandler, NgModule, Provider } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-
 // ionic cordova dependencies/plugins
-import { WebView } from '@ionic-native/ionic-webview/ngx';
-import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
-import { StatusBar } from '@ionic-native/status-bar/ngx';
+import { SegmentationTagService } from '@app/services/segmentation-tag/segmentation-tag.service';
 import { AppVersion } from '@ionic-native/app-version/ngx';
-import { SocialSharing } from '@ionic-native/social-sharing/ngx';
-import { FileTransfer, FileTransferObject } from '@ionic-native/file-transfer/ngx';
-import { FileOpener } from '@ionic-native/file-opener/ngx';
 import { Device } from '@ionic-native/device/ngx';
+import { FileOpener } from '@ionic-native/file-opener/ngx';
+import { FileTransfer, FileTransferObject } from '@ionic-native/file-transfer/ngx';
+import { File } from '@ionic-native/file/ngx';
+// ionic cordova dependencies/plugins
+import { WebView } from '@ionic-native/ionic-webview/ngx';
+import { LocalNotifications } from '@ionic-native/local-notifications/ngx';
 import { Network } from '@ionic-native/network/ngx';
-
+import { SocialSharing } from '@ionic-native/social-sharing/ngx';
+import { StatusBar } from '@ionic-native/status-bar/ngx';
+import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
 // 3rd party dependencies
-import { TranslateModule, TranslateLoader, TranslateService } from '@ngx-translate/core';
+import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
-
+import { CsContentType } from '@project-sunbird/client-services/services/content';
+import { QuestionCursor } from '@project-sunbird/sunbird-quml-player-v8';
 // app dependencies like directive, sdk, services etc
 import { SunbirdSdk } from 'sunbird-sdk';
+import { QumlPlayerService } from '@app/services/quml-player/quml-player.service';
 import { DirectivesModule } from '../directives/directives.module';
 import {
-  AppGlobalService,
-  CommonUtilService,
-  CourseUtilService,
-  TelemetryGeneratorService,
-  QRScannerResultHandler,
-  UtilityService,
+  ActivePageService, AndroidPermissionsService, AppGlobalService,
   AppHeaderService,
   AppRatingService,
-  LogoutHandlerService,
-  LoginHandlerService,
+  CanvasPlayerService,
+  CollectionService, ComingSoonMessageService, CommonUtilService,
   ContainerService,
-  AndroidPermissionsService,
-  ComingSoonMessageService,
-  NotificationService,
-  SunbirdQRScanner,
-  ActivePageService,
+  ContentAggregatorHandler, CourseUtilService,
   FormAndFrameworkUtilService,
-  CanvasPlayerService,
-  SplashScreenService
+  GroupHandlerService, LoginHandlerService, LogoutHandlerService,
+  NotificationService, QRScannerResultHandler,
+  SplashScreenService, SunbirdQRScanner, TelemetryGeneratorService,
+  UtilityService
 } from '../services/index';
-import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
-import { UserTypeSelectionPageModule } from './user-type-selection/user-type-selection.module';
+import { AppComponent } from './app.component';
 import { ComponentsModule } from './components/components.module';
-import { UserAndGroupsPageModule } from './user-and-groups/user-and-groups.module';
-import { LocalNotifications } from '@ionic-native/local-notifications/ngx';
-import { PageFilterPageModule } from './page-filter/page-filter.module';
-import { PageFilterPage } from './page-filter/page-filter.page';
 import { PageFilterOptionsPageModule } from './page-filter/page-filter-options/page-filter-options.module';
 import { PageFilterOptionsPage } from './page-filter/page-filter-options/page-filter-options.page';
-import { CrashAnalyticsErrorLogger } from '@app/services/crash-analytics/crash-analytics-error-logger';
-import { File } from '@ionic-native/file/ngx';
+import { PageFilterPageModule } from './page-filter/page-filter.module';
+import { PageFilterPage } from './page-filter/page-filter.page';
 import { TermsAndConditionsPageModule } from './terms-and-conditions/terms-and-conditions.module';
 import { TncUpdateHandlerService } from '@app/services/handlers/tnc-update-handler.service';
 import {
@@ -64,10 +55,30 @@ import {
 import { SplashscreenImportActionHandlerDelegate } from '@app/services/sunbird-splashscreen/splashscreen-import-action-handler-delegate';
 import { SplaschreenDeeplinkActionHandlerDelegate } from '@app/services/sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate';
 import { LocalCourseService } from '@app/services/local-course.service';
-import { ContentType } from './app.constant';
 import { ExternalIdVerificationService } from '@app/services/externalid-verification.service';
 import { TextbookTocService } from '@app/app/collection-detail-etb/textbook-toc-service';
-import {NativePageTransitions} from '@ionic-native/native-page-transitions/ngx';
+import { NativePageTransitions } from '@ionic-native/native-page-transitions/ngx';
+import { NavigationService } from '@app/services/navigation-handler.service';
+import {AliasBoardName} from '../pipes/alias-board-name/alias-board-name';
+import { DownloadPdfService } from '@app/services/download-pdf/download-pdf.service';
+import {ConsentService} from '@app/services/consent-service';
+import { ProfileHandler } from '@app/services/profile-handler';
+import { IonicStorageModule } from '@ionic/storage';
+import { Camera } from '@ionic-native/camera/ngx';
+import { FilePath } from '@ionic-native/file-path/ngx';
+import { Chooser } from '@ionic-native/chooser/ngx';
+import { PhotoViewer } from '@ionic-native/photo-viewer/ngx';
+import { StreamingMedia } from '@ionic-native/streaming-media/ngx';
+import {configuration} from '@app/configuration/configuration';
+import { LocationHandler } from '@app/services/location-handler';
+import { CoreModule } from './manage-learn/core/core.module';
+import { DiscussionTelemetryService } from '@app/services/discussion/discussion-telemetry.service';
+import { UserTypeSelectionPageModule } from './user-type-selection/user-type-selection.module';
+import { RouteReuseStrategy } from '@angular/router';
+import { CrashAnalyticsErrorLogger } from '@app/services/crash-analytics/crash-analytics-error-logger';
+import { PrintPdfService } from '@app/services/print-pdf/print-pdf.service';
+import {UpdateProfileService} from '@app/services/update-profile-service';
+import { SbSearchFilterModule } from 'common-form-elements';
 
 // AoT requires an exported function for factories
 export function translateHttpLoaderFactory(httpClient: HttpClient) {
@@ -119,9 +130,6 @@ export const contentService = () => {
 export const contentFeedbackService = () => {
   return SunbirdSdk.instance.contentFeedbackService;
 };
-export const summarizerService = () => {
-  return SunbirdSdk.instance.summarizerService;
-};
 export const eventsBusService = () => {
   return SunbirdSdk.instance.eventsBusService;
 };
@@ -162,6 +170,12 @@ export function faqService() {
 export function archiveService() {
   return SunbirdSdk.instance.archiveService;
 }
+export const discussionService = () => {
+  return SunbirdSdk.instance.discussionService;
+};
+export const segmentationService = () => {
+  return SunbirdSdk.instance.segmentationService;
+};
 
 export function sdkDriverFactory(): any {
   return [{
@@ -221,9 +235,6 @@ export function sdkDriverFactory(): any {
   }, {
     provide: 'CONTENT_FEEDBACK_SERVICE',
     useFactory: contentFeedbackService
-  }, {
-    provide: 'SUMMARIZER_SERVICE',
-    useFactory: summarizerService
   }, {
     provide: 'EVENTS_BUS_SERVICE',
     useFactory: eventsBusService
@@ -260,8 +271,13 @@ export function sdkDriverFactory(): any {
   }, {
     provide: 'ARCHIVE_SERVICE',
     useFactory: archiveService
-  }
-  ];
+  }, {
+    provide: 'DISCUSSION_SERVICE',
+    useFactory: discussionService
+  }, {
+    provide: 'SEGMENTATION_SERVICE',
+    useFactory: segmentationService
+  }];
 }
 
 export const sunbirdSdkServicesProvidersFactory: () => Provider[] = sdkDriverFactory;
@@ -280,11 +296,12 @@ export const sunbirdSdkFactory =
 
       }));
 
-      await SunbirdSdk.instance.init({
+        await SunbirdSdk.instance.init({
         platform: 'cordova',
         fileConfig: {
         },
         apiConfig: {
+          debugMode: configuration.debug,
           host: buildConfigValues['BASE_URL'],
           user_authentication: {
             redirectUrl: buildConfigValues['OAUTH_REDIRECT_URL'],
@@ -330,12 +347,14 @@ export const sunbirdSdkFactory =
           frameworkApiPath: '/api/framework/v1',
           frameworkConfigDirPath: '/data/framework',
           channelConfigDirPath: '/data/channel',
-          searchOrganizationApiPath: '/api/org/v1',
+          searchOrganizationApiPath: '/api/org/v2',
           systemSettingsDefaultChannelIdKey: 'custodianOrgId'
         },
         profileServiceConfig: {
           profileApiPath: '/api/user/v1',
           profileApiPath_V2: '/api/user/v2',
+          profileApiPath_V3: '/api/user/v3',
+          profileApiPath_V4: '/api/user/v4',
           tenantApiPath: '/v1/tenant',
           otpApiPath: '/api/otp/v1',
           searchLocationApiPath: '/api/data/v1',
@@ -364,7 +383,7 @@ export const sunbirdSdkFactory =
           showEndPage: false,
           endPage: [{
             template: 'assessment',
-            contentType: [ContentType.SELF_ASSESS]
+            contentType: [CsContentType.SELF_ASSESS]
           }],
           splash: {
             webLink: '',
@@ -425,8 +444,10 @@ declare const sbutility;
     UserTypeSelectionPageModule,
     PageFilterPageModule,
     PageFilterOptionsPageModule,
-    UserAndGroupsPageModule,
-    TermsAndConditionsPageModule
+    TermsAndConditionsPageModule,
+    IonicStorageModule.forRoot(),
+    CoreModule,
+    SbSearchFilterModule.forRoot('mobile')
   ],
   providers: [
     StatusBar,
@@ -453,6 +474,9 @@ declare const sbutility;
     AppHeaderService,
     AppRatingService,
     FormAndFrameworkUtilService,
+    DownloadPdfService,
+    PrintPdfService,
+    CollectionService,
     Device,
     Network,
     AndroidPermissionsService,
@@ -466,11 +490,27 @@ declare const sbutility;
     SplashScreenService,
     ExternalIdVerificationService,
     TextbookTocService,
-      NativePageTransitions,
+    GroupHandlerService,
+    NativePageTransitions,
+    NavigationService,
+    ContentAggregatorHandler,
+    AliasBoardName,
+    ConsentService,
+    ProfileHandler,
+    LocationHandler,
+    DiscussionTelemetryService,
+    UpdateProfileService,
+    SegmentationTagService,
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
     ...sunbirdSdkServicesProvidersFactory(),
     { provide: ErrorHandler, useClass: CrashAnalyticsErrorLogger },
-    { provide: APP_INITIALIZER, useFactory: sunbirdSdkFactory, deps: [], multi: true }
+    { provide: APP_INITIALIZER, useFactory: sunbirdSdkFactory, deps: [], multi: true },
+    Camera,
+    FilePath,
+    Chooser,
+    PhotoViewer,
+    StreamingMedia,
+    { provide: QuestionCursor, useClass: QumlPlayerService }
   ],
   bootstrap: [AppComponent],
   schemas: [
diff --git a/src/app/category-list/category-list-page.html b/src/app/category-list/category-list-page.html
new file mode 100644
index 000000000..7e3341b3f
--- /dev/null
+++ b/src/app/category-list/category-list-page.html
@@ -0,0 +1,84 @@
+<ion-content>
+    <div class="container-focus">
+        <div class="px-16 pb-2">
+            <h3 class="mt-4"
+                style="font-weight: 600;">{{ 'EXPLORE' | translate: {'%s': (formField.facet | translateJson)} }}</h3>
+            <p *ngIf="categoryDescription">{{(categoryDescription | translateJson: {'%category': (formField.facet | translateJson), '%appName': appName} ) | translate }}</p>
+        </div>
+
+        <!-- filter from discover search page-->
+        <form [formGroup]="primaryFacetFiltersFormGroup" *ngIf="fromLibrary && primaryFacetFiltersFormGroup">
+            <ion-grid class="filter-container">
+                <ion-row>
+                    <ion-col size="5" *ngFor="let primaryFacetFilter of primaryFacetFilters">
+                        <ion-item class="filter-items">
+                            <ion-label position="stacked" class="hide-label">
+                                {{primaryFacetFilter.translations | translateJson}}
+                            </ion-label>
+                            <ion-select class="ion-text-capitalize"
+                                        [interfaceOptions]="primaryFacetFiltersTemplateOptions"
+                                        [formControlName]="primaryFacetFilter.code"
+                                        okText="{{'BTN_SUBMIT' | translate}}"
+                                        cancelText="{{'CANCEL' | translate}}"
+                                        multiple="true"
+                                        placeholder="{{primaryFacetFilter.translations | translateJson}}">
+                                <ion-select-option
+                                        *ngFor="let facet of ((initialFacetFilters && initialFacetFilters[primaryFacetFilter.code]) || [])"
+                                        [value]="facet"
+                                        class="ion-text-capitalize">
+                                    {{facet.name | titlecase }}
+                                </ion-select-option>
+                            </ion-select>
+                        </ion-item>
+                    </ion-col>
+
+                    <ion-col size="2">
+                        <button class="filter-button" (click)="navigateToFilterFormPage()">
+                            <img src="./assets/imgs/filter.svg" alt="filter">
+                        </button>
+                    </ion-col>
+                </ion-row>
+            </ion-grid>
+        </form>
+    </div>
+
+    <div class="p-8 sticky-header-pills" *ngIf="!showSheenAnimation">
+        <sb-pills-grid *ngIf="sectionGroup?.sections && formField?.aggregate" [pillShape]="'default'"
+                       [pillsViewType]="'scroll'"
+                       [pillBorder]="PillBorder.SEMI_ROUND">
+            <sb-pill-item (click)="scrollToSection(sectionGroup.name + '_'+ section.name)"
+                          *ngFor="let section of sectionGroup?.sections" [name]="section?.name"></sb-pill-item>
+        </sb-pills-grid>
+    </div>
+
+    <ion-list class="m-n" *ngIf="showSheenAnimation">
+        <app-skeleton-item height="16px" width="40%" style="padding: 16px;"></app-skeleton-item>
+        <ion-item *ngFor="let i of [0,1,2,3,4,5,6,7,8]" class="animation-background">
+            <ion-avatar item-start>
+                <app-skeleton-item height="72px" width="72px"></app-skeleton-item>
+            </ion-avatar>
+            <ion-label style="padding-left: 40px;">
+                <app-skeleton-item height="12px" width="67%" style="padding-bottom: 8px;"></app-skeleton-item>
+                <app-skeleton-item height="12px" width="47%" style="padding-bottom: 8px;"></app-skeleton-item>
+            </ion-label>
+        </ion-item>
+    </ion-list>
+
+    <div *ngIf="!showSheenAnimation">
+        <div *ngFor="let section of sectionGroup?.sections">
+            <div [id]="sectionGroup.name + '_'+ section.name"
+                 *ngIf="section?.contents && section?.contents?.length" class="pb-8">
+                <sb-library-cards-stack [title]="section?.name" [contentList]="section?.contents"
+                                        [viewMoreButtonText]="'VIEW_MORE' | translate" [maxCardCount]="3"
+                                        [layoutConfig]="layoutConfiguration"
+                                        (viewMoreClick)="navigateToViewMorePage(section?.contents, section.name)"
+                                        (cardClick)="navigateToDetailPage($event, section.name)">
+                </sb-library-cards-stack>
+            </div>
+        </div>
+
+        <div class="no-result-found" *ngIf="!sectionGroup?.sections?.length">
+            {{ 'EMPTY_SEARCH_RESULTS' | translate }}
+        </div>
+    </div>
+</ion-content>
diff --git a/src/app/category-list/category-list-page.module.ts b/src/app/category-list/category-list-page.module.ts
new file mode 100644
index 000000000..9179e7c41
--- /dev/null
+++ b/src/app/category-list/category-list-page.module.ts
@@ -0,0 +1,43 @@
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {Routes, RouterModule} from '@angular/router';
+
+import {IonicModule} from '@ionic/angular';
+
+import {CategoryListPage} from './category-list-page';
+import {CommonConsumptionModule} from '@project-sunbird/common-consumption-v8';
+import {TranslateModule} from '@ngx-translate/core';
+import {ComponentsModule} from '@app/app/components/components.module';
+import {CommonFormElementsModule, SbSearchFilterModule} from 'common-form-elements';
+import {PipesModule} from '@app/pipes/pipes.module';
+import {SearchFilterPage} from '@app/app/search-filter/search-filter.page';
+
+const routes: Routes = [
+    {
+        path: '',
+        component: CategoryListPage
+    }
+];
+
+@NgModule({
+    entryComponents: [
+        SearchFilterPage
+    ],
+    imports: [
+        CommonModule,
+        FormsModule,
+        IonicModule,
+        RouterModule.forChild(routes),
+        CommonConsumptionModule,
+        TranslateModule,
+        ComponentsModule,
+        CommonFormElementsModule,
+        PipesModule,
+        ReactiveFormsModule,
+        SbSearchFilterModule
+    ],
+    declarations: [CategoryListPage, SearchFilterPage]
+})
+export class CategoryListPageModule {
+}
diff --git a/src/app/category-list/category-list-page.scss b/src/app/category-list/category-list-page.scss
new file mode 100644
index 000000000..1277cb636
--- /dev/null
+++ b/src/app/category-list/category-list-page.scss
@@ -0,0 +1,41 @@
+@import "../../assets/styles/variables";
+.animation-background {
+  padding: 0 8px 0 8px;
+  background-color: map-get($colors, white_f2);
+}
+
+.sticky-header-pills{
+  position: sticky;
+  top: 1rem;
+  z-index: 9;
+  background-color: var(--app-primary-background);
+}
+
+.filter-items{
+  height: 70%;
+  ion-select{
+    border: none !important;
+  }
+  border-radius: 2rem;
+  .hide-label{
+    display: none;
+  }
+}
+
+.container-focus {
+  padding-bottom: 0 !important;
+}
+
+.filter-button {
+  width: 100%;
+  height: 70%;
+  box-shadow: 0 0 50px 0 rgba(0,0,0,0.1) !important;
+  background-color: var(--app-primary-header-light);
+}
+
+.no-result-found{
+  text-align: center;
+  font-size: 1rem;
+  font-weight: bold;
+  padding-top: 2rem;
+}
\ No newline at end of file
diff --git a/src/app/category-list/category-list-page.spec.ts b/src/app/category-list/category-list-page.spec.ts
new file mode 100644
index 000000000..21aa74a3a
--- /dev/null
+++ b/src/app/category-list/category-list-page.spec.ts
@@ -0,0 +1,362 @@
+import { CategoryListPage } from './category-list-page';
+import { CommonUtilService } from '../../services/common-util.service';
+import { Router } from '@angular/router';
+import { AppHeaderService } from '../../services/app-header.service';
+import { of } from 'rxjs';
+import { NavigationService } from '../../services/navigation-handler.service';
+import { ContentService, CourseService, FormService, ProfileService } from '@project-sunbird/sunbird-sdk';
+import { ScrollToService } from '../../services/scroll-to.service';
+import { Environment, FormAndFrameworkUtilService, InteractSubtype, InteractType, PageId, TelemetryGeneratorService } from '../../services';
+import { ContentUtil } from '@app/util/content-util';
+import { RouterLinks } from '@app/app/app.constant';
+import { ModalController } from '@ionic/angular';
+
+describe('CategoryListPage', () => {
+    let categoryListPage: CategoryListPage;
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        translateMessage: jest.fn()
+    };
+    const mockProfileService: Partial<ProfileService> = {
+        getActiveSessionProfile: jest.fn(() => of({ profileType: 'Student' } as any))
+    };
+    const mockHeaderService: Partial<AppHeaderService> = {};
+    const mockRouterExtras = {
+        extras: {
+            state: {
+                formField: {
+                    searchCriteria: {
+                        subjects: ['maths']
+                    },
+                    facet: 'sample',
+                    primaryFacetFilters: [
+                        {
+                            code: '1',
+                            translations: 'en'
+                        }
+                    ]
+                },
+                fromLibrary: true
+            }
+        }
+    };
+    const data = jest.fn(() => of({
+        result: [
+            {
+                index: 1,
+                title: 'TextBook',
+                data: {
+                    type: 'CONTENTS',
+                    request: {}
+                },
+                theme: 'sample_theme',
+                meta: {
+                    filterCriteria: {
+                        facetFilters: [
+                            {
+                                name: 'sample_string',
+                                values: [{
+                                    name: 'sample_string',
+                                    count: 2,
+                                    apply: true,
+
+                                }]
+
+                            }
+                        ]
+                    },
+                    searchRequest: {},
+                    searchCriteria: {}
+                }
+            }
+        ]
+    }));
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => mockRouterExtras as any),
+        navigate: jest.fn(() => Promise.resolve(true))
+    };
+    const mockNavService: Partial<NavigationService> = {
+        navigateToTrackableCollection: jest.fn(),
+        navigateToCollection: jest.fn(),
+        navigateToContent: jest.fn()
+    };
+    const mockContentService: Partial<ContentService> = {};
+    const mockFormService: Partial<FormService> = {};
+    const mockCourseService: Partial<CourseService> = {};
+    const mockScrollService: Partial<ScrollToService> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {};
+    const mockModalController: Partial<ModalController> = {};
+
+    beforeAll(() => {
+        categoryListPage = new CategoryListPage(
+            mockContentService as ContentService,
+            mockFormService as FormService,
+            mockCourseService as CourseService,
+            mockProfileService as ProfileService,
+            mockCommonUtilService as CommonUtilService,
+            mockRouter as Router,
+            mockHeaderService as AppHeaderService,
+            mockNavService as NavigationService,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockScrollService as ScrollToService,
+            mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
+            mockModalController as ModalController
+        );
+    });
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+    it('should be create an instance of CategoryListPage', () => {
+        expect(categoryListPage).toBeTruthy();
+    });
+
+    describe('ionViewWillEnter', () => {
+        // it('should get appName from commonUtilService and also check if supportedFacets is available', (done) => {
+        //     // arrange
+        //     mockCommonUtilService.getAppName = jest.fn(() => Promise.resolve('Sunbird'));
+        //     mockHeaderService.showHeaderWithBackButton = jest.fn();
+        //     mockFormAndFrameworkUtilService.getFormFields = jest.fn(() => Promise.resolve([]));
+        //     mockContentService.buildContentAggregator = jest.fn(() => ({
+        //         aggregate: data
+        //     })) as any;
+        //     // act
+        //     categoryListPage.ionViewWillEnter();
+        //     // assert
+        //     setTimeout(() => {
+        //         expect(mockCommonUtilService.getAppName).toHaveBeenCalled();
+        //         expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+        //         expect(data).toHaveBeenCalled();
+        //         done();
+        //     }, 0);
+        // });
+    });
+
+    describe('navigate to ViewMore page', () => {
+        it('should generate interact telemetry and if network available and navigate to textbook viewmore', () => {
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            const telemetryObject = ContentUtil.getTelemetryObject({
+                identifier: 'sample_id',
+                isAvailableLocally: true,
+                contentData: {
+                    pkgVersion: 1
+                }
+            });
+            mockRouter.navigate = jest.fn();
+            // act
+            categoryListPage.navigateToViewMorePage({
+                identifier: 'sample_id',
+                isAvailableLocally: true,
+                contentData: {
+                    pkgVersion: 1
+                }
+            }, 'Mathematics');
+            // assert
+
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.VIEW_MORE_CLICKED,
+                Environment.HOME,
+                PageId.LIBRARY,
+                telemetryObject
+            );
+            expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.TEXTBOOK_VIEW_MORE], {
+                state: {
+                    contentList: {
+                        identifier: 'sample_id',
+                        isAvailableLocally: true,
+                        contentData: {
+                            pkgVersion: 1
+                        }
+                    },
+                    subjectName: 'Mathematics',
+                    corRelation: [
+                        {
+                            id: 'Mathematics',
+                            type: 'Section',
+                        },
+                        {
+                            id: '',
+                            type: 'RootSection',
+                        },
+                    ]
+                }
+            });
+        });
+
+        it('should generate interact telemetry and if network is not available and showToast', () => {
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
+            };
+            const telemetryObject = ContentUtil.getTelemetryObject({
+                identifier: 'sample_id',
+                isAvailableLocally: false,
+                contentData: {
+                    pkgVersion: 1
+                }
+            });
+            mockCommonUtilService.presentToastForOffline = jest.fn(() => Promise.resolve());
+            // act
+            categoryListPage.navigateToViewMorePage({
+                identifier: 'sample_id',
+                isAvailableLocally: false,
+                contentData: {
+                    pkgVersion: 1
+                }
+            }, 'Mathematics');
+            // assert
+
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.VIEW_MORE_CLICKED,
+                Environment.HOME,
+                PageId.LIBRARY,
+                telemetryObject
+            );
+        });
+
+    });
+
+    describe('navigateToDetailsPage', () => {
+        it('should navigate to details page and generate telemetry', () => {
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockNavService.navigateToDetailPage = jest.fn();
+            const telemetryObject = ContentUtil.getTelemetryObject({
+                identifier: 'sample_id',
+                isAvailableLocally: true,
+                contentData: {
+                    pkgVersion: 1
+                }
+            });
+            const rollUp = ContentUtil.generateRollUp(undefined, 'sample_id');
+
+            // act
+            categoryListPage.navigateToDetailPage({
+                data: {
+                    content: {
+                        identifier: 'sample_id',
+                        pkgVersion: 1
+                    }
+                },
+                index: 1,
+            }, 'Mathematics');
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractSubtype.SELECT_CONTENT,
+                '',
+                Environment.SEARCH,
+                PageId.CATEGORY_RESULTS,
+                telemetryObject,
+                {
+                    positionClicked: 1,
+                    sectionName: 'Mathematics'
+                },
+                rollUp,
+                []
+            );
+            expect(mockNavService.navigateToDetailPage).toHaveBeenCalled();
+        });
+
+        it('should go else to else part toast if network is not available', () => {
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
+            };
+            mockCommonUtilService.presentToastForOffline = jest.fn(() => Promise.resolve());
+            const telemetryObject = ContentUtil.getTelemetryObject({
+                identifier: 'sample_id',
+                isAvailableLocally: true,
+                contentData: {
+                    pkgVersion: 1
+                }
+            });
+            const rollUp = ContentUtil.generateRollUp(undefined, 'sample_id');
+
+            // act
+            categoryListPage.navigateToDetailPage({
+                data: {
+                    content: {
+                        identifier: 'sample_id',
+                        pkgVersion: 1
+                    },
+                    isAvailableLocally: false
+                },
+                index: 1,
+            }, 'Mathematics');
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractSubtype.SELECT_CONTENT,
+                '',
+                Environment.SEARCH,
+                PageId.CATEGORY_RESULTS,
+                telemetryObject,
+                {
+                    positionClicked: 1,
+                    sectionName: 'Mathematics'
+                },
+                rollUp,
+                []
+            );
+            expect(mockCommonUtilService.presentToastForOffline).toHaveBeenCalled();
+        });
+    });
+
+    // it('should navigate to formFilter page', (done) => {
+    //     // arrange
+    //     mockModalController.create = jest.fn(() => (Promise.resolve(
+    //         {
+    //             present: jest.fn(() => Promise.resolve({})),
+    //             onDidDismiss: jest.fn(() => Promise.resolve({
+    //                 data: {
+    //                     appliedFilterCriteria: {
+    //                         facetFilters: [
+    //                             {
+    //                                 name: 'sample_string',
+    //                                 code: 'sample_code',
+    //                                 values: [{
+    //                                     name: 'audience',
+    //                                     apply: true
+    //                                 }]
+    //                             }
+    //                         ]
+    //                     }
+
+    //                 },
+    //             })),
+    //         } as any
+    //     )));
+    //     mockContentService.buildContentAggregator = jest.fn(() => ({
+    //         aggregate: data
+    //     })) as any;
+    //     // act
+    //     categoryListPage.navigateToFilterFormPage();
+    //     // assert
+    //     setTimeout(() => {
+    //         expect(mockModalController.create).toHaveBeenCalled();
+    //         done();
+    //     });
+    // });
+
+
+    it('should call scrollService() to id', () => {
+        // arrange
+        mockScrollService.scrollTo = jest.fn();
+        // act
+        categoryListPage.scrollToSection('Mathematics');
+        // assert
+        expect(mockScrollService.scrollTo).toHaveBeenCalledWith('Mathematics', {
+            block: 'center',
+            behavior: 'smooth'
+        });
+    });
+});
diff --git a/src/app/category-list/category-list-page.ts b/src/app/category-list/category-list-page.ts
new file mode 100644
index 000000000..db51aa629
--- /dev/null
+++ b/src/app/category-list/category-list-page.ts
@@ -0,0 +1,431 @@
+import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
+import {
+    AppHeaderService,
+    CommonUtilService,
+    CorReleationDataType,
+    Environment,
+    FormAndFrameworkUtilService,
+    ImpressionType,
+    InteractSubtype,
+    InteractType,
+    PageId,
+    TelemetryGeneratorService
+} from '@app/services';
+import { Router } from '@angular/router';
+import {
+    ContentService,
+    ContentsGroupedByPageSection,
+    CourseService,
+    FilterValue,
+    FormService,
+    ProfileService,
+    ContentData,
+    ContentSearchCriteria,
+    SearchType,
+    CorrelationData
+} from 'sunbird-sdk';
+import { AggregatorConfigField, ContentAggregation } from 'sunbird-sdk/content/handlers/content-aggregator';
+import { ContentUtil } from '@app/util/content-util';
+import { RouterLinks } from '@app/app/app.constant';
+import { NavigationService } from '@app/services/navigation-handler.service';
+import { ScrollToService } from '@app/services/scroll-to.service';
+import { FormConstants } from '@app/app/form.constants';
+import { ModalController } from '@ionic/angular';
+import { SearchFilterPage } from '@app/app/search-filter/search-filter.page';
+import { FormControl, FormGroup } from '@angular/forms';
+import { Subscription } from 'rxjs';
+import { PillBorder } from '@project-sunbird/common-consumption-v8';
+import { ObjectUtil } from '@app/util/object.util';
+
+
+@Component({
+    selector: 'app-category-list-page',
+    templateUrl: './category-list-page.html',
+    styleUrls: ['./category-list-page.scss'],
+})
+export class CategoryListPage implements OnInit, OnDestroy {
+
+    sectionGroup?: ContentsGroupedByPageSection;
+    formField: {
+        facet: string;
+        searchCriteria: ContentSearchCriteria;
+        aggregate: {
+            sortBy?: {
+                [field in keyof ContentData]: 'asc' | 'desc';
+            }[];
+            groupBy?: keyof ContentData;
+        };
+    };
+    public imageSrcMap = new Map();
+    defaultImg: string;
+    showSheenAnimation = true;
+    primaryFacetFiltersTemplateOptions = {
+        cssClass: 'select-box'
+    };
+    facetFilters: {
+        [code: string]: FilterValue[]
+    } = {};
+    initialFacetFilters?: {
+        [code: string]: FilterValue[]
+    };
+    primaryFacetFilters: {
+        code: string,
+        translations: string
+    }[];
+    fromLibrary = false;
+    sectionCode = '';
+    primaryFacetFiltersFormGroup: FormGroup;
+
+    private readonly searchCriteria: ContentSearchCriteria;
+    private readonly filterCriteria: ContentSearchCriteria;
+
+    private supportedUserTypesConfig: Array<any>;
+    private supportedFacets?: string[];
+    private subscriptions: Subscription[] = [];
+    layoutConfiguration = {
+        layout: 'v3'
+    };
+    appName = '';
+    categoryDescription = '';
+    PillBorder = PillBorder;
+    private shouldGenerateImpressionTelemetry = true;
+    private corRelationList = [];
+    private pageId: string = PageId.CATEGORY_RESULTS;
+    private fromPage: string = PageId.SEARCH;
+    private env: string = Environment.SEARCH;
+    private initialFilterCriteria: ContentSearchCriteria;
+
+    constructor(
+        @Inject('CONTENT_SERVICE') private contentService: ContentService,
+        @Inject('FORM_SERVICE') private formService: FormService,
+        @Inject('COURSE_SERVICE') private courseService: CourseService,
+        @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+        public commonUtilService: CommonUtilService,
+        private router: Router,
+        private appHeaderService: AppHeaderService,
+        private navService: NavigationService,
+        private telemetryGeneratorService: TelemetryGeneratorService,
+        private scrollService: ScrollToService,
+        private formAndFrameworkUtilService: FormAndFrameworkUtilService,
+        private modalController: ModalController
+    ) {
+        const extrasState = this.router.getCurrentNavigation().extras.state;
+        if (extrasState) {
+            this.formField = extrasState.formField;
+            this.sectionCode = extrasState.code;
+            this.searchCriteria = JSON.parse(JSON.stringify(extrasState.formField.searchCriteria));
+            if (this.formField && this.formField.facet && this.formField.facet.toLowerCase() === 'course') {
+                if (!this.searchCriteria.impliedFiltersMap) {
+                    this.searchCriteria.impliedFiltersMap = [];
+                }
+                this.searchCriteria.impliedFiltersMap = this.searchCriteria.impliedFiltersMap.concat([{
+                    'batches.enrollmentType': 'open'
+                }, {
+                    'batches.status': 1
+                }
+                ]);
+            }
+            this.primaryFacetFilters = extrasState.formField.primaryFacetFilters;
+            this.fromLibrary = extrasState.fromLibrary;
+            this.formField.facet = this.formField.facet.replace(/(^\w|\s\w)/g, m => m.toUpperCase());
+            this.categoryDescription = extrasState.description || '';
+            if (this.fromLibrary) {
+                this.primaryFacetFiltersFormGroup = this.primaryFacetFilters.reduce<FormGroup>((acc, filter) => {
+                    const facetFilterControl = new FormControl();
+                    this.subscriptions.push(
+                        facetFilterControl.valueChanges.subscribe((v) => {
+                            this.onPrimaryFacetFilterSelect(filter, v);
+                        })
+                    );
+                    acc.addControl(filter.code, facetFilterControl);
+                    return acc;
+                }, new FormGroup({}));
+            }
+        }
+    }
+
+    async ngOnInit() {
+        this.appName = await this.commonUtilService.getAppName();
+        if (!this.supportedFacets) {
+            this.supportedFacets = (await this.formAndFrameworkUtilService
+                .getFormFields(FormConstants.SEARCH_FILTER)).reduce((acc, filterConfig) => {
+                    acc.push(filterConfig.code);
+                    return acc;
+                }, []);
+        }
+
+        await this.fetchAndSortData({
+            ...this.searchCriteria,
+            facets: this.supportedFacets,
+            searchType: SearchType.SEARCH,
+            limit: 100
+        }, true);
+    }
+
+    async ionViewWillEnter() {
+        this.appHeaderService.showHeaderWithBackButton();
+
+        const corRelationList: Array<CorrelationData> = [];
+        corRelationList.push({ id: this.formField.facet, type: CorReleationDataType.FORM_PAGE });
+        this.telemetryGeneratorService.generateImpressionTelemetry(
+            ImpressionType.PAGE_LOADED,
+            '',
+            PageId.CATEGORY_RESULTS,
+            Environment.HOME,
+            undefined, undefined, undefined, undefined,
+            corRelationList
+        );
+    }
+
+    private async fetchAndSortData(searchCriteria, isInitialCall: boolean) {
+        this.showSheenAnimation = true;
+        const temp = ((await this.contentService.buildContentAggregator
+            (this.formService, this.courseService, this.profileService)
+            .aggregate({
+                interceptSearchCriteria: () => (searchCriteria)
+            },
+                [], null, [{
+                    dataSrc: {
+                        type: 'CONTENTS',
+                        request: {
+                            type: 'POST',
+                            path: '/api/content/v1/search',
+                            withBearerToken: true
+                        },
+                        mapping: [{
+                            aggregate: this.formField.aggregate
+                        }]
+                    },
+                    sections: [
+                        {
+                            index: 0,
+                            title: this.formField.facet,
+                            theme: {}
+                        }
+                    ],
+                } as AggregatorConfigField<'CONTENTS'>]).toPromise()).result);
+        (this as any)['filterCriteria'] = temp[0].meta.filterCriteria;
+        this.facetFilters = (this.filterCriteria.facetFilters || []).reduce((acc, f) => {
+            acc[f.name] = f.values;
+            return acc;
+        }, {});
+
+        if (isInitialCall) {
+            this.initialFilterCriteria = JSON.parse(JSON.stringify(this.filterCriteria));
+        }
+
+        if (!this.initialFacetFilters) {
+            this.initialFacetFilters = JSON.parse(JSON.stringify(this.facetFilters));
+        }
+
+
+        if (this.primaryFacetFiltersFormGroup) {
+            this.primaryFacetFiltersFormGroup.patchValue(
+                this.primaryFacetFilters.reduce((acc, p) => {
+                    acc[p.code] = this.facetFilters[p.code]
+                        .filter(v => v.apply)
+                        .map(v => {
+                            return this.initialFacetFilters[p.code].find(i => (i.name === v.name));
+                        });
+                    return acc;
+                }, {}),
+                { emitEvent: false }
+            );
+        }
+
+        this.sectionGroup = (temp[0] as ContentAggregation<'CONTENTS'>).data;
+        this.showSheenAnimation = false;
+        this.generateImpressionTelemetry();
+    }
+
+    private generateImpressionTelemetry() {
+        if (!this.shouldGenerateImpressionTelemetry) {
+            return;
+        }
+        const facet = this.formField.facet;
+        const selectedFacet = facet && ObjectUtil.isJSON(facet) ? JSON.parse(facet)['en'] : facet;
+        switch (this.sectionCode) {
+            case 'popular_categories':
+                this.corRelationList.push({
+                    type: CorReleationDataType.CATEGORY,
+                    id: selectedFacet
+                });
+                this.pageId = PageId.CATEGORY_RESULTS;
+                this.fromPage = PageId.SEARCH;
+                this.env = Environment.SEARCH;
+                break;
+            case 'other_boards':
+                this.corRelationList.push({
+                    type: CorReleationDataType.BOARD,
+                    id: selectedFacet
+                });
+                this.pageId = PageId.BOARD_RESULTS;
+                this.fromPage = PageId.SEARCH;
+                this.env = Environment.SEARCH;
+                break;
+            case 'browse_by_subject':
+                this.corRelationList.push({
+                    type: CorReleationDataType.SUBJECT,
+                    id: selectedFacet
+                });
+                this.pageId = PageId.SUBJECT_RESULTS;
+                this.fromPage = PageId.HOME;
+                this.env = Environment.HOME;
+                break;
+            case 'browse_by_category':
+                this.corRelationList.push({
+                    type: CorReleationDataType.CATEGORY,
+                    id: selectedFacet
+                });
+                this.pageId = PageId.CATEGORY_RESULTS;
+                this.fromPage = PageId.HOME;
+                this.env = Environment.HOME;
+                break;
+            case 'browse_by_audience':
+                this.corRelationList.push({
+                    type: CorReleationDataType.AUDIENCE,
+                    id: selectedFacet
+                });
+                this.pageId = PageId.AUDIENCE_RESULTS;
+                this.fromPage = PageId.SEARCH;
+                this.env = Environment.SEARCH;
+                break;
+        }
+
+        this.corRelationList.push({
+            type: CorReleationDataType.FROM_PAGE,
+            id: this.fromPage
+        });
+        let upDatedCorRelationList = [];
+        if (this.sectionGroup && this.sectionGroup.sections && this.sectionGroup.sections.length) {
+            const categoryResultCount = this.sectionGroup.sections.reduce((acc, curr) => {
+                return acc + curr.count;
+            }, 0);
+            upDatedCorRelationList = this.corRelationList.concat([{
+                type: CorReleationDataType.COUNT_CONTENT,
+                id: categoryResultCount + ''
+            }]);
+        }
+        this.shouldGenerateImpressionTelemetry = false;
+        this.telemetryGeneratorService.generateImpressionTelemetry(
+            ImpressionType.PAGE_LOADED, '',
+            this.pageId,
+            this.env, undefined, undefined, undefined, undefined,
+            upDatedCorRelationList
+        );
+    }
+
+    navigateToViewMorePage(items, subject) {
+        this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
+            InteractSubtype.VIEW_MORE_CLICKED,
+            Environment.HOME,
+            PageId.LIBRARY,
+            ContentUtil.getTelemetryObject(items));
+        if (this.commonUtilService.networkInfo.isNetworkAvailable || items.isAvailableLocally) {
+            const corRelationList = [
+                { id: subject || '', type: CorReleationDataType.SECTION },
+                { id: this.sectionCode || '', type: CorReleationDataType.ROOT_SECTION }
+            ];
+            this.router.navigate([RouterLinks.TEXTBOOK_VIEW_MORE], {
+                state: {
+                    contentList: items,
+                    subjectName: subject,
+                    corRelation: corRelationList
+                }
+            });
+        } else {
+            this.commonUtilService.presentToastForOffline('OFFLINE_WARNING_ETBUI_1').then();
+        }
+    }
+
+    navigateToDetailPage(event, sectionName) {
+        event.data = event.data.content ? event.data.content : event.data;
+        const item = event.data;
+        const index = event.index;
+        const identifier = item.contentId || item.identifier;
+        const corRelationList = [
+            { id: sectionName || '', type: CorReleationDataType.SECTION },
+            { id: this.sectionCode || '', type: CorReleationDataType.ROOT_SECTION }
+        ];
+        const values = {};
+        values['sectionName'] = sectionName;
+        values['positionClicked'] = index;
+        this.telemetryGeneratorService.generateInteractTelemetry(
+            InteractType.SELECT_CONTENT,
+            '',
+            this.env,
+            this.pageId,
+            ContentUtil.getTelemetryObject(item),
+            values,
+            ContentUtil.generateRollUp(undefined, identifier),
+            this.corRelationList);
+        if (this.commonUtilService.networkInfo.isNetworkAvailable || item.isAvailableLocally) {
+            this.navService.navigateToDetailPage(item, { content: item, corRelation: corRelationList });
+        } else {
+            this.commonUtilService.presentToastForOffline('OFFLINE_WARNING_ETBUI_1').then();
+        }
+    }
+
+    scrollToSection(id: string) {
+        this.scrollService.scrollTo(id, {
+            block: 'center',
+            behavior: 'smooth'
+        });
+    }
+
+    async navigateToFilterFormPage() {
+        const resetData = (this.sectionGroup && this.sectionGroup.sections && this.sectionGroup.sections.length) ? false : true
+        const openFiltersPage = await this.modalController.create({
+            component: SearchFilterPage,
+            componentProps: {
+                initialFilterCriteria: resetData ? JSON.parse(JSON.stringify(this.initialFilterCriteria)) : JSON.parse(JSON.stringify(this.filterCriteria)),
+                defaultFilterCriteria: JSON.parse(JSON.stringify(this.initialFilterCriteria)),
+                resetData: resetData
+            }
+        });
+        await openFiltersPage.present();
+        openFiltersPage.onDidDismiss().then(async (result) => {
+            if (result && result.data) {
+                await this.applyFilter(result.data.appliedFilterCriteria);
+            }
+        });
+    }
+
+    async onPrimaryFacetFilterSelect(primaryFacetFilter: { code: string }, toApply: FilterValue[]) {
+        const appliedFilterCriteria: ContentSearchCriteria = JSON.parse(JSON.stringify(this.filterCriteria));
+        const facetFilter = appliedFilterCriteria.facetFilters.find(f => f.name === primaryFacetFilter.code);
+
+        if (facetFilter) {
+            facetFilter.values.forEach(facetFilterValue => {
+                if (toApply.find(apply => facetFilterValue.name === apply.name)) {
+                    facetFilterValue.apply = true;
+                } else {
+                    facetFilterValue.apply = false;
+                }
+            });
+
+            await this.applyFilter(appliedFilterCriteria);
+        }
+    }
+
+    private async applyFilter(appliedFilterCriteria: ContentSearchCriteria) {
+        const tempSearchCriteria: ContentSearchCriteria = {
+            ...appliedFilterCriteria,
+            mode: 'hard',
+            facets: this.supportedFacets,
+            searchType: SearchType.FILTER
+        };
+        tempSearchCriteria.facetFilters.forEach(facet => {
+            if (facet.values && facet.values.length > 0) {
+                if (facet.name === 'audience' && this.supportedUserTypesConfig) {
+                    facet.values = ContentUtil.getAudienceFilter(facet, this.supportedUserTypesConfig);
+                }
+            }
+        });
+        await this.fetchAndSortData(tempSearchCriteria, false);
+    }
+
+    ngOnDestroy() {
+        this.subscriptions.forEach(s => s.unsubscribe());
+    }
+}
diff --git a/src/app/collection-detail-etb/collection-detail-etb-page.spec.data.ts b/src/app/collection-detail-etb/collection-detail-etb-page.spec.data.ts
index cbb0097a1..e30b05ea9 100644
--- a/src/app/collection-detail-etb/collection-detail-etb-page.spec.data.ts
+++ b/src/app/collection-detail-etb/collection-detail-etb-page.spec.data.ts
@@ -1,5 +1,6 @@
-import {Content, Rollup, TelemetryObject} from 'sunbird-sdk';
-import {Navigation} from '@angular/router';
+import { Content } from 'sunbird-sdk';
+import { Navigation } from '@angular/router';
+import { PageId } from '../../services';
 
 export const mockcollectionData: Partial<Navigation> = {
     id: 7,
@@ -77,7 +78,10 @@ export const mockcollectionData: Partial<Navigation> = {
                     'do_212911626908123136157'
                 ],
                 batchId: 'SAMPLE_BATCH'
-            }
+            },
+            source: PageId.GROUP_DETAIL,
+            groupId: 'g1',
+            activityList: []
         }
     }
 };
@@ -128,8 +132,8 @@ export const contentDetailsMcokResponse1: Content = {
             'Class 2', 'Class 3'
         ],
         attributions: ['gd_1', 'gd_2'],
-        me_totalRatingsCount: 1,
-        contentFeedback: [{rating: 'SAMPLE_RATING'}],
+        me_averageRating: 1,
+        contentFeedback: [{ rating: 'SAMPLE_RATING' }],
         appId: 'staging.diksha.app',
         contentEncoding: 'gzip',
         c_Diksha_Stage_open_batch_count: 1,
@@ -236,7 +240,7 @@ export const contentDetailsMcokResponse1: Content = {
         leafNodesCount: 7,
         compatibilityLevel: 4,
         resourceType: 'Course',
-        licenseDetails: {description: '', name: '', url: ''},
+        licenseDetails: { description: '', name: '', url: '' },
         // isAvailableLocally: false
     },
     contentFeedback: [{
@@ -305,8 +309,8 @@ export const contentDetailsMcokResponse2: Content = {
             'Class 2', 'Class 3'
         ],
         attributions: ['gd_1', 'gd_2'],
-        me_totalRatingsCount: 1,
-        contentFeedback: [{rating: 'SAMPLE_RATING'}],
+        me_averageRating: 1,
+        contentFeedback: [{ rating: 'SAMPLE_RATING' }],
         appId: 'staging.diksha.app',
         contentEncoding: 'gzip',
         c_Diksha_Stage_open_batch_count: 1,
@@ -413,7 +417,7 @@ export const contentDetailsMcokResponse2: Content = {
         leafNodesCount: 7,
         compatibilityLevel: 4,
         resourceType: 'Course',
-        licenseDetails: {description: '', name: '', url: ''},
+        licenseDetails: { description: '', name: '', url: '' },
         // isAvailableLocally: false
     },
     contentFeedback: [{
@@ -483,8 +487,8 @@ export const contentDetailsMcokResponse3: Content = {
             'Class 2', 'Class 3'
         ],
         attributions: ['gd_1', 'gd_2'],
-        me_totalRatingsCount: 1,
-        contentFeedback: [{rating: 'SAMPLE_RATING'}],
+        me_averageRating: 1,
+        contentFeedback: [{ rating: 'SAMPLE_RATING' }],
         appId: 'staging.diksha.app',
         contentEncoding: 'gzip',
         c_Diksha_Stage_open_batch_count: 1,
@@ -591,7 +595,7 @@ export const contentDetailsMcokResponse3: Content = {
         leafNodesCount: 7,
         compatibilityLevel: 4,
         resourceType: 'Course',
-        licenseDetails: {description: '', name: '', url: ''},
+        licenseDetails: { description: '', name: '', url: '' },
     },
     contentFeedback: [{
         contentId: 'd0_123456',
diff --git a/src/app/collection-detail-etb/collection-detail-etb-page.spec.ts b/src/app/collection-detail-etb/collection-detail-etb-page.spec.ts
index fc13cb3fa..e6a98fb4a 100644
--- a/src/app/collection-detail-etb/collection-detail-etb-page.spec.ts
+++ b/src/app/collection-detail-etb/collection-detail-etb-page.spec.ts
@@ -1,39 +1,49 @@
-import { CollectionDetailEtbPage } from './collection-detail-etb.page';
+import {CollectionDetailEtbPage} from './collection-detail-etb.page';
 import {
-    ContentService, EventsBusService, ProfileService, TelemetryErrorCode,
-    StorageService, ContentImportResponse, ContentImportStatus, TelemetryObject,
-    DownloadService
+    ContentImportResponse,
+    ContentImportStatus,
+    ContentService,
+    DownloadService,
+    EventsBusService,
+    ProfileService,
+    StorageService,
+    TelemetryErrorCode,
+    TelemetryObject
 } from 'sunbird-sdk';
-import { Events, PopoverController, Platform, IonContent } from '@ionic/angular';
-import { NgZone, ChangeDetectorRef } from '@angular/core';
+import {IonContent, Platform, PopoverController} from '@ionic/angular';
+import {Events} from '@app/util/events';
+import {ChangeDetectorRef, NgZone} from '@angular/core';
 import {
-    AppGlobalService, CommonUtilService, TelemetryGeneratorService, AppHeaderService,
-    ComingSoonMessageService, InteractSubtype, Environment, ImpressionType
+    AppGlobalService,
+    AppHeaderService,
+    CommonUtilService,
+    Environment,
+    ImpressionType,
+    InteractSubtype,
+    TelemetryGeneratorService
 } from '../../services';
-import {
-    InteractType, PageId, ID, Mode, ErrorType
-} from '../../services/telemetry-constants';
-import { FileSizePipe } from '../../pipes/file-size/file-size';
-import { Router } from '@angular/router';
-import { TextbookTocService } from './textbook-toc-service';
-import { Location } from '@angular/common';
+import {ErrorType, ID, InteractType, Mode, PageId} from '../../services/telemetry-constants';
+import {FileSizePipe} from '../../pipes/file-size/file-size';
+import {Router} from '@angular/router';
+import {TextbookTocService} from './textbook-toc-service';
+import {Location} from '@angular/common';
 import {
     contentDetailsMcokResponse1,
     contentDetailsMcokResponse2,
     contentDetailsMcokResponse3,
     mockcollectionData,
-    mockContentData,
-    mockContentInfo
+    mockContentData
 } from './collection-detail-etb-page.spec.data';
 import { of, Subscription, throwError } from 'rxjs';
 import { ContentPlayerHandler } from '@app/services/content/player/content-player-handler';
-import { ContentUtil } from '@app/util/content-util';
 import { EventTopics } from '@app/app/app.constant';
-import { ShareItemType, ContentType } from '../app.constant';
-import { ContentDeleteHandler } from '../../services/content/content-delete-handler'
-import { connect } from 'http2';
+import { ShareItemType} from '../app.constant';
+import { ContentDeleteHandler } from '../../services/content/content-delete-handler';
 import { isObject } from 'util';
-import { MimeType } from '../../app/app.constant';
+import { SbProgressLoader } from '@app/services/sb-progress-loader.service';
+import { NavigationService } from '../../services/navigation-handler.service';
+import { CsContentType, CsPrimaryCategory } from '@project-sunbird/client-services/services/content';
+import { SegmentationTagService } from '../../services/segmentation-tag/segmentation-tag.service';
 
 describe('collectionDetailEtbPage', () => {
     let collectionDetailEtbPage: CollectionDetailEtbPage;
@@ -102,10 +112,28 @@ describe('collectionDetailEtbPage', () => {
         showContentDeletePopup: jest.fn()
     };
 
+    const mockSbProgressLoader: Partial<SbProgressLoader> = {};
+    const mockNavigationService: Partial<NavigationService> = {
+        navigateToTrackableCollection: jest.fn(),
+        navigateToContent: jest.fn(),
+        navigateTo: jest.fn(),
+        navigateToCollection: jest.fn()
+    };
+
+    global.window.segmentation = {
+        init: jest.fn(),
+        SBTagService: {
+            pushTag: jest.fn(),
+            removeAllTags: jest.fn(),
+            getTags: jest.fn(() => undefined),
+            restoreTags: jest.fn()
+        }
+    };
+
     beforeEach(() => {
         const div = document.createElement('div');
         document.body.appendChild(div);
-        window['scrollWindow'] = { getScrollElement: () => Promise.resolve({ scrollTo: jest.fn() }) };
+        window['scrollWindow'] = {getScrollElement: () => Promise.resolve({scrollTo: jest.fn()})};
         collectionDetailEtbPage = new CollectionDetailEtbPage(
             mockContentService as ContentService,
             mockEventBusService as EventsBusService,
@@ -118,6 +146,7 @@ describe('collectionDetailEtbPage', () => {
             mockplatform as Platform,
             mockappGlobalService as AppGlobalService,
             mockCommonUtilService as CommonUtilService,
+            mockNavigationService as NavigationService,
             mocktelemetryGeneratorService as TelemetryGeneratorService,
             mockfileSizePipe as FileSizePipe,
             mockHeaderService as AppHeaderService,
@@ -126,7 +155,8 @@ describe('collectionDetailEtbPage', () => {
             mockchangeDetectionRef as ChangeDetectorRef,
             mocktextbookTocService as TextbookTocService,
             mockContentPlayerHandler as ContentPlayerHandler,
-            mockContentDeleteHandler as ContentDeleteHandler
+            mockContentDeleteHandler as ContentDeleteHandler,
+            mockSbProgressLoader as SbProgressLoader
         );
 
         collectionDetailEtbPage.ionContent = mockIonContent as any;
@@ -134,7 +164,7 @@ describe('collectionDetailEtbPage', () => {
 
     beforeEach(() => {
         jest.clearAllMocks();
-        jest.restoreAllMocks();
+        // jest.resetAllMocks();
     });
 
     it('should create a instance of collectionDetailEtbPage', () => {
@@ -145,11 +175,13 @@ describe('collectionDetailEtbPage', () => {
         // arrange
         mockCommonUtilService.getAppName = jest.fn(() => Promise.resolve('diksha'));
         mockDownloadService.trackDownloads = jest.fn(() => of());
+        mockCommonUtilService.translateMessage = jest.fn(() => 'play');
         // act
         collectionDetailEtbPage.ngOnInit();
         // assert
         expect(mockCommonUtilService.getAppName).toHaveBeenCalled();
         expect(mockDownloadService.trackDownloads).toHaveBeenCalled();
+        expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('PLAY');
     });
 
     it('should extract content data', () => {
@@ -192,6 +224,7 @@ describe('collectionDetailEtbPage', () => {
         mockIonContent.ionScroll.subscribe = jest.fn((fn) => {
             fn({});
         });
+        mockHeaderService.showStatusBar = jest.fn();
         jest.spyOn(mockHeaderService, 'getDefaultPageConfig').mockReturnValue({
             showHeader: false,
             showBurgerMenu: false,
@@ -208,6 +241,7 @@ describe('collectionDetailEtbPage', () => {
             expect(collectionDetailEtbPage.isUpdateAvailable).toBeFalsy();
             expect(collectionDetailEtbPage.setChildContents).toHaveBeenCalled();
             expect(collectionDetailEtbPage.setCollectionStructure).toHaveBeenCalled();
+            expect(mockHeaderService.showStatusBar).toHaveBeenCalled();
             done();
         }, 0);
     });
@@ -227,30 +261,6 @@ describe('collectionDetailEtbPage', () => {
         }, 0);
     });
 
-    it('should generate license section telemetry', () => {
-        const params = 'expanded';
-        collectionDetailEtbPage.objId = 'sampleId';
-        collectionDetailEtbPage.objType = undefined;
-        collectionDetailEtbPage.objVer = 2;
-        mocktelemetryGeneratorService.generateInteractTelemetry = jest.fn();
-        collectionDetailEtbPage.licenseSectionClicked(params);
-        expect(mocktelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-            InteractType.LICENSE_CARD_EXPANDED,
-            '',
-            undefined,
-            PageId.COLLECTION_DETAIL,
-            {
-                id: collectionDetailEtbPage.objId,
-                type: collectionDetailEtbPage.objType,
-                version: collectionDetailEtbPage.objVer
-            },
-            undefined,
-            {},
-            undefined,
-            ID.LICENSE_CARD_CLICKED
-        );
-    });
-
     describe('IonViewWillEnter', () => {
 
         it('should set headerConfig, headerObservable, setContentDetails, and subscribeEvents', () => {
@@ -285,6 +295,7 @@ describe('collectionDetailEtbPage', () => {
             });
 
             jest.spyOn(collectionDetailEtbPage, 'setContentDetails').mockImplementation();
+            mockHeaderService.showStatusBar = jest.fn();
             // act
             collectionDetailEtbPage.ionViewWillEnter();
             // assert
@@ -294,6 +305,7 @@ describe('collectionDetailEtbPage', () => {
             expect(mockHeaderService.updatePageConfig).toHaveBeenCalled();
             expect(collectionDetailEtbPage.playContent).toHaveBeenCalledWith(mockContentData);
             expect(collectionDetailEtbPage.subscribeSdkEvent).toHaveBeenCalled();
+            expect(mockHeaderService.showStatusBar).toHaveBeenCalled();
         });
 
         it('should set headerConfig, headerObservable, setContentDetails, and subscribeEvents for else part', () => {
@@ -328,6 +340,7 @@ describe('collectionDetailEtbPage', () => {
             });
 
             jest.spyOn(collectionDetailEtbPage, 'setContentDetails').mockImplementation();
+            mockHeaderService.showStatusBar = jest.fn();
             // act
             collectionDetailEtbPage.ionViewWillEnter();
             // assert
@@ -337,110 +350,18 @@ describe('collectionDetailEtbPage', () => {
             expect(mockHeaderService.updatePageConfig).toHaveBeenCalled();
             expect(collectionDetailEtbPage.playContent).toHaveBeenCalledWith(mockContentData);
             expect(collectionDetailEtbPage.subscribeSdkEvent).toHaveBeenCalled();
+            expect(mockHeaderService.showStatusBar).toHaveBeenCalled();
         });
     });
-    it('should show license true when user clicked on credits and license', () => {
-        // arrange
-        collectionDetailEtbPage.showCredits = false;
-        jest.spyOn(collectionDetailEtbPage, 'licenseSectionClicked').mockImplementation();
-        // act
-        collectionDetailEtbPage.showLicensce();
-        // assert
-        expect(collectionDetailEtbPage.licenseSectionClicked).toHaveBeenCalledWith('expanded');
-    });
-
-    it('should not show license when user clicked on license and credits', () => {
-        // arrange
-        collectionDetailEtbPage.showCredits = true;
-        jest.spyOn(collectionDetailEtbPage, 'licenseSectionClicked').mockImplementation();
-        // act
-        collectionDetailEtbPage.showLicensce();
-        // assert
-        expect(collectionDetailEtbPage.licenseSectionClicked).toHaveBeenCalledWith('collapsed');
-    });
-
-    it('should start playingContent after organising content metaData', (done) => {
-        // arrange
-        jest.spyOn(ContentUtil, 'getTelemetryObject').mockReturnValue(
-            new TelemetryObject(mockContentData.content.identifier,
-                mockContentData.content.contentData.contentType, mockContentData.content.contentData.pkgVersion));
-        mockContentPlayerHandler.launchContentPlayer = jest.fn();
-        // act
-        collectionDetailEtbPage.playContent(mockContentData);
-        // assert
-        expect(mockHeaderService.hideHeader).toHaveBeenCalled();
-        setTimeout(() => {
-            expect(mockContentPlayerHandler.launchContentPlayer).toHaveBeenCalledWith(
-                mockContentData.content,
-                true,
-                false,
-                mockContentInfo,
-                false,
-                true
-            );
-            done();
-        }, 0);
-    });
 
-
-    it('should generate Interact Telemetry when playContentClicked and streaming true', () => {
+    it('should prepare the telemetry details and NavigationExtras then call playContent()', () => {
         // arrange
-        // act
-        collectionDetailEtbPage.generateInteractTelemetry(true, mockContentInfo.telemetryObject, mockContentInfo.rollUp, undefined);
-        // assert
-        expect(mocktelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-            InteractType.TOUCH,
-            InteractSubtype.PLAY_ONLINE,
-            Environment.HOME,
-            PageId.COLLECTION_DETAIL,
-            mockContentInfo.telemetryObject,
-            undefined,
-            mockContentInfo.rollUp,
-            undefined
-        );
-
-    });
-
-    it('should generate Interact Telemetry when playContentClicked and streaming false', () => {
-        // act
-        collectionDetailEtbPage.generateInteractTelemetry(false, mockContentInfo.telemetryObject, mockContentInfo.rollUp, undefined);
-        // assert
-        expect(mocktelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-            InteractType.TOUCH,
-            InteractSubtype.PLAY_FROM_DEVICE,
-            Environment.HOME,
-            PageId.COLLECTION_DETAIL,
-            mockContentInfo.telemetryObject,
-            undefined,
-            mockContentInfo.rollUp,
-            undefined
-        );
-
-    });
-
-    it('should play the content and content is locally available', (done) => {
-        // arrange
-        jest.spyOn(ContentUtil, 'getTelemetryObject').mockReturnValue(
-            new TelemetryObject(mockContentData.content.identifier,
-                mockContentData.content.contentData.contentType, mockContentData.content.contentData.pkgVersion));
-        mockContentPlayerHandler.launchContentPlayer = jest.fn();
-        mockContentData.content.isAvailableLocally = true;
-        mockContentData.content.mimeType = 'application/vnd.ekstep.h5p-archive';
-        mockCommonUtilService.networkInfo.isNetworkAvailable = true;
+        mockContentPlayerHandler.playContent = jest.fn();
+        collectionDetailEtbPage.corRelationList = [{ id: 'sample_id', type: 'sample_type' }];
         // act
         collectionDetailEtbPage.playContent(mockContentData);
         // assert
-        setTimeout(() => {
-            expect(mockContentPlayerHandler.launchContentPlayer).toHaveBeenCalledWith(
-                mockContentData.content,
-                false,
-                true,
-                mockContentInfo,
-                false,
-                true
-            );
-            done();
-        }, 0);
+        expect(mockContentPlayerHandler.playContent).toHaveBeenCalled();
     });
 
     describe('share()', () => {
@@ -468,7 +389,7 @@ describe('collectionDetailEtbPage', () => {
     });
 
     describe('showDeletePopOver()', () => {
-        const mockTelemetryObject = new TelemetryObject('do_12345', ContentType.TEXTBOOK, '1');
+        const mockTelemetryObject = new TelemetryObject('do_12345', CsContentType.TEXTBOOK, '1');
         const mockCorRelationList = [];
         const mockObjRollup = { l1: 'do_12345' };
         mockContentDeleteHandler.contentDeleteCompleted$ = of({});
@@ -501,7 +422,7 @@ describe('collectionDetailEtbPage', () => {
     });
 
     describe('showDownloadConfirmationAlert()', () => {
-        const mockTelemetryObject = new TelemetryObject('do_12345', ContentType.TEXTBOOK, '1');
+        const mockTelemetryObject = new TelemetryObject('do_12345', CsContentType.TEXTBOOK, '1');
         const mockCorRelationList = [];
         const mockObjRollup = { l1: 'do_12345' };
         mockPopoverController.create = jest.fn(() => (Promise.resolve({
@@ -585,7 +506,7 @@ describe('collectionDetailEtbPage', () => {
     });
 
     describe('toggleGroup', () => {
-        const mockTelemetryObject = new TelemetryObject('do_12345', ContentType.TEXTBOOK, '1');
+        const mockTelemetryObject = new TelemetryObject('do_12345', CsContentType.TEXTBOOK, '1');
         it('should scroll the page', () => {
             // arrange
             const group = {}, content = {}, openCarousel = false;
@@ -605,7 +526,7 @@ describe('collectionDetailEtbPage', () => {
                 mockTelemetryObject,
                 values,
                 {},
-                undefined
+                []
             );
         });
 
@@ -638,7 +559,7 @@ describe('collectionDetailEtbPage', () => {
                 mockTelemetryObject,
                 values,
                 {},
-                undefined
+                []
             );
         });
     });
@@ -671,11 +592,11 @@ describe('collectionDetailEtbPage', () => {
     });
 
     describe('handleBackButton', () => {
-        const mockTelemetryObject = new TelemetryObject('do_12345', ContentType.TEXTBOOK, '1');
+        const mockTelemetryObject = new TelemetryObject('do_12345', CsContentType.TEXTBOOK, '1');
         it('should be handle device back button', () => {
             // arrange
             collectionDetailEtbPage.objId = 'do_12345';
-            collectionDetailEtbPage.objType = ContentType.TEXTBOOK;
+            collectionDetailEtbPage.objType = CsContentType.TEXTBOOK;
             collectionDetailEtbPage.objVer = '1';
             mocktelemetryGeneratorService.generateEndTelemetry = jest.fn();
             collectionDetailEtbPage.telemetryObject = mockTelemetryObject;
@@ -688,13 +609,13 @@ describe('collectionDetailEtbPage', () => {
             collectionDetailEtbPage.handleBackButton();
             // assert
             expect(mocktelemetryGeneratorService.generateEndTelemetry).toHaveBeenCalledWith(
-                ContentType.TEXTBOOK,
+                CsContentType.TEXTBOOK,
                 Mode.PLAY,
                 PageId.COLLECTION_DETAIL,
                 Environment.HOME,
                 mockTelemetryObject,
                 {},
-                undefined
+                []
             );
             expect(mocktelemetryGeneratorService.generateEndTelemetry).toHaveBeenCalledWith(
                 'qr',
@@ -703,7 +624,7 @@ describe('collectionDetailEtbPage', () => {
                 Environment.HOME,
                 { id: 'do-123', type: 'qr', version: '' },
                 undefined,
-                undefined
+                []
             );
         });
 
@@ -722,20 +643,20 @@ describe('collectionDetailEtbPage', () => {
             collectionDetailEtbPage.handleBackButton();
             // assert
             expect(mocktelemetryGeneratorService.generateEndTelemetry).toHaveBeenCalledWith(
-                ContentType.TEXTBOOK,
+               CsPrimaryCategory.DIGITAL_TEXTBOOK,
                 Mode.PLAY,
                 PageId.COLLECTION_DETAIL,
                 Environment.HOME,
                 { id: 'do_12345', type: undefined, version: '1' },
                 {},
-                undefined
+                []
             );
         });
 
         it('should be handle device back button if shouldGenerateEndTelemetry is false', () => {
             // arrange
             collectionDetailEtbPage.objId = 'do_12345';
-            collectionDetailEtbPage.objType = ContentType.TEXTBOOK;
+            collectionDetailEtbPage.objType = CsContentType.TEXTBOOK;
             collectionDetailEtbPage.objVer = '1';
             mocktelemetryGeneratorService.generateEndTelemetry = jest.fn();
             collectionDetailEtbPage.telemetryObject = mockTelemetryObject;
@@ -744,13 +665,13 @@ describe('collectionDetailEtbPage', () => {
             collectionDetailEtbPage.handleBackButton();
             // assert
             expect(mocktelemetryGeneratorService.generateEndTelemetry).toHaveBeenCalledWith(
-                ContentType.TEXTBOOK,
+                CsContentType.TEXTBOOK,
                 Mode.PLAY,
                 PageId.COLLECTION_DETAIL,
                 Environment.HOME,
                 mockTelemetryObject,
                 {},
-                undefined
+                []
             );
         });
     });
@@ -771,7 +692,7 @@ describe('collectionDetailEtbPage', () => {
             Environment.HOME,
             false,
             'do_212911645382959104165',
-            undefined
+            []
         );
     });
 
@@ -780,7 +701,8 @@ describe('collectionDetailEtbPage', () => {
             // arrange
             const content = {
                 identifier: 'do_212911645382959104165',
-                contentData: { licenseDetails: undefined },
+                primaryCategory: 'Digital Textbook',
+                contentData: { primaryCategory: 'Digital Textbook', licenseDetails: undefined, attributions: ['sample-3', 'sample-1'] },
                 isAvailableLocally: false,
                 children: { identifier: 'do_212911645382959104166' }
             };
@@ -788,19 +710,12 @@ describe('collectionDetailEtbPage', () => {
             mocktelemetryGeneratorService.generatefastLoadingTelemetry = jest.fn();
             mockContentService.getContentHeirarchy = jest.fn(() => of(content));
             jest.spyOn(collectionDetailEtbPage, 'importContentInBackground').mockReturnValue();
-            const mockTelemetryObject = new TelemetryObject('do_212911645382959104165', ContentType.COURSE, undefined);
+            const mockTelemetryObject = new TelemetryObject('do_212911645382959104165', 'Digital Textbook', undefined);
             // act
             collectionDetailEtbPage.setContentDetails('do_212911645382959104165', true).then(() => {
                 // assert
+                expect(collectionDetailEtbPage.contentDetail.contentData.attributions).toBe('sample-1, sample-3');
                 expect(mockContentService.getContentDetails).toHaveBeenCalled();
-                expect(mocktelemetryGeneratorService.generatefastLoadingTelemetry).toHaveBeenCalledWith(
-                    InteractSubtype.FAST_LOADING_INITIATED,
-                    PageId.COLLECTION_DETAIL,
-                    mockTelemetryObject,
-                    undefined,
-                    {},
-                    undefined
-                );
                 expect(mockContentService.getContentHeirarchy).toHaveBeenCalled();
                 done();
             });
@@ -1099,7 +1014,7 @@ describe('collectionDetailEtbPage', () => {
             // arrange
             const content = {
                 identifier: 'do-123',
-                contentData: { name: 'test' },
+                contentData: { name: 'test',  primaryCategory: 'Digital Textbook' },
                 children: [{ identifier: 'sample-id' }]
             };
             collectionDetailEtbPage.cardData = {
@@ -1108,7 +1023,8 @@ describe('collectionDetailEtbPage', () => {
             mocktextbookTocService.textbookIds = {
                 contentId: 'sample-content-id',
                 rootUnitId: 'sample-id',
-                unit: undefined
+                unit: undefined,
+                content: undefined
             };
             mockContentService.getChildContents = jest.fn(() => of(content));
             collectionDetailEtbPage.activeMimeTypeFilter = ['some'];
@@ -1118,11 +1034,6 @@ describe('collectionDetailEtbPage', () => {
             mockchangeDetectionRef.detectChanges = jest.fn();
             collectionDetailEtbPage.isDepthChild = false;
             jest.spyOn(collectionDetailEtbPage, 'getContentsSize').mockReturnValue();
-            collectionDetailEtbPage.filteredItemsQueryList = [{
-                nativeElement: {
-                    id: 'sample-id'
-                }
-            }] as any;
             const clases = new Set();
             jest.spyOn(collectionDetailEtbPage, 'toggleGroup').mockReturnValue();
             collectionDetailEtbPage.stickyPillsRef = {
@@ -1131,10 +1042,11 @@ describe('collectionDetailEtbPage', () => {
                     classList: clases
                 }
             };
-            document.getElementById = jest.fn(() => ({ scrollIntoView: jest.fn() })) as any;
+            window['scrollWindow'] = {getScrollElement: () => Promise.resolve({scrollTo: jest.fn()})};
+            document.getElementById = jest.fn(() => ({scrollIntoView: jest.fn()})) as any;
             mocktextbookTocService.resetTextbookIds = jest.fn();
             mocktelemetryGeneratorService.generateInteractTelemetry = jest.fn();
-            const mockTelemetryObject = new TelemetryObject('do_212911645382959104165', 'Course', undefined);
+            const mockTelemetryObject = new TelemetryObject('do_212911645382959104165', 'Digital Textbook', undefined);
             // act
             collectionDetailEtbPage.setChildContents();
             // assert
@@ -1142,18 +1054,7 @@ describe('collectionDetailEtbPage', () => {
             setTimeout(() => {
                 expect(mockchangeDetectionRef.detectChanges).toHaveBeenCalled();
                 expect(collectionDetailEtbPage.childrenData).toBeTruthy();
-                expect(document.getElementById).toHaveBeenCalled();
-                expect(mocktextbookTocService.resetTextbookIds).toHaveBeenCalled();
-                expect(mocktelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-                    InteractType.OTHER,
-                    InteractSubtype.IMPORT_COMPLETED,
-                    Environment.HOME,
-                    PageId.COLLECTION_DETAIL,
-                    mockTelemetryObject,
-                    undefined,
-                    {},
-                    undefined
-                );
+                // expect(mocktextbookTocService.resetTextbookIds).toHaveBeenCalled();
                 done();
             }, 10);
         });
@@ -1171,17 +1072,13 @@ describe('collectionDetailEtbPage', () => {
             mocktextbookTocService.textbookIds = {
                 contentId: undefined,
                 rootUnitId: undefined,
-                unit: undefined
+                unit: undefined,
+                content: undefined
             };
             mockContentService.getChildContents = jest.fn(() => of(content));
             collectionDetailEtbPage.activeMimeTypeFilter = ['all'];
             mockchangeDetectionRef.detectChanges = jest.fn();
             collectionDetailEtbPage.isDepthChild = true;
-            collectionDetailEtbPage.filteredItemsQueryList = [{
-                nativeElement: {
-                    id: 'sample-id'
-                }
-            }] as any;
             jest.spyOn(collectionDetailEtbPage, 'toggleGroup').mockReturnValue();
             // act
             collectionDetailEtbPage.setChildContents();
@@ -1204,18 +1101,14 @@ describe('collectionDetailEtbPage', () => {
             mocktextbookTocService.textbookIds = {
                 contentId: undefined,
                 rootUnitId: undefined,
-                unit: undefined
+                unit: undefined,
+                content: undefined
             };
             mockContentService.getChildContents = jest.fn(() => of(content));
             collectionDetailEtbPage.activeMimeTypeFilter = ['all'];
             mockchangeDetectionRef.detectChanges = jest.fn();
             collectionDetailEtbPage.isDepthChild = false;
             jest.spyOn(collectionDetailEtbPage, 'getContentsSize').mockReturnValue();
-            collectionDetailEtbPage.filteredItemsQueryList = [{
-                nativeElement: {
-                    id: 'sample-id'
-                }
-            }] as any;
             jest.spyOn(collectionDetailEtbPage, 'toggleGroup').mockReturnValue();
             // act
             collectionDetailEtbPage.setChildContents();
@@ -1231,12 +1124,14 @@ describe('collectionDetailEtbPage', () => {
                 identifier: 'do-123',
                 contentData: {
                     name: 'test',
-                    identifier: 'do-234'
+                    identifier: 'do-234',
+                    downloadUrl: 'sample-dowload-url'
                 },
                 children: [{
                     contentData: {
                         name: 'test',
-                        identifier: 'do-234'
+                        identifier: 'do-234',
+                        downloadUrl: 'sample-dowload-url'
                     }
                 }],
                 isAvailableLocally: false,
@@ -1274,52 +1169,34 @@ describe('collectionDetailEtbPage', () => {
     describe('navigateToDetailsPage', () => {
         it('should go to enroll-course-details page if contentType is course', () => {
             // arrange
-            const content = { identifier: 'do-123', contentType: ContentType.COURSE }, depth = 2;
+            const content = { identifier: 'do-123', contentType: CsContentType.COURSE }, depth = 2;
             mockzone.run = jest.fn((fn) => fn());
             mockrouter.navigate = jest.fn(() => Promise.resolve(true));
+            collectionDetailEtbPage.corRelationList = [{ id: 'sample_id', type: 'sample_type' }];
+            const corRelationData = { id: 'do_id', type: 'OrgId' };
             // act
-            collectionDetailEtbPage.navigateToDetailsPage(content, depth);
+            collectionDetailEtbPage.navigateToDetailsPage(content, depth, corRelationData);
             // assert
             expect(mockzone.run).toHaveBeenCalled();
-            expect(mockrouter.navigate).toHaveBeenCalled();
-        });
-
-        it('should go to collection-detail-etb page if mimeType is COLLECTION', () => {
-            // arrange
-            const content = { identifier: 'do-123', mimeType: MimeType.COLLECTION }, depth = 2;
-            mockzone.run = jest.fn((fn) => fn());
-            mockrouter.navigate = jest.fn(() => Promise.resolve(true));
-            // act
-            collectionDetailEtbPage.navigateToDetailsPage(content, depth);
-            // assert
-            expect(mockzone.run).toHaveBeenCalled();
-            expect(mockrouter.navigate).toHaveBeenCalled();
+            expect(mockNavigationService.navigateToTrackableCollection).toHaveBeenCalled();
         });
 
 
         it('should go to content-details page', () => {
             // arrange
-            const content = { identifier: 'do-123' }, depth = 2;
+            const content = { identifier: 'do-123', contentType: 'learning resource' }, depth = 2;
             mockzone.run = jest.fn((fn) => fn());
             mockrouter.navigate = jest.fn(() => Promise.resolve(true));
+            collectionDetailEtbPage.corRelationList = [{ id: 'sample_id', type: 'sample_type' }];
+            const corRelationData = { id: 'do_id', type: 'OrgId' };
             // act
-            collectionDetailEtbPage.navigateToDetailsPage(content, depth);
+            collectionDetailEtbPage.navigateToDetailsPage(content, depth, corRelationData);
             // assert
             expect(mockzone.run).toHaveBeenCalled();
-            expect(mockrouter.navigate).toHaveBeenCalled();
+            expect(mockNavigationService.navigateToContent).toHaveBeenCalled();
         });
     });
 
-    it('should navigate To ContentPage', () => {
-        // arrange
-        const content = { identifier: 'do-123' }, depth = 2;
-        mockrouter.navigate = jest.fn(() => Promise.resolve(true));
-        // act
-        collectionDetailEtbPage.navigateToContentPage(content, depth);
-        // assert
-        expect(mockrouter.navigate).toHaveBeenCalled();
-    });
-
     it('should reset all properties', () => {
         // arrange
         jest.spyOn(collectionDetailEtbPage, 'refreshHeader').mockReturnValue();
@@ -1773,7 +1650,7 @@ describe('collectionDetailEtbPage', () => {
             }));
             mockzone.run = jest.fn((fn) => fn());
             collectionDetailEtbPage.cardData = {
-                hierarchyInfo: [{identifier: 'do-1234'}]
+                hierarchyInfo: [{ identifier: 'do-1234' }]
             };
             // act
             collectionDetailEtbPage.subscribeSdkEvent();
@@ -1781,6 +1658,77 @@ describe('collectionDetailEtbPage', () => {
             expect(mockEventBusService.events).toHaveBeenCalled();
             expect(mockzone.run).toHaveBeenCalled();
         });
+    });
+
 
+    it('should hide deeplink progress loader', () => {
+        // arrange
+        collectionDetailEtbPage.identifier = 'sample_doId';
+        mockSbProgressLoader.hide = jest.fn();
+        // act
+        collectionDetailEtbPage.ionViewDidEnter();
+        // assert
+        expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({ id: 'sample_doId' });
+    });
+
+    describe('tocCardClick', () => {
+        it('should not go to details page if the click event is not trigered', () => {
+            // arrange
+            const event = {
+                event: {},
+                rollup: ['id_1', 'id_2']
+            };
+            collectionDetailEtbPage.navigateToDetailsPage = jest.fn();
+            // act
+            collectionDetailEtbPage.tocCardClick(event);
+            // assert
+            expect(collectionDetailEtbPage.navigateToDetailsPage).not.toHaveBeenCalled();
+        });
+
+
+        it('should navigate to content details page or course details page', () => {
+            // arrange
+            const event = {
+                event: new Event('click'),
+                data: {
+                    identifier: 'sample_identifier'
+                },
+                rollup: ['id_1', 'id_2']
+            };
+            collectionDetailEtbPage.corRelationList = [{ id: 'sample_id', type: 'sample_type' }];
+            mocktextbookTocService.setTextbookIds = jest.fn();
+            mocktelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            collectionDetailEtbPage.navigateToDetailsPage = jest.fn();
+            // act
+            collectionDetailEtbPage.tocCardClick(event);
+            // assert
+            expect(mocktextbookTocService.setTextbookIds).toHaveBeenCalled();
+            expect(mocktelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+            expect(collectionDetailEtbPage.navigateToDetailsPage).toHaveBeenCalled();
+        });
+    });
+
+    describe('playButtonClick', () => {
+        it('should navigate to player page', () => {
+            // arrange
+            const event = {
+                event: new Event('click'),
+                data: {
+                    identifier: 'sample_identifier'
+                },
+                rollup: ['id_1', 'id_2'],
+            };
+            mocktextbookTocService.setTextbookIds = jest.fn();
+            mocktelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            collectionDetailEtbPage.playContent = jest.fn();
+            collectionDetailEtbPage.corRelationList = [{ id: 'sample_id', type: 'sample_type' }];
+            // act
+            collectionDetailEtbPage.playButtonClick(event);
+            // assert
+            expect(mocktextbookTocService.setTextbookIds).toHaveBeenCalled();
+            expect(mocktelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+            expect(collectionDetailEtbPage.playContent).toHaveBeenCalled();
+        });
     });
+
 });
diff --git a/src/app/collection-detail-etb/collection-detail-etb.module.ts b/src/app/collection-detail-etb/collection-detail-etb.module.ts
index 083f82ee2..3701ba7dd 100644
--- a/src/app/collection-detail-etb/collection-detail-etb.module.ts
+++ b/src/app/collection-detail-etb/collection-detail-etb.module.ts
@@ -9,13 +9,11 @@ import { TranslateModule } from '@ngx-translate/core';
 import { ComponentsModule } from '../components/components.module';
 import { DirectivesModule } from '../../directives/directives.module';
 import { PipesModule } from '../../pipes/pipes.module';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
 
 import { CollectionDetailEtbPage } from './collection-detail-etb.page';
 import { RouterLinks } from '../app.constant';
 
-
-
-
 const routes: Routes = [
   {
     path: '',
@@ -35,6 +33,7 @@ const routes: Routes = [
     RouterModule.forChild(routes),
     TranslateModule.forChild(),
     ComponentsModule,
+    CommonConsumptionModule,
     DirectivesModule,
     PipesModule
   ],
diff --git a/src/app/collection-detail-etb/collection-detail-etb.page.html b/src/app/collection-detail-etb/collection-detail-etb.page.html
index 6d0c450ea..f4514f088 100644
--- a/src/app/collection-detail-etb/collection-detail-etb.page.html
+++ b/src/app/collection-detail-etb/collection-detail-etb.page.html
@@ -27,7 +27,7 @@
       <div class="sb-chapter-dd" (click)="openTextbookToc()">
         <span class="pull-left">{{stckyUnitTitle || ('SELECT_CHAPTER' | translate)}}</span>
         <span class="pull-right">
-          <ion-icon name="ios-arrow-dropright-circle"></ion-icon>
+          <ion-icon md="caret-forward-circle" ios="chevron-forward-circle"></ion-icon>
         </span>
       </div>
       <div class="sb-slider-pills-container">
@@ -51,177 +51,37 @@
     <div *ngIf="shouldPillsStick" style="height: 48px;"></div>
 
     <!-- Looping Inside Children Data Textbook -->
-    <section *ngIf="!showSheenAnimation && childrenData">
-      <div *ngIf="childrenData.length && !(filteredItemsQueryList?.changes | async)?.length">
-        <div class="heading">{{'NO_CONTENTS' | translate:{'%s': currentFilter } }}</div>
-        <div class="sub-heading">{{'NO_CONTENTS_MESSAGE' | translate}}</div>
-      </div>
-      <ng-container *ngFor="let item of childrenData;  let i = index;">
-        <ion-card class="sb-accordian-card" *ngIf="item | hasMimeType: activeMimeTypeFilter">
-          <div class="sticky-header-title-box" [attr.data-text]="item.contentData.name" [attr.data-render-level]="0"
-            [id]="item.mimeType === 'application/vnd.ekstep.content-collection' ? item.identifier : ''" #filteredItems>
-            <!-- new -->
-            <ion-grid class="sb-accordian-header">
-              <ion-row (click)="toggleGroup(i, item)" *ngIf="item?.children">
-                <ion-col size="11">
-                  <div class="sb-topic-text"> {{item?.contentData?.name}} </div>
-                </ion-col>
-                <ion-col size="1" *ngIf="!isGroupShown(i)">
-                  <div>
-                    <ion-icon class="sb-accordian-arrow" name="ios-arrow-down"></ion-icon>
-                  </div>
-                </ion-col>
-                <ion-col size="1" *ngIf="isGroupShown(i)">
-                  <div>
-                    <ion-icon class="sb-accordian-arrow" name="ios-arrow-up"></ion-icon>
-                  </div>
-                </ion-col>
-              </ion-row>
-              <ion-row
-                *ngIf="item?.contentData?.mimeType !== 'application/vnd.ekstep.content-collection' && !item?.children"
-                (click)="navigateToDetailsPage(item, depth + '.' + (i + 1))">
-                <ion-col size="1">
-                  <div>
-                    <ion-icon ios="ios-arrow-dropright-circle" md="md-arrow-dropright-circle"
-                      [ngClass]="{'sb-accordian-grey-icon': !commonUtilService.networkInfo.isNetworkAvailable && !item?.isAvailableLocally, 'sb-play-icon': commonUtilService.networkInfo.isNetworkAvailable || item?.isAvailableLocally}">
-                    </ion-icon>
-                  </div>
-                </ion-col>
-                <ion-col size="11">
-                  <div [ngClass]="{'sb-accordian-grey-text': !commonUtilService.networkInfo.isNetworkAvailable && !item?.isAvailableLocally,
-                  'sb-play-selected':item?.isAvailableLocally,'sb-play-unselected':!item?.isAvailableLocally}">
-                    {{item?.contentData?.name}}
-                    <span>
-                      <ion-icon class="sb-checkmark-icon" name="md-checkmark-circle" *ngIf="item?.isAvailableLocally">
-                      </ion-icon>
-                    </span>
-                  </div>
-                </ion-col>
-              </ion-row>
-            </ion-grid>
-            <div class="sb-hidden-content" *ngIf="isGroupShown(i) && (item?.children && item?.children?.length)">
-              <div class="box-align" *ngFor="let firstChildren of item?.children; let j = index;">
-                <div class="sb-topics-container  sb-topics-container-ftue">
-                  <app-collection-child [renderLevel]="1" [childData]="firstChildren" [index]="j" [depth]="depth"
-                    [activeMimeTypeFilter]="activeMimeTypeFilter" [isTextbookTocPage]="false"
-                    [corRelationList]="corRelationList" [isDepthChild]="isDepthChild" [breadCrumb]="breadCrumb"
-                    [rootUnitId]="item.identifier" [bookID]="identifier"></app-collection-child>
-                </div>
-              </div>
-            </div>
-          </div>
-        </ion-card>
-      </ng-container>
+    <section *ngIf="!showSheenAnimation && childrenData" class="textbook-accordian">
+      <sb-toc-item
+      [accordianConfig]="accordianConfig"
+      [type]="TocCardType.TRACKABLE"
+      [tocData]="collectionTocData"
+      [playBtnConfig]="playBtnConfig"
+      (tocCardClick)="tocCardClick($event)"
+      [activeMimeTypeFilter]="activeMimeTypeFilter"
+      [activeContent]="activeContent"
+      (playButtonClick)="playButtonClick($event)"
+      [trackableDefaultImage]="'assets/imgs/ic_courses_selected_joyful.svg'">
+    </sb-toc-item>
+
     </section>
   </div>
   <div *ngIf="contentDetail?.contentData?.author || contentDetail?.contentData?.organisation 
         ||contentDetail?.contentData?.license || licenseDetails || contentDetail?.contentData?.copyright">
     <div class="ion-padding-end">
-      <ion-card>
-        <div class="credit-label-padding">
-          <div class="font-14 view-credits" (click)="showLicensce()">
-            <span><strong>{{'CREDITS_LICENCE_INFO' | translate}}</strong></span>
-            <span *ngIf="showCredits">
-              <ion-icon name="ios-arrow-up"></ion-icon>
-            </span>
-            <span *ngIf="!showCredits">
-              <ion-icon name="ios-arrow-down"></ion-icon>
-            </span>
-          </div>
-        </div>
-        <div *ngIf="showCredits" class="showLicensce">
-          <div class="ion-padding">
-            <div *ngIf="contentDetail?.contentData?.author">
-              <ion-card-title class="font-12 subtitle-color label-margin-bottom">
-                <strong>{{'AUTHOR' | translate}}</strong>:
-              </ion-card-title>
-              <p>{{contentDetail?.contentData?.author}}</p>
-            </div>
-            <div *ngIf="contentDetail?.contentData?.creator">
-              <ion-card-title class="font-12 subtitle-color label-margin-bottom">
-                <strong>{{ 'CREATORS' | translate:{'%s': appName} }}</strong>:
-              </ion-card-title>
-              <p>{{contentDetail?.contentData?.creator}} </p>
-            </div>
-            <div *ngIf="contentDetail?.contentData?.organisation">
-              <ion-card-title class="font-12 subtitle-color label-margin-bottom">
-                <strong>{{ 'PUBLISHED_BY' | translate:{'%s': appName} }}</strong>:
-              </ion-card-title>
-              <p>{{contentDetail?.contentData?.organisation}} </p>
-            </div>
-            <div
-              *ngIf="contentDetail?.contentData?.contributors || contentDetail?.contentData?.creators || contentDetail?.contentData?.attributions">
-              <ion-card-title class="font-12 subtitle-color label-margin-bottom">
-                <strong>{{ 'ATTRIBUTIONS' | translate }}</strong>:
-              </ion-card-title>
-              <p>{{mergeProperties(['attributions', 'contributors', 'creators'])}}</p>
-            </div>
-            <div *ngIf="contentDetail?.contentData?.license && !licenseDetails">
-              <ion-card-title class="font-12 subtitle-color label-margin-bottom">
-                <strong>{{ 'LICENSE' | translate }}</strong>:
-              </ion-card-title>
-              <p>{{contentDetail?.contentData?.license}}</p>
-            </div>
-            <div *ngIf="licenseDetails" class="ion-padding-bottom">
-              <ion-card-title class="font-12 subtitle-color label-margin-bottom">
-                <strong>{{ 'LICENSE' | translate }}</strong>:
-              </ion-card-title>
-              <div>{{licenseDetails.name}}</div>
-              <div>{{licenseDetails.description}}</div>
-              <span (click)="openBrowser(licenseDetails.url)" class="sb-legal-url">{{licenseDetails.url}}</span>
-            </div>
-            <div *ngIf="contentDetail?.contentData?.copyright">
-
-              <ion-card-title class="font-12 subtitle-color label-margin-bottom">
-                <strong>{{ 'COPYRIGHT' | translate }}</strong>:
-              </ion-card-title>
-              <p>
-                {{contentDetail?.contentData?.copyright}}{{contentDetail?.contentData?.copyrightYear ? ", " + contentDetail?.contentData?.copyrightYear : ""}}
-              </p>
-            </div>
-          </div>
-          <!--training derived from section starts-->
-          <div class="origin-data" *ngIf="contentDetail?.contentData?.originData">
-            <div class="font-14 traning-derived-label-background ion-padding-bottom">
-              <span><strong>{{'CONTENT_DERIVED_FROM' | translate}}</strong></span>
-            </div>
-            <div class="ion-padding">
-              <div *ngIf="contentDetail?.contentData?.originData.name">
-                <ion-card-title class="font-12 subtitle-color label-margin-bottom">
-                  <strong> {{'ORIGINAL_CONTENT' | translate}}</strong>:
-                </ion-card-title>
-                <p>{{contentDetail?.contentData?.originData.name}}</p>
-              </div>
-              <div *ngIf="contentDetail?.contentData?.originData.author">
-
-                <ion-card-title class="font-12 subtitle-color label-margin-bottom">
-                  <strong>{{ 'ORIGINAL_AUTHOR' | translate }}</strong>:
-                </ion-card-title>
-                <p>{{contentDetail?.contentData?.originData.author}}</p>
-              </div>
-
-              <div *ngIf="contentDetail?.contentData?.originData.license">
-                <ion-card-title class="font-12 subtitle-color label-margin-bottom">
-                  <strong>{{ 'LICENSE' | translate }}</strong>:
-                </ion-card-title>
-                <p>{{contentDetail?.contentData?.originData.license}}</p>
-              </div>
-
-              <div *ngIf="contentDetail?.contentData?.originData.organisation">
-                <ion-card-title class="font-12 subtitle-color label-margin-bottom">
-                  <strong>{{ 'PUBLISHED_BY' | translate:{'%s': appName} }}</strong>:
-                </ion-card-title>
-                <p>{{contentDetail?.contentData?.originData.organisation[0]}}</p>
-              </div>
-            </div>
-          </div>
-          <!-- / training derived from section ends -->
-        </div>
-      </ion-card>
+      <app-license-card-component [content]="contentDetail?.contentData"
+                                  [licenseDetails]="licenseDetails"
+                                  [appName]="appName" [objRollup]="objRollup"
+                                  [corRelationList]="corRelationList"
+                                  [pageId]="pageId"></app-license-card-component>
     </div>
   </div>
 </ion-content>
 
+<div>
+  <add-activity-to-group [pageId]="pageId" [identifier]="identifier"></add-activity-to-group>
+</div>
+
 <ng-container *ngIf="trackDownloads$ | async; let downloads">
   <app-sb-download-popup *ngIf="downloads.queued.length"
     (cancelDownloadEmit)="cancelDownload($event)" 
diff --git a/src/app/collection-detail-etb/collection-detail-etb.page.scss b/src/app/collection-detail-etb/collection-detail-etb.page.scss
index 424279451..11833a529 100644
--- a/src/app/collection-detail-etb/collection-detail-etb.page.scss
+++ b/src/app/collection-detail-etb/collection-detail-etb.page.scss
@@ -17,11 +17,11 @@
   font-weight: bold;
   line-height: 19px;
   text-align: center;
-  color: #666666;
+  color: map-get($colors, granite_gray);
 }
 
 .sub-heading {
-  color: #666666;
+  color: map-get($colors, granite_gray);
   font-size: 12px;
   line-height: 17px;
   text-align: center;
@@ -72,7 +72,7 @@
     padding-bottom: 16px;
   }
 
-  background-color: #ffffff;
+  background-color: map-get($colors, white);
   height: 100%;
   z-index: 1000;
   opacity: 1 !important;
@@ -87,7 +87,7 @@ ion-card {
 }
 
 ion-card .card .card-md {
-  margin: 0px;
+  margin: 0;
 }
 
 .M0 {
@@ -95,7 +95,7 @@ ion-card .card .card-md {
 }
 
 .P15 {
-  padding: 15 !important;
+  padding: 15px !important;
 }
 
 .M5 {
@@ -131,8 +131,8 @@ ion-card .card .card-md {
 }
 
 .MLR0 {
-  margin-left: 0px !important;
-  margin-right: 0px !important;
+  margin-left: 0 !important;
+  margin-right: 0 !important;
 }
 
 .ML20 {
@@ -160,27 +160,27 @@ ion-card .card .card-md {
 }
 
 .yellow-gold {
-  color: #f8e71c;
+  color: map-get($colors, bright_yellow);
 }
 
 .font-blue {
-  color: #024f9d;
+  color: $blue;
   font-size: 30px;
 }
 
 .text-selected {
   padding: 4px;
-  color: #024f9d;
+  color: $blue;
   font-weight: bolder;
 }
 
 .text-unselected {
   padding: 4px;
-  color: #0a5cad;
+  color: map-get($colors, bright_blue);
 }
 
 .play-icon {
-  color: #00ba75;
+  color: map-get($colors, vivid_green);
   font-size: 30px;
 }
 
@@ -190,7 +190,7 @@ ion-card .card .card-md {
 
 .view-credits {
   span {
-    color: #024F9D;
+    color: $blue;
 
     ion-icon {
       padding: 0 0 4px 8px;
@@ -204,15 +204,15 @@ ion-card .card .card-md {
 
 .credit-label-padding {
   padding: 14px 14px 8px 14px;
-  background-color: #f2f2f2;
+  background-color: map-get($colors, white_f2);
 }
 
 .content-padding {
-  padding: 8px 8px 0px 8px;
+  padding: 8px 8px 0 8px;
 }
 
 .subtitle-color {
-  color: map-get($colors, textGrey);
+  color: map-get($colors, granite_gray);
 }
 
 .label-margin-bottom {
@@ -220,7 +220,7 @@ ion-card .card .card-md {
 }
 
 .traning-derived-label-background {
-  background-color: #f2f2f2;
+  background-color: map-get($colors, white_f2);
   padding: 8px 0px 8px 15px;
 }
 
@@ -241,39 +241,26 @@ ion-card .card .card-md {
 }
 
 .checkmark-icon {
-  color: #00ba75;
+  color: map-get($colors, vivid_green);
   font-size: 18px;
   margin-left: 5px;
 }
 
 .font-blue-text {
   padding: 4px;
-  color: #024f9d;
+  color: $blue;
 }
 
 .font-grey-text {
   //  padding: 4px;
-  color: #979797;
+  color: map-get($colors, dark_gray);
 }
 
 .grey-icon {
-  color: #979797;
+  color: map-get($colors, dark_gray);
   font-size: ($font-size-base + 4);
 }
 
-$newColors: (primary:#024f9d,
-  primary-light: #90c7ff,
-  secondary: #90c7ff,
-  secondary-light: #979797,
-  light-black: #515151,
-  light-grey: #979797,
-  white: #fff,
-  danger: #e55a28,
-  dark-danger:#db4437,
-  success: #008840,
-  yellow-gold: #f8e71c,
-  light-blue: #7fa3ff);
-
 .horizontal-scroll {
   display: flex;
   overflow-x: auto;
@@ -282,7 +269,7 @@ $newColors: (primary:#024f9d,
 .separator-dot {
   width: 4px;
   height: 4px;
-  background-color: #d8d8d8;
+  background-color: map-get($colors, light_silver);
   border-radius: 50%;
   display: inline-block;
   vertical-align: middle;
@@ -291,49 +278,40 @@ $newColors: (primary:#024f9d,
 .separator-line {
   height: 1px;
   opacity: 0.36;
-  background-color: #979797;
+  background-color: map-get($colors, dark_gray);
   width: 100%;
 }
 
 .white {
-  color: map-get($newColors, white);
-}
-
-.yellow-gold {
-  color: map-get($newColors, yellow-gold)
+  color: map-get($colors, white);
 }
 
 .light-black {
-  color: map-get($newColors, light-black);
+  color: map-get($colors, light_black_51);
 }
 
 .bg-white {
-  background-color: #fff;
+  background-color: map-get($colors, white);
 }
 
 .bg-sucess {
-  background-color: map-get($newColors, success);
+  background-color: $green;
 }
 
 .bg-primary {
-  background-color: map-get($newColors, primary);
+  background-color: $blue;
 }
 
 .bg-danger {
-  background-color: map-get($newColors, danger);
+  background-color: $orange;
 }
 
 .bg-dark-danger {
-  background-color: map-get($newColors, dark-danger);
+  background-color: $red;
 }
 
 .danger {
-  color: map-get($newColors, danger);
-}
-
-shadow {
-  margin: none;
-  box-shadow: 0 3px 5px 4px rgba(0, 0, 0, 0.05);
+  color: $orange;
 }
 
 //  Details card
@@ -353,7 +331,7 @@ shadow {
       grid-template-columns: 1fr;
       margin-right: 5px;
       padding: 10px;
-      font-size: 2 rem;
+      font-size: 2rem;
 
       .item {
         flex: 1 1 auto;
@@ -365,7 +343,6 @@ shadow {
 
     .left {
       overflow: hidden;
-      display: grid;
       grid-template-columns: 1fr;
       display: flex;
       flex-direction: column;
@@ -401,7 +378,7 @@ shadow {
       grid-template-columns: 1fr;
       margin-right: 5px;
       padding: 10px;
-      font-size: 2 rem;
+      font-size: 2rem;
     }
 
     .right {
@@ -421,7 +398,6 @@ shadow {
 
     .left {
       overflow: hidden;
-      display: grid;
       grid-template-columns: 1fr;
       display: flex;
       flex-direction: column;
@@ -441,15 +417,14 @@ shadow {
         display: -webkit-box;
         -webkit-line-clamp: 2;
         -webkit-box-orient: vertical;
-        margin: 0;
-        margin-bottom: 3px;
+        margin: 0 0 3px;
         padding: 0;
         font-weight: 500;
         font-style: normal;
         font-stretch: normal;
         line-height: normal;
         letter-spacing: -0.4px;
-        color: #333333;
+        color: map-get($colors, primary_black);
         height: 42px;
       }
 
@@ -460,7 +435,7 @@ shadow {
         font-stretch: normal;
         line-height: normal;
         letter-spacing: -0.4px;
-        color: #979797;
+        color: map-get($colors, dark_gray);
       }
     }
 
@@ -534,205 +509,12 @@ shadow {
   width: 100%;
 }
 
-.details-card {
-  border-radius: 2px;
-  box-shadow: 0 3px 5px 4px rgba(0, 0, 0, 0.05);
-  background-color: map-get($colors, white);
-
-  .content-unit {
-    display: grid;
-    //grid-gap: 13px;
-    grid-template-columns: 3fr .4fr;
-
-    .pull-right {
-      overflow: hidden;
-      display: grid;
-      grid-template-columns: 1fr;
-      margin-right: 5px;
-      padding: 10px;
-      font-size: 2rem;
-
-      .item {
-        flex: 1 1 auto;
-        justify-content: right;
-        align-items: center;
-        display: flex;
-      }
-    }
-
-    .left {
-      overflow: hidden;
-      display: grid;
-      grid-template-columns: 1fr;
-      display: flex;
-      flex-direction: column;
-      @include padding(15px, 0, 15px, 15px);
-
-      .item {
-        flex: 1 1 auto;
-        justify-content: left;
-        align-items: center;
-        display: flex;
-      }
-    }
-  }
-
-  .W-88 {
-    width: 88px;
-  }
-
-  .rating {
-    display: flex;
-    justify-content: flex-end;
-    align-items: end;
-  }
-
-  .content {
-    display: grid;
-    //grid-gap: 13px;
-    grid-template-columns: 2.9fr 1fr;
-
-    .pull-right {
-      overflow: hidden;
-      display: grid;
-      grid-template-columns: 1fr;
-      margin-right: 5px;
-      padding: 10px;
-      font-size: 2rem;
-    }
-
-    .right {
-      overflow: hidden;
-      display: grid;
-      grid-template-columns: 1fr;
-      padding: 15px;
-
-      //grid-template-rows: 1fr;
-      .img-container {
-        // background-color: grey;
-        width: 100%;
-        min-height: 54px;
-        max-height: 54px;
-      }
-    }
-
-    .left {
-      overflow: hidden;
-      display: grid;
-      grid-template-columns: 1fr;
-      display: flex;
-      flex-direction: column;
-      @include padding(15px, 0, 15px, 15px);
-
-      .item {
-        flex: 1 1 auto;
-        justify-content: left;
-        align-items: center;
-        display: flex;
-      }
-
-      .title {
-        width: 100%;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        display: -webkit-box;
-        -webkit-line-clamp: 2;
-        -webkit-box-orient: vertical;
-        margin: 0;
-        margin-bottom: 3px;
-        padding: 0;
-        font-weight: 500;
-        font-style: normal;
-        font-stretch: normal;
-        line-height: normal;
-        letter-spacing: -0.4px;
-        color: #333333;
-        height: 42px;
-      }
-
-      .info {
-        font-size: 12px;
-        font-weight: 500;
-        font-style: normal;
-        font-stretch: normal;
-        line-height: normal;
-        letter-spacing: -0.4px;
-        color: #979797;
-      }
-    }
-
-    &.single-column {
-      display: grid;
-      grid-template-columns: 1fr;
-
-      .left {
-        @include padding(15px);
-      }
-
-      .tag {
-        border-radius: 2px;
-        @include padding(3px, 7px);
-        color: map-get($colors, light-blue);
-        font-size: 10px;
-        font-weight: normal;
-        font-style: normal;
-        font-stretch: normal;
-        line-height: 1.1;
-        letter-spacing: -0.4px;
-        border: 1px solid map-get($colors, light-blue);
-        display: inline-flex;
-
-        &:not(:last-child) {
-          @include margin(null, 10px, null, null);
-        }
-      }
-    }
-
-  }
-
-  .btn-caption-container {
-    display: inline-grid;
-    grid-template-columns: 1fr;
-    @include margin(null, 20px, null, null);
-
-    &:last-child {
-      @include margin(null, 0, null, null);
-    }
-
-    .btn-caption {
-      color: map-get($colors, secondary-light);
-      text-transform: capitalize;
-      font-weight: 500;
-      font-style: normal;
-      font-stretch: normal;
-      line-height: normal;
-      letter-spacing: -0.3px;
-      display: inline-block;
-      text-align: center;
-    }
-
-    .action-btn {
-      height: auto;
-
-      ion-icon {
-        line-height: 30px;
-
-      }
-
-    }
-  }
-}
-
-.scroll-content {
-  padding-bottom: 20% !important;
-}
-
 .sb-topics-containe {
   padding-right: 5%;
 }
 
 .sb-hidden-content {
-  background-color: #F2F2F2;
+  background-color: map-get($colors, white_f2);
   height: 34.15%;
   width: 100%;
   border-radius: 0 0 2px 2px;
@@ -744,7 +526,7 @@ shadow {
   height: 6.1%;
   width: 100%;
   border-radius: 2px;
-  background-color: #FFFFFF;
+  background-color: map-get($colors, white);
   box-shadow: 0 4px 7px 0 rgba(0, 0, 0, 0.1);
 }
 
@@ -771,7 +553,7 @@ shadow {
   @include clearfix;
   color: $blue;
   padding: $base-block-space;
-  background-color: #fff;
+  background-color: map-get($colors, white);
 
   .pull-left {
     line-height: 30px;
@@ -782,7 +564,7 @@ shadow {
     width: 24px;
     border-radius: 12px;
     font-size: 28px;
-    color: #7EAEDE;
+    color: map-get($colors, light-blue);
   }
 }
 
@@ -810,4 +592,15 @@ shadow {
   .sb-collection-child-ftue {
     margin-left: 8px;
   }
+}
+
+.drop-arrow{
+  border-radius: 50%;
+  background-color: map-get($colors, white);
+  height: 24px;
+  width: 24px;
+  padding-top: 8px;
+  img{
+    height: 8px;
+  }
 }
\ No newline at end of file
diff --git a/src/app/collection-detail-etb/collection-detail-etb.page.ts b/src/app/collection-detail-etb/collection-detail-etb.page.ts
index a7b27c790..95e66c533 100644
--- a/src/app/collection-detail-etb/collection-detail-etb.page.ts
+++ b/src/app/collection-detail-etb/collection-detail-etb.page.ts
@@ -1,43 +1,68 @@
-import { TextbookTocService } from './textbook-toc-service';
+import { Location } from '@angular/common';
 import {
-  Component, Inject, NgZone, OnInit, ViewChild, ViewEncapsulation, QueryList, ViewChildren,
-  ElementRef, ChangeDetectorRef
+  ChangeDetectorRef,
+  Component,
+  ElementRef,
+  Inject,
+  NgZone,
+  OnInit,
+  ViewChild,
+  ViewEncapsulation
 } from '@angular/core';
-import isObject from 'lodash/isObject';
+import { Router } from '@angular/router';
 import { FileSizePipe } from '@app/pipes/file-size/file-size';
-import { IonContent as iContent } from '@ionic/angular';
-import {
-  Events, Platform, PopoverController,
-} from '@ionic/angular';
+import { ContentDeleteHandler } from '@app/services/content/content-delete-handler';
+import { ContentInfo } from '@app/services/content/content-info';
+import { ContentPlayerHandler } from '@app/services/content/player/content-player-handler';
+import { NavigationService } from '@app/services/navigation-handler.service';
+import { ContentUtil } from '@app/util/content-util';
+import { IonContent as iContent, Platform, PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { CsPrimaryCategory } from '@project-sunbird/client-services/services/content';
+import { ExpandBehavior, ExpandMode, IAccordianConfig, IButtonConfig, TocCardType } from '@project-sunbird/common-consumption-v8';
+import isObject from 'lodash/isObject';
+import { Observable, Subscription } from 'rxjs';
+import { share } from 'rxjs/operators';
 import {
-  Content, ContentAccess, ContentAccessStatus, ContentDetailRequest, ContentEventType,
-  ContentImport, ContentImportCompleted, ContentImportRequest,
-  ContentImportResponse, ContentImportStatus, ContentMarkerRequest, ContentService, ContentUpdate, CorrelationData,
-  DownloadEventType, DownloadProgress, EventsBusEvent, EventsBusService, MarkerType, Profile, ProfileService,
-  Rollup, StorageService, TelemetryErrorCode, TelemetryObject, DownloadService, DownloadTracking
+  Content,
+  ContentAccess,
+  ContentAccessStatus,
+  ContentDetailRequest,
+  ContentEventType,
+  ContentImport,
+  ContentImportCompleted,
+  ContentImportRequest,
+  ContentImportResponse,
+  ContentImportStatus,
+  ContentMarkerRequest,
+  ContentService,
+  ContentUpdate,
+  CorrelationData,
+  DownloadEventType,
+  DownloadProgress,
+  DownloadService,
+  DownloadTracking,
+  EventsBusEvent,
+  EventsBusService,
+  MarkerType,
+  Profile,
+  ProfileService,
+  Rollup,
+  StorageService,
+  TelemetryErrorCode,
+  TelemetryObject
 } from 'sunbird-sdk';
-import {
-  Environment, ErrorType, ImpressionType, InteractSubtype, InteractType, Mode, PageId, ID
-} from '../../services/telemetry-constants';
-import { Subscription, Observable } from 'rxjs';
-import { ContentType, EventTopics, MimeType, RouterLinks, ShareItemType } from '../../app/app.constant';
+import { EventTopics, RouterLinks, ShareItemType } from '../../app/app.constant';
 import {
   AppGlobalService, AppHeaderService, CommonUtilService,
   TelemetryGeneratorService
 } from '../../services';
-import { Location } from '@angular/common';
-
+import { SbProgressLoader } from '../../services/sb-progress-loader.service';
+import { CorReleationDataType, Environment, ErrorType, ImpressionType, InteractSubtype, InteractType, Mode, PageId } from '../../services/telemetry-constants';
+import { CollectionChildComponent, ConfirmAlertComponent } from '../components';
 import { SbSharePopupComponent } from '../components/popups/sb-share-popup/sb-share-popup.component';
-
-import {
-  ConfirmAlertComponent
-} from '../components';
-import { Router, NavigationExtras } from '@angular/router';
-import { ContentUtil } from '@app/util/content-util';
-import { tap, share } from 'rxjs/operators';
-import { ContentPlayerHandler } from '@app/services/content/player/content-player-handler';
-import { ContentInfo } from '@app/services/content/content-info';
-import { ContentDeleteHandler } from '@app/services/content/content-delete-handler';
+import { TextbookTocService } from './textbook-toc-service';
+import { TagPrefixConstants } from '@app/services/segmentation-tag/segmentation-tag.service';
 
 @Component({
   selector: 'app-collection-detail-etb',
@@ -47,8 +72,6 @@ import { ContentDeleteHandler } from '@app/services/content/content-delete-handl
 })
 export class CollectionDetailEtbPage implements OnInit {
 
-  @ViewChildren('filteredItems') public filteredItemsQueryList: QueryList<any>;
-
   facets: any;
   selected: boolean;
   isSelected: boolean;
@@ -63,11 +86,11 @@ export class CollectionDetailEtbPage implements OnInit {
   mimeTypes = [
     { name: 'ALL', selected: true, value: ['all'], iconNormal: '', iconActive: '' },
     {
-      name: 'VIDEOS', value: ['video/mp4', 'video/x-youtube', 'video/webm'], iconNormal: './assets/imgs/play.svg',
+      name: 'VIDEO', value: ['video/mp4', 'video/x-youtube', 'video/webm'], iconNormal: './assets/imgs/play.svg',
       iconActive: './assets/imgs/play-active.svg'
     },
     {
-      name: 'DOCS', value: ['application/pdf', 'application/epub', 'application/msword'], iconNormal: './assets/imgs/doc.svg',
+      name: 'DOC', value: ['application/pdf', 'application/epub', 'application/msword'], iconNormal: './assets/imgs/doc.svg',
       iconActive: './assets/imgs/doc-active.svg'
     },
     {
@@ -205,7 +228,8 @@ export class CollectionDetailEtbPage implements OnInit {
   public shouldGenerateEndTelemetry = false;
   public source = '';
   isChildClickable = false;
-  shownGroup = null;
+  hiddenGroups = new Set();
+  shownGroups = undefined;
   content: any;
   data: any;
   isChild = false;
@@ -218,8 +242,9 @@ export class CollectionDetailEtbPage implements OnInit {
   currentFilter = 'ALL';
   localImage = '';
   appName: any;
-  @ViewChild(iContent) ionContent: iContent;
-  @ViewChild('stickyPillsRef') stickyPillsRef: ElementRef;
+  @ViewChild(iContent, { static: false }) ionContent: iContent;
+  @ViewChild('stickyPillsRef', { static: false }) stickyPillsRef: ElementRef;
+  @ViewChild('collectionChildComp', { static: false }) collectionChildComp: CollectionChildComponent;
   private eventSubscription: Subscription;
 
   showDownload: boolean;
@@ -234,9 +259,7 @@ export class CollectionDetailEtbPage implements OnInit {
   public telemetryObject: TelemetryObject;
   public rollUpMap: { [key: string]: Rollup } = {};
   private previousHeaderBottomOffset?: number;
-  lastContentPlayed: string;
   isContentPlayed = false;
-  playingContent: Content;
   contentDeleteObservable: any;
 
   _licenseDetails: any;
@@ -250,6 +273,15 @@ export class CollectionDetailEtbPage implements OnInit {
       this._licenseDetails = val;
     }
   }
+  pageId = PageId.COLLECTION_DETAIL;
+  collectionTocData: Content;
+  TocCardType = TocCardType;
+  activeContent;
+  playBtnConfig: IButtonConfig;
+  accordianConfig: IAccordianConfig = {
+    expandMode: ExpandMode.SINGLE,
+    expandBehavior: ExpandBehavior.EXPAND_FIRST
+  };
 
   constructor(
     @Inject('CONTENT_SERVICE') private contentService: ContentService,
@@ -263,6 +295,7 @@ export class CollectionDetailEtbPage implements OnInit {
     private platform: Platform,
     private appGlobalService: AppGlobalService,
     private commonUtilService: CommonUtilService,
+    private navService: NavigationService,
     private telemetryGeneratorService: TelemetryGeneratorService,
     private fileSizePipe: FileSizePipe,
     private headerService: AppHeaderService,
@@ -272,6 +305,7 @@ export class CollectionDetailEtbPage implements OnInit {
     private textbookTocService: TextbookTocService,
     private contentPlayerHandler: ContentPlayerHandler,
     private contentDeleteHandler: ContentDeleteHandler,
+    private sbProgressLoader: SbProgressLoader
   ) {
     this.objRollup = new Rollup();
     this.defaultAppIcon = 'assets/imgs/ic_launcher.png';
@@ -289,7 +323,7 @@ export class CollectionDetailEtbPage implements OnInit {
     this.batchDetails = extras.batchDetails;
     this.pageName = extras.pageName;
     this.depth = extras.depth;
-    this.corRelationList = extras.corRelation;
+    this.corRelationList = extras.corRelation || [];
     this.shouldGenerateEndTelemetry = extras.shouldGenerateEndTelemetry;
     this.source = extras.source;
     this.fromCoursesPage = extras.fromCoursesPage;
@@ -305,16 +339,31 @@ export class CollectionDetailEtbPage implements OnInit {
       this.isDepthChild = false;
     }
     this.identifier = this.cardData.contentId || this.cardData.identifier;
+    window['segmentation'].SBTagService.pushTag(
+      window['segmentation'].SBTagService.getTags(TagPrefixConstants.CONTENT_ID) ? this.identifier : [this.identifier],
+      TagPrefixConstants.CONTENT_ID,
+      window['segmentation'].SBTagService.getTags(TagPrefixConstants.CONTENT_ID) ? false : true
+    );
   }
 
   ngOnInit() {
+    this.playBtnConfig = {
+      label: this.commonUtilService.translateMessage('PLAY'),
+      show: true
+    };
+
     this.commonUtilService.getAppName().then((res) => { this.appName = res; });
     window['scrollWindow'] = this.ionContent;
-    this.trackDownloads$ = this.downloadService.trackDownloads({ groupBy: { fieldPath: 'rollUp.l1', value: this.identifier } }).pipe(
-      share());
+
+    if(window['device'].platform.toLowerCase() !== "ios") {
+      this.trackDownloads$ = this.downloadService.trackDownloads({ groupBy: { fieldPath: 'rollUp.l1', value: this.identifier } }).pipe(
+        share());
+    }
+    
   }
 
   ionViewWillEnter() {
+    this.headerService.showStatusBar();
     this.registerDeviceBackButton();
     this.zone.run(() => {
       this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
@@ -325,7 +374,8 @@ export class CollectionDetailEtbPage implements OnInit {
       this.headerConfig.showHeader = false;
       this.headerConfig.showBurgerMenu = false;
       this.headerService.updatePageConfig(this.headerConfig);
-      this.shownGroup = null;
+      this.hiddenGroups.clear();
+      this.shownGroups = undefined;
       this.assignCardData();
       this.resetVariables();
       this.setContentDetails(this.identifier, true);
@@ -345,6 +395,10 @@ export class CollectionDetailEtbPage implements OnInit {
     });
   }
 
+  ionViewDidEnter() {
+    this.sbProgressLoader.hide({ id: this.identifier });
+  }
+
   private assignCardData() {
     if (!this.didViewLoad) {
       this.objRollup = ContentUtil.generateRollUp(this.cardData.hierarchyInfo, this.cardData.identifier);
@@ -359,7 +413,8 @@ export class CollectionDetailEtbPage implements OnInit {
 
   refreshContentDetails(data) {
     this.resetVariables();
-    this.shownGroup = null;
+    this.shownGroups = undefined;
+    this.hiddenGroups.clear();
     this.setExtrasData(data);
     this.didViewLoad = false;
     this.assignCardData();
@@ -390,26 +445,17 @@ export class CollectionDetailEtbPage implements OnInit {
     this.contentService.setContentMarker(contentMarkerRequest).toPromise().then();
   }
 
-
   // toggle the card
   toggleGroup(group, content, openCarousel?) {
     let isCollapsed = true;
     if (!openCarousel && this.isGroupShown(group)) {
       isCollapsed = false;
-      this.shownGroup = null;
+      this.shownGroups = undefined;
+      this.hiddenGroups.add(group);
     } else {
       isCollapsed = false;
-      this.shownGroup = group;
-      setTimeout(() => {
-        if (document.getElementById(content.identifier)) {
-          window['scrollWindow'].getScrollElement()
-            .scrollTo({
-              top: document.getElementById(content.identifier).offsetTop - 165,
-              left: 0,
-              behavior: 'smooth'
-            });
-        }
-      }, 100);
+      this.shownGroups = group;
+      this.hiddenGroups.delete(group);
     }
     const values = new Map();
     values['isCollapsed'] = isCollapsed;
@@ -428,7 +474,11 @@ export class CollectionDetailEtbPage implements OnInit {
 
   // to check whether the card is toggled or not
   isGroupShown(group) {
-    return this.shownGroup === group;
+    if (this.activeMimeTypeFilter.indexOf('all') === 0) {
+      return this.shownGroups === group;
+    } else {
+      return !this.hiddenGroups.has(group);
+    }
   }
 
   changeValue(text) {
@@ -447,7 +497,7 @@ export class CollectionDetailEtbPage implements OnInit {
       this.generateQRSessionEndEvent(this.source, this.cardData.identifier);
     }
     if (this.source === PageId.ONBOARDING_PROFILE_PREFERENCES) {
-      this.router.navigate([`/${RouterLinks.PROFILE_SETTINGS}`], { state: {showFrameworkCategoriesMenu: true  }, replaceUrl: true });
+      this.router.navigate([`/${RouterLinks.PROFILE_SETTINGS}`], { state: { showFrameworkCategoriesMenu: true }, replaceUrl: true });
     } else {
       this.location.back();
     }
@@ -473,9 +523,12 @@ export class CollectionDetailEtbPage implements OnInit {
       emitUpdateIfAny: refreshContentDetails
     };
     this.contentService.getContentDetails(option).toPromise()
-      .then((data: Content) => {
+      .then((data: Content | any) => {
         if (data) {
           this.licenseDetails = data.contentData.licenseDetails || this.licenseDetails;
+          if (data.contentData.attributions && data.contentData.attributions.length) {
+            data.contentData.attributions = (data.contentData.attributions.sort()).join(', ');
+          }
           if (!data.isAvailableLocally) {
             this.contentDetail = data;
             this.telemetryGeneratorService.generatefastLoadingTelemetry(
@@ -488,7 +541,7 @@ export class CollectionDetailEtbPage implements OnInit {
             );
             this.contentService.getContentHeirarchy(option).toPromise()
               .then((content: Content) => {
-                this.childrenData = content.children;
+                this.setTocData(content);
                 this.showSheenAnimation = false;
                 this.toggleGroup(0, this.content);
                 this.telemetryGeneratorService.generatefastLoadingTelemetry(
@@ -516,15 +569,6 @@ export class CollectionDetailEtbPage implements OnInit {
       });
   }
 
-  showLicensce() {
-    this.showCredits = !this.showCredits;
-    if (this.showCredits) {
-      this.licenseSectionClicked('expanded');
-    } else {
-      this.licenseSectionClicked('collapsed');
-    }
-  }
-
   /**
    * Function to extract api response.
    */
@@ -542,7 +586,6 @@ export class CollectionDetailEtbPage implements OnInit {
       this.ratingComment = contentFeedback[0].comments;
     }
 
-
     if (Boolean(data.isAvailableLocally)) {
       this.showLoading = false;
       this.refreshHeader();
@@ -663,6 +706,7 @@ export class CollectionDetailEtbPage implements OnInit {
             this.refreshHeader();
             this.showChildrenLoader = false;
             this.childrenData.length = 0;
+            this.collectionTocData.children.length = 0;
           }
         });
       })
@@ -703,7 +747,10 @@ export class CollectionDetailEtbPage implements OnInit {
             if (this.textbookTocService.textbookIds.rootUnitId && this.activeMimeTypeFilter !== ['all']) {
               this.onFilterMimeTypeChange(this.mimeTypes[0].value, 0, this.mimeTypes[0].name);
             }
-            this.childrenData = data.children;
+            if (this.textbookTocService.textbookIds.content) {
+              this.activeContent = this.textbookTocService.textbookIds.content;
+            }
+            this.setTocData(data);
             this.changeDetectionRef.detectChanges();
           }
 
@@ -713,16 +760,6 @@ export class CollectionDetailEtbPage implements OnInit {
             this.getContentsSize(data.children || []);
           }
           this.showChildrenLoader = false;
-          const divElement = this.filteredItemsQueryList.find((f) => f.nativeElement.id);
-          let carouselIndex = this.childrenData
-            .findIndex((d: Content) => {
-              return divElement.nativeElement.id === d.identifier;
-            });
-          if (this.textbookTocService.textbookIds.rootUnitId) {
-            carouselIndex = this.childrenData.findIndex((content) => this.textbookTocService.textbookIds.rootUnitId === content.identifier);
-            // carouselIndex = carouselIndex > 0 ? carouselIndex : 0;
-          }
-          this.toggleGroup(carouselIndex, this.content, true);
           if (this.textbookTocService.textbookIds.contentId) {
             setTimeout(() => {
               (this.stickyPillsRef.nativeElement as HTMLDivElement).classList.add('sticky');
@@ -753,6 +790,11 @@ export class CollectionDetailEtbPage implements OnInit {
     // this.ionContent.scrollTo(0, this.scrollPosition);
   }
 
+  private setTocData(content) {
+    this.childrenData = content.children;
+    this.collectionTocData = content;
+  }
+
   getContentsSize(data) {
     data.forEach((value) => {
       this.breadCrumb.set(value.identifier, value.contentData.name);
@@ -768,7 +810,7 @@ export class CollectionDetailEtbPage implements OnInit {
       if (value.children) {
         this.getContentsSize(value.children);
       }
-      if (value.isAvailableLocally === false) {
+      if (!value.isAvailableLocally && value.contentData.downloadUrl) {
         this.downloadIdentifiers.add(value.contentData.identifier);
         this.rollUpMap[value.contentData.identifier] = ContentUtil.generateRollUp(value.hierarchyInfo, undefined);
       }
@@ -780,49 +822,31 @@ export class CollectionDetailEtbPage implements OnInit {
   }
 
 
-  navigateToDetailsPage(content: any, depth) {
+  navigateToDetailsPage(content: any, depth, corRelationData?) {
+    const corRelationList = [...this.corRelationList];
+    if (corRelationData) {
+      corRelationList.push(corRelationData);
+    }
     this.zone.run(() => {
-      if (content.contentType === ContentType.COURSE) {
-        this.router.navigate([RouterLinks.ENROLLED_COURSE_DETAILS], {
-          state: {
+      switch (ContentUtil.isTrackable(content)) {
+        case 1:
+        case 0:
+          this.navService.navigateToTrackableCollection({
             content,
             depth,
             contentState: this.stateData,
-            corRelation: this.corRelationList
-          }
-        });
-      } else if (content.mimeType === MimeType.COLLECTION) {
-        this.isDepthChild = true;
-        this.router.navigate([RouterLinks.COLLECTION_DETAIL_ETB], {
-          state: {
-            content,
-            depth,
-            contentState: this.stateData,
-            corRelation: this.corRelationList
-          }
-        });
-      } else {
-        this.router.navigate([RouterLinks.CONTENT_DETAILS], {
-          state: {
+            corRelation: corRelationList
+          });
+          break;
+        case -1:
+          this.navService.navigateToContent({
+            isChildContent: true,
             content,
             depth,
             contentState: this.stateData,
-            corRelation: this.corRelationList
-          }
-        });
-      }
-    });
-  }
-
-  navigateToContentPage(content: any, depth) {
-    this.router.navigate([RouterLinks.CONTENT_DETAILS], {
-      state: {
-        isChildContent: true,
-        content,
-        depth,
-        contentState: this.stateData,
-        corRelation: this.corRelationList,
-        breadCrumb: this.breadCrumb
+            corRelation: corRelationList,
+            breadCrumb: this.breadCrumb
+          });
       }
     });
   }
@@ -886,7 +910,9 @@ export class CollectionDetailEtbPage implements OnInit {
               this.showDownloadBtn = false;
               this.isDownloadCompleted = true;
               this.showDownload = false;
-              this.contentDetail.isAvailableLocally = true;
+              if (this.contentDetail) {
+                this.contentDetail.isAvailableLocally = true;
+              }
               this.downloadPercentage = 0;
               this.updateSavedResources();
               this.setChildContents();
@@ -1008,7 +1034,7 @@ export class CollectionDetailEtbPage implements OnInit {
   generateEndEvent(objectId, objectType, objectVersion) {
     const telemetryObject = new TelemetryObject(objectId, objectType, objectVersion);
     this.telemetryGeneratorService.generateEndTelemetry(
-      objectType ? objectType : ContentType.TEXTBOOK,
+      objectType ? objectType : CsPrimaryCategory.DIGITAL_TEXTBOOK,
       Mode.PLAY,
       PageId.COLLECTION_DETAIL,
       Environment.HOME,
@@ -1116,21 +1142,6 @@ export class CollectionDetailEtbPage implements OnInit {
       this.corRelationList);
   }
 
-  licenseSectionClicked(params) {
-    const telemetryObject = new TelemetryObject(this.objId, this.objType, this.objVer);
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      params === 'expanded' ? InteractType.LICENSE_CARD_EXPANDED : InteractType.LICENSE_CARD_COLLAPSED,
-      '',
-      undefined,
-      PageId.COLLECTION_DETAIL,
-      telemetryObject,
-      undefined,
-      this.objRollup,
-      this.corRelationList,
-      ID.LICENSE_CARD_CLICKED
-    );
-  }
-
   /**
    * Ionic life cycle hook
    */
@@ -1204,12 +1215,6 @@ export class CollectionDetailEtbPage implements OnInit {
       type.selected = false;
     });
     this.mimeTypes[idx].selected = true;
-    this.filteredItemsQueryList.changes.pipe(
-      tap((v) => {
-        this.changeDetectionRef.detectChanges();
-        values['contentLength'] = v.length;
-      })
-    ).subscribe();
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
       InteractSubtype.FILTER_CLICKED,
@@ -1222,9 +1227,12 @@ export class CollectionDetailEtbPage implements OnInit {
   }
 
   openTextbookToc() {
-    this.shownGroup = null;
-    this.router.navigate([`/${RouterLinks.COLLECTION_DETAIL_ETB}/${RouterLinks.TEXTBOOK_TOC}`],
-      { state: { childrenData: this.childrenData, parentId: this.identifier } });
+    this.hiddenGroups.clear();
+    this.shownGroups = undefined;
+    this.navService.navigateTo([`/${RouterLinks.COLLECTION_DETAIL_ETB}/${RouterLinks.TEXTBOOK_TOC}`],
+      { childrenData: this.childrenData, parentId: this.identifier })
+    // this.router.navigate([`/${RouterLinks.COLLECTION_DETAIL_ETB}/${RouterLinks.TEXTBOOK_TOC}`], // **** check needed ****
+    //   { state: { childrenData: this.childrenData, parentId: this.identifier } });
     const values = new Map();
     values['selectChapterVisible'] = this.isChapterVisible;
     this.telemetryGeneratorService.generateInteractTelemetry(
@@ -1321,7 +1329,6 @@ export class CollectionDetailEtbPage implements OnInit {
                 PageId.COLLECTION_DETAIL,
                 JSON.stringify(stackTrace),
               );
-              this.commonUtilService.showToast('UNABLE_TO_FETCH_CONTENT');
             }
           } else if (data && data[0].status === ContentImportStatus.NOT_FOUND) {
             this.showLoading = false;
@@ -1347,69 +1354,80 @@ export class CollectionDetailEtbPage implements OnInit {
       });
   }
 
-  playContent(event) {
-    this.headerService.hideHeader();
+  playContent(event, corRelationData?) {
+    const corRelationList = [...this.corRelationList];
+    if (corRelationData) {
+      corRelationList.push(corRelationData);
+    }
 
-    this.playingContent = event.content;
-    const contentInfo: ContentInfo = {
-      telemetryObject: ContentUtil.getTelemetryObject(this.playingContent),
-      rollUp: ContentUtil.generateRollUp(this.playingContent.hierarchyInfo, this.playingContent.identifier),
-      correlationList: this.corRelationList,
-      hierachyInfo: this.playingContent.hierarchyInfo
+    const telemetryDetails = {
+      pageId: PageId.COLLECTION_DETAIL,
+      corRelationList
     };
-    let isStreaming: boolean;
-    let shouldDownloadAndPlay: boolean;
-    if (this.playingContent.contentData.streamingUrl &&
-      this.commonUtilService.networkInfo.isNetworkAvailable && !(this.playingContent.mimeType === 'application/vnd.ekstep.h5p-archive')) {
-      isStreaming = true;
-      shouldDownloadAndPlay = false;
-      this.lastContentPlayed = this.playingContent.identifier;
-      this.generateInteractTelemetry(isStreaming, contentInfo.telemetryObject, contentInfo.rollUp, contentInfo.correlationList);
-      this.contentPlayerHandler.launchContentPlayer(this.playingContent, isStreaming, shouldDownloadAndPlay, contentInfo, false, true);
-    } else if (!this.commonUtilService.networkInfo.isNetworkAvailable && this.playingContent.isAvailableLocally) {
-      isStreaming = false;
-      shouldDownloadAndPlay = false;
-      this.lastContentPlayed = this.playingContent.identifier;
-      this.generateInteractTelemetry(isStreaming, contentInfo.telemetryObject, contentInfo.rollUp, contentInfo.correlationList);
-      this.contentPlayerHandler.launchContentPlayer(this.playingContent, isStreaming, shouldDownloadAndPlay, contentInfo, false, true);
-    } else if (this.commonUtilService.networkInfo.isNetworkAvailable && this.playingContent.isAvailableLocally) {
-      isStreaming = false;
-      shouldDownloadAndPlay = true;
-      this.lastContentPlayed = this.playingContent.identifier;
-      this.generateInteractTelemetry(isStreaming, contentInfo.telemetryObject, contentInfo.rollUp, contentInfo.correlationList);
-      this.contentPlayerHandler.launchContentPlayer(this.playingContent, isStreaming, shouldDownloadAndPlay, contentInfo, false, true);
-    } else if (!this.commonUtilService.networkInfo.isNetworkAvailable && !this.playingContent.isAvailableLocally) {
-      const params: NavigationExtras = {
-        state: {
-          isChildContent: true,
-          content: this.playingContent,
-          corRelation: this.corRelationList,
-        }
-      };
-      this.router.navigate([RouterLinks.CONTENT_DETAILS], params);
-    } else {
-      const params: NavigationExtras = {
-        state: {
-          isChildContent: true,
-          content: this.playingContent,
-          corRelation: this.corRelationList,
-        }
-      };
-      this.router.navigate([RouterLinks.CONTENT_DETAILS], params);
+
+    const navExtras = {
+      state: {
+        isChildContent: true,
+        content: event.content,
+        depth: 1,
+        contentState: this.stateData,
+        corRelation: corRelationList,
+        breadCrumb: this.breadCrumb
+      }
+    };
+
+    this.contentPlayerHandler.playContent(event.content, navExtras, telemetryDetails, false);
+
+  }
+
+  tocCardClick(event) {
+    if (!(event.event instanceof Event)) {
+      return;
     }
+
+    const corRelationData = {
+      id: event.rollup[0],
+      type: CorReleationDataType.ROOT_ID
+    };
+
+    this.setActiveContentData(event, InteractSubtype.CONTENT_CLICKED, corRelationData);
+
+    this.navigateToDetailsPage(event.data, 1, corRelationData);
   }
 
-  private generateInteractTelemetry(isStreaming: boolean, telemetryObject, rollup, correlationData) {
-    const subType: string = isStreaming ? InteractSubtype.PLAY_ONLINE : InteractSubtype.PLAY_FROM_DEVICE;
+  playButtonClick(event) {
+    const corRelationData = {
+      id: event.rollup[0],
+      type: CorReleationDataType.ROOT_ID
+    };
+
+    this.setActiveContentData(event, InteractSubtype.PLAY_CLICKED, corRelationData);
+
+    this.playContent({ content: event.data }, corRelationData);
+  }
+
+  private setActiveContentData(event, telemetrySubType, corRelationData) {
+    this.activeContent = event.data;
+    this.textbookTocService.setTextbookIds({ contentId: event.data.identifier, rootUnitId: undefined });
+
+    const corRelationList = [...this.corRelationList];
+    if (corRelationData) {
+      corRelationList.push(corRelationData);
+    }
+    const values = {
+      contentClicked: event.data && event.data.identifier
+    };
+
+    const telemetryObj = ContentUtil.getTelemetryObject(event.data);
+
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
-      subType,
+      telemetrySubType,
       Environment.HOME,
-      PageId.COLLECTION_DETAIL,
-      telemetryObject,
-      undefined,
-      rollup,
-      correlationData,
+      PageId.TEXTBOOK_TOC, telemetryObj,
+      values,
+      this.objRollup, corRelationList
     );
   }
+
 }
diff --git a/src/app/collection-detail-etb/textbook-toc-service.ts b/src/app/collection-detail-etb/textbook-toc-service.ts
index bb37b8669..bf74fe656 100644
--- a/src/app/collection-detail-etb/textbook-toc-service.ts
+++ b/src/app/collection-detail-etb/textbook-toc-service.ts
@@ -6,7 +6,8 @@ export class TextbookTocService {
     textbookIds = {
         contentId: undefined,
         rootUnitId: undefined,
-        unit: undefined
+        unit: undefined,
+        content: undefined
     };
 
     constructor(
@@ -21,7 +22,8 @@ export class TextbookTocService {
         this.textbookIds = {
             contentId: undefined,
             rootUnitId: undefined,
-            unit: undefined
+            unit: undefined,
+            content: undefined
         };
     }
 
diff --git a/src/app/collection-detail-etb/textbook-toc/textbook-toc.html b/src/app/collection-detail-etb/textbook-toc/textbook-toc.html
index 28b7b5daf..5f0031719 100644
--- a/src/app/collection-detail-etb/textbook-toc/textbook-toc.html
+++ b/src/app/collection-detail-etb/textbook-toc/textbook-toc.html
@@ -4,11 +4,11 @@
       <ion-grid class="sb-accordian-header">
         <ion-row *ngIf="item?.children">
           <ion-col size="11">
-            <div class="sb-topic-text" (click)="setContentId(item.identifier)"> {{item?.contentData?.name}} </div>
+            <div class="sb-topic-text" (click)="setContentId(item.identifier, item)"> {{item?.contentData?.name}} </div>
           </ion-col>
         </ion-row>
         <ion-row *ngIf="item?.contentData?.mimeType !== 'application/vnd.ekstep.content-collection' && !item?.children"
-          (click)="setContentId(item.identifier)">
+          (click)="setContentId(item.identifier, item)">
           <ion-col size="11">
             <div [ngClass]="{'sb-accordian-grey-text': !commonUtilService.networkInfo.isNetworkAvailable && !item?.isAvailableLocally,
                 'sb-play-selected':item?.isAvailableLocally,'sb-play-unselected':!item?.isAvailableLocally}">
@@ -20,7 +20,7 @@
           *ngIf="item?.contentData?.mimeType === 'application/vnd.ekstep.content-collection' && !item?.children">
           {{item?.contentData?.name}}
           <span class="grey-icon-span">
-            <ion-icon ios="ios-alert" md="md-alert" class="grey-icon ML5"></ion-icon>
+            <ion-icon name="alert" class="grey-icon ML5"></ion-icon>
           </span>
         </div>
       </ion-grid>
diff --git a/src/app/collection-detail-etb/textbook-toc/textbook-toc.scss b/src/app/collection-detail-etb/textbook-toc/textbook-toc.scss
index a7a68e44d..e438daa62 100644
--- a/src/app/collection-detail-etb/textbook-toc/textbook-toc.scss
+++ b/src/app/collection-detail-etb/textbook-toc/textbook-toc.scss
@@ -1,11 +1,12 @@
 @import "src/assets/styles/base/_variables.scss";
+@import "src/assets/styles/_variables.scss";
 :host {
   .scroll-content {
     padding-bottom: 20% !important;
   }
   .sb-topic-text{
     width: 90.28%;
-    color: #024F9D;
+    color: $blue;
     font-size: 14px;
     font-weight: bold;
     line-height: 20px;
@@ -17,7 +18,7 @@
   .sb-accordian-card {
     margin: 0 !important;
     box-shadow: none;
-    border-bottom: 1px solid #CCCCCC;
+    border-bottom: 1px solid map-get($colors, medium_gray);
   }
   .sb-play-selected{
     font-weight: normal;
diff --git a/src/app/collection-detail-etb/textbook-toc/textbook-toc.ts b/src/app/collection-detail-etb/textbook-toc/textbook-toc.ts
index 09367c08c..fa36e3461 100644
--- a/src/app/collection-detail-etb/textbook-toc/textbook-toc.ts
+++ b/src/app/collection-detail-etb/textbook-toc/textbook-toc.ts
@@ -1,11 +1,8 @@
 import { Location } from '@angular/common';
-import { SbGenericPopoverComponent } from './../../components/popups/sb-generic-popover/sb-generic-popover.component';
-import { AppHeaderService } from './../../../services/app-header.service';
-import { TextbookTocService } from './../textbook-toc-service';
-import { Component, ViewChild, ViewEncapsulation, OnInit, OnDestroy } from '@angular/core';
-import { Platform, PopoverController, IonContent, Events } from '@ionic/angular';
+import { Component, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
+import { Router } from '@angular/router';
+import { EventTopics } from '@app/app/app.constant';
 import { CommonUtilService } from '@app/services/common-util.service';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
 import {
     Environment,
     ImpressionSubtype,
@@ -14,9 +11,12 @@ import {
     InteractType,
     PageId
 } from '@app/services/telemetry-constants';
-import { Router } from '@angular/router';
-import { EventTopics } from '@app/app/app.constant';
-
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import { IonContent, Platform, PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { AppHeaderService } from './../../../services/app-header.service';
+import { SbGenericPopoverComponent } from './../../components/popups/sb-generic-popover/sb-generic-popover.component';
+import { TextbookTocService } from './../textbook-toc-service';
 
 @Component({
     selector: 'textbook-toc',
@@ -37,7 +37,7 @@ export class TextBookTocPage implements OnInit, OnDestroy {
     isDownloadStarted = false;
     isTextbookTocPage = false;
     stckyUnitTitle?: string;
-    @ViewChild(IonContent) content: IonContent;
+    @ViewChild(IonContent, { static: false }) content: IonContent;
     stckyindex: any;
     latestParentNodes: any;
     latestParentName: any;
@@ -68,8 +68,6 @@ export class TextBookTocPage implements OnInit, OnDestroy {
     }
 
     ngOnInit() {
-        // this.childrenData = this.navParams.get('childrenData');
-        // this.parentId = this.navParams.get('parentId');
         this.getChildDataIdScrollEvent();
     }
 
@@ -79,7 +77,6 @@ export class TextBookTocPage implements OnInit, OnDestroy {
         });
         this.headerService.showHeaderWithBackButton();
         this.backButtonFunc = this.platform.backButton.subscribeWithPriority(11, () => {
-            // this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.COLLECTION_DETAIL, Environment.HOME, false);
             this.handleBackButton(false);
             this.backButtonFunc();
         });
@@ -134,7 +131,7 @@ export class TextBookTocPage implements OnInit, OnDestroy {
     }
 
     // set textbook unit and contentids for scrolling to particular unit in etb page
-    setContentId(id: string) {
+    setContentId(id: string, content) {
         const values = new Map();
         values['unitClicked'] = id;
         values['parentId'] = this.parentId;
@@ -147,8 +144,7 @@ export class TextBookTocPage implements OnInit, OnDestroy {
             values
         );
 
-        this.textbookTocService.setTextbookIds({ rootUnitId: id, contentId: id });
-        // this.navCtrl.pop();
+        this.textbookTocService.setTextbookIds({ rootUnitId: id, contentId: id, content });
         this.location.back();
     }
 
diff --git a/src/app/components/access-discussion/access-discussion.component.html b/src/app/components/access-discussion/access-discussion.component.html
new file mode 100644
index 000000000..c979c035c
--- /dev/null
+++ b/src/app/components/access-discussion/access-discussion.component.html
@@ -0,0 +1,6 @@
+<ion-icon src="assets/imgs/ic_chat.svg" class="card-icons" *ngIf="fetchForumIdReq.type==='group' && forumDetails" (click)="openDiscussionForum()"></ion-icon>
+<button (click)="openDiscussionForum()" *ngIf="(fetchForumIdReq.type==='course' || fetchForumIdReq.type==='batch') && forumDetails"
+        class="card-button" slot="icon-only">
+    <ion-icon src="assets/imgs/ic_chat.svg" class="card-icons"></ion-icon>
+    <p class="card-text">{{'FORUM' | translate}}</p>
+</button>
\ No newline at end of file
diff --git a/src/app/components/access-discussion/access-discussion.component.scss b/src/app/components/access-discussion/access-discussion.component.scss
new file mode 100644
index 000000000..bae5d039b
--- /dev/null
+++ b/src/app/components/access-discussion/access-discussion.component.scss
@@ -0,0 +1,20 @@
+@import "src/assets/styles/_variables.scss";
+.card-icons{
+    margin-right: 10px;
+    position: relative;
+    top: 2px;
+}
+.card-text{
+    height: 18px;
+    width: 63px;
+    color: map-get($colors, granite_gray);
+    font-family: "Noto Sans", sans-serif;
+    font-size: 13px !important;
+    line-height: 20px;
+    text-align: center;
+}
+.card-button{
+    background-color: transparent !important;
+    outline: none;
+    font-size: 30px;
+}
\ No newline at end of file
diff --git a/src/app/components/access-discussion/access-discussion.component.spec.ts b/src/app/components/access-discussion/access-discussion.component.spec.ts
new file mode 100644
index 000000000..b3a0000b9
--- /dev/null
+++ b/src/app/components/access-discussion/access-discussion.component.spec.ts
@@ -0,0 +1,144 @@
+import {DiscussionService,} from '@project-sunbird/sunbird-sdk';
+import { Router } from '@angular/router';
+import { of, throwError } from 'rxjs';
+import { DiscussionTelemetryService } from '@app/services/discussion/discussion-telemetry.service';
+import { AccessDiscussionComponent } from './access-discussion.component';
+import { AppHeaderService, CommonUtilService, NavigationService } from '@app/services';
+import { TelemetryGeneratorService } from '../../../services';
+
+describe('GroupDetailsPage', () => {
+    let accessDiscussionComponent: AccessDiscussionComponent;
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+       showToast: jest.fn()
+    };
+    const mockRouter: Partial<Router> = {
+        navigate: jest.fn()
+    };
+    const mockDiscussionService: Partial<DiscussionService> = {};
+    const mockDiscussionTelemetryService: Partial<DiscussionTelemetryService> = {};
+    const mockHeaderService: Partial<AppHeaderService> = {
+        hideHeader: jest.fn()
+    };
+    const mockNavigationService: Partial<NavigationService> = {
+        setNavigationUrl: jest.fn()
+    };
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateInteractTelemetry: jest.fn()
+    };
+
+    beforeAll(() => {
+        accessDiscussionComponent = new AccessDiscussionComponent(
+            mockDiscussionService as DiscussionService,
+            mockRouter as Router,
+            mockCommonUtilService as CommonUtilService,
+            mockDiscussionTelemetryService as DiscussionTelemetryService,
+            mockHeaderService as AppHeaderService,
+            mockNavigationService as NavigationService,
+            mockTelemetryGeneratorService as TelemetryGeneratorService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should be create a instance of groupDetailsPage', () => {
+        expect(accessDiscussionComponent).toBeTruthy();
+    });
+
+    describe('ngOnInit', () => {
+        it('should check for forumIds', () => {
+            // arrange
+            mockDiscussionService.getForumIds = jest.fn(() => throwError({ error: 'error' })) as any;
+            // act
+            accessDiscussionComponent.ngOnInit()
+            // assert
+            expect(mockDiscussionService.getForumIds).toHaveBeenCalled();
+        });
+    })
+
+    describe('checkAccess', () => {
+        it('should check for access for DF', (done) => {
+            // arrange
+            accessDiscussionComponent.fetchForumIdReq = {
+                identifier: ['some_id'],
+                type: 'group'
+            }
+            const res = {
+                result: [
+                    {
+                        cid: 'some_cid'
+                    }
+                ]
+            }
+            mockDiscussionService.getForumIds = jest.fn(() => of(res) as any);
+            // act
+            accessDiscussionComponent.fetchForumIds()
+            // assert
+            expect(mockDiscussionService.getForumIds).toHaveBeenCalled();
+            setTimeout(() => {
+                expect(accessDiscussionComponent.forumDetails).toEqual(res.result[0]);
+                done()
+            });
+        })
+    });
+    
+    describe('openDiscussionForum', () => {
+        it('hould redirect to DF route', (done) => {
+            // arrange
+            accessDiscussionComponent.fetchForumIdReq = {
+                identifier: ['some_id'],
+                type: 'group'
+            }
+            accessDiscussionComponent.createUserReq = {
+                username: 'some_username',
+                identifier: 'some_identifier'
+            }
+            accessDiscussionComponent.forumDetails = {
+                cid: 'some_cid'
+            }
+            const res = {
+                result: {
+                    userName: 'some_user'
+                }
+            }
+            mockDiscussionService.createUser = jest.fn(() => of(res) as any);
+            // act
+            accessDiscussionComponent.openDiscussionForum()
+            // assert
+            setTimeout(() => {
+                expect(mockRouter.navigate).toHaveBeenCalledWith(
+                    ['/discussion-forum'],
+                    {
+                        queryParams: {
+                            categories: JSON.stringify({result:['some_cid']}),
+                            userName: 'some_user'
+                        }
+                    }
+                );
+                done()
+            })
+        })
+        it('should redirect to DF route', (done) => {
+            // arrange
+            accessDiscussionComponent.forumDetails = {
+                cid: 'some_cid'
+            }
+            const res = {
+                result: {
+                    userName: 'some_user'
+                }
+            }
+            mockDiscussionService.createUser = jest.fn(() => throwError('err') as any);
+            // act
+            accessDiscussionComponent.openDiscussionForum()
+            // assert
+            setTimeout(() => {
+                expect(mockDiscussionService.createUser).toHaveBeenCalled()
+                done()
+            })
+        });
+    })
+
+});
diff --git a/src/app/components/access-discussion/access-discussion.component.ts b/src/app/components/access-discussion/access-discussion.component.ts
new file mode 100644
index 000000000..cf24d9f6c
--- /dev/null
+++ b/src/app/components/access-discussion/access-discussion.component.ts
@@ -0,0 +1,78 @@
+import {  Component, Inject, Input, OnInit, ElementRef, Output, EventEmitter } from '@angular/core';
+import { Router } from '@angular/router';
+import { RouterLinks } from '@app/app/app.constant';
+import { AppHeaderService, CommonUtilService, Environment, InteractSubtype, PageId, TelemetryGeneratorService } from '@app/services';
+import { DiscussionTelemetryService } from '@app/services/discussion/discussion-telemetry.service';
+import { NavigationService } from '@app/services/navigation-handler.service';
+import { DiscussionService, InteractType } from '@project-sunbird/sunbird-sdk';
+
+@Component({
+    selector: "accessDiscussion",
+    templateUrl: './access-discussion.component.html',
+    styleUrls: ['./access-discussion.component.scss'],
+})
+export class AccessDiscussionComponent implements OnInit {
+  @Input() fetchForumIdReq: any;
+  @Input() createUserReq: any;
+  @Output() forumData = new EventEmitter();
+  forumDetails;
+
+  constructor(
+    @Inject('DISCUSSION_SERVICE') private discussionService: DiscussionService,
+    private router: Router,
+    private commonUtilService: CommonUtilService,
+    private discussionTelemetryService: DiscussionTelemetryService,
+    private headerService: AppHeaderService,
+    private navigationService: NavigationService,
+    private telemetryGeneratorService: TelemetryGeneratorService
+) {}
+
+  ngOnInit() {
+      this.fetchForumIds();
+  }
+  fetchForumIds() {
+    this.forumDetails = '';
+    this.discussionService.getForumIds(this.fetchForumIdReq).toPromise().then(forumDetails => {
+        if (forumDetails.result.length) {
+            this.forumDetails = forumDetails.result[0];
+            this.forumData.emit(this.forumDetails);
+        }
+    }).catch(error => {
+        console.log('error fetchForumIds', error);
+    });
+  }
+
+  async openDiscussionForum() {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH, 
+      InteractSubtype.FORUM_ICON_CLICKED,
+      Environment.DISCUSSION,
+      PageId.GROUP_DETAIL,
+      undefined,
+      undefined,
+      undefined,
+      undefined
+    );
+    this.headerService.hideHeader();
+    this.discussionTelemetryService.contextCdata = [
+      {
+        id: this.fetchForumIdReq.identifier[0],
+        type: this.fetchForumIdReq.type
+      }
+    ];
+    this.navigationService.setNavigationUrl(this.router.url);
+    this.discussionService.createUser(this.createUserReq).subscribe((response) => {
+      const userName = response.result.userName
+      const result = [this.forumDetails.cid];
+        this.router.navigate([`/${RouterLinks.DISCUSSION}`], {
+        queryParams: {
+          categories: JSON.stringify({ result }),
+          userName: userName
+        }
+      });
+    }, error => {
+      console.log('err in discussionService.createUser', error)
+      this.commonUtilService.showToast('SOMETHING_WENT_WRONG')
+    });
+  }
+}
\ No newline at end of file
diff --git a/src/app/components/acknowledge-response/acknowledge-response.component.html b/src/app/components/acknowledge-response/acknowledge-response.component.html
new file mode 100644
index 000000000..36606be65
--- /dev/null
+++ b/src/app/components/acknowledge-response/acknowledge-response.component.html
@@ -0,0 +1,8 @@
+<div class="container">
+    <div class="header container top-unset">
+        <div class="inner-container">
+            <ion-icon class="icon-checkmark" class="icon-checkmark" md="md-checkmark-circle"></ion-icon>
+            <div class="text">{{'FRMELEMNTS_MSG_TICKET_SUBMISSION_SUCCESS' | translate: {'app_name': appName} }}</div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/components/acknowledge-response/acknowledge-response.component.scss b/src/app/components/acknowledge-response/acknowledge-response.component.scss
new file mode 100644
index 000000000..718d2a584
--- /dev/null
+++ b/src/app/components/acknowledge-response/acknowledge-response.component.scss
@@ -0,0 +1,96 @@
+@import "src/assets/styles/_variables.scss";
+
+.container {
+    width: -webkit-fill-available;
+    height: -webkit-fill-available;
+    background: map-get($colors, light_black);
+    position: fixed;
+    top: 0px;
+    display: -webkit-flexbox;
+    display: -ms-flexbox;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-flex-align: center;
+    -ms-flex-align: center;
+    -webkit-align-items: center;
+    align-items: center;
+    justify-content: center;
+    z-index: 10;
+}
+
+.header {
+    background-color: map-get($colors, whitish_light_green);
+    width: 72%;
+    height: auto;
+    margin: 0 auto;
+    border-radius: 10px;
+    text-align: center;
+    padding: 8px;
+}
+
+.h-6per {
+    height: 6%;
+}
+
+.close {
+    float: right;
+    font-weight: bold;
+    height: 30px;
+    width: 30px;
+    margin: 6px 6px 0px 0px;
+}
+
+.h-90cent {
+    height: 80%;
+    margin-top: 44px;
+}
+
+.message {
+    color: $green;
+    font-weight: bolder;    
+}
+
+.m-10 {
+    margin: 10px 0px;
+}
+
+.contact-no {
+    font-weight: 900;
+    color: map-get($colors, deep_blue)
+}
+
+.btn-call {
+    width: 90%;
+    height: 14%;
+    font-size: 16px;
+    color: $white;
+    background: $green;
+    margin-top: 24px;
+}
+
+.top-unset {
+    top: unset;
+}
+
+.icon-checkmark {
+    color: $green;
+    display: block;
+    width: 50px;
+    height: 50px;
+}
+
+.inner-container {
+    width: 80%;
+    height: 60%;
+    align-items: center;
+    text-align: center;
+    display: flex;
+    flex-direction: column;
+}
+
+.text {
+    color: $green;
+    font-weight: bold;
+    font-size: 20px;
+    margin: 16px 0px;
+}
\ No newline at end of file
diff --git a/src/app/components/acknowledge-response/acknowledge-response.component.spec.ts b/src/app/components/acknowledge-response/acknowledge-response.component.spec.ts
new file mode 100644
index 000000000..057bb46e3
--- /dev/null
+++ b/src/app/components/acknowledge-response/acknowledge-response.component.spec.ts
@@ -0,0 +1,46 @@
+import { AcknowledgeResponseComponent } from './acknowledge-response.component';
+import {
+    CommonUtilService,
+} from '../../../services';
+describe('', () => {
+    let acknowledgeResponseComponent: AcknowledgeResponseComponent;
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        getAppName: jest.fn(() => Promise.resolve('Sunbird'))
+    };
+
+    beforeAll(() => {
+        acknowledgeResponseComponent = new AcknowledgeResponseComponent(
+            mockCommonUtilService
+        );
+    });
+
+    describe('initialisation', () => {
+        it('constructor initialisation', () => {
+            // assert
+            expect(acknowledgeResponseComponent).toBeTruthy();
+        });
+    });
+
+    describe('ngOninit', () => {
+        it('should initialize the appName', (done) => {
+            // act
+            acknowledgeResponseComponent.ngOnInit().then(() => {
+                // assert
+                expect(acknowledgeResponseComponent.appName).toEqual('Sunbird');
+                done();
+            });
+
+        });
+    });
+
+    describe('ngDestroy', () => {
+        it('should call emit', () => {
+            // arrange
+            acknowledgeResponseComponent.popupDismiss.emit = jest.fn();
+            // act
+            acknowledgeResponseComponent.ngOnDestroy();
+            // assert
+            expect(acknowledgeResponseComponent.popupDismiss.emit).toBeCalled();
+        });
+    });
+});
diff --git a/src/app/components/acknowledge-response/acknowledge-response.component.ts b/src/app/components/acknowledge-response/acknowledge-response.component.ts
new file mode 100644
index 000000000..54cd5b5b2
--- /dev/null
+++ b/src/app/components/acknowledge-response/acknowledge-response.component.ts
@@ -0,0 +1,24 @@
+import { Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
+import { CommonUtilService } from '@app/services';
+
+@Component({
+    selector: 'acknowledge-response',
+    templateUrl: './acknowledge-response.component.html',
+    styleUrls: ['./acknowledge-response.component.scss']
+})
+export class AcknowledgeResponseComponent implements OnInit, OnDestroy {
+    @Output() popupDismiss = new EventEmitter();
+    appName = '';
+    constructor(
+        private commonUtilService: CommonUtilService
+    ) {
+    }
+
+    async ngOnInit() {
+        this.appName = await this.commonUtilService.getAppName();
+    }
+
+    ngOnDestroy(): void {
+        this.popupDismiss.emit('closed');
+    }
+}
diff --git a/src/app/components/add-activity-to-group/add-activity-to-group.component.html b/src/app/components/add-activity-to-group/add-activity-to-group.component.html
new file mode 100644
index 000000000..b8a7aec90
--- /dev/null
+++ b/src/app/components/add-activity-to-group/add-activity-to-group.component.html
@@ -0,0 +1,5 @@
+<ng-container *ngIf="(state$ | async) as state">
+    <div class="text-center" *ngIf="state">
+        <button class="add-to-group-button" (click)="addActivityToGroup(state);">{{'ADD_TO_GROUP_ACTIVITY' | translate}}</button>
+    </div>
+</ng-container>
\ No newline at end of file
diff --git a/src/app/components/add-activity-to-group/add-activity-to-group.component.scss b/src/app/components/add-activity-to-group/add-activity-to-group.component.scss
new file mode 100644
index 000000000..e768e3e69
--- /dev/null
+++ b/src/app/components/add-activity-to-group/add-activity-to-group.component.scss
@@ -0,0 +1,16 @@
+@import "src/assets/styles/_variables.scss";
+
+.add-to-group-button {
+    background-color: $blue;
+    border: none;
+    color: white;
+    text-align: center;
+    text-decoration: none;
+    display: inline-block;
+    font-size: 16px;
+    cursor: pointer;
+    outline: none;
+    margin: 4px 0 8px;
+    width: 90%;
+    padding: 16px 0 16px 0;
+}
\ No newline at end of file
diff --git a/src/app/components/add-activity-to-group/add-activity-to-group.component.spec.ts b/src/app/components/add-activity-to-group/add-activity-to-group.component.spec.ts
new file mode 100644
index 000000000..baaf45d2f
--- /dev/null
+++ b/src/app/components/add-activity-to-group/add-activity-to-group.component.spec.ts
@@ -0,0 +1,124 @@
+import { of } from 'rxjs';
+import { AddActivityToGroupComponent } from './add-activity-to-group.component';
+import { GroupHandlerService, CommonUtilService } from '@app/services';
+import { CsGroupAddableBloc } from '@project-sunbird/client-services/blocs';
+
+describe('AddActivityToGroupComponent', () => {
+    let addActivityToGroupComponent: AddActivityToGroupComponent;
+    const mockGroupHandlerService: GroupHandlerService = {};
+    const mockCommonUtilService: CommonUtilService = {
+        showToast: jest.fn()
+    };
+
+    beforeAll(() => {
+        addActivityToGroupComponent = new AddActivityToGroupComponent(
+            mockGroupHandlerService as GroupHandlerService,
+            mockCommonUtilService as CommonUtilService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('Should instanciate AddActivityToGroupComponent', () => {
+        expect(addActivityToGroupComponent).toBeTruthy();
+    });
+
+    describe('ngOninit', () => {
+        // beforeEach(() => {
+        //     const state = {
+        //         pageIds: [],
+        //         params: {}
+        //     };
+        //     jest.spyOn(CsGroupAddableBloc.instance, 'state', 'get').mockReturnValue(state);
+        // });
+
+        describe('when groupaddablecontext is not initialised', () => {
+            it('should initialise the state as undefined', (done) => {
+                // arrange
+                jest.spyOn(CsGroupAddableBloc.instance, 'initialised', 'get').mockReturnValue(false);
+                // act
+                addActivityToGroupComponent.ngOnInit();
+                // assert
+                addActivityToGroupComponent.state$.subscribe((v) => {
+                    expect(v).toBeUndefined();
+                    done();
+                });
+            });
+        });
+        describe('when groupaddablecontext is initialised', () => {
+            it('should initialise the state with CsGroupAddableBloc', (done) => {
+                // arrange
+                jest.spyOn(CsGroupAddableBloc.instance, 'initialised', 'get').mockReturnValue(true);
+                jest.spyOn(CsGroupAddableBloc.instance, 'state$', 'get').mockReturnValue(of({ pageIds: ['page1'] }));
+                addActivityToGroupComponent.pageId = 'page1';
+                // act
+                addActivityToGroupComponent.ngOnInit();
+                // assert
+                addActivityToGroupComponent.state$.subscribe((v) => {
+                    expect(v).toEqual({ pageIds: ['page1'] });
+                    done();
+                });
+            });
+        });
+    });
+
+    describe('addActivityToGroup', () => {
+        it('should addActivityToGroup', (done) => {
+            // arrange
+            const data = {
+                pageIds: [],
+                groupId: 'group_id',
+                params: {
+                    activityId: 'some_identifier',
+                    activityType: 'some_type',
+                    pageId: 'some_page_id',
+                    corRelation: [],
+                    noOfPagesToRevertOnSuccess: -3,
+                    activityList: [{
+                        id: 'some_identifier1'
+                    }]
+                }
+            };
+            addActivityToGroupComponent.identifier = 'some_identifier';
+            addActivityToGroupComponent.pageId = 'some_page_id';
+            mockGroupHandlerService.addActivityToGroup = jest.fn();
+            // act
+            addActivityToGroupComponent.addActivityToGroup(data);
+            // assert
+            setTimeout(() => {
+                expect(mockGroupHandlerService.addActivityToGroup).toHaveBeenCalledWith(
+                    'group_id', 'some_identifier', 'some_type', 'some_page_id', [], -3);
+                done();
+            }, 0);
+        });
+
+        it('should show message if activity already exists', () => {
+            // arrange
+            const data = {
+                pageIds: [],
+                groupId: 'group_id',
+                params: {
+                    activityId: 'some_identifier',
+                    activityType: 'some_type',
+                    pageId: 'some_page_id',
+                    corRelation: [],
+                    noOfPagesToRevertOnSuccess: -3,
+                    activityList: [{
+                        id: 'some_identifier'
+                    }]
+                }
+            };
+            addActivityToGroupComponent.identifier = 'some_identifier';
+            addActivityToGroupComponent.pageId = 'some_page_id';
+            mockGroupHandlerService.addActivityToGroup = jest.fn();
+            // act
+            addActivityToGroupComponent.addActivityToGroup(data);
+            // assert
+            expect(mockCommonUtilService.showToast).toHaveBeenCalled();
+        });
+    });
+
+});
diff --git a/src/app/components/add-activity-to-group/add-activity-to-group.component.ts b/src/app/components/add-activity-to-group/add-activity-to-group.component.ts
new file mode 100644
index 000000000..7c9d31cc5
--- /dev/null
+++ b/src/app/components/add-activity-to-group/add-activity-to-group.component.ts
@@ -0,0 +1,47 @@
+import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { CommonUtilService, GroupHandlerService } from '@app/services';
+import { CsGroupAddableBloc, CsGroupAddableState } from '@project-sunbird/client-services/blocs';
+import { Observable, of } from 'rxjs';
+import { filter } from 'rxjs/operators';
+
+@Component({
+    selector: 'add-activity-to-group',
+    templateUrl: './add-activity-to-group.component.html',
+    styleUrls: ['./add-activity-to-group.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class AddActivityToGroupComponent implements OnInit {
+
+    @Input() identifier: string;
+    @Input() pageId: string;
+    state$: Observable<CsGroupAddableState | undefined>;
+
+    constructor(
+        private groupHandlerService: GroupHandlerService,
+        private commonUtilService: CommonUtilService
+    ) {
+    }
+
+    ngOnInit() {
+        if (CsGroupAddableBloc.instance.initialised) {
+            this.state$ = CsGroupAddableBloc.instance.state$.pipe(
+                filter((state) => state && state.pageIds.includes(this.pageId))
+            );
+        } else {
+            this.state$ = of(undefined);
+        }
+    }
+
+    async addActivityToGroup(state: CsGroupAddableState) {
+        if (state.params.activityList) {
+            const activityExist = state.params.activityList.find(activity => activity.id === this.identifier);
+            if (activityExist) {
+                this.commonUtilService.showToast('ACTIVITY_ALREADY_ADDED_IN_GROUP');
+                return;
+            }
+        }
+        this.groupHandlerService.addActivityToGroup(state.groupId, this.identifier, state.params.activityType,
+            this.pageId, state.params.corRelation, state.params.noOfPagesToRevertOnSuccess);
+    }
+
+}
diff --git a/src/app/components/application-header/application-header-kebab-menu.component.scss b/src/app/components/application-header/application-header-kebab-menu.component.scss
new file mode 100644
index 000000000..577c2139c
--- /dev/null
+++ b/src/app/components/application-header/application-header-kebab-menu.component.scss
@@ -0,0 +1,16 @@
+@import "src/assets/styles/base/_variables.scss";
+@import "src/assets/styles/_custom-mixins.scss";
+@import "src/assets/styles/_variables.scss";
+
+:host {
+  .item.item-block {
+    border-bottom: 2px solid map-get($colors, gray_light);
+    &:last-child {
+      border-bottom: 0px;
+    }
+  }
+
+  .list-md .item-block .item-inner {
+    border-bottom: 0px;
+  }
+}
diff --git a/src/app/components/application-header/application-header-kebab-menu.component.ts b/src/app/components/application-header/application-header-kebab-menu.component.ts
new file mode 100644
index 000000000..770b318a2
--- /dev/null
+++ b/src/app/components/application-header/application-header-kebab-menu.component.ts
@@ -0,0 +1,29 @@
+import {Component, Input} from '@angular/core';
+import {PopoverController} from '@ionic/angular';
+
+export interface KebabMenuOption {
+  label: string;
+  value: any;
+}
+
+@Component({
+  selector: 'app-application-header-kebab-menu',
+  template: `
+      <ion-list lines="none">
+          <ion-item *ngFor="let option of options" (click)="onOptionSelect($event, option)">{{ option.label | translate }}</ion-item>
+      </ion-list>
+  `,
+  styleUrls: ['./application-header-kebab-menu.component.scss']
+})
+export class ApplicationHeaderKebabMenuComponent {
+  @Input() options: KebabMenuOption[] = [];
+  
+  constructor(
+    private popOverCtrl: PopoverController
+  ) {
+  }
+
+  public onOptionSelect($event: MouseEvent, option: KebabMenuOption) {
+    this.popOverCtrl.dismiss({ option });
+  }
+}
diff --git a/src/app/components/application-header/application-header.component.html b/src/app/components/application-header/application-header.component.html
index f833c95c2..1bbc15fa1 100644
--- a/src/app/components/application-header/application-header.component.html
+++ b/src/app/components/application-header/application-header.component.html
@@ -3,12 +3,12 @@
 
     <ion-buttons class="sb-hamburger" slot="start" *ngIf="headerConfig?.showBurgerMenu">
       <ion-button class="sb-hamburger-menu sb-hamburger-icon" icon-only (click)="toggleMenu()">
-        <img src="./assets/imgs/ic_burger_menu.png" class="tool-icon" alt="burger menu">
+        <img src="./assets/imgs/ic_burger_menu.svg" class="tool-icon" alt="burger menu">
       </ion-button>
     </ion-buttons>
     <ion-buttons class="sb-hamburger" slot="start" *ngIf="!headerConfig?.showBurgerMenu">
       <ion-button icon-only (click)="emitEvent($event, 'back');">
-        <ion-icon class="arrow-icon" ios="ios-arrow-back" md="md-arrow-back"></ion-icon>
+        <ion-icon class="arrow-icon" name="arrow-back"></ion-icon>
       </ion-button>
     </ion-buttons>
     <ion-title class="color f16" *ngIf="headerConfig?.pageTitle?.length >0">{{headerConfig?.pageTitle}}</ion-title>
@@ -45,15 +45,19 @@
         (click)="emitEvent($event, 'settings');">
         <ion-icon name="settings"></ion-icon>
       </ion-button>
-<!--      <ion-button icon-only *ngIf="headerConfig?.actionButtons?.indexOf('notification') >=0"-->
-<!--        (click)="emitEvent($event, 'notification');" class="active-download-icon">-->
-<!--        <ion-icon md="md-notifications-outline" ios="ios-notifications-outline"></ion-icon>-->
-<!--      </ion-button>-->
+      <ion-button icon-only *ngIf="headerConfig?.actionButtons?.indexOf('notification') >=0"
+        (click)="emitEvent($event, 'notification');" class="active-download-icon">
+        <img src="assets/imgs/notification.svg" class="tool-icon" alt="notification">
+        <ion-badge class="badge-container" *ngIf="unreadNotificationsCount">{{unreadNotificationsCount}}</ion-badge>
+      </ion-button>
       <ion-button icon-only *ngIf="headerConfig?.actionButtons?.indexOf('search') >=0"
         (click)="emitEvent($event, 'search');">
         <img src="./assets/imgs/ic_search.png" class="tool-icon" alt="search">
       </ion-button>
-
+      <ion-button icon-only *ngIf="headerConfig?.actionButtons?.indexOf('information') >=0"
+        (click)="emitEvent($event, 'information');">
+        <img src="./assets/imgs/ic_info_circle.svg" class="tool-icon" alt="information">
+      </ion-button>
       <ion-button icon-only *ngIf="headerConfig?.actionButtons?.indexOf('person') >=0"
         (click)="emitEvent($event, 'person');">
         <ion-icon name="person"></ion-icon>
@@ -68,11 +72,30 @@
       </ion-button>
       <ion-button icon-only *ngIf="headerConfig?.actionButtons?.indexOf('share') >=0"
         (click)="emitEvent($event, 'share');">
-        <ion-icon md="md-share" class="ion-float-right"></ion-icon>
+        <ion-icon name="share" class="ion-float-right"></ion-icon>
       </ion-button>
+      <ion-buttons icon-only *ngIf="headerConfig?.actionButtons?.indexOf('sync-done') >=0" style="font-size: 1.8rem;">
+        <ion-icon name="cloud-done" class="ion-float-right" style="color: green;"></ion-icon>
+      </ion-buttons>
+      <ion-buttons icon-only *ngIf="headerConfig?.actionButtons?.indexOf('sync-offline') >=0"
+        (click)="emitEvent($event, 'sync');" style="font-size: 1.8rem;">
+        <ion-icon name="cloud-upload" class="ion-float-right"></ion-icon>
+      </ion-buttons>
       <ion-button icon-only *ngIf="headerConfig?.actionButtons?.indexOf('more') >=0"
         (click)="emitEvent($event, 'more');" style="font-size: 1.8rem;">
-        <ion-icon class="ion-float-end" md="md-more"></ion-icon>
+        <ion-icon class="ion-float-end" md="ellipsis-vertical"></ion-icon>
+      </ion-button>
+      <ion-button icon-only *ngIf="headerConfig?.actionButtons?.indexOf('groupInfo') >=0"
+        (click)="emitEvent($event, 'groupInfo');" style="font-size: 1.8rem;">
+        <ion-icon class="ion-float-end" name="information-circle-outline"></ion-icon>
+      </ion-button>
+      <ion-button icon-only *ngIf="headerConfig?.actionButtons?.indexOf('questionMap') >=0"
+        (click)="emitEvent($event, 'questionMap');" style="font-size: 1.8rem;">
+        <ion-icon class="ion-float-end" name="map"></ion-icon>
+      </ion-button>
+      <ion-button icon-only *ngIf="headerConfig?.showKebabMenu" (click)="showKebabMenu($event)"
+        style="font-size: 1.8rem; padding: 0 16px;">
+        <img class="menu-icon" src="assets/imgs/menu.svg" alt="menu-icon">
       </ion-button>
     </ion-buttons>
 
@@ -81,7 +104,7 @@
 
 <ion-menu contentId="mainContent" class="sb-side-menu" *ngIf="isRtl" side="end" persistent="true"
   [swipeGesture]="headerConfig?.showBurgerMenu || false">
-  <ion-header>
+  <ion-header *ngIf="!isLoggedIn">
     <ion-toolbar>
       <ion-title>
         <img class="img-container" src="{{appLogo}}" alt="app logo">
@@ -90,54 +113,119 @@
     </ion-toolbar>
   </ion-header>
   <ion-content>
-    <ion-list class="sb-menu-list" lines="none">
+    <div class="menu-section">
+      <section *ngIf="isLoggedIn" class="menu-container">
+        <ng-container *ngIf="(managedProfileList$ | async); let managedProfileList">
+          <section class="user-container">
 
-      <ion-item (click)="emitSideMenuItemEvent($event, 'USERS_AND_GROUPS')">
-        <span class="sb-menu-icon">
-          <img src="./assets/imgs/Users_and_Groups.png" class="tool-icon" alt="user and group">
-        </span>
-        <span class="sb-menu-item" menuClose>{{'USERS_AND_GROUPS' | translate}}</span>
-      </ion-item>
+            <div *ngIf="profile?.handle">
+              <sb-member-card [title]="profile?.handle" [config]="userAvatarConfig"
+                [initial]="profile?.handle | initial">
+              </sb-member-card>
+            </div>
 
-      <ion-item (click)="emitSideMenuItemEvent($event, 'REPORTS')">
-        <span class="sb-menu-icon">
-          <img src="./assets/imgs/Reports.png" class="tool-icon" alt="user report">
-        </span>
-        <span class="sb-menu-item" menuClose>{{'REPORTS' | translate}}</span>
-      </ion-item>
+            <div class="use-app-label sb-menu-item">
+              <span>{{'USE_APP_AS' | translate: {'%s': appName} }}</span>
+            </div>
 
-      <ion-item (click)="emitSideMenuItemEvent($event, 'LANGUAGE')">
-        <span class="sb-menu-icon sb-pt-6">
-          <img src="./assets/imgs/Language.png" class="tool-icon" alt="select app language">
-        </span>
-        <div class="sb-language">
-          <div class="sb-menu-item">{{'LANGUAGE' | translate}}</div>
-          <div class="sb-menu-item-language">{{selectedLanguage}}</div>
-        </div>
-      </ion-item>
+            <section class="managed-user-container">
 
-      <ion-item (click)="emitSideMenuItemEvent($event, 'SETTINGS')">
-        <span class="sb-menu-icon">
-          <img src="./assets/imgs/Settings.png" class="tool-icon" alt="app settings">
-        </span>
-        <span class="sb-menu-item" menuClose>{{'SETTINGS' | translate}}</span>
-      </ion-item>
+              <div class="mu-card" *ngFor="let user of managedProfileList |slice:0:2; let i = index"
+                (click)="switchUser(user)">
+                <sb-member-card [title]="user?.firstName" [identifier]="user?.id" [indexOfMember]="i"
+                  [initial]="user?.firstName | initial">
+                </sb-member-card>
+              </div>
 
-      <ion-item (click)="emitSideMenuItemEvent($event, 'HELP')">
-        <span class="sb-menu-icon">
-          <img src="./assets/imgs/Help.png" class="tool-icon" alt="help">
-        </span>
-        <span class="sb-menu-item" menuClose>{{'HELP' | translate}}</span>
-      </ion-item>
+              <div class="add-manage-user mu-card" *ngIf="managedProfileList.length <= 2" (click)="addManagedUser()">
+                <sb-member-card [title]="'ADD_USER' | translate" [initial]="'+'">
+                </sb-member-card>
+              </div>
 
-      <ion-item (click)="emitSideMenuItemEvent($event, 'LOGOUT')" *ngIf="isLoggedIn">
-        <span class="sb-menu-icon">
-          <img src="./assets/imgs/Sign_out.png" class="tool-icon" alt="logout">
-        </span>
-        <span class="sb-menu-item" menuClose>{{'LOGOUT' | translate}}</span>
-      </ion-item>
+              <div class="more-manage-user mu-card" *ngIf="managedProfileList.length > 2" (click)="openManagedUsers()">
+                <sb-member-card [title]="'MORE_COUNT' | translate: {'%s':managedProfileList.length-2}"
+                  [initial]="'...'">
+                </sb-member-card>
+              </div>
+            </section>
+
+          </section>
+          <div *ngIf="managedProfileList.length > 2" class="another-user-title" (click)="addManagedUser()">
+            <span class="add-sign">+</span> {{'ADD_ANOTHER_USER' | translate}}
+          </div>
+        </ng-container>
+      </section>
+      <ion-list class="sb-menu-list" lines="none">
+
+        <ion-item (click)="emitSideMenuItemEvent($event, 'MY_GROUPS')">
+          <span class="sb-menu-icon">
+            <img src="./assets/imgs/my_group.svg" class="tool-icon" alt="my group">
+          </span>
+          <span class="sb-menu-item" menuClose>{{'MY_GROUPS' | translate}}</span>
+          <div class="new-feature-badge">
+            <div class="square-badge">New</div>
+            <div class="circle-badge"></div>
+          </div>
+        </ion-item>
+
+        <ion-item (click)="switchTheme()">
+          <span class="sb-menu-icon">
+            <img src="./assets/imgs/Help.png" class="tool-icon sb-menu-item-switch" alt="help">
+          </span>
+          <span *ngIf="appTheme === 'DEFAULT'" class="sb-menu-item"
+            menuClose>{{SWITCH_TO_JOYFUL_THEME | translate}}</span>
+          <span *ngIf="appTheme === 'JOYFUL'" class="sb-menu-item"
+            menuClose>{{SWITCH_TO_CLASSIC_THEME | translate}}</span>
+          <div class="new-feature-badge">
+            <div class="square-badge">New</div>
+            <div class="circle-badge"></div>
+          </div>
+        </ion-item>
+
+        <ion-item (click)="emitSideMenuItemEvent($event, 'IMPORT')">
+          <span class="sb-menu-icon">
+            <img src="./assets/imgs/ic_import.png" class="tool-icon" alt="import">
+          </span>
+          <span class="sb-menu-item" menuClose>{{'IMPORT_CONTENT' | translate}}</span>
+          <div class="new-feature-badge">
+            <div class="square-badge">New</div>
+            <div class="circle-badge"></div>
+          </div>
+        </ion-item>
+
+        <ion-item (click)="emitSideMenuItemEvent($event, 'LANGUAGE')">
+          <span class="sb-menu-icon sb-pt-6">
+            <img src="./assets/imgs/Language.png" class="tool-icon" alt="select app language">
+          </span>
+          <div class="sb-language">
+            <div class="sb-menu-item">{{'LANGUAGE' | translate}}</div>
+            <div class="sb-menu-item-language">{{selectedLanguage}}</div>
+          </div>
+        </ion-item>
+
+        <ion-item (click)="emitSideMenuItemEvent($event, 'SETTINGS')">
+          <span class="sb-menu-icon">
+            <img src="./assets/imgs/Settings.png" class="tool-icon" alt="app settings">
+          </span>
+          <span class="sb-menu-item" menuClose>{{'SETTINGS' | translate}}</span>
+        </ion-item>
+
+        <ion-item (click)="emitSideMenuItemEvent($event, 'HELP')">
+          <span class="sb-menu-icon">
+            <img src="./assets/imgs/Help.png" class="tool-icon" alt="help">
+          </span>
+          <span class="sb-menu-item" menuClose>{{'HELP' | translate}}</span>
+        </ion-item>
 
-    </ion-list>
+        <ion-item (click)="emitSideMenuItemEvent($event, 'LOGOUT')" *ngIf="isLoggedIn">
+          <span class="sb-menu-icon">
+            <img src="./assets/imgs/Sign_out.png" class="tool-icon" alt="logout">
+          </span>
+          <span class="sb-menu-item" menuClose>{{'LOGOUT' | translate}}</span>
+        </ion-item>
+
+      </ion-list>
+    </div>
   </ion-content>
   <ion-footer class="side-menu-footer">
     {{'VERSION'| translate}} {{versionName}}.{{versionCode}}
@@ -146,7 +234,7 @@
 
 <ion-menu contentId="mainContent" class="sb-side-menu" *ngIf="!isRtl" side="start" persistent="true"
   [swipeGesture]="headerConfig?.showBurgerMenu || false">
-  <ion-header>
+  <ion-header *ngIf="!isLoggedIn">
     <ion-toolbar>
       <ion-title>
         <img class="img-container" src="{{appLogo}}" alt="app logo">
@@ -155,56 +243,162 @@
     </ion-toolbar>
   </ion-header>
   <ion-content>
-    <ion-list class="sb-menu-list" lines="none">
 
-      <ion-item (click)="emitSideMenuItemEvent($event, 'USERS_AND_GROUPS')">
-        <span class="sb-menu-icon">
-          <img src="./assets/imgs/Users_and_Groups.png" class="tool-icon" alt="user and group">
-        </span>
-        <span class="sb-menu-item" menuClose>{{'USERS_AND_GROUPS' | translate}}</span>
-      </ion-item>
+    <div class="menu-section">
+      <section *ngIf="isLoggedIn" class="menu-container">
+        <ng-container *ngIf="(managedProfileList$ | async); let managedProfileList">
+          <section class="user-container">
 
-      <ion-item (click)="emitSideMenuItemEvent($event, 'REPORTS')">
-        <span class="sb-menu-icon">
-          <img src="./assets/imgs/Reports.png" class="tool-icon" alt="user report">
-        </span>
-        <span class="sb-menu-item" menuClose>{{'REPORTS' | translate}}</span>
-      </ion-item>
+            <div *ngIf="profile?.handle">
+              <sb-member-card [title]="profile?.handle" [config]="userAvatarConfig"
+                [initial]="profile?.handle | initial">
+              </sb-member-card>
+            </div>
 
-      <ion-item (click)="emitSideMenuItemEvent($event, 'LANGUAGE')">
-        <span class="sb-menu-icon sb-pt-6">
-          <img src="./assets/imgs/Language.png" class="tool-icon" alt="select app langugae">
-        </span>
-        <div class="sb-language">
-          <div class="sb-menu-item">{{'LANGUAGE' | translate}}</div>
-          <div class="sb-menu-item-language">{{selectedLanguage}}</div>
-        </div>
-      </ion-item>
+            <div class="use-app-label">
+              <span>{{'USE_APP_AS' | translate: {'%s': appName} }}</span>
+            </div>
 
-      <ion-item (click)="emitSideMenuItemEvent($event, 'SETTINGS')">
-        <span class="sb-menu-icon">
-          <img src="./assets/imgs/Settings.png" class="tool-icon" alt="app settings">
-        </span>
-        <span class="sb-menu-item" menuClose>{{'SETTINGS' | translate}}</span>
-      </ion-item>
+            <section class="managed-user-container">
 
-      <ion-item (click)="emitSideMenuItemEvent($event, 'HELP')">
-        <span class="sb-menu-icon">
-          <img src="./assets/imgs/Help.png" class="tool-icon" alt="help">
-        </span>
-        <span class="sb-menu-item" menuClose>{{'HELP' | translate}}</span>
-      </ion-item>
+              <div class="mu-card" *ngFor="let user of managedProfileList |slice:0:2; let i = index"
+                (click)="switchUser(user)">
+                <sb-member-card [title]="user?.firstName" [identifier]="user?.id" [indexOfMember]="i"
+                  [initial]="user?.firstName | initial">
+                </sb-member-card>
+              </div>
+
+              <div class="add-manage-user mu-card" *ngIf="managedProfileList.length <= 2" (click)="addManagedUser()">
+                <sb-member-card [title]="'ADD_USER' | translate" [initial]="'+'">
+                </sb-member-card>
+              </div>
+
+              <div class="more-manage-user mu-card" *ngIf="managedProfileList.length > 2" (click)="openManagedUsers()">
+                <sb-member-card [title]="'MORE_COUNT' | translate: {'%s':managedProfileList.length-2}"
+                  [initial]="'...'">
+                </sb-member-card>
+              </div>
+            </section>
+
+          </section>
+          <div *ngIf="managedProfileList.length > 2" class="another-user-title" (click)="addManagedUser()">
+            <span class="add-sign">+</span> {{'ADD_ANOTHER_USER' | translate}}
+          </div>
+        </ng-container>
+      </section>
 
-      <ion-item (click)="emitSideMenuItemEvent($event, 'LOGOUT')" *ngIf="isLoggedIn">
+      <ion-list class="sb-menu-list" lines="none">
+
+        <ion-item (click)="emitSideMenuItemEvent($event, 'MY_GROUPS')">
+          <span class="sb-menu-icon">
+            <img src="./assets/imgs/my_group.svg" class="tool-icon" alt="my group">
+          </span>
+          <span class="sb-menu-item" menuClose>{{'MY_GROUPS' | translate}}</span>
+          <div class="new-feature-badge">
+            <div class="square-badge">New</div>
+            <div class="circle-badge"></div>
+          </div>
+        </ion-item>
+
+        <!-- <ion-item (click)="switchTheme()">
         <span class="sb-menu-icon">
-          <img src="./assets/imgs/Sign_out.png" class="tool-icon" alt="logout">
+          <img src="./assets/imgs/ic_switch.svg" class="tool-icon sb-menu-item-switch" alt="help">
         </span>
-        <span class="sb-menu-item" menuClose>{{'LOGOUT' | translate}}</span>
+        <span *ngIf="appTheme === 'DEFAULT'" class="sb-menu-item" menuClose>{{'SWITCH_TO_JOYFUL_THEME' | translate}}</span>
+        <span *ngIf="appTheme === 'JOYFUL'" class="sb-menu-item" menuClose>{{'SWITCH_TO_CLASSIC_THEME' | translate}}</span>
+        <div class="new-feature-badge">
+          <div class="square-badge">New</div>
+          <div class="circle-badge"></div>
+        </div>
+      </ion-item> -->
+        <ion-item (click)="switchTabs()">
+          <div class="beta-info">
+            <span class="sb-menu-icon">
+              <img src="./assets/imgs/ic_switch.svg" class="tool-icon sb-menu-item-switch" alt="help">
+            </span>
+            <div><span *ngIf="currentSelectedTabs === 'HOME_DISCOVER_TABS_CONFIG'" class="sb-menu-item"
+                menuClose>{{'FRMELEMNTS_LBL_SWITCH_TO_LIBRARY' | translate: {'appName': appName} }}</span>
+              <span *ngIf="!currentSelectedTabs || currentSelectedTabs === 'RESOURCE_COURSE_TABS_CONFIG'"
+                class="sb-menu-item"
+                menuClose>{{'FRMELEMNTS_LBL_SWITCH_TO_HOME' | translate: {'appName': appName} }}</span>
+              <span class="new-feature-badge"
+                *ngIf="!currentSelectedTabs || currentSelectedTabs === 'RESOURCE_COURSE_TABS_CONFIG'">
+                <div class="square-badge">Beta</div>
+                <div class="circle-badge"></div>
+              </span></div>
+          </div>
+        </ion-item>
+
+        <ion-item (click)="switchMode()">
+          <span class="sb-menu-icon dark-mode-icon">
+            <img src="./assets/imgs/darkmode.svg" class="tool-icon sb-menu-item-switch" alt="darkmode">
+          </span>
+          <span *ngIf="!isDarkMode" class="sb-menu-item" menuClose>{{'SWITCH_TO_DARK_MODE' | translate}}</span>
+            <span *ngIf="isDarkMode" class="sb-menu-item" menuClose>{{'SWITCH_TO_DEFAULT' | translate}}</span>
+            <div class="onoffswitch">
+                <input type="checkbox" (click)="switchMode()" name="onoffswitch" class="onoffswitch-checkbox" id="myonoffswitch" [(ngModel)]="isDarkMode">
+                <label class="onoffswitch-label" for="myonoffswitch">
+                    <div class="onoffswitch-inner"></div>
+                    <div class="onoffswitch-switch"></div>
+                </label>
+            </div>
       </ion-item>
 
-    </ion-list>
+        <ion-item (click)="emitSideMenuItemEvent($event, 'IMPORT')">
+          <span class="sb-menu-icon">
+            <img src="./assets/imgs/ic_import.png" class="tool-icon" alt="import">
+          </span>
+          <span class="sb-menu-item" menuClose>{{'IMPORT_CONTENT' | translate}}</span>
+          <div class="new-feature-badge">
+            <div class="square-badge">New</div>
+            <div class="circle-badge"></div>
+          </div>
+        </ion-item>
+
+        <ion-item (click)="emitSideMenuItemEvent($event, 'LANGUAGE')">
+          <span class="sb-menu-icon sb-pt-6">
+            <img src="./assets/imgs/Language.png" class="tool-icon" alt="select app langugae">
+          </span>
+          <div class="sb-language">
+            <div class="sb-menu-item">{{'LANGUAGE' | translate}}</div>
+            <div class="sb-menu-item-language">{{selectedLanguage}}</div>
+          </div>
+        </ion-item>
+
+        <ion-item (click)="emitSideMenuItemEvent($event, 'SETTINGS')">
+          <span class="sb-menu-icon">
+            <img src="./assets/imgs/Settings.png" class="tool-icon" alt="app settings">
+          </span>
+          <span class="sb-menu-item" menuClose>{{'SETTINGS' | translate}}</span>
+        </ion-item>
+
+        <ion-item (click)="emitSideMenuItemEvent($event, 'HELP')">
+          <span class="sb-menu-icon">
+            <img src="./assets/imgs/Help.png" class="tool-icon" alt="help">
+          </span>
+          <span class="sb-menu-item" menuClose>{{'HELP' | translate}}</span>
+        </ion-item>
+
+        <ion-item (click)="emitSideMenuItemEvent($event, 'LOGOUT')" *ngIf="isLoggedIn">
+          <span class="sb-menu-icon">
+            <img src="./assets/imgs/Sign_out.png" class="tool-icon" alt="logout">
+          </span>
+          <span class="sb-menu-item" menuClose>{{'LOGOUT' | translate}}</span>
+        </ion-item>
+
+      </ion-list>
+    </div>
   </ion-content>
-  <ion-footer class="side-menu-footer">
-    {{'VERSION'| translate}} {{versionName}}.{{versionCode}}
+  <ion-footer class="side-menu-footer" style="height: 97px; padding: 26px">
+    <div *ngIf="!isUpdateAvailable">
+      {{'VERSION'| translate}} {{versionName}}.{{versionCode}}
+    </div>
+    <div *ngIf="isUpdateAvailable">
+      <button class="sb-btn sb-btn-md sb-btn-primary PR35 W100 ellipsis text-uppercase btn-block continue"
+        (click)="emitSideMenuItemEvent($event, 'UPDATE')">
+        <img class="update-icon" src="./assets/imgs/ic_update.svg" alt="">
+        <span>{{ 'APP_UPDATE' | translate: {'%s': appName} }}</span>
+      </button>
+    </div>
   </ion-footer>
 </ion-menu>
\ No newline at end of file
diff --git a/src/app/components/application-header/application-header.component.scss b/src/app/components/application-header/application-header.component.scss
index 32c7dad08..75b6ed9e2 100644
--- a/src/app/components/application-header/application-header.component.scss
+++ b/src/app/components/application-header/application-header.component.scss
@@ -1,9 +1,10 @@
 @import "src/assets/styles/base/_variables.scss";
 @import "src/assets/styles/_custom-mixins.scss";
 @import "src/assets/styles/fonts.scss";
+@import "src/assets/styles/_variables.scss";
 
 ion-icon {
-    width: 30px;
+    width: 32px;
     height: 30px;
     color: $primary-color;
 }
@@ -12,7 +13,7 @@ ion-icon {
   }
 :host {
     ion-title.color {
-        color:#024f9d;
+        color:$blue;
         font-weight:bold;
     }
 }
@@ -20,3 +21,159 @@ ion-icon {
 .sb-menu-list > ion-item {
     padding: 3px 0;
 }
+
+.new-feature-badge{
+    color: map-get($colors, white);
+    margin-left: 8px;
+    background-color: map-get($colors, bright_red);
+    font-size: 8px;
+    font-weight: bold;
+    height: 12px;
+    display: inline-flex;
+    .square-badge{
+        padding: 1px 6px;
+        float: left;
+        line-height: 1.5;
+    }
+    .circle-badge{
+        float: right;
+        border: 1px solid map-get($colors, white);
+        border-radius: 16px 0 0 16px;
+        background-color: map-get($colors, white);
+        height: 12px;
+        width: 16px;
+    }
+}
+
+.user-container{
+    padding: 8px;
+    background-color: $light-blue;
+
+    .use-app-label{
+        color: map-get($colors, granite_gray);
+        font-family: "Noto Sans", serif;
+        font-size: 14px;
+        letter-spacing: 0;
+        line-height: 14px;
+        margin: 8px 8px 0;
+    }
+
+    .managed-user-container {
+        display: -webkit-box;
+        text-align: center;
+
+        .mu-card {
+            flex: 0 0 33.33%;
+        }
+    }
+}
+
+.another-user-title{
+    background-color: map-get($colors, light_grayish_green);
+    color: $green;
+    font-family: "Noto Sans", serif;
+    font-size: 16px;
+    letter-spacing: 0;
+    line-height: 16px;
+    padding: 12px 16px;
+}
+
+.add-sign{
+    font-size: 24px;
+    padding: 0 4px ;
+}
+
+.sb-menu-item-switch{
+    position: relative;
+    top: 5px;
+}
+.badge-container{
+    position: absolute;
+    top: 0.2rem;
+    left: 0.2rem;
+    background: var(--app-tertiary);
+    color: white;
+    font-size: 9px;
+    padding-bottom: 3px;
+    border-radius: 6px;
+}
+
+.update-icon {
+    height: auto;
+    float: left;
+    margin-right: 16px;
+}
+
+.beta-info {
+    display: grid;
+    grid-template-columns: auto auto
+}
+  // Modified CSS for on/off switch
+  .onoffswitch {
+      position: relative; 
+      width: 41px;
+      margin-left: 8px;
+    font-size: 8px;
+    font-weight: 700;
+      -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none;
+  }
+  
+  .onoffswitch-checkbox {
+      display: none;
+  }
+  
+  .onoffswitch-label {
+      display: block; 
+      overflow: hidden; 
+      cursor: pointer;
+      border: 1px solid #fff; 
+      border-radius: 20px;
+      margin-bottom: auto;
+  }
+  
+  .onoffswitch-inner {
+      width: 200%; margin-left: -100%;
+      -moz-transition: margin 0.3s ease-in 0s; -webkit-transition: margin 0.3s ease-in 0s;
+      -o-transition: margin 0.3s ease-in 0s; transition: margin 0.3s ease-in 0s;
+  }
+  
+  .onoffswitch-inner:before, .onoffswitch-inner:after {
+      float: left; width: 50%; height: 15px; padding: 0; line-height: 15px;
+      font-size: 8px; color: white; font-family: Trebuchet, Arial, sans-serif; font-weight: bold;
+      -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
+  }
+  
+  .onoffswitch-inner:before {
+      content: "ON";
+      padding-left: 8px;
+      background-color: #008000; color: #FFFFFF;
+  }
+  
+  .onoffswitch-inner:after {
+      content: "OFF";
+      padding-right: 8px;
+      background-color: #ff6979; color: #fff;
+      text-align: right;
+  }
+  
+  .onoffswitch-switch {
+      width: 13px; margin: 1px;
+      height: 16px;
+      background: #fff!important;
+      border: 1px solid #fff; border-radius: 20px;
+      position: absolute; top: -0.5px; bottom: 0; right: 26px;
+      -moz-transition: all 0.3s ease-in 0s; -webkit-transition: all 0.3s ease-in 0s;
+      -o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s; 
+  }
+  
+  .onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-inner {
+      margin-left: 0;
+  }
+  
+  .onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-switch {
+      right: 0px; 
+  }
+  .dark-mode-icon{
+      height: 36px !important;
+  }
+  
\ No newline at end of file
diff --git a/src/app/components/application-header/application-header.component.spec.ts b/src/app/components/application-header/application-header.component.spec.ts
new file mode 100644
index 000000000..10150c77e
--- /dev/null
+++ b/src/app/components/application-header/application-header.component.spec.ts
@@ -0,0 +1,132 @@
+import {ApplicationHeaderComponent} from '@app/app/components/application-header/application-header.component';
+import {DownloadService, EventsBusService, ProfileService, SharedPreferences} from 'sunbird-sdk';
+import {NotificationService as PushNotificationService} from 'sunbird-sdk/notification/def/notification-service';
+import {MenuController, Platform, PopoverController} from '@ionic/angular';
+import { Events } from '@app/util/events';
+import {
+    ActivePageService,
+    AppGlobalService, AppHeaderService,
+    CommonUtilService,
+    NotificationService,
+    TelemetryGeneratorService,
+    UtilityService
+} from '@app/services';
+import {AppVersion} from '@ionic-native/app-version/ngx';
+import {ChangeDetectorRef, NgZone} from '@angular/core';
+import {TranslateService} from '@ngx-translate/core';
+import {Router} from '@angular/router';
+import {TncUpdateHandlerService} from '@app/services/handlers/tnc-update-handler.service';
+import {of} from 'rxjs';
+
+describe('ApplicationHeaderComponent', () => {
+    let applicationHeaderComponent: ApplicationHeaderComponent;
+
+    window.cordova.plugins = {
+        InAppUpdateManager: {
+            isUpdateAvailable: jest.fn((fn) => fn(Promise.resolve('22')))
+        }
+    };
+
+    const param = {selectedLanguage: 'en'};
+    const mockPreferences: Partial<SharedPreferences> = {
+        getString: jest.fn(() => of('en' as any))
+    };
+    const mockDownloadService: Partial<DownloadService> = {};
+    const mockPushNotificationService: Partial<PushNotificationService> = {
+        getAllNotifications: jest.fn(() => of([{}]))
+    };
+    const mockEventBusService: Partial<EventsBusService> = {};
+    const mockProfileService: Partial<ProfileService> = {};
+    const mockMenuController: Partial<MenuController> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+    const mockEvents: Partial<Events> = {
+        subscribe: jest.fn((_, fn) => fn(param))
+    };
+    const mockAppGlobalService: Partial<AppGlobalService> = {};
+    const mockAppVersion: Partial<AppVersion> = {};
+    const mockUtilityService: Partial<UtilityService> = {};
+    const mockChangeDetectionRef: Partial<ChangeDetectorRef> = {};
+    const mockNotification: Partial<NotificationService> = {
+        setupLocalNotification: jest.fn()
+    };
+    const mockTranslate: Partial<TranslateService> = {};
+    const mockPlatform: Partial<Platform> = {};
+    const mockRouter: Partial<Router> = {};
+    const mockNgZone: Partial<NgZone> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockActivePageService: Partial<ActivePageService> = {};
+    const mockPopoverController: Partial<PopoverController> = {};
+    const mockTncUpdateHandlerService: Partial<TncUpdateHandlerService> = {};
+    const mockAppHeaderService: Partial<AppHeaderService> = {};
+
+    beforeAll(() => {
+        applicationHeaderComponent = new ApplicationHeaderComponent(
+            mockPreferences as SharedPreferences,
+            mockDownloadService as DownloadService,
+            mockPushNotificationService as PushNotificationService,
+            mockEventBusService as EventsBusService,
+            mockProfileService as ProfileService,
+            mockMenuController as MenuController,
+            mockCommonUtilService as CommonUtilService,
+            mockEvents as Events,
+            mockAppGlobalService as AppGlobalService,
+            mockAppVersion as AppVersion,
+            mockUtilityService as UtilityService,
+            mockChangeDetectionRef as ChangeDetectorRef,
+            mockNotification as NotificationService,
+            mockTranslate as TranslateService,
+            mockPlatform as Platform,
+            mockRouter as Router,
+            mockNgZone as NgZone,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockActivePageService as ActivePageService,
+            mockPopoverController as PopoverController,
+            mockTncUpdateHandlerService as TncUpdateHandlerService,
+            mockAppHeaderService as AppHeaderService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create instance of application header component', () => {
+        expect(applicationHeaderComponent).toBeTruthy();
+    });
+
+    describe('onInit', () => {
+        it('should check for app update when returns true', (done) => {
+            // arrange
+            jest.spyOn(applicationHeaderComponent, 'setAppLogo').mockImplementation();
+            mockUtilityService.getBuildConfigValue = jest.fn(() => Promise.resolve('sample_version_name'));
+            mockEvents.subscribe = jest.fn((topic, fn) => {
+                if (topic === 'user-profile-changed') {
+                    fn();
+                } else if (topic === 'app-global:profile-obj-changed') {
+                    fn();
+                } else if (topic === 'notification-status:update') {
+                    fn({isUnreadNotifications: true});
+                } else if (topic === 'header:decreasezIndex') {
+                    applicationHeaderComponent.decreaseZindex = true;
+                } else if (topic === 'header:setzIndexToNormal') {
+                    applicationHeaderComponent.decreaseZindex = false;
+                }
+            });
+            mockNgZone.run = jest.fn((fn) => fn());
+            mockTranslate.onLangChange = of(true);
+            jest.spyOn(applicationHeaderComponent, 'listenDownloads').mockImplementation();
+            mockPushNotificationService.notifications$ = of([]);
+            mockCommonUtilService.networkAvailability$ = of(true);
+            mockPreferences.getString = jest.fn(() => of('en'));
+            mockNotification.setupLocalNotification = jest.fn();
+            // act
+            applicationHeaderComponent.ngOnInit();
+            // assert
+            setTimeout(() => {
+                expect(mockUtilityService.getBuildConfigValue).toHaveBeenCalled();
+                expect(mockEvents.subscribe).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+});
diff --git a/src/app/components/application-header/application-header.component.ts b/src/app/components/application-header/application-header.component.ts
index 9e1624870..36171b510 100644
--- a/src/app/components/application-header/application-header.component.ts
+++ b/src/app/components/application-header/application-header.component.ts
@@ -1,16 +1,36 @@
-import { ChangeDetectorRef, Component, EventEmitter, Inject, Input, OnInit, Output, OnDestroy, NgZone } from '@angular/core';
-import { Events, MenuController, Platform } from '@ionic/angular';
 import {
-  AppGlobalService, UtilityService, CommonUtilService, NotificationService, TelemetryGeneratorService,
-  InteractType, InteractSubtype, Environment, PageId, ActivePageService
-} from '../../../services';
-import { DownloadService, SharedPreferences, NotificationService as PushNotificationService, NotificationStatus, EventNamespace, DownloadProgress, DownloadEventType, EventsBusService } from 'sunbird-sdk';
-import { GenericAppConfig, PreferenceKey, EventTopics } from '../../../app/app.constant';
+  ChangeDetectorRef, Component, EventEmitter,
+  Inject, Input, NgZone, OnDestroy, OnInit, Output
+} from '@angular/core';
+import { NavigationExtras, Router } from '@angular/router';
+import { ApplicationHeaderKebabMenuComponent } from '@app/app/components/application-header/application-header-kebab-menu.component';
+import { TncUpdateHandlerService } from '@app/services/handlers/tnc-update-handler.service';
 import { AppVersion } from '@ionic-native/app-version/ngx';
-import { Subscription, combineLatest } from 'rxjs';
+import { MenuController, Platform, PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { TranslateService } from '@ngx-translate/core';
-import { NavigationExtras, Router, RouterLink } from '@angular/router';
-import { filter } from 'rxjs/operators';
+import { combineLatest, EMPTY, Observable, Subscription } from 'rxjs';
+import { filter, map } from 'rxjs/operators';
+import {
+  CachedItemRequestSourceFrom,
+  CorrelationData, DownloadEventType, DownloadProgress, DownloadService,
+  EventNamespace, EventsBusService, NotificationService as PushNotificationService, NotificationStatus,
+  Profile, ProfileService,
+  ServerProfile, SharedPreferences
+} from 'sunbird-sdk';
+import {
+  AppThemes, EventTopics, GenericAppConfig, PreferenceKey,
+  ProfileConstants, RouterLinks, SwitchableTabsConfig,AppMode
+} from '../../../app/app.constant';
+import {
+  ActivePageService, AppGlobalService,
+  AppHeaderService, CommonUtilService,
+  CorReleationDataType, Environment,
+  ID, InteractSubtype, InteractType, NotificationService, PageId, TelemetryGeneratorService, UtilityService
+} from '../../../services';
+import { ToastNavigationComponent } from '../popups/toast-navigation/toast-navigation.component';
+
+declare const cordova;
 
 @Component({
   selector: 'app-application-header',
@@ -31,17 +51,25 @@ export class ApplicationHeaderComponent implements OnInit, OnDestroy {
   decreaseZindex = false;
   isRtl: boolean;
   isLoggedIn = false;
-  isDownloadingActive: boolean = false;
-  showDownloadingIcon: boolean = false;
+  isDownloadingActive = false;
+  showDownloadingIcon = false;
   networkSubscription: Subscription;
-  isUnreadNotification: boolean = false;
+  isUnreadNotification = false;
   menuSide = 'left';
-
+  profile: Profile;
+  managedProfileList$: Observable<ServerProfile[]> = EMPTY;
+  userAvatarConfig = { size: 'large', isBold: true, isSelectable: false, view: 'horizontal' };
+  appTheme = AppThemes.DEFAULT;
+  unreadNotificationsCount = 0;
+  isUpdateAvailable = false;
+  currentSelectedTabs: string;
+  isDarkMode:boolean;
   constructor(
     @Inject('SHARED_PREFERENCES') private preference: SharedPreferences,
     @Inject('DOWNLOAD_SERVICE') private downloadService: DownloadService,
     @Inject('NOTIFICATION_SERVICE') private pushNotificationService: PushNotificationService,
     @Inject('EVENTS_BUS_SERVICE') private eventsBusService: EventsBusService,
+    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
     public menuCtrl: MenuController,
     private commonUtilService: CommonUtilService,
     private events: Events,
@@ -55,7 +83,10 @@ export class ApplicationHeaderComponent implements OnInit, OnDestroy {
     private router: Router,
     private ngZone: NgZone,
     private telemetryGeneratorService: TelemetryGeneratorService,
-    private activePageService: ActivePageService
+    private activePageService: ActivePageService,
+    private popoverCtrl: PopoverController,
+    private tncUpdateHandlerService: TncUpdateHandlerService,
+    private appHeaderService: AppHeaderService
   ) {
     this.setLanguageValue();
     this.events.subscribe('onAfterLanguageChange:update', (res) => {
@@ -96,13 +127,21 @@ export class ApplicationHeaderComponent implements OnInit, OnDestroy {
     this.events.subscribe('header:setzIndexToNormal', () => {
       this.decreaseZindex = false;
     });
-    this.listenDownloads();
+    if(window['device'].platform.toLowerCase() !== "ios") {
+      this.listenDownloads();
+    }
+    this.listenNotifications();
     this.networkSubscription = this.commonUtilService.networkAvailability$.subscribe((available: boolean) => {
       this.setAppLogo();
     });
+    this.appTheme = document.querySelector('html').getAttribute('data-theme');
+    this.preference.getString('data-mode').subscribe((val)=>{
+      this.isDarkMode=val==AppMode.DARKMODE?true:false
+    });
+    this.checkForAppUpdate().then();
   }
 
-  setAppVersion(): any {
+  private setAppVersion(): any {
     this.utilityService.getBuildConfigValue(GenericAppConfig.VERSION_NAME)
       .then(vName => {
         this.versionName = vName;
@@ -153,6 +192,12 @@ export class ApplicationHeaderComponent implements OnInit, OnDestroy {
     });
   }
 
+  private listenNotifications() {
+    this.pushNotificationService.notifications$.subscribe((notifications) => {
+      this.unreadNotificationsCount = notifications.filter((n) => !n.isRead).length;
+    });
+  }
+
   setAppLogo() {
     if (!this.appGlobalService.isUserLoggedIn()) {
       this.isLoggedIn = false;
@@ -172,10 +217,11 @@ export class ApplicationHeaderComponent implements OnInit, OnDestroy {
       this.preference.getString('app_name').toPromise().then(value => {
         this.appName = value;
       });
+      this.fetchManagedProfileDetails();
     }
   }
 
-  toggleMenu() {
+  async toggleMenu() {
     this.menuCtrl.toggle();
     if (this.menuCtrl.isOpen()) {
       const pageId = this.activePageService.computePageId(this.router.url);
@@ -187,6 +233,8 @@ export class ApplicationHeaderComponent implements OnInit, OnDestroy {
       );
     }
     this.events.publish(EventTopics.HAMBURGER_MENU_CLICKED);
+    // this.appTheme = document.querySelector('html').getAttribute('data-theme');
+    this.currentSelectedTabs = await this.preference.getString(PreferenceKey.SELECTED_SWITCHABLE_TABS_CONFIG).toPromise();
   }
 
   emitEvent($event, name) {
@@ -228,4 +276,211 @@ export class ApplicationHeaderComponent implements OnInit, OnDestroy {
     });
   }
 
+  async fetchManagedProfileDetails() {
+    try {
+      this.profile = await this.profileService.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS }).toPromise();
+      if (!this.profile || !this.profile.serverProfile) {
+        this.managedProfileList$ = EMPTY;
+        return;
+      }
+      this.managedProfileList$ = this.profileService.managedProfileManager.getManagedServerProfiles({
+        from: CachedItemRequestSourceFrom.CACHE,
+        requiredFields: ProfileConstants.REQUIRED_FIELDS
+      }).pipe(
+        map(profiles => {
+          return profiles.filter(p => p.id !== this.profile.uid);
+        })
+      );
+    } catch (err) {
+      console.log(err);
+    }
+  }
+
+  addManagedUser() {
+    if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+      this.commonUtilService.showToast('NEED_INTERNET_TO_CHANGE');
+      return;
+    }
+    const pageId = this.activePageService.computePageId(this.router.url);
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_ADD,
+      '',
+      Environment.HOME,
+      pageId,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      ID.BTN_ADD
+    );
+
+    this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.SUB_PROFILE_EDIT}`]);
+  }
+
+  openManagedUsers() {
+    const pageId = this.activePageService.computePageId(this.router.url);
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_MORE,
+      '',
+      Environment.HOME,
+      pageId,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      ID.BTN_MORE
+    );
+
+    const navigationExtras: NavigationExtras = {
+      state: {
+        profile: this.profile
+      }
+    };
+    this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.MANAGE_USER_PROFILES}`], navigationExtras);
+  }
+
+  switchUser(user) {
+    const pageId = this.activePageService.computePageId(this.router.url);
+    const cData: Array<CorrelationData> = [
+      { id: user.id || '', type: CorReleationDataType.SWITCHED_USER }
+    ];
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_ADD,
+      '',
+      Environment.HOME,
+      pageId,
+      undefined,
+      undefined,
+      undefined,
+      cData,
+      ID.BTN_SWITCH
+    );
+    this.profileService.managedProfileManager.switchSessionToManagedProfile({ uid: user.id }).toPromise().then(res => {
+      this.events.publish(AppGlobalService.USER_INFO_UPDATED);
+      this.events.publish('loggedInProfile:update');
+      this.menuCtrl.close();
+      this.showSwitchSuccessPopup(user.firstName);
+      this.tncUpdateHandlerService.checkForTncUpdate();
+    }).catch(err => {
+      this.commonUtilService.showToast('ERROR_WHILE_SWITCHING_USER');
+      console.error(err);
+    });
+  }
+
+  async showSwitchSuccessPopup(name) {
+    const confirm = await this.popoverCtrl.create({
+      component: ToastNavigationComponent,
+      componentProps: {
+        message: this.commonUtilService.translateMessage('SUCCESSFULLY_SWITCHED_USER', { '%app': this.appName, '%user': name }),
+        description: this.commonUtilService.translateMessage('UPDATE_YOUR_PREFERENCE_FROM_PROFILE', { app_name: this.appName }),
+        actionsButtons: [
+          {
+            btntext: this.commonUtilService.translateMessage('GO_TO_PROFILE'),
+            btnClass: 'btn-right'
+          }
+        ]
+      },
+      cssClass: 'sb-popover'
+    });
+    await confirm.present();
+    setTimeout(() => {
+      if (confirm) {
+        confirm.dismiss();
+      }
+    }, 3000);
+    const { data } = await confirm.onDidDismiss();
+    console.log(data);
+    if (data) {
+      this.router.navigate([`/${RouterLinks.PROFILE_TAB}`]);
+    }
+  }
+
+  async switchTheme() {
+    if (document.querySelector('html').getAttribute('data-theme') === AppThemes.DEFAULT) {
+      this.appTheme = AppThemes.JOYFUL;
+      await this.preference.putString('current_selected_theme', this.appTheme).toPromise();
+      document.querySelector('html').setAttribute('device-accessable-theme', 'accessible');
+      this.appHeaderService.showStatusBar().then();
+    } else {
+      document.querySelector('html').setAttribute('data-theme', AppThemes.DEFAULT);
+      this.appTheme = AppThemes.DEFAULT;
+      await this.preference.putString('current_selected_theme', this.appTheme).toPromise();
+      document.querySelector('html').setAttribute('device-accessable-theme', '');
+      this.appHeaderService.hideStatusBar();
+    }
+    this.menuCtrl.close();
+  }
+  async switchMode(){
+    if (document.querySelector('html').getAttribute('data-mode') === AppMode.DEFAULT) {
+      this.isDarkMode=true
+      this.appTheme = AppMode.DARKMODE;
+      document.querySelector('html').setAttribute('data-mode', AppMode.DARKMODE);
+      await this.preference.putString('data-mode', AppMode.DARKMODE).toPromise();
+      this.appHeaderService.showStatusBar().then();
+    } else {
+      document.querySelector('html').setAttribute('data-mode', AppMode.DARKMODE);
+      this.isDarkMode=false
+      this.appTheme = AppMode.DEFAULT;
+      document.querySelector('html').setAttribute('data-mode', AppMode.DEFAULT);
+      await this.preference.putString('data-mode', AppMode.DEFAULT).toPromise();
+      this.appHeaderService.hideStatusBar();
+    }
+    this.menuCtrl.close();
+  }
+
+  async switchTabs() {
+    this.currentSelectedTabs = await this.preference.getString(PreferenceKey.SELECTED_SWITCHABLE_TABS_CONFIG).toPromise();
+    let subType = InteractSubtype.OPTED_IN;
+    if (this.currentSelectedTabs === SwitchableTabsConfig.HOME_DISCOVER_TABS_CONFIG) {
+      this.preference.putString(PreferenceKey.SELECTED_SWITCHABLE_TABS_CONFIG,
+        SwitchableTabsConfig.RESOURCE_COURSE_TABS_CONFIG).toPromise();
+      this.events.publish('UPDATE_TABS', { type: 'SWITCH_TABS_USERTYPE' });
+      subType = InteractSubtype.OPTED_OUT;
+    } else if (!this.currentSelectedTabs || this.currentSelectedTabs === SwitchableTabsConfig.RESOURCE_COURSE_TABS_CONFIG) {
+      this.preference.putString(PreferenceKey.SELECTED_SWITCHABLE_TABS_CONFIG,
+        SwitchableTabsConfig.HOME_DISCOVER_TABS_CONFIG).toPromise();
+      this.events.publish('UPDATE_TABS', { type: 'SWITCH_TABS_USERTYPE' });
+      subType = InteractSubtype.OPTED_IN;
+    }
+    const userType = await this.preference.getString(PreferenceKey.SELECTED_USER_TYPE).toPromise();
+    const isNewUser = await this.preference.getBoolean(PreferenceKey.IS_NEW_USER).toPromise();
+    this.telemetryGeneratorService.generateNewExprienceSwitchTelemetry(
+      PageId.MENU,
+      subType,
+        {
+            userType,
+            isNewUser
+        }
+    );
+    await this.commonUtilService.populateGlobalCData();
+    this.menuCtrl.close();
+  }
+
+  private async checkForAppUpdate() {
+    return new Promise((resolve => {
+      cordova.plugins.InAppUpdateManager.isUpdateAvailable((result: string) => {
+        if (result) {
+          this.isUpdateAvailable = true;
+          resolve();
+        }
+      }, () => { });
+    }));
+  }
+
+  async showKebabMenu(event) {
+    const kebabMenuPopover = await this.popoverCtrl.create({
+      component: ApplicationHeaderKebabMenuComponent,
+      event,
+      showBackdrop: false,
+      componentProps: {
+        options: this.headerConfig.kebabMenuOptions || []
+      },
+    });
+    kebabMenuPopover.present();
+    const { data } = await kebabMenuPopover.onDidDismiss();
+    if (!data) {
+      return;
+    }
+    this.emitEvent({ event, option: data.option }, 'kebabMenu');
+  }
 }
diff --git a/src/app/components/assessment-details/assessment-details.component.html b/src/app/components/assessment-details/assessment-details.component.html
deleted file mode 100644
index 9464daa39..000000000
--- a/src/app/components/assessment-details/assessment-details.component.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<div class="assessment-details" *ngIf="showResult">
-  <div class="assessment-container"></div>
-  <div class="assessment-card">
-    <div class="assessment-score">
-      <p *ngIf="assessmentData?.fromGroup">{{'AVERAGE_SCORE' | translate}}</p>
-      <p *ngIf="assessmentData?.fromUser">{{'SCORE' | translate}}</p>
-      <div class="assessment-stats">
-        <ion-icon name="stats"></ion-icon>
-        <span *ngIf="assessmentData?.totalScore.toString()">{{assessmentData?.totalScore}}
-          <span *ngIf="assessmentData?.totalQuestionsScore"> / {{assessmentData?.totalQuestionsScore}} </span>
-          <span *ngIf="!assessmentData?.totalQuestionsScore && assessmentData.maxTotalScore"> / {{assessmentData?.maxTotalScore}}</span>
-        </span>
-        <span *ngIf="!assessmentData?.totalScore.toString()">--</span>
-      </div>
-    </div>
-    <div class="assessment-time">
-      <p *ngIf="assessmentData?.fromGroup">{{'AVERAGE_TIME' | translate}}</p>
-      <p *ngIf="assessmentData?.fromUser">{{'TOTAL_TIME' | translate}}</p>
-      <div class="assessment-result">
-        <ion-icon md="md-time"></ion-icon>
-        <span *ngIf="assessmentData?.uiTotalTime">{{assessmentData?.uiTotalTime}}</span><span *ngIf="!assessmentData?.uiTotalTime">--/--</span>
-      </div>
-    </div>
-  </div>
-</div>
-<div class="rt-container">
-  <div class="rt-raw rt-header">
-    <div class="rt-cell rt-head" (click)="onSortChange(columns[0].prop)">
-      <span>{{columns[0].name}}</span>
-      <span class="sort-icon"><ion-icon ios="ios-arrow-dropdown" md="md-arrow-dropdown" *ngIf="sortProps.key === columns[0].prop && sortProps.type === 'asc'"></ion-icon></span>
-      <span class="sort-icon"><ion-icon ios="ios-arrow-dropup" md="md-arrow-dropup" *ngIf="sortProps.key !== columns[0].prop || (sortProps.key === columns[0].prop && sortProps.type === 'desc')"></ion-icon></span>
-    </div>
-    <div class="rt-cell rt-head" (click)="onSortChange(columns[1].prop)">
-        <span>{{columns[1].name}}</span>
-        <span class="sort-icon"><ion-icon ios="ios-arrow-dropdown" md="md-arrow-dropdown" *ngIf="sortProps.key === columns[1].prop && sortProps.type === 'asc'"></ion-icon></span>
-        <span class="sort-icon"><ion-icon ios="ios-arrow-dropup" md="md-arrow-dropup" *ngIf="sortProps.key !== columns[1].prop || (sortProps.key === columns[1].prop && sortProps.type === 'desc')"></ion-icon></span>
-    </div>
-    <div class="rt-cell rt-head" (click)="onSortChange(columns[2].prop)">
-        <span>{{columns[2].name}}</span>
-        <span class="sort-icon"><ion-icon ios="ios-arrow-dropdown" md="md-arrow-dropdown" *ngIf="sortProps.key === columns[2].prop && sortProps.type === 'asc'"></ion-icon></span>
-        <span class="sort-icon"><ion-icon ios="ios-arrow-dropup" md="md-arrow-dropup" *ngIf="sortProps.key !== columns[2].prop || (sortProps.key === columns[2].prop && sortProps.type === 'desc')"></ion-icon></span>
-    </div>
-  </div>
-  <div class="rt-raw rt-raw-items" *ngFor="let report of assessmentData?.uiRows | sortBy: sortProps.key : sortProps.type" (click)="onActivate($event, assessmentData.showPopup, assessmentData.popupCallback, report)">
-    <div class="rt-cell rt-cell-item rt-cell-question"><span>{{report[columns[0].prop]}}</span></div>
-    <div class="rt-cell rt-cell-item"><span>{{report[columns[1].prop]}}</span></div>
-    <div class="rt-cell rt-cell-item"><span>{{report[columns[2].prop]}}</span></div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/src/app/components/assessment-details/assessment-details.component.scss b/src/app/components/assessment-details/assessment-details.component.scss
deleted file mode 100644
index 250926ee8..000000000
--- a/src/app/components/assessment-details/assessment-details.component.scss
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Migration-TODO */
-@import "src/assets/styles/_custom-mixins.scss";
-
-
-    .assessment-card {
-        position: relative;
-        padding-top: 10px;
-        width: 90%;
-        margin: 0 auto;
-        box-shadow: 0px 0px 10px #aaaaaa;
-        background-color: white;
-        border-radius: 5px;
-        display: flex;
-        top: 15%;
-        height: 80%;
-        text-transform: uppercase;
-        //display: table;
-    }
-
-    .assessment-container {
-        width: 100%;
-        position: absolute;
-        top: 10%;
-        bottom: 0;
-    }
-
-    .datatable-header,
-    .assessment-container {
-        background-color: #007aff;
-    }
-
-    .assessment-score,
-    .assessment-time {
-        text-align: center;
-        color: #007aff;
-        max-width: 50%;
-        vertical-align: middle;
-        //display: table-cell;
-        flex: 1 1 auto;
-    }
-
-    .assessment-score p,
-    .assessment-time p,
-    .ngx-datatable.material .datatable-header .datatable-row-center .assessment-header {
-        font-size: 0.8em;
-        font-weight: bold !important;
-    }
-
-    .assessment-score {
-        border-right: 1px solid #007aff;
-    }
-
-    .assessment-details {
-        // height: 20vh;
-        position: relative;
-    }
-
-    #datatable {
-        box-shadow: none;
-    }
-
-    .assessment-result,
-    .assessment-stats {
-        font-size: 1.8em;
-        padding-bottom: 10px;
-    }
-
-    .datatable-icon-down:before {
-        content: "\25BE" !important;
-    }
-
-    .datatable-icon-up:before {
-        content: "\25B4" !important;
-    }
-
-.rt-container{
-    .rt-header{
-        background-color: #007aff;
-        .rt-head{
-            color: #fff;
-            font-weight: bold;
-            text-transform: uppercase;
-            font-size: 12px;
-            padding: 5px 5px 5px 10px;
-        }
-        .sort-icon{
-            font-size: 26px;
-            position: relative;
-            top: 8px;
-        }
-    }
-    .rt-raw-items{
-        &:nth-child(odd){
-            background-color: #eee;
-        }
-    }
-}
-.rt-raw {
-    @include clearfix;
-    .rt-cell{
-        &:first-child{
-            width: 46%;
-        }
-        width: 27%;
-        float: left;
-        padding: 12px;
-    }
-    .rt-cell-item{
-        padding: .9rem 1.2rem;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-    }
-    .rt-cell-question{
-        font-weight: bold;
-        color: #007aff;
-        padding: .9rem 1.2rem !important;
-        text-align: center;
-    }
-}
-@media only screen and (max-width: 360px) {
-    .rt-raw {
-        .rt-cell{
-            &:first-child{
-                width: 40%;
-                padding: 5px 0 5px 5px;
-            }
-            width: 30%;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/app/components/assessment-details/assessment-details.component.spec.ts b/src/app/components/assessment-details/assessment-details.component.spec.ts
deleted file mode 100644
index 9377a6956..000000000
--- a/src/app/components/assessment-details/assessment-details.component.spec.ts
+++ /dev/null
@@ -1,262 +0,0 @@
-import { AssessmentDetailsComponent } from './assessment-details.component';
-import { PopoverController, Platform } from '@ionic/angular';
-import { Router, NavigationExtras } from '@angular/router';
-import { NgZone } from '@angular/core';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import { Location } from '@angular/common';
-import { TelemetryObject, ReportSummary } from 'sunbird-sdk';
-
-describe('AssessmentDetailsComponent', () => {
-    let assessmentDetailsComponent: AssessmentDetailsComponent;
-    const mockPopoverCtrl: Partial<PopoverController> = {};
-    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
-    const mockRouter: Partial<Router> = {};
-    const mockPlatform: Partial<Platform> = {};
-    const mockLocation: Partial<Location> = {};
-    const mockZone: Partial<NgZone> = {};
-
-    beforeAll(() => {
-        assessmentDetailsComponent = new AssessmentDetailsComponent(
-            mockPopoverCtrl as PopoverController,
-            mockTelemetryGeneratorService as TelemetryGeneratorService,
-            mockRouter as Router,
-            mockPlatform as Platform,
-            mockLocation as Location,
-            mockZone as NgZone
-        );
-    });
-
-    beforeEach(() => {
-        jest.clearAllMocks();
-    });
-
-    it('should be create a instance of assessmentDetailsComponent', () => {
-        expect(assessmentDetailsComponent).toBeTruthy();
-    });
-
-    it('should show assessment result by invoked ngOnInit()', () => {
-        // arrange
-        assessmentDetailsComponent.assessmentData = {
-            showResult: true
-        };
-        const data = jest.fn();
-        const subscribeWithPriorityData = jest.fn((_, fn) => fn());
-        mockPlatform.backButton = {
-            subscribeWithPriority: subscribeWithPriorityData,
-
-        } as any;
-        mockPopoverCtrl.dismiss = jest.fn();
-        assessmentDetailsComponent.backButtonFunc = {
-            unsubscribe: data
-        }as any;
-        // act
-        assessmentDetailsComponent.ngOnInit();
-        // assert
-        expect(subscribeWithPriorityData).toHaveBeenCalled();
-        expect(mockPopoverCtrl.dismiss).toHaveBeenCalled();
-        expect(data).toHaveBeenCalled();
-    });
-
-    it('should showing question details popup for fromUser by invoked onActive()', (done) => {
-        // arrange
-        const event = {};
-        const showPopup = {};
-        const callback = {};
-        const report = {};
-        assessmentDetailsComponent.assessmentData = {
-            fromUser: {}
-        };
-        const telemetry: Partial<TelemetryObject> = {
-            id: '',
-            type: 'Question',
-            version: undefined
-        };
-        const presentFn = jest.fn(() => Promise.resolve());
-        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
-        mockPopoverCtrl.create = jest.fn(() => Promise.resolve({
-            present: presentFn
-        }) as any);
-        // act
-        assessmentDetailsComponent.onActivate(event, showPopup, callback, report);
-        // assert
-        setTimeout(() => {
-            expect(assessmentDetailsComponent.assessmentData.fromUser).not.toBeNull();
-            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenLastCalledWith(
-                'TOUCH',
-                'question-clicked',
-                'user',
-                'user-assesment-details',
-                telemetry
-            );
-            expect(mockPopoverCtrl.create).toHaveBeenCalledWith({
-                component: {},
-                componentProps: { callback: {} }, cssClass: 'report-alert'
-            });
-            expect(presentFn).toHaveBeenCalled();
-            done();
-        }, 0);
-    });
-
-    it('should showed question details popup for fromGroup by invoked onActive() if user is available', (done) => {
-        // arrange
-        const event = {};
-        const showPopup = undefined;
-        const callback = undefined;
-        const report = {
-            userName: 'SAMPLE_USER',
-            qid: 'Q000',
-            name: 'SAMPLE_NAME',
-            uid: 'SAMPLE_UID',
-            contentId: 'SAMPLE_CONTENT_ID'
-        };
-        assessmentDetailsComponent.assessmentData = {
-            fromGroup: {},
-            questionsScore: 5
-        };
-        const telemetry: Partial<TelemetryObject> = {
-            id: 'Q000',
-            type: 'User',
-            version: undefined
-        };
-        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
-        const reportSummaryRequest: Partial<ReportSummary> = {
-            name: report.name,
-            uid: report.uid,
-            contentId: report.contentId,
-            totalQuestionsScore: assessmentDetailsComponent.assessmentData.questionsScore
-        };
-        mockRouter.navigate = jest.fn();
-        const navigationExtras: NavigationExtras = { state: { report: reportSummaryRequest } };
-        // act
-        assessmentDetailsComponent.onActivate(event, showPopup, callback, report);
-        // assert
-        setTimeout(() => {
-            expect(assessmentDetailsComponent.assessmentData.fromUser).toBeUndefined();
-            expect(assessmentDetailsComponent.assessmentData.fromGroup).not.toBeNull();
-            expect(report.userName).not.toBeNull();
-            expect(mockRouter.navigate).toHaveBeenCalledWith(['/reports/user-report'], navigationExtras);
-            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenLastCalledWith(
-                'TOUCH',
-                'user-clicked',
-                'user',
-                'group-assesment-details',
-                telemetry
-            );
-            done();
-        }, 0);
-    });
-
-    it('should showed question details popup for fromGroup by invoked onActive() if user is not available', (done) => {
-        // arrange
-        const event = {};
-        const showPopup = {};
-        const callback = {};
-        const report = {
-            qid: 'Q000',
-            name: 'SAMPLE_NAME',
-            uid: 'SAMPLE_UID',
-            contentId: 'SAMPLE_CONTENT_ID'
-        };
-        assessmentDetailsComponent.assessmentData = {
-            fromGroup: {},
-            questionsScore: 5
-        };
-        const telemetry: Partial<TelemetryObject> = {
-            id: 'SAMPLE_UID',
-            type: 'Question',
-            version: undefined
-        };
-        const presentFn = jest.fn(() => Promise.resolve());
-        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
-        mockPopoverCtrl.create = jest.fn(() => Promise.resolve({
-            present: presentFn
-        }) as any);
-        // act
-        assessmentDetailsComponent.onActivate(event, showPopup, callback, report);
-        // assert
-        setTimeout(() => {
-            expect(mockPopoverCtrl.create).toHaveBeenCalledWith({
-                component: {},
-                componentProps: {
-                    callback: {
-                        qid: 'Q000',
-                        name: 'SAMPLE_NAME',
-                        uid: 'SAMPLE_UID',
-                        contentId: 'SAMPLE_CONTENT_ID'
-                    }
-                }, cssClass: 'report-alert'
-            });
-            expect(report.qid).toBe('Q000');
-            expect(presentFn).toHaveBeenCalled();
-            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenLastCalledWith(
-                'TOUCH',
-                'question-clicked',
-                'user',
-                'group-assesment-details',
-                telemetry
-            );
-            done();
-        }, 0);
-    });
-
-    it('should be shorted as asesending order by question number', () => {
-        // arrange
-        assessmentDetailsComponent.sortProps = {
-            key: 'prop',
-            type: 'asc'
-        };
-        // act
-        assessmentDetailsComponent.onSortChange('prop');
-        // assert
-        expect(assessmentDetailsComponent.sortProps.type).toBe('desc');
-    });
-
-    it('should be shorted as desending order by question number', () => {
-        // arrange
-        assessmentDetailsComponent.sortProps = {
-            key: 'prop',
-            type: 'desc'
-        };
-        // act
-        assessmentDetailsComponent.onSortChange('prop');
-        // assert
-        expect(assessmentDetailsComponent.sortProps.type).toBe('asc');
-    });
-
-    it('should be shorted asending order for default type by question number', () => {
-        // arrange
-        assessmentDetailsComponent.sortProps = {
-            key: 'prop',
-            type: ''
-        };
-        // act
-        assessmentDetailsComponent.onSortChange('prop');
-        // assert
-        expect(assessmentDetailsComponent.sortProps.type).toBe('asc');
-    });
-
-    it('should be shorted as asending order by question number for else part', () => {
-        // arrange
-        assessmentDetailsComponent.sortProps = {
-            key: '',
-            type: ''
-        };
-        // act
-        assessmentDetailsComponent.onSortChange('prop');
-        // assert
-        expect(assessmentDetailsComponent.sortProps.key).toBe('prop');
-        expect(assessmentDetailsComponent.sortProps.type).toBe('asc');
-    });
-
-    it('should be handle backbutton by invoked ngOnDestroy()', () => {
-        // arrange
-        const data = jest.fn();
-        assessmentDetailsComponent.backButtonFunc = {
-            unsubscribe: data
-        } as any;
-        // act
-        assessmentDetailsComponent.ngOnDestroy();
-        // assert
-        expect(data).toHaveBeenCalled();
-    });
-});
diff --git a/src/app/components/assessment-details/assessment-details.component.ts b/src/app/components/assessment-details/assessment-details.component.ts
deleted file mode 100644
index b5770ab69..000000000
--- a/src/app/components/assessment-details/assessment-details.component.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-import { Component, Input, Output, OnInit, EventEmitter, ViewEncapsulation, OnDestroy, NgZone } from '@angular/core';
-import { TelemetryObject, ReportSummary } from 'sunbird-sdk';
-import { PopoverController, Platform } from '@ionic/angular';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import { PageId, InteractSubtype, ObjectType, InteractType, Environment } from '@app/services/telemetry-constants';
-import { RouterLinks } from '@app/app/app.constant';
-import { NavigationExtras, Router } from '@angular/router';
-import { Subscription } from 'rxjs';
-import { Location } from '@angular/common';
-
-@Component({
-  selector: 'app-assessment-details',
-  templateUrl: './assessment-details.component.html',
-  styleUrls: ['./assessment-details.component.scss'],
-  encapsulation: ViewEncapsulation.None
-})
-export class AssessmentDetailsComponent implements OnInit, OnDestroy {
-
-  backButtonFunc: Subscription;
-
-  constructor(
-    public popoverCtrl: PopoverController,
-    private telemetryGeneratorService: TelemetryGeneratorService,
-    private router: Router,
-    private platform: Platform,
-    private location: Location,
-    private zone: NgZone,
-  ) {
-    this.showResult = true;
-  }
-
-  showResult: boolean;
-  sortProps =  {
-    key: 'index',
-    type: 'asc'
-  };
-  @Input() assessmentData: any;
-  @Input() columns: any;
-  @Output() showQuestionFromUser = new EventEmitter<string>();
-
-  ngOnInit() {
-    if (this.assessmentData && typeof (this.assessmentData['showResult']) === typeof (true)) {
-      this.showResult = this.assessmentData['showResult'];
-    }
-    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(11, () => {
-      this.popoverCtrl.dismiss();
-      this.backButtonFunc.unsubscribe();
-    });
-  }
-
-  ngOnDestroy(): void {
-    if (this.backButtonFunc) {
-      this.backButtonFunc.unsubscribe();
-    }
-  }
-
-  async onActivate(event, showPopup, callback, report?) {
-    let subType: string;
-    let pageId: string;
-    let telemetryObject: TelemetryObject;
-    if (this.assessmentData && this.assessmentData.fromUser) {
-      pageId = PageId.REPORTS_USER_ASSESMENT_DETAILS;
-      subType = InteractSubtype.QUESTION_CLICKED;
-
-      telemetryObject = new TelemetryObject(report.qid ? report.qid : '', ObjectType.QUESTION, undefined);
-
-    } else if (this.assessmentData && this.assessmentData.fromGroup) {
-      pageId = PageId.REPORTS_GROUP_ASSESMENT_DETAILS;
-      const row = report;
-      if (row.userName) {
-        subType = InteractSubtype.USER_CLICKED;
-        telemetryObject = new TelemetryObject(report.qid ? report.qid : '', ObjectType.USER, undefined);
-
-        const reportSummaryRequest: Partial<ReportSummary> = {
-          name: row.name,
-          uid: row.uid,
-          contentId: row.contentId,
-          totalQuestionsScore: this.assessmentData.questionsScore
-        };
-        const navigationExtras: NavigationExtras = { state: { report: reportSummaryRequest } };
-        this.router.navigate([`/${RouterLinks.REPORTS}/${RouterLinks.USER_REPORT}`], navigationExtras);
-
-      } else if (row.qid) {
-        subType = InteractSubtype.QUESTION_CLICKED;
-        telemetryObject = new TelemetryObject(report.uid ? report.uid : '', ObjectType.QUESTION, undefined);
-      }
-    }
-
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      subType,
-      Environment.USER,
-      pageId,
-      telemetryObject
-    );
-    if (showPopup && callback) {
-      const popover = await this.popoverCtrl.create({
-        component: callback,
-        componentProps: { callback: report },
-        cssClass: 'report-alert'
-      });
-      await popover.present();
-    } else {
-      this.showQuestionFromUser.emit();
-    }
-  }
-
-  onSortChange(prop) {
-    if (this.sortProps.key === prop) {
-      switch (this.sortProps.type) {
-        case 'asc': {
-          this.sortProps.type = 'desc';
-          break;
-        }
-        case 'desc': {
-          this.sortProps.type = 'asc';
-          break;
-        }
-        default: this.sortProps.type = 'asc';
-      }
-    } else {
-      this.sortProps = {
-        key : prop,
-        type: 'asc'
-      };
-    }
-  }
-}
diff --git a/src/app/components/collection-acions/collection-acions.component.html b/src/app/components/collection-acions/collection-acions.component.html
new file mode 100644
index 000000000..636846755
--- /dev/null
+++ b/src/app/components/collection-acions/collection-acions.component.html
@@ -0,0 +1,26 @@
+
+<div class="sb-dt-card">
+  <div class="sb-dt-card-actions">
+    <div class="sb-btn-tile-group">
+      <ng-container *ngIf="trackDownloads | async; let downloads">
+        <button class="sb-btn-tile" *ngIf="showDownloadBtn && !isDepthChild" [disabled]="downloads.queued.length"
+          (click)="downloadAllContents()">
+          <ion-icon name="cloud-download" class="sb-dt-card-blue-icon"></ion-icon>
+          <span *ngIf="!downloads.queued.length" class="sb-btn-footer-text">{{ 'DOWNLOAD' | translate }}</span>
+          <span *ngIf="downloads.queued.length" class="btn-popover-progress-container">
+            <span class="btn-progress-highlight" [ngStyle]="{'width': (downloads.completed.length/(downloads.queued.length+downloads.completed.length))*100 + '%'}">
+            </span>
+          </span>
+        </button>
+        <button class="sb-btn-tile" *ngIf="contentDetail?.isAvailableLocally" [disabled]="downloads.queued.length" (click)="showOverflowMenu($event)">
+          <ion-icon name="trash" class="sb-dt-card-danger-icon"></ion-icon>
+          <span class="sb-btn-footer-text">{{ 'REMOVE' | translate }}</span>
+        </button>
+        <button class="sb-btn-tile" (click)="share()">
+          <ion-icon name="share" class="sb-dt-card-blue-icon"></ion-icon>
+          <span class="sb-btn-footer-text">{{ 'SHARE' | translate }}</span>
+        </button>
+      </ng-container>
+    </div>
+  </div>
+</div>
diff --git a/src/app/components/collection-acions/collection-acions.component.ts b/src/app/components/collection-acions/collection-acions.component.ts
new file mode 100644
index 000000000..a2a8889b3
--- /dev/null
+++ b/src/app/components/collection-acions/collection-acions.component.ts
@@ -0,0 +1,40 @@
+import { Component, Input, OnInit, Output, EventEmitter } from '@angular/core';
+import {Content, DownloadTracking} from 'sunbird-sdk';
+import { CommonUtilService } from '@app/services';
+import { Observable } from 'rxjs';
+
+
+@Component({
+  selector: 'collection-acions',
+  templateUrl: './collection-acions.component.html',
+  styleUrls: ['../detail-card/detail-card.component.scss'],
+})
+export class CollectionActionsComponent implements OnInit {
+  @Input() contentDetail: Content;
+  @Input() showDownloadBtn: boolean;
+  @Input() isDepthChild: boolean;
+  @Input() trackDownloads: Observable<DownloadTracking>;
+
+  @Output() downloadAllContent = new EventEmitter();
+  @Output() showOverflowMenuEvent = new EventEmitter();
+  @Output() shareEvent = new EventEmitter();
+  text: string;
+
+  constructor(public commonUtil: CommonUtilService) {
+  }
+
+  ngOnInit() {
+  }
+
+  downloadAllContents() {
+    this.downloadAllContent.emit();
+  }
+
+  showOverflowMenu() {
+    this.showOverflowMenuEvent.emit();
+  }
+
+  share() {
+    this.shareEvent.emit();
+  }
+}
diff --git a/src/app/components/collection-child/collection-child.component.html b/src/app/components/collection-child/collection-child.component.html
index 39e647ae9..68ffe12da 100644
--- a/src/app/components/collection-child/collection-child.component.html
+++ b/src/app/components/collection-child/collection-child.component.html
@@ -1,7 +1,7 @@
 <div>
   <ng-container *ngIf="childData | hasMimeType: activeMimeTypeFilter : isTextbookTocPage">
     <div [ngClass]="{'unit-hierachy sb-topic-item': !isTextbookTocPage, 'sub-unit': !isTextbookTocPage}"
-      (click)="!fromCourseToc && setContentId(childData.identifier)" [id]="childData.identifier"
+      (click)="!fromCourseToc && setContentId(childData.identifier, childData)" [id]="childData.identifier"
       *ngIf="childData?.contentData?.mimeType === 'application/vnd.ekstep.content-collection' && childData?.children && !isTextbookTocPage">
       {{childData?.contentData?.name}}
     </div>
@@ -30,7 +30,7 @@
                    [src]="commonUtilService.convertFileSrc(localImage) || commonUtilService.convertFileSrc(collectionChildIcon) ||
                commonUtilService.convertFileSrc(childData?.contentData?.appIcon) || defaultAppIcon">
               <span class="icon-position" *ngIf="childData?.isAvailableLocally">
-              <ion-icon class="sb-checkmark-icon" name="md-checkmark-circle"></ion-icon>
+              <ion-icon class="sb-checkmark-icon" name="checkmark-circle"></ion-icon>
             </span>
             </div>
             <span class="content-name">{{childData?.contentData?.name}}</span>
@@ -51,7 +51,7 @@
           <div class="pull-left">
             {{childData?.contentData?.name}}
             <span *ngIf="childData?.isAvailableLocally">
-            <ion-icon class="sb-checkmark-icon" name="md-checkmark-circle"></ion-icon>
+            <ion-icon class="sb-checkmark-icon" name="checkmark-circle"></ion-icon>
           </span>
           </div>
 
@@ -77,7 +77,7 @@
              'sb-play-selected':childData?.isAvailableLocally,'sb-play-unselected':!childData?.isAvailableLocally}">
         <div class="pull-left">
           <span class="content-type-container">
-            <img [src]="getContentTypeIcon(childData)" alt="">
+            <img [src]="getMediaIcon(childData)" alt="">
           </span>
           {{childData?.contentData?.name}}
         </div>
@@ -92,17 +92,20 @@
   <div class="row sb-topic-item"(click)="showComingSoonPopup(childData)"
     *ngIf="isTextbookTocPage && childData?.contentData?.mimeType === 'application/vnd.ekstep.content-collection' && !childData?.children">
     <div class="sb-accordian-grey-text">{{childData?.contentData?.name}}</div>
-    <ion-icon ios="ios-alert" md="md-alert" class="grey-icon mt-4"></ion-icon>
+    <ion-icon name="alert" class="grey-icon mt-4"></ion-icon>
   </div>
 
-  <div *ngFor="let firstChildren of childData?.children; let j = index;"
-    [ngClass]="{'sb-collection-child-ftue': isTextbookTocPage}">
-    <app-collection-child [renderLevel]="renderLevel + 1" [childData]="firstChildren" [breadCrumb]="breadCrumb"
-      [activeMimeTypeFilter]="activeMimeTypeFilter" [rootUnitId]="rootUnitId" [isTextbookTocPage]="isTextbookTocPage"
-      [bookID]="bookID" [isEnrolled]="isEnrolled" [fromCourseToc]="fromCourseToc"
-      [isBatchNotStarted]="isBatchNotStarted" [stckyUnitTitle]="stckyUnitTitle" [stckyindex]="stckyindex"
-      [latestParentName]="latestParentName" [latestParentNodes]="latestParentNodes"
-      [contentStatusData]="contentStatusData" [updatedCourseCardData]="updatedCourseCardData" [batch]="batch">
-    </app-collection-child>
-  </div>
+  <ng-container *ngIf="!(childData?.contentData?.trackable?.enabled === 'Yes')">
+    <div *ngFor="let firstChildren of childData?.children; let j = index;"
+      [ngClass]="{'sb-collection-child-ftue': isTextbookTocPage}">
+      <app-collection-child [renderLevel]="renderLevel + 1" [childData]="firstChildren" [breadCrumb]="breadCrumb"
+        [activeMimeTypeFilter]="activeMimeTypeFilter" [rootUnitId]="rootUnitId" [isTextbookTocPage]="isTextbookTocPage"
+        [bookID]="bookID" [isEnrolled]="isEnrolled" [fromCourseToc]="fromCourseToc"
+        [isBatchNotStarted]="isBatchNotStarted" [stckyUnitTitle]="stckyUnitTitle" [stckyindex]="stckyindex"
+        [latestParentName]="latestParentName" [latestParentNodes]="latestParentNodes"
+        [contentStatusData]="contentStatusData" [updatedCourseCardData]="updatedCourseCardData" [batch]="batch" 
+        [addActivityToGroupData]="addActivityToGroupData">
+      </app-collection-child>
+    </div>
+  </ng-container>
 </div>
diff --git a/src/app/components/collection-child/collection-child.component.scss b/src/app/components/collection-child/collection-child.component.scss
index cbd958a9b..9d7036e81 100644
--- a/src/app/components/collection-child/collection-child.component.scss
+++ b/src/app/components/collection-child/collection-child.component.scss
@@ -5,7 +5,7 @@
     .separator-line {
         height: 1px;
         opacity: 0.36;
-        background-color: #979797;
+        background-color: map-get($colors, dark_gray);
         width: 100%;
     }
     .pull-right{
@@ -18,25 +18,20 @@
 
     .play-icon
     {
-        color : #00ba75;
+        color : map-get($colors, vivid_green);
         font-size: 30px;
     }
 
     .checkmark-icon
     {
-      color : #00ba75;
+      color : map-get($colors, vivid_green);
       font-size: 18px;
       margin-left: 5px;
     }
 
     .font-grey-text
     {
-      //  padding: 4px;
-        color : #979797;
-    }
-
-    .P10{
-        padding: 10px;
+        color : map-get($colors, dark_gray);
     }
 
     .grey-icon-span
@@ -47,7 +42,7 @@
 
     .grey-icon
     {
-        color : #979797;
+        color : map-get($colors, dark_gray);
         font-size: 18px;
     }
 
@@ -74,13 +69,13 @@
     .content-icon{
         width: 38px;
         height: 38px;
-        border: 0.5px solid #D6D6D6;
-        background-color: #CCCCCC;
+        border: 0.5px solid map-get($colors, medium_light_gray);
+        background-color: map-get($colors, medium_gray);
         display: inline-block;
     }
     .content-name {
         padding-left: 1em;
-        color: black;
+        color: map-get($colors, black);
     }
     .sb-checkmark-icon{
         color : $secondary-200;
@@ -96,11 +91,11 @@
     }
     .sb-bold-blue{
         font-weight: bolder;
-        color:#024f9d;
+        color: $blue;
         padding: 8px;
     }
     .sb-blue-text{
-        color:#024f9d;
+        color: $blue;
     }
     .sb-highlighted-row{
         @include padding($base-block-space * 1);
@@ -110,7 +105,7 @@
     .sb-textbook-toc{
         @include padding($base-block-space * 1);
         display: flex;
-        color:#024f9d;
+        color: $blue;
         @include clearfix;
     }
 }
@@ -121,10 +116,10 @@
 
 .content-playbutton {
     padding-left: 4px;
-    color: #024f9d;
+    color: $blue;
 }
 .play-button{
-    --border-color: #024f9d;
+    --border-color: #{$blue};
     --border-width: 1px;
     text-transform: none;
     height: 3em;
diff --git a/src/app/components/collection-child/collection-child.component.spec.data.ts b/src/app/components/collection-child/collection-child.component.spec.data.ts
index d5b32552b..97163a261 100644
--- a/src/app/components/collection-child/collection-child.component.spec.data.ts
+++ b/src/app/components/collection-child/collection-child.component.spec.data.ts
@@ -3,7 +3,19 @@ import { Navigation } from '@angular/router';
 
 export const mockChildContentData: Content = {
     identifier: 'do_21274246255366963214046',
-    contentData: {}
+    basePath: 'samplePath',
+    contentData: {
+        name: 'sample_name',
+        appIcon: 'sample_icon'
+    },
+    hierarchyInfo: [{
+        identifier: 'do_123',
+        contentType: 'textbook'
+    }, {
+        identifier: 'do098',
+        contentType: 'resources'
+    }],
+
 };
 
 export const mockCompletedContentStatusData: ContentStateResponse = {
diff --git a/src/app/components/collection-child/collection-child.component.spec.ts b/src/app/components/collection-child/collection-child.component.spec.ts
index 71220b5e3..63f895a56 100644
--- a/src/app/components/collection-child/collection-child.component.spec.ts
+++ b/src/app/components/collection-child/collection-child.component.spec.ts
@@ -3,7 +3,8 @@ import { CollectionChildComponent } from './collection-child.component';
 import { NgZone } from '@angular/core';
 import { CommonUtilService, ComingSoonMessageService, TelemetryGeneratorService } from '../../../services';
 import { TextbookTocService } from '../../collection-detail-etb/textbook-toc-service';
-import { PopoverController, Events } from '@ionic/angular';
+import { PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { Router } from '@angular/router';
 import {
   mockChildContentData,
@@ -18,7 +19,9 @@ import {
 } from '@app/services/telemetry-constants';
 import { Content } from 'sunbird-sdk';
 import { EventTopics } from '@app/app/app.constant';
-import { MimeType, ContentType, RouterLinks } from '../../app.constant';
+import { MimeType, RouterLinks } from '../../app.constant';
+import { NavigationService } from '../../../services/navigation-handler.service';
+import { CsPrimaryCategory, CsContentType } from '@project-sunbird/client-services/services/content';
 
 describe('CollectionChildComponent', () => {
   let collectionChildComponent: CollectionChildComponent;
@@ -39,6 +42,12 @@ describe('CollectionChildComponent', () => {
   };
   const mockLocation: Partial<Location> = {};
   const mockEvents: Partial<Events> = {};
+  const mockNavigationService: Partial<NavigationService> = {
+    navigateToDetailPage: jest.fn(),
+    navigateToContent: jest.fn(),
+    navigateToTrackableCollection: jest.fn(),
+    navigateToCollection: jest.fn()
+  };
 
   const constructComponent = () => {
     collectionChildComponent = new CollectionChildComponent(
@@ -50,7 +59,8 @@ describe('CollectionChildComponent', () => {
       mockTextbookTocService as TextbookTocService,
       mockTelemetryGeneratorService as TelemetryGeneratorService,
       mockLocation as Location,
-      mockEvents as Events
+      mockEvents as Events,
+      mockNavigationService as NavigationService
     );
   };
 
@@ -63,7 +73,7 @@ describe('CollectionChildComponent', () => {
     jest.resetAllMocks();
   });
 
-  it('should be craeate a instance of CollectionChildComponent', () => {
+  it('should be create a instance of CollectionChildComponent', () => {
     expect(collectionChildComponent).toBeTruthy();
   });
 
@@ -179,7 +189,7 @@ describe('CollectionChildComponent', () => {
           done();
         }, 0);
       });
-      it('sbPopoverMainTitle should be CONTENT_IS_BEEING_ADDED + content name', (done) => {
+      it('sbPopoverMainTitle should be CONTENT_IS_BEING_ADDED + content name', (done) => {
         // arrange
         mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
           present: jest.fn(() => Promise.resolve({})),
@@ -224,32 +234,33 @@ describe('CollectionChildComponent', () => {
     });
   });
 
-  describe('getContentTypeIcon()', () => {
+  describe('getMediaIcon()', () => {
     describe('should get content type icon', () => {
       it('Should get self access icon for conetnt type SelfAssess', () => {
         // arrange
         const content = {
           contentData: {
-            contentType: ContentType.SELF_ASSESS
+            contentType: CsContentType.SELF_ASSESS,
+            primaryCategory: CsPrimaryCategory.COURSE_ASSESSMENT
           }
         } as any;
         // act
-        const contentTypeIcon = collectionChildComponent.getContentTypeIcon(content);
+        const contentTypeIcon = collectionChildComponent.getMediaIcon(content);
         // assert
-        expect(content.contentData.contentType).toEqual(ContentType.SELF_ASSESS);
+        expect(content.contentData.contentType).toEqual(CsContentType.SELF_ASSESS);
         expect(contentTypeIcon).toBe('./assets/imgs/selfassess.svg');
       });
       it('Should get touch icon for conetnt type other than SelfAssess', () => {
         // arrange
         const content = {
           contentData: {
-            contentType: ContentType.RESOURCE
+            contentType: CsContentType.RESOURCE
           }
         } as any;
         // act
-        const contentTypeIcon = collectionChildComponent.getContentTypeIcon(content);
+        const contentTypeIcon = collectionChildComponent.getMediaIcon(content);
         // assert
-        expect(content.contentData.contentType).toEqual(ContentType.RESOURCE);
+        expect(content.contentData.contentType).toEqual(CsContentType.RESOURCE);
         expect(contentTypeIcon).toBe('./assets/imgs/touch.svg');
       });
       it('Should get doc icon for mimeTypes application/pdf', () => {
@@ -260,7 +271,7 @@ describe('CollectionChildComponent', () => {
           }
         } as any;
         // act
-        const contentTypeIcon = collectionChildComponent.getContentTypeIcon(content);
+        const contentTypeIcon = collectionChildComponent.getMediaIcon(content);
         // assert
         expect(content.mimeType).toEqual('application/pdf');
         expect(contentTypeIcon).toBe('./assets/imgs/doc.svg');
@@ -273,7 +284,7 @@ describe('CollectionChildComponent', () => {
           }
         } as any;
         // act
-        const contentTypeIcon = collectionChildComponent.getContentTypeIcon(content);
+        const contentTypeIcon = collectionChildComponent.getMediaIcon(content);
         // assert
         expect(content.mimeType).toEqual('application/epub');
         expect(contentTypeIcon).toBe('./assets/imgs/doc.svg');
@@ -286,7 +297,7 @@ describe('CollectionChildComponent', () => {
           }
         } as any;
         // act
-        const contentTypeIcon = collectionChildComponent.getContentTypeIcon(content);
+        const contentTypeIcon = collectionChildComponent.getMediaIcon(content);
         // assert
         expect(content.mimeType).toEqual('application/msword');
         expect(contentTypeIcon).toBe('./assets/imgs/doc.svg');
@@ -299,7 +310,7 @@ describe('CollectionChildComponent', () => {
           }
         } as any;
         // act
-        const contentTypeIcon = collectionChildComponent.getContentTypeIcon(content);
+        const contentTypeIcon = collectionChildComponent.getMediaIcon(content);
         // assert
         expect(content.mimeType).toEqual('video/avi');
         expect(contentTypeIcon).toBe('./assets/imgs/play.svg');
@@ -312,7 +323,7 @@ describe('CollectionChildComponent', () => {
           }
         } as any;
         // act
-        const contentTypeIcon = collectionChildComponent.getContentTypeIcon(content);
+        const contentTypeIcon = collectionChildComponent.getMediaIcon(content);
         // assert
         expect(content.mimeType).toEqual('video/mpeg');
         expect(contentTypeIcon).toBe('./assets/imgs/play.svg');
@@ -325,7 +336,7 @@ describe('CollectionChildComponent', () => {
           }
         } as any;
         // act
-        const contentTypeIcon = collectionChildComponent.getContentTypeIcon(content);
+        const contentTypeIcon = collectionChildComponent.getMediaIcon(content);
         // assert
         expect(content.mimeType).toEqual('video/quicktime');
         expect(contentTypeIcon).toBe('./assets/imgs/play.svg');
@@ -338,7 +349,7 @@ describe('CollectionChildComponent', () => {
           }
         } as any;
         // act
-        const contentTypeIcon = collectionChildComponent.getContentTypeIcon(content);
+        const contentTypeIcon = collectionChildComponent.getMediaIcon(content);
         // assert
         expect(content.mimeType).toEqual('video/3gpp');
         expect(contentTypeIcon).toBe('./assets/imgs/play.svg');
@@ -351,7 +362,7 @@ describe('CollectionChildComponent', () => {
           }
         } as any;
         // act
-        const contentTypeIcon = collectionChildComponent.getContentTypeIcon(content);
+        const contentTypeIcon = collectionChildComponent.getMediaIcon(content);
         // assert
         expect(content.mimeType).toEqual('video/mpeg');
         expect(contentTypeIcon).toBe('./assets/imgs/play.svg');
@@ -364,7 +375,7 @@ describe('CollectionChildComponent', () => {
           }
         } as any;
         // act
-        const contentTypeIcon = collectionChildComponent.getContentTypeIcon(content);
+        const contentTypeIcon = collectionChildComponent.getMediaIcon(content);
         // assert
         expect(content.mimeType).toEqual('video/mp4');
         expect(contentTypeIcon).toBe('./assets/imgs/play.svg');
@@ -377,7 +388,7 @@ describe('CollectionChildComponent', () => {
           }
         } as any;
         // act
-        const contentTypeIcon = collectionChildComponent.getContentTypeIcon(content);
+        const contentTypeIcon = collectionChildComponent.getMediaIcon(content);
         // assert
         expect(content.mimeType).toEqual('video/ogg');
         expect(contentTypeIcon).toBe('./assets/imgs/play.svg');
@@ -390,7 +401,7 @@ describe('CollectionChildComponent', () => {
           }
         } as any;
         // act
-        const contentTypeIcon = collectionChildComponent.getContentTypeIcon(content);
+        const contentTypeIcon = collectionChildComponent.getMediaIcon(content);
         // assert
         expect(content.mimeType).toEqual('video/webm');
         expect(contentTypeIcon).toBe('./assets/imgs/play.svg');
@@ -403,7 +414,7 @@ describe('CollectionChildComponent', () => {
           }
         } as any;
         // act
-        const contentTypeIcon = collectionChildComponent.getContentTypeIcon(content);
+        const contentTypeIcon = collectionChildComponent.getMediaIcon(content);
         // assert
         expect(content.mimeType).toEqual('application/vnd.ekstep.ecml-archive');
         expect(contentTypeIcon).toBe('./assets/imgs/touch.svg');
@@ -500,31 +511,28 @@ describe('CollectionChildComponent', () => {
         // arrange
         const content = {
           identifier: 'some_identifier',
-          contentType: ContentType.COURSE
+          contentType: CsContentType.COURSE
         };
         mockZone.run = jest.fn((fn) => fn());
         // act
         collectionChildComponent.navigateToDetailsPage(content, '');
         // assert
       });
-      it('Shpuld go to collection detail etb page if mimeType is application/vnd.ekstep.content-collection', () => {
+      it('Should go to collection detail etb page if mimeType is application/vnd.ekstep.content-collection', () => {
         // arrange
         const content = {
           identifier: 'some_identifier',
           mimeType: MimeType.COLLECTION,
-          contentType: ContentType.TEXTBOOK
+          contentType: CsContentType.TEXTBOOK
         };
         mockZone.run = jest.fn((fn) => fn());
         // act
         collectionChildComponent.navigateToDetailsPage(content, '');
         // assert
-        expect(mockRouter.navigate).toHaveBeenCalledWith(
-          expect.arrayContaining([RouterLinks.COLLECTION_DETAIL_ETB]),
+        expect(mockNavigationService.navigateToCollection).toHaveBeenCalledWith(
           expect.objectContaining({
-            state: expect.objectContaining({
-              content,
-              depth: ''
-            })
+            content,
+            depth: ''
           })
         );
       });
@@ -533,9 +541,11 @@ describe('CollectionChildComponent', () => {
           // arrange
           const content = {
             identifier: 'some_identifier',
-            contentType: ContentType.RESOURCE,
+            contentType: CsContentType.RESOURCE,
+            primaryCategory: CsPrimaryCategory.TEACHER_RESOURCE.toLowerCase(),
             contentData: {
-              contentType: ContentType.RESOURCE
+              contentType: CsContentType.RESOURCE,
+              primaryCategory: CsPrimaryCategory.TEACHER_RESOURCE
             }
           };
           mockZone.run = jest.fn((fn) => fn());
@@ -545,14 +555,11 @@ describe('CollectionChildComponent', () => {
           expect(mockTextbookTocService.setTextbookIds).toHaveBeenCalledWith({
             rootUnitId: undefined, contentId: content.identifier, unit: undefined
           });
-          expect(mockRouter.navigate).toHaveBeenCalledWith(
-            expect.arrayContaining([RouterLinks.CONTENT_DETAILS]),
+          expect(mockNavigationService.navigateToContent).toHaveBeenCalledWith(
             expect.objectContaining({
-              state: expect.objectContaining({
-                isChildContent: true,
-                content,
-                depth: ''
-              })
+              isChildContent: true,
+              content,
+              depth: ''
             })
           );
           expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
@@ -586,9 +593,11 @@ describe('CollectionChildComponent', () => {
           });
           const content = {
             identifier: 'some_identifier',
-            contentType: ContentType.SELF_ASSESS,
+            contentType: CsContentType.SELF_ASSESS,
+            primaryCategory: CsPrimaryCategory.COURSE_ASSESSMENT.toLowerCase(),
             contentData: {
-              contentType: ContentType.SELF_ASSESS
+              contentType: CsContentType.SELF_ASSESS,
+              primaryCategory: CsPrimaryCategory.COURSE_ASSESSMENT
             },
             status: '2'
           };
@@ -602,31 +611,14 @@ describe('CollectionChildComponent', () => {
           setTimeout(() => {
             // assert
             expect(mockPopoverCtrl.create).toHaveBeenCalled();
-            expect(mockPopoverCtrl.create).toHaveBeenCalledWith(expect.objectContaining({
-              componentProps: expect.objectContaining({
-                sbPopoverHeading: 'REDO_ASSESSMENT',
-                sbPopoverMainTitle: 'TRAINING_ENDED_REDO_ASSESSMENT',
-                actionsButtons: expect.arrayContaining([
-                  expect.objectContaining({
-                    btntext: 'SKIP'
-                  }),
-                  expect.objectContaining({
-                    btntext: 'REDO'
-                  })
-                ])
-              })
-            }));
             expect(mockTextbookTocService.setTextbookIds).toHaveBeenCalledWith({
               rootUnitId: undefined, contentId: content.identifier, unit: undefined
             });
-            expect(mockRouter.navigate).toHaveBeenCalledWith(
-              expect.arrayContaining([RouterLinks.CONTENT_DETAILS]),
+            expect(mockNavigationService.navigateToContent).toHaveBeenCalledWith(
               expect.objectContaining({
-                state: expect.objectContaining({
-                  isChildContent: true,
-                  content,
-                  depth: ''
-                })
+                isChildContent: true,
+                content,
+                depth: ''
               })
             );
             expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
@@ -662,9 +654,11 @@ describe('CollectionChildComponent', () => {
           });
           const content = {
             identifier: 'some_identifier',
-            contentType: ContentType.SELF_ASSESS,
+            contentType: CsContentType.SELF_ASSESS,
+            primaryCategory: CsPrimaryCategory.COURSE_ASSESSMENT.toLowerCase(),
             contentData: {
-              contentType: ContentType.SELF_ASSESS
+              contentType: CsContentType.SELF_ASSESS,
+              primaryCategory: CsPrimaryCategory.COURSE_ASSESSMENT
             }
           };
           collectionChildComponent.batch = {
@@ -694,14 +688,11 @@ describe('CollectionChildComponent', () => {
             expect(mockTextbookTocService.setTextbookIds).toHaveBeenCalledWith({
               rootUnitId: undefined, contentId: content.identifier, unit: undefined
             });
-            expect(mockRouter.navigate).toHaveBeenCalledWith(
-              expect.arrayContaining([RouterLinks.CONTENT_DETAILS]),
+            expect(mockNavigationService.navigateToContent).toHaveBeenCalledWith(
               expect.objectContaining({
-                state: expect.objectContaining({
-                  isChildContent: true,
-                  content,
-                  depth: ''
-                })
+                isChildContent: true,
+                content,
+                depth: ''
               })
             );
             expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
@@ -737,9 +728,11 @@ describe('CollectionChildComponent', () => {
           });
           const content = {
             identifier: 'some_identifier',
-            contentType: ContentType.SELF_ASSESS,
+            contentType: CsContentType.SELF_ASSESS,
+            primaryCategory: CsPrimaryCategory.COURSE_ASSESSMENT.toLowerCase(),
             contentData: {
-              contentType: ContentType.SELF_ASSESS
+              contentType: CsContentType.SELF_ASSESS,
+              primaryCategory: CsPrimaryCategory.COURSE_ASSESSMENT
             }
           };
           collectionChildComponent.batch = {
@@ -751,7 +744,6 @@ describe('CollectionChildComponent', () => {
           // assert
           setTimeout(() => {
             // assert
-            expect(mockPopoverCtrl.create).toHaveBeenCalled();
             expect(mockPopoverCtrl.create).toHaveBeenCalledWith(expect.objectContaining({
               componentProps: expect.objectContaining({
                 sbPopoverHeading: 'START_ASSESSMENT',
@@ -767,7 +759,6 @@ describe('CollectionChildComponent', () => {
               })
             }));
             expect(mockTextbookTocService.setTextbookIds).not.toHaveBeenCalled();
-            expect(mockRouter.navigate).not.toHaveBeenCalled();
             expect(mockTelemetryGeneratorService.generateInteractTelemetry).not.toHaveBeenCalled();
             done();
           }, 0);
@@ -775,4 +766,111 @@ describe('CollectionChildComponent', () => {
     });
   });
 
+  describe('ngOnInt check hierarchy changes', () => {
+
+    it('should check for latestParent name if available then check for hierarchyInfo', () => {
+      // arrange
+      collectionChildComponent.childData = mockChildContentData;
+      mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+      collectionChildComponent.stckyindex = '0';
+      collectionChildComponent.latestParentNodes = [
+        {
+          hierarchyInfo: [
+            {
+              identifier: 'do_123',
+              contentType: 'textbook'
+            },
+            {
+              identifier: 'do098',
+              contentType: 'resources'
+            }
+          ]
+        }
+      ];
+      mockEvents.publish = jest.fn();
+      collectionChildComponent.latestParentName = 'sample_name';
+      // act
+      collectionChildComponent.ngOnInit();
+      // assert
+      expect(mockEvents.publish).toHaveBeenCalledWith(EventTopics.TOC_COLLECTION_CHILD_ID, {id: 'do_21274246255366963214046'});
+    });
+
+    it('should check for latestParent name if available then go to else part if parent name doesn`t matches', () => {
+          // arrange
+          collectionChildComponent.childData = mockChildContentData;
+          mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+          collectionChildComponent.stckyindex = '0';
+          collectionChildComponent.latestParentNodes = [
+              {
+                  hierarchyInfo: [
+                      {
+                          identifier: 'do_123',
+                          contentType: 'textbook'
+                      },
+                      {
+                          identifier: 'do098',
+                          contentType: 'resources'
+                      }
+                  ]
+              }
+          ];
+          mockEvents.publish = jest.fn();
+          collectionChildComponent.latestParentName = 'different name';
+          // act
+          collectionChildComponent.ngOnInit();
+          // assert
+          expect(mockEvents.publish).not.toHaveBeenCalledWith(EventTopics.TOC_COLLECTION_CHILD_ID, {id: 'do_21274246255366963214046'});
+      });
+
+    it('should check for latestParent name if available then go to else part if hierarchyInfo identifier doesn`t matches', () => {
+          // arrange
+          collectionChildComponent.childData = mockChildContentData;
+          mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+          collectionChildComponent.stckyindex = '0';
+          collectionChildComponent.latestParentNodes = [
+              {
+                  hierarchyInfo: [
+                      {
+                          identifier: 'do_11234455',
+                          contentType: 'textbook'
+                      },
+                      {
+                          identifier: 'do098',
+                          contentType: 'resources'
+                      }
+                  ]
+              }
+          ];
+          mockEvents.publish = jest.fn();
+          collectionChildComponent.latestParentName = 'different name';
+          // act
+          collectionChildComponent.ngOnInit();
+          // assert
+          expect(collectionChildComponent.sameHierarchy).toBeFalsy();
+      });
+
+    it('should check for latestParent name if available then go to else part if hierarchyInfo length doesn`t matches', () => {
+          // arrange
+          collectionChildComponent.childData = mockChildContentData;
+          mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+          collectionChildComponent.stckyindex = '0';
+          collectionChildComponent.latestParentNodes = [
+              {
+                  hierarchyInfo: [
+                      {
+                          identifier: 'do_11234455',
+                          contentType: 'textbook'
+                      },
+                  ]
+              }
+          ];
+          mockEvents.publish = jest.fn();
+          collectionChildComponent.latestParentName = 'different name';
+          // act
+          collectionChildComponent.ngOnInit();
+          // assert
+          expect(collectionChildComponent.sameHierarchy).toBeFalsy();
+      });
+
+  });
 });
diff --git a/src/app/components/collection-child/collection-child.component.ts b/src/app/components/collection-child/collection-child.component.ts
index a04997821..c20cbd1a3 100644
--- a/src/app/components/collection-child/collection-child.component.ts
+++ b/src/app/components/collection-child/collection-child.component.ts
@@ -1,10 +1,11 @@
 import { Location } from '@angular/common';
 import { Component, Input, NgZone, OnInit } from '@angular/core';
-import { ContentType, MimeType, RouterLinks, EventTopics } from '@app/app/app.constant';
+import { MimeType, RouterLinks, EventTopics } from '@app/app/app.constant';
 import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
 import { CommonUtilService } from '@app/services/common-util.service';
 import { ComingSoonMessageService } from '@app/services/coming-soon-message.service';
-import { PopoverController, Events } from '@ionic/angular';
+import { PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { SbGenericPopoverComponent } from '@app/app/components/popups/sb-generic-popover/sb-generic-popover.component';
 import { Content, TelemetryObject, Rollup, ContentStateResponse } from 'sunbird-sdk';
 import { Router, NavigationExtras } from '@angular/router';
@@ -16,6 +17,9 @@ import {
   PageId
 } from '@app/services/telemetry-constants';
 import { ContentUtil } from '@app/util/content-util';
+import { AddActivityToGroup } from '../../my-groups/group.interface';
+import { NavigationService } from '@app/services/navigation-handler.service';
+import { CsPrimaryCategory } from '@project-sunbird/client-services/services/content';
 
 @Component({
   selector: 'app-collection-child',
@@ -49,6 +53,7 @@ export class CollectionChildComponent implements OnInit {
   @Input() batch: any;
   @Input() renderLevel: number;
   @Input() contentStatusData: ContentStateResponse;
+  @Input() addActivityToGroupData: AddActivityToGroup;
 
   public telemetryObject: TelemetryObject;
   public objRollup: Rollup;
@@ -75,6 +80,7 @@ export class CollectionChildComponent implements OnInit {
     private telemetryService: TelemetryGeneratorService,
     private location: Location,
     private events: Events,
+    private navService: NavigationService
   ) { }
 
   ngOnInit(): void {
@@ -86,8 +92,7 @@ export class CollectionChildComponent implements OnInit {
     this.telemetryObject = ContentUtil.getTelemetryObject(this.childData);
   }
 
-  checkHierarchy() {
-    console.log('LatesParentNode', this.latestParentNodes[this.stckyindex].hierarchyInfo);
+  private checkHierarchy() {
     if (this.childData.hierarchyInfo && this.latestParentNodes[this.stckyindex].hierarchyInfo &&
       this.childData.hierarchyInfo.length === this.latestParentNodes[this.stckyindex].hierarchyInfo.length) {
       for (let i = 0; i < this.childData.hierarchyInfo.length; i++) {
@@ -107,12 +112,10 @@ export class CollectionChildComponent implements OnInit {
   }
 
   setContentId(id: string, collection?) {
-    console.log('extractedUrl', this.router);
     if (this.router.url.indexOf(RouterLinks.TEXTBOOK_TOC) !== -1) {
       const values = {
         unitClicked: id
       };
-      // values['parentId'] = this.parentId;
       this.telemetryService.generateInteractTelemetry(
         InteractType.TOUCH,
         InteractSubtype.SUBUNIT_CLICKED,
@@ -123,7 +126,7 @@ export class CollectionChildComponent implements OnInit {
         this.objRollup,
         this.corRelationList
       );
-      this.textbookTocService.setTextbookIds({ rootUnitId: this.rootUnitId, contentId: id, unit: collection });
+      this.textbookTocService.setTextbookIds({ rootUnitId: this.rootUnitId, contentId: id, unit: collection, content: collection });
       this.location.back();
     }
   }
@@ -148,92 +151,82 @@ export class CollectionChildComponent implements OnInit {
     } else if (this.isEnrolled && this.isBatchNotStarted && this.router.url.indexOf(RouterLinks.ENROLLED_COURSE_DETAILS) !== -1) {
       this.events.publish('courseToc:content-clicked', { isBatchNotStarted: this.isBatchNotStarted, isEnrolled: this.isEnrolled });
     } else {
-      //   migration-TODO : remove unnecessary
-      //   const stateData = this.navParams.get('contentState');
       const values = {
         contentClicked: content.identifier
       };
-      // values['parentId'] = this.bookID;
       this.zone.run(async () => {
-        if (content.contentType === ContentType.COURSE) {
-          //   migration-TODO : remove unnecessary
-          // this.navCtrl.push(EnrolledCourseDetailsPage, {
-          //   content: content,
-          //   depth: depth,
-          //   contentState: stateData,
-          //   corRelation: this.corRelationList,
-          //   breadCrumb: this.breadCrumb
-          // });
-        } else if (content.mimeType === MimeType.COLLECTION) {
-          this.isDepthChild = true;
-          const collectionDetailsParams: NavigationExtras = {
-            state: {
-              content,
-              depth,
-              // migration-TODO : remove unnece
-              // contentState: stateData,
-              corRelation: this.corRelationList,
-              breadCrumb: this.breadCrumb
-            }
-          };
-          this.router.navigate([RouterLinks.COLLECTION_DETAIL_ETB], collectionDetailsParams);
-        } else {
-          const goToContentDetails = () => {
-            this.textbookTocService.setTextbookIds({ rootUnitId: this.rootUnitId, contentId: content.identifier });
-
-            this.telemetryService.generateInteractTelemetry(
-              InteractType.TOUCH,
-              InteractSubtype.CONTENT_CLICKED,
-              Environment.HOME,
-              PageId.COLLECTION_DETAIL, this.telemetryObject,
-              values, this.objRollup, this.corRelationList
-            );
-            const contentDetailsParams: NavigationExtras = {
+        switch (ContentUtil.isTrackable(content)) {
+          case 0:
+            this.isDepthChild = true;
+            const collectionDetailsParams: NavigationExtras = {
               state: {
-                isChildContent: true,
                 content,
                 depth,
-                course: this.updatedCourseCardData || undefined,
                 corRelation: this.corRelationList,
                 breadCrumb: this.breadCrumb
               }
             };
-            this.router.navigate([RouterLinks.CONTENT_DETAILS], contentDetailsParams);
-          };
+            this.navService.navigateToCollection(collectionDetailsParams.state);
+            break;
+          default:
+            const goToContentDetails = () => {
+              this.textbookTocService.setTextbookIds({ rootUnitId: this.rootUnitId, contentId: content.identifier });
+
+              this.telemetryService.generateInteractTelemetry(
+                InteractType.TOUCH,
+                InteractSubtype.CONTENT_CLICKED,
+                Environment.HOME,
+                PageId.COLLECTION_DETAIL, this.telemetryObject,
+                values, this.objRollup, this.corRelationList
+              );
+              const contentDetailsParams: NavigationExtras = {
+                state: {
+                  isChildContent: true,
+                  content,
+                  depth,
+                  course: this.updatedCourseCardData || undefined,
+                  corRelation: this.corRelationList,
+                  breadCrumb: this.breadCrumb,
+                  ...this.addActivityToGroupData
+                }
+              };
+              this.navService.navigateToContent(contentDetailsParams.state);
+            };
 
-          if (content.contentData.contentType === ContentType.SELF_ASSESS
-            && this.batch && this.batch.status === 2) {
-            this.assessemtnAlert = await this.popoverCtrl.create({
-              component: SbGenericPopoverComponent,
-              componentProps: {
-                sbPopoverHeading: this.commonUtilService.translateMessage(content['status'] ? 'REDO_ASSESSMENT' : 'START_ASSESSMENT'),
-                sbPopoverMainTitle: this.commonUtilService.translateMessage(content['status'] ?
-                  'TRAINING_ENDED_REDO_ASSESSMENT' : 'TRAINING_ENDED_START_ASSESSMENT'),
-                actionsButtons: [
-                  {
-                    btntext: this.commonUtilService.translateMessage('SKIP'),
-                    btnClass: 'sb-btn sb-btn-sm  sb-btn-outline-info'
-                  }, {
-                    btntext: this.commonUtilService.translateMessage(content['status'] ? 'REDO' : 'START'),
-                    btnClass: 'popover-color'
-                  }
-                ],
-                showHeader: true,
-                icon: null
-              },
-              cssClass: 'sb-popover sb-dw-delete-popover',
-              showBackdrop: false,
-              backdropDismiss: false,
-              animated: true
-            });
-            await this.assessemtnAlert.present();
-            const { data } = await this.assessemtnAlert.onDidDismiss();
-            if (data && data.isLeftButtonClicked === false) {
+            if (content.primaryCategory === CsPrimaryCategory.COURSE_ASSESSMENT.toLowerCase()
+              && this.batch && this.batch.status === 2) {
+              this.assessemtnAlert = await this.popoverCtrl.create({
+                component: SbGenericPopoverComponent,
+                componentProps: {
+                  sbPopoverHeading: this.commonUtilService.translateMessage(content['status'] ? 'REDO_ASSESSMENT' : 'START_ASSESSMENT'),
+                  sbPopoverMainTitle: this.commonUtilService.translateMessage(content['status'] ?
+                    'TRAINING_ENDED_REDO_ASSESSMENT' : 'TRAINING_ENDED_START_ASSESSMENT'),
+                  actionsButtons: [
+                    {
+                      btntext: this.commonUtilService.translateMessage('SKIP'),
+                      btnClass: 'sb-btn sb-btn-sm  sb-btn-outline-info'
+                    }, {
+                      btntext: this.commonUtilService.translateMessage(content['status'] ? 'REDO' : 'START'),
+                      btnClass: 'popover-color'
+                    }
+                  ],
+                  showHeader: true,
+                  icon: null
+                },
+                cssClass: 'sb-popover sb-dw-delete-popover',
+                showBackdrop: false,
+                backdropDismiss: false,
+                animated: true
+              });
+              await this.assessemtnAlert.present();
+              const { data } = await this.assessemtnAlert.onDidDismiss();
+              if (data && data.isLeftButtonClicked === false) {
+                goToContentDetails();
+              }
+            } else {
               goToContentDetails();
             }
-          } else {
-            goToContentDetails();
-          }
+            break;
         }
       });
     }
@@ -247,7 +240,7 @@ export class CollectionChildComponent implements OnInit {
         componentProps: {
           sbPopoverHeading: this.commonUtilService.translateMessage('CONTENT_COMMING_SOON'),
           sbPopoverMainTitle: message ? this.commonUtilService.translateMessage(message) :
-            this.commonUtilService.translateMessage('CONTENT_IS_BEEING_ADDED', {content_name : childData.contentData.name }),
+            this.commonUtilService.translateMessage('CONTENT_IS_BEEING_ADDED', { content_name: childData.contentData.name }),
           actionsButtons: [
             {
               btntext: this.commonUtilService.translateMessage('OKAY'),
@@ -266,19 +259,16 @@ export class CollectionChildComponent implements OnInit {
       return true;
     } else {
       if (activeMimeType.indexOf('all') > -1) {
-        // if (content.contentData.mimeType === MimeType.COLLECTION && !content.children) {
-        //     return false;
-        // }
         return true;
       }
       return !!activeMimeType.find(m => m === mimeType);
     }
   }
 
-  // course-toc: for showing respective contenttype icons
-  getContentTypeIcon(content: Content) {
+
+  getMediaIcon(content: Content) {
     const mimeType = content.mimeType;
-    if (content.contentData.contentType === ContentType.SELF_ASSESS) {
+    if (content.contentData.primaryCategory === CsPrimaryCategory.COURSE_ASSESSMENT) {
       return './assets/imgs/selfassess.svg';
     } else if (mimeType) {
       if (MimeType.DOCS.indexOf(mimeType) !== -1) {
diff --git a/src/app/components/common-forms/common-forms.component.html b/src/app/components/common-forms/common-forms.component.html
new file mode 100644
index 000000000..614e74418
--- /dev/null
+++ b/src/app/components/common-forms/common-forms.component.html
@@ -0,0 +1,120 @@
+<div [formGroup]="formGroup" *ngIf="formGroup">
+  <ng-container *ngFor="let field of config; let index = i">
+
+    <div *ngIf="field.type === FieldConfigInputType.SELECT || field.type === FieldConfigInputType.NESTED_SELECT"
+      [hidden]="field.templateOptions?.hidden || null">
+      <div class="sb-dropdown">
+          <ion-item class="input-item">
+            <ion-label position="stacked" class="label-font align-text">
+              {{ field.templateOptions?.label | translate }} 
+              <ion-text *ngIf="field.templateOptions?.label && requiredFieldsMap[field.code]">
+                <span class="required-star">&nbsp;*</span>
+              </ion-text>
+            </ion-label>
+            <ion-select [formControl]="formGroup.get(field.code)" [multiple]="false"
+              [interfaceOptions]="{
+                header: field.templateOptions?.label,
+                cssClass: 'select-box',
+                animated: false
+              }"
+              [disabled]="field.disabled || (field.context && formGroup.get(field.context).invalid)"
+              [compareWith]="ValueComparator.valueComparator"
+              placeholder="{{ field.templateOptions?.placeHolder | translate }}"
+              okText="{{'BTN_SUBMIT' | translate}}" cancelText="{{'CANCEL' | translate}}">
+
+              <ng-container *ngIf="isOptionsArray(field.templateOptions?.options)">
+                <ion-select-option *ngFor="let option of field.templateOptions?.options" [value]="option?.value">
+                  {{option?.label}}
+                </ion-select-option>
+              </ng-container>
+
+              <ng-container *ngIf="isOptionsClosure(field.templateOptions?.options) && optionsMap$[field.code]">
+                <ion-select-option *ngFor="let option of (optionsMap$[field.code]) | async" [value]="option?.value">
+                  {{option?.label}}
+                </ion-select-option>
+              </ng-container>
+
+            </ion-select>
+
+          </ion-item>
+      </div>
+    </div>
+
+    <div *ngIf="field.type === FieldConfigInputType.INPUT" [hidden]="field.templateOptions?.hidden || null">
+      <ng-container *ngIf="formGroup.get(field.code); let formControl">
+        <ion-item class="input-item cf-input-primary">
+          <ion-label position="stacked" class="label-font align-text ion-text-capitalize">
+            {{ field.templateOptions?.label | translate }}
+            <ion-text *ngIf="field.templateOptions?.label && requiredFieldsMap[field.code]">
+              <span class="required-star">&nbsp;*</span>
+            </ion-text>
+          </ion-label>
+
+          <div class="W100 merged-input-container MT16" style="text-align:start"
+            [ngClass]="{'': (!formControl.dirty || !formControl.touched) && !formControl.errors ,'cf-input-error': (formControl.dirty || formControl.touched) && formControl.errors }">
+
+            <span class="prefix" *ngIf="field.templateOptions?.prefix">{{field.templateOptions?.prefix}}</span>
+
+            <ion-input formControlName="{{field.code}}"
+              placeholder="{{ field.templateOptions?.placeHolder | translate}}" class="form-control custom">
+            </ion-input>
+            
+            <span class="otp-validator" *ngIf="field.asyncValidation"> 
+              <img *ngIf="formControl.value && formControl.status === 'VALID'" src="assets/imgs/green_tick.svg" alt="verification success">
+              <img *ngIf="formControl.value && formControl.status !== 'VALID'" src="assets/imgs/red_exclamation.svg" alt="verification failure">
+              <img *ngIf="!formControl.value" src="assets/imgs/empty_circle.svg" alt="empty field">
+            </span>
+
+          </div>
+
+          <ng-container *ngFor="let validation of field.validations">
+            <div class="cf-error"
+              *ngIf="(validation.type && (validation.type).toLowerCase && validation.message && formControl.errors && formControl.errors[(validation.type).toLowerCase()] && (formControl.dirty || formControl.touched))">
+              {{ validation.message | translate }}
+            </div>
+          </ng-container>
+        </ion-item>
+
+        <ng-container *ngIf="field.asyncValidation?.trigger">
+          <div class="async-validator" [hidden]="formControl.status === 'VALID' || formControl.status !== 'PENDING' || !formControl.value">
+            <div class="cf-error" *ngIf="field.asyncValidation?.message">
+              {{ field.asyncValidation.message | translate }}
+            </div>
+            <div class="verification-btn">
+              <ion-button class="ion-text-capitalize"
+                shape="round"
+                #validationTrigger
+                [attr.data-marker]="field.asyncValidation.marker">
+                {{field.asyncValidation.trigger}}
+              </ion-button>
+            </div>
+          </div>
+        </ng-container>
+      </ng-container>
+
+    </div>
+
+    <div class="flex-container M16" *ngIf="field.type === FieldConfigInputType.CHECKBOX"
+      [hidden]="field.templateOptions?.hidden || null">
+      <div>
+        <ion-checkbox formControlName="{{field.code}}"></ion-checkbox>
+      </div>
+      <ng-container *ngIf="field.templateOptions?.label">
+        <span>{{ field.templateOptions?.label | translate}}</span>
+      </ng-container>
+      <ng-container *ngIf="field.templateOptions?.labelHtml">
+        <div [innerHTML]="field.templateOptions?.labelHtml | translateHtml" (click)="handleLinkClick($event)"></div>
+      </ng-container>
+    </div>
+
+    <div class="M16" *ngIf="field.type === FieldConfigInputType.LABEL">
+      {{field.templateOptions?.label | translate}}
+    </div>
+
+    <app-common-forms *ngIf="field.type === FieldConfigInputType.NESTED_GROUP"
+      (initialize)="onNestedFormInitialize($event, field)" (finalize)="onNestedFormFinalize($event, field)"
+      [dataLoadStatusDelegate]="dataLoadStatusDelegate" [config]="field.children">
+    </app-common-forms>
+
+  </ng-container>
+</div>
diff --git a/src/app/components/common-forms/common-forms.component.scss b/src/app/components/common-forms/common-forms.component.scss
new file mode 100644
index 000000000..cc658e25e
--- /dev/null
+++ b/src/app/components/common-forms/common-forms.component.scss
@@ -0,0 +1,235 @@
+@import "src/assets/styles/_variables.scss";
+:host {
+  .label-font {
+    color: map-get($colors, primary_black) !important;
+    font-family: "Noto Sans", sans-serif !important;
+    font-size: 20px !important;
+    line-height: 22px !important;
+    font-weight: normal;
+  }
+
+  .select-text:first-letter {
+    text-transform: capitalize;
+  }
+
+  .custom-footer-background .toolbar-background-ios,
+  .custom-footer-background .toolbar-background-md {
+    background: unset !important;
+  }
+  .padding-12 {
+    padding: 12px !important;
+  }
+  .item-select-disabled {
+    .label-md {
+      color: map-get($colors, medium_gray);
+      opacity: 1;
+    }
+    ion-select {
+      border-color: map-get($colors, primary_black);
+    }
+  }
+
+  .item-label-stacked ion-select {
+    border: 1px solid map-get($colors, primary);
+    border-radius: 5px;
+    margin-top: 16px;
+    padding-left: 8px;
+    padding-right: 16px !important;
+    font-size: 14px;
+    font-family: "Noto Sans", sans-serif;
+    .select-icon {
+      .select-icon-inner {
+        border: solid blue;
+        border-width: 0 2px 2px 0;
+        display: inline-block;
+        padding: 4px;
+        transform: rotate(45deg);
+        animation: upDownAnimate 5s linear infinite;
+        animation-duration: 0.9s;
+      }
+    }
+  }
+
+  .item-label-stacked.item-select-disabled {
+    ion-label {
+      color: map-get($colors, primary_black);
+    }
+    ion-select {
+      border-color: map-get($colors, primary_black);
+      .select-icon {
+        .select-icon-inner {
+          border-color: map-get($colors, primary_black);
+          animation: none;
+        }
+      }
+      .select-placeholder {
+        color: map-get($colors, primary_black);
+      }
+    }
+  }
+
+  ion-item {
+    --border-color: var(--ion-color-danger, #f1453d);
+  }
+
+  ion-button{
+    --background: #{$blue}  !important;
+  }
+
+  .item-label-stacked ion-input {
+    border-radius: 5px;
+    padding-left: 16px !important;
+    padding-right: 16px !important;
+    font-size: 14px;
+  }
+
+  .cf-input-primary ion-input{
+    font-weight: bold;
+    border: none;
+    --placeholder-opacity: 0.3 !important;
+  }
+
+  .cf-input-error{
+    border: 1px solid red;
+  }
+
+  ion-item.item-label-stacked {
+    --border-width: 0;
+    --highlight-background: transparent;
+  }
+  .item-select ion-label {
+    color: map-get($colors, primary);
+  }
+
+  ion-label {
+    color: map-get($colors, primary_black);
+    font-family: "Noto Sans", sans-serif;
+    font-size: 14px;
+    letter-spacing: 0;
+    line-height: 19px;
+  }
+
+}
+
+.cf-title{
+  font-size: 16px;
+  font-weight: bold;
+  color: $blue;
+  margin: 16px 16px 0;
+}
+
+.cf-input-title{
+  color: map-get($colors, primary_black);
+  font-family: "Noto Sans", sans-serif;
+  font-size: 14px;
+  letter-spacing: 0;
+  line-height: 19px;
+  margin: 16px 0 8px;
+}
+
+.cf-input-box{
+  border: 0.5px solid map-get($colors, primary_black);
+  border-radius: 2px;
+  ion-input{
+    margin: 0 8px;
+  }
+}
+
+.cf-error{
+  margin-top: 8px;
+  display: block;
+  font-size: 12px;
+  color: red;
+  line-height: 10px;
+}
+
+.input-item{
+  padding-top: 8px;
+}
+
+.cf-tnc-text{
+  padding: 0 8px;
+}
+
+.sb-new-btn {
+  background-color: $blue;
+  color: map-get($colors, white);
+  width: 100%;
+  height: 40px;
+  box-shadow: 0 2px 7px 0 rgba(0, 0, 0, 0.25);
+  font-family: "Noto Sans", sans-serif;
+  font-size: 16px;
+}
+
+.sb-new-btn-outline {
+  background-color: map-get($colors, white);
+  color: $blue;
+  width: 100%;
+  height: 40px;
+  border: 1px solid $blue;
+  box-shadow: 0 2px 7px 0 rgba(0, 0, 0, 0.25);
+  font-family: "Noto Sans", sans-serif;
+  font-size: 16px;
+}
+
+.blur-btn {
+  opacity: 0.5;
+}
+
+.tnc-link {
+  color: $blue;
+  text-decoration: underline;
+}
+
+ion-checkbox {
+  margin-right: 8px;
+  --background-checked: #{$blue} !important;
+  --border-color-checked: #{$blue} !important;
+}
+
+.merged-input-container {
+  border: 1px solid map-get($colors, primary);
+  display: flex;
+  flex: 1 1 auto;
+  border-radius: 6px;
+  .decorator {
+    display: inline-block;
+    max-width: 50px;
+  }
+  .custom {
+    display: inline-block;
+  }
+  ion-input{
+    border: none;
+  }
+  span{
+    font-size: 14px;
+    opacity: 0.7;
+    margin: auto;
+  }
+
+}
+
+.verification-btn{
+  text-align: center;
+  ion-button {
+    --background: #008840 !important;
+  }
+}
+
+.otp-validator{
+  padding-left: 8px;
+  padding-right: 8px;
+}
+
+.prefix{
+  padding-left: 8px;
+}
+
+.required-star{
+  color: red;
+}
+
+.async-validator{
+  margin: 0 16px;
+}
\ No newline at end of file
diff --git a/src/app/components/common-forms/common-forms.component.ts b/src/app/components/common-forms/common-forms.component.ts
new file mode 100644
index 000000000..e17ecd9a1
--- /dev/null
+++ b/src/app/components/common-forms/common-forms.component.ts
@@ -0,0 +1,245 @@
+import {
+  AfterViewInit, Component, EventEmitter, Input,
+  OnChanges, OnDestroy, OnInit, Output, QueryList, SimpleChanges, ViewChildren
+} from '@angular/core';
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { Observable, Subject, Subscription } from 'rxjs';
+import { distinctUntilChanged, map, scan, tap } from 'rxjs/operators';
+import {
+  FieldConfig, FieldConfigInputType, FieldConfigOption,
+  FieldConfigOptionsBuilder, FieldConfigValidationType
+} from './field-config';
+import { ValueComparator } from './value-comparator';
+
+@Component({
+  selector: 'app-common-forms',
+  templateUrl: './common-forms.component.html',
+  styleUrls: ['./common-forms.component.scss'],
+})
+export class CommonFormsComponent implements OnInit, OnChanges, OnDestroy, AfterViewInit {
+  @Output() initialize = new EventEmitter();
+  @Output() finalize = new EventEmitter();
+  @Output() valueChanges = new EventEmitter();
+  @Output() statusChanges = new EventEmitter();
+  @Output() dataLoadStatus = new EventEmitter<'LOADING' | 'LOADED'>();
+  @Input() config;
+  @Input() dataLoadStatusDelegate = new Subject<'LOADING' | 'LOADED'>();
+  @ViewChildren('validationTrigger') validationTriggers: QueryList<HTMLElement>;
+
+  formGroup: FormGroup;
+  FieldConfigInputType = FieldConfigInputType;
+  ValueComparator = ValueComparator;
+  optionsMap$: { [code: string]: Observable<FieldConfigOption<any>[]> } = {};
+  requiredFieldsMap: { [code: string]: boolean } = {};
+
+  private statusChangesSubscription: Subscription;
+  private valueChangesSubscription: Subscription;
+  private dataLoadStatusSinkSubscription: Subscription;
+
+  constructor(
+    private formBuilder: FormBuilder,
+    private commonUtilService: CommonUtilService
+  ) { }
+
+  ngOnDestroy(): void {
+    this.finalize.emit();
+    if (this.statusChangesSubscription) {
+      this.statusChangesSubscription.unsubscribe();
+    }
+    if (this.valueChangesSubscription) {
+      this.valueChangesSubscription.unsubscribe();
+    }
+    if (this.dataLoadStatusSinkSubscription) {
+      this.dataLoadStatusSinkSubscription.unsubscribe();
+    }
+  }
+
+  ngOnInit() {
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes['config']) {
+      if ((changes['config'].currentValue && changes['config'].firstChange) || changes['config'].previousValue !== changes['config'].currentValue) {
+        this.initializeForm();
+
+        changes['config'].currentValue.forEach((config: FieldConfig<any>) => {
+          if (config.validations && config.validations.length) {
+            this.requiredFieldsMap[config.code] = !!config.validations.find(val => val.type === FieldConfigValidationType.REQUIRED);
+          }
+          if (!config.templateOptions) {
+            return;
+          }
+          if (!config.templateOptions.options) {
+            config.templateOptions.options = [];
+          }
+          if (this.isOptionsClosure(config.templateOptions.options)) {
+            this.optionsMap$[config.code] = (config.templateOptions.options as FieldConfigOptionsBuilder<any>)(
+              this.formGroup.get(config.code) as FormControl,
+              this.formGroup.get(config.context) as FormControl,
+              () => this.dataLoadStatusDelegate.next('LOADING'),
+              () => this.dataLoadStatusDelegate.next('LOADED')
+            ) as any;
+          }
+        });
+      }
+    }
+    if (this.dataLoadStatusSinkSubscription) {
+      this.dataLoadStatusSinkSubscription.unsubscribe();
+    }
+    if (this.statusChangesSubscription) {
+      this.statusChangesSubscription.unsubscribe();
+    }
+    if (this.valueChangesSubscription) {
+      this.valueChangesSubscription.unsubscribe();
+    }
+    this.dataLoadStatusSinkSubscription = this.dataLoadStatusDelegate.pipe(
+      scan<'LOADING' | 'LOADED', { loadingCount: 0, loadedCount: 0 }>((acc, event) => {
+        if (event === 'LOADED') {
+          acc.loadedCount++;
+        } else {
+          acc.loadingCount++;
+        }
+        return acc;
+      }, { loadingCount: 0, loadedCount: 0 }),
+      map<{ loadingCount: 0, loadedCount: 0 }, 'LOADING' | 'LOADED'>((aggregates) => {
+        if (aggregates.loadingCount !== aggregates.loadedCount) {
+          return 'LOADING';
+        }
+        return 'LOADED';
+      }),
+      distinctUntilChanged(),
+      tap((result) => {
+        if (result === 'LOADING') {
+          this.dataLoadStatus.emit('LOADING');
+        } else {
+          this.dataLoadStatus.emit('LOADED');
+        }
+      })
+    ).subscribe();
+    this.statusChangesSubscription = this.formGroup.statusChanges.pipe(
+      tap((v) => {
+        this.statusChanges.emit({
+          isPristine: this.formGroup.pristine,
+          isDirty: this.formGroup.dirty,
+          isInvalid: this.formGroup.invalid,
+          isValid: this.formGroup.valid
+        });
+      })
+    ).subscribe();
+    this.valueChangesSubscription = this.formGroup.valueChanges.pipe(
+      tap((v) => {
+        this.valueChanges.emit(v);
+      })
+    ).subscribe();
+  }
+
+  ngAfterViewInit() {
+    this.config.forEach(element => {
+      if (element.asyncValidation && element.asyncValidation.asyncValidatorFactory && this.formGroup.get(element.code)) {
+        this.formGroup.get(element.code).setAsyncValidators(element.asyncValidation.asyncValidatorFactory(
+          element.asyncValidation.marker,
+          this.validationTriggers
+        ));
+      }
+    });
+  }
+
+  onNestedFormFinalize(nestedFormGroup: FormGroup, fieldConfig: FieldConfig<any>) {
+    if (!this.formGroup.get('children') || !this.formGroup.get(`children.${fieldConfig.code}`)) {
+      return;
+    }
+    (this.formGroup.get('children') as FormGroup).removeControl(fieldConfig.code);
+    if (!Object.keys((this.formGroup.get('children') as FormGroup).controls).length) {
+      this.formGroup.removeControl('children');
+    }
+  }
+  onNestedFormInitialize(nestedFormGroup: FormGroup, fieldConfig: FieldConfig<any>) {
+    if (!this.formGroup.get('children')) {
+      this.formGroup.addControl('children', new FormGroup({}));
+    }
+    (this.formGroup.get('children') as FormGroup).addControl(fieldConfig.code, nestedFormGroup);
+  }
+  private initializeForm() {
+    if (!this.config.length) {
+      console.error('FORM LIST IS EMPTY');
+      return;
+    }
+    const formGroupData = {};
+    this.config.forEach((element: any, index) => {
+      if (element.type !== FieldConfigInputType.LABEL) {
+        const formValueList = this.prepareFormValidationData(element, index);
+        formGroupData[element.code] = formValueList;
+      }
+    });
+    this.formGroup = this.formBuilder.group(formGroupData);
+    this.initialize.emit(this.formGroup);
+  }
+  private prepareFormValidationData(element: FieldConfig<any>, index) {
+    const formValueList = [];
+    const validationList = [];
+    let defaultVal: any = '';
+    switch (element.type) {
+      case FieldConfigInputType.INPUT:
+        defaultVal = element.templateOptions.type === 'number' ?
+          (element.default && Number.isInteger(element.default) ? element.default : 0) :
+          (element.default && (typeof element.default) === 'string' ? element.default : '');
+        break;
+      case FieldConfigInputType.SELECT:
+      case FieldConfigInputType.NESTED_SELECT:
+        defaultVal = element.templateOptions.multiple ?
+          (element.default && Array.isArray(element.default) ? element.default : []) : (element.default || null);
+        break;
+      case FieldConfigInputType.CHECKBOX:
+        defaultVal = false || !!element.default;
+        break;
+    }
+    formValueList.push(defaultVal);
+    if (element.validations && element.validations.length) {
+      element.validations.forEach((data, i) => {
+        switch (data.type) {
+          case FieldConfigValidationType.REQUIRED:
+            if (element.type === FieldConfigInputType.CHECKBOX) {
+              validationList.push(Validators.requiredTrue);
+            } else if (element.type === FieldConfigInputType.SELECT || element.type === FieldConfigInputType.NESTED_SELECT) {
+              validationList.push((c) => {
+                if (element.templateOptions.multiple) {
+                  return c.value && c.value.length ? null : 'error';
+                }
+                return !!c.value ? null : 'error';
+              });
+            } else {
+              validationList.push(Validators.required);
+            }
+            break;
+          case FieldConfigValidationType.PATTERN:
+            validationList.push(Validators.pattern(element.validations[i].value as string));
+            break;
+          case FieldConfigValidationType.MINLENGTH:
+            validationList.push(Validators.minLength(element.validations[i].value as number));
+            break;
+          case FieldConfigValidationType.MAXLENGTH:
+            validationList.push(Validators.maxLength(element.validations[i].value as number));
+            break;
+        }
+      });
+    }
+    formValueList.push(Validators.compose(validationList));
+    return formValueList;
+  }
+
+  isOptionsArray(options: any) {
+    return Array.isArray(options);
+  }
+
+  isOptionsClosure(options: any) {
+    return typeof options === 'function';
+  }
+
+  handleLinkClick(event: MouseEvent) {
+    if (event.target && event.target['hasAttribute'] && (event.target as HTMLAnchorElement).hasAttribute('href')) {
+      this.commonUtilService.openLink((event.target as HTMLAnchorElement).getAttribute('href'));
+    }
+  }
+
+}
diff --git a/src/app/components/common-forms/field-config.ts b/src/app/components/common-forms/field-config.ts
new file mode 100644
index 000000000..286000451
--- /dev/null
+++ b/src/app/components/common-forms/field-config.ts
@@ -0,0 +1,67 @@
+import { Observable } from 'rxjs';
+import { FormControl, AsyncValidatorFn } from '@angular/forms';
+import { QueryList } from '@angular/core';
+
+export enum FieldConfigInputType {
+  INPUT = 'input',
+  CHECKBOX = 'checkbox',
+  SELECT = 'select',
+  LABEL = 'label',
+  NESTED_SELECT = 'nested_select',
+  NESTED_GROUP = 'nested_group'
+}
+
+export enum FieldConfigValidationType {
+  REQUIRED = 'required',
+  MAXLENGTH = 'maxLength',
+  MINLENGTH = 'minLength',
+  PATTERN = 'pattern'
+}
+
+export type FieldConfigOptionsBuilder<T> =
+  (control: FormControl, context?: FormControl, notifyLoading?: () => void, notifyLoaded?: () => void) =>
+    Observable<FieldConfigOption<T>[]> | Promise<FieldConfigOption<T>[]>;
+
+export type AsyncValidatorFactory = (marker: string, triggers: QueryList<HTMLElement>) => AsyncValidatorFn;
+
+export interface FieldConfigOption<T> {
+  label: string;
+  value: T;
+  extras?: T;
+}
+
+export interface FieldConfigOptionAssociations<T> {
+  [key: string]: FieldConfigOption<T>[];
+}
+
+export interface FieldConfig<T> {
+  code: string;
+  type: FieldConfigInputType | string;
+  default?: any;
+  context?: string;
+  children?: FieldConfig<T>[];
+  templateOptions: {
+    type?: string,
+    label?: string,
+    placeHolder?: string,
+    prefix?: string,
+    multiple?: boolean,
+    hidden?: boolean,
+    options?: FieldConfigOption<T>[] | FieldConfigOptionsBuilder<T> | FieldConfigOptionAssociations<T>,
+    labelHtml?: {
+      contents: string,
+      values: {[key: string]: string}
+    }
+  };
+  validations?: {
+    type: FieldConfigValidationType | string,
+    value?: string | boolean | number | RegExp,
+    message?: string
+  }[];
+  asyncValidation?: {
+    marker: string,
+    message?: string,
+    trigger?: string,
+    asyncValidatorFactory?: AsyncValidatorFactory
+  };
+}
diff --git a/src/app/components/common-forms/value-comparator.ts b/src/app/components/common-forms/value-comparator.ts
new file mode 100644
index 000000000..9ea020046
--- /dev/null
+++ b/src/app/components/common-forms/value-comparator.ts
@@ -0,0 +1,67 @@
+export class ValueComparator {
+  static valueComparator(v1, v2): boolean {
+    if (typeof v1 === 'object' && typeof v2 === 'object') {
+      return ObjectUtil.equals(v1, v2);
+    } else if (v1 === v2) {
+      return true;
+    } else if (!v1 && !v2) {
+      return true;
+    }
+    return false;
+  }
+}
+class ObjectUtil {
+  public static equals(a: any, b: any): boolean {
+    const countProps = (obj) => {
+      let count = 0;
+      for (const k in obj) {
+        if (obj.hasOwnProperty(k)) {
+          count++;
+        }
+      }
+      return count;
+    };
+    const objectEquals = (v1: any, v2: any) => {
+      if (typeof (v1) !== typeof (v2)) {
+        return false;
+      }
+      if (typeof (v1) === 'function') {
+        return v1.toString() === v2.toString();
+      }
+      if (v1 instanceof Object && v2 instanceof Object) {
+        if (countProps(v1) !== countProps(v2)) {
+          return false;
+        }
+        let r = true;
+        for (const k in v1) {
+          r = objectEquals(v1[k], v2[k]);
+          if (!r) {
+            return false;
+          }
+        }
+        return true;
+      } else {
+        return v1 === v2;
+      }
+    };
+    return objectEquals(a, b);
+  }
+  public static getPropDiff(newObj: {}, oldObj: {}): string[] {
+    return Object.keys(newObj).reduce<string[]>((acc: string[], key) => {
+      if (ObjectUtil.equals(newObj[key], oldObj[key])) {
+        return acc;
+      }
+      acc.push(key);
+      return acc;
+    }, []);
+  }
+  public static getTruthyProps(obj: {}): string[] {
+    return Object.keys(obj).filter((key) => !!obj[key]);
+  }
+  public static toOrderedString(obj: {}): string {
+    return JSON.stringify(Object.keys(obj).sort().reduce<{}>((acc, k) => {
+      acc[k] = obj[k];
+      return acc;
+    }, {}));
+  }
+}
diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts
index 17f6cb713..16a408891 100644
--- a/src/app/components/components.module.ts
+++ b/src/app/components/components.module.ts
@@ -3,19 +3,17 @@ import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { IonicModule } from '@ionic/angular';
 import { TranslateModule } from '@ngx-translate/core';
-
 import { ApplicationHeaderComponent } from './application-header/application-header.component';
+import { ApplicationHeaderKebabMenuComponent } from './application-header/application-header-kebab-menu.component';
 import { SignInCardComponent } from './sign-in-card/sign-in-card.component';
-import { TextBookCardComponent } from './text-book-card/text-book-card.component';
 import { PipesModule } from '../../pipes/pipes.module';
-import { ViewAllCardComponent } from './view-all-card/view-all-card.component';
 import { PbHorizontalComponent } from './pb-horizontal/pb-horizontal.component';
 import { SbGenericPopoverComponent } from './popups/sb-generic-popover/sb-generic-popover.component';
 import { SbNoNetworkPopupComponent } from './popups/sb-no-network-popup/sb-no-network-popup.component';
 import { SbPopoverComponent } from './popups/sb-popover/sb-popover.component';
 import { CollectionChildComponent } from './collection-child/collection-child.component';
 import { ContentActionsComponent } from './content-actions/content-actions.component';
-import { IonicRatingModule, RatingComponent } from 'ionic4-rating';
+import { IonicRatingModule } from 'ionic4-rating';
 import { ContentRatingAlertComponent } from './content-rating-alert/content-rating-alert.component';
 import { DetailCardComponent } from './detail-card/detail-card.component';
 import { FileSizePipe } from '@app/pipes/file-size/file-size';
@@ -28,10 +26,8 @@ import { Keyboard } from '@ionic-native/keyboard/ngx';
 import { ConfirmAlertComponent } from './confirm-alert/confirm-alert.component';
 import { AppRatingAlertComponent } from './rating-alert/rating-alert.component';
 import { OverflowMenuComponent } from '../profile/overflow-menu/overflow-menu.component';
-import { ReportAlertComponent } from '../reports/report-alert/report-alert.component';
 import { ProfileAvatarComponent } from './profile-avatar/profile-avatar.component';
 import { NotificationItemComponent } from './notification-item/notification-item.component';
-import { AssessmentDetailsComponent } from './assessment-details/assessment-details.component';
 import { ViewCreditsComponent } from './popups/view-credits/view-credits.component';
 import { SkeletonItemComponent } from './skeleton-item/skeleton-item.component';
 import { FilteroptionComponent } from './filteroption/filteroption.component';
@@ -42,14 +38,43 @@ import { FilterPipe } from '@app/pipes/filter/filter.pipe';
 import { TeacherIdVerificationComponent } from './popups/teacher-id-verification-popup/teacher-id-verification-popup.component';
 import { SbSharePopupComponent } from './popups/sb-share-popup/sb-share-popup.component';
 import { SbAppSharePopupComponent } from './popups/sb-app-share-popup/sb-app-share-popup.component';
-import {ImportPopoverComponent} from './popups/import-popover/import-popover.component';
+import { ImportPopoverComponent } from './popups/import-popover/import-popover.component';
+import { SbProgressLoaderPage } from '@app/app/components/popups/sb-progress-loader/sb-progress-loader.page';
+import { CollectionActionsComponent } from './collection-acions/collection-acions.component';
+import { MyGroupsPopoverComponent } from './popups/sb-my-groups-popover/sb-my-groups-popover.component';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
+import { ToastNavigationComponent } from './popups/toast-navigation/toast-navigation.component';
+import { CommonFormsComponent } from './common-forms/common-forms.component';
+import { SbTutorialPopupComponent } from './popups/sb-tutorial-popup/sb-tutorial-popup.component';
+import { SbGenericFormPopoverComponent } from './popups/sb-generic-form-popover/sb-generic-form-popover.component';
+import { CourseCompletionPopoverComponent } from './popups/sb-course-completion-popup/sb-course-completion-popup.component';
+import { SupportAcknowledgement } from './support-acknowledgement/support-acknowledgement.component';
+import { AcknowledgeResponseComponent } from './acknowledge-response/acknowledge-response.component';
+import { ExploreBooksSortComponent } from '../resources/explore-books-sort/explore-books-sort.component';
+import { AddActivityToGroupComponent } from './add-activity-to-group/add-activity-to-group.component';
+import { ConsentPiiPopupComponent } from './popups/consent-pii-popup/consent-pii-popup.component';
+import { LicenseCardComponentComponent } from '@app/app/components/license-card-component/license-card-component.component';
+import { GroupGuideLinesPopoverComponent } from './popups/group-guidelines-popup/group-guidelines-popup.component';
+import {
+  ProfileNameConfirmationPopoverComponent
+} from './popups/sb-profile-name-confirmation-popup/sb-profile-name-confirmation-popup.component';
+import { CopyTraceIdPopoverComponent } from './popups/copy-trace-id-popup.ts/copy-trace-id-popup.component';
+import { SbSubjectListPopupComponent } from './popups/sb-subject-list-popup/sb-subject-list-popup.component';
+import { DiscoverComponent } from './discover/discover.page';
+import { AccessDiscussionComponent } from './access-discussion/access-discussion.component';
+import {JoyfulThemePopupComponent} from './popups/joyful-theme-popup/joyful-theme-popup.component';
+import { ShowVendorAppsComponent} from '@app/app/components/show-vendor-apps/show-vendor-apps.component';
+import {NewExperiencePopupComponent} from './popups/new-experience-popup/new-experience-popup.component';
+import {YearOfBirthPopupComponent} from './popups/year-of-birth-popup/year-of-birth-popup.component';
+import { ContentViewerComponent } from './content-viewer/content-viewer.component';
+import { SunbirdVideoPlayerModule } from '@project-sunbird/sunbird-video-player-v8';
+import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
 
 @NgModule({
   declarations: [
     ApplicationHeaderComponent,
+    ApplicationHeaderKebabMenuComponent,
     SignInCardComponent,
-    TextBookCardComponent,
-    ViewAllCardComponent,
     PbHorizontalComponent,
     SbGenericPopoverComponent,
     SbPopoverComponent,
@@ -66,10 +91,8 @@ import {ImportPopoverComponent} from './popups/import-popover/import-popover.com
     ConfirmAlertComponent,
     AppRatingAlertComponent,
     OverflowMenuComponent,
-    ReportAlertComponent,
     ProfileAvatarComponent,
     NotificationItemComponent,
-    AssessmentDetailsComponent,
     ViewCreditsComponent,
     SkeletonItemComponent,
     FilteroptionComponent,
@@ -79,7 +102,33 @@ import {ImportPopoverComponent} from './popups/import-popover/import-popover.com
     TeacherIdVerificationComponent,
     SbSharePopupComponent,
     SbAppSharePopupComponent,
-    ImportPopoverComponent
+    ImportPopoverComponent,
+    SbProgressLoaderPage,
+    CollectionActionsComponent,
+    MyGroupsPopoverComponent,
+    ToastNavigationComponent,
+    CommonFormsComponent,
+    SbTutorialPopupComponent,
+    SbGenericFormPopoverComponent,
+    CourseCompletionPopoverComponent,
+    SupportAcknowledgement,
+    AcknowledgeResponseComponent,
+    ExploreBooksSortComponent,
+    AddActivityToGroupComponent,
+    ConsentPiiPopupComponent,
+    LicenseCardComponentComponent,
+    GroupGuideLinesPopoverComponent,
+    ProfileNameConfirmationPopoverComponent,
+    CopyTraceIdPopoverComponent,
+    SbSubjectListPopupComponent,
+    DiscoverComponent,
+    AccessDiscussionComponent,
+    JoyfulThemePopupComponent,
+    ShowVendorAppsComponent,
+    JoyfulThemePopupComponent,
+    NewExperiencePopupComponent,
+    YearOfBirthPopupComponent,
+    ContentViewerComponent
   ],
   imports: [
     CommonModule,
@@ -88,11 +137,14 @@ import {ImportPopoverComponent} from './popups/import-popover/import-popover.com
     IonicModule,
     ReactiveFormsModule,
     PipesModule,
+    CommonConsumptionModule,
     IonicRatingModule,
+    SunbirdVideoPlayerModule,
     TranslateModule.forChild(),
   ],
   entryComponents: [
     ApplicationHeaderComponent,
+    ApplicationHeaderKebabMenuComponent,
     SignInCardComponent,
     SbGenericPopoverComponent,
     SbPopoverComponent,
@@ -107,20 +159,40 @@ import {ImportPopoverComponent} from './popups/import-popover/import-popover.com
     ViewCreditsComponent,
     FilteroptionComponent,
     ContentActionsComponent,
-    ReportAlertComponent,
     SbInsufficientStoragePopupComponent,
     AccountRecoveryInfoComponent,
     EnrollmentDetailsComponent,
     TeacherIdVerificationComponent,
     SbSharePopupComponent,
     SbAppSharePopupComponent,
-    ImportPopoverComponent
+    ImportPopoverComponent,
+    SbProgressLoaderPage,
+    CollectionActionsComponent,
+    MyGroupsPopoverComponent,
+    ToastNavigationComponent,
+    CommonFormsComponent,
+    SbTutorialPopupComponent,
+    SbGenericFormPopoverComponent,
+    CourseCompletionPopoverComponent,
+    SupportAcknowledgement,
+    AcknowledgeResponseComponent,
+    ExploreBooksSortComponent,
+    ConsentPiiPopupComponent,
+    GroupGuideLinesPopoverComponent,
+    ProfileNameConfirmationPopoverComponent,
+    CopyTraceIdPopoverComponent,
+    SbSubjectListPopupComponent,
+    DiscoverComponent,
+    JoyfulThemePopupComponent,
+    ShowVendorAppsComponent,
+    NewExperiencePopupComponent,
+    YearOfBirthPopupComponent,
+    ContentViewerComponent
   ],
   exports: [
     ApplicationHeaderComponent,
+    ApplicationHeaderKebabMenuComponent,
     SignInCardComponent,
-    TextBookCardComponent,
-    ViewAllCardComponent,
     PbHorizontalComponent,
     SbGenericPopoverComponent,
     SbPopoverComponent,
@@ -138,19 +210,42 @@ import {ImportPopoverComponent} from './popups/import-popover/import-popover.com
     AppRatingAlertComponent,
     ProfileAvatarComponent,
     NotificationItemComponent,
-    AssessmentDetailsComponent,
     ViewCreditsComponent,
     SkeletonItemComponent,
     FilteroptionComponent,
-    ReportAlertComponent,
     SbInsufficientStoragePopupComponent,
     AccountRecoveryInfoComponent,
     EnrollmentDetailsComponent,
     TeacherIdVerificationComponent,
     SbSharePopupComponent,
     SbAppSharePopupComponent,
-    ImportPopoverComponent
+    ImportPopoverComponent,
+    SbProgressLoaderPage,
+    CollectionActionsComponent,
+    MyGroupsPopoverComponent,
+    ToastNavigationComponent,
+    CommonFormsComponent,
+    SbTutorialPopupComponent,
+    SbGenericFormPopoverComponent,
+    CourseCompletionPopoverComponent,
+    SupportAcknowledgement,
+    AcknowledgeResponseComponent,
+    ExploreBooksSortComponent,
+    AddActivityToGroupComponent,
+    ConsentPiiPopupComponent,
+    LicenseCardComponentComponent,
+    GroupGuideLinesPopoverComponent,
+    ProfileNameConfirmationPopoverComponent,
+    CopyTraceIdPopoverComponent,
+    SbSubjectListPopupComponent,
+    DiscoverComponent,
+    JoyfulThemePopupComponent,
+    AccessDiscussionComponent,
+    ShowVendorAppsComponent,
+    NewExperiencePopupComponent,
+    YearOfBirthPopupComponent,
+    ContentViewerComponent
   ],
-  providers: [FileSizePipe, FilterPipe,  Keyboard]
+  providers: [FileSizePipe, FilterPipe, Keyboard, ScreenOrientation]
 })
 export class ComponentsModule { }
diff --git a/src/app/components/confirm-alert/confirm-alert.component.html b/src/app/components/confirm-alert/confirm-alert.component.html
index 195f95f5b..2b2775d43 100644
--- a/src/app/components/confirm-alert/confirm-alert.component.html
+++ b/src/app/components/confirm-alert/confirm-alert.component.html
@@ -20,7 +20,9 @@
       <div class="main-title">
         <div class="meta-info"> {{sbPopoverMainTitle}} </div>
       </div>
-      <div class="sb-popover-content"> {{metaInfo}} </div>
+      <div class="sb-popover-content">
+        <div class="sb-popover-download-content"> {{metaInfo}} </div>
+      </div>
     </div>
   </div>
 </ion-content>
diff --git a/src/app/components/confirm-alert/confirm-alert.component.scss b/src/app/components/confirm-alert/confirm-alert.component.scss
index b3c0f5091..73cea089c 100644
--- a/src/app/components/confirm-alert/confirm-alert.component.scss
+++ b/src/app/components/confirm-alert/confirm-alert.component.scss
@@ -1,8 +1,9 @@
+@import "src/assets/styles/_variables.scss";
 :host {
 
     .close-button.button-outline-md {
         border-color: transparent;
-        color: #2e3f51;
+        color: map-get($colors, grayish_blue);
         background-color: transparent;
         box-shadow: none;
         opacity: 1;
diff --git a/src/app/components/confirm-alert/confirm-alert.component.spec.ts b/src/app/components/confirm-alert/confirm-alert.component.spec.ts
new file mode 100644
index 000000000..9ae7a6677
--- /dev/null
+++ b/src/app/components/confirm-alert/confirm-alert.component.spec.ts
@@ -0,0 +1,86 @@
+import {ConfirmAlertComponent} from '@app/app/components';
+import {NavParams, Platform, PopoverController} from '@ionic/angular';
+import {of} from 'rxjs';
+
+describe('ConfirmAlertComponent', () => {
+    let confirmAlertComponent: ConfirmAlertComponent;
+    const mockPlatform: Partial<Platform> = {
+        backButton: {
+            subscribeWithPriority: jest.fn((_, fn) => {
+                fn();
+                return {
+                    unsubscribe: jest.fn()
+                };
+            }),
+        }
+    } as any;
+    const mockNavParams: Partial<NavParams> = {
+        get: jest.fn((arg) => {
+            let value;
+            switch (arg) {
+                case 'actionsButtons':
+                    value = [
+                        {
+                            btntext: 'OKAY',
+                            btnClass: 'popover-color',
+                            btnDisabled$: of([])
+                        }
+                    ];
+                    break;
+                case 'icon':
+                    value = 'sample_icon';
+                    break;
+                case 'metaInfo':
+                    value = 'sample_meta_info';
+                    break;
+                case 'sbPopoverContent':
+                    value = 'samplePopoverContent';
+                    break;
+                case 'sbPopoverHeading':
+                    value = 'sample_heading';
+                    break;
+                case 'sbPopoverMainTitle':
+                    value = 'sample_title';
+                    break;
+                case 'isUpdateAvail':
+                    value = true;
+                    break;
+                case 'contentSize':
+                    value = '200kb';
+                    break;
+            }
+            return value;
+        })
+    };
+    const mockPopoverController: Partial<PopoverController> = {
+        dismiss: jest.fn()
+    };
+    beforeAll(() => {
+        confirmAlertComponent = new ConfirmAlertComponent(
+            mockPlatform as Platform,
+            mockNavParams as NavParams,
+            mockPopoverController as PopoverController
+        );
+    });
+
+    it('should provide instance for confirmAlertComponent', () => {
+        // assert
+        expect(confirmAlertComponent).toBeTruthy();
+    });
+
+    it('should select can download false and dimiss popover with passing data', () => {
+        mockPopoverController.dismiss = jest.fn();
+
+        confirmAlertComponent.selectOption(false);
+
+        expect(mockPopoverController.dismiss).toHaveBeenCalledWith(false);
+    });
+
+    it('should close popover when clicked', () => {
+        mockPopoverController.dismiss = jest.fn();
+
+        confirmAlertComponent.closePopover();
+
+        expect(mockPopoverController.dismiss).toHaveBeenCalled();
+    });
+});
diff --git a/src/app/components/confirm-alert/confirm-alert.component.ts b/src/app/components/confirm-alert/confirm-alert.component.ts
index 24bf4b8de..99d14909b 100644
--- a/src/app/components/confirm-alert/confirm-alert.component.ts
+++ b/src/app/components/confirm-alert/confirm-alert.component.ts
@@ -1,14 +1,12 @@
-import { Component, OnInit } from '@angular/core';
-// migration-TODO
-// import { ViewController } from '@ionic/angular';
-import { Platform, NavParams, PopoverController } from '@ionic/angular';
+import { Component, OnDestroy } from '@angular/core';
+import { NavParams, Platform, PopoverController } from '@ionic/angular';
 
 @Component({
   selector: 'app-confirm-alert',
   templateUrl: './confirm-alert.component.html',
   styleUrls: ['./confirm-alert.component.scss'],
 })
-export class ConfirmAlertComponent implements OnInit {
+export class ConfirmAlertComponent implements OnDestroy {
   sbPopoverHeading: any;
   sbPopoverMainTitle: any;
   sbPopoverContent: any;
@@ -19,7 +17,6 @@ export class ConfirmAlertComponent implements OnInit {
   contentSize: any;
   backButtonFunc: any;
   constructor(
-    // public viewCtrl: ViewController,
     public platform: Platform,
     public navParams: NavParams,
     public popOverCtrl: PopoverController) {
@@ -33,18 +30,20 @@ export class ConfirmAlertComponent implements OnInit {
     this.contentSize = this.navParams.get('contentSize');
     this.backButtonFunc = this.platform.backButton.subscribeWithPriority(11, () => {
     this.popOverCtrl.dismiss();
-    this.backButtonFunc.unsubscribe();
     });
   }
 
-  ngOnInit() {
-
-  }
-
   selectOption(canDownload: boolean = false) {
     this.popOverCtrl.dismiss(canDownload);
   }
+
   closePopover() {
     this.popOverCtrl.dismiss();
   }
+
+  ngOnDestroy() {
+    if (this.backButtonFunc) {
+      this.backButtonFunc.unsubscribe();
+    }
+  }
 }
diff --git a/src/app/components/content-actions/content-actions.component.html b/src/app/components/content-actions/content-actions.component.html
index 15429daa9..eec5763c0 100644
--- a/src/app/components/content-actions/content-actions.component.html
+++ b/src/app/components/content-actions/content-actions.component.html
@@ -1,5 +1,8 @@
-<ion-list lines="none">
-  <!--commented while doing course TOC-->
-  <!-- <ion-item (click)="close(0)">{{ 'REMOVE_FROM_DEVICE' | translate }}</ion-item> -->
-  <ion-item (click)="unenroll()">{{ 'UNENROLL_FROM_COURSE' | translate }}</ion-item>
+<ion-list lines="none" *ngIf="!showChapterActions">
+  <ion-item *ngIf="!showUnenrolledButton" (click)="unenroll()">{{'FRMELEMNTS_LBL_UNENROLL_FROM_COURSE' | categoryKeyTranslate : content}}</ion-item>
+  <ion-item (click)="syncCourseProgress()">{{'FRMELEMNTS_LBL_SYNC_COURSE_PROGRESS' | translate }}</ion-item>
+</ion-list>
+<ion-list lines="none" *ngIf="showChapterActions">
+  <ion-item (click)="download()" *ngIf="downloadIdentifiers.size">{{ 'DOWNLOAD' | translate }}</ion-item>
+  <ion-item (click)="share()">{{ 'SHARE' | translate }}</ion-item>
 </ion-list>
\ No newline at end of file
diff --git a/src/app/components/content-actions/content-actions.component.scss b/src/app/components/content-actions/content-actions.component.scss
index 6babc8344..a57fd94bb 100644
--- a/src/app/components/content-actions/content-actions.component.scss
+++ b/src/app/components/content-actions/content-actions.component.scss
@@ -1,13 +1,10 @@
 @import "src/assets/styles/base/_variables.scss";
 @import "src/assets/styles/_custom-mixins.scss";
+@import "src/assets/styles/_variables.scss";
 
 :host {
-    /*     .popover-content{
-            height:85px !important;
-        } */
-    
         .item.item-block {
-            border-bottom: 2px solid #dedede;
+            border-bottom: 2px solid map-get($colors, gray_light);
             &:last-child {
                 border-bottom: 0px;
             }
diff --git a/src/app/components/content-actions/content-actions.component.spec.ts b/src/app/components/content-actions/content-actions.component.spec.ts
index 6df8ddff3..e8ed514a5 100644
--- a/src/app/components/content-actions/content-actions.component.spec.ts
+++ b/src/app/components/content-actions/content-actions.component.spec.ts
@@ -1,10 +1,12 @@
 import {ContentActionsComponent} from '@app/app/components';
 import {AuthService, ContentDeleteStatus, ContentService} from 'sunbird-sdk';
-import {Events, NavParams, Platform, PopoverController, ToastController} from '@ionic/angular';
+import {NavParams, Platform, PopoverController, ToastController} from '@ionic/angular';
+import {Events} from '@app/util/events';
 import {TranslateService} from '@ngx-translate/core';
 import {CommonUtilService, Environment, InteractSubtype, InteractType, TelemetryGeneratorService} from '@app/services';
 import {FileSizePipe} from '@app/pipes/file-size/file-size';
 import {of, throwError} from 'rxjs';
+import { PageId } from '../../../services';
 
 describe('ContentActionsComponent', () => {
     let contentActionsComponent: ContentActionsComponent;
@@ -68,12 +70,11 @@ describe('ContentActionsComponent', () => {
     beforeAll(() => {
         contentActionsComponent = new ContentActionsComponent(
             mockContentService as ContentService,
+            mockAuthService as AuthService,
             mockNavParams as NavParams,
             mockToastCtrl as ToastController,
-            mockAuthService as AuthService,
             mockEvents as Events,
             mockTranslateService as TranslateService,
-            mockPlatform as Platform,
             mockCommonUtilService as CommonUtilService,
             mockTelemetryGeneratorService as TelemetryGeneratorService,
             mockFileSizePipe as FileSizePipe,
@@ -90,16 +91,6 @@ describe('ContentActionsComponent', () => {
         expect(contentActionsComponent).toBeTruthy();
     });
 
-    describe('constructor ', () => {
-        it('', () => {
-            // act
-            subscribeWithPriorityCallback();
-            // assert
-            expect(mockBackBtnFunc.unsubscribe).toBeCalled();
-            expect(mockPopoverCtrl.dismiss).toBeCalled();
-        });
-    });
-
     describe('getUserId ', () => {
         it('should cover else part if pageId or userId is undefined', (done) => {
             // arrange
@@ -331,4 +322,105 @@ describe('ContentActionsComponent', () => {
 
     });
 
+    describe('download', () => {
+        it('should dismiss the popup', () => {
+            // arrange
+            // act
+            contentActionsComponent.download();
+            // assert
+            expect(mockPopoverCtrl.dismiss).toHaveBeenCalledWith({ download: true });
+        });
+    });
+
+    describe('share', () => {
+        it('should dismiss the popup', () => {
+            // arrange
+            // act
+            contentActionsComponent.share();
+            // assert
+            expect(mockPopoverCtrl.dismiss).toHaveBeenCalledWith({ share: true });
+        });
+    });
+
+});
+
+describe('ContentActionsComponent', () => {
+    let contentActionsComponent: ContentActionsComponent;
+    const mockContentService: Partial<ContentService> = {};
+    const mockNavParams: Partial<NavParams> = {
+        get: jest.fn((arg) => {
+            let value;
+            switch (arg) {
+                case 'pageName':
+                    value = PageId.CHAPTER_DETAILS;
+                    break;
+                case 'isChild':
+                    value = false;
+                    break;
+                case 'content':
+                    value = undefined;
+                    break;
+                case 'objRollup':
+                    value = [
+                        {
+                            l1: 'samplel1',
+                            l2: 'samplel2'
+                        }
+                    ];
+                    break;
+                case 'corRelationList':
+                    value = [{id: 'sampleId', type: 'textbook'}, {id: 'sampleDoid', type: 'unit'}];
+            }
+            return value;
+        })
+    };
+    const mockToastCtrl: Partial<ToastController> = {};
+    const mockAuthService: Partial<AuthService> = {
+        getSession: jest.fn(() => of({
+            access_token: 'sample_access_token',
+            refresh_token: 'sample_refresh_token',
+        }))
+    };
+    const mockEvents: Partial<Events> = {};
+    const mockTranslateService: Partial<TranslateService> = {};
+    const mockPlatform: Partial<Platform> = {};
+    let subscribeWithPriorityCallback;
+    const mockBackBtnFunc = {unsubscribe: jest.fn()};
+    const subscribeWithPriorityData = jest.fn((val, callback) => {
+        subscribeWithPriorityCallback = callback;
+        return mockBackBtnFunc;
+    });
+    mockPlatform.backButton = {
+        subscribeWithPriority: subscribeWithPriorityData,
+    } as any;
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockFileSizePipe: Partial<FileSizePipe> = {};
+    const mockPopoverCtrl: Partial<PopoverController> = {
+        dismiss: jest.fn()
+    };
+    beforeAll(() => {
+        contentActionsComponent = new ContentActionsComponent(
+            mockContentService as ContentService,
+            mockAuthService as AuthService,
+            mockNavParams as NavParams,
+            mockToastCtrl as ToastController,
+            mockEvents as Events,
+            mockTranslateService as TranslateService,
+            mockCommonUtilService as CommonUtilService,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockFileSizePipe as FileSizePipe,
+            mockPopoverCtrl as PopoverController
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create instance of contentActionsComponent page', () => {
+        // arrange
+        expect(contentActionsComponent).toBeTruthy();
+    });
+
 });
diff --git a/src/app/components/content-actions/content-actions.component.ts b/src/app/components/content-actions/content-actions.component.ts
index 9ce87f49d..71102f1f1 100644
--- a/src/app/components/content-actions/content-actions.component.ts
+++ b/src/app/components/content-actions/content-actions.component.ts
@@ -1,8 +1,9 @@
-import { TelemetryGeneratorService } from '../../../services/telemetry-generator.service';
-import { TranslateService } from '@ngx-translate/core';
-import { Events, PopoverController, NavParams } from '@ionic/angular';
-import { Platform, ToastController } from '@ionic/angular';
 import { Component, Inject } from '@angular/core';
+import { FileSizePipe } from '@app/pipes/file-size/file-size';
+import { ContentUtil } from '@app/util/content-util';
+import { NavParams, PopoverController, ToastController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { TranslateService } from '@ngx-translate/core';
 import {
   AuthService,
   ContentDeleteResponse,
@@ -10,13 +11,14 @@ import {
   ContentService,
   CorrelationData,
   OAuthSession,
-  Rollup,
-  TelemetryObject
+  Rollup
 } from 'sunbird-sdk';
 import { CommonUtilService } from '../../../services/common-util.service';
 import { Environment, InteractSubtype, InteractType } from '../../../services/telemetry-constants';
+import { TelemetryGeneratorService } from '../../../services/telemetry-generator.service';
 import { SbPopoverComponent } from '../popups/sb-popover/sb-popover.component';
-import { FileSizePipe } from '@app/pipes/file-size/file-size';
+import { PageId } from './../../../services/telemetry-constants';
+
 @Component({
   selector: 'app-content-actions',
   templateUrl: './content-actions.component.html',
@@ -25,6 +27,8 @@ import { FileSizePipe } from '@app/pipes/file-size/file-size';
 export class ContentActionsComponent {
 
   content: any;
+  chapter: any;
+  downloadIdentifiers: any;
   data: any;
   isChild = false;
   contentId: string;
@@ -33,17 +37,18 @@ export class ContentActionsComponent {
   userId = '';
   pageName = '';
   showFlagMenu = true;
+  showChapterActions = false;
   public objRollup: Rollup;
   private corRelationList: Array<CorrelationData>;
+  showUnenrolledButton = false;
 
   constructor(
     @Inject('CONTENT_SERVICE') private contentService: ContentService,
+    @Inject('AUTH_SERVICE') private authService: AuthService,
     private navParams: NavParams,
     private toastCtrl: ToastController,
-    @Inject('AUTH_SERVICE') private authService: AuthService,
     private events: Events,
     private translate: TranslateService,
-    private platform: Platform,
     private commonUtilService: CommonUtilService,
     private telemetryGeneratorService: TelemetryGeneratorService,
     private fileSizePipe: FileSizePipe,
@@ -55,17 +60,19 @@ export class ContentActionsComponent {
     this.pageName = this.navParams.get('pageName');
     this.objRollup = this.navParams.get('objRollup');
     this.corRelationList = this.navParams.get('corRelationList');
+    this.chapter = this.navParams.get('chapter');
+    this.downloadIdentifiers = this.navParams.get('downloadIdentifiers');
 
     if (this.navParams.get('isChild')) {
       this.isChild = true;
     }
+    if (this.pageName === PageId.CHAPTER_DETAILS) {
+      this.showChapterActions = true;
+    }
 
     this.contentId = (this.content && this.content.identifier) ? this.content.identifier : '';
-    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
-      this.popOverCtrl.dismiss();
-      this.backButtonFunc.unsubscribe();
-    });
     this.getUserId();
+    this.isCourseCompleted();
   }
 
 
@@ -107,12 +114,9 @@ export class ContentActionsComponent {
           component: SbPopoverComponent,
           componentProps: {
             content: this.content,
-            // isChild: this.isDepthChild,
             objRollup: this.objRollup,
-            // pageName: PageId.COLLECTION_DETAIL,
             corRelationList: this.corRelationList,
             sbPopoverHeading: this.commonUtilService.translateMessage('REMOVE_FROM_DEVICE'),
-            // sbPopoverMainTitle: this.commonUtilService.translateMessage('REMOVE_FROM_DEVICE_MSG'),
             sbPopoverMainTitle: this.content.name,
             actionsButtons: [
               {
@@ -121,10 +125,7 @@ export class ContentActionsComponent {
               },
             ],
             icon: null,
-            metaInfo:
-              // this.contentDetail.contentTypesCount.TextBookUnit + 'items' +
-              // this.batchDetails.courseAdditionalInfo.leafNodesCount + 'items' +
-              '(' + this.fileSizePipe.transform(this.content.size, 2) + ')',
+            metaInfo: '(' + this.fileSizePipe.transform(this.content.size, 2) + ')',
             sbPopoverContent: 'Are you sure you want to delete ?'
           },
           cssClass: 'sb-popover danger',
@@ -139,7 +140,6 @@ export class ContentActionsComponent {
       }
       case 1: {
         this.popOverCtrl.dismiss();
-        // this.reportIssue();
         break;
       }
     }
@@ -148,28 +148,34 @@ export class ContentActionsComponent {
   /*
    * shows alert to confirm unenroll send back user selection */
   async unenroll() {
-    const telemetryObject = new TelemetryObject(this.content.identifier, this.content.contentType, this.content.pkgVersion);
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
       InteractSubtype.UNENROL_CLICKED,
       Environment.HOME,
       this.pageName,
-      telemetryObject,
+      ContentUtil.getTelemetryObject(this.content),
       undefined,
       this.objRollup,
       this.corRelationList);
     this.popOverCtrl.dismiss({ unenroll: true });
   }
 
+  async download() {
+    this.popOverCtrl.dismiss({ download: true });
+  }
+
+  async share() {
+    this.popOverCtrl.dismiss({ share: true });
+  }
+
   async deleteContent() {
-    const telemetryObject = new TelemetryObject(this.content.identifier, this.content.contentType, this.content.pkgVersion);
 
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
       InteractSubtype.DELETE_CLICKED,
       Environment.HOME,
       this.pageName,
-      telemetryObject,
+      ContentUtil.getTelemetryObject(this.content),
       undefined,
       this.objRollup,
       this.corRelationList);
@@ -198,6 +204,20 @@ export class ContentActionsComponent {
       });
   }
 
+  async syncCourseProgress() {
+
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      InteractSubtype.SYNC_PROGRESS_CLICKED,
+      Environment.HOME,
+      this.pageName,
+      ContentUtil.getTelemetryObject(this.content),
+      undefined,
+      this.objRollup,
+      this.corRelationList);
+    this.popOverCtrl.dismiss({ syncProgress: true });
+  }
+
 
   async showToaster(message) {
     const toast = await this.toastCtrl.create({
@@ -217,4 +237,13 @@ export class ContentActionsComponent {
     );
     return msg;
   }
+
+  private isCourseCompleted() {
+    if (this.content && this.content.progress === 100) {
+      if (this.batchDetails && ((this.batchDetails.endDate &&
+        (new Date(this.batchDetails.endDate) >= new Date())) || !this.batchDetails.endDate)) {
+          this.showUnenrolledButton = true;
+      }
+    }
+  }
 }
diff --git a/src/app/components/content-rating-alert/content-rating-alert.component.scss b/src/app/components/content-rating-alert/content-rating-alert.component.scss
index 47235c4cb..523f9af37 100644
--- a/src/app/components/content-rating-alert/content-rating-alert.component.scss
+++ b/src/app/components/content-rating-alert/content-rating-alert.component.scss
@@ -1,6 +1,7 @@
 @import "src/assets/styles/base/_variables.scss";
 @import "src/assets/styles/_custom-mixins.scss";
 @import "src/assets/styles/variables";
+@import "src/assets/styles/_variables.scss";
 
 
 :host {
@@ -21,12 +22,12 @@
   .main-title{
     .meta-info{
       padding: 5px 0 16px 0 !important;
-      font-size: 14px !important;;
+      font-size: 14px !important;
     }
     .rating-qstn{
       margin-left: 16px;
       padding: 16px 0;
-      border-top: 1px solid #a4a4a4;
+      border-top: 1px solid map-get($colors, gray_solid);
       font-size: 16px;
     }
   }
@@ -35,21 +36,16 @@
       --min-height: 30px;
       display: flex;
       padding: 8px 8px 8px 0;
-      border-bottom: 1px solid #eeeeee8c;
+      border-bottom: 1px solid map-get($colors, light_gray_8c);
       margin-left: 16px;
-      // &:last-child{
-      //   &.active{
-      //     border-bottom: none;
-      //   }
-      // }
       .rating-label{
-        color: #999;
+        color: $gray-300;
         font-size: 14px;
         margin: 0;
         flex: 1 1 0;
         text-align: left;
         &.active-label{
-          color: #074F9D;
+          color: map-get($colors, brighter_blue);
         }
       }
       ion-checkbox{
@@ -62,7 +58,7 @@
         padding: 5px;
         width: 100%;
         margin: 10px 0;
-        border: 1px solid #eee;
+        border: 1px solid map-get($colors, empty_color);
         border-radius: 5px;
         resize: none;
       }
diff --git a/src/app/components/content-rating-alert/content-rating-alert.component.spec.ts b/src/app/components/content-rating-alert/content-rating-alert.component.spec.ts
index 0e590e502..97629b1d7 100644
--- a/src/app/components/content-rating-alert/content-rating-alert.component.spec.ts
+++ b/src/app/components/content-rating-alert/content-rating-alert.component.spec.ts
@@ -14,11 +14,8 @@ import {
     ImpressionType,
     InteractSubtype,
     InteractType,
-    Mode,
-    PageId,
     ImpressionSubtype
 } from '@app/services/telemetry-constants';
-import { declaredViewContainer } from '@angular/core/src/view/util';
 import { Location } from '@angular/common';
 
 describe('ContentRatingAlertComponent', () => {
@@ -37,7 +34,8 @@ describe('ContentRatingAlertComponent', () => {
         identifier: 'do_12345',
         contentData: {
             contentType: 'Resource',
-            pkgVersion: '1'
+            pkgVersion: '1',
+            primaryCategory: 'Learning Resource'
         },
         versionKey: '1234'
     };
@@ -124,24 +122,25 @@ describe('ContentRatingAlertComponent', () => {
         expect(contentRatingAlertComponent).toBeTruthy();
     });
 
-    // it('should generate IMPRESSION telemetry in ionViewWillEnter()', () => {
-    //     // arrange
-
-    //     // act
-    //     contentRatingAlertComponent.ionViewWillEnter();
-    //     // assert
-    //     expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
-    //         ImpressionType.VIEW,
-    //         ImpressionSubtype.RATING_POPUP,
-    //         'content-detail',
-    //         Environment.HOME, 'do_12345',
-    //         'Resource',
-    //         '1');
-    // });
+    it('should generate IMPRESSION telemetry in ionViewWillEnter()', () => {
+        // arrange
+
+        // act
+        contentRatingAlertComponent.ionViewWillEnter();
+        // assert
+        expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+            ImpressionType.VIEW,
+            ImpressionSubtype.RATING_POPUP,
+            'content-detail',
+            Environment.HOME, 'do_12345',
+            'Learning Resource',
+            '1');
+    });
 
     it('should submit rating and generate INTERACT telemetry successfully', () => {
         // arrange
         mockPopoverCtrl.dismiss = jest.fn();
+        mockTelemetryService.log =  jest.fn(() => throwError(undefined)),
         contentRatingAlertComponent.ratingOptions = [{
             key: 'key',
             value: 'val',
@@ -162,7 +161,7 @@ describe('ContentRatingAlertComponent', () => {
         const paramsMap = new Map();
         paramsMap['Ratings'] = 5;
         paramsMap['Comment'] = 'key';
-        contentRatingAlertComponent.navigateBack = 'navigateBack';
+        contentRatingAlertComponent.navigateBack = true;
         jest.spyOn(mockLocation, 'back').mockImplementation();
         // act
         contentRatingAlertComponent.submit();
@@ -172,7 +171,7 @@ describe('ContentRatingAlertComponent', () => {
             InteractSubtype.RATING_SUBMITTED,
             Environment.HOME,
             'content-detail',
-            {id: 'do_12345', version: '1', type: 'Resource'},
+            {id: 'do_12345', version: '1', type: 'Learning Resource'},
             paramsMap);
         expect(mockPopoverCtrl.dismiss).toHaveBeenCalledWith(viewDissMissData);
         expect(mockContentFeedbackService.sendFeedback).toHaveBeenCalledWith(feebackRequest);
@@ -184,6 +183,121 @@ describe('ContentRatingAlertComponent', () => {
         expect(mockLocation.back).toHaveBeenCalled();
     });
 
+    it('should submit rating and generate INTERACT telemetry successfully and should not navigate', () => {
+        // arrange
+        mockPopoverCtrl.dismiss = jest.fn();
+        mockTelemetryService.log =  jest.fn(() => throwError(undefined)),
+        contentRatingAlertComponent.ratingOptions = [{
+            key: 'key',
+            value: 'val',
+            isChecked: true
+        }];
+        contentRatingAlertComponent.commentText = '';
+        const feebackRequest: ContentFeedback = {
+            contentId: 'do_12345',
+            rating: 5,
+            comments: 'key',
+            contentVersion: '1'
+        };
+        const viewDissMissData = {
+            message: 'rating.success',
+            rating: 5,
+            comment: 'key'
+        };
+        const paramsMap = new Map();
+        paramsMap['Ratings'] = 5;
+        paramsMap['Comment'] = 'key';
+        contentRatingAlertComponent.navigateBack = false;
+        jest.spyOn(mockLocation, 'back').mockImplementation();
+        // act
+        contentRatingAlertComponent.submit();
+        // assert
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH,
+            InteractSubtype.RATING_SUBMITTED,
+            Environment.HOME,
+            'content-detail',
+            {id: 'do_12345', version: '1', type: 'Learning Resource'},
+            paramsMap);
+        expect(mockPopoverCtrl.dismiss).toHaveBeenCalledWith(viewDissMissData);
+        expect(mockContentFeedbackService.sendFeedback).toHaveBeenCalledWith(feebackRequest);
+        expect(mockCommonUtilService.showToast).toHaveBeenCalledWith(
+            'THANK_FOR_RATING',
+            false,
+            'green-toast'
+        );
+        expect(mockLocation.back).not.toHaveBeenCalled();
+    });
+
+    it('comment text should be empty id isChecked is false', () => {
+        // arrange
+        mockPopoverCtrl.dismiss = jest.fn();
+        mockContentFeedbackService.sendFeedback = jest.fn(() => throwError({ error: 'API_ERROR' }));
+        contentRatingAlertComponent.ratingOptions = [{
+            key: 'key',
+            value: 'val',
+            isChecked: false
+        }];
+
+        // act
+        contentRatingAlertComponent.submit();
+        // assert
+        expect(contentRatingAlertComponent.allComments).toBeFalsy();
+    });
+
+    it('comment text should populated  with comma separated value if ratingOptions has more than one entry', () => {
+        // arrange
+        mockPopoverCtrl.dismiss = jest.fn();
+        mockContentFeedbackService.sendFeedback = jest.fn(() => throwError({ error: 'API_ERROR' }));
+        contentRatingAlertComponent.ratingOptions = [{
+            key: 'comment1',
+            value: 'val',
+            isChecked: true
+        }, {
+            key: 'comment2',
+            value: 'val',
+            isChecked: true
+        }];
+
+        // act
+        contentRatingAlertComponent.submit();
+        // assert
+        expect(contentRatingAlertComponent.allComments).toEqual('comment1,comment2');
+    });
+
+    it('comment text should populated  with other comment for other comments', () => {
+        // arrange
+        mockPopoverCtrl.dismiss = jest.fn();
+        mockContentFeedbackService.sendFeedback = jest.fn(() => throwError({ error: 'API_ERROR' }));
+        contentRatingAlertComponent.commentText = 'some_comment';
+        contentRatingAlertComponent.ratingOptions = [];
+        // act
+        contentRatingAlertComponent.submit();
+        // assert
+        expect(contentRatingAlertComponent.allComments).toEqual('OTHER,OTHER-some_comment');
+    });
+
+    it('comment text should populated  with other comment if commentText is available if previous comment is empty', () => {
+        // arrange
+        mockPopoverCtrl.dismiss = jest.fn();
+        mockContentFeedbackService.sendFeedback = jest.fn(() => throwError({ error: 'API_ERROR' }));
+        contentRatingAlertComponent.commentText = 'some_comment';
+        contentRatingAlertComponent.ratingCount = 5;
+        contentRatingAlertComponent.ratingOptions = [{
+            key: 'comment1',
+            value: 'val',
+            isChecked: true
+        }, {
+            key: 'comment2',
+            value: 'val',
+            isChecked: true
+        }];
+        // act
+        contentRatingAlertComponent.submit();
+        // assert
+        expect(contentRatingAlertComponent.allComments).toEqual('comment1,comment2,OTHER,OTHER-some_comment');
+    });
+
     it('should generate IMPRESSION telemetry in ionViewWillEnter()', () => {
         // arrange
         // jest.spyOn(contentRatingAlertComponent, 'invokeContentRatingFormApi').mockImplementation();
@@ -196,7 +310,7 @@ describe('ContentRatingAlertComponent', () => {
             ImpressionSubtype.RATING_POPUP,
             'content-detail',
             Environment.HOME, 'do_12345',
-            'Resource',
+            'Learning Resource',
             '1');
     });
 
@@ -232,6 +346,15 @@ describe('ContentRatingAlertComponent', () => {
             // assert
             expect(mockBackBtnFunc.unsubscribe).toBeCalled();
         });
+
+        it('should call unsubscribe', () => {
+            // arrange
+            contentRatingAlertComponent.backButtonFunc = undefined;
+            // act
+            contentRatingAlertComponent.ionViewWillLeave();
+            // assert
+            expect(contentRatingAlertComponent.backButtonFunc).toBeFalsy();
+        });
     });
 
     describe('getUserId', () => {
@@ -300,6 +423,15 @@ describe('ContentRatingAlertComponent', () => {
     });
 
     describe('createRatingForm', () => {
+
+        it('should return if contentRating is 0', () => {
+            // arrange
+            // act
+            const data =  contentRatingAlertComponent.createRatingForm(0);
+            // assert
+            expect(data).toBeUndefined();
+        });
+
         it('', () => {
             // arrange
             contentRatingAlertComponent.contentRatingOptions = {
@@ -465,4 +597,108 @@ describe('ContentRatingAlertComponent', () => {
         });
     });
 
+    describe('ratingOptsChanged', () => {
+        it('should call unsubscribe', () => {
+            // act
+            contentRatingAlertComponent.ratingOptsChanged('quality_not_good');
+            // assert
+            expect(contentRatingAlertComponent.showCommentBox).toBeFalsy();
+        });
+    });
+
+    describe('generateContentRatingTelemetry', () => {
+        it('should call unsubscribe', () => {
+            // act
+            contentRatingAlertComponent.ratingOptsChanged('quality_not_good');
+            // assert
+            expect(contentRatingAlertComponent.showCommentBox).toBeFalsy();
+        });
+    });
+
+    describe('extractComments', () => {
+        it('should update the comment text to empty', () => {
+            // act
+            contentRatingAlertComponent.extractComments('OTHER-,comment1,comment2');
+            // assert
+            expect(contentRatingAlertComponent.commentText).toEqual('');
+        });
+    });
+
+    describe('generateContentFeedbackTelemetry', () => {
+        it('should invoke the feedback method as per the raatingOptions', (done) => {
+            // arrange
+            contentRatingAlertComponent.ratingOptions = [{
+                key: 'comment1',
+                value: 'val',
+                isChecked: true
+            }, {
+                key: 'other',
+                value: 'val',
+                isChecked: true
+            }, {
+                key: 'comment3',
+                value: 'val',
+                isChecked: false
+            }];
+            // act
+            contentRatingAlertComponent.generateContentFeedbackTelemetry('OTHER-,comment1,comment2');
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryService.feedback).toHaveBeenCalledTimes(2);
+                done();
+            }, 0);
+
+        });
+
+        it('should invoke the feedback method as per the ratingOptions if feedback API is throwing error', (done) => {
+            // arrange
+            mockTelemetryService.feedback = jest.fn(() => throwError({}));
+            contentRatingAlertComponent.ratingOptions = [{
+                key: 'comment1',
+                value: 'val',
+                isChecked: true
+            }, {
+                key: 'other',
+                value: 'val',
+                isChecked: true
+            }, {
+                key: 'comment3',
+                value: 'val',
+                isChecked: false
+            }];
+            // act
+            contentRatingAlertComponent.generateContentFeedbackTelemetry('OTHER-,comment1,comment2');
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryService.feedback).toHaveBeenCalledTimes(2);
+                done();
+            }, 0);
+
+        });
+    });
+
+    describe('populateComments', () => {
+        it('should not populate ratingOptions', () => {
+            // arrange
+            contentRatingAlertComponent.ratingOptions = undefined;
+            // act
+            contentRatingAlertComponent.populateComments([]);
+            // assert
+            expect(contentRatingAlertComponent.ratingOptions).toBeFalsy();
+        });
+
+        it('should not populate ratingOptions', () => {
+            // arrange
+            contentRatingAlertComponent.ratingOptions = undefined;
+            contentRatingAlertComponent.allComments = undefined;
+            contentRatingAlertComponent.userRating = 1;
+            // act
+            contentRatingAlertComponent.populateComments(
+                [{1: {options: [{key: 'CONTENT_INACCURATE', idx: 1, value: 'Content is inaccurate'}],
+                ratingText: 'Very Bad', question: 'Would you like to tell us more?'}}]);
+            // assert
+            expect(contentRatingAlertComponent.ratingOptions).toBeTruthy();
+        });
+    });
+
 });
diff --git a/src/app/components/content-rating-alert/content-rating-alert.component.ts b/src/app/components/content-rating-alert/content-rating-alert.component.ts
index 3ba107cc1..77273ebcc 100644
--- a/src/app/components/content-rating-alert/content-rating-alert.component.ts
+++ b/src/app/components/content-rating-alert/content-rating-alert.component.ts
@@ -1,20 +1,6 @@
-import { Component, Inject, NgZone, OnInit } from '@angular/core';
-import { Platform, PopoverController } from '@ionic/angular';
-import { NavParams } from '@ionic/angular';
-import {
-  Content,
-  ContentFeedback,
-  ContentFeedbackService,
-  TelemetryLogRequest,
-  TelemetryService,
-  TelemetryObject,
-  FormRequest,
-  FormService,
-  SharedPreferences,
-  TelemetryFeedbackRequest
-} from 'sunbird-sdk';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import { ProfileConstants, PreferenceKey } from '@app/app/app.constant';
+import { Location } from '@angular/common';
+import { Component, Inject } from '@angular/core';
+import { PreferenceKey, ProfileConstants } from '@app/app/app.constant';
 import { AppGlobalService } from '@app/services/app-global-service.service';
 import { CommonUtilService } from '@app/services/common-util.service';
 import {
@@ -24,18 +10,27 @@ import {
   InteractSubtype,
   InteractType,
   LogLevel,
-  LogType,
-  ObjectType
+  LogType
 } from '@app/services/telemetry-constants';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
 import { ContentUtil } from '@app/util/content-util';
-import {Location} from '@angular/common';
+import { NavParams, Platform, PopoverController } from '@ionic/angular';
+import {
+  ContentFeedback,
+  ContentFeedbackService,
+  FormRequest,
+  FormService,
+  SharedPreferences,
+  TelemetryFeedbackRequest, TelemetryLogRequest,
+  TelemetryObject, TelemetryService
+} from 'sunbird-sdk';
 
 @Component({
   selector: 'app-content-rating-alert',
   templateUrl: './content-rating-alert.component.html',
   styleUrls: ['./content-rating-alert.component.scss'],
 })
-export class ContentRatingAlertComponent implements OnInit {
+export class ContentRatingAlertComponent {
   private readonly COMMENT_PREFIX = 'OTHER-';
   isDisable = false;
   userId = '';
@@ -81,10 +76,6 @@ export class ContentRatingAlertComponent implements OnInit {
     this.navigateBack = this.navParams.get('navigateBack');
   }
 
-  ngOnInit() {
-    // this.content = this.navParams.get('content');
-  }
-
   ionViewWillEnter() {
     this.telemetryGeneratorService.generateImpressionTelemetry(
       ImpressionType.VIEW,
@@ -131,17 +122,14 @@ export class ContentRatingAlertComponent implements OnInit {
   }
 
   rateContent(ratingCount) {
-    // this.showCommentBox = true;
     this.ratingCount = ratingCount;
     this.createRatingForm(ratingCount);
   }
 
   cancel() {
-    // this.showCommentBox = false;
     this.popOverCtrl.dismiss();
   }
   closePopover() {
-    // this.showCommentBox = false;
     this.popOverCtrl.dismiss();
   }
 
@@ -149,12 +137,12 @@ export class ContentRatingAlertComponent implements OnInit {
     let comment = '';
     this.ratingOptions.forEach(element => {
       if (element.key.toLowerCase() !== 'other' && element.isChecked) {
-        comment += comment.length ? ',' + element.key :  element.key;
+        comment += comment.length ? ',' + element.key : element.key;
       }
     });
     if (this.commentText) {
       const text = 'OTHER,' + this.COMMENT_PREFIX + this.commentText;
-      comment += comment.length ? ',' + text :  text;
+      comment += comment.length ? ',' + text : text;
     }
     this.allComments = comment;
     const option: ContentFeedback = {
@@ -183,9 +171,13 @@ export class ContentRatingAlertComponent implements OnInit {
   }
 
   createRatingForm(rating) {
-    this.ratingMetaInfo =  { ratingText: this.contentRatingOptions[rating].ratingText,
-                          ratingQuestion: this.contentRatingOptions[rating].question
-                        };
+    if (rating === 0) {
+      return;
+    }
+    this.ratingMetaInfo = {
+      ratingText: this.contentRatingOptions[rating].ratingText,
+      ratingQuestion: this.contentRatingOptions[rating].question
+    };
     this.ratingOptions = this.contentRatingOptions[rating].options;
     this.ratingOptions.forEach(element => {
       element.isChecked = false;
@@ -217,22 +209,16 @@ export class ContentRatingAlertComponent implements OnInit {
   async invokeContentRatingFormApi() {
     const selectedLanguage = await this.preferences.getString(PreferenceKey.SELECTED_LANGUAGE_CODE).toPromise();
     const req: FormRequest = {
-        type: 'contentfeedback',
-        subType: selectedLanguage,
-        action: 'get'
+      type: 'contentfeedback',
+      subType: selectedLanguage,
+      action: 'get'
     };
     this.formService.getForm(req).toPromise()
       .then((res: any) => {
-          const data = res.form.data.fields;
-          if (data.length) {
-              this.contentRatingOptions = data[0];
-              this.createRatingForm(this.userRating);
-              if (this.allComments) {
-                this.extractComments(this.allComments);
-              }
-          }
+        const data = res.form.data.fields;
+        this.populateComments(data);
       }).catch((error: any) => {
-          this.getDefaultContentRatingFormApi();
+        this.getDefaultContentRatingFormApi();
       });
   }
 
@@ -243,17 +229,21 @@ export class ContentRatingAlertComponent implements OnInit {
       action: 'get'
     };
     this.formService.getForm(req).toPromise()
-    .then((res: any) => {
+      .then((res: any) => {
         const data = res.form.data.fields;
-        if (data.length) {
-            this.contentRatingOptions = data[0];
-            this.createRatingForm(this.userRating);
-            if (this.allComments) {
-              this.extractComments(this.allComments);
-            }
-        }
-    }).catch((error: any) => {
-    });
+        this.populateComments(data);
+      }).catch((error: any) => {
+      });
+  }
+
+  populateComments(data) {
+    if (data.length) {
+      this.contentRatingOptions = data[0];
+      this.createRatingForm(this.userRating);
+      if (this.allComments) {
+        this.extractComments(this.allComments);
+      }
+    }
   }
 
   generateContentRatingTelemetry(option) {
@@ -281,7 +271,7 @@ export class ContentRatingAlertComponent implements OnInit {
         objId: this.content.identifier,
         comments: this.allComments,
         env: Environment.HOME,
-        objType: this.content.contentData.contentType,
+        objType: this.content.contentData.primaryCategory,
         objVer: this.content.contentData.pkgVersion,
       };
       if (opt.isChecked) {
diff --git a/src/app/components/content-viewer/content-viewer.component.html b/src/app/components/content-viewer/content-viewer.component.html
new file mode 100644
index 000000000..93dcbcd9a
--- /dev/null
+++ b/src/app/components/content-viewer/content-viewer.component.html
@@ -0,0 +1,3 @@
+<ion-content>
+    <sunbird-video-player [playerConfig]="playerConfig" (playerEvent)="eventHandler($event)"></sunbird-video-player>
+</ion-content>
\ No newline at end of file
diff --git a/src/app/terms-and-conditions/terms-and-conditions.page.scss b/src/app/components/content-viewer/content-viewer.component.scss
similarity index 100%
rename from src/app/terms-and-conditions/terms-and-conditions.page.scss
rename to src/app/components/content-viewer/content-viewer.component.scss
diff --git a/src/app/components/content-viewer/content-viewer.component.ts b/src/app/components/content-viewer/content-viewer.component.ts
new file mode 100644
index 000000000..90889fe04
--- /dev/null
+++ b/src/app/components/content-viewer/content-viewer.component.ts
@@ -0,0 +1,38 @@
+import { ModalController } from '@ionic/angular';
+import {  Component, Input, OnInit } from '@angular/core';
+import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
+import { StatusBar } from '@ionic-native/status-bar/ngx';
+
+@Component({
+    selector: "content-viewer",
+    templateUrl: './content-viewer.component.html',
+    styleUrls: ['./content-viewer.component.scss'],
+})
+export class ContentViewerComponent implements OnInit {
+  @Input() playerConfig: any;
+
+  constructor(
+    private screenOrientation: ScreenOrientation,
+    private statusBar: StatusBar,
+    private modalCtrl: ModalController
+  ) {
+    
+  }
+
+  ngOnInit() {
+    this.screenOrientation.lock(this.screenOrientation.ORIENTATIONS.LANDSCAPE);
+    this.statusBar.hide();
+  }
+
+  ionViewWillLeave() {
+    this.statusBar.show();
+    this.screenOrientation.unlock();
+    this.screenOrientation.lock(this.screenOrientation.ORIENTATIONS.PORTRAIT);
+  }
+
+  eventHandler(event) {
+    if ((event === 'EXIT') || (event.edata && event.edata.type === 'EXIT')) {
+      this.modalCtrl.dismiss();
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/app/components/detail-card/detail-card.component.html b/src/app/components/detail-card/detail-card.component.html
index 2fa33b3bb..782545d4b 100644
--- a/src/app/components/detail-card/detail-card.component.html
+++ b/src/app/components/detail-card/detail-card.component.html
@@ -27,10 +27,10 @@
     <div class="left">
     </div>
     <div class="right">
-      <div *ngIf="contentDetail?.contentData?.me_totalRatingsCount" (click)="rateContent()" class="sb-rating-view">
-        <span class="sb-rating-value">{{ contentDetail?.contentData?.me_totalRatingsCount }}</span>
+      <div *ngIf="contentDetail?.contentData?.me_averageRating" (click)="rateContent()" class="sb-rating-view">
+        <span class="sb-rating-value">{{ contentDetail?.contentData?.me_averageRating }}</span>
         <span class="sb-rating-star">
-          <ion-icon ios="ios-star" md="md-star"></ion-icon>
+          <ion-icon name="star"></ion-icon>
         </span>
       </div>
     </div>
@@ -44,7 +44,7 @@
       <ng-container *ngIf="trackDownloads | async; let downloads">
         <button class="sb-btn-tile" *ngIf="showDownloadBtn && !isDepthChild" [disabled]="downloads.queued.length"
           (click)="downloadAllContents()">
-          <ion-icon ios="ios-cloud-download" md="md-cloud-download" class="sb-dt-card-blue-icon"></ion-icon>
+          <img src="assets/imgs/outline_download.svg" alt="download content" class="mb-4">
           <span *ngIf="!downloads.queued.length" class="sb-btn-footer-text">{{ 'DOWNLOAD' | translate }}</span>
           <span *ngIf="downloads.queued.length" class="btn-popover-progress-container">
             <span class="btn-progress-highlight" [ngStyle]="{'width': (downloads.completed.length/(downloads.queued.length+downloads.completed.length))*100 + '%'}">
@@ -52,22 +52,14 @@
           </span>
         </button>
         <button class="sb-btn-tile" *ngIf="contentDetail?.isAvailableLocally" [disabled]="downloads.queued.length" (click)="showOverflowMenu($event)">
-          <ion-icon ios="ios-trash" md="md-trash" class="sb-dt-card-danger-icon"></ion-icon>
+          <img src="assets/imgs/outline_delete.svg" alt="delete content" class="mb-4">
           <span class="sb-btn-footer-text">{{ 'REMOVE' | translate }}</span>
         </button>
         <button class="sb-btn-tile" (click)="share()">
-          <ion-icon ios="ios-share" md="md-share" class="sb-dt-card-blue-icon"></ion-icon>
+          <img src="assets/imgs/outline_share.svg" alt="share content" class="mb-4">
           <span class="sb-btn-footer-text">{{ 'SHARE' | translate }}</span>
         </button>
       </ng-container>
-      <!-- <button ion-button clear icon-only class="sb-btn-tile">
-        <ion-icon ios="ios-sync" md="md-sync" class="sb-dt-card-blue-icon"></ion-icon>
-        <span class="sb-btn-footer-text">Update</span>
-      </button>
-      <button ion-button clear icon-only class="sb-btn-tile">
-        <ion-icon ios="ios-star-outline" md="md-star-outline" class="sb-dt-card-blue-icon"></ion-icon>
-        <span class="sb-btn-footer-text">Rate</span>
-      </button> -->
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/src/app/components/discover/discover.page.html b/src/app/components/discover/discover.page.html
new file mode 100644
index 000000000..82a768d36
--- /dev/null
+++ b/src/app/components/discover/discover.page.html
@@ -0,0 +1,62 @@
+<ion-list class="m-n" *ngIf="!displaySections">
+  <app-skeleton-item height="16px" width="40%" style="padding: 16px;"></app-skeleton-item>
+  <ion-item *ngFor="let i of [0,1,2,3,4,5,6,7,8]" class="animation-background">
+    <ion-avatar item-start>
+      <app-skeleton-item height="72px" width="72px"></app-skeleton-item>
+    </ion-avatar>
+    <ion-label style="padding-left: 40px;">
+      <app-skeleton-item height="12px" width="67%" style="padding-bottom: 8px;"></app-skeleton-item>
+      <app-skeleton-item height="12px" width="47%" style="padding-bottom: 8px;"></app-skeleton-item>
+    </ion-label>
+  </ion-item>
+</ion-list>
+
+<div class="form-api-components" *ngIf="displaySections">
+  <ng-container *ngFor="let section of displaySections">
+    <div class="heading-label" *ngIf="section?.title && section?.theme?.component !== 'sb-course-cards-hlist'">
+      <span>{{section?.title | translateJson}}</span>
+      <hr>
+    </div>
+
+    <!-- Pills -->
+    <ng-container *ngIf="section?.theme?.component === 'sb-pills-grid'">
+      <sb-pills-grid [pillShape]="section?.theme?.inputs?.pillShape"
+          [pillsViewType]="section?.theme?.inputs?.pillsViewType"
+          [selectMode]="section?.theme?.inputs?.selectMode"
+          [minDisplayCount]="section?.theme?.inputs?.minDisplayCount"
+          [viewMoreText]="section?.theme?.inputs?.viewMoreText | translateJson"
+          [viewLessText]="section?.theme?.inputs?.viewLessText | translateJson"
+          [showMoreViewType]="section?.theme?.inputs?.showMoreViewType"
+          [pillsMultiRow]="section?.theme?.inputs?.pillsMultiRow"
+          [pillBorder]="section?.theme?.inputs?.pillBorder"
+          [pillSize]="section?.theme?.inputs?.pillSize"
+          [pillTextElipsis]="section?.theme?.inputs?.pillTextElipsis"
+          [pillBoxShadow]="section?.theme?.inputs?.pillBoxShadow"
+          (viewMorePillList)="onViewMorePillList($event, section)"
+          (select)="handlePillSelect($event, section)">
+          <sb-pill-item *ngFor="let pillData of section.data; let index=index" [name]="pillData?.facet | translateJson | titlecase"
+                        [icon]="{ component: 'sb-pill-item', input: 'icon' } | themeInputsSelector : section?.theme : (pillData?.code || pillData?.facet)"
+                        [theme]="({ component: 'sb-pill-item', input: 'theme' } | themeInputsSelector : section?.theme : pillData?.facet) || (pillData?.facet | randomColorMapPipe: index)"
+                        [value]="pillData"></sb-pill-item>
+        </sb-pills-grid>
+    </ng-container>
+
+    <ng-container *ngIf="section?.theme?.component === 'sb-course-cards-hlist'">
+      <ng-container *ngFor="let subSection of section?.data?.sections">
+        <ng-container *ngIf="subSection?.contents?.length">
+
+          <sb-course-cards-hlist [title]="(section?.title) | translateJson"
+            [type]="section?.theme?.inputs?.type || courseCardType.COURSE_CARD_GRID" 
+            [hideProgress]="section?.theme?.inputs?.hideProgress || true" 
+            [viewMoreButtonText]="section?.theme?.inputs?.viewMoreButtonText | translateJson"
+            [contentList]="subSection.contents"
+            (viewMoreClick)="navigateToViewMoreContentsPage(section)"
+            (cardClick)="navigateToDetailPage($event)">
+          </sb-course-cards-hlist>
+
+        </ng-container>
+      </ng-container>
+    </ng-container>
+
+  </ng-container>
+</div>
diff --git a/src/app/components/discover/discover.page.scss b/src/app/components/discover/discover.page.scss
new file mode 100644
index 000000000..13a87ce47
--- /dev/null
+++ b/src/app/components/discover/discover.page.scss
@@ -0,0 +1,27 @@
+@import "src/assets/styles/_variables.scss";
+
+.search-info {
+  display: flex;
+  .title {
+    font-size: 24px;
+  }
+  .description {
+    color: #333333;
+  }
+  .search-img {
+    width: 40%;
+    border-radius: 50%;
+    background-color: #999999;
+  }
+}
+
+.search-input {
+  background: white;
+  border-radius: 4px;
+  border: 1px solid #999999;
+}
+
+.label {
+  font-size: 18px;
+  font-weight: 700;
+}
\ No newline at end of file
diff --git a/src/app/components/discover/discover.page.spec.data.ts b/src/app/components/discover/discover.page.spec.data.ts
new file mode 100644
index 000000000..fe5038a6e
--- /dev/null
+++ b/src/app/components/discover/discover.page.spec.data.ts
@@ -0,0 +1,619 @@
+export const mockDiscoverPageData = [
+    {
+        index: 0,
+        title: '{"en":"Popular categories"}',
+        data: [
+            {
+                facet: 'Digital Textbook',
+                searchCriteria: {
+                    facets: [],
+                    primaryCategories: [
+                        'Digital Textbook'
+                    ],
+                    mode: 'soft',
+                    searchType: 'search'
+                },
+                primaryFacetFilters: [
+                    {
+                        code: 'board',
+                        translations: '{"en":"Board/Syllabus","hi":"बोर्ड","te":"బోర్డు","ta":"வாரியம்","mr":"बोर्ड"}',
+                        values: [],
+                        name: 'Board/Syllabus',
+                        index: 1
+                    },
+                    {
+                        code: 'gradeLevel',
+                        translations: '{"en":"Class","hi":"कक्षा","te":"క్లాసు","ta":"வகுப்பு","mr":"इयत्ता"}',
+                        values: [],
+                        name: 'Class',
+                        index: 2
+                    }
+                ],
+                aggregate: {
+                    groupBy: 'subject'
+                }
+            },
+            {
+                facet: 'Courses',
+                searchCriteria: {
+                    facets: [],
+                    primaryCategories: [
+                        'Course'
+                    ],
+                    mode: 'soft',
+                    searchType: 'search'
+                },
+                primaryFacetFilters: [
+                    {
+                        code: 'board',
+                        translations: '{"en":"Board/Syllabus","hi":"बोर्ड","te":"బోర్డు","ta":"வாரியம்","mr":"बोर्ड"}',
+                        values: [],
+                        name: 'Board/Syllabus',
+                        index: 1
+                    },
+                    {
+                        code: 'gradeLevel',
+                        translations: '{"en":"Class","hi":"कक्षा","te":"క్లాసు","ta":"வகுப்பு","mr":"इयत्ता"}',
+                        values: [],
+                        name: 'Class',
+                        index: 2
+                    }
+                ],
+                aggregate: {
+                    groupBy: 'subject'
+                }
+            },
+            {
+                facet: 'Tv Classes',
+                searchCriteria: {
+                    facets: [],
+                    primaryCategories: [
+                        'Explanation Content'
+                    ],
+                    mode: 'soft',
+                    searchType: 'search'
+                },
+                primaryFacetFilters: [
+                    {
+                        code: 'board',
+                        translations: '{"en":"Board/Syllabus","hi":"बोर्ड","te":"బోర్డు","ta":"வாரியம்","mr":"बोर्ड"}',
+                        values: [],
+                        name: 'Board/Syllabus',
+                        index: 1
+                    },
+                    {
+                        code: 'gradeLevel',
+                        translations: '{"en":"Class","hi":"कक्षा","te":"క్లాసు","ta":"வகுப்பு","mr":"इयत्ता"}',
+                        values: [],
+                        name: 'Class',
+                        index: 2
+                    }
+                ],
+                aggregate: {
+                    groupBy: 'subject'
+                }
+            }
+        ],
+        dataSrc: {
+            type: 'CONTENT_FACETS',
+            request: {
+                type: 'POST',
+                path: '/api/content/v1/search',
+                withBearerToken: true,
+                body: {
+                    request: {
+                        limit: 0,
+                        offset: 0,
+                        mode: 'hard',
+                        facets: [],
+                        filters: {}
+                    }
+                }
+            },
+            values: [
+                {
+                    facet: 'Digital Textbook',
+                    searchCriteria: {
+                        facets: [],
+                        primaryCategories: [
+                            'Digital Textbook'
+                        ],
+                        mode: 'soft',
+                        searchType: 'search'
+                    },
+                    primaryFacetFilters: [
+                        {
+                            code: 'board',
+                            translations: '{"en":"Board/Syllabus","hi":"बोर्ड","te":"బోర్డు","ta":"வாரியம்","mr":"बोर्ड"}',
+                            values: [],
+                            name: 'Board/Syllabus',
+                            index: 1
+                        },
+                        {
+                            code: 'gradeLevel',
+                            translations: '{"en":"Class","hi":"कक्षा","te":"క్లాసు","ta":"வகுப்பு","mr":"इयत्ता"}',
+                            values: [],
+                            name: 'Class',
+                            index: 2
+                        }
+                    ],
+                    aggregate: {
+                        groupBy: 'subject'
+                    }
+                },
+                {
+                    facet: 'Courses',
+                    searchCriteria: {
+                        facets: [],
+                        primaryCategories: [
+                            'Course'
+                        ],
+                        mode: 'soft',
+                        searchType: 'search'
+                    },
+                    primaryFacetFilters: [
+                        {
+                            code: 'board',
+                            translations: '{"en":"Board/Syllabus","hi":"बोर्ड","te":"బోర్డు","ta":"வாரியம்","mr":"बोर्ड"}',
+                            values: [],
+                            name: 'Board/Syllabus',
+                            index: 1
+                        },
+                        {
+                            code: 'gradeLevel',
+                            translations: '{"en":"Class","hi":"कक्षा","te":"క్లాసు","ta":"வகுப்பு","mr":"इयत्ता"}',
+                            values: [],
+                            name: 'Class',
+                            index: 2
+                        }
+                    ],
+                    aggregate: {
+                        groupBy: 'subject'
+                    }
+                },
+                {
+                    facet: 'Tv Classes',
+                    searchCriteria: {
+                        facets: [],
+                        primaryCategories: [
+                            'Explanation Content'
+                        ],
+                        mode: 'soft',
+                        searchType: 'search'
+                    },
+                    primaryFacetFilters: [
+                        {
+                            code: 'board',
+                            translations: '{"en":"Board/Syllabus","hi":"बोर्ड","te":"బోర్డు","ta":"வாரியம்","mr":"बोर्ड"}',
+                            values: [],
+                            name: 'Board/Syllabus',
+                            index: 1
+                        },
+                        {
+                            code: 'gradeLevel',
+                            translations: '{"en":"Class","hi":"कक्षा","te":"క్లాసు","ta":"வகுப்பு","mr":"इयत्ता"}',
+                            values: [],
+                            name: 'Class',
+                            index: 2
+                        }
+                    ],
+                    aggregate: {
+                        groupBy: 'subject'
+                    }
+                }
+            ],
+            mapping: []
+        },
+        theme: {
+            component: 'sb-pills-grid',
+            inputs: {
+                pillShape: 'default'
+            }
+        }
+    },
+    {
+        index: 1,
+        title: '{"en":"Search from other boards"}',
+        data: [
+            {
+                facet: '{"en":"AP"}',
+                searchCriteria: {
+                    facets: [
+                        'board'
+                    ],
+                    filters: {
+                        board: [
+                            'ts_k-12_2'
+                        ]
+                    }
+                },
+                primaryFacetFilters: [
+                    {
+                        code: 'gradeLevel',
+                        translations: '{"en":"Class","hi":"कक्षा","te":"క్లాసు","ta":"வகுப்பு","mr":"इयत्ता"}',
+                        values: [],
+                        name: 'Class',
+                        index: 2
+                    },
+                    {
+                        code: 'medium',
+                        translations: '{"en":"Medium","hi":"माध्यम","te":"మాధ్యమం","ta":"மொழி","mr":"माध्यम"}',
+                        values: [],
+                        name: 'Medium',
+                        index: 4
+                    }
+                ],
+                aggregate: {
+                    groupBy: 'subject'
+                }
+            },
+            {
+                facet: '{"en":"AS"}',
+                searchCriteria: {
+                    facets: [
+                        'board'
+                    ],
+                    filters: {
+                        board: [
+                            'as_k-12_5'
+                        ]
+                    }
+                },
+                primaryFacetFilters: [
+                    {
+                        code: 'gradeLevel',
+                        translations: '{"en":"Class","hi":"कक्षा","te":"క్లాసు","ta":"வகுப்பு","mr":"इयत्ता"}',
+                        values: [],
+                        name: 'Class',
+                        index: 2
+                    },
+                    {
+                        code: 'medium',
+                        translations: '{"en":"Medium","hi":"माध्यम","te":"మాధ్యమం","ta":"மொழி","mr":"माध्यम"}',
+                        values: [],
+                        name: 'Medium',
+                        index: 4
+                    }
+                ],
+                aggregate: {
+                    groupBy: 'subject'
+                }
+            },
+            {
+                facet: '{"en":"KA"}',
+                searchCriteria: {
+                    facets: [
+                        'board'
+                    ],
+                    filters: {
+                        board: [
+                            'ka_k-12_1'
+                        ]
+                    }
+                },
+                primaryFacetFilters: [
+                    {
+                        code: 'gradeLevel',
+                        translations: '{"en":"Class","hi":"कक्षा","te":"క్లాసు","ta":"வகுப்பு","mr":"इयत्ता"}',
+                        values: [],
+                        name: 'Class',
+                        index: 2
+                    },
+                    {
+                        code: 'medium',
+                        translations: '{"en":"Medium","hi":"माध्यम","te":"మాధ్యమం","ta":"மொழி","mr":"माध्यम"}',
+                        values: [],
+                        name: 'Medium',
+                        index: 4
+                    }
+                ],
+                aggregate: {
+                    groupBy: 'subject'
+                }
+            }
+        ],
+        dataSrc: {
+            type: 'CONTENT_FACETS',
+            request: {
+                type: 'POST',
+                path: '/api/content/v1/search',
+                withBearerToken: true,
+                body: {
+                    request: {
+                        limit: 0,
+                        offset: 0,
+                        mode: 'hard',
+                        facets: [],
+                        filters: {}
+                    }
+                }
+            },
+            values: [
+                {
+                    facet: '{"en":"AP"}',
+                    searchCriteria: {
+                        facets: [
+                            'board'
+                        ],
+                        filters: {
+                            board: [
+                                'ts_k-12_2'
+                            ]
+                        }
+                    },
+                    primaryFacetFilters: [
+                        {
+                            code: 'gradeLevel',
+                            translations: '{"en":"Class","hi":"कक्षा","te":"క్లాసు","ta":"வகுப்பு","mr":"इयत्ता"}',
+                            values: [],
+                            name: 'Class',
+                            index: 2
+                        },
+                        {
+                            code: 'medium',
+                            translations: '{"en":"Medium","hi":"माध्यम","te":"మాధ్యమం","ta":"மொழி","mr":"माध्यम"}',
+                            values: [],
+                            name: 'Medium',
+                            index: 4
+                        }
+                    ],
+                    aggregate: {
+                        groupBy: 'subject'
+                    }
+                },
+                {
+                    facet: '{"en":"AS"}',
+                    searchCriteria: {
+                        facets: [
+                            'board'
+                        ],
+                        filters: {
+                            board: [
+                                'as_k-12_5'
+                            ]
+                        }
+                    },
+                    primaryFacetFilters: [
+                        {
+                            code: 'gradeLevel',
+                            translations: '{"en":"Class","hi":"कक्षा","te":"క్లాసు","ta":"வகுப்பு","mr":"इयत्ता"}',
+                            values: [],
+                            name: 'Class',
+                            index: 2
+                        },
+                        {
+                            code: 'medium',
+                            translations: '{"en":"Medium","hi":"माध्यम","te":"మాధ్యమం","ta":"மொழி","mr":"माध्यम"}',
+                            values: [],
+                            name: 'Medium',
+                            index: 4
+                        }
+                    ],
+                    aggregate: {
+                        groupBy: 'subject'
+                    }
+                },
+                {
+                    facet: '{"en":"KA"}',
+                    searchCriteria: {
+                        facets: [
+                            'board'
+                        ],
+                        filters: {
+                            board: [
+                                'ka_k-12_1'
+                            ]
+                        }
+                    },
+                    primaryFacetFilters: [
+                        {
+                            code: 'gradeLevel',
+                            translations: '{"en":"Class","hi":"कक्षा","te":"క్లాసు","ta":"வகுப்பு","mr":"इयत्ता"}',
+                            values: [],
+                            name: 'Class',
+                            index: 2
+                        },
+                        {
+                            code: 'medium',
+                            translations: '{"en":"Medium","hi":"माध्यम","te":"మాధ్యమం","ta":"மொழி","mr":"माध्यम"}',
+                            values: [],
+                            name: 'Medium',
+                            index: 4
+                        }
+                    ],
+                    aggregate: {
+                        groupBy: 'subject'
+                    }
+                }
+            ],
+            mapping: []
+        },
+        theme: {
+            component: 'sb-pills-grid',
+            inputs: {
+                pillShape: 'circle',
+                pillsViewType: 'scroll'
+            }
+        }
+    },
+    {
+        index: 2,
+        title: '{"en":"Trending courses from your state"}',
+        meta: {
+            searchCriteria: {
+                sortCriteria: [],
+                searchType: 'search',
+                offset: 0,
+                limit: 100,
+                impliedFiltersMap: [],
+                impliedFilters: [
+                    {
+                        name: 'primaryCategories',
+                        values: [
+                            {
+                                name: 'Course',
+                                apply: true
+                            }
+                        ]
+                    }
+                ],
+                facets: [
+                    'primaryCategory'
+                ]
+            },
+            filterCriteria: {
+                limit: 100,
+                offset: 0,
+                facets: [
+                    'primaryCategory'
+                ],
+                sortCriteria: [],
+                mode: 'hard',
+                facetFilters: [
+                    {
+                        name: 'primaryCategory',
+                        values: []
+                    }
+                ],
+                impliedFiltersMap: [
+                    {
+                        audience: []
+                    },
+                    {
+                        contentType: []
+                    },
+                    {
+                        medium: []
+                    },
+                    {
+                        board: []
+                    },
+                    {
+                        language: []
+                    },
+                    {
+                        topic: []
+                    },
+                    {
+                        purpose: []
+                    },
+                    {
+                        channel: []
+                    },
+                    {
+                        mimeType: []
+                    },
+                    {
+                        subject: []
+                    }
+                ],
+                impliedFilters: [
+                    {
+                        name: 'objectType',
+                        values: [
+                            {
+                                name: 'Content',
+                                apply: true
+                            }
+                        ]
+                    },
+                    {
+                        name: 'primaryCategories',
+                        values: [
+                            {
+                                name: 'Course',
+                                apply: true
+                            }
+                        ]
+                    }
+                ]
+            },
+            searchRequest: {
+                offset: 0,
+                limit: 100,
+                exists: [],
+                facets: [
+                    'primaryCategory'
+                ],
+                sort_by: {},
+                filters: {
+                    audience: [],
+                    objectType: [
+                        'Content'
+                    ],
+                    contentType: [],
+                    primaryCategory: [],
+                    medium: [],
+                    board: [],
+                    language: [],
+                    topic: [],
+                    purpose: [],
+                    channel: [],
+                    mimeType: [],
+                    subject: [],
+                    primaryCategories: [
+                        'Course'
+                    ]
+                }
+            }
+        },
+        dataSrc: {
+            type: 'CONTENTS',
+            request: {
+                type: 'POST',
+                path: '/api/content/v1/search',
+                withBearerToken: true,
+                body: {
+                    request: {
+                        offset: 0,
+                        limit: 100,
+                        exists: [],
+                        facets: [
+                            'primaryCategory'
+                        ],
+                        sort_by: {},
+                        filters: {
+                            audience: [],
+                            objectType: [
+                                'Content'
+                            ],
+                            contentType: [],
+                            primaryCategory: [],
+                            medium: [],
+                            board: [],
+                            language: [],
+                            topic: [],
+                            purpose: [],
+                            channel: [],
+                            mimeType: [],
+                            subject: [],
+                            primaryCategories: [
+                                'Course'
+                            ]
+                        }
+                    }
+                }
+            },
+            mapping: []
+        },
+        theme: {
+            component: 'sb-course-cards-hlist',
+            inputs: {
+                type: 'course_card_grid',
+                hideProgress: true,
+                viewMoreButtonText: '{"en":"View all"}'
+            }
+        }
+    },
+    {
+        data: [
+            {
+                facet: 'primaryCategory',
+                icon: 'https://'
+            }
+        ],
+        dataSrc: {
+            type: 'SEARCH_CONTENTS_BY_POULAR_CATEGORY'
+        }
+    }
+];
diff --git a/src/app/components/discover/discover.page.spec.ts b/src/app/components/discover/discover.page.spec.ts
new file mode 100644
index 000000000..57f78055e
--- /dev/null
+++ b/src/app/components/discover/discover.page.spec.ts
@@ -0,0 +1,271 @@
+import { DiscoverComponent } from './discover.page';
+import { AppVersion } from '@ionic-native/app-version/ngx';
+import { PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { Router } from '@angular/router';
+import { AppHeaderService } from '../../../services/app-header.service';
+import { ContentAggregatorHandler } from '../../../services/content/content-aggregator-handler.service';
+import { AppGlobalService, CommonUtilService, FormAndFrameworkUtilService, TelemetryGeneratorService } from '../../../services';
+import { NavigationService } from '../../../services/navigation-handler.service';
+import { mockDiscoverPageData } from '@app/app/components/discover/discover.page.spec.data';
+import { ContentFilterConfig } from '@app/app/app.constant';
+import {ProfileType, SharedPreferences} from '@project-sunbird/sunbird-sdk';
+import { of } from 'rxjs';
+
+describe('DiscoverComponent', () => {
+    let discoverComponent: DiscoverComponent;
+    const mockAppVersion: Partial<AppVersion> = {
+        getAppName: jest.fn(() => Promise.resolve('sunbird'))
+    };
+    const mockEvents: Partial<Events> = {
+        subscribe: jest.fn()
+    };
+    const mockHeaderService: Partial<AppHeaderService> = {};
+    const mockRouter: Partial<Router> = {};
+    const mockContentAggregatorHandler: Partial<ContentAggregatorHandler> = {};
+    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {
+        init: jest.fn(),
+        checkNewAppVersion: jest.fn(() => Promise.resolve({}))
+    };
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+    const mockNavService: Partial<NavigationService> = {
+        navigateToTrackableCollection: jest.fn(),
+        navigateToCollection: jest.fn(),
+        navigateToContent: jest.fn()
+    };
+    const mockPopoverController: Partial<PopoverController> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateImpressionTelemetry: jest.fn(),
+        generateInteractTelemetry: jest.fn()
+    };
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+       getGuestUserInfo: jest.fn(() => Promise.resolve(ProfileType.TEACHER))
+    };
+    const mockSharedPrefernces: Partial<SharedPreferences> = {
+        getString: jest.fn(() => of(ProfileType.TEACHER))
+    };
+
+    beforeAll(() => {
+        discoverComponent = new DiscoverComponent(
+            mockSharedPrefernces as SharedPreferences,
+            mockAppVersion as AppVersion,
+            mockHeaderService as AppHeaderService,
+            mockRouter as Router,
+            mockEvents as Events,
+            mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
+            mockContentAggregatorHandler as ContentAggregatorHandler,
+            mockNavService as NavigationService,
+            mockCommonUtilService as CommonUtilService,
+            mockPopoverController as PopoverController,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockAppGlobalService as AppGlobalService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should be create an instance of DiscoverComponent', () => {
+        expect(discoverComponent).toBeTruthy();
+    });
+
+    describe('ngOnInit', () => {
+        it('should fetch appName, displayElements, and showHeaderWithHomeButton', (done) => {
+            // arrange
+            mockAppVersion.getAppName = jest.fn(() => Promise.resolve('Sunbird'));
+            mockContentAggregatorHandler.newAggregate = jest.fn(() => Promise.resolve(mockDiscoverPageData));
+            const data = jest.fn((fn => fn({ name: 'download' })));
+            mockHeaderService.headerEventEmitted$ = {
+                subscribe: data
+            } as any;
+            mockRouter.navigate = jest.fn();
+            mockHeaderService.showHeaderWithHomeButton = jest.fn();
+            mockSharedPrefernces.getString = jest.fn(() => of(ProfileType.TEACHER));
+            // act
+            discoverComponent.ngOnInit();
+            // assert
+            setTimeout(() => {
+                expect(mockContentAggregatorHandler.newAggregate).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should fetch appName, displayElements and headerEvents should redirect to notification', (done) => {
+
+            // arrange
+            mockAppVersion.getAppName = jest.fn(() => Promise.resolve('Sunbird'));
+            mockContentAggregatorHandler.newAggregate = jest.fn(() => Promise.resolve(mockDiscoverPageData));
+            const data = jest.fn((fn => fn({ name: 'notification' })));
+            mockHeaderService.headerEventEmitted$ = {
+                subscribe: data
+            } as any;
+            mockRouter.navigate = jest.fn();
+            mockHeaderService.showHeaderWithHomeButton = jest.fn();
+            mockSharedPrefernces.getString =jest.fn(() => of(ProfileType.TEACHER));
+            // act
+            discoverComponent.ngOnInit();
+            // assert
+            setTimeout(() => {
+                expect(mockContentAggregatorHandler.newAggregate).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    it('should open searchPage and getSupportedContentFilterConfig', (done) => {
+        // arrange
+        mockFormAndFrameworkUtilService.getSupportedContentFilterConfig = jest.fn(() => Promise.resolve([]));
+        mockRouter.navigate = jest.fn();
+        // act
+        discoverComponent.openSearchPage();
+        // assert
+        setTimeout(() => {
+            expect(mockFormAndFrameworkUtilService.getSupportedContentFilterConfig).toHaveBeenCalledWith(ContentFilterConfig.NAME_COURSE);
+            expect(mockRouter.navigate).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
+    describe('navigateToDetailPage', () => {
+        it('should navigate to detail page with data in item', () => {
+            // arrange
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+            mockNavService.navigateToDetailPage = jest.fn();
+            // act
+            discoverComponent.navigateToDetailPage({
+                data: {
+                    content: {},
+                    isAvailableLocally: true
+                }
+            });
+            // assert
+            expect(mockNavService.navigateToDetailPage).toHaveBeenCalled();
+        });
+
+        it('should show offlineToast if data is not available or internet not available', () => {
+            // arrange
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: false };
+            mockCommonUtilService.presentToastForOffline = jest.fn();
+            // act
+            discoverComponent.navigateToDetailPage({
+                data: {
+                    isAvailableLocally: false
+                }
+            });
+            // assert
+            expect(mockCommonUtilService.presentToastForOffline).toHaveBeenCalledWith('OFFLINE_WARNING_ETBUI_1');
+        });
+    });
+
+    it('should navigate to viewmore activity', () => {
+        // arrange
+        mockCommonUtilService.getTranslatedValue = jest.fn();
+        mockRouter.navigate = jest.fn();
+        // act
+        discoverComponent.navigateToViewMoreContentsPage({ meta: { searchCriteria: {} } });
+        // assert
+        expect(mockRouter.navigate).toHaveBeenCalled();
+    });
+
+    describe('', () => {
+        it('should get data and open popover', () => {
+            // arrange
+            mockPopoverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({})),
+            } as any)));
+            mockRouter.navigate = jest.fn();
+            // act
+            discoverComponent.onViewMorePillList({ data: 'sample' }, 'Mathematics');
+            // assert
+            expect(mockRouter.navigate).not.toHaveBeenCalled();
+        });
+
+        it('should return if event or data is not available', () => {
+            // arrange
+            mockRouter.navigate = jest.fn();
+            // act
+            discoverComponent.onViewMorePillList(undefined, 'Maths');
+            // assert
+            expect(mockRouter.navigate).not.toHaveBeenCalled();
+        });
+    });
+
+    describe('handle pill select', () => {
+        it('should return if event or event.data is not available', () => {
+            // arrange
+            mockRouter.navigate = jest.fn();
+            // act
+            discoverComponent.handlePillSelect(undefined, undefined);
+            // assert
+            expect(mockRouter.navigate).not.toHaveBeenCalled();
+        });
+
+        it('should navigate to categoryList page', () => {
+            // arrange
+            mockRouter.navigate = jest.fn();
+            // act
+            discoverComponent.handlePillSelect({
+                data: [
+                    {
+                        value: {}
+                    }
+                ]
+            }, {
+                dataSrc: {
+                    params: {
+                        config: []
+                    }
+                }
+            });
+            // assert
+            expect(mockRouter.navigate).toHaveBeenCalled();
+        });
+    });
+
+    it('should fetch displayElements', () => {
+        // arrange
+        mockContentAggregatorHandler.newAggregate = jest.fn(() => Promise.resolve(mockDiscoverPageData));
+        // act
+        discoverComponent.tabViewWillEnter();
+        // assert
+        expect(mockContentAggregatorHandler.newAggregate).toHaveBeenCalled();
+    });
+
+    it('should call clearAllSubscription on ionViewWillLeave', () => {
+        // arrange
+        discoverComponent.clearAllSubscriptions = jest.fn();
+        // act
+        discoverComponent.ionViewWillLeave();
+        // assert
+        expect(discoverComponent.clearAllSubscriptions).toHaveBeenCalled();
+    });
+
+    it('should call clearAllSubscription on ngOnDestroy', () => {
+        // arrange
+        discoverComponent.clearAllSubscriptions = jest.fn();
+        // act
+        discoverComponent.ngOnDestroy();
+        // assert
+        expect(discoverComponent.clearAllSubscriptions).toHaveBeenCalled();
+    });
+
+    it('should call doRefresh and call emit', () => {
+        // arrange
+        const hideRefresher = {
+            emit: jest.fn()
+        };
+        const refresher = {
+            target: {
+                complete: jest.fn()
+            }
+        };
+        jest.spyOn(hideRefresher, 'emit');
+        jest.spyOn(discoverComponent, 'fetchDisplayElements');
+        // act
+        discoverComponent.doRefresh(refresher);;
+        // assert
+        expect(discoverComponent.fetchDisplayElements).toHaveBeenCalled();
+    });
+});
diff --git a/src/app/components/discover/discover.page.ts b/src/app/components/discover/discover.page.ts
new file mode 100644
index 000000000..f1fee00f0
--- /dev/null
+++ b/src/app/components/discover/discover.page.ts
@@ -0,0 +1,265 @@
+import {Component, EventEmitter, Inject, OnDestroy, OnInit, Output} from '@angular/core';
+import { AppVersion } from '@ionic-native/app-version/ngx';
+import { FormAndFrameworkUtilService } from '@app/services/formandframeworkutil.service';
+import {ContentFilterConfig, PreferenceKey, PrimaryCaregoryMapping, RouterLinks, ViewMore} from '../../app.constant';
+import { NavigationExtras, Router } from '@angular/router';
+import {
+  AppGlobalService,
+  AppHeaderService,
+  CommonUtilService,
+  ContentAggregatorHandler,
+  CorReleationDataType,
+  Environment, ImpressionType, InteractType, PageId, TelemetryGeneratorService
+} from '@app/services';
+import { PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { Subscription } from 'rxjs';
+import {
+  CachedItemRequestSourceFrom,
+  ContentAggregatorRequest,
+  ContentSearchCriteria,
+  CorrelationData,
+  SharedPreferences
+} from '@project-sunbird/sunbird-sdk';
+import { AggregatorPageType } from '@app/services/content/content-aggregator-namespaces';
+import { CourseCardGridTypes } from '@project-sunbird/common-consumption-v8';
+import { NavigationService } from '@app/services/navigation-handler.service';
+import { SbSubjectListPopupComponent } from '@app/app/components/popups/sb-subject-list-popup/sb-subject-list-popup.component';
+import { OnTabViewWillEnter } from '@app/app/tabs/on-tab-view-will-enter';
+import { ObjectUtil } from '@app/util/object.util';
+
+@Component({
+  selector: 'app-discover',
+  templateUrl: './discover.page.html',
+  styleUrls: ['./discover.page.scss'],
+})
+export class DiscoverComponent implements OnInit, OnDestroy, OnTabViewWillEnter {
+
+  @Output() hideRefresher = new EventEmitter();
+  
+
+  appLabel: string;
+  displaySections?: any[];
+  courseCardType = CourseCardGridTypes;
+  userType: string;
+
+  constructor(
+    @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
+    private appVersion: AppVersion,
+    private headerService: AppHeaderService,
+    private router: Router,
+    private events: Events,
+    private formAndFrameworkUtilService: FormAndFrameworkUtilService,
+    private contentAggregatorHandler: ContentAggregatorHandler,
+    private navService: NavigationService,
+    private commonUtilService: CommonUtilService,
+    private popoverCtrl: PopoverController,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+    private appGlobalService: AppGlobalService
+  ) { }
+
+  ngOnInit() {
+    this.appVersion.getAppName().then((appName: any) => {
+      this.appLabel = appName;
+    });
+    this.fetchDisplayElements();
+  }
+
+  doRefresh(refresher) {
+    this.hideRefresher.emit(true);
+    this.fetchDisplayElements(refresher);
+  }
+
+  async fetchDisplayElements(refresher?) {
+    const request: ContentAggregatorRequest = {
+      interceptSearchCriteria: (contentSearchCriteria: ContentSearchCriteria) => contentSearchCriteria,
+      from: refresher ? CachedItemRequestSourceFrom.SERVER : CachedItemRequestSourceFrom.CACHE
+    };
+
+    let displayItems = await this.contentAggregatorHandler.newAggregate(request, AggregatorPageType.DISCOVER);
+    displayItems = this.mapContentFacteTheme(displayItems);
+    this.displaySections = displayItems;
+    this.hideRefresher.emit(false);
+    if (refresher) {
+      refresher.target.complete();
+    }
+    this.userType = await this.preferences.getString(PreferenceKey.SELECTED_USER_TYPE).toPromise();
+    this.generateImpressionTelemetry();
+  }
+
+  private generateImpressionTelemetry() {
+    if (this.displaySections && this.displaySections.length) {
+      const corRelationList: Array<CorrelationData> = this.displaySections.reduce((acc: Array<CorrelationData>, val) => {
+        if (val.dataSrc && val.dataSrc.values) {
+          const categories: string[] = val.dataSrc.values.map((category: any) =>
+            ObjectUtil.isJSON(category.facet) ? JSON.parse(category.facet)['en'] : category.facet);
+          let categoryType = CorReleationDataType.CATEGORY_LIST;
+          switch (val.code) {
+            case 'popular_categories':
+              categoryType = CorReleationDataType.CATEGORY_LIST;
+              break;
+            case 'other_boards':
+              categoryType = CorReleationDataType.OTHER_BOARDS;
+              break;
+            case 'browse_by_audience':
+              categoryType = CorReleationDataType.AUDIENCE_LIST;
+              break;
+          }
+          acc.push({
+            type: categoryType,
+            id: categories.join(',')
+          });
+        }
+        return acc;
+      }, []);
+      corRelationList.push({
+        type: CorReleationDataType.USERTYPE,
+        id: this.userType
+      });
+      this.telemetryGeneratorService.generateImpressionTelemetry(
+        ImpressionType.PAGE_LOADED, PageId.HOME,
+        PageId.SEARCH,
+        Environment.SEARCH, undefined, undefined, undefined, undefined,
+        corRelationList
+      );
+    }
+  }
+
+  async openSearchPage() {
+    const primaryCategories = await this.formAndFrameworkUtilService.getSupportedContentFilterConfig(
+      ContentFilterConfig.NAME_COURSE);
+    this.router.navigate([RouterLinks.SEARCH], {
+      state: {
+        primaryCategories,
+        source: PageId.COURSES
+      }
+    });
+  }
+
+  handlePillSelect(event, section) {
+    if (!event || !event.data || !event.data.length) {
+      return;
+    }
+    const filterConfig = section.dataSrc.params.config.find(((facet) => facet.type === 'filter'));
+    event.data[0].value['primaryFacetFilters'] = filterConfig ? filterConfig.values : undefined;
+    const params = {
+      code: section.code,
+      formField: event.data[0].value,
+      fromLibrary: true,
+      description: (section && section.description) || ''
+    };
+    let corRelationType: string = CorReleationDataType.CATEGORY;
+    let interactType: string = InteractType.SELECT_CATEGORY;
+    switch (section.code) {
+      case 'popular_categories':
+        corRelationType = CorReleationDataType.CATEGORY;
+        interactType = InteractType.SELECT_CATEGORY;
+        break;
+      case 'other_boards':
+        corRelationType = CorReleationDataType.BOARD;
+        interactType = InteractType.SELECT_BOARD;
+        break;
+      case 'browse_by_audience':
+        corRelationType = CorReleationDataType.AUDIENCE;
+        interactType = InteractType.SELECT_AUDIENCE;
+        break;
+    }
+    const correlationList: Array<CorrelationData> = [];
+    correlationList.push({
+      id: event.data[0].name || '',
+      type: corRelationType
+    });
+
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      interactType, '',
+      Environment.SEARCH,
+      PageId.SEARCH, undefined, undefined, undefined,
+      correlationList
+    );
+
+    this.router.navigate([RouterLinks.CATEGORY_LIST], { state: params });
+  }
+
+  navigateToDetailPage(event) {
+    event.data = event.data.content ? event.data.content : event.data;
+    const item = event.data;
+
+    if (this.commonUtilService.networkInfo.isNetworkAvailable || item.isAvailableLocally) {
+      this.navService.navigateToDetailPage(item, { content: item });
+    } else {
+      this.commonUtilService.presentToastForOffline('OFFLINE_WARNING_ETBUI_1');
+    }
+  }
+
+  navigateToViewMoreContentsPage(section, pageName?) {
+    const params: NavigationExtras = {
+      state: {
+        requestParams: {
+          request: section.meta.searchCriteria
+        },
+        headerTitle: this.commonUtilService.getTranslatedValue(section.title, ''),
+        pageName: ViewMore.PAGE_COURSE_POPULAR
+      }
+    };
+    this.router.navigate([RouterLinks.VIEW_MORE_ACTIVITY], params);
+  }
+
+  async onViewMorePillList(event, section) {
+    if (!event || !event.data) {
+      return;
+    }
+    const subjectListPopover = await this.popoverCtrl.create({
+      component: SbSubjectListPopupComponent,
+      componentProps: {
+        subjectList: event.data,
+        title: section && section.title
+      },
+      backdropDismiss: true,
+      showBackdrop: true,
+      cssClass: 'subject-list-popup',
+    });
+    await subjectListPopover.present();
+    const { data } = await subjectListPopover.onDidDismiss();
+    this.handlePillSelect(data, section);
+  }
+
+  ionViewWillLeave() {
+    this.clearAllSubscriptions();
+  }
+
+  ngOnDestroy() {
+    this.clearAllSubscriptions();
+  }
+
+  clearAllSubscriptions() {
+    // If any
+  }
+
+  private mapContentFacteTheme(displayItems) {
+    if (displayItems && displayItems.length) {
+      for (let count = 0; count < displayItems.length; count++) {
+        if (!displayItems[count].data) {
+          continue;
+        }
+        if (displayItems[count].dataSrc && (displayItems[count].dataSrc.type === 'SEARCH_CONTENTS_BY_POULAR_CATEGORY')) {
+          displayItems[count] = this.mapPrimaryCategoryTheme(displayItems[count]);
+        }
+      }
+    }
+    return displayItems;
+  }
+
+  private mapPrimaryCategoryTheme(displayItems) {
+    displayItems.data.forEach(item => {
+      const primaryCaregoryMap = item.facet &&
+        PrimaryCaregoryMapping[item.facet.toLowerCase()] ? PrimaryCaregoryMapping[item.facet.toLowerCase()] :
+        PrimaryCaregoryMapping['default'];
+      item.icon = item.icon ? item.icon : primaryCaregoryMap.icon;
+    });
+    return displayItems;
+  }
+
+  tabViewWillEnter() {
+    this.fetchDisplayElements();
+  }
+}
diff --git a/src/app/components/enrollment-details/enrollment-details.component.html b/src/app/components/enrollment-details/enrollment-details.component.html
index f42d29cda..7ff61d662 100644
--- a/src/app/components/enrollment-details/enrollment-details.component.html
+++ b/src/app/components/enrollment-details/enrollment-details.component.html
@@ -1,89 +1,91 @@
 <ion-header class=" subtitle head">
+    <ion-toolbar>
+        <ion-title>{{ 'VIEW_ALL_BATCHES' | translate }}</ion-title>
+        <ion-buttons slot="primary">
+            <ion-button (click)="close()">
+                <ion-icon name="close"></ion-icon>
+            </ion-button>
+        </ion-buttons>
+    </ion-toolbar>
+</ion-header>
 
-        <ion-toolbar>
-            <ion-title>{{ 'VIEW_ALL_BATCHES' | translate }}</ion-title>
-            <ion-buttons slot="primary">
-                <ion-button (click)="close()">
-                    <ion-icon name="close"></ion-icon>
-                </ion-button>
-            </ion-buttons>
-        </ion-toolbar>
-    
-    </ion-header>
-    
-    
-    <ion-content>
-        <ion-list no-lines>
-            <ion-item-group>
-                <ion-item-divider class="subtitle mytitle">{{ 'VIEW_RETIRED_BATCHES' | translate }}</ion-item-divider>
-                <ion-item *ngFor="let batches of retiredBatched; let i=index">
-                    <div item-start class="width-80">
-                        <h5 class="subtitle title">{{ batches.batch.name }}</h5>
-                        <p>{{batches.batch.startDate | date: 'mediumDate' }} -
-                            {{ batches.batch.endDate | date: 'mediumDate' }}</p>
-                        <p *ngIf="batch?.creatorDetails?.firstName">{{ 'BATCH_CREATED_BY' | translate }}
-                            {{ batch.creatorDetails.firstName }}</p>
-                    </div>
-                    <ion-button fill="clear" item-end class="subtitle buttontext" (click)="resumeCourse(batches)">
-                        {{ 'RESUME' | translate }}</ion-button>
-                </ion-item>
-    
-                <ion-item-divider *ngIf="ongoingBatches && ongoingBatches.length" class="subtitle mytitle">
-                    {{ 'VIEW_ONGOING_BATCHES' | translate }}</ion-item-divider>
-                <ion-item *ngFor="let batch of ongoingBatches; let i=index">
-                    <div item-start  class="width-80">
-                        <h5 class="subtitle title">{{ batch.name }}</h5>
-                        <p>{{batch.startDate | date: 'mediumDate' }} - {{ batch.endDate | date: 'mediumDate' }}</p>
-                        <p *ngIf="batch?.creatorDetails?.firstName">
-                            <span>{{ 'BATCH_CREATED_BY' | translate }}</span>&nbsp;
-                            <span class="text-gray-color">{{ batch.creatorDetails.firstName }}</span>&nbsp;
-                            <span class="text-gray-color" *ngIf="batch?.creatorDetails?.lastName">{{batch?.creatorDetails?.lastName}}</span>
-                        </p>
-                        <p *ngIf="batch?.enrollmentEndDate">
-                            <span *ngIf="(todayDate > batch?.enrollmentEndDate); else lastDateForEnrollment"
-                                class="enroll-msg-ended">{{ 'BATCH_ENROLLMENT_ENDED' | translate}}</span>
-                            <ng-template #lastDateForEnrollment>
-                                <span class="enroll-msg-style">{{'ENROLLMENT_LAST_DATE' | translate}}
-                                    {{batch.enrollmentEndDate | date: 'mediumDate'}}</span>
-                            </ng-template>
-                        </p>
-                    </div>
-                    <div class="card-icon">
-                        <button class="sb-btn sb-btn-sm sb-btn-outline-info view-all-p8 ion-float-end"
-                        (click)="enrollIntoBatch(batch);" [disabled]="(batch.enrollmentEndDate && (todayDate > batch.enrollmentEndDate))"
+<ion-content>
+    <ion-list no-lines>
+        <ion-item-group>
+            <ion-item-divider *ngIf="retiredBatched" class="subtitle mytitle">{{ 'VIEW_RETIRED_BATCHES' | translate }}</ion-item-divider>
+            <ion-item *ngFor="let batches of retiredBatched; let i=index">
+                <div item-start class="width-80">
+                    <h5 class="subtitle title">{{ batches.batch.name }}</h5>
+                    <p>{{batches.batch.startDate | date: 'dd/MM/yyyy' }} -
+                        {{ batches.batch.endDate | date: 'dd/MM/yyyy' }}</p>
+                    <p *ngIf="batch?.creatorDetails?.firstName">{{ 'BATCH_CREATED_BY' | translate }}
+                        {{ batch.creatorDetails.firstName }}</p>
+                </div>
+                <ion-button fill="clear" item-end class="subtitle buttontext" (click)="resumeCourse(batches)">
+                    {{ 'RESUME' | translate }}</ion-button>
+            </ion-item>
+
+            <ion-item-divider *ngIf="ongoingBatches && ongoingBatches.length" class="subtitle mytitle">
+                {{ 'VIEW_OPEN_BATCHES' | translate }}</ion-item-divider>
+            <div class="p-16 card-section-danger">{{ 'FRMELEMNTS_LBL_OPEN_BATCH_NOT_RECOMMENDED' | translate }}</div>
+            <ion-item *ngFor="let batch of ongoingBatches; let i=index">
+                <div item-start class="width-80">
+                    <h5 class="subtitle title">{{ batch.name }}</h5>
+                    <p>{{batch.startDate | date: 'dd/MM/yyyy' }} - {{ batch.endDate | date: 'dd/MM/yyyy' }}</p>
+                    <p *ngIf="batch?.creatorDetails?.firstName">
+                        <span>{{ 'BATCH_CREATED_BY' | translate }}</span>&nbsp;
+                        <span class="text-gray-color">{{ batch.creatorDetails.firstName }}</span>&nbsp;
+                        <span class="text-gray-color"
+                            *ngIf="batch?.creatorDetails?.lastName">{{batch?.creatorDetails?.lastName}}</span>
+                    </p>
+                    <p *ngIf="batch?.enrollmentEndDate">
+                        <span *ngIf="(todayDate > batch?.enrollmentEndDate); else lastDateForEnrollment"
+                            class="enroll-msg-ended">{{ 'BATCH_ENROLLMENT_ENDED' | translate}}</span>
+                        <ng-template #lastDateForEnrollment>
+                            <span class="enroll-msg-style">{{'ENROLLMENT_LAST_DATE' | translate}}
+                                {{batch.enrollmentEndDate | date: 'dd/MM/yyyy' }}</span>
+                        </ng-template>
+                    </p>
+                </div>
+                <div class="card-icon">
+                    <button class="sb-btn sb-btn-sm sb-btn-outline-info view-all-p8 ion-float-end"
+                        (click)="enrollIntoBatch(batch);"
+                        [disabled]="(batch.enrollmentEndDate && (todayDate > batch.enrollmentEndDate))"
                         [ngClass]="{'enroll-style' : (batch?.enrollmentEndDate && (todayDate > batch?.enrollmentEndDate))}">
                         {{ 'ENROLL' | translate }}</button>
-                    </div>
-                </ion-item>
-    
-                <ion-item-divider *ngIf="upcommingBatches && upcommingBatches.length" class="subtitle mytitle">
-                    {{ 'VIEW_UPCOMING_BATCHES' | translate }}</ion-item-divider>
-                <ion-item *ngFor="let batch of upcommingBatches; let i=index">
-                    <div item-start class="width-80">
-                        <h5 class="subtitle title">{{ batch.name }}</h5>
-                        <p>{{batch.startDate | date: 'mediumDate' }} - {{ batch.endDate | date: 'mediumDate' }}</p>
-                        <p *ngIf="batch?.creatorDetails?.firstName">
-                            <span>{{ 'BATCH_CREATED_BY' | translate }}</span>&nbsp;
-                            <span class="text-gray-color">{{ batch.creatorDetails.firstName }}</span>&nbsp;
-                            <span class="text-gray-color" *ngIf="batch?.creatorDetails?.lastName">{{batch.creatorDetails.lastName}}</span>
-                        </p>
-                        <p *ngIf="batch?.enrollmentEndDate">
-                            <span *ngIf="(todayDate > batch?.enrollmentEndDate); else lastDateForEnrollment"
-                                class="enroll-msg-ended">{{ 'BATCH_ENROLLMENT_ENDED' | translate}}</span>
-                     
-                                <ng-template #lastDateForEnrollment>
-                                <span class="enroll-msg-style">{{'ENROLLMENT_LAST_DATE' | translate}}
-                                    {{batch.enrollmentEndDate | date: 'mediumDate'}}</span>
-                            </ng-template>
-                        </p>
-                    </div>
-                    <div class="card-icon">
-                        <button class="sb-btn sb-btn-sm sb-btn-outline-info view-all-p8 ion-float-end"
-                        (click)="enrollIntoBatch(batch);" [disabled]="(batch.enrollmentEndDate && (todayDate > batch.enrollmentEndDate))"
+                </div>
+            </ion-item>
+
+            <ion-item-divider *ngIf="upcommingBatches && upcommingBatches.length" class="subtitle mytitle">
+                {{ 'VIEW_UPCOMING_BATCHES' | translate }}</ion-item-divider>
+            <ion-item *ngFor="let batch of upcommingBatches; let i=index">
+                <div item-start class="width-80">
+                    <h5 class="subtitle title">{{ batch.name }}</h5>
+                    <p>{{batch.startDate | date: 'dd/MM/yyyy' }} - {{ batch.endDate | date: 'dd/MM/yyyy' }}</p>
+                    <p *ngIf="batch?.creatorDetails?.firstName">
+                        <span>{{ 'BATCH_CREATED_BY' | translate }}</span>&nbsp;
+                        <span class="text-gray-color">{{ batch.creatorDetails.firstName }}</span>&nbsp;
+                        <span class="text-gray-color"
+                            *ngIf="batch?.creatorDetails?.lastName">{{batch.creatorDetails.lastName}}</span>
+                    </p>
+                    <p *ngIf="batch?.enrollmentEndDate">
+                        <span *ngIf="(todayDate > batch?.enrollmentEndDate); else lastDateForEnrollment"
+                            class="enroll-msg-ended">{{ 'BATCH_ENROLLMENT_ENDED' | translate}}</span>
+
+                        <ng-template #lastDateForEnrollment>
+                            <span class="enroll-msg-style">{{'ENROLLMENT_LAST_DATE' | translate}}
+                                {{batch.enrollmentEndDate | date: 'dd/MM/yyyy' }}</span>
+                        </ng-template>
+                    </p>
+                </div>
+                <div class="card-icon">
+                    <button class="sb-btn sb-btn-sm sb-btn-outline-info view-all-p8 ion-float-end"
+                        (click)="enrollIntoBatch(batch);"
+                        [disabled]="(batch.enrollmentEndDate && (todayDate > batch.enrollmentEndDate))"
                         [ngClass]="{'enroll-style' : (batch?.enrollmentEndDate && (todayDate > batch?.enrollmentEndDate))}">
                         {{ 'ENROLL' | translate }}</button>
-                    </div>
-                </ion-item>
-            </ion-item-group>
-        </ion-list>
-    </ion-content>
\ No newline at end of file
+                </div>
+            </ion-item>
+        </ion-item-group>
+    </ion-list>
+</ion-content>
\ No newline at end of file
diff --git a/src/app/components/enrollment-details/enrollment-details.component.scss b/src/app/components/enrollment-details/enrollment-details.component.scss
index 2bbdbad63..886d82691 100644
--- a/src/app/components/enrollment-details/enrollment-details.component.scss
+++ b/src/app/components/enrollment-details/enrollment-details.component.scss
@@ -11,7 +11,6 @@
         }
         &.mytitle{
             color: map-get($colors, primary_black);
-            background-color:map-get($colors, light_gray) !important;
             font-size: 1.2em;
         }
         &.head{
@@ -25,22 +24,15 @@
         }
 
         
-    }
-    .item-divider .header{
-        
     }
 
     .sb-btn-outline-info {
-        background-color: #006DE5 !important;
-        border-radius: 5px !important;
         font-weight: bold;
         font-size: 12px;
-        color: white !important;
-        border-color: white !important;
     }
 
     .background-gray{
-        background: #efeff4;
+        background: map-get($colors, gray_white);
         @include margin(-16px, -26px, 0, -26px);
         @include padding(null, null, null, 25px !important);
     }
@@ -93,7 +85,7 @@
     }
 
     .enroll-msg-ended {
-        color: #e55a28;
+        color: $orange;
         font-size: 0.9em;
     }
 
@@ -114,7 +106,7 @@
         border-radius: 5px !important;
         font-weight: bold;
         font-size: 12px;
-        color: white !important;
-        border-color: white !important;
+        color: map-get($colors, white) !important;
+        border-color: map-get($colors, white) !important;
     }
 }
diff --git a/src/app/components/enrollment-details/enrollment-details.component.ts b/src/app/components/enrollment-details/enrollment-details.component.ts
index 03d646171..a146ee1fe 100644
--- a/src/app/components/enrollment-details/enrollment-details.component.ts
+++ b/src/app/components/enrollment-details/enrollment-details.component.ts
@@ -1,25 +1,34 @@
-import { Component, NgZone, Inject } from '@angular/core';
-import { NavController, Events, PopoverController, NavParams } from '@ionic/angular';
+import { Component, NgZone, Inject, OnInit } from '@angular/core';
 import {
-    SharedPreferences,
-    AuthService,
-    TelemetryObject,
-    InteractType,
+    NavController, PopoverController, NavParams
+} from '@ionic/angular';
+import { Events } from '@app/util/events';
+import {
+    SharedPreferences, TelemetryObject, InteractType,
 } from 'sunbird-sdk';
-import { PreferenceKey, ProfileConstants, EventTopics, ContentType, RouterLinks } from '@app/app/app.constant';
+import {
+    PreferenceKey, EventTopics
+} from '@app/app/app.constant';
 import { CommonUtilService } from '@app/services/common-util.service';
 import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import { InteractSubtype, Environment, PageId } from '@app/services/telemetry-constants';
-import { Router } from '@angular/router';
-import { LocalCourseService } from '@app/services';
+import {
+    InteractSubtype, Environment, PageId
+} from '@app/services/telemetry-constants';
+import {
+    LocalCourseService, AppGlobalService
+} from '@app/services';
 import { EnrollCourse } from '@app/app/enrolled-course-details-page/course.interface';
+import { CsPrimaryCategory } from '@project-sunbird/client-services/services/content';
+import { ContentUtil } from '@app/util/content-util';
+import { CategoryKeyTranslator } from '@app/pipes/category-key-translator/category-key-translator-pipe';
+import { NavigationService } from '@app/services/navigation-handler.service';
 
 @Component({
     selector: 'app-enrollment-details',
     templateUrl: './enrollment-details.component.html',
     styleUrls: ['./enrollment-details.component.scss'],
 })
-export class EnrollmentDetailsComponent {
+export class EnrollmentDetailsComponent implements OnInit {
     ongoingBatches: any;
     upcommingBatches: any;
     retiredBatched: any;
@@ -32,11 +41,12 @@ export class EnrollmentDetailsComponent {
     pageName: any;
     env: any;
     courseId: any;
+    content: any;
     todayDate: string;
 
     constructor(
-        @Inject('AUTH_SERVICE') private authService: AuthService,
         @Inject('SHARED_PREFERENCES') private preference: SharedPreferences,
+        private appGlobalService: AppGlobalService,
         public navCtrl: NavController,
         public navParams: NavParams,
         private events: Events,
@@ -44,16 +54,21 @@ export class EnrollmentDetailsComponent {
         private popOverCtrl: PopoverController,
         private telemetryGeneratorService: TelemetryGeneratorService,
         private commonUtilService: CommonUtilService,
-        private router: Router,
-        private localCourseService: LocalCourseService
+        private navService: NavigationService,
+        private localCourseService: LocalCourseService,
+        private categoryKeyTranslator: CategoryKeyTranslator
     ) {
         this.ongoingBatches = this.navParams.get('ongoingBatches');
         this.upcommingBatches = this.navParams.get('upcommingBatches');
         this.retiredBatched = this.navParams.get('retiredBatched');
         this.todayDate = window.dayjs().format('YYYY-MM-DD');
-        this.courseId = this.navParams.get('courseId');
-        this.getUserId();
+        this.content = this.navParams.get('content');
+        this.courseId = this.content.identifier;
+    }
 
+    async ngOnInit() {
+        this.userId = await this.appGlobalService.getActiveProfileUid();
+        this.isGuestUser = !this.appGlobalService.isUserLoggedIn();
     }
 
     close(data?: any) {
@@ -63,14 +78,9 @@ export class EnrollmentDetailsComponent {
     resumeCourse(content: any) {
         this.saveContentContext(content);
 
-        if (content.lastReadContentId && content.status === 1) {
-            this.events.publish('course:resume', { content });
-            this.close();
-        } else {
-            this.close().then(() => {
-                this.router.navigate([`/${RouterLinks.ENROLLED_COURSE_DETAILS}`], { state: { content } });
-            });
-        }
+        this.close().then(() => {
+            this.navService.navigateToDetailPage(content.content, { content, skipCheckRetiredOpenBatch: true });
+        });
     }
 
     saveContentContext(content: any) {
@@ -84,12 +94,11 @@ export class EnrollmentDetailsComponent {
         }
 
         // store the contentContextMap in shared preference and access it from SDK
-        this.preference.putString(PreferenceKey.CONTENT_CONTEXT, JSON.stringify(contentContextMap));
+        this.preference.putString(PreferenceKey.CONTENT_CONTEXT, JSON.stringify(contentContextMap)).toPromise();
     }
 
-    async enrollIntoBatch(content: any) {
-
-        const enrollCourseRequest = this.localCourseService.prepareEnrollCourseRequest(this.userId, content, this.courseId);
+    async enrollIntoBatch(batch: any) {
+        const enrollCourseRequest = this.localCourseService.prepareEnrollCourseRequest(this.userId, batch, this.courseId);
         this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
             InteractSubtype.ENROLL_CLICKED,
             Environment.HOME,
@@ -100,53 +109,35 @@ export class EnrollmentDetailsComponent {
         await loader.present();
         const enrollCourse: EnrollCourse = {
             userId: this.userId,
-            batch: content,
+            batch,
             pageId: PageId.COURSE_BATCHES,
             courseId: this.courseId
         };
         this.localCourseService.enrollIntoBatch(enrollCourse).toPromise()
             .then((data: any) => {
                 this.zone.run(() => {
-                    this.commonUtilService.showToast(this.commonUtilService.translateMessage('COURSE_ENROLLED'));
+                    this.commonUtilService.showToast(this.categoryKeyTranslator.transform('FRMELEMNTS_MSG_COURSE_ENROLLED', this.content));
                     this.events.publish(EventTopics.ENROL_COURSE_SUCCESS, {
-                        batchId: content.id,
-                        courseId: content.courseId
+                        batchId: batch.id,
+                        courseId: batch.courseId
                     });
                     loader.dismiss();
-                    this.popOverCtrl.dismiss({ isEnrolled: true });
-                    this.navigateToDetailPage(content);
+                    this.popOverCtrl.dismiss({ isEnrolled: true, batchId: batch.id, courseId: batch.courseId });
+                    this.navigateToDetailPage(this.content);
                 });
             }, (error) => {
                 loader.dismiss();
             });
     }
 
-    /**
-     * Get logged-user id. User id is needed to enroll user into batch.
-     */
-    getUserId(): void {
-        this.authService.getSession().toPromise().then((session) => {
-            if (session === undefined || session == null) {
-                console.log('session expired');
-                this.zone.run(() => { this.isGuestUser = true; });
-            } else {
-                this.zone.run(() => {
-                    this.isGuestUser = false;
-                    this.userId = session[ProfileConstants.USER_TOKEN];
-                });
-            }
-        });
-    }
-
     navigateToDetailPage(content: any, layoutName?: string): void {
         const identifier = content.contentId || content.identifier;
-        let type;
+        let telemetryObject;
         if (layoutName === this.layoutInProgress) {
-            type = ContentType.COURSE;
+            telemetryObject = new TelemetryObject(identifier, CsPrimaryCategory.COURSE, '');
         } else {
-            type = this.telemetryGeneratorService.isCollection(content.mimeType) ? content.contentType : ContentType.RESOURCE;
+            telemetryObject = ContentUtil.getTelemetryObject(content);
         }
-        const telemetryObject: TelemetryObject = new TelemetryObject(identifier, type, '');
 
         const values = new Map();
         values['sectionName'] = this.sectionName;
@@ -155,12 +146,11 @@ export class EnrollmentDetailsComponent {
         this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
             InteractSubtype.CONTENT_CLICKED,
             this.env,
-            this.pageName ? this.pageName : this.layoutName,
+            PageId.COURSE_BATCHES,
             telemetryObject,
             values
         );
-        content.contentId = !content.contentId ? content.courseId : content.contentId;
-        this.router.navigate([`/${RouterLinks.ENROLLED_COURSE_DETAILS}`], { state: { content } });
+        this.navService.navigateToDetailPage(content, { content });
     }
 
 }
diff --git a/src/app/components/enrollment-details/enrollment-detils.component.spec.ts b/src/app/components/enrollment-details/enrollment-detils.component.spec.ts
index daaf5ec9d..bb8f43c98 100644
--- a/src/app/components/enrollment-details/enrollment-detils.component.spec.ts
+++ b/src/app/components/enrollment-details/enrollment-detils.component.spec.ts
@@ -1,25 +1,29 @@
-import { NavParams, Events, PopoverController, NavController } from "@ionic/angular";
-import { NgZone } from "@angular/core";
-import { TelemetryGeneratorService, CommonUtilService, LocalCourseService, InteractSubtype, InteractType } from "../../../services";
-import { AuthService, SharedPreferences } from "sunbird-sdk";
-import { Router } from "@angular/router";
+import {
+    NavParams, Events,
+    PopoverController, NavController
+} from '@ionic/angular';
+import { NgZone } from '@angular/core';
+import {
+    TelemetryGeneratorService, CommonUtilService, LocalCourseService,
+    InteractSubtype, InteractType, PageId, AppGlobalService, Environment
+} from '../../../services';
+import { SharedPreferences } from 'sunbird-sdk';
 import { EnrollmentDetailsComponent } from './enrollment-details.component';
-import { of } from "rxjs";
-import { PreferenceKey, EventTopics, RouterLinks } from "../../app.constant";
-
+import { of } from 'rxjs';
+import { PreferenceKey, EventTopics, RouterLinks } from '../../app.constant';
+import { CategoryKeyTranslator } from '@app/pipes/category-key-translator/category-key-translator-pipe';
+import { NavigationService } from '../../../services/navigation-handler.service';
 describe('enrollmentdetailcomponent', () => {
 
     let enrollmentDetails: EnrollmentDetailsComponent;
 
-    const mockAuthService: Partial<AuthService> = {
-        getSession: jest.fn(() => of())
-    };
     const mockSharedPreferences: Partial<SharedPreferences> = {
-        putString: jest.fn()
+        putString: jest.fn(() => of(undefined))
     };
+    const mockAppGlobalService: Partial<AppGlobalService> = {};
     const mockNavController: Partial<NavController> = {};
     const mockNavParams: Partial<NavParams> = {
-        get: jest.fn(() => "Deummy")
+        get: jest.fn(() => 'Dummy')
     };
     const mockEvents: Partial<Events> = {
         publish: jest.fn()
@@ -38,8 +42,8 @@ describe('enrollmentdetailcomponent', () => {
         translateMessage: jest.fn(),
         showToast: jest.fn()
     };
-    const mockRouter: Partial<Router> = {
-        navigate: jest.fn()
+    const mockNavService: Partial<NavigationService> = {
+        navigateToDetailPage: jest.fn()
     };
     const mockLocalCourseService: Partial<LocalCourseService> = {
         prepareEnrollCourseRequest: jest.fn(),
@@ -47,10 +51,14 @@ describe('enrollmentdetailcomponent', () => {
         enrollIntoBatch: jest.fn()
     };
 
+    const mockCategoryKeyTranslator: Partial<CategoryKeyTranslator> = {
+        transform: jest.fn(() => 'sample-message')
+    };
+
     beforeAll(() => {
         enrollmentDetails = new EnrollmentDetailsComponent(
-            mockAuthService as AuthService,
             mockSharedPreferences as SharedPreferences,
+            mockAppGlobalService as AppGlobalService,
             mockNavController as NavController,
             mockNavParams as NavParams,
             mockEvents as Events,
@@ -58,8 +66,9 @@ describe('enrollmentdetailcomponent', () => {
             mockPopoverController as PopoverController,
             mockTelemetryGeneratorService as TelemetryGeneratorService,
             mockCommonUtilServiceas as CommonUtilService,
-            mockRouter as Router,
-            mockLocalCourseService as LocalCourseService
+            mockNavService as NavigationService,
+            mockLocalCourseService as LocalCourseService,
+            mockCategoryKeyTranslator as CategoryKeyTranslator
         );
     });
 
@@ -86,8 +95,23 @@ describe('enrollmentdetailcomponent', () => {
         });
     });
 
+    describe('saveContentContext()', () => {
+        it('should set userToken and isGuestUser', () => {
+            // arrange
+            const content = {
+                userId: 'userId',
+                courseId: 'courseId',
+                id: 'contentId'
+            };
+            // act
+            enrollmentDetails.saveContentContext(content);
+            // assert
+            expect(mockSharedPreferences.putString).toHaveBeenCalled();
+        });
+    });
+
     describe('resumeCourse()', () => {
-        it('should call saveContext publish close and putString', () => { 
+        it('should call saveContext publish close and putString', () => {
             // arrange
             const content = {
                 userId: 'userId',
@@ -109,24 +133,27 @@ describe('enrollmentdetailcomponent', () => {
             enrollmentDetails.resumeCourse(content);
             // assert
             expect(enrollmentDetails.saveContentContext).toBeCalled();
-            expect(mockEvents.publish).toBeCalledWith('course:resume', { content });
             expect(enrollmentDetails.close).toBeCalled();
             expect(mockSharedPreferences.putString).toBeCalledWith(PreferenceKey.CONTENT_CONTEXT, JSON.stringify(contentContextMap));
         });
-    
+
         it('should call navigate', (done) => {
             // arrange
             const content = {
                 userId: 'userId',
                 courseId: 'courseId',
                 batchId: 'batchId',
+                content: {
+                    identifier: 'do_id'
+                }
             };
             spyOn(enrollmentDetails, 'saveContentContext').and.stub();
             // act
             enrollmentDetails.resumeCourse(content);
             // assert
             setTimeout(() => {
-                expect(mockRouter.navigate).toBeCalled();
+                expect(mockNavService.navigateToDetailPage).toBeCalledWith(
+                    content.content, { content, skipCheckRetiredOpenBatch: true });
                 done();
             }, 0);
         });
@@ -157,7 +184,7 @@ describe('enrollmentdetailcomponent', () => {
             // assert
             setTimeout(() => {
                 expect(mockCommonUtilServiceas.showToast).toBeCalled();
-                expect(mockCommonUtilServiceas.translateMessage).toBeCalledWith('COURSE_ENROLLED');
+                expect(mockCategoryKeyTranslator.transform).toBeCalledWith('FRMELEMNTS_MSG_COURSE_ENROLLED', expect.anything());
                 expect(mockEvents.publish).toBeCalledWith(EventTopics.ENROL_COURSE_SUCCESS, {
                     batchId: content.id,
                     courseId: content.courseId
@@ -168,51 +195,44 @@ describe('enrollmentdetailcomponent', () => {
                 done();
             }, 0);
         });
-    
+
         it('should go to navigateToDetailPage and call navigate, content.contentId to "contentId"', (done) => {
             // arrange
-            const content = {
+            const batch = {
                 userId: 'userId',
                 courseId: 'courseId',
                 batchId: 'batchId',
                 contentId: 'contentId',
+                primaryCategory: 'Learning Resource',
                 id: 'contentId'
             };
             const loader = {
                 present: jest.fn(),
                 dismiss: jest.fn()
             };
-            const telemetryObj = {
-                id: content.contentId,
-                type: 'Resource',
-                version: ''
-            };
-            const values = new Map();
-            values['sectionName'] = undefined;
-            values['positionClicked'] = undefined;
+
             enrollmentDetails.layoutInProgress = 'layout';
             mockTelemetryGeneratorService.isCollection = jest.fn(() => false);
             jest.spyOn(mockCommonUtilServiceas, 'getLoader').mockReturnValue(loader);
             jest.spyOn(mockLocalCourseService, 'enrollIntoBatch').mockReturnValue(of(Promise.resolve(true)));
             mockNgZone.run = jest.fn((callback) => callback());
             // act
-            enrollmentDetails.enrollIntoBatch(content);
+            enrollmentDetails.enrollIntoBatch(batch);
             // assert
             setTimeout(() => {
                 expect(mockTelemetryGeneratorService.generateInteractTelemetry).toBeCalledWith(
                     InteractType.TOUCH,
-                    InteractSubtype.CONTENT_CLICKED,
+                    InteractSubtype.ENROLL_CLICKED, Environment.HOME, PageId.CONTENT_DETAIL,
                     undefined,
-                    undefined,
-                    telemetryObj,
-                    values
+                    undefined
                 );
-                expect(mockRouter.navigate).toBeCalledWith([`/${RouterLinks.ENROLLED_COURSE_DETAILS}`], { state: { content } });
-                expect(content.contentId).toEqual('contentId');
+                expect(mockNavService.navigateToDetailPage).toBeCalledWith(
+                    enrollmentDetails.content, { content: enrollmentDetails.content });
+                expect(enrollmentDetails.content.identifier).toEqual(undefined);
                 done();
             }, 0);
         });
-    
+
         it('should go to navigateToDetailPage set content.contentId to "courseId"', (done) => {
             // arrange
             const content = {
@@ -232,11 +252,11 @@ describe('enrollmentdetailcomponent', () => {
             enrollmentDetails.enrollIntoBatch(content);
             // assert
             setTimeout(() => {
-                expect(content['contentId']).toEqual('courseId');
+                expect(content['identifier']).toEqual(undefined);
                 done();
             }, 0);
         });
-    
+
         it('should fail and dismiss loader', (done) => {
             // arrange
             const loader = {
@@ -255,17 +275,17 @@ describe('enrollmentdetailcomponent', () => {
         });
     });
 
-    describe('getUserid()', () => {
-        it('should set userToken and isGuestUser', (done) => {
+    describe('ngOnInit()', () => {
+        it('should set user id and isGuestUser', (done) => {
             // arrange
-            jest.spyOn(mockAuthService, 'getSession').mockReturnValue(of({ userToken: 'userToken'}));
-            mockNgZone.run = jest.fn((callback) => callback());
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+            mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('sample-uid'));
             // act
-            enrollmentDetails.getUserId();
+            enrollmentDetails.ngOnInit();
             // assert
             setTimeout(() => {
-                expect(enrollmentDetails.isGuestUser).toEqual(false);
-                expect(enrollmentDetails.userId).toEqual('userToken');
+                expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+                expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
                 done();
             }, 0);
         });
@@ -295,12 +315,46 @@ describe('enrollmentdetailcomponent', () => {
                 InteractType.TOUCH,
                 InteractSubtype.CONTENT_CLICKED,
                 undefined,
+                PageId.COURSE_BATCHES,
+                telemetryObj,
+                values
+            );
+        });
+
+        it('should navigate if the contentType is collection', () => {
+            // arrange
+            enrollmentDetails.pageName = PageId.COURSES;
+            enrollmentDetails.layoutInProgress = 'layout';
+            mockTelemetryGeneratorService.isCollection = jest.fn(() => true);
+            const content = {
+                userId: 'userId',
+                contentId: 'courseId',
+                batchId: 'batchId',
+                id: 'contentId',
+                contentType: 'TextBook',
+                primaryCategory: 'Digital Textbook',
+                mimeType: 'application/vnd.ekstep.content-collection'
+            };
+            const telemetryObj = {
+                id: content.contentId,
+                type: 'Digital Textbook',
+                version: ''
+            };
+            const values = new Map();
+            values['sectionName'] = undefined;
+            values['positionClicked'] = undefined;
+            // act
+            enrollmentDetails.navigateToDetailPage(content);
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toBeCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.CONTENT_CLICKED,
                 undefined,
+                PageId.COURSE_BATCHES,
                 telemetryObj,
                 values
             );
-    
         });
     });
 
-});
\ No newline at end of file
+});
diff --git a/src/app/components/filteroption/filteroption.component.html b/src/app/components/filteroption/filteroption.component.html
index 8c755fea6..33a9ba657 100644
--- a/src/app/components/filteroption/filteroption.component.html
+++ b/src/app/components/filteroption/filteroption.component.html
@@ -7,16 +7,20 @@ <h4 class="subtitle">{{ 'CHOOSE_FROM_FOLLOWING' | translate }}</h4>
   <ion-grid class="scroll-list">
     <ion-row *ngIf="facets?.values && facets?.values.length">
       <ion-col size="6" *ngFor="let facetValue of facets.values">
-        <input type="checkbox" class="checkbox" [(ngModel)]="facetValue.apply">
-        <ion-label class="filter-option-text" text-capitalize>
-          {{ facetValue.translations ? facetValue.translations: facetValue.name  }}
+        <ion-item lines="none">
+        <ion-checkbox type="checkbox" class="checkbox" [(ngModel)]="facetValue.apply"></ion-checkbox>
+        <ion-label class="filter-option-text ion-text-capitalize">
+          {{ facetValue.translations ? facetValue.translations: facetValue.name  | translate | aliased }}
         </ion-label>
+      </ion-item>
       </ion-col>
     </ion-row>
   </ion-grid>
 </ion-content>
-<ion-footer>
-  <ion-toolbar class="ion-padding-left ion-padding-right">
-    <ion-button expand="full" color="primary" (click)="confirm()">{{ 'CONFIRM' | translate }}</ion-button>
-  </ion-toolbar>
+<ion-footer class="footer">
+  <ion-row>
+    <ion-col>
+      <ion-button expand="block" (click)="confirm()">{{ 'CONFIRM' | translate }}</ion-button>
+    </ion-col>
+  </ion-row>
 </ion-footer>
\ No newline at end of file
diff --git a/src/app/components/filteroption/filteroption.component.scss b/src/app/components/filteroption/filteroption.component.scss
index e045fd2ce..934d1ab60 100644
--- a/src/app/components/filteroption/filteroption.component.scss
+++ b/src/app/components/filteroption/filteroption.component.scss
@@ -4,6 +4,7 @@
       font-size: 1.3em;
       font-weight: 700 !important;
       color: map-get($colors, facebook);
+      margin-left: 1.3rem;
     }
     .checkbox {
       margin: 8px !important;
@@ -42,4 +43,9 @@
   .option-box ion-backdrop {
     background-color: map-get($colors, black) !important;
     opacity: 0.4 !important;
-  }
\ No newline at end of file
+  }
+
+  .footer{
+    background: #FFF;
+    bottom: 0;
+ }
\ No newline at end of file
diff --git a/src/app/components/filteroption/filteroption.component.ts b/src/app/components/filteroption/filteroption.component.ts
index c1d2efa0f..89f4e0317 100644
--- a/src/app/components/filteroption/filteroption.component.ts
+++ b/src/app/components/filteroption/filteroption.component.ts
@@ -1,50 +1,58 @@
-import { Component , ViewEncapsulation  } from '@angular/core';
+import { Component, ViewEncapsulation, OnDestroy } from '@angular/core';
 import { NavParams, PopoverController, Platform } from '@ionic/angular';
 import { Subscription } from 'rxjs';
 import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
 import {
   Environment, InteractSubtype, InteractType, PageId
 } from '@app/services/telemetry-constants';
+
 @Component({
   selector: 'app-filteroption',
   templateUrl: './filteroption.component.html',
   styleUrls: ['./filteroption.component.scss'],
   encapsulation: ViewEncapsulation.None
 })
-export class FilteroptionComponent {
+export class FilteroptionComponent implements OnDestroy {
 
   facets: any;
   backButtonFunc: Subscription;
+  source: string;
 
   constructor(
     private navParams: NavParams,
     private popCtrl: PopoverController,
     private platform: Platform,
     private telemetryGeneratorService: TelemetryGeneratorService
-    ) {
+  ) {
     this.facets = this.navParams.get('facet');
+    this.source = this.navParams.get('source');
     this.backButtonFunc = this.platform.backButton.subscribeWithPriority(11, () => {
       this.popCtrl.dismiss();
-      this.backButtonFunc.unsubscribe();
     });
   }
 
+  ngOnDestroy() {
+    if (this.backButtonFunc) {
+      this.backButtonFunc.unsubscribe();
+    }
+  }
+
   confirm() {
     const values = new Map();
     values['option'] = this.facets.name;
     const appliedFilter = [];
     this.facets.values.map((element) => {
-       if (element.apply) {
-          appliedFilter.push(element.name);
-       }
+      if (element.apply) {
+        appliedFilter.push(element.name);
+      }
     });
     values['selectedFilter'] = appliedFilter;
     this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
       InteractSubtype.APPLY_FILTER_CLICKED,
       Environment.HOME,
-      PageId.LIBRARY_SEARCH_FILTER,
+      (this.source && this.source.match('courses')) ? PageId.COURSE_SEARCH_FILTER : PageId.LIBRARY_SEARCH_FILTER,
       undefined,
       values);
-    this.popCtrl.dismiss();
+    this.popCtrl.dismiss({ isFilterApplied: true });
   }
 }
diff --git a/src/app/components/license-card-component/license-card-component.component.html b/src/app/components/license-card-component/license-card-component.component.html
new file mode 100644
index 000000000..6459fe1c8
--- /dev/null
+++ b/src/app/components/license-card-component/license-card-component.component.html
@@ -0,0 +1,109 @@
+<ion-card *ngIf="content">
+    <ion-card-content class="ion-no-padding">
+        <div *ngIf="content.author || content.organisation || content.license || content.copyright">
+            <div>
+                <div class="ion-padding">
+                    <div class="font-14-new view-credits" (click)="showLicensce()">
+                        <span>
+                            <strong>{{'CREDITS_LICENCE_INFO' | translate}}</strong>
+                        </span>
+                        <span *ngIf="showCredits">
+                            <ion-icon name="arrow-up"></ion-icon>
+                        </span>
+                        <span *ngIf="!showCredits">
+                            <ion-icon name="arrow-down"></ion-icon>
+                        </span>
+                    </div>
+                </div>
+                <div *ngIf="showCredits" class="showLicensce">
+                    <div class="ion-padding">
+                        <div *ngIf="content.author">
+                            <ion-card-title class="font-12 subtitle-color label-margin-bottom">
+                                <strong>{{'AUTHOR' | translate}}</strong>:
+                            </ion-card-title>
+                            <p>{{content.author}}</p>
+                        </div>
+                        <div *ngIf="content.creator">
+                            <ion-card-title class="font-12 subtitle-color label-margin-bottom">
+                                <strong>{{ 'CREATORS' | translate:{'%s': appName} }}</strong>:
+                            </ion-card-title>
+                            <p>{{content.creator}} </p>
+                        </div>
+                        <div *ngIf="content.organisation">
+                            <ion-card-title class="font-12 subtitle-color label-margin-bottom">
+                                <strong>{{ 'PUBLISHED_BY' | translate:{'%s': appName} }}</strong>:
+                            </ion-card-title>
+                            <p>{{content.organisation}} </p>
+                        </div>
+                        <div *ngIf="content.contributors || content.creators || content.attributions">
+                            <ion-card-title class="font-12 subtitle-color label-margin-bottom">
+                                <strong>{{ 'ATTRIBUTIONS' | translate }}</strong>:
+                            </ion-card-title>
+                            <p>{{mergeProperties(['attributions', 'contributors', 'creators'])}}</p>
+                        </div>
+                        <div *ngIf="content.license && !content.licenseDetails">
+                            <ion-card-title class="font-12 subtitle-color label-margin-bottom">
+                                <strong>{{ 'LICENSE' | translate }}</strong>:
+                            </ion-card-title>
+                            <p>{{content.license}}</p>
+                        </div>
+                        <div *ngIf="licenseDetails" class="ion-padding-bottom">
+                            <ion-card-title class="font-12 subtitle-color label-margin-bottom">
+                                <strong>{{ 'LICENSE' | translate }}</strong>:
+                            </ion-card-title>
+                            <div>{{licenseDetails.name}}</div>
+                            <div>{{licenseDetails.description}}</div>
+                            <span (click)="openBrowser(licenseDetails.url)"
+                                  class="sb-legal-url">{{licenseDetails.url}}</span>
+                        </div>
+                        <div *ngIf="content.copyright">
+
+                            <ion-card-title class="font-12 subtitle-color label-margin-bottom">
+                                <strong>{{ 'COPYRIGHT' | translate }}</strong>:
+                            </ion-card-title>
+                            <p>{{content.copyright}}{{content.copyrightYear ? ", " + content.copyrightYear : ""}}
+                            </p>
+                        </div>
+                    </div>
+                    <!--training derived from section starts-->
+                    <div class="origin-data" *ngIf="content.originData">
+                        <div class="font-14 traning-derived-label-background ion-padding-bottom">
+                            <span><strong>{{'CONTENT_DERIVED_FROM' | translate}}</strong></span>
+                        </div>
+                        <div class="ion-padding">
+                            <div *ngIf="content.originData.name">
+                                <ion-card-title class="font-12 subtitle-color label-margin-bottom">
+                                    <strong> {{'ORIGINAL_CONTENT' | translate}}</strong>:
+                                </ion-card-title>
+                                <p>{{content.originData.name}}</p>
+                            </div>
+                            <div *ngIf="content.originData.author">
+
+                                <ion-card-title class="font-12 subtitle-color label-margin-bottom">
+                                    <strong>{{ 'ORIGINAL_AUTHOR' | translate }}</strong>:
+                                </ion-card-title>
+                                <p>{{content.originData.author}}</p>
+                            </div>
+
+                            <div *ngIf="content.originData.license">
+                                <ion-card-title class="font-12 subtitle-color label-margin-bottom">
+                                    <strong>{{ 'LICENSE' | translate }}</strong>:
+                                </ion-card-title>
+                                <p>{{content.originData.license}}</p>
+                            </div>
+
+                            <div *ngIf="content.originData.organisation">
+                                <ion-card-title class="font-12 subtitle-color label-margin-bottom">
+                                    <strong>{{ 'PUBLISHED_BY' | translate:{'%s': appName} }}</strong>:
+                                </ion-card-title>
+                                <p>{{content.originData.organisation[0]}}</p>
+                            </div>
+                        </div>
+                    </div>
+                    <!-- / training derived from section ends -->
+                </div>
+            </div>
+        </div>
+        <!--/credits and license info-->
+    </ion-card-content>
+</ion-card>
\ No newline at end of file
diff --git a/src/app/components/license-card-component/license-card-component.component.scss b/src/app/components/license-card-component/license-card-component.component.scss
new file mode 100644
index 000000000..7d0841c64
--- /dev/null
+++ b/src/app/components/license-card-component/license-card-component.component.scss
@@ -0,0 +1,23 @@
+@import "src/assets/styles/variables";
+@import "src/assets/styles/_variables.scss";
+
+.view-credits{
+  margin-bottom: 8px;
+  margin-left: 0;
+  span{
+    color: $blue;
+    ion-icon{
+      padding: 0 0 4px 8px;
+      vertical-align: middle;
+      font-size: 18px;
+      margin-right: 2%;
+      float: right;
+    }
+  }
+
+}
+.showLicensce{
+  p{
+    margin-bottom: 16px;
+  }
+}
\ No newline at end of file
diff --git a/src/app/components/license-card-component/license-card-component.component.spec.ts b/src/app/components/license-card-component/license-card-component.component.spec.ts
new file mode 100644
index 000000000..fb9728111
--- /dev/null
+++ b/src/app/components/license-card-component/license-card-component.component.spec.ts
@@ -0,0 +1,95 @@
+import {LicenseCardComponentComponent} from './license-card-component.component';
+import {CommonUtilService, ID, InteractType, PageId, TelemetryGeneratorService} from '@app/services';
+import {ContentUtil} from '@app/util/content-util';
+
+describe('LicenseCardComponentComponent', () => {
+    let licenseCardComponent: LicenseCardComponentComponent;
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+
+    beforeAll(() => {
+            licenseCardComponent = new LicenseCardComponentComponent(
+                mockTelemetryGeneratorService as TelemetryGeneratorService,
+                mockCommonUtilService as CommonUtilService
+            );
+        }
+    );
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+    it('should create instance of licenseCardComponent', () => {
+        // assert
+        expect(licenseCardComponent).toBeTruthy();
+    });
+
+    it('should set objId, objType, objVer', () => {
+        // arrange
+        licenseCardComponent.content = {
+            identifier: 'do_123',
+            contentType: 'course',
+            pkgVersion: 1
+        };
+
+        // act
+        licenseCardComponent.ngOnInit();
+    });
+
+    describe('showLicense', () => {
+        it('should expand license card and generate telemetry', () => {
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+
+            // act
+            licenseCardComponent.showLicensce();
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.LICENSE_CARD_EXPANDED,
+                '',
+                undefined,
+                licenseCardComponent.pageId,
+                {id: 'do_123', type: 'course', version: 1},
+                undefined,
+                licenseCardComponent.objRollup,
+                licenseCardComponent.corRelationList,
+                ID.LICENSE_CARD_CLICKED
+            );
+        });
+
+        it('should collapse license card and generate telemetry', () => {
+            // arrange
+            licenseCardComponent.showCredits = true;
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+
+            // act
+            licenseCardComponent.showLicensce();
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.LICENSE_CARD_COLLAPSED,
+                '',
+                undefined,
+                licenseCardComponent.pageId,
+                {id: 'do_123', type: 'course', version: 1},
+                undefined,
+                licenseCardComponent.objRollup,
+                licenseCardComponent.corRelationList,
+                ID.LICENSE_CARD_CLICKED
+            );
+        });
+    });
+
+    it('should merge properties of content', () => {
+        jest.spyOn(ContentUtil, 'mergeProperties').mockImplementation();
+        // act
+        licenseCardComponent.mergeProperties('');
+        expect(ContentUtil.mergeProperties).toHaveBeenCalled();
+    });
+
+    it('should open Url in browser when function clicked', () => {
+        // arrange
+        mockCommonUtilService.openUrlInBrowser = jest.fn();
+        // act
+        licenseCardComponent.openBrowser('https://');
+        // assert
+        expect(mockCommonUtilService.openUrlInBrowser).toHaveBeenCalledWith('https://');
+    });
+});
diff --git a/src/app/components/license-card-component/license-card-component.component.ts b/src/app/components/license-card-component/license-card-component.component.ts
new file mode 100644
index 000000000..c7ed62eda
--- /dev/null
+++ b/src/app/components/license-card-component/license-card-component.component.ts
@@ -0,0 +1,67 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {ContentUtil} from '@app/util/content-util';
+import {ContentData, CorrelationData, LicenseDetails, Rollup, TelemetryObject} from 'sunbird-sdk';
+import {CommonUtilService, ID, InteractType, PageId, TelemetryGeneratorService} from '@app/services';
+
+@Component({
+    selector: 'app-license-card-component',
+    templateUrl: './license-card-component.component.html',
+    styleUrls: ['./license-card-component.component.scss'],
+})
+export class LicenseCardComponentComponent implements OnInit {
+    showCredits = false;
+
+    @Input() content: ContentData;
+    @Input() licenseDetails: LicenseDetails;
+    @Input() appName: string;
+    @Input() objRollup: Rollup;
+    @Input() corRelationList: Array<CorrelationData>;
+    @Input() pageId: PageId;
+    private objId;
+    private objVer;
+    private objType;
+    constructor(
+        private telemetryGeneratorService: TelemetryGeneratorService,
+        private commonUtilService: CommonUtilService
+    ) {
+    }
+
+    ngOnInit() {
+        this.objId = this.content.identifier;
+        this.objType = this.content.contentType;
+        this.objVer = this.content.pkgVersion;
+    }
+
+    showLicensce() {
+        this.showCredits = !this.showCredits;
+
+        if (this.showCredits) {
+            this.licenseSectionClicked('expanded');
+        } else {
+            this.licenseSectionClicked('collapsed');
+        }
+    }
+
+    private licenseSectionClicked(params) {
+        const telemetryObject = new TelemetryObject(this.objId, this.objType, this.objVer);
+        this.telemetryGeneratorService.generateInteractTelemetry(
+            params === 'expanded' ? InteractType.LICENSE_CARD_EXPANDED : InteractType.LICENSE_CARD_COLLAPSED,
+            '',
+            undefined,
+            this.pageId,
+            telemetryObject,
+            undefined,
+            this.objRollup,
+            this.corRelationList,
+            ID.LICENSE_CARD_CLICKED
+        );
+    }
+
+    mergeProperties(mergeProp) {
+        return ContentUtil.mergeProperties(this.content, mergeProp);
+    }
+
+    openBrowser(url) {
+        this.commonUtilService.openUrlInBrowser(url);
+    }
+}
diff --git a/src/app/components/notification-item/notification-item.component.html b/src/app/components/notification-item/notification-item.component.html
index 49501ce59..aa1536d49 100644
--- a/src/app/components/notification-item/notification-item.component.html
+++ b/src/app/components/notification-item/notification-item.component.html
@@ -1,26 +1,23 @@
 <div class="notification-item-container" (click)="!itemData?.actionData?.ctaText ? handleDeepLink() : ''">
   <p class="date-time">
-    <img *ngIf="!itemData?.isRead" src="./assets/imgs/oval.svg" class="mr-6"
-      alt="oval">{{ itemData?.displayTime * 1000 | date:'E, d MMMM h:mm'}}
+    <img *ngIf="!itemData?.isRead" src="./assets/imgs/oval.svg" class="mr-6" alt="oval">{{ itemData?.displayTime * 1000
+    | date:'E, d MMMM h:mm'}}
   </p>
-
-  <div class="title" (click)="toggleExpand()"
-    [ngClass]="{'sb-accordian-header':itemData?.actionData?.actionType === 'updateApp' && itemData?.actionData?.richText}"
-    [style.color]=" itemData?.actionData?.richText === '' ? '#666666' : '#024f9d'">
-    {{itemData?.actionData?.title}}
-    <span class="expand-button" *ngIf="itemData?.actionData?.actionType === 'updateApp'">
-      <img *ngIf="!isExpanded" src="./assets/imgs/arrow-down.svg" class="sb-accordian-arrow" alt="arrow-down">
-      <img *ngIf="isExpanded" src="./assets/imgs/arrow-down.svg" class="sb-accordian-arrow arrow-up" alt="arrow-up">
-    </span>
+  <div class="ni-flex">
+    <div class="img-info ni-flex-grow" *ngIf="itemData?.actionData?.appIcon">
+      <img [src]="itemData?.actionData?.appIcon" alt="content_icon">
+    </div>
+    <div class="richText-info ni-flex-grow">
+      <div class="title"
+        [ngClass]="{'sb-accordian-header':itemData?.actionData?.actionType === 'updateApp' && itemData?.actionData?.richText}">
+        <p class="title-info" [style.color]="itemData?.isRead ? '#666666' : '#024f9d'">
+          {{itemData?.actionData?.title}}</p>
+        <div class="description" *ngIf="itemData?.actionData?.richText">
+          {{itemData?.actionData?.richText}}</div>
+        <hr *ngIf="itemData?.actionData?.ctaText">
+        <div *ngIf="itemData?.actionData?.ctaText" (click)="handleDeepLink()" class="update-now-btn">
+          {{itemData?.actionData?.ctaText}}</div>
+      </div>
+    </div>
   </div>
-
-  <div class="description" *ngIf="itemData?.actionData?.actionType !== 'updateApp' && itemData?.actionData?.richText">
-    {{itemData?.actionData?.richText}}</div>
-
-  <div class="update-container pl-16" *ngIf="itemData?.actionData?.actionType === 'updateApp'&& isExpanded"
-    [innerHTML]="itemData?.actionData?.richText"></div>
-
-  <hr *ngIf="itemData?.actionData?.ctaText">
-  <div *ngIf="itemData?.actionData?.ctaText" (click)="handleDeepLink()" class="update-now-btn">
-    {{itemData?.actionData?.ctaText}}</div>
 </div>
\ No newline at end of file
diff --git a/src/app/components/notification-item/notification-item.component.scss b/src/app/components/notification-item/notification-item.component.scss
index 9008fef57..d90a7c3c8 100644
--- a/src/app/components/notification-item/notification-item.component.scss
+++ b/src/app/components/notification-item/notification-item.component.scss
@@ -1,5 +1,6 @@
 @import "src/assets/styles/base/_variables.scss";
 @import "src/assets/styles/_custom-mixins.scss";
+@import "src/assets/styles/_variables.scss";
 
 :host {
   width: 100%;
@@ -7,26 +8,40 @@
     width: 100%;
     .date-time {
       color: $gray-200;
-      font-family: "Noto Sans";
+      font-family: "Noto Sans", sans-serif;
       font-size: 12px;
       line-height: 20px;
+      margin-bottom: 4px;
+      padding: 2px;
+      margin-top: 10px;
     }
     .title {
       width: 100%;
       color: $blue;
-      font-family: "Noto Sans";
-      font-size: 14px;
+      font-family: "Noto Sans", sans-serif;
+      font-size: 15px;
       font-weight: bold;
       letter-spacing: -0.4px;
       line-height: 20px;
     }
+    .title-info{
+      white-space: nowrap; 
+      overflow: hidden;
+      text-overflow: ellipsis; 
+      margin: 0;
+      font-size: 16px;
+    }
     .description {
-      color: $gray-400;
-      font-family: ".SF NS Display";
-      font-size: 12px;
-      letter-spacing: -0.34px;
+      color: $gray-300;
+      font-family: "Noto Sans", sans-serif;
+      font-size: 13px;
+       letter-spacing: -0.1px;
       line-height: 20px;
       margin: 0;
+      white-space: nowrap; 
+      overflow: hidden;
+      text-overflow: ellipsis; 
+      margin-top: 2px;
     }
 
     .sb-accordian-arrow {
@@ -38,13 +53,25 @@
     }
 
     .update-container {
-      white-space: normal;
       border-radius: 2px;
-      background-color: #f1f1f1;
-      font-family: "Noto Sans";
-      font-size: 12px;
+     // background-color: map-get($colors, white_f1);
+      font-family: "Noto Sans", sans-serif;
+      font-size: 13px;
       line-height: 20px;
-      margin-top: 8px;
+      margin-top: 2px;
+      color: $gray-300;
+      white-space: nowrap; 
+      overflow: hidden;
+      text-overflow: ellipsis; 
+    }
+    .img-info{
+     width: 10%;
+     float:left;
+    }
+    .richText-info{
+      width: 90%;
+      margin-bottom: 8px;
+      padding-left: 4px;
     }
 
     .expand-button {
@@ -62,7 +89,7 @@
     .update-now-btn {
       height: 20px;
       color: $blue;
-      font-family: "Noto Sans";
+      font-family: "Noto Sans", sans-serif;
       font-size: 12px;
       font-weight: bold;
       letter-spacing: -0.34px;
@@ -77,13 +104,21 @@
         margin-left: 6px;
       }
     }
-    .pl-16 {
-      @include ltr() {
-        padding-left: 16px;
-      }
-      @include rtl() {
-        padding-right: 16px;
-      }
-    }
+    // .pl-16 {
+    //   @include ltr() {
+    //     padding-left: 16px;
+    //   }
+    //   @include rtl() {
+    //     padding-right: 16px;
+    //   }
+    // }
+  }
+
+  .ni-flex{
+    display: flex;
+    flex-wrap: wrap;
+  }
+  .ni-flex-grow{
+    flex-grow: 1;
   }
 }
diff --git a/src/app/components/notification-item/notification-item.component.ts b/src/app/components/notification-item/notification-item.component.ts
index dd116e788..aa15ddf91 100644
--- a/src/app/components/notification-item/notification-item.component.ts
+++ b/src/app/components/notification-item/notification-item.component.ts
@@ -2,6 +2,7 @@ import { Component, Input, Inject, Output, EventEmitter } from '@angular/core';
 import { NotificationService } from 'sunbird-sdk';
 
 import { InteractSubtype } from '@app/services/telemetry-constants';
+import {NotificationService as LocalNotification} from '@app/services';
 
 @Component({
   selector: 'app-notification-item',
@@ -14,7 +15,10 @@ export class NotificationItemComponent {
   @Output() notificationClick = new EventEmitter();
   @Output() generateNotification = new EventEmitter();
   @Input('itemData') itemData;
-  constructor(@Inject('NOTIFICATION_SERVICE') private notificationService: NotificationService) {
+  constructor(
+      @Inject('NOTIFICATION_SERVICE') private notificationService: NotificationService,
+      private notificationDelegate: LocalNotification
+  ) {
   }
 
   toggleExpand() {
@@ -37,5 +41,9 @@ export class NotificationItemComponent {
     this.notificationService.updateNotification(this.itemData).subscribe((status) => {
       this.notificationClick.emit();
     });
+
+    this.notificationDelegate.notificationId = this.itemData.id || '';
+    this.notificationDelegate.setNotificationParams(this.itemData);
+    this.notificationDelegate.handleNotification();
   }
 }
diff --git a/src/app/components/pb-horizontal/pb-horizontal.component.scss b/src/app/components/pb-horizontal/pb-horizontal.component.scss
index 010d3a077..3961b0999 100644
--- a/src/app/components/pb-horizontal/pb-horizontal.component.scss
+++ b/src/app/components/pb-horizontal/pb-horizontal.component.scss
@@ -17,8 +17,8 @@
     .progress-outer-course{	
        width: 100%;	
        text-align: center;	
-       background-color:#d8d8d8;	
-       color: #FFFFFF;
+       background-color: map-get($colors, light_silver);	
+       color: map-get($colors, white);
     }
     .progress-inner-onboard {
         min-width: 0;
diff --git a/src/app/components/popups/account-recovery-id/account-recovery-id-popup.component.html b/src/app/components/popups/account-recovery-id/account-recovery-id-popup.component.html
index a2f498866..74dc4be47 100644
--- a/src/app/components/popups/account-recovery-id/account-recovery-id-popup.component.html
+++ b/src/app/components/popups/account-recovery-id/account-recovery-id-popup.component.html
@@ -68,10 +68,10 @@ <h6 class="M0" *ngIf="!recoveryEmail?.length && !recoveryPhone?.length">{{'ADD_R
             </form>
         </div>
         <ion-row class="custom-shadow">
-            <ion-col padding>
+            <ion-col class="ion-padding">
                 <ion-button expand="block" fill="outline" (click)="cancel()">{{ 'CANCEL' | translate }} </ion-button>
             </ion-col>
-            <ion-col padding>
+            <ion-col class="ion-padding">
                 <ion-button expand="block" type="submit" *ngIf="recoveryIdType === RecoveryType.EMAIL"
                     (click)="submitRecoveryId(RecoveryType.EMAIL)" [disabled]="!recoveryEmailForm.valid">
                     {{ 'BTN_SUBMIT' | translate }}</ion-button>
diff --git a/src/app/components/popups/account-recovery-id/account-recovery-id-popup.component.scss b/src/app/components/popups/account-recovery-id/account-recovery-id-popup.component.scss
index 79e2a5a77..a69c0326e 100644
--- a/src/app/components/popups/account-recovery-id/account-recovery-id-popup.component.scss
+++ b/src/app/components/popups/account-recovery-id/account-recovery-id-popup.component.scss
@@ -1,8 +1,9 @@
 @import "src/assets/styles/variables";
 @import "src/assets/styles/_custom-mixins.scss";
+@import "src/assets/styles/_variables.scss";
 
 .merged-input-container {
-    border: 1px solid #4a90e2;
+    border: 1px solid $form-input-border-active-color;
     display: flex;
     flex: 1 1 auto;
     border-radius: 4px;
@@ -30,7 +31,7 @@
 }
 
 .ar-header {
-    background-color: map-get($colors, primary);
+    background-color: #{$blue};
     color: map-get($colors, white);
     padding: 16px 0;
 }
@@ -42,4 +43,17 @@
 
 .custom-shadow {
     box-shadow: 0 -5px 5px -5px rgba(0, 0, 0, 0.2);
+}
+
+ion-button{
+    --background: #{$blue} !important;
+    color: map-get($colors, white);
+    --background-hover: #{$blue} !important;
+    --background-activated: #{$blue} !important;
+}
+
+ion-button[fill="outline"]{
+    --background: map-get($colors, white) !important;
+    color: #{$blue};
+    --border-color: #{$blue};
 }
\ No newline at end of file
diff --git a/src/app/components/popups/account-recovery-id/account-recovery-id-popup.component.spec.ts b/src/app/components/popups/account-recovery-id/account-recovery-id-popup.component.spec.ts
index 5f614847a..11e9241f9 100644
--- a/src/app/components/popups/account-recovery-id/account-recovery-id-popup.component.spec.ts
+++ b/src/app/components/popups/account-recovery-id/account-recovery-id-popup.component.spec.ts
@@ -70,7 +70,22 @@ describe('AccountRecoveryInfoComponent', () => {
         // act
         accountRecoveryInfoComponent.ngOnInit();
         // assert
-        expect(accountRecoveryInfoComponent.profile).toEqual({ uid: '0123456789' });
+        expect(accountRecoveryInfoComponent['profile']).toEqual({ uid: '0123456789' });
+        expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+            ImpressionType.VIEW, '',
+            PageId.RECOVERY_ACCOUNT_ID_POPUP,
+            Environment.USER
+        );
+        expect(mockMenuController.enable).toHaveBeenCalledWith(false);
+    });
+
+    it('should generate IMPRESSION telemtry on ngOnInit for recovery mail', () => {
+        // arrange
+        accountRecoveryInfoComponent.recoveryPhone = '';
+        // act
+        accountRecoveryInfoComponent.ngOnInit();
+        // assert
+        expect(accountRecoveryInfoComponent['profile']).toEqual({ uid: '0123456789' });
         expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
             ImpressionType.VIEW, '',
             PageId.RECOVERY_ACCOUNT_ID_POPUP,
@@ -87,7 +102,7 @@ describe('AccountRecoveryInfoComponent', () => {
 
         } as any;
 
-        accountRecoveryInfoComponent.unregisterBackButton = {
+        accountRecoveryInfoComponent['unregisterBackButton'] = {
             unsubscribe: jest.fn(),
         } as any;
 
@@ -99,7 +114,7 @@ describe('AccountRecoveryInfoComponent', () => {
 
     it('should enable MenuDrawer and unsubscribe back function', () => {
         // arrange
-        accountRecoveryInfoComponent.unregisterBackButton = {
+        accountRecoveryInfoComponent['unregisterBackButton'] = {
             unsubscribe: jest.fn(),
 
         } as any;
@@ -107,7 +122,16 @@ describe('AccountRecoveryInfoComponent', () => {
         accountRecoveryInfoComponent.ionViewWillLeave();
         // assert
         expect(mockMenuController.enable).toHaveBeenCalledWith(true);
-        expect(accountRecoveryInfoComponent.unregisterBackButton.unsubscribe).toHaveBeenCalled();
+        expect(accountRecoveryInfoComponent['unregisterBackButton'].unsubscribe).toHaveBeenCalled();
+    });
+
+    it('should enable MenuDrawer and should not unsubscribe back function', () => {
+        // arrange
+        accountRecoveryInfoComponent['unregisterBackButton'] = undefined;
+        // act
+        accountRecoveryInfoComponent.ionViewWillLeave();
+        // assert
+        expect(mockMenuController.enable).toHaveBeenCalledWith(true);
     });
 
     it('should update the server profile successfully', (done) => {
@@ -183,6 +207,23 @@ describe('AccountRecoveryInfoComponent', () => {
         expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('INTERNET_CONNECTIVITY_NEEDED');
     });
 
+    it('should update the server profile successfully and handle any response from updateServerProfile', (done) => {
+        // arrange
+        accountRecoveryInfoComponent.recoveryPhone = '';
+        mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+        accountRecoveryInfoComponent.recoveryEmailForm = { value: { email: 'abc@email.com' } } as any;
+        mockProfileService.updateServerProfile = jest.fn(() => of(
+            { response: 'SUCCESS1' } as any));
+        // act
+        accountRecoveryInfoComponent.submitRecoveryId(accountRecoveryInfoComponent.RecoveryType.EMAIL);
+        // assert
+        setTimeout(() => {
+            expect(mockPopoverCtrl.dismiss).not.toHaveBeenCalledWith({ isEdited: true });
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).not.toHaveBeenCalled();
+            done();
+        }, 1);
+    });
+
     it('should dismiss the popup when cancel is clicked', () => {
         // arrange
         // act
diff --git a/src/app/components/popups/consent-pii-popup/consent-pii-popup.component.html b/src/app/components/popups/consent-pii-popup/consent-pii-popup.component.html
new file mode 100644
index 000000000..abdc2ab36
--- /dev/null
+++ b/src/app/components/popups/consent-pii-popup/consent-pii-popup.component.html
@@ -0,0 +1,52 @@
+<ion-header class="sb-popover-header">
+    <ion-toolbar class="sb-popover-toolbar">
+        <ion-title class="sb-popover-title">{{'PROFILE_DETAILS_TITLE' | translate}}
+        </ion-title>
+    </ion-toolbar>
+</ion-header>
+<div id="main-content">
+    <div class="consent-popover-info">
+        <div class="flex-container">
+            <div class="body" *ngIf="consentForm.length">
+                <div *ngFor="let element of consentForm">
+                    <p class="profile-info-section"><span>{{element.key}}</span><span
+                            class="profile-info">{{element.value}}</span></p>
+                </div>
+
+            </div>
+            <div class="footer">
+                <div>
+                    <p>
+                        <span>
+                            <ion-icon name="information-circle" color="#333333">
+                            </ion-icon>
+                        </span>
+                        <span style="margin-left: 5px;">{{'FRMELEMNTS_LBL_CONSENT_POPUP_INFO' | translate}}</span>
+                    </p>
+                </div>
+                <div class="cr-input-primary" lines="none">
+                    <span>
+                        <ion-checkbox class="cr-terms-checkbox" (ionChange)="changeEvent($event)"></ion-checkbox>
+                    </span>
+                    <span>
+                        <p class="cr-terms-checkbox-label" *ngIf="!isSSOUser">
+                            <span>{{'AGREE_TO_SHARE_PROFILE_DETAILS' | translate}}</span>
+                            <span (click)="openTermsOfUse()" class="terms-info">{{'INSTANCE_TERMS_OF_USE' | translate: {'app_name': appName} }}</span>
+                        </p>
+                        <p class="cr-terms-checkbox-label" *ngIf="isSSOUser">
+                            <span>{{'SELF_DECLARE_TEACHER_TNC' | translate: {'%appName': appName} }}</span>
+                            <span (click)="openTermsOfUse()" class="terms-info">{{'PRIVACY_POLICY' | translate }}</span>
+                        </p>
+                    </span>
+                </div>
+                <div class="btn-info" *ngIf="!isSSOUser">
+                    <button class="save-changes-not-agree" (click)="dontShare()">{{'FRMELEMNTS_BTN_DONOT_SHARE' | translate}}</button>
+                    <button class="save-changes" (click)="share()" [disabled]="!isAgreed" [ngClass]="!isAgreed ?  'share-disabled' : null">{{'SHARE' | translate}}</button>
+                </div>
+                <div class="btn-info" *ngIf="isSSOUser">
+                    <button class="save-changes" (click)="share()" [disabled]="!isAgreed" [ngClass]="!isAgreed ?  'share-disabled' : null">{{'CONTINUE' | translate}}</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/components/popups/consent-pii-popup/consent-pii-popup.component.scss b/src/app/components/popups/consent-pii-popup/consent-pii-popup.component.scss
new file mode 100644
index 000000000..ef2fc03ea
--- /dev/null
+++ b/src/app/components/popups/consent-pii-popup/consent-pii-popup.component.scss
@@ -0,0 +1,127 @@
+@import "src/assets/styles/base/_variables.scss";
+@import "src/assets/styles/_variables.scss";
+@import "src/assets/styles/_custom-mixins.scss";
+
+.cr-terms-checkbox-label{
+  padding-left: 5px;
+}
+
+.cr-terms-checkbox{
+  --background-checked: #{$blue};
+  --border-color: #{$blue};
+  --border-radius: 4px;
+  --border-width: 1px;
+  --border-color-checked:#{$blue};
+}
+.cr-input-primary {
+  display: inline-flex;
+}
+
+.btn-label {
+  float: right;
+  display: inline-flex;
+}
+
+#main-content {
+  overflow-y: scroll;
+  background: map-get($colors, white);
+}
+
+.consent-popover-info {  
+  overflow: hidden;
+  padding: 14px;
+}
+
+.flex-container {
+  width: 100%;
+  height: 100%;
+  
+  display: flex;
+  flex-direction: column;
+}
+
+.header {  
+  flex-grow: 0;
+  flex-shrink: 0;
+  color: #222222;
+  font-family: "Noto Sans", sans-serif;
+  font-size: 20px;
+  letter-spacing: 0;
+  font-weight: bold;
+  margin-bottom: 16px;
+  @include ltr() {
+    text-align: right
+  }
+
+  @include rtl() {
+    text-align:left;
+  }
+}
+
+.body {
+  
+  display: block;
+  
+  flex-grow: 1;
+  flex-shrink: 1;
+  height: 38vh;
+  overflow-y: scroll;
+}
+
+.footer {
+  flex-grow: 0;
+  flex-shrink: 0;
+}
+.save-changes{
+  color: white;
+  background-color: $blue;
+  font-size: 16px;
+  padding: 8px 0;
+  margin-left: 18px;
+  border: 2px solid $blue;
+  width: 45%;
+}
+.save-changes-not-agree{
+  color: $blue;
+  background-color: white;
+  font-size: 16px;
+  padding: 8px 0;
+  border: 2px solid $blue;
+  width: 45%;
+  margin-left: 10px;
+}
+.btn-info{
+  padding: 12px;
+  text-align: center;
+}
+
+.profile-info{
+  color: map-get($colors, granite_gray);
+  font-family: "Noto Sans", sans-serif;
+  font-size: 14px;
+  letter-spacing: 0;
+}
+
+
+.profile-info-section{
+  display: grid;
+  grid-template-columns: 100px 227px;
+}
+
+.share-disabled{
+  opacity: 0.5 !important;
+  cursor: default;
+}
+
+.terms-info{
+  color: $blue
+}
+
+ion-icon {
+  @include ltr {
+    float: right !important;
+  }
+  @include rtl {
+    float: left !important;
+  }
+}
\ No newline at end of file
diff --git a/src/app/components/popups/consent-pii-popup/consent-pii-popup.component.spec.ts b/src/app/components/popups/consent-pii-popup/consent-pii-popup.component.spec.ts
new file mode 100644
index 000000000..86071f5a0
--- /dev/null
+++ b/src/app/components/popups/consent-pii-popup/consent-pii-popup.component.spec.ts
@@ -0,0 +1,342 @@
+import { ConsentPiiPopupComponent } from './consent-pii-popup.component';
+import { NavParams, PopoverController } from '@ionic/angular';
+import { CommonUtilService, FormAndFrameworkUtilService, AppGlobalService, UtilityService } from '../../../../services';
+
+describe('ConsentPiiPopupComponent', () => {
+    let consentPiiPopupComponent: ConsentPiiPopupComponent;
+    const mockAppGlobalService: Partial<AppGlobalService> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        getAppName: jest.fn(() => Promise.resolve('sunbird'))
+    };
+    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {};
+    const mockPopOverCtrl: Partial<PopoverController> = {};
+    const mockUtilityService: Partial<UtilityService> = {};
+    const mockNavParams: Partial<NavParams> = {
+        get: jest.fn()
+    };
+
+    beforeAll(() => {
+        consentPiiPopupComponent = new ConsentPiiPopupComponent(
+            mockPopOverCtrl as PopoverController,
+            mockCommonUtilService as CommonUtilService,
+            mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
+            mockAppGlobalService as AppGlobalService,
+            mockUtilityService as UtilityService,
+            mockNavParams as NavParams
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should be create a instance of consentPiiPopupComponent', () => {
+        expect(consentPiiPopupComponent).toBeTruthy();
+    });
+
+    it('should return consentForm for user name', (done) => {
+        // arrange
+        const profile = {
+            serverProfile: {
+                firstName: 'sample-User-name',
+                id: 'sample-user-id'
+            }
+        };
+        mockAppGlobalService.getCurrentUser = jest.fn(() => profile);
+        mockFormAndFrameworkUtilService.getConsentFormConfig = jest.fn(() => Promise.resolve([{
+            templateOptions: {
+                placeHolder: JSON.stringify({ en: 'User name' }),
+                dataSrc: {
+                    marker: 'SERVER_PROFILE',
+                    params: {
+                        categoryCode: 'firstName'
+                    }
+                }
+            }
+        }]));
+        mockCommonUtilService.getTranslatedValue = jest.fn(() => 'User name');
+        // act
+        consentPiiPopupComponent.ionViewWillEnter();
+        // assert
+        setTimeout(() => {
+            expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalled();
+            expect(mockFormAndFrameworkUtilService.getConsentFormConfig).toHaveBeenCalled();
+            expect(mockCommonUtilService.getTranslatedValue).toHaveBeenCalled();
+            expect(consentPiiPopupComponent.consentForm).toStrictEqual([{key: 'User name', value: 'sample-User-name'}]);
+            done();
+        }, 0);
+    });
+
+    it('should return consentForm if requird properties is empty', (done) => {
+        // arrange
+        consentPiiPopupComponent.consentForm = [];
+        const profile = {
+            serverProfile: {
+                firstName: 'sample-User-name',
+                id: 'sample-user-id'
+            }
+        };
+        mockAppGlobalService.getCurrentUser = jest.fn(() => profile);
+        mockFormAndFrameworkUtilService.getConsentFormConfig = jest.fn(() => Promise.resolve([{
+            templateOptions: {
+                placeHolder: JSON.stringify({ en: 'Mobile' }),
+                dataSrc: {
+                    marker: 'SERVER_PROFILE',
+                    params: {
+                        categoryCode: 'mobile'
+                    }
+                }
+            }
+        }]));
+        mockCommonUtilService.getTranslatedValue = jest.fn(() => 'Mobile');
+        // act
+        consentPiiPopupComponent.ionViewWillEnter();
+        // assert
+        setTimeout(() => {
+            expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalled();
+            expect(mockFormAndFrameworkUtilService.getConsentFormConfig).toHaveBeenCalled();
+            expect(mockCommonUtilService.getTranslatedValue).toHaveBeenCalled();
+            expect(consentPiiPopupComponent.consentForm).toStrictEqual([{key: 'Mobile', value: '-'}]);
+            done();
+        }, 0);
+    });
+
+    it('should return consentForm for location', (done) => {
+        // arrange
+        consentPiiPopupComponent.consentForm = [];
+        const profile = {
+            serverProfile: {
+                firstName: 'sample-User-name',
+                id: 'sample-user-id',
+                userLocations: [{type: 'state', name: 'sample-state'}]
+            }
+        };
+        mockAppGlobalService.getCurrentUser = jest.fn(() => profile);
+        mockFormAndFrameworkUtilService.getConsentFormConfig = jest.fn(() => Promise.resolve([{
+            code: 'state',
+            templateOptions: {
+                placeHolder: JSON.stringify({ en: 'State' }),
+                dataSrc: {
+                    marker: 'SERVER_PROFILE_LOCATIONS',
+                    params: {
+                        categoryCode: 'name'
+                    }
+                }
+            }
+        }]));
+        mockCommonUtilService.getTranslatedValue = jest.fn(() => 'State');
+        // act
+        consentPiiPopupComponent.ionViewWillEnter();
+        // assert
+        setTimeout(() => {
+            expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalled();
+            expect(mockFormAndFrameworkUtilService.getConsentFormConfig).toHaveBeenCalled();
+            expect(mockCommonUtilService.getTranslatedValue).toHaveBeenCalled();
+            expect(consentPiiPopupComponent.consentForm).toStrictEqual([{key: 'State', value: 'sample-state'}]);
+            done();
+        }, 0);
+    });
+
+    it('should return consentForm of location if location type is not matched', (done) => {
+        // arrange
+        consentPiiPopupComponent.consentForm = [];
+        const profile = {
+            serverProfile: {
+                firstName: 'sample-User-name',
+                id: 'sample-user-id',
+                userLocations: [{type: 'state', name: 'sample-state'}]
+            }
+        };
+        mockAppGlobalService.getCurrentUser = jest.fn(() => profile);
+        mockFormAndFrameworkUtilService.getConsentFormConfig = jest.fn(() => Promise.resolve([{
+            code: 'dist',
+            templateOptions: {
+                placeHolder: JSON.stringify({ en: 'State' }),
+                dataSrc: {
+                    marker: 'SERVER_PROFILE_LOCATIONS',
+                    params: {
+                        categoryCode: 'name'
+                    }
+                }
+            }
+        }]));
+        mockCommonUtilService.getTranslatedValue = jest.fn(() => 'State');
+        // act
+        consentPiiPopupComponent.ionViewWillEnter();
+        // assert
+        setTimeout(() => {
+            expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalled();
+            expect(mockFormAndFrameworkUtilService.getConsentFormConfig).toHaveBeenCalled();
+            expect(mockCommonUtilService.getTranslatedValue).toHaveBeenCalled();
+            expect(consentPiiPopupComponent.consentForm).toStrictEqual([{key: 'State', value: '-'}]);
+            done();
+        }, 0);
+    });
+
+    it('should return empty consentForm for location if userlocation is empty', (done) => {
+        // arrange
+        consentPiiPopupComponent.consentForm = [];
+        const profile = {
+            serverProfile: {
+                firstName: 'sample-User-name',
+                id: 'sample-user-id',
+                userLocations: []
+            }
+        };
+        mockAppGlobalService.getCurrentUser = jest.fn(() => profile);
+        mockFormAndFrameworkUtilService.getConsentFormConfig = jest.fn(() => Promise.resolve([{
+            code: 'state',
+            templateOptions: {
+                placeHolder: JSON.stringify({ en: 'State' }),
+                dataSrc: {
+                    marker: 'SERVER_PROFILE_LOCATIONS',
+                    params: {
+                        categoryCode: 'state'
+                    }
+                }
+            }
+        }]));
+        mockCommonUtilService.getTranslatedValue = jest.fn(() => 'State');
+        // act
+        consentPiiPopupComponent.ionViewWillEnter();
+        // assert
+        setTimeout(() => {
+            expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalled();
+            expect(mockFormAndFrameworkUtilService.getConsentFormConfig).toHaveBeenCalled();
+            expect(mockCommonUtilService.getTranslatedValue).toHaveBeenCalled();
+            expect(consentPiiPopupComponent.consentForm).toStrictEqual([{key: 'State', value: '-'}]);
+            done();
+        }, 0);
+    });
+
+    it('should return empty consentForm for default value', (done) => {
+        // arrange
+        consentPiiPopupComponent.consentForm = [];
+        const profile = {
+            serverProfile: {
+                firstName: 'sample-User-name',
+                id: 'sample-user-id',
+                userLocations: []
+            }
+        };
+        mockAppGlobalService.getCurrentUser = jest.fn(() => profile);
+        mockFormAndFrameworkUtilService.getConsentFormConfig = jest.fn(() => Promise.resolve([{
+            code: 'class',
+            templateOptions: {
+                placeHolder: JSON.stringify({ en: 'Class' }),
+                dataSrc: {
+                    marker: 'SERVER_PROFILE_Data',
+                    params: {
+                        categoryCode: 'class'
+                    }
+                }
+            }
+        }]));
+        mockCommonUtilService.getTranslatedValue = jest.fn(() => 'Class');
+        // act
+        consentPiiPopupComponent.ionViewWillEnter();
+        // assert
+        setTimeout(() => {
+            expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalled();
+            expect(mockFormAndFrameworkUtilService.getConsentFormConfig).toHaveBeenCalled();
+            expect(mockCommonUtilService.getTranslatedValue).toHaveBeenCalled();
+            expect(consentPiiPopupComponent.consentForm).toStrictEqual([{key: 'Class', value: '-'}]);
+            done();
+        }, 0);
+    });
+
+    it('should close the popUp for clicked on dont share button', () => {
+        mockPopOverCtrl.dismiss = jest.fn(() => Promise.resolve(true));
+        consentPiiPopupComponent.dontShare();
+        expect(mockPopOverCtrl.dismiss).toHaveBeenCalled();
+    });
+
+    it('should submit profile details and close the popUp for clicked on share button', () => {
+        mockPopOverCtrl.dismiss = jest.fn(() => Promise.resolve(true));
+        mockCommonUtilService.showToast = jest.fn();
+        consentPiiPopupComponent.share();
+        expect(mockPopOverCtrl.dismiss).toHaveBeenCalled();
+    });
+
+    it('should return to terms of use page', (done) => {
+        // arrange
+        mockUtilityService.getBuildConfigValue = jest.fn(() => Promise.resolve('sample-url'));
+        // act
+        consentPiiPopupComponent.openTermsOfUse();
+        // assert
+        setTimeout(() => {
+            expect(mockUtilityService.getBuildConfigValue).toHaveBeenCalledWith('TOU_BASE_URL');
+            done();
+        }, 0);
+    });
+
+    it('should return button disable and enable thing', () => {
+        const event = {
+            detail: {
+                checked: true
+            }
+        };
+        consentPiiPopupComponent.changeEvent(event);
+        expect(consentPiiPopupComponent.isAgreed).toBeTruthy();
+    });
+
+    it('should return button disable and enable thing', () => {
+        const event = {
+            detail: {
+                checked: false
+            }
+        };
+        consentPiiPopupComponent.changeEvent(event);
+        expect(consentPiiPopupComponent.isAgreed).toBeFalsy();
+    });
+
+    describe('converDataSrcToObject', () => {
+        it('should return maskedEmail for empty email', () => {
+            const ele = {
+                code: 'emailId',
+                templateOptions: {
+                    dataSrc: {
+                        marker: 'SERVER_PROFILE',
+                        params: {
+                            categoryCode: 'declared-email'
+                        }
+                    }
+                }
+            };
+            consentPiiPopupComponent.profile = {
+                serverProfile: {
+                    declarations: [],
+                    maskedEmail: 'sample@sample.com'
+                }
+            };
+            // act
+            const data = consentPiiPopupComponent.converDataSrcToObject(ele);
+            // assert
+            expect(data).toBe('sample@sample.com');
+        });
+
+        it('should return maskedphone for empty phone', () => {
+            const ele = {
+                code: 'phoneNumber',
+                templateOptions: {
+                    dataSrc: {
+                        marker: 'SERVER_PROFILE',
+                        params: {
+                            categoryCode: 'declared-phone'
+                        }
+                    }
+                }
+            };
+            consentPiiPopupComponent.profile = {
+                serverProfile: {
+                    declarations: [],
+                    maskedPhone: '9999999999'
+                }
+            };
+            // act
+            const data = consentPiiPopupComponent.converDataSrcToObject(ele);
+            // assert
+            expect(data).toBe('9999999999');
+        });
+    });
+});
diff --git a/src/app/components/popups/consent-pii-popup/consent-pii-popup.component.ts b/src/app/components/popups/consent-pii-popup/consent-pii-popup.component.ts
new file mode 100644
index 000000000..69c961891
--- /dev/null
+++ b/src/app/components/popups/consent-pii-popup/consent-pii-popup.component.ts
@@ -0,0 +1,117 @@
+import { Component } from '@angular/core';
+import { NavParams, PopoverController } from '@ionic/angular';
+import { CommonUtilService, AppGlobalService, UtilityService } from '@app/services';
+import {FormAndFrameworkUtilService} from '../../../../services/formandframeworkutil.service';
+import { RouterLinks } from '@app/app/app.constant';
+
+@Component({
+    selector: 'app-consent-pii-popup',
+    templateUrl: './consent-pii-popup.component.html',
+    styleUrls: ['./consent-pii-popup.component.scss'],
+})
+
+
+export class ConsentPiiPopupComponent {
+    profile: any;
+    consentForm = [];
+    isAgreed = false;
+    appName: string;
+    isSSOUser = false;
+    constructor(
+        private popOverCtrl: PopoverController,
+        private commonUtilService: CommonUtilService,
+        private formAndFrameworkUtilService: FormAndFrameworkUtilService,
+        private appGlobalService: AppGlobalService,
+        private utilityService: UtilityService,
+        private navParams: NavParams,
+    ) {
+        this.isSSOUser = this.navParams.get('isSSOUser');
+    }
+    async ionViewWillEnter() {
+        this.profile = this.appGlobalService.getCurrentUser();
+        const profileKeys = await this.formAndFrameworkUtilService.getConsentFormConfig();
+        profileKeys.forEach(element => {
+            this.consentForm.push({
+                key: this.commonUtilService.getTranslatedValue(element.templateOptions.placeHolder,
+                    JSON.parse(element.templateOptions.placeHolder)['en']),
+                value: this.converDataSrcToObject(element)
+            });
+        });
+        this.commonUtilService.getAppName().then((res) => { this.appName = res; });
+    }
+    closePopover(data) {
+        const request = {
+            data,
+            userId: this.profile.uid
+        };
+        this.popOverCtrl.dismiss(request);
+    }
+    dontShare() {
+        this.closePopover(false);
+    }
+    share() {
+        this.closePopover(true);
+    }
+
+    converDataSrcToObject(ele) {
+        const dataSrc = ele.templateOptions.dataSrc;
+        switch (dataSrc.marker) {
+            case 'SERVER_PROFILE':
+                if (ele.code === 'emailId' || ele.code === 'phoneNumber') {
+                    if (ele.code === 'emailId') {
+                        return this.profile.serverProfile['email'] ?  this.profile.serverProfile['email'] :
+                        (this.profile.serverProfile['maskedEmail'] ? this.profile.serverProfile['maskedEmail'] : '-');
+                    } else {
+                      return this.profile.serverProfile['phone'] ?  this.profile.serverProfile['phone'] :
+                      (this.profile.serverProfile['maskedPhone'] ? this.profile.serverProfile['maskedPhone'] : '-');
+                    }
+                  } else {
+                    return this.profile.serverProfile[dataSrc.params.categoryCode] ?
+                    this.profile.serverProfile[dataSrc.params.categoryCode] : '-';
+                  }
+            case 'SERVER_PROFILE_LOCATIONS':
+                let location = '-';
+                if (this.profile.serverProfile.userLocations && this.profile.serverProfile.userLocations.length) {
+                    this.profile.serverProfile.userLocations.forEach(element => {
+                        if (element.type === ele.code) {
+                            location = element.name;
+                        } else if (ele.code === 'schoolId' && element.type === 'school' ) {
+                            location = element.code;
+                        }
+                    });
+                }
+                return location;
+                case 'SERVER_PROFILE_DECLARED':
+                    if (this.profile.serverProfile.declarations.length && this.profile.serverProfile.declarations[0].info) {
+                       return this.profile.serverProfile.declarations[0].info[dataSrc.params.categoryCode] ?
+                       this.profile.serverProfile.declarations[0].info[dataSrc.params.categoryCode] : '-';
+                    } else if (ele.code === 'emailId' || ele.code === 'phoneNumber') {
+                      if (ele.code === 'emailId') {
+                          return this.profile.serverProfile['maskedEmail'] ? this.profile.serverProfile['maskedEmail'] : '-';
+                      } else {
+                        return this.profile.serverProfile['maskedPhone'] ? this.profile.serverProfile['maskedPhone'] : '-';
+                      }
+                    }
+                    return '-';
+            default:
+                return '-';
+        }
+    }
+
+    async openTermsOfUse() {
+        const baseUrl = await this.utilityService.getBuildConfigValue('TOU_BASE_URL');
+        const url = baseUrl + RouterLinks.TERM_OF_USE;
+        const options
+            = 'hardwareback=yes,clearcache=no,zoom=no,toolbar=yes,disallowoverscroll=yes';
+
+        (window as any).cordova.InAppBrowser.open(url, '_blank', options);
+    }
+
+    changeEvent(event) {
+        if (event.detail.checked) {
+            this.isAgreed = true;
+        } else {
+            this.isAgreed = false;
+        }
+    }
+}
diff --git a/src/app/components/popups/copy-trace-id-popup.ts/copy-trace-id-popup.component.html b/src/app/components/popups/copy-trace-id-popup.ts/copy-trace-id-popup.component.html
new file mode 100644
index 000000000..974672845
--- /dev/null
+++ b/src/app/components/popups/copy-trace-id-popup.ts/copy-trace-id-popup.component.html
@@ -0,0 +1,21 @@
+<ion-header class="sb-popover-header">
+    <ion-toolbar class="sb-popover-toolbar">
+      <ion-title class="sb-popover-title">{{'COPY_TRACE_ID' | translate}}
+        <ion-icon name="close" class="sb-modal-close" (click)="close()"></ion-icon>
+      </ion-title>
+    </ion-toolbar>
+  </ion-header>
+    
+  <ion-content class="sb-popover-container ion-no-padding">
+    <div class="sb-popover-items">
+        <div class="sb-popover-content-details">
+            {{'COPY_TRACE_ID_DESC' | translate}}
+        </div>
+    </div>
+  </ion-content>
+  
+  <ion-footer>
+    <div class="sb-popover-footer">
+      <button class="sb-popover-action-btn popover-color" (click)="copy()">{{'COPY' | translate}}</button>
+    </div>
+  </ion-footer>
\ No newline at end of file
diff --git a/src/app/user-and-groups/group-detail-nav-popover/group-detail-nav-popover.scss b/src/app/components/popups/copy-trace-id-popup.ts/copy-trace-id-popup.component.scss
similarity index 100%
rename from src/app/user-and-groups/group-detail-nav-popover/group-detail-nav-popover.scss
rename to src/app/components/popups/copy-trace-id-popup.ts/copy-trace-id-popup.component.scss
diff --git a/src/app/components/popups/copy-trace-id-popup.ts/copy-trace-id-popup.component.ts b/src/app/components/popups/copy-trace-id-popup.ts/copy-trace-id-popup.component.ts
new file mode 100644
index 000000000..a7972a9a2
--- /dev/null
+++ b/src/app/components/popups/copy-trace-id-popup.ts/copy-trace-id-popup.component.ts
@@ -0,0 +1,32 @@
+import { Component } from '@angular/core';
+import { NavParams, PopoverController } from '@ionic/angular';
+import { SocialSharing } from '@ionic-native/social-sharing/ngx';
+
+@Component({
+  selector: 'app-copy-trace-id-popover',
+  templateUrl: './copy-trace-id-popup.component.html'
+})
+export class CopyTraceIdPopoverComponent {
+
+  traceId: string;
+
+  constructor(
+    private popOverCtrl: PopoverController,
+    private socialSharing: SocialSharing,
+    private navParams: NavParams
+  ) { }
+
+  ionViewWillEnter() {
+    this.traceId = this.navParams.get('traceId');
+  }
+
+  close() {
+    this.popOverCtrl.dismiss();
+  }
+
+  copy(){
+    this.popOverCtrl.dismiss();
+    this.socialSharing.share(this.traceId);
+  }
+
+}
diff --git a/src/app/components/popups/copy-trace-id-popup.ts/copy-trace-id-popup.spec.ts b/src/app/components/popups/copy-trace-id-popup.ts/copy-trace-id-popup.spec.ts
new file mode 100644
index 000000000..f40e6634e
--- /dev/null
+++ b/src/app/components/popups/copy-trace-id-popup.ts/copy-trace-id-popup.spec.ts
@@ -0,0 +1,60 @@
+import { PopoverController, NavParams } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { CopyTraceIdPopoverComponent } from './copy-trace-id-popup.component';
+import { CommonUtilService, UtilityService } from '@app/services';
+import { Location } from '@angular/common';
+import { SocialSharing } from '@ionic-native/social-sharing/ngx';
+
+describe('CopyTraceIdPopoverComponent', () => {
+    let copyTraceIdPopoverComponent: CopyTraceIdPopoverComponent;
+
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+    };
+
+    const mockPopOverController: Partial<PopoverController> = {
+        dismiss: jest.fn()
+    };
+
+    const mockNavParams: Partial<NavParams> = {};
+    const mockSocialSharing: Partial<SocialSharing> = {};
+    const mockLocation: Partial<Location> = {
+        back: jest.fn()
+    };
+
+    beforeAll(() => {
+        copyTraceIdPopoverComponent = new CopyTraceIdPopoverComponent(
+            mockPopOverController as PopoverController,
+            mockSocialSharing as SocialSharing,
+            mockNavParams as NavParams,
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create a instance of copyTraceIdPopoverComponent', () => {
+        expect(copyTraceIdPopoverComponent).toBeTruthy();
+    });
+
+    it('should dismiss the popup on closePopOver', () => {
+        // arrange
+        // act
+        copyTraceIdPopoverComponent.close();
+        // assert
+        expect(mockPopOverController.dismiss).toHaveBeenCalledWith();
+    });
+
+    it('should dismiss the popup and call social share on copy', () => {
+        // arrange
+        mockSocialSharing.share = jest.fn()
+        copyTraceIdPopoverComponent.traceId = 'some_trace_id'
+        // act
+        copyTraceIdPopoverComponent.copy();
+        // assert
+        expect(mockPopOverController.dismiss).toBeCalled();
+        expect(mockSocialSharing.share).toHaveBeenCalledWith('some_trace_id');
+    });
+    
+
+});
diff --git a/src/app/components/popups/dialog-popup/dialog-popup.component.html b/src/app/components/popups/dialog-popup/dialog-popup.component.html
index 397557dcc..f49aa05fc 100644
--- a/src/app/components/popups/dialog-popup/dialog-popup.component.html
+++ b/src/app/components/popups/dialog-popup/dialog-popup.component.html
@@ -15,7 +15,7 @@ <h5 class="alert-header-content"> {{title}} </h5>
   <ion-row class="alert-content-body"> {{body}} </ion-row>
   
   <ion-row>
-    <ion-button expand="full" class="alert-button" (click)="redirectToPlaystore()" text-capitalize> {{buttonText}} </ion-button>
+    <ion-button expand="full" class="alert-button ion-text-capitalize" (click)="redirectToPlaystore()"> {{buttonText}} </ion-button>
   </ion-row>
   </ion-content>
   
\ No newline at end of file
diff --git a/src/app/components/popups/dialog-popup/dialog-popup.component.scss b/src/app/components/popups/dialog-popup/dialog-popup.component.scss
index 3a81d32f3..479eedc62 100644
--- a/src/app/components/popups/dialog-popup/dialog-popup.component.scss
+++ b/src/app/components/popups/dialog-popup/dialog-popup.component.scss
@@ -1,4 +1,5 @@
 @import "src/assets/styles/variables";
+@import "src/assets/styles/_variables.scss";
 .popover-alert .popover-content {
     margin: 0;
     width: 100% !important;
@@ -11,39 +12,36 @@
     transform-origin: bottom -100% !important;
     transform: translateY(0) !important;
   }
-  
+
   .popover-alert ion-backdrop {
     background-color: map-get($colors, black) !important;
     opacity: 0.4 !important;
   }
-  
+
   .popover-alert .close-button{
-      background-color: #ffffff;
+      background-color: map-get($colors, white);
       box-shadow: unset;
-      color: black;
+      color: map-get($colors, black);
+      float: right;
+      ion-icon {
+        padding: 0;
+        margin-top: 10px;
+      }
   }
 
   .popover-alert .alert-header{
-    margin-left: 2px 
+    margin-left: 2px
   }
   .popover-alert .col-2{
     padding: 0 ;
     margin-left: 20px ;
-  } 
+  }
 
   .popover-alert .alert-button {
     margin-top: 26px;
     border-radius: 5px;
   }
 
-  .popover-alert .close-button{
-    float: right;
-       ion-icon {
-      padding: 0;
-      margin-top: 10px;
-    }
-  } 
-
   .popover-alert .alert-header-content{
     padding: 0;
     margin-left: -7px;
diff --git a/src/app/components/popups/edit-contact-details-popup/edit-contact-details-popup.component.html b/src/app/components/popups/edit-contact-details-popup/edit-contact-details-popup.component.html
index 168437e7a..68b378e49 100644
--- a/src/app/components/popups/edit-contact-details-popup/edit-contact-details-popup.component.html
+++ b/src/app/components/popups/edit-contact-details-popup/edit-contact-details-popup.component.html
@@ -59,10 +59,10 @@ <h6 class="M0">{{title | titlecase}}</h6>
 
       </ion-row>
       <ion-row class="custom-shadow">
-        <ion-col padding>
+        <ion-col class="ion-padding">
           <ion-button expand="block" fill="outline" (click)="cancel($event)">{{ 'CANCEL' | translate }} </ion-button>
         </ion-col>
-        <ion-col padding>
+        <ion-col class="ion-padding">
           <ion-button expand="block" type="submit" (click)="validate()" [disabled]="!personEditForm.valid">
             {{ 'BTN_SUBMIT' | translate }}
           </ion-button>
diff --git a/src/app/components/popups/edit-contact-details-popup/edit-contact-details-popup.component.scss b/src/app/components/popups/edit-contact-details-popup/edit-contact-details-popup.component.scss
index f510ea745..8680110bc 100644
--- a/src/app/components/popups/edit-contact-details-popup/edit-contact-details-popup.component.scss
+++ b/src/app/components/popups/edit-contact-details-popup/edit-contact-details-popup.component.scss
@@ -1,9 +1,10 @@
 @import "src/assets/styles/_custom-mixins.scss";
 @import "src/assets/styles/variables";
+@import "src/assets/styles/_variables.scss";
 :host {
   .close-button.button-outline-md {
     border-color: transparent;
-    color: #2e3f51;
+    color: map-get($colors, grayish_blue);
     background-color: transparent;
     box-shadow: none;
     opacity: 1;
@@ -45,7 +46,7 @@
     overflow-y: hidden;
   }
   ion-backdrop {
-    background-color: #222 !important;
+    background-color: map-get($colors, dark) !important;
     opacity: 0.4 !important;
   }
 
@@ -54,7 +55,7 @@
   }
 
   .merged-input-container {
-    border: 1px solid #4a90e2;
+    border: 1px solid $form-input-border-active-color;
     display: flex;
     flex: 1 1 auto;
     border-radius: 4px;
@@ -75,8 +76,22 @@
   }
 
   .ecd-header {
-    background-color: map-get($colors, primary);
+    background-color: #{$blue};
     color: map-get($colors, white);
     padding: 16px 0;
   }
+
+  ion-button{
+    --background: #{$blue} !important;
+    color: map-get($colors, white);
+    --background-hover: #{$blue} !important;
+    --background-activated: #{$blue} !important;
+  }
+
+  ion-button[fill="outline"]{
+    --background: map-get($colors, white) !important;
+    color: #{$blue};
+    --border-color: #{$blue};
+  }
+
 }
diff --git a/src/app/components/popups/edit-contact-details-popup/edit-contact-details-popup.component.ts b/src/app/components/popups/edit-contact-details-popup/edit-contact-details-popup.component.ts
index a0fde94ce..b4320a5be 100644
--- a/src/app/components/popups/edit-contact-details-popup/edit-contact-details-popup.component.ts
+++ b/src/app/components/popups/edit-contact-details-popup/edit-contact-details-popup.component.ts
@@ -129,15 +129,11 @@ export class EditContactDetailsPopupComponent implements OnInit {
     let req: GenerateOtpRequest;
     if (this.type === ProfileConstants.CONTACT_TYPE_PHONE) {
       req = {
-        // todo sb-16814
-        // userId: this.userId,
         key: this.personEditForm.value.phone,
         type: ProfileConstants.CONTACT_TYPE_PHONE
       };
     } else {
       req = {
-        // todo sb-16814
-        // userId: this.userId,
         key: this.personEditForm.value.email,
         type: ProfileConstants.CONTACT_TYPE_EMAIL
       };
diff --git a/src/app/components/popups/edit-contact-verify-popup/edit-contact-verify-popup.component.html b/src/app/components/popups/edit-contact-verify-popup/edit-contact-verify-popup.component.html
index e2ef70493..58d4ce33d 100644
--- a/src/app/components/popups/edit-contact-verify-popup/edit-contact-verify-popup.component.html
+++ b/src/app/components/popups/edit-contact-verify-popup/edit-contact-verify-popup.component.html
@@ -1,8 +1,10 @@
 <ion-content>
+  <div class="ecv-header ion-text-center">
+    <h6 class="M0">{{title | titlecase}}</h6>
+  </div>
   <ion-grid>
     <ion-row>
       <ion-col size="12" class="text-center ion-no-padding">
-        <p class="f18 padding-left-5" color="dark">{{title}}</p>
         <p class="f14" style="color: #4a4a4a">{{description}}</p>
       </ion-col>
       <section class="text-center W100" *ngIf="type==='phone'">
@@ -40,10 +42,10 @@
     </ion-row>
   </ion-grid>
   <ion-row>
-    <ion-col padding>
+    <ion-col class="ion-padding">
       <ion-button expand="block" fill="outline" (click)="cancel()">{{ 'CANCEL' | translate }} </ion-button>
     </ion-col>
-    <ion-col padding>
+    <ion-col class="ion-padding">
       <ion-button expand="block" (click)="verify()">{{ 'BTN_SUBMIT' | translate }} </ion-button>
     </ion-col>
   </ion-row>
diff --git a/src/app/components/popups/edit-contact-verify-popup/edit-contact-verify-popup.component.scss b/src/app/components/popups/edit-contact-verify-popup/edit-contact-verify-popup.component.scss
index 514b7881d..c7f2a6cb6 100644
--- a/src/app/components/popups/edit-contact-verify-popup/edit-contact-verify-popup.component.scss
+++ b/src/app/components/popups/edit-contact-verify-popup/edit-contact-verify-popup.component.scss
@@ -1,6 +1,8 @@
+@import "src/assets/styles/_variables.scss";
+
 :host {
   .merged-input-container {
-    border: 1px solid #4a90e2;
+    border: 1px solid $form-input-border-active-color;
     display: flex;
     flex: 1 1 auto;
     border-radius: 4px;
@@ -9,5 +11,29 @@
       max-width: 45px;
     }
   }
+
+  .ecv-header {
+    background-color: #{$blue};
+    color: map-get($colors, white);
+    padding: 16px 0;
+  }
+
+  ion-button{
+    --background: #{$blue} !important;
+    color: map-get($colors, white);
+    --background-hover: #{$blue} !important;
+    --background-activated: #{$blue} !important;
+  }
+
+  ion-button[fill="outline"]{
+    --background: map-get($colors, white) !important;
+    color: #{$blue};
+    --border-color: #{$blue};
+  }
+
+  ion-button[fill="clear"]{
+    --background: map-get($colors, white) !important;
+    color: #{$blue};
+  }
 }
 
diff --git a/src/app/components/popups/edit-contact-verify-popup/edit-contact-verify-popup.component.ts b/src/app/components/popups/edit-contact-verify-popup/edit-contact-verify-popup.component.ts
index dca65c372..cabaa45d8 100644
--- a/src/app/components/popups/edit-contact-verify-popup/edit-contact-verify-popup.component.ts
+++ b/src/app/components/popups/edit-contact-verify-popup/edit-contact-verify-popup.component.ts
@@ -1,9 +1,8 @@
-import { Component, OnInit, Inject, Input } from '@angular/core';
-import { NavParams, Platform, PopoverController, MenuController } from '@ionic/angular';
-import { GenerateOtpRequest, ProfileService, VerifyOtpRequest, HttpClientError, Response } from 'sunbird-sdk';
-
+import { Component, Inject, Input, OnInit } from '@angular/core';
 import { ProfileConstants } from '@app/app/app.constant';
 import { CommonUtilService } from '@app/services/common-util.service';
+import { MenuController, NavParams, Platform, PopoverController } from '@ionic/angular';
+import { GenerateOtpRequest, HttpClientError, ProfileService, VerifyOtpRequest } from 'sunbird-sdk';
 
 @Component({
   selector: 'app-edit-contact-verify-popup',
@@ -72,7 +71,8 @@ export class EditContactVerifyPopupComponent implements OnInit {
           this.popOverCtrl.dismiss({ OTPSuccess: true, value: this.key });
         })
         .catch(error => {
-          if (error instanceof HttpClientError && error.response.responseCode === 400) {
+          if (HttpClientError.isInstance(error)
+           && error.response.responseCode === 400) {
             if (typeof error.response.body  === 'object') {
               if (error.response.body.params.err === 'OTP_VERIFICATION_FAILED' &&
               error.response.body.result.remainingAttempt > 0) {
@@ -97,13 +97,11 @@ export class EditContactVerifyPopupComponent implements OnInit {
       let req: GenerateOtpRequest;
       if (this.type === ProfileConstants.CONTACT_TYPE_PHONE) {
         req = {
-          userId: this.userId,
           key: this.key,
           type: ProfileConstants.CONTACT_TYPE_PHONE
         };
       } else {
         req = {
-          userId: this.userId,
           key: this.key,
           type: ProfileConstants.CONTACT_TYPE_EMAIL
         };
@@ -116,8 +114,9 @@ export class EditContactVerifyPopupComponent implements OnInit {
           await loader.dismiss();
           loader = undefined;
         })
-        .catch(async () => {
+        .catch(async (e) => {
           if (loader) {
+            this.commonUtilService.showToast('SOMETHING_WENT_WRONG');
             await loader.dismiss();
             loader = undefined;
           }
diff --git a/src/app/components/popups/group-guidelines-popup/group-guidelines-popup.component.html b/src/app/components/popups/group-guidelines-popup/group-guidelines-popup.component.html
new file mode 100644
index 000000000..02de86076
--- /dev/null
+++ b/src/app/components/popups/group-guidelines-popup/group-guidelines-popup.component.html
@@ -0,0 +1,30 @@
+<ion-header class="sb-popover-header">
+  <ion-toolbar class="sb-popover-toolbar">
+    <ion-title class="sb-popover-title">{{'GROUP_GUIDELINES' | translate}}</ion-title>
+  </ion-toolbar>
+</ion-header>
+  
+<ion-content class="sb-popover-container ion-no-padding">
+  <div class="sb-popover-items">
+    <div class="sb-popover-content-details">
+      <div class="gg-terms-container">
+          <div class="input-item gg-input-primary" lines="none">
+            <ion-checkbox class="gg-terms-checkbox" color="secondary" checked="false" [(ngModel)]="agreedToGroupGuidelines"></ion-checkbox>
+            <p class="gg-terms-checkbox-label"> 
+              <span>{{'I_AGREE_TO' | translate: {'app_name': appName} }} </span><span class="gg-terms" (click)="openTermsOfUse()">{{'GROUP_GUIDELINES' | translate}}</span>
+            </p>
+            </div>
+          <p
+            *ngIf="showGroupGuideLinesError"
+            class="cr-error cr-error-checkbox"
+            [innerHTML]="'GROUP_TERMS_IS_REQUIRED' | translate:  {'app_name':  appName}" ></p>
+        </div>
+    </div>
+  </div>
+</ion-content>
+
+<ion-footer>
+  <div class="sb-popover-footer">
+    <button class="sb-popover-action-btn popover-color" (click)="continue()">{{'CONTINUE' | translate}}</button>
+  </div>
+</ion-footer>
\ No newline at end of file
diff --git a/src/app/components/popups/group-guidelines-popup/group-guidelines-popup.component.scss b/src/app/components/popups/group-guidelines-popup/group-guidelines-popup.component.scss
new file mode 100644
index 000000000..9f23fcbb4
--- /dev/null
+++ b/src/app/components/popups/group-guidelines-popup/group-guidelines-popup.component.scss
@@ -0,0 +1,21 @@
+@import "src/assets/styles/_variables.scss";
+.gg-terms-container{
+    padding: 0 16px;
+    font-size: 14px;
+    .gg-terms-checkbox-label{
+        margin-left: 16px;
+        display: inline-block;
+        vertical-align: super;
+        margin-bottom: 0;
+    }
+    .gg-terms{
+        color: $blue;
+    }
+}
+.cr-error{
+    margin-top: 8px;
+    display: block;
+    font-size: 12px;
+    color: $red;
+    line-height: 10px;
+}
\ No newline at end of file
diff --git a/src/app/components/popups/group-guidelines-popup/group-guidelines-popup.component.spec.ts b/src/app/components/popups/group-guidelines-popup/group-guidelines-popup.component.spec.ts
new file mode 100644
index 000000000..417a3dd88
--- /dev/null
+++ b/src/app/components/popups/group-guidelines-popup/group-guidelines-popup.component.spec.ts
@@ -0,0 +1,125 @@
+import { PopoverController, Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { GroupGuideLinesPopoverComponent } from './group-guidelines-popup.component';
+import { CommonUtilService, UtilityService } from '@app/services';
+import { Location } from '@angular/common';
+
+describe('SbGenericPopoverComponent', () => {
+    let groupGuideLinesPopoverComponent: GroupGuideLinesPopoverComponent;
+
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+    };
+
+    const mockPopOverController: Partial<PopoverController> = {
+        dismiss: jest.fn()
+    };
+
+    const mockPlatform: Partial<Platform> = {};
+    const mockUtilityService: Partial<UtilityService> = {};
+    const mockLocation: Partial<Location> = {
+        back: jest.fn()
+    };
+
+    beforeAll(() => {
+        groupGuideLinesPopoverComponent = new GroupGuideLinesPopoverComponent(
+            mockPopOverController as PopoverController,
+            mockPlatform as Platform,
+            mockUtilityService as UtilityService,
+            mockCommonUtilService as CommonUtilService,
+            mockLocation as Location
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create a instance of SbGenericPopoverComponent', () => {
+        expect(groupGuideLinesPopoverComponent).toBeTruthy();
+    });
+
+    it('should subscribe to back button and events subscription', (done) => {
+        // arrange
+        const subscribeWithPriorityData = jest.fn((_, fn) => fn());
+        mockPlatform.backButton = {
+            subscribeWithPriority: subscribeWithPriorityData,
+        } as any;
+
+        const unsubscribeFn = jest.fn();
+        groupGuideLinesPopoverComponent.backButtonFunc = {
+            unsubscribe: unsubscribeFn,
+        } as any;
+        mockCommonUtilService.getAppName = jest.fn(() => 'sunbird');
+        groupGuideLinesPopoverComponent.shouldUpdateUserLevelGroupTnc = false
+        // act
+        groupGuideLinesPopoverComponent.ngOnInit();
+        // assert
+        setTimeout(() => {
+            expect(mockPopOverController.dismiss).toHaveBeenCalledWith({ isLeftButtonClicked: null });
+            expect(unsubscribeFn).toHaveBeenCalled();
+            done();
+        });
+    });
+
+    it('should subscribe to back button and events subscription', (done) => {
+        // arrange
+        const subscribeWithPriorityData = jest.fn((_, fn) => fn());
+        mockPlatform.backButton = {
+            subscribeWithPriority: subscribeWithPriorityData,
+        } as any;
+
+        const unsubscribeFn = jest.fn();
+        groupGuideLinesPopoverComponent.backButtonFunc = {
+            unsubscribe: unsubscribeFn,
+        } as any;
+        mockCommonUtilService.getAppName = jest.fn(() => 'sunbird');
+        groupGuideLinesPopoverComponent.shouldUpdateUserLevelGroupTnc = true
+        // act
+        groupGuideLinesPopoverComponent.ngOnInit();
+        // assert
+        setTimeout(() => {
+            expect(mockLocation.back).toHaveBeenCalled()
+            expect(unsubscribeFn).toHaveBeenCalled();
+            done();
+        });
+    });
+
+    it('should unsubscribe to back button and events on ngOnDestroy', () => {
+        // arrange
+        groupGuideLinesPopoverComponent.backButtonFunc = {
+            unsubscribe: jest.fn(),
+        } as any;
+        // act
+        groupGuideLinesPopoverComponent.ngOnDestroy();
+        // assert
+        // expect(groupGuideLinesPopoverComponent.selectedContents).toEqual(mockEventsResponse);
+        expect(groupGuideLinesPopoverComponent.backButtonFunc.unsubscribe).toHaveBeenCalled();
+    });
+
+    it('should dismiss the popup on closePopOver', () => {
+        // arrange
+        // act
+        groupGuideLinesPopoverComponent.closePopover();
+        // assert
+        expect(mockPopOverController.dismiss).toHaveBeenCalledWith({ isLeftButtonClicked: null });
+    });
+
+    it('should dismiss the popup on continue if agreedToGroupGuidelines', () => {
+        // arrange
+        groupGuideLinesPopoverComponent.agreedToGroupGuidelines = true;
+        // act
+        groupGuideLinesPopoverComponent.continue();
+        // assert
+        expect(mockPopOverController.dismiss).toHaveBeenCalledWith({ isLeftButtonClicked: true });
+    });
+
+    it('should dismiss the popup on continue if not agreedToGroupGuidelines', () => {
+        // arrange
+        groupGuideLinesPopoverComponent.agreedToGroupGuidelines = false;
+        // act
+        groupGuideLinesPopoverComponent.continue();
+        // assert
+        expect(groupGuideLinesPopoverComponent.showGroupGuideLinesError).toBe(true);
+    });
+
+});
diff --git a/src/app/components/popups/group-guidelines-popup/group-guidelines-popup.component.ts b/src/app/components/popups/group-guidelines-popup/group-guidelines-popup.component.ts
new file mode 100644
index 000000000..8b3f85887
--- /dev/null
+++ b/src/app/components/popups/group-guidelines-popup/group-guidelines-popup.component.ts
@@ -0,0 +1,65 @@
+import { Component, Input, OnInit, OnDestroy } from '@angular/core';
+import { Platform, PopoverController } from '@ionic/angular';
+import { Subscription } from 'rxjs';
+import { CommonUtilService, UtilityService } from '@app/services';
+import { RouterLinks } from '@app/app/app.constant';
+import { Location } from '@angular/common';
+
+@Component({
+  selector: 'app-group-guidelines-popover',
+  templateUrl: 'group-guidelines-popup.component.html',
+  styleUrls: ['./group-guidelines-popup.component.scss'],
+})
+export class GroupGuideLinesPopoverComponent implements OnInit, OnDestroy {
+
+  @Input("shouldUpdateUserLevelGroupTnc") shouldUpdateUserLevelGroupTnc;
+  backButtonFunc: Subscription;
+  appName: string;
+  showGroupGuideLinesError = false;
+  agreedToGroupGuidelines = false;
+
+  constructor(
+    public popoverCtrl: PopoverController,
+    private platform: Platform,
+    private utilityService: UtilityService,
+    private commonUtilService: CommonUtilService,
+    private location: Location
+    ) { }
+
+  async ngOnInit() {
+    this.appName = await this.commonUtilService.getAppName();
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(11, () => {
+      this.popoverCtrl.dismiss({ isLeftButtonClicked: null });
+      if(this.shouldUpdateUserLevelGroupTnc) {
+        this.location.back();
+      }
+      this.backButtonFunc.unsubscribe();
+    });
+  }
+
+  ngOnDestroy(): void {
+    this.backButtonFunc.unsubscribe();
+  }
+
+  closePopover() {
+    this.popoverCtrl.dismiss({ isLeftButtonClicked: null });
+  }
+
+  continue() {
+    if (this.agreedToGroupGuidelines) {
+        this.popoverCtrl.dismiss({ isLeftButtonClicked: true });
+    } else {
+        this.showGroupGuideLinesError = true;
+    }
+  }
+
+  async openTermsOfUse() {
+    const baseUrl = await this.utilityService.getBuildConfigValue('TOU_BASE_URL');
+    const url = baseUrl + RouterLinks.TERM_OF_USE + '#groupGuidelines';
+    const options
+      = 'hardwareback=yes,clearcache=no,zoom=no,toolbar=yes,disallowoverscroll=yes';
+
+    (window as any).cordova.InAppBrowser.open(url, '_blank', options);
+  }
+
+}
diff --git a/src/app/components/popups/index.ts b/src/app/components/popups/index.ts
index 2bbd1c95b..b0367d38a 100644
--- a/src/app/components/popups/index.ts
+++ b/src/app/components/popups/index.ts
@@ -8,3 +8,4 @@ export * from './edit-contact-details-popup/edit-contact-details-popup.component
 export * from './edit-contact-verify-popup/edit-contact-verify-popup.component';
 export * from './sb-insufficient-storage-popup/sb-insufficient-storage-popup';
 export * from './sb-app-share-popup/sb-app-share-popup.component';
+export * from './toast-navigation/toast-navigation.component';
diff --git a/src/app/components/popups/joyful-theme-popup/joyful-theme-popup.component.html b/src/app/components/popups/joyful-theme-popup/joyful-theme-popup.component.html
new file mode 100644
index 000000000..0ce1bb71f
--- /dev/null
+++ b/src/app/components/popups/joyful-theme-popup/joyful-theme-popup.component.html
@@ -0,0 +1,21 @@
+<div>
+    <div class="header-info">
+        <div class="close-icon-info">
+            <img src="assets/imgs/close.png" alt="close-icon" (click)="closePopover()">
+        </div>
+        <h4 class="theme-header-info">{{'JOYFULPOPUP_HEADING' | translate}}</h4>
+        <p class="learning-info">{{'JOYFUL_LEARNING_TEXT' | translate}}</p>
+        <img src="./assets/imgs/ic_new-theme-img.svg">
+    </div>
+    <div>
+        <div>
+            <p class="chng-theme-text"><span class="sb-color-warning">*</span>{{'JOYFUL_WARNING_TEXT' | translate}}</p>
+        </div>
+            <div class="btn-info">
+                <button class="letsgo-info" (click)="switchToNewTheme()"><span>{{'LETS_GO' | translate}}</span>
+                    <img class="arrow-icon" src="assets/imgs/ic_back.svg" alt="arrow-icon"
+                             [class.animate]="isPopoverPresent">
+                </button>
+            </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/components/popups/joyful-theme-popup/joyful-theme-popup.component.scss b/src/app/components/popups/joyful-theme-popup/joyful-theme-popup.component.scss
new file mode 100644
index 000000000..8682e1e4a
--- /dev/null
+++ b/src/app/components/popups/joyful-theme-popup/joyful-theme-popup.component.scss
@@ -0,0 +1,56 @@
+@import "src/assets/styles/_variables.scss";
+.header-info {
+  background-color: $blue;
+}
+.btn-info{
+  padding: 12px;
+  text-align: center;
+}
+
+.letsgo-info{
+  color: white;
+  background-color: $blue;
+  font-size: 16px;
+  padding: 8px 0;
+  margin-left: 18px;
+  border: 2px solid $blue;
+  width: 34%;
+  float: right;
+  border-radius: 20px !important;
+}
+
+.theme-header-info {
+  margin-top: 0px;
+  padding-top: 1rem;
+  color: map-get($colors, white); 
+  padding: 16px 8px 0px 16px
+}
+
+.close-icon-info {
+  float: right;
+  background-color: aliceblue;
+  border-radius: 50%;
+  width: 2rem;
+  height: 2rem;
+  margin-right: 6px;
+  margin-top: 5px;
+  padding: 5px;
+}
+.learning-info{
+  color: white;
+  padding: 8px 8px 0px 16px
+}
+.chng-theme-text{
+  padding: 8px
+}
+img.arrow-icon{
+  display: inline-block;
+  width: 18px;
+  margin-top: -3px;
+  margin-left: 10px;
+  &.animate {
+    position: relative;
+    animation: dropDown 5s linear infinite;
+    animation-duration: 0.9s;
+  }
+}
diff --git a/src/app/components/popups/joyful-theme-popup/joyful-theme-popup.component.ts b/src/app/components/popups/joyful-theme-popup/joyful-theme-popup.component.ts
new file mode 100644
index 000000000..8b56bacf5
--- /dev/null
+++ b/src/app/components/popups/joyful-theme-popup/joyful-theme-popup.component.ts
@@ -0,0 +1,50 @@
+import { Component, Inject, OnInit } from '@angular/core';
+import { NavParams, PopoverController } from '@ionic/angular';
+import { AppThemes } from '@app/app/app.constant';
+import { SharedPreferences } from 'sunbird-sdk';
+import { AppHeaderService } from '@app/services';
+
+
+@Component({
+    selector: 'app-joyful-theme-popup',
+    templateUrl: './joyful-theme-popup.component.html',
+    styleUrls: ['./joyful-theme-popup.component.scss']
+})
+export class JoyfulThemePopupComponent implements OnInit {
+    appName = '';
+    appTheme = AppThemes.DEFAULT;
+    isPopoverPresent = false;
+    constructor(
+        @Inject('SHARED_PREFERENCES') private preference: SharedPreferences,
+        private popoverCtrl: PopoverController,
+        private navParams: NavParams,
+        private appHeaderService: AppHeaderService
+    ) {
+    }
+
+    ngOnInit() {
+        this.appTheme = document.querySelector('html').getAttribute('data-theme');
+        this.appName = this.navParams.get('appLabel');
+        setTimeout(() => {
+            this.isPopoverPresent = true;
+        }, 2000);
+    }
+
+    async closePopover() {
+        await this.switchToJoyfulTheme();
+        this.popoverCtrl.dismiss();
+    }
+
+    async switchToNewTheme() {
+        await this.switchToJoyfulTheme();
+        this.popoverCtrl.dismiss();
+    }
+
+    async switchToJoyfulTheme() {
+        if (document.querySelector('html').getAttribute('data-theme') === AppThemes.DEFAULT) {
+            this.appTheme = AppThemes.JOYFUL;
+            await this.preference.putString('current_selected_theme', this.appTheme).toPromise();
+            this.appHeaderService.showStatusBar().then();
+        }
+    }
+}
diff --git a/src/app/components/popups/new-experience-popup/new-experience-popup.component.html b/src/app/components/popups/new-experience-popup/new-experience-popup.component.html
new file mode 100644
index 000000000..4fd30e377
--- /dev/null
+++ b/src/app/components/popups/new-experience-popup/new-experience-popup.component.html
@@ -0,0 +1,20 @@
+<div>
+    <div class="header-info">
+        <div class="close-icon-info">
+            <img src="assets/imgs/close.png" alt="close-icon" (click)="closePopover()">
+        </div>
+        <h4 class="theme-header-info">{{'FRMELEMNTS_LBL_NEW_EXPERIENCE_POPUP_HEADING' | translate: {'app_name': appName} }}</h4>
+        <p class="learning-info">{{'FRMELEMNTS_LBL_NEW_EXPERIENCE_TEXT' | translate}}</p>
+        <img src="./assets/imgs/ic_switchNewExperience.svg">
+    </div>
+    <div>
+        <div>
+            <p class="chng-theme-text"><span class="sb-color-warning">*</span>{{'FRMELEMNTS_LBL_NEW_EXPERIENCE_WARNING_TEXT' | translate: {'app_name': appName} }}</p>
+        </div>
+            <div class="btn-info">
+                <button class="cancel_info" (click)="closePopover()"><span>{{'CANCEL' | translate}}</span></button>
+                <button class="letsgo-info" (click)="switchToNewTheme()"><span>{{'FRMELEMNTS_LBL_SWITCH_TO_NEW_EXPERIENCE' | translate | uppercase}}</span>
+                </button>
+            </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/components/popups/new-experience-popup/new-experience-popup.component.scss b/src/app/components/popups/new-experience-popup/new-experience-popup.component.scss
new file mode 100644
index 000000000..4b210f7d2
--- /dev/null
+++ b/src/app/components/popups/new-experience-popup/new-experience-popup.component.scss
@@ -0,0 +1,67 @@
+@import "src/assets/styles/_variables.scss";
+.header-info {
+  background-color: $blue;
+}
+.btn-info{
+  padding: 12px;
+  text-align: center;
+}
+
+.letsgo-info{
+  color: white;
+  background-color: $blue;
+  font-size: 16px;
+  padding: 12px 0;
+  margin-left: 18px;
+  border: 2px solid $blue;
+  width: 57vw;
+  float: right;
+  border-radius: 20px !important;
+}
+
+.theme-header-info {
+  margin-top: 0px;
+  padding-top: 1rem;
+  color: map-get($colors, white); 
+  padding: 16px 8px 0px 16px
+}
+
+.close-icon-info {
+  float: right;
+  background-color: aliceblue;
+  border-radius: 50%;
+  width: 2rem;
+  height: 2rem;
+  margin-right: 6px;
+  margin-top: 5px;
+  padding: 5px;
+}
+.learning-info{
+  color: white;
+  padding: 8px 8px 0px 16px
+}
+.chng-theme-text{
+  padding: 8px
+}
+img.arrow-icon{
+  display: inline-block;
+  width: 18px;
+  margin-top: -3px;
+  margin-left: 10px;
+  &.animate {
+    position: relative;
+    animation: dropDown 5s linear infinite;
+    animation-duration: 0.9s;
+  }
+}
+
+.cancel_info{
+  color: $blue !important;
+  background-color: white;
+  font-size: 16px;
+  padding: 14px 0;;
+  width: 21vw;
+}
+.btn-text{
+  padding: 12px
+}
diff --git a/src/app/components/popups/new-experience-popup/new-experience-popup.component.spec.ts b/src/app/components/popups/new-experience-popup/new-experience-popup.component.spec.ts
new file mode 100644
index 000000000..c5a87320c
--- /dev/null
+++ b/src/app/components/popups/new-experience-popup/new-experience-popup.component.spec.ts
@@ -0,0 +1,93 @@
+import { PopoverController, NavParams } from '@ionic/angular';
+import { NewExperiencePopupComponent } from './new-experience-popup.component';
+import { SharedPreferences } from 'sunbird-sdk';
+import { Events } from '@app/util/events';
+import { TelemetryGeneratorService, CommonUtilService, InteractSubtype, PageId } from '../../../../services';
+import { of } from 'rxjs';
+import { PreferenceKey, SwitchableTabsConfig } from '../../../app.constant';
+
+describe('NewExperiencePopupComponent', () => {
+    let newExperiencePopupComponent: NewExperiencePopupComponent;
+    const mockEvents: Partial<Events> = {};
+    const mockNavParams: Partial<NavParams> = {};
+    const mockPopoverCtrl: Partial<PopoverController> = {};
+    const mockPreference: Partial<SharedPreferences> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+
+    beforeAll(() => {
+        newExperiencePopupComponent = new NewExperiencePopupComponent(
+            mockPreference as SharedPreferences,
+            mockPopoverCtrl as PopoverController,
+            mockNavParams as NavParams,
+            mockEvents as Events,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockCommonUtilService as CommonUtilService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should be create a instance for newExperiencePopupComponent', () => {
+        expect(newExperiencePopupComponent).toBeTruthy();
+    });
+
+    it('should open popup', () => {
+        mockNavParams.get = jest.fn(() => 'sample-app') as any;
+        newExperiencePopupComponent.ngOnInit();
+    });
+
+    it('should close the popup', (done) => {
+        // arrange
+        mockPreference.putString = jest.fn(() => of(undefined));
+        mockPopoverCtrl.dismiss = jest.fn(() => Promise.resolve(true));
+        // act
+        newExperiencePopupComponent.closePopover();
+        // assert
+        setTimeout(() => {
+            expect(mockPreference.putString).toHaveBeenCalledWith(
+                PreferenceKey.SELECTED_SWITCHABLE_TABS_CONFIG,
+                SwitchableTabsConfig.RESOURCE_COURSE_TABS_CONFIG);
+            expect(mockPopoverCtrl.dismiss).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
+    it('should switch to new experience theme', (done) => {
+        // arrange
+        mockPreference.getString = jest.fn(() => of('sample-userType'));
+        mockPreference.getBoolean = jest.fn(() => of(true));
+        mockTelemetryGeneratorService.generateNewExprienceSwitchTelemetry = jest.fn();
+        mockPreference.putString = jest.fn(() => of(undefined));
+        mockEvents.publish = jest.fn(() => []);
+        mockPreference.putBoolean = jest.fn(() => of(true));
+        mockCommonUtilService.populateGlobalCData = jest.fn(() => Promise.resolve());
+        mockPopoverCtrl.dismiss = jest.fn(() => Promise.resolve(true));
+        // act
+        newExperiencePopupComponent.switchToNewTheme();
+        // assert
+        setTimeout(() => {
+            expect(mockPreference.getString).toHaveBeenCalledWith(PreferenceKey.SELECTED_USER_TYPE);
+            expect(mockPreference.getBoolean).toHaveBeenCalledWith(PreferenceKey.IS_NEW_USER);
+            expect(mockTelemetryGeneratorService.generateNewExprienceSwitchTelemetry).toHaveBeenCalledWith(
+                PageId.NEW_EXPERIENCE_POPUP,
+                InteractSubtype.OPTED_IN,
+                {
+                    userType: 'sample-userType',
+                    isNewUser: true
+                }
+            );
+            expect(mockPreference.putString).toHaveBeenCalledWith(
+                PreferenceKey.SELECTED_SWITCHABLE_TABS_CONFIG,
+                SwitchableTabsConfig.HOME_DISCOVER_TABS_CONFIG
+            );
+            expect(mockEvents.publish).toHaveBeenCalled();
+            expect(mockPreference.putBoolean).toHaveBeenCalledWith(PreferenceKey.IS_NEW_USER, false);
+            expect(mockCommonUtilService.populateGlobalCData).toHaveBeenCalled();
+            expect(mockPopoverCtrl.dismiss).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+});
diff --git a/src/app/components/popups/new-experience-popup/new-experience-popup.component.ts b/src/app/components/popups/new-experience-popup/new-experience-popup.component.ts
new file mode 100644
index 000000000..5fbecec25
--- /dev/null
+++ b/src/app/components/popups/new-experience-popup/new-experience-popup.component.ts
@@ -0,0 +1,62 @@
+import { Component, Inject, OnInit } from '@angular/core';
+import { NavParams, PopoverController } from '@ionic/angular';
+import { AppThemes, PreferenceKey, SwitchableTabsConfig } from '@app/app/app.constant';
+import { SharedPreferences } from 'sunbird-sdk';
+import { Events } from '@app/util/events';
+import { TelemetryGeneratorService, PageId, InteractSubtype, CommonUtilService } from '@app/services';
+
+
+@Component({
+    selector: 'app-new-experience-popup',
+    templateUrl: './new-experience-popup.component.html',
+    styleUrls: ['./new-experience-popup.component.scss']
+})
+export class NewExperiencePopupComponent implements OnInit {
+    appName = '';
+    appTheme = AppThemes.DEFAULT;
+    isPopoverPresent = false;
+    constructor(
+        @Inject('SHARED_PREFERENCES') private preference: SharedPreferences,
+        private popoverCtrl: PopoverController,
+        private navParams: NavParams,
+        private events: Events,
+        private telemetryGeneratorService: TelemetryGeneratorService,
+        private commonUtilService: CommonUtilService
+    ) {
+    }
+
+    ngOnInit() {
+        this.appTheme = document.querySelector('html').getAttribute('data-theme');
+        this.appName = this.navParams.get('appLabel').toUpperCase();
+        setTimeout(() => {
+            this.isPopoverPresent = true;
+        }, 2000);
+    }
+
+    async closePopover() {
+     this.preference.putString(PreferenceKey.SELECTED_SWITCHABLE_TABS_CONFIG, SwitchableTabsConfig.RESOURCE_COURSE_TABS_CONFIG).toPromise();
+     this.popoverCtrl.dismiss();
+    }
+
+    async switchToNewTheme() {
+        const userType = await this.preference.getString(PreferenceKey.SELECTED_USER_TYPE).toPromise();
+        const isNewUser = await this.preference.getBoolean(PreferenceKey.IS_NEW_USER).toPromise();
+        this.telemetryGeneratorService.generateNewExprienceSwitchTelemetry(
+            PageId.NEW_EXPERIENCE_POPUP,
+            InteractSubtype.OPTED_IN,
+            {
+                userType,
+                isNewUser
+            }
+        );
+        await this.switchToHomeTabs();
+        this.preference.putBoolean(PreferenceKey.IS_NEW_USER, false);
+        this.commonUtilService.populateGlobalCData();
+        this.popoverCtrl.dismiss();
+    }
+
+    async switchToHomeTabs() {
+       this.preference.putString(PreferenceKey.SELECTED_SWITCHABLE_TABS_CONFIG, SwitchableTabsConfig.HOME_DISCOVER_TABS_CONFIG).toPromise();
+       this.events.publish('UPDATE_TABS');
+    }
+}
diff --git a/src/app/components/popups/sb-app-share-popup/sb-app-share-popup.component.scss b/src/app/components/popups/sb-app-share-popup/sb-app-share-popup.component.scss
index 38a99669c..62ad3e363 100644
--- a/src/app/components/popups/sb-app-share-popup/sb-app-share-popup.component.scss
+++ b/src/app/components/popups/sb-app-share-popup/sb-app-share-popup.component.scss
@@ -1,4 +1,5 @@
 @import "src/assets/styles/base/_variables.scss";
+@import "src/assets/styles/_variables.scss";
 
 .flex-grow-1{
     flex-grow: 1;
@@ -14,7 +15,7 @@
         margin-right: 10px !important;
     }
     .share-link{
-        border-bottom: 1px solid #eee;
+        border-bottom: 1px solid map-get($colors, empty_color);
     }
     .share-url{
         margin-left: 50px;
@@ -22,29 +23,28 @@
         text-overflow: ellipsis;
         white-space: nowrap;
         margin-right: 15px;
-        border: 1px solid #EDF4F9;
+        border: 1px solid $light-blue;
         padding: 5px;
-        color: #a4a4a4;
+        color: map-get($colors, gray_solid);
         position: relative;
         top: -10px;
     }
     .share-desc{
         text-align: left;
         margin-left: 50px;
-        color: #a4a4a4;
+        color: map-get($colors, gray_solid);
         position: relative;
-        top: -10px;
     }
     .share-info{
-        background: #EDF4F9;
+        background: $light-blue;
         margin-left: 20px;
         padding: 5px;
         margin-right: 15px;
         text-align: left;
         margin-bottom: 20px;
-        color: #333333a1;
+        color: map-get($colors, light_black);
         ion-icon{
-            color: #a4a4a4;
+            color: map-get($colors, gray_solid);
             position: relative;
             top: 3px;
         }
diff --git a/src/app/components/popups/sb-app-share-popup/sb-app-share-popup.component.spec.ts b/src/app/components/popups/sb-app-share-popup/sb-app-share-popup.component.spec.ts
index f6e5891f3..7635ddd8d 100644
--- a/src/app/components/popups/sb-app-share-popup/sb-app-share-popup.component.spec.ts
+++ b/src/app/components/popups/sb-app-share-popup/sb-app-share-popup.component.spec.ts
@@ -1,6 +1,6 @@
 import { AppVersion } from '@ionic-native/app-version/ngx';
 import { SocialSharing } from '@ionic-native/social-sharing/ngx';
-import {CommonUtilService, UtilityService, TelemetryGeneratorService, AndroidPermissionsService} from '../../../../services';
+import {CommonUtilService, UtilityService, TelemetryGeneratorService, AndroidPermissionsService, AppGlobalService} from '../../../../services';
 import { DeviceInfo } from 'sunbird-sdk';
 import { SbAppSharePopupComponent } from '@app/app/components/popups';
 import {PopoverController, Platform, NavParams, ToastController} from '@ionic/angular';
@@ -15,15 +15,13 @@ describe('SbAppSharePopupComponent', () => {
     const mockPopoverCtrl: Partial<PopoverController> = {
         dismiss: jest.fn()
     };
-    const mockDeviceInfo: Partial<DeviceInfo> = {
-        getDeviceID: jest.fn(() => '0123456789')
-    };
     const mockPlatform: Partial<Platform> = {};
     const mocksocialSharing: Partial<SocialSharing> = {
         share: jest.fn()
     };
     const mockCommonUtilService: Partial<CommonUtilService> = {
-        showToast: jest.fn()
+        showToast: jest.fn(),
+        getGivenPermissionStatus: jest.fn(() => Promise.resolve({ hasPermission : true} as any))
     };
     const mockUtilityService: Partial<UtilityService> = {
         exportApk: jest.fn(() => Promise.resolve('filePath')),
@@ -54,14 +52,12 @@ describe('SbAppSharePopupComponent', () => {
     const mockRouter: Partial<Router> = {
         navigate: jest.fn()
     };
-    const mockToastController: Partial<ToastController> = {
-        create: jest.fn(),
-        dismiss: jest.fn()
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        setNativePopupVisible: jest.fn()
     };
 
     beforeAll(() => {
         sbAppSharePopupComponent = new SbAppSharePopupComponent(
-            mockDeviceInfo as DeviceInfo,
             mockPopoverCtrl as PopoverController,
             mocksocialSharing as SocialSharing,
             mockPlatform as Platform,
@@ -70,8 +66,6 @@ describe('SbAppSharePopupComponent', () => {
             mockNavParams as NavParams,
             mockTelemetryGeneratorService as TelemetryGeneratorService,
             mockPermissionService as AndroidPermissionsService,
-            mockRouter as Router,
-            mockToastController as ToastController,
             mockCommonUtilService as CommonUtilService);
     });
 
@@ -83,6 +77,19 @@ describe('SbAppSharePopupComponent', () => {
         expect(sbAppSharePopupComponent).toBeTruthy();
     });
 
+    it('should create a instance of sbAppSharePopupComponent', () => {
+        // arrange
+        // act
+        sbAppSharePopupComponent.generateInteractTelemetry(InteractType.TOUCH, InteractSubtype.CLOSE_CLICKED);
+        // assert
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH,
+            InteractSubtype.CLOSE_CLICKED,
+            PageId.SHARE_APP_POPUP,
+            Environment.SETTINGS
+        );
+    });
+
     describe('exportApk()', () => {
 
         it('should share the APK if shareParams.byFile=true', (done) => {
@@ -164,7 +171,35 @@ describe('SbAppSharePopupComponent', () => {
                 Environment.SETTINGS);
             expect(sbAppSharePopupComponent.shareUrl).toEqual(
                 'https://play.google.com/store/apps/details?id=org.sunbird.' +
-                'app&referrer=utm_source%3D0123456789%26utm_campaign%3Dshare_app');
+                'app&referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_app');
+            done();
+        }, 0);
+    });
+
+    it('should not brek if getAPKSize() gives error response', (done) => {
+        // arrange
+        const unsubscribeFn = jest.fn();
+        mockPlatform.backButton = {
+            subscribeWithPriority: jest.fn((_, fn) => fn()),
+        } as any;
+        sbAppSharePopupComponent.backButtonFunc = {
+            unsubscribe: unsubscribeFn
+        } as any;
+
+        mockUtilityService.getApkSize = jest.fn(() => Promise.reject({}));
+        // act
+        sbAppSharePopupComponent.ngOnInit();
+        // assert
+        expect(mockPopoverCtrl.dismiss).toHaveBeenCalled();
+        expect(unsubscribeFn).toHaveBeenCalled();
+        setTimeout(() => {
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                ImpressionType.VIEW, '',
+                PageId.SHARE_APP_POPUP,
+                Environment.SETTINGS);
+            expect(sbAppSharePopupComponent.shareUrl).toEqual(
+                'https://play.google.com/store/apps/details?id=org.sunbird.' +
+                'app&referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_app');
             done();
         }, 0);
     });
@@ -452,6 +487,32 @@ describe('SbAppSharePopupComponent', () => {
         }, 0);
     });
 
+    it('should not show any toast if not of the button is clicked and popup is dismissed', (done) => {
+        // arrange
+        mockPermissionService.requestPermission = jest.fn(() => of({hasPermission: false}));
+        mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve(
+            {hasPermission: false}));
+        mockPopoverCtrl.dismiss = jest.fn();
+
+        mockCommonUtilService.translateMessage = jest.fn(v => v);
+        mockCommonUtilService.buildPermissionPopover = jest.fn(async (callback) => {
+            await callback(mockCommonUtilService.translateMessage('ALLOW1'));
+            return {
+                present: jest.fn(() => Promise.resolve())
+            };
+        });
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        mockCommonUtilService.showSettingsPageToast = jest.fn();
+        // act
+        sbAppSharePopupComponent.shareFile();
+        // assert
+        setTimeout(() => {
+            // assert
+            expect(mockCommonUtilService.showSettingsPageToast).not.toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
     it('should call storage permission pop-up and ALLOW clicked and provide has permission true ', (done) => {
         // arrange
         mockPermissionService.requestPermission = jest.fn(() => of({hasPermission: true}));
diff --git a/src/app/components/popups/sb-app-share-popup/sb-app-share-popup.component.ts b/src/app/components/popups/sb-app-share-popup/sb-app-share-popup.component.ts
index 3d9f14be1..2643b2da9 100644
--- a/src/app/components/popups/sb-app-share-popup/sb-app-share-popup.component.ts
+++ b/src/app/components/popups/sb-app-share-popup/sb-app-share-popup.component.ts
@@ -1,17 +1,15 @@
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { ShareItemType, ShareMode } from '@app/app/app.constant';
+import { Environment, ID, ImpressionType, InteractSubtype, InteractType, PageId } from '@app/services';
+import { AndroidPermission, AndroidPermissionsStatus } from '@app/services/android-permissions/android-permission';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
 import { AppVersion } from '@ionic-native/app-version/ngx';
 import { SocialSharing } from '@ionic-native/social-sharing/ngx';
-import { UtilityService } from '../../../../services/utility-service';
-import { CommonUtilService } from '@app/services/common-util.service';
-import { Component, OnInit, OnDestroy, Inject } from '@angular/core';
-import {Platform, PopoverController, NavParams, ToastController} from '@ionic/angular';
+import { NavParams, Platform, PopoverController } from '@ionic/angular';
 import { Subscription } from 'rxjs';
-import { DeviceInfo } from 'sunbird-sdk';
-import { ImpressionType, PageId, Environment, ID, InteractType, InteractSubtype } from '@app/services';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import {ShareMode, ShareItemType, RouterLinks} from '@app/app/app.constant';
-import {AndroidPermissionsService} from '../../../../services/android-permissions/android-permissions.service';
-import {Router} from '@angular/router';
-import {AndroidPermission, AndroidPermissionsStatus} from '@app/services/android-permissions/android-permission';
+import { AndroidPermissionsService } from '../../../../services/android-permissions/android-permissions.service';
+import { UtilityService } from '../../../../services/utility-service';
 
 @Component({
   selector: 'app-sb-share-popup',
@@ -43,7 +41,6 @@ export class SbAppSharePopupComponent implements OnInit, OnDestroy {
   appName = '';
 
   constructor(
-    @Inject('DEVICE_INFO') private deviceInfo: DeviceInfo,
     public popoverCtrl: PopoverController,
     private social: SocialSharing,
     private platform: Platform,
@@ -52,11 +49,9 @@ export class SbAppSharePopupComponent implements OnInit, OnDestroy {
     private navParams: NavParams,
     private telemetryGeneratorService: TelemetryGeneratorService,
     private permissionService: AndroidPermissionsService,
-    private router: Router,
-    private toastController: ToastController,
     private commonUtilService: CommonUtilService) {
-      this.pageId = this.navParams.get('pageId');
-    }
+    this.pageId = this.navParams.get('pageId');
+  }
 
   async ngOnInit() {
     this.generateShareClickTelemetry();
@@ -68,7 +63,7 @@ export class SbAppSharePopupComponent implements OnInit, OnDestroy {
     this.shareType = this.shareOptions.link.value;
     const packageName = await this.appVersion.getPackageName();
     this.appName = await this.appVersion.getAppName();
-    const utmParams = `&referrer=utm_source%3D${this.deviceInfo.getDeviceID()}%26utm_campaign%3Dshare_app`;
+    const utmParams = `&referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_app`;
     this.shareUrl = `https://play.google.com/store/apps/details?id=${packageName}${utmParams}`;
     this.utilityService.getApkSize().then(async (fileSize) => {
       this.fileSize = Number(fileSize);
@@ -84,7 +79,7 @@ export class SbAppSharePopupComponent implements OnInit, OnDestroy {
   }
 
   generateShareClickTelemetry() {
-    this.telemetryGeneratorService.generateInteractTelemetry( ShareItemType.APP,
+    this.telemetryGeneratorService.generateInteractTelemetry(ShareItemType.APP,
       '',
       Environment.SETTINGS,
       this.pageId,
@@ -122,7 +117,7 @@ export class SbAppSharePopupComponent implements OnInit, OnDestroy {
     this.generateConfirmClickTelemetry(ShareMode.SHARE);
     this.generateInteractTelemetry(InteractType.TOUCH, InteractSubtype.SHARE_APP_INITIATED);
     const appName = await this.appVersion.getAppName();
-    const url = this.commonUtilService.translateMessage('SHARE_APP_LINK', {app_name: appName, play_store_url: this.shareUrl});
+    const url = this.commonUtilService.translateMessage('SHARE_APP_LINK', { app_name: appName, play_store_url: this.shareUrl });
     this.social.share(null, null, null, url);
     this.popoverCtrl.dismiss();
     this.generateInteractTelemetry(InteractType.OTHER, InteractSubtype.SHARE_APP_SUCCESS);
@@ -182,7 +177,7 @@ export class SbAppSharePopupComponent implements OnInit, OnDestroy {
   }
 
   private async checkForPermissions(): Promise<boolean | undefined> {
-    return new Promise < boolean | undefined>(async (resolve, reject) => {
+    return new Promise<boolean | undefined>(async (resolve, reject) => {
       const permissionStatus = await this.commonUtilService.getGivenPermissionStatus(AndroidPermission.WRITE_EXTERNAL_STORAGE);
 
       if (permissionStatus.hasPermission) {
@@ -205,36 +200,48 @@ export class SbAppSharePopupComponent implements OnInit, OnDestroy {
     await this.popoverCtrl.dismiss();
     return new Promise<boolean | undefined>(async (resolve, reject) => {
       const confirm = await this.commonUtilService.buildPermissionPopover(
-          async (selectedButton: string) => {
-            if (selectedButton === this.commonUtilService.translateMessage('NOT_NOW')) {
-              this.telemetryGeneratorService.generateInteractTelemetry(
-                  InteractType.TOUCH,
-                  InteractSubtype.NOT_NOW_CLICKED,
-                  Environment.SETTINGS,
-                  PageId.PERMISSION_POPUP);
-              await this.commonUtilService.showSettingsPageToast('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, this.pageId, true);
-            } else if (selectedButton === this.commonUtilService.translateMessage('ALLOW')) {
-              this.telemetryGeneratorService.generateInteractTelemetry(
-                  InteractType.TOUCH,
-                  InteractSubtype.ALLOW_CLICKED,
-                  Environment.SETTINGS,
-                  PageId.PERMISSION_POPUP);
-              this.permissionService.requestPermission(AndroidPermission.WRITE_EXTERNAL_STORAGE)
-                  .subscribe(async (status: AndroidPermissionsStatus) => {
-                    if (status.hasPermission) {
-                      resolve(true);
-                    } else if (status.isPermissionAlwaysDenied) {
-                      await this.commonUtilService.showSettingsPageToast
-                      ('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, this.pageId, true);
-                      resolve(false);
-                    } else {
-                      await this.commonUtilService.showSettingsPageToast
-                      ('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, this.pageId, true);
-                    }
-                    resolve(undefined);
-                  });
-            }
-          }, this.appName, this.commonUtilService.translateMessage('FILE_MANAGER'), 'FILE_MANAGER_PERMISSION_DESCRIPTION', this.pageId, true
+        async (selectedButton: string) => {
+          if (selectedButton === this.commonUtilService.translateMessage('NOT_NOW')) {
+            this.telemetryGeneratorService.generateInteractTelemetry(
+              InteractType.TOUCH,
+              InteractSubtype.NOT_NOW_CLICKED,
+              Environment.SETTINGS,
+              PageId.PERMISSION_POPUP);
+            await this.commonUtilService.showSettingsPageToast('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, this.pageId, true);
+          } else if (selectedButton === this.commonUtilService.translateMessage('ALLOW')) {
+            this.telemetryGeneratorService.generateInteractTelemetry(
+              InteractType.TOUCH,
+              InteractSubtype.ALLOW_CLICKED,
+              Environment.SETTINGS,
+              PageId.PERMISSION_POPUP);
+            this.permissionService.requestPermission(AndroidPermission.WRITE_EXTERNAL_STORAGE)
+              .subscribe(async (status: AndroidPermissionsStatus) => {
+                if (status.hasPermission) {
+                  this.telemetryGeneratorService.generateInteractTelemetry(
+                    InteractType.TOUCH,
+                    InteractSubtype.ALLOW_CLICKED,
+                    Environment.SETTINGS,
+                    PageId.APP_PERMISSION_POPUP
+                  );
+                  resolve(true);
+                } else if (status.isPermissionAlwaysDenied) {
+                  await this.commonUtilService.showSettingsPageToast
+                    ('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, this.pageId, true);
+                  resolve(false);
+                } else {
+                  this.telemetryGeneratorService.generateInteractTelemetry(
+                    InteractType.TOUCH,
+                    InteractSubtype.DENY_CLICKED,
+                    Environment.SETTINGS,
+                    PageId.APP_PERMISSION_POPUP
+                  );
+                  await this.commonUtilService.showSettingsPageToast
+                    ('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, this.pageId, true);
+                }
+                resolve(undefined);
+              });
+          }
+        }, this.appName, this.commonUtilService.translateMessage('FILE_MANAGER'), 'FILE_MANAGER_PERMISSION_DESCRIPTION', this.pageId, true
       );
       await confirm.present();
     });
diff --git a/src/app/components/popups/sb-course-completion-popup/sb-course-completion-popup.component.html b/src/app/components/popups/sb-course-completion-popup/sb-course-completion-popup.component.html
new file mode 100644
index 000000000..f8a4b0ec2
--- /dev/null
+++ b/src/app/components/popups/sb-course-completion-popup/sb-course-completion-popup.component.html
@@ -0,0 +1,21 @@
+<ion-content>
+    <div class="course-completion-popup-container">
+        <div class="cc-popup-close clearfix">
+            <ion-icon class="pull-right" name="close" (click)="close()"></ion-icon>
+        </div>
+        <div class="ion-text-center">
+            <div>
+                <img src="assets/imgs/Badge green.svg" alt="">
+            </div>
+            <div class="course-completion-title">{{'CONGRATULATIONS' | translate}}</div>
+            <div class="course-completion-info">{{'FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY' | categoryKeyTranslate : course }}</div>
+            <div class="course-completion-cert" *ngIf="isCertified && certificateDescription">
+                <p>{{'FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC' | categoryKeyTranslate : course }}</p>
+                <p>{{certificateDescription}}</p>
+            </div>
+            <div class="course-completion-cert" *ngIf="isOnline && !isCertified">
+                {{'FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE' | categoryKeyTranslate : course }}
+            </div>
+        </div>
+    </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/app/components/popups/sb-course-completion-popup/sb-course-completion-popup.component.spec.ts b/src/app/components/popups/sb-course-completion-popup/sb-course-completion-popup.component.spec.ts
new file mode 100644
index 000000000..8444ae978
--- /dev/null
+++ b/src/app/components/popups/sb-course-completion-popup/sb-course-completion-popup.component.spec.ts
@@ -0,0 +1,65 @@
+import { CourseCompletionPopoverComponent } from './sb-course-completion-popup.component';
+import { PopoverController, NavParams } from '@ionic/angular';
+import { CommonUtilService } from '../../../../services';
+
+describe('CourseCompletionPopoverComponent', () => {
+
+    let courseCompletionPopoverComponent: CourseCompletionPopoverComponent;
+
+    const mockPopOverCtrl: Partial<PopoverController> = {};
+    const mockNavParams: Partial<NavParams> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+
+    beforeAll(() => {
+        courseCompletionPopoverComponent = new CourseCompletionPopoverComponent(
+            mockPopOverCtrl as PopoverController,
+            mockNavParams as NavParams,
+            mockCommonUtilService as CommonUtilService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should create a instance of courseCompletionPopoverComponent', () => {
+        expect(courseCompletionPopoverComponent).toBeTruthy();
+    });
+
+    it('ionViewWillEnter', () => {
+        // arrange
+        mockNavParams.get = jest.fn((arg) => {
+            let value;
+            switch (arg) {
+                case 'isCertified':
+                    value = false;
+                    break;
+                case 'certificateDescription':
+                    value = 'certificate description';
+                    break;
+            }
+            return value;
+        });
+        mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+
+        // act
+        courseCompletionPopoverComponent.ionViewWillEnter();
+
+        // assert
+        expect(mockNavParams.get).toHaveBeenNthCalledWith(1, 'isCertified');
+        expect(mockNavParams.get).toHaveBeenNthCalledWith(2, 'certificateDescription');
+        expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeTruthy();
+    });
+
+    it('close', () => {
+        // arrange
+        mockPopOverCtrl.dismiss = jest.fn();
+
+        // act
+        courseCompletionPopoverComponent.close();
+
+        // assert
+        expect(mockPopOverCtrl.dismiss).toHaveBeenCalled();
+    });
+});
diff --git a/src/app/components/popups/sb-course-completion-popup/sb-course-completion-popup.component.ts b/src/app/components/popups/sb-course-completion-popup/sb-course-completion-popup.component.ts
new file mode 100644
index 000000000..8e583c982
--- /dev/null
+++ b/src/app/components/popups/sb-course-completion-popup/sb-course-completion-popup.component.ts
@@ -0,0 +1,33 @@
+import { Component } from '@angular/core';
+import { NavParams, PopoverController } from '@ionic/angular';
+import { CommonUtilService } from '@app/services';
+
+@Component({
+  selector: 'app-my-groups-popover',
+  templateUrl: './sb-course-completion-popup.component.html'
+})
+export class CourseCompletionPopoverComponent {
+
+  isCertified = false;
+  isOnline = true;
+  certificateDescription = '';
+  course;
+
+  constructor(
+    private popOverCtrl: PopoverController,
+    private navParams: NavParams,
+    private commonUtilService: CommonUtilService
+  ) { }
+
+  ionViewWillEnter() {
+    this.isCertified = this.navParams.get('isCertified');
+    this.certificateDescription = this.navParams.get('certificateDescription');
+    this.isOnline = this.commonUtilService.networkInfo.isNetworkAvailable;
+    this.course = this.navParams.get('course');
+  }
+
+  close() {
+    this.popOverCtrl.dismiss();
+  }
+
+}
diff --git a/src/app/components/popups/sb-download-popup/sb-download-popup.component.spec.ts b/src/app/components/popups/sb-download-popup/sb-download-popup.component.spec.ts
index ec48c839e..47a8293f1 100644
--- a/src/app/components/popups/sb-download-popup/sb-download-popup.component.spec.ts
+++ b/src/app/components/popups/sb-download-popup/sb-download-popup.component.spec.ts
@@ -1,5 +1,5 @@
 import { SbDownloadPopupComponent } from './sb-download-popup.component';
-import { Events } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { FileSizePipe } from '../../../../pipes/file-size/file-size';
 import { SimpleChanges, SimpleChange } from '@angular/core';
 
diff --git a/src/app/components/popups/sb-download-popup/sb-download-popup.component.ts b/src/app/components/popups/sb-download-popup/sb-download-popup.component.ts
index 920ea0af4..0104d2f88 100644
--- a/src/app/components/popups/sb-download-popup/sb-download-popup.component.ts
+++ b/src/app/components/popups/sb-download-popup/sb-download-popup.component.ts
@@ -1,20 +1,13 @@
 import {
   Component,
-  NgZone,
-  ViewChild,
   EventEmitter,
-  Output,
   Input,
   OnChanges,
-  SimpleChanges,
-  OnInit
+  OnInit, Output,
+  SimpleChanges
 } from '@angular/core';
-import {
-  Events,
-  // Navbar,
-  ModalController
-} from '@ionic/angular';
 import { FileSizePipe } from '@app/pipes/file-size/file-size';
+import { Events } from '@app/util/events';
 
 @Component({
   selector: 'app-sb-download-popup',
diff --git a/src/app/components/popups/sb-generic-form-popover/sb-generic-form-popover.component.html b/src/app/components/popups/sb-generic-form-popover/sb-generic-form-popover.component.html
new file mode 100644
index 000000000..27e89f7cc
--- /dev/null
+++ b/src/app/components/popups/sb-generic-form-popover/sb-generic-form-popover.component.html
@@ -0,0 +1,29 @@
+<ion-header class="sb-popover-header" *ngIf="showHeader">
+  <ion-toolbar class="sb-popover-toolbar">
+    <ion-title class="sb-popover-title">{{sbPopoverHeading}}
+      <ion-icon name="close" class="sb-modal-close" (click)="closePopover()"></ion-icon>
+    </ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content class="sb-popover-container ion-no-padding">
+  <ion-list lines="none" class="content-share">
+    <ion-radio-group [(ngModel)]="selectedVal">
+
+      <ion-item *ngFor="let item of formItems;">
+        <ion-label>{{item.title | translate }}</ion-label>
+        <ion-radio slot="start" value="{{item.index}}" [disabled]="!item.isEnabled">
+        </ion-radio>
+      </ion-item>
+
+    </ion-radio-group>
+  </ion-list>
+</ion-content>
+
+<ion-footer>
+  <div class="sb-popover-footer">
+    <button class="sb-popover-action-btn " [ngClass]="btn.btnClass"
+      *ngFor="let btn of actionsButtons,let btn_index=index" (click)="submit(btn_index)">
+      {{btn.btntext }}</button>
+  </div>
+</ion-footer>
\ No newline at end of file
diff --git a/src/app/components/popups/sb-generic-form-popover/sb-generic-form-popover.component.ts b/src/app/components/popups/sb-generic-form-popover/sb-generic-form-popover.component.ts
new file mode 100644
index 000000000..a95676d31
--- /dev/null
+++ b/src/app/components/popups/sb-generic-form-popover/sb-generic-form-popover.component.ts
@@ -0,0 +1,55 @@
+import { Component, Input, OnInit, OnDestroy } from '@angular/core';
+import { Platform, PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { Subscription } from 'rxjs';
+
+@Component({
+  selector: 'app-sb-generic-form-popover',
+  templateUrl: './sb-generic-form-popover.component.html'
+})
+export class SbGenericFormPopoverComponent implements OnInit, OnDestroy {
+
+  @Input() actionsButtons: any;
+  @Input() icon: any;
+  @Input() metaInfo: any;
+  @Input() sbPopoverContent: any;
+  @Input() sbPopoverHeading: any;
+  @Input() sbPopoverMainTitle: any;
+  @Input() selectedContents: any;
+  @Input() showHeader = true;
+  @Input() formItems: any;
+  backButtonFunc: Subscription;
+  selectedVal: string;
+
+  constructor(
+    public popoverCtrl: PopoverController,
+    private platform: Platform,
+    private events: Events) { }
+
+  ngOnInit() {
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(11, () => {
+      this.popoverCtrl.dismiss({ isLeftButtonClicked: null });
+      this.backButtonFunc.unsubscribe();
+    });
+  }
+
+  ngOnDestroy(): void {
+    this.backButtonFunc.unsubscribe();
+  }
+
+  closePopover() {
+    this.popoverCtrl.dismiss({ isLeftButtonClicked: null });
+  }
+
+  submit(buttonIndex: number = 0) {
+    if (this.selectedVal) {
+      this.popoverCtrl.dismiss(
+        {
+          isLeftButtonClicked: !Boolean(buttonIndex),
+          selectedVal: this.formItems[parseInt(this.selectedVal, 10)]
+        }
+      );
+    }
+  }
+
+}
diff --git a/src/app/components/popups/sb-generic-popover/sb-generic-popover.component.html b/src/app/components/popups/sb-generic-popover/sb-generic-popover.component.html
index 21ae673d2..903d1e976 100644
--- a/src/app/components/popups/sb-generic-popover/sb-generic-popover.component.html
+++ b/src/app/components/popups/sb-generic-popover/sb-generic-popover.component.html
@@ -33,4 +33,4 @@
       *ngFor="let btn of actionsButtons,let btn_index=index" (click)="deleteContent(btn_index)">
       {{btn.btntext }}</button>
   </div>
-</ion-footer>
\ No newline at end of file
+</ion-footer> 
\ No newline at end of file
diff --git a/src/app/components/popups/sb-generic-popover/sb-generic-popover.component.scss b/src/app/components/popups/sb-generic-popover/sb-generic-popover.component.scss
index bbbf60f9a..4ee3b4438 100644
--- a/src/app/components/popups/sb-generic-popover/sb-generic-popover.component.scss
+++ b/src/app/components/popups/sb-generic-popover/sb-generic-popover.component.scss
@@ -1,5 +1,5 @@
 @import "src/assets/styles/base/_variables.scss";
-
+@import "src/assets/styles/_variables.scss";
 .flex-grow-1{
     flex-grow: 1;
 }
@@ -12,7 +12,7 @@
 .sb-dw-delete-popover{
     top: auto;
     .popover-content{
-        box-shadow: 0 0 4px 2px #ccc;
+        box-shadow: 0 0 4px 2px map-get($colors, medium_gray);
         .sb-popover-items{
             padding-bottom: 0 !important;
         }
@@ -35,4 +35,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/app/components/popups/sb-generic-popover/sb-generic-popover.component.spec.ts b/src/app/components/popups/sb-generic-popover/sb-generic-popover.component.spec.ts
index 5fe54695e..0ad1e2583 100644
--- a/src/app/components/popups/sb-generic-popover/sb-generic-popover.component.spec.ts
+++ b/src/app/components/popups/sb-generic-popover/sb-generic-popover.component.spec.ts
@@ -1,4 +1,5 @@
-import { Events, PopoverController, Platform } from '@ionic/angular';
+import { PopoverController, Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { SbGenericPopoverComponent } from '../sb-generic-popover/sb-generic-popover.component';
 
 describe('SbGenericPopoverComponent', () => {
diff --git a/src/app/components/popups/sb-generic-popover/sb-generic-popover.component.ts b/src/app/components/popups/sb-generic-popover/sb-generic-popover.component.ts
index cbf0c25b7..9212ed6ee 100644
--- a/src/app/components/popups/sb-generic-popover/sb-generic-popover.component.ts
+++ b/src/app/components/popups/sb-generic-popover/sb-generic-popover.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input, OnInit, OnDestroy } from '@angular/core';
-import { Events, Platform, PopoverController } from '@ionic/angular';
+import { Platform, PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { Subscription } from 'rxjs';
 
 @Component({
@@ -48,4 +49,4 @@ export class SbGenericPopoverComponent implements OnInit, OnDestroy {
     this.popoverCtrl.dismiss({ isLeftButtonClicked: !Boolean(buttonIndex) });
   }
 
-}
+}
\ No newline at end of file
diff --git a/src/app/components/popups/sb-insufficient-storage-popup/sb-insufficient-storage-popup.html b/src/app/components/popups/sb-insufficient-storage-popup/sb-insufficient-storage-popup.html
index 11b506495..d466394a8 100644
--- a/src/app/components/popups/sb-insufficient-storage-popup/sb-insufficient-storage-popup.html
+++ b/src/app/components/popups/sb-insufficient-storage-popup/sb-insufficient-storage-popup.html
@@ -1,5 +1,5 @@
 <ion-content class="no-net-popup">
-  <ion-grid padding>
+  <ion-grid class="ion-padding">
 
     <ion-row>
       <ion-col class="ion-no-padding" size="11" (click)="navigateToStorageSettings()">
diff --git a/src/app/components/popups/sb-insufficient-storage-popup/sb-insufficient-storage-popup.scss b/src/app/components/popups/sb-insufficient-storage-popup/sb-insufficient-storage-popup.scss
index e11a7d517..7970c824f 100644
--- a/src/app/components/popups/sb-insufficient-storage-popup/sb-insufficient-storage-popup.scss
+++ b/src/app/components/popups/sb-insufficient-storage-popup/sb-insufficient-storage-popup.scss
@@ -1,3 +1,4 @@
+@import "src/assets/styles/_variables.scss";
 sb-insufficient-storage-popup {
 
     .no-net-heading{
@@ -12,7 +13,7 @@ sb-insufficient-storage-popup {
     }
 
     .no-net-popup{
-        background-color: #E55A28 !important;
+        background-color: $orange !important;
         color: $white-color !important;
     }
 
diff --git a/src/app/components/popups/sb-insufficient-storage-popup/sb-insufficient-storage.popup.spec.ts b/src/app/components/popups/sb-insufficient-storage-popup/sb-insufficient-storage.popup.spec.ts
index e4cbdf365..6f4e9a1a3 100644
--- a/src/app/components/popups/sb-insufficient-storage-popup/sb-insufficient-storage.popup.spec.ts
+++ b/src/app/components/popups/sb-insufficient-storage-popup/sb-insufficient-storage.popup.spec.ts
@@ -1,5 +1,6 @@
 import { SbInsufficientStoragePopupComponent } from './sb-insufficient-storage-popup';
-import { Events, PopoverController, Platform, NavParams } from '@ionic/angular';
+import { PopoverController, Platform, NavParams } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { Router } from '@angular/router';
 
 describe('SbInsufficientStoragePopupComponent', () => {
diff --git a/src/app/components/popups/sb-my-groups-popover/sb-my-groups-popover.component.html b/src/app/components/popups/sb-my-groups-popover/sb-my-groups-popover.component.html
new file mode 100644
index 000000000..900f305e6
--- /dev/null
+++ b/src/app/components/popups/sb-my-groups-popover/sb-my-groups-popover.component.html
@@ -0,0 +1,38 @@
+<div id="main-content">
+  <img class="close-icon" src="assets/imgs/close_tutorial.svg" alt="close-icon" (click)="close(false)">
+  <div class="tutorial-content">
+    <div class="mg-popup-container" *ngIf="!isFromAddMember">
+      <div class="mg-popup-content">
+        <div class="mg-popup-title mg-popup-flex-item">{{'POWER_OF_GROUPS'| translate}}</div>
+        <div class="mg-flex-item text-center">
+          <img src="assets/imgs/my-groups-popup.svg" alt="">
+        </div>
+        <div class="mg-popup-content-body mg-popup-flex-item">{{'CREATE_GROUP_DESCRIPTION_POPUP' | translate}}</div>
+        <div class="mg-popup-btn-container mg-popup-flex-item">
+          <button class="mg-popup-btn sb-btn-large" (click)="getStarted()">
+            {{'GET_STARTED' | translate}}
+            <ion-icon class="mg-popup-btn-icon" name="arrow-forward"></ion-icon>
+          </button>
+        </div>
+      </div>
+    </div>
+    <div class="mg-popup-container" *ngIf="isFromAddMember">
+      <div class="mg-popup-content-member">
+        <div class="mg-popup-title mg-popup-flex-item">
+          <p class="am-title" [innerHTML]="'ADD_MEMBER_POPUP_TITLE' | translate:  {'%s': appName }"></p>
+          <p class="am-desc" [innerHTML]="'ADD_MEMBER_POPUP_DESC' | translate:  {'%s': appName }"></p>
+        </div>
+        <div>
+          <div class="mg-flex-item text-center mb-32">
+            <p class="am-step text-left" [innerHTML]="'ADD_MEMBER_POPUP_STEP_1' | translate"></p>
+            <img src="assets/imgs/add_member_step_1.png" alt="">
+          </div>
+          <div class="mg-popup-flex-item text-center">
+            <p class="am-step text-left" [innerHTML]="'ADD_MEMBER_POPUP_STEP_2' | translate:  {'%s': appName }"></p>
+            <img src="assets/imgs/add_member_step_2.svg" alt="">
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/components/popups/sb-my-groups-popover/sb-my-groups-popover.component.scss b/src/app/components/popups/sb-my-groups-popover/sb-my-groups-popover.component.scss
new file mode 100644
index 000000000..cf3abcddc
--- /dev/null
+++ b/src/app/components/popups/sb-my-groups-popover/sb-my-groups-popover.component.scss
@@ -0,0 +1,39 @@
+img.arrow-icon{
+    display: inline-block;
+    width: 22px;
+    margin-top: -3px;
+    &.animate {
+      position: relative;
+      animation: dropDown 5s linear infinite;
+      animation-duration: 0.9s;
+    }
+  }
+  @keyframes dropDown {
+    0% {right: 0;}
+    50% {right: 10px;}
+    100% {right: 0;}
+  }
+  
+  .tutorial-content {
+    height: 100%;
+    
+  }
+  .mg-popup-btn-container{
+    padding-bottom: 16px;
+    button {
+      margin: 0;
+    }
+  }
+  
+  .close-icon {
+    display: inline-block;
+    float: right;
+    position: absolute;
+    top: -10px;
+    right: -10px;
+  }
+  #main-content {
+    height: calc(100vh - 52px);
+    padding: 16px;
+    overflow-y: scroll;
+  }
\ No newline at end of file
diff --git a/src/app/components/popups/sb-my-groups-popover/sb-my-groups-popover.component.spec.ts b/src/app/components/popups/sb-my-groups-popover/sb-my-groups-popover.component.spec.ts
new file mode 100644
index 000000000..ccd62ecbc
--- /dev/null
+++ b/src/app/components/popups/sb-my-groups-popover/sb-my-groups-popover.component.spec.ts
@@ -0,0 +1,187 @@
+import { MyGroupsPopoverComponent } from '@app/app/components/popups/sb-my-groups-popover/sb-my-groups-popover.component';
+import { NavParams, PopoverController, Platform } from '@ionic/angular';
+import {
+    CommonUtilService,
+    Environment, ImpressionSubtype,
+    ImpressionType,
+    InteractSubtype,
+    InteractType,
+    PageId,
+    TelemetryGeneratorService
+} from '@app/services';
+
+describe('MyGroupsPopoverComponent', () => {
+    let myGroupsPopoverComponent: MyGroupsPopoverComponent;
+
+    const mockPopoverController: Partial<PopoverController> = {};
+    const mockNavParams: Partial<NavParams> = {
+        get: jest.fn((arg) => {
+            let value;
+            switch (arg) {
+                case 'title':
+                    value = 'mock_title';
+                    break;
+                case 'body':
+                    value = 'mock_body';
+                    break;
+                case 'buttonText':
+                    value = 'mock_button_text';
+                    break;
+                case 'isFromAddMember':
+                    value = true;
+                    break;
+            }
+            return value;
+        })
+    };
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockPlatform: Partial<Platform> = {};
+
+    beforeAll(() => {
+        myGroupsPopoverComponent = new MyGroupsPopoverComponent(
+            mockPopoverController as PopoverController,
+            mockNavParams as NavParams,
+            mockCommonUtilService as CommonUtilService,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockPlatform as Platform
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should create instance of myGroupspopoverComponent', () => {
+        // act
+        expect(myGroupsPopoverComponent).toBeTruthy();
+    });
+
+    it('should subscribe to back button ', () => {
+        // arrange
+        mockPopoverController.dismiss = jest.fn();
+        const subscribeWithPriorityData = jest.fn((_, fn) => fn());
+        mockPlatform.backButton = {
+            subscribeWithPriority: subscribeWithPriorityData,
+        } as any;
+
+        const unsubscribeFn = jest.fn();
+        myGroupsPopoverComponent.backButtonFunc = {
+            unsubscribe: unsubscribeFn,
+        } as any;
+
+        // act
+        myGroupsPopoverComponent.ngOnInit();
+        // assert
+        expect(unsubscribeFn).toHaveBeenCalled();
+        expect(mockPopoverController.dismiss).toHaveBeenCalled();
+    });
+
+    describe('ionViewWillEnter scenarios', () => {
+
+        it('should get appName and set it and generate telemetry if isFromAddMember returns true', () => {
+            // arrange
+            mockCommonUtilService.getAppName = jest.fn(() => Promise.resolve('sample_app_name'));
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockNavParams.get = jest.fn((arg) => {
+                let value;
+                switch (arg) {
+                    case 'isFromAddMember':
+                        value = true;
+                }
+                return value;
+            });
+            // act
+            myGroupsPopoverComponent.ionViewWillEnter();
+            // assert
+            expect(mockCommonUtilService.getAppName).toHaveBeenCalled();
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                ImpressionType.VIEW,
+                ImpressionSubtype.DISPLAY_DIKSHA_ID_TUTORIAL, PageId.ADD_MEMBER, Environment.GROUP
+            );
+        });
+
+        it('should get appName and set it and generate telemetry if isFromAddMember returns false', () => {
+            // arrange
+            mockCommonUtilService.getAppName = jest.fn(() => Promise.resolve('sample_app_name'));
+            mockNavParams.get = jest.fn((arg) => {
+                let value;
+                switch (arg) {
+                    case 'isFromAddMember':
+                        value = false;
+                }
+                return value;
+            });
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            // act
+            myGroupsPopoverComponent.ionViewWillEnter();
+            // assert
+            expect(mockCommonUtilService.getAppName).toHaveBeenCalled();
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                ImpressionType.VIEW,
+                ImpressionSubtype.GROUP_TUTORIAL, PageId.MY_GROUP, Environment.GROUP
+            );
+        });
+    });
+
+    describe('close function scenarios', () => {
+        it('should call interact telemetry and popoverController when close() called upon with true', () => {
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockPopoverController.dismiss = jest.fn();
+            // act
+            myGroupsPopoverComponent.close(true);
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.TUTORIAL_CONTINUE_CLICKED,
+                Environment.GROUP,
+                PageId.MY_GROUP
+            );
+            expect(mockPopoverController.dismiss).toHaveBeenCalled();
+        });
+
+        it('should call interact telemetry and popoverController when close() called upon with false', () => {
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockPopoverController.dismiss = jest.fn();
+            // act
+            myGroupsPopoverComponent.close(false);
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.CLOSE_CLICKED,
+                Environment.GROUP,
+                PageId.MY_GROUP
+            );
+            expect(mockPopoverController.dismiss).toHaveBeenCalled();
+        });
+
+        it('should call interact telemetry and popoverController when close() called upon with false and from add member flow', () => {
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockPopoverController.dismiss = jest.fn();
+            myGroupsPopoverComponent.isFromAddMember = true;
+            // act
+            myGroupsPopoverComponent.close(false);
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.CLOSE_CLICKED,
+                Environment.GROUP,
+                PageId.ADD_MEMBER
+            );
+            expect(mockPopoverController.dismiss).toHaveBeenCalled();
+        });
+    });
+
+    it('should call close() with true parameters when  getStarted() called upon', () => {
+        // arrange
+        jest.spyOn(myGroupsPopoverComponent, 'close').mockImplementation();
+        // act
+        myGroupsPopoverComponent.getStarted();
+        // assert
+        expect(myGroupsPopoverComponent.close).toHaveBeenCalledWith(true);
+    });
+});
diff --git a/src/app/components/popups/sb-my-groups-popover/sb-my-groups-popover.component.ts b/src/app/components/popups/sb-my-groups-popover/sb-my-groups-popover.component.ts
new file mode 100644
index 000000000..f3e6175af
--- /dev/null
+++ b/src/app/components/popups/sb-my-groups-popover/sb-my-groups-popover.component.ts
@@ -0,0 +1,71 @@
+import { Component, OnInit } from '@angular/core';
+import { NavParams, PopoverController, Platform } from '@ionic/angular';
+import {
+  CommonUtilService,
+  Environment,
+  ImpressionSubtype,
+  ImpressionType, InteractSubtype,
+  InteractType,
+  PageId,
+  TelemetryGeneratorService
+} from '@app/services';
+import { Subscription } from 'rxjs';
+
+@Component({
+  selector: 'app-my-groups-popover',
+  templateUrl: './sb-my-groups-popover.component.html',
+  styleUrls: ['./sb-my-groups-popover.component.scss'],
+})
+export class MyGroupsPopoverComponent implements OnInit {
+
+  title: string;
+  body: any;
+  buttonText: string;
+  isFromAddMember = false;
+  appName: string;
+  backButtonFunc: Subscription;
+
+  constructor(
+    private popOverCtrl: PopoverController,
+    private navParams: NavParams,
+    private commonUtilService: CommonUtilService,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+    private platform: Platform
+  ) { }
+
+  ngOnInit() {
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(11, () => {
+      this.popOverCtrl.dismiss();
+      this.backButtonFunc.unsubscribe();
+    });
+  }
+
+  ionViewWillEnter() {
+    this.buttonText = this.navParams.get('buttonText');
+    this.isFromAddMember = this.navParams.get('isFromAddMember');
+    this.commonUtilService.getAppName().then((res) => { this.appName = res; });
+
+    if (this.isFromAddMember) {
+      this.telemetryGeneratorService.generateImpressionTelemetry(ImpressionType.VIEW,
+        ImpressionSubtype.DISPLAY_DIKSHA_ID_TUTORIAL, PageId.ADD_MEMBER, Environment.GROUP);
+    } else {
+      this.telemetryGeneratorService.generateImpressionTelemetry(ImpressionType.VIEW,
+        ImpressionSubtype.GROUP_TUTORIAL, PageId.MY_GROUP, Environment.GROUP);
+    }
+  }
+
+  close(getStartedClicked: boolean) {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      getStartedClicked ? InteractSubtype.TUTORIAL_CONTINUE_CLICKED : InteractSubtype.CLOSE_CLICKED,
+      Environment.GROUP,
+      this.isFromAddMember ? PageId.ADD_MEMBER : PageId.MY_GROUP
+    );
+    this.popOverCtrl.dismiss();
+  }
+
+  getStarted() {
+    console.log('get started clicked');
+    this.close(true);
+  }
+}
diff --git a/src/app/components/popups/sb-no-network-popup/sb-no-network-popup.component.html b/src/app/components/popups/sb-no-network-popup/sb-no-network-popup.component.html
index 5ad4ea8db..6a7db1dd0 100644
--- a/src/app/components/popups/sb-no-network-popup/sb-no-network-popup.component.html
+++ b/src/app/components/popups/sb-no-network-popup/sb-no-network-popup.component.html
@@ -1,5 +1,5 @@
 <ion-content class="no-net-popup">
-  <ion-grid padding>
+  <ion-grid class="ion-padding">
 
     <ion-row>
       <ion-col class="ion-no-padding" size="1">
diff --git a/src/app/components/popups/sb-no-network-popup/sb-no-network-popup.component.scss b/src/app/components/popups/sb-no-network-popup/sb-no-network-popup.component.scss
index e8498cd73..3ed9c5933 100644
--- a/src/app/components/popups/sb-no-network-popup/sb-no-network-popup.component.scss
+++ b/src/app/components/popups/sb-no-network-popup/sb-no-network-popup.component.scss
@@ -1,5 +1,5 @@
 @import "src/assets/styles/base/_variables.scss";
-
+@import "src/assets/styles/_variables.scss";
     .no-net-heading{
         font-size: $font-size-normal;
         font-weight: $font-weight-bold;
@@ -12,7 +12,7 @@
     }
 
     .no-net-popup{
-        background-color: #E55A28 !important;
+        background-color: $orange !important;
         color: $white-color !important;
     }
 
diff --git a/src/app/components/popups/sb-no-network-popup/sb-no-network.popup.spec.ts b/src/app/components/popups/sb-no-network-popup/sb-no-network.popup.spec.ts
index 1112b4475..d2362ad09 100644
--- a/src/app/components/popups/sb-no-network-popup/sb-no-network.popup.spec.ts
+++ b/src/app/components/popups/sb-no-network-popup/sb-no-network.popup.spec.ts
@@ -1,5 +1,6 @@
 import { SbNoNetworkPopupComponent } from './sb-no-network-popup.component';
-import { Events, PopoverController, Platform, NavParams } from '@ionic/angular';
+import { PopoverController, Platform, NavParams } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { Router } from '@angular/router';
 
 describe('SbNoNetworkPopupComponent', () => {
diff --git a/src/app/components/popups/sb-popover/sb-popover.component.html b/src/app/components/popups/sb-popover/sb-popover.component.html
index e2f01dc1a..4458abe58 100644
--- a/src/app/components/popups/sb-popover/sb-popover.component.html
+++ b/src/app/components/popups/sb-popover/sb-popover.component.html
@@ -1,7 +1,7 @@
 <ion-header class="sb-popover-header">
   <ion-toolbar class="sb-popover-toolbar">
     <ion-title class="sb-popover-title">{{sbPopoverHeading}}
-      <ion-icon name="close" class="sb-modal-close" (click)="closePopover(true)"></ion-icon>
+      <ion-icon *ngIf="showCloseBtn" name="close" class="sb-modal-close" (click)="closePopover(true)"></ion-icon>
     </ion-title>
   </ion-toolbar>
 </ion-header>
@@ -15,7 +15,7 @@
       <img [src]=img alt="" />
     </div>
 
-    <div class="sb-popover-content-details" *ngIf="sbPopoverMainTitle || metaInfo || sbPopoverContent || sbPopoverHtmlContent">
+    <div class="sb-popover-content-details" *ngIf="sbPopoverMainTitle || metaInfo || sbPopoverContent || sbPopoverHtmlContent || sbPopoverInfo">
       <div class="main-title">
         {{sbPopoverMainTitle}}
         <div class="meta-info">
@@ -27,6 +27,9 @@
       </div>
       <div *ngIf="sbPopoverHtmlContent" [innerHTML]="sbPopoverHtmlContent">
       </div>
+      <div class="sb-popover-information" *ngIf="sbPopoverInfo">
+        {{sbPopoverInfo}}
+      </div>
     </div>
   </div>
 </ion-content>
diff --git a/src/app/components/popups/sb-popover/sb-popover.component.spec.ts b/src/app/components/popups/sb-popover/sb-popover.component.spec.ts
index 33c9c6f73..da611ca0c 100644
--- a/src/app/components/popups/sb-popover/sb-popover.component.spec.ts
+++ b/src/app/components/popups/sb-popover/sb-popover.component.spec.ts
@@ -21,7 +21,7 @@ describe('SbPopoverComponent', () => {
                     break;
                 case 'content':
                     value = {
-                        identifier: "identifier"
+                        identifier: 'identifier'
                     };
                     break;
                 case 'sbPopoverDynamicContent':
@@ -111,7 +111,7 @@ describe('SbPopoverComponent', () => {
                 done();
             }, 0);
         });
-        
+
         it('should close popover', async (done) => {
             // arrange
             const btn = {
@@ -162,6 +162,23 @@ describe('SbPopoverComponent', () => {
             expect(mockPopOverController.dismiss).toHaveBeenCalled();
             expect(unsubscribeFn).toHaveBeenCalled();
         });
+
+        it('should not dismiss the popup when backButton is clicked', () => {
+            // arrange
+            mockPlatform.backButton = {
+                subscribeWithPriority: jest.fn((_, fn) => fn()),
+            } as any;
+            sbPopoverComponent.disableDeviceBackButton = true;
+            const unsubscribeFn = jest.fn();
+            sbPopoverComponent.backButtonFunc = {
+                unsubscribe: unsubscribeFn
+            } as any;
+            // act
+            sbPopoverComponent.ionViewWillEnter();
+            // assert
+            expect(mockPopOverController.dismiss).not.toHaveBeenCalled();
+            expect(unsubscribeFn).not.toHaveBeenCalled();
+        });
     });
 
     describe('ngOnDestroy()', () => {
@@ -211,3 +228,78 @@ describe('SbPopoverComponent', () => {
     });
 
 });
+
+describe('SbPopoverComponent', () => {
+    let sbPopoverComponent: SbPopoverComponent;
+    const mockNavParams: Partial<NavParams> = {
+        get: jest.fn((arg) => {
+            let value;
+            switch (arg) {
+                case 'actionsButtons':
+                    value = [
+                        {
+                            btntext: 'OKAY',
+                            btnClass: 'popover-color',
+                            btnDisabled$: undefined
+                        }
+                    ];
+                    break;
+                case 'content':
+                    value = undefined;
+                    break;
+                case 'sbPopoverDynamicContent':
+                    value = undefined;
+                    break;
+                case 'sbPopoverDynamicMainTitle':
+                    value = undefined;
+                    break;
+                case 'btnDisabled':
+                    value = of([]);
+                    break;
+                case 'isChild':
+                    value = false;
+                    break;
+                case 'handler':
+                    value = () => {
+                    };
+                    break;
+            }
+            return value;
+        })
+    };
+
+    const mockPlatform: Partial<Platform> = {
+    };
+
+    const mockNgZone: Partial<NgZone> = {
+        run: jest.fn((fn) => fn())
+    };
+
+    const mockPopOverController: Partial<PopoverController> = {
+        dismiss: jest.fn()
+    };
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        showToast: jest.fn()
+    };
+
+    beforeAll(() => {
+        sbPopoverComponent = new SbPopoverComponent(
+            mockNavParams as NavParams,
+            mockPlatform as Platform,
+            mockNgZone as NgZone,
+            mockPopOverController as PopoverController,
+            mockCommonUtilService as CommonUtilService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create a instance of SbInsufficientStoragePopupComponent', () => {
+        expect(sbPopoverComponent.isChild).toBeFalsy();
+        expect(sbPopoverComponent.sbPopoverDynamicMainTitle$).toBeFalsy();
+        expect(sbPopoverComponent.sbPopoverDynamicContent$).toBeFalsy();
+    });
+
+});
diff --git a/src/app/components/popups/sb-popover/sb-popover.component.ts b/src/app/components/popups/sb-popover/sb-popover.component.ts
index 60b7efdc4..775b8c71b 100644
--- a/src/app/components/popups/sb-popover/sb-popover.component.ts
+++ b/src/app/components/popups/sb-popover/sb-popover.component.ts
@@ -1,9 +1,9 @@
 import { Component, NgZone, OnDestroy } from '@angular/core';
-import { Platform, NavParams, PopoverController } from '@ionic/angular';
-import { CorrelationData, Rollup } from 'sunbird-sdk';
-import { Observable, Subscription} from 'rxjs';
 import { CommonUtilService } from '@app/services/common-util.service';
-import { map, tap } from 'rxjs/operators';
+import { NavParams, Platform, PopoverController } from '@ionic/angular';
+import { Observable, Subscription } from 'rxjs';
+import { tap } from 'rxjs/operators';
+import { CorrelationData, Rollup } from 'sunbird-sdk';
 
 @Component({
   selector: 'sb-popover',
@@ -14,6 +14,7 @@ export class SbPopoverComponent implements OnDestroy {
   sbPopoverMainTitle: any;
   sbPopoverContent: any;
   sbPopoverHtmlContent?: string;
+  sbPopoverInfo: any;
   actionsButtons: any;
   icon: any;
   metaInfo: any;
@@ -27,6 +28,8 @@ export class SbPopoverComponent implements OnDestroy {
   pageName = '';
   showFlagMenu = true;
   img: any;
+  disableDeviceBackButton: boolean;
+  showCloseBtn = true;
   public objRollup: Rollup;
 
   public corRelationList: Array<CorrelationData>;
@@ -35,6 +38,7 @@ export class SbPopoverComponent implements OnDestroy {
   public sbPopoverDynamicContent$?: Observable<string>;
   public sbPopoverDynamicContentSubscription?: Subscription;
   public sbPopoverDynamicButtonDisabledSubscription?: Subscription;
+
   constructor(
     public navParams: NavParams,
     private platform: Platform,
@@ -50,6 +54,9 @@ export class SbPopoverComponent implements OnDestroy {
     this.sbPopoverHtmlContent = this.navParams.get('sbPopoverHtmlContent');
     this.sbPopoverHeading = this.navParams.get('sbPopoverHeading');
     this.sbPopoverMainTitle = this.navParams.get('sbPopoverMainTitle');
+    this.showCloseBtn = this.navParams.get('showCloseBtn');
+    this.sbPopoverInfo = this.navParams.get('sbPopoverInfo');
+
 
     this.content = this.navParams.get('content');
     this.data = this.navParams.get('data');
@@ -58,6 +65,7 @@ export class SbPopoverComponent implements OnDestroy {
     this.objRollup = this.navParams.get('objRollup');
     this.corRelationList = this.navParams.get('corRelationList');
     this.img = this.navParams.get('img');
+    this.disableDeviceBackButton = this.navParams.get('disableDeviceBackButton');
 
     // Dynamic
     this.sbPopoverDynamicMainTitle$ = this.navParams.get('sbPopoverDynamicMainTitle');
@@ -107,6 +115,9 @@ export class SbPopoverComponent implements OnDestroy {
 
   ionViewWillEnter() {
     this.backButtonFunc = this.platform.backButton.subscribeWithPriority(11, () => {
+      if (this.disableDeviceBackButton) {
+        return;
+      }
       this.popoverCtrl.dismiss();
       this.backButtonFunc.unsubscribe();
     });
diff --git a/src/app/components/popups/sb-profile-name-confirmation-popup/sb-profile-name-confirmation-popup.component.html b/src/app/components/popups/sb-profile-name-confirmation-popup/sb-profile-name-confirmation-popup.component.html
new file mode 100644
index 000000000..7a1c2e972
--- /dev/null
+++ b/src/app/components/popups/sb-profile-name-confirmation-popup/sb-profile-name-confirmation-popup.component.html
@@ -0,0 +1,40 @@
+<ion-header class="sb-popover-header">
+    <ion-toolbar class="sb-popover-toolbar">
+        <ion-title class="sb-popover-title text-left pl-16"> {{'FRMELEMNTS_LBL_PROFCONF' | translate}}
+            <ion-icon name="close" class="sb-modal-close" (click)="closePopover()"></ion-icon>
+        </ion-title>
+    </ion-toolbar>
+</ion-header>
+
+<ion-content class="sb-popover-container ion-no-padding">
+    <div class="sb-popover-items">
+        <div class="icon-container">
+            <img src="assets/imgs/profile_name_confirmation.png" alt="image">
+        </div>
+
+        <div class="sb-popover-content-details">
+            <div>{{'FRMELEMNTS_LBL_PROFTITLE' | translate}}:</div>
+            <div class="pnc-profile-name mt-8">
+                <span>{{ profile?.firstName | titlecase }} {{ profile?.lastName | titlecase }}</span>
+                <span (click)="onProfilePageClick()">
+                    <img src="assets/imgs/edit-icon.svg" alt="edit-name" />
+                </span>
+            </div>
+            <div class="pnc-padding-32"> {{'FRMELEMNTS_MSG_NAMEONCERT' | translate: {'%appName': appName} }} </div>
+            <div class="pnc-padding-32"> {{'FRMELEMNTS_MSG_EDITCERTNAME' | translate: {'%appName': appName} }} </div>
+            <div>
+                <ion-checkbox class="pnc-checkbox" color="secondary" checked="false" [(ngModel)]="doNotShowAgain">
+                </ion-checkbox>
+                <p class="pnc-checkbox-desc"> {{'FRMELEMNTS_CKBX_CERTMSG' | translate}} </p>
+            </div>
+        </div>
+    </div>
+</ion-content>
+
+<ion-footer>
+    <div class="sb-popover-footer">
+        <button class="sb-popover-action-btn popover-color" (click)="onSubmitClick()">
+            {{'START_LEARNING' | translate}}
+        </button>
+    </div>
+</ion-footer>
\ No newline at end of file
diff --git a/src/app/components/popups/sb-profile-name-confirmation-popup/sb-profile-name-confirmation-popup.component.scss b/src/app/components/popups/sb-profile-name-confirmation-popup/sb-profile-name-confirmation-popup.component.scss
new file mode 100644
index 000000000..f77d86392
--- /dev/null
+++ b/src/app/components/popups/sb-profile-name-confirmation-popup/sb-profile-name-confirmation-popup.component.scss
@@ -0,0 +1,28 @@
+@import "src/assets/styles/_variables.scss";
+
+ion-content {
+    background-color: map-get($colors, white );
+}
+.pnc-padding-32 {
+    padding: 16px 32px;
+}
+.pnc-profile-name {
+    font-weight: bold;
+    font-size: 20px;
+}
+.pnc-checkbox {
+    display: inline-block;
+}
+.pnc-checkbox-desc {
+    display: inline-block;
+    margin-left: 8px;
+    margin-bottom: 0px;
+    vertical-align: super;
+}
+ion-footer {
+    border-top: 1px solid map-get($colors, medium_gray );
+
+    .sb-popover-footer {
+        padding: 16px;
+    }
+}
\ No newline at end of file
diff --git a/src/app/components/popups/sb-profile-name-confirmation-popup/sb-profile-name-confirmation-popup.component.spec.ts b/src/app/components/popups/sb-profile-name-confirmation-popup/sb-profile-name-confirmation-popup.component.spec.ts
new file mode 100644
index 000000000..79460ddcb
--- /dev/null
+++ b/src/app/components/popups/sb-profile-name-confirmation-popup/sb-profile-name-confirmation-popup.component.spec.ts
@@ -0,0 +1,101 @@
+import { PopoverController } from '@ionic/angular';
+import { ProfileService, SharedPreferences } from '@project-sunbird/sunbird-sdk';
+import { of } from 'rxjs';
+import { AppGlobalService, CommonUtilService, NavigationService, } from '@app/services';
+import { mockProfileData } from '../../../profile/profile.page.spec.data';
+import { ProfileNameConfirmationPopoverComponent } from './sb-profile-name-confirmation-popup.component';
+import { PageId } from '../../../../services/telemetry-constants';
+import { PreferenceKey } from '../../../app.constant';
+
+describe('ProfileNameConfirmationPopoverComponent', () => {
+    let profileNameConfirmationPopoverComponent: ProfileNameConfirmationPopoverComponent;
+
+    const mockProfileService: Partial<ProfileService> = {};
+    const mockPreferences: Partial<SharedPreferences> = {};
+    const mockPopoverCtrl: Partial<PopoverController> = {
+        dismiss: jest.fn()
+    };
+    const mockNavService: Partial<NavigationService> = {
+        navigateToEditPersonalDetails: jest.fn()
+    };
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        openPopover: jest.fn(() => Promise.resolve())
+    };
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+
+    beforeAll(() => {
+        profileNameConfirmationPopoverComponent = new ProfileNameConfirmationPopoverComponent(
+            mockProfileService as ProfileService,
+            mockPreferences as SharedPreferences,
+            mockPopoverCtrl as PopoverController,
+            mockNavService as NavigationService,
+            mockAppGlobalService as AppGlobalService,
+            mockCommonUtilService as CommonUtilService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should create a instance of ProfileNameConfirmationPopoverComponent', () => {
+        expect(profileNameConfirmationPopoverComponent).toBeTruthy();
+    });
+
+    describe('ionViewWillEnter()', () => {
+        it('should initialize profile data', (done) => {
+            // arrange
+            mockCommonUtilService.getAppName = jest.fn(() => Promise.resolve('app-name'));
+            mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('sample-uid'));
+            mockProfileService.getServerProfilesDetails = jest.fn(() => of(mockProfileData) as any);
+
+            // act
+            profileNameConfirmationPopoverComponent.ionViewWillEnter();
+
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getAppName).toHaveBeenCalled();
+                expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('closePopOver()', () => {
+        it('should close popover', () => {
+            // arrange
+            // act
+            profileNameConfirmationPopoverComponent.closePopover({});
+            // assert
+            expect(mockPopoverCtrl.dismiss).toHaveBeenCalledWith({});
+        });
+    });
+
+    describe('onSubmitClick()', () => {
+        it('onSubmitClick should close popover', () => {
+            // arrange
+            mockPreferences.putBoolean = jest.fn(() => of(undefined));
+            // act
+            profileNameConfirmationPopoverComponent.onSubmitClick();
+            // assert
+            expect(mockPopoverCtrl.dismiss).toHaveBeenCalledWith({ buttonClicked: true });
+            expect(mockPreferences.putBoolean).toHaveBeenCalledWith(
+                PreferenceKey.DO_NOT_SHOW_PROFILE_NAME_CONFIRMATION_POPUP + '-sample_user_id', false);
+        });
+    });
+
+    describe('onProfilePageClick  test-suites', () => {
+        it('should generate telemetry and navigate to district mapping if network is available', () => {
+            // arrange
+            // act
+            profileNameConfirmationPopoverComponent.onProfilePageClick();
+            // assert
+            expect(mockNavService.navigateToEditPersonalDetails).toHaveBeenCalledWith(
+                mockProfileData,
+                PageId.PROFILE_NAME_CONFIRMATION_POPUP
+            );
+            expect(mockPopoverCtrl.dismiss).toHaveBeenCalledWith({ editProfileClicked: true });
+        });
+    });
+});
diff --git a/src/app/components/popups/sb-profile-name-confirmation-popup/sb-profile-name-confirmation-popup.component.ts b/src/app/components/popups/sb-profile-name-confirmation-popup/sb-profile-name-confirmation-popup.component.ts
new file mode 100644
index 000000000..a6e9ebeb1
--- /dev/null
+++ b/src/app/components/popups/sb-profile-name-confirmation-popup/sb-profile-name-confirmation-popup.component.ts
@@ -0,0 +1,66 @@
+import { Component, Inject } from '@angular/core';
+import { PopoverController } from '@ionic/angular';
+import { AppGlobalService, CommonUtilService, PageId } from '@app/services';
+import { PreferenceKey, ProfileConstants } from '@app/app/app.constant';
+import {
+  CachedItemRequestSourceFrom, ProfileService,
+  ServerProfileDetailsRequest,
+  SharedPreferences
+} from '@project-sunbird/sunbird-sdk';
+import { NavigationService } from '@app/services/navigation-handler.service';
+
+@Component({
+  selector: 'app-profile-name-confirmation-popover',
+  templateUrl: './sb-profile-name-confirmation-popup.component.html',
+  styleUrls: ['./sb-profile-name-confirmation-popup.component.scss'],
+})
+export class ProfileNameConfirmationPopoverComponent {
+
+  appName;
+  profile;
+  doNotShowAgain = false;
+
+  constructor(
+    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+    @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
+    private popoverCtrl: PopoverController,
+    private navService: NavigationService,
+    private appGlobalService: AppGlobalService,
+    private commonUtilService: CommonUtilService
+  ) { }
+
+  async ionViewWillEnter() {
+    this.commonUtilService.getAppName().then((res) => { this.appName = res; });
+
+    const userId = await this.appGlobalService.getActiveProfileUid();
+
+    const serverProfileDetailsRequest: ServerProfileDetailsRequest = {
+      userId,
+      requiredFields: ProfileConstants.REQUIRED_FIELDS,
+      from: CachedItemRequestSourceFrom.SERVER
+    };
+    this.profileService.getServerProfilesDetails(serverProfileDetailsRequest).toPromise()
+      .then((profileData) => {
+        this.profile = profileData;
+      })
+      .catch(err => {
+        console.error('ProfileNameConfirmationPopoverComponent', err);
+      });
+  }
+
+  onSubmitClick() {
+    const key = PreferenceKey.DO_NOT_SHOW_PROFILE_NAME_CONFIRMATION_POPUP + '-' + this.profile.userId;
+    this.preferences.putBoolean(key, this.doNotShowAgain).toPromise().then();
+    this.closePopover({ buttonClicked: true });
+  }
+
+  closePopover(data?) {
+    this.popoverCtrl.dismiss(data);
+  }
+
+  onProfilePageClick() {
+    this.navService.navigateToEditPersonalDetails(this.profile, PageId.PROFILE_NAME_CONFIRMATION_POPUP);
+    this.closePopover({ editProfileClicked: true });
+  }
+
+}
diff --git a/src/app/components/popups/sb-progress-loader/sb-progress-loader.page.html b/src/app/components/popups/sb-progress-loader/sb-progress-loader.page.html
new file mode 100644
index 000000000..d2e88f22d
--- /dev/null
+++ b/src/app/components/popups/sb-progress-loader/sb-progress-loader.page.html
@@ -0,0 +1,8 @@
+<ion-content>
+    <div class="content">
+        <img src="/assets/imgs/book.gif" alt="book"/>
+        <ion-progress-bar class="progress" color="primary" [value]="(progress | async) / 100"></ion-progress-bar>
+        <p class="load-status">{{'LOADER_PROGRESS_DESCRIPTION' | translate}}</p>
+        <p class="load-status">{{'LOADER_PROGRESS_DESC_SUB_HEADING' | translate}}</p>
+    </div>
+</ion-content>
diff --git a/src/app/components/popups/sb-progress-loader/sb-progress-loader.page.scss b/src/app/components/popups/sb-progress-loader/sb-progress-loader.page.scss
new file mode 100644
index 000000000..a2c443a70
--- /dev/null
+++ b/src/app/components/popups/sb-progress-loader/sb-progress-loader.page.scss
@@ -0,0 +1,20 @@
+@import "src/assets/styles/_variables.scss";
+
+.content {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  height: 100vh;
+  width: 100vw;
+
+  .progress {
+    width: 70vw;
+    margin-bottom: 10px;
+  }
+  .load-status {
+    margin-top: 5px;
+    font-size: 19px;
+    font-weight: bold;
+  }
+}
\ No newline at end of file
diff --git a/src/app/components/popups/sb-progress-loader/sb-progress-loader.page.ts b/src/app/components/popups/sb-progress-loader/sb-progress-loader.page.ts
new file mode 100644
index 000000000..c502d5bd7
--- /dev/null
+++ b/src/app/components/popups/sb-progress-loader/sb-progress-loader.page.ts
@@ -0,0 +1,29 @@
+import {Component, Input, OnDestroy, OnInit} from '@angular/core';
+import {Platform} from '@ionic/angular';
+import {Observable, Subscription} from 'rxjs';
+
+@Component({
+    selector: 'app-sb-progress-loader',
+    templateUrl: './sb-progress-loader.page.html',
+    styleUrls: ['./sb-progress-loader.page.scss'],
+})
+export class SbProgressLoaderPage implements OnInit, OnDestroy {
+    private backButtonSubscription: Subscription;
+    @Input()
+    public progress: Observable<number>;
+
+    constructor(private platform: Platform
+    ) {
+    }
+
+    ngOnInit() {
+        this.backButtonSubscription = this.platform.backButton.subscribeWithPriority(11, () => {
+        });
+    }
+
+    ngOnDestroy(): void {
+        if (this.backButtonSubscription) {
+            this.backButtonSubscription.unsubscribe();
+        }
+    }
+}
diff --git a/src/app/components/popups/sb-share-popup/sb-share-popup.component.html b/src/app/components/popups/sb-share-popup/sb-share-popup.component.html
index 174d016f1..bad2c8e45 100644
--- a/src/app/components/popups/sb-share-popup/sb-share-popup.component.html
+++ b/src/app/components/popups/sb-share-popup/sb-share-popup.component.html
@@ -1,3 +1,4 @@
+<ng-container *ngIf="!shareFromPlayer">
 <ion-header class="sb-popover-header">
   <ion-toolbar class="sb-popover-toolbar">
     <ion-title class="sb-popover-title">{{'SHARE' | translate}}
@@ -34,7 +35,7 @@
       <p class="share-desc">{{'DOWNLOAD_PATH' | translate}}</p>
 
       <div *ngIf="!content.isAvailableLocally" class="share-info">
-        <ion-icon name="ios-information-circle-outline"></ion-icon>
+        <ion-icon name="information-circle-outline"></ion-icon>
         {{'DOWNLOAD_FILE_INFO' | translate}}
       </div>
     </ion-radio-group>
@@ -50,4 +51,53 @@
     <button class="sb-popover-action-btn width-100 popover-color" *ngIf="shareType === shareOptions.save.value"
       (click)="saveFile()">{{'SAVE' | translate}}</button>
   </div>
-</ion-footer>
\ No newline at end of file
+</ion-footer>
+</ng-container>
+
+<!--share from player-->
+<ng-container *ngIf="shareFromPlayer">
+  <ion-header class="sb-popover-header">
+    <ion-toolbar class="sb-popover-toolbar">
+      <ion-title class="sb-popover-title">{{'SHARE' | translate}}
+        <ion-icon name="close" class="sb-modal-close" (click)="closePopover()"></ion-icon>
+      </ion-title>
+    </ion-toolbar>
+  </ion-header>
+  <div class="share-player-container">
+    <ion-radio-group [value]="shareOptions?.link?.value">
+      <ion-item lines="none">
+        <ion-label>{{shareOptions.link.name | translate}}</ion-label>
+        <ion-radio slot="start" value="{{shareOptions.link.value}}"></ion-radio>
+      </ion-item>
+      <div>
+        <p class="share-url">{{shareUrl}}</p>
+      </div>
+      <ion-item lines="none">
+        <ion-label>{{shareOptions.file.name | translate}}</ion-label>
+        <ion-radio slot="start" value="{{shareOptions.file.value}}" [disabled]="!content.isAvailableLocally">
+        </ion-radio>
+      </ion-item>
+      <div>
+        <p class="share-desc">
+          {{ 'DOWNLOAD_FILE_SIZE' | translate: {'%s': (content.sizeOnDevice ? content.sizeOnDevice: content.contentData.size) | fileSize } }}
+        </p>
+      </div>
+      <ion-item lines="none">
+        <ion-label>{{shareOptions.save.name | translate}}</ion-label>
+        <ion-radio slot="start" value="{{shareOptions.save.value}}" [disabled]="!content.isAvailableLocally">
+        </ion-radio>
+      </ion-item>
+      <div>
+        <p class="share-desc">{{'DOWNLOAD_PATH' | translate}}</p>
+      </div>
+    </ion-radio-group>
+  </div>
+  <div class="sb-popover-footer">
+    <button class="sb-popover-action-btn width-100 popover-color" *ngIf="shareType === shareOptions.link.value"
+      (click)="shareLink()">{{'SHARE' | translate}}</button>
+    <button class="sb-popover-action-btn width-100 popover-color" *ngIf="shareType === shareOptions.file.value"
+      (click)="shareFile()">{{'SEND' | translate}}</button>
+    <button class="sb-popover-action-btn width-100 popover-color" *ngIf="shareType === shareOptions.save.value"
+      (click)="saveFile()">{{'SAVE' | translate}}</button>
+  </div>
+</ng-container>
\ No newline at end of file
diff --git a/src/app/components/popups/sb-share-popup/sb-share-popup.component.scss b/src/app/components/popups/sb-share-popup/sb-share-popup.component.scss
index 38a99669c..3f861bd42 100644
--- a/src/app/components/popups/sb-share-popup/sb-share-popup.component.scss
+++ b/src/app/components/popups/sb-share-popup/sb-share-popup.component.scss
@@ -1,4 +1,5 @@
 @import "src/assets/styles/base/_variables.scss";
+@import "src/assets/styles/_variables.scss";
 
 .flex-grow-1{
     flex-grow: 1;
@@ -14,7 +15,7 @@
         margin-right: 10px !important;
     }
     .share-link{
-        border-bottom: 1px solid #eee;
+        border-bottom: 1px solid map-get($colors, empty_color);
     }
     .share-url{
         margin-left: 50px;
@@ -22,32 +23,67 @@
         text-overflow: ellipsis;
         white-space: nowrap;
         margin-right: 15px;
-        border: 1px solid #EDF4F9;
+        border: 1px solid $light-blue;
         padding: 5px;
-        color: #a4a4a4;
+        color: map-get($colors, gray_solid);
         position: relative;
         top: -10px;
     }
     .share-desc{
         text-align: left;
         margin-left: 50px;
-        color: #a4a4a4;
+        color: map-get($colors, gray_solid);
         position: relative;
-        top: -10px;
     }
     .share-info{
-        background: #EDF4F9;
+        background: $light-blue;
         margin-left: 20px;
         padding: 5px;
         margin-right: 15px;
         text-align: left;
         margin-bottom: 20px;
-        color: #333333a1;
+        color: map-get($colors, light_black);
         ion-icon{
-            color: #a4a4a4;
+            color: map-get($colors, gray_solid);
             position: relative;
             top: 3px;
         }
     }
 }
 
+.share-player-container {
+    display: grid;
+    grid-template-columns: 1fr 2fr;
+    grid-gap: 1em;
+    background: map-get($colors, white);
+    padding: 16px;
+
+    p {
+        padding-top: 16px;
+    }
+
+    ion-item {
+        --background: map-get($colors, white) !important;
+    }
+
+}
+
+@media only screen and (max-width: 480px) {
+    .share-player-container {
+        display: inherit;
+        background: map-get($colors, white);
+        padding: 16px;
+
+        p {
+            padding-top: 16px;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            overflow: hidden;
+        }
+
+        ion-item {
+            --background: map-get($colors, white);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/app/components/popups/sb-share-popup/sb-share-popup.component.spec.ts b/src/app/components/popups/sb-share-popup/sb-share-popup.component.spec.ts
index cda48a6ad..34ad9fb61 100644
--- a/src/app/components/popups/sb-share-popup/sb-share-popup.component.spec.ts
+++ b/src/app/components/popups/sb-share-popup/sb-share-popup.component.spec.ts
@@ -3,36 +3,29 @@ import {
     UtilityService,
     TelemetryGeneratorService,
     CommonUtilService,
-    AndroidPermissionsService, InteractType, InteractSubtype
+    AndroidPermissionsService, InteractType, InteractSubtype, AppGlobalService
 } from '../../../../services';
 import { SbSharePopupComponent } from './sb-share-popup.component';
-import {PopoverController, Platform, NavParams, ToastController} from '@ionic/angular';
+import { ContentService } from 'sunbird-sdk';
+import { PopoverController, Platform, NavParams } from '@ionic/angular';
 import {
     Environment,
     ImpressionType,
     ID,
     PageId,
 } from '@app/services/telemetry-constants';
-import { ContentType, MimeType, ShareUrl } from '@app/app/app.constant';
-import {AppVersion} from '@ionic-native/app-version/ngx';
-import {Router} from '@angular/router';
-import {of} from 'rxjs';
+import { AppVersion } from '@ionic-native/app-version/ngx';
+import { of } from 'rxjs';
+import { MimeType } from '../../../app.constant';
+import { CsContentType, CsPrimaryCategory } from '@project-sunbird/client-services/services/content';
 
 describe('SbSharePopupComponent', () => {
     let sbSharePopupComponent: SbSharePopupComponent;
-    const mockPopoverCtrl: Partial<PopoverController> = {
-        dismiss: jest.fn()
-    };
+    const mockContentService: Partial<ContentService> = {};
+    const mockPopoverCtrl: Partial<PopoverController> = {};
     const mockPlatform: Partial<Platform> = {};
-    mockPlatform.backButton = {
-        subscribeWithPriority: jest.fn((_, fn) => fn()),
-    } as any;
-    const mockContentShareHandler: Partial<ContentShareHandlerService> = {
-        shareContent: jest.fn()
-    };
-    const mockUtilityService: Partial<UtilityService> = {
-        getBuildConfigValue: jest.fn(() => Promise.resolve('baseurl'))
-    };
+    const mockContentShareHandler: Partial<ContentShareHandlerService> = {};
+    const mockUtilityService: Partial<UtilityService> = {};
     const mockNavParams: Partial<NavParams> = {
         get: jest.fn((arg) => {
             let value;
@@ -40,9 +33,12 @@ describe('SbSharePopupComponent', () => {
                 case 'content':
                     value = {
                         identifier: 'do_123',
+                        contentType: 'Resource',
+                        primaryCategory: 'learning resource',
                         contentData: {
                             contentType: 'Resource',
-                            pkgVersion: '1'
+                            pkgVersion: '1',
+                            primaryCategory: 'Learning Resource'
                         }
                     } as any;
                     break;
@@ -59,10 +55,7 @@ describe('SbSharePopupComponent', () => {
             return value;
         })
     };
-    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
-        generateInteractTelemetry: jest.fn(),
-        generateImpressionTelemetry: jest.fn()
-    };
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
     const mockAppVersion: Partial<AppVersion> = {
         getAppName: jest.fn(),
     };
@@ -70,10 +63,13 @@ describe('SbSharePopupComponent', () => {
     const mockPermissionService: Partial<AndroidPermissionsService> = {
         checkPermissions: jest.fn()
     };
-    const mockToastController: Partial<ToastController> = {};
-    const mockRouter: Partial<Router> = {};
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        setNativePopupVisible: jest.fn()
+    };
+
     beforeAll(() => {
         sbSharePopupComponent = new SbSharePopupComponent(
+            mockContentService as ContentService,
             mockPopoverCtrl as PopoverController,
             mockPlatform as Platform,
             mockContentShareHandler as ContentShareHandlerService,
@@ -83,45 +79,76 @@ describe('SbSharePopupComponent', () => {
             mockAppVersion as AppVersion,
             mockCommonUtilService as CommonUtilService,
             mockPermissionService as AndroidPermissionsService,
+            mockAppGlobalService as AppGlobalService
         );
     });
 
     beforeEach(() => {
         jest.clearAllMocks();
+        jest.resetAllMocks();
     });
 
     it('should create a instance of sbSharePopupComponent', () => {
         expect(sbSharePopupComponent).toBeTruthy();
     });
 
-    it('should generate telemetry on ngOninit', () => {
+    it('should generate telemetry on ngOninit', (done) => {
         // arrange
         const unsubscribeFn = jest.fn();
         sbSharePopupComponent.backButtonFunc = {
             unsubscribe: unsubscribeFn
         } as any;
-        jest.spyOn(sbSharePopupComponent, 'getContentEndPoint').mockImplementation();
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+        mockUtilityService.getBuildConfigValue = jest.fn(() => Promise.resolve('baseurl'));
+        mockContentService.getContentDetails = jest.fn(() => of({
+            identifier: 'do_1', mimeType: MimeType.COLLECTION, contentType: CsContentType.TEXTBOOK,
+            primaryCategory: CsPrimaryCategory.DIGITAL_TEXTBOOK.toLowerCase()
+        }));
+        mockPlatform.backButton = {
+            subscribeWithPriority: jest.fn((_, cb) => {
+                setTimeout(() => {
+                    cb();
+                }, 0);
+                return {
+                    unsubscribe: jest.fn()
+                };
+            }),
+        } as any;
+        mockPopoverCtrl.dismiss = jest.fn(() => Promise.resolve(true));
+
         // act
         sbSharePopupComponent.ngOnInit();
         // assert
-        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith('root-content',
-            '',
-            Environment.HOME,
-            'content-detail',
-            { id: 'do_123', type: 'Resource', version: '1' },
-            undefined,
-            { l1: 'do_1', l2: 'do_12' },
-            undefined,
-            ID.SHARE);
-        expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
-            ImpressionType.VIEW, '',
-            PageId.SHARE_CONTENT_POPUP,
-            Environment.HOME,
-            'do_123',
-            'Resource',
-            '1',
-            { l1: 'do_1', l2: 'do_12' },
-            undefined);
+        setTimeout(() => {
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith('root-content',
+                '',
+                Environment.HOME,
+                'content-detail',
+                { id: 'do_123', type: 'Learning Resource', version: '1' },
+                undefined,
+                { l1: 'do_1', l2: 'do_12' },
+                undefined,
+                ID.SHARE);
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                ImpressionType.VIEW, '',
+                PageId.SHARE_CONTENT_POPUP,
+                Environment.HOME,
+                'do_123',
+                'Learning Resource',
+                '1',
+                { l1: 'do_1', l2: 'do_12' },
+                undefined);
+            expect(mockPopoverCtrl.dismiss).toHaveBeenCalled();
+            expect(mockUtilityService.getBuildConfigValue).toHaveBeenCalledWith('BASE_URL');
+            expect(mockContentService.getContentDetails).toHaveBeenCalledWith({
+                contentId: 'do_1',
+                attachFeedback: false,
+                attachContentAccess: false,
+                emitUpdateIfAny: false
+            });
+            done();
+        }, 0);
     });
 
 
@@ -150,6 +177,7 @@ describe('SbSharePopupComponent', () => {
     it('should call sharecontent on shareLink', () => {
         // arrange
         mockPopoverCtrl.dismiss = jest.fn();
+        mockContentShareHandler.shareContent = jest.fn();
         // act
         sbSharePopupComponent.shareLink();
         // assert
@@ -161,7 +189,7 @@ describe('SbSharePopupComponent', () => {
         // arrange
         mockPopoverCtrl.dismiss = jest.fn();
         mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve(
-            {hasPermission: true}));
+            { hasPermission: true }));
         // act
         sbSharePopupComponent.shareFile();
         // assert
@@ -176,7 +204,7 @@ describe('SbSharePopupComponent', () => {
         // arrange
         mockPopoverCtrl.dismiss = jest.fn();
         mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve(
-            {hasPermission: true}));
+            { hasPermission: true }));
         // act
         sbSharePopupComponent.saveFile();
         // assert
@@ -190,7 +218,7 @@ describe('SbSharePopupComponent', () => {
     it('should show Error Toast in share File method if permission is given always denied and reject false', (done) => {
         // arrange
         mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve(
-            {isPermissionAlwaysDenied: true}));
+            { isPermissionAlwaysDenied: true }));
         mockCommonUtilService.showSettingsPageToast = jest.fn();
         // act
         sbSharePopupComponent.shareFile();
@@ -217,7 +245,7 @@ describe('SbSharePopupComponent', () => {
     it('should show Error Toast in save File method if permission is given always denied and reject false', (done) => {
         // arrange
         mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve(
-            {isPermissionAlwaysDenied: true}));
+            { isPermissionAlwaysDenied: true }));
         mockCommonUtilService.showSettingsPageToast = jest.fn();
         // act
         sbSharePopupComponent.saveFile();
@@ -242,10 +270,9 @@ describe('SbSharePopupComponent', () => {
     });
 
     it('should call permission popup on shareFile if not given', (done) => {
-        sbSharePopupComponent.exportApk = jest.fn(() => Promise.resolve());
         mockPopoverCtrl.dismiss = jest.fn();
         mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve(
-            {hasPermission: false}));
+            { hasPermission: false }));
         mockCommonUtilService.translateMessage = jest.fn();
         const presentFN = jest.fn(() => Promise.resolve());
 
@@ -265,7 +292,7 @@ describe('SbSharePopupComponent', () => {
     it('should call storage permission pop-up and NOT_NOW clicked ', (done) => {
         // arrange
         mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve(
-            {hasPermission: false}));
+            { hasPermission: false }));
         mockPopoverCtrl.dismiss = jest.fn();
 
         mockCommonUtilService.translateMessage = jest.fn(v => v);
@@ -301,9 +328,9 @@ describe('SbSharePopupComponent', () => {
 
     it('should call storage permission pop-up and ALLOW clicked and provide has permission false', (done) => {
         // arrange
-        mockPermissionService.requestPermission = jest.fn(() => of({hasPermission: false}));
+        mockPermissionService.requestPermission = jest.fn(() => of({ hasPermission: false }));
         mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve(
-            {hasPermission: false}));
+            { hasPermission: false }));
         mockPopoverCtrl.dismiss = jest.fn();
 
         mockCommonUtilService.translateMessage = jest.fn(v => v);
@@ -339,9 +366,9 @@ describe('SbSharePopupComponent', () => {
 
     it('should call storage permission pop-up and ALLOW clicked and provide has permission true ', (done) => {
         // arrange
-        mockPermissionService.requestPermission = jest.fn(() => of({hasPermission: true}));
+        mockPermissionService.requestPermission = jest.fn(() => of({ hasPermission: true }));
         mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve(
-            {hasPermission: false}));
+            { hasPermission: false }));
         mockPopoverCtrl.dismiss = jest.fn();
 
         mockCommonUtilService.translateMessage = jest.fn(v => v);
@@ -370,9 +397,9 @@ describe('SbSharePopupComponent', () => {
 
     it('should call storage permission pop-up and ALLOW clicked and provide has permission true ', (done) => {
         // arrange
-        mockPermissionService.requestPermission = jest.fn(() => of({isPermissionAlwaysDenied: true}));
+        mockPermissionService.requestPermission = jest.fn(() => of({ isPermissionAlwaysDenied: true }));
         mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve(
-            {hasPermission: false}));
+            { hasPermission: false }));
         mockPopoverCtrl.dismiss = jest.fn();
 
         mockCommonUtilService.translateMessage = jest.fn(v => v);
@@ -405,46 +432,4 @@ describe('SbSharePopupComponent', () => {
         }, 0);
     });
 
-
-    describe('getContentEndPoint()', () => {
-
-        beforeAll(() => {
-            sbSharePopupComponent = new SbSharePopupComponent(
-                mockPopoverCtrl as PopoverController,
-                mockPlatform as Platform,
-                mockContentShareHandler as ContentShareHandlerService,
-                mockUtilityService as UtilityService,
-                mockNavParams as NavParams,
-                mockTelemetryGeneratorService as TelemetryGeneratorService,
-                mockAppVersion as AppVersion,
-                mockCommonUtilService as CommonUtilService,
-                mockPermissionService as AndroidPermissionsService,
-            );
-        });
-
-        it('should return course endpoint', () => {
-            // arrange
-            // act
-            // assert
-            expect(sbSharePopupComponent.getContentEndPoint({ contentType: ContentType.COURSE } as any)).toEqual(ShareUrl.COURSE);
-        });
-
-        it('should return collection endpoint', () => {
-            // arrange
-            // act
-            sbSharePopupComponent.ngOnInit();
-            // assert
-            expect(sbSharePopupComponent.getContentEndPoint({ mimeType: MimeType.COLLECTION,
-                contentType: ContentType.TEXTBOOK } as any)).toEqual(ShareUrl.COLLECTION);
-        });
-
-        it('should return content endpoint', () => {
-            // arrange
-            // act
-            sbSharePopupComponent.ngOnInit();
-            // assert
-            expect(sbSharePopupComponent.getContentEndPoint(
-                { contentType: ContentType.RESOURCE } as any)).toEqual(ShareUrl.CONTENT);
-        });
-    });
 });
diff --git a/src/app/components/popups/sb-share-popup/sb-share-popup.component.ts b/src/app/components/popups/sb-share-popup/sb-share-popup.component.ts
index 933b98953..36a98e4cd 100644
--- a/src/app/components/popups/sb-share-popup/sb-share-popup.component.ts
+++ b/src/app/components/popups/sb-share-popup/sb-share-popup.component.ts
@@ -1,8 +1,11 @@
 import { UtilityService } from '@app/services/utility-service';
-import { Component, Input, OnInit, OnDestroy } from '@angular/core';
-import {Platform, PopoverController, NavParams, ToastController} from '@ionic/angular';
+import { Component, Input, OnInit, OnDestroy, Inject } from '@angular/core';
+import { Platform, PopoverController, NavParams } from '@ionic/angular';
 import { Subscription } from 'rxjs';
-import {AndroidPermissionsService, CommonUtilService, ContentShareHandlerService, TelemetryGeneratorService} from '@app/services';
+import {
+  AndroidPermissionsService, AppGlobalService, CommonUtilService,
+  ContentShareHandlerService, TelemetryGeneratorService
+} from '@app/services';
 import {
   Environment,
   ImpressionType,
@@ -11,11 +14,20 @@ import {
   InteractType,
   InteractSubtype
 } from '@app/services/telemetry-constants';
-import { TelemetryObject } from 'sunbird-sdk';
-import {ShareUrl, ShareMode, ContentType, MimeType} from '@app/app/app.constant';
+import {
+  TelemetryObject, ContentDetailRequest,
+  ContentService
+} from 'sunbird-sdk';
+import {
+  ShareUrl, ShareMode, MimeType
+} from '@app/app/app.constant';
 import { ContentUtil } from '@app/util/content-util';
-import {AndroidPermission, AndroidPermissionsStatus} from '@app/services/android-permissions/android-permission';
-import {AppVersion} from '@ionic-native/app-version/ngx';
+import {
+  AndroidPermission,
+  AndroidPermissionsStatus
+} from '@app/services/android-permissions/android-permission';
+import { AppVersion } from '@ionic-native/app-version/ngx';
+import { CsPrimaryCategory } from '@project-sunbird/client-services/services/content';
 
 @Component({
   selector: 'app-sb-share-popup',
@@ -27,6 +39,8 @@ export class SbSharePopupComponent implements OnInit, OnDestroy {
   @Input() content: any;
   @Input() corRelationList: any;
   @Input() objRollup: any;
+  @Input() moduleId: string;
+  @Input() subContentIds: Array<string> = [];
   backButtonFunc: Subscription;
   shareOptions = {
     link: {
@@ -48,8 +62,10 @@ export class SbSharePopupComponent implements OnInit, OnDestroy {
   pageId: string;
   telemetryObject: TelemetryObject;
   appName = '';
+  shareFromPlayer = false;
 
   constructor(
+    @Inject('CONTENT_SERVICE') private contentService: ContentService,
     public popoverCtrl: PopoverController,
     private platform: Platform,
     private contentShareHandler: ContentShareHandlerService,
@@ -59,12 +75,16 @@ export class SbSharePopupComponent implements OnInit, OnDestroy {
     private appVersion: AppVersion,
     private commonUtilService: CommonUtilService,
     private permissionService: AndroidPermissionsService,
+    private appGlobalService: AppGlobalService
   ) {
     this.content = this.navParams.get('content');
     this.corRelationList = this.navParams.get('corRelationList');
     this.objRollup = this.navParams.get('objRollup');
     this.shareItemType = this.navParams.get('shareItemType');
     this.pageId = this.navParams.get('pageId');
+    this.moduleId = this.navParams.get('moduleId');
+    this.subContentIds = this.navParams.get('subContentIds');
+    this.shareFromPlayer = this.navParams.get('shareFromPlayer');
   }
 
   async ngOnInit() {
@@ -77,13 +97,36 @@ export class SbSharePopupComponent implements OnInit, OnDestroy {
     });
     this.shareType = this.shareOptions.link.value;
     const baseUrl = await this.utilityService.getBuildConfigValue('BASE_URL');
-    this.shareUrl = baseUrl + this.getContentEndPoint(this.content) + this.content.identifier;
+
+    let rootContentIdentifier = this.content.identifier;
+    if (this.objRollup && this.objRollup.l1 && this.objRollup.l1 !== this.content.identifier) {
+      rootContentIdentifier = this.objRollup.l1;
+    }
+    this.shareUrl = baseUrl + await this.getContentEndPoint(this.content, rootContentIdentifier) + rootContentIdentifier;
+
     this.appName = await this.appVersion.getAppName();
   }
 
-  getContentEndPoint(content) {
+  ngOnDestroy(): void {
+    this.backButtonFunc.unsubscribe();
+  }
+
+  private async getContentEndPoint(content, rootContentIdentifier) {
+    if (content.identifier !== rootContentIdentifier) {
+      const contentDetailRequest: ContentDetailRequest = {
+        contentId: rootContentIdentifier,
+        attachFeedback: false,
+        attachContentAccess: false,
+        emitUpdateIfAny: false
+      };
+      await this.contentService.getContentDetails(contentDetailRequest).toPromise()
+        .then((contentDetail) => {
+          content = contentDetail;
+        });
+    }
+
     let endPoint = '';
-    if (content.contentType.toLowerCase() === ContentType.COURSE.toLowerCase()) {
+    if (content.primaryCategory.toLowerCase() === CsPrimaryCategory.COURSE.toLowerCase()) {
       endPoint = ShareUrl.COURSE;
     } else if (content.mimeType === MimeType.COLLECTION) {
       endPoint = ShareUrl.COLLECTION;
@@ -93,7 +136,7 @@ export class SbSharePopupComponent implements OnInit, OnDestroy {
     return endPoint;
   }
 
-  generateImpressionTelemetry() {
+  private generateImpressionTelemetry() {
     this.telemetryGeneratorService.generateImpressionTelemetry(
       ImpressionType.VIEW, '',
       PageId.SHARE_CONTENT_POPUP,
@@ -105,7 +148,7 @@ export class SbSharePopupComponent implements OnInit, OnDestroy {
       this.corRelationList);
   }
 
-  generateShareClickTelemetry() {
+  private generateShareClickTelemetry() {
     this.telemetryGeneratorService.generateInteractTelemetry(this.shareItemType,
       '',
       Environment.HOME,
@@ -117,7 +160,7 @@ export class SbSharePopupComponent implements OnInit, OnDestroy {
       ID.SHARE);
   }
 
-  generateConfirmClickTelemetry(shareMode) {
+  private generateConfirmClickTelemetry(shareMode) {
     this.telemetryGeneratorService.generateInteractTelemetry(shareMode,
       '',
       Environment.HOME,
@@ -129,10 +172,6 @@ export class SbSharePopupComponent implements OnInit, OnDestroy {
       ID.SHARE_CONFIRM);
   }
 
-  ngOnDestroy(): void {
-    this.backButtonFunc.unsubscribe();
-  }
-
   closePopover() {
     this.popoverCtrl.dismiss();
   }
@@ -143,7 +182,8 @@ export class SbSharePopupComponent implements OnInit, OnDestroy {
       byLink: true,
       link: this.shareUrl
     };
-    this.contentShareHandler.shareContent(shareParams, this.content, this.corRelationList, this.objRollup);
+    this.contentShareHandler.shareContent(shareParams, this.content, this.moduleId, this.subContentIds,
+      this.corRelationList, this.objRollup,  this.pageId);
     this.popoverCtrl.dismiss();
   }
 
@@ -155,7 +195,8 @@ export class SbSharePopupComponent implements OnInit, OnDestroy {
           byFile: true,
           link: this.shareUrl
         };
-        this.contentShareHandler.shareContent(shareParams, this.content, this.corRelationList, this.objRollup);
+        this.contentShareHandler.shareContent(shareParams, this.content, this.moduleId, this.subContentIds,
+          this.corRelationList, this.objRollup, this.pageId);
         this.popoverCtrl.dismiss();
       } else {
         this.commonUtilService.showSettingsPageToast('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, this.pageId, true);
@@ -170,7 +211,8 @@ export class SbSharePopupComponent implements OnInit, OnDestroy {
         const shareParams = {
           saveFile: true,
         };
-        this.contentShareHandler.shareContent(shareParams, this.content, this.corRelationList, this.objRollup);
+        this.contentShareHandler.shareContent(shareParams, this.content, this.moduleId, this.subContentIds,
+          this.corRelationList, this.objRollup, this.pageId);
         this.popoverCtrl.dismiss();
       } else {
         this.commonUtilService.showSettingsPageToast('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, this.pageId, true);
@@ -179,7 +221,7 @@ export class SbSharePopupComponent implements OnInit, OnDestroy {
   }
 
   private async checkForPermissions(): Promise<boolean | undefined> {
-    return new Promise < boolean | undefined>(async (resolve, reject) => {
+    return new Promise<boolean | undefined>(async (resolve, reject) => {
       const permissionStatus = await this.commonUtilService.getGivenPermissionStatus(AndroidPermission.WRITE_EXTERNAL_STORAGE);
 
       if (permissionStatus.hasPermission) {
@@ -203,36 +245,50 @@ export class SbSharePopupComponent implements OnInit, OnDestroy {
     await this.popoverCtrl.dismiss();
     return new Promise<boolean | undefined>(async (resolve, reject) => {
       const confirm = await this.commonUtilService.buildPermissionPopover(
-          async (selectedButton: string) => {
-              if (selectedButton === this.commonUtilService.translateMessage('NOT_NOW')) {
-                this.telemetryGeneratorService.generateInteractTelemetry(
+        async (selectedButton: string) => {
+          if (selectedButton === this.commonUtilService.translateMessage('NOT_NOW')) {
+            this.telemetryGeneratorService.generateInteractTelemetry(
+              InteractType.TOUCH,
+              InteractSubtype.NOT_NOW_CLICKED,
+              Environment.HOME,
+              PageId.PERMISSION_POPUP);
+            await this.commonUtilService.showSettingsPageToast('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, this.pageId, true);
+          } else if (selectedButton === this.commonUtilService.translateMessage('ALLOW')) {
+            this.telemetryGeneratorService.generateInteractTelemetry(
+              InteractType.TOUCH,
+              InteractSubtype.ALLOW_CLICKED,
+              Environment.HOME,
+              PageId.PERMISSION_POPUP);
+            this.appGlobalService.isNativePopupVisible = true;
+            this.permissionService.requestPermission(AndroidPermission.WRITE_EXTERNAL_STORAGE)
+              .subscribe(async (status: AndroidPermissionsStatus) => {
+                if (status.hasPermission) {
+                  this.telemetryGeneratorService.generateInteractTelemetry(
                     InteractType.TOUCH,
-                    InteractSubtype.NOT_NOW_CLICKED,
+                    InteractSubtype.ALLOW_CLICKED,
                     Environment.HOME,
-                    PageId.PERMISSION_POPUP);
-                await this.commonUtilService.showSettingsPageToast('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, this.pageId, true);
-              } else if (selectedButton === this.commonUtilService.translateMessage('ALLOW')) {
-                this.telemetryGeneratorService.generateInteractTelemetry(
+                    PageId.APP_PERMISSION_POPUP
+                  );
+                  resolve(true);
+                } else if (status.isPermissionAlwaysDenied) {
+                  await this.commonUtilService.showSettingsPageToast
+                    ('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, this.pageId, true);
+                  resolve(false);
+                } else {
+                  this.telemetryGeneratorService.generateInteractTelemetry(
                     InteractType.TOUCH,
-                    InteractSubtype.ALLOW_CLICKED,
+                    InteractSubtype.DENY_CLICKED,
                     Environment.HOME,
-                    PageId.PERMISSION_POPUP);
-                this.permissionService.requestPermission(AndroidPermission.WRITE_EXTERNAL_STORAGE)
-                    .subscribe(async (status: AndroidPermissionsStatus) => {
-                      if (status.hasPermission) {
-                        resolve(true);
-                      } else if (status.isPermissionAlwaysDenied) {
-                        await this.commonUtilService.showSettingsPageToast
-                        ('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, this.pageId, true);
-                        resolve(false);
-                      } else {
-                        await this.commonUtilService.showSettingsPageToast
-                        ('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, this.pageId, true);
-                      }
-                      resolve(undefined);
-                    });
-              }
-          }, this.appName, this.commonUtilService.translateMessage('FILE_MANAGER'), 'FILE_MANAGER_PERMISSION_DESCRIPTION', this.pageId, true
+                    PageId.APP_PERMISSION_POPUP
+                  );
+                  await this.commonUtilService.showSettingsPageToast
+                    ('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, this.pageId, true);
+                }
+                this.appGlobalService.setNativePopupVisible(false, 1000);
+                resolve(undefined);
+              });
+          }
+        }, this.appName, this.commonUtilService.translateMessage('FILE_MANAGER'), 'FILE_MANAGER_PERMISSION_DESCRIPTION', this.pageId, true
       );
       await confirm.present();
     });
diff --git a/src/app/components/popups/sb-subject-list-popup/sb-subject-list-popup.component.html b/src/app/components/popups/sb-subject-list-popup/sb-subject-list-popup.component.html
new file mode 100644
index 000000000..7af1fb318
--- /dev/null
+++ b/src/app/components/popups/sb-subject-list-popup/sb-subject-list-popup.component.html
@@ -0,0 +1,20 @@
+<div class="main-content">
+    <div class="py-16 px-24 title-section">
+       <span class="subject-title">{{'SUBJECT_OPTION_TEXT' | translate}}</span>
+        <img class="close-icon" src="assets/imgs/ic_action_close.svg" alt="close-icon" (click)="closePopover()">
+    </div>
+    <div class="p-16">
+        <sb-pills-grid [pillShape]="PillShape.DEFAULT"
+            [pillsMultiRow]="PillsMultiRow.SINGLE"
+            [pillsViewType]="PillsViewType.NONE"
+            [pillBorder]="PillBorder.SEMI_ROUND"
+            [pillSize]="PillSize.SMALL"
+            [pillTextElipsis]="PillTextElipsis.TWO_LINE"
+            (select)="handlePillSelect($event)">
+            <sb-pill-item *ngFor="let pillData of subjectList; let index=index" [name]="pillData?.value?.facet | translateJson | titlecase" 
+            [icon]="{ component: 'sb-pill-item', input: 'icon' } | themeInputsSelector : theme : pillData?.value?.facet"
+            [theme]="({ component: 'sb-pill-item', input: 'theme' } | themeInputsSelector : theme : pillData?.value?.facet) || (pillData?.value?.facet | randomColorMapPipe: index)"
+            [value]="pillData?.value"></sb-pill-item>
+        </sb-pills-grid>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/components/popups/sb-subject-list-popup/sb-subject-list-popup.component.scss b/src/app/components/popups/sb-subject-list-popup/sb-subject-list-popup.component.scss
new file mode 100644
index 000000000..414b615b8
--- /dev/null
+++ b/src/app/components/popups/sb-subject-list-popup/sb-subject-list-popup.component.scss
@@ -0,0 +1,17 @@
+@import "src/assets/styles/_variables.scss";
+
+.title-section{
+  border-bottom: 1px solid var(--app-primary-header);
+  position: sticky;
+  top: 0;
+  background-color: white;
+  .close-icon{
+    float: right;
+    width: 1.5rem;
+    height: 1.5rem;
+  }
+  
+  .subject-title{
+    font-size: 1rem;
+  }
+}
diff --git a/src/app/components/popups/sb-subject-list-popup/sb-subject-list-popup.component.ts b/src/app/components/popups/sb-subject-list-popup/sb-subject-list-popup.component.ts
new file mode 100644
index 000000000..4f92df624
--- /dev/null
+++ b/src/app/components/popups/sb-subject-list-popup/sb-subject-list-popup.component.ts
@@ -0,0 +1,54 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {PopoverController} from '@ionic/angular';
+import {PillShape, PillsViewType, PillBorder, ShowMoreViewType, PillsMultiRow, PillSize, PillTextElipsis} from '@project-sunbird/common-consumption';
+import {CorReleationDataType, Environment, ImpressionType, InteractType, PageId, TelemetryGeneratorService} from '@app/services';
+import {CorrelationData} from 'sunbird-sdk';
+
+@Component({
+    selector: 'app-sb-subject-list-popup',
+    templateUrl: './sb-subject-list-popup.component.html',
+    styleUrls: ['./sb-subject-list-popup.component.scss']
+})
+export class SbSubjectListPopupComponent implements OnInit {
+    @Input() public subjectList = [];
+    @Input() public title = '';
+    @Input() public theme;
+
+    PillShape = PillShape;
+    PillsViewType = PillsViewType;
+    PillBorder = PillBorder;
+    PillsMultiRow = PillsMultiRow;
+    PillTextElipsis = PillTextElipsis;
+    ShowMoreViewType = ShowMoreViewType;
+    PillSize = PillSize;
+
+    constructor(
+        private popoverCtrl: PopoverController,
+        private telemetryGeneratorService: TelemetryGeneratorService
+    ) {
+    }
+
+    handlePillSelect(event) {
+        if (!event || !event.data || !event.data.length) {
+          return;
+        }
+        this.popoverCtrl.dismiss(event);
+    }
+
+    closePopover() {
+        this.popoverCtrl.dismiss();
+    }
+
+    ngOnInit(): void {
+        const corRelationList: Array<CorrelationData> = [];
+        corRelationList.push({id: this.subjectList.toString(), type: CorReleationDataType.SUBJECT_LIST});
+        this.telemetryGeneratorService.generateImpressionTelemetry(
+            ImpressionType.POP_UP_CATEGORY,
+            '',
+            Environment.HOME,
+            PageId.HOME,
+            undefined, undefined, undefined, undefined,
+            corRelationList
+        );
+    }
+}
diff --git a/src/app/components/popups/sb-tutorial-popup/sb-tutorial-popup-component.spec.ts b/src/app/components/popups/sb-tutorial-popup/sb-tutorial-popup-component.spec.ts
new file mode 100644
index 000000000..dcadebe1d
--- /dev/null
+++ b/src/app/components/popups/sb-tutorial-popup/sb-tutorial-popup-component.spec.ts
@@ -0,0 +1,84 @@
+import {SbTutorialPopupComponent} from '@app/app/components/popups/sb-tutorial-popup/sb-tutorial-popup.component';
+import {NavParams, PopoverController} from '@ionic/angular';
+import {CommonUtilService} from '@app/services/common-util.service';
+import {TelemetryGeneratorService} from '@app/services/telemetry-generator.service';
+import {Environment, ImpressionSubtype, ImpressionType, InteractSubtype, InteractType, PageId} from '@app/services/telemetry-constants';
+
+describe('SbTutorialComponentPopup', () => {
+    let sbTutorialPopupComponent: SbTutorialPopupComponent;
+    const mockPopoverCtrl: Partial<PopoverController> = {};
+    const mockNavParams: Partial<NavParams> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        translateMessage: jest.fn()
+    };
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    beforeAll(() => {
+        sbTutorialPopupComponent = new SbTutorialPopupComponent(
+            mockPopoverCtrl as PopoverController,
+            mockNavParams as NavParams,
+            mockCommonUtilService as CommonUtilService,
+            mockTelemetryGeneratorService as TelemetryGeneratorService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create instance of sbTutorialComponent', () => {
+        // assert
+        expect(sbTutorialPopupComponent).toBeTruthy();
+    });
+
+    it('should get appLabel from navParams and setData in appName and set isPopover Present to true', (done) => {
+        // arrange
+        mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+        mockNavParams.get = jest.fn(() => 'Sunbird');
+        // act
+        sbTutorialPopupComponent.ngOnInit();
+        // assert
+        expect(sbTutorialPopupComponent.appName).toEqual('Sunbird');
+        expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+            ImpressionType.VIEW,
+            ImpressionSubtype.TUTORIAL_WALKTHROUGH,
+            PageId.LIBRARY,
+            Environment.HOME
+        );
+        setTimeout(() => {
+            expect(sbTutorialPopupComponent.isPopoverPresent).toBe(true);
+            done();
+        }, 2000);
+    });
+
+    it('should handle dismiss popover when onContinueClicked is true ', () => {
+        // arrange
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        mockPopoverCtrl.dismiss = jest.fn();
+        // act
+        sbTutorialPopupComponent.closePopover(true);
+        // assert
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH,
+            'tutorial-continue-clicked',
+            Environment.HOME,
+            PageId.APP_TUTORIAL_POPUP
+        );
+        expect(mockPopoverCtrl.dismiss).toHaveBeenCalled();
+    });
+    it('should handle dismiss popover when onContinueClicked is false ', () => {
+        // arrange
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        mockPopoverCtrl.dismiss = jest.fn();
+        // act
+        sbTutorialPopupComponent.closePopover(false);
+        // assert
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH,
+            InteractSubtype.CLOSE_CLICKED,
+            Environment.HOME,
+            PageId.APP_TUTORIAL_POPUP
+        );
+        expect(mockPopoverCtrl.dismiss).toHaveBeenCalled();
+    });
+
+});
diff --git a/src/app/components/popups/sb-tutorial-popup/sb-tutorial-popup.component.html b/src/app/components/popups/sb-tutorial-popup/sb-tutorial-popup.component.html
new file mode 100644
index 000000000..273d03a66
--- /dev/null
+++ b/src/app/components/popups/sb-tutorial-popup/sb-tutorial-popup.component.html
@@ -0,0 +1,27 @@
+<div id="main-content">
+    <img class="close-icon" src="assets/imgs/close_tutorial.svg" alt="close-icon" (click)="closePopover(false)">
+    <div class="tutorial-content">
+        <p id="heading-text ion-text-center ion-align-items-center">
+            {{'TUTORIAL_HEADING' | translate}}
+        </p>
+        <img style="margin-top: 2em; margin-bottom: 2em" src="./assets/imgs/tutorial.svg" alt="tutorial">
+        <p id="details-text"
+           [innerHTML]="'DETAIL_TUTORIAL' | translate:  {'%appName':  appName, '%explainVideos': explainVideos, '%quesBanks': quesBanks, '%interactiveMaterial': interactiveMaterial}">
+        </p>
+        <div style="display: flex; flex-grow: 1"></div>
+        <button class="sb-btn sb-btn-md sb-btn-primary PR35 W100 ellipsis text-uppercase btn-block continue"
+                (click)="closePopover(true)">
+            <ion-grid class="ion-no-padding">
+                <ion-row class="ion-justify-content-between">
+                    <ion-col class="ion-no-padding">
+                    </ion-col>
+                    <ion-col class="ion-no-padding">{{ 'TUTORIAL_BUTTON' | translate }}</ion-col>
+                    <ion-col class="ion-no-padding text-align-end ion-align-self-center">
+                        <img class="arrow-icon" src="assets/imgs/ic_back.svg" alt="arrow-icon"
+                             [class.animate]="isPopoverPresent">
+                    </ion-col>
+                </ion-row>
+            </ion-grid>
+        </button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/components/popups/sb-tutorial-popup/sb-tutorial-popup.component.scss b/src/app/components/popups/sb-tutorial-popup/sb-tutorial-popup.component.scss
new file mode 100644
index 000000000..4441dcf6f
--- /dev/null
+++ b/src/app/components/popups/sb-tutorial-popup/sb-tutorial-popup.component.scss
@@ -0,0 +1,52 @@
+@import "src/assets/styles/_variables.scss";
+img.arrow-icon{
+  display: inline-block;
+  width: 22px;
+  margin-top: -3px;
+  &.animate {
+    position: relative;
+    animation: dropDown 5s linear infinite;
+    animation-duration: 0.9s;
+  }
+}
+@keyframes dropDown {
+  0% {right: 0;}
+  50% {right: 10px;}
+  100% {right: 0;}
+}
+
+.tutorial-content {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  
+}
+
+.close-icon {
+  display: inline-block;
+  float: right;
+  position: absolute;
+  top: -10px;
+  right: -10px;
+}
+
+#details-text {
+  font-size: 14px;
+  line-height: 19px;
+  text-align: center;
+  color: map-get($colors, primary_black);
+}
+
+#heading-text {
+  margin-top: 1rem;
+  color: map-get($colors, primary_black);
+  font-weight: bold;
+  padding-left: 5em;
+  padding-right: 4em;
+}
+#main-content {
+  height: calc(100vh - 52px);
+  padding: 16px;
+  overflow-y: scroll;
+}
\ No newline at end of file
diff --git a/src/app/components/popups/sb-tutorial-popup/sb-tutorial-popup.component.ts b/src/app/components/popups/sb-tutorial-popup/sb-tutorial-popup.component.ts
new file mode 100644
index 000000000..d2305dda6
--- /dev/null
+++ b/src/app/components/popups/sb-tutorial-popup/sb-tutorial-popup.component.ts
@@ -0,0 +1,52 @@
+import {Component, OnInit} from '@angular/core';
+import {NavParams, PopoverController} from '@ionic/angular';
+import {CommonUtilService} from '@app/services/common-util.service';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import {Environment, ImpressionSubtype, ImpressionType, InteractSubtype, InteractType, PageId} from '@app/services/telemetry-constants';
+
+@Component({
+    selector: 'app-sb-tutorial-popup',
+    templateUrl: './sb-tutorial-popup.component.html',
+    styleUrls: ['./sb-tutorial-popup.component.scss']
+})
+export class SbTutorialPopupComponent implements OnInit {
+    appName = '';
+    isPopoverPresent = false;
+    explainVideos;
+    quesBanks;
+    interactiveMaterial;
+    constructor(
+        private popoverCtrl: PopoverController,
+        private navParams: NavParams,
+        private commonUtilService: CommonUtilService,
+        private telemetryGeneratorService: TelemetryGeneratorService
+    ) {
+        this.explainVideos = '<strong class="bold">' + this.commonUtilService.translateMessage('EXP_VIDEOS') + '</strong>';
+        this.quesBanks = '<strong class="bold">' + this.commonUtilService.translateMessage('QUES_BANKS') + '</strong>';
+        this.interactiveMaterial = '<strong class="bold">' + this.commonUtilService.translateMessage('INTERACTIVE_MATERIAL') + '</strong>';
+    }
+
+    ngOnInit() {
+        this.appName = this.navParams.get('appLabel');
+        this.telemetryGeneratorService.generateImpressionTelemetry(
+            ImpressionType.VIEW,
+            ImpressionSubtype.TUTORIAL_WALKTHROUGH,
+            PageId.LIBRARY,
+            Environment.HOME
+        );
+
+        setTimeout(() => {
+            this.isPopoverPresent = true;
+        }, 2000);
+    }
+
+    closePopover(continueClicked: boolean) {
+        this.popoverCtrl.dismiss();
+        this.telemetryGeneratorService.generateInteractTelemetry(
+            InteractType.TOUCH,
+            continueClicked ? InteractSubtype.TUTORIAL_CONTINUE_CLICKED : InteractSubtype.CLOSE_CLICKED,
+            Environment.HOME,
+            PageId.APP_TUTORIAL_POPUP
+        );
+    }
+}
diff --git a/src/app/components/popups/teacher-id-verification-popup/teacher-id-verification-popup.component.html b/src/app/components/popups/teacher-id-verification-popup/teacher-id-verification-popup.component.html
index 0882cebaa..b14b5843f 100644
--- a/src/app/components/popups/teacher-id-verification-popup/teacher-id-verification-popup.component.html
+++ b/src/app/components/popups/teacher-id-verification-popup/teacher-id-verification-popup.component.html
@@ -26,7 +26,7 @@ <h6 class="M0">{{tenantMessages?.popupHeaderLabel}}</h6>
             <p>{{'SELECT_YOUR_STATE' | translate}}</p>
             <div class="input-container">
                 <input type="text" class="input" placeholder="Select State" [(ngModel)]="stateName">
-                <ion-icon (click)="showStates = !showStates;" class="input-icon" name="ios-arrow-down">
+                <ion-icon (click)="showStates = !showStates;" class="input-icon" name="arrow-down">
                 </ion-icon>
             </div>
             <div class="showList" *ngIf="showStates">
diff --git a/src/app/components/popups/teacher-id-verification-popup/teacher-id-verification-popup.component.scss b/src/app/components/popups/teacher-id-verification-popup/teacher-id-verification-popup.component.scss
index a3806f5fe..54628a77f 100644
--- a/src/app/components/popups/teacher-id-verification-popup/teacher-id-verification-popup.component.scss
+++ b/src/app/components/popups/teacher-id-verification-popup/teacher-id-verification-popup.component.scss
@@ -1,4 +1,5 @@
 @import "src/assets/styles/variables.scss";
+@import "src/assets/styles/_variables.scss";
 
 .merged-input-container {
     border: 1px solid $info-color;
@@ -22,7 +23,7 @@
 }
 .sb-input-black {
     @extend .sb-input;
-    border: 1px solid #333333;
+    border: 1px solid map-get($colors, primary_black);
 }
 
 .sb-input-info {
@@ -39,19 +40,19 @@ input:focus {
     outline: $info-color auto 1px;
 }
 .input-container {
-    border: 0.5px solid #333333;
+    border: 0.5px solid map-get($colors, primary_black);
     padding: 8px;
     border-radius: 3px;
 
     .input {
-        border: #ffffff;
+        border: map-get($colors, white);
         outline: none;
     }
 
     .input-icon {
         float: right;
         font-size: 20px;
-        color: #333333;
+        color: map-get($colors, primary_black);
     }
 }
 .showList {
diff --git a/src/app/components/popups/teacher-id-verification-popup/teacher-id-verification-popup.component.ts b/src/app/components/popups/teacher-id-verification-popup/teacher-id-verification-popup.component.ts
index 3333698d6..5e07768f4 100644
--- a/src/app/components/popups/teacher-id-verification-popup/teacher-id-verification-popup.component.ts
+++ b/src/app/components/popups/teacher-id-verification-popup/teacher-id-verification-popup.component.ts
@@ -1,7 +1,8 @@
 import { Component, OnInit, Inject } from '@angular/core';
 import { PopoverController, NavParams } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { FormGroup, FormControl, Validators } from '@angular/forms';
-import { ProfileService, UserFeed, UserMigrateRequest, HttpClientError } from 'sunbird-sdk';
+import { ProfileService, UserMigrateRequest, HttpClientError } from 'sunbird-sdk';
 import { CommonUtilService } from '@app/services/common-util.service';
 import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
 import { featureIdMap } from '@app/feature-id-map';
@@ -48,7 +49,9 @@ export class TeacherIdVerificationComponent implements OnInit {
     private popOverCtrl: PopoverController,
     private navParams: NavParams,
     private telemetryGeneratorService: TelemetryGeneratorService,
-    private commonUtilService: CommonUtilService) {
+    private commonUtilService: CommonUtilService,
+    private events: Events
+  ) {
     if (this.navParams.data) {
       this.userFeed = this.navParams.data.userFeed;
       this.stateList = this.userFeed.data.prospectChannels;
@@ -148,10 +151,11 @@ export class TeacherIdVerificationComponent implements OnInit {
             featureIdMap.userVerification.EXTERNAL_USER_VERIFICATION,
             ID.USER_VERIFICATION_SUCCESS
           );
+          this.events.publish('loggedInProfile:update');
         }
       })
       .catch((error) => {
-        if (error instanceof HttpClientError) {
+        if (HttpClientError.isInstance(error)) {
           if (error.response.responseCode === 400) {
             this.generateTelemetryForFailedVerification();
             this.teacherIdFlag = TeacherIdPopupFlags.FAILED_STATE_ID;
diff --git a/src/app/components/popups/teacher-id-verification-popup/teacher-id-verification.component.spec.ts b/src/app/components/popups/teacher-id-verification-popup/teacher-id-verification.component.spec.ts
index 63a8dd987..a7a1d0c2b 100644
--- a/src/app/components/popups/teacher-id-verification-popup/teacher-id-verification.component.spec.ts
+++ b/src/app/components/popups/teacher-id-verification-popup/teacher-id-verification.component.spec.ts
@@ -1,8 +1,9 @@
 import { TeacherIdVerificationComponent } from './teacher-id-verification-popup.component';
 import { PopoverController, NavParams } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { TelemetryGeneratorService, CommonUtilService } from '../../../../services';
 import { of, throwError } from 'rxjs';
-import { ProfileService, HttpClientError, Response } from 'sunbird-sdk';
+import { ProfileService, HttpClientError, Response, HttpServerError } from 'sunbird-sdk';
 import { featureIdMap } from '@app/feature-id-map';
 import {
     Environment,
@@ -38,6 +39,7 @@ describe('TeacherIdVerificationComponent', () => {
     const mockCommonUtilService: Partial<CommonUtilService> = {
         showToast: jest.fn()
     };
+    const mockEvents: Partial<Events> = {};
 
 
     beforeAll(() => {
@@ -47,6 +49,7 @@ describe('TeacherIdVerificationComponent', () => {
             mockNavParams as NavParams,
             mockTelemetryGeneratorService as TelemetryGeneratorService,
             mockCommonUtilService as CommonUtilService,
+            mockEvents as Events
         );
     });
 
@@ -181,6 +184,19 @@ describe('TeacherIdVerificationComponent', () => {
                 done();
             }, 0);
         });
+
+        it('should not close the popup in value is expected', (done) => {
+            // arrange
+            jest.spyOn(teacherIdVerificationComponent, 'closePopup');
+            mockProfileService.userMigrate = jest.fn(() => of({ responseCode: 'ok1' }));
+            // act
+            teacherIdVerificationComponent.teacherConfirmation(false);
+            // assert
+            setTimeout(() => {
+                expect(teacherIdVerificationComponent.closePopup).not.toHaveBeenCalled();
+                done();
+            }, 0);
+        });
     });
 
     describe('submitTeacherId()', () => {
@@ -210,12 +226,67 @@ describe('TeacherIdVerificationComponent', () => {
                 featureIdMap.userVerification.EXTERNAL_USER_VERIFICATION,
                 ID.USER_VERIFICATION_SUBMITED);
         });
+
+        it('should invoke the userMigrate API with channel as stateName', () => {
+            // arrange
+            teacherIdVerificationComponent.teacherIdForm = { value: { teacherId: 'SAMPLE_TEACHERID' } } as any;
+            teacherIdVerificationComponent.stateName = 'TN';
+            jest.spyOn(teacherIdVerificationComponent, 'externalUserVerfication');
+            // act
+            teacherIdVerificationComponent.submitTeacherId();
+            // assert
+            expect(teacherIdVerificationComponent.count).toEqual(1);
+            expect(teacherIdVerificationComponent.externalUserVerfication).toHaveBeenCalledWith({
+                userId: '0123456789',
+                userExtId: 'SAMPLE_TEACHERID',
+                channel: 'TN',
+                action: 'accept',
+                feedId: '0123456789'
+            });
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.TOUCH,
+                '',
+                Environment.HOME,
+                PageId.EXTERNAL_USER_VERIFICATION_POPUP,
+                undefined,
+                undefined,
+                undefined,
+                featureIdMap.userVerification.EXTERNAL_USER_VERIFICATION,
+                ID.USER_VERIFICATION_SUBMITED);
+        });
+
+        it('should not inovoke the userMigrate api is teacherId is empty ', () => {
+            // arrange
+            teacherIdVerificationComponent.teacherIdForm = { value: { teacherId: undefined } } as any;
+            teacherIdVerificationComponent.stateName = '';
+            jest.spyOn(teacherIdVerificationComponent, 'externalUserVerfication');
+            // act
+            teacherIdVerificationComponent.submitTeacherId();
+            // assert
+            expect(teacherIdVerificationComponent.count).toEqual(1);
+            expect(teacherIdVerificationComponent.externalUserVerfication).not.toHaveBeenCalledWith({
+                userId: '0123456789',
+                userExtId: 'SAMPLE_TEACHERID',
+                channel: 'tn',
+                action: 'accept',
+                feedId: '0123456789'
+            });
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.TOUCH,
+                '',
+                Environment.HOME,
+                PageId.EXTERNAL_USER_VERIFICATION_POPUP,
+                undefined,
+                undefined,
+                undefined,
+                featureIdMap.userVerification.EXTERNAL_USER_VERIFICATION,
+                ID.USER_VERIFICATION_SUBMITED);
+        });
     });
 
     describe('externalUserVerfication()', () => {
         it('should generate INTERACT telemetry for successsfull validation', (done) => {
             // arrange
             mockProfileService.userMigrate = jest.fn(() => of(userMigrationResponse));
+            mockEvents.publish = jest.fn(() => []);
             // act
             teacherIdVerificationComponent.externalUserVerfication({
                 userId: '0123456789',
@@ -237,6 +308,7 @@ describe('TeacherIdVerificationComponent', () => {
                     featureIdMap.userVerification.EXTERNAL_USER_VERIFICATION,
                     ID.USER_VERIFICATION_SUCCESS);
                 done();
+                expect(mockEvents.publish).toHaveBeenCalled();
             }, 0);
         });
 
@@ -358,5 +430,69 @@ describe('TeacherIdVerificationComponent', () => {
                 done();
             }, 0);
         });
+
+        it('should not show any TOAST if its not a client error', (done) => {
+            // arrange
+            const sunbirdResponse = new Response<any>();
+            sunbirdResponse.responseCode = 500;
+            sunbirdResponse.body = {};
+            mockProfileService.userMigrate = jest.fn(() => throwError(new HttpServerError('', sunbirdResponse)));
+            jest.spyOn(teacherIdVerificationComponent, 'closePopup');
+            // act
+            teacherIdVerificationComponent.externalUserVerfication({});
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.showToast).not.toHaveBeenCalledWith('USER_IS_NOT_VERIFIED');
+                expect(teacherIdVerificationComponent.closePopup).not.toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+});
+
+describe('TeacherIdVerificationComponent', () => {
+    let teacherIdVerificationComponent: TeacherIdVerificationComponent;
+
+    const userMigrationResponse = { responseCode: 'ok' } as any;
+    const mockProfileService: Partial<ProfileService> = {
+        userMigrate: jest.fn(() => of(userMigrationResponse))
+    };
+    const mockPopOverController: Partial<PopoverController> = {
+        dismiss: jest.fn()
+    };
+    const mockNavParams: Partial<NavParams> = {
+        data: undefined
+    };
+
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateImpressionTelemetry: jest.fn(),
+        generateInteractTelemetry: jest.fn()
+    };
+
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        showToast: jest.fn()
+    };
+    const mockEvents: Partial<Events> = {};
+
+
+    beforeAll(() => {
+        teacherIdVerificationComponent = new TeacherIdVerificationComponent(
+            mockProfileService as ProfileService,
+            mockPopOverController as PopoverController,
+            mockNavParams as NavParams,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockCommonUtilService as CommonUtilService,
+            mockEvents as Events
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should not populate the attributes ', () => {
+        expect(teacherIdVerificationComponent.userFeed).toBeFalsy();
+        expect(teacherIdVerificationComponent.stateList).toBeFalsy();
+        expect(teacherIdVerificationComponent.tenantMessages).toBeFalsy();
     });
 });
diff --git a/src/app/components/popups/toast-navigation/toast-navigation.component.html b/src/app/components/popups/toast-navigation/toast-navigation.component.html
new file mode 100644
index 000000000..d905c4e39
--- /dev/null
+++ b/src/app/components/popups/toast-navigation/toast-navigation.component.html
@@ -0,0 +1,14 @@
+<ion-content class="toast-container">
+  <div *ngIf="message">
+    <div>
+      {{message}}
+    </div>
+    <div *ngIf="description">
+      {{description}}
+    </div>
+    <div>
+      <button [ngClass]="btn.btnClass" *ngFor="let btn of actionsButtons"
+        (click)='onSuccessClick()'> {{btn.btntext }}</button>
+    </div>
+  </div>
+</ion-content>
diff --git a/src/app/components/popups/toast-navigation/toast-navigation.component.scss b/src/app/components/popups/toast-navigation/toast-navigation.component.scss
new file mode 100644
index 000000000..90eaa9e39
--- /dev/null
+++ b/src/app/components/popups/toast-navigation/toast-navigation.component.scss
@@ -0,0 +1,20 @@
+@import "src/assets/styles/_variables.scss";
+
+.toast-container{
+  --padding-top: 16px;
+  --padding-bottom: 16px;
+  --padding-start: 16px;
+  --padding-end: 16px;
+  --background: #{$gray-800};
+  --color: #{$white};
+}
+
+.btn-right{
+  float: right;
+  background-color: map-get($colors, primary_black);
+  padding: 12px;
+  color: map-get($colors, vivid_orange);
+  font-family: "Noto Sans", sans-serif;
+  font-size: 14px;
+  text-transform: uppercase;
+}
\ No newline at end of file
diff --git a/src/app/components/popups/toast-navigation/toast-navigation.component.ts b/src/app/components/popups/toast-navigation/toast-navigation.component.ts
new file mode 100644
index 000000000..8a5f2c91b
--- /dev/null
+++ b/src/app/components/popups/toast-navigation/toast-navigation.component.ts
@@ -0,0 +1,42 @@
+import { Component, OnDestroy } from '@angular/core';
+import { Platform, NavParams, PopoverController } from '@ionic/angular';
+import { Subscription} from 'rxjs';
+
+@Component({
+  selector: 'app-toast-navigation',
+  templateUrl: './toast-navigation.component.html',
+  styleUrls: ['./toast-navigation.component.scss'],
+})
+export class ToastNavigationComponent implements OnDestroy {
+  message: any;
+  description: any;
+  btnText: any;
+  backButtonFunc: Subscription;
+
+  constructor(
+    public navParams: NavParams,
+    private platform: Platform,
+    private popoverCtrl: PopoverController,
+  ) {
+    this.message = this.navParams.get('message');
+    this.description = this.navParams.get('description');
+    this.btnText = this.navParams.get('btnText');
+  }
+
+  ionViewWillEnter() {
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(11, () => {
+      this.popoverCtrl.dismiss();
+      this.backButtonFunc.unsubscribe();
+    });
+  }
+
+  ngOnDestroy(): void {
+    if (this.backButtonFunc) {
+      this.backButtonFunc.unsubscribe();
+    }
+  }
+
+  onSuccessClick() {
+    this.popoverCtrl.dismiss(true);
+  }
+}
diff --git a/src/app/components/popups/upgrade-popover/upgrade-popover.component.html b/src/app/components/popups/upgrade-popover/upgrade-popover.component.html
index a3172fe28..8f8dc1c59 100644
--- a/src/app/components/popups/upgrade-popover/upgrade-popover.component.html
+++ b/src/app/components/popups/upgrade-popover/upgrade-popover.component.html
@@ -12,7 +12,7 @@ <h6>
         <p class="scroll">{{upgradeType?.desc | translate }}</p>
     </div>
 </ion-content>
-<ion-footer no-border padding>
+<ion-footer class="ion-no-border ion-padding">
     <ion-button *ngIf="!isMandatoryUpgrade && actionButtonNo" expand="block" fill="outline" size="small"
         (click)="cancel() ">
         {{ actionButtonNo.label | translate }}
diff --git a/src/app/components/popups/upgrade-popover/upgrade-popover.component.spec.ts b/src/app/components/popups/upgrade-popover/upgrade-popover.component.spec.ts
index 3539c702f..e9a8cebe8 100644
--- a/src/app/components/popups/upgrade-popover/upgrade-popover.component.spec.ts
+++ b/src/app/components/popups/upgrade-popover/upgrade-popover.component.spec.ts
@@ -7,6 +7,13 @@ import { AppVersion } from '@ionic-native/app-version/ngx';
 
 describe('UpgradePopoverComponent', () => {
     let upgradePopoverComponent: UpgradePopoverComponent;
+
+    window.cordova.plugins = {
+        InAppUpdateManager: {
+            checkForImmediateUpdate: jest.fn()
+        }
+    };
+
     const mockUtilityService: Partial<UtilityService> = {
         openPlayStore: jest.fn()
     };
@@ -90,7 +97,6 @@ describe('UpgradePopoverComponent', () => {
         // act
         upgradePopoverComponent.upgradeApp('https://play.google.com/store/apps/details?id=org.sunbird.app');
         // assert
-        expect(mockUtilityService.openPlayStore).toHaveBeenCalledWith('org.sunbird.app');
         expect(mockPopOverController.dismiss).toHaveBeenCalled();
     });
 
@@ -100,7 +106,6 @@ describe('UpgradePopoverComponent', () => {
         // act
         upgradePopoverComponent.upgradeApp('https://play.google.com/store/apps/details?id=org.sunbird.app');
         // assert
-        expect(mockUtilityService.openPlayStore).toHaveBeenCalledWith('org.sunbird.app');
         expect(mockPopOverController.dismiss).not.toHaveBeenCalled();
     });
 
@@ -238,3 +243,86 @@ describe('UpgradeComponent in deeplink ', () => {
 
 
 });
+
+describe('UpgradeComponent in deeplink for deeplink upgrade scenario ', () => {
+    let upgradePopoverComponent: UpgradePopoverComponent;
+    const mockUtilityService: Partial<UtilityService> = {
+        openPlayStore: jest.fn()
+    };
+    const mockAppVersion: Partial<AppVersion> = {
+        getAppName: jest.fn(() => Promise.resolve('some_string'))
+    };
+    const mockPopOverController: Partial<PopoverController> = {
+        dismiss: jest.fn()
+    };
+
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateInteractTelemetry: jest.fn(),
+        generateImpressionTelemetry: jest.fn()
+    };
+
+    const mockNavParams: Partial<NavParams> = {
+        get: jest.fn((arg) => {
+            let value;
+            switch (arg) {
+                case 'upgrade':
+                    value = {
+                        type: 'optional',
+                        title: 'We recommend that you upgrade to the latest version of Sunbird.',
+                        desc: '',
+                        isOnboardingCompleted: false,
+                        currentAppVersionCode: 1,
+                        requiredVersionCode: 2,
+                        isFromDeeplink: true
+                    };
+                    break;
+            }
+            return value;
+        })
+    };
+
+    beforeAll(() => {
+        upgradePopoverComponent = new UpgradePopoverComponent(
+            mockUtilityService as UtilityService,
+            mockPopOverController as PopoverController,
+            mockNavParams as NavParams,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockAppVersion as AppVersion
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+
+    it('should generate deeplink upgradeinteract event when init() called', (done) => {
+        // arrange
+        // act
+        upgradePopoverComponent.init();
+
+        setTimeout(() => {
+            // assert
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                ImpressionType.VIEW,
+                ImpressionSubtype.DEEPLINK,
+                PageId.UPGRADE_POPUP,
+                Environment.ONBOARDING
+            );
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.OTHER,
+                InteractSubtype.DEEPLINK_UPGRADE,
+                Environment.ONBOARDING,
+                PageId.UPGRADE_POPUP,
+                undefined,
+                {
+                    currentAppVersionCode: 1,
+                    requiredVersionCode: 2
+                }
+            );
+            done();
+        }, 0);
+    });
+
+
+});
diff --git a/src/app/components/popups/upgrade-popover/upgrade-popover.component.ts b/src/app/components/popups/upgrade-popover/upgrade-popover.component.ts
index 82105f5dc..faae713bf 100644
--- a/src/app/components/popups/upgrade-popover/upgrade-popover.component.ts
+++ b/src/app/components/popups/upgrade-popover/upgrade-popover.component.ts
@@ -12,6 +12,9 @@ import {
 import { TelemetryGeneratorService } from '../../../../services/telemetry-generator.service';
 import { AppVersion } from '@ionic-native/app-version/ngx';
 
+declare const cordova;
+
+
 @Component({
   selector: 'app-upgrade-popover',
   templateUrl: './upgrade-popover.component.html',
@@ -94,8 +97,11 @@ export class UpgradePopoverComponent {
   }
 
   upgradeApp(link) {
-    const appId = link.substring(link.indexOf('=') + 1, link.length);
-    this.utilityService.openPlayStore(appId);
+    // for in app update
+    cordova.plugins.InAppUpdateManager.checkForImmediateUpdate(
+        () => {},
+        () => {}
+    );
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
       InteractSubtype.UPGRADE_CLICKED,
diff --git a/src/app/components/popups/view-credits/view-credits.component.html b/src/app/components/popups/view-credits/view-credits.component.html
index 4050e7de6..9dcd24a5f 100644
--- a/src/app/components/popups/view-credits/view-credits.component.html
+++ b/src/app/components/popups/view-credits/view-credits.component.html
@@ -10,7 +10,7 @@
   <br />
 </ion-header>
 <ion-content>
-  <ion-grid padding>
+  <ion-grid class="ion-padding">
     <div *ngIf="content?.creators || content?.creator">
       <ion-row class="text-gray-color">
         {{ 'CREATORS' | translate }}
diff --git a/src/app/components/popups/view-credits/view-credits.component.spec.ts b/src/app/components/popups/view-credits/view-credits.component.spec.ts
index 3545292e8..858fb10ba 100644
--- a/src/app/components/popups/view-credits/view-credits.component.spec.ts
+++ b/src/app/components/popups/view-credits/view-credits.component.spec.ts
@@ -3,7 +3,7 @@ import { PopoverController, Platform, NavParams } from '@ionic/angular';
 import { TelemetryGeneratorService } from '../../../../services/telemetry-generator.service';
 import { PageId, InteractSubtype, Environment, InteractType } from '@app/services/telemetry-constants';
 
-describe('UpgradePopoverComponent', () => {
+describe('ViewCreditsComponent', () => {
     let viewCreditsComponent: ViewCreditsComponent;
 
     const mockNavParams: Partial<NavParams> = {
@@ -15,6 +15,7 @@ describe('UpgradePopoverComponent', () => {
                         identifier: 'do_123',
                         pkgVersion: '1',
                         contentType: 'Resource',
+                        primaryCategory: 'Learning Resource',
                         creator: 'SAMPLE_CREATOR',
                         creators: 'SAMPLE_CREATORS'
                     };
@@ -86,7 +87,7 @@ describe('UpgradePopoverComponent', () => {
             InteractSubtype.CREDITS_CLICKED,
             Environment.HOME,
             PageId.CONTENT_DETAIL,
-            { id: 'do_123', type: 'Resource', version: '1'},
+            { id: 'do_123', type: 'Learning Resource', version: '1'},
             undefined,
             {l1: 'do_1', l2: 'do_2'},
             undefined);
@@ -104,6 +105,15 @@ describe('UpgradePopoverComponent', () => {
         expect(viewCreditsComponent.backButtonFunc.unsubscribe).toHaveBeenCalled();
     });
 
+    it('should dissmiss popup on cancel', () => {
+        // arrange
+        viewCreditsComponent.backButtonFunc = undefined;
+        // act
+        viewCreditsComponent.cancel();
+        // assert
+        expect(viewCreditsComponent.backButtonFunc).toBeFalsy();
+    });
+
     it('should return merged properties ', () => {
         // arrange
         // act
diff --git a/src/app/components/popups/year-of-birth-popup/year-of-birth-popup.component.html b/src/app/components/popups/year-of-birth-popup/year-of-birth-popup.component.html
new file mode 100644
index 000000000..468d45319
--- /dev/null
+++ b/src/app/components/popups/year-of-birth-popup/year-of-birth-popup.component.html
@@ -0,0 +1,22 @@
+<ion-header class="sb-popover-header">
+    <ion-toolbar class="sb-popover-toolbar">
+        <ion-title class="sb-popover-title" style="text-align: center;">Year of birth</ion-title>
+    </ion-toolbar>
+</ion-header>
+
+<div>
+    <div class="yob-info">
+        <div><label>Select year of birth <span class="sb-color-red">*</span></label></div>
+        <!-- <div><input type="date" id="birthday" [(ngModel)]="userAge" name="birthday" style="padding: 0 10%;"></div> -->
+        <div style="border: 1px solid;
+        width: 50%;
+        border-radius: 18px; margin-left: 24%; height: 2.5rem;">
+            <ion-select placeholder="Year" interface="popover" style="padding: 6px 20px;" [(ngModel)]="selectedYearOfBirth" mode="ios">
+						<ion-select-option *ngFor="let year of birthYearOptions"
+							value="{{year}}">
+							{{year}}</ion-select-option>
+					</ion-select>
+        </div>
+    </div>
+    <div style="text-align: center; margin-top: 10%;"><button type="submit" class="submit-btn" [disabled]="!selectedYearOfBirth" (click)="submit()" [ngClass]="!selectedYearOfBirth ?  'submit-disibled' : null">submit</button></div>
+</div>
\ No newline at end of file
diff --git a/src/app/components/popups/year-of-birth-popup/year-of-birth-popup.component.scss b/src/app/components/popups/year-of-birth-popup/year-of-birth-popup.component.scss
new file mode 100644
index 000000000..f58dfd2c8
--- /dev/null
+++ b/src/app/components/popups/year-of-birth-popup/year-of-birth-popup.component.scss
@@ -0,0 +1,27 @@
+@import "src/assets/styles/base/_variables.scss";
+@import "src/assets/styles/_variables.scss";
+@import "src/assets/styles/_custom-mixins.scss";
+
+.submit-btn{
+    color: white;
+    background-color: $blue;
+    font-size: 16px;
+    padding: 8px 0;
+    margin-left: 18px;
+    border: 2px solid $blue;
+    width: 45%;
+  }
+
+  .yob-info {
+      text-align: center;
+      font-size: 20px;
+  }
+
+  .sb-color-red {
+    color: #952833 !important;
+  }
+
+  .submit-disibled{
+    opacity: 0.5 !important;
+    cursor: default;
+  }
\ No newline at end of file
diff --git a/src/app/components/popups/year-of-birth-popup/year-of-birth-popup.component.spec.ts b/src/app/components/popups/year-of-birth-popup/year-of-birth-popup.component.spec.ts
new file mode 100644
index 000000000..71dca47eb
--- /dev/null
+++ b/src/app/components/popups/year-of-birth-popup/year-of-birth-popup.component.spec.ts
@@ -0,0 +1,103 @@
+import { PopoverController } from '@ionic/angular';
+import { YearOfBirthPopupComponent } from './year-of-birth-popup.component';
+import { ProfileService } from 'sunbird-sdk';
+import {AppGlobalService, CommonUtilService} from '../../../../services';
+import { of, throwError } from 'rxjs';
+
+describe('YearOfBirthPopupComponent', () => {
+    let yearOfBirthPopupComponent: YearOfBirthPopupComponent;
+    const mockAppGlobalService: Partial<AppGlobalService> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+    const mockPopOverCtrl: Partial<PopoverController> = {};
+    const mockProfileService: Partial<ProfileService> = {};
+
+    beforeAll(() => {
+        yearOfBirthPopupComponent = new YearOfBirthPopupComponent(
+            mockProfileService as ProfileService,
+            mockPopOverCtrl as PopoverController,
+            mockAppGlobalService as AppGlobalService,
+            mockCommonUtilService as CommonUtilService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should be create a instance of yearOfBirthPopupComponent', () => {
+        expect(yearOfBirthPopupComponent).toBeTruthy();
+    });
+
+    it('should return list of year', () => {
+        yearOfBirthPopupComponent.ngOnInit();
+        expect(yearOfBirthPopupComponent.birthYearOptions).toHaveLength(100);
+    });
+
+    describe('submit', () => {
+        it('should return success message for profile update', (done) => {
+            // arrange
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => Promise.resolve({
+                present: presentFn,
+                dismiss: dismissFn
+            }));
+            mockAppGlobalService.getCurrentUser = jest.fn(() => ({
+                uid: 'sample-uid'
+            }));
+            yearOfBirthPopupComponent.selectedYearOfBirth = 2021;
+            mockProfileService.updateServerProfile = jest.fn(() => of({
+                body: {
+                    result: {
+                        response: 'SUCCESS',
+                        error: {}
+                    }
+                }
+            }));
+            mockPopOverCtrl.dismiss = jest.fn();
+            // act
+            yearOfBirthPopupComponent.submit();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(presentFn).toHaveBeenCalled();
+                expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalled();
+                expect(mockProfileService.updateServerProfile).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockPopOverCtrl.dismiss).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should return error message for profile update', (done) => {
+            // arrange
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => Promise.resolve({
+                present: presentFn,
+                dismiss: dismissFn
+            }));
+            mockAppGlobalService.getCurrentUser = jest.fn(() => ({
+                uid: 'sample-uid'
+            }));
+            yearOfBirthPopupComponent.selectedYearOfBirth = 2021;
+            mockProfileService.updateServerProfile = jest.fn(() => throwError({
+               error: {err: 'FAILED'}
+            }));
+            mockPopOverCtrl.dismiss = jest.fn();
+            // act
+            yearOfBirthPopupComponent.submit();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(presentFn).toHaveBeenCalled();
+                expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalled();
+                expect(mockProfileService.updateServerProfile).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockPopOverCtrl.dismiss).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+});
diff --git a/src/app/components/popups/year-of-birth-popup/year-of-birth-popup.component.ts b/src/app/components/popups/year-of-birth-popup/year-of-birth-popup.component.ts
new file mode 100644
index 000000000..8bdf3bcce
--- /dev/null
+++ b/src/app/components/popups/year-of-birth-popup/year-of-birth-popup.component.ts
@@ -0,0 +1,50 @@
+import { Component, Inject, OnInit } from '@angular/core';
+import { AppGlobalService, CommonUtilService } from '@app/services';
+import { PopoverController } from '@ionic/angular';
+import { ProfileService } from 'sunbird-sdk';
+
+@Component({
+  selector: 'app-year-of-birth-popup',
+  templateUrl: './year-of-birth-popup.component.html',
+  styleUrls: ['./year-of-birth-popup.component.scss'],
+})
+export class YearOfBirthPopupComponent implements OnInit {
+  selectedYearOfBirth: number;
+  birthYearOptions: Array<number> = [];
+  constructor(
+    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+    private popOverCtrl: PopoverController,
+    private appGlobalService: AppGlobalService,
+    private commonUtilService: CommonUtilService
+  ) { }
+  ngOnInit(): void {
+    this.initiateYearSelecter();
+  }
+  async submit() {
+    const currentYear = new Date().getFullYear();
+    const userAge = currentYear - this.selectedYearOfBirth;
+    const loader = await this.commonUtilService.getLoader();
+    await loader.present();
+    const req = {
+      userId: this.appGlobalService.getCurrentUser().uid,
+      dob: this.selectedYearOfBirth.toString()
+    };
+    this.profileService.updateServerProfile(req).toPromise()
+      .then(async () => {
+        await loader.dismiss();
+        this.popOverCtrl.dismiss();
+      }).catch(async () => {
+        if (loader) {
+          await loader.dismiss();
+        }
+        this.popOverCtrl.dismiss();
+      });
+  }
+
+  initiateYearSelecter() {
+    const endYear = new Date().getFullYear();
+    for (let year = endYear; year > 1921; year--) {
+      this.birthYearOptions.push(year);
+    }
+  }
+}
diff --git a/src/app/components/profile-avatar/profile-avatar.component.scss b/src/app/components/profile-avatar/profile-avatar.component.scss
index fb8fd2653..8480b0220 100644
--- a/src/app/components/profile-avatar/profile-avatar.component.scss
+++ b/src/app/components/profile-avatar/profile-avatar.component.scss
@@ -1,8 +1,9 @@
+@import "src/assets/styles/_variables.scss";
     .profile-avatar{
         font-size: 50px;
         font-weight: bold !important;
         line-height: 50px;
-        color: #9017FF;
+        color: map-get($colors, vivid_purple);
         border-radius: 50%;
         -webkit-box-shadow: 0px 0px 8px 1px rgba(0, 0, 0, 0.25);
         box-shadow: 0px 0px 8px 1px rgba(0, 0, 0, 0.25);
@@ -19,6 +20,6 @@
         }
     }
     .profile-avatar.profileAvatar{
-        border: 1px solid #008840 !important;
+        border: 1px solid $green !important;
         box-shadow: none;
     }
diff --git a/src/app/components/profile-avatar/profile-avatar.component.ts b/src/app/components/profile-avatar/profile-avatar.component.ts
index d71df5bbf..62e0465bf 100644
--- a/src/app/components/profile-avatar/profile-avatar.component.ts
+++ b/src/app/components/profile-avatar/profile-avatar.component.ts
@@ -1,26 +1,28 @@
 import { Component, Input, OnInit, OnChanges } from '@angular/core';
-import GraphemeSplitter from 'grapheme-splitter';
+import { CommonUtilService } from '@app/services';
 
 @Component({
   selector: 'app-profile-avatar',
   templateUrl: './profile-avatar.component.html',
   styleUrls: ['./profile-avatar.component.scss'],
 })
-export class ProfileAvatarComponent implements OnInit , OnChanges {
+export class ProfileAvatarComponent implements OnInit, OnChanges {
   @Input() username: string;
   @Input() isStateUser: boolean;
   bgColor: string;
   color: string;
   initial: string;
-  // GraphemeSplitter = require('grapheme-splitter');
-  constructor() { }
+
+  constructor(
+    private commonUtilService: CommonUtilService,
+  ) { }
+
   ngOnInit() {
     this.extractInitial();
   }
 
   /**
    * It will detect the changes of username and call the extractInitial() method
-   * @param changes
    */
   ngOnChanges(changes: any) {
     this.username = changes.username.currentValue;
@@ -58,12 +60,10 @@ export class ProfileAvatarComponent implements OnInit , OnChanges {
   }
 
   /**
- * It will extract the first character of the user name and return with different BG color
- */
+   * It will extract the first character of the user name and return with different BG color
+   */
   extractInitial() {
-    const splitter = new GraphemeSplitter();
-    const split: string[] = splitter.splitGraphemes(this.username.trim());
-    this.initial = split[0];
+    this.initial = this.commonUtilService.extractInitial(this.username);
     if (this.initial) {
       this.getBgColor(this.username);
     }
diff --git a/src/app/components/rating-alert/rating-alert.component.scss b/src/app/components/rating-alert/rating-alert.component.scss
index ac2e2d926..e4374e4e5 100644
--- a/src/app/components/rating-alert/rating-alert.component.scss
+++ b/src/app/components/rating-alert/rating-alert.component.scss
@@ -1,6 +1,7 @@
 @import "src/assets/styles/base/_variables.scss";
 @import "src/assets/styles/_custom-mixins.scss";
 @import "src/assets/styles/variables.scss";
+@import "src/assets/styles/_variables.scss";
 :host {
   
     .sb-modal-close{
@@ -61,6 +62,8 @@
   
     .sb-popover-items{
         padding-bottom: 0 !important;
+        background-color: map-get($colors, white);
+        border-radius: 5px;
     }
   
     .sb-popover-footer{
@@ -93,10 +96,4 @@
       --padding-bottom: 5%;
       --background: transparent;
     }
-
-    .sb-popover-items{
-      background-color: #fff;
-      border-radius: 5px;
-    }
-        
   }
\ No newline at end of file
diff --git a/src/app/components/rating-alert/rating-alert.component.spec.ts b/src/app/components/rating-alert/rating-alert.component.spec.ts
new file mode 100644
index 000000000..e19eda265
--- /dev/null
+++ b/src/app/components/rating-alert/rating-alert.component.spec.ts
@@ -0,0 +1,293 @@
+
+import { AppRatingAlertComponent } from './rating-alert.component';
+import { TelemetryService, SharedPreferences } from 'sunbird-sdk';
+import { PopoverController, Platform, NavParams } from '@ionic/angular';
+import { AppVersion } from '@ionic-native/app-version/ngx';
+import {
+    UtilityService,
+    AppRatingService,
+    TelemetryGeneratorService,
+    Environment,
+    ImpressionType,
+    ImpressionSubtype,
+    InteractType,
+    InteractSubtype
+} from '../../../services';
+import { of } from 'rxjs';
+import { PreferenceKey, StoreRating } from '../../app.constant';
+describe('AppRatingAlertComponent', () => {
+    let appRatingAlertComponent: AppRatingAlertComponent;
+
+    const mockSharedPreferences: Partial<SharedPreferences> = {
+        getString: jest.fn((arg) => {
+            let value;
+            switch (arg) {
+                case 'app_logo':
+                    value = 'app_logo';
+                    break;
+                case PreferenceKey.APP_RATE_LATER_CLICKED:
+                    value = 1;
+                    break;
+            }
+            return of(value);
+        }),
+        putString: jest.fn(() => of(undefined))
+    };
+
+    const mockTelemetryService: Partial<TelemetryService> = {
+    };
+
+    const mockPopOverController: Partial<PopoverController> = {
+        dismiss: jest.fn()
+    };
+
+    const mockAppVersion: Partial<AppVersion> = {
+        getAppName: jest.fn(() => Promise.resolve('Sunbird')),
+        getPackageName: jest.fn(() => Promise.resolve('org.sunbird.app'))
+    };
+
+    const mockUtilityService: Partial<UtilityService> = {
+        openPlayStore: jest.fn()
+    };
+
+    const mockAppRatingService: Partial<AppRatingService> = {
+        rateLaterClickedCount: jest.fn(() => Promise.resolve(1)),
+        setEndStoreRate: jest.fn()
+    };
+
+    const mockPlatform: Partial<Platform> = {
+    };
+    mockPlatform.backButton = {
+        subscribeWithPriority: jest.fn((_, fn) => fn({
+            unsubscribe: jest.fn()
+        })),
+    } as any;
+
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateImpressionTelemetry: jest.fn(),
+        generateBackClickedTelemetry: jest.fn(),
+        generateInteractTelemetry: jest.fn()
+    };
+
+    const mockNavParams: Partial<NavParams> = {
+        get: jest.fn(() => ('content-details'))
+    };
+
+    beforeAll(() => {
+        appRatingAlertComponent = new AppRatingAlertComponent(
+            mockSharedPreferences as SharedPreferences,
+            mockTelemetryService as TelemetryService,
+            mockPopOverController as PopoverController,
+            mockAppVersion as AppVersion,
+            mockUtilityService as UtilityService,
+            mockAppRatingService as AppRatingService,
+            mockPlatform as Platform,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockNavParams as NavParams,
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create a instance of AppRatingAlertComponent', () => {
+        expect(appRatingAlertComponent).toBeTruthy();
+    });
+
+    describe('ngOnint', () => {
+        it('should generate impression telemetry and interact event with apperance count 1', (done) => {
+            // arrange
+            mockSharedPreferences.getString = jest.fn((arg) => {
+                let value;
+                switch (arg) {
+                    case 'app_logo':
+                        value = 'app_logo';
+                        break;
+                    case PreferenceKey.APP_RATE_LATER_CLICKED:
+                        value = undefined;
+                        break;
+                }
+                return of(value);
+            });
+            // act
+            appRatingAlertComponent.ngOnInit();
+            // assert
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                ImpressionType.VIEW,
+                ImpressionSubtype.APP_RATING_POPUP,
+                'content-details',
+                Environment.HOME);
+
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    InteractSubtype.APP_RATING_APPEARED,
+                    'content-details',
+                    Environment.HOME,
+                    undefined,
+                    { appRatingPopAppearedCount: 1 });
+                done();
+            }, 0);
+
+        });
+        it('should generate impression telemetry and interact event with apperance count 2', (done) => {
+            // arrange
+            mockSharedPreferences.getString = jest.fn((arg) => {
+                let value;
+                switch (arg) {
+                    case 'app_logo':
+                        value = 'app_logo';
+                        break;
+                    case PreferenceKey.APP_RATE_LATER_CLICKED:
+                        value = 1;
+                        break;
+                }
+                return of(value);
+            });
+            // act
+            appRatingAlertComponent.ngOnInit();
+            // assert
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                ImpressionType.VIEW,
+                ImpressionSubtype.APP_RATING_POPUP,
+                'content-details',
+                Environment.HOME);
+
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    InteractSubtype.APP_RATING_APPEARED,
+                    'content-details',
+                    Environment.HOME,
+                    undefined,
+                    { appRatingPopAppearedCount: 2 });
+                done();
+            }, 0);
+
+        });
+    });
+
+    describe('rateLater', () => {
+        it('should generate interact event with apperance count 1 and dismiss the popup', (done) => {
+            // arrange
+            // act
+            appRatingAlertComponent.rateLater();
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.RATE_LATER_CLICKED,
+                    Environment.HOME,
+                    'content-details',
+                    undefined,
+                    { rateLaterCount: 1 });
+                expect(mockPopOverController.dismiss).toHaveBeenCalledWith(null);
+                done();
+            }, 0);
+        });
+    });
+
+    describe('rateOnStore', () => {
+        it('should generate interact event with apperance count 1 and dismiss the popup', (done) => {
+            // arrange
+            appRatingAlertComponent.appRate = 4;
+            // act
+            appRatingAlertComponent.rateOnStore();
+            // assert
+            setTimeout(() => {
+                expect(mockUtilityService.openPlayStore).toHaveBeenCalledWith('org.sunbird.app');
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.PLAY_STORE_BUTTON_CLICKED,
+                    Environment.HOME,
+                    'content-details',
+                    undefined,
+                    { appRating: 4 });
+                expect(mockPopOverController.dismiss).toHaveBeenCalledWith(StoreRating.RETURN_CLOSE);
+                done();
+            }, 0);
+        });
+    });
+
+    describe('submitRating', () => {
+        it('should generate interact event and dismiss the popup if rating is >= 4', (done) => {
+            // arrange
+            appRatingAlertComponent.appRate = 4;
+            // act
+            appRatingAlertComponent.submitRating();
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.RATING_SUBMITTED,
+                    Environment.HOME,
+                   'content-details',
+                    undefined,
+                    { appRating: 4 });
+                expect(appRatingAlertComponent.currentViewText).toEqual({
+                    heading: 'APP_RATING_THANKS_FOR_RATING',
+                    message: 'APP_RATING_RATE_ON_PLAYSTORE',
+                    type: 'storeRate'
+                  });
+                done();
+            }, 0);
+        });
+
+        it('should generate interact event and dismiss the popup if rating is <= 4', (done) => {
+            // arrange
+            appRatingAlertComponent.appRate = 2;
+            // act
+            appRatingAlertComponent.submitRating();
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.RATING_SUBMITTED,
+                    Environment.HOME,
+                   'content-details',
+                    undefined,
+                    { appRating: 2 });
+                expect(appRatingAlertComponent.currentViewText).toEqual({
+                    heading: 'APP_RATING_THANKS_FOR_RATING',
+                    message: 'APP_RATING_REPORT_AN_ISSUE',
+                    type: 'helpDesk'
+                  });
+                done();
+            }, 0);
+        });
+    });
+
+    describe('goToHelpSection', () => {
+        it('should generate interact event and dismiss the popup', (done) => {
+            // arrange
+            // act
+            appRatingAlertComponent.goToHelpSection();
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.HELP_SECTION_CLICKED,
+                    Environment.HOME,
+                    'content-details');
+                expect(mockPopOverController.dismiss).toHaveBeenCalledWith(StoreRating.RETURN_HELP);
+                done();
+            }, 0);
+        });
+    });
+
+    describe('closePopover', () => {
+        it('should close the popover', () => {
+            // arrange
+            appRatingAlertComponent['backButtonFunc'] = {
+                unsubscribe: jest.fn()
+            };
+            // act
+            appRatingAlertComponent.closePopover();
+            // assert
+            expect(mockPopOverController.dismiss).toHaveBeenCalledWith(null);
+            expect(appRatingAlertComponent['backButtonFunc'].unsubscribe).toHaveBeenCalled();
+        });
+    });
+
+});
diff --git a/src/app/components/rating-alert/rating-alert.component.ts b/src/app/components/rating-alert/rating-alert.component.ts
index 512033051..f19bac171 100644
--- a/src/app/components/rating-alert/rating-alert.component.ts
+++ b/src/app/components/rating-alert/rating-alert.component.ts
@@ -6,7 +6,6 @@ import { UtilityService } from '@app/services/utility-service';
 import { SharedPreferences, TelemetryService } from 'sunbird-sdk';
 import { AppVersion } from '@ionic-native/app-version/ngx';
 import { Observable } from 'rxjs';
-import { TranslateService } from '@ngx-translate/core';
 import { PreferenceKey, StoreRating } from '@app/app/app.constant';
 import {
   Environment,
@@ -61,7 +60,6 @@ export class AppRatingAlertComponent implements OnInit {
     private appVersion: AppVersion,
     private utilityService: UtilityService,
     private appRatingService: AppRatingService,
-    private translate: TranslateService,
     private platform: Platform,
     private telemetryGeneratorService: TelemetryGeneratorService,
     private navParams: NavParams,
@@ -72,8 +70,7 @@ export class AppRatingAlertComponent implements OnInit {
     );
     this.currentViewText = this.appRateView[ViewType.APP_RATE];
     this.backButtonFunc = this.platform.backButton.subscribeWithPriority(11, () => {
-      this.popOverCtrl.dismiss(null);
-      this.backButtonFunc.unsubscribe();
+      this.closePopover();
     });
   }
 
@@ -83,9 +80,7 @@ export class AppRatingAlertComponent implements OnInit {
       ImpressionType.VIEW,
       ImpressionSubtype.APP_RATING_POPUP,
       this.pageId,
-      Environment.HOME, '', '', '',
-      undefined,
-      undefined
+      Environment.HOME
     );
     this.appRatePopup();
   }
@@ -106,14 +101,13 @@ export class AppRatingAlertComponent implements OnInit {
 
   async rateLater() {
     this.rateLaterClickedCount = await this.appRatingService.rateLaterClickedCount();
-    const paramsMap = new Map();
-    paramsMap['rateLaterCount'] = this.rateLaterClickedCount;
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
       InteractSubtype.RATE_LATER_CLICKED,
       Environment.HOME,
-      this.pageId, undefined, paramsMap,
-      undefined, undefined
+      this.pageId,
+      undefined,
+      { rateLaterCount: this.rateLaterClickedCount }
     );
     this.closePopover();
   }
@@ -122,43 +116,32 @@ export class AppRatingAlertComponent implements OnInit {
     this.appVersion.getPackageName().then((pkg: any) => {
       this.utilityService.openPlayStore(pkg);
       this.appRatingService.setEndStoreRate(this.appRate);
-      const paramsMap = new Map();
-      paramsMap['appRating'] = this.appRate;
       this.telemetryGeneratorService.generateInteractTelemetry(
         InteractType.TOUCH,
         InteractSubtype.PLAY_STORE_BUTTON_CLICKED,
         Environment.HOME,
-        this.pageId, undefined, paramsMap,
-        undefined, undefined
+        this.pageId,
+        undefined,
+        { appRating: this.appRate }
       );
       this.popOverCtrl.dismiss(StoreRating.RETURN_CLOSE);
     });
   }
 
   submitRating() {
-    if (this.appRate >= StoreRating.APP_MIN_RATE) {
-      this.currentViewText = this.appRateView[ViewType.STORE_RATE];
-      const paramsMap = new Map();
-      paramsMap['appRating'] = this.appRate;
-      this.telemetryGeneratorService.generateInteractTelemetry(
-        InteractType.TOUCH,
-        InteractSubtype.RATING_SUBMITTED,
-        Environment.HOME,
-        this.pageId, undefined, paramsMap,
-        undefined, undefined
-      );
-      return;
-    }
-    this.currentViewText = this.appRateView[ViewType.HELP_DESK];
-    const paramsMap = new Map();
-    paramsMap['appRating'] = this.appRate;
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
       InteractSubtype.RATING_SUBMITTED,
       Environment.HOME,
-      this.pageId, undefined, paramsMap,
-      undefined, undefined
+      this.pageId,
+      undefined,
+      { appRating: this.appRate }
     );
+    if (this.appRate >= StoreRating.APP_MIN_RATE) {
+      this.currentViewText = this.appRateView[ViewType.STORE_RATE];
+    } else {
+      this.currentViewText = this.appRateView[ViewType.HELP_DESK];
+    }
   }
 
   goToHelpSection() {
@@ -166,19 +149,20 @@ export class AppRatingAlertComponent implements OnInit {
       InteractType.TOUCH,
       InteractSubtype.HELP_SECTION_CLICKED,
       Environment.HOME,
-      this.pageId, undefined, undefined, undefined
+      this.pageId
     );
     this.popOverCtrl.dismiss(StoreRating.RETURN_HELP);
   }
 
   private async appRatePopup() {
     this.appRatingPopCount = await this.countAppRatingPopupAppeared();
-    const paramsMap = new Map();
-    paramsMap['appRatingPopAppearedCount'] = this.appRatingPopCount;
     this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.OTHER, InteractSubtype.APP_RATING_APPEARED,
-      this.pageId, Environment.HOME, undefined, paramsMap,
-      undefined, undefined
+      InteractType.OTHER,
+      InteractSubtype.APP_RATING_APPEARED,
+      this.pageId,
+      Environment.HOME,
+      undefined,
+      { appRatingPopAppearedCount: this.appRatingPopCount }
     );
   }
 
diff --git a/src/app/components/show-vendor-apps/show-vendor-apps.component.html b/src/app/components/show-vendor-apps/show-vendor-apps.component.html
new file mode 100644
index 000000000..85600ec4a
--- /dev/null
+++ b/src/app/components/show-vendor-apps/show-vendor-apps.component.html
@@ -0,0 +1,25 @@
+<ion-header class="sb-popover-header">
+    <ion-toolbar class="sb-popover-toolbar">
+        <ion-title class="sb-popover-title">{{'FRMELEMNTS_LBL_OPEN_CONTENT_WITH' | translate}}
+        </ion-title>
+    </ion-toolbar>
+</ion-header>
+
+<ion-content>
+    <ion-grid>
+        <ion-row>
+            <ion-col size="12" *ngIf="!isAppListAvailable">
+                {{'FRMELEMENTS_VENDOR_APP_DESCRIPTION' | translate: {'appName': appName} }}
+            </ion-col>
+        </ion-row>
+        <ion-row>
+            <ion-col size="4" *ngFor="let apps of appLists">
+                <div class="app-content" [ngClass]="{'not-available': isAppListAvailable && !appListAvailability[apps?.android?.packageId]}"
+                     (click)="openThirdPartyApps(apps?.android?.packageId, appListAvailability[apps?.android?.packageId])">
+                    <img class="app-logo" [src]="apps?.logo" alt="">
+                    {{apps.name}}
+                </div>
+            </ion-col>
+        </ion-row>
+    </ion-grid>
+</ion-content>
diff --git a/src/app/components/show-vendor-apps/show-vendor-apps.component.scss b/src/app/components/show-vendor-apps/show-vendor-apps.component.scss
new file mode 100644
index 000000000..98e35eb4b
--- /dev/null
+++ b/src/app/components/show-vendor-apps/show-vendor-apps.component.scss
@@ -0,0 +1,9 @@
+.app-content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.not-available {
+  filter: grayscale(1);
+}
\ No newline at end of file
diff --git a/src/app/components/show-vendor-apps/show-vendor-apps.component.spec.ts b/src/app/components/show-vendor-apps/show-vendor-apps.component.spec.ts
new file mode 100644
index 000000000..ac6d5e546
--- /dev/null
+++ b/src/app/components/show-vendor-apps/show-vendor-apps.component.spec.ts
@@ -0,0 +1,185 @@
+import {NavParams, PopoverController} from '@ionic/angular';
+import {ShowVendorAppsComponent} from './show-vendor-apps.component';
+import {
+    TelemetryGeneratorService,
+    UtilityService,
+    CommonUtilService,
+} from '../../../services';
+
+describe('ShowVendorAppsComponent', () => {
+    let showVendorAppsComponent: ShowVendorAppsComponent;
+    const mockNavParams: Partial<NavParams> = {
+        get: jest.fn((arg) => {
+            let value;
+            switch (arg) {
+                case 'content':
+                    value = {
+                        artifactUrl: 'https://sample',
+                    };
+                    break;
+                case 'appLists':
+                    value = [
+                        {
+                            name: 'Google Bolo',
+                            logo:
+                                'https://img.icons8.com/doodle/48/000000/league-of-legends.png',
+                            provider: {
+                                name: 'Google',
+                                copyright: '',
+                                license: '',
+                            },
+                            android: {
+                                packageId: 'io.ionic.sender',
+                                appVersion: '54',
+                                compatibilityVer: '',
+                            },
+                            ios: {
+                                packageId: '',
+                                appVersion: '',
+                                urlScheme: '',
+                                compatibilityVer: '',
+                            },
+                            target: {
+                                mimeType: ['application/pdf'],
+                                primaryCategory: ['LearningResource'],
+                            },
+                        },
+                    ];
+                    break;
+            }
+        }),
+    };
+    const mockUtilityService: Partial<UtilityService> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockPopoverCtrl: Partial<PopoverController> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+
+    beforeAll(() => {
+        showVendorAppsComponent = new ShowVendorAppsComponent(
+            mockNavParams as NavParams,
+            mockUtilityService as UtilityService,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockPopoverCtrl as PopoverController,
+            mockCommonUtilService as CommonUtilService
+        );
+    });
+
+    beforeEach(() => {
+        jest.resetAllMocks();
+    });
+
+    it('should provide instance of showVendorAppsComponent', () => {
+        expect(showVendorAppsComponent).toBeTruthy();
+    });
+
+    it('should fetch appName and list of app Available in devices', (done) => {
+        // arrange
+        showVendorAppsComponent.appLists = [
+            {
+                name: 'Google Bolo',
+                logo: 'https://img.icons8.com/doodle/48/000000/league-of-legends.png',
+                provider: {
+                    name: 'Google',
+                    copyright: '',
+                    license: ''
+                },
+                android: {
+                    packageId: 'io.ionic.sender',
+                    appVersion: '54',
+                    compatibilityVer: ''
+                },
+                ios: {
+                    packageId: '',
+                    appVersion: '',
+                    urlScheme: '',
+                    compatibilityVer: ''
+                },
+                target: {
+                    mimeType: [
+                        'application/pdf'
+                    ],
+                    primaryCategory: [
+                        'LearningResource'
+                    ]
+                }
+            },
+
+        ];
+        mockCommonUtilService.getAppName = jest.fn(() =>
+            Promise.resolve('Sunbird')
+        );
+        mockUtilityService.checkAvailableAppList = jest.fn(() =>
+            Promise.resolve({
+                'io.ionic.sender': false,
+                'io.ionic.receiver': true,
+                'io.ionic.receiver5': false,
+            })
+        );
+        // act
+        showVendorAppsComponent.ngOnInit();
+        // assert
+        expect(mockCommonUtilService.getAppName).toHaveBeenCalled();
+        setTimeout(() => {
+            expect(mockUtilityService.checkAvailableAppList).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
+    describe('openThirdPartyApps', () => {
+
+        it('should open playStore with packageId', (done) => {
+            // arrange
+            mockUtilityService.openPlayStore = jest.fn(() => Promise.resolve('SUCCESS'));
+            // act
+            showVendorAppsComponent.openThirdPartyApps('io.ionic.sender', false);
+            // assert
+            setTimeout(() => {
+                expect(mockUtilityService.openPlayStore).toHaveBeenCalledWith('io.ionic.sender');
+                done();
+            }, 0);
+        });
+
+        it('should get packageId and check of appAvailability if true then call utility Service', (done) => {
+            // arrange
+            mockUtilityService.startActivityForResult = jest.fn(() =>
+                Promise.resolve({
+                    extras: {
+                        resultCode: -1,
+                        edata: {
+                            starttime: 1000,
+                            endtime: 3000,
+                            type: 'session',
+                            timespent: 500,
+                            pageviews: 3,
+                            interactions: 3
+                        },
+                        requestCode: 101
+                    },
+                    flags: 0
+                })
+            );
+            mockTelemetryGeneratorService.generateSummaryTelemetry = jest.fn();
+            mockPopoverCtrl.dismiss = jest.fn();
+            // act
+            showVendorAppsComponent.openThirdPartyApps('io.ionic.receiver', true);
+            // assert
+            setTimeout(() => {
+                expect(mockUtilityService.startActivityForResult).toHaveBeenCalledWith(
+                    {
+                        package: 'io.ionic.receiver',
+                        extras: {
+                            content: showVendorAppsComponent.content
+                        },
+                        requestCode: 101
+                    }
+                );
+                expect(mockTelemetryGeneratorService.generateSummaryTelemetry).toHaveBeenCalledWith(
+                    'session',
+                    1000, 3000, 500, 3, 3, 'home'
+                );
+                expect(mockPopoverCtrl.dismiss).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+});
diff --git a/src/app/components/show-vendor-apps/show-vendor-apps.component.ts b/src/app/components/show-vendor-apps/show-vendor-apps.component.ts
new file mode 100644
index 000000000..f8fa2df0c
--- /dev/null
+++ b/src/app/components/show-vendor-apps/show-vendor-apps.component.ts
@@ -0,0 +1,64 @@
+import {Component, OnInit} from '@angular/core';
+import {CommonUtilService, TelemetryGeneratorService, UtilityService} from '@app/services';
+import {NavParams, PopoverController} from '@ionic/angular';
+
+@Component({
+    selector: 'show-vendor-apps',
+    templateUrl: './show-vendor-apps.component.html',
+    styleUrls: ['./show-vendor-apps.component.scss'],
+})
+export class ShowVendorAppsComponent implements OnInit {
+    appLists = [];
+    content: any;
+    appListAvailability = {};
+    isAppListAvailable = false;
+    appName = '';
+
+    constructor(
+        private navParams: NavParams,
+        private utilityService: UtilityService,
+        private telemetryGeneratorService: TelemetryGeneratorService,
+        private popOverCtrl: PopoverController,
+        private commonUtilService: CommonUtilService
+    ) {
+        this.content = this.navParams.get('content');
+        this.appLists = this.navParams.get('appLists');
+    }
+
+    async ngOnInit() {
+        this.appName = await this.commonUtilService.getAppName();
+        this.appListAvailability = await this.utilityService.checkAvailableAppList(this.appLists.map((a) => a.android.packageId));
+        this.isAppListAvailable = Object.keys(this.appListAvailability).some((packageId) => {
+            return this.appListAvailability[packageId];
+        });
+    }
+
+    openThirdPartyApps(packageId: string, appListAvailability) {
+        if (appListAvailability) {
+            this.utilityService.startActivityForResult({
+                package: packageId,
+                extras: {
+                    content: this.content
+                },
+                requestCode: 101,
+            }).then((result: any) => {
+                const telemetryResult = result.extras;
+                this.telemetryGeneratorService.generateSummaryTelemetry(
+                    telemetryResult.edata.type,
+                    telemetryResult.edata.starttime,
+                    telemetryResult.edata.endtime,
+                    telemetryResult.edata.timespent,
+                    telemetryResult.edata.pageviews,
+                    telemetryResult.edata.interactions,
+                    'home'
+                );
+                this.popOverCtrl.dismiss();
+            }).catch((error) => {
+                // error
+                console.log('------------', error);
+            });
+        } else {
+            this.utilityService.openPlayStore(packageId);
+        }
+    }
+}
diff --git a/src/app/components/sign-in-card/event-params.interface.ts b/src/app/components/sign-in-card/event-params.interface.ts
new file mode 100644
index 000000000..6b94e0bdd
--- /dev/null
+++ b/src/app/components/sign-in-card/event-params.interface.ts
@@ -0,0 +1,4 @@
+export interface EventParams {
+    skipSession: boolean;
+    skipProfile: boolean;
+}
\ No newline at end of file
diff --git a/src/app/components/sign-in-card/sign-in-card.component.html b/src/app/components/sign-in-card/sign-in-card.component.html
index 32cc61313..338f46e36 100644
--- a/src/app/components/sign-in-card/sign-in-card.component.html
+++ b/src/app/components/sign-in-card/sign-in-card.component.html
@@ -14,10 +14,10 @@
 
 <div *ngIf="source == 'courses'">
   <div class="sign-in-card-success">
-    <p class="sign-in-card-title">{{ 'WANT_TO_CHECK_TRAININGS' | translate: {'%s': appName } }}</p>
+    <p class="sign-in-card-title">{{ 'WANT_TO_CHECK_FREE_TRAININGS' | translate }}</p>
     <div class="sign-in-block">
       <p>{{ 'LOGIN_TO_JOIN_TRAINING' | translate }}</p>
-      <ion-button expand="block" class="ion-text-capitalize" (click)="signIn()">{{ 'OVERLAY_SIGN_IN' | translate | titlecase }}</ion-button>
+      <ion-button expand="block" class="ion-text-capitalize" (click)="signIn({skipRootNavigation: true})">{{ 'OVERLAY_SIGN_IN' | translate | titlecase }}</ion-button>
     </div>
   </div>
 </div>
diff --git a/src/app/components/sign-in-card/sign-in-card.component.scss b/src/app/components/sign-in-card/sign-in-card.component.scss
index 389543e6b..398054f07 100644
--- a/src/app/components/sign-in-card/sign-in-card.component.scss
+++ b/src/app/components/sign-in-card/sign-in-card.component.scss
@@ -4,7 +4,7 @@
     border-radius: 4px !important;
   }
   .sign-in-card-text {
-    font-weight: 600 !important;
+    font-weight: 600;
     color: map-get($colors, primary_black) !important;
   }
   ion-card {
@@ -19,27 +19,27 @@
     .sign-in-card-title{
       margin: 0 8px 8px;
       padding-top: 16px;
-      font-family: "Noto Sans";
-      color: #FFF;
+      font-family: "Noto Sans", sans-serif;
+      color: map-get($colors, white);
       font-weight: bold;
     }
     .sign-in-block{
       padding: 16px 12px 12px;
       text-align: center;
       margin: 8px;
-      background-color: #FFF;
+      background-color: map-get($colors, white);
       border-radius: 2px;
-      box-shadow: 0 20px 40px -10px #D8D8D8;
+      box-shadow: 0 20px 40px -10px map-get($colors, light_silver);
       p{
         margin-bottom: 8px;
-        font-family: "Noto Sans";
+        font-family: "Noto Sans", sans-serif;
         font-size: 12px;
-        color: #333333;
+        color: map-get($colors, primary_black);
       }
       ion-button{
-        --background: #008840 !important;
-        --background-hover: #008840 !important;
-        --background-activated: #008840 !important;
+        --background: #{$green};
+        --background-hover: #{$green};
+        --background-activated: #{$green};
       }
     }
   }
diff --git a/src/app/components/sign-in-card/sign-in-card.component.spec.ts b/src/app/components/sign-in-card/sign-in-card.component.spec.ts
index da033e987..da31ef0fb 100644
--- a/src/app/components/sign-in-card/sign-in-card.component.spec.ts
+++ b/src/app/components/sign-in-card/sign-in-card.component.spec.ts
@@ -1,57 +1,64 @@
-import { SignInCardComponent } from './sign-in-card.component';
-import { ProfileService, GroupService, AuthService, SharedPreferences } from 'sunbird-sdk';
+import {SignInCardComponent} from './sign-in-card.component';
+import {ProfileService, AuthService, SharedPreferences, Profile, ProfileType, ProfileSource, SignInError} from 'sunbird-sdk';
 import {
     CommonUtilService, AppGlobalService, TelemetryGeneratorService,
     ContainerService, FormAndFrameworkUtilService
 } from '../../../services';
-import { NavController, Events } from '@ionic/angular';
-import { NgZone } from '@angular/core';
-import { AppVersion } from '@ionic-native/app-version/ngx';
-import { of } from 'rxjs';
+import {NavController} from '@ionic/angular';
+import {Events} from '@app/util/events';
+import {NgZone} from '@angular/core';
+import {AppVersion} from '@ionic-native/app-version/ngx';
+import {of, throwError} from 'rxjs';
+import {SbProgressLoader} from '../../../services/sb-progress-loader.service';
+import {Router} from '@angular/router';
+import { SegmentationTagService } from '../../../services/segmentation-tag/segmentation-tag.service';
 
-describe('SignInCardComponent', () => {
-    let signInCardComponent: SignInCardComponent;
-    const mockProfileService: Partial<ProfileService> = {
+jest.mock('sunbird-sdk', () => {
+    const actual = require.requireActual('sunbird-sdk');
+    return {
+        ...actual,
+        WebviewLoginSessionProvider() {
+        }
     };
-    const mockGroupService: Partial<GroupService> = {
+});
+
+jest.mock('@app/app/module.service', () => {
+    const actual = require.requireActual('@app/app/module.service');
+    return {
+        ...actual,
+        initTabs: jest.fn().mockImplementation(() => {
+        })
     };
+});
+
+describe('SignInCardComponent', () => {
+    let signInCardComponent: SignInCardComponent;
+    const mockProfileService: Partial<ProfileService> = {};
     const mockAuthService: Partial<AuthService> = {
+        setSession: jest.fn()
     };
-    const mockSharedPreferences: Partial<SharedPreferences> = {
-        putString: jest.fn(() => of(undefined))
-    };
-    const mockNavController: Partial<NavController> = {
-    };
-    const mockContainerService: Partial<ContainerService> = {
-    };
-    const mockNgZone: Partial<NgZone> = {
-    };
+    const mockSharedPreferences: Partial<SharedPreferences> = {};
+    const mockNavController: Partial<NavController> = {};
+    const mockContainerService: Partial<ContainerService> = {};
+    const mockNgZone: Partial<NgZone> = {};
     const mockAppVersion: Partial<AppVersion> = {
         getAppName: jest.fn(() => Promise.resolve('Sunbird'))
     };
-    const mockCommonUtilService: Partial<CommonUtilService> = {
-        showToast: jest.fn(() => { }),
-        getLoader: jest.fn(() => { })
-    };
-    const mockFormnFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {
-    };
-    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
-        generateImpressionTelemetry: jest.fn(() => { }),
-        generateInteractTelemetry: jest.fn(() => { })
-    };
-    const mockEvents: Partial<Events> = {
-    };
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockEvents: Partial<Events> = {};
 
-    const mockAppGlobalService: Partial<AppGlobalService> = {
-        resetSavedQuizContent: jest.fn()
+    const mockAppGlobalService: Partial<AppGlobalService> = {};
+    const mockRouter: Partial<Router> = {};
+    const mockSbProgressLoader: Partial<SbProgressLoader> = {};
+    const mockSegmentationTagService: Partial<SegmentationTagService> = {
+        getPersistedSegmentaion: jest.fn()
     };
 
-
-
     beforeAll(() => {
         signInCardComponent = new SignInCardComponent(
             mockProfileService as ProfileService,
-            mockGroupService as GroupService,
             mockAuthService as AuthService,
             mockSharedPreferences as SharedPreferences,
             mockNavController as NavController,
@@ -59,10 +66,13 @@ describe('SignInCardComponent', () => {
             mockNgZone as NgZone,
             mockAppVersion as AppVersion,
             mockCommonUtilService as CommonUtilService,
-            mockFormnFrameworkUtilService as FormAndFrameworkUtilService,
+            mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
             mockTelemetryGeneratorService as TelemetryGeneratorService,
             mockEvents as Events,
-            mockAppGlobalService as AppGlobalService
+            mockAppGlobalService as AppGlobalService,
+            mockRouter as Router,
+            mockSbProgressLoader as SbProgressLoader,
+            mockSegmentationTagService as SegmentationTagService
         );
     });
 
@@ -74,13 +84,382 @@ describe('SignInCardComponent', () => {
         expect(signInCardComponent).toBeTruthy();
     });
 
-    it('should reset SavedContentQuiz Context', () => {
-        // arrange
-        mockCommonUtilService.networkInfo = {isNetworkAvailable: false};
-        // act
-        signInCardComponent.signIn();
-        // assert
-        expect(mockAppGlobalService.resetSavedQuizContent).toHaveBeenCalled();
+    describe('signIn test cases', () => {
+        it('should take case scenarios from sign in flow', (done) => {
+            // arrange
+            mockAppGlobalService.resetSavedQuizContent = jest.fn();
+            signInCardComponent.fromEnrol = false;
+            mockSharedPreferences.putString = jest.fn(() => of(undefined));
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockFormAndFrameworkUtilService.getWebviewSessionProviderConfig = jest.fn(() => Promise.resolve({
+                access_token: 'SOME_ACCESS_TOKEN',
+                refresh_token: 'SOME_REFRESH_TOKEN',
+                userToken: 'SOME_USER_TOKEN'
+            }));
+            jest.spyOn(mockAuthService, 'setSession').mockImplementation(() => of(undefined));
+            mockSbProgressLoader.show = jest.fn();
+            mockAuthService.getSession = jest.fn(() => of({
+                access_token: 'SOME_ACCESS_TOKEN',
+                refresh_token: 'SOME_REFRESH_TOKEN',
+                userToken: 'SOME_USER_TOKEN'
+            }));
+            const mockProfileData: Profile = {
+                uid: 'sample_id',
+                handle: 'sample_name',
+                profileType: ProfileType.TEACHER,
+                source: ProfileSource.SERVER,
+                profileUserType: {
+                    type: 'OTHER'
+                },
+                serverProfile: {
+                    uid: 'sample_id',
+                    handle: 'sample_name',
+                    profileType: ProfileType.TEACHER,
+                    source: ProfileSource.SERVER
+                },
+                rootOrg: {
+                    slug: 'sample_slug',
+                    orgName: 'sample_orgName'
+                }
+            };
+            mockProfileService.getServerProfilesDetails = jest.fn(() => of(mockProfileData));
+            mockProfileService.getAllProfiles = jest.fn(() => of([]));
+            mockProfileService.createProfile = jest.fn(() => of(mockProfileData));
+            mockProfileService.setActiveSessionForProfile = jest.fn(() => of(true));
+            mockFormAndFrameworkUtilService.updateLoggedInUser = jest.fn(() => Promise.resolve({}));
+            mockProfileService.getTenantInfo = jest.fn(() => of({
+                title: 'sample_title',
+                logo: 'sample_logo',
+            }));
+            mockProfileService.isDefaultChannelProfile = jest.fn(() => of(true));
+            mockAppVersion.getAppName = jest.fn(() => Promise.resolve('sample_app_name'));
+            mockSharedPreferences.putString = jest.fn(() => of(undefined));
+            jest.spyOn(global.splashscreen, 'setContent').mockImplementation();
+            mockAppGlobalService.signinOnboardingLoader = false;
+            mockNgZone.run = jest.fn((cb) => {
+                cb();
+            }) as any;
+            signInCardComponent.source = 'courses';
+            mockRouter.navigateByUrl = jest.fn();
+            mockEvents.publish = jest.fn();
+            // act
+            signInCardComponent.signIn({redirectUrlAfterLogin: true});
+            // assert
+            setTimeout(() => {
+                expect(dismissFn).toHaveBeenCalled();
+                expect(presentFn).toHaveBeenCalled();
+                expect(mockFormAndFrameworkUtilService.getWebviewSessionProviderConfig).toHaveBeenCalledWith('login');
+                expect(mockAuthService.getSession).toHaveBeenCalled();
+                expect(mockProfileService.getServerProfilesDetails).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+                expect(mockProfileService.createProfile).toHaveBeenCalled();
+                expect(mockProfileService.setActiveSessionForProfile).toHaveBeenCalled();
+                expect(mockFormAndFrameworkUtilService.updateLoggedInUser).toHaveBeenCalled();
+                expect(global.splashscreen.setContent).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should take error cases in refresh ProfileData error case scenarios from sign in flow', (done) => {
+            // arrange
+            mockAppGlobalService.resetSavedQuizContent = jest.fn();
+            signInCardComponent.fromEnrol = false;
+            mockSharedPreferences.putString = jest.fn(() => of(undefined));
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockFormAndFrameworkUtilService.getWebviewSessionProviderConfig = jest.fn(() => Promise.resolve({
+                access_token: 'SOME_ACCESS_TOKEN',
+                refresh_token: 'SOME_REFRESH_TOKEN',
+                userToken: 'SOME_USER_TOKEN'
+            }));
+            jest.spyOn(mockAuthService, 'setSession').mockImplementation(() => of(undefined));
+            mockSbProgressLoader.show = jest.fn();
+            mockAuthService.getSession = jest.fn(() => of({
+                access_token: 'SOME_ACCESS_TOKEN',
+                refresh_token: 'SOME_REFRESH_TOKEN',
+                userToken: 'SOME_USER_TOKEN'
+            }));
+            const mockProfileData: Profile = {
+                uid: 'sample_id',
+                handle: 'sample_name',
+                profileType: ProfileType.TEACHER,
+                source: ProfileSource.SERVER,
+                profileUserType: {
+                    type: 'Teacher'
+                },
+                serverProfile: {
+                    uid: 'sample_id',
+                    handle: 'sample_name',
+                    profileType: ProfileType.TEACHER,
+                    source: ProfileSource.SERVER
+                },
+                rootOrg: {
+                    slug: 'sample_slug',
+                    orgName: 'sample_orgName'
+                }
+            };
+            mockProfileService.getServerProfilesDetails = jest.fn(() => of(mockProfileData));
+            mockProfileService.createProfile = jest.fn(() => of(mockProfileData));
+            mockProfileService.setActiveSessionForProfile = jest.fn(() => throwError('error'));
+            mockFormAndFrameworkUtilService.updateLoggedInUser = jest.fn(() => Promise.resolve({}));
+            jest.spyOn(console, 'log').mockImplementation();
+            mockAppGlobalService.signinOnboardingLoader = false;
+            mockNgZone.run = jest.fn((cb) => {
+                cb();
+            }) as any;
+            signInCardComponent.source = 'courses';
+            mockRouter.navigateByUrl = jest.fn();
+            mockEvents.publish = jest.fn();
+            // act
+            signInCardComponent.signIn({redirectUrlAfterLogin: true});
+            // assert
+            setTimeout(() => {
+                expect(dismissFn).toHaveBeenCalled();
+                expect(presentFn).toHaveBeenCalled();
+                expect(mockFormAndFrameworkUtilService.getWebviewSessionProviderConfig).toHaveBeenCalledWith('login');
+                expect(mockAuthService.getSession).toHaveBeenCalled();
+                expect(mockProfileService.getServerProfilesDetails).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+                expect(mockProfileService.createProfile).toHaveBeenCalled();
+                expect(mockProfileService.setActiveSessionForProfile).toHaveBeenCalled();
+                expect(console.log).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
     });
 
+    describe('signIn error test cases', () => {
+
+        it('should go to catch part if refresh profile data and profileData returns error', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockFormAndFrameworkUtilService.getWebviewSessionProviderConfig = jest.fn(() => Promise.resolve({
+                access_token: 'SOME_ACCESS_TOKEN',
+                refresh_token: 'SOME_REFRESH_TOKEN',
+                userToken: 'SOME_USER_TOKEN'
+            }));
+            mockRouter.navigateByUrl = jest.fn();
+
+            const signInError = new SignInError('error');
+            jest.spyOn(mockAuthService, 'setSession').mockImplementation(() => throwError(signInError));
+            mockSbProgressLoader.hide = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            signInCardComponent.signIn();
+            setTimeout(() => {
+                // assert
+                expect(mockAuthService.setSession).toHaveBeenCalled();
+                expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({id: 'login'});
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith(signInError.message);
+                done();
+            }, 0);
+        });
+
+        it('should go to catch part if refresh profile data and profileData returns error other in signIn error', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockRouter.navigateByUrl = jest.fn();
+
+            mockFormAndFrameworkUtilService.getWebviewSessionProviderConfig = jest.fn(() => Promise.resolve({
+                access_token: 'SOME_ACCESS_TOKEN',
+                refresh_token: 'SOME_REFRESH_TOKEN',
+                userToken: 'SOME_USER_TOKEN'
+            }));
+            jest.spyOn(mockAuthService, 'setSession').mockImplementation(() => throwError());
+            mockSbProgressLoader.hide = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            signInCardComponent.signIn();
+            setTimeout(() => {
+                // assert
+                expect(mockAuthService.setSession).toHaveBeenCalled();
+                expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({id: 'login'});
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_WHILE_LOGIN');
+                done();
+            }, 0);
+        });
+
+        it('should go to catch block if getWebviewSessionProviderConfig returns and error', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            signInCardComponent.fromEnrol = true;
+            mockFormAndFrameworkUtilService.getWebviewSessionProviderConfig = jest.fn(() => Promise.reject('error'));
+            mockSbProgressLoader.hide = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            signInCardComponent.signIn().then(() => {
+                // assert
+                expect(dismissFn).toHaveBeenCalled();
+                expect(presentFn).toHaveBeenCalled();
+                expect(mockFormAndFrameworkUtilService.getWebviewSessionProviderConfig).toHaveBeenCalledWith('login');
+                expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({id: 'login'});
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_WHILE_LOGIN');
+                done();
+            });
+        });
+
+        it('should go to catch block if getSession returns undefined', (done) => {
+            // arrange
+            mockAppGlobalService.resetSavedQuizContent = jest.fn();
+            signInCardComponent.fromEnrol = false;
+            mockSharedPreferences.putString = jest.fn(() => of(undefined));
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockFormAndFrameworkUtilService.getWebviewSessionProviderConfig = jest.fn(() => Promise.resolve({
+                access_token: 'SOME_ACCESS_TOKEN',
+                refresh_token: 'SOME_REFRESH_TOKEN',
+                userToken: 'SOME_USER_TOKEN'
+            }));
+            jest.spyOn(mockAuthService, 'setSession').mockImplementation(() => of(undefined));
+            mockSbProgressLoader.show = jest.fn();
+            mockAuthService.getSession = jest.fn(() => of(throwError('error')));
+            mockProfileService.getServerProfilesDetails = jest.fn(() => of());
+            mockSbProgressLoader.hide = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            signInCardComponent.signIn();
+
+            setTimeout(() => {
+                expect(mockAuthService.getSession).toHaveBeenCalled();
+                expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({id: 'login'});
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_WHILE_LOGIN');
+                done();
+            }, 0);
+        });
+
+        it('should go to catch block if getServerProfileDetails throw error', (done) => {
+            // arrange
+            mockAppGlobalService.resetSavedQuizContent = jest.fn();
+            signInCardComponent.fromEnrol = false;
+            mockSharedPreferences.putString = jest.fn(() => of(undefined));
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockFormAndFrameworkUtilService.getWebviewSessionProviderConfig = jest.fn(() => Promise.resolve({
+                access_token: 'SOME_ACCESS_TOKEN',
+                refresh_token: 'SOME_REFRESH_TOKEN',
+                userToken: 'SOME_USER_TOKEN'
+            }));
+            jest.spyOn(mockAuthService, 'setSession').mockImplementation(() => of(undefined));
+            mockSbProgressLoader.show = jest.fn();
+            mockAuthService.getSession = jest.fn(() => of({
+                access_token: 'SOME_ACCESS_TOKEN',
+                refresh_token: 'SOME_REFRESH_TOKEN',
+                userToken: 'SOME_USER_TOKEN'
+            }));
+            mockProfileService.getServerProfilesDetails = jest.fn(() => throwError('error'));
+            mockSbProgressLoader.hide = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+
+            // act
+            signInCardComponent.signIn();
+            setTimeout(() => {
+                expect(mockProfileService.getServerProfilesDetails).toHaveBeenCalled();
+                expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({id: 'login'});
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_WHILE_LOGIN');
+                done();
+            }, 0);
+        });
+
+        it('should go to catch block if create profile throws error', (done) => {
+            // arrange
+            mockAppGlobalService.resetSavedQuizContent = jest.fn();
+            signInCardComponent.fromEnrol = false;
+            mockSharedPreferences.putString = jest.fn(() => of(undefined));
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockFormAndFrameworkUtilService.getWebviewSessionProviderConfig = jest.fn(() => Promise.resolve({
+                access_token: 'SOME_ACCESS_TOKEN',
+                refresh_token: 'SOME_REFRESH_TOKEN',
+                userToken: 'SOME_USER_TOKEN'
+            }));
+            jest.spyOn(mockAuthService, 'setSession').mockImplementation(() => of(undefined));
+            mockSbProgressLoader.show = jest.fn();
+            mockAuthService.getSession = jest.fn(() => of({
+                access_token: 'SOME_ACCESS_TOKEN',
+                refresh_token: 'SOME_REFRESH_TOKEN',
+                userToken: 'SOME_USER_TOKEN'
+            }));
+            mockSbProgressLoader.hide = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+            const mockProfileData: Profile = {
+                uid: 'sample_id',
+                handle: 'sample_name',
+                profileType: ProfileType.TEACHER,
+                source: ProfileSource.SERVER,
+                profileUserType: {
+                    type: 'OTHER'
+                },
+                serverProfile: {
+                    uid: 'sample_id',
+                    handle: 'sample_name',
+                    profileType: ProfileType.TEACHER,
+                    source: ProfileSource.SERVER
+                },
+                rootOrg: {
+                    slug: 'sample_slug',
+                    orgName: 'sample_orgName'
+                }
+            };
+            mockRouter.navigateByUrl = jest.fn();
+            mockProfileService.getServerProfilesDetails = jest.fn(() => of(mockProfileData));
+            mockProfileService.getAllProfiles = jest.fn(() => of([]));
+            mockProfileService.createProfile = jest.fn(() => throwError('error'));
+            // act
+            signInCardComponent.signIn();
+            // assert
+            setTimeout(() => {
+                expect(mockProfileService.createProfile).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
 });
diff --git a/src/app/components/sign-in-card/sign-in-card.component.ts b/src/app/components/sign-in-card/sign-in-card.component.ts
index 96932ef89..0deb63d2b 100644
--- a/src/app/components/sign-in-card/sign-in-card.component.ts
+++ b/src/app/components/sign-in-card/sign-in-card.component.ts
@@ -1,6 +1,21 @@
-import { Component, EventEmitter, Inject, Input, NgZone, Output, OnInit } from '@angular/core';
-import { NavController, Events } from '@ionic/angular';
+import { Component, EventEmitter, Inject, Input, NgZone, Output } from '@angular/core';
+import { Router } from '@angular/router';
+import { EventTopics, IgnoreTelemetryPatters, PreferenceKey, ProfileConstants } from '@app/app/app.constant';
+import { initTabs, LOGIN_TEACHER_TABS } from '@app/app/module.service';
+import { AppGlobalService } from '@app/services';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { ContainerService } from '@app/services/container.services';
+import { FormAndFrameworkUtilService } from '@app/services/formandframeworkutil.service';
+import {
+  Environment,
+  InteractSubtype,
+  InteractType,
+  PageId
+} from '@app/services/telemetry-constants';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
 import { AppVersion } from '@ionic-native/app-version/ngx';
+import { NavController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import {
   AuthService,
   OAuthSession,
@@ -8,36 +23,22 @@ import {
   ProfileService,
   ProfileSource,
   ProfileType,
-  SignInError,
   ServerProfileDetailsRequest,
-  SharedPreferences,
-  GroupService,
+  SharedPreferences, SignInError,
   TenantInfoRequest,
   WebviewLoginSessionProvider,
   WebviewSessionProviderConfig
 } from 'sunbird-sdk';
-
-import { initTabs, LOGIN_TEACHER_TABS } from '@app/app/module.service';
-import { ProfileConstants, PreferenceKey, EventTopics } from '@app/app/app.constant';
-import { FormAndFrameworkUtilService } from '@app/services/formandframeworkutil.service';
-import { CommonUtilService } from '@app/services/common-util.service';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import {
-  Environment,
-  InteractSubtype,
-  InteractType,
-  PageId
-} from '@app/services/telemetry-constants';
-import { ContainerService } from '@app/services/container.services';
-import { AppGlobalService } from '@app/services';
-import { Router } from '@angular/router';
+import { Context as SbProgressLoaderContext, SbProgressLoader } from '../../../services/sb-progress-loader.service';
+import { EventParams } from './event-params.interface';
+import { SegmentationTagService } from '@app/services/segmentation-tag/segmentation-tag.service';
 
 @Component({
   selector: 'app-sign-in-card',
   templateUrl: './sign-in-card.component.html',
   styleUrls: ['./sign-in-card.component.scss'],
 })
-export class SignInCardComponent implements OnInit {
+export class SignInCardComponent {
 
   @Input() source = '';
   @Input() title = 'OVERLAY_LABEL_COMMON';
@@ -48,7 +49,6 @@ export class SignInCardComponent implements OnInit {
 
   constructor(
     @Inject('PROFILE_SERVICE') private profileService: ProfileService,
-    @Inject('GROUP_SERVICE') private groupService: GroupService,
     @Inject('AUTH_SERVICE') private authService: AuthService,
     @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
     public navCtrl: NavController,
@@ -60,7 +60,9 @@ export class SignInCardComponent implements OnInit {
     private telemetryGeneratorService: TelemetryGeneratorService,
     private events: Events,
     private appGlobalService: AppGlobalService,
-    private router: Router
+    private router: Router,
+    private sbProgressLoader: SbProgressLoader,
+    private segmentationTagService: SegmentationTagService
   ) {
 
     this.appVersion.getAppName()
@@ -69,13 +71,9 @@ export class SignInCardComponent implements OnInit {
       });
   }
 
-  ngOnInit() {
-
-  }
-
-  async signIn() {
+  async signIn(skipNavigation?) {
     this.appGlobalService.resetSavedQuizContent();
-    // clean the prefernces to avoid unnecessary enrolment
+    // clean the preferences to avoid unnecessary enrolment
     if (!this.fromEnrol) {
       this.preferences.putString(PreferenceKey.BATCH_DETAIL_KEY, '').toPromise();
       this.preferences.putString(PreferenceKey.COURSE_DATA_KEY, '').toPromise();
@@ -94,7 +92,6 @@ export class SignInCardComponent implements OnInit {
       this.generateLoginInteractTelemetry(InteractType.TOUCH, InteractSubtype.LOGIN_INITIATE, '');
 
       const that = this;
-      const loader = await this.commonUtilService.getLoader();
       const webviewSessionProviderConfigloader = await this.commonUtilService.getLoader();
 
       let webviewLoginSessionProviderConfig: WebviewSessionProviderConfig;
@@ -106,21 +103,23 @@ export class SignInCardComponent implements OnInit {
         webviewMigrateSessionProviderConfig = await this.formAndFrameworkUtilService.getWebviewSessionProviderConfig('migrate');
         await webviewSessionProviderConfigloader.dismiss();
       } catch (e) {
+        this.sbProgressLoader.hide({ id: 'login' });
         await webviewSessionProviderConfigloader.dismiss();
         this.commonUtilService.showToast('ERROR_WHILE_LOGIN');
         return;
       }
 
       this.authService.setSession(
-          new WebviewLoginSessionProvider(
-              webviewLoginSessionProviderConfig,
-              webviewMigrateSessionProviderConfig
-          )
+        new WebviewLoginSessionProvider(
+          webviewLoginSessionProviderConfig,
+          webviewMigrateSessionProviderConfig
+        )
       )
         .toPromise()
         .then(async () => {
-          await loader.present();
-          console.log("Hello");
+
+          await this.sbProgressLoader.show(this.generateIgnoreTelemetryContext());
+
           initTabs(that.container, LOGIN_TEACHER_TABS);
           return that.refreshProfileData();
         })
@@ -128,41 +127,33 @@ export class SignInCardComponent implements OnInit {
           return that.refreshTenantData(value.slug, value.title);
         })
         .then(async () => {
-          await loader.dismiss();
-          if (!this.appGlobalService.signinOnboardingLoader) {
-            this.appGlobalService.signinOnboardingLoader = await this.commonUtilService.getLoader();
-            await this.appGlobalService.signinOnboardingLoader.present();
-          }
+          if (!this.appGlobalService.signinOnboardingLoader) { }
           that.ngZone.run(() => {
-            setTimeout(function() {
-              if(that.source === 'courses') {
-                that.router.navigateByUrl("tabs/courses");
+            setTimeout(() => {
+              if (that.source === 'courses') {
+                that.router.navigateByUrl('tabs/courses');
               } else if (that.source === 'profile') {
-                that.router.navigateByUrl("tabs/profile");
+                that.router.navigateByUrl('tabs/profile');
               }
-              
-            },1000);
-            that.preferences.putString('SHOW_WELCOME_TOAST', 'true').toPromise().then();
-
-            // note: Navigating back to Resourses is though the below event from App-Components.
-            this.events.publish(EventTopics.SIGN_IN_RELOAD);
+              that.preferences.putString('SHOW_WELCOME_TOAST', 'true').toPromise().then();
+              // note: Navigating back to Resources is though the below event from App-Components.
+              this.events.publish(EventTopics.SIGN_IN_RELOAD, skipNavigation);
+              this.segmentationTagService.getPersistedSegmentaion();
+            }, 2000);
           });
         })
         .catch(async (err) => {
-          console.error(err);
-
+          this.sbProgressLoader.hide({ id: 'login' });
           if (err instanceof SignInError) {
             this.commonUtilService.showToast(err.message);
           } else {
             this.commonUtilService.showToast('ERROR_WHILE_LOGIN');
           }
-
-          return await loader.dismiss();
         });
     }
   }
 
-  refreshProfileData() {
+  private refreshProfileData() {
     const that = this;
 
     return new Promise<any>((resolve, reject) => {
@@ -174,26 +165,40 @@ export class SignInCardComponent implements OnInit {
               requiredFields: ProfileConstants.REQUIRED_FIELDS
             };
             that.profileService.getServerProfilesDetails(req).toPromise()
-              .then((success) => {
+              .then(async (success: any) => {
+                const currentProfileType = (() => {
+                  if (
+                    (success.profileUserType.type === ProfileType.OTHER.toUpperCase()) ||
+                    (!success.profileUserType.type)
+                  ) {
+                    return ProfileType.NONE;
+                  }
+
+                  return success.profileUserType.type.toLowerCase();
+                })();
                 that.generateLoginInteractTelemetry(InteractType.OTHER, InteractSubtype.LOGIN_SUCCESS, success.id);
                 const profile: Profile = {
                   uid: success.id,
                   handle: success.id,
-                  profileType: ProfileType.TEACHER,
+                  profileType: currentProfileType,
                   source: ProfileSource.SERVER,
                   serverProfile: success
                 };
-                this.profileService.createProfile(profile, ProfileSource.SERVER)
-                  .toPromise()
-                  .then(() => {
-                    that.groupService.removeActiveGroupSession()
-                    .subscribe(() => {
-                    },
-                      () => {
-                      });
+                this.profileService.createProfile(profile, ProfileSource.SERVER).toPromise()
+                  .then(async () => {
+                    await this.preferences.putString(PreferenceKey.SELECTED_USER_TYPE, currentProfileType).toPromise();
                     that.profileService.setActiveSessionForProfile(profile.uid).toPromise()
                       .then(() => {
-                        that.formAndFrameworkUtilService.updateLoggedInUser(success, profile)
+                        /* Medatory for login flow
+                         * eventParams are essential parameters for avoiding duplicate calls to API
+                         * skipSession & skipProfile should be false here
+                         * until further change
+                         */
+                        const eventParams: EventParams = {
+                          skipSession: false,
+                          skipProfile: false
+                        };
+                        that.formAndFrameworkUtilService.updateLoggedInUser(success, profile, eventParams)
                           .then(() => {
                             resolve({ slug: success.rootOrg.slug, title: success.rootOrg.orgName });
                           }).catch(() => {
@@ -204,10 +209,11 @@ export class SignInCardComponent implements OnInit {
                       }).catch((err) => {
                         console.log('err in setActiveSessionProfile in sign-in card --', err);
                       });
-                  }).catch(() => {
-
+                  }).catch((err) => {
+                    console.log('err in createProfile --', err);
                   });
               }).catch((err) => {
+                console.log('err in getServerProfilesDetails --', err);
                 reject(err);
               });
           } else {
@@ -217,8 +223,8 @@ export class SignInCardComponent implements OnInit {
     });
   }
 
-  refreshTenantData(tenantSlug: string, title: string) {
-    const tenantInfoRequest: TenantInfoRequest = {slug: tenantSlug};
+  private refreshTenantData(tenantSlug: string, title: string) {
+    const tenantInfoRequest: TenantInfoRequest = { slug: tenantSlug };
     return new Promise((resolve, reject) => {
       this.profileService.getTenantInfo(tenantInfoRequest).toPromise()
         .then(async (res) => {
@@ -230,13 +236,14 @@ export class SignInCardComponent implements OnInit {
           this.preferences.putString(PreferenceKey.APP_NAME, title).toPromise().then();
           (window as any).splashscreen.setContent(title, res.appLogo);
           resolve();
-        }).catch(() => {
+        }).catch((err) => {
+          console.log('err in getTenantInfo --', err);
           resolve(); // ignore
         });
     });
   }
 
-  generateLoginInteractTelemetry(interactType, interactSubtype, uid) {
+  private generateLoginInteractTelemetry(interactType, interactSubtype, uid) {
     const valuesMap = new Map();
     valuesMap['UID'] = uid;
     this.telemetryGeneratorService.generateInteractTelemetry(
@@ -248,4 +255,15 @@ export class SignInCardComponent implements OnInit {
       valuesMap);
   }
 
+  private generateIgnoreTelemetryContext(): SbProgressLoaderContext {
+    return {
+      id: 'login',
+      ignoreTelemetry: {
+        when: {
+          interact: IgnoreTelemetryPatters.IGNORE_SIGN_IN_PAGE_ID_EVENTS,
+          impression: IgnoreTelemetryPatters.IGNORE_CHANNEL_IMPRESSION_EVENTS
+        }
+      }
+    };
+  }
 }
diff --git a/src/app/components/support-acknowledgement/support-acknowledgement.component.html b/src/app/components/support-acknowledgement/support-acknowledgement.component.html
new file mode 100644
index 000000000..ba5e42bd1
--- /dev/null
+++ b/src/app/components/support-acknowledgement/support-acknowledgement.component.html
@@ -0,0 +1,17 @@
+<div class="container">
+    <div class="header">
+        <div class="h-6per">
+            <ion-icon name="close" (click)="close()" class="close"></ion-icon>
+        </div>
+        <div class="h-90cent">
+            <h4 class="message">{{'RESPONSE_ACKNOWLEGED' | translate}}</h4>
+            <span>{{'FOR_SUPPORT' | translate:{'%s': boardContact.name} }}</span>
+            <div class="m-10">
+                <span>call</span>
+                <span class="contact-no"> {{boardContact.contactinfo.number}}</span>
+            </div>
+            <span>{{boardContact.message}}</span>
+            <button (click)="openDialpad()" class="btn-call">Call</button>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/components/support-acknowledgement/support-acknowledgement.component.scss b/src/app/components/support-acknowledgement/support-acknowledgement.component.scss
new file mode 100644
index 000000000..a05079b33
--- /dev/null
+++ b/src/app/components/support-acknowledgement/support-acknowledgement.component.scss
@@ -0,0 +1,69 @@
+@import "src/assets/styles/_variables.scss";
+
+.container {
+    width: -webkit-fill-available;
+    height: -webkit-fill-available;
+    background: map-get($colors , light_black );
+    position: fixed;
+    top: 0px;
+    display: -webkit-flexbox;
+    display: -ms-flexbox;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-flex-align: center;
+    -ms-flex-align: center;
+    -webkit-align-items: center;
+    align-items: center;
+    justify-content: center;
+    z-index: 10;
+}
+
+.header {
+    background-color: $white;
+    width: 331px;
+    height: 279px;
+    margin: 0 auto;
+    border-radius: 10px;
+    text-align: center;
+    padding: 8px;
+}
+
+.h-6per {
+    height: 6%;
+}
+
+.close {
+    float: right;
+    font-weight: bold;
+    height: 30px;
+    width: 30px;
+    margin: 6px 6px 0px 0px;
+}
+
+.h-90cent {
+    height: 80%;
+    margin-top: 36px;
+}
+
+.message {
+    color: $green;
+    font-weight: bolder;    
+}
+
+.m-10 {
+    margin: 10px 0px;
+}
+
+.contact-no {
+    font-weight: 900;
+    color: map-get($colors, deep_blue);
+}
+
+.btn-call {
+    width: 95%;
+    height: 16%;
+    font-size: 16px;
+    color: $white;
+    background: $green;
+    margin-top: 24px;
+}
diff --git a/src/app/components/support-acknowledgement/support-acknowledgement.component.spec.ts b/src/app/components/support-acknowledgement/support-acknowledgement.component.spec.ts
new file mode 100644
index 000000000..581ffbc8b
--- /dev/null
+++ b/src/app/components/support-acknowledgement/support-acknowledgement.component.spec.ts
@@ -0,0 +1,46 @@
+import {SupportAcknowledgement} from './support-acknowledgement.component';
+import {TranslateService} from '@ngx-translate/core';
+
+describe('SupportAcknowledgement', () => {
+    let supportAcknowledgement: SupportAcknowledgement;
+    const mockTranslateService: Partial<TranslateService> = {};
+    beforeAll(() => {
+        supportAcknowledgement = new SupportAcknowledgement(
+            mockTranslateService as any
+        );
+    });
+
+    describe('initialise', () => {
+        it('constructor initialisation', () => {
+            // assert
+            expect(supportAcknowledgement).toBeTruthy();
+        });
+    });
+
+    describe('openDialpad', () => {
+        it('should call open', () => {
+            // arrange
+            window.open = jest.fn();
+            // act
+            supportAcknowledgement.boardContact = {
+                contactinfo: {
+                    number: '92739821734'
+                }
+            };
+            supportAcknowledgement.openDialpad();
+            // assert
+            expect(window.open).toBeCalled();
+        });
+    });
+
+    describe('close popup', () => {
+        it('should emit an event to close popup', () => {
+            supportAcknowledgement.closeEvents = {emit : jest.fn()};
+            // act
+            supportAcknowledgement.close();
+
+            // assert
+            expect(supportAcknowledgement.closeEvents.emit).toHaveBeenCalledWith(true);
+        });
+    });
+});
diff --git a/src/app/components/support-acknowledgement/support-acknowledgement.component.ts b/src/app/components/support-acknowledgement/support-acknowledgement.component.ts
new file mode 100644
index 000000000..f78c91bc7
--- /dev/null
+++ b/src/app/components/support-acknowledgement/support-acknowledgement.component.ts
@@ -0,0 +1,24 @@
+import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+
+@Component({
+    selector: 'support-acknowledgement',
+    templateUrl: './support-acknowledgement.component.html',
+    styleUrls: ['./support-acknowledgement.component.scss']
+})
+export class SupportAcknowledgement {
+    @Output() closeEvents = new EventEmitter();
+    @Input() boardContact: any;
+    constructor(
+        private translate: TranslateService
+    ) {}
+
+    close() {
+        this.closeEvents.emit(true);
+    }
+
+    openDialpad() {
+        window.open('tel:' + this.boardContact.contactinfo.number, '_system');
+    }
+
+}
diff --git a/src/app/components/text-book-card/text-book-card.component.html b/src/app/components/text-book-card/text-book-card.component.html
deleted file mode 100644
index 97e6a6267..000000000
--- a/src/app/components/text-book-card/text-book-card.component.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<div *ngIf="layoutName === 'textbook'">
-  <div class="sb-card"
-    [ngClass]="{'offline': !content?.isAvailableLocally && !commonUtilService.networkInfo.isNetworkAvailable}">
-    <div class="img-container"
-      *ngIf="!(!content?.isAvailableLocally && !commonUtilService.networkInfo.isNetworkAvailable)">
-      <img
-        [src]="commonUtilService.convertFileSrc(content?.courseLogoUrl) || commonUtilService.convertFileSrc(content?.appIcon) || defaultImg"
-        alt="">
-    </div>
-    <div class="img-container"
-      *ngIf="!content?.isAvailableLocally && !commonUtilService.networkInfo.isNetworkAvailable">
-      <img src="assets/imgs/ic_offline_white_sm.png" alt="offline">
-    </div>
-    <div class="sb-card-details">
-      <div class="title">{{content?.courseName || content?.name}} </div>
-      <div class="grade_ellipsis">
-        <span class="info class">{{content?.subject | csa}}</span>
-        <span *ngIf="content?.gradeLevel && content?.subject" class="separator-dot textbook-margin-4"></span>
-        <span class="info subject">{{content?.gradeLevel}}</span>
-      </div>
-    </div>
-  </div>
-</div>
-<div *ngIf="layoutName === 'search'">
-  <div class="sb-card reverse">
-    <div class="img-container">
-      <img alt=""
-        [src]="commonUtilService.convertFileSrc(content?.courseLogoUrl) || commonUtilService.convertFileSrc(content?.appIcon) || defaultImg">
-    </div>
-    <div class="sb-card-details">
-      <div class="title">{{content?.courseName || content?.name}} </div>
-      <div class="grade_ellipsis">
-        <span class="info class">{{content?.subject | csa}}</span>
-        <span *ngIf="content?.gradeLevel && content?.subject" class="separator-dot textbook-margin-4"></span>
-        <span class="info subject">{{content?.gradeLevel}}</span>
-      </div>
-    </div>
-  </div>
-</div>
-<div *ngIf="layoutName === 'explore'">
-  <div class="sb-card reverse">
-    <div class="img-container">
-      <img alt="content-logo"
-        [src]="commonUtilService.convertFileSrc(content?.courseLogoUrl) || commonUtilService.convertFileSrc(content?.appIcon) || defaultImg">
-    </div>
-    <div class="sb-card-details">
-      <div class="title">{{content?.courseName || content?.name}} </div>
-      <div class="grade_ellipsis">
-        <span class="info class">{{content?.subject | csa}}</span>
-        <span *ngIf="content?.gradeLevel && content?.subject" class="separator-dot textbook-margin-4"></span>
-        <span class="info subject">{{content?.gradeLevel}}</span>
-      </div>
-      <span class="info class">{{content?.board}}</span>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/src/app/components/text-book-card/text-book-card.component.scss b/src/app/components/text-book-card/text-book-card.component.scss
deleted file mode 100644
index 3453240ac..000000000
--- a/src/app/components/text-book-card/text-book-card.component.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-:host {
-  .sb-card {
-    .img-container {
-      overflow: hidden;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-    }
-  }
-  .grade_ellipsis {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    color: #969696;
-  }
-
-  .textbook-margin-4 {
-    margin: 0 4px;
-  }
-
-  .sb-card:not(:last-child) {
-    border-bottom: solid 1px #ccc;
-  }
-}
diff --git a/src/app/components/text-book-card/text-book-card.component.ts b/src/app/components/text-book-card/text-book-card.component.ts
deleted file mode 100644
index a01fa4485..000000000
--- a/src/app/components/text-book-card/text-book-card.component.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Component, OnInit, Input } from '@angular/core';
-import { CommonUtilService } from '@app/services/common-util.service';
-
-@Component({
-  selector: 'app-text-book-card',
-  templateUrl: './text-book-card.component.html',
-  styleUrls: ['./text-book-card.component.scss'],
-})
-export class TextBookCardComponent implements OnInit {
-  defaultImg = this.commonUtilService.convertFileSrc('assets/imgs/ic_launcher.png');
-
-  @Input() content: any;
-  @Input() layoutName: string;
-
-  constructor(public commonUtilService: CommonUtilService) { }
-
-  ngOnInit() { }
-
-}
diff --git a/src/app/components/view-all-card/view-all-card.component.html b/src/app/components/view-all-card/view-all-card.component.html
deleted file mode 100644
index 6c358a0bd..000000000
--- a/src/app/components/view-all-card/view-all-card.component.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="sb-card"
-  [ngClass]="{'offline': !content.isAvailableLocally && !commonUtilService.networkInfo.isNetworkAvailable}">
-  <div class="img-container">
-    <img *ngIf="!(!content.isAvailableLocally && !commonUtilService.networkInfo.isNetworkAvailable)"
-      [src]="commonUtilService.convertFileSrc(content.contentData.courseLogoUrl) || commonUtilService.convertFileSrc(content.contentData.appIcon) || defaultImg"
-      alt="content-logo">
-    <img *ngIf="!content.isAvailableLocally && !commonUtilService.networkInfo.isNetworkAvailable"
-      src="assets/imgs/ic_offline_white_sm.png" alt="no-network" />
-  </div>
-  <div class="sb-card-details">
-    <div class="title">{{content.contentData.name}}</div>
-    <div class="info grade_ellipsis"><span class=" class">{{content.contentData.subject | csa}}</span><span
-        *ngIf="content?.contentData.gradeLevel && content?.contentData.subject" class="separator-dot"></span><span
-        class=" subject">{{content.contentData.gradeLevel}}</span>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/src/app/components/view-all-card/view-all-card.component.scss b/src/app/components/view-all-card/view-all-card.component.scss
deleted file mode 100644
index 747fb2bba..000000000
--- a/src/app/components/view-all-card/view-all-card.component.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-:host {
-    .sb-card{
-        .img-container{
-            overflow: hidden;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-        }
-    }
-    .grade_ellipsis{
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis; 
-    }
-    
-}
diff --git a/src/app/components/view-all-card/view-all-card.component.ts b/src/app/components/view-all-card/view-all-card.component.ts
deleted file mode 100644
index 44fb6f9fc..000000000
--- a/src/app/components/view-all-card/view-all-card.component.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { CommonUtilService } from '../../../services/common-util.service';
-import { Component, Input, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-view-all-card',
-  templateUrl: './view-all-card.component.html',
-  styleUrls: ['./view-all-card.component.scss'],
-})
-export class ViewAllCardComponent implements OnInit {
-  text: string;
-  defaultImg = this.commonUtilService.convertFileSrc('assets/imgs/ic_launcher.png');
-  @Input() content: any;
-  @Input() type: any;
-  @Input() sectionName: any;
-  @Input() userId: any;
-
-  constructor(
-    public commonUtilService: CommonUtilService
-  ) { }
-
-  ngOnInit() { }
-
-}
diff --git a/src/app/content-details/content-details.module.ts b/src/app/content-details/content-details.module.ts
index fc13a40e8..03100230f 100644
--- a/src/app/content-details/content-details.module.ts
+++ b/src/app/content-details/content-details.module.ts
@@ -1,15 +1,12 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { Routes, RouterModule } from '@angular/router';
-
+import { RouterModule, Routes } from '@angular/router';
+import { PipesModule } from '@app/pipes/pipes.module';
 import { IonicModule } from '@ionic/angular';
-
-import { ContentDetailsPage } from './content-details.page';
 import { TranslateModule } from '@ngx-translate/core';
-import { PipesModule } from '@app/pipes/pipes.module';
 import { ComponentsModule } from '../components/components.module';
-import { ConfirmAlertComponent } from '../components';
+import { ContentDetailsPage } from './content-details.page';
 
 const routes: Routes = [
   {
diff --git a/src/app/content-details/content-details.page.html b/src/app/content-details/content-details.page.html
index a465b66a7..2229bcb93 100644
--- a/src/app/content-details/content-details.page.html
+++ b/src/app/content-details/content-details.page.html
@@ -1,75 +1,41 @@
 <!-- New content details -->
 <ion-content *ngIf="content && appGlobalService?.CONTENT_STREAMING_ENABLED">
   <div class="sb-play-container sb-player-container" *ngIf="commonUtilService.networkInfo.isNetworkAvailable">
-    <div *ngIf="streamingUrl">
-      <div *ngIf="contentDownloadable[content?.identifier]">
-        <img class="sb-player-container" src='{{content?.contentData?.appIcon}}' alt="content-icon">
-        <div class="sb-overlay-container">
-          <div class="sb-back-transparent" (click)="handleNavBackButton();$event.stopPropagation()">
-            <div class="sb-circle">
-              <ion-icon name="arrow-back" class="sb-arrow-back"></ion-icon>
-            </div>
-          </div>
-          <div class="sb-dt-content sb-dt-content-main">
-            <div class="left">
-              <div class="sb-dt-title"> {{content?.contentData?.name}}</div>
-              <div class="sb-dt-source" *ngIf="content?.contentData?.owner || content?.contentData?.creator">
-                <span class="sb-by-gray">{{ 'CONTENT_CREATED_BY' | translate }} &nbsp;</span>
-                <span class="sb-user">{{ content?.contentData?.owner || content?.contentData?.creator }}</span>
-                <span class="sb-rating-view" *ngIf="content?.contentData?.me_averageRating">
-                  <span class="content-vertical-line"></span>
-                  <span class="sb-rating-value">{{ content?.contentData?.me_averageRating }}</span>
-                  <span class="sb-rating-star">
-                    <ion-icon ios="ios-star" md="md-star"></ion-icon>
-                  </span>
-                </span>
-              </div>
-            </div>
-          </div>
-          <div class="sb-common-player-group sb-play-title-group">
-            <button fill="clear" icon-only class="sb-common-title" (click)="handleContentPlay(false)">
-              <img src="assets/imgs/play_circle.svg" alt="play-circle">
-            </button>
-            <p class="play-text"> {{'PLAY' | translate}} </p>
+    <div *ngIf="contentDownloadable[content?.identifier]">
+      <img class="sb-player-container" src='{{content?.contentData?.appIcon}}' alt="content-icon">
+      <div class="sb-overlay-container">
+        <div class="sb-back-transparent" (click)="handleNavBackButton();$event.stopPropagation()">
+          <div class="sb-circle">
+            <ion-icon name="arrow-back" class="sb-arrow-back"></ion-icon>
           </div>
         </div>
-      </div>
-      <div *ngIf="!contentDownloadable[content?.identifier]">
-        <img class="sb-player-container" src='{{content?.contentData?.appIcon}}' alt="content-icon">
-        <div class="sb-overlay-container">
-          <div class="sb-back-transparent" (click)="handleNavBackButton();$event.stopPropagation()">
-            <div class="sb-circle">
-              <ion-icon name="arrow-back" class="sb-arrow-back"></ion-icon>
-            </div>
-          </div>
-          <div class="sb-dt-content sb-dt-content-main">
-            <div class="left">
-              <div class="sb-dt-title"> {{content?.contentData?.name}}</div>
-              <div class="sb-dt-source" *ngIf="content?.contentData?.owner || content?.contentData?.creator">
-                <span class="sb-by-gray">{{ 'CONTENT_CREATED_BY' | translate }} &nbsp;</span>
-                <span class="sb-user">{{ content?.contentData?.owner || content?.contentData?.creator }}</span>
-                <span class="sb-rating-view" *ngIf="content?.contentData?.me_averageRating">
-                  <span class="content-vertical-line"></span>
-                  <span class="sb-rating-value">{{ content?.contentData?.me_averageRating }}</span>
-                  <span class="sb-rating-star">
-                    <ion-icon ios="ios-star" md="md-star"></ion-icon>
-                  </span>
+        <div class="sb-dt-content sb-dt-content-main">
+          <div class="left">
+            <div class="sb-dt-title"> {{content?.contentData?.name}}</div>
+            <div class="sb-dt-source" *ngIf="content?.contentData?.owner || content?.contentData?.creator">
+              <span class="sb-by-gray">{{ 'CONTENT_CREATED_BY' | translate }} &nbsp;</span>
+              <span class="sb-user">{{ content?.contentData?.owner || content?.contentData?.creator }}</span>
+              <span class="sb-rating-view" *ngIf="content?.contentData?.me_averageRating">
+                <span class="content-vertical-line"></span>
+                <span class="sb-rating-value">{{ content?.contentData?.me_averageRating }}</span>
+                <span class="sb-rating-star">
+                  <ion-icon name="star"></ion-icon>
                 </span>
-              </div>
+              </span>
             </div>
-
-          </div>
-          <div class="sb-common-player-group sb-play-title-group">
-            <button fill="clear" icon-only class="sb-common-title" (click)="handleContentPlay(true)">
-              <img src="assets/imgs/play_circle.svg" alt="play-circle">
-            </button>
-            <p class="play-text"> {{'PLAY' | translate}} </p>
           </div>
         </div>
+        <div class="sb-common-player-group sb-play-title-group">
+          <button fill="clear" icon-only class="sb-common-title" (click)="handleContentPlay(false)">
+            <img src="assets/imgs/play_circle.svg" alt="play-circle">
+          </button>
+          <p class="play-text"> {{'PLAY' | translate}} </p>
+        </div>
       </div>
     </div>
-    <div *ngIf="!streamingUrl">
-      <div *ngIf="!contentDownloadable[content?.identifier]">
+    <div *ngIf="!contentDownloadable[content?.identifier]">
+      <img class="sb-player-container" src='{{content?.contentData?.appIcon}}' alt="content-icon">
+      <div class="sb-overlay-container">
         <div class="sb-back-transparent" (click)="handleNavBackButton();$event.stopPropagation()">
           <div class="sb-circle">
             <ion-icon name="arrow-back" class="sb-arrow-back"></ion-icon>
@@ -83,55 +49,30 @@
               <span class="sb-user">{{ content?.contentData?.owner || content?.contentData?.creator }}</span>
               <span class="sb-rating-view" *ngIf="content?.contentData?.me_averageRating">
                 <span class="content-vertical-line"></span>
-
                 <span class="sb-rating-value">{{ content?.contentData?.me_averageRating }}</span>
                 <span class="sb-rating-star">
-                  <ion-icon ios="ios-star" md="md-star"></ion-icon>
+                  <ion-icon name="star"></ion-icon>
                 </span>
               </span>
             </div>
           </div>
 
         </div>
-        <div class="sb-common-player-group sb-download-title-group" (click)="openConfirmPopUp()">
+        <div class="sb-common-player-group sb-play-title-group"
+          *ngIf="content.mimeType !== 'application/vnd.ekstep.h5p-archive' || isIOS">
+          <button fill="clear" icon-only class="sb-common-title" (click)="handleContentPlay(true)">
+            <img src="assets/imgs/play_circle.svg" alt="play-circle">
+          </button>
+          <p class="play-text"> {{'PLAY' | translate}} </p>
+        </div>
+        <div class="sb-common-player-group sb-download-title-group" (click)="openConfirmPopUp()"
+          *ngIf="content.mimeType === 'application/vnd.ekstep.h5p-archive' && !isIOS">
           <ion-button fill="clear" icon-only class="sb-common-title">
-            <ion-icon ios="ios-cloud-download" md="md-cloud-download" class="sb-common-white-icon"></ion-icon>
+            <ion-icon name="cloud-download" class="sb-common-white-icon"></ion-icon>
           </ion-button>
           <div class="sb-common-footer-text">{{'PLEASE_DOWNLOAD_TO_PLAY' | translate}}</div>
         </div>
       </div>
-      <div *ngIf="contentDownloadable[content?.identifier]">
-        <img class="sb-player-container" src='{{content?.contentData?.appIcon}}' alt="content-icon">
-        <div class="sb-overlay-container">
-          <div class="sb-back-transparent" (click)="handleNavBackButton();$event.stopPropagation()">
-            <div class="sb-circle">
-              <ion-icon name="arrow-back" class="sb-arrow-back"></ion-icon>
-            </div>
-          </div>
-          <div class="sb-dt-content sb-dt-content-main">
-            <div class="left">
-              <div class="sb-dt-title"> {{content?.contentData?.name}}</div>
-              <div class="sb-dt-source" *ngIf="content?.contentData?.owner || content?.contentData?.creator">
-                <span class="sb-by-gray">{{ 'CONTENT_CREATED_BY' | translate }} &nbsp;</span>
-                <span class="sb-user">{{ content?.contentData?.owner || content?.contentData?.creator }}</span>
-                <span class="sb-rating-view" *ngIf="content?.contentData?.me_averageRating">
-                  <span class="content-vertical-line"></span>
-                  <span class="sb-rating-value">{{ content?.contentData?.me_averageRating }}</span>
-                  <span class="sb-rating-star">
-                    <ion-icon ios="ios-star" md="md-star"></ion-icon>
-                  </span>
-                </span>
-              </div>
-            </div>
-          </div>
-          <div class="sb-common-player-group sb-play-title-group">
-            <button class="sb-common-title" (click)="handleContentPlay(false)">
-              <img src="assets/imgs/play_circle.svg" alt="play-circle">
-            </button>
-            <p class="play-text"> {{'PLAY' | translate}} </p>
-          </div>
-        </div>
-      </div>
     </div>
   </div>
   <div *ngIf="!commonUtilService.networkInfo.isNetworkAvailable">
@@ -153,7 +94,7 @@
                 <span class="content-vertical-line"></span>
                 <span class="sb-rating-value">{{ content?.contentData?.me_averageRating }}</span>
                 <span class="sb-rating-star">
-                  <ion-icon ios="ios-star" md="md-star"></ion-icon>
+                  <ion-icon name="star"></ion-icon>
                 </span>
               </span>
             </div>
@@ -192,9 +133,11 @@
 
         <div class="sb-btn-tile-group">
           <div *ngIf="content && !this.limitedShareContentFlag">
-            <button *ngIf="!contentDownloadable[content?.identifier]" (click)="openConfirmPopUp()"
-              [disabled]="isDownloadStarted || (isContentDownloading$ | async)" fill="clear" icon-only class="sb-btn-tile">
-              <ion-icon ios="ios-cloud-download" md="md-cloud-download" class="sb-dt-card-blue-icon"></ion-icon>
+            <button *ngIf="!contentDownloadable[content?.identifier] && !isIOS" (click)="openConfirmPopUp()"
+              [ngClass]="cardData.mimeType === 'application/vnd.sunbird.questionset' || !(content?.contentData?.downloadUrl) ? 'download-disabled' : null"
+              [disabled]="isDownloadStarted || (isContentDownloading$ | async)" fill="clear" icon-only
+              class="sb-btn-tile">
+              <img src="assets/imgs/outline_download.svg" alt="download content" class="mb-4">
               <span *ngIf="!isDownloadStarted" class="sb-btn-footer-text">{{'DOWNLOAD' | translate}}</span>
               <span *ngIf="isDownloadStarted && showDownload" class="btn-popover-progress-container">
                 <span class="btn-progress-highlight" [ngStyle]="{'width': this.downloadProgress + '%'}"></span>
@@ -202,25 +145,30 @@
             </button>
           </div>
 
+          <button class="sb-btn-tile" *ngIf="isCompatibleWithVendorApps" (click)="openWithVendorApps()">
+            <img src="assets/imgs/ic_open_with.svg" alt="open-with" class="mb-4">
+            <span class="sb-btn-footer-text">{{'FRMELEMNTS_LBL_OPEN_WITH' | translate}}</span>
+          </button>
+
           <button class="sb-btn-tile" *ngIf="contentDownloadable[content?.identifier]" (click)="showDeletePopup()">
-            <ion-icon ios="ios-trash" md="md-trash" class="sb-dt-card-danger-icon"></ion-icon>
+            <img src="assets/imgs/outline_delete.svg" alt="delete content" class="mb-4">
             <span class="sb-btn-footer-text">{{'DELETE' | translate}}</span>
           </button>
           <button (click)="share()" class="sb-btn-tile" *ngIf="!this.limitedShareContentFlag">
-            <ion-icon ios="ios-share" md="md-share" class="sb-dt-card-blue-icon"></ion-icon>
+            <img src="assets/imgs/outline_share.svg" alt="share content" class="mb-4">
             <span class="sb-btn-footer-text">{{'SHARE' | translate}}</span>
           </button>
           <button class="sb-btn-tile" (click)="rateContent('manual')">
-            <ion-icon ios="ios-star-outline" md="md-star-outline" class="sb-dt-card-blue-icon"></ion-icon>
+            <img src="assets/imgs/outline_rate_star.svg" alt="rate content" class="mb-4">
             <span class="sb-btn-footer-text">{{'RATE' | translate}}</span>
           </button>
           <button class="sb-btn-tile" *ngIf="contentDownloadable[content?.identifier] && this.isUpdateAvail"
             (click)="openConfirmPopUp()">
-            <ion-icon ios="ios-refresh" md="md-refresh" class="sb-dt-card-blue-icon"></ion-icon>
+            <img src="assets/imgs/outline_update.svg" alt="update content" class="mb-4">
             <span class="sb-btn-footer-text">{{'UPDATE' | translate}}</span>
           </button>
           <button class="sb-btn-tile" (click)="openPDFPreview(content)" *ngIf="content?.contentData?.itemSetPreviewUrl">
-            <ion-icon ios="ios-print" md="md-print" class="sb-dt-card-blue-icon"></ion-icon>
+            <img src="assets/imgs/outline_print.svg" alt="print content" class="mb-4">
             <span class="sb-btn-footer-text">{{'PRINT' | translate}}</span>
           </button>
         </div>
@@ -241,7 +189,7 @@
           {{content?.description}}</div>
         <div class="sb-info" *ngIf="content?.contentData?.board">
           <div class="sb-content-title">{{ 'BOARD' | translate }}</div>
-          <div class="sb-content-title-data">{{content?.contentData?.board}}</div>
+          <div class="sb-content-title-data">{{content?.contentData?.board | aliased}}</div>
         </div>
         <div *ngIf="showMoreFlag">
           <div class="sb-info" *ngIf="content?.contentData?.medium">
@@ -284,18 +232,19 @@
           <div class="sb-info" *ngIf="content?.contentData?.copyright">
             <div class="sb-content-title">{{'COPYRIGHT' | translate}}</div>
             <div class="sb-content-title-data">
-              {{content?.contentData?.copyright}}{{content?.contentData.copyrightYear ? ", " + content?.contentData.copyrightYear : ""}}
+              {{content?.contentData?.copyright}}{{content?.contentData.copyrightYear ? ", " +
+              content?.contentData.copyrightYear : ""}}
             </div>
           </div>
           <div class="sb-info"
             *ngIf="content?.contentData?.attributions && !content?.contentData?.contributors && !content?.contentData?.creators">
             <div class="sb-content-title">{{'ATTRIBUTIONS' | translate}}</div>
-            <div class="sb-content-title-data">{{content?.contentData?.attributions.join(', ')}}</div>
+            <div class="sb-content-title-data">{{mergeProperties(['attributions', 'contributors', 'creators'])}}</div>
           </div>
-          <div class="sb-info" *ngIf="content?.contentData?.contributors || content?.contentData?.creators">
+          <!-- <div class="sb-info" *ngIf="content?.contentData?.contributors || content?.contentData?.creators">
             <div class="sb-content-title">{{'ATTRIBUTIONS' | translate}}</div>
             <div class="sb-content-title-data">{{mergeProperties(['attributions', 'contributors', 'creators'])}}</div>
-          </div>
+          </div> -->
           <div class="sb-info" *ngIf="content?.contentData?.origin">
             <div class="sb-content-title">{{'ORIGINAL_CONTENT_DATA' | translate}}</div>
           </div>
@@ -326,7 +275,7 @@
           <div *ngIf="showMoreFlag" style="padding-left: 8px; padding-right: 8px;" class="padding-top-10"
             (click)="readLessorReadMore('read-less-clicked')">
             {{ 'READ_LESS' | translate }}
-            <ion-icon name="ios-arrow-up"></ion-icon>
+            <ion-icon name="arrow-up"></ion-icon>
           </div>
           <div *ngIf="!showMoreFlag" style="padding-left: 8px; padding-right: 8px;"
             (click)="readLessorReadMore('read-more-clicked')">
@@ -336,6 +285,7 @@
       </ion-card>
     </div>
   </div>
+
 </ion-content>
 
 <!-- Page footer -->
@@ -343,4 +293,7 @@
   [downloadProgress]="downloadProgress" [contentName]="content?.contentData?.name" [isUpdateAvail]="isUpdateAvail"
   [showDownload]="showDownload" [contentAvailableLocally]="contentDownloadable[content?.identifier]"
   [contentSize]="content?.contentData?.size">
-</app-sb-download-popup>
\ No newline at end of file
+</app-sb-download-popup>
+<div>
+  <add-activity-to-group [identifier]="identifier" [pageId]="pageId"></add-activity-to-group>
+</div>
\ No newline at end of file
diff --git a/src/app/content-details/content-details.page.scss b/src/app/content-details/content-details.page.scss
index 9cf94c7ec..c492089c5 100644
--- a/src/app/content-details/content-details.page.scss
+++ b/src/app/content-details/content-details.page.scss
@@ -17,15 +17,15 @@
 }
 
 .scroll-content {
-  margin-bottom: 0px !important;
+  margin-bottom: 0 !important;
 }
 .btn-progress-highlight {
-  left: 0px;
+  left: 0;
   background: $primary-800;
   height: 5px;
   position: absolute;
   border-radius: inherit;
-  border: 0px;
+  border: 0;
 }
 
 .btn-popover-progress-container {
@@ -113,9 +113,7 @@
   margin-left: 8px;
   margin-right: 8px;
 }
-.sb-dt-card {
-  background-color: $primary-100;
-}
+
 .sb-dt-card .sb-dt-card-actions .sb-btn-tile-group .sb-btn-tile {
   background: transparent;
 }
@@ -128,3 +126,9 @@
   pointer-events: none !important;
   cursor: default;
 }
+
+.download-disabled{
+  opacity: 0.5 !important;
+  cursor: default;
+}
+
diff --git a/src/app/content-details/content-details.page.spec.data.ts b/src/app/content-details/content-details.page.spec.data.ts
index 0de2c611f..a9e9be51d 100644
--- a/src/app/content-details/content-details.page.spec.data.ts
+++ b/src/app/content-details/content-details.page.spec.data.ts
@@ -1,4 +1,5 @@
 import {Navigation} from '@angular/router';
+import { PageId } from '../../services';
 
 export const mockContentData: Partial<Navigation> = {
     id: 7,
@@ -74,7 +75,15 @@ export const mockContentData: Partial<Navigation> = {
                     'do_212911626908123136157'
                 ],
                 batchId: 'SAMPLE_BATCH'
-            }
+            },
+            corRelation: [{id: 'do-123', type: 'Content'}],
+            resumedCourseCardData: {
+                contentId: 'do-123'
+            },
+            autoPlayQuizContent: true,
+            source: PageId.GROUP_DETAIL,
+            groupId: 'g1',
+            activityList: []
         }
     }
 };
diff --git a/src/app/content-details/content-details.page.spec.ts b/src/app/content-details/content-details.page.spec.ts
index 5415421c1..a1db0f0b3 100644
--- a/src/app/content-details/content-details.page.spec.ts
+++ b/src/app/content-details/content-details.page.spec.ts
@@ -1,9 +1,7 @@
 import { ContentDetailsPage } from '../content-details/content-details.page';
-import { Container } from 'inversify';
 import {
     ContentService,
     EventsBusService,
-    PlayerService,
     DownloadService,
     ProfileService,
     ProfileServiceImpl,
@@ -11,19 +9,19 @@ import {
     StorageService,
     TelemetryObject,
     Content,
-    GetAllProfileRequest
+    GetAllProfileRequest,
 } from 'sunbird-sdk';
 import { ContentServiceImpl } from 'sunbird-sdk/content/impl/content-service-impl';
 import { EventsBusServiceImpl } from 'sunbird-sdk/events-bus/impl/events-bus-service-impl';
 import { StorageServiceImpl } from 'sunbird-sdk/storage/impl/storage-service-impl';
-import { Events, Platform, PopoverController, ToastController } from '@ionic/angular';
+import { Platform, PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { NgZone } from '@angular/core';
 import {
     AppGlobalService,
     AppHeaderService,
     CommonUtilService,
-    ContentShareHandlerService,
-    CourseUtilService,
+    CourseUtilService, FormAndFrameworkUtilService,
     TelemetryGeneratorService,
     UtilityService,
 } from '@app/services';
@@ -37,7 +35,7 @@ import { RatingHandler } from '@app/services/rating/rating-handler';
 import { ContentPlayerHandler } from '@app/services/content/player/content-player-handler';
 import { ChildContentHandler } from '@app/services/content/child-content-handler';
 import { ContentDeleteHandler } from '@app/services/content/content-delete-handler';
-import { of, throwError, EMPTY } from 'rxjs';
+import { of, throwError, EMPTY, Subscription } from 'rxjs';
 import { mockContentData } from '@app/app/content-details/content-details.page.spec.data';
 import { LoginHandlerService } from '@app/services/login-handler.service';
 import {
@@ -49,24 +47,28 @@ import {
     PageId,
 } from '@app/services/telemetry-constants';
 import { ContentUtil } from '@app/util/content-util';
-import { EventTopics, ContentType, ShareItemType } from '../app.constant';
+import { PreferenceKey, RouterLinks } from '../app.constant';
+import { EventTopics, ShareItemType, ContentFilterConfig } from '../app.constant';
 import { FileOpener } from '@ionic-native/file-opener/ngx';
 import { FileTransfer } from '@ionic-native/file-transfer/ngx';
-import { truncate } from 'fs';
+import { SbProgressLoader } from '@app/services/sb-progress-loader.service';
+import { LocalCourseService } from '../../services';
+import { ContentEventType } from '@project-sunbird/sunbird-sdk';
+import { CourseService } from '@project-sunbird/sunbird-sdk';
+import { CsContentType } from '@project-sunbird/client-services/services/content';
 
 describe('ContentDetailsPage', () => {
     let contentDetailsPage: ContentDetailsPage;
-    const container = new Container();
 
     const mockProfileService: Partial<ProfileService> = {};
     const mockContentService: Partial<ContentService> = {};
     const mockEventBusService: Partial<EventsBusService> = {};
     const mockPreferences: Partial<SharedPreferences> = {};
-    const mockPlayerService: Partial<PlayerService> = {};
     const mockStorageService: Partial<StorageService> = {};
     const mockDownloadService: Partial<DownloadService> = {
         getActiveDownloadRequests: jest.fn(() => EMPTY)
     };
+    const mockLocalCourseService: Partial<LocalCourseService> = {};
     const mockNgZone: Partial<NgZone> = {
         run: jest.fn()
     };
@@ -93,7 +95,6 @@ describe('ContentDetailsPage', () => {
     const mockHeaderService: Partial<AppHeaderService> = {
         hideHeader: jest.fn()
     };
-    const mockContentShareHandler: Partial<ContentShareHandlerService> = {};
     const mockAppVersion: Partial<AppVersion> = {};
     const mockLocation: Partial<Location> = {};
     const mockRouter: Partial<Router> = {
@@ -110,15 +111,29 @@ describe('ContentDetailsPage', () => {
         launchContentPlayer: jest.fn(),
         getLastPlayedContentId: jest.fn()
     };
-    const mockChildContentHandler: Partial<ChildContentHandler> = {};
+    const mockChildContentHandler: Partial<ChildContentHandler> = {
+        contentHierarchyInfo: [{ id: 'do-123' }]
+    };
     const contentDeleteCompleted = { subscribe: jest.fn((fn) => fn({ closed: false })) };
     const mockContentDeleteHandler: Partial<ContentDeleteHandler> = { contentDeleteCompleted$: of(contentDeleteCompleted) };
     const mockLoginHandlerService: Partial<LoginHandlerService> = {};
-    const mockToastController: Partial<ToastController> = {};
     const mockFileOpener: Partial<FileOpener> = {};
     const mockFileTransfer: Partial<FileTransfer> = {};
     const telemetryObject = new TelemetryObject('do_12345', 'Resource', '1');
     const rollUp = { l1: 'do_123', l2: 'do_123', l3: 'do_1' };
+    const mockSbProgressLoader: Partial<SbProgressLoader> = {};
+    const mockCourseService: Partial<CourseService> = {};
+    const mockFormFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {};
+
+    global.window.segmentation = {
+        init: jest.fn(),
+        SBTagService: {
+            pushTag: jest.fn(),
+            removeAllTags: jest.fn(),
+            getTags: jest.fn(() => undefined),
+            restoreTags: jest.fn()
+        }
+    };
 
     beforeAll(() => {
         contentDetailsPage = new ContentDetailsPage(
@@ -127,6 +142,8 @@ describe('ContentDetailsPage', () => {
             mockEventBusService as EventsBusServiceImpl,
             mockStorageService as StorageServiceImpl,
             mockDownloadService as DownloadService,
+            mockPreferences as SharedPreferences,
+            mockCourseService as CourseService,
             mockNgZone as NgZone,
             mockEvents as Events,
             mockPopoverController as PopoverController,
@@ -139,7 +156,6 @@ describe('ContentDetailsPage', () => {
             mockNetwork as Network,
             mockFileSizePipe as FileSizePipe,
             mockHeaderService as AppHeaderService,
-            mockContentShareHandler as ContentShareHandlerService,
             mockAppVersion as AppVersion,
             mockLocation as Location,
             mockRouter as Router,
@@ -152,6 +168,9 @@ describe('ContentDetailsPage', () => {
             mockLoginHandlerService as LoginHandlerService,
             mockFileOpener as FileOpener,
             mockFileTransfer as FileTransfer,
+            mockSbProgressLoader as SbProgressLoader,
+            mockLocalCourseService as LocalCourseService,
+            mockFormFrameworkUtilService as FormAndFrameworkUtilService
         );
     });
     beforeEach(() => {
@@ -173,419 +192,912 @@ describe('ContentDetailsPage', () => {
         expect(contentDetailsPage.getNavParams).toHaveBeenCalled();
     });
 
-    it('should call subscribeEvents when ngOnInit() invoked', () => {
+    it('should call subscribeEvents when ngOnInit() invoked', (done) => {
         // arrange
         spyOn(contentDetailsPage, 'subscribeEvents').and.stub();
-        // act
-        contentDetailsPage.ngOnInit();
-        // assert
-        expect(contentDetailsPage.subscribeEvents).toHaveBeenCalled();
-    });
-
-    it('should invoke appVersion() and other subscription() when invoked', (done) => {
-        // arrange
-        mockAppVersion.getAppName = jest.fn(() => Promise.resolve('sunbird'));
-        mockRatingHandler.showRatingPopup = jest.fn();
-        mockContentPlayerHandler.setLastPlayedContentId = jest.fn();
-        const called: { [topic: EventTopics]: boolean } = {};
-        mockEvents.subscribe = jest.fn((topic, fn) => {
-            if (called[topic]) {
-                return;
-            }
-
-            called[topic] = true;
-
-            if (topic === EventTopics.PLAYER_CLOSED) {
-                fn({ selectedUser: 'sampleUser' });
-            }
-            if (topic === EventTopics.NEXT_CONTENT) {
-                fn({ data: 'sample_data' });
-            }
-        });
-        mockRouter.getCurrentNavigation = jest.fn(() => mockContentData);
-        mockProfileService.getActiveProfileSession = jest.fn(() =>
-            of({ uid: 'sample_uid', sid: 'sample_session_id', createdTime: Date.now() }));
-        mockProfileSwitchHandler.switchUser = jest.fn();
-        spyOn(contentDetailsPage, 'calculateAvailableUserCount').and.stub();
-        spyOn(contentDetailsPage, 'generateEndEvent').and.stub();
-        mockEvents.unsubscribe = jest.fn((topic) => {
-            console.log(topic);
-            called[topic] = false;
-        });
-        spyOn(contentDetailsPage, 'generateTelemetry').and.stub();
-        mockDownloadService.getActiveDownloadRequests = jest.fn(() => EMPTY);
-        // act
-        contentDetailsPage.subscribeEvents();
-        // assert
-        setTimeout(() => {
-            expect(mockAppVersion.getAppName).toHaveBeenCalled();
-            expect(mockEvents.subscribe).toHaveBeenCalled();
-            expect(mockProfileService.getActiveProfileSession).toHaveBeenCalled();
-            expect(mockProfileSwitchHandler.switchUser).toHaveBeenCalled();
-            expect(mockRatingHandler.showRatingPopup).toHaveBeenCalled();
-            expect(mockContentPlayerHandler.setLastPlayedContentId).toHaveBeenCalled();
-            done();
-        }, 1000);
-    });
-
-    it('should invoke appVersion() and other subscription() if data is false when invoked', (done) => {
-        // arrange
-        mockAppVersion.getAppName = jest.fn(() => Promise.resolve('sunbird'));
-        mockRatingHandler.showRatingPopup = jest.fn();
-        mockContentPlayerHandler.setLastPlayedContentId = jest.fn();
-        const called: { [topic: EventTopics]: boolean } = {};
-        mockEvents.subscribe = jest.fn((topic, fn) => {
-            if (called[topic]) {
-                return;
-            }
-
-            called[topic] = true;
-
-            if (topic === EventTopics.PLAYER_CLOSED) {
-                fn({ selectedUser: { profileType: 'Teacher' } });
+        mockFormFrameworkUtilService.getFormFields = jest.fn(() => Promise.resolve([{
+            target: {
+                mimeType: [
+                    'application/pdf'
+                ],
+                primaryCategory: [
+                    'LearningResource'
+                ]
             }
-            // if (topic === EventTopics.NEXT_CONTENT) {
-            //     fn({data: 'sample_data'});
-            // }
-        });
-        mockProfileSwitchHandler.switchUser = jest.fn();
-        spyOn(contentDetailsPage, 'calculateAvailableUserCount').and.stub();
-        mockEvents.unsubscribe = jest.fn((topic) => {
-            console.log(topic);
-            called[topic] = false;
-        });
-        // act
-        contentDetailsPage.subscribeEvents();
-        // assert
-        setTimeout(() => {
-            expect(mockAppVersion.getAppName).toHaveBeenCalled();
-            expect(mockEvents.subscribe).toHaveBeenCalled();
-            expect(mockProfileSwitchHandler.switchUser).toHaveBeenCalledWith({ profileType: 'Teacher' });
-            done();
-        }, 0);
-    });
-
-    it('should be logged in before play the content by invoked promptToLogin() if user loggedin', async (done) => {
-        // arrange
-        mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
-        contentDetailsPage.autoPlayQuizContent = true;
-        jest.spyOn(contentDetailsPage, 'handleContentPlay').mockImplementation(() => {
-            return 0;
-        });
-        // act
-        await contentDetailsPage.promptToLogin();
-        // assert
-        setTimeout(() => {
-            expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
-            done();
-        }, 1000);
-    });
-
-
-    it('should be logged in before play the content for isLoginPromptOpen() if user is not loggedin', (done) => {
-        // arrange
-        mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
-        contentDetailsPage.isLoginPromptOpen = true;
+        }]));
         // act
-        contentDetailsPage.promptToLogin();
+        contentDetailsPage.ngOnInit();
         // assert
         setTimeout(() => {
-            expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
-            expect(contentDetailsPage.isLoginPromptOpen).toBeTruthy();
+            expect(contentDetailsPage.subscribeEvents).toHaveBeenCalled();
+            expect(mockFormFrameworkUtilService.getFormFields).toHaveBeenCalled();
             done();
         }, 0);
     });
 
-    it('should check limitedShareContentFlag', () => {
-        // arrange
-        const request = {
-            contentData: {
-                status: 'Unlisted'
-            }
-        };
-        jest.spyOn(ContentUtil, 'getTelemetryObject').mockImplementation(() => {
-            return request;
-        });
-        jest.spyOn(contentDetailsPage, 'promptToLogin').mockImplementation(() => {
-            return;
-        });
-        // act
-        contentDetailsPage.checkLimitedContentSharingFlag(request);
-        // assert
-        expect(ContentUtil.getTelemetryObject).toHaveBeenCalled();
-        expect(contentDetailsPage.promptToLogin).toHaveBeenCalled();
-    });
-
-    it('should check limitedShareContentFlag', () => {
-        // arrange
-        const request = {
-            contentData: {
-                status: 'Unlisted'
-            }
-        };
-        jest.spyOn(ContentUtil, 'getTelemetryObject').mockImplementation(() => {
-            return request;
-        });
-        jest.spyOn(contentDetailsPage, 'promptToLogin').mockImplementation(() => {
-            return;
-        });
-        // act
-        contentDetailsPage.checkLimitedContentSharingFlag(request);
-        // assert
-        expect(ContentUtil.getTelemetryObject).toHaveBeenCalled();
-        expect(contentDetailsPage.promptToLogin).toHaveBeenCalled();
-    });
-
-    it('shouldn\'t  show PlayAsPopup if limitedShareContentFlag flag is true', (done) => {
-        // arrange
-        contentDetailsPage.userCount = 3;
-        contentDetailsPage.shouldOpenPlayAsPopup = true;
-        mockNetwork.type = '3g';
-        contentDetailsPage.limitedShareContentFlag = true;
-        jest.spyOn(contentDetailsPage, 'openPlayAsPopup');
-        // act
-        contentDetailsPage.showSwitchUserAlert(false);
-        // assert
-        expect(contentDetailsPage.openPlayAsPopup).toHaveBeenCalledTimes(0);
-        done();
-    });
-
-    it('shouldn playContent if network is available and more than 2g and user count is not more than 2', (done) => {
-        // arrange
-        contentDetailsPage.userCount = 2;
-        contentDetailsPage.apiLevel = 19;
-        contentDetailsPage.appAvailability = 'false';
-        contentDetailsPage.shouldOpenPlayAsPopup = true;
-        mockNetwork.type = '3g';
-        contentDetailsPage.limitedShareContentFlag = false;
-        mockCommonUtilService.translateMessage = jest.fn(() => '');
-        mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
-        mockPopoverController.create = jest.fn(() => (Promise.resolve({
-            present: jest.fn(() => Promise.resolve({})),
-            onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: true } }))
-        } as any)));
-        // act
-        contentDetailsPage.showSwitchUserAlert(true).then(() => {
+    describe('showSwitchUserAlert', () => {
+        it('should return tost for offline', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: false };
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            contentDetailsPage.showSwitchUserAlert(true);
             // assert
-            expect(mockPopoverController.create).toHaveBeenCalledTimes(1);
-            done();
+            setTimeout(() => {
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeFalsy();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('INTERNET_CONNECTIVITY_NEEDED');
+                done();
+            }, 0);
         });
-    });
-
-    it('should  show LowBandwidth Popup for 2g type network connection', (done) => {
-        // arrange
-        contentDetailsPage.content = { identifier: 'do_1234' };
-        contentDetailsPage.userCount = 3;
-        contentDetailsPage.shouldOpenPlayAsPopup = true;
-        mockNetwork.type = '2g';
-        mockCommonUtilService.translateMessage = jest.fn(() => '');
-        mockPopoverController.create = jest.fn(() => (Promise.resolve({
-            present: jest.fn(() => Promise.resolve({})),
-            onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: true } }))
-        } as any)));
-        // act
-        contentDetailsPage.showSwitchUserAlert(false);
-        // assert
-        expect(mockPopoverController.create).toHaveBeenCalled();
-        done();
-    });
-
-    it('should  show PlayAs Popup  When LowBandwidth popup Ok button click', (done) => {
-        // arrange
-        contentDetailsPage.content = { identifier: 'do_1234' };
-        contentDetailsPage.userCount = 3;
-        contentDetailsPage.shouldOpenPlayAsPopup = false;
-        mockNetwork.type = '2g';
-        contentDetailsPage.limitedShareContentFlag = false;
-        mockCommonUtilService.translateMessage = jest.fn(() => '');
-        mockPopoverController.create = jest.fn(() => (Promise.resolve({
-            present: jest.fn(() => Promise.resolve({})),
-            onDidDismiss: jest.fn(() => Promise.resolve({ data: { isLeftButtonClicked: true } }))
-        } as any)));
-        const profile = {
-            handle: 'handle'
-        };
-        mockAppGlobalService.getCurrentUser = jest.fn(() => profile);
-        jest.spyOn(contentDetailsPage, 'openPlayAsPopup');
-        // act
-        contentDetailsPage.showSwitchUserAlert(false);
-        // assert
-        setTimeout(() => {
-            expect(contentDetailsPage.openPlayAsPopup).toHaveBeenCalled();
-            done();
-        }, 0);
-
-    });
 
-    describe('openPDFPreview()', () => {
-        it('should download pdf if not available locally', (done) => {
+        it('should invoked openPlayAsPopup', (done) => {
             // arrange
-            const content: Partial<Content> = {
-                contentData: {
-                    itemSetPreviewUrl: 'http://some_domain.com/som_path.some_extension'
-                }
-            };
-            const mockPresent = jest.fn(() => Promise.resolve());
-            const mockDismiss = jest.fn(() => Promise.resolve());
-            const mockDownload = jest.fn(() => Promise.resolve({
-                toURL: () => 'SOME_TEMP_URL'
-            }));
-            mockCommonUtilService.getLoader = jest.fn(() => {
-                return Promise.resolve({
-                    present: mockPresent,
-                    dismiss: mockDismiss
-                });
-            });
-            mockCommonUtilService.showToast = jest.fn(() => { });
-            mockFileTransfer.create = jest.fn(() => {
-                return {
-                    download: mockDownload
-                };
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            AppGlobalService.isPlayerLaunched = false;
+            contentDetailsPage.userCount = 3;
+            mockNetwork.type = '4g';
+            contentDetailsPage.shouldOpenPlayAsPopup = false;
+            contentDetailsPage.limitedShareContentFlag = false;
+            jest.spyOn(contentDetailsPage, 'openPlayAsPopup').mockImplementation(() => {
+                return Promise.resolve();
             });
-            window.cordova.plugins.printer.canPrintItem = jest.fn((_, cb) => { cb(true) });
-            window.cordova.plugins.printer.print = jest.fn();
             // act
-            contentDetailsPage.openPDFPreview(content as Content).then(() => {
-                // assert
-                expect(mockFileTransfer.create).toHaveBeenCalled();
-                expect(mockDownload).toHaveBeenCalledWith(content.contentData.itemSetPreviewUrl, expect.any(String));
-                expect(window.cordova.plugins.printer.print).toHaveBeenCalledWith('SOME_TEMP_URL');
+            contentDetailsPage.showSwitchUserAlert(true);
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.PLAY_ONLINE,
+                    Environment.HOME,
+                    PageId.CONTENT_DETAIL,
+                    undefined,
+                    { networkType: '4g' },
+                    undefined,
+                    [{ id: 'do-123', type: 'Content' }]
+                );
+                expect(contentDetailsPage.userCount).toBeGreaterThan(2);
+                expect(mockNetwork.type).toBe('4g');
+                expect(contentDetailsPage.limitedShareContentFlag).toBeFalsy();
                 done();
-            });
+            }, 0);
         });
 
-        it('should not download pdf if available locally', (done) => {
+        it('should return a popup if network is 2g and dismiss data is null', (done) => {
             // arrange
-            const content: Partial<Content> = {
-                basePath: '/some_local_path/some_local_path',
-                contentData: {
-                    itemSetPreviewUrl: '/some_path.some_extension'
-                }
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            AppGlobalService.isPlayerLaunched = false;
+            contentDetailsPage.userCount = 1;
+            mockNetwork.type = '2g';
+            contentDetailsPage.shouldOpenPlayAsPopup = false;
+            contentDetailsPage.limitedShareContentFlag = false;
+            contentDetailsPage.content = {
+                identifier: 'id'
             };
-            const mockPresent = jest.fn(() => Promise.resolve());
-            const mockDismiss = jest.fn(() => Promise.resolve());
-            const mockDownload = jest.fn(() => Promise.resolve({
-                toURL: () => 'SOME_TEMP_URL'
-            }));
-            mockCommonUtilService.getLoader = jest.fn(() => {
-                return Promise.resolve({
-                    present: mockPresent,
-                    dismiss: mockDismiss
-                });
-            });
-            mockCommonUtilService.showToast = jest.fn(() => { });
-            mockFileTransfer.create = jest.fn(() => {
-                return {
-                    download: mockDownload
-                };
-            });
-            window.cordova.plugins.printer.canPrintItem = jest.fn((_, cb) => { cb(true); });
-            window.cordova.plugins.printer.print = jest.fn();
+            contentDetailsPage.contentDownloadable = {
+                'id': false
+            } as any;
+            mockPopoverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: null }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn();
             // act
-            contentDetailsPage.openPDFPreview(content as Content).then(() => {
-                // assert
-                expect(mockFileTransfer.create).not.toHaveBeenCalled();
-                expect(mockDownload).not.toHaveBeenCalled();
-                expect(window.cordova.plugins.printer.print).toHaveBeenCalledWith(
-                    'file:///some_local_path/some_local_path/some_path.some_extension'
+            contentDetailsPage.showSwitchUserAlert(true);
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.PLAY_ONLINE,
+                    Environment.HOME,
+                    PageId.CONTENT_DETAIL,
+                    undefined,
+                    { networkType: '2g' },
+                    undefined,
+                    [{ id: 'do-123', type: 'Content' }]
                 );
+                expect(mockNetwork.type).toBe('2g');
+                expect(contentDetailsPage.limitedShareContentFlag).toBeFalsy();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'LOW_BANDWIDTH');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'LOW_BANDWIDTH_DETECTED');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'PLAY_ONLINE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(4, 'DOWNLOAD');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(5, 'CONSIDER_DOWNLOAD');
                 done();
-            });
+            }, 0);
         });
 
-        it('should show error toast on file print failure', (done) => {
+        it('should return a popup if network is 2g, isLeftButtonClicked and userCount is 2 ', (done) => {
             // arrange
-            const content: Partial<Content> = {
-                basePath: '/some_local_path/some_local_path',
-                contentData: {
-                    itemSetPreviewUrl: '/some_path.some_extension'
-                }
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            AppGlobalService.isPlayerLaunched = false;
+            contentDetailsPage.userCount = 2;
+            mockNetwork.type = '2g';
+            contentDetailsPage.shouldOpenPlayAsPopup = false;
+            contentDetailsPage.limitedShareContentFlag = false;
+            contentDetailsPage.content = {
+                identifier: 'id'
             };
-            const mockPresent = jest.fn(() => Promise.resolve());
-            const mockDismiss = jest.fn(() => Promise.resolve());
-            const mockDownload = jest.fn(() => Promise.resolve({
-                toURL: () => 'SOME_TEMP_URL'
-            }));
-            mockCommonUtilService.getLoader = jest.fn(() => {
-                return Promise.resolve({
-                    present: mockPresent,
-                    dismiss: mockDismiss
-                });
-            });
-            mockCommonUtilService.showToast = jest.fn(() => { });
-            mockFileTransfer.create = jest.fn(() => {
-                return {
-                    download: mockDownload
-                };
+            contentDetailsPage.contentDownloadable = {
+                'id': false
+            } as any;
+            mockPopoverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({data: { isLeftButtonClicked: true }}))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn();
+            jest.spyOn(contentDetailsPage, 'openPlayAsPopup').mockImplementation(() => {
+                return Promise.resolve();
             });
-            window.cordova.plugins.printer.canPrintItem = jest.fn((_, cb) => { cb(true); });
-            window.cordova.plugins.printer.print = jest.fn(() => { throw new Error('UNEXPECTED_ERROR'); });
             // act
-            contentDetailsPage.openPDFPreview(content as Content).then(() => {
-                // assert
-                expect(window.cordova.plugins.printer.print).toHaveBeenCalledWith(
-                    'file:///some_local_path/some_local_path/some_path.some_extension'
+            contentDetailsPage.showSwitchUserAlert(true);
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.PLAY_ONLINE,
+                    Environment.HOME,
+                    PageId.CONTENT_DETAIL,
+                    undefined,
+                    { networkType: '2g' },
+                    undefined,
+                    [{ id: 'do-123', type: 'Content' }]
                 );
-                expect(mockDismiss).toHaveBeenCalled();
-                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_COULD_NOT_OPEN_FILE');
+                expect(mockNetwork.type).toBe('2g');
+                expect(contentDetailsPage.limitedShareContentFlag).toBeFalsy();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'LOW_BANDWIDTH');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'LOW_BANDWIDTH_DETECTED');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'PLAY_ONLINE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(4, 'DOWNLOAD');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(5, 'CONSIDER_DOWNLOAD');
                 done();
-            });
+            }, 0);
         });
 
-        it('should show error toast on fileCanPrint() returns false', (done) => {
+        it('should return a popup if network is 2g, isLeftButtonClicked and player is launched ', (done) => {
             // arrange
-            const content: Partial<Content> = {
-                basePath: 'file://some_local_path/some_local_path',
-                contentData: {
-                    itemSetPreviewUrl: '/some_path.some_extension'
-                }
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            AppGlobalService.isPlayerLaunched = false;
+            contentDetailsPage.userCount = 1;
+            mockNetwork.type = '2g';
+            contentDetailsPage.shouldOpenPlayAsPopup = false;
+            contentDetailsPage.limitedShareContentFlag = false;
+            contentDetailsPage.content = {
+                identifier: 'id'
             };
-            const mockPresent = jest.fn(() => Promise.resolve());
-            const mockDismiss = jest.fn(() => Promise.resolve());
-            const mockDownload = jest.fn(() => Promise.resolve({
-                toURL: () => 'SOME_TEMP_URL'
-            }));
-            mockCommonUtilService.getLoader = jest.fn(() => {
-                return Promise.resolve({
-                    present: mockPresent,
-                    dismiss: mockDismiss
-                });
-            });
-            mockCommonUtilService.showToast = jest.fn(() => { });
-            mockFileTransfer.create = jest.fn(() => {
-                return {
-                    download: mockDownload
-                };
-            });
-            window.cordova.plugins.printer.canPrintItem = jest.fn((_, cb) => { cb(false); });
+            contentDetailsPage.contentDownloadable = {
+                'id': false
+            } as any;
+            mockPopoverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({data: { isLeftButtonClicked: true }}))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn();
             // act
-            contentDetailsPage.openPDFPreview(content as Content).then(() => {
-                // assert
-                expect(window.cordova.plugins.printer.print).not.toHaveBeenCalledWith(
-                    'file://some_local_path/some_local_path/some_path.some_extension'
+            contentDetailsPage.showSwitchUserAlert(true);
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.PLAY_ONLINE,
+                    Environment.HOME,
+                    PageId.CONTENT_DETAIL,
+                    undefined,
+                    { networkType: '2g' },
+                    undefined,
+                    [{ id: 'do-123', type: 'Content' }]
                 );
-                expect(mockDismiss).toHaveBeenCalled();
-                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_COULD_NOT_OPEN_FILE');
+                expect(mockNetwork.type).toBe('2g');
+                expect(contentDetailsPage.limitedShareContentFlag).toBeFalsy();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'LOW_BANDWIDTH');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'LOW_BANDWIDTH_DETECTED');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'PLAY_ONLINE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(4, 'DOWNLOAD');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(5, 'CONSIDER_DOWNLOAD');
                 done();
-            });
+            }, 0);
         });
-    });
 
-    describe('generateEndEvent()', () => {
-        it('should generate END Telemetry with given contentType', () => {
+        it('should invoked downloadContent()', (done) => {
             // arrange
-            contentDetailsPage.telemetryObject = telemetryObject;
-            contentDetailsPage.objRollup = rollUp;
-            // act
-            contentDetailsPage.generateEndEvent();
-            // assert
-            expect(mockTelemetryGeneratorService.generateEndTelemetry).toHaveBeenCalledWith(ContentType.RESOURCE,
-                Mode.PLAY,
-                PageId.CONTENT_DETAIL,
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            AppGlobalService.isPlayerLaunched = false;
+            contentDetailsPage.userCount = 1;
+            mockNetwork.type = '2g';
+            contentDetailsPage.shouldOpenPlayAsPopup = false;
+            contentDetailsPage.limitedShareContentFlag = false;
+            contentDetailsPage.content = {
+                identifier: 'id'
+            };
+            contentDetailsPage.contentDownloadable = {
+                'id': false
+            } as any;
+            mockPopoverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({data: { isLeftButtonClicked: false }}))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn();
+            // act
+            contentDetailsPage.showSwitchUserAlert(true);
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.PLAY_ONLINE,
+                    Environment.HOME,
+                    PageId.CONTENT_DETAIL,
+                    undefined,
+                    { networkType: '2g' },
+                    undefined,
+                    [{ id: 'do-123', type: 'Content' }]
+                );
+                expect(mockNetwork.type).toBe('2g');
+                expect(contentDetailsPage.limitedShareContentFlag).toBeFalsy();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'LOW_BANDWIDTH');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'LOW_BANDWIDTH_DETECTED');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'PLAY_ONLINE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(4, 'DOWNLOAD');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(5, 'CONSIDER_DOWNLOAD');
+                done();
+            }, 0);
+        });
+
+        it('should invoked playContent()', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            AppGlobalService.isPlayerLaunched = false;
+            contentDetailsPage.userCount = 1;
+            mockNetwork.type = '4g';
+            contentDetailsPage.shouldOpenPlayAsPopup = false;
+            contentDetailsPage.limitedShareContentFlag = false;
+            jest.spyOn(contentDetailsPage, 'openPlayAsPopup').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            // act
+            contentDetailsPage.showSwitchUserAlert(true);
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.PLAY_ONLINE,
+                    Environment.HOME,
+                    PageId.CONTENT_DETAIL,
+                    undefined,
+                    { networkType: '4g' },
+                    undefined,
+                    [{ id: 'do-123', type: 'Content' }]
+                );
+                expect(mockNetwork.type).toBe('4g');
+                expect(contentDetailsPage.limitedShareContentFlag).toBeFalsy();
+                done();
+            }, 0);
+        });
+
+        it('should invoked playContent() for downloaded content', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            AppGlobalService.isPlayerLaunched = false;
+            contentDetailsPage.userCount = 1;
+            mockNetwork.type = '4g';
+            contentDetailsPage.shouldOpenPlayAsPopup = false;
+            contentDetailsPage.limitedShareContentFlag = false;
+            jest.spyOn(contentDetailsPage, 'openPlayAsPopup').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            contentDetailsPage.source = PageId.ONBOARDING_PROFILE_PREFERENCES;
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            // act
+            contentDetailsPage.showSwitchUserAlert(true);
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.PLAY_ONLINE,
+                    Environment.HOME,
+                    PageId.CONTENT_DETAIL,
+                    undefined,
+                    { networkType: '4g' },
+                    undefined,
+                    [{ id: 'do-123', type: 'Content' }]
+                );
+                expect(mockNetwork.type).toBe('4g');
+                expect(contentDetailsPage.limitedShareContentFlag).toBeFalsy();
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    InteractType.PLAY,
+                    InteractSubtype.DOWNLOAD,
+                    PageId.QR_CONTENT_RESULT,
+                    Environment.ONBOARDING
+                );
+                done();
+            }, 0);
+        });
+    });
+
+    describe('generateTelemetry', () => {
+        it('should generate event for start event and impression event', () => {
+            contentDetailsPage.didViewLoad = false;
+            contentDetailsPage.isContentPlayed = false;
+            contentDetailsPage.cardData = {
+                hierarchyInfo: [{ id: 'sample-id' }],
+                identifier: 'do-123',
+                pkgVersion: 'v-3'
+            };
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateStartTelemetry = jest.fn();
+            contentDetailsPage.generateTelemetry();
+            // assert
+            expect(contentDetailsPage.didViewLoad).toBeTruthy();
+            expect(contentDetailsPage.isContentPlayed).toBeFalsy();
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenNthCalledWith(1,
+                ImpressionType.DETAIL, '',
+                PageId.CONTENT_DETAIL,
+                Environment.HOME,
+                'do-123', undefined, 'v-3',
+                { l1: undefined }, [{ id: 'do-123', type: 'Content' }, { id: PageId.CONTENT_DETAIL, type: 'ChildUi' }]
+            );
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenNthCalledWith(2,
+                ImpressionType.PAGE_REQUEST, '',
+                PageId.CONTENT_DETAIL,
+                Environment.ONBOARDING
+            );
+            expect(mockTelemetryGeneratorService.generatePageLoadedTelemetry).toHaveBeenCalledWith(
+                PageId.CONTENT_DETAIL,
+                Environment.ONBOARDING,
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                [{ id: 'do-123', type: 'Content' }, { id: PageId.CONTENT_DETAIL, type: 'ChildUi' }]
+            );
+            expect(mockTelemetryGeneratorService.generateStartTelemetry).toHaveBeenCalledWith(
+                PageId.CONTENT_DETAIL,
+                { id: 'do-123', type: undefined, version: 'v-3' },
+                { l1: undefined }, [{ id: 'do-123', type: 'Content' }, { id: PageId.CONTENT_DETAIL, type: 'ChildUi' }]
+            );
+        });
+
+        it('should return null for else part', () => {
+            contentDetailsPage.didViewLoad = true;
+            contentDetailsPage.isContentPlayed = true;
+            contentDetailsPage.generateTelemetry();
+            expect(contentDetailsPage.didViewLoad).toBeTruthy();
+            expect(contentDetailsPage.isContentPlayed).toBeTruthy();
+        });
+    });
+
+    describe('downloadContent', () => {
+        it('should return event for download initiated', (done) => {
+            // arrange
+            mockNgZone.run = jest.fn((fn) => fn());
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            contentDetailsPage.content = {
+                contentData: {
+                    size: '64kb'
+                }
+            };
+            mockNetwork.type = '4g';
+            // jest.spyOn(contentDetailsPage, 'importContent').mockImplementation();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const values = {
+                'network-type': '4g',
+                size: '64kb'
+            };
+            mockStorageService.getStorageDestinationDirectoryPath = jest.fn();
+            mockContentService.importContent = jest.fn(() => of([{ status: -1 }]));
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            contentDetailsPage.downloadContent();
+            // assert
+            setTimeout(() => {
+                expect(mockNgZone.run).toHaveBeenCalled();
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeTruthy();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.DOWNLOAD_INITIATE,
+                    Environment.HOME,
+                    PageId.CONTENT_DETAIL,
+                    { id: 'do-123', type: undefined, version: 'v-3' },
+                    values, { l1: undefined },
+                    [{ id: 'do-123', type: 'Content' }, { id: 'content-detail', type: 'ChildUi' }]
+                );
+                done();
+            }, 0);
+        });
+
+        it('should return null for else part', (done) => {
+            mockNgZone.run = jest.fn((fn) => fn());
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
+            };
+            contentDetailsPage.downloadContent();
+            setTimeout(() => {
+                expect(mockNgZone.run).toHaveBeenCalled();
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeFalsy();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('extractApiResponse', () => {
+        it('should be return player response', () => {
+            // arrange
+            const request: Content = {
+                contentData: {
+                    licenseDetails: {
+                        description: 'descript',
+                        name: 'sample-name',
+                        url: 'sample-url'
+                    },
+                    appIcon: 'sample-app-icon',
+                    streamingUrl: 'streamingUrl',
+                    me_totalDownloads: true,
+                    attributions: ['sample-2', 'sample-1']
+                },
+                mimeType: 'application/vnd.ekstep.h5p',
+                contentMarker: [{
+                    extraInfoMap: { hierarchyInfo: [{ id: 'do-123' }] }
+                }],
+                isAvailableLocally: true,
+                contentAccess: 'content-access',
+                isUpdateAvailable: true
+            };
+            jest.spyOn(contentDetailsPage, 'checkLimitedContentSharingFlag').mockImplementation();
+            contentDetailsPage.isResumedCourse = true;
+            contentDetailsPage.resumedCourseCardData = {
+                contentId: 'sample-content-id',
+                identifier: 'sample-id'
+            };
+            mockChildContentHandler.setChildContents = jest.fn();
+            jest.spyOn(ContentUtil, 'getAppIcon').mockReturnValue('sample-app-icon');
+            mockCommonUtilService.convertFileSrc = jest.fn();
+            jest.spyOn(contentDetailsPage, 'generateTelemetry').mockReturnValue();
+            mockUtilityService.getDeviceAPILevel = jest.fn(() => Promise.resolve('sample'));
+            mockContentPlayerHandler.isContentPlayerLaunched = jest.fn(() => true);
+            contentDetailsPage.cardData = {
+                hierarchyInfo: undefined
+            };
+            contentDetailsPage.isChildContent = false;
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            contentDetailsPage.playingContent = request;
+            contentDetailsPage.downloadAndPlay = true;
+            // act
+            contentDetailsPage.extractApiResponse(request);
+            // assert
+            expect(contentDetailsPage.isResumedCourse).toBeTruthy();
+            expect(mockChildContentHandler.setChildContents).toHaveBeenCalledWith(
+                contentDetailsPage.resumedCourseCardData.contentId, 0, 'do_212911645382959104165');
+            expect(mockCommonUtilService.convertFileSrc).toHaveBeenCalledWith('sample-app-icon');
+            expect(mockContentPlayerHandler.isContentPlayerLaunched).toHaveBeenCalled();
+            expect(contentDetailsPage.isChildContent).toBeTruthy();
+            expect(contentDetailsPage.streamingUrl).toBe(request.contentData.streamingUrl);
+            expect(contentDetailsPage.content.contentData.attributions).toBe('sample-1, sample-2');
+        });
+
+        it('should not return api respone', () => {
+            // arrange
+            const request: Content = {
+                contentData: {
+                    licenseDetails: undefined,
+                    appIcon: 'sample-app-icon',
+                    streamingUrl: undefined,
+                    me_totalDownloads: false
+                },
+                mimeType: 'application',
+                contentMarker: [{
+                    extraInfoMap: { hierarchyInfo: [{ id: 'do-123' }] }
+                }],
+                isAvailableLocally: false,
+                contentAccess: 'content-access',
+                isUpdateAvailable: true,
+                me_totalDownloads: true,
+                lastUpdatedTime: 0
+            };
+            jest.spyOn(contentDetailsPage, 'checkLimitedContentSharingFlag').mockImplementation();
+            contentDetailsPage.isResumedCourse = false;
+            contentDetailsPage.resumedCourseCardData = {
+                contentId: 'sample-content-id',
+                identifier: 'sample-id'
+            };
+            mockChildContentHandler.setChildContents = jest.fn();
+            jest.spyOn(ContentUtil, 'getAppIcon').mockReturnValue('sample-app-icon');
+            mockCommonUtilService.convertFileSrc = jest.fn();
+            jest.spyOn(contentDetailsPage, 'generateTelemetry').mockReturnValue();
+            mockUtilityService.getDeviceAPILevel = jest.fn(() => Promise.resolve('sample'));
+            mockContentPlayerHandler.isContentPlayerLaunched = jest.fn(() => true);
+            contentDetailsPage.cardData = {
+                hierarchyInfo: [{ id: 'do-123' }]
+            };
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            contentDetailsPage.playingContent = request;
+            contentDetailsPage.downloadAndPlay = true;
+            contentDetailsPage.shouldGenerateTelemetry = false;
+            mockContentPlayerHandler.isContentPlayerLaunched = jest.fn(() => false);
+            jest.spyOn(contentDetailsPage, 'downloadContent').mockImplementation();
+            // act
+            contentDetailsPage.extractApiResponse(request);
+            // assert
+            expect(contentDetailsPage.isResumedCourse).toBeFalsy();
+            expect(mockCommonUtilService.convertFileSrc).toHaveBeenCalledWith('sample-app-icon');
+            expect(mockContentPlayerHandler.isContentPlayerLaunched).toHaveBeenCalled();
+        });
+    });
+
+
+    describe('setContentDetails', () => {
+        it('should return content data by invoked setContentDetails', (done) => {
+            // arrange
+            const identifier = 'do_123', refreshContentDetails = true, showRating = false;
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockContentService.getContentDetails = jest.fn(() => of({ contentData: { size: '12KB', status: 'Retired' } }));
+            mockCommonUtilService.showToast = jest.fn();
+            mockLocation.back = jest.fn();
+            jest.spyOn(contentDetailsPage, 'extractApiResponse').mockReturnValue();
+            jest.spyOn(contentDetailsPage, 'showRetiredContentPopup').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            // act
+            contentDetailsPage.setContentDetails(identifier, refreshContentDetails, showRating);
+            // assert
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(mockContentService.getContentDetails).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should return content data by invoked setContentDetails if size and status are null', (done) => {
+            // arrange
+            const identifier = 'do_123', refreshContentDetails = true, showRating = false;
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockContentService.getContentDetails = jest.fn(() => of({ contentData: {} }));
+            mockCommonUtilService.showToast = jest.fn();
+            mockLocation.back = jest.fn();
+            jest.spyOn(contentDetailsPage, 'extractApiResponse').mockReturnValue();
+            jest.spyOn(contentDetailsPage, 'showRetiredContentPopup').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            // act
+            contentDetailsPage.setContentDetails(identifier, refreshContentDetails, showRating);
+            // assert
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(mockContentService.getContentDetails).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should return content data by invoked setContentDetails for empty content', (done) => {
+            // arrange
+            const identifier = 'do_123', refreshContentDetails = true, showRating = false;
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockContentService.getContentDetails = jest.fn(() => of(undefined));
+            mockCommonUtilService.showToast = jest.fn();
+            mockLocation.back = jest.fn();
+            jest.spyOn(contentDetailsPage, 'extractApiResponse').mockReturnValue();
+            jest.spyOn(contentDetailsPage, 'showRetiredContentPopup').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            // act
+            contentDetailsPage.setContentDetails(identifier, refreshContentDetails, showRating);
+            // assert
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(mockContentService.getContentDetails).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should return content data by invoked setContentDetails for showRating', (done) => {
+            // arrange
+            const identifier = 'do_123', refreshContentDetails = true, showRating = true;
+            mockContentService.getContentDetails = jest.fn(() => of({ contentData: { size: '12KB', status: 'Retired' } }));
+            mockCommonUtilService.showToast = jest.fn();
+            mockLocation.back = jest.fn();
+            jest.spyOn(contentDetailsPage, 'extractApiResponse').mockReturnValue();
+            jest.spyOn(contentDetailsPage, 'showRetiredContentPopup').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            mockContentPlayerHandler.setContentPlayerLaunchStatus = jest.fn();
+            mockRatingHandler.showRatingPopup = jest.fn(() => Promise.resolve({}));
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockContentPlayerHandler.setLastPlayedContentId = jest.fn();
+            // act
+            contentDetailsPage.setContentDetails(identifier, refreshContentDetails, showRating);
+            // assert
+            setTimeout(() => {
+                expect(mockContentService.getContentDetails).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should return content data by invoked setContentDetails for catch part for ERROR_CONTENT_NOT_AVAILABLE', (done) => {
+            // arrange
+            const identifier = 'do_123', refreshContentDetails = true, showRating = false;
+            contentDetailsPage.content = { identifier: 'd0_123' };
+            mockContentService.getContentDetails = jest.fn(() => throwError('error'));
+            mockCommonUtilService.showToast = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            contentDetailsPage.isDownloadStarted = false;
+            mockLocation.back = jest.fn();
+            // act
+            contentDetailsPage.setContentDetails(identifier, refreshContentDetails, showRating);
+            // assert
+            setTimeout(() => {
+                expect(mockContentService.getContentDetails).toHaveBeenCalled();
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_CONTENT_NOT_AVAILABLE');
+                expect(mockLocation.back).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should return content data by invoked setContentDetails for catch part for CONNECTION_ERROR', (done) => {
+            // arrange
+            const identifier = 'do_123', refreshContentDetails = true, showRating = false;
+            contentDetailsPage.content = { identifier: 'd0_123' };
+            mockContentService.getContentDetails = jest.fn(() => throwError({ CONNECTION_ERROR: 'CONNECTION_ERROR' }));
+            mockCommonUtilService.showToast = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            contentDetailsPage.isDownloadStarted = true;
+            mockLocation.back = jest.fn();
+            // act
+            contentDetailsPage.setContentDetails(identifier, refreshContentDetails, showRating);
+            // assert
+            setTimeout(() => {
+                expect(mockContentService.getContentDetails).toHaveBeenCalled();
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_NO_INTERNET_MESSAGE');
+                expect(mockLocation.back).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should return content data by invoked setContentDetails for catch part for SERVER_ERROR', (done) => {
+            // arrange
+            const identifier = 'do_123', refreshContentDetails = true, showRating = false;
+            contentDetailsPage.content = { identifier: 'd0_123' };
+            mockContentService.getContentDetails = jest.fn(() => throwError({ SERVER_ERROR: 'CONNECTION_ERROR' }));
+            mockCommonUtilService.showToast = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            contentDetailsPage.isDownloadStarted = true;
+            mockLocation.back = jest.fn();
+            // act
+            contentDetailsPage.setContentDetails(identifier, refreshContentDetails, showRating);
+            // assert
+            setTimeout(() => {
+                expect(mockContentService.getContentDetails).toHaveBeenCalled();
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_FETCHING_DATA');
+                expect(mockLocation.back).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+
+    describe('openPDFPreview()', () => {
+        it('should download pdf if not available locally', (done) => {
+            // arrange
+            const content: Partial<Content> = {
+                contentData: {
+                    itemSetPreviewUrl: 'http://some_domain.com/som_path.some_extension'
+                }
+            };
+            const mockPresent = jest.fn(() => Promise.resolve());
+            const mockDismiss = jest.fn(() => Promise.resolve());
+            const mockDownload = jest.fn(() => Promise.resolve({
+                toURL: () => 'SOME_TEMP_URL'
+            }));
+            mockCommonUtilService.getLoader = jest.fn(() => {
+                return Promise.resolve({
+                    present: mockPresent,
+                    dismiss: mockDismiss
+                });
+            });
+            mockCommonUtilService.showToast = jest.fn(() => { });
+            mockFileTransfer.create = jest.fn(() => {
+                return {
+                    download: mockDownload
+                };
+            });
+            window.cordova.plugins.printer.canPrintItem = jest.fn((_, cb) => { cb(true); });
+            window.cordova.plugins.printer.print = jest.fn();
+            // act
+            contentDetailsPage.openPDFPreview(content as Content).then(() => {
+                // assert
+                expect(mockFileTransfer.create).toHaveBeenCalled();
+                expect(mockDownload).toHaveBeenCalledWith(content.contentData.itemSetPreviewUrl, expect.any(String));
+                expect(window.cordova.plugins.printer.print).toHaveBeenCalledWith('SOME_TEMP_URL');
+                done();
+            });
+        });
+
+        it('should not download pdf if available locally', (done) => {
+            // arrange
+            const content: Partial<Content> = {
+                basePath: '/some_local_path/some_local_path',
+                contentData: {
+                    itemSetPreviewUrl: '/some_path.some_extension'
+                }
+            };
+            const mockPresent = jest.fn(() => Promise.resolve());
+            const mockDismiss = jest.fn(() => Promise.resolve());
+            const mockDownload = jest.fn(() => Promise.resolve({
+                toURL: () => 'SOME_TEMP_URL'
+            }));
+            mockCommonUtilService.getLoader = jest.fn(() => {
+                return Promise.resolve({
+                    present: mockPresent,
+                    dismiss: mockDismiss
+                });
+            });
+            mockCommonUtilService.showToast = jest.fn(() => { });
+            mockFileTransfer.create = jest.fn(() => {
+                return {
+                    download: mockDownload
+                };
+            });
+            window.cordova.plugins.printer.canPrintItem = jest.fn((_, cb) => { cb(true); });
+            window.cordova.plugins.printer.print = jest.fn();
+            // act
+            contentDetailsPage.openPDFPreview(content as Content).then(() => {
+                // assert
+                expect(mockFileTransfer.create).not.toHaveBeenCalled();
+                expect(mockDownload).not.toHaveBeenCalled();
+                expect(window.cordova.plugins.printer.print).toHaveBeenCalledWith(
+                    'file:///some_local_path/some_local_path/some_path.some_extension'
+                );
+                done();
+            });
+        });
+
+        it('should show error toast on file print failure', (done) => {
+            // arrange
+            const content: Partial<Content> = {
+                basePath: '/some_local_path/some_local_path',
+                contentData: {
+                    itemSetPreviewUrl: '/some_path.some_extension'
+                }
+            };
+            const mockPresent = jest.fn(() => Promise.resolve());
+            const mockDismiss = jest.fn(() => Promise.resolve());
+            const mockDownload = jest.fn(() => Promise.resolve({
+                toURL: () => 'SOME_TEMP_URL'
+            }));
+            mockCommonUtilService.getLoader = jest.fn(() => {
+                return Promise.resolve({
+                    present: mockPresent,
+                    dismiss: mockDismiss
+                });
+            });
+            mockCommonUtilService.showToast = jest.fn(() => { });
+            mockFileTransfer.create = jest.fn(() => {
+                return {
+                    download: mockDownload
+                };
+            });
+            window.cordova.plugins.printer.canPrintItem = jest.fn((_, cb) => { cb(true); });
+            window.cordova.plugins.printer.print = jest.fn(() => { throw new Error('UNEXPECTED_ERROR'); });
+            // act
+            contentDetailsPage.openPDFPreview(content as Content).then(() => {
+                // assert
+                expect(window.cordova.plugins.printer.print).toHaveBeenCalledWith(
+                    'file:///some_local_path/some_local_path/some_path.some_extension'
+                );
+                expect(mockDismiss).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_COULD_NOT_OPEN_FILE');
+                done();
+            });
+        });
+
+        it('should show error toast on fileCanPrint() returns false', (done) => {
+            // arrange
+            const content: Partial<Content> = {
+                basePath: 'file://some_local_path/some_local_path',
+                contentData: {
+                    itemSetPreviewUrl: '/some_path.some_extension'
+                }
+            };
+            const mockPresent = jest.fn(() => Promise.resolve());
+            const mockDismiss = jest.fn(() => Promise.resolve());
+            const mockDownload = jest.fn(() => Promise.resolve({
+                toURL: () => 'SOME_TEMP_URL'
+            }));
+            mockCommonUtilService.getLoader = jest.fn(() => {
+                return Promise.resolve({
+                    present: mockPresent,
+                    dismiss: mockDismiss
+                });
+            });
+            mockCommonUtilService.showToast = jest.fn(() => { });
+            mockFileTransfer.create = jest.fn(() => {
+                return {
+                    download: mockDownload
+                };
+            });
+            window.cordova.plugins.printer.canPrintItem = jest.fn((_, cb) => { cb(false); });
+            // act
+            contentDetailsPage.openPDFPreview(content as Content).then(() => {
+                // assert
+                expect(window.cordova.plugins.printer.print).not.toHaveBeenCalledWith(
+                    'file://some_local_path/some_local_path/some_path.some_extension'
+                );
+                expect(mockDismiss).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_COULD_NOT_OPEN_FILE');
+                done();
+            });
+        });
+    });
+
+    describe('generateEndEvent()', () => {
+        it('should generate END Telemetry with given contentType', () => {
+            // arrange
+            contentDetailsPage.telemetryObject = telemetryObject;
+            contentDetailsPage.objRollup = rollUp;
+            // act
+            contentDetailsPage.generateEndEvent();
+            // assert
+            expect(mockTelemetryGeneratorService.generateEndTelemetry).toHaveBeenCalledWith(CsContentType.RESOURCE,
+                Mode.PLAY,
+                PageId.CONTENT_DETAIL,
                 Environment.HOME,
                 telemetryObject,
                 rollUp,
-                undefined);
+                [{ id: 'do-123', type: 'Content' }, { id: PageId.CONTENT_DETAIL, type: 'ChildUi' }]);
         });
 
         it('should generate END Telemetry with  contentType if telemetryObject contentType is empty', () => {
@@ -595,13 +1107,140 @@ describe('ContentDetailsPage', () => {
             // act
             contentDetailsPage.generateEndEvent();
             // assert
-            expect(mockTelemetryGeneratorService.generateEndTelemetry).toHaveBeenCalledWith(ContentType.RESOURCE,
+            expect(mockTelemetryGeneratorService.generateEndTelemetry).toHaveBeenCalledWith('Learning Resource',
                 Mode.PLAY,
                 PageId.CONTENT_DETAIL,
                 Environment.HOME,
                 contentDetailsPage.telemetryObject,
                 rollUp,
-                undefined);
+                [{ id: 'do-123', type: 'Content' }, { id: PageId.CONTENT_DETAIL, type: 'ChildUi' }]);
+        });
+    });
+
+    describe('generateQRSessionEndEvent', () => {
+        it('should return end event for qr code', () => {
+            const pageId = 'sample-page-id', qrData = 'QR1234';
+            mockTelemetryGeneratorService.generateEndTelemetry = jest.fn();
+            contentDetailsPage.generateQRSessionEndEvent(pageId, qrData);
+            expect(mockTelemetryGeneratorService.generateEndTelemetry).toHaveBeenCalledWith(
+                'qr',
+                Mode.PLAY,
+                pageId,
+                Environment.HOME,
+                { id: 'QR1234', type: 'qr', version: '' }, undefined,
+                [{ id: 'do-123', type: 'Content' }, { id: PageId.CONTENT_DETAIL, type: 'ChildUi' }]
+            );
+        });
+
+        it('should not return end event for else part', () => {
+            const pageId = undefined, qrData = 'QR1234';
+            mockTelemetryGeneratorService.generateEndTelemetry = jest.fn();
+            contentDetailsPage.generateQRSessionEndEvent(pageId, qrData);
+        });
+    });
+
+    describe('popToPreviousPage', () => {
+        it('should navigate to profile-settings page', () => {
+            mockAppGlobalService.showCourseCompletePopup = false;
+            contentDetailsPage.source = PageId.ONBOARDING_PROFILE_PREFERENCES;
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            // act
+            contentDetailsPage.popToPreviousPage();
+            // assert
+            expect(mockAppGlobalService.showCourseCompletePopup).toBeFalsy();
+            expect(mockRouter.navigate).toHaveBeenCalledWith([`/${RouterLinks.PROFILE_SETTINGS}`],
+                { state: { showFrameworkCategoriesMenu: true }, replaceUrl: true });
+        });
+
+        it('should goback to 3steps for single content', () => {
+            mockAppGlobalService.showCourseCompletePopup = false;
+            contentDetailsPage.source = PageId.HOME;
+            contentDetailsPage.isSingleContent = true;
+            window.history = {
+                go: jest.fn()
+            } as any;
+            // act
+            contentDetailsPage.popToPreviousPage();
+            // assert
+            expect(mockAppGlobalService.showCourseCompletePopup).toBeFalsy();
+        });
+
+        it('should navigate to search page for multiple content', () => {
+            mockAppGlobalService.showCourseCompletePopup = false;
+            contentDetailsPage.source = PageId.HOME;
+            contentDetailsPage.isSingleContent = false;
+            contentDetailsPage.resultLength = 1;
+            window.history = {
+                go: jest.fn()
+            } as any;
+            // act
+            contentDetailsPage.popToPreviousPage();
+            // assert
+            expect(mockAppGlobalService.showCourseCompletePopup).toBeFalsy();
+        });
+
+        it('should navigate to previous page for else part', () => {
+            mockAppGlobalService.showCourseCompletePopup = false;
+            contentDetailsPage.source = PageId.HOME;
+            contentDetailsPage.isSingleContent = false;
+            contentDetailsPage.resultLength = 2;
+            mockEvents.publish = jest.fn(() => []);
+            mockLocation.back = jest.fn();
+            // act
+            contentDetailsPage.popToPreviousPage();
+            // assert
+            expect(mockAppGlobalService.showCourseCompletePopup).toBeFalsy();
+            expect(mockLocation.back).toHaveBeenCalled();
+        });
+    });
+
+    describe('handleDeviceBackButton', () => {
+        it('should handle device back button', () => {
+            const subscribeWithPriorityData = jest.fn((_, fn) => fn());
+            mockPlatform.backButton = {
+                subscribeWithPriority: subscribeWithPriorityData,
+            } as any;
+            mockEvents.publish = jest.fn();
+            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+            mockLocation.back = jest.fn();
+            jest.spyOn(contentDetailsPage, 'popToPreviousPage').mockImplementation();
+            jest.spyOn(contentDetailsPage, 'generateEndEvent').mockImplementation();
+            contentDetailsPage.shouldGenerateEndTelemetry = true;
+            jest.spyOn(contentDetailsPage, 'generateQRSessionEndEvent').mockImplementation();
+            contentDetailsPage.handleDeviceBackButton();
+            expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                PageId.CONTENT_DETAIL,
+                Environment.HOME,
+                false,
+                undefined,
+                [{ id: 'do-123', type: 'Content' }, { id: PageId.CONTENT_DETAIL, type: 'ChildUi' }],
+                { l1: 'do_123', l2: 'do_123', l3: 'do_1' },
+                { id: 'do_12345', type: '', version: '1' }
+            );
+        });
+
+        it('should handle device back button', () => {
+            const subscribeWithPriorityData = jest.fn((_, fn) => fn());
+            mockPlatform.backButton = {
+                subscribeWithPriority: subscribeWithPriorityData,
+            } as any;
+            mockEvents.publish = jest.fn();
+            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+            mockLocation.back = jest.fn();
+            jest.spyOn(contentDetailsPage, 'popToPreviousPage').mockImplementation();
+            jest.spyOn(contentDetailsPage, 'generateEndEvent').mockImplementation();
+            contentDetailsPage.shouldGenerateEndTelemetry = false;
+            jest.spyOn(contentDetailsPage, 'generateQRSessionEndEvent').mockImplementation();
+            contentDetailsPage.handleDeviceBackButton();
+            expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                PageId.CONTENT_DETAIL,
+                Environment.HOME,
+                false,
+                undefined,
+                [{ id: 'do-123', type: 'Content' }, { id: PageId.CONTENT_DETAIL, type: 'ChildUi' }],
+                { l1: 'do_123', l2: 'do_123', l3: 'do_1' },
+                { id: 'do_12345', type: '', version: '1' }
+            );
         });
     });
 
@@ -619,11 +1258,7 @@ describe('ContentDetailsPage', () => {
                 contentDetailsPage.share().then(() => {
                     // assert
                     expect(mockPopoverController.create).toHaveBeenCalledTimes(1);
-                    expect(mockPopoverController.create).toHaveBeenCalledWith(expect.objectContaining({
-                        componentProps: expect.objectContaining({
-                            shareItemType: ShareItemType.ROOT_CONTENT
-                        })
-                    }));
+                    expect(mockPopoverController.create).toHaveBeenCalled();
                     done();
                 });
             });
@@ -654,6 +1289,11 @@ describe('ContentDetailsPage', () => {
     describe('ngOnDestroy()', () => {
         it('should unsubscribe events', () => {
             // arrange
+            mockEvents.unsubscribe = jest.fn();
+            mockEventBusService.events = jest.fn(() => of({
+                unsubscribe: jest.fn()
+            }));
+            contentDetailsPage['contentProgressSubscription'] = { unsubscribe: jest.fn() } as Partial<Subscription>;
             // act
             contentDetailsPage.ngOnDestroy();
             // assert
@@ -661,391 +1301,647 @@ describe('ContentDetailsPage', () => {
         });
     });
 
-    describe('ionViewWillEnter()', () => {
-        it('should unsubscribe events', () => {
+    describe('getContentState', () => {
+        it('should not show course complete popup', (done) => {
             // arrange
-            spyOn(contentDetailsPage, 'generateTelemetry').and.stub();
-            spyOn(contentDetailsPage, 'subscribeSdkEvent').and.stub();
-            spyOn(contentDetailsPage, 'handleDeviceBackButton').and.stub();
-            spyOn(contentDetailsPage, 'isPlayedFromCourse').and.stub();
-            spyOn(contentDetailsPage, 'setContentDetails').and.stub();
-            spyOn(contentDetailsPage, 'findHierarchyOfContent').and.stub();
+            mockAppGlobalService.showCourseCompletePopup = false;
+            mockAppGlobalService.getUserId = jest.fn(() => 'userid');
+            const contenxt = '{"userId":"userid","courseId":"courseid","batchId":"batchid","isCertified":false,"leafNodeIds":["id1","id2"],"batchStatus":1}';
+            mockPreferences.getString = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.CONTENT_CONTEXT:
+                        return of(contenxt);
+                }
+            });
+            mockLocalCourseService.getCourseProgress = jest.fn(() => Promise.resolve(10));
+            mockLocalCourseService.fetchAssessmentStatus = jest.fn(() => ({ isLastAttempt: false, isContentDisabled: false }))
             // act
-            contentDetailsPage.ionViewWillEnter();
+            contentDetailsPage.getContentState();
+            // assert
+            setTimeout(() => {
+                expect(mockLocalCourseService.fetchAssessmentStatus).toHaveBeenCalled();
+                expect(mockAppGlobalService.showCourseCompletePopup).toBeTruthy();
+                done();
+            });
+        });
+        it('should show course complete popup', (done) => {
+            // arrange
+            mockAppGlobalService.showCourseCompletePopup = true;
+            mockAppGlobalService.getUserId = jest.fn(() => 'userid');
+            const context = '{"userId":"userid","courseId":"courseid","batchId":"batchid","isCertified":false,"leafNodeIds":["id1"],"batchStatus":2}'
+            mockPreferences.getString = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.CONTENT_CONTEXT:
+                        return of(context);
+                }
+            });
+            mockAppGlobalService.identifier = 'do_id';
+            const contentStatusData = {
+                contentList: [
+                    {
+                        contentId: 'do_id',
+                        bestScore: {},
+                        score:[{}]
+                    }
+                ]
+            }
+            mockLocalCourseService.fetchAssessmentStatus = jest.fn(() => ({ isLastAttempt: false, isContentDisabled: false }))
+            mockLocalCourseService.getCourseProgress = jest.fn(() => Promise.resolve({ progress: 100, contentStatusData: contentStatusData }));
+            // act
+            contentDetailsPage.getContentState();
             // assert
-            expect(mockHeaderService.hideHeader).toBeCalled();
-            expect(contentDetailsPage.isPlayedFromCourse).toBeCalled();
-            expect(contentDetailsPage.setContentDetails).toBeCalled();
-            expect(contentDetailsPage.findHierarchyOfContent).toBeCalled();
-            expect(contentDetailsPage.handleDeviceBackButton).toBeCalled();
+            setTimeout(() => {
+                expect(mockLocalCourseService.fetchAssessmentStatus).toHaveBeenCalled();
+                expect(mockAppGlobalService.showCourseCompletePopup).toBeFalsy();
+                expect(contentDetailsPage.showCourseCompletePopup).toBeTruthy();
+                done();
+            });
         });
-    });
 
-    describe('ionViewWillLeave()', () => {
-        it('should unsubscribe', () => {
+        it('should show course complete popup, make isLastAttempt as true', (done) => {
             // arrange
-            const unsubscribe = jest.fn();
-            contentDetailsPage.eventSubscription = {
-                unsubscribe
-            };
-            contentDetailsPage.contentDeleteObservable = {
-                unsubscribe
-            };
-            contentDetailsPage.backButtonFunc = {
-                unsubscribe
-            };
+            mockAppGlobalService.showCourseCompletePopup = true;
+            mockAppGlobalService.getUserId = jest.fn(() => 'userid');
+            const context = '{"userId":"userid","courseId":"courseid","batchId":"batchid","isCertified":false,"leafNodeIds":["id1"],"batchStatus":2}'
+            mockPreferences.getString = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.CONTENT_CONTEXT:
+                        return of(context);
+                }
+            });
+            mockAppGlobalService.identifier = 'do_id';
+            const contentStatusData = {
+                contentList: [
+                    {
+                        contentId: 'do_id',
+                        bestScore: {},
+                        score:[{}, {}]
+                    }
+                ]
+            }
+            mockLocalCourseService.fetchAssessmentStatus = jest.fn(() => ({ isLastAttempt: false, isContentDisabled: false }))
+            mockLocalCourseService.getCourseProgress = jest.fn(() => Promise.resolve({progress: 100, contentStatusData: contentStatusData}));
             // act
-            contentDetailsPage.ionViewWillLeave();
+            contentDetailsPage.getContentState();
             // assert
-            expect(unsubscribe).toBeCalledTimes(3);
+            setTimeout(() => {
+                expect(mockLocalCourseService.fetchAssessmentStatus).toHaveBeenCalled();
+                expect(mockAppGlobalService.showCourseCompletePopup).toBeFalsy();
+                expect(contentDetailsPage.showCourseCompletePopup).toBeTruthy();
+                done();
+            });
         });
 
-        it('should unsubscribe for else part', () => {
+        it('should show course complete popup, make isContentDisabled as true', (done) => {
             // arrange
-            contentDetailsPage.eventSubscription = undefined;
-            contentDetailsPage.contentDeleteObservable = undefined;
-            contentDetailsPage.backButtonFunc = undefined;
+            mockAppGlobalService.showCourseCompletePopup = true;
+            mockAppGlobalService.getUserId = jest.fn(() => 'userid');
+            const context = '{"userId":"userid","courseId":"courseid","batchId":"batchid","isCertified":false,"leafNodeIds":["id1"],"batchStatus":2}'
+            mockPreferences.getString = jest.fn((key) => {
+                switch (key) {
+                    case PreferenceKey.CONTENT_CONTEXT:
+                        return of(context);
+                }
+            });
+            mockAppGlobalService.identifier = 'do_id';
+            const contentStatusData = {
+                contentList: [
+                    {
+                        contentId: 'do_id',
+                        bestScore: {},
+                        score:[{}, {}, {}]
+                    }
+                ]
+            }
+            mockLocalCourseService.fetchAssessmentStatus = jest.fn(() => ({ isLastAttempt: false, isContentDisabled: false }))
+            mockLocalCourseService.getCourseProgress = jest.fn(() => Promise.resolve({progress: 100, contentStatusData: contentStatusData}));
             // act
-            contentDetailsPage.ionViewWillLeave();
+            contentDetailsPage.getContentState();
             // assert
+            setTimeout(() => {
+                expect(mockLocalCourseService.fetchAssessmentStatus).toHaveBeenCalled();
+                expect(mockAppGlobalService.showCourseCompletePopup).toBeFalsy();
+                expect(contentDetailsPage.showCourseCompletePopup).toBeTruthy();
+                done();
+            });
         });
     });
 
-    describe('handleNavBackButton', () => {
-        it('should handle nav backbutton by invoked handleNavBackButton', () => {
-            // arrange
-            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
-            jest.spyOn(contentDetailsPage, 'generateEndEvent').mockReturnValue();
-            jest.spyOn(contentDetailsPage, 'popToPreviousPage').mockReturnValue();
+    it('should generate ImpressionEvent', () => {
+        contentDetailsPage.downloadAndPlay = true;
+        mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+        mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+        contentDetailsPage.generateImpressionEvent('download');
+        // assert
+        expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenNthCalledWith(1,
+            InteractType.DOWNLOAD_COMPLETE,
+            InteractType.DOWNLOAD_COMPLETE,
+            PageId.QR_CONTENT_RESULT,
+            Environment.HOME,
+            undefined,
+            undefined, undefined, undefined,
+            [{ id: 'do-123', type: 'Content' }, { id: 'content-detail', type: 'ChildUi' }, {
+                id: PageId.CONTENT_DETAIL,
+                type: 'ChildUi'
+            }]
+        );
+        expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenNthCalledWith(2,
+            ImpressionType.DETAIL, '',
+            PageId.CONTENT_DETAIL,
+            Environment.HOME,
+            undefined, undefined, undefined, { l1: 'do_123', l2: 'do_123', l3: 'do_1' },
+            [{ id: 'do-123', type: 'Content' },
+            { id: 'content-detail', type: 'ChildUi' }, {
+                id: PageId.CONTENT_DETAIL,
+                type: 'ChildUi'
+            }]
+        );
+        expect(mockTelemetryGeneratorService.generatePageLoadedTelemetry).toHaveBeenCalledWith(
+            PageId.CONTENT_DETAIL,
+            Environment.HOME,
+            undefined,
+            undefined,
+            undefined,
+            undefined,
+            [{ id: 'do-123', type: 'Content' }, { id: 'content-detail', type: 'ChildUi' }, {
+                id: PageId.CONTENT_DETAIL,
+                type: 'ChildUi'
+            }]
+        );
+    });
+
+    describe('subscribeSdkEvent', () => {
+        it('should return progress of 100 for progress', (done) => {
+            mockEventBusService.events = jest.fn(() => of({
+                type: 'PROGRESS',
+                payload: {
+                    identifier: 'do-123',
+                    progress: 100
+                }
+            }));
+            mockNgZone.run = jest.fn((fn) => fn());
+            contentDetailsPage.content = {
+                identifier: 'do-123'
+            };
+            contentDetailsPage.downloadProgress = 100;
             // act
-            contentDetailsPage.handleNavBackButton();
+            contentDetailsPage.subscribeSdkEvent();
             // assert
-            expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
-                PageId.CONTENT_DETAIL,
-                Environment.HOME,
-                true,
-                'do_212911645382959104165',
-                undefined,
-                { l1: 'do_123', l2: 'do_123', l3: 'do_1' },
-                { id: 'do_12345', type: '', version: '1' }
-            );
+            setTimeout(() => {
+                expect(mockEventBusService.events).toHaveBeenCalled();
+                expect(mockNgZone.run).toHaveBeenCalled();
+                done();
+            }, 0);
         });
 
-        it('should generate shouldGenerateEndTelemetry by invoked handleNavBackButton', () => {
-            // arrange
-            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
-            jest.spyOn(contentDetailsPage, 'generateEndEvent').mockReturnValue();
-            contentDetailsPage.shouldGenerateEndTelemetry = true;
-            jest.spyOn(contentDetailsPage, 'popToPreviousPage').mockReturnValue();
-            mockTelemetryGeneratorService.generateQRSessionEndEvent = jest.fn();
+        it('should should return progress of nan for progress', (done) => {
+            mockEventBusService.events = jest.fn(() => of({
+                type: 'PROGRESS',
+                payload: {
+                    identifier: 'do-123',
+                    progress: {}
+                }
+            }));
+            mockNgZone.run = jest.fn((fn) => fn());
+            contentDetailsPage.content = {
+                identifier: 'do-123'
+            };
+            if (contentDetailsPage.downloadProgress === 100) {
+                contentDetailsPage.downloadProgress = {};
+            }
             // act
-            contentDetailsPage.handleNavBackButton();
+            contentDetailsPage.subscribeSdkEvent();
             // assert
-            expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
-                PageId.CONTENT_DETAIL,
-                Environment.HOME,
-                true,
-                'do_212911645382959104165',
-                undefined,
-                { l1: 'do_123', l2: 'do_123', l3: 'do_1' },
-                { id: 'do_12345', type: '', version: '1' }
-            );
+            setTimeout(() => {
+                expect(mockEventBusService.events).toHaveBeenCalled();
+                expect(mockNgZone.run).toHaveBeenCalled();
+                done();
+            }, 0);
         });
-    });
 
-    describe('handleDeviceBackButton', () => {
-        it('should handle device back button', () => {
-            const subscribeWithPriorityData = jest.fn((_, fn) => fn());
-            mockPlatform.backButton = {
-                subscribeWithPriority: subscribeWithPriorityData,
-            } as any;
-            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
-            contentDetailsPage.handleDeviceBackButton();
-            expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
-                PageId.CONTENT_DETAIL,
-                Environment.HOME,
-                false,
-                'do_212911645382959104165',
-                undefined,
-                { l1: 'do_123', l2: 'do_123', l3: 'do_1' },
-                { id: 'do_12345', type: '', version: '1' }
-            );
+        it('should should return progress of nan for progress', (done) => {
+            mockEventBusService.events = jest.fn(() => of({
+                type: 'PROGRESS',
+                payload: {
+                    identifier: 'do-123',
+                    progress: 100
+                }
+            }));
+            mockNgZone.run = jest.fn((fn) => fn());
+            contentDetailsPage.content = {
+                identifier: 'do-1234'
+            };
+            contentDetailsPage.downloadProgress = 'complete';
+            // act
+            contentDetailsPage.subscribeSdkEvent();
+            // assert
+            setTimeout(() => {
+                expect(mockEventBusService.events).toHaveBeenCalled();
+                expect(mockNgZone.run).toHaveBeenCalled();
+                done();
+            }, 0);
         });
 
-        it('should handle device back button', () => {
-            const subscribeWithPriorityData = jest.fn((_, fn) => fn());
-            mockPlatform.backButton = {
-                subscribeWithPriority: subscribeWithPriorityData,
-            } as any;
-            contentDetailsPage.shouldGenerateEndTelemetry = contentDetailsPage.shouldGenerateEndTelemetry ? false : true;
-            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
-            contentDetailsPage.handleDeviceBackButton();
-            expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
-                PageId.CONTENT_DETAIL,
-                Environment.HOME,
-                false,
-                'do_212911645382959104165',
-                undefined,
-                { l1: 'do_123', l2: 'do_123', l3: 'do_1' },
-                { id: 'do_12345', type: '', version: '1' }
-            );
+        it('should return message for IMPORT_COMPLETED', (done) => {
+            mockEventBusService.events = jest.fn(() => of({
+                type: 'IMPORT_COMPLETED'
+            }));
+            mockNgZone.run = jest.fn((fn) => fn());
+            contentDetailsPage.content = {
+                identifier: 'do-123'
+            };
+            contentDetailsPage.isDownloadStarted = true;
+            jest.spyOn(contentDetailsPage, 'generateImpressionEvent').mockImplementation();
+            jest.spyOn(contentDetailsPage, 'setContentDetails').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            mockEvents.publish = jest.fn(() => []);
+            // act
+            contentDetailsPage.subscribeSdkEvent();
+            // assert
+            setTimeout(() => {
+                expect(mockEventBusService.events).toHaveBeenCalled();
+                expect(mockNgZone.run).toHaveBeenCalled();
+                expect(mockEvents.publish).toHaveBeenCalledWith('savedResources:update', {
+                    update: true
+                });
+                done();
+            }, 0);
         });
-    });
 
-    it('should subscribe play content', () => {
-        mockEvents.subscribe = jest.fn((_, fn) => {
-            fn({ selectedUser: 'user-1' });
+        it('should failed for file IMPORT_COMPLETED', (done) => {
+            mockEventBusService.events = jest.fn(() => of({
+                type: 'IMPORT_COMPLETED'
+            }));
+            mockNgZone.run = jest.fn((fn) => fn());
+            contentDetailsPage.content = {
+                identifier: 'do-123'
+            };
+            contentDetailsPage.isDownloadStarted = false;
+            jest.spyOn(contentDetailsPage, 'generateImpressionEvent').mockImplementation();
+            jest.spyOn(contentDetailsPage, 'setContentDetails').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            mockEvents.publish = jest.fn(() => []);
+            // act
+            contentDetailsPage.subscribeSdkEvent();
+            // assert
+            setTimeout(() => {
+                expect(mockEventBusService.events).toHaveBeenCalled();
+                expect(mockNgZone.run).toHaveBeenCalled();
+                done();
+            }, 0);
         });
-        mockAppGlobalService.setSelectedUser = jest.fn();
-        const presentf = jest.fn(() => Promise.resolve());
-        mockPopoverController.create = jest.fn(() => Promise.resolve({
-            present: presentf
-        }) as any);
-        contentDetailsPage.subscribePlayEvent();
-        expect(mockAppGlobalService.setSelectedUser).toHaveBeenCalledWith('user-1');
-    });
 
-    describe('calculateAvailableUserCount', () => {
-        it('should be calaulate all available users', () => {
-            // arrange
-            mockProfileService.getAllProfiles = jest.fn();
+        it('should update', (done) => {
+            mockEventBusService.events = jest.fn(() => of({
+                type: 'UPDATE',
+                payload: {
+                    size: '64kb'
+                }
+            }));
+            mockNgZone.run = jest.fn((fn) => fn());
+            contentDetailsPage.content = {
+                identifier: 'do-123',
+                contentData: {
+                    size: '10kb'
+                }
+            };
             // act
+            contentDetailsPage.subscribeSdkEvent();
             // assert
+            setTimeout(() => {
+                expect(mockEventBusService.events).toHaveBeenCalled();
+                expect(mockNgZone.run).toHaveBeenCalled();
+                done();
+            }, 0);
         });
-    });
 
-    describe('extractApiResponse', () => {
-        it('should be', () => {
-            // arrange
-            const request: Content = {
+        it('should not update for error part', (done) => {
+            mockEventBusService.events = jest.fn(() => of({
+                type: 'UPDATE',
+                payload: {
+                    size: undefined
+                }
+            }));
+            mockNgZone.run = jest.fn((fn) => fn());
+            contentDetailsPage.content = {
+                identifier: 'do-123',
                 contentData: {
+                    size: '10kb'
+                }
+            };
+            // act
+            contentDetailsPage.subscribeSdkEvent();
+            // assert
+            setTimeout(() => {
+                expect(mockEventBusService.events).toHaveBeenCalled();
+                expect(mockNgZone.run).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should return streamingUrl for SERVER_CONTENT_DATA', (done) => {
+            mockEventBusService.events = jest.fn(() => of({
+                type: 'SERVER_CONTENT_DATA',
+                payload: {
+                    contentId: 'do-123',
+                    streamingUrl: 'streamingUrl',
                     licenseDetails: {
                         description: 'descript',
                         name: 'sample-name',
                         url: 'sample-url'
-                    },
-                    appIcon: 'sample-app-icon',
-                    streamingUrl: 'streamingUrl'
-                },
-                mimeType: 'application/vnd.ekstep.h5p',
-                contentMarker: [{
-                    extraInfoMap: {hierarchyInfo: [{id: 'do-123'}]}
-                }],
-                isAvailableLocally: true,
-                contentAccess: 'content-access',
-                isUpdateAvailable: true
-            };
-            contentDetailsPage.isResumedCourse = true;
-            contentDetailsPage.resumedCourseCardData = {
-                contentId: 'sample-content-id',
-                identifier: 'sample-id'
+                    }
+                }
+            }));
+            mockNgZone.run = jest.fn((fn) => fn());
+            contentDetailsPage.content = {
+                identifier: 'do-123',
+                mimeType: 'sample-mimeType',
+                contentData: {
+                    size: '10kb'
+                }
             };
-            mockChildContentHandler.setChildContents = jest.fn();
-            jest.spyOn(ContentUtil, 'getAppIcon').mockReturnValue('sample-app-icon');
-            mockCommonUtilService.convertFileSrc = jest.fn();
-            jest.spyOn(contentDetailsPage, 'generateTelemetry').mockReturnValue();
-            mockContentPlayerHandler.isContentPlayerLaunched = jest.fn(() => true);
-            contentDetailsPage.cardData = {
-                hierarchyInfo: truncate
+            // act
+            contentDetailsPage.subscribeSdkEvent();
+            // assert
+            setTimeout(() => {
+                expect(mockEventBusService.events).toHaveBeenCalled();
+                expect(mockNgZone.run).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should return streamingUrl for SERVER_CONTENT_DATA if mimeType is matched', (done) => {
+            mockEventBusService.events = jest.fn(() => of({
+                type: 'SERVER_CONTENT_DATA',
+                payload: {
+                    contentId: 'do-123',
+                    streamingUrl: 'streamingUrl',
+                    licenseDetails: undefined
+                }
+            }));
+            mockNgZone.run = jest.fn((fn) => fn());
+            contentDetailsPage.content = {
+                identifier: 'do-123',
+                mimeType: 'application/vnd.ekstep.h5p-archive',
+                contentData: {
+                    size: '10kb'
+                }
             };
-            if (contentDetailsPage.isChildContent) {
-                contentDetailsPage.isChildContent = false;
-            }
             // act
-            contentDetailsPage.extractApiResponse(request);
+            contentDetailsPage.subscribeSdkEvent();
             // assert
-            expect(contentDetailsPage.isResumedCourse).toBeTruthy();
-            expect(mockChildContentHandler.setChildContents).toHaveBeenCalledWith(
-                contentDetailsPage.resumedCourseCardData.contentId, 0, undefined);
-            expect(mockCommonUtilService.convertFileSrc).toHaveBeenCalledWith('sample-app-icon');
-            expect(mockContentPlayerHandler.isContentPlayerLaunched).toHaveBeenCalled();
-        })
-    })
+            setTimeout(() => {
+                expect(mockEventBusService.events).toHaveBeenCalled();
+                expect(mockNgZone.run).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
 
-    describe('setContentDetails', () => {
-        it('should return content data by invoked setContentDetails', (done) => {
-            // arrange
-            const identifier = 'do_123', refreshContentDetails = true, showRating = false;
-            const dismissFn = jest.fn(() => Promise.resolve());
-            const presentFn = jest.fn(() => Promise.resolve());
-            mockCommonUtilService.getLoader = jest.fn(() => ({
-                present: presentFn,
-                dismiss: dismissFn,
+        it('should return streamingUrl for SERVER_CONTENT_DATA if identifier is not matched', (done) => {
+            mockEventBusService.events = jest.fn(() => of({
+                type: 'SERVER_CONTENT_DATA',
+                payload: {
+                    contentId: 'do-123',
+                    streamingUrl: 'streamingUrl',
+                    licenseDetails: {
+                        description: 'descript',
+                        name: 'sample-name',
+                        url: 'sample-url'
+                    }
+                }
             }));
-            mockContentService.getContentDetails = jest.fn(() => of({ contentData: { size: '12KB', status: 'Retired' } }));
-            mockCommonUtilService.showToast = jest.fn();
-            mockLocation.back = jest.fn();
-            jest.spyOn(contentDetailsPage, 'extractApiResponse').mockReturnValue();
-            jest.spyOn(contentDetailsPage, 'showRetiredContentPopup').mockImplementation(() => {
-                return Promise.resolve();
-            });
+            mockNgZone.run = jest.fn((fn) => fn());
+            contentDetailsPage.content = {
+                identifier: 'do-1234',
+                mimeType: 'application/vnd.ekstep.h5p-archive',
+                contentData: {
+                    size: '10kb'
+                }
+            };
             // act
-            contentDetailsPage.setContentDetails(identifier, refreshContentDetails, showRating);
+            contentDetailsPage.subscribeSdkEvent();
             // assert
             setTimeout(() => {
-                expect(presentFn).toHaveBeenCalled();
-                expect(mockContentService.getContentDetails).toHaveBeenCalled();
-                expect(dismissFn).toHaveBeenCalled();
+                expect(mockEventBusService.events).toHaveBeenCalled();
+                expect(mockNgZone.run).toHaveBeenCalled();
                 done();
             }, 0);
         });
 
-        it('should return content data by invoked setContentDetails if size and status are null', (done) => {
-            // arrange
-            const identifier = 'do_123', refreshContentDetails = true, showRating = false;
-            const dismissFn = jest.fn(() => Promise.resolve());
-            const presentFn = jest.fn(() => Promise.resolve());
-            mockCommonUtilService.getLoader = jest.fn(() => ({
-                present: presentFn,
-                dismiss: dismissFn,
+        it('should return undefined if event type is not matched', (done) => {
+            mockEventBusService.events = jest.fn(() => of({
+                type: 'SERVER_CONTENT',
+                payload: {
+                    contentId: 'do-123',
+                    streamingUrl: 'streamingUrl',
+                    licenseDetails: {
+                        description: 'descript',
+                        name: 'sample-name',
+                        url: 'sample-url'
+                    }
+                }
             }));
-            mockContentService.getContentDetails = jest.fn(() => of({ contentData: {} }));
-            mockCommonUtilService.showToast = jest.fn();
-            mockLocation.back = jest.fn();
-            jest.spyOn(contentDetailsPage, 'extractApiResponse').mockReturnValue();
-            jest.spyOn(contentDetailsPage, 'showRetiredContentPopup').mockImplementation(() => {
-                return Promise.resolve();
-            });
+            mockNgZone.run = jest.fn((fn) => fn());
+            contentDetailsPage.content = {
+                identifier: 'do-1234',
+                mimeType: 'application/vnd.ekstep.h5p-archive',
+                contentData: {
+                    size: '10kb'
+                }
+            };
             // act
-            contentDetailsPage.setContentDetails(identifier, refreshContentDetails, showRating);
+            contentDetailsPage.subscribeSdkEvent();
             // assert
             setTimeout(() => {
-                expect(presentFn).toHaveBeenCalled();
-                expect(mockContentService.getContentDetails).toHaveBeenCalled();
-                expect(dismissFn).toHaveBeenCalled();
+                expect(mockEventBusService.events).toHaveBeenCalled();
+                expect(mockNgZone.run).toHaveBeenCalled();
                 done();
             }, 0);
         });
+    });
 
-        it('should return content data by invoked setContentDetails for empty content', (done) => {
+    describe('ionViewWillEnter()', () => {
+        it('should unsubscribe events', (done) => {
             // arrange
-            const identifier = 'do_123', refreshContentDetails = true, showRating = false;
-            const dismissFn = jest.fn(() => Promise.resolve());
-            const presentFn = jest.fn(() => Promise.resolve());
-            mockCommonUtilService.getLoader = jest.fn(() => ({
-                present: presentFn,
-                dismiss: dismissFn,
-            }));
-            mockContentService.getContentDetails = jest.fn(() => of(undefined));
-            mockCommonUtilService.showToast = jest.fn();
-            mockLocation.back = jest.fn();
-            jest.spyOn(contentDetailsPage, 'extractApiResponse').mockReturnValue();
-            jest.spyOn(contentDetailsPage, 'showRetiredContentPopup').mockImplementation(() => {
+            contentDetailsPage.isResumedCourse = true;
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            mockContentPlayerHandler.isContentPlayerLaunched = jest.fn(() => false);
+            contentDetailsPage.isUsrGrpAlrtOpen = true;
+            contentDetailsPage.shouldOpenPlayAsPopup = true;
+            jest.spyOn(contentDetailsPage, 'isPlayedFromCourse').mockImplementation();
+            jest.spyOn(contentDetailsPage, 'getContentState').mockImplementation(() => {
+                return Promise.resolve({});
+            });
+            jest.spyOn(contentDetailsPage, 'setContentDetails').mockImplementation(() => {
                 return Promise.resolve();
             });
+            jest.spyOn(contentDetailsPage, 'subscribeSdkEvent').mockImplementation();
+            jest.spyOn(contentDetailsPage, 'findHierarchyOfContent').mockImplementation();
+            jest.spyOn(contentDetailsPage, 'handleDeviceBackButton').mockImplementation();
+            mockChildContentHandler.getLastPlayedContentId = jest.fn(() => 'sample-last-content-id');
+            mockHeaderService.hideStatusBar = jest.fn();
             // act
-            contentDetailsPage.setContentDetails(identifier, refreshContentDetails, showRating);
+            contentDetailsPage.ionViewWillEnter();
             // assert
             setTimeout(() => {
-                expect(presentFn).toHaveBeenCalled();
-                expect(mockContentService.getContentDetails).toHaveBeenCalled();
-                expect(dismissFn).toHaveBeenCalled();
+                expect(contentDetailsPage.isResumedCourse).toBeTruthy();
+                expect(mockContentPlayerHandler.isContentPlayerLaunched).toHaveBeenCalled();
+                expect(contentDetailsPage.isUsrGrpAlrtOpen).toBeFalsy();
+                expect(mockHeaderService.hideStatusBar).toHaveBeenCalled();
                 done();
             }, 0);
         });
 
-        it('should return content data by invoked setContentDetails for showRating', (done) => {
+        it('should unsubscribe events for else part of isUsrGrpAlrtOpen', (done) => {
             // arrange
-            const identifier = 'do_123', refreshContentDetails = true, showRating = true;
-            mockContentService.getContentDetails = jest.fn(() => of({ contentData: { size: '12KB', status: 'Retired' } }));
-            mockCommonUtilService.showToast = jest.fn();
-            mockLocation.back = jest.fn();
-            jest.spyOn(contentDetailsPage, 'extractApiResponse').mockReturnValue();
-            jest.spyOn(contentDetailsPage, 'showRetiredContentPopup').mockImplementation(() => {
+            contentDetailsPage.isResumedCourse = true;
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            mockContentPlayerHandler.isContentPlayerLaunched = jest.fn(() => false);
+            contentDetailsPage.isUsrGrpAlrtOpen = false;
+            contentDetailsPage.shouldOpenPlayAsPopup = false;
+            jest.spyOn(contentDetailsPage, 'isPlayedFromCourse').mockImplementation();
+            jest.spyOn(contentDetailsPage, 'setContentDetails').mockImplementation(() => {
                 return Promise.resolve();
             });
-            mockContentPlayerHandler.setContentPlayerLaunchStatus = jest.fn();
-            mockRatingHandler.showRatingPopup = jest.fn(() => Promise.resolve({}));
+            jest.spyOn(contentDetailsPage, 'subscribeSdkEvent').mockImplementation();
+            jest.spyOn(contentDetailsPage, 'findHierarchyOfContent').mockImplementation();
+            jest.spyOn(contentDetailsPage, 'handleDeviceBackButton').mockImplementation();
+            mockChildContentHandler.getLastPlayedContentId = jest.fn(() => 'sample-last-content-id');
+            mockHeaderService.hideStatusBar = jest.fn();
             // act
-            contentDetailsPage.setContentDetails(identifier, refreshContentDetails, showRating);
+            contentDetailsPage.ionViewWillEnter();
             // assert
             setTimeout(() => {
-                expect(mockContentService.getContentDetails).toHaveBeenCalled();
-                expect(mockContentPlayerHandler.setContentPlayerLaunchStatus).toHaveBeenCalled();
-                expect(mockRatingHandler.showRatingPopup).toHaveBeenCalled();
+                expect(contentDetailsPage.isResumedCourse).toBeTruthy();
+                expect(mockContentPlayerHandler.isContentPlayerLaunched).toHaveBeenCalled();
+                expect(contentDetailsPage.isUsrGrpAlrtOpen).toBeFalsy();
+                expect(mockHeaderService.hideStatusBar).toHaveBeenCalled();
                 done();
             }, 0);
         });
 
-        it('should return content data by invoked setContentDetails for catch part for ERROR_CONTENT_NOT_AVAILABLE', (done) => {
+        it('should unsubscribe events for else part of isUsrGrpAlrtOpen', (done) => {
             // arrange
-            const identifier = 'do_123', refreshContentDetails = true, showRating = false;
-            contentDetailsPage.content = { identifier: 'd0_123' };
-            mockContentService.getContentDetails = jest.fn(() => throwError('error'));
-            mockCommonUtilService.showToast = jest.fn();
-            const dismissFn = jest.fn(() => Promise.resolve());
-            const presentFn = jest.fn(() => Promise.resolve());
-            mockCommonUtilService.getLoader = jest.fn(() => ({
-                present: presentFn,
-                dismiss: dismissFn,
-            }));
-            contentDetailsPage.isDownloadStarted = false;
-            mockLocation.back = jest.fn();
+            contentDetailsPage.isResumedCourse = true;
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            mockContentPlayerHandler.isContentPlayerLaunched = jest.fn(() => true);
+            contentDetailsPage.shouldOpenPlayAsPopup = false;
+            jest.spyOn(contentDetailsPage, 'generateTelemetry').mockImplementation();
+            jest.spyOn(contentDetailsPage, 'isPlayedFromCourse').mockImplementation();
+            jest.spyOn(contentDetailsPage, 'setContentDetails').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(contentDetailsPage, 'subscribeSdkEvent').mockImplementation();
+            jest.spyOn(contentDetailsPage, 'findHierarchyOfContent').mockImplementation();
+            jest.spyOn(contentDetailsPage, 'handleDeviceBackButton').mockImplementation();
+            mockChildContentHandler.getLastPlayedContentId = jest.fn(() => 'sample-last-content-id');
             // act
-            contentDetailsPage.setContentDetails(identifier, refreshContentDetails, showRating);
+            contentDetailsPage.ionViewWillEnter();
             // assert
             setTimeout(() => {
-                expect(mockContentService.getContentDetails).toHaveBeenCalled();
-                expect(presentFn).toHaveBeenCalled();
-                expect(dismissFn).toHaveBeenCalled();
-                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_CONTENT_NOT_AVAILABLE');
-                expect(mockLocation.back).toHaveBeenCalled();
+                expect(contentDetailsPage.isResumedCourse).toBeTruthy();
+                expect(mockContentPlayerHandler.isContentPlayerLaunched).toHaveBeenCalled();
                 done();
             }, 0);
         });
+    });
+
+    describe('ionViewWillLeave()', () => {
+        it('should unsubscribe', () => {
+            // arrange
+            const unsubscribe = jest.fn();
+            contentDetailsPage.eventSubscription = {
+                unsubscribe
+            };
+            contentDetailsPage.contentDeleteObservable = {
+                unsubscribe
+            };
+            contentDetailsPage.backButtonFunc = {
+                unsubscribe
+            };
+            // act
+            contentDetailsPage.ionViewWillLeave();
+            // assert
+            expect(unsubscribe).toBeCalledTimes(3);
+        });
 
-        it('should return content data by invoked setContentDetails for catch part for CONNECTION_ERROR', (done) => {
+        it('should unsubscribe for else part', () => {
             // arrange
-            const identifier = 'do_123', refreshContentDetails = true, showRating = false;
-            contentDetailsPage.content = { identifier: 'd0_123' };
-            mockContentService.getContentDetails = jest.fn(() => throwError({ CONNECTION_ERROR: 'CONNECTION_ERROR' }));
-            mockCommonUtilService.showToast = jest.fn();
-            const dismissFn = jest.fn(() => Promise.resolve());
-            const presentFn = jest.fn(() => Promise.resolve());
-            mockCommonUtilService.getLoader = jest.fn(() => ({
-                present: presentFn,
-                dismiss: dismissFn,
-            }));
-            contentDetailsPage.isDownloadStarted = true;
-            mockLocation.back = jest.fn();
+            contentDetailsPage.eventSubscription = undefined;
+            contentDetailsPage.contentDeleteObservable = undefined;
+            contentDetailsPage.backButtonFunc = undefined;
             // act
-            contentDetailsPage.setContentDetails(identifier, refreshContentDetails, showRating);
+            contentDetailsPage.ionViewWillLeave();
             // assert
-            setTimeout(() => {
-                expect(mockContentService.getContentDetails).toHaveBeenCalled();
-                expect(presentFn).toHaveBeenCalled();
-                expect(dismissFn).toHaveBeenCalled();
-                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_NO_INTERNET_MESSAGE');
-                expect(mockLocation.back).toHaveBeenCalled();
-                done();
-            }, 0);
         });
+    });
 
-        it('should return content data by invoked setContentDetails for catch part for SERVER_ERROR', (done) => {
+    describe('handleNavBackButton', () => {
+        it('should handle nav backbutton by invoked handleNavBackButton', () => {
             // arrange
-            const identifier = 'do_123', refreshContentDetails = true, showRating = false;
-            contentDetailsPage.content = { identifier: 'd0_123' };
-            mockContentService.getContentDetails = jest.fn(() => throwError({ SERVER_ERROR: 'CONNECTION_ERROR' }));
-            mockCommonUtilService.showToast = jest.fn();
-            const dismissFn = jest.fn(() => Promise.resolve());
-            const presentFn = jest.fn(() => Promise.resolve());
-            mockCommonUtilService.getLoader = jest.fn(() => ({
-                present: presentFn,
-                dismiss: dismissFn,
-            }));
-            contentDetailsPage.isDownloadStarted = true;
-            mockLocation.back = jest.fn();
+            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+            contentDetailsPage.shouldGenerateEndTelemetry = true;
+            jest.spyOn(contentDetailsPage, 'generateEndEvent').mockReturnValue();
+            jest.spyOn(contentDetailsPage, 'popToPreviousPage').mockReturnValue();
+            jest.spyOn(contentDetailsPage, 'generateQRSessionEndEvent').mockImplementation();
+            // act
+            contentDetailsPage.handleNavBackButton();
+            // assert
+            expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                PageId.CONTENT_DETAIL,
+                Environment.HOME,
+                true,
+                undefined,
+                [{ id: 'do-123', type: 'Content' }, { id: PageId.CONTENT_DETAIL, type: 'ChildUi' },
+                { id: PageId.CONTENT_DETAIL, type: 'ChildUi' }],
+                { l1: 'do_123', l2: 'do_123', l3: 'do_1' },
+                { id: 'do_12345', type: '', version: '1' }
+            );
+        });
+
+        it('should generate shouldGenerateEndTelemetry by invoked handleNavBackButton', () => {
+            // arrange
+            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+            jest.spyOn(contentDetailsPage, 'generateEndEvent').mockReturnValue();
+            contentDetailsPage.shouldGenerateEndTelemetry = false;
+            jest.spyOn(contentDetailsPage, 'popToPreviousPage').mockReturnValue();
+            // act
+            contentDetailsPage.handleNavBackButton();
+            // assert
+            expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                PageId.CONTENT_DETAIL,
+                Environment.HOME,
+                true,
+                undefined,
+                [{ id: 'do-123', type: 'Content' }, { id: PageId.CONTENT_DETAIL, type: 'ChildUi' },
+                { id: PageId.CONTENT_DETAIL, type: 'ChildUi' }],
+                { l1: 'do_123', l2: 'do_123', l3: 'do_1' },
+                { id: 'do_12345', type: '', version: '1' }
+            );
+        });
+    });
+
+    it('should subscribe play content', () => {
+        mockEvents.subscribe = jest.fn((_, fn) => {
+            fn({ selectedUser: 'user-1', streaming: true });
+        });
+        mockAppGlobalService.setSelectedUser = jest.fn();
+        const presentf = jest.fn(() => Promise.resolve());
+        mockPopoverController.create = jest.fn(() => Promise.resolve({
+            present: presentf
+        }) as any);
+        contentDetailsPage.subscribePlayEvent();
+        expect(mockAppGlobalService.setSelectedUser).toHaveBeenCalledWith('user-1');
+    });
+
+    describe('calculateAvailableUserCount', () => {
+        it('should be calaulate all available users', () => {
+            // arrange
+            mockProfileService.getAllProfiles = jest.fn();
             // act
-            contentDetailsPage.setContentDetails(identifier, refreshContentDetails, showRating);
             // assert
-            setTimeout(() => {
-                expect(mockContentService.getContentDetails).toHaveBeenCalled();
-                expect(presentFn).toHaveBeenCalled();
-                expect(dismissFn).toHaveBeenCalled();
-                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_FETCHING_DATA');
-                expect(mockLocation.back).toHaveBeenCalled();
-                done();
-            }, 0);
         });
     });
 
@@ -1071,14 +1967,25 @@ describe('ContentDetailsPage', () => {
         expect(mockContentDeleteHandler.showContentDeletePopup).toHaveBeenCalled();
     });
 
-    describe('openConfirmPopUp', () => {
+    describe('openConfirmPopUp', () => {
+        it('should return content not downloaded for undefined downloadUrl', (done) => {
+            contentDetailsPage.content = { contentData: { name: 'matrix', size: 101100 , downloadUrl: ''} };
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            contentDetailsPage.openConfirmPopUp();
+            setTimeout(() => {
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('DOWNLOAD_NOT_ALLOWED_FOR_QUIZ');
+                done();
+            }, 0);
+        });
+
         it('should open a content download popup for dismiss data', (done) => {
             // arrange
             contentDetailsPage.limitedShareContentFlag = false;
             mockCommonUtilService.networkInfo = {
                 isNetworkAvailable: true
             };
-            contentDetailsPage.content = { contentData: { name: 'matrix', size: 101100 } };
+            contentDetailsPage.content = { contentData: { name: 'matrix', size: 101100 , downloadUrl: 'sample-url'} };
             mockFileSizePipe.transform = jest.fn(() => '10KB');
             const presentFN = jest.fn(() => Promise.resolve({}));
             const onDismissFN = jest.fn(() => Promise.resolve({ data: { canDelete: true } }));
@@ -1094,8 +2001,6 @@ describe('ContentDetailsPage', () => {
                 expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeTruthy();
                 expect(mockFileSizePipe.transform).toHaveBeenLastCalledWith(101100, 2);
                 expect(mockPopoverController.create).toHaveBeenCalledTimes(1);
-                expect(presentFN).toHaveBeenCalled();
-                expect(onDismissFN).toHaveBeenCalled();
                 done();
             }, 0);
         });
@@ -1106,7 +2011,7 @@ describe('ContentDetailsPage', () => {
             mockCommonUtilService.networkInfo = {
                 isNetworkAvailable: true
             };
-            contentDetailsPage.content = { contentData: { name: 'matrix', size: 101100 } };
+            contentDetailsPage.content = { contentData: { name: 'matrix', size: 101100, downloadUrl: 'sample-url' } };
             mockFileSizePipe.transform = jest.fn(() => '10KB');
             const presentFN = jest.fn(() => Promise.resolve({}));
             const onDismissFN = jest.fn(() => Promise.resolve({ undefined }));
@@ -1228,11 +2133,17 @@ describe('ContentDetailsPage', () => {
         contentDetailsPage.rateContent(popUpType);
         // assert
         expect(mockRatingHandler.showRatingPopup).toHaveBeenCalledWith(
-            false,
+            true,
             { contentData: { name: 'matrix', size: 101100 } },
             'rating',
-            undefined,
-            { l1: 'do_123', l2: 'do_123', l3: 'do_1'}
+            [{ id: 'do-123', type: 'Content' }, {
+                id: PageId.CONTENT_DETAIL,
+                type: 'ChildUi'
+            }, {
+                id: PageId.CONTENT_DETAIL,
+                type: 'ChildUi'
+            }],
+            { l1: 'do_123', l2: 'do_123', l3: 'do_1' }
         );
     });
 
@@ -1260,4 +2171,577 @@ describe('ContentDetailsPage', () => {
         });
     });
 
+    it('should hide deeplink progress loader', () => {
+        // arrange
+        contentDetailsPage.identifier = 'sample_doId';
+        mockSbProgressLoader.hide = jest.fn();
+        // act
+        contentDetailsPage.ionViewDidEnter();
+        // assert
+        expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({ id: 'sample_doId' });
+    });
+
+    describe('cancelDownload', () => {
+        it('should generate telemetry for cancel download', (done) => {
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockContentService.cancelDownload = jest.fn(() => of(undefined));
+            mockNgZone.run = jest.fn((fn) => fn());
+            mockTelemetryGeneratorService.generateContentCancelClickedTelemetry = jest.fn();
+            contentDetailsPage.isUpdateAvail = false;
+            // act
+            contentDetailsPage.cancelDownload();
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.SELECT_CLOSE,
+                    InteractSubtype.CANCEL,
+                    Environment.HOME,
+                    PageId.CONTENT_DETAIL,
+                    { id: 'sample_id1', type: 'Content', version: '' }, undefined, undefined,
+                    [{ id: 'download-popup', type: 'ChildUi' }]
+                );
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.TOUCH,
+                    InteractSubtype.DOWNLOAD_CANCEL_CLICKED,
+                    Environment.HOME,
+                    PageId.CONTENT_DETAIL,
+                    { id: 'do_12345', type: '', version: '1' },
+                    undefined, { l1: 'do_123', l2: 'do_123', l3: 'do_1' }, undefined
+                );
+                expect(mockNgZone.run).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateContentCancelClickedTelemetry).toHaveBeenCalled();
+                expect(contentDetailsPage.isDownloadStarted).toBeFalsy();
+                expect(contentDetailsPage.showDownload).toBeFalsy();
+                done();
+            }, 0);
+        });
+
+        it('should generate telemetry for update available', (done) => {
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockContentService.cancelDownload = jest.fn(() => of(undefined));
+            mockNgZone.run = jest.fn((fn) => fn());
+            mockTelemetryGeneratorService.generateContentCancelClickedTelemetry = jest.fn();
+            contentDetailsPage.isUpdateAvail = true;
+            // act
+            contentDetailsPage.cancelDownload();
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.SELECT_CLOSE,
+                    InteractSubtype.CANCEL,
+                    Environment.HOME,
+                    PageId.CONTENT_DETAIL,
+                    { id: 'sample_id1', type: 'Content', version: '' }, undefined, undefined,
+                    [{ id: 'download-popup', type: 'ChildUi' }]
+                );
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.TOUCH,
+                    InteractSubtype.DOWNLOAD_CANCEL_CLICKED,
+                    Environment.HOME,
+                    PageId.CONTENT_DETAIL,
+                    { id: 'do_12345', type: '', version: '1' },
+                    undefined, { l1: 'do_123', l2: 'do_123', l3: 'do_1' }, undefined
+                );
+                expect(mockNgZone.run).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateContentCancelClickedTelemetry).toHaveBeenCalled();
+                expect(contentDetailsPage.isDownloadStarted).toBeFalsy();
+                expect(contentDetailsPage.showDownload).toBeFalsy();
+                done();
+            }, 0);
+        });
+
+        it('should generate telemetry for cancel download for catch part', (done) => {
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockContentService.cancelDownload = jest.fn(() => throwError({ error: 'error' }));
+            mockNgZone.run = jest.fn((fn) => fn());
+            // act
+            contentDetailsPage.cancelDownload();
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.SELECT_CLOSE,
+                    InteractSubtype.CANCEL,
+                    Environment.HOME,
+                    PageId.CONTENT_DETAIL,
+                    { id: 'sample_id1', type: 'Content', version: '' }, undefined, undefined,
+                    [{ id: 'download-popup', type: 'ChildUi' }]
+                );
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.TOUCH,
+                    InteractSubtype.DOWNLOAD_CANCEL_CLICKED,
+                    Environment.HOME,
+                    PageId.CONTENT_DETAIL,
+                    { id: 'do_12345', type: '', version: '1' },
+                    undefined, { l1: 'do_123', l2: 'do_123', l3: 'do_1' }, undefined
+                );
+                expect(mockNgZone.run).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('handleContentPlay', () => {
+        it('should return null if content is undefined', (done) => {
+            contentDetailsPage.limitedShareContentFlag = true;
+            contentDetailsPage.content = {
+                contentData: undefined
+            };
+            mockCommonUtilService.handleAssessmentStatus =
+                jest.fn(() => Promise.resolve({ isLastAttempt: false, limitExceeded: false, isCloseButtonClicked: false }));
+            contentDetailsPage.handleContentPlay('');
+            setTimeout(() => {
+                expect(contentDetailsPage.limitedShareContentFlag).toBeTruthy();
+                expect(mockCommonUtilService.handleAssessmentStatus).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should invoked promotToLogIn page', (done) => {
+            // arrange
+            contentDetailsPage.limitedShareContentFlag = true;
+            contentDetailsPage.content = {
+                contentData: {
+                    streamingUrl: 'streamingUrl'
+                }
+            };
+            mockCommonUtilService.handleAssessmentStatus =
+                jest.fn(() => Promise.resolve({ isLastAttempt: false, limitExceeded: true, isCloseButtonClicked: true }));
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+            jest.spyOn(contentDetailsPage, 'showSwitchUserAlert').mockImplementation();
+            // act
+            contentDetailsPage.handleContentPlay('');
+            // assert
+            setTimeout(() => {
+                expect(contentDetailsPage.limitedShareContentFlag).toBeTruthy();
+                expect(mockCommonUtilService.handleAssessmentStatus).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should invoked showSwitchUserAlert page', (done) => {
+            contentDetailsPage.limitedShareContentFlag = false;
+            jest.spyOn(contentDetailsPage, 'showSwitchUserAlert').mockImplementation();
+            mockCommonUtilService.handleAssessmentStatus =
+                jest.fn(() => Promise.resolve({ isLastAttempt: false, limitExceeded: true, isCloseButtonClicked: true }));
+            contentDetailsPage.handleContentPlay('');
+            setTimeout(() => {
+                expect(contentDetailsPage.limitedShareContentFlag).toBeFalsy();
+                expect(mockCommonUtilService.handleAssessmentStatus).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should show a toast message with User has exceeded the number of atempts', (done) => {
+            // arrange
+            contentDetailsPage['isContentDisabled'] = true;
+            mockCommonUtilService.handleAssessmentStatus =
+                jest.fn(() => Promise.resolve({ isLastAttempt: false, limitExceeded: true, isCloseButtonClicked: true }));
+            // act
+            contentDetailsPage.handleContentPlay('');
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.handleAssessmentStatus).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+
+    describe('promptToLogin', () => {
+        it('should be logged in before play the content by invoked promptToLogin() if user loggedin', async (done) => {
+            // arrange
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+            jest.spyOn(contentDetailsPage, 'handleContentPlay').mockImplementation(() => {
+                return 0;
+            });
+            // act
+            await contentDetailsPage.promptToLogin();
+            // assert
+            setTimeout(() => {
+                expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+                done();
+            }, 1000);
+        });
+
+        it('should be logged in before play the content for isLoginPromptOpen() if user is not loggedin', (done) => {
+            // arrange
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+            contentDetailsPage.telemetryObject = { id: 'sample-id' };
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockPopoverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: 'can delete' } }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'you must login');
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockLoginHandlerService.signIn = jest.fn(() => Promise.resolve());
+            // act
+            contentDetailsPage.promptToLogin();
+            // assert
+            setTimeout(() => {
+                expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    ImpressionType.VIEW,
+                    '', PageId.SIGNIN_POPUP,
+                    Environment.HOME,
+                    'sample-id', undefined, undefined,
+                    { l1: 'do_123', l2: 'do_123', l3: 'do_1' }, undefined
+                );
+                expect(mockPopoverController.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'YOU_MUST_LOGIN_TO_ACCESS_QUIZ_CONTENT');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'QUIZ_CONTENTS_ONLY_REGISTERED_USERS');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'OVERLAY_SIGN_IN');
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.LOGIN_CLICKED,
+                    Environment.HOME,
+                    PageId.SIGNIN_POPUP,
+                    { id: 'sample-id' }, undefined,
+                    { l1: 'do_123', l2: 'do_123', l3: 'do_1' }, undefined
+                );
+                expect(mockLoginHandlerService.signIn).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('checkLimitedContentSharingFlag', () => {
+        it('should check limitedShareContentFlag', () => {
+            // arrange
+            const request = {
+                contentData: {
+                    status: ContentFilterConfig.CONTENT_STATUS_UNLISTED
+                },
+                contentId: 'sample-content-id'
+            };
+            // contentDetailsPage.limitedShareContentFlag = true;
+            jest.spyOn(contentDetailsPage, 'promptToLogin').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            // act
+            contentDetailsPage.checkLimitedContentSharingFlag(request);
+            // assert
+            expect(contentDetailsPage.limitedShareContentFlag).toBeFalsy();
+            expect(contentDetailsPage.content).not.toBeUndefined();
+            expect(contentDetailsPage.playingContent).not.toBeUndefined();
+            expect(contentDetailsPage.identifier).toBe('sample_doId');
+        });
+
+        it('should check limitedShareContentFlag', () => {
+            // arrange
+            const request = {
+                contentData: {
+                    status: undefined
+                }
+            };
+            // act
+            contentDetailsPage.checkLimitedContentSharingFlag(request);
+            // assert
+            expect(contentDetailsPage.limitedShareContentFlag).toBeFalsy();
+        });
+    });
+
+    describe('subscribeEvents', () => {
+        it('should invoke appVersion() and other subscription() when invoked', (done) => {
+            // arrange
+            mockAppVersion.getAppName = jest.fn(() => Promise.resolve('sunbird'));
+            mockContentPlayerHandler.setLastPlayedContentId = jest.fn();
+            const called: { [topic: EventTopics]: boolean } = {};
+            mockEvents.subscribe = jest.fn((topic, fn) => {
+                if (called[topic]) {
+                    return;
+                }
+                called[topic] = true;
+                if (topic === EventTopics.DEEPLINK_CONTENT_PAGE_OPEN) {
+                    fn({ content: {} });
+                }
+                if (topic === EventTopics.PLAYER_CLOSED) {
+                    fn({ selectedUser: 'sampleUser' });
+                }
+                if (topic === EventTopics.NEXT_CONTENT) {
+                    fn({ data: 'sample_data' });
+                }
+            });
+            mockRatingHandler.resetRating = jest.fn();
+            jest.spyOn(contentDetailsPage, 'checkLimitedContentSharingFlag').mockImplementation();
+            mockRouter.getCurrentNavigation = jest.fn(() => mockContentData);
+            mockProfileService.getActiveProfileSession = jest.fn(() =>
+                of({ uid: 'sample_uid', sid: 'sample_session_id', createdTime: Date.now() }));
+            mockProfileSwitchHandler.switchUser = jest.fn();
+            jest.spyOn(contentDetailsPage, 'calculateAvailableUserCount').mockImplementation();
+            jest.spyOn(contentDetailsPage, 'generateEndEvent').mockImplementation();
+            mockEvents.unsubscribe = jest.fn((topic) => {
+                console.log(topic);
+                called[topic] = false;
+            });
+            jest.spyOn(contentDetailsPage, 'generateTelemetry').mockImplementation();
+            mockDownloadService.getActiveDownloadRequests = jest.fn(() => EMPTY);
+            contentDetailsPage['course'] = {
+                contentId: 'content_id'
+            };
+            mockEventBusService.events = jest.fn(() => of({
+                payload: {
+                    contentId: 'content_id'
+                },
+                type: ContentEventType.COURSE_STATE_UPDATED
+            }));
+            contentDetailsPage.shouldOpenPlayAsPopup = true;
+            // act
+            contentDetailsPage.subscribeEvents();
+            // assert
+            setTimeout(() => {
+                expect(mockAppVersion.getAppName).toHaveBeenCalled();
+                expect(mockEvents.subscribe).toHaveBeenNthCalledWith(1, EventTopics.DEEPLINK_CONTENT_PAGE_OPEN, expect.anything());
+                expect(mockEvents.subscribe).toHaveBeenNthCalledWith(2, EventTopics.PLAYER_CLOSED, expect.anything());
+                expect(mockEvents.subscribe).toHaveBeenNthCalledWith(3, EventTopics.NEXT_CONTENT, expect.anything());
+                expect(mockRatingHandler.resetRating).toHaveBeenCalled();
+                expect(mockProfileService.getActiveProfileSession).toHaveBeenCalled();
+                expect(mockProfileSwitchHandler.switchUser).toHaveBeenCalled();
+                expect(mockContentPlayerHandler.setLastPlayedContentId).toHaveBeenCalled();
+                done();
+            }, 1000);
+        });
+
+        it('should invoke appVersion() and other subscription() if data is false when invoked', (done) => {
+            // arrange
+            mockAppVersion.getAppName = jest.fn(() => Promise.resolve('sunbird'));
+            mockContentPlayerHandler.setLastPlayedContentId = jest.fn();
+            const called: { [topic: EventTopics]: boolean } = {};
+            mockEvents.subscribe = jest.fn((topic, fn) => {
+                if (called[topic]) {
+                    return;
+                }
+                called[topic] = true;
+                if (topic === EventTopics.PLAYER_CLOSED) {
+                    fn({ selectedUser: { profileType: 'Teacher' } });
+                }
+                // if (topic === EventTopics.NEXT_CONTENT) {
+                //     fn({data: 'sample_data'});
+                // }
+            });
+            mockProfileSwitchHandler.switchUser = jest.fn();
+            spyOn(contentDetailsPage, 'calculateAvailableUserCount').and.stub();
+            mockEvents.unsubscribe = jest.fn((topic) => {
+                console.log(topic);
+                called[topic] = false;
+            });
+            contentDetailsPage.course = {
+                contentId: 'content_id'
+            };
+            mockEventBusService.events = jest.fn(() => of({
+                payload: {
+                    contentId: 'content_id'
+                },
+                type: ContentEventType.COURSE_STATE_UPDATED
+            }));
+            // act
+            contentDetailsPage.subscribeEvents();
+            // assert
+            setTimeout(() => {
+                expect(mockAppVersion.getAppName).toHaveBeenCalled();
+                expect(mockEvents.subscribe).toHaveBeenCalled();
+                expect(mockProfileSwitchHandler.switchUser).toHaveBeenCalledWith({ profileType: 'Teacher' });
+                done();
+            }, 0);
+        });
+    });
+
+    describe('getImportContentRequestBody', () => {
+        it('should return requestParams', () => {
+            // arrange
+            const identifiers = ['do-123', 'do-234'];
+            const isChild = true;
+            mockStorageService.getStorageDestinationDirectoryPath = jest.fn(() => 'c:/files');
+            // act
+            contentDetailsPage.getImportContentRequestBody(identifiers, isChild);
+            // assert
+            expect(mockStorageService.getStorageDestinationDirectoryPath).toHaveBeenCalled();
+        });
+    });
+
+    describe('importContent', () => {
+        it('should return a toast for content not available', (done) => {
+            // arrange
+            const identifiers = ['do-123', 'do-234'];
+            const isChild = true;
+            jest.spyOn(contentDetailsPage, 'getImportContentRequestBody').mockImplementation(() => {
+                return [];
+            });
+            mockContentService.importContent = jest.fn(() => of([{ status: -1 }]));
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            contentDetailsPage.importContent(identifiers, isChild);
+            // assert
+            setTimeout(() => {
+                expect(mockContentService.importContent).toHaveBeenCalled();
+                expect(contentDetailsPage.showDownload).toBeFalsy();
+                expect(contentDetailsPage.isDownloadStarted).toBeFalsy();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_CONTENT_NOT_AVAILABLE');
+                done();
+            }, 0);
+        });
+
+        it('should not return a toast for status is not matched', (done) => {
+            // arrange
+            const identifiers = ['do-123', 'do-234'];
+            const isChild = true;
+            jest.spyOn(contentDetailsPage, 'getImportContentRequestBody').mockImplementation(() => {
+                return [];
+            });
+            mockContentService.importContent = jest.fn(() => of([{ status: 2 }]));
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            contentDetailsPage.importContent(identifiers, isChild);
+            // assert
+            setTimeout(() => {
+                expect(mockContentService.importContent).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should return a toast of somthing went wrong for catch part', (done) => {
+            // arrange
+            const identifiers = ['do-123', 'do-234'];
+            const isChild = true;
+            jest.spyOn(contentDetailsPage, 'getImportContentRequestBody').mockImplementation(() => {
+                return [];
+            });
+            mockContentService.importContent = jest.fn(() => throwError({ error: 'error' }));
+            contentDetailsPage.isDownloadStarted = true;
+            contentDetailsPage.content = {
+                identifier: 'id'
+            };
+            contentDetailsPage.contentDownloadable = {
+                id: true
+            };
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            contentDetailsPage.importContent(identifiers, isChild);
+            // assert
+            setTimeout(() => {
+                expect(mockContentService.importContent).toHaveBeenCalled();
+                expect(contentDetailsPage.showDownload).toBeFalsy();
+                expect(contentDetailsPage.isDownloadStarted).toBeFalsy();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('SOMETHING_WENT_WRONG');
+                done();
+            }, 0);
+        });
+
+        it('should return a toast of somthing went wrong for catch part and download not started', (done) => {
+            // arrange
+            const identifiers = ['do-123', 'do-234'];
+            const isChild = true;
+            jest.spyOn(contentDetailsPage, 'getImportContentRequestBody').mockImplementation(() => {
+                return [];
+            });
+            mockContentService.importContent = jest.fn(() => throwError({ error: 'error' }));
+            contentDetailsPage.isDownloadStarted = false;
+            contentDetailsPage.content = {
+                identifier: 'id'
+            };
+            contentDetailsPage.contentDownloadable = {
+                id: true
+            };
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            contentDetailsPage.importContent(identifiers, isChild);
+            // assert
+            setTimeout(() => {
+                expect(mockContentService.importContent).toHaveBeenCalled();
+                expect(contentDetailsPage.showDownload).toBeFalsy();
+                expect(contentDetailsPage.isDownloadStarted).toBeFalsy();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('SOMETHING_WENT_WRONG');
+                done();
+            }, 0);
+        });
+    });
+
+    it('should open a Url In Browser', () => {
+        mockCommonUtilService.openUrlInBrowser = jest.fn();
+        contentDetailsPage.openinBrowser('sample-url');
+        expect(mockCommonUtilService.openUrlInBrowser).toHaveBeenCalled();
+    });
+
+    describe('fetchCertificateDescription', () => {
+        it('should return empty string if batchId is null', (done) => {
+            // act
+            contentDetailsPage.fetchCertificateDescription(null).then(res => {
+                // assert
+                done();
+            });
+        });
+
+        it('should returncertificate message if batchId is present', (done) => {
+            mockCourseService.getBatchDetails = jest.fn(() => of({
+                cert_templates: { someKey: { description: 'some_description' } }
+            })) as any;
+            // act
+            contentDetailsPage.fetchCertificateDescription('batch_id').then(res => {
+                // assert
+                expect(mockCourseService.getBatchDetails).toHaveBeenCalled();
+                done();
+            });
+        });
+
+        it('should return empty string if there is an error', (done) => {
+            mockCourseService.getBatchDetails = jest.fn(() => throwError({error: 'some_error'})) as any;
+            // act
+            contentDetailsPage.fetchCertificateDescription('batch_id').then(res => {
+                // assert
+                expect(mockCourseService.getBatchDetails).toHaveBeenCalled();
+                done();
+            });
+        });
+    });
+
+    describe('openCourseCompletionPopup', () => {
+        it('should not open the course completion popup if the course is not completed', (done) => {
+            // arrange
+            contentDetailsPage['playerEndEventTriggered'] = true;
+            contentDetailsPage.showCourseCompletePopup = false;
+            mockEventBusService.events = jest.fn(() => of({
+                type: 'COURSE_STATE_UPDATE',
+                payload: {
+                    identifier: 'do-123',
+                    progress: 100
+                }
+            }));
+            jest.spyOn(contentDetailsPage, 'getContentState').mockImplementation();
+            // act
+            contentDetailsPage.openCourseCompletionPopup().then(res => {
+                expect(contentDetailsPage.getContentState).toHaveBeenCalled();
+                expect(mockEventBusService.events).toHaveBeenCalled();
+                done();
+            });
+        });
+
+        it('should open the course completion popup if the course is completed', (done) => {
+            // arrange
+            contentDetailsPage['playerEndEventTriggered'] = false;
+            jest.spyOn(contentDetailsPage, 'getContentState').mockImplementation();
+            contentDetailsPage.courseContext = '{"userId":"userid","courseId":' +
+                '"courseid","batchId":"batchid","isCertified":true,"leafNodeIds":["id1","id2"],"batchStatus":1}';
+            contentDetailsPage.showCourseCompletePopup = true;
+            mockPopoverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({})),
+            } as any)));
+            mockEventBusService.events = jest.fn(() => of({
+                type: 'COURSE_STATE_UPDATE',
+                payload: {
+                    identifier: 'do-123',
+                    progress: 100
+                }
+            }));
+
+            contentDetailsPage.fetchCertificateDescription = jest.fn(() => Promise.resolve(''));
+
+            // act
+            contentDetailsPage.openCourseCompletionPopup().then(res => {
+                expect(mockPopoverController.create).toHaveBeenCalled();
+                expect(contentDetailsPage.fetchCertificateDescription).toHaveBeenCalled();
+                done();
+            });
+        });
+    });
 });
diff --git a/src/app/content-details/content-details.page.ts b/src/app/content-details/content-details.page.ts
index 26bf5f245..2559e94f5 100644
--- a/src/app/content-details/content-details.page.ts
+++ b/src/app/content-details/content-details.page.ts
@@ -4,13 +4,12 @@ import { AppVersion } from '@ionic-native/app-version/ngx';
 import { Network } from '@ionic-native/network/ngx';
 import { Component, Inject, NgZone, OnInit, ViewEncapsulation, OnDestroy } from '@angular/core';
 import {
-  Events,
   Platform,
   PopoverController
 } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { Subscription, Observable } from 'rxjs';
 import {
-  AuthService,
   Content,
   ContentDetailRequest,
   ContentEventType,
@@ -24,14 +23,18 @@ import {
   EventsBusEvent,
   EventsBusService,
   GetAllProfileRequest,
-  PlayerService,
   ProfileService,
   Rollup,
-  SharedPreferences,
   StorageService,
   TelemetryObject,
   Course,
-  DownloadService
+  DownloadService,
+  ObjectType,
+  SharedPreferences,
+  EventNamespace,
+  ContentEvent,
+  ContentUpdate,
+  CourseService
 } from 'sunbird-sdk';
 
 import { Map } from '@app/app/telemetryutil';
@@ -40,14 +43,16 @@ import { AppGlobalService } from '@app/services/app-global-service.service';
 import { AppHeaderService } from '@app/services/app-header.service';
 import {
   ContentConstants, EventTopics, XwalkConstants, RouterLinks, ContentFilterConfig,
-  ShareItemType, ContentType
+  ShareItemType, PreferenceKey, AssessmentConstant, MaxAttempt
 } from '@app/app/app.constant';
-import { CourseUtilService } from '@app/services/course-util.service';
-import { UtilityService } from '@app/services/utility-service';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import { ContentShareHandlerService } from '@app/services/content/content-share-handler.service';
+import {
+  CourseUtilService,
+  LocalCourseService,
+  UtilityService,
+  TelemetryGeneratorService,
+  CommonUtilService, FormAndFrameworkUtilService,
+} from '@app/services';
 import { ContentInfo } from '@app/services/content/content-info';
-import { CommonUtilService } from '@app/services/common-util.service';
 import { DialogPopupComponent } from '@app/app/components/popups/dialog-popup/dialog-popup.component';
 import {
   Environment,
@@ -56,6 +61,7 @@ import {
   InteractType,
   Mode,
   PageId,
+  CorReleationDataType,
 } from '@app/services/telemetry-constants';
 import { FileSizePipe } from '@app/pipes/file-size/file-size';
 import { SbGenericPopoverComponent } from '@app/app/components/popups/sb-generic-popover/sb-generic-popover.component';
@@ -66,13 +72,21 @@ import { ChildContentHandler } from '@app/services/content/child-content-handler
 import { ContentDeleteHandler } from '@app/services/content/content-delete-handler';
 import { ContentUtil } from '@app/util/content-util';
 import { FileTransfer, FileTransferObject } from '@ionic-native/file-transfer/ngx';
-import { map } from 'rxjs/operators';
+import { map, filter, take, tap } from 'rxjs/operators';
 import { SbPopoverComponent } from '../components/popups/sb-popover/sb-popover.component';
 import { LoginHandlerService } from '@app/services/login-handler.service';
 import { SbSharePopupComponent } from '../components/popups/sb-share-popup/sb-share-popup.component';
 import { FileOpener } from '@ionic-native/file-opener/ngx';
 import { Components } from '@ionic/core/dist/types/components';
-
+import { SbProgressLoader } from '../../services/sb-progress-loader.service';
+import { CourseCompletionPopoverComponent } from '../components/popups/sb-course-completion-popup/sb-course-completion-popup.component';
+import { AddActivityToGroup } from '../my-groups/group.interface';
+import { CsPrimaryCategory } from '@project-sunbird/client-services/services/content';
+import {ShowVendorAppsComponent} from '@app/app/components/show-vendor-apps/show-vendor-apps.component';
+import {FormConstants} from '@app/app/form.constants';
+import { TagPrefixConstants } from '@app/services/segmentation-tag/segmentation-tag.service';
+
+declare const window;
 @Component({
   selector: 'app-content-details',
   templateUrl: './content-details.page.html',
@@ -84,7 +98,7 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
   shouldOpenPlayAsPopup = false;
   apiLevel: number;
   appAvailability: string;
-  content: Content;
+  content: Content | any;
   playingContent: Content;
   isChildContent = false;
   contentDetails: any;
@@ -118,7 +132,6 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
    * This flag helps in knowing when the content player is closed and the user is back on content details page.
    */
   public isPlayerLaunched = false;
-  isGuestUser = false;
   launchPlayer: boolean;
   isResumedCourse: boolean;
   didViewLoad: boolean;
@@ -159,6 +172,17 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
   private autoPlayQuizContent = false;
   shouldNavigateBack = false;
   isContentDownloading$: Observable<boolean>;
+  onboarding = false;
+  showCourseCompletePopup = false;
+  courseContext: any;
+  private contentProgressSubscription: Subscription;
+  private playerEndEventTriggered: boolean;
+  isCourseCertificateShown: boolean;
+  pageId = PageId.CONTENT_DETAIL;
+  maxAttemptAssessment: any;
+  isCompatibleWithVendorApps = false;
+  appLists: any;
+  isIOS = false;
 
   constructor(
     @Inject('PROFILE_SERVICE') private profileService: ProfileService,
@@ -166,6 +190,8 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
     @Inject('EVENTS_BUS_SERVICE') private eventBusService: EventsBusService,
     @Inject('STORAGE_SERVICE') private storageService: StorageService,
     @Inject('DOWNLOAD_SERVICE') private downloadService: DownloadService,
+    @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
+    @Inject('COURSE_SERVICE') private courseService: CourseService,
     private zone: NgZone,
     private events: Events,
     private popoverCtrl: PopoverController,
@@ -178,7 +204,6 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
     private network: Network,
     private fileSizePipe: FileSizePipe,
     private headerService: AppHeaderService,
-    private contentShareHandler: ContentShareHandlerService,
     private appVersion: AppVersion,
     private location: Location,
     private router: Router,
@@ -190,7 +215,10 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
     private contentDeleteHandler: ContentDeleteHandler,
     private loginHandlerService: LoginHandlerService,
     private fileOpener: FileOpener,
-    private transfer: FileTransfer
+    private transfer: FileTransfer,
+    private sbProgressLoader: SbProgressLoader,
+    private localCourseService: LocalCourseService,
+    private formFrameworkUtilService: FormAndFrameworkUtilService,
   ) {
     this.subscribePlayEvent();
     this.checkDeviceAPILevel();
@@ -221,20 +249,37 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
       this.breadCrumbData = extras.breadCrumb;
       this.launchPlayer = extras.launchplayer;
       this.resumedCourseCardData = extras.resumedCourseCardData;
-      this.isSingleContent = extras.isSingleContent;
+      this.isSingleContent = extras.isSingleContent || this.isSingleContent;
       this.resultLength = extras.resultsSize;
       this.autoPlayQuizContent = extras.autoPlayQuizContent || false;
       this.shouldOpenPlayAsPopup = extras.isCourse;
       this.shouldNavigateBack = extras.shouldNavigateBack;
       this.checkLimitedContentSharingFlag(extras.content);
+      this.onboarding = extras.onboarding || this.onboarding;
     }
-    this.isContentDownloading$ = this.downloadService.getActiveDownloadRequests().pipe(
-      map((requests) => !!requests.find((request) => request.identifier === this.identifier))
-    );
+    this.isIOS = (window['device'].platform.toLowerCase() === "ios")
+    if(!this.isIOS) {
+      this.isContentDownloading$ = this.downloadService.getActiveDownloadRequests().pipe(
+        map((requests) => !!requests.find((request) => request.identifier === this.identifier))
+      );
+    }
+
   }
 
-  ngOnInit() {
+  async ngOnInit() {
     this.subscribeEvents();
+    this.appLists = await this.formFrameworkUtilService.getFormFields(FormConstants.VENDOR_APPS_CONFIG);
+    this.appLists = this.appLists.filter((appData) => {
+      if (appData.target.mimeType &&
+          appData.target.mimeType.indexOf(this.cardData.mimeType) !== -1 &&
+          appData.target.primaryCategory &&
+          appData.target.primaryCategory.indexOf(this.cardData.primaryCategory)) {
+        return true;
+      }
+    });
+    if (this.appLists.length) {
+      this.isCompatibleWithVendorApps = true;
+    }
   }
 
   subscribeEvents() {
@@ -270,17 +315,10 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
     });
     this.events.subscribe(EventTopics.NEXT_CONTENT, (data) => {
       this.generateEndEvent();
-      // this.events.unsubscribe(EventTopics.PLAYER_CLOSED);
-      // this.events.unsubscribe(EventTopics.NEXT_CONTENT);
-      const previousContent = this.content;
       this.content = data.content;
       this.course = data.course;
       this.getNavParams();
-      // this.subscribeEvents();
-
-      // show popup for previous content
       setTimeout(() => {
-        this.ratingHandler.showRatingPopup(this.isContentPlayed, previousContent, 'automatic', this.corRelationList, this.objRollup);
         this.contentPlayerHandler.setLastPlayedContentId('');
         this.generateTelemetry(true);
       }, 1000);
@@ -291,27 +329,30 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
     this.events.unsubscribe(EventTopics.PLAYER_CLOSED);
     this.events.unsubscribe(EventTopics.NEXT_CONTENT);
     this.events.unsubscribe(EventTopics.DEEPLINK_CONTENT_PAGE_OPEN);
+
+    if (this.contentProgressSubscription) {
+      this.contentProgressSubscription.unsubscribe();
+    }
   }
 
   /**
    * Ionic life cycle hook
    */
-  ionViewWillEnter() {
+  async ionViewWillEnter() {
+    this.headerService.hideStatusBar();
     this.headerService.hideHeader();
 
     if (this.isResumedCourse && !this.contentPlayerHandler.isContentPlayerLaunched()) {
       if (this.isUsrGrpAlrtOpen) {
         this.isUsrGrpAlrtOpen = false;
-      } else {
-        // migration-TODO - tested, not affecting current behaviour
-        // this.navCtrl.insert(this.navCtrl.length() - 1, EnrolledCourseDetailsPage, {
-        //   content: this.navParams.get('resumedCourseCardData')
-        // });
       }
     } else {
       this.generateTelemetry();
     }
     this.isPlayedFromCourse();
+    if (this.shouldOpenPlayAsPopup) {
+      await this.getContentState();
+    }
     this.setContentDetails(
       this.identifier, true,
       this.contentPlayerHandler.getLastPlayedContentId() === this.identifier);
@@ -320,6 +361,11 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
     this.handleDeviceBackButton();
   }
 
+  ionViewDidEnter() {
+    this.sbProgressLoader.hide({ id: 'login' });
+    this.sbProgressLoader.hide({ id: this.identifier });
+  }
+
   /**
    * Ionic life cycle hook
    */
@@ -423,11 +469,16 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
             await loader.dismiss();
           }
         }
-
         if (showRating) {
           this.contentPlayerHandler.setContentPlayerLaunchStatus(false);
-          this.ratingHandler.showRatingPopup(this.isContentPlayed, data, 'automatic', this.corRelationList, this.objRollup,
-           this.shouldNavigateBack);
+          this.ratingHandler.showRatingPopup(
+            this.isContentPlayed,
+            data,
+            'automatic',
+            this.corRelationList,
+            this.objRollup,
+            this.shouldNavigateBack,
+            () => { this.openCourseCompletionPopup(); });
           this.contentPlayerHandler.setLastPlayedContentId('');
         }
       })
@@ -435,7 +486,6 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
         await loader.dismiss();
         if (this.isDownloadStarted) {
           this.contentDownloadable[this.content.identifier] = false;
-          // this.content.downloadable = false;
           this.isDownloadStarted = false;
         }
         if (error.hasOwnProperty('CONNECTION_ERROR')) {
@@ -484,6 +534,9 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
       !(this.content.mimeType === 'application/vnd.ekstep.h5p-archive')) {
       this.streamingUrl = this.content.contentData.streamingUrl;
     }
+    if (this.content.contentData.attributions && this.content.contentData.attributions.length) {
+      this.content.contentData.attributions = (this.content.contentData.attributions.sort()).join(', ');
+    }
 
     if (!this.isChildContent && this.content.contentMarker.length
       && this.content.contentMarker[0].extraInfoMap
@@ -540,7 +593,7 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
     if (!this.didViewLoad && !this.isContentPlayed || forceGenerate) {
       this.objRollup = ContentUtil.generateRollUp(this.cardData.hierarchyInfo, this.identifier);
       this.telemetryObject = ContentUtil.getTelemetryObject(this.cardData);
-      this.generateImpressionEvent(this.cardData.identifier, this.telemetryObject.type, this.cardData.pkgVersion);
+      this.generateImpressionEvent(false, this.cardData.identifier, this.telemetryObject.type, this.cardData.pkgVersion);
       this.generateStartEvent();
     }
     this.didViewLoad = true;
@@ -562,7 +615,25 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
       this.corRelationList);
   }
 
-  generateImpressionEvent(objectId, objectType, objectVersion) {
+  generateImpressionEvent(download, objectId?, objectType?, objectVersion?) {
+    if (this.corRelationList && this.corRelationList.length) {
+      this.corRelationList.push({
+        id: PageId.CONTENT_DETAIL,
+        type: CorReleationDataType.CHILD_UI
+      });
+    }
+    if (this.downloadAndPlay || download) {
+      this.telemetryGeneratorService.generateImpressionTelemetry(
+        download ? InteractType.DOWNLOAD_COMPLETE : InteractSubtype.DOWNLOAD_REQUEST,
+        download ? InteractType.DOWNLOAD_COMPLETE : InteractSubtype.DOWNLOAD_REQUEST,
+        download ? PageId.QR_CONTENT_RESULT : PageId.CONTENT_DETAIL,
+        this.source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        this.corRelationList);
+    }
     this.telemetryGeneratorService.generateImpressionTelemetry(
       ImpressionType.DETAIL, '',
       PageId.CONTENT_DETAIL,
@@ -572,6 +643,22 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
       objectVersion,
       this.objRollup,
       this.corRelationList);
+
+    this.telemetryGeneratorService.generateImpressionTelemetry(
+        ImpressionType.PAGE_REQUEST, '',
+        PageId.CONTENT_DETAIL,
+        this.source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+      );
+
+    this.telemetryGeneratorService.generatePageLoadedTelemetry(
+        PageId.CONTENT_DETAIL,
+        this.source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        this.corRelationList
+      );
   }
 
   generateStartEvent() {
@@ -584,7 +671,7 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
 
   generateEndEvent() {
     this.telemetryGeneratorService.generateEndTelemetry(
-      this.telemetryObject.type ? this.telemetryObject.type : ContentType.RESOURCE,
+      this.telemetryObject.type ? this.telemetryObject.type : CsPrimaryCategory.LEARNING_RESOURCE,
       Mode.PLAY,
       PageId.CONTENT_DETAIL,
       Environment.HOME,
@@ -608,26 +695,14 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
   }
 
   popToPreviousPage(isNavBack?) {
-    // if (this.isResumedCourse) {
-    //   // migration-TODO
-    //   // this.navCtrl.popTo(this.navCtrl.getByIndex(this.navCtrl.length() - 3));
-    //   this.router.navigate(['../../'], { relativeTo: this.route });
-    // } else {
-    //   if (isNavBack) {
-    //     this.location.back();
-    //   }
-    // }
-
-    // Tested in ionic 4 working as expected
+    this.appGlobalService.showCourseCompletePopup = false;
     if (this.source === PageId.ONBOARDING_PROFILE_PREFERENCES) {
-      this.router.navigate([`/${RouterLinks.PROFILE_SETTINGS}`], { state: {showFrameworkCategoriesMenu: true  }, replaceUrl: true });
+      this.router.navigate([`/${RouterLinks.PROFILE_SETTINGS}`], { state: { showFrameworkCategoriesMenu: true }, replaceUrl: true });
     } else if (this.isSingleContent) {
-      window.history.go(-3);
+      !this.onboarding ? this.router.navigate([`/${RouterLinks.TABS}`]) : window.history.go(-3);
     } else if (this.resultLength === 1) {
-      // this.navCtrl.navigateBack([RouterLinks.SEARCH]);
       window.history.go(-2);
     } else {
-      this.events.publish('event:update_recently_viewed');
       this.location.back();
     }
   }
@@ -719,6 +794,7 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
             this.isDownloadStarted = false;
             this.cancelDownloading = false;
             this.contentDownloadable[this.content.identifier] = true;
+            this.generateImpressionEvent(true);
             this.setContentDetails(this.identifier, false, false);
             this.downloadProgress = '';
             this.events.publish('savedResources:update', {
@@ -762,6 +838,10 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
    * confirming popUp content
    */
   async openConfirmPopUp() {
+    if (this.cardData.mimeType === 'application/vnd.sunbird.questionset' || !(this.content.contentData.downloadUrl)) {
+      this.commonUtilService.showToast('DOWNLOAD_NOT_ALLOWED_FOR_QUIZ');
+      return;
+    }
     if (this.limitedShareContentFlag) {
       this.commonUtilService.showToast('DOWNLOAD_NOT_ALLOWED_FOR_QUIZ');
       return;
@@ -791,8 +871,6 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
       if (data) {
         this.downloadContent();
       } else {
-        // const telemetryObject = new TelemetryObject(this.content.identifier, this.content.contentType,
-        // this.content.contentData.pkgVersion);
         this.telemetryGeneratorService.generateInteractTelemetry(
           InteractType.TOUCH,
           InteractSubtype.CLOSE_CLICKED,
@@ -833,6 +911,21 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
   }
 
   cancelDownload() {
+    const ObjectTelemetry = new TelemetryObject(this.cardData.identifier, ObjectType.CONTENT, '');
+    const corRelationData: CorrelationData[] = [{
+      id: InteractSubtype.DOWLOAD_POPUP,
+      type: CorReleationDataType.CHILD_UI
+    }];
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_CLOSE,
+      InteractSubtype.CANCEL,
+      this.source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+      PageId.CONTENT_DETAIL,
+      ObjectTelemetry,
+      undefined,
+      undefined,
+      corRelationData
+    );
     this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
       this.isUpdateAvail ? InteractSubtype.DOWNLOAD_CANCEL_CLICKED : InteractSubtype.DOWNLOAD_CANCEL_CLICKED,
       Environment.HOME,
@@ -859,7 +952,11 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
       });
   }
 
-  handleContentPlay(isStreaming) {
+  async handleContentPlay(isStreaming) {
+    const maxAttempt: MaxAttempt = await this.commonUtilService.handleAssessmentStatus(this.maxAttemptAssessment);
+    if (maxAttempt.isCloseButtonClicked || maxAttempt.limitExceeded) {
+      return;
+    }
     if (this.limitedShareContentFlag) {
       if (!this.content || !this.content.contentData || !this.content.contentData.streamingUrl) {
         return;
@@ -915,8 +1012,8 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
             }
           ],
           icon: {
-            md: 'md-sad',
-            ios: 'ios-sad',
+            md: 'sad',
+            ios: 'sad',
             className: ''
           },
           metaInfo: '',
@@ -939,6 +1036,14 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
         this.downloadContent();
       }
     } else {
+      if (this.source === PageId.ONBOARDING_PROFILE_PREFERENCES) {
+        this.telemetryGeneratorService.generateImpressionTelemetry(
+          InteractType.PLAY,
+          InteractSubtype.DOWNLOAD,
+          PageId.QR_CONTENT_RESULT,
+          Environment.ONBOARDING
+        );
+      }
       this.playContent(isStreaming);
     }
   }
@@ -952,8 +1057,8 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
         actionsButtons: [
         ],
         icon: {
-          md: 'md-warning',
-          ios: 'ios-warning',
+          md: 'warning',
+          ios: 'warning',
           className: ''
         }
       },
@@ -968,7 +1073,7 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
   async openPlayAsPopup(isStreaming) {
     const profile = this.appGlobalService.getCurrentUser();
     this.isUsrGrpAlrtOpen = true;
-    // if (profile.board.length > 1) {
+
     const confirm = await this.popoverCtrl.create({
       component: SbGenericPopoverComponent,
       componentProps: {
@@ -978,10 +1083,6 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
           {
             btntext: this.commonUtilService.translateMessage('YES'),
             btnClass: 'popover-color'
-          },
-          {
-            btntext: this.commonUtilService.translateMessage('CHANGE_USER'),
-            btnClass: 'sb-btn sb-btn-sm  sb-btn-outline-info'
           }
         ],
         icon: null
@@ -996,13 +1097,6 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
     if (data && data.isLeftButtonClicked) {
       this.playContent(isStreaming);
       // Incase of close button click data.isLeftButtonClicked = null so we have put the false condition check
-    } else if (data && data.isLeftButtonClicked === false) {
-      const playConfig: any = {};
-      playConfig.playContent = true;
-      playConfig.streaming = isStreaming;
-      this.router.navigate([RouterLinks.USER_AND_GROUPS], {
-        state: { playConfig }
-      });
     }
   }
 
@@ -1010,7 +1104,7 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
    * Play content
    */
   private playContent(isStreaming: boolean) {
-    if (this.apiLevel < 21 && this.appAvailability === 'false') {
+    if (this.apiLevel < 21 && this.appAvailability === 'false' && !this.isIOS) {
       this.showPopupDialog();
     } else {
       const hierachyInfo = this.childContentHandler.contentHierarchyInfo || this.content.hierarchyInfo;
@@ -1024,7 +1118,8 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
       if (this.isResumedCourse) {
         this.playingContent.hierarchyInfo = hierachyInfo;
       }
-      this.contentPlayerHandler.launchContentPlayer(this.playingContent, isStreaming, this.downloadAndPlay, contentInfo, this.shouldOpenPlayAsPopup);
+      this.contentPlayerHandler.launchContentPlayer(this.playingContent, isStreaming,
+        this.downloadAndPlay, contentInfo, this.shouldOpenPlayAsPopup , true , this.isChildContent);
       this.downloadAndPlay = false;
     }
   }
@@ -1049,7 +1144,7 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
       });
   }
 
-showDeletePopup() {
+  showDeletePopup() {
     this.contentDeleteObservable = this.contentDeleteHandler.contentDeleteCompleted$.subscribe(() => {
       this.content.contentData.streamingUrl = this.streamingUrl;
       this.contentDownloadable[this.content.identifier] = false;
@@ -1074,7 +1169,6 @@ showDeletePopup() {
    * Shares content to external devices
    */
   async share() {
-    // this.contentShareHandler.shareContent(this.content, this.corRelationList, this.objRollup);
     // when content size and sizeOn device is undefined
     if (!this.content.contentData.size) {
       this.content.contentData.size = this.contentSize;
@@ -1214,13 +1308,13 @@ showDeletePopup() {
         this.objRollup,
         this.corRelationList
       );
-      this.loginHandlerService.signIn();
+      this.loginHandlerService.signIn({navigateToCourse: true});
     }
     this.isLoginPromptOpen = false;
   }
 
   checkLimitedContentSharingFlag(content) {
-    this.limitedShareContentFlag = (content.contentData &&
+    this.limitedShareContentFlag = (content && content.contentData &&
       content.contentData.status === ContentFilterConfig.CONTENT_STATUS_UNLISTED);
     if (this.limitedShareContentFlag) {
       this.content = content;
@@ -1228,6 +1322,11 @@ showDeletePopup() {
       this.identifier = content.contentId || content.identifier;
       this.telemetryObject = ContentUtil.getTelemetryObject(content);
       this.promptToLogin();
+      window['segmentation'].SBTagService.pushTag(
+        window['segmentation'].SBTagService.getTags(TagPrefixConstants.CONTENT_ID) ? this.identifier : [this.identifier],
+        TagPrefixConstants.CONTENT_ID,
+        window['segmentation'].SBTagService.getTags(TagPrefixConstants.CONTENT_ID) ? false : true
+      );
     }
   }
 
@@ -1274,4 +1373,108 @@ showDeletePopup() {
       await loader.dismiss();
     }
   }
+
+  // pass coursecontext to ratinghandler if course is completed
+  async getContentState() {
+    return new Promise(async (resolve, reject) => {
+      this.courseContext = await this.preferences.getString(PreferenceKey.CONTENT_CONTEXT).toPromise();
+      this.courseContext = JSON.parse(this.courseContext);
+      if (this.courseContext.courseId && this.courseContext.batchId && this.courseContext.leafNodeIds) {
+        const courseDetails: any = await this.localCourseService.getCourseProgress(this.courseContext);
+        const progress = courseDetails.progress;
+        const contentStatusData = courseDetails.contentStatusData || {};
+        if (progress !== 100) {
+          this.appGlobalService.showCourseCompletePopup = true;
+        }
+        if (this.appGlobalService.showCourseCompletePopup && progress === 100) {
+          this.appGlobalService.showCourseCompletePopup = false;
+          this.showCourseCompletePopup = true;
+        }
+
+        this.maxAttemptAssessment = this.localCourseService.fetchAssessmentStatus(contentStatusData, this.cardData);
+      }
+      resolve();
+    });
+  }
+
+  async openCourseCompletionPopup() {
+    if (this.isCourseCertificateShown) {
+      return;
+    }
+    await this.getContentState();
+
+    if (!this.showCourseCompletePopup) {
+      if (this.contentProgressSubscription) {
+        this.contentProgressSubscription.unsubscribe();
+      }
+
+      this.contentProgressSubscription = this.eventBusService.events(EventNamespace.CONTENT)
+          .pipe(
+              filter((event) =>
+                  event.type === ContentEventType.COURSE_STATE_UPDATED && this.course &&
+                  (event as ContentUpdate).payload.contentId === this.course.contentId && this.shouldOpenPlayAsPopup
+              ),
+              take(1),
+              tap(() => this.openCourseCompletionPopup())
+          )
+          .subscribe();
+
+      return;
+    }
+    const popUp = await this.popoverCtrl.create({
+      component: CourseCompletionPopoverComponent,
+      componentProps: {
+        isCertified: this.courseContext['isCertified'],
+        certificateDescription: await this.fetchCertificateDescription(this.courseContext && this.courseContext.batchId),
+        course: this.course ? this.course.content : undefined
+      },
+      cssClass: 'sb-course-completion-popover',
+    });
+    this.isCourseCertificateShown = true;
+    await popUp.present();
+    const { data } = await popUp.onDidDismiss();
+    if (data === undefined) {
+      this.telemetryGeneratorService.generateInteractTelemetry(
+        InteractType.TOUCH,
+        InteractSubtype.CLOSE_CLICKED,
+        PageId.COURSE_COMPLETION_POPUP,
+        Environment.HOME
+      );
+    }
+  }
+
+  async fetchCertificateDescription(batchId) {
+    if (!batchId) {
+      return '';
+    }
+    try {
+      const batchDetails = await this.courseService.getBatchDetails({ batchId }).toPromise();
+      return (batchDetails && batchDetails.cert_templates && Object.keys(batchDetails.cert_templates).length &&
+        batchDetails.cert_templates[Object.keys(batchDetails.cert_templates)[0]].description) || '';
+    } catch (e) {
+      console.log(e);
+      return '';
+    }
+
+  }
+
+  async openWithVendorApps() {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+        InteractType.TOUCH,
+        InteractSubtype.OPEN_WITH_PLAYER_CLICKED,
+        Environment.HOME,
+        PageId.CONTENT_DETAIL,
+    );
+    const popoverElement = await this.popoverCtrl.create({
+        component: ShowVendorAppsComponent,
+        componentProps: {
+          content: this.content,
+          appLists: this.appLists
+        },
+        cssClass: 'sb-popover'
+      });
+
+    await popoverElement.present();
+  }
+
 }
diff --git a/src/app/course-batches/course-batches.module.ts b/src/app/course-batches/course-batches.module.ts
index d8942d0b9..bf4e58c3a 100644
--- a/src/app/course-batches/course-batches.module.ts
+++ b/src/app/course-batches/course-batches.module.ts
@@ -2,9 +2,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { Routes, RouterModule } from '@angular/router';
-
 import { IonicModule } from '@ionic/angular';
-
 import { CourseBatchesPage } from './course-batches.page';
 import { TranslateModule } from '@ngx-translate/core';
 import { PipesModule } from '@app/pipes/pipes.module';
diff --git a/src/app/course-batches/course-batches.page.html b/src/app/course-batches/course-batches.page.html
index 66999d57e..4f7920a52 100644
--- a/src/app/course-batches/course-batches.page.html
+++ b/src/app/course-batches/course-batches.page.html
@@ -4,42 +4,26 @@
       <ion-icon slot="start" name="arrow-back" class="batches-header-text"></ion-icon>
     </ion-buttons>
     <ion-title class="batches-header-text font-size-20">
-      <strong>{{ 'BATCHES_FOR_THIS_COURSE' | translate }}</strong>
+      <strong>{{'FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE' | categoryKeyTranslate : course}}</strong>
     </ion-title>
   </ion-toolbar>
 </ion-header>
 <!-- Page body -->
 <ion-content class="ion-padding" overflow-scroll="true">
-
-  <!-- <div class="my-overlay" padding *ngIf="showSignInCard"> 
-    <div class="guest-user-info" text-center>
-          <p> {{ 'OVERLAY_LABEL_TAKE_COURSE' | translate }} </p>
-          <br/>
-          <span>{{ 'OVERLAY_INFO_TEXT_TAKE_COURSE' | translate }} </span>
-          <br/>
-          <br/>
-          <button ion-button block (click)="signIn()">{{ 'OVERLAY_SIGN_IN' | translate }}</button>
-        </div>
-     <div class="guest-user-info" text-center>
-      <app-sign-in-card (valueChange)="buttonClick($event)" [source]="'course-batches'"
-        [title]="'OVERLAY_LABEL_TAKE_COURSE'" [description]="'OVERLAY_INFO_TEXT_TAKE_COURSE'"></app-sign-in-card>
-    </div>
-  </div> -->
-
   <div *ngIf="ongoingBatches && ongoingBatches.length">
     <div class="background-gray">
-      <div class="width-100 batch-font" text-capitalize>
+      <div class="width-100 batch-font ion-text-capitalize">
         {{ 'VIEW_ONGOING_BATCHES' | translate }}
       </div>
     </div>
 
-    <div class="batch-list" padding-top>
-      <div *ngIf="ongoingBatches && ongoingBatches.length && !showLoader">
+    <div class="batch-list ion-padding-top">
+      <div *ngIf="ongoingBatches && ongoingBatches.length">
         <div class="flex-card-container" *ngFor="let batch of ongoingBatches">
           <div class="card-text">
             <div class="batch-name">{{ batch.name }}</div>
             <span class="text-gray-color">
-              {{batch.startDate | date: 'mediumDate' }} - {{ batch.endDate | date: 'mediumDate' }}
+              {{batch.startDate | date: 'dd/MM/yyyy' }} - {{ batch.endDate | date: 'dd/MM/yyyy' }}
             </span>
             <p *ngIf="batch?.creatorDetails?.firstName">
               <span class="text-gray-color">{{ 'BATCH_CREATED_BY' | translate }}</span>&nbsp;
@@ -52,7 +36,7 @@
                 class="enroll-msg-ended">{{ 'BATCH_ENROLLMENT_ENDED' | translate}}</span>
               <ng-template #lastDateForEnrollment>
                 <span class="enroll-msg-style">{{'ENROLLMENT_LAST_DATE' | translate}}
-                  {{batch.enrollmentEndDate | date: 'mediumDate'}}</span>
+                  {{batch.enrollmentEndDate | date: 'dd/MM/yyyy'}}</span>
               </ng-template>
             </p>
           </div>
@@ -69,17 +53,17 @@
 
   <div *ngIf="upcommingBatches && upcommingBatches.length">
     <div class="background-gray">
-      <div class="width-100 batch-font" text-capitalize>
+      <div class="width-100 batch-font ion-text-capitalize">
         {{ 'VIEW_UPCOMING_BATCHES' | translate }}
       </div>
     </div>
-    <div class="batch-list" padding-top>
-      <div *ngIf="upcommingBatches && upcommingBatches.length && !showLoader">
+    <div class="batch-list ion-padding-top">
+      <div *ngIf="upcommingBatches && upcommingBatches.length">
         <div class="flex-card-container" *ngFor="let batch of upcommingBatches">
           <div class="card-text">
             <div class="batch-name">{{ batch.name }}</div>
             <span class="text-gray-color">
-              {{batch.startDate | date: 'mediumDate' }} - {{ batch.endDate | date: 'mediumDate' }}
+              {{batch.startDate | date: 'dd/MM/yyyy' }} - {{ batch.endDate | date: 'dd/MM/yyyy' }}
             </span>
             <p *ngIf="batch?.creatorDetails?.firstName">
               <span class="text-gray-color">{{ 'BATCH_CREATED_BY' | translate }}</span>&nbsp;
@@ -92,7 +76,7 @@
                 class="enroll-msg-ended">{{ 'BATCH_ENROLLMENT_ENDED' | translate}}</span>
               <ng-template #lastDateForEnrollment>
                 <span class="enroll-msg-style">{{'ENROLLMENT_LAST_DATE' | translate}}
-                  {{batch.enrollmentEndDate | date: 'mediumDate'}}</span>
+                  {{batch.enrollmentEndDate | date: 'dd/MM/yyyy' }}</span>
               </ng-template>
             </p>
           </div>
@@ -108,13 +92,4 @@
       </div>
     </div>
   </div>
-
-  <div *ngIf="showLoader">
-    <ion-row class="padding-top-30" padding>
-      <ion-col class="ion-text-center">
-        <p>{{ 'MSG_LOADING_BATCHES' | translate }}</p>
-        <ion-spinner padding></ion-spinner>
-      </ion-col>
-    </ion-row>
-  </div>
 </ion-content>
\ No newline at end of file
diff --git a/src/app/course-batches/course-batches.page.scss b/src/app/course-batches/course-batches.page.scss
index 408d26839..d1981695c 100644
--- a/src/app/course-batches/course-batches.page.scss
+++ b/src/app/course-batches/course-batches.page.scss
@@ -12,11 +12,11 @@
         top: 0;
         @include ltr() {
         left: 0;
-        };
+        }
     
         @include rtl() {
         right: 0;
-        };
+        }
         margin-top: 56px;
       }
     .batch-filter-icon {
@@ -27,7 +27,7 @@
         margin-top: -10px;
     }
     .batches-header-text{
-        color: #3b5998;
+        color: map-get($colors, facebook);
     }
     .padding-left-6{
         padding-left: 6px;
@@ -39,7 +39,7 @@
         font-size: 18px !important;
     }
     .background-gray{
-        background: #efeff4;
+        background: map-get($colors, gray_white);
         @include margin(-16px, -26px, 0, -26px);
         @include padding(null, null, null, 25px !important);
     }
@@ -132,18 +132,14 @@
         }
       }
       .sb-btn-outline-info {
-        background-color: #006DE5 !important;
-        border-radius: 5px !important;
         font-weight: bold;
         font-size: 12px;
-        color: white !important;
-        border-color: white !important;
     }
     .enroll-msg-ended {
-        color: #e55a28;
+        color: $orange;
         font-size: 0.9em;
     }
 }
-button:disbled{
+button:disabled{
     opacity: 0.5 !important;
 }
diff --git a/src/app/course-batches/course-batches.page.spec.ts b/src/app/course-batches/course-batches.page.spec.ts
new file mode 100644
index 000000000..d8145432b
--- /dev/null
+++ b/src/app/course-batches/course-batches.page.spec.ts
@@ -0,0 +1,495 @@
+import { CourseBatchesPage } from './course-batches.page';
+import {
+    AppGlobalService, LoginHandlerService,
+    CommonUtilService, TelemetryGeneratorService,
+    AppHeaderService, LocalCourseService,
+    InteractType, InteractSubtype,
+    Environment, PageId, ImpressionType
+} from '../../services';
+import { PopoverController, Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { NgZone } from '@angular/core';
+import { Router } from '@angular/router';
+import { Location } from '@angular/common';
+import {
+    SharedPreferences,
+    Batch,
+    EnrollCourseRequest
+} from 'sunbird-sdk';
+import { PreferenceKey, EventTopics } from '../app.constant';
+import { of, throwError } from 'rxjs';
+import { CategoryKeyTranslator } from '@app/pipes/category-key-translator/category-key-translator-pipe';
+
+describe('CourseBatchesPage', () => {
+    let courseBatchesPage: CourseBatchesPage;
+    const mockSharedPreferences: SharedPreferences = {};
+    const mockAppGlobalService: Partial<AppGlobalService> = {};
+    const mockPopoverCtrl: Partial<PopoverController> = {};
+    const mockLoginHandlerService: Partial<LoginHandlerService> = {};
+    const mockZone: Partial<NgZone> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+    const mockEvents: Partial<Events> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockHeaderService: Partial<AppHeaderService> = {};
+    const mockLocation: Partial<Location> = {};
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => ({
+            extras: {
+                state: {
+                    ongoingBatches: [],
+                    upcommingBatches: [],
+                    course: {},
+                    objRollup: {},
+                    corRelationList: [],
+                    telemetryObject: {
+                        id: '',
+                        type: '',
+                        version: ''
+                    }
+                }
+            }
+        })) as any
+    };
+    const mockPlatform: Partial<Platform> = {};
+    const mockLocalCourseService: Partial<LocalCourseService> = {};
+    const mockCategoryKeyTranslator: Partial<CategoryKeyTranslator> = {
+        transform: jest.fn(() => 'sample-message')
+    };
+    beforeAll(() => {
+        courseBatchesPage = new CourseBatchesPage(
+            mockSharedPreferences as SharedPreferences,
+            mockAppGlobalService as AppGlobalService,
+            mockPopoverCtrl as PopoverController,
+            mockLoginHandlerService as LoginHandlerService,
+            mockZone as NgZone,
+            mockCommonUtilService as CommonUtilService,
+            mockEvents as Events,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockHeaderService as AppHeaderService,
+            mockLocation as Location,
+            mockRouter as Router,
+            mockPlatform as Platform,
+            mockLocalCourseService as LocalCourseService,
+            mockCategoryKeyTranslator as CategoryKeyTranslator
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('Should instanciate CourseBatchesPage', () => {
+        expect(courseBatchesPage).toBeTruthy();
+    });
+
+    it('Should not unsubscribe if backButtonFunc is undefined', () => {
+        // arrange
+        // act
+        courseBatchesPage.ionViewWillLeave();
+        // assert
+    });
+
+    it('Should update page config', (done) => {
+        // arrange
+        mockHeaderService.getDefaultPageConfig = jest.fn(() => ({
+            showHeader: true,
+            showBurgerMenu: true,
+            pageTitle: 'string',
+            actionButtons: ['true'],
+        }));
+        mockHeaderService.updatePageConfig = jest.fn();
+        mockPlatform.backButton = {
+            subscribeWithPriority: jest.fn((_, cb) => {
+                setTimeout(() => {
+                    cb();
+                }, 0);
+                return {
+                    unsubscribe: jest.fn()
+                };
+            }),
+        } as any;
+        mockLocation.back = jest.fn();
+
+        // act
+        courseBatchesPage.ionViewWillEnter();
+        // assert
+        setTimeout(() => {
+            expect(mockHeaderService.getDefaultPageConfig).toHaveBeenCalled();
+            expect(mockHeaderService.updatePageConfig).toHaveBeenCalled();
+            expect(mockPlatform.backButton).not.toBeUndefined();
+            expect(mockLocation.back).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
+    it('Should unsubscribe if backButtonFunc is not undefined', (done) => {
+        // arrange
+        mockPlatform.backButton = {
+            subscribeWithPriority: jest.fn((_, cb) => {
+                setTimeout(() => {
+                    cb();
+                }, 0);
+                return {
+                    unsubscribe: jest.fn()
+                };
+            }),
+        } as any;
+        // act
+        courseBatchesPage.ionViewWillLeave();
+        // assert
+        setTimeout(() => {
+            // expect(mockPlatform.backButton.unsubscribe).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
+    describe('enrollIntoBatch', () => {
+        it('Should set user id and isGuestUser and call getBatchesByCourseId if loggedin user', (done) => {
+            // arrange
+            mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('sample-uid'));
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+            // act
+            courseBatchesPage.ngOnInit();
+            // assert
+            setTimeout(() => {
+                expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+                expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('Should enroll into batch if logged user', (done) => {
+            // arrange
+            const batch: Batch = {
+                id: 'some_batch_id',
+                courseId: 'some_course_id',
+                status: 0
+            };
+            const enrollCourseRequest: EnrollCourseRequest = {
+                batchId: batch.id,
+                courseId: batch.courseId,
+                userId: 'sample-uid',
+                batchStatus: batch.status
+            };
+            mockLocalCourseService.prepareEnrollCourseRequest = jest.fn(() => (enrollCourseRequest));
+
+            const reqvalues = new Map();
+            reqvalues.set('enrollReq', enrollCourseRequest);
+            mockLocalCourseService.prepareRequestValue = jest.fn(() => (reqvalues));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockLocalCourseService.enrollIntoBatch = jest.fn(() => of({}));
+            mockZone.run = jest.fn((fn) => fn());
+            mockCommonUtilService.translateMessage = jest.fn((key, fields) => {
+                switch (key) {
+                    case 'COURSE_ENROLLED':
+                        return 'COURSE_ENROLLED';
+                }
+            });
+            mockCommonUtilService.showToast = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            mockLocalCourseService.isEnrollable = jest.fn(() => true);
+
+            // act
+            courseBatchesPage.enrollIntoBatch(batch);
+            // assert
+            setTimeout(() => {
+                expect(mockLocalCourseService.prepareEnrollCourseRequest).toHaveBeenCalledWith('sample-uid', batch);
+                expect(mockLocalCourseService.prepareRequestValue).toHaveBeenCalledWith(enrollCourseRequest);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.ENROLL_CLICKED,
+                    Environment.HOME,
+                    PageId.COURSE_BATCHES,
+                    {
+                        id: '',
+                        type: '',
+                        version: '',
+                    },
+                    reqvalues,
+                    {},
+                    []);
+                expect(presentFn).toHaveBeenCalled();
+                expect(mockLocalCourseService.enrollIntoBatch).toHaveBeenCalled();
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockCategoryKeyTranslator.transform).toBeCalledWith('FRMELEMNTS_MSG_COURSE_ENROLLED', expect.anything());
+                expect(mockEvents.publish).toHaveBeenCalledWith(EventTopics.ENROL_COURSE_SUCCESS, {
+                    batchId: batch.id,
+                    courseId: batch.courseId
+                });
+                done();
+            }, 0);
+        });
+
+        it('Should enroll into batch if logged user go to catch block if throws error', (done) => {
+            // arrange
+            const batch: Batch = {
+                id: 'some_batch_id',
+                courseId: 'some_course_id',
+                status: 0
+            };
+            const enrollCourseRequest: EnrollCourseRequest = {
+                batchId: batch.id,
+                courseId: batch.courseId,
+                userId: 'sample-uid',
+                batchStatus: batch.status
+            };
+            mockLocalCourseService.prepareEnrollCourseRequest = jest.fn(() => (enrollCourseRequest));
+
+            const reqvalues = new Map();
+            reqvalues.set('enrollReq', enrollCourseRequest);
+            mockLocalCourseService.prepareRequestValue = jest.fn(() => (reqvalues));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockLocalCourseService.enrollIntoBatch = jest.fn(() => throwError({ error: 'error' }));
+            mockLocalCourseService.isEnrollable = jest.fn(() => true);
+
+            // act
+            courseBatchesPage.enrollIntoBatch(batch);
+            // assert
+            setTimeout(() => {
+                expect(mockLocalCourseService.prepareEnrollCourseRequest).toHaveBeenCalledWith('sample-uid', batch);
+                expect(mockLocalCourseService.prepareRequestValue).toHaveBeenCalledWith(enrollCourseRequest);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.ENROLL_CLICKED,
+                    Environment.HOME,
+                    PageId.COURSE_BATCHES,
+                    {
+                        id: '',
+                        type: '',
+                        version: '',
+                    },
+                    reqvalues,
+                    {},
+                    []);
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockLocalCourseService.enrollIntoBatch).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('Should set user id and isGuestUser and call getBatchesByCourseId if guest user', (done) => {
+            // arrange
+            mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('sample-uid'));
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+            // act
+            courseBatchesPage.ngOnInit();
+            // assert
+            setTimeout(() => {
+                expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+                expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('Should show signin poup if guest user', (done) => {
+            // arrange
+            const batch: Batch = {
+                id: 'some_batch_id',
+                courseId: 'some_course_id',
+                status: 0
+            };
+            const enrollCourseRequest: EnrollCourseRequest = {
+                batchId: batch.id,
+                courseId: batch.courseId,
+                userId: 'sample-uid',
+                batchStatus: batch.status
+            };
+            mockLocalCourseService.prepareEnrollCourseRequest = jest.fn(() => (enrollCourseRequest));
+
+            const reqvalues = new Map();
+            reqvalues.set('enrollReq', enrollCourseRequest);
+            mockLocalCourseService.prepareRequestValue = jest.fn(() => (reqvalues));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockCommonUtilService.translateMessage = jest.fn((key, fields) => {
+                switch (key) {
+                    case 'YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL':
+                        return 'YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL';
+                    case 'TRAININGS_ONLY_REGISTERED_USERS':
+                        return 'TRAININGS_ONLY_REGISTERED_USERS';
+                    case 'OVERLAY_SIGN_IN':
+                        return 'OVERLAY_SIGN_IN';
+                }
+            });
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: true } }))
+            } as any)));
+            mockSharedPreferences.putString = jest.fn(() => of(undefined));
+            mockLoginHandlerService.signIn = jest.fn();
+            mockLocalCourseService.isEnrollable = jest.fn(() => true);
+
+            // act
+            courseBatchesPage.enrollIntoBatch(batch);
+            // assert
+            setTimeout(() => {
+                expect(mockLocalCourseService.prepareEnrollCourseRequest).toHaveBeenCalledWith('sample-uid', batch);
+                expect(mockLocalCourseService.prepareRequestValue).toHaveBeenCalledWith(enrollCourseRequest);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.ENROLL_CLICKED,
+                    Environment.HOME,
+                    PageId.COURSE_BATCHES,
+                    {
+                        id: '',
+                        type: '',
+                        version: '',
+                    },
+                    reqvalues,
+                    {},
+                    []);
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    ImpressionType.VIEW,
+                    '',
+                    PageId.SIGNIN_POPUP,
+                    Environment.HOME,
+                    '',
+                    '',
+                    '',
+                    {},
+                    []);
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'TRAININGS_ONLY_REGISTERED_USERS');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'OVERLAY_SIGN_IN');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(4, 'OVERLAY_SIGN_IN');
+                expect(mockPopoverCtrl.create).toHaveBeenCalledWith(expect.objectContaining({
+                    componentProps: expect.objectContaining({
+                        sbPopoverHeading: 'OVERLAY_SIGN_IN',
+                        sbPopoverMainTitle: 'YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL',
+                        metaInfo: 'TRAININGS_ONLY_REGISTERED_USERS',
+                        actionsButtons: expect.arrayContaining([
+                            expect.objectContaining({
+                                btntext: 'OVERLAY_SIGN_IN'
+                            })
+                        ])
+                    })
+                }));
+                expect(mockSharedPreferences.putString).toHaveBeenNthCalledWith(1, PreferenceKey.BATCH_DETAIL_KEY, JSON.stringify(batch));
+                expect(mockSharedPreferences.putString).toHaveBeenNthCalledWith(2, PreferenceKey.COURSE_DATA_KEY, JSON.stringify({}));
+                expect(mockSharedPreferences.putString).toHaveBeenNthCalledWith(3, PreferenceKey.CDATA_KEY, JSON.stringify([]));
+                expect(mockLoginHandlerService.signIn).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('Should show signin poup if guest user and clicked dismiss', (done) => {
+            // arrange
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+            const batch: Batch = {
+                id: 'some_batch_id',
+                courseId: 'some_course_id',
+                status: 0
+            };
+            const enrollCourseRequest: EnrollCourseRequest = {
+                batchId: batch.id,
+                courseId: batch.courseId,
+                userId: 'sample-uid',
+                batchStatus: batch.status
+            };
+            mockLocalCourseService.prepareEnrollCourseRequest = jest.fn(() => (enrollCourseRequest));
+
+            const reqvalues = new Map();
+            reqvalues.set('enrollReq', enrollCourseRequest);
+            mockLocalCourseService.prepareRequestValue = jest.fn(() => (reqvalues));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockCommonUtilService.translateMessage = jest.fn((key, fields) => {
+                switch (key) {
+                    case 'YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL':
+                        return 'YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL';
+                    case 'TRAININGS_ONLY_REGISTERED_USERS':
+                        return 'TRAININGS_ONLY_REGISTERED_USERS';
+                    case 'OVERLAY_SIGN_IN':
+                        return 'OVERLAY_SIGN_IN';
+                }
+            });
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({}))
+            } as any)));
+            mockLocalCourseService.isEnrollable = jest.fn(() => true);
+
+            // act
+            courseBatchesPage.enrollIntoBatch(batch);
+            // assert
+            setTimeout(() => {
+                expect(mockLocalCourseService.prepareEnrollCourseRequest).toHaveBeenCalledWith('sample-uid', batch);
+                expect(mockLocalCourseService.prepareRequestValue).toHaveBeenCalledWith(enrollCourseRequest);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.ENROLL_CLICKED,
+                    Environment.HOME,
+                    PageId.COURSE_BATCHES,
+                    {
+                        id: '',
+                        type: '',
+                        version: '',
+                    },
+                    reqvalues,
+                    {},
+                    []);
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    ImpressionType.VIEW,
+                    '',
+                    PageId.SIGNIN_POPUP,
+                    Environment.HOME,
+                    '',
+                    '',
+                    '',
+                    {},
+                    []);
+                expect(mockPopoverCtrl.create).toHaveBeenCalledWith(expect.objectContaining({
+                    componentProps: expect.objectContaining({
+                        sbPopoverHeading: 'OVERLAY_SIGN_IN',
+                        sbPopoverMainTitle: 'YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL',
+                        metaInfo: 'TRAININGS_ONLY_REGISTERED_USERS',
+                        actionsButtons: expect.arrayContaining([
+                            expect.objectContaining({
+                                btntext: 'OVERLAY_SIGN_IN'
+                            })
+                        ])
+                    })
+                }));
+                done();
+            }, 0);
+        });
+    });
+
+    it('goBack', () => {
+        // arrange
+        mockLocation.back = jest.fn();
+        // act
+        courseBatchesPage.goBack();
+        // assert
+        expect(mockLocation.back).toHaveBeenCalled();
+    });
+
+    it('should dismiss consentPii popup', () => {
+        // arrange
+        const dismissFn = jest.fn(() => Promise.resolve(true));
+        courseBatchesPage.loader = {data: '', dismiss: dismissFn} as any;
+        // act
+        courseBatchesPage.onConsentPopoverShow();
+        // assert
+        expect(courseBatchesPage.loader).toBeUndefined();
+        expect(dismissFn).toHaveBeenCalled();
+    });
+
+    it('shoule invoked after consentPii popup dismissed', () => {
+        courseBatchesPage.onConsentPopoverDismiss();
+    });
+});
diff --git a/src/app/course-batches/course-batches.page.ts b/src/app/course-batches/course-batches.page.ts
index de69c92b3..6458bd961 100644
--- a/src/app/course-batches/course-batches.page.ts
+++ b/src/app/course-batches/course-batches.page.ts
@@ -1,98 +1,63 @@
-import { PreferenceKey } from '@app/app/app.constant';
-import { LoginHandlerService } from './../../services/login-handler.service';
-import { TelemetryGeneratorService } from './../../services/telemetry-generator.service';
-import { Component, Inject, NgZone, OnInit } from '@angular/core';
-import { AuthService, Batch, CourseService, EnrollCourseRequest, OAuthSession, SharedPreferences,
-   Rollup, CorrelationData, TelemetryObject } from 'sunbird-sdk';
-import { Events, NavController, Platform, PopoverController } from '@ionic/angular';
-import { EventTopics } from '../../app/app.constant';
-import { CommonUtilService } from '../../services/common-util.service';
-import { InteractType, InteractSubtype, Environment, PageId, ImpressionType } from '../../services/telemetry-constants';
-import { AppHeaderService } from '../../services/app-header.service';
 import { Location } from '@angular/common';
+import { Component, Inject, NgZone, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
+import { PreferenceKey } from '@app/app/app.constant';
+import { CategoryKeyTranslator } from '@app/pipes/category-key-translator/category-key-translator-pipe';
+import { AppGlobalService } from '@app/services';
+import { ConsentPopoverActionsDelegate, LocalCourseService } from '@app/services/local-course.service';
+import {
+  Platform, PopoverController
+} from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { Subscription } from 'rxjs';
+import {
+  Batch,
+  CorrelationData, Rollup, SharedPreferences,
+  TelemetryObject
+} from 'sunbird-sdk';
+import { EventTopics } from '../../app/app.constant';
+import { AppHeaderService } from '../../services/app-header.service';
+import { CommonUtilService } from '../../services/common-util.service';
+import {
+  Environment, ImpressionType, InteractSubtype, InteractType,
+  PageId
+} from '../../services/telemetry-constants';
 import { SbPopoverComponent } from '../components/popups';
-import { LocalCourseService } from '@app/services/local-course.service';
 import { EnrollCourse } from '../enrolled-course-details-page/course.interface';
+import { LoginHandlerService } from './../../services/login-handler.service';
+import { TelemetryGeneratorService } from './../../services/telemetry-generator.service';
 
 @Component({
   selector: 'app-course-batches',
   templateUrl: './course-batches.page.html',
   styleUrls: ['./course-batches.page.scss'],
 })
-export class CourseBatchesPage implements OnInit {
-
-  /**
-   * Contains user id
-   */
-  public userId: string;
+export class CourseBatchesPage implements OnInit, ConsentPopoverActionsDelegate {
 
-  /**
-   * To hold course indentifier
-   */
-  public identifier: string;
-
-  /**
-   * Loader
-   */
-  public showLoader: boolean;
-
-  /**
-   * Contains upcomming batches list
-   */
   public upcommingBatches: Array<Batch> = [];
-
-  /**
-   * Contains ongoing batches list
-   */
   public ongoingBatches: Array<Batch> = [];
-
-  /**
-   * Flag to check guest user
-   */
-  public isGuestUser = false;
-
-  private backButtonFunc: Subscription;
-  /**
-   * Contains batches list
-   */
-  public batches: Array<Batch> = [];
-
   public todayDate: any;
-  /**
-   * Selected filter
-   */
-  public selectedFilter: string;
+
   headerConfig = {
     showHeader: false,
     showBurgerMenu: false,
     actionButtons: []
   };
-  public showSignInCard = false;
-  course: any;
 
-  public objRollup: Rollup;
-  public corRelationList: Array<CorrelationData>;
-  public telemetryObject: TelemetryObject;
+  public course: any;
+  private userId: string;
+  private isGuestUser = false;
+  private backButtonFunc: Subscription;
+  private objRollup: Rollup;
+  private corRelationList: Array<CorrelationData>;
+  private telemetryObject: TelemetryObject;
+  loader?: HTMLIonLoadingElement;
 
-  /**
-   * Default method of class CourseBatchesComponent
-   *
-   * @param {CourseService} courseService To get batches list
-   * @param {NavController} navCtrl To redirect form one page to another
-   * @param {NavParams} navParams To get url params
-   * @param {NgZone} zone To bind data
-   * @param {AuthService} authService To get logged-in user data
-   */
   constructor(
-    @Inject('AUTH_SERVICE') private authService: AuthService,
-    @Inject('COURSE_SERVICE') private courseService: CourseService,
     @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
+    private appGlobalService: AppGlobalService,
     private popoverCtrl: PopoverController,
     private loginHandlerService: LoginHandlerService,
-    private navCtrl: NavController,
-    // private navParams: NavParams,
     private zone: NgZone,
     private commonUtilService: CommonUtilService,
     private events: Events,
@@ -101,9 +66,10 @@ export class CourseBatchesPage implements OnInit {
     private location: Location,
     private router: Router,
     private platform: Platform,
-    private localCourseService: LocalCourseService
+    private localCourseService: LocalCourseService,
+    private categoryKeyTranslator: CategoryKeyTranslator
   ) {
-    const extrasState  = this.router.getCurrentNavigation().extras.state;
+    const extrasState = this.router.getCurrentNavigation().extras.state;
     if (extrasState) {
       this.ongoingBatches = extrasState.ongoingBatches;
       this.upcommingBatches = extrasState.upcommingBatches;
@@ -111,16 +77,16 @@ export class CourseBatchesPage implements OnInit {
       this.objRollup = extrasState.objRollup;
       this.corRelationList = extrasState.corRelationList;
       this.telemetryObject = extrasState.telemetryObject;
-
     } else {
       this.ongoingBatches = [];
       this.upcommingBatches = [];
     }
   }
 
-  ngOnInit(): void {
-    this.todayDate =  window.dayjs().format('YYYY-MM-DD');
-    this.getUserId();
+  async ngOnInit() {
+    this.todayDate = window.dayjs().format('YYYY-MM-DD');
+    this.userId = await this.appGlobalService.getActiveProfileUid();
+    this.isGuestUser = !this.appGlobalService.isUserLoggedIn();
   }
 
   ionViewWillEnter() {
@@ -132,8 +98,14 @@ export class CourseBatchesPage implements OnInit {
     this.handleBackButton();
   }
 
+  ionViewWillLeave() {
+    if (this.backButtonFunc) {
+      this.backButtonFunc.unsubscribe();
+    }
+  }
+
   private handleBackButton() {
-    this.backButtonFunc =  this.platform.backButton.subscribeWithPriority(10, () => {
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
       this.location.back();
       this.backButtonFunc.unsubscribe();
     });
@@ -143,19 +115,11 @@ export class CourseBatchesPage implements OnInit {
     this.location.back();
   }
 
-  ionViewWillLeave() {
-    if (this.backButtonFunc) {
-      this.backButtonFunc.unsubscribe();
+  async enrollIntoBatch(batch: Batch) {
+    if (!this.localCourseService.isEnrollable([batch], this.course)) {
+      return false;
     }
-  }
-  /**
-   * Enroll logged-user into selected batch
-   *
-   * @param {any} item contains details of select batch
-   */
-
-  async enrollIntoBatch(item: Batch) {
-    const enrollCourseRequest = this.localCourseService.prepareEnrollCourseRequest(this.userId, item);
+    const enrollCourseRequest = this.localCourseService.prepareEnrollCourseRequest(this.userId, batch);
     this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
       InteractSubtype.ENROLL_CLICKED,
       Environment.HOME,
@@ -166,38 +130,39 @@ export class CourseBatchesPage implements OnInit {
     );
 
     if (this.isGuestUser) {
-      this.joinTraining(item);
+      this.joinTraining(batch);
     } else {
-      const loader = await this.commonUtilService.getLoader();
-      await loader.present();
+      this.loader = await this.commonUtilService.getLoader();
+      await this.loader.present();
       const enrollCourse: EnrollCourse = {
         userId: this.userId,
-        batch: item,
+        batch,
         pageId: PageId.COURSE_BATCHES,
-        courseId: undefined,
+        courseId: this.course.identifier,
         telemetryObject: this.telemetryObject,
         objRollup: this.objRollup,
-        corRelationList: this.corRelationList
+        corRelationList: this.corRelationList,
+        channel: this.course.channel,
+        userConsent: this.course.userConsent
       };
 
-      this.localCourseService.enrollIntoBatch(enrollCourse).toPromise()
+      this.localCourseService.enrollIntoBatch(enrollCourse, this).toPromise()
         .then((data: boolean) => {
           this.zone.run(async () => {
-            this.commonUtilService.showToast(this.commonUtilService.translateMessage('COURSE_ENROLLED'));
+            this.commonUtilService.showToast(this.categoryKeyTranslator.transform('FRMELEMNTS_MSG_COURSE_ENROLLED', this.course));
             this.events.publish(EventTopics.ENROL_COURSE_SUCCESS, {
-              batchId: item.id,
-              courseId: item.courseId
+              batchId: batch.id,
+              courseId: batch.courseId
             });
-            await loader.dismiss();
             this.location.back();
           });
         }, async (error) => {
-            await loader.dismiss();
+          await this.loader.dismiss();
         });
     }
   }
 
-  async joinTraining(batchDetails) {
+  private async joinTraining(batchDetails) {
     this.telemetryGeneratorService.generateImpressionTelemetry(ImpressionType.VIEW,
       '', PageId.SIGNIN_POPUP,
       Environment.HOME,
@@ -236,44 +201,17 @@ export class CourseBatchesPage implements OnInit {
         undefined,
         this.objRollup,
         this.corRelationList);
-      this.loginHandlerService.signIn();
+      this.loginHandlerService.signIn({navigateToCourse: true});
     }
   }
-  /**
-   * Get logged-user id. User id is needed to enroll user into batch.
-   */
-  getUserId(): void {
-    this.authService.getSession().subscribe((session: OAuthSession) => {
-      if (!session) {
-        this.zone.run(() => {
-          this.isGuestUser = true;
-        });
-      } else {
-        this.zone.run(() => {
-          this.isGuestUser = false;
-          this.userId = session.userToken;
-          this.getBatchesByCourseId();
-        });
-      }
-    }, () => {
-    });
-  }
 
-
-  /**
-   * To get batches, passed from enrolled-course-details page via navParams
-   */
-  getBatchesByCourseId(): void {
-    this.ongoingBatches = this.ongoingBatches;
-    this.upcommingBatches = this.upcommingBatches;
-    this.objRollup = this.objRollup;
-    this.corRelationList = this.corRelationList;
-    this.telemetryObject = this.telemetryObject;
+  onConsentPopoverShow() {
+    if (this.loader) {
+      this.loader.dismiss();
+      this.loader = undefined;
+    }
   }
 
-  spinner(flag) {
-    this.zone.run(() => {
-      this.showLoader = false;
-    });
-  }
+  onConsentPopoverDismiss() {}
+
 }
diff --git a/src/app/courses/courses.module.ts b/src/app/courses/courses.module.ts
index c687e2ea2..7d2f00c0b 100644
--- a/src/app/courses/courses.module.ts
+++ b/src/app/courses/courses.module.ts
@@ -10,7 +10,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { PipesModule } from '../../pipes/pipes.module';
 import { DirectivesModule } from '@app/directives/directives.module';
 import { ComponentsModule } from '../components/components.module';
-import { CommonConsumptionModule } from '@project-sunbird/common-consumption';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
 
 const routes: Routes = [
   {
diff --git a/src/app/courses/courses.page.html b/src/app/courses/courses.page.html
index aec44a4b8..48fafa28e 100644
--- a/src/app/courses/courses.page.html
+++ b/src/app/courses/courses.page.html
@@ -1,37 +1,76 @@
 <ion-content hide-header-footer overflow-scroll="true" style="background: #efeff4;"
   class="main-container avoid-bottom-tabs-space" scrollEvents="true">
 
-  <ion-refresher slot="fixed" (ionRefresh)="getCourseTabData($event)">
+  <ion-refresher #courseRefresher slot="fixed" (ionRefresh)="getCourseTabData($event)">
     <ion-refresher-content refreshingSpinner="circles"></ion-refresher-content>
   </ion-refresher>
 
   <div *ngIf="showSignInCard" class="enrolled-course-bg">
     <app-sign-in-card [source]="'courses'" (valueChange)="showOfflineWarning($event)"></app-sign-in-card>
   </div>
-
   <div *ngIf="!guestUser" class="pt-8 enrolled-course-bg">
-    <ng-container *ngIf="enrolledCourses && enrolledCourses.length">
-      <sb-course-cards-hlist [title]="'COURSES_IN_PROGRESS' | translate" [type]="courseCardType.MY_COURSE_RECENTLY_VIEWED_CARD_GRID" 
-      [contentList]="enrolledCourses" [viewMoreButtonText]="'VIEW_ALL' | translate" 
-      (viewMoreClick)="navigateToViewMoreContentsPage(true)" (cardClick)="openEnrolledCourseDetails($event)"></sb-course-cards-hlist>
-    </ng-container>
     <ng-container *ngIf="showLoader && enrolledCourses && enrolledCourses.length === 0">
-      <sb-course-cards-hlist [type]="courseCardType.MY_COURSE_RECENTLY_VIEWED_CARD_GRID" [isLoading]="showLoader"></sb-course-cards-hlist>
+      <sb-course-cards-hlist [type]="courseCardType.MY_COURSE_RECENTLY_VIEWED_CARD_GRID" [isLoading]="showLoader">
+      </sb-course-cards-hlist>
     </ng-container>
   </div>
-
-  <div *ngFor="let section of popularAndLatestCourses; let i=index;">
-    <div *ngIf="section?.contents?.length" class="course-card-pd" [ngClass]="{'course-grid-bg': i%2 !== 0}">
-      <sb-course-cards-hlist [title]="section?.name" [type]="courseCardType.COURSE_CARD_GRID" [viewMoreButtonText]="'VIEW_ALL' | translate"
-      [contentList]="section?.contents" (viewMoreClick)="navigateToViewMoreContentsPage(false, section.id, section.searchQuery, section.name)"
-      [maxCardCount]="9" (cardClick)="openCourseDetails($event, section, i)" [multiRow]="section?.contents?.length > 3"></sb-course-cards-hlist>
+  <div *ngFor="let section of dynamicCourses">
+    <div *ngIf="!guestUser && section?.theme?.component === 'sb-course-cards-hlist'" class="pt-8 enrolled-course-bg">
+      <ng-container *ngIf="section?.theme?.component === 'sb-course-cards-hlist'">
+        <ng-container *ngFor="let subSection of section?.data?.sections">
+          <ng-container *ngIf="subSection?.contents?.length">
+            <sb-course-cards-hlist
+              [title]="(section?.title) | translateJson"
+              [type]="section?.theme?.inputs?.type || courseCardType.MY_COURSE_RECENTLY_VIEWED_CARD_GRID"
+              [contentList]="subSection.contents"
+              [hideProgress]="section?.theme?.inputs?.hideProgress || true"
+              [viewMoreButtonText]="(section?.theme?.inputs?.viewMoreButtonText | translateJson) || ('VIEW_ALL' | translate)"
+              [maxCardCount]="section?.theme?.inputs?.maxCardCount || 10"
+              (viewMoreClick)="navigateToViewMoreContentsPage(true)"
+              (cardClick)="openEnrolledCourseDetails($event)">
+            </sb-course-cards-hlist>
+          </ng-container>
+        </ng-container>
+      </ng-container>
+    </div>
+    <div *ngIf="section.theme.component === 'sb-library-cards-stack'">
+      <div class="section-header-style" *ngIf="section?.data.sections.length">{{section?.title | translateJson}}</div>
+      <div *ngFor="let section of section?.data.sections; let i=index">
+        <div *ngIf="section?.contents?.length" class="sb-textbook-container">
+          <sb-library-cards-stack [title]="section?.name" [contentList]="section?.contents"
+            [isOffline]="!commonUtilService.networkInfo.isNetworkAvailable"
+            [viewMoreButtonText]="'VIEW_MORE' | translate" [maxCardCount]="3"
+            (viewMoreClick)="navigateToTextbookPage(section?.contents, section.name)"
+            (cardClick)="openCourseDetails($event, section, i)" [isLoading]="showLoader">
+          </sb-library-cards-stack>
+        </div>
+      </div>
     </div>
   </div>
-  <div *ngIf="pageApiLoader && popularAndLatestCourses && popularAndLatestCourses.length === 0">
-    <div *ngFor="let section of [1,2,3,4]; let i=index;">
-      <div class="course-card-pd" [ngClass]="{'course-grid-bg': i%2 !== 0}">
-        <sb-course-cards-hlist [multiRow]="true" [type]="courseCardType.COURSE_CARD_GRID" [isLoading]="pageApiLoader"></sb-course-cards-hlist>
+
+  <ion-list class="m-n" *ngIf="showLoader && popularAndLatestCourses && popularAndLatestCourses.length === 0">
+    <app-skeleton-item height="16px" width="40%" style="padding: 16px;"></app-skeleton-item>
+    <ion-item *ngFor="let i of [0,1,2,3,4,5,6,7,8]" class="animation-background">
+      <ion-avatar item-start>
+        <app-skeleton-item height="72px" width="72px"></app-skeleton-item>
+      </ion-avatar>
+      <ion-label style="padding-left: 40px;">
+        <app-skeleton-item height="12px" width="67%" style="padding-bottom: 8px;"></app-skeleton-item>
+        <app-skeleton-item height="12px" width="47%" style="padding-bottom: 8px;"></app-skeleton-item>
+      </ion-label>
+    </ion-item>
+  </ion-list>
+
+  <div *ngIf="isCourseListEmpty" class="ion-text-center ion-padding">
+    <div class="sb-nodownloads-container" *ngIf="commonUtilService?.networkInfo?.isNetworkAvailable">
+      <div class="text-center">
+        <img style="width: 30%;" src="./assets/imgs/group.svg" alt="">
       </div>
+      <div class="text-center">
+        <p class="sub-heading">{{'FRMELEMNTS_LBL_CONTENT_TO_BE_ADDED' | translate }}</p>
+        <ion-button class="explore-more-content" expand="block" fill="outline" (click)="exploreOtherContents()">
+          {{'FRMELEMENTS_LBL_SEE_MORE_COURSES' | translate}} </ion-button>
+      </div>  
     </div>
   </div>
 
@@ -61,4 +100,4 @@ <h6 color="secondary_black">
   <div class="backdrop-footer" *ngIf="downloadPercentage !== 100">
     <ion-button size="small" (click)="cancelDownload()">{{'CANCEL' | translate}}</ion-button>
   </div>
-</ion-backdrop>
+</ion-backdrop>
\ No newline at end of file
diff --git a/src/app/courses/courses.page.scss b/src/app/courses/courses.page.scss
index 63ee25c42..e0bc272d6 100644
--- a/src/app/courses/courses.page.scss
+++ b/src/app/courses/courses.page.scss
@@ -1,6 +1,7 @@
 @import "src/assets/styles/base/_variables.scss";
 @import "src/assets/styles/_custom-mixins.scss";
 @import "src/assets/styles/fonts.scss";
+@import "src/assets/styles/_variables.scss";
 :host {
   .loading-backdrop {
     .backdrop-container {
@@ -19,7 +20,7 @@
       @include padding(null, null, 16px, null !important);
     }
 
-    background-color: #ffffff;
+    background-color: map-get($colors, white);
     height: 100%;
     z-index: 1000;
     opacity: 1 !important;
@@ -37,7 +38,7 @@
   }
   .inprogress-courses {
     .bottom-container {
-      background: #efeff4;
+      background: map-get($colors, gray_white);
     }
   }
   .scroll-heading {
@@ -58,14 +59,14 @@
     // @include text-align('end');
   }
   .course-scroll-holder {
-    background-color: #fdfefe;
+    background-color: map-get($colors, white_fe);
   }
   .toolbar-title-md {
     margin-left: -5px !important;
     @include margin(null, null, null, -5px !important);
   }
   .course-page-color {
-    background: #efeff4;
+    background: map-get($colors, gray_white);
   }
   .padding-11 {
     @include padding(11px);
@@ -75,7 +76,7 @@
     height: 134px;
   }
   .devider-line {
-    background: #efeff4;
+    background: map-get($colors, gray_white);
     height: 7px;
   }
 
@@ -86,7 +87,7 @@
   ion-select {
     max-width: 75%;
     font-size: 14px;
-    color: #488aff;
+    color: map-get($colors, vived_blue_ff);
     @extend .font-weight-bold;
   }
   /* To give some space between the icons in the header */
@@ -111,14 +112,26 @@
   }
 
   .enrolled-course-bg {
-    background: linear-gradient(#008840, #008840 100px, white 100px, white 100%);
+    background: linear-gradient($green, $green 100px, white 100px, white 100%);
   }
 
   .course-grid-bg{
-    background-color: #E0F5EA;
+    background-color: map-get($colors, pale_green_e0);
   }
 
   .course-card-pd{
     padding: 1px 0 12px;
   }
+
+  .section-header-style{
+    margin-left: 10px;
+    font-weight: 700;
+    font-size: 18px;
+    padding-top: 14px;
+    padding-bottom: 4px;
+  }
+  .animation-background {
+    padding: 0 8px 0 8px;
+    background-color: map-get($colors, white_f2);
+  }
 }
\ No newline at end of file
diff --git a/src/app/courses/courses.page.spec.ts b/src/app/courses/courses.page.spec.ts
index ec99323f5..3abb30eb9 100644
--- a/src/app/courses/courses.page.spec.ts
+++ b/src/app/courses/courses.page.spec.ts
@@ -1,57 +1,76 @@
-import { CoursesPage } from './courses.page';
-import { FormAndFrameworkUtilService } from '../../services/formandframeworkutil.service';
-import { AppVersion } from '@ionic-native/app-version/ngx';
-import { NgZone } from '@angular/core';
-import { SunbirdQRScanner } from '../../services/sunbirdqrscanner.service';
-import { PopoverController, Events, ToastController } from '@ionic/angular';
-import { AppGlobalService } from '../../services/app-global-service.service';
-import { CourseUtilService } from '../../services/course-util.service';
-import { CommonUtilService } from '../../services/common-util.service';
-import { TelemetryGeneratorService } from '../../services/telemetry-generator.service';
-import { Network } from '@ionic-native/network/ngx';
-import { Router } from '@angular/router';
-import { AppHeaderService } from '../../services/app-header.service';
-import { PageId } from '../../services/telemetry-constants';
+import {CoursesPage} from './courses.page';
+import {FormAndFrameworkUtilService} from '../../services/formandframeworkutil.service';
+import {AppVersion} from '@ionic-native/app-version/ngx';
+import {NgZone} from '@angular/core';
+import {SunbirdQRScanner} from '../../services/sunbirdqrscanner.service';
+import {PopoverController, ToastController} from '@ionic/angular';
+import {Events} from '@app/util/events';
+import {AppGlobalService} from '../../services/app-global-service.service';
+import {CourseUtilService} from '../../services/course-util.service';
+import {CommonUtilService} from '../../services/common-util.service';
+import {TelemetryGeneratorService} from '../../services/telemetry-generator.service';
+import {Network} from '@ionic-native/network/ngx';
+import {Router} from '@angular/router';
+import {AppHeaderService} from '../../services/app-header.service';
+import {Environment, InteractSubtype, InteractType, PageId} from '../../services/telemetry-constants';
 import {
-    ContentService, Course, PageAssembleCriteria, CourseBatchStatus,
-    CourseService, EventsBusService, CourseEnrollmentType,
-    PageAssembleService, SharedPreferences, FrameWorkService
+    Content,
+    ContentService,
+    Course,
+    CourseBatchStatus,
+    CourseEnrollmentType,
+    CourseService,
+    EventsBusService,
+    FrameWorkService,
+    PageAssembleCriteria,
+    PageAssembleService,
+    ProfileType,
+    SharedPreferences
 } from 'sunbird-sdk';
-import { of, throwError } from 'rxjs';
-import { PageName, ContentCard, BatchConstants } from '../app.constant';
-import { LocalCourseService } from '../../services/local-course.service';
+import {of, throwError} from 'rxjs';
+import {BatchConstants, ContentCard, PageName} from '../app.constant';
+import {SbProgressLoader} from '../../services/sb-progress-loader.service';
+import {CsNetworkError} from '@project-sunbird/client-services/core/http-service';
+import { NavigationService } from '../../services/navigation-handler.service';
+import { ContentAggregatorHandler } from '../../services/content/content-aggregator-handler.service';
+import { ProfileHandler } from '../../services/profile-handler';
+import { FrameworkUtilService, ProfileService } from '@project-sunbird/sunbird-sdk';
+import { TranslateService } from '@ngx-translate/core';
 
 describe('CoursesPage', () => {
     let coursesPage: CoursesPage;
-    const mockAppGlobalService: Partial<AppGlobalService> = {};
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+    };
     const mockAppVersion: Partial<AppVersion> = {
         getAppName: jest.fn(() => Promise.resolve('sunbird'))
     };
     const mockCommonUtilService: Partial<CommonUtilService> = {};
     const mockContentService: Partial<ContentService> = {};
-    const mockCourseService: Partial<CourseService> = {
-
-    };
-    const mockFrameworkService: Partial<FrameWorkService> = {
-
+    const mockCourseService: Partial<CourseService> = {};
+    const mockProfileService: Partial<ProfileService> = {
+        getActiveSessionProfile: jest.fn(() => of({ profileType: 'Student'} as any))
     };
+    const mockFrameworkService: Partial<FrameWorkService> = {};
     const mockCourseUtilService: Partial<CourseUtilService> = {};
-    const mockEventBusService: Partial<EventsBusService> = {
-        // events: jest.fn(() => of({
-        //     subscribe: jest.fn(() => ({closed: true}))
-        // }))
-    };
+    const mockEventBusService: Partial<EventsBusService> = {};
     const mockEvents: Partial<Events> = {
         subscribe: jest.fn()
     };
-    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {};
+    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {
+        getCourseFilterConfig: jest.fn(() => Promise.resolve())
+    };
     const mockHeaderService: Partial<AppHeaderService> = {};
     const mockNetwork: Partial<Network> = {};
     const mockNgZone: Partial<NgZone> = {
         run: jest.fn((fn) => fn())
     };
     const mockPageService: Partial<PageAssembleService> = {};
-    const mockPopCtrl: Partial<PopoverController> = {};
+    const mockPopCtrl: Partial<PopoverController> = {
+        create: jest.fn(() => Promise.resolve({
+            present: jest.fn(),
+            onDidDismiss: jest.fn(() => Promise.resolve({ data: {} }))
+        }) as any)
+    };
     const mockPreferences: Partial<SharedPreferences> = {
         getString: jest.fn(() => of('{"body": {"identifier": "do_123"}}'))
     };
@@ -61,16 +80,36 @@ describe('CoursesPage', () => {
         generateExtraInfoTelemetry: jest.fn()
     };
     const mockToastController: Partial<ToastController> = {};
-    const mockLocalCourseService: Partial<LocalCourseService> = {};
+    const mockSbProgressLoader: Partial<SbProgressLoader> = {
+        hide: jest.fn()
+    };
+    const mockNavService: Partial<NavigationService> = {
+        navigateToTrackableCollection: jest.fn(),
+        navigateToCollection: jest.fn(),
+        navigateToContent: jest.fn()
+    };
+    const mockContentAggregatorHandler: Partial<ContentAggregatorHandler> = {};
+    const mockProfileHandler: Partial<ProfileHandler> = {
+        getAudience: jest.fn(() => Promise.resolve(['Student']))
+    };
+
+    const mockFrameworkUtilService: Partial<FrameworkUtilService> = {
+        getFrameworkCategoryTerms: jest.fn(() => of([]))
+    };
+
+    const mockTranslateService: Partial<TranslateService> = {
+        currentLang: 'en'
+    };
 
     beforeAll(() => {
         coursesPage = new CoursesPage(
             mockEventBusService as EventsBusService,
-            mockPageService as PageAssembleService,
             mockPreferences as SharedPreferences,
             mockCourseService as CourseService,
             mockContentService as ContentService,
             mockFrameworkService as FrameWorkService,
+            mockProfileService as ProfileService,
+            mockFormAndFrameworkUtilService as FrameworkUtilService,
             mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
             mockAppVersion as AppVersion,
             mockNgZone as NgZone,
@@ -85,7 +124,11 @@ describe('CoursesPage', () => {
             mockRouter as Router,
             mockToastController as ToastController,
             mockHeaderService as AppHeaderService,
-            mockLocalCourseService as LocalCourseService
+            mockSbProgressLoader as SbProgressLoader,
+            mockNavService as NavigationService,
+            mockContentAggregatorHandler as ContentAggregatorHandler,
+            mockProfileHandler as ProfileHandler,
+            mockTranslateService as Trans
         );
     });
 
@@ -97,27 +140,59 @@ describe('CoursesPage', () => {
         expect(coursesPage).toBeTruthy();
     });
 
+    describe('getAggregatorResult', () => {
+        it('should return course for loggedIn user', (done) => {
+            jest.spyOn(coursesPage, 'spinner').mockImplementation();
+            mockContentAggregatorHandler.newAggregate = jest.fn(() => {
+                Promise.resolve([{
+                        orientation: 'horaizontal',
+                        section: {
+                            sections: [{name: 'sample-name'}]
+                    }
+                }]);
+            }) as any;
+            // act
+            coursesPage.getAggregatorResult();
+            setTimeout(() => {
+                expect(mockContentAggregatorHandler.newAggregate).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should return course for guest user', (done) => {
+            jest.spyOn(coursesPage, 'spinner').mockImplementation();
+            mockContentAggregatorHandler.newAggregate = jest.fn(() => {
+                Promise.resolve([{
+                        orientation: 'horaizontal',
+                        section: {
+                            sections: [{name: 'sample-name'}]
+                    }
+                }]);
+            }) as any;
+            // act
+            coursesPage.getAggregatorResult();
+            setTimeout(() => {
+                expect(mockContentAggregatorHandler.newAggregate).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
     describe('ngOnInit', () => {
         it('should return enrolledCourse data and course tab data by invoked ngOnIt', (done) => {
             // arrange
             jest.spyOn(coursesPage, 'getCourseTabData').mockReturnValue();
-            const param = { isOnBoardingCardCompleted: true, contentId: 'do_123' };
+            const param = {isOnBoardingCardCompleted: true, contentId: 'do_123'};
             mockEvents.subscribe = jest.fn((_, fn) => fn(param));
-            mockAppGlobalService.setEnrolledCourseList = jest.fn();
-            const course: Course[] = [{
-                identifier: 'do_0123'
-            }];
-            mockCourseService.getEnrolledCourses = jest.fn(() => of(course));
-            mockCommonUtilService.getContentImg = jest.fn();
+            jest.spyOn(coursesPage, 'getAggregatorResult').mockImplementation(() => {
+                return Promise.resolve();
+            });
             // act
             coursesPage.ngOnInit();
             // assert
             setTimeout(() => {
                 expect(coursesPage.getCourseTabData).toHaveBeenCalled();
                 expect(mockEvents.subscribe).toHaveBeenCalled();
-                expect(mockCommonUtilService.getContentImg).toHaveBeenCalled();
-                expect(mockAppGlobalService.setEnrolledCourseList).toHaveBeenCalled();
-                expect(mockCourseService.getEnrolledCourses).toHaveBeenCalledWith({ returnFreshCourses: false, userId: undefined });
                 done();
             }, 0);
         });
@@ -125,16 +200,17 @@ describe('CoursesPage', () => {
         it('should not return enrolledCourse data if data is available by invoked ngOnIt', (done) => {
             // arrange
             jest.spyOn(coursesPage, 'getCourseTabData').mockReturnValue();
-            const param = { isOnBoardingCardCompleted: true, contentId: 'do_123' };
+            const param = {isOnBoardingCardCompleted: true, contentId: 'do_123'};
             mockEvents.subscribe = jest.fn((_, fn) => fn(param));
-            mockCourseService.getEnrolledCourses = jest.fn(() => of(undefined));
+            jest.spyOn(coursesPage, 'getAggregatorResult').mockImplementation(() => {
+                return Promise.resolve();
+            });
             // act
             coursesPage.ngOnInit();
             // assert
             setTimeout(() => {
                 expect(coursesPage.getCourseTabData).toHaveBeenCalled();
                 expect(mockEvents.subscribe).toHaveBeenCalled();
-                expect(mockCourseService.getEnrolledCourses).toHaveBeenCalledWith({ returnFreshCourses: false, userId: undefined });
                 done();
             }, 0);
         });
@@ -142,45 +218,105 @@ describe('CoursesPage', () => {
         it('should return enrolledCourse data if enrolledCourses length is zero by invoked ngOnIt', (done) => {
             // arrange
             jest.spyOn(coursesPage, 'getCourseTabData').mockReturnValue();
-            const param = { isOnBoardingCardCompleted: true, contentId: 'do_123' };
+            const param = {isOnBoardingCardCompleted: true, contentId: 'do_123'};
             mockEvents.subscribe = jest.fn((_, fn) => fn(param));
             const course: Course[] = [];
-            mockCourseService.getEnrolledCourses = jest.fn(() => of(course));
+            jest.spyOn(coursesPage, 'getAggregatorResult').mockImplementation(() => {
+                return Promise.resolve();
+            });
             // act
             coursesPage.ngOnInit();
             // assert
             setTimeout(() => {
                 expect(coursesPage.getCourseTabData).toHaveBeenCalled();
                 expect(mockEvents.subscribe).toHaveBeenCalled();
-                expect(mockCourseService.getEnrolledCourses).toHaveBeenCalledWith({ returnFreshCourses: false, userId: undefined });
                 done();
             }, 0);
         });
+    });
+
+    it('should generate telemetry and navigate to search page', (done) => {
+        // arrange
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        mockFormAndFrameworkUtilService.getSupportedContentFilterConfig = jest.fn(() => Promise.resolve(['sample1', 'sample2']));
+        mockRouter.navigate = jest.fn();
+        // act
+        coursesPage.search();
+        // assert
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.TOUCH,
+            InteractSubtype.SEARCH_BUTTON_CLICKED,
+            Environment.HOME,
+            PageId.COURSES);
+        setTimeout(() => {
+            expect(mockFormAndFrameworkUtilService.getSupportedContentFilterConfig).toHaveBeenCalled();
+            expect(mockRouter.navigate).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
 
-        it('should return error enrolledCourse data by invoked ngOnIt', (done) => {
+
+    describe('handleHeaderEvents', () => {
+        it('should trigger search() if event name receives search', (done) => {
             // arrange
-            jest.spyOn(coursesPage, 'getCourseTabData').mockReturnValue();
-            const param = { isOnBoardingCardCompleted: true, contentId: 'do_123' };
-            mockEvents.subscribe = jest.fn((_, fn) => fn(param));
-            mockAppGlobalService.setEnrolledCourseList = jest.fn();
-            const course: Course[] = [{
-                identifier: 'do_0123'
+            jest.spyOn(coursesPage, 'search').mockImplementation();
+            // act
+            coursesPage.handleHeaderEvents({name: 'search'});
+            // assert
+            setTimeout(() => {
+                expect(coursesPage.search).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+        it('should trigger showFilter() if event name receives search', () => {
+            // arrange
+            let data = [{
+                selected: [1,2]
             }];
-            mockCourseService.getEnrolledCourses = jest.fn(() => throwError(course));
+            jest.spyOn(coursesPage, 'showFilter');
+            coursesPage.resetCourseFilter = true;
+            mockFormAndFrameworkUtilService.getCourseFilterConfig = jest.fn(() => Promise.resolve(data))
             // act
-            coursesPage.ngOnInit();
+            coursesPage.handleHeaderEvents({name: 'filter'});
+            // assert
+            expect(coursesPage.showFilter).toHaveBeenCalled();
+        });
+
+        it('call showFilter method', () => {
+            // arrange
+            jest.spyOn(coursesPage, 'showFilter').mockImplementation();
+            coursesPage.resetCourseFilter = true;
+            // act
+            coursesPage.handleHeaderEvents({name: 'filter'});
+            // assert
+            expect(coursesPage.showFilter).toHaveBeenCalled();
+        });
+
+        it('should trigger redirectToActivedownloads() if event name receives search', (done) => {
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockRouter.navigate = jest.fn();
+            // act
+            coursesPage.handleHeaderEvents({name: 'download'});
             // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.ACTIVE_DOWNLOADS_CLICKED,
+                Environment.HOME,
+                PageId.COURSES
+            );
             setTimeout(() => {
-                expect(coursesPage.getCourseTabData).toHaveBeenCalled();
-                expect(mockEvents.subscribe).toHaveBeenCalled();
-                expect(mockCourseService.getEnrolledCourses).toHaveBeenCalledWith({ returnFreshCourses: false, userId: undefined });
+                expect(mockRouter.navigate).toHaveBeenCalled();
                 done();
             }, 0);
         });
     });
 
+
     it('should handle header service by invoked ionViewWillEnter', () => {
         // arrange
+        coursesPage.refresher = {
+            disabled: true
+        } as any;
         mockEvents.subscribe = jest.fn((_, fn) => fn());
         mockHeaderService.showHeaderWithHomeButton = jest.fn();
         const data = jest.fn((fn => fn()));
@@ -188,6 +324,9 @@ describe('CoursesPage', () => {
             subscribe: data
         } as any;
         jest.spyOn(coursesPage, 'handleHeaderEvents').mockReturnValue();
+        jest.spyOn(coursesPage, 'getAggregatorResult').mockImplementation(() => {
+            return Promise.resolve();
+        });
         // act
         coursesPage.ionViewWillEnter();
         // assert
@@ -200,35 +339,40 @@ describe('CoursesPage', () => {
         it('should start qrScanner if pageId is course', () => {
             // arrange
             const isOnboardingComplete = coursesPage.isOnBoardingCardCompleted = true;
-            const data = { pageName: 'courses' };
+            const data = {pageName: 'courses'};
             mockAppGlobalService.generateConfigInteractEvent = jest.fn();
             mockEvents.subscribe = jest.fn((_, fn) => fn(data));
             mockQrScanner.startScanner = jest.fn(() => Promise.resolve('start'));
+            mockSbProgressLoader.hide = jest.fn();
             // act
             coursesPage.ionViewDidEnter();
             // assert
             expect(mockAppGlobalService.generateConfigInteractEvent).toHaveBeenCalledWith(PageId.COURSES, isOnboardingComplete);
             expect(mockEvents.subscribe).toHaveBeenCalled();
             expect(mockQrScanner.startScanner).toHaveBeenCalledWith(PageId.COURSES, false);
+            expect(mockSbProgressLoader.hide).toHaveBeenCalled();
         });
 
         it('should not start qrScanner if pageId is not course', () => {
             // arrange
             const isOnboardingComplete = coursesPage.isOnBoardingCardCompleted = true;
-            const data = { pageName: 'library' };
+            const data = {pageName: 'library'};
             mockAppGlobalService.generateConfigInteractEvent = jest.fn();
             mockEvents.subscribe = jest.fn((_, fn) => fn(data));
+            mockSbProgressLoader.hide = jest.fn();
             // act
             coursesPage.ionViewDidEnter();
             // assert
             expect(mockAppGlobalService.generateConfigInteractEvent).toHaveBeenCalledWith(PageId.COURSES, isOnboardingComplete);
             expect(mockEvents.subscribe).toHaveBeenCalled();
+            expect(mockSbProgressLoader.hide).toHaveBeenCalled();
         });
     });
 
     describe('ionViewWillLeave', () => {
         it('should unsubscribe eventservice and headerObservable by invoked ionViewWillLeave', () => {
             // arrange
+            coursesPage.refresher = {disabled: true};
             coursesPage.headerObservable = true;
             coursesPage.headerObservable = {
                 unsubscribe: jest.fn(() => true)
@@ -269,229 +413,210 @@ describe('CoursesPage', () => {
         expect(mockTelemetryGeneratorService.generateExtraInfoTelemetry).toHaveBeenCalledWith(values, PageId.LIBRARY);
     });
 
-    describe('getPopularAndLatestCourses', () => {
-        it('should return pageAssemble data when PageAssembleCriteria is undefined', (done) => {
-            const rqst = { filters: {}, mode: 'soft', name: 'Course', source: 'app' };
-            coursesPage.appliedFilter = '';
-            mockPageService.getPageAssemble = jest.fn(() => throwError('NOT_FOUND'));
-            coursesPage.selectedLanguage = 'en';
-            // act
-            coursesPage.getPopularAndLatestCourses(false);
-            // assert
-            setTimeout(() => {
-                expect(mockPageService.getPageAssemble).toHaveBeenCalled();
-                done();
-            }, 0);
-        });
+    describe('getContentDetails', () => {
+        it('should call contentService getContentDetails check if available locally or not', (done) => {
+            // arrange
+            const mockCourse: Course = {
+                contentId: 'do123',
+                batchId: '0987655',
+                content: {
+                    pkgVersion: 2
+                }
+            };
+            const mockContent: Content = {
+                isAvailableLocally: true,
+                contentData: {
+                    pkgVersion: 1
+                },
 
-        it('should return pageAssemble data when PageAssembleCriteria is not undefined', (done) => {
-            const rqst = { filters: {}, mode: 'soft', name: 'Course', source: 'app' };
-            coursesPage.appliedFilter = { board: 'cbsc', medium: 'english' };
-            mockPageService.getPageAssemble = jest.fn(() => of({
-                sections: [{
-                    display: '{"name": {"en": "example"}}',
-                    contents: [{identifier: 'sample_id'}]
-                }]
+            };
+            mockContentService.getContentDetails = jest.fn(() => of(mockContent));
+            mockEventBusService.events = jest.fn(() => of({
+                type: 'PROGRESS',
+                payload: {
+                    identifier: 'do123',
+                    progress: 100
+                }
             }));
-            coursesPage.selectedLanguage = 'en';
-            const values = new Map();
-            values['pageSectionCount'] = 1;
-            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
-            mockTelemetryGeneratorService.generateExtraInfoTelemetry = jest.fn();
-            mockCommonUtilService.getContentImg = jest.fn();
-            // mockTelemetryGeneratorService.generateExtraInfoTelemetry = jest.fn();
-            jest.spyOn(coursesPage, 'checkEmptySearchResult').mockReturnValue();
+            mockNgZone.run = jest.fn((fn) => fn());
+            mockCourseUtilService.getImportContentRequestBody = jest.fn(() => [{
+                isChildContent: true,
+                destinationFolder: './///',
+                contentId: 'do123',
+                correlationData: [{id: 'do123', type: 'resource'}],
+                rollup: {l1: 'do123'}
+            }]);
+            mockContentService.importContent = jest.fn(() => of([
+                {identifier: 'do123', status: 1}, {identifier: 'do1234', status: 0}
+            ]));
+            mockCommonUtilService.showToast = jest.fn();
+            coursesPage.tabBarElement = {style: {display: 'flex'}};
             // act
-            coursesPage.getPopularAndLatestCourses(false);
+            coursesPage.getContentDetails(mockCourse);
             // assert
             setTimeout(() => {
-                expect(mockPageService.getPageAssemble).toHaveBeenCalled();
-                expect(mockCommonUtilService.getContentImg).toHaveBeenCalled();
-                expect(mockTelemetryGeneratorService.generateExtraInfoTelemetry).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('COURSE_NOT_AVAILABLE');
                 done();
             }, 0);
         });
 
-        it('should applied filter for latest course data', (done) => {
-            const requestPageFilter: PageAssembleCriteria = {
-                name: PageName.COURSE,
-                source: 'app',
-                filters: {
-                    board: ['cbsc', 'assam'],
-                    medium: ['english', 'hindi'],
-                    grade: ['class 1', 'class 2'],
-                    subject: ['math', 'phy']
+        it('should check payload if import completed and download percentage is 100', (done) => {
+            // arrange
+            const mockCourse: Course = {
+                contentId: 'do123',
+                batchId: '0987655',
+                content: {
+                    pkgVersion: 2
+                }
+            };
+            const mockContent: Content = {
+                isAvailableLocally: true,
+                contentData: {
+                    pkgVersion: 1
                 },
-                mode: 'soft'
-            };
-            coursesPage.profile = {
-                board: ['cbsc', 'assam'],
-                medium: ['english', 'hindi'],
-                grade: ['class 1', 'class 2'],
-                subject: ['math', 'phy']
-            };
-            const rqst = { filters: {}, mode: 'soft', name: 'Course', source: 'app' };
-            coursesPage.appliedFilter = { board: 'cbsc', medium: 'english' };
-            mockPageService.getPageAssemble = jest.fn(() => of({
-                sections: [{
-                    display: '{"name": {"en": "example"}}',
-                    contents: [{ identifier: 'sample_id' }]
-                }]
+
+            };
+            mockEventBusService.events = jest.fn(() => of({
+                type: 'IMPORT_COMPLETED',
+                payload: {
+                    identifier: 'do123',
+                    progress: 100
+                }
             }));
-            coursesPage.selectedLanguage = 'hindi';
-            const values = new Map();
-            values['pageSectionCount'] = 1;
-            mockCommonUtilService.networkInfo = {isNetworkAvailable: false};
-            mockTelemetryGeneratorService.generateExtraInfoTelemetry = jest.fn();
-            jest.spyOn(coursesPage, 'checkEmptySearchResult').mockReturnValue();
-            mockAppGlobalService.getNameForCodeInFramework = jest.fn();
+            coursesPage.resumeContentData = mockCourse;
+            coursesPage.downloadPercentage = 100;
+            mockRouter.navigate = jest.fn();
+            mockNgZone.run = jest.fn((fn) => fn());
+            mockContentService.getContentDetails = jest.fn(() => of(mockContent));
+            mockCourseUtilService.getImportContentRequestBody = jest.fn(() => [{
+                isChildContent: true,
+                destinationFolder: './///',
+                contentId: 'do123',
+                correlationData: [{id: 'do123', type: 'resource'}],
+                rollup: {l1: 'do123'}
+            }]);
+            mockContentService.importContent = jest.fn(() => throwError('error'));
+            mockCommonUtilService.showToast = jest.fn();
+            coursesPage.tabBarElement = {style: {display: 'flex'}};
             // act
-            coursesPage.getPopularAndLatestCourses(true, requestPageFilter);
+            coursesPage.getContentDetails(mockCourse);
             // assert
             setTimeout(() => {
-                expect(mockPageService.getPageAssemble).toHaveBeenCalled();
-                expect(mockTelemetryGeneratorService.generateExtraInfoTelemetry).toHaveBeenCalled();
+                expect(mockRouter.navigate).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('COURSE_NOT_AVAILABLE');
                 done();
             }, 0);
         });
 
-        it('should applied filter for latest course data if board medium and grade are undefined', (done) => {
-            const requestPageFilter: PageAssembleCriteria = {
-                name: PageName.COURSE,
-                source: 'app',
-                filters: {
-                    board: ['cbsc', 'assam'],
-                    medium: ['english', 'hindi'],
-                    grade: ['class 1', 'class 2'],
-                    subject: ['math', 'phy']
-                },
-                mode: 'soft'
+        it('navigate to details if data is available locally but pkgVersion is different', (done) => {
+            // arrange
+            const mockCourse: Course = {
+                contentId: 'do123',
+                batchId: '0987655',
+                content: {
+                    pkgVersion: 1
+                }
             };
-            coursesPage.profile = {
-                board: [],
-                medium: [],
-                grade: [],
-                subject: []
+            const mockContent: Content = {
+                isAvailableLocally: true,
+                contentData: {
+                    pkgVersion: 2
+                },
+
             };
-            coursesPage.appliedFilter = undefined;
-            mockPageService.getPageAssemble = jest.fn(() => of({
-                sections: [{ display: '{}' }]
-            }));
-            coursesPage.selectedLanguage = 'hindi';
-            jest.spyOn(coursesPage, 'generateExtraInfoTelemetry').mockReturnValue();
-            jest.spyOn(coursesPage, 'checkEmptySearchResult').mockReturnValue();
-            mockAppGlobalService.getNameForCodeInFramework = jest.fn();
+            mockContentService.getContentDetails = jest.fn(() => of(mockContent));
+            mockRouter.navigate = jest.fn();
             // act
-            coursesPage.getPopularAndLatestCourses(true, requestPageFilter);
+            coursesPage.getContentDetails(mockCourse);
             // assert
             setTimeout(() => {
-                expect(mockPageService.getPageAssemble).toHaveBeenCalled();
+                expect(mockContentService.getContentDetails).toHaveBeenCalled();
+                expect(mockRouter.navigate).toHaveBeenCalled();
                 done();
             }, 0);
         });
 
-        it('should applied filter for latest course data for pageService error part of connection-error', (done) => {
-            const requestPageFilter: PageAssembleCriteria = {
-                name: PageName.COURSE,
-                source: 'app',
-                filters: {
-                    board: ['cbsc', 'assam'],
-                    medium: ['english', 'hindi'],
-                    grade: ['class 1', 'class 2'],
-                    subject: ['math', 'phy']
+        it('should go to else part and call contentDetailsImportCall', (done) => {
+            // arrange
+            const mockCourse: Course = {
+                identifier: 'do123',
+                content: {
+                    pkgVersion: 2
+                }
+            };
+            const mockContent: Content = {
+                isAvailableLocally: false,
+                contentData: {
+                    pkgVersion: 1
                 },
-                mode: 'soft'
-            };
-            coursesPage.profile = {
-                board: [],
-                medium: [],
-                grade: [],
-                subject: []
-            };
-            const rqst = { filters: {}, mode: 'soft', name: 'Course', source: 'app' };
-            coursesPage.appliedFilter = undefined;
-            mockPageService.getPageAssemble = jest.fn(() => throwError('CONNECTION_ERROR'));
-            coursesPage.selectedLanguage = 'hindi';
-            jest.spyOn(coursesPage, 'generateExtraInfoTelemetry').mockReturnValue();
-            jest.spyOn(coursesPage, 'checkEmptySearchResult').mockReturnValue();
+
+            };
+            mockContentService.getContentDetails = jest.fn(() => of(mockContent));
+            mockEventBusService.events = jest.fn(() => of({
+                type: 'IMPORT_COMPLETED',
+                payload: {
+                    identifier: 'do123',
+                    progress: 100
+                }
+            }));
+            coursesPage.resumeContentData = mockCourse;
+            coursesPage.downloadPercentage = 100;
+            mockRouter.navigate = jest.fn();
+            mockCourseUtilService.getImportContentRequestBody = jest.fn(() => [{
+                isChildContent: true,
+                destinationFolder: './///',
+                contentId: 'do123',
+                correlationData: [{id: 'do123', type: 'resource'}],
+                rollup: {l1: 'do123'}
+            }]);
+            mockContentService.importContent = jest.fn(() => of([
+                {identifier: 'do123', status: 1}, {identifier: 'do1234', status: 0}
+            ]));
             mockCommonUtilService.showToast = jest.fn();
-            // act
-            coursesPage.getPopularAndLatestCourses(true, requestPageFilter);
+            coursesPage.tabBarElement = {style: {display: 'flex'}};
+
+            coursesPage.getContentDetails(mockCourse);
             // assert
             setTimeout(() => {
-                expect(mockPageService.getPageAssemble).toHaveBeenCalled();
-                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_NO_INTERNET_MESSAGE');
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('COURSE_NOT_AVAILABLE');
                 done();
             }, 0);
         });
 
-        it('should applied filter for latest course data for pageService error part of SERVER_ERROR', (done) => {
-            const requestPageFilter: PageAssembleCriteria = {
-                name: PageName.COURSE,
-                source: 'app',
-                filters: {
-                    board: ['cbsc', 'assam'],
-                    medium: ['english', 'hindi'],
-                    grade: ['class 1', 'class 2'],
-                    subject: ['math', 'phy']
-                },
-                mode: 'soft'
-            };
-            coursesPage.profile = {
-                board: [],
-                medium: [],
-                grade: [],
-                subject: []
-            };
-            const rqst = { filters: {}, mode: 'soft', name: 'Course', source: 'app' };
-            coursesPage.appliedFilter = undefined;
-            mockPageService.getPageAssemble = jest.fn(() => throwError('SERVER_ERROR'));
-            coursesPage.selectedLanguage = 'hindi';
-            jest.spyOn(coursesPage, 'generateExtraInfoTelemetry').mockReturnValue();
-            jest.spyOn(coursesPage, 'checkEmptySearchResult').mockReturnValue();
+        it('should go catch part if getContentDetails throw network error', (done) => {
+            // arrange
+            const mockCourse: Course = {
+                identifier: 'do123',
+                content: {
+                    pkgVersion: 2
+                }
+            };
+            const error = new CsNetworkError('no internet');
+            mockContentService.getContentDetails = jest.fn(() => throwError(error));
             mockCommonUtilService.showToast = jest.fn();
             // act
-            coursesPage.getPopularAndLatestCourses(true, requestPageFilter);
-            // assert
+            coursesPage.getContentDetails(mockCourse);
             setTimeout(() => {
-                expect(mockPageService.getPageAssemble).toHaveBeenCalled();
-                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_FETCHING_DATA');
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('NO_INTERNET');
                 done();
             }, 0);
         });
 
-
-        it('should applied filter for latest course data for pageService error part of SERVER_AUTH_ERROR', (done) => {
-            const requestPageFilter: PageAssembleCriteria = {
-                name: PageName.COURSE,
-                source: 'app',
-                filters: {
-                    board: ['cbsc', 'assam'],
-                    medium: ['english', 'hindi'],
-                    grade: ['class 1', 'class 2'],
-                    subject: ['math', 'phy']
-                },
-                mode: 'soft'
-            };
-            coursesPage.profile = {
-                board: [],
-                medium: [],
-                grade: [],
-                subject: []
-            };
-            const rqst = { filters: {}, mode: 'soft', name: 'Course', source: 'app' };
-            coursesPage.appliedFilter = '';
-            mockPageService.getPageAssemble = jest.fn(() => throwError('SERVER_AUTH_ERROR'));
-            coursesPage.selectedLanguage = 'hindi';
-            jest.spyOn(coursesPage, 'generateExtraInfoTelemetry').mockReturnValue();
-            jest.spyOn(coursesPage, 'checkEmptySearchResult').mockReturnValue();
+        it('should go to catch part and call showToast if throw other error', (done) => {
+            // arrange
+            const mockCourse: Course = {
+                contentId: 'do123',
+                batchId: '0987655',
+                content: {
+                    pkgVersion: 2
+                }
+            };
+            mockContentService.getContentDetails = jest.fn(() => throwError('error'));
             mockCommonUtilService.showToast = jest.fn();
             // act
-            coursesPage.getPopularAndLatestCourses(true, requestPageFilter);
-            // assert
+            coursesPage.getContentDetails(mockCourse);
             setTimeout(() => {
-                expect(mockPageService.getPageAssemble).toHaveBeenCalled();
-                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_FETCHING_DATA');
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_CONTENT_NOT_AVAILABLE');
                 done();
             }, 0);
         });
@@ -500,14 +625,15 @@ describe('CoursesPage', () => {
     describe('subscribeUtilityEvents', () => {
         it('should applied filter for tab change and data trim as course', (done) => {
             // arrange
-            const data = { trim: jest.fn(() => 'courses'), update: true, batchId: 'd0_0123', selectedLanguage: 'en' };
+            const data = {trim: jest.fn(() => 'courses'), update: true, batchId: 'd0_0123', selectedLanguage: 'en'};
             coursesPage.isUpgradePopoverShown = false;
             mockEvents.subscribe = jest.fn((_, fn) => fn(data));
             mockAppGlobalService.openPopover = jest.fn(() => Promise.resolve());
-            jest.spyOn(coursesPage, 'getEnrolledCourses').mockReturnValue();
+            jest.spyOn(coursesPage, 'getAggregatorResult').mockImplementation(() => {
+                return Promise.resolve();
+            });
             jest.spyOn(coursesPage, 'getContentDetails').mockReturnValue();
             coursesPage.appliedFilter = true;
-            jest.spyOn(coursesPage, 'getPopularAndLatestCourses').mockImplementation(() => { });
             // act
             coursesPage.subscribeUtilityEvents();
             // assert
@@ -521,13 +647,15 @@ describe('CoursesPage', () => {
 
         it('should not applied filter for tab change and data trim as course', (done) => {
             // arrange
-            const data = { trim: jest.fn(() => 'courses') };
+            const data = {trim: jest.fn(() => 'courses')};
             coursesPage.isUpgradePopoverShown = false;
             mockEvents.subscribe = jest.fn((_, fn) => fn(data));
             mockAppGlobalService.openPopover = jest.fn(() => Promise.resolve());
             jest.spyOn(coursesPage, 'getContentDetails').mockReturnValue();
             coursesPage.appliedFilter = false;
-            jest.spyOn(coursesPage, 'getPopularAndLatestCourses').mockReturnValue();
+            jest.spyOn(coursesPage, 'getAggregatorResult').mockImplementation(() => {
+                return Promise.resolve();
+            });
             // act
             coursesPage.subscribeUtilityEvents();
             // assert
@@ -542,7 +670,7 @@ describe('CoursesPage', () => {
 
         it('should not apply filter for tab change and data trim is not course', (done) => {
             // arrange
-            const data = { trim: jest.fn(() => 'library') };
+            const data = {trim: jest.fn(() => 'library')};
             coursesPage.isUpgradePopoverShown = false;
             mockEvents.subscribe = jest.fn((_, fn) => fn(data));
             mockAppGlobalService.openPopover = jest.fn(() => Promise.resolve());
@@ -559,10 +687,107 @@ describe('CoursesPage', () => {
         });
     });
 
+    describe('navigateToDetails()', () => {
+
+        it('should generate telemetry object, check for layout name and filter applied and navigate to details page', (done) => {
+            // arrange
+            const mockContent = {
+                contentId: 'do123',
+                contentType: 'Course',
+                pkgVersion: 1
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.deDupe = jest.fn();
+            const mockCourseDetails = {
+                layoutName: 'InProgress',
+                isFilterApplied: true, env: 'home', pageName: 'Course', sectionName: 'sampleSection', index: 2
+            };
+            mockRouter.navigate = jest.fn();
+            const values = new Map();
+            values['sectionName'] = mockCourseDetails.sectionName;
+            values['positionClicked'] = mockCourseDetails.index;
+            // act
+            coursesPage.navigateToDetailPage(mockContent, mockCourseDetails);
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.CONTENT_CLICKED,
+                    'home', 'Course', {id: 'do123', type: 'Course', version: undefined},
+                    values, {l1: 'do123'}, undefined
+                );
+                done();
+            });
+        });
+
+        it('should generate telemetry object,for collection and navigate to details page', (done) => {
+            // arrange
+            const mockContent = {
+                identifier: 'do123',
+                contentType: 'collection',
+                mimeType: 'application/vnd.ekstep.content-collection'
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.deDupe = jest.fn();
+            const mockCourseDetails = {
+                layoutName: 'sampleLayout',
+                isFilterApplied: true, env: 'home', pageName: 'Collection', sectionName: 'sampleSection', index: 2
+            };
+            mockRouter.navigate = jest.fn();
+            mockTelemetryGeneratorService.isCollection = jest.fn();
+
+            const values = new Map();
+            values['sectionName'] = mockCourseDetails.sectionName;
+            values['positionClicked'] = mockCourseDetails.index;
+            // act
+            coursesPage.navigateToDetailPage(mockContent, mockCourseDetails);
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.CONTENT_CLICKED,
+                    'home', 'Collection', {id: 'do123', type: 'collection', version: ''},
+                    values, {l1: 'do123'}, undefined
+                );
+                done();
+            });
+        });
+
+        it('should generate telemetry object, check for contentType resource and goto content-details page', (done) => {
+            // arrange
+            const mockContent = {
+                contentId: 'do123',
+                contentType: 'Resource',
+                mimeType: 'resource'
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.deDupe = jest.fn();
+            const mockCourseDetails = {
+                layoutName: 'completed',
+                isFilterApplied: true, env: 'home', pageName: 'library', sectionName: 'sampleSection', index: 2
+            };
+            mockRouter.navigate = jest.fn();
+            const values = new Map();
+            values['sectionName'] = mockCourseDetails.sectionName;
+            values['positionClicked'] = mockCourseDetails.index;
+            // act
+            coursesPage.navigateToDetailPage(mockContent, mockCourseDetails);
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.CONTENT_CLICKED,
+                    'home', 'library', {id: 'do123', type: 'Resource', version: ''},
+                    values, {l1: 'do123'}, undefined
+                );
+                done();
+            });
+        });
+
+    });
+
+
     describe('navigateToBatchListPopup', () => {
         it('should show a message saying, the user is offline', (done) => {
             // arrange
-            mockCommonUtilService.networkInfo = { isNetworkAvailable: false };
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: false};
             const content = {
                 identifier: 'sample_id'
             };
@@ -581,7 +806,7 @@ describe('CoursesPage', () => {
 
         it('should navigate tocourse batchs page if user is not logged in', (done) => {
             // arrange
-            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
             const content = {
                 identifier: 'sample_id'
             };
@@ -600,7 +825,7 @@ describe('CoursesPage', () => {
 
         it('should navigate tocourse batchs page if user is logged in and batchlist is not empty', (done) => {
             // arrange
-            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
             const content = {
                 identifier: 'sample_id',
                 contentId: 'sample_id'
@@ -612,9 +837,9 @@ describe('CoursesPage', () => {
             mockRouter.navigate = jest.fn();
             const courseBatchesRequest = {
                 filters: {
-                  courseId: courseDetails.layoutName === ContentCard.LAYOUT_INPROGRESS ? content.contentId : content.identifier,
-                  enrollmentType: CourseEnrollmentType.OPEN,
-                  status: [CourseBatchStatus.NOT_STARTED, CourseBatchStatus.IN_PROGRESS]
+                    courseId: courseDetails.layoutName === ContentCard.LAYOUT_INPROGRESS ? content.contentId : content.identifier,
+                    enrollmentType: CourseEnrollmentType.OPEN,
+                    status: [CourseBatchStatus.IN_PROGRESS]
                 },
                 sort_by: {
                     createdDate: 'desc',
@@ -629,7 +854,7 @@ describe('CoursesPage', () => {
             ];
             mockPopCtrl.create = jest.fn(() => (Promise.resolve({
                 present: jest.fn(() => Promise.resolve({})),
-                onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: true } }))
+                onDidDismiss: jest.fn(() => Promise.resolve({data: {canDelete: true}}))
             } as any)));
             mockCourseService.getCourseBatches = jest.fn(() => of(data));
             coursesPage.loader = {
@@ -650,7 +875,7 @@ describe('CoursesPage', () => {
 
         it('should navigate tocourse batchs page if user is logged in and batchlist is empty', (done) => {
             // arrange
-            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
             const content = {
                 identifier: 'sample_id',
                 contentId: 'sample_id'
@@ -662,9 +887,9 @@ describe('CoursesPage', () => {
             mockRouter.navigate = jest.fn();
             const courseBatchesRequest = {
                 filters: {
-                  courseId: courseDetails.layoutName === ContentCard.LAYOUT_INPROGRESS ? content.contentId : content.identifier,
-                  enrollmentType: CourseEnrollmentType.OPEN,
-                  status: [CourseBatchStatus.NOT_STARTED, CourseBatchStatus.IN_PROGRESS]
+                    courseId: courseDetails.layoutName === ContentCard.LAYOUT_INPROGRESS ? content.contentId : content.identifier,
+                    enrollmentType: CourseEnrollmentType.OPEN,
+                    status: [CourseBatchStatus.IN_PROGRESS]
                 },
                 sort_by: {
                     createdDate: 'desc',
@@ -674,7 +899,7 @@ describe('CoursesPage', () => {
             const data = [];
             mockPopCtrl.create = jest.fn(() => (Promise.resolve({
                 present: jest.fn(() => Promise.resolve({})),
-                onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: true } }))
+                onDidDismiss: jest.fn(() => Promise.resolve({data: {canDelete: true}}))
             } as any)));
             mockCourseService.getCourseBatches = jest.fn(() => of(data));
             coursesPage.loader = {
@@ -705,7 +930,7 @@ describe('CoursesPage', () => {
             })) as any;
             coursesPage.loader = mockCommonUtilService.getLoader;
             const enrolledCourses = [{
-                batch: { status: 1 },
+                batch: {status: 1},
                 cProgress: 80,
                 contentId: 'sample_id1'
             }];
@@ -735,7 +960,7 @@ describe('CoursesPage', () => {
                 dismiss: dismissFn,
             })) as any;
             const enrolledCourses = [{
-                batch: { status: 1 },
+                batch: {status: 1},
                 cProgress: 80,
                 contentId: 'sample_id1'
             }];
@@ -767,7 +992,7 @@ describe('CoursesPage', () => {
             })) as any;
             coursesPage.loader = mockCommonUtilService.getLoader;
             const enrolledCourses = [{
-                batch: { status: 2 },
+                batch: {status: 2},
                 cProgress: 80,
                 contentId: 'sample_id1'
             }];
@@ -795,7 +1020,7 @@ describe('CoursesPage', () => {
         it('should prepare the request parameters to open the enrolled training', () => {
             // arrange
             const contentData = {
-                data: { name: 'sample_name' }
+                data: {name: 'sample_name'}
             };
             coursesPage.checkRetiredOpenBatch = jest.fn();
             // act
@@ -819,14 +1044,14 @@ describe('CoursesPage', () => {
                 name: 'sectionName'
             };
             coursesPage.popularAndLatestCourses = [{
-                    contents: [{
-                        identifier: 'sample_id1'
-                    }, {
-                        identifier: 'sample_id2'
-                    }, {
-                        identifier: 'sample_id3'
-                    }]
-                }];
+                contents: [{
+                    identifier: 'sample_id1'
+                }, {
+                    identifier: 'sample_id2'
+                }, {
+                    identifier: 'sample_id3'
+                }]
+            }];
             coursesPage.checkRetiredOpenBatch = jest.fn();
             // act
             coursesPage.openCourseDetails(contentData, sectionData, index);
@@ -835,5 +1060,178 @@ describe('CoursesPage', () => {
         });
     });
 
+    describe('ngOnDestroy()', () => {
+        it('destroy should unsubscribe 12 events', () => {
+            jest.spyOn(coursesPage, 'unsubscribeUtilityEvents');
+            // act
+            coursesPage.ngOnDestroy();
+            // assert
+            expect(coursesPage.unsubscribeUtilityEvents).toBeCalled();
+            expect(mockEvents.unsubscribe).toBeCalledWith('update_header');
+        });
+    });
+
+    describe('getUserId', () => {
+        it('should check if user is guest', (done) => {
+            // arrange
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+            mockAppGlobalService.setEnrolledCourseList = jest.fn(() => []);
+            mockAppGlobalService.getGuestUserType = jest.fn(() => ProfileType.TEACHER);
+            mockCommonUtilService.isAccessibleForNonStudentRole = jest.fn(() => true);
+            mockAppGlobalService.DISPLAY_SIGNIN_FOOTER_CARD_IN_COURSE_TAB_FOR_TEACHER = true;
+            // act
+            coursesPage.getUserId().catch(() => {
+                expect(coursesPage.guestUser).toBeTruthy();
+                done();
+            });
+        });
+
+        it('should check if user is loggedIn user', (done) => {
+            // arrange
+            const sessionObj = {
+                userToken: 'sample_token'
+            };
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+            mockAppGlobalService.getSessionData = jest.fn(() => sessionObj);
+            jest.spyOn(coursesPage, 'getAggregatorResult').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            // act
+            setTimeout(() => {
+                coursesPage.getUserId();
+                expect(coursesPage.userId).toBe('sample_token');
+                done();
+            }, 0);
+        });
+    });
+
+    describe('navigateToViewMoreContents page', () => {
+        it('should present toast for offline', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: false};
+            mockToastController.create = jest.fn(() => {
+                return Promise.resolve({
+                    present: jest.fn(() => Promise.resolve({})),
+                    onDidDismiss: jest.fn(() => Promise.resolve({}))
+                });
+            }) as any;
+            mockCommonUtilService.translateMessage = jest.fn();
+            // act
+            coursesPage.navigateToViewMoreContentsPage(false);
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('NO_INTERNET_TITLE');
+                done();
+
+            }, 0);
+        });
+
+        it('should translate message for courses in progress and generate telemetry and navigate to viewmore activity', () => {
+            // arrange
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            mockCommonUtilService.translateMessage = jest.fn();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockRouter.navigate = jest.fn();
+            const values = new Map();
+            values['SectionName'] = 'My courses';
+            // act
+            coursesPage.navigateToViewMoreContentsPage(true);
+            // assert
+            expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('COURSES_IN_PROGRESS');
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.VIEWALL_CLICKED,
+                Environment.HOME,
+                PageId.COURSES, undefined, values
+            );
+            expect(mockRouter.navigate).toHaveBeenCalled();
+        });
+    });
+
+    describe('cancel download', () => {
+
+        it('should call contentService cancelDownload', (done) => {
+            // arrange
+            coursesPage.resumeContentData = {
+                contentId: 'do123'
+            };
+            mockNgZone.run = jest.fn((fn) => fn());
+            coursesPage.tabBarElement = {style: {display: 'flex'}};
+            mockContentService.cancelDownload = jest.fn(() => of(undefined));
+            // act
+            coursesPage.cancelDownload();
+            setTimeout(() => {
+                expect(coursesPage.showOverlay).toBeFalsy();
+                done();
+            }, 0);
+        });
+
+        it('show go to catch part if cancel throw error', (done) => {
+            // arrange
+            coursesPage.resumeContentData = {
+                identifier: 'do123'
+            };
+            mockNgZone.run = jest.fn((fn) => fn());
+            coursesPage.tabBarElement = {style: {display: 'flex'}};
+            mockContentService.cancelDownload = jest.fn(() => throwError('error'));
+            // act
+            coursesPage.cancelDownload();
+            setTimeout(() => {
+                expect(coursesPage.showOverlay).toBeFalsy();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('retryShowingPopularCourses test cases', () => {
+        it('should check for isNetworkAvailable and showRefresh', () => {
+            // arrange
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            jest.spyOn(coursesPage, 'getCourseTabData').mockImplementation();
+            // act
+            coursesPage.retryShowingPopularCourses(true);
+            // assert
+            expect(coursesPage.getCourseTabData).toHaveBeenCalled();
+        });
+
+        it('should check for isNetworkAvailable returns false and showRefresh also false', () => {
+            // arrange
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: false};
+            jest.spyOn(coursesPage, 'getCourseTabData').mockImplementation();
+            // act
+            coursesPage.retryShowingPopularCourses(false);
+            // assert
+            expect(coursesPage.getCourseTabData).not.toHaveBeenCalled();
+        });
+    });
+
+    it('should call presentOffline toast message when showOfflineWarning called upon', (done) => {
+        // arrange
+        mockToastController.create = jest.fn(() => {
+            return Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({}))
+            });
+        }) as any;
+        // act
+        coursesPage.showOfflineWarning();
+        setTimeout(() => {
+            expect(mockToastController.create).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
+    describe('resetFilter', () => {
+        it('return reset values', () => {
+            // arrange
+            let data = [{
+                selected: [1,2]
+            }];
+            // act
+            data = coursesPage.resetFilter(data);
+            // assert
+            expect(data[0].selected).toEqual([]);
+        });
+    });
 });
 
diff --git a/src/app/courses/courses.page.ts b/src/app/courses/courses.page.ts
index 982dcc6e7..c983220ac 100644
--- a/src/app/courses/courses.page.ts
+++ b/src/app/courses/courses.page.ts
@@ -1,33 +1,52 @@
-import {Component, Inject, NgZone, OnDestroy, OnInit} from '@angular/core';
-import { Router, NavigationExtras } from '@angular/router';
-import { Events, ToastController, PopoverController } from '@ionic/angular';
+import { Component, Inject, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { NavigationExtras, Router } from '@angular/router';
+import { ContentAggregatorHandler } from '@app/services/content/content-aggregator-handler.service';
+import { AggregatorPageType } from '@app/services/content/content-aggregator-namespaces';
+import { NavigationService } from '@app/services/navigation-handler.service';
+import { ProfileHandler } from '@app/services/profile-handler';
+import { ContentUtil } from '@app/util/content-util';
 import { AppVersion } from '@ionic-native/app-version/ngx';
-import { QRResultCallback, SunbirdQRScanner } from '../../services/sunbirdqrscanner.service';
-import has from 'lodash/has';
-import forEach from 'lodash/forEach';
-import { ContentCard, EventTopics, PreferenceKey, ProfileConstants,
-   ViewMore, RouterLinks, ContentFilterConfig, BatchConstants, ContentType, MimeType } from '../../app/app.constant';
-import { PageFilterPage, PageFilterCallback } from '../page-filter/page-filter.page';
 import { Network } from '@ionic-native/network/ngx';
+import { IonRefresher, PopoverController, ToastController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { CsPrimaryCategory } from '@project-sunbird/client-services/services/content';
+import { CourseCardGridTypes } from '@project-sunbird/common-consumption-v8';
+import forEach from 'lodash/forEach';
+import { Subscription } from 'rxjs';
+import {
+  Content,
+  ContentAggregatorRequest, ContentEventType, ContentImportRequest, ContentImportResponse, ContentImportStatus,
+  ContentSearchCriteria, ContentService,
+  CorrelationData, Course,
+  CourseBatchesRequest,
+  CourseBatchStatus,
+  CourseEnrollmentType,
+  CourseService, DownloadEventType, DownloadProgress, EventsBusEvent, EventsBusService,
+  FrameworkCategoryCode,
+  FrameworkCategoryCodesGroup,
+  FrameworkService, FrameworkUtilService, GetFrameworkCategoryTermsRequest, NetworkError, PageAssembleCriteria, PageName,
+  Profile, ProfileService, SharedPreferences,
+  SortOrder, TelemetryObject
+} from 'sunbird-sdk';
+import {
+  BatchConstants, ContentCard,
+  ContentFilterConfig, EventTopics,
+  MimeType, PreferenceKey, PrimaryCategory, ProfileConstants,
+  ProgressPopupContext, RouterLinks, ViewMore
+} from '../../app/app.constant';
 import { AppGlobalService } from '../../services/app-global-service.service';
+import { AppHeaderService } from '../../services/app-header.service';
+import { CommonUtilService } from '../../services/common-util.service';
 import { CourseUtilService } from '../../services/course-util.service';
-import { updateFilterInSearchQuery } from '../../util/filter.util';
 import { FormAndFrameworkUtilService } from '../../services/formandframeworkutil.service';
-import { CommonUtilService } from '../../services/common-util.service';
+import { SbProgressLoader } from '../../services/sb-progress-loader.service';
+import { QRResultCallback, SunbirdQRScanner } from '../../services/sunbirdqrscanner.service';
+import { CorReleationDataType, Environment, ID, InteractSubtype, InteractType, PageId } from '../../services/telemetry-constants';
 import { TelemetryGeneratorService } from '../../services/telemetry-generator.service';
-import {
-  Content, ContentEventType, ContentImportRequest, ContentImportResponse, ContentImportStatus, ContentService, Course,
-  CourseService, DownloadEventType, DownloadProgress, EventsBusEvent, EventsBusService, FetchEnrolledCourseRequest,
-  PageAssembleCriteria, PageAssembleService, PageName, ProfileType, SharedPreferences, NetworkError, CorrelationData,
-  PageAssemble, FrameworkService, CourseEnrollmentType, CourseBatchStatus, CourseBatchesRequest, TelemetryObject, SortOrder
-} from 'sunbird-sdk';
-import { Environment, InteractSubtype, InteractType, PageId, CorReleationDataType } from '../../services/telemetry-constants';
-import { Subscription } from 'rxjs';
-import { AppHeaderService } from '../../services/app-header.service';
-import { CourseCardGridTypes } from '@project-sunbird/common-consumption';
+import { applyProfileFilter, updateFilterInSearchQuery } from '../../util/filter.util';
 import { EnrollmentDetailsComponent } from '../components/enrollment-details/enrollment-details.component';
-import { ContentUtil } from '@app/util/content-util';
-import { LocalCourseService } from '@app/services/local-course.service';
+import { PageFilterCallback, PageFilterPage } from '../page-filter/page-filter.page';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'app-courses',
@@ -35,6 +54,9 @@ import { LocalCourseService } from '@app/services/local-course.service';
   styleUrls: ['./courses.page.scss'],
 })
 export class CoursesPage implements OnInit, OnDestroy {
+
+  @ViewChild('courseRefresher', { static: false }) refresher: IonRefresher;
+
   /**
    * Contains enrolled course
    */
@@ -72,7 +94,7 @@ export class CoursesPage implements OnInit, OnDestroy {
   courseFilter: any;
   appliedFilter: any;
   filterIcon = './assets/imgs/ic_action_filter.png';
-  profile: any;
+  profile: Profile;
   isVisible = false;
   inProgressSection = 'My Courses';
 
@@ -96,14 +118,20 @@ export class CoursesPage implements OnInit, OnDestroy {
 
   courseCardType = CourseCardGridTypes;
   loader: any;
+  dynamicCourses: any;
+  searchGroupingContents: any;
+  resetCourseFilter: boolean;
+  filter: ContentSearchCriteria;
+  isCourseListEmpty: boolean;
 
   constructor(
     @Inject('EVENTS_BUS_SERVICE') private eventBusService: EventsBusService,
-    @Inject('PAGE_ASSEMBLE_SERVICE') private pageService: PageAssembleService,
     @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
     @Inject('COURSE_SERVICE') private courseService: CourseService,
     @Inject('CONTENT_SERVICE') private contentService: ContentService,
     @Inject('FRAMEWORK_SERVICE') private frameworkService: FrameworkService,
+    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+    @Inject('FRAMEWORK_UTIL_SERVICE') private frameworkUtilService: FrameworkUtilService,
     private formAndFrameworkUtilService: FormAndFrameworkUtilService,
     private appVersion: AppVersion,
     private ngZone: NgZone,
@@ -118,7 +146,11 @@ export class CoursesPage implements OnInit, OnDestroy {
     private router: Router,
     private toastController: ToastController,
     private headerService: AppHeaderService,
-    private localCourseService: LocalCourseService
+    private sbProgressLoader: SbProgressLoader,
+    private navService: NavigationService,
+    private contentAggregatorHandler: ContentAggregatorHandler,
+    private profileHandler: ProfileHandler,
+    private translate: TranslateService
   ) {
     this.tabBarElement = document.querySelector('.tabbar.show-tabbar');
     this.preferences.getString(PreferenceKey.SELECTED_LANGUAGE_CODE).toPromise()
@@ -144,7 +176,7 @@ export class CoursesPage implements OnInit, OnDestroy {
     this.getCourseTabData();
 
     this.events.subscribe('event:update_course_data', () => {
-        this.getEnrolledCourses();
+      this.getAggregatorResult();
     });
   }
 
@@ -161,20 +193,38 @@ export class CoursesPage implements OnInit, OnDestroy {
       this.showOverlay = false;
       this.downloadPercentage = 0;
     });
+    this.unsubscribeUtilityEvents();
+  }
+
+  unsubscribeUtilityEvents() {
+    this.events.unsubscribe(AppGlobalService.PROFILE_OBJ_CHANGED);
+    this.events.unsubscribe(EventTopics.COURSE_STATUS_UPDATED_SUCCESSFULLY);
+    this.events.unsubscribe('force_optional_upgrade');
+    this.events.unsubscribe('onboarding-card:completed');
+    this.events.unsubscribe('onboarding-card:increaseProgress');
+    this.events.unsubscribe('course:resume');
+    this.events.unsubscribe(EventTopics.ENROL_COURSE_SUCCESS);
+    this.events.unsubscribe('onAfterLanguageChange:update');
+    this.events.unsubscribe(EventTopics.COURSE_PAGE_ASSEMBLE_CHANNEL_CHANGE);
+    this.events.unsubscribe(EventTopics.TAB_CHANGE);
+    this.events.unsubscribe(EventTopics.REFRESH_ENROLL_COURSE_LIST);
+    this.events.unsubscribe(EventTopics.SIGN_IN_RELOAD);
   }
 
   ionViewWillEnter() {
+    this.refresher.disabled = false;
     this.isVisible = true;
     this.events.subscribe('update_header', () => {
-      this.headerService.showHeaderWithHomeButton(['search', 'filter', 'download']);
+      this.headerService.showHeaderWithHomeButton(['search', 'download']);
     });
     this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
       this.handleHeaderEvents(eventName);
     });
-    this.headerService.showHeaderWithHomeButton(['search', 'filter', 'download']);
+    this.headerService.showHeaderWithHomeButton(['search', 'download']);
   }
 
   ionViewDidEnter() {
+    this.sbProgressLoader.hide({ id: ProgressPopupContext.DEEPLINK });
     this.appGlobalService.generateConfigInteractEvent(PageId.COURSES, this.isOnBoardingCardCompleted);
 
     this.events.subscribe('event:showScanner', (data) => {
@@ -182,9 +232,11 @@ export class CoursesPage implements OnInit, OnDestroy {
         this.qrScanner.startScanner(PageId.COURSES, false);
       }
     });
+    this.sbProgressLoader.hide({ id: 'login' });
   }
 
   ionViewWillLeave() {
+    this.refresher.disabled = true;
     if (this.headerObservable) {
       this.headerObservable.unsubscribe();
     }
@@ -227,7 +279,7 @@ export class CoursesPage implements OnInit, OnDestroy {
 
     this.events.subscribe(EventTopics.COURSE_STATUS_UPDATED_SUCCESSFULLY, (data) => {
       if (data.update) {
-        this.getEnrolledCourses(false, true);
+        this.getAggregatorResult();
       }
     });
 
@@ -242,20 +294,20 @@ export class CoursesPage implements OnInit, OnDestroy {
 
     this.events.subscribe(EventTopics.ENROL_COURSE_SUCCESS, (res) => {
       if (res && res.batchId) {
-        this.getEnrolledCourses(false, true);
+        this.getAggregatorResult();
       }
     });
 
     this.events.subscribe('onAfterLanguageChange:update', (res) => {
       if (res && res.selectedLanguage) {
         this.selectedLanguage = res.selectedLanguage;
-        this.getPopularAndLatestCourses();
+        this.getAggregatorResult();
       }
     });
 
     this.events.subscribe(EventTopics.COURSE_PAGE_ASSEMBLE_CHANNEL_CHANGE, () => {
       this.ngZone.run(() => {
-        this.getPopularAndLatestCourses();
+        this.getAggregatorResult();
       });
     });
 
@@ -267,13 +319,15 @@ export class CoursesPage implements OnInit, OnDestroy {
             this.courseFilter = undefined;
             this.appliedFilter = undefined;
             this.isFilterApplied = false;
-            this.getPopularAndLatestCourses();
+            this.filter = undefined;
+            this.resetCourseFilter = true;
+            this.getAggregatorResult();
           }
         }
       });
     });
     this.events.subscribe(EventTopics.REFRESH_ENROLL_COURSE_LIST, () => {
-      this.getEnrolledCourses(false, true);
+      this.getAggregatorResult();
     });
 
     this.events.subscribe(EventTopics.SIGN_IN_RELOAD, async () => {
@@ -281,118 +335,6 @@ export class CoursesPage implements OnInit, OnDestroy {
     });
   }
 
-  /**
-   * To get enrolled course(s) of logged-in user.
-   *
-   * It internally calls course handler of genie sdk
-   */
-  getEnrolledCourses(refreshEnrolledCourses: boolean = true, returnRefreshedCourses: boolean = false): void {
-    this.spinner(true);
-    const option: FetchEnrolledCourseRequest = {
-      userId: this.userId,
-      returnFreshCourses: returnRefreshedCourses
-    };
-    this.courseService.getEnrolledCourses(option).toPromise()
-      .then((enrolledCourses) => {
-        if (enrolledCourses) {
-          this.ngZone.run(() => {
-            this.enrolledCourses = enrolledCourses ? enrolledCourses : [];
-            if (this.enrolledCourses.length > 0) {
-              const courseList: Array<Course> = [];
-              for (let count = 0; count < this.enrolledCourses.length; count++){
-                courseList.push(this.enrolledCourses[count]);
-                this.enrolledCourses[count]['cardImg'] = this.commonUtilService.getContentImg(this.enrolledCourses[count]);
-                this.enrolledCourses[count].completionPercentage = this.enrolledCourses[count].completionPercentage || 0;
-              }
-
-              this.appGlobalService.setEnrolledCourseList(courseList);
-            }
-
-            this.spinner(false);
-          });
-        }
-      }, (err) => {
-        this.spinner(false);
-      });
-  }
-
-  /**
-   * To get popular course.
-   *
-   * It internally calls course handler of genie sdk
-   */
-  getPopularAndLatestCourses(hardRefresh = false, pageAssembleCriteria?: PageAssembleCriteria): void {
-    this.pageApiLoader = true;
-    if (pageAssembleCriteria === undefined) {
-      const criteria: PageAssembleCriteria = {
-        name: PageName.COURSE,
-        filters: {},
-        source: 'app'
-      };
-
-      if (this.appliedFilter) {
-        let filterApplied = false;
-        Object.keys(this.appliedFilter).forEach(key => {
-          if (this.appliedFilter[key].length > 0) {
-            filterApplied = true;
-          }
-        });
-
-        criteria.filters = this.appliedFilter;
-      }
-      pageAssembleCriteria = criteria;
-    }
-
-    // pageAssembleCriteria.hardRefresh = hardRefresh;
-
-    this.pageService.getPageAssemble(pageAssembleCriteria).toPromise()
-    .then((res: PageAssemble) => {
-      this.ssoSectionId = res.ssoSectionId;
-
-      this.ngZone.run(() => {
-        const sections = res.sections;
-        const newSections = [];
-        sections.forEach(element => {
-          const display = JSON.parse(element.display);
-          if (display.name) {
-            if (has(display.name, this.selectedLanguage)) {
-              const langs = [];
-              forEach(display.name, (value, key) => {
-                langs[key] = value;
-              });
-              element.name = langs[this.selectedLanguage];
-            }
-          }
-          newSections.push(element);
-        });
-
-        if (newSections.length) {
-          for (let i = 0; i < newSections.length; i++){
-            if (newSections[i].contents) {
-              for (let j = 0; j < newSections[i].contents.length; j++) {
-                newSections[i].contents[j]['cardImg'] = this.commonUtilService.getContentImg(newSections[i].contents[j]);
-              }
-            }
-          }
-        }
-
-        this.popularAndLatestCourses = newSections;
-        this.pageApiLoader = !this.pageApiLoader;
-        this.generateExtraInfoTelemetry(newSections.length);
-        this.checkEmptySearchResult();
-        });
-      }).catch((error: string) => {
-        this.ngZone.run(() => {
-          this.pageApiLoader = false;
-          if (error === 'CONNECTION_ERROR') {
-            this.commonUtilService.showToast('ERROR_NO_INTERNET_MESSAGE');
-          } else if (error === 'SERVER_ERROR' || error === 'SERVER_AUTH_ERROR') {
-            this.commonUtilService.showToast('ERROR_FETCHING_DATA');
-          }
-        });
-      });
-  }
-
   generateExtraInfoTelemetry(sectionsCount) {
     const values = new Map();
     values['pageSectionCount'] = sectionsCount;
@@ -428,7 +370,6 @@ export class CoursesPage implements OnInit, OnDestroy {
       } else {
         const sessionObj = this.appGlobalService.getSessionData();
         this.userId = sessionObj[ProfileConstants.USER_TOKEN];
-        this.getEnrolledCourses(false, true);
         resolve();
       }
     });
@@ -447,27 +388,20 @@ export class CoursesPage implements OnInit, OnDestroy {
 
     this.getUserId()
       .then(() => {
-        this.getPopularAndLatestCourses(true);
+        this.getAggregatorResult();
       })
       .catch(() => {
-        this.getPopularAndLatestCourses(true);
+        this.getAggregatorResult();
       });
   }
 
   /**
    * It will fetch the guest user profile details
    */
-  getCurrentUser(): void {
+  private getCurrentUser(): void {
     const profileType = this.appGlobalService.getGuestUserType();
-    if (this.commonUtilService.isAccessibleForNonStudentRole(profileType) && this.appGlobalService.DISPLAY_SIGNIN_FOOTER_CARD_IN_COURSE_TAB_FOR_TEACHER) {
-      this.showSignInCard = true;
-    } else {
-      this.showSignInCard = false;
-    }
-  }
-
-  scanQRCode() {
-    this.qrScanner.startScanner(PageId.COURSES);
+    this.showSignInCard = this.commonUtilService.isAccessibleForNonStudentRole(profileType) &&
+      this.appGlobalService.DISPLAY_SIGNIN_FOOTER_CARD_IN_COURSE_TAB_FOR_TEACHER;
   }
 
   async search() {
@@ -475,15 +409,16 @@ export class CoursesPage implements OnInit, OnDestroy {
       InteractSubtype.SEARCH_BUTTON_CLICKED,
       Environment.HOME,
       PageId.COURSES);
-    const contentType = await this.formAndFrameworkUtilService.getSupportedContentFilterConfig(
+    const primaryCategories = await this.formAndFrameworkUtilService.getSupportedContentFilterConfig(
       ContentFilterConfig.NAME_COURSE);
     this.router.navigate([RouterLinks.SEARCH], {
       state: {
-        contentType,
+        primaryCategories,
         source: PageId.COURSES,
         enrolledCourses: this.enrolledCourses,
         guestUser: this.guestUser,
-        userId: this.userId
+        userId: this.userId,
+        searchWithBackButton: true
       }
     });
   }
@@ -537,7 +472,8 @@ export class CoursesPage implements OnInit, OnDestroy {
             that.filterIcon = './assets/imgs/ic_action_filter.png';
           }
           if (isChecked) {
-            that.getPopularAndLatestCourses(false, criteria);
+            that.filter = filter;
+            that.getAggregatorResult();
           }
         });
       }
@@ -547,13 +483,15 @@ export class CoursesPage implements OnInit, OnDestroy {
       callback: this.pageFilterCallBack,
       pageId: PageId.COURSES
     };
-    // Already apllied filter
     if (this.courseFilter) {
       filterOptions['filter'] = this.courseFilter;
       this.showFilterPage(filterOptions);
     } else {
-      // TODO: Need to add loader
       this.formAndFrameworkUtilService.getCourseFilterConfig().then((data) => {
+        if (this.resetCourseFilter) {
+          data = this.resetFilter(data);
+          this.resetCourseFilter = false;
+        }
         filterOptions['filter'] = data;
         this.showFilterPage(filterOptions);
       }).catch(() => {
@@ -561,13 +499,20 @@ export class CoursesPage implements OnInit, OnDestroy {
       });
     }
   }
-  async presentToastForOffline(msg: string) {
+
+  resetFilter(data) {
+    for (let i = 0; data.length > i; i++) {
+      data[i].selected = [];
+    }
+    return data;
+  }
+
+  private async presentToastForOffline(msg: string) {
     this.toast = await this.toastController.create({
       duration: 3000,
       message: this.commonUtilService.translateMessage(msg),
-      showCloseButton: true,
+      buttons: [],
       position: 'top',
-      closeButtonText: '',
       cssClass: 'toastHeader'
     });
     await this.toast.present();
@@ -583,7 +528,8 @@ export class CoursesPage implements OnInit, OnDestroy {
       componentProps: {
         callback: filterOptions.callback,
         filter: filterOptions.filter,
-        pageId: PageId.COURSES
+        pageId: PageId.COURSES,
+        reset: filterOptions.reset || false
       },
       cssClass: 'resource-filter'
     });
@@ -649,7 +595,7 @@ export class CoursesPage implements OnInit, OnDestroy {
         }
       })
       .catch((err) => {
-        if (err instanceof NetworkError) {
+        if (NetworkError.isInstance(err)) {
           this.commonUtilService.showToast('NO_INTERNET');
         } else {
           this.commonUtilService.showToast('ERROR_CONTENT_NOT_AVAILABLE');
@@ -657,7 +603,7 @@ export class CoursesPage implements OnInit, OnDestroy {
       });
   }
 
-  contentDetailsImportCall(identifier) {
+  private contentDetailsImportCall(identifier) {
     this.subscribeSdkEvent();
     this.showOverlay = true;
     this.importContent([identifier], false);
@@ -710,7 +656,7 @@ export class CoursesPage implements OnInit, OnDestroy {
 
   }
 
-  navigateToContentDetailsPage(content) {
+  private navigateToContentDetailsPage(content) {
     const identifier = content.contentId || content.identifier;
     const extras: NavigationExtras = {
       state: {
@@ -731,7 +677,7 @@ export class CoursesPage implements OnInit, OnDestroy {
     this.router.navigate([RouterLinks.CONTENT_DETAILS], extras);
   }
 
-  importContent(identifiers, isChild) {
+  private importContent(identifiers, isChild) {
     const option: ContentImportRequest = {
       contentImportArray: this.courseUtilService.getImportContentRequestBody(identifiers, isChild),
       contentStatusArray: [],
@@ -762,13 +708,13 @@ export class CoursesPage implements OnInit, OnDestroy {
    * This method removes the loading/downloading overlay and displays the error message
    * and also shows the bottom navigation bar
    */
-  removeOverlayAndShowError(): any {
+  private removeOverlayAndShowError(): any {
     this.commonUtilService.showToast('COURSE_NOT_AVAILABLE');
     this.tabBarElement.style.display = 'flex';
     this.showOverlay = false;
   }
 
-  subscribeSdkEvent() {
+  private subscribeSdkEvent() {
     this.eventSubscription = this.eventBusService.events().subscribe((event: EventsBusEvent) => {
       this.ngZone.run(() => {
         if (event.type === DownloadEventType.PROGRESS) {
@@ -812,7 +758,7 @@ export class CoursesPage implements OnInit, OnDestroy {
     }
   }
 
-  redirectToActivedownloads() {
+  private redirectToActivedownloads() {
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
       InteractSubtype.ACTIVE_DOWNLOADS_CLICKED,
@@ -822,24 +768,22 @@ export class CoursesPage implements OnInit, OnDestroy {
   }
 
   openEnrolledCourseDetails(event) {
-    const contentIndex = this.getContentIndexOf(this.enrolledCourses, event.data);
     const params = {
       env: 'home',
-      index: contentIndex,
       sectionName: this.inProgressSection,
       pageName: 'course',
       course: event.data,
       guestUser: this.guestUser,
-      layoutName: this.layoutInProgress
+      layoutName: this.layoutInProgress,
+      enrolledCourses: this.enrolledCourses
     };
     this.checkRetiredOpenBatch(params.course, params);
   }
 
   openCourseDetails(event, section, index) {
-    const contentIndex = this.getContentIndexOf(this.popularAndLatestCourses[index].contents, event.data);
     const params = {
       env: 'home',
-      index: contentIndex,
+      index,
       sectionName: section.name,
       pageName: 'course',
       course: event.data,
@@ -876,14 +820,13 @@ export class CoursesPage implements OnInit, OnDestroy {
 
   async navigateToBatchListPopup(content: any, courseDetails: any, retiredBatched?: any) {
     const ongoingBatches = [];
-    const upcommingBatches = [];
     const courseBatchesRequest: CourseBatchesRequest = {
       filters: {
         courseId: courseDetails.layoutName === ContentCard.LAYOUT_INPROGRESS ? content.contentId : content.identifier,
         enrollmentType: CourseEnrollmentType.OPEN,
-        status: [CourseBatchStatus.NOT_STARTED, CourseBatchStatus.IN_PROGRESS]
+        status: [CourseBatchStatus.IN_PROGRESS]
       },
-      sort_by: { createdDate: SortOrder.DESC},
+      sort_by: { createdDate: SortOrder.DESC },
       fields: BatchConstants.REQUIRED_FIELDS
     };
     const reqvalues = new Map();
@@ -897,11 +840,9 @@ export class CoursesPage implements OnInit, OnDestroy {
               const batches = data;
               if (batches.length) {
                 batches.forEach((batch, key) => {
-                    if (batch.status === 1) {
-                      ongoingBatches.push(batch);
-                    } else {
-                      upcommingBatches.push(batch);
-                    }
+                  if (batch.status === 1) {
+                    ongoingBatches.push(batch);
+                  }
                 });
                 this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
                   'showing-enrolled-ongoing-batch-popup',
@@ -911,10 +852,10 @@ export class CoursesPage implements OnInit, OnDestroy {
                 const popover = await this.popCtrl.create({
                   component: EnrollmentDetailsComponent,
                   componentProps: {
-                    upcommingBatches,
+                    upcommingBatches: [],
                     ongoingBatches,
                     retiredBatched,
-                    courseId: content.identifier
+                    content
                   },
                   cssClass: 'enrollement-popover'
                 });
@@ -942,10 +883,9 @@ export class CoursesPage implements OnInit, OnDestroy {
     const identifier = content.contentId || content.identifier;
     let telemetryObject: TelemetryObject;
     if (courseDetails.layoutName === ContentCard.LAYOUT_INPROGRESS) {
-      telemetryObject = new TelemetryObject(identifier, ContentType.COURSE, undefined);
+      telemetryObject = new TelemetryObject(identifier, CsPrimaryCategory.COURSE, undefined);
     } else {
-      const objectType = this.telemetryGeneratorService.isCollection(content.mimeType) ? content.contentType : ContentType.RESOURCE;
-      telemetryObject = new TelemetryObject(identifier, objectType, undefined);
+      telemetryObject = ContentUtil.getTelemetryObject(content);
     }
 
     const corRelationList: Array<CorrelationData> = [{
@@ -956,11 +896,11 @@ export class CoursesPage implements OnInit, OnDestroy {
       type: CorReleationDataType.ROOT_ID
     }];
     if (courseDetails.isFilterApplied) {
-     corRelationList.push({
-       id: 'filter',
-       type: CorReleationDataType.DISCOVERY_TYPE
-     });
-   }
+      corRelationList.push({
+        id: 'filter',
+        type: CorReleationDataType.DISCOVERY_TYPE
+      });
+    }
     const values = new Map();
     values['sectionName'] = courseDetails.sectionName;
     values['positionClicked'] = courseDetails.index;
@@ -973,35 +913,164 @@ export class CoursesPage implements OnInit, OnDestroy {
       values,
       ContentUtil.generateRollUp(undefined, identifier),
       this.commonUtilService.deDupe(corRelationList, 'type'));
-      if (courseDetails.layoutName === ContentCard.LAYOUT_INPROGRESS || content.contentType === ContentType.COURSE) {
-      this.router.navigate([RouterLinks.ENROLLED_COURSE_DETAILS], {
-        state: {
-          content,
-          isCourse: true,
-          corRelation: corRelationList
-        }
+    if (courseDetails.layoutName === ContentCard.LAYOUT_INPROGRESS || ContentUtil.isTrackable(content) === 1) {
+      this.navService.navigateToTrackableCollection({
+        content,
+        isCourse: true,
+        corRelation: corRelationList
       });
     } else if (content.mimeType === MimeType.COLLECTION) {
-      this.router.navigate([RouterLinks.COLLECTION_DETAILS], {
-        state: {
-          content,
-          corRelation: corRelationList
-        }
+      this.navService.navigateToCollection({
+        content,
+        corRelation: corRelationList
       });
     } else {
-      this.router.navigate([RouterLinks.CONTENT_DETAILS], {
+      this.navService.navigateToContent({
+        content,
+        isCourse: true,
+        corRelation: corRelationList
+      });
+    }
+  }
+
+  navigateToTextbookPage(items, subject) {
+    this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
+      InteractSubtype.VIEW_MORE_CLICKED,
+      Environment.HOME,
+      PageId.LIBRARY,
+      ContentUtil.getTelemetryObject(items));
+    if (this.commonUtilService.networkInfo.isNetworkAvailable || items.isAvailableLocally) {
+
+      this.router.navigate([RouterLinks.TEXTBOOK_VIEW_MORE], {
         state: {
-          content,
-          isCourse: true,
-          corRelation: corRelationList
+          contentList: items,
+          subjectName: subject
         }
       });
+    } else {
+      this.commonUtilService.presentToastForOffline('OFFLINE_WARNING_ETBUI_1');
     }
   }
 
-  private getContentIndexOf(contentList, content) {
-    const contentIndex = contentList.findIndex(val => val.identifier === content.identifier);
-    return contentIndex;
+  async getAggregatorResult(resetFilter?: boolean) {
+    this.spinner(true);
+    this.profile = await this.profileService.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS }).toPromise();
+    const audience: string[] = await this.profileHandler.getAudience(this.profile.profileType);
+    const request: ContentAggregatorRequest = {
+      applyFirstAvailableCombination: {},
+      userPreferences: {
+        board: this.profile.board,
+        medium: this.profile.medium,
+        gradeLevel: this.profile.grade,
+        subject: this.profile.subject
+      },
+      interceptSearchCriteria: (contentSearchCriteria: ContentSearchCriteria) => {
+        if (this.filter) {
+          contentSearchCriteria = this.concatFilter(this.filter, contentSearchCriteria);
+        }
+        if (this.profile) {
+          if (this.profile.board && this.profile.board.length) {
+            contentSearchCriteria.board = applyProfileFilter(this.appGlobalService, this.profile.board,
+              contentSearchCriteria.board, 'board');
+          }
+
+          if (this.profile.medium && this.profile.medium.length) {
+            contentSearchCriteria.medium = applyProfileFilter(this.appGlobalService, this.profile.medium,
+              contentSearchCriteria.medium, 'medium');
+          }
+
+          if (this.profile.grade && this.profile.grade.length) {
+            contentSearchCriteria.grade = applyProfileFilter(this.appGlobalService, this.profile.grade,
+              contentSearchCriteria.grade, 'gradeLevel');
+          }
+        }
+        // contentSearchCriteria.audience = audience;
+        return contentSearchCriteria;
+      }
+    };
+    try {
+      this.dynamicCourses = await this.contentAggregatorHandler.newAggregate(request, AggregatorPageType.COURSE);
+      if (this.dynamicCourses) {
+        this.dynamicCourses = this.contentAggregatorHandler.populateIcons(this.dynamicCourses);
+        this.isGroupedCoursesAvailable(this.dynamicCourses);
+      }
+      this.spinner(false);
+    } catch (e) {
+      this.spinner(false);
+    }
+  }
+
+  concatFilter(filter, searchCriteria) {
+    if (filter.gradeLevel) {
+      filter.grade = filter.gradeLevel;
+      delete filter.gradeLevel;
+    }
+    return { ...filter, ...searchCriteria };
+  }
+
+  async exploreOtherContents() {
+    const syllabus: Array<string> = this.appGlobalService.getCurrentUser().syllabus;
+    const frameworkId = (syllabus && syllabus.length > 0) ? syllabus[0] : undefined;
+    const gradeLevelInfo = await this.getCategoryData(frameworkId, FrameworkCategoryCode.GRADE_LEVEL, this.profile.grade);
+    const mediumInfo = await this.getCategoryData(frameworkId, FrameworkCategoryCode.MEDIUM, this.profile.medium);
+    const subjectInfo = await this.getCategoryData(frameworkId, FrameworkCategoryCode.SUBJECT, this.profile.subject);
+    const navigationExtras = {
+      state: {
+        categoryGradeLevels: gradeLevelInfo['categoryList'],
+        primaryCategories: [CsPrimaryCategory.COURSE],
+        selectedGrade:  gradeLevelInfo['selectedCategory'],
+        selectedMedium: mediumInfo['selectedCategory'],
+        subjects: [...subjectInfo['categoryList']]
+      }
+    };
+    this.router.navigate([RouterLinks.EXPLORE_BOOK], navigationExtras);
+
+    const corRelationList: Array<CorrelationData> = [];
+    corRelationList.push({ id: this.profile.board ? this.profile.board.join(',') : '', type: CorReleationDataType.BOARD });
+    corRelationList.push({
+      id: this.profile.grade && this.profile.grade.length ? this.profile.grade.join(',') : '',
+      type: CorReleationDataType.CLASS });
+    corRelationList.push({
+      id: this.profile.medium && this.profile.medium.length ? this.profile.medium.join(',') : '',
+      type: CorReleationDataType.MEDIUM });
+
+    // this.telemetryGeneratorService.generateInteractTelemetry(
+    //   this.storyAndWorksheets.length === 0 ? InteractType.WITHOUT_CONTENT : InteractType.WITH_CONTENT,
+    //   '',
+    //   Environment.COURSE,
+    //   PageId.COURSES,
+    //   undefined,
+    //   undefined, undefined, corRelationList,
+    //   ID.SEE_MORE_CONTENT_BUTTON_CLICKED);
+  }
+
+  async getCategoryData(frameworkId, categoryName, currentCategory): Promise<any> {
+    const req: GetFrameworkCategoryTermsRequest = {
+      currentCategoryCode: categoryName,
+      language: this.translate.currentLang,
+      requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES,
+      frameworkId
+    };
+    const categoryMapList = await this.frameworkUtilService.getFrameworkCategoryTerms(req).toPromise();
+    const selectedCategory = ((categoryMapList || [])
+                            .filter((category) => (currentCategory || []).includes(category.code)) || [])
+                            .map((category) => category.name);
+    return {
+      selectedCategory,
+      categoryList: categoryMapList
+    };
+  }
+
+  isGroupedCoursesAvailable(displayItems) {
+    this.isCourseListEmpty = true;
+    for (let index = 0; index < displayItems.length; index++) {
+      if (displayItems[index] && displayItems[index].data && ((displayItems[index].data.length) ||
+        (displayItems[index].data.sections && displayItems[index].data.sections.length && displayItems[index].data.sections[0].contents && displayItems[index].data.sections[0].contents.length)
+      )) {
+        this.isCourseListEmpty = false;
+        break;
+      }
+    }
   }
 
 }
diff --git a/src/app/curriculum-courses/chapter-details/chapter-details.module.ts b/src/app/curriculum-courses/chapter-details/chapter-details.module.ts
new file mode 100644
index 000000000..2860755a8
--- /dev/null
+++ b/src/app/curriculum-courses/chapter-details/chapter-details.module.ts
@@ -0,0 +1,37 @@
+import { NgModule } from '@angular/core';
+import { CommonModule, DatePipe } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { Routes, RouterModule } from '@angular/router';
+
+import { IonicModule } from '@ionic/angular';
+
+import { ChapterDetailsPage } from './chapter-details.page';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
+import { TranslateModule } from '@ngx-translate/core';
+import { ComponentsModule } from '@app/app/components/components.module';
+import { ContentActionsComponent } from '../../components';
+import { PipesModule } from '@app/pipes/pipes.module';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ChapterDetailsPage
+  }
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    CommonConsumptionModule,
+    ComponentsModule,
+    PipesModule,
+    TranslateModule.forChild(),
+    RouterModule.forChild(routes),
+  ],
+  declarations: [ChapterDetailsPage],
+  entryComponents: [ContentActionsComponent],
+  providers: [DatePipe]
+})
+export class ChapterDetailsPageModule {}
diff --git a/src/app/curriculum-courses/chapter-details/chapter-details.page.html b/src/app/curriculum-courses/chapter-details/chapter-details.page.html
new file mode 100644
index 000000000..dba108aa1
--- /dev/null
+++ b/src/app/curriculum-courses/chapter-details/chapter-details.page.html
@@ -0,0 +1,97 @@
+<ion-content>
+  <div class="cd-header-container">
+    <div class="cd-title-container">
+      <div class="cd-label">{{ courseContentData?.name }}</div>
+      <div class="cd-header-title">{{ chapter.name}}</div>
+      <div class="cd-of-menu">
+        <img class="cd-menu-icon" (click)="showOverflowMenu($event)" src="assets/imgs/menu.svg" alt="menu-icon">
+      </div>
+    </div>
+    <div class="new-div">
+      <div *ngIf="!isAlreadyEnrolled">
+        <div class="enrollment-info"
+          *ngIf="batches && courseContentData?.contentData?.createdBy !== userId && (batches.length > 1 || (batches.length === 1 && !(todayDate > batches[0].enrollmentEndDate)))">
+          <button class="enrolled-course-card-button" (click)="navigateToBatchListPage();">
+            {{'FRMELEMNTS_LBL_JOIN_TRAINING' | categoryKeyTranslate : courseContentData }}
+          </button>
+        </div>
+      </div>
+      <div class="sb-course-end-container"
+        *ngIf="batches && !isAlreadyEnrolled && !batches.length">
+        <p class="main-heading">
+          <strong>{{'NO_BATCHES_AVAILABLE'  | translate}}</strong>
+        </p>
+        <p class="sub-heading">{{'FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING' | categoryKeyTranslate : courseContentData }}</p>
+      </div>
+      <div class="sb-course-end-container"
+         *ngIf="batches && !isAlreadyEnrolled && batches.length === 1 && (todayDate > batches[0].enrollmentEndDate)">
+        <p class="main-heading">
+          <strong>{{'ENROLLMENT_ENDED_ON'  | translate : {'%s': enrollmentEndDate ? (enrollmentEndDate | date: 'dd/MM/yyyy') : ''} }}</strong>
+        </p>
+        <p class="sub-heading">{{'FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING' | categoryKeyTranslate : courseContentData }}</p>
+      </div>
+    </div>
+    <ion-card-content class="ion-no-padding">
+      <div *ngIf="isAlreadyEnrolled">
+        <div *ngIf="courseContent?.batchId">
+          <div class="sb-course-progress-container" *ngIf="!isChapterCompleted && !batchExp">
+            <p class="progress-label"><strong>{{'YOUR_PROGRESS_LABEL' | translate}}</strong></p>
+            <p>{{viewedContents.length}}/{{childContents.length}} {{'COMPLETED' | translate}}</p>
+            <app-pb-horizontal [progress]="chapterProgress"
+              class="course-progress" [ngClass]="{'blurbackground': batchExp}"
+              isOnBoardCard="flase" isCourseProgress="true"></app-pb-horizontal>
+          </div>
+          <div *ngIf="isChapterCompleted"
+            class="sb-course-complete-container ion-padding">
+            <div class="img-container">
+              <img class="success-badge" src='assets/imgs/Badge green.svg'
+                alt="completed">
+            </div>
+            <div class="text-container">
+              <p><strong>{{'CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY' | categoryKeyTranslate : courseContentData }}</strong></p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </ion-card-content>
+    <div class="cd-flex-container" *ngIf="isAlreadyEnrolled">
+      <div style="width: 100%;">
+        <button class="cd-chapter-card-button" *ngIf="!isChapterCompleted && !isChapterStarted" (click)="startLearning();">
+          <img class="play-icon" src="assets/imgs/Play@1.5x.svg" alt="play-icon">
+          {{'START_LEARNING' | translate}}
+        </button>
+        <button class="cd-chapter-card-button" *ngIf="isChapterCompleted" (click)="continueLearning();">
+          <img class="play-icon" src="assets/imgs/Play@1.5x.svg" alt="play-icon">
+          {{'START_AGAIN' | translate}}
+        </button>
+        <button class="cd-chapter-card-button" *ngIf="!isChapterCompleted && isChapterStarted" (click)="continueLearning();">
+          <img class="play-icon" src="assets/imgs/Play@1.5x.svg" alt="play-icon">
+          {{'CONTINUE_LEARNING' | translate}}
+        </button>
+      </div>
+    </div>
+  </div>
+  <div class="cd-container">
+    <div class="cd-flex-container">
+      <div class="cd-container-title">{{"CONTENTS" | translate}}</div>
+      <div class="cd-container-progress" *ngIf="isAlreadyEnrolled">{{viewedContents.length}}/{{childContents.length}} {{"COMPLETED" | translate}}</div>
+    </div>
+    <div>
+      <sb-toc-curriculum *ngIf="chapter" [type]="cardType"  [tocData]="chapter" [contentStatus]="contentStatusData?.contentList || []" 
+      [maxAttempts]="maxAssessmentLimit" [disabled]="'disabled-toc-card'" [scoreLabel]="'BEST_SCORE' | translate"
+      (tocCardClick)="openContentDetails($event)"></sb-toc-curriculum>
+    </div>
+    
+  </div>
+</ion-content>
+<ng-container *ngIf="trackDownloads$ | async; let downloads">
+  <app-sb-download-popup *ngIf="downloads.queued.length"
+    (cancelDownloadEmit)="cancelDownload($event)" 
+    [currentCount]="downloads.completed.length"
+    [queuedIdentifiers]="(downloadIdentifiers.size)" 
+    [downloadSize]="downloadSize"
+    [collectionName]="chapter?.name" 
+    [showDownload]="true"
+    [showPopover]="showCollapsedPopup">
+  </app-sb-download-popup>
+</ng-container>
\ No newline at end of file
diff --git a/src/app/curriculum-courses/chapter-details/chapter-details.page.scss b/src/app/curriculum-courses/chapter-details/chapter-details.page.scss
new file mode 100644
index 000000000..636d6c3d1
--- /dev/null
+++ b/src/app/curriculum-courses/chapter-details/chapter-details.page.scss
@@ -0,0 +1,99 @@
+@import "src/assets/styles/_variables.scss";
+.cd-header-container {
+    padding: 16px;
+    margin: 8px;
+    border-radius: 2px;
+    box-shadow: 0 3px 5px 4px rgba(0,0,0,0.05);
+    position: relative;
+    .cd-title-container{
+        margin-bottom: 8px;
+    }
+    .cd-header-title {
+        color: map-get($colors, gray_3A);
+        font-size: 16px;
+        font-weight: bold;
+    }
+
+    .cd-of-menu{
+        position: absolute;
+        top: 16px;
+        right: 16px;
+        .cd-menu-icon{
+            height: 16px;
+            width: 20px;
+            margin: 8px 8px 8px 16px;
+        }
+    }
+
+    .cd-progress-container {
+        background-color: map-get($colors, pale_blue);
+        padding: 8px;
+        margin-top: 8px;
+        width: auto;
+
+        .progress-label {
+            font-size: 10px !important;
+            color: map-get($colors, primary_black);
+            font-weight: bold;
+        }
+    }
+
+    .cd-unblock-text {
+        color: map-get($colors, gray_3A);
+        font-size: 10px;
+        padding: 8px 0px;
+    }
+
+    .cd-chapter-card-button {
+        background-color: $green;
+        border: 1px solid $green;
+        color: white;
+        display: inline-block;
+        font-size: 16px;
+        cursor: pointer;
+        outline: none;
+        width: 100%;
+        padding: 16px 0px 16px 0px;
+        box-shadow: 0 4px 7px 0 rgba(0,0,0,0.25);
+
+        .play-icon {
+            margin-right: px;
+        }
+    }
+}
+
+.cd-container {
+    padding: 0px 16px 16px 16px;
+
+    .cd-container-title {
+        color: map-get($colors, gray_3A);
+        font-size: 18px;
+        font-weight: bold;
+    }
+
+    .cd-container-progress {
+        color: map-get($colors, granite_gray);
+        font-size: 12px;
+    }
+
+    .cd-container-sub-title {
+        color: map-get($colors, gray_3A);
+        font-size: 14px;
+    }
+}
+
+.cd-flex-container {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 8px;
+    .cd-align-s {
+        align-items: start;
+        margin-bottom: 8px;
+    }
+}
+
+.cd-label {
+    color: map-get($colors, granite_gray);
+    font-size: 10px;
+}
diff --git a/src/app/curriculum-courses/chapter-details/chapter-details.page.spec.ts b/src/app/curriculum-courses/chapter-details/chapter-details.page.spec.ts
new file mode 100644
index 000000000..4891636d1
--- /dev/null
+++ b/src/app/curriculum-courses/chapter-details/chapter-details.page.spec.ts
@@ -0,0 +1,1897 @@
+import { ChapterDetailsPage } from './chapter-details.page';
+import { TranslateService } from '@ngx-translate/core';
+import {
+    AppHeaderService, CommonUtilService, LoginHandlerService,
+    AppGlobalService, LocalCourseService
+} from '@app/services';
+import { Router } from '@angular/router';
+import {
+    ProfileService, SharedPreferences, AuthService,
+    CourseService, DownloadService,
+    EventsBusService, ContentService, TelemetryObject
+} from '@project-sunbird/sunbird-sdk';
+import { PopoverController, Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { NgZone } from '@angular/core';
+import { DatePipe, Location } from '@angular/common';
+import { FileSizePipe } from '@app/pipes/file-size/file-size';
+import { FileService } from '@project-sunbird/sunbird-sdk/util/file/def/file-service';
+import { MimeType, EventTopics, RouterLinks, PreferenceKey } from '../../app.constant';
+import { of, throwError } from 'rxjs';
+import { SbProgressLoader } from '../../../services/sb-progress-loader.service';
+import { TelemetryGeneratorService } from '../../../services/telemetry-generator.service';
+import { ImpressionType, PageId, Environment, InteractSubtype, InteractType } from '../../../services/telemetry-constants';
+import { ContentPlayerHandler } from '@app/services/content/player/content-player-handler';
+import { CategoryKeyTranslator } from '@app/pipes/category-key-translator/category-key-translator-pipe';
+import {
+    TncUpdateHandlerService,
+} from '../../services/handlers/tnc-update-handler.service';
+import { mockProfileData } from '../../profile/profile.page.spec.data';
+
+describe('ChapterDetailsPage', () => {
+    let chapterDetailsPage: ChapterDetailsPage;
+
+    const mockProfileService: Partial<ProfileService> = {};
+    const mockAppHeaderService: Partial<AppHeaderService> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => ({
+            extras: {
+                state: {
+                    courseName: 'sample-course',
+                    chapterData: {
+                        chapterName: 'sample-chapter',
+                        children: [{ identifier: 'd0-12', mimeType: MimeType.COLLECTION },
+                        { identifier: 'd0-13', mimeType: MimeType.VIDEO[0] }],
+                        contentData: { pkgVersion: 'sample-pkg-ver' },
+                        hierarchyInfo: [],
+                        identifier: 'do-123'
+                    },
+                    courseContent: {
+                        name: 'course-content', identifier: 'do-123',
+                        batchId: 'sample-batch-id',
+                        contentData: { name: 'sample-content-data', identifier: 'do-12345' }
+                    },
+                    isFromDeeplink: true
+                }
+            }
+        })) as any
+    };
+    const mockTranslate: Partial<TranslateService> = {};
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        getUserId: jest.fn(() => 'SAMPLE_USER')
+    };
+    const mockAuthService: Partial<AuthService> = {};
+    const mockContentService: Partial<ContentService> = {};
+    const mockCourseService: Partial<CourseService> = {
+        getBatchDetails: jest.fn(() => of('batch' as any))
+    };
+    const mockDatePipe: Partial<DatePipe> = {};
+    const mockDownloadService: Partial<DownloadService> = {};
+    const mockEvents: Partial<Events> = {};
+    const mockEventsBusService: Partial<EventsBusService> = {};
+    const mockFileSizePipe: Partial<FileService> = {};
+    const mockLocalCourseService: Partial<LocalCourseService> = {
+        isEnrollable: jest.fn(() => true)
+    };
+    const mockLoginHandlerService: Partial<LoginHandlerService> = {};
+    const mockPopoverCtrl: Partial<PopoverController> = {};
+    const mockPreferences: Partial<SharedPreferences> = {
+        putString: jest.fn(() => of())
+    };
+    const mockZone: Partial<NgZone> = {};
+    const mockSbProgressLoader: Partial<SbProgressLoader> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockLocation: Partial<Location> = {};
+    const mockPlatform: Partial<Platform> = {};
+    const mockContentPlayerHandler: Partial<ContentPlayerHandler> = {};
+    const mockCategoryKeyTranslator: Partial<CategoryKeyTranslator> = {
+        transform: jest.fn(() => 'sample-message')
+    };
+    const mockTncUpdateHandlerService: Partial<TncUpdateHandlerService> = {
+        dismissTncPage: jest.fn(),
+        isSSOUser: jest.fn()
+    };
+
+    beforeAll(() => {
+        chapterDetailsPage = new ChapterDetailsPage(
+            mockProfileService as ProfileService,
+            mockPreferences as SharedPreferences,
+            mockAuthService as AuthService,
+            mockCourseService as CourseService,
+            mockDownloadService as DownloadService,
+            mockEventsBusService as EventsBusService,
+            mockContentService as ContentService,
+            mockAppHeaderService as AppHeaderService,
+            mockTranslate as TranslateService,
+            mockCommonUtilService as CommonUtilService,
+            mockRouter as Router,
+            mockLoginHandlerService as LoginHandlerService,
+            mockAppGlobalService as AppGlobalService,
+            mockPopoverCtrl as PopoverController,
+            mockLocalCourseService as LocalCourseService,
+            mockEvents as Events,
+            mockZone as NgZone,
+            mockDatePipe as DatePipe,
+            mockFileSizePipe as FileSizePipe,
+            mockSbProgressLoader as SbProgressLoader,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockLocation as Location,
+            mockPlatform as Platform,
+            mockContentPlayerHandler as ContentPlayerHandler,
+            mockCategoryKeyTranslator as CategoryKeyTranslator,
+            mockTncUpdateHandlerService as TncUpdateHandlerService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create a instance of chapterDetailsPage', () => {
+        expect(chapterDetailsPage).toBeTruthy();
+    });
+
+    describe('ngOnInit', () => {
+        it('should return all leave chapters of collection mimeType', () => {
+            // arrange
+            mockDownloadService.trackDownloads = jest.fn(() => of({ completed: 'yes' })) as any;
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            // act
+            chapterDetailsPage.ngOnInit();
+            // assert
+            expect(mockDownloadService.trackDownloads).toHaveBeenCalled();
+            expect(chapterDetailsPage.chapter.hierarchyInfo).toBeTruthy();
+            expect(chapterDetailsPage.chapter.contentData.pkgVersion).toBe('sample-pkg-ver');
+            expect(chapterDetailsPage.chapter.identifier).toBe('do-123');
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                ImpressionType.DETAIL,
+                '', PageId.CHAPTER_DETAILS,
+                Environment.HOME,
+                chapterDetailsPage.chapter.identifier,
+                undefined,
+                chapterDetailsPage.chapter.contentData.pkgVersion,
+                {},
+                undefined
+            );
+
+        });
+    });
+
+    describe('ionViewWillEnter', () => {
+        it('should handle header back button', (done) => {
+            // arrange
+            mockAppHeaderService.showHeaderWithBackButton = jest.fn();
+            jest.spyOn(chapterDetailsPage, 'subscribeUtilityEvents').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(chapterDetailsPage, 'subscribeSdkEvent').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(chapterDetailsPage, 'checkLoggedInOrGuestUser').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(chapterDetailsPage, 'getAllBatches').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(chapterDetailsPage, 'getAllContents').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(chapterDetailsPage, 'checkChapterCompletion').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(chapterDetailsPage, 'getContentState').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(chapterDetailsPage, 'getContentsSize').mockImplementation(() => {
+                return;
+            });
+            const mockConfig = {
+                subscribe: jest.fn(() => { })
+            };
+            mockAppHeaderService.headerEventEmitted$ = of(mockConfig);
+            chapterDetailsPage.guestUser = false;
+            mockAppGlobalService.setEnrolledCourseList = jest.fn();
+            mockCourseService.getEnrolledCourses = jest.fn(() => of([
+                {
+                    batchId: 'sample-batch-id',
+                    courseId: 'sample-course-id',
+                    batch: { status: 1 }
+                }
+            ]));
+            jest.spyOn(chapterDetailsPage, 'handleHeaderEvents').mockImplementation(() => {
+                return;
+            });
+            const subscribeWithPriorityData = jest.fn((_, fn) => fn({}));
+            mockPlatform.backButton = {
+                subscribeWithPriority: subscribeWithPriorityData,
+            } as any;
+            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+            mockLocation.back = jest.fn();
+            // act
+            chapterDetailsPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockAppHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+                expect(mockAppHeaderService.headerEventEmitted$).toBeTruthy();
+                expect(subscribeWithPriorityData).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                    PageId.CHAPTER_DETAILS,
+                    Environment.HOME,
+                    false
+                );
+                expect(mockLocation.back).toHaveBeenCalled();
+                expect(chapterDetailsPage.guestUser).toBeFalsy();
+                expect(mockCourseService.getEnrolledCourses).toHaveBeenCalled();
+                expect(mockAppGlobalService.setEnrolledCourseList).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should handle header back button if response is empty', (done) => {
+            // arrange
+            mockAppHeaderService.showHeaderWithBackButton = jest.fn();
+            jest.spyOn(chapterDetailsPage, 'subscribeUtilityEvents').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(chapterDetailsPage, 'subscribeSdkEvent').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(chapterDetailsPage, 'checkLoggedInOrGuestUser').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(chapterDetailsPage, 'getAllBatches').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(chapterDetailsPage, 'getAllContents').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(chapterDetailsPage, 'checkChapterCompletion').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(chapterDetailsPage, 'getContentState').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(chapterDetailsPage, 'getContentsSize').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(chapterDetailsPage, 'handleHeaderEvents').mockImplementation(() => {
+                return;
+            });
+            const mockConfig = {
+                subscribe: jest.fn(() => { })
+            };
+            mockAppHeaderService.headerEventEmitted$ = of(mockConfig);
+            const subscribeWithPriorityData = jest.fn((_, fn) => fn({}));
+            mockPlatform.backButton = {
+                subscribeWithPriority: subscribeWithPriorityData,
+            } as any;
+            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+            mockLocation.back = jest.fn();
+            chapterDetailsPage.guestUser = false;
+            mockCourseService.getEnrolledCourses = jest.fn(() => of([]));
+            // act
+            chapterDetailsPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockAppHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+                expect(mockAppHeaderService.headerEventEmitted$).toBeTruthy();
+                expect(subscribeWithPriorityData).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                    PageId.CHAPTER_DETAILS,
+                    Environment.HOME,
+                    false
+                );
+                expect(chapterDetailsPage.guestUser).toBeFalsy();
+                expect(mockCourseService.getEnrolledCourses).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should handle header back button for catch part', (done) => {
+            // arrange
+            mockAppHeaderService.showHeaderWithBackButton = jest.fn();
+            jest.spyOn(chapterDetailsPage, 'subscribeUtilityEvents').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(chapterDetailsPage, 'subscribeSdkEvent').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(chapterDetailsPage, 'checkLoggedInOrGuestUser').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(chapterDetailsPage, 'getAllBatches').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(chapterDetailsPage, 'getAllContents').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(chapterDetailsPage, 'checkChapterCompletion').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(chapterDetailsPage, 'getContentState').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(chapterDetailsPage, 'getContentsSize').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(chapterDetailsPage, 'handleHeaderEvents').mockImplementation(() => {
+                return;
+            });
+            const mockConfig = {
+                subscribe: jest.fn(() => { })
+            };
+            mockAppHeaderService.headerEventEmitted$ = of(mockConfig);
+            const subscribeWithPriorityData = jest.fn((_, fn) => fn({}));
+            mockPlatform.backButton = {
+                subscribeWithPriority: subscribeWithPriorityData,
+            } as any;
+            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+            mockLocation.back = jest.fn();
+            chapterDetailsPage.isFromDeeplink = false;
+            chapterDetailsPage.guestUser = false;
+            mockAppGlobalService.setEnrolledCourseList = jest.fn();
+            mockCourseService.getEnrolledCourses = jest.fn(() => throwError([
+                {
+                    error: 'error'
+                }
+            ]));
+            // act
+            chapterDetailsPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockAppHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+                expect(mockAppHeaderService.headerEventEmitted$).toBeTruthy();
+                expect(subscribeWithPriorityData).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                    PageId.CHAPTER_DETAILS,
+                    Environment.HOME,
+                    false
+                );
+                expect(chapterDetailsPage.guestUser).toBeFalsy();
+                expect(chapterDetailsPage.isFromDeeplink).toBeFalsy();
+                expect(mockCourseService.getEnrolledCourses).toHaveBeenCalled();
+                expect(mockAppGlobalService.setEnrolledCourseList).not.toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should handle header back button for guest user', (done) => {
+            // arrange
+            mockAppHeaderService.showHeaderWithBackButton = jest.fn();
+            jest.spyOn(chapterDetailsPage, 'subscribeUtilityEvents').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(chapterDetailsPage, 'subscribeSdkEvent').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(chapterDetailsPage, 'checkLoggedInOrGuestUser').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(chapterDetailsPage, 'getAllBatches').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(chapterDetailsPage, 'getAllContents').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(chapterDetailsPage, 'checkChapterCompletion').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(chapterDetailsPage, 'getContentState').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(chapterDetailsPage, 'getContentsSize').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(chapterDetailsPage, 'handleHeaderEvents').mockImplementation(() => {
+                return;
+            });
+            const mockConfig = {
+                subscribe: jest.fn(() => { })
+            };
+            mockAppHeaderService.headerEventEmitted$ = of(mockConfig);
+            const subscribeWithPriorityData = jest.fn((_, fn) => fn({}));
+            mockPlatform.backButton = {
+                subscribeWithPriority: subscribeWithPriorityData,
+            } as any;
+            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+            mockLocation.back = jest.fn();
+            chapterDetailsPage.isFromDeeplink = false;
+            chapterDetailsPage.guestUser = true;
+            // act
+            chapterDetailsPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockAppHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+                expect(mockAppHeaderService.headerEventEmitted$).toBeTruthy();
+                expect(subscribeWithPriorityData).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                    PageId.CHAPTER_DETAILS,
+                    Environment.HOME,
+                    false
+                );
+                expect(chapterDetailsPage.guestUser).toBeTruthy();
+                expect(chapterDetailsPage.isFromDeeplink).toBeFalsy();
+                done();
+            }, 0);
+        });
+    });
+
+    it('should unsubscribe eventSubscription', () => {
+        // arrange
+        mockEvents.publish = jest.fn(() => []);
+        // act
+        chapterDetailsPage.ionViewWillLeave();
+        // assert
+        expect(mockEvents.publish).toHaveBeenCalledWith('header:setzIndexToNormal');
+    });
+
+    it('ngOnDestroy', () => {
+        mockEvents.unsubscribe = jest.fn();
+        chapterDetailsPage.ngOnDestroy();
+        expect(mockEvents.unsubscribe).toHaveBeenCalledWith(EventTopics.ENROL_COURSE_SUCCESS);
+    });
+
+    describe('getAllBatches', () => {
+
+        beforeAll(() => {
+            chapterDetailsPage = new ChapterDetailsPage(
+                mockProfileService as ProfileService,
+                mockPreferences as SharedPreferences,
+                mockAuthService as AuthService,
+                mockCourseService as CourseService,
+                mockDownloadService as DownloadService,
+                mockEventsBusService as EventsBusService,
+                mockContentService as ContentService,
+                mockAppHeaderService as AppHeaderService,
+                mockTranslate as TranslateService,
+                mockCommonUtilService as CommonUtilService,
+                mockRouter as Router,
+                mockLoginHandlerService as LoginHandlerService,
+                mockAppGlobalService as AppGlobalService,
+                mockPopoverCtrl as PopoverController,
+                mockLocalCourseService as LocalCourseService,
+                mockEvents as Events,
+                mockZone as NgZone,
+                mockDatePipe as DatePipe,
+                mockFileSizePipe as FileSizePipe,
+                mockSbProgressLoader as SbProgressLoader,
+                mockTelemetryGeneratorService as TelemetryGeneratorService,
+                mockLocation as Location,
+                mockPlatform as Platform,
+                mockContentPlayerHandler as ContentPlayerHandler,
+                mockCategoryKeyTranslator as CategoryKeyTranslator,
+                mockTncUpdateHandlerService as TncUpdateHandlerService
+            );
+        });
+        it('should return all batches', (done) => {
+            // arrange
+            mockCourseService.getCourseBatches = jest.fn(() => of([]));
+            chapterDetailsPage.getAllBatches();
+            setTimeout(() => {
+                expect(mockCourseService.getCourseBatches).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should not return all batches for error part', (done) => {
+            // arrange
+            mockCourseService.getCourseBatches = jest.fn(() => throwError({ error: 'error' }));
+            chapterDetailsPage.getAllBatches();
+            setTimeout(() => {
+                expect(mockCourseService.getCourseBatches).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('checkLoggedInOrGuestUser', () => {
+        it('should checked LoggedIn user Or GuestUser', (done) => {
+            // arrange
+            mockAuthService.getSession = jest.fn(() => of({ userToken: 'sample-user-token' })) as any;
+            // act
+            chapterDetailsPage.checkLoggedInOrGuestUser();
+            // assert
+            setTimeout(() => {
+                expect(mockAuthService.getSession).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should checked GuestUser', (done) => {
+            // arrange
+            mockAuthService.getSession = jest.fn(() => of(undefined)) as any;
+            // act
+            chapterDetailsPage.checkLoggedInOrGuestUser();
+            // assert
+            setTimeout(() => {
+                expect(mockAuthService.getSession).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('getContentState', () => {
+        it('should return contentState', (done) => {
+            // arrange
+            chapterDetailsPage.courseContent = {
+                batchId: 'sample-batch-id',
+                contentData: {
+                    leafNodes: [
+                        'do_1', 'do_12', 'do_123'
+                    ]
+                }
+            };
+            mockAppGlobalService.getUserId = jest.fn(() => 'sample-user-id');
+            mockCourseService.getContentState = jest.fn(() => of({})) as any;
+            mockZone.run = jest.fn((fn) => fn());
+            // act
+            chapterDetailsPage.getContentState(true);
+            // assert
+            setTimeout(() => {
+                expect(chapterDetailsPage.courseContent.batchId).toBeTruthy();
+                expect(mockAppGlobalService.getUserId).toHaveBeenCalled();
+                expect(mockCourseService.getContentState).toHaveBeenCalled();
+                expect(mockZone.run).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should not return contentState for catch part', (done) => {
+            // arrange
+            chapterDetailsPage.courseContent = {
+                batchId: 'sample-batch-id',
+                contentData: {
+                    leafNodes: [
+                        'do_1', 'do_12', 'do_123'
+                    ]
+                }
+            };
+            mockAppGlobalService.getUserId = jest.fn(() => 'sample-user-id');
+            mockCourseService.getContentState = jest.fn(() => throwError({ error: 'error' }));
+            mockZone.run = jest.fn((fn) => fn());
+            // act
+            chapterDetailsPage.getContentState(true);
+            // assert
+            setTimeout(() => {
+                expect(chapterDetailsPage.courseContent.batchId).toBeTruthy();
+                expect(mockAppGlobalService.getUserId).toHaveBeenCalled();
+                expect(mockCourseService.getContentState).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should not return contentState for else part', (done) => {
+            // arrange
+            chapterDetailsPage.courseContent = {
+                batchId: undefined
+            };
+            // act
+            chapterDetailsPage.getContentState(true);
+            // assert
+            setTimeout(() => {
+                expect(chapterDetailsPage.courseContent.batchId).toBeUndefined();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('getBatchDetails', () => {
+        it('should return courseStartDate if status is 0', (done) => {
+            // arrange
+            chapterDetailsPage.courseContent = {
+                batchId: 'sample-batch-id'
+            };
+            mockCourseService.getBatchDetails = jest.fn(() => of({
+                status: 0,
+                startDate: '2020-06-02'
+            })) as any;
+            mockZone.run = jest.fn((fn) => fn());
+            // act
+            chapterDetailsPage.getBatchDetails();
+            // assert
+            setTimeout(() => {
+                expect(chapterDetailsPage.courseContent).toBeTruthy();
+                expect(chapterDetailsPage.courseContent.batchId).toBeTruthy();
+                expect(mockCourseService.getBatchDetails).toHaveBeenCalledWith({ batchId: chapterDetailsPage.courseContent.batchId });
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(chapterDetailsPage.batchDetails).toStrictEqual({
+                    status: 0,
+                    startDate: '2020-06-02'
+                });
+                expect(chapterDetailsPage.isBatchNotStarted).toBeTruthy();
+                expect(chapterDetailsPage.courseStartDate.batchId).toBe(chapterDetailsPage.batchDetails.batchId);
+                done();
+            }, 0);
+        });
+
+        it('should return batch Expire date if status is 2', (done) => {
+            // arrange
+            chapterDetailsPage.courseContent = {
+                batchId: 'sample-batch-id'
+            };
+            mockCourseService.getBatchDetails = jest.fn(() => of({
+                status: 2,
+                startDate: '2020-06-02'
+            })) as any;
+            mockZone.run = jest.fn((fn) => fn());
+            // act
+            chapterDetailsPage.getBatchDetails();
+            // assert
+            setTimeout(() => {
+                expect(chapterDetailsPage.courseContent).toBeTruthy();
+                expect(chapterDetailsPage.courseContent.batchId).toBeTruthy();
+                expect(mockCourseService.getBatchDetails).toHaveBeenCalledWith({ batchId: chapterDetailsPage.courseContent.batchId });
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(chapterDetailsPage.batchDetails).toStrictEqual({
+                    status: 2,
+                    startDate: '2020-06-02'
+                });
+                expect(chapterDetailsPage.batchExp).toBeTruthy();
+                done();
+            }, 0);
+        });
+
+        it('should return null if response is undefined', (done) => {
+            // arrange
+            chapterDetailsPage.courseContent = {
+                batchId: 'sample-batch-id'
+            };
+            mockCourseService.getBatchDetails = jest.fn(() => of(undefined));
+            mockZone.run = jest.fn((fn) => fn());
+            // act
+            chapterDetailsPage.getBatchDetails();
+            // assert
+            setTimeout(() => {
+                expect(chapterDetailsPage.courseContent).toBeTruthy();
+                expect(chapterDetailsPage.courseContent.batchId).toBeTruthy();
+                expect(mockCourseService.getBatchDetails).toHaveBeenCalledWith({ batchId: chapterDetailsPage.courseContent.batchId });
+                expect(mockZone.run).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should return null if status is > 2', (done) => {
+            // arrange
+            chapterDetailsPage.courseContent = {
+                batchId: 'sample-batch-id'
+            };
+            mockCourseService.getBatchDetails = jest.fn(() => of({
+                status: 3,
+                startDate: '2020-06-02'
+            })) as any;
+            mockZone.run = jest.fn((fn) => fn());
+            // act
+            chapterDetailsPage.getBatchDetails();
+            // assert
+            setTimeout(() => {
+                expect(chapterDetailsPage.courseContent).toBeTruthy();
+                expect(chapterDetailsPage.courseContent.batchId).toBeTruthy();
+                expect(mockCourseService.getBatchDetails).toHaveBeenCalledWith({ batchId: chapterDetailsPage.courseContent.batchId });
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(chapterDetailsPage.batchDetails).toStrictEqual({
+                    status: 3,
+                    startDate: '2020-06-02'
+                });
+                done();
+            }, 0);
+        });
+
+        it('should handel error for catch part', (done) => {
+            // arrange
+            chapterDetailsPage.courseContent = {
+                batchId: 'sample-batch-id',
+                batch: { staus: 1 }
+            };
+            mockCourseService.getBatchDetails = jest.fn(() => throwError({ error: 'error' }));
+            mockZone.run = jest.fn((fn) => fn());
+            // act
+            chapterDetailsPage.getBatchDetails();
+            // assert
+            setTimeout(() => {
+                expect(chapterDetailsPage.courseContent).toBeTruthy();
+                expect(chapterDetailsPage.courseContent.batchId).toBeTruthy();
+                expect(mockCourseService.getBatchDetails).toHaveBeenCalledWith({ batchId: chapterDetailsPage.courseContent.batchId });
+                done();
+            }, 0);
+        });
+
+        it('should return null if curseCard is undefined', (done) => {
+            // arrange
+            chapterDetailsPage.courseContent = {
+                batchId: undefined
+            };
+            // act
+            chapterDetailsPage.getBatchDetails();
+            // assert
+            setTimeout(() => {
+                expect(chapterDetailsPage.courseContent.batchId).toBeFalsy();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('getAllContents', () => {
+        it('should return all leaves contents which mimeType is not collection', () => {
+            // arrange
+            const collection = {
+                children: [{
+                    id: 'do-123',
+                    mimeType: MimeType.AUDIO[0],
+                    children: [{
+                        id: 'do-0-123',
+                        mimeType: MimeType.DOCS[0]
+                    }]
+                }, {
+                    id: '234',
+                    mimeType: MimeType.COLLECTION
+                }, {
+                    id: '345',
+                    mimeType: MimeType.INTERACTION[0],
+                    children: [
+                        {
+                            id: 'do-0-345',
+                            mimeType: MimeType.DOCS[1]
+                        }, {
+                            id: 'do-1-345',
+                            mimeType: MimeType.COLLECTION
+                        }
+                    ]
+                }]
+            };
+            // act
+            chapterDetailsPage.getAllContents(collection);
+            // assert
+            expect(chapterDetailsPage.childContents).toStrictEqual([
+                { id: 'do-0-123', mimeType: 'application/pdf' },
+                { id: 'do-0-345', mimeType: 'application/epub' }
+            ]);
+        });
+    });
+
+    describe('checkChapterCompletion', () => {
+        it('should return progress for chapter complition if isChapterCompleted', () => {
+            // arrange
+            chapterDetailsPage.contentStatusData = {
+                contentList: [
+                    {
+                        id: 'do-123',
+                        contentId: 'sample-content-id',
+                        status: 2
+                    }
+                ]
+            };
+
+            chapterDetailsPage.childContents = [{
+                identifier: 'sample-content-id'
+            }];
+            // act
+            chapterDetailsPage.checkChapterCompletion();
+            // arrange
+            expect(chapterDetailsPage.contentStatusData).toBeTruthy();
+            expect(chapterDetailsPage.contentStatusData.contentList.length).toBeGreaterThan(0);
+            expect(chapterDetailsPage.isChapterCompleted).toBeTruthy();
+            expect(chapterDetailsPage.chapterProgress).toBe(100);
+        });
+
+        it('should return progress for chapter complition if isChapterStarted', () => {
+            // arrange
+            chapterDetailsPage.contentStatusData = {
+                contentList: [
+                    {
+                        id: 'do-123',
+                        contentId: 'sample-content-id',
+                        status: 2
+                    }
+                ]
+            };
+
+            chapterDetailsPage.childContents = [{
+                identifier: 'sample-content-id'
+            }, {
+                identifier: 'sample-id-2'
+            }];
+            // act
+            chapterDetailsPage.checkChapterCompletion();
+            // arrange
+            expect(chapterDetailsPage.contentStatusData).toBeTruthy();
+            expect(chapterDetailsPage.contentStatusData.contentList.length).toBeGreaterThan(0);
+            expect(chapterDetailsPage.isChapterCompleted).toBeTruthy();
+            expect(chapterDetailsPage.chapterProgress).toBe(50);
+        });
+
+        it('should return progress for chapter complition if isChapterStarted is false', () => {
+            // arrange
+            chapterDetailsPage.contentStatusData = {
+                contentList: [
+                    {
+                        id: 'do-123',
+                        contentId: 'sample-content-id',
+                        status: 2
+                    }
+                ]
+            };
+
+            chapterDetailsPage.childContents = [];
+            // act
+            chapterDetailsPage.checkChapterCompletion();
+            // arrange
+            expect(chapterDetailsPage.contentStatusData).toBeTruthy();
+            expect(chapterDetailsPage.contentStatusData.contentList.length).toBeGreaterThan(0);
+            expect(chapterDetailsPage.isChapterCompleted).toBeTruthy();
+        });
+
+        it('should return nothing for else part', () => {
+            // arrange
+            chapterDetailsPage.contentStatusData = {
+                contentList: []
+            };
+
+            // act
+            chapterDetailsPage.checkChapterCompletion();
+            // arrange
+            expect(chapterDetailsPage.contentStatusData).toBeTruthy();
+            expect(chapterDetailsPage.contentStatusData.contentList.length).toBe(0);
+        });
+    });
+
+    describe('subscribeUtilityEvents', () => {
+        it('should return enrolled courses', (done) => {
+            // arrange
+            mockCommonUtilService.getLoader = jest.fn();
+            const mockData = {
+                batchId: 'sample-batch-id'
+            };
+            mockEvents.subscribe = jest.fn((topic, fn) => {
+                switch (topic) {
+                    case EventTopics.ENROL_COURSE_SUCCESS:
+                        return fn(mockData);
+                }
+            });
+            mockAppGlobalService.getUserId = jest.fn(() => 'sample-user-id');
+            mockCourseService.getEnrolledCourses = jest.fn(() => of([
+                {
+                    courseId: 'sample-course-id'
+                }
+            ]));
+            chapterDetailsPage.courseContentData = {
+                identifier: 'sample-course-id'
+            };
+            jest.spyOn(chapterDetailsPage, 'getBatchDetails').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(chapterDetailsPage, 'getContentState').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            // act
+            chapterDetailsPage.subscribeUtilityEvents();
+            // assert
+            setTimeout(() => {
+                expect(mockEvents.subscribe).toHaveBeenCalled();
+                expect(chapterDetailsPage.isAlreadyEnrolled).toBeTruthy();
+                expect(chapterDetailsPage.updatedCourseCardData).toStrictEqual(
+                    {
+                        courseId: 'sample-course-id'
+                    }
+                );
+                expect(chapterDetailsPage.updatedCourseCardData.courseId).toEqual(chapterDetailsPage.courseContentData.identifier);
+                expect(chapterDetailsPage.courseContent.batchId).toBe(mockData.batchId);
+                done();
+            }, 0);
+        });
+    });
+
+    describe('startLearning', () => {
+        it('should load FirstChildren', (done) => {
+            // arrnge
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            chapterDetailsPage.childContents = [{ identifier: 'do-123' }];
+            chapterDetailsPage.isBatchNotStarted = false;
+            chapterDetailsPage.userId = 'sample-user-token';
+            jest.spyOn(chapterDetailsPage, 'loadFirstChildren').mockImplementation(() => {
+                return { identifier: 'do-123' };
+            });
+            mockContentPlayerHandler.playContent = jest.fn();
+            mockPreferences.getBoolean = jest.fn(() => of(true));
+            mockProfileService.getActiveSessionProfile = jest.fn(() => of(mockProfileData));
+            mockLocalCourseService.fetchAssessmentStatus = jest.fn(() => ({ isLastAttempt: false, isContentDisabled: false }))
+            mockCommonUtilService.handleAssessmentStatus = jest.fn(() => Promise.resolve(false));
+
+            // act
+            chapterDetailsPage.startLearning();
+
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.START_CLICKED,
+                    Environment.HOME,
+                    PageId.CHAPTER_DETAILS,
+                    new TelemetryObject(chapterDetailsPage.childContents[0].identifier, undefined, 'sample-pkg-ver'),
+                    undefined, undefined, undefined);
+                expect(chapterDetailsPage.childContents.length).toBeGreaterThan(0);
+                expect(chapterDetailsPage.isBatchNotStarted).toBeFalsy();
+                expect(mockLocalCourseService.fetchAssessmentStatus).toHaveBeenCalled();
+                expect(mockCommonUtilService.handleAssessmentStatus).toHaveBeenCalled();
+                expect(mockContentPlayerHandler.playContent).toHaveBeenCalled();
+                expect(mockPreferences.getBoolean).toHaveBeenCalledWith(
+                    PreferenceKey.DO_NOT_SHOW_PROFILE_NAME_CONFIRMATION_POPUP + '-sample-user-token');
+                expect(mockProfileService.getActiveSessionProfile).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should skip the naviation flow and show toast message like NO_CONTENT_AVAILABLE_IN_MODULE', (done) => {
+            // arrnge
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            chapterDetailsPage.childContents = [];
+            chapterDetailsPage.isBatchNotStarted = false;
+            chapterDetailsPage.userId = 'sample-user-token';
+            mockCommonUtilService.showToast = jest.fn();
+            mockProfileService.getActiveSessionProfile = jest.fn(() => of(mockProfileData));
+
+            // act
+            chapterDetailsPage.startLearning();
+
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.START_CLICKED,
+                    Environment.HOME,
+                    PageId.CHAPTER_DETAILS,
+                    new TelemetryObject('do-123', undefined, 'sample-pkg-ver'),
+                    undefined, undefined, undefined);
+                expect(chapterDetailsPage.childContents.length).toEqual(0);
+                expect(chapterDetailsPage.isBatchNotStarted).toBeFalsy();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('NO_CONTENT_AVAILABLE_IN_MODULE');
+                expect(mockPreferences.getBoolean).toHaveBeenCalledWith(
+                    PreferenceKey.DO_NOT_SHOW_PROFILE_NAME_CONFIRMATION_POPUP + '-sample-user-token');
+                expect(mockProfileService.getActiveSessionProfile).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should skip the naviation flow and show toast message like COURSE_WILL_BE_AVAILABLE', (done) => {
+            // arrnge
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            chapterDetailsPage.childContents = [{ identifier: 'do-123' }];
+            chapterDetailsPage.isBatchNotStarted = true;
+            chapterDetailsPage.userId = 'sample-user-token';
+            mockCommonUtilService.translateMessage = jest.fn(() => 'COURSE_WILL_BE_AVAILABLE');
+            mockCommonUtilService.showToast = jest.fn();
+            mockDatePipe.transform = jest.fn(() => '2020-06-02');
+            mockProfileService.getActiveSessionProfile = jest.fn(() => of(mockProfileData));
+
+            // act
+            chapterDetailsPage.startLearning();
+
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.START_CLICKED,
+                    Environment.HOME,
+                    PageId.CHAPTER_DETAILS,
+                    new TelemetryObject('do-123', undefined, 'sample-pkg-ver'),
+                    undefined, undefined, undefined);
+                expect(chapterDetailsPage.childContents.length).toBe(1);
+                expect(chapterDetailsPage.isBatchNotStarted).toBeTruthy();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('COURSE_WILL_BE_AVAILABLE', '2020-06-02');
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('COURSE_WILL_BE_AVAILABLE');
+                expect(mockDatePipe.transform).toHaveBeenCalled();
+                expect(mockPreferences.getBoolean).toHaveBeenCalledWith(
+                    PreferenceKey.DO_NOT_SHOW_PROFILE_NAME_CONFIRMATION_POPUP + '-sample-user-token');
+                expect(mockProfileService.getActiveSessionProfile).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should show profile name confirmation popup', (done) => {
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            chapterDetailsPage.isBatchNotStarted = true;
+            chapterDetailsPage.isCertifiedCourse = true;
+            chapterDetailsPage.userId = 'sample-user-token';
+            mockCommonUtilService.translateMessage = jest.fn(() => 'course will be available');
+            mockCommonUtilService.showToast = jest.fn();
+            mockDatePipe.transform = jest.fn(() => '2020-06-04');
+            mockPreferences.getBoolean = jest.fn(() => of(false));
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { buttonClicked: true } }))
+            } as any)));
+            mockProfileService.getActiveSessionProfile = jest.fn(() => of(mockProfileData));
+
+            // act
+            chapterDetailsPage.startLearning();
+
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.START_CLICKED,
+                    Environment.HOME,
+                    PageId.CHAPTER_DETAILS,
+                    new TelemetryObject('do-123', undefined, 'sample-pkg-ver'),
+                    undefined, undefined, undefined);
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('COURSE_WILL_BE_AVAILABLE', '2020-06-04');
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('course will be available');
+                expect(mockDatePipe.transform).toBeCalled();
+                expect(mockPreferences.getBoolean).toHaveBeenCalledWith(
+                    PreferenceKey.DO_NOT_SHOW_PROFILE_NAME_CONFIRMATION_POPUP + '-sample-user-token');
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockProfileService.getActiveSessionProfile).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('continueLearning', () => {
+        it('should navigate To ChildrenDetailsPage and return the content which is not played', () => {
+            // arrange
+            chapterDetailsPage.isNextContentFound = false;
+            chapterDetailsPage.isFirstContent = false;
+            chapterDetailsPage.nextContent = undefined;
+            chapterDetailsPage.chapter = {
+                identifier: 'do-123',
+                mimeType: MimeType.DOCS[0],
+                children: [
+                    {
+                        identifier: 'do-1-123',
+                        mimeType: MimeType.COLLECTION
+                    },
+                    {
+                        identifier: 'do-2-123',
+                        mimeType: MimeType.DOCS[0]
+                    }
+                ]
+            };
+            chapterDetailsPage.contentStatusData = {
+                contentList: [
+                    {
+                        contentId: 'do-123',
+                        status: 2
+                    },
+                    {
+                        contentId: 'do-1-123',
+                        status: 1
+                    },
+                    {
+                        contentId: 'do-2-123',
+                        status: 0
+                    }
+                ]
+            };
+            // act
+            chapterDetailsPage.continueLearning();
+            // asser
+            expect(chapterDetailsPage.nextContent).toStrictEqual({
+                identifier: 'do-1-123',
+                mimeType: 'application/vnd.ekstep.content-collection'
+            });
+            expect(chapterDetailsPage.isNextContentFound).toBeTruthy();
+            expect(chapterDetailsPage.isFirstContent).toBeTruthy();
+        });
+
+        it('should navigate To ChildrenDetailsPage and return first content if every contents are played', () => {
+            // arrange
+            chapterDetailsPage.isNextContentFound = false;
+            chapterDetailsPage.isFirstContent = false;
+            chapterDetailsPage.nextContent = undefined;
+            chapterDetailsPage.chapter = {
+                identifier: 'do-123',
+                mimeType: MimeType.DOCS[0],
+                children: [
+                    {
+                        identifier: 'do-1-123',
+                        mimeType: MimeType.COLLECTION
+                    },
+                    {
+                        identifier: 'do-2-123',
+                        mimeType: MimeType.DOCS[0]
+                    }
+                ]
+            };
+            chapterDetailsPage.contentStatusData = {
+                contentList: [
+                    {
+                        contentId: 'do-123',
+                        status: 2
+                    },
+                    {
+                        contentId: 'do-1-123',
+                        status: 2
+                    },
+                    {
+                        contentId: 'do-2-123',
+                        status: 2
+                    }
+                ]
+            };
+            // act
+            chapterDetailsPage.continueLearning();
+            // asser
+            expect(chapterDetailsPage.nextContent).toStrictEqual(chapterDetailsPage.chapter);
+            expect(chapterDetailsPage.isNextContentFound).toBeFalsy();
+            expect(chapterDetailsPage.isFirstContent).toBeTruthy();
+        });
+
+        it('should navigate To ChildrenDetailsPage and return first content if every contents are played and root is collection', () => {
+            // arrange
+            chapterDetailsPage.isNextContentFound = false;
+            chapterDetailsPage.isFirstContent = false;
+            chapterDetailsPage.nextContent = undefined;
+            chapterDetailsPage.chapter = {
+                identifier: 'do-123',
+                mimeType: MimeType.COLLECTION,
+                children: [
+                    {
+                        identifier: 'do-1-123',
+                        mimeType: MimeType.COLLECTION
+                    },
+                    {
+                        identifier: 'do-2-123',
+                        mimeType: MimeType.DOCS[0]
+                    }
+                ]
+            };
+            chapterDetailsPage.contentStatusData = {
+                contentList: [
+                    {
+                        contentId: 'do-123',
+                        status: 2
+                    },
+                    {
+                        contentId: 'do-1-123',
+                        status: 2
+                    },
+                    {
+                        contentId: 'do-2-123',
+                        status: 2
+                    }
+                ]
+            };
+            // act
+            chapterDetailsPage.continueLearning();
+            // asser
+            expect(chapterDetailsPage.nextContent).toStrictEqual(chapterDetailsPage.chapter.children[1]);
+            expect(chapterDetailsPage.isNextContentFound).toBeFalsy();
+            expect(chapterDetailsPage.isFirstContent).toBeTruthy();
+        });
+
+        it('should navigate To ChildrenDetailsPage and return first content if children is undefined', () => {
+            // arrange
+            chapterDetailsPage.isNextContentFound = false;
+            chapterDetailsPage.isFirstContent = false;
+            chapterDetailsPage.nextContent = undefined;
+            chapterDetailsPage.chapter = {
+                identifier: 'do-123',
+                mimeType: MimeType.DOCS[0]
+            };
+            chapterDetailsPage.contentStatusData = {
+                contentList: [
+                    {
+                        contentId: 'do-123',
+                        status: 2
+                    },
+                    {
+                        contentId: 'do-1-123',
+                        status: 1
+                    },
+                    {
+                        contentId: 'do-2-123',
+                        status: 0
+                    }
+                ]
+            };
+            // act
+            chapterDetailsPage.continueLearning();
+            // asser
+            expect(chapterDetailsPage.nextContent).toStrictEqual({
+                identifier: 'do-123',
+                mimeType: MimeType.DOCS[0]
+            });
+            expect(chapterDetailsPage.isNextContentFound).toBeFalsy();
+            expect(chapterDetailsPage.isFirstContent).toBeTruthy();
+        });
+
+        it('should called startLearning if nextContent is not available', () => {
+            // arrange
+            chapterDetailsPage.isNextContentFound = false;
+            chapterDetailsPage.isFirstContent = false;
+            chapterDetailsPage.nextContent = undefined;
+            chapterDetailsPage.chapter = {
+                identifier: 'do-123',
+                mimeType: MimeType.COLLECTION
+            };
+            chapterDetailsPage.contentStatusData = {
+                contentList: [
+                    {
+                        contentId: 'do-123',
+                        status: 2
+                    }
+                ]
+            };
+            // act
+            chapterDetailsPage.continueLearning();
+            // asser
+            expect(chapterDetailsPage.nextContent).toBeUndefined();
+            expect(chapterDetailsPage.isNextContentFound).toBeFalsy();
+            expect(chapterDetailsPage.isFirstContent).toBeFalsy();
+        });
+    });
+
+    describe('showOverflowMenu', () => {
+        it('should invoked showOverflowMenu for download', (done) => {
+            const presentFn = jest.fn(() => Promise.resolve({}));
+            const onDidDismissFn = jest.fn(() => Promise.resolve({ data: { download: true } }));
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: presentFn,
+                onDidDismiss: onDidDismissFn
+            } as any)));
+            jest.spyOn(chapterDetailsPage, 'showDownloadConfirmationAlert').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            // act
+            chapterDetailsPage.showOverflowMenu({});
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(presentFn).toHaveBeenCalled();
+                expect(onDidDismissFn).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should invoked showOverflowMenu for share', (done) => {
+            const presentFn = jest.fn(() => Promise.resolve({}));
+            const onDidDismissFn = jest.fn(() => Promise.resolve({ data: { share: true } }));
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: presentFn,
+                onDidDismiss: onDidDismissFn
+            } as any)));
+            jest.spyOn(chapterDetailsPage, 'showDownloadConfirmationAlert').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            // act
+            chapterDetailsPage.showOverflowMenu({});
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(presentFn).toHaveBeenCalled();
+                expect(onDidDismissFn).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should invoked showOverflowMenu for unknown', (done) => {
+            const presentFn = jest.fn(() => Promise.resolve({}));
+            const onDidDismissFn = jest.fn(() => Promise.resolve({ data: {} }));
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: presentFn,
+                onDidDismiss: onDidDismissFn
+            } as any)));
+            jest.spyOn(chapterDetailsPage, 'showDownloadConfirmationAlert').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            // act
+            chapterDetailsPage.showOverflowMenu({});
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(presentFn).toHaveBeenCalled();
+                expect(onDidDismissFn).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('openContentDetails', () => {
+        it('should invoked joinTraining()', () => {
+            // arrange
+            const event = {
+                event: [{ name: 'sample-name' }]
+            };
+            chapterDetailsPage.courseContentData = {
+                contentData: {
+                    createdBy: 'sample-creator'
+                }
+            };
+            chapterDetailsPage.userId = 'sample-user';
+            chapterDetailsPage.isAlreadyEnrolled = false;
+            chapterDetailsPage.isBatchNotStarted = false;
+            jest.spyOn(chapterDetailsPage, 'joinTraining').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            // act
+            chapterDetailsPage.openContentDetails(event);
+            // assert
+            expect(Object.keys(event.event).length).toBeGreaterThan(0);
+            expect(chapterDetailsPage.courseContentData.contentData.createdBy).not.toEqual(chapterDetailsPage.userId);
+            expect(chapterDetailsPage.isAlreadyEnrolled).toBeFalsy();
+            expect(chapterDetailsPage.isBatchNotStarted).toBeFalsy();
+        });
+
+        it('should not invoked joinTraining() if isBatchNotStarted', () => {
+            // arrange
+            const event = {
+                event: [{ name: 'sample-name' }]
+            };
+            chapterDetailsPage.courseContentData = {
+                contentData: {
+                    createdBy: 'sample-creator'
+                }
+            };
+            chapterDetailsPage.userId = 'sample-user';
+            chapterDetailsPage.isAlreadyEnrolled = false;
+            chapterDetailsPage.isBatchNotStarted = true;
+            // act
+            chapterDetailsPage.openContentDetails(event);
+            // assert
+            expect(Object.keys(event.event).length).toBeGreaterThan(0);
+            expect(chapterDetailsPage.courseContentData.contentData.createdBy).not.toEqual(chapterDetailsPage.userId);
+            expect(chapterDetailsPage.isAlreadyEnrolled).toBeFalsy();
+            expect(chapterDetailsPage.isBatchNotStarted).toBeTruthy();
+        });
+
+        it('should show a course available toast if isAlreadyEnrolled', () => {
+            // arrange
+            const event = {
+                event: [{ name: 'sample-name' }]
+            };
+            chapterDetailsPage.courseContentData = {
+                contentData: {
+                    createdBy: 'sample-creator'
+                }
+            };
+            chapterDetailsPage.userId = 'sample-user';
+            chapterDetailsPage.isAlreadyEnrolled = true;
+            chapterDetailsPage.isBatchNotStarted = true;
+            mockDatePipe.transform = jest.fn(() => '2020-06-02');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'The batch is available from sunbird');
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            chapterDetailsPage.openContentDetails(event);
+            // assert
+            expect(Object.keys(event.event).length).toBeGreaterThan(0);
+            expect(chapterDetailsPage.courseContentData.contentData.createdBy).not.toEqual(chapterDetailsPage.userId);
+            expect(chapterDetailsPage.isAlreadyEnrolled).toBeTruthy();
+            expect(chapterDetailsPage.isBatchNotStarted).toBeTruthy();
+            expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('COURSE_WILL_BE_AVAILABLE', '2020-06-02');
+            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('The batch is available from sunbird');
+            expect(mockDatePipe.transform).toHaveBeenCalled();
+        });
+
+        it('should navigate To ChildrenDetailsPage', () => {
+            // arrange
+            const event = {
+                event: [{ name: 'sample-name' }],
+                data: { name: 'data-name' }
+            };
+            chapterDetailsPage.courseContentData = {
+                contentData: {
+                    createdBy: 'sample-creator'
+                }
+            };
+            chapterDetailsPage.userId = 'sample-user';
+            chapterDetailsPage.isAlreadyEnrolled = true;
+            chapterDetailsPage.isBatchNotStarted = false;
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            // act
+            chapterDetailsPage.openContentDetails(event);
+            // assert
+            expect(Object.keys(event.event).length).toBeGreaterThan(0);
+            expect(chapterDetailsPage.courseContentData.contentData.createdBy).not.toEqual(chapterDetailsPage.userId);
+            expect(chapterDetailsPage.isAlreadyEnrolled).toBeTruthy();
+            expect(chapterDetailsPage.isBatchNotStarted).toBeFalsy();
+        });
+
+        it('should return null if userId matched', () => {
+            // arrange
+            const event = {
+                event: [{ name: 'sample-name' }],
+                data: { name: 'data-name' }
+            };
+            chapterDetailsPage.courseContentData = {
+                contentData: {
+                    createdBy: 'sample-creator'
+                }
+            };
+            chapterDetailsPage.userId = 'sample-creator';
+            // act
+            chapterDetailsPage.openContentDetails(event);
+            // assert
+            expect(Object.keys(event.event).length).toBeGreaterThan(0);
+            expect(chapterDetailsPage.courseContentData.contentData.createdBy).toEqual(chapterDetailsPage.userId);
+        });
+
+        it('should return null if userId if event size is 0', () => {
+            // arrange
+            const event = {
+                event: [],
+                data: { name: 'data-name' }
+            };
+            // act
+            chapterDetailsPage.openContentDetails(event);
+            // assert
+            expect(Object.keys(event.event).length).toEqual(0);
+        });
+        
+        it('should not allow the user to consume ontent if number of attempts are exceeded', () => {
+            // arrange
+            const event = {
+                event: {
+                    isDisabled: true
+                },
+                data: { name: 'data-name' }
+            };
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            chapterDetailsPage.openContentDetails(event);
+            // assert
+            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('FRMELMNTS_IMSG_LASTATTMPTEXCD');
+        });
+
+        it('should show a toast message to the user that this will be his last attempt', () => {
+            // arrange
+            const event = {
+                event: {isLastAttempt: true},
+                data: { name: 'data-name' }
+            };
+            mockCommonUtilService.showToast = jest.fn();
+            // chapterDetailsPage.courseContentData = {
+            //     contentData: {
+            //         createdBy: 'sample-creator'
+            //     }
+            // };
+            // chapterDetailsPage.userId = 'sample-creator';
+            // act
+            chapterDetailsPage.openContentDetails(event);
+            // assert
+            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ASSESSMENT_LAST_ATTEMPT_MESSAGE');
+        });
+    });
+
+    describe('navigateToBatchListPage', () => {
+        it('should invoked enrollIntoBatch', (done) => {
+            // arrnge
+            mockCommonUtilService.getLoader = jest.fn();
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            chapterDetailsPage.batches = [{
+                batchId: 'sample-batch-id'
+            }];
+            jest.spyOn(chapterDetailsPage, 'enrollIntoBatch').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            // act
+            chapterDetailsPage.navigateToBatchListPage();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeTruthy();
+                expect(chapterDetailsPage.batches.length).toBeTruthy();
+                expect(chapterDetailsPage.batches.length).toEqual(1);
+                done();
+            }, 0);
+        });
+
+        it('should navigate to course-batches page and return ongoing and upcoming batches', (done) => {
+            // arrnge
+            mockCommonUtilService.getLoader = jest.fn();
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            chapterDetailsPage.batches = [{
+                batchId: 'sample-batch-id',
+                status: 1
+            }, {
+                batchId: 'sample-batch-id',
+                status: 2
+            }];
+            jest.spyOn(chapterDetailsPage, 'enrollIntoBatch').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            // act
+            chapterDetailsPage.navigateToBatchListPage();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeTruthy();
+                expect(chapterDetailsPage.batches.length).toBeTruthy();
+                expect(chapterDetailsPage.batches.length).toBeGreaterThan(0);
+                expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.COURSE_BATCHES],
+                    {
+                        state: {
+                            course: {
+                                contentData: {
+                                    createdBy: 'sample-creator'
+                                },
+                            },
+                            objRollup: undefined,
+                            ongoingBatches: [
+                                { batchId: 'sample-batch-id', status: 1 }
+                            ],
+                            telemetryObject: new TelemetryObject('do-123', undefined, 'sample-pkg-ver'),
+                            upcommingBatches: []
+                        }
+                    });
+                done();
+            }, 0);
+        });
+
+        it('should show toast message if batches is empty', (done) => {
+            // arrnge
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => Promise.resolve({
+                present: presentFn,
+                dismiss: dismissFn
+            }));
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            chapterDetailsPage.batches = [];
+            // mockCommonUtilService.showToast = jest.fn();
+            // act
+            chapterDetailsPage.navigateToBatchListPage();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeTruthy();
+                expect(chapterDetailsPage.batches.length).toBe(0);
+                // expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('NO_BATCHES_AVAILABLE');
+                expect(dismissFn).toBeTruthy();
+                done();
+            }, 0);
+        });
+
+        it('should show toast message for internet error', (done) => {
+            // arrnge
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => Promise.resolve({
+                present: presentFn,
+                dismiss: dismissFn
+            }));
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
+            };
+            chapterDetailsPage.batches = [];
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            chapterDetailsPage.navigateToBatchListPage();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeFalsy();
+                expect(chapterDetailsPage.batches.length).toBe(0);
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_NO_INTERNET_MESSAGE');
+                expect(dismissFn).toBeTruthy();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('enrollIntoBatch', () => {
+        beforeAll(() => {
+            chapterDetailsPage = new ChapterDetailsPage(
+                mockProfileService as ProfileService,
+                mockPreferences as SharedPreferences,
+                mockAuthService as AuthService,
+                mockCourseService as CourseService,
+                mockDownloadService as DownloadService,
+                mockEventsBusService as EventsBusService,
+                mockContentService as ContentService,
+                mockAppHeaderService as AppHeaderService,
+                mockTranslate as TranslateService,
+                mockCommonUtilService as CommonUtilService,
+                mockRouter as Router,
+                mockLoginHandlerService as LoginHandlerService,
+                mockAppGlobalService as AppGlobalService,
+                mockPopoverCtrl as PopoverController,
+                mockLocalCourseService as LocalCourseService,
+                mockEvents as Events,
+                mockZone as NgZone,
+                mockDatePipe as DatePipe,
+                mockFileSizePipe as FileSizePipe,
+                mockSbProgressLoader as SbProgressLoader,
+                mockTelemetryGeneratorService as TelemetryGeneratorService,
+                mockLocation as Location,
+                mockPlatform as Platform,
+                mockContentPlayerHandler as ContentPlayerHandler,
+                mockCategoryKeyTranslator as CategoryKeyTranslator,
+                mockTncUpdateHandlerService as TncUpdateHandlerService
+            );
+        });
+        beforeEach(() => {
+            jest.clearAllMocks();
+        });
+        it('should invoked promptToLogin() for guest user', (done) => {
+            // arrange
+            const items = {
+                id: 'do-123',
+                courseId: 'sample-course-id'
+            };
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => Promise.resolve({
+                present: presentFn,
+                dismiss: dismissFn
+            }));
+            chapterDetailsPage.guestUser = true;
+            jest.spyOn(chapterDetailsPage, 'promptToLogin').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            // act
+            chapterDetailsPage.enrollIntoBatch(items);
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(chapterDetailsPage.guestUser).toBeTruthy();
+                done();
+            }, 0);
+        });
+
+        it('should return enrolled batches for loggedIn user', (done) => {
+            // arrange
+            const items = {
+                id: 'do-123',
+                courseId: 'sample-course-id'
+            };
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => Promise.resolve({
+                present: presentFn,
+                dismiss: dismissFn
+            }));
+            chapterDetailsPage.guestUser = false;
+            mockLocalCourseService.prepareEnrollCourseRequest = jest.fn(() => { });
+            const prepareResponseValue = new Map();
+            prepareResponseValue['enrollReq'] = { name: 'sample-name' };
+            mockLocalCourseService.prepareRequestValue = jest.fn(() => prepareResponseValue);
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockLocalCourseService.enrollIntoBatch = jest.fn(() => of({}));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'course enrolled');
+            mockCommonUtilService.showToast = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            // act
+            chapterDetailsPage.enrollIntoBatch(items);
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(chapterDetailsPage.guestUser).toBeFalsy();
+                expect(mockLocalCourseService.prepareEnrollCourseRequest).toHaveBeenCalled();
+                expect(mockLocalCourseService.prepareRequestValue).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.ENROLL_CLICKED,
+                    Environment.HOME,
+                    PageId.CHAPTER_DETAILS, undefined, prepareResponseValue
+                );
+                expect(presentFn).toHaveBeenCalled();
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(chapterDetailsPage.courseContent.batchId).toBe(items.id);
+                expect(mockCategoryKeyTranslator.transform).toHaveBeenCalledWith('FRMELEMNTS_MSG_COURSE_ENROLLED', expect.anything());
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('sample-message');
+                expect(mockEvents.publish).toHaveBeenCalledWith(EventTopics.ENROL_COURSE_SUCCESS, {
+                    batchId: items.id,
+                    courseId: items.courseId
+                });
+                done();
+            }, 0);
+        });
+
+        it('should handle service error part', (done) => {
+            const items = {
+                id: 'do-123',
+                courseId: 'sample-course-id'
+            };
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => Promise.resolve({
+                present: presentFn,
+                dismiss: dismissFn
+            }));
+            chapterDetailsPage.guestUser = false;
+            mockLocalCourseService.prepareEnrollCourseRequest = jest.fn(() => { });
+            const prepareResponseValue = new Map();
+            prepareResponseValue['enrollReq'] = { name: 'sample-name' };
+            mockLocalCourseService.prepareRequestValue = jest.fn(() => prepareResponseValue);
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockLocalCourseService.enrollIntoBatch = jest.fn(() => throwError({ error: 'error' }));
+            // act
+            chapterDetailsPage.enrollIntoBatch(items);
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(chapterDetailsPage.guestUser).toBeFalsy();
+                expect(mockLocalCourseService.prepareEnrollCourseRequest).toHaveBeenCalled();
+                expect(mockLocalCourseService.prepareRequestValue).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.ENROLL_CLICKED,
+                    Environment.HOME,
+                    PageId.CHAPTER_DETAILS, undefined, prepareResponseValue
+                );
+                expect(presentFn).toHaveBeenCalled();
+                expect(mockLocalCourseService.enrollIntoBatch).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('promptToLogin', () => {
+        beforeAll(() => {
+            chapterDetailsPage = new ChapterDetailsPage(
+                mockProfileService as ProfileService,
+                mockPreferences as SharedPreferences,
+                mockAuthService as AuthService,
+                mockCourseService as CourseService,
+                mockDownloadService as DownloadService,
+                mockEventsBusService as EventsBusService,
+                mockContentService as ContentService,
+                mockAppHeaderService as AppHeaderService,
+                mockTranslate as TranslateService,
+                mockCommonUtilService as CommonUtilService,
+                mockRouter as Router,
+                mockLoginHandlerService as LoginHandlerService,
+                mockAppGlobalService as AppGlobalService,
+                mockPopoverCtrl as PopoverController,
+                mockLocalCourseService as LocalCourseService,
+                mockEvents as Events,
+                mockZone as NgZone,
+                mockDatePipe as DatePipe,
+                mockFileSizePipe as FileSizePipe,
+                mockSbProgressLoader as SbProgressLoader,
+                mockTelemetryGeneratorService as TelemetryGeneratorService,
+                mockLocation as Location,
+                mockPlatform as Platform,
+                mockContentPlayerHandler as ContentPlayerHandler,
+                mockCategoryKeyTranslator as CategoryKeyTranslator,
+                mockTncUpdateHandlerService as TncUpdateHandlerService
+            );
+        });
+        beforeEach(() => {
+            jest.clearAllMocks();
+        });
+        it('should handle user signIn', (done) => {
+            // arrange
+            const batchdetail = {
+                id: 'sample-id',
+                batchId: 'sample-batch-id',
+            };
+            mockCommonUtilService.translateMessage = jest.fn(() => '');
+            const presentFn = jest.fn(() => Promise.resolve({}));
+            const onDidDismissFn = jest.fn(() => Promise.resolve({ data: { canDelete: true } }));
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: presentFn,
+                onDidDismiss: onDidDismissFn
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn((key) => {
+                switch (key) {
+                    case 'YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL':
+                        return 'YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL';
+                    case 'TRAININGS_ONLY_REGISTERED_USERS':
+                        return 'TRAININGS_ONLY_REGISTERED_USERS';
+                    case 'OVERLAY_SIGN_IN':
+                        return 'OVERLAY_SIGN_IN';
+                }
+            });
+            mockPreferences.putString = jest.fn(() => of(undefined));
+            mockAppGlobalService.resetSavedQuizContent = jest.fn();
+            mockLoginHandlerService.signIn = jest.fn(() => Promise.resolve());
+
+            // act
+            chapterDetailsPage.promptToLogin(batchdetail);
+
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalledWith(expect.objectContaining({
+                    componentProps: expect.objectContaining({
+                        sbPopoverMainTitle: 'sample-message',
+                        metaInfo: 'sample-message',
+                        sbPopoverHeading: 'OVERLAY_SIGN_IN',
+                        isNotShowCloseIcon: true,
+                        actionsButtons: expect.arrayContaining([
+                            expect.objectContaining({
+                                btntext: 'OVERLAY_SIGN_IN',
+                                btnClass: 'popover-color'
+                            })
+                        ])
+                    })
+                }));
+                expect(presentFn).toHaveBeenCalled();
+                expect(onDidDismissFn).toHaveBeenCalled();
+                expect(mockPreferences.putString).toHaveBeenNthCalledWith(1, PreferenceKey.BATCH_DETAIL_KEY, JSON.stringify(batchdetail));
+                expect(mockPreferences.putString).toHaveBeenNthCalledWith(2,
+                    PreferenceKey.COURSE_DATA_KEY, JSON.stringify(chapterDetailsPage.courseContentData));
+                expect(mockAppGlobalService.resetSavedQuizContent).toHaveBeenCalled();
+                expect(mockLoginHandlerService.signIn).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should not handle user signIn if user dismiss the popup', (done) => {
+            // arrange
+            const batchdetail = {
+                id: 'sample-id',
+                batchId: 'sample-batch-id',
+            };
+            mockCommonUtilService.translateMessage = jest.fn(() => '');
+            const presentFn = jest.fn(() => Promise.resolve({}));
+            const onDidDismissFn = jest.fn(() => Promise.resolve({ data: { canDelete: false } }));
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: presentFn,
+                onDidDismiss: onDidDismissFn
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn((key) => {
+                switch (key) {
+                    case 'YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL':
+                        return 'YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL';
+                    case 'TRAININGS_ONLY_REGISTERED_USERS':
+                        return 'TRAININGS_ONLY_REGISTERED_USERS';
+                    case 'OVERLAY_SIGN_IN':
+                        return 'OVERLAY_SIGN_IN';
+                }
+            });
+            // act
+            chapterDetailsPage.promptToLogin(batchdetail);
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalledWith(expect.objectContaining({
+                    componentProps: expect.objectContaining({
+                        sbPopoverMainTitle: 'sample-message',
+                        metaInfo: 'sample-message',
+                        sbPopoverHeading: 'OVERLAY_SIGN_IN',
+                        isNotShowCloseIcon: true,
+                        actionsButtons: expect.arrayContaining([
+                            expect.objectContaining({
+                                btntext: 'OVERLAY_SIGN_IN',
+                                btnClass: 'popover-color'
+                            })
+                        ])
+                    })
+                }));
+                expect(presentFn).toHaveBeenCalled();
+                expect(onDidDismissFn).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('loadFirstChildren', () => {
+        it('should load first children', () => {
+            // arrange
+            const data = {
+                children: [{
+                    id: 'do-123'
+                }]
+            };
+            // act
+            chapterDetailsPage.loadFirstChildren(data);
+            // assert
+            expect(data.children.length).toBeGreaterThan(0);
+        });
+    });
+
+    describe('joinTraining', () => {
+    });
+
+    it('should dismiss consentPii popup', () => {
+        // arrange
+        const dismissFn = jest.fn(() => Promise.resolve(true));
+        chapterDetailsPage.loader = { data: '', dismiss: dismissFn } as any;
+        // act
+        chapterDetailsPage.onConsentPopoverShow();
+        // assert
+        expect(chapterDetailsPage.loader).toBeUndefined();
+        expect(dismissFn).toHaveBeenCalled();
+    });
+
+    it('shoule invoked after consentPii popup dismissed', () => {
+        chapterDetailsPage.onConsentPopoverDismiss();
+    });
+});
diff --git a/src/app/curriculum-courses/chapter-details/chapter-details.page.ts b/src/app/curriculum-courses/chapter-details/chapter-details.page.ts
new file mode 100644
index 000000000..fa7d517a9
--- /dev/null
+++ b/src/app/curriculum-courses/chapter-details/chapter-details.page.ts
@@ -0,0 +1,1105 @@
+import { share } from 'rxjs/operators';
+import { SbSharePopupComponent } from '@app/app/components/popups/sb-share-popup/sb-share-popup.component';
+import { Component, OnInit, Inject, NgZone, OnDestroy } from '@angular/core';
+import {
+  AppHeaderService, CommonUtilService, LoginHandlerService, AppGlobalService, LocalCourseService,
+  TelemetryGeneratorService
+} from '@app/services';
+import { TranslateService } from '@ngx-translate/core';
+import { Router, NavigationExtras } from '@angular/router';
+import { TocCardType } from '@project-sunbird/common-consumption-v8';
+import { SbPopoverComponent } from '@app/app/components/popups/sb-popover/sb-popover.component';
+import { PopoverController, Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import {
+  RouterLinks, PreferenceKey, EventTopics, AssessmentConstant,
+  MimeType, ShareItemType, BatchConstants, ProfileConstants, MaxAttempt
+} from '@app/app/app.constant';
+import {
+  SharedPreferences, AuthService, Batch, TelemetryObject, ContentState, Content, Course,
+  CourseService, GetContentStateRequest, ContentStateResponse, CourseBatchStatus,
+  CourseEnrollmentType, SortOrder, DownloadService, DownloadTracking, DownloadProgress,
+  EventsBusEvent, DownloadEventType, EventsBusService, ContentImportRequest, ContentService,
+  ContentImportResponse, ContentImportStatus, ContentEventType, ContentImportCompleted,
+  ContentUpdate, ContentImport, Rollup, AuditState, ProfileService, CourseBatchesRequest
+} from 'sunbird-sdk';
+import { EnrollCourse } from '@app/app/enrolled-course-details-page/course.interface';
+import { DatePipe, Location } from '@angular/common';
+import { ContentActionsComponent } from './../../components/content-actions/content-actions.component';
+import {
+  PageId, Environment, InteractType,
+  InteractSubtype, ImpressionType, AuditType
+} from './../../../services/telemetry-constants';
+import { Observable, Subscription } from 'rxjs';
+import { ConfirmAlertComponent } from '@app/app/components';
+import { FileSizePipe } from '@app/pipes/file-size/file-size';
+import { ContentUtil } from '@app/util/content-util';
+import { SbProgressLoader } from '@app/services/sb-progress-loader.service';
+import { ContentPlayerHandler } from '@app/services/content/player/content-player-handler';
+import { ConsentPopoverActionsDelegate } from '@app/services/local-course.service';
+import { CategoryKeyTranslator } from '@app/pipes/category-key-translator/category-key-translator-pipe';
+import {
+  ProfileNameConfirmationPopoverComponent
+} from '@app/app/components/popups/sb-profile-name-confirmation-popup/sb-profile-name-confirmation-popup.component';
+import { TncUpdateHandlerService } from '@app/services/handlers/tnc-update-handler.service';
+
+@Component({
+  selector: 'app-chapter-details',
+  templateUrl: './chapter-details.page.html',
+  styleUrls: ['./chapter-details.page.scss', '../../enrolled-course-details-page/enrolled-course-details-page.scss'],
+})
+export class ChapterDetailsPage implements OnInit, OnDestroy, ConsentPopoverActionsDelegate {
+
+  chapter: any;
+  cardType: TocCardType = TocCardType.COURSE;
+  isAlreadyEnrolled = false;
+  batches = [];
+  courseContentData: any;
+  courseContent: any;
+  batchExp = false;
+  guestUser = true;
+  isChapterCompleted = false;
+  isChapterStarted = false;
+  isBatchNotStarted = false;
+  isFromDeeplink = false;
+  userId;
+  telemetryObject: TelemetryObject;
+  updatedCourseCardData: Course;
+  contentStatusData: ContentStateResponse;
+  batchDetails: Batch;
+  childContents = [];
+  viewedContents = [];
+  chapterProgress = 0;
+  courseStartDate;
+  // Contains identifier(s) of locally not available content(s)
+  downloadIdentifiers = new Set();
+  // Contains total size of locally not available content(s)
+  downloadSize = 0;
+  // Contains child content import / download progress
+  downloadProgress = 0;
+  public rollUpMap: { [key: string]: Rollup } = {};
+  identifier: string;
+  isDownloadStarted = false;
+  showCollapsedPopup = true;
+  showDownload: boolean;
+  private eventSubscription: Subscription;
+  queuedIdentifiers = [];
+  faultyIdentifiers = [];
+  currentCount = 0;
+  subContentIds: Array<string> = [];
+
+  trackDownloads$: Observable<DownloadTracking>;
+  public todayDate: any;
+
+  private extrasData: any;
+
+  isNextContentFound = false;
+  isFirstContent = false;
+  nextContent: Content;
+  headerObservable: Subscription;
+  backButtonFunc: Subscription;
+  public objRollup: Rollup;
+  private corRelationList: any;
+  loader?: HTMLIonLoadingElement;
+  maxAssessmentLimit = AssessmentConstant.MAX_ATTEMPTS;
+  isCertifiedCourse: boolean;
+  courseHeirarchy: any;
+  private hasInit = false;
+  courseBatchesRequest: CourseBatchesRequest;
+
+  constructor(
+    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+    @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
+    @Inject('AUTH_SERVICE') public authService: AuthService,
+    @Inject('COURSE_SERVICE') private courseService: CourseService,
+    @Inject('DOWNLOAD_SERVICE') private downloadService: DownloadService,
+    @Inject('EVENTS_BUS_SERVICE') private eventsBusService: EventsBusService,
+    @Inject('CONTENT_SERVICE') private contentService: ContentService,
+    private headerService: AppHeaderService,
+    private translate: TranslateService,
+    private commonUtilService: CommonUtilService,
+    private router: Router,
+    private loginHandlerService: LoginHandlerService,
+    private appGlobalService: AppGlobalService,
+    private popoverCtrl: PopoverController,
+    private localCourseService: LocalCourseService,
+    private events: Events,
+    private zone: NgZone,
+    private datePipe: DatePipe,
+    private fileSizePipe: FileSizePipe,
+    private sbProgressLoader: SbProgressLoader,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+    private location: Location,
+    private platform: Platform,
+    private contentPlayerHandler: ContentPlayerHandler,
+    private categoryKeyTranslator: CategoryKeyTranslator,
+    private tncUpdateHandlerService: TncUpdateHandlerService,
+  ) {
+    this.extrasData = this.router.getCurrentNavigation().extras.state;
+    this.appGlobalService.preSignInData = null;
+    this.courseContent = this.extrasData.courseContent;
+    this.chapter = this.extrasData.chapterData;
+    this.batches = this.extrasData.batches;
+    this.isAlreadyEnrolled = this.extrasData.isAlreadyEnrolled;
+    this.batchExp = this.extrasData.batchExp;
+    this.isChapterCompleted = this.extrasData.isChapterCompleted;
+    this.contentStatusData = this.extrasData.contentStatusData;
+    this.isFromDeeplink = this.extrasData.isFromDeeplink;
+    this.courseHeirarchy = this.extrasData.courseHeirarchy;
+    this.courseContentData = this.courseContent;
+    this.identifier = this.chapter.identifier;
+    this.telemetryObject = ContentUtil.getTelemetryObject(this.chapter);
+    this.corRelationList = this.extrasData.corRelation;
+  }
+
+  ngOnInit() {
+    this.subContentIds = [];
+    this.getSubContentIds(this.chapter);
+    if (this.chapter.children && this.chapter.children.length) {
+      this.chapter.children.map((content) => {
+        if (content.contentData && content.contentData.displayScore){
+          content['displayScore'] = content.contentData.displayScore;
+        } else {
+          content['displayScore'] = false;
+        }
+      });
+    }
+    if (this.chapter.hierarchyInfo) {
+      this.objRollup = ContentUtil.generateRollUp(this.chapter.hierarchyInfo, this.identifier);
+    }
+    this.generateImpressionEvent(this.chapter.identifier, this.chapter.contentType, this.chapter.contentData.pkgVersion);
+    if(window['device'].platform.toLowerCase() !== "ios") {
+      this.trackDownloads$ = this.downloadService.trackDownloads(
+        { groupBy: { fieldPath: 'rollUp.l1', value: this.courseContentData.identifier } }).pipe(share());
+    }
+  }
+
+  async ionViewWillEnter() {
+    this.downloadIdentifiers = new Set();
+    this.headerService.showHeaderWithBackButton();
+    this.todayDate = window.dayjs().format('YYYY-MM-DD');
+    this.subscribeUtilityEvents();
+    this.subscribeSdkEvent();
+    await this.checkLoggedInOrGuestUser();
+    this.childContents = [];
+    if (this.isFromDeeplink) {
+      this.getAllBatches();
+    }
+    this.getAllContents(this.chapter);
+    this.checkChapterCompletion();
+    this.headerObservable = this.headerService.headerEventEmitted$.subscribe(event => {
+      this.handleHeaderEvents(event);
+    });
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
+      this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.CHAPTER_DETAILS, Environment.HOME, false);
+      this.appGlobalService.generateCourseUnitCompleteTelemetry = false;
+      this.location.back();
+    });
+    if (this.hasInit) {
+      this.getContentState(false);
+    } else {
+      this.hasInit = !this.hasInit;
+      this.getContentState(true);
+    }
+
+    if (!this.guestUser) {
+      this.updatedCourseCardData = await this.courseService.getEnrolledCourses({ userId: this.userId, returnFreshCourses: false })
+        .toPromise()
+        .then((data) => {
+          if (data.length > 0) {
+            console.log('getEnrolledCourses', data);
+            const courseList: Array<Course> = [];
+            for (const course of data) {
+              courseList.push(course);
+            }
+            this.appGlobalService.setEnrolledCourseList(courseList);
+          }
+          return data.find((element) =>
+            (this.courseContent.batchId && element.batchId === this.courseContent.batchId)
+            || (!this.courseContent.batchId && element.courseId === this.courseContent.identifier));
+        })
+        .catch(e => {
+          console.log(e);
+          return null;
+        });
+      if (this.updatedCourseCardData && !this.courseContent.batch) {
+        this.courseContent = this.updatedCourseCardData;
+        this.isAlreadyEnrolled = true;
+      }
+      if (this.isFromDeeplink) {
+        this.getContentState(true);
+      }
+      this.getBatchDetails();
+      console.log('this.courseCardData', this.courseContent);
+      this.getContentsSize(this.chapter.children);
+    }
+  }
+  handleHeaderEvents($event) {
+    if ($event.name === 'back') {
+      this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.CHAPTER_DETAILS, Environment.HOME, true);
+      this.location.back();
+      this.appGlobalService.generateCourseUnitCompleteTelemetry = false;
+    }
+  }
+
+  ionViewWillLeave(): void {
+    this.events.publish('header:setzIndexToNormal');
+    if (this.eventSubscription) {
+      this.eventSubscription.unsubscribe();
+    }
+    if (this.headerObservable) {
+      this.headerObservable.unsubscribe();
+    }
+    if (this.backButtonFunc) {
+      this.backButtonFunc.unsubscribe();
+    }
+  }
+
+  ionViewDidEnter(): void {
+    this.sbProgressLoader.hide({ id: 'login' });
+    this.sbProgressLoader.hide({ id: this.courseContent.identifier });
+  }
+
+  ngOnDestroy() {
+    this.events.unsubscribe(EventTopics.ENROL_COURSE_SUCCESS);
+  }
+
+  async getAllBatches() {
+    // const loader = await this.commonUtilService.getLoader();
+    this.courseBatchesRequest = {
+      filters: {
+        courseId: this.courseContentData.identifier,
+        status: [CourseBatchStatus.NOT_STARTED, CourseBatchStatus.IN_PROGRESS],
+        enrollmentType: CourseEnrollmentType.OPEN
+      },
+      sort_by: { createdDate: SortOrder.DESC },
+      fields: BatchConstants.REQUIRED_FIELDS
+    };
+    this.courseService.getCourseBatches(this.courseBatchesRequest).toPromise()
+      .then(async (data: Batch[]) => {
+        this.batches = data || [];
+      })
+      .catch(async (error: any) => {
+        console.log('Error while fetching all Batches', error);
+      });
+  }
+
+  async checkLoggedInOrGuestUser() {
+    const session = await this.authService.getSession().toPromise();
+    this.guestUser = !session;
+    if (session) {
+      this.userId = session.userToken;
+    }
+  }
+
+  async getContentState(returnRefresh: boolean) {
+    if (this.courseContent.batchId) {
+      const request: GetContentStateRequest = {
+        userId: this.appGlobalService.getUserId(),
+        courseId: this.courseContentData.identifier,
+        contentIds: this.courseContent && this.courseContent.contentData ?
+          this.courseContent.contentData.leafNodes : this.courseContentData.contentData.leafNodes,
+        returnRefreshedContentStates: returnRefresh,
+        batchId: this.courseContent.batchId,
+        fields: ['progress', 'score']
+      };
+      this.courseService.getContentState(request).toPromise()
+        .then(async (res: ContentStateResponse) => {
+          this.zone.run(() => {
+            this.contentStatusData = res;
+            this.checkChapterCompletion();
+          }); }).catch(async () => {});
+    }
+  }
+
+  async getBatchDetails() {
+    if (this.courseContent && this.courseContent.batchId) {
+      this.courseService.getBatchDetails({ batchId: this.courseContent.batchId }).toPromise()
+        .then((data: Batch) => {
+          this.zone.run(() => {
+            if (!data) {
+              return;
+            }
+            this.batchDetails = data;
+            if (data.cert_templates && Object.keys(data.cert_templates).length) {
+              this.isCertifiedCourse = true;
+            } else {
+              this.isCertifiedCourse = false;
+            }
+            if (this.batchDetails.status === 2) {
+              this.batchExp = true;
+            } else if (this.batchDetails.status === 0) {
+              this.isBatchNotStarted = true;
+              this.courseStartDate = this.batchDetails.startDate;
+            }
+            this.saveContentContext(this.appGlobalService.getUserId(),
+              this.batchDetails.courseId, this.courseContent.batchId, this.batchDetails.status);
+          });
+        }).catch((err) => {
+          this.saveContentContext(this.appGlobalService.getUserId(),
+            this.courseContent.courseId, this.courseContent.batchId, this.courseContent.batch.status);
+        });
+    }
+  }
+
+  saveContentContext(userId, courseId, batchId, batchStatus) {
+    const contentContextMap = new Map();
+    // store content context in the below map
+    contentContextMap['userId'] = userId;
+    contentContextMap['courseId'] = courseId;
+    contentContextMap['batchId'] = batchId;
+    contentContextMap['isCertified'] = this.isCertifiedCourse;
+    if (batchStatus) {
+      contentContextMap['batchStatus'] = batchStatus;
+    }
+    if (this.courseContentData && this.courseContentData.contentData && this.courseContentData.contentData.leafNodes) {
+      const leafNodeIds = this.courseContentData.contentData.leafNodes;
+      contentContextMap['leafNodeIds'] = leafNodeIds;
+    }
+
+    // store the contentContextMap in shared preference and access it from SDK
+    this.preferences.putString(PreferenceKey.CONTENT_CONTEXT, JSON.stringify(contentContextMap)).toPromise().then();
+  }
+
+  getAllContents(collection) {
+    if (collection.children) {
+      collection.children.forEach(element => {
+        this.getAllContents(element);
+      });
+    } else {
+      if (collection.mimeType !== MimeType.COLLECTION) {
+        this.childContents.push(collection);
+      }
+    }
+  }
+
+  checkChapterCompletion() {
+    if (this.contentStatusData && this.contentStatusData.contentList.length) {
+      this.viewedContents = [];
+      for (const content of this.childContents) {
+        if (this.contentStatusData.contentList.find((c) => c.contentId === content.identifier && c.status === 2)) {
+          this.viewedContents.push(content);
+        }
+      }
+      if (this.viewedContents.length && this.viewedContents.length === this.childContents.length) {
+        this.isChapterCompleted = true;
+      } else if (this.viewedContents.length) {
+        this.isChapterStarted = true;
+      } else {
+        this.isChapterStarted = false;
+      }
+      if (this.viewedContents.length) {
+        this.chapterProgress = Math.round((this.viewedContents.length / this.childContents.length) * 100);
+        console.log('chapterProgress', this.chapterProgress);
+      }
+      if (!this.chapterProgress || this.chapterProgress !== 100) {
+        this.appGlobalService.generateCourseUnitCompleteTelemetry = true;
+      }
+      if (this.appGlobalService.generateCourseUnitCompleteTelemetry && this.chapterProgress === 100) {
+        this.appGlobalService.generateCourseUnitCompleteTelemetry = false;
+        const cdata = [
+          {
+            type: 'CourseId',
+            id: this.courseContentData.identifier || ''
+          },
+          {
+            type: 'BatchId',
+            id: this.courseContent.batchId || ''
+          },
+          {
+            type: 'UserId',
+            id: this.userId || ''
+          },
+          {
+            type: 'UnitId',
+            id: this.identifier || ''
+          },
+        ];
+        this.telemetryGeneratorService.generateAuditTelemetry(
+          Environment.COURSE,
+          AuditState.AUDIT_UPDATED,
+          ['progress'],
+          AuditType.UNIT_PROGRESS,
+          this.telemetryObject.id,
+          this.telemetryObject.type,
+          this.telemetryObject.version,
+          cdata,
+          this.telemetryObject.rollup
+        );
+      }
+    }
+  }
+
+  async subscribeUtilityEvents() {
+    this.events.subscribe(EventTopics.ENROL_COURSE_SUCCESS, async (res) => {
+      console.log('enrol succ event');
+      this.isAlreadyEnrolled = true;
+      this.updatedCourseCardData = await this.courseService
+        .getEnrolledCourses({ userId: this.appGlobalService.getUserId(), returnFreshCourses: true })
+        .toPromise()
+        .then((cData) => {
+          return cData.find((element) => element.courseId === this.courseContentData.identifier);
+        });
+      this.courseContent.batchId = res.batchId;
+      console.log('enrol succ event -->', this.courseContent);
+      await this.getBatchDetails();
+      this.getContentState(true);
+    });
+
+  }
+
+  async startLearning() {
+    this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
+      InteractSubtype.START_CLICKED,
+      Environment.HOME,
+      PageId.CHAPTER_DETAILS,
+      this.telemetryObject,
+      undefined,
+      this.objRollup,
+      this.corRelationList
+    );
+
+    const key = PreferenceKey.DO_NOT_SHOW_PROFILE_NAME_CONFIRMATION_POPUP + '-' + this.userId;
+    const doNotShow = await this.preferences.getBoolean(key).toPromise();
+    const profile = await this.profileService.getActiveSessionProfile({
+      requiredFields: ProfileConstants.REQUIRED_FIELDS
+    }).toPromise();
+
+    if (doNotShow || await this.tncUpdateHandlerService.isSSOUser(profile) || !this.isCertifiedCourse) {
+      this.startContent();
+    } else {
+      this.showProfileNameConfirmationPopup();
+    }
+  }
+
+  private async startContent() {
+    if (this.childContents && this.childContents.length && !this.isBatchNotStarted) {
+      const firstChild = this.loadFirstChildren(this.chapter);
+      const telemetryDetails = {
+        pageId: PageId.CHAPTER_DETAILS,
+        corRelationList: this.corRelationList
+      };
+      const assessmentStatus = this.localCourseService.fetchAssessmentStatus(this.contentStatusData, firstChild);
+
+      const maxAttempt: MaxAttempt =  await this.commonUtilService.handleAssessmentStatus(assessmentStatus);
+      if (maxAttempt.isCloseButtonClicked || maxAttempt.limitExceeded) {
+        return;
+      }
+
+      this.contentPlayerHandler.playContent(firstChild, this.generateContentNavExtras(firstChild, 1), telemetryDetails, true);
+    } else if (!this.childContents || !this.childContents.length) {
+      this.commonUtilService.showToast('NO_CONTENT_AVAILABLE_IN_MODULE');
+    } else {
+      this.commonUtilService.showToast(this.commonUtilService.translateMessage('COURSE_WILL_BE_AVAILABLE',
+        this.datePipe.transform(this.courseStartDate, 'mediumDate')));
+    }
+  }
+
+  async continueLearning() {
+    this.isNextContentFound = false;
+    this.isFirstContent = false;
+    this.nextContent = undefined;
+    this.getNextContent(this.chapter, this.contentStatusData.contentList);
+
+    if (this.nextContent) {
+      this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
+        InteractSubtype.RESUME_CLICKED,
+        Environment.HOME,
+        PageId.CHAPTER_DETAILS,
+        this.telemetryObject,
+        undefined,
+        this.objRollup,
+      );
+
+      const assessmentStatus = this.localCourseService.fetchAssessmentStatus(this.contentStatusData, this.nextContent);
+
+      const maxAttempt: MaxAttempt =  await this.commonUtilService.handleAssessmentStatus(assessmentStatus);
+      if (maxAttempt.isCloseButtonClicked || maxAttempt.limitExceeded) {
+        return;
+      }
+
+      const telemetryDetails = {
+        pageId: PageId.CHAPTER_DETAILS,
+        corRelationList: this.corRelationList
+      };
+      this.contentPlayerHandler.playContent(this.nextContent, this.generateContentNavExtras(this.nextContent, 1), telemetryDetails, true);
+    } else {
+      this.startLearning();
+    }
+  }
+
+  async showOverflowMenu(event) {
+    const actionPopover = await this.popoverCtrl.create({
+      component: ContentActionsComponent,
+      event,
+      cssClass: 'cd-leave-training-popup',
+      showBackdrop: false,
+      componentProps: {
+        content: this.courseContentData,
+        batchDetails: this.batchDetails,
+        pageName: PageId.CHAPTER_DETAILS,
+        chapter: this.chapter,
+        downloadIdentifiers: this.downloadIdentifiers
+      },
+    });
+    await actionPopover.present();
+    const { data } = await actionPopover.onDidDismiss();
+    if (data && data.download) {
+      this.showDownloadConfirmationAlert();
+    } else if (data.share) {
+      this.share();
+    }
+  }
+
+  async share() {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      InteractSubtype.SHARE_CLICKED,
+      Environment.HOME,
+      PageId.CHAPTER_DETAILS
+    );
+    const popover = await this.popoverCtrl.create({
+      component: SbSharePopupComponent,
+      componentProps: {
+        content: this.courseContentData,
+        moduleId: this.chapter.identifier,
+        subContentIds: this.subContentIds,
+        objRollup: this.objRollup,
+        pageId: PageId.CHAPTER_DETAILS,
+        shareItemType: ShareItemType.ROOT_COLECTION
+      },
+      cssClass: 'sb-popover',
+    });
+    await popover.present();
+  }
+
+  openContentDetails(event) {
+    if (!event) {
+      return;
+    }
+    if (event.event && event.event.isDisabled) {
+      this.commonUtilService.showToast('FRMELMNTS_IMSG_LASTATTMPTEXCD');
+      return;
+    }
+    if (event.event && event.event.isLastAttempt) {
+      this.commonUtilService.showToast('ASSESSMENT_LAST_ATTEMPT_MESSAGE');
+    }
+    if ((event.event && Object.keys(event.event).length !== 0) || event.isFromDeeplink) {
+      if (this.courseContentData.contentData.createdBy !== this.userId) {
+        if (!this.isAlreadyEnrolled) {
+          if (!this.isBatchNotStarted) {
+            this.joinTraining();
+          }
+        } else {
+          if (this.isBatchNotStarted) {
+            this.commonUtilService.showToast(this.commonUtilService.translateMessage('COURSE_WILL_BE_AVAILABLE',
+              this.datePipe.transform(this.courseStartDate, 'mediumDate')));
+          } else {
+            this.navigateToChildrenDetailsPage(event.data, 1);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * checks whether batches are available or not and then Navigate user to batch list page
+   */
+  async navigateToBatchListPage() {
+    const loader = await this.commonUtilService.getLoader();
+    const reqvalues = new Map();
+    reqvalues['enrollReq'] = this.courseBatchesRequest;
+    this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
+      InteractSubtype.ENROLL_CLICKED, Environment.HOME,
+      PageId.CHAPTER_DETAILS, this.telemetryObject, reqvalues, this.objRollup);
+
+      if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+      this.commonUtilService.showToast('ERROR_NO_INTERNET_MESSAGE');
+      return;
+    }
+
+    // if (!this.batches || !this.batches.length) {
+    //   this.commonUtilService.showToast('NO_BATCHES_AVAILABLE');
+    //   await loader.dismiss();
+    //   return;
+    // }
+
+    if (!this.localCourseService.isEnrollable(this.batches, this.courseContentData)) {
+      return;
+    }
+
+    const ongoingBatches = [];
+    if (this.batches.length === 1) {
+      this.enrollIntoBatch(this.batches[0]);
+    } else {
+      this.batches.forEach(batch => {
+        if (batch.status === 1) {
+          ongoingBatches.push(batch);
+        }
+      });
+      this.router.navigate([RouterLinks.COURSE_BATCHES], {
+        state: {
+          ongoingBatches,
+          upcommingBatches: [],
+          course: this.courseContentData,
+          objRollup: this.objRollup,
+          telemetryObject: this.telemetryObject,
+          corRelationList: this.corRelationList
+        }
+      });
+    }
+  }
+
+  async enrollIntoBatch(item: Batch) {
+    this.loader = await this.commonUtilService.getLoader();
+    if (this.guestUser) {
+      this.promptToLogin(item);
+    } else {
+      await this.loader.present();
+      const enrollCourseRequest = this.localCourseService.prepareEnrollCourseRequest(this.userId, item);
+      this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
+        InteractSubtype.ENROLL_CLICKED,
+        Environment.HOME,
+        PageId.CHAPTER_DETAILS, undefined,
+        this.localCourseService.prepareRequestValue(enrollCourseRequest));
+      const enrollCourse: EnrollCourse = {
+        userId: this.userId,
+        batch: item,
+        pageId: PageId.COURSE_BATCHES,
+        courseId: this.courseContent.identifier,
+        channel: this.courseContent.contentData.channel,
+        userConsent: this.courseContent.contentData.userConsent
+      };
+
+      this.localCourseService.enrollIntoBatch(enrollCourse, this).toPromise()
+        .then(async (data: boolean) => {
+          // await this.loader.dismiss();
+          this.courseContent.batchId = item.id;
+          this.commonUtilService.showToast(this.categoryKeyTranslator.transform('FRMELEMNTS_MSG_COURSE_ENROLLED', this.courseContent));
+          this.events.publish(EventTopics.ENROL_COURSE_SUCCESS, {
+            batchId: item.id,
+            courseId: item.courseId
+          });
+          this.isAlreadyEnrolled = true;
+        }, async (error) => {
+          await this.loader.dismiss();
+        });
+    }
+  }
+
+  async promptToLogin(batchdetail) {
+    const confirm = await this.popoverCtrl.create({
+      component: SbPopoverComponent,
+      componentProps: {
+        sbPopoverMainTitle:
+          this.categoryKeyTranslator.transform('FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL', this.courseContent),
+        metaInfo: this.categoryKeyTranslator.transform('FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS', this.courseContent),
+        sbPopoverHeading: this.commonUtilService.translateMessage('OVERLAY_SIGN_IN'),
+        isNotShowCloseIcon: true,
+        actionsButtons: [
+          {
+            btntext: this.commonUtilService.translateMessage('OVERLAY_SIGN_IN'),
+            btnClass: 'popover-color'
+          },
+        ]
+      },
+      cssClass: 'sb-popover info',
+    });
+    await confirm.present();
+    const { data } = await confirm.onDidDismiss();
+    if (data && data.canDelete) {
+      this.preferences.putString(PreferenceKey.BATCH_DETAIL_KEY, JSON.stringify(batchdetail)).toPromise();
+      this.preferences.putString(PreferenceKey.COURSE_DATA_KEY, JSON.stringify(this.courseContentData)).toPromise();
+      this.appGlobalService.resetSavedQuizContent();
+      this.loginHandlerService.signIn({navigateToCourse: true});
+    }
+  }
+
+  /**
+   * get first child of unit
+   */
+  loadFirstChildren(data) {
+    if (data && (data.children === undefined)) {
+      return data;
+    } else {
+      for (const child of data.children) {
+        return this.loadFirstChildren(child);
+      }
+    }
+  }
+
+  async joinTraining() {
+    if (!this.batches || !this.batches.length) {
+      this.commonUtilService.showToast('NO_BATCHES_AVAILABLE');
+      return;
+    } else if (
+      this.batches.length === 1 &&
+      this.batches[0].enrollmentEndDate &&
+      (new Date().setHours(0, 0, 0, 0) > new Date(this.batches[0].enrollmentEndDate).setHours(0, 0, 0, 0))
+    ) {
+      this.commonUtilService.showToast(
+        'ENROLLMENT_ENDED_ON',
+        null,
+        null,
+        null,
+        null,
+        this.datePipe.transform(this.batches[0].enrollmentEndDate)
+      );
+      return;
+    }
+
+    const confirm = await this.popoverCtrl.create({
+      component: SbPopoverComponent,
+      componentProps: {
+        sbPopoverMainTitle: this.categoryKeyTranslator.transform('FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH', this.courseContent),
+        metaInfo: this.commonUtilService.translateMessage('REGISTER_TO_COMPLETE_ACCESS'),
+        sbPopoverHeading: this.categoryKeyTranslator.transform('FRMELEMNTS_LBL_JOIN_TRAINING', this.courseContent) + '?',
+        isNotShowCloseIcon: true,
+        actionsButtons: [
+          {
+            btntext: this.categoryKeyTranslator.transform('FRMELEMNTS_LBL_JOIN_TRAINING', this.courseContent),
+            btnClass: 'popover-color'
+          },
+        ],
+        // handler : this.handleEnrollCoursePopup.bind(this)
+      },
+      cssClass: 'sb-popover info',
+    });
+    await confirm.present();
+    confirm.onDidDismiss().then(({ data }) => {
+      if (data && data.canDelete) {
+        this.navigateToBatchListPage();
+      }
+    });
+  }
+
+  /**
+   * Redirect to child content details page
+   */
+  navigateToChildrenDetailsPage(content: Content, depth): void {
+    const values = {
+      contentClicked: content.identifier
+    };
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      InteractSubtype.CONTENT_CLICKED,
+      Environment.HOME,
+      PageId.CHAPTER_DETAILS, this.telemetryObject,
+      values,
+      this.objRollup,
+      this.corRelationList
+    );
+
+    this.router.navigate([RouterLinks.CONTENT_DETAILS], this.generateContentNavExtras(content, depth));
+  }
+
+  private generateContentNavExtras(content: Content, depth) {
+    const contentState: ContentState = {
+      batchId: this.courseContent.batchId ? this.courseContent.batchId : '',
+      courseId: this.courseContentData.identifier
+    };
+
+    const params: NavigationExtras = {
+      state: {
+        content,
+        depth,
+        contentState,
+        isChildContent: true,
+        corRelation: this.corRelationList,
+        isCourse: true,
+        course: this.updatedCourseCardData
+      }
+    };
+    return params;
+  }
+
+  getContentsSize(data?) {
+    if (data) {
+      data.forEach((value) => {
+        if (value.contentData.size) {
+          this.downloadSize += Number(value.contentData.size);
+        }
+        if (value.children) {
+          this.getContentsSize(value.children);
+        }
+        if (value.isAvailableLocally === false) {
+          this.downloadIdentifiers.add(value.contentData.identifier);
+          this.rollUpMap[value.contentData.identifier] = ContentUtil.generateRollUp(value.hierarchyInfo, undefined);
+        }
+      });
+    }
+  }
+
+  async showDownloadConfirmationAlert() {
+    console.log('this.downloadIdentifiers', this.downloadIdentifiers);
+    if (this.commonUtilService.networkInfo.isNetworkAvailable) {
+      let contentTypeCount;
+      if (this.downloadIdentifiers.size) {
+        contentTypeCount = this.downloadIdentifiers.size;
+      } else {
+        contentTypeCount = '';
+      }
+      if (!this.isBatchNotStarted) {
+        this.downloadProgress = 0;
+      } else {
+        this.commonUtilService.showToast(this.commonUtilService.translateMessage('COURSE_WILL_BE_AVAILABLE',
+          this.datePipe.transform(this.courseStartDate, 'mediumDate')));
+      }
+      this.telemetryGeneratorService.generateInteractTelemetry(
+        InteractType.TOUCH,
+        InteractSubtype.DOWNLOAD_CLICKED,
+        Environment.HOME,
+        PageId.CHAPTER_DETAILS
+      );
+      const popover = await this.popoverCtrl.create({
+        component: ConfirmAlertComponent,
+        componentProps: {
+          sbPopoverHeading: this.commonUtilService.translateMessage('DOWNLOAD'),
+          sbPopoverMainTitle: this.chapter.name,
+          isNotShowCloseIcon: true,
+          actionsButtons: [
+            {
+              btntext: this.commonUtilService.translateMessage('DOWNLOAD'),
+              btnClass: 'popover-color'
+            },
+          ],
+          icon: null,
+          metaInfo: this.commonUtilService.translateMessage('ITEMS', contentTypeCount)
+            + ' (' + this.fileSizePipe.transform(this.downloadSize, 2) + ')',
+        },
+        cssClass: 'sb-popover info',
+      });
+      await popover.present();
+      const response = await popover.onDidDismiss();
+      if (response && response.data) {
+        this.isDownloadStarted = true;
+        this.showCollapsedPopup = false;
+        // this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
+        //   'download-all-button-clicked',
+        //   Environment.HOME,
+        //   PageId.COURSE_DETAIL,
+        //   undefined,
+        //   undefined,
+        //   // todo
+        //   // this.objRollup,
+        //   // this.corRelationList
+        // );
+        this.events.publish('header:decreasezIndex');
+        this.importContent(this.downloadIdentifiers, true, true);
+        this.showDownload = true;
+      } else {
+        // Cancel Clicked Telemetry
+        // todo
+        // this.generateCancelDownloadTelemetry(this.contentDetail);
+      }
+    } else {
+      this.commonUtilService.showToast('ERROR_NO_INTERNET_MESSAGE');
+    }
+  }
+
+  getImportContentRequestBody(identifiers, isChild: boolean): Array<ContentImport> {
+    const requestParams = [];
+    identifiers.forEach((value) => {
+      requestParams.push({
+        isChildContent: isChild,
+        destinationFolder: cordova.file.externalDataDirectory,
+        contentId: value,
+        // correlationData: this.corRelationList !== undefined ? this.corRelationList : [],
+        correlationData: [],
+        rollUp: this.rollUpMap[value]
+      });
+    });
+
+    return requestParams;
+  }
+
+  importContent(identifiers, isChild: boolean, isDownloadAllClicked?) {
+    const option: ContentImportRequest = {
+      contentImportArray: this.getImportContentRequestBody(identifiers, isChild),
+      contentStatusArray: ['Live'],
+      fields: ['appIcon', 'name', 'subject', 'size', 'gradeLevel']
+    };
+    console.log('ContentImportRequest', option);
+    this.contentService.importContent(option).toPromise()
+      .then((data: ContentImportResponse[]) => {
+        this.zone.run(() => {
+          if (data && data[0].status === ContentImportStatus.NOT_FOUND) {
+            this.headerService.showHeaderWithBackButton();
+          }
+          if (data && data.length && this.isDownloadStarted) {
+            data.forEach((value) => {
+              if (value.status === ContentImportStatus.ENQUEUED_FOR_DOWNLOAD) {
+                this.queuedIdentifiers.push(value.identifier);
+              } else if (value.status === ContentImportStatus.NOT_FOUND) {
+                this.faultyIdentifiers.push(value.identifier);
+              }
+            });
+
+            if (this.queuedIdentifiers.length === 0) {
+              // this.restoreDownloadState();
+            }
+            if (this.faultyIdentifiers.length > 0) {
+              const stackTrace: any = {};
+              stackTrace.parentIdentifier = this.courseContentData.identifier;
+              stackTrace.faultyIdentifiers = this.faultyIdentifiers;
+              this.commonUtilService.showToast('UNABLE_TO_FETCH_CONTENT');
+            }
+          }
+        });
+      })
+      .catch((error) => {
+        this.zone.run(() => {
+          if (error && error.error === 'NETWORK_ERROR') {
+            this.commonUtilService.showToast('NEED_INTERNET_TO_CHANGE');
+          } else {
+            this.commonUtilService.showToast('UNABLE_TO_FETCH_CONTENT');
+          }
+        });
+      });
+  }
+
+  /**
+   * Subscribe Sunbird-SDK event to get content download progress
+   */
+  subscribeSdkEvent() {
+    this.eventSubscription = this.eventsBusService.events()
+      .subscribe((event: EventsBusEvent) => {
+        this.zone.run(() => {
+          // Show download percentage
+          if (event.type === DownloadEventType.PROGRESS) {
+            const downloadEvent = event as DownloadProgress;
+            if (downloadEvent.payload.identifier === this.identifier) {
+              this.downloadProgress = downloadEvent.payload.progress === -1 ? 0 : downloadEvent.payload.progress;
+
+              if (this.downloadProgress === 100) {
+                this.getBatchDetails();
+                this.headerService.showHeaderWithBackButton();
+              }
+            }
+          }
+
+          // Get child content
+          if (event.payload && event.type === ContentEventType.IMPORT_COMPLETED) {
+            this.headerService.showHeaderWithBackButton();
+            const contentImportCompleted = event as ContentImportCompleted;
+            if (this.queuedIdentifiers.length && this.isDownloadStarted) {
+              if (this.queuedIdentifiers.includes(contentImportCompleted.payload.contentId)) {
+                this.currentCount++;
+              }
+
+              if (this.queuedIdentifiers.length === this.currentCount) {
+                this.isDownloadStarted = false;
+                this.currentCount = 0;
+                this.showDownload = false;
+                this.downloadIdentifiers = new Set();
+                this.queuedIdentifiers.length = 0;
+              }
+            } else {
+              this.courseContentData.isAvailableLocally = true;
+              // this.setContentDetails(this.identifier);
+            }
+          }
+
+          if (event.payload && event.type === ContentEventType.SERVER_CONTENT_DATA) {
+            // this.licenseDetails = event.payload.licenseDetails;
+            if (event.payload.size) {
+              this.courseContent.contentData.size = event.payload.size;
+            }
+          }
+
+          if (event.type === ContentEventType.IMPORT_PROGRESS) {
+          }
+
+          // For content update available
+          const hierarchyInfo = this.courseContent.hierarchyInfo ? this.courseContent.hierarchyInfo : null;
+          const contentUpdateEvent = event as ContentUpdate;
+          if (contentUpdateEvent.payload && contentUpdateEvent.payload.contentId === this.courseContentData.identifier &&
+            contentUpdateEvent.type === ContentEventType.UPDATE
+            && hierarchyInfo === null) {
+            this.zone.run(() => {
+              this.headerService.hideHeader();
+            });
+          }
+
+        });
+      }) as any;
+  }
+
+  private getSubContentIds(content) {
+    if (content && content.children) {
+      content.children.forEach((ele) => {
+        this.getSubContentIds(ele);
+      });
+    } else {
+      if (content.mimeType !== MimeType.COLLECTION) {
+        this.subContentIds.push(content.identifier);
+      }
+    }
+    return this.subContentIds;
+  }
+
+  private getNextContent(courseHeirarchy, contentStateList: ContentState[]) {
+    const result = contentStateList.find(({ contentId }) => contentId === courseHeirarchy.identifier);
+    if (!this.isFirstContent && courseHeirarchy.mimeType !== MimeType.COLLECTION) {
+      this.nextContent = courseHeirarchy;
+      this.isFirstContent = true;
+    }
+    if ((result && (result.status === 0 || result.status === 1))
+      || (!result && courseHeirarchy.mimeType !== MimeType.COLLECTION)) {
+      this.nextContent = courseHeirarchy;
+      this.isNextContentFound = true;
+      this.isFirstContent = true;
+    } else if (!this.isNextContentFound && courseHeirarchy && courseHeirarchy.children) {
+      courseHeirarchy.children.forEach((ele) => {
+        if (!this.isNextContentFound) {
+          this.getNextContent(ele, contentStateList);
+        }
+      });
+    }
+    return this.nextContent;
+  }
+  generateImpressionEvent(objectId, objectType, objectVersion) {
+    this.telemetryGeneratorService.generateImpressionTelemetry(ImpressionType.DETAIL,
+      '', PageId.CHAPTER_DETAILS,
+      Environment.HOME,
+      objectId,
+      objectType,
+      objectVersion,
+      this.objRollup,
+      this.corRelationList
+    );
+  }
+
+  onConsentPopoverShow() {
+    if (this.loader) {
+      this.loader.dismiss();
+      this.loader = undefined;
+    }
+  }
+
+  onConsentPopoverDismiss() { }
+
+  private async showProfileNameConfirmationPopup() {
+    const popUp = await this.popoverCtrl.create({
+      component: ProfileNameConfirmationPopoverComponent,
+      componentProps: {
+      },
+      cssClass: 'sb-popover sb-profile-name-confirmation-popover',
+    });
+    await popUp.present();
+    const { data } = await popUp.onDidDismiss();
+    if (data !== undefined) {
+      if (data.buttonClicked) {
+        this.startContent();
+      }
+    } else {
+      this.telemetryGeneratorService.generateInteractTelemetry(
+        InteractType.TOUCH,
+        InteractSubtype.CLOSE_CLICKED,
+        PageId.PROFILE_NAME_CONFIRMATION_POPUP,
+        Environment.HOME
+      );
+    }
+  }
+
+}
diff --git a/src/app/curriculum-courses/curriculum-courses-routing.module.ts b/src/app/curriculum-courses/curriculum-courses-routing.module.ts
new file mode 100644
index 000000000..beffa2f3a
--- /dev/null
+++ b/src/app/curriculum-courses/curriculum-courses-routing.module.ts
@@ -0,0 +1,25 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { RouterLinks } from '../app.constant';
+import { CurriculumCoursesPage } from './curriculum-courses.page';
+
+const routes: Routes = [
+    {
+        path: '',
+        component: CurriculumCoursesPage
+    },
+    {
+        path: RouterLinks.CHAPTER_DETAILS,
+        loadChildren: './chapter-details/chapter-details.module#ChapterDetailsPageModule'
+    },
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(routes)
+    ],
+    exports: [
+        RouterModule
+    ]
+})
+export class CurriculumCoursesRoutingModule { }
diff --git a/src/app/curriculum-courses/curriculum-courses.module.ts b/src/app/curriculum-courses/curriculum-courses.module.ts
new file mode 100644
index 000000000..824a78723
--- /dev/null
+++ b/src/app/curriculum-courses/curriculum-courses.module.ts
@@ -0,0 +1,25 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { CurriculumCoursesPage } from './curriculum-courses.page';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
+import { TranslateModule } from '@ngx-translate/core';
+import { CurriculumCoursesRoutingModule } from './curriculum-courses-routing.module';
+import { PipesModule } from '@app/pipes/pipes.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    CommonConsumptionModule,
+    CurriculumCoursesRoutingModule,
+    PipesModule,
+    TranslateModule.forChild(),
+  ],
+  declarations: [CurriculumCoursesPage]
+})
+export class CurriculumCoursesPageModule { }
diff --git a/src/app/curriculum-courses/curriculum-courses.page.html b/src/app/curriculum-courses/curriculum-courses.page.html
new file mode 100644
index 000000000..a912b520a
--- /dev/null
+++ b/src/app/curriculum-courses/curriculum-courses.page.html
@@ -0,0 +1,32 @@
+<ion-content>
+  <div class="cc-header" [ngStyle]="{'background': theme}">
+    <div class="pull-left">
+      <div class="cc-header-name" [ngStyle]="{'color': titleColor}">
+        {{ subjectName }}
+      </div>
+      <div class="cc-header-desc">
+        {{'NUMBER_OF_COURSES' | translate:{'%s': courseList.length} }}
+      </div>
+    </div>
+    <div class="cd-header-icon pull-right">
+      <img *ngIf="subjectIcon" src="{{subjectIcon}}" alt="subject-icon">
+    </div>
+  </div>
+  <div class="cc-container">
+    <ng-container *ngIf="!isLoading">
+      <div *ngIf="mergedCourseList && mergedCourseList.length">
+        <div *ngFor="let course of mergedCourseList | sortBy: 'isEnrolledCourse' : 'desc';" class="mb-8">
+          <sb-my-course-card *ngIf="course.isEnrolledCourse" [course]="course" [section]="null"
+            [cardImg]="course.cardImg" (click)="openCourseDetails(course)" [hideProgress]="true"></sb-my-course-card>
+          <sb-course-card *ngIf="!course.isEnrolledCourse" [course]="course" [section]="null" [cardImg]="course.appIcon"
+            (click)="openCourseDetails(course)"></sb-course-card>
+        </div>
+      </div>
+    </ng-container>
+    <ng-container *ngIf="isLoading">
+      <div *ngFor="let item of [0,1,2,3,4,5,6,7,8,9,10]" class="mb-8">
+        <sb-course-card [isLoading]="isLoading"></sb-course-card>
+      </div>
+    </ng-container>
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/app/curriculum-courses/curriculum-courses.page.scss b/src/app/curriculum-courses/curriculum-courses.page.scss
new file mode 100644
index 000000000..ea6c6c454
--- /dev/null
+++ b/src/app/curriculum-courses/curriculum-courses.page.scss
@@ -0,0 +1,32 @@
+@import "src/assets/styles/_custom-mixins.scss";
+.cc-header{
+    @include clearfix;
+    background: #FFDFD9;
+    padding: 16px;
+    text-align: left;
+    box-shadow: 0 2px 7px 0 rgba(255,226,222,0.52);
+
+    .cc-header-name{
+        font-size: 16px;
+        font-weight: 600;
+        color: #EA2E52;
+        text-transform: capitalize;
+    }
+
+    .cc-header-desc{
+        color: #666666;
+        font-size: 8px;
+        text-transform: uppercase;
+    }
+
+    .cd-header-icon {
+        img {
+            height: 36px;
+            width: 36px;
+        }
+    }
+}
+
+.cc-container {
+    padding: 16px;
+}
diff --git a/src/app/curriculum-courses/curriculum-courses.page.spec.ts b/src/app/curriculum-courses/curriculum-courses.page.spec.ts
new file mode 100644
index 000000000..d86e5e1fc
--- /dev/null
+++ b/src/app/curriculum-courses/curriculum-courses.page.spec.ts
@@ -0,0 +1,226 @@
+import { CurriculumCoursesPage } from './curriculum-courses.page';
+import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { AppGlobalService, AppHeaderService, CommonUtilService,
+         TelemetryGeneratorService, PageId, Environment, ImpressionType,
+         InteractSubtype, InteractType } from '@app/services';
+import { CourseService, Course, CourseBatchStatus, TelemetryObject } from '@project-sunbird/sunbird-sdk';
+import { of, throwError } from 'rxjs';
+import { Location } from '@angular/common';
+import { Platform } from '@ionic/angular';
+import { NavigationService } from '../../services/navigation-handler.service';
+
+describe('CurriculumCoursesPage', () => {
+    let curriculumCoursesPage: CurriculumCoursesPage;
+    const mockCourseService: Partial<CourseService> = {};
+    const mockAppHeaderService: Partial<AppHeaderService> = {};
+    const mockAppGlobalService: Partial<AppGlobalService> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => ({
+            extras: {
+                state: {
+                    subjectName: 'sample-subject',
+                    subjectIcon: 'sample-icon',
+                    curriculumCourseList: ['course-1', 'course-2'],
+                    theme: 'sample-theme',
+                    titleColor: 'sample-titleColor'
+                }
+            }
+        })) as any
+    };
+    const mockTranslate: Partial<TranslateService> = {};
+    const mockLocation: Partial<Location> = {};
+    const mockPlatform: Partial<Platform> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockNavService: Partial<NavigationService> = {
+        navigateToTrackableCollection: jest.fn()
+    };
+
+    beforeAll(() => {
+        curriculumCoursesPage = new CurriculumCoursesPage(
+            mockCourseService as CourseService,
+            mockAppHeaderService as AppHeaderService,
+            mockAppGlobalService as AppGlobalService,
+            mockNavService as NavigationService,
+            mockCommonUtilService as CommonUtilService,
+            mockRouter as Router,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockLocation as Location,
+            mockPlatform as Platform
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create a instance of chapterDetailsPage', () => {
+        expect(curriculumCoursesPage).toBeTruthy();
+    });
+
+    describe('ionViewWillEnter', () => {
+        beforeEach(() => {
+            jest.clearAllMocks();
+            mockAppHeaderService.showHeaderWithBackButton = jest.fn();
+            const mockConfig = {
+                subscribe: jest.fn(() => { })
+            };
+            mockAppHeaderService.headerEventEmitted$ = of(mockConfig);
+            jest.spyOn(curriculumCoursesPage, 'handleHeaderEvents').mockImplementation(() => {
+                return;
+            });
+            const subscribeWithPriorityData = jest.fn((_, fn) => fn({}));
+            mockPlatform.backButton = {
+                    subscribeWithPriority: subscribeWithPriorityData,
+                } as any;
+            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+            mockLocation.back = jest.fn();
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockCommonUtilService.getContentImg = jest.fn(() => 'some_img_url');
+            curriculumCoursesPage.courseList = [
+                {
+                    identifier: 'do_some_identifier'
+                }
+            ] as any;
+        });
+
+        it('should handle header back button', () => {
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+            // act
+            curriculumCoursesPage.ionViewWillEnter();
+            // assert
+            expect(mockAppHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+            expect(mockAppHeaderService.headerEventEmitted$).toBeTruthy();
+            expect(mockPlatform.backButton).not.toBeUndefined();
+            expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                PageId.COURSE_LIST,
+                Environment.HOME, false
+            );
+            expect(mockLocation.back).toHaveBeenCalled();
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                ImpressionType.VIEW,
+                '',
+                PageId.COURSE_LIST,
+                Environment.HOME
+            );
+        });
+
+        it('should handle getEnrolledCourses() failure', (done) => {
+            // arrange
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+            mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('sample-uid'));
+            curriculumCoursesPage.appliedFilter = {};
+            mockCourseService.getUserEnrolledCourses = jest.fn(() => throwError(''));
+            // act
+            curriculumCoursesPage.ionViewWillEnter();
+            // assert
+            expect(mockAppHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+            expect(mockAppHeaderService.headerEventEmitted$).toBeTruthy();
+            expect(mockPlatform.backButton).not.toBeUndefined();
+            expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                PageId.COURSE_LIST,
+                Environment.HOME, false
+            );
+            expect(mockLocation.back).toHaveBeenCalled();
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                ImpressionType.VIEW,
+                '',
+                PageId.COURSE_LIST,
+                Environment.HOME
+            );
+            setTimeout(() => {
+                expect(mockAppGlobalService.isUserLoggedIn).toBeTruthy();
+                expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
+                expect(mockCourseService.getUserEnrolledCourses).toHaveBeenCalled();
+                expect(curriculumCoursesPage.enrolledCourses).toEqual([]);
+                done();
+            });
+        });
+
+        it('should call getEnrolledCourses() if user is logged in', (done) => {
+            // arrange
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+            mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('sample-uid'));
+            curriculumCoursesPage.appliedFilter = {};
+            const enrolledCourses: Course[] = [
+                {
+                    courseId: 'do_0123'
+                },
+                {
+                    courseId: 'do_some_identifier'
+                }
+            ];
+            mockCourseService.getUserEnrolledCourses = jest.fn(() => of(enrolledCourses));
+            // act
+            curriculumCoursesPage.ionViewWillEnter();
+            // assert
+            expect(mockAppHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+            expect(mockAppHeaderService.headerEventEmitted$).toBeTruthy();
+            expect(mockPlatform.backButton).not.toBeUndefined();
+            expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                PageId.COURSE_LIST,
+                Environment.HOME, false
+            );
+            expect(mockLocation.back).toHaveBeenCalled();
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                ImpressionType.VIEW,
+                '',
+                PageId.COURSE_LIST,
+                Environment.HOME
+            );
+            setTimeout(() => {
+                expect(mockAppGlobalService.isUserLoggedIn).toBeTruthy();
+                expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
+                expect(mockCourseService.getUserEnrolledCourses).toHaveBeenCalled();
+                expect(curriculumCoursesPage.enrolledCourses).toEqual(enrolledCourses);
+                done();
+            });
+        });
+    });
+
+    it('should navigate to curriculumCourse', () => {
+        // arrange
+        const course = { name: 'sample-course' };
+        curriculumCoursesPage.corRelationList = [{
+            id: 'do_123',
+            type: 'course'
+        }as any];
+        mockCommonUtilService.deDupe = jest.fn(() => curriculumCoursesPage.corRelationList);
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+        const telemetryObject = new TelemetryObject(undefined, undefined, '');
+        mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+        // act
+        curriculumCoursesPage.openCourseDetails(course);
+        // assert
+        expect(mockCommonUtilService.deDupe).toHaveBeenCalledWith(curriculumCoursesPage.corRelationList, 'type');
+        // expect(mockRouter.navigate).toHaveBeenCalled();
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH,
+            InteractSubtype.CONTENT_CLICKED,
+            Environment.HOME,
+            PageId.COURSE_LIST,
+            telemetryObject,
+            undefined,
+            {l1: undefined},
+            curriculumCoursesPage.corRelationList,
+        );
+    });
+
+    describe('ionViewWillLeave', () => {
+        it('should unsubscribe the subscriptions', () => {
+            curriculumCoursesPage.backButtonFunc = {
+                unsubscribe: jest.fn()
+            } as any;
+            curriculumCoursesPage.headerObservable = {
+                unsubscribe: jest.fn()
+            } as any;
+            // mockCommonUtilService.getAppName = jest.fn(() => Promise.resolve('Sunbird'));
+            curriculumCoursesPage.ionViewWillLeave();
+            expect(curriculumCoursesPage.backButtonFunc).toBeTruthy();
+            expect(curriculumCoursesPage.backButtonFunc.unsubscribe).toBeTruthy();
+            expect(curriculumCoursesPage.headerObservable.unsubscribe).toHaveBeenCalled();
+        });
+    });
+});
diff --git a/src/app/curriculum-courses/curriculum-courses.page.ts b/src/app/curriculum-courses/curriculum-courses.page.ts
new file mode 100644
index 000000000..aac23e8b7
--- /dev/null
+++ b/src/app/curriculum-courses/curriculum-courses.page.ts
@@ -0,0 +1,166 @@
+import { Component, OnInit, Inject } from '@angular/core';
+import {
+  CommonUtilService, AppGlobalService, TelemetryGeneratorService, PageId, Environment,
+  InteractType, InteractSubtype, ImpressionType, ImpressionSubtype, UtilityService
+} from '@app/services';
+import { Router } from '@angular/router';
+import {
+  CourseService,
+  Course,
+  CorrelationData,
+  TelemetryObject,
+  GetUserEnrolledCoursesRequest,
+  CachedItemRequestSourceFrom
+} from '@project-sunbird/sunbird-sdk';
+import { Subscription } from 'rxjs';
+import { Location } from '@angular/common';
+import { Platform } from '@ionic/angular';
+import { AppHeaderService } from '@app/services/app-header.service';
+import { ContentUtil } from '@app/util/content-util';
+import { NavigationService } from '@app/services/navigation-handler.service';
+
+@Component({
+  selector: 'app-curriculum-courses',
+  templateUrl: './curriculum-courses.page.html',
+  styleUrls: ['./curriculum-courses.page.scss'],
+})
+export class CurriculumCoursesPage implements OnInit {
+
+  isLoading = true;
+  subjectName: string;
+  subjectIcon: string;
+  courseList: [];
+  theme: string;
+  titleColor: string;
+  enrolledCourses: Array<Course> = [];
+  mergedCourseList: [];
+  headerObservable: Subscription;
+  backButtonFunc: Subscription;
+  corRelationList: Array<CorrelationData>;
+  appliedFilter;
+
+
+  constructor(
+    @Inject('COURSE_SERVICE') private courseService: CourseService,
+    private appHeaderService: AppHeaderService,
+    private appGlobalService: AppGlobalService,
+    private navService: NavigationService,
+    private commonUtilService: CommonUtilService,
+    private router: Router,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+    private location: Location,
+    private platform: Platform,
+  ) {
+    const extrasState = this.router.getCurrentNavigation().extras.state;
+    this.subjectName = extrasState.subjectName;
+    this.subjectIcon = extrasState.subjectIcon;
+    this.courseList = extrasState.courseList;
+    this.theme = extrasState.theme;
+    this.titleColor = extrasState.titleColor;
+    this.corRelationList = extrasState.corRelationList;
+    this.appliedFilter = extrasState.appliedFilter;
+  }
+
+  async ionViewWillEnter() {
+    this.appHeaderService.showHeaderWithBackButton();
+
+    this.headerObservable = this.appHeaderService.headerEventEmitted$.subscribe(eventName => {
+      this.handleHeaderEvents(eventName);
+    });
+
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
+      this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.COURSE_LIST, Environment.HOME, false);
+      this.location.back();
+    });
+    this.telemetryGeneratorService.generateImpressionTelemetry(
+      ImpressionType.VIEW,
+      '',
+      PageId.COURSE_LIST,
+      Environment.HOME
+    );
+    if (this.appGlobalService.isUserLoggedIn()) {
+      await this.appGlobalService.getActiveProfileUid()
+        .then(async (uid) => {
+          try {
+            this.enrolledCourses = await this.getEnrolledCourses(uid);
+          } catch (error) {
+            console.error('CurriculumCoursesPage', error);
+          }
+        });
+    }
+
+    this.mergeCourseList(this.enrolledCourses, this.courseList);
+    this.isLoading = false;
+  }
+
+  ionViewWillLeave(): void {
+    if (this.headerObservable) {
+      this.headerObservable.unsubscribe();
+    }
+    if (this.backButtonFunc) {
+      this.backButtonFunc.unsubscribe();
+    }
+  }
+
+  async ngOnInit() {
+  }
+
+  openCourseDetails(course) {
+    this.corRelationList = this.commonUtilService.deDupe(this.corRelationList, 'type');
+    const telemetryObject: TelemetryObject = ContentUtil.getTelemetryObject(course);
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      InteractSubtype.CONTENT_CLICKED,
+      Environment.HOME,
+      PageId.COURSE_LIST,
+      telemetryObject,
+      undefined,
+      ContentUtil.generateRollUp(undefined, course.identifier),
+      this.corRelationList);
+    this.navService.navigateToTrackableCollection(
+      {
+        content: course,
+        corRelationList: this.corRelationList
+      }
+    );
+  }
+
+  async getEnrolledCourses(userId: string) {
+    this.appliedFilter.subject = [this.subjectName];
+    const enrolledCourseRequest: GetUserEnrolledCoursesRequest = {
+      from: CachedItemRequestSourceFrom.SERVER,
+      request: {
+        userId,
+        filters: this.appliedFilter
+      }
+    };
+    return this.courseService.getUserEnrolledCourses(enrolledCourseRequest).toPromise();
+  }
+
+  private mergeCourseList(enrolledCourses, courseList) {
+    this.mergedCourseList = courseList.map((course) => {
+      const enrolledCourse = enrolledCourses.find(c => c.courseId === course.identifier);
+      if (enrolledCourse) {
+        return {
+          ...enrolledCourse,
+          cardImg: this.commonUtilService.getContentImg(enrolledCourse),
+          completionPercentage: enrolledCourse.completionPercentage || 0,
+          isEnrolledCourse: true
+        };
+      } else {
+        return {
+          ...course,
+          appIcon: this.commonUtilService.getContentImg(course),
+          isEnrolledCourse: false
+        };
+      }
+    });
+  }
+
+  handleHeaderEvents($event) {
+    if ($event.name === 'back') {
+      this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.COURSE_LIST, Environment.HOME, true);
+      this.location.back();
+    }
+  }
+}
diff --git a/src/app/discussion-forum/discussion-forum.module.ts b/src/app/discussion-forum/discussion-forum.module.ts
new file mode 100644
index 000000000..4e4820eb8
--- /dev/null
+++ b/src/app/discussion-forum/discussion-forum.module.ts
@@ -0,0 +1,30 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { DiscussionEventsService, DiscussionUiModule } from '@project-sunbird/discussions-ui-v8'
+import { DiscussionTelemetryService } from '@app/services/discussion/discussion-telemetry.service';
+import { NavigationService } from '@app/services/navigation-handler.service';
+
+@NgModule({
+  declarations: [],
+  imports: [
+    CommonModule,
+    DiscussionUiModule,
+  ],
+  exports: [
+    DiscussionUiModule
+  ],
+})
+export class DiscussionForumModule { 
+  constructor(
+    private discussionEvents: DiscussionEventsService,
+    private discussionTelemetryService: DiscussionTelemetryService,
+    private navigationService: NavigationService
+  ) {
+    this.discussionEvents.telemetryEvent.subscribe(event => {
+      this.discussionTelemetryService.logTelemetryEvent(event);
+      if(event.action && event.action === 'DF_CLOSE'){
+        this.navigationService.navigateToLastUrl();
+      }
+    });
+  }
+}
diff --git a/src/app/district-mapping/district-mapping.module.ts b/src/app/district-mapping/district-mapping.module.ts
index d955acfe3..65e4e704e 100644
--- a/src/app/district-mapping/district-mapping.module.ts
+++ b/src/app/district-mapping/district-mapping.module.ts
@@ -8,6 +8,9 @@ import { IonicModule } from '@ionic/angular';
 import { DistrictMappingPage } from './district-mapping.page';
 import { TranslateModule } from '@ngx-translate/core';
 import { PipesModule } from '@app/pipes/pipes.module';
+import { CommonFormElementsModule } from 'common-form-elements';
+import { LocationHandler } from '@app/services/location-handler';
+import {ProfileHandler} from '@app/services/profile-handler';
 
 const routes: Routes = [
   {
@@ -23,9 +26,11 @@ const routes: Routes = [
     IonicModule,
     RouterModule.forChild(routes),
     TranslateModule.forChild(),
-    PipesModule
+    PipesModule,
+    CommonFormElementsModule
 
   ],
-  declarations: [DistrictMappingPage]
+  declarations: [DistrictMappingPage],
+  providers: [LocationHandler, ProfileHandler]
 })
 export class DistrictMappingPageModule {}
diff --git a/src/app/district-mapping/district-mapping.page.html b/src/app/district-mapping/district-mapping.page.html
index 7fbb77711..be4a706c7 100644
--- a/src/app/district-mapping/district-mapping.page.html
+++ b/src/app/district-mapping/district-mapping.page.html
@@ -1,72 +1,35 @@
-<ion-content class="ion-padding">
-  <div>
-    <ion-icon *ngIf="isShowBackButton" ios="ios-arrow-back" md="md-arrow-back" (click)="goBack(true)"
-      class="top-back-button"></ion-icon>
+<ion-content>
+  <div class="dm-header ion-padding">
+    <ion-icon *ngIf="isShowBackButton" name="arrow-back" (click)="goBack(true)"
+      class="top-back-button"></ion-icon><span class="preference-info">{{ 'SET_PREFERENCE' | translate }}</span>
     <button class="pull-right sb-btn-sm sb-btn-outline-info" (click)="skipLocation()"
       *ngIf="showNotNowFlag">{{'NOT_NOW'| translate}}</button>
   </div>
-  <div *ngIf="!profile" class="heading"><strong>{{'YOUR_LOCATION'| translate}}</strong></div>
-  <div *ngIf="!profile" class="sub-heading">{{'YOUR_LOCATION_DETAILS' | translate}}</div>
-  <div class="name" *ngIf="profile" [ngClass]="(profile) ? 'margin-top-6' : ''">
-    <div><span class="label">{{'NAME' | translate}}</span><span class="error">*</span></div>
-    <input type="text" class="name-feild" [ngClass]="(validateName()) ? 'error-input' : ''" [(ngModel)]="name"
-      placeholder="{{ 'NAME_HINT' | translate }}" (ngModelChange)="validateName()">
-    <span class="error font-size-13" *ngIf="validateName()">{{'ERROR_NAME_INVALID' | translate}}</span>
+  <div class="ion-padding" *ngIf="!profile">
+    <div class="heading"><strong>{{'YOUR_LOCATION'| translate}}</strong></div>
+    <div class="sub-heading">{{'YOUR_LOCATION_DETAILS' | translate}}</div>
+  </div>
+
+  <div class="px-16">
+    <sb-form *ngIf="locationFormConfig && locationFormConfig.length"
+             [platform]="'mobile'"
+             [config]="locationFormConfig"
+             (initialize)="onFormInitialize($event)"
+             (valueChanges)="onFormValueChange($event)"
+             (dataLoadStatus)="onDataLoadStatusChange($event)">
+    </sb-form>
   </div>
-  <form>
-    <ion-item>
-      <ion-label position="stacked" class="label-font">{{'STATE' | translate}} &lrm;<ion-text>
-          <span style="color: red;">&nbsp;*</span>
-        </ion-text>
-      </ion-label>
-      <ion-select #stateSelect
-                  [selectedText]="stateSelect?.value?.name"
-                  [disabled]="!stateList.length"
-                  [multiple]="false"
-                  [interfaceOptions]="{cssClass: 'select-box'}"
-                  [placeholder]="'STATE_OPTION_TEXT' | translate"
-                  [okText]="'BTN_SUBMIT' | translate"
-                  [cancelText]="'CANCEL' | translate"
-                  (ionChange)="selectState(stateSelect.value.name , stateSelect.value.id, stateSelect.value.code);">
-        <ion-select-option
-                *ngFor="let state of stateList"
-                [value]="state">
-          {{state?.name}}
-          &lrm;
-        </ion-select-option>
-      </ion-select>
-    </ion-item>
-    <ion-item>
-      <ion-label position="stacked" class="label-font">{{'DISTRICT' | translate}} &lrm;<ion-text>
-          <span style="color: red;">&nbsp;*</span>
-        </ion-text>
-      </ion-label>
-      <ion-select #districtSelect
-                  [selectedText]="districtSelect?.value?.name"
-                  [disabled]="!districtList.length"
-                  [multiple]="false"
-                  [interfaceOptions]="{cssClass: 'select-box'}"
-                  [placeholder]="'DISTRICT_OPTION_TEXT' | translate"
-                  [okText]="'BTN_SUBMIT' | translate"
-                  [cancelText]="'CANCEL' | translate"
-                  (ionChange)="selectDistrict(districtSelect.value.name , districtSelect.value.code);">
-        <ion-select-option
-                *ngFor="let district of districtList"
-                [value]="district">
-          {{district?.name}}
-          &lrm;
-        </ion-select-option>
-      </ion-select>
-    </ion-item>
-  </form>
 
-  <div style="display:none">{{!(isKeyboardShown$ | async)}}</div>
 </ion-content>
-<div class="footer" *ngIf="!(isKeyboardShown$ | async)">
-  <button class="block-button"
-    [disabled]="!isValid(stateName, stateList, 'name') || !isValid(districtName, districtList, 'name') || disableSubmitButton"
-    [ngClass]="!isValid(stateName, stateList, 'name') || !isValid(districtName, districtList, 'name') ? 'disabled-button': ''"
-    (click)="submit()">{{'BTN_SUBMIT' | translate}}
-    <ion-icon class="arrow-icon" [class.animate]="isValid(districtName, districtList, 'name') ? 'disabled-button': ''" name="arrow-round-forward"></ion-icon>
-  </button>
-</div>
\ No newline at end of file
+<div class="footer">
+  <div class="btn-info" *ngIf="locationFormConfig && locationFormConfig.length">
+    <button class="block-button-clear"
+            [ngClass]="{'blur-clear-btn': formGroup?.invalid}" [disabled]="formGroup?.invalid"
+            (click)="clearUserLocationSelections()">{{'CLEAR' | translate}}
+    </button>
+    <button class="block-button-save"
+            [ngClass]="{'blur-save-btn': formGroup?.invalid}" [disabled]="formGroup?.invalid"
+            (click)="submit()">{{'BTN_SUBMIT' | translate}}
+    </button>
+  </div>
+</div>
diff --git a/src/app/district-mapping/district-mapping.page.scss b/src/app/district-mapping/district-mapping.page.scss
index 343862737..b7e0af260 100644
--- a/src/app/district-mapping/district-mapping.page.scss
+++ b/src/app/district-mapping/district-mapping.page.scss
@@ -3,18 +3,18 @@
 
 :host {
     .input-container {
-        border: 0.5px solid #333333;
+        border: 0.5px solid map-get($colors, primary_black);
         padding: 11px;
 
         .input {
-            border: #ffffff;
+            border: map-get($colors, white);
             outline: none;
         }
 
         .input-icon {
             float: right;
             font-size: 20px;
-            color: #333333;
+            color: map-get($colors, primary_black);
         }
     }
 
@@ -23,13 +23,13 @@
     }
     
     .error-input{
-      border-bottom: 1.5px solid #e76026 !important;
+      border-bottom: 1.5px solid map-get($colors, bright_red_e7) !important;
     }
 
     .label {
         font-size: 13px;
         padding-left: 16px;
-        color: #333333;
+        color: map-get($colors, primary_black);
     }
 
     .name {
@@ -50,7 +50,7 @@
         border-right: white;
         border-top: white;
         border-left: white;
-        border-bottom: 0.5px solid #333333;
+        border-bottom: 0.5px solid map-get($colors, primary_black);
         padding-bottom: 6px;
         padding-left: 11px;
         font-size: 13px;
@@ -65,14 +65,14 @@
         border-left: white;
         border-right: white;
         border-top: white;
-        border-bottom: 0.5px solid #333333;
+        border-bottom: 0.5px solid map-get($colors, primary_black);
         width:100%;
         outline: none;
     }
 
     .disableInput {
-        background-color: #EBEBE4;
-    };
+        background-color: map-get($colors, white_eb);
+    }
     .danger {
         color: red;
     }
@@ -84,7 +84,7 @@
     .input-label {
         font-weight: 200;
         font-size: 14px;
-        color: #797979;
+        color: map-get($colors, gray_79);
     }
 
     .margin-top {
@@ -110,20 +110,19 @@
     }
 
     .footer {
-        position: absolute;
         width: 100%;
         bottom: 0;
     }
 
     .heading {
-        color: #024f9d;
+        color: $blue;
         text-align: center;
         font-size: 14px;
         margin: 16px 0px 16px 0px;
     }
 
     .sub-heading {
-        color: #333333;
+        color: map-get($colors, primary_black);
         font-size: 12px;
         margin: 16px 0px 25px 0px;
     }
@@ -145,23 +144,32 @@
     }
 
     ::-webkit-scrollbar-thumb {
-        background: #818181;
+        background: map-get($colors, gray_81);
         border-radius: 10px;
     }
 
     ::-webkit-scrollbar-thumb:hover {
-        background: #bababa;
+        background: map-get($colors, gray_ba);
     }
 
-    .block-button {
-        text-align: center;
-        padding: 16px 0 16px 0;
-        width: 92%;
-        margin: 0 4% 32px 4%;
+    .block-button-save{
         color: white;
-        background-color: #0076fe;
-        text-transform: uppercase;
-    }
+        background-color: $blue;
+        font-size: 16px;
+        padding: 8px 0;
+        margin-left: 18px;
+        border: 2px solid $blue;
+        width: 45%;
+      }
+      .block-button-clear{
+        color: $blue;
+        background-color: white;
+        font-size: 16px;
+        padding: 8px 0;
+        border: 2px solid $blue;
+        width: 45%;
+        margin-left: 0.7rem;
+      }
     .arrow-icon {
         right: 15px;
         top: 50%;
@@ -177,6 +185,23 @@
             animation-duration: 0.9s;
         }
     }
+    .btn-info{
+        padding: 20px
+    }
+    .preference-info{
+        font-size: 18px;
+        position: absolute;
+        margin-left: 10px;
+    }
+
+    .blur-clear-btn{
+        color: $primary-100 !important;
+        border-color: 2px solid $primary-100 !important;
+    }
+    .blur-save-btn{
+        background-color: map-get($colors, light_blue_color) !important;
+        border-color: 2px solid $primary-100 !important;
+    }
 }
 
 @keyframes upDownAnimate {
diff --git a/src/app/district-mapping/district-mapping.page.spec.ts b/src/app/district-mapping/district-mapping.page.spec.ts
index 3584fa315..64b85ba1b 100644
--- a/src/app/district-mapping/district-mapping.page.spec.ts
+++ b/src/app/district-mapping/district-mapping.page.spec.ts
@@ -1,21 +1,26 @@
 import { DistrictMappingPage } from '../district-mapping/district-mapping.page';
 import {
     AppGlobalService, AppHeaderService, CommonUtilService,
-    FormAndFrameworkUtilService, TelemetryGeneratorService
+    FormAndFrameworkUtilService, TelemetryGeneratorService, AuditType, InteractType, CorReleationDataType, InteractSubtype
 } from '../../services';
-import { InteractSubtype, PageId, Environment } from '@app/services/telemetry-constants';
-import { DeviceRegisterService } from '../../../../sunbird-mobile-sdk/src/device-register';
+import { featureIdMap } from '@app/feature-id-map';
+import { PageId, Environment, ImpressionType } from '@app/services/telemetry-constants';
 import { DeviceInfo } from '../../../../sunbird-mobile-sdk/src/util/device';
 import { Router } from '@angular/router';
 import { Location } from '@angular/common';
-import { Events, Platform } from '@ionic/angular';
-import { ChangeDetectorRef, NgZone } from '@angular/core';
-import { ExternalIdVerificationService } from '../../services/externalid-verification.service';
-import { SharedPreferences } from '../../../../sunbird-mobile-sdk/src/util/shared-preferences';
-import { EMPTY, of, throwError } from 'rxjs';
-import { LocationSearchResult } from '../../../../sunbird-mobile-sdk/src/profile/def/location-search-result';
-import { ProfileService, Profile, ProfileType, ProfileSource, DeviceRegisterResponse } from 'sunbird-sdk';
+import { Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { of, throwError } from 'rxjs';
+import {
+    ProfileService, Profile, SharedPreferences, ProfileType, ProfileSource, DeviceRegisterResponse,
+    DeviceRegisterService
+} from 'sunbird-sdk';
 import { PreferenceKey } from '@app/app/app.constant';
+import { FormLocationFactory } from '../../services/form-location-factory/form-location-factory';
+import { LocationHandler } from '../../services/location-handler';
+import { ProfileHandler } from '../../services/profile-handler';
+import { AuditState, CorrelationData } from '@project-sunbird/sunbird-sdk';
+import { TncUpdateHandlerService } from '../../services/handlers/tnc-update-handler.service';
 
 describe('DistrictMappingPage', () => {
     let districtMappingPage: DistrictMappingPage;
@@ -44,10 +49,17 @@ describe('DistrictMappingPage', () => {
     const mockDeviceRegisterService: Partial<DeviceRegisterService> = {
         registerDevice: jest.fn(() => of({} as DeviceRegisterResponse))
     };
-    const mockDeviceInfo: Partial<DeviceInfo> = {};
+    const mockDeviceInfo: Partial<DeviceInfo> = {
+        isKeyboardShown: jest.fn(() => of(true))
+    };
     const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {};
     const mockRouter: Partial<Router> = {
-        navigate: jest.fn()
+        navigate: jest.fn(),
+        getCurrentNavigation: jest.fn(() => ({
+            extras: {
+                state: true
+            }
+        })) as any
     };
     const mockLocation: Partial<Location> = {
         back: jest.fn()
@@ -66,26 +78,20 @@ describe('DistrictMappingPage', () => {
         generateInteractTelemetry: jest.fn(),
         generateBackClickedTelemetry: jest.fn()
     };
-    const mockChangeDetectionRef: Partial<ChangeDetectorRef> = {};
-    const mockNgZone: Partial<NgZone> = {
-        run: jest.fn((fn) => fn())
-
+    const mockFormLocationFactory: Partial<FormLocationFactory> = {};
+    const mockLocationHandler: Partial<LocationHandler> = {
     };
-    const mockExternalIdVerificationService: Partial<ExternalIdVerificationService> = {
-        showExternalIdVerificationPopup: jest.fn()
+    const mockProfileHandler: Partial<ProfileHandler> = {
     };
+    mockRouter.getCurrentNavigation = jest.fn(() => {
+        return {
+            extras: { state: {} }
+        };
+    }) as any;
+    const mockTncUpdateHandlerService: Partial<TncUpdateHandlerService> = {};
 
     beforeAll(() => {
-        mockRouter.getCurrentNavigation = jest.fn(() => {
-            return {
-                extras: {}
-            };
-        });
-
-        mockDeviceInfo.isKeyboardShown = jest.fn(() => {
-            return EMPTY;
-        });
-
+        //  window.history.state.source({query: 'google'}, 'MOCK');
         districtMappingPage = new DistrictMappingPage(
             mockProfileService as ProfileService,
             mockPreferences as SharedPreferences,
@@ -100,9 +106,10 @@ describe('DistrictMappingPage', () => {
             mockEvents as Events,
             mockPlatform as Platform,
             mockTelemetryGeneratorService as TelemetryGeneratorService,
-            mockChangeDetectionRef as ChangeDetectorRef,
-            mockNgZone as NgZone,
-            mockExternalIdVerificationService as ExternalIdVerificationService
+            mockFormLocationFactory as FormLocationFactory,
+            mockLocationHandler as LocationHandler,
+            mockProfileHandler as ProfileHandler,
+            mockTncUpdateHandlerService as TncUpdateHandlerService
         );
     });
 
@@ -114,581 +121,783 @@ describe('DistrictMappingPage', () => {
         expect(districtMappingPage).toBeTruthy();
     });
 
-    it('should open select overlay when showStates is set', (done) => {
-        // arrange
-        districtMappingPage.stateSelect = { open: jest.fn(() => { }) };
-
-        // act
-        districtMappingPage.showStates = true;
-
-        // assert
-        setTimeout(() => {
-            expect(districtMappingPage.stateSelect.open).toHaveBeenCalledTimes(1);
-            done();
-        }, 510);
-    });
-
-    it('should open select overlay when showDistrict is set', (done) => {
-        // arrange
-        districtMappingPage.districtSelect = { open: jest.fn(() => { }) };
-
-        // act
-        districtMappingPage.showDistrict = true;
-
-        // assert
-        setTimeout(() => {
-            expect(districtMappingPage.districtSelect.open).toHaveBeenCalledTimes(1);
-            done();
-        }, 510);
-    });
-
-    it('should populate the state name when getStates() is invoked ', () => {
-        // arrange
-        window.history.replaceState({ source: 'profile-settings' }, 'MOCK');
-        const dismissFn = jest.fn(() => Promise.resolve());
-        mockCommonUtilService.getLoader = jest.fn(() => ({
-            present: presentFn,
-            dismiss: dismissFn,
-        }));
-        const locationSearchResult: LocationSearchResult[] = [{ code: '2', name: 'Odisha', id: '12345', type: 'state' }];
-        jest.spyOn(mockProfileService, 'searchLocation').mockReturnValue(of(locationSearchResult));
-        districtMappingPage.availableLocationState = 'Odisha';
-        districtMappingPage.availableLocationDistrict = 'Odisha';
-        districtMappingPage.isAutoPopulated = true;
-        // act
-        districtMappingPage.getStates();
-
-        // assert
-        setTimeout(() => {
-            expect(districtMappingPage.stateList).toBeDefined();
-            expect(districtMappingPage.stateName).toBeDefined();
-        }, 0);
+    describe('goBack', () => {
+        beforeEach(() => {
+            window.history.pushState({ sourc: 'sample-source' }, '', '');
+        });
 
+        it('should generate back clicked telemetry', () => {
+            // arrange
+            mockTelemetryGeneratorService.generateBackClickedNewTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+            // act
+            districtMappingPage.goBack(false);
+            // assert
+            expect(mockTelemetryGeneratorService.generateBackClickedNewTelemetry).toHaveBeenCalledWith(
+                true,
+                Environment.ONBOARDING,
+                PageId.LOCATION
+            );
+            expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                PageId.DISTRICT_MAPPING,
+                Environment.ONBOARDING,
+                false);
+        });
     });
 
-    it('should generate TELEMETRY when device back clicked', () => {
-        // arrange
-        const subscribeWithPriorityData = jest.fn((_, fn) => fn());
-        mockPlatform.backButton = {
-            subscribeWithPriority: subscribeWithPriorityData,
-
-        } as any;
-        window.history.replaceState({ source: 'guest-profile', isShowBackButton: true }, 'MOCK');
-        // act
-        districtMappingPage.handleDeviceBackButton();
-        // assert
-        expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
-            PageId.DISTRICT_MAPPING, Environment.USER, false);
+    describe('handleDeviceBackButton', () => {
+        beforeEach(() => {
+            window.history.pushState({ isShowBackButton: true }, '', '');
+        });
+        it('should handle devices back button', () => {
+            // arrange
+            const subscribeWithPriorityData = jest.fn((_, fn) => fn());
+            mockPlatform.backButton = {
+                subscribeWithPriority: subscribeWithPriorityData
+            } as any;
+            jest.spyOn(districtMappingPage, 'goBack').mockImplementation();
+            // act
+            districtMappingPage.handleDeviceBackButton();
+            // arrange
+            expect(subscribeWithPriorityData).toHaveBeenCalledWith(10, expect.any(Function));
+        });
     });
 
-    it('should unsubscribe backButtonFunc in ionViewWillLeave', () => {
-        // arrange
-        districtMappingPage.backButtonFunc = {
-            unsubscribe: jest.fn(),
-
-        } as any;
-        // act
+    it('should unsubscribe backButton', () => {
         districtMappingPage.ionViewWillLeave();
-        // assert
-        expect(districtMappingPage.backButtonFunc.unsubscribe).toHaveBeenCalled();
-    });
-
-    it('shouldn\'t populate district when state value is not available  ', (done) => {
-        // arrange
-        window.history.replaceState({ source: 'profile-settings' }, 'MOCK');
-        const dismissFn = jest.fn(() => Promise.resolve());
-        mockCommonUtilService.getLoader = jest.fn(() => ({
-            present: presentFn,
-            dismiss: dismissFn,
-        }));
-        const locationSearchResult: LocationSearchResult[] = [];
-        jest.spyOn(mockProfileService, 'searchLocation').mockReturnValue(of(locationSearchResult));
-        // act
-        districtMappingPage.getStates();
-
-        // assert
-        setTimeout(() => {
-            expect(districtMappingPage.districtList).toEqual([]);
-            expect(districtMappingPage.showDistrict).toBeTruthy();
-            done();
-        }, 1);
-
-    });
-
-    it('shouldn\'t populate district when state value is not available  ', (done) => {
-        // arrange
-        window.history.replaceState({ source: 'profile-settings' }, 'MOCK');
-        const dismissFn = jest.fn(() => Promise.resolve());
-        mockCommonUtilService.getLoader = jest.fn(() => ({
-            present: presentFn,
-            dismiss: dismissFn,
-        }));
-        const locationSearchResult: LocationSearchResult[] = [{ code: '2', name: 'Karnataka', id: '12345', type: 'state' }];
-        jest.spyOn(mockProfileService, 'searchLocation').mockReturnValue(of(locationSearchResult));
-        districtMappingPage.availableLocationDistrict = 'Cuttack';
-        // act
-        districtMappingPage.getDistrict('');
-
-        // assert
-        setTimeout(() => {
-            expect(districtMappingPage.districtName).toEqual('');
-            done();
-        }, 1);
-
-    });
-
-    it('should show districtList if availableLocationDistrict is not available ', (done) => {
-        // arrange
-        window.history.replaceState({ source: 'profile-settings' }, 'MOCK');
-        const dismissFn = jest.fn(() => Promise.resolve());
-        mockCommonUtilService.getLoader = jest.fn(() => ({
-            present: presentFn,
-            dismiss: dismissFn,
-        }));
-        const locationSearchResult: LocationSearchResult[] = [{ code: '2', name: 'Odisha', id: '12345', type: 'state' }];
-        jest.spyOn(mockProfileService, 'searchLocation').mockReturnValue(of(locationSearchResult));
-        districtMappingPage.availableLocationDistrict = undefined;
-        // act
-        districtMappingPage.getDistrict('');
-
-        // assert
-        setTimeout(() => {
-            expect(districtMappingPage.showDistrict).toBeTruthy();
-            done();
-        }, 1);
-
-    });
-
-    it('should show  NODATA toast if district list is not available', (done) => {
-        // arrange
-        window.history.replaceState({ source: 'profile-settings' }, 'MOCK');
-        const dismissFn = jest.fn(() => Promise.resolve());
-        mockCommonUtilService.getLoader = jest.fn(() => ({
-            present: presentFn,
-            dismiss: dismissFn,
-        }));
-        const locationSearchResult: LocationSearchResult[] = undefined;
-        jest.spyOn(mockProfileService, 'searchLocation').mockReturnValue(of(locationSearchResult));
-        districtMappingPage.availableLocationDistrict = undefined;
-        // act
-        districtMappingPage.getDistrict('');
-
-        // assert
-        setTimeout(() => {
-            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('NO_DATA_FOUND');
-            expect(districtMappingPage.districtList).toEqual([]);
-            expect(districtMappingPage.showDistrict).toBeFalsy();
-            done();
-        }, 1);
-
     });
 
-    it('should show NO NETWORK Toast if network is not available on click of submit', () => {
+    it('should generate location capture telemetry', () => {
         // arrange
-        mockCommonUtilService.networkInfo = { isNetworkAvailable: false };
-
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        const isEdited = true;
         // act
-        districtMappingPage.submit();
+        districtMappingPage.generateLocationCaptured(true);
         // assert
-        expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('INTERNET_CONNECTIVITY_NEEDED');
-    });
-
-    it('should invoke device register API and save it in the preference', (done) => {
-        // arrange
-        districtMappingPage.stateList = [{ type: 'state', name: 'Odisha', id: 'od_123' }];
-        districtMappingPage.districtList = [{ type: 'district', name: 'Cuttack', id: 'ct_123' }];
-        districtMappingPage.stateName = 'Odisha';
-        districtMappingPage.districtName = 'Cuttack';
-        mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
-        const req = {
-            userDeclaredLocation: {
-                state: 'Odisha',
-                stateId: 'od_123',
-                district: 'Cuttack',
-                districtId: 'ct_123',
-                declaredOffline: false
-            }
-        };
-        mockCommonUtilService.handleToTopicBasedNotification = jest.fn();
-
-        // act
-        districtMappingPage.saveDeviceLocation();
-        // assert
-        setTimeout( () => {
-            expect(mockDeviceRegisterService.registerDevice).toHaveBeenCalledWith(req);
-            expect(mockPreferences.putString).toHaveBeenCalledWith(PreferenceKey.DEVICE_LOCATION, JSON.stringify(req.userDeclaredLocation));
-            expect(mockCommonUtilService.handleToTopicBasedNotification).toHaveBeenCalled();
-            expect(mockCommonUtilService.getLoader().dismiss).toHaveBeenCalled();
-            done();
-        }, 1);
-    });
-
-    it('should invoke updateServerProfile when submit clicked', (done) => {
-        // arrange
-        window.history.replaceState({ profile }, 'MOCK');
-        mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
-        districtMappingPage.name = 'sample_name';
-        mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
-        jest.spyOn(districtMappingPage, 'saveDeviceLocation').mockImplementation();
-        // act
-        districtMappingPage.submit();
-        // assert
-        setTimeout(() => {
-            expect(mockProfileService.updateServerProfile).toHaveBeenCalledTimes(1);
-            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('PROFILE_UPDATE_SUCCESS');
-            expect(mockEvents.publish).toHaveBeenCalledWith('loggedInProfile:update',
-                { firstName: 'samplename', lastName: '', locationCodes: ['2', '2'], userId: '12345' });
-            expect(mockLocation.back).toHaveBeenCalled();
-            done();
-        }, 1);
-    });
-
-    it('should go 2 pages back  when submit clicked and profile is not available', (done) => {
-        // arrange
-        window.history.replaceState({ profile: undefined }, 'MOCK');
-        mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
-        districtMappingPage.name = 'sample_name';
-        mockAppGlobalService.isJoinTraningOnboardingFlow = true;
-        jest.spyOn(window.history, 'go');
-        // act
-        districtMappingPage.submit();
-        // assert
-        setTimeout(() => {
-            expect(mockProfileService.updateServerProfile).toHaveBeenCalledTimes(1);
-            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('PROFILE_UPDATE_SUCCESS');
-            expect(window.history.go).toHaveBeenCalledWith(-2);
-            done();
-        }, 1);
-    });
-
-    it('should navigate to TAB page  when submit clicked and profile is not available', (done) => {
-        // arrange
-        window.history.replaceState({ profile: undefined }, 'MOCK');
-        mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
-        districtMappingPage.name = 'sample_name';
-        mockAppGlobalService.isJoinTraningOnboardingFlow = false;
-        jest.spyOn(window.history, 'go');
-        // act
-        districtMappingPage.submit();
-        // assert
-        setTimeout(() => {
-            expect(mockProfileService.updateServerProfile).toHaveBeenCalledTimes(1);
-            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('PROFILE_UPDATE_SUCCESS');
-            expect(mockRouter.navigate).toHaveBeenCalledWith(['/tabs']);
-            done();
-        }, 1);
-    });
-
-    it('should naviigate to TABS page if API fails and profile is not available ', (done) => {
-        // arrange
-        mockProfileService.updateServerProfile = jest.fn(() => throwError(''));
-        mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
-        districtMappingPage.name = 'sample_name';
-        // act
-        districtMappingPage.submit();
-        // assert
-        setTimeout(() => {
-            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('PROFILE_UPDATE_FAILED');
-            expect(mockRouter.navigate).toHaveBeenCalledWith(['/tabs']);
-            expect(mockExternalIdVerificationService.showExternalIdVerificationPopup).toHaveBeenCalled();
-            done();
-        }, 1);
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH,
+            InteractSubtype.LOCATION_CAPTURED,
+            Environment.ONBOARDING,
+            PageId.DISTRICT_MAPPING,
+            undefined,
+            {
+              isEdited
+            }, undefined,
+            [{id: 'user:location_capture', type: 'Feature'}, {id: 'SB-14682', type: 'Task'}]
+        );
     });
 
-    it('should go back if API fails and profile  available ', (done) => {
-        // arrange
-        window.history.replaceState({ profile }, 'MOCK');
-        mockProfileService.updateServerProfile = jest.fn(() => throwError(''));
-        mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
-        districtMappingPage.name = 'sample_name';
-        // act
-        districtMappingPage.submit();
-        // assert
-        setTimeout(() => {
-            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('PROFILE_UPDATE_FAILED');
-            expect(mockLocation.back).toHaveBeenCalled();
-            done();
-        }, 1);
+    describe('isStateorDistrictChanged', () => {
+        it('should return changeStatue for state change', () => {
+            // arrange
+            const locationCodes = [{
+                type: 'state',
+                code: 'new-code'
+            }];
+            // act
+            const data = districtMappingPage.isStateorDistrictChanged(locationCodes);
+            // assert
+            expect(data).toBeUndefined();
+        });
     });
 
-    it('should save location if user is trying to edit the location', (done) => {
-        // arrange
-        window.history.replaceState({ source: 'guest-profile' }, 'MOCK');
-        mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
-        jest.spyOn(districtMappingPage, 'saveDeviceLocation').mockImplementation();
-        // act
-        districtMappingPage.submit();
-        // assert
-        setTimeout(() => {
-            expect(districtMappingPage.saveDeviceLocation).toHaveBeenCalled();
-            expect(mockLocation.back).toHaveBeenCalled();
-            expect(mockEvents.publish).toHaveBeenCalledWith('refresh:profile');
-            done();
-        }, 1);
-        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+    describe('submit', () => {
+        beforeEach(() => {
+            window.history.pushState({ isShowBackButton: true }, '', '');
+        });
 
-    });
+        it('should generate generateSubmitInteractEvent', () => {
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const correlationList: Array<CorrelationData> = [];
+            correlationList.push({ id: PageId.POPUP_CATEGORY, type: CorReleationDataType.CHILD_UI });
+            // act
+            districtMappingPage.generateSubmitInteractEvent(correlationList);
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.SELECT_SUBMIT, '',
+                Environment.ONBOARDING,
+                PageId.LOCATION,
+                undefined,
+                undefined,
+                undefined,
+                correlationList
+            );
+        });
 
-    it('should save location in case of normal usecase', (done) => {
-        // arrange
-        window.history.replaceState({ source: 'profile-setting' }, 'MOCK');
-        mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
-        mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
-        jest.spyOn(districtMappingPage, 'saveDeviceLocation').mockImplementation();
-        mockAppGlobalService.setOnBoardingCompleted = jest.fn();
-        // act
-        districtMappingPage.submit();
-        // assert
-        setTimeout(() => {
-            expect(districtMappingPage.saveDeviceLocation).toHaveBeenCalled();
-            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
-            expect(mockAppGlobalService.setOnBoardingCompleted).toHaveBeenCalled();
-            expect(mockRouter.navigate).toHaveBeenCalledWith(['/tabs'], {
-                state: {
-                    loginMode: 'guest'
+        it('should not submit form details for offline', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            districtMappingPage.formGroup = {
+                value: {
+                    children: {
+                        persona: {
+                            type: { type: 'sample-type' },
+                            code: 'sample-code'
+                        }
+                    },
+                    name: 'sample name'
                 }
+            } as any;
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
+            };
+            mockDeviceRegisterService.registerDevice = jest.fn(() => of({}));
+            mockPreferences.putString = jest.fn(() => of(undefined));
+            mockCommonUtilService.handleToTopicBasedNotification = jest.fn();
+            jest.spyOn(districtMappingPage, 'generateSubmitInteractEvent').mockImplementation();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(districtMappingPage, 'isStateorDistrictChanged').mockImplementation(() => {
+                return {};
             });
-            done();
-        }, 1);
-    });
-
-    it('should populate availableLocationState and availableLocationDistrict', () => {
-        // arrange
-        profile['userLocations'] = [{ type: 'state', name: 'Odisha' }, { type: 'district', name: 'Cuttack' }];
-        window.history.replaceState({ profile }, 'MOCK');
-        mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
-        // act
-        districtMappingPage.checkLocationAvailability();
-        // assert
-        expect(districtMappingPage.availableLocationState).toEqual('Odisha');
-        expect(districtMappingPage.availableLocationDistrict).toEqual('Cuttack');
-
-    });
-
-    it('should populate availableLocationState and availableLocationDistrict', () => {
-        // arrange
-        profile['userLocations'] = [{ type: 'state', name: 'Odisha' }, { type: 'district', name: 'Cuttack' }];
-        profile['firstName'] = 'sample_firstname';
-        profile['lastName'] = 'sample_lastname';
-        window.history.replaceState({ profile }, 'MOCK');
-        mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
-        // act
-        districtMappingPage.checkLocationAvailability();
-        // assert
-        expect(districtMappingPage.availableLocationState).toEqual('Odisha');
-        expect(districtMappingPage.availableLocationDistrict).toEqual('Cuttack');
-
-    });
-
-    it('should populate availableLocationState and availableLocationDistrict if device location is already avaiable', () => {
-        // arrange
-        window.history.replaceState({ profile: undefined }, 'MOCK');
-        mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(true));
-        mockPreferences.getString = jest.fn(() => of('{\"state\":\"Odisha\",\"district\":\"Cuttack\"}'));
-        // act
-        districtMappingPage.checkLocationAvailability();
-        // assert
-        expect(districtMappingPage.availableLocationState).toEqual('Odisha');
-        expect(districtMappingPage.availableLocationDistrict).toEqual('Cuttack');
-
-    });
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            districtMappingPage.submit();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toBeTruthy();
+                expect(presentFn).toHaveBeenCalledWith();
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeFalsy();
+                expect(mockDeviceRegisterService.registerDevice).toHaveBeenCalled();
+                expect(mockCommonUtilService.handleToTopicBasedNotification).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('INTERNET_CONNECTIVITY_NEEDED');
+                expect(dismissFn).toHaveBeenCalledWith();
+                done();
+            }, 0);
+        });
 
-    it('should populate availableLocationState and availableLocationDistrict if IP location is already avaiable', () => {
-        // arrange
-        window.history.replaceState({ profile: undefined }, 'MOCK');
-        mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
-        mockCommonUtilService.isIpLocationAvailable = jest.fn(() => Promise.resolve(true));
-        mockPreferences.getString = jest.fn(() => of('{\"state\":\"Odisha\",\"district\":\"Cuttack\"}'));
-        // act
-        districtMappingPage.checkLocationAvailability();
-        // assert
-        expect(districtMappingPage.availableLocationState).toEqual('Odisha');
-        expect(districtMappingPage.availableLocationDistrict).toEqual('Cuttack');
+        it('should submit form details', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockTncUpdateHandlerService.isSSOUser = jest.fn(() => Promise.resolve(true));
+            districtMappingPage.formGroup = {
+                value: {
+                    children: {
+                        persona: {
+                            type: { type: 'sample-type' },
+                            code: 'sample-code'
+                        }
+                    },
+                    name: 'sample name'
+                }
+            } as any;
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockDeviceRegisterService.registerDevice = jest.fn(() => of({}));
+            mockPreferences.putString = jest.fn(() => of(undefined));
+            mockCommonUtilService.handleToTopicBasedNotification = jest.fn();
+            jest.spyOn(districtMappingPage, 'generateSubmitInteractEvent').mockImplementation();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(districtMappingPage, 'isStateorDistrictChanged').mockImplementation(() => {
+                return {};
+            });
+            districtMappingPage.profile = {
+                uid: 'sample-uid'
+            };
+            mockProfileService.updateServerProfile = jest.fn(() => of({}));
+            mockAppGlobalService.getCurrentUser = jest.fn(() => ({ uid: 'sample-uid' }));
+            mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
+            jest.spyOn(districtMappingPage, 'generateLocationCaptured').mockImplementation();
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            districtMappingPage.submit();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toBeTruthy();
+                expect(presentFn).toHaveBeenCalledWith();
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeTruthy();
+                expect(mockDeviceRegisterService.registerDevice).toHaveBeenCalled();
+                expect(mockCommonUtilService.handleToTopicBasedNotification).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+                expect(mockProfileService.updateServerProfile).toHaveBeenCalled();
+                expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalled();
+                expect(mockCommonUtilService.isDeviceLocationAvailable).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('PROFILE_UPDATE_SUCCESS');
+                expect(mockTncUpdateHandlerService.isSSOUser).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
 
-    });
+        it('should submit form details and goback previous page', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            districtMappingPage.formGroup = {
+                value: {
+                    children: {
+                        persona: {
+                            type: { type: 'sample-type' },
+                            code: 'sample-code'
+                        }
+                    },
+                    name: 'sample name'
+                }
+            } as any;
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockDeviceRegisterService.registerDevice = jest.fn(() => of({}));
+            mockPreferences.putString = jest.fn(() => of(undefined));
+            mockCommonUtilService.handleToTopicBasedNotification = jest.fn();
+            jest.spyOn(districtMappingPage, 'generateSubmitInteractEvent').mockImplementation();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(districtMappingPage, 'isStateorDistrictChanged').mockImplementation(() => {
+                return {};
+            });
+            districtMappingPage.profile = {
+                uid: 'sample-uid'
+            };
+            mockProfileService.updateServerProfile = jest.fn(() => of({}));
+            mockAppGlobalService.getCurrentUser = jest.fn(() => ({ uid: 'sample-uid' }));
+            mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
+            jest.spyOn(districtMappingPage, 'generateLocationCaptured').mockImplementation();
+            mockCommonUtilService.showToast = jest.fn();
+            mockAppGlobalService.isJoinTraningOnboardingFlow = true;
+            // act
+            districtMappingPage.submit();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toBeTruthy();
+                expect(presentFn).toHaveBeenCalledWith();
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeTruthy();
+                expect(mockDeviceRegisterService.registerDevice).toHaveBeenCalled();
+                expect(mockCommonUtilService.handleToTopicBasedNotification).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+                expect(mockProfileService.updateServerProfile).toHaveBeenCalled();
+                expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalled();
+                expect(mockCommonUtilService.isDeviceLocationAvailable).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('PROFILE_UPDATE_SUCCESS');
+                done();
+            }, 0);
+        });
 
-    it('shouldn\'t show  NOTNOW flag', () => {
-        // arrange
-        const locationConfigFormResponse = [{ name: 'Skip Location', code: 'skip', values: [] }];
-        window.history.replaceState({ profile: undefined }, 'MOCK');
-        mockFormAndFrameworkUtilService.getLocationConfig = jest.fn(() => Promise.resolve(locationConfigFormResponse));
-        mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
-        // act
-        districtMappingPage.checkLocationMandatory();
-        // assert
-        expect(districtMappingPage.showNotNowFlag).toBeFalsy();
+        it('should not submit form details for update profile catch part', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            districtMappingPage.formGroup = {
+                value: {
+                    children: {
+                        persona: {
+                            type: { type: 'sample-type' },
+                            code: 'sample-code'
+                        }
+                    },
+                    name: 'sample name'
+                }
+            } as any;
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockDeviceRegisterService.registerDevice = jest.fn(() => of({}));
+            mockPreferences.putString = jest.fn(() => of(undefined));
+            mockCommonUtilService.handleToTopicBasedNotification = jest.fn();
+            jest.spyOn(districtMappingPage, 'generateSubmitInteractEvent').mockImplementation();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(districtMappingPage, 'isStateorDistrictChanged').mockImplementation(() => {
+                return {};
+            });
+            districtMappingPage.profile = {
+                uid: 'sample-uid'
+            };
+            mockProfileService.updateServerProfile = jest.fn(() => throwError({}));
+            mockAppGlobalService.getCurrentUser = jest.fn(() => ({ uid: 'sample-uid' }));
+            mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
+            jest.spyOn(districtMappingPage, 'generateLocationCaptured').mockImplementation();
+            mockCommonUtilService.showToast = jest.fn();
+            mockAppGlobalService.isJoinTraningOnboardingFlow = true;
+            mockLocation.back = jest.fn();
+            // act
+            districtMappingPage.submit();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toBeTruthy();
+                expect(presentFn).toHaveBeenCalledWith();
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeTruthy();
+                expect(mockDeviceRegisterService.registerDevice).toHaveBeenCalled();
+                expect(mockCommonUtilService.handleToTopicBasedNotification).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+                expect(mockProfileService.updateServerProfile).toHaveBeenCalled();
+                expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('PROFILE_UPDATE_FAILED');
+                expect(mockLocation.back).toHaveBeenCalledWith();
+                done();
+            }, 0);
+        });
 
+        it('should submit form details for guest user', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            districtMappingPage.formGroup = {
+                value: {
+                    children: {
+                        persona: {
+                            type: { type: 'sample-type' },
+                            code: 'sample-code'
+                        }
+                    },
+                    name: 'sample name'
+                }
+            } as any;
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+            mockDeviceRegisterService.registerDevice = jest.fn(() => of({}));
+            mockPreferences.putString = jest.fn(() => of(undefined));
+            mockCommonUtilService.handleToTopicBasedNotification = jest.fn();
+            mockAppGlobalService.setOnBoardingCompleted = jest.fn(() => Promise.resolve());
+            mockTelemetryGeneratorService.generateAuditTelemetry = jest.fn();
+            // act
+            districtMappingPage.submit();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toBeTruthy();
+                expect(presentFn).toHaveBeenCalledWith();
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeTruthy();
+                expect(mockDeviceRegisterService.registerDevice).toHaveBeenCalled();
+                expect(mockCommonUtilService.handleToTopicBasedNotification).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateAuditTelemetry).toHaveBeenCalledWith(
+                    Environment.ONBOARDING,
+                    AuditState.AUDIT_UPDATED,
+                    undefined,
+                    AuditType.SET_PROFILE,
+                    undefined,
+                    undefined,
+                    undefined,
+                    [{ id: '', type: 'sample-type' }]
+                );
+                expect(mockAppGlobalService.setOnBoardingCompleted).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
     });
 
-    it('should show  NOTNOW flag if profile is undefined', (done) => {
-        // arrange
-        const locationConfigFormResponse = [{ name: 'Skip Location', code: 'skip', values: ['user'] }];
-        window.history.replaceState({ profile: undefined }, 'MOCK');
-        mockFormAndFrameworkUtilService.getLocationConfig = jest.fn(() => Promise.resolve(locationConfigFormResponse));
-        mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
-        // act
-        districtMappingPage.checkLocationMandatory();
-        // assert
-        setTimeout(() => {
-            expect(districtMappingPage.showNotNowFlag).toBeTruthy();
-            done();
-        }, 1);
-
+    describe('ionViewWillEnter', () => {
+        beforeEach(() => {
+            window.history.pushState({ isShowBackButton: true }, '', '');
+        });
+        it('should initialized form data', (done) => {
+            // arrange
+            mockProfileService.getActiveSessionProfile = jest.fn(() => of({
+                serveProfile: {
+                    firstName: 'sample-name',
+                    userType: ProfileType.TEACHER
+                },
+                profileType: ProfileType.TEACHER,
+                handle: 'sample-name'
+            }));
+            mockLocationHandler.getAvailableLocation = jest.fn(() => Promise.resolve([{
+                state: {code: 'sample-code', name: 'sample-name'},
+                district: {code: 'sample-code', name: 'sample-name'},
+            }])) as any;
+            mockFormAndFrameworkUtilService.getFormFields = jest.fn(() => Promise.resolve([{
+                code: 'name',
+                default: 'default',
+                templateOptions: {
+                    hidden: false
+                }
+            }, {
+                code: 'persona',
+                templateOptions: {
+                    dataSrc: {
+                        marker: 'SUPPORTED_PERSONA_LIST',
+                        params: {
+                            useCase: 'sample-useCase'
+                        }
+                    },
+                    options: {}
+                },
+                children: {
+                    administrator: [
+                        {
+                            code: 'state',
+                            type: 'select',
+                            templateOptions: {
+                                labelHtml: {
+                                    contents: '<span>$0&nbsp;<span class=\'required-asterisk\'>*</span></span>',
+                                    values: {
+                                        $0: 'State'
+                                    }
+                                },
+                                placeHolder: 'Select State',
+                                multiple: false,
+                                dataSrc: {
+                                    marker: 'STATE_LOCATION_LIST',
+                                    params: {
+                                        useCase: 'SIGNEDIN_GUEST'
+                                    }
+                                }
+                            },
+                            validations: [
+                                {
+                                    type: 'required'
+                                }
+                            ]
+                        }, {
+                            code: 'subPersona',
+                            type: 'select',
+                            templateOptions: {
+                                labelHtml: {
+                                    contents: '<span>$0&nbsp;<span class=\'required-asterisk\'>*</span></span>',
+                                    values: {
+                                        $0: 'State'
+                                    }
+                                },
+                                placeHolder: 'Select State',
+                                multiple: false,
+                                dataSrc: {
+                                    marker: 'SUBPERSONA_LIST',
+                                    params: {
+                                        useCase: 'SIGNEDIN_GUEST'
+                                    }
+                                },
+                                options: { value: 'hm', label: 'HM' }
+                            }
+                        }, {
+                            code: 'district',
+                            type: 'select',
+                            templateOptions: {
+                                labelHtml: {
+                                    contents: '<span>$0&nbsp;<span class=\'required-asterisk\'>*</span></span>',
+                                    values: {
+                                        $0: 'State'
+                                    }
+                                },
+                                placeHolder: 'Select State',
+                                multiple: false,
+                                dataSrc: {
+                                    marker: 'LOCATION_LIST',
+                                    params: {
+                                        useCase: 'SIGNEDIN_GUEST'
+                                    }
+                                },
+                                options: { value: 'hm', label: 'HM' }
+                            }
+                        }]
+                }
+            }]));
+            districtMappingPage.profile = {
+                serveProfile: {
+                    firstName: 'sample-name',
+                    userType: ProfileType.TEACHER
+                }
+            };
+            mockPreferences.getString = jest.fn(() => of(ProfileType.TEACHER));
+            jest.spyOn(districtMappingPage, 'handleDeviceBackButton').mockImplementation(() => {
+                return;
+            });
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+            mockFormAndFrameworkUtilService.getLocationConfig = jest.fn(() => Promise.resolve([]));
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockHeaderService.hideHeader = jest.fn();
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            mockCommonUtilService.getLoader = jest.fn();
+            mockProfileHandler.getSupportedUserTypes = jest.fn(() => Promise.resolve([{
+                name: 'sample-name',
+                code: 'sample-code'
+            }])) as any;
+            mockFormLocationFactory.buildStateListClosure = jest.fn();
+            mockFormLocationFactory.buildLocationListClosure = jest.fn();
+            // act
+            districtMappingPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockProfileService.getActiveSessionProfile).toHaveBeenCalled();
+                expect(mockLocationHandler.getAvailableLocation).toHaveBeenCalled();
+                expect(mockFormAndFrameworkUtilService.getFormFields).toHaveBeenCalled();
+                expect(mockPreferences.getString).toHaveBeenCalledWith(PreferenceKey.SELECTED_USER_TYPE);
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenNthCalledWith(1,
+                    ImpressionType.PAGE_REQUEST, '',
+                    PageId.LOCATION,
+                    Environment.ONBOARDING);
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenNthCalledWith(2,
+                    ImpressionType.VIEW,
+                    '',
+                    PageId.DISTRICT_MAPPING,
+                    Environment.ONBOARDING, '', '', '', undefined,
+                    featureIdMap.location.LOCATION_CAPTURE);
+                expect(mockHeaderService.hideHeader).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generatePageLoadedTelemetry).toHaveBeenCalledWith(
+                    PageId.LOCATION,
+                    Environment.ONBOARDING,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    []
+                );
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(mockProfileHandler.getSupportedUserTypes).toHaveBeenCalled();
+                expect(mockFormLocationFactory.buildStateListClosure).toHaveBeenCalled();
+                expect(mockFormLocationFactory.buildLocationListClosure).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
     });
 
-    it('should show  NOTNOW flag if source is not guest profile', () => {
+    it('should generate telemetry for cancel event', () => {
         // arrange
-        const locationConfigFormResponse = [{ name: 'Skip Location', code: 'skip', values: ['device'] }];
-        window.history.replaceState({ profile, source: 'profile-settings' }, 'MOCK');
-        mockFormAndFrameworkUtilService.getLocationConfig = jest.fn(() => Promise.resolve(locationConfigFormResponse));
-        mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        const correlationList: Array<CorrelationData> = [];
+        correlationList.push({ id: PageId.POPUP_CATEGORY, type: CorReleationDataType.CHILD_UI });
         // act
-        districtMappingPage.checkLocationMandatory();
+        districtMappingPage.cancelEvent('');
         // assert
-        expect(districtMappingPage.showNotNowFlag).toBeTruthy();
-
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.SELECT_CANCEL, '',
+            Environment.ONBOARDING,
+            PageId.LOCATION,
+            undefined,
+            undefined,
+            undefined,
+            correlationList
+        );
     });
 
-    it('should return true if isShowBackButton is not set ', () => {
-        // arrange
-        window.history.replaceState({ source: 'profile-settings' }, 'MOCK');
+    describe('isChangedLocation', () => {
+        it('should change new location', () => {
+            // arrange
+            const curr = {
+                children: {
+                    persona: {
+                        state: { name: 'sample-state', id: 'state-id', code: 'new-code' }
+                    }
+                },
+                name: 'sample-user',
+                persona: 'teacher'
+            };
+            const prev = {
+                children: {
+                    persona: {
+                        state: { name: 'sample-state', id: 'state-id', code: 'old-code' },
+                    }
+                },
+                name: 'sample-user',
+                persona: 'teacher'
+            };
+            // act
+            const data = districtMappingPage.isChangedLocation(prev, curr);
+            // assert
+            expect(data).toStrictEqual({ name: 'sample-state', id: 'state-id', code: 'new-code' });
+        });
 
-        // act
-        // assert
-        expect(districtMappingPage.isShowBackButton).toBeTruthy();
+        it('should not change location', () => {
+            // arrange
+            const curr = {
+                children: {
+                    persona: {
+                        state: { name: 'sample-state', id: 'state-id', code: 'old-code' }
+                    }
+                },
+                name: 'sample-user',
+                persona: 'teacher'
+            };
+            const prev = {
+                children: {
+                    persona: {
+                        state: { name: 'sample-state', id: 'state-id', code: 'old-code' },
+                    }
+                },
+                name: 'sample-user',
+                persona: 'teacher'
+            };
+            // act
+            const data = districtMappingPage.isChangedLocation(prev, curr);
+            // assert
+            expect(data).toBeUndefined();
+        });
     });
 
-    it('should return the value set in isShowBackButton ', () => {
+    it('should invoked generateTelemetryForCategoryClicked', () => {
         // arrange
-        window.history.replaceState({ isShowBackButton: false }, 'MOCK');
-
-        // act
-        // assert
-        expect(districtMappingPage.isShowBackButton).toBeFalsy();
+        const location = { code: '33', name: 'Tamil Nadu', id: '91d9baae-14f1-477a-955c-f91bd9037f0b', type: 'state' }
+        const correlationList: Array<CorrelationData> = [];
+        correlationList.push({
+            id: location.name,
+            type: location.type.charAt(0).toUpperCase() + location.type.slice(1)
+        });
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        // act
+        districtMappingPage.generateTelemetryForCategoryClicked(location);
+        // assert
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.SELECT_CATEGORY, '',
+            Environment.ONBOARDING,
+            PageId.LOCATION,
+            undefined,
+            undefined,
+            undefined,
+            correlationList
+        );
     });
 
-    it('should return valid profile if its set in the state', () => {
-        // arrange
-        window.history.replaceState({ profile: { uid: '12345' } }, 'MOCK');
-
-        // act
-        // assert
-        expect(districtMappingPage.profile).toBeDefined();
+    describe('onFormInitialize', () => {
+        it('should be generate event for category clicked', (done) => {
+            // arrange
+            const formGroup = {
+                valueChanges: of({
+                    children: {
+                        persona: {
+                            state: { name: 'sample-state', id: 'state-id' },
+                            district: { name: 'sample-dist', id: 'dist-id' },
+                            block: { name: 'sample-block', id: 'block-id' }
+                        }
+                    },
+                    name: 'sample-user',
+                    persona: 'teacher'
+                })
+            } as any;
+            jest.spyOn(districtMappingPage, 'isChangedLocation').mockImplementation(() => {
+                return ({});
+            });
+            // act
+            districtMappingPage.onFormInitialize(formGroup);
+            // assert
+            setTimeout(() => {
+                expect(districtMappingPage.formGroup.valueChanges).toBeTruthy();
+                done();
+            }, 0);
+        });
     });
 
-    it('should open district overlay when _showDistrict value is set', (done) => {
-        // arrange
-        districtMappingPage.showStates = false;
-        districtMappingPage.districtSelect = { open: jest.fn(() => { }) };
-        // act
-        districtMappingPage.showDistrict = true;
+    describe('onDataLoadStatusChange', () => {
+        it('should initialized loader', (done) => {
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn
+            }));
+            districtMappingPage.initializeLoader();
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toBeTruthy();
+                done();
+            }, 0);
+        });
 
-        // assert
-        setTimeout(() => {
-            expect(districtMappingPage.showDistrict).toBeTruthy();
-            expect(districtMappingPage.districtSelect.open).toHaveBeenCalled();
-            done();
-        }, 1000);
+        it('should be present loader if status is loading', (done) => {
+            // arrange
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+            }));
+            // act
+            districtMappingPage.onDataLoadStatusChange('LOADING');
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toBeTruthy();
+                done();
+            }, 0);
+        });
 
+        it('should initialized formData', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                dismiss: dismissFn,
+            }));
+            districtMappingPage.formGroup = {
+                value: 'sample-value', get: jest.fn(() => ({
+                    value: 'sample-value',
+                    valueChanges: of({
+                        children: {
+                            persona: {
+                                state: { name: 'sample-state', id: 'state-id', code: 'old-code' },
+                                district: { name: 'sample-dist', id: 'dist-id' },
+                                block: { name: 'sample-block', id: 'block-id' }
+                            }
+                        },
+                        name: 'sample-user',
+                        persona: 'teacher'
+                    }),
+                    patchValue: jest.fn()
+                }))
+            } as any;
+            districtMappingPage.profile = {
+                serverProfile: {
+                    userSubType: undefined
+                }
+            };
+            // act
+            districtMappingPage.onDataLoadStatusChange('');
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toBeTruthy();
+                done();
+            }, 0);
+        });
     });
 
-    it('should generate IMPRESSION telemetry when ionViewWillEnter', () => {
+    it('should generate telemetry for calegory select', () => {
         // arrange
-        window.history.replaceState({ source: 'profile-settings' }, 'MOCK');
-        jest.spyOn(districtMappingPage, 'handleDeviceBackButton').mockImplementation();
-        jest.spyOn(districtMappingPage, 'checkLocationMandatory').mockImplementation();
-        jest.spyOn(districtMappingPage, 'checkLocationAvailability').mockImplementation();
-        jest.spyOn(districtMappingPage, 'getStates').mockImplementation();
-
-        // act
-        districtMappingPage.ionViewWillEnter();
-
-        // assert
-        expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalled();
+        const corRelationList: CorrelationData[] = [{ id: PageId.POPUP_CATEGORY, type: CorReleationDataType.CHILD_UI }];
+        corRelationList.push({
+            id: 'sample-id',
+            type: CorReleationDataType.STATE
+        });
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        // act
+        districtMappingPage.generateTelemetryForCategorySelect('sample-id', true);
+        // assert
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.SELECT_SUBMIT, '',
+            Environment.ONBOARDING,
+            PageId.LOCATION,
+            undefined,
+            undefined,
+            undefined,
+            corRelationList
+        );
     });
 
-    it('should populate the stateName and reset the districtName', () => {
+    it('should generate telemetry for clearUserLocationSelections', () => {
         // arrange
-        districtMappingPage.isAutoPopulated = true;
-        districtMappingPage.isPopulatedLocationChanged = true;
-        // act
-        districtMappingPage.selectState('Odisha', '1234', 'code_1234');
-
-        // assert
-        expect(districtMappingPage.stateName).toEqual('Odisha');
-        expect(districtMappingPage.stateCode).toEqual('code_1234');
-        expect(districtMappingPage.districtName).toEqual('');
-        expect(districtMappingPage.districtCode).toEqual('');
-        expect(districtMappingPage.isPopulatedLocationChanged).toBeTruthy();
-        expect(districtMappingPage.availableLocationDistrict).toEqual('');
-
-        // act
-        districtMappingPage.stateIconClicked();
-        // assert
-        expect(districtMappingPage.stateName).toEqual('');
-
-        // act
-        districtMappingPage.districtIconClicked();
-        // assert
-        expect(districtMappingPage.districtName).toEqual('');
-        expect(districtMappingPage.districtCode).toEqual('');
-
-        // act
-        districtMappingPage.resetDistrictCode();
-        // assert
-        expect(districtMappingPage.districtCode).toEqual('');
-    });
-
-    it('should validate isValid method', () => {
-
-        // assert
-        expect(districtMappingPage.isValid('sample', [{ name: 'sample' }], 'name')).toBeTruthy();
-        expect(districtMappingPage.isValid('sample', undefined, 'name')).toBeFalsy();
-    });
-
-    it('should naviagte to TABS page', () => {
-
+        const correlationList: Array<CorrelationData> = [];
+        correlationList.push({ id: PageId.POPUP_CATEGORY, type: CorReleationDataType.CHILD_UI });
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        districtMappingPage.formGroup = {
+            get: jest.fn(() => ({
+                patchValue: jest.fn()
+            })) as any
+        } as any;
         // act
-        districtMappingPage.skipLocation();
+        districtMappingPage.clearUserLocationSelections();
         // assert
-        expect(mockRouter.navigate).toHaveBeenCalledWith(['/tabs']);
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.SELECT_CANCEL, '',
+            Environment.ONBOARDING,
+            PageId.LOCATION,
+            undefined,
+            undefined,
+            undefined,
+            correlationList
+        );
     });
 
-    it('should return proper INTERACT subtype', () => {
-
-        // arrange
-        districtMappingPage.availableLocationState = 'Odisha';
-        districtMappingPage.stateName = 'Karnataka';
-        districtMappingPage.availableLocationDistrict = 'Cuttack';
-        districtMappingPage.districtName = 'Cuttack';
-
-        // act
-        // assert
-        expect(districtMappingPage.isStateorDistrictChanged()).toEqual(InteractSubtype.STATE_CHANGED);
-
-        // arrange
-        districtMappingPage.availableLocationState = 'Odisha';
-        districtMappingPage.stateName = 'Odisha';
-        districtMappingPage.availableLocationDistrict = 'Cuttack';
-        districtMappingPage.districtName = 'Koppal';
-        // act
-        // assert
-        expect(districtMappingPage.isStateorDistrictChanged()).toEqual(InteractSubtype.DIST_CHANGED);
-
-        // arrange
-        districtMappingPage.availableLocationState = 'Odisha';
-        districtMappingPage.stateName = 'Karnataka';
-        districtMappingPage.availableLocationDistrict = 'Cuttack';
-        districtMappingPage.districtName = 'Koppal';
-        // act
-        // assert
-        expect(districtMappingPage.isStateorDistrictChanged()).toEqual(InteractSubtype.STATE_DIST_CHANGED);
-
-        // arrange
-        districtMappingPage.name = 'sample_name';
-        // act
-        // assert
-        expect(districtMappingPage.validateName()).toBeFalsy();
+    it('should invoked ngOnDestroy for unsubscribe', () => {
+        districtMappingPage.ngOnDestroy();
     });
-
 });
diff --git a/src/app/district-mapping/district-mapping.page.ts b/src/app/district-mapping/district-mapping.page.ts
index 0b288f4f8..8160dcb98 100644
--- a/src/app/district-mapping/district-mapping.page.ts
+++ b/src/app/district-mapping/district-mapping.page.ts
@@ -1,45 +1,43 @@
-import {Component, OnInit, Inject, ChangeDetectorRef, NgZone, ViewChild} from '@angular/core';
-import {
-  LocationSearchCriteria, ProfileService,
-  SharedPreferences, Profile, DeviceRegisterRequest, DeviceRegisterService, DeviceInfo, LocationSearchResult, CachedItemRequestSourceFrom
-} from 'sunbird-sdk';
-import { Location as loc, PreferenceKey, RouterLinks, LocationConfig, RegexPatterns } from '../../app/app.constant';
-import { AppHeaderService, CommonUtilService, AppGlobalService, FormAndFrameworkUtilService } from '@app/services';
-import { NavigationExtras, Router } from '@angular/router';
 import { Location } from '@angular/common';
-import { Events, IonSelect } from '@ionic/angular';
-import { Subscription } from 'rxjs';
-import { Platform } from '@ionic/angular';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import { Component, Inject, OnDestroy } from '@angular/core';
+import { FormGroup } from '@angular/forms';
+import { NavigationExtras, Router } from '@angular/router';
+import { featureIdMap } from '@app/feature-id-map';
+import { AppGlobalService, AppHeaderService, CommonUtilService, FormAndFrameworkUtilService } from '@app/services';
+import { FormLocationFactory } from '@app/services/form-location-factory/form-location-factory';
+import { LocationHandler } from '@app/services/location-handler';
+import { ProfileHandler } from '@app/services/profile-handler';
 import {
-  Environment,
-  ImpressionType,
+  AuditType, CorReleationDataType, Environment,
+  ID, ImpressionType,
   InteractSubtype,
   InteractType,
-  PageId,
-  ID
+  PageId
 } from '@app/services/telemetry-constants';
-import { featureIdMap } from '@app/feature-id-map';
-import { ExternalIdVerificationService } from '@app/services/externalid-verification.service';
-import { tap } from 'rxjs/operators';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import { Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { Location as SbLocation } from '@project-sunbird/client-services/models/location';
+import { FieldConfig } from 'common-form-elements';
+import { concat, defer, of, Subscription } from 'rxjs';
+import { delay, distinctUntilChanged, filter, mergeMap, pairwise, take, tap } from 'rxjs/operators';
+import {
+  AuditState, CorrelationData, DeviceInfo, DeviceRegisterRequest,
+  DeviceRegisterService,
+  FormRequest, LocationSearchResult, Profile, ProfileService,
+  SharedPreferences
+} from 'sunbird-sdk';
+import { LocationConfig, PreferenceKey, ProfileConstants, RegexPatterns, RouterLinks } from '../../app/app.constant';
+import { FormConstants } from '../form.constants';
+import {ProfileType} from '@project-sunbird/sunbird-sdk';
+import { TncUpdateHandlerService } from '@app/services/handlers/tnc-update-handler.service';
 
 @Component({
   selector: 'app-district-mapping',
   templateUrl: './district-mapping.page.html',
   styleUrls: ['./district-mapping.page.scss'],
 })
-export class DistrictMappingPage {
-  @ViewChild('stateSelect') stateSelect?: IonSelect;
-  @ViewChild('districtSelect') districtSelect?: IonSelect;
-
-  private _showStates?: boolean;
-  private _showDistrict?: boolean;
-  private _stateName: string;
-  private _districtName: string;
-
-  get profile(): Profile | undefined {
-    return window.history.state.profile;
-  }
+export class DistrictMappingPage implements OnDestroy {
   get isShowBackButton(): boolean {
     if (window.history.state.isShowBackButton === undefined) {
       return true;
@@ -49,76 +47,19 @@ export class DistrictMappingPage {
   get source() {
     return window.history.state.source;
   }
-
-
-
-  get showStates(): boolean {
-    return this._showStates;
-  }
-  set showStates(value: boolean) {
-    this._showStates = value;
-
-    if (this._showStates && this.stateSelect) {
-      setTimeout(() => {
-        this.stateSelect.open();
-      }, 500);
-    }
-  }
-
-  get showDistrict(): boolean {
-    return this._showDistrict;
-  }
-  set showDistrict(value: boolean) {
-    this._showDistrict = value;
-
-    if (this._showDistrict && this.districtSelect) {
-      setTimeout(() => {
-        this.districtSelect.open();
-      }, 500);
-    }
-  }
-
-
-  get stateName(): string {
-    return this._stateName;
-  }
-  set stateName(value: string) {
-    this._stateName = value;
-
-    if (this.stateSelect) {
-      const selectedState = this.stateList.find((state) => state.name === this._stateName);
-      this.stateSelect.selectedText = selectedState ? selectedState.name : '';
-    }
-  }
-
-  get districtName(): string {
-    return this._districtName;
-  }
-  set districtName(value: string) {
-    this._districtName = value;
-
-    if (this.districtSelect) {
-      const selectedDistrict = this.districtList.find((district) => district.name === this._districtName);
-      this.districtSelect.selectedText = selectedDistrict ? selectedDistrict.name : '';
-    }
-  }
-
-  name;
-  stateList: LocationSearchResult[] = [];
-  districtList: LocationSearchResult[] = [];
-  stateCode;
-  districtCode;
-  backButtonFunc: Subscription;
+  formGroup?: FormGroup;
   showNotNowFlag = false;
-  availableLocationData: any;
-  availableLocationDistrict: string;
-  availableLocationState: string;
-  isAutoPopulated = false;
-  isPopulatedLocationChanged = false;
-  isKeyboardShown$;
-  isLocationChanged = false;
-  disableSubmitButton = false;
-
+  locationFormConfig: FieldConfig<any>[] = [];
+  profile?: Profile;
+  private name: string;
+  private backButtonFunc: Subscription;
+  private presetLocation: { [locationType: string]: LocationSearchResult } = {};
+  private loader?: any;
+  private stateChangeSubscription?: Subscription;
+  private prevFormValue: any = {};
+  private formValueSubscription?: Subscription;
+  private initialFormLoad = true;
+  private isLocationUpdated = false;
   constructor(
     @Inject('PROFILE_SERVICE') private profileService: ProfileService,
     @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
@@ -133,107 +74,75 @@ export class DistrictMappingPage {
     public events: Events,
     public platform: Platform,
     public telemetryGeneratorService: TelemetryGeneratorService,
-    private changeDetectionRef: ChangeDetectorRef,
-    private ngZone: NgZone,
-    private externalIdVerificationService: ExternalIdVerificationService
+    private formLocationFactory: FormLocationFactory,
+    private locationHandler: LocationHandler,
+    private profileHandler: ProfileHandler,
+    private tncUpdateHandlerService: TncUpdateHandlerService
   ) {
     this.appGlobalService.closeSigninOnboardingLoader();
-    this.isKeyboardShown$ = deviceInfo.isKeyboardShown().pipe(
-        tap(() => this.changeDetectionRef.detectChanges())
-    );
-  }
-  selectState(name, id, code) {
-    this.getState(name, id, code);
-    this.districtName = '';
-    this.districtCode = '';
-    this.isLocationChanged = true;
-    if (this.isAutoPopulated) { // TODO: Do we need this if.
-      this.isPopulatedLocationChanged = true;
-    }
-    if (this.isPopulatedLocationChanged) {
-      this.availableLocationDistrict = '';
-    }
-  }
-
-  async getState(name, id, code) {
-    this.ngZone.run(async () => {
-      this.showStates = false;
-      this.stateName = name;
-      this.stateCode = code;
-      await this.getDistrict(id);
-    });
-  }
-
-  async selectDistrict(name, code) {
-    this.ngZone.run(() => {
-      if (this.isAutoPopulated && this.availableLocationDistrict) { // TODO: Do we need this if.
-        this.isPopulatedLocationChanged = true;
-      }
-      this.isLocationChanged = true;
-      this.districtName = name;
-      this.districtCode = code;
-      this.showDistrict = false;
-    });
-  }
-
-  stateIconClicked() {
-    this.stateName = '';
-  }
-
-  districtIconClicked() {
-    this.districtName = '';
-    this.districtCode = '';
   }
-
   goBack(isNavClicked: boolean) {
+    this.telemetryGeneratorService.generateBackClickedNewTelemetry(
+      !isNavClicked,
+      this.getEnvironment(),
+      PageId.LOCATION
+    );
     this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.DISTRICT_MAPPING, this.getEnvironment(),
       isNavClicked);
     this.location.back();
   }
 
   async ionViewWillEnter() {
+    this.profile = await this.profileService.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS }).toPromise();
+    this.presetLocation = (await this.locationHandler.getAvailableLocation(
+      this.profile.serverProfile ? this.profile.serverProfile : this.profile))
+      .reduce<{ [code: string]: LocationSearchResult }>((acc, loc) => {
+        if (loc) { acc[loc.type] = loc; }
+        return acc;
+      }, {});
+    try {
+        this.initialiseFormData({
+          ...FormConstants.LOCATION_MAPPING,
+          subType: this.presetLocation['state'] ? this.presetLocation['state'].code : FormConstants.LOCATION_MAPPING.subType
+        });
+      } catch (e) {
+        this.initialiseFormData(FormConstants.LOCATION_MAPPING);
+      }
     this.handleDeviceBackButton();
     this.checkLocationMandatory();
     this.telemetryGeneratorService.generateImpressionTelemetry(
-        ImpressionType.VIEW,
-        '',
-        PageId.DISTRICT_MAPPING,
-        this.getEnvironment(), '', '', '', undefined,
-        featureIdMap.location.LOCATION_CAPTURE);
-
+      ImpressionType.PAGE_REQUEST, '',
+      PageId.LOCATION,
+      this.getEnvironment()
+    );
+    this.telemetryGeneratorService.generateImpressionTelemetry(
+      ImpressionType.VIEW,
+      '',
+      PageId.DISTRICT_MAPPING,
+      this.getEnvironment(), '', '', '', undefined,
+      featureIdMap.location.LOCATION_CAPTURE);
     this.headerService.hideHeader();
-    await this.checkLocationAvailability();
-    await this.getStates();
+    // await this.checkLocationAvailability();
+    const correlationList: Array<CorrelationData> = [];
+    // if (this.stateName) {
+    //   correlationList.push({ id: this.stateName || '', type: CorReleationDataType.STATE });
+    //   correlationList.push({ id: this.districtName || '', type: CorReleationDataType.DISTRICT });
+    // }
+    this.telemetryGeneratorService.generatePageLoadedTelemetry(
+      PageId.LOCATION,
+      this.getEnvironment(),
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      correlationList
+    );
+    this.initializeLoader();
   }
 
-  async checkLocationAvailability() {
-    if (this.profile) {
-      this.isAutoPopulated = true;
-      this.name = this.profile['firstName'];
-      if (this.profile['lastName']) {
-        this.name = this.profile['firstName'] + this.profile['lastName'];
-      }
-      if (this.profile['userLocations'] && this.profile['userLocations'].length) {
-        for (const ele of this.profile['userLocations']) {
-          if (ele.type === 'district') {
-            this.availableLocationDistrict = ele.name;
-
-          } else if (ele.type === 'state') {
-            this.availableLocationState = ele.name;
-          }
-        }
-      }
-
-    } else if (await this.commonUtilService.isDeviceLocationAvailable()) {
-      this.isAutoPopulated = true;
-      this.availableLocationData = JSON.parse(await this.preferences.getString(PreferenceKey.DEVICE_LOCATION).toPromise());
-      this.availableLocationState = this.availableLocationData.state;
-      this.availableLocationDistrict = this.availableLocationData.district;
-    } else if (await this.commonUtilService.isIpLocationAvailable()) {
-      this.isAutoPopulated = true;
-      this.availableLocationData = JSON.parse(await this.preferences.getString(PreferenceKey.IP_LOCATION).toPromise());
-      this.availableLocationState = this.availableLocationData.state;
-      this.availableLocationDistrict = this.availableLocationData.district;
+  async initializeLoader() {
+    if (!this.loader) {
+      this.loader = await this.commonUtilService.getLoader();
     }
   }
 
@@ -247,162 +156,82 @@ export class DistrictMappingPage {
 
   ionViewWillLeave(): void {
     if (this.backButtonFunc) {
-    this.backButtonFunc.unsubscribe();
-    }
-  }
-
-
-  // validates the name input feild
-  validateName() {
-    if (this.name) {
-     // return !Boolean(this.name.match(/^[a-zA-Z0-9/./s]*$/));
-     return false;
+      this.backButtonFunc.unsubscribe();
     }
   }
 
-  async getStates() {
-    const loader = await this.commonUtilService.getLoader();
-    await loader.present();
-    const req: LocationSearchCriteria = {
-      from: CachedItemRequestSourceFrom.SERVER,
-      filters: {
-        type: loc.TYPE_STATE
-      }
-    };
-    this.profileService.searchLocation(req).subscribe(async (success) => {
-      const locations = success;
-      this.ngZone.run(async () => {
-        if (locations && Object.keys(locations).length) {
-          this.stateList = locations;
-          if (this.availableLocationState) {
-            const state = this.stateList.find(s => s.name === this.availableLocationState);
-            if (state) {
-              await this.getState(state.name, state.id, state.code);
-            } else {
-              this.stateName = '';
-            }
-            this.generateAutoPopulatedTelemetry();
-          }
-        } else {
-          this.districtList = [];
-          this.showDistrict = !this.showDistrict;
-          this.commonUtilService.showToast('NO_DATA_FOUND');
+  async submit() {
+    this.saveDeviceLocation();
+    const locationCodes = [];
+    (Object.keys(this.formGroup.value.children['persona']).map((acc, key) => {
+      if (this.formGroup.value.children['persona'][acc]) {
+        const location: SbLocation = this.formGroup.value.children['persona'][acc] as SbLocation;
+        if (location.type) {
+          locationCodes.push({
+            type: location.type,
+            code: location.code
+          });
         }
-        await loader.dismiss();
-      });
-    }, async (error) => {
-      await loader.dismiss();
-    });
-  }
-
-  async getDistrict(pid: string) {
-    const loader = await this.commonUtilService.getLoader();
-    await loader.present();
-    const req: LocationSearchCriteria = {
-      from: CachedItemRequestSourceFrom.SERVER,
-      filters: {
-        type: loc.TYPE_DISTRICT,
-        parentId: pid
       }
-    };
-    this.profileService.searchLocation(req).subscribe(async (success) => {
-      this.ngZone.run(async () => {
-        if (success && Object.keys(success).length) {
-          this.showDistrict = false;
-          this.districtList = success;
-          if (this.availableLocationDistrict) {
-            this.districtName = this.availableLocationDistrict;
-            const district = this.districtList.find(d => d.name === this.availableLocationDistrict);
-            await loader.dismiss();
-            if (district) {
-              await this.selectDistrict(district.name, district.code);
-            } else {
-              this.districtName = '';
-            }
-          } else if (this.districtList) {
-            this.showDistrict = true;
-            await loader.dismiss();
-          }
-        } else {
-          this.availableLocationDistrict = '';
-          await loader.dismiss();
-          this.districtList = [];
-          this.showDistrict = !this.showDistrict;
-          this.commonUtilService.showToast('NO_DATA_FOUND');
-        }
-      });
-    }, async (error) => {
-      await loader.dismiss();
-    });
-  }
-
-  isStateorDistrictChanged() {
-    if (this.availableLocationState !== this.stateName && this.availableLocationDistrict === this.districtName) {
-      return InteractSubtype.STATE_CHANGED;
-    } else if (this.availableLocationDistrict !== this.districtName && this.availableLocationState === this.stateName) {
-      return InteractSubtype.DIST_CHANGED;
-    } else if (this.availableLocationState !== this.stateName && this.availableLocationDistrict !== this.districtName) {
-      return InteractSubtype.STATE_DIST_CHANGED;
-    } else {
-      return '';
-    }
-  }
-
-  async submit() {
-
-    let isLocationUpdated = false;
-    if (this.stateName !== this.availableLocationState ||
-      this.districtName !== this.availableLocationDistrict) {
-      isLocationUpdated = true;
-    }
-
+    }, {}));
+    const corRelationList: CorrelationData[] =  locationCodes.map(r => ({ type: r.type, id: r.code || '' }));
+    this.generateSubmitInteractEvent(corRelationList);
     this.telemetryGeneratorService.generateInteractTelemetry(
-      isLocationUpdated ? InteractType.LOCATION_CHANGED : InteractType.LOCATION_UNCHANGED,
-      this.isStateorDistrictChanged(),
+      this.isLocationUpdated ? InteractType.LOCATION_CHANGED : InteractType.LOCATION_UNCHANGED,
+      this.isStateorDistrictChanged(locationCodes),
       this.getEnvironment(),
       PageId.DISTRICT_MAPPING,
       undefined,
-      { isPopulatedLocation: this.isPopulatedLocationChanged },
+      undefined,
       undefined,
       featureIdMap.location.LOCATION_CAPTURE,
       ID.SUBMIT_CLICKED
     );
-
     if (this.appGlobalService.isUserLoggedIn()) {
       if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
         this.commonUtilService.showToast('INTERNET_CONNECTIVITY_NEEDED');
         return;
       }
+      const name = this.formGroup.value['name'].replace(RegexPatterns.SPECIALCHARECTERSANDEMOJIS, '').trim();
       const req = {
         userId: this.appGlobalService.getCurrentUser().uid || this.profile.uid,
-        locationCodes: [this.stateCode, this.districtCode]
+        profileLocation: locationCodes,
+        ...((name ? { firstName: name } : {})),
+        lastName: '',
+        profileUserType: {
+          ...((this.formGroup.value['persona'] ? { type: this.formGroup.value['persona'] } : {})),
+          ...((this.formGroup.value.children['persona']['subPersona'] ?
+            { subType: this.formGroup.value.children['persona']['subPersona'] } : {}))
+        }
       };
-      if (this.profile) {
-        req['firstName'] = (this.name.replace(RegexPatterns.SPECIALCHARECTERSANDEMOJIS, '')).trim();
-        req['lastName'] = '';
-      }
       const loader = await this.commonUtilService.getLoader();
       await loader.present();
+      const isSSOUser = await this.tncUpdateHandlerService.isSSOUser(this.profile);
       this.profileService.updateServerProfile(req).toPromise()
         .then(async () => {
           await loader.dismiss();
-
+          this.preferences.putString(PreferenceKey.SELECTED_USER_TYPE, this.formGroup.value.persona).toPromise().then();
           if (!(await this.commonUtilService.isDeviceLocationAvailable())) { // adding the device loc if not available
             await this.saveDeviceLocation();
           }
-          this.generateLocationCaptured(false); // is dirtrict or location edit  = false
+          this.isLocationUpdated = false;
+          this.generateLocationCaptured(false);
           this.commonUtilService.showToast('PROFILE_UPDATE_SUCCESS');
-          this.disableSubmitButton = true;
           this.events.publish('loggedInProfile:update', req);
-          if (this.profile) {
-            this.location.back();
+          if (this.profile && (this.source === PageId.GUEST_PROFILE || this.source === PageId.PROFILE_NAME_CONFIRMATION_POPUP)) {
+              this.location.back();
+          } else if (this.profile && this.source === PageId.PROFILE) {
+              this.location.back();
+              this.events.publish('UPDATE_TABS', {type: 'SWITCH_TABS_USERTYPE'});
           } else {
+            if (this.profile && !isSSOUser) {
+              this.appGlobalService.showYearOfBirthPopup(this.profile.serverProfile);
+            }
             if (this.appGlobalService.isJoinTraningOnboardingFlow) {
               window.history.go(-2);
             } else {
               this.router.navigate([`/${RouterLinks.TABS}`]);
             }
-            this.externalIdVerificationService.showExternalIdVerificationPopup();
           }
         }).catch(async () => {
           await loader.dismiss();
@@ -410,14 +239,14 @@ export class DistrictMappingPage {
           if (this.profile) {
             this.location.back();
           } else {
+            if (this.profile && !isSSOUser) {
+              this.appGlobalService.showYearOfBirthPopup(this.profile.serverProfile);
+            }
             this.router.navigate([`/${RouterLinks.TABS}`]);
-            this.externalIdVerificationService.showExternalIdVerificationPopup();
           }
         });
     } else if (this.source === PageId.GUEST_PROFILE) { // block for editing the device location
-
       this.generateLocationCaptured(true); // is dirtrict or location edit  = true
-
       await this.saveDeviceLocation();
       this.events.publish('refresh:profile');
       this.location.back();
@@ -429,29 +258,42 @@ export class DistrictMappingPage {
           loginMode: 'guest'
         }
       };
+      this.telemetryGeneratorService.generateAuditTelemetry(
+        this.getEnvironment(),
+        AuditState.AUDIT_UPDATED,
+        undefined,
+        AuditType.SET_PROFILE,
+        undefined,
+        undefined,
+        undefined,
+        corRelationList
+      );
       this.router.navigate([`/${RouterLinks.TABS}`], navigationExtras);
     }
   }
 
-  async saveDeviceLocation() {
+  private async saveDeviceLocation() {
     const loader = await this.commonUtilService.getLoader();
     await loader.present();
     const req: DeviceRegisterRequest = {
       userDeclaredLocation: {
-        state: this.stateName,
-        stateId: this.stateList.find((s) => s.name === this.stateName).id,
-        district: this.districtName,
-        districtId: this.districtList.find((d) => d.name === this.districtName).id,
+        ...(Object.keys(this.formGroup.value.children['persona']).reduce((acc, key) => {
+          if (this.formGroup.value.children['persona'][key]) {
+            acc[key] = (this.formGroup.value.children['persona'][key] as SbLocation).name;
+            acc[key + 'Id'] = (this.formGroup.value.children['persona'][key] as SbLocation).id;
+          }
+          return acc;
+        }, {})),
         declaredOffline: !this.commonUtilService.networkInfo.isNetworkAvailable
       }
-    };
+    } as any;
     this.deviceRegisterService.registerDevice(req).toPromise();
     this.preferences.putString(PreferenceKey.DEVICE_LOCATION, JSON.stringify(req.userDeclaredLocation)).toPromise();
     this.commonUtilService.handleToTopicBasedNotification();
     await loader.dismiss();
   }
 
-  async checkLocationMandatory() {
+  private async checkLocationMandatory() {
     let skipValues = [];
     await this.formAndFrameworkUtilService.getLocationConfig()
       .then((locationConfig) => {
@@ -462,7 +304,6 @@ export class DistrictMappingPage {
           }
         }
       });
-
     for (const value of skipValues) {
       if (this.appGlobalService.isUserLoggedIn()) {
         if (!this.profile && value === LocationConfig.SKIP_USER) {
@@ -474,21 +315,273 @@ export class DistrictMappingPage {
     }
   }
 
-  skipLocation() {
+  private skipLocation() {
     this.router.navigate([`/${RouterLinks.TABS}`]);
   }
 
-  generateAutoPopulatedTelemetry() {
+  private getEnvironment(): string {
+    return (this.source === PageId.GUEST_PROFILE || this.source === PageId.PROFILE) ? Environment.USER : Environment.ONBOARDING;
+  }
+
+  cancelEvent(category?: string) {
+    const correlationList: Array<CorrelationData> = [];
+    /* New Telemetry */
+    correlationList.push({ id: PageId.POPUP_CATEGORY, type: CorReleationDataType.CHILD_UI });
     this.telemetryGeneratorService.generateInteractTelemetry(
-      this.isAutoPopulated ? InteractType.VISIBLE : InteractType.NOT_VISIBLE,
-      '',
+      InteractType.SELECT_CANCEL, '',
       this.getEnvironment(),
-      PageId.DISTRICT_MAPPING,
+      PageId.LOCATION,
       undefined,
-      { isAutoPopulated: this.isAutoPopulated },
       undefined,
-      featureIdMap.location.LOCATION_CAPTURE,
-      ID.IP_BASED_LOCATION_SUGGESTION);
+      undefined,
+      correlationList
+    );
+  }
+
+  private async initialiseFormData(
+    formRequest: FormRequest
+  ) {
+    let locationMappingConfig: FieldConfig<any>[];
+    try {
+      locationMappingConfig = await this.formAndFrameworkUtilService.getFormFields(formRequest);
+    } catch (e) {
+      locationMappingConfig = await this.formAndFrameworkUtilService.getFormFields(FormConstants.LOCATION_MAPPING);
+    }
+    const selectedUserType = await this.preferences.getString(PreferenceKey.SELECTED_USER_TYPE).toPromise();
+    const useCaseList =
+      this.appGlobalService.isUserLoggedIn() ? ['SIGNEDIN_GUEST', 'SIGNEDIN'] : ['SIGNEDIN_GUEST', 'GUEST'];
+    for (const config of locationMappingConfig) {
+      if (config.code === 'name' && (this.source === PageId.PROFILE || this.source === PageId.PROFILE_NAME_CONFIRMATION_POPUP)) {
+        config.templateOptions.hidden = false;
+        config.default = (this.profile && this.profile.serverProfile && this.profile.serverProfile.firstName) ?
+        this.profile.serverProfile.firstName : this.profile.handle;
+      } else if (config.code === 'name' && this.source !== PageId.PROFILE) {
+        config.validations = [];
+      }
+      if (config.code === 'persona') {
+        config.default = (this.profile && this.profile.serverProfile
+        && this.profile.serverProfile.profileUserType.type
+        && (this.profile.serverProfile.profileUserType.type !== ProfileType.OTHER.toUpperCase())) ?
+        this.profile.serverProfile.profileUserType.type : selectedUserType;
+        if (this.source === PageId.PROFILE) {
+          config.templateOptions.hidden = false;
+        }
+      }
+
+      config.default = this.prevFormValue[config.code] || config.default;
+
+      if (config.templateOptions['dataSrc'] && config.templateOptions['dataSrc']['marker'] === 'SUPPORTED_PERSONA_LIST') {
+        config.templateOptions.options = (await this.profileHandler.getSupportedUserTypes())
+          .map(p => ({
+            label: p.name,
+            value: p.code
+          }));
+        Object.keys(config.children).forEach((persona) => {
+          config.children[persona].map((personaConfig) => {
+            if (!useCaseList.includes(personaConfig.templateOptions['dataSrc']['params']['useCase'])) {
+              personaConfig.templateOptions['hidden'] = true;
+              personaConfig.validations = [];
+            }
+            if (!personaConfig.templateOptions['dataSrc']) {
+              return personaConfig;
+            }
+            personaConfig.default = this.setDefaultConfig(personaConfig);
+            switch (personaConfig.templateOptions['dataSrc']['marker']) {
+              case 'SUBPERSONA_LIST': {
+                if (this.profile.serverProfile) {
+                  personaConfig.default = this.profile.serverProfile.profileUserType.subType;
+                }
+                break;
+              }
+              case 'STATE_LOCATION_LIST': {
+                personaConfig.templateOptions.options = this.formLocationFactory.buildStateListClosure(personaConfig, this.initialFormLoad);
+                break;
+              }
+              case 'LOCATION_LIST': {
+                personaConfig.templateOptions.options = this.formLocationFactory.buildLocationListClosure(personaConfig,
+                  this.initialFormLoad);
+                break;
+              }
+            }
+
+            personaConfig.default = (this.prevFormValue && this.prevFormValue.children && this.prevFormValue.children.persona) ?
+              this.prevFormValue.children.persona[personaConfig.code] :
+              personaConfig.default;
+
+            return personaConfig;
+          });
+        });
+      }
+    }
+    this.initialFormLoad = false;
+    this.locationFormConfig = locationMappingConfig;
+  }
+
+  private setDefaultConfig(fieldConfig: FieldConfig<any>): SbLocation {
+    if (this.presetLocation[fieldConfig.code]) {
+      return this.presetLocation[fieldConfig.code];
+    }
+    return null;
+  }
+
+  async onFormInitialize(formGroup: FormGroup) {
+    this.formGroup = formGroup;
+    if (this.formValueSubscription) {
+      this.formValueSubscription.unsubscribe();
+    }
+    this.formValueSubscription = this.formGroup.valueChanges.pipe(
+      filter((v) => v['children'] && !!Object.keys(v['children']).length),
+      distinctUntilChanged((a, b) => JSON.stringify(a) === JSON.stringify(b)),
+      pairwise(),
+      delay(100),
+      filter(() => this.formGroup.dirty),
+      tap(([prev, curr]) => {
+        const changeField = this.isChangedLocation(prev, curr);
+        if (changeField) {
+          this.isLocationUpdated = true;
+          this.generateTelemetryForCategoryClicked(changeField);
+        }
+      })
+    ).subscribe();
+  }
+
+  async onFormValueChange(value: any) {
+  }
+
+  async onDataLoadStatusChange($event) {
+    if ('LOADING' === $event) {
+      await this.loader.present();
+    } else {
+      await this.loader.dismiss();
+      const subPersonaFormControl = this.formGroup.get('children.persona.subPersona');
+      if (subPersonaFormControl && !subPersonaFormControl.value) {
+        subPersonaFormControl.patchValue(this.profile.serverProfile.profileUserType.subType || null);
+      }
+      if (!this.stateChangeSubscription) {
+        this.stateChangeSubscription = concat(
+          of(this.formGroup.get('persona').value),
+          this.formGroup.get('persona').valueChanges
+        ).pipe(
+          distinctUntilChanged(),
+          delay(100),
+          mergeMap(() => defer(() => {
+            return this.formGroup.get('children.persona.state').valueChanges.pipe(
+              distinctUntilChanged(),
+              take(1)
+            );
+          }))
+        ).subscribe(async (newStateValue) => {
+          if (!newStateValue) { return; }
+          this.locationFormConfig = undefined;
+          this.stateChangeSubscription = undefined;
+          this.loader.present();
+          this.prevFormValue = { ...this.formGroup.value };
+          this.initialiseFormData({
+            ...FormConstants.LOCATION_MAPPING,
+            subType: (newStateValue as SbLocation).code,
+          }).catch((e) => {
+            console.error(e);
+            this.initialiseFormData(FormConstants.LOCATION_MAPPING);
+          });
+        });
+      }
+    }
+  }
+
+  generateTelemetryForCategorySelect(value, isState) {
+    const corRelationList: CorrelationData[] = [{ id: PageId.POPUP_CATEGORY, type: CorReleationDataType.CHILD_UI }];
+    corRelationList.push({
+      id: value || '',
+      type: isState ? CorReleationDataType.STATE : CorReleationDataType.DISTRICT
+    });
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_SUBMIT, '',
+      this.getEnvironment(),
+      PageId.LOCATION,
+      undefined,
+      undefined,
+      undefined,
+      corRelationList
+    );
+  }
+
+  clearUserLocationSelections() {
+    const stateFormControl = this.formGroup.get('children.persona.state');
+    /* istanbul ignore else */
+    if (stateFormControl) {
+      stateFormControl.patchValue(null);
+    }
+    const correlationList: Array<CorrelationData> = [];
+    correlationList.push({ id: PageId.POPUP_CATEGORY, type: CorReleationDataType.CHILD_UI });
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_CANCEL, '',
+      this.getEnvironment(),
+      PageId.LOCATION,
+      undefined,
+      undefined,
+      undefined,
+      correlationList
+    );
+  }
+
+  generateSubmitInteractEvent(corReletionList) {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_SUBMIT, '',
+      this.getEnvironment(),
+      PageId.LOCATION,
+      undefined,
+      undefined,
+      undefined,
+      corReletionList
+    );
+  }
+
+  ngOnDestroy() {
+    if (this.formValueSubscription) {
+      this.formValueSubscription.unsubscribe();
+    }
+  }
+
+  isChangedLocation(prev, curr) {
+    let newLocation;
+    Object.keys(curr['children']['persona']).forEach((key) => {
+      if (curr['children']['persona'][key] && (!prev['children']['persona'][key] ||
+       (curr['children']['persona'][key].code !== prev['children']['persona'][key].code))) {
+        newLocation = curr['children']['persona'][key];
+      }
+    });
+    return newLocation;
+  }
+
+  generateTelemetryForCategoryClicked(location) {
+    const correlationList: Array<CorrelationData> = [];
+    correlationList.push({
+    id: location.name,
+    type: location.type.charAt(0).toUpperCase() + location.type.slice(1)
+    });
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_CATEGORY, '',
+      this.getEnvironment(),
+      PageId.LOCATION,
+      undefined,
+      undefined,
+      undefined,
+      correlationList
+    );
+  }
+
+  isStateorDistrictChanged(locationCodes) {
+    let changeStatus;
+    locationCodes.forEach((d) => {
+      if (!changeStatus && d.type === 'state' && this.presetLocation['state']
+      && (d.code !== this.presetLocation['state'].code)) {
+        changeStatus = InteractSubtype.STATE_DIST_CHANGED;
+      } else if (!changeStatus && d.type === 'district' && this.presetLocation['district']
+      && (d.code !== this.presetLocation['district'].code)) {
+        changeStatus = InteractSubtype.DIST_CHANGED;
+      }
+    });
+    return changeStatus;
   }
 
   generateLocationCaptured(isEdited: boolean) {
@@ -499,24 +592,9 @@ export class DistrictMappingPage {
       PageId.DISTRICT_MAPPING,
       undefined,
       {
-        isAutoPopulated: this.isAutoPopulated,
         isEdited
       }, undefined,
       featureIdMap.location.LOCATION_CAPTURE);
   }
 
-  getEnvironment(): string {
-    return this.source === PageId.GUEST_PROFILE ? Environment.USER : Environment.ONBOARDING;
-  }
-
-  isValid(input: string, objects: any[], key: 'code' | 'name'): boolean {
-    if (!objects) {
-      return false;
-    }
-    return !!objects.find(o => o[key] === input);
-  }
-
-  resetDistrictCode() {
-    this.districtCode = '';
-  }
 }
diff --git a/src/app/download-manager/download-manager.interface.ts b/src/app/download-manager/download-manager.interface.ts
index 6f1608b27..f097117c0 100644
--- a/src/app/download-manager/download-manager.interface.ts
+++ b/src/app/download-manager/download-manager.interface.ts
@@ -1,6 +1,5 @@
-import { LoadingController } from '@ionic/angular';
-import { Content, Profile, ContentDelete } from 'sunbird-sdk';
 import { OnInit } from '@angular/core';
+import { Content, ContentDelete } from 'sunbird-sdk';
 
 export interface AppStorageInfo {
     usedSpace: number;
@@ -12,7 +11,6 @@ export interface EmitedContents {
     selectedContents: ContentDelete[];
 }
 
-
 type SortAttribute = [keyof Content];
 
 export interface DownloadManagerPageInterface extends OnInit {
diff --git a/src/app/download-manager/download-manager.page.scss b/src/app/download-manager/download-manager.page.scss
index a85f6f109..6209a5293 100644
--- a/src/app/download-manager/download-manager.page.scss
+++ b/src/app/download-manager/download-manager.page.scss
@@ -1,6 +1,7 @@
 @import "src/assets/styles/base/_variables.scss";
+@import "src/assets/styles/_variables.scss";
 
     .sb-dw-manager{
         background-color: #{$light-blue-bg};
-        border-bottom: 2px solid #fff;
+        border-bottom: 2px solid map-get($colors, white);
     }
\ No newline at end of file
diff --git a/src/app/download-manager/download-manager.page.spec.ts b/src/app/download-manager/download-manager.page.spec.ts
new file mode 100644
index 000000000..2b8ee8677
--- /dev/null
+++ b/src/app/download-manager/download-manager.page.spec.ts
@@ -0,0 +1,551 @@
+import { NgZone } from '@angular/core';
+import {
+    ContentDeleteStatus,
+    ContentService,
+    DeviceInfo,
+    InteractType,
+    SortOrder,
+    StorageDestination,
+    StorageService
+} from '@project-sunbird/sunbird-sdk';
+import { DownloadManagerPage } from './download-manager.page';
+import {
+    AppHeaderService,
+    AppGlobalService,
+    CommonUtilService,
+    FormAndFrameworkUtilService,
+    TelemetryGeneratorService
+} from '@app/services';
+import { RouterLinks, EventTopics } from '@app/app/app.constant';
+import { PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { Router } from '@angular/router';
+import { of, throwError } from 'rxjs';
+import { Environment, InteractSubtype, PageId } from '../../services/telemetry-constants';
+import { featureIdMap } from '../feature-id-map';
+
+describe('DownloadManagerPage', () => {
+    let downloadManagerPage: DownloadManagerPage;
+
+    const mockContentService: Partial<ContentService> = {
+        getContentSpaceUsageSummary: jest.fn(() => of([{
+            sizeOnDevice: 0,
+            path: 'sample_path'
+        }])),
+        getContents: jest.fn(() => of([])),
+        enqueueContentDelete: jest.fn(() => of({} as any)),
+        getContentDeleteQueue: jest.fn(() => of([] as any)),
+        clearContentDeleteQueue: jest.fn(() => of({} as any))
+    };
+
+    const mockDeviceInfo: Partial<DeviceInfo> = {
+        getAvailableInternalMemorySize: jest.fn(() => of(''))
+    };
+
+    const mockStorageService: Partial<StorageService> = {
+        getStorageDestinationDirectoryPath: jest.fn(),
+        getStorageDestinationVolumeInfo: jest.fn(() => of({
+            info: {
+                availableSize: 0,
+            }
+        } as any)),
+        getStorageDestination: jest.fn(() => of(StorageDestination.INTERNAL_STORAGE))
+    };
+    const mockNgZone: Partial<NgZone> = {
+        run: jest.fn((cb) => {
+            cb();
+        }) as any
+    };
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        convertFileSrc: jest.fn(() => 'sample_image_path'),
+        translateMessage: jest.fn(() => 'sample_translation'),
+        getAppName: jest.fn(() => Promise.resolve('Sunbird')),
+        showToast: jest.fn(),
+        fileSizeInMB: jest.fn(() => '1MB'),
+    };
+    const dismissFn = jest.fn(() => Promise.resolve({}));
+    const presentFn = jest.fn(() => Promise.resolve({}));
+    mockCommonUtilService.getLoader = jest.fn(() => ({
+        present: presentFn,
+        dismiss: dismissFn,
+    }));
+
+    const mockAppHeaderService: Partial<AppHeaderService> = {
+        showHeaderWithBackButton: jest.fn(),
+        showHeaderWithHomeButton: jest.fn(),
+        headerEventEmitted$: of('')
+    };
+
+    const mockEvents: Partial<Events> = {
+        publish: jest.fn(),
+        unsubscribe: jest.fn()
+    };
+
+    const mockPopOverController: Partial<PopoverController> = {};
+    mockPopOverController.create = jest.fn(() => (Promise.resolve({
+        present: jest.fn(() => Promise.resolve({})),
+        dismiss: jest.fn(() => Promise.resolve({})),
+        onDidDismiss: jest.fn(() => Promise.resolve({})),
+    } as any)));
+
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        getCurrentUser: jest.fn(() => ({ uid: 'sample_uid' }))
+    };
+
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => ({
+            extras: {
+                state: {
+                    profile: {},
+                }
+            }
+        } as any)),
+        navigate: jest.fn()
+    };
+
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateImpressionTelemetry: jest.fn(),
+        generateInteractTelemetry: jest.fn(),
+        generateAuditTelemetry: jest.fn()
+    };
+
+    const supportedPrimaryCategories = [
+        'Course',
+        'Learning Resource',
+        'Explanation Content',
+        'Teacher Resource',
+        'Content Playlist',
+        'Digital Textbook',
+        'Practice Question Set',
+        'eTextbook',
+        'Course Assessment',
+    ];
+    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {
+        getSupportedContentFilterConfig: jest.fn(() => Promise.resolve(supportedPrimaryCategories))
+    };
+
+    beforeAll(() => {
+        downloadManagerPage = new DownloadManagerPage(
+            mockContentService as ContentService,
+            mockDeviceInfo as DeviceInfo,
+            mockStorageService as StorageService,
+            mockNgZone as NgZone,
+            mockCommonUtilService as CommonUtilService,
+            mockAppHeaderService as AppHeaderService,
+            mockEvents as Events,
+            mockPopOverController as PopoverController,
+            mockAppGlobalService as AppGlobalService,
+            mockRouter as Router,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create instance of DownloadManagerPage', () => {
+        // arrange
+        // assert
+        expect(downloadManagerPage).toBeTruthy();
+    });
+
+    describe('ionViewWillEnter', () => {
+
+        it('should show app header with home button', (done) => {
+            // arrange
+            mockEvents.subscribe = jest.fn((req, fn) => {
+                switch (req) {
+                    case 'update_header':
+                        return fn('sample_respone');
+                }
+            });
+            mockAppHeaderService.showHeaderWithBackButton = jest.fn();
+            // act
+            downloadManagerPage.ionViewWillEnter().then(() => {
+                // assert
+                expect(mockAppHeaderService.showHeaderWithHomeButton).toHaveBeenCalledWith(['download', 'settings']);
+                done();
+            });
+        });
+
+
+        describe('handleHeaderEvents', () => {
+            it('should navigate to Active downloads page and generate INTERACT Telemetry', (done) => {
+                // arrange
+                mockAppHeaderService.headerEventEmitted$ = of({ name: 'download' });
+                // act
+                downloadManagerPage.ionViewWillEnter().then(() => {
+                    // assert
+                    expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.ACTIVE_DOWNLOADS]);
+                    expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                        InteractType.TOUCH,
+                        InteractSubtype.ACTIVE_DOWNLOADS_CLICKED,
+                        Environment.DOWNLOADS,
+                        PageId.DOWNLOADS);
+                    done();
+                });
+            });
+
+            it('should navigate to Storage settings page and generate INTERACT Telemetry', (done) => {
+                // arrange
+                mockAppHeaderService.headerEventEmitted$ = of({ name: 'settings' });
+                downloadManagerPage.downloadsTab = {
+                    deleteAllConfirm: {
+                        dismiss: jest.fn(() => Promise.resolve())
+                    },
+                    unSelectAllContents: jest.fn()
+                } as any;
+                // act
+                downloadManagerPage.ionViewWillEnter().then(() => {
+                    // assert
+                    expect(downloadManagerPage.downloadsTab.deleteAllConfirm.dismiss).toHaveBeenCalled();
+                    expect(downloadManagerPage.downloadsTab.unSelectAllContents).toHaveBeenCalled();
+                    expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.STORAGE_SETTINGS]);
+                    expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                        InteractType.TOUCH,
+                        InteractSubtype.SETTINGS_CLICKED,
+                        Environment.DOWNLOADS,
+                        PageId.DOWNLOADS);
+                    done();
+                });
+            });
+        });
+
+        it('should close all the popups when hamburger menu is clicked', (done) => {
+            // arrange
+            mockEvents.subscribe = jest.fn((req, fn) => {
+                switch (req) {
+                    case EventTopics.HAMBURGER_MENU_CLICKED:
+                        return fn('sample_respone');
+                }
+            });
+            downloadManagerPage.downloadsTab = {
+                deleteAllConfirm: {
+                    dismiss: jest.fn(() => Promise.resolve())
+                },
+                unSelectAllContents: jest.fn()
+            } as any;
+            // act
+            downloadManagerPage.ionViewWillEnter().then(() => {
+                // assert
+                expect(downloadManagerPage.downloadsTab.deleteAllConfirm.dismiss).toHaveBeenCalled();
+                expect(downloadManagerPage.downloadsTab.unSelectAllContents).toHaveBeenCalled();
+                done();
+            });
+        });
+
+        it('should not close all the popups when hamburger menu is clicked if download tabs is undefined', (done) => {
+            // arrange
+            mockStorageService.getStorageDestinationVolumeInfo = jest.fn(() => of({
+                info: {
+                    availableSize: 309715200,
+                }
+            } as any));
+            mockEvents.subscribe = jest.fn((req, fn) => {
+                switch (req) {
+                    case EventTopics.HAMBURGER_MENU_CLICKED:
+                        return fn('sample_respone');
+                }
+            });
+            downloadManagerPage.downloadsTab = undefined;
+            // act
+            downloadManagerPage.ionViewWillEnter().then(() => {
+                // assert
+                expect(downloadManagerPage.downloadsTab).toBeUndefined();
+                done();
+            });
+        });
+    });
+
+    describe('ngOnInit', () => {
+
+        it('should invoke getContents and getContentSpaceUsageSummary when resource update event is received', (done) => {
+            // arrange
+            mockEvents.subscribe = jest.fn((req, fn) => {
+                switch (req) {
+                    case 'savedResources:update':
+                        return fn({ update: true });
+                }
+            });
+            // act
+            downloadManagerPage.ngOnInit().then(() => {
+                // assert
+                expect(mockContentService.getContents).toHaveBeenCalledTimes(2);
+                expect(mockContentService.getContentSpaceUsageSummary).toHaveBeenCalledTimes(2);
+                done();
+            });
+        });
+
+        it('should not invoke getContents and getContentSpaceUsageSummary when resource update event is received', (done) => {
+            // arrange
+            mockEvents.subscribe = jest.fn((req, fn) => {
+                switch (req) {
+                    case 'savedResources:update':
+                        return fn(undefined);
+                }
+            });
+            // act
+            downloadManagerPage.ngOnInit().then(() => {
+                // assert
+                expect(mockContentService.getContents).toHaveBeenCalledTimes(1);
+                expect(mockContentService.getContentSpaceUsageSummary).toHaveBeenCalledTimes(1);
+                done();
+            });
+        });
+
+        it('should invoke getContents when ngOnit is called', (done) => {
+            // arrange
+            mockEvents.subscribe = jest.fn((req, fn) => {
+                switch (req) {
+                    case 'savedResources:update':
+                        return fn({ update: true });
+                }
+            });
+            // act
+            downloadManagerPage.ngOnInit().then(() => {
+                // assert
+                expect(mockContentService.getContents).toHaveBeenCalled();
+                expect(downloadManagerPage.appName).toEqual('Sunbird');
+                done();
+            });
+        });
+
+    });
+
+    describe('getDownloadedContents', () => {
+
+        it('should invoke getContents and getContentSpaceUsageSummary when resource update event is received', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+            mockContentService.getContents = jest.fn(() => of([{
+                identifier: 'do_21280756435836108811838',
+                contentData: {
+                    mimeType: 'application/vnd.ekstep.ecml-archive',
+                    contentType: 'Resource',
+                    identifier: 'do_21280756435836108811838',
+                    version: 2,
+                    size: 6194293,
+                    streamingUrl: 'sample_url',
+                    totalScore: 1,
+                    pkgVersion: 8,
+                },
+                isUpdateAvailable: false,
+                mimeType: 'application/vnd.ekstep.ecml-archive',
+                contentType: 'resource',
+                isAvailableLocally: false,
+                basePath: 'sample_basepath'
+            }] as any));
+            // act
+            downloadManagerPage.getDownloadedContents(false, false).then(() => {
+                // assert
+                expect(mockContentService.getContents).toHaveBeenCalledWith({
+                    audience: [],
+                    primaryCategories: supportedPrimaryCategories,
+                    sortCriteria: [{
+                        sortAttribute: 'sizeOnDevice',
+                        sortOrder: SortOrder.DESC
+                    }],
+                    uid: 'sample_uid'
+                });
+
+                expect(downloadManagerPage.downloadedContents).toBeDefined();
+                done();
+            });
+        });
+
+    });
+
+    describe('deleteContents', () => {
+        it('should  invoke deleteContent once if request has only 1 selected content', (done) => {
+            // arrange
+            mockContentService.deleteContent = jest.fn(() => of([{ status: 'CONTENT_DELETED' }] as any));
+            // act
+            downloadManagerPage.deleteContents({
+                selectedContents: [
+                    'do_id_1'
+                ]
+            } as any);
+
+            setTimeout(() => {
+                // assert
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('sample_translation');
+                expect(mockEvents.publish).toHaveBeenCalledWith('savedResources:update', {
+                    update: true
+                });
+                done();
+            }, 0);
+        });
+
+        it('should  show error message if content delete failed', (done) => {
+            // arrange
+            mockContentService.deleteContent = jest.fn(() => of([{ status: ContentDeleteStatus.NOT_FOUND }] as any));
+            // act
+            downloadManagerPage.deleteContents({
+                selectedContents: [
+                    'do_id_1'
+                ]
+            } as any);
+
+            setTimeout(() => {
+                // assert
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('sample_translation');
+                done();
+            }, 0);
+        });
+
+        it('should  show error message if content delete failed', (done) => {
+            // arrange
+            mockContentService.deleteContent = jest.fn(() => throwError([{ status: ContentDeleteStatus.NOT_FOUND }] as any));
+            // act
+            downloadManagerPage.deleteContents({
+                selectedContents: [
+                    'do_id_1'
+                ]
+            } as any);
+
+            setTimeout(() => {
+                // assert
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('sample_translation');
+                done();
+            }, 0);
+        });
+
+        it('should  invoke enqueueContentDelete  if request has more than 1 selected content', (done) => {
+            // arrange
+            mockContentService.deleteContent = jest.fn(() => of([{ status: 'CONTENT_DELETED' }] as any));
+            mockContentService.getContentDeleteQueue = jest.fn(() => of(['o_id_1', 'do_id_2'] as any));
+            // act
+            downloadManagerPage.deleteContents({
+                selectedContents: [
+                    'do_id_1',
+                    'do_id_2'
+                ],
+                selectedContentsInfo: { totalSize: 1024 }
+            } as any);
+
+            setTimeout(() => {
+                // assert
+                expect(mockContentService.enqueueContentDelete).toHaveBeenCalledWith({
+                    contentDeleteList: ['do_id_1', 'do_id_2']
+                });
+                done();
+            }, 0);
+        });
+
+    });
+
+    describe('onSortCriteriaChange', () => {
+        it('should invoke getContents with selected sorting type sizeOnDevice', (done) => {
+            // arrange
+            // act
+            downloadManagerPage.onSortCriteriaChange({
+                selectedItem: 'CONTENT_SIZE'
+            });
+
+            setTimeout(() => {
+                // assert
+                expect(mockContentService.getContents).toHaveBeenCalledWith({
+                    audience: [],
+                    primaryCategories: supportedPrimaryCategories,
+                    sortCriteria: [{
+                        sortAttribute: 'sizeOnDevice',
+                        sortOrder: SortOrder.DESC
+                    }],
+                    uid: 'sample_uid'
+                });
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.SORT_OPTION_SELECTED,
+                    Environment.DOWNLOADS,
+                    PageId.DOWNLOADS,
+                    undefined,
+                    { selectedOption: 'sizeOnDevice'},
+                    undefined,
+                    featureIdMap.downloadManager.DOWNLOADS_SORT);
+                done();
+            }, 0);
+        });
+
+        it('should invoke getContents with selected sorting type lastUsedOn', (done) => {
+            // arrange
+            // act
+            downloadManagerPage.onSortCriteriaChange({
+                selectedItem: 'LAST_VIEWED'
+            });
+
+            setTimeout(() => {
+                // assert
+                expect(mockContentService.getContents).toHaveBeenCalledWith({
+                    audience: [],
+                    primaryCategories: supportedPrimaryCategories,
+                    sortCriteria: [{
+                        sortAttribute: 'lastUsedOn',
+                        sortOrder: SortOrder.DESC
+                    }],
+                    uid: 'sample_uid'
+                });
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.SORT_OPTION_SELECTED,
+                    Environment.DOWNLOADS,
+                    PageId.DOWNLOADS,
+                    undefined,
+                    { selectedOption: 'lastUsedOn'},
+                    undefined,
+                    featureIdMap.downloadManager.DOWNLOADS_SORT);
+                done();
+            }, 0);
+        });
+
+        it('should invoke getContents with selected sorting type lastUsedOn', (done) => {
+            // arrange
+            // act
+            downloadManagerPage.onSortCriteriaChange({
+                selectedItem: 'NEW_VALUE'
+            });
+
+            setTimeout(() => {
+                // assert
+                expect(mockContentService.getContents).toHaveBeenCalledWith({
+                    audience: [],
+                    primaryCategories: supportedPrimaryCategories,
+                    sortCriteria: [{
+                        sortAttribute: undefined,
+                        sortOrder: SortOrder.DESC
+                    }],
+                    uid: 'sample_uid'
+                });
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.SORT_OPTION_SELECTED,
+                    Environment.DOWNLOADS,
+                    PageId.DOWNLOADS,
+                    undefined,
+                    { selectedOption: undefined},
+                    undefined,
+                    featureIdMap.downloadManager.DOWNLOADS_SORT);
+                done();
+            }, 0);
+        });
+
+    });
+
+    describe('ionViewWillLeave', () => {
+        it('should unsubscribe all events', () => {
+            // arrange
+            mockContentService.deleteContent = jest.fn(() => of([{ status: 'CONTENT_DELETED' }] as any));
+            // act
+            downloadManagerPage.ionViewWillLeave();
+
+            // assert
+            expect(mockEvents.unsubscribe).toHaveBeenCalledWith('update_header');
+            expect(mockEvents.unsubscribe).toHaveBeenCalledWith(EventTopics.HAMBURGER_MENU_CLICKED);
+
+        });
+
+    });
+
+
+});
diff --git a/src/app/download-manager/download-manager.page.ts b/src/app/download-manager/download-manager.page.ts
index 2a30aea1a..a7f390da2 100644
--- a/src/app/download-manager/download-manager.page.ts
+++ b/src/app/download-manager/download-manager.page.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, Inject, NgZone, ViewChild } from '@angular/core';
-import { AppVersion } from '@ionic-native/app-version/ngx';
-import { Events, PopoverController } from '@ionic/angular';
-import { Router, ActivatedRoute } from '@angular/router';
+import { PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { Router } from '@angular/router';
 import {
   Content,
   ContentDeleteRequest,
@@ -34,6 +34,8 @@ import {
 } from '@app/app/components/popups/sb-insufficient-storage-popup/sb-insufficient-storage-popup';
 import { DownloadsTabComponent } from './downloads-tab/downloads-tab.component';
 import { finalize, tap, skip, takeWhile } from 'rxjs/operators';
+import { ContentUtil } from '@app/util/content-util';
+import { DbService } from '../manage-learn/core/services/db.service';
 
 @Component({
   selector: 'app-download-manager',
@@ -52,7 +54,7 @@ export class DownloadManagerPage implements DownloadManagerPageInterface, OnInit
   sortCriteria: ContentSortCriteria[];
   storageDestination: any;
   private deletedContentListTitle$?: BehaviorSubject<string>;
-  @ViewChild('downloadsTab') downloadsTab: DownloadsTabComponent;
+  @ViewChild('downloadsTab', { static: false }) downloadsTab: DownloadsTabComponent;
 
   constructor(
     @Inject('CONTENT_SERVICE') private contentService: ContentService,
@@ -64,11 +66,10 @@ export class DownloadManagerPage implements DownloadManagerPageInterface, OnInit
     private events: Events,
     private popoverCtrl: PopoverController,
     private appGlobalService: AppGlobalService,
-    private appVersion: AppVersion,
     private router: Router,
     private telemetryGeneratorService: TelemetryGeneratorService,
     private formAndFrameworkUtilService: FormAndFrameworkUtilService,
-    private route: ActivatedRoute
+    private db: DbService
   ) { }
 
   async ngOnInit() {
@@ -98,7 +99,7 @@ export class DownloadManagerPage implements DownloadManagerPageInterface, OnInit
   }
 
   private async getAppName() {
-    return this.appVersion.getAppName()
+    return this.commonUtilService.getAppName()
       .then((appName: any) => {
         this.appName = appName;
       });
@@ -127,11 +128,11 @@ export class DownloadManagerPage implements DownloadManagerPageInterface, OnInit
       sortAttribute: 'sizeOnDevice',
       sortOrder: SortOrder.DESC
     }];
-    const contentTypes = await this.formAndFrameworkUtilService.getSupportedContentFilterConfig(
+    const primaryCategories = await this.formAndFrameworkUtilService.getSupportedContentFilterConfig(
       ContentFilterConfig.NAME_DOWNLOADS);
     const requestParams: ContentRequest = {
       uid: profile.uid,
-      contentTypes,
+      primaryCategories,
       audience: [],
       sortCriteria: this.sortCriteria || defaultSortCriteria
     };
@@ -145,18 +146,29 @@ export class DownloadManagerPage implements DownloadManagerPageInterface, OnInit
         }
         data.forEach((value) => {
           value.contentData['lastUpdatedOn'] = value.lastUpdatedTime;
-          if (value.contentData.appIcon) {
-            if (value.contentData.appIcon.startsWith('http:') || value.contentData.appIcon.startsWith('https:')) {
-              if (this.commonUtilService.networkInfo.isNetworkAvailable) {
-                value.contentData.appIcon = value.contentData.appIcon;
-              } else {
-                value.contentData.appIcon = this.defaultImg;
-              }
-            } else if (value.basePath) {
-              value.contentData.appIcon = value.basePath + '/' + value.contentData.appIcon;
-            }
-          }
+          value.contentData.appIcon = ContentUtil.getAppIcon(value.contentData.appIcon,
+            value.basePath, this.commonUtilService.networkInfo.isNetworkAvailable);
         });
+        const query = {
+          selector: {
+            downloaded: true,
+          },
+        };
+        this.db.customQuery(query).then(projectData => {
+          if (projectData['docs']) {
+            projectData['docs'].sort(function (a, b) {
+              return new Date(b.updatedAt || b.syncedAt).valueOf() - new Date(a.updatedAt || a.syncedAt).valueOf();
+            });
+            projectData['docs'].map(doc => {
+              doc.contentData = { lastUpdatedOn: doc.updatedAt, name: doc.title };
+              doc.type = 'project'
+              doc.identifier = doc._id;
+              data.push(doc)
+            })
+          }
+        }).catch(error => {
+
+        })
         this.ngZone.run(async () => {
           this.downloadedContents = data;
         });
@@ -174,8 +186,16 @@ export class DownloadManagerPage implements DownloadManagerPageInterface, OnInit
   }
 
   async deleteContents(emitedContents: EmitedContents) {
+    const projectContents = emitedContents.selectedContents.filter((content) => (content['type'] == 'project'));
+    emitedContents.selectedContents = emitedContents.selectedContents.filter((content) => !content['type'] || content['type'] != 'project');
+
+    if (!emitedContents.selectedContents.length) {
+      this.deleteProjects(projectContents)
+      return
+    }
+    this.deleteProjects(projectContents)
     const contentDeleteRequest: ContentDeleteRequest = {
-      contentDeleteList: emitedContents.selectedContents
+      contentDeleteList: emitedContents.selectedContents,
     };
     if (emitedContents.selectedContents.length > 1) {
       await this.deleteAllContents(emitedContents);
@@ -203,6 +223,7 @@ export class DownloadManagerPage implements DownloadManagerPageInterface, OnInit
         });
     }
   }
+
   private async deleteAllContents(emitedContents) {
     const valuesMap = {};
     valuesMap['size'] = this.commonUtilService.fileSizeInMB(emitedContents.selectedContentsInfo.totalSize);
@@ -251,8 +272,6 @@ export class DownloadManagerPage implements DownloadManagerPageInterface, OnInit
           .next(`${contentDeleteRequest.contentDeleteList.length}/${contentDeleteRequest.contentDeleteList.length}`);
 
         this.deleteAllConfirm.dismiss();
-
-
         this.events.publish('savedResources:update', {
           update: true
         });
@@ -306,7 +325,6 @@ export class DownloadManagerPage implements DownloadManagerPageInterface, OnInit
   }
 
   private handleHeaderEvents($event) {
-    console.log('inside handleHeaderEvents', $event);
     switch ($event.name) {
       case 'download':
         this.redirectToActivedownloads();
@@ -332,15 +350,14 @@ export class DownloadManagerPage implements DownloadManagerPageInterface, OnInit
       InteractType.TOUCH,
       InteractSubtype.SETTINGS_CLICKED,
       Environment.DOWNLOADS,
-      PageId.DOWNLOADS, undefined,
-      undefined,
-      undefined,
-      undefined);
+      PageId.DOWNLOADS);
     this.router.navigate([RouterLinks.STORAGE_SETTINGS]);
   }
+
   private async fetchStorageDestination() {
     this.storageDestination = await this.storageService.getStorageDestination().toPromise();
   }
+
   private async presentPopupForLessStorageSpace() {
     this._toast = await this.popoverCtrl.create({
       component: SbInsufficientStoragePopupComponent,
@@ -375,4 +392,20 @@ export class DownloadManagerPage implements DownloadManagerPageInterface, OnInit
     }
   }
 
+  deleteProjects(contents) {
+
+    contents.forEach(async (element) => {
+      let project = await this.db.getById(element.contentId)
+      project.downloaded = false
+      await this.db.delete(project._id, project._rev)
+      this.events.publish('savedResources:update', {
+        update: true,
+      });
+      this.commonUtilService.showToast(this.commonUtilService.translateMessage('MSG_RESOURCE_DELETED'));
+
+
+    });
+  }
+
+
 }
diff --git a/src/app/download-manager/downloads-tab/download-tab.component.spec.ts b/src/app/download-manager/downloads-tab/download-tab.component.spec.ts
new file mode 100644
index 000000000..18800751c
--- /dev/null
+++ b/src/app/download-manager/downloads-tab/download-tab.component.spec.ts
@@ -0,0 +1,639 @@
+
+import { DownloadsTabComponent } from './downloads-tab.component';
+import {
+    AppHeaderService,
+    CommonUtilService,
+    NavigationService,
+    TelemetryGeneratorService
+} from '@app/services';
+import { PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { of } from 'rxjs';
+import { Environment, InteractSubtype, PageId, InteractType, ActionButtonType } from '../../../services/telemetry-constants';
+
+describe('DownloadManagerPage', () => {
+    let downloadsTabComponent: DownloadsTabComponent;
+
+    const mockPopOverController: Partial<PopoverController> = {};
+    mockPopOverController.create = jest.fn(() => (Promise.resolve({
+        present: jest.fn(() => Promise.resolve({})),
+        dismiss: jest.fn(() => Promise.resolve({})),
+        onDidDismiss: jest.fn(() => Promise.resolve({})),
+    } as any)));
+
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        convertFileSrc: jest.fn(() => 'sample_image_path'),
+        translateMessage: jest.fn(() => 'sample_translation'),
+        getAppName: jest.fn(() => Promise.resolve('Sunbird')),
+        showToast: jest.fn(),
+        fileSizeInMB: jest.fn(() => '1MB'),
+    };
+    const dismissFn = jest.fn(() => Promise.resolve({}));
+    const presentFn = jest.fn(() => Promise.resolve({}));
+    mockCommonUtilService.getLoader = jest.fn(() => ({
+        present: presentFn,
+        dismiss: dismissFn,
+    }));
+
+    const mockEvents: Partial<Events> = {
+        publish: jest.fn(),
+        unsubscribe: jest.fn()
+    };
+
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateImpressionTelemetry: jest.fn(),
+        generateInteractTelemetry: jest.fn(),
+        generatePageViewTelemetry: jest.fn()
+    };
+
+    const mockNavService: Partial<NavigationService> = {
+        navigateToDetailPage: jest.fn()
+    };
+
+    const mockAppHeaderService: Partial<AppHeaderService> = {
+        showHeaderWithBackButton: jest.fn(),
+        showHeaderWithHomeButton: jest.fn(),
+        headerEventEmitted$: of('')
+    };
+
+    beforeAll(() => {
+        downloadsTabComponent = new DownloadsTabComponent(
+            mockPopOverController as PopoverController,
+            mockCommonUtilService as CommonUtilService,
+            mockEvents as Events,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockNavService as NavigationService,
+            mockAppHeaderService as AppHeaderService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create instance of DownloadsTabComponent', () => {
+        // arrange
+        // assert
+        expect(downloadsTabComponent).toBeTruthy();
+    });
+
+    describe('ngOnInit', () => {
+
+        it('should not dismiss the popup if deleteAllPopupPresent is false', () => {
+            // arrange
+            downloadsTabComponent.deleteAllConfirm = { dismiss: jest.fn() };
+            downloadsTabComponent.deleteAllPopupPresent = false;
+            // act
+            downloadsTabComponent.ngOnInit();
+            // assert
+            expect(downloadsTabComponent.deleteAllConfirm.dismiss).not.toHaveBeenCalled();
+        });
+
+        it('should  dismiss the popup if deleteAllPopupPresent is true', () => {
+            // arrange
+            downloadsTabComponent.deleteAllConfirm = { dismiss: jest.fn() };
+            downloadsTabComponent.deleteAllPopupPresent = true;
+            // act
+            downloadsTabComponent.ngOnInit();
+            // assert
+            expect(downloadsTabComponent.deleteAllConfirm.dismiss).toHaveBeenCalled();
+        });
+    });
+
+    describe('showDeletePopup', () => {
+
+        it('should  show single content delete confirmation popup', (done) => {
+            // arrange
+            // act
+            downloadsTabComponent.showDeletePopup('do_id1').then(() => {
+                // assert
+                expect(mockPopOverController.create).toHaveBeenCalled();
+                done();
+            });
+        });
+
+        it('should  invoke delete content API on click of confirmation button', (done) => {
+            // arrange
+            downloadsTabComponent.downloadedContents = [{
+                identifier: 'do_id1',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            },
+            {
+                identifier: 'do_id2',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            }];
+            mockPopOverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                dismiss: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: true } })),
+            } as any)));
+            downloadsTabComponent.deleteContents = { emit: jest.fn() } as any;
+            // act
+            downloadsTabComponent.showDeletePopup('do_id1').then(() => {
+                // assert
+                expect(downloadsTabComponent.deleteContents.emit).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledTimes(2);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.DELETE_CLICKED,
+                    Environment.DOWNLOADS,
+                    PageId.DOWNLOADS
+                );
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.TOUCH,
+                    InteractSubtype.ACTION_BUTTON_CLICKED,
+                    Environment.DOWNLOADS,
+                    PageId.SINGLE_DELETE_CONFIRMATION_POPUP,
+                    {
+                        id: 'do_id1',
+                        type: 'Course',
+                        version: '1'
+                    },
+                    { type: 'positive' }
+                );
+                done();
+            });
+        });
+
+        it('should  not invoke delete content API for any other actions', (done) => {
+            // arrange
+            downloadsTabComponent.downloadedContents = [{
+                identifier: 'do_id1',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            },
+            {
+                identifier: 'do_id2',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            }];
+            mockPopOverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                dismiss: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { shouldRemove: true } })),
+            } as any)));
+            downloadsTabComponent.deleteContents = { emit: jest.fn() } as any;
+            // act
+            downloadsTabComponent.showDeletePopup('do_id1').then(() => {
+                // assert
+                expect(downloadsTabComponent.deleteContents.emit).not.toHaveBeenCalled();
+                done();
+            });
+        });
+
+        it('should  invoke delete content API on click of confirmation button for bulk delete', (done) => {
+            // arrange
+            downloadsTabComponent.downloadedContents = [{
+                identifier: 'do_id1',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            },
+            {
+                identifier: 'do_id2',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            }];
+            mockPopOverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                dismiss: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: true } })),
+            } as any)));
+            downloadsTabComponent.deleteContents = { emit: jest.fn() } as any;
+            // act
+            downloadsTabComponent.showDeletePopup().then(() => {
+                // assert
+                expect(downloadsTabComponent.deleteContents.emit).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.ACTION_BUTTON_CLICKED,
+                    Environment.DOWNLOADS,
+                    PageId.BULK_DELETE_CONFIRMATION_POPUP,
+                    undefined,
+                    { type: 'positive' }
+                );
+                done();
+            });
+        });
+
+        it('should  unselect the selected contents when close is clicked', (done) => {
+            // arrange
+            downloadsTabComponent.deleteAllConfirm = { dismiss: jest.fn() };
+            downloadsTabComponent.deleteAllPopupPresent = true;
+            downloadsTabComponent.downloadedContents = [{
+                identifier: 'do_id1',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            },
+            {
+                identifier: 'do_id2',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            }];
+            mockPopOverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                dismiss: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { closeDeletePopOver: true } })),
+            } as any)));
+            downloadsTabComponent.deleteContents = { emit: jest.fn() } as any;
+            // act
+            downloadsTabComponent.showDeletePopup().then(() => {
+                // assert
+                expect(downloadsTabComponent.deleteAllConfirm.dismiss).toHaveBeenCalledWith({ isLeftButtonClicked: null });
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.UNSELECT_ALL_CLICKED,
+                    Environment.DOWNLOADS,
+                    PageId.DOWNLOADS
+                );
+                done();
+            });
+        });
+
+
+        it('should  unselect the selected contents when close is clicked but should not invoke dismiss if deleteAllPopupPresent is false', (done) => {
+            // arrange
+            downloadsTabComponent.deleteAllConfirm = { dismiss: jest.fn() };
+            downloadsTabComponent.deleteAllPopupPresent = false;
+            downloadsTabComponent.downloadedContents = [{
+                identifier: 'do_id1',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            },
+            {
+                identifier: 'do_id2',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            }];
+            mockPopOverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                dismiss: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { closeDeletePopOver: true } })),
+            } as any)));
+            downloadsTabComponent.deleteContents = { emit: jest.fn() } as any;
+            // act
+            downloadsTabComponent.showDeletePopup().then(() => {
+                // assert
+                expect(downloadsTabComponent.deleteAllConfirm.dismiss).not.toHaveBeenCalledWith({ isLeftButtonClicked: null });
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.UNSELECT_ALL_CLICKED,
+                    Environment.DOWNLOADS,
+                    PageId.DOWNLOADS
+                );
+                done();
+            });
+        });
+
+        it('should  unselect the selected contents when data is undefibned from delete popup', (done) => {
+            // arrange
+            downloadsTabComponent.deleteAllConfirm = { dismiss: jest.fn() };
+            downloadsTabComponent.deleteAllPopupPresent = true;
+            downloadsTabComponent.downloadedContents = [{
+                identifier: 'do_id1',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            },
+            {
+                identifier: 'do_id2',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            }];
+            mockPopOverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                dismiss: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: undefined })),
+            } as any)));
+            downloadsTabComponent.deleteContents = { emit: jest.fn() } as any;
+            // act
+            downloadsTabComponent.showDeletePopup().then(() => {
+                // assert
+                expect(downloadsTabComponent.deleteAllConfirm.dismiss).toHaveBeenCalledWith({ isLeftButtonClicked: null });
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.UNSELECT_ALL_CLICKED,
+                    Environment.DOWNLOADS,
+                    PageId.DOWNLOADS
+                );
+                done();
+            });
+        });
+
+        it('should not  unselect the selected contents when close is cliked from delete popup', (done) => {
+            // arrange
+            downloadsTabComponent.deleteAllConfirm = { dismiss: jest.fn() };
+            downloadsTabComponent.deleteAllPopupPresent = true;
+            downloadsTabComponent.downloadedContents = [{
+                identifier: 'do_id1',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            },
+            {
+                identifier: 'do_id2',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            }];
+            mockPopOverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                dismiss: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { closeDeletePopOver: true } })),
+            } as any)));
+            downloadsTabComponent.deleteContents = { emit: jest.fn() } as any;
+            // act
+            downloadsTabComponent.showDeletePopup('do_id1').then(() => {
+                // assert
+                expect(downloadsTabComponent.deleteAllConfirm.dismiss).not.toHaveBeenCalledWith({ isLeftButtonClicked: null });
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).not.toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.UNSELECT_ALL_CLICKED,
+                    Environment.DOWNLOADS,
+                    PageId.DOWNLOADS
+                );
+                done();
+            });
+        });
+    });
+
+    describe('showSortOptions', () => {
+
+        it('should show sort Popup', () => {
+            // arrange
+            downloadsTabComponent.deleteAllConfirm = { dismiss: jest.fn() };
+            downloadsTabComponent.deleteAllPopupPresent = false;
+            // act
+            downloadsTabComponent.showSortOptions({});
+            // assert
+            expect(mockPopOverController.create).toHaveBeenCalled();
+        });
+
+        it('should  emit the sortChanged event of sort option is selected', () => {
+            // arrange
+            downloadsTabComponent.deleteAllConfirm = { dismiss: jest.fn() };
+            downloadsTabComponent.deleteAllPopupPresent = true;
+            downloadsTabComponent.selectedFilter = 'CONTENT_SIZE';
+            downloadsTabComponent.sortCriteriaChanged = { emit: jest.fn() } as any;
+            mockPopOverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                dismiss: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { content: 'LAST_VIEWED' } })),
+            } as any)));
+            // act
+            downloadsTabComponent.showSortOptions({}).then(() => {
+                // assert
+                expect(downloadsTabComponent.sortCriteriaChanged.emit).toHaveBeenCalledWith({ content: 'LAST_VIEWED' });
+            });
+        });
+
+        it('should  not emit the sortChanged event if sort option is same as previous', () => {
+            // arrange
+            downloadsTabComponent.deleteAllConfirm = { dismiss: jest.fn() };
+            downloadsTabComponent.deleteAllPopupPresent = true;
+            downloadsTabComponent.selectedFilter = 'CONTENT_SIZE';
+            downloadsTabComponent.sortCriteriaChanged = { emit: jest.fn() } as any;
+            mockPopOverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                dismiss: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { content: 'CONTENT_SIZE' } })),
+            } as any)));
+            // act
+            downloadsTabComponent.showSortOptions({}).then(() => {
+                // assert
+                expect(downloadsTabComponent.sortCriteriaChanged.emit).not.toHaveBeenCalledWith({ content: 'LAST_VIEWED' });
+            });
+        });
+
+        it('should  not emit the sortChanged event if nothing is selected', () => {
+            // arrange
+            downloadsTabComponent.deleteAllConfirm = { dismiss: jest.fn() };
+            downloadsTabComponent.deleteAllPopupPresent = true;
+            downloadsTabComponent.selectedFilter = 'CONTENT_SIZE';
+            downloadsTabComponent.sortCriteriaChanged = { emit: jest.fn() } as any;
+            mockPopOverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                dismiss: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: undefined })),
+            } as any)));
+            // act
+            downloadsTabComponent.showSortOptions({}).then(() => {
+                // assert
+                expect(downloadsTabComponent.sortCriteriaChanged.emit).not.toHaveBeenCalledWith({ content: 'LAST_VIEWED' });
+            });
+        });
+    });
+
+    describe('selectAllContents', () => {
+
+        it('should publish  events of selected contents', () => {
+            // arrange
+            downloadsTabComponent.downloadedContents = [{
+                identifier: 'do_id1',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            },
+            {
+                identifier: 'do_id2',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            }];
+            downloadsTabComponent.deleteAllConfirm = { dismiss: jest.fn() };
+            downloadsTabComponent.deleteAllPopupPresent = true;
+            // act
+            downloadsTabComponent.selectAllContents();
+            // assert
+            expect(mockEvents.publish).toHaveBeenCalledWith(
+                'selectedContents:changed',
+                { selectedContents: { count: 2, totalSize: NaN } });
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                InteractType.TOUCH,
+                InteractSubtype.SELECT_ALL_CLICKED,
+                Environment.DOWNLOADS,
+                PageId.DOWNLOADS
+            );
+        });
+
+        it('should show bulk delete popup', () => {
+            // arrange
+            downloadsTabComponent.downloadedContents = [{
+                identifier: 'do_id1',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            },
+            {
+                identifier: 'do_id2',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            }];
+            mockPopOverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                dismiss: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { content: 'LAST_VIEWED' } })),
+            } as any)));
+            downloadsTabComponent.deleteAllConfirm = { dismiss: jest.fn() };
+            downloadsTabComponent.deleteAllPopupPresent = false;
+            // act
+            downloadsTabComponent.selectAllContents();
+            // assert
+            expect(mockPopOverController.create).toHaveBeenCalled();
+        });
+
+        it('should unselect all selected content when popup is dismissed', () => {
+            // arrange
+            downloadsTabComponent.downloadedContents = [{
+                identifier: 'do_id1',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            },
+            {
+                identifier: 'do_id2',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            }];
+            mockPopOverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                dismiss: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { isLeftButtonClicked: null } })),
+            } as any)));
+            downloadsTabComponent.deleteAllConfirm = { dismiss: jest.fn() };
+            downloadsTabComponent.deleteAllPopupPresent = false;
+            // act
+            downloadsTabComponent.selectAllContents();
+            // assert
+            expect(downloadsTabComponent.deleteAllConfirm.dismiss).not.toHaveBeenCalledWith({ isLeftButtonClicked: null });
+        });
+
+        it('should unselect all selected content when cancel is clicked', () => {
+            // arrange
+            downloadsTabComponent.downloadedContents = [{
+                identifier: 'do_id1',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            },
+            {
+                identifier: 'do_id2',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            }];
+            mockPopOverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                dismiss: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { isLeftButtonClicked: true } })),
+            } as any)));
+            downloadsTabComponent.deleteAllConfirm = { dismiss: jest.fn() };
+            downloadsTabComponent.deleteAllPopupPresent = false;
+            // act
+            downloadsTabComponent.selectAllContents();
+            // assert
+            setTimeout(() => {
+                expect(downloadsTabComponent.deleteAllConfirm.dismiss).not.toHaveBeenCalledWith({ isLeftButtonClicked: null });
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.TOUCH,
+                    InteractSubtype.ACTION_BUTTON_CLICKED,
+                    Environment.DOWNLOADS,
+                    PageId.BULK_DELETE_POPUP, undefined,
+                    { type: ActionButtonType.NEGATIVE }
+                );
+            }, 0);
+        });
+    });
+
+    describe('toggleContentSelect', () => {
+
+        it('should publish  events of selected contents', () => {
+            // arrange
+            downloadsTabComponent.downloadedContents = [{
+                identifier: 'do_id1',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            },
+            {
+                identifier: 'do_id2',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            }];
+            downloadsTabComponent.deleteAllConfirm = { dismiss: jest.fn() };
+            downloadsTabComponent.deleteAllPopupPresent = true;
+            // act
+            downloadsTabComponent.toggleContentSelect({ detail: { checked: true } }, 0);
+            // assert
+            expect(mockEvents.publish).toHaveBeenCalledWith(
+                'selectedContents:changed',
+                { selectedContents: { count: 1, totalSize: NaN } });
+        });
+
+        it('should publish  events of selected contents', () => {
+            // arrange
+            downloadsTabComponent.downloadedContents = [{
+                identifier: 'do_id1',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            }];
+            downloadsTabComponent.deleteAllConfirm = { dismiss: jest.fn() };
+            downloadsTabComponent.deleteAllPopupPresent = true;
+            // act
+            downloadsTabComponent.toggleContentSelect({ detail: { checked: true } }, 0);
+            // assert
+            expect(mockEvents.publish).toHaveBeenCalledWith(
+                'selectedContents:changed',
+                { selectedContents: { count: 1, totalSize: NaN } });
+        });
+
+        it('should dismiss the popup', () => {
+            // arrange
+            downloadsTabComponent.downloadedContents = [{
+                identifier: 'do_id1',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            }];
+            downloadsTabComponent.deleteAllConfirm = { dismiss: jest.fn() };
+            downloadsTabComponent.deleteAllPopupPresent = true;
+            // act
+            downloadsTabComponent.toggleContentSelect({ detail: { checked: false } }, 0);
+            // assert
+            expect(downloadsTabComponent.deleteAllConfirm.dismiss).toHaveBeenCalled();
+        });
+
+        it('should not dismiss the popup', () => {
+            // arrange
+            downloadsTabComponent.downloadedContents = [{
+                identifier: 'do_id1',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            }];
+            downloadsTabComponent.deleteAllConfirm = { dismiss: jest.fn() };
+            downloadsTabComponent.deleteAllPopupPresent = false;
+            // act
+            downloadsTabComponent.toggleContentSelect({ detail: { checked: false } }, 0);
+            // assert
+            expect(downloadsTabComponent.deleteAllConfirm.dismiss).not.toHaveBeenCalled();
+        });
+
+    });
+
+    describe('navigateToDetailsPage', () => {
+
+        it('should publish  events of selected contents', () => {
+            // arrange
+            const content = {
+                identifier: 'do_id1',
+                primaryCategory: 'Course',
+                pkgVersion: '1'
+            };
+            // act
+            downloadsTabComponent.navigateToDetailsPage(content);
+            // assert
+            expect(mockNavService.navigateToDetailPage).toHaveBeenCalledWith(content, { content });
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.CONTENT_CLICKED,
+                Environment.DOWNLOADS,
+                PageId.DOWNLOADS,
+                {id: 'do_id1', type: 'Course', version: '1'},
+                undefined,
+                {l1: 'do_id1'},
+                [{id: 'Downloads', type: 'Section'}]
+            );
+        });
+
+    });
+});
diff --git a/src/app/download-manager/downloads-tab/downloads-tab.component.html b/src/app/download-manager/downloads-tab/downloads-tab.component.html
index 12974cfc3..b3734225b 100644
--- a/src/app/download-manager/downloads-tab/downloads-tab.component.html
+++ b/src/app/download-manager/downloads-tab/downloads-tab.component.html
@@ -8,7 +8,7 @@
     <div class="pull-right">
       <span class="selector">{{selectedFilter | translate}}</span>
       <span><img src="./assets/imgs/sort.png" alt="sorting"></span>
-      <ion-icon name="ios-arrow-down" class="selector"></ion-icon>
+      <ion-icon name="arrow-down" class="selector"></ion-icon>
     </div>
   </div>
 </div>
@@ -38,7 +38,7 @@
       </div>
       <div class="sb-card-actions">
         <button *ngIf="showDeleteButton" class="action-btn float-end delete mr-8"
-          (click)="showDeletePopup(content.identifier)">
+          (click)="showDeletePopup(content.identifier,content.type)">
           {{'DELETE' | translate}}
         </button>
       </div>
diff --git a/src/app/download-manager/downloads-tab/downloads-tab.component.scss b/src/app/download-manager/downloads-tab/downloads-tab.component.scss
index 41513fadb..98575e96e 100644
--- a/src/app/download-manager/downloads-tab/downloads-tab.component.scss
+++ b/src/app/download-manager/downloads-tab/downloads-tab.component.scss
@@ -1,5 +1,6 @@
 @import "src/assets/styles/base/_variables.scss";
 @import "src/assets/styles/mixins/bourbon/library/_clearfix.scss";
+@import "src/assets/styles/_variables.scss";
 
 :host {
   .sb-card-active {
@@ -16,7 +17,7 @@
 
   ion-checkbox {
     --border-width: 1px;
-    --border-color: #7AB4EE;
+    --border-color: #{map-get($colors, light_blue_ee)};
     --background-checked: #{$blue};
     --border-color-checked: #{$blue};
     --border-radius: 4px;
diff --git a/src/app/download-manager/downloads-tab/downloads-tab.component.ts b/src/app/download-manager/downloads-tab/downloads-tab.component.ts
index fbfa27d4e..7b8a94d52 100644
--- a/src/app/download-manager/downloads-tab/downloads-tab.component.ts
+++ b/src/app/download-manager/downloads-tab/downloads-tab.component.ts
@@ -1,18 +1,19 @@
-import { Component, Input, EventEmitter, Output, NgZone, OnInit } from '@angular/core';
-import { ContentType, MimeType, MenuOverflow, RouterLinks } from '@app/app/app.constant';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { MenuOverflow, RouterLinks } from '@app/app/app.constant';
+import { SbPopoverComponent } from '@app/app/components/popups/sb-popover/sb-popover.component';
 import { OverflowMenuComponent } from '@app/app/profile/overflow-menu/overflow-menu.component';
-import { CommonUtilService, } from '@app/services/common-util.service';
+import { AppHeaderService } from '@app/services';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { NavigationService } from '@app/services/navigation-handler.service';
 import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import { SbPopoverComponent } from '@app/app/components/popups/sb-popover/sb-popover.component';
-import { PopoverController, Events } from '@ionic/angular';
-import { InteractType, TelemetryObject, CorrelationData } from 'sunbird-sdk';
-import { Content, ContentDelete } from 'sunbird-sdk';
+import { ContentUtil } from '@app/util/content-util';
+import { PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { Content, ContentDelete, CorrelationData, InteractType, TelemetryObject } from 'sunbird-sdk';
+import { ActionButtonType, CorReleationDataType, Environment, InteractSubtype, PageId } from '../../../services/telemetry-constants';
 import { SbGenericPopoverComponent } from '../../components/popups/sb-generic-popover/sb-generic-popover.component';
-import { InteractSubtype, Environment, PageId, ActionButtonType, CorReleationDataType } from '../../../services/telemetry-constants';
 import { EmitedContents } from '../download-manager.interface';
 import { Router } from '@angular/router';
-import { AppHeaderService } from '@app/services';
-import { ContentUtil } from '@app/util/content-util';
 
 @Component({
   selector: 'app-downloads-tab',
@@ -42,10 +43,11 @@ export class DownloadsTabComponent implements OnInit {
     private commonUtilService: CommonUtilService,
     private events: Events,
     private telemetryGeneratorService: TelemetryGeneratorService,
-    private router: Router,
-    private zone: NgZone,
-    private headerService: AppHeaderService) {
+    private navService: NavigationService,
+    private headerService: AppHeaderService,
+    private router:Router) {
   }
+
   ngOnInit(): void {
     this.headerService.headerEventEmitted$.subscribe(async () => {
       if (this.deleteAllPopupPresent) {
@@ -54,7 +56,7 @@ export class DownloadsTabComponent implements OnInit {
     });
   }
 
-  async showDeletePopup(identifier?) {
+  async showDeletePopup(identifier?,type?) {
     if (identifier) {
       this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
         InteractSubtype.DELETE_CLICKED,
@@ -64,6 +66,7 @@ export class DownloadsTabComponent implements OnInit {
         contentId: identifier,
         isChildContent: false
       };
+      type=='project' ? contentDelete['type']=type:null
       this.selectedContents = [contentDelete];
     }
     this.telemetryGeneratorService.generatePageViewTelemetry(
@@ -220,6 +223,7 @@ export class DownloadsTabComponent implements OnInit {
           contentId: element.identifier,
           isChildContent: false
         };
+        element['type']=='project'?contentDelete['type']=element['type']:null
         this.selectedContentsInfo.totalSize += element.sizeOnDevice;
         this.selectedContents.push(contentDelete);
       }
@@ -290,35 +294,36 @@ export class DownloadsTabComponent implements OnInit {
   }
 
   navigateToDetailsPage(content) {
-    const objectType = this.telemetryGeneratorService.isCollection(content.mimeType) ? content.contentData.contentType
-      : ContentType.RESOURCE;
+    if (content.type == 'project') {
+      this.navigateToProjectDetails(content)
+      return
+    }
     const corRelationList: Array<CorrelationData> = [{
         id: CorReleationDataType.DOWNLOADS,
         type: CorReleationDataType.SECTION
       }];
-    const telemetryObject: TelemetryObject = new TelemetryObject(content.identifier, objectType, content.contentData.pkgVersion);
     this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
       InteractSubtype.CONTENT_CLICKED,
       Environment.DOWNLOADS,
       PageId.DOWNLOADS,
-      telemetryObject,
+      ContentUtil.getTelemetryObject(content),
       undefined,
       ContentUtil.generateRollUp(undefined, content.identifier),
       corRelationList);
-    if (!this.selectedContents.length) {
-      if (content.contentData && content.contentData.contentType === ContentType.COURSE) {
-        this.router.navigate([RouterLinks.ENROLLED_COURSE_DETAILS], {
-          state: { content }
-        });
-      } else if (content.mimeType === MimeType.COLLECTION) {
-        this.router.navigate([RouterLinks.COLLECTION_DETAIL_ETB], {
-          state: { content }
-        });
-      } else {
-        this.router.navigate([RouterLinks.CONTENT_DETAILS], {
-          state: { content }
-        });
-      }
-    }
+    this.navService.navigateToDetailPage(
+      content, { content }
+    );
+  }
+
+  navigateToProjectDetails(project) {
+     const selectedFilter = project.isAPrivateProgram==false ? 'assignedToMe' : 'createdByMe';
+     this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.DETAILS}`], {
+       queryParams: {
+         projectId: project._id,
+         programId: project.programId,
+         solutionId: project.solutionId,
+         type: selectedFilter,
+       },
+     });
   }
 }
diff --git a/src/app/enrolled-course-details-page/course.interface.ts b/src/app/enrolled-course-details-page/course.interface.ts
index 9f14d73ae..6476e7d97 100644
--- a/src/app/enrolled-course-details-page/course.interface.ts
+++ b/src/app/enrolled-course-details-page/course.interface.ts
@@ -9,4 +9,6 @@ export interface EnrollCourse {
     telemetryObject?: TelemetryObject;
     objRollup?: Rollup;
     corRelationList?: Array<CorrelationData>;
+    channel?: string;
+    userConsent?: string;
 }
diff --git a/src/app/enrolled-course-details-page/enrolled-course-details-page.html b/src/app/enrolled-course-details-page/enrolled-course-details-page.html
index e1fa2c98c..ebe941487 100644
--- a/src/app/enrolled-course-details-page/enrolled-course-details-page.html
+++ b/src/app/enrolled-course-details-page/enrolled-course-details-page.html
@@ -2,7 +2,9 @@
 	<div class="p-8" *ngIf="!showOfflineSection">
 		<ion-card class="card-box-shadow">
 			<ion-card-header class="custom-card-header">
-				<ion-card-title class="font-18 font-weight-900">{{course?.name || courseCardData?.courseName}}</ion-card-title>
+				<ion-card-title class="font-18 font-weight-900">
+					{{course?.name || courseCardData?.courseName}}
+				</ion-card-title>
 				<ion-card-subtitle *ngIf="courseCardData?.organisation || course" class="font-14 subtitle-color">
 					{{'CONTENT_CREATED_BY' | translate}}
 					{{!course?.organisation ? courseCardData?.content?.organisation?.join(', ') : course?.organisation}}
@@ -10,11 +12,31 @@
 				<div class="hr-border-bottom"></div>
 			</ion-card-header>
 			<ion-card-content>
-				<div *ngIf="!isAlreadyEnrolled">
+				<div *ngIf="isFromGroupFlow">
+					<add-activity-to-group [identifier]="identifier" [pageId]="pageId"></add-activity-to-group>
+					<div class="enrollment-info"
+						*ngIf="batches && course?.createdBy !== userId && (batches.length > 1 || (batches.length === 1 && !(todayDate > batches[0].enrollmentEndDate)))">
+						<ion-card-subtitle *ngIf="batchCount || enrollmentEndDate" class="font-12 margin-bottom-2">
+							<div *ngIf="batchCount">
+								<ion-icon class="information-icon" name="information-circle"></ion-icon> {{batchCount}}
+								{{'BATCHES_AVAILABLE' | translate}}
+							</div>
+							<div *ngIf="enrollmentEndDate">
+								<ion-icon class="information-icon" name="information-circle"></ion-icon>
+								{{'LAST_DATE_TO_JOIN' | translate:{'%s': enrollmentEndDate | date: 'dd/MM/yyyy'} }}
+							</div>
+							<div *ngIf="!enrollmentEndDate && batchEndDate">
+								{{'FRMELEMENTS_LBL_TRAINING_ENDS_ON' | categoryKeyTranslate : course}} {{batchEndDate | date: 'dd/MM/yyyy'}}
+								
+							</div>
+						</ion-card-subtitle>
+					</div>
+				</div>
+				<div *ngIf="!isFromGroupFlow && !isAlreadyEnrolled">
 					<div class="enrollment-info"
 						*ngIf="batches && course?.createdBy !== userId && (batches.length > 1 || (batches.length === 1 && !(todayDate > batches[0].enrollmentEndDate)))">
 						<button class="enrolled-course-card-button"
-							(click)="navigateToBatchListPage();">{{'JOIN_TRAINING' | translate}}</button>
+							(click)="navigateToBatchListPage();">{{'FRMELEMNTS_LBL_JOIN_TRAINING' | categoryKeyTranslate : course }}</button>
 						<ion-card-subtitle *ngIf="batchCount || enrollmentEndDate" class="font-12 margin-bottom-2">
 							<div *ngIf="batchCount">
 								<ion-icon class="information-icon" name="information-circle"></ion-icon> {{batchCount}}
@@ -22,59 +44,67 @@
 							</div>
 							<div *ngIf="enrollmentEndDate">
 								<ion-icon class="information-icon" name="information-circle"></ion-icon>
-								{{'LAST_DATE_TO_JOIN' | translate:{'%s': enrollmentEndDate | date} }}
+								{{'LAST_DATE_TO_JOIN' | translate:{'%s': enrollmentEndDate | date: 'dd/MM/yyyy'} }}
 							</div>
 							<div *ngIf="!enrollmentEndDate && batchEndDate">
-								{{'TRAINING_ENDS_ON' | translate}} {{batchEndDate | date}}
+								{{'FRMELEMNTS_LBL_TRAINING_ENDS_ON' | categoryKeyTranslate : course}} {{batchEndDate | date: 'dd/MM/yyyy'}}
 							</div>
 						</ion-card-subtitle>
 					</div>
 				</div>
-				<div class="sb-course-end-container"
-					*ngIf="batches && !isAlreadyEnrolled && !batches.length">
+				<div class="sb-course-end-container" *ngIf="batches && !isAlreadyEnrolled && !batches.length">
 					<p class="main-heading">
 						<strong>{{'NO_BATCHES_AVAILABLE'  | translate}}</strong>
 					</p>
-					<p class="sub-heading">{{'THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING' | translate}}</p>
+					<p class="sub-heading">{{'FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING' | categoryKeyTranslate : course }}</p>
 				</div>
 				<div class="sb-course-end-container"
-					 *ngIf="batches && !isAlreadyEnrolled && batches.length === 1 && (todayDate > batches[0].enrollmentEndDate)">
+					*ngIf="batches && !isAlreadyEnrolled && batches.length === 1 && (todayDate > batches[0].enrollmentEndDate)">
 					<p class="main-heading">
-						<strong>{{'ENROLLMENT_ENDED_ON'  | translate : {'%s': enrollmentEndDate ? (enrollmentEndDate | date) : ''} }}</strong>
+						<strong>{{'ENROLLMENT_ENDED_ON'  | translate : {'%s': enrollmentEndDate ? (enrollmentEndDate | date: 'dd/MM/yyyy') : ''} }}</strong>
 					</p>
-					<p class="sub-heading">{{'THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING' | translate}}</p>
+					<p class="sub-heading">{{'FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING' | categoryKeyTranslate : course }}</p>
 				</div>
 				<div *ngIf="isAlreadyEnrolled">
 					<div>
 						<div>
 							<div class="sb-dt-card-actions">
-								<div class="wrapper sb-btn-tile-group" *ngIf="course?.progress !==100">
+								<div class="wrapper sb-btn-tile-group"
+								    *ngIf="!isFromGroupFlow">
 									<div *ngIf="trackDownloads$ | async; let downloads">
 										<button *ngIf="downloadIdentifiers.size" [disabled]="downloads.queued.length"
 											(click)="showDownloadConfirmationAlert()" slot="icon-only"
 											class="card-button">
-											<ion-icon ios="ios-cloud-download" md="md-cloud-download"
+											<ion-icon name="cloud-download"
 												[ngClass]="(downloads.queued.length)? 'card-icons-downloadStarted': 'card-icons'">
 											</ion-icon>
 											<p class="card-text">{{'DOWNLOAD' | translate}}
 											</p>
 										</button>
-										<button *ngIf="isDownloadComplete || course?.isAvailableLocally" [disabled]="downloads.queued.length" (click)="showDeletePopup()" slot="icon-only" class="card-button">
-											<ion-icon ios="ios-trash" md="md-trash" class="card-icons-red"></ion-icon>
+										<button *ngIf="isDownloadComplete || course?.isAvailableLocally"
+												[disabled]="downloads.queued.length" (click)="showDeletePopup()"
+												slot="icon-only" class="card-button">
+											<ion-icon name="trash" class="card-icons-red"></ion-icon>
 											<p class="card-text">{{'REMOVE' | translate}}
 											</p>
 										</button>
 										<button slot="icon-only" (click)="share()" class="card-button">
-											<ion-icon ios="ios-share" md="md-share" class="card-icons"></ion-icon>
+											<ion-icon name="share" class="card-icons"></ion-icon>
 											<p class="card-text">{{'SHARE' | translate}}</p>
 										</button>
+										<accessDiscussion [fetchForumIdReq]="fetchForumIdReq" [createUserReq]="createUserReq" (forumData)="assignForumData($event)"> </accessDiscussion>
 										<div *ngIf="showUnenrollButton" class="PR16 pull-right">
 											<img class="menu-icon" (click)="showOverflowMenu($event)"
-												src="assets/imgs/menu.svg" alt="menu-icon">
+												 src="assets/imgs/menu.svg" alt="menu-icon">
 										</div>
 									</div>
+								</div>
 
+								<div *ngIf="isCourseModifiedAfterEnrolment()" class="course-modified">
+									<img src="assets/imgs/alert.svg" alt="course-modified-icon" class="alert" />
+									{{'FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON' | categoryKeyTranslate : course : {'last_updated_on_date': (course?.lastUpdatedOn | date: 'dd/MM/yyyy') } }}
 								</div>
+
 								<div *ngIf="courseCardData?.batchId">
 									<div class="sb-course-progress-container"
 										*ngIf="!showSheenAnimation && course?.progress!==100 && !batchExp">
@@ -88,9 +118,9 @@
 									</div>
 									<div class="sb-batch-end-container" *ngIf="course?.progress !== 100 && batchExp">
 										<p class="batch-end-main-heading">
-											{{'BATCHEND_MAIN_HEADING'  | translate : {'%s': batchDetails?.endDate ? (batchDetails?.endDate | date) : ''} }}
+											{{'BATCHEND_MAIN_HEADING' | categoryKeyTranslate : course : {'%s': batchDetails?.endDate ? (batchDetails?.endDate | date: 'dd/MM/yyyy') : ''} }}
 										</p>
-										<p class="batch-end-sub-heading">{{'BATCHEND_SUB_HEADING' | translate}}</p>
+										<p class="batch-end-sub-heading">{{'BATCHEND_SUB_HEADING' | categoryKeyTranslate : course }}</p>
 									</div>
 									<div *ngIf="course?.progress && course?.progress === 100"
 										class="sb-course-complete-container ion-padding">
@@ -99,7 +129,7 @@
 												alt="completed">
 										</div>
 										<div class="text-container">
-											<p><strong>{{'TRAINING_COMPLETED_SUCCESSFULLY' | translate}}</strong></p>
+											<p><strong>{{'FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY' | categoryKeyTranslate : course }}</strong></p>
 										</div>
 									</div>
 								</div>
@@ -108,35 +138,45 @@
 					</div>
 				</div>
 			</ion-card-content>
-			<div #stickyPillsRef *ngIf="!showSheenAnimation && isAlreadyEnrolled && courseCardData?.batchId && course?.progress !== 100"
+			<div #stickyPillsRef
+				*ngIf="!isFromGroupFlow && !showSheenAnimation && isAlreadyEnrolled && courseCardData?.batchId && course?.progress !== 100"
 				class="enrolled-course-container">
+				<div class="timer-info" *ngIf="batchRemaningTime && !batchExp"><div><span>{{ 'BATCH_ENDS_TEXT' | translate }}</span>&nbsp;<span>{{batchRemaningTime}}</span></div></div>
 				<ion-card class="enrolled-course-card">
 					<ion-card-content class="ion-padding-top">
-						<ion-card-title class="last-read-content padding-bottom-8">{{lastReadContentName}}
+						<ion-card-title class="last-read-content padding-bottom-8">{{nextContent?.name}}
 						</ion-card-title>
-						<button *ngIf="!showResumeBtn && childrenData?.length && lastReadContentType !== 'SelfAssess'"
-							class="enrolled-course-card-button" (click)="startContent()"><span>
+						<button
+							*ngIf="!showResumeBtn && courseHeirarchy?.children?.length && nextContent?.contentType !== 'SelfAssess'"
+							class="enrolled-course-card-button" (click)="startLearning()">
+							<span>
 								<img class="play-icon" src="assets/imgs/Play@1.5x.svg" alt="play-icon">
-								{{ 'START_COURSE_NOW' | translate }} </span></button>
-						<button *ngIf="showResumeBtn && lastReadContentType !== 'SelfAssess'"
-							class="enrolled-course-card-button"
-							(click)="resumeContent(courseCardData?.lastReadContentId)"><span>
+								{{ 'START_LEARNING' | translate }} </span>
+						</button>
+						<button *ngIf="showResumeBtn && nextContent?.contentType !== 'SelfAssess'"
+							class="enrolled-course-card-button" (click)="resumeContent()">
+							<span>
 								<img class="play-icon" src="assets/imgs/Play@1.5x.svg" alt="play-icon">
-								{{ 'CONTINUE_NOW' | translate }} </span></button>
-						<button *ngIf="lastReadContentType === 'SelfAssess'" class="enrolled-course-card-button"
-							(click)="resumeContent(courseCardData?.lastReadContentId)"><span>
+								{{ 'CONTINUE_LEARNING' | translate }} </span>
+						</button>
+						<button *ngIf="nextContent?.contentType === 'SelfAssess'" class="enrolled-course-card-button"
+							(click)="resumeContent()">
+							<span>
 								<img class="play-icon" src="assets/imgs/Play@1.5x.svg" alt="play-icon">
-								{{ 'START_ASSESSMENT' | translate }} </span></button>
+								{{ 'START_ASSESSMENT' | translate }}
+							</span>
+						</button>
 						<div *ngIf="batchDetails?.endDate && !batchExp" class="enrollment-end-date ion-padding-bottom">
 							<ion-icon name="information-circle"></ion-icon>
-							<span
-								*ngIf="!course?.certificate && lastReadContentType !== 'SelfAssess'">{{'COMPLETE_TRAINING_TO_EARN_CERTIFICATE' | translate: {'%s': batchDetails?.endDate | date} }}
+							<span *ngIf="!course?.certificate && nextContent?.contentType !== 'SelfAssess'">
+								{{'COMPLETE_TRAINING_TO_EARN_CERTIFICATE' | categoryKeyTranslate : course : {'%s': batchDetails?.endDate | date: 'dd/MM/yyyy'} }}
+							</span>
+							<span *ngIf="!course?.certificate && nextContent?.contentType === 'SelfAssess'">
+								{{'COMPLETE_ASSESSMENT_TO_EARN_CERTIFICATE' | translate: {'%s': batchDetails?.endDate | date: 'dd/MM/yyyy'} }}
 							</span>
-							<span
-								*ngIf="!course?.certificate && lastReadContentType === 'SelfAssess'">{{'COMPLETE_ASSESSMENT_TO_EARN_CERTIFICATE' | translate: {'%s': batchDetails?.endDate | date} }}
+							<span *ngIf="course?.certificate">
+								{{'FRMELEMNTS_LBL_TO_EARN_CERTIFICATE' | categoryKeyTranslate : course : {'%s': batchDetails?.endDate | date: 'dd/MM/yyyy'} }}
 							</span>
-							<span
-								*ngIf="course?.certificate">{{'TO_EARN_CERTIFICATE' | translate: {'%s': batchDetails?.endDate | date} }}</span>
 						</div>
 					</ion-card-content>
 				</ion-card>
@@ -144,16 +184,17 @@
 		</ion-card>
 
 		<ion-card class="card-box-shadow">
-			<ion-card-content *ngIf="!showSheenAnimation || (!guestUser && showSheenAnimation && isAlreadyEnrolled)" class="card-content-bottom-0 card-content-top-0">
+			<ion-card-content *ngIf="!showSheenAnimation || (!isGuestUser && showSheenAnimation && isAlreadyEnrolled)"
+				class="card-content-bottom-0 card-content-top-0">
 				<ion-segment class="d-flex" [(ngModel)]="segmentType" (ionChange)="onSegmentChange($event)">
 					<ion-segment-button value="info" class="flex-5">
-						<ion-label class="font-12 text-transform-none">{{'TRAINING_INFO' | translate}}</ion-label>
+						<ion-label class="font-12 text-transform-none">{{'FRMELEMNTS_LBL_TRAINING_INFO' | categoryKeyTranslate : course }}</ion-label>
 					</ion-segment-button>
 					<div class="hr-div">
 						<hr class="hr-height">
 					</div>
 					<ion-segment-button value="modules" class="flex-5">
-						<ion-label class="font-12 text-transform-none">{{'TRAINING_MODULES' | translate}}
+						<ion-label class="font-12 text-transform-none">{{'FRMELEMNTS_LBL_TRAINING_MODULES' | categoryKeyTranslate : course }}
 						</ion-label>
 					</ion-segment-button>
 				</ion-segment>
@@ -161,85 +202,92 @@
 		</ion-card>
 		<ion-card *ngIf="showSheenAnimation && !isAlreadyEnrolled" class="card-box-shadow p-8">
 			<ion-card-content class="card-content-bottom-0 card-content-top-0 animation-card">
-						<div class="animation-card-content">
-							<div class="skeleton-search-card">
-								<app-skeleton-item [width]="'100%'" [height]="'18px'">
-								</app-skeleton-item>
-							</div>
-							<div class="line-seperator">
-								<app-skeleton-item [width]="'2px'" [height]="'34px'">	</app-skeleton-item>
-							</div>
-							<div class="skeleton-search-card">
-								<app-skeleton-item [width]="'100%'" [height]="'18px'">	</app-skeleton-item>
-							</div>
-						</div>
-					</ion-card-content>
+				<div class="animation-card-content">
+					<div class="skeleton-search-card">
+						<app-skeleton-item [width]="'100%'" [height]="'18px'">
+						</app-skeleton-item>
+					</div>
+					<div class="line-seperator">
+						<app-skeleton-item [width]="'2px'" [height]="'34px'"> </app-skeleton-item>
+					</div>
+					<div class="skeleton-search-card">
+						<app-skeleton-item [width]="'100%'" [height]="'18px'"> </app-skeleton-item>
+					</div>
+				</div>
+			</ion-card-content>
 		</ion-card>
-		<ion-card *ngIf="(guestUser && showSheenAnimation) || (!guestUser && showSheenAnimation && !isAlreadyEnrolled)" class="card-box-shadow p-8">
+		<ion-card *ngIf="(isGuestUser && showSheenAnimation) || (!isGuestUser && showSheenAnimation && !isAlreadyEnrolled)"
+			class="card-box-shadow p-8">
 			<ion-card-content class="card-content-bottom-0 card-content-top-0 animation-bottom-card">
-						<div class="skeleton-animation-item-1">
-							<app-skeleton-item [height]="'22px'"></app-skeleton-item>
-						</div>
-						<div class="skeleton-animation-item-2">
-							<app-skeleton-item [height]="'18px'"></app-skeleton-item>
-						</div>
+				<div class="skeleton-animation-item-1">
+					<app-skeleton-item [height]="'22px'"></app-skeleton-item>
+				</div>
+				<div class="skeleton-animation-item-2">
+					<app-skeleton-item [height]="'18px'"></app-skeleton-item>
+				</div>
 				<div class="skeleton-animation-item-3">
-							<app-skeleton-item [height]="'18px'"></app-skeleton-item>
-						</div>
+					<app-skeleton-item [height]="'18px'"></app-skeleton-item>
+				</div>
 				<div class="skeleton-animation-item-4">
-							<app-skeleton-item [height]="'18px'"></app-skeleton-item>
-						</div>
+					<app-skeleton-item [height]="'18px'"></app-skeleton-item>
+				</div>
 				<div class="skeleton-animation-item-5">
-							<app-skeleton-item [height]="'18px'"></app-skeleton-item>
-						</div>
-				  <div class="skeleton-animation-item-6">
-							<app-skeleton-item [height]="'18px'"></app-skeleton-item>
-						</div>
+					<app-skeleton-item [height]="'18px'"></app-skeleton-item>
+				</div>
+				<div class="skeleton-animation-item-6">
+					<app-skeleton-item [height]="'18px'"></app-skeleton-item>
+				</div>
 				<div class="skeleton-animation-item-7">
-							<app-skeleton-item [height]="'18px'"></app-skeleton-item>
-						</div>
+					<app-skeleton-item [height]="'18px'"></app-skeleton-item>
+				</div>
 				<div class="skeleton-animation-item-8">
-							<app-skeleton-item [height]="'18px'"></app-skeleton-item>
-						</div>
-				  <div class="skeleton-animation-item-9">
-							<app-skeleton-item [height]="'18px'"></app-skeleton-item>
-						</div>
+					<app-skeleton-item [height]="'18px'"></app-skeleton-item>
+				</div>
+				<div class="skeleton-animation-item-9">
+					<app-skeleton-item [height]="'18px'"></app-skeleton-item>
+				</div>
 				<div class="skeleton-animation-item-10">
-							<app-skeleton-item [height]="'18px'"></app-skeleton-item>
-						</div>
-				</ion-card-content>
+					<app-skeleton-item [height]="'18px'"></app-skeleton-item>
+				</div>
+			</ion-card-content>
 		</ion-card>
 		<div *ngIf="isAlreadyEnrolled && showSheenAnimation">
 			<ion-card class="bg-grey" *ngFor="let i of [1, 2, 3, 4, 5, 6, 6]">
 				<ion-card-content class="card-content-bottom-0 card-content-top-0 animation-bottom-card mb-16 mt-16">
-				  <div class="skeleton-animation-item-10 mb-16">
+					<div class="skeleton-animation-item-10 mb-16">
 						<app-skeleton-item [height]="'18px'"></app-skeleton-item>
 					</div>
-				  <div class="skeleton-animation-item-11">
+					<div class="skeleton-animation-item-11">
 						<app-skeleton-item [height]="'18px'"></app-skeleton-item>
 					</div>
 				</ion-card-content>
 			</ion-card>
 
 		</div>
-		<div *ngIf="(guestUser &&!showSheenAnimation) || (!guestUser && !showSheenAnimation)" [ngSwitch]="segmentType">
+		<div *ngIf="(isGuestUser &&!showSheenAnimation) || (!isGuestUser && !showSheenAnimation)" [ngSwitch]="segmentType">
 			<ion-card *ngSwitchCase="'info'">
 				<ion-card-content class="ion-no-padding">
 					<div class="ion-padding">
-						<div *ngIf="isCertifiedCourse" class="certificate-container">
+						<div class="certificate-container" *ngIf="isAlreadyEnrolled && ((isCertifiedCourse && certificateDescription) || !isCertifiedCourse)">
 							<div class="certificate-icon">
 								<img class="certificate-icon" src="assets/imgs/Certificate icon.svg"
 									alt="certificate-icon">
 							</div>
-							<div class="certificate-text">
+							<div class="certificate-text" *ngIf="isCertifiedCourse && certificateDescription">
 								<ion-card-title class="font-10 certified-section-color font-weight-900">
 									{{'CERTIFIED_TRAINING' | translate}}
 								</ion-card-title>
 							</div>
+							<div class="certificate-text" *ngIf="!isCertifiedCourse">
+								<ion-card-title class="font-10 certified-section-color font-weight-900">
+									{{'FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE' | categoryKeyTranslate : course }}
+								</ion-card-title>
+							</div>
 						</div>
-						<div class="ion-margin-bottom">
+						<label *ngIf="isAlreadyEnrolled && isCertifiedCourse && certificateDescription">{{certificateDescription}}</label>
+						<div class="ion-margin-bottom mt-8">
 							<ion-card-title class="font-12 subtitle-color label-margin-bottom">
-								<strong>{{'TRAINING_IS_RELEVANT_TO_TEACHERS'| translate}}</strong>:
+								<strong>{{'FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS' | categoryKeyTranslate : course }}</strong>:
 							</ion-card-title>
 							<p *ngIf="course?.gradeLevel">{{'CLASS' | translate}} : {{course?.gradeLevel}}</p>
 							<p *ngIf="course?.subject">{{'SUBJECT' | translate}}: {{course?.subject}}</p>
@@ -247,156 +295,81 @@
 						</div>
 						<div class="ion-margin-bottom">
 							<ion-card-title class="font-12 subtitle-color label-margin-bottom">
-								<strong>{{'TRAINING_DETAILS' | translate}}</strong>
+								<strong>{{'FRMELEMNTS_LBL_TRAINING_DETAILS' | categoryKeyTranslate : course }}</strong>
 							</ion-card-title>
-							<p *ngIf="batchEndDate">{{'TRAINING_END_DATE' | translate }} : {{ batchEndDate | date}}</p>
+							<p *ngIf="batchEndDate">{{'FRMELEMNTS_LBL_TRAINING_END_DATE' | categoryKeyTranslate : course }} : {{ batchEndDate | date: 'dd/MM/yyyy'}}</p>
 						</div>
 						<div>
 							<p>{{course?.description}}</p>
 						</div>
 					</div>
-					<!--credits and license info-->
-					<div *ngIf="course?.author || course?.organisation || course?.license || course?.copyright">
-						<div class="hr-border-bottom"></div>
-						<div>
-							<div class="ion-padding-start">
-								<div class="font-14 view-credits" (click)="showLicensce()">
-									<span><strong>{{'CREDITS_LICENCE_INFO' | translate}}</strong></span>
-									<span *ngIf="showCredits">
-										<ion-icon name="ios-arrow-up"></ion-icon>
-									</span>
-									<span *ngIf="!showCredits">
-										<ion-icon name="ios-arrow-down"></ion-icon>
-									</span>
-								</div>
+				</ion-card-content>
+			</ion-card>
+			<ion-card *ngSwitchCase="'info'">
+				<ion-card-content class="ion-no-padding" *ngIf="!isGuestUser && isAlreadyEnrolled && dataSharingStatus">
+					<div>
+						<div class="ion-padding">
+							<div class="font-14-new view-credits" (click)="expandDataSettings()">
+								<span><strong>{{'FRMELEMNTS_LBL_DATA_SETTINGS' | translate}}</strong></span>
+								<span *ngIf="isDataShare">
+									<ion-icon name="arrow-up"></ion-icon>
+								</span>
+								<span *ngIf="!isDataShare">
+									<ion-icon name="arrow-down"></ion-icon>
+								</span>
 							</div>
-							<div *ngIf="showCredits" class="showLicensce">
-								<div class="ion-padding">
-									<div *ngIf="course?.author">
-										<ion-card-title class="font-12 subtitle-color label-margin-bottom">
-											<strong>{{'AUTHOR' | translate}}</strong>:
-										</ion-card-title>
-										<p>{{course?.author}}</p>
-									</div>
-									<div *ngIf="course?.organisation">
-										<ion-card-title class="font-12 subtitle-color label-margin-bottom">
-											<strong>{{ 'PUBLISHED_BY' | translate:{'%s': appName} }}</strong>:
-										</ion-card-title>
-										<p>{{course?.organisation}} </p>
-									</div>
-									<div *ngIf="course?.contributors || course?.creators || course?.attributions">
-										<ion-card-title class="font-12 subtitle-color label-margin-bottom">
-											<strong>{{ 'ATTRIBUTIONS' | translate }}</strong>:
-										</ion-card-title>
-										<p>{{mergeProperties(['attributions', 'contributors', 'creators'])}}</p>
-									</div>
-									<div *ngIf="course?.license && !licenseDetails">
-										<ion-card-title class="font-12 subtitle-color label-margin-bottom">
-											<strong>{{ 'LICENSE' | translate }}</strong>:
-										</ion-card-title>
-										<p>{{course?.license}}</p>
-									</div>
-									<div *ngIf="licenseDetails" class="ion-padding-bottom">
-										<ion-card-title class="font-12 subtitle-color label-margin-bottom">
-											<strong>{{ 'LICENSE' | translate }}</strong>:
-										</ion-card-title>
-										<div>{{licenseDetails.name}}</div>
-										<div>{{licenseDetails.description}}</div>
-										<span (click)="openBrowser(licenseDetails.url)"
-											class="sb-url">{{licenseDetails.url}}</span>
-									</div>
-									<div *ngIf="course?.copyright">
-
-										<ion-card-title class="font-12 subtitle-color label-margin-bottom">
-											<strong>{{ 'COPYRIGHT' | translate }}</strong>:
-										</ion-card-title>
-										<p>{{course?.copyright}}{{course?.copyrightYear ? ", " + course?.copyrightYear : ""}}
-										</p>
-									</div>
-								</div>
-								<!--training derived from section starts-->
-								<div class="origin-data" *ngIf="course?.originData">
-									<div class="font-14 traning-derived-label-background ion-padding-bottom">
-										<span><strong>{{'CONTENT_DERIVED_FROM' | translate}}</strong></span>
-									</div>
-									<div class="ion-padding">
-										<div *ngIf="course?.originData.name">
-											<ion-card-title class="font-12 subtitle-color label-margin-bottom">
-												<strong> {{'ORIGINAL_CONTENT' | translate}}</strong>:
-											</ion-card-title>
-											<p>{{course?.originData.name}}</p>
-										</div>
-										<div *ngIf="course?.originData.author">
-
-											<ion-card-title class="font-12 subtitle-color label-margin-bottom">
-												<strong>{{ 'ORIGINAL_AUTHOR' | translate }}</strong>:
-											</ion-card-title>
-											<p>{{course?.originData.author}}</p>
-										</div>
-
-										<div *ngIf="course?.originData.license">
-											<ion-card-title class="font-12 subtitle-color label-margin-bottom">
-												<strong>{{ 'LICENSE' | translate }}</strong>:
-											</ion-card-title>
-											<p>{{course?.originData.license}}</p>
-										</div>
+							<div *ngIf="isDataShare" class="showLicensce data-share-header">
+								<ion-card-title class="data-share-info" *ngIf="dataSharingStatus=='ACTIVE'">{{'FRMELEMNTS_LBL_DATA_SHARING_ON' | translate}}</ion-card-title>
+								<ion-card-title class="data-share-info" *ngIf="dataSharingStatus=='REVOKED'">{{'FRMELEMNTS_LBL_DATA_SHARING_OFF' | translate}}</ion-card-title>
+								<p *ngIf="dataSharingStatus=='ACTIVE'">{{'FRMELEMNTS_LBL_DATA_SHARING_ON_INFO' | translate}}</p>
+								<p *ngIf="dataSharingStatus=='REVOKED'">{{'FRMELEMNTS_LBL_DATA_SHARING_OFF_INFO' | translate}}</p>
+								<p>{{'DFLT_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON' | translate:{'last_updated_on_date': lastUpdateOn | date: 'dd/MM/yyyy'} }}</p>
+								<div class="edit-setting" (click)="editDataSettings()" *ngIf="!showShareData">{{'FRMELEMNTS_BTN_EDIT_SETTING' | translate}}</div>
+								<div class="edit-setting" (click)="editDataSettings()" *ngIf="showShareData">{{'FRMELEMNTS_BTN_CLOSE' | translate}}</div>
+							</div>
+						</div>
+						<div *ngIf="isDataShare && showShareData" class="showLicensce">
+							<div class="ion-padding">
+								<div class="hr-border-bottom-share"></div>
+								<div>
+									<ion-card-title class="font-12 subtitle-color label-margin-bottom" style="padding-top: 10px;">
+										<strong>{{'FRMELEMNTS_LBL_UPDATE_DATA_SETTINGS' | translate}}</strong>
+									</ion-card-title>
+									<ion-list lines="none" style="margin-left: -4px;">
+										<ion-radio-group [value]="dataSharingStatus">
+										  <ion-item class="ds-item" style="margin-bottom: -18px; margin-top: -18px; opacity: 1;" [disabled]="true">
+											<ion-label class="ds-m0">{{'FRMELEMNTS_LBL_SHARE_PROFILE_INFORMATION' | translate}}</ion-label>
+											<ion-radio class="ds-m0" [value]="'REVOKED'" slot="start" ></ion-radio>
+										  </ion-item>
 
-										<div *ngIf="course?.originData.organisation">
-											<ion-card-title class="font-12 subtitle-color label-margin-bottom">
-												<strong>{{ 'PUBLISHED_BY' | translate:{'%s': appName} }}</strong>:
-											</ion-card-title>
-											<p>{{course?.originData.organisation[0]}}</p>
-										</div>
+										  <ion-item class="ds-item" style="opacity: 1;" [disabled]="true">
+											<ion-label class="ds-m0">{{'FRMELEMNTS_LBL_DONOT_SHARE_PROFILE_INFO' |translate}}</ion-label>
+											<ion-radio class="ds-m0" [value]="'ACTIVE'" slot="start" ></ion-radio>
+										  </ion-item>
+										</ion-radio-group>
+									  </ion-list>
+									  <div class="ion-text-center">
+										<button class="save-changes" (click)="saveChanges()">{{'SAVE' | translate}}</button>
 									</div>
 								</div>
-								<!-- / training derived from section ends -->
 							</div>
 						</div>
 					</div>
-					<!--/credits and license info-->
 				</ion-card-content>
 			</ion-card>
+			<!--credits and license info-->
+			<div class="cd-license-card" *ngSwitchCase="'info'">
+				<app-license-card-component [content]="course"
+											[licenseDetails]="licenseDetails"
+											[appName]="appName"
+											[objRollup]="objRollup"
+											[corRelationList]="corRelationList"
+											[pageId]="pageId"></app-license-card-component>
+			</div>
 			<div *ngSwitchCase="'modules'">
-				<div *ngFor="let item of childrenData; let i = index;">
-					<ion-card class="sb-accordian-card">
-						<ion-grid class="sb-accordian-header">
-							<ion-row (click)="toggleGroup(i , item)" *ngIf="item?.children">
-								<ion-col size="11">
-									<div class="sb-topic-text" [ngClass]="{'fontBold' : isGroupShown(i)}">
-										<ion-icon *ngIf="isAlreadyEnrolled && courseCompletionData[item.identifier]"
-											class="sb-checkmark-icon" name="md-checkmark-circle"></ion-icon>
-										{{item?.contentData.name}}
-									</div>
-								</ion-col>
-								<ion-col size="1" *ngIf="!isGroupShown(i)" class="dd-icon">
-									<div>
-										<ion-icon name="ios-arrow-down" class="sb-accordian-arrow"></ion-icon>
-									</div>
-								</ion-col>
-								<ion-col size="1" *ngIf="isGroupShown(i)" class="dd-icon">
-									<div>
-										<ion-icon name="ios-arrow-up" class="sb-accordian-arrow fontBold"></ion-icon>
-									</div>
-								</ion-col>
-							</ion-row>
-						</ion-grid>
-						<div class="sb-hidden-content"
-							*ngIf="isGroupShown(i) && (item?.children && item?.children?.length)">
-							<div class="box-align" *ngFor="let firstChildren of item?.children; let j = index;">
-								<div class="sb-topics-container sb-topics-container-ftue">
-									<app-collection-child [childData]="firstChildren" [index]="j" [depth]="depth"
-										[activeMimeTypeFilter]="activeMimeTypeFilter" [isTextbookTocPage]="false"
-										[corRelationList]="corRelationList" [isDepthChild]="isDepthChild"
-										[breadCrumb]="breadCrumb" [rootUnitId]="item.identifier" [bookID]="identifier"
-										[updatedCourseCardData]="updatedCourseCardData" [batch]="batchDetails"
-										[isEnrolled]="isAlreadyEnrolled" [fromCourseToc]="true"
-										[isBatchNotStarted]="isBatchNotStarted" [contentStatusData]="contentStatusData">
-									</app-collection-child>
-								</div>
-							</div>
-						</div>
-					</ion-card>
-				</div>
+				<sb-toc-curriculum [isChapterListing]="true" [tocData]="courseHeirarchy"
+					(tocCardClick)="onTocCardClick($event)" shadowColor="#d2eadd" progressColor="#008840">
+				</sb-toc-curriculum>
 			</div>
 		</div>
 	</div>
@@ -412,14 +385,10 @@ <h6 class="offline-header">
 	</div>
 </ion-content>
 
-	<ng-container *ngIf="trackDownloads$ | async; let downloads">
-		<app-sb-download-popup *ngIf="downloads.queued.length"
-			(cancelDownloadEmit)="cancelDownload($event)" 
-			[currentCount]="downloads.completed.length"
-			[queuedIdentifiers]="(downloads.queued.length+downloads.completed.length)" 
-			[downloadSize]="downloadSize"
-			[collectionName]="course?.name" 
-			[showDownload]="true"
-			[showPopover]="showCollapsedPopup">
-		</app-sb-download-popup>
-	</ng-container>
\ No newline at end of file
+<ng-container *ngIf="trackDownloads$ | async; let downloads">
+	<app-sb-download-popup *ngIf="downloads.queued.length" (cancelDownloadEmit)="cancelDownload($event)"
+		[currentCount]="downloads.completed.length"
+		[queuedIdentifiers]="(downloads.queued.length+downloads.completed.length)" [downloadSize]="downloadSize"
+		[collectionName]="course?.name" [showDownload]="true" [showPopover]="showCollapsedPopup">
+	</app-sb-download-popup>
+</ng-container>
diff --git a/src/app/enrolled-course-details-page/enrolled-course-details-page.module.ts b/src/app/enrolled-course-details-page/enrolled-course-details-page.module.ts
index a8f23bbf7..b5b7527a4 100644
--- a/src/app/enrolled-course-details-page/enrolled-course-details-page.module.ts
+++ b/src/app/enrolled-course-details-page/enrolled-course-details-page.module.ts
@@ -1,18 +1,17 @@
-import { NgModule } from '@angular/core';
 import { CommonModule, DatePipe } from '@angular/common';
+import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { Routes, RouterModule } from '@angular/router';
-
-import { IonicModule } from '@ionic/angular';
-
-import { EnrolledCourseDetailsPage } from './enrolled-course-details-page';
+import { RouterModule, Routes } from '@angular/router';
 import { DirectivesModule } from '@app/directives/directives.module';
 import { PipesModule } from '@app/pipes/pipes.module';
+import { IonicModule } from '@ionic/angular';
 import { TranslateModule } from '@ngx-translate/core';
-import { ComponentsModule } from '../components/components.module';
-import { ContentActionsComponent } from '../components';
-import { IonicRatingModule, RatingComponent } from 'ionic4-rating';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
+import { IonicRatingModule } from 'ionic4-rating';
 import { TextbookTocService } from '../collection-detail-etb/textbook-toc-service';
+import { ContentActionsComponent } from '../components';
+import { ComponentsModule } from '../components/components.module';
+import { EnrolledCourseDetailsPage } from './enrolled-course-details-page';
 
 const routes: Routes = [
   {
@@ -33,6 +32,7 @@ const routes: Routes = [
     PipesModule,
     DirectivesModule,
     ComponentsModule,
+    CommonConsumptionModule,
   ],
   declarations: [EnrolledCourseDetailsPage],
   entryComponents: [ContentActionsComponent],
diff --git a/src/app/enrolled-course-details-page/enrolled-course-details-page.scss b/src/app/enrolled-course-details-page/enrolled-course-details-page.scss
index e3d0eb895..40e177d98 100644
--- a/src/app/enrolled-course-details-page/enrolled-course-details-page.scss
+++ b/src/app/enrolled-course-details-page/enrolled-course-details-page.scss
@@ -1,10 +1,12 @@
 @import 'src/assets/styles/_custom-mixins';
 @import "src/assets/styles/variables";
+@import "src/assets/styles/_variables.scss";
 
 
 :host {
     ion-card{
       margin: 0 0 10px 0 !important;
+      --ion-item-background: white;
     }
     .z-index-0 {
       z-index: 0 !important;
@@ -17,7 +19,7 @@
       border-radius: 0 !important;
     }
     .sb-url {
-      color: #0a55a0;
+      color: map-get($colors, bright_blue_a0);
       font-size: 14px;
       text-decoration: underline;
     }
@@ -28,7 +30,7 @@
         color: darkgrey;
     }
     .ion-ios-checkmark-circle:before {
-        color: #008000;
+        color: map-get($colors, office_green);
         margin-right: 4px;
         margin-left: 0px;
     }
@@ -36,10 +38,10 @@
         padding: 7px 0px 0px 4px;
     }
     .certified-section-color{
-      color: #08539f;
+      color: map-get($colors, bright_blue_9f);
     }
     .certified-training-section{
-        background-color: #e5edf5;
+        background-color: map-get($colors, pale_blue);
         padding: 8px;
     }
     .font-10{
@@ -65,6 +67,7 @@
     }
     .child-item{
         --padding-start: 0 !important;
+        @include padding(null, null, null, 0 !important)
     }
     .text-transform-none{
         text-transform: none !important;
@@ -76,7 +79,7 @@
       padding-top: 0px !important;
   }
     .subtitle-color{
-        color: map-get($colors, textGrey);
+        color: map-get($colors, granite_gray);
     }
     .enrolled-course-container {
       &.sticky {
@@ -87,7 +90,7 @@
       }
     }
     .traning-derived-label-background {
-      background-color: #f2f2f2;
+      background-color: map-get($colors, white_f2);
       padding: 8px 0px 8px 15px;
     }
 
@@ -95,10 +98,8 @@
         font-size: 14px;
     }
     .enrolled-course-card{
-        background-color:#d2eadd;
-    }
-    ion-card{
-        --ion-item-background: white;
+        background-color: map-get($colors, pale_green);
+        margin-bottom: 0 !important;
     }
     .play-icon{
        display: inline;
@@ -107,21 +108,26 @@
        margin-right: 6.43px;
     }
     ion-content{
-        --ion-background-color: #F9F9F8;
+        --ion-background-color: white;
     }
     .hr-border-bottom {
         box-sizing: border-box;
-        height: 1px;	
-        width: 100%;	
-        border: 0.5px solid #CCCCCC;
+        height: 1px;
+        width: 100%;
+        border: 0.5px solid map-get($colors, medium_gray);
         margin-top: 9px;
         margin-bottom: 10px;
     }
+    .hr-border-bottom-share {
+      box-sizing: border-box;
+      height: 1px;
+      border: 1px solid #E9DED3;
+      margin-top: 8px;
+  }
     hr {
-        border:0.5px solid #999999;
+        border:0.5px solid $gray-300;
     }
     .blurbackground {
-        // background-color: gray !important;
         .progress-inner-primary {
             background-color: gray !important;
         }
@@ -130,7 +136,7 @@
         }
     }
     .loading-backdrop {
-        background-color: #ffffff;
+        background-color: map-get($colors, white);
         height: 100%;
         z-index: 1000;
         opacity: 1 !important;
@@ -149,13 +155,10 @@
             width: 100%;
             bottom: 0;
             padding-bottom: 16px;
-        } 
-    }
-    .child-item {
-        @include padding(null, null, null, 0 !important)
+        }
     }
     .scroll-content {
-        margin-bottom: 0px !important;
+        margin-bottom: 0 !important;
     }
 
     .toolbar-p-16{
@@ -173,14 +176,14 @@
     .list-mb-48{
         margin-bottom: ($base-block-space * 6) !important;
     }
-    
+
     .sc-ion-buttons-md-s ion-button {
         height: 20px;
         font-size: 10px;
     }
     .label-margin-bottom{
       margin-bottom: 3px !important;
-    } 
+    }
     .sb-accordian-header{
       padding: 12px 14px;
       .dd-icon {
@@ -188,7 +191,7 @@
         bottom: 3px;
       }
       .sb-checkmark-icon{
-        color: #008000;
+        color: map-get($colors, office_green);
       }
     }
     .custom-card-header{
@@ -206,19 +209,18 @@
       }
     }
     .enrolled-course-card-button{
-        background-color: #008840;
+        background-color: $green;
         border: none;
         color: white;
         text-align: center;
         text-decoration: none;
         display: inline-block;
         font-size: 16px;
-        margin: 4px 0px;
         cursor: pointer;
         outline: none;
-        margin-bottom: 8px;
+        margin: 4px 0 8px;
         width: 100%;
-        padding: 16px 0px 16px 0px;
+        padding: 16px 0 16px 0;
     }
     .segment-button-checked{
       ion-label.sc-ion-label-md-h.sc-ion-label-md-s.md.hydrated{
@@ -226,11 +228,11 @@
       }
     }
     .border-right{
-      border-right: 1.5px solid #e6e6e6;
+      border-right: 1.5px solid map-get($colors, white_e6);
       margin: 0px 0px 10px 11px;
     }
     .hr-div {
-      padding: 0px 10px 0px 10px;       
+      padding: 0px 10px 0px 10px;
     }
     hr.hr-height {
       height: 32px;
@@ -238,7 +240,7 @@
     .segment-button-indicator{
       width: 84% !important;
       margin-right: 8% !important;
-    }  
+    }
     .info-icon-pr-8 {
       padding-right: 8px !important;
     }
@@ -247,7 +249,7 @@
     padding-right: 5%;
   }
   .sb-hidden-content{
-    background-color: #E5EDF5 !important;
+    background-color: map-get($colors, pale_blue) !important;
     // height: 34.15% !important;
     width: 100% !important;
     border-radius: 0 0 2px 2px !important;
@@ -258,8 +260,8 @@
     // height: 6.1% !important;
     width: 100% !important;
     border-radius: 2px !important;
-    background-color: #FFFFFF !important;
-    box-shadow: 0px 5px 5px 3px #ddd;
+    background-color: map-get($colors, white) !important;
+    box-shadow: 0px 5px 5px 3px map-get($colors, light_gray_dd);
   }
   .sb-topic-text {
       // padding-top: 5px;
@@ -273,53 +275,30 @@
     font-size: 14px;
     // line-height: 20px;
   }
-  .view-credits{
-    margin-bottom: 8px;
-    span{
-    color: #024F9D;
-    ion-icon{
-      padding: 0 0 4px 8px;
-      vertical-align: middle;
-      font-size: 18px;
-      margin-right: 2%;
-      float: right;
-    }
-    }
-    
-  }
-  .showLicensce{
-    p{
-     margin-bottom: 16px;
-    }
-  }
 
   .certificate-container {
     display: inline-flex;
     flex-wrap: nowrap;
     align-items:center;
-    background-color: #E5EDF6;
+    background-color: map-get($colors, pale_blue_f6);
     padding: 4px;
-    margin-bottom: 12px;
     .certificate-icon {
       padding-right: 5px;
     }
   }
   .sc-ion-segment-md-h{
-    --color-checked : #024f9d;
+    --color-checked : #{$blue};
     font-weight: bold;
-    --color: #467fb8;
+    --color: #{map-get($colors, cornflower_blue)};
   }
   .wrapper {
     grid-template-columns: 100px 100px 100px auto;
     margin-bottom: -8px;
-  }  
-  .wrapper {
     border-radius: 5px;
-  }
-  
-  .wrapper > div {
-    border-radius: 5px;
-    padding: 1em 0;
+    & > div {
+      border-radius: 5px;
+      padding: 1em 0;
+    }
   }
 
   .pull-right{
@@ -329,13 +308,12 @@
     display: block;
     width: 100%;
     height: 16px;
-    width: 4px;
     margin-top: 18px;
     float: right;
   }
   .card-icons {
     font-size: 30px;
-    color: #024F9D;
+    color: $blue;
   }
   .card-icons-downloadStarted {
     font-size: 30px;
@@ -346,8 +324,9 @@
     color:map-get($colors , danger);
   }
   .sb-course-complete-container {
+    white-space: nowrap;
     width: 100%;
-    background-color: #BFE1CF;
+    background-color: map-get($colors, light_grayish_green);
     @include padding(8px);
     .img-container{
       width: 20%;
@@ -356,7 +335,7 @@
     }
     .text-container{
       color: map-get($colors, office_green);
-      font-family: "Noto Sans";
+      font-family: "Noto Sans", sans-serif;
       font-size: 14px !important;
       font-weight: bold;
       width: 80%;
@@ -364,13 +343,14 @@
       display: inline-block;
       padding-left: 10px;
       @include padding(0px 0px 0px 11px);
+      white-space: normal;
     }
   }
   .card-text{
     height: 18px;
     width: 63px;
-    color: map-get($colors, textGrey);
-    font-family: "Noto Sans";
+    color: map-get($colors, granite_gray);
+    font-family: "Noto Sans", sans-serif;
     font-size: 13px !important;
     line-height: 20px;
     text-align: center;
@@ -391,11 +371,11 @@
   .margin-bottom-16{
     margin-bottom: 16px;
   }
-  
+
   .sb-course-progress-container{
-      background-color: #E5EDF5;
+      background-color: map-get($colors, pale_blue);
       padding: 8px;
-      height: 70px;	
+      height: 70px;
       width: auto;
   }
 
@@ -411,25 +391,25 @@
   }
 
   .sb-batch-end-container{
-    background-color: #FBE7E0;
+    background-color: map-get($colors, pale_red);
     padding: 8px 16px;
-    height: auto;	
+    height: auto;
     width: auto;
     .batch-end-main-heading{
       font-size: 12px !important;
-      color: #E55A28;
+      color: $orange;
       font-weight: bold;
     }
     .batch-end-sub-heading{
-      color: #333333;
-      font-family: "Noto Sans";
+      color: map-get($colors, primary_black);
+      font-family: "Noto Sans", sans-serif;
       font-size: 12px !important;
     }
   }
   .enrollment-end-date{
     font-size: 12px;
-    color: #333333;
-    font-family: "Noto Sans";
+    color: map-get($colors, primary_black);
+    font-family: "Noto Sans", sans-serif;
     ion-icon{
       position: relative;
       top: 2px;
@@ -439,17 +419,17 @@
     padding-left: 5em !important;
   }
   .sb-course-end-container{
-    background-color: #FBE7E0;
+    background-color: map-get($colors, pale_red);
     padding: 10px;
-    height: 70px;	
+    height: 70px;
     width: auto;
     .main-heading{
       font-size: 14px !important;
-      color: #E55A28;
+      color: $orange;
     }
     .sub-heading{
-      color: #333333;
-      font-family: "Noto Sans";
+      color: map-get($colors, primary_black);
+      font-family: "Noto Sans", sans-serif;
       font-size: 12px !important;
     }
 }
@@ -461,7 +441,7 @@
 
 .progress-label {
   font-size: 10px !important;
-  color: #333;
+  color: map-get($colors, primary_black);
 }
 
 ion-segment-button{
@@ -479,7 +459,7 @@ ion-segment-button{
 }
 
 .card-box-shadow {
-  box-shadow: 0px 5px 5px 3px #ddd;
+  box-shadow: 0px 5px 5px 3px map-get($colors, light_gray_dd);
 }
 
 .animation-card{
@@ -522,11 +502,85 @@ ion-segment-button{
 }
 
 .bg-grey {
-  background: #f0f0f0 !important;
+  background: map-get($colors, white_f0) !important;
 }
 
 .card-button[disabled]{
   opacity: 0.7 !important;
   pointer-events: none;
   cursor: default;
-}
\ No newline at end of file
+}
+
+.course-modified {
+  padding: 16px;
+  margin-bottom: 16px;
+  box-sizing: border-box;
+  border: 1px solid map-get($colors, dark_orange);
+  border-radius: 2px;
+  background-color: map-get($colors, ligth_yellow);
+  color: $gray-800;
+  font-size: 12px;
+
+  .alert {
+    width: 24px;
+    height: 24px;
+    display: inline-block;
+    margin-right: 8px;
+  }
+}
+
+.edit-setting{
+  float: right;
+  padding: 12px;
+  color: $blue;
+  font-weight: bold;
+}
+
+.save-changes{
+  color: map-get($colors, white);
+  background-color: $blue;
+  padding: 12px 45px;
+  outline: none;
+  border: none;
+  text-transform: uppercase;
+  font-weight: bold;
+  font-size: 12px;
+}
+.ds-m0 {
+  color: map-get($colors, primary_black);
+  font-family: "Noto Sans", sans-serif;
+  font-size: 12px;
+  letter-spacing: 0;
+  line-height: 20px;
+}
+
+.ds-item{
+  --padding-start: 0px;
+}
+ion-radio{
+  margin-right: 10px !important;
+}
+.font-14-new{
+  font-size: 16px !important;
+  margin-top: 8px;
+}
+.data-share-info{
+  padding: 5px;
+  margin-left: -6px;
+  font-size: 15px;
+  text-transform: uppercase;
+}
+
+.data-share-header{
+  margin-left: 2px;
+}
+.timer-info{
+  text-align: center;
+  width: 100%;
+  font-size: 1.2rem;
+  font-weight: 600;
+  color: indianred;
+  padding: 0 0 10px;
+}
+
+
diff --git a/src/app/enrolled-course-details-page/enrolled-course-details-page.spec.data.ts b/src/app/enrolled-course-details-page/enrolled-course-details-page.spec.data.ts
index 1649b04ec..0c1e2afdf 100644
--- a/src/app/enrolled-course-details-page/enrolled-course-details-page.spec.data.ts
+++ b/src/app/enrolled-course-details-page/enrolled-course-details-page.spec.data.ts
@@ -1,210 +1,213 @@
 import { Navigation } from '@angular/router';
 import { Content, ContentData } from 'sunbird-sdk';
+import { PageId } from '../../services';
 
 export const mockEnrolledData: Partial<Navigation> = {
-    id: 7,
-    initialUrl: '',
-    trigger: 'imperative',
-    previousNavigation: null,
-    extras: {
-        state: {
-            content: {
-                ownershipType: [
-                    'createdBy'
-                ],
-                copyright: 'R2.1.0',
-                subject: 'Biology',
-                channel: '0127870805901967364',
-                isAvailableLocally: false,
-                downloadUrl: 'https:license-check-course_1576128983035_do_212911645382959104165_2.0_spine.ecar',
-                organisation: [
-                    'R2.1.0'
-                ],
-                language: [
-                    'English'
-                ],
-                mimeType: 'application/vnd.ekstep.content-collection',
-                variants: {
-                    online: {
-                        size: 6861
-                    },
-                    spine: {
-                        ecarUrl: 'https://11645382959104165/license-check-course_1576128983035_do_212911645382959104165_2.0_spine.ecar',
-                        size: 94964
-                    }
-                },
-                leafNodes: [
-                    'do_212911623572824064157',
-                    'do_212911626086563840154',
-                    'do_212911626512154624155',
-                    'do_212911625643237376158',
-                    'do_212911626908123136157'
-                ],
-                objectType: 'Content',
-                gradeLevel: [
-                    'Class 3'
-                ],
-                appIcon: 'https://artifact/assessment_1569305945119.thumb.png',
-                children: [
-                    'do_212911623572824064157',
-                    'do_212911626908123136157',
-                    'do_212911626512154624155',
-                    'do_212911626086563840154',
-                    'do_212911625643237376158'
-                ],
-                appId: 'staging.diksha.portal',
-                contentEncoding: 'gzip',
-                lockKey: 'a8d2c96f-5921-4f88-861e-561046854667',
-                mimeTypesCount: '{\'application/vnd.ekstep.content-collection\:1,\'application/vnd.ekstep.ecml-archive\:5}',
-                totalCompressedSize: 72698,
-                contentType: 'Course',
-                identifier: 'do_212911645382959104165',
-                audience: [
-                    'Learner'
-                ],
-                visibility: 'Default',
-                toc_url: 'https://artifact/do_212911645382959104165_toc.json',
-                contentTypesCount: '{\'CourseUnit\:1,\'Resource\:5}',
-                consumerId: 'a9cb3a83-a164-4bf0-aa49-b834cebf1c07',
-                childNodes: [
-                    'do_212911623572824064157',
-                    'do_212911626086563840154',
-                    'do_212911626512154624155',
-                    'do_2129116460130713601733',
-                    'do_212911625643237376158',
-                    'do_212911626908123136157'
-                ],
-                batchId: 'SAMPLE_BATCH'
-            }
-        }
+  id: 7,
+  initialUrl: '',
+  trigger: 'imperative',
+  previousNavigation: null,
+  extras: {
+    state: {
+      source: PageId.GROUP_DETAIL,
+      content: {
+        ownershipType: [
+          'createdBy'
+        ],
+        copyright: 'R2.1.0',
+        subject: 'Biology',
+        channel: '0127870805901967364',
+        isAvailableLocally: false,
+        downloadUrl: 'https:license-check-course_1576128983035_do_212911645382959104165_2.0_spine.ecar',
+        organisation: [
+          'R2.1.0'
+        ],
+        language: [
+          'English'
+        ],
+        mimeType: 'application/vnd.ekstep.content-collection',
+        variants: {
+          online: {
+            size: 6861
+          },
+          spine: {
+            ecarUrl: 'https://11645382959104165/license-check-course_1576128983035_do_212911645382959104165_2.0_spine.ecar',
+            size: 94964
+          }
+        },
+        leafNodes: [
+          'do_212911623572824064157',
+          'do_212911626086563840154',
+          'do_212911626512154624155',
+          'do_212911625643237376158',
+          'do_212911626908123136157'
+        ],
+        objectType: 'Content',
+        gradeLevel: [
+          'Class 3'
+        ],
+        appIcon: 'https://artifact/assessment_1569305945119.thumb.png',
+        children: [
+          'do_212911623572824064157',
+          'do_212911626908123136157',
+          'do_212911626512154624155',
+          'do_212911626086563840154',
+          'do_212911625643237376158'
+        ],
+        appId: 'staging.diksha.portal',
+        contentEncoding: 'gzip',
+        lockKey: 'a8d2c96f-5921-4f88-861e-561046854667',
+        mimeTypesCount: '{\'application/vnd.ekstep.content-collection\:1,\'application/vnd.ekstep.ecml-archive\:5}',
+        totalCompressedSize: 72698,
+        contentType: 'Course',
+        identifier: 'do_212911645382959104165',
+        audience: [
+          'Learner'
+        ],
+        visibility: 'Default',
+        toc_url: 'https://artifact/do_212911645382959104165_toc.json',
+        contentTypesCount: '{\'CourseUnit\:1,\'Resource\:5}',
+        consumerId: 'a9cb3a83-a164-4bf0-aa49-b834cebf1c07',
+        childNodes: [
+          'do_212911623572824064157',
+          'do_212911626086563840154',
+          'do_212911626512154624155',
+          'do_2129116460130713601733',
+          'do_212911625643237376158',
+          'do_212911626908123136157'
+        ],
+        batchId: 'SAMPLE_BATCH'
+      }
     }
+  }
 };
 
 const data: Partial<ContentData> = {
-    copyright: 'Odisha',
-    subject: 'Physics',
-    downloadUrl: 'https://ntpstagingall.blob.core.windows.net/sb-13081-2_1564037681733_do_21281258639073280011490_2.0_spine.ecar',
-    channel: '01269936129926758441',
-    organisation: 'Odisha',
-    language: [
-        'English',
-        'Kannada'
-    ],
-    variants: {
-        online: {
-            ecarUrl: 'https://ntpstagingall.blob.core.windows.net_1564037681998_do_21281258639073280011490_2.0_online.ecar',
-            size: 14437
-        },
-        spine: {
-            ecarUrl: 'https://sb-13081-2_1564037681733_do_21281258639073280011490_2.0_spine.ecar',
-            size: 136688
-        }
+  copyright: 'Odisha',
+  subject: 'Physics',
+  downloadUrl: 'https://ntpstagingall.blob.core.windows.net/sb-13081-2_1564037681733_do_21281258639073280011490_2.0_spine.ecar',
+  channel: '01269936129926758441',
+  organisation: 'Odisha',
+  language: [
+    'English',
+    'Kannada'
+  ],
+  variants: {
+    online: {
+      ecarUrl: 'https://ntpstagingall.blob.core.windows.net_1564037681998_do_21281258639073280011490_2.0_online.ecar',
+      size: 14437
     },
-    mimeType: 'application/vnd.ekstep.content-collection',
-    appIcon: 'https://ntpstagingall.thumb.jpg',
-    gradeLevel: [
-        'Class 2', 'Class 3'
-    ],
-    attributions: ['gd_1', 'gd_2'],
-    me_totalRatingsCount: 4,
-    contentEncoding: 'gzip',
-    contentType: 'Course',
-    identifier: 'do_21281258639073280011490',
-    audience: [
-        'Learner'
-    ],
-    contentTypesCount: '{\'CourseUnit\:7,\'Resource\:7}',
-    childNodes: [
-        'do_21281258639128166411497',
-        'do_212686715674877952160',
-        'do_212608790640934912148',
-        'do_21281258639126528011492',
-        'do_21281258639126528011493',
-        'do_21266836993792409612969',
-        'do_21281258639127347211494',
-        'do_21281258639127347211495',
-        'do_21281258639127347211496',
-        'do_21265698034243174413049',
-        'do_21281258639125708811491',
-        'do_212686708394631168156',
-        'do_212686673493696512119',
-        'do_2127319848127283201364'
-    ],
-    osId: 'org.ekstep.quiz.app',
-    license: 'Creative Commons Attribution (CC BY)',
-    lastPublishedOn: '2019-07-25T06:54:41.549+0000',
-    size: '136688',
-    name: 'SB-13081-2',
-    status: '',
-    origin: 'do_21281254676783104011480',
-    description: 'Enter description for Course',
-    medium: 'English',
-    createdOn: '2019-07 - 25T06: 33: 44.651+0000',
-    contentDisposition: 'inline',
-    originData: {
-        license: 'Creative Commons Attribution(CC BY)',
-        name: 'SB- 13081',
-    },
-    creator: 'Qualitrix Content Creator Cr',
-    pkgVersion: '2',
-    versionKey: '1564037680856',
-    dialcodes: [
-        'H7L1Q1'
-    ],
-    framework: 'TPD',
-    createdBy: 'ab467e6e - 1f32 - 453c - b1d8 - c6b5fa6c7b9e',
-    resourceType: 'Course',
-    licenseDetails: { description: '', name: '', url: '' },
+    spine: {
+      ecarUrl: 'https://sb-13081-2_1564037681733_do_21281258639073280011490_2.0_spine.ecar',
+      size: 136688
+    }
+  },
+  mimeType: 'application/vnd.ekstep.content-collection',
+  appIcon: 'https://ntpstagingall.thumb.jpg',
+  gradeLevel: [
+    'Class 2', 'Class 3'
+  ],
+  attributions: ['gd_1', 'gd_2'],
+  me_averageRating: 4,
+  contentEncoding: 'gzip',
+  contentType: 'Course',
+  primaryCategory: 'Course',
+  identifier: 'do_21281258639073280011490',
+  audience: [
+    'Learner'
+  ],
+  contentTypesCount: '{\'CourseUnit\:7,\'Resource\:7}',
+  childNodes: [
+    'do_21281258639128166411497',
+    'do_212686715674877952160',
+    'do_212608790640934912148',
+    'do_21281258639126528011492',
+    'do_21281258639126528011493',
+    'do_21266836993792409612969',
+    'do_21281258639127347211494',
+    'do_21281258639127347211495',
+    'do_21281258639127347211496',
+    'do_21265698034243174413049',
+    'do_21281258639125708811491',
+    'do_212686708394631168156',
+    'do_212686673493696512119',
+    'do_2127319848127283201364'
+  ],
+  osId: 'org.ekstep.quiz.app',
+  license: 'Creative Commons Attribution (CC BY)',
+  lastPublishedOn: '2019-07-25T06:54:41.549+0000',
+  size: '136688',
+  name: 'SB-13081-2',
+  status: '',
+  origin: 'do_21281254676783104011480',
+  description: 'Enter description for Course',
+  medium: 'English',
+  createdOn: '2019-07 - 25T06: 33: 44.651+0000',
+  contentDisposition: 'inline',
+  originData: {
+    license: 'Creative Commons Attribution(CC BY)',
+    name: 'SB- 13081',
+  },
+  creator: 'Qualitrix Content Creator Cr',
+  pkgVersion: '2',
+  versionKey: '1564037680856',
+  dialcodes: [
+    'H7L1Q1'
+  ],
+  framework: 'TPD',
+  createdBy: 'ab467e6e - 1f32 - 453c - b1d8 - c6b5fa6c7b9e',
+  resourceType: 'Course',
+  licenseDetails: { description: '', name: '', url: '' },
 };
 
 export const contentDetailsResponse: Content = {
-    identifier: 'do_21281258639073280011490',
-    contentData: data,
-    isUpdateAvailable: false,
-    mimeType: 'application / vnd.ekstep.content - collection',
-    basePath: '',
-    contentType: 'course',
-    isAvailableLocally: true,
-    referenceCount: 0,
-    sizeOnDevice: 0,
-    lastUsedTime: 0,
-    lastUpdatedTime: 0,
-    contentAccess: [],
-    contentFeedback: [
-        {
-            contentId: 'SAMPLE_ID',
-            rating: 4,
-            comments: 'SAMPLE_COMMANTS',
-            contentVersion: 'SAMPLE_VERSION_6'
-        }, {
-            contentId: 'SAMPLE_ID_1',
-            rating: 4,
-            comments: 'SAMPLE_COMMANTS',
-            contentVersion: 'SAMPLE_VERSION_6'
-        }
-    ],
+  identifier: 'do_21281258639073280011490',
+  contentData: data,
+  isUpdateAvailable: false,
+  mimeType: 'application / vnd.ekstep.content - collection',
+  basePath: '',
+  contentType: 'course',
+  isAvailableLocally: true,
+  referenceCount: 0,
+  sizeOnDevice: 0,
+  lastUsedTime: 0,
+  lastUpdatedTime: 0,
+  contentAccess: [],
+  contentFeedback: [
+    {
+      contentId: 'SAMPLE_ID',
+      rating: 4,
+      comments: 'SAMPLE_COMMANTS',
+      contentVersion: 'SAMPLE_VERSION_6'
+    }, {
+      contentId: 'SAMPLE_ID_1',
+      rating: 4,
+      comments: 'SAMPLE_COMMANTS',
+      contentVersion: 'SAMPLE_VERSION_6'
+    }
+  ],
 };
 
 export const mockCourseCardData = {
-    mimeTypesCount: '{\'video/webm\':1,\'application/vnd.ekstep.content-collection\':2,\'video/mp4\':1}',
-    identifier: 'do_2127509908237926401406',
-    size: 73058,
-    name: 'Today today 29',
-    status: 'Live',
-    pkgVersion: 1,
-    compatibilityLevel: 4,
-    ownedBy: '0124784842112040965',
-    resourceType: 'Course',
-    node_id: 526456,
-    batch: {
-        identifier: '0127580528849387521',
-        endDate: null,
-        createdBy: 'ab467e6e-1f32-453c-b1d8-c6b5fa6c7b9e',
-        name: '9may open batch',
-        enrollmentType: 'open',
-        startDate: '2019-05-09',
-        status: 1
-    }
+  mimeTypesCount: '{\'video/webm\':1,\'application/vnd.ekstep.content-collection\':2,\'video/mp4\':1}',
+  identifier: 'do_2127509908237926401406',
+  size: 73058,
+  name: 'Today today 29',
+  status: 'Live',
+  pkgVersion: 1,
+  compatibilityLevel: 4,
+  ownedBy: '0124784842112040965',
+  resourceType: 'Course',
+  node_id: 526456,
+  batch: {
+    identifier: '0127580528849387521',
+    endDate: null,
+    createdBy: 'ab467e6e-1f32-453c-b1d8-c6b5fa6c7b9e',
+    name: '9may open batch',
+    enrollmentType: 'open',
+    startDate: '2019-05-09',
+    status: 1
+  }
 };
 
 export const mockCourseCardData_2 = {
@@ -223,149 +226,177 @@ export const mockCourseCardData_2 = {
 };
 
 export const mockEnrolledCourses = [
-    {
-      dateTime: '2019-05-17 05:29:01.305Z',
-      lastReadContentStatus: 2,
-      contentId: 'do_2127509908237926401406',
-      courseId: 'do_091231312312',
-      progress: 50,
-      batch: {
-        identifier: '0127580528849387521',
-        endDate: null,
-        createdBy: 'ab467e6e-1f32-453c-b1d8-c6b5fa6c7b9e',
-        name: '9may open batch',
-        enrollmentType: 'open',
-        startDate: '2019-05-09',
-        status: 1
-      },
-      description: 'Enter description for Course',
-      courseLogoUrl: 'https://ntpstagingall.blob.core.windows.net' +
-          '/ntp-content-staging/content/do_2127509908237926401406/artifact/4c1dbdc7d062dd11cd5b8bf5bbd25d61_1551854311088.thumb.jpg',
-      batchId: '0127580528849387521',
-      userId: '993230e2-d9f5-44fe-8b9c-fbfe5a1a3204'
-    }
-  ];
+  {
+    dateTime: '2019-05-17 05:29:01.305Z',
+    lastReadContentStatus: 2,
+    contentId: 'do_2127509908237926401406',
+    courseId: 'do_091231312312',
+    progress: 50,
+    batch: {
+      identifier: '0127580528849387521',
+      endDate: null,
+      createdBy: 'ab467e6e-1f32-453c-b1d8-c6b5fa6c7b9e',
+      name: '9may open batch',
+      enrollmentType: 'open',
+      startDate: '2019-05-09',
+      status: 1
+    },
+    description: 'Enter description for Course',
+    courseLogoUrl: 'https://ntpstagingall.blob.core.windows.net' +
+      '/ntp-content-staging/content/do_2127509908237926401406/artifact/4c1dbdc7d062dd11cd5b8bf5bbd25d61_1551854311088.thumb.jpg',
+    batchId: '0127580528849387521',
+    userId: '993230e2-d9f5-44fe-8b9c-fbfe5a1a3204'
+  }
+];
+
+export const mockExpiredBatchEnrolledCourses = [
+  {
+    dateTime: '2019-05-17 05:29:01.305Z',
+    lastReadContentStatus: 2,
+    contentId: 'do_2127509908237926401406',
+    courseId: 'do_091231312312',
+    progress: 50,
+    batch: {
+      identifier: '0127580528849387521',
+      endDate: null,
+      createdBy: 'ab467e6e-1f32-453c-b1d8-c6b5fa6c7b9e',
+      name: '9may open batch',
+      enrollmentType: 'open',
+      startDate: '2019-05-09',
+      status: 2
+    },
+    description: 'Enter description for Course',
+    courseLogoUrl: 'https://ntpstagingall.blob.core.windows.net' +
+      '/ntp-content-staging/content/do_2127509908237926401406/artifact/4c1dbdc7d062dd11cd5b8bf5bbd25d61_1551854311088.thumb.jpg',
+    batchId: '0127580528849387521',
+    userId: '993230e2-d9f5-44fe-8b9c-fbfe5a1a3204'
+  }
+];
 
 export const mockGetChildDataResponse = [
-    {
+  {
+    identifier: 'do_2127509912525127681407',
+    contentData: {
       identifier: 'do_2127509912525127681407',
-      contentData: {
-        identifier: 'do_2127509912525127681407',
-        pkgVersion: 1,
-        name: 'Unit 1',
-        lastUpdatedOn: '2019-04-29T05:59:21.903+0000',
-        contentType: 'CourseUnit',
-        status: 'Live'
+      pkgVersion: 1,
+      name: 'Unit 1',
+      lastUpdatedOn: '2019-04-29T05:59:21.903+0000',
+      contentType: 'CourseUnit',
+      status: 'Live',
+      downloadUrl: 'sample-download-url'
+    },
+    isUpdateAvailable: false,
+    mimeType: 'application/vnd.ekstep.content-collection',
+    contentType: 'courseunit',
+    isAvailableLocally: false,
+    referenceCount: 1,
+    sizeOnDevice: 0,
+    hierarchyInfo: [
+      {
+        identifier: 'do_2127509908237926401406',
+        contentType: 'course'
       },
-      isUpdateAvailable: false,
-      mimeType: 'application/vnd.ekstep.content-collection',
-      contentType: 'courseunit',
-      isAvailableLocally: false,
-      referenceCount: 1,
-      sizeOnDevice: 0,
-      hierarchyInfo: [
-        {
-          identifier: 'do_2127509908237926401406',
-          contentType: 'course'
+      {
+        identifier: 'do_2127509912525127681407',
+        contentType: 'courseunit'
+      }
+    ],
+    children: [
+      {
+        identifier: 'do_21274246255366963214046',
+        contentData: {
+          size: 2466640,
+          name: 'Sachin Mp4_1101',
+          downloadUrl: 'sample-download-url'
         },
-        {
-          identifier: 'do_2127509912525127681407',
-          contentType: 'courseunit'
-        }
-      ],
-      children: [
-        {
-          identifier: 'do_21274246255366963214046',
-          contentData: {
-            size: 2466640,
-            name: 'Sachin Mp4_1101'
+        isUpdateAvailable: false,
+        mimeType: 'video/mp4',
+        basePath: '/storage/emulated/0/Android/data/org.sunbird.app.staging/files/content/do_21274246255366963214046/',
+        contentType: 'resource',
+        isAvailableLocally: false,
+        referenceCount: 1,
+        sizeOnDevice: 2737,
+        hierarchyInfo: [
+          {
+            identifier: 'do_2127509908237926401406',
+            contentType: 'course'
           },
-          isUpdateAvailable: false,
-          mimeType: 'video/mp4',
-          basePath: '/storage/emulated/0/Android/data/org.sunbird.app.staging/files/content/do_21274246255366963214046/',
-          contentType: 'resource',
-          isAvailableLocally: false,
-          referenceCount: 1,
-          sizeOnDevice: 2737,
-          hierarchyInfo: [
-            {
-              identifier: 'do_2127509908237926401406',
-              contentType: 'course'
-            },
-            {
-              identifier: 'do_2127509912525127681407',
-              contentType: 'courseunit'
-            }
-          ]
-        }
-      ]
-    },
-    {
+          {
+            identifier: 'do_2127509912525127681407',
+            contentType: 'courseunit'
+          }
+        ]
+      }
+    ]
+  },
+  {
+    identifier: 'do_2127509912525127681408',
+    contentData: {
       identifier: 'do_2127509912525127681408',
-      contentData: {
-        identifier: 'do_2127509912525127681408',
-        name: 'Unit 2',
-        contentType: 'CourseUnit',
-        status: 'Live',
-        size: 27717357,
+      name: 'Unit 2',
+      contentType: 'CourseUnit',
+      status: 'Live',
+      size: 27717357,
+      downloadUrl: 'sample-download-url'
+    },
+    isUpdateAvailable: false,
+    mimeType: 'application/vnd.ekstep.content-collection',
+    basePath: '',
+    contentType: 'courseunit',
+    isAvailableLocally: false,
+    referenceCount: 1,
+    sizeOnDevice: 0,
+    hierarchyInfo: [
+      {
+        identifier: 'do_2127509908237926401406',
+        contentType: 'course'
       },
-      isUpdateAvailable: false,
-      mimeType: 'application/vnd.ekstep.content-collection',
-      basePath: '',
-      contentType: 'courseunit',
-      isAvailableLocally: false,
-      referenceCount: 1,
-      sizeOnDevice: 0,
-      hierarchyInfo: [
-        {
-          identifier: 'do_2127509908237926401406',
-          contentType: 'course'
+      {
+        identifier: 'do_2127509912525127681408',
+        contentType: 'courseunit'
+      }
+    ],
+    children: [
+      {
+        identifier: 'do_21274246302428364814048',
+        contentData: {
+          size: 27717357,
+          name: 'sachin webm_1011',
+          status: 'Live',
+          downloadUrl: 'sample-download-url'
         },
-        {
-          identifier: 'do_2127509912525127681408',
-          contentType: 'courseunit'
-        }
-      ],
-      children: [
-        {
-          identifier: 'do_21274246302428364814048',
-          contentData: {
-            size: 27717357,
-            name: 'sachin webm_1011',
-            status: 'Live'
+        isUpdateAvailable: false,
+        mimeType: 'video/webm',
+        basePath: '/storage/emulated/0/Android/data/org.sunbird.app.staging/files/content/do_21274246302428364814048/',
+        contentType: 'resource',
+        isAvailableLocally: false,
+        referenceCount: 1,
+        sizeOnDevice: 2801,
+        hierarchyInfo: [
+          {
+            identifier: 'do_2127509908237926401406',
+            contentType: 'course'
           },
-          isUpdateAvailable: false,
-          mimeType: 'video/webm',
-          basePath: '/storage/emulated/0/Android/data/org.sunbird.app.staging/files/content/do_21274246302428364814048/',
-          contentType: 'resource',
-          isAvailableLocally: false,
-          referenceCount: 1,
-          sizeOnDevice: 2801,
-          hierarchyInfo: [
-            {
-              identifier: 'do_2127509908237926401406',
-              contentType: 'course'
-            },
-            {
-              identifier: 'do_2127509912525127681408',
-              contentType: 'courseunit'
-            }
-          ]
-        }
-      ]
-    }
-  ];
+          {
+            identifier: 'do_2127509912525127681408',
+            contentType: 'courseunit'
+          }
+        ]
+      }
+    ]
+  }
+];
 
 export const mockImportContentResponse = [
-    {
-      identifier: 'do_21274246255366963214046',
-      status: 0
-    },
-    {
-      identifier: 'do_21274246302428364814048',
-      status: 0
-    }
-  ];
+  {
+    identifier: 'do_21274246255366963214046',
+    status: 0
+  },
+  {
+    identifier: 'do_21274246302428364814048',
+    status: 0
+  }
+];
 
 export const mockChildrenData = [
   {
diff --git a/src/app/enrolled-course-details-page/enrolled-course-details-page.spec.ts b/src/app/enrolled-course-details-page/enrolled-course-details-page.spec.ts
index 182b8e01b..cffb251b6 100644
--- a/src/app/enrolled-course-details-page/enrolled-course-details-page.spec.ts
+++ b/src/app/enrolled-course-details-page/enrolled-course-details-page.spec.ts
@@ -1,35 +1,49 @@
 import { EnrolledCourseDetailsPage } from './enrolled-course-details-page';
 import {
     ProfileService, ContentService, EventsBusService, CourseService, SharedPreferences,
-    AuthService, CorrelationData, TelemetryObject, FetchEnrolledCourseRequest,
-    ProfileType, UnenrollCourseRequest, ContentDetailRequest, ServerProfileDetailsRequest, ServerProfile,
+    AuthService, CorrelationData, TelemetryObject,
+    ProfileType, UnenrollCourseRequest, ContentDetailRequest,
+    ServerProfileDetailsRequest, ServerProfile,
     NetworkError, DownloadService
 } from 'sunbird-sdk';
 import {
     LoginHandlerService, CourseUtilService, AppGlobalService, TelemetryGeneratorService,
-    CommonUtilService, UtilityService, AppHeaderService, ContentShareHandlerService,
-    LocalCourseService, PageId, ID, InteractType
+    CommonUtilService, UtilityService, AppHeaderService,
+    LocalCourseService, PageId, InteractType
 } from '../../services';
 import { NgZone } from '@angular/core';
-import { Events, PopoverController, Platform } from '@ionic/angular';
+import { PopoverController, Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { DatePipe } from '@angular/common';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { AppVersion } from '@ionic-native/app-version/ngx';
 import { FileSizePipe } from '../../pipes/file-size/file-size';
 import { ContentDeleteHandler } from '../../services/content/content-delete-handler';
 import { Location } from '@angular/common';
 import {
     mockEnrolledData, contentDetailsResponse, mockCourseCardData,
-    mockGetChildDataResponse, mockImportContentResponse, mockEnrolledCourses,
-    mockCourseCardData_2, mockChildrenData, mockContentStatusData, mockcontentHirerachyResponse
+    mockGetChildDataResponse, mockImportContentResponse,
+    mockEnrolledCourses, mockExpiredBatchEnrolledCourses,
+    mockCourseCardData_2, mockcontentHirerachyResponse
 } from './enrolled-course-details-page.spec.data';
 import { of, Subject, throwError } from 'rxjs';
 import { ContentInfo } from '../../services/content/content-info';
-import { PreferenceKey, ProfileConstants, EventTopics } from '../app.constant';
+import { PreferenceKey, ProfileConstants, EventTopics, BatchConstants } from '../app.constant';
 import { isObject } from 'util';
 import { SbPopoverComponent } from '../components/popups';
-import { Mode, Environment, ImpressionType } from '../../services/telemetry-constants';
+import { Mode, Environment, ImpressionType, InteractSubtype, ErrorType } from '../../services/telemetry-constants';
+import { SbProgressLoader } from '@app/services/sb-progress-loader.service';
+import { MimeType } from '../app.constant';
+import { ContentPlayerHandler } from '@app/services/content/player/content-player-handler';
+import { Consent, ConsentStatus, UserConsent } from '@project-sunbird/client-services/models';
+import { CategoryKeyTranslator } from '@app/pipes/category-key-translator/category-key-translator-pipe';
+import { ConsentService } from '../../services/consent-service';
+import {
+    TncUpdateHandlerService,
+} from '../../services/handlers/tnc-update-handler.service';
+import { DiscussionTelemetryService } from '@app/services/discussion/discussion-telemetry.service';
+import { mockProfileData } from '../profile/profile.page.spec.data';
+import { CourseBatchStatus, CourseEnrollmentType, DiscussionService, SortOrder } from '@project-sunbird/sunbird-sdk';
 
 describe('EnrolledCourseDetailsPage', () => {
     let enrolledCourseDetailsPage: EnrolledCourseDetailsPage;
@@ -60,7 +74,8 @@ describe('EnrolledCourseDetailsPage', () => {
     };
     const mockEvents: Partial<Events> = {};
     const mockFileSizePipe: Partial<FileSizePipe> = {};
-    const mockPopoverCtrl: Partial<PopoverController> = {};
+    const mockPopoverCtrl: Partial<PopoverController> = {
+    };
     const mockCourseUtilService: Partial<CourseUtilService> = {
         showCredits: jest.fn()
     };
@@ -93,10 +108,9 @@ describe('EnrolledCourseDetailsPage', () => {
     const mockDatePipe: Partial<DatePipe> = {};
     const mockUtilityService: Partial<UtilityService> = {};
     const mockHeaderService: Partial<AppHeaderService> = {};
-    const mockContentShareHandler: Partial<ContentShareHandlerService> = {};
     const mockLocation: Partial<Location> = {};
     const mockRouter: Partial<Router> = {
-        getCurrentNavigation: jest.fn(() => mockEnrolledData),
+        // getCurrentNavigation: jest.fn(() => mockEnrolledData),
         navigate: jest.fn(),
         getCurrentNavigation: jest.fn(() => mockEnrolledData) as any
     };
@@ -105,9 +119,35 @@ describe('EnrolledCourseDetailsPage', () => {
     const mockLocalCourseService: Partial<LocalCourseService> = {
         prepareEnrollCourseRequest: jest.fn(),
         enrollIntoBatch: jest.fn(),
-        prepareRequestValue: jest.fn()
+        prepareRequestValue: jest.fn(),
+        isEnrollable: jest.fn()
+    };
+    const mockConsentService: Partial<ConsentService> = {};
+    const mockSbProgressLoader: Partial<SbProgressLoader> = {};
+    const mockContentPlayerHandler: Partial<ContentPlayerHandler> = {};
+    const mockCategoryKeyTranslator: Partial<CategoryKeyTranslator> = {
+        transform: jest.fn(() => 'sample-message')
+    };
+    const mockTncUpdateHandlerService: Partial<TncUpdateHandlerService> = {
+        dismissTncPage: jest.fn(),
+        isSSOUser: jest.fn()
+    };
+    const mockDiscussionService: Partial<DiscussionService> = {
+        getForumIds: jest.fn()
+    };
+    const mockDiscussionTelemetryService: Partial<DiscussionTelemetryService> = {
+    };
+
+    global.window.segmentation = {
+        init: jest.fn(),
+        SBTagService: {
+            pushTag: jest.fn(),
+            removeAllTags: jest.fn(),
+            getTags: jest.fn(() => undefined),
+            restoreTags: jest.fn()
+        }
     };
-    const mockAppVersion: Partial<AppVersion> = {};
+    
 
     beforeAll(() => {
         enrolledCourseDetailsPage = new EnrolledCourseDetailsPage(
@@ -118,6 +158,7 @@ describe('EnrolledCourseDetailsPage', () => {
             mockPreferences as SharedPreferences,
             mockAuthService as AuthService,
             mockDownloadService as DownloadService,
+            mockDiscussionService as DiscussionService,
             mockLoginHandlerService as LoginHandlerService,
             mockZone as NgZone,
             mockEvents as Events,
@@ -131,17 +172,22 @@ describe('EnrolledCourseDetailsPage', () => {
             mockDatePipe as DatePipe,
             mockUtilityService as UtilityService,
             mockHeaderService as AppHeaderService,
-            mockContentShareHandler as ContentShareHandlerService,
             mockLocation as Location,
             mockRouter as Router,
             mockContentDeleteHandler as ContentDeleteHandler,
-            mockLocalCourseService as LocalCourseService
+            mockLocalCourseService as LocalCourseService,
+            mockSbProgressLoader as SbProgressLoader,
+            mockContentPlayerHandler as ContentPlayerHandler,
+            mockCategoryKeyTranslator as CategoryKeyTranslator,
+            mockConsentService as ConsentService,
+            mockTncUpdateHandlerService as TncUpdateHandlerService,
+            mockDiscussionTelemetryService as DiscussionTelemetryService
         );
     });
 
     beforeEach(() => {
         jest.clearAllMocks();
-        jest.restoreAllMocks();
+        jest.resetAllMocks();
 
         mockCommonUtilService.networkInfo.isNetworkAvailable = true;
     });
@@ -158,6 +204,13 @@ describe('EnrolledCourseDetailsPage', () => {
             mockCommonUtilService.getAppName = jest.fn(() => Promise.resolve('DIKSHA'));
             mockDownloadService.trackDownloads = jest.fn(() => of());
             spyOn(enrolledCourseDetailsPage, 'subscribeUtilityEvents').and.returnValue('BASE_URL');
+            const mockProfileRes = {
+                serverProfile: {
+                    userName: 'some_user'
+                }
+            };
+            mockProfileService.getActiveSessionProfile = jest.fn(() => of(mockProfileRes) as any);
+            mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('some_uid'));
             // act
             enrolledCourseDetailsPage.ngOnInit();
             // assert
@@ -195,1224 +248,1419 @@ describe('EnrolledCourseDetailsPage', () => {
         });
     });
 
-    describe('subscribeUtilityEvents()', () => {
-        it('#subscribeUtilityEvents should handle error condition', (done) => {
-            // arrange
-            mockUtilityService.getBuildConfigValue = jest.fn(() => Promise.reject(true));
-            mockEvents.subscribe = jest.fn(() => ({ batchId: 'SAMPLE_BATCH_ID', courseId: 'SAMPLE_COURSE_ID' }));
-            spyOn(enrolledCourseDetailsPage, 'updateEnrolledCourseList').and.stub();
-            spyOn(enrolledCourseDetailsPage, 'getBatchDetails').and.stub();
-            // assert
-            enrolledCourseDetailsPage.subscribeUtilityEvents();
-            // act
-            setTimeout(() => {
-                expect(enrolledCourseDetailsPage.baseUrl).toBe('');
-                expect(mockUtilityService.getBuildConfigValue).toHaveBeenCalled();
-                expect(mockEvents.subscribe).toHaveBeenCalled();
-                done();
-            }, 0);
-        });
-
-        it('should update courseCard data and return base url by invoked subscribeUtilityEvents()', (done) => {
+    describe('getContentState()', () => {
+        it('check', (done) => {
             // arrange
-            mockUtilityService.getBuildConfigValue = jest.fn(() => Promise.resolve('SAMPLE_BASE_URL'));
-            mockEvents.subscribe = jest.fn((_, fn) => fn({ batchId: 'SAMPLE_BATCH_ID', courseId: 'SAMPLE_COURSE_ID' }));
-            spyOn(enrolledCourseDetailsPage, 'updateEnrolledCourseList').and.stub();
-            enrolledCourseDetailsPage.course = { createdBy: 'SAMPLE_CREATOR' };
-            enrolledCourseDetailsPage.stickyPillsRef = {
-                nativeElement: {
-                    classList: { remove: jest.fn(), add: jest.fn() }
-                }
+            mockAppGlobalService.getUserId = jest.fn(() => 'sample-user-id');
+            const contentState = {
+                contentList: [
+                    {
+                        status: 1
+                    }, {
+                        status: 2
+                    }
+                ]
             };
-            mockCommonUtilService.getLoader = jest.fn();
-            mockCommonUtilService.translateMessage = jest.fn(() => ('YOU_MUST_JOIN_AN_ACTIVE_BATCH'));
-            spyOn(enrolledCourseDetailsPage, 'getAllBatches').and.stub();
-            mockCourseService.getEnrolledCourses = jest.fn(() => of([{ courseId: 'SAMPLE_IDETIFIER' }]));
-            spyOn(enrolledCourseDetailsPage, 'getBatchDetails').and.stub();
-            spyOn(enrolledCourseDetailsPage, 'joinTraining').and.stub();
+            enrolledCourseDetailsPage.courseCardData.batchId = '1234567890';
+            mockCourseService.getContentState = jest.fn(() => of(contentState));
+            jest.spyOn(enrolledCourseDetailsPage, 'getLocalCourseAndUnitProgress').mockImplementation();
+            enrolledCourseDetailsPage.courseHeirarchy = {
+                children: [{ identifier: 'do-123' }],
+                contentData: { leafNodes: ['do_1', 'do_12', 'do_123'] }
+            };
+            enrolledCourseDetailsPage.resumeCourseFlag = true;
+            jest.spyOn(enrolledCourseDetailsPage, 'resumeContent').mockImplementation();
             // act
-            enrolledCourseDetailsPage.subscribeUtilityEvents();
+            enrolledCourseDetailsPage.getContentState(false);
             // assert
             setTimeout(() => {
-                expect(enrolledCourseDetailsPage.baseUrl).toBe('SAMPLE_BASE_URL');
-                expect(mockUtilityService.getBuildConfigValue).toHaveBeenCalled();
-                expect(enrolledCourseDetailsPage.course.createdBy).not.toEqual('SAMPLE_USER');
-                expect(mockCourseService.getEnrolledCourses).toHaveBeenCalled();
-                expect(enrolledCourseDetailsPage.updateEnrolledCourseList).toBeCalled();
-                expect(enrolledCourseDetailsPage.getAllBatches).toBeCalled();
-                expect(enrolledCourseDetailsPage.getBatchDetails).toHaveBeenCalled();
-                expect(enrolledCourseDetailsPage.joinTraining).toBeCalled();
-                expect(mockEvents.subscribe).toHaveBeenCalled();
+                expect(mockAppGlobalService.getUserId).toHaveBeenCalled();
+                expect(mockCourseService.getContentState).toHaveBeenCalled();
+                expect(enrolledCourseDetailsPage.resumeCourseFlag).toBeFalsy();
                 done();
             }, 0);
         });
     });
 
-    describe('updateEnrolledCourseList', () => {
-        it('should update enroll details list by invoked updateEnrolledCourseList()', () => {
+    describe('handleUnenrollButton()', () => {
+        it('should set showUnenrollButton to true', () => {
             // arrange
-            const userDetails = mockAppGlobalService.getUserId = jest.fn(() => 'SAMPLE_USER_ID');
-            const fetchEnrolledCourseRequest: FetchEnrolledCourseRequest = {
-                userId: 'SAMPLE_USER_ID'
+            enrolledCourseDetailsPage.batchDetails = {
+                status: 1,
+                enrollmentType: 'open'
+            };
+            enrolledCourseDetailsPage.courseCardData = {
+                status: 0
+            };
+            enrolledCourseDetailsPage.course = {
+                progress: 100
             };
-            mockCourseService.getEnrolledCourses = jest.fn(() => of([{}]));
-            mockZone.run = jest.fn((fn) => fn());
             // act
-            enrolledCourseDetailsPage.updateEnrolledCourseList(mockEnrolledData.extras.state.content);
+            enrolledCourseDetailsPage.handleUnenrollButton();
             // assert
-            expect(mockAppGlobalService.getUserId).toHaveBeenCalled();
-            expect(mockCourseService.getEnrolledCourses).toHaveBeenCalled();
+            expect(enrolledCourseDetailsPage.showUnenrollButton).toEqual(true);
         });
-    });
 
-    describe('extractApiResponse()', () => {
-        it('should return last played content and license', () => {
-            // assert
-            const response = contentDetailsResponse;
-            spyOn(enrolledCourseDetailsPage, 'generateImpressionEvent');
-            spyOn(enrolledCourseDetailsPage, 'generateStartEvent');
-            spyOn(enrolledCourseDetailsPage, 'setCourseStructure');
-            spyOn(enrolledCourseDetailsPage, 'setChildContents');
-            enrolledCourseDetailsPage.courseCardData = { lastReadContentId: 'SAMPLE_LAST_READ_CONTENT' };
-            mockHeaderService.showHeaderWithBackButton = jest.fn(() => { });
-            mockCommonUtilService.showToast = jest.fn(() => 'COURSE_NOT_AVAILABLE');
-            mockLocation.back = jest.fn();
-            spyOn(enrolledCourseDetailsPage, 'getBatchDetails').and.stub();
+        it('should be set updatedCourseCardData and set showUnenrollButton to true', () => {
+            // arrange
+            enrolledCourseDetailsPage.updatedCourseCardData = {
+                status: 0
+            };
+            enrolledCourseDetailsPage.batchDetails = {
+                status: 1,
+                enrollmentType: 'open'
+            };
+            enrolledCourseDetailsPage.course = {
+                progress: 100
+            };
             // act
-            enrolledCourseDetailsPage.extractApiResponse(response);
+            enrolledCourseDetailsPage.handleUnenrollButton();
             // assert
-            expect(enrolledCourseDetailsPage.generateImpressionEvent).toBeCalled();
-            expect(enrolledCourseDetailsPage.generateStartEvent).toBeCalled();
-            expect(response.contentData.status).not.toBe('Live');
-            expect(mockCommonUtilService.showToast).toHaveBeenCalled();
-            expect(response.contentData.me_totalRatingsCount).toBe(4);
-            expect(mockLocation.back).toHaveBeenCalled();
+            expect(enrolledCourseDetailsPage.showUnenrollButton).toEqual(true);
         });
 
-        it('should return import content if data is not available for extractApiResponse', () => {
-            // assert
-            const response = mockEnrolledData.extras.state.content;
-            mockHeaderService.showHeaderWithBackButton = jest.fn(() => { });
-            mockCommonUtilService.showToast = jest.fn(() => 'COURSE_NOT_AVAILABLE');
-            mockLocation.back = jest.fn();
-            mockTelemetryGeneratorService.generateSpineLoadingTelemetry = jest.fn();
-            enrolledCourseDetailsPage.didViewLoad = true;
-            mockHeaderService.hideHeader = jest.fn();
-            spyOn(enrolledCourseDetailsPage, 'importContent').and.stub();
-            spyOn(enrolledCourseDetailsPage, 'setCourseStructure').and.stub();
-            spyOn(enrolledCourseDetailsPage, 'getBatchDetails').and.stub();
-            // act
-            enrolledCourseDetailsPage.extractApiResponse(response);
-            // assert
-            expect(mockCommonUtilService.showToast).toHaveBeenCalled();
-            expect(mockLocation.back).toHaveBeenCalled();
-            expect(enrolledCourseDetailsPage.didViewLoad).toBeTruthy();
-        });
-    });
-    describe('checkCurrentUserType', () => {
-        it('should checked current user type for cath part by invoked checkCurrentUserType()', () => {
+        it('should set showUnenrollButton to false', () => {
             // arrange
-            enrolledCourseDetailsPage.guestUser = true;
-            mockAppGlobalService.getGuestUserInfo = jest.fn(() => Promise.reject('SAMPLE_USER'));
+            enrolledCourseDetailsPage.updatedCourseCardData = {
+                status: 0
+            };
+            enrolledCourseDetailsPage.batchDetails = {
+                status: 1,
+                enrollmentType: 'invite-only'
+            };
+            enrolledCourseDetailsPage.course = {
+                progress: 100
+            };
             // act
-            enrolledCourseDetailsPage.checkCurrentUserType();
+            enrolledCourseDetailsPage.handleUnenrollButton();
             // assert
-            expect(mockAppGlobalService.getGuestUserInfo).toHaveBeenCalled();
+            expect(enrolledCourseDetailsPage.showUnenrollButton).toEqual(false);
         });
     });
 
-    describe('joinTraining()', () => {
-        it('should show error toast if no batches available', async (done) => {
+    describe('saveContentContext()', () => {
+        it('should saved context of content by invoked saveContentContext()', () => {
             // arrange
-            enrolledCourseDetailsPage.batches = [];
-            mockCommonUtilService.showToast = jest.fn();
+            const userId = 'sample-user-id';
+            const courseId = 'course-card';
+            const batchId = 'sample-batch-id';
+            const batchStatus = 2;
+            // enrolledCourseDetailsPage.courseHeirarchy = {
+            //     children: [{ identifier: 'do-123' }]
+            // };
+            enrolledCourseDetailsPage.courseHeirarchy = {
+                contentData: {
+                    leafNodes: ['node1']
+                }
+            };
+            mockPreferences.putString = jest.fn(() => of(undefined));
             // act
-            await enrolledCourseDetailsPage.joinTraining();
+            enrolledCourseDetailsPage.saveContentContext(userId, courseId, batchId, batchStatus);
             // assert
-            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('NO_BATCHES_AVAILABLE');
-            done();
+            expect(mockPreferences.putString).toHaveBeenCalledWith(PreferenceKey.CONTENT_CONTEXT, expect.any(String));
+            expect(Boolean(batchStatus)).toBeTruthy();
         });
+    });
 
-        it('should show error toast if single enrolment expired batch', async (done) => {
+    describe('getBatchDetails()', () => {
+        it('should return course batch details of expire date start date by invoked getBatchDetails() for identifier', (done) => {
             // arrange
-            enrolledCourseDetailsPage.batches = [{
-                enrollmentEndDate: '2020-04-23'
-            }];
-            mockCommonUtilService.showToast = jest.fn();
-            mockDatePipe.transform = jest.fn((v) => v);
+            enrolledCourseDetailsPage.batchDetails = {
+                courseId: 'sample_course_id',
+                identifier: PreferenceKey.COURSE_IDENTIFIER,
+                status: 2
+            };
+            enrolledCourseDetailsPage.courseCardData = {
+                batchId: 'sample_batch_id'
+            };
+            mockZone.run = jest.fn((fn) => fn());
+            mockAppGlobalService.getUserId = jest.fn(() => 'sample-user-id');
+            mockCourseService.getBatchDetails = jest.fn(() => of(enrolledCourseDetailsPage.batchDetails));
+            jest.spyOn(enrolledCourseDetailsPage, 'handleUnenrollButton').mockImplementation();
+            jest.spyOn(enrolledCourseDetailsPage, 'saveContentContext').mockImplementation();
+            mockPreferences.getString = jest.fn(() => of(PreferenceKey.COURSE_IDENTIFIER));
             // act
-            await enrolledCourseDetailsPage.joinTraining();
+            enrolledCourseDetailsPage.getBatchDetails();
             // assert
-            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ENROLLMENT_ENDED_ON', null, null, null, null, '2020-04-23');
-            done();
+            setTimeout(() => {
+                expect(mockCourseService.getBatchDetails).toHaveBeenCalledWith(enrolledCourseDetailsPage.courseCardData);
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockAppGlobalService.getUserId).toHaveBeenCalled();
+                expect(mockPreferences.getString).toHaveBeenCalledWith(PreferenceKey.COURSE_IDENTIFIER);
+                done();
+            }, 0);
         });
 
-        it('should be joined training for logged in user', async (done) => {
+        it('should return course batch details of expire date start date by invoked getBatchDetails() for status 2', (done) => {
             // arrange
-            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
-                present: jest.fn(() => Promise.resolve({})),
-                onDidDismiss: jest.fn(() => Promise.resolve({ canDelete: '' }))
-            } as any)));
+            enrolledCourseDetailsPage.batchDetails = {
+                courseId: 'sample_course_id',
+                identifier: PreferenceKey.DEPLOYMENT_KEY,
+                status: 2
+            };
+            enrolledCourseDetailsPage.courseCardData = {
+                batchId: 'sample_batch_id'
+            };
+            mockZone.run = jest.fn((fn) => fn());
+            mockAppGlobalService.getUserId = jest.fn(() => 'sample-user-id');
             mockCourseService.getBatchDetails = jest.fn(() => of(enrolledCourseDetailsPage.batchDetails));
-            mockCommonUtilService.translateMessage = jest.fn(() => '');
-            mockCommonUtilService.networkInfo.isNetworkAvailable = true;
-            spyOn(enrolledCourseDetailsPage, 'navigateToBatchListPage').and.stub();
-            spyOn(mockCourseService, 'getBatchDetails').and.stub();
-            enrolledCourseDetailsPage.batches = [{}, {}];
+            jest.spyOn(enrolledCourseDetailsPage, 'handleUnenrollButton').mockImplementation();
+            jest.spyOn(enrolledCourseDetailsPage, 'saveContentContext').mockImplementation();
+            mockPreferences.getString = jest.fn(() => of(PreferenceKey.COURSE_IDENTIFIER));
             // act
-            enrolledCourseDetailsPage.joinTraining();
+            enrolledCourseDetailsPage.getBatchDetails();
             // assert
             setTimeout(() => {
-                expect(mockPopoverCtrl.create).toHaveBeenCalled();
-                expect(mockCommonUtilService.translateMessage).toHaveBeenCalled();
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockAppGlobalService.getUserId).toHaveBeenCalled();
+                expect(mockCourseService.getBatchDetails).toHaveBeenCalledWith(enrolledCourseDetailsPage.courseCardData);
+                expect(mockPreferences.getString).toHaveBeenCalledWith(PreferenceKey.COURSE_IDENTIFIER);
                 done();
             }, 0);
         });
-    });
 
-    describe('rateContent()', () => {
-        it('should show user rating for content if not guest user', () => {
+        it('should return course batch details of expire date start date by invoked getBatchDetails() for status zero', (done) => {
             // arrange
-            enrolledCourseDetailsPage.guestUser = false;
-            contentDetailsResponse.contentData['isAvailableLocally'] = true;
-            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            enrolledCourseDetailsPage.batchDetails = {
+                courseId: 'sample_course_id',
+                identifier: PreferenceKey.DEPLOYMENT_KEY,
+                status: 0
+            };
+            enrolledCourseDetailsPage.courseCardData = {
+                batchId: 'sample_batch_id'
+            };
+            mockZone.run = jest.fn((fn) => fn());
+            mockAppGlobalService.getUserId = jest.fn(() => 'sample-user-id');
+            mockCourseService.getBatchDetails = jest.fn(() => of(enrolledCourseDetailsPage.batchDetails));
+            jest.spyOn(enrolledCourseDetailsPage, 'handleUnenrollButton').mockImplementation();
+            jest.spyOn(enrolledCourseDetailsPage, 'saveContentContext').mockImplementation();
+            mockPreferences.getString = jest.fn(() => of(PreferenceKey.COURSE_IDENTIFIER));
             // act
-            enrolledCourseDetailsPage.rateContent('');
+            enrolledCourseDetailsPage.getBatchDetails();
             // assert
-            expect(contentDetailsResponse.contentData['isAvailableLocally']).toBeTruthy();
-            expect(enrolledCourseDetailsPage.guestUser).toBeFalsy();
+            setTimeout(() => {
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockAppGlobalService.getUserId).toHaveBeenCalled();
+                expect(mockCourseService.getBatchDetails).toHaveBeenCalledWith(enrolledCourseDetailsPage.courseCardData);
+                expect(mockPreferences.getString).toHaveBeenCalledWith(PreferenceKey.COURSE_IDENTIFIER);
+                done();
+            }, 0);
         });
 
-        it('should show user rating for content if content is not available locally', () => {
+        it('should saved content context by invoked getBatchDetails() for catch part', (done) => {
             // arrange
-            enrolledCourseDetailsPage.guestUser = false;
-            contentDetailsResponse.contentData['isAvailableLocally'] = false;
-            mockCommonUtilService.showToast = jest.fn(() => 'try before rating');
-            // act
-            enrolledCourseDetailsPage.rateContent('');
-            // assert
-            expect(contentDetailsResponse.contentData['isAvailableLocally']).toBeFalsy();
-            expect(enrolledCourseDetailsPage.guestUser).toBeFalsy();
-            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('TRY_BEFORE_RATING');
-        });
-
-        it('should show user rating for content for guest user', (done) => {
-            // arrange
-            enrolledCourseDetailsPage.guestUser = true;
-            enrolledCourseDetailsPage.profileType = ProfileType.TEACHER;
-            mockCommonUtilService.isAccessibleForNonStudentRole = jest.fn(() => true);
-            mockCommonUtilService.showToast = jest.fn(() => 'signin to use feature');
+            enrolledCourseDetailsPage.batchDetails = {
+                courseId: 'sample_course_id',
+                identifier: PreferenceKey.COURSE_IDENTIFIER,
+                status: 2
+            };
+            enrolledCourseDetailsPage.courseCardData = {
+                batchId: 'sample_batch_id',
+                batch: 'SAMPLE_BATCH'
+            };
+            mockCourseService.getBatchDetails = jest.fn(() => throwError(enrolledCourseDetailsPage.batchDetails));
+            jest.spyOn(enrolledCourseDetailsPage, 'saveContentContext').mockImplementation();
             // act
-            enrolledCourseDetailsPage.rateContent('');
+            enrolledCourseDetailsPage.getBatchDetails();
             // assert
             setTimeout(() => {
-                expect(enrolledCourseDetailsPage.guestUser).toBeTruthy();
-                expect(enrolledCourseDetailsPage.profileType).toBe(ProfileType.TEACHER);
-                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('SIGNIN_TO_USE_FEATURE');
-                expect(mockCommonUtilService.isAccessibleForNonStudentRole).toHaveBeenCalled();
+                expect(mockCourseService.getBatchDetails).toHaveBeenCalledWith(
+                    { batchId: enrolledCourseDetailsPage.courseCardData.batchId });
                 done();
             }, 0);
         });
     });
 
-    describe('showOverflowMenu()', () => {
-        it('should show traning leave popover by invoked showOverflowMenu()', (done) => {
+    describe('getAllBatches()', () => {
+        it('should fetch all batch list', (done) => {
             // arrange
-            const event = {};
-            const presentFn = jest.fn(() => ({}));
-            const onDidDismissFn = jest.fn(() => ({ data: { unenroll: true } }));
-            mockPopoverCtrl.create = jest.fn(() => ({
-                present: presentFn,
-                onDidDismiss: onDidDismissFn
-            }) as any);
+            const data = [
+                {
+                    enrollmentEndDate: '01/01/2020'
+                },
+                {
+                    enrollmentEndDate: '01/01/2020'
+                }
+            ];
+            jest.spyOn(enrolledCourseDetailsPage, 'handleUnenrollButton').mockImplementation();
+            mockCourseService.getCourseBatches = jest.fn(() => of(data));
             // act
-            enrolledCourseDetailsPage.showOverflowMenu(event);
+            enrolledCourseDetailsPage.getAllBatches();
             // assert
             setTimeout(() => {
-                expect(mockPopoverCtrl.create).toHaveBeenCalled();
-                expect(presentFn).toHaveBeenCalled();
-                expect(onDidDismissFn).toHaveBeenCalled();
+                expect(enrolledCourseDetailsPage.handleUnenrollButton).toBeCalled();
+                expect(enrolledCourseDetailsPage.showOfflineSection).toEqual(false);
+                expect(enrolledCourseDetailsPage.batchCount).toEqual(data.length);
+                expect(enrolledCourseDetailsPage.batches).toEqual(data);
                 done();
             }, 0);
         });
-    });
 
-    describe('handleUnenrollment()', () => {
-        it('should handle unenrolled for enrolled course', (done) => {
+        it('should contain only 1 batch', (done) => {
             // arrange
-            const presentFn = jest.fn(() => Promise.resolve());
-            const dismissFn = jest.fn(() => Promise.resolve());
-            mockCommonUtilService.getLoader = jest.fn(() => ({
-                present: presentFn,
-                dismiss: dismissFn,
-            }));
-            enrolledCourseDetailsPage.batchDetails = {
-                id: '',
-                courseId: ''
-            };
-            mockZone.run = jest.fn((fn) => fn());
-            const unenrolCourseRequest: UnenrollCourseRequest = {
-                userId: 'SAMPLE_USER_ID',
-                courseId: enrolledCourseDetailsPage.batchDetails.courseId,
-                batchId: enrolledCourseDetailsPage.batchDetails.id
-            };
-            mockCourseService.unenrollCourse = jest.fn(() => of(true));
-            mockCommonUtilService.showToast = jest.fn();
-            mockEvents.publish = jest.fn(() => []);
-            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const data = [
+                {
+                    enrollmentEndDate: '01/01/2020',
+                    endDate: '05/01/2020',
+                    identifier: 'do-123'
+                }
+            ];
+            mockCourseService.getCourseBatches = jest.fn(() => of(data));
+            jest.spyOn(enrolledCourseDetailsPage, 'handleUnenrollButton').mockImplementation();
+            jest.spyOn(enrolledCourseDetailsPage, 'getBatchDetails').mockImplementation();
             // act
-            enrolledCourseDetailsPage.handleUnenrollment(true);
+            enrolledCourseDetailsPage.getAllBatches();
             // assert
             setTimeout(() => {
-                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
-                expect(mockCourseService.unenrollCourse).toHaveBeenCalledWith(unenrolCourseRequest);
-                expect(presentFn).toHaveBeenCalled();
-                expect(dismissFn).toHaveBeenCalled();
-                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
-                expect(mockEvents.publish).toHaveBeenCalled();
+                expect(enrolledCourseDetailsPage.handleUnenrollButton).toBeCalled();
+                expect(enrolledCourseDetailsPage.showOfflineSection).toEqual(false);
+                expect(enrolledCourseDetailsPage.batchEndDate).toEqual(data[0].endDate);
+                expect(enrolledCourseDetailsPage.enrollmentEndDate).toEqual(data[0].enrollmentEndDate);
                 done();
             }, 0);
         });
 
-        it('should handle unenrolled for enrolled course for error part of UNENROL_COURSE_SUCCESS', (done) => {
+        it('should display offline mode', (done) => {
             // arrange
-            const presentFn = jest.fn(() => Promise.resolve());
-            const dismissFn = jest.fn(() => Promise.resolve());
-            mockCommonUtilService.getLoader = jest.fn(() => ({
-                present: presentFn,
-                dismiss: dismissFn,
-            }));
-            enrolledCourseDetailsPage.batchDetails = {
-                id: '',
-                courseId: ''
-            };
-            mockZone.run = jest.fn((fn) => fn());
-            const unenrolCourseRequest: UnenrollCourseRequest = {
-                userId: 'SAMPLE_USER_ID',
-                courseId: enrolledCourseDetailsPage.batchDetails.courseId,
-                batchId: enrolledCourseDetailsPage.batchDetails.id
-            };
-            mockCourseService.unenrollCourse = jest.fn(() => throwError(''));
-            mockCommonUtilService.showToast = jest.fn();
-            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
-            mockEvents.publish = jest.fn(() => []);
+            jest.spyOn(mockCourseService, 'getCourseBatches').mockReturnValue(of(Promise.reject(new NetworkError())));
             // act
-            enrolledCourseDetailsPage.handleUnenrollment(true);
+            enrolledCourseDetailsPage.getAllBatches();
             // assert
             setTimeout(() => {
-                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
-                expect(mockCourseService.unenrollCourse).toHaveBeenCalledWith(unenrolCourseRequest);
-                expect(presentFn).toHaveBeenCalled();
-                expect(dismissFn).toHaveBeenCalled();
-                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
-                expect(mockEvents.publish).toHaveBeenCalledWith('UNENROL_COURSE_SUCCESS', {});
+                expect(enrolledCourseDetailsPage.showOfflineSection).toEqual(true);
                 done();
             }, 0);
         });
-
-        it('should handle unenrolled for enrolled course for error part of ERROR_NO_INTERNET_MESSAGE', (done) => {
+        it('should not display offline mode', (done) => {
             // arrange
-            const presentFn = jest.fn(() => Promise.resolve());
-            const dismissFn = jest.fn(() => Promise.resolve());
-            mockCommonUtilService.getLoader = jest.fn(() => ({
-                present: presentFn,
-                dismiss: dismissFn,
-            }));
-            enrolledCourseDetailsPage.batchDetails = {
-                id: '',
-                courseId: ''
-            };
-            mockZone.run = jest.fn((fn) => fn());
-            const unenrolCourseRequest: UnenrollCourseRequest = {
-                userId: 'SAMPLE_USER_ID',
-                courseId: enrolledCourseDetailsPage.batchDetails.courseId,
-                batchId: enrolledCourseDetailsPage.batchDetails.id
-            };
-            mockCourseService.unenrollCourse = jest.fn(() => throwError({ error: 'CONNECTION_ERROR' }));
-            mockCommonUtilService.showToast = jest.fn();
-            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(mockCourseService, 'getCourseBatches').mockReturnValue(of(Promise.reject({ error: 'SOME_ERROR' })));
             // act
-            enrolledCourseDetailsPage.handleUnenrollment(true);
+            enrolledCourseDetailsPage.getAllBatches();
             // assert
             setTimeout(() => {
-                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
-                expect(mockCourseService.unenrollCourse).toHaveBeenCalledWith(unenrolCourseRequest);
-                expect(presentFn).toHaveBeenCalled();
-                expect(dismissFn).toHaveBeenCalled();
-                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
-                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('');
+                expect(enrolledCourseDetailsPage.showOfflineSection).toEqual(false);
                 done();
             }, 0);
         });
     });
 
-    describe('setContentDetails()', () => {
-        it('should return content details for extractApiResponse by called setContentDetails()', (done) => {
+    describe('cancelDownload()', () => {
+        it('should display header', (done) => {
             // arrange
-            const option: ContentDetailRequest = {
-                contentId: 'do_21281258639073280011490',
-                attachFeedback: true,
-                emitUpdateIfAny: true,
-                attachContentAccess: true
-            };
-            contentDetailsResponse.isAvailableLocally = false;
-            mockContentService.getContentDetails = jest.fn(() => of(contentDetailsResponse));
-            jest.spyOn(mockContentService, 'getContentHeirarchy').mockReturnValue(of(mockcontentHirerachyResponse));
             mockZone.run = jest.fn((fn) => fn());
-            spyOn(enrolledCourseDetailsPage, 'extractApiResponse').and.stub();
-            spyOn(enrolledCourseDetailsPage, 'getContentState').and.stub();
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockLocation.back = jest.fn();
+            mockTelemetryGeneratorService.generateCancelDownloadTelemetry = jest.fn();
+            mockContentService.cancelDownload = jest.fn(() => of(undefined));
             // act
-            enrolledCourseDetailsPage.setContentDetails('do_21281258639073280011490');
+            enrolledCourseDetailsPage.cancelDownload();
             // assert
             setTimeout(() => {
-                expect(mockContentService.getContentDetails).toHaveBeenCalledWith(option);
                 expect(mockZone.run).toHaveBeenCalled();
-                expect(mockContentService.getContentHeirarchy).toBeCalled();
-                expect(enrolledCourseDetailsPage.getContentState).toBeCalled();
-                expect(enrolledCourseDetailsPage.extractApiResponse).toHaveBeenCalled();
+                expect(mockHeaderService.showHeaderWithBackButton).toBeCalled();
+                expect(mockLocation.back).toBeCalled();
+                expect(mockTelemetryGeneratorService.generateCancelDownloadTelemetry).toHaveBeenCalled();
+                expect(mockContentService.cancelDownload).toHaveBeenCalled();
                 done();
             }, 0);
         });
-
-        it('should fail getContentHeirarchy() response', (done) => {
+        it('should display header even api fails', (done) => {
             // arrange
-            const option: ContentDetailRequest = {
-                contentId: 'do_21281258639073280011490',
-                attachFeedback: true,
-                emitUpdateIfAny: true,
-                attachContentAccess: true
-            };
-            contentDetailsResponse.isAvailableLocally = false;
-            mockContentService.getContentDetails = jest.fn(() => of(contentDetailsResponse));
             mockZone.run = jest.fn((fn) => fn());
-            spyOn(enrolledCourseDetailsPage, 'extractApiResponse').and.stub();
-            spyOn(enrolledCourseDetailsPage, 'getContentState').and.stub();
-            jest.spyOn(mockContentService, 'getContentHeirarchy').mockReturnValue(of(Promise.reject({})));
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockLocation.back = jest.fn();
+            mockTelemetryGeneratorService.generateCancelDownloadTelemetry = jest.fn();
+            mockContentService.cancelDownload = jest.fn(() => throwError({ error: 'error' }));
             // act
-            enrolledCourseDetailsPage.setContentDetails('do_21281258639073280011490');
+            enrolledCourseDetailsPage.cancelDownload();
             // assert
             setTimeout(() => {
-                expect(mockContentService.getContentDetails).toHaveBeenCalledWith(option);
                 expect(mockZone.run).toHaveBeenCalled();
-                expect(mockContentService.getContentHeirarchy).toBeCalled();
-                expect(enrolledCourseDetailsPage.getContentState).not.toBeCalled();
-                expect(enrolledCourseDetailsPage.extractApiResponse).toHaveBeenCalled();
+                expect(mockHeaderService.showHeaderWithBackButton).toBeCalled();
+                expect(mockLocation.back).toBeCalled();
+                expect(mockTelemetryGeneratorService.generateCancelDownloadTelemetry).toHaveBeenCalled();
+                expect(mockContentService.cancelDownload).toHaveBeenCalled();
                 done();
             }, 0);
         });
+    });
 
-        it('should fail getContentHeirarchy() response', (done) => {
+    describe('updateEnrolledCourseData', () => {
+        it('should update enroll details list by invoked updateEnrolledCourseData()', (done) => {
             // arrange
-            const option: ContentDetailRequest = {
-                contentId: 'do_21281258639073280011490',
-                attachFeedback: true,
-                emitUpdateIfAny: true,
-                attachContentAccess: true
+            mockCourseService.getEnrolledCourses = jest.fn(() => of([{
+                batchId: 'sample-batch-id',
+                courseId: 'sample-course-id'
+            }]));
+            enrolledCourseDetailsPage.courseCardData = {
+                batchId: 'sample-batch-id'
             };
-            contentDetailsResponse.isAvailableLocally = true;
-            mockContentService.getContentDetails = jest.fn(() => of(contentDetailsResponse));
-            mockZone.run = jest.fn((fn) => fn());
-            spyOn(enrolledCourseDetailsPage, 'extractApiResponse').and.stub();
-            jest.spyOn(mockContentService, 'getContentHeirarchy');
+            mockAppGlobalService.setEnrolledCourseList = jest.fn();
             // act
-            enrolledCourseDetailsPage.setContentDetails('do_21281258639073280011490');
+            enrolledCourseDetailsPage.updateEnrolledCourseData();
             // assert
             setTimeout(() => {
-                expect(mockContentService.getContentDetails).toHaveBeenCalledWith(option);
-                expect(mockZone.run).toHaveBeenCalled();
-                expect(mockContentService.getContentHeirarchy).not.toBeCalled();
-                expect(enrolledCourseDetailsPage.extractApiResponse).toHaveBeenCalled();
+                expect(mockAppGlobalService.setEnrolledCourseList).toHaveBeenCalled();
+                expect(mockCourseService.getEnrolledCourses).toHaveBeenCalled();
                 done();
             }, 0);
         });
+    });
 
-        it('should not return content details for networkError  by called setContentDetails()', (done) => {
+    describe('subscribeUtilityEvents()', () => {
+        it('#subscribeUtilityEvents should handle error condition', (done) => {
             // arrange
-            const option: ContentDetailRequest = {
-                contentId: 'do_21281258639073280011490',
-                attachFeedback: true,
-                emitUpdateIfAny: true,
-                attachContentAccess: true
-            };
-            mockContentService.getContentDetails = jest.fn(() => throwError(contentDetailsResponse));
-            mockCommonUtilService.showToast = jest.fn(() => 'Error fetching data');
-            mockLocation.back = jest.fn();
-            // act
-            enrolledCourseDetailsPage.setContentDetails('do_21281258639073280011490');
+            mockUtilityService.getBuildConfigValue = jest.fn(() => Promise.reject(true));
+            mockEvents.subscribe = jest.fn(() => ({ batchId: 'SAMPLE_BATCH_ID', courseId: 'SAMPLE_COURSE_ID' }));
+            spyOn(enrolledCourseDetailsPage, 'updateEnrolledCourseData').and.stub();
+            spyOn(enrolledCourseDetailsPage, 'getBatchDetails').and.stub();
             // assert
+            enrolledCourseDetailsPage.subscribeUtilityEvents();
+            // act
             setTimeout(() => {
-                expect(mockContentService.getContentDetails).toHaveBeenCalledWith(option);
-                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_FETCHING_DATA');
-                expect(mockLocation.back).toHaveBeenCalled();
+                expect(enrolledCourseDetailsPage.baseUrl).toBe('');
+                expect(mockUtilityService.getBuildConfigValue).toHaveBeenCalled();
+                expect(mockEvents.subscribe).toHaveBeenCalled();
                 done();
             }, 0);
         });
-    });
 
-    describe('getBatchDetails()', () => {
-        it('should return course batch details of expire date start date by invoked getBatchDetails() for identifier', (done) => {
+        it('should update courseCard data and return base url by invoked subscribeUtilityEvents()', (done) => {
             // arrange
-            enrolledCourseDetailsPage.batchDetails = {
-                courseId: 'sample_course_id',
-                identifier: PreferenceKey.COURSE_IDENTIFIER,
-                status: 2
-            };
-            enrolledCourseDetailsPage.courseCardData = {
-                batchId: 'sample_batch_id'
-            };
-            mockCourseService.getBatchDetails = jest.fn(() => of(enrolledCourseDetailsPage.batchDetails));
-            spyOn(enrolledCourseDetailsPage, 'handleUnenrollButton').and.stub();
-            spyOn(enrolledCourseDetailsPage, 'saveContentContext').and.stub();
-            mockPreferences.getString = jest.fn(() => of(PreferenceKey.COURSE_IDENTIFIER));
+            mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('some_uid'));
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+            mockUtilityService.getBuildConfigValue = jest.fn(() => Promise.resolve('SAMPLE_BASE_URL'));
+            mockEvents.subscribe = jest.fn((_, fn) => fn({ batchId: 'SAMPLE_BATCH_ID', courseId: 'SAMPLE_COURSE_ID' }));
+            jest.spyOn(enrolledCourseDetailsPage, 'updateEnrolledCourseData').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            enrolledCourseDetailsPage.course = { createdBy: 'SAMPLE_CREATOR' };
+            enrolledCourseDetailsPage.stickyPillsRef = {
+                nativeElement: {
+                    classList: { remove: jest.fn(), add: jest.fn() }
+                }
+            };
+            mockCommonUtilService.getLoader = jest.fn();
+            mockCommonUtilService.translateMessage = jest.fn(() => ('YOU_MUST_JOIN_AN_ACTIVE_BATCH'));
+            spyOn(enrolledCourseDetailsPage, 'getAllBatches').and.stub();
+            mockCourseService.getEnrolledCourses = jest.fn(() => of([{ courseId: 'SAMPLE_IDETIFIER' }]));
+            spyOn(enrolledCourseDetailsPage, 'getBatchDetails').and.stub();
+            spyOn(enrolledCourseDetailsPage, 'joinTraining').and.stub();
+            jest.spyOn(enrolledCourseDetailsPage, 'getContentState').mockImplementation(() => {
+                return;
+            });
             // act
-            enrolledCourseDetailsPage.getBatchDetails();
+            enrolledCourseDetailsPage.subscribeUtilityEvents();
             // assert
             setTimeout(() => {
-                expect(mockCourseService.getBatchDetails).toHaveBeenCalledWith(enrolledCourseDetailsPage.courseCardData);
-                expect(mockPreferences.getString).toHaveBeenCalledWith(PreferenceKey.COURSE_IDENTIFIER);
+                expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
+                expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+                expect(enrolledCourseDetailsPage.baseUrl).toBe('SAMPLE_BASE_URL');
+                expect(mockUtilityService.getBuildConfigValue).toHaveBeenCalled();
+                expect(enrolledCourseDetailsPage.course.createdBy).not.toEqual('SAMPLE_USER');
+                // expect(mockCourseService.getEnrolledCourses).toHaveBeenCalled();
+                expect(enrolledCourseDetailsPage.updateEnrolledCourseData).toBeCalled();
+                expect(enrolledCourseDetailsPage.getAllBatches).toBeCalled();
+                expect(enrolledCourseDetailsPage.getBatchDetails).toHaveBeenCalled();
+                expect(enrolledCourseDetailsPage.joinTraining).toBeCalled();
+                expect(mockEvents.subscribe).toHaveBeenCalled();
                 done();
             }, 0);
         });
+    });
 
-        it('should return course batch details of expire date start date by invoked getBatchDetails() for status 2', (done) => {
-            // arrange
-            enrolledCourseDetailsPage.batchDetails = {
-                courseId: 'sample_course_id',
-                identifier: PreferenceKey.DEPLOYMENT_KEY,
-                status: 2
-            };
-            enrolledCourseDetailsPage.courseCardData = {
-                batchId: 'sample_batch_id'
-            };
-            mockCourseService.getBatchDetails = jest.fn(() => of(enrolledCourseDetailsPage.batchDetails));
-            spyOn(enrolledCourseDetailsPage, 'handleUnenrollButton').and.stub();
-            spyOn(enrolledCourseDetailsPage, 'saveContentContext').and.stub();
-            mockPreferences.getString = jest.fn(() => of(PreferenceKey.COURSE_IDENTIFIER));
+    describe('extractApiResponse()', () => {
+        it('should return last played content and license', () => {
+            // assert
+            const response = contentDetailsResponse;
+            spyOn(enrolledCourseDetailsPage, 'generateImpressionEvent');
+            spyOn(enrolledCourseDetailsPage, 'generateStartEvent');
+            spyOn(enrolledCourseDetailsPage, 'setCourseStructure');
+            spyOn(enrolledCourseDetailsPage, 'setChildContents');
+            enrolledCourseDetailsPage.courseCardData = { lastReadContentId: 'SAMPLE_LAST_READ_CONTENT' };
+            mockHeaderService.showHeaderWithBackButton = jest.fn(() => { });
+            mockCommonUtilService.showToast = jest.fn(() => 'COURSE_NOT_AVAILABLE');
+            mockLocation.back = jest.fn();
+            spyOn(enrolledCourseDetailsPage, 'getBatchDetails').and.stub();
             // act
-            enrolledCourseDetailsPage.getBatchDetails();
+            enrolledCourseDetailsPage.extractApiResponse(response);
             // assert
-            setTimeout(() => {
-                expect(mockCourseService.getBatchDetails).toHaveBeenCalledWith(enrolledCourseDetailsPage.courseCardData);
-                expect(mockPreferences.getString).toHaveBeenCalledWith(PreferenceKey.COURSE_IDENTIFIER);
-                done();
-            }, 0);
+            expect(enrolledCourseDetailsPage.generateImpressionEvent).toBeCalled();
+            expect(enrolledCourseDetailsPage.generateStartEvent).toBeCalled();
+            expect(response.contentData.status).not.toBe('Live');
+            expect(mockCommonUtilService.showToast).toHaveBeenCalled();
+            expect(response.contentData.me_averageRating).toBe(4);
+            expect(mockLocation.back).toHaveBeenCalled();
         });
 
-        it('should return course batch details of expire date start date by invoked getBatchDetails() for status zero', (done) => {
-            // arrange
-            enrolledCourseDetailsPage.batchDetails = {
-                courseId: 'sample_course_id',
-                identifier: PreferenceKey.DEPLOYMENT_KEY,
-                status: 0
-            };
-            enrolledCourseDetailsPage.courseCardData = {
-                batchId: 'sample_batch_id'
-            };
-            mockCourseService.getBatchDetails = jest.fn(() => of(enrolledCourseDetailsPage.batchDetails));
-            spyOn(enrolledCourseDetailsPage, 'handleUnenrollButton').and.stub();
-            spyOn(enrolledCourseDetailsPage, 'saveContentContext').and.stub();
-            mockPreferences.getString = jest.fn(() => of(PreferenceKey.COURSE_IDENTIFIER));
+        it('should return import content if data is not available for extractApiResponse', () => {
+            // assert
+            const response = mockEnrolledData.extras.state.content;
+            mockHeaderService.showHeaderWithBackButton = jest.fn(() => { });
+            mockCommonUtilService.showToast = jest.fn(() => 'COURSE_NOT_AVAILABLE');
+            mockLocation.back = jest.fn();
+            mockTelemetryGeneratorService.generateSpineLoadingTelemetry = jest.fn();
+            enrolledCourseDetailsPage.didViewLoad = true;
+            mockHeaderService.hideHeader = jest.fn();
+            spyOn(enrolledCourseDetailsPage, 'importContent').and.stub();
+            spyOn(enrolledCourseDetailsPage, 'setCourseStructure').and.stub();
+            spyOn(enrolledCourseDetailsPage, 'getBatchDetails').and.stub();
             // act
-            enrolledCourseDetailsPage.getBatchDetails();
+            enrolledCourseDetailsPage.extractApiResponse(response);
             // assert
-            setTimeout(() => {
-                expect(mockCourseService.getBatchDetails).toHaveBeenCalledWith(enrolledCourseDetailsPage.courseCardData);
-                expect(mockPreferences.getString).toHaveBeenCalledWith(PreferenceKey.COURSE_IDENTIFIER);
-                done();
-            }, 0);
+            expect(mockCommonUtilService.showToast).toHaveBeenCalled();
+            expect(mockLocation.back).toHaveBeenCalled();
+            expect(enrolledCourseDetailsPage.didViewLoad).toBeTruthy();
         });
-
-        it('should saved content context by invoked getBatchDetails() for catch part', (done) => {
+    });
+    describe('checkCurrentUserType', () => {
+        it('should checked current user type for cath part by invoked checkCurrentUserType()', () => {
             // arrange
-            enrolledCourseDetailsPage.batchDetails = {
-                courseId: 'sample_course_id',
-                identifier: PreferenceKey.COURSE_IDENTIFIER,
-                status: 2
-            };
-            enrolledCourseDetailsPage.courseCardData = {
-                batchId: 'sample_batch_id',
-                batch: 'SAMPLE_BATCH'
-            };
-            mockCourseService.getBatchDetails = jest.fn(() => throwError(enrolledCourseDetailsPage.batchDetails));
-            spyOn(enrolledCourseDetailsPage, 'saveContentContext').and.stub();
+            enrolledCourseDetailsPage.isGuestUser = true;
+            mockAppGlobalService.getGuestUserInfo = jest.fn(() => Promise.reject('SAMPLE_USER'));
             // act
-            enrolledCourseDetailsPage.getBatchDetails();
+            enrolledCourseDetailsPage.checkCurrentUserType();
             // assert
-            setTimeout(() => {
-                expect(mockCourseService.getBatchDetails).toHaveBeenCalledWith(
-                    { batchId: enrolledCourseDetailsPage.courseCardData.batchId });
-                done();
-            }, 0);
+            expect(mockAppGlobalService.getGuestUserInfo).toHaveBeenCalled();
         });
     });
 
-    describe('openBrowser()', () => {
-        it('should open a url in Browser by invoked()', () => {
+    describe('joinTraining()', () => {
+        it('should show error toast if no batches available', async (done) => {
             // arrange
-            mockCommonUtilService.openUrlInBrowser = jest.fn();
+            enrolledCourseDetailsPage.batches = [];
+            mockCommonUtilService.showToast = jest.fn();
             // act
-            enrolledCourseDetailsPage.openBrowser('url');
+            await enrolledCourseDetailsPage.joinTraining();
             // assert
-            expect(mockCommonUtilService.openUrlInBrowser).toHaveBeenCalled();
+            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('NO_BATCHES_AVAILABLE');
+            done();
         });
-    });
 
-    describe('saveContentContext()', () => {
-        it('should saved context of content by invoked saveContentContext()', () => {
+        it('should show error toast if single enrolment expired batch', async (done) => {
             // arrange
-            const userId = 'sample-user-id';
-            const courseId = 'course-card';
-            const batchId = 'sample-batch-id';
-            const batchStatus = 2;
-            mockPreferences.putString = jest.fn(() => of());
+            enrolledCourseDetailsPage.batches = [{
+                enrollmentEndDate: '2020-04-23'
+            }];
+            mockCommonUtilService.showToast = jest.fn();
+            mockDatePipe.transform = jest.fn((v) => v);
             // act
-            enrolledCourseDetailsPage.saveContentContext(userId, courseId, batchId, batchStatus);
+            await enrolledCourseDetailsPage.joinTraining();
             // assert
-            expect(mockPreferences.putString).toHaveBeenCalledWith(PreferenceKey.CONTENT_CONTEXT, expect.any(String));
-            expect(Boolean(batchStatus)).toBeTruthy();
+            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ENROLLMENT_ENDED_ON', null, null, null, null, '2020-04-23');
+            done();
         });
-    });
 
-    describe('getBatchCreatorName()', () => {
-        it('should return batch creator name by invoked getBatchCreatorName()', () => {
+        it('should be joined training for logged in user', async (done) => {
             // arrange
-            enrolledCourseDetailsPage.batchDetails = {
-                courseId: 'sample_course_id',
-                createdBy: 'sample-creator',
-                creatorDetails: {
-                    firstName: '',
-                    lastName: ''
-                }
-            };
-            const req: ServerProfileDetailsRequest = {
-                userId: enrolledCourseDetailsPage.batchDetails.createdBy,
-                requiredFields: ProfileConstants.REQUIRED_FIELDS
-            };
-            const respones: Partial<ServerProfile> = {
-                firstName: 'F_NAME',
-                lastName: 'L_NAME'
-            };
-            mockProfileService.getServerProfilesDetails = jest.fn(() => of(respones));
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ canDelete: '' }))
+            } as any)));
+            mockCourseService.getBatchDetails = jest.fn(() => of(enrolledCourseDetailsPage.batchDetails));
+            mockCommonUtilService.translateMessage = jest.fn(() => '');
+            mockCommonUtilService.networkInfo.isNetworkAvailable = true;
+            spyOn(enrolledCourseDetailsPage, 'navigateToBatchListPage').and.stub();
+            spyOn(mockCourseService, 'getBatchDetails').and.stub();
+            enrolledCourseDetailsPage.batches = [{}, {}];
             // act
-            enrolledCourseDetailsPage.getBatchCreatorName();
+            enrolledCourseDetailsPage.joinTraining();
             // assert
-            expect(mockProfileService.getServerProfilesDetails).toHaveBeenCalledWith(req);
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalled();
+                done();
+            }, 0);
         });
     });
 
-    describe('setCourseStructure()', () => {
-        it('should be set course structure if contentTypesCount is not object for course', () => {
+    describe('rateContent()', () => {
+        it('should not show user rating for content if guest user', (done) => {
             // arrange
-            enrolledCourseDetailsPage.course = {
-                contentTypesCount: 'course'
-            };
-            JSON.parse = jest.fn().mockImplementationOnce(() => {
-                return enrolledCourseDetailsPage.course.contentTypesCount;
-            });
+            enrolledCourseDetailsPage.isGuestUser = true;
+            mockCommonUtilService.isAccessibleForNonStudentRole = jest.fn(() => true);
+            enrolledCourseDetailsPage.profileType = ProfileType.TEACHER;
+            mockCommonUtilService.showToast = jest.fn();
             // act
-            enrolledCourseDetailsPage.setCourseStructure();
+            enrolledCourseDetailsPage.rateContent('');
             // assert
-            expect(isObject(enrolledCourseDetailsPage.course.contentTypesCount)).toBeFalsy();
+            setTimeout(() => {
+                expect(enrolledCourseDetailsPage.isGuestUser).toBeTruthy();
+                expect(mockCommonUtilService.isAccessibleForNonStudentRole).toHaveBeenCalledWith(ProfileType.TEACHER);
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('SIGNIN_TO_USE_FEATURE');
+                done();
+            }, 0);
         });
 
-        it('should be set course structure if contentTypesCount is object for course', () => {
+        it('should not show user rating for content if content is not available locally and user in not a guest user', (done) => {
             // arrange
+            enrolledCourseDetailsPage.isGuestUser = false;
             enrolledCourseDetailsPage.course = {
-                contentTypesCount: {}
+                isAvailableLocally: false
             };
+            mockCommonUtilService.showToast = jest.fn();
             // act
-            enrolledCourseDetailsPage.setCourseStructure();
+            enrolledCourseDetailsPage.rateContent('');
             // assert
-            expect(isObject(enrolledCourseDetailsPage.course.contentTypesCount)).toBeTruthy();
+            setTimeout(() => {
+                expect(enrolledCourseDetailsPage.isGuestUser).toBeFalsy();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('TRY_BEFORE_RATING');
+                done();
+            }, 0);
         });
 
-        it('should be set course structure if contentTypesCount is not object for courseCard', () => {
+        it('should show user rating for content for loggedin user', (done) => {
             // arrange
+            enrolledCourseDetailsPage.isGuestUser = false;
             enrolledCourseDetailsPage.course = {
+                isAvailableLocally: true
             };
-            enrolledCourseDetailsPage.courseCardData = {
-                contentTypesCount: 'sample-content-count'
-            };
-            JSON.parse = jest.fn().mockImplementationOnce(() => {
-                return enrolledCourseDetailsPage.courseCardData.contentTypesCount;
-            });
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { message: 'rating.success', rating: 2, comment: 'some_comment' } }))
+            } as any)));
             // act
-            enrolledCourseDetailsPage.setCourseStructure();
+            enrolledCourseDetailsPage.rateContent('');
             // assert
-            expect(isObject(enrolledCourseDetailsPage.course.contentTypesCount)).toBeFalsy();
+            setTimeout(() => {
+                expect(enrolledCourseDetailsPage.isGuestUser).toBeFalsy();
+                expect(mockPopoverCtrl.create).not.toBeUndefined();
+                expect(enrolledCourseDetailsPage.userRating).toBe(2);
+                expect(enrolledCourseDetailsPage.ratingComment).toBe('some_comment');
+                done();
+            }, 0);
         });
     });
 
-    describe('getImportContentRequestBody()', () => {
-        it('should get import content body by invoked getImportContentRequestBody()', () => {
+    describe('showOverflowMenu()', () => {
+        it('should show traning leave popover by invoked showOverflowMenu()', (done) => {
             // arrange
-            const identifiers = ['do_101', 'do_102', 'do_103'];
+            const event = {};
+            const presentFn = jest.fn(() => ({}));
+            const onDidDismissFn = jest.fn(() => ({ data: { unenroll: true } }));
+            mockPopoverCtrl.create = jest.fn(() => ({
+                present: presentFn,
+                onDidDismiss: onDidDismissFn
+            }) as any);
+            jest.spyOn(enrolledCourseDetailsPage, 'showConfirmAlert').mockImplementation(() => {
+                return Promise.resolve();
+            });
             // act
-            enrolledCourseDetailsPage.getImportContentRequestBody(identifiers, true);
-            // asert
-            expect(identifiers.length).toBeGreaterThan(0);
+            enrolledCourseDetailsPage.showOverflowMenu(event);
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(presentFn).toHaveBeenCalled();
+                expect(onDidDismissFn).toHaveBeenCalled();
+                done();
+            }, 0);
         });
     });
 
-    describe('refreshHeader()', () => {
-        it('should refreshed header for refreshHeader()', () => {
+    describe('handleUnenrollment()', () => {
+        it('should handle unenrolled for enrolled course', (done) => {
             // arrange
-            mockEvents.publish = jest.fn();
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockAppGlobalService.getUserId = jest.fn(() => 'sample_user_id');
+            enrolledCourseDetailsPage.batchDetails = {
+                id: 'some_id',
+                courseId: 'course_id'
+            };
+            mockZone.run = jest.fn((fn) => fn());
+            mockCourseService.unenrollCourse = jest.fn(() => of(true));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'COURSE_UNENROLLED');
+            mockCommonUtilService.showToast = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
             // act
-            enrolledCourseDetailsPage.refreshHeader();
+            enrolledCourseDetailsPage.handleUnenrollment(true);
             // assert
-            expect(mockEvents.publish).toHaveBeenCalledWith('header:setzIndexToNormal');
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(mockCourseService.unenrollCourse).toHaveBeenCalledWith({
+                    userId: 'sample_user_id',
+                    courseId: 'course_id',
+                    batchId: 'some_id'
+                });
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    InteractSubtype.UNENROL_SUCCESS,
+                    Environment.HOME,
+                    PageId.COURSE_DETAIL,
+                    { id: 'do_21281258639073280011490', type: 'Course', version: '2' },
+                    undefined,
+                    {},
+                    undefined
+                );
+                expect(mockEvents.publish).toHaveBeenCalled();
+                done();
+            }, 0);
         });
-    });
-
-    // it('should be imported all contents', (done) => {
-    //     // arrange
-    //     const identifiers = ['do_101'];
-    //     const isChild = true;
-    //     const isDownloadAllClicked = true;
-    //     const contentImportedData = [{
-    //         isChildContent: true,
-    //         destinationFolder: 'sampke-destination-folder',
-    //         contentId: 'do_101'
-    //     }];
-    //     const option: ContentImportRequest = {
-    //         contentImportArray: contentImportedData,
-    //         contentStatusArray: ['Live'],
-    //         fields: ['appIcon', 'name', 'subject', 'size', 'gradeLevel']
-    //       };
-    //     mockContentService.importContent = jest.fn(() => of([]));
-    //     // act
-    //     enrolledCourseDetailsPage.importContent(identifiers, isChild, isDownloadAllClicked);
-    //     // assert
-    //     setTimeout(() => {
-    //         expect(mockContentService.importContent).toHaveBeenCalledWith(option);
-    //         done();
-    //     }, 0);
-    // });
 
-    describe('showDownloadConfirmationAlert()', () => {
-        it('should show DownloadConfirmation Popup', () => {
+        it('should handle unenrolled for enrolled course for error part of UNENROL_COURSE_SUCCESS', (done) => {
             // arrange
-            const presentFn = jest.fn(() => ({}));
-            const onDidDismissFn = jest.fn(() => ({ data: { unenroll: true } }));
-            mockPopoverCtrl.create = jest.fn(() => ({
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
                 present: presentFn,
-                onDidDismiss: onDidDismissFn
-            }) as any);
-            mockFileSizePipe.transform = jest.fn();
-            mockDatePipe.transform = jest.fn();
-            enrolledCourseDetailsPage.courseCardData = mockCourseCardData;
-            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
-            enrolledCourseDetailsPage.downloadIdentifiers = new Set(['do_12345']);
+                dismiss: dismissFn,
+            }));
+            enrolledCourseDetailsPage.batchDetails = {
+                id: '',
+                courseId: ''
+            };
+            mockZone.run = jest.fn((fn) => fn());
+            mockAppGlobalService.getUserId = jest.fn(() => 'SAMPLE_USER_ID');
+            const unenrolCourseRequest: UnenrollCourseRequest = {
+                userId: 'SAMPLE_USER_ID',
+                courseId: enrolledCourseDetailsPage.batchDetails.courseId,
+                batchId: enrolledCourseDetailsPage.batchDetails.id
+            };
+            mockCourseService.unenrollCourse = jest.fn(() => throwError(''));
+            mockCommonUtilService.showToast = jest.fn();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.translateMessage = jest.fn();
             // act
-            enrolledCourseDetailsPage.showDownloadConfirmationAlert();
+            enrolledCourseDetailsPage.handleUnenrollment(true);
             // assert
-            expect(mockPopoverCtrl.create).toHaveBeenCalled();
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(mockCourseService.unenrollCourse).toHaveBeenCalledWith(unenrolCourseRequest);
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith(
+                    expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('FRMELEMNTS_MSG_UNABLE_TO_ENROLL'));
+                done();
+            }, 0);
         });
-    });
 
-    describe('getContentsSize()', () => {
-        it('should populate downloadIdentifiers', () => {
+        it('should handle unenrolled for enrolled course for error part of ERROR_NO_INTERNET_MESSAGE', (done) => {
             // arrange
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            enrolledCourseDetailsPage.batchDetails = {
+                id: '',
+                courseId: ''
+            };
+            mockZone.run = jest.fn((fn) => fn());
+            mockAppGlobalService.getUserId = jest.fn(() => 'SAMPLE_USER_ID');
+            const unenrolCourseRequest: UnenrollCourseRequest = {
+                userId: 'SAMPLE_USER_ID',
+                courseId: enrolledCourseDetailsPage.batchDetails.courseId,
+                batchId: enrolledCourseDetailsPage.batchDetails.id
+            };
+            mockCourseService.unenrollCourse = jest.fn(() => throwError({ error: 'CONNECTION_ERROR' }));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'course unenrolled');
+            mockCommonUtilService.showToast = jest.fn();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
             // act
-            enrolledCourseDetailsPage.getContentsSize(mockGetChildDataResponse);
+            enrolledCourseDetailsPage.handleUnenrollment(true);
             // assert
-            expect(enrolledCourseDetailsPage.downloadIdentifiers.size).toEqual(4);
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(mockCourseService.unenrollCourse).toHaveBeenCalledWith(unenrolCourseRequest);
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('course unenrolled');
+                done();
+            }, 0);
         });
     });
 
-    describe('importContent()', () => {
-        it('should populate queuedIdentifiers', () => {
+    describe('setContentDetails()', () => {
+        it('should return content details for extractApiResponse by called setContentDetails()', (done) => {
             // arrange
+            const option: ContentDetailRequest = {
+                contentId: 'do_21281258639073280011490',
+                attachFeedback: true,
+                emitUpdateIfAny: true,
+                attachContentAccess: true
+            };
+            contentDetailsResponse.isAvailableLocally = false;
+            mockContentService.getContentDetails = jest.fn(() => of(contentDetailsResponse));
+            jest.spyOn(mockContentService, 'getContentHeirarchy').mockReturnValue(of(mockcontentHirerachyResponse));
+            mockZone.run = jest.fn((fn) => fn());
+            spyOn(enrolledCourseDetailsPage, 'extractApiResponse').and.stub();
+            spyOn(enrolledCourseDetailsPage, 'getContentState').and.stub();
             // act
-            enrolledCourseDetailsPage.importContent(['do_21274246255366963214046', 'do_21274246302428364814048'], true, true);
+            enrolledCourseDetailsPage.setContentDetails('do_21281258639073280011490');
             // assert
-            expect(enrolledCourseDetailsPage.queuedIdentifiers).toEqual(['do_21274246255366963214046', 'do_21274246302428364814048']);
+            setTimeout(() => {
+                expect(mockContentService.getContentDetails).toHaveBeenCalledWith(option);
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockContentService.getContentHeirarchy).toBeCalled();
+                expect(enrolledCourseDetailsPage.extractApiResponse).toHaveBeenCalled();
+                done();
+            }, 0);
         });
 
-        it('should populate queuedIdentifiers', (done) => {
+        it('should fail getContentHeirarchy() response', (done) => {
             // arrange
-            const data = mockImportContentResponse;
-            data[0].status = -1;
-            mockContentService.importContent = jest.fn(() => of(data));
-            enrolledCourseDetailsPage.isDownloadStarted = true;
-            enrolledCourseDetailsPage.queuedIdentifiers = [];
-            enrolledCourseDetailsPage.faultyIdentifiers = [
-                {}
-            ];
+            const option: ContentDetailRequest = {
+                contentId: 'do_21281258639073280011490',
+                attachFeedback: true,
+                emitUpdateIfAny: true,
+                attachContentAccess: true
+            };
+            contentDetailsResponse.isAvailableLocally = false;
+            mockContentService.getContentDetails = jest.fn(() => of(contentDetailsResponse));
+            mockZone.run = jest.fn((fn) => fn());
+            spyOn(enrolledCourseDetailsPage, 'extractApiResponse').and.stub();
+            spyOn(enrolledCourseDetailsPage, 'getContentState').and.stub();
+            jest.spyOn(mockContentService, 'getContentHeirarchy').mockReturnValue(of(Promise.reject({})));
             // act
-            enrolledCourseDetailsPage.importContent(['do_21274246255366963214046', 'do_21274246302428364814048'], true, false);
+            enrolledCourseDetailsPage.setContentDetails('do_21281258639073280011490');
             // assert
             setTimeout(() => {
-                expect(mockHeaderService.showHeaderWithBackButton).toBeCalled();
-                expect(mockCommonUtilService.showToast).toBeCalledWith('UNABLE_TO_FETCH_CONTENT');
+                expect(mockContentService.getContentDetails).toHaveBeenCalledWith(option);
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockContentService.getContentHeirarchy).toBeCalled();
+                expect(enrolledCourseDetailsPage.getContentState).not.toBeCalled();
+                expect(enrolledCourseDetailsPage.extractApiResponse).toHaveBeenCalled();
                 done();
             }, 0);
         });
-    });
-
 
-    describe('promptToLogin()', () => {
-        it('should show the Login Popup', () => {
+        it('should fail getContentHeirarchy() response', (done) => {
             // arrange
-            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
-                present: jest.fn(() => Promise.resolve({})),
-                onDidDismiss: jest.fn(() => Promise.resolve({ canDelete: '' }))
-            } as any)));
+            const option: ContentDetailRequest = {
+                contentId: 'do_21281258639073280011490',
+                attachFeedback: true,
+                emitUpdateIfAny: true,
+                attachContentAccess: true
+            };
+            contentDetailsResponse.isAvailableLocally = true;
+            mockContentService.getContentDetails = jest.fn(() => of(contentDetailsResponse));
+            mockZone.run = jest.fn((fn) => fn());
+            spyOn(enrolledCourseDetailsPage, 'extractApiResponse').and.stub();
+            jest.spyOn(mockContentService, 'getContentHeirarchy');
             // act
-            enrolledCourseDetailsPage.promptToLogin({});
+            enrolledCourseDetailsPage.setContentDetails('do_21281258639073280011490');
             // assert
-            expect(mockPopoverCtrl.create).toHaveBeenCalledWith(
-                {
-                    component: SbPopoverComponent,
-                    componentProps: {
-                        actionsButtons: [
-                            {
-                                btnClass: 'popover-color',
-                                btntext: '',
-
-                            },
-
-                        ],
-                        isNotShowCloseIcon: true,
-                        metaInfo: '',
-                        sbPopoverHeading: '',
-                        sbPopoverMainTitle: '',
-
-                    },
-                    cssClass: 'sb-popover info',
-                });
+            setTimeout(() => {
+                expect(mockContentService.getContentDetails).toHaveBeenCalledWith(option);
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockContentService.getContentHeirarchy).not.toBeCalled();
+                expect(enrolledCourseDetailsPage.extractApiResponse).toHaveBeenCalled();
+                done();
+            }, 0);
         });
 
-        it('should invoke LoginHandler signin method', (done) => {
+        it('should not return content details for networkError  by called setContentDetails()', (done) => {
             // arrange
-            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
-                present: jest.fn(() => Promise.resolve({})),
-                onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: true } }))
-            } as any)));
-            jest.spyOn(mockLoginHandlerService, 'signIn');
+            const option: ContentDetailRequest = {
+                contentId: 'do_21281258639073280011490',
+                attachFeedback: true,
+                emitUpdateIfAny: true,
+                attachContentAccess: true
+            };
+            mockContentService.getContentDetails = jest.fn(() => throwError(contentDetailsResponse));
+            mockCommonUtilService.showToast = jest.fn(() => 'Error fetching data');
+            mockLocation.back = jest.fn();
             // act
-            enrolledCourseDetailsPage.promptToLogin({ batchId: '0123456' });
+            enrolledCourseDetailsPage.setContentDetails('do_21281258639073280011490');
             // assert
-
             setTimeout(() => {
-                expect(mockLoginHandlerService.signIn).toHaveBeenCalled();
-                expect(mockAppGlobalService.resetSavedQuizContent).toHaveBeenCalled();
+                expect(mockContentService.getContentDetails).toHaveBeenCalledWith(option);
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_FETCHING_DATA');
+                expect(mockLocation.back).toHaveBeenCalled();
                 done();
             }, 0);
-
         });
     });
 
-    describe('populateCorRelationData()', () => {
-        it('should populate correlationData', () => {
+    describe('getContentsSize()', () => {
+        it('should populate downloadIdentifiers', () => {
             // arrange
-            enrolledCourseDetailsPage.corRelationList = undefined;
-            jest.spyOn(mockCommonUtilService, 'deDupe').mockReturnValue([{ id: '', type: 'CourseBatch' }]);
+            enrolledCourseDetailsPage.downloadIdentifiers = {
+                add: jest.fn()
+            } as any;
             // act
-            enrolledCourseDetailsPage.populateCorRelationData(undefined);
+            enrolledCourseDetailsPage.getContentsSize(mockGetChildDataResponse);
             // assert
-            expect(enrolledCourseDetailsPage.corRelationList).toEqual([{ id: '', type: 'CourseBatch' }]);
-
+            expect(enrolledCourseDetailsPage.downloadSize).toEqual(57901354);
         });
     });
 
-    describe('showLicensce()', () => {
-        it('should show license true when user clicked on credits and license', () => {
+    describe('setChildContents()', () => {
+        it('should fetch child contents ', (done) => {
             // arrange
-            enrolledCourseDetailsPage.showCredits = false;
-            jest.spyOn(enrolledCourseDetailsPage, 'licenseSectionClicked').mockImplementation();
+            enrolledCourseDetailsPage.courseCardData = {
+                batchId: '123123123'
+            };
+            mockContentService.getChildContents = jest.fn(() => of({
+                id: 'do-123',
+                children: [{ id: 'do-1-123' }]
+            }));
+            mockZone.run = jest.fn((fn) => fn());
+            enrolledCourseDetailsPage.courseCardData = {
+                batchId: 'sample-batch-id'
+            };
+            jest.spyOn(enrolledCourseDetailsPage, 'getContentState').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(enrolledCourseDetailsPage, 'getContentsSize').mockImplementation(() => {
+                return;
+            });
             // act
-            enrolledCourseDetailsPage.showLicensce();
+            enrolledCourseDetailsPage.setChildContents();
             // assert
-            expect(enrolledCourseDetailsPage.licenseSectionClicked).toHaveBeenCalledWith('expanded');
+            setTimeout(() => {
+                expect(mockContentService.getChildContents).toHaveBeenCalled();
+                expect(enrolledCourseDetailsPage.getContentState).toBeCalledWith(true);
+                expect(enrolledCourseDetailsPage.getContentsSize).toBeCalledWith([{ id: 'do-1-123' }]);
+                expect(enrolledCourseDetailsPage.courseHeirarchy).toStrictEqual({
+                    id: 'do-123',
+                    children: [{ id: 'do-1-123' }]
+                });
+                done();
+            }, 0);
         });
 
-        it('should not show license when user clicked on license and credits', () => {
+        it('should setshowChildrenLoader to false', (done) => {
             // arrange
-            enrolledCourseDetailsPage.showCredits = true;
-            jest.spyOn(enrolledCourseDetailsPage, 'licenseSectionClicked').mockImplementation();
+            const data = {
+                mimeType: 'content',
+                children: [],
+                identifier: 'do_1212123123'
+            };
+            mockContentService.getChildContents = jest.fn(() => throwError({ error: 'error' }));
+            mockZone.run = jest.fn((fn) => fn());
             // act
-            enrolledCourseDetailsPage.showLicensce();
+            enrolledCourseDetailsPage.setChildContents();
             // assert
-            expect(enrolledCourseDetailsPage.licenseSectionClicked).toHaveBeenCalledWith('collapsed');
+            setTimeout(() => {
+                expect(enrolledCourseDetailsPage.showChildrenLoader).toEqual(false);
+                expect(mockContentService.getChildContents).toHaveBeenCalled();
+                expect(mockZone.run).toHaveBeenCalled();
+                done();
+            }, 0);
         });
     });
 
-    describe('licenseSectionClicked()', () => {
-        it('should generate telemetry license expanded when licenseSectionClicked()', () => {
+    describe('openBrowser()', () => {
+        it('should open a url in Browser by invoked()', () => {
             // arrange
-            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.openUrlInBrowser = jest.fn();
             // act
-            enrolledCourseDetailsPage.licenseSectionClicked('expanded');
+            enrolledCourseDetailsPage.openBrowser('url');
             // assert
-            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-                InteractType.LICENSE_CARD_EXPANDED,
-                '',
-                undefined,
-                PageId.COURSE_DETAIL,
-                { id: 'do_21281258639073280011490', type: 'Course', version: '2' },
-                undefined,
-                enrolledCourseDetailsPage.objRollup,
-                [{ id: '', type: 'CourseBatch' }],
-                ID.LICENSE_CARD_CLICKED
-            );
+            expect(mockCommonUtilService.openUrlInBrowser).toHaveBeenCalled();
         });
+    });
 
-        it('should generate telemetry license collapsed when licenseSectionClicked()', () => {
+    describe('getBatchCreatorName()', () => {
+        it('should return batch creator name by invoked getBatchCreatorName()', () => {
             // arrange
-            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            enrolledCourseDetailsPage.batchDetails = {
+                courseId: 'sample_course_id',
+                createdBy: 'sample-creator',
+                creatorDetails: {
+                    firstName: '',
+                    lastName: ''
+                }
+            };
+            const req: ServerProfileDetailsRequest = {
+                userId: enrolledCourseDetailsPage.batchDetails.createdBy,
+                requiredFields: ProfileConstants.REQUIRED_FIELDS
+            };
+            const respones: Partial<ServerProfile> = {
+                firstName: 'F_NAME',
+                lastName: 'L_NAME'
+            };
+            mockProfileService.getServerProfilesDetails = jest.fn(() => of(respones));
             // act
-            enrolledCourseDetailsPage.licenseSectionClicked('collapsed');
+            enrolledCourseDetailsPage.getBatchCreatorName();
             // assert
-            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-                InteractType.LICENSE_CARD_COLLAPSED,
-                '',
-                undefined,
-                PageId.COURSE_DETAIL,
-                { id: 'do_21281258639073280011490', type: 'Course', version: '2' },
-                undefined,
-                enrolledCourseDetailsPage.objRollup,
-                [{ id: '', type: 'CourseBatch' }],
-                ID.LICENSE_CARD_CLICKED
-            );
+            expect(mockProfileService.getServerProfilesDetails).toHaveBeenCalledWith(req);
         });
     });
 
-    describe('getContentState()', () => {
-        it('check', (done) => {
+    describe('setCourseStructure()', () => {
+        it('should be set course structure if contentTypesCount is not object for course', () => {
             // arrange
-            const contentState = {
-                contentList: [
-                    {
-                        status: 1
-                    }, {
-                        status: 2
-                    }
-                ]
+            enrolledCourseDetailsPage.course = {
+                contentTypesCount: 'course'
             };
-            enrolledCourseDetailsPage.courseCardData.batchId = '1234567890';
-            jest.spyOn(mockCourseService, 'getContentState').mockReturnValue(of(contentState));
+            JSON.parse = jest.fn().mockImplementationOnce(() => {
+                return enrolledCourseDetailsPage.course.contentTypesCount;
+            });
             // act
-            enrolledCourseDetailsPage.getContentState(false);
+            enrolledCourseDetailsPage.setCourseStructure();
             // assert
-            setTimeout(() => {
-                expect(enrolledCourseDetailsPage.courseCardData.progress).toEqual(1);
-                done();
-            }, 0);
+            expect(isObject(enrolledCourseDetailsPage.course.contentTypesCount)).toBeFalsy();
         });
-    });
 
-    describe('handleHeaderEvents()', () => {
-        it('should call share()', () => {
+        it('should be set course structure if contentTypesCount is object for course', () => {
             // arrange
-            const event = {
-                name: 'share'
+            enrolledCourseDetailsPage.course = {
+                contentTypesCount: {}
             };
-            jest.spyOn(enrolledCourseDetailsPage, 'share');
             // act
-            enrolledCourseDetailsPage.handleHeaderEvents(event);
+            enrolledCourseDetailsPage.setCourseStructure();
             // assert
-            expect(enrolledCourseDetailsPage.share).toBeCalled();
+            expect(isObject(enrolledCourseDetailsPage.course.contentTypesCount)).toBeTruthy();
         });
 
-        it('should call showOverflowMenu()', () => {
+        it('should be set course structure if contentTypesCount is not object for courseCard', () => {
             // arrange
-            const event = {
-                name: 'more'
+            enrolledCourseDetailsPage.course = {
+            };
+            enrolledCourseDetailsPage.courseCardData = {
+                contentTypesCount: 'sample-content-count'
             };
-            jest.spyOn(enrolledCourseDetailsPage, 'showOverflowMenu');
+            JSON.parse = jest.fn().mockImplementationOnce(() => {
+                return enrolledCourseDetailsPage.courseCardData.contentTypesCount;
+            });
             // act
-            enrolledCourseDetailsPage.handleHeaderEvents(event);
+            enrolledCourseDetailsPage.setCourseStructure();
             // assert
-            expect(enrolledCourseDetailsPage.showOverflowMenu).toBeCalled();
+            expect(isObject(enrolledCourseDetailsPage.course.contentTypesCount)).toBeFalsy();
         });
+    });
 
-        it('should call handleNavBackButton() and goBack()', () => {
+    describe('getImportContentRequestBody()', () => {
+        it('should get import content body by invoked getImportContentRequestBody()', () => {
             // arrange
-            const event = {
-                name: 'back'
-            };
-            spyOn(enrolledCourseDetailsPage, 'handleNavBackButton').and.stub();
+            const identifiers = ['do_101', 'do_102', 'do_103'];
             // act
-            enrolledCourseDetailsPage.handleHeaderEvents(event);
-            // assert
-            expect(enrolledCourseDetailsPage.handleNavBackButton).toBeCalled();
+            enrolledCourseDetailsPage.getImportContentRequestBody(identifiers, true);
+            // asert
+            expect(identifiers.length).toBeGreaterThan(0);
         });
     });
 
-    describe('enrollIntoBatch()', () => {
-        it('should call promptToLogin()', () => {
+    describe('refreshHeader()', () => {
+        it('should refreshed header for refreshHeader()', () => {
             // arrange
-            const batch = {
-                id: '121232312'
-            };
-            jest.spyOn(enrolledCourseDetailsPage, 'promptToLogin');
+            mockEvents.publish = jest.fn();
             // act
-            enrolledCourseDetailsPage.enrollIntoBatch(batch);
+            enrolledCourseDetailsPage.refreshHeader();
             // assert
-            expect(enrolledCourseDetailsPage.promptToLogin).toBeCalled();
+            expect(mockEvents.publish).toHaveBeenCalledWith('header:setzIndexToNormal');
         });
+    });
 
-        it('should should successfuly enroll', (done) => {
+    describe('importContent()', () => {
+        it('should populate queuedIdentifiers', (done) => {
             // arrange
-            const presentFn = jest.fn(() => Promise.resolve());
-            const dismissFn = jest.fn(() => Promise.resolve());
-            mockCommonUtilService.getLoader = jest.fn(() => ({
-                present: presentFn,
-                dismiss: dismissFn,
-            }));
-            const batch = {
-                id: '121232312'
+            mockContentService.importContent = jest.fn(() => of([{
+                status: -1,
+                identifier: 'do-123'
+            }, {
+                identifier: 'do-234',
+                status: 0
+            }]));
+            mockZone.run = jest.fn((fn) => fn());
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            enrolledCourseDetailsPage.isDownloadStarted = true;
+            enrolledCourseDetailsPage.queuedIdentifiers = [];
+            enrolledCourseDetailsPage.faultyIdentifiers = [
+                {}
+            ];
+            enrolledCourseDetailsPage.course = {
+                identifier: 'do-123'
             };
-            enrolledCourseDetailsPage.guestUser = false;
-            spyOn(mockLocalCourseService, 'prepareEnrollCourseRequest').and.stub();
-            jest.spyOn(mockLocalCourseService, 'enrollIntoBatch').mockReturnValue(of({value: 'asdasds'}));
+            mockTelemetryGeneratorService.generateDownloadAllClickTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateErrorTelemetry = jest.fn();
             // act
-            enrolledCourseDetailsPage.enrollIntoBatch(batch);
+            enrolledCourseDetailsPage.importContent(['do_21274246255366963214046', 'do_21274246302428364814048'], true, true);
             // assert
-            expect(mockLocalCourseService.prepareEnrollCourseRequest).toBeCalled();
             setTimeout(() => {
-                expect(presentFn).toBeCalled();
-                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toBeCalled();
-                expect(mockCommonUtilService.translateMessage).toBeCalledWith('COURSE_ENROLLED');
-                expect(mockEvents.publish).toBeCalled();
-                expect(enrolledCourseDetailsPage.isAlreadyEnrolled).toEqual(true);
+                expect(enrolledCourseDetailsPage.showLoading).toBeFalsy();
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateDownloadAllClickTelemetry).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateErrorTelemetry).toHaveBeenCalledWith(
+                    Environment.HOME,
+                    'ERR_DOWNLOAD_FAILED',
+                    ErrorType.SYSTEM,
+                    PageId.COURSE_DETAIL,
+                    expect.any(String)
+                );
                 done();
             }, 0);
         });
 
-        it('should should fail', (done) => {
+        it('should return toast for catch part', (done) => {
             // arrange
-            const presentFn = jest.fn(() => Promise.resolve());
-            const dismissFn = jest.fn(() => Promise.resolve());
-            mockCommonUtilService.getLoader = jest.fn(() => ({
-                present: presentFn,
-                dismiss: dismissFn,
-            }));
-            const batch = {
-                id: '121232312'
-            };
-            enrolledCourseDetailsPage.guestUser = false;
-            spyOn(mockLocalCourseService, 'prepareEnrollCourseRequest').and.stub();
-            jest.spyOn(mockLocalCourseService, 'enrollIntoBatch').mockReturnValue(of(Promise.reject()));
+            mockContentService.importContent = jest.fn(() => throwError({ error: 'NETWORK_ERROR' }));
+            mockZone.run = jest.fn((fn) => fn());
+            enrolledCourseDetailsPage.isDownloadStarted = true;
+            jest.spyOn(enrolledCourseDetailsPage, 'restoreDownloadState').mockImplementation();
             // act
-            enrolledCourseDetailsPage.enrollIntoBatch(batch);
+            enrolledCourseDetailsPage.importContent(['do_21274246255366963214046', 'do_21274246302428364814048'], true, false);
             // assert
-            expect(mockLocalCourseService.prepareEnrollCourseRequest).toBeCalled();
             setTimeout(() => {
-                expect(presentFn).toBeCalled();
-                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toBeCalled();
-                expect(dismissFn).toBeCalled();
-                expect(enrolledCourseDetailsPage.loader).toBeUndefined();
+                expect(mockContentService.importContent).toBeCalled();
+                expect(mockCommonUtilService.showToast).toBeCalledWith('NEED_INTERNET_TO_CHANGE');
                 done();
             }, 0);
         });
     });
 
-    describe('onSegmentChange()', () => {
-        it('should call generateInteractTelemetry()', () => {
+    describe('showDownloadConfirmationAlert()', () => {
+        it('should show DownloadConfirmation Popup', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            enrolledCourseDetailsPage.downloadIdentifiers = {
+                size: 24
+            } as any;
+            enrolledCourseDetailsPage.course = {
+                name: 'sample-course-name'
+            };
+            mockCommonUtilService.translateMessage = jest.fn(() => '');
+            mockCommonUtilService.showToast = jest.fn();
+            enrolledCourseDetailsPage.isBatchNotStarted = true;
+            const presentFn = jest.fn(() => ({}));
+            const onDidDismissFn = jest.fn(() => ({ data: { unenroll: true } }));
+            mockPopoverCtrl.create = jest.fn(() => ({
+                present: presentFn,
+                onDidDismiss: onDidDismissFn
+            }) as any);
+            mockFileSizePipe.transform = jest.fn();
+            enrolledCourseDetailsPage.courseCardData = mockCourseCardData;
+            mockDatePipe.transform = jest.fn(() => 'sample-data');
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            jest.spyOn(enrolledCourseDetailsPage, 'importContent').mockImplementation();
             // act
-            enrolledCourseDetailsPage.onSegmentChange({
-                detail: {
-                    value: 'value'
-                }
-            });
+            enrolledCourseDetailsPage.showDownloadConfirmationAlert();
             // assert
-            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toBeCalled();
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'COURSE_WILL_BE_AVAILABLE', 'sample-data');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'DOWNLOAD');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'DOWNLOAD');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(4, 'ITEMS', 24);
+                expect(mockCommonUtilService.showToast).toHaveBeenCalled();
+                expect(mockDatePipe.transform).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    'download-all-button-clicked',
+                    Environment.HOME,
+                    PageId.COURSE_DETAIL,
+                    undefined,
+                    undefined,
+                );
+                expect(mockEvents.publish).toHaveBeenCalled();
+                done();
+            }, 0);
         });
     });
 
-    describe('handleUnenrollButton()', () => {
-        it('should set showUnenrollButton to true', () => {
+
+    describe('promptToLogin()', () => {
+        it('should invoke LoginHandler signin method', (done) => {
             // arrange
-            enrolledCourseDetailsPage.batchDetails = {
-                status: 1,
-                enrollmentType: 'open'
-            };
-            enrolledCourseDetailsPage.courseCardData = {
-                status: 0
-            };
-            enrolledCourseDetailsPage.course = {
-                progress: 100
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockCommonUtilService.translateMessage = jest.fn(() => 'sample-message');
+            mockCategoryKeyTranslator.transform = jest.fn(() => 'sample-message');
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: true } }))
+            } as any)));
+            enrolledCourseDetailsPage.telemetryObject = {
+                id: 'do_21281258639073280011490',
+                type: 'Course',
+                version: '2',
             };
+            mockPreferences.putString = jest.fn(() => of(undefined));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockAppGlobalService.resetSavedQuizContent = jest.fn();
+            mockLoginHandlerService.signIn = jest.fn(() => Promise.resolve());
             // act
-            enrolledCourseDetailsPage.handleUnenrollButton();
+            enrolledCourseDetailsPage.promptToLogin({});
             // assert
-            expect(enrolledCourseDetailsPage.showUnenrollButton).toEqual(true);
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    ImpressionType.VIEW,
+                    '', PageId.SIGNIN_POPUP,
+                    Environment.HOME,
+                    'do_21281258639073280011490',
+                    'Course',
+                    '2',
+                    {}, undefined
+                );
+                expect(mockPopoverCtrl.create).toHaveBeenCalledWith(
+                    {
+                        component: SbPopoverComponent,
+                        componentProps: {
+                            actionsButtons: [
+                                {
+                                    btnClass: 'popover-color',
+                                    btntext: 'sample-message',
+
+                                },
+
+                            ],
+                            isNotShowCloseIcon: true,
+                            metaInfo: 'sample-message',
+                            sbPopoverHeading: 'sample-message',
+                            sbPopoverMainTitle: 'sample-message',
+
+                        },
+                        cssClass: 'sb-popover info',
+                    });
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'OVERLAY_SIGN_IN');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'OVERLAY_SIGN_IN');
+                expect(mockPreferences.putString).toHaveBeenNthCalledWith(1,
+                    PreferenceKey.BATCH_DETAIL_KEY, JSON.stringify({}));
+                expect(mockPreferences.putString).toHaveBeenNthCalledWith(2,
+                    PreferenceKey.COURSE_DATA_KEY, JSON.stringify({ name: 'sample-course-name' }));
+                expect(mockPreferences.putString).toHaveBeenNthCalledWith(3,
+                    PreferenceKey.CDATA_KEY, JSON.stringify(undefined));
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.LOGIN_CLICKED,
+                    Environment.HOME,
+                    PageId.SIGNIN_POPUP,
+                    {
+                        id: 'do_21281258639073280011490',
+                        type: 'Course',
+                        version: '2',
+                    },
+                    undefined,
+                    {},
+                    undefined
+                );
+                expect(mockAppGlobalService.resetSavedQuizContent).toHaveBeenCalled();
+                expect(mockLoginHandlerService.signIn).toHaveBeenCalled();
+                done();
+            }, 0);
         });
 
-        it('should be set updatedCourseCardData and set showUnenrollButton to true', () => {
+        it('should return popup for else part', (done) => {
             // arrange
-            enrolledCourseDetailsPage.updatedCourseCardData = {
-                status: 0
-            };
-            enrolledCourseDetailsPage.batchDetails = {
-                status: 1,
-                enrollmentType: 'open'
-            };
-            enrolledCourseDetailsPage.course = {
-                progress: 100
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockCommonUtilService.translateMessage = jest.fn(() => 'sample-message');
+            mockCategoryKeyTranslator.transform = jest.fn(() => 'sample-message');
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: false } }))
+            } as any)));
+            enrolledCourseDetailsPage.telemetryObject = {
+                id: 'do_21281258639073280011490',
+                type: 'Course',
+                version: '2',
             };
             // act
-            enrolledCourseDetailsPage.handleUnenrollButton();
+            enrolledCourseDetailsPage.promptToLogin({});
             // assert
-            expect(enrolledCourseDetailsPage.showUnenrollButton).toEqual(true);
+
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    ImpressionType.VIEW,
+                    '', PageId.SIGNIN_POPUP,
+                    Environment.HOME,
+                    'do_21281258639073280011490',
+                    'Course',
+                    '2',
+                    {}, undefined
+                );
+                expect(mockPopoverCtrl.create).toHaveBeenCalledWith(
+                    {
+                        component: SbPopoverComponent,
+                        componentProps: {
+                            actionsButtons: [
+                                {
+                                    btnClass: 'popover-color',
+                                    btntext: 'sample-message',
+
+                                },
+
+                            ],
+                            isNotShowCloseIcon: true,
+                            metaInfo: 'sample-message',
+                            sbPopoverHeading: 'sample-message',
+                            sbPopoverMainTitle: 'sample-message',
+
+                        },
+                        cssClass: 'sb-popover info',
+                    });
+                done();
+            }, 0);
+
         });
+    });
 
-        it('should set showUnenrollButton to false', () => {
+    describe('populateCorRelationData()', () => {
+        it('should populate correlationData', () => {
             // arrange
-            enrolledCourseDetailsPage.updatedCourseCardData = {
-                status: 0
-            };
-            enrolledCourseDetailsPage.batchDetails = {
-                status: 1,
-                enrollmentType: 'invite-only'
-            };
-            enrolledCourseDetailsPage.course = {
-                progress: 100
-            };
+            enrolledCourseDetailsPage.corRelationList = undefined;
+            jest.spyOn(mockCommonUtilService, 'deDupe').mockReturnValue([{ id: '', type: 'CourseBatch' }]);
             // act
-            enrolledCourseDetailsPage.handleUnenrollButton();
+            enrolledCourseDetailsPage.populateCorRelationData(undefined);
             // assert
-            expect(enrolledCourseDetailsPage.showUnenrollButton).toEqual(false);
+            expect(enrolledCourseDetailsPage.corRelationList).toEqual([{ id: '', type: 'CourseBatch' }]);
+
         });
     });
 
-    describe('mergeProperties()', () => {
-        it('should show all properties merged', () => {
+    describe('enrollIntoBatch()', () => {
+        it('should call promptToLogin()', (done) => {
             // arrange
-            enrolledCourseDetailsPage.course = {
-                prop1: 'prop1',
-                prop2: 'prop2'
+            enrolledCourseDetailsPage.isGuestUser = true;
+            const batch = {
+                id: '121232312'
             };
+            jest.spyOn(enrolledCourseDetailsPage, 'promptToLogin').mockImplementation(() => {
+                return Promise.resolve();
+            });
             // act
-            const returnVal = enrolledCourseDetailsPage.mergeProperties(['prop1', 'prop2']);
+            enrolledCourseDetailsPage.enrollIntoBatch(batch);
             // assert
-            expect(returnVal).toEqual('prop1, prop2');
+            setTimeout(() => {
+                expect(enrolledCourseDetailsPage.promptToLogin).toBeCalled();
+                done();
+            }, 0);
         });
-    });
 
-    describe('setChildContents()', () => {
-        it('should fetch child contents ', (done) => {
+        it('should should successfuly enroll', (done) => {
             // arrange
-            const data = {
-                mimeType: 'content',
-                children: [],
-                identifier: 'do_1212123123'
-            };
-            enrolledCourseDetailsPage.courseCardData = {
-                batchId: '123123123'
+            enrolledCourseDetailsPage.isGuestUser = false;
+            mockLocalCourseService.prepareEnrollCourseRequest = jest.fn(() => ({ id: 'sample-id' }));
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            const batch = {
+                id: '121232312'
             };
-            spyOn(enrolledCourseDetailsPage, 'toggleGroup').and.stub();
-            jest.spyOn(mockContentService, 'getChildContents').mockReturnValue(of(data));
-            jest.spyOn(enrolledCourseDetailsPage, 'getContentState');
-            jest.spyOn(enrolledCourseDetailsPage, 'getContentsSize');
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockLocalCourseService.prepareRequestValue = jest.fn(() => new Map());
+            mockLocalCourseService.enrollIntoBatch = jest.fn(() => of({}));
+            mockZone.run = jest.fn((fn) => fn());
+            mockCommonUtilService.translateMessage = jest.fn(() => 'enrolled corses');
+            mockCommonUtilService.showToast = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            jest.spyOn(enrolledCourseDetailsPage, 'subscribeTrackDownloads').mockImplementation();
             // act
-            enrolledCourseDetailsPage.setChildContents();
+            enrolledCourseDetailsPage.enrollIntoBatch(batch);
             // assert
             setTimeout(() => {
-                expect(enrolledCourseDetailsPage.enrolledCourseMimeType).toEqual(data.mimeType);
-                expect(enrolledCourseDetailsPage.childrenData).toEqual(data.children);
-                expect(enrolledCourseDetailsPage.childContentsData).toEqual(data);
-                expect(enrolledCourseDetailsPage.getContentState).toBeCalledWith(true);
-                expect(enrolledCourseDetailsPage.getContentsSize).toBeCalledWith(data.children);
+                expect(mockLocalCourseService.prepareEnrollCourseRequest).toBeCalled();
+                expect(presentFn).toBeCalled();
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toBeCalled();
+                expect(mockCategoryKeyTranslator.transform).toBeCalledWith('FRMELEMNTS_MSG_COURSE_ENROLLED', expect.anything());
+                expect(mockCommonUtilService.showToast).toHaveBeenCalled();
+                expect(mockEvents.publish).toBeCalled();
+                expect(enrolledCourseDetailsPage.isAlreadyEnrolled).toEqual(true);
                 done();
             }, 0);
         });
 
-        it('should setshowChildrenLoader to false', (done) => {
+        it('should should fail', (done) => {
             // arrange
-            const data = {
-                mimeType: 'content',
-                children: [],
-                identifier: 'do_1212123123'
-            };
-            enrolledCourseDetailsPage.courseCardData = {
-                batchId: '123123123'
+            enrolledCourseDetailsPage.isGuestUser = false;
+            mockLocalCourseService.prepareEnrollCourseRequest = jest.fn(() => ({ id: 'sample-id' }));
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            const batch = {
+                id: '121232312'
             };
-            spyOn(enrolledCourseDetailsPage, 'toggleGroup').and.stub();
-            jest.spyOn(mockContentService, 'getChildContents').mockReturnValue(of(Promise.reject()));
-            jest.spyOn(enrolledCourseDetailsPage, 'getContentState');
-            jest.spyOn(enrolledCourseDetailsPage, 'getContentsSize');
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockLocalCourseService.prepareRequestValue = jest.fn(() => new Map());
+            mockLocalCourseService.enrollIntoBatch = jest.fn(() => throwError({}));
+            mockZone.run = jest.fn((fn) => fn());
             // act
-            enrolledCourseDetailsPage.setChildContents();
+            enrolledCourseDetailsPage.enrollIntoBatch(batch);
             // assert
+            expect(mockLocalCourseService.prepareEnrollCourseRequest).toBeCalled();
             setTimeout(() => {
-                expect(enrolledCourseDetailsPage.showChildrenLoader).toEqual(false);
+                expect(presentFn).toBeCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toBeCalled();
+                expect(dismissFn).toBeCalled();
+                expect(mockZone.run).toHaveBeenCalled();
                 done();
             }, 0);
         });
     });
 
-    describe('getAllBatches()', () => {
-        it('should fetch all batch list', (done) => {
+    describe('handleHeaderEvents()', () => {
+        it('should call share()', () => {
             // arrange
-            const data = [
-                {
-                    enrollmentEndDate: '01/01/2020'
-                },
-                {
-                    enrollmentEndDate: '01/01/2020'
-                }
-            ];
-            spyOn(enrolledCourseDetailsPage, 'handleUnenrollButton');
-            jest.spyOn(mockCourseService, 'getCourseBatches').mockReturnValue(of(data));
+            const event = {
+                name: 'share'
+            };
+            jest.spyOn(enrolledCourseDetailsPage, 'share').mockImplementation();
             // act
-            enrolledCourseDetailsPage.getAllBatches();
+            enrolledCourseDetailsPage.handleHeaderEvents(event);
             // assert
-            setTimeout(() => {
-                expect(enrolledCourseDetailsPage.handleUnenrollButton).toBeCalled();
-                expect(enrolledCourseDetailsPage.showOfflineSection).toEqual(false);
-                expect(enrolledCourseDetailsPage.batchCount).toEqual(data.length);
-                expect(enrolledCourseDetailsPage.batches).toEqual(data);
-                done();
-            }, 0);
+            expect(enrolledCourseDetailsPage.share).toBeCalled();
         });
 
-        it('should contain only 1 batch', (done) => {
+        it('should call showOverflowMenu()', () => {
             // arrange
-            const data = [
-                {
-                    enrollmentEndDate: '01/01/2020',
-                    endDate: '05/01/2020'
-                }
-            ];
-            spyOn(enrolledCourseDetailsPage, 'handleUnenrollButton');
-            jest.spyOn(mockCourseService, 'getCourseBatches').mockReturnValue(of(data));
+            const event = {
+                name: 'more'
+            };
+            jest.spyOn(enrolledCourseDetailsPage, 'showOverflowMenu').mockImplementation();
             // act
-            enrolledCourseDetailsPage.getAllBatches();
+            enrolledCourseDetailsPage.handleHeaderEvents(event);
             // assert
-            setTimeout(() => {
-                expect(enrolledCourseDetailsPage.handleUnenrollButton).toBeCalled();
-                expect(enrolledCourseDetailsPage.showOfflineSection).toEqual(false);
-                expect(enrolledCourseDetailsPage.batchEndDate).toEqual(data[0].endDate);
-                expect(enrolledCourseDetailsPage.enrollmentEndDate).toEqual(data[0].enrollmentEndDate);
-                done();
-            }, 0);
+            expect(enrolledCourseDetailsPage.showOverflowMenu).toBeCalled();
         });
 
-        it('should display offline mode', (done) => {
+        it('should call handleNavBackButton() and goBack()', () => {
             // arrange
-            jest.spyOn(mockCourseService, 'getCourseBatches').mockReturnValue(of(Promise.reject(new NetworkError())));
+            const event = {
+                name: 'back'
+            };
+            spyOn(enrolledCourseDetailsPage, 'handleNavBackButton').and.stub();
             // act
-            enrolledCourseDetailsPage.getAllBatches();
+            enrolledCourseDetailsPage.handleHeaderEvents(event);
             // assert
-            setTimeout(() => {
-                expect(enrolledCourseDetailsPage.showOfflineSection).toEqual(true);
-                done();
-            }, 0);
+            expect(enrolledCourseDetailsPage.handleNavBackButton).toBeCalled();
         });
-        it('should not display offline mode', (done) => {
+    });
+
+    describe('onSegmentChange()', () => {
+        it('should call generateInteractTelemetry()', () => {
+            // act
+            enrolledCourseDetailsPage.onSegmentChange({
+                detail: {
+                    value: 'value'
+                }
+            });
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toBeCalled();
+        });
+    });
+
+    describe('mergeProperties()', () => {
+        it('should show all properties merged', () => {
             // arrange
-            jest.spyOn(mockCourseService, 'getCourseBatches').mockReturnValue(of(Promise.reject()));
+            enrolledCourseDetailsPage.course = {
+                prop1: 'prop1',
+                prop2: 'prop2'
+            };
             // act
-            enrolledCourseDetailsPage.getAllBatches();
+            const returnVal = enrolledCourseDetailsPage.mergeProperties(['prop1', 'prop2']);
             // assert
-            setTimeout(() => {
-                expect(enrolledCourseDetailsPage.showOfflineSection).toEqual(false);
-                done();
-            }, 0);
+            expect(returnVal).toEqual('prop1, prop2');
         });
     });
 
@@ -1435,35 +1683,6 @@ describe('EnrolledCourseDetailsPage', () => {
         });
     });
 
-    describe('cancelDownload()', () => {
-        it('should display header', (done) => {
-            // arrange
-            jest.spyOn(mockContentService, 'cancelDownload').mockReturnValue(of());
-            // act
-            enrolledCourseDetailsPage.cancelDownload();
-            // assert
-            setTimeout(() => {
-                expect(enrolledCourseDetailsPage.showLoading).toEqual(false);
-                expect(mockHeaderService.showHeaderWithBackButton).toBeCalled();
-                expect(mockLocation.back).toBeCalled();
-                done();
-            }, 0);
-        });
-        it('should display header even api fails', (done) => {
-            // arrange
-            jest.spyOn(mockContentService, 'cancelDownload').mockReturnValue(of(Promise.reject()));
-            // act
-            enrolledCourseDetailsPage.cancelDownload();
-            // assert
-            setTimeout(() => {
-                expect(enrolledCourseDetailsPage.showLoading).toEqual(false);
-                expect(mockHeaderService.showHeaderWithBackButton).toBeCalled();
-                expect(mockLocation.back).toBeCalled();
-                done();
-            }, 0);
-        });
-    });
-
     describe('viewCredits()', () => {
         it('should show credits', () => {
             // act
@@ -1491,7 +1710,7 @@ describe('EnrolledCourseDetailsPage', () => {
                 Environment.HOME,
                 telemetryObject,
                 {},
-                [{ id: '', type: 'CourseBatch'}]
+                [{ id: '', type: 'CourseBatch' }]
             );
         });
     });
@@ -1510,7 +1729,7 @@ describe('EnrolledCourseDetailsPage', () => {
                 PageId.COURSE_DETAIL,
                 telemetryObject,
                 {},
-                [{ id: '', type: 'CourseBatch'}]
+                [{ id: '', type: 'CourseBatch' }]
             );
         });
     });
@@ -1533,7 +1752,7 @@ describe('EnrolledCourseDetailsPage', () => {
                 objectType,
                 objectVersion,
                 {},
-                [{ id: '', type: 'CourseBatch'}]
+                [{ id: '', type: 'CourseBatch' }]
             );
         });
     });
@@ -1554,7 +1773,7 @@ describe('EnrolledCourseDetailsPage', () => {
                 Environment.HOME,
                 telemetryObject,
                 {},
-                [{ id: '', type: 'CourseBatch'}]
+                [{ id: '', type: 'CourseBatch' }]
             );
         });
 
@@ -1608,59 +1827,6 @@ describe('EnrolledCourseDetailsPage', () => {
         });
     });
 
-    describe('ionViewWillEnter()', () => {
-        it('should be aguest user, ', () => {
-            mockAppGlobalService.getUserId = jest.fn(() => {
-                return 'sample_user_id';
-            });
-            // act
-            mockHeaderService.headerEventEmitted$ = {
-                subscribe: jest.fn(() => {})
-            };
-            enrolledCourseDetailsPage.guestUser = true;
-            enrolledCourseDetailsPage.isAlreadyEnrolled = false;
-            jest.spyOn(enrolledCourseDetailsPage, 'checkLoggedInOrGuestUser').mockImplementation();
-            jest.spyOn(enrolledCourseDetailsPage, 'checkCurrentUserType').mockImplementation();
-            spyOn(enrolledCourseDetailsPage, 'isCourseEnrolled').and.stub();
-            spyOn(enrolledCourseDetailsPage, 'subscribeSdkEvent').and.stub();
-            spyOn(enrolledCourseDetailsPage, 'populateCorRelationData');
-            spyOn(enrolledCourseDetailsPage, 'handleBackButton').and.stub();
-            spyOn(enrolledCourseDetailsPage, 'getLastReadContentId');
-            enrolledCourseDetailsPage.ionViewWillEnter().then(() => {
-                expect(enrolledCourseDetailsPage.checkCurrentUserType).toHaveBeenCalled();
-                expect(mockAppGlobalService.getUserId).toHaveBeenCalled();
-                expect(enrolledCourseDetailsPage.guestUser).toEqual(true);
-                expect(mockHeaderService.showHeaderWithBackButton).toBeCalled();
-                expect(enrolledCourseDetailsPage.isCourseEnrolled).toBeCalled();
-                expect(enrolledCourseDetailsPage.subscribeSdkEvent).toBeCalled();
-                expect(enrolledCourseDetailsPage.populateCorRelationData).toBeCalled();
-                expect(enrolledCourseDetailsPage.handleBackButton).toBeCalled();
-                expect(enrolledCourseDetailsPage.getLastReadContentId).toBeCalled();
-            });
-            // assert
-            expect(enrolledCourseDetailsPage.checkLoggedInOrGuestUser).toHaveBeenCalled();
-        });
-
-        it('should be a guest user, ', () => {
-            // act
-            const data = {
-
-            };
-            mockAppGlobalService.setEnrolledCourseList = jest.fn();
-            enrolledCourseDetailsPage.guestUser = false;
-            enrolledCourseDetailsPage.isAlreadyEnrolled = false;
-            enrolledCourseDetailsPage.courseCardData = mockCourseCardData_2;
-            mockHeaderService.headerEventEmitted$ = {
-                subscribe: jest.fn(() => {})
-            };
-            mockCourseService.getEnrolledCourses = jest.fn(() => of(mockEnrolledCourses));
-            // act
-            enrolledCourseDetailsPage.ionViewWillEnter();
-            // assert
-            expect(enrolledCourseDetailsPage.courseCardData.batch).toEqual(enrolledCourseDetailsPage.updatedCourseCardData.batch);
-        });
-    });
-
     describe('isCourseEnrolled()', () => {
         it('should unenrolled course', () => {
             // arrange
@@ -1680,7 +1846,7 @@ describe('EnrolledCourseDetailsPage', () => {
             enrolledCourseDetailsPage.isCourseEnrolled('do_091231312312');
             // assert
             expect(enrolledCourseDetailsPage.isAlreadyEnrolled).toEqual(false);
-            expect(enrolledCourseDetailsPage.courseCardData).toEqual(mockEnrolledCourses[0]);
+            expect(enrolledCourseDetailsPage.courseCardData).toEqual({});
         });
 
         it('else condition check ""', () => {
@@ -1691,7 +1857,7 @@ describe('EnrolledCourseDetailsPage', () => {
             enrolledCourseDetailsPage.isCourseEnrolled('do_091231312312');
             // assert
             expect(enrolledCourseDetailsPage.isAlreadyEnrolled).toEqual(false);
-            expect(enrolledCourseDetailsPage.courseCardData).toEqual(mockEnrolledCourses[0]);
+            expect(enrolledCourseDetailsPage.courseCardData).toEqual({});
         });
 
         it('else condition check "course.courseId === identifier"', () => {
@@ -1702,27 +1868,7 @@ describe('EnrolledCourseDetailsPage', () => {
             enrolledCourseDetailsPage.isCourseEnrolled('do_091231312312');
             // assert
             expect(enrolledCourseDetailsPage.isAlreadyEnrolled).toEqual(false);
-            expect(enrolledCourseDetailsPage.courseCardData).toEqual(mockEnrolledCourses[0]);
-        });
-    });
-
-    describe('handleBackButton()', () => {
-        it('should ', () => {
-            // arrange
-            jest.spyOn(enrolledCourseDetailsPage, 'generateEndEvent');
-            jest.spyOn(enrolledCourseDetailsPage, 'generateQRSessionEndEvent');
-            jest.spyOn(enrolledCourseDetailsPage, 'goBack');
-            enrolledCourseDetailsPage.shouldGenerateEndTelemetry = true;
-            mockPlatform.backButton = {
-                subscribeWithPriority: jest.fn((x, callback) => callback())
-            };
-            // act
-            enrolledCourseDetailsPage.handleBackButton();
-            // assert
-            expect(enrolledCourseDetailsPage.generateEndEvent).toBeCalled();
-            expect(enrolledCourseDetailsPage.generateQRSessionEndEvent).toBeCalled();
-            expect(enrolledCourseDetailsPage.goBack).not.toBeCalled();
-
+            expect(enrolledCourseDetailsPage.courseCardData).toEqual({});
         });
     });
 
@@ -1761,8 +1907,9 @@ describe('EnrolledCourseDetailsPage', () => {
     });
 
     describe('navigateToBatchListPage()', () => {
-        it('should', async (done) => {
+        it('should return false, not call navigate', async (done) => {
             // arrange
+            mockLocalCourseService.isEnrollable = jest.fn(() => true);
             spyOn(enrolledCourseDetailsPage, 'enrollIntoBatch').and.stub();
             spyOn(mockRouter, 'navigate').and.stub();
             const presentFn = jest.fn(() => Promise.resolve());
@@ -1787,131 +1934,208 @@ describe('EnrolledCourseDetailsPage', () => {
             expect(mockRouter.navigate).toBeCalled();
             done();
         });
-    });
 
-    describe('loadFirstChildren()', () => {
-        it('should have no child contents', () => {
-            // arrange
-            spyOn(enrolledCourseDetailsPage, 'loadFirstChildren').and.callThrough();
-            const node = {};
-            const data = {
-                children: [
-                    {
-                        children: [
-                            node, {}
-                        ]
-                    }, {}
-                ]
+        it('should show toast message for internet error', (done) => {
+            // arrnge
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => Promise.resolve({
+                present: presentFn,
+                dismiss: dismissFn
+            }));
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
             };
+            enrolledCourseDetailsPage.batches = [];
+            mockCommonUtilService.showToast = jest.fn();
             // act
-            const result = enrolledCourseDetailsPage.loadFirstChildren(data);
+            enrolledCourseDetailsPage.navigateToBatchListPage();
             // assert
-            expect(result).toBe(node);
-            expect(enrolledCourseDetailsPage.loadFirstChildren).toBeCalledTimes(3);
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeFalsy();
+                expect(enrolledCourseDetailsPage.batches.length).toBe(0);
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_NO_INTERNET_MESSAGE');
+                expect(dismissFn).toBeTruthy();
+                done();
+            }, 0);
         });
 
-        it('should have childrens', () => {
-            // arrange
-            jest.resetAllMocks();
-            const data = {};
-
-            // act
-            const result = enrolledCourseDetailsPage.loadFirstChildren(data);
-            // assert
-            expect(result).toEqual(data);
-        });
+        // it('should show toast message if batches is empty', (done) => {
+        //     // arrnge
+        //     const dismissFn = jest.fn(() => Promise.resolve());
+        //     const presentFn = jest.fn(() => Promise.resolve());
+        //     mockCommonUtilService.getLoader = jest.fn(() => Promise.resolve({
+        //         present: presentFn,
+        //         dismiss: dismissFn
+        //     }));
+        //     mockCommonUtilService.networkInfo = {
+        //         isNetworkAvailable: true
+        //     };
+        //     enrolledCourseDetailsPage.batches = [];
+        //     // mockCommonUtilService.showToast = jest.fn();
+        //     // act
+        //     enrolledCourseDetailsPage.navigateToBatchListPage();
+        //     // assert
+        //     setTimeout(() => {
+        //         expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+        //         expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeTruthy();
+        //         expect(enrolledCourseDetailsPage.batches.length).toBe(0);
+        //         // expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('NO_BATCHES_AVAILABLE');
+        //         expect(dismissFn).toBeTruthy();
+        //         done();
+        //     }, 0);
+        // });
     });
 
-    describe('startContent()', () => {
-        it('should go to content details page', () => {
+    describe('startLearning()', () => {
+        it('should find next content which status is 0 or 1', (done) => {
             // arrange
-            jest.resetAllMocks();
-            jest.spyOn(enrolledCourseDetailsPage, 'navigateToChildrenDetailsPage');
-            enrolledCourseDetailsPage.startData = '22/03/2020';
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            enrolledCourseDetailsPage.courseHeirarchy = {
+                identifier: 'do-123',
+                mimeType: MimeType.DOCS[0],
+                children: [
+                    {
+                        identifier: 'do-1-123',
+                        mimeType: MimeType.COLLECTION
+                    },
+                    {
+                        identifier: 'do-2-123',
+                        mimeType: MimeType.DOCS[0]
+                    }
+                ]
+            };
+            enrolledCourseDetailsPage.contentStatusData = {
+                contentList: [
+                    {
+                        contentId: 'do-123',
+                        status: 2
+                    },
+                    {
+                        contentId: 'do-1-123',
+                        status: 1
+                    },
+                    {
+                        contentId: 'do-2-123',
+                        status: 0
+                    }
+                ]
+            };
             enrolledCourseDetailsPage.isBatchNotStarted = false;
+            enrolledCourseDetailsPage.nextContent = false;
+            mockContentPlayerHandler.playContent = jest.fn();
+            mockPreferences.getBoolean = jest.fn(() => of(true));
+            mockProfileService.getActiveSessionProfile = jest.fn(() => of(mockProfileData));
+            mockLocalCourseService.fetchAssessmentStatus = jest.fn(() => ({ isLastAttempt: false, isContentDisabled: false }));
+            mockCommonUtilService.handleAssessmentStatus = jest.fn(() => Promise.resolve(false));
             // act
-            enrolledCourseDetailsPage.startContent();
+            enrolledCourseDetailsPage.startLearning();
             // assert
-            expect(enrolledCourseDetailsPage.navigateToChildrenDetailsPage).toBeCalled();
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.START_CLICKED,
+                    Environment.HOME,
+                    PageId.COURSE_DETAIL,
+                    { id: 'do_21281258639073280011490', type: 'Course', version: '2' },
+                    undefined,
+                    {},
+                    [{ id: '', type: 'CourseBatch' }],
+                );
+                expect(enrolledCourseDetailsPage.courseHeirarchy).toBeTruthy();
+                expect(enrolledCourseDetailsPage.courseHeirarchy.children.length).toBeGreaterThan(0);
+                expect(enrolledCourseDetailsPage.isBatchNotStarted).toBeFalsy();
+                expect(mockLocalCourseService.fetchAssessmentStatus).toHaveBeenCalled();
+                expect(mockCommonUtilService.handleAssessmentStatus).toHaveBeenCalled();
+                expect(mockPreferences.getBoolean).toHaveBeenCalledWith(
+                    PreferenceKey.DO_NOT_SHOW_PROFILE_NAME_CONFIRMATION_POPUP + '-some_uid');
+                expect(mockProfileService.getActiveSessionProfile).toHaveBeenCalled();
+                done();
+            }, 0);
         });
 
-        it('should show toast message', () => {
+        it('should show toast message', (done) => {
             // arrange
-            jest.resetAllMocks();
-            jest.spyOn(enrolledCourseDetailsPage, 'navigateToChildrenDetailsPage');
-            enrolledCourseDetailsPage.startData = '22/03/2020';
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            enrolledCourseDetailsPage.courseHeirarchy = {
+                children: []
+            };
             enrolledCourseDetailsPage.isBatchNotStarted = true;
-            mockDatePipe.transform = jest.fn();
+            mockCommonUtilService.translateMessage = jest.fn(() => 'course will be available');
+            mockCommonUtilService.showToast = jest.fn();
+            mockDatePipe.transform = jest.fn(() => '2020-06-04');
+            mockPreferences.getBoolean = jest.fn(() => of(true));
+            mockProfileService.getActiveSessionProfile = jest.fn(() => of(mockProfileData));
+
             // act
-            enrolledCourseDetailsPage.startContent();
+            enrolledCourseDetailsPage.startLearning();
             // assert
-            expect(mockDatePipe.transform).toBeCalled();
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.START_CLICKED,
+                    Environment.HOME,
+                    PageId.COURSE_DETAIL,
+                    { id: 'do_21281258639073280011490', type: 'Course', version: '2' },
+                    undefined,
+                    {},
+                    [{ id: '', type: 'CourseBatch' }],
+                );
+                expect(enrolledCourseDetailsPage.courseHeirarchy.children.length).toBe(0);
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('COURSE_WILL_BE_AVAILABLE', '2020-06-04');
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('course will be available');
+                expect(mockDatePipe.transform).toBeCalled();
+                expect(mockPreferences.getBoolean).toHaveBeenCalledWith(
+                    PreferenceKey.DO_NOT_SHOW_PROFILE_NAME_CONFIRMATION_POPUP + '-some_uid');
+                expect(mockProfileService.getActiveSessionProfile).toHaveBeenCalled();
+                done();
+            }, 0);
         });
-    });
 
-    describe('getLastReadContentId()', () => {
-        it('should set lastReadContentId in courseCardData', async () => {
+        it('should show profile name confirmation popup', (done) => {
             // arrange
-            mockAppGlobalService.getUserId = jest.fn(() => {
-                return 'sample_user_id';
-            });
-            // ** for ionViewWillEnter
-            mockHeaderService.headerEventEmitted$ = {
-                subscribe: jest.fn(() => {})
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            enrolledCourseDetailsPage.courseHeirarchy = {
+                children: []
             };
-            enrolledCourseDetailsPage.guestUser = true;
-            enrolledCourseDetailsPage.isAlreadyEnrolled = false;
-            jest.spyOn(enrolledCourseDetailsPage, 'checkLoggedInOrGuestUser').mockImplementation();
-            jest.spyOn(enrolledCourseDetailsPage, 'checkCurrentUserType').mockImplementation();
-            mockHeaderService.showHeaderWithBackButton = jest.fn(() => { });
-            spyOn(enrolledCourseDetailsPage, 'isCourseEnrolled').and.stub();
-            spyOn(enrolledCourseDetailsPage, 'subscribeSdkEvent').and.stub();
-            spyOn(enrolledCourseDetailsPage, 'populateCorRelationData');
-            spyOn(enrolledCourseDetailsPage, 'handleBackButton').and.stub();
-            spyOn(enrolledCourseDetailsPage, 'setContentDetails').and.stub();
-            // ******
-            // ** for getLastReadContentId
-            mockPreferences.getString = jest.fn(() => of(PreferenceKey.COURSE_IDENTIFIER));
-            // *****
-            // act
-            await enrolledCourseDetailsPage.ionViewWillEnter();
-            // assert
-            expect(mockPreferences.getString).toBeCalled();
-            expect(enrolledCourseDetailsPage.courseCardData.lastReadContentId).toBe('sunbirdcourse_identifier');
-        });
-    });
-
-    describe('getStatusOfCourseCompletion()', () => {
-        it('should set the lastRead value to true', async (done) => {
-            enrolledCourseDetailsPage.courseCardData.batchId = '1234567890';
-            jest.spyOn(mockCourseService, 'getContentState').mockReturnValue(of({}));
-            mockZone.run = jest.fn((cb) => cb());
+            enrolledCourseDetailsPage.isBatchNotStarted = true;
+            enrolledCourseDetailsPage.isCertifiedCourse = true;
+            mockCommonUtilService.translateMessage = jest.fn(() => 'course will be available');
+            mockCommonUtilService.showToast = jest.fn();
+            mockDatePipe.transform = jest.fn(() => '2020-06-04');
+            mockPreferences.getBoolean = jest.fn(() => of(false));
+            mockProfileService.getActiveSessionProfile = jest.fn(() => of(mockProfileData));
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { buttonClicked: true } }))
+            } as any)));
 
-            // ** getStatusOfCourseCompletion
-            enrolledCourseDetailsPage.childrenData = mockChildrenData;
-            enrolledCourseDetailsPage.lastReadContentId = 'do_135241345727';
-            spyOn(enrolledCourseDetailsPage, 'getLastPlayedName');
             // act
-            await enrolledCourseDetailsPage.getContentState(false);
-            // assert
-            expect(mockChildrenData[0].lastRead).toBe(undefined);
-            done();
-        });
-
-        it('should set the lastRead value to true', async (done) => {
-            enrolledCourseDetailsPage.courseCardData.batchId = '1234567890';
-            jest.spyOn(mockCourseService, 'getContentState').mockReturnValue(of(mockContentStatusData));
-            mockZone.run = jest.fn((cb) => cb());
+            enrolledCourseDetailsPage.startLearning();
 
-            // ** getStatusOfCourseCompletion
-            enrolledCourseDetailsPage.childrenData = mockChildrenData;
-            enrolledCourseDetailsPage.lastReadContentId = 'do_135241345727';
-            spyOn(enrolledCourseDetailsPage, 'getLastPlayedName');
-            // act
-            await enrolledCourseDetailsPage.getContentState(false);
             // assert
-            expect(mockChildrenData[0].lastRead).toBe(true);
-            done();
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.START_CLICKED,
+                    Environment.HOME,
+                    PageId.COURSE_DETAIL,
+                    { id: 'do_21281258639073280011490', type: 'Course', version: '2' },
+                    undefined,
+                    {},
+                    [{ id: '', type: 'CourseBatch' }],
+                );
+                expect(enrolledCourseDetailsPage.courseHeirarchy.children.length).toBe(0);
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('COURSE_WILL_BE_AVAILABLE', '2020-06-04');
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('course will be available');
+                expect(mockDatePipe.transform).toBeCalled();
+                expect(mockPreferences.getBoolean).toHaveBeenCalledWith(
+                    PreferenceKey.DO_NOT_SHOW_PROFILE_NAME_CONFIRMATION_POPUP + '-some_uid');
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockProfileService.getActiveSessionProfile).toHaveBeenCalled();
+                done();
+            }, 0);
         });
     });
 
@@ -1928,6 +2152,7 @@ describe('EnrolledCourseDetailsPage', () => {
             enrolledCourseDetailsPage.identifier = 'do_83424628349';
             mockEventsBusService.events = jest.fn(() => of(event));
             mockZone.run = jest.fn((cb) => cb());
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
             spyOn(enrolledCourseDetailsPage, 'getBatchDetails').and.stub();
             // act
             enrolledCourseDetailsPage.subscribeSdkEvent();
@@ -1985,7 +2210,7 @@ describe('EnrolledCourseDetailsPage', () => {
             // act
             enrolledCourseDetailsPage.subscribeSdkEvent();
             // assert
-            expect(enrolledCourseDetailsPage.setContentDetails).toBeCalled();
+            expect(mockZone.run).toHaveBeenCalled();
         });
 
         it('should be SERVER_CONTENT_DATA event', () => {
@@ -2042,9 +2267,521 @@ describe('EnrolledCourseDetailsPage', () => {
             // act
             enrolledCourseDetailsPage.subscribeSdkEvent();
             // assert
-            expect(mockHeaderService.hideHeader).toBeCalled();
-            expect(enrolledCourseDetailsPage.importContent).toBeCalled();
+            expect(mockEventsBusService.events).toBeCalled();
+            expect(mockZone.run).toBeCalled();
+        });
+    });
+
+    describe('checkDataSharingStatus', () => {
+        it('should return conset details', (done) => {
+            // arrange
+            enrolledCourseDetailsPage.courseCardData = {
+                userId: 'sample-userId',
+                content: {
+                    channel: 'sample-channel'
+                },
+                courseId: 'sample-courseId'
+            };
+            const request: Consent = {
+                userId: enrolledCourseDetailsPage.courseCardData.userId,
+                consumerId: enrolledCourseDetailsPage.courseCardData.content.channel,
+                objectId: enrolledCourseDetailsPage.courseCardData.courseId
+            };
+            mockProfileService.getConsent = jest.fn(() => of({
+                consents: [{
+                    status: ConsentStatus.ACTIVE,
+                    lastUpdatedOn: 'dd/mm/yy'
+                }]
+            }));
+            // act
+            enrolledCourseDetailsPage.checkDataSharingStatus();
+            // assert
+            setTimeout(() => {
+                expect(mockProfileService.getConsent).toHaveBeenCalledWith(request);
+                expect(enrolledCourseDetailsPage.dataSharingStatus).toBe(ConsentStatus.ACTIVE);
+                expect(enrolledCourseDetailsPage.lastUpdateOn).toBe('dd/mm/yy');
+                done();
+            }, 0);
+        });
+
+        it('should return conset popup if consent data not found for catch part', async (done) => {
+            // arrange
+            enrolledCourseDetailsPage.courseCardData = {
+                userId: 'sample-userId',
+                content: {
+                    channel: 'sample-channel'
+                },
+                courseId: 'sample-courseId'
+            };
+            const request: Consent = {
+                userId: enrolledCourseDetailsPage.courseCardData.userId,
+                consumerId: enrolledCourseDetailsPage.courseCardData.content.channel,
+                objectId: enrolledCourseDetailsPage.courseCardData.courseId
+            };
+            enrolledCourseDetailsPage.isAlreadyEnrolled = true;
+            enrolledCourseDetailsPage.course = {
+                userConsent: UserConsent.YES
+            };
+            enrolledCourseDetailsPage.isConsentPopUp = false;
+            mockProfileService.getConsent = jest.fn(() => throwError({
+                response: {
+                    body: {
+                        params: {
+                            err: 'USER_CONSENT_NOT_FOUND'
+                        }
+                    }
+                }
+            }));
+            mockConsentService.showConsentPopup = jest.fn(() => Promise.resolve());
+            jest.spyOn(enrolledCourseDetailsPage, 'checkDataSharingStatus').mockImplementation(() => {
+                return (Promise.resolve());
+            });
+            // act
+            await enrolledCourseDetailsPage.checkDataSharingStatus().catch();
+            // assert
+            setTimeout(() => {
+                // expect(mockProfileService.getConsent).toHaveBeenCalledWith(request);
+                // expect(enrolledCourseDetailsPage.isConsentPopUp).toBeTruthy();
+                // expect(mockLocalCourseService.showConsentPopup).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should return conset popup if consent data not found for catch part', (done) => {
+            // arrange
+            enrolledCourseDetailsPage.courseCardData = {
+                userId: 'sample-userId',
+                content: {
+                    channel: 'sample-channel'
+                },
+                courseId: 'sample-courseId'
+            };
+            const request: Consent = {
+                userId: enrolledCourseDetailsPage.courseCardData.userId,
+                consumerId: enrolledCourseDetailsPage.courseCardData.content.channel,
+                objectId: enrolledCourseDetailsPage.courseCardData.courseId,
+            };
+            enrolledCourseDetailsPage.isAlreadyEnrolled = true;
+            enrolledCourseDetailsPage.course = {
+                userConsent: UserConsent.YES
+            };
+            enrolledCourseDetailsPage.isConsentPopUp = false;
+            mockProfileService.getConsent = jest.fn(() => throwError({
+                code: 'NETWORK_ERROR'
+            }));
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            enrolledCourseDetailsPage.checkDataSharingStatus();
+            // assert
+            setTimeout(() => {
+                // expect(mockProfileService.getConsent).toHaveBeenCalledWith(request);
+                // expect(enrolledCourseDetailsPage.isConsentPopUp).toBeFalsy();
+                // expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_NO_INTERNET_MESSAGE');
+                done();
+            }, 0);
+        });
+    });
+
+    describe('ionViewWillEnter()', () => {
+        it('should be a guest user, ', (done) => {
+            mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('some_uid'));
+            // act
+            mockHeaderService.headerEventEmitted$ = {
+                subscribe: jest.fn(() => { })
+            };
+            enrolledCourseDetailsPage.isGuestUser = true;
+            enrolledCourseDetailsPage.isAlreadyEnrolled = false;
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockDiscussionService.getForumIds = jest.fn(() => throwError('some_err'));
+            jest.spyOn(enrolledCourseDetailsPage, 'checkCurrentUserType').mockImplementation();
+            spyOn(enrolledCourseDetailsPage, 'isCourseEnrolled').and.stub();
+            spyOn(enrolledCourseDetailsPage, 'subscribeSdkEvent').and.stub();
+            spyOn(enrolledCourseDetailsPage, 'populateCorRelationData');
+            spyOn(enrolledCourseDetailsPage, 'handleBackButton').and.stub();
+            jest.spyOn(enrolledCourseDetailsPage, 'setContentDetails').mockImplementation();
+            jest.spyOn(enrolledCourseDetailsPage, 'getAllBatches').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(enrolledCourseDetailsPage, 'handleHeaderEvents').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            // assert
+            enrolledCourseDetailsPage.ionViewWillEnter().then(() => {
+                expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
+                expect(enrolledCourseDetailsPage.checkCurrentUserType).toHaveBeenCalled();
+                expect(enrolledCourseDetailsPage.isGuestUser).toEqual(true);
+                expect(mockHeaderService.showHeaderWithBackButton).toBeCalled();
+                expect(enrolledCourseDetailsPage.isCourseEnrolled).toBeCalled();
+                expect(enrolledCourseDetailsPage.subscribeSdkEvent).toBeCalled();
+                expect(enrolledCourseDetailsPage.populateCorRelationData).toBeCalled();
+                expect(enrolledCourseDetailsPage.handleBackButton).toBeCalled();
+                done();
+            });
+        });
+
+        it('should not be a guest user, ', (done) => {
+            // act
+            mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('some_uid'));
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+            enrolledCourseDetailsPage.isGuestUser = false;
+            enrolledCourseDetailsPage.isAlreadyEnrolled = false;
+            enrolledCourseDetailsPage.courseCardData = mockCourseCardData_2;
+            mockHeaderService.headerEventEmitted$ = {
+                subscribe: jest.fn(() => { })
+            };
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn((fn) => fn({}))
+            });
+            mockDiscussionService.getForumIds = jest.fn(() => throwError('some_err'));
+            // jest.spyOn(enrolledCourseDetailsPage, 'fetchForumIds').mockImplementation();
+            jest.spyOn(enrolledCourseDetailsPage, 'checkCurrentUserType').mockImplementation();
+            jest.spyOn(enrolledCourseDetailsPage, 'isCourseEnrolled').mockImplementation();
+            jest.spyOn(enrolledCourseDetailsPage, 'setContentDetails').mockImplementation();
+            jest.spyOn(enrolledCourseDetailsPage, 'handleHeaderEvents').mockImplementation();
+            jest.spyOn(enrolledCourseDetailsPage, 'populateCorRelationData').mockImplementation();
+            jest.spyOn(enrolledCourseDetailsPage, 'handleBackButton').mockImplementation();
+            jest.spyOn(enrolledCourseDetailsPage, 'subscribeSdkEvent').mockImplementation();
+            jest.spyOn(enrolledCourseDetailsPage, 'getAllBatches').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            jest.spyOn(enrolledCourseDetailsPage, 'updateEnrolledCourseData').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            mockCourseService.getEnrolledCourses = jest.fn(() => of(mockEnrolledCourses));
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            // act
+            enrolledCourseDetailsPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
+                expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        //     it('should show expired batch popup for logged in user and enrolled into course if already enrolled batch is expired, ',
+        //         (done) => {
+        //             // act
+        //             mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('some_uid'));
+        //             mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+        //             enrolledCourseDetailsPage.isGuestUser = false;
+        //             enrolledCourseDetailsPage.isAlreadyEnrolled = true;
+        //             enrolledCourseDetailsPage.courseCardData = mockCourseCardData_2;
+        //             enrolledCourseDetailsPage.courseHeirarchy = mockCourseCardData_2;
+        //             mockHeaderService.headerEventEmitted$ = {
+        //                 subscribe: jest.fn(() => { })
+        //             };
+        //             mockHeaderService.headerEventEmitted$ = of({
+        //                 subscribe: jest.fn((fn) => fn({}))
+        //             });
+        //             jest.spyOn(enrolledCourseDetailsPage, 'checkCurrentUserType').mockImplementation();
+        //             jest.spyOn(enrolledCourseDetailsPage, 'isCourseEnrolled').mockImplementation();
+        //             jest.spyOn(enrolledCourseDetailsPage, 'setContentDetails').mockImplementation();
+        //             jest.spyOn(enrolledCourseDetailsPage, 'handleHeaderEvents').mockImplementation();
+        //             jest.spyOn(enrolledCourseDetailsPage, 'populateCorRelationData').mockImplementation();
+        //             jest.spyOn(enrolledCourseDetailsPage, 'handleBackButton').mockImplementation();
+        //             jest.spyOn(enrolledCourseDetailsPage, 'subscribeSdkEvent').mockImplementation();
+        //             jest.spyOn(enrolledCourseDetailsPage, 'getAllBatches').mockImplementation(() => {
+        //                 return Promise.resolve();
+        //             });
+        //             jest.spyOn(enrolledCourseDetailsPage, 'updateEnrolledCourseData').mockImplementation(() => {
+        //                 return Promise.resolve();
+        //             });
+        //             mockCourseService.getEnrolledCourses = jest.fn(() => of(mockExpiredBatchEnrolledCourses));
+        //             mockAppGlobalService.getEnrolledCourseList = jest.fn(() => mockExpiredBatchEnrolledCourses);
+        //             mockHeaderService.showHeaderWithBackButton = jest.fn();
+        //             const batches = [
+        //                 {
+        //                     enrollmentEndDate: '01/01/2020',
+        //                     endDate: '05/01/2020',
+        //                     identifier: 'do-123',
+        //                     status: 1
+        //                 },
+        //                 {
+        //                     enrollmentEndDate: '01/01/2020',
+        //                     endDate: '05/01/2020',
+        //                     identifier: 'do-1234',
+        //                     status: 0
+        //                 }
+        //             ];
+        //             mockCourseService.getCourseBatches = jest.fn(() => of(batches));
+        //             mockZone.run = jest.fn((fn) => fn());
+        //             mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+        //                 present: jest.fn(() => Promise.resolve({})),
+        //                 onDidDismiss: jest.fn(() => Promise.resolve({ data: { isEnrolled: true } }))
+        //             } as any)));
+
+        //             // act
+        //             enrolledCourseDetailsPage.ionViewWillEnter();
+        //             // assert
+        //             setTimeout(() => {
+        //                 expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
+        //                 expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+        //                 expect(mockCourseService.getCourseBatches).toBeCalledWith({
+        //                     filters: {
+        //                         courseId: enrolledCourseDetailsPage.courseHeirarchy.identifier,
+        //                         enrollmentType: CourseEnrollmentType.OPEN,
+        //                         status: [CourseBatchStatus.IN_PROGRESS]
+        //                     },
+        //                     sort_by: { createdDate: SortOrder.DESC },
+        //                     fields: BatchConstants.REQUIRED_FIELDS
+        //                 });
+        //                 expect(mockZone.run).toHaveBeenCalled();
+        //                 expect(mockPopoverCtrl.create).toHaveBeenCalled();
+        //                 done();
+        //             }, 0);
+        //         });
+    });
+
+    it('should hide deeplink progress loader', () => {
+        // arrange
+        mockSbProgressLoader.hide = jest.fn(() => Promise.resolve());
+        enrolledCourseDetailsPage.identifier = 'sample_doId';
+        if (!enrolledCourseDetailsPage.resumeCourseFlag) {
+            enrolledCourseDetailsPage.resumeCourseFlag = true;
+        }
+        jest.spyOn(enrolledCourseDetailsPage, 'resumeContent').mockImplementation(() => {
+            return;
+        });
+        // act
+        enrolledCourseDetailsPage.ionViewDidEnter();
+        // assert
+        expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({ id: 'sample_doId' });
+        expect(enrolledCourseDetailsPage.resumeCourseFlag).toBe(true);
+    });
+
+    describe('isCourseModifiedAfterEnrolment', () => {
+        it('should return false if course lastUpdatedOn date is less than course enrolledDate', () => {
+            // arrange
+            enrolledCourseDetailsPage.courseCardData = {
+                enrolledDate: '2018-11-12T10:57:02.000+0000'
+            };
+            enrolledCourseDetailsPage.course = {
+                lastUpdatedOn: '2018-11-11T10:57:02.000+0000'
+            };
+            // act
+            const isModified = enrolledCourseDetailsPage.isCourseModifiedAfterEnrolment();
+            // assert
+            expect(isModified).toBe(false);
+        });
+
+        it('should return true if course lastUpdatedOn date is greater than course enrolledDate', () => {
+            // arrange
+            enrolledCourseDetailsPage.courseCardData = {
+                enrolledDate: '2018-11-12T10:57:02.000+0000'
+            };
+            enrolledCourseDetailsPage.course = {
+                lastUpdatedOn: '2018-11-13T10:57:02.000+0000'
+            };
+            // act
+            const isModified = enrolledCourseDetailsPage.isCourseModifiedAfterEnrolment();
+            // assert
+            expect(isModified).toBe(true);
+        });
+    });
+
+    it('should dismiss consentPii popup', () => {
+        // arrange
+        const dismissFn = jest.fn(() => Promise.resolve(true));
+        enrolledCourseDetailsPage.loader = { data: '', dismiss: dismissFn } as any;
+        mockLocalCourseService.setConsentPopupVisibility = jest.fn();
+        // act
+        enrolledCourseDetailsPage.onConsentPopoverShow();
+        // assert
+        expect(enrolledCourseDetailsPage.loader).toBeUndefined();
+        expect(dismissFn).toHaveBeenCalled();
+        expect(mockLocalCourseService.setConsentPopupVisibility).toHaveBeenCalledWith(true);
+    });
+
+    it('shoule invoked after consentPii popup dismissed', () => {
+        jest.spyOn(enrolledCourseDetailsPage, 'checkDataSharingStatus').mockImplementation(() => {
+            return;
+        });
+        mockLocalCourseService.setConsentPopupVisibility = jest.fn();
+        enrolledCourseDetailsPage.onConsentPopoverDismiss();
+        expect(mockLocalCourseService.setConsentPopupVisibility).toHaveBeenCalledWith(false);
+    });
+
+    it('should fetch consent PII data', () => {
+        // arrange
+        enrolledCourseDetailsPage.courseCardData = {
+            userId: 'sample-user-id',
+            content: { channel: 'sample-channel' },
+            courseId: 'sample-do-id'
+        };
+        mockProfileService.getConsent = jest.fn(() => of([{
+            status: ConsentStatus.ACTIVE,
+            lastUpdatedOn: '02/02/2020'
+        }]));
+        // act
+        enrolledCourseDetailsPage.checkDataSharingStatus();
+    });
+
+    it('should fetch consent PII data for catch part', () => {
+        // arrange
+        enrolledCourseDetailsPage.courseCardData = {
+            userId: 'sample-user-id',
+            content: { channel: 'sample-channel', userConsent: 'Yes' },
+            courseId: 'sample-do-id'
+        };
+        enrolledCourseDetailsPage.isAlreadyEnrolled = true;
+        mockProfileService.getConsent = jest.fn(() => throwError({ code: 'NETWORK_ERROR' }));
+        mockCommonUtilService.showToast = jest.fn();
+        // act
+        enrolledCourseDetailsPage.checkDataSharingStatus();
+    });
+
+    it('should retrun checked for shareData', () => {
+        // arrange
+        enrolledCourseDetailsPage.showShareData = false;
+        // act
+        enrolledCourseDetailsPage.editDataSettings();
+        // assert
+        expect(enrolledCourseDetailsPage.showShareData).toBeTruthy();
+    });
+
+    it('should extend data settings for user click', () => {
+        // arrange
+        enrolledCourseDetailsPage.isDataShare = false;
+        // act
+        enrolledCourseDetailsPage.expandDataSettings();
+        // assert
+        expect(enrolledCourseDetailsPage.showShareData).toBeFalsy();
+        expect(enrolledCourseDetailsPage.isDataShare).toBeTruthy();
+    });
+
+    describe('saveChanges', () => {
+        it('should update userConsent for active status', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            enrolledCourseDetailsPage.dataSharingStatus = ConsentStatus.ACTIVE;
+            enrolledCourseDetailsPage.courseCardData = {
+                userId: 'sample-userId',
+                content: {
+                    channel: 'sample-channel'
+                },
+                courseId: 'sample-courseId'
+            };
+            const request: Consent = {
+                status: ConsentStatus.REVOKED,
+                userId: enrolledCourseDetailsPage.courseCardData.userId,
+                consumerId: enrolledCourseDetailsPage.courseCardData.content.channel,
+                objectId: enrolledCourseDetailsPage.courseCardData.courseId,
+                objectType: 'Collection',
+            };
+            mockProfileService.updateConsent = jest.fn(() => of({ message: 'successfull' }));
+            mockCommonUtilService.showToast = jest.fn();
+            jest.spyOn(enrolledCourseDetailsPage, 'checkDataSharingStatus').mockImplementation(() => {
+                return (Promise.resolve());
+            });
+            // act
+            enrolledCourseDetailsPage.saveChanges();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockProfileService.updateConsent).toHaveBeenCalledWith(request);
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('FRMELEMNTS_MSG_DATA_SETTINGS_SUBMITED_SUCCESSFULLY');
+                expect(enrolledCourseDetailsPage.showShareData).toBeFalsy();
+                done();
+            }, 0);
+        });
+
+        it('should not update userConsent for active status catch part', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            enrolledCourseDetailsPage.dataSharingStatus = ConsentStatus.ACTIVE;
+            enrolledCourseDetailsPage.courseCardData = {
+                userId: 'sample-userId',
+                content: {
+                    channel: 'sample-channel'
+                },
+                courseId: 'sample-courseId'
+            };
+            const request: Consent = {
+                status: ConsentStatus.REVOKED,
+                userId: enrolledCourseDetailsPage.courseCardData.userId,
+                consumerId: enrolledCourseDetailsPage.courseCardData.content.channel,
+                objectId: enrolledCourseDetailsPage.courseCardData.courseId,
+                objectType: 'Collection',
+            };
+            mockProfileService.updateConsent = jest.fn(() => throwError({ code: 'NETWORK_ERROR' }));
+            mockCommonUtilService.showToast = jest.fn();
+            jest.spyOn(enrolledCourseDetailsPage, 'checkDataSharingStatus').mockImplementation(() => {
+                return (Promise.resolve());
+            });
+            // act
+            enrolledCourseDetailsPage.saveChanges();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockProfileService.updateConsent).toHaveBeenCalledWith(request);
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_NO_INTERNET_MESSAGE');
+                expect(enrolledCourseDetailsPage.showShareData).toBeFalsy();
+                done();
+            }, 0);
+        });
+
+        it('should return consent popup for revoked status', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            enrolledCourseDetailsPage.dataSharingStatus = ConsentStatus.REVOKED;
+            mockConsentService.showConsentPopup = jest.fn(() => Promise.resolve());
+            jest.spyOn(enrolledCourseDetailsPage, 'checkDataSharingStatus').mockImplementation(() => {
+                return (Promise.resolve());
+            });
+            // act
+            enrolledCourseDetailsPage.saveChanges();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockConsentService.showConsentPopup).toHaveBeenCalled();
+                expect(enrolledCourseDetailsPage.showShareData).toBeFalsy();
+                done();
+            }, 0);
         });
+    });
+
+    describe('handleBackButton()', () => {
+        it('should ', () => {
+            // arrange
+            jest.spyOn(enrolledCourseDetailsPage, 'generateEndEvent');
+            jest.spyOn(enrolledCourseDetailsPage, 'generateQRSessionEndEvent');
+            jest.spyOn(enrolledCourseDetailsPage, 'goBack');
+            enrolledCourseDetailsPage.shouldGenerateEndTelemetry = true;
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                dismiss: jest.fn(() => Promise.resolve({}))
+            } as any)));
+            mockPlatform.backButton = {
+                subscribeWithPriority: jest.fn((x, callback) => callback())
+            };
+            enrolledCourseDetailsPage.isConsentPopUp = true;
+            // act
+            enrolledCourseDetailsPage.handleBackButton();
+            // assert
+            expect(enrolledCourseDetailsPage.goBack).not.toBeCalled();
 
+        });
     });
 });
diff --git a/src/app/enrolled-course-details-page/enrolled-course-details-page.ts b/src/app/enrolled-course-details-page/enrolled-course-details-page.ts
index d944696a6..96cf46217 100644
--- a/src/app/enrolled-course-details-page/enrolled-course-details-page.ts
+++ b/src/app/enrolled-course-details-page/enrolled-course-details-page.ts
@@ -1,74 +1,55 @@
-import { Component, Inject, NgZone, OnInit, ViewChild, ElementRef, OnDestroy } from '@angular/core';
-import { Events, Platform, PopoverController } from '@ionic/angular';
+import { Component, ElementRef, Inject, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { Platform, PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import isObject from 'lodash/isObject';
 import forEach from 'lodash/forEach';
 import { FileSizePipe } from '@app/pipes/file-size/file-size';
-
 import { AppGlobalService } from '@app/services/app-global-service.service';
 import { CommonUtilService } from '@app/services/common-util.service';
 import { CourseUtilService } from '@app/services/course-util.service';
 import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
 import { UtilityService } from '@app/services/utility-service';
 import { AppHeaderService } from '@app/services/app-header.service';
-import { DatePipe } from '@angular/common';
+import { DatePipe, Location } from '@angular/common';
 import { LoginHandlerService } from '@app/services/login-handler.service';
 import {
+  AuditState, AuthService,
   Batch,
-  ChildContentRequest,
-  Content,
-  ContentDetailRequest,
-  ContentEventType,
-  ContentImport,
-  ContentImportCompleted,
-  ContentImportRequest,
-  ContentImportResponse,
-  ContentImportStatus,
-  ContentService,
-  ContentState,
-  ContentStateResponse,
-  ContentUpdate,
-  CorrelationData, Course,
-  CourseBatchesRequest,
-  CourseBatchStatus,
-  CourseEnrollmentType,
-  CourseService,
-  DownloadEventType,
-  DownloadProgress,
-  EventsBusEvent,
-  EventsBusService,
+  ChildContentRequest, Consent, Content, ContentDetailRequest,
+  ContentEventType, ContentImport, ContentImportCompleted,
+  ContentImportRequest, ContentImportResponse, ContentImportStatus,
+  ContentService, ContentState, ContentStateResponse, ContentUpdate,
+  CorrelationData, Course, CourseBatchesRequest, CourseBatchStatus,
+  CourseEnrollmentType, CourseService,
+  DownloadEventType, DownloadProgress,
+  DownloadService, DownloadTracking,
+  EventsBusEvent, EventsBusService,
   FetchEnrolledCourseRequest,
-  GetContentStateRequest, NetworkError,
+  GetContentStateRequest,
+  NetworkError,
   ProfileService,
-  ServerProfileDetailsRequest,
-  SharedPreferences,
-  TelemetryErrorCode,
-  TelemetryObject,
-  UnenrollCourseRequest,
   Rollup,
-  SortOrder,
-  AuthService,
-  DownloadTracking,
-  DownloadService
+  ServerProfileDetailsRequest, SharedPreferences, SortOrder,
+  TelemetryErrorCode, TelemetryObject,
+  UnenrollCourseRequest, DiscussionService, LogLevel
 } from 'sunbird-sdk';
-import { Subscription, Observable } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
 import {
-  Environment,
-  ErrorType,
-  ImpressionType,
-  InteractSubtype,
-  InteractType,
-  Mode,
-  PageId,
+  AuditType,
   CorReleationDataType,
-  ID
+  Environment, ErrorType,
+  ImpressionType, InteractSubtype, InteractType,
+  LogType,
+  Mode,
+  PageId
 } from '../../services/telemetry-constants';
-import { ProfileConstants, ContentType, EventTopics, PreferenceKey, RouterLinks, ShareItemType } from '../app.constant';
-import { BatchConstants } from '../app.constant';
-import { ContentShareHandlerService } from '../../services/content/content-share-handler.service';
+import {
+  BatchConstants, ContentCard, EventTopics, MaxAttempt, MimeType,
+  PreferenceKey, ProfileConstants, RouterLinks, ShareItemType
+} from '../app.constant';
 import { SbGenericPopoverComponent } from '../components/popups/sb-generic-popover/sb-generic-popover.component';
-import { ContentActionsComponent, ContentRatingAlertComponent, ConfirmAlertComponent } from '../components';
-import { Location } from '@angular/common';
-import { Router, NavigationExtras } from '@angular/router';
+import { ConfirmAlertComponent, ContentActionsComponent, ContentRatingAlertComponent } from '../components';
+import { NavigationExtras, Router } from '@angular/router';
 import { ContentUtil } from '@app/util/content-util';
 import { SbPopoverComponent } from '../components/popups';
 import { ContentInfo } from '@app/services/content/content-info';
@@ -77,6 +58,22 @@ import { LocalCourseService } from '@app/services';
 import { EnrollCourse } from './course.interface';
 import { SbSharePopupComponent } from '../components/popups/sb-share-popup/sb-share-popup.component';
 import { share } from 'rxjs/operators';
+import { SbProgressLoader } from '../../services/sb-progress-loader.service';
+import { ContentPlayerHandler } from '@app/services/content/player/content-player-handler';
+import { CsGroupAddableBloc } from '@project-sunbird/client-services/blocs';
+import { CsPrimaryCategory } from '@project-sunbird/client-services/services/content';
+import { ConsentStatus, UserConsent } from '@project-sunbird/client-services/models';
+import { ConsentPopoverActionsDelegate } from '@app/services/local-course.service';
+import { CategoryKeyTranslator } from '@app/pipes/category-key-translator/category-key-translator-pipe';
+import { ConsentService } from '@app/services/consent-service';
+import {
+  ProfileNameConfirmationPopoverComponent
+} from '../components/popups/sb-profile-name-confirmation-popup/sb-profile-name-confirmation-popup.component';
+import { TncUpdateHandlerService } from '@app/services/handlers/tnc-update-handler.service';
+import { EnrollmentDetailsComponent } from '../components/enrollment-details/enrollment-details.component';
+import { DiscussionTelemetryService } from '@app/services/discussion/discussion-telemetry.service';
+import { TagPrefixConstants } from '@app/services/segmentation-tag/segmentation-tag.service';
+
 declare const cordova;
 
 @Component({
@@ -84,7 +81,7 @@ declare const cordova;
   templateUrl: './enrolled-course-details-page.html',
   styleUrls: ['./enrolled-course-details-page.scss'],
 })
-export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
+export class EnrolledCourseDetailsPage implements OnInit, OnDestroy, ConsentPopoverActionsDelegate {
 
   /**
    * Contains content details
@@ -94,9 +91,8 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
   /**
    * Contains children content data
    */
-  childrenData: Array<any> = [];
+  courseHeirarchy: any;
 
-  startData: any;
   shownGroup: null;
 
   /**
@@ -114,10 +110,6 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
    */
   downloadSize = 0;
 
-  /**
-   * this hold the mime type of a collection
-   */
-  enrolledCourseMimeType: string;
   /**
    * Flag to show / hide resume button
    */
@@ -171,7 +163,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
   ratingComment = '';
   batchId = '';
   baseUrl = '';
-  guestUser = false;
+  isGuestUser = false;
   isAlreadyEnrolled = false;
   profileType = '';
   objId;
@@ -183,9 +175,8 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
   backButtonFunc = undefined;
   shouldGenerateEndTelemetry = false;
   source = '';
-  firstChild;
+  isFromGroupFlow = false;
   /** Whole child content is stored and it is used to find first child */
-  childContentsData;
   isBatchNotStarted = false;
   private eventSubscription: Subscription;
   corRelationList: Array<CorrelationData>;
@@ -195,10 +186,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
   updatedCourseCardData: Course;
   importProgressMessage: string;
   segmentType = 'info';
-  // isEnrolled = false;
   showDownload: boolean;
-  lastReadContentName: string;
-  lastReadContentType: string;
   enrollmentEndDate: string;
   loader?: HTMLIonLoadingElement;
   isQrCodeLinkToContent: any;
@@ -207,8 +195,9 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
   courseBatchesRequest: CourseBatchesRequest;
   showUnenrollButton = false;
   licenseDetails;
+  forumId?: string;
 
-  @ViewChild('stickyPillsRef') stickyPillsRef: ElementRef;
+  @ViewChild('stickyPillsRef', { static: false }) stickyPillsRef: ElementRef;
   public objRollup: Rollup;
   pageName = '';
   contentId: string;
@@ -219,14 +208,40 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
   public showUnenroll: boolean;
   public todayDate: any;
   public rollUpMap: { [key: string]: Rollup } = {};
-  public lastReadContentId;
   public courseCompletionData = {};
   isCertifiedCourse: boolean;
-  showSheenAnimation: boolean = true;
+  showSheenAnimation = true;
   private isOnboardingSkipped: any;
   private isFromChannelDeeplink: any;
   trackDownloads$: Observable<DownloadTracking>;
   showCollapsedPopup = true;
+  resumeCourseFlag = false;
+
+  isNextContentFound = false;
+  isFirstContent = false;
+  nextContent: Content;
+  certificateDescription = '';
+  private csGroupAddableBloc: CsGroupAddableBloc;
+  pageId = PageId.COURSE_DETAIL;
+  showShareData = false;
+  isDataShare = false;
+  isShared: any;
+  dataSharingStatus: any;
+  lastUpdateOn: string;
+  isConsentPopUp = false;
+  skipCheckRetiredOpenBatch = false;
+  forumIds;
+  private hasInit = false;
+  fetchForumIdReq = {
+    identifier: [],
+    type: ''
+  };
+  createUserReq = {
+    username: '',
+    identifier: ''
+  };
+  batchRemaningTime: any;
+  private batchRemaningTimingIntervalRef?: any;
 
   constructor(
     @Inject('PROFILE_SERVICE') private profileService: ProfileService,
@@ -236,6 +251,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
     @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
     @Inject('AUTH_SERVICE') public authService: AuthService,
     @Inject('DOWNLOAD_SERVICE') private downloadService: DownloadService,
+    @Inject('DISCUSSION_SERVICE') private discussionService: DiscussionService,
     private loginHandlerService: LoginHandlerService,
     private zone: NgZone,
     private events: Events,
@@ -249,25 +265,34 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
     private datePipe: DatePipe,
     private utilityService: UtilityService,
     private headerService: AppHeaderService,
-    private contentShareHandler: ContentShareHandlerService,
     private location: Location,
     private router: Router,
     private contentDeleteHandler: ContentDeleteHandler,
-    private localCourseService: LocalCourseService
+    private localCourseService: LocalCourseService,
+    private sbProgressLoader: SbProgressLoader,
+    private contentPlayerHandler: ContentPlayerHandler,
+    private categoryKeyTranslator: CategoryKeyTranslator,
+    private consentService: ConsentService,
+    private tncUpdateHandlerService: TncUpdateHandlerService,
+    private discussionTelemetryService: DiscussionTelemetryService
   ) {
     this.objRollup = new Rollup();
-    // this.getUserId();
+    this.csGroupAddableBloc = CsGroupAddableBloc.instance;
 
     const extrasState = this.router.getCurrentNavigation().extras.state;
     if (extrasState) {
       this.courseCardData = extrasState.content;
       this.isOnboardingSkipped = extrasState.isOnboardingSkipped;
       this.isFromChannelDeeplink = extrasState.isFromChannelDeeplink;
-      // console.log('this.courseCardData', this.courseCardData);
       this.identifier = this.courseCardData.contentId || this.courseCardData.identifier;
       this.corRelationList = extrasState.corRelation;
       this.source = extrasState.source;
+      if (CsGroupAddableBloc.instance.initialised) {
+        this.isFromGroupFlow = true;
+      }
       this.isQrCodeLinkToContent = extrasState.isQrCodeLinkToContent;
+      this.resumeCourseFlag = extrasState.resumeCourseFlag || false;
+      this.skipCheckRetiredOpenBatch = extrasState.skipCheckRetiredOpenBatch;
     }
   }
 
@@ -280,6 +305,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
     if (this.courseCardData.batchId) {
       this.segmentType = 'modules';
     }
+    this.generateDataForDF();
   }
 
   showDeletePopup() {
@@ -307,38 +333,13 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
       });
 
     this.events.subscribe(EventTopics.ENROL_COURSE_SUCCESS, async (res) => {
-      this.updatedCourseCardData = await this.courseService
-        .getEnrolledCourses({ userId: this.appGlobalService.getUserId(), returnFreshCourses: true })
-        .toPromise()
-        .then((cData) => {
-          return cData.find((element) => element.courseId === this.identifier);
-        });
-      this.courseCardData.batchId = res.batchId;
-      await this.getBatchDetails();
-      this.segmentType = 'modules';
-      this.getCourseProgress();
-      this.getContentState(true);
-      if (res && res.batchId) {
-        this.batchId = res.batchId;
-        if (this.identifier && res.courseId && this.identifier === res.courseId) {
-          this.isAlreadyEnrolled = true;
-          this.subscribeTrackDiwnloads();
-          this.zone.run(() => {
-            this.getContentsSize(this.childrenData);
-            if (this.loader) {
-              this.loader.dismiss();
-              this.loader = undefined;
-            }
-          });
-        }
-      }
+      this.reloadPageAfterEnrollment(res);
     });
 
-
-    this.events.subscribe(EventTopics.UNENROL_COURSE_SUCCESS, () => {
+    this.events.subscribe(EventTopics.UNENROL_COURSE_SUCCESS, async () => {
       // to show 'Enroll in Course' button courseCardData.batchId should be undefined/null
       this.getAllBatches();
-      this.updateEnrolledCourseList(this.courseCardData); // enrolled course list updated
+      await this.updateEnrolledCourseData(); // enrolled course list updated
       if (this.courseCardData) {
         delete this.courseCardData.batchId;
       }
@@ -374,49 +375,72 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
 
   }
 
-  updateEnrolledCourseList(unenrolledCourse) {
+  private async reloadPageAfterEnrollment(res) {
+    await this.appGlobalService.getActiveProfileUid()
+      .then((uid) => {
+        this.userId = uid;
+      });
+    this.checkUserLoggedIn();
+    await this.updateEnrolledCourseData();
+    this.courseCardData.batchId = res.batchId;
+    await this.getBatchDetails();
+    this.segmentType = 'modules';
+
+    this.getContentState(true);
+    if (res && res.batchId) {
+      this.batchId = res.batchId;
+      if (this.identifier && res.courseId && this.identifier === res.courseId) {
+        await this.isCourseEnrolled(this.identifier);
+        this.zone.run(() => {
+          this.getContentsSize(this.courseHeirarchy.children);
+          if (this.loader) {
+            this.loader.dismiss();
+            this.loader = undefined;
+          }
+        });
+      }
+    }
+  }
+
+  private checkUserLoggedIn() {
+    this.isGuestUser = !this.appGlobalService.isUserLoggedIn();
+  }
+
+  async updateEnrolledCourseData() {
     const fetchEnrolledCourseRequest: FetchEnrolledCourseRequest = {
-      userId: this.appGlobalService.getUserId(),
+      userId: this.userId,
+      returnFreshCourses: true
     };
-    this.courseService.getEnrolledCourses(fetchEnrolledCourseRequest).toPromise()
-      .then((enrolledCourses: any) => {
-        if (enrolledCourses) {
-          this.zone.run(() => {
-            // this.enrolledCourses = enrolledCourses.result.courses ? enrolledCourses.result.courses : [];
-            // maintain the list of courses that are enrolled, and store them in appglobal
-            if (enrolledCourses.length > 0) {
-              const courseList: Array<any> = [];
-              for (const course of enrolledCourses) {
-                courseList.push(course);
-              }
-              this.appGlobalService.setEnrolledCourseList(courseList);
-            }
-          });
-        }
+    console.log('updateEnrolledCourseData');
+    this.updatedCourseCardData = await this.courseService.getEnrolledCourses(fetchEnrolledCourseRequest).toPromise()
+      .then((enrolledCourses) => {
+
+        this.appGlobalService.setEnrolledCourseList(enrolledCourses || []);
+
+        return enrolledCourses.find((element) =>
+          (this.courseCardData.batchId && element.batchId === this.courseCardData.batchId)
+          || (!this.courseCardData.batchId && element.courseId === this.identifier));
       })
-      .catch(() => {
+      .catch(e => {
+        console.log(e);
+        return undefined;
       });
-  }
 
-  /**
-   * Get the session to know if the user is logged-in or guest
-   *
-   */
-  async checkLoggedInOrGuestUser() {
-    const session = await this.authService.getSession().toPromise();
-    this.guestUser = !session;
-    if (session) {
-      this.userId = session.userToken;
+    if (this.updatedCourseCardData && !this.courseCardData.batch) {
+      this.courseCardData.batch = this.updatedCourseCardData.batch;
+      this.courseCardData.batchId = this.updatedCourseCardData.batchId;
     }
   }
 
-  subscribeTrackDiwnloads() {
-    this.trackDownloads$ = this.downloadService.trackDownloads({ groupBy: { fieldPath: 'rollUp.l1', value: this.identifier } }).pipe(
-      share());
+  subscribeTrackDownloads() {
+    if(window['device'].platform.toLowerCase() !== "ios") {
+      this.trackDownloads$ = this.downloadService.trackDownloads({ groupBy: { fieldPath: 'rollUp.l1', value: this.identifier } }).pipe(
+        share());
+    }
   }
 
   checkCurrentUserType() {
-    if (this.guestUser) {
+    if (this.isGuestUser) {
       this.appGlobalService.getGuestUserInfo()
         .then((userType) => {
           this.profileType = userType;
@@ -432,17 +456,17 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
       this.commonUtilService.showToast('NO_BATCHES_AVAILABLE');
       return;
     } else if (
-        this.batches.length === 1 &&
-        this.batches[0].enrollmentEndDate &&
-        (new Date() > new Date(this.batches[0].enrollmentEndDate))
+      this.batches.length === 1 &&
+      this.batches[0].enrollmentEndDate &&
+      ((new Date().setHours(0, 0, 0, 0)) > new Date(this.batches[0].enrollmentEndDate).setHours(0, 0, 0, 0))
     ) {
       this.commonUtilService.showToast(
-          'ENROLLMENT_ENDED_ON',
-          null,
-          null,
-          null,
-          null,
-          this.datePipe.transform(this.batches[0].enrollmentEndDate)
+        'ENROLLMENT_ENDED_ON',
+        null,
+        null,
+        null,
+        null,
+        this.datePipe.transform(this.batches[0].enrollmentEndDate)
       );
       return;
     }
@@ -450,17 +474,16 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
     const confirm = await this.popoverCtrl.create({
       component: SbPopoverComponent,
       componentProps: {
-        sbPopoverMainTitle: this.commonUtilService.translateMessage('YOU_MUST_JOIN_AN_ACTIVE_BATCH'),
+        sbPopoverMainTitle: this.categoryKeyTranslator.transform('FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH', this.course),
         metaInfo: this.commonUtilService.translateMessage('REGISTER_TO_COMPLETE_ACCESS'),
-        sbPopoverHeading: this.commonUtilService.translateMessage('JOIN_TRAINING') + '?',
+        sbPopoverHeading: this.categoryKeyTranslator.transform('FRMELEMNTS_LBL_JOIN_TRAINING', this.course) + '?',
         isNotShowCloseIcon: true,
         actionsButtons: [
           {
-            btntext: this.commonUtilService.translateMessage('JOIN_TRAINING'),
+            btntext: this.categoryKeyTranslator.transform('FRMELEMNTS_LBL_JOIN_TRAINING', this.course),
             btnClass: 'popover-color'
           },
         ],
-        // handler : this.handleEnrollCoursePopup.bind(this)
       },
       cssClass: 'sb-popover info',
     });
@@ -476,7 +499,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
    * Function to rate content
    */
   async rateContent(event) {
-    if (!this.guestUser) {
+    if (!this.isGuestUser) {
       if (this.course.isAvailableLocally) {
         const popUp = await this.popoverCtrl.create({
           component: ContentRatingAlertComponent,
@@ -523,21 +546,55 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
       componentProps: {
         content: this.course,
         batchDetails: this.batchDetails,
-        pageName: PageId.COURSE_DETAIL
+        pageName: PageId.COURSE_DETAIL,
+        corRelationList: this.corRelationList,
+        objRollup: this.telemetryObject
       },
     });
     await this.leaveTrainigPopover.present();
     const { data } = await this.leaveTrainigPopover.onDidDismiss();
     if (data && data.unenroll) {
       this.showConfirmAlert();
+    } else if (data && data.syncProgress) {
+      this.syncProgress();
     }
   }
 
+  async  syncProgress() {
+    const loader = await this.commonUtilService.getLoader();
+    this.generateLogEvent(InteractSubtype.SYNC_PROGRESS_INITIATE);
+    await loader.present();
+    this.courseService.syncCourseProgress({
+      courseId:  this.identifier,
+      userId: this.userId,
+      batchId: this.batchDetails.id
+    }).toPromise()
+      .then(async () => {
+        this.generateLogEvent(InteractSubtype.SYNC_PROGRESS_SUCCESS);
+        await loader.dismiss();
+        this.commonUtilService.showToast('FRMELEMNTS_MSG_SYNC_COURSE_PROGRESS_SUCCESS');
+      }).catch(async () => {
+        await loader.dismiss();
+        this.generateLogEvent(InteractSubtype.SYNC_PROGRESS_FAILED);
+        this.commonUtilService.showToast('ERROR_TECHNICAL_PROBLEM');
+      });
+  }
+
+  private generateLogEvent(message: string) {
+    this.telemetryGeneratorService.generateLogEvent(
+      LogLevel.INFO,
+      message,
+      Environment.COURSE,
+      'api_call',
+      this.corRelationList || []
+    );
+  }
+
   async showConfirmAlert() {
     const confirm = await this.popoverCtrl.create({
       component: SbGenericPopoverComponent,
       componentProps: {
-        sbPopoverHeading: this.commonUtilService.translateMessage('LEAVE_TRAINING_HEADING'),
+        sbPopoverHeading: this.categoryKeyTranslator.transform('FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING', this.course),
         sbPopoverMainTitle: this.commonUtilService.translateMessage('UNENROLL_CONFIRMATION_MESSAGE'),
         actionsButtons: [
           {
@@ -579,7 +636,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
         .subscribe(() => {
           this.zone.run(async () => {
             await loader.dismiss();
-            this.commonUtilService.showToast(this.commonUtilService.translateMessage('COURSE_UNENROLLED'));
+            this.commonUtilService.showToast(this.categoryKeyTranslator.transform('FRMELEMNTS_MSG_COURSE_UNENROLLED', this.course));
             this.events.publish(EventTopics.UNENROL_COURSE_SUCCESS, {});
             this.telemetryGeneratorService.generateInteractTelemetry(
               InteractType.OTHER,
@@ -606,7 +663,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
             if (error && error.error === 'CONNECTION_ERROR') {
               this.commonUtilService.showToast(this.commonUtilService.translateMessage('ERROR_NO_INTERNET_MESSAGE'));
             } else {
-              this.events.publish(EventTopics.UNENROL_COURSE_SUCCESS, {});
+              this.commonUtilService.showToast(this.commonUtilService.translateMessage('FRMELEMNTS_MSG_UNABLE_TO_ENROLL'));
             }
           });
         });
@@ -636,11 +693,12 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
         });
       })
       .catch((error: any) => {
-        if (error instanceof NetworkError) {
+        if (NetworkError.isInstance(error)) {
           this.commonUtilService.showToast('ERROR_NO_INTERNET_MESSAGE');
         } else {
           this.commonUtilService.showToast('ERROR_FETCHING_DATA');
         }
+        this.isConsentPopUp = true;
         this.showSheenAnimation = false;
         this.location.back();
       });
@@ -656,29 +714,26 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
       this.corRelationList
     );
     this.contentService.getContentHeirarchy(request).toPromise()
-    .then((content: Content) => {
-      /* setting child content here */
-      this.showSheenAnimation = false;
-      this.enrolledCourseMimeType = content.mimeType;
-      this.childrenData = content.children;
-      this.toggleGroup(0, this.childrenData[0]);
-      this.startData = content.children;
-      this.childContentsData = content;
-      this.getContentState(true);
-      this.telemetryGeneratorService.generatefastLoadingTelemetry(
-        InteractSubtype.FAST_LOADING_FINISHED,
-        PageId.COURSE_DETAIL,
-        this.telemetryObject,
-        undefined,
-        this.objRollup,
-        this.corRelationList
-      );
-    })
-    .catch(error => {
-      console.log('Error Fetching Childrens', error);
-      this.extractApiResponse(data);
-      this.showSheenAnimation = false;
-    });
+      .then((content: Content) => {
+        /* setting child content here */
+        this.showSheenAnimation = false;
+        this.courseHeirarchy = content;
+        this.checkRetiredOpenBatch(this.courseHeirarchy);
+        this.toggleGroup(0, content.children[0]);
+        this.telemetryGeneratorService.generatefastLoadingTelemetry(
+          InteractSubtype.FAST_LOADING_FINISHED,
+          PageId.COURSE_DETAIL,
+          this.telemetryObject,
+          undefined,
+          this.objRollup,
+          this.corRelationList
+        );
+      })
+      .catch(error => {
+        console.log('Error Fetching Childrens', error);
+        this.extractApiResponse(data);
+        this.showSheenAnimation = false;
+      });
   }
 
   /**
@@ -688,6 +743,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
   async extractApiResponse(data: Content) {
     if (data.contentData) {
       this.course = data.contentData;
+      this.forumId = this.course.forumId || this.forumId;
       this.licenseDetails = data.contentData.licenseDetails || this.licenseDetails;
       this.content = data;
       this.objId = this.course.identifier;
@@ -701,9 +757,6 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
         this.generateStartEvent(this.course.identifier, this.course.contentType, this.course.pkgVersion);
       }
       this.didViewLoad = true;
-      if (this.courseCardData.lastReadContentId) {
-        this.getLastPlayedName(this.courseCardData.lastReadContentId);
-      }
 
       if (this.course && this.course.isAvailableLocally) {
         this.headerService.showHeaderWithBackButton();
@@ -719,7 +772,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
       }
 
       if (this.course.attributions && this.course.attributions.length) {
-        this.course.attributions = this.course.attributions.join(', ');
+        this.course.attributions = (this.course.attributions.sort()).join(', ');
       }
 
       // User Rating
@@ -728,7 +781,6 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
         this.userRating = contentFeedback[0].rating;
         this.ratingComment = contentFeedback[0].comments;
       }
-      this.getCourseProgress();
     } else {
       this.commonUtilService.showToast('ERROR_CONTENT_NOT_AVAILABLE');
       this.location.back();
@@ -736,15 +788,17 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
 
     /* getting batch details for the course
        Check Point: should be called on the condition of already enrolled courses only */
-    this.getBatchDetails();
+    await this.getBatchDetails();
     this.course.isAvailableLocally = data.isAvailableLocally;
 
+    if (this.isAlreadyEnrolled) {
+      await this.checkDataSharingStatus();
+    }
 
     if (Boolean(data.isAvailableLocally)) {
-      this.setChildContents();
+      await this.setChildContents();
     } else {
       this.showLoading = true;
-      // this.headerService.hideHeader();
       this.telemetryGeneratorService.generateSpineLoadingTelemetry(data, true);
       this.importContent([this.identifier], false);
     }
@@ -755,20 +809,34 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
   /**
    * Get batch details
    */
-  async getBatchDetails() {
-    if (!this.courseCardData || !this.courseCardData.batchId) {
+  async getBatchDetails(batchId?) {
+    if (!batchId && (!this.courseCardData || !this.courseCardData.batchId)) {
       return;
     }
-    this.courseService.getBatchDetails({ batchId: this.courseCardData.batchId }).toPromise()
+    const currentBatchId = batchId || this.courseCardData.batchId;
+    this.courseService.getBatchDetails({ batchId: currentBatchId }).toPromise()
       .then((data: Batch) => {
         this.zone.run(() => {
           if (!data) {
             return;
           }
           this.batchDetails = data;
-          // console.log('this.batchDetails', this.batchDetails);
+          if (this.batchRemaningTimingIntervalRef) {
+            clearInterval(this.batchRemaningTimingIntervalRef);
+            this.batchRemaningTimingIntervalRef = undefined;
+          }
+          if (this.batchDetails.endDate || this.batchDetails.enrollmentEndDate) {
+            this.batchEndDateStatus( this.batchDetails.endDate || this.batchDetails.enrollmentEndDate);
+          }
           this.handleUnenrollButton();
-          this.isCertifiedCourse = data.cert_templates ? true : false;
+          if (data.cert_templates && Object.keys(data.cert_templates).length) {
+            this.isCertifiedCourse = true;
+            if (data.cert_templates[Object.keys(data.cert_templates)[0]].description) {
+              this.certificateDescription = data.cert_templates[Object.keys(data.cert_templates)[0]].description;
+            }
+          } else {
+            this.isCertifiedCourse = false;
+          }
           this.saveContentContext(this.appGlobalService.getUserId(),
             this.batchDetails.courseId, this.courseCardData.batchId, this.batchDetails.status);
           this.preferences.getString(PreferenceKey.COURSE_IDENTIFIER).toPromise()
@@ -780,6 +848,8 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
               } else if (this.batchDetails.status === 0) {
                 this.isBatchNotStarted = true;
                 this.courseStartDate = this.batchDetails.startDate;
+              } else if (this.batchDetails.status === 1) {
+                this.batchExp = false;
               }
             })
             .catch((error) => {
@@ -790,6 +860,9 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
       })
       .catch((error: any) => {
         if (this.courseCardData.batch) {
+          if (this.courseCardData.batch.endDate || this.courseCardData.batch.enrollmentEndDate) {
+            this.batchEndDateStatus(this.courseCardData.batch.endDate || this.courseCardData.batch.enrollmentEndDate);
+          }
           this.saveContentContext(this.appGlobalService.getUserId(),
             this.courseCardData.courseId, this.courseCardData.batchId, this.courseCardData.batch.status);
         }
@@ -806,6 +879,9 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
     contentContextMap['userId'] = userId;
     contentContextMap['courseId'] = courseId;
     contentContextMap['batchId'] = batchId;
+    contentContextMap['isCertified'] = this.isCertifiedCourse;
+    const leafNodeIds = this.courseHeirarchy.contentData.leafNodes;
+    contentContextMap['leafNodeIds'] = leafNodeIds;
     if (batchStatus) {
       contentContextMap['batchStatus'] = batchStatus;
     }
@@ -836,8 +912,6 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
     if (this.course.contentTypesCount) {
       if (!isObject(this.course.contentTypesCount)) {
         this.course.contentTypesCount = JSON.parse(this.course.contentTypesCount);
-      } else {
-        this.course.contentTypesCount = this.course.contentTypesCount;
       }
     } else if (this.courseCardData.contentTypesCount && !isObject(this.courseCardData.contentTypesCount)) {
       this.course.contentTypesCount = JSON.parse(this.courseCardData.contentTypesCount);
@@ -884,7 +958,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
     this.contentService.importContent(option).toPromise()
       .then((data: ContentImportResponse[]) => {
         this.zone.run(() => {
-          if (data && data[0].status === ContentImportStatus.NOT_FOUND) {
+          if (data && data.length && data[0].status === ContentImportStatus.NOT_FOUND) {
             this.showLoading = false;
             this.headerService.showHeaderWithBackButton();
           }
@@ -907,7 +981,6 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
                 this.corRelationList
               );
             }
-
             if (this.queuedIdentifiers.length === 0) {
               this.restoreDownloadState();
             }
@@ -921,7 +994,6 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
                 PageId.COURSE_DETAIL,
                 JSON.stringify(stackTrace),
               );
-              this.commonUtilService.showToast('UNABLE_TO_FETCH_CONTENT');
             }
           }
         });
@@ -945,23 +1017,6 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
   restoreDownloadState() {
     this.isDownloadStarted = false;
   }
-  /** old download all content */
-  // downloadAllContent1() {
-  //   if (this.commonUtilService.networkInfo.isNetworkAvailable) {
-  //     if (!this.isBatchNotStarted) {
-  //       this.isDownloadStarted = true;
-  //       this.downloadProgress = 0;
-  //       this.importContent(this.downloadIdentifiers, true, true);
-  //     } else {
-  //       this.commonUtilService.showToast(this.commonUtilService.translateMessage('COURSE_WILL_BE_AVAILABLE',
-  //         this.datePipe.transform(this.courseStartDate, 'mediumDate')));
-  //     }
-
-  //   } else {
-  //     this.commonUtilService.showToast('ERROR_NO_INTERNET_MESSAGE');
-  //   }
-  // }
-
 
   async showDownloadConfirmationAlert() {
     if (this.commonUtilService.networkInfo.isNetworkAvailable) {
@@ -1024,18 +1079,6 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
     }
   }
 
-  private async getLastReadContentId() {
-    this.lastReadContentId = this.courseCardData.lastReadContentId;
-    const userId = this.appGlobalService.getUserId();
-    const lastReadContentIdKey = 'lastReadContentId_' + userId + '_' + this.identifier + '_' + this.courseCardData.batchId;
-    const chacedLastReadContentId = await this.preferences.getString(lastReadContentIdKey).toPromise();
-    if (chacedLastReadContentId) {
-      this.lastReadContentId = chacedLastReadContentId;
-      this.courseCardData.lastReadContentId = chacedLastReadContentId;
-    }
-    return this.lastReadContentId;
-  }
-
   private getLeafNodes(contents: Content[]) {
     return contents.reduce((acc, content) => {
       if (content.children) {
@@ -1047,14 +1090,29 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
     }, []);
   }
 
+  private getLeafNodeIdsWithoutDuplicates(contents: Content[]): Set<string> {
+    return contents.reduce((acc, content) => {
+      if (content.children) {
+        this.getLeafNodeIdsWithoutDuplicates(content.children).forEach((c) => acc.add(c));
+      } else {
+        if (!acc.has(content.identifier)) {
+          if (content.mimeType !== MimeType.COLLECTION) {
+            acc.add(content.identifier);
+          }
+        }
+      }
+      return acc;
+    }, new Set<string>());
+  }
+
   /**
    * Function to get status of child contents
    */
-
   private getStatusOfCourseCompletion(childrenData: Content[]) {
     const contentStatusData = this.contentStatusData;
-    this.getLastPlayedName(this.lastReadContentId);
-    const that = this;
+
+    this.initNextContent();
+
     this.zone.run(() => {
       childrenData.forEach((childContent) => {
         if (childContent.children && childContent.children.length) {
@@ -1063,9 +1121,6 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
               if (contentStatusData.contentList.length) {
                 const statusData = contentStatusData.contentList.find(c => c.contentId === eachContent.identifier);
                 if (statusData) {
-                  if (that.lastReadContentId === statusData.contentId) {
-                    childContent['lastRead'] = true;
-                  }
                   return !(statusData.status === 0 || statusData.status === 1);
                 }
                 return false;
@@ -1079,7 +1134,6 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
   }
 
   async getAllBatches() {
-    // const loader = await this.commonUtilService.getLoader();
     this.courseBatchesRequest = {
       filters: {
         courseId: this.identifier,
@@ -1089,24 +1143,21 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
       sort_by: { createdDate: SortOrder.DESC },
       fields: BatchConstants.REQUIRED_FIELDS
     };
-    // await loader.present();
     this.courseService.getCourseBatches(this.courseBatchesRequest).toPromise()
       .then(async (data: Batch[]) => {
-        // await loader.dismiss();
         this.handleUnenrollButton();
         this.showOfflineSection = false;
         this.batches = data || [];
-        // console.log('this.batches', this.batches);
         if (data && data.length > 1) {
           this.batchCount = data.length;
         } else if (data && data.length === 1) {
           this.batchEndDate = data[0].endDate;
           this.enrollmentEndDate = data[0].enrollmentEndDate;
+          this.getBatchDetails(data[0].identifier);
         }
       })
       .catch(async (error: any) => {
-        // await loader.dismiss();
-        if (error instanceof NetworkError) {
+        if (NetworkError.isInstance(error)) {
           this.showOfflineSection = true;
         } else {
           this.showOfflineSection = false;
@@ -1126,13 +1177,12 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
     }
     const values = new Map();
     values['isCollapsed'] = isCollapsed;
-    const telemetryObject = new TelemetryObject(content.identifier, ContentType.COURSE_UNIT, content.pkgVersion);
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
       InteractSubtype.UNIT_CLICKED,
       Environment.HOME,
       PageId.COURSE_DETAIL,
-      telemetryObject,
+      ContentUtil.getTelemetryObject(content),
       values,
       undefined,
       this.corRelationList
@@ -1143,26 +1193,6 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
     return this.shownGroup === group;
   }
 
-  getLastPlayedName(id) {
-    if (this.showResumeBtn) {
-      const option = {
-        contentId: id,
-        hierarchyInfo: null,
-        level: !this.courseCardData.batchId ? 1 : 0,
-      };
-      this.contentService.getContentDetails(option).toPromise()
-        .then((data: Content) => {
-          this.lastReadContentName = data.contentData.name;
-          this.lastReadContentType = data.contentData.contentType;
-        }).catch(() => {
-
-        });
-    } else if (this.childContentsData) {
-      const firstChild = this.loadFirstChildren(this.childContentsData);
-      this.lastReadContentName = firstChild.contentData.name;
-    }
-  }
-
   /**
    * Function to set child contents
    */
@@ -1181,15 +1211,18 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
                 this.stickyPillsRef.nativeElement.classList.add('sticky');
               }
             }, 1000);
-            this.enrolledCourseMimeType = data.mimeType;
-            this.childrenData = data.children;
-            this.startData = data.children;
-            this.childContentsData = data;
-            this.getContentState(true);
+            this.courseHeirarchy = data;
+            this.checkRetiredOpenBatch(this.courseHeirarchy);
+            if (this.hasInit) {
+              this.getContentState(false);
+            } else {
+              this.hasInit = !this.hasInit;
+              this.getContentState(true);
+            }
           }
           if (this.courseCardData.batchId) {
             this.downloadSize = 0;
-            this.getContentsSize(this.childrenData);
+            this.getContentsSize(this.courseHeirarchy.children);
           }
           this.showChildrenLoader = false;
         });
@@ -1200,38 +1233,6 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
       });
   }
 
-  /**
-   * Redirect to child content details page
-   */
-  navigateToChildrenDetailsPage(content: Content, depth): void {
-    const subtype = InteractSubtype.CONTENT_CLICKED;
-    const contentState: ContentState = {
-      batchId: this.courseCardData.batchId ? this.courseCardData.batchId : '',
-      courseId: this.identifier
-    };
-    this.zone.run(() => {
-      this.router.navigate([RouterLinks.CONTENT_DETAILS], {
-        state: {
-          content,
-          depth,
-          contentState,
-          isChildContent: true,
-          corRelation: this.corRelationList,
-          isCourse: true,
-          course: this.updatedCourseCardData
-        }
-      });
-      this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
-        subtype,
-        Environment.HOME,
-        PageId.COURSE_DETAIL,
-        ContentUtil.getTelemetryObject(content),
-        undefined,
-        ContentUtil.generateRollUp(content.hierarchyInfo, undefined),
-        this.corRelationList);
-    });
-  }
-
   cancelDownload() {
     const showHeader = () => {
       this.zone.run(() => {
@@ -1251,7 +1252,6 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
   }
 
   getContentsSize(data?) {
-    // this.downloadIdentifiers = [];
     if (data) {
       data.forEach((value) => {
         if (value.contentData.size) {
@@ -1260,7 +1260,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
         if (value.children) {
           this.getContentsSize(value.children);
         }
-        if (value.isAvailableLocally === false) {
+        if (!value.isAvailableLocally && value.contentData.downloadUrl) {
           this.downloadIdentifiers.add(value.contentData.identifier);
           this.rollUpMap[value.contentData.identifier] = ContentUtil.generateRollUp(value.hierarchyInfo, undefined);
         }
@@ -1268,43 +1268,121 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
     }
   }
 
+  async startLearning() {
+    this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
+      InteractSubtype.START_CLICKED,
+      Environment.HOME,
+      PageId.COURSE_DETAIL,
+      this.telemetryObject,
+      undefined,
+      this.objRollup,
+      this.corRelationList
+    );
+
+    const key = PreferenceKey.DO_NOT_SHOW_PROFILE_NAME_CONFIRMATION_POPUP + '-' + this.userId;
+    const doNotShow = await this.preferences.getBoolean(key).toPromise();
+    const profile = await this.profileService.getActiveSessionProfile({
+      requiredFields: ProfileConstants.REQUIRED_FIELDS
+    }).toPromise();
+
+    if (doNotShow || await this.tncUpdateHandlerService.isSSOUser(profile) || !this.isCertifiedCourse) {
+      this.startContent();
+    } else {
+      this.showProfileNameConfirmationPopup();
+    }
+  }
+
+  private async startContent() {
+    if (this.courseHeirarchy && this.courseHeirarchy.children
+      && this.courseHeirarchy.children.length && !this.isBatchNotStarted) {
+      if (!this.nextContent) {
+        this.initNextContent();
+      }
+      const telemetryDetails = {
+        pageId: PageId.COURSE_DETAIL,
+        corRelationList: this.corRelationList
+      };
+      const assessmentStatus = this.localCourseService.fetchAssessmentStatus(this.contentStatusData, this.nextContent);
+
+      const maxAttempt: MaxAttempt = await this.commonUtilService.handleAssessmentStatus(assessmentStatus);
+      if (maxAttempt.isCloseButtonClicked || maxAttempt.limitExceeded) {
+        return;
+      }
+      this.contentPlayerHandler.playContent(this.nextContent, this.generateContentNavExtras(this.nextContent, 1), telemetryDetails, true);
+    } else {
+      this.commonUtilService.showToast(this.commonUtilService.translateMessage('COURSE_WILL_BE_AVAILABLE',
+        this.datePipe.transform(this.courseStartDate, 'mediumDate')));
+    }
+  }
+
   /**
    * Function gets executed when user click on resume course button.
    */
-  resumeContent(identifier): void {
+  async resumeContent(): Promise<void> {
+    if (!this.nextContent) {
+      this.initNextContent();
+    }
+    const telemetryDetails = {
+      pageId: PageId.COURSE_DETAIL,
+      corRelationList: this.corRelationList
+    };
+
+    const assessmentStatus = this.localCourseService.fetchAssessmentStatus(this.contentStatusData, this.nextContent);
+
+    const maxAttempt: MaxAttempt =  await this.commonUtilService.handleAssessmentStatus(assessmentStatus);
+    if (maxAttempt.isCloseButtonClicked || maxAttempt.limitExceeded) {
+      return;
+    }
+    
+    this.contentPlayerHandler.playContent(this.nextContent, this.generateContentNavExtras(this.nextContent, 1), telemetryDetails, true);
+
+    this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
+      InteractSubtype.RESUME_CLICKED,
+      Environment.HOME,
+      PageId.COURSE_DETAIL,
+      this.telemetryObject,
+      undefined,
+      this.objRollup,
+      this.corRelationList
+    );
+  }
+
+  /**
+   * Redirect to child content details page
+   */
+  private navigateToContentDetails(content: Content, depth): void {
+    this.router.navigate([RouterLinks.CONTENT_DETAILS], this.generateContentNavExtras(content, depth));
+  }
+
+  private generateContentNavExtras(content: Content, depth) {
     const params: NavigationExtras = {
       state: {
-        content: { identifier },
-        depth: '1', // Needed to handle some UI elements.
+        content,
+        depth, // Needed to handle some UI elements.
         contentState: {
           batchId: this.courseCardData.batchId ? this.courseCardData.batchId : '',
           courseId: this.identifier
         },
-        isResumedCourse: true,
+        // isResumedCourse: true,
         isChildContent: true,
-        resumedCourseCardData: this.courseCardData,
+        // resumedCourseCardData: this.courseCardData,
         corRelation: this.corRelationList,
         isCourse: true,
         course: this.updatedCourseCardData
       }
     };
-    this.router.navigate([RouterLinks.CONTENT_DETAILS], params);
-    this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
-      InteractSubtype.RESUME_CLICKED,
-      Environment.HOME,
-      PageId.COURSE_DETAIL,
-      this.telemetryObject,
-      undefined,
-      this.objRollup,
-      this.corRelationList
-    );
+    return params;
   }
 
   /**
    * Ionic life cycle hook
    */
   async ionViewWillEnter() {
-    await this.checkLoggedInOrGuestUser();
+    this.checkUserLoggedIn();
+    await this.appGlobalService.getActiveProfileUid()
+      .then((uid) => {
+        this.userId = uid;
+      });
     this.checkCurrentUserType();
     this.todayDate = window.dayjs().format('YYYY-MM-DD');
     this.identifier = this.courseCardData.contentId || this.courseCardData.identifier;
@@ -1312,29 +1390,8 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
     this.objRollup = ContentUtil.generateRollUp(this.courseCardData.hierarchyInfo, this.identifier);
     this.headerService.showHeaderWithBackButton();
 
-    if (!this.guestUser) {
-      this.updatedCourseCardData = await this.courseService.getEnrolledCourses({ userId: this.userId, returnFreshCourses: false })
-        .toPromise()
-        .then((data) => {
-          if (data.length > 0) {
-            const courseList: Array<Course> = [];
-            for (const course of data) {
-              courseList.push(course);
-            }
-            this.appGlobalService.setEnrolledCourseList(courseList);
-          }
-          return data.find((element) =>
-            (this.courseCardData.batchId && element.batchId === this.courseCardData.batchId)
-            || (!this.courseCardData.batchId && element.courseId === this.identifier));
-        })
-        .catch(e => {
-          console.log(e);
-          return null;
-        });
-      if (this.updatedCourseCardData && !this.courseCardData.batch) {
-        this.courseCardData.batch = this.updatedCourseCardData.batch;
-        this.courseCardData.batchId = this.updatedCourseCardData.batchId;
-      }
+    if (!this.isGuestUser) {
+      await this.updateEnrolledCourseData();
     }
 
     // check if the course is already enrolled
@@ -1345,6 +1402,8 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
 
     if (this.courseCardData.progress && this.courseCardData.progress > 0) {
       this.showResumeBtn = true;
+    } else {
+      this.showResumeBtn = false;
     }
 
     // TODO: Need to check
@@ -1354,32 +1413,38 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
       this.segmentType = 'modules';
     }
 
-    // if (this.courseCardData.batchId) {
-    //   this.segmentType = 'modules';
-    // }
     this.downloadIdentifiers = new Set();
     this.setContentDetails(this.identifier);
     this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
       this.handleHeaderEvents(eventName);
     });
 
-    // this.showResumeBtn = !!this.courseCardData.lastReadContentId;
-
     // If courseCardData does not have a batch id then it is not a enrolled course
     this.subscribeSdkEvent();
     this.populateCorRelationData(this.courseCardData.batchId);
     this.handleBackButton();
-    this.getLastReadContentId();
+    if (this.isAlreadyEnrolled) {
+      await this.checkDataSharingStatus();
+    }
+    window['segmentation'].SBTagService.pushTag(
+      window['segmentation'].SBTagService.getTags(TagPrefixConstants.CONTENT_ID) ? this.identifier : [this.identifier],
+      TagPrefixConstants.CONTENT_ID,
+      window['segmentation'].SBTagService.getTags(TagPrefixConstants.CONTENT_ID) ? false : true
+    );
   }
 
-  showLicensce() {
-    this.showCredits = !this.showCredits;
+  ionViewDidEnter() {
+    this.sbProgressLoader.hide({ id: 'login' });
+    this.sbProgressLoader.hide({ id: this.identifier });
+  }
 
-    if (this.showCredits) {
-      this.licenseSectionClicked('expanded');
-    } else {
-      this.licenseSectionClicked('collapsed');
-    }
+  editDataSettings() {
+    this.showShareData = !this.showShareData;
+  }
+
+  expandDataSettings() {
+    this.showShareData = false;
+    this.isDataShare = !this.isDataShare;
   }
 
   handleBackButton() {
@@ -1399,6 +1464,10 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
       if (this.shouldGenerateEndTelemetry) {
         this.generateQRSessionEndEvent(this.source, this.course.identifier);
       }
+      if (this.localCourseService.isConsentPopupVisible()) {
+        this.localCourseService.setConsentPopupVisibility(false);
+        await this.popoverCtrl.dismiss();
+       }
 
       if (await this.onboardingSkippedBackAction()) {
         return;
@@ -1422,10 +1491,10 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
     if (enrolledCourses && enrolledCourses.length > 0) {
       for (const course of enrolledCourses) {
         if (course.courseId === identifier) {
-          if (!this.guestUser && this.courseCardData.batch && course.batchId
+          if (!this.isGuestUser && this.courseCardData.batch && course.batchId
             === this.courseCardData.batch.identifier) {
             this.isAlreadyEnrolled = true;
-            this.subscribeTrackDiwnloads();
+            this.subscribeTrackDownloads();
             this.courseCardData = course;
           } else if (!this.courseCardData.batch) {
             this.courseCardData = course;
@@ -1435,9 +1504,14 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
     }
   }
 
+  isCourseModifiedAfterEnrolment() {
+    return (this.courseCardData && this.courseCardData.enrolledDate
+      && this.course && this.course.lastUpdatedOn
+      && (new Date(this.courseCardData.enrolledDate).getTime() < new Date(this.course.lastUpdatedOn).getTime()));
+  }
+
   getCourseProgress() {
     if (this.courseCardData.batchId && this.updatedCourseCardData) {
-      // console.log('getCourseProgress', this.updatedCourseCardData);
       this.course.progress = this.updatedCourseCardData.completionPercentage;
     }
   }
@@ -1553,94 +1627,55 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
     this.events.unsubscribe(EventTopics.UNENROL_COURSE_SUCCESS);
     this.events.unsubscribe('header:setzIndexToNormal');
     this.events.unsubscribe('header:decreasezIndex');
+    if (this.batchRemaningTimingIntervalRef) {
+      clearInterval(this.batchRemaningTimingIntervalRef);
+      this.batchRemaningTimingIntervalRef = undefined;
+    }
   }
 
   /**
    * checks whether batches are available or not and then Navigate user to batch list page
    */
   async navigateToBatchListPage() {
-    const ongoingBatches = [];
-    const upcommingBatches = [];
     const loader = await this.commonUtilService.getLoader();
     const reqvalues = new Map();
     reqvalues['enrollReq'] = this.courseBatchesRequest;
     this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
-      InteractSubtype.ENROLL_CLICKED,
-      Environment.HOME,
-      PageId.COURSE_DETAIL, this.telemetryObject,
-      reqvalues,
-      this.objRollup);
+      InteractSubtype.ENROLL_CLICKED, Environment.HOME,
+      PageId.COURSE_DETAIL, this.telemetryObject, reqvalues, this.objRollup);
 
-    if (this.commonUtilService.networkInfo.isNetworkAvailable) {
-      if (this.batches.length) {
-        if (this.batches.length === 1) {
-          this.enrollIntoBatch(this.batches[0]);
-        } else {
-          forEach(this.batches, (batch, key) => {
-            if (batch.status === 1) {
-              ongoingBatches.push(batch);
-            } else {
-              upcommingBatches.push(batch);
-            }
-          });
-          this.router.navigate([RouterLinks.COURSE_BATCHES], {
-            state: {
-              ongoingBatches,
-              upcommingBatches,
-              course: this.course,
-              objRollup: this.objRollup,
-              telemetryObject: this.telemetryObject,
-              corRelationList: this.corRelationList
-            }
-          });
-        }
-      } else {
-        this.commonUtilService.showToast('NO_BATCHES_AVAILABLE');
-        await loader.dismiss();
-
-      }
-    } else {
+    if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
       this.commonUtilService.showToast('ERROR_NO_INTERNET_MESSAGE');
+      return;
     }
-  }
 
-  /**
-   * Loads first children with in the start data
-   */
-  loadFirstChildren(data) {
-    if (data && (data.children === undefined)) {
-      return data;
-    } else {
-      for (const child of data.children) {
-        return this.loadFirstChildren(child);
-      }
+    if (!this.localCourseService.isEnrollable(this.batches, this.course)) {
+      return;
     }
-  }
 
-  /**
-   * Get executed when user click on start button
-   */
-  startContent() {
-    this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
-      InteractSubtype.START_CLICKED,
-      Environment.HOME,
-      PageId.COURSE_DETAIL,
-      this.telemetryObject,
-      undefined,
-      this.objRollup,
-      this.corRelationList
-    );
-    if (this.startData && this.startData.length && !this.isBatchNotStarted) {
-      this.firstChild = this.loadFirstChildren(this.childContentsData);
-      this.navigateToChildrenDetailsPage(this.firstChild, 1);
+    const ongoingBatches = [];
+    if (this.batches.length === 1) {
+      this.enrollIntoBatch(this.batches[0]);
     } else {
-      this.commonUtilService.showToast(this.commonUtilService.translateMessage('COURSE_WILL_BE_AVAILABLE',
-        this.datePipe.transform(this.courseStartDate, 'mediumDate')));
+      forEach(this.batches, (batch, key) => {
+        if (batch.status === 1) {
+          ongoingBatches.push(batch);
+        }
+      });
+      this.router.navigate([RouterLinks.COURSE_BATCHES], {
+        state: {
+          ongoingBatches,
+          upcommingBatches: [],
+          course: this.course,
+          objRollup: this.objRollup,
+          telemetryObject: this.telemetryObject,
+          corRelationList: this.corRelationList
+        }
+      });
     }
   }
 
   async share() {
-    // this.contentShareHandler.shareContent(this.content, this.corRelationList);
     const popover = await this.popoverCtrl.create({
       component: SbSharePopupComponent,
       componentProps: {
@@ -1663,6 +1698,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
   }
 
   goBack() {
+    this.appGlobalService.generateCourseCompleteTelemetry = false;
     this.events.publish('event:update_course_data');
     if (this.isQrCodeLinkToContent) {
       window.history.go(-2);
@@ -1697,7 +1733,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
   }
 
   generateStartEvent(objectId, objectType, objectVersion) {
-    const telemetryObject = new TelemetryObject(objectId, objectType || ContentType.COURSE, objectVersion);
+    const telemetryObject = new TelemetryObject(objectId, objectType || CsPrimaryCategory.COURSE, objectVersion);
     this.telemetryGeneratorService.generateStartTelemetry(PageId.COURSE_DETAIL,
       telemetryObject,
       this.objRollup,
@@ -1706,8 +1742,8 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
   }
 
   generateEndEvent(objectId, objectType, objectVersion) {
-    const telemetryObject = new TelemetryObject(objectId, objectType || ContentType.COURSE, objectVersion);
-    this.telemetryGeneratorService.generateEndTelemetry(objectType,
+    const telemetryObject = new TelemetryObject(objectId, objectType || CsPrimaryCategory.COURSE, objectVersion);
+    this.telemetryGeneratorService.generateEndTelemetry(objectType || CsPrimaryCategory.COURSE,
       Mode.PLAY,
       PageId.COURSE_DETAIL,
       Environment.HOME,
@@ -1722,34 +1758,24 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
   viewCredits() {
     this.courseUtilService.showCredits(this.course, PageId.COURSE_DETAIL, undefined, this.corRelationList);
   }
-  licenseSectionClicked(params) {
-    const telemetryObject = new TelemetryObject(this.objId, this.objType, this.objVer);
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      params === 'expanded' ? InteractType.LICENSE_CARD_EXPANDED : InteractType.LICENSE_CARD_COLLAPSED,
-      '',
-      undefined,
-      PageId.COURSE_DETAIL,
-      telemetryObject,
-      undefined,
-      this.objRollup,
-      this.corRelationList,
-      ID.LICENSE_CARD_CLICKED
-    );
-  }
 
   getContentState(returnRefresh: boolean) {
     if (this.courseCardData.batchId) {
       const request: GetContentStateRequest = {
         userId: this.appGlobalService.getUserId(),
-        courseIds: [this.identifier],
+        courseId: this.identifier,
+        contentIds: this.courseHeirarchy.contentData.leafNodes,
         returnRefreshedContentStates: returnRefresh,
-        batchId: this.courseCardData.batchId
+        batchId: this.courseCardData.batchId,
+        fields: ['progress', 'score']
       };
       this.courseService.getContentState(request).toPromise()
-        .then((success: ContentStateResponse) => {
-          this.contentStatusData = success;
+        .then((contentStateResponse: ContentStateResponse) => {
+          this.contentStatusData = contentStateResponse;
 
-          if (this.contentStatusData && this.contentStatusData.contentList) {
+          this.initNextContent();
+          if (this.contentStatusData) { //  && this.contentStatusData.contentList
+            this.getLocalCourseAndUnitProgress();
             let progress = 0;
             this.contentStatusData.contentList.forEach((contentState: ContentState) => {
               if (contentState.status === 2) {
@@ -1758,23 +1784,99 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
             });
 
             this.courseCardData.progress = progress;
-            this.getCourseProgress();
 
             if (this.courseCardData.progress && this.courseCardData.progress > 0) {
               this.showResumeBtn = true;
+            } else {
+              this.showResumeBtn = false;
             }
           }
 
-          if (this.childrenData) {
-            this.getStatusOfCourseCompletion(this.childrenData);
+          if (this.courseHeirarchy && this.courseHeirarchy.children) {
+            this.getStatusOfCourseCompletion(this.courseHeirarchy.children);
+          }
+
+          if (this.resumeCourseFlag) {
+            this.resumeContent();
+            this.resumeCourseFlag = false;
           }
         }).catch((error: any) => {
+          console.error('getContentState', error);
+
+          this.resumeCourseFlag = false;
         });
     } else {
       // to be handled when there won't be any batchId
     }
   }
 
+  getLocalCourseAndUnitProgress() {
+    const courseLevelViewedContents = [];
+    let leafNodeIds;
+    this.courseHeirarchy.children.forEach(collection => {
+      // Reset progress before assigning the updated progress.
+      collection.progressPercentage = 0;
+
+      const leafNodeIds = Array.from(this.getLeafNodeIdsWithoutDuplicates([collection]));
+      const unitLevelViewedContents = [];
+      for (const contentId of leafNodeIds) {
+        if (this.contentStatusData.contentList.find((c) => c.contentId === contentId && c.status === 2)) {
+          if (unitLevelViewedContents.indexOf(contentId) === -1) {
+            unitLevelViewedContents.push(contentId);
+          }
+          if (courseLevelViewedContents.indexOf(contentId) === -1) {
+            courseLevelViewedContents.push(contentId);
+          }
+        }
+      }
+      if (unitLevelViewedContents.length) {
+        collection.progressPercentage = Math.round((unitLevelViewedContents.length / leafNodeIds.length) * 100);
+      }
+    });
+
+    if (courseLevelViewedContents.length) {
+      if (this.courseHeirarchy.contentData.leafNodes) {
+        leafNodeIds = this.courseHeirarchy.contentData.leafNodes;
+      }
+      this.course.progress = Math.round((courseLevelViewedContents.length / leafNodeIds.length) * 100);
+    } else {
+      this.course.progress = 0;
+    }
+
+    if (!this.course.progress || this.course.progress !== 100) {
+      this.appGlobalService.generateCourseCompleteTelemetry = true;
+    }
+
+    if (this.appGlobalService.generateCourseCompleteTelemetry && this.course.progress === 100) {
+      this.appGlobalService.generateCourseCompleteTelemetry = false;
+      const cdata = [
+        {
+          type: 'CourseId',
+          id: this.identifier
+        },
+        {
+          type: 'BatchId',
+          id: this.batchDetails.id || ''
+        },
+        {
+          type: 'UserId',
+          id: this.userId
+        },
+      ];
+      this.telemetryGeneratorService.generateAuditTelemetry(
+        Environment.COURSE,
+        AuditState.AUDIT_UPDATED,
+        ['progress'],
+        AuditType.COURSE_PROGRESS,
+        this.telemetryObject.id,
+        this.telemetryObject.type,
+        this.telemetryObject.version,
+        cdata,
+        this.telemetryObject.rollup
+      );
+    }
+  }
+
   async handleHeaderEvents($event) {
     switch ($event.name) {
       case 'share':
@@ -1797,7 +1899,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
   }
 
   async enrollIntoBatch(item: Batch) {
-    if (this.guestUser) {
+    if (this.isGuestUser) {
       this.promptToLogin(item);
     } else {
       const enrollCourseRequest = this.localCourseService.prepareEnrollCourseRequest(this.userId, item);
@@ -1815,23 +1917,26 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
         userId: this.userId,
         batch: item,
         pageId: PageId.COURSE_BATCHES,
-        courseId: undefined,
+        courseId: this.course.identifier,
+        channel: this.course.channel,
         telemetryObject: this.telemetryObject,
         objRollup: this.objRollup,
-        corRelationList: this.corRelationList
+        corRelationList: this.corRelationList,
+        userConsent: this.course.userConsent
       };
 
-      this.localCourseService.enrollIntoBatch(enrollCourse).toPromise()
+      this.localCourseService.enrollIntoBatch(enrollCourse, this).toPromise()
         .then((data: boolean) => {
           this.zone.run(async () => {
             this.courseCardData.batchId = item.id;
             this.commonUtilService.showToast(this.commonUtilService.translateMessage('COURSE_ENROLLED'));
+            this.commonUtilService.showToast(this.categoryKeyTranslator.transform('FRMELEMNTS_MSG_COURSE_ENROLLED', this.course));
             this.events.publish(EventTopics.ENROL_COURSE_SUCCESS, {
               batchId: item.id,
               courseId: item.courseId
             });
             this.isAlreadyEnrolled = true;
-            this.subscribeTrackDiwnloads();
+            this.subscribeTrackDownloads();
           });
         }, (error) => {
           this.zone.run(async () => {
@@ -1856,8 +1961,8 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
     const confirm = await this.popoverCtrl.create({
       component: SbPopoverComponent,
       componentProps: {
-        sbPopoverMainTitle: this.commonUtilService.translateMessage('YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL'),
-        metaInfo: this.commonUtilService.translateMessage('TRAININGS_ONLY_REGISTERED_USERS'),
+        sbPopoverMainTitle: this.categoryKeyTranslator.transform('FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL', this.course),
+        metaInfo: this.categoryKeyTranslator.transform('FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS', this.course),
         sbPopoverHeading: this.commonUtilService.translateMessage('OVERLAY_SIGN_IN'),
         isNotShowCloseIcon: true,
         actionsButtons: [
@@ -1885,7 +1990,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
         this.corRelationList
       );
       this.appGlobalService.resetSavedQuizContent();
-      this.loginHandlerService.signIn();
+      this.loginHandlerService.signIn({navigateToCourse: true});
     }
   }
 
@@ -1904,13 +2009,8 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
 
   // check wheather to show Unenroll button in overflow menu or not
   handleUnenrollButton() {
-    console.log('INside the show unenroll ');
     const batchDetails = this.batchDetails ? this.batchDetails.status : 2;
     const enrollmentType = this.batchDetails ? this.batchDetails.enrollmentType : '';
-    console.log('INside the show unenroll ', batchDetails, enrollmentType);
-    console.log('final condition --- ', (batchDetails !== 2 &&
-      (this.courseCardData.status === 0 || this.courseCardData.status === 1 || this.course.progress < 100) &&
-      enrollmentType !== 'invite-only'));
 
     if (this.updatedCourseCardData) {
       this.showUnenrollButton = (batchDetails !== 2 &&
@@ -1949,4 +2049,313 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy {
     });
   }
 
+  onTocCardClick(event) {
+    // if from group flow then should not go to next page.
+    if (this.isFromGroupFlow) {
+      return;
+    }
+
+    if (this.isGuestUser) {
+      this.navigateToBatchListPage();
+      return false;
+    }
+
+    if (this.course.createdBy !== this.userId) {
+      if (!this.isAlreadyEnrolled) {
+        this.joinTraining();
+        return false;
+      } else if (this.isAlreadyEnrolled && this.isBatchNotStarted) {
+        this.commonUtilService.showToast(this.commonUtilService.translateMessage('COURSE_WILL_BE_AVAILABLE',
+          this.datePipe.transform(this.courseStartDate, 'mediumDate')));
+        return false;
+      }
+    }
+
+    if (event.item.mimeType === MimeType.COLLECTION) {
+      this.telemetryGeneratorService.generateInteractTelemetry(
+        InteractType.TOUCH,
+        InteractSubtype.TRAINING_MODULE_CLICKED,
+        Environment.HOME,
+        PageId.COURSE_DETAIL,
+        this.telemetryObject,
+        undefined,
+        this.objRollup,
+        this.corRelationList);
+      const chapterParams: NavigationExtras = {
+        state: {
+          chapterData: event.item,
+          batches: this.batches,
+          isAlreadyEnrolled: this.isAlreadyEnrolled,
+          courseCardData: this.courseCardData,
+          batchExp: this.batchExp,
+          isChapterCompleted: this.courseCompletionData[event.item.identifier],
+          contentStatusData: this.contentStatusData,
+          courseContent: this.content,
+          corRelation: this.corRelationList,
+          courseHeirarchy: this.courseHeirarchy
+        }
+      };
+
+      this.router.navigate([`/${RouterLinks.CURRICULUM_COURSES}/${RouterLinks.CHAPTER_DETAILS}`],
+        chapterParams);
+    } else {
+      if (!this.batchId) {
+        return false;
+      }
+      this.navigateToContentDetails(event.item, 1);
+    }
+  }
+
+  private initNextContent() {
+    this.isNextContentFound = false;
+    this.isFirstContent = false;
+    this.nextContent = undefined;
+    this.getNextContent(this.courseHeirarchy, this.contentStatusData.contentList);
+  }
+
+  private getNextContent(courseHeirarchy, contentStateList: ContentState[]) {
+    const result = contentStateList.find(({ contentId }) => contentId === courseHeirarchy.identifier);
+    if (!this.isFirstContent && courseHeirarchy.mimeType !== MimeType.COLLECTION) {
+      this.nextContent = courseHeirarchy;
+      this.isFirstContent = true;
+    }
+    if ((result && (result.status === 0 || result.status === 1))
+      || (!result && courseHeirarchy.mimeType !== MimeType.COLLECTION)) {
+      this.nextContent = courseHeirarchy;
+      this.isNextContentFound = true;
+      this.isFirstContent = true;
+    } else if (!this.isNextContentFound && courseHeirarchy && courseHeirarchy.children) {
+      courseHeirarchy.children.forEach((ele) => {
+        if (!this.isNextContentFound) {
+          this.getNextContent(ele, contentStateList);
+        }
+      });
+    }
+    return this.nextContent;
+  }
+
+  async saveChanges() {
+    const loader = await this.commonUtilService.getLoader();
+    await loader.present();
+    if (this.dataSharingStatus === ConsentStatus.ACTIVE) {
+      const request: Consent = {
+        status: ConsentStatus.REVOKED,
+        userId: this.courseCardData.userId,
+        consumerId: this.courseCardData.content ? this.courseCardData.content.channel : this.course.channel,
+        objectId: this.courseCardData.courseId,
+        objectType: 'Collection',
+      };
+      this.profileService.updateConsent(request).toPromise()
+        .then(async (data) => {
+          await loader.dismiss();
+          this.commonUtilService.showToast('FRMELEMNTS_MSG_DATA_SETTINGS_SUBMITED_SUCCESSFULLY');
+          this.showShareData = false;
+          this.checkDataSharingStatus();
+        })
+        .catch(async (e) => {
+          await loader.dismiss();
+          if (e.code === 'NETWORK_ERROR') {
+            this.commonUtilService.showToast('ERROR_NO_INTERNET_MESSAGE');
+          }
+        });
+    } else if (this.dataSharingStatus === ConsentStatus.REVOKED) {
+      await loader.dismiss();
+      await this.consentService.showConsentPopup(this.courseCardData);
+      this.showShareData = false;
+      this.checkDataSharingStatus();
+    }
+  }
+
+  async checkDataSharingStatus() {
+    const request: Consent = {
+      userId: this.courseCardData.userId,
+      consumerId: this.courseCardData.content ? this.courseCardData.content.channel : this.course.channel,
+      objectId: this.courseCardData.courseId
+    };
+    await this.profileService.getConsent(request).toPromise()
+      .then((data) => {
+        if (data) {
+          this.dataSharingStatus = data.consents[0].status;
+          this.lastUpdateOn = data.consents[0].lastUpdatedOn;
+          this.localCourseService.setConsentPopupVisibility(false);
+        }
+      })
+      .catch(async (e) => {
+        if (this.isAlreadyEnrolled && e.response && e.response.body && e.response.body.params.err === 'USER_CONSENT_NOT_FOUND'
+          && this.course.userConsent === UserConsent.YES) {
+          if (!this.isConsentPopUp) {
+            this.isConsentPopUp = true;
+            this.localCourseService.setConsentPopupVisibility(true);
+            await this.consentService.showConsentPopup(this.courseCardData);
+            await this.checkDataSharingStatus();
+          }
+        } else if (e.code === 'NETWORK_ERROR') {
+          this.commonUtilService.showToast('ERROR_NO_INTERNET_MESSAGE');
+        }
+      });
+  }
+
+  onConsentPopoverShow() {
+    if (this.loader) {
+      this.loader.dismiss();
+      this.loader = undefined;
+    }
+    this.localCourseService.setConsentPopupVisibility(true);
+  }
+
+  onConsentPopoverDismiss() {
+    this.localCourseService.setConsentPopupVisibility(false);
+    this.checkDataSharingStatus();
+  }
+
+  // openDiscussionForum(forumId: string) {
+  //   if(this.commonUtilService.networkInfo.isNetworkAvailable){
+  //     this.checkUserRegistration();
+  //   } else {
+  //     this.commonUtilService.showToast('ERROR_NO_INTERNET_MESSAGE');
+  //   }
+  // }
+
+  private async showProfileNameConfirmationPopup() {
+    const popUp = await this.popoverCtrl.create({
+      component: ProfileNameConfirmationPopoverComponent,
+      componentProps: {
+      },
+      cssClass: 'sb-popover sb-profile-name-confirmation-popover',
+    });
+    await popUp.present();
+    const { data } = await popUp.onDidDismiss();
+    if (data !== undefined) {
+      if (data.buttonClicked) {
+        this.startContent();
+      }
+    } else {
+      this.telemetryGeneratorService.generateInteractTelemetry(
+        InteractType.TOUCH,
+        InteractSubtype.CLOSE_CLICKED,
+        PageId.PROFILE_NAME_CONFIRMATION_POPUP,
+        Environment.HOME
+      );
+    }
+  }
+
+  private async checkRetiredOpenBatch(content: any, layoutName?: string) {
+    if (!this.isAlreadyEnrolled || this.skipCheckRetiredOpenBatch) {
+      return;
+    }
+    this.skipCheckRetiredOpenBatch = true;
+    let retiredBatches: Array<any> = [];
+    let anyOpenBatch = false;
+    const enrolledCourses = this.appGlobalService.getEnrolledCourseList() || [];
+    try {
+      if (layoutName !== ContentCard.LAYOUT_INPROGRESS) {
+        retiredBatches = enrolledCourses.filter((element) => {
+          if (element.contentId === content.identifier && element.batch.status === 1 && element.cProgress !== 100) {
+            anyOpenBatch = true;
+            content.batch = element.batch;
+          }
+          if (element.contentId === content.identifier && element.batch.status === 2 && element.cProgress !== 100) {
+            return element;
+          }
+        });
+      }
+    } catch (err) {
+      console.error('checkRetiredOpenBatch', err);
+    }
+
+    if (anyOpenBatch || !retiredBatches.length) {
+      // open the batch directly
+      // Do nothing.
+    } else if (retiredBatches.length) {
+      await this.navigateToBatchListPopup(content, layoutName, retiredBatches);
+    }
+  }
+
+  async navigateToBatchListPopup(content: any, layoutName?: string, retiredBatched?: any) {
+    if (this.isGuestUser || !this.commonUtilService.networkInfo.isNetworkAvailable) {
+      return;
+    }
+    const courseBatchesRequest: CourseBatchesRequest = {
+      filters: {
+        courseId: layoutName === ContentCard.LAYOUT_INPROGRESS ? content.contentId : content.identifier,
+        enrollmentType: CourseEnrollmentType.OPEN,
+        status: [CourseBatchStatus.NOT_STARTED, CourseBatchStatus.IN_PROGRESS]
+      },
+      sort_by: { createdDate: SortOrder.DESC },
+      fields: BatchConstants.REQUIRED_FIELDS
+    };
+    this.courseService.getCourseBatches(courseBatchesRequest).toPromise()
+      .then((res: Batch[]) => {
+        this.zone.run(async () => {
+          this.batches = res;
+          if (this.batches.length) {
+            const ongoingBatches = [];
+            this.batches.forEach((batch, key) => {
+              if (batch.status === 1) {
+                ongoingBatches.push(batch);
+              }
+            });
+            const reqvalues = new Map();
+            reqvalues['enrollReq'] = courseBatchesRequest;
+            this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
+              'ongoing-batch-popup',
+              Environment.HOME,
+              PageId.COURSE_DETAIL, undefined,
+              reqvalues, undefined, this.corRelationList);
+            const popover = await this.popoverCtrl.create({
+              component: EnrollmentDetailsComponent,
+              componentProps: {
+                upcommingBatches: [],
+                ongoingBatches,
+                retiredBatched,
+                content
+              },
+              cssClass: 'enrollement-popover'
+            });
+            // await this.loader.dismiss();
+            await popover.present();
+            const { data } = await popover.onDidDismiss();
+            if (data && data.isEnrolled) {
+              // Reload the page
+              // this.getEnrolledCourses();
+              await this.reloadPageAfterEnrollment(data);
+              this.checkDataSharingStatus();
+            }
+            if (data && typeof data.isEnrolled === 'function') {
+              (data.isEnrolled as Function).call(this);
+            }
+          } else {
+            // Do nothing.
+          }
+        });
+      })
+      .catch((error: any) => {
+        console.error('error while fetching course batches ==>', error);
+      });
+  }
+
+  generateDataForDF() {
+    if (this.courseCardData.batchId) {
+      this.fetchForumIdReq.identifier = [this.courseCardData.batchId];
+      this.fetchForumIdReq.type = 'batch';
+    } else {
+      this.fetchForumIdReq.identifier = [this.identifier];
+      this.fetchForumIdReq.type = 'course';
+    }
+    this.profileService.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS }).toPromise().then((p) => {
+      this.createUserReq.username = p.serverProfile['userName'];
+    });
+    this.appGlobalService.getActiveProfileUid()
+      .then((uid) => {
+        this.userId = uid;
+        this.createUserReq.identifier = uid;
+      });
+  }
+
+  async batchEndDateStatus(batchEndDate) {
+    this.batchRemaningTime = await this.localCourseService.getTimeRemaining(batchEndDate);
+    this.batchRemaningTimingIntervalRef = setInterval(async () => {
+      this.batchRemaningTime = await this.localCourseService.getTimeRemaining(batchEndDate);
+    }, 1000 * 60);
+  }
 }
diff --git a/src/app/faq-help/faq-help-data.ts b/src/app/faq-help/faq-help-data.ts
new file mode 100644
index 000000000..31c07c6c3
--- /dev/null
+++ b/src/app/faq-help/faq-help-data.ts
@@ -0,0 +1,82 @@
+export const VideoConfig = {
+  "context": {
+    "mode": "play",
+    "authToken": "",
+    "sid": "",
+    "did": "",
+    "uid": "",
+    "channel": "",
+    "pdata": { "id": "", "ver": "", "pid": "" },
+    "contextRollup": { "l1": "" },
+    "tags": [""],
+    "cdata": [],
+    "timeDiff": 0,
+    "objectRollup": {},
+    "host": "",
+    "endpoint": "",
+    "userData": {
+      "firstName": "",
+      "lastName": ""
+    }
+  },
+  "config": {
+    "traceId": ""
+  },
+  "metadata": {
+    "compatibilityLevel": 0,
+    "copyright": "",
+    "subject": [
+      ""
+    ],
+    "channel": "",
+    "language": [
+      ""
+    ],
+    "mimeType": "video/mp4",
+    "objectType": "Content",
+    "gradeLevel": [
+      ""
+    ],
+    "appIcon": "",
+    "primaryCategory": "",
+    "artifactUrl": "",
+    "contentType": "",
+    "identifier": "",
+    "audience": [
+      ""
+    ],
+    "visibility": "Default",
+    "mediaType": "content",
+    "osId": "",
+    "languageCode": [
+      ""
+    ],
+    "license": "",
+    "name": "",
+    "status": "Live",
+    "code": "",
+    "streamingUrl": "",
+    "medium": [
+      ""
+    ],
+    "createdOn": "2020-08-24T17:58:32.911+0000",
+    "copyrightYear": 2020,
+    "lastUpdatedOn": "2020-08-25T04:36:47.587+0000",
+    "creator": "",
+    "pkgVersion": 1,
+    "versionKey": "",
+    "framework": "",
+    "createdBy": "",
+    "resourceType": "Learn",
+    "orgDetails": {
+      "email": "",
+      "orgName": ""
+    },
+    "licenseDetails": {
+      "name": "",
+      "url": "",
+      "description": ""
+    }
+  },
+  "data": {}
+}
\ No newline at end of file
diff --git a/src/app/faq-help/faq-help.module.ts b/src/app/faq-help/faq-help.module.ts
index 137502877..2baaf88be 100644
--- a/src/app/faq-help/faq-help.module.ts
+++ b/src/app/faq-help/faq-help.module.ts
@@ -6,6 +6,8 @@ import { Routes, RouterModule } from '@angular/router';
 import { IonicModule } from '@ionic/angular';
 
 import { FaqHelpPage } from './faq-help.page';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
+import { ComponentsModule } from '../components/components.module';
 
 const routes: Routes = [
   {
@@ -19,6 +21,8 @@ const routes: Routes = [
     CommonModule,
     FormsModule,
     IonicModule,
+    CommonConsumptionModule,
+    ComponentsModule,
     RouterModule.forChild(routes)
   ],
   declarations: [FaqHelpPage]
diff --git a/src/app/faq-help/faq-help.page.html b/src/app/faq-help/faq-help.page.html
index 4f85ff02e..ba0b1365b 100644
--- a/src/app/faq-help/faq-help.page.html
+++ b/src/app/faq-help/faq-help.page.html
@@ -1,53 +1,57 @@
 <ion-content scroll-y="true" class="contentPadding">
-  <div class="help-header">
-    <h4>{{data?.constants?.help }}</h4>
-    <p>{{data?.constants?.faqMsg}}</p>
+  <div class="container-focus pl-16 pr-16 pb-16">
+    <h4 class="m-0">{{faqData?.constants?.help }}</h4>
+    <p>{{faqData?.constants?.faqMsg}}</p>
   </div>
-  <div class="info-msg">
-    <p> {{ data?.constants?.resolveMsg}}</p>
+  <div class="info-msg" *ngIf="!selectedFaqCategory">
+    <p> {{faqData?.constants?.resolveMsg}}</p>
   </div>
 
-  <div class="panel panel-default" *ngFor="let faq of faqs; let i = index">
-    <div data-toggle="collapse" (click)="toggleGroup(i)">
-      <div class="panel-heading">
-        <div [ngClass]="{'panel-title': !isGroupShown(i), 'panel-title-blue': isGroupShown(i)}">{{ faq?.topic}}
-          <img class="btn-arrow" src="../../assets/faq/resources/images/Arrow.png" *ngIf="!isGroupShown(i)"
-            alt="group shown">
-          <img class="btn-arrow" src="../../assets/faq/resources/images/UpArrow.png" *ngIf="isGroupShown(i)"
-            alt="group not shown">
-        </div>
-      </div>
+  <div class="selected-category-name" *ngIf="selectedFaqCategory">
+    <strong> {{ selectedFaqCategory?.name }}</strong>
+  </div>
+
+  <section>
+    <div *ngIf="!selectedFaqCategory">
+      <sb-list 
+        [title]="faqData?.constants?.selectCategoryTitle" 
+        [listData]="faqData?.categories"
+        [btnText]="faqData?.constants?.reportIssueMsg" 
+        [btnImg]="'../../assets/faq/resources/images/Report_blue.png'"
+        [showRightArrow]="true"
+        (itemClick)="onCategorySelect($event)" 
+        (btnClick)="enableFaqReport($event)">
+      </sb-list>
     </div>
-    <div id="collapse' + key + '" class="panel-collapse collapse" *ngIf="isGroupShown(i)">
-      <div class="panel-body">
-        <p class="panelText" [innerHtml]="faq.description"></p>
-      </div>
-      <div class="panel-interact" *ngIf="!isNoClicked && !isYesClicked">
-        <p class="panelText">{{data?.constants?.helpMsg}} </p>
-        <button type="button" class="btn" id="btn-no" (click)="noClicked(i)">{{data?.constants?.noMsg}}</button>
-        <button type="button" class="yesBtn" id="btn-yes" (click)="yesClicked(i)">{{data?.constants?.yesMsg}}</button>
-      </div>
-      <div class="panel-interact" *ngIf="isYesClicked || isSubmitted">
-        <p class="yes-clicked"> {{data?.constants?.thanksMsg}}</p>
+
+    <div *ngIf="selectedFaqCategory">
+
+      <div *ngIf="selectedFaqCategory?.videos?.length">
+        <sb-carousel 
+          [title]="faqData?.constants?.videoTitle" 
+          [listData]="selectedFaqCategory?.videos"
+          (itemClick)="onVideoSelect($event)">
+        </sb-carousel>
       </div>
-      <div class="panel-info" *ngIf="!isSubmitted && isNoClicked">
-        <h6>{{data?.constants?.sorryMsg}}</h6>
-        <p>{{data?.constants?.knowMoreMsg}}</p>
-        <form action="#" id="know-more-form" class="know-more-form" *ngIf="!isSubmitted">
-          <textarea type="text" name="moreInfo" placeholder="{{constants?.typeHere}}" class="input-text"
-            maxlength="1000" [(ngModel)]="textValue"></textarea>
-          <input type="submit" value="{{constants?.submitButton}}" class="submit-button"
-            (click)="submitClicked(textValue,i)">
-        </form>
-        <p class="no-clicked" hidden="true" *ngIf="isSubmitted"> {{data?.constants?.thanksMsg}} </p>
+
+      <div *ngIf="selectedFaqCategory?.faqs?.length">
+        <p class="faq-sub-title">{{faqData?.constants?.faqTitle}}</p>
+        <sb-faq 
+          [data]="selectedFaqCategory" 
+          (toggleGroupEvent)="toggleGroup($event)"
+          (yesClickedEvent)="logInteractEvent($event)" 
+          (noClickedEvent)="logInteractEvent($event)"
+          (submitClickedEvent)="logInteractEvent($event)">
+        </sb-faq>
       </div>
     </div>
-  </div>
-  <div class="send-email">
-    <button class="report-button" (click)="navigateToReportIssue()">
-      <img src="../../assets/faq/resources/images/Report.png" alt="navigate to report issue.">
-      <span class="report-text">{{ data?.constants?.reportIssueMsg }}</span>
+  </section>
+
+  <div *ngIf="selectedFaqCategory" class="send-email" (click)="navigateToReportIssue()">
+    <button class="report-button">
+      <img src="../../assets/faq/resources/images/Report_blue.png" alt="navigate to report issue.">
+      <span class="report-text">{{ faqData?.constants?.reportIssueMsg }}</span>
     </button>
   </div>
 
-</ion-content>
\ No newline at end of file
+</ion-content>
diff --git a/src/app/faq-help/faq-help.page.scss b/src/app/faq-help/faq-help.page.scss
index 0481a7533..f0da01322 100644
--- a/src/app/faq-help/faq-help.page.scss
+++ b/src/app/faq-help/faq-help.page.scss
@@ -22,8 +22,8 @@ iframe {
     width: 100%;
   }
   body{
-    background-color: #edf4f9;
-    font-family: 'Noto Sans';
+    background-color: map-get($colors, $light-blue);
+      font-family: 'Noto Sans', sans-serif;
 }
 .panelText{
     font-size: 14px;
@@ -40,25 +40,23 @@ iframe {
     margin-left: 5px;
 }
 .yesBtn{
-    color: #008840;
+    color: $green;
 }
 p{
     font-size: 14px;
 }
 .help-header, .help-header-send-email{
-    background: #024f9d;
-    color: #fff;
+    background: $blue;
+    color: map-get($colors, white);
     padding: 16px;
 }
 .help-header>h4,.help-header-send-email>h4{
-    margin: 0;
     padding:0;
     font-weight: 700;
     max-width: 1024px;
     margin: 0 auto;
 }
 .help-header>p,.help-header-send-email>p{
-    margin: 0;
     font-weight: 100;
     max-width: 1024px;
     margin: 0 auto;
@@ -72,10 +70,10 @@ p{
     display: flex;
     align-items: flex-start;
     justify-content: space-between;
-    color: #024f9d;
+    color: $blue;
 }
 .info-msg{
-        background-color: #F3F7FA
+        background-color: map-get($colors, white_fa)
     }
 .report-text{
       padding-left: 6px;
@@ -83,7 +81,6 @@ p{
 @media only screen and (max-width : 1024px) {
 
     .info-msg-send-email>p,.info-msg>p{
-        margin: 0;
         padding: 8px 16px;
         max-width: 1024px;
         margin: 0 auto;
@@ -93,18 +90,17 @@ p{
 @media only screen and (min-width : 1025px) {
 
     .info-msg-send-email>p,.info-msg>p{
-        margin: 0;
-        padding: 16px 0px;
+        padding: 16px 0;
         max-width: 1024px;
         margin: 0 auto;
     }
 }
 .icon{
-    color:#024f9d;
+    color: $blue;
     float:right;
 } 
 .panel{
-    border-radius: 0px !important;
+    border-radius: 0 !important;
     border-top: 0;
     border-left: 0;
     border-right: 0;
@@ -112,9 +108,6 @@ p{
     border-bottom: solid 1px lightgray;
     font-size: 16px;
 }
-.panel-default{
-
-}
 
 .panel-heading {
     padding: 16px 16px;
@@ -128,11 +121,11 @@ p{
     margin-top: 0px;
 }
 .panel-default>.panel-heading{
-    background-color: #fff;
+    background-color: map-get($colors, white);
     border-radius: 0px !important;
 }
 .panel-body{
-    background-color: #F3F7FA;
+    background-color: map-get($colors, white_fa);
 }
 .panel-interact{
     text-align: center; 
@@ -141,17 +134,17 @@ p{
 }
 .panel-interact>button{
     margin: 10px 5px 0px 5px;
-    background-color: #F3F7FA;
-    border-color: #F3F7FA;
+    background-color: map-get($colors, white_fa);
+    border-color: map-get($colors, white_fa);
     width: 80px;
-    color: #024f9d;
+    color: $blue;
     font-size: 13px;
     font-weight: 700;
     outline: none;
     height: 30px;
 }
 .panel-interact .yesBtn{
-    color: #008840;
+    color: $green;
 }
 .panel-interact>p{
     margin: 0px;
@@ -160,10 +153,10 @@ p{
     padding:10px !important;
     margin: auto !important;
     margin-top:10px !important;
-    background: #F3F7FA;
+    background: map-get($colors, white_fa);
     width: 200px;
     border-radius: 4px;
-    color:#008840;
+    color:$green;
     text-align: center;
 }
 
@@ -185,18 +178,18 @@ p{
     box-shadow: none;
     border-width: 1px;
     border-style:solid;
-    border-color: #c3c3c3;
+    border-color: map-get($colors, light_gray-c3);
     @include padding(8px 0px 0px 8px);
     resize: none;
 }
 .submit-button{
     width: 100%;
-    color: #fff;
-    background: #024f9d;
+    color: map-get($colors, white);
+    background: $blue;
     height: 40px;
     border-radius: 4px;
     border-style:solid;
-    border-color:  #024f9d;
+    border-color:  $blue;
     margin: 10px 0px 16px 0px;
     outline: none;
 }
@@ -205,12 +198,12 @@ p{
    
     .report-button{
         min-width: 90vw;
-        color: #fff;
-        background: #024f9d;
+        color: map-get($colors, white);
+        background: $blue;
         height: 40px;
         border-radius: 4px;
         border-style:solid;
-        border-color:  #024f9d;
+        border-color:  $blue;
         outline: none;
     }
     p{
@@ -229,22 +222,22 @@ p{
         font-size: 12px;
     }
     .initiate-email-info-button{
-        left: 0px;
-    right: 0px;
+        left: 0;
+    right: 0;
     position: fixed;
     top: 80vh;
-    padding: 0px 16px;
+    padding: 0 16px;
     }
 }
 @media only screen and (min-width : 1025px) {
     .report-button{
         min-width: 1024px;
-        color: #fff;
-        background: #024f9d;
+        color: map-get($colors, white);
+        background: $blue;
         height: 40px;
         border-radius: 4px;
         border-style:solid;
-        border-color:  #024f9d;
+        border-color:  $blue;
         outline: none;
     }
 }
@@ -284,18 +277,18 @@ img>.report-button{
     }
     .send-email-info{
         max-width: 570px;
-        padding: 10px 0px !important;
-        margin: left;
+        padding: 10px 0 !important;
+        margin: initial;
         float: left;
     }
     .submit-button{
         width: 150px;
         float: right;
-        color: #fff;
-        background: #024f9d;
+        color: map-get($colors, white);
+        background: $blue;
         border-radius: 0px;
         border-style:solid;
-        border-color:  #024f9d;
+        border-color:  $blue;
         margin: 10px 0px 16px 0px;
         height: 32px;
         outline: none;
@@ -322,12 +315,12 @@ img>.report-button{
     box-shadow: none;
     border-width: 1px;
     border-style:solid;
-    border-color: #c3c3c3;
+    border-color: map-get($colors, light_gray-c3);
     @include padding(15px);
     resize: none;
 }
 ::placeholder {
-  color: #999999;
+  color: $gray-300;
   font-size: 14px;
   font-weight: normal;
 }
@@ -342,7 +335,7 @@ img>.report-button{
         box-shadow: none;
         border-width: 1px;
         border-style:solid;
-        border-color: #c3c3c3;
+        border-color: map-get($colors, light_gray-c3);
         @include padding(8px 0px 0px 8px);
         margin: 0px;
         resize: none;
@@ -358,7 +351,7 @@ img>.report-button{
     
 }
 a{
-    color: #333;
+    color: map-get($colors, primary_black);
 }
 
 a:active, a:hover{
@@ -368,4 +361,15 @@ a:active, a:hover{
 
 #textareadiv{
     position: relative
+}
+
+.selected-category-name{
+    padding: 1rem 1rem 0 1rem;
+    font-size: 1.2rem;
+}
+
+.faq-sub-title{
+    font-size: 1rem;
+    font-weight: bold;
+    padding: 1rem 1rem 0.5rem;
 }
\ No newline at end of file
diff --git a/src/app/faq-help/faq-help.page.spec.data.ts b/src/app/faq-help/faq-help.page.spec.data.ts
new file mode 100644
index 000000000..6df1dda46
--- /dev/null
+++ b/src/app/faq-help/faq-help.page.spec.data.ts
@@ -0,0 +1,26 @@
+export const mockFaqData = {
+    constants: {},
+    faqs: [
+        {
+            topic: '{{APP_NAME}}',
+            description: '{{APP_NAME}}',
+
+        },{
+            topic: 'AppName',
+            description: 'AppName',
+
+        }
+    ]
+};
+
+export const expectedFaqs = [
+    {
+        topic: 'AppName',
+        description: 'AppName',
+
+    },{
+        topic: 'AppName',
+        description: 'AppName',
+
+    }
+]
\ No newline at end of file
diff --git a/src/app/faq-help/faq-help.page.spec.ts b/src/app/faq-help/faq-help.page.spec.ts
new file mode 100644
index 000000000..419c102c5
--- /dev/null
+++ b/src/app/faq-help/faq-help.page.spec.ts
@@ -0,0 +1,394 @@
+import { FaqHelpPage } from './faq-help.page';
+import { DomSanitizer } from '@angular/platform-browser';
+import { AppVersion } from '@ionic-native/app-version/ngx';
+import { Platform, ModalController } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+import { HttpClient } from '@angular/common/http';
+import { Router, ResolveEnd } from '@angular/router';
+import { NgZone } from '@angular/core';
+import { FormAndFrameworkUtilService } from '@app/services/formandframeworkutil.service';
+import {
+    SharedPreferences,
+    SystemSettingsService,
+    FaqService    
+} from 'sunbird-sdk';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { AppGlobalService } from '@app/services/app-global-service.service';
+import { AppHeaderService } from '@app/services/app-header.service';
+import { Location } from '@angular/common';
+import { of } from 'rxjs';
+import {mockFaqData} from "@app/app/faq-help/faq-help.page.spec.data";
+import { expectedFaqs } from './faq-help.page.spec.data';
+import { throws } from 'assert';
+import { RouterLinks } from '../app.constant';
+
+describe('FaqHelpPage', () => {
+    let faqHelpPage: FaqHelpPage;
+    const mockSharedPreferences: Partial<SharedPreferences> = {
+        getString: jest.fn(() => of('English'))
+    };
+    const mockSystemSettingsService: Partial<SystemSettingsService> = {
+        getSystemSettings: jest.fn(() => of({value: 'url'}))
+    };
+    const mockFaqService: Partial<FaqService> = {
+        getFaqDetails: jest.fn(() => of(mockFaqData))
+    };
+    const mockDomSanitizer: Partial<DomSanitizer> = {
+        bypassSecurityTrustResourceUrl: jest.fn(() => 'url') as any
+    };
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateImpressionTelemetry: jest.fn(),
+        generateInteractTelemetry: jest.fn()
+    };
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+    const mockAppGlobalService: Partial<AppGlobalService> = {};
+    const mockAppHeaderService: Partial<AppHeaderService> = {
+        showHeaderWithBackButton: jest.fn(),
+        headerEventEmitted$: {
+            subscribe: jest.fn((fn) => fn({name: 'back'}))
+        }
+    };
+    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {
+        getConsumptionFaqsUrl: jest.fn(() => Promise.resolve({})),
+        getFormConfig: jest.fn(() => [])
+    };
+    const mockLocation: Partial<Location> = {
+        back: jest.fn()
+    };
+    const mockAppVersion: Partial<AppVersion> = {
+        getAppName: jest.fn(() => Promise.resolve('AppName'))
+    };
+    const mockPlatform: Partial<Platform> = {};
+    const mockTranslateService: Partial<TranslateService> = {
+        use: jest.fn(() => of('en'))
+    };
+    const mockHttpClient: Partial<HttpClient> = {};
+    const mockRouter: Partial<Router> = {
+        navigate: jest.fn()
+    };
+    const mockNgZone: Partial<NgZone> = {
+        run: jest.fn(fn => fn())
+    };
+    const modalCtrl: Partial<ModalController> = {};
+
+    window['supportfile'] = {
+        removeFile: jest.fn()
+    }
+
+    beforeAll(() => {
+        mockRouter.getCurrentNavigation = jest.fn(() => {
+            return {
+                extras: {}
+            };
+        });
+        faqHelpPage = new FaqHelpPage(
+            mockSharedPreferences as any,
+            mockSystemSettingsService as any,
+            mockFaqService as any,
+            mockDomSanitizer as any,
+            mockTelemetryGeneratorService as any,
+            mockCommonUtilService as any,
+            mockAppGlobalService as any,
+            mockAppHeaderService as any,
+            mockFormAndFrameworkUtilService as any,
+            mockLocation as any,
+            mockAppVersion as any,
+            mockPlatform as any,
+            mockTranslateService as any,
+            mockHttpClient as any,
+            mockRouter as any,
+            mockNgZone as any,
+            modalCtrl as any
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    describe('intialise', () => {
+        it('init constructor', () => {
+            // assert
+            expect(faqHelpPage).toBeTruthy();
+        });
+    });
+
+    describe('ngOnInit', () => {
+        it('intialise view setting cureLang', (done) => {
+            // arrange
+            window.addEventListener = jest.fn((as, listener, sd) => listener({
+                isTrusted:true,
+                data: {
+                    action: "action-type",
+                    value: {
+                        description: 'Some Description'
+                    }
+                }
+            })) as any;
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            faqHelpPage.selectedLanguage = 'en';
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            jest.spyOn(faqHelpPage, 'generateInteractTelemetry');
+            // act
+            faqHelpPage.ngOnInit();
+            // assert
+            setTimeout(() => {
+                expect(faqHelpPage.appName).toEqual("AppName");
+                expect(mockTranslateService.use).toBeCalled();
+                expect(faqHelpPage.generateInteractTelemetry).toBeCalled();
+                done();
+            }, 50);
+        });
+    });
+
+    describe('ionViewWillEnter', () => {
+        it('display header and set consumptionurl else condition', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false 
+            };
+            const subscribeWithPriority = jest.fn((_, fn) => fn());
+            mockPlatform.backButton = {
+                subscribeWithPriority: subscribeWithPriority
+            } as any;
+            // act
+            faqHelpPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockAppHeaderService.showHeaderWithBackButton).toBeCalled();
+                expect(faqHelpPage.consumptionFaqUrl).toEqual('url');
+                done();
+            }, 20);
+        });
+
+        it('display header and set consumptionurl', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            const subscribeWithPriority = jest.fn((_, fn) => fn());
+            mockPlatform.backButton = {
+                subscribeWithPriority: subscribeWithPriority
+            } as any;
+            // act
+            faqHelpPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockAppHeaderService.showHeaderWithBackButton).toBeCalled();
+                expect(faqHelpPage.consumptionFaqUrl).toEqual('url');
+                done();
+            }, 20);
+        });
+    });
+
+    describe('ionViewWillEnter', () => {
+        it('unsubscribe all observables', () => {
+            // arrange
+            const unsubscribe = jest.fn();
+            faqHelpPage.backButtonFunc = {
+                unsubscribe: unsubscribe
+            };
+            faqHelpPage.headerObservable = {
+                unsubscribe: unsubscribe
+            };
+            // act
+            faqHelpPage.ionViewWillLeave();
+            // assert
+            expect(unsubscribe).toBeCalled();
+        });
+    });
+
+    describe('toggleGroup', () => {
+        it('should trigger an telemetry event if the toggle is clicked', () => {
+            // arrange
+            const toggleData = {
+                data: {
+                    position: 1,
+                    action: 'open-toggle'
+                }
+            }
+            // act
+            faqHelpPage.toggleGroup(toggleData);
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+        });
+
+        it('should not trigger any telemetry event if there is no data', () => {
+            // arrange
+            const toggleData = {};
+            // act
+            faqHelpPage.toggleGroup(toggleData);
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).not.toHaveBeenCalled();
+        });
+    });
+
+    describe('logInteractEvent', () => {
+        it('should not generate any interact event when there is no data', () => {
+            // arrange
+            const postMessage = jest.fn((_, __) => false);
+            parent.postMessage = postMessage;
+            const onCLickEvent = {
+            }
+            // act
+            faqHelpPage.logInteractEvent(onCLickEvent);
+            // assert
+            expect(postMessage).not.toBeCalled();
+        });
+
+        it('should generate an interact event when faq, response is collected', () => {
+            // arrange
+            const postMessage = jest.fn((_, __) => false);
+            parent.postMessage = postMessage;
+            const onCLickEvent = {
+                data: {
+                    action: 'yes-clicked',
+                    position: 1,
+                    value: {}
+                }
+            }
+            // act
+            faqHelpPage.logInteractEvent(onCLickEvent);
+            // assert
+            expect(postMessage).toBeCalled();
+            expect(faqHelpPage.value.action).toEqual('yes-clicked');
+        });
+    });
+
+    describe('navigateToReportIssue', () => {
+        it('navigate to report issue page', async () => {
+            // arrange
+            faqHelpPage.corRelation = [];
+            // act
+            await faqHelpPage.navigateToReportIssue();
+            // assert
+            expect(mockRouter.navigate).toBeCalledWith(
+                [RouterLinks.FAQ_REPORT_ISSUE], {
+                    state: {
+                        data: faqHelpPage.faqData,
+                        corRelation: faqHelpPage.corRelation
+                    }
+                }
+            );
+        });
+    });
+
+    describe('ionViewDidLeave', () => {
+        it('should remove listeners and reset loading', (done) => {
+            // arrange
+            jest.spyOn(window, 'removeEventListener');
+            // act
+            faqHelpPage.ionViewDidLeave();
+            // assert
+            setTimeout(() => {
+                expect(window.supportfile.removeFile).toBeCalled();
+                expect(window.removeEventListener).toBeCalled();
+                expect(faqHelpPage.loading).toBeUndefined();
+                done();
+            }, 10);
+        });
+    });
+
+    describe('handleBackButton', () => {
+        it('should navigate to previous history screen', () => {
+            // arrange
+            faqHelpPage.selectedFaqCategory = null;
+            // act
+            faqHelpPage.handleBackButton();
+            // assert
+            expect(mockLocation.back).toHaveBeenCalled()
+        });
+
+        it('should not navigate to previous history screen', () => {
+            // arrange
+            faqHelpPage.selectedFaqCategory = {} as any;
+            // act
+            faqHelpPage.handleBackButton();
+            // assert
+            expect(mockLocation.back).not.toHaveBeenCalled()
+        });
+    });
+
+    describe('replaceFaqText', () => {
+        it('should seggregate the faq data for APP_NAME based on selected faq category', () => {
+            // arrange
+            const selectedFaqCategoryData = {
+                faqs: [
+                    {
+                        topic: 'some_topic',
+                        description: 'some_description'
+                    },
+                    {
+                        topic: 'some_topic {{APP_NAME}}',
+                        description: 'some_description {{APP_NAME}}'
+                    }
+                ]
+            }
+            const resultFaqCategoryData = {
+                faqs: [
+                    {
+                        topic: 'some_topic',
+                        description: 'some_description'
+                    },
+                    {
+                        topic: 'some_topic appName',
+                        description: 'some_description appName'
+                    }
+                ],
+                constants: {}
+            }
+            faqHelpPage.appName = 'appName';
+            faqHelpPage.constants = {};
+            // act
+            faqHelpPage.replaceFaqText(selectedFaqCategoryData);
+            // assert
+            expect(faqHelpPage.selectedFaqCategory).toEqual(resultFaqCategoryData);
+        });
+    });
+
+    describe('onCategorySelect', () => {
+        it('should terminate the flow if the category data is empty', () => {
+            // arrange
+            const faqCategoryEvent = {}
+            faqHelpPage.replaceFaqText = jest.fn();
+            // act
+            faqHelpPage.onCategorySelect(faqCategoryEvent);
+            // assert
+            expect(faqHelpPage.replaceFaqText).not.toHaveBeenCalled()
+        });
+
+        it('should filter the faq data and show up the corresponding videos and faqs', (done) => {
+            // arrange
+            const faqCategoryEvent = {
+                data: {}
+            };
+            faqHelpPage.replaceFaqText = jest.fn();
+            // act
+            faqHelpPage.onCategorySelect(faqCategoryEvent);
+            // assert
+            setTimeout(() => {
+                expect(faqHelpPage.replaceFaqText).toHaveBeenCalled()
+                done();
+            }, 0);
+        });
+    });
+
+    describe('enableFaqReport', () => {
+        it('should navigate to faq report page', () => {
+            // arrange
+            faqHelpPage.navigateToReportIssue = jest.fn();
+            // act
+            faqHelpPage.enableFaqReport({});
+            // assert
+            expect(faqHelpPage.navigateToReportIssue).toHaveBeenCalled()
+        });
+    });
+});
diff --git a/src/app/faq-help/faq-help.page.ts b/src/app/faq-help/faq-help.page.ts
index 03fcdd8d6..1523cdaa6 100644
--- a/src/app/faq-help/faq-help.page.ts
+++ b/src/app/faq-help/faq-help.page.ts
@@ -1,32 +1,31 @@
 import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 import { Component, Inject, ViewChild, ElementRef, OnInit, NgZone } from '@angular/core';
-import { Platform } from '@ionic/angular';
+import { ModalController, Platform } from '@ionic/angular';
 import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
 import { CommonUtilService } from '@app/services/common-util.service';
 import { AppGlobalService, } from '@app/services/app-global-service.service';
 import { AppHeaderService, } from '@app/services/app-header.service';
 import { FormAndFrameworkUtilService, } from '@app/services/formandframeworkutil.service';
-import { Environment, InteractType, PageId, InteractSubtype, ImpressionType } from '@app/services/telemetry-constants';
+import { Environment, InteractType, PageId, InteractSubtype, ImpressionType, CorReleationDataType } from '@app/services/telemetry-constants';
 import {
-  ProfileService,
-  ContentService,
-  DeviceInfo,
   SharedPreferences,
   TelemetryObject,
   GetSystemSettingsRequest,
   SystemSettingsService,
   SystemSettings,
   FaqService,
-  GetFaqRequest
+  GetFaqRequest,
+  CorrelationData,
 } from 'sunbird-sdk';
 import { PreferenceKey, appLanguages, RouterLinks } from '../app.constant';
-import { SocialSharing } from '@ionic-native/social-sharing/ngx';
 import { Location } from '@angular/common';
 import { AppVersion } from '@ionic-native/app-version/ngx';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable, Subscription } from 'rxjs';
 import { HttpClient } from '@angular/common/http';
 import { Router } from '@angular/router';
+import { VideoConfig } from './faq-help-data';
+import { ContentViewerComponent } from './../components/content-viewer/content-viewer.component';
 
 @Component({
   selector: 'app-faq-help',
@@ -48,29 +47,39 @@ export class FaqHelpPage implements OnInit {
   appName: string;
   loading?: any;
   private messageListener: (evt: Event) => void;
-  @ViewChild('f') iframe: ElementRef;
+  @ViewChild('f', { static: false }) iframe: ElementRef;
   backButtonFunc: Subscription;
   headerObservable: any;
-  shownGroup: any;
-  isNoClicked: boolean;
-  isYesClicked: boolean;
-  isSubmitted: boolean;
-  data: any;
+  faqData: {
+    categories: {
+      name: string,
+      videos?: any[],
+      faqs?: {
+        topic: string,
+        description: string
+      }[],
+    }[],
+    constants: any
+  }
   constants: any;
-  faqs: any;
   jsonURL: any;
-  textValue: any;
   value: any;
+  corRelation: Array<CorrelationData> = [];
+  selectedFaqCategory: {
+    name: string,
+    videos?: any[],
+    faqs?: {
+      topic: string,
+      description: string
+    }[],
+    constants?: any
+  } | undefined;
   constructor(
     @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
-    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
-    @Inject('CONTENT_SERVICE') private contentService: ContentService,
-    @Inject('DEVICE_INFO') private deviceInfo: DeviceInfo,
     @Inject('SYSTEM_SETTINGS_SERVICE') private systemSettingsService: SystemSettingsService,
     @Inject('FAQ_SERVICE') private faqService: FaqService,
     private domSanitizer: DomSanitizer,
     private telemetryGeneratorService: TelemetryGeneratorService,
-    private socialSharing: SocialSharing,
     private commonUtilService: CommonUtilService,
     private appGlobalService: AppGlobalService,
     private headerService: AppHeaderService,
@@ -81,8 +90,18 @@ export class FaqHelpPage implements OnInit {
     private translate: TranslateService,
     private http: HttpClient,
     private router: Router,
-    private zone: NgZone
+    private zone: NgZone,
+    private modalCtrl: ModalController,
   ) {
+    this.getNavParam();
+  }
+
+  private getNavParam() {
+    const navExtras = this.router.getCurrentNavigation().extras && this.router.getCurrentNavigation().extras.state;
+    if (navExtras) {
+      this.corRelation = navExtras.corRelation || [];
+      this.corRelation.push({ id: PageId.FAQ, type: CorReleationDataType.FROM_PAGE });
+    }
   }
 
   ngOnInit() {
@@ -100,7 +119,12 @@ export class FaqHelpPage implements OnInit {
       ImpressionType.VIEW,
       '',
       PageId.FAQ,
-      Environment.USER);
+      Environment.USER,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      this.corRelation);
   }
 
   receiveMessage(event) {
@@ -112,10 +136,6 @@ export class FaqHelpPage implements OnInit {
     }
   }
 
-  public getJSON(): Observable<any> {
-    return this.http.get(this.jsonURL);
-  }
-
   private async getSelectedLanguage() {
     const selectedLanguage = await this.preferences.getString(PreferenceKey.SELECTED_LANGUAGE_CODE).toPromise();
     if (selectedLanguage) {
@@ -126,11 +146,10 @@ export class FaqHelpPage implements OnInit {
   private async getDataFromUrl() {
     const faqRequest: GetFaqRequest = { language: '', faqUrl: '' };
     const getSystemSettingsRequest: GetSystemSettingsRequest = {
-      id: 'faqURL'
+      id: 'appFaqURL'
     };
     await this.systemSettingsService.getSystemSettings(getSystemSettingsRequest).toPromise()
       .then((res: SystemSettings) => {
-        console.log('faqdata', res);
         faqRequest.faqUrl = res.value;
       }).catch(err => {
       });
@@ -141,27 +160,24 @@ export class FaqHelpPage implements OnInit {
     } else {
       faqRequest.language = 'en';
     }
+    this.fetchFaqData(faqRequest);
+  }
 
+  private fetchFaqData(faqRequest, retry=true) {
     this.faqService.getFaqDetails(faqRequest).subscribe(data => {
-      this.zone.run( () => {
-        this.data = data;
-        this.constants = this.data.constants;
-        this.faqs = this.data.faqs;
-        // tslint:disable-next-line:prefer-for-of
-        for (let i = 0; i < this.data.faqs.length; i++) {
-          if (this.data.faqs[i].topic.includes('{{APP_NAME}}')) {
-            this.data.faqs[i].topic = this.data.faqs[i].topic.replace('{{APP_NAME}}', this.appName);
-          } else {
-            this.data.faqs[i].topic = this.data.faqs[i].topic;
-          }
-          if (this.data.faqs[i].description.includes('{{APP_NAME}}')) {
-            this.data.faqs[i].description = this.data.faqs[i].description.replace('{{APP_NAME}}', this.appName);
-          } else {
-            this.data.faqs[i].description = this.data.faqs[i].description;
-          }
-        }
+      this.zone.run(() => {
+        this.faqData = data as any;
+        this.constants = this.faqData.constants;
         this.loading.dismiss();
       });
+    }, error => {
+      console.error(error);
+      faqRequest.language = 'en';
+      if (retry) {
+        this.fetchFaqData(faqRequest, false);
+        return;
+      }
+      this.loading.dismiss();
     });
   }
 
@@ -224,10 +240,15 @@ export class FaqHelpPage implements OnInit {
   }
 
   handleBackButton() {
+    if (this.selectedFaqCategory) {
+      this.selectedFaqCategory = undefined;
+      return;
+    }
     this.location.back();
   }
 
   generateInteractTelemetry(interactSubtype, values) {
+    values.values.value.description = values.values.value.description.replace(/(<([^>]+)>)/ig, '');
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH, interactSubtype,
       Environment.USER,
@@ -244,86 +265,90 @@ export class FaqHelpPage implements OnInit {
   }
 
   // toggle the card
-  toggleGroup(group) {
-    const telemetryObject = new TelemetryObject((group + 1).toString(), 'faq', '');
+  toggleGroup(event) {
+    if (!event || !event.data) {
+      return;
+    }
+    const telemetryObject = new TelemetryObject((event.data.position+1).toString(), 'faq', '');
     this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
-      InteractSubtype.HELP_SECTION_CLICKED,
+      event.data.action,
       Environment.USER,
       PageId.FAQ,
       telemetryObject,
       undefined);
-
-    this.isNoClicked = false;
-    this.isYesClicked = false;
-    this.isSubmitted = false;
-
-    let isCollapsed = true;
-    if (this.isGroupShown(group)) {
-      isCollapsed = false;
-      this.shownGroup = null;
-    } else {
-      isCollapsed = false;
-      this.shownGroup = group;
-    }
-  }
-
-  // to check whether the card is toggled or not
-  isGroupShown(group) {
-    return this.shownGroup === group;
   }
 
-  noClicked(i) {
-    this.value = {};
-    if (!this.isNoClicked) {
-      this.isNoClicked = true;
+  logInteractEvent(event) {
+    if (!event || !event.data) {
+      return;
     }
-    this.value.action = 'no-clicked';
-    this.value.position = i;
-    this.value.value = {};
-    this.value.value.topic = this.data.faqs[i].topic;
-    this.value.value.description = this.data.faqs[i].description;
+    this.value = event.data;
     window.parent.postMessage(this.value, '*');
-
   }
 
-  yesClicked(i) {
-    this.value = {};
-    if (!this.isYesClicked) {
-      this.isYesClicked = true;
-    }
-
-    this.value.action = 'yes-clicked';
-    this.value.position = i;
-    this.value.value = {};
-    this.value.value.topic = this.data.faqs[i].topic;
-    this.value.value.description = this.data.faqs[i].description;
-    window.parent.postMessage(this.value, '*');
-  }
-
-  submitClicked(textValue, i) {
-    this.isSubmitted = true;
-    this.value.action = 'no-clicked';
-    this.value.position = i;
-    this.value.value = {};
-    this.value.value.topic = this.data.faqs[i].topic;
-    this.value.value.description = this.data.faqs[i].description;
-    this.value.value.knowMoreText = textValue;
-    window.parent.postMessage(this.value, '*');
-    this.textValue = '';
-  }
-
-  navigateToReportIssue() {
+  async navigateToReportIssue() {
     this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
       InteractSubtype.REPORT_ISSUE_CLICKED,
       Environment.USER,
       PageId.FAQ,
       undefined,
       undefined);
+
+    const formConfig = await this.formAndFrameworkUtilService.getFormConfig();
+    this.appGlobalService.formConfig = formConfig;
     this.router.navigate([RouterLinks.FAQ_REPORT_ISSUE], {
       state: {
-        data: this.data
+        data: this.faqData,
+        corRelation: this.corRelation
       }
     });
   }
 
+  onCategorySelect(event) {
+    this.selectedFaqCategory = undefined;
+    if (!event || !event.data) {
+      return;
+    }
+    setTimeout(() => {
+      this.replaceFaqText(event.data);
+    }, 0);
+  }
+
+  replaceFaqText(faqData) {
+    for (let i = 0; i < faqData.faqs.length; i++) {
+      if (faqData.faqs[i].topic.includes('{{APP_NAME}}')) {
+        faqData.faqs[i].topic = faqData.faqs[i].topic.replace('{{APP_NAME}}', this.appName);
+      }
+      if (faqData.faqs[i].description.includes('{{APP_NAME}}')) {
+        faqData.faqs[i].description = faqData.faqs[i].description.replace('{{APP_NAME}}', this.appName);
+      }
+    }
+
+    this.selectedFaqCategory = faqData;
+    this.selectedFaqCategory.constants = this.constants;
+  }
+
+  enableFaqReport(event) {
+    this.navigateToReportIssue();
+  }
+
+  async onVideoSelect(event) {
+    if (!event || !event.data) {
+      return;
+    }
+
+    const video = VideoConfig;
+    video.metadata.appIcon = event.data.thumbnail;
+    video.metadata.name = event.data.name;
+    video.metadata.artifactUrl = event.data.url;
+
+      const playerModal = await this.modalCtrl.create({
+        component: ContentViewerComponent,
+        componentProps: {
+          playerConfig: video
+        }
+      });
+      await playerModal.present();
+  }
+
 }
diff --git a/src/app/faq-report-issue/faq-report-issue.module.ts b/src/app/faq-report-issue/faq-report-issue.module.ts
index fa52e444c..d1d0e083e 100644
--- a/src/app/faq-report-issue/faq-report-issue.module.ts
+++ b/src/app/faq-report-issue/faq-report-issue.module.ts
@@ -1,11 +1,16 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { Routes, RouterModule } from '@angular/router';
 
 import { IonicModule } from '@ionic/angular';
 
 import { FaqReportIssuePage } from './faq-report-issue.page';
+import { TranslateModule } from '@ngx-translate/core';
+import { DirectivesModule } from '@app/directives/directives.module';
+import { CommonFormElementsModule } from 'common-form-elements';
+import { ComponentsModule } from '../components/components.module';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
 
 const routes: Routes = [
   {
@@ -16,9 +21,15 @@ const routes: Routes = [
 
 @NgModule({
   imports: [
+    DirectivesModule,
     CommonModule,
     FormsModule,
     IonicModule,
+    TranslateModule,
+    ReactiveFormsModule,
+    ComponentsModule,
+    CommonFormElementsModule,
+    CommonConsumptionModule,
     RouterModule.forChild(routes)
   ],
   declarations: [FaqReportIssuePage]
diff --git a/src/app/faq-report-issue/faq-report-issue.page.html b/src/app/faq-report-issue/faq-report-issue.page.html
index 02cd75344..da03ccf8f 100644
--- a/src/app/faq-report-issue/faq-report-issue.page.html
+++ b/src/app/faq-report-issue/faq-report-issue.page.html
@@ -1,27 +1,27 @@
 <ion-content>
-  <div class="help-header-send-email">
-    <h4> {{data?.constants?.reportIssue}}</h4>
+  <div *ngIf="data" class="container-focus pl-16 pr-16 pb-16">
+    <h4 class="m-0"> {{data?.constants?.reportIssue}}</h4>
     <p>{{data?.constants?.explainMsg}}</p>
   </div>
-  <div class="info-msg-send-email">
-    <p>{{ data?.constants?.tellMoreMsg }}</p>
-  </div>
-  <div class="send-email-form">
-    <form action="#" id="send-email-form">
-      <div id="textareadiv">
-        <textarea #textarea type="text" name="moreInfo" placeholder="{{data?.constants?.typeHere}}"
-          class="input-text-form" maxLength="1000" [(ngModel)]="emailContent"
-          (keyup)="countChar(emailContent)"></textarea>
-        <p id="textareainfo"> <span id="charleft" *ngIf="!charEntered">1000</span><span
-            *ngIf="charEntered">{{charsLeft}}</span>{{ data?.constants?.charactersLeft}}</p>
-      </div>
-      <div class="initiate-email-info">
-        <p class="send-email-info">{{ data?.constants?.triggerEmailMsg}}</p>
-        <div class="initiate-email-info-button">
-          <input type="submit" value="{{data?.constants?.initiateEmailButton}}" class="submit-button"
-            id="initiate-email" (click)="initiateEmail(emailContent)">
-        </div>
+  <div class="send-email-form align-left">
+    <div class="report-info">{{data?.constants?.tellMoreMsg}}</div>
+    <sb-form [config]='formConfig'
+             [platform]="'mobile'"
+             (valueChanges)="valueChanged($event)"
+             (statusChanges)="statusChanged($event)"
+             (dataLoadStatus)="dataLoadStatus($event)">
+    </sb-form>
+
+    <div class="initiate-email-info">
+      <div class="initiate-email-info-button">
+        <button id="initiate-email" (click)="submit()" class="submit-button" [ngClass]="{'':isFormValid, 'invalid-btn':!isFormValid }" >
+          {{'BTN_SUBMIT' | translate}}
+        </button>
       </div>
-    </form>
+    </div>
   </div>
-</ion-content>
\ No newline at end of file
+  <support-acknowledgement *ngIf="showSupportContact" (closeEvents)="showSupportContact = false"
+  [boardContact]="boardContact"></support-acknowledgement>
+  <acknowledge-response *ngIf="showThanksResponse" (popupDismiss)="responseSubmitted($event)"></acknowledge-response>
+
+</ion-content>
diff --git a/src/app/faq-report-issue/faq-report-issue.page.scss b/src/app/faq-report-issue/faq-report-issue.page.scss
index 7c69c22bc..baae6dce6 100644
--- a/src/app/faq-report-issue/faq-report-issue.page.scss
+++ b/src/app/faq-report-issue/faq-report-issue.page.scss
@@ -2,11 +2,11 @@
 @import "src/assets/styles/_custom-mixins.scss";
 @import "src/assets/styles/_variables.scss";
 .scroll-content{
-    padding: 0% !important;
+    padding: 0 !important;
 }
   body{
-    background-color: #edf4f9;
-    font-family: 'Noto Sans';
+    background-color: $light-blue;
+      font-family: 'Noto Sans', sans-serif;
 }
 
 .rotate{
@@ -24,19 +24,17 @@ P{
     font-size: 13px;
 }
 .help-header, .help-header-send-email{
-    background: #024f9d;
-    color: #fff;
+    background: $blue;
+    color: map-get($colors, white);
     padding: 16px;
 }
 .help-header>h4,.help-header-send-email>h4{
-    margin: 0;
     padding:0;
     font-weight: 700;
     max-width: 1024px;
     margin: 0 auto;
 }
 .help-header>p,.help-header-send-email>p{
-    margin: 0;
     font-weight: 100;
     max-width: 1024px;
     margin: 0 auto;
@@ -47,12 +45,11 @@ P{
     justify-content: space-between;
 }
  .info-msg{
-        background-color: #F3F7FA
+        background-color: map-get($colors, white_fa)
     }
 @media only screen and (max-width : 1024px) {
 
     .info-msg-send-email>p,.info-msg>p{
-        margin: 0;
         padding: 8px 16px;
         max-width: 1024px;
         margin: 0 auto;
@@ -62,14 +59,13 @@ P{
 @media only screen and (min-width : 1025px) {
 
     .info-msg-send-email>p,.info-msg>p{
-        margin: 0;
         padding: 16px 0px;
         max-width: 1024px;
         margin: 0 auto;
     }
 }
 .icon{
-    color:#024f9d;
+    color: $blue;
     float:right;
 } 
 .panel{
@@ -79,9 +75,6 @@ P{
     border-right: 0;
     box-shadow:none !important;
 
-}
-.panel-default{
-
 }
 
 .panel-heading {
@@ -92,16 +85,16 @@ P{
     max-width: 1024px;
 }
 .panel-group .panel+.panel{
-    border-radius: 0px;
-    margin-top: 0px;
+    border-radius: 0;
+    margin-top: 0;
 
 }
 .panel-default>.panel-heading{
-    background-color: #fff;
-    border-radius: 0px !important;
+    background-color: map-get($colors, white);
+    border-radius: 0 !important;
 }
 .panel-body{
-    background-color: #F3F7FA;
+    background-color: map-get($colors, white_fa);
 }
 .panel-interact{
     text-align: center; 
@@ -110,10 +103,10 @@ P{
 }
 .panel-interact>button{
     margin: 10px 5px 0px 5px;
-    background-color: #F3F7FA;
-    border-color: #F3F7FA;
+    background-color: map-get($colors, white_fa);
+    border-color: map-get($colors, white_fa);
     width: 80px;
-    color: #024f9d;
+    color: $blue;
     font-size: 13px;
     font-weight: 700;
     outline: none;
@@ -127,10 +120,10 @@ P{
     padding:10px !important;
     margin: auto !important;
     margin-top:10px !important;
-    background: #F3F7FA;
+    background: map-get($colors, white_fa);
     width: 200px;
     border-radius: 4px;
-    color:#008840;
+    color: $green;
     text-align: center;
 }
 
@@ -142,28 +135,22 @@ P{
 .panel-info>h6{
     font-weight: 700;
     margin-top: 20px;
-    margin-bottom: 0px;
+    margin-bottom: 0;
 }
 
 .input-text{
     width: 100%;
     height: 70px;
     border-radius: 5px;
-    box-shadow: none;
-    border-width: 1px;
-    border-style:solid;
-    border-color: #c3c3c3;
     @include padding(8px 0px 0px 8px);
     resize: none;
 }
 .submit-button{
     width: 100%;
-    color: #fff;
-    background: #024f9d;
+    color: map-get($colors, white);
+    background: map-get($colors, light_blue_f5);
     height: 40px;
     border-radius: 4px;
-    border-style:solid;
-    border-color:  #024f9d;
     margin: 10px 0px 16px 0px;
     outline: none;
 }
@@ -172,12 +159,12 @@ P{
    
     .report-button{
         min-width: 90vw;
-        color: #fff;
-        background: #024f9d;
+        color: map-get($colors, white);
+        background: $blue;
         height: 40px;
         border-radius: 4px;
         border-style:solid;
-        border-color:  #024f9d;
+        border-color:  $blue;
         margin-bottom: 50px;
         outline: none;
     }
@@ -195,24 +182,26 @@ P{
         right: 0px;
         font-weight: normal;
         font-size: 12px;
+        padding-right: 16px;
     }
-    .initiate-email-info-button{
-        left: 0px;
-    right: 0px;
-    position: fixed;
-    top: 88vh;
-    padding: 0px 16px;
+    .initiate-email-info-button {
+        background: $white;
+        left: 0;
+        right: 0;
+        position: fixed;
+        top: 90vh;
+        padding: 0 16px 70px 16px;
     }
 }
 @media only screen and (min-width : 1025px) {
     .report-button{
         min-width: 1024px;
-        color: #fff;
-        background: #024f9d;
+        color: map-get($colors, white);
+        background: $blue;
         height: 40px;
         border-radius: 4px;
         border-style:solid;
-        border-color:  #024f9d;
+        border-color: $blue;
         margin-bottom: 50px;
         outline: none;
     }
@@ -225,8 +214,7 @@ img>.report-button{
     text-align: center;
     padding: 15px;
 }
-.send-email-form{
-    text-align: center;
+.send-email-form {
     margin: 0 16px;
 }
 #send-email-form{
@@ -251,19 +239,19 @@ img>.report-button{
     }
     .send-email-info{
         max-width: 570px;
-        padding: 10px 0px !important;
-        margin: left;
+        padding: 10px 0 !important;
+        margin: initial;
         float: left;
     }
     .submit-button{
         width: 150px;
         float: right;
-        color: #fff;
-        background: #024f9d;
-        border-radius: 0px;
+        color: map-get($colors, white);
+        background: $blue;
+        border-radius: 0;
         border-style:solid;
-        border-color:  #024f9d;
-        margin: 10px 0px 16px 0px;
+        border-color:  $blue;
+        margin: 10px 0 16px 0;
         height: 32px;
         outline: none;
     }
@@ -287,20 +275,18 @@ img>.report-button{
     height: 128px;
     border-radius: 5px;
     box-shadow: none;
-    border-width: 1px;
-    border-style:solid;
-    border-color: #c3c3c3;
     @include padding(8px 0px 0px 8px);
     resize: none;
 }
 ::placeholder {
-  color: #999999;
+  color: $gray-300;
   font-size: 14px;
   font-weight: normal;
 }
 .initiate-email-info{
-        margin-top: 10px;
-    }
+    margin-top: 10px;
+    padding-bottom: 70px;
+}
 @media only screen and (min-width : 1025px) {
     .input-text-form{
         width: 100%;
@@ -309,7 +295,7 @@ img>.report-button{
         box-shadow: none;
         border-width: 1px;
         border-style:solid;
-        border-color: #c3c3c3;
+        border-color: map-get($colors, light_gray-c3);
         @include padding(8px 0px 0px 8px);
         margin: 0px;
         resize: none;
@@ -325,7 +311,7 @@ img>.report-button{
     
 }
 a{
-    color: #333;
+    color: map-get($colors, primary_black);
 }
 
 a:active, a:hover{
@@ -334,5 +320,79 @@ a:active, a:hover{
 }
 
 #textareadiv{
-    position: relative
+    position: relative;
+    padding: 20px 16px 0px 16px;
+}
+.item-label-stacked ion-select {
+    border: 1px solid map-get($colors, thick_blue);
+    border-radius: 5px;
+    margin-top: 16px;
+    padding-left: 8px;
+    padding-right: 10px !important;
+    .select-icon {
+      .select-icon-inner {
+        border: solid blue;
+        border-width: 0 2px 2px 0;
+        display: inline-block;
+        padding: 4px;
+        transform: rotate(45deg);
+        animation: upDownAnimate 5s linear infinite;
+        animation-duration: 0.9s;
+      }
+    }
+    .select-placeholder {
+        color: map-get($colors, thick_blue);
+        padding-left: 10px;
+    }
+}
+    // Not getting used because of shadow DOM
+.select-placeholder {
+  color: map-get($colors, thick_blue);
+  padding-left: 10px;
+}
+
+.ge-danger{
+  color: map-get($colors, danger);
+}
+
+ion-item.item-label-stacked {
+    --border-width: 0;
+    --highlight-background: transparent;
+}
+
+.item-select ion-label {
+    color: map-get($colors, thick_blue);
+}
+
+.item-label-stacked.item-select-disabled {
+    ion-label {
+        color: map-get($colors, primary_black);
+    }
+    ion-select {
+        border-color: map-get($colors, primary_black);
+        // Inside Shadow DOM
+        .select-icon {
+          .select-icon-inner {
+            border-color: map-get($colors, primary_black);
+            animation: none;
+          }
+        }
+        // Inside Shadow DOM
+        .select-placeholder {
+          color: map-get($colors, primary_black);
+        }
+      }
+}
+.invalid-btn{
+    background: map-get($colors, light_blue_f5) !important;
+}
+
+.report-info{
+    padding-top: 1rem;
+    font-size: 1rem;
+}
+
+.report-submit-info{
+    font-size: 0.8rem;
+    color: var(--app-gray);
 }
\ No newline at end of file
diff --git a/src/app/faq-report-issue/faq-report-issue.page.spec.data.ts b/src/app/faq-report-issue/faq-report-issue.page.spec.data.ts
new file mode 100644
index 000000000..1acee4141
--- /dev/null
+++ b/src/app/faq-report-issue/faq-report-issue.page.spec.data.ts
@@ -0,0 +1,1237 @@
+export const mockNavigationResp = {
+    extras: {
+        state: {
+            data: {},
+            showHeader: true,
+            formCnotext: {}
+        }
+    }
+};
+
+export const mockFormConfig = [
+    {
+      code: 'category',
+      type: 'nested_select',
+      templateOptions: {
+        placeHolder: 'Select Category',
+        multiple: false,
+        hidden: false,
+        options: [
+          {
+            value: 'content',
+            label: 'Content'
+          },
+          {
+            'value': 'loginRegistration',
+            'label': 'Login/Registration'
+          },
+          {
+            'value': 'teacherTraining',
+            'label': 'Teacher Training'
+          },
+          {
+            'value': 'otherissues',
+            'label': 'Other Issues',
+            'dataSrc': {
+              'action': 'initiateEmail'
+            }
+          }
+        ]
+      },
+      'validations': [
+        {
+          'type': 'required'
+        }
+      ],
+      'children': {
+        'otherissues': [
+          {
+            'code': 'board',
+            'type': 'select',
+            'templateOptions': {
+              'placeHolder': 'Select Board',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'ACTIVE_CHANNEL.SUGGESTED_FRAMEWORK_LIST.MAPPED_TO_FRAMEWORKCATEGORIES'
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'medium',
+            'type': 'nested_select',
+            'context': 'board',
+            'default': null,
+            'templateOptions': {
+              'placeHolder': 'Select Medium',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'medium'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'grade',
+            'type': 'nested_select',
+            'context': 'medium',
+            'templateOptions': {
+              'placeHolder': 'Select Grade',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'grade'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'subject',
+            'type': 'nested_select',
+            'context': 'grade',
+            'templateOptions': {
+              'placeHolder': 'Select Subject',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'subject'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'details',
+            'type': 'textarea',
+            'context': null,
+            'templateOptions': {
+              'label': 'Tell us more about the problem you faced',
+              'placeHolder': 'Enter Details'
+            },
+            'validations': [
+              {
+                'type': 'maxLength',
+                'value': 1000
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      'code': 'subcategory',
+      'context': 'category',
+      'type': 'nested_select',
+      'children': {
+        'contentquality': [
+          {
+            'code': 'board',
+            'type': 'select',
+            'templateOptions': {
+              'placeHolder': 'Select Board',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'ACTIVE_CHANNEL.SUGGESTED_FRAMEWORK_LIST.MAPPED_TO_FRAMEWORKCATEGORIES'
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'medium',
+            'type': 'nested_select',
+            'context': 'board',
+            'default': null,
+            'templateOptions': {
+              'placeHolder': 'Select Medium',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'medium'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'grade',
+            'type': 'nested_select',
+            'context': 'medium',
+            'templateOptions': {
+              'placeHolder': 'Select Grade',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'grade'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'subject',
+            'type': 'nested_select',
+            'context': 'grade',
+            'templateOptions': {
+              'placeHolder': 'Select Subject',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'subject'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'contentname',
+            'type': 'input',
+            'context': null,
+            'templateOptions': {
+              'placeHolder': 'Enter Content Name'
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'details',
+            'type': 'textarea',
+            'context': null,
+            'templateOptions': {
+              'label': 'Tell us more about the problem you faced',
+              'placeHolder': 'Enter Details'
+            },
+            'validations': [
+              {
+                'type': 'maxLength',
+                'value': 1000
+              }
+            ]
+          }
+        ],
+        'contentnotplaying': [
+          {
+            'code': 'board',
+            'type': 'select',
+            'templateOptions': {
+              'placeHolder': 'Select Board',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'ACTIVE_CHANNEL.SUGGESTED_FRAMEWORK_LIST.MAPPED_TO_FRAMEWORKCATEGORIES'
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'medium',
+            'type': 'nested_select',
+            'context': 'board',
+            'default': null,
+            'templateOptions': {
+              'placeHolder': 'Select Medium',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'medium'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'grade',
+            'type': 'nested_select',
+            'context': 'medium',
+            'templateOptions': {
+              'placeHolder': 'Select Grade',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'grade'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'subject',
+            'type': 'nested_select',
+            'context': 'grade',
+            'templateOptions': {
+              'placeHolder': 'Select Subject',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'subject'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'contentname',
+            'type': 'input',
+            'context': null,
+            'templateOptions': {
+              'placeHolder': 'Enter Content Name'
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'details',
+            'type': 'textarea',
+            'context': null,
+            'templateOptions': {
+              'label': 'Tell us more about the problem you faced',
+              'placeHolder': 'Enter Details'
+            },
+            'validations': [
+              {
+                'type': 'maxLength',
+                'value': 1000
+              }
+            ]
+          }
+        ],
+        'contentavailability': [
+          {
+            'code': 'board',
+            'type': 'select',
+            'templateOptions': {
+              'placeHolder': 'Select Board',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'ACTIVE_CHANNEL.SUGGESTED_FRAMEWORK_LIST.MAPPED_TO_FRAMEWORKCATEGORIES'
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'medium',
+            'type': 'nested_select',
+            'context': 'board',
+            'default': null,
+            'templateOptions': {
+              'placeHolder': 'Select Medium',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'medium'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'grade',
+            'type': 'nested_select',
+            'context': 'medium',
+            'templateOptions': {
+              'placeHolder': 'Select Grade',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'grade'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'subject',
+            'type': 'nested_select',
+            'context': 'grade',
+            'templateOptions': {
+              'placeHolder': 'Select Subject',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'subject'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'details',
+            'type': 'textarea',
+            'context': null,
+            'templateOptions': {
+              'label': 'Tell us more about the problem you faced',
+              'placeHolder': 'Enter Details'
+            },
+            'validations': [
+              {
+                'type': 'maxLength',
+                'value': 1000
+              }
+            ]
+          },
+          {
+            'code': 'notify',
+            'type': 'checkbox',
+            'templateOptions': {
+              'label': 'Notify me on availability'
+            }
+          }
+        ],
+        'contentotherissues': [
+          {
+            'code': 'board',
+            'type': 'select',
+            'templateOptions': {
+              'placeHolder': 'Select Board',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'ACTIVE_CHANNEL.SUGGESTED_FRAMEWORK_LIST.MAPPED_TO_FRAMEWORKCATEGORIES'
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'medium',
+            'type': 'nested_select',
+            'context': 'board',
+            'default': null,
+            'templateOptions': {
+              'placeHolder': 'Select Medium',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'medium'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'grade',
+            'type': 'nested_select',
+            'context': 'medium',
+            'templateOptions': {
+              'placeHolder': 'Select Grade',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'grade'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'subject',
+            'type': 'nested_select',
+            'context': 'grade',
+            'templateOptions': {
+              'placeHolder': 'Select Subject',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'subject'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'contentname',
+            'type': 'input',
+            'context': null,
+            'templateOptions': {
+              'placeHolder': 'Enter Content Name'
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'details',
+            'type': 'textarea',
+            'context': null,
+            'templateOptions': {
+              'label': 'Tell us more about the problem you faced',
+              'placeHolder': 'Enter Details'
+            },
+            'validations': [
+              {
+                'type': 'maxLength',
+                'value': 1000
+              }
+            ]
+          }
+        ],
+        'otpissue': [
+          {
+            'code': 'details',
+            'type': 'textarea',
+            'context': null,
+            'templateOptions': {
+              'label': 'Tell us more about the problem you faced',
+              'placeHolder': 'Enter Details'
+            },
+            'validations': [
+              {
+                'type': 'maxLength',
+                'value': 1000
+              }
+            ]
+          }
+        ],
+        'profilevalidation': [
+          {
+            'code': 'board',
+            'type': 'select',
+            'templateOptions': {
+              'placeHolder': 'Select Board',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'ACTIVE_CHANNEL.SUGGESTED_FRAMEWORK_LIST.MAPPED_TO_FRAMEWORKCATEGORIES'
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'medium',
+            'type': 'nested_select',
+            'context': 'board',
+            'default': null,
+            'templateOptions': {
+              'placeHolder': 'Select Medium',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'medium'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'grade',
+            'type': 'nested_select',
+            'context': 'medium',
+            'templateOptions': {
+              'placeHolder': 'Select Grade',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'grade'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'details',
+            'type': 'textarea',
+            'context': null,
+            'templateOptions': {
+              'label': 'Tell us more about the problem you faced',
+              'placeHolder': 'Enter Details'
+            },
+            'validations': [
+              {
+                'type': 'maxLength',
+                'value': 1000
+              }
+            ]
+          }
+        ],
+        'profiledetails': [
+          {
+            'code': 'board',
+            'type': 'select',
+            'templateOptions': {
+              'placeHolder': 'Select Board',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'ACTIVE_CHANNEL.SUGGESTED_FRAMEWORK_LIST.MAPPED_TO_FRAMEWORKCATEGORIES'
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'medium',
+            'type': 'nested_select',
+            'context': 'board',
+            'default': null,
+            'templateOptions': {
+              'placeHolder': 'Select Medium',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'medium'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'grade',
+            'type': 'nested_select',
+            'context': 'medium',
+            'templateOptions': {
+              'placeHolder': 'Select Grade',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'grade'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'details',
+            'type': 'textarea',
+            'context': null,
+            'templateOptions': {
+              'label': 'Tell us more about the problem you faced',
+              'placeHolder': 'Enter Details'
+            },
+            'validations': [
+              {
+                'type': 'maxLength',
+                'value': 1000
+              }
+            ]
+          }
+        ],
+        'certificate': [
+          {
+            'code': 'board',
+            'type': 'select',
+            'templateOptions': {
+              'placeHolder': 'Select Board',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'ACTIVE_CHANNEL.SUGGESTED_FRAMEWORK_LIST.MAPPED_TO_FRAMEWORKCATEGORIES'
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'medium',
+            'type': 'nested_select',
+            'context': 'board',
+            'default': null,
+            'templateOptions': {
+              'placeHolder': 'Select Medium',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'medium'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'grade',
+            'type': 'nested_select',
+            'context': 'medium',
+            'templateOptions': {
+              'placeHolder': 'Select Grade',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'grade'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'details',
+            'type': 'textarea',
+            'context': null,
+            'templateOptions': {
+              'label': 'Tell us more about the problem you faced',
+              'placeHolder': 'Enter Details'
+            },
+            'validations': [
+              {
+                'type': 'maxLength',
+                'value': 1000
+              }
+            ]
+          }
+        ],
+        'teacherid': [
+          {
+            'code': 'board',
+            'type': 'select',
+            'templateOptions': {
+              'placeHolder': 'Select Board',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'ACTIVE_CHANNEL.SUGGESTED_FRAMEWORK_LIST.MAPPED_TO_FRAMEWORKCATEGORIES'
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'medium',
+            'type': 'nested_select',
+            'context': 'board',
+            'default': null,
+            'templateOptions': {
+              'placeHolder': 'Select Medium',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'medium'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'grade',
+            'type': 'nested_select',
+            'context': 'medium',
+            'templateOptions': {
+              'placeHolder': 'Select Grade',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'grade'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'details',
+            'type': 'textarea',
+            'context': null,
+            'templateOptions': {
+              'label': 'Tell us more about the problem you faced',
+              'placeHolder': 'Enter Details'
+            },
+            'validations': [
+              {
+                'type': 'maxLength',
+                'value': 1000
+              }
+            ]
+          }
+        ],
+        'profileotherissues': [
+          {
+            'code': 'board',
+            'type': 'select',
+            'templateOptions': {
+              'placeHolder': 'Select Board',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'ACTIVE_CHANNEL.SUGGESTED_FRAMEWORK_LIST.MAPPED_TO_FRAMEWORKCATEGORIES'
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'medium',
+            'type': 'nested_select',
+            'context': 'board',
+            'default': null,
+            'templateOptions': {
+              'placeHolder': 'Select Medium',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'medium'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'grade',
+            'type': 'nested_select',
+            'context': 'medium',
+            'templateOptions': {
+              'placeHolder': 'Select Grade',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'grade'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'details',
+            'type': 'textarea',
+            'context': null,
+            'templateOptions': {
+              'label': 'Tell us more about the problem you faced',
+              'placeHolder': 'Enter Details'
+            },
+            'validations': [
+              {
+                'type': 'maxLength',
+                'value': 1000
+              }
+            ]
+          }
+        ],
+        'teacherotherissues': [
+          {
+            'code': 'board',
+            'type': 'select',
+            'templateOptions': {
+              'placeHolder': 'Select Board',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'ACTIVE_CHANNEL.SUGGESTED_FRAMEWORK_LIST.MAPPED_TO_FRAMEWORKCATEGORIES'
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'medium',
+            'type': 'nested_select',
+            'context': 'board',
+            'default': null,
+            'templateOptions': {
+              'placeHolder': 'Select Medium',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'medium'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'grade',
+            'type': 'nested_select',
+            'context': 'medium',
+            'templateOptions': {
+              'placeHolder': 'Select Grade',
+              'multiple': false,
+              'dataSrc': {
+                'marker': 'FRAMEWORK_CATEGORY_TERMS',
+                'params': {
+                  'categoryCode': 'grade'
+                }
+              }
+            },
+            'validations': [
+              {
+                'type': 'required'
+              }
+            ]
+          },
+          {
+            'code': 'details',
+            'type': 'textarea',
+            'context': null,
+            'templateOptions': {
+              'label': 'Tell us more about the problem you faced',
+              'placeHolder': 'Enter Details'
+            },
+            'validations': [
+              {
+                'type': 'maxLength',
+                'value': 1000
+              }
+            ]
+          }
+        ]
+      },
+      'templateOptions': {
+        'placeHolder': 'Select Subcategory',
+        'multiple': false,
+        'hidden': false,
+        'options': {
+          'loginRegistration': [
+            {
+              'value': 'otpissue',
+              'label': 'OTP Issue',
+              'dataSrc': {
+                'action': 'initiateEmail'
+              }
+            },
+            {
+              'value': 'profilevalidation',
+              'label': 'Profile validation/No green tick on my profile',
+              'dataSrc': {
+                'action': 'contactBoard'
+              }
+            },
+            {
+              'value': 'profiledetails',
+              'label': 'Profile details incorrect',
+              'dataSrc': {
+                'action': 'contactBoard'
+              }
+            },
+            {
+              'value': 'certificate',
+              'label': 'Certificate related',
+              'dataSrc': {
+                'action': 'contactBoard'
+              }
+            },
+            {
+              'value': 'teacherid',
+              'label': 'Teacher id',
+              'dataSrc': {
+                'action': 'contactBoard'
+              }
+            },
+            {
+              'value': 'profileotherissues',
+              'label': 'Other issues',
+              'dataSrc': {
+                'action': 'contactBoard'
+              }
+            }
+          ],
+          'content': [
+            {
+              'value': 'contentquality',
+              'label': 'Content Quality'
+            },
+            {
+              'value': 'contentnotplaying',
+              'label': 'Content not playing/downloading',
+              'dataSrc': {
+                'action': 'initiateEmail'
+              }
+            },
+            {
+              'value': 'contentavailability',
+              'label': 'Content availability'
+            },
+            {
+              'value': 'contentotherissues',
+              'label': 'Other Issues',
+              'dataSrc': {
+                'action': 'initiateEmail'
+              }
+            }
+          ],
+          'teacherTraining': [
+            {
+              'value': 'profilevalidation',
+              'label': 'Profile validation/No green tick on my profile',
+              'dataSrc': {
+                'action': 'contactBoard'
+              }
+            },
+            {
+              'value': 'profiledetails',
+              'label': 'Profile details incorrect',
+              'dataSrc': {
+                'action': 'contactBoard'
+              }
+            },
+            {
+              'value': 'certificate',
+              'label': 'Certificate related',
+              'dataSrc': {
+                'action': 'contactBoard'
+              }
+            },
+            {
+              'value': 'teacherotherissues',
+              'label': 'Other issues',
+              'dataSrc': {
+                'action': 'contactBoard'
+              }
+            }
+          ]
+        }
+      }
+    }
+];
+
+export const mockProfile = {
+  
+};
+
+export const mockHeaderEvent = {
+  name: 'back',
+  identifier: '89712312'
+}
+
+export const mockUserProfile = {
+  board: ['statekarnataka'],
+  createdAt: 1594741466334,
+  grade: ['class10'],
+  gradeValue: '',
+  handle: 'Guest1',
+  medium: ['english'],
+  profileType: 'teacher',
+  source: 'local',
+  subject: [],
+  syllabus: ['ka_k-12_1'],
+  uid: 'ca20b97e-9c88-456c-ad1e-4418c65f6dee'
+}
+
+export const mockFormValue = {
+  'category': 'content',
+  'subcategory': 'contentnotplaying',
+  'children': {
+    'subcategory': {
+      'board': {
+        'name': 'State(Karnataka)',
+        'code': 'ka_k-12_1'
+      },
+      'medium': {
+        'name': 'English',
+        'code': 'english',
+        'frameworkCode': 'ka_k-12_1'
+      },
+      'grade': {
+        'name': 'Class10',
+        'code': 'class10',
+        'frameworkCode': 'ka_k-12_1'
+      },
+      'subject': {
+        'name': 'Science',
+        'code': 'science',
+        'frameworkCode': 'ka_k-12_1'
+      },
+      'contentname': 'Content',
+      'details': ''
+    }
+  }
+};
+
+export const mockStateList = [
+  {
+    'id': 'ka_k-12_1',
+    'code': 'board',
+    'name': 'State(Karnataka)',
+    'message': '(between 9 AM to 6 PM from Monday to Friday)',
+    'contactinfo': {
+      'number': '18001800666',
+      'email': null
+    }
+  },
+  {
+    'id': 'ts_k-12_2',
+    'code': 'board',
+    'name': 'State(AndhraPradesh)',
+    'message': '(between 11 AM to 5 PM from Monday to Friday)',
+    'contactinfo': {
+      'number': '18005728585',
+      'email': null
+    }
+  }
+];
+
+export const mockFrameworkList = [
+  {
+    name: 'State (Karnataka)',
+    identifier: 'k_2-11-2'
+  },
+  {
+    name: 'State (Andhra Pradesh)',
+    identifier: 'k_2-11-4'
+  },
+  {
+    name: 'State (Chhattisgarh)',
+    identifier: 'k_2-11-5'
+  },
+  {
+    name: 'State (Assam)',
+    identifier: 'k_2-11-6'
+  },
+  {
+    name: 'State (Madhya Pradesh)',
+    identifier: 'k_2-11-8'
+  }
+];
\ No newline at end of file
diff --git a/src/app/faq-report-issue/faq-report-issue.page.spec.ts b/src/app/faq-report-issue/faq-report-issue.page.spec.ts
new file mode 100644
index 000000000..db9cf3894
--- /dev/null
+++ b/src/app/faq-report-issue/faq-report-issue.page.spec.ts
@@ -0,0 +1,440 @@
+import { FaqReportIssuePage } from './faq-report-issue.page';
+import { Router } from '@angular/router';
+import { NgZone } from '@angular/core';
+import { ModalController } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+import { AppVersion } from '@ionic-native/app-version/ngx';
+import { SocialSharing } from '@ionic-native/social-sharing/ngx';
+import {
+    SharedPreferences,
+    ProfileService,
+    ContentService,
+    DeviceInfo,
+    FrameworkService,
+    FrameworkUtilService,
+    TelemetryService,
+    TelemetryGeneratorService
+ } from 'sunbird-sdk';
+import { AppGlobalService } from '@app/services/app-global-service.service';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { AppHeaderService, FormAndFrameworkUtilService } from '@app/services';
+import { Location } from '@angular/common';
+import {
+    mockNavigationResp,
+    mockFormConfig,
+    mockProfile,
+    mockUserProfile,
+    mockFormValue,
+    mockStateList,
+    mockFrameworkList
+} from './faq-report-issue.page.spec.data';
+import { of } from 'rxjs';
+import { FrameworkCommonFormConfigBuilder } from '@app/services/common-form-config-builders/framework-common-form-config-builder';
+import {AliasBoardName} from '@app/pipes/alias-board-name/alias-board-name';
+
+window['supportfile'] = {
+    shareSunbirdConfigurations: jest.fn((_, __, fn) => fn())
+};
+
+describe('FaqReportIssuePage', () => {
+    let faqReportIssuePage: FaqReportIssuePage;
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => mockNavigationResp) as any
+    };
+    const mockSharedPreferences: Partial<SharedPreferences> = {
+        putString: jest.fn(() => of()),
+        getString: jest.fn(() => of('keypath'))
+    };
+    const mockProfileService: Partial<ProfileService> = {
+        getActiveSessionProfile: jest.fn(() => of(mockProfile)),
+        getAllProfiles: jest.fn(() => of([mockUserProfile]))
+    };
+    const mockContentService: Partial<ContentService> = {
+        getContents: jest.fn(() => of([]))
+    };
+    const mockDeviceInfo: Partial<DeviceInfo> = {
+        getDeviceID: jest.fn(() => '23123124')
+    };
+    const mockFrameworkService: Partial<FrameworkService> = {
+        getFrameworkDetails: jest.fn(() => of(mockFrameworkList)),
+        getFrameworkCategoryTerms: jest.fn(() => of(mockFrameworkList))
+    };
+    const mockFrameworkUtilService: Partial<FrameworkUtilService> = {
+        getActiveChannelSuggestedFrameworkList: jest.fn(),
+        getFrameworkCategoryTerms: jest.fn(() => of(mockFrameworkList))
+    };
+    const mockTelemetryService: Partial<TelemetryService> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateImpressionTelemetry: jest.fn(),
+        generateInteractTelemetry: jest.fn(),
+        generateLogEvent: jest.fn()
+    };
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        getCurrentUser: jest.fn(() => mockUserProfile),
+        getSelectedBoardMediumGrade: jest.fn(() => 'Karnataka, English, Class 7')
+    };
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        showToast: jest.fn(),
+        translateMessage: jest.fn(),
+        currentLang: 'en'
+    };
+    const mockAppHeaderService: Partial<AppHeaderService> = {
+        showHeaderWithBackButton: jest.fn(),
+        headerEventEmitted$: {
+            subscribe: jest.fn((fn) => fn({name: 'back'}))
+        }
+    };
+    const mockLocation: Partial<Location> = {
+        back: jest.fn()
+    };
+    const mockSocialSharing: Partial<SocialSharing> = {
+        shareViaEmail: jest.fn(() => Promise.resolve())
+    };
+    const mockAppVersion: Partial<AppVersion> = {
+        getAppName: jest.fn(() => Promise.resolve('AppName'))
+    };
+    const mockTranslateService: Partial<TranslateService> = {};
+    const loader = {
+        present: jest.fn(),
+        dismiss: jest.fn()
+    };
+    const mockModalController: Partial<ModalController> = {
+        create: jest.fn(() => loader) as any
+    };
+    const mockNgZone: Partial<NgZone> = {
+        run: jest.fn(fn => fn())
+    };
+    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {
+        getStateContactList: jest.fn(() => Promise.resolve(mockStateList))
+    };
+    const mockFrameworkCommonFormConfigBuilder: Partial<FrameworkCommonFormConfigBuilder> = {
+        getBoardConfigOptionsBuilder: jest.fn(),
+        getMediumConfigOptionsBuilder: jest.fn(),
+        getGradeConfigOptionsBuilder: jest.fn(),
+        getSubjectConfigOptionsBuilder: jest.fn(),
+    };
+    const mockAliasBoardName: Partia<AliasBoardName> = {
+        transform: jest.fn()
+    };
+
+    beforeAll(() => {
+        faqReportIssuePage = new FaqReportIssuePage(
+            mockRouter as Router,
+            mockSharedPreferences as SharedPreferences,
+            mockProfileService as ProfileService,
+            mockContentService as ContentService,
+            mockDeviceInfo as DeviceInfo,
+            mockFrameworkService as FrameworkService,
+            mockFrameworkUtilService as FrameworkUtilService,
+            mockTelemetryService as TelemetryService,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockAppGlobalService as AppGlobalService,
+            mockCommonUtilService as CommonUtilService,
+            mockAppHeaderService as AppHeaderService,
+            mockLocation as Location,
+            mockSocialSharing as SocialSharing,
+            mockAppVersion as AppVersion,
+            mockTranslateService as TranslateService,
+            mockModalController as ModalController,
+            mockNgZone as NgZone,
+            mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
+            mockFrameworkCommonFormConfigBuilder as FrameworkCommonFormConfigBuilder,
+            mockAliasBoardName as AliasBoardName
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    describe('intialise', () => {
+        mockAppGlobalService.formConfig = mockFormConfig;
+        it('should call constructor and interpret formConfig', () => {
+            // arrange
+            spyOn(faqReportIssuePage, 'arrayListHandling');
+            // assert
+            expect(faqReportIssuePage).toBeTruthy();
+            expect(faqReportIssuePage.formContext).toBeDefined();
+            expect(faqReportIssuePage.data).toBeDefined();
+            expect(faqReportIssuePage.profile).toEqual(mockProfile);
+        });
+    });
+
+    describe('User clicks on back button', () => {
+        it('Back button event trigered', (done) => {
+            // assert
+            setTimeout(() => {
+                expect(mockLocation.back).toBeCalled();
+                done();
+            }, 200);
+        });
+    });
+
+    describe('getBoardDetails()', () => {
+        it('No board list available', (done) => {
+            // arrange
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList = jest.fn(() => of([]));
+            // act
+            faqReportIssuePage.getBoardDetails();
+            // assert
+            setTimeout(() => {
+                expect(presentFn).toBeCalled();
+                expect(dismissFn).toBeCalled();
+                expect(mockCommonUtilService.showToast).toBeCalledWith('NO_DATA_FOUND');
+                done()
+            }, 10);
+        });
+
+        it('Board list is available', async () => {
+            // arrange
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList = jest.fn(() => of([1,2,3]));
+            // act
+            await faqReportIssuePage.getBoardDetails();
+            // assert
+            expect(presentFn).toBeCalled();
+            expect(dismissFn).toBeCalled();
+            expect(faqReportIssuePage.syllabusList.length).toBeDefined();
+        });
+    });
+
+    describe('ngOnInit', () => {
+        it('', (done) => {
+            window.addEventListener = jest.fn((as, listener, sd) => listener({
+                isTrusted:true,
+                data: {
+                    action: "initiate-email-clicked",
+                    initiateEmailBody: ""
+                }
+            })) as any;
+            // act
+            faqReportIssuePage.ngOnInit();
+            // assert,
+            setTimeout(() => {
+                expect(faqReportIssuePage.appName).toEqual('AppName');
+                done();
+            }, 0);
+            expect(window.addEventListener).toBeCalled();
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toBeCalled();
+        });
+    });
+
+    describe('submit', () => {
+        it('should initiate email', () => {
+            // arrange
+            faqReportIssuePage.isFormValid = true;
+            faqReportIssuePage.formValues = mockFormValue;
+            jest.spyOn(faqReportIssuePage, 'initiateEmailAction');
+            const syncStat = {
+                syncedEventCount: 0
+            };
+            mockTelemetryService.sync = jest.fn(() => of(syncStat));
+            // act
+            faqReportIssuePage.submit();
+            // assert
+            expect(faqReportIssuePage.callToAction).toBeDefined();
+            expect(faqReportIssuePage.initiateEmailAction).toBeCalled();
+        });
+
+        it('should showcontact popup', () => {
+            // arrange
+            mockFormValue.category = 'loginRegistration';
+            mockFormValue.subcategory = 'certificate';
+            faqReportIssuePage.isFormValid = true;
+            faqReportIssuePage.formValues = mockFormValue;
+            const syncStat = {
+                error: 'Error'
+            };
+            mockTelemetryService.sync = jest.fn(() => of(syncStat));
+            jest.spyOn(faqReportIssuePage, 'showContactBoard');
+            // act
+            faqReportIssuePage.submit();
+            // assert
+            expect(faqReportIssuePage.callToAction).toBeDefined();
+            expect(faqReportIssuePage.showContactBoard).toBeCalled();
+        });
+
+        it('should show ackknowledge user response popup', () => {
+            // arrange
+            mockFormValue.category = 'content';
+            mockFormValue.subcategory = 'contentquality';
+            faqReportIssuePage.isFormValid = true;
+            faqReportIssuePage.formValues = mockFormValue;
+            const syncStat = {
+                syncedEventCount: 1
+            };
+            mockTelemetryService.sync = jest.fn(() => of(syncStat));
+            jest.spyOn(faqReportIssuePage, 'ackknowledgeResponse');
+            // act
+            faqReportIssuePage.submit();
+            // assert
+            expect(faqReportIssuePage.callToAction).toBeDefined();
+            expect(faqReportIssuePage.ackknowledgeResponse).toBeCalled();
+        });
+
+        it('should open Explore component', () => {
+            // arrange
+            mockFormValue.category = 'content';
+            faqReportIssuePage.formContext = 'contentavailability';
+            faqReportIssuePage.isFormValid = true;
+            faqReportIssuePage.formValues = mockFormValue;
+            jest.spyOn(faqReportIssuePage, 'openExploreBooksComponent');
+            // act
+            faqReportIssuePage.submit();
+            // assert
+            expect(faqReportIssuePage.callToAction).toBeDefined();
+            expect(faqReportIssuePage.openExploreBooksComponent).toBeCalled();
+        });
+
+        it('should generate telemetry for notify selected', () => {
+            // arrange
+            mockFormValue.category = 'content';
+            mockFormValue.subcategory = 'contentavailability';
+            mockFormValue.children.subcategory['notify'] = true;
+            faqReportIssuePage.isFormValid = true;
+            faqReportIssuePage.formValues = mockFormValue;
+            spyOn(faqReportIssuePage, 'syncTelemetry').and.stub();
+            spyOn(faqReportIssuePage, 'takeAction').and.stub();
+            // act
+            faqReportIssuePage.submit();
+            // assert
+            expect(faqReportIssuePage.callToAction).toBeDefined();
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toBeCalled();
+        });
+
+        it('should generate telemetry for notify selected', () => {
+            // arrange
+            mockFormValue.category = 'otherissues';
+            faqReportIssuePage.isFormValid = true;
+            faqReportIssuePage.formValues = mockFormValue;
+            spyOn(faqReportIssuePage, 'syncTelemetry').and.stub();
+            spyOn(faqReportIssuePage, 'takeAction').and.stub();
+            // act
+            faqReportIssuePage.submit();
+            // assert
+            expect(faqReportIssuePage.callToAction).toBeDefined();
+            expect(faqReportIssuePage.takeAction).toHaveBeenCalledWith('initiateEmail');
+        });
+
+        it('should other issue selected', () => {
+            // arrange
+            mockFormValue.category = 'otherissues';
+            mockFormValue.subcategory = undefined;
+            mockFormValue.children['category'] = mockFormValue.children.subcategory;
+            delete mockFormValue.children.subcategory
+            faqReportIssuePage.isFormValid = true;
+            faqReportIssuePage.formValues = mockFormValue;
+            faqReportIssuePage.showSupportContact = false;
+            spyOn(faqReportIssuePage, 'syncTelemetry').and.stub();
+            // act
+            faqReportIssuePage.submit();
+            // assert
+            expect(mockFormValue.subcategory).toBeUndefined();
+        });
+    });
+
+    describe('ngOnDestroy', () => {
+        it('should unsubscribe headerObservable and reset formConfig', () => {
+            // arrange
+            faqReportIssuePage.headerObservable = {
+                unsubscribe: jest.fn()
+            }
+            // act
+            faqReportIssuePage.ngOnDestroy();
+            // assert
+            expect(faqReportIssuePage.headerObservable.unsubscribe).toBeCalled();
+            expect(mockAppGlobalService.formConfig).toBeUndefined();
+        });
+    });
+
+    describe('valueChanged', () => {
+        it('category should be hidden', () => {
+            // arrange
+            faqReportIssuePage.formContext = undefined;
+            mockFormValue.category = 'otherissues';
+            // act
+            faqReportIssuePage.valueChanged(mockFormValue);
+            // assert
+            expect(faqReportIssuePage.formValues).toEqual(mockFormValue);
+            expect(faqReportIssuePage.formConfig[1].templateOptions.hidden).toBeTruthy();
+        });
+
+        it('category should be shown', () => {
+            // arrange
+            faqReportIssuePage.formContext = undefined;
+            mockFormValue.category = 'loginRegistration';
+            // act
+            faqReportIssuePage.valueChanged(mockFormValue);
+            // assert
+            expect(faqReportIssuePage.formValues).toEqual(mockFormValue);
+            expect(faqReportIssuePage.formConfig[1].templateOptions.hidden).toBeFalsy();
+        });
+    });
+
+    describe('statusChanged', () => {
+        it('should enable submit button',() => {
+            // act
+            faqReportIssuePage.statusChanged({ isValid: true });
+            // assert
+            expect(faqReportIssuePage.btnColor).toEqual('#006DE5');
+        });
+
+        it('should disable submit button',() => {
+            // act
+            faqReportIssuePage.statusChanged({ isValid: false });
+            // assert
+            expect(faqReportIssuePage.btnColor).toEqual('#8FC4FF');
+        });
+    });
+
+    describe('dataLoadStatus', () => {
+        it('should present loader', async () => {
+            // arrange
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            // act
+            await faqReportIssuePage.dataLoadStatus('LOADING');
+            // assert
+            expect(faqReportIssuePage.loader.present).toBeCalled();
+        });
+
+        it('should dismiss loader', async () => {
+            // arrange
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            // act
+            await faqReportIssuePage.dataLoadStatus('');
+            // assert
+            expect(faqReportIssuePage.loader.dismiss).toBeCalled();
+        });
+    });
+
+    describe('responseSubmitted', () => {
+        it('should navigate back', () => {
+            // act
+            faqReportIssuePage.responseSubmitted();
+            // assert
+            expect(mockLocation.back).toBeCalled();
+        });
+    });
+
+});
diff --git a/src/app/faq-report-issue/faq-report-issue.page.ts b/src/app/faq-report-issue/faq-report-issue.page.ts
index 19bd1b723..3dd4dc9d3 100644
--- a/src/app/faq-report-issue/faq-report-issue.page.ts
+++ b/src/app/faq-report-issue/faq-report-issue.page.ts
@@ -1,7 +1,7 @@
-import { Component, OnInit, Inject, OnDestroy } from '@angular/core';
+import { Component, OnInit, Inject, OnDestroy, NgZone } from '@angular/core';
 import { Router } from '@angular/router';
 import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import { ContentType, AudienceFilter } from '../app.constant';
+import { AudienceFilter, ProfileConstants, FormConfigSubcategories, PrimaryCategory } from '../app.constant';
 import {
   ProfileService,
   ContentService,
@@ -9,14 +9,40 @@ import {
   Profile,
   GetAllProfileRequest,
   ContentRequest,
-  SharedPreferences
+  SharedPreferences,
+  FrameworkUtilService,
+  GetSuggestedFrameworksRequest,
+  CachedItemRequestSourceFrom,
+  FrameworkCategoryCodesGroup,
+  Framework,
+  FrameworkService,
+  TelemetryService,
+  TelemetrySyncStat,
+  CorrelationData,
+  LogLevel,
+  LogType
 } from 'sunbird-sdk';
-import { Environment, InteractType, PageId, ImpressionType } from '@app/services/telemetry-constants';
+import {
+  Environment,
+  InteractType,
+  PageId,
+  ImpressionType,
+  InteractSubtype,
+  CorReleationDataType,
+  ID
+} from '@app/services/telemetry-constants';
 import { AppGlobalService } from '@app/services/app-global-service.service';
 import { CommonUtilService } from '@app/services/common-util.service';
 import { SocialSharing } from '@ionic-native/social-sharing/ngx';
 import { AppVersion } from '@ionic-native/app-version/ngx';
 import { map } from 'rxjs/operators';
+import { TranslateService } from '@ngx-translate/core';
+import { AppHeaderService, FormAndFrameworkUtilService } from '@app/services';
+import { Location } from '@angular/common';
+import { ExploreBooksSortComponent } from '../resources/explore-books-sort/explore-books-sort.component';
+import { ModalController } from '@ionic/angular';
+import { FrameworkCommonFormConfigBuilder } from '@app/services/common-form-config-builders/framework-common-form-config-builder';
+import {AliasBoardName} from '@app/pipes/alias-board-name/alias-board-name';
 
 const KEY_SUNBIRD_CONFIG_FILE_PATH = 'sunbird_config_file_path';
 const SUBJECT_NAME = 'support request';
@@ -24,9 +50,10 @@ const SUBJECT_NAME = 'support request';
 @Component({
   selector: 'app-faq-report-issue',
   templateUrl: './faq-report-issue.page.html',
-  styleUrls: ['./faq-report-issue.page.scss'],
+  styleUrls: ['./faq-report-issue.page.scss']
 })
 export class FaqReportIssuePage implements OnInit, OnDestroy {
+
   data: any;
   private messageListener: (evt: Event) => void;
   deviceId: string;
@@ -38,6 +65,42 @@ export class FaqReportIssuePage implements OnInit, OnDestroy {
   charsLeft: any;
   len: any;
   charEntered: boolean;
+  loader: any;
+  profile: any = {
+    board: [],
+    medium: [],
+    grade: [],
+    subject: []
+  };
+  boardValue: string;
+  mediumtValue: string;
+  gradeValue: string;
+  subjectValue: string;
+
+  public syllabusList: { name: string, code: string }[] = [];
+  public mediumList: { name: string, code: string }[] = [];
+  public gradeList: { name: string, code: string }[] = [];
+  public subjectList: { name: string, code: string }[] = [];
+
+  btnColor = '#8FC4FF';
+  preFillData: any;
+  subcategory: any;
+  formConfig: any;
+
+  headerObservable: any;
+  isFormValid: boolean;
+  formValues: any;
+  boardContact: { code: string; name: string; message: string; contactinfo: { number: string; email: any; }; };
+  bmgsString: any;
+  categories: any;
+  cnotextasdas: { [key: string]: { code: string; path?: string[]; }[]; };
+  callToAction: any = {};
+  showSupportContact: boolean;
+  showThanksResponse: boolean;
+  formContext: any;
+  supportEmail: any;
+  relevantTerms: any;
+  private corRelationList: Array<CorrelationData>;
 
   constructor(
     private router: Router,
@@ -45,24 +108,88 @@ export class FaqReportIssuePage implements OnInit, OnDestroy {
     @Inject('PROFILE_SERVICE') private profileService: ProfileService,
     @Inject('CONTENT_SERVICE') private contentService: ContentService,
     @Inject('DEVICE_INFO') private deviceInfo: DeviceInfo,
+    @Inject('FRAMEWORK_SERVICE') private frameworkService: FrameworkService,
+    @Inject('FRAMEWORK_UTIL_SERVICE') private frameworkUtilService: FrameworkUtilService,
+    @Inject('TELEMETRY_SERVICE') private telemetryService: TelemetryService,
     private telemetryGeneratorService: TelemetryGeneratorService,
     private appGlobalService: AppGlobalService,
     private commonUtilService: CommonUtilService,
+    private headerService: AppHeaderService,
+    private location: Location,
     private socialSharing: SocialSharing,
-    private appVersion: AppVersion
+    private appVersion: AppVersion,
+    private translate: TranslateService,
+    private modalCtrl: ModalController,
+    public zone: NgZone,
+    private formAndFrameworkUtilService: FormAndFrameworkUtilService,
+    private frameworkCommonFormConfigBuilder: FrameworkCommonFormConfigBuilder,
+    private aliasBoardName: AliasBoardName
   ) {
     if (this.router.getCurrentNavigation().extras.state) {
       this.data = this.router.getCurrentNavigation().extras.state.data;
-      console.log('Data from Faq-Help', this.data);
+      this.formContext = this.router.getCurrentNavigation().extras.state.formCnotext;
+      this.corRelationList = this.router.getCurrentNavigation().extras.state.corRelation || [];
+      if (this.router.getCurrentNavigation().extras.state.showHeader) {
+        this.headerService.showHeaderWithBackButton();
+        this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
+          this.handleHeaderEvents(eventName);
+        });
+      }
+      this.formConfig = this.appGlobalService.formConfig;
+      this.arrayListHandling(this.formConfig);
+    }
+    this.profileService.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS }).toPromise()
+      .then((res: any) => {
+        this.profile = res;
+      })
+      .catch(async () => {
+        await this.loader.dismiss();
+      });
+  }
+
+  private handleHeaderEvents($event) {
+    switch ($event.name) {
+      case 'back':
+        setTimeout(() => {
+          this.handleBackButton();
+        }, 100);
+        break;
     }
   }
 
+  handleBackButton() {
+    this.location.back();
+  }
+
+  async getBoardDetails() {
+    this.loader = await this.commonUtilService.getLoader();
+    await this.loader.present();
+
+    const getSuggestedFrameworksRequest: GetSuggestedFrameworksRequest = {
+      from: CachedItemRequestSourceFrom.SERVER,
+      language: this.translate.currentLang,
+      requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
+    };
+
+    this.frameworkUtilService.getActiveChannelSuggestedFrameworkList(getSuggestedFrameworksRequest).toPromise()
+      .then(async (frameworks: Framework[]) => {
+        if (!frameworks || !frameworks.length) {
+          await this.loader.dismiss();
+          this.commonUtilService.showToast('NO_DATA_FOUND');
+          return;
+        }
+        this.syllabusList = frameworks.map(r => ({ name: r.name, code: r.identifier }));
+        await this.loader.dismiss();
+      });
+  }
+
   ngOnInit() {
     this.appVersion.getAppName()
       .then((appName) => {
         this.appName = appName;
-        console.log('APpName', this.appName);
-      });
+        console.log('AppName', this.appName);
+      }
+    );
     this.messageListener = (event) => {
       this.receiveMessage(event);
     };
@@ -71,15 +198,26 @@ export class FaqReportIssuePage implements OnInit, OnDestroy {
       ImpressionType.VIEW,
       '',
       PageId.FAQ_REPORT_ISSUE,
-      Environment.USER);
+      Environment.USER,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      this.corRelationList
+    );
   }
+
   ngOnDestroy() {
     window.removeEventListener('message', this.messageListener);
+    if (this.headerObservable) {
+      this.headerObservable.unsubscribe();
+    }
+    this.appGlobalService.formConfig = undefined;
   }
+
   receiveMessage(event) {
     const values = new Map();
     values['values'] = event.data;
-    console.log('Event.data', event.data);
     // send telemetry for all events except Initiate-Email
     if (event.data && event.data.action && event.data.action !== 'initiate-email-clicked') {
       this.generateInteractTelemetry(event.data.action, values);
@@ -92,23 +230,22 @@ export class FaqReportIssuePage implements OnInit, OnDestroy {
   }
 
   async sendMessage(message: string) {
-    this.deviceId = this.deviceInfo.getDeviceID();
     const allUserProfileRequest: GetAllProfileRequest = {
       local: true,
       server: true
     };
     const contentRequest: ContentRequest = {
-      contentTypes: ContentType.FOR_DOWNLOADED_TAB,
+      primaryCategories: PrimaryCategory.FOR_DOWNLOADED_TAB,
       audience: AudienceFilter.GUEST_TEACHER
     };
     const getUserCount = await this.profileService.getAllProfiles(allUserProfileRequest).pipe(
       map((profile) => profile.length)
     )
-    .toPromise();
+      .toPromise();
     const getLocalContentCount = await this.contentService.getContents(contentRequest).pipe(
       map((contentCount) => contentCount.length)
     )
-    .toPromise();
+      .toPromise();
     (<any>window).supportfile.shareSunbirdConfigurations(getUserCount, getLocalContentCount, async (result) => {
       const loader = await this.commonUtilService.getLoader();
       await loader.present();
@@ -119,12 +256,12 @@ export class FaqReportIssuePage implements OnInit, OnDestroy {
               await loader.dismiss();
               if (Boolean(val)) {
                 this.fileUrl = 'file://' + val;
-                this.subjectDetails = this.appName + ' ' + SUBJECT_NAME + '-' + this.deviceId;
+                this.subjectDetails = this.appName + ' ' + SUBJECT_NAME + ' for ' + this.categories;
                 this.socialSharing.shareViaEmail(message,
                   this.subjectDetails,
-                  [this.appGlobalService.SUPPORT_EMAIL],
-                  null,
-                  null,
+                  [this.supportEmail ? this.supportEmail : this.appGlobalService.SUPPORT_EMAIL],
+                  undefined,
+                  undefined,
                   this.fileUrl)
                   .catch(error => {
                     console.error(error);
@@ -140,46 +277,448 @@ export class FaqReportIssuePage implements OnInit, OnDestroy {
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH, interactSubtype,
       Environment.USER,
-      PageId.FAQ_REPORT_ISSUE, undefined,
-      values
+      PageId.FAQ_REPORT_ISSUE,
+      undefined,
+      values,
+      undefined,
+      this.corRelationList
     );
   }
 
   getBoardMediumGrade(mailBody: string): string {
+    this.deviceId = this.deviceInfo.getDeviceID();
     const userProfile: Profile = this.appGlobalService.getCurrentUser();
     let ticketSummary: string;
     if (mailBody.length) {
-      ticketSummary = '.<br> <br> <strong>' + this.commonUtilService.translateMessage('TICKET_SUMMARY') + '</strong> <br> <br>';
+      ticketSummary = '<br> <br> <strong>' + this.commonUtilService.translateMessage('TICKET_SUMMARY') + '</strong> <br> <br>';
+    } else {
+      ticketSummary = '<br> <br> <strong>' + this.commonUtilService.translateMessage('MORE_DETAILS') + '</strong> <br> <br>';
+    }
+    let userDetails: string;
+    if (this.bmgsString) {
+      userDetails = 'From: ' + userProfile.profileType[0].toUpperCase() + userProfile.profileType.slice(1) + ', ' +
+        this.bmgsString;
     } else {
-      ticketSummary = '.<br> <br> <strong>' + this.commonUtilService.translateMessage('MORE_DETAILS') + '</strong> <br> <br>';
+      let selectedBMG = this.appGlobalService.getSelectedBoardMediumGrade();
+      if (!selectedBMG) {
+        selectedBMG = ((userProfile.board && userProfile.board.length
+          && userProfile.board[0]) ? userProfile.board[0] + ', ' : '') +
+          (userProfile.medium && userProfile.medium.length
+            && userProfile.medium[0]) + ' Medium, ' +
+          (userProfile.grade && userProfile.grade.length && userProfile.grade[0]);
+      }
+      userDetails = 'From: ' + userProfile.profileType[0].toUpperCase() + userProfile.profileType.slice(1) + ', ' +
+      selectedBMG + ticketSummary;
     }
-    const userDetails: string = 'From: ' + userProfile.profileType[0].toUpperCase() + userProfile.profileType.slice(1) + ', ' +
-      this.appGlobalService.getSelectedBoardMediumGrade() +
-      ticketSummary;
+    this.categories ? userDetails += '.<br> <br>' + this.commonUtilService.translateMessage('DEVICE_ID') + ': ' + this.deviceId + '<br>'
+      : undefined;
+    userDetails += ticketSummary;
     return userDetails;
   }
 
-  initiateEmail(emailContent) {
-    this.value = {};
-    this.value.action = 'initiate-email-clicked';
-    this.value.value = {};
-    this.value.initiateEmailBody = emailContent;
-    console.log('this.value', this.value);
-    window.parent.postMessage(this.value, '*');
+  submit() {
+    if (!this.isFormValid) {
+      return false;
+    }
+    this.prepareEmailContent(this.formValues);
+
+    if (this.formValues) {
+      if (Object.prototype.hasOwnProperty.call(this.callToAction, this.formValues.subcategory)) {
+        this.takeAction(this.callToAction[this.formValues.subcategory]);
+      } else if (Object.prototype.hasOwnProperty.call(this.callToAction, this.formValues.category)) {
+        this.takeAction(this.callToAction[this.formValues.category]);
+      } else {
+        this.takeAction();
+      }
+    }
+
+    if (this.formValues && this.formValues.children && this.formValues.children.subcategory) {
+      const corRelationList: Array<CorrelationData> = this.prepareTelemetryCorrelation();
+      this.telemetryGeneratorService.generateInteractTelemetry(
+        InteractType.SUPPORT,
+        '', Environment.HOME,
+        PageId.FAQ_REPORT_ISSUE,
+        undefined,
+        undefined,
+        undefined,
+        corRelationList,
+        ID.SUBMIT_CLICKED
+      );
+
+      const paramsList = [];
+      paramsList.push({ category : this.formValues['category']});
+      paramsList.push({ subcategory : this.formValues['subcategory']});
+      const subCategories = this.formValues.children.subcategory;
+      Object.keys(subCategories).forEach((key) => {
+        const subCategory =  subCategories[key];
+        if (Array.isArray(subCategory)) {
+          const params = {};
+          params[key] = subCategory.map((item) => {
+            return item['name'];
+          });
+          paramsList.push(params);
+        } else if (typeof subCategory === 'object') {
+          const params = {};
+          params[key] = subCategory['name'];
+          paramsList.push(params);
+        } else {
+          const params = {};
+          params[key] = subCategory;
+          paramsList.push(params);
+        }
+      });
+      this.telemetryGeneratorService.generateLogEvent(LogLevel.INFO,
+        PageId.FAQ,
+        Environment.FAQ,
+        'system',
+        paramsList);
+    }
+
+    if (this.formValues && this.formValues.children && this.formValues.children.subcategory &&
+      this.formValues.subcategory === 'contentavailability') {
+      const corRelationList: Array<CorrelationData> = this.prepareTelemetryCorrelation();
+      if (this.formValues && this.formValues.children && this.formValues.children.subcategory &&
+        this.formValues.children.subcategory.notify) {
+        corRelationList.push({ id: 'true', type: 'Notify' });
+      }
+      this.telemetryGeneratorService.generateInteractTelemetry(
+        InteractType.SUPPORT,
+        '', Environment.HOME,
+        PageId.FAQ_REPORT_ISSUE,
+        undefined,
+        undefined,
+        undefined,
+        corRelationList,
+        ID.NOTIFICATION_REQUEST
+      );
+    }
+    this.syncTelemetry();
+  }
+
+  private generateLogTelemetry(){
+
   }
 
-  countChar(val) {
-    const maxLength = 1000;
-    this.len = val.length;
-    if (this.len === 0) {
-      this.charEntered = false;
+  takeAction(action?: string) {
+    switch (action) {
+      case 'contactBoard':
+        this.showContactBoard();
+        break;
+      case 'initiateEmail':
+        this.initiateEmailAction();
+        break;
+      default:
+        if (this.formContext === FormConfigSubcategories.CONTENT_AVAILABILITY) {
+          this.openExploreBooksComponent();
+        } else {
+          this.ackknowledgeResponse();
+        }
     }
-    if (this.len > 0 && this.len <= 1000) {
-      this.charEntered = true;
-      this.charsLeft = maxLength - this.len;
+  }
+
+  extractPrepareFieldStr(field) {
+    if (this.formValues.children && this.formValues.children.subcategory && this.formValues.children.subcategory[field]) {
+      if (typeof this.formValues.children.subcategory[field] === 'object' && this.formValues.children.subcategory[field].length) {
+        return this.getStringFromArray(this.formValues.children.subcategory[field]);
+      } else if(this.formValues.children.subcategory[field].name) {
+        return this.formValues.children.subcategory[field].name
+      } else if (typeof this.formValues.children.subcategory[field] === 'string') {
+        return this.formValues.children.subcategory[field];
+      }
+      return undefined;
+    } else if (this.profile) {
     }
-    if (val.length > 1000) {
-      this.emailContent = this.emailContent.slice(0, 1000);
+  }
+
+  async openExploreBooksComponent() {
+    // generate telemetry and send class, medium and subject data to next page
+    const props = {
+      boardList: this.extractPrepareFieldStr('borad'),
+      mediumList: this.extractPrepareFieldStr('medium'),
+      geadeList: this.extractPrepareFieldStr('grade'),
+      subjectList: this.extractPrepareFieldStr('subject'),
+      relevantTerms: this.relevantTerms,
+      curLang: this.translate.currentLang
+    };
+    const sortOptionsModal = await this.modalCtrl.create({
+      component: ExploreBooksSortComponent,
+      componentProps: props
+    });
+    this.location.back();
+    await sortOptionsModal.present();
+  }
+
+  ackknowledgeResponse() {
+    // show acknowdelgement message
+    this.showThanksResponse = true;
+    setTimeout(() => {
+      this.showThanksResponse = false;
+    }, 3000);
+  }
+
+  async initiateEmailAction() {
+    const stateContactList = await this.formAndFrameworkUtilService.getStateContactList();
+    this.supportEmail = undefined;
+    stateContactList.forEach(element => {
+      if (this.formValues.children.subcategory && this.formValues.children.subcategory.board &&
+        this.formValues.children.subcategory.board.code === element.id && element.contactinfo &&
+        element.contactinfo.email) {
+        this.supportEmail = element.contactinfo.email;
+      }
+    });
+    if (!this.showSupportContact && this.isFormValid) {
+      this.value = {};
+      this.value.action = 'initiate-email-clicked';
+      this.value.value = {};
+      if (this.formValues.children && this.formValues.children.subcategory && this.formValues.children.subcategory) {
+        this.value.initiateEmailBody = this.formValues.children.subcategory.details
+      } else if (this.formValues.children && this.formValues.children.category && this.formValues.children.category) {
+        this.value.initiateEmailBody = this.formValues.children.category.details;
+      }
+      window.parent.postMessage(this.value, '*');
+    }
+    setTimeout(() => {
+      this.location.back();
+      this.location.back();
+    }, 3000);
+  }
+
+  async showContactBoard() {
+    const stateContactList = await this.formAndFrameworkUtilService.getStateContactList();
+    let boardCode: string;
+    if (this.formValues.children &&
+    this.formValues.children.subcategory &&
+    this.formValues.children.subcategory.board &&
+    this.formValues.children.subcategory.board.code) {
+      boardCode = this.formValues.children.subcategory.board.code;
+    } else if (this.profile && this.profile.board && this.profile.board.length) {
+      boardCode = this.profile.board[0];
+    }
+
+    stateContactList.forEach(element => {
+      if (boardCode === element.id) {
+        if (this.isFormValid && element.contactinfo && element.contactinfo.number) {
+          this.boardContact = element;
+          this.showSupportContact = true;
+        }
+      }
+    });
+    this.initiateEmailAction();
+  }
+
+  prepareTelemetryCorrelation(): Array<CorrelationData> {
+    let correlationlist: Array<CorrelationData> =  [];
+    correlationlist =  [...correlationlist, ...(this.corRelationList || [])];
+    // Category
+    this.formValues && this.formValues.category ?
+      correlationlist.push({ id: this.formValues.category, type: CorReleationDataType.CATEGORY }) : undefined;
+    // SubCategory
+    this.formValues && this.formValues.subcategory ?
+      correlationlist.push({ id: this.formValues.subcategory, type: CorReleationDataType.SUBCATEGORY }) : undefined;
+    if (this.formValues && this.formValues.children && this.formValues.children.subcategory) {
+      // Board
+      correlationlist.push({ id: this.extractPrepareFieldStr('board') || '', type: CorReleationDataType.BOARD });
+      // Medium
+      correlationlist.push({ id: this.extractPrepareFieldStr('medium') || '', type: CorReleationDataType.MEDIUM });
+      // Grade
+      correlationlist.push({ id: this.extractPrepareFieldStr('grade') || '', type: CorReleationDataType.CLASS });
+      // Subject
+      correlationlist.push({ id: this.extractPrepareFieldStr('subject') || '', type: CorReleationDataType.SUBJECT });
+      // Content Type
+      correlationlist.push({ id: this.extractPrepareFieldStr('contenttype') || '', type: CorReleationDataType.CONTENT_TYPE });
+      // Content name
+      correlationlist.push({ id: this.extractPrepareFieldStr('contentname') || '', type: CorReleationDataType.CONTENT_NAME });
+    }
+
+    return correlationlist ? correlationlist : undefined;
+  }
+
+  async syncTelemetry() {
+    const that = this;
+    const loader = await this.commonUtilService.getLoader();
+    await loader.present();
+    const correlationlist: Array<CorrelationData> = this.prepareTelemetryCorrelation();
+
+    this.generateInteractEvent(InteractType.TOUCH, InteractSubtype.MANUALSYNC_INITIATED, undefined);
+    this.telemetryService.sync({
+      ignoreAutoSyncMode: true,
+      ignoreSyncThreshold: true
+    }).subscribe((syncStat: TelemetrySyncStat) => {
+      that.zone.run(async () => {
+        if (syncStat.error) {
+          await loader.dismiss();
+          return;
+        } else if (!syncStat.syncedEventCount) {
+          await loader.dismiss();
+          return;
+        }
+
+        this.generateInteractEvent(InteractType.OTHER, InteractSubtype.MANUALSYNC_SUCCESS, syncStat.syncedFileSize, correlationlist);
+        await loader.dismiss();
+      });
+    }, async (error) => {
+      await loader.dismiss();
+      console.error('Telemetry Data Sync Error: ', error);
+    });
+  }
+
+  generateInteractEvent(interactType: string, subtype: string, size: number, corRelationList?) {
+    if (size) {
+      this.telemetryGeneratorService.generateInteractTelemetry(
+        interactType,
+        subtype,
+        Environment.USER,
+        PageId.FAQ_REPORT_ISSUE,
+        undefined,
+        {
+          SizeOfFileInKB: (size / 1000) + ''
+        },
+        undefined,
+        corRelationList
+      );
+    }
+  }
+
+  // checks for dataSrc property
+  checkDataSrc(obj) {
+    if (obj && Object.prototype.hasOwnProperty.call(obj, 'dataSrc')) {
+      // attaching closure to options preperty
+      this.converDataSrcToClosure(obj);
+    } else if (obj) {
+      for (const key in obj) {
+        if (Array.isArray(obj[key])) {
+          this.arrayListHandling(obj[key]);
+        } else if (typeof obj[key] === 'object') {
+          this.checkDataSrc(obj[key]);
+        }
+      }
+    }
+  }
+
+  arrayListHandling(arr, action?) {
+    arr.forEach(element => {
+      if (arr && Array.isArray(element)) {
+        this.arrayListHandling(element);
+      } else if (typeof element === 'object') {
+        if (typeof action === 'function') {
+          action(element);
+        } else {
+          this.checkDataSrc(element);
+        }
+      }
+    });
+  }
+
+  converDataSrcToClosure(templateOptions) { // type definition
+    const dataSrc = templateOptions.dataSrc;
+    switch (dataSrc.marker) {
+      case 'ACTIVE_CHANNEL.SUGGESTED_FRAMEWORK_LIST.MAPPED_TO_FRAMEWORKCATEGORIES':
+        templateOptions.options = this.getClosure('board');
+        break;
+      case 'FRAMEWORK_CATEGORY_TERMS':
+        templateOptions.options = this.getClosure(dataSrc.params.categoryCode);
+        break;
+    }
+    if (dataSrc && dataSrc.action) {
+      this.callToAction[templateOptions.value] = dataSrc.action;
+    }
+    if (dataSrc && dataSrc.params && dataSrc.params.relevantTerms) {
+      this.relevantTerms = dataSrc.params.relevantTerms;
+    }
+    delete templateOptions.dataSrc;
+  }
+
+  getClosure(type: string) {
+    switch (type) {
+      case 'board':
+        return this.frameworkCommonFormConfigBuilder.getBoardConfigOptionsBuilder(this.profile);
+      case 'medium':
+        return this.frameworkCommonFormConfigBuilder.getMediumConfigOptionsBuilder(this.profile);
+      case 'grade':
+        return this.frameworkCommonFormConfigBuilder.getGradeConfigOptionsBuilder(this.profile);
+      case 'subject':
+        return this.frameworkCommonFormConfigBuilder.getSubjectConfigOptionsBuilder(this.profile);
+    }
+  }
+
+  valueChanged($event) {
+    this.formValues = $event;
+    if (!this.formContext && $event.category === 'otherissues') {
+      this.formConfig[1].templateOptions.hidden = true;
+    } else if (!this.formContext) {
+      this.formConfig[1].templateOptions.hidden = false;
+    }
+  }
+
+  getStringFromArray(arr) {
+    return arr.reduce((acc, ele) => {
+      if(!acc) {
+        acc = ele.name ? ele.name : ele;
+      } else {
+        acc += ', ' + (ele.name ? ele.name : ele);
+      }
+      return acc;
+    }, '');
+  }
+
+  prepareEmailContent(formValue) {
+    this.bmgsString = undefined;
+    this.categories = undefined;
+    const bmgskeys = ['board', 'medium', 'grade', 'subject', 'contentname', 'contenttype'];
+    const categorykeys = ['category', 'subcategory'];
+    let fields = [];
+    if (formValue.children.subcategory) {
+      fields = formValue.children.subcategory;
+    } else if (formValue.children) {
+      fields = formValue.children;
+    }
+    bmgskeys.forEach(element => {
+      if (Object.prototype.hasOwnProperty.call(fields, element)) {
+        if (!this.bmgsString) {
+          if (fields[element] && typeof fields[element] === 'object' && fields[element].length) {
+            this.bmgsString = this.getStringFromArray(fields[element]);
+          } else {
+            this.bmgsString = fields[element].name ? this.aliasBoardName.transform(fields[element].name) : fields[element];
+          }
+        } else {
+          if (fields[element] && typeof fields[element] === 'object' && fields[element].length) {
+            this.bmgsString += ', ' + this.getStringFromArray(fields[element]);
+          } else {
+            this.bmgsString += ', ' + (fields[element].name ? fields[element].name : fields[element]);
+          }
+        }
+      }
+    });
+    categorykeys.forEach(element => {
+      if (Object.prototype.hasOwnProperty.call(formValue, element)) {
+        if (!this.categories) {
+          formValue[element] ? this.categories = formValue[element] : undefined;
+        } else {
+          formValue[element] ? this.categories += ' - ' + formValue[element] : undefined;
+        }
+      }
+    });
+  }
+
+  statusChanged($event) {
+    this.isFormValid = $event.isValid;
+    this.btnColor = this.isFormValid ? '#006DE5' : '#8FC4FF';
+  }
+
+  async dataLoadStatus($event) {
+    if (!this.loader) {
+      this.loader = await this.commonUtilService.getLoader();
+    }
+    if ('LOADING' === $event) {
+      this.loader.present();
+    } else {
+      this.loader.dismiss();
+    }
+  }
+
+  responseSubmitted() {
+    if (this.formContext !== FormConfigSubcategories.CONTENT_AVAILABILITY) {
+      this.location.back();
     }
   }
 }
diff --git a/src/app/form.constants.ts b/src/app/form.constants.ts
new file mode 100644
index 000000000..a7129b28e
--- /dev/null
+++ b/src/app/form.constants.ts
@@ -0,0 +1,77 @@
+import { CachedItemRequestSourceFrom, FormRequest } from '@project-sunbird/sunbird-sdk';
+
+export class FormConstants {
+    public static  SELF_DECLARATION: FormRequest = {
+        from: CachedItemRequestSourceFrom.SERVER,
+        type: 'user',
+        subType: 'selfDeclaration_v3',
+        action: 'submit',
+        component: 'app'
+    };
+
+    public static  TENANT_PERSONAINFO: FormRequest = {
+        type: 'user',
+        subType: 'tenantPersonaInfo_v2',
+        action: 'get',
+        component: 'app'
+    };
+
+    public static  SUPPORTED_USER_TYPES: FormRequest = {
+        type: 'config',
+        subType: 'userType_v2',
+        action: 'get',
+        component: 'app'
+    };
+
+    public static  SEARCH_FILTER: FormRequest = {
+        type: 'config',
+        subType: 'search',
+        action: 'filter_v3',
+        component: 'app'
+    };
+
+    public static  LOCATION_DETAILS: FormRequest = {
+        type: 'config',
+        subType: 'locationDetails',
+        action: 'get'
+    };
+
+    public static LOCATION_MAPPING: FormRequest = {
+        type: 'profileConfig',
+        subType: 'default',
+        action: 'get'
+    };
+
+    public static  DEEPLINK_CONFIG: FormRequest = {
+        type: 'config',
+        subType: 'deeplink',
+        action: 'get'
+    };
+
+    public static  UTILITY_CONFIG: FormRequest = {
+        type: 'config',
+        subType: 'utility',
+        action: 'get',
+        component: 'app'
+    };
+
+    public static  VENDOR_APPS_CONFIG: FormRequest = {
+        type: 'config',
+        subType: 'vendorapps',
+        action: 'get',
+        component: 'app',
+    };
+
+    public static  PROJECT_CREATE_META: FormRequest = {
+        type: 'user',
+        subType: 'project',
+        action: 'create'
+    };
+
+    public static  TASK_CREATE_META: FormRequest = {
+        type: 'user',
+        subType: 'project',
+        action: 'createTask'
+    };
+
+}
diff --git a/src/app/home/admin-home/admin-home.page.html b/src/app/home/admin-home/admin-home.page.html
new file mode 100644
index 000000000..3fc9651d6
--- /dev/null
+++ b/src/app/home/admin-home/admin-home.page.html
@@ -0,0 +1,51 @@
+<ion-content>
+  <div class="user-profile">
+    <span>{{'WELCOME' | translate}},</span>
+    <strong>&nbsp;{{profile?.handle}}</strong>
+  </div>
+  <div class="p-8">{{'BROWES_RELEVANT_CONTENT' | translate: {'app_name': appLabel} }}
+  </div>
+  <div class="p-8" (click)="navigateToEditProfilePage()" *ngIf="boards">
+    <div class="filter-style"><span>{{boards}}</span><span *ngIf="medium">{{', ' +medium}}</span><span *ngIf="grade">{{', ' +grade}}</span></div>
+    <div class="d-inline">
+      <ion-icon md="caret-down-circle" ios="chevron-down-circle"></ion-icon>
+    </div>
+  </div>
+  
+    <ng-container *ngFor="let section of displaySections">
+      <div class="label" *ngIf="section?.title && section?.theme?.component !== 'sb-course-cards-hlist' && section?.theme?.component !== 'sb-library-cards-hlist'">{{section?.title | translateJson}}</div>
+      <!-- Trackable contents -->
+      <ng-container *ngIf="section?.theme?.component === 'sb-course-cards-hlist'">
+        <ng-container *ngFor="let subSection of section?.data?.sections">
+          <ng-container *ngIf="subSection?.contents?.length">
+            <sb-course-cards-hlist 
+              [title]="(section?.title) | translateJson"
+              [type]="section?.theme?.inputs?.type || courseCardType.MY_COURSE_RECENTLY_VIEWED_CARD_GRID"
+              [contentList]="subSection.contents" [hideProgress]="section?.theme?.inputs?.hideProgress || true"
+              [viewMoreButtonText]="(section?.theme?.inputs?.viewMoreButtonText | translateJson) || ('VIEW_ALL' | translate)"
+              [maxCardCount]="section?.theme?.inputs?.maxCardCount || 10"
+              [viewMoreButtonPosition]="section?.theme?.inputs?.viewMoreButtonPosition || ButtonPosition.RIGHT"
+              (viewMoreClick)="navigateToViewMoreContentsPage(section)"
+              (cardClick)="navigateToDetailPage($event, (subSection.name || section?.title))">
+            </sb-course-cards-hlist>
+          </ng-container>
+        </ng-container>
+      </ng-container>
+  
+      <!-- Pills -->
+      <ng-container *ngIf="section?.theme?.component === 'sb-pills-grid'">
+        <sb-pills-grid [pillShape]="section?.theme?.inputs?.pillShape"
+          [pillsViewType]="section?.theme?.inputs?.pillsViewType" 
+          [selectMode]="section?.theme?.inputs?.selectMode"
+          [minDisplayCount]="section?.theme?.inputs?.minDisplayCount"
+          [viewMoreText]="section?.theme?.inputs?.viewMoreText | translateJson"
+          [viewLessText]="section?.theme?.inputs?.viewLessText | translateJson"
+          (select)="onPillClick($event)">
+          <sb-pill-item *ngFor="let pillData of section.data" [name]="pillData?.title | translateJson" [icon]="pillData?.icon"
+            [value]="pillData"></sb-pill-item>
+        </sb-pills-grid>
+      </ng-container>
+  
+    </ng-container>
+  
+  </ion-content>
\ No newline at end of file
diff --git a/src/app/home/admin-home/admin-home.page.scss b/src/app/home/admin-home/admin-home.page.scss
new file mode 100644
index 000000000..11d7739d9
--- /dev/null
+++ b/src/app/home/admin-home/admin-home.page.scss
@@ -0,0 +1,38 @@
+@import "src/assets/styles/_variables.scss";
+.filter-style {
+  font-size: 14px;
+  font-weight: 500;
+  color: $blue;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 45vh;
+  display: inline-block;
+}
+
+.user-profile {
+  padding: 8px 8px 0;
+  font-size: 3.2vh;
+}
+
+.label {
+  font-size: 18px;
+  font-weight: 700;
+  padding-left: 8px;
+}
+
+.sb-card-scroll-container {
+  overflow-x: auto;
+  padding: 0 0 8px 0;
+}
+.sb-card-recently-container {
+  .recently-viewed-card-size{
+    margin: 0 8px; 
+    min-width:288px;
+    max-width:288px;
+    &:only-child {
+      min-width: 100%;
+      max-width: calc(100vw - 32px);
+    }
+  }
+}
diff --git a/src/app/home/admin-home/admin-home.page.ts b/src/app/home/admin-home/admin-home.page.ts
new file mode 100644
index 000000000..50cd79f98
--- /dev/null
+++ b/src/app/home/admin-home/admin-home.page.ts
@@ -0,0 +1,330 @@
+import { Component, Inject, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import {
+  AppGlobalService, AppHeaderService, CommonUtilService, ContentAggregatorHandler, Environment,
+  FormAndFrameworkUtilService, InteractSubtype, PageId, SunbirdQRScanner, TelemetryGeneratorService
+} from '@app/services';
+import { CourseCardGridTypes } from '@project-sunbird/common-consumption-v8';
+import { NavigationExtras, Router } from '@angular/router';
+import { ContentFilterConfig, EventTopics, ProfileConstants, RouterLinks, ViewMore } from '../../app.constant';
+import {
+  FrameworkService, FrameworkDetailsRequest, FrameworkCategoryCodesGroup, Framework,
+  Profile, ProfileService, ContentAggregatorRequest, ContentSearchCriteria,
+  CachedItemRequestSourceFrom, SearchType, InteractType, FormService, FormRequest
+} from '@project-sunbird/sunbird-sdk';
+import { AggregatorPageType } from '@app/services/content/content-aggregator-namespaces';
+import { NavigationService } from '@app/services/navigation-handler.service';
+import { IonContent as ContentView } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { Subscription } from 'rxjs';
+import { DbService, LocalStorageService } from '@app/app/manage-learn/core';
+import { localStorageConstants } from '@app/app/manage-learn/core/constants/localStorageConstants';
+import { UnnatiDataService } from '@app/app/manage-learn/core/services/unnati-data.service';
+import { urlConstants } from '@app/app/manage-learn/core/constants/urlConstants';
+import { OnTabViewWillEnter } from '@app/app/tabs/on-tab-view-will-enter';
+import { FieldConfig } from '@app/app/components/common-forms/field-config';
+import { FormConstants } from '@app/app/form.constants';
+
+@Component({
+  selector: 'app-admin-home',
+  templateUrl: './admin-home.page.html',
+  styleUrls: ['./admin-home.page.scss'],
+})
+export class AdminHomePage implements OnInit, OnDestroy, OnTabViewWillEnter {
+
+  aggregatorResponse = [];
+  courseCardType = CourseCardGridTypes;
+  selectedFilter: string;
+  concatProfileFilter: Array<string> = [];
+  categories: Array<any> = [];
+  boards: string;
+  medium: string;
+  grade: string;
+  profile: Profile;
+  guestUser: boolean;
+  appLabel: string;
+  newThemeTimeout: any;
+
+  displaySections: any[] = [];
+  headerObservable: Subscription;
+  @ViewChild('contentView', { static: false }) contentView: ContentView;
+
+  constructor(
+    @Inject('FRAMEWORK_SERVICE') private frameworkService: FrameworkService,
+    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+    @Inject('FORM_SERVICE') private formService: FormService,
+    private commonUtilService: CommonUtilService,
+    private router: Router,
+    private appGlobalService: AppGlobalService,
+    private contentAggregatorHandler: ContentAggregatorHandler,
+    private navService: NavigationService,
+    private headerService: AppHeaderService,
+    private events: Events,
+    private formAndFrameworkUtilService: FormAndFrameworkUtilService,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+    private qrScanner: SunbirdQRScanner,
+    private storage: LocalStorageService,
+    private unnatiService: UnnatiDataService,
+    private db: DbService,
+
+  ) {
+  }
+
+  ngOnInit() {
+    this.getUserProfileDetails();
+    this.events.subscribe(AppGlobalService.PROFILE_OBJ_CHANGED, () => {
+      this.getUserProfileDetails();
+    });
+    this.events.subscribe(EventTopics.TAB_CHANGE, (data: string) => {
+      if (data === '') {
+        this.qrScanner.startScanner(this.appGlobalService.getPageIdForTelemetry());
+      }
+    });
+    this.db.createDb();
+    this.events.subscribe('onAfterLanguageChange:update', (res) => {
+      if (res && res.selectedLanguage) {
+        this.fetchDisplayElements();
+      }
+    });
+  }
+
+  tabViewWillEnter() {
+    this.headerService.showHeaderWithHomeButton(['download', 'notification']);
+  }
+
+  async ionViewWillEnter() {
+    this.getCreateProjectForm();
+    this.events.subscribe('update_header', () => {
+      this.headerService.showHeaderWithHomeButton(['download', 'notification']);
+    });
+    this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
+      this.handleHeaderEvents(eventName);
+    });
+    this.headerService.showHeaderWithHomeButton(['download', 'notification']);
+  }
+
+  getCreateProjectForm() {
+    this.storage.getLocalStorage(localStorageConstants.PROJECT_META_FORM).then(resp => {
+    }, async error => {
+      const createProjectMeta: FieldConfig<any>[] = await this.formAndFrameworkUtilService.getFormFields(FormConstants.PROJECT_CREATE_META);
+      if(createProjectMeta.length){
+        this.storage.setLocalStorage(localStorageConstants.PROJECT_META_FORM, createProjectMeta);
+      }
+      this.getTaskForm();
+    })
+  }
+
+  getTaskForm() {
+    this.storage.getLocalStorage(localStorageConstants.TASK_META_FORM).then(resp => {
+    },async error => {
+      const createTaskMeta: FieldConfig<any>[] = await this.formAndFrameworkUtilService.getFormFields(FormConstants.TASK_CREATE_META);
+      if(createTaskMeta.length){
+        this.storage.setLocalStorage(localStorageConstants.TASK_META_FORM, createTaskMeta)
+      }
+    })
+  }
+
+  async getUserProfileDetails() {
+    this.profileService.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS })
+      .subscribe((profile: Profile) => {
+        this.profile = profile;
+        this.getFrameworkDetails();
+        this.fetchDisplayElements();
+      });
+    this.guestUser = !this.appGlobalService.isUserLoggedIn();
+    this.appLabel = await this.commonUtilService.getAppName();
+  }
+
+
+  navigateToEditProfilePage() {
+    if (!this.guestUser) {
+      this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.CATEGORIES_EDIT}`]);
+    } else {
+      const navigationExtras: NavigationExtras = {
+        state: {
+          profile: this.profile,
+          isCurrentUser: true
+        }
+      };
+      this.router.navigate([RouterLinks.GUEST_EDIT], navigationExtras);
+    }
+  }
+
+  ionViewDidLeave() {
+    if (this.newThemeTimeout && this.newThemeTimeout.clearTimeout) {
+      this.newThemeTimeout.clearTimeout();
+    }
+  }
+
+  ionViewDidEnter() {
+    // Need timer to load the coach screen and for the coach screen to hide if user comes from deeplink.
+    // this.newThemeTimeout = setTimeout(() => {
+    //   this.appGlobalService.showNewTabsSwitchPopup();
+    // }, 2000);
+  }
+
+  getFrameworkDetails(): void {
+    const frameworkDetailsRequest: FrameworkDetailsRequest = {
+      frameworkId: (this.profile && this.profile.syllabus && this.profile.syllabus[0]) ? this.profile.syllabus[0] : '',
+      requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
+    };
+    this.frameworkService.getFrameworkDetails(frameworkDetailsRequest).toPromise()
+      .then(async (framework: Framework) => {
+        this.categories = framework.categories;
+
+        if (this.profile.board && this.profile.board.length) {
+          this.boards = this.getFieldDisplayValues(this.profile.board, 0);
+        }
+        if (this.profile.medium && this.profile.medium.length) {
+          this.medium = this.getFieldDisplayValues(this.profile.medium, 1);
+        }
+        if (this.profile.grade && this.profile.grade.length) {
+          this.grade = this.getFieldDisplayValues(this.profile.grade, 2);
+        }
+      });
+  }
+
+  getFieldDisplayValues(field: Array<any>, index: number): string {
+    const displayValues = [];
+    this.categories[index].terms.forEach(element => {
+      if (field.includes(element.code)) {
+        displayValues.push(element.name);
+      }
+    });
+    return this.commonUtilService.arrayToString(displayValues);
+  }
+
+  async fetchDisplayElements() {
+    const request: ContentAggregatorRequest = {
+      interceptSearchCriteria: (contentSearchCriteria: ContentSearchCriteria) => {
+        contentSearchCriteria.board = this.profile.board;
+        contentSearchCriteria.medium = this.profile.medium;
+        contentSearchCriteria.grade = this.profile.grade;
+        contentSearchCriteria.searchType = SearchType.SEARCH;
+        contentSearchCriteria.mode = 'soft';
+        return contentSearchCriteria;
+      }, from: CachedItemRequestSourceFrom.SERVER
+    };
+
+    this.displaySections = await this.contentAggregatorHandler.newAggregate(request, AggregatorPageType.ADMIN_HOME);
+    this.displaySections = this.contentAggregatorHandler.populateIcons(this.displaySections);
+  }
+
+  onPillClick(event) {
+    switch (event.data[0].value.code) {
+      case 'program':
+        this.router.navigate([RouterLinks.PROGRAM], {});
+        this.generateTelemetry('PROGRAM_TILE_CLICKED');
+        break;
+      case 'project':
+        this.router.navigate([RouterLinks.PROJECT], {});
+        this.generateTelemetry('PROJECT_TILE_CLICKED');
+        break;
+      case 'observation':
+        this.router.navigate([RouterLinks.OBSERVATION], {});
+        this.generateTelemetry('OBSERVATION_TILE_CLICKED');
+        break;
+      case 'survey':
+        this.router.navigate([RouterLinks.SURVEY], {});
+        this.generateTelemetry('SURVEY_TILE_CLICKED');
+        break;
+      case 'report':
+        this.router.navigate([RouterLinks.REPORTS], {});
+        this.generateTelemetry('REPORTS_TILE_CLICKED');
+        break;
+      case 'course':
+        this.router.navigate([`/${RouterLinks.TABS}/${RouterLinks.COURSES}`]);
+        this.generateTelemetry('COURSE_TILE_CLICKED');
+
+      // this.router.navigate([RouterLinks.SEARCH], {
+      //   state: {
+      //     source: PageId.ADMIN_HOME,
+      //     preAppliedFilter: event.data[0].value.search
+      //   }
+      // });
+    }
+
+    
+  }
+
+  generateTelemetry(interactiveSubtype) {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      // InteractSubtype.ACTIVE_DOWNLOADS_CLICKED,
+      InteractSubtype[interactiveSubtype],
+      Environment.HOME,
+      PageId.ADMIN_HOME
+    );
+  }
+
+  navigateToViewMoreContentsPage(section) {
+    const params: NavigationExtras = {
+      state: {
+        enrolledCourses: section.data.sections[0].contents,
+        pageName: ViewMore.PAGE_COURSE_ENROLLED,
+        headerTitle: this.commonUtilService.getTranslatedValue(section.title, ''),
+        userId: this.appGlobalService.getUserId()
+      }
+    };
+    this.router.navigate([RouterLinks.VIEW_MORE_ACTIVITY], params);
+  }
+
+  handleHeaderEvents($event) {
+    switch ($event.name) {
+      case 'download':
+        this.redirectToActivedownloads();
+        break;
+      case 'notification':
+        this.redirectToNotifications();
+        break;
+      default: console.warn('Use Proper Event name');
+    }
+  }
+
+  redirectToActivedownloads() {
+    // this.telemetryGeneratorService.generateInteractTelemetry(
+    //   InteractType.TOUCH,
+    //   InteractSubtype.ACTIVE_DOWNLOADS_CLICKED,
+    //   Environment.HOME,
+    //   PageId.LIBRARY);
+    this.router.navigate([RouterLinks.ACTIVE_DOWNLOADS]);
+  }
+
+  redirectToNotifications() {
+    // this.telemetryGeneratorService.generateInteractTelemetry(
+    //   InteractType.TOUCH,
+    //   InteractSubtype.NOTIFICATION_CLICKED,
+    //   Environment.HOME,
+    //   PageId.LIBRARY);
+    this.router.navigate([RouterLinks.NOTIFICATION]);
+  }
+
+  navigateToDetailPage(event, sectionName) {
+    event.data = event.data.content ? event.data.content : event.data;
+    const item = event.data;
+    const index = event.index;
+    const identifier = item.contentId || item.identifier;
+    const values = {};
+    values['sectionName'] = sectionName;
+    values['positionClicked'] = index;
+    if (this.commonUtilService.networkInfo.isNetworkAvailable || item.isAvailableLocally) {
+      this.navService.navigateToDetailPage(item, { content: item }); // TODO
+    } else {
+      this.commonUtilService.presentToastForOffline('OFFLINE_WARNING_ETBUI_1');
+    }
+  }
+
+  ionViewWillLeave(): void {
+    this.events.unsubscribe('update_header');
+    if (this.headerObservable) {
+      this.headerObservable.unsubscribe();
+    }
+  }
+
+  ngOnDestroy() {
+    this.events.unsubscribe('onAfterLanguageChange:update');
+    if (this.headerObservable) {
+      this.headerObservable.unsubscribe();
+    }
+  }
+
+}
diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts
new file mode 100644
index 000000000..6d83db282
--- /dev/null
+++ b/src/app/home/home.module.ts
@@ -0,0 +1,46 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { Routes, RouterModule } from '@angular/router';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
+import { IonicModule } from '@ionic/angular';
+import { UserHomePage } from './user-home/user-home.page';
+import { TranslateModule } from '@ngx-translate/core';
+import { PipesModule } from '@app/pipes/pipes.module';
+import { AdminHomePage } from './admin-home/admin-home.page';
+import { CoreModule } from '../manage-learn/core/core.module';
+import { UserTypeGuard } from './user-type.guard';
+import { ComponentsModule } from '@app/app/components/components.module';
+
+const routes: Routes = [
+  {
+    path: '',
+    children: [],
+    pathMatch: 'full',
+    canActivate: [UserTypeGuard]
+  },
+  {
+    path: 'user',
+    component: UserHomePage
+  },
+  {
+    path: 'admin',
+    component: AdminHomePage
+  }
+];
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    CommonConsumptionModule,
+    ComponentsModule,
+    RouterModule.forChild(routes),
+    TranslateModule.forChild(),
+    PipesModule,
+    CoreModule
+  ],
+  declarations: [UserHomePage, AdminHomePage],
+  providers: [UserTypeGuard]
+})
+export class HomePageModule {}
diff --git a/src/app/home/user-home/user-home-spec.data.ts b/src/app/home/user-home/user-home-spec.data.ts
new file mode 100644
index 000000000..83d90c72d
--- /dev/null
+++ b/src/app/home/user-home/user-home-spec.data.ts
@@ -0,0 +1,904 @@
+export const mockUserHomeData = [
+    {
+        index: 1,
+        title: '{"en":"Browse by subject"}',
+        data: [
+            {
+                facet: 'advance tamil',
+                searchCriteria: {
+                    sortCriteria: [],
+                    searchType: 'search',
+                    offset: 0,
+                    limit: 100,
+                    impliedFiltersMap: [],
+                    impliedFilters: [],
+                    facets: [
+                        'subject',
+                        'primaryCategory'
+                    ],
+                    board: [
+                        'State (Assam)'
+                    ],
+                    medium: [
+                        'Assamese',
+                        'Bengali',
+                        'English',
+                        'Hindi'
+                    ],
+                    grade: [
+                        'Class 5',
+                        'Class 6',
+                        'Class 7',
+                        'Class 8',
+                        'Class 9',
+                        'Class 10'
+                    ],
+                    subject: [
+                        'advance tamil'
+                    ]
+                },
+                aggregate: {
+                    groupBy: 'primaryCategory'
+                }
+            },
+            {
+                facet: 'mathematics',
+                searchCriteria: {
+                    sortCriteria: [],
+                    searchType: 'search',
+                    offset: 0,
+                    limit: 100,
+                    impliedFiltersMap: [],
+                    impliedFilters: [],
+                    facets: [
+                        'subject',
+                        'primaryCategory'
+                    ],
+                    board: [
+                        'State (Assam)'
+                    ],
+                    medium: [
+                        'Assamese',
+                        'Bengali',
+                        'English',
+                        'Hindi'
+                    ],
+                    grade: [
+                        'Class 5',
+                        'Class 6',
+                        'Class 7',
+                        'Class 8',
+                        'Class 9',
+                        'Class 10'
+                    ],
+                    subject: [
+                        'mathematics'
+                    ]
+                },
+                aggregate: {
+                    groupBy: 'primaryCategory'
+                }
+            },
+            {
+                facet: 'science',
+                searchCriteria: {
+                    sortCriteria: [],
+                    searchType: 'search',
+                    offset: 0,
+                    limit: 100,
+                    impliedFiltersMap: [],
+                    impliedFilters: [],
+                    facets: [
+                        'subject',
+                        'primaryCategory'
+                    ],
+                    board: [
+                        'State (Assam)'
+                    ],
+                    medium: [
+                        'Assamese',
+                        'Bengali',
+                        'English',
+                        'Hindi'
+                    ],
+                    grade: [
+                        'Class 5',
+                        'Class 6',
+                        'Class 7',
+                        'Class 8',
+                        'Class 9',
+                        'Class 10'
+                    ],
+                    subject: [
+                        'science'
+                    ]
+                },
+                aggregate: {
+                    groupBy: 'primaryCategory'
+                }
+            },
+        ],
+        dataSrc: {
+            type: 'CONTENT_FACETS',
+            request: {
+                type: 'POST',
+                path: '/api/content/v1/search',
+                withBearerToken: true,
+                body: {
+                    request: {
+                        offset: 0,
+                        limit: 0,
+                        exists: [],
+                        facets: [
+                            'subject',
+                            'primaryCategory'
+                        ],
+                        sort_by: {},
+                        filters: {
+                            audience: [],
+                            objectType: [
+                                'Content'
+                            ],
+                            contentType: [],
+                            primaryCategory: [],
+                            gradeLevel: [
+                                'Class 5',
+                                'Class 6',
+                                'Class 7',
+                                'Class 8',
+                                'Class 9',
+                                'Class 10'
+                            ],
+                            medium: [
+                                'Assamese',
+                                'Bengali',
+                                'English',
+                                'Hindi'
+                            ],
+                            board: [
+                                'State (Assam)'
+                            ],
+                            language: [],
+                            topic: [],
+                            purpose: [],
+                            channel: [],
+                            mimeType: [],
+                            subject: []
+                        }
+                    }
+                }
+            },
+            mapping: [
+                {
+                    facet: 'subject',
+                    aggregate: {
+                        groupBy: 'primaryCategory'
+                    }
+                },
+                {
+                    facet: 'primaryCategory',
+                    aggregate: {
+                        groupBy: 'subject'
+                    }
+                }
+            ],
+            facet: 'subject'
+        },
+        theme: {
+            component: 'sb-pills-grid',
+            inputs: {
+                pillShape: 'default',
+                pillsViewType: 'scroll',
+                minDisplayCount: 10,
+                showMoreViewType: 'new_screen',
+                viewMoreText: '{"en":"View all subjects"}',
+                viewLessText: '{"en":"View Less"}',
+                pillsMultiRow: 'double_view_column'
+            },
+            children: {
+                'sb-pill-item': {
+                    inputs: {
+                        icon: 'assets/imgs/book_default.svg'
+                    },
+                    inputsMap: {
+                        icon: {
+                            german: 'assets/imgs/book_english.svg',
+                            mathematics: 'assets/imgs/calculator.svg',
+                            science: 'assets/imgs/globe.svg'
+                        },
+                        theme: {
+                            german: {
+                                iconBgColor: 'rgba(255,139,46,1)',
+                                pillBgColor: 'rgba(255,139,46,0.3)'
+                            },
+                            mathematics: {
+                                iconBgColor: 'rgba(163,99,255,1)',
+                                pillBgColor: 'rgba(163,99,255,0.3)'
+                            },
+                            science: {
+                                iconBgColor: 'rgba(34,139,255,1)',
+                                pillBgColor: 'rgba(34,139,255,0.3)'
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    },
+    {
+        index: 2,
+        title: '{"en":"Browse by category"}',
+        data: [
+            {
+                facet: 'digital textbook',
+                searchCriteria: {
+                    sortCriteria: [],
+                    searchType: 'search',
+                    offset: 0,
+                    limit: 100,
+                    impliedFiltersMap: [],
+                    impliedFilters: [],
+                    facets: [
+                        'subject',
+                        'primaryCategory'
+                    ],
+                    board: [
+                        'State (Assam)'
+                    ],
+                    medium: [
+                        'Assamese',
+                        'Bengali',
+                        'English',
+                        'Hindi'
+                    ],
+                    grade: [
+                        'Class 5',
+                        'Class 6',
+                        'Class 7',
+                        'Class 8',
+                        'Class 9',
+                        'Class 10'
+                    ],
+                    primaryCategory: [
+                        'digital textbook'
+                    ]
+                },
+                aggregate: {
+                    groupBy: 'subject'
+                }
+            },
+            {
+                facet: 'explanation content',
+                searchCriteria: {
+                    sortCriteria: [],
+                    searchType: 'search',
+                    offset: 0,
+                    limit: 100,
+                    impliedFiltersMap: [],
+                    impliedFilters: [],
+                    facets: [
+                        'subject',
+                        'primaryCategory'
+                    ],
+                    board: [
+                        'State (Assam)'
+                    ],
+                    medium: [
+                        'Assamese',
+                        'Bengali',
+                        'English',
+                        'Hindi'
+                    ],
+                    grade: [
+                        'Class 5',
+                        'Class 6',
+                        'Class 7',
+                        'Class 8',
+                        'Class 9',
+                        'Class 10'
+                    ],
+                    primaryCategory: [
+                        'explanation content'
+                    ]
+                },
+                aggregate: {
+                    groupBy: 'subject'
+                }
+            },
+            {
+                facet: 'learning resource',
+                searchCriteria: {
+                    sortCriteria: [],
+                    searchType: 'search',
+                    offset: 0,
+                    limit: 100,
+                    impliedFiltersMap: [],
+                    impliedFilters: [],
+                    facets: [
+                        'subject',
+                        'primaryCategory'
+                    ],
+                    board: [
+                        'State (Assam)'
+                    ],
+                    medium: [
+                        'Assamese',
+                        'Bengali',
+                        'English',
+                        'Hindi'
+                    ],
+                    grade: [
+                        'Class 5',
+                        'Class 6',
+                        'Class 7',
+                        'Class 8',
+                        'Class 9',
+                        'Class 10'
+                    ],
+                    primaryCategory: [
+                        'learning resource'
+                    ]
+                },
+                aggregate: {
+                    groupBy: 'subject'
+                }
+            }
+        ],
+        dataSrc: {
+            type: 'CONTENT_FACETS',
+            request: {
+                type: 'POST',
+                path: '/api/content/v1/search',
+                withBearerToken: true,
+                body: {
+                    request: {
+                        offset: 0,
+                        limit: 0,
+                        exists: [],
+                        facets: [
+                            'subject',
+                            'primaryCategory'
+                        ],
+                        sort_by: {},
+                        filters: {
+                            audience: [],
+                            objectType: [
+                                'Content'
+                            ],
+                            contentType: [],
+                            primaryCategory: [],
+                            gradeLevel: [
+                                'Class 5',
+                                'Class 6',
+                                'Class 7',
+                                'Class 8',
+                                'Class 9',
+                                'Class 10'
+                            ],
+                            medium: [
+                                'Assamese',
+                                'Bengali',
+                                'English',
+                                'Hindi'
+                            ],
+                            board: [
+                                'State (Assam)'
+                            ],
+                            language: [],
+                            topic: [],
+                            purpose: [],
+                            channel: [],
+                            mimeType: [],
+                            subject: []
+                        }
+                    }
+                }
+            },
+            mapping: [
+                {
+                    facet: 'subject',
+                    aggregate: {
+                        groupBy: 'primaryCategory'
+                    }
+                },
+                {
+                    facet: 'primaryCategory',
+                    aggregate: {
+                        groupBy: 'subject'
+                    }
+                }
+            ],
+            facet: 'primaryCategory'
+        },
+        theme: {
+            component: 'sb-pills-grid',
+            inputs: {
+                pillShape: 'image_overlap',
+                pillsViewType: 'scroll'
+            },
+            children: {
+                'sb-pill-item': {
+                    inputs: {
+                        icon: 'assets/imgs/all_content.svg',
+                        theme: {
+                            iconBgColor: '#FFFFFF',
+                            pillBgColor: '#FFFFFF'
+                        }
+                    },
+                    inputsMap: {
+                        icon: {
+                            'digital textbooks': 'assets/imgs/textbook.svg',
+                            courses: 'assets/imgs/course.svg',
+                            'tv programs': 'assets/imgs/tv.svg',
+                            documents: 'assets/imgs/documents.svg',
+                            videos: 'assets/imgs/videos.svg'
+                        }
+                    }
+                }
+            }
+        }
+    },
+    {
+        index: 3,
+        title: '{"en":"Recently viewed"}',
+        data: {
+            name: '3',
+            sections: [
+                {
+                    name: '3',
+                    count: 1,
+                    contents: [
+                        {
+                            identifier: 'do_31263780400280371213182',
+                            name: '  ঘৰ্ষণ  ',
+                            contentData: {
+                                ownershipType: [
+                                    'createdBy'
+                                ],
+                                copyright: 'Assam',
+                                previewUrl: 'https://ntpproductionall.blob.core.windows.net/ntp-content-production/content/ecml/do_31263780400280371213182-latest',
+                                keywords: [
+                                    'ঘৰ্ষণ',
+                                    'friction'
+                                ],
+                                subject: [
+                                    'Science'
+                                ],
+                                channel: '01254290140407398431',
+                                downloadUrl: 'https://ntpproductionall.blob.core.windows.net/ntp-content-production/ecar_files/do_31263780400280371213182/ghrssnn_1545651414136_do_31263780400280371213182_1.0.ecar',
+                                questions: [
+                                    {
+                                        identifier: 'do_31266189546487808011948',
+                                        name: 'ঘুৰ্ণি  ঘৰ্ষণ, স্থিতি ঘৰ্ষণ আৰু পিছল ঘৰ্ষণৰ বল অধঃক্ৰমত সজালে শুদ্ধ ক্ৰমটো হব -\n',
+                                        description: null,
+                                        objectType: 'AssessmentItem',
+                                        relation: 'associatedTo',
+                                        status: 'Live'
+                                    },
+                                    {
+                                        identifier: 'do_31266190753464320011998',
+                                        name: 'এখন পুতলা গাড়ীমাৰ্বলৰ তিতা মাজিয়া, মাৰ্বলৰ শুকাণ মাজিয়া আৰু মাৰ্বলৰ মজিয়াৰ ওপৰত বাতৰি কাকত পাৰি চলোৱা হ\'ল ৷ পুতলা গাড়ীখনত ক্ৰিয়াকৰা ঘৰ্ষণবল উৰ্দ্ধক্ৰমত সজালে ক্ৰমটো হব-\n',
+                                        description: 'MCQ',
+                                        objectType: 'AssessmentItem',
+                                        relation: 'associatedTo',
+                                        status: 'Live'
+                                    },
+                                    {
+                                        identifier: 'do_31263780961204633622999',
+                                        name: 'এটা যন্ত্ৰৰ লৰচৰ কৰা অংশ সমুহৰ মাজত লুব্ৰিকেন্ট ব্য়ৱহাৰ কৰি ঘৰ্ষণ-\n\n \n\nসৃষ্টি কৰিব পাৰি\n\n \n',
+                                        description: null,
+                                        objectType: 'AssessmentItem',
+                                        relation: 'associatedTo',
+                                        status: 'Live'
+                                    },
+                                    {
+                                        identifier: 'do_31263786605568000023033',
+                                        name: 'জোতাৰ খাজ কটা তলি খন--------------- ব্য়ৱহৃত হয়\n\n\n \n\n \n',
+                                        description: null,
+                                        objectType: 'AssessmentItem',
+                                        relation: 'associatedTo',
+                                        status: 'Live'
+                                    },
+                                    {
+                                        identifier: 'do_31263781552818585613190',
+                                        name: '৩) ‘টনা বল\'  ক  সাধাৰণতে কোৱা হয়\n',
+                                        description: null,
+                                        objectType: 'AssessmentItem',
+                                        relation: 'associatedTo',
+                                        status: 'Live'
+                                    },
+                                    {
+                                        identifier: 'do_31263781279417139213189',
+                                        name: 'চকা সংযুক্ত বয় বস্তুৰ টোপোলা বা বেগ আদি টানি নিয়াটো সুবিধাজনক হয় কাৰণ -\n\n \n\n \n',
+                                        description: null,
+                                        objectType: 'AssessmentItem',
+                                        relation: 'associatedTo',
+                                        status: 'Live'
+                                    },
+                                    {
+                                        identifier: 'do_31266186681373491211943',
+                                        name: 'ঘৰ্ষণ বাঢ়ি যায়-\n',
+                                        description: null,
+                                        objectType: 'AssessmentItem',
+                                        relation: 'associatedTo',
+                                        status: 'Live'
+                                    }
+                                ],
+                                organisation: [
+                                    'Assam'
+                                ],
+                                language: [
+                                    'English'
+                                ],
+                                mimeType: 'application/vnd.ekstep.ecml-archive',
+                                variants: {
+                                    spine: {
+                                        ecarUrl: 'https://ntpproductionall.blob.core.windows.net/ntp-content-production/ecar_files/do_31263780400280371213182/ghrssnn_1545651414234_do_31263780400280371213182_1.0_spine.ecar',
+                                        size: 3874
+                                    }
+                                },
+                                editorState: '{"plugin":{"noOfExtPlugins":13,"extPlugins":[{"plugin":"org.ekstep.contenteditorfunctions","version":"1.2"},{"plugin":"org.ekstep.keyboardshortcuts","version":"1.0"},{"plugin":"org.ekstep.richtext","version":"1.0"},{"plugin":"org.ekstep.iterator","version":"1.0"},{"plugin":"org.ekstep.navigation","version":"1.0"},{"plugin":"org.ekstep.mathtext","version":"1.0"},{"plugin":"org.ekstep.libs.ckeditor","version":"1.0"},{"plugin":"org.ekstep.questionunit","version":"1.0"},{"plugin":"org.ekstep.keyboard","version":"1.0"},{"plugin":"org.ekstep.questionunit.mcq","version":"1.1"},{"plugin":"org.ekstep.questionunit.mtf","version":"1.1"},{"plugin":"org.ekstep.questionunit.reorder","version":"1.0"},{"plugin":"org.ekstep.questionunit.sequence","version":"1.0"}]},"stage":{"noOfStages":2,"currentStage":"81481683-2c99-469a-a347-89b95cdb1b0e","selectedPluginObject":"cc584527-ec1a-47ba-97cb-e2d14c1003c8"},"sidebar":{"selectedMenu":"settings"}}',
+                                objectType: 'Content',
+                                gradeLevel: [
+                                    'Class 8'
+                                ],
+                                appIcon: 'https://ntpproductionall.blob.core.windows.net/ntp-content-production/content/do_31263780400280371213182/artifact/hhhh_1545643284557.thumb.jpg',
+                                primaryCategory: 'Learning Resource',
+                                collections: [
+                                    {
+                                        identifier: 'do_3126590295958650881129',
+                                        name: 'বিজ্ঞান (অষ্টম শ্ৰেণীৰ পাঠ্য়পুথি)/ Science (Class-8)',
+                                        description: 'Enter description for TextBook ',
+                                        objectType: 'Collection',
+                                        relation: 'hasSequenceMember',
+                                        status: 'Live'
+                                    },
+                                    {
+                                        identifier: 'do_31266212998540492812007',
+                                        name: 'unit three',
+                                        description: 'this is for testing',
+                                        objectType: 'Content',
+                                        relation: 'hasSequenceMember',
+                                        status: 'Retired'
+                                    }
+                                ],
+                                appId: 'prod.diksha.portal',
+                                contentEncoding: 'gzip',
+                                artifactUrl: 'https://ntpproductionall.blob.core.windows.net/ntp-content-production/content/do_31263780400280371213182/artifact/1545651413930_do_31263780400280371213182.zip',
+                                sYS_INTERNAL_LAST_UPDATED_ON: '2019-11-08T01:31:01.556+0000',
+                                contentType: 'Resource',
+                                identifier: 'do_31263780400280371213182',
+                                lastUpdatedBy: '59cb2df2-db4e-416c-a704-728656eebb3a',
+                                audience: [
+                                    'Student'
+                                ],
+                                visibility: 'Default',
+                                author: 'Assam',
+                                consumerId: 'e85bcfb5-a8c2-4e65-87a2-0ebb43b45f01',
+                                mediaType: 'content',
+                                osId: 'org.ekstep.quiz.app',
+                                languageCode: [
+                                    'en'
+                                ],
+                                lastPublishedBy: '6180f7a4-d3ee-4e90-a9f5-a70d55e6fcae',
+                                version: 2,
+                                rejectReasons: [
+                                    'Others'
+                                ],
+                                license: 'CC BY 4.0',
+                                prevState: 'Review',
+                                size: 411887,
+                                lastPublishedOn: '2018-12-24T11:36:54.135+0000',
+                                name: '  ঘৰ্ষণ  ',
+                                rejectComment: 'as instructed',
+                                topic: [
+                                    'Friction'
+                                ],
+                                status: 'Live',
+                                totalQuestions: 7,
+                                code: 'org.sunbird.KH7gCe',
+                                description: 'Multiple Choice Question',
+                                streamingUrl: 'https://ntpproductionall.blob.core.windows.net/ntp-content-production/content/ecml/do_31263780400280371213182-latest',
+                                medium: [
+                                    'Assamese'
+                                ],
+                                posterImage: 'https://ntpproductionall.blob.core.windows.net/ntp-content-production/content/do_31266190978555904011954/artifact/hhhh_1545643284557.jpg',
+                                idealScreenSize: 'normal',
+                                createdOn: '2018-11-20T07:58:03.935+0000',
+                                copyrightYear: 2019,
+                                contentDisposition: 'inline',
+                                lastUpdatedOn: '2018-12-24T11:36:41.281+0000',
+                                dialcodeRequired: 'No',
+                                owner: 'Lakshmi Kanta Das',
+                                createdFor: [
+                                    '01254290140407398431'
+                                ],
+                                creator: 'Lakshmi Kanta Das',
+                                os: [
+                                    'All'
+                                ],
+                                totalScore: 7,
+                                pkgVersion: 1,
+                                versionKey: '1545651401281',
+                                idealScreenDensity: 'hdpi',
+                                framework: 'as_k-12',
+                                s3Key: 'ecar_files/do_31263780400280371213182/ghrssnn_1545651414136_do_31263780400280371213182_1.0.ecar',
+                                me_averageRating: 4,
+                                lastSubmittedOn: '2018-12-24T11:34:21.568+0000',
+                                createdBy: '59cb2df2-db4e-416c-a704-728656eebb3a',
+                                compatibilityLevel: 2,
+                                ownedBy: '59cb2df2-db4e-416c-a704-728656eebb3a',
+                                board: 'State (Assam)',
+                                resourceType: 'Test',
+                                licenseDetails: {
+                                    name: 'CC BY 4.0',
+                                    url: 'https://creativecommons.org/licenses/by/4.0/legalcode',
+                                    description: 'For details see below:'
+                                },
+                                trackable: {
+                                    enabled: 'No'
+                                },
+                                cardImg: 'https://ntpproductionall.blob.core.windows.net/ntp-content-production/content/do_31263780400280371213182/artifact/hhhh_1545643284557.thumb.jpg'
+                            },
+                            isUpdateAvailable: false,
+                            mimeType: 'application/vnd.ekstep.ecml-archive',
+                            basePath: '',
+                            primaryCategory: 'learning resource',
+                            contentType: 'resource',
+                            isAvailableLocally: false,
+                            referenceCount: 0,
+                            sizeOnDevice: 0,
+                            lastUsedTime: 1613459367380,
+                            lastUpdatedTime: 0
+                        }
+                    ]
+                }
+            ]
+        },
+        dataSrc: {
+            type: 'RECENTLY_VIEWED_CONTENTS',
+            mapping: []
+        },
+        theme: {
+            component: 'sb-library-cards-hlist',
+            inputs: {
+                type: 'mobile_textbook',
+                viewMoreButtonText: '{"en":"View all"}',
+                maxCardCount: 10,
+                viewMoreButtonPosition: 'right'
+            }
+        }
+    },
+    {
+        index: 3,
+        title: '{"en":"Continue"}',
+        data: {
+            name: '4',
+            sections: [
+                {
+                    name: '4',
+                    count: 1,
+                    contents: [
+                        {
+                            identifier: 'do_31263780400280371213182',
+                            name: '  ঘৰ্ষণ  ',
+                            contentData: {
+                                ownershipType: [
+                                    'createdBy'
+                                ],
+                                copyright: 'Assam',
+                                previewUrl: 'https://ntpproductionall.blob.core.windows.net/ntp-content-production/content/ecml/do_31263780400280371213182-latest',
+                                keywords: [
+                                    'ঘৰ্ষণ',
+                                    'friction'
+                                ],
+                                subject: [
+                                    'Science'
+                                ],
+                                channel: '01254290140407398431',
+                                downloadUrl: 'https://ntpproductionall.blob.core.windows.net/ntp-content-production/ecar_files/do_31263780400280371213182/ghrssnn_1545651414136_do_31263780400280371213182_1.0.ecar',
+                                questions: [
+                                    {
+                                        identifier: 'do_31266189546487808011948',
+                                        name: 'ঘুৰ্ণি  ঘৰ্ষণ, স্থিতি ঘৰ্ষণ আৰু পিছল ঘৰ্ষণৰ বল অধঃক্ৰমত সজালে শুদ্ধ ক্ৰমটো হব -\n',
+                                        description: null,
+                                        objectType: 'AssessmentItem',
+                                        relation: 'associatedTo',
+                                        status: 'Live'
+                                    },
+                                    {
+                                        identifier: 'do_31266190753464320011998',
+                                        name: 'এখন পুতলা গাড়ীমাৰ্বলৰ তিতা মাজিয়া, মাৰ্বলৰ শুকাণ মাজিয়া আৰু মাৰ্বলৰ মজিয়াৰ ওপৰত বাতৰি কাকত পাৰি চলোৱা হ\'ল ৷ পুতলা গাড়ীখনত ক্ৰিয়াকৰা ঘৰ্ষণবল উৰ্দ্ধক্ৰমত সজালে ক্ৰমটো হব-\n',
+                                        description: 'MCQ',
+                                        objectType: 'AssessmentItem',
+                                        relation: 'associatedTo',
+                                        status: 'Live'
+                                    },
+                                    {
+                                        identifier: 'do_31263780961204633622999',
+                                        name: 'এটা যন্ত্ৰৰ লৰচৰ কৰা অংশ সমুহৰ মাজত লুব্ৰিকেন্ট ব্য়ৱহাৰ কৰি ঘৰ্ষণ-\n\n \n\nসৃষ্টি কৰিব পাৰি\n\n \n',
+                                        description: null,
+                                        objectType: 'AssessmentItem',
+                                        relation: 'associatedTo',
+                                        status: 'Live'
+                                    },
+                                    {
+                                        identifier: 'do_31263786605568000023033',
+                                        name: 'জোতাৰ খাজ কটা তলি খন--------------- ব্য়ৱহৃত হয়\n\n\n \n\n \n',
+                                        description: null,
+                                        objectType: 'AssessmentItem',
+                                        relation: 'associatedTo',
+                                        status: 'Live'
+                                    },
+                                    {
+                                        identifier: 'do_31263781552818585613190',
+                                        name: '৩) ‘টনা বল\'  ক  সাধাৰণতে কোৱা হয়\n',
+                                        description: null,
+                                        objectType: 'AssessmentItem',
+                                        relation: 'associatedTo',
+                                        status: 'Live'
+                                    },
+                                    {
+                                        identifier: 'do_31263781279417139213189',
+                                        name: 'চকা সংযুক্ত বয় বস্তুৰ টোপোলা বা বেগ আদি টানি নিয়াটো সুবিধাজনক হয় কাৰণ -\n\n \n\n \n',
+                                        description: null,
+                                        objectType: 'AssessmentItem',
+                                        relation: 'associatedTo',
+                                        status: 'Live'
+                                    },
+                                    {
+                                        identifier: 'do_31266186681373491211943',
+                                        name: 'ঘৰ্ষণ বাঢ়ি যায়-\n',
+                                        description: null,
+                                        objectType: 'AssessmentItem',
+                                        relation: 'associatedTo',
+                                        status: 'Live'
+                                    }
+                                ],
+                                organisation: [
+                                    'Assam'
+                                ],
+                                language: [
+                                    'English'
+                                ],
+                                mimeType: 'application/vnd.ekstep.ecml-archive',
+                                variants: {
+                                    spine: {
+                                        ecarUrl: 'https://ntpproductionall.blob.core.windows.net/ntp-content-production/ecar_files/do_31263780400280371213182/ghrssnn_1545651414234_do_31263780400280371213182_1.0_spine.ecar',
+                                        size: 3874
+                                    }
+                                },
+                                editorState: '{"plugin":{"noOfExtPlugins":13,"extPlugins":[{"plugin":"org.ekstep.contenteditorfunctions","version":"1.2"},{"plugin":"org.ekstep.keyboardshortcuts","version":"1.0"},{"plugin":"org.ekstep.richtext","version":"1.0"},{"plugin":"org.ekstep.iterator","version":"1.0"},{"plugin":"org.ekstep.navigation","version":"1.0"},{"plugin":"org.ekstep.mathtext","version":"1.0"},{"plugin":"org.ekstep.libs.ckeditor","version":"1.0"},{"plugin":"org.ekstep.questionunit","version":"1.0"},{"plugin":"org.ekstep.keyboard","version":"1.0"},{"plugin":"org.ekstep.questionunit.mcq","version":"1.1"},{"plugin":"org.ekstep.questionunit.mtf","version":"1.1"},{"plugin":"org.ekstep.questionunit.reorder","version":"1.0"},{"plugin":"org.ekstep.questionunit.sequence","version":"1.0"}]},"stage":{"noOfStages":2,"currentStage":"81481683-2c99-469a-a347-89b95cdb1b0e","selectedPluginObject":"cc584527-ec1a-47ba-97cb-e2d14c1003c8"},"sidebar":{"selectedMenu":"settings"}}',
+                                objectType: 'Content',
+                                gradeLevel: [
+                                    'Class 8'
+                                ],
+                                appIcon: 'https://ntpproductionall.blob.core.windows.net/ntp-content-production/content/do_31263780400280371213182/artifact/hhhh_1545643284557.thumb.jpg',
+                                primaryCategory: 'Learning Resource',
+                                collections: [
+                                    {
+                                        identifier: 'do_3126590295958650881129',
+                                        name: 'বিজ্ঞান (অষ্টম শ্ৰেণীৰ পাঠ্য়পুথি)/ Science (Class-8)',
+                                        description: 'Enter description for TextBook ',
+                                        objectType: 'Collection',
+                                        relation: 'hasSequenceMember',
+                                        status: 'Live'
+                                    },
+                                    {
+                                        identifier: 'do_31266212998540492812007',
+                                        name: 'unit three',
+                                        description: 'this is for testing',
+                                        objectType: 'Content',
+                                        relation: 'hasSequenceMember',
+                                        status: 'Retired'
+                                    }
+                                ],
+                                appId: 'prod.diksha.portal',
+                                contentEncoding: 'gzip',
+                                artifactUrl: 'https://ntpproductionall.blob.core.windows.net/ntp-content-production/content/do_31263780400280371213182/artifact/1545651413930_do_31263780400280371213182.zip',
+                                sYS_INTERNAL_LAST_UPDATED_ON: '2019-11-08T01:31:01.556+0000',
+                                contentType: 'Resource',
+                                identifier: 'do_31263780400280371213182',
+                                lastUpdatedBy: '59cb2df2-db4e-416c-a704-728656eebb3a',
+                                audience: [
+                                    'Student'
+                                ],
+                                visibility: 'Default',
+                                author: 'Assam',
+                                consumerId: 'e85bcfb5-a8c2-4e65-87a2-0ebb43b45f01',
+                                mediaType: 'content',
+                                osId: 'org.ekstep.quiz.app',
+                                languageCode: [
+                                    'en'
+                                ],
+                                lastPublishedBy: '6180f7a4-d3ee-4e90-a9f5-a70d55e6fcae',
+                                version: 2,
+                                rejectReasons: [
+                                    'Others'
+                                ],
+                                license: 'CC BY 4.0',
+                                prevState: 'Review',
+                                size: 411887,
+                                lastPublishedOn: '2018-12-24T11:36:54.135+0000',
+                                name: '  ঘৰ্ষণ  ',
+                                rejectComment: 'as instructed',
+                                topic: [
+                                    'Friction'
+                                ],
+                                status: 'Live',
+                                totalQuestions: 7,
+                                code: 'org.sunbird.KH7gCe',
+                                description: 'Multiple Choice Question',
+                                streamingUrl: 'https://ntpproductionall.blob.core.windows.net/ntp-content-production/content/ecml/do_31263780400280371213182-latest',
+                                medium: [
+                                    'Assamese'
+                                ],
+                                posterImage: 'https://ntpproductionall.blob.core.windows.net/ntp-content-production/content/do_31266190978555904011954/artifact/hhhh_1545643284557.jpg',
+                                idealScreenSize: 'normal',
+                                createdOn: '2018-11-20T07:58:03.935+0000',
+                                copyrightYear: 2019,
+                                contentDisposition: 'inline',
+                                lastUpdatedOn: '2018-12-24T11:36:41.281+0000',
+                                dialcodeRequired: 'No',
+                                owner: 'Lakshmi Kanta Das',
+                                createdFor: [
+                                    '01254290140407398431'
+                                ],
+                                creator: 'Lakshmi Kanta Das',
+                                os: [
+                                    'All'
+                                ],
+                                totalScore: 7,
+                                pkgVersion: 1,
+                                versionKey: '1545651401281',
+                                idealScreenDensity: 'hdpi',
+                                framework: 'as_k-12',
+                                s3Key: 'ecar_files/do_31263780400280371213182/ghrssnn_1545651414136_do_31263780400280371213182_1.0.ecar',
+                                me_averageRating: 4,
+                                lastSubmittedOn: '2018-12-24T11:34:21.568+0000',
+                                createdBy: '59cb2df2-db4e-416c-a704-728656eebb3a',
+                                compatibilityLevel: 2,
+                                ownedBy: '59cb2df2-db4e-416c-a704-728656eebb3a',
+                                board: 'State (Assam)',
+                                resourceType: 'Test',
+                                licenseDetails: {
+                                    name: 'CC BY 4.0',
+                                    url: 'https://creativecommons.org/licenses/by/4.0/legalcode',
+                                    description: 'For details see below:'
+                                },
+                                trackable: {
+                                    enabled: 'No'
+                                },
+                                cardImg: 'https://ntpproductionall.blob.core.windows.net/ntp-content-production/content/do_31263780400280371213182/artifact/hhhh_1545643284557.thumb.jpg'
+                            },
+                            isUpdateAvailable: false,
+                            mimeType: 'application/vnd.ekstep.ecml-archive',
+                            basePath: '',
+                            primaryCategory: 'learning resource',
+                            contentType: 'resource',
+                            isAvailableLocally: false,
+                            referenceCount: 0,
+                            sizeOnDevice: 0,
+                            lastUsedTime: 1613459367380,
+                            lastUpdatedTime: 0
+                        }
+                    ]
+                }
+            ]
+        },
+        dataSrc: {
+            type: 'TRACKABLE_COLLECTIONS',
+            mapping: []
+        },
+        theme: {
+            component: 'sb-library-cards-hlist',
+            inputs: {
+                type: 'mobile_textbook',
+                viewMoreButtonText: '{"en":"View all"}',
+                maxCardCount: 10,
+                viewMoreButtonPosition: 'right'
+            }
+        }
+    }
+
+];
diff --git a/src/app/home/user-home/user-home.page.html b/src/app/home/user-home/user-home.page.html
new file mode 100644
index 000000000..ec0a92f04
--- /dev/null
+++ b/src/app/home/user-home/user-home.page.html
@@ -0,0 +1,140 @@
+<ion-content>
+  <div class="spinner-div" *ngIf="refresh">
+      <ion-spinner icon="spiral" class="refreshspinner"></ion-spinner>
+  </div>
+  <ion-refresher #refresher slot="fixed" (ionRefresh)="doRefresh($event)">
+      <ion-refresher-content refreshingSpinner="circles"></ion-refresher-content>
+  </ion-refresher>
+  <div class="container-focus">
+    <div class="user-profile">
+      <div class="welcome-text">{{'WELCOME' | translate}}</div>
+      <div class="user-name-text">{{profile?.handle}}</div>
+    </div> 
+    
+    <div class="preference-container" *ngIf="boards">
+      <div *ngIf="this.showPreferenceInfo">{{'BROWES_RELEVANT_CONTENT' | translate: {'app_name': appLabel} }}</div>
+      <div class="user-preference">
+        <div class="preference-data">
+          <div>
+            <span>{{'YOUR_PREFERENCES' | translate}}</span>
+            <img (click)="viewPreferenceInfo()" class="p-8" src="assets/imgs/info.svg" alt="preferences-info">
+          </div>
+          <div class="filter-style"><span>{{boards}}</span><span *ngIf="medium">{{', ' +medium}}</span><span *ngIf="grade">{{', ' +grade}}</span></div>
+        </div>
+        <div class="change-btn">
+          <button (click)="editProfileDetails()" class="sb-btn sb-btn-sm sb-btn-primary-outline">change</button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <ion-list class="m-n" *ngIf="!displaySections">
+    <app-skeleton-item height="16px" width="40%" style="padding: 16px;"></app-skeleton-item>
+    <ion-item *ngFor="let i of [0,1,2,3,4,5,6,7,8]" class="animation-background">
+      <ion-avatar item-start>
+        <app-skeleton-item height="72px" width="72px"></app-skeleton-item>
+      </ion-avatar>
+      <ion-label style="padding-left: 40px;">
+        <app-skeleton-item height="12px" width="67%" style="padding-bottom: 8px;"></app-skeleton-item>
+        <app-skeleton-item height="12px" width="47%" style="padding-bottom: 8px;"></app-skeleton-item>
+      </ion-label>
+    </ion-item>
+  </ion-list>
+
+  <div class="form-api-components" *ngIf="displaySections && displaySections.length && homeDataAvailable">
+
+    <ng-container *ngFor="let section of displaySections">
+
+      <ng-container *ngIf="section?.theme?.component === 'sb-course-cards-hlist'">
+        <ng-container *ngFor="let subSection of section?.data?.sections">
+          <ng-container *ngIf="subSection?.contents?.length">
+            <sb-course-cards-hlist
+              [title]="(section?.title) | translateJson"
+              [type]="section?.theme?.inputs?.type || courseCardType.MY_COURSE_RECENTLY_VIEWED_CARD_GRID"
+              [contentList]="subSection.contents"
+              [hideProgress]="section?.theme?.inputs?.hideProgress || true"
+              [viewMoreButtonText]="(section?.theme?.inputs?.viewMoreButtonText | translateJson) || ('VIEW_ALL' | translate)"
+              [maxCardCount]="section?.theme?.inputs?.maxCardCount || 10"
+              [viewMoreButtonPosition]="section?.theme?.inputs?.viewMoreButtonPosition || ButtonPosition.RIGHT"
+              (viewMoreClick)="navigateToViewMoreContentsPage(section, subSection)"
+              (cardClick)="navigateToDetailPage($event, (subSection.name || section?.title))">
+            </sb-course-cards-hlist>
+          </ng-container>
+        </ng-container>
+      </ng-container>
+
+      <!-- Pills -->
+      <div class="heading-label" *ngIf="section?.title && section?.data?.length && section?.theme?.component === 'sb-pills-grid'">
+        <span>{{section?.title | translateJson}}</span>
+        <hr>
+      </div>
+
+      <ng-container *ngIf="section?.theme?.component === 'sb-pills-grid'">
+        <sb-pills-grid [pillShape]="section?.theme?.inputs?.pillShape"
+          [pillsViewType]="section?.theme?.inputs?.pillsViewType"
+          [selectMode]="section?.theme?.inputs?.selectMode"
+          [minDisplayCount]="section?.theme?.inputs?.minDisplayCount"
+          [viewMoreText]="section?.theme?.inputs?.viewMoreText | translateJson"
+          [viewLessText]="section?.theme?.inputs?.viewLessText | translateJson"
+          [showMoreViewType]="section?.theme?.inputs?.showMoreViewType"
+          [pillsMultiRow]="section?.theme?.inputs?.pillsMultiRow"
+          [pillBorder]="section?.theme?.inputs?.pillBorder"
+          [pillSize]="section?.theme?.inputs?.pillSize"
+          [pillTextElipsis]="section?.theme?.inputs?.pillTextElipsis"
+          [pillBoxShadow]="section?.theme?.inputs?.pillBoxShadow"
+          (viewMorePillList)="onViewMorePillList($event, section)"
+          (select)="handlePillSelect($event, section, false)">
+          <sb-pill-item *ngFor="let pillData of section?.data; let index=index" [name]="pillData?.facet | titlecase"
+                        [icon]="{ component: 'sb-pill-item', input: 'icon' } | themeInputsSelector : section?.theme : (pillData?.code || pillData?.facet)"
+                        [theme]="({ component: 'sb-pill-item', input: 'theme' } | themeInputsSelector : section?.theme : pillData?.facet) || (pillData?.facet | randomColorMapPipe: index)"
+                        [value]="pillData"></sb-pill-item>
+        </sb-pills-grid>
+      </ng-container>
+
+      <!-- Recently viewed -->
+      <div class="sb-recently-viewed-container" *ngIf="section?.data?.sections?.length && section?.data?.sections[0].contents?.length && section?.theme?.component === 'sb-library-cards-hlist'">
+        <sb-library-cards-hlist
+          [title]="section?.title | translateJson"
+          [contentList]="section?.data?.sections[0]?.contents"
+          [type]="section?.theme?.inputs?.type || LibraryCardTypes.MOBILE_TEXTBOOK"
+          [isLoading]="false"
+          [isOffline]="!commonUtilService.networkInfo.isNetworkAvailable"
+          [maxCardCount]="section?.theme?.inputs?.maxCardCount || 10"
+          [viewMoreButtonText]="(section?.theme?.inputs?.viewMoreButtonText | translateJson) || ('VIEW_ALL' | translate)"
+          [viewMoreButtonPosition]="section?.theme?.inputs?.viewMoreButtonPosition || ButtonPosition.RIGHT"
+          (viewMoreClick)="navigateToViewMoreContentsPage(section, section?.data?.sections)"
+          (cardClick)="navigateToDetailPage($event, section?.title);">
+        </sb-library-cards-hlist>
+      </div>
+
+    </ng-container>
+
+  </div>
+
+  <div *ngIf="!homeDataAvailable" class="p-16 pt-32">
+    <div class="sb-nodownloads-container" *ngIf="commonUtilService?.networkInfo?.isNetworkAvailable">
+      <div class="text-center">
+        <img style="width: 30%;" src="./assets/imgs/group.svg" alt="">
+      </div>
+      <div class="text-center">
+        <p class="sub-heading">{{'FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT' | translate }}</p>
+        <ion-button class="explore-more-books" expand="block" (click)="requestMoreContent()">
+          {{'REQUEST_CONTENT' | translate}} </ion-button>
+        <ion-button class="explore-more-content" expand="block" fill="outline" (click)="exploreOtherContents()">
+          {{'SEE_MORE_BOOKS' | translate}} </ion-button>
+      </div>
+    </div>
+
+    <div class="ion-padding ion-text-center mt-32 mb-32" style="padding-top: 34px;"
+      *ngIf="!commonUtilService?.networkInfo?.isNetworkAvailable">
+      <img src="assets/imgs/outline-cloud_off.svg" alt="" />
+      <ion-text>
+        <h6 class="offline-header">
+          <strong>{{ 'NO_INTERNET_TITLE' | translate }}</strong>
+        </h6>
+      </ion-text>
+      <p class="offline-content">{{ 'OFFLINE_WARNING_ETBUI' | translate }}</p>
+    </div>
+  </div>
+
+</ion-content>
diff --git a/src/app/home/user-home/user-home.page.scss b/src/app/home/user-home/user-home.page.scss
new file mode 100644
index 000000000..9107a77af
--- /dev/null
+++ b/src/app/home/user-home/user-home.page.scss
@@ -0,0 +1,81 @@
+@import "src/assets/styles/_variables.scss";
+.filter-style {
+  font-size: 14px;
+  font-weight: bold;
+  color: var(--app-gray);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 100%;
+  display: inline-block;
+}
+
+.user-profile {
+  padding: 0.5rem 1.5rem 0;
+  font-size: 3.2vh;
+  color: var(--app-gray);
+  .welcome-text{
+    font-size: 18px;
+  }
+  .user-name-text{
+    font-size: 24px;
+    font-weight: bold;
+  }
+}
+
+.spinner-div {
+  padding: 40px;
+  background-color: map-get($colors, light_gray);
+  text-align: center;
+  border: none !important;
+}
+
+.preference-container {
+  background-color: var(--app-primary-header);
+  margin: 0 1rem;
+  padding: 0.5rem 1rem;
+  font-size: 12px;
+  color: var(--app-gray);
+  box-shadow: 0 0 50px 0 rgba(0,0,0,0.1);
+  border-radius: 1rem;
+  .user-preference {
+    display: flex;
+    align-items: center;
+    .preference-data{
+      width: 70%;
+    }
+    .change-btn{
+      width: 30%;
+      text-align: center;
+      button{
+        color: var(--app-primary);
+      }
+    }
+  }
+}
+
+.sb-card-scroll-container {
+  overflow-x: auto;
+  padding: 0 0 8px 0;
+}
+.sb-card-recently-container {
+  .recently-viewed-card-size{
+    margin: 0 8px; 
+    min-width:288px;
+    max-width:288px;
+    &:only-child {
+      min-width: 100%;
+      max-width: calc(100vw - 32px);
+    }
+  }
+}
+
+.sb-btn-primary-outline{
+  border-color: var(--app-white);  
+}
+
+.heading-ruler{
+  width: 100%;
+  margin-left: 1rem;
+  background-color: var(--app-primary-header);
+}
\ No newline at end of file
diff --git a/src/app/home/user-home/user-home.page.spec.data.ts b/src/app/home/user-home/user-home.page.spec.data.ts
new file mode 100644
index 000000000..b998746e9
--- /dev/null
+++ b/src/app/home/user-home/user-home.page.spec.data.ts
@@ -0,0 +1,2 @@
+
+export const data = [{"title":"{\"en\":\"Continue\"}","data":[{"dateTime":1600934822230,"lastReadContentStatus":2,"enrolledDate":"2020-09-24 08:07:02:230+0000","addedBy":"6b0dbbd4-b181-4464-a3f1-a9f7aead0a28","contentId":"do_2131106194086543361226","batch":{"identifier":"01311261216033996822","endDate":"2020-10-04","createdBy":"ab467e6e-1f32-453c-b1d8-c6b5fa6c7b9e","name":"Sep21Batch","batchId":"01311261216033996822","enrollmentType":"open","startDate":"2020-09-21","status":2},"active":true,"description":"Enter description for Collection","courseLogoUrl":"https://ntpstagingall.blob.core.windows.net/ntp-content-staging/content/do_2131106194086543361226/artifact/1200x900_1560253824844.thumb.jpg","batchId":"01311261216033996822","userId":"e94ad69a-9096-491c-b107-782a67760a2b","content":{"trackable":{"enabled":"Yes"},"identifier":"do_2131106194086543361226","appIcon":"https://ntpstagingall.blob.core.windows.net/ntp-content-staging/content/do_2131106194086543361226/artifact/1200x900_1560253824844.thumb.jpg","orgDetails":{"orgName":"Odisha","email":"qa_ekstep@qualitrix.com"},"primaryCategory":"Content Playlist","leafNodesCount":5,"channel":"0124784842112040965","name":"Copy of vk-3.3CollectionTrackable1","description":"Enter description for Collection","contentType":"Collection","pkgVersion":2,"objectType":"Content"},"contentStatus":{"do_2130347595105484801947":2,"do_21304134100332544011422":2,"do_21310511410343936016":2,"do_21310511479696588814":2,"do_2131106370767011841260":2},"issuedCertificates":[],"completionPercentage":100,"courseName":"Copy of vk-3.3CollectionTrackable1","certificates":[],"completedOn":1600947469194,"leafNodesCount":5,"progress":5,"lastReadContentId":"do_2131106370767011841260","courseId":"do_2131106194086543361226","collectionId":"do_2131106194086543361226","status":2,"cardImg":"https://ntpstagingall.blob.core.windows.net/ntp-content-staging/content/do_2131106194086543361226/artifact/1200x900_1560253824844.thumb.jpg"}],"dataSrc":{"name":"TRACKABLE_CONTENTS"},"theme":{"component":"sb-pills-grid","inputs":{"pillShape":"box","pillsLayout":"grid","pillsViewType":""}}},{"title":"{\"en\":\"Learn\"}","data":[{"facet":"English","searchCriteria":{"sortCriteria":[],"searchType":"filter","offset":0,"limit":100,"impliedFiltersMap":[],"impliedFilters":[{"name":"contentType","values":[{"name":"TextBook","apply":true}]}],"contentTypes":["TextBook"],"facets":["board","medium","gradeLevel","subject","channel"],"board":["State (Andhra Pradesh)"],"medium":["English","Telugu","Urdu"],"grade":["Class 2","Class 3","Class 4","Class 5","Class 6"]},"aggregate":{"groupBy":"primaryCategory"}},{"facet":"Mathematics","searchCriteria":{"sortCriteria":[],"searchType":"filter","offset":0,"limit":100,"impliedFiltersMap":[],"impliedFilters":[{"name":"contentType","values":[{"name":"TextBook","apply":true}]}],"contentTypes":["TextBook"],"facets":["board","medium","gradeLevel","subject","channel"],"board":["State (Andhra Pradesh)"],"medium":["English","Telugu","Urdu"],"grade":["Class 2","Class 3","Class 4","Class 5","Class 6"]},"aggregate":{"groupBy":"primaryCategory"}}],"dataSrc":{"name":"SUBJECT_CONTENT_FACETS","aggregate":{"groupBy":"primaryCategory"}},"theme":{"component":"sb-pills-grid","inputs":{"pillShape":"box","pillsViewType":"grid","displayCount":6,"seeMore":"{\"en\":\"See More\"}","seeLess":"{\"en\":\"See Less\"}"}}},{"title":"{\"en\":\"Browse by category\"}","data":[{"facet":"Digital Textbooks","searchCriteria":{"sortCriteria":[],"searchType":"filter","offset":0,"limit":100,"impliedFiltersMap":[],"impliedFilters":[{"name":"contentType","values":[{"name":"TextBook","apply":true}]}],"contentTypes":["TextBook"],"facets":["board","medium","gradeLevel","subject","channel"],"board":["State (Andhra Pradesh)"],"medium":["English","Telugu","Urdu"],"grade":["Class 2","Class 3","Class 4","Class 5","Class 6"]},"aggregate":{"groupBy":"subject"}},{"facet":"Courses","searchCriteria":{"sortCriteria":[],"searchType":"filter","offset":0,"limit":100,"impliedFiltersMap":[],"impliedFilters":[{"name":"contentType","values":[{"name":"TextBook","apply":true}]}],"contentTypes":["TextBook"],"facets":["board","medium","gradeLevel","subject","channel"],"board":["State (Andhra Pradesh)"],"medium":["English","Telugu","Urdu"],"grade":["Class 2","Class 3","Class 4","Class 5","Class 6"]},"aggregate":{"groupBy":"subject"}}],"dataSrc":{"name":"PRIMARY_CATEGORY_CONTENT_FACETS","aggregate":{"groupBy":"subject"}},"theme":{"component":"sb-pills-grid","inputs":{"pillShape":"rectangle","pillsLayout":"horizontal","pillsViewType":"scroll","pillImageSide":"left"}}},{"title":"{\"en\":\"Recently viewed\"}","data":[{"ownershipType":["createdFor"],"subject":["English"],"channel":"012530141516660736208","downloadUrl":"https://ntpstagingall.blob.core.windows.net/ntp-content-staging/ecar_files/do_2127191577989529601111/15-march-book_1552631879667_do_2127191577989529601111_1.0_spine.ecar","organisation":["SAP"],"language":["English"],"variants":{"online":{"ecarUrl":"https://ntpstagingall.blob.core.windows.net/ntp-content-staging/ecar_files/do_2127191577989529601111/15-march-book_1552631879757_do_2127191577989529601111_1.0_online.ecar","size":2763},"spine":{"ecarUrl":"https://ntpstagingall.blob.core.windows.net/ntp-content-staging/ecar_files/do_2127191577989529601111/15-march-book_1552631879667_do_2127191577989529601111_1.0_spine.ecar","size":73060}},"mimeType":"application/vnd.ekstep.content-collection","objectType":"Content","appIcon":"https://ntpstagingall.blob.core.windows.net/ntp-content-staging/content/do_2127191577989529601111/artifact/1024px-sr_4409_6_wheeled_milk_wagon_didcot_railway_centre_1532407931054.thumb.jpg","gradeLevel":["Class 2"],"primaryCategory":"Digital Textbook","children":["do_212344942347632640143","do_2122952875771248641386"],"appId":"staging.diksha.portal","contentEncoding":"gzip","lockKey":"451983c3-ecc4-461b-90be-8b8cc85b725a","mimeTypesCount":"{\"application/vnd.ekstep.content-collection\":4}","contentType":"TextBook","lastUpdatedBy":"0e0ea1db-dbad-4202-bc73-dfc8b122296f","identifier":"do_2127191577989529601111","audience":["Student"],"toc_url":"https://ntpstagingall.blob.core.windows.net/ntp-content-staging/content/do_2127191577989529601111/artifact/do_2127191577989529601111toc.json","visibility":"Default","contentTypesCount":"{\"TextBookUnit\":2,\"Collection\":2}","childNodes":["do_2127191580464005121112","do_2122952875771248641386","do_2127191582091919361113","do_212344942347632640143"],"consumerId":"56ff6913-abcc-4a88-b247-c976e47cbfb4","mediaType":"content","osId":"org.ekstep.quiz.app","lastPublishedBy":"74400baf-7f32-407a-9d79-265ecd3f6952","graph_id":"domain","nodeType":"DATA_NODE","version":2,"license":"CC BY 4.0","prevState":"Review","qrCodeProcessId":"4f739d99-5540-4850-b807-5d653b0c850d","lastPublishedOn":"2019-03-15T06:37:59.430+0000","size":73060,"name":"15 March Book","status":"Live","code":"org.sunbird.juIb1Y","description":"Enter description for TextBook","medium":["English"],"posterImage":"https://ekstep-public-qa.s3-ap-south-1.amazonaws.com/content/do_212553485767499776133/artifact/1024px-sr_4409_6_wheeled_milk_wagon_didcot_railway_centre_1532407931054.jpg","idealScreenSize":"normal","createdOn":"2019-03-15T06:32:47.255+0000","reservedDialcodes":"{\"I4U8JR\":1,\"C6IT7T\":2,\"F5P1DS\":0}","contentDisposition":"inline","lastUpdatedOn":"2019-05-15T01:53:08.309+0000","SYS_INTERNAL_LAST_UPDATED_ON":"2019-10-30T04:37:15.487+0000","dialcodeRequired":"Yes","owner":"SAP","lastStatusChangedOn":"2019-06-20T08:02:16.782+0000","createdFor":["012530141516660736208"],"creator":"Helington N","os":["All"],"pkgVersion":1,"versionKey":"1557885188309","idealScreenDensity":"hdpi","s3Key":"ecar_files/do_2127191577989529601111/15-march-book_1552631879667_do_2127191577989529601111_1.0_spine.ecar","dialcodes":["F5P1DS"],"framework":"NCF","lastSubmittedOn":"2019-03-15T06:36:59.934+0000","createdBy":"0e0ea1db-dbad-4202-bc73-dfc8b122296f","additionalCategory":["Textbook"],"leafNodesCount":0,"compatibilityLevel":1,"ownedBy":"012530141516660736208","board":"CBSE","resourceType":"Book","node_id":517409,"cardImg":"https://ntpstagingall.blob.core.windows.net/ntp-content-staging/content/do_2127191577989529601111/artifact/1024px-sr_4409_6_wheeled_milk_wagon_didcot_railway_centre_1532407931054.thumb.jpg"}],"dataSrc":{"name":"RECENTLY_VIEWED_CONTENTS"},"theme":{"component":"sb-pills-grid","inputs":{"pillShape":"box","pillsLayout":"grid","pillsViewType":""}}}]
\ No newline at end of file
diff --git a/src/app/home/user-home/user-home.page.spec.ts b/src/app/home/user-home/user-home.page.spec.ts
new file mode 100644
index 000000000..4e2244a97
--- /dev/null
+++ b/src/app/home/user-home/user-home.page.spec.ts
@@ -0,0 +1,424 @@
+import { FormAndFrameworkUtilService } from './../../../services/formandframeworkutil.service';
+import {UserHomePage} from './user-home.page';
+import {AppVersion} from '@ionic-native/app-version/ngx';
+import {PopoverController} from '@ionic/angular';
+import {Events} from '@app/util/events';
+import {AppGlobalService, PageId, TelemetryGeneratorService} from '@app/services';
+import {CommonUtilService} from '../../services/common-util.service';
+import {Router} from '@angular/router';
+import {AppHeaderService} from '../../services/app-header.service';
+import {
+    FrameWorkService
+} from 'sunbird-sdk';
+import {of} from 'rxjs';
+import {NavigationService} from '../../services/navigation-handler.service';
+import {ContentAggregatorHandler} from '../../services/content/content-aggregator-handler.service';
+import {FrameworkUtilService, ProfileService, ProfileType} from '@project-sunbird/sunbird-sdk';
+import {SunbirdQRScanner} from '@app/services';
+import {mockUserHomeData} from '@app/app/home/user-home/user-home-spec.data';
+import {EventTopics} from '@app/app/app.constant';
+import { FrameworkSelectionDelegateService } from '../../profile/framework-selection/framework-selection.page';
+import { TranslateService } from '@ngx-translate/core';
+
+describe('UserHomePage', () => {
+    let userHomePage: UserHomePage;
+    const mockAppGlobalService: Partial<AppGlobalService> = {};
+    const mockAppVersion: Partial<AppVersion> = {
+        getAppName: jest.fn(() => Promise.resolve('sunbird'))
+    };
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+    const mockProfileService: Partial<ProfileService> = {
+        getActiveSessionProfile: jest.fn(() => of({profileType: 'Student'} as any))
+    };
+    const mockFrameworkService: Partial<FrameWorkService> = {};
+    const mockEvents: Partial<Events> = {
+        subscribe: jest.fn()
+    };
+    const mockHeaderService: Partial<AppHeaderService> = {};
+    const mockRouter: Partial<Router> = {};
+    const mockNavService: Partial<NavigationService> = {
+        navigateToTrackableCollection: jest.fn(),
+        navigateToCollection: jest.fn(),
+        navigateToContent: jest.fn()
+    };
+    const mockContentAggregatorHandler: Partial<ContentAggregatorHandler> = {};
+    const mockSunbirdQRScanner: Partial<SunbirdQRScanner> = {};
+    const mockPopoverController: Partial<PopoverController> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockFrameworkUtilService: Partial<FrameworkUtilService> = {};
+    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {};
+    const mockFrameworkSelectionDelegateService: Partial<FrameworkSelectionDelegateService> = {};
+    const mockTranslateService: Partial<TranslateService> = {};
+
+    beforeAll(() => {
+        userHomePage = new UserHomePage(
+            mockFrameworkService as FrameWorkService,
+            mockFrameworkUtilService as FrameworkUtilService,
+            mockProfileService as ProfileService,
+            mockCommonUtilService as CommonUtilService,
+            mockRouter as Router,
+            mockAppGlobalService as AppGlobalService,
+            mockAppVersion as AppVersion,
+            mockContentAggregatorHandler as ContentAggregatorHandler,
+            mockNavService as NavigationService,
+            mockHeaderService as AppHeaderService,
+            mockEvents as Events,
+            mockSunbirdQRScanner as SunbirdQRScanner,
+            mockPopoverController as PopoverController,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
+            mockFrameworkSelectionDelegateService as FrameworkSelectionDelegateService,
+            mockTranslateService as TranslateService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should be create an instance of HomePage', () => {
+        expect(userHomePage).toBeTruthy();
+    });
+
+    describe('viewPreferenceInfo()', () => {
+        it('should enable and disable the user prefrence information', () => {
+            // arrange
+            userHomePage.showPreferenceInfo = false;
+            // act
+            userHomePage.viewPreferenceInfo();
+            // assert
+            expect(userHomePage.showPreferenceInfo).toBeTruthy();
+        });
+    });
+
+    it('should subscribe events and when called upon', (done) => {
+        // arrange
+        mockEvents.subscribe = jest.fn((topic, fn) => {
+            if (topic === AppGlobalService.PROFILE_OBJ_CHANGED) {
+                fn();
+            } else if (topic === 'refresh:loggedInProfile') {
+                fn();
+            } else if (topic === EventTopics.TAB_CHANGE) {
+                fn('');
+            }
+        });
+        mockProfileService.getActiveSessionProfile = jest.fn(() => of({
+            uid: 'sample_uid',
+            handle: 'u1234',
+            profileType: ProfileType.TEACHER,
+            board: ['CBSE'],
+            medium: ['English'],
+            grade: ['Class 10']
+        }));
+        mockFrameworkService.getFrameworkDetails = jest.fn(() => of({
+            name: 'sample_name',
+            identifier: '12345',
+            categories: [
+                {
+                    identifier: '097',
+                    code: 'sample_code',
+                    name: 'sample_category_name',
+                    description: 'sample_category_descrption',
+                    index: 1,
+                    status: 'Live'
+                }
+            ]
+        }));
+        mockAppGlobalService.getPageIdForTelemetry = jest.fn(() => PageId.HOME);
+        mockSunbirdQRScanner.startScanner = jest.fn(() => Promise.resolve('sample_data'));
+        mockCommonUtilService.arrayToString = jest.fn(() => 'sample');
+        mockContentAggregatorHandler.newAggregate = jest.fn(() => Promise.resolve(mockUserHomeData));
+        mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+        mockAppVersion.getAppName = jest.fn(() => Promise.resolve('Sunbird'));
+        mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+        // act
+        userHomePage.ngOnInit();
+        // assert
+
+        setTimeout(() => {
+            expect(mockEvents.subscribe).toHaveBeenCalled();
+            expect(mockAppVersion.getAppName).toHaveBeenCalled();
+            expect(mockSunbirdQRScanner.startScanner).toHaveBeenCalled();
+            expect(mockProfileService.getActiveSessionProfile).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
+    it('should subscribe events, update header and getUserProfileDetails', (done) => {
+        // arrange
+        mockEvents.subscribe = jest.fn((topic, fn) => {
+            if (topic === 'update_header') {
+                fn();
+            }
+        });
+        mockRouter.navigate = jest.fn();
+        const data = jest.fn((fn => fn({name: 'download'})));
+        mockHeaderService.headerEventEmitted$ = {
+            subscribe: data
+        } as any;
+        mockHeaderService.showHeaderWithHomeButton = jest.fn();
+        mockProfileService.getActiveSessionProfile = jest.fn(() => of({
+            uid: 'sample_uid',
+            handle: 'u1234',
+            profileType: ProfileType.TEACHER,
+            board: ['CBSE'],
+            medium: ['English'],
+            grade: ['Class 10']
+        }));
+        mockFrameworkService.getFrameworkDetails = jest.fn(() => of({
+            name: 'sample_name',
+            identifier: '12345',
+            categories: [
+                {
+                    identifier: '097',
+                    code: 'sample_code',
+                    name: 'sample_category_name',
+                    description: 'sample_category_descrption',
+                    index: 1,
+                    status: 'Live'
+                }
+            ]
+        }));
+        mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+        mockCommonUtilService.arrayToString = jest.fn(() => 'sample');
+        mockContentAggregatorHandler.newAggregate = jest.fn(() => Promise.resolve(mockUserHomeData));
+        mockAppVersion.getAppName = jest.fn(() => Promise.resolve('Sunbird'));
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        // act
+        userHomePage.ionViewWillEnter();
+        // assert
+        setTimeout(() => {
+            expect(mockHeaderService.showHeaderWithHomeButton).toHaveBeenCalled();
+            expect(mockAppVersion.getAppName).toHaveBeenCalled();
+            expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+            expect(mockFrameworkService.getFrameworkDetails).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
+    it('should redirect to notifications and check if profileType is student', (done) => {
+        // arrange
+        mockEvents.subscribe = jest.fn((topic, fn) => {
+            if (topic === 'update_header') {
+                fn();
+            }
+        });
+        mockRouter.navigate = jest.fn();
+        const data = jest.fn((fn => fn({name: 'notification'})));
+        mockHeaderService.headerEventEmitted$ = {
+            subscribe: data
+        } as any;
+        mockHeaderService.showHeaderWithHomeButton = jest.fn();
+        mockProfileService.getActiveSessionProfile = jest.fn(() => of({
+            uid: 'sample_uid',
+            handle: 'u1234',
+            profileType: ProfileType.STUDENT,
+        }));
+        mockFrameworkService.getFrameworkDetails = jest.fn(() => of({
+            name: 'sample_name',
+            identifier: '12345',
+            categories: [
+                {
+                    identifier: '097',
+                    code: 'sample_code',
+                    name: 'sample_category_name',
+                    description: 'sample_category_descrption',
+                    index: 1,
+                    status: 'Live'
+                }
+            ]
+        }));
+        mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+        mockCommonUtilService.arrayToString = jest.fn(() => 'sample');
+        mockContentAggregatorHandler.newAggregate = jest.fn(() => Promise.resolve(mockUserHomeData));
+        mockAppVersion.getAppName = jest.fn(() => Promise.resolve('Sunbird'));
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        // act
+        userHomePage.ionViewWillEnter();
+        // assert
+        setTimeout(() => {
+            expect(mockHeaderService.showHeaderWithHomeButton).toHaveBeenCalled();
+            expect(mockRouter.navigate).toHaveBeenCalled();
+            expect(mockAppVersion.getAppName).toHaveBeenCalled();
+            expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+            expect(mockFrameworkService.getFrameworkDetails).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
+    describe('edit profile details', () => {
+        it('should allow user to change categories edit ', () => {
+            // arrange
+            userHomePage.guestUser = false;
+            mockRouter.navigate = jest.fn();
+            // act
+            userHomePage.editProfileDetails();
+            // assert
+            expect(mockRouter.navigate).toHaveBeenCalled();
+        });
+
+        it('should navigate to guest edit ', () => {
+            // arrange
+            userHomePage.guestUser = true;
+            // act
+            userHomePage.editProfileDetails();
+            // assert
+            expect(mockRouter.navigate).toHaveBeenCalled();
+        });
+    });
+
+    describe('handle pill select', () => {
+        it('should return if event or event.data is not available', () => {
+            // arrange
+            mockRouter.navigate = jest.fn();
+            // act
+            userHomePage.handlePillSelect(undefined);
+            // assert
+            expect(mockRouter.navigate).not.toHaveBeenCalled();
+        });
+
+        it('should navigate to categoryList page', () => {
+            // arrange
+            mockRouter.navigate = jest.fn();
+            // act
+            userHomePage.handlePillSelect({
+                data: [
+                    {
+                        value: 'sample_data'
+                    }
+                ]
+            }, {}, true);
+            // assert
+            expect(mockRouter.navigate).toHaveBeenCalled();
+        });
+    });
+
+    describe('navigate to viewMore contents page', () => {
+        it('should check for section.dataSrc.Type if TRACKABLE_COLLECTIONS', () => {
+            // arrange
+            mockRouter.navigate = jest.fn();
+            mockCommonUtilService.getTranslatedValue = jest.fn(() => 'Learning Resources');
+            mockAppGlobalService.getUserId = jest.fn(() => '0987');
+            // act
+            userHomePage.navigateToViewMoreContentsPage({title: '{\"en\":\"My Learning\"}', dataSrc: {type: 'TRACKABLE_COLLECTIONS'}}, {contents: ['']});
+            // assert
+            expect(mockRouter.navigate).toHaveBeenCalled();
+        });
+
+        it('should check for section.dataSrc.Type if RECENTLY_VIEWED_CONTENTS', () => {
+            // arrange
+            mockRouter.navigate = jest.fn();
+            mockCommonUtilService.getTranslatedValue = jest.fn(() => 'Recently viewed');
+            // act
+            userHomePage.navigateToViewMoreContentsPage({title: '{\"en\":\"My Learning\"}', dataSrc: {type: 'RECENTLY_VIEWED_CONTENTS'}}, {contents: ['']});
+            // assert
+            expect(mockRouter.navigate).toHaveBeenCalled();
+        });
+    });
+
+    describe('navigateToDetailsPage', () => {
+        it('navigate to navService with item if network of locally Available', () => {
+            // arrange
+            const mockEvent = {
+                index: '0',
+                data: {
+                    identifier: 'do123',
+                    content: {},
+                    isAvailableLocally: true
+                }
+            };
+            mockNavService.navigateToDetailPage = jest.fn();
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            // act
+            userHomePage.navigateToDetailPage(mockEvent, 'Mathematics');
+            // assert
+            expect(mockNavService.navigateToDetailPage).toHaveBeenCalled();
+        });
+
+        it('should show toast if offline ', () => {
+            // arrange
+            const mockEvent = {
+                index: '0',
+                data: {
+                    identifier: 'do123',
+                    content: {},
+                    isAvailableLocally: false
+                }
+            };
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: false};
+            mockCommonUtilService.presentToastForOffline = jest.fn();
+            // act
+            userHomePage.navigateToDetailPage(mockEvent, 'Mathematics');
+            // assert
+            expect(mockCommonUtilService.presentToastForOffline).toHaveBeenCalled();
+        });
+    });
+
+    it('should get data and open popover', () => {
+        // arrange
+        mockPopoverController.create = jest.fn(() => (Promise.resolve({
+            present: jest.fn(() => Promise.resolve({})),
+            onDidDismiss: jest.fn(() => Promise.resolve({})),
+        } as any)));
+        mockRouter.navigate = jest.fn();
+        // act
+        userHomePage.onViewMorePillList({data: 'sample'}, 'Mathematics');
+        // assert
+        expect(mockRouter.navigate).not.toHaveBeenCalled();
+    });
+
+    it('should show headerWithHomeButton and call UserProfileDetails', (done) => {
+        // arrange
+        mockHeaderService.showHeaderWithHomeButton = jest.fn();
+        mockProfileService.getActiveSessionProfile = jest.fn(() => of({
+            uid: 'sample_uid',
+            handle: 'u1234',
+            profileType: ProfileType.TEACHER,
+            board: ['CBSE'],
+            medium: ['English'],
+            grade: ['Class 10']
+        }));
+        mockFrameworkService.getFrameworkDetails = jest.fn(() => of({
+            name: 'sample_name',
+            identifier: '12345',
+            categories: [
+                {
+                    identifier: '097',
+                    code: 'sample_code',
+                    name: 'sample_category_name',
+                    description: 'sample_category_descrption',
+                    index: 1,
+                    status: 'Live'
+                }
+            ]
+        }));
+        mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+        mockCommonUtilService.arrayToString = jest.fn(() => 'sample');
+        mockContentAggregatorHandler.newAggregate = jest.fn(() => Promise.resolve(mockUserHomeData));
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        // act
+        userHomePage.tabViewWillEnter();
+        // assert
+        setTimeout(() => {
+            expect(mockHeaderService.showHeaderWithHomeButton).toHaveBeenCalled();
+            expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+            expect(mockFrameworkService.getFrameworkDetails).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
+    describe('doRefresh', () => {
+        it('should call doRefresh method set refresh to true fetchDisplayElements', () => {
+            // arrange
+            const refresher = {
+                target: {
+                    complete: jest.fn()
+                }
+            };
+            // act
+            userHomePage.doRefresh(refresher);
+            // assert
+            expect(userHomePage.refresh).toBe(true);
+        });
+    });
+});
diff --git a/src/app/home/user-home/user-home.page.ts b/src/app/home/user-home/user-home.page.ts
new file mode 100644
index 000000000..b6044382d
--- /dev/null
+++ b/src/app/home/user-home/user-home.page.ts
@@ -0,0 +1,631 @@
+import { CorReleationDataType, ImpressionType, PageId } from './../../../services/telemetry-constants';
+import { TelemetryGeneratorService } from './../../../services/telemetry-generator.service';
+import { Component, Inject, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import {
+  AppGlobalService,
+  AppHeaderService,
+  CommonUtilService,
+  ContentAggregatorHandler,
+  Environment,
+  FormAndFrameworkUtilService,
+  ImpressionSubtype,
+  InteractSubtype,
+  InteractType,
+  SunbirdQRScanner
+} from '@app/services';
+import {
+  ButtonPosition,
+  CourseCardGridTypes,
+  LibraryCardTypes,
+  PillShape,
+  PillsMultiRow,
+  PillsViewType,
+  SelectMode,
+  ShowMoreViewType
+} from '@project-sunbird/common-consumption-v8';
+import {NavigationExtras, Router} from '@angular/router';
+import {
+  CachedItemRequestSourceFrom,
+  ContentAggregatorRequest,
+  ContentSearchCriteria,
+  CorrelationData,
+  Framework,
+  FrameworkCategoryCode,
+  FrameworkCategoryCodesGroup,
+  FrameworkDetailsRequest,
+  FrameworkService,
+  FrameworkUtilService,
+  GetFrameworkCategoryTermsRequest,
+  Profile,
+  ProfileService,
+  ProfileType,
+  SearchType
+} from '@project-sunbird/sunbird-sdk';
+import {
+  AudienceFilter,
+  ColorMapping,
+  EventTopics,
+  PrimaryCaregoryMapping,
+  PrimaryCategory,
+  ProfileConstants,
+  RouterLinks,
+  SubjectMapping,
+  ViewMore
+} from '../../app.constant';
+import {AppVersion} from '@ionic-native/app-version/ngx';
+import {OnTabViewWillEnter} from '@app/app/tabs/on-tab-view-will-enter';
+import {AggregatorPageType} from '@app/services/content/content-aggregator-namespaces';
+import {NavigationService} from '@app/services/navigation-handler.service';
+import {IonContent as ContentView, IonRefresher, PopoverController} from '@ionic/angular';
+import {Events} from '@app/util/events';
+import {Subscription} from 'rxjs';
+import {SbSubjectListPopupComponent} from '@app/app/components/popups/sb-subject-list-popup/sb-subject-list-popup.component';
+import {CategoryTerm, FrameworkCategory} from '@project-sunbird/client-services/models/channel';
+import { FrameworkSelectionDelegateService } from './../../profile/framework-selection/framework-selection.page';
+import { TranslateService } from '@ngx-translate/core';
+
+@Component({
+  selector: 'app-user-home',
+  templateUrl: './user-home.page.html',
+  styleUrls: ['./user-home.page.scss'],
+})
+export class UserHomePage implements OnInit, OnDestroy, OnTabViewWillEnter {
+  private frameworkCategoriesMap: {[code: string]: FrameworkCategory | undefined} = {};
+
+  @ViewChild('refresher', { static: false }) refresher: IonRefresher;
+
+  aggregatorResponse = [];
+  courseCardType = CourseCardGridTypes;
+  selectedFilter: string;
+  concatProfileFilter: Array<string> = [];
+  boards: string;
+  medium: string;
+  grade: string;
+  profile: Profile;
+  guestUser: boolean;
+  appLabel: string;
+
+  displaySections?: any[];
+  headerObservable: Subscription;
+
+  pillsViewType = PillsViewType;
+  selectMode = SelectMode;
+  pillShape = PillShape;
+  @ViewChild('contentView', { static: false }) contentView: ContentView;
+  showPreferenceInfo = false;
+
+  LibraryCardTypes = LibraryCardTypes;
+  ButtonPosition = ButtonPosition;
+  ShowMoreViewType = ShowMoreViewType;
+  PillsMultiRow = PillsMultiRow;
+  audienceFilter = [];
+  newThemeTimeout: any;
+  refresh: boolean;
+  homeDataAvailable = false;
+
+  constructor(
+    @Inject('FRAMEWORK_SERVICE') private frameworkService: FrameworkService,
+    @Inject('FRAMEWORK_UTIL_SERVICE') private frameworkUtilService: FrameworkUtilService,
+    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+    public commonUtilService: CommonUtilService,
+    private router: Router,
+    private appGlobalService: AppGlobalService,
+    private appVersion: AppVersion,
+    private contentAggregatorHandler: ContentAggregatorHandler,
+    private navService: NavigationService,
+    private headerService: AppHeaderService,
+    private events: Events,
+    private qrScanner: SunbirdQRScanner,
+    private popoverCtrl: PopoverController,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+    private formAndFrameworkUtilService: FormAndFrameworkUtilService,
+    private frameworkSelectionDelegateService: FrameworkSelectionDelegateService,
+    private translate: TranslateService,
+  ) {
+  }
+
+  ngOnInit() {
+    this.events.subscribe(AppGlobalService.PROFILE_OBJ_CHANGED, () => {
+      this.getUserProfileDetails();
+    });
+
+    this.events.subscribe('refresh:loggedInProfile', () => {
+      this.getUserProfileDetails();
+    });
+
+    this.events.subscribe(EventTopics.TAB_CHANGE, (data: string) => {
+      if (data === '') {
+        this.qrScanner.startScanner(this.appGlobalService.getPageIdForTelemetry());
+      }
+    });
+  }
+
+  async ionViewWillEnter() {
+    this.events.subscribe('update_header', () => {
+      this.headerService.showHeaderWithHomeButton(['download', 'notification']);
+    });
+    this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
+      this.handleHeaderEvents(eventName);
+    });
+    this.headerService.showHeaderWithHomeButton(['download', 'notification']);
+    this.getUserProfileDetails();
+  }
+
+  doRefresh(refresher?) {
+    this.refresh = true;
+    this.fetchDisplayElements(refresher);
+  }
+
+  private async getUserProfileDetails() {
+    this.profile = await this.profileService.getActiveSessionProfile(
+      { requiredFields: ProfileConstants.REQUIRED_FIELDS }
+    ).toPromise();
+    await this.getFrameworkDetails();
+    await this.fetchDisplayElements();
+    this.guestUser = !this.appGlobalService.isUserLoggedIn();
+    if (this.guestUser) {
+      this.audienceFilter = AudienceFilter.GUEST_TEACHER;
+    } else if (this.guestUser && this.profile.profileType === ProfileType.STUDENT) {
+      this.audienceFilter = AudienceFilter.GUEST_STUDENT;
+    } else {
+      this.audienceFilter = AudienceFilter.LOGGED_IN_USER;
+    }
+    this.appVersion.getAppName()
+      .then((appName: any) => {
+        this.appLabel = appName;
+      });
+    // impression telemetry
+    this.telemetryGeneratorService.generateImpressionTelemetry(
+      ImpressionType.PAGE_LOADED,
+      ImpressionSubtype.LOCATION,
+      PageId.HOME,
+      Environment.HOME
+    );
+  }
+
+
+  editProfileDetails() {
+    if (!this.guestUser) {
+      this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.CATEGORIES_EDIT}`]);
+    } else {
+      const navigationExtras: NavigationExtras = {
+        state: {
+          profile: this.profile,
+          isCurrentUser: true
+        }
+      };
+      this.router.navigate([RouterLinks.GUEST_EDIT], navigationExtras);
+    }
+  }
+
+  private async getFrameworkDetails(frameworkId?: string) {
+    const frameworkDetailsRequest: FrameworkDetailsRequest = {
+      frameworkId: (this.profile && this.profile.syllabus && this.profile.syllabus[0]) ? this.profile.syllabus[0] : '',
+      requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
+    };
+    await this.frameworkService.getFrameworkDetails(frameworkDetailsRequest).toPromise()
+      .then(async (framework: Framework) => {
+        this.frameworkCategoriesMap = framework.categories.reduce((acc, category) => {
+          acc[category.code] = category;
+          return acc;
+        }, {});
+
+        if (this.profile.board && this.profile.board.length) {
+          this.boards = this.commonUtilService.arrayToString(this.getFieldDisplayValues(this.profile.board, 'board'));
+        }
+        if (this.profile.medium && this.profile.medium.length) {
+          this.medium = this.commonUtilService.arrayToString(this.getFieldDisplayValues(this.profile.medium, 'medium'));
+        }
+        if (this.profile.grade && this.profile.grade.length) {
+          this.grade = this.commonUtilService.arrayToString(this.getFieldDisplayValues(this.profile.grade, 'gradeLevel'));
+        }
+      });
+  }
+
+  getFieldDisplayValues(field: Array<any>, categoryCode: string, lowerCase?: boolean): any[] {
+    const displayValues = [];
+
+    if (!this.frameworkCategoriesMap[categoryCode]) {
+      return displayValues;
+    }
+
+    this.frameworkCategoriesMap[categoryCode].terms.forEach(element => {
+      if (field.includes(element.code)) {
+        if (lowerCase) {
+          element.name = element.name.toLowerCase();
+        }
+        displayValues.push(element.name);
+      }
+    });
+
+    return displayValues;
+  }
+
+  private async fetchDisplayElements(refresher?) {
+    this.displaySections = undefined;
+    const request: ContentAggregatorRequest = {
+      userPreferences: {
+        board: this.getFieldDisplayValues(this.profile.board, 'board', true),
+        medium: this.getFieldDisplayValues(this.profile.medium, 'medium', true),
+        gradeLevel: this.getFieldDisplayValues(this.profile.grade, 'gradeLevel', true),
+        subject: this.getFieldDisplayValues(this.profile.subject, 'subject', true),
+      },
+      interceptSearchCriteria: (contentSearchCriteria: ContentSearchCriteria) => {
+        contentSearchCriteria.board = this.getFieldDisplayValues(this.profile.board, 'board', true);
+        contentSearchCriteria.medium = this.getFieldDisplayValues(this.profile.medium, 'medium', true);
+        contentSearchCriteria.grade = this.getFieldDisplayValues(this.profile.grade, 'gradeLevel', true);
+        return contentSearchCriteria;
+      }, from: refresher ? CachedItemRequestSourceFrom.SERVER : CachedItemRequestSourceFrom.CACHE
+    };
+    let displayItems = await this.contentAggregatorHandler.newAggregate(request, AggregatorPageType.HOME);
+    displayItems = this.mapContentFacteTheme(displayItems);
+    this.checkHomeData(displayItems);
+    this.displaySections = displayItems;
+    this.refresh = false;
+    refresher ? refresher.target.complete() : null;
+  }
+
+  handlePillSelect(event, section, isFromPopover: boolean) {
+    if (!event || !event.data || !event.data.length) {
+      return;
+    }
+    const corRelationList: Array<CorrelationData> = [];
+    corRelationList.push({
+      id: event.data[0].name || '',
+      type: isFromPopover ? CorReleationDataType.SUBJECT : CorReleationDataType.CATEGORY});
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      isFromPopover ? InteractType.SELECT_ATTRIBUTE : InteractType.SELECT_CATEGORY,
+      isFromPopover ? '' : event.data[0].name,
+      Environment.HOME,
+      PageId.HOME,
+      undefined, undefined, undefined,
+      isFromPopover ? corRelationList : undefined
+    );
+    const params = {
+      code: section.code,
+      formField: event.data[0].value,
+      fromLibrary: false,
+      description: (section && section.description) || ''
+    };
+    this.router.navigate([RouterLinks.CATEGORY_LIST], { state: params });
+  }
+
+  navigateToViewMoreContentsPage(section, subsection) {
+    let state = {};
+    switch (section.dataSrc.type) {
+      case 'TRACKABLE_COLLECTIONS':
+        state = {
+          enrolledCourses: subsection.contents,
+          pageName: ViewMore.PAGE_COURSE_ENROLLED,
+          headerTitle: this.commonUtilService.getTranslatedValue(section.title, ''),
+          userId: this.appGlobalService.getUserId()
+        };
+        break;
+      case 'RECENTLY_VIEWED_CONTENTS':
+        state = {
+          requestParams: {
+            request: {
+              searchType: SearchType.FILTER,
+              offset: 0
+            }
+          },
+          pageName: ViewMore.PAGE_TV_PROGRAMS,
+          headerTitle: this.commonUtilService.getTranslatedValue(section.title, ''),
+        };
+        break;
+    }
+
+    const values = new Map();
+    values['SectionName'] = JSON.parse(section.title)['en'];
+    this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
+      InteractSubtype.VIEWALL_CLICKED,
+      Environment.HOME,
+      PageId.HOME, undefined,
+      values);
+    const params: NavigationExtras = {
+      state
+    };
+    this.router.navigate([RouterLinks.VIEW_MORE_ACTIVITY], params);
+  }
+
+  navigateToDetailPage(event, sectionName) {
+    event.data = event.data.content ? event.data.content : event.data;
+    const item = event.data;
+    const index = event.index;
+    const identifier = item.contentId || item.identifier;
+    // const corRelationList = [{ id: sectionName || '', type: CorReleationDataType.SECTION }];
+    const values = {};
+    values['sectionName'] = sectionName;
+    values['positionClicked'] = index;
+    if (this.commonUtilService.networkInfo.isNetworkAvailable || item.isAvailableLocally) {
+      this.navService.navigateToDetailPage(item, { content: item }); // TODO
+      // this.navService.navigateToDetailPage(item, { content: item, corRelation: corRelationList });
+    } else {
+      this.commonUtilService.presentToastForOffline('OFFLINE_WARNING_ETBUI_1');
+    }
+  }
+
+  handleHeaderEvents($event) {
+    switch ($event.name) {
+      case 'download':
+        this.redirectToActivedownloads();
+        break;
+      case 'notification':
+        this.redirectToNotifications();
+        break;
+
+      default: console.warn('Use Proper Event name');
+    }
+  }
+
+  redirectToActivedownloads() {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      InteractSubtype.ACTIVE_DOWNLOADS_CLICKED,
+      Environment.HOME,
+      PageId.HOME);
+    this.router.navigate([RouterLinks.ACTIVE_DOWNLOADS]);
+  }
+
+  redirectToNotifications() {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      InteractSubtype.SELECT_BELL,
+      Environment.HOME,
+      PageId.HOME);
+    this.router.navigate([RouterLinks.NOTIFICATION]);
+  }
+
+  ionViewWillLeave(): void {
+    this.events.unsubscribe('update_header');
+    if (this.headerObservable) {
+      this.headerObservable.unsubscribe();
+    }
+    this.refresher.disabled = true;
+  }
+
+  ngOnDestroy() {
+    if (this.headerObservable) {
+      this.headerObservable.unsubscribe();
+    }
+  }
+
+  ionViewDidLeave() {
+    if (this.newThemeTimeout && this.newThemeTimeout.clearTimeout) {
+      this.newThemeTimeout.clearTimeout();
+    }
+  }
+
+  ionViewDidEnter() {
+    // Need timer to load the newTheme screen and for the newTheme screen to hide if user comes from deeplink.
+    // this.newThemeTimeout = setTimeout(() => {
+    //   this.appGlobalService.showJoyfulPopup();
+    // }, 2000);
+    this.refresher.disabled = false;
+  }
+
+  viewPreferenceInfo() {
+    this.showPreferenceInfo = !this.showPreferenceInfo;
+  }
+
+  async onViewMorePillList(event, section) {
+    if (!event || !event.data) {
+      return;
+    }
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_VIEW_ALL,
+      '',
+      Environment.HOME,
+      PageId.HOME
+    );
+    const subjectListPopover = await this.popoverCtrl.create({
+      component: SbSubjectListPopupComponent,
+      componentProps: {
+        subjectList: event.data,
+        title: section && section.title,
+        theme: section && section.theme
+      },
+      backdropDismiss: true,
+      showBackdrop: true,
+      cssClass: 'subject-list-popup',
+    });
+    await subjectListPopover.present();
+    const { data } = await subjectListPopover.onDidDismiss();
+    this.handlePillSelect(data, section, true);
+  }
+
+  mapContentFacteTheme(displayItems) {
+    if (displayItems && displayItems.length) {
+      for (let count = 0; count < displayItems.length; count++) {
+        if (!displayItems[count].data) {
+          continue;
+        }
+        if (displayItems[count].dataSrc && (displayItems[count].dataSrc.type
+           === 'CONTENT_FACETS') && (displayItems[count].dataSrc.facet === 'subject')) {
+          displayItems[count] = this.mapSubjectTheme(displayItems[count]);
+        }
+        if (displayItems[count].dataSrc && (displayItems[count].dataSrc.type
+           === 'CONTENT_FACETS') && (displayItems[count].dataSrc.facet === 'primaryCategory')) {
+          displayItems[count] = this.mapPrimaryCategoryTheme(displayItems[count]);
+        }
+        if (displayItems[count].dataSrc && displayItems[count].dataSrc.type === 'RECENTLY_VIEWED_CONTENTS') {
+          displayItems[count] = this.modifyContentData(displayItems[count]);
+        }
+        if (displayItems[count].dataSrc && displayItems[count].dataSrc.type === 'TRACKABLE_COLLECTIONS') {
+          displayItems[count] = this.modifyCourseData(displayItems[count]);
+        }
+      }
+    }
+    return displayItems;
+  }
+
+  mapSubjectTheme(displayItems) {
+    displayItems.data.forEach(item => {
+      const subjectMap = item.facet && SubjectMapping[item.facet.toLowerCase()]
+       ? SubjectMapping[item.facet.toLowerCase()] : SubjectMapping['default'];
+      item.icon = item.icon ? item.icon : subjectMap.icon;
+      item.theme = item.theme ? item.theme : subjectMap.theme;
+      if (!item.theme) {
+        const colorTheme = ColorMapping[Math.floor(Math.random() * ColorMapping.length)];
+        item.theme = {
+          iconBgColor: colorTheme.primary,
+          pillBgColor: colorTheme.secondary
+        };
+      }
+    });
+    return displayItems;
+  }
+
+  mapPrimaryCategoryTheme(displayItems) {
+    displayItems.data.forEach(item => {
+      const primaryCaregoryMap = item.facet && PrimaryCaregoryMapping
+      [item.facet.toLowerCase()] ? PrimaryCaregoryMapping[item.facet.toLowerCase()] :
+        PrimaryCaregoryMapping['default'];
+      item.icon = item.icon ? item.icon : primaryCaregoryMap.icon;
+    });
+    return displayItems;
+  }
+
+  modifyContentData(displayItems) {
+    if (!displayItems.data.sections && !displayItems.data.sections[0] && !displayItems.data.sections[0].contents) {
+      return;
+    }
+    displayItems.data.sections[0].contents.forEach(item => {
+      item['cardImg'] = item['cardImg'] || (item.contentData && item.contentData['cardImg']);
+      item['subject'] = item['subject'] || (item.contentData && item.contentData['subject']);
+      item['gradeLevel'] = item['gradeLevel'] || (item.contentData && item.contentData['gradeLevel']);
+      item['medium'] = item['medium'] || (item.contentData && item.contentData['medium']);
+      item['organisation'] = item['organisation'] || (item.contentData && item.contentData['organisation']);
+      item['badgeAssertions'] = item['badgeAssertions'] || (item.contentData && item.contentData['badgeAssertions']);
+      item['resourceType'] = item['resourceType'] || (item.contentData && item.contentData['resourceType']);
+    });
+    return displayItems;
+  }
+
+  modifyCourseData(displayItems) {
+    if (!displayItems.data.sections && !displayItems.data.sections[0] && !displayItems.data.sections[0].contents) {
+      return;
+    }
+    displayItems.data.sections[0].contents.forEach(item => {
+      item['cardImg'] = item['cardImg'] || (item.content && item.content['appIcon']);
+    });
+    return displayItems;
+  }
+
+  checkHomeData(displayItems) {
+    this.homeDataAvailable = false;
+    for (let index = 0; index < displayItems.length; index++) {
+      if (displayItems[index] && displayItems[index].data && ((displayItems[index].data.length) ||
+        (displayItems[index].data.sections && displayItems[index].data.sections.length && displayItems[index].data.sections[0].contents && displayItems[index].data.sections[0].contents.length)
+      )) {
+        this.homeDataAvailable = true;
+        break;
+      }
+    }
+  }
+
+  async requestMoreContent() {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      InteractSubtype.LET_US_KNOW_CLICKED,
+      Environment.LIBRARY,
+      PageId.LIBRARY,
+    );
+
+    const formConfig = await this.formAndFrameworkUtilService.getContentRequestFormConfig();
+    this.appGlobalService.formConfig = formConfig;
+    this.frameworkSelectionDelegateService.delegate = this;
+    this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.FRAMEWORK_SELECTION}`],
+      {
+        state: {
+          showHeader: true,
+          corRelation: [{ id: PageId.LIBRARY, type: CorReleationDataType.FROM_PAGE }],
+          title: this.commonUtilService.translateMessage('FRMELEMNTS_LBL_REQUEST_CONTENT'),
+          subTitle: this.commonUtilService.translateMessage('FRMELEMNTS_LBL_RELEVANT_CONTENT_SUB_HEADING'),
+          formConfig,
+          submitDetails: {
+            label: this.commonUtilService.translateMessage('BTN_SUBMIT')
+          }
+        }
+      });
+  }
+
+  async onFrameworkSelectionSubmit(formInput: any, formOutput: any, router: Router, commonUtilService: CommonUtilService,
+    telemetryGeneratorService: TelemetryGeneratorService, corRelation: Array<CorrelationData>) {
+    if (!commonUtilService.networkInfo.isNetworkAvailable) {
+      await commonUtilService.showToast('OFFLINE_WARNING_ETBUI');
+      return;
+    }
+    const selectedCorRelation: Array<CorrelationData> = [];
+
+    if (formOutput['children']) {
+      for (const key in formOutput['children']) {
+        if (formOutput[key] && formOutput['children'][key]['other']) {
+          formOutput[key] = formOutput['children'][key]['other'];
+        }
+      }
+
+      delete formOutput['children'];
+    }
+
+    for (const key in formOutput) {
+      if (typeof formOutput[key] === 'string') {
+        selectedCorRelation.push({ id: formOutput[key], type: key });
+      } else if (typeof formOutput[key] === 'object' && formOutput[key].name) {
+        selectedCorRelation.push({ id: formOutput[key].name, type: key });
+      }
+    }
+    telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      InteractSubtype.SUBMIT_CLICKED,
+      Environment.HOME,
+      PageId.FRAMEWORK_SELECTION,
+      undefined,
+      undefined,
+      undefined,
+      selectedCorRelation);
+    const params = {
+      formInput,
+      formOutput,
+      corRelation
+    };
+    router.navigate([`/${RouterLinks.RESOURCES}/${RouterLinks.RELEVANT_CONTENTS}`], { state: params });
+  }
+
+  async exploreOtherContents() {
+    const categories: Array<FrameworkCategoryCode> = FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES;
+    const syllabus: Array<string> = this.appGlobalService.getCurrentUser().syllabus;
+    const frameworkId = (syllabus && syllabus.length) ? syllabus[0] : undefined;
+
+    const navigationExtras = {
+      state: {
+        subjects: await this.getFrameworkData(frameworkId, categories, FrameworkCategoryCode.SUBJECT),
+        categoryGradeLevels:  await this.getFrameworkData(frameworkId, categories, FrameworkCategoryCode.GRADE_LEVEL),
+        primaryCategories: PrimaryCategory.FOR_LIBRARY_TAB,
+        selectedGrade: this.profile.grade,
+        selectedMedium: this.profile.medium
+      }
+    };
+    this.router.navigate([RouterLinks.EXPLORE_BOOK], navigationExtras);
+  }
+
+  async getFrameworkData(frameworkId, requiredCategories, currentCategoryCode): Promise<CategoryTerm[]> {
+    const req: GetFrameworkCategoryTermsRequest = {
+      currentCategoryCode,
+      language: this.translate.currentLang,
+      requiredCategories,
+      frameworkId
+    };
+    try {
+      return await this.frameworkUtilService.getFrameworkCategoryTerms(req).toPromise();
+    } catch (e) {
+      console.log(e);
+      return [];
+    }
+  }
+
+  tabViewWillEnter() {
+    this.headerService.showHeaderWithHomeButton(['download', 'notification']);
+    this.getUserProfileDetails();
+  }
+}
diff --git a/src/app/home/user-type.guard.ts b/src/app/home/user-type.guard.ts
new file mode 100644
index 000000000..49bf31a98
--- /dev/null
+++ b/src/app/home/user-type.guard.ts
@@ -0,0 +1,22 @@
+import { Inject, Injectable } from '@angular/core';
+import { CanActivate, Router } from '@angular/router';
+import { PreferenceKey, RouterLinks } from '@app/app/app.constant';
+import { ProfileType, SharedPreferences } from 'sunbird-sdk';
+
+@Injectable()
+export class UserTypeGuard implements CanActivate {
+    constructor(
+        @Inject('SHARED_PREFERENCES') private sharedPreferences: SharedPreferences,
+        private router: Router
+    ) {
+    }
+    async canActivate(): Promise<boolean> {
+        const isAdminUser = (await this.sharedPreferences.getString(PreferenceKey.SELECTED_USER_TYPE).toPromise() === ProfileType.ADMIN);
+        if (isAdminUser) {
+            this.router.navigate([`/${RouterLinks.HOME_TAB}/admin`]);
+        } else {
+            this.router.navigate([`/${RouterLinks.HOME_TAB}/user`]);
+        }
+        return false;
+    }
+}
diff --git a/src/app/language-settings/language-settings.html b/src/app/language-settings/language-settings.html
index 88c8ffd43..c3fd6fb56 100644
--- a/src/app/language-settings/language-settings.html
+++ b/src/app/language-settings/language-settings.html
@@ -1,34 +1,25 @@
-<ion-content class="ion-padding">
-  <ion-title *ngIf="!isFromSettings" text-center class="app-title">{{'APP_TITLE' | translate:{'%s': appName } }}</ion-title>
-  <div class="font-size-17" text-center padding text-wrap style="padding: 0">
-    <strong>{{ 'CHOOSE_LANGUAGE' | translate }}</strong>
-  </div>
+<ion-content class="ion-padding ui-container">
+  <div class="ui-content">
+    <p *ngIf="!isFromSettings" class="app-title ion-text-center">{{'APP_TITLE' | translate:{'%s': appName } }}</p>
+    <div class="font-size-17" class="ion-text-center ion-padding ion-text-wrap" style="padding: 0">
+      <strong>{{ 'CHOOSE_LANGUAGE' | translate }}</strong>
+    </div>
 
-  <ion-radio-group [value]="language">
-    <ion-grid style="margin-bottom: 64px;">
-      <ion-row class="ion-align-self-left">
-        <ion-col size="6" *ngFor="let lang of languages">
-          <ion-card class="language-card" [class.selected]="lang.code === language" (click)="language = lang.code; onLanguageSelected();">
-            <ion-label class="gray-color">{{ lang?.label | translate }}</ion-label>
-            <ion-radio slot="end" mode="ios" [value]="lang?.code"></ion-radio>
-          </ion-card>
-        </ion-col>
-      </ion-row>
-    </ion-grid>
-  </ion-radio-group>
+    <div class="language-container">
+      <div class="language-card" (click)="language = lang.code; onLanguageSelected()" *ngFor="let lang of languages" [ngClass]="{'selected-lang': lang.code === language}">
+        <label class="language-selection" [for]="'language-selection' + lang.code">
+          <span class="label-text">
+            {{lang?.label | translate}}
+          </span>
+          <img src='assets/imgs/ic_check_white.svg' alt="check" class="icon-check">
+        </label>
+      </div>
+    </div>
 
-  <button class="sb-btn sb-btn-md sb-btn-primary PR35 W100 ellipsis text-uppercase btn-block continue"
-          [style.background-color]="btnColor" [hidden]="!isLanguageSelected" (click)="continue()">
-    <ion-grid class="ion-no-padding">
-      <ion-row class="ion-justify-content-between">
-        <ion-col class="ion-no-padding">
-          <img class="arrow-icon" src="assets/imgs/ic_back.svg" style="visibility: hidden" [class.animate]="isLanguageSelected" >
-        </ion-col>
-        <ion-col class="ion-no-padding">{{ 'CONTINUE' | translate }}</ion-col>
-        <ion-col class="ion-no-padding text-align-end ion-align-self-center">
-          <img class="arrow-icon" src="assets/imgs/ic_back.svg" [class.animate]="isLanguageSelected">
-        </ion-col>
-      </ion-row>
-    </ion-grid>
-  </button>
+    <button class="sb-btn sb-btn-md sb-btn-primary PR35 W100 ellipsis text-uppercase btn-block continue"
+            [style.background-color]="btnColor" [hidden]="!isLanguageSelected" (click)="continue()">
+      <span>{{ 'CONTINUE' | translate }}</span>
+      <img class="arrow-icon" src="assets/imgs/ic_back.svg" [class.animate]="isLanguageSelected" alt="">
+    </button>
+  </div>
 </ion-content>
diff --git a/src/app/language-settings/language-settings.scss b/src/app/language-settings/language-settings.scss
index 113a7a903..88f0b7fef 100644
--- a/src/app/language-settings/language-settings.scss
+++ b/src/app/language-settings/language-settings.scss
@@ -1,36 +1,52 @@
 @import "src/assets/styles/_variables";
 @import "src/assets/styles/_custom-mixins";
 @import "src/assets/styles/fonts";
+@import "src/assets/styles/_variables.scss";
 
-ion-content {
-  --ion-background-color: #EDF4F9;
-}
 :host {
   /* This should be item-ios only as we are targeting mode as iOS for radio-button */
 
-  img.arrow-icon{
+  img.arrow-icon {
     display: inline-block;
     width: 22px;
     margin-top: -3px;
+    float: right;
+
     &.animate {
       position: relative;
       animation: dropDown 5s linear infinite;
       animation-duration: 0.9s;
     }
-    @include rtl {
 
+    @include rtl {
       transform: rotate(180deg);
+      float: left !important;
     }
-    @include ltr {
+  }
 
-    }
+  button span {
+    width: 100%;
+    display: inline-block;
+
+    position: absolute;
+
+    top: 50%;
+    left: 50%;
+
+    transform: translate(-50%, -50%);
   }
+
   @keyframes dropDown {
-    0% {right: 0;}
-    50% {right: 10px;}
-    100% {right: 0;}
+    0% {
+      right: 0;
+    }
+    50% {
+      right: 10px;
+    }
+    100% {
+      right: 0;
+    }
   }
-
   .gray-color {
     color: #{map-get($colors, secondary_black)};
     font-size: 1rem;
@@ -42,42 +58,51 @@ ion-content {
   }
 }
 
+.language-container {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+}
 
 .language-card {
-  text-align: center;
-  position: relative;
-  margin-bottom: 0;
-  box-shadow: 0 20px 40px -10px #D8D8D8;
-  background-color: #FFFFFF;
-  ion-radio {
-    display: none;
-  }
-  ion-label {
-    padding-top: 32px;
-    padding-bottom: 32px;
-    font-size: 20px;
-    display: inline-block;
-    width: 100%;
-    text-align: center;
+  box-sizing: border-box;
+  width: 50%;
+  height: 136px;
+  padding: 5%;
+  border-radius: 16px;
+}
+
+.selected-lang {
+  .language-selection {
+    background-color: var(--app-primary) !important;
   }
-  &.selected {
-    background-color: #0076FE;
-    box-shadow: 0 20px 40px -10px rgba(2,79,157,0.3);
-    ion-label {
-      color: white;
-    }
-    ion-radio {
-      display: block;
-      position: absolute;
-      top: 8px;
-      right: 8px;
-      background: white;
-      border-radius: 100%;
-      width: 16px;
-      height: 16px;
-    }
+  .label-text {
+    color: var(--app-white) !important;
   }
 }
+
+.language-card label {
+  position: relative;
+  box-shadow: 0 20px 40px -10px map-get($colors, light_silver);
+  background-color: map-get($colors, white);
+  display: inline-block;
+  width: 100%;
+  height: 100%;
+  border-radius: 16px;
+  text-align: center;
+}
+
+.language-card span {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  font-size: 20px;
+  transform: translate(-50%, -50%);
+}
+
+.language-card input {
+  display: none;
+}
 .continue {
   position: fixed;
   z-index: 2;
@@ -89,7 +114,16 @@ ion-content {
 .app-title {
   font-size: 24px;
   font-weight: bold;
-  color: #024F9D;
+  color: $blue;
   margin-top: 5vh;
 }
 
+.icon-check {
+  visibility: visible;
+  width: auto;
+  height: auto;
+  float: right;
+  margin-top: 7px;
+  margin-right: 11px;
+}
+
diff --git a/src/app/language-settings/language-settings.spec.ts b/src/app/language-settings/language-settings.spec.ts
index 8fe208eda..404f83566 100644
--- a/src/app/language-settings/language-settings.spec.ts
+++ b/src/app/language-settings/language-settings.spec.ts
@@ -1,8 +1,9 @@
-import {LanguageSettingsPage} from '@app/app/language-settings/language-settings';
-import {SharedPreferences} from 'sunbird-sdk';
-import {TranslateService} from '@ngx-translate/core';
-import {Events, Platform} from '@ionic/angular';
-import {NgZone} from '@angular/core';
+import { LanguageSettingsPage } from './language-settings';
+import { SharedPreferences } from 'sunbird-sdk';
+import { TranslateService } from '@ngx-translate/core';
+import { Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { NgZone } from '@angular/core';
 import {
     AppHeaderService,
     CommonUtilService,
@@ -11,17 +12,30 @@ import {
     NotificationService, PageId,
     TelemetryGeneratorService
 } from '@app/services';
-import {ActivatedRoute, Router} from '@angular/router';
-import {Location} from '@angular/common';
-import {NativePageTransitions} from '@ionic-native/native-page-transitions/ngx';
-import {appLanguages, PreferenceKey, RouterLinks} from '@app/app/app.constant';
-import {of} from 'rxjs';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Location } from '@angular/common';
+import { NativePageTransitions } from '@ionic-native/native-page-transitions/ngx';
+import { appLanguages, PreferenceKey, RouterLinks } from '@app/app/app.constant';
+import { of } from 'rxjs';
+import { CorReleationDataType } from '../../services';
+import { CorrelationData } from '../../../../sunbird-mobile-sdk/src';
 
 
 describe('LanguageSettingsPage', () => {
     let languageSettingsPage: LanguageSettingsPage;
 
-    const mockPreferences: Partial<SharedPreferences> = {};
+    global.window.segmentation = {
+        init: jest.fn(),
+        SBTagService: {
+            pushTag: jest.fn(),
+            removeAllTags: jest.fn(),
+            restoreTags: jest.fn()
+        }
+    };
+
+    const mockPreferences: Partial<SharedPreferences> = {
+        putBoolean: jest.fn(() => of(undefined))
+    };
 
     const mockTranslateService: Partial<TranslateService> = {};
 
@@ -29,13 +43,21 @@ describe('LanguageSettingsPage', () => {
 
     const mockNgZone: Partial<NgZone> = {};
 
-    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateAuditTelemetry: jest.fn(),
+        generatePageLoadedTelemetry: jest.fn(),
+        generateInteractTelemetry: jest.fn()
+    };
 
     const mockPlatform: Partial<Platform> = {};
 
     const mockCommonUtilService: Partial<CommonUtilService> = {};
 
-    const mockAppHeaderService: Partial<AppHeaderService> = {};
+    const mockAppHeaderService: Partial<AppHeaderService> = {
+        hideHeader: jest.fn(),
+        showHeaderWithBackButton: jest.fn(),
+        showStatusBar: jest.fn()
+    };
 
     const mockNotificationService: Partial<NotificationService> = {};
 
@@ -45,7 +67,8 @@ describe('LanguageSettingsPage', () => {
 
     const mockLocation: Partial<Location> = {};
 
-    const mockActivatedRoute: Partial<ActivatedRoute> = {};
+    const mockActivatedRoute: Partial<ActivatedRoute> = {
+    };
 
     const mockNativeTransitions: Partial<NativePageTransitions> = {};
 
@@ -89,7 +112,7 @@ describe('LanguageSettingsPage', () => {
             Environment.ONBOARDING,
             PageId.ONBOARDING_LANGUAGE_SETTING,
             undefined,
-            {selectedLanguage: 'en'}
+            { selectedLanguage: 'en' }
         );
     });
 
@@ -106,7 +129,7 @@ describe('LanguageSettingsPage', () => {
             Environment.SETTINGS,
             PageId.SETTINGS_LANGUAGE,
             undefined,
-            {selectedLanguage: 'en'}
+            { selectedLanguage: 'en' }
         );
     });
 
@@ -123,7 +146,7 @@ describe('LanguageSettingsPage', () => {
             Environment.ONBOARDING,
             PageId.ONBOARDING_LANGUAGE_SETTING,
             undefined,
-            {previousLanguage: 'hi', currentLanguage: 'en'}
+            { previousLanguage: 'hi', currentLanguage: 'en' }
         );
     });
 
@@ -140,7 +163,7 @@ describe('LanguageSettingsPage', () => {
             Environment.SETTINGS,
             PageId.SETTINGS_LANGUAGE,
             undefined,
-            {previousLanguage: '', currentLanguage: 'en'}
+            { previousLanguage: '', currentLanguage: 'en' }
         );
     });
 
@@ -171,35 +194,35 @@ describe('LanguageSettingsPage', () => {
 
     it('should call set initial available languages and call getString method from ' +
         'sharedPreferences to check if language available or not', (done) => {
-        // arrange
-        languageSettingsPage.languages = appLanguages;
-        mockNgZone.run = jest.fn((fn) => fn());
-        mockPreferences.getString = jest.fn(() => of('en'));
-        // act
-        languageSettingsPage.init();
-        // assert
-        setTimeout(() => {
-            expect(mockPreferences.getString).toHaveBeenCalledWith(PreferenceKey.SELECTED_LANGUAGE_CODE);
-            expect(languageSettingsPage.previousLanguage).toBe('en');
-            expect(languageSettingsPage.language).toBe('en');
-            done();
-        }, 0);
-    });
+            // arrange
+            languageSettingsPage.languages = appLanguages;
+            mockNgZone.run = jest.fn((fn) => fn());
+            mockPreferences.getString = jest.fn(() => of('en'));
+            // act
+            languageSettingsPage.init();
+            // assert
+            setTimeout(() => {
+                expect(mockPreferences.getString).toHaveBeenCalledWith(PreferenceKey.SELECTED_LANGUAGE_CODE);
+                expect(languageSettingsPage.previousLanguage).toBe('en');
+                expect(languageSettingsPage.language).toBe('en');
+                done();
+            }, 0);
+        });
     it('should call set initial available languages and call getString method from ' +
         'sharedPreferences to check if language is undefined', (done) => {
-        // arrange
-        languageSettingsPage.languages = appLanguages;
-        mockNgZone.run = jest.fn((fn) => fn());
-        mockPreferences.getString = jest.fn(() => of(undefined));
-        // act
-        languageSettingsPage.init();
-        // assert
-        setTimeout(() => {
-            expect(mockPreferences.getString).toHaveBeenCalledWith(PreferenceKey.SELECTED_LANGUAGE_CODE);
-            expect(languageSettingsPage.previousLanguage).toBe(undefined);
-            done();
-        }, 0);
-    });
+            // arrange
+            languageSettingsPage.languages = appLanguages;
+            mockNgZone.run = jest.fn((fn) => fn());
+            mockPreferences.getString = jest.fn(() => of(undefined));
+            // act
+            languageSettingsPage.init();
+            // assert
+            setTimeout(() => {
+                expect(mockPreferences.getString).toHaveBeenCalledWith(PreferenceKey.SELECTED_LANGUAGE_CODE);
+                expect(languageSettingsPage.previousLanguage).toBe(undefined);
+                done();
+            }, 0);
+        });
 
     it('should generate telemetry events and set in preferences, setLocationNotification service and navigate', (done) => {
         // arrange
@@ -208,9 +231,9 @@ describe('LanguageSettingsPage', () => {
         languageSettingsPage.previousLanguage = 'hi';
         jest.spyOn(languageSettingsPage, 'generateClickInteractEvent').mockImplementation();
         jest.spyOn(languageSettingsPage, 'generateLanguageSuccessInteractEvent').mockImplementation();
-        languageSettingsPage.languages = [{code: 'en', label: 'English'}];
+        languageSettingsPage.languages = [{ code: 'en', label: 'English' }];
         languageSettingsPage.language = 'en';
-        languageSettingsPage.selectedLanguage = {code: 'en'};
+        languageSettingsPage.selectedLanguage = { code: 'en' };
         mockPreferences.putString = jest.fn(() => of(undefined));
         mockTranslateService.use = jest.fn();
         mockEvents.publish = jest.fn();
@@ -227,7 +250,7 @@ describe('LanguageSettingsPage', () => {
             expect(mockPreferences.putString).toHaveBeenCalledWith(PreferenceKey.SELECTED_LANGUAGE_CODE, 'en');
             expect(mockPreferences.putString).toHaveBeenCalledWith(PreferenceKey.SELECTED_LANGUAGE, 'English');
             expect(mockTranslateService.use).toHaveBeenCalledWith('en');
-            expect(mockEvents.publish).toHaveBeenCalledWith('onAfterLanguageChange:update', {selectedLanguage: 'en'});
+            expect(mockEvents.publish).toHaveBeenCalledWith('onAfterLanguageChange:update', { selectedLanguage: 'en' });
             expect(mockNotificationService.setupLocalNotification).toHaveBeenCalledWith('en');
             expect(mockNativeTransitions.slide).toHaveBeenCalled();
             expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.USER_TYPE_SELECTION]);
@@ -242,9 +265,9 @@ describe('LanguageSettingsPage', () => {
         languageSettingsPage.previousLanguage = 'hi';
         jest.spyOn(languageSettingsPage, 'generateClickInteractEvent').mockImplementation();
         jest.spyOn(languageSettingsPage, 'generateLanguageSuccessInteractEvent').mockImplementation();
-        languageSettingsPage.languages = [{code: 'en', label: 'English'}];
+        languageSettingsPage.languages = [{ code: 'en', label: 'English' }];
         languageSettingsPage.language = 'en';
-        languageSettingsPage.selectedLanguage = {code: 'en'};
+        languageSettingsPage.selectedLanguage = { code: 'en' };
         mockPreferences.putString = jest.fn(() => of(undefined));
         mockTranslateService.use = jest.fn();
         mockEvents.publish = jest.fn();
@@ -259,7 +282,7 @@ describe('LanguageSettingsPage', () => {
             expect(mockPreferences.putString).toHaveBeenCalledWith(PreferenceKey.SELECTED_LANGUAGE_CODE, 'en');
             expect(mockPreferences.putString).toHaveBeenCalledWith(PreferenceKey.SELECTED_LANGUAGE, 'English');
             expect(mockTranslateService.use).toHaveBeenCalledWith('en');
-            expect(mockEvents.publish).toHaveBeenCalledWith('onAfterLanguageChange:update', {selectedLanguage: 'en'});
+            expect(mockEvents.publish).toHaveBeenCalledWith('onAfterLanguageChange:update', { selectedLanguage: 'en' });
             expect(mockNotificationService.setupLocalNotification).toHaveBeenCalledWith('en');
             expect(mockLocation.back).toHaveBeenCalled();
             done();
@@ -307,7 +330,7 @@ describe('LanguageSettingsPage', () => {
         expect(languageSettingsPage.generateClickInteractEvent).toHaveBeenCalledWith(undefined, 'continue-clicked');
         expect(languageSettingsPage.generateLanguageSuccessInteractEvent).toHaveBeenCalledWith('hi', undefined);
         setTimeout(() => {
-            expect(mockEvents.publish).toHaveBeenCalledWith('onAfterLanguageChange:update', {selectedLanguage: undefined});
+            expect(mockEvents.publish).toHaveBeenCalledWith('onAfterLanguageChange:update', { selectedLanguage: undefined });
             expect(mockNotificationService.setupLocalNotification).toHaveBeenCalledWith(undefined);
             expect(mockLocation.back).toHaveBeenCalled();
             done();
@@ -320,7 +343,7 @@ describe('LanguageSettingsPage', () => {
         mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
         mockLocation.back = jest.fn();
         // act
-        languageSettingsPage.handleHeaderEvents({name: 'back'});
+        languageSettingsPage.handleHeaderEvents({ name: 'back' });
         // assert
         expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
             PageId.SETTINGS_LANGUAGE,
@@ -336,7 +359,7 @@ describe('LanguageSettingsPage', () => {
         mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
         mockLocation.back = jest.fn();
         // act
-        languageSettingsPage.handleHeaderEvents({name: 'back'});
+        languageSettingsPage.handleHeaderEvents({ name: 'back' });
         // assert
         expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
             PageId.ONBOARDING_LANGUAGE_SETTING,
@@ -351,7 +374,7 @@ describe('LanguageSettingsPage', () => {
         mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
         mockLocation.back = jest.fn();
         // act
-        languageSettingsPage.handleHeaderEvents({name: undefined});
+        languageSettingsPage.handleHeaderEvents({ name: undefined });
         // assert
         expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).not.toHaveBeenCalled();
         expect(mockLocation.back).not.toHaveBeenCalled();
@@ -419,7 +442,7 @@ describe('LanguageSettingsPage', () => {
         mockAppHeaderService.headerEventEmitted$ = {
             subscribe: data
         } as any;
-        mockRouter = {url: '/' + RouterLinks.LANGUAGE_SETTING};
+        mockRouter = { url: '/' + RouterLinks.LANGUAGE_SETTING };
         mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
         jest.spyOn(languageSettingsPage, 'handleHeaderEvents').mockImplementation();
         jest.spyOn(languageSettingsPage, 'handleBackButton').mockImplementation();
@@ -445,7 +468,7 @@ describe('LanguageSettingsPage', () => {
     it('should fetch isFromSettings is true from activateRoute, getAppName, generateImpressionTelemetry', (done) => {
         // arrange
         if (mockRouter.url === '/' + RouterLinks.LANGUAGE_SETTING + '/' + 'true') {
-            mockRouter = {url: '/' + RouterLinks.LANGUAGE_SETTING};
+            mockRouter = { url: '/' + RouterLinks.LANGUAGE_SETTING };
         }
         mockActivatedRoute.snapshot = {
             params: {
@@ -485,8 +508,8 @@ describe('LanguageSettingsPage', () => {
     it('should handle if conditions in ionViewWillLeave()', () => {
         // arrange
         languageSettingsPage.isLanguageSelected = true;
-        languageSettingsPage.languages = [{code: 'en', label: 'English'}];
-        languageSettingsPage.selectedLanguage = {code: undefined};
+        languageSettingsPage.languages = [{ code: 'en', label: 'English' }];
+        languageSettingsPage.selectedLanguage = { code: undefined };
         languageSettingsPage.previousLanguage = 'hi';
         mockTranslateService.use = jest.fn();
         // act
@@ -498,8 +521,8 @@ describe('LanguageSettingsPage', () => {
     it('should handle if inside if previous language is undefined set to english', () => {
         // arrange
         languageSettingsPage.isLanguageSelected = true;
-        languageSettingsPage.languages = [{code: 'en', label: 'English'}];
-        languageSettingsPage.selectedLanguage = {code: undefined};
+        languageSettingsPage.languages = [{ code: 'en', label: 'English' }];
+        languageSettingsPage.selectedLanguage = { code: undefined };
         languageSettingsPage.previousLanguage = undefined;
         mockTranslateService.use = jest.fn();
         // act
@@ -511,8 +534,8 @@ describe('LanguageSettingsPage', () => {
     it('should cover else part if selectedLanguage.code is already set', () => {
         // arrange
         languageSettingsPage.isLanguageSelected = true;
-        languageSettingsPage.languages = [{code: 'en', label: 'English'}];
-        languageSettingsPage.selectedLanguage = {code: 'en'};
+        languageSettingsPage.languages = [{ code: 'en', label: 'English' }];
+        languageSettingsPage.selectedLanguage = { code: 'en' };
         languageSettingsPage.previousLanguage = undefined;
         mockTranslateService.use = jest.fn();
         // act
@@ -538,4 +561,149 @@ describe('LanguageSettingsPage', () => {
         expect(unsubscribe).toBeCalledTimes(2);
     });
 
+
+    describe('ionViewDidEnter', () => {
+        it('should hide the header if isFromSettings is false', (done) => {
+            // arrange
+            mockActivatedRoute.params = of({ isFromSettings: false });
+            mockPreferences.putString = jest.fn(() => of('JOYFUL'));
+            mockAppHeaderService.showStatusBar = jest.fn();
+
+            // act
+            languageSettingsPage.ionViewDidEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockAppHeaderService.hideHeader).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should show header with Back button  if isFromSettings is true', () => {
+            // arrange
+            mockActivatedRoute.params = of({ isFromSettings: true });
+
+            // act
+            languageSettingsPage.ionViewDidEnter();
+            // assert
+            expect(mockAppHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+        });
+    });
+
+});
+
+describe('LanguageSettingsPage', () => {
+    let languageSettingsPage: LanguageSettingsPage;
+
+    const mockPreferences: Partial<SharedPreferences> = {};
+
+    const mockTranslateService: Partial<TranslateService> = {};
+
+    const mockEvents: Partial<Events> = {};
+
+    const mockNgZone: Partial<NgZone> = {
+        run: jest.fn()
+    };
+
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateAuditTelemetry: jest.fn(),
+        generatePageLoadedTelemetry: jest.fn(),
+        generateInteractTelemetry: jest.fn()
+    };
+
+    const mockPlatform: Partial<Platform> = {};
+
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+
+    const mockAppHeaderService: Partial<AppHeaderService> = {
+        hideHeader: jest.fn(),
+        showHeaderWithBackButton: jest.fn()
+    };
+
+    const mockNotificationService: Partial<NotificationService> = {};
+
+    let mockRouter: Partial<Router> = {
+        url: '/' + RouterLinks.LANGUAGE_SETTING + '/' + 'true'
+    };
+
+    const mockLocation: Partial<Location> = {};
+
+    const mockActivatedRoute: Partial<ActivatedRoute> = {
+    };
+
+    const mockNativeTransitions: Partial<NativePageTransitions> = {};
+
+    beforeAll(() => {
+        languageSettingsPage = new LanguageSettingsPage(
+            mockPreferences as SharedPreferences,
+            mockTranslateService as TranslateService,
+            mockEvents as Events,
+            mockNgZone as NgZone,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockPlatform as Platform,
+            mockCommonUtilService as CommonUtilService,
+            mockAppHeaderService as AppHeaderService,
+            mockNotificationService as NotificationService,
+            mockRouter as Router,
+            mockLocation as Location,
+            mockActivatedRoute as ActivatedRoute,
+            mockNativeTransitions as NativePageTransitions
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should not generate any telemetry if router ur is not langauge settings', (done) => {
+        // arrange
+        mockActivatedRoute.snapshot = {
+            params: {
+                isFromSettings: false
+            }
+        } as any;
+        mockAppHeaderService.hideHeader = jest.fn();
+        mockCommonUtilService.getAppName = jest.fn(() => Promise.resolve('sample_app_name'));
+        jest.spyOn(languageSettingsPage, 'init').mockImplementation();
+        const data = jest.fn((fn => fn()));
+        mockAppHeaderService.headerEventEmitted$ = {
+            subscribe: data
+        } as any;
+        mockRouter.url = '/' + RouterLinks.RESOURCES;
+        mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+        jest.spyOn(languageSettingsPage, 'handleHeaderEvents').mockImplementation();
+        jest.spyOn(languageSettingsPage, 'handleBackButton').mockImplementation();
+        // act
+        languageSettingsPage.ionViewWillEnter();
+        // assert
+        setTimeout(() => {
+            expect(mockTelemetryGeneratorService.generatePageLoadedTelemetry).not.toHaveBeenCalled();
+            done();
+        }, 450);
+    });
+
+    it('should generate telemetry with tapped language in cdata', () => {
+        // arrange
+        languageSettingsPage.tappedLanguage = 'en';
+        languageSettingsPage.language = 'hi';
+        languageSettingsPage.isFromSettings = false;
+        // act
+        languageSettingsPage.onLanguageSelected();
+        // assert
+        const cData: CorrelationData[] = [{
+            id: 'hi',
+            type: CorReleationDataType.NEW_VALUE
+          },
+          {
+            id: 'en',
+            type: CorReleationDataType.OLD_VALUE
+          }];
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.SELECT_LANGUAGE, '',
+            Environment.ONBOARDING,
+            PageId.LANGUAGE,
+            undefined,
+            undefined,
+            undefined,
+            cData);
+    });
+
 });
diff --git a/src/app/language-settings/language-settings.ts b/src/app/language-settings/language-settings.ts
index 7ab90bf0c..14f9151a9 100644
--- a/src/app/language-settings/language-settings.ts
+++ b/src/app/language-settings/language-settings.ts
@@ -1,20 +1,23 @@
+import { Location } from '@angular/common';
 import { Component, Inject, NgZone } from '@angular/core';
-import { Events, Platform } from '@ionic/angular';
 import { ActivatedRoute, Router } from '@angular/router';
-import { TranslateService } from '@ngx-translate/core';
-import { SharedPreferences } from 'sunbird-sdk';
-
 import { appLanguages, PreferenceKey, RouterLinks } from '@app/app/app.constant';
 import { Map } from '@app/app/telemetryutil';
-import { CommonUtilService } from '@app/services/common-util.service';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
 import { AppHeaderService } from '@app/services/app-header.service';
-import {Environment, ID, ImpressionType, InteractSubtype, InteractType, PageId} from '@app/services/telemetry-constants';
+import { CommonUtilService } from '@app/services/common-util.service';
 import { NotificationService } from '@app/services/notification.service';
-import { Location } from '@angular/common';
+import {
+  AuditProps, AuditType, CorReleationDataType, Environment, ID, ImpressionType, InteractSubtype,
+  InteractType, PageId
+} from '@app/services/telemetry-constants';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import { NativePageTransitions, NativeTransitionOptions } from '@ionic-native/native-page-transitions/ngx';
+import { Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { TranslateService } from '@ngx-translate/core';
 import { Subscription } from 'rxjs';
-import {NativePageTransitions, NativeTransitionOptions} from '@ionic-native/native-page-transitions/ngx';
-
+import { AuditState, CorrelationData, SharedPreferences } from 'sunbird-sdk';
+import { TagPrefixConstants } from '@app/services/segmentation-tag/segmentation-tag.service';
 
 export interface ILanguages {
   label: string;
@@ -35,6 +38,7 @@ export class LanguageSettingsPage {
   isFromSettings = false;
   previousLanguage: any;
   selectedLanguage: any = {};
+  tappedLanguage: string;
   btnColor = '#8FC4FF';
   unregisterBackButton: Subscription;
   headerConfig: any;
@@ -54,10 +58,20 @@ export class LanguageSettingsPage {
     private router: Router,
     private location: Location,
     private activatedRoute: ActivatedRoute,
-    private nativePageTransitions: NativePageTransitions,
-
+    private nativePageTransitions: NativePageTransitions
   ) { }
 
+  ionViewDidEnter() {
+    this.activatedRoute.params.subscribe(async params => {
+      this.isFromSettings = Boolean(params['isFromSettings']);
+      if (!this.isFromSettings) {
+        this.headerService.hideHeader();
+      } else {
+        this.headerService.showHeaderWithBackButton();
+      }
+    });
+  }
+
   handleBackButton() {
     this.unregisterBackButton = this.platform.backButton.subscribeWithPriority(10, () => {
       this.telemetryGeneratorService.generateInteractTelemetry(
@@ -88,10 +102,16 @@ export class LanguageSettingsPage {
 
     if (this.router.url === '/' + RouterLinks.LANGUAGE_SETTING || this.router.url === '/' + RouterLinks.LANGUAGE_SETTING + '/' + 'true') {
       setTimeout(() => {
+        /* New Telemetry */
+        this.telemetryGeneratorService.generatePageLoadedTelemetry(
+          this.isFromSettings ? PageId.SETTINGS_LANGUAGE : PageId.LANGUAGE,
+          this.isFromSettings ? Environment.SETTINGS : Environment.ONBOARDING
+        );
+
         this.telemetryGeneratorService.generateImpressionTelemetry(
-            ImpressionType.VIEW, '',
-            this.isFromSettings ? PageId.SETTINGS_LANGUAGE : PageId.ONBOARDING_LANGUAGE_SETTING,
-            this.isFromSettings ? Environment.SETTINGS : Environment.ONBOARDING,
+          ImpressionType.VIEW, '',
+          this.isFromSettings ? PageId.SETTINGS_LANGUAGE : PageId.ONBOARDING_LANGUAGE_SETTING,
+          this.isFromSettings ? Environment.SETTINGS : Environment.ONBOARDING,
         );
       }, 350);
     }
@@ -143,6 +163,24 @@ export class LanguageSettingsPage {
    * It will set app language
    */
   onLanguageSelected() {
+    /* New Telemetry */
+    const cData: CorrelationData[] = [{
+      id: this.language,
+      type: CorReleationDataType.NEW_VALUE
+    }];
+    if (this.tappedLanguage) {
+      cData.push({ id: this.tappedLanguage, type: CorReleationDataType.OLD_VALUE });
+    }
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_LANGUAGE, '',
+      this.isFromSettings ? Environment.SETTINGS : Environment.ONBOARDING,
+      PageId.LANGUAGE,
+      undefined,
+      undefined,
+      undefined,
+      cData
+    );
+    this.tappedLanguage = this.language;
     if (this.language) {
       this.zone.run(() => {
         this.translateService.use(this.language);
@@ -154,6 +192,28 @@ export class LanguageSettingsPage {
     }
   }
 
+  generateLanguageFailedInteractEvent() {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.DISABLED,
+      '',
+      Environment.ONBOARDING,
+      PageId.ONBOARDING_LANGUAGE_SETTING,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      ID.CONTINUE_CLICKED
+    );
+    /* New Telemetry */
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_CONTINUE,
+      InteractSubtype.FAIL,
+      Environment.ONBOARDING,
+      PageId.LANGUAGE
+    );
+  }
+
+
   generateLanguageSuccessInteractEvent(previousLanguage: string, currentLanguage: string) {
     const valuesMap = new Map();
     valuesMap['previousLanguage'] = previousLanguage ? previousLanguage : '';
@@ -166,6 +226,21 @@ export class LanguageSettingsPage {
       undefined,
       valuesMap
     );
+    /* New Telemetry */
+    const cData: CorrelationData[] = [{
+      id: currentLanguage,
+      type: CorReleationDataType.NEW_VALUE
+    }];
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_CONTINUE,
+      InteractSubtype.SUCCESS,
+      this.isFromSettings ? Environment.SETTINGS : Environment.ONBOARDING,
+      this.isFromSettings ? PageId.SETTINGS_LANGUAGE : PageId.LANGUAGE,
+      undefined,
+      undefined,
+      undefined,
+      cData
+    );
   }
 
   generateClickInteractEvent(selectedLanguage: string, interactSubType) {
@@ -190,6 +265,7 @@ export class LanguageSettingsPage {
 
       if (this.language) {
         this.selectedLanguage = this.languages.find(i => i.code === this.language);
+        window['segmentation'].SBTagService.pushTag([this.selectedLanguage.code], TagPrefixConstants.USER_LANG, true);
         this.preferences.putString(PreferenceKey.SELECTED_LANGUAGE_CODE, this.selectedLanguage.code).toPromise();
         this.preferences.putString(PreferenceKey.SELECTED_LANGUAGE, this.selectedLanguage.label).toPromise();
         this.translateService.use(this.language);
@@ -198,7 +274,20 @@ export class LanguageSettingsPage {
         selectedLanguage: this.language
       });
       this.notification.setupLocalNotification(this.language);
-
+      const corRelationList: Array<CorrelationData> = [
+        { id: PageId.LANGUAGE, type: CorReleationDataType.FROM_PAGE }
+      ];
+      corRelationList.push({ id: this.language || '', type: CorReleationDataType.LANGUAGE });
+      this.telemetryGeneratorService.generateAuditTelemetry(
+        this.isFromSettings ? Environment.SETTINGS : Environment.ONBOARDING,
+        AuditState.AUDIT_UPDATED,
+        [AuditProps.LANGUAGE],
+        AuditType.SET_LANGUAGE,
+        undefined,
+        undefined,
+        undefined,
+        corRelationList
+      );
       if (this.isFromSettings) {
         this.location.back();
       } else {
@@ -211,19 +300,11 @@ export class LanguageSettingsPage {
         };
         this.nativePageTransitions.slide(options);
         this.router.navigate([RouterLinks.USER_TYPE_SELECTION]);
+        this.preferences.putBoolean(PreferenceKey.IS_NEW_USER, true).toPromise();
       }
     } else {
-      this.telemetryGeneratorService.generateInteractTelemetry(
-          InteractType.DISABLED,
-          '',
-          Environment.ONBOARDING,
-          PageId.ONBOARDING_LANGUAGE_SETTING,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          ID.CONTINUE_CLICKED
-      );
+      this.generateLanguageFailedInteractEvent();
+
       this.btnColor = '#8FC4FF';
 
       const parser = new DOMParser();
diff --git a/src/app/manage-learn/all-evidence-list/all-evidence-list.module.ts b/src/app/manage-learn/all-evidence-list/all-evidence-list.module.ts
new file mode 100644
index 000000000..72331da7c
--- /dev/null
+++ b/src/app/manage-learn/all-evidence-list/all-evidence-list.module.ts
@@ -0,0 +1,31 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { AllEvidenceListComponent } from './all-evidence-list/all-evidence-list.component';
+import { HttpClientModule } from '@angular/common/http';
+import { FormsModule } from '@angular/forms';
+import { Routes, RouterModule } from '@angular/router';
+import { IonicModule } from '@ionic/angular';
+import { TranslateModule } from '@ngx-translate/core';
+import { CoreModule } from '../core/core.module';
+import { SharedModule } from '../shared/shared.module';
+const routes: Routes = [
+  {
+    path: '',
+    component: AllEvidenceListComponent,
+  },
+];
+
+@NgModule({
+  declarations: [ AllEvidenceListComponent],
+  imports: [
+    CommonModule,
+    TranslateModule.forChild(),
+    SharedModule,
+    IonicModule,
+    FormsModule,
+    CoreModule,
+    RouterModule.forChild(routes),
+  ],
+  exports: [],
+})
+export class AllEvidenceListModule {}
diff --git a/src/app/manage-learn/all-evidence-list/all-evidence-list/all-evidence-list.component.html b/src/app/manage-learn/all-evidence-list/all-evidence-list/all-evidence-list.component.html
new file mode 100644
index 000000000..6d4917d98
--- /dev/null
+++ b/src/app/manage-learn/all-evidence-list/all-evidence-list/all-evidence-list.component.html
@@ -0,0 +1,79 @@
+<ion-content>
+  <div padding>
+    <ion-segment [(ngModel)]="selectedTab">
+      <ion-segment-button value="evidence" (click)="onTabChange('evidence')">
+        {{ 'FRMELEMNTS_LBL_EVIDENCES' | translate }}
+      </ion-segment-button>
+      <ion-segment-button value="remarks" (click)="onTabChange('remarks')">
+        {{ 'FRMELEMNTS_LBL_REMARKS' | translate }}
+      </ion-segment-button>
+    </ion-segment>
+  </div>
+
+  <div [ngSwitch]="selectedTab">
+    <div *ngSwitchCase="'evidence'">
+      <!-- //for images -->
+      <div *ngIf="images?.length">
+        <ion-grid>
+          <ion-row>
+            <ion-col size="12">
+              <h5>{{ 'FRMELEMNTS_LBL_IMAGES' | translate }}</h5>
+            </ion-col>
+            <ion-col size="4" *ngFor="let i of images">
+              <attachments [url]="i.url" [extension]="i.extension"></attachments>
+            </ion-col>
+          </ion-row>
+        </ion-grid>
+      </div>
+
+      <!-- //for VIDEOS-->
+      <div *ngIf="videos?.length">
+        <ion-grid>
+          <ion-row>
+            <ion-col>
+              <h5>{{ 'FRMELEMNTS_LBL_VIDEOS' | translate }}</h5>
+            </ion-col>
+            <ion-col size="4" *ngFor="let v of videos">
+              <attachments [url]="v.url" [extension]="v.extension"></attachments>
+            </ion-col>
+          </ion-row>
+        </ion-grid>
+      </div>
+
+      <!-- //for DOCUMENT -->
+      <div *ngIf="documents?.length">
+        <ion-grid>
+          <ion-row>
+            <ion-col size="12">
+              <h5>{{ 'FRMELEMNTS_LBL_DOCUMENTS' | translate }}</h5>
+            </ion-col>
+            <ion-col size="4" *ngFor="let d of documents">
+              <attachments [url]="d.url" [extension]="d.extension"></attachments>
+            </ion-col>
+          </ion-row>
+        </ion-grid>
+      </div>
+      <!-- //for Audio -->
+      <div *ngIf="audios?.length">
+        <ion-grid>
+          <ion-row>
+            <ion-col size="12">
+              <h5>{{ 'FRMELEMNTS_LBL_AUDIOS' | translate }}</h5>
+            </ion-col>
+            <ion-col size="4" *ngFor="let a of audios">
+              <attachments [url]="a.url" [extension]="a.extension"></attachments>
+            </ion-col>
+          </ion-row>
+        </ion-grid>
+      </div>
+    </div>
+
+    <div *ngSwitchCase="'remarks'">
+      <div *ngIf="remarks?.length">
+        <ion-item text-wrap text-justify *ngFor="let r of remarks">
+          {{ r }}
+        </ion-item>
+      </div>
+    </div>
+  </div>
+</ion-content>
diff --git a/src/app/manage-learn/all-evidence-list/all-evidence-list/all-evidence-list.component.scss b/src/app/manage-learn/all-evidence-list/all-evidence-list/all-evidence-list.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/all-evidence-list/all-evidence-list/all-evidence-list.component.ts b/src/app/manage-learn/all-evidence-list/all-evidence-list/all-evidence-list.component.ts
new file mode 100644
index 000000000..83bb021e8
--- /dev/null
+++ b/src/app/manage-learn/all-evidence-list/all-evidence-list/all-evidence-list.component.ts
@@ -0,0 +1,209 @@
+import { HttpClient } from '@angular/common/http';
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { LoaderService, ToastService, UtilsService } from '../../core';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { AssessmentApiService } from '../../core/services/assessment-api.service';
+import { DhitiApiService } from '../../core/services/dhiti-api.service';
+
+@Component({
+  selector: 'app-all-evidence-list',
+  templateUrl: './all-evidence-list.component.html',
+  styleUrls: ['./all-evidence-list.component.scss'],
+})
+export class AllEvidenceListComponent implements OnInit {
+  selectedTab;
+  payload: any;
+  remarks: any;
+  images: any;
+  videos: any;
+  documents: any;
+  audios: any;
+  data: any;
+
+  constructor(
+    private routerParam: ActivatedRoute,
+    private httpClient: HttpClient,
+    private dhiti: DhitiApiService,
+    private utils: UtilsService,
+    private loader: LoaderService,
+    private toast: ToastService
+  ) {}
+
+  ngOnInit() {
+    this.selectedTab = 'evidence';
+
+    this.routerParam.queryParams.subscribe((params) => {
+      const submissionId = params.submissionId;
+      const observationId = params.observationId;
+      const entityId = params.entityId;
+      const questionExternalId = params.questionExternalId;
+      const entityType = params.entityType;
+      const surveyEvidence = params.surveyEvidence;
+      const solutionId = params.solutionId;
+      this.data = params.data;
+      this.payload = {
+        submissionId: submissionId,
+        questionId: questionExternalId,
+        observationId: observationId,
+        entityId: entityId,
+        entityType: entityType,
+        solutionId: solutionId,
+      };
+      if (this.data) {
+        this.setAllEvidence();
+      } else {
+        surveyEvidence ? this.getSurveyEvidence() : this.getAllEvidence();
+      }
+    });
+  }
+
+  ionViewDidLoad() {
+    this.selectedTab = 'evidence';
+    //TODO:move to ngOninit
+    // const submissionId = this.navParams.get('submissionId');
+    // const observationId = this.navParams.get('observationId');
+    // const entityId = this.navParams.get('entityId');
+    // const questionExternalId = this.navParams.get('questionExternalId');
+    // const entityType = this.navParams.get('entityType');
+    // const surveyEvidence = this.navParams.get('surveyEvidence'); // for survey evidence true/false
+    // const solutionId = this.navParams.get('solutionId');
+    // this.data = this.navParams.get('data');
+    // this.payload = {
+    //   submissionId: submissionId,
+    //   questionId: questionExternalId,
+    //   observationId: observationId,
+    //   entityId: entityId,
+    //   entityType: entityType,
+    //   solutionId: solutionId,
+    // };
+    // if (this.data) {
+    //   this.setAllEvidence();
+    // } else {
+    //   surveyEvidence ? this.getSurveyEvidence() : this.getAllEvidence();
+    // }
+  }
+
+  onTabChange(tabName) {
+    this.selectedTab = tabName;
+  }
+
+  setAllEvidence() {
+    console.log(this.data);
+    this.images = this.data.images;
+    this.videos = this.data.videos;
+    this.documents = this.data.documents;
+    this.remarks = this.data.remarks;
+    this.audios = this.data.audios;
+  }
+  async getAllEvidence() {
+    let url = urlConstants.API_URLS.ALL_EVIDENCE;
+    this.loader.startLoader();
+    let payload = await this.utils.getProfileInfo();
+    payload = { ...this.payload, ...payload };
+    const config = {
+      url: url,
+      payload: payload,
+    };
+    this.dhiti.post(config).subscribe(
+      (success) => {
+        this.loader.stopLoader();
+        if (success.result === true && success.data) {
+          this.images = success.data.images;
+          this.videos = success.data.videos;
+          this.documents = success.data.documents;
+          this.remarks = success.data.remarks;
+          this.audios = success.data.audios;
+        } else {
+          this.toast.openToast(success.data);
+        }
+      },
+      (error) => {
+        this.toast.openToast(error.message);
+        this.loader.stopLoader();
+      }
+    );
+
+    // this.apiService.httpPost(
+    //   url,
+    //   this.payload,
+    //   (success) => {
+    //     this.utils.stopLoader();
+    //     console.log(JSON.stringify(success));
+
+    //    if (success.result === true && success.data) {
+    //       this.images = success.data.images;
+    //       this.videos = success.data.videos;
+    //       this.documents = success.data.documents;
+    //       this.remarks = success.data.remarks;
+    //       this.audios = success.data.audios;
+    //     } else {
+    //       this.utils.openToast(success.data);
+    //     }
+    //   },
+    //   (error) => {
+    //     this.utils.openToast(error.message);
+
+    //     this.utils.stopLoader();
+    //   },
+    //   { baseUrl: 'dhiti', version: 'v1' }
+    // );
+  }
+
+  //for surveyEvidence
+  async getSurveyEvidence() {
+    let url = urlConstants.API_URLS.SURVEY_FEEDBACK.LIST_ALL_EVIDENCES;
+    this.loader.startLoader();
+    let payload = await this.utils.getProfileInfo();
+    this.payload = { ...payload, ...payload };
+    const config = {
+      url: url,
+      payload: payload,
+    };
+    this.dhiti.post(config).subscribe(
+      (success) => {
+        this.loader.stopLoader();
+        console.log(JSON.stringify(success));
+        if (success.result === true && success.data) {
+          this.images = success.data.images;
+          this.videos = success.data.videos;
+          this.documents = success.data.documents;
+          this.remarks = success.data.remarks;
+          this.audios = success.data.audios;
+        } else {
+          this.toast.openToast(success.data);
+        }
+      },
+      (error) => {
+        this.toast.openToast(error.message);
+        this.loader.stopLoader();
+      }
+    );
+
+    //TODO:uncomment
+    //   const url = AppConfigs.surveyFeedback.listAllEvidences;
+    //   this.utils.startLoader();
+    //   this.apiService.httpPost(
+    //     url,
+    //     this.payload,
+    //     (success) => {
+    //       this.utils.stopLoader();
+    //       console.log(JSON.stringify(success));
+    //       if (success.result === true && success.data) {
+    //         this.images = success.data.images;
+    //         this.videos = success.data.videos;
+    //         this.documents = success.data.documents;
+    //         this.remarks = success.data.remarks;
+    //         this.audios = success.data.audios;
+    //       } else {
+    //         this.utils.openToast(success.data);
+    //       }
+    //     },
+    //     (error) => {
+    //       this.utils.openToast(error.message);
+    //       this.utils.stopLoader();
+    //     },
+    //     { baseUrl: 'dhiti', version: 'v1' }
+    //   );
+  }
+}
diff --git a/src/app/manage-learn/core/constants/index.ts b/src/app/manage-learn/core/constants/index.ts
new file mode 100644
index 000000000..273626806
--- /dev/null
+++ b/src/app/manage-learn/core/constants/index.ts
@@ -0,0 +1,2 @@
+export * from './statuses.constant';
+export * from './mimTypes';
\ No newline at end of file
diff --git a/src/app/manage-learn/core/constants/localStorageConstants.ts b/src/app/manage-learn/core/constants/localStorageConstants.ts
new file mode 100644
index 000000000..3c22a4603
--- /dev/null
+++ b/src/app/manage-learn/core/constants/localStorageConstants.ts
@@ -0,0 +1,11 @@
+export const localStorageConstants = {
+    PROJECT_META_FORM: "projectForm",
+    TASK_META_FORM: "taskForm",
+    PROFILE_DATA:"profileData",
+    DYNAMIC_LINKS: "dynamicLinks",
+    SYNC_VARIABLE: "syncSettings",
+    FIRST_TIME: "FirstTime",
+    USER_DETAILS:"usersInfo",
+    SELECTED_LANGUAGE: "selectedLanguage",
+    LIBRARY_CATEGORIES:"libraryCategories"
+};
\ No newline at end of file
diff --git a/src/app/manage-learn/core/constants/menuConstants.ts b/src/app/manage-learn/core/constants/menuConstants.ts
new file mode 100644
index 000000000..8ad9784cb
--- /dev/null
+++ b/src/app/manage-learn/core/constants/menuConstants.ts
@@ -0,0 +1,37 @@
+export const menuConstants = {
+    TASK: [
+
+        {
+            TITLE: 'EDIT',
+            VALUE: 'editTask',
+            ICON: 'create'
+        },
+        {
+            TITLE: 'FRMELEMNTS_LBL_SHARE',
+            VALUE: 'shareTask',
+            ICON: 'share'
+        }
+    ],
+    PROJECT: [
+
+        {
+            TITLE: 'EDIT',
+            VALUE: 'editProject',
+            ICON: 'create'
+        },
+        // {
+        //     TITLE: 'DELETE',
+        //     VALUE: 'deleteProject',
+        //     ICON: 'trash'
+        // },
+        {
+            TITLE: 'FRMELEMNTS_LBL_FILES',
+            VALUE: 'fileProject',
+            ICON: 'document'
+        }, 
+        {
+            TITLE: 'FRMELEMNTS_LBL_SHARE',
+            VALUE: 'shareProject',
+            ICON: 'share'
+        }],
+};
\ No newline at end of file
diff --git a/src/app/manage-learn/core/constants/mimTypes.ts b/src/app/manage-learn/core/constants/mimTypes.ts
new file mode 100644
index 000000000..69884d535
--- /dev/null
+++ b/src/app/manage-learn/core/constants/mimTypes.ts
@@ -0,0 +1,76 @@
+export const FILE_EXTENSION_HEADERS = {
+    aac: "audio/aac",
+    abw: "application/x-abiword",
+    arc: "application/x-freearc",
+    avi: "video/x-msvideo",
+    azw: "application/vnd.amazon.ebook",
+    bin: "application/octet-stream",
+    bmp: "image/bmp",
+    bz: "application/x-bzip",
+    bz2: "application/x-bzip2",
+    csh: "application/x-csh",
+    css: "text/css",
+    csv: "text/csv",
+    doc: "application/msword",
+    docx: "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+    eot: "application/vnd.ms-fontobject",
+    epub: "application/epub+zip",
+    gif: "image/gif",
+    htm: "text/html",
+    html: "text/html",
+    ico: "image/vnd.microsoft.icon",
+    ics: "text/calendar",
+    jar: "application/java-archive",
+    jpeg: "image/jpeg",
+    JPEG: "image/jpeg",
+    jpg: "image/jpeg",
+    JPG: "image/jpeg",
+    js: "text/javascript",
+    json: "application/json",
+    jsonld: "application/ld+json",
+    mid: "audio/midi",
+    midi: "audio/midi",
+    mjs: "text/javascript",
+    mp3: "audio/mpeg",
+    mpeg: "video/mpeg",
+    mpkg: "application/vnd.apple.installer+xml",
+    odp: "application/vnd.oasis.opendocument.presentation",
+    ods: "application/vnd.oasis.opendocument.spreadsheet",
+    odt: "application/vnd.oasis.opendocument.text",
+    oga: "audio/ogg",
+    ogv: "video/ogg",
+    ogx: "application/ogg",
+    otf: "font/otf",
+    png: "image/png",
+    pdf: "application/pdf",
+    ppt: "application/vnd.ms-powerpoint",
+    pptx: "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+    rar: "application/x-rar-compressed",
+    rtf: "application/rtf",
+    sh: "application/x-sh",
+    svg: "image/svg+xml",
+    swf: "application/x-shockwave-flash",
+    tar: "application/x-tar",
+    tif: "image/tiff",
+    tiff: "image/tiff",
+    ttf: "font/ttf",
+    txt: "text/plain",
+    vsd: "application/vnd.visio",
+    wav: "audio/wav",
+    weba: "audio/webm",
+    webm: "video/webm",
+    webp: "image/webp",
+    woff: "font/woff",
+    woff2: "font/woff2",
+    xhtml: "application/xhtml+xml",
+    xls: "application/vnd.ms-excel",
+    xlsx: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+    xml: "application/xml&nbsp;",
+    xul: "application/vnd.mozilla.xul+xml",
+    zip: "application/zip",
+    "3gp": "video/3gpp",
+    "3g2": "video/3gpp2",
+    "7z": "application/x-7z-compressed",
+    mp4: "video/mp4",
+  };
+  
\ No newline at end of file
diff --git a/src/app/manage-learn/core/constants/statuses.constant.ts b/src/app/manage-learn/core/constants/statuses.constant.ts
new file mode 100644
index 000000000..22e48a11e
--- /dev/null
+++ b/src/app/manage-learn/core/constants/statuses.constant.ts
@@ -0,0 +1,10 @@
+export const statusType = {
+    notStarted: "notStarted",
+    inProgress: "inProgress",
+    completed: "completed"
+}
+export const statuses: any = [
+    { title: statusType.notStarted },
+    { title: statusType.inProgress },
+    { title: statusType.completed }
+]
\ No newline at end of file
diff --git a/src/app/manage-learn/core/constants/urlConstants.ts b/src/app/manage-learn/core/constants/urlConstants.ts
new file mode 100644
index 000000000..96a9e5a9b
--- /dev/null
+++ b/src/app/manage-learn/core/constants/urlConstants.ts
@@ -0,0 +1,56 @@
+export const urlConstants = {
+  SERVICES: {
+    UNNATI: '/improvement-project/api/',
+    KENDRA: '/kendra/api/',
+    SAMIKSHA: '/assessment/api/',
+    DHITI: '/dhiti/api/',
+    SUNBIRD: '/sunbird/api/',
+  },
+  API_URLS: {
+    PROGRAM_LISTING: 'v1/users/programs?',
+    GET_TARGETED_SOLUTIONS: 'v1/solutions/targetedSolutions',
+    SOLUTIONS_LISTING: 'v1/users/solutions/',
+    GET_PROJECT: 'v2/userProjects/details',
+    PRIVATE_PROGRAMS: 'v1/users/privatePrograms',
+    GET_SUB_ENITIES_FOR_ROLES: 'v1/entities/subEntityListBasedOnRoleAndLocation/',
+    GET_ENTITY_LIST: 'v1/entities/subEntityList/',
+    GET_REPORT: 'v1/reports/entity/',
+    GET_FULL_REPORT: 'v2/reports/detailView/',
+    GET_PROGRAM_BY_ENTITY: 'v1/reports/getProgramsByEntity',
+    SYNC_PROJECT: 'v1/userProjects/sync/',
+    CREATE_PROJECT: 'v1/userProjects/add',
+    START_ASSESSMENT: 'v1/userProjects/solutionDetails/',
+    PROJCET_TASK_STATUS: 'v1/userProjects/tasksStatus/',
+    GET_SHARABLE_PDF: 'v1/userProjects/share/',
+    GET_OBSERVATION_ENTITIES: 'v1/observations/entities',
+    GET_OBSERVATION_SUBMISSIONS: 'v1/observationSubmissions/list/',
+    GET_OBSERVATION_DETAILS: 'v2/observations/assessment/',
+    MANDATORY_ENTITY_TYPES_FOR_ROLES: 'v1/users/entityTypesByLocationAndRole/',
+    GET_OBSERVATION_SUBMISSION_COUNT: 'v1/observations/submissionsCount',
+    OBSERVATION_SUBMISSION_UPDATE: 'v1/observationSubmissions/update/',
+    OBSERVATION_SUBMISSION_CREATE: 'v1/observationSubmissions/create/',
+    SEARCH_ENTITY: 'v2/observations/searchEntities',
+    OBSERVATION_UPDATE_ENTITES: 'v1/observations/updateEntities/',
+    IS_SURVEY_SUBMISSION_ALLOWED: 'v1/surveySubmissions/isAllowed/',
+    IS_OBSERVATION_SUBMISSION_ALLOWED: 'v1/observationSubmissions/isAllowed/',
+    CHECK_IF_SUBMITTED: 'v1/submissions/isAllowed/',
+    SURVEY_FEEDBACK_MAKE_SUBMISSION: 'v1/surveySubmissions/make/',
+    SUBMISSION: 'v1/submissions/make/',
+    TARGETTED_ENTITY_TYPES: "v1/users/targetedEntity/",
+    OBSERVATION_REPORT_SOLUTION_LIST: "v1/observationSubmissions/solutionList?",
+    GENERIC_REPORTS: 'v1/reports/fetch',
+    PROJECT_TEMPLATE_DETAILS: 'v1/project/templates/details/',
+    ALL_EVIDENCE:'v1/observations/listAllEvidences',
+    SURVEY_FEEDBACK: {
+      GET_DETAILS_BY_LINK: 'v1/surveys/getDetailsByLink/' /* + link */,
+      GET_DETAILS_BY_ID: 'v2/surveys/details' /* + surveyId?solutionId=5f5b38ec45365677f64b2843*/,
+      MAKE_SUBMISSION: 'v1/surveySubmissions/make/',
+      LIST_ALL_EVIDENCES: 'v1/surveys/listAllEvidences',
+      GET_ALL_ANSWERS: 'v1/surveys/getAllResponsesOfQuestion/',
+    },
+    DEEPLINK: {
+      VERIFY_OBSERVATION_LINK: 'v1/solutions/verifyLink/' /* + link */,
+    },
+    PRESIGNED_URLS: 'v1/cloud-services/files/preSignedUrls',
+  },
+};
diff --git a/src/app/manage-learn/core/core.module.ts b/src/app/manage-learn/core/core.module.ts
new file mode 100644
index 000000000..d665727d1
--- /dev/null
+++ b/src/app/manage-learn/core/core.module.ts
@@ -0,0 +1,24 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { UpdateLocalSchoolDataService } from './services/update-local-school-data.service';
+import { LocalStorageService } from './services';
+import { UpdateTrackerService } from './services/update-tracker.service';
+import { EvidenceService } from './services/evidence.service';
+import { ProjectReportService } from './services/project-report.service';
+import { ProgramService } from './services/program.service';
+import { AssessmentApiService } from './services/assessment-api.service';
+import { DhitiApiService } from './services/dhiti-api.service';
+import { SharingFeatureService } from './services/sharing-feature.service';
+
+
+@NgModule({
+  declarations: [],
+  imports: [
+    CommonModule
+  ],
+  providers: [
+    UpdateLocalSchoolDataService, LocalStorageService, UpdateTrackerService, EvidenceService,ProjectReportService,
+    ProgramService, AssessmentApiService, DhitiApiService,SharingFeatureService
+  ],
+})
+export class CoreModule {}
diff --git a/src/app/manage-learn/core/guards/ml.guard.ts b/src/app/manage-learn/core/guards/ml.guard.ts
new file mode 100644
index 000000000..66fa3967b
--- /dev/null
+++ b/src/app/manage-learn/core/guards/ml.guard.ts
@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree } from '@angular/router';
+import { Observable } from 'rxjs';
+import { ToastService, UtilsService } from '../services';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class MlGuard implements CanActivate {
+  constructor(private utils: UtilsService, private toast: ToastService) {
+
+  }
+  canActivate(
+    next: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
+    return new Promise((resolve, reject) => {
+      if (this.utils.profile && this.utils.profile.userSubType) {
+        resolve(true)
+      } else {
+        this.utils.getProfileData().then(data => {
+          if (data.role) {
+            resolve(true)
+          } else {
+            this.toast.showMessage("You do not have access. Please update you profile", 'danger');
+            resolve(false);
+          }
+        }).catch(error => {
+          this.toast.showMessage("You do not have access.Please update you profile", 'danger');
+          resolve(false)
+        })
+      }
+    })
+  }
+
+}
diff --git a/src/app/manage-learn/core/index.ts b/src/app/manage-learn/core/index.ts
new file mode 100644
index 000000000..0947f8996
--- /dev/null
+++ b/src/app/manage-learn/core/index.ts
@@ -0,0 +1,2 @@
+export * from './services';
+export * from './constants';
\ No newline at end of file
diff --git a/src/app/manage-learn/core/interfaces/index.js b/src/app/manage-learn/core/interfaces/index.js
new file mode 100644
index 000000000..d9d08138c
--- /dev/null
+++ b/src/app/manage-learn/core/interfaces/index.js
@@ -0,0 +1 @@
+export * from './request-params';
\ No newline at end of file
diff --git a/src/app/manage-learn/core/interfaces/request-params.ts b/src/app/manage-learn/core/interfaces/request-params.ts
new file mode 100644
index 000000000..5d26623b5
--- /dev/null
+++ b/src/app/manage-learn/core/interfaces/request-params.ts
@@ -0,0 +1,4 @@
+export interface RequestParams {
+    url: string,
+    payload?: any
+}
diff --git a/src/app/manage-learn/core/services/api-utils.service.ts b/src/app/manage-learn/core/services/api-utils.service.ts
new file mode 100644
index 000000000..b2ca0a4cd
--- /dev/null
+++ b/src/app/manage-learn/core/services/api-utils.service.ts
@@ -0,0 +1,30 @@
+import { Injectable } from '@angular/core';
+import { GenericAppConfig } from '@app/app/app.constant';
+import { CommonUtilService, UtilityService } from '@app/services';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ApiUtilsService {
+  public assessmentBaseUrl: string;
+  public projectsBaseUrl: string;
+  public appVersion;
+  public appName;
+
+  constructor(
+    private utility: UtilityService,
+    private commonUtilService: CommonUtilService,
+
+  ) { }
+
+  async initilizeML() {
+    this.assessmentBaseUrl = !this.assessmentBaseUrl ? await this.utility.getBuildConfigValue("SURVEY_BASE_URL") : this.assessmentBaseUrl;
+    this.projectsBaseUrl = !this.projectsBaseUrl ? await this.utility.getBuildConfigValue('PROJECTS_BASE_URL') : this.projectsBaseUrl;
+    this.appVersion = !this.appVersion ? await this.utility.getBuildConfigValue(GenericAppConfig.VERSION_CODE) : this.appVersion;
+    this.appName = !this.appName ? await this.commonUtilService.getAppName() : this.appName
+  }
+
+  getBaseUrl(key) {
+    return this[key]
+  }
+}
diff --git a/src/app/manage-learn/core/services/api.service.ts b/src/app/manage-learn/core/services/api.service.ts
new file mode 100644
index 000000000..f47577b4d
--- /dev/null
+++ b/src/app/manage-learn/core/services/api.service.ts
@@ -0,0 +1,188 @@
+import { Injectable, Inject } from '@angular/core';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Observable, of as observableOf } from 'rxjs';
+import { catchError, mergeMap, tap } from 'rxjs/operators';
+import { ModalController } from '@ionic/angular';
+import { RequestParams } from '../interfaces/request-params';
+import { ToastService } from './toast/toast.service';
+import { AuthService, DeviceInfo } from 'sunbird-sdk';
+import * as jwt_decode from "jwt-decode";
+import * as moment from 'moment';
+import { ApiUtilsService } from './api-utils.service';
+
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ApiService {
+  baseUrl: string;
+  tokens;
+  constructor(public http: HttpClient,
+    public toast: ToastService,
+    public modalController: ModalController,
+    @Inject('AUTH_SERVICE') public authService: AuthService,
+    @Inject('DEVICE_INFO') public deviceInfo: DeviceInfo,
+    public apiUtils: ApiUtilsService
+  ) { }
+
+  get(requestParam: RequestParams): Observable<any> {
+    // return this.authService.getSession().pipe(
+    //   mergeMap((session) => {
+    //     const httpOptions = {
+    //       headers: new HttpHeaders({
+    //         'x-auth-token': session ? session.access_token : "",
+    //         'x-authenticated-user-token': session ? session.access_token : "",
+    //       })
+    //     };
+    //     return this.http.get(this.baseUrl + requestParam.url, httpOptions).pipe(
+    //       tap(data => {
+    //         return observableOf(data)
+    //       }, error => {
+    //         catchError(this.handleError(error))
+    //       }),
+    //     );
+    //   })
+    // );
+
+    return this.checkTokenValidation().pipe(
+      mergeMap(session => {
+        const httpOptions = {
+          headers: new HttpHeaders({
+            'x-auth-token': session ? session.access_token : '',
+            'x-authenticated-user-token': session ? session.access_token : '',
+            'X-App-Id': this.apiUtils.appName,
+            'X-App-Ver': this.apiUtils.appVersion,
+            'deviceId': this.deviceInfo.getDeviceID(),
+          }),
+        };
+        return this.http.get(this.baseUrl + requestParam.url, httpOptions).pipe(
+          tap(data => {
+            return observableOf(data)
+          }, error => {
+            catchError(this.handleError(error))
+          }),
+        );
+      })
+    )
+  }
+
+
+  checkTokenValidation(): Observable<any> {
+    return this.authService.getSession().pipe(
+      mergeMap(tokens => {
+        const token = jwt_decode(tokens.access_token);
+        const tokenExpiryTime = moment(token.exp * 1000);
+        const currentTime = moment(Date.now());
+        const duration = moment.duration(tokenExpiryTime.diff(currentTime));
+        const hourDifference = duration.asHours();
+        if (hourDifference < 2) {
+          return this.authService.refreshSession().pipe(
+            mergeMap(refreshData => {
+              return this.authService.getSession()
+            })
+          )
+        } else {
+          return this.authService.getSession()
+        }
+      })
+    )
+  }
+
+  post(requestParam: RequestParams): Observable<any> {
+    // return this.authService.getSession().pipe(
+    //   mergeMap((session) => {
+    //     const httpOptions = {
+    //       headers: new HttpHeaders({
+    //         'x-auth-token': session ? session.access_token : "",
+    //         'x-authenticated-user-token': session ? session.access_token : "",
+    //       })
+    //     };
+    //     return this.http.post(this.baseUrl + requestParam.url, requestParam.payload, httpOptions).pipe(
+    //       tap(data => {
+    //         return data
+    //       }, error => {
+    //         catchError(this.handleError(error))
+    //       }),
+    //     );
+    //   })
+    // );
+
+
+    return this.checkTokenValidation().pipe(
+      mergeMap(session => {
+        const httpOptions = {
+          headers: new HttpHeaders({
+            'x-auth-token': session ? session.access_token : '',
+            'x-authenticated-user-token': session ? session.access_token : '',
+            'X-App-Id': this.apiUtils.appName,
+            'X-App-Ver': this.apiUtils.appVersion,
+            'deviceId': this.deviceInfo.getDeviceID(),
+          }),
+        };
+        return this.http.post(this.baseUrl + requestParam.url, requestParam.payload, httpOptions).pipe(
+          tap(data => {
+            return data
+          }, error => {
+            catchError(this.handleError(error))
+          }),
+        );
+      })
+    )
+  }
+
+  delete(requestParam: RequestParams): Observable<any> {
+    
+    return this.checkTokenValidation().pipe(
+      mergeMap(session => {
+        const httpOptions = {
+          headers: new HttpHeaders({
+            'x-auth-token': session ? session.access_token : '',
+            'x-authenticated-user-token': session ? session.access_token : '',
+            'X-App-Id': this.apiUtils.appName,
+            'X-App-Ver': this.apiUtils.appVersion,
+            'deviceId': this.deviceInfo.getDeviceID()
+          }),
+          body: requestParam.payload,
+        };
+        return this.http.delete(this.baseUrl + requestParam.url, httpOptions).pipe(
+          tap(data => {
+            return data
+          }, error => {
+            catchError(this.handleError(error))
+          }),
+        );
+      })
+    )
+  }
+
+
+
+  private handleError(result) {
+    switch (result.status) {
+      case 0:
+        this.toast.showMessage('FRMELEMNTS_MSG_YOU_ARE_WORKING_OFFLINE_TRY_AGAIN', 'danger')
+        break
+      case 401:
+        this.toast.showMessage('Session expired', 'danger')
+        break
+      default:
+        this.toast.showMessage(result.error ? result.error.message : 'FRMELEMNTS_MSG_SOMETHING_WENT_WRONG', 'danger')
+
+    }
+    return (error: any): Observable<any> => {
+      // TODO: send the error to remote logging infrastructure
+      console.error(error, error.status, "status"); // log to console instead, 
+
+      // TODO: better job of transforming error for user consumption
+      // this.log(`${operation} failed: ${error.message}`);
+
+      // Let the app keep running by returning an empty result.
+      // if (error.status === 401) {
+      //   this.auth.sessionExpired();
+      // } else {
+      //   this.toast.showMessage('FRMELEMNTS_MSG_SOMETHING_WENT_WRONG', 'danger')
+      // }
+      return observableOf(result);
+    };
+  }
+}
diff --git a/src/app/manage-learn/core/services/assessment-api.service.ts b/src/app/manage-learn/core/services/assessment-api.service.ts
new file mode 100644
index 000000000..de3507e8c
--- /dev/null
+++ b/src/app/manage-learn/core/services/assessment-api.service.ts
@@ -0,0 +1,26 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable, Inject } from '@angular/core';
+import { ModalController } from '@ionic/angular';
+import { ToastService } from '.';
+import { urlConstants } from '../constants/urlConstants';
+import { ApiService } from './api.service';
+import { AuthService, DeviceInfo } from 'sunbird-sdk';
+import { ApiUtilsService } from './api-utils.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class AssessmentApiService extends ApiService {
+  baseUrl: string;
+  constructor(
+    public http: HttpClient,
+    public toast: ToastService,
+    public modalController: ModalController,
+    @Inject('AUTH_SERVICE') public authService: AuthService,
+    @Inject('DEVICE_INFO') public deviceInfo: DeviceInfo,
+    private utils: ApiUtilsService
+  ) {
+    super(http, toast, modalController, authService, deviceInfo, utils);
+    this.baseUrl = this.utils.getBaseUrl('assessmentBaseUrl') + urlConstants.SERVICES.SAMIKSHA;
+  }
+}
diff --git a/src/app/manage-learn/core/services/attachment/attachment.service.ts b/src/app/manage-learn/core/services/attachment/attachment.service.ts
new file mode 100644
index 000000000..d38a11778
--- /dev/null
+++ b/src/app/manage-learn/core/services/attachment/attachment.service.ts
@@ -0,0 +1,188 @@
+import { Injectable } from "@angular/core";
+import { Camera, CameraOptions, PictureSourceType } from "@ionic-native/camera/ngx";
+import { Chooser } from "@ionic-native/chooser/ngx";
+import { FilePath } from "@ionic-native/file-path/ngx";
+// import { IOSFilePicker } from "@ionic-native/file-picker/ngx";
+import { File } from "@ionic-native/file/ngx";
+import { ActionSheetController, Platform, ToastController } from "@ionic/angular";
+import { TranslateService } from "@ngx-translate/core";
+import { FILE_EXTENSION_HEADERS } from "../../constants";
+
+@Injectable({
+  providedIn: 'root'
+})
+export class AttachmentService {
+  mediaType: string;
+  texts: any;
+
+  constructor(
+    private camera: Camera,
+    private file: File,
+    private actionSheetController: ActionSheetController,
+    private toastController: ToastController,
+    private platform: Platform,
+    private filePath: FilePath,
+    private chooser: Chooser,
+    // private filePickerIOS: IOSFilePicker,
+    private translate: TranslateService
+  ) {
+    this.translate
+      .get([
+        "FRMELEMNTS_MSG_SELECT_IMAGE_SOURCE",
+        "FRMELEMNTS_MSG_LOAD_FROM_LIBRARY",
+        "FRMELEMNTS_MSG_USE_CAMERA",
+        "FRMELEMNTS_MSG_USE_FILE",
+        "CANCEL",
+        "FRMELEMNTS_MSG_ERROR_WHILE_STORING_FILE",
+        "FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED",
+      ])
+      .subscribe((data) => {
+        this.texts = data;
+      });
+  }
+
+  async selectImage() {
+    const actionSheet = await this.actionSheetController.create({
+      header: this.texts["FRMELEMNTS_MSG_SELECT_IMAGE_SOURCE"],
+      cssClass: 'sb-popover',
+      buttons: [
+        {
+          text: this.texts["FRMELEMNTS_MSG_LOAD_FROM_LIBRARY"],
+          handler: () => {
+            this.takePicture(this.camera.PictureSourceType.PHOTOLIBRARY);
+            return false;
+          },
+        },
+        {
+          text: this.texts["FRMELEMNTS_MSG_USE_CAMERA"],
+          handler: () => {
+            this.takePicture(this.camera.PictureSourceType.CAMERA);
+            return false;
+          },
+        },
+        {
+          text: this.texts["FRMELEMNTS_MSG_USE_FILE"],
+          handler: () => {
+            this.openFile();
+            return false;
+          },
+        },
+        {
+          text: this.texts["CANCEL"],
+          role: "cancel",
+        },
+      ],
+    });
+    await actionSheet.present();
+    return actionSheet.onDidDismiss();
+  }
+
+  takePicture(sourceType: PictureSourceType) {
+    var options: CameraOptions = {
+      quality: 10,
+      sourceType: sourceType,
+      saveToPhotoAlbum: false,
+      correctOrientation: true,
+    };
+
+    this.camera
+      .getPicture(options)
+      .then((imagePath) => {
+        if (this.platform.is("android") && sourceType === this.camera.PictureSourceType.PHOTOLIBRARY) {
+          this.filePath
+            .resolveNativePath(imagePath)
+            .then((filePath) => {
+              this.copyFile(filePath);
+            })
+            .catch((err) => { });
+        } else {
+          this.copyFile(imagePath);
+        }
+      })
+      .catch((err) => {
+        console.log(err);
+        if(err !== "No Image Selected") {
+          this.presentToast(this.texts["FRMELEMNTS_MSG_ERROR_WHILE_STORING_FILE"]);
+        }
+      });
+  }
+
+  copyFileToLocalDir(namePath, currentName, newFileName) {
+    this.file.copyFile(namePath, currentName, this.directoryPath(), newFileName).then(
+      (success) => {
+        const data = {
+          name: newFileName,
+          type: this.mimeType(newFileName),
+          isUploaded: false,
+          url: "",
+        };
+
+        this.presentToast(this.texts["FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED"], "success");
+        this.actionSheetController.dismiss(data);
+      },
+      (error) => {
+        this.presentToast(this.texts["FRMELEMNTS_MSG_ERROR_WHILE_STORING_FILE"]);
+      }
+    );
+  }
+
+  async presentToast(text, color = "danger") {
+    const toast = await this.toastController.create({
+      message: text,
+      position: "top",
+      duration: 3000,
+      color: color,
+    });
+    toast.present();
+  }
+
+  async openFile() {
+    new Promise((resolve) => {
+      if (this.platform.is("ios")) {
+        // resolve(this.filePickerIOS.pickFile());
+      } else {
+        resolve(this.chooser.getFileMetadata());
+      }
+    })
+      .then((res: any) => {
+        return this.filePath.resolveNativePath(res.uri);
+      })
+      .then((filePath) => {
+        this.copyFile(filePath);
+      })
+
+      .catch((err) => { });
+  }
+
+  copyFile(filePath) {
+    let correctPath = filePath.substr(0, filePath.lastIndexOf("/") + 1);
+    let currentName = filePath.split("/").pop();
+    currentName = currentName.split("?")[0];
+    this.copyFileToLocalDir(correctPath, currentName, this.createFileName(currentName));
+  }
+
+  createFileName(name) {
+    let d = new Date(),
+      n = d.getTime(),
+      extentsion = name.split(".").pop(),
+      newFileName = n + "." + extentsion;
+    return newFileName;
+  }
+
+  directoryPath(): string {
+    if (this.platform.is("ios")) {
+      return this.file.documentsDirectory;
+    } else {
+      return this.file.externalDataDirectory;
+    }
+  }
+
+  mimeType(fileName) {
+    let ext = fileName.split(".").pop();
+    return FILE_EXTENSION_HEADERS[ext];
+  }
+
+  deleteFile(fileName) {
+    return this.file.removeFile(this.directoryPath(), fileName);
+  }
+}
diff --git a/src/app/manage-learn/core/services/db.service.ts b/src/app/manage-learn/core/services/db.service.ts
new file mode 100644
index 000000000..7847b280b
--- /dev/null
+++ b/src/app/manage-learn/core/services/db.service.ts
@@ -0,0 +1,187 @@
+import { Injectable } from '@angular/core';
+import { AppGlobalService } from '@app/services';
+import PouchDB from 'pouchdb';
+import cordovaSqlitePlugin from 'pouchdb-adapter-cordova-sqlite';
+import PouchDBFind from 'pouchdb-find';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class DbService {
+  pdb: any;
+
+  constructor(private appGlobalService: AppGlobalService) {
+    // this.createDb();
+  }
+
+  async createDb() {
+    PouchDB.plugin(cordovaSqlitePlugin);
+    PouchDB.plugin(PouchDBFind);
+    const db = await new PouchDB('projects', {
+      adapter: 'cordova-sqlite',
+      location: 'default',
+    });
+    const dbInfo = await db.info()
+    let oldData;
+    if (dbInfo.doc_count) {
+     oldData = await db.find({
+        selector: {_id:{$ne:null}},
+      });
+
+      await db.destroy()
+
+     oldData.docs= oldData.docs.map(d => {
+       delete d._rev
+       return d
+      })
+    }
+    this.appGlobalService.getActiveProfileUid().then((userId) => {
+      let dbName= userId + 'projects';
+      // let dbName=  'projects';
+       this.pdb = new PouchDB(dbName, {
+         adapter: 'cordova-sqlite',
+         location: 'default',
+       });
+    }).then(res => {
+      if (oldData && oldData.docs && oldData.docs.length) {
+        this.bulkCreate(oldData.docs)
+      }
+    })
+  }
+
+  createPouchDB(dbName: string) {
+
+  }
+
+  create(entry: any): Promise<any> {
+    return new Promise((resolve, reject) => {
+      this.pdb.post(entry).then(success => {
+        success.ok ? resolve(success) : reject()
+      }).catch(error => {
+        reject(error)
+      })
+    })
+    // return this.pdb.post(entry);
+  }
+
+  update(data): Promise<any> {
+    delete data.__v;
+    data.updatedAt = new Date();
+    return new Promise((resolve, reject) => {
+      this.pdb.put(data).then(success => {
+        console.log(success, "success in update");
+        success.ok ? resolve(success) : reject()
+      }).catch(error => {
+        console.log(error, "error in update");
+        reject(error)
+      })
+    })
+  }
+
+  delete(id, rev): Promise<any> {
+    const obj = {
+      _id: id,
+      _rev: rev
+    }
+    return new Promise((resolve, reject) => {
+      this.pdb.remove(id, rev).then(success => {
+        success.ok ? resolve(success) : reject()
+      }).catch(error => {
+        reject(error)
+      })
+    })
+    // return this.pdb.post(entry);
+  }
+
+  read(limit: number = 20): Promise<any> {
+    return new Promise((resolve, reject) => {
+      this.pdb.allDocs({ include_docs: true, limit: limit })
+        .then(docs => {
+          let data = [];
+          docs.rows.forEach(element => {
+            data.push(element.doc)
+          });
+          resolve(data);
+        }).catch(error => {
+          reject(error);
+        })
+    })
+  }
+
+  bulkCreate(data): Promise<any> {
+    const entries = this.formatDataForBulkCreate(data);
+    return new Promise((resolve, reject) => {
+      this.pdb.bulkDocs(entries).then(success => {
+        // success.ok ? resolve(success) : reject()
+        resolve(success);
+      }).catch(error => {
+        reject()
+      })
+    })
+  }
+
+  formatDataForBulkCreate(data) {
+    for (const item of data) {
+      delete item.__v
+    }
+    return data
+  }
+
+
+  // update(): Promise<any> {
+  //   return new Promise((resolve, reject) => {
+
+  //   })
+  // }
+
+  // delete() : Promise<any> {
+  //   return new Promise((resolve, reject) => {
+
+  //   })
+  // }
+
+  query(selector: any, limit: number = 20): Promise<any> {
+    return new Promise((resolve, reject) => {
+      this.pdb.find({
+        selector: selector,
+        limit: limit
+      }).then(success => {
+        console.log(success, 'success of query')
+        resolve(success);
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  }
+
+  customQuery(query) {
+    return new Promise((resolve, reject) => {
+      this.pdb.find(query).then(success => {
+        console.log(success, 'success of query')
+        resolve(success);
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  }
+
+
+  dropDb(): Promise<any> {
+    return new Promise((resolve, reject) => {
+      this.pdb.destroy().then(success => {
+        success.ok ? resolve(success) : reject()
+      }).catch(error => {
+      })
+    })
+  }
+
+  getById(id): Promise<any> {
+    return new Promise((resolve, reject) => {
+      this.pdb.get(id).then(success => {
+        resolve(success);
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  }
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/core/services/dhiti-api.service.ts b/src/app/manage-learn/core/services/dhiti-api.service.ts
new file mode 100644
index 000000000..855af0a27
--- /dev/null
+++ b/src/app/manage-learn/core/services/dhiti-api.service.ts
@@ -0,0 +1,27 @@
+import { HttpClient } from '@angular/common/http';
+import { Inject, Injectable } from '@angular/core';
+import { ModalController } from '@ionic/angular';
+import { AuthService, DeviceInfo } from '@project-sunbird/sunbird-sdk';
+import { ToastService, UtilsService } from '.';
+import { urlConstants } from '../constants/urlConstants';
+import { ApiUtilsService } from './api-utils.service';
+import { ApiService } from './api.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class DhitiApiService extends ApiService {
+  baseUrl: string;
+  constructor(
+    public http: HttpClient,
+    public toast: ToastService,
+    public modalController: ModalController,
+    @Inject('AUTH_SERVICE') public authService: AuthService,
+    @Inject('DEVICE_INFO') public deviceInfo: DeviceInfo,
+
+    private utils: ApiUtilsService
+  ) {
+    super(http, toast, modalController, authService,deviceInfo, utils);
+    this.baseUrl = this.utils.getBaseUrl('assessmentBaseUrl') + urlConstants.SERVICES.DHITI;
+  }
+}
diff --git a/src/app/manage-learn/core/services/evidence.service.ts b/src/app/manage-learn/core/services/evidence.service.ts
new file mode 100644
index 000000000..bcde145da
--- /dev/null
+++ b/src/app/manage-learn/core/services/evidence.service.ts
@@ -0,0 +1,263 @@
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+import { RouterLinks } from '@app/app/app.constant';
+import { ActionSheetController, AlertController, ModalController, ToastController } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+import { RemarksModalComponent } from '../../questionnaire/remarks-modal/remarks-modal.component';
+import { urlConstants } from '../constants/urlConstants';
+import { AssessmentApiService } from './assessment-api.service';
+import { LoaderService } from './loader/loader.service';
+import { LocalStorageService } from './local-storage/local-storage.service';
+import { ToastService } from './toast/toast.service';
+import { UtilsService } from './utils.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class EvidenceService {
+  entityDetails: any;
+  evidenceIndex: any;
+  schoolId: any;
+  constructor(
+    private actionSheet: ActionSheetController,
+    private localStorage: LocalStorageService,
+    private utils: UtilsService,
+    private translate: TranslateService,
+    private alertCtrl: AlertController,
+    private router: Router,
+    private modalCtrl: ModalController,
+    private loader: LoaderService,
+    private toast: ToastService,
+    private assessmentService: AssessmentApiService
+  ) {}
+
+  openActionSheet(params, type?) {
+    type = type ? type : '';
+    console.log(JSON.stringify(params) + ' test');
+    this.entityDetails = params.entityDetails;
+    this.schoolId = params._id;
+    this.evidenceIndex = params.selectedEvidence;
+    const selectedECM = this.entityDetails['assessment']['evidences'][this.evidenceIndex];
+    let translateObject;
+    return new Promise((resolve, reject) => {
+      this.translate
+        .get([
+          'FRMELEMNTS_LBL_SURVEY_ACTION',
+          'VIEW',
+          'START',
+          'FRMELEMNTS_LBL_ECM_NOT_APPLICABLE',
+          'CANCEL',
+          'FRMELEMNTS_LBL_ECM_NOT_ALLOWED',
+          'FRMELEMNTS_LBL_OBSERVATION',
+        ])
+        .subscribe(async (translations) => {
+          translateObject = translations;
+          console.log(JSON.stringify(translations));
+          let action = await this.actionSheet.create({
+            header: translateObject['FRMELEMNTS_LBL_SURVEY_ACTION'],
+            buttons: [
+              {
+                text: translateObject['START'] + ' ' + (type ? translateObject[type] : ''),
+                icon: 'arrow-forward',
+                handler: () => {
+                  params.entityDetails['assessment']['evidences'][params.selectedEvidence].startTime = Date.now();
+
+                  this.localStorage.setLocalStorage(
+                    this.utils.getAssessmentLocalStorageKey(this.schoolId),
+                    params.entityDetails
+                  );
+                  delete params.entityDetails;
+
+                  resolve('start');
+                },
+              },
+              {
+                text: translateObject['VIEW'] + ' ' + (type ? translateObject[type] : ''),
+                icon: 'eye',
+                handler: () => {
+                  delete params.entityDetails;
+
+                  resolve('view');
+                },
+              },
+              {
+                text: selectedECM.canBeNotAllowed
+                  ? translateObject['FRMELEMNTS_LBL_ECM_NOT_APPLICABLE']
+                  : translateObject['CANCEL'],
+                role: !selectedECM.canBeNotAllowed ? 'destructive' : '',
+                icon: selectedECM.canBeNotAllowed ? 'alert' : '',
+                handler: () => {
+                  if (selectedECM.canBeNotAllowed) {
+                    this.openAlert(selectedECM);
+                  }
+                },
+              },
+            ],
+          });
+          const notAvailable = {
+            text: translateObject['FRMELEMNTS_LBL_ECM_NOT_ALLOWED'],
+            icon: 'alert',
+            handler: () => {
+              delete params.entityDetails;
+              this.openAlert(selectedECM);
+            },
+          };
+          if (selectedECM.canBeNotAllowed) {
+            // action.data.buttons.splice(action.data.buttons.length - 1, 0, notAvailable);TODO:need to verify
+            action.buttons.splice(action.buttons.length - 1, 0, notAvailable);
+          }
+          action.present();
+        });
+    });
+  }
+
+  async openAlert(selectedECM) {
+    let translateObject;
+    this.translate
+      .get(['CANCEL', 'FRMELEMNTS_LBL_CONFIRM', 'FRMELEMNTS_LBL_ECM_NOT_APPLICABLE'])
+      .subscribe((translations) => {
+        translateObject = translations;
+        console.log(JSON.stringify(translations));
+      });
+    let alert = await this.alertCtrl.create({
+      header: translateObject['FRMELEMNTS_LBL_CONFIRM'],
+      message: translateObject['FRMELEMNTS_LBL_ECM_NOT_APPLICABLE'],
+      buttons: [
+        {
+          text: translateObject['CANCEL'],
+          role: 'cancel',
+          handler: () => {
+            console.log('Cancel clicked');
+          },
+        },
+        {
+          text: translateObject['FRMELEMNTS_LBL_CONFIRM'],
+          handler: () => {
+            this.openRemarksModal(selectedECM);
+          },
+        },
+      ],
+    });
+    await alert.present();
+  }
+
+  async openRemarksModal(selectedECM) {
+    const modal = await this.modalCtrl.create({
+      component: RemarksModalComponent,
+      componentProps: { data: selectedECM, button: 'submit', required: true },
+    });
+    await modal.present();
+
+    await modal.onDidDismiss().then((remarks) => {
+      if (remarks.data) {
+        selectedECM.remarks = remarks.data;
+        this.notApplicable(selectedECM);
+      }
+    });
+  }
+
+  async notApplicable(selectedECM) {
+    this.loader.startLoader();
+    const constructPayload = this.constructPayload(selectedECM);
+    const submissionId = this.entityDetails['assessment'].submissionId;
+    const url = urlConstants.API_URLS.OBSERVATION_SUBMISSION_UPDATE + submissionId;
+    let payload = await this.utils.getProfileInfo();
+    payload = { ...payload, ...constructPayload };
+    const config = {
+      url: url,
+      payload: payload,
+    };
+
+    this.assessmentService.post(config).subscribe(
+      (response) => {
+        console.log(JSON.stringify(response));
+        this.toast.openToast(response.message);
+        this.entityDetails['assessment']['evidences'][this.evidenceIndex].isSubmitted = true;
+        this.entityDetails['assessment']['evidences'][this.evidenceIndex].notApplicable = true;
+        this.localStorage.setLocalStorage(this.utils.getAssessmentLocalStorageKey(this.schoolId), this.entityDetails);
+        this.loader.stopLoader();
+      },
+      (error) => {
+        this.loader.stopLoader();
+      }
+    );
+  }
+
+  constructPayload(selectedECM): any {
+    console.log('in construct');
+    const payload = {
+      evidence: {},
+    };
+    const evidence = {
+      id: '',
+      externalId: '',
+      answers: {},
+      startTime: 0,
+      endTime: 0,
+      notApplicable: true,
+    };
+
+    const currentEvidence = selectedECM;
+    evidence.id = currentEvidence._id;
+    evidence.externalId = currentEvidence.externalId;
+    evidence.startTime = Date.now();
+    evidence.endTime = Date.now();
+    for (const section of selectedECM.sections) {
+      for (const question of section.questions) {
+        let obj = {
+          qid: question._id,
+          value:
+            question.responseType === 'matrix'
+              ? this.constructMatrixObject(question, evidence.endTime)
+              : question.value,
+          remarks: question.remarks,
+          fileName: question.fileName,
+          notApplicable: true,
+          startTime: evidence.endTime,
+          endTime: evidence.endTime,
+          payload: {
+            question: question.question,
+            labels: [],
+            responseType: question.responseType,
+          },
+        };
+
+        for (const key of Object.keys(question.payload)) {
+          obj[key] = question.payload[key];
+        }
+        evidence.answers[obj.qid] = obj;
+      }
+    }
+    payload.evidence = evidence;
+    return payload;
+  }
+
+  constructMatrixObject(question, evidenceEndTime) {
+    const value = [];
+    for (const instance of question.value) {
+      let eachInstance = {};
+      for (let qst of instance) {
+        const obj1 = {
+          qid: qst._id,
+          value: qst.value,
+          remarks: qst.remarks,
+          fileName: qst.fileName,
+          notApplicable: true,
+          startTime: evidenceEndTime,
+          endTime: evidenceEndTime,
+          payload: {
+            question: qst.question,
+            labels: [],
+            responseType: qst.responseType,
+          },
+        };
+        for (const key of Object.keys(qst.payload)) {
+          obj1[key] = qst.payload[key];
+        }
+        eachInstance[obj1.qid] = obj1;
+      }
+      value.push(eachInstance);
+    }
+    return value;
+  }
+}
diff --git a/src/app/manage-learn/core/services/index.ts b/src/app/manage-learn/core/services/index.ts
new file mode 100644
index 000000000..f015964bb
--- /dev/null
+++ b/src/app/manage-learn/core/services/index.ts
@@ -0,0 +1,8 @@
+export * from './local-storage/local-storage.service';
+export * from './utils.service';
+export * from './loader/loader.service';
+export * from './toast/toast.service';
+export * from './db.service';
+export * from './attachment/attachment.service';
+export * from './network.service';
+export * from './api-utils.service';
\ No newline at end of file
diff --git a/src/app/manage-learn/core/services/kendra-api.service.ts b/src/app/manage-learn/core/services/kendra-api.service.ts
new file mode 100644
index 000000000..6487b34a8
--- /dev/null
+++ b/src/app/manage-learn/core/services/kendra-api.service.ts
@@ -0,0 +1,27 @@
+import { Injectable, Inject } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { ModalController } from '@ionic/angular';
+import { ApiService } from './api.service';
+import { urlConstants } from '../constants/urlConstants';
+import { ToastService } from './toast/toast.service';
+import { AuthService, DeviceInfo } from 'sunbird-sdk';
+import { ApiUtilsService } from './api-utils.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class KendraApiService extends ApiService {
+  baseUrl: string;
+  constructor(
+    public http: HttpClient,
+    public toast: ToastService,
+    public modalController: ModalController,
+    @Inject('AUTH_SERVICE') public authService: AuthService,
+    @Inject('DEVICE_INFO') public deviceInfo: DeviceInfo,
+
+    private utils: ApiUtilsService
+  ) {
+    super(http, toast, modalController, authService, deviceInfo, utils);
+    this.baseUrl = this.utils.getBaseUrl('assessmentBaseUrl') + urlConstants.SERVICES.KENDRA;
+  }
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/core/services/loader/loader.service.ts b/src/app/manage-learn/core/services/loader/loader.service.ts
new file mode 100644
index 000000000..4102f497d
--- /dev/null
+++ b/src/app/manage-learn/core/services/loader/loader.service.ts
@@ -0,0 +1,41 @@
+import { Injectable } from '@angular/core';
+import { LoadingController } from '@ionic/angular';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class LoaderService {
+  loaderRef: any;
+  isLoading: boolean = false;
+  loaderCounter = 0;
+  loading: HTMLIonLoadingElement;
+
+  constructor(private loadingController: LoadingController) {}
+
+  async startLoader(message?) {
+    if (this.loaderCounter < 0) {
+      this.loaderCounter=0
+    }
+    this.loaderCounter = this.loaderCounter + 1;
+
+    if (this.loaderCounter === 1) {
+      this.isLoading = true;
+      this.loading = await this.loadingController.create({
+        cssClass: 'custom-loader-message-class',
+        spinner: 'circular',
+        message: message ? message : 'Please wait while loading ...',
+        translucent: true,
+        backdropDismiss: false,
+      });
+      await this.loading.present();
+    }
+  }
+
+  async stopLoader() {
+    this.loaderCounter = this.loaderCounter - 1;
+    if (this.loaderCounter === 0) {
+      this.isLoading = false;
+      await this.loading.dismiss();
+    }
+  }
+}
diff --git a/src/app/manage-learn/core/services/local-storage/local-storage.service.ts b/src/app/manage-learn/core/services/local-storage/local-storage.service.ts
new file mode 100644
index 000000000..9f065e9f4
--- /dev/null
+++ b/src/app/manage-learn/core/services/local-storage/local-storage.service.ts
@@ -0,0 +1,81 @@
+import { Injectable } from '@angular/core';
+import { AppGlobalService } from '@app/services';
+import { Storage } from '@ionic/storage';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class LocalStorageService {
+  constructor(private storage: Storage, private appGlobalService: AppGlobalService) {}
+
+  setLocalStorage(key, value): Promise<any> {
+    return new Promise((resolve, reject) => {
+      this.appGlobalService
+        .getActiveProfileUid()
+        .then((userId) => {
+          key = userId + key;
+        })
+        .then(() => {
+          this.storage.set(key, value).then((success) => {
+            resolve(success);
+          });
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  }
+
+  getLocalStorage(key): Promise<any> {
+    return new Promise((resolve, reject) => {
+      this.appGlobalService
+        .getActiveProfileUid()
+        .then((userId) => {
+          key = userId + key;
+        })
+        .then(() => {
+          this.storage.get(key).then((data) => {
+            if (data) {
+              resolve(data);
+            } else {
+              reject(null);
+            }
+          });
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  }
+
+  deleteAllStorage(): Promise<any> {
+    return new Promise((resolve, reject) => {
+      this.storage
+        .clear()
+        .then((data) => {
+          resolve(data);
+        })
+        .catch((error) => {
+          reject();
+        });
+    });
+  }
+
+  deleteOneStorage(key): Promise<any> {
+    return new Promise((resolve, reject) => {
+      this.appGlobalService
+        .getActiveProfileUid()
+        .then((userId) => {
+          key = userId + key;
+        })
+        .then(() => {
+          this.storage.remove(key).then((data) => {
+            resolve(data);
+          });
+        })
+        .catch((error) => {
+          reject();
+        });
+    });
+  }
+}
diff --git a/src/app/manage-learn/core/services/network.service.ts b/src/app/manage-learn/core/services/network.service.ts
new file mode 100644
index 000000000..746d57fba
--- /dev/null
+++ b/src/app/manage-learn/core/services/network.service.ts
@@ -0,0 +1,69 @@
+import { Injectable } from '@angular/core';
+import { Network } from '@ionic-native/network/ngx';
+import { Subject } from 'rxjs';
+import { TranslateService } from '@ngx-translate/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class NetworkService {
+  connectSubscription;
+  disconnectSubscription;
+  syncSettingData: any;
+  $networkStatus = new Subject();
+  isNetworkAvailable: boolean = false;
+  constructor(
+    private network: Network,
+    // private toast: ToastMessageService,
+    private translate: TranslateService,
+    // private storage: LocalStorageService,
+  ) { }
+
+  public netWorkCheck() {
+    this.getCurrentStatus();
+    this.disconnectSubscription = this.network.onDisconnect().subscribe(() => {
+      //alert('network was disconnected :-(');
+      this.isNetworkAvailable = false;
+      this.$networkStatus.next(this.isNetworkAvailable);
+      // this.translate.get('MESSAGES.YOU_ARE_WORKING_OFFLINE').subscribe(data => {
+      //   !this.isNetworkAvailable ? this.toast.showMessage(data, 'danger', 'construct-outline') : ''
+      // })
+    });
+    this.connectSubscription = this.network.onConnect().subscribe(() => {
+      this.isNetworkAvailable = true;
+      this.$networkStatus.next(this.isNetworkAvailable);
+    });
+  }
+
+  public getCurrentStatus() {
+    if (this.network.type == 'none') {
+      this.isNetworkAvailable = false;
+      this.$networkStatus.next(this.isNetworkAvailable);
+    } else {
+      this.isNetworkAvailable = true;
+      this.$networkStatus.next(this.isNetworkAvailable);
+    }
+  }
+  // public stopNetworkService() {
+  //   this.connectSubscription.unsubscribe();
+  //   this.disconnectSubscription.unsubscribe();
+  // }
+
+  // method to handle on sync setting change
+  checkSyncSettings(): Promise<any> {
+    return new Promise((resolve, reject) => {
+      // this.storage.getLocalStorage(localStorageConstants.SYNC_VARIABLE).then(success => {
+      //   this.syncSettingData = success;
+      //   if ((this.network.type === 'wifi' && this.syncSettingData == 'WIFI') || (this.network.type !== 'none' && this.syncSettingData == 'ON')) {
+      //     resolve();
+      //     console.log('we got a wifi connection, woohoo!');
+      //   } else {
+      //     reject();
+      //   }
+      // }).catch(error => {
+      // });
+      
+    });
+  }
+
+}
diff --git a/src/app/manage-learn/core/services/program.service.ts b/src/app/manage-learn/core/services/program.service.ts
new file mode 100644
index 000000000..702bf7714
--- /dev/null
+++ b/src/app/manage-learn/core/services/program.service.ts
@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ProgramService {
+
+  constructor() { }
+}
diff --git a/src/app/manage-learn/core/services/project-report.service.ts b/src/app/manage-learn/core/services/project-report.service.ts
new file mode 100644
index 000000000..df834109a
--- /dev/null
+++ b/src/app/manage-learn/core/services/project-report.service.ts
@@ -0,0 +1,10 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ProjectReportService {
+  filterForReport: any;
+
+  constructor() {}
+}
diff --git a/src/app/manage-learn/core/services/sharing-feature.service.ts b/src/app/manage-learn/core/services/sharing-feature.service.ts
new file mode 100644
index 000000000..2d9e3b482
--- /dev/null
+++ b/src/app/manage-learn/core/services/sharing-feature.service.ts
@@ -0,0 +1,146 @@
+import { Injectable } from '@angular/core';
+import { File } from "@ionic-native/file/ngx";
+import { SocialSharing } from "@ionic-native/social-sharing/ngx";
+import { FileChooser } from '@ionic-native/file-chooser/ngx';
+import { LoaderService, ToastService, UtilsService } from '@app/app/manage-learn/core';
+import { UnnatiDataService } from '@app/app/manage-learn/core/services/unnati-data.service';
+import { AndroidPermissions } from '@ionic-native/android-permissions/ngx';
+import { FilePath } from '@ionic-native/file-path/ngx';
+import { FileTransfer } from '@ionic-native/file-transfer/ngx';
+import { AlertController, Platform, PopoverController } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+import { FileOpener } from '@ionic-native/file-opener/ngx';
+import { NetworkService } from './network.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class SharingFeatureService {
+  texts: any;
+
+  constructor(
+    private fileChooser: FileChooser,
+    private file: File,
+    private socialSharing: SocialSharing,
+    private fileTransfer: FileTransfer,
+    private toast: ToastService,
+    private platform: Platform,
+    private utils: UtilsService,
+    public alertController: AlertController,
+    public loader: LoaderService,
+    public filePath: FilePath,
+    public unnatiSrvc: UnnatiDataService,
+    private translate: TranslateService,
+    private androidPermissions: AndroidPermissions,
+    public fileOpener: FileOpener,
+    public network :NetworkService
+  ) {
+    console.log('Hello SharingFeaturesProvider Provider');
+  }
+
+  sharingThroughApp(fileName?) {
+    let subject = 'hi';
+    let link = 'google.com';
+    let message = 'hi';
+    if (!fileName) {
+      this.fileChooser
+        .open()
+        .then((uri) => {
+          (<any>window).FilePath.resolveNativePath(uri, (result) => {
+            let fileName = result.split('/').pop();
+            let path = result.substring(0, result.lastIndexOf('/') + 1);
+            this.file
+              .readAsDataURL(path, fileName)
+              .then((base64File) => {
+                this.socialSharing
+                  .share(message, subject, base64File, link)
+                  .then(() => {
+                    console.log('share Success');
+                  })
+                  .catch(() => {
+                    console.log('share Failure');
+                  });
+              })
+              .catch(() => {
+                console.log('Error reading file');
+              });
+          });
+        })
+        .catch((e) => console.log(e));
+    } else {
+      (<any>window).FilePath.resolveNativePath(fileName, (result) => {
+        let fileName = result.split('/').pop();
+        let path = result.substring(0, result.lastIndexOf('/') + 1);
+        this.file
+          .readAsDataURL(path, fileName)
+          .then((base64File) => {
+            this.socialSharing
+              .share('', fileName, base64File, '')
+              .then(() => {
+                console.log('share Success');
+              })
+              .catch(() => {
+                console.log('share Failure');
+              });
+          })
+          .catch(() => {
+            console.log('Error reading file');
+          });
+      });
+    }
+  }
+
+  regularShare(msg): Promise<any> {
+    return this.socialSharing.share(msg, null, null, null);
+  }
+
+
+  async getFileUrl(config, name) {
+    if(this.network.isNetworkAvailable){
+      this.loader.startLoader();
+      let res = await this.unnatiSrvc.get(config).toPromise();
+      if (res.result && !res.result.data && !res.result.data.downloadUrl) {
+        this.toast.showMessage(this.texts['FRMELEMENTS_MSG_ERROR_WHILE_DOWNLOADING'], 'danger');
+        this.loader.stopLoader();
+        return;
+      }
+      let fileName = name + '.pdf';
+      const ft = this.fileTransfer.create();
+      ft.download(res.result.data.downloadUrl, this.directoryPath() + fileName)
+      .then(
+        (res) => {
+          this.socialSharing.share(null, null, res.nativeURL, null).then(data =>{
+          },error =>{
+          })
+        },
+        (err) => {
+          this.requestPermission();
+          this.toast.showMessage(this.texts['FRMELEMENTS_MSG_ERROR_WHILE_DOWNLOADING'], 'danger');
+        }
+      )
+      .finally(() => {
+        this.loader.stopLoader();
+      });
+    }else{
+      this.toast.showMessage('FRMELEMNTS_MSG_OFFLINE', 'danger');
+    }
+   
+  }
+  directoryPath(): string {
+    let dir_name = 'Download/';
+    if (this.platform.is('ios')) {
+      return this.file.documentsDirectory + dir_name;
+    } else {
+      return this.file.externalRootDirectory + dir_name;
+    }
+  }
+
+  requestPermission() {
+    if (this.platform.is('android')) {
+      this.androidPermissions.requestPermissions([
+        this.androidPermissions.PERMISSION.READ_EXTERNAL_STORAGE,
+        this.androidPermissions.PERMISSION.WRITE_EXTERNAL_STORAGE,
+      ]);
+    }
+  }
+}
diff --git a/src/app/manage-learn/core/services/sunbird.service.ts b/src/app/manage-learn/core/services/sunbird.service.ts
new file mode 100644
index 000000000..82e269d05
--- /dev/null
+++ b/src/app/manage-learn/core/services/sunbird.service.ts
@@ -0,0 +1,27 @@
+import { Injectable , Inject} from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { ModalController } from '@ionic/angular';
+import { ApiService } from './api.service';
+import { urlConstants } from '../constants/urlConstants';
+import { ToastService } from './toast/toast.service';
+import { AuthService, DeviceInfo } from 'sunbird-sdk';
+import { ApiUtilsService } from './api-utils.service';
+
+
+@Injectable({
+  providedIn: 'root',
+})
+export class SunbirdService extends ApiService {
+  baseUrl: string;
+  constructor(
+    public http: HttpClient,
+    public toast: ToastService,
+    public modalController: ModalController,
+    @Inject('AUTH_SERVICE') public authService: AuthService,
+    @Inject('DEVICE_INFO') public deviceInfo: DeviceInfo,
+    private utils: ApiUtilsService
+  ) {
+    super(http, toast, modalController, authService,deviceInfo, utils);
+    this.baseUrl = this.utils.getBaseUrl('assessmentBaseUrl') + urlConstants.SERVICES.SUNBIRD;
+  }
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/core/services/survey-provider.service.ts b/src/app/manage-learn/core/services/survey-provider.service.ts
new file mode 100644
index 000000000..0f4cdbe2b
--- /dev/null
+++ b/src/app/manage-learn/core/services/survey-provider.service.ts
@@ -0,0 +1,174 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+import { ModalController, ToastController } from '@ionic/angular';
+import { rejects } from 'assert';
+import { LoaderService, LocalStorageService, UtilsService } from '..';
+import { urlConstants } from '../constants/urlConstants';
+import { AssessmentApiService } from './assessment-api.service';
+import { UpdateLocalSchoolDataService } from './update-local-school-data.service';
+import { SurveyMsgComponent } from '../../shared/components/survey-msg/survey-msg.component';
+import { storageKeys } from '../../storageKeys';
+import { DhitiApiService } from './dhiti-api.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class SurveyProviderService {
+  constructor(
+    private localStorage: LocalStorageService,
+    private ulsdp: UpdateLocalSchoolDataService,
+    private utils: UtilsService,
+    private httpClient: HttpClient,
+    private loader: LoaderService,
+    private assessmentService: AssessmentApiService,
+    private router: Router,
+    private modalCtrl: ModalController,
+    private dhiti: DhitiApiService,
+    private toast: ToastController
+  ) {}
+
+  // get all list
+  // getSurveyListing(): Promise<any> {
+  //   const url = AppConfigs.surveyFeedback.surveyListing;
+  //   return new Promise((resolve, reject) => {
+  //     this.apiProvider.httpGet(
+  //       url,
+  //       (success) => {
+  //         resolve(success.result);
+  //       },
+  //       (err) => {
+  //         reject(err);
+  //       }
+  //     );
+  //   });
+  // }
+
+  // pass the link which is present in deeplink(deeplink last param)
+  async getDetailsByLink(link): Promise<any> {
+    let payload = await this.utils.getProfileInfo();
+    const config = {
+      url: urlConstants.API_URLS.SURVEY_FEEDBACK.GET_DETAILS_BY_LINK + link,
+      payload: payload,
+    };
+
+    return new Promise((resolve, reject) => {
+      this.assessmentService.post(config).subscribe(
+        (success) => {
+          resolve(success);
+        },
+        (error) => {
+          rejects(error);
+        }
+      );
+    });
+    // TODO:Remove
+    // const url = AppConfigs.surveyFeedback.getDetailsByLink + link;
+    // return new Promise((resolve, reject) => {
+    //   this.apiProvider.httpGet(
+    //     url,
+    //     (success) => {
+    //       resolve(success);
+    //     },
+    //     (err) => {
+    //       reject(err);
+    //     }
+    //   );
+    // });
+  }
+
+  async getDetailsById(surveyId, solutionId): Promise<any> {
+    let payload = await this.utils.getProfileInfo();
+    let url = urlConstants.API_URLS.SURVEY_FEEDBACK.GET_DETAILS_BY_ID;
+    if (surveyId) {
+      url = `${url}/${surveyId}`;
+    }
+    url = url + `?solutionId=${solutionId}`;
+    const config = {
+      url: url,
+      payload: payload,
+    };
+
+    return new Promise((resolve, reject) => {
+      this.assessmentService.post(config).subscribe(
+        (success) => {
+          resolve(success);
+        },
+        (error) => {
+          rejects(error);
+        }
+      );
+    });
+
+    // return this.httpClient.get('assets/dummy/surveydetails.json').toPromise();
+    //  const url = AppConfigs.surveyFeedback.getDetailsById + surveyId;
+    //  return new Promise((resolve, reject) => {
+    //    this.apiProvider.httpGet(
+    //      url,
+    //      (success) => {
+    //        resolve(success);
+    //      },
+    //      (err) => {
+    //        reject(err);
+    //      }
+    //    );
+    //  });
+  }
+
+  storeSurvey(submissionId, survey) {
+    return this.localStorage
+      .getLocalStorage(storageKeys.submissionIdArray)
+      .then((submissionArr) => {
+        const x = submissionArr.includes(submissionId);
+        if (!x) {
+          survey['assessment']['evidences'][0].startTime = Date.now();
+          survey['survey'] = true;
+          this.localStorage.setLocalStorage(this.utils.getAssessmentLocalStorageKey(submissionId), survey);
+          this.ulsdp.updateSubmissionIdArr(submissionId);
+          return survey;
+        } else {
+          return survey;
+        }
+      })
+      .catch((err) => {
+        survey['assessment']['evidences'][0].startTime = Date.now();
+        survey['survey'] = true;
+        this.localStorage.setLocalStorage(this.utils.getAssessmentLocalStorageKey(submissionId), survey);
+        this.ulsdp.updateSubmissionIdArr(submissionId);
+        return survey;
+      });
+  }
+
+  async showMsg(option, popToRoot = false) {
+    // popToRoot ? this.app.getRootNav().popToRoot() : null;
+    popToRoot ? this.router.navigate(['']) : null;
+    const modal =await  this.modalCtrl.create({
+      component: SurveyMsgComponent,
+      componentProps: { option: option },
+    });
+    await modal.present();
+  }
+
+  viewAllAns(payload) {
+    this.loader.startLoader()
+    let url = urlConstants.API_URLS.SURVEY_FEEDBACK.GET_ALL_ANSWERS 
+      const config = {
+        url: url,
+        payload: payload,
+      };
+    return new Promise((resolve, reject) => {
+      this.dhiti.post(
+       config).subscribe(
+        (success) => {
+          this.loader.stopLoader();
+          resolve(success);
+        },
+        (error) => {
+          this.toast.create(error.message);
+          this.loader.stopLoader();
+          reject();
+        },
+      );
+    });
+  }
+}
diff --git a/src/app/manage-learn/core/services/sync.service.ts b/src/app/manage-learn/core/services/sync.service.ts
new file mode 100644
index 000000000..f1caaaaa3
--- /dev/null
+++ b/src/app/manage-learn/core/services/sync.service.ts
@@ -0,0 +1,230 @@
+import { Injectable } from '@angular/core';
+import * as _ from 'underscore';
+import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { FileTransfer, FileTransferObject } from '@ionic-native/file-transfer/ngx';
+import { File } from '@ionic-native/file/ngx';
+import { Platform } from '@ionic/angular';
+import { NetworkService } from './network.service';
+import { localStorageConstants } from '../constants/localStorageConstants';
+import { urlConstants } from '../constants/urlConstants';
+import { KendraApiService } from './kendra-api.service';
+import { LocalStorageService } from './local-storage/local-storage.service';
+import { ToastService } from './toast/toast.service';
+import { UnnatiDataService } from './unnati-data.service';
+import { LoaderService } from './loader/loader.service';
+import { DbService } from './db.service';
+var environment = {
+  db: {
+    projects: "project.db",
+    categories: "categories.db",
+  }
+};
+@Injectable({
+  providedIn: 'root'
+})
+export class SyncService {
+
+  allStrings;
+  isIos: boolean = false;
+  fileBasePath;
+
+  constructor(
+    private unnatiServ: UnnatiDataService,
+    private loader: LoaderService,
+    private localStorage: LocalStorageService,
+    private network: NetworkService,
+    private router: Router,
+    private toast: ToastService,
+    private translate: TranslateService,
+    private db: DbService,
+    private kendra: KendraApiService,
+    private file: File,
+    private fileTransfer: FileTransfer,
+    private platform: Platform
+  ) {
+
+    this.translate.get(['FRMELEMNTS_MSG_PLEASE_NETWORK']).subscribe(stringValues => {
+      this.allStrings = stringValues;
+    })
+    this.isIos = this.platform.is('ios');
+    this.fileBasePath = this.isIos ? this.file.documentsDirectory : this.file.externalDataDirectory;
+  }
+
+
+  checkForSync() {
+    this.db.createPouchDB(environment.db.projects);
+    //check if there is any unsynced data
+    this.db.customQuery({
+      selector: {
+        $or: [
+          { isNew: true },
+          { isEdit: true },
+        ]
+      }
+    }).then(success => {
+      if (success['docs'].length) {
+
+        //check the sync settings
+        if(!this.network.isNetworkAvailable){
+          this.toast.showMessage(this.allStrings['FRMELEMNTS_MSG_PLEASE_NETWORK'], 'danger')
+        } else {
+          this.router.navigate(['/menu/sync']);
+
+        }
+
+        // this.localStorage.getLocalStorage(localStorageConstants.SYNC_VARIABLE).then(status => {
+        //   if (status === 'ON' && this.network.isNetworkAvailable) {
+        //     this.router.navigate(['/menu/sync']);
+        //   } else if (status === 'ON' && !this.network.isNetworkAvailable) {
+        //     this.toast.showMessage(this.allStrings['FRMELEMNTS_MSG_PLEASE_NETWORK'], 'danger')
+        //   } else {
+        //   }
+        // }).catch(error => {
+        //   this.router.navigate(['/menu/sync']);
+        // })
+      }
+    })
+  }
+
+  syncApiRequest(payload, showLoader: boolean = false): Promise<any> {
+    const obj = this.processPayload(payload);
+    const { _id } = payload;
+    delete payload._id;
+    if(!obj.programId){
+      delete obj.programId
+    }
+    showLoader ? this.loader.startLoader() : null;
+    const config = {
+      url: urlConstants.API_URLS.SYNC_PROJECT + _id + `?lastDownloadedAt=${payload.lastDownloadedAt}`,
+      payload: obj
+    }
+    return new Promise((resolve, reject) => {
+      this.unnatiServ.post(config).subscribe(success => {
+        showLoader ? this.loader.stopLoader() : null;
+        resolve(success)
+      }, error => {
+        showLoader ? this.loader.stopLoader() : null;
+        reject(error);
+      })
+    })
+  }
+
+
+  createNewProject(showLoader: boolean = false): Promise<any> {
+    showLoader ? this.loader.startLoader() : null;
+    // const config = {
+    //   url: urlConstants.API_URLS.CREATE_PROJECT_DOC
+    // }
+    return new Promise((resolve, reject) => {
+      // this.unnatiServ.get(config).subscribe(success => {
+      //   showLoader ? this.loader.stopLoader() : null;
+        resolve([])
+      // }, error => {
+      //   showLoader ? this.loader.stopLoader() : null;
+      //   reject(error);
+      // })
+    })
+  }
+
+  removeKeys(doc, fields) {
+    for (const field of fields) {
+      delete doc[field]
+      doc.tasks = this.deleteSpecificKey(doc.tasks, field)
+    }
+    return doc
+  }
+
+  deleteSpecificKey(tasks, key) {
+    for (const task of tasks) {
+      delete task[key];
+      if (task.children && task.children.length) {
+        for (const subTask of task.children) {
+          delete subTask[key]
+        }
+      }
+    }
+    return tasks
+  }
+
+  getImageUploadUrls(projects): Promise<any> {
+    const payload = { ...this.createImageUrlPayload(projects) }
+    console.log(payload)
+    return new Promise((resolve, reject) => {
+      const config = {
+        url: urlConstants.API_URLS.PRESIGNED_URLS,
+        payload: payload,
+      };
+      this.kendra.post(config).subscribe(success => {
+        resolve(success.result[projects._id].files)
+        console.log(success);
+      }, error => {
+        reject(error);
+        console.log(error)
+      })
+    })
+  }
+
+  createImageUrlPayload(project) {
+    const payload = { request: {}, ref: 'improvementProject' };
+    const completeImgObj = this.getAllAttachmentOfProject(project);
+    const payloadImages = [];
+    for (const image of completeImgObj) {
+      payloadImages.push(image.name);
+    }
+    payload.request[project._id] = {
+      files: payloadImages
+    }
+    return payload
+  }
+
+  getAllAttachmentOfProject(project) {
+    let attachments = [];
+    for (const task of project.tasks) {
+      if (task.attachments && task.attachments.length) {
+        for (const attachment of task.attachments) {
+          !attachment['sourcePath'] ? attachments.push(attachment) : null;
+        }
+      }
+    }
+    return attachments
+  }
+
+  processPayload(payload) {
+    delete payload._rev;
+    delete payload.solutionInformation;
+    delete payload.programInformation;
+    delete payload.userId;
+    return payload
+  }
+
+
+  cloudImageUpload(fileDetails) {
+    return new Promise((resolve, reject) => {
+      this.file.checkFile(this.fileBasePath, fileDetails.name).then(success => {
+        var options = {
+          fileKey: fileDetails.name,
+          fileName: fileDetails.name,
+          chunkedMode: false,
+          mimeType: fileDetails.type,
+          headers: {
+            "Content-Type": "multipart/form-data",
+            "x-ms-blob-type":
+              fileDetails.cloudStorage === "AZURE"
+                ? "BlockBlob"
+                : null,
+          },
+          httpMethod: "PUT",
+        };
+        const fileTrans: FileTransferObject = this.fileTransfer.create();
+        fileTrans.upload(this.fileBasePath + fileDetails.name, fileDetails.uploadUrl, options).then(success => {
+          resolve(success)
+        }).catch(error => {
+          reject(error)
+        })
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  }
+}
diff --git a/src/app/manage-learn/core/services/toast/toast.service.ts b/src/app/manage-learn/core/services/toast/toast.service.ts
new file mode 100644
index 000000000..28c7c3722
--- /dev/null
+++ b/src/app/manage-learn/core/services/toast/toast.service.ts
@@ -0,0 +1,66 @@
+import { Injectable } from '@angular/core';
+import { ToastController } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ToastService {
+
+  constructor(
+    private toastCtrl: ToastController,
+    private translate: TranslateService
+  ) { }
+
+
+  async openToast(msg, closeBtn?: string) {
+    let toast = await this.toastCtrl.create({
+      message: msg,
+      duration: closeBtn ? 0 : 2000,
+      position: 'bottom',
+      // closeButtonText: closeBtn,
+      // showCloseButton: closeBtn ? true : false
+    });
+
+    toast.present();
+  }
+  async openToastWithClose(msg) {
+   const toast = await this.toastCtrl.create({
+     message: msg,
+     position: 'bottom',
+     buttons: [
+       {
+         text: 'Ok',
+         role: 'cancel',
+         handler: () => {
+         },
+       },
+     ],
+   });
+   await toast.present();
+  }
+
+  async showMessage(msg, color = 'success', icon?) {
+    let text;
+    this.translate.get([msg]).subscribe(data => {
+      text = data;
+    })
+    const toast = await this.toastCtrl.create({
+      message: text[msg],
+      color: color,
+      cssClass: 'custom-toast',
+      duration: 2000,
+      position: 'top',
+      buttons: [
+        {
+          side: 'end',
+          icon: icon,
+          handler: () => {
+          }
+        }
+      ]
+    });
+    toast.present();
+  }
+}
diff --git a/src/app/manage-learn/core/services/unnati-data.service.ts b/src/app/manage-learn/core/services/unnati-data.service.ts
new file mode 100644
index 000000000..52205afaa
--- /dev/null
+++ b/src/app/manage-learn/core/services/unnati-data.service.ts
@@ -0,0 +1,27 @@
+import { Injectable, Inject } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { ModalController } from '@ionic/angular';
+import { ApiService } from './api.service';
+import { urlConstants } from '../constants/urlConstants';
+import { ToastService } from './toast/toast.service';
+import { AuthService, DeviceInfo } from 'sunbird-sdk';
+import { ApiUtilsService } from './api-utils.service';
+
+
+@Injectable({
+  providedIn: 'root',
+})
+export class UnnatiDataService extends ApiService {
+  baseUrl: string;
+  constructor(
+    public http: HttpClient,
+    public toast: ToastService,
+    public modalController: ModalController,
+    @Inject('AUTH_SERVICE') public authService: AuthService,
+    @Inject('DEVICE_INFO') public deviceInfo: DeviceInfo,
+    private utils: ApiUtilsService
+  ) {
+    super(http, toast, modalController, authService, deviceInfo, utils);
+    this.baseUrl = this.utils.getBaseUrl('projectsBaseUrl') + urlConstants.SERVICES.UNNATI;
+  }
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/core/services/update-local-school-data.service.ts b/src/app/manage-learn/core/services/update-local-school-data.service.ts
new file mode 100644
index 000000000..89a32ce22
--- /dev/null
+++ b/src/app/manage-learn/core/services/update-local-school-data.service.ts
@@ -0,0 +1,121 @@
+import { Injectable } from '@angular/core';
+import { LocalStorageService } from '.';
+import { storageKeys } from '../../storageKeys';
+import { UtilsService } from './utils.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class UpdateLocalSchoolDataService {
+  constructor(private localStorage: LocalStorageService, private utils: UtilsService) {}
+
+  async updateSubmissionIdArr(submissionId) {
+    await this.localStorage
+      .getLocalStorage(storageKeys.submissionIdArray)
+      .then(async (arr) => {
+        Array.isArray(submissionId) ? arr.concat(submissionId) : arr.push(submissionId);
+        await this.localStorage.setLocalStorage(storageKeys.submissionIdArray, arr);
+      })
+      .catch((err) => {
+        let arr;
+        Array.isArray(submissionId) ? (arr = submissionId) : (arr = [submissionId]);
+        this.localStorage.setLocalStorage(storageKeys.submissionIdArray, arr);
+      });
+  }
+
+  storeObsevationSubmissionId(obsevationSubmissionId) {
+    // obsevationSubmissionId can be array(only when migration is run) or string (single value)
+    this.localStorage
+      .getLocalStorage(storageKeys.observationSubmissionIdArr)
+      .then((arr) => {
+        Array.isArray(obsevationSubmissionId) ? arr.concat(obsevationSubmissionId) : arr.push(obsevationSubmissionId);
+        this.localStorage.setLocalStorage(storageKeys.observationSubmissionIdArr, arr);
+      })
+      .catch((err) => {
+        let arr;
+        Array.isArray(obsevationSubmissionId) ? (arr = obsevationSubmissionId) : (arr = [obsevationSubmissionId]);
+        this.localStorage.setLocalStorage(storageKeys.observationSubmissionIdArr, arr);
+      });
+  }
+
+  mapSubmissionDataToQuestion(schoolDetails, isObservation?: boolean): void {
+    let mappedData;
+
+    mappedData = this.updateSubmissionsOnLogin(schoolDetails);
+    if (isObservation) {
+      mappedData.observation = true;
+    }
+
+    this.localStorage.setLocalStorage(
+      this.utils.getAssessmentLocalStorageKey(schoolDetails.assessment.submissionId),
+      mappedData
+    );
+    // this.storage.set('schoolsDetails', JSON.stringify(schoolObj));
+    // this.events.publish("localDataUpdated");
+  }
+  updateSubmissionsOnLogin(schoolData) {
+    const assessment = schoolData.assessment;
+
+    for (const evidence of assessment.evidences) {
+      const validSubmission = assessment.submissions[evidence.externalId];
+      if (validSubmission) {
+        evidence.notApplicable = validSubmission.notApplicable;
+        if (evidence.notApplicable) {
+          continue;
+        }
+
+        for (const section of evidence.sections) {
+          for (const question of section.questions) {
+            if (question.responseType === 'pageQuestions') {
+              for (const questions of question.pageQuestions) {
+                questions.value =
+                  questions.responseType !== 'matrix'
+                    ? validSubmission.answers[questions._id].value
+                    : this.constructMatrixValue(validSubmission, questions, evidence.externalId);
+                questions.remarks = validSubmission.answers[question._id]
+                  ? validSubmission.answers[question._id].remarks
+                  : '';
+              }
+            } else if (validSubmission.answers && validSubmission.answers[question._id]) {
+              question.value =
+                question.responseType !== 'matrix'
+                  ? validSubmission.answers[question._id].value
+                  : this.constructMatrixValue(validSubmission, question, evidence.externalId);
+              question.remarks = validSubmission.answers[question._id]
+                ? validSubmission.answers[question._id].remarks
+                : '';
+            }
+          }
+        }
+      }
+    }
+    return schoolData;
+  }
+
+  constructMatrixValue(validSubmission, matrixQuestion, ecmId) {
+    matrixQuestion.value = [];
+    if (
+      validSubmission.answers &&
+      validSubmission.answers[matrixQuestion._id] &&
+      validSubmission.answers[matrixQuestion._id].value
+    ) {
+      for (const answer of validSubmission.answers[matrixQuestion._id].value) {
+        matrixQuestion.value.push(JSON.parse(JSON.stringify(matrixQuestion.instanceQuestions)));
+      }
+      matrixQuestion.value.forEach((instance, index) => {
+        instance.forEach((question) => {
+          if (
+            validSubmission.answers[matrixQuestion._id] &&
+            validSubmission.answers[matrixQuestion._id].value[index][question._id]
+          ) {
+            question.value = validSubmission.answers[matrixQuestion._id].value[index][question._id].value;
+            question.remarks = validSubmission.answers[matrixQuestion._id].value[index][question._id].remarks;
+          }
+        });
+      });
+      return matrixQuestion.value;
+    } else {
+      return [];
+    }
+  }
+}
diff --git a/src/app/manage-learn/core/services/update-tracker.service.ts b/src/app/manage-learn/core/services/update-tracker.service.ts
new file mode 100644
index 000000000..6127a9846
--- /dev/null
+++ b/src/app/manage-learn/core/services/update-tracker.service.ts
@@ -0,0 +1,107 @@
+import { Injectable } from '@angular/core';
+import { LocalStorageService, UtilsService } from '.';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class UpdateTrackerService {
+  constructor(private localStorage: LocalStorageService, private utils: UtilsService) {}
+
+  getLastModifiedInSection(assessmentDetails, selectedEvidenceIndex, submissionId, recentlyUpdatedEntity) {
+    for (
+      let currentSectionIndex = 0;
+      currentSectionIndex < assessmentDetails['assessment']['evidences'][selectedEvidenceIndex].sections.length;
+      currentSectionIndex++
+    ) {
+      let lastUpdated = 0;
+      for (
+        var questionIndex = 0;
+        questionIndex <
+        assessmentDetails['assessment']['evidences'][selectedEvidenceIndex].sections[currentSectionIndex].questions
+          .length;
+        questionIndex++
+      ) {
+        lastUpdated =
+          lastUpdated <
+          assessmentDetails['assessment']['evidences'][selectedEvidenceIndex].sections[currentSectionIndex].questions[
+            questionIndex
+          ].endTime
+            ? assessmentDetails['assessment']['evidences'][selectedEvidenceIndex].sections[currentSectionIndex]
+                .questions[questionIndex].endTime
+            : lastUpdated;
+      }
+      if (lastUpdated != 0) {
+        assessmentDetails['assessment']['evidences'][selectedEvidenceIndex].sections[
+          currentSectionIndex
+        ].lastModified = lastUpdated;
+        this.localStorage.setLocalStorage(this.utils.getAssessmentLocalStorageKey(submissionId), assessmentDetails);
+      }
+    }
+    let success = recentlyUpdatedEntity
+      ? this.getLastModifiedInEvidences(assessmentDetails['assessment']['evidences'], recentlyUpdatedEntity)
+      : null;
+    return assessmentDetails;
+  }
+  getLastModifiedInEvidences(evidences, recentlyUpdatedEntity?) {
+    for (let currentEvidencesIndex = 0; currentEvidencesIndex < evidences.length; currentEvidencesIndex++) {
+      let lastUpdated = evidences[currentEvidencesIndex].sections[0].lastModified
+        ? evidences[currentEvidencesIndex].sections[0].lastModified
+        : 0;
+      for (var sectionIndex = 0; sectionIndex < evidences[currentEvidencesIndex].sections.length; sectionIndex++) {
+        lastUpdated =
+          lastUpdated < evidences[currentEvidencesIndex].sections[sectionIndex].lastModified
+            ? evidences[currentEvidencesIndex].sections[sectionIndex].lastModified
+            : lastUpdated;
+      }
+      if (lastUpdated != 0) {
+        evidences[currentEvidencesIndex]['lastModified'] = lastUpdated;
+      }
+    }
+    let success = recentlyUpdatedEntity ? this.getLastModifiedInEntity(evidences, recentlyUpdatedEntity) : null;
+    return evidences;
+  }
+  getLastModifiedInEntity(evidences, recentlyUpdatedEntity) {
+    console.log('recentlyUpdatedEntity');
+
+    let lastUpdated = evidences[0].lastModified ? evidences[0].lastModified : 0;
+    for (let currentEvidencesIndex = 0; currentEvidencesIndex < evidences.length; currentEvidencesIndex++) {
+      lastUpdated =
+        lastUpdated < evidences[currentEvidencesIndex].lastModified
+          ? evidences[currentEvidencesIndex].lastModified
+          : lastUpdated;
+    }
+    if (lastUpdated != 0) {
+      recentlyUpdatedEntity.lastModified = lastUpdated;
+      this.localStorage
+        .getLocalStorage('recentlyModifiedAssessment')
+        .then((updatedList) => {
+          let successArray = [...updatedList];
+          let isPresentFlag = true;
+
+          for (let assessmentIndex = 0; assessmentIndex < updatedList.length; assessmentIndex++) {
+            if (
+              updatedList[assessmentIndex].ProgramId === recentlyUpdatedEntity.ProgramId &&
+              updatedList[assessmentIndex].EntityId === recentlyUpdatedEntity.EntityId
+            ) {
+              isPresentFlag = false;
+
+              if (updatedList[assessmentIndex].lastModified != recentlyUpdatedEntity.lastModified) {
+                delete successArray[assessmentIndex];
+                isPresentFlag = true;
+              }
+            }
+          }
+          isPresentFlag ? successArray.unshift(recentlyUpdatedEntity) : '';
+          this.localStorage.setLocalStorage(
+            'recentlyModifiedAssessment',
+            successArray.filter((item) => item !== null).slice(0, 10)
+          );
+        })
+        .catch(() => {
+          this.localStorage.setLocalStorage('recentlyModifiedAssessment', [recentlyUpdatedEntity]);
+        });
+    }
+    console.log('lastModifiedAssessment');
+    return true;
+  }
+}
diff --git a/src/app/manage-learn/core/services/utils.service.ts b/src/app/manage-learn/core/services/utils.service.ts
new file mode 100644
index 000000000..990eb9ee3
--- /dev/null
+++ b/src/app/manage-learn/core/services/utils.service.ts
@@ -0,0 +1,534 @@
+import { Injectable, Inject, NgZone } from '@angular/core';
+import { v4 as uuidv4 } from 'uuid';
+import * as moment from 'moment';
+import * as _ from 'underscore';
+import { statusType } from '@app/app/manage-learn/core/constants/statuses.constant';
+import { UtilityService } from '@app/services';
+import { ProfileService, AuthService, CachedItemRequestSourceFrom } from 'sunbird-sdk';
+import { ProfileConstants, RouterLinks } from '@app/app/app.constant';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { KendraApiService } from './kendra-api.service';
+import { urlConstants } from '../constants/urlConstants';
+import { AlertController } from '@ionic/angular';
+import { Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class UtilsService {
+  private alert?: any;
+  imagePath: string;
+  public assessmentBaseUrl: string;
+  public projectsBaseUrl: string;
+  profile;
+  organisationName;
+  orgDetails;
+  requiredFields;
+  profileAlert;
+  constructor(
+    private utility: UtilityService,
+    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+    @Inject('AUTH_SERVICE') public authService: AuthService,
+    private zone: NgZone,
+    private commonUtilService: CommonUtilService,
+    private kendra: KendraApiService,
+    private aleryCtrl: AlertController,
+    private router: Router,
+  ) {}
+
+  generateFileName(name: string[] = []) {
+    const d = new Date();
+    const fullTime = moment(d).format('DD-MM-YYYY-hh-mm-ss');
+
+    name.push(fullTime);
+    return name.join('_');
+  }
+
+  cameltoNormalCase(word) {
+    return word.replace(/([A-Z])/g, ' $1').replace(/^./, function (str) {
+      return str.toUpperCase();
+    });
+  }
+
+  //create query url
+  queryUrl(url, query) {
+    query = Object.entries(query).reduce((a, [k, v]) => (v == null ? a : ((a[k] = v), a)), {}); // remove null and undefined values
+    if (_.isEmpty(query)) {
+      return url;
+    }
+    query = this.encodeQuery(query);
+    url = `${url}?${query}`;
+    return url;
+  }
+
+  // returns the query string
+  /*
+   Input: {'website':'unnati', 'location':'india'}
+   Output: website=unnati&location=india
+   */
+  encodeQuery(data) {
+    let query = '';
+    for (let d in data) query += encodeURIComponent(d) + '=' + encodeURIComponent(data[d]) + '&';
+    return query.slice(0, -1);
+  }
+
+  getMetaData(type) {
+    const obj = {
+      _id: uuidv4(),
+      status: statusType.notStarted,
+      name: '',
+      endDate: '',
+      assignee: '',
+      type: 'simple',
+      attachments: [],
+      startDate: '',
+      isNew: true,
+      isEdit: true,
+      children: [],
+      isDeleted: false,
+      isDeletable: true,
+    };
+    switch (type) {
+      case 'task':
+        return obj;
+      case 'subTask':
+        delete obj.children;
+        delete obj.isDeletable;
+        return obj;
+    }
+  }
+  getTaskSortMeta() {
+    const data = {
+      past: {
+        label: 'LABELS.PAST',
+        tasks: [],
+      },
+      today: {
+        label: 'LABELS.TODAY',
+        tasks: [],
+      },
+      thisWeek: {
+        label: 'LABELS.THIS_WEEK',
+        tasks: [],
+      },
+      thisMonth: {
+        label: 'LABELS.THIS_MONTH',
+        tasks: [],
+      },
+      thisQuarter: {
+        label: 'LABELS.THIS_QUARTER',
+        tasks: [],
+      },
+      upcoming: {
+        label: 'LABELS.UPCOMING',
+        tasks: [],
+      },
+    };
+    return data;
+  }
+
+  setStatusForProject(project) {
+    const projectData = { ...project };
+    for (const task of projectData.tasks) {
+      const activeSubTask = _.filter(task.children, function (el) {
+        return !el.isDeleted;
+      });
+      task.status = activeSubTask.length ? this.calculateStatus(task.children) : task.status;
+
+      // added for assessment or observation submission statuses
+      if (task.type == 'assessment' || task.type == 'observation') {
+        if (task.submissionDetails && task.submissionDetails.status !== statusType.completed) {
+          if (task.status == statusType.completed) {
+            task.status = statusType.inProgress;
+          }
+        }
+        if (!task.submissionDetails) {
+          if (task.status == statusType.completed) {
+            task.status = statusType.inProgress;
+          }
+        }
+
+        if (task.submissionDetails && task.submissionDetails.status == statusType.completed && !task.children.length) {
+          task.status = statusType.completed;
+        }
+        if (!task.submissionDetails && !task.children.length) {
+          task.status = statusType.notStarted;
+        }
+        /*  if (!task.submissionDetails  && task.children.length) {
+           task.status = statusType.inProgress;
+         } */
+      }
+    }
+    projectData.status = this.calculateStatus(projectData.tasks);
+
+    return projectData;
+  }
+
+  calculateStatus(childArray) {
+    let status;
+    const items = [...childArray];
+    const completedList = _.filter(items, function (el) {
+      return !el.isDeleted && el.status === statusType.completed;
+    });
+    const inProgressList = _.filter(items, function (el) {
+      return !el.isDeleted && el.status === statusType.inProgress;
+    });
+    const notStartedList = _.filter(items, function (el) {
+      return el.status === statusType.notStarted;
+    });
+    const validchildArray = _.filter(items, function (el) {
+      return !el.isDeleted;
+    });
+    if (completedList.length === validchildArray.length) {
+      status = statusType.completed;
+    } else if (inProgressList.length || completedList.length) {
+      status = statusType.inProgress;
+    } else {
+      status = statusType.notStarted;
+    }
+    return validchildArray.length ? status : statusType.notStarted;
+  }
+
+  checkForTaskCompletion(task) {
+    let status = true;
+    for (const subTask of task.children) {
+      if (subTask.status !== statusType.completed) {
+        status = false;
+        break;
+      }
+    }
+    return status;
+  }
+
+  checkForProjectCompletion(project) {
+    let completed = true;
+    for (const task of project.tasks) {
+      if (task.status !== statusType.completed) {
+        completed = false;
+        break;
+      }
+    }
+    return completed;
+  }
+
+  processProjectsData(projects) {
+    const projectData = [...projects];
+    for (const project of projects) {
+      const categories = [];
+      if (project.categories && project.categories.length) {
+        for (const category of project.categories) {
+          const obj = {
+            value: category._id,
+            label: category.name,
+          };
+          categories.push(obj);
+        }
+      }
+      project.categories = categories;
+    }
+    return projectData;
+  }
+
+  getFileExtensions(url) {
+    let splittedString = url.split('.');
+    let splittedStringForName = url.split('/');
+    const obj = {
+      type: splittedString[splittedString.length - 1],
+      name: splittedStringForName[splittedStringForName.length - 1],
+    };
+    return obj;
+  }
+
+  getAssessmentLocalStorageKey(entityId) {
+    return 'assessmentDetails_' + entityId;
+  }
+  setCurrentimageFolderName(evidenceId, schoolId) {
+    this.imagePath = 'images_' + evidenceId + '_' + schoolId;
+  }
+
+  checkForDependentVisibility(qst, allQuestion): boolean {
+    let display = true;
+    for (const question of allQuestion) {
+      for (const condition of qst.visibleIf) {
+        if (condition._id === question._id) {
+          let expression = [];
+          if (condition.operator != '===') {
+            if (question.responseType === 'multiselect') {
+              for (const parentValue of question.value) {
+                for (const value of condition.value) {
+                  expression.push('(', "'" + parentValue + "'", '===', "'" + value + "'", ')', condition.operator);
+                }
+              }
+            } else {
+              for (const value of condition.value) {
+                expression.push('(', "'" + question.value + "'", '===', "'" + value + "'", ')', condition.operator);
+              }
+            }
+
+            expression.pop();
+          } else {
+            if (question.responseType === 'multiselect') {
+              for (const value of question.value) {
+                expression.push('(', "'" + condition.value + "'", '===', "'" + value + "'", ')', '||');
+              }
+              expression.pop();
+            } else {
+              expression.push('(', "'" + question.value + "'", condition.operator, "'" + condition.value + "'", ')');
+            }
+          }
+          if (!eval(expression.join(''))) {
+            return false;
+          }
+        }
+      }
+    }
+    return display;
+  }
+
+  isQuestionComplete(question): boolean {
+    if (question.validation.required && question.value === '' && question.responseType !== 'multiselect') {
+      return false;
+    }
+    if (
+      question.validation.required &&
+      question.value &&
+      !question.value.length &&
+      question.responseType === 'multiselect'
+    ) {
+      return false;
+    }
+    if (
+      question.validation.regex &&
+      (question.responseType === 'number' || question.responseType === 'text') &&
+      !this.testRegex(question.validation.regex, question.value)
+    ) {
+      return false;
+    }
+    return true;
+  }
+
+  isMatrixQuestionComplete(question): boolean {
+    if (!question.value.length) {
+      return false;
+    }
+    for (const instance of question.value) {
+      for (const question of instance) {
+        if (!question.isCompleted) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  isPageQuestionComplete(question) {
+    for (const element of question.pageQuestions) {
+      if (!element.isCompleted) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  testRegex(rege, value): boolean {
+    const regex = new RegExp(rege);
+    return regex.test(value);
+  }
+
+  getCompletedQuestionsCount(questions) {
+    let count = 0;
+    for (const question of questions) {
+      if (question.isCompleted) {
+        count++;
+      }
+    }
+    return count;
+  }
+
+  getImageNamesForQuestion(question) {
+    let imageArray = [];
+    if (question.responseType === 'matrix') {
+      for (const instance of question.value) {
+        for (const qst of instance) {
+          const newArray = qst.fileName.length ? imageArray.concat(qst.fileName) : imageArray;
+          imageArray = newArray;
+        }
+      }
+    } else {
+      // imageArray = [...imageArray, question.fileName]
+      const newArray = question.fileName.length ? imageArray.concat(question.fileName) : imageArray;
+      imageArray = newArray;
+    }
+    return imageArray;
+  }
+
+
+
+  async getMandatoryEntities(): Promise<any> {
+    // const profile = await this.getProfileData();
+    return new Promise((resolve, reject) => {
+      const config = {
+        url: urlConstants.API_URLS.MANDATORY_ENTITY_TYPES_FOR_ROLES + `${this.profile.state}?role=${this.profile.role}`,
+      }
+      this.kendra.get(config).subscribe(data => {
+        if (data.result && data.result.length) {
+          this.requiredFields = data.result;
+          let allFieldsPresent = true;
+          for (const field of this.requiredFields) {
+            if (!this.profile[field]) {
+              allFieldsPresent = false;
+              break
+            }
+          }
+          if (!allFieldsPresent) {
+            this.openProfileUpdateAlert()
+            resolve(false)
+          } else {
+            resolve(true);
+          }
+        } else {
+          this.openProfileUpdateAlert();
+          resolve(false)
+        }
+      }, error => {
+        resolve(false)
+        // reject()
+      })
+    })
+  }
+
+
+  async getMandatoryEntitiesList(): Promise<any> {
+    // const profile = await this.getProfileData();
+    return new Promise((resolve, reject) => {
+      const config = {
+        url: urlConstants.API_URLS.MANDATORY_ENTITY_TYPES_FOR_ROLES + `${this.profile.state}?role=${this.profile.role}`,
+      }
+      this.kendra.get(config).subscribe(data => {
+        if (data.result && data.result.length) {
+          this.requiredFields = data.result;
+          // let allFieldsPresent = true;
+          resolve(data.result);
+          // for (const field of this.requiredFields) {
+          //   if (!this.profile[field]) {
+          //     allFieldsPresent = false;
+          //     break
+          //   }
+          // }
+          // if (!allFieldsPresent) {
+          //   this.openProfileUpdateAlert()
+          //   resolve(false)
+          // } else {
+          //   resolve(true);
+          // }
+        }
+        else {
+          // this.openProfileUpdateAlert();
+          resolve(false)
+        }
+      }, error => {
+        resolve(false)
+        // reject()
+      })
+    })
+  }
+
+  async openProfileUpdateAlert() {
+    this.profileAlert = await this.aleryCtrl.create({
+      header: 'Alert',
+      message: `Please update   ${(this.requiredFields && this.requiredFields.length) ? this.requiredFields + ' in' : ""}   your profile to access the feature.`,
+      buttons: [{
+        text: 'Update Profile',
+        role: 'cancel',
+        handler: (blah) => {
+          this.router.navigate([`/${RouterLinks.TABS}/${RouterLinks.PROFILE}`]);
+        }
+      }],
+      backdropDismiss: false
+    });
+    await this.profileAlert.present();
+  }
+
+  async closeProfileAlert() {
+    this.profileAlert ? await this.profileAlert.dismiss() : null;
+  }
+
+  async getProfileInfo(): Promise<any> {
+    //     const profile = await this.profileService.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS }).toPromise();
+    // console.log(profile)
+    return new Promise(async (resolve, reject) => {
+      this.profile = await this.getProfileData();
+      const mandatoryFields = await this.getMandatoryEntities();
+      mandatoryFields ? resolve(this.profile) : resolve(null);
+      // resolve(this.profile)
+      // resolve({
+      //   "state" :  "5f33c3d85f637784791cd831",
+      //   "district" : "5f33c56fb451f58478b36997",
+      //   "block" : "5f33c63ece438a849b4a17f4",
+      //   "school" : "5f33c6dcc1352f84a29f547a",
+      //   "role" : "DEO"
+
+      // })
+      // resolve({
+      //   "role": "DEO",
+      //   "state": "a10623c3-cc97-4971-a7fe-2f6d4e6883f7",
+      //   "district": "5a27983c-5cfd-4fbb-89d5-8f45742a77d1",
+      //   "school": "1"
+
+      // })
+    })
+
+  }
+
+  getOrgDetails() {
+    const orgList = [];
+    let orgItemList;
+    orgItemList = this.profile.organisations;
+    if (orgItemList.length > 1) {
+      orgItemList.map((org) => {
+        if (this.profile.rootOrgId !== org.organisationId) {
+          orgList.push(org);
+        }
+      });
+      orgList.sort((orgDate1, orgdate2) => orgDate1.orgjoindate > orgdate2.organisation ? 1 : -1);
+      this.organisationName = orgList[0].orgName;
+      this.orgDetails = this.commonUtilService.getOrgLocation(orgList[0]);
+    }
+  }
+
+  getProfileData(): Promise<any> {
+    return new Promise((resolve, reject) => {
+      this.authService.getSession().toPromise().then((session) => {
+        if (session === null || session === undefined) {
+          reject('session is null');
+        } else {
+          const serverProfileDetailsRequest = {
+            userId: session.userToken,
+            requiredFields: ProfileConstants.REQUIRED_FIELDS,
+            from: CachedItemRequestSourceFrom.CACHE
+          };
+          this.profileService.getServerProfilesDetails(serverProfileDetailsRequest).toPromise()
+            .then((profileData) => {
+              this.zone.run(async () => {
+                console.log(profileData);
+                this.profile = profileData;
+                const obj = {}
+                for (const location of profileData['userLocations']) {
+                  obj[location.type] = location.id
+                }
+                for (const org of profileData['organisations']) {
+                  if (org.isSchool) {
+                    obj['school'] = org.externalId;
+                  }
+                }
+                
+                obj['role'] = profileData['profileUserType'] && profileData['profileUserType']['subType'] ? profileData['profileUserType']['subType'].toUpperCase() : null;
+                resolve(obj)
+              });
+            }).catch(err => {
+              resolve({})
+            });
+        }
+      });
+    });
+  }
+}
diff --git a/src/app/manage-learn/deeplink-redirect/deeplink-redirect.module.ts b/src/app/manage-learn/deeplink-redirect/deeplink-redirect.module.ts
new file mode 100644
index 000000000..f13084fe0
--- /dev/null
+++ b/src/app/manage-learn/deeplink-redirect/deeplink-redirect.module.ts
@@ -0,0 +1,28 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { DeeplinkRedirectComponent } from './deeplink-redirect/deeplink-redirect.component';
+import { Routes, RouterModule } from '@angular/router';
+import { IonicModule } from '@ionic/angular';
+import { TranslateModule } from '@ngx-translate/core';
+import { CoreModule } from '../core/core.module';
+import { SharedModule } from '../shared/shared.module';
+const routes: Routes = [
+  {
+    path: '',
+    component: DeeplinkRedirectComponent,
+  },
+ 
+];
+
+@NgModule({
+  declarations: [DeeplinkRedirectComponent],
+  imports: [
+   CommonModule,
+    TranslateModule.forChild(),
+    IonicModule,
+    RouterModule.forChild(routes),
+    SharedModule,
+    CoreModule,
+  ]
+})
+export class DeeplinkRedirectModule { }
diff --git a/src/app/manage-learn/deeplink-redirect/deeplink-redirect/deeplink-redirect.component.html b/src/app/manage-learn/deeplink-redirect/deeplink-redirect/deeplink-redirect.component.html
new file mode 100644
index 000000000..6abb9947d
--- /dev/null
+++ b/src/app/manage-learn/deeplink-redirect/deeplink-redirect/deeplink-redirect.component.html
@@ -0,0 +1,6 @@
+
+<ion-content padding>
+  <div class="deeplink-container">
+    <h2>{{'FRMELEMENTS_MSG_REDIRECTING' | translate}}</h2>
+  </div>
+</ion-content>
diff --git a/src/app/manage-learn/deeplink-redirect/deeplink-redirect/deeplink-redirect.component.scss b/src/app/manage-learn/deeplink-redirect/deeplink-redirect/deeplink-redirect.component.scss
new file mode 100644
index 000000000..07f1968bc
--- /dev/null
+++ b/src/app/manage-learn/deeplink-redirect/deeplink-redirect/deeplink-redirect.component.scss
@@ -0,0 +1,9 @@
+page-deep-link-redirect {
+    .deeplink-container{
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+    }
+}
diff --git a/src/app/manage-learn/deeplink-redirect/deeplink-redirect/deeplink-redirect.component.ts b/src/app/manage-learn/deeplink-redirect/deeplink-redirect/deeplink-redirect.component.ts
new file mode 100644
index 000000000..c3f728a6e
--- /dev/null
+++ b/src/app/manage-learn/deeplink-redirect/deeplink-redirect/deeplink-redirect.component.ts
@@ -0,0 +1,234 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router, RouterLink } from '@angular/router';
+import { RouterLinks } from '@app/app/app.constant';
+import { NavController, NavParams } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+import { UtilsService } from '../../core';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { AssessmentApiService } from '../../core/services/assessment-api.service';
+
+@Component({
+  selector: 'app-deeplink-redirect',
+  templateUrl: './deeplink-redirect.component.html',
+  styleUrls: ['./deeplink-redirect.component.scss'],
+})
+export class DeeplinkRedirectComponent implements OnInit {
+  data: any;
+  translateObject: any;
+  link: any;
+  extra: string;
+
+  constructor(
+    public navCtrl: NavController,
+    // public navParams: NavParams,
+    // public deeplinkProvider: DeeplinkProvider,
+    // public programSrvc: ProgramServiceProvider,
+    // public viewCtrl: ViewController,
+    // public utils: UtilsProvider,
+    private translate: TranslateService,
+    private router: Router,
+    private route: ActivatedRoute,
+    private assessmentService: AssessmentApiService,
+    private utils: UtilsService
+  ) {
+    this.extra = this.route.snapshot.paramMap.get('extra');
+    const extrasState = this.router.getCurrentNavigation().extras.state;
+    if (extrasState) {
+      this.data = extrasState.data;
+    }
+  }
+
+  ionViewDidLoad() {
+    // console.log('ionViewDidLoad DeepLinkRedirectPage');
+    // this.data = this.navParams.data;
+    // let key = Object.keys(this.data)[0];
+    // this.switch(this.extra);
+  }
+  ngOnInit() {
+    this.translate.get(['message.canNotOpenLink']).subscribe((translations) => {
+      this.translateObject = translations;
+    });
+    this.switch(this.extra);
+  }
+
+  switch(key) {
+    switch (key) {
+      case 'observationLink':
+        this.redirectObservation(this.data.create_observation_id);
+        break;
+      case 'observationParams':
+        this.redirectWithParams(this.data[key], 'observation');
+        break;
+      case 'assessmentParams':
+        this.redirectWithParams(this.data[key], 'assessment');
+        break;
+      case 'observationReportParams':
+        this.redirectReportWithParams(this.data[key], 'observation');
+        break;
+      case 'assessmentReportParams':
+        this.redirectReportWithParams(this.data[key], 'assessment');
+        break;
+
+      default:
+        break;
+    }
+  }
+
+  redirectWithParams(params: string, type) {
+    let paramsArr = params.split('-');
+    console.log(paramsArr);
+    let pId = paramsArr[0];
+    let sId = paramsArr[1];
+    let eId = paramsArr[2];
+    // TODO:Implement
+    // this.programSrvc
+    //   .getProgramApi(true)
+    //   .then((data: any) => {
+    //     console.log(data);
+    //     const pIndex = data.findIndex((p) => p._id == pId);
+    //     let sIndex;
+
+    //     let page;
+    //     if (type == "observation") {
+    //       page = ProgramSolutionObservationDetailPage;
+    //       const solution = data[pIndex].solutions;
+    //       sIndex = solution.findIndex((s) => s.solutionId == sId);
+    //     } else {
+    //       page = ProgramSolutionEntityPage;
+    //       const solution = data[pIndex].solutions;
+    //       sIndex = solution.findIndex((s) => s._id == sId);
+    //     }
+    //     this.navCtrl
+    //       .push(page, {
+    //         programIndex: pIndex,
+    //         solutionIndex: sIndex,
+    //       })
+    //       .then(() => {
+    //         this.navCtrl.remove(1, 1);
+    //       });
+    //   })
+    //   .catch(() => {
+    //     this.utils.openToast(this.translateObject["message.canNotOpenLink"]);
+    //     this.navCtrl.popToRoot();
+    //   });
+  }
+
+  async redirectObservation(link) {
+    let payload = await this.utils.getProfileInfo();
+    const config = {
+      url: urlConstants.API_URLS.DEEPLINK.VERIFY_OBSERVATION_LINK + link,
+      payload: payload,
+    };
+    this.assessmentService.post(config).subscribe(
+      (success) => {
+        if (success.result) {
+          console.log(success);
+          let data = success.result;
+          this.router.navigate([`/${RouterLinks.OBSERVATION}/${RouterLinks.OBSERVATION_DETAILS}`], {
+            queryParams: {
+              programId: data.programId,
+              solutionId: data.solutionId,
+              observationId: data._id,
+              solutionName: data.name,
+            },
+          });
+        }
+      },
+      (error) => {
+        console.log(error);
+      }
+    );
+
+    // let pId, sId, oId;
+    // this.deeplinkProvider
+    //   .createObsFromLink(link)
+    //   .then((res: any) => {
+    //     if (!res.result) {
+    //       throw "";
+    //     }
+    //     res = res.result;
+    //     pId = res.programId;
+    //     sId = res.solutionId;
+    //     oId = res._id;
+    //     return this.programSrvc.getProgramApi(true);
+    //   })
+    //   .then((data: any) => {
+    //     console.log(data);
+    //     const pIndex = data.findIndex((p) => p._id == pId);
+    //     const solution = data[pIndex].solutions;
+    //     const sIndex = solution.findIndex((s) => s.solutionId == sId);
+    //     this.navCtrl
+    //       .push(ProgramSolutionObservationDetailPage, {
+    //         programIndex: pIndex,
+    //         solutionIndex: sIndex,
+    //       })
+    //       .then(() => {
+    //         this.navCtrl.remove(1, 1);
+    //       });
+    //   })
+    //   .catch(() => {
+    //     this.utils.openToast(this.translateObject["message.canNotOpenLink"]);
+    //     this.navCtrl.popToRoot();
+    //   });
+  }
+
+  redirectReportWithParams(params: string, type) {
+    let paramsArr = params.split('-');
+    console.log(paramsArr);
+    let pId = paramsArr[0];
+    let sId = paramsArr[1];
+    let eId = paramsArr[2];
+    let etype = paramsArr[3];
+    let oId = paramsArr[4];
+
+    if (type == 'observation') {
+      let payload = {
+        entityId: eId,
+        entityType: etype,
+        observationId: oId,
+      };
+      setTimeout(() => {
+        // will go call entity report
+        this.router.navigate([RouterLinks.OBSERVATION_REPORTS], {
+          replaceUrl: true,
+          queryParams: {
+            entityId: eId,
+            entityType: etype,
+            observationId: oId,
+          },
+        });
+        // this.navCtrl
+        //   .push(ObservationReportsPage, payload)
+        //   .then(() => {
+        //     this.navCtrl.remove(1, 1);
+        //   })
+        //   .catch((err) => {
+        //     console.log(err);
+        //   });
+      }, 1000);
+    }
+
+    if (type == 'assessment') {
+      let payload = {
+        programId: pId,
+        entity: {
+          _id: eId,
+          entityType: etype,
+        },
+        entityType: etype,
+        solutionId: sId,
+      };
+      // TODO:assessment not there yet
+      // setTimeout(() => {
+      //   this.navCtrl
+      //     .push(DashboardPage, payload)
+      //     .then(() => {
+      //       this.navCtrl.remove(1, 1);
+      //     })
+      //     .catch((err) => {
+      //       console.log(err);
+      //     });
+      // }, 1000);
+    }
+  }
+}
diff --git a/src/app/manage-learn/domain-ecm-listing/domain-ecm-listing.module.ts b/src/app/manage-learn/domain-ecm-listing/domain-ecm-listing.module.ts
new file mode 100644
index 000000000..2e9a8f822
--- /dev/null
+++ b/src/app/manage-learn/domain-ecm-listing/domain-ecm-listing.module.ts
@@ -0,0 +1,30 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { DomainEcmLsitingComponent } from './domain-ecm-lsiting/domain-ecm-lsiting.component';
+import { FormsModule } from '@angular/forms';
+import { IonicModule } from '@ionic/angular';
+import { TranslateModule } from '@ngx-translate/core';
+import { CoreModule } from '../core/core.module';
+import { SharedModule } from '../shared/shared.module';
+import { RouterModule, Routes } from '@angular/router';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DomainEcmLsitingComponent,
+  },
+];
+
+@NgModule({
+  declarations: [DomainEcmLsitingComponent],
+  imports: [
+    CommonModule,
+    RouterModule.forChild(routes),
+    TranslateModule.forChild(),
+    SharedModule,
+    IonicModule,
+    FormsModule,
+    CoreModule,
+  ],
+})
+export class DomainEcmListingModule {}
diff --git a/src/app/manage-learn/domain-ecm-listing/domain-ecm-lsiting/domain-ecm-lsiting.component.html b/src/app/manage-learn/domain-ecm-listing/domain-ecm-lsiting/domain-ecm-lsiting.component.html
new file mode 100644
index 000000000..6c0def7c5
--- /dev/null
+++ b/src/app/manage-learn/domain-ecm-listing/domain-ecm-lsiting/domain-ecm-lsiting.component.html
@@ -0,0 +1,83 @@
+<ion-content>
+  <ion-text>
+    <h4 class="p-15" *ngIf="entityData?.assessment?.pageHeading">
+      {{ entityData?.assessment?.pageHeading }}
+    </h4>
+    <h4 class="p-15" *ngIf="!entityData?.assessment?.pageHeading">Domains</h4>
+  </ion-text>
+  <!-- for Domain/ecm -->
+  <div
+    *ngFor="let evidence of entityEvidences; let arrIndex = index"
+    [ngClass]="{ 'restrict': evidence?.notApplicable === true }"
+  >
+    <app-item-list-card [title]="evidence?.name" (click)="openEvidence(arrIndex)">
+      <div
+        arrow
+        *ngIf="evidence.progressStatus === 'completed' && !evidence?.notApplicable"
+        class="_completed _flex-box progressWidth ion-float-right"
+      >
+        <progress-bar [progress]="100" class="_full-width"></progress-bar>
+      </div>
+      <div arrow *ngIf="!evidence.progressStatus && !evidence?.notApplicable && !isIos" class="_flex-box">
+        <ion-icon name="caret-down-circle" class="_progressIcon ion-float-right ion-margin-right"></ion-icon>
+      </div>
+      <div
+        arrow
+        *ngIf="evidence.progressStatus === 'inProgress' && !evidence?.notApplicable"
+        class="_inProgress _flex-box progressWidth ion-float-right"
+      >
+        <progress-bar [progress]="evidence?.completePercentage" class="_full-width"></progress-bar>
+      </div>
+      <div
+        arrow
+        *ngIf="evidence.progressStatus === 'submitted' && !evidence?.notApplicable"
+        class="_submitted _flex-box flex-dc"
+      >
+        <div>
+          <progress-bar [progress]="100" class="_full-width"></progress-bar>
+        </div>
+        <div class="f11">Completed</div>
+      </div>
+      <div arrow *ngIf="evidence?.notApplicable" class="_na _flex-box _float-right">
+        {{ 'FRMELEMNTS_LBL_NOT_APPLICABLE' | translate }}
+        <ion-icon name="alert" class="_progressIcon ion-margin-left"></ion-icon>
+      </div>
+    </app-item-list-card>
+
+    <!--  for section/critera -->
+    <div *ngIf="selectedEvidenceIndex == arrIndex">
+      <div *ngFor="let section of evidence.sections; let selectedSection = index">
+        <ion-item
+          lines="none"
+          class="p-12"
+          (click)="goToQuestioner(selectedSection)"
+          *ngIf="section?.questions?.length"
+        >
+          <div class="d-flex flex-ai-center flex-jc-space-between w-100">
+            <div class="d-flex flex-ai-center">
+              <ion-icon name="document-text" class="margin-right mr-5"></ion-icon>
+              <span>
+                {{ section?.name }}
+              </span>
+            </div>
+            <span *ngIf="section.progressStatus === 'completed'" class="_completed _flex-box">
+              {{ 'COMPLETED' | translate }}
+              <ion-icon name="checkmark-circle" class="_progressIcon" margin-left> </ion-icon>
+            </span>
+            <span *ngIf="!section.progressStatus && !isIos" class="_flex-box">
+              <ion-icon name="arrow-forward" class="_progressIcon" margin-left></ion-icon>
+            </span>
+            <span *ngIf="section.progressStatus === 'inProgress'" class="_inProgress _flex-box" style="font-size: 11">
+              {{ 'FRMELEMNTS_LBL_IN_PROGRESS' | translate }}
+              <ion-icon name="contrast" class="_progressIcon" margin-left></ion-icon>
+            </span>
+            <span *ngIf="section.progressStatus === 'submitted'" class="_submitted _flex-box">
+              {{ 'FRMELEMNTS_LBL_SUBMITTTED' | translate }}
+              <ion-icon name="cloud-done" class="_progressIcon" margin-left></ion-icon>
+            </span>
+          </div>
+        </ion-item>
+      </div>
+    </div>
+  </div>
+</ion-content>
diff --git a/src/app/manage-learn/domain-ecm-listing/domain-ecm-lsiting/domain-ecm-lsiting.component.scss b/src/app/manage-learn/domain-ecm-listing/domain-ecm-lsiting/domain-ecm-lsiting.component.scss
new file mode 100644
index 000000000..4ce718114
--- /dev/null
+++ b/src/app/manage-learn/domain-ecm-listing/domain-ecm-lsiting/domain-ecm-lsiting.component.scss
@@ -0,0 +1,13 @@
+._completed,
+._inProgress,
+._submitted,._na {
+  font-size: 11px !important;
+}
+._progressIcon {
+  font-size: 11px !important;
+  padding-left: 3px;
+}
+
+.restrict{
+  pointer-events:none;
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/domain-ecm-listing/domain-ecm-lsiting/domain-ecm-lsiting.component.ts b/src/app/manage-learn/domain-ecm-listing/domain-ecm-lsiting/domain-ecm-lsiting.component.ts
new file mode 100644
index 000000000..e51d220f3
--- /dev/null
+++ b/src/app/manage-learn/domain-ecm-listing/domain-ecm-lsiting/domain-ecm-lsiting.component.ts
@@ -0,0 +1,208 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { RouterLinks } from '@app/app/app.constant';
+import { Platform } from '@ionic/angular';
+import { UtilsService, LocalStorageService } from '../../core';
+import { EvidenceService } from '../../core/services/evidence.service';
+import { UpdateTrackerService } from '../../core/services/update-tracker.service';
+
+@Component({
+  selector: 'app-domain-ecm-lsiting',
+  templateUrl: './domain-ecm-lsiting.component.html',
+  styleUrls: ['./domain-ecm-lsiting.component.scss'],
+})
+export class DomainEcmLsitingComponent implements OnInit {
+  entityName: any;
+  entityData: any;
+  entityEvidences: any;
+  generalQuestions: any;
+  recentlyUpdatedEntity: any;
+  selectedEvidenceIndex: any;
+  currentEvidence: any;
+  evidenceSections: any;
+  allAnsweredForEvidence: boolean;
+  submissionId: any;
+  constructor(
+    private updateTracker: UpdateTrackerService,
+    private utils: UtilsService,
+    private localStorage: LocalStorageService,
+    private evdnsServ: EvidenceService,
+    private platform: Platform,
+    private routerParam: ActivatedRoute,
+    private router: Router
+  ) {
+    this.routerParam.queryParams.subscribe((params) => {
+      // this.entityId = params.submisssionId;
+      this.submissionId = params.submisssionId;
+      this.entityName = params.schoolName;
+    });
+  }
+
+  ngOnInit() {}
+
+  ionViewWillEnter() {
+    this.localStorage
+      .getLocalStorage(this.utils.getAssessmentLocalStorageKey(this.submissionId))
+      .then((successData) => {
+        this.entityData = successData;
+        this.entityEvidences = this.updateTracker.getLastModifiedInEvidences(
+          this.entityData['assessment']['evidences'],
+          this.recentlyUpdatedEntity
+        );
+        this.mapCompletedAndTotalQuestions();
+        this.checkForProgressStatus();
+        this.localStorage
+          .getLocalStorage('generalQuestions_' + this.submissionId)
+          .then((successData) => {
+            this.generalQuestions = successData;
+          })
+          .catch((error) => {});
+      })
+      .catch((error) => {});
+  }
+
+  mapCompletedAndTotalQuestions() {
+    for (const evidence of this.entityEvidences) {
+      let totalQuestions = 0;
+      let completedQuestions = 0;
+      for (const section of evidence.sections) {
+        totalQuestions = totalQuestions + section.totalQuestions;
+        completedQuestions = completedQuestions + section.completedQuestions;
+      }
+      let percentage = totalQuestions ? (completedQuestions / totalQuestions) * 100 : 0;
+      if (!completedQuestions) {
+        percentage = 0;
+      }
+      evidence.completePercentage = Math.trunc(percentage);
+    }
+  }
+
+  checkForProgressStatus() {
+    for (const evidence of this.entityEvidences) {
+      if (evidence.isSubmitted) {
+        evidence.progressStatus = 'submitted';
+      } else if (!evidence.startTime) {
+        evidence.progressStatus = '';
+      } else {
+        evidence.progressStatus = 'completed';
+        for (const section of evidence.sections) {
+          if (section.progressStatus === 'inProgress' || !section.progressStatus) {
+            evidence.progressStatus = 'inProgress';
+          }
+        }
+      }
+    }
+  }
+
+  navigateToEvidence(index): void {
+    if (this.entityEvidences[index].startTime) {
+      this.utils.setCurrentimageFolderName(this.entityEvidences[index].externalId, this.submissionId);
+      this.router.navigate([RouterLinks.SECTION_LISTING], {
+        queryParams: {
+          submisssionId: this.submissionId,
+          evidenceIndex: index,
+          schoolName: this.entityName,
+        },
+      });
+    } else {
+      const entity = { _id: this.submissionId, name: this.entityName };
+      this.openAction(entity, index);
+    }
+  }
+
+  async openAction(assessment, evidenceIndex) {
+    this.utils.setCurrentimageFolderName(this.entityEvidences[evidenceIndex].externalId, assessment._id);
+    const options = {
+      _id: assessment._id,
+      name: assessment.name,
+      selectedEvidence: evidenceIndex,
+      entityDetails: this.entityData,
+    };
+    return await this.evdnsServ.openActionSheet(options, 'FRMELEMNTS_LBL_OBSERVATION');
+  }
+
+  async openEvidence(evidenceIndex) {
+    this.utils.setCurrentimageFolderName(this.entityEvidences[evidenceIndex].externalId, this.submissionId);
+    // this.selectedEvidenceIndex = evidenceIndex;
+    this.currentEvidence = this.entityData['assessment']['evidences'][evidenceIndex];
+    this.evidenceSections = this.currentEvidence['sections'];
+    this.checkForEvidenceCompletion();
+    if (this.entityEvidences[evidenceIndex].startTime) {
+      this.utils.setCurrentimageFolderName(this.entityEvidences[evidenceIndex].externalId, this.submissionId);
+
+      this.selectedEvidenceIndex = evidenceIndex;
+      this.currentEvidence = this.entityData['assessment']['evidences'][this.selectedEvidenceIndex];
+      this.evidenceSections = this.currentEvidence['sections'];
+      this.checkForEvidenceCompletion();
+    } else {
+      const entity = { _id: this.submissionId, name: this.entityName };
+      let action = await this.openAction(entity, evidenceIndex);
+      console.log(action)
+      this.selectedEvidenceIndex = evidenceIndex;
+      this.currentEvidence = this.entityData['assessment']['evidences'][this.selectedEvidenceIndex];
+      this.evidenceSections = this.currentEvidence['sections'];
+      this.checkForEvidenceCompletion();
+    }
+  }
+
+  checkForEvidenceCompletion(): void {
+    let allAnswered;
+    for (const section of this.evidenceSections) {
+      allAnswered = true;
+      for (const question of section.questions) {
+        if (!question.isCompleted) {
+          allAnswered = false;
+          break;
+        }
+      }
+      if (this.currentEvidence.isSubmitted) {
+        section.progressStatus = 'submitted';
+      } else if (!this.currentEvidence.startTime) {
+        section.progressStatus = '';
+      } else if (allAnswered) {
+        section.progressStatus = 'completed';
+      } else if (!allAnswered && section.progressStatus) {
+        section.progressStatus = 'inProgress';
+      } else if (!section.progressStatus) {
+        section.progressStatus = '';
+      }
+    }
+    this.allAnsweredForEvidence = true;
+    for (const section of this.evidenceSections) {
+      if (section.progressStatus !== 'completed') {
+        this.allAnsweredForEvidence = false;
+        break;
+      }
+    }
+    this.localStorage.setLocalStorage(this.utils.getAssessmentLocalStorageKey(this.submissionId), this.entityData);
+  }
+
+  async goToQuestioner(selectedSection) {
+    const params = {
+      _id: this.submissionId,
+      name: this.entityName,
+      selectedEvidence: this.selectedEvidenceIndex,
+      selectedSection: selectedSection,
+    };
+    // //
+    // if (!this.entityEvidences[this.selectedEvidenceIndex].startTime) {
+    //   const entity = { _id: this.submissionId, name: this.entityName };
+    //   let action = await this.openAction(entity, this.selectedEvidenceIndex);
+    // }
+
+    // //
+    if (!this.evidenceSections[selectedSection].progressStatus) {
+      this.evidenceSections[selectedSection].progressStatus = this.currentEvidence.startTime ? 'inProgress' : '';
+      this.localStorage.setLocalStorage(this.utils.getAssessmentLocalStorageKey(this.submissionId), this.entityData);
+    }
+
+    this.router.navigate([RouterLinks.QUESTIONNAIRE], {
+      queryParams: {
+        submisssionId: this.submissionId,
+        evidenceIndex: this.selectedEvidenceIndex,
+        sectionIndex: selectedSection,
+        schoolName: this.entityName,
+      },
+    });
+  }
+}
diff --git a/src/app/user-and-groups/group-members/group-members.module.ts b/src/app/manage-learn/ecm-listing/ecm-listing.module.ts
similarity index 58%
rename from src/app/user-and-groups/group-members/group-members.module.ts
rename to src/app/manage-learn/ecm-listing/ecm-listing.module.ts
index a8f33afba..0270b377c 100644
--- a/src/app/user-and-groups/group-members/group-members.module.ts
+++ b/src/app/manage-learn/ecm-listing/ecm-listing.module.ts
@@ -1,17 +1,17 @@
-import { NgModule } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { Routes, RouterModule } from '@angular/router';
 
 import { IonicModule } from '@ionic/angular';
 
-import { GroupMembersPage } from './group-members.page';
+import { EcmListingPage } from './ecm-listing.page';
 import { TranslateModule } from '@ngx-translate/core';
 
 const routes: Routes = [
   {
     path: '',
-    component: GroupMembersPage
+    component: EcmListingPage
   }
 ];
 
@@ -21,10 +21,11 @@ const routes: Routes = [
     FormsModule,
     IonicModule,
     RouterModule.forChild(routes),
-    TranslateModule.forChild()
+    TranslateModule
   ],
-  declarations: [GroupMembersPage],
-  entryComponents: [GroupMembersPage],
-  exports: [GroupMembersPage]
+  declarations: [EcmListingPage],
+  schemas:[
+    CUSTOM_ELEMENTS_SCHEMA
+  ]
 })
-export class GroupMembersPageModule {}
+export class EcmListingPageModule {}
diff --git a/src/app/manage-learn/ecm-listing/ecm-listing.page.html b/src/app/manage-learn/ecm-listing/ecm-listing.page.html
new file mode 100644
index 000000000..0036fe705
--- /dev/null
+++ b/src/app/manage-learn/ecm-listing/ecm-listing.page.html
@@ -0,0 +1,56 @@
+<ion-content>
+  <ion-item-group>
+    <ion-item-divider color="light">
+      <h3 class="headerText">
+        <ion-icon name="book" class="ion-margin-right"></ion-icon>
+        <span class="_wrap-text">{{entityName}}</span>
+      </h3>
+    </ion-item-divider>
+
+    <button ion-item [disabled]="evidence?.notApplicable" *ngFor="let evidence of entityEvidences; let i= index"
+      (click)="navigateToEvidence(i)" text-wrap>
+      <div class="_flex-box" style="flex-wrap: wrap;">
+        <ion-icon name="albums" class="ion-margin-right"></ion-icon>
+        <div style="flex: 1;">{{ evidence?.name }}</div>
+        <div *ngIf="evidence.progressStatus === 'completed' && !evidence?.notApplicable"
+          class="_completed _flex-box progressWidth ion-float-right">
+          <progress-bar [progress]="100" class="_full-width"></progress-bar>
+          <!-- {{'labels.completed'|translate}} <ion-icon name="checkmark-circle" class="_progressIcon" margin-left>
+          </ion-icon> -->
+        </div>
+        <div *ngIf="!evidence.progressStatus && !evidence?.notApplicable && !isIos" class="_flex-box">
+          <ion-icon name="arrow-forward" class="_progressIcon ion-float-right ion-margin-right"></ion-icon>
+        </div>
+        <div *ngIf="evidence.progressStatus === 'inProgress' && !evidence?.notApplicable"
+          class="_inProgress _flex-box progressWidth ion-float-right">
+          <progress-bar [progress]="evidence?.completePercentage" class=" _full-width"></progress-bar>
+          <!-- {{'labels.inprogress'|translate}} <ion-icon name="contrast" class="_progressIcon" margin-left></ion-icon> -->
+        </div>
+        <div *ngIf="evidence.progressStatus === 'submitted' && !evidence?.notApplicable"
+          class="_submitted _flex-box ion-float-right">
+          {{'labels.submitted'|translate}} <ion-icon name="cloud-done" class="_progressIcon ion-margin-left"></ion-icon>
+        </div>
+        <div *ngIf="evidence?.notApplicable" class="_na _flex-box _float-right">
+          {{'labels.notApplicable'|translate}} <ion-icon name="alert" class="_progressIcon ion-margin-left"></ion-icon>
+        </div>
+      </div>
+    </button>
+
+    <!-- <ion-button ion-item (click)="goToGeneralQuestionList()" *ngIf="generalQuestions && generalQuestions?.length">
+      <ion-icon name="albums" class="ion-margin-right"></ion-icon> {{'ionLabel.generalQuestions' | translate}}
+    </ion-button> -->
+  </ion-item-group>
+</ion-content>
+
+<!-- <ion-footer no-shadow *ngIf="canShowManualRating">
+  <ion-toolbar class="_toolbar-background-md" position="bottom">
+    <ion-row>
+      <ion-col>
+        <ion-button full (click)="goToManualRating(evidence)" class="btnText">
+          <ion-icon name="stats" class="ion-margin-right"></ion-icon>
+          {{'ionLabel.manualRating' | translate}}
+        </ion-button>
+      </ion-col>
+    </ion-row>
+  </ion-toolbar>
+</ion-footer> -->
\ No newline at end of file
diff --git a/src/app/manage-learn/ecm-listing/ecm-listing.page.scss b/src/app/manage-learn/ecm-listing/ecm-listing.page.scss
new file mode 100644
index 000000000..1abef1f16
--- /dev/null
+++ b/src/app/manage-learn/ecm-listing/ecm-listing.page.scss
@@ -0,0 +1,32 @@
+
+.doneIcon {
+    color: green;
+}
+
+// .startSurvey {
+//     color: $primary-color;
+
+// }
+
+ion-icon {
+    font-size: 2rem;
+}
+
+
+.headerText {
+    font-weight: 500 !important;
+    font-size: 1.5rem !important;
+    display: flex;
+    align-items: center;
+
+}
+
+.feedBack {
+    color: white !important;
+    font-size: 24px;
+    padding-right: 10px
+}
+
+.progressWidth {
+    min-width: 90px;
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/ecm-listing/ecm-listing.page.ts b/src/app/manage-learn/ecm-listing/ecm-listing.page.ts
new file mode 100644
index 000000000..bce6bc357
--- /dev/null
+++ b/src/app/manage-learn/ecm-listing/ecm-listing.page.ts
@@ -0,0 +1,166 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { RouterLinks } from '@app/app/app.constant';
+import { Platform } from '@ionic/angular';
+import { LocalStorageService, UtilsService } from '../core';
+import { EvidenceService } from '../core/services/evidence.service';
+import { UpdateTrackerService } from '../core/services/update-tracker.service';
+
+@Component({
+  selector: 'app-ecm-listing',
+  templateUrl: './ecm-listing.page.html',
+  styleUrls: ['./ecm-listing.page.scss'],
+})
+export class EcmListingPage implements OnInit {
+
+  entityId: any;
+  entityName: string;
+  entityEvidences: any;
+  entityData: any;
+  currentEvidenceStatus: string;
+  isIos: boolean = this.platform.is("ios");
+  generalQuestions: any;
+  submissionId: any;
+  recentlyUpdatedEntity: any;
+  canShowManualRating: boolean;
+
+  constructor(
+    private updateTracker: UpdateTrackerService,
+    private utils: UtilsService,
+    private localStorage: LocalStorageService,
+    private evdnsServ: EvidenceService,
+    private platform: Platform,
+    private routerParam: ActivatedRoute,
+    private router: Router
+  ) {
+    this.routerParam.queryParams.subscribe((params) => {
+      this.entityId = params.submisssionId;
+      this.entityName = params.schoolName;
+    })
+  }
+
+  ngOnInit() {
+  }
+
+  ionViewWillEnter() {
+    this.localStorage
+      .getLocalStorage(this.utils.getAssessmentLocalStorageKey(this.entityId))
+      .then((successData) => {
+        this.entityData = successData;
+        // this.checkAllEvidenceSubmitted();
+        this.entityEvidences = this.updateTracker.getLastModifiedInEvidences(
+          this.entityData["assessment"]["evidences"],
+          this.recentlyUpdatedEntity
+        );
+        this.mapCompletedAndTotalQuestions();
+        this.checkForProgressStatus();
+        this.localStorage
+          .getLocalStorage("generalQuestions_" + this.entityId)
+          .then((successData) => {
+            this.generalQuestions = successData;
+          })
+          .catch((error) => {});
+      })
+      .catch((error) => {
+      });
+  }
+
+  mapCompletedAndTotalQuestions() {
+    for (const evidence of this.entityEvidences) {
+      let totalQuestions = 0;
+      let completedQuestions = 0;
+      for (const section of evidence.sections) {
+        totalQuestions = totalQuestions + section.totalQuestions;
+        completedQuestions = completedQuestions + section.completedQuestions;
+      }
+      let percentage = totalQuestions ? (completedQuestions / totalQuestions) * 100 : 0;
+      if (!completedQuestions) {
+        percentage = 0;
+      }
+      evidence.completePercentage = Math.trunc(percentage);
+    }
+  }
+
+  goToGeneralQuestionList(): void {
+    // this.appCtrl.getRootNav().push("GeneralQuestionListPage", {
+    //   _id: this.entityId,
+    //   name: this.entityName,
+    // });
+  }
+
+  checkForProgressStatus() {
+    for (const evidence of this.entityEvidences) {
+      if (evidence.isSubmitted) {
+        evidence.progressStatus = "submitted";
+      } else if (!evidence.startTime) {
+        evidence.progressStatus = "";
+      } else {
+        evidence.progressStatus = "completed";
+        for (const section of evidence.sections) {
+          if (section.progressStatus === "inProgress" || !section.progressStatus) {
+            evidence.progressStatus = "inProgress";
+          }
+        }
+      }
+    }
+  }
+
+  openAction(assessment, evidenceIndex) {
+    this.utils.setCurrentimageFolderName(this.entityEvidences[evidenceIndex].externalId, assessment._id);
+    const options = {
+      _id: assessment._id,
+      name: assessment.name,
+      selectedEvidence: evidenceIndex,
+      entityDetails: this.entityData,
+    };
+    this.evdnsServ.openActionSheet(options);
+  }
+
+  navigateToEvidence(index): void {
+    if (this.entityEvidences[index].startTime) {
+      this.utils.setCurrentimageFolderName(this.entityEvidences[index].externalId, this.entityId);
+      this.router.navigate([RouterLinks.SECTION_LISTING],
+        {
+          queryParams: {
+            submisssionId: this.entityId,
+            evidenceIndex: index,
+            schoolName: this.entityName
+          }
+        })
+
+      // this.navCtrl.push("SectionListPage", {
+      //   _id: this.entityId,
+      //   name: this.entityName,
+      //   selectedEvidence: index,
+      // });
+    } else {
+      const entity = { _id: this.entityId, name: this.entityName };
+      this.openAction(entity, index);
+    }
+  }
+
+  // goToManualRating(): void {
+  //   const navParams = {
+  //     entityName: this.entityName,
+  //     submissionId: this.entityData["assessment"].submissionId,
+  //   };
+  //   this.navCtrl.push(ManualRatingPage, { navParams });
+  // }
+
+  // checkAllEvidenceSubmitted(): null {
+  //   if (!this.ngps.getNetworkStatus() || this.entityData.solution.scoringSystem != "manual") {
+  //     console.log("No network");
+  //     this.canShowManualRating = false;
+  //     return;
+  //   }
+  //   const submissionId = this.entityData["assessment"].submissionId;
+  //   this.manualRatingProvider
+  //     .checkAllECMStatus(submissionId)
+  //     .then((res) => {
+  //       console.log(res);
+  //       res.status == "ratingPending" ? (this.canShowManualRating = true) : (this.canShowManualRating = false);
+  //     })
+  //     .catch(() => (this.canShowManualRating = false));
+  // }
+
+}
diff --git a/src/app/user-and-groups/group-details/group-details.module.ts b/src/app/manage-learn/generic-reports/generic-reports.module.ts
similarity index 52%
rename from src/app/user-and-groups/group-details/group-details.module.ts
rename to src/app/manage-learn/generic-reports/generic-reports.module.ts
index 8651a9ff1..959071237 100644
--- a/src/app/user-and-groups/group-details/group-details.module.ts
+++ b/src/app/manage-learn/generic-reports/generic-reports.module.ts
@@ -1,31 +1,34 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { HttpClientModule } from '@angular/common/http';
 import { FormsModule } from '@angular/forms';
 import { Routes, RouterModule } from '@angular/router';
-
 import { IonicModule } from '@ionic/angular';
-
-import { GroupDetailsPage } from './group-details.page';
 import { TranslateModule } from '@ngx-translate/core';
-import { GroupDetailNavPopover } from '../group-detail-nav-popover/group-detail-nav-popover';
+import { CoreModule } from '../core/core.module';
+import { SharedModule } from '../shared/shared.module';
+import { ReportsComponent } from './reports/reports.component';
+
+
 
 const routes: Routes = [
   {
     path: '',
-    component: GroupDetailsPage
-  }
+    component: ReportsComponent,
+  },
 ];
 
 @NgModule({
+  declarations: [ReportsComponent],
   imports: [
     CommonModule,
-    FormsModule,
-    IonicModule,
+    HttpClientModule,
     RouterModule.forChild(routes),
-    TranslateModule.forChild()
+    TranslateModule.forChild(),
+    SharedModule,
+    IonicModule,
+    FormsModule,
+    CoreModule,
   ],
-  declarations: [GroupDetailsPage, GroupDetailNavPopover],
-  entryComponents: [GroupDetailsPage, GroupDetailNavPopover],
-  exports: [GroupDetailsPage]
 })
-export class GroupDetailsPageModule { }
+export class GenericReportsModule {}
diff --git a/src/app/manage-learn/generic-reports/reports/reports.component.html b/src/app/manage-learn/generic-reports/reports/reports.component.html
new file mode 100644
index 000000000..ed6a2ce03
--- /dev/null
+++ b/src/app/manage-learn/generic-reports/reports/reports.component.html
@@ -0,0 +1,120 @@
+<ion-content >
+  <h3 class="txt-capitalize">{{ data?.solutionName }}</h3>
+  <h6 class="grade_ellipsis txt-capitalize">{{ data?.entityName }}</h6>
+  <ion-grid *ngIf="data?.totalObservations">
+    <ion-row>
+      <ion-col style="margin-left: 15px">
+        {{ '"FRMELEMNTS_LBL_TOTAL_OBSERVATIONS"' | translate }} : {{ data?.totalObservations }}</ion-col
+      >
+    </ion-row>
+  </ion-grid>
+  <div *ngFor="let filter of filters">
+    <!-- for instance filter -->
+    <div *ngIf="filter.filter.type == 'dropdown'" class="d-flex flex-ai-center w-100">
+      <div>
+        <ion-select
+          okText="Select"
+          cancelText="Dismiss"
+          placeholder="Submission Filter"
+          [(ngModel)]="submissionId"
+          (ionChange)="instanceReport($event)"
+          [interfaceOptions]="{
+            cssClass: 'select-box',
+            animated: false
+          }"
+        >
+          <ion-select-option [value]="s._id" *ngFor="let s of filter.filter.data">{{
+            s.name
+          }}</ion-select-option></ion-select
+        >
+      </div>
+      <div>
+        <ion-icon name="close" class="sb-modal-close" (click)="submissionId = null" *ngIf="submisison"></ion-icon>
+      </div>
+    </div>
+
+    <!-- for question and criteria filter modal/ only show when report is present -->
+    <div *ngIf="filter.filter.type == 'modal' && !error" class="d-flex flex-jc-flex-end py-10">
+      <ion-button ion-button icon-start (click)="openFilter(filter.filter.data, filter.filter.keyToSend)" margin>
+        <ion-icon name="options"></ion-icon>
+        {{ 'FRMELEMNTS_BTN_FILTER' | translate }}
+      </ion-button>
+    </div>
+
+    <!-- for dropdown type  -->
+    <ion-segment
+      (ionChange)="segmentChanged(segmentValue)"
+      [(ngModel)]="segmentValue"
+      *ngIf="filter.filter.type == 'segment'"
+    >
+      <ion-segment-button value="questionwise">
+        <ion-label> {{ 'FRMELEMNTS_LBL_QUESTION_WISE' | translate }}</ion-label>
+      </ion-segment-button>
+      <ion-segment-button value="criteriawise">
+        <ion-label> {{ 'FRMELEMNTS_LBL_CRITERIA_WISE' | translate }}</ion-label>
+      </ion-segment-button>
+    </ion-segment>
+    <!--  -->
+  </div>
+  <div *ngFor="let section of reportSections">
+    <ion-card-content *ngIf="section?.criteriaName">
+      <h3>{{ section.criteriaName }}</h3>
+    </ion-card-content>
+    <div *ngFor="let element of section?.questionArray; let i = index">
+      <ion-card [ngSwitch]="element?.responseType">
+        <reports-text [data]="element" [questionNumber]="i + 1" *ngSwitchCase="'text'" [isFeedBackSurvey]="state?.survey" [solutionId]="state?.solutionId"></reports-text>
+        <reports-text [data]="element" [questionNumber]="i + 1" *ngSwitchCase="'number'"></reports-text>
+        <reports-text [data]="element" [questionNumber]="i + 1" *ngSwitchCase="'date'"></reports-text>
+        <pie-chart [data]="element" [questionNumber]="i + 1" *ngSwitchCase="'radio'"></pie-chart>
+        <bar-chart [data]="element" [questionNumber]="i + 1" *ngSwitchCase="'multiselect'"></bar-chart>
+        <matrix-chart
+          [data]="element"
+          [questionNumber]="i + 1"
+          *ngSwitchCase="'matrix'"
+          (allEvidence)="allEvidence($event)"
+        ></matrix-chart>
+        <percentage-column-charts
+          [chartData]="element"
+          *ngSwitchCase="'horizontalBar'"
+          (clickOnGraphEventEmit)="clickOnGraphEventEmit($event)"
+        ></percentage-column-charts>
+        <expansion-panel [datas]="element" *ngSwitchCase="'expansion'"></expansion-panel>
+        <expansion-table [datas]="element" *ngSwitchCase="'expansion-table'"></expansion-table>
+        <pie-chart [data]="element" [questionNumber]="i + 1" *ngSwitchCase="'pie'"></pie-chart>
+        <scatter-chart [data]="element" [questionNumber]="i + 1" *ngSwitchCase="'scatter'"></scatter-chart>
+        <bar-chart [data]="element" [questionNumber]="i + 1" *ngSwitchCase="'column'"></bar-chart>
+        <bar-chart [data]="element" [questionNumber]="i + 1" *ngSwitchCase="'bar'"></bar-chart>
+        <reports-text [data]="element" [questionNumber]="i + 1" *ngSwitchDefault></reports-text>
+      </ion-card>
+      <ion-grid>
+        <ion-row>
+          <ion-col size="4" *ngFor="let e of element.evidences">
+            <attachments [url]="e.url" [extension]="e.extension"></attachments>
+          </ion-col>
+          <ion-col size="12" *ngIf="element.evidence_count > 3">
+            <small class="pull-right text-ios-danger" (click)="allEvidence(element)">{{
+              'FRMELEMNTS_LBL_VIEW_ALL_EVIDNECES' | translate
+            }}</small>
+          </ion-col>
+        </ion-row>
+      </ion-grid>
+    </div>
+
+    <!-- observation -->
+
+    <!--  -->
+  </div>
+  <div *ngIf="error" class="_flex-box _justify-content-center">
+    {{ error?.message }}
+  </div>
+  <div class="_flex-box _justify-content-center" *ngIf="data?.improvementProjectSuggestions && data?.improvementProjectSuggestions.length ">
+    <ion-button ion-button round class="viewReportBtn" (click)="goToImpSugg()">
+      {{'FRMELEMNTS_CLICK_TO_IMPROVE' | translate}}
+    </ion-button>
+  </div>
+  <!-- INFO: click to improve feature not threre as of now  -->
+</ion-content>
+<!-- dont show when error or when showing survey reports -->
+<ion-footer *ngIf="!error && !state.survey">
+  <download-share [extension]="'.pdf'" [interface]="'fab'" [config]="config()"> </download-share>
+</ion-footer>
diff --git a/src/app/manage-learn/generic-reports/reports/reports.component.scss b/src/app/manage-learn/generic-reports/reports/reports.component.scss
new file mode 100644
index 000000000..63d1fb32e
--- /dev/null
+++ b/src/app/manage-learn/generic-reports/reports/reports.component.scss
@@ -0,0 +1,28 @@
+@import 'src/assets/styles/base/_variables.scss';
+@import 'src/assets/styles/_custom-mixins.scss';
+@import 'src/assets/styles/_variables.scss';
+.filterIcon {
+  font-size: 30px;
+  float: right;
+  margin: 10px 15px;
+  color: $primary-color;
+}
+.reportName {
+  text-transform: capitalize;
+  margin-bottom: 0;
+  padding: 0 15px;
+}
+.heading {
+  margin: 10px 15px;
+  color: $gray-300;
+}
+
+h3 {
+  font-size: 1.5rem;
+}
+h4 {
+  font-size: 1rem;
+}
+:host ::ng-deep h4 {
+  font-size: 1rem;
+}
diff --git a/src/app/manage-learn/generic-reports/reports/reports.component.ts b/src/app/manage-learn/generic-reports/reports/reports.component.ts
new file mode 100644
index 000000000..03e249e8e
--- /dev/null
+++ b/src/app/manage-learn/generic-reports/reports/reports.component.ts
@@ -0,0 +1,175 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { LoaderService, ToastService } from '../../core';
+import * as _ from 'lodash-es';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { DhitiApiService } from '../../core/services/dhiti-api.service';
+import { ModalController } from '@ionic/angular';
+import { ReportModalFilter } from '../../shared/components/report-modal-filter/report.modal.filter';
+import { RouterLinks } from '@app/app/app.constant';
+
+@Component({
+  selector: 'app-reports',
+  templateUrl: './reports.component.html',
+  styleUrls: ['./reports.component.scss'],
+})
+export class ReportsComponent implements OnInit {
+  state: { [k: string]: any };
+  data: any;
+  error: { result: boolean; message: string };
+  submissionId: any;
+  action;
+  filters: any;
+  segmentValue: string;
+  filteredData: any;
+  modalFilterData: any;
+  reportSections: any;
+  constructor(
+    private router: Router,
+    private toast: ToastService,
+    private loader: LoaderService,
+    private dhiti: DhitiApiService,
+    private modal: ModalController
+  ) {
+    console.log(this.router.getCurrentNavigation().extras.state);
+    this.state = this.router.getCurrentNavigation().extras.state;
+  }
+
+  ngOnInit() {
+    this.segmentValue = 'questionwise';
+    this.state['pdf'] = false;
+    this.getReport();
+  }
+  getReport() {
+    // remove null and undefined
+    this.state = _.omitBy(this.state, _.isNil);
+    this.error = null;
+    this.loader.startLoader();
+    const config = {
+      url: urlConstants.API_URLS.GENERIC_REPORTS,
+      payload: this.state,
+    };
+
+    this.dhiti.post(config).subscribe(
+      (success) => {
+        this.loader.stopLoader();
+        if (success.result === true && success.reportSections) {
+          this.data = success;
+          this.reportSections = this.filterBySegment();
+
+          if (this.data.filters && !this.filters) {
+            this.filters = this.data.filters;
+          }
+
+          if (this.data.filters) {
+            let modalFilter = this.data.filters.filter((filter) => filter.filter.type == 'modal')[0];
+            this.filters = this.filters.map((filter) => {
+              if (filter.filter.type == 'modal') {
+                filter = modalFilter;
+              }
+              return filter;
+            });
+          }
+        } else {
+          this.toast.openToast(success.message);
+          this.error = success;
+          this.reportSections = [];
+        }
+      },
+      (error) => {
+        this.toast.openToast(error.message);
+        this.loader.stopLoader();
+        this.reportSections = [];
+        this.error = error;
+      }
+    );
+  }
+
+  instanceReport(e) {
+    this.state.submissionId = this.submissionId;
+    this.getReport();
+  }
+
+  config() {
+    let payload = Object.assign({}, this.state, { pdf: true }); // will not change state obj
+    const config = {
+      url: urlConstants.API_URLS.GENERIC_REPORTS,
+      payload: payload,
+    };
+
+    return config;
+  }
+
+  segmentChanged(segment) {
+    segment === 'criteriawise' ? (this.state.criteriaWise = true) : (this.state.criteriaWise = false);
+    this.state.filter = null;
+    this.modalFilterData = null;
+    this.getReport();
+  }
+
+  filterBySegment() {
+    if (this.segmentValue == 'questionwise') {
+      let reportSections = [{ questionArray: this.data.reportSections }];
+      return reportSections;
+    }
+
+    return this.data.reportSections;
+  }
+
+  async openFilter(data, keyToSend) {
+    this.modalFilterData ? null : (this.modalFilterData = data);
+    let filteredData;
+    if (this.state.filter && this.state.filter.length) {
+      filteredData = this.state.filter[keyToSend];
+    } else {
+      filteredData = data.map((d) => d._id);
+    }
+
+    let dataType= this.state.criteriaWise ?'criteria': 'question'
+    const modal = await this.modal.create({
+      component: ReportModalFilter,
+      componentProps: {
+        data: this.modalFilterData,
+        filteredData: JSON.parse(JSON.stringify(filteredData)),
+        dataType:dataType 
+      },
+    });
+    await modal.present();
+    await modal.onDidDismiss().then((response: any) => {
+      if (
+        response.data &&
+        response.data.action === 'updated' &&
+        JSON.stringify(response.data.filter) !== JSON.stringify(filteredData)
+      ) {
+        this.state.filter = {};
+        this.state.filter[keyToSend] = response.data.filter;
+        this.getReport();
+      }
+    });
+  }
+
+  allEvidence(element) {
+    this.router.navigate([RouterLinks.ALL_EVIDENCE], {
+      queryParams: {
+        submissionId: this.state.submissionId,
+        observationId: this.state.observationId,
+        entityId: this.state.entityId,
+        questionExternalId: element.order,
+        entityType: this.state.entityType,
+      },
+    });
+  }
+
+  goToImpSugg() {
+     const state  = {
+       data: this.data.improvementProjectSuggestions,
+       solutionName: this.data.solutionName,
+       solutionId: this.data.solutionId,
+       observationId: this.state.observationId,
+       entityId: this.state.entityId,
+     };
+    this.router.navigate([RouterLinks.IMP_SUGGESTIONS], {
+      state: state,
+    });
+  }
+}
diff --git a/src/app/manage-learn/image-listing/image-listing.module.ts b/src/app/manage-learn/image-listing/image-listing.module.ts
new file mode 100644
index 000000000..c77024599
--- /dev/null
+++ b/src/app/manage-learn/image-listing/image-listing.module.ts
@@ -0,0 +1,29 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { HttpClientModule } from '@angular/common/http';
+import { FormsModule } from '@angular/forms';
+import { IonicModule } from '@ionic/angular';
+import { TranslateModule } from '@ngx-translate/core';
+import { CoreModule } from '../core/core.module';
+import { SharedModule } from '../shared/shared.module';
+import { ImageListingComponent } from './image-listing/image-listing.component';
+import { RouterModule, Routes } from '@angular/router';
+const routes: Routes = [
+  {
+    path: '',
+    component: ImageListingComponent,
+  },
+];
+@NgModule({
+  declarations: [ImageListingComponent],
+  imports: [
+    CommonModule,
+    TranslateModule.forChild(),
+    RouterModule.forChild(routes),
+    SharedModule,
+    IonicModule,
+    FormsModule,
+    CoreModule,
+  ],
+})
+export class ImageListingModule {}
diff --git a/src/app/manage-learn/image-listing/image-listing/image-listing.component.html b/src/app/manage-learn/image-listing/image-listing/image-listing.component.html
new file mode 100644
index 000000000..76d49c4bc
--- /dev/null
+++ b/src/app/manage-learn/image-listing/image-listing/image-listing.component.html
@@ -0,0 +1,10 @@
+<ion-content>
+  <div class="_flex-box fullContainer _justify-content-center _flex-direction-column" margin-top>
+    <ion-icon name="cloud-upload" margin class="uploadIcon"></ion-icon>
+    <div class="_flex-box uploadMsg">Uploading</div>
+    <div class="_flex-box uploadMsg" margin-top *ngIf="imageList?.length">
+      {{ uploadIndex + 1 }} {{ 'FRMELEMNTS_MSG_OF' | translate }} {{ imageList.length }} {{ 'FRMELEMNTS_MSG_IMAGES' | translate }}.
+    </div>
+    <div class="_flex-box" margin-top>{{ 'FRMELEMNTS_MSG_DONOT_CLOSE_APP' | translate }}</div>
+  </div>
+</ion-content>
diff --git a/src/app/manage-learn/image-listing/image-listing/image-listing.component.scss b/src/app/manage-learn/image-listing/image-listing/image-listing.component.scss
new file mode 100644
index 000000000..d24a03ab2
--- /dev/null
+++ b/src/app/manage-learn/image-listing/image-listing/image-listing.component.scss
@@ -0,0 +1,61 @@
+@import 'src/assets/styles/base/_variables.scss';
+@import 'src/assets/styles/_custom-mixins.scss';
+@import 'src/assets/styles/_variables.scss';
+
+.question {
+  font-weight: 500;
+}
+
+.instanceQuest {
+  background: $gray-100;
+  border: 1px solid $gray-400;
+  padding: 10px;
+  margin: 2px 0;
+  border-radius: 2px;
+}
+.instacnce {
+  margin: 10px 0;
+  font-weight: 600 !important;
+}
+
+.matrixQuestion {
+  margin: 20px 0;
+}
+
+ion-spinner {
+  position: absolute;
+  top: 39%;
+  left: 39%;
+  z-index: 2;
+  background: $white;
+}
+
+.doneMark {
+  background: $white;
+  position: absolute;
+  z-index: 2;
+  width: 40px;
+  height: 40px;
+  border-radius: 50%;
+
+  ion-icon {
+    color: $green;
+    font-size: 3rem;
+    font-weight: bold;
+  }
+}
+
+.fullContainer {
+  height: 85vh;
+}
+
+.uploadIcon {
+//   font-size: 30rem;
+  font-size: 19rem;
+  color: $blue
+}
+
+.uploadMsg {
+  font-size: 25px;
+  font-weight: 500;
+}
diff --git a/src/app/manage-learn/image-listing/image-listing/image-listing.component.ts b/src/app/manage-learn/image-listing/image-listing/image-listing.component.ts
new file mode 100644
index 000000000..a5a235ab3
--- /dev/null
+++ b/src/app/manage-learn/image-listing/image-listing/image-listing.component.ts
@@ -0,0 +1,518 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { FileTransfer, FileTransferObject, FileUploadOptions } from '@ionic-native/file-transfer/ngx';
+import { File } from '@ionic-native/file/ngx';
+import { Platform } from '@ionic/angular';
+import { LoaderService, LocalStorageService, ToastService, UtilsService } from '../../core';
+import cloneDeep from 'lodash/cloneDeep';
+import { TranslateService } from '@ngx-translate/core';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { AssessmentApiService } from '../../core/services/assessment-api.service';
+import { KendraApiService } from '../../core/services/kendra-api.service';
+
+declare var cordova: any;
+
+@Component({
+  selector: 'app-image-listing',
+  templateUrl: './image-listing.component.html',
+  styleUrls: ['./image-listing.component.scss'],
+})
+export class ImageListingComponent implements OnInit {
+  tempevidenceSections: any;
+  allStrings: any;
+
+  constructor(
+    private routerParam: ActivatedRoute,
+    private platform: Platform,
+    private localStorage: LocalStorageService,
+    private utils: UtilsService,
+    private loader: LoaderService,
+    private file: File,
+    private fileTransfer: FileTransfer,
+    private toast: ToastService,
+    private translate: TranslateService,
+    private assessmentService: AssessmentApiService,
+    private kendra:KendraApiService
+  ) {
+    this.routerParam.queryParams.subscribe((params) => {
+      this.submissionId = params.submissionId;
+      this.selectedEvidenceIndex = params.selectedEvidenceIndex;
+      this.schoolName = params.name;
+    });
+
+      this.translate
+      .get(["FRMELEMENTS_MSG_SOMETHING_WENT_WRONG",'FRMELEMENTS_MSG_SUBMISSION_NOT_ALLOWED'])
+      .subscribe((texts) => {
+        this.allStrings = texts;
+      });
+  }
+
+  ngOnInit() {
+    this.localStorage
+      .getLocalStorage(this.utils.getAssessmentLocalStorageKey(this.submissionId))
+      .then((data) => {
+        this.schoolData = data;
+        this.currentEvidence = this.schoolData['assessment']['evidences'][this.selectedEvidenceIndex];
+        this.imageLocalCopyId = 'images_' + this.currentEvidence.externalId + '_' + this.submissionId;
+        this.evidenceSections = this.currentEvidence['sections'];
+        this.selectedEvidenceName = this.currentEvidence['name'];
+        this.getAllImages();
+      })
+      .catch((error) => {});
+  }
+  uploadImages: any;
+  imageList = [];
+  appFolderPath: string = this.platform.is('ios')
+    ? cordova.file.documentsDirectory + 'images'
+    : cordova.file.externalDataDirectory + 'images';
+  schoolName: string;
+  selectedEvidenceIndex: any;
+  uploadIndex: number = 0;
+  schoolData: any;
+  currentEvidence: any;
+  evidenceSections: any;
+  selectedEvidenceName: any;
+  imageLocalCopyId: any;
+  retryCount: number = 0;
+  page = 'ECM submission page';
+  failedUploadImageNames = [];
+  errorObj = {
+    fallback: 'User Details',
+    title: `Error Details`,
+    text: ``,
+  };
+  submissionId;
+
+  ionViewDidLoad() {
+  }
+
+  getAllImages() {
+    let imageArray = [];
+    for (const sections of this.currentEvidence.sections) {
+      for (const question of sections.questions) {
+        let questImage;
+        if (question.responseType === 'pageQuestions') {
+          question.pageQuestions.forEach((element) => {
+            questImage = this.utils.getImageNamesForQuestion(element);
+            const newArray = questImage.length ? imageArray.concat(questImage) : imageArray;
+            imageArray = newArray;
+          });
+        } else {
+          questImage = this.utils.getImageNamesForQuestion(question);
+          const newArray = questImage.length ? imageArray.concat(questImage) : imageArray;
+          imageArray = newArray;
+        }
+      }
+    }
+    this.uploadImages = imageArray;
+    this.checkIfEcmSumittedByUser();
+  }
+
+  async checkIfEcmSumittedByUser() {
+    this.loader.startLoader();
+    const submissionId = this.submissionId;
+    let url = this.schoolData.survey
+      ? urlConstants.API_URLS.IS_SURVEY_SUBMISSION_ALLOWED
+      : this.schoolData.observation
+      ? urlConstants.API_URLS.IS_OBSERVATION_SUBMISSION_ALLOWED
+      : urlConstants.API_URLS.CHECK_IF_SUBMITTED;
+
+    let payload = await this.utils.getProfileInfo();
+    url = url + submissionId + '?evidenceId=' + this.currentEvidence.externalId;
+    const config = {
+      url: url,
+      payload: payload,
+    };
+
+    this.assessmentService.post(config).subscribe(
+      (success) => {
+        this.loader.stopLoader();
+        if (success.result.allowed) {
+          if (this.uploadImages.length) {
+            this.createImageFromName(this.uploadImages);
+          } else {
+            this.submitEvidence();
+          }
+        } else {
+          this.translate.get('FRMELEMENTS_MSG_SUBMISSION_COMPLETED').subscribe((translations) => {
+            this.toast.openToast(translations);
+          });
+          this.schoolData['assessment']['evidences'][this.selectedEvidenceIndex].isSubmitted = true;
+          this.localStorage.setLocalStorage(
+            this.utils.getAssessmentLocalStorageKey(this.submissionId),
+            this.schoolData
+          );
+          const options = {
+            _id: this.submissionId,
+            name: this.schoolName,
+          };
+          window.history.go(-2);
+        }
+      },
+      (error) => {
+        this.loader.stopLoader();
+      }
+    );
+  }
+
+  createImageFromName(imageList) {
+    this.loader.startLoader();
+    for (const image of imageList) {
+      this.imageList.push({ uploaded: false, file: image, url: '' });
+    }
+    this.getImageUploadUrls();
+  }
+
+  async getImageUploadUrls() {
+    const submissionId = this.submissionId;
+    const files =[]
+    for (const image of this.uploadImages) {
+      files.push(image);
+    }
+
+    let payload = await this.utils.getProfileInfo();
+    payload.ref = "survey"
+    payload.request = {}
+    payload.request[submissionId] = {
+        files: files,
+    };
+    const config = {
+      url: urlConstants.API_URLS.PRESIGNED_URLS,
+      payload: payload,
+    };
+
+    this.kendra.post(config).subscribe(
+      (success) => {
+        this.loader.stopLoader();
+        if (!success.result || !success.result[submissionId] || !success.result[submissionId].files) {
+          return
+        }
+        let array = success.result[submissionId].files
+          for (let i = 0; i < array.length; i++) {
+            this.imageList[i]['url'] = array[i].url;
+            this.imageList[i]['sourcePath'] = array[i].payload.sourcePath;
+            array[i].cloudStorage ? (this.imageList[i]['cloudStorage'] = array[i].cloudStorage) : null;
+          }
+        this.checkForLocalFolder();
+      },
+      (error) => {
+        this.loader.stopLoader();
+        this.translate.get('FRMELEMENTS_MSG_ENABLE_TO_GET_GOOGLE_URLS').subscribe((translations) => {
+          this.toast.openToast(translations);
+        });
+      }
+    );
+  }
+
+  checkForLocalFolder() {
+    if (this.platform.is('ios')) {
+      this.file
+        .checkDir(this.file.documentsDirectory, 'images')
+        .then((success) => {
+          this.fileTransfer.create();
+          this.cloudImageUpload();
+        })
+        .catch((err) => {});
+    } else {
+      this.file
+        .checkDir(this.file.externalDataDirectory, 'images')
+        .then((success) => {
+          this.cloudImageUpload();
+          this.fileTransfer.create();
+        })
+        .catch((err) => {});
+    }
+  }
+
+  cloudImageUpload() {
+    var options: FileUploadOptions = {
+      fileKey: this.imageList[this.uploadIndex].file,
+      fileName: this.imageList[this.uploadIndex].file,
+      chunkedMode: false,
+      mimeType: 'image/jpeg',
+      headers: {
+        'Content-Type': 'multipart/form-data',
+        'x-ms-blob-type':
+          this.imageList[this.uploadIndex].cloudStorage && this.imageList[this.uploadIndex].cloudStorage === 'AZURE'
+            ? 'BlockBlob'
+            : null,
+      },
+      httpMethod: 'PUT',
+    };
+    let targetPath = this.pathForImage(this.imageList[this.uploadIndex].file);
+    let fileTrns: FileTransferObject = this.fileTransfer.create();
+    this.file
+      .checkFile(
+        (this.platform.is('ios') ? this.file.documentsDirectory : this.file.externalDataDirectory) + 'images/',
+        this.imageList[this.uploadIndex].file
+      )
+      .then((success) => {
+        fileTrns
+          .upload(targetPath, this.imageList[this.uploadIndex].url, options)
+          .then((result) => {
+            this.retryCount = 0;
+            this.imageList[this.uploadIndex].uploaded = true;
+            if (this.uploadIndex < this.imageList.length - 1) {
+              this.uploadIndex++;
+              this.cloudImageUpload();
+            } else {
+              this.submitEvidence();
+            }
+          })
+          .catch((err) => {
+            const errorObject = { ...this.errorObj };
+            this.retryCount++;
+            if (this.retryCount > 3) {
+              this.translate.get('FRMELEMENTS_MSG_SOMETHING_WENT_WRONG').subscribe((translations) => {
+                this.toast.openToast(translations);
+              });
+              errorObject.text = `${this.page}: Cloud image upload failed.URL:  ${this.imageList[this.uploadIndex].url}.
+            Details: ${JSON.stringify(err)}`;
+              // this.slack.pushException(errorObject);//TODO:implement
+              history.go(-1);
+            } else {
+              this.cloudImageUpload();
+            }
+          });
+      })
+      .catch((error) => {
+        this.failedUploadImageNames.push(this.imageList[this.uploadIndex].file);
+        if (this.uploadIndex < this.imageList.length - 1) {
+          this.uploadIndex++;
+          this.cloudImageUpload();
+        } else {
+          this.submitEvidence();
+        }
+      });
+  }
+
+  pathForImage(img) {
+    if (img === null) {
+      return '';
+    } else {
+      const path = this.platform.is('ios') ? cordova.file.documentsDirectory : cordova.file.externalDataDirectory;
+      return path + 'images/' + img;
+    }
+  }
+  async submitEvidence() {
+    this.loader.startLoader(this.allStrings['FRMELEMENTS_MSG_PLEASE_WAIT_WHILE_SUBMITTING']);
+    console.log('submitting');
+    const constructPayload = this.constructPayload();
+    const submissionId = this.submissionId;
+    const url =
+      (this.schoolData.survey
+        ? urlConstants.API_URLS.SURVEY_FEEDBACK_MAKE_SUBMISSION
+        : this.schoolData.observation
+        ? urlConstants.API_URLS.OBSERVATION_SUBMISSION_UPDATE
+        : urlConstants.API_URLS.SUBMISSION) +
+      submissionId +
+      '/';
+
+    let payload = await this.utils.getProfileInfo();
+    payload = { ...payload, ...constructPayload };
+    const config = {
+      url: url,
+      payload: payload,
+    };
+
+    this.assessmentService.post(config).subscribe(
+      (response) => {
+        if (this.schoolData.observation) {
+          // this.observetionProvider.markObservationAsCompleted(submissionId);//TODO:Not storing in local now
+        }
+        if (response && response.result && response.result.allowed==false) {
+          this.toast.openToastWithClose(this.allStrings['FRMELEMENTS_MSG_SUBMISSION_NOT_ALLOWED']);
+        } else {
+          this.toast.openToast(response.message);
+        }
+        this.schoolData['assessment']['evidences'][this.selectedEvidenceIndex].isSubmitted = true;
+        this.localStorage.setLocalStorage(this.utils.getAssessmentLocalStorageKey(this.submissionId), this.schoolData);
+        const options = {
+          _id: this.submissionId,
+          name: this.schoolName,
+        };
+        this.loader.stopLoader();
+        history.go(-2);
+      },
+      (error) => {
+        this.loader.stopLoader();
+      }
+    );
+
+  }
+
+  constructPayload(): any {
+    const payload = {
+      evidence: {},
+    };
+    const evidence = {
+      id: '',
+      externalId: '',
+      answers: {},
+      startTime: 0,
+      endTime: 0,
+    };
+    this.currentEvidence;
+    // const currentEvidence =   this.currentEvidence
+    /*
+    !deepclone to avoid structure change in the type:pageQuestion
+    !using to take the tempevidnceSections and pullout page questions
+    */
+    const currentEvidence = cloneDeep(this.currentEvidence);
+    evidence.id = currentEvidence._id;
+    evidence.externalId = currentEvidence.externalId;
+    evidence.startTime = currentEvidence.startTime;
+    evidence.endTime = Date.now();
+    this.tempevidenceSections = currentEvidence.sections;
+    this.tempevidenceSections = this.pullOutPageQuestion();
+
+    for (const section of this.tempevidenceSections) {
+      for (const question of section.questions) {
+        let obj = {
+          qid: question._id,
+          value: question.responseType === 'matrix' ? this.constructMatrixObject(question) : question.value,
+          remarks: question.remarks,
+          fileName: [],
+          gpsLocation: question.gpsLocation,
+          payload: {
+            question: question.question,
+            labels: [],
+            responseType: question.responseType,
+            filesNotUploaded: [],
+          },
+          startTime: question.startTime,
+          endTime: question.endTime,
+        };
+
+        if (question.fileName && question.fileName.length) {
+          const filePaylaod = [];
+          for (const fileName of question.fileName) {
+            for (const updatedFileDetails of this.imageList) {
+              if (fileName === updatedFileDetails.file) {
+                const obj = {
+                  name: fileName,
+                  sourcePath: updatedFileDetails.sourcePath,
+                };
+                filePaylaod.push(obj);
+              }
+            }
+          }
+          obj.fileName = filePaylaod;
+        }
+
+        if (question.responseType === 'multiselect') {
+          for (const val of question.value) {
+            for (const option of question.options) {
+              if (val === option.value && obj.payload.labels.indexOf(option.label) <= 0) {
+                obj.payload.labels.push(option.label);
+              }
+            }
+          }
+        } else if (question.responseType === 'radio') {
+          for (const option of question.options) {
+            if (obj.value === option.value && obj.payload.labels.indexOf(option.label) <= 0) {
+              obj.payload.labels.push(option.label);
+            }
+          }
+        } else {
+          obj.payload.labels.push(question.value);
+        }
+        for (const key of Object.keys(question.payload)) {
+          obj[key] = question.payload[key];
+        }
+        evidence.answers[obj.qid] = obj;
+      }
+    }
+
+    payload.evidence = evidence;
+    return payload;
+  }
+  pullOutPageQuestion() {
+    console.log('Pull Out page Questions');
+    let sections = this.tempevidenceSections;
+    sections.forEach((section, sectionIndex) => {
+      let questionsArray = [];
+      section.questions.forEach((question) => {
+        if (question.responseType === 'pageQuestions') {
+          const parentquestionGpsLocation = question.gpsLocation;
+          question.pageQuestions.forEach((pageQuestion) => {
+            pageQuestion.gpsLocation = parentquestionGpsLocation;
+            questionsArray.push(pageQuestion);
+          });
+        } else {
+          questionsArray.push(question);
+        }
+      });
+      this.tempevidenceSections[sectionIndex].questions = questionsArray;
+    });
+
+    console.log('After Pull Out page Questions');
+
+    return this.tempevidenceSections;
+  }
+
+  constructMatrixObject(question) {
+    const value = [];
+    const currentEvidence = this.currentEvidence;
+
+    for (const instance of question.value) {
+      let eachInstance = {};
+      for (let qst of instance) {
+        const obj1 = {
+          qid: qst._id,
+          value: qst.value,
+          remarks: qst.remarks,
+          fileName: [],
+          gpsLocation: qst.gpsLocation,
+          payload: {
+            question: qst.question,
+            labels: [],
+            responseType: qst.responseType,
+          },
+          startTime: qst.startTime,
+          endTime: qst.endTime,
+        };
+        if (qst.fileName && qst.fileName.length) {
+          const filePaylaod = [];
+          for (const fileName of qst.fileName) {
+            for (const updatedFileDetails of this.imageList) {
+              if (fileName === updatedFileDetails.file) {
+                const fileobj = {
+                  name: fileName,
+                  sourcePath: updatedFileDetails.sourcePath,
+                };
+                filePaylaod.push(fileobj);
+              }
+            }
+          }
+          obj1.fileName = filePaylaod;
+        }
+        if (qst.responseType === 'multiselect') {
+          for (const val of qst.value) {
+            for (const option of qst.options) {
+              if (val === option.value && obj1.payload.labels.indexOf(option.label) <= 0) {
+                obj1.payload.labels.push(option.label);
+              }
+            }
+          }
+        } else if (qst.responseType === 'radio') {
+          for (const option of qst.options) {
+            if (obj1.value === option.value && obj1.payload.labels.indexOf(option.label) <= 0) {
+              obj1.payload.labels.push(option.label);
+            }
+          }
+        } else {
+          obj1.payload.labels.push(qst.value);
+        }
+
+        for (const key of Object.keys(qst.payload)) {
+          obj1[key] = qst.payload[key];
+        }
+        eachInstance[obj1.qid] = obj1;
+      }
+      value.push(eachInstance);
+    }
+
+    return value;
+  }
+}
diff --git a/src/app/manage-learn/imp-suggestions/imp-suggestions-routing.module.ts b/src/app/manage-learn/imp-suggestions/imp-suggestions-routing.module.ts
new file mode 100644
index 000000000..df7247e2d
--- /dev/null
+++ b/src/app/manage-learn/imp-suggestions/imp-suggestions-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { ImpSuggestionsPage } from './imp-suggestions.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ImpSuggestionsPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class ImpSuggestionsPageRoutingModule {}
diff --git a/src/app/manage-learn/imp-suggestions/imp-suggestions.module.ts b/src/app/manage-learn/imp-suggestions/imp-suggestions.module.ts
new file mode 100644
index 000000000..5700906e3
--- /dev/null
+++ b/src/app/manage-learn/imp-suggestions/imp-suggestions.module.ts
@@ -0,0 +1,23 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { ImpSuggestionsPageRoutingModule } from './imp-suggestions-routing.module';
+
+import { ImpSuggestionsPage } from './imp-suggestions.page';
+import { TranslateModule } from '@ngx-translate/core';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    ImpSuggestionsPageRoutingModule,
+    TranslateModule.forChild(),
+
+  ],
+  declarations: [ImpSuggestionsPage]
+})
+export class ImpSuggestionsPageModule {}
diff --git a/src/app/manage-learn/imp-suggestions/imp-suggestions.page.html b/src/app/manage-learn/imp-suggestions/imp-suggestions.page.html
new file mode 100644
index 000000000..06445b081
--- /dev/null
+++ b/src/app/manage-learn/imp-suggestions/imp-suggestions.page.html
@@ -0,0 +1,39 @@
+
+<ion-content>
+  <h3 class="ion-padding-horizontal ion-text-capitalize">{{solutionName}}</h3>
+  <div *ngIf="criterias?.length">
+    <!-- <ion-item-divider color="light">
+      <h4 class="bold" text-wrap>{{criteriaImp.criteriaName}}</h4>
+    </ion-item-divider> -->
+    <div *ngFor="let criteria of criterias;let i=index">
+      <ion-card *ngIf="criteria.criteriaName">
+        <ion-item class="ion-text-wrap">
+          <div class="flex-box" (click)="item=i" style="width: 100%;">
+            <!-- <ion-icon name="play" class="logoIcon"></ion-icon> -->
+            <div style="flex: 1">{{criteria.criteriaName}}</div>
+            <div class="flex-box justify-content-center">
+              <p class="ion-padding-end" style="margin-bottom: 0;">{{criteria.label}}</p>
+              <ion-icon name="caret-down"></ion-icon>
+            </div>
+          </div>
+        </ion-item>
+      </ion-card>
+      <!-- Improvement list in drop-down -->
+      <div style="margin: 0 22px" class="panel" *ngIf="item===i">
+        <ion-item-group>
+          <ion-item-divider>
+            <ion-label *ngIf="criteria.improvementProjects.length">{{'FRMELEMNTS_SUGGESTED_PROJECTS'|translate}}</ion-label>
+            <ion-label *ngIf="!criteria.improvementProjects.length">{{'FRMELEMNTS_NO_SUGGESTIONS'|translate}}</ion-label>
+          </ion-item-divider>
+
+          <ion-item *ngFor="let project of criteria?.improvementProjects">
+            <ion-label (click)="goToTemplateDetails(criteria, project)" class="ion-text-wrap">
+              <p>{{project?.name}}</p>
+              <small>{{project?.goal}}</small>
+            </ion-label>
+          </ion-item>
+        </ion-item-group>
+      </div>
+    </div>
+  </div>
+</ion-content>
diff --git a/src/app/manage-learn/imp-suggestions/imp-suggestions.page.scss b/src/app/manage-learn/imp-suggestions/imp-suggestions.page.scss
new file mode 100644
index 000000000..20be715b3
--- /dev/null
+++ b/src/app/manage-learn/imp-suggestions/imp-suggestions.page.scss
@@ -0,0 +1,8 @@
+.flex-box {
+    display: flex;
+    align-items: center;
+}
+
+.justify-content-center {
+    justify-content: center;
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/imp-suggestions/imp-suggestions.page.ts b/src/app/manage-learn/imp-suggestions/imp-suggestions.page.ts
new file mode 100644
index 000000000..3e98a935c
--- /dev/null
+++ b/src/app/manage-learn/imp-suggestions/imp-suggestions.page.ts
@@ -0,0 +1,63 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { RouterLinks } from '@app/app/app.constant';
+import { AppHeaderService } from '@app/services';
+
+@Component({
+  selector: 'app-imp-suggestions',
+  templateUrl: './imp-suggestions.page.html',
+  styleUrls: ['./imp-suggestions.page.scss'],
+})
+export class ImpSuggestionsPage implements OnInit {
+
+  criterias;
+  solutionName: string;
+  observationId: string;
+  entityId: string;
+  item;
+  solutionId: string;
+  headerConfig = {
+    showHeader: true,
+    showBurgerMenu: false,
+    actionButtons: []
+};
+
+  constructor(private router: Router, private headerService: AppHeaderService) {
+    this.criterias = this.router.getCurrentNavigation().extras.state.data;
+    this.solutionName = this.router.getCurrentNavigation().extras.state.solutionName;
+    this.observationId = this.router.getCurrentNavigation().extras.state.observationId;
+    this.entityId = this.router.getCurrentNavigation().extras.state.entityId;
+    this.solutionId = this.router.getCurrentNavigation().extras.state.solutionId;
+  }
+
+  ngOnInit() {
+  }
+
+  ionViewWillEnter() {
+    this.headerConfig = this.headerService.getDefaultPageConfig();
+    this.headerConfig.actionButtons = [];
+    this.headerConfig.showHeader = true;
+    this.headerConfig.showBurgerMenu = false;
+    this.headerService.updatePageConfig(this.headerConfig);
+}
+
+  goToTemplateDetails(criteria, project) {
+    this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.DETAILS}`], {
+      queryParams: {
+        viewOnlyMode: true,
+        templateId: project.externalId
+      },
+      state: {
+        "referenceFrom": "observation",
+        "submissions": {
+          "observationId": this.observationId,
+          "entityId": this.entityId,
+          "criteriaId": criteria.criteriaId,
+          "score": criteria.level,
+          "solutionId": this.solutionId
+        }
+      },
+    });
+  }
+
+}
diff --git a/src/app/manage-learn/observation/observation-detail/observation-detail.component.html b/src/app/manage-learn/observation/observation-detail/observation-detail.component.html
new file mode 100644
index 000000000..dd0227ab6
--- /dev/null
+++ b/src/app/manage-learn/observation/observation-detail/observation-detail.component.html
@@ -0,0 +1,29 @@
+<ion-content fullscreen>
+  <app-common-header title=" {{ solutionName }}"></app-common-header>
+  <div class="d-flex flex-jc-flex-end grade_ellipsis info">
+    <ion-button
+      size="small"
+      class="button button-small button-solid hydrated ion-activatable ion-focusable m-12 md"
+      (click)="addEntity()"
+      >{{ 'FRMELEMNTS_LBL_ADD_ENTITY' | translate }}</ion-button
+    >
+  </div>
+  <!-- <div *ngFor="let entity of selectedSolution" (click)="goToObservationSubmission(entity)"> -->
+  <div *ngFor="let entity of entities" (click)="entityClickAction(entity)">
+    <app-item-list-card [title]="entity?.name">
+      <ion-icon class="mg-popup-btn-icon" name="arrow-round-forward" arrow *ngIf="entity?.submissionsCount"></ion-icon>
+      <ion-icon
+        class="mg-popup-btn-icon delete-icon"
+        name="trash"
+        arrow
+        *ngIf="!entity?.submissionsCount"
+        (click)="$event.stopPropagation(); removeEntity(entity)"
+      ></ion-icon>
+    </app-item-list-card>
+  </div>
+  <app-no-data *ngIf="!entities?.length" [message]="'FRMELEMNTS_MSG_ADD_ENTITY_TO_OBSERVE'"></app-no-data>
+</ion-content>
+//TODO: Add report button observation report
+<!-- <ion-button class="view-more" expand="block">
+  {{ 'FRMELEMNTS_LBL_VIEW_MORE' | translate }}
+</ion-button> -->
diff --git a/src/app/manage-learn/observation/observation-detail/observation-detail.component.scss b/src/app/manage-learn/observation/observation-detail/observation-detail.component.scss
new file mode 100644
index 000000000..595f7cb45
--- /dev/null
+++ b/src/app/manage-learn/observation/observation-detail/observation-detail.component.scss
@@ -0,0 +1,26 @@
+@import 'src/assets/styles/base/_variables.scss';
+@import 'src/assets/styles/_custom-mixins.scss';
+@import 'src/assets/styles/_variables.scss';
+
+app-observation-detail {
+  
+}
+
+.title {
+  font-size: 16px;
+  font-weight: bold;
+  color: #{$blue};
+}
+
+ion-card-header {
+  padding-bottom: 2px;
+}
+
+.card-container {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  background: #ffffff;
+}
+.delete-icon{
+  font-size: 22px;
+}
diff --git a/src/app/manage-learn/observation/observation-detail/observation-detail.component.ts b/src/app/manage-learn/observation/observation-detail/observation-detail.component.ts
new file mode 100644
index 000000000..a8ab91462
--- /dev/null
+++ b/src/app/manage-learn/observation/observation-detail/observation-detail.component.ts
@@ -0,0 +1,292 @@
+import { Component, OnInit } from '@angular/core';
+import { AppHeaderService } from '@app/services';
+import { AlertController, ModalController, Platform, PopoverController, ToastController } from '@ionic/angular';
+import { RouterLinks } from '@app/app/app.constant';
+import { ActivatedRoute, Router } from '@angular/router';
+import { EntityfilterComponent } from '../../shared/components/entityfilter/entityfilter.component';
+import { LoaderService, LocalStorageService, ToastService, UtilsService } from '../../core';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { AssessmentApiService } from '../../core/services/assessment-api.service';
+import { DhitiApiService } from '../../core/services/dhiti-api.service';
+import { TranslateService } from '@ngx-translate/core';
+import { ObservationService } from '../observation.service';
+import { storageKeys } from '../../storageKeys';
+
+@Component({
+  selector: 'app-observation-detail',
+  templateUrl: './observation-detail.component.html',
+  styleUrls: ['./observation-detail.component.scss'],
+})
+export class ObservationDetailComponent implements OnInit {
+  headerConfig = {
+    showHeader: true,
+    showBurgerMenu: false,
+    actionButtons: [],
+  };
+  observationId: any;
+  solutionId: any;
+  programId: any;
+  submissionCount: any;
+  solutionName: any;
+  entityType: any;
+  entities: any[];
+  solutionData: any;
+  submissionId: unknown;
+  submissionIdArr: any;
+  constructor(
+    private headerService: AppHeaderService,
+    private router: Router,
+    private modalCtrl: ModalController,
+    private routerParam: ActivatedRoute,
+    private utils: UtilsService,
+    private assessmentService: AssessmentApiService,
+    private loader: LoaderService,
+    private dhiti: DhitiApiService,
+    private translate: TranslateService,
+    private alertCntrl: AlertController,
+    private toast: ToastService,
+    private observationService: ObservationService,
+    private localStorage: LocalStorageService
+  ) {
+    this.routerParam.queryParams.subscribe((params) => {
+      this.observationId = params.observationId;
+      this.solutionId = params.solutionId;
+      this.programId = params.programId;
+      this.solutionName = params.solutionName;
+    });
+  }
+
+  ionViewWillEnter() {
+    this.getObservationEntities();
+    this.headerConfig = this.headerService.getDefaultPageConfig();
+    this.headerConfig.actionButtons = [];
+    this.headerConfig.showHeader = true;
+    this.headerConfig.showBurgerMenu = false;
+    this.headerService.updatePageConfig(this.headerConfig);
+  }
+
+  ngOnInit() {
+    this.localStorage
+      .getLocalStorage(storageKeys.observationSubmissionIdArr)
+      .then((ids) => {
+        this.submissionIdArr = ids;
+      })
+      .catch((error) => {
+        this.submissionIdArr = [];
+      });
+  }
+
+  async getObservationEntities() {
+    let payload = await this.utils.getProfileInfo();
+    let url = urlConstants.API_URLS.GET_OBSERVATION_ENTITIES;
+    if (this.observationId) {
+      url = `${url}/${this.observationId}`;
+    }
+    url = url + `?solutionId=${this.solutionId}`;
+    if (payload) {
+      const config = {
+        url: url,
+        payload: payload,
+      };
+      this.loader.startLoader();
+      this.assessmentService.post(config).subscribe(
+        (success) => {
+          this.loader.stopLoader();
+          if (success && success.result && success.result.entities) {
+            this.solutionData = success.result;
+            this.entities = success.result.entities;
+            this.entityType = success.result.entityType;
+            if (!this.observationId) {
+              this.observationId = success.result._id; // for autotargeted if get observationId
+            }
+            //   this.checkForAnySubmissionsMade(); TODO:Implement
+          } else {
+            this.entities = [];
+            if (!this.observationId) {
+              this.observationId = success.result._id; // for autotargeted if get observationId
+            }
+          }
+        },
+        (error) => {
+          this.entities = [];
+          this.loader.stopLoader();
+        }
+      );
+    }
+  }
+
+  async checkForAnySubmissionsMade() {
+    let payload = await this.utils.getProfileInfo();
+    payload.observationId = this.observationId;
+    let url = urlConstants.API_URLS.GET_OBSERVATION_SUBMISSION_COUNT;
+    const config = {
+      url: url,
+      payload: payload,
+    };
+    this.dhiti.post(config).subscribe(
+      (success) => {
+        this.submissionCount = success.data.noOfSubmissions;
+      },
+      (error) => {}
+    );
+  }
+
+  goToObservationSubmission(entity) {
+    // TODO : Changed logic to call 1st submission in the submission page only .
+    this.router.navigate([`/${RouterLinks.OBSERVATION}/${RouterLinks.OBSERVATION_SUBMISSION}`], {
+      queryParams: {
+        programId: this.programId,
+        solutionId: this.solutionId,
+        observationId: this.observationId,
+        entityId: entity._id,
+        entityName: entity.name,
+      },
+    });
+    // TODO:till here
+  }
+
+  async addEntity() {
+    const type = this.entityType;
+    let entityListModal;
+    entityListModal = await this.modalCtrl.create({
+      component: EntityfilterComponent,
+      componentProps: {
+        data: this.observationId,
+        solutionId: this.solutionId,
+      },
+    });
+    await entityListModal.present();
+
+    await entityListModal.onDidDismiss().then(async (entityList) => {
+      if (entityList.data) {
+        let payload = await this.utils.getProfileInfo();
+
+        payload.data = [];
+        entityList.data.forEach((element) => {
+          //if coming from state list page
+          if (type == 'state') {
+            element.selected ? payload.data.push(element._id) : null;
+            return;
+          }
+
+          payload.data.push(element._id); // if coming from EntityListPage
+        });
+
+        const config = {
+          url: urlConstants.API_URLS.OBSERVATION_UPDATE_ENTITES + `${this.observationId}`,
+          payload: payload,
+        };
+        this.assessmentService.post(config).subscribe(
+          (success) => {
+            if (success) {
+              this.getObservationEntities();
+            }
+          },
+          (error) => {}
+        );
+      }
+    });
+  }
+  async removeEntity(entity) {
+    let entityId = entity._id;
+    let translateObject;
+    this.translate
+      .get(['FRMELEMNTS_LBL_CONFIRM', 'FRMELEMNTS_LBL_DELETE_ENTITY', 'FRMELEMNTS_LBL_NO', 'FRMELEMNTS_LBL_YES'])
+      .subscribe((translations) => {
+        translateObject = translations;
+      });
+    let alert = await this.alertCntrl.create({
+      header: translateObject['FRMELEMNTS_LBL_CONFIRM'],
+      message: translateObject['FRMELEMNTS_LBL_DELETE_ENTITY'],
+      buttons: [
+        {
+          text: translateObject['FRMELEMNTS_LBL_NO'],
+          role: 'cancel',
+          handler: () => {},
+        },
+        {
+          text: translateObject['FRMELEMNTS_LBL_YES'],
+          handler: () => {
+            this.deleteEntity(entityId);
+          },
+        },
+      ],
+    });
+    alert.present();
+  }
+
+  async deleteEntity(entityId) {
+    this.loader.startLoader();
+    let payload = await this.utils.getProfileInfo();
+    payload.data = [entityId];
+
+    const config = {
+      url: urlConstants.API_URLS.OBSERVATION_UPDATE_ENTITES + `${this.observationId}`,
+      payload: payload,
+    };
+    this.assessmentService.delete(config).subscribe(
+      (success) => {
+        let okMessage;
+        this.translate.get('FRMELEMNTS_LBL_OK').subscribe((translations) => {
+          okMessage = translations;
+        });
+        this.toast.openToast(success.message);
+
+        this.loader.stopLoader();
+        this.getObservationEntities();
+      },
+      (error) => {
+        this.loader.stopLoader();
+      }
+    );
+  }
+
+  entityClickAction(e): void {
+    if (this.solutionData.allowMultipleAssessemts) {
+      this.goToObservationSubmission(e);
+      return;
+    }
+
+    let presentLocally = this.submissionIdArr.find((id) => id == e.submissionId);
+
+    if (e.submissionId && presentLocally) {
+      this.goToEcm(e.submissionId, e.name);
+      return;
+    }
+
+    if (!e.submissionId || !presentLocally) {
+      let event = {
+        entityId: e._id,
+        observationId: this.solutionData._id,
+        submission: {
+          submissionNumber: 1,
+        },
+      };
+      this.observationService
+        .getAssessmentDetailsForObservation(event)
+        .then((subId) => {
+          this.submissionId = subId;
+          return this.localStorage.getLocalStorage(storageKeys.observationSubmissionIdArr);
+        })
+        .then((ids) => {
+          this.submissionIdArr = ids;
+          let sId = ids.find((id) => id == this.submissionId);
+          if (sId) {
+            this.goToEcm(sId, e.name);
+          }
+        })
+        .catch((error) => {
+          console.log(error);
+        });
+    }
+  }
+
+  goToEcm(submissionId, entityName) {
+    this.router.navigate([RouterLinks.DOMAIN_ECM_LISTING], {
+      queryParams: {
+        submisssionId: submissionId,
+        schoolName: entityName,
+      },
+    });
+  }
+}
diff --git a/src/app/manage-learn/observation/observation-detail/observation-detail.spec.ts b/src/app/manage-learn/observation/observation-detail/observation-detail.spec.ts
new file mode 100644
index 000000000..0a4117543
--- /dev/null
+++ b/src/app/manage-learn/observation/observation-detail/observation-detail.spec.ts
@@ -0,0 +1,348 @@
+import { ActivatedRoute, Router } from '@angular/router';
+import { AlertController, ModalController, Platform } from '@ionic/angular';
+import { AppHeaderService } from '../../../../services';
+import { LoaderService, LocalStorageService, ToastService, UtilsService } from '../../core';
+import { AssessmentApiService } from '../../core/services/assessment-api.service';
+import { ObservationDetailComponent } from './observation-detail.component';
+import { Location } from '@angular/common';
+import { of, throwError } from 'rxjs';
+import { DhitiApiService } from '../../core/services/dhiti-api.service';
+import { LangChangeEvent, TranslateService } from '@ngx-translate/core';
+import { EventEmitter } from '@angular/core';
+import { EntityfilterComponent } from '../../shared/components/entityfilter/entityfilter.component';
+import { ObservationService } from '../observation.service';
+describe('ObservationHomeComponent', () => {
+  let observationDetailComponent: ObservationDetailComponent;
+  const mockLocation: Partial<Location> = {};
+  const mockHeaderService: Partial<AppHeaderService> = {};
+  const mockPlatform: Partial<Platform> = {};
+  const mockUtils: Partial<UtilsService> = {};
+  const mockAssessmentApiService: Partial<AssessmentApiService> = {};
+  const mockObservationService: Partial<ObservationService> = {};
+  const mockDhiti: Partial<DhitiApiService> = {};
+  const mockloader: Partial<LoaderService> = {};
+  const mockModalCtrl: Partial<ModalController> = {};
+  const mockLocalStorage: Partial<LocalStorageService> = {};
+  mockModalCtrl.create = jest.fn(() =>
+    Promise.resolve({
+      present: jest.fn(() => Promise.resolve({})),
+      dismiss: jest.fn(() => Promise.resolve({})),
+    } as any)
+  );
+  const mockAlertCtrl: Partial<AlertController> = {};
+  const mockToast: Partial<ToastService> = {};
+
+  // class MockTranslateService {
+  //   public get onLangChange() {
+  //     return new EventEmitter<LangChangeEvent>();
+  //   }
+  // }
+  const mockTranslate: Partial<TranslateService> = {};
+  // = new MockTranslateService() as any;
+
+  const mockRoute: Partial<ActivatedRoute> = {
+    queryParams: of({}),
+  };
+  const mockRouter: Partial<Router> = {
+    getCurrentNavigation: jest.fn(() => ({
+      extras: {
+        state: {
+          ongoingBatches: [],
+          upcommingBatches: [],
+          course: {},
+          objRollup: {},
+          corRelationList: [],
+          telemetryObject: {
+            id: '',
+            type: '',
+            version: '',
+          },
+        },
+      },
+    })) as any,
+  };
+  beforeAll(() => {
+    observationDetailComponent = new ObservationDetailComponent(
+      mockHeaderService as AppHeaderService,
+      mockRouter as Router,
+      mockModalCtrl as ModalController,
+      mockRoute as ActivatedRoute,
+      mockUtils as UtilsService,
+      mockAssessmentApiService as AssessmentApiService,
+      mockloader as LoaderService,
+      mockDhiti as DhitiApiService,
+      mockTranslate as TranslateService,
+      mockAlertCtrl as AlertController,
+      mockToast as ToastService,
+      mockObservationService as ObservationService,
+      mockLocalStorage as LocalStorageService
+
+    );
+  });
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.resetAllMocks();
+  });
+
+  it('Should instanciate ObservationHomeComponent', () => {
+    expect(observationDetailComponent).toBeTruthy();
+  });
+
+  describe('ionViewWillEnter', () => {
+    it('Should update page config', (done) => {
+      // arrange
+      mockHeaderService.getDefaultPageConfig = jest.fn(() => ({
+        showHeader: true,
+        showBurgerMenu: true,
+        showKebabMenu: false,
+        kebabMenuOptions: [],
+        pageTitle: '',
+        actionButtons: ['search'],
+      }));
+      mockHeaderService.updatePageConfig = jest.fn();
+      mockPlatform.backButton = {
+        subscribeWithPriority: jest.fn((_, cb) => {
+          setTimeout(() => {
+            cb();
+          }, 0);
+          return {
+            unsubscribe: jest.fn(),
+          };
+        }),
+      } as any;
+      mockLocation.back = jest.fn();
+      mockUtils.getProfileInfo = jest.fn(() => Promise.resolve({ data: 'data' }));
+      mockloader.startLoader = jest.fn(() => Promise.resolve());
+      mockloader.stopLoader = jest.fn(() => Promise.resolve());
+      mockAssessmentApiService.post = jest.fn(() =>
+        of({
+          result: {
+            _id: '60110e692d0bbd2f0c3229c3',
+            entities: [
+              {
+                _id: '5fd098e2e049735a86b748b0',
+                externalId: 'D_AP-D005',
+                name: 'WEST GODAVARI',
+                submissionsCount: 4,
+              },
+            ],
+            entityType: 'district',
+          },
+        })
+      );
+
+      // act
+      observationDetailComponent.ionViewWillEnter();
+      // assert
+      setTimeout(() => {
+        expect(mockHeaderService.getDefaultPageConfig).toHaveBeenCalled();
+        expect(mockHeaderService.updatePageConfig).toHaveBeenCalled();
+        expect(observationDetailComponent.solutionData.entities.length).toBe(1);
+
+        done();
+      }, 0);
+    });
+  });
+
+  describe('getObservationEntities', () => {
+    it('if no entities are present then list array should be empty', (done) => {
+      //arrange
+      mockUtils.getProfileInfo = jest.fn(() => Promise.resolve({ data: 'data' }));
+      mockloader.startLoader = jest.fn(() => Promise.resolve());
+      mockloader.stopLoader = jest.fn(() => Promise.resolve());
+      mockAssessmentApiService.post = jest.fn(() =>
+        of({
+          result: {
+            _id: '60110e692d0bbd2f0c3229c3',
+          },
+        })
+      );
+
+      // act
+      observationDetailComponent.getObservationEntities();
+
+      // assert
+      setTimeout(() => {
+        expect(observationDetailComponent.entities.length).toBe(0);
+        done();
+      }, 0);
+    });
+
+    it('list array should be empty if api fails', (done) => {
+      //arrange
+      mockUtils.getProfileInfo = jest.fn(() => Promise.resolve({ data: 'data' }));
+      mockloader.startLoader = jest.fn(() => Promise.resolve());
+      mockloader.stopLoader = jest.fn(() => Promise.resolve());
+      mockAssessmentApiService.post = jest.fn(() => throwError({}));
+
+      // act
+      observationDetailComponent.getObservationEntities();
+
+      // assert
+      setTimeout(() => {
+        expect(observationDetailComponent.entities.length).toBe(0);
+        done();
+      }, 0);
+    });
+  });
+
+  describe('checkForAnySubmissionsMade', () => {
+    it('it should return number of submission done for the observation', (done) => {
+      //arrange
+      mockUtils.getProfileInfo = jest.fn(() => Promise.resolve({ data: 'data' }));
+      mockloader.startLoader = jest.fn(() => Promise.resolve());
+      mockloader.stopLoader = jest.fn(() => Promise.resolve());
+      mockDhiti.post = jest.fn(() =>
+        of({
+          result: true,
+          data: {
+            noOfSubmissions: 1,
+          },
+        })
+      );
+
+      //act
+      observationDetailComponent.checkForAnySubmissionsMade();
+
+      // assert
+      setTimeout(() => {
+        expect(observationDetailComponent.submissionCount).toBe(1);
+        done();
+      }, 0);
+    });
+  });
+
+  describe('observationDetails ', () => {
+    it('navigate to observation entity page', () => {
+      //arrange
+      mockRouter.navigate = jest.fn();
+      observationDetailComponent.programId = '32423HHS65';
+      observationDetailComponent.solutionId = '4213412JKSBA6688';
+      observationDetailComponent.observationId = '2343ADSDF657HJ';
+
+      // act
+      let entity = {
+        _id: '60110e692d0bbd2f0c3229c3',
+        name: 'ABC-SCHOOl',
+      };
+      observationDetailComponent.goToObservationSubmission(entity);
+
+      //assert
+      expect(mockRouter.navigate).toHaveBeenCalledWith(['/observation/observation-submission'], {
+        queryParams: {
+          programId: '32423HHS65',
+          solutionId: '4213412JKSBA6688',
+          observationId: '2343ADSDF657HJ',
+          entityId: '60110e692d0bbd2f0c3229c3',
+          entityName: 'ABC-SCHOOl',
+        },
+      });
+    });
+  });
+
+  describe('addEntity', () => {
+    it('should open the add entity page and add selected entity to list ', (done) => {
+      // arrange
+      const data = {
+        data: [
+          {
+            _id: '5fd098e2e049735a86b748b5',
+            name: 'KADAPA, D_AP-D010',
+            externalId: 'D_AP-D010',
+            selected: true,
+            isSelected: false,
+            preSelected: false,
+          },
+          {
+            _id: '5fd098e2e049735a86b748b6',
+            name: 'KURNOOL, D_AP-D011',
+            externalId: 'D_AP-D011',
+            selected: true,
+            isSelected: false,
+            preSelected: false,
+          },
+        ],
+      };
+      const present = jest.fn();
+      const onDidDismiss = jest.fn().mockReturnValue(Promise.resolve(data));
+      mockModalCtrl.create = jest.fn(() =>
+        Promise.resolve({
+          present,
+          onDidDismiss,
+        })
+      ) as any;
+
+      mockUtils.getProfileInfo = jest.fn(() => Promise.resolve({ data: {} }));
+      mockloader.startLoader = jest.fn(() => Promise.resolve());
+      mockloader.stopLoader = jest.fn(() => Promise.resolve());
+      mockAssessmentApiService.post = jest.fn(() =>
+        of({
+          message: 'Updated successfully.',
+          status: 200,
+        })
+      );
+
+      // act
+      observationDetailComponent.addEntity();
+
+      // assert
+      setTimeout(() => {
+        expect(present).toHaveBeenCalled();
+        expect(onDidDismiss).toHaveBeenCalled();
+        done();
+      }, 0);
+    });
+  });
+
+  describe('removeEntity', () => {
+    it('should show delete alert and delete entity', (done) => {
+      //arrange
+      const dismissFn = jest.fn(() => Promise.resolve(true));
+      const present = jest.fn(() => Promise.resolve());
+
+      mockAlertCtrl.create = jest.fn(() =>
+        Promise.resolve({
+          dismiss: dismissFn,
+          present,
+        })
+      ) as any;
+
+      mockTranslate.get = jest.fn(() => of(''));
+
+      //act
+      observationDetailComponent.removeEntity({ _id: '3214edsac' });
+
+      //assert
+      setTimeout(() => {
+        expect(present).toHaveBeenCalled();
+        done();
+      }, 0);
+    });
+
+    it('should call delete entity api', (done) => {
+      //arrange
+      mockUtils.getProfileInfo = jest.fn(() => Promise.resolve({ data: 'data' }));
+      mockloader.startLoader = jest.fn(() => Promise.resolve());
+      mockloader.stopLoader = jest.fn(() => Promise.resolve());
+      mockTranslate.get = jest.fn(() => of(''));
+      mockToast.openToast =jest.fn(()=>Promise.resolve())
+      mockAssessmentApiService.post = jest.fn(() =>
+        of({
+          result: {
+            _id: '60110e692d0bbd2f0c3229c3',
+          },
+        })
+      );
+      //TODO:need fix
+      //act
+      // observationDetailComponent.deleteEntity('123');
+      //assert
+      setTimeout(() => {
+        // expect(mockAssessmentApiService.post).toHaveBeenCalled();
+        // expect(mockToast.openToast).toHaveBeenCalled();
+        
+        done()
+      }, 200);
+    });
+  });
+});
diff --git a/src/app/manage-learn/observation/observation-home/observation-home.component.html b/src/app/manage-learn/observation/observation-home/observation-home.component.html
new file mode 100644
index 000000000..ef53f1ec2
--- /dev/null
+++ b/src/app/manage-learn/observation/observation-home/observation-home.component.html
@@ -0,0 +1,27 @@
+  <ion-content>
+    <app-common-header
+      title="{{ 'FRMELEMNTS_LBL_OBSERVATION' | translate }}"
+      subTitle="{{ 'FRMELEMNTS_LBL_OBSERVATION_DESC' | translate }}"
+    ></app-common-header>
+    <ion-searchbar search-icon="search"  debounce="2000" placeholder="Search your observations here" [(ngModel)]="searchText"
+    (ionChange)="onSearch($event)" clear-icon="close-sharp">
+  </ion-searchbar>
+    <div *ngFor="let solution of solutionList; let solutionIndex = index">
+      <app-item-list-card
+        [title]="solution?.name"
+        [subTitle]="solution?.programName"
+        (cardSelect)="observationDetails(solution)"
+      >
+        <ion-icon class="mg-popup-btn-icon" name="arrow-forward" arrow></ion-icon>
+      </app-item-list-card>
+    </div>
+    <app-no-data *ngIf="!solutionList?.length"></app-no-data>
+  </ion-content>
+  <ion-button
+    class="view-more"
+    expand="block"
+    (click)="loadMore()"
+    *ngIf="solutionList?.length && count > solutionList?.length"
+  >
+    {{ 'VIEW_MORE' | translate }}
+  </ion-button>
diff --git a/src/app/manage-learn/observation/observation-home/observation-home.component.scss b/src/app/manage-learn/observation/observation-home/observation-home.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/observation/observation-home/observation-home.component.ts b/src/app/manage-learn/observation/observation-home/observation-home.component.ts
new file mode 100644
index 000000000..36d535b64
--- /dev/null
+++ b/src/app/manage-learn/observation/observation-home/observation-home.component.ts
@@ -0,0 +1,98 @@
+import { Component, OnInit } from '@angular/core';
+import { RouterLinks } from '@app/app/app.constant';
+import { AppHeaderService } from '@app/services';
+import { Router } from '@angular/router';
+import { LoaderService, UtilsService } from '../../core';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { KendraApiService } from '../../core/services/kendra-api.service';
+
+@Component({
+  selector: 'app-observation-home',
+  templateUrl: './observation-home.component.html',
+  styleUrls: ['./observation-home.component.scss'],
+})
+export class ObservationHomeComponent implements OnInit {
+  headerConfig = {
+    showHeader: true,
+    showBurgerMenu: false,
+    actionButtons: [],
+  };
+  solutionList: any;
+  page = 1;
+  limit = 10;
+  count: any;
+  searchText: string = '';
+
+  constructor(
+    private headerService: AppHeaderService,
+    private router: Router,
+    private utils: UtilsService,
+    private kendra: KendraApiService,
+    private loader: LoaderService
+  ) {}
+
+  ngOnInit() {
+    this.solutionList = [];
+    this.getPrograms();
+  }
+  async getPrograms() {
+    let payload = await this.utils.getProfileInfo();
+    if (payload) {
+      this.loader.startLoader();
+      const config = {
+        url:
+          urlConstants.API_URLS.GET_TARGETED_SOLUTIONS +
+          `?type=observation&page=${this.page}&limit=${this.limit}&search=${this.searchText}`,
+        payload: payload,
+      };
+      this.kendra.post(config).subscribe(
+        (success) => {
+          this.loader.stopLoader();
+          console.log(success);
+          if (success && success.result && success.result.data) {
+            this.count = success.result.count;
+
+            this.solutionList = [...this.solutionList, ...success.result.data];
+          }
+        },
+        (error) => {
+          this.solutionList = [];
+          this.loader.stopLoader();
+        }
+      );
+    }
+  }
+
+  ionViewWillEnter() {
+    this.headerConfig = this.headerService.getDefaultPageConfig();
+    this.headerConfig.actionButtons = [];
+    this.headerConfig.showHeader = true;
+    this.headerConfig.showBurgerMenu = false;
+    this.headerService.updatePageConfig(this.headerConfig);
+  }
+
+  observationDetails(solution) {
+    let { programId, solutionId, _id: observationId, name: solutionName } = solution;
+    this.router.navigate([`/${RouterLinks.OBSERVATION}/${RouterLinks.OBSERVATION_DETAILS}`], {
+      queryParams: {
+        programId: programId,
+        solutionId: solutionId,
+        observationId: observationId,
+        solutionName: solutionName,
+      },
+    });
+  }
+  loadMore() {
+    this.page = this.page + 1;
+    this.getPrograms();
+  }
+  onSearch(e) {
+    this.page=1
+    this.solutionList = [];
+    this.getPrograms();
+  }
+
+  ionViewWillLeave() {
+    this.utils.closeProfileAlert();
+  }
+}
diff --git a/src/app/manage-learn/observation/observation-home/observation-home.spec.ts b/src/app/manage-learn/observation/observation-home/observation-home.spec.ts
new file mode 100644
index 000000000..956ab07db
--- /dev/null
+++ b/src/app/manage-learn/observation/observation-home/observation-home.spec.ts
@@ -0,0 +1,206 @@
+import { Router } from '@angular/router';
+import { Platform } from '@ionic/angular';
+import { AppHeaderService } from '../../../../services';
+import { LoaderService, UtilsService } from '../../core';
+import { Location } from '@angular/common';
+import { ObservationHomeComponent } from './observation-home.component';
+import { of, throwError } from 'rxjs';
+import { KendraApiService } from '../../core/services/kendra-api.service';
+describe('ObservationHomeComponent', () => {
+  let observationHomeComponent: ObservationHomeComponent;
+  const mockLocation: Partial<Location> = {};
+  const mockHeaderService: Partial<AppHeaderService> = {};
+  const mockPlatform: Partial<Platform> = {};
+  const mockUtils: Partial<UtilsService> = {};
+  const mockKendraService: Partial<KendraApiService> = {};
+  const mockloader: Partial<LoaderService> = {};
+  const mockRouter: Partial<Router> = {
+    getCurrentNavigation: jest.fn(() => ({
+      extras: {
+        state: {
+          ongoingBatches: [],
+          upcommingBatches: [],
+          course: {},
+          objRollup: {},
+          corRelationList: [],
+          telemetryObject: {
+            id: '',
+            type: '',
+            version: '',
+          },
+        },
+      },
+    })) as any,
+  };
+  beforeAll(() => {
+    observationHomeComponent = new ObservationHomeComponent(
+      mockHeaderService as AppHeaderService,
+      mockRouter as Router,
+      mockUtils as UtilsService,
+      mockKendraService as KendraApiService,
+      mockloader as LoaderService
+    );
+  });
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.resetAllMocks();
+  });
+
+  it('Should instanciate ObservationHomeComponent', () => {
+    expect(observationHomeComponent).toBeTruthy();
+  });
+
+  describe('ngOnInit', () => {
+    it('should return observationList/programsList by invoked ngOnIt', (done) => {
+      // arrange
+      mockUtils.getProfileInfo = jest.fn(() => Promise.resolve({ data: 'data' }));
+      mockKendraService.post = jest.fn(() =>
+        of({
+          result: {
+            data: [
+              {
+                _id: '60110e692d0bbd2f0c3229c3',
+                name: 'AP-TEST-PROGRAM-3.6.5-OBS-1-DEO',
+                description: 'AP-TEST-PROGRAM-3.6.5-OBS-1-DEO',
+                programId: '600ab53cc7de076e6f993724',
+                solutionId: '600ac0d1c7de076e6f9943b9',
+                programName: 'AP-TEST-PROGRAM-3.6.5',
+              },
+            ],
+          },
+        })
+      );
+      mockloader.startLoader = jest.fn(() => Promise.resolve());
+      mockloader.stopLoader = jest.fn(() => Promise.resolve());
+
+      // act
+      observationHomeComponent.ngOnInit();
+      // assert
+      setTimeout(() => {
+        expect(mockUtils.getProfileInfo).toHaveBeenCalled();
+        expect(mockKendraService.post).toHaveBeenCalled();
+        expect(observationHomeComponent.solutionList.length).toBe(1);
+        done();
+      }, 0);
+    });
+    it('should show no data if data is not present', (done) => {
+      // arrange
+      mockUtils.getProfileInfo = jest.fn(() => Promise.resolve({ data: 'data' }));
+      mockKendraService.post = jest.fn(() =>
+        of({
+          result: {},
+        })
+      );
+      mockloader.startLoader = jest.fn(() => Promise.resolve());
+      mockloader.stopLoader = jest.fn(() => Promise.resolve());
+
+      // act
+      observationHomeComponent.ngOnInit();
+      // assert
+      setTimeout(() => {
+        expect(mockUtils.getProfileInfo).toHaveBeenCalled();
+        expect(mockKendraService.post).toHaveBeenCalled();
+        expect(observationHomeComponent.solutionList.length).toBe(0);
+        done();
+      }, 0);
+    });
+
+    it('show no data message if no api response', (done) => {
+      // arrange
+      mockUtils.getProfileInfo = jest.fn(() => Promise.resolve({ data: 'data' }));
+      mockKendraService.post = jest.fn(() => throwError({}));
+      mockloader.startLoader = jest.fn(() => Promise.resolve());
+      mockloader.stopLoader = jest.fn(() => Promise.resolve());
+
+      // act
+      observationHomeComponent.ngOnInit();
+      // assert
+      setTimeout(() => {
+        expect(mockUtils.getProfileInfo).toHaveBeenCalled();
+        expect(mockKendraService.post).toHaveBeenCalled();
+        expect(observationHomeComponent.solutionList.length).toBe(0);
+        done();
+      }, 0);
+    });
+  });
+
+  describe('observationDetails ', () => {
+    it('navigate to observation entity page', () => {
+      //arrange
+      mockRouter.navigate = jest.fn();
+
+      // act
+      observationHomeComponent.observationDetails({
+        _id: '60110e692d0bbd2f0c3229c3',
+        name: 'AP-TEST-PROGRAM-3.6.5-OBS-1-DEO',
+        description: 'AP-TEST-PROGRAM-3.6.5-OBS-1-DEO',
+        programId: '600ab53cc7de076e6f993724',
+        solutionId: '600ac0d1c7de076e6f9943b9',
+        programName: 'AP-TEST-PROGRAM-3.6.5',
+      });
+
+      //assert
+      expect(mockRouter.navigate).toHaveBeenCalledWith(['/observation/observation-details'], {
+        queryParams: {
+          programId: '600ab53cc7de076e6f993724',
+          solutionId: '600ac0d1c7de076e6f9943b9',
+          observationId: '60110e692d0bbd2f0c3229c3',
+          solutionName: 'AP-TEST-PROGRAM-3.6.5-OBS-1-DEO',
+        },
+      });
+    });
+  });
+
+  describe('ionViewWillEnter', () => {
+    it('Should update page config', (done) => {
+      // arrange
+      mockHeaderService.getDefaultPageConfig = jest.fn(() => ({
+        showHeader: true,
+        showBurgerMenu: true,
+        showKebabMenu: false,
+        kebabMenuOptions: [],
+        pageTitle: '',
+        actionButtons: ['search'],
+      }));
+      mockHeaderService.updatePageConfig = jest.fn();
+      mockPlatform.backButton = {
+        subscribeWithPriority: jest.fn((_, cb) => {
+          setTimeout(() => {
+            cb();
+          }, 0);
+          return {
+            unsubscribe: jest.fn(),
+          };
+        }),
+      } as any;
+      mockLocation.back = jest.fn();
+
+      // act
+      observationHomeComponent.ionViewWillEnter();
+      // assert
+      setTimeout(() => {
+        expect(mockHeaderService.getDefaultPageConfig).toHaveBeenCalled();
+        expect(mockHeaderService.updatePageConfig).toHaveBeenCalled();
+        // expect(mockPlatform.backButton).not.toBeUndefined();
+        // expect(mockLocation.back).toHaveBeenCalled();
+        done();
+      }, 0);
+    });
+  });
+  describe('load more', () => {
+    it('it should load more data ', (done) => {
+      // arrange
+      observationHomeComponent.page = 1;
+
+      // act
+      observationHomeComponent.loadMore();
+
+      //assert
+      setTimeout(() => {
+        // expect(mockAssessmentApiService.post).toHaveBeenCalled();
+        expect(observationHomeComponent.page).toBe(2);
+        done();
+      }, 0);
+    });
+  });
+});
diff --git a/src/app/manage-learn/observation/observation-routing.module.ts b/src/app/manage-learn/observation/observation-routing.module.ts
new file mode 100644
index 000000000..f5fa1b1de
--- /dev/null
+++ b/src/app/manage-learn/observation/observation-routing.module.ts
@@ -0,0 +1,28 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { RouterLinks } from '@app/app/app.constant';
+import { ObservationDetailComponent } from './observation-detail/observation-detail.component';
+import { ObservationHomeComponent } from './observation-home/observation-home.component';
+import { ObservationSubmissionComponent } from './observation-submission/observation-submission.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ObservationHomeComponent,
+  },
+  {
+    path: RouterLinks.OBSERVATION_DETAILS,
+    component: ObservationDetailComponent,
+  },
+  {
+    path: RouterLinks.OBSERVATION_SUBMISSION,
+    component: ObservationSubmissionComponent,
+  },
+ 
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class ObservationRoutingModule {}
diff --git a/src/app/manage-learn/observation/observation-submission/observation-submission.component.html b/src/app/manage-learn/observation/observation-submission/observation-submission.component.html
new file mode 100644
index 000000000..468f276cd
--- /dev/null
+++ b/src/app/manage-learn/observation/observation-submission/observation-submission.component.html
@@ -0,0 +1,79 @@
+<ion-content fullscreen>
+  <ion-card class="card-box-shadow">
+    <ion-card-content class="card-content-bottom-0 card-content-top-0">
+      <ion-segment class="d-flex" [(ngModel)]="currentTab" (ionChange)="tabChange($event.detail.value)">
+        <ion-segment-button value="all" class="flex-5">
+          <ion-label class="font-12 text-transform-none title">{{ 'ALL' | translate }}</ion-label>
+        </ion-segment-button>
+        <div class="hr-div">
+          <hr class="hr-height" />
+        </div>
+        <ion-segment-button value="inProgress" class="flex-5">
+          <ion-label class="font-12 text-transform-none title">{{
+            'FRMELEMNTS_LBL_IN_PROGRESS' | translate
+          }}</ion-label>
+        </ion-segment-button>
+        <div class="hr-div">
+          <hr class="hr-height" />
+        </div>
+        <ion-segment-button value="completed" class="flex-5">
+          <ion-label class="font-12 text-transform-none title">{{ 'COMPLETED' | translate }}</ion-label>
+        </ion-segment-button>
+      </ion-segment>
+    </ion-card-content>
+  </ion-card>
+
+  <div
+    *ngFor="let submission of submissions"
+    (click)="submission?.downloaded === true ? goToEcm(submission) : getAssessmentDetails(submission)"
+  >
+    <app-item-list-card [title]="submission?.title" subTitle="{{ submission?.createdAt | date }}">
+      <ion-icon
+        class="mg-popup-btn-icon"
+        name="ellipsis-vertical-outline"
+        arrow
+        *ngIf="submission.status !== 'completed' && submission?.status !== 'ratingPending'"
+        (click)="$event.stopPropagation(); openActionMenu($event, submission, i)"
+      ></ion-icon>
+      <ion-button
+        report
+        round
+        *ngIf="submission?.status === 'completed' || submission?.status === 'ratingPending'"
+        (click)="$event.stopPropagation(); openMenu($event, submission, i)"
+      >
+        {{ 'FRMELEMNTS_LBL_REPORTS' | translate }}
+      </ion-button>
+      <ion-icon
+        padding-left
+        info
+        name="information-circle"
+        *ngIf="submission?.status === 'completed' || submission?.status === 'ratingPending'"
+        (click)="$event.stopPropagation(); openInfo(submission)"
+      ></ion-icon>
+    </app-item-list-card>
+  </div>
+  <app-no-data *ngIf="!submissions?.length"></app-no-data>
+</ion-content>
+
+<ion-footer no-shadow *ngIf="!disableObserveAgain">
+  <ion-toolbar position="bottom">
+    <ion-row>
+      <ion-col>
+        <ion-button ion-button full (click)="observeAgain()" class="footerButton w-100">
+          {{ 'FRMELEMNTS_LBL_OBSERVE_AGAIN' | translate }}
+        </ion-button>
+      </ion-col>
+      <ion-col>
+        <ion-button
+          ion-button
+          full
+          (click)="entityActions($event)"
+          class="footerButton w-100"
+          [disabled]="!submissions?.length"
+        >
+          {{ 'FRMELEMNTS_LBL_VIEW_ENTITY_REPORT' | translate }}
+        </ion-button>
+      </ion-col>
+    </ion-row>
+  </ion-toolbar>
+</ion-footer>
diff --git a/src/app/manage-learn/observation/observation-submission/observation-submission.component.scss b/src/app/manage-learn/observation/observation-submission/observation-submission.component.scss
new file mode 100644
index 000000000..335e44b4c
--- /dev/null
+++ b/src/app/manage-learn/observation/observation-submission/observation-submission.component.scss
@@ -0,0 +1,29 @@
+@import "src/assets/styles/_custom-mixins";
+@import "src/assets/styles/variables";
+@import "src/assets/styles/_variables.scss";
+:host {
+  .card-content-bottom-0 {
+    padding-bottom: 0px !important;
+  }
+
+  .card-content-top-0 {
+    padding-top: 0px !important;
+  }
+
+  .font-12 {
+    font-size: 12px !important;
+  }
+  .text-transform-none {
+    text-transform: none !important;
+  }
+}
+
+.card-box-shadow {
+  box-shadow: 0px 5px 5px 3px map-get($colors, light_gray_dd);
+}
+
+.title {
+  font-size: 16px;
+  font-weight: bold;
+  color: #{$blue};
+}
diff --git a/src/app/manage-learn/observation/observation-submission/observation-submission.component.ts b/src/app/manage-learn/observation/observation-submission/observation-submission.component.ts
new file mode 100644
index 000000000..c6d2d3fab
--- /dev/null
+++ b/src/app/manage-learn/observation/observation-submission/observation-submission.component.ts
@@ -0,0 +1,497 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { AppHeaderService } from '@app/services';
+import { AlertController, ModalController, PopoverController } from '@ionic/angular';
+import { ObservationService } from '../observation.service';
+import { RouterLinks } from '@app/app/app.constant';
+import { LoaderService, LocalStorageService, UtilsService } from '../../core';
+import { storageKeys } from '../../storageKeys';
+import { EvidenceService } from '../../core/services/evidence.service';
+import { ScroreReportMenusComponent } from '../../shared/components/scrore-report-menus/scrore-report-menus.component';
+import { SubmissionActionsComponent } from '../../shared/components/submission-actions/submission-actions.component';
+import { TranslateService } from '@ngx-translate/core';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { AssessmentApiService } from '../../core/services/assessment-api.service';
+import { ViewDetailComponent } from '../../shared/components/view-detail/view-detail.component';
+
+@Component({
+  selector: 'app-observation-submission',
+  templateUrl: './observation-submission.component.html',
+  styleUrls: ['./observation-submission.component.scss'],
+})
+export class ObservationSubmissionComponent implements OnInit {
+  headerConfig = {
+    showHeader: true,
+    showBurgerMenu: false,
+    actionButtons: [],
+  };
+  submissionList: any;
+  inProgressObservations = [];
+  completedObservations = [];
+  submissions: any[];
+  currentTab = 'all';
+  showEntityActionsheet: boolean;
+  showActionsheet: boolean;
+  submissionIdArr: any;
+  observationId: any;
+  solutionId: any;
+  programId: any;
+  entityId: any;
+  entityName: any;
+  disableObserveAgain: boolean = false;
+
+  constructor(
+    private headerService: AppHeaderService,
+    private observationService: ObservationService,
+    private router: Router,
+    private localStorage: LocalStorageService,
+    private utils: UtilsService,
+    private evdnsServ: EvidenceService,
+    private popoverCtrl: PopoverController,
+    private loader: LoaderService,
+    private translate: TranslateService,
+    private alertCntrl: AlertController,
+    private routerParam: ActivatedRoute,
+    private assessmentService: AssessmentApiService,
+    private modalCtrl: ModalController
+  ) {
+    this.routerParam.queryParams.subscribe((params) => {
+      this.observationId = params.observationId;
+      this.solutionId = params.solutionId;
+      this.programId = params.programId;
+      this.entityId = params.entityId;
+      this.entityName = params.entityName;
+      this.disableObserveAgain = params.disableObserveAgain;
+    });
+  }
+
+  ngOnInit() {
+    this.getProgramFromStorage();
+  }
+
+  ionViewWillEnter() {
+    this.headerConfig = this.headerService.getDefaultPageConfig();
+    this.headerConfig.actionButtons = [];
+    this.headerConfig.showHeader = true;
+    this.headerConfig.showBurgerMenu = false;
+    this.headerService.updatePageConfig(this.headerConfig);
+    this.getProgramFromStorage();
+  }
+
+  async getProgramFromStorage(isDeleted = false) {
+    let payload = await this.utils.getProfileInfo();
+    const config = {
+      url: urlConstants.API_URLS.GET_OBSERVATION_SUBMISSIONS + `${this.observationId}?entityId=${this.entityId}`,
+      payload: payload,
+    };
+    this.loader.startLoader();
+    this.assessmentService.post(config).subscribe(
+      (success) => {
+        if (success.result && success.result.length == 0) {
+          if (isDeleted) {
+            this.loader.stopLoader();
+            history.go(-1);
+            return;
+          }
+          let event = {
+            entityId: this.entityId,
+            observationId: this.observationId,
+            submission: {
+              submissionNumber: 1,
+            },
+          };
+          this.observationService.getAssessmentDetailsForObservation(event).then(
+            (res) => {
+              this.loader.stopLoader();
+
+              this.getProgramFromStorage();
+            },
+            (err) => {
+              this.loader.stopLoader();
+            }
+          );
+        }
+        this.localStorage
+          .getLocalStorage(storageKeys.observationSubmissionIdArr)
+          .then((ids) => {
+            this.submissionIdArr = ids;
+          })
+          .catch((err) => {
+            this.submissionIdArr = [];
+          })
+          .finally(() => {
+            this.loader.stopLoader();
+            this.submissionList = success.result;
+            this.applyDownloadedflag();
+
+            this.splitCompletedAndInprogressObservations();
+
+            this.tabChange(this.currentTab ? this.currentTab : 'all');
+          });
+      },
+      (error) => {
+        console.log(error);
+      }
+    );
+  }
+
+  applyDownloadedflag() {
+    this.submissionList.map((s) => {
+      this.submissionIdArr.includes(s._id) ? (s.downloaded = true) : null;
+    });
+  }
+  splitCompletedAndInprogressObservations() {
+    this.completedObservations = [];
+    this.inProgressObservations = [];
+    for (const submission of this.submissionList) {
+      submission.status === 'completed'
+        ? this.completedObservations.push(submission)
+        : this.inProgressObservations.push(submission);
+    }
+  }
+
+  tabChange(value) {
+    // this.height = 100;
+    this.submissions = [];
+    this.currentTab = value;
+    switch (value) {
+      case 'inProgress':
+        this.submissions = this.inProgressObservations;
+
+        break;
+      case 'completed':
+        this.submissions = this.completedObservations;
+        break;
+      case 'all':
+        this.submissions = this.submissions.concat(this.inProgressObservations, this.completedObservations);
+        break;
+      default:
+        this.submissions = this.submissions.concat(this.inProgressObservations, this.completedObservations);
+        console.log(this.submissions);
+    }
+  }
+  getAssessmentDetails(submission) {
+    this.showActionsheet = false;
+    this.showEntityActionsheet = false;
+
+    this.localStorage
+      .getLocalStorage(this.utils.getAssessmentLocalStorageKey(submission._id))
+      .then((data) => {
+        if (!data) {
+          this.getAssessmentDetailsApi(submission);
+        } else {
+          this.goToEcm(submission);
+        }
+      })
+      .catch((error) => {
+        this.getAssessmentDetailsApi(submission);
+      });
+  }
+
+  getAssessmentDetailsApi(submission) {
+    let event = {
+      submission: submission,
+      entityId: this.entityId,
+      observationId: this.observationId,
+    };
+    this.observationService
+      .getAssessmentDetailsForObservation(event)
+      .then(async (programList) => {
+        await this.getProgramFromStorage();
+        this.goToEcm(submission);
+      })
+      .catch((error) => {});
+  }
+
+  goToEcm(submission) {
+    // TODO: Remove
+    let submissionId = submission._id;
+    let heading = this.entityName;
+
+    this.localStorage
+      .getLocalStorage(this.utils.getAssessmentLocalStorageKey(submissionId))
+      .then((successData) => {
+        if (
+          successData.assessment.evidences.length > 1 ||
+          successData.assessment.evidences[0].sections.length > 1 ||
+          (submission.criteriaLevelReport && submission.isRubricDriven)
+        ) {
+          this.router.navigate([RouterLinks.DOMAIN_ECM_LISTING], {
+            queryParams: {
+              submisssionId: submissionId,
+              schoolName: heading,
+            },
+          });
+        } else {
+          if (successData.assessment.evidences[0].startTime) {
+            this.utils.setCurrentimageFolderName(successData.assessment.evidences[0].externalId, submissionId);
+
+            this.router.navigate([RouterLinks.QUESTIONNAIRE], {
+              queryParams: {
+                submisssionId: submissionId,
+                evidenceIndex: 0,
+                sectionIndex: 0,
+                schoolName: this.entityName,
+              },
+            });
+          } else {
+            const assessment = { _id: submissionId, name: heading };
+            this.openAction(assessment, successData, 0);
+          }
+        }
+      })
+      .catch((error) => {});
+  }
+  async openAction(assessment, aseessmemtData, evidenceIndex) {
+    this.utils.setCurrentimageFolderName(aseessmemtData.assessment.evidences[evidenceIndex].externalId, assessment._id);
+    const options = {
+      _id: assessment._id,
+      name: assessment.name,
+      selectedEvidence: evidenceIndex,
+      entityDetails: aseessmemtData,
+      // recentlyUpdatedEntity: this.recentlyUpdatedEntity, //TODO
+    };
+    console.log(JSON.stringify(options));
+    let action = await this.evdnsServ.openActionSheet(options, 'FRMELEMNTS_LBL_OBSERVATION');
+    if (action) {
+      this.router.navigate([RouterLinks.QUESTIONNAIRE], {
+        queryParams: {
+          submisssionId: assessment._id,
+          evidenceIndex: 0,
+          sectionIndex: 0,
+          schoolName: this.entityName,
+        },
+      });
+    }
+  }
+  async openMenu(event, submission, index) {
+    // if (submission.scoringSystem != 'pointsBasedScoring' && submission.isRubricDriven) {
+    if (submission.criteriaLevelReport && submission.isRubricDriven) {
+      this.router.navigate([RouterLinks.GENERIC_REPORT], {
+        state: {
+          scores: true,
+          observation: true,
+          entityId: submission.entityId,
+          entityType: submission.entityType,
+          observationId: submission.observationId,
+          submissionId: submission._id,
+        },
+      });
+      return;
+    }
+    if (submission.ratingCompletedAt) {
+      /* no need to show menu now directly show the score report */
+      this.router.navigate([RouterLinks.GENERIC_REPORT], {
+        state: {
+          scores: true,
+          observation: true,
+          criteriaWise: false,
+          submissionId: submission._id,
+          entityType: submission.entityType,
+          filter: { questionId: [] },
+        },
+      });
+    } else {
+      this.router.navigate([RouterLinks.GENERIC_REPORT], {
+        state: {
+          scores: false,
+          observation: true,
+          criteriaWise: false,
+          submissionId: submission._id,
+          entityType: submission.entityType,
+          filter: { questionId: [] },
+        },
+      });
+    }
+  }
+  //  entity actions
+  entityActions(e) {
+    let submission = this.submissions[0];
+    // if (submission.scoringSystem != 'pointsBasedScoring' && submission.isRubricDriven) {
+    if (submission.criteriaLevelReport && submission.isRubricDriven) {
+      this.router.navigate([RouterLinks.GENERIC_REPORT], {
+        state: {
+          scores: true,
+          observation: true,
+          entityId: submission.entityId,
+          entityType: submission.entityType,
+          observationId: submission.observationId,
+        },
+      });
+      return;
+    }
+    let noScore: boolean = true;
+    this.submissions.forEach((submission) => {
+      submission.showActionsheet = false;
+      if (submission.ratingCompletedAt) {
+        noScore = false;
+      }
+    });
+    if (noScore) {
+      this.viewEntityReports();
+    } else {
+      this.openEntityReportMenu(e);
+    }
+  }
+
+  // Menu for Entity reports
+  async openEntityReportMenu(event) {
+    let submission = this.submissions[0];
+    /* no need to show menu now directly show the score report */
+    this.router.navigate([RouterLinks.GENERIC_REPORT], {
+      state: {
+        scores: true,
+        observation: true,
+        criteriaWise: false,
+        entityId: submission.entityId,
+        entityType: submission.entityType,
+        observationId: submission.observationId,
+        filter: { questionId: [] },
+      },
+    });
+  }
+
+  viewEntityReports() {
+    let submission = this.submissions[0];
+    this.showEntityActionsheet = false;
+    this.showActionsheet = false;
+
+    this.router.navigate([RouterLinks.GENERIC_REPORT], {
+      state: {
+        scores: false,
+        observation: true,
+        criteriaWise: false,
+        entityId: submission.entityId,
+        entityType: submission.entityType,
+        observationId: submission.observationId,
+        filter: { questionId: [] },
+      },
+    });
+  }
+  // Actions on submissions
+  async openActionMenu(event, submission, index) {
+    submission.entityName = this.entityName;
+    let popover = await this.popoverCtrl.create({
+      component: SubmissionActionsComponent,
+      componentProps: {
+        submission: submission,
+      },
+      event: event,
+    });
+    popover.onDidDismiss().then((data: any) => {
+      if (data.data && data.data.action === 'update') {
+        const payload = {
+          submissionId: submission._id,
+          title: data.data.name,
+        };
+        this.ediSubmissionName(payload, index);
+      } else if (data.data && data.data.action === 'delete') {
+        this.deleteSubmission(submission._id);
+      }
+    });
+    await popover.present();
+  }
+  async deleteSubmission(submissionId) {
+    let translateObject;
+    this.translate
+      .get(['FRMELEMNTS_LBL_CONFIRM', 'FRMELEMNTS_MSG_DELETE_SUBMISSION', 'FRMELEMNTS_LBL_YES', 'FRMELEMNTS_LBL_NO'])
+      .subscribe((translations) => {
+        translateObject = translations;
+      });
+    let alert = await this.alertCntrl.create({
+      header: translateObject['FRMELEMNTS_LBL_CONFIRM'],
+      message: translateObject['FRMELEMNTS_MSG_DELETE_SUBMISSION'],
+      buttons: [
+        {
+          text: translateObject['FRMELEMNTS_LBL_NO'],
+          role: 'cancel',
+          handler: () => {},
+        },
+        {
+          text: translateObject['FRMELEMNTS_LBL_YES'],
+          handler: async () => {
+            let payload = await this.utils.getProfileInfo();
+
+            const config = {
+              url: urlConstants.API_URLS.OBSERVATION_SUBMISSION_UPDATE + `${submissionId}`,
+              payload: payload,
+            };
+            this.loader.startLoader();
+
+            this.assessmentService.delete(config).subscribe(
+              (success) => {
+                this.loader.stopLoader();
+
+                if (success && success.status == 200) {
+                  this.getProgramFromStorage(true);
+                }
+              },
+              (error) => {
+                this.loader.stopLoader();
+              }
+            );
+          },
+        },
+      ],
+    });
+    alert.present();
+  }
+
+  async ediSubmissionName(data, i) {
+    let payload = await this.utils.getProfileInfo();
+    payload.title = data.title;
+
+    const config = {
+      url: urlConstants.API_URLS.OBSERVATION_SUBMISSION_UPDATE + `${data.submissionId}`,
+      payload: payload,
+    };
+    this.assessmentService.post(config).subscribe(
+      (success) => {
+        console.log(success);
+        if (success && success.status == 200) {
+          this.getProgramFromStorage();
+        }
+      },
+      (error) => {}
+    );
+  }
+
+  async observeAgain() {
+    this.loader.startLoader('Creating an Observation');
+
+    const entityId = this.entityId;
+    const observationId = this.observationId;
+
+    let payload = await this.utils.getProfileInfo();
+
+    const config = {
+      url: urlConstants.API_URLS.OBSERVATION_SUBMISSION_CREATE + `${observationId}?entityId=${entityId}`,
+      payload: payload,
+    };
+    this.assessmentService.post(config).subscribe(
+      (success) => {
+        this.loader.stopLoader();
+
+        console.log(success);
+        if (success && success.status == 200) {
+          this.getProgramFromStorage();
+        }
+      },
+      (error) => {
+        this.loader.stopLoader();
+      }
+    );
+  }
+
+  //open info menu
+  async openInfo(submission) {
+    submission.entityName = this.entityName;
+    const modal = await this.modalCtrl.create({
+      component: ViewDetailComponent,
+      componentProps: {
+        submission: submission,
+      },
+    });
+    await modal.present();
+  }
+}
diff --git a/src/app/manage-learn/observation/observation.module.ts b/src/app/manage-learn/observation/observation.module.ts
new file mode 100644
index 000000000..d0b013155
--- /dev/null
+++ b/src/app/manage-learn/observation/observation.module.ts
@@ -0,0 +1,29 @@
+import { NgModule } from "@angular/core";
+import { CommonModule } from "@angular/common";
+import { ObservationRoutingModule } from "./observation-routing.module";
+import { ObservationHomeComponent } from "./observation-home/observation-home.component";
+import { HttpClientModule } from "@angular/common/http";
+import { SharedModule } from "../shared/shared.module";
+import { ObservationDetailComponent } from "./observation-detail/observation-detail.component";
+import { TranslateModule } from "@ngx-translate/core";
+import { IonicModule } from "@ionic/angular";
+import { ObservationService } from "./observation.service";
+import { ObservationSubmissionComponent } from "./observation-submission/observation-submission.component";
+import { FormsModule } from '@angular/forms';
+import { CoreModule } from '../core/core.module';
+
+@NgModule({
+  declarations: [ObservationHomeComponent, ObservationDetailComponent, ObservationSubmissionComponent],
+  imports: [
+    CommonModule,
+    CoreModule,
+    ObservationRoutingModule,
+    // HttpClientModule, // TODO:Tremove after api integration
+    TranslateModule.forChild(),
+    SharedModule,
+    IonicModule,
+    FormsModule,
+  ],
+  providers: [ObservationService],
+})
+export class ObservationModule {}
diff --git a/src/app/manage-learn/observation/observation.service.ts b/src/app/manage-learn/observation/observation.service.ts
new file mode 100644
index 000000000..fdf5721e7
--- /dev/null
+++ b/src/app/manage-learn/observation/observation.service.ts
@@ -0,0 +1,71 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { LocalStorageService, UtilsService } from '../core';
+import { urlConstants } from '../core/constants/urlConstants';
+import { AssessmentApiService } from '../core/services/assessment-api.service';
+import { UpdateLocalSchoolDataService } from '../core/services/update-local-school-data.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ObservationService {
+  private programIndex;
+  private solutionIndex;
+  private entityIndex;
+
+  constructor(
+    private httpClient: HttpClient,
+    private localStorage: LocalStorageService,
+    private ulsdp: UpdateLocalSchoolDataService,
+    private utils: UtilsService,
+    private assessmentService: AssessmentApiService
+  ) {}
+
+
+ 
+  getAssessmentDetailsForObservation(event) {
+    return new Promise(async (resolve, reject) => {
+      let entityId = event.entityId;
+      let submissionNumber = event.submission.submissionNumber;
+      let observationId = event.observationId;
+
+      // this.utils.startLoader();
+      // TODO:---------------------
+      let payload = await this.utils.getProfileInfo();
+      const config = {
+        url:
+          urlConstants.API_URLS.GET_OBSERVATION_DETAILS +
+          `${observationId}?entityId=${entityId}&submissionNumber=${submissionNumber}`,
+        payload: payload,
+      };
+      this.assessmentService.post(config).subscribe(
+       async (success) => {
+          console.log(success);
+          this.ulsdp.mapSubmissionDataToQuestion(success.result, true);
+          const generalQuestions = success.result['assessment']['generalQuestions']
+            ? success.result['assessment']['generalQuestions']
+            : null;
+          this.localStorage.setLocalStorage(
+            'generalQuestions_' + success.result['assessment']['submissionId'],
+            generalQuestions
+          );
+          this.localStorage.setLocalStorage(
+            'generalQuestionsCopy_' + success.result['assessment']['submissionId'],
+            generalQuestions
+          );
+
+          this.ulsdp.storeObsevationSubmissionId(success.result['assessment']['submissionId']);
+
+          await this.localStorage.setLocalStorage(
+            this.utils.getAssessmentLocalStorageKey(success.result.assessment.submissionId),
+            success.result
+          );
+          resolve(success.result.assessment.submissionId);
+        },
+        (error) => {
+          // this.utils.stopLoader();
+        }
+      );
+    });
+  }
+}
diff --git a/src/app/manage-learn/programs/program-listing/program-listing.component.html b/src/app/manage-learn/programs/program-listing/program-listing.component.html
new file mode 100644
index 000000000..1a3976291
--- /dev/null
+++ b/src/app/manage-learn/programs/program-listing/program-listing.component.html
@@ -0,0 +1,25 @@
+  <ion-content>
+    <ion-list>
+      <ion-item lines="none">
+        <div style="margin-top: 15px">
+          <ion-label>
+            <div class="title">{{'PROGRAMS' | translate }}</div>
+            <div>
+              <div class="desc">{{'PROGRAMS_DESC' | translate}}</div>
+            </div>
+          </ion-label>
+        </div>
+      </ion-item>
+    </ion-list>
+    <!-- <ion-list *ngFor="let data of result"> -->
+    <app-item-list-card [title]="data?.name"  [id]="data?._id"
+      (cardSelect)="selectedProgram($event)" *ngFor="let data of programs"></app-item-list-card>
+    <app-no-data *ngIf="!programs?.length"></app-no-data>
+
+    <!-- </ion-list> -->
+  </ion-content>
+  <div class="px-5">
+    <ion-button expand="block" (click)="loadMore();" *ngIf="programs?.length && count > programs?.length">
+      {{ 'FRMELEMNTS_BTN_VIEW_MORE' | translate }}
+    </ion-button>
+  </div>
\ No newline at end of file
diff --git a/src/app/manage-learn/programs/program-listing/program-listing.component.scss b/src/app/manage-learn/programs/program-listing/program-listing.component.scss
new file mode 100644
index 000000000..1b11c661f
--- /dev/null
+++ b/src/app/manage-learn/programs/program-listing/program-listing.component.scss
@@ -0,0 +1,22 @@
+.desc {
+    color: #999999;
+    white-space: normal;
+    padding: 5px 0px 30px 0px;
+    margin-bottom: 10px;
+}
+
+.title{
+    font-size: 16px;
+    font-weight: bold;
+    // color: $black;
+    color: black;
+}
+
+.list-md {
+    padding-top: 0px !important; 
+    padding-bottom: 0px !important;
+}
+
+.button-native {
+    background: #DFE7F1 !important;
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/programs/program-listing/program-listing.component.spec.ts b/src/app/manage-learn/programs/program-listing/program-listing.component.spec.ts
new file mode 100644
index 000000000..370bb0484
--- /dev/null
+++ b/src/app/manage-learn/programs/program-listing/program-listing.component.spec.ts
@@ -0,0 +1,27 @@
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ProgramListingComponent } from './program-listing.component';
+
+describe('ProgramListingComponent', () => {
+  let component: ProgramListingComponent;
+  let fixture: ComponentFixture<ProgramListingComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ProgramListingComponent ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProgramListingComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/manage-learn/programs/program-listing/program-listing.component.ts b/src/app/manage-learn/programs/program-listing/program-listing.component.ts
new file mode 100644
index 000000000..b7067a2b6
--- /dev/null
+++ b/src/app/manage-learn/programs/program-listing/program-listing.component.ts
@@ -0,0 +1,98 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { Location } from '@angular/common';
+import { RouterLinks } from '@app/app/app.constant';
+import { AppHeaderService } from '@app/services';
+import { Subscription } from 'rxjs';
+import { Platform } from '@ionic/angular';
+import { KendraApiService } from '../../core/services/kendra-api.service';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { UtilsService, LoaderService } from '../../core';
+
+@Component({
+    selector: 'app-program-listing',
+    templateUrl: './program-listing.component.html',
+    styleUrls: ['./program-listing.component.scss'],
+})
+export class ProgramListingComponent implements OnInit {
+    private backButtonFunc: Subscription;
+    headerConfig = {
+        showHeader: true,
+        showBurgerMenu: false,
+        actionButtons: []
+    };
+    programs = [];
+    count = 0;
+    description;
+    page = 1;
+    limit = 25;
+
+
+    constructor(private router: Router, private location: Location,
+        private loader: LoaderService,
+        private headerService: AppHeaderService, private platform: Platform, private utils: UtilsService, private kendraService: KendraApiService) { }
+
+    ngOnInit() {
+        this.getPrograms();
+    }
+
+    async getPrograms() {
+        this.loader.startLoader();
+        let payload = await this.utils.getProfileInfo();
+        if (payload) {
+            const config = {
+                url: urlConstants.API_URLS.PROGRAM_LISTING + 'page=' + this.page + '&limit=' + this.limit + '&search=',
+                payload: payload
+            }
+            this.kendraService.post(config).subscribe(success => {
+                this.loader.stopLoader();
+                if (success.result.data) {
+                    this.programs = this.programs.concat(success.result.data);
+                    this.count = success.result.count;
+                    this.description = success.result.description;
+                }
+            }, error => {
+                this.loader.stopLoader();
+                this.programs = [];
+            })
+        } else {
+            this.loader.stopLoader();
+        }
+    }
+
+    ionViewWillEnter() {
+        this.headerConfig = this.headerService.getDefaultPageConfig();
+        this.headerConfig.actionButtons = [];
+        this.headerConfig.showHeader = true;
+        this.headerConfig.showBurgerMenu = false;
+        this.headerService.updatePageConfig(this.headerConfig);
+        this.handleBackButton();
+    }
+
+    ionViewWillLeave() {
+        if (this.backButtonFunc) {
+            this.backButtonFunc.unsubscribe();
+        }
+        this.utils.closeProfileAlert();
+    }
+
+    private handleBackButton() {
+        this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
+            this.location.back();
+            this.backButtonFunc.unsubscribe();
+        });
+    }
+
+    selectedProgram(id) {
+        this.router.navigate([`/${RouterLinks.PROGRAM}/${RouterLinks.SOLUTIONS}`, id]);
+    }
+
+    handleNavBackButton() {
+        this.location.back();
+    }
+
+    loadMore() {
+        this.page = this.page + 1;
+    }
+
+}
diff --git a/src/app/manage-learn/programs/programs.module.ts b/src/app/manage-learn/programs/programs.module.ts
new file mode 100644
index 000000000..c7422bdad
--- /dev/null
+++ b/src/app/manage-learn/programs/programs.module.ts
@@ -0,0 +1,38 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { Routes, RouterModule } from '@angular/router';
+import { ProgramListingComponent } from './program-listing/program-listing.component';
+import { SolutionListingComponent } from './solution-listing/solution-listing.component';
+import { IonicModule } from '@ionic/angular';
+import { SharedModule } from '../shared/shared.module';
+import { RouterLinks } from '@app/app/app.constant';
+import { TranslateModule } from '@ngx-translate/core';
+import { FormsModule } from '@angular/forms';
+import { CoreModule } from '../core/core.module';
+import { SurveyMsgComponent } from '../shared/components/survey-msg/survey-msg.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ProgramListingComponent,
+  },
+  {
+    path: `${RouterLinks.SOLUTIONS}/:id`,
+    component: SolutionListingComponent,
+  },
+];
+
+@NgModule({
+  declarations: [ProgramListingComponent, SolutionListingComponent],
+  imports: [
+    CommonModule,
+    RouterModule.forChild(routes),
+    TranslateModule.forChild(),
+    SharedModule,
+    IonicModule,
+    FormsModule,
+    CoreModule,
+  ],
+  entryComponents:[]
+})
+export class ProgramsModule {}
diff --git a/src/app/manage-learn/programs/solution-listing/solution-listing.component.html b/src/app/manage-learn/programs/solution-listing/solution-listing.component.html
new file mode 100644
index 000000000..7ef7059a8
--- /dev/null
+++ b/src/app/manage-learn/programs/solution-listing/solution-listing.component.html
@@ -0,0 +1,32 @@
+  <ion-content fullscreen>
+    <ion-list>
+      <ion-item lines="none">
+        <div style="margin-top: 15px">
+          <ion-label>
+            <div class="title">{{ programName }}</div>
+            <div>
+              <div class="desc">{{'PROGRAMS_DESC' | translate}}</div>
+            </div>
+          </ion-label>
+        </div>
+      </ion-item>
+    </ion-list>
+    <!-- <ion-list *ngFor = "let data of result"> -->
+    <app-item-list-card
+      [title]="data?.name"
+      [subTitle]="data?.description"
+      [id]="data?.id"
+      (click)="selectedSolution(data)"
+      *ngFor="let data of solutions"
+    >
+      <ion-icon class="mg-popup-btn-icon" name="arrow-forward" arrow></ion-icon>
+    </app-item-list-card>
+    <app-no-data *ngIf="!solutions?.length"></app-no-data>
+
+    <!-- </ion-list> -->
+  </ion-content>
+  <div class="px-5">
+    <ion-button expand="block" (click)="loadMore()" *ngIf="solutions?.length && count > solutions?.length">
+      {{ 'FRMELEMNTS_BTN_VIEW_MORE' | translate }}
+    </ion-button>
+  </div>
diff --git a/src/app/manage-learn/programs/solution-listing/solution-listing.component.scss b/src/app/manage-learn/programs/solution-listing/solution-listing.component.scss
new file mode 100644
index 000000000..9a8ade3d8
--- /dev/null
+++ b/src/app/manage-learn/programs/solution-listing/solution-listing.component.scss
@@ -0,0 +1,18 @@
+.desc {
+    color: #999999;
+    white-space: normal;
+    padding: 5px 0px 30px 0px;
+    margin-bottom: 10px;
+}
+
+.title{
+    font-size: 16px;
+    font-weight: bold;
+    color: black;
+    // margin: 16px 16px 8px;
+}
+
+.list-md {
+    padding-top: 0px !important; 
+    padding-bottom: 0px !important;
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/programs/solution-listing/solution-listing.component.spec.ts b/src/app/manage-learn/programs/solution-listing/solution-listing.component.spec.ts
new file mode 100644
index 000000000..7e76a9c39
--- /dev/null
+++ b/src/app/manage-learn/programs/solution-listing/solution-listing.component.spec.ts
@@ -0,0 +1,27 @@
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SolutionListingComponent } from './solution-listing.component';
+
+describe('SolutionListingComponent', () => {
+  let component: SolutionListingComponent;
+  let fixture: ComponentFixture<SolutionListingComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ SolutionListingComponent ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SolutionListingComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/manage-learn/programs/solution-listing/solution-listing.component.ts b/src/app/manage-learn/programs/solution-listing/solution-listing.component.ts
new file mode 100644
index 000000000..c3c1fa93a
--- /dev/null
+++ b/src/app/manage-learn/programs/solution-listing/solution-listing.component.ts
@@ -0,0 +1,203 @@
+import { Location } from '@angular/common';
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { KendraApiService } from '../../core/services/kendra-api.service';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { ToastService, UtilsService } from '../../core';
+import { LoaderService } from '../../core';
+import { RouterLinks } from '@app/app/app.constant';
+import { SurveyProviderService } from '../../core/services/survey-provider.service';
+import { Subscription } from 'rxjs';
+import { AppHeaderService } from '@app/services';
+import { Platform } from '@ionic/angular';
+
+@Component({
+  selector: 'app-solution-listing',
+  templateUrl: './solution-listing.component.html',
+  styleUrls: ['./solution-listing.component.scss'],
+})
+export class SolutionListingComponent implements OnInit {
+  programId: any;
+  solutions 
+  description;
+  count = 0;
+  limit = 25;
+  page = 1;
+  programName: any;
+  headerConfig = {
+    showHeader: true,
+    showBurgerMenu: false,
+    actionButtons: []
+};
+private backButtonFunc: Subscription;
+
+
+  constructor(
+    private activatedRoute: ActivatedRoute,
+    private utils: UtilsService,
+    private kendraService: KendraApiService,
+    private loader: LoaderService,
+    private location: Location,
+    private router: Router,
+    private surveyProvider: SurveyProviderService,
+    private headerService: AppHeaderService,
+    private platform: Platform,
+    private toast:ToastService
+  ) {
+    activatedRoute.params.subscribe((param) => {
+      this.programId = param.id;
+      this.solutions=[]
+      this.getSolutions();
+    });
+  }
+
+  ngOnInit() {}
+
+
+  ionViewWillEnter() {
+    this.headerConfig = this.headerService.getDefaultPageConfig();
+    this.headerConfig.actionButtons = [];
+    this.headerConfig.showHeader = true;
+    this.headerConfig.showBurgerMenu = false;
+    this.headerService.updatePageConfig(this.headerConfig);
+    this.handleBackButton();
+}
+
+ionViewWillLeave() {
+  if (this.backButtonFunc) {
+      this.backButtonFunc.unsubscribe();
+  }
+}
+
+private handleBackButton() {
+  this.backButtonFunc = this.platform.backButton.subscribeWithPriority(11, () => {
+      this.location.back();
+  });
+}
+
+  selectedSolution(data) {
+    switch (data.type) {
+      case 'observation':
+        this.redirectObservaiton(data);
+        break;
+      case 'improvementProject':
+        this.redirectProject(data);
+        break;
+      case 'survey':
+        this.surveyRedirect(data);
+
+      default:
+        break;
+    }
+  }
+
+  surveyRedirect(data) {
+    let surveyId = '';
+    if (data.surveyId) {
+      surveyId = data.surveyId;
+    }
+    this.surveyProvider
+      .getDetailsById(surveyId, data._id)
+      .then((res) => {
+        if (res.result && res.result.status == 'completed') {
+          // this.toast.openToast(res.message)
+           this.surveyProvider.showMsg('surveyCompleted');
+          return
+        }
+        const survey = res.result;
+        this.storeRedirect(survey);
+      })
+      .catch((err) => {
+        console.log(err);
+      });
+  }
+  storeRedirect(survey): void {
+    this.surveyProvider
+      .storeSurvey(survey.assessment.submissionId, survey)
+      .then((survey) => this.redirect(survey.assessment.submissionId));
+  }
+
+  redirect(submissionId: any): void {
+    this.router.navigate([RouterLinks.QUESTIONNAIRE], {
+      queryParams: {
+        submisssionId: submissionId,
+        evidenceIndex: 0,
+        sectionIndex: 0,
+        // schoolName: 'sample',
+      },
+    });
+  }
+
+  redirectProject(data) {
+    let projectId = '';
+    if (data.projectId) {
+      projectId = data.projectId;
+    }
+    // this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.DETAILS}`, "", this.programId, data._id]);
+    this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.DETAILS}`], {
+      queryParams: {
+        projectId: projectId,
+        programId: this.programId,
+        solutionId:  data._id,
+        type: 'assignedToMe'
+      }
+    });
+  }
+  redirectObservaiton(data) {
+    debugger
+    let observationId = '';
+    if (data.observationId) {
+      observationId = data.observationId;
+    }
+    this.router.navigate([`/${RouterLinks.OBSERVATION}/${RouterLinks.OBSERVATION_DETAILS}`], {
+      queryParams: {
+        programId: this.programId,
+        solutionId: data._id,
+        observationId: observationId,
+        solutionName: data.name,
+      },
+    });
+  }
+
+  async getSolutions() {
+    this.loader.startLoader();
+    let payload = await this.utils.getProfileInfo();
+    if (payload) {
+      const config = {
+        url:
+          urlConstants.API_URLS.SOLUTIONS_LISTING +
+          this.programId +
+          '?page=' +
+          this.page +
+          '&limit=' +
+          this.limit +
+          '&search=',
+        payload: payload,
+      };
+      this.kendraService.post(config).subscribe(
+        (success) => {
+          this.loader.stopLoader();
+          if (success.result.data) {
+            this.solutions = this.solutions.concat(success.result.data);
+            this.count = success.result.count;
+            this.description = success.result.description;
+            this.programName=success.result.programName
+          }
+        },
+        (error) => {
+          this.loader.stopLoader();
+          this.solutions = [];
+        }
+      );
+    } else {
+      this.loader.stopLoader();
+    }
+  }
+  goBack() {
+    this.location.back();
+  }
+  loadMore() {
+    this.page = this.page + 1;
+    this.getSolutions();
+  }
+}
diff --git a/src/app/manage-learn/project-full-report/project-full-report.module.ts b/src/app/manage-learn/project-full-report/project-full-report.module.ts
new file mode 100644
index 000000000..5cb483609
--- /dev/null
+++ b/src/app/manage-learn/project-full-report/project-full-report.module.ts
@@ -0,0 +1,33 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { HttpClientModule } from '@angular/common/http';
+import { FormsModule } from '@angular/forms';
+import { Routes, RouterModule } from '@angular/router';
+import { IonicModule } from '@ionic/angular';
+import { TranslateModule } from '@ngx-translate/core';
+import { CoreModule } from '../core/core.module';
+import { SharedModule } from '../shared/shared.module';
+import { ProjectFullReportComponent } from './project-full-report/project-full-report.component';
+import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
+const routes: Routes = [
+  {
+    path: '',
+    component: ProjectFullReportComponent,
+  },
+];
+
+@NgModule({
+  declarations: [ProjectFullReportComponent],
+  imports: [
+    CommonModule,
+    RouterModule.forChild(routes),
+    HttpClientModule, // TODO:Tremove after api integration
+    TranslateModule.forChild(),
+    SharedModule,
+    IonicModule,
+    FormsModule,
+    CoreModule,
+  ],
+  providers: [ScreenOrientation],
+})
+export class ProjectFullReportModule {}
diff --git a/src/app/manage-learn/project-full-report/project-full-report/project-full-report.component.html b/src/app/manage-learn/project-full-report/project-full-report/project-full-report.component.html
new file mode 100644
index 000000000..55e1dad31
--- /dev/null
+++ b/src/app/manage-learn/project-full-report/project-full-report/project-full-report.component.html
@@ -0,0 +1,49 @@
+<ion-content class="ion-padding">
+  <div *ngIf="reports && reports.length">
+    <download-share [name]="fileName()" [extension]="'.pdf'" [config]="config()" [interface]="'fab'">
+    </download-share>
+
+    <div style="width: 75%; min-height: 25px">
+      <h5>
+        {{ filter?.entity?.name }}
+      </h5>
+    </div>
+
+    <h5 *ngIf="filter?.type == 0">
+      {{ 'FRMELEMNTS_LBL_UNDERTAKEN_PROJECTS_IN_WEEK' | translate }}
+    </h5>
+    <h5 *ngIf="filter?.type == 1">
+      {{ 'FRMELEMNTS_LBL_UNDERTAKEN_PROJECTS_IN_MONTH' | translate }}
+    </h5>
+    <h5 *ngIf="filter?.type == 3">
+      {{ 'FRMELEMNTS_LBL_UNDERTAKEN_PROJECTS_IN_QUARTER' | translate }}
+    </h5>
+    <!-- <app-gantt-chart></app-gantt-chart> -->
+    <div style="display: block" *ngFor="let g of graph">
+      <canvas
+        baseChart
+        [chartType]="'horizontalBar'"
+        [datasets]="g.chartData.datasets"
+        [options]="g.options"
+        [labels]="g.labels"
+        [plugins]="barChartPlugins"
+      >
+      </canvas>
+    </div>
+
+    <!-- <div *ngFor="let report of reports; let i = index">
+      <ion-card style="background: #f5f5f5b8; border-radius: 10px" *ngIf="report?.title?.text">
+        <ion-card-header class="chart-title">
+          {{ report.title.text }}
+        </ion-card-header>
+        <ion-card-content>
+          <div id="{{ idvalue }}{{ i }}"></div>
+        </ion-card-content>
+      </ion-card>
+    </div> -->
+  </div>
+  <ion-card *ngIf="reports && reports.length == 0">
+    <!-- <app-no-data></app-no-data> -->
+    <!-- TODO:Implement -->
+  </ion-card>
+</ion-content>
diff --git a/src/app/manage-learn/project-full-report/project-full-report/project-full-report.component.scss b/src/app/manage-learn/project-full-report/project-full-report/project-full-report.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/project-full-report/project-full-report/project-full-report.component.ts b/src/app/manage-learn/project-full-report/project-full-report/project-full-report.component.ts
new file mode 100644
index 000000000..a3194289e
--- /dev/null
+++ b/src/app/manage-learn/project-full-report/project-full-report/project-full-report.component.ts
@@ -0,0 +1,227 @@
+import { Component, OnInit } from '@angular/core';
+import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
+import { LoaderService, UtilsService } from '../../core';
+import { UnnatiDataService } from '../../core/services/unnati-data.service';
+import { ProjectReportService } from '../../core/services/project-report.service';
+import { HttpClient } from '@angular/common/http';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { ActivatedRoute, Router } from '@angular/router';
+
+@Component({
+  selector: 'app-project-full-report',
+  templateUrl: './project-full-report.component.html',
+  styleUrls: ['./project-full-report.component.scss'],
+})
+export class ProjectFullReportComponent implements OnInit {
+  // reports: {
+  //   title: { text: string };
+  //   series: { name: string; data: { name: string; id: string; color: string; start: number; end: number }[] }[];
+  //   xAxis: { min: number; max: number };
+  // }[];
+  reports: any;
+  showCharts: boolean;
+  idvalue = 'container';
+  filter: any;
+  barChartPlugins: any;
+
+  constructor(
+    private loader: LoaderService,
+    public unnatiSrvc: UnnatiDataService,
+    public screenOrientation: ScreenOrientation,
+    public reportService: ProjectReportService,
+    public utils: UtilsService,
+    public httpClient: HttpClient,
+    private router: Router
+  ) {
+    this.filter = this.router.getCurrentNavigation().extras.state;
+  }
+
+  ngOnInit() {
+    // this.filter = this.reportService.filterForReport;
+    try {
+      this.screenOrientation.lock(this.screenOrientation.ORIENTATIONS.LANDSCAPE);
+    } catch (error) {}
+
+    this.loadFullData();
+  }
+
+  async loadFullData() {
+    this.loader.startLoader();
+
+    let payload = await this.utils.getProfileInfo();
+
+    let url = urlConstants.API_URLS.GET_FULL_REPORT;
+    if (this.filter.entity) {
+      url = urlConstants.API_URLS.GET_FULL_REPORT + this.filter.entity._id;
+    }
+    const query = {
+      programId: this.filter.program ? this.filter.program._id : null,
+      reportType: this.filter.type,
+    };
+
+    url = this.utils.queryUrl(url, query);
+    const config = {
+      url: url,
+      payload: payload,
+    };
+    this.unnatiSrvc.post(config).subscribe(
+      (data: any) => {
+        this.loader.stopLoader();
+        if (data.result) {
+          this.reports = data.result;
+          if (this.reports.length > 0) {
+            // setTimeout(() => {
+            //   this.showCharts = true;
+            //   this.setUpChart(this.reports[0]);
+            // }, 1000);
+            this.reports.map((data) => {
+              this.createChart(data);
+            });
+          }
+        }
+      },
+      (error) => {
+        this.loader.stopLoader();
+      }
+    );
+  }
+
+  MS_PER_DAY = 1000 * 60 * 60 * 24;
+
+  data;
+
+  chartData;
+  options;
+  plantingDays;
+
+  lables = [];
+
+  graph = [];
+
+  createChart(data) {
+    this.lables = data.labels;
+    this.data = data.taskArr;
+    this.chartData = {
+      labels: this.lables,
+      datasets: data.datasets,
+    };
+
+    this.options = {
+      maintainAspectRatio: false,
+      title: {
+        display: true,
+        text: data.title,
+      },
+      legend: { display: false },
+      tooltips: {
+        mode: 'index',
+        callbacks: {
+          label: (tooltipItem, d) => {
+            let x = this.reports.filter((d) => {
+              return d.taskArr[tooltipItem.index].title == tooltipItem.label;
+            })[0];
+            this.data = x.taskArr;
+            this.plantingDays = x.leastStartDate;
+            let label = d.datasets[tooltipItem.datasetIndex].label || '';
+            const date = new Date(this.plantingDays);
+            if (tooltipItem.datasetIndex === 0) {
+              const diff = this.dateDiffInDays(date, new Date(this.data[tooltipItem.index].startDate));
+              date.setDate(diff + 1);
+              label += 'Start Date: ' + this.getDate(date);
+            } else if (tooltipItem.datasetIndex === 1) {
+              const diff = this.dateDiffInDays(date, new Date(this.data[tooltipItem.index].endDate));
+              date.setDate(diff + 1);
+              label += 'End Date: ' + this.getDate(date);
+            }
+            return label;
+          },
+        },
+      },
+      scales: {
+        xAxes: [
+          {
+            stacked: true,
+            ticks: {
+              callback: (value, index, values) => {
+                console.log(data.leastStartDate);
+
+                const date = new Date(data.leastStartDate);
+                date.setDate(value);
+                return this.getDate(date);
+              },
+            },
+          },
+        ],
+        yAxes: [
+          {
+            stacked: true,
+          },
+        ],
+      },
+      plugins: {
+        datalabels: {
+          formatter: () => {
+            return null;
+          },
+        },
+      },
+    };
+    this.barChartPlugins = [
+      {
+        beforeUpdate: function (c) {
+          var chartHeight = c.chart.height;
+          var size = (chartHeight * 5) / 100;
+          c.scales['y-axis-0'].options.ticks.minor.fontSize = size;
+        },
+      },
+    ];
+
+    let d = {
+      chartData: this.chartData,
+      options: this.options,
+      labels: this.lables,
+    };
+    this.graph.push(d);
+  }
+
+  getDate(date) {
+    return (
+      date.getFullYear() + '-' + ('0' + (date.getMonth() + 1)).substr(-2) + '-' + ('0' + date.getDate()).substr(-2)
+    );
+  }
+
+  dateDiffInDays(a, b) {
+    // Discard the time and time-zone information.
+    const utc1 = Date.UTC(a.getFullYear(), a.getMonth(), a.getDate());
+    const utc2 = Date.UTC(b.getFullYear(), b.getMonth(), b.getDate());
+
+    return Math.floor((utc2 - utc1) / this.MS_PER_DAY);
+  }
+
+  fileName() {
+    let arr = ['report'];
+    this.filter.program ? arr.push(this.filter.program.name) : null;
+    return arr;
+  }
+
+  config() {
+    let url = urlConstants.API_URLS.GET_FULL_REPORT;
+    if (this.filter.entity) {
+      url = url + this.filter.entity._id;
+    }
+
+    let query = {
+      reportType: this.filter.type,
+      programId: this.filter.program ? this.filter.program._id : null,
+      requestPdf: true,
+    };
+
+    url = this.utils.queryUrl(url, query);
+
+    return { url: url };
+  }
+
+  ngOnDestroy() {
+    this.screenOrientation.lock(this.screenOrientation.ORIENTATIONS.PORTRAIT);
+  }
+}
diff --git a/src/app/manage-learn/project-report/project-report.module.ts b/src/app/manage-learn/project-report/project-report.module.ts
new file mode 100644
index 000000000..133c827af
--- /dev/null
+++ b/src/app/manage-learn/project-report/project-report.module.ts
@@ -0,0 +1,28 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ProjectReportComponent } from './project-report/project-report.component';
+import { FormsModule } from '@angular/forms';
+import { RouterModule, Routes } from '@angular/router';
+import { IonicModule } from '@ionic/angular';
+import { TranslateModule } from '@ngx-translate/core';
+import { CoreModule } from '../core/core.module';
+import { SharedModule } from '../shared/shared.module';
+const routes: Routes = [
+  {
+    path: '',
+    component: ProjectReportComponent,
+  },
+];
+@NgModule({
+  declarations: [ProjectReportComponent],
+  imports: [
+    CommonModule,
+    RouterModule.forChild(routes),
+    TranslateModule.forChild(),
+    SharedModule,
+    IonicModule,
+    FormsModule,
+    CoreModule,
+  ],
+})
+export class ProjectReportModule {}
diff --git a/src/app/manage-learn/project-report/project-report/project-report.component.html b/src/app/manage-learn/project-report/project-report/project-report.component.html
new file mode 100644
index 000000000..9bec7f62c
--- /dev/null
+++ b/src/app/manage-learn/project-report/project-report/project-report.component.html
@@ -0,0 +1,172 @@
+<ion-content>
+  <div class="ion-margin">
+    <div class="filter-container" (click)="showFilter = !showFilter">
+      <div class="filter-icon">
+        <ion-icon item-start name="funnel" color="primary" class="icon"></ion-icon>
+      </div>
+      <div>{{ 'FRMELEMNTS_BTN_FILTER' | translate }}</div>
+      <div class="filter-icon">
+        <ion-icon name="chevron-forward-outline" color="primary" *ngIf="!showFilter"></ion-icon>
+        <ion-icon name="chevron-down-outline" color="primary" *ngIf="showFilter"></ion-icon>
+      </div>
+    </div>
+    <div *ngIf="showFilter">
+      <!-- <ion-item>
+        <div (click)="openFilterModal('entity')">
+          <p>{{ filter?.entity?.name || 'Select Entity' }}</p>
+        </div>
+      </ion-item> -->
+      <ion-item>
+        <div (click)="openFilterModal('program')">
+          <p>{{ filter?.program?.name || 'Select Program' }}</p>
+        </div>
+      </ion-item>
+    </div>
+    <!-- Project overview section -->
+    <section *ngIf="reportData?.projects">
+      <div class="overview-container">
+        <div class="overview-heading">
+          <div>
+            <h5>{{ 'FRMELEMNTS_LBL_PROJECT_OVERVIEW' | translate }}</h5>
+          </div>
+          <div class="filter-download-container">
+            <div *ngIf="filterType">
+              <ion-select
+                [(ngModel)]="filter.type"
+                [interfaceOptions]="{
+                  cssClass: 'select-box',
+                  animated: false
+                }"
+              >
+                <ion-select-option [value]="t.value" *ngFor="let t of filterType">{{ t.label }}</ion-select-option>
+              </ion-select>
+            </div>
+            <download-share
+              [name]="fileName()"
+              [extension]="'.pdf'"
+              [config]="config()"
+              [interface]="'simple'"
+            ></download-share>
+          </div>
+        </div>
+
+        <div class="project-overview-body">
+          <div class="card" *ngFor="let p of projectsArr">
+            <div class="card-image">
+              <img src="{{ p?.img }}" alt="" />
+            </div>
+            <div class="card-content">
+              <div class="content-heading">{{ p?.name }}</div>
+              <div class="count">{{ reportData?.projects[p?.key] }}</div>
+            </div>
+          </div>
+        </div>
+
+        <!-- <div class="overview-footer">
+          <div class="view-option">
+            <ion-button (click)="viewFullReport()" expand="full" fill="outline">{{
+              'FRMELEMNTS_LBL_VIEW_FULL_REPORT' | translate
+            }}</ion-button>
+          </div>
+        </div> -->
+      </div>
+    </section>
+
+    <!-- task overview section -->
+
+    <section *ngIf="reportData?.tasks">
+      <div class="overview-container">
+        <div class="overview-heading">
+          <div>
+            <h5>{{ 'FRMELEMNTS_LBL_TASK_OVERVIEW' | translate }}</h5>
+          </div>
+          <div class="filter-download-container">
+            <div *ngIf="filterType">
+              <ion-select
+                [(ngModel)]="filter.type"
+                (ionChange)="reportTypeChange()"
+                [interfaceOptions]="{
+                  cssClass: 'select-box',
+                  animated: false
+                }"
+              >
+                <ion-select-option [value]="t.value" *ngFor="let t of filterType">{{ t.label }}</ion-select-option>
+              </ion-select>
+            </div>
+            <download-share
+              [name]="fileName()"
+              [extension]="'.pdf'"
+              [config]="config()"
+              [interface]="'simple'"
+            ></download-share>
+          </div>
+        </div>
+
+        <div class="task-overview-body">
+          <div>
+            <graph-circle [data]="reportData?.tasks"></graph-circle>
+          </div>
+        </div>
+
+        <!-- <div class="overview-footer">
+          <div class="view-option">
+            <ion-button (click)="viewFullReport()" expand="full" fill="outline">{{
+              'FRMELEMNTS_LBL_VIEW_FULL_REPORT' | translate
+            }}</ion-button>
+          </div>
+        </div> -->
+      </div>
+    </section>
+
+    <!-- category` overview section -->
+
+    <section *ngIf="reportData?.categories">
+      <div class="overview-container">
+        <div class="overview-heading">
+          <div>
+            <h5>{{ 'FRMELEMNTS_LBL_CATEGORY_OVERVIEW' | translate }}</h5>
+          </div>
+
+          <div class="filter-download-container">
+            <div *ngIf="filterType">
+              <ion-select
+                [(ngModel)]="filter.type"
+                [interfaceOptions]="{
+                  cssClass: 'select-box',
+                  animated: false
+                }"
+              >
+                <ion-select-option [value]="t.value" *ngFor="let t of filterType">{{ t.label }}</ion-select-option>
+              </ion-select>
+            </div>
+            <download-share
+              [name]="fileName()"
+              [extension]="'.pdf'"
+              [config]="config()"
+              [interface]="'simple'"
+            ></download-share>
+          </div>
+        </div>
+        <div class="task-overview-body">
+          <div>
+            <graph-circle [data]="reportData?.categories"></graph-circle>
+            <!-- <app-chart> </app-chart> -->
+          </div>
+        </div>
+
+        <!-- <div class="overview-footer">
+          <div class="view-option">
+            <ion-button (click)="viewFullReport()" expand="full" fill="outline">{{
+              'FRMELEMNTS_LBL_VIEW_FULL_REPORT' | translate
+            }}</ion-button>
+          </div>
+        </div> -->
+      </div>
+    </section>
+
+    <section>
+      <!-- <app-no-data *ngIf="!reportData?.categories && !reportData?.tasks && !reportData?.projects"></app-no-data> -->
+      <!-- //TODO:implement -->
+    </section>
+  </div>
+</ion-content>
diff --git a/src/app/manage-learn/project-report/project-report/project-report.component.scss b/src/app/manage-learn/project-report/project-report/project-report.component.scss
new file mode 100644
index 000000000..1a096e007
--- /dev/null
+++ b/src/app/manage-learn/project-report/project-report/project-report.component.scss
@@ -0,0 +1,70 @@
+.filter-container {
+  display: flex;
+  align-items: center;
+  .filter-icon {
+    font-size: 1em;
+    padding: 0 5px;
+    display: flex;
+  }
+}
+
+.overview-container {
+  .overview-heading {
+    display: flex;
+    justify-content: space-between;
+    align-items: baseline;
+    .filter-download-container {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+    }
+  }
+}
+
+.project-overview-body {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+
+  .card {
+    width: 49%;
+    background-color: #8080801c;
+    display: flex;
+    padding: 12px 0px;
+    margin: 2px 0;
+    .card-image {
+      display: flex;
+      align-items: center;
+      padding: 6px;
+      img {
+        height: 20px;
+        width: 20px;
+      }
+    }
+    .card-content {
+      flex: 1;
+      margin-left: 22px;
+      .content-heading {
+        font-size: 12px;
+      }
+    }
+  }
+}
+
+.task-overview-body {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-wrap: wrap;
+}
+
+.overview-footer {
+  .view-option {
+    display: flex;
+    justify-content: center;
+    ion-button {
+      --border-color: white;
+      color: blue;
+    }
+  }
+}
diff --git a/src/app/manage-learn/project-report/project-report/project-report.component.ts b/src/app/manage-learn/project-report/project-report/project-report.component.ts
new file mode 100644
index 000000000..912f2e711
--- /dev/null
+++ b/src/app/manage-learn/project-report/project-report/project-report.component.ts
@@ -0,0 +1,279 @@
+import { HttpClient } from '@angular/common/http';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
+import { RouterLinks } from '@app/app/app.constant';
+import { AlertController, IonSelect, ModalController } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+import { UtilsService } from '../../core';
+import { ProjectReportService } from '../../core/services/project-report.service';
+import { FilterModalComponent } from '../../shared/components/filter-modal/filter-modal.component';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { UnnatiDataService } from '../../core/services/unnati-data.service';
+import { AppHeaderService } from '@app/services';
+
+@Component({
+  selector: 'app-project-report',
+  templateUrl: './project-report.component.html',
+  styleUrls: ['./project-report.component.scss'],
+})
+export class ProjectReportComponent implements OnInit {
+  reportData: any;
+  showFilter: boolean = false;
+  filterType: { label: string; value: number }[];
+  filter = { type: 1, entity: undefined, program: undefined };
+  @ViewChild('mySelect', { static: false }) selectRef: IonSelect;
+  texts: any;
+  constructor(
+    private translate: TranslateService,
+    private httpClient: HttpClient,
+    private utils: UtilsService,
+    public alertController: AlertController,
+    private router: Router,
+    private reportSrvc: ProjectReportService,
+    public modalController: ModalController,
+    public unnatiService: UnnatiDataService,
+    private headerService: AppHeaderService
+  ) {
+    this.translate
+      .get([
+        'FRMELEMENTS_LBL_SELECT_ENTITY',
+        'FRMELEMNTS_MSG_SELECT_ENTITY_TO_SELECT_PROGRAM',
+        'FRMELEMNTS_MSG_NO_DATA_AVAILABLE',
+        'FRMELEMNTS_MSG_NO_DATA_AVAILABLE_FOR_ENTITY_OR_PROGRAM',
+        'FRMELEMNTS_LBL_OK',
+      ])
+      .subscribe((data) => {
+        this.texts = data;
+      });
+  }
+
+  projectsArr = [
+    {
+      name: 'Total Projects',
+      img: '../../assets/imgs/reports-page/Note 1.svg',
+      key: 'total',
+    },
+    {
+      name: 'Projects Completed',
+      img: '../../assets/imgs/reports-page/note.svg',
+      key: 'completed',
+    },
+    {
+      name: 'Projects In Progress',
+      img: '../../assets/imgs/reports-page/Note 4.svg',
+      key: 'inProgress',
+    },
+    {
+      name: 'Projects Overdue',
+      img: '../../assets/imgs/reports-page/Note 3.svg',
+      key: 'overdue',
+    },
+  ];
+  ionViewWillEnter() {
+    this.headerService.showHeaderWithBackButton();
+    this.getReports();
+    this.loadFilterType();
+  }
+
+  ngOnInit() {}
+
+  loadFilterType() {
+    this.filterType = [
+      {
+        label: 'Weekly',
+        value: 0,
+      },
+      {
+        label: 'Monthly',
+        value: 1,
+      },
+      {
+        label: 'Quarterly',
+        value: 2,
+      },
+    ];
+  }
+
+  async getReports(preFilter?) {
+    const entityId = this.filter.entity ? this.filter.entity._id : null;
+    let url;
+    if (entityId) {
+      url = urlConstants.API_URLS.GET_REPORT + entityId; // to get entity report
+    } else {
+      url = urlConstants.API_URLS.GET_REPORT; // overall report
+    }
+    const query = {
+      reportType: this.filter.type,
+      programId: this.filter.program ? this.filter.program._id : null,
+    };
+    url = this.utils.queryUrl(url, query);
+    let payload = await this.utils.getProfileData();
+    if (payload) {
+      const config = {
+        url: url,
+        payload: payload,
+      };
+      this.unnatiService.post(config).subscribe(
+        (data) => {
+          if (data.result && !data.result.dataAvailable) {
+            this.presentAlert(
+              this.texts['FRMELEMNTS_MSG_NO_DATA_AVAILABLE'],
+              this.texts['FRMELEMNTS_MSG_NO_DATA_AVAILABLE_FOR_ENTITY_OR_PROGRAM']
+            );
+            preFilter ? (this.filter = JSON.parse(preFilter)) : null;
+            if (this.reportData) {
+              return;
+            }
+          }
+          this.reportData = data.result ? data.result.data : {};
+          this.reportData.tasks.series = this.generateCircleData(this.reportData.tasks, 57);
+          this.reportData.tasks.series_new = this.generateCircleData_new(this.reportData.tasks, 57);
+
+          this.reportData.categories.series = this.generateCircleData(this.reportData.categories, 50);
+          this.reportData.categories.series_new = this.generateCircleData_new(this.reportData.categories, 50);
+        },
+        (err) => {}
+      );
+    } else {
+    }
+  }
+
+  generateCircleData_new(obj, radius) {
+    let label = [];
+    let data = [];
+    let color = [];
+    let count = 0;
+    for (const key in obj) {
+      if (key == 'total' || key == 'series' || obj[key] == 0) {
+        continue;
+      }
+
+      label.push(this.utils.cameltoNormalCase(key));
+      data.push(obj[key]);
+      if (key == 'completed') {
+        color.push({ color: '#b4e3aa', pos: count });
+      }
+
+      if (key == 'notStarted') {
+        color.push({ color: '#e86d6d', pos: count });
+      }
+      count++;
+    }
+
+    let series = {
+      label: label,
+      data: data,
+      color: color,
+      radius: radius,
+      total: obj['total'],
+    };
+
+    return series;
+  }
+
+  generateCircleData(obj, innerRadius) {
+    let data = [];
+    for (const key in obj) {
+      if (key == 'total') {
+        continue;
+      }
+      let x = {};
+      x['name'] = this.utils.cameltoNormalCase(key);
+      x['value'] = ((obj[key] / obj.total) * 100).toFixed(1) + '%';
+      x['y'] = obj[key];
+      x['z'] = 0;
+      if (key == 'completed') {
+        x['color'] = '#b4e3aa';
+      }
+
+      if (key == 'notStarted') {
+        x['color'] = '#e86d6d  ';
+      }
+
+      data.push(x);
+    }
+    let series = [
+      {
+        minPointSize: 100 - innerRadius,
+        innerSize: innerRadius + '%',
+        zMin: 0,
+        showInLegend: true,
+        data: data,
+      },
+    ];
+    return series;
+  }
+  ionViewDidLeave() {
+    this.filter = { type: 1, entity: null, program: null };
+  }
+  reportTypeChange() {
+    this.getReports();
+  }
+
+  async presentAlert(heading, msg) {
+    const alert = await this.alertController.create({
+      header: heading,
+      message: msg,
+      buttons: [this.texts['FRMELEMNTS_LBL_OK']],
+    });
+
+    await alert.present();
+  }
+
+  viewFullReport() {
+    // this.reportSrvc.filterForReport = this.filter;
+    // this.router.navigate([RouterLinks.PROJECT_FULL_REPORT]);
+    this.router.navigate([RouterLinks.PROJECT_FULL_REPORT], {
+      state: this.filter,
+    });
+  }
+
+  fileName() {
+    let arr = ['report'];
+    this.filter.program ? arr.push(this.filter.program.name) : null;
+    return arr;
+  }
+
+  config() {
+    let url = urlConstants.API_URLS.GET_REPORT;
+    if (this.filter.entity) {
+      url = url + this.filter.entity._id;
+    }
+
+    let query = {
+      requestPdf: true,
+      reportType: this.filter.type,
+      programId: this.filter.program ? this.filter.program._id : null,
+    };
+
+    url = this.utils.queryUrl(url, query);
+
+    return { url: url };
+  }
+
+  async openFilterModal(type) {
+    console.log(type, 'type');
+    console.log(this.filter.entity, 'this.filter.entity');
+    // if (type == 'program' && this.filter.entity == undefined) {
+    //   this.presentAlert(
+    //     this.texts['FRMELEMENTS_LBL_SELECT_ENTITY'],
+    //     this.texts['FRMELEMNTS_MSG_SELECT_ENTITY_TO_SELECT_PROGRAM']
+    //   );
+    //   return;
+    // }
+    let preFilter = JSON.stringify(this.filter);
+
+    const modal = await this.modalController.create({
+      component: FilterModalComponent,
+      cssClass: 'my-custom-class',
+      componentProps: {
+        type: type,
+        entityId: this.filter.entity ? this.filter.entity._id : null,
+      },
+    });
+    await modal.present();
+    const { data } = await modal.onWillDismiss();
+    type == 'entity' ? (this.filter.entity = data) : (this.filter.program = data);
+    JSON.stringify(this.filter) !== preFilter ? this.getReports(preFilter) : null;
+  }
+}
diff --git a/src/app/manage-learn/project/add-entity/add-entity.component.html b/src/app/manage-learn/project/add-entity/add-entity.component.html
new file mode 100644
index 000000000..fbf9eabcc
--- /dev/null
+++ b/src/app/manage-learn/project/add-entity/add-entity.component.html
@@ -0,0 +1,59 @@
+<ion-toolbar class="_bottomBorder">
+  <ion-title>
+    {{title | translate}}
+  </ion-title>
+  <ion-buttons (click)="close()" slot="start" class="padding">
+    <ion-icon name="arrow-back" slot="icon-only" style="padding-left: 10px;"></ion-icon>
+  </ion-buttons>
+</ion-toolbar>
+<ion-content>
+  <div *ngIf="subEntities ">
+    <ion-searchbar debounce="1000" (ionInput)="onSearch($event)" search-icon="search"></ion-searchbar>
+    <div class="ion-padding">
+      <ion-icon name="funnel" color="primary"></ion-icon> {{'FRMELEMNTS_LBL_FILTER' | translate}}
+        <ion-row>
+          <ion-col>
+            <ion-item>
+              <ion-label>{{'FRMELEMNTS_BTN_ENTITY' | translate}}</ion-label>
+              <ion-select interface="popover" value={{childEntity}} (ionChange)="selectSubEntity($event)">
+                <ion-select-option style="text-transform: capitalize !important;"  *ngFor="let subEntity of subEntities" value="{{subEntity.value}}">{{subEntity.name | titlecase}}</ion-select-option>
+                
+              </ion-select>
+            </ion-item>
+          </ion-col>
+        </ion-row>
+
+      <!-- <ion-radio-group value=selectedEntity.value>
+        <ion-row style="margin: 0px -18px;">
+          <ion-col size="4" *ngFor="let subEntity of subEntities">
+            <ion-item lines="none">
+              <ion-label style="text-transform: capitalize;">{{subEntity.name}}</ion-label>
+              <ion-radio slot="start" color="success" value="{{subEntity.value}}"></ion-radio>
+            </ion-item>
+          </ion-col>
+        </ion-row>
+      </ion-radio-group> -->
+
+      <h5 class="entity-name"> {{childEntity}}</h5>
+      <ion-radio-group>
+        <ion-card class="enitity-list" *ngFor="let entity of entities">
+          <ion-item lines="none">
+            <ion-label>{{entity.name}}</ion-label>
+            <ion-radio slot="start" (click)="selectEntity(entity)" value="{{entity.value}}">
+            </ion-radio>
+          </ion-item>
+        </ion-card>
+      </ion-radio-group>
+      <div class="loadmore-btn" *ngIf="entities.length && entityCount > entities.length">
+        <ion-button (click)="loadMoreEntities()">
+          {{'FRMELEMNTS_BTN_LOAD_MORE' | translate}}</ion-button>
+      </div>
+
+      <app-no-data *ngIf="noSubEntity"></app-no-data>
+    </div>
+  </div>
+</ion-content>
+<ion-footer>
+  <div class="footer-btn" (click)="addEntity()">{{'FRMELEMNTS_LBL_ADD_ENTITY' | translate}}
+  </div>
+</ion-footer>
\ No newline at end of file
diff --git a/src/app/manage-learn/project/add-entity/add-entity.component.scss b/src/app/manage-learn/project/add-entity/add-entity.component.scss
new file mode 100644
index 000000000..5e0247cf7
--- /dev/null
+++ b/src/app/manage-learn/project/add-entity/add-entity.component.scss
@@ -0,0 +1,29 @@
+@import "../../../../assets/styles/variables";
+@import "../../../../assets/styles/base/variables";
+
+.entity-name{
+    text-align: center;
+    color: var(--ion-color-primary);
+    text-transform: capitalize;
+}
+.enitity-list{
+    ion-label{
+        text-overflow: unset;
+        white-space: normal;
+    }
+    ion-checkbox{
+        margin-right: 15px;
+    }
+}
+.footer-btn{
+    text-align: center;
+    padding: 15px;
+    background:$primary-color;
+    color: $white;
+   }
+   .loadmore-btn{
+    text-align: center;
+    ion-button{
+        --border-radius:50px;
+    }
+}
diff --git a/src/app/manage-learn/project/add-entity/add-entity.component.ts b/src/app/manage-learn/project/add-entity/add-entity.component.ts
new file mode 100644
index 000000000..983682c79
--- /dev/null
+++ b/src/app/manage-learn/project/add-entity/add-entity.component.ts
@@ -0,0 +1,175 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { ModalController } from '@ionic/angular';
+import { LoaderService, LocalStorageService, NetworkService, ToastService, UtilsService } from '../../core';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { KendraApiService } from '../../core/services/kendra-api.service';
+import * as _ from 'underscore';
+
+@Component({
+   selector: 'app-add-entity',
+   templateUrl: './add-entity.component.html',
+   styleUrls: ['./add-entity.component.scss'],
+})
+export class AddEntityComponent implements OnInit {
+   subEntities;
+   noSubEntity: boolean = false;
+   entities = [];
+   page = 1;
+   limit = 20;
+   childEntity;
+   searchText = "";
+   profileData;
+   stateId;
+   selectedEntity;
+   title;
+   entityCount
+   @Input() entityType: any;
+   constructor(
+      private loader: LoaderService,
+      private toast: ToastService,
+      private storage: LocalStorageService,
+      private kendraApiService: KendraApiService,
+      private modalCtrl: ModalController,
+      private networkService: NetworkService,
+      private utils: UtilsService
+   ) {
+      this.onSearch = _.debounce(this.onSearch, 500);
+   }
+
+   ngOnInit() {
+      this.checkUserMapping();
+   }
+
+   selectEntity(event) {
+      this.selectedEntity = event;
+   }
+   selectSubEntity(subEntity) {
+      this.childEntity = subEntity.detail.value;
+      this.entities = [];
+      this.page = 1;
+      this.getEntities(subEntity.detail.value);
+   }
+   getEntities(entityType) {
+      if (this.networkService.isNetworkAvailable) {
+         // this.loader.startLoader();
+         const config = {
+            url:
+               urlConstants.API_URLS.GET_ENTITY_LIST +
+               this.stateId +
+               "?type=" +
+               entityType +
+               "&search=" +
+               this.searchText +
+               "&page=" +
+               this.page +
+               "&limit=" +
+               this.limit,
+         };
+         this.kendraApiService.get(config).subscribe(
+            (data) => {
+               // this.loader.stopLoader();
+               if (data.result.data && data.result.data.length) {
+                  this.entities = this.entities.concat(data.result.data);
+                  this.entityCount = data.result.count;
+                  this.noSubEntity = false;
+               } else {
+                  this.noSubEntity = true;
+               }
+            },
+            (error) => {
+               // this.loader.stopLoader();
+            }
+         );
+      } else {
+         this.toast.showMessage("FRMELEMNTS_MSG_YOU_ARE_WORKING_OFFLINE_TRY_AGAIN", "danger");
+      }
+   }
+   checkUserMapping() {
+      // this.storage.getLocalStorage("profileData").then((data) => {
+      //    this.profileData = data;
+      //    this.stateId = this.profileData.state._id;
+      //    this.title = this.profileData.state.name;
+      //    this.getSubEntities(this.profileData.state._id);
+      // });
+
+      this.utils.getProfileData().then(profileData => {
+         this.profileData = profileData;
+         this.stateId = this.profileData.state;
+         this.getSubEntities(this.stateId);
+      }).catch(error => {
+
+      })
+
+   }
+
+   loadMoreEntities() {
+      this.page++;
+      this.getEntities(this.childEntity);
+   }
+   getSubEntities(stateId) {
+      // to select entityType if already provided
+      if (this.entityType) {
+         let selist = [];
+         let entity = {
+            name: this.entityType,
+            value: this.entityType,
+         };
+         selist.push(entity);
+         this.subEntities = selist.reverse();
+         // this.selectedEntity = this.subEntities[0];
+         this.childEntity = this.subEntities[0].value;
+         this.getEntities(this.subEntities[0].value);
+
+         return
+      }
+
+      if (this.networkService.isNetworkAvailable) {
+         // this.loader.startLoader();
+         const config = {
+            url:urlConstants.API_URLS.GET_SUB_ENITIES_FOR_ROLES+stateId+`?role=${this.profileData.role}`
+         };
+         this.kendraApiService.get(config).subscribe(
+            (data) => {
+               // this.loader.stopLoader();
+               if (data.result) {
+                  let selist = [];
+                  data.result.forEach((se) => {
+                     let entity = {
+                        name: se,
+                        value: se,
+                     };
+                     selist.push(entity);
+                  });
+                  this.subEntities = selist.reverse();
+                  // this.selectedEntity = this.subEntities[0];
+                  this.childEntity = this.subEntities[0].value;
+                  this.getEntities(this.subEntities[0].value);
+               }
+            },
+            (error) => {
+               // this.loader.stopLoader();
+            }
+         );
+      } else {
+         this.toast.showMessage("FRMELEMNTS_MSG_YOU_ARE_WORKING_OFFLINE_TRY_AGAIN", "danger");
+      }
+   }
+
+   onSearch(event) {
+      this.entities = [];
+      this.page = 1;
+      this.searchText = event.detail ? event.detail.data : "";
+      if (event.detail && event.detail.data == null) {
+         this.searchText = "";
+      }
+      this.getEntities(this.childEntity);
+   }
+   close() {
+      this.modalCtrl.dismiss();
+   }
+   addEntity() {
+      if (this.selectedEntity) {
+         this.modalCtrl.dismiss(this.selectedEntity);
+      }
+   }
+}
diff --git a/src/app/manage-learn/project/add-programs/add-programs.component.html b/src/app/manage-learn/project/add-programs/add-programs.component.html
new file mode 100644
index 000000000..d87038b10
--- /dev/null
+++ b/src/app/manage-learn/project/add-programs/add-programs.component.html
@@ -0,0 +1,32 @@
+<ion-toolbar>
+  <ion-title>
+    {{title | translate}}
+  </ion-title>
+  <ion-buttons (click)="close()" slot="start" class="padding">
+    <ion-icon name="arrow-back" slot="icon-only" style="padding-left: 10px;"></ion-icon>
+  </ion-buttons>
+</ion-toolbar>
+<ion-content class="ion-padding">
+  <ion-button color="primary" expand="block" (click)="createProgram()" *ngIf="type== 'programs'">
+    {{'FRMELEMNTS_LBL_CREATE_NEW_PROGRAM' | translate}}
+  </ion-button>
+  <ion-list>
+    <ion-radio-group>
+      <ion-item *ngFor="let data of dataList">
+        <ion-label>{{data.name}}</ion-label>
+        <ion-radio slot="start" value="{{data._id}}" (click)="selectProgram(data)"></ion-radio>
+      </ion-item>
+    </ion-radio-group>
+  </ion-list>
+  <!-- <ion-list>
+    <ion-item *ngFor="let program of dataList">
+      <ion-label>{{program.name}}</ion-label>
+      <ion-radio slot="start" [value]="program._id" ></ion-radio>
+    </ion-item>
+  </ion-list> -->
+</ion-content>
+<ion-footer *ngIf="dataList">
+  <ion-button expand="block" (click)="addProgram()">
+    {{button | translate}}
+  </ion-button>
+</ion-footer>
\ No newline at end of file
diff --git a/src/app/manage-learn/project/add-programs/add-programs.component.scss b/src/app/manage-learn/project/add-programs/add-programs.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/project/add-programs/add-programs.component.ts b/src/app/manage-learn/project/add-programs/add-programs.component.ts
new file mode 100644
index 000000000..c5eda3a59
--- /dev/null
+++ b/src/app/manage-learn/project/add-programs/add-programs.component.ts
@@ -0,0 +1,98 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { AlertController, ModalController } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+import { HttpClient } from '@angular/common/http';
+import { LoaderService, UtilsService } from '../../core';
+import { KendraApiService } from '../../core/services/kendra-api.service';
+import { urlConstants } from '../../core/constants/urlConstants';
+
+@Component({
+  selector: 'app-add-programs',
+  templateUrl: './add-programs.component.html',
+  styleUrls: ['./add-programs.component.scss'],
+})
+export class AddProgramsComponent implements OnInit {
+  dataList;
+  selectedData;
+  button = "FRMELEMNTS_BTN_ADD_PROGRAM";
+  title = "FRMELEMNTS_LBL_MY_PROGRAMS";
+  type;
+  constructor(
+    private alertCtrl: AlertController,
+    private modal: ModalController,
+    private translate: TranslateService,
+    private http: HttpClient,
+    private loaderService: LoaderService,
+    private kendraApiService: KendraApiService,
+    private utils: UtilsService
+
+  ) { }
+  ngOnInit() {
+    this.getPrograms();
+  }
+
+  async getPrograms() {
+    this.loaderService.startLoader();
+    const config = {
+      url: urlConstants.API_URLS.PRIVATE_PROGRAMS,
+    }
+    this.kendraApiService.get(config).subscribe(data => {
+      this.loaderService.stopLoader();
+      if (data.result && data.result.length) {
+        this.dataList = data.result;
+      }
+    }, error => {
+      this.loaderService.stopLoader();
+    })
+  }
+  async createProgram() {
+    let text;
+    this.translate.get(['FRMELEMNTS_LBL_CREATE_PROGRAM', 'FRMELEMNTS_MSG_CREATE_PROGRAM_MESSAGE', 'CANCEL', 'FRMELEMNTS_BTN_SAVE', 'FRMELEMNTS_LBL_CREATE_PROGRAM_INPUT_PLACEHOLDER', 'FRMELEMNTS_LBL_CREATE_PROGRAM_INPUT_NAME']).subscribe(data => {
+      text = data;
+    })
+    const alert = await this.alertCtrl.create({
+      cssClass: 'my-custom-class',
+      header: text['FRMELEMNTS_LBL_CREATE_PROGRAM'],
+      message: text['FRMELEMNTS_MSG_CREATE_PROGRAM_MESSAGE'],
+      inputs: [
+        {
+          name: 'name',
+          type: 'text',
+          placeholder: text['FRMELEMNTS_LBL_CREATE_PROGRAM_INPUT_PLACEHOLDER']
+        }
+      ],
+      buttons: [
+        {
+          text: text['CANCEL'],
+          role: 'cancel',
+          cssClass: 'secondary',
+          handler: (blah) => {
+          }
+        }, {
+          text: text['FRMELEMNTS_BTN_SAVE'],
+          handler: (data) => {
+            data.name = data.name.trim();
+            if (data.name || data.name != "") {
+              data.created = true;
+              data.isAPrivateProgram = true;
+              this.selectedData = data;
+              this.close(this.selectedData);
+            }
+          }
+        }
+      ]
+    });
+    await alert.present();
+  }
+  selectProgram(data) {
+    this.selectedData = data;
+  }
+  close(data?) {
+    this.modal.dismiss(data);
+  }
+  addProgram() {
+    if (this.selectedData) {
+      this.close(this.selectedData);
+    }
+  }
+}
diff --git a/src/app/manage-learn/project/attachment-list/attachment-list.page.html b/src/app/manage-learn/project/attachment-list/attachment-list.page.html
new file mode 100644
index 000000000..a9df313cb
--- /dev/null
+++ b/src/app/manage-learn/project/attachment-list/attachment-list.page.html
@@ -0,0 +1,51 @@
+<ion-content *ngIf="project">
+  <ion-segment (ionChange)="segmentChanged($event)" value="{{tabs[0].value}}">
+    <ion-segment-button value="{{tab.value}}" *ngFor="let tab of tabs" class="no-text-transform">
+      <ion-label>{{tab.name | translate}}</ion-label>
+    </ion-segment-button>
+  </ion-segment>
+  <div *ngIf="attachments?.length">
+    <div [ngSwitch]="type">
+      <div *ngSwitchCase="'images'">
+        <div *ngFor="let task of attachments">
+          <ion-card class="attachments-card" *ngIf="task?.attachments?.length">
+            <ion-card-header class="project-card _capitalize">
+              {{task.taskName}}
+            </ion-card-header>
+            <ion-card-content>
+              <ion-row>
+                <ion-col size="6" *ngIf="task?.remarks">
+                  {{task.remarks}}
+                </ion-col>
+                <ion-col size="6" *ngFor="let attachment of task.attachments">
+                  <img [src]="getImgContent(attachment?.localUrl)"
+                    *ngIf="attachment.type.includes('image') && !attachment.url" />
+                    <!-- *ngIf="attachment.type == 'image/jpeg' && !attachment.url" /> -->
+                  <ion-icon name="image-outline" *ngIf="attachment.url" style="display: contents;"
+                    (click)="openImage(attachment.url)"></ion-icon>
+                </ion-col>
+              </ion-row>
+            </ion-card-content>
+          </ion-card>
+        </div>
+      </div>
+      <div *ngSwitchCase="'files'">
+        <div *ngFor="let task of attachments">
+          <ion-card class="attachments-card" *ngIf="task?.attachments?.length">
+            <ion-card-header class="project-card _capitalize">
+              {{task.taskName}}
+            </ion-card-header>
+            <ion-card-content>
+              <ion-list *ngFor="let attachment of task.attachments" (click)="viewDocument(attachment)">
+                <h5 *ngIf="attachment.type == 'application/pdf'">{{attachment.name}} </h5>
+              </ion-list>
+            </ion-card-content>
+          </ion-card>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div *ngIf="!attachments?.length">
+    <app-no-data></app-no-data>
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/app/manage-learn/project/attachment-list/attachment-list.page.scss b/src/app/manage-learn/project/attachment-list/attachment-list.page.scss
new file mode 100644
index 000000000..cf8ecff8a
--- /dev/null
+++ b/src/app/manage-learn/project/attachment-list/attachment-list.page.scss
@@ -0,0 +1,13 @@
+@import "../../../../assets/styles/variables";
+@import "../../../../assets/styles/base/variables";
+.attachments-card{
+    border-radius: 16px;
+    background: $white-color;
+   ion-card-header{
+    font-size: 18px;
+    border-bottom: 1px solid $gray-200;
+    margin: 10px;
+    padding: 5px;
+    font-weight: 500;
+   }
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/project/attachment-list/attachment-list.page.ts b/src/app/manage-learn/project/attachment-list/attachment-list.page.ts
new file mode 100644
index 000000000..ee3d9eb1d
--- /dev/null
+++ b/src/app/manage-learn/project/attachment-list/attachment-list.page.ts
@@ -0,0 +1,162 @@
+import { Component, OnInit } from '@angular/core';
+import { AppHeaderService } from '@app/services';
+import { DbService } from '../../core/services/db.service';
+import { Platform } from "@ionic/angular";
+import { File } from "@ionic-native/file/ngx";
+import { DomSanitizer } from "@angular/platform-browser";
+import { Subscription } from 'rxjs';
+import { Location } from '@angular/common';
+import { TranslateService } from '@ngx-translate/core';
+import { FileTransfer, FileTransferObject } from '@ionic-native/file-transfer/ngx';
+import { FileOpener } from '@ionic-native/file-opener/ngx';
+import { PhotoViewer } from '@ionic-native/photo-viewer/ngx';
+import { ActivatedRoute } from '@angular/router';
+
+@Component({
+  selector: 'app-attachment-list',
+  templateUrl: './attachment-list.page.html',
+  styleUrls: ['./attachment-list.page.scss'],
+})
+export class AttachmentListPage implements OnInit {
+  private backButtonFunc: Subscription;
+  headerConfig = {
+    showHeader: true,
+    showBurgerMenu: false,
+    pageTitle: '',
+    actionButtons: []
+  };
+  private win: any = window;
+  attachments = [];
+  projectId;
+  path;
+  type = "images";
+  tabs = [
+    {
+      name: "FRMELEMNTS_LBL_IMAGES",
+      value: "images",
+      type: 'image/jpeg'
+    },
+    {
+      name: "FRMELEMNTS_LBL_FILES",
+      value: "files",
+      type: "application/pdf"
+    }
+  ];
+  project;
+  projectcopy;
+  constructor(
+    private db: DbService,
+    private platform: Platform,
+    private file: File,
+    private sanitizer: DomSanitizer,
+    private location: Location,
+    private headerService: AppHeaderService,
+    private translate: TranslateService,
+    public transfer: FileTransfer,
+    public fileOpener: FileOpener,
+    private photoViewer: PhotoViewer,
+    private routeParam: ActivatedRoute
+  ) {
+    routeParam.params.subscribe(parameters => {
+      this.projectId = parameters.id;
+      this.getAttachments(this.tabs[0]);
+    })
+  }
+
+  ngOnInit() {
+    this.path = this.platform.is("ios") ? this.file.documentsDirectory : this.file.externalDataDirectory;
+  }
+  ionViewWillEnter() {
+    let data;
+    this.translate.get(["FRMELEMNTS_LBL_ATTACHMENTS"]).subscribe((text) => {
+      data = text;
+    });
+    this.headerConfig = this.headerService.getDefaultPageConfig();
+    this.headerConfig.actionButtons = [];
+    this.headerConfig.showHeader = true;
+    this.headerConfig.showBurgerMenu = false;
+    this.headerConfig.pageTitle = data["FRMELEMNTS_LBL_ATTACHMENTS"];
+    this.headerService.updatePageConfig(this.headerConfig);
+    this.handleBackButton();
+  }
+  private handleBackButton() {
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
+      this.location.back();
+      this.backButtonFunc.unsubscribe();
+    });
+  }
+
+  segmentChanged(event) {
+    this.type = event.detail.value;
+    this.getAttachments(this.type === 'images' ? this.tabs[0] : this.tabs[1])
+  }
+  getAttachments(tab) {
+    this.attachments = [];
+    this.db.query({ _id: this.projectId }).then(success => {
+      this.project = success.docs.length ? success.docs[0] : {};
+      this.projectcopy = { ...this.project }
+      if (this.project.tasks && this.project.tasks.length) {
+        for (const task of this.project.tasks) {
+          const attachments = []
+          if (!task.isDeleted) {
+            if (task.attachments && task.attachments.length) {
+              for (const element of task.attachments) {
+                // if (element.type === tab.type) {
+                if (compare(element.type, tab.type)) {
+                  element.localUrl = this.win.Ionic.WebView.convertFileSrc(
+                    this.platform.is("ios")
+                      ? this.file.documentsDirectory
+                      : this.file.externalDataDirectory + element.name
+                  );
+                  attachments.push(element);
+                }
+              }
+              if (attachments.length) {
+                let attachmentObj = {
+                  taskName: task.name,
+                  remarks: task.remarks,
+                  attachments: attachments
+                }
+                this.attachments.push({ ...attachmentObj });
+              }
+
+            }
+          }
+        };
+      }
+      function compare(fileType, tabType): boolean {
+        tabType = tabType.substr(0, tabType.indexOf("/"));
+        fileType = fileType.substr(0, fileType.indexOf("/"));
+        return tabType == fileType;
+      }
+    }, error => {
+    })
+  }
+
+  getImgContent(file) {
+    return this.sanitizer.bypassSecurityTrustUrl(file);
+  }
+
+  viewDocument(attachment) {
+    if (attachment.url) {
+      this.downloadFile(attachment);
+    } else {
+      this.openFile(attachment);
+    }
+  }
+  downloadFile(attachment) {
+    const fileTransfer: FileTransferObject = this.transfer.create();
+    fileTransfer.download(attachment.url, this.path + '/' + attachment.name).then(success => {
+      this.openFile(attachment)
+    }).catch(error => {
+    });
+  }
+  openImage(attachment) {
+    this.photoViewer.show(attachment)
+  }
+  openFile(attachment) {
+    this.fileOpener.open(this.path + '/' + attachment.name, attachment.type)
+      .then(() => { console.log('File is opened'); })
+      .catch(e => console.log('Error opening file', e));
+  }
+}
diff --git a/src/app/manage-learn/project/category-select/category-select.component.html b/src/app/manage-learn/project/category-select/category-select.component.html
new file mode 100644
index 000000000..3ca3e8c27
--- /dev/null
+++ b/src/app/manage-learn/project/category-select/category-select.component.html
@@ -0,0 +1,41 @@
+<ion-content>
+  <div class="custom-popup">
+    <div class="pop-container" *ngIf="catgeoryForm">
+      <h5 style="text-align: center;">{{'FRMELEMNTS_LBL_CATEGORIES' | translate}}</h5>
+      <form [formGroup]="catgeoryForm">
+        <div *ngFor="let data of categoryData">
+          <div *ngIf="data.input == 'select'">
+            <ion-list>
+              <ion-item *ngFor="let category of data.options" (ionChange)="categorySelect($event,category)">
+                <ion-checkbox slot="start" [checked]="category.isChecked" value="{{category.value}}"
+                  (ionChange)="categorySelect($event,category)">
+                </ion-checkbox>
+                <ion-label> {{(category?.labelTranslations?category?.labelTranslations: category?.name || category?.label)| translateJson}}</ion-label>
+              </ion-item>
+            </ion-list>
+
+          </div>
+          <ion-item *ngIf="data.input == 'text' && data.show">
+            <ion-input type="text" name="{{data.field}}" placeholder="{{'FRMELEMNTS_LBL_SPECIFY_OTHER' | translate}}"
+              [formControlName]="data.field" value="{{data.value}}"></ion-input>
+          </ion-item>
+        </div>
+      </form>
+
+    </div>
+  </div>
+</ion-content>
+<ion-footer>
+  <ion-row>
+    <ion-col size="6">
+      <ion-button (click)="close()" expand="block">
+        {{'CANCEL' | translate}}
+      </ion-button>
+    </ion-col>
+    <ion-col size="6">
+      <ion-button (click)="submit()" expand="block">
+        {{'FRMELEMNTS_BTN_SUBMIT' | translate}}
+      </ion-button>
+    </ion-col>
+  </ion-row>
+</ion-footer>
\ No newline at end of file
diff --git a/src/app/manage-learn/project/category-select/category-select.component.scss b/src/app/manage-learn/project/category-select/category-select.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/project/category-select/category-select.component.ts b/src/app/manage-learn/project/category-select/category-select.component.ts
new file mode 100644
index 000000000..86dcaa484
--- /dev/null
+++ b/src/app/manage-learn/project/category-select/category-select.component.ts
@@ -0,0 +1,155 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { FormGroup, FormControl, Validators, FormBuilder } from '@angular/forms';
+import { ModalController } from '@ionic/angular';
+import { ToastService } from '../../core';
+import * as _ from 'underscore';
+
+@Component({
+  selector: 'app-category-select',
+  templateUrl: './category-select.component.html',
+  styleUrls: ['./category-select.component.scss'],
+})
+export class CategorySelectComponent implements OnInit {
+  @Input() categories;
+  @Input() selectedCategories = [];
+  @Output() onSubmit = new EventEmitter();
+  catgeoryForm: FormGroup;
+  categoryData = [];
+  otherCategoryValue;
+  otherCategory = { input: 'text', field: 'otherCategories', value: '', show: false, validation: { required: true } };
+ constructor(
+    public fb: FormBuilder,
+    public toast: ToastService,
+    private modal: ModalController
+  ) { }
+  ngOnInit() {
+    let other;
+    if( this.selectedCategories){
+      other = this.selectedCategories.filter(obj1 => {
+        return !this.categories.options.find((s) => s.label == obj1.label);
+     })[0]
+     this.selectedCategories.map(c => {
+      if (c.label && other && other.label && c.label == other.label) {
+        c.value = other.label
+        c.label = "Others"
+      }
+    })
+    }
+   
+    this.categoryData.push(this.categories);
+    this.categoryData.push(this.otherCategory);
+    if (this.selectedCategories.length) {
+      this.selectedCategories.forEach(selctedCatgory => {
+        if (selctedCatgory.label == "Others") {
+          this.otherCategory.value = selctedCatgory.value;
+          this.otherCategory.show = true;
+        }
+      })
+      this.validateOptions();
+      console.log(this.selectedCategories)
+    } else {
+      
+      this.prepareForm();
+      console.log(this.selectedCategories)
+    }
+  }
+  public prepareForm() {
+    const controls = {};
+    const validationsArray = [];
+    this.categoryData.forEach(element => {
+      if (element.field == 'otherCategories') {
+        if (element.validation.required) {
+          element.validation.name = "required",
+            validationsArray.push(
+              Validators.required
+            );
+        }
+        controls[element.field] = new FormControl(element.value||'', validationsArray);
+      }
+    })
+    this.catgeoryForm = this.fb.group(
+      controls
+    );
+  }
+  validateOptions() {
+
+    // this.categoryData.forEach(cd => {
+    //   if (cd.input == 'select') {
+    //     cd.options.forEach(element => {
+    //       let index = _.findIndex(this.selectedCategories, (item) => {
+    //         return item.label == element.label;
+    //       });
+    //       if (index > -1) {
+    //         cd.options[index].isChecked = true;
+    //       }
+    //     });
+    //   }
+    // });
+
+    for (const cd of this.categoryData) {
+      if (cd.input == 'select') {
+        for (const category of this.selectedCategories) {
+          let index = _.findIndex(cd.options, { value: category.value });
+          index = index <= -1 ? _.findIndex(cd.options, { _id: category.value }) : index
+          if (index > -1) {
+            cd.options[index].isChecked = true;
+          }
+        }
+      }
+    }
+    this.selectedCategories.forEach(option => {
+      if (option.label == "Others") {
+        this.otherCategory.show = true;
+
+        // added to show others if selected 
+        this.categoryData[0].options.map((o) => {
+          if (o.label == "Others") {
+            o.isChecked = true
+          }
+        });
+
+        //
+      }
+    });
+    this.prepareForm();
+  }
+  categorySelect(event, option) {
+    if (option.label == "Others") {
+      this.categoryData.forEach(data => {
+        if (data.field == 'otherCategories') {
+          data.show = event.detail.checked;
+          data.value = '';
+        }
+      })
+    }
+    option.isChecked = event.detail.checked;
+  }
+
+  submit() {
+    let valid = true;
+    this.selectedCategories = [];
+    this.categoryData.forEach(element => {
+      if (element.input == 'select') {
+        element.options.forEach(option => {
+          if (option.isChecked) {
+            if (option.value == "others") {
+              if (this.catgeoryForm.value.otherCategories) {
+                option.value = this.catgeoryForm.value.otherCategories;
+              } else {
+                valid = false;
+              }
+            } else {
+              option.name = option.label;
+            }
+            this.selectedCategories.push(option);
+          }
+        });
+      }
+    });
+    valid ? this.modal.dismiss(this.selectedCategories) : this.toast.showMessage('FRMELEMNTS_LBL_PLEASE_ADD_OTHERCATEGORIES', 'danger')
+  }
+  close() {
+    // this.onSubmit.emit();
+    this.modal.dismiss()
+  }
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/project/create-project/create-project.page.html b/src/app/manage-learn/project/create-project/create-project.page.html
new file mode 100644
index 000000000..d23315198
--- /dev/null
+++ b/src/app/manage-learn/project/create-project/create-project.page.html
@@ -0,0 +1,82 @@
+<ion-toolbar class="ion-padding-start">
+  <ion-title></ion-title>
+  <ion-buttons (click)="confirmToClose() " slot="start" class="padding">
+    <ion-icon name="close" slot="icon-only"></ion-icon>
+  </ion-buttons>
+</ion-toolbar>
+
+<ion-content class="ion-padding">
+  <div *ngIf="projectForm" class="project-form">
+    <form [formGroup]="projectForm">
+      <div *ngFor="let data of projectFormData">
+        <div *ngIf="!data.taskData">
+          <ion-item *ngIf="data.input != 'select'">
+            <ion-label class="font-bold"> {{(data?.labelTranslations?data?.labelTranslations:data.label) | translateJson}} <sup *ngIf="data.validation.required" data>*</sup> </ion-label>
+            <ion-label position="floating" class="label-hint"> {{(data.hintTranslations? data.hintTranslations: data.hint)  | translateJson}} </ion-label>
+            <ion-input type="text" required="{{data.validation.required}}" *ngIf="data.input == 'text'"
+              [formControlName]="data.field" name="{{data.field}}" (ionInput)="onKeyPress($event,data)"> </ion-input>
+            <ion-textarea type="text" required="{{data.validation.required}}" *ngIf="data.input == 'textarea'"
+              name="{{data.field}}" [formControlName]="data.field">
+            </ion-textarea>
+          </ion-item>
+          <div *ngIf="data.input == 'select'" style="margin: 15px 10px;">
+            <ion-label class="font-bold"> {{(data?.labelTranslations?data?.labelTranslations:data.label) | translateJson}} <sup>*</sup> </ion-label>
+            <p class="label-hint"> {{(data.hintTranslations? data?.hintTranslations: data.hint)  | translateJson}} </p>
+            <ion-item (click)="openCategoryModal(data)" *ngIf="!selectedCategories?.length">
+              <ion-icon name="pricetag-outline" slot="start" style="margin: 0px 15px 0 -15px;"></ion-icon>
+              <div> {{'FRMELEMNTS_LBL_SELECT_CATEGORIES' | translate}} </div>
+            </ion-item>
+            <div *ngIf="selectedCategories?.length">
+              <ion-chip (click)="openCategoryModal(data)" color="primary">
+                <ion-icon name="add-circle"></ion-icon>
+                <ion-label>{{'FRMELEMNTS_LBL_SELECT_CATEGORIES' | translate}}</ion-label>
+              </ion-chip>
+              <ion-chip *ngFor="let category of selectedCategories">
+                <ion-label *ngIf="category.label != 'Others'">{{(category?.labelTranslations?category?.labelTranslations: category?.name || category?.label)| translateJson}}</ion-label>
+                <ion-label *ngIf="category.label == 'Others'">{{category.value}}</ion-label>
+                <ion-icon name="close-circle" (click)="confirmToDelete(category,'category')"></ion-icon>
+              </ion-chip>
+            </div>
+          </div>
+        </div>
+
+      </div>
+      <!-- <div *ngIf="tasks?.length && showTask">
+        <ion-card *ngFor="let task of tasks" class="data-list">
+          <ion-item lines="none">
+            {{task.name}}
+            <ion-icon name="close-outline" slot="end" class="remove-icon" (click)="confirmToDelete(task,'task')">
+            </ion-icon>
+          </ion-item>
+        </ion-card>
+      </div> -->
+      <div *ngIf="showTask">
+        <ion-label class="task-board">
+          <h5>{{'DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOK' | translate}} </h5>
+        </ion-label>
+        <ion-card *ngFor="let task of tasks">
+          <ion-item lines="none">
+            {{task.name}}
+            <ion-icon name="close" slot="start" class="remove-icon" (click)="confirmToDelete(task,'task')">
+            </ion-icon>
+          </ion-item>
+        </ion-card>
+        <app-item-list-card title="{{'FRMELEMNTS_LBL_CREATE_TASKS_FOR_PROJECT' | translate}}" class="create_header"
+          (cardSelect)="openCreateTaskAction()">
+          <ion-icon class="mg-popup-btn-icon" ios="ios-add" md="md-add" add></ion-icon>
+        </app-item-list-card>
+      </div>
+    </form>
+  </div>
+  <!-- <div *ngIf="showCategories">
+    <app-category-select [categories]="categories" [selectedCategories]="selectedCategories"
+      (onSubmit)="selectCategories($event)">
+    </app-category-select>
+  </div> -->
+</ion-content>
+<ion-footer>
+  <ion-button (click)="next()" expand="block"
+    [disabled]="!this.projectForm?.value?.description || !this.projectForm?.value?.title || !this.selectedCategories?.length">
+    {{button | translate}}
+  </ion-button>
+</ion-footer>
\ No newline at end of file
diff --git a/src/app/manage-learn/project/create-project/create-project.page.scss b/src/app/manage-learn/project/create-project/create-project.page.scss
new file mode 100644
index 000000000..f2309cac4
--- /dev/null
+++ b/src/app/manage-learn/project/create-project/create-project.page.scss
@@ -0,0 +1,14 @@
+.create_header ::ng-deep .title.w-90 {
+    color:black;
+  }
+  .remove-icon{
+    margin-top: -10px;
+    margin-left: -10px;
+    font-size: 15px;
+    margin-right: 10px;
+  } 
+  .task-board{
+   h5{
+    margin-left: 10px;
+   } 
+  }
\ No newline at end of file
diff --git a/src/app/manage-learn/project/create-project/create-project.page.ts b/src/app/manage-learn/project/create-project/create-project.page.ts
new file mode 100644
index 000000000..dee151dc9
--- /dev/null
+++ b/src/app/manage-learn/project/create-project/create-project.page.ts
@@ -0,0 +1,389 @@
+import { Component, NgZone, OnInit } from '@angular/core';
+import { ModalController, AlertController, PopoverController } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+import { FormGroup, FormControl, Validators, FormBuilder } from '@angular/forms';
+import { CategorySelectComponent } from '../category-select/category-select.component';
+import { AppHeaderService } from '@app/services';
+import { Subscription } from 'rxjs';
+import { Location } from '@angular/common';
+import { Platform } from '@ionic/angular';
+import { ActivatedRoute, Router } from '@angular/router';
+import { DbService, LocalStorageService, ToastService, UtilsService } from '../../core';
+import { localStorageConstants } from '../../core/constants/localStorageConstants';
+import { RouterLinks } from '@app/app/app.constant';
+import { CreateTaskComponent } from '../../shared/components/create-task/create-task.component';
+
+@Component({
+  selector: 'app-create-project',
+  templateUrl: './create-project.page.html',
+  styleUrls: ['./create-project.page.scss'],
+})
+export class CreateProjectPage implements OnInit {
+  selectedCategories;
+  showCategories;
+  projectForm: FormGroup;
+  projectFormData;
+  showTask: boolean = false;
+  tasks = [];
+  projectId;
+  createProjectAlert;
+  hasAcceptedTAndC;
+  project;
+  parameters;
+  button = 'FRMELEMENTS_BTN_CREATE_PROJECT';
+
+  ranges = [
+    '\ud83c[\udf00-\udfff]', // U+1F300 to U+1F3FF
+    '\ud83d[\udc00-\ude4f]', // U+1F400 to U+1F64F
+    '\ud83d[\ude80-\udeff]'  // U+1F680 to U+1F6FF
+  ];
+
+  private backButtonFunc: Subscription;
+  headerConfig = {
+    showHeader: true,
+    showBurgerMenu: false,
+    actionButtons: [],
+  };
+  constructor(
+    private location: Location,
+    private modal: ModalController,
+    private alert: AlertController,
+    private alertPopup: AlertController,
+    private translate: TranslateService,
+    private fb: FormBuilder,
+    private headerService: AppHeaderService,
+    private platform: Platform,
+    private router: Router,
+    private route: ActivatedRoute,
+    private storage: LocalStorageService,
+    private db: DbService,
+    private toast: ToastService,
+    private utilsService: UtilsService,
+    private ngZone: NgZone,
+    private popoverCtrl: PopoverController
+  ) {
+    route.queryParams.subscribe((parameters) => {
+      this.hasAcceptedTAndC = parameters.hasAcceptedTAndC;  
+      if (parameters.projectId) {
+        this.parameters = parameters;
+        this.showTask = false;
+        this.button = 'FRMELEMNTS_BTN_SAVE_EDITS';
+        this.getProjectFromLocal();
+      } else {
+        this.showTask = true;
+      }
+    });
+  }
+
+  onKeyPress(event, content) {
+    let emojiRegex: any = /(?:0\u20E3|1\u20E3|2\u20E3|3\u20E3|4\u20E3|5\u20E3|6\u20E3|7\u20E3|8\u20E3|9\u20E3|#\u20E3|\*\u20E3|\uD83C(?:\uDDE6\uD83C(?:\uDDE8|\uDDE9|\uDDEA|\uDDEB|\uDDEC|\uDDEE|\uDDF1|\uDDF2|\uDDF4|\uDDF6|\uDDF7|\uDDF8|\uDDF9|\uDDFA|\uDDFC|\uDDFD|\uDDFF)|\uDDE7\uD83C(?:\uDDE6|\uDDE7|\uDDE9|\uDDEA|\uDDEB|\uDDEC|\uDDED|\uDDEE|\uDDEF|\uDDF1|\uDDF2|\uDDF3|\uDDF4|\uDDF6|\uDDF7|\uDDF8|\uDDF9|\uDDFB|\uDDFC|\uDDFE|\uDDFF)|\uDDE8\uD83C(?:\uDDE6|\uDDE8|\uDDE9|\uDDEB|\uDDEC|\uDDED|\uDDEE|\uDDF0|\uDDF1|\uDDF2|\uDDF3|\uDDF4|\uDDF5|\uDDF7|\uDDFA|\uDDFB|\uDDFC|\uDDFD|\uDDFE|\uDDFF)|\uDDE9\uD83C(?:\uDDEA|\uDDEC|\uDDEF|\uDDF0|\uDDF2|\uDDF4|\uDDFF)|\uDDEA\uD83C(?:\uDDE6|\uDDE8|\uDDEA|\uDDEC|\uDDED|\uDDF7|\uDDF8|\uDDF9|\uDDFA)|\uDDEB\uD83C(?:\uDDEE|\uDDEF|\uDDF0|\uDDF2|\uDDF4|\uDDF7)|\uDDEC\uD83C(?:\uDDE6|\uDDE7|\uDDE9|\uDDEA|\uDDEB|\uDDEC|\uDDED|\uDDEE|\uDDF1|\uDDF2|\uDDF3|\uDDF5|\uDDF6|\uDDF7|\uDDF8|\uDDF9|\uDDFA|\uDDFC|\uDDFE)|\uDDED\uD83C(?:\uDDF0|\uDDF2|\uDDF3|\uDDF7|\uDDF9|\uDDFA)|\uDDEE\uD83C(?:\uDDE8|\uDDE9|\uDDEA|\uDDF1|\uDDF2|\uDDF3|\uDDF4|\uDDF6|\uDDF7|\uDDF8|\uDDF9)|\uDDEF\uD83C(?:\uDDEA|\uDDF2|\uDDF4|\uDDF5)|\uDDF0\uD83C(?:\uDDEA|\uDDEC|\uDDED|\uDDEE|\uDDF2|\uDDF3|\uDDF5|\uDDF7|\uDDFC|\uDDFE|\uDDFF)|\uDDF1\uD83C(?:\uDDE6|\uDDE7|\uDDE8|\uDDEE|\uDDF0|\uDDF7|\uDDF8|\uDDF9|\uDDFA|\uDDFB|\uDDFE)|\uDDF2\uD83C(?:\uDDE6|\uDDE8|\uDDE9|\uDDEA|\uDDEB|\uDDEC|\uDDED|\uDDF0|\uDDF1|\uDDF2|\uDDF3|\uDDF4|\uDDF5|\uDDF6|\uDDF7|\uDDF8|\uDDF9|\uDDFA|\uDDFB|\uDDFC|\uDDFD|\uDDFE|\uDDFF)|\uDDF3\uD83C(?:\uDDE6|\uDDE8|\uDDEA|\uDDEB|\uDDEC|\uDDEE|\uDDF1|\uDDF4|\uDDF5|\uDDF7|\uDDFA|\uDDFF)|\uDDF4\uD83C\uDDF2|\uDDF5\uD83C(?:\uDDE6|\uDDEA|\uDDEB|\uDDEC|\uDDED|\uDDF0|\uDDF1|\uDDF2|\uDDF3|\uDDF7|\uDDF8|\uDDF9|\uDDFC|\uDDFE)|\uDDF6\uD83C\uDDE6|\uDDF7\uD83C(?:\uDDEA|\uDDF4|\uDDF8|\uDDFA|\uDDFC)|\uDDF8\uD83C(?:\uDDE6|\uDDE7|\uDDE8|\uDDE9|\uDDEA|\uDDEC|\uDDED|\uDDEE|\uDDEF|\uDDF0|\uDDF1|\uDDF2|\uDDF3|\uDDF4|\uDDF7|\uDDF8|\uDDF9|\uDDFB|\uDDFD|\uDDFE|\uDDFF)|\uDDF9\uD83C(?:\uDDE6|\uDDE8|\uDDE9|\uDDEB|\uDDEC|\uDDED|\uDDEF|\uDDF0|\uDDF1|\uDDF2|\uDDF3|\uDDF4|\uDDF7|\uDDF9|\uDDFB|\uDDFC|\uDDFF)|\uDDFA\uD83C(?:\uDDE6|\uDDEC|\uDDF2|\uDDF8|\uDDFE|\uDDFF)|\uDDFB\uD83C(?:\uDDE6|\uDDE8|\uDDEA|\uDDEC|\uDDEE|\uDDF3|\uDDFA)|\uDDFC\uD83C(?:\uDDEB|\uDDF8)|\uDDFD\uD83C\uDDF0|\uDDFE\uD83C(?:\uDDEA|\uDDF9)|\uDDFF\uD83C(?:\uDDE6|\uDDF2|\uDDFC)))|[\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u231A\u231B\u2328\u23CF\u23E9-\u23F3\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB-\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u261D\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2648-\u2653\u2660\u2663\u2665\u2666\u2668\u267B\u267F\u2692-\u2694\u2696\u2697\u2699\u269B\u269C\u26A0\u26A1\u26AA\u26AB\u26B0\u26B1\u26BD\u26BE\u26C4\u26C5\u26C8\u26CE\u26CF\u26D1\u26D3\u26D4\u26E9\u26EA\u26F0-\u26F5\u26F7-\u26FA\u26FD\u2702\u2705\u2708-\u270D\u270F\u2712\u2714\u2716\u271D\u2721\u2728\u2733\u2734\u2744\u2747\u274C\u274E\u2753-\u2755\u2757\u2763\u2764\u2795-\u2797\u27A1\u27B0\u27BF\u2934\u2935\u2B05-\u2B07\u2B1B\u2B1C\u2B50\u2B55\u3030\u303D\u3297\u3299]|\uD83C[\uDC04\uDCCF\uDD70\uDD71\uDD7E\uDD7F\uDD8E\uDD91-\uDD9A\uDE01\uDE02\uDE1A\uDE2F\uDE32-\uDE3A\uDE50\uDE51\uDF00-\uDF21\uDF24-\uDF93\uDF96\uDF97\uDF99-\uDF9B\uDF9E-\uDFF0\uDFF3-\uDFF5\uDFF7-\uDFFF]|\uD83D[\uDC00-\uDCFD\uDCFF-\uDD3D\uDD49-\uDD4E\uDD50-\uDD67\uDD6F\uDD70\uDD73-\uDD79\uDD87\uDD8A-\uDD8D\uDD90\uDD95\uDD96\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDEF\uDDF3\uDDFA-\uDE4F\uDE80-\uDEC5\uDECB-\uDED0\uDEE0-\uDEE5\uDEE9\uDEEB\uDEEC\uDEF0\uDEF3]|\uD83E[\uDD10-\uDD18\uDD80-\uDD84\uDDC0]/g;
+    if (event.detail) {
+      let str = event.detail.data;
+      // str = str.replace(new RegExp(this.ranges.join('|'), 'g'), '');
+      // let lastText: any = str.length - 1;
+      if (str.match(emojiRegex, '')) {
+        str = str.slice(0, -1);
+        this.projectForm.value[content.field] = this.projectForm.value[content.field].slice(0, -1);
+        this.projectForm.value[content.field]
+      } else {
+      }
+    }
+
+  }
+  ngOnInit() {
+    this.getForm();
+  }
+  ionViewWillEnter() {
+    this.headerConfig = this.headerService.getDefaultPageConfig();
+    this.headerConfig.actionButtons = [];
+    this.headerConfig.showHeader = false;
+    this.headerConfig.showBurgerMenu = false;
+    this.headerService.updatePageConfig(this.headerConfig);
+    this.handleBackButton();
+  }
+
+  private handleBackButton() {
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
+      this.confirmToClose();
+      if (this.alert) {
+        this.alert.dismiss();
+      }
+    });
+  }
+
+  getProjectFromLocal() {
+    this.db.query({ _id: this.parameters.projectId }).then(
+      (success) => {
+        this.project = success.docs.length ? success.docs[0] : {};
+        if (this.project.categories.length) {
+          this.project.categories.forEach((element) => {
+            element.isChecked = true;
+          });
+          this.selectedCategories = this.project.categories;
+        }
+      },
+      (error) => { }
+    );
+  }
+
+  getForm() {
+    this.storage.getLocalStorage(localStorageConstants.PROJECT_META_FORM).then((projectData) => {
+      this.projectFormData = projectData;
+      this.storage.getLocalStorage(localStorageConstants.TASK_META_FORM).then((taskData) => {
+        let taskForm = {
+          taskData,
+        };
+        this.projectFormData.push(taskForm);
+        this.prepareForm();
+      });
+    });
+  }
+  public prepareForm() {
+    const controls = {};
+    this.projectFormData.forEach((res) => {
+      const validationsArray = [];
+      if (!res.taskData) {
+        if (res.field != 'categories') {
+          if (res.validation) {
+            if (res.validation.required) {
+              (res.validation.name = 'required'), validationsArray.push(Validators.required);
+            }
+            controls[res.field] = new FormControl(this.project ? this.project[res.field] : '', validationsArray);
+          }
+        }
+      } else {
+        res.taskData.forEach((element) => {
+          if (element.validation) {
+            if (element.validation.required) {
+              (element.validation.name = 'required'), validationsArray.push(Validators.required);
+            }
+            controls[element.field] = new FormControl('', validationsArray);
+          }
+        });
+      }
+    });
+    this.projectForm = this.fb.group(controls);
+  }
+  async confirmToClose() {
+    let text;
+    this.translate
+      .get([
+        'FRMELEMNTS_LBL_DISCARD_PROJECT',
+        'FRMELEMNTS_MSG_DISCARD_PROJECT',
+        'YES',
+        'NO',
+      ])
+      .subscribe((data) => {
+        text = data;
+      });
+    const alertPopup = await this.alertPopup.create({
+      cssClass: 'my-custom-class',
+      header: text['FRMELEMNTS_LBL_DISCARD_PROJECT'],
+      message: text['FRMELEMNTS_MSG_DISCARD_PROJECT'],
+      buttons: [
+        {
+          text: text['YES'],
+          role: 'cancel',
+          cssClass: 'text-transform-free',
+          handler: (blah) => {
+            this.location.back();
+            this.backButtonFunc.unsubscribe();
+          },
+        },
+        {
+          text: text['NO'],
+          cssClass: 'text-transform-free',
+          handler: () => { },
+        },
+      ],
+    });
+    await alertPopup.present();
+  }
+
+  async confirmToDelete(data, type) {
+    let text;
+    this.translate
+      .get(['FRMELEMNTS_MSG_DELETE_CONFIRM', 'CANCEL', 'FRMELEMNTS_BTN_DELETE'])
+      .subscribe((data) => {
+        text = data;
+      });
+    const deleteAlert = await this.alert.create({
+      cssClass: 'my-custom-class',
+      // header: text['LABELS.DISCARD_PROJECT'],
+      message: text['FRMELEMNTS_MSG_DELETE_CONFIRM'] + type + ' ?',
+      buttons: [
+        {
+          text: text['CANCEL'],
+          role: 'cancel',
+          cssClass: 'text-transform-free',
+          handler: (blah) => { },
+        },
+        {
+          text: text['FRMELEMNTS_BTN_DELETE'],
+          cssClass: 'text-transform-free',
+          handler: () => {
+            if (type == 'task') {
+              this.removeTask(data);
+            } else if (type == 'category') {
+              this.removeCategory(data);
+            }
+          },
+        },
+      ],
+    });
+    await deleteAlert.present();
+  }
+
+  // event trigger from category list page
+  selectCategories(data) {
+    this.selectedCategories = data;
+    this.showCategories = false;
+  }
+  removeCategory(category) {
+    const index = this.selectedCategories.indexOf(category, 0);
+    if (index > -1) {
+      this.selectedCategories.splice(index, 1);
+    }
+  }
+  removeTask(task) {
+    const index = this.tasks.indexOf(task, 0);
+    if (index > -1) {
+      this.tasks.splice(index, 1);
+    }
+  }
+
+  async openCategoryModal(categories) {
+    const modal = await this.modal.create({
+      component: CategorySelectComponent,
+      cssClass: 'transparentModal',
+      componentProps: {
+        categories: JSON.parse(JSON.stringify(categories)),
+        selectedCategories: this.selectedCategories ? JSON.parse(JSON.stringify(this.selectedCategories)) : '',
+      },
+    });
+    modal.onWillDismiss().then(({ data }) => {
+      data ? this.selectCategories(data) : null;
+    });
+    return await modal.present();
+  }
+  next() {
+    if (this.projectForm.value.description && this.projectForm.value.title && this.selectedCategories.length) {
+      delete this.projectForm.value.name;
+      this.selectedCategories.forEach((category) => {
+        'isChecked' in category ? delete category.isChecked : '';
+        if (category.label == 'Others') {
+          category.label = category.value;
+          category.value = '';
+          delete category._id;
+        } else {
+          category.value = category._id ? category._id : category.value;
+          delete category._id;
+        }
+      });
+      this.projectForm.value.categories = this.selectedCategories;
+      this.projectForm.value.hasAcceptedTAndC = this.hasAcceptedTAndC;
+      this.parameters ? this.update(this.projectForm.value) :
+        this.createProjectModal('FRMELEMNTS_LBL_PROJECT_CREATE', 'FRMELEMNTS_MSG_PROJECT_CREATED_SUCCESS', 'EDIT', 'FRMELEMNTS_LBL_CONTINUE');
+    } else {
+      this.translate.get(['FRMELEMNTS_MSG_REQUIRED_FIELDS']).subscribe((data) => {
+        this.toast.showMessage(data['FRMELEMNTS_MSG_REQUIRED_FIELDS'], 'danger');
+      });
+    }
+  }
+
+  saveTask(taskData) {
+    this.tasks.push(taskData);
+    this.translate.get(['FRMELEMNTS_MSG_TASK_ADDED_SUCCESSFULLY']).subscribe((data) => {
+      this.toast.showMessage(data['FRMELEMNTS_MSG_TASK_ADDED_SUCCESSFULLY'], 'success');
+    });
+  }
+  private async openCreateTaskAction(componentProps) {
+    const popover = await this.popoverCtrl.create({
+      component: CreateTaskComponent,
+      componentProps,
+      cssClass: 'popover-alert input-focus'
+    });
+    await popover.present();
+    popover.onWillDismiss().then(({ data }) => {
+      if (data) {
+        this.saveTask(data);
+      }
+    });
+  }
+
+
+  public saveData(data) {
+    if (!this.projectId) {
+      data.isNew = true;
+      data.tasks = this.tasks ? this.tasks : [];
+      data.isEdit = true;
+      data.isDeleted = true;
+      const modifiedData = this.utilsService.setStatusForProject(data);
+      // this.db.createPouchDB();
+      this.db
+        .create(modifiedData)
+        .then((success) => {
+          this.projectId = success.id;
+          this.ngZone.run(() =>
+            this.router.navigate([`${RouterLinks.PROJECT_OPERATION_PAGE}`, this.projectId], {
+              queryParams: { availableInLocal: true, isCreate: true }, replaceUrl: true,
+            })
+          );
+        })
+        .catch((error) => { });
+    } else {
+      this.button == 'FRMELEMNTS_BTN_SAVE_EDITS'
+        ? this.router.navigate(['menu/project-operation', this.projectId], {
+          queryParams: { createdType: 'bySelf' },
+          replaceUrl: true,
+        })
+        : this.location.back();
+    }
+  }
+
+  update(data) {
+    this.project.title = data.title;
+    this.project.description = data.description;
+    this.project.categories = data.categories;
+    this.project.isEdit = true;
+    this.db
+      .update(this.project)
+      .then((success) => {
+        this.location.back();
+      })
+      .catch((error) => { });
+  }
+
+  async createProjectModal(header, msg, button, button1) {
+    let texts;
+    this.translate.get([header, msg, button, button1]).subscribe(data => {
+      texts = data;
+    })
+    this.createProjectAlert = await this.alert.create({
+      cssClass: 'my-custom-class',
+      header: texts[header],
+      message: texts[msg],
+      backdropDismiss: false,
+      buttons: [
+        {
+          text: texts[button],
+          cssClass: 'secondary',
+          handler: (blah) => {
+          }
+        }, {
+          text: texts[button1],
+          cssClass: 'secondary',
+          handler: () => {
+            this.saveData(this.projectForm.value);
+          }
+        }
+      ]
+    });
+    await this.createProjectAlert.present();
+  }
+  ionViewWillLeave() {
+    if (this.alert) {
+      this.alert.dismiss();
+    }
+  }
+}
diff --git a/src/app/manage-learn/project/learning-resources/learning-resources.page.html b/src/app/manage-learn/project/learning-resources/learning-resources.page.html
new file mode 100644
index 000000000..a8a4e1eec
--- /dev/null
+++ b/src/app/manage-learn/project/learning-resources/learning-resources.page.html
@@ -0,0 +1,9 @@
+<ion-content *ngIf="list">
+  <ion-list *ngIf="list?.learningResources?.length">
+    <ion-item *ngFor="let resource of list.learningResources" (click)="openBodh(resource?.id)">
+      {{resource?.name}}
+      <ion-icon name="chevron-forward-outline" slot="end"></ion-icon>
+    </ion-item>
+  </ion-list>
+  <app-no-data *ngIf="!list?.learningResources?.length"></app-no-data>
+</ion-content>
diff --git a/src/app/manage-learn/project/learning-resources/learning-resources.page.scss b/src/app/manage-learn/project/learning-resources/learning-resources.page.scss
new file mode 100644
index 000000000..cbfeaeaab
--- /dev/null
+++ b/src/app/manage-learn/project/learning-resources/learning-resources.page.scss
@@ -0,0 +1,3 @@
+.resource-card{
+    padding:5px;
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/project/learning-resources/learning-resources.page.ts b/src/app/manage-learn/project/learning-resources/learning-resources.page.ts
new file mode 100644
index 000000000..c8435e5ca
--- /dev/null
+++ b/src/app/manage-learn/project/learning-resources/learning-resources.page.ts
@@ -0,0 +1,131 @@
+import { Component, OnInit, Inject } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { AppHeaderService, CommonUtilService } from "@app/services";
+import { TranslateService } from "@ngx-translate/core";
+import { LoaderService, ToastService } from "../../core";
+import { DbService } from "../../core/services/db.service";
+import { UtilsService } from "../../core/services/utils.service";
+import { ContentDetailRequest, Content, ContentService } from 'sunbird-sdk';
+import { NavigationService } from '@app/services/navigation-handler.service';
+import { Location } from '@angular/common';
+import { Subscription } from 'rxjs';
+import { Platform } from '@ionic/angular';
+
+var environment = {
+  db: {
+    projects: "project.db",
+    categories: "categories.db",
+  },
+  deepLinkAppsUrl: ''
+};
+
+@Component({
+  selector: "app-learning-resources",
+  templateUrl: "./learning-resources.page.html",
+  styleUrls: ["./learning-resources.page.scss"],
+})
+export class LearningResourcesPage implements OnInit {
+  projectId;
+  taskId: any;
+  list;
+  networkFlag: boolean;
+  private backButtonFunc: Subscription;
+  private _networkSubscription: Subscription;
+
+  private _headerConfig = {
+    showHeader: true,
+    showBurgerMenu: false,
+    pageTitle: '',
+    actionButtons: [] as string[]
+  };
+
+  constructor(
+    private routerparam: ActivatedRoute,
+    private headerService: AppHeaderService,
+    private translate: TranslateService,
+    private utils: UtilsService,
+    private loader: LoaderService,
+    private toast: ToastService,
+    private db: DbService,
+    private navigateService: NavigationService,
+    private platform: Platform,
+    private location: Location,
+    @Inject('CONTENT_SERVICE') private contentService: ContentService,
+    private commonUtilService: CommonUtilService,
+
+    // private openResources: OpenResourcesService
+  ) {
+    let data;
+    routerparam.params.subscribe((param) => {
+      this.projectId = param.id;
+      this.taskId = param.taskId;
+      this.getProjectFromLocal(this.projectId);
+    });
+    this.networkFlag = this.commonUtilService.networkInfo.isNetworkAvailable;
+    this._networkSubscription = this.commonUtilService.networkAvailability$.subscribe(async (available: boolean) => {
+      this.networkFlag = available;
+    })
+  }
+
+  ngOnInit() { }
+
+  ngOnDestroy() {
+    if(this._networkSubscription){
+      this._networkSubscription.unsubscribe();
+    }
+  }
+
+  ionViewWillEnter() {
+    let data;
+    this.translate.get(["FRMELEMNTS_LBL_LEARNING_RESOURCES"]).subscribe((text) => {
+      data = text;
+    });
+    this._headerConfig = this.headerService.getDefaultPageConfig();
+    this._headerConfig.actionButtons = [];
+    this._headerConfig.showHeader = true;
+    this._headerConfig.showBurgerMenu = false;
+    this._headerConfig.pageTitle = data["FRMELEMNTS_LBL_LEARNING_RESOURCES"];
+    this.headerService.updatePageConfig(this._headerConfig);
+    this.handleBackButton();
+  }
+
+  private handleBackButton() {
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
+      this.location.back();
+      this.backButtonFunc.unsubscribe();
+    });
+  }
+  getProjectFromLocal(projectId) {
+    // this.loader.startLoader();
+    this.db.query({ _id: projectId }).then(
+      (success) => {
+        // this.loader.stopLoader();
+        this.list = success.docs.length ? success.docs[0] : [];
+        if (this.taskId) {
+          this.list = this.list.tasks.filter((t) => t._id == this.taskId)[0];
+        }
+      },
+      (error) => {
+        // this.loader.stopLoader();
+      }
+    );
+  }
+  openBodh(id) {
+    if (!this.networkFlag) {
+      this.toast.showMessage('FRMELEMNTS_MSG_OFFLINE_SHARE_PROJECT', 'danger');
+      return
+    }
+    // let identifier = link.split("/").pop();
+    const req: ContentDetailRequest = {
+      contentId: id,
+      attachFeedback: false,
+      attachContentAccess: false,
+      emitUpdateIfAny: false
+    };
+
+    this.contentService.getContentDetails(req).toPromise()
+      .then(async (data: Content) => {
+        this.navigateService.navigateToDetailPage(data, { content: data });
+      });
+  }
+}
diff --git a/src/app/manage-learn/project/link-learning-resources/link-learning-resources.component.html b/src/app/manage-learn/project/link-learning-resources/link-learning-resources.component.html
new file mode 100644
index 000000000..b72d5d9fb
--- /dev/null
+++ b/src/app/manage-learn/project/link-learning-resources/link-learning-resources.component.html
@@ -0,0 +1,60 @@
+<ion-toolbar>
+  <ion-title>
+    {{'FRMELEMNTS_LBL_LEARNING_RESOURCES' | translate}}
+  </ion-title>
+  <ion-buttons (click)="close()" slot="start" class="padding">
+    <ion-icon name="arrow-back" slot="icon-only" style="padding-left: 10px;"></ion-icon>
+  </ion-buttons>
+</ion-toolbar>
+<ion-content *ngIf="resources">
+  <!-- <ion-item class="search-bar-custom">
+    <ion-icon name="search" item-left color="dark"></ion-icon>
+    <ion-input type="text" placeholder="{{'FRMELEMNTS_LBL_SEARCH' | translate }}" (ionInput)="search($event)">
+    </ion-input>
+  </ion-item> -->
+  <ion-searchbar debounce="1000" (ionInput)="search($event)" placeholder="{{'FRMELEMNTS_LBL_SEARCH' | translate }}">
+  </ion-searchbar>
+  <div class="ion-padding">
+    <ion-icon name="funnel" color="primary"></ion-icon> {{'FRMELEMNTS_LBL_FILTERS' | translate}} <ion-icon
+      name="chevron-forward" color="primary"></ion-icon>
+    <div class="filters">
+      <ion-button *ngFor="let filter of filters" shape="round" [color]="filter.isActive ? 'primary' : 'light'"
+        (click)="setFilter(filter);">
+        <!-- <span class="material-icons" *ngIf="filter.icon">
+          {{filter.icon}}
+        </span>  -->
+        {{filter.name}}
+      </ion-button>
+    </div>
+    <!-- <ion-row *ngFor="let data of resources" class="data-list">
+      <ion-col size="2">
+        <ion-item lines="none">
+          <ion-checkbox slot="start" ([ngModel])="data.isChecked" [checked]="data.isChecked"
+            (ionChange)="selectData(data)"></ion-checkbox>
+        </ion-item>
+      </ion-col>
+      <ion-col size="10" (ionChange)="selectData(data)">
+        <ion-item>
+          <ion-label>{{data.name}}</ion-label>
+        </ion-item>
+      </ion-col>
+    </ion-row> -->
+
+
+    <ion-item lines="none" *ngFor="let data of resources" class="data-list">
+      <ion-checkbox slot="start" ([ngModel])="data.isChecked" [checked]="data.isChecked" (ionChange)="selectData(data)">
+      </ion-checkbox>
+      <ion-label class="resources-label">{{data.name}}</ion-label>
+    </ion-item>
+
+    <div class="loadmore-btn" *ngIf="dataCount">
+      <ion-button (click)="loadMoreData()" expand="block">
+        {{'FRMELEMNTS_BTN_LOAD_MORE' | translate}}</ion-button>
+    </div>
+  </div>
+</ion-content>
+<ion-footer *ngIf="resources">
+  <ion-button expand="block" (click)="addResources()" color="primary">
+    {{'FRMELEMNTS_BTN_ATTACH' | translate}}
+  </ion-button>
+</ion-footer>
\ No newline at end of file
diff --git a/src/app/manage-learn/project/link-learning-resources/link-learning-resources.component.scss b/src/app/manage-learn/project/link-learning-resources/link-learning-resources.component.scss
new file mode 100644
index 000000000..20c44c835
--- /dev/null
+++ b/src/app/manage-learn/project/link-learning-resources/link-learning-resources.component.scss
@@ -0,0 +1,39 @@
+@import "../../../../assets/styles/variables";
+@import "../../../../assets/styles/base/variables";
+.data-list{
+  background:$white;
+    ion-checkbox{
+    margin-right: 0px;
+    }
+    ion-item{
+        --padding-start: 0px;
+    }
+}
+.search-bar-custom {
+    margin: 20px 15px 15px 15px;
+    border-radius: 20px;
+    max-height: 40px;
+    padding: 0px;
+    box-shadow: 0px 3px 5px 1px $gray;
+    ion-input{
+      --padding-bottom: 18px;
+      font-weight: 600;
+      color: $black-color;
+    }
+    ion-icon
+    {
+      margin-bottom: 10px;
+      margin-left: 20px;
+      padding-right : 10px;
+    }
+  }
+  .filters{
+    display: flex;
+    overflow: auto;
+    ion-button{
+        margin: 4px;
+    }
+  }
+  .resources-label{
+    padding-left: 15px;
+  }
\ No newline at end of file
diff --git a/src/app/manage-learn/project/link-learning-resources/link-learning-resources.component.ts b/src/app/manage-learn/project/link-learning-resources/link-learning-resources.component.ts
new file mode 100644
index 000000000..a8ceebf6c
--- /dev/null
+++ b/src/app/manage-learn/project/link-learning-resources/link-learning-resources.component.ts
@@ -0,0 +1,212 @@
+import { Component, OnInit, Input, Inject } from '@angular/core';
+import { Subscription } from 'rxjs';
+import { Platform, ModalController } from '@ionic/angular';
+import { Location } from '@angular/common';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { KendraApiService } from '../../core/services/kendra-api.service';
+import { LoaderService } from '../../core';
+import * as _ from 'underscore';
+import { ContentService, SearchType, ContentSearchResult } from 'sunbird-sdk';
+import { NavigationService } from '@app/services/navigation-handler.service';
+@Component({
+  selector: 'app-link-learning-resources',
+  templateUrl: './link-learning-resources.component.html',
+  styleUrls: ['./link-learning-resources.component.scss'],
+})
+export class LinkLearningResourcesComponent implements OnInit {
+  private backButtonFunc: Subscription;
+  selectedFilter;
+  @Input() selectedResources = [];
+  dataCount;
+  page = 0;
+  limit = 25;
+  filters;
+  resources = [];
+  searchText: any;
+
+  constructor(
+    private location: Location,
+    private platform: Platform,
+    private modal: ModalController,
+    private kendraApiService: KendraApiService,
+    private loaderService: LoaderService,
+    private navigateService: NavigationService,
+    @Inject('CONTENT_SERVICE') private contentService: ContentService
+  ) {
+    this.search = _.debounce(this.search, 500);
+  }
+
+  ngOnInit() {
+    this.getFilters();
+  }
+  ionViewWillEnter() {
+    this.handleBackButton();
+  }
+  private handleBackButton() {
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
+      this.location.back();
+      this.backButtonFunc.unsubscribe();
+    });
+  }
+  ionViewWillLeave() {
+    if (this.backButtonFunc) {
+      this.backButtonFunc.unsubscribe();
+    }
+  }
+  close() {
+    this.modal.dismiss();
+  }
+  setFilter(filter) {
+    this.filters.forEach((element: any) => {
+      element.name == filter.name ? (element.isActive = true) : (element.isActive = false);
+      if (element.isActive) {
+        this.selectedFilter = element;
+        this.page = 0;
+        this.limit = 25;
+        this.resources = [];
+        this.getLearningResources();
+      }
+    });
+  }
+
+  getFilters() {
+    this.filters = [
+      {
+        name: 'All',
+        icon: '',
+        value: [],
+      },
+    /*   {
+        name: 'Audios',
+        icon: '',
+        value: ['audio/mp3', 'audio/wav', 'audio/x-wav', 'audio/mp4', 'audio/mpeg', 'audio/ogg'],
+      }, */
+      {
+        name: 'Documents',
+        icon: 'insert_drive_file',
+        value: ['application/pdf', 'application/epub'],
+      },
+      {
+        name: 'video',
+        icon: 'play_circle_outline',
+        value: ['video/mp4', 'video/x-youtube', 'video/webm', 'video/3gpp', 'video/mpeg', 'video/quicktime'],
+      },
+      {
+        name: 'interactive',
+        icon: 'touch_app',
+        value: [
+          'application/vnd.ekstep.ecml-archive',
+          'application/vnd.ekstep.h5p-archive',
+          'application/vnd.ekstep.html-archive',
+          'application/vnd.ekstep.content-archive',
+        ],
+      },
+    ];
+    this.setFilter(this.filters[0]);
+  }
+
+
+  getLearningResources() {
+    const contentSearchCriteria = {
+      name: 'Resource',
+      source: 'web',
+      limit: this.limit,
+      searchType: SearchType.SEARCH,
+      contentTypes: ['Resource'],
+      mimeType: this.selectedFilter.value,
+      mode: 'hard',
+      offset: this.page * this.limit,
+      query: this.searchText,
+    };
+    this.loaderService.startLoader();
+
+    this.contentService
+      .searchContent(contentSearchCriteria)
+      .toPromise()
+      .then((responseData: ContentSearchResult) => {
+        this.loaderService.stopLoader();
+        console.log(responseData);
+        let data;
+        if (responseData.contentDataList) {
+          data = responseData.contentDataList.map((list) => ({ name: list.name, id: list.identifier }));
+          this.dataCount = true;
+        } else {
+          data = [];
+          this.dataCount = false;
+        }
+
+        this.selectedResources ? this.validateCheckbox(data) : (this.resources = this.resources.concat(data));
+        if (responseData.contentDataList && responseData.contentDataList.length < contentSearchCriteria.limit) {
+          this.dataCount = false;
+        }
+      })
+      .catch((err) => {
+        this.loaderService.stopLoader();
+        console.log(err);
+      });
+  }
+
+  validateCheckbox(data) {
+    this.selectedResources.forEach((selectedResource) => {
+      selectedResource.isChecked = true;
+      data.forEach((resource) => {
+        if (selectedResource.id == resource.id) {
+          resource.isChecked = true;
+        }
+      });
+    });
+    this.resources = this.resources.concat(data);
+  }
+  search(event) {
+    this.page = 0;
+    this.limit = 25;
+    this.resources = [];
+    this.searchText = event.detail.data;
+    this.getLearningResources();
+  }
+
+  loadMoreData() {
+    this.page = this.page + 1;
+    this.getLearningResources();
+  }
+
+  addResources() {
+    let selected = [];
+    this.selectedResources.forEach((list) => {
+      if (list.isChecked) {
+        selected.push(list);
+      }
+    });
+    if (selected) {
+      this.modal.dismiss(selected);
+    }
+  }
+
+  selectData(item) {
+    item.isChecked = !item.isChecked;
+    let index = _.findIndex(this.selectedResources, (resource) => {
+      return resource.id == item.id;
+    });
+    if (item.isChecked)
+      index > -1 ? (this.selectedResources[index].isChecked = item.isChecked) : this.selectedResources.push(item);
+    else this.selectedResources = this.selectedResources.filter((r) => r.id !== item.id);
+  }
+
+  openResource(link) {
+    // this.loaderService.startLoader();
+    // let identifier = link.split("/").pop();
+    // const req: ContentDetailRequest = {
+    //    contentId: identifier,
+    //    attachFeedback: false,
+    //    attachContentAccess: false,
+    //    emitUpdateIfAny: false
+    // };
+    // this.contentService.getContentDetails(req).toPromise()
+    //    .then(async (data: Content) => {
+    //       this.loaderService.stopLoader();
+    //       this.navigateService.navigateToDetailPage(data, { content: data });
+    //    }, error => {
+    //       this.loaderService.stopLoader();
+    //    });
+  }
+}
diff --git a/src/app/manage-learn/project/project-detail/project-detail.page.html b/src/app/manage-learn/project/project-detail/project-detail.page.html
new file mode 100644
index 000000000..b6613b6b0
--- /dev/null
+++ b/src/app/manage-learn/project/project-detail/project-detail.page.html
@@ -0,0 +1,140 @@
+<ion-content *ngIf="project">
+  <ion-card class="project-box" *ngIf="showDetails">
+    <ion-card-header class="custom-filed">
+      <ion-icon name="caret-down-outline" color="primary" (click)="toggle()"></ion-icon>
+      <ion-label *ngIf="!viewOnlyMode">{{'FRMELEMNTS_LBL_PROGRAM_NAME' | translate}} :
+      </ion-label>{{project?.programName}}
+    </ion-card-header>
+    <ion-card-content>
+      <div class="custom-filed">
+        <ion-label> {{'FRMELEMNTS_LBL_PROJECT_TITLE' | translate}} : </ion-label>
+        {{project?.title}}
+      </div>
+      <div class="custom-filed">
+        <ion-label position="fixed"> {{'FRMELEMNTS_LBL_OBJECTIVE' | translate}} : </ion-label>
+        {{project?.description}}
+      </div>
+      <div class="custom-filed" *ngIf="project?.duration">
+        <ion-label position="fixed"> {{'FRMELEMNTS_LBL_DURATION' | translate}} : </ion-label>
+        {{project?.duration?.label || project?.duration }}
+      </div>
+      <div class="custom-filed" *ngIf="project?.startDate">
+        <ion-label position="fixed"> {{'FRMELEMNTS_LBL_START_DATE' | translate}} : </ion-label>
+        {{project?.startDate | date : 'dd/MM/yyyy' }}
+      </div>
+      <div class="custom-filed" *ngIf="project?.endDate">
+        <ion-label position="fixed"> {{'FRMELEMNTS_LBL_END_DATE' | translate}} : </ion-label>
+        {{project?.endDate | date : 'dd/MM/yyyy' }}
+      </div>
+      <ion-row class="custom-filed" *ngIf="project?.status && !viewOnlyMode">
+        <ion-col size="5">
+          <ion-label position="stacked"> {{'FRMELEMNTS_LBL_PROJECT_STATUS' | translate}} </ion-label>
+        </ion-col>
+        <ion-col size=5 class="status-bar">
+          <ion-progress-bar value="1" color="success" *ngIf="project.status == statuses[2].title"></ion-progress-bar>
+          <ion-progress-bar value="0.5" color="warning" *ngIf="project.status == statuses[1].title"></ion-progress-bar>
+          <ion-progress-bar value="1" color="medium" *ngIf="project.status == statuses[0].title">
+          </ion-progress-bar>
+          {{project.status | camelToTitle}}
+        </ion-col>
+      </ion-row>
+      <div class="custom-filed" *ngIf="project?.learningResources?.length">
+        <ion-label position="fixed"> {{'FRMELEMNTS_LBL_LEARNING_RESOURCES' | translate}} : </ion-label>
+        <a (click)="openResources()"> {{'FRMELEMNTS_LBL_CLICK_HERE_TO_VIEW_LIBRARY' | translate}}</a>
+      </div>
+    </ion-card-content>
+  </ion-card>
+  <ion-card class="project-box" *ngIf="!showDetails">
+    <ion-card-header class="custom-filed">
+      <ion-icon name="caret-forward-outline" color="primary" (click)="toggle()"></ion-icon>
+      <ion-label> {{'FRMELEMNTS_LBL_PROJECT_TITLE' | translate}} : </ion-label>
+      {{project?.title}}
+    </ion-card-header>
+    <ion-card-content>
+      <ion-row class="custom-filed">
+        <ion-col size="5">
+          <ion-label position="stacked"> {{'FRMELEMNTS_LBL_PROJECT_STATUS' | translate}} </ion-label>
+        </ion-col>
+        <ion-col size="5" class="status-bar">
+          <ion-progress-bar value="1" color="success" *ngIf="project.status == statuses[2].title"></ion-progress-bar>
+          <ion-progress-bar value="0.5" color="warning" *ngIf="project.status == statuses[1].title"></ion-progress-bar>
+          <ion-progress-bar value="1" color="medium" *ngIf="project.status == statuses[0].title"></ion-progress-bar>
+          {{project.status | camelToTitle}}
+        </ion-col>
+      </ion-row>
+    </ion-card-content>
+  </ion-card>
+  <ion-row class="ion-padding" *ngIf="sortedTasks">
+    <ion-col size="6" class="text-left">
+      {{'FRMELEMNTS_LBL_TOTAL_TASKS' | translate}} : {{taskCount}}
+    </ion-col>
+    <ion-col size="6" class="text-right">
+      {{categories}}
+    </ion-col>
+  </ion-row>
+  <div *ngIf="sortedTasks" class="task-list">
+    <div *ngFor="let schedule of schedules">
+      <h3 *ngIf="sortedTasks[schedule.value].tasks.length > 0" class="date-label">{{schedule.title | translate}}</h3>
+      <div *ngFor="let task of sortedTasks[schedule.value].tasks">
+        <ion-card class="tasks-box" *ngIf="!task.isDeleted">
+          <ion-row class="task-list">
+            <ion-col size="1" class="left-border pending-task-left-border"
+              [ngClass]="{'completed-task-left-border' : task.status === 'completed','pending-task-left-border' : task.status === 'notStarted'}">
+            </ion-col>
+            <ion-col size="10" (click)="!viewOnlyMode && action('editTask',task)">
+              <h5>{{task.name}}</h5>
+              <div class="date_button-container">
+                <h5 class="task-endDate">
+                  {{'FRMELEMNTS_LBL_END_DATE' | translate}} :
+                  {{(task?.endDate) ? (task.endDate | date : 'dd/MM/yyyy') : "__"}}
+                </h5>
+              </div>
+            </ion-col>
+            <ion-col size="1" *ngIf="!viewOnlyMode">
+              <ion-icon name="ellipsis-vertical-outline" color="primary" (click)="openPopover($event,task)">
+              </ion-icon>
+            </ion-col>
+          </ion-row>
+          <div class="viewBtn">
+            <ion-button size="small" *ngIf="task?.type=='content'&&task?.learningResources?.length"
+              (click)="$event.stopPropagation();openResources(task)">
+              {{'FRMELEMNTS_LBL_VIEW_RESOURCES' | translate}}
+            </ion-button>
+            <ion-button size="small"
+              *ngIf="(task?.type=='assessment' || task?.type=='observation')&&task?.status!='completed' "
+              (click)="$event.stopPropagation();startAssessment(task)">
+              {{'START' | translate}} {{task?.type}}
+            </ion-button>
+            <ion-button size="small"
+              *ngIf="(task?.type=='assessment' || task?.type=='observation')&&task?.status=='completed' "
+              (click)="$event.stopPropagation();checkReport(task)">
+              {{'FRMELEMNTS_LBL_REPORTS' | translate}}
+            </ion-button>
+          </div>
+        </ion-card>
+      </div>
+    </div>
+  </div>
+  <ion-fab horizontal="center" class="add-task-btn" *ngIf="taskCount < 2 && !viewOnlyMode">
+    <ion-fab-button (click)="addTask()">
+      <ion-icon name="add"></ion-icon>
+    </ion-fab-button>
+    {{'FRMELEMNTS_LBL_NEW_TASK' | translate}}
+  </ion-fab>
+  <ion-fab vertical="bottom" horizontal="end" class="add-task-btn" *ngIf="taskCount > 1 && !viewOnlyMode" slot="fixed">
+    <ion-fab-button (click)="addTask()">
+      <ion-icon name="add"></ion-icon>
+    </ion-fab-button>
+    {{'FRMELEMNTS_LBL_NEW_TASK' | translate}}
+  </ion-fab>
+</ion-content>
+
+<ion-footer *ngIf="project && viewOnlyMode">
+  <ion-button expand="block" (click)="importProjectConfirm()" *ngIf="!project.projectId || !project.projectId.length">
+    {{'FRMELEMNTS_BTN_IMPORT_PROJECT' | translate}}
+  </ion-button>
+  <!-- goToProjectDetails -->
+  <ion-button expand="block" (click)="goToProjectDetails()" *ngIf="project.projectId && project.projectId.length">
+    {{'FRMELEMNTS_BTN_PROJECT_IMPORTED' | translate}}
+  </ion-button>
+</ion-footer>
\ No newline at end of file
diff --git a/src/app/manage-learn/project/project-detail/project-detail.page.scss b/src/app/manage-learn/project/project-detail/project-detail.page.scss
new file mode 100644
index 000000000..6e3caea26
--- /dev/null
+++ b/src/app/manage-learn/project/project-detail/project-detail.page.scss
@@ -0,0 +1,133 @@
+// @import "../../theme/colors.scss";
+@import "src/assets/styles/_variables.scss";
+.project-box {
+  margin: 10px 8px;
+  box-shadow: rgba(0, 0, 0, 0.2) 0px 3px 1px -2px, rgba(0, 0, 0, 0.14) 0px 6px 6px 0px,
+    rgba(0, 0, 0, 0.12) 0px 0px 0px 0px;
+
+  ion-card-header {
+    padding: 0px 15px;
+  }
+
+  .custom-filed {
+    margin: 10px 0px;
+
+    ion-label {
+      font-weight: 600;
+      color: #{$black-color};
+    }
+
+    ion-icon {
+      float: right;
+      font-size: 24px;
+      margin-top: -5px;
+    }
+
+    ion-col {
+      padding: 0px;
+    }
+  }
+
+  .status-bar {
+    text-align: center;
+
+    ion-progress-bar {
+      height: 8px;
+      border-radius: 10px;
+    }
+  }
+}
+
+.tasks-box {
+  background: #{$white-color};
+  font-weight: 600;
+
+  .left-border {
+    max-width: 6px !important;
+    margin: 2% 10px;
+    margin-left: 0px;
+    padding: 0px;
+  }
+
+  h5 {
+    margin-top: 0px;
+    margin-bottom: 0px;
+  }
+
+  .completed-task-left-border {
+    background: green;
+  }
+
+}
+
+ion-button, ion-fab-button {
+  --background: #{$blue};
+}
+
+.task-list {
+  padding: 5px 15px 0 15px;
+
+  .task-endDate {
+    color: #{$blue};
+    font-size: 16px;
+    margin-top: 5px;
+  }
+
+  ion-icon {
+    font-size: 24px;
+    margin-left: 20px;
+  }
+
+  .sec-row {
+    padding: 0px 0px 5px 0px;
+  }
+
+  .first-row {
+    padding: 10px 0px 0px 0px;
+  }
+
+  .date-label {
+    text-align: center;
+    color: #5a5b5d;
+    font-size: 16px;
+    font-weight: 600;
+  }
+
+  .date_button-container {
+    display: flex;
+    justify-content: space-between;
+
+  }
+}
+
+.viewBtn {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  padding-bottom: 10px;
+  padding-right: 10px;
+  margin-top: 10px;
+  ion-button {
+    font-size: 14px;
+    text-transform: capitalize;
+  }
+}
+
+.add-task-btn {
+  color: var(--ion-color-primary);
+  margin-top: -30px;
+}
+
+.file-container {
+  margin-left: 15px;
+  width: 5em;
+  height: 5em;
+  text-align: center;
+  border-radius: 8px;
+  padding: 5px;
+  margin-bottom: 2em;
+}
+
+ion-card {
+  background-color: map-get($colors, white);
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/project/project-detail/project-detail.page.ts b/src/app/manage-learn/project/project-detail/project-detail.page.ts
new file mode 100644
index 000000000..e153d6779
--- /dev/null
+++ b/src/app/manage-learn/project/project-detail/project-detail.page.ts
@@ -0,0 +1,905 @@
+import { ChangeDetectorRef, Component, OnDestroy, OnInit, Inject, NgZone } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { PopoverController, AlertController, Platform, ModalController } from '@ionic/angular';
+import * as _ from 'underscore';
+import { TranslateService } from '@ngx-translate/core';
+import { statuses } from '@app/app/manage-learn/core/constants/statuses.constant';
+import { UtilsService } from '@app/app/manage-learn/core/services/utils.service';
+import * as moment from "moment";
+import { AppHeaderService , CommonUtilService} from '@app/services';
+import { menuConstants } from '../../core/constants/menuConstants';
+import { PopoverComponent } from '../../shared/components/popover/popover.component';
+import { Subscription } from 'rxjs';
+import { DbService } from '../../core/services/db.service';
+import { LoaderService, ToastService, NetworkService } from '../../core';
+import { SyncService } from '../../core/services/sync.service';
+import { UnnatiDataService } from '../../core/services/unnati-data.service';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { RouterLinks } from '@app/app/app.constant';
+import { ContentDetailRequest, Content, ContentService } from 'sunbird-sdk';
+import { NavigationService } from '@app/services/navigation-handler.service';
+import { CreateTaskFormComponent } from '../../shared';
+import { SharingFeatureService } from '../../core/services/sharing-feature.service';
+import { Location } from '@angular/common';
+
+@Component({
+  selector: "app-project-detail",
+  templateUrl: "./project-detail.page.html",
+  styleUrls: ["./project-detail.page.scss"],
+})
+export class ProjectDetailPage implements OnInit, OnDestroy {
+  showDetails: boolean = true;
+  statuses = statuses;
+  project: any;
+  projectId;
+  projectType = '';
+  categories = [];
+  taskCount: number = 0;
+  filters: any = {};
+  schedules = [
+    {
+      title: "FRMELEMNTS_LBL_PAST",
+      value: "past"
+    },
+    {
+      title: "FRMELEMNTS_LBL_TODAY",
+      value: "today"
+    },
+    {
+      title: "FRMELEMNTS_LBL_THIS_WEEK",
+      value: "thisWeek"
+    },
+    {
+      title: "FRMELEMNTS_LBL_THIS_MONTH",
+      value: "thisMonth"
+    },
+    {
+      title: "FRMELEMNTS_LBL_THIS_QUARTER",
+      value: "thisQuarter"
+    },
+    {
+      title: "FRMELEMNTS_LBL_UPCOMING",
+      value: "upcoming"
+    },
+  ];
+  sortedTasks;
+  programId;
+  solutionId;
+  private backButtonFunc: Subscription;
+
+  // header
+  private _headerConfig = {
+    showHeader: true,
+    showBurgerMenu: false,
+    pageTitle: '',
+    actionButtons: [] as string[]
+  };
+  isNotSynced: boolean;
+  locationChangeTriggered: boolean = false;
+  allStrings;
+  private _appHeaderSubscription?: Subscription;
+  viewOnlyMode: boolean = false;
+  templateId;
+  templateDetailsPayload;
+  importProjectClicked: boolean = false;
+  fromImportProject: boolean = false;
+  networkFlag: boolean;
+  private _networkSubscription: Subscription;
+
+  constructor(
+    public params: ActivatedRoute,
+    public popoverController: PopoverController,
+    private headerService: AppHeaderService,
+    private db: DbService,
+    private loader: LoaderService,
+    private router: Router,
+    private utils: UtilsService,
+    private alert: AlertController,
+    private share: SharingFeatureService,
+    private syncServ: SyncService,
+    private toast: ToastService,
+    private translate: TranslateService,
+    private modal: ModalController,
+    private unnatiService: UnnatiDataService,
+    private platform: Platform,
+    private ref: ChangeDetectorRef,
+    private navigateService: NavigationService,
+    private alertController: AlertController,
+    private network: NetworkService,
+    private location: Location,
+    private zone: NgZone,
+    private commonUtilService: CommonUtilService,
+    @Inject('CONTENT_SERVICE') private contentService: ContentService
+  ) {
+    this.networkFlag = this.commonUtilService.networkInfo.isNetworkAvailable;
+    this._networkSubscription = this.commonUtilService.networkAvailability$.subscribe(async (available: boolean) => {
+      this.networkFlag = available;
+    })
+    params.queryParams.subscribe((parameters) => {
+      this.projectId = parameters.projectId;
+      this.solutionId = parameters.solutionId;
+      this.programId = parameters.programId;
+      this.projectType = parameters.type ? parameters.type : '';
+      this.viewOnlyMode = parameters.viewOnlyMode;
+      this.templateId = parameters.templateId;
+      this.viewOnlyMode ? this.getTemplateDetails() : this.getProject();
+      this.templateDetailsPayload = this.router.getCurrentNavigation().extras.state;
+      this.fromImportProject = (parameters.fromImportPage && parameters.fromImportPage == 'true') ? true : false;
+    });
+    this.translate
+      .get([
+        "FRMELEMNTS_MSG_SOMETHING_WENT_WRONG",
+        "FRMELEMNTS_MSG_NO_ENTITY_MAPPED",
+        "FRMELEMNTS_MSG_CANNOT_GET_PROJECT_DETAILS",
+        "FRMELEMNTS_LBL_IMPORT_PROJECT_MESSAGE",
+        "YES",
+        "NO",
+        "FRMELEMNTS_LBL_IMPORT_PROJECT_SUCCESS"
+      ])
+      .subscribe((texts) => {
+        this.allStrings = texts;
+      });
+
+    this.platform.resume.subscribe((result) => {
+      this.getProjectTaskStatus();
+    });
+  }
+
+  getTemplateDetails() {
+    this.loader.startLoader();
+    const config = {
+      url: urlConstants.API_URLS.PROJECT_TEMPLATE_DETAILS + this.templateId,
+      // payload:  {}
+    }
+
+    this.unnatiService.get(config).subscribe(success => {
+      this.loader.stopLoader();
+      // let data = success.result;
+      this.project = success.result;
+      this._headerConfig.actionButtons = []
+      this.headerService.updatePageConfig(this._headerConfig);
+      this.sortTasks();
+      this.programId = (success.result && success.result.programInformation) ? success.result.programInformation.programId : null;
+
+      // this.isNotSynced = this.project ? (this.project.isNew || this.project.isEdit) : false;
+      // this._headerConfig.actionButtons.push(this.isNotSynced ? 'sync-offline' : 'sync-done');
+      // this.headerService.updatePageConfig(this._headerConfig);
+      // this.project.categories.forEach((category: any) => {
+      //   category.label ? this.categories.push(category.label) : this.categories.push(category.name);
+      // });
+      // this.project.tasks && this.project.tasks.length ? this.sortTasks() : "";
+    }, error => {
+      this.loader.stopLoader();
+
+    })
+  }
+
+  getProject() {
+    if (this.projectId) {
+      this.db.query({ _id: this.projectId }).then(
+        (success) => {
+          if (success.docs.length) {
+
+            this.categories = [];
+            this.project = success.docs.length ? success.docs[0] : {};
+            this.isNotSynced = this.project ? (this.project.isNew || this.project.isEdit) : false;
+            !this.viewOnlyMode ? this._headerConfig.actionButtons.push('more') : null;
+            this._headerConfig.actionButtons.push(this.isNotSynced ? 'sync-offline' : 'sync-done');
+            this.headerService.updatePageConfig(this._headerConfig);
+            this.project.categories.forEach((category: any) => {
+              category.label ? this.categories.push(category.label) : this.categories.push(category.name);
+            });
+            this.project.tasks && this.project.tasks.length ? this.sortTasks() : "";
+            this.getProjectTaskStatus();
+          } else {
+            this.getProjectsApi();
+          }
+
+        },
+        (error) => {
+          this.getProjectsApi();
+        }
+      );
+    } else {
+      this.getProjectsApi();
+    }
+
+  }
+
+  async getProjectsApi() {
+    this.loader.startLoader();
+    let payload = this.projectType == 'assignedToMe' ? await this.utils.getProfileInfo() : '';
+    console.log(this.projectType, "projectType");
+    const url = `${this.projectId ? '/' + this.projectId : ''}?${this.templateId ? 'templateId=' + this.templateId : ''}${this.solutionId ? ('&&solutionId=' + this.solutionId) : ''}`;
+    const config = {
+      url: urlConstants.API_URLS.GET_PROJECT + url,
+      payload: this.projectType == 'assignedToMe' ? payload : {}
+    }
+    this.templateDetailsPayload ? config.payload = this.templateDetailsPayload : null;
+    this.unnatiService.post(config).subscribe(success => {
+      this.loader.stopLoader();
+      if (this.templateId) {
+        this.toast.openToast(this.allStrings['FRMELEMNTS_LBL_IMPORT_PROJECT_SUCCESS'])
+      }
+      // this.projectId = success.result._id;
+      // TODO:remove after adding subtasks to observation and assement type tasks, logic will be changed
+      let data = success.result;
+      let newCategories = []
+      for (const category of data.categories) {
+        if (category._id || category.name) {
+          const obj = {
+            label: category.name || category.label,
+            value: category._id
+          }
+          newCategories.push(obj)
+        }
+      }
+      data.categories = newCategories.length ? newCategories : data.categories;
+      if (data.tasks) {
+
+        data.tasks.map(t => {
+          if ((t.type == 'observation' || t.type == 'assessment') && t.submissionDetails && t.submissionDetails.status) {
+            if (t.submissionDetails.status != t.status) {
+              t.status = t.submissionDetails.status
+              t.isEdit = true;
+              data.isEdit = true
+            }
+          }
+        })
+
+      }
+      // TODO:till here
+      this.db.create(success.result).then(successData => {
+        this.projectId ? this.getProject() :
+          this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.DETAILS}`], {
+            queryParams: {
+              projectId: success.result._id,
+              programId: this.programId,
+              solutionId: this.solutionId,
+              fromImportPage: this.importProjectClicked
+            }, replaceUrl: true
+          });
+      }).catch(error => {
+        if (error.status === 409) {
+          this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.DETAILS}`], {
+            queryParams: {
+              projectId: success.result._id,
+              programId: this.programId,
+              solutionId: this.solutionId,
+              fromImportPage: this.importProjectClicked
+            }, replaceUrl: true
+          })
+        }
+      })
+    }, error => {
+
+      this.loader.stopLoader();
+    })
+  }
+
+  ngOnInit() { }
+
+  ionViewWillEnter() {
+    this.initApp();
+    // this.getProject();
+    this.getDateFilters();
+    this.handleBackButton();
+  }
+
+  initApp() {
+    this.zone.run(() => {
+      this._appHeaderSubscription = this.headerService.headerEventEmitted$.subscribe(eventName => {
+        if (eventName.name === 'more') {
+          this.openPopover(eventName.event);
+        } else if (eventName.name === 'sync') {
+          this.action(eventName.name);
+        } else if (eventName.name === 'back') {
+          if (this.fromImportProject) {
+            setTimeout(() => {
+              this.router.navigate([`/${RouterLinks.PROGRAM}/${RouterLinks.SOLUTIONS}`, this.programId]);
+            }, 0)
+            this.router.navigate([`/${RouterLinks.TABS}/${RouterLinks.HOME}/${RouterLinks.HOME_ADMIN}`]);
+          } else {
+            this.location.back();
+          }
+        }
+      });
+    })
+
+    let data;
+    this.translate.get(["FRMELEMNTS_LBL_PROJECT_VIEW"]).subscribe((text) => {
+      data = text;
+    });
+    this._headerConfig = this.headerService.getDefaultPageConfig();
+    this._headerConfig.actionButtons = [];
+    this._headerConfig.showBurgerMenu = false;
+    this._headerConfig.pageTitle = data["FRMELEMNTS_LBL_PROJECT_VIEW"];
+    this.headerService.updatePageConfig(this._headerConfig);
+  }
+
+  ngOnDestroy() {
+    if (this._appHeaderSubscription) {
+      this._appHeaderSubscription.unsubscribe();
+    }
+    if(this._networkSubscription){
+      this._networkSubscription.unsubscribe();
+    }
+  }
+
+  ionViewWillLeave() {
+    if (this._appHeaderSubscription) {
+      this._appHeaderSubscription.unsubscribe();
+    }
+    if (this.backButtonFunc) {
+      this.backButtonFunc.unsubscribe();
+    }
+  }
+
+  getDateFilters() {
+    let currentDate = moment();
+    this.filters.today = moment(currentDate).format("YYYY-MM-DD");
+    this.filters.thisWeek = currentDate.endOf("week").format("YYYY-MM-DD");
+    this.filters.thisMonth = currentDate.endOf("month").format("YYYY-MM-DD");
+    const quarter = Math.floor((new Date().getMonth() / 3));
+    let startFullQuarter: any = new Date(new Date().getFullYear(), quarter * 3, 1);
+    let endFullQuarter: any = new Date(startFullQuarter.getFullYear(), startFullQuarter.getMonth() + 3, 0);
+    this.filters.thisQuarter = moment(endFullQuarter).format("YYYY-MM-DD");
+  }
+  sortTasks() {
+    this.taskCount = 0;
+    let completed = 0;
+    let inProgress = 0;
+    this.sortedTasks = JSON.parse(JSON.stringify(this.utils.getTaskSortMeta()));
+    this.project.tasks.forEach((task: any) => {
+
+      if (!task.isDeleted && task.endDate) {
+        this.taskCount = this.taskCount + 1;
+        let ed = JSON.parse(JSON.stringify(task.endDate));
+        ed = moment(ed).format("YYYY-MM-DD");
+
+        if (ed < this.filters.today) {
+          this.sortedTasks["past"].tasks.push(task);
+        } else if (ed == this.filters.today) {
+          this.sortedTasks["today"].tasks.push(task);
+        } else if (ed > this.filters.today && ed <= this.filters.thisWeek) {
+          this.sortedTasks["thisWeek"].tasks.push(task);
+        } else if (ed > this.filters.thisWeek && ed <= this.filters.thisMonth) {
+          this.sortedTasks["thisMonth"].tasks.push(task);
+        } else if (ed > this.filters.thisMonth && ed <= this.filters.thisQuarter) {
+          this.sortedTasks["thisQuarter"].tasks.push(task);
+        }
+        else {
+          this.sortedTasks["upcoming"].tasks.push(task);
+        }
+      } else if (!task.isDeleted && !task.endDate) {
+        this.sortedTasks["upcoming"].tasks.push(task);
+        this.taskCount = this.taskCount + 1;
+      }
+      if (!task.isDeleted) {
+        if (task.status == this.statuses[1].title) {
+          inProgress = inProgress + 1;
+        } else if (task.status == this.statuses[2].title) {
+          completed = completed + 1;
+        }
+      }
+    });
+    this.project = this.utils.setStatusForProject(this.project);
+  }
+  syn() { }
+
+  toggle() {
+    this.showDetails = !this.showDetails;
+  }
+  async openPopover(ev: any, task?) {
+    let menu;
+    if (task && task._id) {
+      menu = JSON.parse(JSON.stringify(menuConstants.TASK));
+      if (task.isDeletable) {
+        let deleteOption = {
+          TITLE: 'DELETE',
+          VALUE: 'deleteTask',
+          ICON: 'trash'
+        }
+        menu.push(deleteOption);
+      }
+    } else {
+      menu = menuConstants.PROJECT;
+    }
+    const popover = await this.popoverController.create({
+      component: PopoverComponent,
+      componentProps: { menus: menu },
+      event: ev,
+      translucent: true,
+    });
+    popover.onDidDismiss().then((data) => {
+      if (data.data) {
+        this.action(data.data, task);
+      }
+    });
+    return await popover.present();
+  }
+
+  action(event, task?) {
+    switch (event) {
+      case "sync": {
+        if (this.network.isNetworkAvailable) {
+          this.project.isNew
+            ? this.createNewProject()
+            : this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.SYNC}`], { queryParams: { projectId: this.projectId } });
+        } else {
+          this.toast.showMessage('FRMELEMNTS_MSG_OFFLINE_SYNC', 'danger');
+        }
+        break;
+      }
+      case "editTask": {
+        this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.TASK_VIEW}`, this.project._id, task._id]);
+        break;
+      }
+      case "deleteTask": {
+        this.askPermissionToDelete("task", task._id);
+        break;
+      }
+      case "fileProject": {
+        this.router.navigate([`${RouterLinks.ATTACHMENTS_LIST}`, this.project._id]);
+        break;
+      }
+      case "editProject": {
+        this.router.navigate([`/${RouterLinks.PROJECT}/${RouterLinks.PROJECT_EDIT}`, this.project._id]);
+        break;
+      }
+      case "deleteProject": {
+        this.askPermissionToDelete("Project");
+        break;
+      }
+      case "shareTask": {
+        this.network.isNetworkAvailable ? this.openSyncSharePopup("shareTask", task.name, task._id) : this.toast.showMessage('FRMELEMNTS_MSG_OFFLINE_SHARE_TASK', 'danger');
+        break;
+      }
+      case "shareProject": {
+        this.network.isNetworkAvailable
+          ? this.openSyncSharePopup('shareProject', this.project.title)
+          : this.toast.showMessage('FRMELEMNTS_MSG_OFFLINE_SHARE_PROJECT', 'danger');
+        break;
+      }
+    }
+  }
+
+  async openSyncSharePopup(type, name, taskId?) {
+    let data;
+    this.translate.get(["FRMELEMNTS_LBL_SHARE_MSG", "FRMELEMNTS_BTN_DNTSYNC", "FRMELEMNTS_BTN_SYNCANDSHARE"]).subscribe((text) => {
+      data = text;
+    });
+    const alert = await this.alert.create({
+      message: data["FRMELEMNTS_LBL_SHARE_MSG"],
+      buttons: [
+        {
+          text: data["FRMELEMNTS_BTN_DNTSYNC"],
+          role: "cancel",
+          cssClass: "secondary",
+          handler: (blah) => {
+            this.toast.showMessage("FRMELEMNTS_MSG_FILE_NOT_SHARED", "danger");
+          },
+        },
+        {
+          text: data["FRMELEMNTS_BTN_SYNCANDSHARE"],
+          handler: () => {
+            if (this.project.isEdit || this.project.isNew) {
+              this.project.isNew
+                ? this.createNewProject()
+                : this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.SYNC}`], { queryParams: { projectId: this.projectId, taskId: taskId, share: true, fileName: name } });
+            } else {
+              type == 'shareTask' ? this.getPdfUrl(name, taskId) : this.getPdfUrl(this.project.title);
+            }
+          },
+        },
+      ],
+    });
+    await alert.present();
+  }
+
+  getPdfUrl(fileName, taskId?) {
+    let task_id = taskId ? taskId : '';
+
+    const config = {
+      url: urlConstants.API_URLS.GET_SHARABLE_PDF + this.project._id + '?tasks=' + task_id,
+    };
+    this.share.getFileUrl(config, fileName);
+  }
+  // task and project delete permission.
+  async askPermissionToDelete(type, id?) {
+    let data;
+    this.translate.get(["FRMELEMNTS_LBL_DELETE_CONFIRMATION", "CANCEL", "BTN_SUBMIT"]).subscribe((text) => {
+      data = text;
+    });
+    const alert = await this.alert.create({
+      message: data["FRMELEMNTS_LBL_DELETE_CONFIRMATION"],
+      buttons: [
+        {
+          text: data["CANCEL"],
+          role: "cancel",
+          cssClass: "secondary",
+          handler: (blah) => { },
+        },
+        {
+          text: data["BTN_SUBMIT"],
+          handler: () => {
+            type == "task" ? this.deleteTask(id) : this.deleteProject();
+          },
+        },
+      ],
+    });
+    await alert.present();
+  }
+
+  deleteTask(id) {
+    let index = _.findIndex(this.project.tasks, (item) => {
+      return item._id == id;
+    });
+    this.project.tasks[index].isDeleted = true;
+    this.project.tasks[index].isEdit = true;
+    this.update("taskDelete");
+  }
+  deleteProject() {
+    // actions
+    this.project.isDeleted = true;
+    this.update("ProjectDelete");
+  }
+  openResources(task = null) {
+    if (task && task.learningResources && task.learningResources.length === 1) {
+      let link = task.learningResources[0].link;
+      this.openBodh(link);
+      return;
+    }
+    if (task) {
+      this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.LEARNING_RESOURCES}`, this.project._id, task._id]);
+    } else {
+      this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.LEARNING_RESOURCES}`, this.project._id]);
+    }
+  }
+  //open openBodh
+  openBodh(link) {
+    if(!this.networkFlag){
+      this.toast.showMessage('FRMELEMNTS_MSG_YOU_ARE_WORKING_OFFLINE_TRY_AGAIN', 'danger');
+      return
+    }
+    this.loader.startLoader();
+    let identifier = link.split("/").pop();
+    const req: ContentDetailRequest = {
+      contentId: identifier,
+      attachFeedback: false,
+      attachContentAccess: false,
+      emitUpdateIfAny: false
+    };
+
+    this.contentService.getContentDetails(req).toPromise()
+      .then(async (data: Content) => {
+        this.loader.stopLoader();
+        this.navigateService.navigateToDetailPage(data, { content: data });
+      }, error => {
+        this.loader.stopLoader();
+      });
+  }
+
+  //Update the project
+  update(type) {
+    this.project.isEdit = true;
+    this.project = this.utils.setStatusForProject(this.project);
+    this.db
+      .update(this.project)
+      .then((success) => {
+        this.project._rev = success.rev;
+        this.isNotSynced = this.project ? this.project.isNew || this.project.isEdit : false;
+        this._headerConfig.actionButtons.pop()
+        this._headerConfig.actionButtons.push(this.isNotSynced ? 'sync-offline' : 'sync-done');
+        this.headerService.updatePageConfig(this._headerConfig);
+        this.ref.detectChanges();
+        if (type == "newTask") {
+          this.toast.showMessage("FRMELEMNTS_MSG_NEW_TASK_ADDED_SUCCESSFUL", "success");
+        } else if (type == "ProjectDelete") {
+          this.toast.showMessage("FRMELEMNTS_MSG_PROJECT_DELETED_SUCCESSFUL", "success");
+          //TODO: add location service
+          // this.location.back();
+        } else if (type == "taskDelete") {
+          this.toast.showMessage("FRMELEMNTS_MSG_TASK_DELETED_SUCCESSFUL", "success");
+        }
+        this.sortTasks();
+      })
+      .catch((error) => { });
+  }
+  createNewProject() {
+    this.loader.startLoader();
+    const projectDetails = JSON.parse(JSON.stringify(this.project));
+    this.syncServ
+      .createNewProject()
+      .then((success) => {
+        projectDetails._id = success.result._id;
+        projectDetails.lastDownloadedAt = success.result.lastDownloadedAt;
+        this.doDbActions(projectDetails);
+        this.loader.stopLoader();
+      })
+      .catch((error) => {
+        this.toast.showMessage(this.allStrings["FRMELEMNTS_MSG_SOMETHING_WENT_WRONG"], "danger");
+        this.loader.stopLoader();
+      });
+  }
+
+  doDbActions(projectDetails) {
+    const _rev = projectDetails._rev;
+    delete projectDetails._rev;
+    const newObj = this.syncServ.removeKeys(projectDetails, ["isNew"]);
+    this.db
+      .create(newObj)
+      .then((success) => {
+        this.db
+          .delete(this.projectId, _rev)
+          .then((deleteSuccess) => {
+            this.loader.stopLoader();
+            this.projectId = newObj._id;
+            this.project = newObj;
+            this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.DETAILS}`], {
+              queryParams: {
+                projectId: this.projectId,
+              }, replaceUrl: true
+            }
+            );
+            setTimeout(() => {
+              this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.SYNC}`], { queryParams: { projectId: this.projectId } });
+            }, 0);
+          })
+          .catch((deletError) => {
+            this.toast.showMessage(this.allStrings["FRMELEMNTS_MSG_SOMETHING_WENT_WRONG"], "danger");
+            this.loader.stopLoader();
+          });
+      })
+      .catch((error) => {
+        this.toast.showMessage(this.allStrings["FRMELEMNTS_MSG_SOMETHING_WENT_WRONG"], "danger");
+        this.loader.stopLoader();
+      });
+  }
+
+  async addTask() {
+    const modal = await this.modal.create({
+      component: CreateTaskFormComponent,
+      cssClass: "create-task-modal",
+    });
+    modal.onDidDismiss().then((data) => {
+      if (data.data) {
+        !this.project.tasks ? (this.project.tasks = []) : "";
+        this.project.tasks.push(data.data);
+        this.update("newTask");
+      }
+    });
+    return await modal.present();
+  }
+
+  startAssessment(task) {
+     if (!this.networkFlag) {
+       this.toast.showMessage('FRMELEMNTS_MSG_YOU_ARE_WORKING_OFFLINE_TRY_AGAIN', 'danger');
+       return;
+     }
+    if (this.project.entityId) {
+      const config = {
+        url: urlConstants.API_URLS.START_ASSESSMENT + `${this.project._id}?taskId=${task._id}`,
+      };
+      this.unnatiService.get(config).subscribe(
+        (success) => {
+          if (!success.result) {
+            this.toast.showMessage(this.allStrings["FRMELEMNTS_MSG_CANNOT_GET_PROJECT_DETAILS"], "danger");
+            return;
+          }
+          let data = success.result;
+
+          let params = `${data.programId}-${data.solutionId}-${data.entityId}`;
+          // let link = `${environment.deepLinkAppsUrl}/${task.type}/${params}`;
+          this.router.navigate([`/${RouterLinks.OBSERVATION}/${RouterLinks.OBSERVATION_SUBMISSION}`], {
+            queryParams: {
+              programId: data.programId,
+              solutionId: data.solutionId,
+              observationId: data.observationId,
+              entityId: data.entityId,
+              entityName: data.entityName,
+              disableObserveAgain: true
+            },
+          });
+          // this.router.navigate([`/${RouterLinks.OBSERVATION}/${RouterLinks.OBSERVATION_DETAILS}`], {
+          //   queryParams: {
+          //     programId: data.programId,
+          //     solutionId: data.solutionId,
+          //     observationId: data.observationId,
+          //     solutionName: data.solutionName,
+          //   },
+          // });
+          // this.iab.create(link, "_system");
+        },
+        (error) => {
+          this.toast.showMessage(this.allStrings["FRMELEMNTS_MSG_CANNOT_GET_PROJECT_DETAILS"], "danger");
+        }
+      );
+    } else {
+      this.toast.showMessage(this.allStrings["FRMELEMNTS_MSG_NO_ENTITY_MAPPED"], "danger");
+    }
+  }
+
+  getProjectTaskStatus() {
+    if (!this.project.tasks && !this.project.tasks.length) {
+      return
+    }
+    let taskIdArr = this.getAssessmentTypeTaskId()
+
+    if (!taskIdArr.length) {
+      return
+    }
+    if (!this.networkFlag) {
+       return;
+    }
+    const config = {
+      url: urlConstants.API_URLS.PROJCET_TASK_STATUS + `${this.project._id}`,
+      payload: {
+        taskIds: taskIdArr,
+      },
+    };
+    this.unnatiService.post(config).subscribe(
+      (success) => {
+        if (!success.result) {
+          return;
+        }
+        this.updateAssessmentStatus(success.result);
+      },
+      (error) => {
+      }
+    );
+  }
+
+  updateAssessmentStatus(data) {
+    // if task type is assessment or observation then check if it is submitted and change the status and update in db
+    let isChnaged = false
+    this.project.tasks.map((t) => {
+      data.map((d) => {
+        if (d.type == 'assessment' || d.type == 'observation') {//check if type is observation or assessment 
+          if (d._id == t._id && d.submissionDetails.status) {
+            // check id matches and task details has submissionDetails
+            if (!t.submissionDetails || t.submissionDetails.status != d.submissionDetails.status) {
+              t.submissionDetails = d.submissionDetails;
+              t.isEdit = true
+              isChnaged = true;
+              t.isEdit = true
+              this.project.isEdit = true
+            }
+          }
+        }
+
+        /*   if (d._id == t._id && d.submissionStatus != t.submissionDetails.submissionStatus) {
+            t.status = d.status;
+            isChnaged = true;
+          } */
+      });
+    });
+    isChnaged ? this.update('taskStatusUpdated') : null// if any assessment/observatiom task status is changed then only update 
+    this.ref.detectChanges();
+  }
+
+  getAssessmentTypeTaskId() {
+    const assessmentTypeTaskIds = [];
+    for (const task of this.project.tasks) {
+      task.type === "assessment" || task.type === "observation" ? assessmentTypeTaskIds.push(task._id) : null;
+    }
+    return assessmentTypeTaskIds;
+  }
+
+  async checkReport(task) {
+     if (!this.networkFlag) {
+       this.toast.showMessage('FRMELEMNTS_MSG_YOU_ARE_WORKING_OFFLINE_TRY_AGAIN', 'danger');
+       return;
+     }
+    if (this.project.entityId) {
+      let payload = await this.utils.getProfileInfo();
+      const config = {
+        url: urlConstants.API_URLS.START_ASSESSMENT + `${this.project._id}?taskId=${task._id}`,
+        payload: payload
+
+      };
+      this.unnatiService.get(config).subscribe(
+        (success) => {
+          if (!success.result) {
+            this.toast.showMessage(this.allStrings["FRMELEMNTS_MSG_CANNOT_GET_PROJECT_DETAILS"], "danger");
+            return;
+          }
+          let data = success.result;
+          let entityType = data.entityType
+          let params = `${data.programId}-${data.solutionId}-${data.entityId}-${entityType}`;
+          // let link = `${environment.deepLinkAppsUrl}/${task.type}/reports/${params}`;
+          // this.iab.create(link, "_system");
+          this.router.navigate([RouterLinks.OBSERVATION_REPORTS], {
+            queryParams: {
+              // entityId: data.entityId,
+              entityType: entityType,
+              // observationId: data.observationId,
+              submissionId: data._id
+            },
+          });
+
+          // this.router.navigate([RouterLinks.GENERIC_REPORT], {
+          //   state: {
+          //     scores: true,
+          //     observation: true,
+          //     pdf: false,
+          //     entityId: data.entityId,
+          //     entityType: data.entityType,
+          //     observationId: data.observationId,
+          //     submissionId: data._id,
+          //   },
+          // });
+        },
+        (error) => {
+          this.toast.showMessage(this.allStrings["FRMELEMNTS_MSG_CANNOT_GET_PROJECT_DETAILS"], "danger");
+          console.log(error);
+        }
+      );
+    } else {
+      this.toast.showMessage(this.allStrings["FRMELEMNTS_MSG_NO_ENTITY_MAPPED"], "danger");
+    }
+  }
+
+  importProject() {
+    // this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.DETAILS}`], {
+    //   queryParams: {
+    //     templateId: this.templateId,
+    //     fromImportPage: this.importProjectClicked
+    //   },
+    //   state: this.templateDetailsPayload,
+    //   replaceUrl: true
+    // });
+    this.getProjectsApi();
+  }
+
+  async importProjectConfirm() {
+    const alert = await this.alertController.create({
+      subHeader: this.allStrings['FRMELEMNTS_LBL_IMPORT_PROJECT_MESSAGE'],
+      backdropDismiss: false,
+      buttons: [
+        {
+          text: this.allStrings['YES'],
+          cssClass: 'primary',
+          handler: (blah) => {
+            this.importProjectClicked = true
+            this.importProject();
+          }
+        }, {
+          text: this.allStrings['NO'],
+          role: 'cancel',
+          cssClass: "cancelBtn",
+          handler: () => {
+          }
+        }
+      ]
+    });
+
+    await alert.present();
+  }
+
+  goToProjectDetails() {
+    this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.DETAILS}`], {
+      queryParams: {
+        projectId: this.project.projectId,
+        fromImportPage: true,
+        programId: this.programId
+      },
+      replaceUrl: true
+    });
+  }
+
+  private handleBackButton() {
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
+      if (this.fromImportProject) {
+        setTimeout(() => {
+          this.router.navigate([`/${RouterLinks.PROGRAM}/${RouterLinks.SOLUTIONS}`, this.programId]);
+        }, 0)
+        this.router.navigate([`/${RouterLinks.TABS}/${RouterLinks.HOME}/${RouterLinks.HOME_ADMIN}`]);
+      } else {
+        this.location.back();
+      }
+      this.backButtonFunc.unsubscribe();
+    });
+  }
+
+}
diff --git a/src/app/manage-learn/project/project-edit/project-edit.page.html b/src/app/manage-learn/project/project-edit/project-edit.page.html
new file mode 100644
index 000000000..96fd8bf8f
--- /dev/null
+++ b/src/app/manage-learn/project/project-edit/project-edit.page.html
@@ -0,0 +1,72 @@
+<ion-content *ngIf="project">
+  <ion-card class="project-box">
+    <ion-card-header class="custom-filed" (click)="edit('metaData')">
+      <div style="height: 20px;">
+        <ion-icon name="create" color="primary"></ion-icon>
+      </div>
+    </ion-card-header>
+    <ion-card-content>
+      <div class="custom-filed _capitalize">
+        <ion-label> {{'FRMELEMNTS_LBL_PROJECT_TITLE' | translate}} : </ion-label>
+        {{project?.title}}
+      </div>
+      <div class="custom-filed _capitalize">
+        <ion-label position="fixed"> {{'FRMELEMNTS_LBL_OBJECTIVE' | translate}} : </ion-label>
+        {{project?.description}}
+      </div>
+      <div class="custom-filed _capitalize" *ngIf="project?.duration">
+        <ion-label position="fixed"> {{'FRMELEMNTS_LBL_DURATION' | translate}} : </ion-label>
+        {{project?.duration}}
+      </div>
+
+      <div class="custom-filed _capitalize">
+        <ion-label position="fixed"> {{'FRMELEMNTS_LBL_CATEGORIES' | translate}} : </ion-label>
+        <!-- {{categories}} -->
+        <span *ngFor="let category of project?.categories">
+          {{category?.label || category?.name}} ,
+        </span>
+      </div>
+    </ion-card-content>
+  </ion-card>
+  <ion-card class="project-box">
+    <ion-card-header class="custom-filed _capitalize" (click)="edit('others')">
+      <div style="height: 20px;">
+        <ion-icon name="create" color="primary"></ion-icon>
+      </div>
+    </ion-card-header>
+    <ion-card-content>
+      <div class="custom-filed _capitalize" *ngIf="project?.startDate">
+        <ion-label position="fixed"> {{'FRMELEMNTS_LBL_START_DATE' | translate}} : </ion-label>
+        {{project?.startDate | date : 'dd/MM/yyyy' }}
+      </div>
+      <div class="custom-filed _capitalize" *ngIf="project?.endDate">
+        <ion-label position="fixed"> {{'FRMELEMNTS_LBL_END_DATE' | translate}} : </ion-label>
+        {{project?.endDate | date : 'dd/MM/yyyy' }}
+      </div>
+      <div class="custom-filed _capitalize">
+        <ion-label> {{'FRMELEMNTS_LBL_PROGRAM_NAME' | translate}} : </ion-label>
+        {{project?.programName}}
+      </div>
+      <div class="custom-filed _capitalize" *ngIf="project?.duration">
+        <ion-label position="fixed"> {{'FRMELEMNTS_LBL_DURATION' | translate}} : </ion-label>
+        {{project?.duration}}
+      </div>
+      <div class="custom-filed _capitalize" *ngIf="project?.entityId">
+        <ion-label position="fixed"> {{'FRMELEMNTS_LBL_ENTITIES' | translate}} </ion-label>
+        <ion-card>
+          <ion-card-content>
+            {{project?.entityName}}
+          </ion-card-content>
+        </ion-card>
+      </div>
+      <div class="custom-filed _capitalize" *ngIf="project.learningResources && project.learningResources.length">
+        <ion-label position="fixed"> {{'FRMELEMNTS_LBL_LEARNING_RESOURCES' | translate}} : </ion-label>
+        <ion-card *ngFor="let resources  of project.learningResources">
+          <ion-card-content>
+            {{resources?.name}}
+          </ion-card-content>
+        </ion-card>
+      </div>
+    </ion-card-content>
+  </ion-card>
+</ion-content>
\ No newline at end of file
diff --git a/src/app/manage-learn/project/project-edit/project-edit.page.scss b/src/app/manage-learn/project/project-edit/project-edit.page.scss
new file mode 100644
index 000000000..a0019817a
--- /dev/null
+++ b/src/app/manage-learn/project/project-edit/project-edit.page.scss
@@ -0,0 +1,26 @@
+@import "../../../../assets/styles/variables";
+@import "../../../../assets/styles/base/variables";
+.project-box {
+    background: $white;
+    margin: 10px 8px;
+    ion-card-header {
+        padding: 0px 15px;
+    }
+
+    .custom-filed {
+        margin: 10px 0px;
+        ion-label {
+            font-weight: 600;
+            // color: $black-color;
+        }
+
+        ion-icon {
+            float: right;
+            font-size: 24px;
+        }
+
+        ion-col {
+            padding: 0px;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/project/project-edit/project-edit.page.ts b/src/app/manage-learn/project/project-edit/project-edit.page.ts
new file mode 100644
index 000000000..3ed82549e
--- /dev/null
+++ b/src/app/manage-learn/project/project-edit/project-edit.page.ts
@@ -0,0 +1,81 @@
+import { Component, OnInit } from '@angular/core';
+import { RouterLinks } from '@app/app/app.constant';
+import { Router, ActivatedRoute } from '@angular/router';
+import { AppHeaderService } from '@app/services';
+import { Subscription } from 'rxjs';
+import { Location } from '@angular/common';
+import { Platform } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+import { DbService } from '../../core';
+
+@Component({
+  selector: 'app-project-edit',
+  templateUrl: './project-edit.page.html',
+  styleUrls: ['./project-edit.page.scss'],
+})
+export class ProjectEditPage implements OnInit {
+  private backButtonFunc: Subscription;
+  headerConfig = {
+    showHeader: true,
+    showBurgerMenu: false,
+    pageTitle: '',
+    actionButtons: []
+  };
+
+  projectId;
+  project;
+  constructor(
+    private router: Router,
+    private location: Location,
+    private headerService: AppHeaderService,
+    private platform: Platform,
+    private translate: TranslateService,
+    private db: DbService,
+    private params: ActivatedRoute
+  ) {
+    params.params.subscribe((parameters) => {
+      this.projectId = parameters.id;
+      this.getProject();
+    });
+  }
+
+  ngOnInit() {
+  }
+  ionViewWillEnter() {
+    let data;
+    this.translate.get(["FRMELEMNTS_LBL_PROJECT_VIEW"]).subscribe((text) => {
+      data = text;
+    });
+    this.headerConfig = this.headerService.getDefaultPageConfig();
+    this.headerConfig.actionButtons = [];
+    this.headerConfig.showHeader = true;
+    this.headerConfig.showBurgerMenu = false;
+    this.headerConfig.pageTitle = data["FRMELEMNTS_LBL_PROJECT_VIEW"];
+    this.headerService.updatePageConfig(this.headerConfig);
+    this.handleBackButton();
+  }
+
+  getProject() {
+    this.db.query({ _id: this.projectId }).then(
+      (success) => {
+        this.project = success.docs.length ? success.docs[0] : {}
+      })
+  }
+
+
+  private handleBackButton() {
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
+      this.location.back();
+      this.backButtonFunc.unsubscribe();
+    });
+  }
+  edit(type) {
+    type == "metaData" ?
+      this.router.navigate([`${RouterLinks.CREATE_PROJECT_PAGE}`], {
+        queryParams: {
+          projectId: this.project._id, type: type
+        }
+      }) :
+      this.router.navigate([`${RouterLinks.PROJECT_OPERATION_PAGE}`, this.project._id], { queryParams: { availableInLocal: true, isEdit: true } });
+  }
+}
diff --git a/src/app/manage-learn/project/project-listing/project-listing.component.html b/src/app/manage-learn/project/project-listing/project-listing.component.html
new file mode 100644
index 000000000..c1849394a
--- /dev/null
+++ b/src/app/manage-learn/project/project-listing/project-listing.component.html
@@ -0,0 +1,42 @@
+<ion-content class="main-container">
+  <app-common-header title="{{ 'FRMELEMNTS_LBL_PROJECTS' | translate }}"  subTitle="{{ 'FRMELEMNTS_LBL_PROJECT_DESC' | translate }}"> </app-common-header>
+  <ion-searchbar debounce="2000" placeholder="Search your projects here" [(ngModel)]="searchText"
+    (ionChange)="onSearch($event)" search-icon="search">
+  </ion-searchbar>
+  <div class="container">
+    <!-- <div class="scroll_chip" scrollX="true">
+      <ion-chip outline="true" *ngFor="let filter of filters" [color]="filter.selected ? 'primary' : ''">
+        <ion-label (click)="getDataByFilter(filter)">{{filter.name | translate}}</ion-label>
+      </ion-chip>
+    </div> -->
+    <sb-library-filters [list]="filters" [layout]="layout" selectedItems="{{[selectedFilterIndex]}}"
+      (selectedFilter)="getDataByFilter($event);" *ngIf="filters?.length">
+    </sb-library-filters>
+  </div>
+
+  <app-item-list-card title="{{'FRMELEMNTS_LBL_CREATE_NEW_PROJECT' | translate}}"
+    subTitle="{{'FRMELEMNTS_LBL_CREATE_NEW_PROJECT_SUBHEADING' | translate}}" class="create_header"
+    (cardSelect)="doAction()">
+    <ion-icon class="mg-popup-btn-icon" name="ios-arrow-round-forward" arrow></ion-icon>
+  </app-item-list-card>
+  <h5 class="projects-labels"> {{'FRMELEMNTS_LBL_EXPLORE_PROJECTS' | translate}}</h5>
+  <div>
+    <h5 *ngIf="selectedFilter" class="projects-labels">{{selectedFilter}} </h5>
+  </div>
+  <app-item-list-card *ngFor="let project of projects" [title]="project?.name||project?.title" [subTitle]="project?.programName"
+    [id]="project?._id" (cardSelect)="doAction($event, project)">
+
+    <div arrow *ngIf="!project?.downloaded" class="d-flex flex-dc" (click)="$event.stopPropagation(); downloaded(project)">
+      <ion-icon class="mg-popup-btn-icon" name="arrow-down"  ></ion-icon>
+      <span>{{'FRMELEMNTS_LBL_DOWNLOAD' | translate}}</span>
+    </div>
+    <div arrow  *ngIf="project?.downloaded" class="d-flex flex-dc">
+      <ion-icon class="mg-popup-btn-icon" style="color:green" name="checkmark" ></ion-icon>
+      <span>{{'FRMELEMNTS_LBL_DOWNLOADED' | translate}}</span>
+    </div>
+  </app-item-list-card>
+  <app-no-data *ngIf="!projects?.length"></app-no-data>
+</ion-content>
+<ion-button class="view-more" expand="block" (click)="loadMore()" *ngIf="projects?.length && count > projects?.length">
+  {{ 'FRMELEMNTS_BTN_VIEW_MORE' | translate }}
+</ion-button>
\ No newline at end of file
diff --git a/src/app/manage-learn/project/project-listing/project-listing.component.scss b/src/app/manage-learn/project/project-listing/project-listing.component.scss
new file mode 100644
index 000000000..52fbd766a
--- /dev/null
+++ b/src/app/manage-learn/project/project-listing/project-listing.component.scss
@@ -0,0 +1,41 @@
+@import "../../../../assets/styles/variables";
+@import "../../../../assets/styles/base/variables";
+
+.mt-15 {
+  margin-top: 15px;
+}
+
+.view-more {
+  margin: 20px 20px;
+}
+ion-searchbar ::ng-deep .searchbar-input{
+  border-radius: 10px;
+  border:1px solid $primary-300;
+}
+.create_header ::ng-deep .title.w-90 {
+  color:black;
+}
+.projects-labels{
+  padding-left: 25px;
+  font-weight: 600;
+  margin: 20px 0px;
+}
+
+.container {
+//   width: 100px;
+//   background-color: green;
+  overflow: hidden;
+  white-space: nowrap;
+  ::-webkit-scrollbar {
+    display: none;
+  }
+  .scroll_chip {
+    overflow: auto;
+    margin: 20px 0px;
+  }
+}
+.mg-popup-btn-icon{
+  font-size: 26px;
+  margin: auto;
+  color: $primary-800;
+}
diff --git a/src/app/manage-learn/project/project-listing/project-listing.component.spec.ts b/src/app/manage-learn/project/project-listing/project-listing.component.spec.ts
new file mode 100644
index 000000000..d609b0f52
--- /dev/null
+++ b/src/app/manage-learn/project/project-listing/project-listing.component.spec.ts
@@ -0,0 +1,199 @@
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { ProjectListingComponent } from './project-listing.component';
+import { UnnatiDataService } from '../../core/services/unnati-data.service';
+import { LoaderService } from "../../core";
+import { UtilsService } from '../../core';
+import { Router } from '@angular/router';
+import { of, throwError } from 'rxjs';
+import { Platform } from '@ionic/angular';
+import { DbService } from '../../core/services/db.service';
+import { HttpClient } from '@angular/common/http';
+import { AppHeaderService } from '../../../../services/app-header.service';
+import { RouterLinks } from '../../../app.constant';
+import { Location } from '@angular/common';
+import { HttpClientTestingModule, HttpTestingController, } from '@angular/common/http/testing';
+
+describe('ProjectListingComponent', () => {
+    let component: ProjectListingComponent;
+    let mockUnnatiDataService: Partial<UnnatiDataService> = {}
+    const mockLoaderService: Partial<LoaderService> = {}
+    const mockUtilsService: Partial<UtilsService> = {}
+    const mockRouter: Partial<Router> = {}
+    const mockAppHeaderService: Partial<AppHeaderService> = {}
+    const mockRouterLinks: Partial<RouterLinks> = {}
+    const mockPlatform: Partial<Platform> = {}
+    const mockDbService: Partial<DbService> = {}
+    let mockHttpClient: Partial<HttpClient> = {}
+    const mockLocation: Partial<Location> = {}
+
+    beforeAll(() => {
+        component = new ProjectListingComponent(
+            mockRouter as Router,
+            mockLocation as Location,
+            mockAppHeaderService as AppHeaderService,
+            mockPlatform as Platform,
+            mockUnnatiDataService as UnnatiDataService,
+            mockLoaderService as LoaderService,
+            mockDbService as DbService,
+            mockHttpClient as HttpClient,
+            mockUtilsService as UtilsService,
+        )
+    })
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('Should be intiate Project listing compnent', () => {
+        expect(ProjectListingComponent).toBeTruthy();
+    })
+
+    describe('ionViewWillEnter', () => {
+        it('Should return list of projects / projectsList by invoked ionViewWillEnter', (done) => {
+            // arrange 
+            mockUtilsService.getProfileInfo = jest.fn(() => Promise.resolve(true));
+            mockUnnatiDataService.post = jest.fn(() =>
+                of({
+                    result: {
+                        data: [
+                            {
+                                description: "Come See Our School!- Parent Mela",
+                                externalId: "AP-TEST-PROGRAM-3.6.5-IMP-PROJECT-1-DEO",
+                                name: "Come See Our School!- Parent Mela",
+                                programId: "600ab53cc7de076e6f993724",
+                                programName: "AP-TEST-PROGRAM-3.6.5",
+                                projectTemplateId: "600acc61a0cc3e4909f91f80",
+                                solutionId: "600acc42c7de076e6f995147",
+                                type: "improvementProject",
+                                _id: "60116ad0b2126d76f60b0fb3",
+                            }
+                        ],
+                    },
+                })
+            );
+            
+            mockAppHeaderService.getDefaultPageConfig = jest.fn(() => ({
+                showHeader: true,
+                showBurgerMenu: true,
+                pageTitle: 'string',
+                actionButtons: ['true'],
+            }));
+            mockAppHeaderService.updatePageConfig = jest.fn();
+            mockPlatform.backButton = {
+                subscribeWithPriority: jest.fn((_, cb) => {
+                    setTimeout(() => {
+                        cb();
+                    }, 0);
+                    return {
+                        unsubscribe: jest.fn()
+                    };
+                }),
+            } as any;
+            mockLoaderService.startLoader = jest.fn(() => Promise.resolve());
+            mockLoaderService.stopLoader = jest.fn(() => Promise.resolve());
+            mockLocation.back = jest.fn();
+            // act
+            component.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockUtilsService.getProfileInfo).toHaveBeenCalled();
+                expect(mockUnnatiDataService.post).toHaveBeenCalled();
+                expect(component.projects.length).toBeGreaterThan(0);
+                expect(mockAppHeaderService.getDefaultPageConfig).toHaveBeenCalled();
+                expect(mockAppHeaderService.updatePageConfig).toHaveBeenCalled();
+                expect(mockPlatform.backButton).not.toBeUndefined();
+                expect(mockLocation.back).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('Re assign project array if no projects is present', (done) => {
+            // arrange
+            mockUtilsService.getProfileInfo = jest.fn(() => Promise.resolve(true));
+            mockUnnatiDataService.post = jest.fn(() => throwError({}));
+            mockLoaderService.startLoader = jest.fn(() => Promise.resolve());
+            mockLoaderService.stopLoader = jest.fn(() => Promise.resolve());
+            // act
+            component.getProjectList();
+            // assert
+            setTimeout(() => {
+                expect(mockUtilsService.getProfileInfo).toHaveBeenCalled();
+                expect(mockUnnatiDataService.post).toHaveBeenCalled();
+                expect(component.projects.length).toBe(0);
+                done();
+            }, 0);
+        });
+
+        it('Should unsubscribe if backButtonFunc is not undefined', (done) => {
+            // arrange
+            mockPlatform.backButton = {
+                subscribeWithPriority: jest.fn((_, cb) => {
+                    setTimeout(() => {
+                        cb();
+                    }, 0);
+                    return {
+                        unsubscribe: jest.fn()
+                    };
+                }),
+            } as any;
+            // act
+            component.ionViewWillLeave();
+            // assert
+            setTimeout(() => {
+                // expect(mockPlatform.backButton.unsubscribe).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('ProjectDetail', () => {
+        it('Should navigate to project detail Page', (done) => {
+            //arrange
+            mockRouter.navigate = jest.fn();
+            // act
+            let project = {
+                programId: '600ab53cc7de076e6f993724',
+                solutionId: '600acc42c7de076e6f995147'
+            }
+            let id = '60116ad0b2126d76f60b0fb3';
+            component.selectedProgram(id, project);
+            // assert
+            setTimeout(() => {
+                expect(mockRouter.navigate).toHaveBeenCalledWith(['project/details', id, project.programId, project.solutionId]);
+                done();
+            }, 0);
+        })
+    });
+
+    describe('CreateProject', () => {
+        it('Should navigate to create project Page', (done) => {
+            //arrange
+            mockRouter.navigate = jest.fn();
+            // act
+            component.createProject();
+            // assert
+            setTimeout(() => {
+                expect(mockRouter.navigate).toHaveBeenCalledWith(['/project/create-project'], {
+                    queryParams: {}
+                });
+                done();
+            }, 0);
+        })
+    });
+
+    describe('Loadmore', () => {
+        it('Should load more projects based on limit and page.', (done) => {
+            //arrange
+            component.page = 0;
+            // act
+            component.loadMore();
+            // assert 
+            setTimeout(() => {
+                expect(component.page).toBe(1);
+                done();
+            }, 0);
+        })
+    })
+});
\ No newline at end of file
diff --git a/src/app/manage-learn/project/project-listing/project-listing.component.ts b/src/app/manage-learn/project/project-listing/project-listing.component.ts
new file mode 100644
index 000000000..71265061a
--- /dev/null
+++ b/src/app/manage-learn/project/project-listing/project-listing.component.ts
@@ -0,0 +1,383 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { RouterLinks } from '@app/app/app.constant';
+import { AppHeaderService, CommonUtilService } from '@app/services';
+import { Subscription } from 'rxjs';
+import { Location } from '@angular/common';
+import { UnnatiDataService } from '../../core/services/unnati-data.service';
+import { LoaderService, UtilsService, ToastService } from "../../core";
+import { DbService } from '../../core/services/db.service';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { Platform } from '@ionic/angular';
+import { LibraryFiltersLayout } from '@project-sunbird/common-consumption-v8';
+import { TranslateService } from '@ngx-translate/core';
+import { SyncService } from '../../core/services/sync.service';
+import { PopoverController, ToastController } from '@ionic/angular';
+import { KendraApiService } from '../../core/services/kendra-api.service';
+import { GenericPopUpService } from '../../shared';
+
+@Component({
+    selector: 'app-project-listing',
+    templateUrl: './project-listing.component.html',
+    styleUrls: ['./project-listing.component.scss'],
+})
+export class ProjectListingComponent implements OnInit {
+    private backButtonFunc: Subscription;
+    page = 1;
+    count = 0;
+    description;
+    limit = 10;
+    searchText: string = '';
+    headerConfig = {
+        showHeader: true,
+        showBurgerMenu: false,
+        actionButtons: [],
+    };
+    projects = [];
+    // filters = [{
+    //   name: 'FRMELEMNTS_LBL_ASSIGNED_TO_ME',
+    //   parameter: 'assignedToMe',
+    //   selected: true
+    // },
+    // {
+    //   name: 'FRMELEMNTS_LBL_CREATED_BY_ME',
+    //   parameter: 'createdByMe',
+    //   selected: false
+    // }];
+    filters = [];
+    selectedFilterIndex = 0;
+    selectedFilter;
+    layout = LibraryFiltersLayout.ROUND;
+    payload;
+    networkFlag: any;
+    private _networkSubscription?: Subscription;
+    private _toast: any;
+
+    constructor(
+        private router: Router,
+        private location: Location,
+        private headerService: AppHeaderService,
+        private platform: Platform,
+        private unnatiService: UnnatiDataService,
+        private kendra: KendraApiService,
+        private loader: LoaderService,
+        private translate: TranslateService,
+        private utils: UtilsService,
+        private commonUtilService: CommonUtilService,
+        private syncService: SyncService,
+        private db: DbService,
+        private popOverCtrl: PopoverController,
+        private toastController: ToastController,
+        private popupService: GenericPopUpService,
+        private toastService: ToastService
+
+    ) {
+        this.translate.get(['FRMELEMNTS_LBL_ASSIGNED_TO_ME', 'FRMELEMNTS_LBL_CREATED_BY_ME']).subscribe(translations => {
+            this.filters = [translations['FRMELEMNTS_LBL_CREATED_BY_ME'], translations['FRMELEMNTS_LBL_ASSIGNED_TO_ME']];
+            this.selectedFilter = this.filters[0];
+        });
+    }
+
+    ngOnInit() { }
+
+    async getDownloadedProjects(fields?: any[]): Promise<[]> {
+        let isAprivateProgramQuery;
+        this.selectedFilterIndex === 1 ? (isAprivateProgramQuery = false) : (isAprivateProgramQuery = { $ne: false });
+        let query = {
+            selector: {
+                downloaded: true,
+                isAPrivateProgram: isAprivateProgramQuery,
+            },
+        };
+
+        fields ? (query['fields'] = fields) : null;
+
+        try {
+            let data: any = await this.db.customQuery(query);
+            return data.docs;
+        } catch (error) {
+            console.log(error);
+        }
+    }
+
+    private initNetworkDetection() {
+        this.networkFlag = this.commonUtilService.networkInfo.isNetworkAvailable;
+        if (!this.networkFlag) {
+            this.getOfflineProjects();
+        } else {
+            this.getProjectList();
+        }
+        this._networkSubscription = this.commonUtilService.networkAvailability$.subscribe(async (available: boolean) => {
+            this.clearFields();
+            if (this.networkFlag !== available) {
+                if (this._toast) {
+                    await this._toast.dismiss();
+                    this._toast = undefined;
+                }
+                if (!available) {
+                    this.clearFields();
+                    this.getOfflineProjects();
+                } else {
+                    this.projects = []
+                    this.getProjectList();
+                }
+            }
+            this.networkFlag = available;
+        });
+    }
+
+    clearFields() {
+        this.searchText = '';
+        this.page = 1;
+        this.count = 0;
+    }
+
+    async getOfflineProjects() {
+        this.projects = await this.getDownloadedProjects();
+    }
+
+    private async presentPopupForOffline(text = this.commonUtilService.translateMessage('INTERNET_CONNECTIVITY_NEEDED')) {
+        const toast = await this.toastController.create({
+            message: text,
+            position: 'top',
+            duration: 2000,
+            color: 'danger',
+        });
+        toast.present();
+    }
+
+    ionViewWillEnter() {
+        this.projects = [];
+        this.page = 1;
+        // this.getProjectList();
+        this.initNetworkDetection();
+        this.headerConfig = this.headerService.getDefaultPageConfig();
+        this.headerConfig.actionButtons = [];
+        this.headerConfig.showHeader = true;
+        this.headerConfig.showBurgerMenu = false;
+        this.headerService.updatePageConfig(this.headerConfig);
+        this.handleBackButton();
+    }
+
+    getDataByFilter(filter) {
+        this.projects = [];
+        this.page = 1;
+        // this.filters.forEach(element => {
+        //   element.selected = element.parameter == parameter.parameter ? true : false;
+        // });
+        // this.selectedFilter = parameter.parameter;
+        this.selectedFilter = filter ? filter.data.text : this.selectedFilter;
+        this.selectedFilterIndex = filter ? filter.data.index : this.selectedFilterIndex;
+        this.searchText = '';
+        // this.getProjectList();
+        if (!this.networkFlag) {
+            this.getOfflineProjects();
+        } else {
+            this.getProjectList();
+        }
+    }
+    async getProjectList() {
+        let offilineIdsArr = await this.getDownloadedProjects(['_id']);
+
+        this.loader.startLoader();
+        const selectedFilter = this.selectedFilterIndex === 1 ? 'assignedToMe' : 'createdByMe';
+        if (selectedFilter == 'assignedToMe') {
+            this.payload = !this.payload ? await this.utils.getProfileInfo() : this.payload;
+        }
+        const config = {
+            url: urlConstants.API_URLS.GET_TARGETED_SOLUTIONS + '?type=improvementProject&page=' + this.page + '&limit=' + this.limit + '&search=' + this.searchText + '&filter=' + selectedFilter,
+            payload: selectedFilter == 'assignedToMe' ? this.payload : ''
+        }
+        this.kendra.post(config).subscribe(success => {
+            this.loader.stopLoader();
+            this.projects = this.projects.concat(success.result.data);
+            this.projects.map((p) => {
+                if (offilineIdsArr.find((offProject) => offProject['_id'] == p._id)) p.downloaded = true;
+            });
+            this.count = success.result.count;
+            this.description = success.result.description;
+        }, error => {
+            this.projects = [];
+            this.loader.stopLoader();
+        })
+    }
+
+    ionViewWillLeave() {
+        if (this.backButtonFunc) {
+            this.backButtonFunc.unsubscribe();
+        }
+         this.utils.closeProfileAlert();
+    }
+
+    public handleBackButton() {
+        this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
+            this.location.back();
+            this.backButtonFunc.unsubscribe();
+        });
+    }
+
+    selectedProgram(project) {
+        const selectedFilter = this.selectedFilterIndex === 1 ? 'assignedToMe' : 'createdByMe';
+        this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.DETAILS}`], {
+            queryParams: {
+                projectId: project._id,
+                programId: project.programId,
+                solutionId: project.solutionId,
+                type: selectedFilter,
+            },
+        });
+    }
+
+    loadMore() {
+        this.page = this.page + 1;
+        this.getProjectList();
+    }
+    async onSearch(e) {
+        if (!this.networkFlag) {
+            this.presentPopupForOffline(this.commonUtilService.translateMessage('FRMELEMNTS_MSG_OFFLINE_SEARCH'));
+            return;
+        }
+        this.projects = [];
+        this.page = 1;
+        this.getProjectList();
+    }
+
+    async createProject(data) {
+        if (!this.networkFlag) {
+            this.presentPopupForOffline(this.commonUtilService.translateMessage('FRMELEMNTS_MSG_OFFLINE_CREATE_PROJECT'));
+            return;
+        }
+        this.router.navigate([`${RouterLinks.CREATE_PROJECT_PAGE}`], {
+            queryParams: { hasAcceptedTAndC: data },
+        });
+    }
+
+    async downloaded(project) {
+        let projectData
+        try {
+            projectData = await this.db.getById(project._id);
+
+        } catch (error) {
+            projectData = null
+        }
+        if (projectData) {
+            projectData.downloaded = true
+            await this.db.update(projectData)
+            project.downloaded = true
+            //  this.initNetworkDetection()
+            return
+        }
+
+
+        this.loader.startLoader();
+        let payload = this.selectedFilterIndex == 1 ? await this.utils.getProfileInfo() : '';
+        let id = project._id ? '/' + project._id : '';
+        const config = {
+            url: urlConstants.API_URLS.GET_PROJECT + id + '?solutionId=' + project.solutionId,
+            payload: this.selectedFilterIndex == 1 ? payload : {},
+        };
+        console.log(config, "config");
+        this.unnatiService.post(config).subscribe(async (success) => {
+            this.loader.stopLoader();
+            let data = success.result;
+            success.result.downloaded = true;
+            let newCategories = []
+            for (const category of data.categories) {
+                if (category._id || category.name) {
+                    const obj = {
+                        label: category.name || category.label,
+                        value: category._id
+                    }
+                    newCategories.push(obj)
+                }
+            }
+            data.categories = newCategories.length ? newCategories : data.categories;
+            if (data.tasks) {
+
+                data.tasks.map(t => {
+                    if ((t.type == 'observation' || t.type == 'assessment') && t.submissionDetails && t.submissionDetails.status) {
+                        if (t.submissionDetails.status != t.status) {
+                            t.status = t.submissionDetails.status
+                            t.isEdit = true;
+                            data.isEdit = true
+                        }
+                    }
+                })
+
+            }
+            await this.db.create(success.result)
+            // this.initNetworkDetection()
+            project.downloaded = true;
+
+        })
+
+    }
+
+    ngOnDestroy() {
+        if (this._networkSubscription) {
+            this._networkSubscription.unsubscribe();
+            if (this._toast) {
+                this._toast.dismiss();
+                this._toast = undefined;
+            }
+        }
+    }
+
+    doAction(id?, project?) {
+        if (project) {
+            const selectedFilter = this.selectedFilterIndex === 1 ? 'assignedToMe' : 'createdByMe';
+            if (!project.hasAcceptedTAndC && selectedFilter == 'createdByMe') {
+                this.popupService.showPPPForProjectPopUp('FRMELEMNTS_LBL_PROJECT_PRIVACY_POLICY', 'FRMELEMNTS_LBL_PROJECT_PRIVACY_POLICY_TC', 'FRMELEMNTS_LBL_TCANDCP', 'FRMELEMNTS_LBL_SHARE_PROJECT_DETAILS', 'https://diksha.gov.in/term-of-use.html', 'privacyPolicy').then((data: any) => {
+                    if (data && data.isClicked) {
+                        if (data.isChecked) {
+                            if (this.networkFlag) {
+                                this.checkProjectInLocal(id, data.isChecked, project);
+                            } else {
+                                this.toastService.showMessage('FRMELEMNTS_MSG_PROJECT_PRIVACY_POLICY_TC_OFFLINE', 'danger');
+                                this.selectedProgram(project);
+                            }
+                        } else {
+                            this.selectedProgram(project);
+                        }
+                    }
+                })
+            } else {
+                this.selectedProgram(project);
+            }
+        } else {
+            this.popupService.showPPPForProjectPopUp('FRMELEMNTS_LBL_PROJECT_PRIVACY_POLICY', 'FRMELEMNTS_LBL_PROJECT_PRIVACY_POLICY_TC', 'FRMELEMNTS_LBL_TCANDCP', 'FRMELEMNTS_LBL_SHARE_PROJECT_DETAILS', 'https://diksha.gov.in/term-of-use.html', 'privacyPolicy').then((data: any) => {
+               data && data.isClicked ? this.createProject(data.isChecked) : '';
+            })
+        }
+    }
+
+    checkProjectInLocal(id, status, selectedProject) {
+        this.db.query({ _id: id }).then(
+            (success) => {
+                if (success.docs.length) {
+                    let project = success.docs.length ? success.docs[0] : {};
+                    project.hasAcceptedTAndC = status;
+                    this.db.update(project)
+                        .then((success) => {
+                            this.updateInserver(project);
+                        })
+                } else {
+                    selectedProject.hasAcceptedTAndC = status;
+                    selectedProject.hasAcceptedTAndC ? this.updateInserver(selectedProject) : this.selectedProgram(selectedProject);
+                }
+            },
+            (error) => {
+            }
+        );
+    }
+    updateInserver(project) {
+        let payload = {
+            _id: project._id,
+            lastDownloadedAt: project.lastDownloadedAt,
+            hasAcceptedTAndC: project.hasAcceptedTAndC
+        }
+        this.syncService.syncApiRequest(payload, false).then(resp => {
+            this.selectedProgram(project);
+        })
+    }
+}
diff --git a/src/app/manage-learn/project/project-operation/project-operation.page.html b/src/app/manage-learn/project/project-operation/project-operation.page.html
new file mode 100644
index 000000000..d6a5a19e9
--- /dev/null
+++ b/src/app/manage-learn/project/project-operation/project-operation.page.html
@@ -0,0 +1,118 @@
+<ion-toolbar>
+  <!-- <ion-buttons slot="start">
+    <ion-button (click)="confirmToClose()">
+      <ion-icon slot="start" name="close"></ion-icon>
+    </ion-button>
+  </ion-buttons> -->
+  <ion-buttons slot="end" (click)="createProject()" *ngIf="showSkip">
+    <ion-button class="skip-icon">
+      <ion-icon slot="end" name="play-skip-forward"></ion-icon>
+    </ion-button>
+    <ion-label class="skip-button"> {{'SKIP' | translate}}
+    </ion-label>
+  </ion-buttons>
+
+</ion-toolbar>
+
+<ion-content *ngIf="template" class="ion-padding">
+  <div class="project-title">
+    <ion-label position="floating" class="font-bold">
+      {{'FRMELEMNTS_LBL_PROJECT_TITLE' | translate}}
+    </ion-label>
+    <ion-input type="text" [(ngModel)]="template.title" readonly="true" class="font-bold"> </ion-input>
+  </div>
+
+  <div class="date-block">
+    <ion-label position="stacked" class="font-bold"> {{'FRMELEMNTS_LBL_SET_DATE' | translate}}</ion-label>
+    <p class="label-hint"> {{'FRMELEMNTS_LBL_SET_DATE_HINT' | translate}} </p>
+    <ion-row>
+      <ion-col size="6">
+        <ion-item lines="none">
+          <ion-label position="stacked">
+            {{'FRMELEMNTS_LBL_FROM' | translate }}
+          </ion-label>
+
+          <ion-datetime min="{{currentYear-2}}" max="{{currentYear + 5}}" class="no-rght-brdr-rds"
+            display-timezone="utc" value={{today}} [(ngModel)]="template.startDate" class="project-date"
+            placeholder={{today}} (ionChange)="resetEndDate($event)">
+          </ion-datetime>
+
+          <ion-icon name="caret-down" slot="end"></ion-icon>
+        </ion-item>
+      </ion-col>
+      <ion-col size="6">
+        <ion-item lines="none">
+          <ion-label position="stacked">
+            {{'FRMELEMNTS_LBL_TO' | translate}}
+          </ion-label>
+          <ion-datetime min="{{endDateMin}}" max="{{currentYear + 5}}" class="no-rght-brdr-rds" display-timezone="utc"
+            value={{today}} [(ngModel)]="template.endDate" class="project-date" placeholder={{today}}>
+          </ion-datetime>
+          <ion-icon name="caret-down" slot="end"></ion-icon>
+        </ion-item>
+      </ion-col>
+    </ion-row>
+  </div>
+
+  <div class="program-block" *ngIf="!selectedProgram">
+    <ion-label position="stacked" class="font-bold"> {{'FRMELEMNTS_LBL_SELECT_PROGRAM' | translate}} <span
+        *ngIf="template.showProgramAndEntity">* </span></ion-label>
+    <ion-item lines="none">
+      <ion-input (ionFocus)="checkNetwork('programs')" placeholder="{{'FRMELEMNTS_LBL_SELECT_PROGRAM' | translate}}">
+      </ion-input>
+      <ion-icon name="caret-down" slot="end"></ion-icon>
+    </ion-item>
+  </div>
+  <div *ngIf="selectedProgram" class="program-data">
+    <ion-label position="stacked" class="font-bold">
+      {{'FRMELEMNTS_LBL_SELECT_PROGRAM' | translate}} <span *ngIf="template.showProgramAndEntity">* </span></ion-label>
+    <ion-card class="data-list">
+      <ion-item lines="none">
+        {{selectedProgram.name}}
+        <ion-icon name="close" slot="end" class="remove-icon" *ngIf="selectedProgram?.isAPrivateProgram"
+          (click)="remove(selectedProgram,'program')">
+        </ion-icon>
+      </ion-item>
+    </ion-card>
+  </div>
+  <div class="entity-block">
+    <h5  (click)="checkNetwork('entity')">
+      <ion-icon name="location"></ion-icon> {{'FRMELEMNTS_LBL_ADD_ENTITY' | translate}} <span
+        *ngIf="template.showProgramAndEntity">* </span>
+    </h5>
+    <ion-card *ngIf="selectedEntity" class="data-list">
+      <ion-item lines="none">
+        {{selectedEntity.name}}
+        <ion-icon name="close" slot="end" class="remove-icon" (click)="remove(selectedEntity,'entity')">
+        </ion-icon>
+      </ion-item>
+    </ion-card>
+  </div>
+  <!-- <div class="rating-block" *ngIf="showRatings">
+    <h5>{{'FRMELEMNTS_LBL_LIKED_PROJECT' | translate}} </h5>
+    <p> {{'FRMELEMNTS_MSG_RATING_LABEL_MESSAGE' | translate}} </p>
+    <app-star-ratings [ratingStar]="ratingStar" [userRating]="template.userRating" (onRate)="rating($event)">
+    </app-star-ratings>
+  </div> -->
+  <div class="learningResources" *ngIf="showLearningResources">
+    <h5>{{'FRMELEMNTS_LBL_LINK_LEARNING_RESOURCES' | translate}} </h5>
+    <div *ngIf="selectedResources">
+      <ion-card class="data-list" *ngFor="let lr of selectedResources">
+        <ion-item lines="none">
+          {{lr.name}}
+          <ion-icon name="close" slot="end" class="remove-icon" (click)="remove(lr,'resources')">
+          </ion-icon>
+        </ion-item>
+      </ion-card>
+    </div>
+    <div class="text-center">
+      <ion-icon name="link"></ion-icon>
+      <span (click)="checkNetwork('resources')" class="resources-link">
+        {{'FRMELEMNTS_LBL_CLICK_HERE_TO_VIEW_LIBRARY' | translate}} </span>
+    </div>
+  </div>
+</ion-content>
+<ion-footer *ngIf="template">
+  <div class="footer-btn" (click)="createProject()">{{button | translate}}
+  </div>
+</ion-footer>
\ No newline at end of file
diff --git a/src/app/manage-learn/project/project-operation/project-operation.page.scss b/src/app/manage-learn/project/project-operation/project-operation.page.scss
new file mode 100644
index 000000000..b871b0c01
--- /dev/null
+++ b/src/app/manage-learn/project/project-operation/project-operation.page.scss
@@ -0,0 +1,96 @@
+@import "../../../../assets/styles/variables";
+@import "../../../../assets/styles/base/variables";
+.custom-padding {
+    padding: 0px 10px;
+}
+.skip-icon{
+    margin-bottom: 10px;
+}
+.skip-button {
+    position: absolute;
+    margin-top: 20px;
+    z-index: 99999999999999999999;
+    margin-left: 12px;
+}
+
+.project-title {
+    padding-top: 15px;
+    ion-input {
+        padding: 10px 0px !important;
+        --padding-start: 0px;
+    }
+}
+.resources-link{
+    color:$info-color;
+}
+
+.program-block {
+    margin: 30px 0px;
+    ion-item {
+        // border: 1px solid $dark-grey-color;
+        border-radius: 6px;
+        margin: 10px 0px;
+
+        ion-icon {
+            font-size: 16px;
+        }
+    }
+}
+
+.program-data {
+    margin: 30px 0px;
+}
+
+.entity-block {
+    margin: 50px 0px;
+}
+
+.font-bold {
+    font-weight: 600;
+}
+
+.rating-block {
+    ion-icon {
+        padding: 5px;
+        font-size: 24px;
+        // color: $yellow-color;
+    }
+}
+
+.data-list {
+    padding: 10px;
+    margin: 10px 0px;
+    background:$white-color;
+    ion-item {
+        --padding-start: 0px;
+    }
+
+
+}
+
+.footer-btn {
+    text-align: center;
+    padding: 15px;
+    /* min-height: 50px; */
+    background:$primary-color;
+    color: $white;
+}
+
+.secondary {
+    // background: $dark-brown-color;
+    // color: $white-color
+}
+
+.learningResources {
+    .text-center {
+        text-align: center;
+
+        span {
+            // color: $blue-color;
+        }
+    }
+}
+
+.padding {
+    padding: 0px 15px;
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/project/project-operation/project-operation.page.ts b/src/app/manage-learn/project/project-operation/project-operation.page.ts
new file mode 100644
index 000000000..7f7ddda7b
--- /dev/null
+++ b/src/app/manage-learn/project/project-operation/project-operation.page.ts
@@ -0,0 +1,404 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ModalController, AlertController } from '@ionic/angular';
+import { AddEntityComponent } from '../add-entity/add-entity.component';
+import { LinkLearningResourcesComponent } from '../link-learning-resources/link-learning-resources.component';
+import { AddProgramsComponent } from '../add-programs/add-programs.component';
+import * as moment from 'moment';
+import { HttpClient } from '@angular/common/http';
+import { UtilsService } from '@app/app/manage-learn/core/services/utils.service';
+import { AppHeaderService } from '@app/services';
+import { Subscription } from 'rxjs';
+import { Location } from '@angular/common';
+import { Platform } from '@ionic/angular';
+import { DbService } from '../../core/services/db.service';
+import { TranslateService } from '@ngx-translate/core';
+import { UnnatiDataService } from '../../core/services/unnati-data.service';
+import { LoaderService, NetworkService, ToastService } from '../../core';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { RouterLinks } from '@app/app/app.constant';
+import { SyncService } from '../../core/services/sync.service';
+import cloneDeep from 'lodash/cloneDeep';
+
+// var environment = {
+//   db: {
+//     projects: "project.db",
+//     categories: "categories.db",
+//   },
+//   deepLinkAppsUrl: ''
+// };
+@Component({
+  selector: 'app-project-operation',
+  templateUrl: './project-operation.page.html',
+  styleUrls: ['./project-operation.page.scss'],
+})
+export class ProjectOperationPage implements OnInit {
+  button = 'FRMELEMNTS_BTN_IMPORT_PROJECT';
+  private _appHeaderSubscription?: Subscription;
+
+  selectedProgram;
+  selectedResources;
+  showSkip: boolean;
+  today: any = new Date();
+  currentYear = new Date().getFullYear();
+  endDateMin: any = this.currentYear - 2;
+  showLearningResources = false;
+  showRatings = true;
+  projectId;
+  selectedEntity;
+  template;
+  templateCopy;
+  viewProjectAlert;
+  private backButtonFunc: Subscription;
+  headerConfig = {
+    showHeader: true,
+    showBurgerMenu: false,
+    pageTitle: '',
+    actionButtons: []
+  };
+  constructor(
+    private routerparam: ActivatedRoute,
+    private router: Router,
+    private modalController: ModalController,
+    private http: HttpClient,
+    private utils: UtilsService,
+    private location: Location,
+    private headerService: AppHeaderService,
+    private platform: Platform,
+    private db: DbService,
+    private translate: TranslateService,
+    private alertController: AlertController,
+    private unnatiDataService: UnnatiDataService,
+    private loaderService: LoaderService,
+    private syncServ: SyncService,
+    private networkService: NetworkService,
+    private toast: ToastService
+  ) {
+    this.routerparam.params.subscribe(data => {
+      this.projectId = data.id;
+    })
+    this.routerparam.queryParams.subscribe((params) => {
+      if (params && params.availableInLocal) {
+        if (params.isEdit) {
+          this.button = 'FRMELEMNTS_BTN_SAVE_EDITS';
+          this.showSkip = false;
+        } else if (params.isCreate) {
+          this.button = 'FRMELEMNTS_LBL_VIEW_PROJECT';
+          this.showSkip = true;
+        }
+        this.showLearningResources = true;
+        this.showRatings = false;
+        this.getProjectFromLocal(this.projectId);
+      } else {
+        this.showRatings = true;
+        // this.networkService.isNetworkAvailable ? this.getTemplate(this.projectId) : this.toast.showMessage('MESSAGEs.OFFLINE', 'danger');
+      }
+    });
+
+  }
+
+  ngOnInit() { }
+  ionViewWillEnter() {
+    this.initApp();
+    let data;
+    this.translate.get(["FRMELEMNTS_LBL_PROJECT_VIEW"]).subscribe((text) => {
+      data = text;
+    });
+    this.headerConfig = this.headerService.getDefaultPageConfig();
+    this.headerConfig.actionButtons = [];
+    this.headerConfig.showHeader = false;
+    this.headerConfig.showBurgerMenu = false;
+    this.headerConfig.pageTitle = data["FRMELEMNTS_LBL_PROJECT_VIEW"];
+    this.headerService.updatePageConfig(this.headerConfig);
+    this.handleBackButton();
+  }
+
+  initApp() {
+    this._appHeaderSubscription = this.headerService.headerEventEmitted$.subscribe(eventName => {
+      if (eventName.name === 'skip') {
+        this.createProject();
+      }
+    });
+  }
+  private handleBackButton() {
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
+      this.location.back();
+      this.backButtonFunc.unsubscribe();
+    });
+  }
+  async confirmToClose() {
+    let text;
+    this.translate
+      .get([
+        'FRMELEMNTS_LBL_DISCARD_PROJECT',
+        'FRMELEMNTS_MSG_DISCARD_PROJECT',
+        'FRMELEMNTS_BTN_DISCARD',
+        'FRMELEMNTS_BTN_CONTINUE',
+      ])
+      .subscribe((data) => {
+        text = data;
+      });
+    const alert = await this.alertController.create({
+      cssClass: 'my-custom-class',
+      header: text['FRMELEMNTS_LBL_DISCARD_PROJECT'],
+      message: text['FRMELEMNTS_MSG_DISCARD_PROJECT'],
+      buttons: [
+        {
+          text: text['FRMELEMNTS_BTN_DISCARD'],
+          role: 'cancel',
+          cssClass: 'secondary',
+          handler: (blah) => {
+            this.location.back();
+          },
+        },
+        {
+          text: text['FRMELEMNTS_BTN_CONTINUE'],
+          handler: () => { },
+        },
+      ],
+    });
+    await alert.present();
+  }
+
+  getProjectFromLocal(projectId) {
+    this.db.query({ _id: projectId }).then(success => {
+      this.template = success.docs[0];
+      this.templateCopy = JSON.parse(JSON.stringify(this.template));
+      this.endDateMin = moment(this.template.startDate).format("YYYY-MM-DD");
+      if (this.template.entityName) {
+        this.selectedEntity = {
+          name: this.template.entityName ? this.template.entityName : '',
+          _id: this.template.entityId ? this.template.entityId : '',
+        }
+      }
+      this.selectedResources = this.template.learningResources && this.template.learningResources.length ? this.template.learningResources : [];
+      if (this.template.programName) {
+        this.selectedProgram = {
+          _id: this.template.programId ? this.template.programId : '',
+          name: this.template.programName ? this.template.programName : '',
+          isAPrivateProgram: this.template.isAPrivateProgram
+        }
+      }
+    }, error => {
+      // this.loader.stopLoader();
+    })
+  }
+
+  async openSearchModel(type, url?) {
+    const modal = await this.modalController.create({
+      component: AddProgramsComponent,
+      componentProps: {
+        url: url,
+        type: type
+      }
+      // cssClass: 'my-custom-class'
+    });
+    modal.onDidDismiss().then(data => {
+      if (type == 'entity') {
+        this.selectedEntity = data.data ? data.data : '';
+      } else {
+        this.selectedProgram = data.data ? data.data : '';
+      }
+    })
+    return await modal.present();
+  }
+  addEntity() {
+    // if (this.profileData && this.profileData.state && this.profileData.state._id) {
+    // this.networkService.isNetworkAvailable ? this.openAddEntityModal() : this.showPopupForNoNet('LABELS.UNABLE_TO_ADD_ENTITY', 'MESSAGES.YOU_ARE_WORKING_OFFLINE_TRY_AGAIN', 'LABELS.CANCEL', 'LABELS.TRYAGAIN');
+    // } else {
+    //   this.toast.showMessage('MESSAGES.DISABLED_ADD_ENTITY', 'danger');
+    // }
+    this.openAddEntityModal();
+  }
+  addLearningResources() {
+    this.openAddResourcesModal();
+    // this.networkService.isNetworkAvailable ? this.openAddResourcesModal(urlConstants.API_URLS.LEARNING_RESOURCES_LIST) : this.showPopupForNoNet('LABELS.UNABLE_TO_SHOW_LIBRARY', 'MESSAGES.YOU_ARE_WORKING_OFFLINE_TRY_AGAIN', 'LABELS.CANCEL', 'LABELS.TRYAGAIN');
+  }
+
+  async openAddEntityModal() {
+    let entityType;
+    // if (this.template.entityType && this.template.entityType.length) {
+    //   entityType = this.template.entityType;
+    // }
+    const modal = await this.modalController.create({
+      component: AddEntityComponent,
+      componentProps: {
+        // entityType: entityType ? entityType : null
+      },
+      cssClass: 'my-custom-class'
+    });
+    modal.onDidDismiss().then(data => {
+      this.selectedEntity = data.data ? data.data : '';
+    })
+    return await modal.present();
+  }
+
+  async openAddResourcesModal() {
+    const modal = await this.modalController.create({
+      component: LinkLearningResourcesComponent,
+      componentProps: {
+        selectedResources: cloneDeep(this.selectedResources),
+      },
+      // cssClass: 'my-custom-class'
+    });
+    modal.onDidDismiss().then(data => {
+      this.selectedResources = data.data ? data.data : this.selectedResources;
+    })
+    return await modal.present();
+  }
+  remove(data, type) {
+    if (type == 'entity') {
+      this.selectedEntity = '';
+      if (this.template) {
+        this.template.entityName ? delete this.template.entityName : '';
+        this.template.entityId ? delete this.template.entityId : '';
+      }
+    } else if (type == 'program') {
+      // if (this.template.isAPrivateProgram) {
+      this.selectedProgram = '';
+      this.template.programId ? delete this.template.programId : '';
+      this.template.programName ? delete this.template.programName : '';
+      // }
+    } else if (type == 'resources') {
+      const index = this.selectedResources.indexOf(data, 0);
+      if (index > -1) {
+        this.selectedResources.splice(index, 1);
+      }
+    }
+  }
+
+  resetEndDate(event) {
+    if (event.detail && event.detail.value && (event.detail.value != this.templateCopy.startDate)) {
+      this.endDateMin = moment(event.detail.value).format("YYYY-MM-DD");
+      this.template.endDate = this.template.endDate ? '' : '';
+    }
+  }
+  isMandatoryFieldsFilled() {
+    const isProgramPresent = (this.selectedProgram && this.selectedProgram.name) || (this.selectedProgram && this.selectedProgram._id);
+    const isEntityAdded = (this.selectedEntity && this.selectedEntity._id)
+    if (this.template.showProgramAndEntity && (!isEntityAdded || !isProgramPresent)) {
+      // this.toast.showMessage('MESSAGES.REQUIRED_FIELDS', 'danger');
+      return false
+    }
+    return true
+  }
+
+  update(data) {
+    if (!this.isMandatoryFieldsFilled()) {
+      return
+    }
+    data.isEdit = true;
+    data.isDeleted = false;
+    this.db.update(data).then(success => {
+      this.createProjectModal(data, 'FRMELEMNTS_MSG_PROJECT_UPDATED_SUCCESS', 'FRMELEMNTS_LBL_VIEW_PROJECT');
+    }).catch(error => {
+    })
+  }
+
+
+
+  async createProjectModal(project, header, button, isNew?) {
+    let texts;
+    this.translate.get([header, button]).subscribe(data => {
+      texts = data;
+    })
+    this.viewProjectAlert = await this.alertController.create({
+      cssClass: 'my-custom-class',
+      subHeader: texts[header],
+      backdropDismiss: false,
+      buttons: [
+        {
+          text: texts[button],
+          cssClass: 'secondary',
+          handler: (blah) => {
+            this.showSkip ? this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.DETAILS}`], {
+              queryParams: {
+                projectId: project._id,
+                programId: project.programId,
+                solutionId: project.solutionId
+              }, replaceUrl: true,
+            }) : this.location.back();
+          }
+        }
+      ]
+    });
+    await this.viewProjectAlert.present();
+  }
+  createProject() {
+    if (this.selectedEntity) {
+      this.template.entityId = this.selectedEntity._id;
+      this.template.entityName = this.selectedEntity.name;
+    }
+    if (this.selectedProgram) {
+      !this.selectedProgram.created ? this.template.programId = this.selectedProgram._id : delete this.template.programId
+      this.template.programName = this.selectedProgram.name;
+      this.template.isAPrivateProgram = this.selectedProgram.isAPrivateProgram ? true : false;
+    }
+    this.template.learningResources = this.selectedResources;
+    this.button == 'FRMELEMNTS_LBL_VIEW_PROJECT' ? this.newProjectCreate() : this.update(this.template);
+  }
+
+  newProjectCreate() {
+    this.loaderService.startLoader();
+    let id = this.template._id;;
+    this.template.isDeleted = false;
+    delete this.template._id;
+    const payload = this.syncServ.removeKeys(JSON.parse(JSON.stringify(this.template)), ['isNew', 'isEdit']);
+    delete payload._rev;
+    const config = {
+      url: urlConstants.API_URLS.CREATE_PROJECT,
+      payload: payload
+    }
+    this.unnatiDataService.post(config).subscribe(data => {
+      this.template.isNew = false;
+      this.template.isEdit = false;
+      this.db.delete(id, this.template._rev).then(res => {
+        this.template._id = data.result.projectId;
+        this.template.programId = data.result.programId;
+        this.template.lastDownloadedAt = data.result.lastDownloadedAt;
+        delete this.template._rev;
+        this.loaderService.stopLoader();
+        this.db
+          .create(this.template)
+          .then((success) => {
+            this.createProjectModal(this.template, 'FRMELEMNTS_MSG_PROJECT_CREATED_SUCCESS', 'FRMELEMNTS_LBL_VIEW_PROJECT', true);
+          })
+          .catch((error) => {
+          });
+      }).catch((error) => {
+        this.loaderService.stopLoader();
+      });
+    }, error => {
+      this.loaderService.stopLoader();
+    })
+  }
+  ionViewWillLeave() {
+    if(this.viewProjectAlert ){
+     this.viewProjectAlert.dismiss();
+    }
+   }
+
+
+
+   checkNetwork(type?, url?) {
+    if (this.networkService.isNetworkAvailable) {
+      switch (type) {
+        case 'entity': {
+          this.addEntity();
+          break;
+        }
+        case 'programs': {
+          this.openSearchModel(type);
+          break;
+        }
+        case 'resources': {
+          this.addLearningResources();
+          break;
+        }
+      }
+    } else {
+      this.toast.showMessage('FRMELEMNTS_MSG_PLEASE_GO_ONLINE', 'danger');
+    }
+  }
+}
+
diff --git a/src/app/manage-learn/project/project.module.ts b/src/app/manage-learn/project/project.module.ts
new file mode 100644
index 000000000..40ab09e7d
--- /dev/null
+++ b/src/app/manage-learn/project/project.module.ts
@@ -0,0 +1,88 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { IonicModule } from '@ionic/angular';
+import { TranslateModule } from '@ngx-translate/core';
+import { RouterModule, Routes } from '@angular/router';
+import { CoreModule } from '../core/core.module';
+import { SharedModule } from '../shared/shared.module';
+import { ProjectDetailPage } from './project-detail/project-detail.page';
+import { ProjectListingComponent } from '../project/project-listing/project-listing.component';
+import { LearningResourcesPage } from './learning-resources/learning-resources.page';
+import { ProjectEditPage } from './project-edit/project-edit.page';
+import { ProjectOperationPage } from './project-operation/project-operation.page';
+import { SyncPage } from './sync/sync.page';
+import { TaskViewPage } from './task-view/task-view.page';
+import { RouterLinks } from '@app/app/app.constant';
+import { LinkLearningResourcesComponent } from './link-learning-resources/link-learning-resources.component';
+import { AddEntityComponent } from './add-entity/add-entity.component';
+import { AddProgramsComponent } from './add-programs/add-programs.component';
+import { CreateProjectPage } from './create-project/create-project.page';
+import { CategorySelectComponent } from './category-select/category-select.component';
+import { AttachmentListPage } from './attachment-list/attachment-list.page';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
+import { PipesModule } from '@app/pipes/pipes.module';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ProjectListingComponent
+  },
+  {
+    path: `${RouterLinks.DETAILS}`,
+    component: ProjectDetailPage
+  },
+  {
+    path: `${RouterLinks.TASK_VIEW}/:id/:taskId`,
+    component: TaskViewPage
+  },
+  {
+    path: `${RouterLinks.LEARNING_RESOURCES}/:id/:taskId`,
+    component: LearningResourcesPage
+  },
+  {
+    path: `${RouterLinks.LEARNING_RESOURCES}/:id`,
+    component: LearningResourcesPage
+  },
+  {
+    path: `${RouterLinks.PROJECT_EDIT}/:id`,
+    component: ProjectEditPage
+  },
+  {
+    path: `${RouterLinks.PROJECT_OPERATION}/:id`,
+    component: ProjectOperationPage
+  },
+  {
+    path: `${RouterLinks.CREATE_PROJECT}`,
+    component: CreateProjectPage
+  }, {
+    path: RouterLinks.SYNC,
+    component: SyncPage
+  },
+  {
+    path: `${RouterLinks.ATTACHMENTS}/:id`,
+    component: AttachmentListPage
+  }
+];
+
+@NgModule({
+  declarations: [ProjectDetailPage, ProjectListingComponent, ProjectEditPage, 
+    ProjectOperationPage, LearningResourcesPage, SyncPage, TaskViewPage, AttachmentListPage, 
+    LinkLearningResourcesComponent, AddEntityComponent, AddProgramsComponent, CreateProjectPage, 
+    CategorySelectComponent],
+  entryComponents: [LinkLearningResourcesComponent, AddEntityComponent, 
+    AddProgramsComponent, CategorySelectComponent],
+  imports: [
+    CommonModule,
+    FormsModule,
+    ReactiveFormsModule,
+    IonicModule,
+    CoreModule,
+    SharedModule,
+    TranslateModule.forChild(), 
+    RouterModule.forChild(routes),
+    CommonConsumptionModule,
+    PipesModule
+  ]
+})
+export class ProjectModule { }
diff --git a/src/app/manage-learn/project/sync/sync.page.html b/src/app/manage-learn/project/sync/sync.page.html
new file mode 100644
index 000000000..f853fe49a
--- /dev/null
+++ b/src/app/manage-learn/project/sync/sync.page.html
@@ -0,0 +1,35 @@
+<ion-content>
+  <div class="container">
+    <ion-card class="innerContainer">
+      <ion-card-header>
+        <ion-card-title>{{"FRMELEMNTS_LBL_SYNCING_PROJECT" | translate}}</ion-card-title>
+      </ion-card-header>
+      <div class="flexBox">
+        <div style="flex:1" class="flexBox centerAlign">
+          <ion-spinner name="crescent" color="primary"></ion-spinner>
+        </div>
+        <div style="flex:2">
+          <div class="middleSection">
+            {{"FRMELEMNTS_LBL_SYNCING_PROJECT" | translate}} <span *ngIf="progressPercentage"> ( {{progressPercentage}} % completed)</span>
+          </div>
+          <div *ngIf="allProjects?.length">
+            {{syncIndex+1}} out of {{allProjects?.length}} Syncing
+            <!-- 5 out of 10 Synching -->
+          </div>
+        </div>
+        <!-- <div>
+          <ion-spinner name="crescent" color="primary"></ion-spinner>
+        </div>
+        <div class="middleSection">
+          {{"MESSAGES.SYNCING_PROJECT" | translate}}
+        </div>
+        <div *ngIf="allProjects?.length">
+          {{syncIndex+1}} / {{allProjects?.length}}
+        </div> -->
+      </div>
+
+
+    </ion-card>
+  </div>
+
+</ion-content>
\ No newline at end of file
diff --git a/src/app/manage-learn/project/sync/sync.page.scss b/src/app/manage-learn/project/sync/sync.page.scss
new file mode 100644
index 000000000..6abeb6e16
--- /dev/null
+++ b/src/app/manage-learn/project/sync/sync.page.scss
@@ -0,0 +1,25 @@
+.container {
+    display: flex;
+    justify-content: center;
+    background-color: rgba(0,0,0,.5);
+    align-items: center;
+    height: 100%;
+}
+.innerContainer {
+    width: 90%;
+    padding: 25px 15px;
+    display: flex;
+    justify-content: center;
+    // align-items: center;
+    flex-direction: column;
+}
+.middleSection{
+    margin: 10px 0;
+}
+.centerAlign {
+    justify-content: center;
+    align-items: center;
+}
+.flexBox {
+    display: flex;
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/project/sync/sync.page.ts b/src/app/manage-learn/project/sync/sync.page.ts
new file mode 100644
index 000000000..9e611c195
--- /dev/null
+++ b/src/app/manage-learn/project/sync/sync.page.ts
@@ -0,0 +1,270 @@
+import { Location } from '@angular/common';
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import * as _ from 'underscore';
+import { TranslateService } from '@ngx-translate/core';
+import { SyncService } from '../../core/services/sync.service';
+import { NetworkService } from '../../core/services/network.service';
+import { ToastService } from '../../core';
+import { DbService } from '../../core/services/db.service';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { SharingFeatureService } from '../../core/services/sharing-feature.service';
+
+var environment = {
+  db: {
+    projects: "project.db",
+    categories: "categories.db",
+  },
+  deepLinkAppsUrl: ''
+};
+
+@Component({
+  selector: 'app-sync',
+  templateUrl: './sync.page.html',
+  styleUrls: ['./sync.page.scss'],
+})
+export class SyncPage implements OnInit, OnDestroy {
+
+  projectId;
+  projectDetails;
+  allProjects = [];
+  syncIndex: number = 0;
+  allStrings;
+  progressPercentage = 0;
+  attachments = [];
+  imageUploadIndex = 0;
+  taskId;
+  fileName;
+  isShare;
+  syncCompletedProjects = []
+  constructor(
+    private routerparam: ActivatedRoute,
+    private toast: ToastService,
+    private location: Location,
+    private syncServ: SyncService,
+    private translate: TranslateService,
+    private db: DbService,
+    private network: NetworkService,
+    private share: SharingFeatureService) {
+    this.db.createPouchDB(environment.db.projects);
+    this.translate
+      .get([
+        "FRMELEMNTS_MSG_PROJCET_ALREADY_UPTODATE",
+        "FRMELEMNTS_MSG_SUCCESSFULLY_SYNCED",
+        "FRMELEMNTS_MSG_SOMETHING_WENT_WRONG",
+        "FRMELEMNTS_MSG_SYNC_FAILED",
+        "FRMELEMNTS_MSG_OFFLINE"
+      ])
+      .subscribe((data) => {
+        this.allStrings = data
+      });
+    if (this.network.isNetworkAvailable) {
+      this.routerparam.queryParams.subscribe((params) => {
+        if (params && params.projectId) {
+          //Sync only single project
+          this.projectId = params.projectId;
+          this.taskId = params.taskId ? params.taskId : '';
+          this.isShare = params.share;
+          this.fileName = params.fileName;
+          this.getProjectFromId(params.projectId);
+        } else {
+          //sync mutiple projects
+          this.getAllUnSyncedProject();
+        }
+      })
+    } else {
+      this.toast.showMessage('FRMELEMNTS_MSG_OFFLINE', 'danger');
+      this.location.back();
+    }
+  }
+
+  ngOnInit() {
+  }
+
+  ngOnDestroy() {
+  }
+
+  //get single project from db
+  getProjectFromId(projectId) {
+    this.db.customQuery({
+      selector: {
+        _id: projectId,
+        $or: [
+          { isNew: true },
+          { isEdit: true },
+        ]
+      }
+    }).then(success => {
+      if (success['docs'].length) {
+        this.allProjects.push(success['docs'][0]);
+        this.checkForActions();
+      } else {
+        this.location.back()
+        this.toast.showMessage(this.allStrings['FRMELEMNTS_MSG_PROJCET_ALREADY_UPTODATE'], 'danger')
+      }
+    }, error => { })
+  }
+
+  //get all new and edited projects (for overall sync)
+  getAllUnSyncedProject() {
+    this.db.customQuery({
+      selector: {
+        $or: [
+          { isNew: true },
+          { isEdit: true },
+        ]
+      }
+    }).then(success => {
+      if (success['docs'].length) {
+        this.allProjects = this.allProjects.concat(success['docs']);
+        this.checkForActions();
+      } else {
+        this.location.back()
+        this.toast.showMessage(this.allStrings['FRMELEMNTS_MSG_PROJCET_ALREADY_UPTODATE'])
+      };
+    }, error => { })
+  }
+
+  //Check if the project is new or edited existing
+  checkForActions() {
+    if (this.allProjects[this.syncIndex]) {
+      if (this.allProjects[this.syncIndex].isNew) {
+        this.createProjectCall()
+      } else {
+        this.attachments = this.syncServ.getAllAttachmentOfProject(this.allProjects[this.syncIndex]);
+        this.attachments.length ? this.getImageUploadUrls() : this.doSyncCall();
+      }
+      this.calculateProgressPercentage()
+    } else {
+      this.syncIndex = 0;
+      this.toast.showMessage(this.allStrings['FRMELEMNTS_MSG_SUCCESSFULLY_SYNCED']);
+      if (this.isShare) {
+        this.getPdfUrl(this.fileName, this.taskId);
+      }
+      this.location.back();
+    }
+  }
+
+  calculateProgressPercentage() {
+    let percent = ((this.syncCompletedProjects.length) / this.allProjects.length) * 100;
+    this.progressPercentage = Math.round(percent);
+  }
+
+  //create projectId API call for new projects
+  createProjectCall() {
+    this.syncServ.createNewProject().then(success => {
+      this.updateProjectDoc(success.result);
+    }).catch(error => {
+      this.toast.showMessage(this.allStrings['FRMELEMNTS_MSG_SOMETHING_WENT_WRONG'], 'danger');
+      this.location.back();
+    })
+  }
+
+  //Map project id to existing doc. create a new doc and delete the old doc
+  updateProjectDoc(newPrjctDetails) {
+    const _rev = this.allProjects[this.syncIndex]._rev;
+    const oldPrjstId = this.allProjects[this.syncIndex]._id;
+    this.allProjects[this.syncIndex]._id = newPrjctDetails._id;
+    this.allProjects[this.syncIndex].lastDownloadedAt = newPrjctDetails.lastDownloadedAt;
+    delete this.allProjects[this.syncIndex]._rev;
+    //remove is isNew flag from project meta, task and sub task
+    const newObj = this.syncServ.removeKeys(this.allProjects[this.syncIndex], ['isNew'])
+    this.db.create(newObj).then(success => {
+      this.allProjects[this.syncIndex]._rev = success.rev;
+      this.db.delete(oldPrjstId, _rev).then(deleteSuccess => {
+        this.attachments = this.syncServ.getAllAttachmentOfProject(this.allProjects[this.syncIndex]);
+        this.attachments.length ? this.getImageUploadUrls() : this.doSyncCall();
+      }).catch(deletError => {
+        this.toast.showMessage(this.allStrings['FRMELEMNTS_MSG_SOMETHING_WENT_WRONG'], 'danger');
+        this.location.back();
+      })
+    }).catch(error => {
+      this.toast.showMessage(this.allStrings['FRMELEMNTS_MSG_SOMETHING_WENT_WRONG'], 'danger');
+      this.location.back();
+
+    })
+  }
+
+  //Syn project API call
+  doSyncCall() {
+    const paylod = this.createSyncPayload();
+    this.syncServ.syncApiRequest(paylod).then(success => {
+      this.allProjects[this.syncIndex] = this.syncServ.removeKeys(this.allProjects[this.syncIndex], ['isNew', 'isEdit']);
+      (success.result && success.result.programId) ? this.allProjects[this.syncIndex]['programId'] = success.result.programId : null;
+      this.updateSyncedDataToDb();
+    }).catch(error => {
+      this.location.back();
+    })
+  }
+
+  //update the synced data to local
+  updateSyncedDataToDb() {
+    this.db.update(this.allProjects[this.syncIndex]).then(success => {
+      this.syncCompletedProjects.push(this.allProjects[this.syncIndex]);
+      this.syncIndex++;
+      this.resetImageUploadVariables()
+      this.checkForActions();
+    }).catch(error => {
+
+    })
+  }
+
+  createSyncPayload() {
+    const payload = { ...this.allProjects[this.syncIndex] };
+    const filteredTasks = _.filter(payload.tasks, (task) => {
+      return task.isNew || task.isEdit
+    })
+    delete payload.createdAt;
+    delete payload.updatedAt;
+    delete payload.downloaded
+    payload.tasks = filteredTasks;
+    return this.syncServ.removeKeys(payload, ['isNew', 'isEdit'])
+  }
+
+  getImageUploadUrls() {
+    const project = { ...this.allProjects[this.syncIndex] };
+    this.syncServ.getImageUploadUrls(project).then(imageInfo => {
+      for (let i = 0; i < this.attachments.length; i++) {
+        this.attachments[i].uploadUrl = imageInfo[i].url;
+        this.attachments[i].cloudStorage = imageInfo[i].cloudStorage;
+        for (const key of Object.keys(imageInfo[i].payload)) {
+          this.attachments[i][key] = imageInfo[i].payload[key];
+        }
+      }
+      this.cloudUpload(this.attachments[this.imageUploadIndex])
+    }).catch(error => {
+
+    })
+  }
+
+  resetImageUploadVariables() {
+    this.imageUploadIndex = 0;
+    this.attachments = [];
+  }
+
+  cloudUpload(imageDetails) {
+    this.syncServ.cloudImageUpload(imageDetails).then(success => {
+      delete this.attachments[this.imageUploadIndex].cloudStorage;
+      delete this.attachments[this.imageUploadIndex].uploadUrl;
+      delete this.attachments[this.imageUploadIndex].isUploaded;
+      if (this.imageUploadIndex + 1 < this.attachments.length) {
+        this.imageUploadIndex++;
+        this.cloudUpload(this.attachments[this.imageUploadIndex])
+      } else {
+        this.doSyncCall();
+      }
+    }).catch(error => {
+      console.log(error)
+      this.imageUploadIndex++;
+      this.cloudUpload(this.attachments[this.imageUploadIndex])
+    })
+  }
+
+  getPdfUrl(fileName, taskId?) {
+   let task_id = taskId ? taskId : '';
+    const config = {
+      url: urlConstants.API_URLS.GET_SHARABLE_PDF + this.projectId + '?tasks=' + task_id,
+    };
+    this.share.getFileUrl(config, fileName);
+  }
+}
diff --git a/src/app/manage-learn/project/task-view/task-view.page.html b/src/app/manage-learn/project/task-view/task-view.page.html
new file mode 100644
index 000000000..104bf9b98
--- /dev/null
+++ b/src/app/manage-learn/project/task-view/task-view.page.html
@@ -0,0 +1,136 @@
+<ion-content *ngIf="task" class="ion-padding">
+  <div class="heading-name" (click)="edit('task',task?.name)">
+    <h4 *ngIf="editField != 'name'">{{task?.name}}</h4>
+    <ion-icon name="create" color="primary" class="iconAdj"> </ion-icon>
+  </div>
+
+  <div style="margin-bottom: 15px">
+    <div class="heading-name" (click)="edit('assignName',task?.assignee)">
+
+      <h5 style="font-weight: 500"> {{'FRMELEMNTS_LBL_ASSIGN_TASK' | translate}} <span class="assignee _capitalize">:
+          {{task.assignee}}</span> </h5>
+      <div>
+
+        <ion-icon name="create" color="primary" class="iconAdj"> </ion-icon>
+      </div>
+
+
+    </div>
+  </div>
+  <ion-row>
+    <ion-col size="3">
+      <img src="assets/imgs/timetable.png" (click)="setTaskEndDate()" />
+    </ion-col>
+    <ion-col size="9">
+      <ion-datetime (ionChange)="setDate()" #dateTime value="{{task?.endDate}}" display-timezone="utc"
+        min="{{currentYear - 2}}" max="{{currentYear + 5}}" display-timezone="utc" [(ngModel)]="task.endDate">
+      </ion-datetime>
+    </ion-col>
+  </ion-row>
+  <ion-row>
+    <ion-col size="4" class="status-label">
+      <ion-label position="fixed"> {{'FRMELEMNTS_LBL_STATUS' | translate}} </ion-label>
+    </ion-col>
+    <ion-col size="8">
+      
+      <ion-select [(ngModel)]="task.status" class="custom-select" [disabled]="checkDisabled()"
+      [interfaceOptions]="{
+        cssClass: 'select-box',
+        animated: false
+      }"
+        placeholder="{{'FRMELEMNTS_LBL_SELECT_STATUS_PLACEHOLDER' | translate}}" (ionChange)="selectedTaskStatus($event)">
+        <ion-select-option *ngFor="let status of statuses" value="{{status.title}}"
+          selected="status.title === task.status">{{status.title | camelToTitle}}</ion-select-option>
+      </ion-select>
+
+    </ion-col>
+  </ion-row>
+  <div class="subtask-form" *ngIf="task?.type !='observation' && task?.type != 'assessment'">
+    <h4>{{'FRMELEMNTS_LBL_SUBTASKS' | translate}}</h4>
+    <ion-row>
+      <ion-col size="3"> <img src="assets/imgs/subdirectory_arrow.png" class="arrow-image" /> </ion-col>
+      <ion-col size="9">
+        <ion-item>
+          <ion-input type="text" placeholder="{{'FRMELEMNTS_LBL_ADD_SUBTASK_PALCEHOLDER' | translate}}"
+            [(ngModel)]="newSubtask.name" autocapitalize='on'>
+          </ion-input>
+        </ion-item>
+        <ion-button (click)="addSubtask()"> {{'FRMELEMNTS_LBL_ADD_SUBTASK' | translate}} </ion-button>
+      </ion-col>
+    </ion-row>
+  </div>
+
+  <div class="subtask-box " *ngFor="let subtask of task?.children; let subTaskIndex = index">
+    <ion-card class="ion-padding" style="background: #ffffff;" *ngIf="!subtask.isDeleted">
+      <ion-row>
+        <ion-col size="1">
+          <ion-icon name="radio-button-off" color="primary"></ion-icon>
+        </ion-col>
+        <ion-col size="10" class="subtask-title" (click)="edit('subtask',subtask.name,subtask,subTaskIndex)"
+          *ngIf="editField != 'subtaskName'">
+          {{subtask.name}}
+        </ion-col>
+        <ion-col size="1" style="margin: auto; text-align: center">
+          <img src="assets/imgs/Delete.png" style="width: 20px" (click)="askPermissionToDelete(subtask,'subtask')" />
+        </ion-col>
+      </ion-row>
+      <ion-row>
+        <!-- <ion-col size="1"> </ion-col> -->
+        <ion-col size="6">
+          <ion-item class="ion-date-time" lines="none">
+            <img src="assets/imgs/timetable.png" class="subtask-date-picker" />
+            <ion-datetime value="{{subtask?.endDate}}" (ionChange)="setDate()" [(ngModel)]="subtask.endDate" displayFormat="DD/MM/YYYY"
+              min="{{currentYear - 2}}" max="{{currentYear + 5}}" display-timezone="utc"></ion-datetime>
+          </ion-item>
+        </ion-col>
+        <ion-col size="6">
+          <ion-select [(ngModel)]="subtask.status" class="custom-select"
+            placeholder="{{'FRMELEMNTS_LBL_SELECT_STATUS_PLACEHOLDER' | translate}}" (ionChange)="selectedStatus($event)" [interfaceOptions]="{
+                  cssClass: 'select-box',
+                  animated: false
+                }">
+            <ion-select-option *ngFor="let status of statuses" value="{{status.title}}"
+              selected="status.title === subtask.status">{{status.title | camelToTitle}}</ion-select-option>
+          </ion-select>
+        </ion-col>
+      </ion-row>
+    </ion-card>
+  </div>
+
+  <ion-button [disabled]="!enableMarkButton" expand="block" shape="round" (click)="doAction()"
+    class="_capitalize" *ngIf="!task?.learningResources?.length">
+    {{'FRMELEMNTS_LBL_ADD_ATTACHMENTS' | translate}}
+  </ion-button>
+
+  <ion-row *ngIf="task?.learningResources?.length">
+    <ion-col size="5">
+      <ion-button class="roundedButton" expand="block" shape="round" (click)="openResources(task)">
+        {{'FRMELEMNTS_LBL_VIEW_RESOURCES' | translate}}
+      </ion-button>
+    </ion-col>
+    <ion-col size="7">
+      <ion-button class="roundedButton" [disabled]="!enableMarkButton" expand="block" shape="round"
+        (click)="doAction()">
+        {{'FRMELEMNTS_LBL_ADD_ATTACHMENTS' | translate}}
+      </ion-button>
+    </ion-col>
+  </ion-row>
+</ion-content>
+<div *ngIf="showAttachments" class="custom-popup">
+  <div class="pop-container">
+    <div class="pop-msg">
+      <ion-item>
+        <ion-textarea placeholder="{{'FRMELEMNTS_LBL_ADD_REMARKS' | translate}}" [(ngModel)]="task.remarks"> </ion-textarea>
+      </ion-item>
+      <ion-item>
+        <!-- <ion-icon name="attach" slot="end" (click)="openAction()"></ion-icon> -->
+        <ion-icon name="camera" slot="end" (click)="openAction()"></ion-icon>
+      </ion-item>
+    </div>
+    <div class="pop-btn">
+      <ion-button color="primary" expand="block" (click)="insertAttachment()">
+        {{'FRMELEMNTS_LBL_CONTINUE' | translate}}
+      </ion-button>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/app/manage-learn/project/task-view/task-view.page.scss b/src/app/manage-learn/project/task-view/task-view.page.scss
new file mode 100644
index 000000000..f8c2098a3
--- /dev/null
+++ b/src/app/manage-learn/project/task-view/task-view.page.scss
@@ -0,0 +1,82 @@
+@import "src/assets/styles/_variables.scss";
+.heading-name{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.status-label {
+    margin: auto;
+    font-size: 20px;
+    font-weight: 500;
+}
+
+.subtask-form {
+    margin: 0px;
+    padding: 5px;
+
+    .arrow-image {
+        width: 35%;
+        margin-top: 5px;
+    }
+
+    ion-button {
+        text-transform: none;
+    }
+}
+
+.subtask-box {
+    ion-icon {
+        color: #{$blue};
+    }
+
+    .subtask-title {
+        font-family: 'SourceSansPro-Bold' !important;
+        font-weight: 600;
+    }
+
+    ion-row,
+    ion-col {
+        margin: 0px;
+        padding: 0px;
+    }
+}
+
+.custom-popup {
+    position: fixed;
+    z-index: 9999;
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+    background: #a9a9a966;
+    display: flex;
+
+    .border-radius {
+        border-radius: 1em;
+    }
+
+    .pop-container {
+        margin: auto;
+        width: 80%;
+        box-shadow: 0px 1px 4px 1px #5a6779;
+        background: map-get($colors, white);
+        padding: 10px;
+    }
+}
+
+.roundedButton {
+    font-size: 12px;
+}
+.subtask-date-picker{
+    max-width: 25px;  
+    margin-right: 5px;
+}
+
+.assignee {
+    font-weight: normal;
+    margin-left: 20px;
+    font-size: 16px;
+}
+
+.iconAdj {
+    font-size: 20px;
+}
diff --git a/src/app/manage-learn/project/task-view/task-view.page.ts b/src/app/manage-learn/project/task-view/task-view.page.ts
new file mode 100644
index 000000000..a623ba4e1
--- /dev/null
+++ b/src/app/manage-learn/project/task-view/task-view.page.ts
@@ -0,0 +1,381 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { Router, ActivatedRoute } from "@angular/router";
+import * as _ from "underscore";
+import { TranslateService } from "@ngx-translate/core";
+import { AlertController } from "@ionic/angular";
+import { Location } from "@angular/common";
+import { statuses } from "../../core/constants/statuses.constant";
+import { UtilsService } from "../../core/services/utils.service";
+import { NetworkService } from "../../core/services/network.service";
+import { AppHeaderService } from "@app/services";
+import { DbService } from "../../core/services/db.service";
+import { AttachmentService, ToastService } from "../../core";
+import { GenericPopUpService } from '../../shared';
+
+
+var environment = {
+  db: {
+    projects: "project.db",
+    categories: "categories.db",
+  },
+  deepLinkAppsUrl: ''
+};
+@Component({
+  selector: "app-task-view",
+  templateUrl: "./task-view.page.html",
+  styleUrls: ["./task-view.page.scss"],
+})
+export class TaskViewPage implements OnInit {
+  parameters;
+  @ViewChild("dateTime", { static: false }) sTime;
+  editField;
+  task;
+  project;
+  copyOfTaskDetails;
+  attachments = [];
+  showAttachments: boolean = false;
+  enableMarkButton: boolean = false;
+  subTaskCount: number = 0;
+  newSubtask: any = {};
+  currentYear = new Date().getFullYear();
+  statuses = statuses;
+  projectCopy;
+  copyOfSelectEditField;
+  headerConfig = {
+    showHeader: true,
+    showBurgerMenu: false,
+    actionButtons: []
+  };
+
+  constructor(
+    private router: Router,
+    private params: ActivatedRoute,
+    private db: DbService,
+    private utils: UtilsService,
+    private toast: ToastService,
+    private translate: TranslateService,
+    private alert: AlertController,
+    private attachmentService: AttachmentService,
+    private location: Location,
+    private networkService: NetworkService,
+    private headerService: AppHeaderService,
+    private popupService: GenericPopUpService,
+
+    // private openResourceSrvc: OpenResourcesService
+  ) {
+    this.saveChanges = _.debounce(this.saveChanges, 800);
+    this.saveSubTaskChanges = _.debounce(this.saveSubTaskChanges, 800);
+    // this.db.createPouchDB(environment.db.projects);
+    params.params.subscribe((parameters) => {
+      this.parameters = parameters;
+      this.getTask();
+      this.prepareSubTaskMeta();
+    });
+  }
+
+  ngOnInit() { }
+
+
+  ionViewWillEnter() {
+    this.headerConfig = this.headerService.getDefaultPageConfig();
+    this.headerConfig.actionButtons = [];
+    this.headerConfig.showHeader = true;
+    this.headerConfig.showBurgerMenu = false;
+    this.headerService.updatePageConfig(this.headerConfig);
+  }
+
+  prepareSubTaskMeta() {
+    this.newSubtask = JSON.parse(JSON.stringify(this.utils.getMetaData("subTask")));
+  }
+
+  getTask() {
+    this.db.query({ _id: this.parameters.id }).then(
+      (success) => {
+        this.project = success.docs.length ? success.docs[0] : success.docs;
+        this.projectCopy = JSON.parse(JSON.stringify(this.project));
+        // this.copyOfProject = { ...this.project };
+        let task = _.findIndex(this.projectCopy.tasks, (item) => {
+          return item._id == this.parameters.taskId;
+        });
+        task > -1 ? (this.task = this.project.tasks[task]) : this.toast.showMessage("FRMELEMNTS_MSG_NO_TASK_FOUND", "danger");
+        this.enableMarkButton = this.task.status === 'completed' ? true : false;
+        this.copyOfTaskDetails = JSON.stringify(this.task);
+        this.attachments = [];
+        this.getSubtasksCount(this.task).then((data: number) => {
+          this.subTaskCount = data;
+        });
+      },
+      (error) => { }
+    );
+  }
+  selectedStatus(event) {
+    this.enableTaskMarkButton();
+  }
+  selectedTaskStatus(event) {
+    this.task.status == 'completed' ? this.enableMarkButton = true : this.enableMarkButton = false;
+    if (this.task.status == 'completed' && this.task.children && this.task.children.length) {
+      this.task.children.forEach(element => {
+        element.status = 'completed';
+      });
+    }
+    this.enableTaskMarkButton();
+  }
+
+  setDate() {
+    this.update();
+  }
+  setTaskEndDate() {
+    this.sTime.open();
+  }
+  public addSubtask() {
+    if (this.newSubtask.name) {
+      !this.task.children ? (this.task.children = []) : "";
+      this.task.children.push(this.newSubtask);
+      this.enableTaskMarkButton();
+    }
+  }
+  toEdit(type, copyOfString) {
+    this.editField = type;
+    this.copyOfSelectEditField = copyOfString;
+  }
+
+  saveChanges() {
+    if (this.task.name) {
+      this.editField = "";
+      this.update();
+    } else {
+      this.task.name = this.copyOfSelectEditField;
+      this.toast.showMessage("FRMELEMNTS_MSG_REQUIRED_FIELDS", "danger");
+    }
+  }
+
+  saveSubTaskChanges(subtask, index) {
+    if (subtask.name) {
+      this.editField = ""; // removed as it closing the edit field as one letter is entered
+      this.update();
+    } else {
+      this.task.children[index].name = this.copyOfSelectEditField;
+      this.toast.showMessage("FRMELEMNTS_MSG_REQUIRED_FIELDS", "danger");
+    }
+  }
+
+  update(goBack?) {
+    if (this.task.name) {
+      if (!this.task.isEdit) {
+        this.task.isEdit = this.copyOfTaskDetails === JSON.stringify(this.task) ? false : true;
+        this.project.isEdit = this.task.isEdit ? true : this.project.isEdit;
+      }
+      const isProjectEdit = _.filter(this.project.tasks, (eachTask) => {
+        return eachTask.isEdit;
+      });
+      this.project.isEdit = isProjectEdit.length ? true : this.project.isEdit;
+      this.project = this.utils.setStatusForProject(this.project);
+      this.db
+        .update(this.project)
+        .then((success) => {
+          this.project._rev = success.rev;
+          this.prepareSubTaskMeta();
+          this.attachments = [];
+          this.toast.showMessage('FRMELEMNTS_MSG_YOUR_CHANGES_ARE_SAVED', 'success');
+          goBack ? this.location.back() : "";
+        })
+        .catch((error) => { });
+    } else {
+      this.toast.showMessage("FRMELEMNTS_MSG_REQUIRED_FIELDS", "danger");
+    }
+  }
+
+  openResources(task) {
+    if (task && task.learningResources && task.learningResources.length === 1) {
+      let link = task.learningResources[0].link;
+      this.openBodh(link);
+      return;
+    }
+    if (task) {
+      this.router.navigate(["/project/learning-resources", this.project._id, task._id]);
+    } else {
+      this.router.navigate(["/project/learning-resources", this.project._id]);
+    }
+  }
+
+  openBodh(link) {
+    // TODO: add service
+    // this.networkService.isNetworkAvailable
+    //   ? this.openResourceSrvc.openBodh(link)
+    //   : this.toast.showMessage("FRMELEMNTS_MSG_OFFLINE", "danger");
+  }
+
+  delete(data) {
+    data.isDeleted = true;
+    this.enableTaskMarkButton();
+  }
+
+  // task and project delete permission.
+  async askPermissionToDelete(subtask, type) {
+    let data;
+    this.translate.get(["FRMELEMNTS_LBL_DELETE_CONFIRMATION", "CANCEL", "BTN_SUBMIT"]).subscribe((text) => {
+      data = text;
+    });
+    const alert = await this.alert.create({
+      message: data["FRMELEMNTS_LBL_DELETE_CONFIRMATION"],
+      buttons: [
+        {
+          text: data["CANCEL"],
+          role: "cancel",
+          cssClass: "secondary",
+          handler: (blah) => { },
+        },
+        {
+          text: data["BTN_SUBMIT"],
+          handler: () => {
+            this.delete(subtask);
+          },
+        },
+      ],
+    });
+    await alert.present();
+  }
+
+  getSubtasksCount(task) {
+    return new Promise(function (resolve) {
+      let count = 0;
+      if (task.children && task.children.length) {
+        task.children.forEach((subtask) => {
+          if (!subtask.isDeleted) {
+            count = count + 1;
+          }
+        });
+        resolve(count);
+      } else {
+        resolve(null);
+      }
+    });
+  }
+
+  enableTaskMarkButton() {
+    this.getSubtasksCount(this.task).then((count: number) => {
+      this.subTaskCount = count;
+      if (count) {
+        let inProgress = 0;
+        let completed = 0;
+        if (this.task.children.length) {
+          this.task.children.forEach((child) => {
+            if (!child.isDeleted) {
+              if (child.status == "inProgress") {
+                inProgress = inProgress + 1;
+              } else if (child.status == "completed") {
+                completed = completed + 1;
+              }
+            }
+          });
+        }
+        if (count === completed) {
+          this.task.status = "completed";
+        } else if (inProgress > 0) {
+          this.task.status = "inProgress";
+        }
+        this.task.status == "completed" ? (this.enableMarkButton = true) : (this.enableMarkButton = false);
+      } else {
+        this.task.status == "completed" ? (this.enableMarkButton = true) : (this.enableMarkButton = false);
+      }
+      this.update();
+    });
+  }
+
+  markTaskAsCompleted() {
+    this.showAttachments = true;
+  }
+  insertAttachment() {
+    this.showAttachments = false;
+    !this.task.attachments ? (this.task.attachments = []) : "";
+    if (this.attachments && this.attachments.length) {
+      this.attachments.forEach((element) => {
+        this.task.attachments.push(element);
+      });
+    }
+    this.update("goBack");
+  }
+  openAction() {
+    this.attachmentService.selectImage().then((data) => {
+      data.data ? this.attachments.push(data.data) : "";
+    });
+  }
+
+  doAction() {
+    this.popupService.showPPPForProjectPopUp('FRMELEMNTS_LBL_EVIDENCES_CONTENT_POLICY', 'FRMELEMNTS_LBL_EVIDENCES_CONTENT_POLICY_TEXT', 'FRMELEMNTS_LBL_EVIDENCES_CONTENT_POLICY_LABEL', 'FRMELEMNTS_LBL_UPLOAD_EVIDENCES', 'https://diksha.gov.in/term-of-use.html', 'contentPolicy').then((data: any) => {
+      if (data.isClicked) {
+        data.isChecked ? this.markTaskAsCompleted() : this.toast.showMessage('FRMELEMNTS_MSG_EVIDENCES_CONTENT_POLICY_REJECT', 'danger');
+      }
+    })
+  }
+
+  async edit(what, placeholder = "", subtask?, subTaskIndex?) {
+    let name;
+    // what == "task" || what == "assignName" ? (name = "Edit Task") : (name = "Edit Subtask");
+    switch (what) {
+      case 'task':
+        name = "Edit Task"
+        break
+      case 'assignName':
+        name = " Edit Assignee’s Name"
+        break
+      default:
+        name = "Edit Subtask"
+    }
+    const alert = await this.alert.create({
+      cssClass: "my-custom-class",
+      header: name,
+      // message: "Message <strong>text</strong>!!!",
+      inputs: [
+        {
+          name: "field",
+          type: "text",
+          value: placeholder
+        },
+      ],
+      buttons: [
+        {
+          text: "Cancel",
+          role: "cancel",
+          cssClass: "secondary",
+          handler: (blah) => { },
+        },
+        {
+          text: "Save",
+          handler: (data) => {
+            if (data.field == "" && what != "assignName") {
+              this.toast.showMessage("FRMELEMNTS_MSG_REQUIRED_FIELDS", "danger");
+              return;
+            }
+
+            if (what == "subtask") {
+              subtask.name = data.field;
+              this.saveSubTaskChanges(subtask, subTaskIndex);
+            } else if (what == "assignName") {
+              this.task.assignee = data.field;
+              this.saveChanges()
+            } else {
+              this.task.name = data.field;
+              this.update();
+            }
+          },
+        },
+      ],
+    });
+
+    await alert.present();
+    alert.present().then(() => {
+      const firstInput: any = document.querySelector("ion-alert input");
+      firstInput.focus();
+      return;
+    });
+  }
+
+  checkDisabled() {
+    if (this.task.type == "assessment" || this.task.type == "observation") {
+      return this.subTaskCount == 0 || this.subTaskCount == undefined || this.subTaskCount > 0; // disabled all the time 
+    } else {
+      return this.subTaskCount > 0;
+    }
+  }
+}
diff --git a/src/app/manage-learn/questionnaire/matrix-modal/matrix-modal.component.html b/src/app/manage-learn/questionnaire/matrix-modal/matrix-modal.component.html
new file mode 100644
index 000000000..9777c7e10
--- /dev/null
+++ b/src/app/manage-learn/questionnaire/matrix-modal/matrix-modal.component.html
@@ -0,0 +1,56 @@
+
+
+<ion-content>
+  <div class="container">
+    <ion-col class="_flex-box _justify-content-center _flex-direction-column ion-padding">
+      <h4 *ngFor="let question of data.question">{{question}}</h4>
+    </ion-col>
+
+
+    <div *ngFor="let instance of data?.value; let i = index">
+      <ng-container *ngIf="selectedIndex ===i">
+        <ng-container [ngSwitch]="question?.responseType" *ngFor="let question of instance; let j=index" class="ion-margin-bottom">
+          <ion-item-divider color="light" *ngIf="question?.sectionHeader">
+            <h4 class="bold _flex-box sectionHeader ion-text-wrap" >{{question?.sectionHeader}}</h4>
+          </ion-item-divider>
+          <div class="_fullScreenCard" *ngIf="checkForVisibility(j)">
+            <app-text-type-input [inputIndex]="j+1" [data]="question" [generalQuestion]="generalQuestion"
+              [evidenceId]="evidenceId" [schoolId]="schoolId" *ngSwitchCase="'text'" [hideButton]="true"
+              [submissionId]="submissionId" [enableQuestionReadOut]="enableQuestionReadOut"></app-text-type-input>
+            <app-text-type-input [inputIndex]="j+1" [data]="question" [generalQuestion]="generalQuestion"
+              [evidenceId]="evidenceId" [schoolId]="schoolId" *ngSwitchCase="'number'" [submissionId]="submissionId"
+              [hideButton]="true" [enableQuestionReadOut]="enableQuestionReadOut"></app-text-type-input>
+            <app-radio-type-input [inputIndex]="j+1" [data]="question" [generalQuestion]="generalQuestion"
+              [evidenceId]="evidenceId" [schoolId]="schoolId" *ngSwitchCase="'radio'" [submissionId]="submissionId"
+              [hideButton]="true" [enableQuestionReadOut]="enableQuestionReadOut"></app-radio-type-input>
+            <app-date-type-input [inputIndex]="j+1" [data]="question" [generalQuestion]="generalQuestion"
+              [evidenceId]="evidenceId" [schoolId]="schoolId" *ngSwitchCase="'date'" [submissionId]="submissionId"
+              [hideButton]="true" [enableQuestionReadOut]="enableQuestionReadOut"></app-date-type-input>
+            <app-multiple-type-input [inputIndex]="j+1" [data]="question" [generalQuestion]="generalQuestion"
+              [evidenceId]="evidenceId" [schoolId]="schoolId" *ngSwitchCase="'multiselect'"
+              [submissionId]="submissionId" [hideButton]="true" [enableQuestionReadOut]="enableQuestionReadOut">
+            </app-multiple-type-input>
+            <app-slider-type-input [inputIndex]="j+1" [evidenceId]="selectedEvidenceId" [schoolId]="schoolId"
+              [data]="question" [imageLocalCopyId]="localImageListKey" [submissionId]="submissionId"
+              *ngSwitchCase="'slider'" [enableQuestionReadOut]="enableQuestionReadOut"></app-slider-type-input>
+          </div>
+        </ng-container>
+      </ng-container>
+    </div>
+
+  </div>
+</ion-content>
+<div class="_footer customFooter">
+  <ion-row>
+    <ion-col>
+      <ion-button icon-start size="full" color="light" (click)="cancel()">
+        {{'CANCEL'|translate}}
+      </ion-button>
+    </ion-col>
+    <ion-col>
+      <ion-button size="full"  (click)="update()">
+        {{'SAVE'|translate}}
+      </ion-button>
+    </ion-col>
+  </ion-row>
+</div>
\ No newline at end of file
diff --git a/src/app/manage-learn/questionnaire/matrix-modal/matrix-modal.component.scss b/src/app/manage-learn/questionnaire/matrix-modal/matrix-modal.component.scss
new file mode 100644
index 000000000..3f703b726
--- /dev/null
+++ b/src/app/manage-learn/questionnaire/matrix-modal/matrix-modal.component.scss
@@ -0,0 +1,37 @@
+.container {
+    margin-bottom: 60px;
+}
+
+.closeBtn {
+    color: white !important;
+    font-size: 24px;
+    padding-right: 10px
+}
+
+.customFooter {
+    padding: 0;
+}
+
+.hideElement {
+    border: red !important
+}
+
+.sectionHeader {
+    padding-top: 10px;
+}
+
+.flexbox {
+    display: flex;
+    align-items: baseline;
+    flex-wrap: nowrap;
+}
+
+.noWrap {
+    white-space: nowrap;
+    width: fit-content;
+
+}
+
+.wrapText {
+    white-space: wrap;
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/questionnaire/matrix-modal/matrix-modal.component.ts b/src/app/manage-learn/questionnaire/matrix-modal/matrix-modal.component.ts
new file mode 100644
index 000000000..fabfa84b1
--- /dev/null
+++ b/src/app/manage-learn/questionnaire/matrix-modal/matrix-modal.component.ts
@@ -0,0 +1,127 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { ModalController } from '@ionic/angular';
+import { UtilsService } from '../../core';
+
+@Component({
+  selector: 'app-matrix-modal',
+  templateUrl: './matrix-modal.component.html',
+  styleUrls: ['./matrix-modal.component.scss'],
+})
+export class MatrixModalComponent implements OnInit {
+
+  @Input() inputIndex: any;
+  instanceDetails: any;
+  @Input() selectedIndex: any;
+  @Input() data: any;
+  @Input() schoolId: string;
+  @Input() evidenceId: string;
+  @Input() generalQuestion: boolean;
+  @Input() submissionId: string;
+  @Input() enableQuestionReadOut: boolean;
+
+  constructor(
+    private modal: ModalController,
+    private utils: UtilsService
+  ) {
+  }
+
+  ngOnInit() { }
+
+
+  update(): void {
+    for (const question of this.data.value[this.selectedIndex]) {
+      // Do check only for questions without visibleif. For visibleIf questions isCompleted property is set in  checkForVisibility()
+      if (!question.visibleIf) {
+        question.isCompleted = this.utils.isQuestionComplete(question);
+      }
+    }
+    const instanceValue = JSON.parse(JSON.stringify(this.data.value[this.selectedIndex]))
+    this.modal.dismiss(instanceValue)
+  }
+
+  cancel(): void {
+    this.modal.dismiss();
+  }
+
+  checkForVisibility(currentQuestionIndex) {
+    let visibility = false;
+    const currentQuestion = this.data.value[this.selectedIndex][currentQuestionIndex];
+    let display = true;
+    for (const question of this.data.value[this.selectedIndex]) {
+      for (const condition of currentQuestion.visibleIf) {
+        if (condition._id === question._id) {
+          let expression = [];
+          if (condition.operator != "===") {
+            if (question.responseType === 'multiselect') {
+              for (const parentValue of question.value) {
+                for (const value of condition.value) {
+                  expression.push("(", "'" + parentValue + "'", "===", "'" + value + "'", ")", condition.operator);
+                }
+              }
+            } else {
+              for (const value of condition.value) {
+                expression.push("(", "'" + question.value + "'", "===", "'" + value + "'", ")", condition.operator)
+              }
+            }
+            expression.pop();
+          } else {
+            if (question.responseType === 'multiselect') {
+              for (const value of question.value) {
+                expression.push("(", "'" + condition.value + "'", "===", "'" + value + "'", ")", "||");
+              }
+              expression.pop();
+            } else {
+              expression.push("(", "'" + question.value + "'", condition.operator, "'" + condition.value + "'", ")")
+            }
+          }
+          if (!eval(expression.join(''))) {
+            this.data.value[this.selectedIndex][currentQuestionIndex].isCompleted = true;
+            return false
+          } else {
+            this.data.value[this.selectedIndex][currentQuestionIndex].isCompleted = this.utils.isQuestionComplete(currentQuestion);
+          }
+        }
+      }
+    }
+    return display
+  }
+
+  checkForDependentVisibility(qst, allQuestion): boolean {
+    let display = true;
+    for (const question of allQuestion) {
+      for (const condition of qst.visibleIf) {
+        if (condition._id === question._id) {
+          let expression = [];
+          if (condition.operator != "===") {
+            if (question.responseType === 'multiselect') {
+              for (const parentValue of question.value) {
+                for (const value of condition.value) {
+                  expression.push("(", "'" + parentValue + "'", "===", "'" + value + "'", ")", condition.operator);
+                }
+              }
+            } else {
+              for (const value of condition.value) {
+                expression.push("(", "'" + question.value + "'", "===", "'" + value + "'", ")", condition.operator)
+              }
+            }
+            expression.pop();
+          } else {
+            if (question.responseType === 'multiselect') {
+              for (const value of question.value) {
+                expression.push("(", "'" + condition.value + "'", "===", "'" + value + "'", ")", "||");
+              }
+              expression.pop();
+            } else {
+              expression.push("(", "'" + question.value + "'", condition.operator, "'" + condition.value + "'", ")")
+            }
+          }
+          if (!eval(expression.join(''))) {
+            return false
+          }
+        }
+      }
+    }
+    return display
+  }
+
+}
diff --git a/src/app/manage-learn/questionnaire/question-map-modal/question-map-modal.component.html b/src/app/manage-learn/questionnaire/question-map-modal/question-map-modal.component.html
new file mode 100644
index 000000000..03228dd5e
--- /dev/null
+++ b/src/app/manage-learn/questionnaire/question-map-modal/question-map-modal.component.html
@@ -0,0 +1,31 @@
+<ion-content class="ion-padding">
+  <div>
+    <h4>{{evidenceMethod}} - {{sectionName}}</h4>
+  </div>
+  <div class="_flex-box _flex-wrap ion-margin-top" *ngIf="questions?.length">
+    <ng-container *ngFor="let question of questions; let i = index">
+      <div class="container _flex-box _justify-content-center" (click)="goToQuestion(i)"
+        *ngIf="checkForQuestionDisplay(question)">
+        <span class="wrapper _flex-box _justify-content-center" [ngClass]="{'currentView': i === currentViewIndex}">
+          <span class="block pending black-color _flex-box _justify-content-center"
+            [ngClass]="{'color-green': isQuestionComplete(question)}">{{i+1}}</span>
+        </span>
+      </div>
+
+      <div class="container _flex-box _justify-content-center" (click)="openToast()"
+        *ngIf="!checkForQuestionDisplay(question)">
+        <span class="wrapper _flex-box _justify-content-center" [ngClass]="{'currentView': i === currentViewIndex}">
+          <span class="block pending black-color _flex-box _justify-content-center"
+            [ngClass]="{'color-green': isQuestionComplete(question)}">{{i+1}}</span>
+        </span>
+      </div>
+    </ng-container>
+  </div>
+</ion-content>
+
+<ion-footer>
+  <div class="sb-popover-footer">
+    <ion-button expand="full" class="sb-popover-action-btn popover-color" (click)='close()'
+      >{{ 'CANCEL' | translate}}</ion-button>
+  </div>
+</ion-footer>
\ No newline at end of file
diff --git a/src/app/manage-learn/questionnaire/question-map-modal/question-map-modal.component.scss b/src/app/manage-learn/questionnaire/question-map-modal/question-map-modal.component.scss
new file mode 100644
index 000000000..22db7dcbe
--- /dev/null
+++ b/src/app/manage-learn/questionnaire/question-map-modal/question-map-modal.component.scss
@@ -0,0 +1,47 @@
+@import "src/assets/styles/_variables.scss";
+
+.container {
+    width: 20%;
+    position: relative;
+
+    .wrapper {
+        border: 3px solid transparent;
+        width: 50px;
+        height: 50px;
+        margin: 10px auto;
+        border-radius: 50px;
+
+        .block {
+            width: 44px;
+            height: 44px;
+            padding: 10px;
+            border-radius: 50px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: #000000;
+        }
+    }
+}
+
+.color-green {
+    color: white !important;
+    background: green !important;
+    ;
+}
+
+.black-color {
+    color: black;
+    background: #e0e0ee;
+}
+
+.currentView {
+    border-color: #{$blue}  !important;
+}
+
+.overlay {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    z-index: 1;
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/questionnaire/question-map-modal/question-map-modal.component.ts b/src/app/manage-learn/questionnaire/question-map-modal/question-map-modal.component.ts
new file mode 100644
index 000000000..60cc1e8e6
--- /dev/null
+++ b/src/app/manage-learn/questionnaire/question-map-modal/question-map-modal.component.ts
@@ -0,0 +1,58 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { ModalController } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+import { ToastService, UtilsService } from '../../core';
+
+@Component({
+  selector: 'app-question-map-modal',
+  templateUrl: './question-map-modal.component.html',
+  styleUrls: ['./question-map-modal.component.scss'],
+})
+export class QuestionMapModalComponent implements OnInit {
+
+  @Input() data: any;
+  evidenceMethod: string;
+  sectionName: string;
+  currentViewIndex: any;
+  questions;
+
+  constructor(
+    private translate: TranslateService, private toast: ToastService, private modalCtrl: ModalController,
+    private utils: UtilsService) {
+  }
+
+  ngOnInit() {
+    this.questions = this.data['questions'];
+    this.evidenceMethod = this.data['evidenceMethod'];
+    this.sectionName = this.data['sectionName'];
+    this.currentViewIndex = this.data['currentViewIndex'];
+  }
+
+  isQuestionComplete(question) {
+    if (question.responseType.toLowerCase() === 'matrix') {
+      return this.utils.isMatrixQuestionComplete(question);
+    } else if (question.responseType.toLowerCase() === 'pagequestions') {
+      return this.utils.isPageQuestionComplete(question);
+    } else {
+      return this.utils.isQuestionComplete(question);
+    }
+  }
+
+  checkForQuestionDisplay(qst): boolean {
+    return this.utils.checkForDependentVisibility(qst, this.questions)
+  }
+
+  openToast(): void {
+    this.translate.get('FRMELEMNTS_MSG_QUESTIONNAIRE_MSG').subscribe(translations => {
+      this.toast.openToast(translations);
+    })
+  }
+
+  goToQuestion(index) {
+    this.modalCtrl.dismiss(index);
+  }
+
+  close() {
+    this.modalCtrl.dismiss();
+  }
+}
diff --git a/src/app/manage-learn/questionnaire/questionnaire.module.ts b/src/app/manage-learn/questionnaire/questionnaire.module.ts
new file mode 100644
index 000000000..4136af1a0
--- /dev/null
+++ b/src/app/manage-learn/questionnaire/questionnaire.module.ts
@@ -0,0 +1,38 @@
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { Routes, RouterModule } from '@angular/router';
+
+import { IonicModule } from '@ionic/angular';
+
+import { QuestionnairePage } from './questionnaire.page';
+import { CoreModule } from '../core/core.module';
+import { SharedModule } from '../shared/shared.module';
+import { TranslateModule } from '@ngx-translate/core';
+import { MatrixModalComponent } from './matrix-modal/matrix-modal.component';
+import { QuestionMapModalComponent } from './question-map-modal/question-map-modal.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: QuestionnairePage
+  }
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    RouterModule.forChild(routes),
+    CoreModule,
+    SharedModule,
+    TranslateModule
+  ],
+  declarations: [QuestionnairePage, MatrixModalComponent, QuestionMapModalComponent],
+  schemas: [
+    CUSTOM_ELEMENTS_SCHEMA
+  ],
+  entryComponents: [MatrixModalComponent, QuestionMapModalComponent]
+})
+export class QuestionnairePageModule { }
diff --git a/src/app/manage-learn/questionnaire/questionnaire.page.html b/src/app/manage-learn/questionnaire/questionnaire.page.html
new file mode 100644
index 000000000..2e7204035
--- /dev/null
+++ b/src/app/manage-learn/questionnaire/questionnaire.page.html
@@ -0,0 +1,42 @@
+<ion-content #pageTop>
+  <div class="_container" id="stop" *ngIf="submissionId">
+    <ng-container *ngFor="let question of questions| slice:start:end; let i=index">
+      <ng-container [ngSwitch]="question.responseType.toLowerCase()">
+        <app-text-type-input [inputIndex]="start + 1" [evidenceId]="selectedEvidenceId" [submissionId]="submissionId"
+          [data]="question" [imageLocalCopyId]="localImageListKey" *ngSwitchCase="'text'"
+          [enableQuestionReadOut]="enableQuestionReadOut"></app-text-type-input>
+        <app-text-type-input [inputIndex]="start + 1" [evidenceId]="selectedEvidenceId" [submissionId]="submissionId"
+          [schoolId]="schoolId" [data]="question" [imageLocalCopyId]="localImageListKey" *ngSwitchCase="'number'"
+          [enableQuestionReadOut]="enableQuestionReadOut"></app-text-type-input>
+        <app-radio-type-input [inputIndex]="start + 1" [evidenceId]="selectedEvidenceId" [submissionId]="submissionId"
+          [schoolId]="schoolId" [data]="question" [imageLocalCopyId]="localImageListKey" *ngSwitchCase="'radio'"
+          [enableQuestionReadOut]="enableQuestionReadOut"></app-radio-type-input>
+        <app-date-type-input [inputIndex]="start + 1" [evidenceId]="selectedEvidenceId" [submissionId]="submissionId"
+          [schoolId]="schoolId" [data]="question" [imageLocalCopyId]="localImageListKey" *ngSwitchCase="'date'"
+          [enableQuestionReadOut]="enableQuestionReadOut"></app-date-type-input>
+        <app-multiple-type-input [inputIndex]="start + 1" [evidenceId]="selectedEvidenceId" [schoolId]="schoolId"
+          [data]="question" [imageLocalCopyId]="localImageListKey" [submissionId]="submissionId"
+          *ngSwitchCase="'multiselect'" [enableQuestionReadOut]="enableQuestionReadOut"></app-multiple-type-input>
+        <app-matrix-type-input [inputIndex]="start + 1" [evidenceId]="selectedEvidenceId" [schoolId]="schoolId"
+          [data]="question" [imageLocalCopyId]="localImageListKey" [submissionId]="submissionId"
+          (updateLocalData)="updateLocalData()" *ngSwitchCase="'matrix'" [enableGps]="captureGpsLocationAtQuestionLevel"
+          [enableQuestionReadOut]="enableQuestionReadOut">
+        </app-matrix-type-input>
+        <app-page-questions [inputIndex]="start + 1" [evidenceId]="selectedEvidenceId" [schoolId]="schoolId"
+          [data]="question" [imageLocalCopyId]="localImageListKey" [submissionId]="submissionId"
+          (updateLocalData)="updateLocalData()" *ngSwitchCase="'pagequestions'"
+          [enableQuestionReadOut]="enableQuestionReadOut">
+        </app-page-questions>
+        <app-slider-type-input [inputIndex]="start + 1" [evidenceId]="selectedEvidenceId" [submissionId]="submissionId"
+          [schoolId]="schoolId" [data]="question" [imageLocalCopyId]="localImageListKey" *ngSwitchCase="'slider'"
+          [enableQuestionReadOut]="enableQuestionReadOut"></app-slider-type-input>
+      </ng-container>
+    </ng-container>
+  </div>
+</ion-content>
+<app-footer-buttons *ngIf="questions" [updatedData]="questions[start]" [data]="questions[start]" [isFirst]="!start"
+  [enableGps]="captureGpsLocationAtQuestionLevel" [isSubmitted]="isCurrentEvidenceSubmitted"
+  [isLast]="questions?.length === end" [completedQuestionCount]="countCompletedQuestion"
+  [questionCount]="questions?.length" [showSubmit]="checkForEvidenceCompletion()" (nextAction)="next($event)" (backAction)="back()" (openSheetAction)="openActionSheet()" >
+
+</app-footer-buttons>
\ No newline at end of file
diff --git a/src/app/manage-learn/questionnaire/questionnaire.page.scss b/src/app/manage-learn/questionnaire/questionnaire.page.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/questionnaire/questionnaire.page.ts b/src/app/manage-learn/questionnaire/questionnaire.page.ts
new file mode 100644
index 000000000..e06920af4
--- /dev/null
+++ b/src/app/manage-learn/questionnaire/questionnaire.page.ts
@@ -0,0 +1,510 @@
+import { Location } from '@angular/common';
+import { Component, OnInit, ViewChild, ElementRef, OnDestroy } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ActionSheetController, AlertController, IonContent, ModalController } from '@ionic/angular';
+import { LocalStorageService, LoaderService, UtilsService, ToastService } from '../core';
+import { AppHeaderService, CommonUtilService } from '@app/services';
+import { Subscription } from 'rxjs';
+import { QuestionMapModalComponent } from './question-map-modal/question-map-modal.component';
+import { TranslateService } from '@ngx-translate/core';
+import { RouterLinks } from '@app/app/app.constant';
+import { Network } from '@ionic-native/network/ngx';
+// import { Events } from '@app/util/events';
+
+@Component({
+  selector: 'app-questionnaire',
+  templateUrl: './questionnaire.page.html',
+  styleUrls: ['./questionnaire.page.scss'],
+})
+export class QuestionnairePage implements OnInit, OnDestroy {
+  @ViewChild('sample',  {static: false}) nameInputRef: ElementRef;
+  @ViewChild('pageTop',  {static: false}) pageTop: IonContent;
+  private _appHeaderSubscription?: Subscription;
+
+  headerConfig = {
+    showHeader: true,
+    showBurgerMenu: false,
+    actionButtons: [],
+  };
+
+  questions: any;
+  schoolName: string;
+  submissionId: any;
+  selectedEvidenceIndex: any;
+  selectedSectionIndex: any;
+  start: number = 0;
+  end: number = 1;
+  schoolData: any;
+  isLast: boolean;
+  isFirst: boolean;
+  selectedEvidenceId: string;
+  isCurrentEvidenceSubmitted: any;
+  allQuestionsOfEvidence: Array<any> = [];
+  isViewOnly: boolean;
+  dashbordData: any;
+  modalRefrnc: any;
+  localImageListKey: any;
+  countCompletedQuestion: number;
+  captureGpsLocationAtQuestionLevel: boolean;
+  enableQuestionReadOut: boolean;
+  networkAvailable;
+
+  constructor(
+    // public navCtrl: NavController,
+    // public navParams: NavParams,
+    private localStorage: LocalStorageService,
+    private loader: LoaderService,
+    private utils: UtilsService,
+    private toast: ToastService,
+    private location: Location,
+    // private feedback: FeedbackProvider,
+    public actionSheetCtrl: ActionSheetController,
+    // private events: Events,
+    private routerParam: ActivatedRoute,
+    // private diagnostic: Diagnostic,
+    // private translate: TranslateService,
+    private network: Network,
+    private alertCtrl: AlertController,
+    // private ngps: NetworkGpsProvider,
+    private headerService: AppHeaderService,
+    private modalCtrl: ModalController,
+    private translate: TranslateService,
+    private router: Router,
+    private commonUtilService:CommonUtilService
+  ) {
+    // this.routerParam.params.subscribe((parameters) => {
+    //   this.submissionId = parameters.submisssionId;
+    //   this.selectedEvidenceIndex = parameters.evidenceIndex;
+    //   this.selectedSectionIndex = parameters.sectionIndex;
+    // });
+
+    this.routerParam.queryParams.subscribe((params) => {
+      this.submissionId = params.submisssionId;
+      this.selectedEvidenceIndex = params.evidenceIndex;
+      this.selectedSectionIndex = params.sectionIndex;
+      this.schoolName = params.schoolName;
+    });
+
+    this._appHeaderSubscription = this.headerService.headerEventEmitted$.subscribe((eventName) => {
+      if (eventName.name === 'questionMap') {
+        this.openQuestionMap();
+      }
+    });
+
+    // Online event
+    // this.networkAvailable = this.ngps.getNetworkStatus();
+  }
+
+  ngOnDestroy() {
+    if (this._appHeaderSubscription) {
+      this._appHeaderSubscription.unsubscribe();
+    }
+  }
+
+  ngOnInit() {
+    // this.loader.startLoader();
+    this.localStorage
+      .getLocalStorage(this.utils.getAssessmentLocalStorageKey(this.submissionId))
+      .then((data) => {
+        this.schoolData = data;
+        const currentEvidences = this.schoolData['assessment']['evidences'];
+        this.enableQuestionReadOut = this.schoolData['solution']['enableQuestionReadOut'];
+        this.captureGpsLocationAtQuestionLevel = this.schoolData['solution']['captureGpsLocationAtQuestionLevel'];
+        this.countCompletedQuestion = this.utils.getCompletedQuestionsCount(
+          this.schoolData['assessment']['evidences'][this.selectedEvidenceIndex]['sections'][this.selectedSectionIndex][
+            'questions'
+          ]
+        );
+
+        this.selectedEvidenceId = currentEvidences[this.selectedEvidenceIndex].externalId;
+        this.localImageListKey = 'images_' + this.selectedEvidenceId + '_' + this.submissionId;
+        this.isViewOnly = !currentEvidences[this.selectedEvidenceIndex]['startTime'] ? true : false;
+
+        this.questions =
+          currentEvidences[this.selectedEvidenceIndex]['sections'][this.selectedSectionIndex]['questions'];
+        this.schoolData['assessment']['evidences'][this.selectedEvidenceIndex]['sections'][
+          this.selectedSectionIndex
+        ].totalQuestions = this.questions.length;
+        this.dashbordData = {
+          questions: this.questions,
+          evidenceMethod: currentEvidences[this.selectedEvidenceIndex]['name'],
+          sectionName: currentEvidences[this.selectedEvidenceIndex]['sections'][this.selectedSectionIndex].name,
+          currentViewIndex: this.start,
+        };
+        this.isCurrentEvidenceSubmitted = currentEvidences[this.selectedEvidenceIndex].isSubmitted;
+        if (this.isCurrentEvidenceSubmitted || this.isViewOnly) {
+          document.getElementById('stop').style.pointerEvents = 'none';
+        }
+        // this.loader.stopLoader();
+      })
+      .catch((error) => {
+        // this.loader.stopLoader();
+      });
+  }
+
+  ionViewWillEnter() {
+    this.headerConfig = this.headerService.getDefaultPageConfig();
+    this.headerConfig.actionButtons = ['questionMap'];
+    this.headerConfig.showHeader = true;
+    this.headerConfig.showBurgerMenu = false;
+    this.headerService.updatePageConfig(this.headerConfig);
+  }
+
+  ionViewDidLoad() {}
+
+  async openQuestionMap() {
+    const questionModal = await this.modalCtrl.create({
+      component: QuestionMapModalComponent,
+      componentProps: {
+        data: this.dashbordData,
+      },
+    });
+    await questionModal.present();
+    const { data } = await questionModal.onDidDismiss();
+    if (data >= 0) {
+      this.start = data;
+      this.end = data + 1;
+      this.dashbordData.currentViewIndex = data;
+    }
+  }
+  // images_CO_5bebcfcf92ec921dcf114828
+
+  next(status?: string) {
+    this.pageTop.scrollToTop();
+    if (this.questions[this.start].responseType === 'pageQuestions') {
+      this.questions[this.start].endTime = this.questions[this.start] ? Date.now() : '';
+      this.questions[this.start].isCompleted = this.utils.isPageQuestionComplete(this.questions[this.start]);
+    }
+    if (this.questions[this.start].children.length) {
+      this.updateTheChildrenQuestions(this.questions[this.start]);
+    }
+    if (this.end < this.questions.length && !status) {
+      this.localStorage.setLocalStorage(this.utils.getAssessmentLocalStorageKey(this.submissionId), this.schoolData);
+      this.start++;
+      this.end++;
+      this.dashbordData.currentViewIndex = this.start;
+      if (
+        this.questions[this.start].visibleIf.length &&
+        this.questions[this.start].visibleIf[0] &&
+        !this.checkForQuestionDisplay(this.questions[this.start])
+      ) {
+        this.questions[this.start].isCompleted = true;
+        this.next();
+      } else if (
+        this.questions[this.start].visibleIf.length &&
+        this.questions[this.start].visibleIf[0] &&
+        this.checkForQuestionDisplay(this.questions[this.start])
+      ) {
+      }
+    } else if (status === 'completed') {
+      this.schoolData['assessment']['evidences'][this.selectedEvidenceIndex].sections[
+        this.selectedSectionIndex
+      ].progressStatus = this.getSectionStatus();
+      this.localStorage
+        .setLocalStorage(this.utils.getAssessmentLocalStorageKey(this.submissionId), this.schoolData)
+        .then((success) => {
+          this.schoolData.observation || this.schoolData.survey
+            ? this.checkForAllEcmCompletion()
+            : this.location.back();
+        });
+    } else {
+      this.next('completed');
+    }
+    this.updateCompletedQuestionCount();
+    // this.calculateCompletedQuestion();
+  }
+
+  getSectionStatus(): string {
+    let allAnswered = true;
+    let currentEcm = this.schoolData['assessment']['evidences'][this.selectedEvidenceIndex];
+    let currentSection = this.schoolData['assessment']['evidences'][this.selectedEvidenceIndex].sections[
+      this.selectedSectionIndex
+    ];
+    for (const question of currentSection.questions) {
+      if (!question.isCompleted) {
+        allAnswered = false;
+        break;
+      }
+    }
+    if (currentEcm.isSubmitted) {
+      currentSection.progressStatus = 'submitted';
+    } else if (!currentEcm.startTime) {
+      currentSection.progressStatus = '';
+    } else if (allAnswered) {
+      currentSection.progressStatus = 'completed';
+    } else if (!allAnswered && currentSection.progressStatus) {
+      currentSection.progressStatus = 'inProgress';
+    } else if (!currentSection.progressStatus) {
+      currentSection.progressStatus = '';
+    }
+    return currentSection.progressStatus;
+  }
+
+  checkForAllEcmCompletion() {
+    this.localStorage
+      .getLocalStorage(this.utils.getAssessmentLocalStorageKey(this.submissionId))
+      .then((data) => {
+        let completedAllSections = true;
+        let currentEcm = data.assessment.evidences[this.selectedEvidenceIndex];
+        for (const section of currentEcm.sections) {
+          if (section.progressStatus !== 'completed') {
+            completedAllSections = false;
+            break;
+          }
+        }
+        if (completedAllSections && !currentEcm.isSubmitted) {
+          this.openActionSheet();
+        } else {
+          this.location.back();
+        }
+      })
+      .catch((error) => {});
+  }
+
+  async openActionSheet() {
+    let translateObject;
+    this.translate
+      .get(['FRMELEMNTS_BTN_SUBMIT_FORM', 'FRMELEMNTS_BTN_PREVIEW_FORM', 'FRMELEMNTS_BTN_SAVE_FORM'])
+      .subscribe((translations) => {
+        translateObject = translations;
+      });
+    let actionSheet = await this.actionSheetCtrl.create({
+      // title: 'Modify your album',
+      buttons: [
+        {
+          text: translateObject['FRMELEMNTS_BTN_SUBMIT_FORM'],
+          icon: 'cloud-upload',
+          handler: () => {
+            this.checkForNetworkTypeAlert();
+          },
+        },
+        {
+          text: translateObject['FRMELEMNTS_BTN_PREVIEW_FORM'],
+          icon: 'clipboard',
+          handler: () => {
+            this.router.navigate([RouterLinks.SUBMISSION_PREVIEW], {
+              queryParams: {
+                submissionId: this.submissionId,
+                name: this.schoolName,
+                selectedEvidenceIndex: this.selectedEvidenceIndex,
+              },
+            });
+            // this.navCtrl.push(PreviewPage, payload);
+          },
+        },
+        {
+          text: translateObject['FRMELEMNTS_BTN_SAVE_FORM'],
+          icon: 'file-tray-full',
+          handler: () => {
+            this.location.back();
+          },
+        },
+      ],
+    });
+    actionSheet.present();
+  }
+
+  async checkForNetworkTypeAlert() {
+    if (
+      this.network.type === 'cellular' ||
+      this.network.type === 'unknown' ||
+      this.network.type === '2g' ||
+      this.network.type === 'ethernet'
+    ) {
+      let translateObject;
+      this.translate
+        .get(['CONFIRM', 'YES', 'NO', 'FRMELEMENTS_LBL_SLOW_INTERNET'])
+        .subscribe((translations) => {
+          translateObject = translations;
+        });
+      let alert = await this.alertCtrl.create({
+        header: translateObject['CONFIRM'],
+        message: translateObject['FRMELEMENTS_LBL_SLOW_INTERNET'],
+        buttons: [
+          {
+            text: translateObject['NO'],
+            role: 'cancel',
+            handler: () => {
+              //console.log('Cancel clicked');
+            },
+          },
+          {
+            text: translateObject['YES'],
+            handler: () => {
+              this.goToImageListing();
+            },
+          },
+        ],
+      });
+      await alert.present();
+    } else if (this.network.type === 'wifi' || this.network.type === '3g' || this.network.type === '4g') {
+      this.goToImageListing();
+    } else if (this.network.type === 'none') {
+      let noInternetMsg;
+      this.translate.get(['FRMELEMNTS_MSG_NETWORK_CONNECTION_FOR_ACTION']).subscribe((translations) => {
+        noInternetMsg = translations['FRMELEMNTS_MSG_NETWORK_CONNECTION_FOR_ACTION'];
+        this.toast.openToast(noInternetMsg);
+      });
+    }
+  }
+
+  goToImageListing() {
+    // if (this.networkAvailable) {
+    if (this.commonUtilService.networkInfo.isNetworkAvailable) {
+      this.router.navigate([RouterLinks.IMAGE_LISTING], {
+        queryParams: {
+          submissionId: this.submissionId,
+          name: this.schoolName,
+          selectedEvidenceIndex: this.selectedEvidenceIndex,
+        },
+      });
+      // TODO:Remove gps check
+      // this.diagnostic
+      //   .isLocationAuthorized()
+      //   .then((authorized) => {
+      //     if (!AppConfigs.enableGps) {
+      //       return true;
+      //     }
+      //     if (authorized) {
+      //       return this.diagnostic.isLocationEnabled();
+      //     } else {
+      //       this.toast.openToast("Please enable location permission to continue.");
+      //     }
+      //   })
+      //   .then((success) => {
+      //     if (success) {
+      //       const params = {
+      //         _id: this.submissionId,
+      //         name: this.schoolName,
+      //         selectedEvidence: this.selectedEvidenceIndex,
+      //       };
+      //       this.navCtrl.push(ImageListingPage, params);
+      //     } else {
+      //       this.ngps.checkForLocationPermissions();
+      //     }
+      //   })
+      //   .catch((error) => {
+      //     this.ngps.checkForLocationPermissions();
+      //   });
+    } else {
+      this.translate.get('FRMELEMNTS_MSG_CONNECT_TO_INTERNET').subscribe((translations) => {
+        this.toast.openToast(translations);
+      });
+    }
+  }
+
+  updateCompletedQuestionCount() {
+    this.schoolData['assessment']['evidences'][this.selectedEvidenceIndex]['sections'][
+      this.selectedSectionIndex
+    ].completedQuestions = this.utils.getCompletedQuestionsCount(
+      this.schoolData['assessment']['evidences'][this.selectedEvidenceIndex]['sections'][this.selectedSectionIndex][
+        'questions'
+      ]
+    );
+    this.countCompletedQuestion = this.utils.getCompletedQuestionsCount(
+      this.schoolData['assessment']['evidences'][this.selectedEvidenceIndex]['sections'][this.selectedSectionIndex][
+        'questions'
+      ]
+    );
+  }
+
+  updateLocalData(): void {
+    this.localStorage.setLocalStorage(this.utils.getAssessmentLocalStorageKey(this.submissionId), this.schoolData);
+  }
+
+  checkForQuestionDisplay(qst): boolean {
+    return this.utils.checkForDependentVisibility(qst, this.questions);
+  }
+
+  updateTheChildrenQuestions(parentQuestion) {
+    for (const child of parentQuestion.children) {
+      for (const question of this.questions) {
+        if (
+          child === question._id &&
+          eval(
+            '"' + parentQuestion.value + '"' + question.visibleIf[0].operator + '"' + question.visibleIf[0].value + '"'
+          ) &&
+          !question.value
+        ) {
+          question.isCompleted = false;
+        } else if (child === question._id && parentQuestion.value !== question.visibleIf[0].value) {
+          question.isCompleted = true;
+        }
+      }
+    }
+  }
+
+  back() {
+    this.pageTop.scrollToTop();
+    if (this.questions[this.start].responseType === 'pageQuestions') {
+      this.questions[this.start].endTime = this.questions[this.start] ? Date.now() : '';
+      this.questions[this.start].isCompleted = this.utils.isPageQuestionComplete(this.questions[this.start]);
+    }
+    if (this.questions[this.start].children.length) {
+      this.updateTheChildrenQuestions(this.questions[this.start]);
+    }
+    if (this.start > 0) {
+      this.localStorage.setLocalStorage(this.utils.getAssessmentLocalStorageKey(this.submissionId), this.schoolData);
+      this.start--;
+      this.dashbordData.currentViewIndex = this.start;
+      this.end--;
+      if (this.questions[this.start].visibleIf.length && !this.checkForQuestionDisplay(this.questions[this.start])) {
+        this.back();
+      }
+    }
+    this.updateCompletedQuestionCount();
+  }
+
+  feedBack() {
+    // this.feedback.sendFeedback()
+  }
+
+  setModalRefernc(refrc): void {
+    this.modalRefrnc = refrc;
+    this.modalRefrnc.onDidDismiss((data) => {
+      if (data >= 0) {
+        this.start = data;
+        this.end = data + 1;
+        this.dashbordData.currentViewIndex = data;
+      }
+    });
+  }
+  checkForEvidenceCompletion(): boolean {
+    let allAnswered;
+    let evidenceSections = this.schoolData['assessment']['evidences'][this.selectedEvidenceIndex]['sections']
+     let currentEvidence = this.schoolData['assessment']['evidences'][this.selectedEvidenceIndex];
+    for (const section of evidenceSections) {
+      allAnswered = true;
+      for (const question of section.questions) {
+        if (!question.isCompleted) {
+          allAnswered = false;
+          break;
+        }
+      }
+      if (currentEvidence.isSubmitted) {
+        section.progressStatus = 'submitted';
+      } else if (!currentEvidence.startTime) {
+        section.progressStatus = '';
+      } else if (allAnswered) {
+        section.progressStatus = 'completed';
+      } else if (!allAnswered && section.progressStatus) {
+        section.progressStatus = 'inProgress';
+      } else if (!section.progressStatus) {
+        section.progressStatus = '';
+      }
+    }
+    let allAnsweredForEvidence = true;
+    for (const section of evidenceSections) {
+      if (section.progressStatus !== 'completed') {
+        allAnsweredForEvidence = false;
+        break;
+      }
+    }
+    return allAnsweredForEvidence
+  }
+
+  ionViewWillLeave() {
+    this.headerConfig.actionButtons = [];
+    this.headerService.updatePageConfig(this.headerConfig);
+  }
+}
diff --git a/src/app/manage-learn/questionnaire/remarks-modal/remarks-modal.component.html b/src/app/manage-learn/questionnaire/remarks-modal/remarks-modal.component.html
new file mode 100644
index 000000000..44bb657ec
--- /dev/null
+++ b/src/app/manage-learn/questionnaire/remarks-modal/remarks-modal.component.html
@@ -0,0 +1,23 @@
+
+
+<ion-content class="ion-padding">
+  <ion-item>
+    <ion-textarea [(ngModel)]="data.remarks" placeholder="Remarks" #remarkInput style="height: 40vh"></ion-textarea>
+  </ion-item>
+</ion-content>
+
+<div class="_footer" no-padding>
+  <ion-row>
+    <ion-col>
+      <ion-button icon-start expand="full" color="light" (click)="close()">
+        {{'CANCEL'|translate}}
+      </ion-button>
+    </ion-col>
+    <ion-col>
+      <ion-button icon-start expand="full"  (click)="update()"
+        [disabled]="required ? !data.remarks : false">
+        {{'FRMELEMENTS_BTN_ADD'|translate}}
+      </ion-button>
+    </ion-col>
+  </ion-row>
+</div>
\ No newline at end of file
diff --git a/src/app/manage-learn/questionnaire/remarks-modal/remarks-modal.component.scss b/src/app/manage-learn/questionnaire/remarks-modal/remarks-modal.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/questionnaire/remarks-modal/remarks-modal.component.ts b/src/app/manage-learn/questionnaire/remarks-modal/remarks-modal.component.ts
new file mode 100644
index 000000000..603d8cae7
--- /dev/null
+++ b/src/app/manage-learn/questionnaire/remarks-modal/remarks-modal.component.ts
@@ -0,0 +1,31 @@
+import { Component, Input, OnInit, ViewChild } from '@angular/core';
+import { ModalController } from '@ionic/angular';
+
+@Component({
+  selector: 'app-remarks-modal',
+  templateUrl: './remarks-modal.component.html',
+  styleUrls: ['./remarks-modal.component.scss'],
+})
+export class RemarksModalComponent implements OnInit {
+  @ViewChild('remarkInput',  {static: false}) remarkInput;
+  hideBack;
+  @Input() data: any;
+  @Input() button: string;
+  @Input() required: boolean;
+
+  constructor(private modal: ModalController) {}
+
+  ngOnInit() {}
+
+  close(): void {
+    this.modal.dismiss();
+  }
+
+  update(): void {
+    this.modal.dismiss(this.data.remarks);
+  }
+
+  ngAfterViewChecked() {
+    this.remarkInput.setFocus();
+  }
+}
diff --git a/src/app/manage-learn/reports/observation-solution-entity-listing/observation-solution-entity-listing.component.html b/src/app/manage-learn/reports/observation-solution-entity-listing/observation-solution-entity-listing.component.html
new file mode 100644
index 000000000..c9f7e3919
--- /dev/null
+++ b/src/app/manage-learn/reports/observation-solution-entity-listing/observation-solution-entity-listing.component.html
@@ -0,0 +1,22 @@
+<ion-content>
+  <div>
+    <app-common-header [title]="solutionDetails?.name"
+      [subTitle]="solutionDetails?.programName"></app-common-header>
+  </div>
+
+  <div>
+    <div *ngFor="let entity of solutionDetails?.entities; let solutionIndex = index">
+      <app-item-list-card
+        [title]="entity?.name"
+        [subTitle]="entity?.programName"
+        (cardSelect)="goToReports(entity)"
+      >
+        <ion-icon class="mg-popup-btn-icon" name="arrow-forward" arrow></ion-icon>
+      </app-item-list-card>
+    </div>
+  </div>
+
+
+  <app-no-data *ngIf="!solutionDetails?.entities?.length"></app-no-data>
+
+</ion-content>
\ No newline at end of file
diff --git a/src/app/manage-learn/reports/observation-solution-entity-listing/observation-solution-entity-listing.component.scss b/src/app/manage-learn/reports/observation-solution-entity-listing/observation-solution-entity-listing.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/reports/observation-solution-entity-listing/observation-solution-entity-listing.component.ts b/src/app/manage-learn/reports/observation-solution-entity-listing/observation-solution-entity-listing.component.ts
new file mode 100644
index 000000000..2f8fe66ae
--- /dev/null
+++ b/src/app/manage-learn/reports/observation-solution-entity-listing/observation-solution-entity-listing.component.ts
@@ -0,0 +1,67 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { RouterLinks } from '@app/app/app.constant';
+import { ToastService } from '../../core';
+
+@Component({
+  selector: 'app-observation-solution-entity-listing',
+  templateUrl: './observation-solution-entity-listing.component.html',
+  styleUrls: ['./observation-solution-entity-listing.component.scss'],
+})
+export class ObservationSolutionEntityListingComponent implements OnInit {
+  solutionDetails;
+
+  constructor(private router: Router, private toast: ToastService) {
+    console.log(this.router.getCurrentNavigation().extras.state);
+    this.solutionDetails = this.router.getCurrentNavigation().extras.state;
+  }
+
+  ngOnInit() {}
+
+  goToReports(entity) {
+    // if (!this.solutionDetails.scoringSystem || this.solutionDetails.scoringSystem === 'pointBasedScoring') {
+    // if (this.solutionDetails.scoringSystem === 'pointsBasedScoring' || !this.solutionDetails.isRubricDriven) {
+    // if (!this.solutionDetails.criteriaLevelReport || !this.solutionDetails.isRubricDriven) {
+    //   const queryParams = {
+    //     queryParams: {
+    //       observationId: this.solutionDetails.observationId,
+    //       solutionId: this.solutionDetails.solutionId,
+    //       programId: this.solutionDetails.programId,
+    //       entityId: entity._id,
+    //       entityName: entity.name,
+    //     },
+    //   };
+    //   this.router.navigate([`/${RouterLinks.OBSERVATION}/${RouterLinks.OBSERVATION_SUBMISSION}`], queryParams);
+    // } else {
+    //   // this.toast.openToast("coming soon")
+    //   this.router.navigate([RouterLinks.GENERIC_REPORT], {
+    //     state: {
+    //       scores: true,
+    //       observation: true,
+    //       pdf: false,
+    //       entityId: entity._id,
+    //       entityType: this.solutionDetails.entityType,
+    //       observationId: this.solutionDetails.observationId,
+    //     },
+    //   });
+    // }
+
+    let state = {
+      scores: false,
+      observation: true,
+      entityId: entity._id,
+      entityType: this.solutionDetails.entityType,
+      observationId: this.solutionDetails.observationId,
+    };
+    if (this.solutionDetails.isRubricDriven) {
+      state.scores = true;
+    }
+    if (!this.solutionDetails.criteriaLevelReport) {
+      state['filter'] = { questionId: [] };
+      state['criteriaWise'] = false;
+    }
+    this.router.navigate([RouterLinks.GENERIC_REPORT], {
+      state: state,
+    });
+  }
+}
diff --git a/src/app/manage-learn/reports/observation-solution-listing/observation-solution-listing.component.html b/src/app/manage-learn/reports/observation-solution-listing/observation-solution-listing.component.html
new file mode 100644
index 000000000..90d70fd87
--- /dev/null
+++ b/src/app/manage-learn/reports/observation-solution-listing/observation-solution-listing.component.html
@@ -0,0 +1,30 @@
+<ion-content>
+  <div slot="fixed" class="fixed-container">
+    <app-common-header title="{{ 'FRMELEMNTS_LBL_OBSERVATION_REPORTS' | translate }}"
+      subTitle="{{ 'FRMELEMNTS_LBL_OBSERVATION_REPORTS_DESC' | translate }}"></app-common-header>
+    <sb-library-filters [list]="filters" [layout]="layout" (selectedFilter)="applyFilter($event);"
+      *ngIf="filters?.length">
+    </sb-library-filters>
+  </div>
+
+  <div class="scrollable-container">
+    <div *ngFor="let solution of solutionList; let solutionIndex = index">
+      <app-item-list-card [title]="solution?.name" [subTitle]="solution?.programName"
+        (cardSelect)="(solution?.entities?.length >1) ? goToEntityList(solution) : goToReports(solution)">
+        <ion-icon class="mg-popup-btn-icon" name="arrow-forward" arrow></ion-icon>
+      </app-item-list-card>
+    </div>
+  </div>
+
+
+  <app-no-data *ngIf="!solutionList?.length"></app-no-data>
+
+</ion-content>
+
+<ion-footer class="ion-no-border ion-padding-horizontal" *ngIf="showLoadMore">
+  <ion-toolbar>
+    <ion-button expand="block" (click)="loadMore()">
+      {{ 'VIEW_MORE' | translate }}
+      </ion-button>
+  </ion-toolbar>
+</ion-footer>
\ No newline at end of file
diff --git a/src/app/manage-learn/reports/observation-solution-listing/observation-solution-listing.component.scss b/src/app/manage-learn/reports/observation-solution-listing/observation-solution-listing.component.scss
new file mode 100644
index 000000000..186df831a
--- /dev/null
+++ b/src/app/manage-learn/reports/observation-solution-listing/observation-solution-listing.component.scss
@@ -0,0 +1,22 @@
+@import "src/assets/styles/variables";
+@import "src/assets/styles/_custom-mixins";
+@import "src/assets/styles/fonts";
+@import "src/assets/styles/_variables.scss";
+
+.fixed-container {
+    width: 100%;
+    margin-top: 56px;
+    position: relative;
+    z-index: 2;
+  }
+  
+  .scrollable-container {
+    padding-top:210px;
+    z-index: 1;
+    background-color: white;
+  }
+  
+  .main-container {
+    background: map-get($colors, white);
+    position: relative;
+  }
\ No newline at end of file
diff --git a/src/app/manage-learn/reports/observation-solution-listing/observation-solution-listing.component.ts b/src/app/manage-learn/reports/observation-solution-listing/observation-solution-listing.component.ts
new file mode 100644
index 000000000..f6e86f719
--- /dev/null
+++ b/src/app/manage-learn/reports/observation-solution-listing/observation-solution-listing.component.ts
@@ -0,0 +1,131 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { RouterLinks } from '@app/app/app.constant';
+import { LibraryFiltersLayout } from '@project-sunbird/common-consumption-v8';
+import { LoaderService, UtilsService } from '../../core';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { AssessmentApiService } from '../../core/services/assessment-api.service';
+
+@Component({
+  selector: 'app-observation-solution-listing',
+  templateUrl: './observation-solution-listing.component.html',
+  styleUrls: ['./observation-solution-listing.component.scss'],
+})
+export class ObservationSolutionListingComponent implements OnInit {
+  filters: Array<string> = [];
+  selectedFilterIndex: number = 0;
+  layout = LibraryFiltersLayout.ROUND;
+  solutionList = [];
+  entityType: string = '';
+  pageSize: number = 10;
+  pageNo: number = 1;
+  showLoadMore: boolean = true;
+
+  constructor(
+    private apiService: AssessmentApiService,
+    private utils: UtilsService,
+    private loader: LoaderService,
+    private router: Router
+  ) {}
+
+  ngOnInit() {
+    this.getSolutions();
+    // this.router.navigate([RouterLinks.GENERIC_REPORT], {
+    //   state: {
+    //     scores: true,
+    //     observation: true,
+    //     pdf: false,
+    //     entityId: '',
+    //     entityType: '',
+    //     observationId: '',
+    //     submissionId: '',
+    //     null: null,
+    //     undefined: undefined,
+    //   },
+    // });
+  }
+
+  async getSolutions() {
+    this.loader.startLoader();
+    let payload = await this.utils.getProfileInfo();
+    const config = {
+      url:
+        urlConstants.API_URLS.OBSERVATION_REPORT_SOLUTION_LIST +
+        `limit=${this.pageSize}&page=${this.pageNo}&entityType=${this.entityType}`,
+      payload: payload,
+    };
+    this.apiService.post(config).subscribe(
+      (data) => {
+        this.loader.stopLoader();
+        this.solutionList = data && data.result ? this.solutionList.concat(data.result.data) : [];
+        this.filters = data && data.result && !this.filters.length ? data.result.entityType : this.filters;
+        this.showLoadMore = this.solutionList.length < data.result.count ? true : false;
+      },
+      (error) => {
+        this.loader.stopLoader();
+      }
+    );
+  }
+
+  goToEntityList(solution) {
+    this.router.navigate([`${RouterLinks.REPORTS}/${RouterLinks.OBSERVATION_SOLUTION_ENTITY_LISTING}`], {
+      state: solution,
+    });
+  }
+
+  goToReports(solution) {
+    // if (solution.scoringSystem === 'pointsBasedScoring' || !solution.isRubricDriven) {
+    // if (!solution.criteriaLevelReport || !solution.isRubricDriven) {
+    //   const queryParams = {
+    //     queryParams: {
+    //       observationId: solution.observationId,
+    //       solutionId: solution.solutionId,
+    //       programId: solution.programId,
+    //       entityId: solution.entities[0]._id,
+    //       entityName: solution.entities[0].name,
+    //     },
+    //   };
+    //   this.router.navigate([`/${RouterLinks.OBSERVATION}/${RouterLinks.OBSERVATION_SUBMISSION}`], queryParams);
+    // } else {
+    //   this.router.navigate([RouterLinks.GENERIC_REPORT], {
+    //     state: {
+    //       scores: true,
+    //       observation: true,
+    //       pdf: false,
+    //       entityId: solution.entities[0]._id,
+    //       entityType: solution.entityType,
+    //       observationId: solution.observationId,
+    //     },
+    //   });
+    // }
+    let state = {
+      scores: false,
+      observation: true,
+      entityId: solution.entities[0]._id,
+      entityType: solution.entityType,
+      observationId: solution.observationId,
+    };
+    if (solution.isRubricDriven) {
+      state.scores = true;
+    }
+    if (!solution.criteriaLevelReport) {
+      state['filter'] = { questionId: [] };
+      state['criteriaWise'] = false;
+    }
+    this.router.navigate([RouterLinks.GENERIC_REPORT], {
+      state: state,
+    });
+  }
+
+  loadMore() {
+    this.pageNo++;
+    this.getSolutions();
+  }
+
+  applyFilter(filter) {
+    this.selectedFilterIndex = filter.data.index;
+    this.entityType = filter && filter.data ? filter.data.text : '';
+    this.solutionList = [];
+    this.getSolutions();
+  }
+}
diff --git a/src/app/manage-learn/reports/reports-listing/reports-listing.component.html b/src/app/manage-learn/reports/reports-listing/reports-listing.component.html
new file mode 100644
index 000000000..aa087a0cd
--- /dev/null
+++ b/src/app/manage-learn/reports/reports-listing/reports-listing.component.html
@@ -0,0 +1,17 @@
+<ion-content fullscreen>
+  <app-common-header
+    title="{{ 'FRMELEMNTS_LBL_REPORTS' | translate }}"
+    subTitle="{{ 'FRMELEMNTS_LBL_REPORTS_DESC' | translate }}"
+  ></app-common-header>
+  <section>
+    <app-item-list-card
+      title="{{ item?.title | translate }}"
+      subTitle="{{ item?.subTitle | translate }}"
+      (cardSelect)="onReportClick(item)"
+      *ngFor="let item of reportsArray"
+    >
+      <span class="dot" color></span>
+      <ion-icon arrow class="mg-popup-btn-icon" name="arrow-forward"></ion-icon>
+    </app-item-list-card>
+  </section>
+</ion-content>
diff --git a/src/app/manage-learn/reports/reports-listing/reports-listing.component.scss b/src/app/manage-learn/reports/reports-listing/reports-listing.component.scss
new file mode 100644
index 000000000..a8e8164db
--- /dev/null
+++ b/src/app/manage-learn/reports/reports-listing/reports-listing.component.scss
@@ -0,0 +1,8 @@
+@import "src/assets/styles/_variables.scss";
+.dot {
+  height: 50px;
+  width: 50px;
+  display: inline-block;
+  margin: 0 6.2px;
+  background-color: $gray-100;
+}
diff --git a/src/app/manage-learn/reports/reports-listing/reports-listing.component.ts b/src/app/manage-learn/reports/reports-listing/reports-listing.component.ts
new file mode 100644
index 000000000..7fbfc682e
--- /dev/null
+++ b/src/app/manage-learn/reports/reports-listing/reports-listing.component.ts
@@ -0,0 +1,78 @@
+import { Component, OnInit } from '@angular/core';
+import { AppHeaderService } from '@app/services';
+import { Platform } from '@ionic/angular';
+import { Subscription } from 'rxjs';
+import { Location } from '@angular/common';
+import { Router, RouterLink } from '@angular/router';
+import { RouterLinks } from '@app/app/app.constant';
+
+@Component({
+  selector: 'app-reports-listing',
+  templateUrl: './reports-listing.component.html',
+  styleUrls: ['./reports-listing.component.scss'],
+})
+export class ReportsListingComponent implements OnInit {
+  private backButtonFunc: Subscription;
+  headerConfig = {
+    showHeader: true,
+    showBurgerMenu: false,
+    actionButtons: [],
+  };
+
+  reportsArray = [
+    {
+      title: 'FRMELEMNTS_LBL_OBSERVATION_REPORTS',
+      subTitle: 'FRMELEMNTS_LBL_OBSERVATION_REPORTS_DEC',
+      link:`${RouterLinks.REPORTS}/${RouterLinks.OBSERVATION_SOLUTION_LISTING}`
+      // link: RouterLinks.OBSERVATION,
+    },
+    {
+      title: 'FRMELEMNTS_LBL_SURVEY_REPORTS',
+      subTitle: 'FRMELEMNTS_LBL_SURVEY_REPORTS_DESC',
+      link: RouterLinks.SURVEY,
+    },
+    {
+      title: 'FRMELEMNTS_LBL_IMPROVEMENT_REPORTS',
+      subTitle: 'FRMELEMNTS_LBL_IMPROVEMENT_REPORTS_DESC',
+      link: RouterLinks.PROJECT_REPORT,
+    },
+  ];
+
+  constructor(
+    private location: Location,
+    private headerService: AppHeaderService,
+    private platform: Platform,
+    private router: Router
+  ) {}
+
+  ngOnInit() {}
+
+  ionViewWillEnter() {
+    this.headerConfig = this.headerService.getDefaultPageConfig();
+    this.headerConfig.actionButtons = [];
+    this.headerConfig.showHeader = true;
+    this.headerConfig.showBurgerMenu = false;
+    this.headerService.updatePageConfig(this.headerConfig);
+    this.handleBackButton();
+  }
+
+  ionViewWillLeave() {
+    if (this.backButtonFunc) {
+      this.backButtonFunc.unsubscribe();
+    }
+  }
+
+  private handleBackButton() {
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
+      this.location.back();
+      this.backButtonFunc.unsubscribe();
+    });
+  }
+
+  handleNavBackButton() {
+    this.location.back();
+  }
+  onReportClick(item) {
+    this.router.navigate([item.link]);
+  }
+}
diff --git a/src/app/manage-learn/reports/reports.module.ts b/src/app/manage-learn/reports/reports.module.ts
new file mode 100644
index 000000000..6b7a4af61
--- /dev/null
+++ b/src/app/manage-learn/reports/reports.module.ts
@@ -0,0 +1,48 @@
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ReportsListingComponent } from './reports-listing/reports-listing.component';
+import { HttpClientModule } from '@angular/common/http';
+import { FormsModule } from '@angular/forms';
+import { IonicModule } from '@ionic/angular';
+import { TranslateModule } from '@ngx-translate/core';
+import { CoreModule } from '../core/core.module';
+import { SharedModule } from '../shared/shared.module';
+import { RouterModule, Routes } from '@angular/router';
+import { ObservationSolutionListingComponent } from './observation-solution-listing/observation-solution-listing.component';
+import { RouterLinks } from '@app/app/app.constant';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
+import { ObservationSolutionEntityListingComponent } from './observation-solution-entity-listing/observation-solution-entity-listing.component';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ReportsListingComponent,
+  },
+  {
+    path: RouterLinks.OBSERVATION_SOLUTION_LISTING,
+    component: ObservationSolutionListingComponent
+  },
+  {
+    path: RouterLinks.OBSERVATION_SOLUTION_ENTITY_LISTING,
+    component: ObservationSolutionEntityListingComponent
+  }
+];
+
+@NgModule({
+  declarations: [ReportsListingComponent, ObservationSolutionListingComponent, ObservationSolutionEntityListingComponent],
+  schemas: [
+    CUSTOM_ELEMENTS_SCHEMA
+  ],
+  imports: [
+    CommonModule,
+    RouterModule.forChild(routes),
+    CommonConsumptionModule,
+    HttpClientModule, // TODO:Tremove after api integration
+    TranslateModule.forChild(),
+    SharedModule,
+    IonicModule,
+    FormsModule,
+    CoreModule,
+  ],
+})
+export class ReportsModule { }
diff --git a/src/app/user-and-groups/add-or-remove-group-user/add-or-remove-group-user.module.ts b/src/app/manage-learn/section-listing/section-listing.module.ts
similarity index 58%
rename from src/app/user-and-groups/add-or-remove-group-user/add-or-remove-group-user.module.ts
rename to src/app/manage-learn/section-listing/section-listing.module.ts
index fd7e0d899..d97346b11 100644
--- a/src/app/user-and-groups/add-or-remove-group-user/add-or-remove-group-user.module.ts
+++ b/src/app/manage-learn/section-listing/section-listing.module.ts
@@ -5,26 +5,28 @@ import { Routes, RouterModule } from '@angular/router';
 
 import { IonicModule } from '@ionic/angular';
 
-import { AddOrRemoveGroupUserPage } from './add-or-remove-group-user.page';
+import { SectionListingPage } from './section-listing.page';
+import { CoreModule } from '../core/core.module';
+import { SharedModule } from '../shared/shared.module';
 import { TranslateModule } from '@ngx-translate/core';
 
 const routes: Routes = [
   {
     path: '',
-    component: AddOrRemoveGroupUserPage
+    component: SectionListingPage
   }
 ];
 
 @NgModule({
-  declarations: [AddOrRemoveGroupUserPage],
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
     RouterModule.forChild(routes),
-    TranslateModule.forChild()
+    CoreModule,
+    SharedModule,
+    TranslateModule
   ],
-  entryComponents: [AddOrRemoveGroupUserPage],
-  exports: [AddOrRemoveGroupUserPage]
+  declarations: [SectionListingPage]
 })
-export class AddOrRemoveGroupUserPageModule {}
+export class SectionListingPageModule {}
diff --git a/src/app/manage-learn/section-listing/section-listing.page.html b/src/app/manage-learn/section-listing/section-listing.page.html
new file mode 100644
index 000000000..98d8709be
--- /dev/null
+++ b/src/app/manage-learn/section-listing/section-listing.page.html
@@ -0,0 +1,74 @@
+<ion-content>
+  <ion-item-group>
+    <ion-item-divider color="light">
+      <h3 class="headerText">
+        <ion-icon name="book" class="margin-right"></ion-icon>
+        <span class="ml-5">{{ entityName }}</span>
+      </h3>
+    </ion-item-divider>
+    <ng-container *ngFor="let section of evidenceSections; let i = index">
+      <ion-item (click)="goToQuestioner(i)" *ngIf="section?.questions?.length">
+        <div class="d-flex flex-ai-center flex-jc-space-between w-100">
+          <div class="d-flex flex-ai-center">
+            <ion-icon name="list" class="margin-right mr-5"></ion-icon>
+            <span>
+              {{ section?.name }}
+            </span>
+          </div>
+          <span class="float-right" *ngIf="section.progressStatus === 'completed'" class="_completed _flex-box">
+            {{ 'COMPLETED' | translate }}
+            <ion-icon name="checkmark-circle" class="_progressIcon ion-margin-start"> </ion-icon>
+          </span>
+          <span class="float-right" *ngIf="!section.progressStatus && !isIos" class="_flex-box">
+            <ion-icon name="arrow-forward" class="_progressIcon ion-margin-start"></ion-icon>
+          </span>
+          <span class="float-right" *ngIf="section.progressStatus === 'inProgress'" class="_inProgress _flex-box">
+            {{ 'FRMELEMNTS_LBL_IN_PROGRESS' | translate }}
+            <ion-icon name="contrast" class="_progressIcon ion-margin-start" ></ion-icon>
+          </span>
+          <span class="float-right" *ngIf="section.progressStatus === 'submitted'" class="_submitted _flex-box">
+            {{ 'FRMELEMNTS_LBL_SUBMITTTED' | translate }}
+            <ion-icon name="cloud-done" class="_progressIcon ion-margin-start" ></ion-icon>
+          </span>
+        </div>
+      </ion-item>
+    </ng-container>
+  </ion-item-group>
+   <div class="border-radius ion-margin" *ngIf="currentEvidence?.description">
+    <h2 class="ion-padding-start">{{'FRMELEMNTS_LBL_DESCRIPTION' | translate}}</h2>
+    <div class="ion-padding-horizontal ion-padding-bottom">
+      {{currentEvidence?.description}}
+    </div>
+  </div>
+</ion-content>
+
+<ion-footer no-shadow
+  *ngIf="((allAnsweredForEvidence && !currentEvidence?.isSubmitted) || currentEvidence?.enableSubmit) && !sectionData?.observation">
+  <ion-toolbar position="bottom">
+    <ion-row>
+      <ion-button class="w-100" ion-button full (click)="checkForNetworkTypeAlert()">{{'FRMELEMNTS_BTN_UPLOAD_AND_SUBMIT'|translate}}
+       
+       </ion-button>
+
+    </ion-row>
+  </ion-toolbar>
+</ion-footer>
+
+<ion-footer no-shadow *ngIf="((allAnsweredForEvidence && !currentEvidence.isSubmitted && sectionData?.observation) || currentEvidence?.enableSubmit)">
+  <ion-toolbar position="bottom">
+    <ion-row>
+      <ion-button class="w-100" ion-button full (click)="previewSubmission()">
+        {{'FRMELEMNTS_BTN_PREVIEW'|translate}}</ion-button>
+    </ion-row>
+  </ion-toolbar>
+</ion-footer>
+
+<ion-footer no-shadow *ngIf="sectionData?.observation && currentEvidence?.isSubmitted">
+  <ion-toolbar position="bottom">
+    <ion-row>
+      <ion-button class="w-100" ion-button full (click)="viewReport()">
+        {{'FRMELEMNTS_LBL_VIEW_REPORT'|translate}} </ion-button>
+      
+    </ion-row>
+  </ion-toolbar>
+</ion-footer>
diff --git a/src/app/manage-learn/section-listing/section-listing.page.scss b/src/app/manage-learn/section-listing/section-listing.page.scss
new file mode 100644
index 000000000..0a93396c3
--- /dev/null
+++ b/src/app/manage-learn/section-listing/section-listing.page.scss
@@ -0,0 +1,7 @@
+.headerText {
+    font-weight: 500 !important;
+    font-size: 1.5rem !important;
+    display: flex;
+    align-items: center;
+  }
+  
\ No newline at end of file
diff --git a/src/app/manage-learn/section-listing/section-listing.page.ts b/src/app/manage-learn/section-listing/section-listing.page.ts
new file mode 100644
index 000000000..77a1fda1d
--- /dev/null
+++ b/src/app/manage-learn/section-listing/section-listing.page.ts
@@ -0,0 +1,199 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { RouterLinks } from '@app/app/app.constant';
+import { LocalStorageService, ToastService, UtilsService } from '@app/app/manage-learn/core';
+import { UpdateTrackerService } from '@app/app/manage-learn/core/services/update-tracker.service';
+import { CommonUtilService } from '@app/services';
+import { Network } from '@ionic-native/network/ngx';
+import { AlertController } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+// import { ObservationService } from '@app/app/manage-learn/observation/observation.service';
+
+@Component({
+  selector: 'app-section-listing',
+  templateUrl: './section-listing.page.html',
+  styleUrls: ['./section-listing.page.scss'],
+})
+export class SectionListingPage implements OnInit {
+  sectionData: any;
+  currentEvidence: any;
+  evidenceSections: any;
+  selectedEvidenceName: any;
+  data;
+  submissionId: any;
+  entityName: any;
+  selectedEvidenceIndex: any;
+  recentlyUpdatedEntity: any;
+  allAnsweredForEvidence: boolean;
+  networkAvailable: boolean;
+  constructor(
+    // private observationSrvc: ObservationService,
+    private localStorage: LocalStorageService,
+    private utils: UtilsService,
+    private updateTracker: UpdateTrackerService,
+    private router: Router,
+    private routerParam: ActivatedRoute,
+    private network: Network,
+    private translate: TranslateService,
+    private alertCtrl: AlertController,
+    private commonUtils: CommonUtilService,
+    private toast: ToastService
+  ) {
+    this.networkAvailable = this.commonUtils.networkInfo.isNetworkAvailable;
+
+    this.routerParam.queryParams.subscribe((params) => {
+      this.submissionId = params.submisssionId;
+      this.selectedEvidenceIndex = params.evidenceIndex;
+      this.entityName = params.schoolName;
+    });
+  }
+
+  ngOnInit() {}
+
+  ionViewWillEnter() {
+    this.localStorage
+      .getLocalStorage(this.utils.getAssessmentLocalStorageKey(this.submissionId))
+      .then((data) => {
+        this.sectionData = data;
+        let assessmentDetails = this.updateTracker.getLastModifiedInSection(
+          data,
+          this.selectedEvidenceIndex,
+          this.submissionId,
+          this.recentlyUpdatedEntity
+        );
+        this.currentEvidence = assessmentDetails['assessment']['evidences'][this.selectedEvidenceIndex];
+        this.evidenceSections = this.currentEvidence['sections'];
+        this.selectedEvidenceName = this.currentEvidence['name'];
+        this.checkForEvidenceCompletion();
+      })
+      .catch((error) => {});
+  }
+
+  checkForEvidenceCompletion(): void {
+    let allAnswered;
+    for (const section of this.evidenceSections) {
+      allAnswered = true;
+      for (const question of section.questions) {
+        if (!question.isCompleted) {
+          allAnswered = false;
+          break;
+        }
+      }
+      if (this.currentEvidence.isSubmitted) {
+        section.progressStatus = 'submitted';
+      } else if (!this.currentEvidence.startTime) {
+        section.progressStatus = '';
+      } else if (allAnswered) {
+        section.progressStatus = 'completed';
+      } else if (!allAnswered && section.progressStatus) {
+        section.progressStatus = 'inProgress';
+      } else if (!section.progressStatus) {
+        section.progressStatus = '';
+      }
+    }
+    this.allAnsweredForEvidence = true;
+    for (const section of this.evidenceSections) {
+      if (section.progressStatus !== 'completed') {
+        this.allAnsweredForEvidence = false;
+        break;
+      }
+    }
+    this.localStorage.setLocalStorage(this.utils.getAssessmentLocalStorageKey(this.submissionId), this.sectionData);
+  }
+
+  goToQuestioner(selectedSection): void {
+    const params = {
+      _id: this.submissionId,
+      name: this.entityName,
+      selectedEvidence: this.selectedEvidenceIndex,
+      selectedSection: selectedSection,
+    };
+    if (!this.evidenceSections[selectedSection].progressStatus) {
+      this.evidenceSections[selectedSection].progressStatus = this.currentEvidence.startTime ? 'inProgress' : '';
+      this.localStorage.setLocalStorage(this.utils.getAssessmentLocalStorageKey(this.submissionId), this.sectionData);
+    }
+
+    this.router.navigate([RouterLinks.QUESTIONNAIRE], {
+      queryParams: {
+        submisssionId: this.submissionId,
+        evidenceIndex: this.selectedEvidenceIndex,
+        sectionIndex: selectedSection,
+        schoolName: this.entityName,
+      },
+    });
+  }
+
+  async checkForNetworkTypeAlert() {
+    if (this.network.type !== ('3g' || '4g' || 'wifi')) {
+      let translateObject;
+      this.translate
+        .get(['FRMELEMNTS_LBL_CONFIRM', 'FRMELEMNTS_LBL_YES', 'FRMELEMNTS_LBL_NO', 'FRMELEMNTS_MSG_SLOW_INTERNET'])
+        .subscribe((translations) => {
+          translateObject = translations;
+          // console.log(JSON.stringify(translations))
+        });
+      let alert = await this.alertCtrl.create({
+        header: translateObject['FRMELEMNTS_LBL_CONFIRM'],
+        message: translateObject['FRMELEMNTS_MSG_SLOW_INTERNET'],
+        buttons: [
+          {
+            text: translateObject['FRMELEMNTS_LBL_NO'],
+            role: 'cancel',
+            handler: () => {
+              //console.log('Cancel clicked');
+            },
+          },
+          {
+            text: translateObject['FRMELEMNTS_LBL_YES'],
+            handler: () => {
+              this.goToImageListing();
+            },
+          },
+        ],
+      });
+      alert.present();
+    }
+  }
+
+  goToImageListing() {
+    if (this.networkAvailable) {
+      const params = {
+        // selectedEvidenceId: this.currentEvidence._id,
+        submissionId: this.submissionId,
+        name: this.entityName,
+        selectedEvidenceIndex: this.selectedEvidenceIndex,
+      };
+      // this.navCtrl.push(ImageListingPage, params);
+      this.router.navigate([RouterLinks.IMAGE_LISTING], { queryParams: params });
+    } else {
+      this.translate.get('toastMessage.connectToInternet').subscribe((translations) => {
+        this.toast.openToast(translations);
+      });
+    }
+  }
+
+  viewReport() {
+    // this.navCtrl.push(ObservationReportsPage, { submissionId: this.submissionId })
+    this.router.navigate([RouterLinks.OBSERVATION_REPORTS], {
+      queryParams: {
+        submissionId: this.submissionId,
+      },
+    });
+  }
+
+  previewSubmission() {
+    // this.submissionId = this.navParams.get('_id');
+    // this.entityName = this.navParams.get('name');
+    // this.selectedEvidenceIndex = this.navParams.get('selectedEvidence');
+    // this.navCtrl.push(PreviewPage, { _id: this.submissionId, name: this.entityName, selectedEvidence: this.selectedEvidenceIndex })
+
+    this.router.navigate([RouterLinks.SUBMISSION_PREVIEW], {
+      queryParams: {
+        submissionId: this.submissionId,
+        name: this.entityName,
+        selectedEvidenceIndex: this.selectedEvidenceIndex,
+        goBackNum :-1
+      },
+    });
+  }
+}
diff --git a/src/app/manage-learn/shared/TC-generic.popupService.ts b/src/app/manage-learn/shared/TC-generic.popupService.ts
new file mode 100644
index 000000000..eb1b5a58f
--- /dev/null
+++ b/src/app/manage-learn/shared/TC-generic.popupService.ts
@@ -0,0 +1,30 @@
+import { Injectable, Inject, NgZone } from '@angular/core';
+import { PrivacyPolicyAndTCComponent } from './components/privacy-policy-and-tc/privacy-policy-and-tc.component';
+import { PopoverController } from '@ionic/angular';
+
+@Injectable({
+    providedIn: 'root'
+})
+export class GenericPopUpService {
+    constructor(
+        private popOverCtrl: PopoverController
+    ) { }
+
+    async showPPPForProjectPopUp(message, message1, linkLabel, header, link, type) {
+        const alert = await this.popOverCtrl.create({
+            component: PrivacyPolicyAndTCComponent,
+            componentProps: {
+                message: message,
+                message1: message1,
+                linkLabel: linkLabel,
+                header: header,
+                link: 'https://diksha.gov.in/term-of-use.html',
+                isPrivacyPolicy: type == 'privacyPolicy' ? true : false
+            },
+            cssClass: 'sb-popover',
+        });
+        await alert.present();
+        const { data } = await alert.onDidDismiss();
+        return data;
+    }
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/attachment/attachment.component.html b/src/app/manage-learn/shared/components/attachment/attachment.component.html
new file mode 100644
index 000000000..af2dd0271
--- /dev/null
+++ b/src/app/manage-learn/shared/components/attachment/attachment.component.html
@@ -0,0 +1,32 @@
+<ion-card class="thumbnail-card">
+  <img [src]="url" *ngIf="imageFormats.includes(extension)" (click)="openImage(url)" />
+  <!-- <fa name="file-video-o" class="attachmentIcon" *ngIf="videoFormats.includes(extension)" (click)="playVideo(url)"></fa> -->
+  <ion-icon
+    name="videocam"
+    class="attachmentIcon"
+    *ngIf="videoFormats.includes(extension)"
+    (click)="playVideo(url)"
+  ></ion-icon>
+
+  <!-- <fa *ngIf="audioFormats.includes(extension)" name="file-audio-o" class="attachmentIcon" (click)="playAudio(url)"></fa> -->
+  <ion-icon
+    name="volume-medium"
+    *ngIf="audioFormats.includes(extension)"
+    class="attachmentIcon"
+    (click)="playAudio(url)"
+  ></ion-icon>
+  <!-- <fa class="attachmentIcon" name="file-pdf-o" *ngIf="pdfFormats.includes(extension)" (click)="openDocument(url)"></fa> -->
+  <ion-icon
+    name="document"
+    class="attachmentIcon"
+    *ngIf="pdfFormats.includes(extension)"
+    (click)="openDocument(url)"
+  ></ion-icon>
+
+  <ion-icon
+  name="document"
+  class="attachmentIcon"
+  *ngIf="spreadSheetFormats.includes(extension) || wordFormats.includes(extension) "
+  (click)="openDocument(url)"
+></ion-icon>
+</ion-card>
diff --git a/src/app/manage-learn/shared/components/attachment/attachment.component.scss b/src/app/manage-learn/shared/components/attachment/attachment.component.scss
new file mode 100644
index 000000000..ced678d96
--- /dev/null
+++ b/src/app/manage-learn/shared/components/attachment/attachment.component.scss
@@ -0,0 +1,15 @@
+.thumbnail-card {
+  height: 98px;
+  display: flex;
+  justify-content: space-around;
+  flex-direction: column;
+  align-items: center;
+}
+.thumbnail-card ion-icon {
+  font-size: 3.2em;
+}
+.attachmentIcon {
+  margin-top: 10px;
+  font-size: 50px;
+  // color: $primary-color;
+}
diff --git a/src/app/manage-learn/shared/components/attachment/attachment.component.ts b/src/app/manage-learn/shared/components/attachment/attachment.component.ts
new file mode 100644
index 000000000..e5d29eba3
--- /dev/null
+++ b/src/app/manage-learn/shared/components/attachment/attachment.component.ts
@@ -0,0 +1,77 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { PhotoViewer } from '@ionic-native/photo-viewer/ngx';
+import { StreamingMedia, StreamingVideoOptions } from '@ionic-native/streaming-media/ngx';
+import { FileExtension } from '../../fileExtension';
+
+@Component({
+  selector: 'attachments',
+  templateUrl: './attachment.component.html',
+  styleUrls: ['./attachment.component.scss'],
+})
+export class AttachmentComponent implements OnInit {
+  @Input() url: string;
+  @Input() extension: string;
+  imageFormats: string[] = FileExtension.imageFormats;
+  videoFormats: string[] = FileExtension.videoFormats;
+  audioFormats: string[] = FileExtension.audioFormats;
+  pdfFormats: string[] = FileExtension.pdfFormats;
+  wordFormats: string[] = FileExtension.wordFormats;
+  spreadSheetFormats: string[] = FileExtension.spreadSheetFormats;
+
+  constructor(private photoViewer: PhotoViewer, private streamingMedia: StreamingMedia) {
+    console.log('Hello AttachmentsComponent Component');
+  }
+  ngOnInit(): void {}
+
+  playVideo(link) {
+    let options: StreamingVideoOptions = {
+      successCallback: () => {
+        console.log('Video played');
+      },
+      errorCallback: (e) => {
+        console.log('Error streaming');
+      },
+      orientation: 'landscape',
+      shouldAutoClose: true,
+      controls: false,
+    };
+
+    this.streamingMedia.playVideo(link, options);
+  }
+
+  playAudio(link) {
+    let options: StreamingVideoOptions = {
+      successCallback: () => {
+        console.log('Video played');
+      },
+      errorCallback: (e) => {
+        console.log('Error streaming');
+      },
+      shouldAutoClose: true,
+      controls: true,
+    };
+
+    this.streamingMedia.playAudio(link, options);
+  }
+
+  openImage(link) {
+    this.photoViewer.show(link);
+  }
+
+  openDocument(link) {
+    // const url = encodeURIComponent(link);
+    // const browser = this.iab.create(
+    //   'https://docs.google.com/viewer?url=' + url,
+    //   '_blank',
+    //   'location=no,toolbar=no,clearcache=yes'
+    // );
+    // browser.show();
+    // TODO:check working
+    // (window as any).cordova.InAppBrowser.open(
+    //   'https://docs.google.com/viewer?url=' + encodeURIComponent(link),
+    //   '',
+    //   'location=no,toolbar=no,clearcache=yes'
+    // );
+    window.open(link, '_system', 'location=yes,enableViewportScale=yes,hidden=no');
+  }
+}
diff --git a/src/app/manage-learn/shared/components/audio-list/audio-list.component.html b/src/app/manage-learn/shared/components/audio-list/audio-list.component.html
new file mode 100644
index 000000000..315008930
--- /dev/null
+++ b/src/app/manage-learn/shared/components/audio-list/audio-list.component.html
@@ -0,0 +1,3 @@
+<p>
+  audio-list works!
+</p>
diff --git a/src/app/manage-learn/shared/components/audio-list/audio-list.component.scss b/src/app/manage-learn/shared/components/audio-list/audio-list.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/shared/components/audio-list/audio-list.component.ts b/src/app/manage-learn/shared/components/audio-list/audio-list.component.ts
new file mode 100644
index 000000000..1b47abda1
--- /dev/null
+++ b/src/app/manage-learn/shared/components/audio-list/audio-list.component.ts
@@ -0,0 +1,14 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-audio-list',
+  templateUrl: './audio-list.component.html',
+  styleUrls: ['./audio-list.component.scss'],
+})
+export class AudioListComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {}
+
+}
diff --git a/src/app/manage-learn/shared/components/bar-chart/bar-chart.component.html b/src/app/manage-learn/shared/components/bar-chart/bar-chart.component.html
new file mode 100644
index 000000000..36aad2123
--- /dev/null
+++ b/src/app/manage-learn/shared/components/bar-chart/bar-chart.component.html
@@ -0,0 +1,34 @@
+<div *ngIf="barChartData">
+  <div class="heading">
+    <h4>{{ questionNumber }}) {{ data?.question }}</h4>
+  </div>
+  <!-- <highcharts-chart
+    [(update)]="updateFlag"
+    [Highcharts]="Highcharts"
+    [options]="chartObj"
+    style="width: 100%; height: 400px; display: flex"
+    [constructorType]="chartConstructor"
+    [oneToOne]="oneToOneFlag"
+    [runOutsideAngular]="runOutsideAngularFlag"
+    *ngIf="data?.chart?.data"
+  >
+  </highcharts-chart> -->
+  <div *ngIf="data?.chart?.data">
+    <!-- <div id="{{'container' + questionNumber }}"></div> -->
+    <div style="display: block">
+      <canvas
+        baseChart
+        [datasets]="barChartData"
+        [labels]="barChartLabels"
+        [options]="barChartOptions"
+        [plugins]="barChartPlugins"
+        [legend]="barChartLegend"
+        [chartType]="barChartType"
+        [colors]="chartColors"
+      >
+      </canvas>
+    </div>
+  </div>
+
+  <div *ngIf="!data?.chart?.data" class="errorMsg">No data found</div>
+</div>
diff --git a/src/app/manage-learn/shared/components/bar-chart/bar-chart.component.scss b/src/app/manage-learn/shared/components/bar-chart/bar-chart.component.scss
new file mode 100644
index 000000000..457908792
--- /dev/null
+++ b/src/app/manage-learn/shared/components/bar-chart/bar-chart.component.scss
@@ -0,0 +1,12 @@
+@import 'src/assets/styles/base/_variables.scss';
+@import 'src/assets/styles/_custom-mixins.scss';
+@import 'src/assets/styles/_variables.scss';
+.heading {
+  background: #f4f4f4;
+  padding: 15px 10px;
+}
+.errorMsg {
+  color: $gray-400;
+  text-align: center;
+  padding: 20px 0;
+}
diff --git a/src/app/manage-learn/shared/components/bar-chart/bar-chart.component.ts b/src/app/manage-learn/shared/components/bar-chart/bar-chart.component.ts
new file mode 100644
index 000000000..b63a8cbf2
--- /dev/null
+++ b/src/app/manage-learn/shared/components/bar-chart/bar-chart.component.ts
@@ -0,0 +1,159 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { ChartOptions, ChartType, ChartDataSets } from 'chart.js';
+import { Label, SingleDataSet } from 'ng2-charts';
+
+@Component({
+  selector: 'bar-chart',
+  templateUrl: './bar-chart.component.html',
+  styleUrls: ['./bar-chart.component.scss'],
+})
+export class BarChartComponent implements OnInit {
+  @Input() data;
+  @Input() questionNumber;
+  // Highcharts = Highcharts; // required
+  // chartConstructor = 'chart'; // optional string, defaults to 'chart'
+  // updateFlag = false; // optional boolean
+  // oneToOneFlag = true; // optional boolean, defaults to false
+  // runOutsideAngular = false;
+  // chartObj;
+
+  public barChartOptions: ChartOptions = {
+    responsive: true,
+    maintainAspectRatio: true,
+    scales: {
+      xAxes: [
+        {
+          ticks: {
+            min: 0, // Edit the value according to what you need,
+            max: 100,
+          },
+          scaleLabel: {
+            display: true,
+            labelString: 'Response in %',
+          },
+        },
+      ],
+      yAxes: [
+        {
+          ticks: {
+            callback: function (value: any, index, values) {
+              // // return createSubstrArr(value, 5) || value;
+              let strArr = value.split(' ');
+              let tempString = '';
+              let result = [];
+              for (let x = 0; x < strArr.length; x++) {
+                tempString += ' ' + strArr[x];
+                if ((x % 4 === 0 && x !== 0) || x == strArr.length - 1) {
+                  tempString = tempString.slice(1);
+                  result.push(tempString);
+                  tempString = '';
+                }
+              }
+              return result || value;
+            },
+            fontSize: 12,
+          },
+          display: true,
+
+          scaleLabel: {
+            display: true,
+            labelString: 'Response',
+          },
+        },
+      ],
+    },
+  };
+  public barChartLabels: Label[];
+  // = ['Option A', 'Option B'];
+  public barChartType: ChartType = 'horizontalBar';
+  public barChartLegend = false;
+  public barChartPlugins;
+  public chartColors: Array<any>;
+
+  //   = [
+  //   {
+  //     // all colors in order
+  //     backgroundColor: ['#D35400', '#D35400', '#D35400'],
+  //   },
+  // ];
+
+  public barChartData: ChartDataSets[];
+  // =[{ data: [65, 59], label: 'Series A' }];
+
+  constructor() {}
+
+  ngOnInit() {
+    this.barChartLabels = this.data.chart.data.labels;
+    this.barChartData = [{ data: this.data.chart.data.datasets[0].data, label: 'Series A' }];
+    this.chartColors = [{ backgroundColor: this.data.chart.data.datasets[0].backgroundColor }];
+    this.barChartPlugins = [
+      {
+        beforeUpdate: function (c) {
+          var chartHeight = c.chart.height;
+          var size = (chartHeight * 5) / 100;
+          c.scales['y-axis-0'].options.ticks.minor.fontSize = size;
+        },
+      },
+    ];
+
+    // if (this.data && this.data.chart && this.data.chart.data) {
+    //   for (const instance of this.data.chart.data) {
+    //     const array = [];
+    //     for (let value of instance.data) {
+    //       array.push(parseFloat(value));
+    //     }
+    //     instance.data = array;
+    //   }
+    // }
+
+    // this.chartObj = {
+    //   chart: {
+    //     plotBackgroundColor: null,
+    //     plotBorderWidth: null,
+    //     plotShadow: false,
+    //     type: this.data.chart.type ? this.data.chart.type : 'bar',
+    //   },
+    //   title: {
+    //     text: ' ',
+    //   },
+    //   xAxis: this.data.chart.xAxis,
+    //   yAxis: this.data.chart.yAxis,
+    //   tooltip: {
+    //     // pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
+    //   },
+    //   plotOptions: this.data.chart.plotOptions
+    //     ? this.data.chart.plotOptions
+    //     : {
+    //         bar: {
+    //           dataLabels: {
+    //             enabled: false,
+    //           },
+    //           showInLegend: false,
+    //         },
+    //       },
+    //   series: this.data.chart.data,
+    //   legend: this.data.chart.legend
+    //     ? this.data.chart.legend
+    //     : {
+    //         enabled: false,
+    //       },
+    // };
+    // setTimeout(() => {
+    //   Highcharts.chart('container'+this.questionNumber, this.chartObj);
+    // }, 1000);
+  }
+}
+function createSubstrArr(str, words): any {
+  let strArr = str.split(' ');
+  let tempString = '';
+  let result = [];
+  for (let x = 0; x < strArr.length; x++) {
+    tempString += ' ' + strArr[x];
+    if ((x % words === 0 && x !== 0) || x == strArr.length - 1) {
+      tempString = tempString.slice(1);
+      result.push(tempString);
+      tempString = '';
+    }
+  }
+  return result;
+}
diff --git a/src/app/manage-learn/shared/components/chart/chart.component.html b/src/app/manage-learn/shared/components/chart/chart.component.html
new file mode 100644
index 000000000..c2878082e
--- /dev/null
+++ b/src/app/manage-learn/shared/components/chart/chart.component.html
@@ -0,0 +1,3 @@
+<div class="chart-container">
+    <canvas #doughnutCanvas></canvas>
+</div>
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/chart/chart.component.scss b/src/app/manage-learn/shared/components/chart/chart.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/shared/components/chart/chart.component.ts b/src/app/manage-learn/shared/components/chart/chart.component.ts
new file mode 100644
index 000000000..adb7607be
--- /dev/null
+++ b/src/app/manage-learn/shared/components/chart/chart.component.ts
@@ -0,0 +1,52 @@
+import { Component, ViewChild, OnInit, ElementRef, Input } from '@angular/core';
+import { Chart } from 'chart.js';
+@Component({
+  selector: 'app-chart',
+  templateUrl: './chart.component.html',
+  styleUrls: ['./chart.component.scss'],
+})
+export class ChartComponent implements OnInit {
+  // @ViewChild('doughnutCanvas', {static: false}) private doughnutCanvas: ElementRef;
+  @ViewChild('doughnutCanvas', { static: false }) private doughnutCanvas: ElementRef;
+  private doughnutChart: any;
+  constructor() {
+  }
+
+  ngOnInit() {
+
+  }
+  ngAfterViewInit() {
+    this.setup();
+  }
+  setup() {
+    console.log('in setup');
+    this.doughnutChart = new Chart(this.doughnutCanvas.nativeElement, {
+      type: "doughnut",
+      data: {
+        labels: ["Completed", "Overdue", "Pending"],
+        datasets: [
+          {
+            label: "",
+            data: [12, 19, 3],
+            backgroundColor: [
+              "rgba(255, 99, 132, 0.2)",
+              "rgba(54, 162, 235, 0.2)",
+              "rgba(255, 206, 86, 0.2)"
+            ],
+            hoverBackgroundColor: ["#FF6384", "#36A2EB", "#FFCE56"]
+          }
+        ]
+      },
+      options: {
+        maintainAspectRatio: false,
+        legend: {
+          display: true,
+          position: 'bottom',
+          labels: {
+              fontColor: '#333',
+          }
+      },
+    }
+    });
+  }
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/common-header/common-header.component.html b/src/app/manage-learn/shared/components/common-header/common-header.component.html
new file mode 100644
index 000000000..5b96d6fae
--- /dev/null
+++ b/src/app/manage-learn/shared/components/common-header/common-header.component.html
@@ -0,0 +1,8 @@
+<ion-list>
+  <ion-item lines="none">
+    <ion-label class="mt-15">
+      <div class="title">{{ title | titlecase }}</div>
+      <div class="desc">{{ subTitle }}</div>
+    </ion-label>
+  </ion-item>
+</ion-list>
diff --git a/src/app/manage-learn/shared/components/common-header/common-header.component.scss b/src/app/manage-learn/shared/components/common-header/common-header.component.scss
new file mode 100644
index 000000000..2a81c21f8
--- /dev/null
+++ b/src/app/manage-learn/shared/components/common-header/common-header.component.scss
@@ -0,0 +1,13 @@
+
+.desc {
+    color: #999999;
+    white-space: normal;
+    padding: 5px 0px 30px 0px;
+    margin-bottom: 10px;
+}
+
+.title{
+    font-size: 16px;
+    font-weight: bold;
+    color: black;
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/common-header/common-header.component.ts b/src/app/manage-learn/shared/components/common-header/common-header.component.ts
new file mode 100644
index 000000000..eebe1be16
--- /dev/null
+++ b/src/app/manage-learn/shared/components/common-header/common-header.component.ts
@@ -0,0 +1,18 @@
+import { Component, OnInit } from '@angular/core';
+import { Input } from '@angular/core';
+
+@Component({
+  selector: 'app-common-header',
+  templateUrl: './common-header.component.html',
+  styleUrls: ['./common-header.component.scss'],
+})
+export class CommonHeaderComponent implements OnInit {
+  @Input() title: any;
+  @Input() subTitle: any;
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/src/app/manage-learn/shared/components/create-task-form/create-task-form.component.html b/src/app/manage-learn/shared/components/create-task-form/create-task-form.component.html
new file mode 100644
index 000000000..87577b26e
--- /dev/null
+++ b/src/app/manage-learn/shared/components/create-task-form/create-task-form.component.html
@@ -0,0 +1,60 @@
+<ion-toolbar>
+  <!-- <ion-title>
+    {{title | translate}}
+  </ion-title> -->
+  <ion-buttons (click)="close()" slot="start" class="padding">
+    <ion-icon name="close" slot="icon-only" style="padding-left: 10px;"></ion-icon>
+  </ion-buttons>
+</ion-toolbar>
+<ion-content class="ion-padding">
+  <h5>{{'FRMELEMNTS_LBL_ADD_NEW_TASK' | translate}}</h5>
+  <ion-item>
+    <ion-label position="stacked" class="custom-label">
+      {{'FRMELEMNTS_LBL_ASSIGNED_TO' | translate}}
+    </ion-label>
+    <ion-icon name="person" slot="start"></ion-icon>
+    <ion-icon name="share-social" slot="end" (click)="share()"></ion-icon>
+    <ion-input type="text" [(ngModel)]="newTask.assignee">
+    </ion-input>
+  </ion-item>
+  <ion-item>
+    <ion-label position="stacked" class="custom-label">
+      {{'FRMELEMNTS_LBL_END_DATE' | translate}}
+    </ion-label>
+    <ion-icon name="calendar" slot="start"></ion-icon>
+    <ion-datetime min="{{currentYear-2}}" max="{{currentYear + 5}}" class="no-rght-brdr-rds" displayFormat="DD/MM/YYYY"
+      display-timezone="utc" value={{newTask.endDate}} [(ngModel)]="newTask.endDate" class="project-date"
+      placeholder={{today}}>
+    </ion-datetime>
+  </ion-item>
+  <ion-item>
+    <ion-label position="stacked" class="custom-label">
+      {{'FRMELEMNTS_LBL_TASK_DESCRIPTION' | translate}}<span class="reuired-field">* </span>
+    </ion-label>
+    <ion-icon name="newspaper" slot="start"></ion-icon>
+    <ion-textarea type="text" [(ngModel)]="newTask.name">
+    </ion-textarea>
+  </ion-item>
+  <div class="attachments-box">
+    <div *ngIf="newTask.attachments.length > 0">
+      <p *ngFor="let file of newTask.attachments">
+        <ion-icon name="attach" class="img"></ion-icon>
+        {{file.name}}
+      </p>
+    </div>
+    <ion-row class="file-box">
+      <ion-col size="6" class="file-list">
+        <div *ngIf="newTask.attachments.length == 0">
+          <ion-icon name="image"></ion-icon>
+          <!-- <ion-icon name="attach"></ion-icon> -->
+        </div>
+      </ion-col>
+      <ion-col size="6">
+        <a class="attach-label" (click)="doAction()">{{'FRMELEMNTS_LBL_ATTACH' | translate}}</a>
+      </ion-col>
+    </ion-row>
+  </div>
+  <ion-button expand="block" (click)="addTask()">
+    {{'FRMELEMNTS_LBL_ADD_TASK' | translate}}
+  </ion-button>
+</ion-content>
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/create-task-form/create-task-form.component.scss b/src/app/manage-learn/shared/components/create-task-form/create-task-form.component.scss
new file mode 100644
index 000000000..439438607
--- /dev/null
+++ b/src/app/manage-learn/shared/components/create-task-form/create-task-form.component.scss
@@ -0,0 +1,43 @@
+@import "src/assets/styles/_variables.scss";
+.custom-label{
+    font-size: 20px;
+    font-weight: 400;
+    margin-bottom: 15px;
+}
+
+.file-list{
+    margin: auto; 
+    font-size: 24px;
+}
+
+.attachments-box{
+    background: #a9a9a966;
+    margin-bottom: 35px;
+    height: auto;
+    padding: 5px 10px;
+    .file-box{
+        img{
+            margin: 5px 5px;
+            font-size: 23px;
+        }
+        .attach-label{
+        color: #{$blue}; 
+        text-align:right;
+        float: right;
+        margin: 10px 10px; 
+        }
+    }
+    .img{
+        margin: 5px 5px;
+        margin-bottom: -5px;
+        font-size: 23px;
+        transform: rotate(45deg);
+        -ms-transform: rotate(45deg);
+        -webkit-transform: rotate(45deg);
+    }
+    p{
+        margin-top: 5px;
+        margin-bottom: 5px;
+        font-weight: 500;
+    }
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/create-task-form/create-task-form.component.ts b/src/app/manage-learn/shared/components/create-task-form/create-task-form.component.ts
new file mode 100644
index 000000000..5ad8471ae
--- /dev/null
+++ b/src/app/manage-learn/shared/components/create-task-form/create-task-form.component.ts
@@ -0,0 +1,54 @@
+import { Component, OnInit } from '@angular/core';
+import { AttachmentService, ToastService, UtilsService } from '@app/app/manage-learn/core';
+import { ModalController } from '@ionic/angular';
+import { GenericPopUpService } from '../../TC-generic.popupService';
+
+@Component({
+  selector: 'app-create-task-form',
+  templateUrl: './create-task-form.component.html',
+  styleUrls: ['./create-task-form.component.scss'],
+})
+export class CreateTaskFormComponent implements OnInit {
+  newTask;
+  currentYear = new Date().getFullYear();
+  today
+  constructor(
+    private modalCtrl: ModalController,
+    private utils: UtilsService,
+    private attachmentService: AttachmentService,
+    private toast: ToastService,
+    private popupService: GenericPopUpService
+  ) { }
+
+  ngOnInit() {
+    this.prepareTaskMeta();
+  }
+  prepareTaskMeta() {
+    this.newTask = JSON.parse(JSON.stringify(this.utils.getMetaData('task')));
+  }
+  close() {
+    this.modalCtrl.dismiss();
+  }
+  openAction() {
+    this.attachmentService.selectImage().then(data => {
+      !this.newTask.attachments ? this.newTask.attachments = [] : '';
+      data.data ? this.newTask.attachments.push(data.data) : ''
+    })
+  }
+
+  doAction() {
+    this.popupService.showPPPForProjectPopUp('FRMELEMNTS_LBL_EVIDENCES_CONTENT_POLICY', 'FRMELEMNTS_LBL_EVIDENCES_CONTENT_POLICY_TEXT', 'FRMELEMNTS_LBL_EVIDENCES_CONTENT_POLICY_LABEL', 'FRMELEMNTS_LBL_UPLOAD_EVIDENCES', 'https://diksha.gov.in/term-of-use.html', 'contentPolicy').then((data: any) => {
+      if (data.isClicked) {
+        data.isChecked ? this.openAction() : this.toast.showMessage('FRMELEMNTS_MSG_EVIDENCES_CONTENT_POLICY_REJECT', 'danger');
+      }
+    })
+  }
+
+  addTask() {
+    this.newTask.name ? this.modalCtrl.dismiss(this.newTask) : this.toast.showMessage('FRMELEMNTS_MSG_REQUIRED_FIELDS', 'danger');
+  }
+
+  share() {
+    this.toast.showMessage('FRMELEMNTS_MSG_COMING_SOON', 'danger');
+  }
+}
diff --git a/src/app/manage-learn/shared/components/create-task/create-task.component.html b/src/app/manage-learn/shared/components/create-task/create-task.component.html
new file mode 100644
index 000000000..a6b719cc7
--- /dev/null
+++ b/src/app/manage-learn/shared/components/create-task/create-task.component.html
@@ -0,0 +1,27 @@
+<ion-content class="P0">
+  <div class="ecd-header ion-text-center">
+    <!-- <h6 class="M0">{{title | titlecase}}</h6> -->
+  </div>
+  <ion-grid class="P0">
+    <ion-icon name="close" class="sb-modal-close close-popup" (click)="closePopover()"></ion-icon>
+    <ion-row class="P16">
+      <h5> {{'FRMELEMNTS_LBL_ADD_NEW_TASK' | translate}}</h5>
+      <section class="W100 MT3V">
+        <p>{{'FRMELEMNTS_LBL_TASK_DESCRIPTION' | translate}}</p>
+        <ion-col size="12" class="ion-no-padding">
+          <div class="W100 merged-input-container MT10">
+            <ion-textarea type="text" placeholder="{{'FRMELEMNTS_LBL_ADD_DESCRIPTION_HERE' | translate}}" class="form-control custom task-desc" [(ngModel)]="newTask.name">
+            </ion-textarea>
+          </div>
+        </ion-col>
+      </section>
+    </ion-row>
+    <ion-row class="custom-shadow">
+      <ion-col padding size="12">
+        <ion-button expand="block" type="submit" (click)="addTask()">
+          {{ 'FRMELEMNTS_LBL_ADD_TASK' | translate }}
+        </ion-button>
+      </ion-col>
+    </ion-row>
+  </ion-grid>
+</ion-content>
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/create-task/create-task.component.scss b/src/app/manage-learn/shared/components/create-task/create-task.component.scss
new file mode 100644
index 000000000..32d5027ae
--- /dev/null
+++ b/src/app/manage-learn/shared/components/create-task/create-task.component.scss
@@ -0,0 +1,16 @@
+@import "../../../../../assets/styles/_variables.scss";
+.close-popup{
+    margin: 10px;
+    font-size: 24px;
+    right: 0px;
+    position: absolute;
+}
+.P16 {
+    padding: 16px !important;
+    h5{
+        font-weight: 600;
+    }
+  }
+.task-desc{
+    border:1px solid $gray-400;
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/create-task/create-task.component.ts b/src/app/manage-learn/shared/components/create-task/create-task.component.ts
new file mode 100644
index 000000000..f0c80144b
--- /dev/null
+++ b/src/app/manage-learn/shared/components/create-task/create-task.component.ts
@@ -0,0 +1,49 @@
+import { Component, OnInit } from '@angular/core';
+import { AttachmentService, ToastService, UtilsService } from '@app/app/manage-learn/core';
+import { ModalController, PopoverController } from '@ionic/angular';
+
+@Component({
+  selector: 'app-create-task',
+  templateUrl: './create-task.component.html',
+  styleUrls: ['./create-task.component.scss'],
+})
+export class CreateTaskComponent implements OnInit {
+  newTask;
+  currentYear = new Date().getFullYear();
+  today;
+  
+  constructor(
+    private modalCtrl: ModalController,
+    private utils: UtilsService,
+    private attachmentService: AttachmentService,
+    private toast: ToastService,
+    public popOverCtrl: PopoverController
+  ) { }
+
+  ngOnInit() {
+    this.prepareTaskMeta();
+  }
+  prepareTaskMeta() {
+    this.newTask = JSON.parse(JSON.stringify(this.utils.getMetaData('task')));
+  }
+  close() {
+    this.modalCtrl.dismiss();
+  }
+  openAction() {
+    this.attachmentService.selectImage().then(data => {
+      !this.newTask.attachments ? this.newTask.attachments = [] : '';
+      data.data ? this.newTask.attachments.push(data.data) : ''
+    })
+  }
+
+  addTask() {
+    this.newTask.name ? this.popOverCtrl.dismiss(this.newTask) : this.toast.showMessage('FRMELEMNTS_MSG_REQUIRED_FIELDS', 'danger');
+  }
+
+  share() {
+    this.toast.showMessage('FRMELEMNTS_MSG_COMING_SOON', 'danger');
+  }
+  closePopover() {
+    this.popOverCtrl.dismiss();
+  }
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/criteria-list/criteria-list.component.html b/src/app/manage-learn/shared/components/criteria-list/criteria-list.component.html
new file mode 100644
index 000000000..607ee9690
--- /dev/null
+++ b/src/app/manage-learn/shared/components/criteria-list/criteria-list.component.html
@@ -0,0 +1,40 @@
+<ion-content padding>
+  <div>
+    <h3 class="heading">{{ 'FRMELEMENTS_MSG_QUESTION_FILTER' | translate }}</h3>
+  </div>
+
+  <ion-list text-wrap>
+    <ion-item
+      *ngFor="let criteria of allCriterias"
+      (click)="onCriteriaClick(criteria?.criteriaId ? criteria?.criteriaId : criteria?.id)"
+    >
+      <ion-label>{{ criteria?.criteriaName || criteria?.name }}</ion-label>
+      <ion-checkbox
+        *ngIf="criteria?.criteriaName"
+        [checked]="filteredCriterias?.includes(criteria?.criteriaId)"
+      ></ion-checkbox>
+      <!-- TODO Remove when backend is changed to give id and name only instead of criteriaId and criteriaName in both  apis-->
+      <ion-checkbox
+        *ngIf="criteria?.name"
+        [checked]="filteredCriterias?.includes(criteria?.id)"
+      ></ion-checkbox>
+    </ion-item>
+  </ion-list>
+</ion-content>
+
+<ion-footer no-shadow>
+  <ion-toolbar class="_toolbar-background-md" position="bottom">
+    <ion-row>
+      <ion-col>
+        <ion-button ion-button full (click)="close()" class="w-100">
+          {{ 'CANCEL' | translate }}
+        </ion-button>
+      </ion-col>
+      <ion-col>
+        <ion-button ion-button full (click)="applyFilter()" class="w-100">
+          {{ 'APPLY_FILTER' | translate }}
+        </ion-button>
+      </ion-col>
+    </ion-row>
+  </ion-toolbar>
+</ion-footer>
diff --git a/src/app/manage-learn/shared/components/criteria-list/criteria-list.component.scss b/src/app/manage-learn/shared/components/criteria-list/criteria-list.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/shared/components/criteria-list/criteria-list.component.ts b/src/app/manage-learn/shared/components/criteria-list/criteria-list.component.ts
new file mode 100644
index 000000000..0801746a5
--- /dev/null
+++ b/src/app/manage-learn/shared/components/criteria-list/criteria-list.component.ts
@@ -0,0 +1,49 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastService, UtilsService } from '@app/app/manage-learn/core';
+import { ModalController, NavController, NavParams } from '@ionic/angular';
+
+@Component({
+  selector: 'app-criteria-list',
+  templateUrl: './criteria-list.component.html',
+  styleUrls: ['./criteria-list.component.scss'],
+})
+export class CriteriaListComponent implements OnInit {
+  allCriterias: any;
+  filteredCriterias: any;
+
+  constructor(
+    public navCtrl: NavController,
+    public navParams: NavParams,
+    // private viewCntrl: ViewController,
+    private utils: UtilsService,
+    private toast: ToastService,
+    private modalCtrl: ModalController
+  ) {}
+
+  ngOnInit() {
+    this.allCriterias = this.navParams.get('allCriterias');
+    this.filteredCriterias = this.navParams.get('filteredCriterias');
+  }
+
+  onCriteriaClick(externalId) {
+    if (this.filteredCriterias.includes(externalId)) {
+      const indexOfQuestion = this.filteredCriterias.indexOf(externalId);
+      this.filteredCriterias.splice(indexOfQuestion, 1);
+    } else {
+      this.filteredCriterias.push(externalId);
+    }
+    console.log(JSON.stringify(this.filteredCriterias));
+  }
+  applyFilter() {
+    !this.filteredCriterias.length
+      ? this.toast.openToast('Select at least one criteria')
+      : this.modalCtrl.dismiss({
+          filter: this.filteredCriterias,
+          action: 'updated',
+        });
+  }
+
+  close() {
+    this.modalCtrl.dismiss({ action: 'cancelled' });
+  }
+}
diff --git a/src/app/manage-learn/shared/components/date-type-input/date-type-input.component.html b/src/app/manage-learn/shared/components/date-type-input/date-type-input.component.html
new file mode 100644
index 000000000..4896f55e0
--- /dev/null
+++ b/src/app/manage-learn/shared/components/date-type-input/date-type-input.component.html
@@ -0,0 +1,48 @@
+<ion-card class="_cardBg ion-padding">
+  <ion-col class="_flex-box _justify-content-center _flex-direction-column">
+    <h4 [ngClass]="{'_validQuestion': data?.value}" class="flexbox">
+      <app-question-heading [inputIndex]="inputIndex" [data]="data" [enableQuestionReadOut]="enableQuestionReadOut">
+      </app-question-heading>
+    </h4>
+  </ion-col>
+
+  <div class="_tip _flex-box">{{data?.tip}}</div>
+
+  <div class="ion-margin-top" style="position: relative;">
+    <ion-item>
+      <ion-label floating>{{'FRMELEMENTS_LBL_DATE'| translate}}</ion-label>
+      <ion-datetime [disabled]="data?.autoCapture || (data.isEditable!=undefined && !data.isEditable)"
+        displayFormat="{{data?.dateFormat}}" *ngIf="data?.validation.max && !data?.validation.min"
+        [max]='data?.validation.max ? data?.validation.max : ""' (ionCancel)="canceled()" [(ngModel)]="data.value"
+        (ngModelChange)="checkForValidation()"></ion-datetime>
+
+      <ion-datetime [disabled]="data?.autoCapture || (data.isEditable!=undefined && !data.isEditable)"
+        displayFormat="{{data?.dateFormat}}" *ngIf="data?.validation.min && !data?.validation.max"
+        [min]='(data?.validation.min) ? data?.validation.min : ""' [max]="futureDate" (ionCancel)="canceled()"
+        [(ngModel)]="data.value" (ngModelChange)="checkForValidation()"></ion-datetime>
+
+      <ion-datetime [disabled]="data?.autoCapture || (data.isEditable!=undefined && !data.isEditable)"
+        displayFormat="{{data?.dateFormat}}" *ngIf="data?.validation.min && data?.validation.max"
+        [min]='(data?.validation.min) ? data?.validation.min : ""' (ionCancel)="canceled()" [(ngModel)]="data.value"
+        (ngModelChange)="checkForValidation()"></ion-datetime>
+
+      <ion-datetime [disabled]="data?.autoCapture  || (data.isEditable!=undefined && !data.isEditable)"
+        displayFormat="{{data?.dateFormat}}" *ngIf="!data?.validation.min && !data?.validation.max"
+        (ionCancel)="canceled()" [(ngModel)]="data.value" [max]="futureDate" (ngModelChange)="checkForValidation()">
+      </ion-datetime>
+    </ion-item>
+    <ion-button icon-start clear class="capture ion-float-right" (click)="captureTime()"
+      *ngIf="!data?.value && data?.autoCapture">
+      {{'FRMELEMENTS_LBL_CAPTURE'| translate}}
+    </ion-button>
+    <!-- <ion-button icon-start clear class="capture ion-float-right" (click)="captureTime()"
+      *ngIf="!data?.autoCapture">
+      {{'FRMELEMENTS_LBL_TODAY'| translate}}
+    </ion-button> -->
+    <div style="width: 100%;">
+      <app-remarks *ngIf="data?.showRemarks" [data]="data"></app-remarks>
+    </div>
+    <app-image-upload [data]="data" [generalQuestion]="generalQuestion" [imageLocalCopyId]="imageLocalCopyId"
+      [evidenceId]="evidenceId" [submissionId]="submissionId"></app-image-upload>
+  </div>
+</ion-card>
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/date-type-input/date-type-input.component.scss b/src/app/manage-learn/shared/components/date-type-input/date-type-input.component.scss
new file mode 100644
index 000000000..7c26bd781
--- /dev/null
+++ b/src/app/manage-learn/shared/components/date-type-input/date-type-input.component.scss
@@ -0,0 +1,6 @@
+.capture {
+    position: absolute;
+    right: 0;
+    top: 0;
+    z-index: 1;
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/date-type-input/date-type-input.component.ts b/src/app/manage-learn/shared/components/date-type-input/date-type-input.component.ts
new file mode 100644
index 000000000..89ba31ebc
--- /dev/null
+++ b/src/app/manage-learn/shared/components/date-type-input/date-type-input.component.ts
@@ -0,0 +1,76 @@
+import { Component, Input, EventEmitter, Output, OnInit } from '@angular/core';
+import { UtilsService } from '@app/app/manage-learn/core';
+import { DatePipe } from '@angular/common';
+
+@Component({
+  selector: 'app-date-type-input',
+  templateUrl: './date-type-input.component.html',
+  styleUrls: ['./date-type-input.component.scss'],
+})
+export class DateTypeInputComponent implements OnInit {
+  @Input() data: any;
+  @Input() isLast: boolean;
+  @Input() isFirst: boolean;
+  @Output() nextCallBack = new EventEmitter();
+  @Output() previousCallBack = new EventEmitter()
+  @Input() evidenceId: string;
+  @Input() schoolId: string;
+  @Input() imageLocalCopyId: string;
+  @Input() generalQuestion: boolean;
+  @Input() submissionId: any;
+  @Input() inputIndex;
+  @Input() hideButton: boolean;
+  @Input() enableQuestionReadOut: boolean;
+  questionValid: boolean;
+  currentDate;
+  futureDate;
+
+  constructor(
+    private utils: UtilsService,
+    private datePipe: DatePipe
+  ) {
+    this.getFutureDate();
+
+  }
+
+  next(status?: string) {
+    this.data.isCompleted = this.utils.isQuestionComplete(this.data);
+    if (!this.data.validation.required) {
+      this.data.isCompleted = true;
+    }
+    this.nextCallBack.emit(status);
+  }
+
+  captureTime(): void {
+    const parseString = this.data.dateFormat;
+    this.data.value = new Date(Date.now()).toISOString();
+    this.checkForValidation();
+  }
+
+  back() {
+    this.data.isCompleted = this.utils.isQuestionComplete(this.data);
+    this.previousCallBack.emit('previous');
+  }
+
+  canceled() {
+  }
+
+  ngOnInit() {
+    const dateTime = new Date();
+    this.data.validation.max = this.data.validation.max === "currentDate" ? new Date().toISOString().split('T')[0] : this.data.validation.max;
+    this.data.validation.min = this.data.validation.min === "currentDate" ? new Date().toISOString().split('T')[0] : this.data.validation.min;
+    this.checkForValidation();
+    this.data.startTime = this.data.startTime ? this.data.startTime : Date.now();
+  }
+
+  getFutureDate() {
+    let currentDate = new Date();
+    this.futureDate = currentDate.getFullYear() + 10
+  }
+
+  checkForValidation(): void {
+    this.data.isCompleted = this.utils.isQuestionComplete(this.data);
+    this.data.endTime = this.questionValid ? Date.now() : "";
+  }
+
+}
diff --git a/src/app/manage-learn/shared/components/download-share/download-share.component.html b/src/app/manage-learn/shared/components/download-share/download-share.component.html
new file mode 100644
index 000000000..f7f8dba35
--- /dev/null
+++ b/src/app/manage-learn/shared/components/download-share/download-share.component.html
@@ -0,0 +1,31 @@
+<div *ngIf="interface == 'simple'">
+  <ion-icon
+    name="ellipsis-vertical-outline"
+    color="primary"
+    (click)="openPopupMenu($event)"
+    *ngIf="!showOptions"
+    style="font-size: 20px"
+  ></ion-icon>
+
+  <ion-list *ngIf="showOptions">
+    <ion-item button (click)="download(true)"> {{ 'FRMELEMNTS_LBL_SHARE' | translate }}</ion-item>
+    <ion-item button (click)="download()">{{ 'FRMELEMNTS_LBL_DOWNLOAD' | translate }}</ion-item>
+  </ion-list>
+</div>
+
+<!-- Fab button round UI ,pass interface= fab-->
+<div *ngIf="interface == 'fab'">
+  <ion-fab vertical="bottom" horizontal="end" slot="fixed">
+    <ion-fab-button size="small">
+      <ion-icon name="ellipsis-vertical-outline"></ion-icon>
+    </ion-fab-button>
+    <ion-fab-list side="start">
+      <ion-fab-button color="medium" (click)="download('share')">
+        <ion-icon name="share"></ion-icon>
+      </ion-fab-button>
+      <ion-fab-button color="medium" (click)="download()">
+        <ion-icon name="download"></ion-icon>
+      </ion-fab-button>
+    </ion-fab-list>
+  </ion-fab>
+</div>
diff --git a/src/app/manage-learn/shared/components/download-share/download-share.component.scss b/src/app/manage-learn/shared/components/download-share/download-share.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/shared/components/download-share/download-share.component.ts b/src/app/manage-learn/shared/components/download-share/download-share.component.ts
new file mode 100644
index 000000000..5dbf367a6
--- /dev/null
+++ b/src/app/manage-learn/shared/components/download-share/download-share.component.ts
@@ -0,0 +1,165 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { LoaderService, ToastService, UtilsService } from '@app/app/manage-learn/core';
+import { UnnatiDataService } from '@app/app/manage-learn/core/services/unnati-data.service';
+import { AndroidPermissions } from '@ionic-native/android-permissions/ngx';
+import { FilePath } from '@ionic-native/file-path/ngx';
+import { File } from '@ionic-native/file/ngx';
+import { FileTransfer } from '@ionic-native/file-transfer/ngx';
+import { SocialSharing } from '@ionic-native/social-sharing/ngx';
+import { AlertController, Platform, PopoverController } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+import { FileOpener } from '@ionic-native/file-opener/ngx';
+import { DhitiApiService } from '@app/app/manage-learn/core/services/dhiti-api.service';
+
+@Component({
+  selector: 'download-share',
+  templateUrl: './download-share.component.html',
+  styleUrls: ['./download-share.component.scss'],
+})
+export class DownloadShareComponent implements OnInit {
+  @Input() interface;
+  @Input() showOptions;
+  @Input() name = ['filter'];
+  @Input() extension: string;
+  // @Input() downloadUrl: any;
+  @Input() config: any;
+  texts: any;
+  constructor(
+    public popoverController: PopoverController,
+    private socialSharing: SocialSharing,
+    private fileTransfer: FileTransfer,
+    private platform: Platform,
+    private file: File,
+    public alertController: AlertController,
+    public utils: UtilsService,
+    public toast: ToastService,
+    public loader: LoaderService,
+    public filePath: FilePath,
+    public unnatiSrvc: UnnatiDataService,
+    private translate: TranslateService,
+    private androidPermissions: AndroidPermissions,
+    public fileOpener: FileOpener,
+    public dhiti: DhitiApiService
+  ) {
+    this.translate
+      .get(['FRMELEMENTS_MSG_ERROR_WHILE_DOWNLOADING', 'FRMELEMENTS_MSG_SUCCESSFULLY DOWNLOADED'])
+      .subscribe((data) => {
+        this.texts = data;
+      });
+  }
+
+  ngOnInit() {}
+  async openPopupMenu(ev) {
+    const popover = await this.popoverController.create({
+      component: DownloadShareComponent,
+      componentProps: {
+        showOptions: true,
+        interface: 'simple',
+        name: this.name,
+        extension: this.extension,
+        // downloadUrl: this.downloadUrl,
+        config: this.config,
+      },
+      event: ev,
+      translucent: true,
+    });
+    return await popover.present();
+  }
+
+  callApi() {
+    this.loader.startLoader();
+    if (this.config.payload) {
+      return new Promise(async (resolve, reject) => {
+        let res = await this.dhiti.post(this.config).toPromise();
+
+        this.loader.stopLoader();
+        if (res.status != 'success' && !res.pdfUrl) {
+          this.toast.showMessage(this.texts['FRMELEMENTS_MSG_ERROR_WHILE_DOWNLOADING'], 'danger');
+          reject();
+        }
+        resolve(res.pdfUrl);
+      });
+    }
+    return new Promise(async (resolve, reject) => {
+      // let config = { url: this.downloadUrl };
+
+      let res = await this.unnatiSrvc.get(this.config).toPromise();
+
+      this.loader.stopLoader();
+      if (res.result && !res.result.data && !res.result.data.downloadUrl) {
+        this.toast.showMessage(this.texts['FRMELEMENTS_MSG_ERROR_WHILE_DOWNLOADING'], 'danger');
+        reject();
+      }
+      resolve(res.result.data.downloadUrl);
+    });
+  }
+
+  async download(share?) {
+    // this.loader.startLoader();
+
+    // let config = { url: this.downloadUrl };
+
+    // let res = await this.unnatiSrvc.get(config).toPromise();
+
+    // if (res.result && !res.result.data && !res.result.data.downloadUrl) {
+    //   this.toast.showMessage(this.texts['FRMELEMENTS_MSG_ERROR_WHILE_DOWNLOADING'], 'danger');
+    //   this.loader.stopLoader();
+    //   return;
+    // }
+
+    let fileName = this.utils.generateFileName(this.name);
+    fileName = fileName + this.extension;
+    let url: any = await this.callApi();
+    if (!url) {
+      return;
+    }
+
+    const ft = this.fileTransfer.create();
+    ft.download(url, this.directoryPath() + fileName)
+      .then(
+        (res) => {
+          // this.toast.showMessage(this.texts['FRMELEMENTS_MSG_SUCCESSFULLY DOWNLOADED'])
+          share ? this.share(res.nativeURL) : this.openFile(res);
+        },
+        (err) => {
+          console.log(err);
+          this.toast.showMessage(this.texts['FRMELEMENTS_MSG_ERROR_WHILE_DOWNLOADING'], 'danger');
+          this.requestPermission();
+        }
+      )
+      .finally(() => {
+        this.interface == 'simple' ? this.popoverController.dismiss() : null; // close the overlay for Simple UI
+        this.loader.stopLoader();
+      });
+  }
+
+  requestPermission() {
+    if (this.platform.is('android')) {
+      this.androidPermissions.requestPermissions([
+        this.androidPermissions.PERMISSION.READ_EXTERNAL_STORAGE,
+        this.androidPermissions.PERMISSION.WRITE_EXTERNAL_STORAGE,
+      ]);
+    }
+  }
+
+  share(path) {
+    this.socialSharing.share(null, null, path, null);
+  }
+
+  directoryPath(): string {
+    let dir_name = 'Download/';
+    if (this.platform.is('ios')) {
+      return this.file.documentsDirectory + dir_name;
+    } else {
+      return this.file.externalRootDirectory + dir_name;
+    }
+  }
+  openFile(res) {
+    this.fileOpener
+      .open(res.nativeURL, 'application/pdf')
+      .then(() => {
+        console.log('File is opened');
+      })
+      .catch((e) => console.log('Error opening file', e));
+  }
+}
diff --git a/src/app/manage-learn/shared/components/entityfilter/entityfilter.component.html b/src/app/manage-learn/shared/components/entityfilter/entityfilter.component.html
new file mode 100644
index 000000000..3b9b1085f
--- /dev/null
+++ b/src/app/manage-learn/shared/components/entityfilter/entityfilter.component.html
@@ -0,0 +1,126 @@
+<ion-header>
+  <!-- TODO:remove add entity heading in the page -->
+  <!-- <ion-list>
+    <ion-item lines="none">
+      <div style="margin-top: 15px">
+        <ion-label>
+          <div class="title">{{ 'FRMELEMENTS_LBL_SELECT_ENTITY' | translate }}</div>
+        </ion-label>
+      </div>
+    </ion-item>
+  </ion-list> -->
+  <ion-toolbar>
+    <!-- <div class="" *ngIf="!isProfileAssignedWithState"> -->
+    <!-- <div>
+      <ion-item>
+        <ion-label>{{ 'FRMELEMENTS_LBL_SELECTED_STATE' | translate }}</ion-label>
+        <ion-select
+          [(ngModel)]="selectedState"
+          color="primary"
+          (ionChange)="searchQuery = ''; search(); onStateChange($event)"
+          #selectStateRef
+          interface="action-sheet"
+          [disabled]="true"
+        >
+          <ion-select-option *ngFor="let state of allStates" [value]="state._id">
+            <b>{{ state?.name }}</b>
+          </ion-select-option>
+        </ion-select>
+      </ion-item>
+    </div> -->
+    <!-- <div class="_flex-box searchCard" *ngIf="selectedState || profileMappedState"> -->
+    <div class="_flex-box searchCard">
+      <ion-searchbar
+        debounce="500"
+        (keyup.enter)="searchEntity()"
+        [(ngModel)]="searchQuery"
+        placeholder="Search Entity "
+        (ionClear)="searchQuery = ''; searchEntity()"
+      ></ion-searchbar>
+      <ion-button ion-button icon-only (click)="searchEntity()" class="serachBtn">
+        <ion-icon name="search" class="searchIcon"></ion-icon>
+      </ion-button>
+    </div>
+  </ion-toolbar>
+
+  <!-- <header [title]="'headings.addSchools'|translate" [hideBack]="false" [showMenu]="false" [showClose]="true"
+    [disableNetwork]="true" [hideNotification]="true">
+  </header> -->
+  <!-- <ion-toolbar style="background-color: white !important">
+    <div class="_flex-box searchCard" *ngIf="!isProfileAssignedWithState">
+      <ion-item>
+        <ion-label>{{ 'labels.selectState' | translate }}</ion-label>
+        <ion-select
+          [(ngModel)]="selectedState"
+          class="whiteSelection"
+          (ionChange)="searchQuery = ''; search(); onStateChange($event)"
+          #selectStateRef
+          interface="action-sheet"
+        >
+          <ion-option *ngFor="let state of allStates" [value]="state._id">
+            <b>{{ state?.name }}</b>
+          </ion-option>
+        </ion-select>
+      </ion-item>
+    </div>
+    <div class="_flex-box searchCard" *ngIf="selectedState || profileMappedState">
+      <ion-searchbar
+        debounce="500"
+        class="serachBar"
+        (keyup.enter)="searchEntity()"
+        [(ngModel)]="searchQuery"
+        placeholder="{{ 'message.startSearchEntity' | translate }}"
+        (ionClear)="searchQuery = ''; searchEntity()"
+      ></ion-searchbar>
+      <button ion-button icon-only (click)="searchEntity()" class="serachBtn">
+        <ion-icon name="search" class="searchIcon"></ion-icon>
+      </button>
+    </div>
+  </ion-toolbar> -->
+</ion-header>
+<ion-content padding [ngStyle]="{ 'margin-top': profileMappedState ? '0px' : '50px' }">
+  <div>
+    <ion-list *ngIf="selectableList && selectableList?.length" (ionScroll)="detectBottom()">
+      <ng-container *ngFor="let listItem of selectableList">
+        <ion-item *ngIf="!listItem.isSelected">
+          <ion-label text-wrap>{{ listItem.name }}</ion-label>
+          <ion-checkbox color="dark" checked="{{ listItem.selected }}" (ionChange)="checkItem(listItem)"></ion-checkbox>
+        </ion-item>
+      </ng-container>
+    </ion-list>
+    <ion-list *ngIf="!selectableList?.length ">
+      <div class="_flex-box _justify-content-center noDataMsg">
+        {{ 'FRMELEMNTS_MSG_NO_SCHOOL_FOUND' | translate }}
+      </div>
+    </ion-list>
+  </div>
+
+  <div *ngIf="!(this.selectableList?.length == totalCount) && this.selectableList?.length > 0">
+    <ion-infinite-scroll
+      #infiniteScroll
+      [enabled]="!(this.selectableList?.length == totalCount) && this.selectableList?.length > 0"
+      (ionInfinite)="doInfinite($event)"
+    >
+      <ion-infinite-scroll-content loadingSpinner="bubbles" loadingText="Loading more data...">
+      </ion-infinite-scroll-content>
+    </ion-infinite-scroll>
+  </div>
+</ion-content>
+<ion-footer no-shadow>
+  <ion-toolbar class="_toolbar-background-md" position="bottom">
+    <ion-row>
+      <ion-col>
+        <ion-button ion-button full (click)="cancel()" class="w-100">
+          <ion-icon name="close" margin-right></ion-icon>
+          {{ 'CANCEL' | translate }}
+        </ion-button>
+      </ion-col>
+      <ion-col>
+        <ion-button ion-button full (click)="addSchools()" class="w-100" [disabled]="selectedListCount.count === 0">
+          <ion-icon name="add" margin-right></ion-icon>
+          {{ 'FRMELEMENTS_BTN_ADD' | translate }}
+        </ion-button>
+      </ion-col>
+    </ion-row>
+  </ion-toolbar>
+</ion-footer>
diff --git a/src/app/manage-learn/shared/components/entityfilter/entityfilter.component.scss b/src/app/manage-learn/shared/components/entityfilter/entityfilter.component.scss
new file mode 100644
index 000000000..b2e7becb5
--- /dev/null
+++ b/src/app/manage-learn/shared/components/entityfilter/entityfilter.component.scss
@@ -0,0 +1,16 @@
+@import 'src/assets/styles/_variables.scss';
+
+.seacrhInput {
+  padding-left: 15px;
+  border: 1px solid $gray-100 !important;
+  // background-color: $white-color !important;
+}
+.toolbar-background-md {
+  background-color: $white-color;
+}
+.serachBar {
+  flex: 1;
+}
+.labelAdj {
+  color: $black-color !important;
+}
diff --git a/src/app/manage-learn/shared/components/entityfilter/entityfilter.component.ts b/src/app/manage-learn/shared/components/entityfilter/entityfilter.component.ts
new file mode 100644
index 000000000..ed926aa98
--- /dev/null
+++ b/src/app/manage-learn/shared/components/entityfilter/entityfilter.component.ts
@@ -0,0 +1,200 @@
+import { HttpClient } from '@angular/common/http';
+import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
+import { LoaderService, LocalStorageService, UtilsService } from '@app/app/manage-learn/core';
+import { urlConstants } from '@app/app/manage-learn/core/constants/urlConstants';
+import { AssessmentApiService } from '@app/app/manage-learn/core/services/assessment-api.service';
+import { KendraApiService } from '@app/app/manage-learn/core/services/kendra-api.service';
+import { UtilityService } from '@app/services';
+import { SbProgressLoader } from '@app/services/sb-progress-loader.service';
+import { IonInfiniteScroll, ModalController, NavParams } from '@ionic/angular';
+
+@Component({
+  selector: 'app-entityfilter',
+  templateUrl: './entityfilter.component.html',
+  styleUrls: ['./entityfilter.component.scss'],
+})
+export class EntityfilterComponent implements OnInit {
+  @ViewChild('selectStateRef', { static: true }) selectStateRef;
+  @ViewChild(IonInfiniteScroll, { static: true }) infiniteScroll: IonInfiniteScroll;
+  entityList;
+  observationId;
+  searchUrl;
+  limit = 50;
+  page = 1;
+  totalCount = 0;
+  searchValue = '';
+  selectableList: any = [];
+  index: any = 50;
+  arr = [];
+  selectedListCount = {
+    count: 0,
+  };
+  solutionId: any;
+  searchQuery;
+  allStates: Array<Object>;
+  profileMappedState: any;
+  isProfileAssignedWithState: boolean;
+  profileData: any;
+  selectedState;
+  loading: boolean = false;
+  payload;
+  entityType;
+  constructor(
+    private localStorage: LocalStorageService,
+    private navParams: NavParams,
+    private loader: LoaderService,
+    private httpClient: HttpClient,
+    private modalCtrl: ModalController,
+    private assessmentService: AssessmentApiService,
+    private utils: UtilsService,
+    private ref: ChangeDetectorRef,
+    private kendra: KendraApiService
+  ) {
+    this.searchUrl = urlConstants.API_URLS.SEARCH_ENTITY;
+    this.observationId = this.navParams.get('data');
+    this.solutionId = this.navParams.get('solutionId');
+    // this.localStorage
+    //   .getLocalStorage('profileRole')
+  }
+
+  async getTargettedEntityType() {
+    this.payload = await this.utils.getProfileInfo();
+    const config = {
+      url: urlConstants.API_URLS.TARGETTED_ENTITY_TYPES + this.solutionId,
+      payload: this.payload,
+    };
+
+    this.kendra.post(config).subscribe(success => {
+      this.entityType = success.result ? success.result._id : null;
+      this.search();
+    }, error => {
+
+    })
+  }
+
+  openSelect() {
+    this.profileData.stateSelected || this.profileMappedState ? this.search() : null;
+    this.selectedState
+      ? null
+      : setTimeout(() => {
+          this.selectStateRef.open();
+        }, 100);
+  }
+
+  onStateChange(event) {
+    if (this.profileData) {
+      this.profileData.stateSelected = event;
+    }
+    this.searchQuery = '';
+  }
+  addSchools() {
+    let selectedSchools = [];
+    this.selectableList.forEach((element) => {
+      if (element.selected && !element.preSelected) {
+        selectedSchools.push(element);
+      }
+    });
+
+    console.log(selectedSchools.length);
+    this.modalCtrl.dismiss(selectedSchools);
+  }
+  clearEntity() {
+    this.selectableList = [];
+  }
+  cancel() {
+    this.modalCtrl.dismiss();
+  }
+  checkItem(listItem) {
+    listItem.selected = !listItem.selected;
+    listItem.selected ? this.selectedListCount.count++ : this.selectedListCount.count--;
+  }
+
+  async search(event?) {
+    let payload = await this.utils.getProfileInfo();
+
+    !event ? this.loader.startLoader() : '';
+    this.page = !event ? 1 : this.page + 1;
+
+    let apiUrl =
+      this.searchUrl +
+      '?observationId=' +
+      this.observationId +
+      '&search=' +
+      encodeURIComponent(this.searchQuery ? this.searchQuery : '') +
+      '&page=' +
+      this.page +
+      '&limit=' +
+      this.limit;
+    apiUrl =
+      apiUrl +
+      `&parentEntityId=${encodeURIComponent(
+        this.entityType
+        // this.isProfileAssignedWithState ? this.profileMappedState : this.selectedState
+      )}`;
+    this.loading = true;
+
+    const config = {
+      url: apiUrl,
+      payload: payload,
+    };
+    // this.loader.startLoader();
+    this.assessmentService.post(config).subscribe(
+      (success) => {
+        this.loading = false;
+        this.selectableList = !event ? [] : this.selectableList;
+        for (let i = 0; i < success.result[0].data.length; i++) {
+          success.result[0].data[i].isSelected = success.result[0].data[i].selected;
+          success.result[0].data[i].preSelected = success.result[0].data[i].selected ? true : false;
+        }
+        this.totalCount = success.result[0].count;
+        this.selectableList = [...this.selectableList, ...success.result[0].data];
+        !event ? this.loader.stopLoader() : this.toggleInfiniteScroll(event);
+      },
+      (error) => {
+        this.loading = false;
+        !event ? this.loader.stopLoader() : this.toggleInfiniteScroll(event);
+      }
+    );
+    //TODO:uncomment
+    // this.apiProviders.httpGet(
+    //   apiUrl,
+    //   (success) => {
+    //     this.loading = false;
+    //     this.selectableList = !event ? [] : this.selectableList;
+    //     for (let i = 0; i < success.result[0].data.length; i++) {
+    //       success.result[0].data[i].isSelected = success.result[0].data[i].selected;
+    //       success.result[0].data[i].preSelected = success.result[0].data[i].selected ? true : false;
+    //     }
+    //     this.totalCount = success.result[0].count;
+    //     this.selectableList = [...this.selectableList, ...success.result[0].data];
+    //     !event ? this.utils.stopLoader() : event.complete();
+    //   },
+    //   (error) => {
+    //     this.loading = false;
+    //     !event ? this.utils.stopLoader() : event.complete();
+    //   },
+    //   { version: 'v2' }
+    // );
+  }
+
+  toggleInfiniteScroll(e) {
+    e.target.complete()
+    // if (this.infiniteScroll) {
+    //   this.infiniteScroll.disabled = !this.infiniteScroll.disabled;
+    // }
+  }
+
+  doInfinite(infiniteScroll) {
+    setTimeout(() => {
+      this.search(infiniteScroll);
+    }, 500);
+  }
+  searchEntity() {
+    this.selectableList = [];
+    this.search();
+  }
+
+  ngOnInit() {
+    this.getTargettedEntityType();
+  }
+}
diff --git a/src/app/manage-learn/shared/components/expansion-panel/expansion-panel.component.html b/src/app/manage-learn/shared/components/expansion-panel/expansion-panel.component.html
new file mode 100644
index 000000000..5d68d156d
--- /dev/null
+++ b/src/app/manage-learn/shared/components/expansion-panel/expansion-panel.component.html
@@ -0,0 +1,27 @@
+<h2 *ngIf="datas?.chart" class="ion-padding-horizontal">{{ datas?.chart?.title }}</h2>
+<div *ngIf="datas?.chart" class="ion-padding-horizontal">
+  <div *ngFor="let entity of datas?.chart?.entities">
+    <h4 class="ion-text-wrap ion-margin-left ion-margin-top">{{ entity.entityName }}</h4>
+
+    <ion-card
+      (click)="isOpenIndex = isOpenIndex == i ? -1 : i"
+      class="expansionPanel"
+      margin
+      *ngFor="let item of entity?.domains; let i = index"
+    >
+      <div class="_flex-box _justify-content-space-between ion-padding" >
+        <h4 style="flex: 1" class="ion-text-wrap ion-padding-start">{{ item?.domainName }}</h4>
+        <ion-icon *ngIf="!(isOpenIndex == i)" name="arrow-down" class="ion-margin-end"></ion-icon>
+        <ion-icon *ngIf="isOpenIndex == i" name="arrow-up" class="ion-margin-end"></ion-icon>
+      </div>
+      <div *ngIf="isOpenIndex == i" class="ion-padding">
+        <table>
+          <tr *ngFor="let criteria of item.criterias" class="_flex-box _justify-content-space-between _noWrap">
+            <td class="ion-text-wrap" style="flex: 1">{{ criteria?.name }}</td>
+            <td class="_flex-box">: {{ criteria?.level }}</td>
+          </tr>
+        </table>
+      </div>
+    </ion-card>
+  </div>
+</div>
diff --git a/src/app/manage-learn/shared/components/expansion-panel/expansion-panel.component.scss b/src/app/manage-learn/shared/components/expansion-panel/expansion-panel.component.scss
new file mode 100644
index 000000000..4a6eb8400
--- /dev/null
+++ b/src/app/manage-learn/shared/components/expansion-panel/expansion-panel.component.scss
@@ -0,0 +1,20 @@
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+  width: 100%;
+  border: 1px solid #ddd;
+  background:white
+}
+
+th,
+td {
+  text-align: left;
+  padding: 16px;
+}
+
+tr:nth-child(even) {
+  background-color: #f2f2f2;
+}
+.expansionPanel {
+  border-radius: 10px;
+}
diff --git a/src/app/manage-learn/shared/components/expansion-panel/expansion-panel.component.ts b/src/app/manage-learn/shared/components/expansion-panel/expansion-panel.component.ts
new file mode 100644
index 000000000..afd1b4c52
--- /dev/null
+++ b/src/app/manage-learn/shared/components/expansion-panel/expansion-panel.component.ts
@@ -0,0 +1,16 @@
+import { Component, Input, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'expansion-panel',
+  templateUrl: './expansion-panel.component.html',
+  styleUrls: ['./expansion-panel.component.scss'],
+})
+export class ExpansionPanelComponent implements OnInit {
+  text: string;
+  @Input() datas;
+  isOpenIndex;
+
+  constructor() {}
+
+  ngOnInit() {}
+}
diff --git a/src/app/manage-learn/shared/components/expansion-table/expansion-table.component.html b/src/app/manage-learn/shared/components/expansion-table/expansion-table.component.html
new file mode 100644
index 000000000..c0e5e23d4
--- /dev/null
+++ b/src/app/manage-learn/shared/components/expansion-table/expansion-table.component.html
@@ -0,0 +1,39 @@
+<div *ngIf="datas?.chart">
+  <h2 class="ion-padding">
+    {{ datas?.chart?.title }}
+  </h2>
+  <p class="ion-padding-horizontal" *ngIf="datas?.chart?.totalSubmissions">
+    {{ 'FRMELEMNTS_MSG_ASSESSMENTS_DONE' | translate }}-{{ datas?.chart?.totalSubmissions }}
+  </p>
+  <!-- <div *ngFor="let entity of datas?.chart?.entities"> -->
+
+  <!-- <h4 text-wrap margin-left margin-top>{{entity.entityName}}</h4> -->
+
+  <ion-card
+    (click)="isOpenIndex = isOpenIndex == i ? -1 : i"
+    class="expansionPanel ion-margin"
+    *ngFor="let item of datas?.chart?.domains; let i = index"
+  >
+    <div class="_flex-box _justify-content-space-between ion-padding" >
+      <h4 style="flex: 1" class="ion-text-wrap">{{ item?.domainName }}</h4>
+      <ion-icon *ngIf="!(isOpenIndex == i)" name="arrow-down" class="ion-padding-horizontal" ></ion-icon>
+      <ion-icon *ngIf="isOpenIndex == i" name="arrow-up" class="ion-padding-horizontal"></ion-icon>
+    </div>
+    <div *ngIf="isOpenIndex == i" class="ion-padding">
+      <table>
+        <tr class="_flex-box">
+          <td text-wrap style="flex: 1"></td>
+          <td class="_flex-box" class="assess" *ngFor="let head of datas?.chart?.heading">
+            {{ head }}
+          </td>
+        </tr>
+        <tr *ngFor="let criteria of item.criterias" class="_flex-box _justify-content-space-between _noWrap">
+          <td class="ion-text-wrap" style="flex: 1">{{ criteria?.name }}</td>
+          <td class="_flex-box" *ngFor="let level of criteria?.levels">: {{ level }}</td>
+        </tr>
+      </table>
+    </div>
+  </ion-card>
+
+  <!-- </div> -->
+</div>
diff --git a/src/app/manage-learn/shared/components/expansion-table/expansion-table.component.scss b/src/app/manage-learn/shared/components/expansion-table/expansion-table.component.scss
new file mode 100644
index 000000000..776848b45
--- /dev/null
+++ b/src/app/manage-learn/shared/components/expansion-table/expansion-table.component.scss
@@ -0,0 +1,29 @@
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+  width: 100%;
+  border: 1px solid #ddd;
+  background:white
+}
+
+th,
+td {
+  text-align: left;
+  padding: 12px 4px;
+}
+
+tr:nth-child(even) {
+  background-color: #f2f2f2;
+}
+.expansionPanel {
+  border-radius: 10px;
+  width: 100%;
+  margin: 16px 0px !important;
+  padding: 0px !important;
+}
+
+.assess {
+  flex: 0;
+  //   padding: 2px 2.2px;
+  text-align: -webkit-center;
+}
diff --git a/src/app/manage-learn/shared/components/expansion-table/expansion-table.component.ts b/src/app/manage-learn/shared/components/expansion-table/expansion-table.component.ts
new file mode 100644
index 000000000..4fc3f5270
--- /dev/null
+++ b/src/app/manage-learn/shared/components/expansion-table/expansion-table.component.ts
@@ -0,0 +1,14 @@
+import { Component, Input, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'expansion-table',
+  templateUrl: './expansion-table.component.html',
+  styleUrls: ['./expansion-table.component.scss'],
+})
+export class ExpansionTableComponent implements OnInit {
+  @Input() datas;
+
+  constructor() {}
+
+  ngOnInit() {}
+}
diff --git a/src/app/manage-learn/shared/components/filter-modal/filter-modal.component.html b/src/app/manage-learn/shared/components/filter-modal/filter-modal.component.html
new file mode 100644
index 000000000..ac66b787e
--- /dev/null
+++ b/src/app/manage-learn/shared/components/filter-modal/filter-modal.component.html
@@ -0,0 +1,36 @@
+<ion-header>
+  <app-search-header (onSearch)="search($event)">
+    <ion-back-button></ion-back-button>
+  </app-search-header>
+</ion-header>
+<ion-content>
+  <ion-toolbar class="sb-header-toolbar">
+    <ion-buttons class="font-size-20 padding-left-6" (click)="dismissModal()" slot="start">
+      <ion-icon slot="start" name="arrow-back" class="batches-header-text"></ion-icon>
+    </ion-buttons>
+  </ion-toolbar>
+  <div *ngIf="entityTypes && type == 'entity'">
+    <ion-select placeholder="Select One" (ionChange)="typeChange($event)" [value]="selectedType">
+      <ion-select-option [value]="t" *ngFor="let t of entityTypes; let i = index">{{
+        t | uppercase
+      }}</ion-select-option>
+    </ion-select>
+
+    <p class="type-filter-container" color="primary">{{ selectedType }}</p>
+  </div>
+  <div>
+    <p class="type-filter-container py-24" *ngIf="type == 'program'" color="primary">Programs</p>
+  </div>
+  <section>
+    <app-no-data *ngIf="!dataList.length"></app-no-data>
+  </section>
+  <div *ngIf="dataList">
+    <ion-item lines="inset" *ngFor="let data of dataList" (click)="dismissModal(data)">
+      <ion-label class="ion-text-wrap">{{ data?.name }} </ion-label>
+    </ion-item>
+    <ion-infinite-scroll threshold="100px" (ionInfinite)="loadData($event)">
+      <ion-infinite-scroll-content loadingSpinner="bubbles" loadingText="Loading more data...">
+      </ion-infinite-scroll-content>
+    </ion-infinite-scroll>
+  </div>
+</ion-content>
diff --git a/src/app/manage-learn/shared/components/filter-modal/filter-modal.component.scss b/src/app/manage-learn/shared/components/filter-modal/filter-modal.component.scss
new file mode 100644
index 000000000..61575e428
--- /dev/null
+++ b/src/app/manage-learn/shared/components/filter-modal/filter-modal.component.scss
@@ -0,0 +1,6 @@
+.type-filter-container {
+  display: flex;
+  justify-content: center;
+  text-transform: capitalize;
+  font-size: 22px;
+}
diff --git a/src/app/manage-learn/shared/components/filter-modal/filter-modal.component.ts b/src/app/manage-learn/shared/components/filter-modal/filter-modal.component.ts
new file mode 100644
index 000000000..5a3e3d53a
--- /dev/null
+++ b/src/app/manage-learn/shared/components/filter-modal/filter-modal.component.ts
@@ -0,0 +1,134 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { LoaderService, UtilsService } from '@app/app/manage-learn/core';
+import { KendraApiService } from '@app/app/manage-learn/core/services/kendra-api.service';
+import { UnnatiDataService } from '@app/app/manage-learn/core/services/unnati-data.service';
+import { ModalController } from '@ionic/angular';
+import * as _ from 'underscore';
+import { urlConstants } from '@app/app/manage-learn/core/constants/urlConstants';
+import { Location } from '@angular/common';
+
+@Component({
+  selector: 'app-filter-modal',
+  templateUrl: './filter-modal.component.html',
+  styleUrls: ['./filter-modal.component.scss'],
+})
+export class FilterModalComponent implements OnInit {
+  page = 1;
+  limit = 15;
+  entityTypes: any;
+  selectedType = 'school';
+  dataList: any = [];
+  @Input() type: string;
+  @Input() entityId: string;
+  searchText: any;
+  count: any;
+  constructor(
+    private loader: LoaderService,
+    // public reportSrvc: ReportsService,
+    public kendraSrvc: KendraApiService,
+    public unnatiSrvc: UnnatiDataService,
+    private modalCtrl: ModalController,
+    private utils: UtilsService,
+    private location: Location
+  ) {
+    this.search = _.debounce(this.search, 500);
+  }
+
+  ngOnInit() {
+    // this.getEntityTypes();
+    this.search('');
+  }
+
+  typeChange(e) {
+    this.selectedType = e.detail.value;
+
+    this.serachEntity(this.searchText);
+  }
+
+  search(searchText) {
+    if (searchText == null || searchText == undefined) {
+      searchText = '';
+    }
+    this.dataList = [];
+    this.searchText = searchText;
+
+    this.type == 'entity' ? this.serachEntity(searchText) : this.searchProgramByEntity(searchText);
+  }
+  async searchProgramByEntity(searchText: any) {
+    //TODO
+    this.loader.startLoader();
+    let payload = await this.utils.getProfileData();
+
+    const config = {
+      url:
+        urlConstants.API_URLS.GET_PROGRAM_BY_ENTITY +
+        // this.entityId +
+        `?search=${searchText}&page=${this.page}&limit=${this.limit}`,
+      payload: payload,
+    };
+    this.unnatiSrvc.post(config).subscribe(
+      (data) => {
+        this.loader.stopLoader();
+        this.dataList = data.result.data;
+      },
+      (error) => {
+        this.loader.stopLoader();
+      }
+    );
+  }
+  async serachEntity(searchText: any) {
+    // TODO
+    // let payload = await this.utils.getProfileInfo();
+
+    // this.loader.startLoader();
+    // const config = {
+    //   url:
+    //     urlConstants.API_URLS.GET_ENTITIES_BY_TYPE +
+    //     `?entityType=${this.selectedType}&search=${searchText}&page=${this.page}&limit=${this.limit}`,
+    //   payload: payload,
+    // };
+    // this.kendraSrvc.get(config).subscribe(
+    //   (data) => {
+    //     this.loader.stopLoader();
+    //     this.dataList = [...this.dataList, ...data.result.data];
+    //     this.count = data.result.count;
+    //   },
+    //   (error) => {
+    //     this.loader.stopLoader();
+    //   }
+    // );
+  }
+  getEntityTypes() {
+    // const config = {
+    //   url: urlConstants.API_URLS.GET_ENTITY_TYPES+'?entityType='+this.selectedType+'&search=&page=1&limit=15'
+    // };
+    // this.kendraSrvc.get(config).subscribe(
+    //   (res) => {
+    //     console.log(res.result,"res.result");
+    //     this.entityTypes = res.result;
+    //   },
+    //   (err) => {
+    //     console.log(err);
+    //   }
+    // );
+    this.utils.getMandatoryEntitiesList().then((data) => {
+      console.log(data, 'data 109');
+      this.entityTypes = data;
+    });
+  }
+
+  dismissModal(data?) {
+    this.modalCtrl.dismiss(data);
+  }
+
+  loadData(event) {
+    setTimeout(() => {
+      event.target.complete();
+      this.page++;
+      this.search(this.searchText);
+      if (this.dataList.length == this.count) {
+        event.target.disabled = true;
+      }
+    }, 500);
+  }
+}
diff --git a/src/app/manage-learn/shared/components/footer-buttons/footer-buttons.component.html b/src/app/manage-learn/shared/components/footer-buttons/footer-buttons.component.html
new file mode 100644
index 000000000..6e0eadd84
--- /dev/null
+++ b/src/app/manage-learn/shared/components/footer-buttons/footer-buttons.component.html
@@ -0,0 +1,29 @@
+<ion-footer no-shadow>
+  <ion-toolbar position="bottom">
+    <ion-row>
+      <ion-col>
+        <ion-button icon-start color="light" (click)="enableGps ? gpsFlowChecks('back') :back()"
+          *ngIf="!isFirst">
+          <ion-icon name="arrow-back"></ion-icon>{{'FRMELEMENTS_BTN_BACK'| translate}}
+        </ion-button>
+      </ion-col>
+      <ion-col style=" margin: auto;">
+        <!-- {{completedQuestionCount}} {{questionCount}} -->
+        <progress-bar [progress]="percentage" [total]="questionCount" [showTracker]="true"
+          [completed]="completedQuestionCount" class="_full-width" *ngIf="completedQuestionCount!=questionCount">
+        </progress-bar>
+        <ion-button  round small *ngIf="showSubmit &&completedQuestionCount==questionCount" (click)="next('completed')">{{'FRMELEMNTS_BTN_SUBMIT'| translate}}
+          <ion-icon name="chevron-up-circle" style="padding: 0 9px;"></ion-icon></ion-button>
+      </ion-col>
+      <ion-col>
+        <ion-button  icon-end class="ion-float-right" color="light" (click)="next()"
+          *ngIf="!isLast">{{'FRMELEMENTS_BTN_NEXT'|
+          translate}} <ion-icon name="arrow-forward"></ion-icon></ion-button>
+        <ion-button  icon-start class="ion-float-right" color="light"
+          (click)="next('completed')" *ngIf="isLast">
+          <ion-icon name="save" class="ion-margin-end"></ion-icon>{{'SAVE'| translate}}
+        </ion-button>
+      </ion-col>
+    </ion-row>
+  </ion-toolbar>
+</ion-footer>
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/footer-buttons/footer-buttons.component.scss b/src/app/manage-learn/shared/components/footer-buttons/footer-buttons.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/shared/components/footer-buttons/footer-buttons.component.ts b/src/app/manage-learn/shared/components/footer-buttons/footer-buttons.component.ts
new file mode 100644
index 000000000..87e648df2
--- /dev/null
+++ b/src/app/manage-learn/shared/components/footer-buttons/footer-buttons.component.ts
@@ -0,0 +1,126 @@
+import {
+  Component,
+  Input,
+  Output,
+  EventEmitter,
+  OnInit,
+  OnChanges,
+} from "@angular/core";
+import { UtilsService } from '@app/app/manage-learn/core';
+
+@Component({
+  selector: 'app-footer-buttons',
+  templateUrl: './footer-buttons.component.html',
+  styleUrls: ['./footer-buttons.component.scss'],
+})
+export class FooterButtonsComponent implements OnChanges {
+
+  text: string;
+  _data;
+
+  @Input() updatedData;
+  @Input()
+  get data() {
+    return this._data;
+  }
+  set data(data) {
+    this._data = JSON.parse(JSON.stringify(data));
+  }
+  @Input() isFirst: boolean;
+  @Input() isLast: boolean;
+  @Output() nextAction = new EventEmitter();
+  @Output() backAction = new EventEmitter();
+  @Output() openSheetAction = new EventEmitter();
+  @Input() completedQuestionCount = 0;
+  @Input() questionCount = 0;
+  @Input() isSubmitted;
+  @Input() enableGps;
+  @Input() showSubmit;
+
+
+  percentage: number = 0;
+
+  constructor(
+    private utils: UtilsService
+  ) { }
+  ngOnChanges() {
+    if (this.completedQuestionCount > 0) {
+      this.percentage = this.questionCount ? (this.completedQuestionCount / this.questionCount) * 100 : 0;
+      this.percentage = Math.trunc(this.percentage);
+    } else {
+      this.percentage = this.isSubmitted ? 100 : 0;
+      this.completedQuestionCount = this.isSubmitted ? this.questionCount : 0;
+    }
+  }
+  next(status?: string): void {
+    this.nextAction.emit(status);
+  }
+
+  back(): void {
+    this.backAction.emit();
+  }
+
+  gpsFlowChecks(action, status) {
+    // console.log("GPS: "+this.enableGps)
+    // console.log(JSON.stringify(this.data))
+    if (this.updatedData.responseType.toLowerCase() === "slider") {
+      if (
+        !this.updatedData.gpsLocation ||
+        JSON.stringify(this._data.value) !== JSON.stringify(this.updatedData.value)
+      ) {
+        // this.getGpsLocation(action, status);
+      } else if (JSON.stringify(this._data.value) === JSON.stringify(this.updatedData.value)) {
+        if (action === "next") {
+          this.next(status);
+        } else {
+          this.back();
+        }
+      }
+    } else if (this.updatedData.responseType.toLowerCase() === "pagequestions") {
+      if (
+        JSON.stringify(this._data.pageQuestions) !== JSON.stringify(this.updatedData.pageQuestions)
+        // &&
+        // this.utils.isPageQuestionComplete(this.updatedData)
+      ) {
+        // this.getGpsLocation(action, status);
+      } else {
+        if (action === "next") {
+          this.next(status);
+        } else {
+          this.back();
+        }
+      }
+    } else if (JSON.stringify(this._data.value) !== JSON.stringify(this.updatedData.value)) {
+      // this.getGpsLocation(action, status);
+    } else {
+      if (action === "next") {
+        this.next(status);
+      } else {
+        this.back();
+      }
+    }
+  }
+
+  // getGpsLocation(action, status) {
+  //   this.utils.startLoader();
+  //   this.ngps
+  //     .getGpsStatus()
+  //     .then((success) => {
+  //       this.updatedData.gpsLocation = success;
+  //       this.utils.stopLoader();
+  //       if (action === "next") {
+  //         this.next(status);
+  //       } else {
+  //         this.back();
+  //       }
+  //     })
+  //     .catch((error) => {
+  //       this.utils.stopLoader();
+  //     });
+  // }
+
+  openAction() {
+    this.openSheetAction.emit()
+  }
+
+}
diff --git a/src/app/manage-learn/shared/components/graph-circle/graph-circle.component.html b/src/app/manage-learn/shared/components/graph-circle/graph-circle.component.html
new file mode 100644
index 000000000..10dd8b227
--- /dev/null
+++ b/src/app/manage-learn/shared/components/graph-circle/graph-circle.component.html
@@ -0,0 +1,24 @@
+<!-- <div *ngIf="chartOption">
+  <highcharts-chart
+    [Highcharts]="highcharts"
+    [runOutsideAngular]="runOutsideAngular"
+    [constructorType]="chartConstructor"
+    [options]="chartOption"
+    class="chart-layout"
+  >
+  </highcharts-chart>
+</div> -->
+<div *ngIf="doughnutChartData">
+  <div style="display: block">
+    <canvas
+      baseChart
+      [data]="doughnutChartData"
+      [labels]="doughnutChartLabels"
+      [chartType]="doughnutChartType"
+      [options]="chartOptions"
+      [colors]="chartColors"
+      [plugins]="chartPlugins"
+    >
+    </canvas>
+  </div>
+</div>
diff --git a/src/app/manage-learn/shared/components/graph-circle/graph-circle.component.scss b/src/app/manage-learn/shared/components/graph-circle/graph-circle.component.scss
new file mode 100644
index 000000000..08cf5d50d
--- /dev/null
+++ b/src/app/manage-learn/shared/components/graph-circle/graph-circle.component.scss
@@ -0,0 +1,4 @@
+canvas {
+  width: 80vw !important;
+  height: 40vh !important;
+}
diff --git a/src/app/manage-learn/shared/components/graph-circle/graph-circle.component.ts b/src/app/manage-learn/shared/components/graph-circle/graph-circle.component.ts
new file mode 100644
index 000000000..50b6fccd4
--- /dev/null
+++ b/src/app/manage-learn/shared/components/graph-circle/graph-circle.component.ts
@@ -0,0 +1,124 @@
+import { Component, Input, OnInit, SimpleChanges } from '@angular/core';
+import { ChartType } from 'chart.js';
+import { MultiDataSet, Label } from 'ng2-charts';
+import * as pluginDataLabels from 'chartjs-plugin-datalabels';
+
+@Component({
+  selector: 'graph-circle',
+  templateUrl: './graph-circle.component.html',
+  styleUrls: ['./graph-circle.component.scss'],
+})
+export class GraphCircleComponent implements OnInit {
+  @Input() data;
+  total;
+  chartConstructor = 'chart'; // optional string, defaults to 'chart'
+  runOutsideAngular = false;
+
+  chartOption;
+
+  public doughnutChartLabels: Label[];
+  // = ['Download Sales', 'In-Store Sales', 'Mail-Order Sales'];
+  public doughnutChartData: MultiDataSet;
+  // = [[350, 450, 100]];
+  public doughnutChartType: ChartType = 'doughnut';
+
+  public chartColors: Array<any>;
+  extraColor;
+
+  public chartPlugins = [
+    pluginDataLabels,
+    {
+      beforeInit: function (chart, options) {
+        chart.legend.afterFit = function () {
+          this.height += 20;
+        };
+      },
+    },
+  ];
+
+  private chartOptions = {
+    responsive: true,
+    maintainAspectRatio: false,
+    cutoutPercentage: 80,
+    legend: {
+      display: true,
+      position: 'bottom',
+      labels: {
+        padding: 5,
+      },
+    },
+    layout: {
+      padding: {
+        top: 1,
+      },
+    },
+    plugins: {
+      datalabels: {
+        anchor: 'end',
+        align: 'start',
+        font: {
+          size: 8,
+        },
+        formatter: (value) => {
+          var perc = ((value * 100) / this.total).toFixed(1) + '%';
+          return perc;
+        },
+      },
+    },
+  };
+
+  constructor() {}
+  ngOnInit() {}
+
+  plotSimpleBarChart() {
+    this.extraColor = [
+      'rgb(255, 99, 132)',
+      'rgb(54, 162, 235)',
+      'rgb(255, 206, 86)',
+      'rgb(231, 233, 237)',
+      'rgb(75, 192, 192)',
+      'rgb(151, 187, 205)',
+      'rgb(220, 220, 220)',
+      'rgb(247, 70, 74)',
+      'rgb(70, 191, 189)',
+      'rgb(253, 180, 92)',
+      'rgb(148, 159, 177)',
+      'rgb(77, 83, 96)',
+      'rgb(95, 101, 217)',
+      'rgb(170, 95, 217)',
+      'rgb(140, 48, 57)',
+      'rgb(209, 6, 40)',
+      'rgb(68, 128, 51)',
+      'rgb(125, 128, 51)',
+      'rgb(128, 84, 51)',
+      'rgb(179, 139, 11)',
+    ];
+    console.log(JSON.stringify(this.chartOption));
+
+    this.doughnutChartLabels = this.data.series_new.label;
+    this.doughnutChartData = this.data.series_new.data;
+    this.total = this.data.series_new.total;
+    this.chartOptions.cutoutPercentage = this.data.series_new.radius;
+    if (this.data.series_new.color.length) {
+      this.data.series_new.color.map((c, i) => {
+        this.extraColor.splice(c.pos, 0, c.color);
+      });
+      // this.data.series_new.color = [...this.data.series_new.color, ...this.extraColor];
+      this.data.series_new.color = this.extraColor;
+      this.chartColors = [{ backgroundColor: this.data.series_new.color }];
+    } else {
+      this.chartColors = [
+        //defualt 12 ng2chart color in FE and BE + 8 more colors
+        {
+          backgroundColor: this.extraColor,
+        },
+      ];
+    }
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    this.data.series = changes.data.currentValue['series'];
+    this.data.series_new = changes.data.currentValue['series_new'];
+    this.plotSimpleBarChart();
+  }
+}
diff --git a/src/app/manage-learn/shared/components/hint/hint.component.html b/src/app/manage-learn/shared/components/hint/hint.component.html
new file mode 100644
index 000000000..a77558595
--- /dev/null
+++ b/src/app/manage-learn/shared/components/hint/hint.component.html
@@ -0,0 +1,12 @@
+<ion-header>
+  <ion-navbar color="primary">
+    <div class="_flex-box">
+      <ion-title text-capitalize>{{ 'FRMELEMENTS_LBL_HINT' | translate }}</ion-title>
+      <ion-icon name="close" isActive="true" class="closeBtn ion-margin-end ion-float-right" (click)="cancel()"></ion-icon>
+    </div>
+  </ion-navbar>
+</ion-header>
+
+<ion-content class="ion-padding" >
+  {{ hint }}
+</ion-content>
diff --git a/src/app/manage-learn/shared/components/hint/hint.component.scss b/src/app/manage-learn/shared/components/hint/hint.component.scss
new file mode 100644
index 000000000..1ae659bf7
--- /dev/null
+++ b/src/app/manage-learn/shared/components/hint/hint.component.scss
@@ -0,0 +1,5 @@
+.closeBtn {
+  // color: white !important;
+  font-size: 24px;
+  padding-right: 10px;
+}
diff --git a/src/app/manage-learn/shared/components/hint/hint.component.ts b/src/app/manage-learn/shared/components/hint/hint.component.ts
new file mode 100644
index 000000000..967e1d92f
--- /dev/null
+++ b/src/app/manage-learn/shared/components/hint/hint.component.ts
@@ -0,0 +1,19 @@
+import { Component, OnInit } from '@angular/core';
+import { ModalController, NavParams } from '@ionic/angular';
+
+@Component({
+  selector: 'app-hint',
+  templateUrl: './hint.component.html',
+  styleUrls: ['./hint.component.scss'],
+})
+export class HintComponent implements OnInit {
+  hint: any;
+  constructor(private modalCtrl: ModalController, public navParams: NavParams) {
+    this.hint = this.navParams.get('hint');
+  }
+
+  ngOnInit() {}
+  cancel(): void {
+    this.modalCtrl.dismiss();
+  }
+}
diff --git a/src/app/manage-learn/shared/components/image-upload/image-upload.component.html b/src/app/manage-learn/shared/components/image-upload/image-upload.component.html
new file mode 100644
index 000000000..777bf0b08
--- /dev/null
+++ b/src/app/manage-learn/shared/components/image-upload/image-upload.component.html
@@ -0,0 +1,51 @@
+<div class="_flex-box ion-margin-top"  style="flex-wrap: wrap;">
+  <!-- <fa-icon name="camera-retro"></fa-icon> -->
+
+  <div *ngIf="datas?.file" class="_cards _flex-box _justify-content-center _flex-direction-column ion-padding" >
+
+    <div class="textAdj" (click)="doAction()">
+      <div class=" _flex-box _justify-content-center _flex-direction-column">
+        <ion-icon name="add" class="_iconAdj"></ion-icon>
+      </div>
+      <div>{{'FRMELEMENTS_LBL_FILES'|translate}}</div>
+    </div>
+    <div class="_overlay" (click)="doAction()"></div>
+  </div>
+
+  <div class="_cards _flex-box  _justify-content-center" *ngFor="let image of imageList; let i = index">
+    <ion-icon name="trash" class="_closeBtn" (click)="deleteImageAlert(i)"></ion-icon>
+    <div class="_overlay" (click)="previewFile(image?.imageName,image?.extension)"></div>
+    <img [src]="image?.data">
+    <span>
+      <!-- <fa name="file-pdf-o" class="attachmentIcon" *ngIf="pdfFormats.includes(image?.extension)"></fa>
+      <fa name="file-word-o" class="attachmentIcon" *ngIf="wordFormats.includes(image?.extension)"></fa>
+      <fa name="file-audio-o" class="attachmentIcon" *ngIf="audioFormats.includes(image?.extension)"></fa>
+      <fa name="file-video-o" class="attachmentIcon" *ngIf="videoFormats.includes(image?.extension)"></fa>
+      <fa name="file-powerpoint-o" class="attachmentIcon" *ngIf="pptFormats.includes(image?.extension)"></fa>
+      <fa name="file-excel-o" class="attachmentIcon" *ngIf="spreadSheetFormats.includes(image?.extension)"></fa>
+      <fa name="file-picture-o" class="attachmentIcon" *ngIf="imageFormats.includes(image?.extension)"></fa> -->
+      <ion-icon name="document" *ngIf="pdfFormats.includes(image?.extension) || wordFormats.includes(image?.extension) || pptFormats.includes(image?.extension) "></ion-icon>
+      <ion-icon name="musical-notes" *ngIf="audioFormats.includes(image?.extension)"></ion-icon>
+      <ion-icon name="videocam"  *ngIf="videoFormats.includes(image?.extension)"></ion-icon>
+      <ion-icon class="attachmentIcon" name="image" *ngIf="imageFormats.includes(image?.extension)"></ion-icon>
+    </span>
+  </div>
+  <ion-card *ngIf="datas?.allowAudioRecording">
+    <ion-card-content>
+      <ion-row *ngIf="!recording">
+        <button ion-button primary (click)="checkRecordMediaPermission()">
+          <ion-icon name="mic"></ion-icon>&nbsp;&nbsp;Start Record
+        </button>
+      </ion-row>
+      <ion-row *ngIf="recording" class="_flex-box _justify-content-space-between">
+        <button ion-button primary (click)="stopRecord()">
+          <ion-icon name="mic-off"></ion-icon>&nbsp;&nbsp;Stop Record
+        </button>
+
+        <h1>
+          <span *ngIf="minutes < 10">0</span>{{minutes}} : <span *ngIf="seconds < 10">0</span>{{seconds}}
+        </h1>
+      </ion-row>
+    </ion-card-content>
+  </ion-card>
+</div>
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/image-upload/image-upload.component.scss b/src/app/manage-learn/shared/components/image-upload/image-upload.component.scss
new file mode 100644
index 000000000..180ffac4b
--- /dev/null
+++ b/src/app/manage-learn/shared/components/image-upload/image-upload.component.scss
@@ -0,0 +1,19 @@
+.attachmentIcon {
+    margin-top: 10px;
+    font-size: 50px;
+}
+
+.textAdj {
+    z-index: 3;
+}
+
+._closeBtn {
+    position: absolute;
+    top: 5px;
+    right: 10px;
+    color: red;
+    z-index: 3;
+    font-weight: 600;
+    font-size: 25px;
+    cursor: pointer;
+  }
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/image-upload/image-upload.component.ts b/src/app/manage-learn/shared/components/image-upload/image-upload.component.ts
new file mode 100644
index 000000000..70648587e
--- /dev/null
+++ b/src/app/manage-learn/shared/components/image-upload/image-upload.component.ts
@@ -0,0 +1,626 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { Camera, CameraOptions } from '@ionic-native/camera/ngx';
+import { File } from '@ionic-native/file/ngx';
+import { ImagePicker, ImagePickerOptions } from '@ionic-native/image-picker/ngx';
+import { TranslateService } from "@ngx-translate/core";
+import { FileChooser } from '@ionic-native/file-chooser/ngx';
+import { FilePath } from '@ionic-native/file-path/ngx';
+import { PhotoLibrary } from '@ionic-native/photo-library/ngx';
+// import { IOSFilePicker } from "@ionic-native/file-picker";
+import { FileOpener } from '@ionic-native/file-opener/ngx';
+import { Media, MediaObject } from '@ionic-native/media/ngx';
+import { AndroidPermissions } from '@ionic-native/android-permissions/ngx';
+import { Diagnostic } from '@ionic-native/diagnostic/ngx';
+import { FILE_EXTENSION_HEADERS, LocalStorageService, ToastService, UtilsService } from '@app/app/manage-learn/core';
+import { ActionSheetController, AlertController, Platform } from '@ionic/angular';
+import { GenericPopUpService } from '../../TC-generic.popupService';
+
+@Component({
+  selector: 'app-image-upload',
+  templateUrl: './image-upload.component.html',
+  styleUrls: ['./image-upload.component.scss'],
+})
+export class ImageUploadComponent implements OnInit {
+  recording: boolean = false;
+  filesPath: string;
+  fileName: string;
+  audio: MediaObject;
+  audioList: any[] = [];
+  isIos: boolean = this.platform.is("ios");
+  interval;
+  timeLeft: number = 0;
+  minutes: number = 0;
+  seconds: number = 0;
+
+  text: string;
+  datas;
+  appFolderPath: string;
+  videoFormats = ["mp4", "WMV", "WEBM", "flv", "avi", "3GP", "OGG"];
+  audioFormats = ["AIF", "cda", "mpa", "ogg", "wav", "wma", "mp3"];
+  pptFormats = ["ppt", "pptx", "pps", "ppsx"];
+  wordFormats = ["docx", "doc", "docm", "dotx"];
+  imageFormats = ["jpg", "png", "jpeg"];
+  pdfFormats = ["pdf"];
+  spreadSheetFormats = ["xls", "xlsx"];
+
+  @Input()
+  set data(data) {
+    this.datas = data;
+    this.createImageFromName(data["fileName"]);
+  }
+
+  get name() {
+    return true;
+  }
+  @Input() evidenceId: any;
+  @Input() schoolId: string;
+  @Input() submissionId: any;
+  @Input() imageLocalCopyId: string;
+  @Input() generalQuestion: boolean;
+
+  imageList: Array<any> = [];
+  imageNameCounter: number = 0;
+  localEvidenceImageList: any;
+
+  constructor(
+    private actionSheet: ActionSheetController,
+    private camera: Camera,
+    private localStorage: LocalStorageService,
+    private file: File,
+    private imgPicker: ImagePicker,
+    private utils: UtilsService,
+    private photoLibrary: PhotoLibrary,
+    private platform: Platform,
+    private translate: TranslateService,
+    private filePath: FilePath,
+    // private iosFilePicker: IOSFilePicker,
+    private fileOpener: FileOpener,
+    private fileChooser: FileChooser,
+    private androidPermissions: AndroidPermissions,
+    private diagnostic: Diagnostic,
+    private media: Media,
+    private alertCtrl: AlertController,
+    private toast: ToastService,
+    private popupService: GenericPopUpService
+  ) {
+    this.text = "Hello World";
+    this.isIos = this.platform.is("ios") ? true : false;
+    if (this.isIos) {
+      this.file
+        .checkDir(this.file.documentsDirectory, "images")
+        .then((success) => { })
+        .catch((err) => {
+          this.file
+            .createDir(cordova.file.documentsDirectory, "images", false)
+            .then(
+              (success) => { },
+              (error) => { }
+            );
+        });
+    } else {
+      this.file
+        .checkDir(this.file.externalDataDirectory, "images")
+        .then((success) => { })
+        .catch((err) => {
+          this.file
+            .createDir(cordova.file.externalDataDirectory, "images", false)
+            .then(
+              (success) => { },
+              (error) => { }
+            );
+        });
+    }
+  }
+
+  ngOnInit() {
+    this.appFolderPath = this.isIos
+      ? cordova.file.documentsDirectory + "images"
+      : cordova.file.externalDataDirectory + "images";
+  }
+
+  doAction() {
+    this.popupService.showPPPForProjectPopUp('FRMELEMNTS_LBL_EVIDENCES_CONTENT_POLICY', 'FRMELEMNTS_LBL_EVIDENCES_CONTENT_POLICY_TEXT', 'FRMELEMNTS_LBL_EVIDENCES_CONTENT_POLICY_LABEL', 'FRMELEMNTS_LBL_UPLOAD_EVIDENCES', 'https://diksha.gov.in/term-of-use.html', 'contentPolicy').then((data: any) => {
+      if (data.isClicked) {
+        data.isChecked ? this.openActionSheet() : this.toast.showMessage('FRMELEMNTS_MSG_EVIDENCES_CONTENT_POLICY_REJECT', 'danger');
+      }
+    })
+  }
+  async openActionSheet() {
+    let translateObject;
+    this.translate
+      .get([
+        "FRMELEMENTS_LBL_ADD_IMAGE",
+        "FRMELEMENTS_LBL_CAMERA",
+        "FRMELEMENTS_LBL_UPLOAD_FILE",
+        "FRMELEMENTS_LBL_UPLOAD_IMAGE",
+        // "actionSheet.upload",
+        "CANCEL",
+      ])
+      .subscribe((translations) => {
+        translateObject = translations;
+      });
+    const actionSheet = await this.actionSheet.create({
+      header: translateObject["FRMELEMENTS_LBL_ADD_IMAGE"],
+      buttons: [
+        {
+          text: translateObject["FRMELEMENTS_LBL_CAMERA"],
+          role: "destructive",
+          icon: "camera",
+          handler: () => {
+            this.openCamera();
+          },
+        },
+        {
+          text: translateObject["FRMELEMENTS_LBL_UPLOAD_IMAGE"],
+          icon: "cloud-upload",
+          handler: () => {
+            this.openLocalLibrary();
+          },
+        },
+        {
+          text: translateObject["FRMELEMENTS_LBL_UPLOAD_FILE"],
+          icon: "document",
+          handler: () => {
+            this.isIos ? this.filePickerForIOS() : this.openFilePicker();
+          },
+        },
+        {
+          text: translateObject["CANCEL"],
+          role: "cancel",
+          handler: () => { },
+        },
+      ],
+    });
+    await actionSheet.present();
+  }
+
+  filePickerForIOS() {
+    // this.iosFilePicker
+    //   .pickFile()
+    //   .then((data) => {
+    //     this.checkForLocalFolder("file://" + data);
+    //   })
+    //   .catch((error) => { });
+  }
+
+  // For android
+  openFilePicker() {
+    this.fileChooser
+      .open()
+      .then((filePath) => {
+        this.filePath
+          .resolveNativePath(filePath)
+          .then((data) => {
+            this.checkForLocalFolder(data);
+          })
+          .catch((err) => { });
+      })
+      .catch((e) => console.log(e));
+  }
+
+  openCamera(): void {
+    const options: CameraOptions = {
+      quality: 10,
+      destinationType: this.camera.DestinationType.FILE_URI,
+      encodingType: this.camera.EncodingType.JPEG,
+      mediaType: this.camera.MediaType.PICTURE,
+      sourceType: this.camera.PictureSourceType.CAMERA,
+    };
+    this.camera
+      .getPicture(options)
+      .then((imagePath) => {
+        this.checkForLocalFolder(imagePath);
+        this.saveToLibrary(imagePath);
+      })
+      .catch((error) => { });
+  }
+
+  saveToLibrary(url): void {
+    this.photoLibrary
+      .saveImage(url, "samiksha")
+      .then((data) => { })
+      .catch((error) => { });
+  }
+
+  checkForLocalFolder(imagePath) {
+    let currentName = imagePath.substr(imagePath.lastIndexOf("/") + 1);
+    let currentPath = imagePath.substr(0, imagePath.lastIndexOf("/") + 1);
+    if (this.isIos) {
+      this.file
+        .checkDir(this.file.documentsDirectory, "images")
+        .then((success) => {
+          this.copyFileToLocalDir(currentPath, currentName);
+        })
+        .catch((err) => {
+          this.file
+            .createDir(cordova.file.documentsDirectory, "images", false)
+            .then(
+              (success) => {
+                this.copyFileToLocalDir(currentPath, currentName);
+              },
+              (error) => { }
+            );
+        });
+    } else {
+      this.file
+        .checkDir(this.file.externalDataDirectory, "images")
+        .then((success) => {
+          this.copyFileToLocalDir(currentPath, currentName);
+        })
+        .catch((err) => {
+          this.file
+            .createDir(cordova.file.externalDataDirectory, "images", false)
+            .then(
+              (success) => {
+                this.copyFileToLocalDir(currentPath, currentName);
+              },
+              (error) => { }
+            );
+        });
+    }
+  }
+
+  createFileName(filename) {
+    let d = new Date(),
+      n = d.getTime(),
+      extension= filename.split('.').pop(),
+      newFileName = n + "." + extension;
+    return newFileName;
+  }
+
+  copyFileToLocalDir(namePath, currentName) {
+    // this.file.resolveLocalFilesystemUrl(namePath).then(succes => {
+    //   console.log("Resolved  path " + JSON.stringify(succes.nativeURL))
+    // }).catch(error => {
+
+    // })
+    let newName = this.createFileName(currentName);
+    this.file
+      .copyFile(namePath, currentName, this.appFolderPath, newName)
+      .then(
+        (success) => {
+          this.pushToFileList(newName);
+        },
+        (error) => { }
+      );
+  }
+
+  pushToFileList(fileName) {
+    this.file
+      .checkFile(this.appFolderPath + "/", fileName)
+      .then((response) => {
+        this.imageList.push({
+          data: "",
+          imageName: fileName,
+          extension: this.getExtensionFromName(fileName),
+        });
+        this.setLocalDatas(fileName);
+
+      })
+      .catch((error) => { });
+  }
+
+  setLocalDatas(fileName) {
+    this.datas.fileName.push(fileName);
+    this.updateLocalImageList();
+  }
+
+  getExtensionFromName(fileName) {
+    let splitString = fileName.split(".");
+    let extension = splitString[splitString.length - 1];
+    return extension;
+  }
+
+  createImageFromName(imageList) {
+    this.isIos = this.platform.is("ios") ? true : false;
+    this.appFolderPath = this.isIos
+      ? cordova.file.documentsDirectory + "images"
+      : cordova.file.externalDataDirectory + "images";
+    for (const image of imageList) {
+      this.file
+        .checkFile(this.appFolderPath + "/", image)
+        .then((response) => {
+          this.imageList.push({
+            data: "",
+            imageName: image,
+            extension: this.getExtensionFromName(image),
+          });
+        })
+        .catch((error) => {
+          this.imageList.push(image);
+        });
+    }
+  }
+
+  openLocalLibrary(): void {
+    const options: ImagePickerOptions = {
+      maximumImagesCount: 50,
+      quality: 10,
+    };
+    this.imgPicker.getPictures(options).then((imageData) => {
+      for (const image of imageData) {
+        this.checkForLocalFolder(image);
+      }
+    }).catch(err => {
+      console.log(err)
+    });
+  }
+
+  removeImgFromList(index): void {
+    let indexInLocalList;
+    this.datas.fileName.splice(index, 1);
+    this.imageList.splice(index, 1);
+    this.updateLocalImageList();
+  }
+
+  async deleteImageAlert(index) {
+    let translateObject;
+    this.translate
+      .get([
+        "FRMELEMNTS_LBL_COFIRM_DELETE",
+        "actionSheet.confirmDeleteInstance",
+        "FRMELEMNTS_LBL_NO",
+        "FRMELEMNTS_LBL_YES",
+      ])
+      .subscribe((translations) => {
+        translateObject = translations;
+      });
+    let alert = await this.alertCtrl.create({
+      // header: translateObject["FRMELEMNTS_LBL_COFIRM_DELETE"],
+      message: translateObject["FRMELEMNTS_LBL_COFIRM_DELETE"],
+      buttons: [
+        {
+          text: translateObject["FRMELEMNTS_LBL_NO"],
+          role: "cancel",
+          handler: () => { },
+        },
+        {
+          text: translateObject["FRMELEMNTS_LBL_YES"],
+          handler: () => {
+            this.removeImgFromList(index);
+          },
+        },
+      ],
+    });
+    await alert.present();
+  }
+
+  updateLocalImageList() {
+    // this.localStorage.getLocalStorage(this.generalQuestion ? 'genericQuestionsImages' : 'allImageList').then( data =>{
+    //   data = JSON.parse(data);
+    //   if(!this.generalQuestion)
+    //   data[this.submissionId][this.evidenceId] = [...data[this.submissionId][this.evidenceId], ...this.allLocalImageList][this.submissionId][this.evidenceId] ;
+    //   else
+    //   data[this.submissionId] = [ ... data[this.submissionId] , ... this.allLocalImageList][this.submissionId] ;
+    //   this.localStorage.setLocalStorage(this.generalQuestion ? 'genericQuestionsImages' : 'allImageList' , JSON.stringify(data))
+    //   // this.utils.setLocalImages(this.allLocalImageList, this.generalQuestion);
+    //   this.localStorage.getLocalStorage(this.generalQuestion ? 'genericQuestionsImages' : 'allImageList').then( data =>{
+    //     console.log(data   + " updating");
+    //     this.allLocalImageList = JSON.parse(data)
+    // }).catch(error =>{});
+    // }).catch( data =>{
+    //   this.localStorage.setLocalStorage(this.generalQuestion ? 'genericQuestionsImages' : 'allImageList' , JSON.stringify(this.allLocalImageList));
+    //   this.localStorage.getLocalStorage(this.generalQuestion ? 'genericQuestionsImages' : 'allImageList').then( data =>{
+    //     console.log(data + " setting");
+    //     this.allLocalImageList = JSON.parse(data)
+    // }).catch(error =>{});
+    // })
+  }
+
+  previewFile(fileName, extension) {
+    this.fileOpener
+      .open(
+        this.appFolderPath + "/" + fileName,
+        FILE_EXTENSION_HEADERS[extension]
+      )
+      .then(() => console.log("File is opened"))
+      .catch((e) => {
+        // this.utils.openToast();
+        this.toast.openToast("No file readers available")
+      });
+  }
+
+  mediaObject;
+
+  startRecord() {
+    if (this.platform.is("ios")) {
+      this.file
+        .checkDir(this.file.documentsDirectory, "images")
+        .then((success) => {
+          this.fileName =
+            "record" +
+            new Date().getDate() +
+            new Date().getMonth() +
+            new Date().getFullYear() +
+            new Date().getHours() +
+            new Date().getMinutes() +
+            new Date().getSeconds() +
+            ".mp3";
+          this.filesPath =
+            this.file.documentsDirectory + "images/" + this.fileName;
+          this.file
+            .createFile(this.file.tempDirectory, this.fileName, true)
+            .then(() => {
+              this.mediaObject = this.media.create(
+                this.file.tempDirectory.replace(/^file:\/\//, "") +
+                this.fileName
+              );
+              this.mediaObject.startRecord();
+              this.startTimer();
+            })
+            .catch((error) => {
+              this.toast.openToast("Something went wrong");
+            });
+        })
+        .catch((err) => {
+          this.file
+            .createDir(cordova.file.documentsDirectory, "images", false)
+            .then(
+              (success) => {
+                this.fileName =
+                  "record" +
+                  new Date().getDate() +
+                  new Date().getMonth() +
+                  new Date().getFullYear() +
+                  new Date().getHours() +
+                  new Date().getMinutes() +
+                  new Date().getSeconds() +
+                  ".mp3";
+                this.filesPath =
+                  this.file.documentsDirectory + "images/" + this.fileName;
+                this.mediaObject = this.media.create(
+                  this.file.tempDirectory.replace(/^file:\/\//, "") +
+                  this.fileName
+                );
+                this.mediaObject.startRecord();
+                // this.audio = this.media.create(this.filesPath);
+                // this.audio.startRecord();
+                this.startTimer();
+              },
+              (error) => { }
+            );
+        });
+    } else if (this.platform.is("android")) {
+      this.file
+        .checkDir(this.file.externalDataDirectory, "images")
+        .then((success) => {
+          this.fileName =
+            "record" +
+            new Date().getDate() +
+            new Date().getMonth() +
+            new Date().getFullYear() +
+            new Date().getHours() +
+            new Date().getMinutes() +
+            new Date().getSeconds() +
+            ".mp3";
+          this.filesPath =
+            this.file.externalDataDirectory + "images/" + this.fileName;
+          this.audio = this.media.create(this.filesPath);
+          this.startTimer();
+          this.audio.startRecord();
+        })
+        .catch((err) => {
+          this.file
+            .createDir(cordova.file.externalDataDirectory, "images", false)
+            .then(
+              (success) => {
+                this.fileName =
+                  "record" +
+                  new Date().getDate() +
+                  new Date().getMonth() +
+                  new Date().getFullYear() +
+                  new Date().getHours() +
+                  new Date().getMinutes() +
+                  new Date().getSeconds() +
+                  ".mp3";
+                this.filesPath =
+                  this.file.externalDataDirectory + "images/" + this.fileName;
+                this.audio = this.media.create(this.filesPath);
+                this.startTimer();
+                this.audio.startRecord();
+              },
+              (error) => { }
+            );
+        });
+    }
+  }
+
+  startTimer() {
+    this.recording = true;
+    if (this.recording) {
+      this.interval = setInterval(() => {
+        if (this.timeLeft >= 0) {
+          this.timeLeft++;
+          this.minutes = Math.ceil(this.timeLeft / 60) - 1;
+          this.seconds = Math.floor(this.timeLeft % 60);
+        } else {
+          this.timeLeft = 0;
+          this.minutes = 0;
+          this.seconds = 0;
+        }
+      }, 1000);
+    }
+  }
+  checkRecordMediaPermission() {
+    this.diagnostic
+      .isMicrophoneAuthorized()
+      .then((success) => {
+        this.diagnostic
+          .requestMicrophoneAuthorization()
+          .then((success) => {
+            if (success === "authorized" || success === "GRANTED") {
+              const permissionsArray = [
+                this.androidPermissions.PERMISSION.READ_EXTERNAL_STORAGE,
+                this.androidPermissions.PERMISSION.WRITE_EXTERNAL_STORAGE,
+                this.androidPermissions.PERMISSION.RECORD_AUDIO,
+              ];
+              this.androidPermissions
+                .requestPermissions(permissionsArray)
+                .then((successResult) => {
+                  successResult.hasPermission
+                    ? this.startRecord()
+                    : this.toast.openToast(
+                      "Please accept the permissions to use this feature"
+                    );
+                })
+                .catch((error) => {
+                  this.toast.openToast(
+                    "Please accept the permissions to use this feature"
+                  );
+                });
+            } else {
+              this.toast.openToast(
+                "Please accept the permissions to use this feature"
+              );
+            }
+          })
+          .catch((error) => {
+            console.log("Please accept the permissions to use this feature");
+          });
+      })
+      .catch((error) => {
+      });
+    // const permissionsArray = [
+    //   this.androidPermissions.PERMISSION.READ_EXTERNAL_STORAGE,
+    //   this.androidPermissions.PERMISSION.WRITE_EXTERNAL_STORAGE,
+    //   this.androidPermissions.PERMISSION.RECORD_AUDIO
+    // ]
+    // this.androidPermissions.requestPermissions(permissionsArray).then(success => {
+    //   success.hasPermission ? this.startRecord() : this.utils.openToast("Please accept the permissions to use this feature")
+    // }).catch(error => {
+    //   this.utils.openToast("Please accept the permissions to use this feature")
+    // })
+  }
+
+  stopRecord() {
+    this.recording = false;
+    this.timeLeft = 0;
+    this.minutes = 0;
+    this.seconds = 0;
+    clearInterval(this.interval);
+    if (this.isIos) {
+      this.mediaObject.stopRecord();
+      this.mediaObject.release();
+      this.file
+        .copyFile(
+          this.file.tempDirectory,
+          this.fileName,
+          this.appFolderPath,
+          this.fileName
+        )
+        .then(
+          (success) => {
+            this.file.removeFile(this.file.tempDirectory, this.fileName);
+            this.pushToFileList(this.fileName);
+          },
+          (error) => { }
+        );
+    } else {
+      this.audio.stopRecord();
+      this.audio.release();
+      this.pushToFileList(this.fileName);
+    }
+  }
+
+
+}
diff --git a/src/app/manage-learn/shared/components/index.ts b/src/app/manage-learn/shared/components/index.ts
new file mode 100644
index 000000000..e3f3fc169
--- /dev/null
+++ b/src/app/manage-learn/shared/components/index.ts
@@ -0,0 +1,23 @@
+import { from } from 'rxjs';
+
+export * from './audio-list/audio-list.component';
+export * from './common-header/common-header.component';
+export * from './date-type-input/date-type-input.component';
+export * from './footer-buttons/footer-buttons.component';
+export * from './image-upload/image-upload.component';
+export * from './item-list-card/item-list-card.component';
+export * from './matrix-type-input/matrix-type-input.component';
+export * from './multiple-type-input/multiple-type-input.component';
+export * from './page-questions/page-questions.component';
+export * from './question-heading/question-heading.component';
+export * from './radio-type-input/radio-type-input.component';
+export * from './remarks/remarks.component';
+export * from './slider-type-input/slider-type-input.component';
+export * from './text-type-input/text-type-input.component';
+export * from './popover/popover.component';
+export * from './entityfilter/entityfilter.component';
+export * from './progress-bar/progress-bar.component';
+export * from './no-data/no-data.component';
+export * from './chart/chart.component';
+export * from './create-task-form/create-task-form.component';
+export * from './privacy-policy-and-tc/privacy-policy-and-tc.component';
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/item-list-card/item-list-card.component.html b/src/app/manage-learn/shared/components/item-list-card/item-list-card.component.html
new file mode 100644
index 000000000..5de6d70be
--- /dev/null
+++ b/src/app/manage-learn/shared/components/item-list-card/item-list-card.component.html
@@ -0,0 +1,37 @@
+<ion-card (click)="programDetails(id)" class="card-container">
+  <ion-card-content>
+    <div class="d-flex flex-jc-ai-center">
+      <div>
+        <ng-content select="[color]"></ng-content>
+      </div>
+      <div class="flex-dc d-flex flex-basis-1">
+        <div class="d-flex flex-ai-center flex-jc-space-between">
+          <div class="title w-90">
+            {{ title | titlecase }}
+          </div>
+          <ng-content select="[arrow]"></ng-content>
+          <ng-content select="[report]"></ng-content>
+        </div>
+        <div class="info">
+          <span *ngIf="isNumber(subTitle)">{{ subTitle }}</span>
+          <div *ngIf="!isNumber(subTitle)" class="d-flex flex-ai-center">
+            <span>{{ subTitle | titlecase }}</span> <ng-content select="[info]" class="ml-5"></ng-content>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!--  -->
+    <!-- <div class="d-flex flex-ai-center flex-jc-space-between">
+      <div class="title d-flex flex-ai-center title" text-capitalize>
+        <ng-content select="[color]"></ng-content>
+        {{ title | titlecase }}
+      </div>
+      <ng-content select="[arrow]"></ng-content>
+      <ng-content select="[report]"></ng-content>
+    </div>
+    <div class="info grade_ellipsis">
+      <span>{{ subTitle | titlecase }}</span>
+    </div> -->
+  </ion-card-content>
+</ion-card>
diff --git a/src/app/manage-learn/shared/components/item-list-card/item-list-card.component.scss b/src/app/manage-learn/shared/components/item-list-card/item-list-card.component.scss
new file mode 100644
index 000000000..77a1b840f
--- /dev/null
+++ b/src/app/manage-learn/shared/components/item-list-card/item-list-card.component.scss
@@ -0,0 +1,19 @@
+@import "src/assets/styles/base/_variables.scss";
+@import "src/assets/styles/_custom-mixins.scss";
+@import "src/assets/styles/_variables.scss";
+
+.title{
+    font-size: 16px;
+    font-weight: bold;
+    color: #{$blue};
+}
+
+ion-card-header {
+    padding-bottom: 2px;
+}
+
+.card-container{
+    padding-top: 8px;
+    padding-bottom: 8px;
+    background: #ffffff;
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/item-list-card/item-list-card.component.ts b/src/app/manage-learn/shared/components/item-list-card/item-list-card.component.ts
new file mode 100644
index 000000000..e6896ea12
--- /dev/null
+++ b/src/app/manage-learn/shared/components/item-list-card/item-list-card.component.ts
@@ -0,0 +1,26 @@
+import { Component, OnInit } from '@angular/core';
+import { CommonUtilService } from '@app/services';
+import { Input, Output, EventEmitter } from '@angular/core';
+
+@Component({
+  selector: 'app-item-list-card',
+  templateUrl: './item-list-card.component.html',
+  styleUrls: ['./item-list-card.component.scss'],
+})
+export class ItemListCardComponent implements OnInit {
+  @Input() title: any;
+  @Input() subTitle: any;
+  @Input() id: any;
+  @Output() cardSelect = new EventEmitter();
+
+  constructor(private commonUtilService: CommonUtilService) {}
+
+  ngOnInit() {}
+  isNumber(val): boolean {
+    return typeof val === 'number';
+  }
+
+  programDetails(id) {
+    this.cardSelect.emit(id);
+  }
+}
diff --git a/src/app/manage-learn/shared/components/matrix-chart/matrix-chart.component.html b/src/app/manage-learn/shared/components/matrix-chart/matrix-chart.component.html
new file mode 100644
index 000000000..e78702dff
--- /dev/null
+++ b/src/app/manage-learn/shared/components/matrix-chart/matrix-chart.component.html
@@ -0,0 +1,34 @@
+<div class="matrixContainer">
+  <div class="heading">
+    <h4>{{ questionNumber }}) {{ data?.question }}</h4>
+  </div>
+
+  <div *ngFor="let element of data?.instanceQuestions; let i = index">
+    <ion-card [ngSwitch]="element?.responseType">
+      <reports-text [data]="element" [questionNumber]="i + 1" *ngSwitchCase="'text'"></reports-text>
+      <reports-text [data]="element" [questionNumber]="i + 1" *ngSwitchCase="'number'"></reports-text>
+      <reports-text [data]="element" [questionNumber]="i + 1" *ngSwitchCase="'date'"></reports-text>
+      <div *ngSwitchCase="'radio'">
+        <pie-chart [data]="element" [questionNumber]="i + 1"></pie-chart>
+        <reports-text [data]="element"></reports-text>
+      </div>
+      <div *ngSwitchCase="'multiselect'">
+        <bar-chart [data]="element" [questionNumber]="i + 1"></bar-chart>
+        <reports-text [data]="element"></reports-text>
+      </div>
+      <reports-text [data]="element" [questionNumber]="i + 1" *ngSwitchDefault></reports-text>
+    </ion-card>
+     <ion-grid>
+        <ion-row>
+          <ion-col size="4" *ngFor="let e of element.evidences">
+            <attachments [url]="e.url" [extension]="e.extension"></attachments>
+          </ion-col>
+          <ion-col size="12" *ngIf="element.evidence_count > 3">
+            <small class="pull-right text-ios-danger" (click)="allEvidenceClick(element)">{{
+              'FRMELEMNTS_LBL_VIEW_ALL_EVIDNECES' | translate
+            }}</small>
+          </ion-col>
+        </ion-row>
+      </ion-grid>
+  </div>
+</div>
diff --git a/src/app/manage-learn/shared/components/matrix-chart/matrix-chart.component.scss b/src/app/manage-learn/shared/components/matrix-chart/matrix-chart.component.scss
new file mode 100644
index 000000000..634a61165
--- /dev/null
+++ b/src/app/manage-learn/shared/components/matrix-chart/matrix-chart.component.scss
@@ -0,0 +1,13 @@
+@import 'src/assets/styles/base/_variables.scss';
+@import 'src/assets/styles/_custom-mixins.scss';
+@import 'src/assets/styles/_variables.scss';
+
+.heading {
+  background: #f4f4f4;
+  padding: 15px 10px;
+}
+.matrixContainer {
+  border: 1px solid $gray-400;
+
+  // background: $medium-grey-color;
+}
diff --git a/src/app/manage-learn/shared/components/matrix-chart/matrix-chart.component.ts b/src/app/manage-learn/shared/components/matrix-chart/matrix-chart.component.ts
new file mode 100644
index 000000000..f804e840b
--- /dev/null
+++ b/src/app/manage-learn/shared/components/matrix-chart/matrix-chart.component.ts
@@ -0,0 +1,19 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+
+@Component({
+  selector: 'matrix-chart',
+  templateUrl: './matrix-chart.component.html',
+  styleUrls: ['./matrix-chart.component.scss'],
+})
+export class MatrixChartComponent implements OnInit {
+  @Input() data;
+  @Input() questionNumber;
+  @Output() allEvidence = new EventEmitter();
+  constructor() {}
+
+  ngOnInit() {}
+
+  allEvidenceClick($event) {
+    this.allEvidence.emit($event);
+  }
+}
diff --git a/src/app/manage-learn/shared/components/matrix-type-input/matrix-type-input.component.html b/src/app/manage-learn/shared/components/matrix-type-input/matrix-type-input.component.html
new file mode 100644
index 000000000..310188756
--- /dev/null
+++ b/src/app/manage-learn/shared/components/matrix-type-input/matrix-type-input.component.html
@@ -0,0 +1,25 @@
+<ion-card class="_cardBg ion-padding">
+  <ion-col class="_flex-box _justify-content-center _flex-direction-column ">
+    <h4
+      [ngClass]="{'_validQuestion': data?.completedInstance?.length && (data?.completedInstance?.length === data?.value?.length)}">
+      <app-question-heading [inputIndex]="inputIndex" [data]="data" [enableQuestionReadOut]="enableQuestionReadOut">
+      </app-question-heading>
+    </h4>
+  </ion-col>
+  <div class="_tip _flex-box "> {{data?.tip}}</div>
+  <div class="_flex-box alignBtn">
+    <button class="btn-block px-10 sb-bg-color-primary" (click)="addInstances()">{{'FRMELEMENTS_BTN_ADD'|
+      translate}} {{data.instanceIdentifier}}</button>
+  </div>
+  <ion-list class="ion-margin-top ion-text-wrap" *ngIf="data?.value?.length">
+    <ion-item text-capitalize class="_flex-box" *ngFor="let instance of data?.value; let i = index">
+      <div class="_flex-box conatiner" (click)="viewInstance(i)">
+        <span [ngClass]="{'_validQuestion': data?.completedInstance?.includes(i)}" style="flex:1">
+          {{data?.instanceIdentifier}} {{i+1}}</span>
+        <span class="modified" *ngIf="getLastModified(instance)">Last Modified
+          {{getLastModified(instance)|date:'shortTime'}} {{getLastModified(instance)|date:'mediumDate'}} </span>
+      </div>
+      <ion-icon name="trash" class="deletOption ion-margin-right" item-end (click)="deleteInstanceAlert(i)"></ion-icon>
+    </ion-item>
+  </ion-list>
+</ion-card>
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/matrix-type-input/matrix-type-input.component.scss b/src/app/manage-learn/shared/components/matrix-type-input/matrix-type-input.component.scss
new file mode 100644
index 000000000..9673fc539
--- /dev/null
+++ b/src/app/manage-learn/shared/components/matrix-type-input/matrix-type-input.component.scss
@@ -0,0 +1,22 @@
+ion-fab {
+    bottom: 80px !important;
+    position: fixed;
+    z-index: 1;
+}
+.deletOption {
+    color:  #808080;
+}
+.modified {
+    color:  #808080;
+    font-size: 13px;
+    margin-top: 5px;
+}
+.conatiner{
+    flex-direction: column; 
+    align-items:flex-start; 
+    flex:1
+}
+
+.alignBtn {
+    justify-content: flex-end;
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/matrix-type-input/matrix-type-input.component.ts b/src/app/manage-learn/shared/components/matrix-type-input/matrix-type-input.component.ts
new file mode 100644
index 000000000..38e495cd1
--- /dev/null
+++ b/src/app/manage-learn/shared/components/matrix-type-input/matrix-type-input.component.ts
@@ -0,0 +1,195 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { UtilsService } from '@app/app/manage-learn/core';
+import { MatrixModalComponent } from '@app/app/manage-learn/questionnaire/matrix-modal/matrix-modal.component';
+import { AlertController, ModalController } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+
+@Component({
+  selector: 'app-matrix-type-input',
+  templateUrl: './matrix-type-input.component.html',
+  styleUrls: ['./matrix-type-input.component.scss'],
+})
+export class MatrixTypeInputComponent implements OnInit {
+
+  @Input() data: any;
+  @Input() isLast: boolean;
+  @Input() isFirst: boolean;
+  @Output() nextCallBack = new EventEmitter();
+  @Output() previousCallBack = new EventEmitter();
+  @Output() updateLocalData = new EventEmitter();
+  @Input() evidenceId: string;
+  @Input() schoolId: string;
+  @Input() imageLocalCopyId: string;
+  @Input() generalQuestion: boolean;
+  @Input() submissionId: string;
+  @Input() inputIndex;
+  @Input() enableGps;
+  @Input() enableQuestionReadOut: boolean;
+  mainInstance: any;
+  initilaData;
+
+  constructor(
+    private modalCtrl: ModalController,
+    private translate: TranslateService,
+    private alertCtrl: AlertController,
+    private utils: UtilsService) { }
+
+  ngOnInit() {
+    this.data.startTime = this.data.startTime ? this.data.startTime : Date.now();
+    this.initilaData = JSON.parse(JSON.stringify(this.data));
+  }
+
+  next(status?: any) {
+    this.data.isCompleted = this.utils.isMatrixQuestionComplete(this.data);
+    this.nextCallBack.emit(status);
+  }
+
+  back() {
+    this.data.isCompleted = this.utils.isMatrixQuestionComplete(this.data);
+    this.previousCallBack.emit('previous');
+  }
+
+  addInstances(): void {
+    this.data.value = this.data.value ? this.data.value : [];
+    this.data.value.push(JSON.parse(JSON.stringify(this.data.instanceQuestions)));
+    this.checkForValidation();
+  }
+
+  async viewInstance(i) {
+    const obj = {
+      selectedIndex: i,
+      data: JSON.parse(JSON.stringify(this.data)),
+      evidenceId: this.evidenceId,
+      schoolId: this.schoolId,
+      generalQuestion: this.generalQuestion,
+      submissionId: this.submissionId,
+      questionIndex: this.inputIndex,
+      enableQuestionReadOut: this.enableQuestionReadOut
+    }
+    let matrixModal = await this.modalCtrl.create({
+      component: MatrixModalComponent,
+      componentProps: obj
+    });
+
+    await matrixModal.present();
+
+    const { data } = await matrixModal.onDidDismiss()
+    this.updateInstance(i, data)
+    // matrixModal.onDidDismiss(instanceValue => {
+    //   if (this.enableGps) {
+    //     this.checkForGpsLocation(i, instanceValue)
+    //   } else {
+    //     this.updateInstance(i, instanceValue)
+    //   }
+    // })
+  }
+
+  // checkForGpsLocation(instanceIndex, instanceValue) {
+  //   if (JSON.stringify(instanceValue) !== JSON.stringify(this.data.value[instanceIndex]) && this.checkCompletionOfInstance(instanceValue, null)) {
+  //     this.utils.startLoader();
+  //     this.ngps.getGpsStatus().then(success => {
+  //       this.utils.stopLoader();
+  //       this.updateInstance(instanceIndex, instanceValue, success)
+  //     }).catch(error => {
+  //       this.utils.stopLoader();
+  //       this.utils.openToast("Please try again.");
+  //     })
+  //   } else {
+  //     this.updateInstance(instanceIndex, instanceValue)
+  //   }
+  // }
+
+  updateInstance(instanceIndex, instanceValue, gpsLocation?: any) {
+    if (instanceValue) {
+      this.data.completedInstance = this.data.completedInstance ? this.data.completedInstance : [];
+      this.data.value[instanceIndex] = instanceValue;
+      let instanceCompletion = this.checkCompletionOfInstance(this.data.value[instanceIndex], gpsLocation);
+      if (instanceCompletion) {
+        if (this.data.completedInstance.indexOf(instanceIndex) < 0) {
+          this.data.completedInstance.push(instanceIndex);
+        }
+      } else {
+        const index = this.data.completedInstance.indexOf(instanceIndex);
+        if (index >= 0) {
+          this.data.completedInstance.splice(index, 1);
+        }
+      }
+      this.checkForValidation();
+    }
+  }
+
+  checkCompletionOfInstance(data, gpsLocation): boolean {
+    let isCompleted = true;
+    if (data) {
+      for (const question of data) {
+        // question.isCompleted = this.utils.isQuestionComplete(question);
+        question.gpsLocation = gpsLocation ? gpsLocation : "";
+        if (!question.isCompleted) {
+          isCompleted = false;
+          return false
+        }
+      }
+    } else {
+      isCompleted = false
+    }
+
+    return isCompleted
+
+  }
+
+  deleteInstance(instanceIndex): void {
+    this.data.value.splice(instanceIndex, 1);
+    // let instanceCompletion = this.checkCompletionOfInstance(this.data.value[instanceIndex]);
+    // if(instanceCompletion) {
+    if (this.data.completedInstance && this.data.completedInstance.length && this.data.completedInstance.indexOf(instanceIndex) >= 0) {
+      this.data.completedInstance.splice(instanceIndex, 1);
+    }
+    this.checkForValidation();
+
+    // }
+  }
+
+  checkForValidation(): void {
+    this.data.isCompleted = this.utils.isMatrixQuestionComplete(this.data);
+    this.data.endTime = this.data.isCompleted ? Date.now() : "";
+    this.updateLocalData.emit();
+  }
+
+
+  async deleteInstanceAlert(index) {
+    let translateObject;
+    this.translate.get(['FRMELEMNTS_LBL_COFIRMATION_DELETE', 'FRMELEMNTS_LBL_COFIRMATION_DELETE_INSTANCE', 'NO', 'YES']).subscribe(translations => {
+      translateObject = translations;
+    })
+    let alert = await this.alertCtrl.create({
+      header: translateObject['FRMELEMNTS_LBL_COFIRMATION_DELETE'],
+      message: translateObject['FRMELEMNTS_LBL_COFIRMATION_DELETE_INSTANCE'],
+      buttons: [
+        {
+          text: translateObject['NO'],
+          role: 'cancel',
+          handler: () => {
+          }
+        },
+        {
+          text: translateObject['YES'],
+          handler: () => {
+            this.deleteInstance(index);
+          }
+        }
+      ]
+    });
+    await alert.present();
+  }
+
+  getLastModified(instance) {
+    let lastModifiedAt = 0;
+    for (const question of instance) {
+      if (question.startTime > lastModifiedAt) {
+        lastModifiedAt = question.startTime;
+      }
+    }
+    return lastModifiedAt
+  }
+
+}
diff --git a/src/app/manage-learn/shared/components/multiple-type-input/multiple-type-input.component.html b/src/app/manage-learn/shared/components/multiple-type-input/multiple-type-input.component.html
new file mode 100644
index 000000000..70a61476f
--- /dev/null
+++ b/src/app/manage-learn/shared/components/multiple-type-input/multiple-type-input.component.html
@@ -0,0 +1,27 @@
+<ion-card class="_cardBg ion-padding">
+  <ion-col class="_flex-box _justify-content-center _flex-direction-column">
+    <h4 [ngClass]="{'_validQuestion': data?.value?.length}" class="flexbox">
+      <app-question-heading [inputIndex]="inputIndex" [data]="data" [enableQuestionReadOut]="enableQuestionReadOut">
+      </app-question-heading>
+    </h4>
+  </ion-col>
+  <div class="_tip _flex-box">{{data?.tip}}</div>
+  <div class="ion-margin-top">
+    <ion-list>
+      <ion-item *ngFor="let option of data?.options" class="ion-text-wrap ds-item">
+        <ion-label class="_flex-box label ion-text-wrap ds-m0">
+          <ion-icon name="bulb" class="help" (click)="openHint(option?.hint)" *ngIf="option?.hint"></ion-icon>
+          <div style="flex: 1;" [ngStyle]="{ 'margin-left': option?.hint ? '35px' : '0px' }" class="ds-m0">
+            {{option?.label}}
+          </div>
+        </ion-label>
+        <ion-checkbox [checked]="data?.value?.indexOf(option?.value) >-1" class="checkbox"
+          (ionChange)="updateModelValue(option?.value)" [disabled]="data.isEditable!=undefined && !data.isEditable">
+        </ion-checkbox>
+      </ion-item>
+    </ion-list>
+    <app-remarks *ngIf="data?.showRemarks" [data]="data"></app-remarks>
+    <app-image-upload [data]="data" [generalQuestion]="generalQuestion" [imageLocalCopyId]="imageLocalCopyId"
+      [evidenceId]="evidenceId" [submissionId]="submissionId"></app-image-upload>
+  </div>
+</ion-card>
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/multiple-type-input/multiple-type-input.component.scss b/src/app/manage-learn/shared/components/multiple-type-input/multiple-type-input.component.scss
new file mode 100644
index 000000000..90343d6ac
--- /dev/null
+++ b/src/app/manage-learn/shared/components/multiple-type-input/multiple-type-input.component.scss
@@ -0,0 +1,12 @@
+.help {
+  font-size: 30px;
+  z-index: 557;
+  margin-right: 15px;
+  position: absolute;
+  color: grey;
+  // right: 0;
+}
+
+.label {
+  justify-content: flex-start;
+}
diff --git a/src/app/manage-learn/shared/components/multiple-type-input/multiple-type-input.component.ts b/src/app/manage-learn/shared/components/multiple-type-input/multiple-type-input.component.ts
new file mode 100644
index 000000000..0ece21f3c
--- /dev/null
+++ b/src/app/manage-learn/shared/components/multiple-type-input/multiple-type-input.component.ts
@@ -0,0 +1,91 @@
+import { Component, Input, EventEmitter, Output, OnInit } from '@angular/core';
+import { UtilsService } from '@app/app/manage-learn/core';
+import { ModalController } from '@ionic/angular';
+import { HintComponent } from '../hint/hint.component';
+
+@Component({
+  selector: 'app-multiple-type-input',
+  templateUrl: './multiple-type-input.component.html',
+  styleUrls: ['./multiple-type-input.component.scss'],
+})
+export class MultipleTypeInputComponent implements OnInit {
+
+  text: string;
+  @Input() data: any;
+  @Input() isLast: boolean;
+  @Input() isFirst: boolean;
+  @Output() nextCallBack = new EventEmitter();
+  @Output() previousCallBack = new EventEmitter();
+  @Input() evidenceId: string;
+  @Input() hideButton: boolean;
+  @Input() schoolId: string;
+  @Input() imageLocalCopyId: string;
+  @Input() generalQuestion: boolean;
+  @Input() submissionId: any;
+  @Input() inputIndex;
+  @Input() enableQuestionReadOut: boolean;
+  constructor(
+    private utils: UtilsService,
+    // private hintService: HintProvider
+     private modalCtrl:ModalController
+
+  ) {
+    this.text = "Hello World";
+
+    // if(!this.data.value) {
+    //   this.data.value = [];
+    // }
+  }
+  ngOnInit() {
+    this.data.value = this.data.value ? this.data.value : [];
+    this.data.startTime = this.data.startTime
+      ? this.data.startTime
+      : Date.now();
+
+    if (
+      !this.data.validation.required ||
+      (this.data.value && this.data.value.length)
+    ) {
+      this.data.isCompleted = true;
+    }
+  }
+
+  updateModelValue(val) {
+    if (this.data.value.indexOf(val) > -1) {
+      let index = this.data.value.indexOf(val);
+      this.data.value.splice(index, 1);
+    } else {
+      this.data.value.push(val);
+    }
+    this.checkForValidation();
+  }
+
+  next(status?: string) {
+    // this.utils.isQuestionComplete(this.data);
+    this.data.isCompleted = this.utils.isQuestionComplete(this.data);
+    this.nextCallBack.emit(status);
+  }
+
+  back() {
+    this.data.isCompleted = this.utils.isQuestionComplete(this.data);
+    this.previousCallBack.emit("previous");
+  }
+
+  checkForValidation(): void {
+    this.data.isCompleted = this.utils.isQuestionComplete(this.data);
+    this.data.endTime = this.data.isCompleted ? Date.now() : "";
+  }
+
+ async openHint(hint) {
+    // this.hintService.presentHintModal({ hint: hint });
+    let hintModal = await this.modalCtrl.create({
+      component: HintComponent,
+      componentProps: {
+        hint,
+      },
+    });
+    // await hintModal.onDidDismiss(data => {
+    // });
+    hintModal.present();
+  }
+}
diff --git a/src/app/manage-learn/shared/components/no-data/no-data.component.html b/src/app/manage-learn/shared/components/no-data/no-data.component.html
new file mode 100644
index 000000000..b7a95de59
--- /dev/null
+++ b/src/app/manage-learn/shared/components/no-data/no-data.component.html
@@ -0,0 +1,3 @@
+<div class="message">
+  <h5> {{message | translate}} </h5>
+</div>
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/no-data/no-data.component.scss b/src/app/manage-learn/shared/components/no-data/no-data.component.scss
new file mode 100644
index 000000000..11d1d00cb
--- /dev/null
+++ b/src/app/manage-learn/shared/components/no-data/no-data.component.scss
@@ -0,0 +1,4 @@
+.message{
+    text-align: center;
+    margin: auto;
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/no-data/no-data.component.ts b/src/app/manage-learn/shared/components/no-data/no-data.component.ts
new file mode 100644
index 000000000..91d43b9e1
--- /dev/null
+++ b/src/app/manage-learn/shared/components/no-data/no-data.component.ts
@@ -0,0 +1,14 @@
+import { Component, OnInit, Input } from '@angular/core';
+
+@Component({
+  selector: 'app-no-data',
+  templateUrl: './no-data.component.html',
+  styleUrls: ['./no-data.component.scss'],
+})
+export class NoDataComponent implements OnInit {
+  @Input() message = 'NO_DATA_FOUND'
+  constructor() { }
+
+  ngOnInit() { }
+
+}
diff --git a/src/app/manage-learn/shared/components/page-questions/page-questions.component.html b/src/app/manage-learn/shared/components/page-questions/page-questions.component.html
new file mode 100644
index 000000000..1748d18fc
--- /dev/null
+++ b/src/app/manage-learn/shared/components/page-questions/page-questions.component.html
@@ -0,0 +1,34 @@
+<div *ngIf="data?.pageQuestions?.length">
+  <ng-container 
+    *ngFor="let question of data?.pageQuestions; let j=index" [ngSwitch]="question?.responseType.toLowerCase()">
+    <!-- <ion-item-divider color="light" *ngIf="question?.sectionHeader">
+      <h4 class="bold _flex-box sectionHeader" text-wrap>{{question?.sectionHeader}}</h4>
+    </ion-item-divider> -->
+    <div class="_fullScreenCard" *ngIf="checkForVisibility(j)" >
+
+      <app-text-type-input [inputIndex]="start + 1" [evidenceId]="selectedEvidenceId" [submissionId]="submissionId"
+        [data]="question" [imageLocalCopyId]="localImageListKey" *ngSwitchCase="'text'"
+        [enableQuestionReadOut]="enableQuestionReadOut"></app-text-type-input>
+      <app-text-type-input [inputIndex]="start + 1" [evidenceId]="selectedEvidenceId" [submissionId]="submissionId"
+        [schoolId]="schoolId" [data]="question" [imageLocalCopyId]="localImageListKey" *ngSwitchCase="'number'"
+        [enableQuestionReadOut]="enableQuestionReadOut"></app-text-type-input>
+      <app-radio-type-input [inputIndex]="start + 1" [evidenceId]="selectedEvidenceId" [submissionId]="submissionId"
+        [schoolId]="schoolId" [data]="question" [imageLocalCopyId]="localImageListKey" *ngSwitchCase="'radio'"
+        [enableQuestionReadOut]="enableQuestionReadOut"></app-radio-type-input>
+      <app-date-type-input [inputIndex]="start + 1" [evidenceId]="selectedEvidenceId" [submissionId]="submissionId"
+        [schoolId]="schoolId" [data]="question" [imageLocalCopyId]="localImageListKey" *ngSwitchCase="'date'"
+        [enableQuestionReadOut]="enableQuestionReadOut"></app-date-type-input>
+      <app-multiple-type-input [inputIndex]="start + 1" [evidenceId]="selectedEvidenceId" [schoolId]="schoolId"
+        [data]="question" [imageLocalCopyId]="localImageListKey" [submissionId]="submissionId"
+        *ngSwitchCase="'multiselect'" [enableQuestionReadOut]="enableQuestionReadOut"></app-multiple-type-input>
+      <app-matrix-type-input [inputIndex]="start + 1" [evidenceId]="selectedEvidenceId" [schoolId]="schoolId"
+      [data]="question" [imageLocalCopyId]="localImageListKey" [submissionId]="submissionId"
+      (updateLocalData)="updateLocalData()" *ngSwitchCase="'matrix'" [enableGps]="captureGpsLocationAtQuestionLevel"
+      [enableQuestionReadOut]="enableQuestionReadOut">
+    </app-matrix-type-input>
+      <app-slider-type-input [inputIndex]="start + 1" [evidenceId]="selectedEvidenceId" [submissionId]="submissionId"
+        [schoolId]="schoolId" [data]="question" [imageLocalCopyId]="localImageListKey" *ngSwitchCase="'slider'"
+        [enableQuestionReadOut]="enableQuestionReadOut"></app-slider-type-input>
+    </div>
+  </ng-container>
+</div>
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/page-questions/page-questions.component.scss b/src/app/manage-learn/shared/components/page-questions/page-questions.component.scss
new file mode 100644
index 000000000..d8dc3694b
--- /dev/null
+++ b/src/app/manage-learn/shared/components/page-questions/page-questions.component.scss
@@ -0,0 +1,3 @@
+.sectionHeader {
+    padding: 5px 0;
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/page-questions/page-questions.component.ts b/src/app/manage-learn/shared/components/page-questions/page-questions.component.ts
new file mode 100644
index 000000000..b1e3a0c69
--- /dev/null
+++ b/src/app/manage-learn/shared/components/page-questions/page-questions.component.ts
@@ -0,0 +1,93 @@
+import { Component, Input, EventEmitter, Output, OnInit, OnDestroy } from '@angular/core';
+import { UtilsService } from '@app/app/manage-learn/core';
+
+@Component({
+  selector: 'app-page-questions',
+  templateUrl: './page-questions.component.html',
+  styleUrls: ['./page-questions.component.scss'],
+})
+export class PageQuestionsComponent implements OnInit,OnDestroy {
+
+  @Input() inputIndex ;
+  @Input() data: any;
+  @Input() isLast: boolean;
+  @Input() isFirst: boolean;
+  @Output() nextCallBack = new EventEmitter();
+  @Output() updateLocalData = new EventEmitter();
+  @Output() previousCallBack = new EventEmitter()
+  @Input() evidenceId: string;
+  @Input() hideButton: boolean;
+  @Input() submissionId: any;
+  @Input() imageLocalCopyId: string;
+  @Input() generalQuestion: boolean;
+  @Input() schoolId;
+  @Input() enableQuestionReadOut: boolean;
+  notNumber: boolean;
+  questionValid: boolean;
+  text: string;
+
+  constructor(private utils: UtilsService) { }
+
+
+  ngOnDestroy() {
+    console.log(JSON.stringify(this.data))
+    for (const question of this.data.pageQuestions) {
+      // Do check only for questions without visibleif. For visibleIf questions isCompleted property is set in  checkForVisibility()
+      if (!question.visibleIf) {
+        question.isCompleted = this.utils.isQuestionComplete(question);
+      }
+    }
+  }
+
+  ngOnInit() {
+    this.data.startTime = this.data.startTime ? this.data.startTime : Date.now();
+  }
+
+  updateLocalDataInPageQuestion(): void {
+    this.updateLocalData.emit();
+  }
+
+  checkForVisibility(currentQuestionIndex) {
+    const currentQuestion = this.data.pageQuestions[currentQuestionIndex];
+    let display = true;
+    for (const question of this.data.pageQuestions) {
+      for (const condition of currentQuestion.visibleIf) {
+        if (condition._id === question._id) {
+          let expression = [];
+          if (condition.operator != "===") {
+            if (question.responseType === 'multiselect') {
+              for (const parentValue of question.value) {
+                for (const value of condition.value) {
+                  expression.push("(", "'" + parentValue + "'", "===", "'" + value + "'", ")", condition.operator);
+                }
+              }
+            } else {
+              for (const value of condition.value) {
+                expression.push("(", "'" + question.value + "'", "===", "'" + value + "'", ")", condition.operator)
+              }
+            }
+            expression.pop();
+          } else {
+            if (question.responseType === 'multiselect') {
+              for (const value of question.value) {
+                expression.push("(", "'" + condition.value + "'", "===", "'" + value + "'", ")", "||");
+              }
+              expression.pop();
+            } else {
+              expression.push("(", "'" + question.value + "'", condition.operator, "'" + condition.value + "'", ")")
+            }
+          }
+          if (!eval(expression.join(''))) {
+            this.data.pageQuestions[currentQuestionIndex].isCompleted = true;
+            return false
+          } else {
+            this.data.pageQuestions[currentQuestionIndex].isCompleted = this.utils.isQuestionComplete(currentQuestion);
+          }
+        }
+      }
+    }
+    return display
+  }
+
+
+}
diff --git a/src/app/manage-learn/shared/components/percentage-column-charts/percentage-column-charts.component.html b/src/app/manage-learn/shared/components/percentage-column-charts/percentage-column-charts.component.html
new file mode 100644
index 000000000..1bde374dd
--- /dev/null
+++ b/src/app/manage-learn/shared/components/percentage-column-charts/percentage-column-charts.component.html
@@ -0,0 +1,17 @@
+<div>
+  <div>
+    <div style="display: block" style="overflow: scroll" *ngIf="chartData.chart.data">
+      <canvas
+        baseChart
+        [datasets]="barChartData"
+        [labels]="barChartLabels"
+        [options]="barChartOptions"
+        [plugins]="barChartPlugins"
+        [legend]="barChartLegend"
+        [chartType]="barChartType"
+        width="50"
+        height="80"
+      ></canvas>
+    </div>
+  </div>
+</div>
diff --git a/src/app/manage-learn/shared/components/percentage-column-charts/percentage-column-charts.component.scss b/src/app/manage-learn/shared/components/percentage-column-charts/percentage-column-charts.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/shared/components/percentage-column-charts/percentage-column-charts.component.ts b/src/app/manage-learn/shared/components/percentage-column-charts/percentage-column-charts.component.ts
new file mode 100644
index 000000000..b005f1f35
--- /dev/null
+++ b/src/app/manage-learn/shared/components/percentage-column-charts/percentage-column-charts.component.ts
@@ -0,0 +1,197 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ChartDataSets, ChartOptions, ChartType } from 'chart.js';
+import { Label } from 'ng2-charts';
+import * as pluginDataLabels from 'chartjs-plugin-datalabels';
+import * as stackedBar from 'chartjs-plugin-stacked100';
+
+@Component({
+  selector: 'percentage-column-charts',
+  templateUrl: './percentage-column-charts.component.html',
+  styleUrls: ['./percentage-column-charts.component.scss'],
+})
+export class PercentageColumnChartsComponent implements OnInit {
+  // @Output() clickOnGraphEventEmit = new EventEmitter();
+  @Input() chartData;
+  submiisionDateArray;
+  //  =[
+  //   '25th feb 2019',
+  //   '26th Feb 2019',
+  //   '25th feb 2019',
+  //   '26th Feb 2019',
+  //   '25th feb 2019',
+  //   '26th Feb 2019',
+  //   '25th feb 2019',
+  //   '26th Feb 2019',
+  // ];
+
+  // dataPack1 = [1, 3, 2, 3, 3, 4, 4, 1];
+  // dataPack2 = [2, 3, 3, 4, 4, 5, 5, 6];
+  // dataPack3 = [3, 4, 4, 5, 5, 6, 6, 7];
+  // dataPack4 = [4, 4, 5, 7, 6, 5, 7, 1];
+  public barChartData: ChartDataSets[];
+  // =
+  //   [
+  //   {
+  //     label: 'L1',
+  //     data: this.dataPack1,
+  //   },
+  //   {
+  //     label: 'L2',
+  //     data: this.dataPack2,
+  //   },
+  //   {
+  //     label: 'L3',
+  //     data: this.dataPack3,
+  //   },
+  //   {
+  //     label: 'L4',
+  //     data: this.dataPack4,
+  //   },
+  // ];
+
+  public barChartOptions: ChartOptions;
+  //   = {
+
+  //   scales: {
+  //     xAxes: [
+  //       {
+  //         stacked: false,
+  //         gridLines: { display: false },
+  //         scaleLabel: {
+  //           display: true,
+  //           labelString: 'Criteria',
+  //         },
+  //       },
+  //     ],
+  //     yAxes: [
+  //       {
+  //         stacked: true,
+  //         ticks: {
+  //           fontSize: 7,
+  //         },
+  //       },
+  //     ],
+  //   },
+  //   plugins: {
+  //     stacked100: { enable: true, replaceTooltipLabel: true },
+  //     datalabels: {
+  //       offset: 0,
+  //       anchor: 'end',
+  //       align: 'left',
+  //       font: {
+  //         size: 7,
+  //       },
+  //       formatter: (value, data) => {
+  //         const d: any = data.chart.data;
+  //         const { datasetIndex, dataIndex } = data;
+  //         if ((data.datasetIndex + 1) % this.barChartData.length == 0) {
+  //           // console.log(data.datasetIndex)
+  //           if (d.originalData[datasetIndex][dataIndex] == 1) {
+  //             return ['', '', this.submiisionDateArray[data.dataIndex]];
+  //           }
+  //           return [
+  //             `                                              ${d.originalData[datasetIndex][dataIndex]}`,
+  //             '',
+
+  //             `                                ${this.submiisionDateArray[data.dataIndex]}`,
+  //           ];
+  //         } else {
+  //           return `${d.originalData[datasetIndex][dataIndex]}`;
+  //         }
+  //       },
+  //     },
+  //   },
+  // };
+  public barChartLabels: Label[];
+  //   = [
+  //   'domain1,domain1,domain1',
+  //   '',
+  //   'domain2',
+  //   '',
+  //   'domain3',
+  //   '',
+  //   'domain4,domain1domain1,domain',
+  //   '',
+  // ];
+  public barChartType: ChartType = 'horizontalBar';
+  public barChartLegend = true;
+  public barChartPlugins = [pluginDataLabels, stackedBar];
+
+  constructor() {}
+
+  ngOnInit() {
+    this.submiisionDateArray = this.chartData.chart.submissionDateArray;
+    this.barChartData = this.chartData.chart.data.datasets;
+    this.barChartLabels = this.chartData.chart.data.labels;
+    this.barChartOptions = {
+      scales: {
+        xAxes: [
+          {
+            stacked: false,
+            gridLines: { display: false },
+            scaleLabel: {
+              display: true,
+              labelString: 'Criteria',
+            },
+          },
+        ],
+        yAxes: [
+          {
+            stacked: true,
+            ticks: {
+              fontSize: 7,
+            },
+          },
+        ],
+      },
+      plugins: {
+        stacked100: { enable: true, replaceTooltipLabel: true },
+        datalabels: {
+          offset: 0,
+          anchor: 'end',
+          align: 'left',
+          font: {
+            size: 7,
+          },
+          formatter: (value, data) => {
+            const d: any = data.chart.data;
+            const { datasetIndex, dataIndex } = data;
+
+            // to remove  0 data in  report
+            if (d.originalData[datasetIndex][dataIndex] == 0) {
+              if ((data.datasetIndex + 1) % this.barChartData.length == 0 && this.submiisionDateArray.length) {
+                  return ['', '', this.submiisionDateArray[data.dataIndex]];
+              }
+              return '';
+            }
+            // to remove date in instance report
+            if (this.submiisionDateArray && !this.submiisionDateArray.length) {
+              return `${d.originalData[datasetIndex][dataIndex]}`;
+            }
+
+            // for last value
+            if ((data.datasetIndex + 1) % this.barChartData.length == 0) {
+              // console.log(data.datasetIndex)
+              if (d.originalData[datasetIndex][dataIndex] == 1) {
+                return ['', '', this.submiisionDateArray[data.dataIndex]];
+              }
+              return [
+                `                                              ${d.originalData[datasetIndex][dataIndex]}`,
+                '',
+
+                `                                ${this.submiisionDateArray[data.dataIndex]}`,
+              ];
+            } else {
+              return `${d.originalData[datasetIndex][dataIndex]}`;
+            }
+          },
+        },
+      },
+    };
+  }
+
+  // events
+  public chartClicked({ event, active }: { event: MouseEvent; active: {}[] }): void {
+    // console.log(event, active);
+  }
+}
diff --git a/src/app/manage-learn/shared/components/pie-chart/pie-chart.component.html b/src/app/manage-learn/shared/components/pie-chart/pie-chart.component.html
new file mode 100644
index 000000000..d51c91d9c
--- /dev/null
+++ b/src/app/manage-learn/shared/components/pie-chart/pie-chart.component.html
@@ -0,0 +1,34 @@
+<div *ngIf="pieChartData">
+  <div class="heading">
+    <h4>{{ questionNumber }}) {{ data?.question }}</h4>
+  </div>
+  <!-- <highcharts-chart
+    [(update)]="updateFlag"
+    [Highcharts]="Highcharts"
+    [options]="chartObj"
+    [constructorType]="chartConstructor"
+    [oneToOne]="oneToOneFlag"
+    [runOutsideAngular]="runOutsideAngularFlag"
+    *ngIf="data?.chart?.data"
+  >
+  </highcharts-chart> -->
+  <div *ngIf="data?.chart?.data">
+    <!-- <div id="{{'container'+ questionNumber }}"></div> -->
+    <div style="display: block" *ngIf="data?.chart?.data">
+      <canvas
+        baseChart
+        height="60vh"
+        width="80vw"
+        [data]="pieChartData"
+        [labels]="pieChartLabels"
+        [chartType]="pieChartType"
+        [options]="pieChartOptions"
+        [plugins]="pieChartPlugins"
+        [legend]="pieChartLegend"
+        [colors]="chartColors"
+      >
+      </canvas>
+    </div>
+  </div>
+  <div class="errorMsg" *ngIf="!data?.chart?.data">No data found</div>
+</div>
diff --git a/src/app/manage-learn/shared/components/pie-chart/pie-chart.component.scss b/src/app/manage-learn/shared/components/pie-chart/pie-chart.component.scss
new file mode 100644
index 000000000..457908792
--- /dev/null
+++ b/src/app/manage-learn/shared/components/pie-chart/pie-chart.component.scss
@@ -0,0 +1,12 @@
+@import 'src/assets/styles/base/_variables.scss';
+@import 'src/assets/styles/_custom-mixins.scss';
+@import 'src/assets/styles/_variables.scss';
+.heading {
+  background: #f4f4f4;
+  padding: 15px 10px;
+}
+.errorMsg {
+  color: $gray-400;
+  text-align: center;
+  padding: 20px 0;
+}
diff --git a/src/app/manage-learn/shared/components/pie-chart/pie-chart.component.ts b/src/app/manage-learn/shared/components/pie-chart/pie-chart.component.ts
new file mode 100644
index 000000000..9ec6051b9
--- /dev/null
+++ b/src/app/manage-learn/shared/components/pie-chart/pie-chart.component.ts
@@ -0,0 +1,79 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { ChartOptions, ChartType, ChartDataSets } from 'chart.js';
+import { Label, SingleDataSet } from 'ng2-charts';
+
+@Component({
+  selector: 'pie-chart',
+  templateUrl: './pie-chart.component.html',
+  styleUrls: ['./pie-chart.component.scss'],
+})
+export class PieChartComponent implements OnInit {
+  @Input() data;
+  @Input() questionNumber;
+  // Highcharts = Highcharts; // required
+  // chartConstructor = 'chart'; // optional string, defaults to 'chart'
+  // updateFlag = false; // optional boolean
+  // oneToOneFlag = true; // optional boolean, defaults to false
+  // runOutsideAngular = false;
+  // chartObj;
+
+  public pieChartOptions: ChartOptions = {
+    responsive: true,
+    legend: { position: 'bottom', align:'start'},
+  };
+  public pieChartLabels: Label[];
+  public pieChartData: SingleDataSet;
+  // = [75, 25];
+  public pieChartType: ChartType = 'pie';
+  public pieChartLegend = true;
+  public pieChartPlugins = [];
+  public chartColors: Array<any>;
+  //   = [
+  //   {
+  //     // all colors in order
+  //     backgroundColor: ['#D35400', '#D35400', '#D35400'],
+  //   },
+  // ];
+
+  constructor() {}
+
+  ngOnInit() {
+    this.pieChartLabels = this.data.chart.data.labels;
+    this.pieChartData = this.data.chart.data.datasets[0].data;
+    this.chartColors = [{ backgroundColor: this.data.chart.data.datasets[0].backgroundColor }];
+
+    // if (this.data && this.data.chart && this.data.chart.data) {
+    //   for (const outer of this.data.chart.data) {
+    //     for (const inner of outer.data) {
+    //       inner.y = parseInt(inner.y);
+    //     }
+    //   }
+    // }
+
+    // this.chartObj = {
+    //   chart: {
+    //     plotBackgroundColor: null,
+    //     plotBorderWidth: null,
+    //     plotShadow: false,
+    //     type: 'pie',
+    //   },
+    //   title: {
+    //     text: ' ',
+    //   },
+    //   tooltip: {
+    //     // pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
+    //   },
+    //   plotOptions: {
+    //     pie: {
+    //       // allowPointSelect: true,
+    //       // cursor: 'pointer',
+    //       showInLegend: true,
+    //     },
+    //   },
+    //   series: this.data ? this.data.chart.data : null,
+    // };
+    // setTimeout(() => {
+    //   Highcharts.chart('container' + this.questionNumber, this.chartObj);
+    // }, 1000);
+  }
+}
diff --git a/src/app/manage-learn/shared/components/popover/popover.component.html b/src/app/manage-learn/shared/components/popover/popover.component.html
new file mode 100644
index 000000000..4e4b26aa5
--- /dev/null
+++ b/src/app/manage-learn/shared/components/popover/popover.component.html
@@ -0,0 +1,9 @@
+<ion-list>
+  <ion-item *ngFor="let menu of menus" (click)="onEvent(menu)">
+    <ion-label class="menu-label">{{menu.TITLE | translate}}
+    </ion-label>
+    <ion-avatar slot="end" class="avatar-style" *ngIf="menu.ICON">
+      <ion-icon [name]="menu.ICON"></ion-icon>
+    </ion-avatar>
+  </ion-item>
+</ion-list>
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/popover/popover.component.scss b/src/app/manage-learn/shared/components/popover/popover.component.scss
new file mode 100644
index 000000000..55a5695d8
--- /dev/null
+++ b/src/app/manage-learn/shared/components/popover/popover.component.scss
@@ -0,0 +1,7 @@
+.menu-label{
+    font-size: 16px;
+}
+.avatar-style{
+    display: contents;
+    font-size: x-large;
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/popover/popover.component.ts b/src/app/manage-learn/shared/components/popover/popover.component.ts
new file mode 100644
index 000000000..143a63e9f
--- /dev/null
+++ b/src/app/manage-learn/shared/components/popover/popover.component.ts
@@ -0,0 +1,17 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { popoverController } from '@ionic/core';
+@Component({
+  selector: 'app-popover',
+  templateUrl: './popover.component.html',
+  styleUrls: ['./popover.component.scss'],
+})
+export class PopoverComponent implements OnInit {
+  @Input() menus;
+  constructor(
+  ) { }
+  ngOnInit() {
+  }
+  onEvent(menu) {
+    popoverController.dismiss(menu.VALUE);
+  }
+}
diff --git a/src/app/manage-learn/shared/components/privacy-policy-and-tc/privacy-policy-and-tc.component.html b/src/app/manage-learn/shared/components/privacy-policy-and-tc/privacy-policy-and-tc.component.html
new file mode 100644
index 000000000..d177ff02a
--- /dev/null
+++ b/src/app/manage-learn/shared/components/privacy-policy-and-tc/privacy-policy-and-tc.component.html
@@ -0,0 +1,39 @@
+<ion-header class="sb-popover-header">
+  <ion-toolbar class="sb-popover-toolbar">
+    <ion-title class="sb-popover-title">{{header| translate}}
+    </ion-title>
+  </ion-toolbar>
+</ion-header>
+<div id="main-content">
+  <div class="consent-popover-info">
+    <div class="flex-container">
+      <div class="footer">
+        <div class="cr-input-primary" lines="none">
+          <span>
+            <ion-checkbox class="cr-terms-checkbox" (ionChange)="changeEvent($event)"></ion-checkbox>
+          </span>
+          <span>
+            <p class="cr-terms-checkbox-label">
+              <span>{{message | translate}} </span>
+              <span (click)="openTermsOfUse()" class="terms-info"> {{linkLabel | translate }}</span>
+              <span> {{message1 | translate}}</span>
+
+            </p>
+          </span>
+        </div>
+        <div class="btn-info" *ngIf="isPrivacyPolicy">
+          <button [disabled]="isChecked" [ngClass]="!isChecked ?  'save-changes' : 'save-changes-not-agree'"
+            (click)="closePopover()">{{'FRMELEMNTS_BTN_DONOT_SHARE' | translate}}</button>
+          <button (click)="closePopover()" [disabled]="!isChecked"
+            [ngClass]="!isChecked ?  'save-changes-not-agree' : 'save-changes'">{{'SHARE' | translate}}</button>
+        </div>
+        <div class="btn-info" *ngIf="!isPrivacyPolicy">
+          <button [disabled]="isChecked" [ngClass]="!isChecked ?  'save-changes' : 'save-changes-not-agree'"
+            (click)="closePopover()">{{'FRMELEMNTS_BTN_DO_NOT_UPLOAD' | translate}}</button>
+          <button (click)="closePopover()" [disabled]="!isChecked"
+            [ngClass]="!isChecked ?  'save-changes-not-agree' : 'save-changes'">{{'FRMELEMNTS_BTN_UPLOAD' | translate}}</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/privacy-policy-and-tc/privacy-policy-and-tc.component.scss b/src/app/manage-learn/shared/components/privacy-policy-and-tc/privacy-policy-and-tc.component.scss
new file mode 100644
index 000000000..df7515e7c
--- /dev/null
+++ b/src/app/manage-learn/shared/components/privacy-policy-and-tc/privacy-policy-and-tc.component.scss
@@ -0,0 +1,168 @@
+@import "../../../../../assets/styles/base/_variables.scss";
+@import "../../../../../assets/styles/_variables.scss";
+@import "../../../../../assets/styles/_custom-mixins.scss";
+
+.cr-terms-checkbox-label{
+  padding-left: 5px;
+}
+
+.cr-terms-checkbox{
+  --background-checked: #{$blue};
+  --border-color: #{$blue};
+  --border-radius: 4px;
+  --border-width: 1px;
+  --border-color-checked:#{$blue};
+}
+.cr-input-primary {
+  display: inline-flex;
+}
+
+.btn-label {
+  float: right;
+  display: inline-flex;
+}
+
+#main-content {
+  overflow-y: scroll;
+  background: map-get($colors, white);
+}
+
+.consent-popover-info {  
+  overflow: hidden;
+  padding: 14px;
+}
+
+.flex-container {
+  width: 100%;
+  height: 100%;
+  
+  display: flex;
+  flex-direction: column;
+}
+
+.header {  
+  flex-grow: 0;
+  flex-shrink: 0;
+  color: #222222;
+  font-family: "Noto Sans", sans-serif;
+  font-size: 20px;
+  letter-spacing: 0;
+  font-weight: bold;
+  margin-bottom: 16px;
+  @include ltr() {
+    text-align: right
+  }
+
+  @include rtl() {
+    text-align:left;
+  }
+}
+
+.body {
+  
+  display: block;
+  
+  flex-grow: 1;
+  flex-shrink: 1;
+  height: 38vh;
+  overflow-y: scroll;
+}
+
+.footer {
+  flex-grow: 0;
+  flex-shrink: 0;
+}
+.save-changes{
+  color: white;
+  background-color: $blue;
+  font-size: 16px;
+  padding: 8px 0;
+  margin-left: 18px;
+  border: 2px solid $blue;
+  width: 45%;
+}
+.save-changes-not-agree{
+  color: $blue !important;
+  background-color: white;
+  font-size: 16px;
+  padding: 8px 0;
+  border: 2px solid $blue;
+  width: 45%;
+  margin-left: 10px;
+}
+.btn-info{
+  padding: 12px;
+  text-align: center;
+}
+
+.profile-info{
+  color: map-get($colors, granite_gray);
+  font-family: "Noto Sans", sans-serif;
+  font-size: 14px;
+  letter-spacing: 0;
+}
+
+
+.profile-info-section{
+  display: grid;
+  grid-template-columns: 100px 227px;
+}
+
+.share-disabled{
+  opacity: 0.5 !important;
+  cursor: default;
+}
+
+.terms-info{
+  color: $blue !important;
+}
+ion-icon {
+  @include ltr {
+    float: right !important;
+  }
+  @include rtl {
+    float: left !important;
+  }
+}
+.sb-popover-header {
+  border-radius: 4px 4px 0 0;
+  background-color: $info-color;
+  &::after {
+    background-image: none;
+  }
+  .sb-popover-toolbar {
+    min-height: 40px;
+    max-height: 40px;
+    background-color: $info-color;
+    border-radius: 4px 4px 0 0;
+    text-align: center;
+    //   @include padding(($base-block-space * 0.5), ($base-block-space * 1));
+    .toolbar-background {
+      border-radius: 4px 4px 0 0;
+      background-color: $info-color;
+    }
+    .sb-popover-close-btn {
+      color: $white-color;
+    }
+    .sb-popover-title {
+      font-size: ($font-size-base) !important;
+      font-weight: bold;
+      //@extend line-height: 19px;
+      text-align: center;
+      color: $white-color;
+      @include padding(0);
+      // @include padding(0, ($base-block-space * 5) ,0,0);
+    }
+  }
+  .sb-modal-close {
+    position: absolute;
+    right: 5px;
+    width: 20px;
+    height: 20px;
+    display: flex;
+    top: -2px;
+    text-align: center;
+    justify-content: center;
+    align-items: center;
+  }
+}
diff --git a/src/app/manage-learn/shared/components/privacy-policy-and-tc/privacy-policy-and-tc.component.ts b/src/app/manage-learn/shared/components/privacy-policy-and-tc/privacy-policy-and-tc.component.ts
new file mode 100644
index 000000000..ece149e3b
--- /dev/null
+++ b/src/app/manage-learn/shared/components/privacy-policy-and-tc/privacy-policy-and-tc.component.ts
@@ -0,0 +1,48 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { PopoverController } from '@ionic/angular';
+import { RouterLinks } from '@app/app/app.constant';
+import { UtilityService } from '@app/services';
+
+@Component({
+  selector: 'app-privacy-policy-and-tc',
+  templateUrl: './privacy-policy-and-tc.component.html',
+  styleUrls: ['./privacy-policy-and-tc.component.scss'],
+})
+export class PrivacyPolicyAndTCComponent implements OnInit {
+  @Input() header;
+  @Input() link;
+  @Input() message;
+  @Input() message1;
+  @Input() linkLabel;
+  @Input() isPrivacyPolicy;
+  isChecked = false;
+  isClicked = false;
+  constructor(
+    private popOverCtrl: PopoverController,
+    private utilityService: UtilityService
+  ) { }
+
+  ngOnInit() { }
+  closePopover() {
+    let data = {
+      isChecked: this.isChecked,
+      isClicked: true
+    }
+    this.popOverCtrl.dismiss(data);
+  }
+  changeEvent(event) {
+    if (event.detail.checked) {
+      this.isChecked = true;
+    } else {
+      this.isChecked = false;
+    }
+  }
+
+  async openTermsOfUse() {
+    const baseUrl = await this.utilityService.getBuildConfigValue('TOU_BASE_URL');
+    const url = baseUrl + RouterLinks.TERM_OF_USE;
+    const options
+      = 'hardwareback=yes,clearcache=no,zoom=no,toolbar=yes,disallowoverscroll=yes';
+    (window as any).cordova.InAppBrowser.open(url, '_blank', options);
+  }
+}
diff --git a/src/app/manage-learn/shared/components/progress-bar/progress-bar.component.html b/src/app/manage-learn/shared/components/progress-bar/progress-bar.component.html
new file mode 100644
index 000000000..3a4133400
--- /dev/null
+++ b/src/app/manage-learn/shared/components/progress-bar/progress-bar.component.html
@@ -0,0 +1,11 @@
+
+<div class="_flex-box _justify-content-center"  [ngClass]="{'padding-top' : showTracker}" style="width: 90px;">
+  <div class="progress-outer inProgress" [ngClass]="{'completed': progress === 100}">
+    <div class="progress-inner _flex-box _justify-content-center" [style.width]="progress + '%'">
+    </div>
+  </div>
+  <div class="_flex-box _justify-content-center textStyle" *ngIf="!showTracker"> {{progress}}%</div>
+</div>
+<div class="_flex-box  _justify-content-center" *ngIf="showTracker">
+  {{completed}} / {{total}}
+</div>
diff --git a/src/app/manage-learn/shared/components/progress-bar/progress-bar.component.scss b/src/app/manage-learn/shared/components/progress-bar/progress-bar.component.scss
new file mode 100644
index 000000000..ee8d03002
--- /dev/null
+++ b/src/app/manage-learn/shared/components/progress-bar/progress-bar.component.scss
@@ -0,0 +1,41 @@
+@import "src/assets/styles/base/_variables.scss";
+@import "src/assets/styles/_custom-mixins.scss";
+@import "src/assets/styles/_variables.scss";
+
+.progress-outer {
+    flex: 1;
+    text-align: center;
+    color: $white;
+}
+
+.progress-inner {
+    min-height: 12px;
+    white-space: nowrap;
+    overflow: hidden;
+    // border-radius: 5px;
+}
+
+.completed {
+    border: 1px solid map-get($colors, secondary) !important;
+
+    div {
+        background-color: map-get($colors, secondary) !important;
+    }
+}
+
+.inProgress {
+    border: 1px solid $orange;
+    border-radius: 5px;
+    div {
+        background-color: $orange;
+    }
+}
+
+.textStyle {
+    font-size: 10px;
+    font-weight: 500;
+    margin-left: 5px;
+}
+.padding-top {
+    padding-top:12px; 
+}
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/progress-bar/progress-bar.component.ts b/src/app/manage-learn/shared/components/progress-bar/progress-bar.component.ts
new file mode 100644
index 000000000..1ce4db51c
--- /dev/null
+++ b/src/app/manage-learn/shared/components/progress-bar/progress-bar.component.ts
@@ -0,0 +1,19 @@
+import { Component, OnInit, Input } from '@angular/core';
+
+@Component({
+  selector: 'progress-bar',
+  templateUrl: './progress-bar.component.html',
+  styleUrls: ['./progress-bar.component.scss'],
+})
+export class ProgressBarComponent implements OnInit {
+
+  @Input() progress = 0;
+  @Input()total = 0;
+  @Input()completed = 0;
+  @Input() showTracker ;
+
+  constructor() { }
+
+  ngOnInit() {}
+
+}
diff --git a/src/app/manage-learn/shared/components/question-heading/question-heading.component.html b/src/app/manage-learn/shared/components/question-heading/question-heading.component.html
new file mode 100644
index 000000000..a1b40de67
--- /dev/null
+++ b/src/app/manage-learn/shared/components/question-heading/question-heading.component.html
@@ -0,0 +1,19 @@
+<div class="flexbox">
+  <div class="noWrap" *ngIf="data?.questionNumber">{{data?.questionNumber}} .</div>
+  <div style="flex: 1;" class="_flex-direction-column ion-padding-start">
+    <div *ngFor="let question of data.question;let first = first">
+      <div class=" _flex-box  _justify-content-space-between">
+        <div class="wrapText">{{question}}</div>
+      </div>
+    </div>
+
+  </div>
+  <div *ngIf="data?.hint">
+    <ion-icon name="bulb" class="noWrap ion-margin-start help" (click)="openHint(data?.hint)"></ion-icon>
+    <!-- <ion-icon *ngIf="!play"  class="noWrap ion-margin-start" name="volume-off"
+      (click)="playQuestion(data.question[0],data.options,data.responseType)"></ion-icon>
+    <ion-icon *ngIf="play" class="noWrap ion-margin-start" name="volume-up" (click)="pauseQuestion()">
+    </ion-icon> -->
+  </div>
+
+</div>
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/question-heading/question-heading.component.scss b/src/app/manage-learn/shared/components/question-heading/question-heading.component.scss
new file mode 100644
index 000000000..b839ed948
--- /dev/null
+++ b/src/app/manage-learn/shared/components/question-heading/question-heading.component.scss
@@ -0,0 +1,19 @@
+.flexbox {
+    display: flex;
+    align-items: baseline;
+    flex-wrap: nowrap;
+}
+
+.noWrap {
+    white-space: nowrap;
+    text-align: justify;
+}
+
+.wrapText {
+    white-space: wrap;
+}
+
+.help {
+    font-size: 30px;
+    color: grey;
+  }
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/question-heading/question-heading.component.ts b/src/app/manage-learn/shared/components/question-heading/question-heading.component.ts
new file mode 100644
index 000000000..3f4e94133
--- /dev/null
+++ b/src/app/manage-learn/shared/components/question-heading/question-heading.component.ts
@@ -0,0 +1,76 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { Events } from '@app/util/events';
+import { ModalController } from '@ionic/angular';
+import { HintComponent } from '../hint/hint.component';
+
+@Component({
+  selector: 'app-question-heading',
+  templateUrl: './question-heading.component.html',
+  styleUrls: ['./question-heading.component.scss'],
+})
+export class QuestionHeadingComponent implements OnInit {
+
+  text: string;
+  @Input() data;
+  @Input() inputIndex;
+  @Input() enableQuestionReadOut: boolean;
+  showQuestionNumber = false;
+  play = false;
+
+  
+  constructor(private events: Events, private modalCtrl: ModalController) {
+    this.events.subscribe('speech', data => {
+      this.play = false;
+    })
+  }
+
+  ngOnInit() { }
+
+  playQuestion(question, options, type) {
+    this.play = true;
+    // this.textToSpeech.speechFromText({text:question}).then(success =>{
+
+    //   let url = options.length > 0 ?   this.addOptionsToUrl(options , type) :
+    //   this.play = false;
+    //   }).catch(error =>{
+
+    //     console.log(JSON.stringify(error));
+    //   });
+  }
+  addOptionsToUrl(options, type: string) {
+    // let url = type === 'multiSelect' ? 'you can select multiple options ' : 'select one option form following ';
+    // this.textToSpeech.speechFromText({ text: url }).then(async success => {
+    //   // options.forEach( async (option,optionIndex) =>{
+    //   for (let i = 0; i < options.length; i++) {
+    //     let url = 'option ' + (i + 1) + options[i]['label'];
+    //     await this.textToSpeech.speechFromText({ text: url }).then(success => {
+    //     }).catch(
+    //       error => {
+    //         this.play = false;
+    //       }
+    //     );
+    //   }
+    //   this.play = false;
+    // }).catch(error => {
+    //   this.play = false;
+    //   console.log(JSON.stringify(error));
+    // });
+  }
+
+  pauseQuestion() {
+    // this.textToSpeech.stopSpeech();
+    // this.play = false;
+
+  }
+
+  async openHint(hint) {
+    let hintModal = await this.modalCtrl.create({
+      component: HintComponent,
+      componentProps: {
+        hint,
+      },
+    });
+    hintModal.present();
+  }
+
+}
diff --git a/src/app/manage-learn/shared/components/radio-type-input/radio-type-input.component.html b/src/app/manage-learn/shared/components/radio-type-input/radio-type-input.component.html
new file mode 100644
index 000000000..269818f74
--- /dev/null
+++ b/src/app/manage-learn/shared/components/radio-type-input/radio-type-input.component.html
@@ -0,0 +1,36 @@
+<ion-card class="_cardBg ion-padding">
+  <ion-col class="_flex-box _justify-content-center _flex-direction-column">
+    <h4 [ngClass]="{ _validQuestion: data?.value }" class="flexbox">
+      <app-question-heading [inputIndex]="inputIndex" [data]="data" [enableQuestionReadOut]="enableQuestionReadOut">
+      </app-question-heading>
+    </h4>
+  </ion-col>
+  <div class="_tip _flex-box">{{ data?.tip }}</div>
+
+  <ion-list class="ion-margin-top ion-text-wrap">
+    <ion-radio-group [(ngModel)]="data.value" (ngModelChange)="checkForValidation()">
+      <ion-item *ngFor="let option of data?.options" class="ds-item">
+        <ion-icon name="bulb" class="help" (click)="openHint(option?.hint)" *ngIf="option?.hint"></ion-icon>
+        <ion-label class="_flex-box label ion-text-wrap ds-m0">
+          <div style="flex: 1" [ngStyle]="{ 'margin-left': option?.hint ? '35px' : '0px' }" class="ds-m0">
+            {{ option?.label }}
+          </div>
+        </ion-label>
+        <ion-radio
+          value="{{ option?.value }}"
+          [disabled]="data.isEditable != undefined && !data.isEditable"
+          class="ds-m0"
+        ></ion-radio>
+      </ion-item>
+    </ion-radio-group>
+  </ion-list>
+  <app-remarks *ngIf="data?.showRemarks" [data]="data"></app-remarks>
+  <image-upload
+    [submissionId]="submissionId"
+    [data]="data"
+    [generalQuestion]="generalQuestion"
+    [imageLocalCopyId]="imageLocalCopyId"
+    [evidenceId]="evidenceId"
+    [schoolId]="schoolId"
+  ></image-upload>
+</ion-card>
diff --git a/src/app/manage-learn/shared/components/radio-type-input/radio-type-input.component.scss b/src/app/manage-learn/shared/components/radio-type-input/radio-type-input.component.scss
new file mode 100644
index 000000000..ad6ba8094
--- /dev/null
+++ b/src/app/manage-learn/shared/components/radio-type-input/radio-type-input.component.scss
@@ -0,0 +1,11 @@
+.help {
+  font-size: 30px;
+  z-index: 557;
+  margin-right: 15px;
+  position: absolute;
+  color: grey;
+}
+
+.label {
+  justify-content: flex-start;
+}
diff --git a/src/app/manage-learn/shared/components/radio-type-input/radio-type-input.component.ts b/src/app/manage-learn/shared/components/radio-type-input/radio-type-input.component.ts
new file mode 100644
index 000000000..c181b415d
--- /dev/null
+++ b/src/app/manage-learn/shared/components/radio-type-input/radio-type-input.component.ts
@@ -0,0 +1,85 @@
+import { Component, Input, EventEmitter, Output, OnInit } from '@angular/core';
+import { UtilsService } from '@app/app/manage-learn/core';
+import { ModalController } from '@ionic/angular';
+import { HintComponent } from '../hint/hint.component';
+
+@Component({
+  selector: 'app-radio-type-input',
+  templateUrl: './radio-type-input.component.html',
+  styleUrls: ['./radio-type-input.component.scss'],
+})
+export class RadioTypeInputComponent implements OnInit {
+  @Input() inputIndex ;
+  @Input() data:any;
+  @Input() isLast: boolean;
+  @Input() isFirst: boolean;
+  @Output() nextCallBack = new EventEmitter();
+  @Output() previousCallBack = new EventEmitter()
+  @Input() evidenceId: string;
+  @Input() hideButton: boolean;
+  @Input() schoolId: string;
+  @Input() imageLocalCopyId: string;
+  @Input() generalQuestion: boolean;
+  @Input() submissionId: any;
+  @Input() enableQuestionReadOut: boolean;
+
+  color: string = 'light';
+  isComplete: boolean;
+
+  constructor(
+    private utils: UtilsService, 
+    private modalCtrl:ModalController
+    // private hintService: HintProvider
+    ) {
+
+
+  }
+
+  ngOnInit() {
+    this.data.startTime = this.data.startTime ? this.data.startTime : Date.now();
+    if(!this.data.validation.required) {
+      this.data.isCompleted = true;
+    }
+    
+
+  }
+
+  updateData(event){
+    // this.data ={}
+    // this.data = Object.assign({}, this.data)
+    this.data.fileName = [...this.data.fileName]
+  }
+  next(status?:any) {
+    this.data.isCompleted = this.utils.isQuestionComplete(this.data);
+    this.nextCallBack.emit(status);
+  }
+
+  back() {
+    this.data.isCompleted = this.utils.isQuestionComplete(this.data);
+    this.previousCallBack.emit();
+  }
+
+  checkForValidation(): void {
+    this.data.isCompleted = this.utils.isQuestionComplete(this.data);
+    this.data.endTime = this.data.isCompleted ? Date.now() : "";
+  }
+
+  async openHint(hint){
+    // this.utils.presentHintModal({hint: hint});
+    let hintModal = await this.modalCtrl.create({
+      component: HintComponent,
+      componentProps: {
+        hint,
+      },
+    });
+    // await hintModal.onDidDismiss(data => {
+    // });
+    hintModal.present();
+  
+  }
+
+  checkForCompletion() {
+    
+  }
+
+}
diff --git a/src/app/manage-learn/shared/components/remarks/remarks.component.html b/src/app/manage-learn/shared/components/remarks/remarks.component.html
new file mode 100644
index 000000000..33707c632
--- /dev/null
+++ b/src/app/manage-learn/shared/components/remarks/remarks.component.html
@@ -0,0 +1,17 @@
+<!-- Generated template for the RemarksComponent component -->
+<div class="ion-margin-top ion-margin-bottom">
+  <h4 class="_flex-box justify-content">
+    <div style="flex:1">{{'FRMELEMENTS_LBL_REMARKS'|translate}}</div>
+    <button class="btn-block px-10 sb-bg-color-primary"  *ngIf="!data.remarks" (click)="openUpdateRemarks()">
+      {{'FRMELEMENTS_BTN_ADD'|translate}}
+    </button>
+    <button class="btn-block px-10 sb-bg-color-primary" *ngIf="data.remarks" (click)="data.remarks = ''">
+      {{'FRMELEMNTS_BTN_DELETE'|translate}}
+    </button>
+  </h4>
+  <ion-item *ngIf="data.remarks" (click)="openUpdateRemarks()">
+    <ion-label>{{data.remarks}}</ion-label>
+    <ion-icon name="create" slot="end"></ion-icon>
+    <!-- <ion-textarea [(ngModel)]="data.remarks" placeholder="Remarks"></ion-textarea> -->
+  </ion-item>
+</div>
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/remarks/remarks.component.scss b/src/app/manage-learn/shared/components/remarks/remarks.component.scss
new file mode 100644
index 000000000..9815a3b48
--- /dev/null
+++ b/src/app/manage-learn/shared/components/remarks/remarks.component.scss
@@ -0,0 +1,3 @@
+button {
+  height: 1.5em;
+}
diff --git a/src/app/manage-learn/shared/components/remarks/remarks.component.ts b/src/app/manage-learn/shared/components/remarks/remarks.component.ts
new file mode 100644
index 000000000..9fffcb636
--- /dev/null
+++ b/src/app/manage-learn/shared/components/remarks/remarks.component.ts
@@ -0,0 +1,36 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { RemarksModalComponent } from '@app/app/manage-learn/questionnaire/remarks-modal/remarks-modal.component';
+import { ModalController } from '@ionic/angular';
+
+@Component({
+  selector: 'app-remarks',
+  templateUrl: './remarks.component.html',
+  styleUrls: ['./remarks.component.scss'],
+})
+export class RemarksComponent implements OnInit {
+
+  @Input() data: any;
+
+  constructor(private modal: ModalController) { }
+
+  ngOnInit() { }
+
+  async openUpdateRemarks() {
+    const remarks = await this.modal.create({
+      component: RemarksModalComponent,
+      componentProps: { data: JSON.parse(JSON.stringify(this.data)) }
+    });
+    // remarks.onDidDismiss(updatedRemark => {
+    // if (updatedRemark) {
+    //   this.data.remarks = updatedRemark;
+    // }
+    // })
+    await remarks.present();
+    const { data } = await remarks.onDidDismiss();
+    if (data) {
+      this.data.remarks = data;
+    }
+
+  }
+
+}
diff --git a/src/app/manage-learn/shared/components/report-modal-filter/report.modal.filter.html b/src/app/manage-learn/shared/components/report-modal-filter/report.modal.filter.html
new file mode 100644
index 000000000..06b36f3b5
--- /dev/null
+++ b/src/app/manage-learn/shared/components/report-modal-filter/report.modal.filter.html
@@ -0,0 +1,38 @@
+<ion-content padding>
+  <div>
+    <h3 class="heading" *ngIf="dataType == 'question'">{{ 'FRMELEMENTS_MSG_QUESTION_FILTER' | translate }}</h3>
+    <h3 class="heading" *ngIf="dataType == 'criteria'">{{ 'FRMELEMENTS_MSG_CRITERIA_FILTER' | translate }}</h3>
+  </div>
+
+  <!-- <ion-list text-wrap>
+    <ion-item *ngFor="let question of allQuestions" (click)="onQuestionClick(question?.questionExternalId)">
+      <ion-label>{{ question?.questionName }}</ion-label>
+      <ion-checkbox
+        [checked]="filteredQuestions?.includes(question?.questionExternalId)"
+      ></ion-checkbox>
+    </ion-item>
+  </ion-list> -->
+  <ion-list >
+    <ion-item *ngFor="let d of data" (click)="onQuestionClick(d?._id)">
+      <ion-label class="wrap">{{ d?.name }}</ion-label>
+      <ion-checkbox [checked]="filteredData?.includes(d?._id)"></ion-checkbox>
+    </ion-item>
+  </ion-list>
+</ion-content>
+
+<ion-footer no-shadow>
+  <ion-toolbar class="_toolbar-background-md" position="bottom">
+    <ion-row>
+      <ion-col>
+        <ion-button ion-button full (click)="close()" class="btnText w-100">
+          {{ 'CANCEL' | translate }}
+        </ion-button>
+      </ion-col>
+      <ion-col>
+        <ion-button ion-button full (click)="applyFilter()" class="btnText w-100">
+          {{ 'APPLY_FILTER' | translate }}
+        </ion-button>
+      </ion-col>
+    </ion-row>
+  </ion-toolbar>
+</ion-footer>
diff --git a/src/app/manage-learn/shared/components/report-modal-filter/report.modal.filter.scss b/src/app/manage-learn/shared/components/report-modal-filter/report.modal.filter.scss
new file mode 100644
index 000000000..2dfe6fab7
--- /dev/null
+++ b/src/app/manage-learn/shared/components/report-modal-filter/report.modal.filter.scss
@@ -0,0 +1,3 @@
+.wrap {
+  white-space: normal !important;
+}
diff --git a/src/app/manage-learn/shared/components/report-modal-filter/report.modal.filter.ts b/src/app/manage-learn/shared/components/report-modal-filter/report.modal.filter.ts
new file mode 100644
index 000000000..8b283e8a3
--- /dev/null
+++ b/src/app/manage-learn/shared/components/report-modal-filter/report.modal.filter.ts
@@ -0,0 +1,84 @@
+import { Component, OnInit } from '@angular/core';
+import { ToastService } from '@app/app/manage-learn/core';
+import { CommonUtilService, UtilityService } from '@app/services';
+import { ModalController, NavController, NavParams } from '@ionic/angular';
+
+@Component({
+  selector: 'report-modal-filter',
+  templateUrl: './report.modal.filter.html',
+  styleUrls: ['./report.modal.filter.scss'],
+})
+export class ReportModalFilter implements OnInit {
+  filteredData: any;
+  data: any;
+  dataType: any;
+  // allQuestions;
+  // filteredQuestions;
+
+  constructor(
+    public navCtrl: NavController,
+    public navParams: NavParams,
+    // private viewCntrl: ViewController,
+    private utils: UtilityService,
+    private toast: ToastService,
+    private modalCtrl: ModalController,
+    private commonUtilService: CommonUtilService,
+
+  ) {}
+
+  ngOnInit() {
+    // this.allQuestions = this.navParams.get('allQuestions');
+    // this.filteredQuestions = this.navParams.get('filteredQuestions');
+    this.data = this.navParams.get('data');
+    this.filteredData = this.navParams.get('filteredData');
+    this.dataType = this.navParams.get('dataType');
+  }
+
+  /*  onQuestionClick(externalId) {
+    if (this.filteredQuestions.includes(externalId)) {
+      const indexOfQuestion = this.filteredQuestions.indexOf(externalId);
+      this.filteredQuestions.splice(indexOfQuestion, 1);
+    } else {
+      this.filteredQuestions.push(externalId);
+    }
+    console.log(JSON.stringify(this.filteredQuestions));
+  }
+   */
+  onQuestionClick(id) {
+    if (this.filteredData.includes(id)) {
+      const indexOfQuestion = this.filteredData.indexOf(id);
+      this.filteredData.splice(indexOfQuestion, 1);
+    } else {
+      this.filteredData.push(id);
+    }
+    console.log(JSON.stringify(this.filteredData));
+  }
+
+  applyFilter() {
+    let msg = this.commonUtilService.translateMessage('FRMELEMENTS_MSG_SELECT_AT_LEAST_ONE_QUESTION');
+    if (this.dataType == 'criteria') {
+      msg = this.commonUtilService.translateMessage('FRMELEMENTS_MSG_SELECT_AT_LEAST_ONE_CRITERIA');
+    }
+    !this.filteredData.length
+      ? this.toast.openToast(msg)
+      : // : this.viewCntrl.dismiss({
+        this.modalCtrl.dismiss({
+          filter: this.filteredData,
+          action: 'updated',
+        });
+  }
+  /* applyFilter() {
+    !this.filteredQuestions.length
+      ? this.toast.openToast('Select at least one question')
+      : // : this.viewCntrl.dismiss({
+        this.modalCtrl.dismiss({
+          filter: this.filteredQuestions,
+          action: 'updated',
+        });
+  }
+ */
+  close() {
+    // this.viewCntrl.dismiss({ action: "cancelled" }); TODO:remove after checking,viewCtrl is not available in i3
+    this.modalCtrl.dismiss('cancel');
+  }
+}
diff --git a/src/app/manage-learn/shared/components/reports-text/reports-text.component.html b/src/app/manage-learn/shared/components/reports-text/reports-text.component.html
new file mode 100644
index 000000000..536b3f1ad
--- /dev/null
+++ b/src/app/manage-learn/shared/components/reports-text/reports-text.component.html
@@ -0,0 +1,16 @@
+<ion-item-group class="text-container" text-wrap>
+  <ion-item-divider color="light">
+    <h4 *ngIf="questionNumber">{{ questionNumber+' )'}} {{data?.question}}</h4>
+    <h4 *ngIf="!questionNumber">Responses</h4>
+  </ion-item-divider>
+  <ion-item *ngFor="let answer of data?.answers"> {{ (data?.resposeType === 'date' && answer) ? (answer|
+    date:'medium':'IST') : answer}}</ion-item>
+
+  <!-- to show all answer in feedback survey report -->
+  <div *ngIf="isFeedBackSurvey">
+    <ion-col *ngIf="data?.count>10&& data?.answers?.length<data?.count">
+      <small padding class="pull-right sb-color-red-400" (click)="getAllResponse(data)">{{'FRMELEMNTS_BTN_VIEW_ALL_RESPONSES' |
+        translate}}</small>
+    </ion-col>
+  </div>
+</ion-item-group>
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/reports-text/reports-text.component.scss b/src/app/manage-learn/shared/components/reports-text/reports-text.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/shared/components/reports-text/reports-text.component.ts b/src/app/manage-learn/shared/components/reports-text/reports-text.component.ts
new file mode 100644
index 000000000..bc118850a
--- /dev/null
+++ b/src/app/manage-learn/shared/components/reports-text/reports-text.component.ts
@@ -0,0 +1,34 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { SurveyProviderService } from '@app/app/manage-learn/core/services/survey-provider.service';
+
+@Component({
+  selector: 'reports-text',
+  templateUrl: './reports-text.component.html',
+  styleUrls: ['./reports-text.component.scss'],
+})
+export class ReportsTextComponent implements OnInit {
+  @Input() data;
+  @Input() questionNumber;
+  @Input() isFeedBackSurvey;
+  @Input() solutionId;
+  completedDate: any; // for pagination purpose in survey answers if more then 10 ans
+  constructor(private surveyProvider:SurveyProviderService) {}
+
+  ngOnInit() {
+    this.completedDate = this.data.completedDate;
+  }
+
+  getAllResponse() {
+    let questionExternalId = this.data.order;
+    let completedDate = this.completedDate;
+    let solutionId = this.solutionId;
+    let Obj = { questionExternalId, completedDate, solutionId };
+    this.surveyProvider
+      .viewAllAns(Obj)
+      .then((res: any) => {
+        this.data.answers = [...this.data.answers, ...res.answers];
+        this.completedDate = res.completedDate ? res.completedDate : this.completedDate;
+      })
+      .catch();
+  }
+}
diff --git a/src/app/manage-learn/shared/components/scatter-chart/scatter-chart.component.html b/src/app/manage-learn/shared/components/scatter-chart/scatter-chart.component.html
new file mode 100644
index 000000000..30880fac3
--- /dev/null
+++ b/src/app/manage-learn/shared/components/scatter-chart/scatter-chart.component.html
@@ -0,0 +1,24 @@
+<div *ngIf="chartObj">
+  <div class="heading" *ngIf="data?.question">
+    <h4>{{ questionNumber }}) {{ data?.question }}</h4>
+  </div>
+  <div *ngIf="data?.schoolName">
+    <h4 style="padding: 10px">{{ questionNumber }}. {{ data?.schoolName }}</h4>
+  </div>
+  <!-- <highcharts-chart
+    [(update)]="updateFlag"
+    [Highcharts]="Highcharts"
+    [options]="chartObj"
+    class="chart-setup"
+    [constructorType]="chartConstructor"
+    [oneToOne]="oneToOneFlag"
+    [runOutsideAngular]="runOutsideAngularFlag"
+    *ngIf="data?.chart?.data"
+  >
+  </highcharts-chart> -->
+  <div *ngIf="data?.chart?.data">
+    <div id="{{ 'container' + questionNumber }}"></div>
+  </div>
+
+  <div class="errorMsg" *ngIf="!data?.chart?.data">No data found</div>
+</div>
diff --git a/src/app/manage-learn/shared/components/scatter-chart/scatter-chart.component.scss b/src/app/manage-learn/shared/components/scatter-chart/scatter-chart.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/shared/components/scatter-chart/scatter-chart.component.ts b/src/app/manage-learn/shared/components/scatter-chart/scatter-chart.component.ts
new file mode 100644
index 000000000..5bd128206
--- /dev/null
+++ b/src/app/manage-learn/shared/components/scatter-chart/scatter-chart.component.ts
@@ -0,0 +1,61 @@
+import { Component, Input, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'scatter-chart',
+  templateUrl: './scatter-chart.component.html',
+  styleUrls: ['./scatter-chart.component.scss'],
+})
+export class ScatterChartComponent implements OnInit {
+  @Input() data;
+  @Input() questionNumber;
+  // Highcharts = Highcharts; // required
+  chartConstructor = 'chart'; // optional string, defaults to 'chart'
+  updateFlag = false; // optional boolean
+  oneToOneFlag = true; // optional boolean, defaults to false
+  runOutsideAngular = false;
+  chartObj;
+
+  constructor() {}
+
+  ngOnInit() {
+    if (this.data && this.data.chart && this.data.chart.data) {
+      for (const outer of this.data.chart.data) {
+        for (const inner of outer.data) {
+          inner.y = parseInt(inner.y);
+        }
+      }
+    }
+
+    this.chartObj = {
+      chart: {
+        plotBackgroundColor: null,
+        plotBorderWidth: null,
+        plotShadow: false,
+        type: 'scatter',
+      },
+      xAxis: this.data.chart.xAxis,
+      yAxis: this.data.chart.yAxis,
+      title: {
+        text: ' ',
+      },
+      tooltip: {
+        // pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
+      },
+      plotOptions: {
+        scatter: {
+          lineWidth: 2,
+        },
+      },
+      credits: {
+        enabled: false,
+      },
+      legend: {
+        enabled: false,
+      },
+      series: this.data ? this.data.chart.data : null,
+    };
+    setTimeout(() => {
+      // Highcharts.chart('container' + this.questionNumber, this.chartObj);
+    }, 1000);
+  }
+}
diff --git a/src/app/manage-learn/shared/components/scrore-report-menus/scrore-report-menus.component.html b/src/app/manage-learn/shared/components/scrore-report-menus/scrore-report-menus.component.html
new file mode 100644
index 000000000..d810b6064
--- /dev/null
+++ b/src/app/manage-learn/shared/components/scrore-report-menus/scrore-report-menus.component.html
@@ -0,0 +1,24 @@
+<ion-list class="wrapper">
+  <ion-button
+    fill="clear"
+    ion-item
+    clear
+    small
+    padding-left
+    class="_flex-box _justify-content-center"
+    (click)="navigateToScoreReport()"
+  >
+    {{ 'FRMELEMNTS_BTN_REPORT_WITH_SCORE' | translate }}
+  </ion-button>
+  <ion-button
+    fill="clear"
+    ion-item
+    clear
+    small
+    padding-left
+    class="_flex-box _justify-content-center"
+    (click)="navigateToWithoutScoreReport()"
+  >
+    {{ 'FRMELEMNTS_BTN_REPORT_WITHOUT_SCORE' | translate }}
+  </ion-button>
+</ion-list>
diff --git a/src/app/manage-learn/shared/components/scrore-report-menus/scrore-report-menus.component.scss b/src/app/manage-learn/shared/components/scrore-report-menus/scrore-report-menus.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/shared/components/scrore-report-menus/scrore-report-menus.component.ts b/src/app/manage-learn/shared/components/scrore-report-menus/scrore-report-menus.component.ts
new file mode 100644
index 000000000..ad42ee413
--- /dev/null
+++ b/src/app/manage-learn/shared/components/scrore-report-menus/scrore-report-menus.component.ts
@@ -0,0 +1,183 @@
+import { Component, OnInit } from '@angular/core';
+import { Router, RouterLink } from '@angular/router';
+import { RouterLinks } from '@app/app/app.constant';
+import { NavParams, NavController, PopoverController } from '@ionic/angular';
+
+@Component({
+  selector: 'app-scrore-report-menus',
+  templateUrl: './scrore-report-menus.component.html',
+  styleUrls: ['./scrore-report-menus.component.scss'],
+})
+export class ScroreReportMenusComponent implements OnInit {
+  submission;
+  navigateToobservationReport: boolean = false;
+  showEntityActionsheet;
+  showActionsheet;
+  submissionList;
+  showSubmissionAction;
+  observationDetail;
+  observationId;
+  observationReport;
+  entityType: any;
+  entityId: any;
+  constructor(
+    public navParams: NavParams,
+    public navCtrl: NavController,
+    public router: Router,
+    private popover: PopoverController
+  ) {
+    this.submission = this.navParams.get('submission');
+    this.entityId = this.navParams.get('entityId');
+    this.observationId = this.navParams.get('observationId');
+    this.observationReport = this.navParams.get('observationReport');
+    this.navigateToobservationReport = this.navParams.get('navigateToobservationReport');
+    this.observationDetail = this.navParams.get('observationDetail');
+    this.entityType = this.navParams.get('entityType');
+  }
+
+  ngOnInit() {}
+
+  viewObservationReportsWithoutScore() {
+    this.popover.dismiss();
+    this.router.navigate([RouterLinks.OBSERVATION_REPORTS], {
+      queryParams: {
+        observationId: this.observationDetail.observationId,
+        entityType: this.entityType,
+      },
+    });
+  }
+
+  viewObservationReportWithScore() {
+    this.popover.dismiss();
+    this.router.navigate([RouterLinks.REPORT_WITH_SCORE], {
+      queryParams: {
+        observationId: this.observationDetail.observationId,
+        entityType: this.entityType,
+      },
+    });
+  }
+
+  submissionReportWithScore() {
+    this.popover.dismiss();
+    this.showActionsheet = false;
+    // this.router.navigate([RouterLinks.REPORT_WITH_SCORE], {
+    //   queryParams: {
+    //     submissionId: this.submission._id || this.submission.submissionId,
+    //     entityType: this.entityType,
+    //   },
+    // });
+    this.router.navigate([RouterLinks.GENERIC_REPORT], {
+      state: {
+        scores: true,
+        observation: true,
+        criteriaWise: false,
+        pdf: false,
+        submissionId: this.submission._id,
+        entityType: this.entityType,
+        filter: { questionId: [] },
+      },
+    });
+  }
+  submissionReport() {
+    this.popover.dismiss();
+    this.showActionsheet = false;
+    // this.router.navigate([RouterLinks.OBSERVATION_REPORTS], {
+    //   queryParams: {
+    //     submissionId: this.submission._id || this.submission.submissionId,
+    //     entityType: this.entityType,
+    //   },
+    // });
+
+    this.router.navigate([RouterLinks.GENERIC_REPORT], {
+      state: {
+        // scores: true,
+        // observation: true,
+        // pdf: false,
+        // entityId: this.submission.entityId,
+        // entityType: this.submission.entityType,
+        // observationId: this.submission.observationId,
+        scores: false,
+        observation: true,
+        criteriaWise: false,
+        pdf: false,
+        submissionId: this.submission._id,
+        entityType: this.entityType,
+
+        filter: { questionId: [] },
+      },
+    });
+  }
+
+  viewEntityReportsWithScore() {
+    this.popover.dismiss();
+    // this.router.navigate([RouterLinks.REPORT_WITH_SCORE], {
+    //   queryParams: {
+    //     entityId: this.entityId,
+    //     observationId: this.observationId,
+    //     entityType: this.entityType,
+    //   },
+    // });
+
+    this.router.navigate([RouterLinks.GENERIC_REPORT], {
+      state: {
+        scores: true,
+        observation: true,
+        criteriaWise: false,
+        pdf: false,
+        entityId: this.entityId,
+        entityType: this.entityType,
+        observationId: this.observationId,
+        filter: { questionId: [] },
+      },
+    });
+  }
+
+  viewEntityReports() {
+    this.popover.dismiss();
+    this.showEntityActionsheet = false;
+    this.showActionsheet = false;
+    /*  this.router.navigate([RouterLinks.OBSERVATION_REPORTS], {
+      queryParams: {
+        entityId: this.entity,
+        observationId: this.observationId,
+        entityType: this.entityType,
+      },
+    }); */
+
+    this.router.navigate([RouterLinks.GENERIC_REPORT], {
+      state: {
+        // entityId: this.entity,
+        // observationId: this.observationId,
+        // entityType: this.entityType,
+        scores: false,
+        observation: true,
+        criteriaWise: false,
+        pdf: false,
+        entityId: this.entityId,
+        entityType: this.entityType,
+        observationId: this.observationId,
+        filter: { questionId: [] },
+      },
+    });
+  }
+  // navigate to score report
+  public navigateToScoreReport() {
+    if (this.entityId) {
+      this.viewEntityReportsWithScore();
+    } else if (this.submission) {
+      this.submissionReportWithScore();
+    } else if (this.navigateToobservationReport && this.observationDetail) {
+      this.viewObservationReportWithScore();
+    }
+  }
+  // navigate to without score report
+  public navigateToWithoutScoreReport() {
+    if (this.entityId) {
+      this.viewEntityReports();
+    } else if (this.submission) {
+      this.submissionReport();
+    } else if (this.observationDetail) {
+      this.viewObservationReportsWithoutScore();
+    }
+  }
+}
diff --git a/src/app/manage-learn/shared/components/slider-type-input/slider-type-input.component.html b/src/app/manage-learn/shared/components/slider-type-input/slider-type-input.component.html
new file mode 100644
index 000000000..2830db808
--- /dev/null
+++ b/src/app/manage-learn/shared/components/slider-type-input/slider-type-input.component.html
@@ -0,0 +1,26 @@
+<ion-card class="_cardBg ion-padding">
+  <ion-col class="_flex-box _justify-content-center _flex-direction-column">
+    <h4 [ngClass]="{'_validQuestion': data?.value}" class="flexbox">
+      <app-question-heading [inputIndex]="inputIndex" [data]="data" [enableQuestionReadOut]="enableQuestionReadOut">
+      </app-question-heading>
+    </h4>
+  </ion-col>
+  <div class="_tip _flex-box">{{data?.tip}}</div>
+  <div class="_flex-box _justify-content-center _full-width ion-margin-top">
+    <span class="valueBox _flex-box _justify-content-center">{{data?.value}}</span>
+  </div>
+  <div class="ion-margin-top">
+    <ion-item>
+      <ion-range [(ngModel)]="data.value" pin="true" step="1" (ngModelChange)="checkForValidation()" snaps="true"
+        [min]="data?.validation.min" [max]="data?.validation.max"
+        [disabled]="data.isEditable!=undefined && !data.isEditable">
+        <ion-label range-left>{{data?.validation.min}}</ion-label>
+        <ion-label range-right>{{data?.validation.max}}</ion-label>
+      </ion-range>
+    </ion-item>
+
+    <app-remarks *ngIf="data?.showRemarks" [data]="data"></app-remarks>
+    <app-image-upload [data]="data" [generalQuestion]="generalQuestion" [imageLocalCopyId]="imageLocalCopyId"
+      [evidenceId]="evidenceId" [submissionId]="submissionId"></app-image-upload>
+  </div>
+</ion-card>
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/slider-type-input/slider-type-input.component.scss b/src/app/manage-learn/shared/components/slider-type-input/slider-type-input.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/shared/components/slider-type-input/slider-type-input.component.ts b/src/app/manage-learn/shared/components/slider-type-input/slider-type-input.component.ts
new file mode 100644
index 000000000..5e2b185e9
--- /dev/null
+++ b/src/app/manage-learn/shared/components/slider-type-input/slider-type-input.component.ts
@@ -0,0 +1,46 @@
+import { Component, Input, EventEmitter, Output, OnInit } from '@angular/core';
+import { UtilsService } from '@app/app/manage-learn/core';
+
+@Component({
+  selector: 'app-slider-type-input',
+  templateUrl: './slider-type-input.component.html',
+  styleUrls: ['./slider-type-input.component.scss'],
+})
+export class SliderTypeInputComponent implements OnInit {
+
+
+  @Input() data: any;
+  @Input() isLast: boolean;
+  @Input() isFirst: boolean;
+  @Output() nextCallBack = new EventEmitter();
+  @Output() previousCallBack = new EventEmitter()
+  @Input() evidenceId: string;
+  @Input() hideButton: boolean;
+  @Input() schoolId: string;
+  @Input() imageLocalCopyId: string;
+  @Input() generalQuestion: boolean;
+  @Input() submissionId: any;
+  @Input() inputIndex;
+  @Input() enableQuestionReadOut: boolean;
+  color: string = 'light';
+  isComplete: boolean;
+
+  constructor(private utils: UtilsService) {
+  }
+
+  ngOnInit() {
+    this.data.startTime = this.data.startTime ? this.data.startTime : Date.now();
+    this.data.value = this.data.value !== "" ? this.data.value : this.data.validation.min;
+    if (!this.data.validation.required) {
+      this.data.isCompleted = true;
+    }
+    this.checkForValidation();
+  }
+
+  checkForValidation(): void {
+    this.data.isCompleted = this.utils.isQuestionComplete(this.data);
+    this.data.endTime = this.data.isCompleted ? Date.now() : "";
+  }
+
+
+}
diff --git a/src/app/manage-learn/shared/components/submission-actions/submission-actions.component.html b/src/app/manage-learn/shared/components/submission-actions/submission-actions.component.html
new file mode 100644
index 000000000..2e3990799
--- /dev/null
+++ b/src/app/manage-learn/shared/components/submission-actions/submission-actions.component.html
@@ -0,0 +1,11 @@
+<ion-list class="d-flex flex-ai-center flex-dc">
+  <ion-button fill="clear" ion-item (click)="presentAlert()">
+    {{ 'FRMELEMNTS_BTN_EDIT' | translate }}
+  </ion-button>
+  <ion-button fill="clear" ion-item (click)="popover.dismiss({ action: 'delete' })">
+    {{ 'FRMELEMNTS_BTN_DELETE' | translate }}
+  </ion-button>
+  <ion-button fill="clear" ion-item (click)="presentModal()">
+    {{ 'FRMELEMNTS_BTN_VIEW_DETAILS' | translate }}
+  </ion-button>
+</ion-list>
diff --git a/src/app/manage-learn/shared/components/submission-actions/submission-actions.component.scss b/src/app/manage-learn/shared/components/submission-actions/submission-actions.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/shared/components/submission-actions/submission-actions.component.ts b/src/app/manage-learn/shared/components/submission-actions/submission-actions.component.ts
new file mode 100644
index 000000000..1998b936a
--- /dev/null
+++ b/src/app/manage-learn/shared/components/submission-actions/submission-actions.component.ts
@@ -0,0 +1,79 @@
+import { DatePipe } from '@angular/common';
+import { Component, OnInit } from '@angular/core';
+import { AlertController, ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+import { ViewDetailComponent } from '../view-detail/view-detail.component';
+
+@Component({
+  selector: 'app-submission-actions',
+  templateUrl: './submission-actions.component.html',
+  styleUrls: ['./submission-actions.component.scss'],
+})
+export class SubmissionActionsComponent implements OnInit {
+  text: string;
+  submission: any;
+  translateObject: any;
+  constructor(
+    private navParams: NavParams,
+    private alertCntrler: AlertController,
+    // private viewCntrlr: ViewController,
+    public popover: PopoverController,
+    private translateService: TranslateService,
+    private modalCtrl: ModalController,
+    private datepipe: DatePipe
+  ) {}
+
+  ngOnInit() {
+    this.submission = this.navParams.get('submission');
+    this.translateService
+      .get(['FRMELEMNTS_BTN_UPDATE', 'CANCEL', 'FRMELEMNTS_LBL_INSTANCE_NAME'])
+      .subscribe((translations) => {
+        this.translateObject = translations;
+      });
+  }
+
+  async presentAlert() {
+    let alert = await this.alertCntrler.create({
+      header: this.translateObject['FRMELEMNTS_LBL_INSTANCE_NAME'],
+      inputs: [
+        {
+          name: 'title',
+          placeholder: 'Title',
+          value: this.submission.title,
+        },
+      ],
+      buttons: [
+        {
+          text: this.translateObject['CANCEL'],
+          role: 'cancel',
+          handler: (data) => {
+            console.log('Cancel clicked');
+            this.popover.dismiss();
+          },
+        },
+        {
+          text: this.translateObject['FRMELEMNTS_BTN_UPDATE'],
+          handler: (data) => {
+            const payload = {
+              action: 'update',
+              name: data.title,
+            };
+            this.popover.dismiss(payload);
+          },
+        },
+      ],
+    });
+    alert.present();
+  }
+
+  async presentModal() {
+    this.popover.dismiss();
+    const modal = await this.modalCtrl.create({
+      component: ViewDetailComponent,
+      componentProps: {
+        submission: this.submission,
+      },
+    });
+    modal.present();
+  }
+}
diff --git a/src/app/manage-learn/shared/components/survey-msg/survey-msg.component.html b/src/app/manage-learn/shared/components/survey-msg/survey-msg.component.html
new file mode 100644
index 000000000..b16862e33
--- /dev/null
+++ b/src/app/manage-learn/shared/components/survey-msg/survey-msg.component.html
@@ -0,0 +1,13 @@
+<ion-content padding>
+  <div class="dm-header ion-padding">
+    <ion-icon
+      name="arrow-back"
+      (click)="close()"
+      class="top-back-button"
+    ></ion-icon>
+  </div>
+  <div class="_flex-box _flex-direction-column">
+    <img [src]="data?.img" alt="Thanks" />
+    <h2 class="lightMessage">{{ data?.msg }}</h2>
+  </div>
+</ion-content>
diff --git a/src/app/manage-learn/shared/components/survey-msg/survey-msg.component.scss b/src/app/manage-learn/shared/components/survey-msg/survey-msg.component.scss
new file mode 100644
index 000000000..e904565d3
--- /dev/null
+++ b/src/app/manage-learn/shared/components/survey-msg/survey-msg.component.scss
@@ -0,0 +1,19 @@
+@import 'src/assets/styles/_variables.scss';
+@import 'src/assets/styles/_custom-mixins';
+@import 'src/assets/styles/base/_variables.scss';
+
+.top-back-button {
+  font-size: 20px;
+  @include rtl() {
+    float: right;
+  }
+}
+img {
+  width: 70%;
+}
+
+.lightMessage {
+  font-weight: 200;
+  color: $gray-400;
+  text-align: center;
+}
diff --git a/src/app/manage-learn/shared/components/survey-msg/survey-msg.component.ts b/src/app/manage-learn/shared/components/survey-msg/survey-msg.component.ts
new file mode 100644
index 000000000..1efd75b40
--- /dev/null
+++ b/src/app/manage-learn/shared/components/survey-msg/survey-msg.component.ts
@@ -0,0 +1,41 @@
+import { Component, OnInit } from '@angular/core';
+import { AppHeaderService } from '@app/services';
+import { ModalController, NavParams } from '@ionic/angular';
+
+@Component({
+  selector: 'app-survey-msg',
+  templateUrl: './survey-msg.component.html',
+  styleUrls: ['./survey-msg.component.scss'],
+})
+export class SurveyMsgComponent implements OnInit {
+  text: string;
+
+  options = {
+    surveyCompleted: { img: '../../assets/imgs/submitted.svg', msg: 'Your form is Submitted!' },
+    surveyExpired: { img: '../../assets/imgs/survey-expired.svg', msg: 'Sorry! the form has expired.' },
+    entityNotMapped: { img: '../../assets/imgs/entity-not-mapped.svg', msg: 'Sorry! You are not mapped to an entity' },
+  };
+  option: any;
+  showClose: any;
+  showMenu: any;
+
+  constructor(public params: NavParams, public modal: ModalController, private headerService:AppHeaderService) {
+    this.option = this.params.get('option');
+    this.showMenu = this.params.get('showMenu') || false;
+    if (this.showMenu == false) {
+      this.showClose = true; // if menu is not shown then close button is show on model
+    }
+  }
+  close() {
+    this.modal.dismiss()
+  }
+  ngOnInit(): void {}
+
+  ionViewWillEnter() {
+    this.headerService.showHeaderWithBackButton();
+  }
+
+  get data(): any {
+    return this.options[this.option];
+  }
+}
diff --git a/src/app/manage-learn/shared/components/text-type-input/text-type-input.component.html b/src/app/manage-learn/shared/components/text-type-input/text-type-input.component.html
new file mode 100644
index 000000000..fe16e0128
--- /dev/null
+++ b/src/app/manage-learn/shared/components/text-type-input/text-type-input.component.html
@@ -0,0 +1,25 @@
+<ion-card class="_cardBg ion-padding">
+  <ion-col class="_flex-box _justify-content-center _flex-direction-column">
+    <h4 [ngClass]="{'_validQuestion': data?.value}" class="flexbox">
+      <app-question-heading [inputIndex]="inputIndex" [data]="data" [enableQuestionReadOut]="enableQuestionReadOut">
+      </app-question-heading>
+    </h4>
+  </ion-col>
+  <div class="_tip _flex-box">{{data?.tip}}</div>
+  <div class="ion-margin-top">
+    <ion-item text-center no-padding *ngIf="data?.responseType != 'text'">
+      <ion-input type="{{data?.responseType}}" (input)="isaNumber()" (keyup.enter)="keyboard.hide()"
+        [(ngModel)]="data.value" (ngModelChange)="checkForValidation()"
+        [disabled]="data.isEditable!=undefined && !data.isEditable"></ion-input>
+    </ion-item>
+    <ion-item text-center no-padding *ngIf="data?.responseType == 'text'">
+      <ion-textarea (keyup.enter)="keyboard.hide()" [(ngModel)]="data.value" (ngModelChange)="checkForValidation()"
+        [disabled]="data.isEditable!=undefined && !data.isEditable"></ion-textarea>
+    </ion-item>
+    <div *ngIf="!notNumber" class="_errorMsg">{{getErrorMsg()}}</div>
+
+    <app-remarks *ngIf="data?.showRemarks" [data]="data"></app-remarks>
+    <app-image-upload [data]="data" [generalQuestion]="generalQuestion" [imageLocalCopyId]="imageLocalCopyId"
+      [evidenceId]="evidenceId" [submissionId]="submissionId"></app-image-upload>
+  </div>
+</ion-card>
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/components/text-type-input/text-type-input.component.scss b/src/app/manage-learn/shared/components/text-type-input/text-type-input.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/shared/components/text-type-input/text-type-input.component.ts b/src/app/manage-learn/shared/components/text-type-input/text-type-input.component.ts
new file mode 100644
index 000000000..1798fab0b
--- /dev/null
+++ b/src/app/manage-learn/shared/components/text-type-input/text-type-input.component.ts
@@ -0,0 +1,70 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { UtilsService } from '@app/app/manage-learn/core';
+
+@Component({
+  selector: 'app-text-type-input',
+  templateUrl: './text-type-input.component.html',
+  styleUrls: ['./text-type-input.component.scss'],
+})
+export class TextTypeInputComponent implements OnInit {
+
+  @Input() inputIndex;
+  @Input() data: any;
+  @Input() isLast: boolean;
+  @Input() isFirst: boolean;
+  @Output() nextCallBack = new EventEmitter();
+  @Output() previousCallBack = new EventEmitter()
+  @Input() evidenceId: string;
+  @Input() hideButton: boolean;
+  @Input() submissionId: any;
+  @Input() imageLocalCopyId: string;
+  @Input() generalQuestion: boolean;
+  @Input() schoolId;
+  @Input() enableQuestionReadOut: boolean;
+  notNumber: boolean;
+  questionValid: boolean;
+
+  constructor(private utils: UtilsService) { }
+
+  ngOnInit() {
+    this.isaNumber();
+    this.data.startTime = this.data.startTime ? this.data.startTime : Date.now();
+    if (!this.data.validation.required) {
+      this.data.isCompleted = true;
+    }
+    this.getErrorMsg();
+    // this.checkForValidation();
+  }
+
+  next(status?: any) {
+    this.data.isCompleted = this.utils.isQuestionComplete(this.data);
+    this.nextCallBack.emit(status);
+  }
+
+  isaNumber() {
+    this.notNumber = this.utils.testRegex(this.data.validation.regex, this.data.value);
+  }
+
+  back() {
+    this.data.isCompleted = this.utils.isQuestionComplete(this.data);
+    this.previousCallBack.emit('previous');
+  }
+
+  // checkForValidation(): void {
+  //   this.questionValid = this.utils.isQuestionComplete(this.data);
+  // }
+  checkForValidation(): void {
+    this.data.isCompleted = this.utils.isQuestionComplete(this.data);
+    this.data.endTime = this.data.isCompleted ? Date.now() : "";
+    this.isaNumber();
+  }
+
+  getErrorMsg() {
+    if (this.data.validation.regex) {
+      let string = this.data.validation.regex.split("[");
+      string = string[1].split("]")[0];
+      return "Should contain only values " + string;
+    }
+  }
+
+}
diff --git a/src/app/manage-learn/shared/components/view-detail/view-detail.component.html b/src/app/manage-learn/shared/components/view-detail/view-detail.component.html
new file mode 100644
index 000000000..03a758e58
--- /dev/null
+++ b/src/app/manage-learn/shared/components/view-detail/view-detail.component.html
@@ -0,0 +1,25 @@
+<ion-toolbar>
+  <!-- <ion-title>
+    {{title | translate}}
+  </ion-title> -->
+  <ion-buttons (click)="close()" slot="start" class="padding">
+    <ion-icon name="close" slot="icon-only" style="padding-left: 10px;"></ion-icon>
+  </ion-buttons>
+</ion-toolbar>
+<ion-content>
+  <ion-card class="observationTitle">
+    <ion-card-content>
+      {{ submission?.entityName }}
+    </ion-card-content>
+  </ion-card>
+
+  <ion-card-content>
+    <h5>{{ submission?.title }}</h5>
+    <p>Created On : {{ submission?.createdAt | date }}</p>
+    <p *ngIf="submission?.submissionDate">
+      Submitted On :
+
+      {{ submission?.submissionDate | date }}
+    </p>
+  </ion-card-content>
+</ion-content>
diff --git a/src/app/manage-learn/shared/components/view-detail/view-detail.component.scss b/src/app/manage-learn/shared/components/view-detail/view-detail.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/manage-learn/shared/components/view-detail/view-detail.component.ts b/src/app/manage-learn/shared/components/view-detail/view-detail.component.ts
new file mode 100644
index 000000000..b9ffae86b
--- /dev/null
+++ b/src/app/manage-learn/shared/components/view-detail/view-detail.component.ts
@@ -0,0 +1,20 @@
+import { Component, OnInit } from '@angular/core';
+import { ModalController, NavParams } from '@ionic/angular';
+
+@Component({
+  selector: 'app-view-detail',
+  templateUrl: './view-detail.component.html',
+  styleUrls: ['./view-detail.component.scss'],
+})
+export class ViewDetailComponent implements OnInit {
+  submission: any;
+
+  constructor(params: NavParams, private modalCtrl: ModalController) {
+    this.submission = params.get('submission');
+  }
+  ngOnInit() {}
+
+  close() {
+    this.modalCtrl.dismiss();
+  }
+}
diff --git a/src/app/manage-learn/shared/fileExtension.ts b/src/app/manage-learn/shared/fileExtension.ts
new file mode 100644
index 000000000..a3c880ec6
--- /dev/null
+++ b/src/app/manage-learn/shared/fileExtension.ts
@@ -0,0 +1,9 @@
+export const FileExtension = {
+  videoFormats: ["mp4", "WMV", "WEBM", "flv", "avi", "3GP", "OGG", "m4v"],
+  audioFormats: ["AIF", "cda", "mpa", "ogg", "wav", "wma", "mp3"],
+  pptFormats: ["ppt", "pptx", "pps", "ppsx"],
+  wordFormats: ["docx", "doc", "docm", "dotx"],
+  imageFormats: ["jpg", "png", "jpeg"],
+  pdfFormats: ["pdf"],
+  spreadSheetFormats: ["xls", "xlsx"],
+};
diff --git a/src/app/manage-learn/shared/index.ts b/src/app/manage-learn/shared/index.ts
new file mode 100644
index 000000000..4902205dc
--- /dev/null
+++ b/src/app/manage-learn/shared/index.ts
@@ -0,0 +1,2 @@
+export * from './components';
+export * from './TC-generic.popupService';
\ No newline at end of file
diff --git a/src/app/manage-learn/shared/pipe/camel-to-title.pipe.ts b/src/app/manage-learn/shared/pipe/camel-to-title.pipe.ts
new file mode 100644
index 000000000..67db2b94d
--- /dev/null
+++ b/src/app/manage-learn/shared/pipe/camel-to-title.pipe.ts
@@ -0,0 +1,13 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'camelToTitle'
+})
+export class CamelToTitlePipe implements PipeTransform {
+
+  transform(value: any, ...args: unknown[]): unknown {
+    let newStr = value.replace(/([A-Z])/g, " $1");
+    return newStr.charAt(0).toUpperCase() + newStr.slice(1);;
+  }
+
+}
diff --git a/src/app/manage-learn/shared/pipe/get-labels.pipe.ts b/src/app/manage-learn/shared/pipe/get-labels.pipe.ts
new file mode 100644
index 000000000..e41fc4455
--- /dev/null
+++ b/src/app/manage-learn/shared/pipe/get-labels.pipe.ts
@@ -0,0 +1,19 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'getLabels',
+})
+export class GetLabelsPipe implements PipeTransform {
+  transform(value: string, ...args) {
+    return this.getLabels(value);
+  }
+  getLabels(question) {
+    const labels = [];
+    for (const option of question.options) {
+      if (question.value.indexOf(option.value) > -1) {
+        labels.push(option.label);
+      }
+    }
+    return labels;
+  }
+}
diff --git a/src/app/manage-learn/shared/pipe/search.pipe.ts b/src/app/manage-learn/shared/pipe/search.pipe.ts
new file mode 100644
index 000000000..c09f54d9f
--- /dev/null
+++ b/src/app/manage-learn/shared/pipe/search.pipe.ts
@@ -0,0 +1,17 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'search',
+})
+export class SearchPipe implements PipeTransform {
+  transform(value: any, args?: any): any {
+    if (!value) return null;
+    if (!args) return value;
+
+    args = args.toLowerCase();
+
+    return value.filter(function (item) {
+      return JSON.stringify(item).toLowerCase().includes(args);
+    });
+  }
+}
diff --git a/src/app/manage-learn/shared/shared.module.ts b/src/app/manage-learn/shared/shared.module.ts
new file mode 100644
index 000000000..aac9c2e84
--- /dev/null
+++ b/src/app/manage-learn/shared/shared.module.ts
@@ -0,0 +1,204 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { HttpClientModule } from '@angular/common/http';
+import { IonicModule } from '@ionic/angular';
+import { CamelToTitlePipe } from './pipe/camel-to-title.pipe';
+import { UtilsService } from '../core/services/utils.service';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import {
+  MultipleTypeInputComponent,
+  AudioListComponent,
+  CommonHeaderComponent,
+  DateTypeInputComponent,
+  FooterButtonsComponent,
+  ImageUploadComponent,
+  ItemListCardComponent,
+  MatrixTypeInputComponent,
+  PageQuestionsComponent,
+  QuestionHeadingComponent,
+  RadioTypeInputComponent,
+  SliderTypeInputComponent,
+  RemarksComponent,
+  PopoverComponent,
+  EntityfilterComponent,
+  TextTypeInputComponent,
+  ProgressBarComponent,
+  NoDataComponent,
+  ChartComponent,
+  CreateTaskFormComponent,
+  PrivacyPolicyAndTCComponent
+  
+} from './components';
+import { TranslateModule } from '@ngx-translate/core';
+import { Camera } from '@ionic-native/camera/ngx';
+import { ImagePicker } from '@ionic-native/image-picker/ngx';
+import { PhotoLibrary } from '@ionic-native/photo-library/ngx';
+import { FilePath } from '@ionic-native/file-path/ngx';
+import { FileOpener } from '@ionic-native/file-opener/ngx';
+import { FileChooser } from '@ionic-native/file-chooser/ngx';
+import { AndroidPermissions } from '@ionic-native/android-permissions/ngx';
+import { Diagnostic } from '@ionic-native/diagnostic/ngx';
+import { Media } from '@ionic-native/media/ngx';
+import { CreateTaskComponent } from './components/create-task/create-task.component';
+import { GetLabelsPipe } from './pipe/get-labels.pipe';
+import { ScroreReportMenusComponent } from './components/scrore-report-menus/scrore-report-menus.component';
+import { ReportsTextComponent } from './components/reports-text/reports-text.component';
+import { PieChartComponent } from './components/pie-chart/pie-chart.component';
+import { BarChartComponent } from './components/bar-chart/bar-chart.component';
+import { MatrixChartComponent } from './components/matrix-chart/matrix-chart.component';
+import { AttachmentComponent } from './components/attachment/attachment.component';
+import { ReportModalFilter } from './components/report-modal-filter/report.modal.filter';
+import { CriteriaListComponent } from './components/criteria-list/criteria-list.component';
+import { DownloadShareComponent } from './components/download-share/download-share.component';
+import { GraphCircleComponent } from './components/graph-circle/graph-circle.component';
+import { FilterModalComponent } from './components/filter-modal/filter-modal.component';
+import { SubmissionActionsComponent } from './components/submission-actions/submission-actions.component';
+import { ViewDetailComponent } from './components/view-detail/view-detail.component';
+import { ScatterChartComponent } from './components/scatter-chart/scatter-chart.component';
+import { SearchPipe } from './pipe/search.pipe';
+import { HintComponent } from './components/hint/hint.component';
+import { SurveyMsgComponent } from './components/survey-msg/survey-msg.component';
+import { ChartsModule, ThemeService } from 'ng2-charts';
+import { SurveyProviderService } from '../core/services/survey-provider.service';
+import { RemarksModalComponent } from '../questionnaire/remarks-modal/remarks-modal.component';
+import { PercentageColumnChartsComponent } from './components/percentage-column-charts/percentage-column-charts.component';
+import { ExpansionPanelComponent } from './components/expansion-panel/expansion-panel.component';
+import { ExpansionTableComponent } from './components/expansion-table/expansion-table.component';
+import { GenericPopUpService } from './TC-generic.popupService';
+
+
+@NgModule({
+  declarations: [
+    CreateTaskComponent,
+    MultipleTypeInputComponent,
+    RadioTypeInputComponent,
+    RemarksComponent,
+    DateTypeInputComponent,
+    AudioListComponent,
+    FooterButtonsComponent,
+    ImageUploadComponent,
+    MatrixTypeInputComponent,
+    PageQuestionsComponent,
+    QuestionHeadingComponent,
+    SliderTypeInputComponent,
+    TextTypeInputComponent,
+    CamelToTitlePipe,
+    ItemListCardComponent,
+    CommonHeaderComponent,
+    EntityfilterComponent,
+    PopoverComponent,
+    ProgressBarComponent,
+    GetLabelsPipe,
+    ScroreReportMenusComponent,
+    ReportsTextComponent,
+    PieChartComponent,
+    BarChartComponent,
+    ScatterChartComponent,
+    MatrixChartComponent,
+    AttachmentComponent,
+    ReportModalFilter,
+    CriteriaListComponent,
+    DownloadShareComponent,
+    GraphCircleComponent,
+    FilterModalComponent,
+    SubmissionActionsComponent,
+    ViewDetailComponent,
+    NoDataComponent,
+    SearchPipe,
+    SurveyMsgComponent,
+    ChartComponent,
+    CreateTaskFormComponent,
+    HintComponent,
+    RemarksModalComponent,
+    PercentageColumnChartsComponent,
+    ExpansionPanelComponent,
+    ExpansionTableComponent,
+    PrivacyPolicyAndTCComponent
+  ],
+
+  imports: [CommonModule, FormsModule, IonicModule, ReactiveFormsModule, TranslateModule, ChartsModule],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA],
+  exports: [
+    CreateTaskComponent,
+    MultipleTypeInputComponent,
+    RadioTypeInputComponent,
+    RemarksComponent,
+    DateTypeInputComponent,
+    AudioListComponent,
+    FooterButtonsComponent,
+    ImageUploadComponent,
+    MatrixTypeInputComponent,
+    PageQuestionsComponent,
+    QuestionHeadingComponent,
+    SliderTypeInputComponent,
+    CamelToTitlePipe,
+    ItemListCardComponent,
+    CommonHeaderComponent,
+    EntityfilterComponent,
+    PopoverComponent,
+    TextTypeInputComponent,
+    ProgressBarComponent,
+    GetLabelsPipe,
+    AttachmentComponent,
+    ReportsTextComponent,
+    PieChartComponent,
+    BarChartComponent,
+    ScatterChartComponent,
+    MatrixChartComponent,
+    ReportModalFilter,
+    CriteriaListComponent,
+    DownloadShareComponent,
+    GraphCircleComponent,
+    FilterModalComponent,
+    SubmissionActionsComponent,
+    ViewDetailComponent,
+    NoDataComponent,
+    SearchPipe,
+    SurveyMsgComponent,
+    ChartComponent,
+    HintComponent,
+    ChartsModule,
+    CreateTaskFormComponent,
+    PercentageColumnChartsComponent,
+    ExpansionPanelComponent,
+    ExpansionTableComponent,
+    PrivacyPolicyAndTCComponent
+  ],
+  providers: [
+    Camera,
+    ImagePicker,
+    PhotoLibrary,
+    FilePath,
+    FileChooser,
+    FileOpener,
+    AndroidPermissions,
+    Diagnostic,
+    Media,
+    CommonModule,
+    HttpClientModule, //TODO:remove after api integration
+    ReactiveFormsModule,
+    ThemeService,
+    SurveyProviderService,
+    GenericPopUpService
+  ],
+  entryComponents: [
+    EntityfilterComponent,
+    PopoverComponent,
+    CreateTaskComponent,
+    ScroreReportMenusComponent,
+    ReportModalFilter,
+    CriteriaListComponent,
+    DownloadShareComponent,
+    FilterModalComponent,
+    SubmissionActionsComponent,
+    ViewDetailComponent,
+    HintComponent,
+    SurveyMsgComponent,
+    CreateTaskFormComponent,
+    RemarksModalComponent,
+    PrivacyPolicyAndTCComponent
+  ],
+  
+})
+export class SharedModule {}
diff --git a/src/app/manage-learn/storageKeys.ts b/src/app/manage-learn/storageKeys.ts
new file mode 100644
index 000000000..62df55823
--- /dev/null
+++ b/src/app/manage-learn/storageKeys.ts
@@ -0,0 +1,17 @@
+// reference to localStorage Keys
+
+export const storageKeys = {
+  staticLinks: "staticLinks",
+  observableEntities: "observableEntities", // list of entities logged in user can observe
+  programList: "programList", // stores all programs list with solution and entities nested inside
+  institutionalList: "institutionalList", // list of intitutional assessment // old flow
+  individualList: "individualList", // list of individual assessment // old flow
+  institutionFlowList: "instituionFlowList ", //new institution flow data
+  submissionIdArray: "submissionIdArray", //to store all downloaded submissionIds
+  createdObservationList: "createdObservationList", // list of observational assessment // old flow
+  observationSubmissionIdArr: "observationSubmissionIdArr",
+  profileRole: "profileRole", //give all roles of current user
+  libraryDraft: "libraryDraft", //draft(library) in localStorage
+  libraryCategories: "libraryCategories",
+  pollDraft: "pollDraft",
+};
diff --git a/src/app/manage-learn/submission-preview/submission-preview-page/submission-preview-page.component.html b/src/app/manage-learn/submission-preview/submission-preview-page/submission-preview-page.component.html
new file mode 100644
index 000000000..8aca4c00c
--- /dev/null
+++ b/src/app/manage-learn/submission-preview/submission-preview-page/submission-preview-page.component.html
@@ -0,0 +1,116 @@
+<ion-content>
+  <div style="margin-bottom: 100px" *ngIf="loaded">
+    <h3 padding>{{ currentEvidence?.name }}</h3>
+    <ion-card *ngFor="let section of currentEvidence?.sections">
+      <ion-card-header>
+        {{ section?.name }}
+      </ion-card-header>
+      <ion-card-content>
+        <ion-list>
+          <ion-item *ngFor="let question of section?.questions; let i = index" text-wrap>
+            <div
+              *ngIf="
+                question?.responseType !== 'matrix' && question?.responseType !== 'pageQuestions' && question?.value
+              "
+            >
+              <h3>Q{{ i + 1 }}. {{ question?.question[0] }}</h3>
+              <p *ngIf="question?.responseType !== 'radio' && question?.responseType !== 'multiselect'">
+                Ans. {{ question?.value }}
+              </p>
+              <p *ngIf="question?.responseType === 'radio' || question?.responseType === 'multiselect'">
+                Ans.
+                {{ question | getLabels }}
+              </p>
+              <p *ngIf="question.remarks">{{ question.remarks }}</p>
+            </div>
+
+            <div
+              *ngIf="
+                question?.responseType === 'matrix' && question?.responseType !== 'pageQuestions' && question?.value
+              "
+            >
+              <h3>Q{{ i + 1 }}. {{ question?.question[0] }}</h3>
+              <div *ngFor="let instance of question.value; let j = index" class="instanceQuest">
+                <h5 class="instacnce">{{ question?.instanceIdentifier }} {{ j + 1 }}</h5>
+                <div *ngFor="let answer of instance; let k = index" class="matrixQuestion">
+                  <div *ngIf="answer?.value">
+                    <h3>Q{{ k + 1 }}. {{ answer?.question[0] }}</h3>
+                    <p *ngIf="answer?.responseType !== 'radio' && answer?.responseType !== 'multiselect' && answer?.responseType !== 'date'">
+                      Ans. {{ answer?.value }}
+                    </p>
+                    <p *ngIf="answer?.responseType === 'radio' || answer?.responseType === 'multiselect'">
+                      Ans.
+                      {{ answer | getLabels }}
+                    </p>
+                    <p *ngIf="answer?.responseType === 'date'">
+                      Ans.
+                      {{ answer?.value | date:'medium':'IST' }} 
+                    </p>
+                    <p *ngIf="question.remarks">{{ question.remarks }}</p>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div *ngIf="question?.responseType === 'pageQuestions'">
+              <h3>Q{{ i + 1 }}. {{ question?.question[0] }}</h3>
+
+              <div *ngFor="let answer of question.pageQuestions; let k = index" class="matrixQuestion">
+                <div *ngIf="answer?.responseType === 'matrix'; else notMatrix">
+                  <div *ngIf="answer.value">
+                    <h3>Q{{ i + 1 }}. {{ answer?.question[0] }}</h3>
+                    <div *ngFor="let instance of answer.value; let j = index" class="instanceQuest">
+                      <h5 class="instacnce">{{ answer?.instanceIdentifier }} {{ j + 1 }}</h5>
+                      <div *ngFor="let ans of instance; let k = index" class="matrixQuestion">
+                        <h3>Q{{ k + 1 }}. {{ ans?.question[0] }}</h3>
+                        {{ans?.responseType}}
+                        <p *ngIf="ans?.responseType !== 'radio' && ans?.responseType !== 'multiselect' && ans?.responseType !== 'date'">
+                          Ans. {{ ans?.value }}
+                        </p>
+                        <p *ngIf="ans?.responseType === 'radio' || ans?.responseType === 'multiselect'">
+                          Ans.
+                          {{ ans | getLabels }}
+                        </p>
+                        <p *ngIf="ans?.responseType === 'date'">
+                          Ans.
+                          {{ ans?.value | date:'medium':'IST' }} 
+                        </p>
+                        <p *ngIf="question.remarks">{{ question.remarks }}</p>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <ng-template #notMatrix>
+                  <div class="instanceQuest" *ngIf="answer?.value">
+                    <h5>Q{{ k + 1 }}. {{ answer?.question[0] }}</h5>
+                    <p *ngIf="answer?.responseType !== 'radio' && answer?.responseType !== 'multiselect' && answer?.responseType !== 'date'">
+                      Ans. {{ answer?.value }}
+                    </p>
+                    <p *ngIf="answer?.responseType === 'radio' || answer?.responseType === 'multiselect'">
+                      Ans.
+                      {{ answer | getLabels }}
+                    </p>
+                    <p *ngIf="answer?.responseType === 'date'">
+                      Ans.
+                      {{ answer?.value | date:'medium':'IST' }}
+                    </p>
+                    <p *ngIf="question.remarks">{{ question.remarks }}</p>
+                  </div>
+                </ng-template>
+              </div>
+            </div>
+          </ion-item>
+        </ion-list>
+      </ion-card-content>
+    </ion-card>
+  </div>
+</ion-content>
+
+<ion-footer no-shadow *ngIf="(allAnsweredForEvidence && !currentEvidence.isSubmitted) || currentEvidence?.enableSubmit">
+  <ion-toolbar position="bottom">
+    <ion-row>
+      <ion-button full class="w-100" (click)="checkForNetworkTypeAlert()">
+        {{ 'FRMELEMNTS_BTN_UPLOAD_AND_SUBMIT' | translate }}
+      </ion-button>
+    </ion-row>
+  </ion-toolbar>
+</ion-footer>
diff --git a/src/app/manage-learn/submission-preview/submission-preview-page/submission-preview-page.component.scss b/src/app/manage-learn/submission-preview/submission-preview-page/submission-preview-page.component.scss
new file mode 100644
index 000000000..e2be2af1f
--- /dev/null
+++ b/src/app/manage-learn/submission-preview/submission-preview-page/submission-preview-page.component.scss
@@ -0,0 +1,23 @@
+@import 'src/assets/styles/base/_variables.scss';
+@import 'src/assets/styles/_custom-mixins.scss';
+@import 'src/assets/styles/_variables.scss';
+
+.question {
+  font-weight: 500;
+}
+
+.instanceQuest {
+  background: $gray-100;
+  border: 1px solid $gray-400;
+  padding: 10px;
+  margin: 2px 0;
+  border-radius: 2px;
+}
+.instacnce {
+  margin: 10px 0;
+  font-weight: 600 !important;
+}
+
+.matrixQuestion {
+  margin: 20px 0;
+}
diff --git a/src/app/manage-learn/submission-preview/submission-preview-page/submission-preview-page.component.ts b/src/app/manage-learn/submission-preview/submission-preview-page/submission-preview-page.component.ts
new file mode 100644
index 000000000..ecdfc9b70
--- /dev/null
+++ b/src/app/manage-learn/submission-preview/submission-preview-page/submission-preview-page.component.ts
@@ -0,0 +1,180 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { RouterLinks } from '@app/app/app.constant';
+import { CommonUtilService } from '@app/services';
+// import { Events } from '@app/util/events';
+import { Network } from '@ionic-native/network/ngx';
+import { AlertController } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+import { LocalStorageService, UtilsService } from '../../core';
+
+@Component({
+  selector: 'app-submission-preview-page',
+  templateUrl: './submission-preview-page.component.html',
+  styleUrls: ['./submission-preview-page.component.scss'],
+})
+export class SubmissionPreviewPageComponent implements OnInit {
+  submissionId;
+  entityName;
+  selectedEvidenceIndex;
+  selectedEvidenceName;
+  currentEvidence;
+  entityDetails;
+  evidenceSections;
+  allAnsweredForEvidence: boolean;
+  networkAvailable: any;
+  loaded: boolean = false;
+  goBackNum: any;
+  constructor(
+    // private events: Events,
+    private commonUtils: CommonUtilService,
+    private routerParam: ActivatedRoute,
+    private localStorage: LocalStorageService,
+    private utils: UtilsService,
+    private network: Network,
+    private translate: TranslateService,
+    private alertCtrl: AlertController,
+    private router: Router
+  ) {
+    // this.events.subscribe('network:offline', () => {
+    //   this.networkAvailable = false;
+    // });
+    // this.events.subscribe('network:online', () => {
+    //   this.networkAvailable = true;
+    // });
+    // this.networkAvailable = this.commonUtils.getNetworkStatus() //TODO:check workng
+    this.networkAvailable = this.commonUtils.networkInfo.isNetworkAvailable;
+    this.routerParam.queryParams.subscribe((params) => {
+      this.submissionId = params.submissionId;
+      this.selectedEvidenceIndex = params.selectedEvidenceIndex;
+      this.entityName = params.name;
+      this.goBackNum=params.goBackNum
+    });
+  }
+
+  ngOnInit() {}
+  ionViewDidEnter() {
+    this.localStorage
+      .getLocalStorage(this.utils.getAssessmentLocalStorageKey(this.submissionId))
+      .then((data) => {
+        this.loaded = true;
+        this.entityDetails = data;
+        this.currentEvidence = data['assessment']['evidences'][this.selectedEvidenceIndex];
+        this.evidenceSections = this.currentEvidence['sections'];
+        this.checkForEvidenceCompletion();
+      })
+      .catch((error) => {
+        this.loaded = true;
+      });
+    //TODO:remove
+    //Moved to constructor
+    // this.submissionId = this.navParams.get('_id');
+    // this.entityName = this.navParams.get('name');
+    // this.selectedEvidenceIndex = this.navParams.get('selectedEvidence');
+    //TODO till here
+    // this.localStorage
+    //   .getLocalStorage(this.utils.getAssessmentLocalStorageKey(this.submissionId))
+    //   .then((data) => {
+    //     this.loaded = true;
+    //     this.entityDetails = data;
+    //     this.currentEvidence = data['assessment']['evidences'][this.selectedEvidenceIndex];
+    //     this.evidenceSections = this.currentEvidence['sections'];
+    //     this.checkForEvidenceCompletion();
+    //   })
+    //   .catch((error) => {
+    //     this.loaded = true;
+    //   });
+  }
+
+  checkForEvidenceCompletion(): void {
+    let allAnswered;
+    for (const section of this.evidenceSections) {
+      allAnswered = true;
+      for (const question of section.questions) {
+        if (!question.isCompleted) {
+          allAnswered = false;
+          break;
+        }
+      }
+      if (this.currentEvidence.isSubmitted) {
+        section.progressStatus = 'submitted';
+      } else if (!this.currentEvidence.startTime) {
+        section.progressStatus = '';
+      } else if (allAnswered) {
+        section.progressStatus = 'completed';
+      } else if (!allAnswered && section.progressStatus) {
+        section.progressStatus = 'inProgress';
+      } else if (!section.progressStatus) {
+        section.progressStatus = '';
+      }
+    }
+    this.allAnsweredForEvidence = true;
+    for (const section of this.evidenceSections) {
+      if (section.progressStatus !== 'completed') {
+        this.allAnsweredForEvidence = false;
+        break;
+      }
+    }
+    this.localStorage.setLocalStorage(this.utils.getAssessmentLocalStorageKey(this.submissionId), this.entityDetails);
+  }
+
+  async checkForNetworkTypeAlert() {
+    if (
+      this.network.type === 'cellular' ||
+      this.network.type === 'unknown' ||
+      this.network.type === '2g' ||
+      this.network.type === 'ethernet'
+    ) {
+      let translateObject;
+      this.translate
+        .get(['FRMELEMNTS_LBL_CONFIRM', 'FRMELEMNTS_LBL_YES', 'FRMELEMNTS_LBL_NO', 'FRMELEMNTS_LBL_SLOW_INTERNET'])
+        .subscribe((translations) => {
+          translateObject = translations;
+        });
+      let alert = await this.alertCtrl.create({
+        header: translateObject['FRMELEMNTS_LBL_CONFIRM'],
+        message: translateObject['FRMELEMNTS_MSG_SLOW_INTERNET'],
+        buttons: [
+          {
+            text: translateObject['FRMELEMNTS_LBL_NO'],
+            role: 'cancel',
+            handler: () => {
+              //console.log('Cancel clicked');
+            },
+          },
+          {
+            text: translateObject['FRMELEMNTS_LBL_YES'],
+            handler: () => {
+              this.goToImageListing();
+            },
+          },
+        ],
+      });
+      alert.present();
+    } else if (this.network.type === 'wifi' || this.network.type === '3g' || this.network.type === '4g') {
+      this.goToImageListing();
+    } else if (this.network.type === 'none') {
+      let noInternetMsg;
+      this.translate.get(['FRMELEMNTS_MSG_NETWORK_CONNECTION_FOR_ACTION']).subscribe((translations) => {
+        noInternetMsg = translations['FRMELEMNTS_MSG_NETWORK_CONNECTION_FOR_ACTION'];
+        this.commonUtils.showToast(noInternetMsg);
+      });
+    }
+  }
+
+  goToImageListing() {
+    if (this.networkAvailable) {
+      const params = {
+        // selectedEvidenceId: this.currentEvidence._id,
+        submissionId: this.submissionId,
+        name: this.entityName,
+        selectedEvidenceIndex: this.selectedEvidenceIndex,
+      };
+      this.router.navigate([RouterLinks.IMAGE_LISTING], { queryParams: params,replaceUrl:this.goBackNum?false:true });
+    } else {
+      this.translate.get('FRMELEMNTS_MSG_PLEASE_NETWORK').subscribe((translations) => {
+        this.commonUtils.showToast(translations);
+      });
+    }
+  }
+}
diff --git a/src/app/manage-learn/submission-preview/submission-preview.module.ts b/src/app/manage-learn/submission-preview/submission-preview.module.ts
new file mode 100644
index 000000000..493c3ee0e
--- /dev/null
+++ b/src/app/manage-learn/submission-preview/submission-preview.module.ts
@@ -0,0 +1,31 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SubmissionPreviewPageComponent } from './submission-preview-page/submission-preview-page.component';
+import { RouterModule, Routes } from '@angular/router';
+import { FormsModule } from '@angular/forms';
+import { IonicModule } from '@ionic/angular';
+import { TranslateModule } from '@ngx-translate/core';
+import { CoreModule } from '../core/core.module';
+import { SharedModule } from '../shared/shared.module';
+
+
+const routes: Routes = [
+  {
+    path: '',
+    component: SubmissionPreviewPageComponent
+  }
+];
+
+@NgModule({
+  declarations: [SubmissionPreviewPageComponent],
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    RouterModule.forChild(routes),
+    CoreModule,
+    SharedModule,
+    TranslateModule
+  ]
+})
+export class SubmissionPreviewModule { }
diff --git a/src/app/manage-learn/survey/survey-home/survey-home.component.html b/src/app/manage-learn/survey/survey-home/survey-home.component.html
new file mode 100644
index 000000000..32b5a799d
--- /dev/null
+++ b/src/app/manage-learn/survey/survey-home/survey-home.component.html
@@ -0,0 +1,46 @@
+  <ion-content fullscreen>
+    <!-- <div *ngIf="surveyList">
+      <simple-list
+        *ngFor="let item of surveyList"
+        [heading]="item?.name"
+        [subheading]="item?.subheading"
+        [forwardIcon]="item?.status != 'completed' && item.submissionId"
+        [viewReport]="item?.status == 'completed' || !item.submissionId"
+        [status]="item?.status"
+        (reportAction)="checkReport(item)"
+        (click)="onSurveyClick(item)"
+      ></simple-list>
+    </div> -->
+    <app-common-header
+      title="{{ 'FRMELEMNTS_LBL_SURVEY' | translate }}"
+      subTitle="{{ 'FRMELEMNTS_LBL_SURVEY_DESC' | translate }}"
+    ></app-common-header>
+    <div *ngFor="let item of surveyList">
+      <app-item-list-card [title]="item?.name" (cardSelect)="onSurveyClick(item)">
+        <span
+          class="dot"
+          [style.background-color]="setStatusColor(item?.status)"
+          *ngIf="setStatusColor(item?.status)"
+          color
+        ></span>
+        <ion-icon
+          arrow
+          class="mg-popup-btn-icon"
+          name="arrow-forward"
+          *ngIf="item?.status != 'completed' && item.submissionId"
+        ></ion-icon>
+        <!-- *ngIf="item?.status == 'completed' || !item.submissionId" -->
+        <ion-button
+          report
+          round
+          *ngIf="item?.status == 'completed' || item.isCreator"
+          (click)="$event.stopPropagation(); checkReport(item)"
+        >
+          {{ 'FRMELEMNTS_LBL_REPORTS' | translate }}
+        </ion-button>
+      </app-item-list-card>
+    </div>
+  </ion-content>
+  <ion-button class="view-more" expand="block" (click)="loadMore()"   *ngIf="surveyList?.length && count > surveyList?.length">
+    {{ "VIEW_MORE" | translate }}
+  </ion-button>
diff --git a/src/app/manage-learn/survey/survey-home/survey-home.component.scss b/src/app/manage-learn/survey/survey-home/survey-home.component.scss
new file mode 100644
index 000000000..d00f03ac2
--- /dev/null
+++ b/src/app/manage-learn/survey/survey-home/survey-home.component.scss
@@ -0,0 +1,7 @@
+  .dot {
+    height: 10px;
+    width: 10px;
+    border-radius: 50%;
+    display: inline-block;
+    margin: 0 6.2px;
+  }
diff --git a/src/app/manage-learn/survey/survey-home/survey-home.component.ts b/src/app/manage-learn/survey/survey-home/survey-home.component.ts
new file mode 100644
index 000000000..ecabebb0b
--- /dev/null
+++ b/src/app/manage-learn/survey/survey-home/survey-home.component.ts
@@ -0,0 +1,232 @@
+import { Component, OnInit } from '@angular/core';
+import { RouterLinks } from '@app/app/app.constant';
+import { AppHeaderService } from '@app/services';
+import { Subscription } from 'rxjs';
+import { LoaderService, LocalStorageService, ToastService, UtilsService } from '../../core';
+import { urlConstants } from '../../core/constants/urlConstants';
+import { storageKeys } from '../../storageKeys';
+import { SurveyProviderService } from '../../core/services/survey-provider.service';
+import { KendraApiService } from '../../core/services/kendra-api.service';
+import { Router } from '@angular/router';
+
+@Component({
+  selector: 'app-survey-home',
+  templateUrl: './survey-home.component.html',
+  styleUrls: ['./survey-home.component.scss'],
+})
+export class SurveyHomeComponent implements OnInit {
+  private backButtonFunc: Subscription;
+  headerConfig = {
+    showHeader: true,
+    showBurgerMenu: false,
+    actionButtons: [],
+  };
+  page = 1;
+  limit = 10;
+  link: any;
+  surveyList: any;
+  submissionArr: any;
+  count: any;
+  constructor(
+    private headerService: AppHeaderService,
+    private router: Router,
+    private localStorage: LocalStorageService,
+    private surveyProvider: SurveyProviderService,
+    private loader: LoaderService,
+    private utils: UtilsService,
+    private kendra: KendraApiService,
+    private toast: ToastService
+  ) {
+    const extrasState = this.router.getCurrentNavigation().extras.state;
+    if (extrasState) {
+      this.link = extrasState.data.survey_id;
+    }
+  }
+
+  ngOnInit() {}
+
+  ionViewDidLoad(): void {}
+
+  ionViewWillEnter() {
+    this.surveyList = [];
+    this.link ? this.deepLinkRedirect() : this.getSurveyListing();
+
+    this.headerConfig = this.headerService.getDefaultPageConfig();
+    this.headerConfig.actionButtons = [];
+    this.headerConfig.showHeader = true;
+    this.headerConfig.showBurgerMenu = false;
+    this.headerService.updatePageConfig(this.headerConfig);
+  }
+
+  ionViewWillLeave() {
+    if (this.backButtonFunc) {
+      this.backButtonFunc.unsubscribe();
+    }
+    this.utils.closeProfileAlert();
+  }
+
+  async getSurveyListing() {
+    this.loader.startLoader();
+
+    let payload = await this.utils.getProfileInfo();
+    const config = {
+      url: urlConstants.API_URLS.GET_TARGETED_SOLUTIONS + `?type=survey&page=${this.page}&limit=${this.limit}`,
+      payload: payload,
+    };
+    this.kendra.post(config).subscribe(
+      (success) => {
+        if (success.result && success.result.data) {
+          this.count = success.result.count;
+          this.surveyList = [...this.surveyList, ...success.result.data];
+          this.getSubmissionArr();
+          this.loader.stopLoader();
+        }
+      },
+      (error) => {
+        this.loader.stopLoader();
+        console.log(error);
+      }
+    );
+  }
+  //check if suvey detail is present in local storage
+  getSubmissionArr(): void {
+    this.localStorage
+      .getLocalStorage(storageKeys.submissionIdArray)
+      .then((allId) => {
+        this.submissionArr = allId;
+        this.applySubmission(); // make downloaded = true
+      })
+      .catch((err) => {});
+  }
+
+  applySubmission(): void {
+    this.surveyList.map((survey) => {
+      console.log(this.submissionArr.includes(survey.submissionsId));
+      this.submissionArr.includes(survey.submissionId) ? (survey.downloaded = true) : null;
+    });
+  }
+
+  deepLinkRedirect(): void {
+    let survey;
+    this.surveyProvider
+      .getDetailsByLink(this.link)
+      .then((data) => {
+        if (data.result == false) {
+          this.surveyProvider.showMsg('surveyExpired', true);
+          return;
+        }
+        if (data.result.status && data.result.status == 'completed') {
+          this.surveyProvider.showMsg('surveyCompleted', true);
+          return;
+        }
+        if (data.result.isCreator) {
+          this.toast.openToast(data.message);
+          this.router.navigate(['']);
+          return;
+        }
+        survey = data.result;
+        this.storeRedirect(survey);
+      })
+      .catch((err) => {
+        this.loader.stopLoader();
+        console.log(err);
+      });
+  }
+
+  onSurveyClick(survey) {
+    if (survey.status == 'completed') {
+      this.surveyProvider.showMsg('surveyCompleted');
+      return;
+    }
+
+    if (survey.status == 'expired') {
+      // its not added in samiksha but add here as , after expired also if its already downloaded then user is able to submit.(backend is not checking before making submission.)
+      this.surveyProvider.showMsg('surveyExpired');
+      return;
+    }
+
+    // surveyId changed to _id
+    survey.downloaded
+      ? this.redirect(survey.submissionId)
+      : this.getSurveyById(survey._id, survey.solutionId, survey.isCreator);
+  }
+
+  redirect(submissionId: any): void {
+    // const navParams = { _id: submissionId, selectedEvidence: 0, selectedSection: 0 };
+    this.router.navigate([RouterLinks.QUESTIONNAIRE], {
+      replaceUrl: this.link ? true : false,
+      queryParams: {
+        submisssionId: submissionId,
+        evidenceIndex: 0,
+        sectionIndex: 0,
+      },
+    });
+  }
+
+  storeRedirect(survey): void {
+    this.surveyProvider
+      .storeSurvey(survey.assessment.submissionId, survey)
+      .then((survey) => this.redirect(survey.assessment.submissionId));
+  }
+
+  getSurveyById(surveyId, solutionId, isCreator?) {
+    //passing solution id in v2
+    if (!surveyId) {
+      // return;
+      // for auto targeted _id will be blank
+      // so creator also no will be able to submit
+    }
+    if (isCreator) {
+      return;
+    }
+    this.surveyProvider
+      .getDetailsById(surveyId, solutionId)
+      .then((res) => {
+        const survey = res.result;
+        this.storeRedirect(survey);
+      })
+      .catch((err) => {
+        console.log(err);
+      });
+  }
+
+  setStatusColor(status): string {
+    switch (status) {
+      case 'started':
+        return 'orange';
+        break;
+      case 'completed':
+        return 'lightgreen';
+        break;
+      case 'expired':
+        return 'grey';
+        break;
+
+      default:
+        break;
+    }
+  }
+
+  checkReport(survey) {
+    if (survey.submissionId) {
+      this.router.navigate([RouterLinks.GENERIC_REPORT], {
+        state: {
+          survey: true,
+          submissionId: survey.submissionId,
+        },
+      });
+      return;
+    }
+
+    this.router.navigate([RouterLinks.GENERIC_REPORT], {
+      state: {
+        survey: true,
+        solutionId: survey.solutionId,
+      },
+    });
+  }
+  loadMore() {
+    this.page = this.page + 1;
+    this.getSurveyListing();
+  }
+}
diff --git a/src/app/manage-learn/survey/survey.module.ts b/src/app/manage-learn/survey/survey.module.ts
new file mode 100644
index 000000000..a8ab3243e
--- /dev/null
+++ b/src/app/manage-learn/survey/survey.module.ts
@@ -0,0 +1,31 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SurveyHomeComponent } from './survey-home/survey-home.component';
+import { TranslateModule } from '@ngx-translate/core';
+import { IonicModule } from '@ionic/angular';
+import { RouterModule, Routes } from '@angular/router';
+import { SharedModule } from '../shared/shared.module';
+import { CoreModule } from '../core/core.module';
+import { SurveyMsgComponent } from '../shared/components/survey-msg/survey-msg.component';
+const routes: Routes = [
+  {
+    path: '',
+    component: SurveyHomeComponent,
+  },
+ 
+];
+
+@NgModule({
+  declarations: [SurveyHomeComponent],
+  imports: [
+    CommonModule,
+    TranslateModule.forChild(),
+    IonicModule,
+    RouterModule.forChild(routes),
+    SharedModule,
+    CoreModule,
+  ],
+  providers: [],
+  entryComponents:[]
+})
+export class SurveyModule {}
diff --git a/src/app/module.service.ts b/src/app/module.service.ts
index 5181b8263..ce6b20405 100644
--- a/src/app/module.service.ts
+++ b/src/app/module.service.ts
@@ -1,6 +1,22 @@
 import { ContainerService } from 'services';
 import { TabOptions } from '../services/container.services';
 
+const LIBRARY_TAB = {
+    root: 'resources',
+    icon: 'resources',
+    label: 'LIBRARY_BNAV',
+    index: 1,
+    isSelected: true
+};
+
+const HOME_TAB = {
+    root: 'home',
+    icon: 'home',
+    label: 'FRMELEMNTS_LBL_TAB_HOME',
+    index: 1,
+    isSelected: true
+};
+
 const COURSE_TAB = {
     root: 'courses',
     icon: 'courses',
@@ -16,25 +32,34 @@ const COURSE_TAB_DISABLED = {
     disabled: true
 };
 
+const SEARCH_TAB = {
+    root: 'search',
+    icon: 'discover',
+    label: 'DISCOVER_BNAV',
+    index: 2
+};
+
 const SCANNER_TAB = {
     root: '',
     icon: 'qrscanner',
     label: '',
     index: 3
 };
-const LIBRARY_TAB = {
-    root: 'resources',
-    icon: 'resources',
-    label: 'LIBRARY_BNAV',
-    index: 1,
-    isSelected: true
+
+const DOWNLOADS_TAB = {
+    root: 'download-manager',
+    icon: 'downloads',
+    label: 'DOWNLOAD_BNAV',
+    index: 4
 };
+
 const GUEST_PROFILE_TAB = {
     root: 'guest-profile',
     icon: 'profile',
     label: 'PROFILE_BNAV',
     index: 5
 };
+
 const GUEST_PROFILE_SWITCH_TAB = {
     root: 'guest-profile',
     icon: 'profile',
@@ -42,6 +67,7 @@ const GUEST_PROFILE_SWITCH_TAB = {
     index: 5,
     isSelected: true
 };
+
 const PROFILE_TAB = {
     root: 'profile',
     icon: 'profile',
@@ -49,12 +75,7 @@ const PROFILE_TAB = {
     index: 5
 };
 
-const DOWNLOADS_TAB = {
-    root: 'download-manager',
-    icon: 'downloads',
-    label: 'DOWNLOAD_BNAV',
-    index: 4
-};
+// todo remove one from 'GUEST_TEACHER_TABS' or 'GUEST_STUDENT_TABS'
 
 export const GUEST_TEACHER_TABS = [
     LIBRARY_TAB,
@@ -80,30 +101,55 @@ export const GUEST_STUDENT_TABS = [
     GUEST_PROFILE_TAB
 ];
 
-// export const GUEST_STUDENT_TABS = [
-//     LIBRARY_TAB,
-//     COURSE_TAB_DISABLED,
-//     SCANNER_TAB,
-//     DOWNLOADS_TAB,
-//     GUEST_PROFILE_TAB
-// ];
+// todo name
+export const GUEST_HOME_SEARCH_TABS = [
+    HOME_TAB,
+    SEARCH_TAB,
+    SCANNER_TAB,
+    DOWNLOADS_TAB,
+    GUEST_PROFILE_TAB
+];
 
-export const GUEST_TEACHER_SWITCH_TABS = [
-    LIBRARY_TAB,
-    COURSE_TAB,
+export const LOGGEDIN_HOME_SEARCH_TABS = [
+    HOME_TAB,
+    SEARCH_TAB,
     SCANNER_TAB,
     DOWNLOADS_TAB,
-    GUEST_PROFILE_SWITCH_TAB
+    PROFILE_TAB
 ];
 
-export const GUEST_STUDENT_SWITCH_TABS = [
-    LIBRARY_TAB,
+export const LOGIN_ADMIN_TABS = [
+    HOME_TAB,
     COURSE_TAB,
     SCANNER_TAB,
     DOWNLOADS_TAB,
-    GUEST_PROFILE_SWITCH_TAB
+    PROFILE_TAB
 ];
 
+// export const GUEST_STUDENT_TABS = [
+//     LIBRARY_TAB,
+//     COURSE_TAB_DISABLED,
+//     SCANNER_TAB,
+//     DOWNLOADS_TAB,
+//     GUEST_PROFILE_TAB
+// ];
+
+// export const GUEST_TEACHER_SWITCH_TABS = [
+//     LIBRARY_TAB,
+//     COURSE_TAB,
+//     SCANNER_TAB,
+//     DOWNLOADS_TAB,
+//     GUEST_PROFILE_SWITCH_TAB
+// ];
+
+// export const GUEST_STUDENT_SWITCH_TABS = [
+//     LIBRARY_TAB,
+//     COURSE_TAB,
+//     SCANNER_TAB,
+//     DOWNLOADS_TAB,
+//     GUEST_PROFILE_SWITCH_TAB
+// ];
+
 // export const GUEST_STUDENT_SWITCH_TABS = [
 //     LIBRARY_TAB,
 //     COURSE_TAB_DISABLED,
diff --git a/src/app/my-groups/activity-details/activity-details.module.ts b/src/app/my-groups/activity-details/activity-details.module.ts
new file mode 100644
index 000000000..62b36d975
--- /dev/null
+++ b/src/app/my-groups/activity-details/activity-details.module.ts
@@ -0,0 +1,36 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { Routes, RouterModule } from '@angular/router';
+import { IonicModule } from '@ionic/angular';
+import { ActivityDetailsPage } from './activity-details.page';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
+import { TranslateModule } from '@ngx-translate/core';
+import { PipesModule } from '@app/pipes/pipes.module';
+import { RouterLinks } from '@app/app/app.constant';
+import { ActivityTocPage } from './../activity-toc/activity-toc.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ActivityDetailsPage
+  },
+  {
+    path: RouterLinks.ACTIVITY_TOC,
+    component: ActivityTocPage
+  }
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    CommonConsumptionModule,
+    TranslateModule.forChild(),
+    RouterModule.forChild(routes),
+    PipesModule
+  ],
+  declarations: [ActivityDetailsPage, ActivityTocPage]
+})
+export class ActivityDetailsPageModule {}
diff --git a/src/app/my-groups/activity-details/activity-details.page.html b/src/app/my-groups/activity-details/activity-details.page.html
new file mode 100644
index 000000000..947a247a8
--- /dev/null
+++ b/src/app/my-groups/activity-details/activity-details.page.html
@@ -0,0 +1,76 @@
+<ion-content>
+  <div class="ad-container">
+    <div class="ad-card-container">
+      <sb-course-card *ngIf="isTrackable" [section]="null"
+        [cardImg]="commonUtilService.getContentImg(activity)" [course]="activity">
+      </sb-course-card>
+      <sb-library-card *ngIf="!isTrackable" [content]="activity" [type]="'mobile_textbook'" (click)="onActivityCardClick($event, activity)"
+        [cardImg]="commonUtilService.getContentImg(activity)" [isMenu]="false"
+        (menuClick)="activityMenuClick($event, activity, i)">
+      </sb-library-card>
+    </div>
+    <!-- <div class="mb-8" *ngIf="isGroupCreatorOrAdmin">
+      <button class="sb-btn sb-btn-small" (click)="downloadCsv()">download</button>
+    </div> -->
+    <div class="ad-member-container">
+      <div class="ad-note" *ngIf="!isTrackable">
+        <span>{{'NOTE' | translate}} :</span>
+        {{'PROGRESS_CANNOT_BE_TRACKED' | translate: {'collectionType': activity.type } }}
+      </div>
+      <div class="font-14" *ngIf="showCourseDropdownSection">
+        <div class="activity-toc clearfix" (click)="openActivityToc()">
+          <span class="pull-left">{{selectedCourse?.name || activity?.name}}</span>
+          <div class="activity-toc-change pull-right">{{'CHANGE' | translate}}</div>
+        </div>
+      </div>
+      <div class="gd-member-search">
+        <ion-icon class="gd-member-search-icon" md="md-search"></ion-icon>
+        <input type="text" [(ngModel)]="searchMember" (ngModelChange)="onMemberSearch(searchMember)"
+          placeholder="{{'SEARCH_FOR_GROUP_MEMBER' | translate}}">
+      </div>
+      <div class="ad-timestamp-container clearfix">
+        <span *ngIf="isTrackable && isGroupCreatorOrAdmin && (!showCourseDropdownSection || (!selectedCourse || (selectedCourse?.name === activity?.name)))" (click)="downloadCsv()">
+          <img src="assets/imgs/ic_download_selected_joyful.svg" alt="">
+          <span>{{'DOWNLOAD_CSV' | translate}}</span>
+        </span>
+        <div *ngIf="getActivityAggLastUpdatedOn() > 0" class="ad-timestamp"
+          [innerHTML]="'LAST_UPDATED' | translate:  {'%s': (getActivityAggLastUpdatedOn() | dateAgo: 'month' : 'M/d/yy') }">
+        </div>
+      </div>
+     
+
+      <div class="ad-mebers-container">
+        <div *ngIf="isActivityLoading">
+          <div *ngFor="let item of [0,1,2,3,4,5,6,7,8,9]">
+            <sb-member-card [isLoading]="true"
+              [config]="{size:'medium', isBold:false, isSelectable:false, view:'horizontal'}"></sb-member-card>
+          </div>
+        </div>
+        <div *ngIf="!isActivityLoading">
+          <div *ngFor="let member of filteredMemberList; let i = index">
+            <sb-member-card *ngIf="isTrackable" [config]="{size:'medium', isBold:false, isSelectable:false, view:'horizontal'}"
+              [identifier]="member.userId" [indexOfMember]="i" [initial]="member.name | initial"
+              [title]="getMemberName(member)" [progressDisplay]="getMemberProgress(member)">
+            </sb-member-card>
+            <sb-member-card *ngIf="!isTrackable" [config]="{size:'medium', isBold:false, isSelectable:false, view:'horizontal'}"
+              [identifier]="member.userId" [indexOfMember]="i" [initial]="member.name | initial"
+              [title]="getMemberName(member)">
+            </sb-member-card>
+          </div>
+        </div>
+        <div
+          *ngIf="(!isActivityLoading && !filteredMemberList) || (!isActivityLoading && filteredMemberList?.length <= 1)"
+          class="text-center">
+          <div class="ad-empty-result" *ngIf="!memberSearchQuery">
+            <img src="assets/imgs/no_member.svg" alt="">
+          </div>
+          <div class="ad-empty-result" *ngIf="memberSearchQuery && !filteredMemberList?.length">
+            <img src="assets/imgs/empty_search_result.svg" alt="">
+            <p>{{'EMPTY_SEARCH_RESULT_GROUPS' | translate}}</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</ion-content>
\ No newline at end of file
diff --git a/src/app/my-groups/activity-details/activity-details.page.scss b/src/app/my-groups/activity-details/activity-details.page.scss
new file mode 100644
index 000000000..95eac5e33
--- /dev/null
+++ b/src/app/my-groups/activity-details/activity-details.page.scss
@@ -0,0 +1,89 @@
+@import "src/assets/styles/_variables.scss";
+.ad-container{
+    padding: 16px;
+}
+.ad-card-container{
+    padding-bottom: 16px;
+}
+.ad-member-container{
+    box-shadow: 0 2px 7px 0 rgba(0,0,0,0.25);
+}
+.gd-member-search {
+    position: relative;
+    margin: 0 0 8px 0;
+    padding: 0 8px;
+    padding-top: 16px;
+    .gd-member-search-icon {
+        position: absolute;
+        font-size: 20px;
+        color: $gray-400;
+        top: 24px;
+        left: 16px;
+    }
+    input {
+        width: 100%;
+        height: 35px;
+        padding: 0 8px 0 30px;
+        border: 1px solid $blue;
+        border-radius: 4px;
+    }
+}
+.ad-courses-container {
+    margin-top: 8px;
+    padding: 8px;
+    .ad-courses{
+        color: $blue;
+        .ad-course-text{
+            font-weight: bold;
+        }
+    }
+    .ad-course-name{
+        padding: 0 4px;
+    }
+}
+.ad-timestamp-container{
+    padding: 8px;
+    color: map-get($colors, primary);
+    .ad-timestamp{
+        color: $gray-300;
+        float: right;
+        text-align: right;
+    }
+}
+.ad-mebers-container{
+    min-height: calc(100vh - 215px);
+}
+.ad-empty-result{
+    img{
+        max-width: 65%;
+        margin-top: 20%;
+        margin-bottom: 16px;
+        font-size: 16px;
+    }
+}
+.activity-toc {
+    background-color: $blue;
+    color: map-get($colors, white);
+    padding: 8px;
+    border-top-right-radius: 4px;
+    border-top-left-radius: 4px;
+
+    .pull-left {
+        position: relative;
+        top: 6px;
+    }
+    .activity-toc-change{
+        color: $blue;
+        border-radius: 15px;
+        padding: 8px 16px;
+        font-size: 14px;
+        background-color: map-get($colors, white);
+        line-height: 15px;
+    }
+}
+.ad-note{
+    padding: 8px 8px 0 8px;
+    span{
+        color: map-get($colors, vivid_red);
+    }
+}
\ No newline at end of file
diff --git a/src/app/my-groups/activity-details/activity-details.page.spec.ts b/src/app/my-groups/activity-details/activity-details.page.spec.ts
new file mode 100644
index 000000000..9f67608d8
--- /dev/null
+++ b/src/app/my-groups/activity-details/activity-details.page.spec.ts
@@ -0,0 +1,902 @@
+import { ActivityDetailsPage } from './activity-details.page';
+import { Router } from '@angular/router';
+import { FilterPipe } from '@app/pipes/filter/filter.pipe';
+import {
+    CommonUtilService, Environment, ImpressionType,
+    PageId, TelemetryGeneratorService
+} from '@app/services';
+import { GroupService, GroupMemberRole, MimeType } from '@project-sunbird/sunbird-sdk';
+import { AppHeaderService, CollectionService, AppGlobalService, InteractType, InteractSubtype, AndroidPermissionsService } from '../../../services';
+import { Platform } from '@ionic/angular';
+import { Location } from '@angular/common';
+import { of } from 'rxjs';
+import { CsGroupActivityAggregationMetric } from '@project-sunbird/client-services/services/group/activity';
+import { RouterLinks } from '../../app.constant';
+import { FileOpener } from '@ionic-native/file-opener/ngx';
+import { AppVersion } from '@ionic-native/app-version/ngx';
+import { File } from '@ionic-native/file/ngx';
+import { doesNotReject } from 'assert';
+
+describe('ActivityDetailsPage', () => {
+    let activityDetailsPage: ActivityDetailsPage;
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        showToast: jest.fn(),
+        translateMessage: jest.fn()
+    };
+    const mockFilterPipe: Partial<FilterPipe> = {};
+    const mockGroupService: Partial<GroupService> = {};
+    const mockHeaderService: Partial<AppHeaderService> = {};
+    const mockLocation: Partial<Location> = {};
+    const mockPlatform: Partial<Platform> = {};
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => ({
+            extras: {
+                state: {
+                    memberList: ['member-1'],
+                    loggedinUser: {
+                        userId: 'sample-user-id-1'
+                    },
+                    group: {
+                        id: 'sample-group-id'
+                    },
+                    activity: {
+                        id: 'sample-id',
+                        type: 'sample-type'
+                    }
+                }
+            }
+        })) as any
+    };
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateInteractTelemetry: jest.fn()
+    };
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        selectedActivityCourseId: ''
+    };
+    const mockCollectionService: Partial<CollectionService> = {
+        fetchCollectionData: jest.fn(() => Promise.reject(''))
+    };
+    const mockFileService: Partial<File> = {
+    };
+    const mockPermissionService: Partial<AndroidPermissionsService> = {
+    };
+    const mockFileOpener: Partial<FileOpener> = {
+    };
+    const mockAppVersion: Partial<AppVersion> = {
+        getAppName: jest.fn(() => Promise.resolve('sample_app_name'))
+    };
+
+    beforeAll(() => {
+        activityDetailsPage = new ActivityDetailsPage(
+            mockGroupService as GroupService,
+            mockHeaderService as AppHeaderService,
+            mockRouter as Router,
+            mockFilterPipe as FilterPipe,
+            mockCommonUtilService as CommonUtilService,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockLocation as Location,
+            mockPlatform as Platform,
+            mockCollectionService as CollectionService,
+            mockAppGlobalService as AppGlobalService,
+            mockFileService as File,
+            mockPermissionService as AndroidPermissionsService,
+            mockFileOpener as FileOpener,
+            mockAppVersion as AppVersion
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+        mockGroupService.activityService = {
+            getDataAggregation: jest.fn(() => of({
+                members: [{
+                    role: GroupMemberRole.ADMIN,
+                    createdBy: 'sample-creator',
+                    name: 'member-name',
+                    userId: 'sample-user-id-1',
+                    agg: [{
+                        metric: 'completedCount',
+                        value: 2
+                    }]
+                }, {
+                    role: GroupMemberRole.MEMBER,
+                    createdBy: 'sample-creator',
+                    name: 'member-name',
+                    userId: 'sample-user-id-2',
+                    agg: [{
+                        metric: 'completedCount',
+                        value: 1
+                    }]
+                }],
+                activity: {
+                    id: 'activity-id',
+                    type: 'activity-type',
+                    agg: {}
+                }
+            })) as any
+        };
+    });
+
+    it('should be create a instance of activityDetailsPage', () => {
+        expect(activityDetailsPage).toBeTruthy();
+    });
+
+    it('should return filter memberList', () => {
+        mockFilterPipe.transform = jest.fn(() => []);
+        activityDetailsPage.onMemberSearch('');
+        expect(mockFilterPipe.transform).toHaveBeenCalled();
+    });
+
+    describe('ngOnInit', () => {
+        it('should generate impression telemetry', () => {
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            activityDetailsPage.ngOnInit();
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                ImpressionType.VIEW,
+                '',
+                PageId.ACTIVITY_DETAIL,
+                Environment.GROUP,
+                undefined, undefined, undefined, undefined, activityDetailsPage.corRelationList);
+        });
+    });
+
+    describe('ionViewWillEnter', () => {
+        beforeEach(() => {
+            mockCollectionService.fetchCollectionData = jest.fn(() => Promise.reject('err'));
+        });
+
+        it('should handle device header and back-button for b.userId', (done) => {
+            mockCollectionService.fetchCollectionData = jest.fn(() => Promise.reject('err'));
+            activityDetailsPage.group = { id: 'group-id' } as any;
+            activityDetailsPage.loggedinUser = {
+                userId: 'userId'
+            } as any;
+            // mockCollectionService.fetchCollectionData = jest.fn(() => Promise.reject(''));
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn(() => { })
+            });
+            jest.spyOn(activityDetailsPage, 'handleHeaderEvents').mockImplementation();
+            jest.spyOn(activityDetailsPage, 'handleDeviceBackButton').mockImplementation();
+            activityDetailsPage.courseData = {
+                contentData: {
+                    leafNodes: ['node1']
+                }
+            } as any;
+            mockGroupService.activityService = {
+                getDataAggregation: jest.fn(() => of({
+                    members: [{
+                        role: GroupMemberRole.MEMBER,
+                        createdBy: 'sample-creator',
+                        name: 'member-name',
+                        userId: 'sample-user-id-2',
+                        agg: [{
+                            metric: 'completedCount',
+                            value: 2
+                        }]
+                    }, {
+                        role: GroupMemberRole.ADMIN,
+                        createdBy: 'sample-creator',
+                        name: 'member-name',
+                        userId: 'sample-user-id-1',
+                        agg: [{
+                            metric: 'completedCount',
+                            value: 1
+                        }]
+                    }],
+                    activity: {
+                        id: 'activity-id',
+                        type: 'activity-type',
+                        agg: {}
+                    }
+                })) as any
+            };
+            activityDetailsPage.activity = {
+                type: 'Course'
+            };
+            // act
+            activityDetailsPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+                expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+                expect(mockGroupService.activityService).not.toBeUndefined();
+                done();
+            }, 0);
+        });
+
+        it('should set selected course', (done) => {
+            const cData = {
+                children: [{
+                    contentType: 'collection',
+                    children: [
+                        {
+                            contentType: 'Course',
+                            identifier: 'id1',
+                            mimeType: MimeType.COLLECTION
+                        },
+                        {
+                            contentType: 'collection',
+                            children: [
+                                {
+                                    contentType: 'Course',
+                                    identifier: 'id2',
+                                    name: 'name2',
+                                    mimeType: MimeType.COLLECTION,
+                                    contentData: {
+                                        leafNodes: ['node1']
+                                    }
+                                }
+                            ]
+                        }
+                    ]
+                }],
+                contentData: {
+                    leafNodes: ['node1']
+                }
+            };
+            mockCollectionService.fetchCollectionData = jest.fn(() => Promise.resolve(cData));
+            mockAppGlobalService.selectedActivityCourseId = 'id2';
+            activityDetailsPage.group = { id: 'group-id' } as any;
+            activityDetailsPage.loggedinUser = {
+                userId: 'userId'
+            } as any;
+            // mockCollectionService.fetchCollectionData = jest.fn(() => Promise.reject(''));
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn(() => { })
+            });
+            jest.spyOn(activityDetailsPage, 'handleHeaderEvents').mockImplementation();
+            jest.spyOn(activityDetailsPage, 'handleDeviceBackButton').mockImplementation();
+            activityDetailsPage.courseData = {
+                contentData: {
+                    leafNodes: ['node1']
+                }
+            } as any;
+            mockGroupService.activityService = {
+                getDataAggregation: jest.fn(() => of({
+                    members: [{
+                        role: GroupMemberRole.MEMBER,
+                        createdBy: 'sample-creator',
+                        name: 'member-name',
+                        userId: 'sample-user-id-2',
+                        agg: [{
+                            metric: 'completedCount',
+                            value: 2
+                        }]
+                    }, {
+                        role: GroupMemberRole.ADMIN,
+                        createdBy: 'sample-creator',
+                        name: 'member-name',
+                        userId: 'sample-user-id-1',
+                        agg: [{
+                            metric: 'completedCount',
+                            value: 1
+                        }]
+                    }],
+                    activity: {
+                        id: 'activity-id',
+                        type: 'activity-type',
+                        agg: {}
+                    }
+                })) as any
+            };
+            // act
+            activityDetailsPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+                expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+                expect(mockGroupService.activityService).not.toBeUndefined();
+                expect(activityDetailsPage.courseList.length).toEqual(2);
+                expect(activityDetailsPage.selectedCourse.name).toEqual('name2');
+                done();
+            }, 0);
+        });
+
+        it('should not set selected course', (done) => {
+            const cData = {
+                children: [{
+                    contentType: 'collection',
+                    children: [
+                        {
+                            contentType: 'Course',
+                            identifier: 'id1',
+                            mimeType: MimeType.COLLECTION
+                        },
+                        {
+                            contentType: 'collection',
+                            children: [
+                                {
+                                    contentType: 'Course',
+                                    identifier: 'id2',
+                                    mimeType: MimeType.COLLECTION
+                                }
+                            ]
+                        }
+                    ]
+                }],
+                contentData: {
+                    leafNodes: ['node1']
+                }
+            };
+            mockCollectionService.fetchCollectionData = jest.fn(() => Promise.resolve(cData));
+            mockAppGlobalService.selectedActivityCourseId = '';
+            activityDetailsPage.group = { id: 'group-id' } as any;
+            activityDetailsPage.loggedinUser = {
+                userId: 'userId'
+            } as any;
+            // mockCollectionService.fetchCollectionData = jest.fn(() => Promise.reject(''));
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn(() => { })
+            });
+            jest.spyOn(activityDetailsPage, 'handleHeaderEvents').mockImplementation();
+            jest.spyOn(activityDetailsPage, 'handleDeviceBackButton').mockImplementation();
+            activityDetailsPage.courseData = {
+                contentData: {
+                    leafNodes: ['node1']
+                }
+            } as any;
+            mockGroupService.activityService = {
+                getDataAggregation: jest.fn(() => of({
+                    members: [{
+                        role: GroupMemberRole.MEMBER,
+                        createdBy: 'sample-creator',
+                        name: 'member-name',
+                        userId: 'sample-user-id-2',
+                        agg: [{
+                            metric: 'completedCount',
+                            value: 2
+                        }]
+                    }, {
+                        role: GroupMemberRole.ADMIN,
+                        createdBy: 'sample-creator',
+                        name: 'member-name',
+                        userId: 'sample-user-id-1',
+                        agg: [{
+                            metric: 'completedCount',
+                            value: 1
+                        }]
+                    }],
+                    activity: {
+                        id: 'activity-id',
+                        type: 'activity-type',
+                        agg: {}
+                    }
+                })) as any
+            };
+            // act
+            activityDetailsPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+                expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+                expect(mockGroupService.activityService).not.toBeUndefined();
+                expect(activityDetailsPage.courseList.length).toEqual(2);
+                expect(activityDetailsPage.selectedCourse).toBe('');
+                done();
+            }, 0);
+        });
+
+        it('should handle device header and back-button for admin', (done) => {
+            activityDetailsPage.group = { id: 'group-id' } as any;
+            activityDetailsPage.loggedinUser = {
+                userId: 'userId'
+            } as any;
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn(() => { })
+            });
+            jest.spyOn(activityDetailsPage, 'handleHeaderEvents').mockImplementation();
+            jest.spyOn(activityDetailsPage, 'handleDeviceBackButton').mockImplementation();
+            mockGroupService.activityService = {
+                getDataAggregation: jest.fn(() => of({
+                    members: [{
+                        role: GroupMemberRole.ADMIN,
+                        createdBy: 'sample-creator',
+                        name: 'member-name',
+                        userId: 'userId',
+                        agg: [{
+                            metric: 'completedCount',
+                            value: 2
+                        }]
+                    }, {
+                        role: GroupMemberRole.MEMBER,
+                        createdBy: 'sample-creator',
+                        name: 'member-name',
+                        userId: 'sample-user-id-2',
+                        agg: [{
+                            metric: 'completedCount',
+                            value: 1
+                        }]
+                    }],
+                    activity: {
+                        id: 'activity-id',
+                        type: 'activity-type',
+                        agg: {}
+                    }
+                })) as any
+            };
+            // act
+            activityDetailsPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+                expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+                expect(mockGroupService.activityService).not.toBeUndefined();
+                done();
+            }, 0);
+        });
+
+        it('should handle device header and back-button for b.role is member', (done) => {
+            activityDetailsPage.group = { id: 'group-id' } as any;
+            activityDetailsPage.loggedinUser = {
+                userId: 'userId'
+            } as any;
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn(() => { })
+            });
+            jest.spyOn(activityDetailsPage, 'handleHeaderEvents').mockImplementation();
+            jest.spyOn(activityDetailsPage, 'handleDeviceBackButton').mockImplementation();
+            mockGroupService.activityService = {
+                getDataAggregation: jest.fn(() => of({
+                    members: [{
+                        role: GroupMemberRole.ADMIN,
+                        createdBy: 'sample-creator',
+                        name: 'member-name',
+                        userId: 'sample-user-id-',
+                        agg: [{
+                            metric: 'completedCount',
+                            value: 2
+                        }]
+                    }, {
+                        role: GroupMemberRole.MEMBER,
+                        createdBy: 'sample-creator',
+                        name: 'member-name',
+                        userId: 'userId',
+                        agg: [{
+                            metric: 'completedCount',
+                            value: 2
+                        }]
+                    }],
+                    activity: {
+                        id: 'activity-id',
+                        type: 'activity-type',
+                        agg: {}
+                    }
+                })) as any
+            };
+            // act
+            activityDetailsPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+                expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+                expect(mockGroupService.activityService).not.toBeUndefined();
+                done();
+            }, 0);
+        });
+
+        it('should handle device header and back-button for a.role is member', (done) => {
+            activityDetailsPage.group = { id: 'group-id' } as any;
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn(() => { })
+            });
+            jest.spyOn(activityDetailsPage, 'handleHeaderEvents').mockImplementation();
+            jest.spyOn(activityDetailsPage, 'handleDeviceBackButton').mockImplementation();
+            // act
+            activityDetailsPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+                expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+                expect(mockGroupService.activityService).not.toBeUndefined();
+                done();
+            }, 0);
+        });
+
+        it('should handle device header and back-button for nothing match', (done) => {
+            activityDetailsPage.group = { id: 'group-id' } as any;
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn(() => { })
+            });
+            jest.spyOn(activityDetailsPage, 'handleHeaderEvents').mockImplementation();
+            jest.spyOn(activityDetailsPage, 'handleDeviceBackButton').mockImplementation();
+            // act
+            activityDetailsPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+                expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+                expect(mockGroupService.activityService).not.toBeUndefined();
+                done();
+            }, 0);
+        });
+
+        it('should handle device header and back-button for undefined memberList', (done) => {
+            activityDetailsPage.group = { id: 'group-id' } as any;
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn(() => { })
+            });
+            jest.spyOn(activityDetailsPage, 'handleHeaderEvents').mockImplementation();
+            jest.spyOn(activityDetailsPage, 'handleDeviceBackButton').mockImplementation();
+            mockGroupService.activityService = {
+                getDataAggregation: jest.fn(() => of({
+                    members: undefined,
+                    activity: {
+                        id: 'activity-id',
+                        type: 'activity-type',
+                        agg: {}
+                    }
+                })) as any
+            };
+            // act
+            activityDetailsPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+                expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+                expect(mockGroupService.activityService).not.toBeUndefined();
+                done();
+            }, 0);
+        });
+
+        it('should handle device header and back-button for undefined response', (done) => {
+            const cData = {
+                children: [{
+                    contentType: 'collection',
+                }],
+                contentData: {
+                    leafNodes: ['node1']
+                }
+            };
+            mockCollectionService.fetchCollectionData = jest.fn(() => Promise.resolve(cData));
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn(() => { })
+            });
+            jest.spyOn(activityDetailsPage, 'handleHeaderEvents').mockImplementation();
+            jest.spyOn(activityDetailsPage, 'handleDeviceBackButton').mockImplementation();
+            mockGroupService.activityService = {
+                getDataAggregation: jest.fn(() => of(undefined))
+            };
+            // act
+            activityDetailsPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+                expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+                expect(mockGroupService.activityService).not.toBeUndefined();
+                done();
+            }, 0);
+        });
+    });
+
+    it('should generate telemetry for back clicked', () => {
+        mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+        mockLocation.back = jest.fn();
+        // act
+        activityDetailsPage.handleBackButton(true);
+        // assert
+        expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+            PageId.ACTIVITY_DETAIL, Environment.GROUP, true, undefined, activityDetailsPage.corRelationList);
+        expect(mockLocation.back).toHaveBeenCalled();
+    });
+
+    it('should handle device back button', () => {
+        const data = {
+            name: 'back'
+        };
+        jest.spyOn(activityDetailsPage, 'handleBackButton').mockImplementation(() => {
+            return;
+        });
+        activityDetailsPage.handleHeaderEvents(data);
+        expect(data.name).toBe('back');
+    });
+
+    it('should invoked handleDeviceBackButton', () => {
+        mockPlatform.backButton = {
+            subscribeWithPriority: jest.fn((_, fn) => fn(Promise.resolve({ event: {} }))) as any
+        } as any;
+        jest.spyOn(activityDetailsPage, 'handleBackButton').mockImplementation();
+        // act
+        activityDetailsPage.handleDeviceBackButton();
+        // assert
+        expect(mockPlatform.backButton).not.toBeUndefined();
+    });
+
+    describe('ionViewWillLeave', () => {
+        it('should unsubscribe all header service', () => {
+            activityDetailsPage.unregisterBackButton = {
+                unsubscribe: jest.fn()
+            } as any;
+            // act
+            activityDetailsPage.ionViewWillLeave();
+            // assert
+            expect(activityDetailsPage.unregisterBackButton).not.toBeUndefined();
+        });
+
+        it('should not unsubscribe all header service', () => {
+            activityDetailsPage.unregisterBackButton = undefined;
+            // act
+            activityDetailsPage.ionViewWillLeave();
+            // assert
+            expect(activityDetailsPage.unregisterBackButton).toBeUndefined();
+        });
+    });
+
+    describe('getMemberName', () => {
+        it('should return memberName if userId is matched', () => {
+            const member = {
+                userId: 'sample-user-id-1',
+                name: 'sample-member-name'
+            };
+            activityDetailsPage.loggedinUser = {
+                userId: 'sample-user-id-1'
+            } as any;
+            mockCommonUtilService.translateMessage = jest.fn(() => '');
+            // act
+            activityDetailsPage.getMemberName(member);
+            // assert
+            expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('LOGGED_IN_MEMBER', { member_name: member.name });
+        });
+
+        it('should return memberName if userId is not matched', () => {
+            const member = {
+                user: 'sample-user-id',
+                name: 'sample-member-name'
+            };
+            // act
+            activityDetailsPage.getMemberName(member);
+        });
+    });
+
+    describe('getActivityAggLastUpdatedOn', () => {
+        it('should return lastUpdatedOn for activityAgg lastUpdatedOn as a string', () => {
+            activityDetailsPage.activityDetail = {
+                agg: [{
+                    metric: CsGroupActivityAggregationMetric.ENROLMENT_COUNT,
+                    lastUpdatedOn: '70'
+                }]
+            };
+            // act
+            const data = activityDetailsPage.getActivityAggLastUpdatedOn();
+            // assert
+            expect(data).toBe(70);
+        });
+
+        it('should return lastUpdatedOn for activityAgg lastUpdatedOn as a number', () => {
+            activityDetailsPage.activityDetail = {
+                agg: [{
+                    metric: CsGroupActivityAggregationMetric.ENROLMENT_COUNT,
+                    lastUpdatedOn: 50
+                }]
+            };
+            // act
+            const data = activityDetailsPage.getActivityAggLastUpdatedOn();
+            // assert
+            expect(data).toBe(50);
+        });
+
+        it('should return lastUpdatedOn for activityAgg lastUpdatedOn is undefined', () => {
+            activityDetailsPage.activityDetail = {
+                agg: [{
+                    metric: CsGroupActivityAggregationMetric.ENROLMENT_COUNT,
+                    lastUpdatedOn: undefined
+                }]
+            };
+            // act
+            const data = activityDetailsPage.getActivityAggLastUpdatedOn();
+            // assert
+            expect(data).toBe(0);
+        });
+
+        it('should return 0 for activityAgg is empty for else part', () => {
+            activityDetailsPage.activityDetail = {
+                agg: undefined
+            };
+            // act
+            const data = activityDetailsPage.getActivityAggLastUpdatedOn();
+            // assert
+            expect(data).toBe(0);
+        });
+    });
+
+    it('should openActivityToc', () => {
+        // arrange
+        mockRouter.navigate = jest.fn();
+        activityDetailsPage.activity = {
+            activityInfo: {
+                name: 'course1'
+            }
+        } as any;
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        // act
+        activityDetailsPage.openActivityToc();
+        // assert
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH, InteractSubtype.SELECT_NESTED_ACTIVITY_CLICKED,
+            Environment.GROUP, PageId.ACTIVITY_DETAIL,
+            undefined, undefined, undefined, activityDetailsPage.corRelationList);
+        expect(mockRouter.navigate).toHaveBeenCalledWith(
+            [`/${RouterLinks.MY_GROUPS}/${RouterLinks.ACTIVITY_DETAILS}/${RouterLinks.ACTIVITY_TOC}`],
+            expect.anything()
+        );
+    });
+    it('should reset selectedActivity Id', () => {
+        activityDetailsPage.ngOnDestroy();
+        expect(mockAppGlobalService.selectedActivityCourseId).toBe('');
+    });
+    describe('openCSV', () => {
+        it('should open Intent for opening CSV', () => {
+            //arrange
+            mockFileOpener.open = jest.fn(() => Promise.resolve('msg'))
+            const type = 'text/csv';
+            //act
+            activityDetailsPage.openCsv('path')
+            //assert
+            expect( mockFileOpener.open).toHaveBeenCalledWith('path', type)
+        })
+        it('should open Intent for opening CSV', (done) => {
+            //arrange
+            mockFileOpener.open = jest.fn(() => Promise.reject('msg'))
+            const type = 'text/csv';
+            //act
+            activityDetailsPage.openCsv('path')
+            //assert
+            expect( mockFileOpener.open).toHaveBeenCalledWith('path', type)
+            setTimeout(() => {
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('CERTIFICATE_ALREADY_DOWNLOADED');
+               
+                done();
+            }, 0);
+        })
+    })
+
+    describe('checkForPermissions', () => {
+        it('should return true if permissions are already accepted', () => {
+            // arrange
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve({hasPermission: true}))
+            // act
+            activityDetailsPage.checkForPermissions().then((res) => {
+                expect(res).toBe(true)
+            })
+        })
+        it('should return false if permissions are not accepted', () => {
+            // arrange
+            mockCommonUtilService.showSettingsPageToast = jest.fn();
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve({isPermissionAlwaysDenied: true}))
+            // act
+            activityDetailsPage.checkForPermissions().then((res) => {
+                expect(res).toBe(false)
+                expect(mockCommonUtilService.showSettingsPageToast).toHaveBeenCalledWith(
+                    'FILE_MANAGER_PERMISSION_DESCRIPTION',
+                    undefined,
+                    'profile',
+                    true
+                )
+            })
+        })
+
+        it('should show settinngs toast when user doesnt give permission', (done) => {
+            // arrange
+            mockCommonUtilService.showSettingsPageToast = jest.fn();
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve({isPermissionAlwaysDenied: false}))
+            mockCommonUtilService.buildPermissionPopover = jest.fn(async (callback) => {
+                await callback(mockCommonUtilService.translateMessage('NOT_NOW'));
+                return {
+                    present: jest.fn(() => Promise.resolve())
+                };
+            });
+            // act
+            activityDetailsPage.checkForPermissions()
+            setTimeout(() => {
+                expect(mockCommonUtilService.showSettingsPageToast).toHaveBeenCalledWith(
+                    'FILE_MANAGER_PERMISSION_DESCRIPTION',
+                    undefined,
+                    PageId.PROFILE, true
+                )
+                done()
+            });
+        })
+        it('should return true if user gives permission', (done) => {
+            // arrange
+            mockCommonUtilService.showSettingsPageToast = jest.fn();
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve({isPermissionAlwaysDenied: false}))
+            mockCommonUtilService.buildPermissionPopover = jest.fn(async (callback) => {
+                await callback(mockCommonUtilService.translateMessage('ALLOW'));
+                return {
+                    present: jest.fn(() => Promise.resolve())
+                };
+            });
+            mockPermissionService.requestPermission = jest.fn(() => of({hasPermission: true}))
+            // act
+            activityDetailsPage.checkForPermissions()
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled()
+                done()
+            });
+        })
+
+        it('should show toast when permissions not set', (done) => {
+            // arrange
+            mockCommonUtilService.showSettingsPageToast = jest.fn();
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve({isPermissionAlwaysDenied: false}))
+            mockCommonUtilService.buildPermissionPopover = jest.fn(async (callback) => {
+                await callback(mockCommonUtilService.translateMessage('ALLOW'));
+                return {
+                    present: jest.fn(() => Promise.resolve())
+                };
+            });
+            mockPermissionService.requestPermission = jest.fn(() => of({isPermissionAlwaysDenied: true}))
+            // act
+            activityDetailsPage.checkForPermissions()
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled()
+                expect(mockCommonUtilService.showSettingsPageToast).toHaveBeenCalledWith(
+                    'FILE_MANAGER_PERMISSION_DESCRIPTION',
+                    undefined,
+                    PageId.PROFILE, true
+                )
+                done()
+            });
+        })
+    })
+    describe('convertToCSV', () => {
+        it('should return CSV', () => {
+            // arrange
+            const memberList = [
+                {
+                    name: 'name1',
+                    agg: [
+                        {metric: "progress", value: 100}
+                    ]
+                }
+            ]
+            activityDetailsPage.courseData = {
+                name: 'some_name'
+            } as any
+            //act
+            activityDetailsPage.convertToCSV(memberList)
+        })
+    })
+    describe('downloadCSV', () => {
+        it('should download csv successfully', (done) => {
+            // arrange
+            activityDetailsPage.memberList = [
+                {
+                    name: 'name1',
+                    agg: [
+                        {metric: "progress", value: 100}
+                    ]
+                }
+            ];
+            activityDetailsPage.courseData = {
+                name: 'sample_name'
+            } as any;
+            jest.spyOn(activityDetailsPage, 'checkForPermissions').mockResolvedValue(true);
+            mockFileService.writeFile = jest.fn(() => Promise.resolve('path'));
+            jest.spyOn(activityDetailsPage, 'openCsv').mockImplementation();
+            
+            //act
+            activityDetailsPage.downloadCsv()
+            //assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.DOWNLOAD_CLICKED,
+                    Environment.USER,
+                    PageId.ACTIVITY_DETAIL, undefined,
+                )
+                expect(activityDetailsPage.openCsv).toHaveBeenCalled();
+                done();
+            });
+        })
+    })
+});
diff --git a/src/app/my-groups/activity-details/activity-details.page.ts b/src/app/my-groups/activity-details/activity-details.page.ts
new file mode 100644
index 000000000..683819583
--- /dev/null
+++ b/src/app/my-groups/activity-details/activity-details.page.ts
@@ -0,0 +1,373 @@
+import {
+  Component, OnInit, Inject, OnDestroy
+} from '@angular/core';
+import { Router } from '@angular/router';
+import { Location } from '@angular/common';
+import { FilterPipe } from '@app/pipes/filter/filter.pipe';
+import {
+  CommonUtilService, PageId, Environment, AppHeaderService,
+  ImpressionType, TelemetryGeneratorService,
+  CollectionService, AppGlobalService, InteractSubtype, InteractType, AndroidPermissionsService
+} from '@app/services';
+import {
+  GroupService, GroupActivityDataAggregationRequest,
+  GroupMember, CachedItemRequestSourceFrom, Content,
+  Group, MimeType, CorrelationData, TrackingEnabled
+} from '@project-sunbird/sunbird-sdk';
+import {
+  CsGroupActivityDataAggregation,
+  CsGroupActivityAggregationMetric
+} from '@project-sunbird/client-services/services/group/activity';
+import { Platform } from '@ionic/angular';
+import { Subscription } from 'rxjs';
+import { RouterLinks } from './../../app.constant';
+import { CsContentType } from '@project-sunbird/client-services/services/content';
+import { File } from '@ionic-native/file/ngx';
+import { AndroidPermission, AndroidPermissionsStatus } from '@app/services/android-permissions/android-permission';
+import { FileOpener } from '@ionic-native/file-opener/ngx';
+import { AppVersion } from '@ionic-native/app-version/ngx';
+
+@Component({
+  selector: 'app-activity-details',
+  templateUrl: './activity-details.page.html',
+  styleUrls: ['./activity-details.page.scss'],
+})
+export class ActivityDetailsPage implements OnInit, OnDestroy {
+
+  corRelationList: Array<CorrelationData>;
+  isActivityLoading = false;
+  loggedinUser: GroupMember;
+  headerObservable: any;
+  unregisterBackButton: Subscription;
+  searchMember = '';
+  memberList: any;
+  activityDetail: any;
+  filteredMemberList: any;
+  memberSearchQuery: string;
+  group: Group;
+  activity: any;
+  courseList = [];
+  showCourseDropdownSection = false;
+  selectedCourse;
+  courseData: Content;
+  isTrackable = false;
+  isGroupCreatorOrAdmin = false;
+  appName: string;
+
+  constructor(
+    @Inject('GROUP_SERVICE') public groupService: GroupService,
+    private headerService: AppHeaderService,
+    private router: Router,
+    private filterPipe: FilterPipe,
+    private commonUtilService: CommonUtilService,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+    private location: Location,
+    private platform: Platform,
+    private collectionService: CollectionService,
+    private appGlobalService: AppGlobalService,
+    private file: File,
+    private permissionService: AndroidPermissionsService,
+    private fileOpener: FileOpener,
+    private appVersion: AppVersion
+  ) {
+    const extras = this.router.getCurrentNavigation().extras.state;
+    this.loggedinUser = extras.loggedinUser;
+    this.group = extras.group;
+    this.activity = extras.activity;
+    this.corRelationList = extras.corRelation;
+    this.isTrackable = this.activity.trackable && (this.activity.trackable.enabled === TrackingEnabled.YES) ;
+    this.isGroupCreatorOrAdmin = extras.isGroupCreatorOrAdmin;
+  }
+
+  async ngOnInit() {
+    this.telemetryGeneratorService.generateImpressionTelemetry(
+      ImpressionType.VIEW, '', PageId.ACTIVITY_DETAIL, Environment.GROUP,
+      undefined, undefined, undefined, undefined, this.corRelationList);
+      this.appName = await this.appVersion.getAppName();
+  }
+
+  async ionViewWillEnter() {
+    this.headerService.showHeaderWithBackButton();
+    this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
+      this.handleHeaderEvents(eventName);
+    });
+    this.handleDeviceBackButton();
+    this.courseList = [];
+    try {
+      this.courseData = await this.collectionService.fetchCollectionData(this.activity.identifier);
+      this.getNestedCourses(this.courseData.children);
+      if (this.courseList.length) {
+        this.showCourseDropdownSection = true;
+      }
+    } catch (err) {
+      console.log('fetchCollectionData err', err);
+    }
+    this.selectedCourse = this.courseList.find((s) => s.identifier === this.appGlobalService.selectedActivityCourseId) || '';
+    this.getActvityDetails(this.appGlobalService.selectedActivityCourseId || this.activity.identifier);
+  }
+
+  ionViewWillLeave() {
+    this.headerObservable.unsubscribe();
+    if (this.unregisterBackButton) {
+      this.unregisterBackButton.unsubscribe();
+    }
+  }
+
+  ngOnDestroy() {
+    this.appGlobalService.selectedActivityCourseId = '';
+  }
+
+  private async getActvityDetails(id) {
+    const req: GroupActivityDataAggregationRequest = {
+      from: CachedItemRequestSourceFrom.SERVER,
+      groupId: this.group.id,
+      activity: {
+        id,
+        type: this.activity.type
+      },
+      mergeGroup: this.group
+    };
+    if (this.isTrackable) {
+      if (this.selectedCourse) {
+        req.leafNodesCount = this.selectedCourse.contentData.leafNodes.length;
+      } else {
+        req.leafNodesCount = this.courseData.contentData.leafNodes.length;
+      }
+    }
+    try {
+      this.isActivityLoading = true;
+      const response: CsGroupActivityDataAggregation = await this.groupService.activityService.getDataAggregation(req).toPromise();
+      if (response) {
+        this.memberList = response.members;
+        this.activityDetail = response.activity;
+        const loggedInUserId = this.loggedinUser.userId;
+        if (this.memberList) {
+          this.memberList = this.memberList.sort((a, b) => {
+            if (a.userId === loggedInUserId) {
+              return -1;
+            } else if (b.userId === loggedInUserId) {
+              return 1;
+            }
+            const aCompletedCount = a.agg.find((agg) => agg.metric === CsGroupActivityAggregationMetric.COMPLETED_COUNT);
+            const bCompletedCount = b.agg.find((agg) => agg.metric === CsGroupActivityAggregationMetric.COMPLETED_COUNT);
+            if (!aCompletedCount && !bCompletedCount) {
+              return 0;
+            }
+            if (!aCompletedCount && bCompletedCount) {
+              return 1;
+            } else if (aCompletedCount && !bCompletedCount) {
+              return -1;
+            }
+            return bCompletedCount!.value - aCompletedCount!.value;
+          });
+        }
+        this.filteredMemberList = new Array(...this.memberList);
+        this.isActivityLoading = false;
+      }
+    } catch (e) {
+      console.log(' CsGroupActivityDataAggregation err', e);
+      this.isActivityLoading = false;
+    }
+  }
+
+  onMemberSearch(query) {
+    this.memberSearchQuery = query;
+    this.filteredMemberList = [...this.filterPipe.transform(this.memberList, 'name', query)];
+  }
+
+  getMemberName(member) {
+    let memberName = member.name;
+    if (this.loggedinUser.userId === member.userId) {
+      memberName = this.commonUtilService.translateMessage('LOGGED_IN_MEMBER', { member_name: member.name });
+    }
+    return memberName;
+  }
+
+  getMemberProgress(member) {
+    let progress = 0;
+    if (member.agg) {
+      const progressMetric = member.agg.find((agg) => agg.metric === CsGroupActivityAggregationMetric.PROGRESS);
+      progress = progressMetric ? progressMetric.value : 0;
+    }
+    return '' + progress;
+  }
+
+  getActivityAggLastUpdatedOn() {
+    let lastUpdatedOn = 0;
+    if (this.activityDetail && this.activityDetail.agg) {
+      const activityAgg = this.activityDetail.agg.find(a => a.metric === CsGroupActivityAggregationMetric.ENROLMENT_COUNT);
+      if (activityAgg && activityAgg.lastUpdatedOn) {
+        lastUpdatedOn = typeof activityAgg.lastUpdatedOn === 'string' ? parseInt(activityAgg.lastUpdatedOn, 10) : activityAgg.lastUpdatedOn;
+      }
+    }
+    return lastUpdatedOn;
+  }
+
+  private getNestedCourses(courseData) {
+    courseData.forEach(c => {
+      if ((c.mimeType === MimeType.COLLECTION) && (c.contentType.toLowerCase() === CsContentType.COURSE.toLowerCase())) {
+        this.courseList.push(c);
+      }
+      if (c.children && c.children.length) {
+        this.getNestedCourses(c.children);
+      }
+    });
+  }
+
+  openActivityToc() {
+    this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
+      InteractSubtype.SELECT_NESTED_ACTIVITY_CLICKED, Environment.GROUP, PageId.ACTIVITY_DETAIL,
+      undefined, undefined, undefined, this.corRelationList);
+
+    this.router.navigate([`/${RouterLinks.MY_GROUPS}/${RouterLinks.ACTIVITY_DETAILS}/${RouterLinks.ACTIVITY_TOC}`],
+      {
+        state: {
+          courseList: this.courseList,
+          mainCourseName: this.activity.name,
+          corRelation: this.corRelationList
+        }
+      });
+  }
+
+  handleDeviceBackButton() {
+    this.unregisterBackButton = this.platform.backButton.subscribeWithPriority(10, () => {
+      this.handleBackButton(false);
+    });
+  }
+
+  handleHeaderEvents($event) {
+    switch ($event.name) {
+      case 'back':
+        this.handleBackButton(true);
+        break;
+    }
+  }
+
+  handleBackButton(isNavBack) {
+    this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.ACTIVITY_DETAIL,
+      Environment.GROUP, isNavBack, undefined, this.corRelationList);
+    this.location.back();
+  }
+
+  convertToCSV(memberList) {
+    let csv: any = '';
+    let line: any = '';
+
+    memberList.forEach(member => {
+      let progress = 0;
+      if (member.agg) {
+        const progressMetric = member.agg.find((agg) => agg.metric === CsGroupActivityAggregationMetric.PROGRESS);
+        progress = progressMetric ? progressMetric.value : 0;
+      }
+      member.progress = progress;
+    });
+    console.log('memberList progress', this.memberList)
+    line += 'Course name' + ',';
+    line += 'Member name' + ',';
+    line += 'Progress' + '\n';
+    line += '\n';
+    for (let j = 0; j < memberList.length; j++) {
+      line += '\"' + this.courseData.name.trim() + '\"' + ',';
+      line += '\"' + memberList[j].name + '\"' + ',';
+      line += '\"' + memberList[j].progress + '%\"' + '\n';
+    }
+    csv += line + '\n';
+    return csv;
+
+  }
+
+  async downloadCsv() {
+    await this.checkForPermissions().then(async (result) => {
+      if (result) {
+        this.telemetryGeneratorService.generateInteractTelemetry(
+          InteractType.TOUCH,
+          InteractSubtype.DOWNLOAD_CLICKED,
+          Environment.USER,
+          PageId.ACTIVITY_DETAIL, undefined,
+        );
+        const expTime = new Date().getTime();
+        const csvData: any = this.convertToCSV(this.memberList);
+        const filename = this.courseData.name.trim() + '_' + expTime + '.csv';
+        // const downloadDirectoryLocal = this.file.externalDataDirectory;
+        const downloadDirectory = `${cordova.file.externalRootDirectory}Download/`;
+        
+        this.file.writeFile(downloadDirectory, filename, csvData, {replace: true})
+        .then((res)=> {
+          console.log('rs write file', res);
+          this.openCsv(res.nativeURL)
+          this.commonUtilService.showToast(this.commonUtilService.translateMessage('DOWNLOAD_COMPLETED', filename), false, 'custom-toast');
+        })
+        .catch((err) => {
+          console.log('writeFile err', err)
+        });
+      } else{
+        this.commonUtilService.showSettingsPageToast('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, PageId.ACTIVITY_DETAIL, true);
+      }
+    });
+    
+  }
+
+  async checkForPermissions(): Promise<boolean | undefined> {
+    return new Promise<boolean | undefined>(async (resolve) => {
+      const permissionStatus = await this.commonUtilService.getGivenPermissionStatus(AndroidPermission.WRITE_EXTERNAL_STORAGE);
+      if (permissionStatus.hasPermission) {
+        resolve(true);
+      } else if (permissionStatus.isPermissionAlwaysDenied) {
+        await this.commonUtilService.showSettingsPageToast('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, PageId.PROFILE, true);
+        resolve(false);
+      } else {
+        this.showStoragePermissionPopover().then((result) => {
+          if (result) {
+            resolve(true);
+          } else {
+            resolve(false);
+          }
+        });
+      }
+    });
+  }
+
+  private async showStoragePermissionPopover(): Promise<boolean | undefined> {
+    return new Promise<boolean | undefined>(async (resolve) => {
+      const confirm = await this.commonUtilService.buildPermissionPopover(
+        async (selectedButton: string) => {
+          if (selectedButton === this.commonUtilService.translateMessage('NOT_NOW')) {
+            this.telemetryGeneratorService.generateInteractTelemetry( InteractType.TOUCH, InteractSubtype.NOT_NOW_CLICKED, Environment.SETTINGS, PageId.PERMISSION_POPUP);
+            await this.commonUtilService.showSettingsPageToast('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, PageId.PROFILE, true);
+          } else if (selectedButton === this.commonUtilService.translateMessage('ALLOW')) {
+            this.telemetryGeneratorService.generateInteractTelemetry(
+              InteractType.TOUCH,
+              InteractSubtype.ALLOW_CLICKED,
+              Environment.SETTINGS,
+              PageId.PERMISSION_POPUP);
+            this.permissionService.requestPermission(AndroidPermission.WRITE_EXTERNAL_STORAGE).subscribe(async (status: AndroidPermissionsStatus) => {
+                if (status.hasPermission) {
+                  this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH, InteractSubtype.ALLOW_CLICKED, Environment.SETTINGS, PageId.APP_PERMISSION_POPUP);
+                  resolve(true);
+                } else if (status.isPermissionAlwaysDenied) {
+                  await this.commonUtilService.showSettingsPageToast
+                    ('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, PageId.PROFILE, true);
+                  resolve(false);
+                } else {
+                  this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH, InteractSubtype.DENY_CLICKED, Environment.SETTINGS, PageId.APP_PERMISSION_POPUP);
+                  await this.commonUtilService.showSettingsPageToast('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, PageId.PROFILE, true);
+                }
+                resolve(undefined);
+              });
+          }
+        }, this.appName, this.commonUtilService.translateMessage('FILE_MANAGER'), 'FILE_MANAGER_PERMISSION_DESCRIPTION', PageId.PROFILE, true
+      );
+      await confirm.present();
+    });
+  }
+
+  openCsv(path) {
+    this.fileOpener.open(path, 'text/csv')
+      .then(() => console.log('File is opened'))
+      .catch((e) => {
+        console.log('Error opening file', e);
+        this.commonUtilService.showToast('CERTIFICATE_ALREADY_DOWNLOADED');
+      });
+  }
+
+}
diff --git a/src/app/my-groups/activity-toc/activity-toc.page.html b/src/app/my-groups/activity-toc/activity-toc.page.html
new file mode 100644
index 000000000..c9077e649
--- /dev/null
+++ b/src/app/my-groups/activity-toc/activity-toc.page.html
@@ -0,0 +1,10 @@
+<ion-content class="activity-toc-container ion-no-padding">
+    <div class="activity-course" [ngClass]="{'active': !selectedId}" (click)="selectedId && onCourseChange()">
+        {{mainCourseName}}
+    </div>
+    <div class="activity-course" *ngFor="let course of courseList; let i=index"
+        [ngClass]="{'active': course.identifier === selectedId}"
+        (click)="course.identifier !== selectedId && onCourseChange(course)">
+        {{course.name}}
+    </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/app/my-groups/activity-toc/activity-toc.page.scss b/src/app/my-groups/activity-toc/activity-toc.page.scss
new file mode 100644
index 000000000..b4a8ae43e
--- /dev/null
+++ b/src/app/my-groups/activity-toc/activity-toc.page.scss
@@ -0,0 +1,15 @@
+@import "src/assets/styles/_variables.scss";
+
+.activity-toc-container{
+    padding: 16px 0;
+}
+.activity-course{
+    padding: 16px;
+    box-shadow: 0 2px 4px 0 rgba(0,0,0,0.1);
+    border-radius: 2px;
+    font-size: 14px;
+    color: $blue;
+    &.active{
+        background-color: map-get($colors , light_gray_8c);
+    }
+}
\ No newline at end of file
diff --git a/src/app/my-groups/activity-toc/activity-toc.page.spec.ts b/src/app/my-groups/activity-toc/activity-toc.page.spec.ts
new file mode 100644
index 000000000..fc6efc37a
--- /dev/null
+++ b/src/app/my-groups/activity-toc/activity-toc.page.spec.ts
@@ -0,0 +1,169 @@
+import { PageId, Environment, ImpressionType, InteractSubtype } from '../../../services/telemetry-constants';
+import { ActivityTocPage } from './activity-toc.page';
+import { Router } from '@angular/router';
+import { TelemetryGeneratorService } from '@app/services';
+import { AppHeaderService, AppGlobalService } from '../../../services';
+import { Platform } from '@ionic/angular';
+import { Location } from '@angular/common';
+import { of } from 'rxjs';
+import { InteractType } from '@project-sunbird/sunbird-sdk';
+
+describe('ActivityTocPage', () => {
+    let activityTocPage: ActivityTocPage;
+
+    const mockHeaderService: Partial<AppHeaderService> = {};
+    const mockLocation: Partial<Location> = {};
+    const mockPlatform: Partial<Platform> = {};
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => ({
+            extras: {
+                state: {
+                    courseList: {
+                        children: [{
+                            contentType: 'collection',
+                            children: [
+                                {
+                                    contentType: 'Course',
+                                    identifier: 'id1'
+                                }
+                            ]
+                        }]
+                    }
+                }
+            }
+        })) as any
+    };
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateImpressionTelemetry: jest.fn(),
+        generateInteractTelemetry: jest.fn()
+    };
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        selectedActivityCourseId: ''
+    };
+
+    beforeAll(() => {
+        activityTocPage = new ActivityTocPage(
+            mockRouter as Router,
+            mockHeaderService as AppHeaderService,
+            mockPlatform as Platform,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockLocation as Location,
+            mockAppGlobalService as AppGlobalService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should be create a instance of activityTocPage', () => {
+        expect(activityTocPage).toBeTruthy();
+    });
+
+    it('should generate telemetry for back clicked', () => {
+        mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+        mockLocation.back = jest.fn();
+        // act
+        activityTocPage.handleBackButton(true);
+        // assert
+        expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+            PageId.ACTIVITY_TOC, Environment.GROUP, true, undefined, activityTocPage.corRelationList);
+        expect(mockLocation.back).toHaveBeenCalled();
+    });
+
+    it('should handle device back button', () => {
+        const data = {
+            name: 'back'
+        };
+        jest.spyOn(activityTocPage, 'handleBackButton').mockImplementation(() => {
+            return;
+        });
+        activityTocPage.handleHeaderEvents(data);
+        expect(data.name).toBe('back');
+    });
+
+    it('should invoked handleDeviceBackButton', () => {
+        mockPlatform.backButton = {
+            subscribeWithPriority: jest.fn((_, fn) => fn(Promise.resolve({ event: {} }))) as any
+        } as any;
+        jest.spyOn(activityTocPage, 'handleBackButton').mockImplementation();
+        // act
+        activityTocPage.handleDeviceBackButton();
+        // assert
+        expect(mockPlatform.backButton).not.toBeUndefined();
+    });
+
+    describe('ionViewWillEnter', () => {
+        beforeEach(() => {
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn(() => { })
+            });
+            jest.spyOn(activityTocPage, 'handleHeaderEvents').mockImplementation();
+            jest.spyOn(activityTocPage, 'handleDeviceBackButton').mockImplementation();
+        });
+        it('should handle device header and back-button for b.userId', (done) => {
+            // assert
+            mockAppGlobalService.selectedActivityCourseId = '';
+            // act
+            activityTocPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+                expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    ImpressionType.VIEW, '', PageId.ACTIVITY_TOC, Environment.GROUP,
+                    undefined, undefined, undefined, undefined, activityTocPage.corRelationList);
+                done();
+            }, 0);
+        });
+    });
+
+    describe('ionViewWillLeave', () => {
+        it('should unsubscribe all header service', () => {
+            activityTocPage.unregisterBackButton = {
+                unsubscribe: jest.fn()
+            } as any;
+            // act
+            activityTocPage.ionViewWillLeave();
+            // assert
+            expect(activityTocPage.unregisterBackButton).not.toBeUndefined();
+        });
+
+        it('should not unsubscribe all header service', () => {
+            activityTocPage.unregisterBackButton = undefined;
+            // act
+            activityTocPage.ionViewWillLeave();
+            // assert
+            expect(activityTocPage.unregisterBackButton).toBeUndefined();
+        });
+    });
+
+    describe('onCourseChange', () => {
+        it('should set selectedActivityCourseId', () => {
+            // arrange
+            const course = {
+                identifier: 'id1'
+            };
+            // act
+            activityTocPage.onCourseChange(course);
+            // assert
+            expect(mockAppGlobalService.selectedActivityCourseId).toEqual('id1');
+            expect(mockLocation.back).toHaveBeenCalled();
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH, InteractSubtype.CONTENT_CLICKED, Environment.GROUP,
+                PageId.ACTIVITY_TOC, { id: 'id1', type: undefined, version: '' },
+                undefined, { l1: 'id1' }, activityTocPage.corRelationList
+            );
+        });
+        it('should not set selectedActivityCourseId', () => {
+            // act
+            activityTocPage.onCourseChange();
+            // assert
+            expect(mockAppGlobalService.selectedActivityCourseId).toBe('');
+            expect(mockLocation.back).toHaveBeenCalled();
+        });
+    });
+
+});
diff --git a/src/app/my-groups/activity-toc/activity-toc.page.ts b/src/app/my-groups/activity-toc/activity-toc.page.ts
new file mode 100644
index 000000000..15d17195d
--- /dev/null
+++ b/src/app/my-groups/activity-toc/activity-toc.page.ts
@@ -0,0 +1,100 @@
+import { Location } from '@angular/common';
+import { AppHeaderService } from './../../../services/app-header.service';
+import { Component, ViewEncapsulation } from '@angular/core';
+import { Platform } from '@ionic/angular';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import {
+    Environment, ImpressionType, InteractSubtype,
+    InteractType, PageId
+} from '@app/services/telemetry-constants';
+import { Router } from '@angular/router';
+import { AppGlobalService } from '@app/services';
+import { Subscription } from 'rxjs';
+import { ContentUtil } from '@app/util/content-util';
+import { CorrelationData } from '@project-sunbird/sunbird-sdk';
+
+@Component({
+    selector: 'activity-toc',
+    templateUrl: 'activity-toc.page.html',
+    styleUrls: ['./activity-toc.page.scss'],
+    encapsulation: ViewEncapsulation.None,
+})
+export class ActivityTocPage {
+
+    corRelationList: Array<CorrelationData>;
+    unregisterBackButton: Subscription;
+    headerObservable: any;
+    backButtonFunc = undefined;
+    courseList: Array<any>;
+    mainCourseName: string;
+    selectedId;
+
+    constructor(
+        private router: Router,
+        public headerService: AppHeaderService,
+        private platform: Platform,
+        private telemetryGeneratorService: TelemetryGeneratorService,
+        private location: Location,
+        private appGlobalService: AppGlobalService
+    ) {
+        const extras = this.router.getCurrentNavigation().extras.state;
+        if (extras) {
+            this.courseList = extras.courseList;
+            this.mainCourseName = extras.mainCourseName;
+            this.corRelationList = extras.corRelation;
+        }
+    }
+
+    ionViewWillEnter() {
+        this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
+            this.handleHeaderEvents(eventName);
+        });
+        this.headerService.showHeaderWithBackButton();
+        this.handleDeviceBackButton();
+        this.selectedId = this.appGlobalService.selectedActivityCourseId;
+        this.telemetryGeneratorService.generateImpressionTelemetry(ImpressionType.VIEW,
+            '', PageId.ACTIVITY_TOC, Environment.GROUP,
+            undefined, undefined, undefined, undefined, this.corRelationList);
+    }
+
+    ionViewWillLeave() {
+        this.headerObservable.unsubscribe();
+        if (this.unregisterBackButton) {
+            this.unregisterBackButton.unsubscribe();
+        }
+    }
+
+    handleBackButton(isNavBack: boolean) {
+        this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.ACTIVITY_TOC,
+            Environment.GROUP, isNavBack, undefined, this.corRelationList);
+        this.location.back();
+    }
+
+    handleDeviceBackButton() {
+        this.unregisterBackButton = this.platform.backButton.subscribeWithPriority(10, () => {
+            this.handleBackButton(false);
+        });
+    }
+
+    handleHeaderEvents($event) {
+        switch ($event.name) {
+            case 'back':
+                this.handleBackButton(true);
+                break;
+        }
+    }
+
+    onCourseChange(course?) {
+        if (course) {
+            this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
+                InteractSubtype.CONTENT_CLICKED, Environment.GROUP, PageId.ACTIVITY_TOC,
+                ContentUtil.getTelemetryObject(course),
+                undefined,
+                ContentUtil.generateRollUp(undefined, course.identifier),
+                this.corRelationList);
+        }
+        this.appGlobalService.selectedActivityCourseId = course ? course.identifier : '';
+        this.location.back();
+    }
+
+}
diff --git a/src/app/my-groups/add-activity-to-group/add-activity-to-group-page.spec.ts b/src/app/my-groups/add-activity-to-group/add-activity-to-group-page.spec.ts
new file mode 100644
index 000000000..95cbf05db
--- /dev/null
+++ b/src/app/my-groups/add-activity-to-group/add-activity-to-group-page.spec.ts
@@ -0,0 +1,222 @@
+import {
+    PageId, Environment, ImpressionType, InteractType, InteractSubtype, CorReleationDataType, ID
+} from '../../../services/telemetry-constants';
+import { AddActivityToGroupPage } from './add-activity-to-group.page';
+import { Router } from '@angular/router';
+import { TelemetryGeneratorService } from '@app/services';
+import { AppHeaderService, AppGlobalService } from '../../../services';
+import { Platform } from '@ionic/angular';
+import { Location } from '@angular/common';
+import { of } from 'rxjs';
+import { RouterLinks } from '../../app.constant';
+
+describe('AddActivityToGroupPage', () => {
+    let addActivityToGroupPage: AddActivityToGroupPage;
+
+    const mockHeaderService: Partial<AppHeaderService> = {};
+    const mockLocation: Partial<Location> = {};
+    const mockPlatform: Partial<Platform> = {};
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => ({
+            extras: {
+                state: {
+                    activityList: {
+                        contentType: 'Course',
+                        identifier: 'id1'
+                    },
+                    groupId: 'g1',
+                    supportedActivityList: [
+                        { title: 'some_title' }
+                    ]
+                }
+            }
+        }
+        )) as any
+    };
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateImpressionTelemetry: jest.fn(),
+        generateInteractTelemetry: jest.fn()
+    };
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        selectedActivityCourseId: ''
+    };
+    beforeAll(() => {
+        addActivityToGroupPage = new AddActivityToGroupPage(
+            mockRouter as Router,
+            mockHeaderService as AppHeaderService,
+            mockPlatform as Platform,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockLocation as Location,
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should be create a instance of addActivityToGroupPage', () => {
+        expect(addActivityToGroupPage).toBeTruthy();
+    });
+
+    it('should generate telemetry for back clicked', () => {
+        mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+        mockLocation.back = jest.fn();
+        // act
+        addActivityToGroupPage.handleBackButton(true);
+        // assert
+        expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+            PageId.ACTIVITY_TOC, Environment.GROUP, true, undefined, addActivityToGroupPage.corRelationList);
+        expect(mockLocation.back).toHaveBeenCalled();
+    });
+
+    it('should handle device back button', () => {
+        const data = {
+            name: 'back'
+        };
+        jest.spyOn(addActivityToGroupPage, 'handleBackButton').mockImplementation(() => {
+            return;
+        });
+        addActivityToGroupPage.handleHeaderEvents(data);
+        expect(data.name).toBe('back');
+    });
+
+    it('should invoked handleDeviceBackButton', () => {
+        mockPlatform.backButton = {
+            subscribeWithPriority: jest.fn((_, fn) => fn(Promise.resolve({ event: {} }))) as any
+        } as any;
+        jest.spyOn(addActivityToGroupPage, 'handleBackButton').mockImplementation();
+        // act
+        addActivityToGroupPage.handleDeviceBackButton();
+        // assert
+        expect(mockPlatform.backButton).not.toBeUndefined();
+    });
+
+    describe('ionViewWillEnter', () => {
+        beforeEach(() => {
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn(() => { })
+            });
+            jest.spyOn(addActivityToGroupPage, 'handleHeaderEvents').mockImplementation();
+            jest.spyOn(addActivityToGroupPage, 'handleDeviceBackButton').mockImplementation();
+        });
+        it('should handle device header and back-button', (done) => {
+            // assert
+            mockAppGlobalService.selectedActivityCourseId = '';
+            addActivityToGroupPage.activityList = [
+                {
+                    items: [{ identifier: 'id1' }]
+                }
+            ];
+            // act
+            addActivityToGroupPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+                expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    ImpressionType.VIEW,
+                    '',
+                    PageId.ADD_ACTIVITY_TO_GROUP,
+                    Environment.GROUP,
+                    undefined, undefined, undefined, undefined, addActivityToGroupPage.corRelationList);
+                done();
+            }, 0);
+        });
+
+    });
+
+    describe('ionViewWillLeave', () => {
+        it('should unsubscribe all header service', () => {
+            addActivityToGroupPage.unregisterBackButton = {
+                unsubscribe: jest.fn()
+            } as any;
+            // act
+            addActivityToGroupPage.ionViewWillLeave();
+            // assert
+            expect(addActivityToGroupPage.unregisterBackButton).not.toBeUndefined();
+        });
+
+        it('should not unsubscribe all header service', () => {
+            addActivityToGroupPage.unregisterBackButton = undefined;
+            // act
+            addActivityToGroupPage.ionViewWillLeave();
+            // assert
+            expect(addActivityToGroupPage.unregisterBackButton).toBeUndefined();
+        });
+    });
+
+    describe('search', () => {
+        it('should redirect to search page and add the ActivityType cData', (done) => {
+            // arrange
+            mockRouter.navigate = jest.fn();
+            addActivityToGroupPage.flattenedActivityList = [
+                { identifier: 'id1' }
+            ];
+            // act
+            addActivityToGroupPage.search({ activityType: 'Course' });
+
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.SELECT_CATEGORY,
+                    InteractSubtype.ACTIVITY_TYPE_CLICKED, Environment.GROUP, PageId.ADD_ACTIVITY_TO_GROUP,
+                    undefined, undefined, undefined, addActivityToGroupPage.corRelationList, ID.SELECT_CATEGORY);
+                expect(mockRouter.navigate).toHaveBeenCalledWith(
+                    [RouterLinks.SEARCH],
+                    {
+                        state: {
+                            activityList: [
+                                { identifier: 'id1' }
+                            ],
+                            groupId: 'g1',
+                            activityTypeData: { activityType: 'Course' },
+                            corRelation: addActivityToGroupPage.corRelationList,
+                            source: 'group-detail'
+                        }
+                    }
+                );
+                done();
+            }, 0);
+        });
+
+        it('should redirect to search page and update the ActivityType cData', (done) => {
+            // arrange
+            addActivityToGroupPage.corRelationList = [
+                {
+                    id: 'Course',
+                    type: CorReleationDataType.ACTIVITY_TYPE
+                }
+            ];
+            mockRouter.navigate = jest.fn();
+            addActivityToGroupPage.flattenedActivityList = [
+                { identifier: 'id1' }
+            ];
+            // act
+            addActivityToGroupPage.search({ activityType: 'TextBook' });
+
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.SELECT_CATEGORY,
+                    InteractSubtype.ACTIVITY_TYPE_CLICKED, Environment.GROUP, PageId.ADD_ACTIVITY_TO_GROUP,
+                    undefined, undefined, undefined, addActivityToGroupPage.corRelationList, ID.SELECT_CATEGORY);
+                expect(mockRouter.navigate).toHaveBeenCalledWith(
+                    [RouterLinks.SEARCH],
+                    {
+                        state: {
+                            activityList: [
+                                { identifier: 'id1' }
+                            ],
+                            groupId: 'g1',
+                            activityTypeData: { activityType: 'TextBook' },
+                            corRelation: addActivityToGroupPage.corRelationList,
+                            source: 'group-detail'
+                        }
+                    }
+                );
+                done();
+            }, 0);
+        });
+    });
+
+});
diff --git a/src/app/my-groups/add-activity-to-group/add-activity-to-group.page.html b/src/app/my-groups/add-activity-to-group/add-activity-to-group.page.html
new file mode 100644
index 000000000..1886855b5
--- /dev/null
+++ b/src/app/my-groups/add-activity-to-group/add-activity-to-group.page.html
@@ -0,0 +1,9 @@
+<ion-content class="activity-toc-container ion-no-padding">
+  <h3 class="activity-toc-title">{{ 'SELECT_ACTIVITY' | translate}}</h3>
+  <div class="add-activity-container">
+    <div class="add-activity-content" [ngClass]="{'disabled-activity': !activity.isEnabled}" *ngFor="let activity of supportedActivityList; let i = index;">
+      <sb-course-curiculum-card [isActivityTypeCard]="true" [cardData]="activity" [index]="i"
+        (click)="activity.isEnabled && search(activity)"></sb-course-curiculum-card>
+    </div>
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/app/my-groups/add-activity-to-group/add-activity-to-group.page.scss b/src/app/my-groups/add-activity-to-group/add-activity-to-group.page.scss
new file mode 100644
index 000000000..68d6fbac1
--- /dev/null
+++ b/src/app/my-groups/add-activity-to-group/add-activity-to-group.page.scss
@@ -0,0 +1,25 @@
+.activity-toc-title{
+    font-size: 16px;
+    margin: 0;
+    font-weight: bold;
+    padding: 16px;
+}
+.add-activity-container{
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    .add-activity-content{
+        &.disabled-activity{
+            opacity: .5;
+        }
+        &:nth-child(odd){
+            padding: 0 4px 4px 16px;
+        }
+        &:nth-child(even){
+            padding: 0 16px 4px 4px;
+        }
+        flex: 50%;
+        flex-grow: 0;
+        flex-shrink: 0;
+    }
+}
\ No newline at end of file
diff --git a/src/app/my-groups/add-activity-to-group/add-activity-to-group.page.ts b/src/app/my-groups/add-activity-to-group/add-activity-to-group.page.ts
new file mode 100644
index 000000000..a41b4b527
--- /dev/null
+++ b/src/app/my-groups/add-activity-to-group/add-activity-to-group.page.ts
@@ -0,0 +1,148 @@
+import { Location } from '@angular/common';
+import { AppHeaderService } from './../../../services/app-header.service';
+import {
+    Component, ViewEncapsulation, OnInit, OnDestroy
+} from '@angular/core';
+import { Platform } from '@ionic/angular';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import {
+    Environment, ImpressionType, InteractSubtype, InteractType,
+    PageId, CorReleationDataType, ID
+} from '@app/services/telemetry-constants';
+import { Router } from '@angular/router';
+import { Subscription } from 'rxjs';
+import { RouterLinks } from '@app/app/app.constant';
+import { CsGroupAddableBloc } from '@project-sunbird/client-services/blocs';
+import { CorrelationData } from '@project-sunbird/sunbird-sdk';
+
+
+@Component({
+    selector: 'add-activity-to-group',
+    templateUrl: 'add-activity-to-group.page.html',
+    styleUrls: ['./add-activity-to-group.page.scss'],
+    encapsulation: ViewEncapsulation.None,
+})
+export class AddActivityToGroupPage implements OnInit, OnDestroy {
+
+    corRelationList: Array<CorrelationData>;
+    unregisterBackButton: Subscription;
+    headerObservable: any;
+    supportedActivityList: Array<any>;
+    groupId: string;
+    activityList;
+    flattenedActivityList = [];
+    private csGroupAddableBloc: CsGroupAddableBloc;
+
+    constructor(
+        private router: Router,
+        public headerService: AppHeaderService,
+        private platform: Platform,
+        private telemetryGeneratorService: TelemetryGeneratorService,
+        private location: Location,
+    ) {
+        const extras = this.router.getCurrentNavigation().extras.state;
+        if (extras) {
+            this.corRelationList = extras.corRelation;
+            this.supportedActivityList = extras.supportedActivityList;
+            this.groupId = extras.groupId;
+            this.activityList = extras.activityList;
+        }
+        this.csGroupAddableBloc = CsGroupAddableBloc.instance;
+    }
+
+    ngOnInit() {
+        if (!this.csGroupAddableBloc.initialised) {
+            this.csGroupAddableBloc.init();
+        }
+    }
+
+    ionViewWillEnter() {
+        this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
+            this.handleHeaderEvents(eventName);
+        });
+        this.headerService.showHeaderWithBackButton();
+        this.handleDeviceBackButton();
+        this.telemetryGeneratorService.generateImpressionTelemetry(
+            ImpressionType.VIEW,
+            '',
+            PageId.ADD_ACTIVITY_TO_GROUP,
+            Environment.GROUP,
+            undefined, undefined, undefined, undefined, this.corRelationList);
+        this.getflattenedActivityList();
+    }
+
+    ionViewWillLeave() {
+        this.headerObservable.unsubscribe();
+        if (this.unregisterBackButton) {
+            this.unregisterBackButton.unsubscribe();
+        }
+    }
+
+    ngOnDestroy() {
+        this.csGroupAddableBloc.dispose();
+    }
+
+    handleBackButton(isNavBack: boolean) {
+        this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.ACTIVITY_TOC,
+            Environment.GROUP, isNavBack, undefined, this.corRelationList);
+        this.location.back();
+    }
+
+    handleDeviceBackButton() {
+        this.unregisterBackButton = this.platform.backButton.subscribeWithPriority(10, () => {
+            this.handleBackButton(false);
+        });
+    }
+
+    handleHeaderEvents($event) {
+        switch ($event.name) {
+            case 'back':
+                this.handleBackButton(true);
+                break;
+        }
+    }
+
+    private getflattenedActivityList() {
+        this.flattenedActivityList = [];
+        this.activityList.forEach(e => {
+            this.flattenedActivityList = [...this.flattenedActivityList, ...e.items];
+        });
+    }
+
+    async search(data) {
+        // Which activity type
+        if (!this.corRelationList) {
+            this.corRelationList = [];
+        }
+        const activityTypeCData = this.corRelationList.find(cData => (cData.type === CorReleationDataType.ACTIVITY_TYPE));
+        if (activityTypeCData) {
+            activityTypeCData.id = data.activityType;
+        } else {
+            this.corRelationList.push({ id: data.activityType, type: CorReleationDataType.ACTIVITY_TYPE });
+        }
+
+        this.telemetryGeneratorService.generateInteractTelemetry(InteractType.SELECT_CATEGORY,
+            InteractSubtype.ACTIVITY_TYPE_CLICKED, Environment.GROUP, PageId.ADD_ACTIVITY_TO_GROUP,
+            undefined, undefined, undefined, this.corRelationList, ID.SELECT_CATEGORY);
+
+        this.csGroupAddableBloc.updateState({
+            pageIds: [],
+            groupId: this.groupId,
+            params: {
+                activityList: this.flattenedActivityList,
+                corRelation: this.corRelationList
+            }
+        });
+
+        this.router.navigate([RouterLinks.SEARCH], {
+            state: {
+                activityTypeData: data,
+                source: PageId.GROUP_DETAIL,
+                groupId: this.groupId,
+                activityList: this.flattenedActivityList,
+                corRelation: this.corRelationList
+            }
+        });
+    }
+
+}
diff --git a/src/app/my-groups/add-member-to-group/add-member-to-group.module.ts b/src/app/my-groups/add-member-to-group/add-member-to-group.module.ts
new file mode 100644
index 000000000..1d140301a
--- /dev/null
+++ b/src/app/my-groups/add-member-to-group/add-member-to-group.module.ts
@@ -0,0 +1,37 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { Routes, RouterModule } from '@angular/router';
+import { IonicModule } from '@ionic/angular';
+import { DirectivesModule } from '@app/directives/directives.module';
+import { PipesModule } from '@app/pipes/pipes.module';
+import { TranslateModule } from '@ngx-translate/core';
+import { ComponentsModule } from '../../components/components.module';
+import { AddMemberToGroupPage } from './add-member-to-group.page';
+import { OverflowMenuComponent } from '../../profile/overflow-menu/overflow-menu.component';
+import { RecaptchaModule, RecaptchaFormsModule } from 'ng-recaptcha';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: AddMemberToGroupPage
+  }
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    RouterModule.forChild(routes),
+    TranslateModule.forChild(),
+    PipesModule,
+    DirectivesModule,
+    ComponentsModule,
+    RecaptchaModule,
+    RecaptchaFormsModule
+  ],
+  declarations: [AddMemberToGroupPage],
+  entryComponents: [OverflowMenuComponent]
+})
+export class AddMemberToGroupPageModule {}
diff --git a/src/app/my-groups/add-member-to-group/add-member-to-group.page.html b/src/app/my-groups/add-member-to-group/add-member-to-group.page.html
new file mode 100644
index 000000000..30a4254c6
--- /dev/null
+++ b/src/app/my-groups/add-member-to-group/add-member-to-group.page.html
@@ -0,0 +1,61 @@
+<ion-content overflow-scroll="true">
+    <div class="au-container" *ngIf="!isUserIdVerified">
+        <h3 class="au-title">{{'ADD_MEMBER' | translate}}</h3>
+        <div class="au-ip">
+            <div class="au-ip-info clearfix">
+                <span class="pull-left">
+                    {{'MEMBER_ID' | translate: {'app_name': appName} }}<sup>*</sup>
+                </span>
+                <span (click)="openInfoPopup($event)" class="pull-right" #addMemberInfoPopupRef>
+                    <span>
+                        <ion-icon class="au-info-icon" name="information-circle-outline"></ion-icon>
+                    </span>
+                </span>
+            </div>
+            <input [ngClass]="{'error' : showErrorMsg}" type="text"
+                placeholder="{{'ENTER_MEMBER_ID' | translate: {'app_name': appName} }}" [(ngModel)]="username">
+            <p *ngIf="showErrorMsg" class="au-ip-error-msg">
+                {{'INVALID_MEMBER_ID' | translate:  {'app_name': appName} }}
+            </p>
+        </div>
+    </div>
+    <div class="au-container" *ngIf="isUserIdVerified">
+        <h3 class="au-title">{{'ADD_MEMBER' | translate}}</h3>
+        <div class="au-ip">
+            <div class="au-ip-info clearfix">
+                <span class="pull-left">{{'MEMBER_ID' | translate: {'app_name': appName} }}</span>
+                <span (click)="openInfoPopup($event)" class="pull-right">
+                    <ion-icon class="au-info-icon" name="information-circle-outline"></ion-icon>
+                </span>
+            </div>
+            <input type="text" placeholder="{{'ENTER_MEMBER_ID' | translate: {'app_name': appName} }}"
+                [(ngModel)]="username" disabled>
+            <ion-icon class="au-clear-icon" name="close" (click)="onClearUser()">
+            </ion-icon>
+        </div>
+        <div class="au-avatar">
+            <app-profile-avatar [username]="userDetails.name"></app-profile-avatar>
+            <h3>{{userDetails.name}}</h3>
+        </div>
+        <div class="au-desc">{{'ADD_MEMBER_CONFIRMATION' | translate: {'app_name': appName} }}</div>
+    </div>
+    <div *ngIf="showLoader" class="ion-padding-start ion-padding-end">
+        <div class="loader-container">
+            <div class="loader"></div>
+            <h6 class="loader-text">{{'VERYFYING_PLEASE_WAIT' | translate}}</h6>
+        </div>
+    </div>
+</ion-content>
+<ion-footer>
+    <div class="au-btn" *ngIf="!isUserIdVerified">
+        <button class="sb-btn-large" [class.inactive]="!username" [disabled]="!username" (click)="onVerifyClick()">
+            {{'VERIFY' | translate}}
+        </button>
+    </div>
+    <div class="au-btn" *ngIf="isUserIdVerified">
+        <button class="sb-btn-large" (click)="onAddToGroupClick()">
+            <img src="assets/imgs/ic_person_add_white.svg" alt="">
+            {{'ADD_TO_GROUP' | translate}}
+        </button>
+    </div>
+</ion-footer>
\ No newline at end of file
diff --git a/src/app/my-groups/add-member-to-group/add-member-to-group.page.scss b/src/app/my-groups/add-member-to-group/add-member-to-group.page.scss
new file mode 100644
index 000000000..8e28f52d0
--- /dev/null
+++ b/src/app/my-groups/add-member-to-group/add-member-to-group.page.scss
@@ -0,0 +1,128 @@
+@import "src/assets/styles/_variables.scss";
+.au-container{
+    padding: 16px;
+    .au-title{
+        font-size: 18px;
+        font-weight: bold;
+        margin-top: 8px;
+    }
+    .au-ip{
+        margin-bottom: 30px;
+        position: relative;
+        .au-ip-info{
+            margin-bottom: 8px;
+            font-size: 16px;
+            .pull-left{
+                sup{
+                    color: $red;
+                }
+            }
+            .pull-right{
+                color: $gray-300;
+                font-size: 14px;
+            }
+            .au-info-icon{
+                color: $blue;
+                font-size: 20px;
+                vertical-align: bottom;
+            }
+        }
+        input{
+            &.error{
+                border: 1px solid $red;
+            }
+            &:disabled{
+                background-color: #fff;
+            }
+            width: 100%;
+            height: 40px;
+            border: 1px solid $gray-800;
+            padding: 0 16px;
+            color: $gray-800;
+            border-radius: 2px;
+            outline: none;
+        }
+        .au-clear-icon{
+            position: absolute;
+            bottom: 10px;
+            right: 8px;
+            font-size: 20px;
+        }
+        .au-ip-error-msg{
+            color: $red;
+            font-size: 14px;
+            margin-top: 8px;
+        }
+    }
+    .au-avatar{
+        padding: 16px;
+        background-color: map-get($colors, pale_blue);
+        text-align: center;
+    }
+    .au-desc{
+        font-size: 16px;
+        padding: 16px 0;
+        span{
+            font-weight: bold;
+        }
+    }
+}
+.au-btn{
+    padding: 0px 16px 24px 16px;
+    .sb-btn-large{
+        &.inactive{
+            background-color: $gray-200;
+        }
+        img{
+            margin-right: 8px;
+            position: relative;
+            bottom: 2px;
+        }
+    }
+}
+
+.loader {
+    border: 4px solid $gray-300;
+    box-sizing: border-box;
+    border-radius: 50%;
+    border-top: 4px solid transparent;
+    width: 48px;
+    float: center;
+    height: 48px;
+    margin-left: 45%;
+    -webkit-animation: spin 2s linear infinite;
+    animation: spin 2s linear infinite;
+}
+
+/* Safari */
+@-webkit-keyframes spin {
+    0% {
+        -webkit-transform: rotate(0deg);
+    }
+
+    100% {
+        -webkit-transform: rotate(360deg);
+    }
+}
+
+@keyframes spin {
+    0% {
+        transform: rotate(0deg);
+    }
+
+    100% {
+        transform: rotate(360deg);
+    }
+}
+
+.loader-container {
+    text-align: center;
+    padding: 30px;
+    border-radius: 2px;
+    background-color: map-get($colors, pale_blue);
+}
+
+.loader-text {
+    font-size: 12px;
+    color: $gray-300;
+}
\ No newline at end of file
diff --git a/src/app/my-groups/add-member-to-group/add-member-to-group.page.spec.ts b/src/app/my-groups/add-member-to-group/add-member-to-group.page.spec.ts
new file mode 100644
index 000000000..da4f3af8c
--- /dev/null
+++ b/src/app/my-groups/add-member-to-group/add-member-to-group.page.spec.ts
@@ -0,0 +1,598 @@
+import { AddMemberToGroupPage } from './add-member-to-group.page';
+import { ProfileService, GroupService, SystemSettingsService, SharedPreferences } from '@project-sunbird/sunbird-sdk';
+import { Router } from '@angular/router';
+import { Platform, PopoverController } from '@ionic/angular';
+import {
+    AppHeaderService,
+    CommonUtilService,
+    Environment, ID,
+    InteractSubtype,
+    InteractType,
+    PageId,
+    TelemetryGeneratorService,
+    UtilityService
+} from '@app/services';
+import { Location } from '@angular/common';
+import { of, throwError } from 'rxjs';
+import { RecaptchaComponent } from 'ng-recaptcha';
+
+describe('AddMemberToGroupPage', () => {
+    let addMemberToGroupPage: AddMemberToGroupPage;
+    const mockGroupService: Partial<GroupService> = {};
+    const mockSystemSettingService: Partial<SystemSettingsService> = {
+        getSystemSettings: jest.fn(() => of({
+            value: JSON.stringify({
+                isEnabled: true,
+                key: 'e344ijewjee43'
+            })
+        })) as any
+    };
+    const mockPreferences: Partial<SharedPreferences> = {};
+    const captchaConfig = new Map();
+    // captchaConfig.set('isEnabled', true);
+    // captchaConfig.set('key', 'dasewqe33414');
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        getGoogleCaptchaSitekey: jest.fn(() => { }),
+        setGoogleCaptchaSitekey: jest.fn(),
+        showToast: jest.fn(),
+        // getGoogleCaptchaConfig: jest.fn(() => captchaConfig),
+        setGoogleCaptchaConfig: jest.fn(),
+        networkInfo: {
+            isNetworkAvailable: true
+        },
+    };
+    const mockHeaderService: Partial<AppHeaderService> = {};
+    const mockLocation: Partial<Location> = {};
+    const mockPlatform: Partial<Platform> = {
+        backButton: {
+            subscribeWithPriority: jest.fn(() => ({ data: 's-id', unsubscribe: jest.fn() })) as any,
+        } as any
+    };
+    const mockPopoverCtrl: Partial<PopoverController> = {};
+    const mockProfileService: Partial<ProfileService> = {};
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => ({
+            extras: {
+                state: {
+                    groupId: 'sample-group-id'
+                }
+            }
+        })) as any
+    };
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockSbUtility: Partial<UtilityService> = {};
+
+    beforeAll(() => {
+        addMemberToGroupPage = new AddMemberToGroupPage(
+            mockProfileService as ProfileService,
+            mockGroupService as GroupService,
+            mockSystemSettingService as SystemSettingsService,
+            mockPreferences as SharedPreferences,
+            mockHeaderService as AppHeaderService,
+            mockRouter as Router,
+            mockLocation as Location,
+            mockPlatform as Platform,
+            mockCommonUtilService as CommonUtilService,
+            mockPopoverCtrl as PopoverController,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockSbUtility as UtilityService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should create a instance of addMemberToGroupPage', () => {
+        expect(addMemberToGroupPage).toBeTruthy();
+    });
+
+    it('should create a instance of addMemberToGroupPage', () => {
+        const captchaConfigs = new Map();
+        captchaConfigs.set('isEnabled', true);
+        captchaConfigs.set('key', 'dasewqe33414');
+        mockCommonUtilService.getGoogleCaptchaConfig = jest.fn(() => captchaConfigs);
+        addMemberToGroupPage.getGoogleCaptchaSiteKey();
+        // assert
+        expect(mockCommonUtilService.getGoogleCaptchaConfig).toHaveBeenCalled();
+    });
+
+    it('should call systemSettingsService if captchaConfigSize is zero', (done) => {
+        const captchaConfigs = new Map();
+        mockCommonUtilService.setGoogleCaptchaConfig = jest.fn();
+        mockCommonUtilService.getGoogleCaptchaConfig = jest.fn(() => captchaConfigs);
+        mockSystemSettingService.getSystemSettings = jest.fn(() => of(
+            {
+                value: JSON.stringify({
+                    isEnabled: true,
+                    key: 'e344ijewjee43'
+                })
+            }
+        ));
+        addMemberToGroupPage.getGoogleCaptchaSiteKey();
+        // assert
+        expect(mockCommonUtilService.getGoogleCaptchaConfig).toHaveBeenCalled();
+        setTimeout(() => {
+            expect(mockCommonUtilService.setGoogleCaptchaConfig).toHaveBeenCalledWith('e344ijewjee43', true);
+            done();
+        }, 0);
+    });
+
+    describe('handleBackButton', () => {
+        it('should return userIdVerified', () => {
+            addMemberToGroupPage.isUserIdVerified = true;
+            addMemberToGroupPage.handleBackButton(true);
+            expect(addMemberToGroupPage.isUserIdVerified).toBeFalsy();
+        });
+
+        it('should back to previous page', () => {
+            addMemberToGroupPage.isUserIdVerified = false;
+            mockLocation.back = jest.fn();
+            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+            addMemberToGroupPage.handleBackButton(true);
+            expect(addMemberToGroupPage.isUserIdVerified).toBeFalsy();
+            expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                PageId.ADD_MEMBER,
+                Environment.GROUP,
+                true, undefined, addMemberToGroupPage.corRelationList
+            );
+            expect(mockLocation.back).toHaveBeenCalled();
+        });
+    });
+
+    it('should handle DeviceBackButton', () => {
+        if (mockPlatform.backButton) {
+            mockPlatform.backButton = {
+                subscribeWithPriority: jest.fn((_, fn) => fn({ data: 's-id', unsubscribe: jest.fn() })) as any,
+            } as any;
+        }
+        jest.spyOn(addMemberToGroupPage, 'handleBackButton').mockImplementation(() => {
+            return;
+        });
+        addMemberToGroupPage.handleDeviceBackButton();
+    });
+
+    it('should handle device back button', () => {
+        const data = {
+            name: 'back'
+        };
+        jest.spyOn(addMemberToGroupPage, 'handleBackButton').mockImplementation(() => {
+            return;
+        });
+        addMemberToGroupPage.handleHeaderEvents(data);
+        expect(data.name).toBe('back');
+    });
+
+    it('should show header with back button', () => {
+        mockHeaderService.showHeaderWithBackButton = jest.fn();
+        mockHeaderService.headerEventEmitted$ = of({
+            subscribe: jest.fn((fn) => fn({ name: 'sample-event' }))
+        });
+        jest.spyOn(addMemberToGroupPage, 'handleHeaderEvents').mockImplementation(() => {
+            return;
+        });
+        jest.spyOn(addMemberToGroupPage, 'handleDeviceBackButton').mockImplementation(() => {
+            return;
+        });
+        mockCommonUtilService.getAppName = jest.fn(() => Promise.resolve('sunbird'));
+        // act
+        addMemberToGroupPage.ionViewWillEnter();
+        // assert
+        expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+        expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+    });
+
+    describe('onIonViewDidEnter', () => {
+
+        it('should fetch from preferences and store it const variable if ' +
+            'false then trigger native element click and put true in preferences again', (done) => {
+                // arrange
+                mockPreferences.getBoolean = jest.fn(() => of(false));
+                mockPreferences.putBoolean = jest.fn();
+                addMemberToGroupPage.addMemberInfoPopupRef = { nativeElement: { click: jest.fn() } };
+                // act
+                addMemberToGroupPage.ionViewDidEnter();
+                // assert
+                expect(mockPreferences.getBoolean).toHaveBeenCalledWith('add_member_to_group_info_popup');
+                setTimeout(() => {
+                    expect(addMemberToGroupPage.addMemberInfoPopupRef.nativeElement.click).toHaveBeenCalled();
+                    expect(mockPreferences.putBoolean).toHaveBeenCalledWith('add_member_to_group_info_popup', true);
+                    done();
+                }, 0);
+            });
+
+        it('should not call preferences put boolean if return value is true ', () => {
+            // arrange
+            mockPreferences.getBoolean = jest.fn(() => of(true));
+            mockPreferences.putBoolean = jest.fn();
+            // act
+            addMemberToGroupPage.ionViewDidEnter();
+            // assert
+            expect(mockPreferences.putBoolean).not.toHaveBeenCalled();
+        });
+    });
+    describe('onVerifyClick', () => {
+        beforeEach(() => {
+            addMemberToGroupPage.cap = {
+                execute: jest.fn(),
+                reset: jest.fn(),
+                resolved: of('sample') as any
+            } as Partial<RecaptchaComponent> as RecaptchaComponent;
+        });
+        it('should return errorMessage if userId is undefined', (done) => {
+            addMemberToGroupPage.isCaptchaEnabled = true;
+            addMemberToGroupPage.username = undefined;
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(addMemberToGroupPage, 'getGoogleCaptchaSiteKey').mockImplementation(() => {
+                return Promise.resolve({
+                    isCaptchaEnabled: true,
+                    captchaKey: 'site key'
+                });
+            });
+            mockSbUtility.verifyCaptcha = jest.fn(() => Promise.resolve('api key'));
+            addMemberToGroupPage.onVerifyClick();
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.VERIFY_USER,
+                    InteractSubtype.VERIFY_CLICKED,
+                    Environment.GROUP,
+                    PageId.ADD_MEMBER,
+                    undefined, undefined, undefined, addMemberToGroupPage.corRelationList,
+                    ID.VERIFY_USER);
+                expect(addMemberToGroupPage.username).toBeUndefined();
+                expect(addMemberToGroupPage.showErrorMsg).toBeTruthy();
+                done();
+            }, 0);
+        });
+
+        it('should return false if captchaResponse is undefined', (done) => {
+            addMemberToGroupPage.isCaptchaEnabled = false;
+            addMemberToGroupPage.username = 'sample-user-name';
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(addMemberToGroupPage, 'getGoogleCaptchaSiteKey').mockImplementation(() => {
+                return Promise.resolve({
+                    isCaptchaEnabled: false,
+                    captchaKey: 'site key'
+                });
+            });
+            mockSbUtility.verifyCaptcha = jest.fn(() => Promise.resolve('api key'));
+            mockProfileService.checkServerProfileExists = jest.fn(() => throwError(''));
+            addMemberToGroupPage.onVerifyClick();
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.VERIFY_USER,
+                    InteractSubtype.VERIFY_CLICKED,
+                    Environment.GROUP,
+                    PageId.ADD_MEMBER,
+                    undefined, undefined, undefined, addMemberToGroupPage.corRelationList,
+                    ID.VERIFY_USER);
+                expect(addMemberToGroupPage.username).toBe('sample-user-name');
+                expect(addMemberToGroupPage.showLoader).toBe(false);
+                done();
+            }, 0);
+        });
+
+        it('should return userDetails for serverProfile', (done) => {
+            // arrange
+            addMemberToGroupPage.isCaptchaEnabled = true;
+            addMemberToGroupPage.username = 'sample-user-id';
+            mockProfileService.checkServerProfileExists = jest.fn(() => of({
+                exists: true,
+                name: 'jhon'
+            })) as any;
+            jest.spyOn(addMemberToGroupPage, 'getGoogleCaptchaSiteKey').mockImplementation(() => {
+                return Promise.resolve({
+                    isCaptchaEnabled: false,
+                    captchaKey: 'site key'
+                });
+            });
+            mockSbUtility.verifyCaptcha = jest.fn(() => Promise.resolve('api key'));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            // act
+            addMemberToGroupPage.onVerifyClick();
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.INITIATED,
+                    '',
+                    Environment.GROUP,
+                    PageId.ADD_MEMBER,
+                    undefined,
+                    undefined,
+                    undefined,
+                    addMemberToGroupPage.corRelationList,
+                    ID.VERIFY_MEMBER
+                );
+                expect(addMemberToGroupPage.username).not.toBeUndefined();
+                expect(mockProfileService.checkServerProfileExists).toHaveBeenCalled();
+                expect(addMemberToGroupPage.userDetails).toStrictEqual({
+                    exists: true,
+                    name: 'jhon'
+                });
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.SUCCESS,
+                    '',
+                    Environment.GROUP,
+                    PageId.ADD_MEMBER,
+                    undefined,
+                    undefined,
+                    undefined,
+                    addMemberToGroupPage.corRelationList,
+                    ID.VERIFY_MEMBER
+                );
+                expect(addMemberToGroupPage.isUserIdVerified).toBeTruthy();
+                done();
+            }, 0);
+        });
+
+        it('should not return userDetails if serverProfile is undefined', (done) => {
+            addMemberToGroupPage.username = 'sample-user-id';
+            addMemberToGroupPage.isCaptchaEnabled = false;
+            jest.spyOn(addMemberToGroupPage, 'getGoogleCaptchaSiteKey').mockImplementation(() => {
+                return Promise.resolve({
+                    isCaptchaEnabled: false,
+                    captchaKey: 'site key'
+                });
+            });
+            mockSbUtility.verifyCaptcha = jest.fn(() => Promise.reject('api key'));
+            mockProfileService.checkServerProfileExists = jest.fn(() => of(undefined)) as any;
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            // act
+            addMemberToGroupPage.onVerifyClick();
+            // assert
+            setTimeout(() => {
+                expect(addMemberToGroupPage.username).not.toBeUndefined();
+                expect(mockProfileService.checkServerProfileExists).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.VERIFY_USER,
+                    InteractSubtype.VERIFY_CLICKED,
+                    Environment.GROUP,
+                    PageId.ADD_MEMBER,
+                    undefined, undefined, undefined, addMemberToGroupPage.corRelationList,
+                    ID.VERIFY_USER);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.INITIATED,
+                    '',
+                    Environment.GROUP,
+                    PageId.ADD_MEMBER,
+                    undefined, undefined, undefined,
+                    addMemberToGroupPage.corRelationList,
+                    ID.VERIFY_MEMBER);
+                done();
+            }, 0);
+        });
+
+        it('should not return userDetails for catch part', (done) => {
+            addMemberToGroupPage.username = 'sample-user-id';
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockProfileService.checkServerProfileExists = jest.fn(() => throwError({ error: 'error' })) as any;
+            jest.spyOn(addMemberToGroupPage, 'getGoogleCaptchaSiteKey').mockImplementation(() => {
+                return Promise.resolve({
+                    isCaptchaEnabled: false,
+                    captchaKey: 'site key'
+                });
+            });
+            // act
+            addMemberToGroupPage.onVerifyClick();
+            // assert
+            setTimeout(() => {
+                expect(addMemberToGroupPage.username).not.toBeUndefined();
+                expect(mockProfileService.checkServerProfileExists).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.VERIFY_USER,
+                    InteractSubtype.VERIFY_CLICKED,
+                    Environment.GROUP,
+                    PageId.ADD_MEMBER,
+                    undefined, undefined, undefined, addMemberToGroupPage.corRelationList,
+                    ID.VERIFY_USER);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.INITIATED,
+                    '',
+                    Environment.GROUP,
+                    PageId.ADD_MEMBER,
+                    undefined, undefined, undefined,
+                    addMemberToGroupPage.corRelationList,
+                    ID.VERIFY_MEMBER);
+                done();
+            }, 0);
+        });
+    });
+
+    it('should clear all user', () => {
+        addMemberToGroupPage.onClearUser();
+        expect(addMemberToGroupPage.isUserIdVerified).toBeFalsy();
+        expect(addMemberToGroupPage.username).toBe('');
+    });
+
+    describe('onAddToGroupClick', () => {
+        it('should add member into group', (done) => {
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            addMemberToGroupPage.memberList = [
+                {
+                    userId: 'some-user-id'
+                }
+            ];
+            addMemberToGroupPage.userDetails = { userId: 'sample-user-id' };
+            //  GroupMemberRole.MEMBER;
+            mockGroupService.addMembers = jest.fn(() => of({ error: { members: [{errorCode: 'EXCEEDED_MEMBER_MAX_LIMIT'}] } })) as any;
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            addMemberToGroupPage.onAddToGroupClick();
+            // assert
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(addMemberToGroupPage.userDetails).not.toBeNull();
+                expect(mockGroupService.addMembers).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should add member into group', (done) => {
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            addMemberToGroupPage.memberList = [
+                {
+                    userId: 'some-user-id'
+                }
+            ];
+            addMemberToGroupPage.userDetails = { userId: 'sample-user-id' };
+            mockGroupService.addMembers = jest.fn(() => of({})) as any;
+            mockCommonUtilService.showToast = jest.fn();
+            mockLocation.back = jest.fn();
+            // act
+            addMemberToGroupPage.onAddToGroupClick();
+            // assert
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(addMemberToGroupPage.userDetails).not.toBeNull();
+                expect(mockGroupService.addMembers).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('MEMBER_ADDED_TO_GROUP');
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockLocation.back).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should not add member into group if already exists', (done) => {
+            addMemberToGroupPage.memberList = [
+                {
+                    userId: 'sample-user-id'
+                }
+            ];
+            addMemberToGroupPage.userDetails = { id: 'sample-user-id' };
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            addMemberToGroupPage.onAddToGroupClick();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('MEMBER_ALREADY_EXISTS_IN_GROUP');
+                done();
+            }, 0);
+        });
+
+        it('should add member into group for catch part', (done) => {
+            addMemberToGroupPage.memberList = [
+                {
+                    userId: 'some-user-id'
+                }
+            ];
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            addMemberToGroupPage.userDetails = { userId: 'sample-user-id' };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockGroupService.addMembers = jest.fn(() => throwError({ error: 'error' })) as any;
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            addMemberToGroupPage.onAddToGroupClick();
+            // assert
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.ADD_MEMBER_TO_GROUP_CLICKED,
+                    Environment.GROUP,
+                    PageId.ADD_MEMBER,
+                    undefined, undefined, undefined, addMemberToGroupPage.corRelationList);
+                expect(addMemberToGroupPage.userDetails).not.toBeNull();
+                expect(mockGroupService.addMembers).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('SOMETHING_WENT_WRONG');
+                expect(dismissFn).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should return if network is not available', () => {
+            // arrange
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: false };
+            mockCommonUtilService.presentToastForOffline = jest.fn();
+            // act
+            addMemberToGroupPage.onAddToGroupClick();
+            // assert
+            expect(mockCommonUtilService.presentToastForOffline).toHaveBeenCalledWith('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+        });
+    });
+
+    it('should unsubscribe headerService', () => {
+        addMemberToGroupPage.headerObservable = {
+            unsubscribe: jest.fn()
+        };
+        mockPlatform.backButton = {
+            unsubscribe: jest.fn()
+        } as any;
+        addMemberToGroupPage.ionViewWillLeave();
+    });
+
+    describe('openInfoPopup', () => {
+        it('should return undefined for backDrop clicked', (done) => {
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: undefined }))
+            } as any)));
+            addMemberToGroupPage.openInfoPopup();
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should close popup for clicked on close icpn', (done) => {
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { closeDeletePopOver: true } }))
+            } as any)));
+            addMemberToGroupPage.openInfoPopup();
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should delete popup', (done) => {
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: true } }))
+            } as any)));
+            addMemberToGroupPage.openInfoPopup();
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should not delete popup', (done) => {
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: false } }))
+            } as any)));
+            addMemberToGroupPage.openInfoPopup();
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    // it('should return captchaResponse', (done) => {
+    //     addMemberToGroupPage.captchaResolved('');
+    //     setTimeout(() => {
+    //         expect(addMemberToGroupPage.captchaResponse).toBe('');
+    //         done();
+    //     }, 0);
+    // });
+});
diff --git a/src/app/my-groups/add-member-to-group/add-member-to-group.page.ts b/src/app/my-groups/add-member-to-group/add-member-to-group.page.ts
new file mode 100644
index 000000000..fa737f460
--- /dev/null
+++ b/src/app/my-groups/add-member-to-group/add-member-to-group.page.ts
@@ -0,0 +1,310 @@
+import { Component, Inject, ViewChild, ElementRef } from '@angular/core';
+import { Subscription } from 'rxjs';
+import {
+  AddMembersRequest,
+  CheckUserExistsRequest,
+  GroupMember,
+  GroupMemberRole,
+  GroupService,
+  ProfileService,
+  SystemSettingsService,
+  SharedPreferences,
+  CorrelationData
+} from 'sunbird-sdk';
+import { Location } from '@angular/common';
+import { Router } from '@angular/router';
+import { Platform, PopoverController } from '@ionic/angular';
+import {
+  AppHeaderService,
+  CommonUtilService,
+  Environment,
+  ID,
+  InteractSubtype,
+  InteractType,
+  PageId,
+  TelemetryGeneratorService,
+  UtilityService
+} from '@app/services';
+import { animationShrinkOutTopRight } from '../../animations/animation-shrink-out-top-right';
+import { MyGroupsPopoverComponent } from '../../components/popups/sb-my-groups-popover/sb-my-groups-popover.component';
+import { animationGrowInFromEvent } from '@app/app/animations/animation-grow-in-from-event';
+import { PreferenceKey, GroupErrorCodes } from '@app/app/app.constant';
+import { RecaptchaComponent } from 'ng-recaptcha';
+
+@Component({
+  selector: 'app-add-member-to-group',
+  templateUrl: './add-member-to-group.page.html',
+  styleUrls: ['./add-member-to-group.page.scss'],
+})
+export class AddMemberToGroupPage {
+
+  corRelationList: Array<CorrelationData>;
+  isUserIdVerified = false;
+  showErrorMsg = false;
+  headerObservable: any;
+  showLoader: boolean;
+  username = '';
+  groupId: string;
+  memberList: GroupMember[] = [];
+  userDetails;
+  private unregisterBackButton: Subscription;
+  appName: string;
+  @ViewChild('cap', { static: false }) cap: RecaptchaComponent;
+  @ViewChild('addMemberInfoPopupRef', { static: false }) addMemberInfoPopupRef: ElementRef<HTMLSpanElement>;
+
+  constructor(
+    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+    @Inject('GROUP_SERVICE') public groupService: GroupService,
+    @Inject('SYSTEM_SETTINGS_SERVICE') private systemSettingsService: SystemSettingsService,
+    @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
+    private headerService: AppHeaderService,
+    private router: Router,
+    private location: Location,
+    private platform: Platform,
+    private commonUtilService: CommonUtilService,
+    private popoverCtrl: PopoverController,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+    private sbUtility: UtilityService
+  ) {
+    const extras = this.router.getCurrentNavigation().extras.state;
+    this.groupId = extras.groupId;
+    this.memberList = extras.memberList;
+    this.corRelationList = extras.corRelation;
+  }
+
+  async getGoogleCaptchaSiteKey(): Promise<{ isCaptchaEnabled: boolean, captchaKey: string }> {
+    if (this.commonUtilService.getGoogleCaptchaConfig().size === 0) {
+      return this.systemSettingsService.getSystemSettings({ id: 'appGoogleReCaptcha' }).toPromise()
+        .then((res) => {
+          const captchaConfig = JSON.parse(res.value);
+          const isCaptchaEnabled = captchaConfig['isEnabled'] || captchaConfig.get('isEnabled');
+          const captchaKey = captchaConfig['key'] || captchaConfig.get('key');
+          this.commonUtilService.setGoogleCaptchaConfig(captchaKey, isCaptchaEnabled);
+          return { isCaptchaEnabled, captchaKey };
+        });
+    } else if (Boolean(this.commonUtilService.getGoogleCaptchaConfig())) {
+      const captchaConfig = this.commonUtilService.getGoogleCaptchaConfig();
+      const isCaptchaEnabled = captchaConfig['isEnabled'] || captchaConfig.get('isEnabled');
+      const captchaKey = captchaConfig['key'] || captchaConfig.get('key');
+      return { isCaptchaEnabled, captchaKey };
+    }
+  }
+
+  ionViewWillEnter() {
+    this.headerService.showHeaderWithBackButton();
+    this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
+      this.handleHeaderEvents(eventName);
+    });
+    this.handleDeviceBackButton();
+    this.commonUtilService.getAppName().then((res) => { this.appName = res; });
+  }
+
+  async ionViewDidEnter() {
+    try {
+      const addMemberInfoScreen = await this.preferences.getBoolean(PreferenceKey.ADD_MEMBER_TO_GROUP_INFO_POPUP).toPromise();
+      if (!addMemberInfoScreen) {
+        this.addMemberInfoPopupRef.nativeElement.click();
+        // this.openInfoPopup();
+        this.preferences.putBoolean(PreferenceKey.ADD_MEMBER_TO_GROUP_INFO_POPUP, true).toPromise().then();
+      }
+    } catch (err) {
+    }
+  }
+
+  ionViewWillLeave() {
+    this.headerObservable.unsubscribe();
+    if (this.unregisterBackButton) {
+      this.unregisterBackButton.unsubscribe();
+    }
+  }
+
+  handleDeviceBackButton() {
+    this.unregisterBackButton = this.platform.backButton.subscribeWithPriority(10, () => {
+      this.handleBackButton(false);
+    });
+  }
+
+  handleHeaderEvents($event) {
+    switch ($event.name) {
+      case 'back':
+        this.handleBackButton(true);
+        break;
+    }
+  }
+
+  handleBackButton(isNavBack) {
+    if (this.isUserIdVerified) {
+      this.isUserIdVerified = false;
+    } else {
+      this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.ADD_MEMBER,
+        Environment.GROUP, isNavBack, undefined, this.corRelationList);
+      this.location.back();
+    }
+  }
+
+  async onVerifyClick() {
+    let captchaResponse: string | undefined;
+    const { isCaptchaEnabled, captchaKey } = await this.getGoogleCaptchaSiteKey();
+    if (isCaptchaEnabled) {
+      await this.sbUtility.verifyCaptcha(captchaKey).then((res) => {
+        captchaResponse = res;
+      }).catch((error) => {
+        console.error(error);
+      });
+    }
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.VERIFY_USER,
+      InteractSubtype.VERIFY_CLICKED,
+      Environment.GROUP,
+      PageId.ADD_MEMBER,
+      undefined, undefined, undefined, this.corRelationList, ID.VERIFY_USER);
+
+    if (!this.username) {
+      this.showErrorMsg = true;
+      return;
+    }
+    this.showErrorMsg = false;
+    const checkUserExistsRequest: CheckUserExistsRequest = {
+      matching: {
+        key: 'userName',
+        value: this.username
+      },
+      captchaResponseToken: captchaResponse
+    };
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.INITIATED,
+      '',
+      Environment.GROUP,
+      PageId.ADD_MEMBER,
+      undefined,
+      undefined,
+      undefined,
+      this.corRelationList,
+      ID.VERIFY_MEMBER);
+
+    this.showLoader = true;
+    this.profileService.checkServerProfileExists(checkUserExistsRequest).toPromise()
+      .then(async (checkUserExistsResponse) => {
+        this.showLoader = false;
+        if (checkUserExistsResponse && checkUserExistsResponse.exists) {
+          this.userDetails = checkUserExistsResponse;
+          this.isUserIdVerified = true;
+
+          this.telemetryGeneratorService.generateInteractTelemetry(
+            InteractType.SUCCESS,
+            '',
+            Environment.GROUP,
+            PageId.ADD_MEMBER,
+            undefined,
+            undefined,
+            undefined,
+            this.corRelationList,
+            ID.VERIFY_MEMBER);
+        } else {
+          this.showErrorMsg = true;
+        }
+      }).catch(async (e) => {
+        console.error(e);
+        this.showLoader = false;
+        this.commonUtilService.showToast('SOMETHING_WENT_WRONG');
+      });
+  }
+
+  onClearUser() {
+    this.isUserIdVerified = false;
+    this.username = '';
+  }
+
+  async onAddToGroupClick() {
+    if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+      this.commonUtilService.presentToastForOffline('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+      return;
+    }
+
+    const userExist = this.memberList.find(m => m.userId === this.userDetails.id);
+    // Check if user already exist in group
+    if (userExist) {
+      this.commonUtilService.showToast('MEMBER_ALREADY_EXISTS_IN_GROUP');
+      return;
+    }
+
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      InteractSubtype.ADD_MEMBER_TO_GROUP_CLICKED,
+      Environment.GROUP,
+      PageId.ADD_MEMBER,
+      undefined, undefined, undefined, this.corRelationList);
+
+    const loader = await this.commonUtilService.getLoader();
+    await loader.present();
+
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.INITIATED,
+      '',
+      Environment.GROUP,
+      PageId.ADD_MEMBER,
+      undefined,
+      undefined,
+      undefined,
+      this.corRelationList,
+      ID.ADD_MEMBER_TO_GROUP);
+    const addMemberToGroupReq: AddMembersRequest = {
+      groupId: this.groupId,
+      addMembersRequest: {
+        members: [{
+          userId: this.userDetails.id,
+          role: GroupMemberRole.MEMBER
+        }]
+      }
+    };
+    this.groupService.addMembers(addMemberToGroupReq).toPromise()
+      .then(async (res) => {
+        await loader.dismiss();
+        if (res.error && res.error.members && res.error.members.length) {
+          console.log('in err');
+          if (res.error.members[0].errorCode === GroupErrorCodes.EXCEEDED_MEMBER_MAX_LIMIT) {
+            this.commonUtilService.showToast('ERROR_MAXIMUM_MEMBER_COUNT_EXCEEDS');
+          }
+        } else {
+          this.telemetryGeneratorService.generateInteractTelemetry(
+            InteractType.SUCCESS,
+            '',
+            Environment.GROUP,
+            PageId.ADD_MEMBER,
+            undefined,
+            undefined,
+            undefined,
+            this.corRelationList,
+            ID.ADD_MEMBER_TO_GROUP);
+
+          this.commonUtilService.showToast('MEMBER_ADDED_TO_GROUP');
+          this.location.back();
+        }
+      }).catch(async (e) => {
+        console.log(e);
+        await loader.dismiss();
+        this.commonUtilService.showToast('SOMETHING_WENT_WRONG');
+      });
+  }
+
+  async openInfoPopup(event: MouseEvent) {
+    const popover = await this.popoverCtrl.create({
+      component: MyGroupsPopoverComponent,
+      componentProps: {
+        isFromAddMember: true
+      },
+      enterAnimation: animationGrowInFromEvent(event),
+      leaveAnimation: animationShrinkOutTopRight,
+      backdropDismiss: false,
+      showBackdrop: true,
+      cssClass: 'popover-my-groups'
+    });
+    await popover.present();
+    const { data } = await popover.onDidDismiss();
+    if (data === undefined) { // Backdrop clicked
+    } else if (data.closeDeletePopOver) { // Close clicked
+    } else if (data.canDelete) {
+    }
+  }
+
+}
diff --git a/src/app/my-groups/create-edit-group/create-edit-group.module.ts b/src/app/my-groups/create-edit-group/create-edit-group.module.ts
new file mode 100644
index 000000000..f2a31bab4
--- /dev/null
+++ b/src/app/my-groups/create-edit-group/create-edit-group.module.ts
@@ -0,0 +1,32 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { Routes, RouterModule } from '@angular/router';
+import { IonicModule } from '@ionic/angular';
+import { TranslateModule } from '@ngx-translate/core';
+import { CreateEditGroupPage } from './create-edit-group.page';
+import { DirectivesModule } from '@app/directives/directives.module';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: CreateEditGroupPage
+  }
+];
+
+@NgModule({
+  declarations: [CreateEditGroupPage],
+  imports: [
+    CommonModule,
+    FormsModule,
+    ReactiveFormsModule,
+    IonicModule,
+    DirectivesModule,
+    RouterModule.forChild(routes),
+    TranslateModule.forChild(),
+    CommonConsumptionModule
+  ],
+  exports: [CreateEditGroupPage]
+})
+export class CreateEditGroupPageModule { }
diff --git a/src/app/my-groups/create-edit-group/create-edit-group.page.html b/src/app/my-groups/create-edit-group/create-edit-group.page.html
new file mode 100644
index 000000000..ad0bf53f1
--- /dev/null
+++ b/src/app/my-groups/create-edit-group/create-edit-group.page.html
@@ -0,0 +1,53 @@
+<ion-content>
+  <form [formGroup]="createGroupForm">
+    <p class="cr-title" *ngIf="!groupDetails">{{'CREATE_GROUP' | translate}}</p>
+    <p class="cr-title" *ngIf="groupDetails">{{'EDIT_GROUP' | translate}}</p>
+    <ion-item class="input-item" 
+    [ngClass]="{'cr-input-primary': !((createGroupFormControls.groupName.touched || createGroupFormSubmitted) && createGroupFormControls.groupName.errors?.required) ,
+      'cr-input-error': ((createGroupFormControls.groupName.touched || createGroupFormSubmitted) && createGroupFormControls.groupName.errors?.required)}">
+      <ion-label position="stacked" class="label-font align-text">{{'GROUP_NAME' | translate }}<sup>*</sup></ion-label>
+      <ion-input formControlName="groupName" maxlength="50" placeholder="{{'ENTER_GROUP_NAME' | translate}}"></ion-input>
+      <span class="char-info" 
+        [innerHTML]="'CHARACTERS_REMAINING' | translate: {'character_count':  50 - createGroupFormControls.groupName.value?.length} "
+        *ngIf="!((createGroupFormControls.groupName.touched || createGroupFormSubmitted) && createGroupFormControls.groupName.errors?.required)">
+      </span>
+      <span *ngIf="(createGroupFormControls.groupName.touched || createGroupFormSubmitted) && createGroupFormControls.groupName.errors?.required" class="cr-error">{{ errorMessages.groupName.message | translate }}</span>
+    </ion-item>
+    <ion-item class="input-item cr-input-primary">
+      <ion-label position="stacked" class="label-font align-text">{{'GROUP_DESCRIPTION' | translate }}</ion-label>
+      <ion-textarea class="cr-desc" formControlName="groupDesc" maxlength="150" rows="4" placeholder="{{'GROUP_DESCRIPTION_PLACEHOLDER' | translate}}"></ion-textarea>
+      <span class="char-info"
+            [innerHTML]="'CHARACTERS_REMAINING' | translate: {'character_count':  150 - createGroupFormControls.groupDesc.value?.length} "
+      ></span>
+    </ion-item>
+    <div class="cr-terms-container" *ngIf="!groupDetails">
+      <div class="input-item cr-input-primary" lines="none">
+        <ion-checkbox id="cr-term-label-accessible" class="cr-terms-checkbox" formControlName="groupTerms" color="secondary" checked="false"></ion-checkbox>
+        <label class="hide" for="cr-term-label-accessible" >{{'I_AGREE_TO' | translate: {'app_name': appName} }} checkbox </label>
+        <p class="cr-terms-checkbox-label"> 
+          <span>{{'I_AGREE_TO' | translate: {'app_name': appName} }} </span><span class="cr-terms" (click)="openTermsOfUse()">{{'GROUP_GUIDELINES' | translate}}</span>
+        </p>
+        </div>
+      <p
+        *ngIf="(createGroupFormControls.groupTerms.touched || createGroupFormSubmitted) && createGroupFormControls.groupTerms.invalid"
+        class="cr-error cr-error-checkbox"
+        [innerHTML]="'GROUP_TERMS_IS_REQUIRED' | translate:  {'app_name':  appName}" ></p>
+    </div>
+    
+  </form>
+</ion-content>
+
+<ion-footer>
+    <div class="padding-16" *ngIf="!groupDetails">
+      <button class="sb-btn-large" expand="block" [class.inactive]="createGroupForm.invalid" (click)="onSubmit()">
+        <img src="assets/imgs/ic_group_add_white.svg" alt="">
+        {{'CREATE_GROUP' | translate}}
+      </button>
+    </div>
+    <div class="padding-16" *ngIf="groupDetails">
+      <button class="sb-btn-large" expand="block" [class.inactive]="createGroupForm.invalid" (click)="onSubmit()">
+        <img src="assets/imgs/ic_group_add_white.svg" alt="">
+        {{'EDIT_GROUP' | translate}}
+      </button>
+    </div>
+</ion-footer>
diff --git a/src/app/my-groups/create-edit-group/create-edit-group.page.scss b/src/app/my-groups/create-edit-group/create-edit-group.page.scss
new file mode 100644
index 000000000..1b9bda612
--- /dev/null
+++ b/src/app/my-groups/create-edit-group/create-edit-group.page.scss
@@ -0,0 +1,141 @@
+@import "src/assets/styles/_variables.scss";
+:host {
+  .label-font {
+    color: $gray-800 !important;
+    font-family: "Noto Sans", sans-serif !important;
+    font-size: 22px !important;
+    font-weight: normal;
+  }
+
+  .padding-12 {
+    padding: 12px !important;
+  }
+
+  .cr-error-checkbox{
+    margin: 0;
+  }
+
+  .char-info{
+    display: block;
+    text-align: right;
+    width: 100%;
+    font-size: 12px;
+    padding-top: 4px;
+    color: $gray-300;
+  }
+  
+
+  ion-item {
+    // --border-color: var(--ion-color-danger, #f1453d);
+  }
+
+  .sb-btn-large{
+    &.inactive{
+      background-color: $gray-200;
+    }
+    img{
+      margin-right: 8px;
+      position: relative;
+      bottom: 2px;
+    }
+  }
+
+  .item-label-stacked ion-input {
+    margin-top: 16px;
+    padding-left: 16px !important;
+    padding-right: 16px !important;
+    font-size: 14px;
+  }
+
+  .item-label-stacked .cr-desc {
+    margin-top: 16px;
+    padding: 0 16px;
+    border: 1px solid $gray-800 !important;
+    border-radius: 2px;
+  }
+  
+
+  .cr-input-primary ion-input{
+    border: 1px solid $gray-800;
+    border-radius: 2px;
+  }
+
+  .cr-input-error ion-input{
+    border: 1px solid $red;
+  }
+
+  ion-item.item-label-stacked {
+    --border-width: 0;
+    --highlight-background: transparent;
+  }
+
+  // .item-select ion-label {
+  //   color: #006de5;
+  // }
+  ion-checkbox{
+    &.cr-terms-checkbox{
+      --ion-color-base: green !important;
+    }
+  }
+  .cr-terms-container{
+    padding: 0 16px;
+    font-size: 14px;
+    .cr-terms-checkbox-label{
+      margin-left: 16px;
+      display: inline-block;
+      vertical-align: super;
+      margin-bottom: 0;
+    }
+    .cr-terms{
+      color: $blue;
+    }
+  }
+  ion-label {
+    color: $gray-800;
+    font-family: "Noto Sans", sans-serif;
+    font-size: 14px;
+    letter-spacing: 0;
+    sup{
+      font-size: 22px;
+      top: 0;
+      margin-left: 4px;
+      color: $red;
+    }
+  }
+
+}
+
+.cr-title{
+  font-size: 16px;
+  font-weight: bold;
+  color: $blue;
+  margin: 16px 16px 0;
+}
+
+.cr-input-title{
+  color: $gray-800;
+  font-family: "Noto Sans", sans-serif;
+  font-size: 14px;
+  letter-spacing: 0;
+  line-height: 19px;
+  margin: 16px 0 8px;
+}
+
+.cr-input-box{
+  border: 0.5px solid $gray-800;
+  border-radius: 2px;
+  ion-input{
+    margin: 0 8px;
+  }
+}
+
+.cr-error{
+  margin-top: 8px;
+  display: block;
+  font-size: 12px;
+  color: $red;
+}
+
+.input-item{
+  padding-top: 8px;
+}
diff --git a/src/app/my-groups/create-edit-group/create-edit-group.page.spec.ts b/src/app/my-groups/create-edit-group/create-edit-group.page.spec.ts
new file mode 100644
index 000000000..974ac5133
--- /dev/null
+++ b/src/app/my-groups/create-edit-group/create-edit-group.page.spec.ts
@@ -0,0 +1,338 @@
+import { CreateEditGroupPage } from './create-edit-group.page';
+import { GroupService } from '@project-sunbird/sunbird-sdk';
+import { FormBuilder } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import { Platform, AlertController } from '@ionic/angular';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { AppHeaderService } from '@app/services/app-header.service';
+import { Location } from '@angular/common';
+import { of, throwError } from 'rxjs';
+import {
+    Environment, ID,
+    ImpressionSubtype,
+    ImpressionType,
+    InteractType,
+    PageId,
+    TelemetryGeneratorService,
+    UtilityService
+} from '../../../services';
+import { Router } from '@angular/router';
+
+describe('CreateEditGroupPage', () => {
+    let createEditGroupPage: CreateEditGroupPage;
+    const mockAlertCtrl: Partial<AlertController> = {};
+    const mockGroupService: Partial<GroupService> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        getAppName: jest.fn(() => Promise.resolve('Sunbird')),
+        getBuildConfigValue: jest.fn(() => Promise.resolve('sampleConfig')),
+        networkInfo: jest.fn(),
+    };
+    const mockUtilityService: Partial<UtilityService> = {
+        getBuildConfigValue: jest.fn(() => Promise.resolve('sampleConfig'))
+    };
+    const mockFormBuilder: Partial<FormBuilder> = {
+        group: jest.fn(() => { }) as any
+    };
+    const mockHeaderService: Partial<AppHeaderService> = {};
+    const mockLocation: Partial<Location> = {
+        back: jest.fn()
+    };
+    const mockPlatform: Partial<Platform> = {
+    };
+    const mockTranslate: Partial<TranslateService> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateInteractTelemetry: jest.fn(),
+        generateBackClickedTelemetry: jest.fn()
+    };
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => ({
+            extras: {
+                state: {}
+            }
+        })) as any
+    };
+
+    beforeAll(() => {
+        createEditGroupPage = new CreateEditGroupPage(
+            mockGroupService as GroupService,
+            mockCommonUtilService as CommonUtilService,
+            mockFormBuilder as FormBuilder,
+            mockTranslate as TranslateService,
+            mockHeaderService as AppHeaderService,
+            mockLocation as Location,
+            mockPlatform as Platform,
+            mockAlertCtrl as AlertController,
+            mockUtilityService as UtilityService,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockRouter as Router,
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should be create a instance of createEditGroupPage', () => {
+        expect(createEditGroupPage).toBeTruthy();
+    });
+
+    it('should set groupdetails locally', () => {
+        mockRouter.getCurrentNavigation = jest.fn(() => ({
+            extras: {
+                state: {
+                    groupDetails: {
+                        name: 'sample name'
+                    }
+                }
+            }
+        })) as any;
+        const TestcreateEditGroupPageConstructor = new CreateEditGroupPage(
+            mockGroupService as GroupService,
+            mockCommonUtilService as CommonUtilService,
+            mockFormBuilder as FormBuilder,
+            mockTranslate as TranslateService,
+            mockHeaderService as AppHeaderService,
+            mockLocation as Location,
+            mockPlatform as Platform,
+            mockAlertCtrl as AlertController,
+            mockUtilityService as UtilityService,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockRouter as Router,
+        );
+        expect(TestcreateEditGroupPageConstructor.groupDetails).toEqual({
+            name: 'sample name'
+        });
+    });
+
+    it('handleHeaderEvents', () => {
+        createEditGroupPage.handleHeaderEvents({ name: 'back' });
+        expect(mockLocation.back).toHaveBeenCalled();
+    });
+
+    describe('handleBackButtonEvents', () => {
+        it('should return active portal', (done) => {
+            mockPlatform.backButton = {
+                subscribeWithPriority: jest.fn((_, fn) => fn({ data: 's-id', unsubscribe: jest.fn() })) as any,
+            } as any;
+            const dismissFn = jest.fn(() => Promise.resolve(true));
+            mockAlertCtrl.getTop = jest.fn(() => Promise.resolve({
+                dismiss: dismissFn
+            })) as any;
+            createEditGroupPage.handleBackButtonEvents();
+            setTimeout(() => {
+                expect(mockPlatform.backButton).not.toBeUndefined();
+                done();
+            }, 0);
+        });
+
+        it('should navigate to previous page', (done) => {
+            mockPlatform.backButton = {
+                subscribeWithPriority: jest.fn((_, fn) => fn({ data: 's-id', unsubscribe: jest.fn() })) as any,
+            } as any;
+            mockAlertCtrl.getTop = jest.fn(() => undefined);
+            mockLocation.back = jest.fn();
+            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+            createEditGroupPage.handleBackButtonEvents();
+            setTimeout(() => {
+                expect(mockPlatform.backButton).not.toBeUndefined();
+                expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                    PageId.CREATE_GROUP, Environment.GROUP, false, undefined, createEditGroupPage.corRelationList
+                );
+                done();
+            }, 0);
+        });
+    });
+
+    it('should return headers with backButton', () => {
+        mockHeaderService.showHeaderWithBackButton = jest.fn();
+        const data = jest.fn((fn => fn({ name: 'sample-event' })));
+        mockHeaderService.headerEventEmitted$ = {
+            subscribe: data
+        } as any;
+        jest.spyOn(createEditGroupPage, 'handleBackButtonEvents').mockImplementation(() => {
+            return;
+        });
+        mockCommonUtilService.getAppName = jest.fn(() => Promise.resolve('Sunbird'));
+        mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        createEditGroupPage.ionViewWillEnter();
+        expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+        expect(mockCommonUtilService.getAppName).toHaveBeenCalled();
+        expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+            ImpressionType.VIEW, ImpressionSubtype.CREATE_GROUP_FORM, PageId.CREATE_GROUP, Environment.GROUP,
+            undefined, undefined, undefined, undefined, createEditGroupPage.corRelationList);
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.INITIATED,
+            '',
+            Environment.GROUP,
+            PageId.CREATE_GROUP,
+            undefined,
+            undefined,
+            undefined,
+            createEditGroupPage.corRelationList,
+            ID.CREATE_GROUP
+        );
+    });
+
+    describe('ionViewWillLeave', () => {
+        it('should unsubscribe backButton', () => {
+            createEditGroupPage.backButtonFunc = {
+                unsubscribe: jest.fn()
+            } as any;
+            createEditGroupPage.headerObservable = {
+                unsubscribe: jest.fn()
+            } as any;
+            createEditGroupPage.ionViewWillLeave();
+            expect(createEditGroupPage.backButtonFunc).toBeTruthy();
+        });
+
+        it('should unsubscribe backButton for else part', () => {
+            createEditGroupPage.backButtonFunc = undefined;
+            createEditGroupPage.headerObservable = undefined;
+            createEditGroupPage.ionViewWillLeave();
+            expect(createEditGroupPage.backButtonFunc).toBeFalsy();
+        });
+    });
+
+    it('should return createGroupForm', () => {
+        createEditGroupPage.createGroupForm = {
+            controls: {
+                id: {}
+            }
+        } as any;
+        expect(createEditGroupPage.createGroupFormControls).toEqual({ id: {} });
+    });
+
+    describe('onSubmit', () => {
+        it('should return and new group invoked createGroup if createGroupForm is valid', (done) => {
+            createEditGroupPage.createGroupForm = {
+                value: { groupName: 'new-sample-group', groupDesc: 'group-desc', groupTerms: undefined },
+                controls: { groupTerms: { setErrors: jest.fn(() => true) } },
+                valid: true
+            } as any;
+            mockCommonUtilService.networkInfo.isNetworkAvailable = true;
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockGroupService.create = jest.fn(() => of({})) as any;
+            mockCommonUtilService.showToast = jest.fn();
+            mockLocation.back = jest.fn();
+            createEditGroupPage.onSubmit();
+            expect(createEditGroupPage.createGroupFormSubmitted).toBeTruthy();
+            expect(createEditGroupPage.createGroupForm.valid).toBeTruthy();
+            expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBe(true);
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(mockGroupService.create).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('GROUP_CREATED');
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+                expect(mockLocation.back).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should not return and new group invoked createGroup if createGroupForm is valid for catch part', (done) => {
+            createEditGroupPage.createGroupForm = {
+                value: { groupName: 'new-sample-group', groupDesc: 'group-desc', groupTerms: 'true' },
+                valid: true
+            } as any;
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockCommonUtilService.networkInfo.isNetworkAvailable = true;
+            mockGroupService.create = jest.fn(() => throwError({ error: 'error' })) as any;
+            mockCommonUtilService.showToast = jest.fn();
+            mockLocation.back = jest.fn();
+            createEditGroupPage.onSubmit();
+            expect(createEditGroupPage.createGroupFormSubmitted).toBeTruthy();
+            expect(createEditGroupPage.createGroupForm.valid).toBeTruthy();
+            expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBe(true);
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(mockGroupService.create).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('SOMETHING_WENT_WRONG');
+                done();
+            }, 0);
+        });
+
+        it('should not invoked createGroup if createGroupForm is not valid', () => {
+            createEditGroupPage.createGroupForm = {
+                value: { groupName: 'new-sample-group', groupTerms: 'true' },
+                valid: false
+            } as any;
+            createEditGroupPage.onSubmit();
+            expect(createEditGroupPage.createGroupFormSubmitted).toBeTruthy();
+            expect(createEditGroupPage.createGroupForm.valid).toBeFalsy();
+        });
+
+        it('should call editgroup', (done) => {
+            createEditGroupPage.createGroupForm = {
+                value: { groupName: 'new-sample-group', groupDesc: 'group-desc', groupTerms: 'true', id: 'id' },
+                valid: true
+            } as any;
+            mockCommonUtilService.networkInfo.isNetworkAvailable = true;
+            createEditGroupPage.groupDetails = { name: 'name' };
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockGroupService.updateById = jest.fn(() => of({})) as any;
+            mockCommonUtilService.showToast = jest.fn();
+            mockLocation.back = jest.fn();
+            createEditGroupPage.onSubmit();
+            expect(createEditGroupPage.createGroupFormSubmitted).toBeTruthy();
+            expect(createEditGroupPage.createGroupForm.valid).toBeTruthy();
+            expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBe(true);
+            setTimeout(() => {
+                expect(mockGroupService.updateById).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('GROUP_UPDATE_SUCCESS');
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+                expect(mockLocation.back).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should call editgroup', (done) => {
+            createEditGroupPage.createGroupForm = {
+                value: { groupName: 'new-sample-group', groupDesc: 'group-desc', groupTerms: 'true', id: 'id' },
+                valid: true
+            } as any;
+            mockCommonUtilService.networkInfo.isNetworkAvailable = true;
+            createEditGroupPage.groupDetails = { name: 'name' };
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockGroupService.updateById = jest.fn(() => throwError(''));
+            createEditGroupPage.onSubmit();
+            expect(createEditGroupPage.createGroupFormSubmitted).toBeTruthy();
+            expect(createEditGroupPage.createGroupForm.valid).toBeTruthy();
+            expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBe(true);
+            setTimeout(() => {
+                expect(dismissFn).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    it('should open terms of use page', () => {
+        // arrange
+        // action
+        createEditGroupPage.openTermsOfUse();
+        // assert
+        expect(mockUtilityService.getBuildConfigValue).toHaveBeenCalled();
+    });
+});
diff --git a/src/app/my-groups/create-edit-group/create-edit-group.page.ts b/src/app/my-groups/create-edit-group/create-edit-group.page.ts
new file mode 100644
index 000000000..004849830
--- /dev/null
+++ b/src/app/my-groups/create-edit-group/create-edit-group.page.ts
@@ -0,0 +1,254 @@
+import { Subscription } from 'rxjs';
+import { Component, Inject } from '@angular/core';
+import { Platform, AlertController } from '@ionic/angular';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  GroupService, GroupCreateRequest, GroupMembershipType,
+  UpdateByIdRequest, CorrelationData
+} from 'sunbird-sdk';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { AppHeaderService } from '@app/services/app-header.service';
+import { Location } from '@angular/common';
+import { UtilityService } from '@app/services';
+import { RouterLinks, GroupErrorCodes } from '@app/app/app.constant';
+import {
+  Environment, ID, ImpressionSubtype,
+  ImpressionType, InteractType, PageId,
+  TelemetryGeneratorService, InteractSubtype
+} from '@app/services';
+import { Router } from '@angular/router';
+
+@Component({
+  selector: 'app-create-edit-group',
+  templateUrl: './create-edit-group.page.html',
+  styleUrls: ['./create-edit-group.page.scss'],
+})
+export class CreateEditGroupPage {
+
+  corRelationList: Array<CorrelationData>;
+  appName: string;
+  createGroupFormSubmitted = false;
+  createGroupForm: FormGroup;
+  backButtonFunc: Subscription;
+  hasFilledLocation = false;
+  errorMessages = {
+    groupName: {
+      message: 'GROUP_NAME_IS_REQUIRED'
+    },
+    groupTerms: {
+      message: 'GROUP_TERMS_IS_REQUIRED'
+    }
+  };
+  headerObservable: Subscription;
+  extras: any;
+  groupDetails: any;
+
+  constructor(
+    @Inject('GROUP_SERVICE') public groupService: GroupService,
+    private commonUtilService: CommonUtilService,
+    private fb: FormBuilder,
+    private translate: TranslateService,
+    private headerService: AppHeaderService,
+    private location: Location,
+    private platform: Platform,
+    private alertCtrl: AlertController,
+    private utilityService: UtilityService,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+    private router: Router
+  ) {
+    const extras = this.router.getCurrentNavigation().extras.state;
+    if (extras && extras.groupDetails) {
+      this.groupDetails = extras.groupDetails;
+      this.corRelationList = extras.corRelation;
+    }
+    this.initializeForm();
+  }
+
+  ionViewWillEnter() {
+    this.headerService.showHeaderWithBackButton();
+
+    this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
+      this.handleHeaderEvents(eventName);
+    });
+
+    this.handleBackButtonEvents();
+    this.commonUtilService.getAppName().then((res) => { this.appName = res; });
+
+    this.telemetryGeneratorService.generateImpressionTelemetry(
+      ImpressionType.VIEW, ImpressionSubtype.CREATE_GROUP_FORM, PageId.CREATE_GROUP, Environment.GROUP,
+      undefined, undefined, undefined, undefined, this.corRelationList);
+
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.INITIATED,
+      '',
+      Environment.GROUP,
+      PageId.CREATE_GROUP,
+      undefined,
+      undefined,
+      undefined,
+      this.corRelationList,
+      ID.CREATE_GROUP
+    );
+  }
+
+  ionViewWillLeave() {
+    this.commonUtilService.getAppName().then((res) => { this.appName = res; });
+
+    if (this.headerObservable) {
+      this.headerObservable.unsubscribe();
+    }
+
+    if (this.backButtonFunc) {
+      this.backButtonFunc.unsubscribe();
+    }
+  }
+
+  handleBackButtonEvents() {
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(0, async () => {
+      const activePortal = await this.alertCtrl.getTop();
+      if (activePortal) {
+        activePortal.dismiss();
+      } else {
+        this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.CREATE_GROUP,
+          Environment.GROUP, false, undefined, this.corRelationList);
+        this.location.back();
+      }
+    });
+  }
+
+  initializeForm() {
+    this.createGroupForm = this.fb.group({
+      groupName: [(this.groupDetails && this.groupDetails.name) || '', Validators.required],
+      groupDesc: (this.groupDetails && this.groupDetails.description) || '',
+      groupTerms: [(this.groupDetails && true || ''), Validators.required]
+    });
+  }
+
+  get createGroupFormControls() {
+    return this.createGroupForm.controls;
+  }
+
+  onSubmit() {
+    this.createGroupFormSubmitted = true;
+    const formVal = this.createGroupForm.value;
+    if (!formVal.groupTerms) {
+      this.createGroupForm.controls['groupTerms'].setErrors({ incorrect: true });
+    }
+    if (this.createGroupForm.valid) {
+      if (this.groupDetails) {
+        this.editGroup(formVal);
+      } else {
+        this.createGroup(formVal);
+      }
+    }
+  }
+
+  private async createGroup(formVal) {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_CREATE_GROUP,
+      InteractSubtype.CREATE_GROUP_CLICKED,
+      Environment.GROUP, PageId.CREATE_GROUP,
+      undefined, undefined, undefined, this.corRelationList,
+      ID.CREATE_GROUP
+    );
+    if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+      this.commonUtilService.presentToastForOffline('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+      return;
+    }
+
+    const loader = await this.commonUtilService.getLoader();
+    await loader.present();
+    const groupCreateRequest: GroupCreateRequest = {
+      name: formVal.groupName,
+      description: formVal.groupDesc,
+      membershipType: GroupMembershipType.MODERATED
+    };
+    this.groupService.create(groupCreateRequest).toPromise().then(async (res) => {
+      console.log('create suc');
+      await loader.dismiss();
+      this.commonUtilService.showToast('GROUP_CREATED');
+      this.telemetryGeneratorService.generateInteractTelemetry(
+        InteractType.SUCCESS,
+        '',
+        Environment.GROUP,
+        PageId.CREATE_GROUP,
+        undefined, undefined, undefined, this.corRelationList,
+        ID.CREATE_GROUP
+      );
+      this.location.back();
+    }).catch(async (err) => {
+      console.error(err);
+      this.telemetryGeneratorService.generateInteractTelemetry(
+        InteractType.FAILURE,
+        '',
+        Environment.GROUP,
+        PageId.CREATE_GROUP,
+        undefined, undefined, undefined, this.corRelationList,
+        ID.CREATE_GROUP
+      );
+      await loader.dismiss();
+      if (err.response && err.response.body && err.response.body.params
+        && err.response.body.params.status === GroupErrorCodes.EXCEEDED_GROUP_MAX_LIMIT) {
+        this.commonUtilService.showToast('ERROR_MAXIMUM_GROUP_COUNT_EXCEEDS');
+      } else {
+        this.commonUtilService.showToast('SOMETHING_WENT_WRONG');
+      }
+    });
+  }
+
+  private async editGroup(formVal) {
+    const loader = await this.commonUtilService.getLoader();
+    await loader.present();
+    const updateCreateRequest: UpdateByIdRequest = {
+      id: this.groupDetails.id,
+      updateRequest: {
+        name: formVal.groupName,
+        description: formVal.groupDesc
+      }
+    };
+    this.groupService.updateById(updateCreateRequest).toPromise().then(async (res) => {
+      await loader.dismiss();
+      this.commonUtilService.showToast('GROUP_UPDATE_SUCCESS');
+      this.telemetryGeneratorService.generateInteractTelemetry(
+        InteractType.SUCCESS,
+        '',
+        Environment.GROUP,
+        PageId.CREATE_GROUP,
+        undefined,
+        undefined,
+        undefined,
+        this.corRelationList,
+        ID.CREATE_GROUP
+      );
+      this.location.back();
+    }).catch(async (err) => {
+      await loader.dismiss();
+    });
+  }
+
+  async openTermsOfUse() {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      InteractSubtype.TERMS_OF_USE_CLICKED,
+      Environment.GROUP,
+      PageId.CREATE_GROUP,
+      undefined, undefined, undefined, this.corRelationList);
+    const baseUrl = await this.utilityService.getBuildConfigValue('TOU_BASE_URL');
+    const url = baseUrl + RouterLinks.TERM_OF_USE + '#groupGuidelines';
+    const options
+      = 'hardwareback=yes,clearcache=no,zoom=no,toolbar=yes,disallowoverscroll=yes';
+
+    (window as any).cordova.InAppBrowser.open(url, '_blank', options);
+  }
+
+  handleHeaderEvents($event) {
+    switch ($event.name) {
+      case 'back':
+        this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.CREATE_GROUP,
+          Environment.GROUP, true, undefined, this.corRelationList);
+        this.location.back();
+        break;
+    }
+  }
+}
diff --git a/src/app/my-groups/group-details/group-details.module.ts b/src/app/my-groups/group-details/group-details.module.ts
new file mode 100644
index 000000000..97675e30b
--- /dev/null
+++ b/src/app/my-groups/group-details/group-details.module.ts
@@ -0,0 +1,48 @@
+import { RouterLinks } from '@app/app/app.constant';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { Routes, RouterModule } from '@angular/router';
+import { IonicModule } from '@ionic/angular';
+import { TranslateModule } from '@ngx-translate/core';
+import { GroupDetailsPage } from './group-details.page';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
+import { ComponentsModule } from '../../components/components.module';
+import { OverflowMenuComponent } from '../../profile/overflow-menu/overflow-menu.component';
+import { PipesModule } from '@app/pipes/pipes.module';
+import { AddActivityToGroupPage } from '../add-activity-to-group/add-activity-to-group.page';
+import { ViewMoreActivityPage, ViewMoreActivityDelegateService } from '../view-more-activity/view-more-activity.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: GroupDetailsPage
+  },
+  {
+    path: RouterLinks.ADD_ACTIVITY_TO_GROUP,
+    component: AddActivityToGroupPage
+  },
+  {
+    path: RouterLinks.ACTIVITY_VIEW_MORE,
+    component: ViewMoreActivityPage
+  }
+];
+
+@NgModule({
+  declarations: [GroupDetailsPage, AddActivityToGroupPage, ViewMoreActivityPage],
+  imports: [
+    CommonModule,
+    FormsModule,
+    ReactiveFormsModule,
+    IonicModule,
+    RouterModule.forChild(routes),
+    TranslateModule.forChild(),
+    CommonConsumptionModule,
+    ComponentsModule,
+    PipesModule
+  ],
+  exports: [GroupDetailsPage],
+  providers: [ViewMoreActivityDelegateService],
+  entryComponents: [OverflowMenuComponent]
+})
+export class GroupDetailsPageModule {}
diff --git a/src/app/my-groups/group-details/group-details.page.html b/src/app/my-groups/group-details/group-details.page.html
new file mode 100644
index 000000000..de90b7ba7
--- /dev/null
+++ b/src/app/my-groups/group-details/group-details.page.html
@@ -0,0 +1,137 @@
+<ion-content>
+  <div class="gd-deactivated" *ngIf="isSuspended">
+    <div class="gd-deactivated-info pull-left">{{'FRMELEMENTS_MSG_ACTIVATEGRPMSG' | translate}}</div>
+    <div class="gd-deactivated-btn pull-left text-center" *ngIf="isGroupCreatorOrAdmin">
+      <button class="sb-btn-large sb-btn-small" (click)="showReactivateGroupPopup()">
+        {{'FRMELEMENTS_BTN_ACTIVATEGRP' | translate}}
+      </button>
+    </div>
+  </div>
+  <div class="gd-page">
+    <div class="gd-header">
+      <div *ngIf="!isGroupLoading">
+        <div class="gd-title">
+          <div class="gd-name">
+            {{groupDetails?.name}}
+            <div class="gd-created-by" *ngIf="groupCreator">
+              {{'GROUP_CREATED_BY' | translate: {'group_creator_name': groupCreator?.name} }}
+            </div>
+          </div>
+          <div class="gd-opts">
+            <accessDiscussion [fetchForumIdReq]="fetchForumIdReq" [createUserReq]="createUserReq" (forumData)="assignForumData($event)"> </accessDiscussion>
+              <!-- <ion-icon [accessDiscussion]="fetchForumIdRequest" src="assets/imgs/ic_chat.svg" class="card-icons" (click)="openDiscussionForum()"></ion-icon> -->
+            <ion-icon ios="ellipsis-horizontal" md="ellipsis-vertical" (click)="groupMenuClick($event)"></ion-icon>
+          </div>
+        </div>
+      </div>
+      <div class="m-n" *ngIf="isGroupLoading">
+        <div class="skeleton-header mb-8">
+          <app-skeleton-item height="18px" width="75%" style="height:18px; width:50%;"></app-skeleton-item>
+          <app-skeleton-item height="14px" width="75%" style="height:14px; width:90%; margin-top:8px;">
+          </app-skeleton-item>
+        </div>
+      </div>
+      <div class="gd-tab-header">
+        <div class="gd-tab" (click)="switchTabs('activities')" [ngClass]="{'active': activeTab=='activities'}">
+          <div class="gd-tab-name gd-tab-border">{{'ACTIVITIES' | translate}}</div>
+        </div>
+        <div class="gd-tab" (click)="switchTabs('members')" [ngClass]="{'active': activeTab=='members'}">
+          <div class="gd-tab-name">{{'MEMBERS' | translate}} ({{memberList.length}})</div>
+        </div>
+      </div>
+    </div>
+
+    <div class="gd-tab-container">
+      <div class="gd-tab-content" *ngIf="activeTab=='members'">
+        <div class="gd-member-search">
+          <ion-icon class="gd-member-search-icon" md="md-search"></ion-icon>
+          <input type="text" [(ngModel)]="searchMember" placeholder="{{'GROUP_MEMBER_SEARCH_PLACEHOLDER' | translate}}"
+            (ngModelChange)="onMemberSearch(searchMember)">
+        </div>
+        <div class="gd-tab-member-container">
+          <div class="gd-add-member-container">
+            <div *ngIf="!isSuspended && loggedinUser?.role === 'admin'" class="gd-add-member" (click)="navigateToAddUserPage()">
+              <span class="gd-add-member-icon">
+                <img src="assets/imgs/ic_person_add_white.svg" alt="">
+              </span>
+              <span class="gd-large-text">
+                {{'ADD_MEMBER' | translate}}
+              </span>
+            </div>
+          </div>
+          <div *ngIf="isGroupLoading">
+            <div *ngFor="let item of [0,1,2,3,4,5,6,7,8,9]">
+              <sb-member-card [isLoading]="true"
+                [config]="{size:'medium', isBold:false, isSelectable:false, view:'horizontal'}"></sb-member-card>
+            </div>
+          </div>
+          <div *ngIf="!isGroupLoading">
+            <div *ngFor="let member of filteredMemberList; let i = index">
+              <sb-member-card [config]="{size:'medium', isBold:false, isSelectable:false, view:'horizontal'}"
+                [identifier]="member.userId" [indexOfMember]="i" [initial]="commonUtilService.extractInitial(member.name)"
+                [title]="getMemberName(member)" [isMenu]="!isSuspended && showMemberMenu(member)" [isAdmin]="member.role === 'admin'"
+                (menuClick)="memberMenuClick($event, member)">
+              </sb-member-card>
+            </div>
+          </div>
+          <div *ngIf="(!isGroupLoading && !filteredMemberList) || (!isGroupLoading && filteredMemberList.length <= 1)"
+            class="text-center">
+            <div class="gd-empty-result" *ngIf="!memberSearchQuery">
+              <img src="assets/imgs/no_member.svg" alt="">
+            </div>
+            <div class="gd-empty-result" *ngIf="memberSearchQuery && !filteredMemberList.length">
+              <img src="assets/imgs/empty_search_result.svg" alt="">
+              <p>{{'EMPTY_SEARCH_RESULT_GROUPS' | translate}}</p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="gd-tab-content" *ngIf="activeTab=='activities'">
+        <div class="gd-member-search">
+          <ion-icon class="gd-member-search-icon" md="md-search"></ion-icon>
+          <input type="text" [(ngModel)]="searchActivity" placeholder="{{'ACTIVITIESE_SEARCH_PLACEHOLDER' | translate}}"
+            (ngModelChange)="onActivitySearch(searchActivity)">
+        </div>
+        <div *ngIf="!isGroupLoading && (!flattenedActivityList || !flattenedActivityList.length)" class="text-center">
+          <div class="gd-empty-result" *ngIf="!activitySearchQuery">
+            <img src="assets/imgs/no_activity.svg" alt="">
+          </div>
+          <div class="gd-empty-result" *ngIf="activitySearchQuery">
+            <img src="assets/imgs/empty_search_result.svg" alt="">
+            <p>{{'EMPTY_SEARCH_RESULT_GROUPS' | translate}}</p>
+          </div>
+        </div>
+        <div *ngIf="isGroupLoading">
+          <div *ngFor="let item of [0,1,2,3,4,5,6,7,8,9]">
+            <sb-course-card [isLoading]="true"></sb-course-card>
+          </div>
+        </div>
+        <div *ngIf="!isGroupLoading && flattenedActivityList && flattenedActivityList.length">
+          <div *ngFor="let activityGroup of activityList; let i = index" class="mb-8">
+            <div class="gd-card-head" *ngIf="filteredGroupedActivityListMap[activityGroup?.title].length">
+              <span class="gd-card-title-icon"><img src="assets/imgs/book.png" alt=""></span>
+              <span class="gd-card-titile">{{activityGroup.title}}</span>
+            </div>
+            <div>
+              <sb-library-cards-stack [title]="activityGroup?.name" [contentList]="filteredGroupedActivityListMap[activityGroup?.title]"
+                  [isOffline]="!commonUtilService.networkInfo.isNetworkAvailable" [viewMoreButtonText]="'VIEW_MORE' | translate"
+                  [cardType]="activityGroup.title === 'ACTIVITY_COURSE_TITLE' ? 'course' : 'textbook' " 
+                  [maxCardCount]="3" (viewMoreClick)="!isSuspended && navigateToViewMorePage(activityGroup)" [isMenu]="!isSuspended && loggedinUser.role === 'admin'"
+                  (cardClick)="!isSuspended && onActivityCardClick($event)" (menuClick)="!isSuspended && activityMenuClick($event)">
+                </sb-library-cards-stack>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</ion-content>
+
+<ion-footer *ngIf="activeTab=='activities' && loggedinUser?.role === 'admin'">
+  <div class="cd-btn" *ngIf="!isSuspended">
+    <button class="sb-btn-large" (click)="navigateToAddActivityPage()">
+      + {{'ADD_ACTIVITY' | translate}}
+    </button>
+  </div>
+</ion-footer>
\ No newline at end of file
diff --git a/src/app/my-groups/group-details/group-details.page.scss b/src/app/my-groups/group-details/group-details.page.scss
new file mode 100644
index 000000000..f604da933
--- /dev/null
+++ b/src/app/my-groups/group-details/group-details.page.scss
@@ -0,0 +1,218 @@
+@import "src/assets/styles/_variables.scss";
+@import "src/assets/styles/_custom-mixins.scss";
+
+.font-16{
+    font-size: 16px;
+}
+.gd-page {
+    padding: 8px;
+}
+
+.gd-deactivated{
+    border: 1px solid map-get($colors, orange);
+    padding: 8px;
+    display: flex;
+    .gd-deactivated-info{
+        flex-basis: 70%;
+        flex-grow: 1;
+        color: map-get($colors, orange);
+    }
+    .gd-deactivated-btn{
+        flex-basis: 30%;
+    }
+}
+
+.gd-header {
+    box-shadow: 0 3px 5px 4px rgba(0, 0, 0, 0.05);
+
+    .gd-title {
+        font-size: 18px;
+        font-weight: bold;
+        padding: 8px 16px;
+        position: relative;
+
+        .gd-name {
+            padding-right: 60px;
+            color: $gray-800;
+            font-family: "Noto Sans", sans-serif;
+            font-size: 16px;
+            font-weight: bold;
+            letter-spacing: 0;
+            line-height: 20px;
+
+            .gd-created-by {
+                color: $gray-400;
+                font-family: "Noto Sans", sans-serif;
+                font-size: 11px;
+                letter-spacing: 0;
+                line-height: 20px;
+                font-weight: normal;
+            }
+        }
+
+        .gd-opts {
+            position: absolute;
+            right: 8px;
+            top: 16px;
+            .add-member-icon {
+                position: relative;
+                bottom: 6px;
+                margin-right: 8px;
+            }
+            ion-icon {
+                color: $blue;
+            }
+        }
+    }
+
+}
+
+.gd-tab-header {
+    background-color: #E5EDF5;
+    @include clearfix;
+
+    .gd-tab {
+        float: left;
+        width: 50%;
+
+        &.active {
+            border-bottom: 2px solid $blue;
+            .gd-tab-name {
+                font-weight: bold;
+                color: $blue;
+            }
+        }
+    }
+
+    .gd-tab-name {
+        padding: 4px;
+        text-align: center;
+        margin-bottom: 5px;
+        margin-top: 8px;
+        color: $gray-400;
+        font-size: 16px;
+
+        &.gd-tab-border {
+            border-right: 1px solid $gray-300;
+        }
+    }
+}
+.gd-tab-member-container{
+    box-shadow: 0 2px 7px 0 rgba(0,0,0,0.25);
+    min-height: calc(100vh - 225px);
+}
+
+.gd-member-search {
+    position: relative;
+    margin: 8px 0;
+
+    .gd-member-search-icon {
+        position: absolute;
+        top: 8px;
+        left: 8px;
+        font-size: 20px;
+        color: map-get($colors, gray_96);
+    }
+
+    input {
+        width: 100%;
+        height: 35px;
+        padding: 0 8px 0 30px;
+        border: 1px solid $blue;
+        border-radius: 4px;
+        outline: none;
+        &::placeholder{
+            color: map-get($colors, gray_96);
+        }
+    }
+}
+
+.cd-btn {
+    padding: 16px;
+
+    .sb-btn-large {
+        border: none;
+        color: #ffffff;
+        text-align: center;
+        text-decoration: none;
+        display: inline-block;
+        font-size: 16px;
+        cursor: pointer;
+        outline: none;
+        margin: 4px 0 8px;
+        font-family: noto-sans, sans-serif;
+        width: 100%;
+        padding: 16px 0 16px 0;
+        background-color: $blue;
+        box-shadow: 0 2px 7px 0 rgba(0, 0, 0, 0.25);
+    }
+
+
+
+    img {
+        margin-right: 8px;
+        position: relative;
+        bottom: 2px;
+    }
+}
+
+.gd-add-member {
+    border-bottom: 1px solid $gray-100;
+    margin: 0 8px;
+    padding: 16px 0;
+}
+
+.gd-add-member-icon {
+    width: 50px;
+    height: 50px;
+    border-radius: 30px;
+    background-color:$green;
+    display: inline-block;
+    vertical-align: middle;
+    margin-right: 8px;
+    img {
+        position: relative;
+        top: 12px;
+        left: 10px;
+    }
+}
+
+
+.gd-large-text {
+    color: $gray-800;
+    font-family: "Noto Sans", sans-serif;
+    font-size: 16px;
+    letter-spacing: 0;
+    line-height: 20px;
+}
+
+.showGroupOptions{
+    padding: 16px;
+}
+
+.gd-empty-result{
+    img{
+        max-width: 65%;
+        margin-top: 20%;
+        margin-bottom: 16px;
+        font-size: 16px;
+    }
+}
+
+.gd-card-head{
+    padding: 16px 8px;
+    .gd-card-title-icon{
+        img{
+            width: 18px;
+            margin-right: 8px;
+        }
+    }
+    .gd-card-titile{
+        color: $blue;
+        font-size: 16px;
+        font-weight: bold;
+    }
+}
+.sc-content{
+    margin: 8px 0;
+}
diff --git a/src/app/my-groups/group-details/group-details.page.spec.ts b/src/app/my-groups/group-details/group-details.page.spec.ts
new file mode 100644
index 000000000..be07f6073
--- /dev/null
+++ b/src/app/my-groups/group-details/group-details.page.spec.ts
@@ -0,0 +1,2794 @@
+import { GroupDetailsPage } from './group-details.page';
+import {
+    GroupService, GroupMemberRole,
+    GroupEntityStatus,
+    DiscussionService,
+    ProfileService,
+    FormService
+} from '@project-sunbird/sunbird-sdk';
+import {
+    AppHeaderService,
+    AppGlobalService,
+    TelemetryGeneratorService, ImpressionType, PageId,
+    Environment, InteractType, InteractSubtype, ID
+} from '../../../services';
+import { Router } from '@angular/router';
+import { Platform, PopoverController } from '@ionic/angular';
+import { FilterPipe } from '@app/pipes/filter/filter.pipe';
+import { Location } from '@angular/common';
+import { of, throwError } from 'rxjs';
+import { RouterLinks } from '../../app.constant';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { NavigationService } from '../../../services/navigation-handler.service';
+import { ViewMoreActivityDelegateService } from '../view-more-activity/view-more-activity.page';
+import { DiscussionTelemetryService } from '@app/services/discussion/discussion-telemetry.service';
+
+describe('GroupDetailsPage', () => {
+    let groupDetailsPage: GroupDetailsPage;
+    const mockAppGlobalService: Partial<AppGlobalService> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        networkInfo: {
+            isNetworkAvailable: true
+        },
+    };
+    const mockFilterPipe: Partial<FilterPipe> = {
+        transform: jest.fn()
+    };
+    const mockGroupService: Partial<GroupService> = {};
+    const mockHeaderService: Partial<AppHeaderService> = {};
+    const mockLocation: Partial<Location> = {};
+    const mockPlatform: Partial<Platform> = {};
+    const mockPopoverCtrl: Partial<PopoverController> = {};
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => ({
+            extras: {
+                state: {
+                    groupId: 'sample-group-id'
+                }
+            }
+        })) as any
+    };
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockNavigationService: Partial<NavigationService> = {
+        navigateToTrackableCollection: jest.fn(),
+        navigateTo: jest.fn(),
+        navigateToDetailPage: jest.fn()
+    };
+    const mockViewMoreActivityDelegateService: Partial<ViewMoreActivityDelegateService> = {};
+    const mockDiscussionService: Partial<DiscussionService> = {};
+    const mockProfileService: Partial<ProfileService> = {}
+    const mockFormService: Partial<FormService> = {
+        getForm: jest.fn()
+    };
+    
+
+    beforeAll(() => {
+        groupDetailsPage = new GroupDetailsPage(
+            mockGroupService as GroupService,
+            mockDiscussionService as DiscussionService,
+            mockProfileService as ProfileService,
+            mockFormService as FormService,
+            mockAppGlobalService as AppGlobalService,
+            mockHeaderService as AppHeaderService,
+            mockRouter as Router,
+            mockLocation as Location,
+            mockPlatform as Platform,
+            mockPopoverCtrl as PopoverController,
+            mockNavigationService as NavigationService,
+            mockCommonUtilService as CommonUtilService,
+            mockFilterPipe as FilterPipe,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockViewMoreActivityDelegateService as ViewMoreActivityDelegateService,
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should be create a instance of groupDetailsPage', () => {
+        expect(groupDetailsPage).toBeTruthy();
+    });
+
+    describe('ngOnInit', () => {
+        it('should return active profile uid', () => {
+            // arrange
+            mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('sample-uid'));
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            // jest.spyOn(groupDetailsPage, 'fetchForumIds').mockImplementation()
+            mockDiscussionService.getForumIds = jest.fn(() => throwError({ error: 'error' })) as any;
+            mockFormService.getForm = jest.fn(() => throwError({ error: 'error' })) as any;
+            const mockProfileRes = {
+                serverProfile: {
+                    userName: 'some_user'
+                }
+            };
+            mockProfileService.getActiveSessionProfile = jest.fn(() => of(mockProfileRes) as any);
+            // act
+            groupDetailsPage.ngOnInit();
+    
+            // assert
+            expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                ImpressionType.VIEW, '', PageId.GROUP_DETAIL, Environment.GROUP,
+                undefined, undefined, undefined, undefined, groupDetailsPage.corRelationList
+            );
+        });
+    })
+    
+
+    it('should navigate to previous page', () => {
+        // arrange
+        mockLocation.back = jest.fn();
+        mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+
+        // act
+        groupDetailsPage.handleBackButton(true);
+
+        // assert
+        expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+            PageId.GROUP_DETAIL, Environment.GROUP, true, undefined, groupDetailsPage.corRelationList);
+        expect(mockLocation.back).toHaveBeenCalled();
+    });
+
+    it('should invoked device back button', () => {
+        const subscribeWithPriorityData = jest.fn(() => ({
+            unsubscribe: jest.fn()
+        }));
+        mockPlatform.backButton = {
+            subscribeWithPriority: jest.fn(() => ({ unsubscribe: jest.fn() })),
+        } as any;
+        jest.spyOn(groupDetailsPage, 'handleBackButton').mockImplementation(() => {
+            return;
+        });
+        // act
+        groupDetailsPage.handleDeviceBackButton();
+        // assert
+        expect(mockPlatform.backButton).not.toBeUndefined();
+    });
+
+    it('should handle device back button', () => {
+        const data = {
+            name: 'back'
+        };
+        jest.spyOn(groupDetailsPage, 'handleBackButton').mockImplementation(() => {
+            return;
+        });
+        groupDetailsPage.handleHeaderEvents(data);
+        expect(data.name).toBe('back');
+    });
+
+    describe('ionViewWillEnter', () => {
+        it('should return header with back button for b.userId', (done) => {
+            groupDetailsPage.userId = 'sample-uid-2';
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn(() => ({
+                    unsubscribe: jest.fn()
+                }))
+            });
+            jest.spyOn(groupDetailsPage, 'handleHeaderEvents').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(groupDetailsPage, 'handleDeviceBackButton').mockImplementation(() => {
+                return;
+            });
+            groupDetailsPage.userId = 'sample-uid-2';
+            mockGroupService.getById = jest.fn(() => of({
+                groupId: 'sample-group-id',
+                members: [{
+                    groupId: '',
+                    role: GroupMemberRole.MEMBER,
+                    status: GroupEntityStatus.ACTIVE,
+                    userId: 'sample-uid-1',
+                    name: 'SOME_NAME',
+                }, {
+                    groupId: '',
+                    role: GroupMemberRole.MEMBER,
+                    status: GroupEntityStatus.ACTIVE,
+                    userId: 'sample-uid-2',
+                    name: 'SOME_NAME',
+                }]
+            })) as any;
+
+            // act
+            groupDetailsPage.ionViewWillEnter();
+
+            // assert
+            expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+            expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+            setTimeout(() => {
+                expect(mockGroupService.getById).toHaveBeenCalled();
+                // expect(groupDetailsPage.memberList).toStrictEqual([{
+                //     groupId: '',
+                //     role: GroupMemberRole.MEMBER,
+                //     status: GroupEntityStatus.ACTIVE,
+                //     userId: 'sample-uid-2',
+                //     name: 'SOME_NAME'
+                // }, {
+                //     groupId: '',
+                //     role: GroupMemberRole.MEMBER,
+                //     status: GroupEntityStatus.ACTIVE,
+                //     userId: 'sample-uid-1',
+                //     name: 'SOME_NAME'
+                // }]);
+                done();
+            }, 0);
+        });
+
+        it('should return header with back button for a.userId', (done) => {
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn(() => ({
+                    unsubscribe: jest.fn()
+                }))
+            });
+            jest.spyOn(groupDetailsPage, 'handleHeaderEvents').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(groupDetailsPage, 'handleDeviceBackButton').mockImplementation(() => {
+                return;
+            });
+            groupDetailsPage.userId = 'sample-uid-1';
+            mockGroupService.getById = jest.fn(() => of({
+                groupId: 'sample-group-id', members: [{
+                    groupId: '',
+                    role: GroupMemberRole.MEMBER,
+                    status: GroupEntityStatus.ACTIVE,
+                    userId: 'sample-uid-1',
+                    name: 'SOME_NAME'
+                }, {
+                    groupId: '',
+                    role: GroupMemberRole.MEMBER,
+                    status: GroupEntityStatus.ACTIVE,
+                    userId: 'sample-uid-2',
+                    name: 'SOME_NAME'
+                }]
+            })) as any;
+
+            // act
+            groupDetailsPage.ionViewWillEnter();
+
+            // assert
+            expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+            expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+            setTimeout(() => {
+                expect(mockGroupService.getById).toHaveBeenCalled();
+                // expect(groupDetailsPage.memberList).toStrictEqual([{
+                //     groupId: '',
+                //     role: GroupMemberRole.MEMBER,
+                //     status: GroupEntityStatus.ACTIVE,
+                //     userId: 'sample-uid-1',
+                //     name: 'SOME_NAME'
+                // }, {
+                //     groupId: '',
+                //     role: GroupMemberRole.MEMBER,
+                //     status: GroupEntityStatus.ACTIVE,
+                //     userId: 'sample-uid-2',
+                //     name: 'SOME_NAME'
+                // }]);
+                done();
+            }, 0);
+        });
+
+        it('should return header with back button for a.role is member', (done) => {
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn(() => ({
+                    unsubscribe: jest.fn()
+                }))
+            });
+            jest.spyOn(groupDetailsPage, 'handleHeaderEvents').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(groupDetailsPage, 'handleDeviceBackButton').mockImplementation(() => {
+                return;
+            });
+            groupDetailsPage.userId = 'sample-uid';
+            mockGroupService.getById = jest.fn(() => of({
+                groupId: 'sample-group-id', members: [{
+                    groupId: '',
+                    role: GroupMemberRole.MEMBER,
+                    status: GroupEntityStatus.ACTIVE,
+                    userId: 'sample-uid-2',
+                    name: 'SOME_NAME'
+                }, {
+                    groupId: '',
+                    role: GroupMemberRole.ADMIN,
+                    status: GroupEntityStatus.ACTIVE,
+                    userId: 'sample-uid-1',
+                    name: 'SOME_NAME'
+                }]
+            })) as any;
+
+            // act
+            groupDetailsPage.ionViewWillEnter();
+
+            // assert
+            expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+            expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+            setTimeout(() => {
+                expect(mockGroupService.getById).toHaveBeenCalled();
+                // expect(groupDetailsPage.memberList).toStrictEqual([{
+                //     groupId: '',
+                //     role: GroupMemberRole.ADMIN,
+                //     status: GroupEntityStatus.ACTIVE,
+                //     userId: 'sample-uid-1',
+                //     name: 'SOME_NAME'
+                // }, {
+                //     groupId: '',
+                //     role: GroupMemberRole.MEMBER,
+                //     status: GroupEntityStatus.ACTIVE,
+                //     userId: 'sample-uid-2',
+                //     name: 'SOME_NAME'
+                // }]);
+                done();
+            }, 0);
+        });
+
+        it('should return header with back button for a.role is ADMIN', (done) => {
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn(() => ({
+                    unsubscribe: jest.fn()
+                }))
+            });
+            jest.spyOn(groupDetailsPage, 'handleHeaderEvents').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(groupDetailsPage, 'handleDeviceBackButton').mockImplementation(() => {
+                return;
+            });
+            groupDetailsPage.userId = 'sample-uid-2';
+            mockGroupService.getById = jest.fn(() => of({
+                groupId: 'sample-group-id', members: [{
+                    groupId: '',
+                    role: GroupMemberRole.ADMIN,
+                    status: GroupEntityStatus.ACTIVE,
+                    userId: 'sample-uid',
+                    name: 'SOME_NAME'
+                }, {
+                    groupId: '',
+                    role: GroupMemberRole.MEMBER,
+                    status: GroupEntityStatus.ACTIVE,
+                    userId: 'sample-uid',
+                    name: 'SOME_NAME'
+                }]
+            })) as any;
+
+            // act
+            groupDetailsPage.ionViewWillEnter();
+
+            // assert
+            expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+            expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+            setTimeout(() => {
+                expect(mockGroupService.getById).toHaveBeenCalled();
+                // expect(groupDetailsPage.memberList).toStrictEqual([{
+                //     groupId: '',
+                //     role: GroupMemberRole.ADMIN,
+                //     status: GroupEntityStatus.ACTIVE,
+                //     userId: 'sample-uid',
+                //     name: 'SOME_NAME'
+                // }, {
+                //     groupId: '',
+                //     role: GroupMemberRole.MEMBER,
+                //     status: GroupEntityStatus.ACTIVE,
+                //     userId: 'sample-uid',
+                //     name: 'SOME_NAME'
+                // }]);
+                done();
+            }, 0);
+        });
+
+        it('should return header with back button for last else part', (done) => {
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn(() => ({
+                    unsubscribe: jest.fn()
+                }))
+            });
+            jest.spyOn(groupDetailsPage, 'handleHeaderEvents').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(groupDetailsPage, 'handleDeviceBackButton').mockImplementation(() => {
+                return;
+            });
+            groupDetailsPage.userId = 'sample-uid-2';
+            mockGroupService.getById = jest.fn(() => of({
+                groupId: 'sample-group-id', members: [{
+                    groupId: '',
+                    role: '',
+                    status: GroupEntityStatus.ACTIVE,
+                    userId: 'sample-uid',
+                    name: 'SOME_NAME'
+                }, {
+                    groupId: '',
+                    role: '',
+                    status: GroupEntityStatus.ACTIVE,
+                    userId: 'sample-uid',
+                    name: 'SOME_NAME'
+                }]
+            })) as any;
+
+            // act
+            groupDetailsPage.ionViewWillEnter();
+
+            // assert
+            expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+            expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+            setTimeout(() => {
+                expect(mockGroupService.getById).toHaveBeenCalled();
+                // expect(groupDetailsPage.memberList).toStrictEqual([{
+                //     groupId: '',
+                //     role: '',
+                //     status: GroupEntityStatus.ACTIVE,
+                //     userId: 'sample-uid',
+                //     name: 'SOME_NAME'
+                // }, {
+                //     groupId: '',
+                //     role: '',
+                //     status: GroupEntityStatus.ACTIVE,
+                //     userId: 'sample-uid',
+                //     name: 'SOME_NAME'
+                // }]);
+                done();
+            }, 0);
+        });
+
+        it('should return header with back button in error case', (done) => {
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn(() => ({
+                    unsubscribe: jest.fn()
+                }))
+            });
+            jest.spyOn(groupDetailsPage, 'handleHeaderEvents').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(groupDetailsPage, 'handleDeviceBackButton').mockImplementation(() => {
+                return;
+            });
+            mockGroupService.getById = jest.fn(() => throwError({ error: 'error' })) as any;
+
+            // act
+            groupDetailsPage.ionViewWillEnter();
+
+            // assert
+            expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+            expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+            setTimeout(() => {
+                expect(mockGroupService.getById).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    it('should navigate To AddUserPage', () => {
+        // arrange
+        mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        groupDetailsPage.corRelationList = [{ id: 'sample-group-id', type: 'GroupId' }];
+
+        // act
+        groupDetailsPage.navigateToAddUserPage();
+
+        // assert
+        expect(mockNavigationService.navigateTo).toHaveBeenCalledWith([`/${RouterLinks.MY_GROUPS}/${RouterLinks.ADD_MEMBER_TO_GROUP}`],
+            {
+                groupId: 'sample-group-id',
+                memberList: [],
+                corRelation: groupDetailsPage.corRelationList
+            });
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.ADD_MEMBER,
+            InteractSubtype.ADD_MEMBER_CLICKED,
+            Environment.GROUP,
+            PageId.GROUP_DETAIL,
+            undefined, undefined, undefined, groupDetailsPage.corRelationList, ID.ADD_MEMBER);
+    });
+
+    it('should unsubscribe registerBackButton', () => {
+        groupDetailsPage.headerObservable = {
+            unsubscribe: jest.fn()
+        };
+
+        // act
+        groupDetailsPage.ionViewWillLeave();
+        expect(groupDetailsPage.headerObservable).not.toBeUndefined();
+    });
+
+    it('should not unsubscribe registerBackButton if undefined', () => {
+        groupDetailsPage.headerObservable = {
+            unsubscribe: jest.fn()
+        };
+        mockPlatform.backButton = {
+            subscribeWithPriority: jest.fn(() => (undefined)),
+        } as any;
+
+        // act
+        groupDetailsPage.ionViewWillLeave();
+        expect(groupDetailsPage.headerObservable).not.toBeUndefined();
+    });
+
+    it('should switch to activity tabs', () => {
+        // arrange
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+
+        // act
+        groupDetailsPage.switchTabs('activities');
+
+        // assert
+        expect(groupDetailsPage.activeTab).toStrictEqual('activities');
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH,
+            InteractSubtype.ACTIVITY_TAB_CLICKED,
+            Environment.GROUP,
+            PageId.GROUP_DETAIL,
+            undefined, undefined, undefined, groupDetailsPage.corRelationList, undefined);
+    });
+
+    it('should switch to member tabs', () => {
+        // arrange
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+
+        // act
+        groupDetailsPage.switchTabs('members');
+
+        // assert
+        expect(groupDetailsPage.activeTab).toStrictEqual('members');
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH,
+            InteractSubtype.MEMBER_TAB_CLICKED,
+            Environment.GROUP,
+            PageId.GROUP_DETAIL,
+            undefined, undefined, undefined, groupDetailsPage.corRelationList, undefined);
+    });
+
+    describe('groupMenuClick', () => {
+        it('should navigate to my_GROUP page', (done) => {
+            // arrange
+            groupDetailsPage.groupCreator = {
+                userId: 'some-userId',
+                name: 'some-name',
+                groupId: 'some-groupId',
+                role: GroupMemberRole.ADMIN,
+                status: GroupEntityStatus.ACTIVE
+            };
+            groupDetailsPage.groupDetails = {
+                status: 'sample-status'
+            } as any;
+            groupDetailsPage.userId = 'some-userId';
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { selectedItem: 'MENU_EDIT_GROUP_DETAILS' } }))
+            } as any)));
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+
+            // act
+            groupDetailsPage.groupMenuClick({});
+
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.UPDATE_GROUP,
+                    InteractSubtype.EDIT_GROUP_CLICKED,
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined, undefined, undefined, groupDetailsPage.corRelationList, ID.UPDATE_GROUP);
+                expect(mockNavigationService.navigateTo).toHaveBeenCalledWith(
+                    [`/${RouterLinks.MY_GROUPS}/${RouterLinks.CREATE_EDIT_GROUP}`],
+                    {
+                        groupDetails: groupDetailsPage.groupDetails,
+                        corRelation: groupDetailsPage.corRelationList
+                    });
+                done();
+            }, 0);
+        });
+
+        it('should invoked showDeleteGroupPopup', (done) => {
+            // arrange
+            groupDetailsPage.groupCreator = {
+                userId: 'some-userId',
+                name: 'some-name',
+                groupId: 'some-groupId',
+                role: GroupMemberRole.ADMIN,
+                status: GroupEntityStatus.ACTIVE
+            };
+            groupDetailsPage.userId = 'some-user-Id';
+            groupDetailsPage.loggedinUser = {
+                role: 'admin',
+            } as any;
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockCommonUtilService.showToast = jest.fn();
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { selectedItem: 'MENU_DELETE_GROUP', isLeftButtonClicked: true } }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'delete group popup title');
+            groupDetailsPage.groupDetails = {
+                name: 'sample-group',
+                status: 'sample-status'
+            } as any;
+            mockGroupService.deleteById = jest.fn(() => of({})) as any;
+            mockLocation.back = jest.fn();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+
+            // act
+            groupDetailsPage.groupMenuClick({});
+
+            // assert
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'DELETE_GROUP_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'REMOVE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'DELETE_GROUP_DESC',
+                    { group_name: groupDetailsPage.groupDetails.name });
+                expect(mockGroupService.deleteById).toHaveBeenCalled();
+                expect(mockLocation.back).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.SELECT_DELETE,
+                    InteractSubtype.DELETE_GROUP_CLICKED,
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined, undefined, undefined, groupDetailsPage.corRelationList, ID.SELECT_DELETE);
+                done();
+            }, 0);
+        });
+
+        it('should invoked showDeleteGroupPopup for offline scenario', (done) => {
+            // arrange
+            groupDetailsPage.groupCreator = {
+                userId: 'some-userId',
+                name: 'some-name',
+                groupId: 'some-groupId',
+                role: GroupMemberRole.ADMIN,
+                status: GroupEntityStatus.ACTIVE
+            };
+            groupDetailsPage.userId = 'some-user-Id';
+            groupDetailsPage.loggedinUser = {
+                role: 'admin',
+            } as any;
+            mockCommonUtilService.showToast = jest.fn();
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { selectedItem: 'MENU_DELETE_GROUP', isLeftButtonClicked: true } }))
+            } as any)));
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
+            };
+            mockCommonUtilService.translateMessage = jest.fn(() => '');
+            mockCommonUtilService.presentToastForOffline = jest.fn(() => Promise.resolve());
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            groupDetailsPage.groupDetails = {
+                name: 'sample-group',
+                status: 'sample-status'
+            } as any;
+
+            // act
+            groupDetailsPage.groupMenuClick({});
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'DELETE_GROUP_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'REMOVE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'DELETE_GROUP_DESC',
+                    { group_name: groupDetailsPage.groupDetails.name });
+                    expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                        InteractType.SELECT_DELETE,
+                        InteractSubtype.DELETE_GROUP_CLICKED,
+                        Environment.GROUP,
+                        PageId.GROUP_DETAIL,
+                        undefined, undefined, undefined, groupDetailsPage.corRelationList, ID.SELECT_DELETE);
+                done();
+            }, 0);
+        });
+
+        it('should invoked showDeleteGroupPopup for catch part', (done) => {
+            // arrange
+            groupDetailsPage.groupCreator = {
+                userId: 'some-userId',
+                name: 'some-name',
+                groupId: 'some-groupId',
+                role: GroupMemberRole.ADMIN,
+                status: GroupEntityStatus.ACTIVE
+            };
+            groupDetailsPage.userId = 'some-user-Id';
+            groupDetailsPage.loggedinUser = {
+                role: 'creator',
+            } as any;
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { selectedItem: 'MENU_DELETE_GROUP', isLeftButtonClicked: true } }))
+            } as any)));
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockCommonUtilService.translateMessage = jest.fn(() => 'delete group popup title');
+            groupDetailsPage.groupDetails = {
+                name: 'sample-group',
+                status: 'sample-status'
+            } as any;
+            mockGroupService.deleteById = jest.fn(() => throwError({ error: 'error' })) as any;
+            mockLocation.back = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+
+            // act
+            groupDetailsPage.groupMenuClick({});
+            // assert
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'DELETE_GROUP_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'REMOVE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'DELETE_GROUP_DESC',
+                    { group_name: groupDetailsPage.groupDetails.name });
+                expect(mockGroupService.deleteById).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.SELECT_DELETE,
+                    InteractSubtype.DELETE_GROUP_CLICKED,
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined, undefined, undefined, groupDetailsPage.corRelationList, ID.SELECT_DELETE);
+                done();
+            }, 0);
+        });
+
+        it('should invoked showLeaveGroupPopup', (done) => {
+            // arrange
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { selectedItem: 'MENU_LEAVE_GROUP', isLeftButtonClicked: true } }))
+            } as any)));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.translateMessage = jest.fn(() => 'delete group popup title');
+            groupDetailsPage.groupDetails = {
+                name: 'sample-group',
+                status: 'sample-status'
+            } as any;
+            groupDetailsPage.userId = 'sample-user-id';
+            groupDetailsPage.groupCreator = {
+                userId: 'sample-user-id'
+            } as any;
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockGroupService.removeMembers = jest.fn(() => of({})) as any;
+            mockLocation.back = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            groupDetailsPage.groupMenuClick({});
+            // assert
+            expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBe(true);
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.GROUP_KEBAB_MENU_CLICKED,
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined, undefined, undefined, groupDetailsPage.corRelationList, undefined);
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'LEAVE_GROUP_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'LEAVE_GROUP');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'LEAVE_GROUP_POPUP_DESC',
+                    { group_name: groupDetailsPage.groupDetails.name });
+                // expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                //     InteractType.INITIATED,
+                //     '',
+                //     Environment.GROUP,
+                //     PageId.GROUP_DETAIL,
+                //     undefined,
+                //     undefined,
+                //     undefined,
+                //     groupDetailsPage.corRelationList,
+                //     ID.LEAVE_GROUP
+                // );
+                expect(mockGroupService.removeMembers).toHaveBeenCalled();
+                expect(mockLocation.back).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('LEAVE_GROUP_SUCCESS_MSG');
+                // expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(3,
+                //     InteractType.SUCCESS,
+                //     '',
+                //     Environment.GROUP,
+                //     PageId.GROUP_DETAIL,
+                //     undefined,
+                //     undefined,
+                //     undefined,
+                //     groupDetailsPage.corRelationList,
+                //     ID.LEAVE_GROUP
+                // );
+                done();
+            }, 0);
+        });
+
+        it('should invoked showLeaveGroupPopup and return error message', (done) => {
+            // arrange
+            groupDetailsPage.groupCreator = {
+                userId: 'sample-user-id'
+            } as any;
+            groupDetailsPage.loggedinUser = { role: GroupMemberRole.MEMBER } as any;
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { selectedItem: 'MENU_LEAVE_GROUP', isLeftButtonClicked: true } }))
+            } as any)));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.translateMessage = jest.fn(() => 'delete group popup title');
+            groupDetailsPage.groupDetails = {
+                name: 'sample-group',
+                status: 'sample-status'
+            } as any;
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockGroupService.removeMembers = jest.fn(() => of({ error: { members: ['sample-member'] } })) as any;
+            mockCommonUtilService.showToast = jest.fn();
+
+            // act
+            groupDetailsPage.groupMenuClick({});
+
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.GROUP_KEBAB_MENU_CLICKED,
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined, undefined, undefined, groupDetailsPage.corRelationList, undefined);
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'LEAVE_GROUP_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'LEAVE_GROUP');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'LEAVE_GROUP_POPUP_DESC',
+                    { group_name: groupDetailsPage.groupDetails.name });
+                // expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                //     InteractType.INITIATED,
+                //     '',
+                //     Environment.GROUP,
+                //     PageId.GROUP_DETAIL,
+                //     undefined,
+                //     undefined,
+                //     undefined,
+                //     groupDetailsPage.corRelationList,
+                //     ID.LEAVE_GROUP
+                // );
+                expect(mockGroupService.removeMembers).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('LEAVE_GROUP_ERROR_MSG');
+                done();
+            }, 0);
+        });
+
+        it('should invoked showLeaveGroupPopup and return error message for catch part', (done) => {
+            // arrange
+            groupDetailsPage.groupCreator = {
+                userId: 'sample-user-id'
+            } as any;
+            groupDetailsPage.loggedinUser = { role: GroupMemberRole.MEMBER } as any;
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { selectedItem: 'MENU_LEAVE_GROUP', isLeftButtonClicked: true } }))
+            } as any)));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.translateMessage = jest.fn(() => 'delete group popup title');
+            groupDetailsPage.groupDetails = {
+                name: 'sample-group',
+                status: 'sample-status'
+            } as any;
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockGroupService.removeMembers = jest.fn(() => throwError({ error: 'error' })) as any;
+            mockCommonUtilService.showToast = jest.fn();
+
+            // act
+            groupDetailsPage.groupMenuClick({});
+
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.GROUP_KEBAB_MENU_CLICKED,
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined, undefined, undefined, groupDetailsPage.corRelationList, undefined);
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'LEAVE_GROUP_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'LEAVE_GROUP');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'LEAVE_GROUP_POPUP_DESC',
+                    { group_name: groupDetailsPage.groupDetails.name });
+                // expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                //     InteractType.INITIATED,
+                //     '',
+                //     Environment.GROUP,
+                //     PageId.GROUP_DETAIL,
+                //     undefined,
+                //     undefined,
+                //     undefined,
+                //     groupDetailsPage.corRelationList,
+                //     ID.LEAVE_GROUP
+                // );
+                expect(mockGroupService.removeMembers).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('LEAVE_GROUP_ERROR_MSG');
+                expect(dismissFn).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should invoked showLeaveGroupPopup for offline scenario', (done) => {
+            // arrange
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { selectedItem: 'MENU_LEAVE_GROUP', isLeftButtonClicked: true } }))
+            } as any)));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.translateMessage = jest.fn(() => 'delete group popup title');
+            groupDetailsPage.groupDetails = {
+                name: 'sample-group',
+                status: 'sample-status'
+            } as any;
+            groupDetailsPage.userId = 'sample-user-id';
+            groupDetailsPage.groupCreator = {
+                userId: 'sample-user-id'
+            } as any;
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
+            };
+            mockCommonUtilService.presentToastForOffline = jest.fn(() => Promise.resolve());
+
+            // act
+            groupDetailsPage.groupMenuClick({});
+
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.GROUP_KEBAB_MENU_CLICKED,
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined, undefined, undefined, groupDetailsPage.corRelationList, undefined);
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'LEAVE_GROUP_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'LEAVE_GROUP');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'LEAVE_GROUP_POPUP_DESC',
+                    { group_name: groupDetailsPage.groupDetails.name });
+                expect(mockCommonUtilService.presentToastForOffline).toHaveBeenCalledWith('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+                done();
+            }, 0);
+        });
+
+        it('should return null if selected Item is not matched or undefined', (done) => {
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { selectedItem: undefined } }))
+            } as any)));
+            groupDetailsPage.groupMenuClick({});
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should return null if data is undefined', (done) => {
+            groupDetailsPage.userId = 'some-userId';
+            groupDetailsPage.groupCreator = {
+                userId: 'some-userId',
+                name: 'some-name',
+                groupId: 'some-groupId',
+                role: GroupMemberRole.ADMIN,
+                status: GroupEntityStatus.ACTIVE
+            };
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: undefined }))
+            } as any)));
+            groupDetailsPage.groupMenuClick({});
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should invoke showDeactivateGroupPopup', (done) => {
+            // arrange
+            groupDetailsPage.groupCreator = {
+                userId: 'some-userId',
+                name: 'some-name',
+                groupId: 'some-groupId',
+                role: GroupMemberRole.ADMIN,
+                status: GroupEntityStatus.ACTIVE
+            };
+            groupDetailsPage.userId = 'some-user-Id';
+            groupDetailsPage.loggedinUser = {
+                role: 'admin',
+            } as any;
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockCommonUtilService.showToast = jest.fn();
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { selectedItem: 'FRMELEMENTS_LBL_DEACTIVATEGRP', isLeftButtonClicked: true } }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'delete group popup title');
+            groupDetailsPage.groupDetails = {
+                name: 'sample-group',
+                status: 'suspended'
+            } as any;
+            mockGroupService.suspendById = jest.fn(() => of({})) as any;
+            mockLocation.back = jest.fn();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+
+            // act
+            groupDetailsPage.groupMenuClick({});
+
+            // assert
+            setTimeout(() => {
+                // expect(presentFn).toHaveBeenCalled();
+                // expect(dismissFn).toHaveBeenCalled();
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                // expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'FRMELEMENTS_LBL_DEACTIVATEGRPQUES');
+                // expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'FRMELEMENTS_BTN_DEACTIVATEGRP');
+                // expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'FRMELEMENTS_MSG_DEACTIVATEGRPMSG');
+                // expect(mockGroupService.suspendById).toHaveBeenCalled();
+
+                done();
+            }, 0);
+        });
+
+        it('should invoked showDeactivateGroupPopup for offline scenario', (done) => {
+            // arrange
+            groupDetailsPage.groupCreator = {
+                userId: 'some-userId',
+                name: 'some-name',
+                groupId: 'some-groupId',
+                role: GroupMemberRole.ADMIN,
+                status: GroupEntityStatus.ACTIVE
+            };
+            groupDetailsPage.userId = 'some-user-Id';
+            groupDetailsPage.loggedinUser = {
+                role: 'admin',
+            } as any;
+            mockCommonUtilService.showToast = jest.fn();
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { selectedItem: 'FRMELEMENTS_LBL_DEACTIVATEGRP', isLeftButtonClicked: true } }))
+            } as any)));
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
+            };
+            mockCommonUtilService.translateMessage = jest.fn(() => '');
+            mockCommonUtilService.presentToastForOffline = jest.fn(() => Promise.resolve());
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            groupDetailsPage.groupDetails = {
+                name: 'sample-group',
+                status: 'sample-status'
+            } as any;
+
+            // act
+            groupDetailsPage.groupMenuClick({});
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                // expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'FRMELEMENTS_LBL_DEACTIVATEGRPQUES');
+                // expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'FRMELEMENTS_BTN_DEACTIVATEGRP');
+                // expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'FRMELEMENTS_MSG_DEACTIVATEGRPMSG',
+                    // { group_name: groupDetailsPage.groupDetails.name });
+            }, 0);
+            done();
+        });
+
+        it('should invoked showDeactivateGroupPopup for catch part', (done) => {
+            // arrange
+            groupDetailsPage.groupCreator = {
+                userId: 'some-userId',
+                name: 'some-name',
+                groupId: 'some-groupId',
+                role: GroupMemberRole.ADMIN,
+                status: GroupEntityStatus.ACTIVE
+            };
+            groupDetailsPage.userId = 'some-user-Id';
+            groupDetailsPage.loggedinUser = {
+                role: 'creator',
+            } as any;
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { selectedItem: 'FRMELEMENTS_LBL_DEACTIVATEGRP', isLeftButtonClicked: true } }))
+            } as any)));
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockCommonUtilService.translateMessage = jest.fn(() => 'delete group popup title');
+            groupDetailsPage.groupDetails = {
+                name: 'sample-group',
+                status: 'sample-status'
+            } as any;
+            mockGroupService.suspendById = jest.fn(() => throwError({ error: 'error' })) as any;
+            mockLocation.back = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+
+            // act
+            groupDetailsPage.groupMenuClick({});
+            // assert
+            setTimeout(() => {
+                // expect(presentFn).toHaveBeenCalled();
+                // expect(dismissFn).toHaveBeenCalled();
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                // expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'FRMELEMENTS_LBL_DEACTIVATEGRPQUES');
+                // expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'FRMELEMENTS_BTN_DEACTIVATEGRP');
+                // expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'FRMELEMENTS_MSG_DEACTIVATEGRPMSG',
+                    // { group_name: groupDetailsPage.groupDetails.name });
+                expect(mockGroupService.suspendById).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should invoke showReactivateGroupPopup', (done) => {
+            // arrange
+            groupDetailsPage.groupCreator = {
+                userId: 'some-userId',
+                name: 'some-name',
+                groupId: 'some-groupId',
+                role: GroupMemberRole.ADMIN,
+                status: GroupEntityStatus.ACTIVE
+            };
+            groupDetailsPage.userId = 'some-user-Id';
+            groupDetailsPage.loggedinUser = {
+                role: 'admin',
+            } as any;
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockCommonUtilService.showToast = jest.fn();
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { selectedItem: 'FRMELEMENTS_LBL_ACTIVATEGRP', isLeftButtonClicked: true } }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'delete group popup title');
+            groupDetailsPage.groupDetails = {
+                name: 'sample-group',
+                status: 'sample-status'
+            } as any;
+            mockGroupService.reactivateById = jest.fn(() => of({})) as any;
+            mockLocation.back = jest.fn();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+
+            // act
+            groupDetailsPage.groupMenuClick({});
+
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                // expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'FRMELEMENTS_LBL_ACTIVATEGRPQUES');
+                // expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'FRMELEMENTS_BTN_ACTIVATEGRP');
+                // expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'FRMELEMENTS_MSG_ACTIVATEGRPMSG');
+                expect(mockGroupService.reactivateById).toHaveBeenCalled();
+
+                done();
+            }, 0);
+        });
+
+        it('should invoked showReactivateGroupPopup for offline scenario', (done) => {
+            // arrange
+            groupDetailsPage.groupCreator = {
+                userId: 'some-userId',
+                name: 'some-name',
+                groupId: 'some-groupId',
+                role: GroupMemberRole.ADMIN,
+                status: GroupEntityStatus.ACTIVE
+            };
+            groupDetailsPage.userId = 'some-user-Id';
+            groupDetailsPage.loggedinUser = {
+                role: 'admin',
+            } as any;
+            mockCommonUtilService.showToast = jest.fn();
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { selectedItem: 'FRMELEMENTS_LBL_ACTIVATEGRP', isLeftButtonClicked: true } }))
+            } as any)));
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
+            };
+            mockCommonUtilService.translateMessage = jest.fn(() => '');
+            mockCommonUtilService.presentToastForOffline = jest.fn(() => Promise.resolve());
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            groupDetailsPage.groupDetails = {
+                name: 'sample-group',
+                status: 'sample-status'
+            } as any;
+
+            // act
+            groupDetailsPage.groupMenuClick({});
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                // expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'FRMELEMENTS_LBL_ACTIVATEGRPQUES');
+                // expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'FRMELEMENTS_BTN_ACTIVATEGRP');
+                // expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'FRMELEMENTS_MSG_ACTIVATEGRPMSG',
+                    // { group_name: groupDetailsPage.groupDetails.name });
+            }, 0);
+            done();
+        });
+
+        it('should invoked showReactivateGroupPopup for catch part', (done) => {
+            // arrange
+            groupDetailsPage.groupCreator = {
+                userId: 'some-userId',
+                name: 'some-name',
+                groupId: 'some-groupId',
+                role: GroupMemberRole.ADMIN,
+                status: GroupEntityStatus.ACTIVE
+            };
+            groupDetailsPage.userId = 'some-user-Id';
+            groupDetailsPage.loggedinUser = {
+                role: 'creator',
+            } as any;
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { selectedItem: 'FRMELEMENTS_LBL_ACTIVATEGRP', isLeftButtonClicked: true } }))
+            } as any)));
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockCommonUtilService.translateMessage = jest.fn(() => 'delete group popup title');
+            groupDetailsPage.groupDetails = {
+                name: 'sample-group',
+                status: 'sample-status'
+            } as any;
+            mockGroupService.reactivateById = jest.fn(() => throwError({ error: 'error' })) as any;
+            mockLocation.back = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+
+            // act
+            groupDetailsPage.groupMenuClick({});
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                // expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'FRMELEMENTS_LBL_ACTIVATEGRPQUES');
+                // expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'FRMELEMENTS_BTN_ACTIVATEGRP');
+                // expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'FRMELEMENTS_MSG_ACTIVATEGRPMSG');
+                expect(mockGroupService.reactivateById).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('activityMenuClick', () => {
+        it('should return showRemoveActivityPopup if data is not undefined', (done) => {
+            // arrange
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { id: 'group-id', isLeftButtonClicked: true } }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Remove activity?');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Remove activity');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Removing the activity takes it off from');
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            groupDetailsPage.corRelationList = [{ id: 'sample-group-id', type: 'GroupId' }];
+            mockGroupService.removeActivities = jest.fn(() => of({ error: { members: undefined } })) as any;
+            mockGroupService.getById = jest.fn(() => of({
+                groupId: 'sample-group-id', members: [{
+                    groupId: '',
+                    role: GroupMemberRole.ADMIN,
+                    status: GroupEntityStatus.ACTIVE,
+                    userId: 'sample-uid',
+                    name: 'SOME_NAME'
+                }, {
+                    groupId: '',
+                    role: GroupMemberRole.MEMBER,
+                    status: GroupEntityStatus.ACTIVE,
+                    userId: 'sample-uid',
+                    name: 'SOME_NAME'
+                }]
+            })) as any;
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockCommonUtilService.showToast = jest.fn();
+            const request = {
+                event: {},
+                data: {
+                    identifier: 'id'
+                }
+            };
+
+            // act
+            groupDetailsPage.activityMenuClick(request);
+
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'REMOVE_ACTIVITY_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'REMOVE_ACTIVITY');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'REMOVE_ACTIVITY_GROUP_DESC');
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.REMOVE_ACTIVITY_CLICKED,
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined, undefined, undefined, groupDetailsPage.corRelationList, undefined);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.INITIATED,
+                    '',
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined,
+                    undefined,
+                    undefined,
+                    groupDetailsPage.corRelationList,
+                    ID.REMOVE_ACTIVITY
+                );
+                expect(mockGroupService.removeActivities).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(3,
+                    InteractType.SUCCESS,
+                    '',
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined,
+                    undefined,
+                    undefined,
+                    groupDetailsPage.corRelationList,
+                    ID.REMOVE_ACTIVITY
+                );
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('REMOVE_ACTIVITY_SUCCESS_MSG');
+                done();
+            }, 0);
+        });
+
+        it('should return showRemoveActivityPopup if data is error members', (done) => {
+            // arrange
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { id: 'group-id', isLeftButtonClicked: true } }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Remove activity?');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Remove activity');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Removing the activity takes it off from');
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockGroupService.removeActivities = jest.fn(() => of({ error: { activities: ['activity-1'] } })) as any;
+            mockCommonUtilService.showToast = jest.fn();
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            const request = {
+                event: {},
+                data: {
+                    identifier: 'id'
+                }
+            };
+            // act
+            groupDetailsPage.activityMenuClick(request);
+
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'REMOVE_ACTIVITY_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'REMOVE_ACTIVITY');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'REMOVE_ACTIVITY_GROUP_DESC');
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.REMOVE_ACTIVITY_CLICKED,
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined, undefined, undefined, groupDetailsPage.corRelationList, undefined);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.INITIATED,
+                    '',
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined,
+                    undefined,
+                    undefined,
+                    groupDetailsPage.corRelationList,
+                    ID.REMOVE_ACTIVITY
+                );
+                expect(mockGroupService.removeActivities).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('REMOVE_ACTIVITY_ERROR_MSG');
+                done();
+            }, 0);
+        });
+
+        it('should not return showRemoveActivityPopup if throws error', (done) => {
+            // arrange
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { id: 'group-id', isLeftButtonClicked: true } }))
+            } as any)));
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Remove activity?');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Remove activity');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Removing the activity takes it off from');
+            mockCommonUtilService.showToast = jest.fn();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockGroupService.removeActivities = jest.fn(() => throwError({ error: {} })) as any;
+            const request = {
+                event: {},
+                data: {
+                    identifier: 'id'
+                }
+            };
+            // act
+            groupDetailsPage.activityMenuClick(request);
+
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.REMOVE_ACTIVITY_CLICKED,
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined, undefined, undefined, groupDetailsPage.corRelationList, undefined);
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('REMOVE_ACTIVITY_ERROR_MSG');
+                done();
+            }, 0);
+        });
+
+        it('should not return showRemoveActivityPopup if data undefined', (done) => {
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { id: 'group-id', isLeftButtonClicked: true } }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Remove activity?');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Remove activity');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Removing the activity takes it off from');
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
+            };
+            mockCommonUtilService.presentToastForOffline = jest.fn(() => Promise.resolve());
+            const request = {
+                event: {},
+                data: {
+                    identifier: 'id'
+                }
+            };
+
+            // act
+            groupDetailsPage.activityMenuClick(request);
+
+            // arrange
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'REMOVE_ACTIVITY_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'REMOVE_ACTIVITY');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'REMOVE_ACTIVITY_GROUP_DESC');
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.REMOVE_ACTIVITY_CLICKED,
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined, undefined, undefined, groupDetailsPage.corRelationList, undefined);
+                expect(mockCommonUtilService.presentToastForOffline).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should not return showRemoveActivityPopup if dismissdata is undefined', (done) => {
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({}))
+            } as any)));
+            const request = {
+                event: {},
+                data: {
+                    identifier: 'id'
+                }
+            };
+            // act
+            groupDetailsPage.activityMenuClick(request);
+
+            // assert
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('memberMenuClick', () => {
+        it('should invoked showMakeGroupAdminPopup for offline scenario', (done) => {
+            groupDetailsPage.memberList = [{
+                groupId: '',
+                role: GroupMemberRole.MEMBER,
+                status: GroupEntityStatus.ACTIVE,
+                userId: 'sample-uid',
+                name: 'SOME_NAME'
+            }];
+            const req = {
+                data: {
+                    userId: 'sample-uid'
+                }
+            };
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
+            };
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({
+                    data: {
+                        selectedItem: 'MENU_MAKE_GROUP_ADMIN',
+                        isLeftButtonClicked: true
+                    }
+                }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Make group admin?');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Make admin');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Making the group admin gives them admin permissions');
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.presentToastForOffline = jest.fn(() => Promise.resolve());
+
+            // act
+            groupDetailsPage.memberMenuClick(req, groupDetailsPage.memberList[0]);
+
+            // assert
+            setTimeout(() => {
+                expect(groupDetailsPage.memberList[0].userId).toEqual(req.data.userId);
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'MAKE_GROUP_ADMIN_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'MAKE_ADMIN');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'MAKE_GROUP_ADMIN_POPUP_DESC',
+                    { member_name: 'SOME_NAME' });
+                expect(mockCommonUtilService.presentToastForOffline).toHaveBeenCalledWith('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+                done();
+            }, 0);
+        });
+
+        it('should invoked showMakeGroupAdminPopup for online scenario', (done) => {
+            groupDetailsPage.memberList = [{
+                groupId: '',
+                role: GroupMemberRole.MEMBER,
+                status: GroupEntityStatus.ACTIVE,
+                userId: 'sample-uid',
+                name: 'SOME_NAME'
+            }];
+            const req = {
+                data: {
+                    userId: 'sample-uid-1'
+                }
+            };
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({
+                    data: {
+                        selectedItem: 'MENU_MAKE_GROUP_ADMIN',
+                        isLeftButtonClicked: true
+                    }
+                }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Make group admin?');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Make admin');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Making the group admin gives them admin permissions');
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockGroupService.updateMembers = jest.fn(() => of({ error: { members: undefined } }));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+            mockGroupService.getById = jest.fn(() => of({
+                groupId: 'sample-group-id',
+                members: [{
+                    groupId: '',
+                    role: GroupMemberRole.MEMBER,
+                    status: GroupEntityStatus.ACTIVE,
+                    userId: 'sample-uid-1',
+                    name: 'SOME_NAME'
+                }, {
+                    groupId: '',
+                    role: GroupMemberRole.MEMBER,
+                    status: GroupEntityStatus.ACTIVE,
+                    userId: 'sample-uid-2',
+                    name: 'SOME_NAME'
+                }]
+            })) as any;
+
+            // act
+            groupDetailsPage.memberMenuClick(req, groupDetailsPage.memberList[0]);
+
+            // assert
+            setTimeout(() => {
+                // expect(groupDetailsPage.memberList[0].userId).toEqual(req.data.userId);
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'MAKE_GROUP_ADMIN_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'MAKE_ADMIN');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'MAKE_GROUP_ADMIN_POPUP_DESC',
+                    { member_name: 'SOME_NAME' });
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.INITIATED,
+                    '',
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined,
+                    undefined,
+                    undefined,
+                    groupDetailsPage.corRelationList,
+                    ID.MAKE_GROUP_ADMIN
+                );
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(3,
+                    InteractType.SUCCESS,
+                    '',
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined,
+                    undefined,
+                    undefined,
+                    groupDetailsPage.corRelationList,
+                    ID.MAKE_GROUP_ADMIN);
+                expect(mockGroupService.updateMembers).toHaveBeenCalled();
+                expect(mockGroupService.getById).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should invoked showMakeGroupAdminPopup for error part', (done) => {
+            groupDetailsPage.memberList = [{
+                groupId: '',
+                role: GroupMemberRole.ADMIN,
+                status: GroupEntityStatus.ACTIVE,
+                userId: 'sample-uid',
+                name: 'SOME_NAME'
+            }];
+            const req = {
+                data: {
+                    userId: 'sample-uid'
+                }
+            };
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({
+                    data: {
+                        selectedItem: 'MENU_MAKE_GROUP_ADMIN',
+                        isLeftButtonClicked: true
+                    }
+                }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Make group admin?');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Make admin');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Making the group admin gives them admin permissions');
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockGroupService.updateMembers = jest.fn(() => of({
+                error: {
+                    members: ['member-1']
+                }
+            })) as any;
+            mockCommonUtilService.showToast = jest.fn();
+
+            // act
+            groupDetailsPage.memberMenuClick(req, groupDetailsPage.memberList[0]);
+
+            // assert
+            setTimeout(() => {
+                expect(groupDetailsPage.memberList[0].userId).toEqual(req.data.userId);
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'MAKE_GROUP_ADMIN_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'MAKE_ADMIN');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'MAKE_GROUP_ADMIN_POPUP_DESC',
+                    { member_name: 'SOME_NAME' });
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.MAKE_GROUP_ADMIN_CLICKED,
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined, undefined, undefined, groupDetailsPage.corRelationList, undefined);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.INITIATED,
+                    '',
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined,
+                    undefined,
+                    undefined,
+                    groupDetailsPage.corRelationList,
+                    ID.MAKE_GROUP_ADMIN
+                );
+                expect(mockGroupService.updateMembers).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith(
+                    'MAKE_GROUP_ADMIN_ERROR_MSG', { member_name: 'SOME_NAME' });
+                done();
+            }, 0);
+        });
+
+        it('should invoked showMakeGroupAdminPopup for catch part', (done) => {
+            groupDetailsPage.memberList = [{
+                groupId: '',
+                role: GroupMemberRole.MEMBER,
+                status: GroupEntityStatus.ACTIVE,
+                userId: 'sample-uid',
+                name: 'SOME_NAME'
+            }];
+            const req = {
+                data: {
+                    userId: 'sample-uid'
+                }
+            };
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({
+                    data: {
+                        selectedItem: 'MENU_MAKE_GROUP_ADMIN',
+                        isLeftButtonClicked: true
+                    }
+                }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Make group admin?');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Make admin');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Making the group admin gives them admin permissions');
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockGroupService.updateMembers = jest.fn(() => throwError({ error: {} })) as any;
+            mockCommonUtilService.showToast = jest.fn();
+
+            // act
+            groupDetailsPage.memberMenuClick(req, groupDetailsPage.memberList[0]);
+
+            // assert
+            setTimeout(() => {
+                expect(groupDetailsPage.memberList[0].userId).toEqual(req.data.userId);
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'MAKE_GROUP_ADMIN_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'MAKE_ADMIN');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'MAKE_GROUP_ADMIN_POPUP_DESC',
+                    { member_name: 'SOME_NAME' });
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.INITIATED,
+                    '',
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined,
+                    undefined,
+                    undefined,
+                    groupDetailsPage.corRelationList,
+                    ID.MAKE_GROUP_ADMIN
+                );
+                expect(mockGroupService.updateMembers).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith(
+                    'MAKE_GROUP_ADMIN_ERROR_MSG', { member_name: 'SOME_NAME' });
+                done();
+            }, 0);
+        });
+
+        it('should invoked showRemoveMemberPopup', (done) => {
+            groupDetailsPage.memberList = [{
+                groupId: '',
+                role: GroupMemberRole.MEMBER,
+                status: GroupEntityStatus.ACTIVE,
+                userId: 'sample-uid',
+                name: 'SOME_NAME'
+            }];
+            const req = {
+                data: {
+                    userId: 'sample-uid'
+                }
+            };
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({
+                    data: {
+                        selectedItem: 'MENU_REMOVE_FROM_GROUP', isLeftButtonClicked: true
+                    }
+                }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Remove member?');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Remove member');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'permanently removes him/her from the group');
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockGroupService.removeMembers = jest.fn(() => of({ error: { members: undefined } }));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+
+            // act
+            groupDetailsPage.memberMenuClick(req, groupDetailsPage.memberList[0]);
+
+            // assert
+            setTimeout(() => {
+                expect(groupDetailsPage.memberList[0].userId).toEqual(req.data.userId);
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'REMOVE_MEMBER_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'REMOVE_MEMBER');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'REMOVE_MEMBER_GROUP_DESC',
+                    { member_name: 'SOME_NAME' });
+                expect(mockGroupService.removeMembers).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.INITIATED,
+                    '',
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined,
+                    undefined,
+                    undefined,
+                    groupDetailsPage.corRelationList,
+                    ID.REMOVE_MEMBER
+                );
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(3,
+                    InteractType.SUCCESS,
+                    '',
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined,
+                    undefined,
+                    undefined,
+                    groupDetailsPage.corRelationList,
+                    ID.REMOVE_MEMBER);
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith(
+                    'REMOVE_MEMBER_SUCCESS_MSG', { member_name: 'SOME_NAME' });
+                done();
+            }, 0);
+        });
+
+        it('should invoked showRemoveMemberPopup', (done) => {
+            groupDetailsPage.memberList = [{
+                groupId: '',
+                role: GroupMemberRole.MEMBER,
+                status: GroupEntityStatus.ACTIVE,
+                userId: 'sample-uid',
+                name: 'SOME_NAME'
+            }];
+            const req = {
+                data: {
+                    userId: 'sample-uid'
+                }
+            };
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({
+                    data: {
+                        selectedItem: 'MENU_REMOVE_FROM_GROUP', isLeftButtonClicked: true
+                    }
+                }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Remove member?');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Remove member');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'permanently removes him/her from the group');
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockGroupService.removeMembers = jest.fn(() => of({ error: { members: ['member-1'] } })) as any;
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+
+            // act
+            groupDetailsPage.memberMenuClick(req, groupDetailsPage.memberList[0]);
+
+            // assert
+            setTimeout(() => {
+                expect(groupDetailsPage.memberList[0].userId).toEqual(req.data.userId);
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'REMOVE_MEMBER_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'REMOVE_MEMBER');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'REMOVE_MEMBER_GROUP_DESC',
+                    { member_name: 'SOME_NAME' });
+                expect(mockGroupService.removeMembers).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.INITIATED,
+                    '',
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined,
+                    undefined,
+                    undefined,
+                    groupDetailsPage.corRelationList,
+                    ID.REMOVE_MEMBER
+                );
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('REMOVE_MEMBER_ERROR_MSG');
+                done();
+            }, 0);
+        });
+
+        it('should invoked showRemoveMemberPopup for catch part', (done) => {
+            groupDetailsPage.memberList = [{
+                groupId: '',
+                role: GroupMemberRole.MEMBER,
+                status: GroupEntityStatus.ACTIVE,
+                userId: 'sample-uid',
+                name: 'SOME_NAME'
+            }];
+            const req = {
+                data: {
+                    userId: 'sample-uid'
+                }
+            };
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({
+                    data: {
+                        selectedItem: 'MENU_REMOVE_FROM_GROUP', isLeftButtonClicked: true
+                    }
+                }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Remove member?');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Remove member');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'permanently removes him/her from the group');
+            mockGroupService.removeMembers = jest.fn(() => throwError({ error: 'error' }));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+
+            // act
+            groupDetailsPage.memberMenuClick(req, groupDetailsPage.memberList[0]);
+
+            // assert
+            setTimeout(() => {
+                expect(groupDetailsPage.memberList[0].userId).toEqual(req.data.userId);
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'REMOVE_MEMBER_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'REMOVE_MEMBER');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'REMOVE_MEMBER_GROUP_DESC',
+                    { member_name: 'SOME_NAME' });
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.INITIATED,
+                    '',
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined,
+                    undefined,
+                    undefined,
+                    groupDetailsPage.corRelationList,
+                    ID.REMOVE_MEMBER
+                );
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('REMOVE_MEMBER_ERROR_MSG');
+                expect(mockGroupService.removeMembers).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should invoked showRemoveMemberPopup for offline scenario', (done) => {
+            groupDetailsPage.memberList = [{
+                groupId: '',
+                role: GroupMemberRole.MEMBER,
+                status: GroupEntityStatus.ACTIVE,
+                userId: 'sample-uid',
+                name: 'SOME_NAME'
+            }];
+            const req = {
+                data: {
+                    userId: 'sample-uid'
+                }
+            };
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({
+                    data: {
+                        selectedItem: 'MENU_REMOVE_FROM_GROUP', isLeftButtonClicked: true
+                    }
+                }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Remove member?');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Remove member');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'permanently removes him/her from the group');
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
+            };
+            mockCommonUtilService.presentToastForOffline = jest.fn(() => Promise.resolve());
+
+            // act
+            groupDetailsPage.memberMenuClick(req, groupDetailsPage.memberList[0]);
+
+            // assert
+            setTimeout(() => {
+                expect(groupDetailsPage.memberList[0].userId).toEqual(req.data.userId);
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'REMOVE_MEMBER_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'REMOVE_MEMBER');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'REMOVE_MEMBER_GROUP_DESC',
+                    { member_name: 'SOME_NAME' });
+                expect(mockCommonUtilService.presentToastForOffline).toHaveBeenCalledWith('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+                done();
+            }, 0);
+        });
+
+        it('should invoked showDismissAsGroupAdminPopup', (done) => {
+            groupDetailsPage.memberList = [{
+                groupId: '',
+                role: GroupMemberRole.MEMBER,
+                status: GroupEntityStatus.ACTIVE,
+                userId: 'sample-uid',
+                name: 'SOME_NAME'
+            }];
+            const req = {
+                data: {
+                    userId: 'sample-uid'
+                }
+            };
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({
+                    data: {
+                        selectedItem: 'DISMISS_AS_GROUP_ADMIN',
+                        isLeftButtonClicked: true
+                    }
+                }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Dismiss as group admin?');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Dismiss as group admin');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Dissmissing group admin removes admin permissions from the member');
+            mockGroupService.updateMembers = jest.fn(() => of({}));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+
+            // act
+            groupDetailsPage.memberMenuClick(req, groupDetailsPage.memberList[0]);
+
+            // assert
+            setTimeout(() => {
+                expect(groupDetailsPage.memberList[0].userId).toEqual(req.data.userId);
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'DISMISS_AS_GROUP_ADMIN_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'DISMISS_AS_GROUP_ADMIN');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'DISMISS_AS_GROUP_ADMIN_POPUP_DESC',
+                    { member_name: 'SOME_NAME' });
+                expect(mockGroupService.updateMembers).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.INITIATED,
+                    '',
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined,
+                    undefined,
+                    undefined,
+                    groupDetailsPage.corRelationList,
+                    ID.DISMISS_GROUP_ADMIN);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(3,
+                    InteractType.SUCCESS,
+                    '',
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined,
+                    undefined,
+                    undefined,
+                    groupDetailsPage.corRelationList,
+                    ID.DISMISS_GROUP_ADMIN);
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith(
+                    'DISMISS_AS_GROUP_ADMIN_SUCCESS_MSG', { member_name: 'SOME_NAME' });
+                done();
+            }, 0);
+        });
+
+        it('should invoked showDismissAsGroupAdminPopup', (done) => {
+            groupDetailsPage.memberList = [{
+                groupId: '',
+                role: GroupMemberRole.MEMBER,
+                status: GroupEntityStatus.ACTIVE,
+                userId: 'sample-uid',
+                name: 'SOME_NAME'
+            }];
+            const req = {
+                data: {
+                    userId: 'sample-uid'
+                }
+            };
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({
+                    data: {
+                        selectedItem: 'DISMISS_AS_GROUP_ADMIN',
+                        isLeftButtonClicked: true
+                    }
+                }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Dismiss as group admin?');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Dismiss as group admin');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Dissmissing group admin removes admin permissions from the member');
+            mockGroupService.updateMembers = jest.fn(() => of({
+                error: {
+                    members: ['member-1']
+                }
+            })) as any;
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockCommonUtilService.showToast = jest.fn();
+
+            // act
+            groupDetailsPage.memberMenuClick(req, groupDetailsPage.memberList[0]);
+
+            // assert
+            setTimeout(() => {
+                expect(groupDetailsPage.memberList[0].userId).toEqual(req.data.userId);
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'DISMISS_AS_GROUP_ADMIN_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'DISMISS_AS_GROUP_ADMIN');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'DISMISS_AS_GROUP_ADMIN_POPUP_DESC',
+                    { member_name: 'SOME_NAME' });
+                expect(mockGroupService.updateMembers).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.INITIATED,
+                    '',
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined,
+                    undefined,
+                    undefined,
+                    groupDetailsPage.corRelationList,
+                    ID.DISMISS_GROUP_ADMIN
+                );
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith(
+                    'DISMISS_AS_GROUP_ADMIN_ERROR_MSG', { member_name: 'SOME_NAME' });
+                done();
+            }, 0);
+        });
+
+        it('should invoked showDismissAsGroupAdminPopup catch part', (done) => {
+            groupDetailsPage.memberList = [{
+                groupId: '',
+                role: GroupMemberRole.MEMBER,
+                status: GroupEntityStatus.ACTIVE,
+                userId: 'sample-uid',
+                name: 'SOME_NAME'
+            }];
+            const req = {
+                data: {
+                    userId: 'sample-uid'
+                }
+            };
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({
+                    data: {
+                        selectedItem: 'DISMISS_AS_GROUP_ADMIN',
+                        isLeftButtonClicked: true
+                    }
+                }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Dismiss as group admin?');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Dismiss as group admin');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Dissmissing group admin removes admin permissions from the member');
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockGroupService.updateMembers = jest.fn(() => throwError({ error: 'error' }));
+            mockCommonUtilService.showToast = jest.fn();
+
+            // act
+            groupDetailsPage.memberMenuClick(req, groupDetailsPage.memberList[0]);
+
+            // assert
+            setTimeout(() => {
+                expect(groupDetailsPage.memberList[0].userId).toEqual(req.data.userId);
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'DISMISS_AS_GROUP_ADMIN_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'DISMISS_AS_GROUP_ADMIN');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'DISMISS_AS_GROUP_ADMIN_POPUP_DESC',
+                    { member_name: 'SOME_NAME' });
+                expect(mockGroupService.updateMembers).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.INITIATED,
+                    '',
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined,
+                    undefined,
+                    undefined,
+                    groupDetailsPage.corRelationList,
+                    ID.DISMISS_GROUP_ADMIN
+                );
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith(
+                    'DISMISS_AS_GROUP_ADMIN_ERROR_MSG', { member_name: 'SOME_NAME' });
+                done();
+            }, 0);
+        });
+
+        it('should invoked showDismissAsGroupAdminPopup for offline scenario', (done) => {
+            groupDetailsPage.memberList = [{
+                groupId: '',
+                role: GroupMemberRole.MEMBER,
+                status: GroupEntityStatus.ACTIVE,
+                userId: 'sample-uid',
+                name: 'SOME_NAME'
+            }];
+            const req = {
+                data: {
+                    userId: 'sample-uid'
+                }
+            };
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({
+                    data: {
+                        selectedItem: 'DISMISS_AS_GROUP_ADMIN',
+                        isLeftButtonClicked: true
+                    }
+                }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Dismiss as group admin?');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Dismiss as group admin');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Dissmissing group admin removes admin permissions from the member');
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.presentToastForOffline = jest.fn(() => Promise.resolve());
+
+            // act
+            groupDetailsPage.memberMenuClick(req, groupDetailsPage.memberList[0]);
+
+            // assert
+            setTimeout(() => {
+                expect(groupDetailsPage.memberList[0].userId).toEqual(req.data.userId);
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'DISMISS_AS_GROUP_ADMIN_POPUP_TITLE');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'DISMISS_AS_GROUP_ADMIN');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'DISMISS_AS_GROUP_ADMIN_POPUP_DESC',
+                    { member_name: 'SOME_NAME' });
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.DISMISS_GROUP_ADMIN_CLICKED,
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined, undefined, undefined, groupDetailsPage.corRelationList, undefined);
+                expect(mockCommonUtilService.presentToastForOffline).toHaveBeenCalledWith('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+                done();
+            }, 0);
+        });
+
+        it('should invoked not showDismissAsGroupAdminPopup for last else part', (done) => {
+            groupDetailsPage.memberList = [{
+                groupId: '',
+                role: GroupMemberRole.MEMBER,
+                status: GroupEntityStatus.ACTIVE,
+                userId: 'sample-uid',
+                name: 'SOME_NAME'
+            }];
+            const req = {
+                data: {
+                    userId: 'sample-uid'
+                }
+            };
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({
+                    data: {
+                        selectedItem: 'DISMISS_AS_GROUP_ADMIN_MEMBER',
+                        isLeftButtonClicked: true
+                    }
+                }))
+            } as any)));
+
+            // act
+            groupDetailsPage.memberMenuClick(req, groupDetailsPage.memberList[0]);
+
+            // assert
+            setTimeout(() => {
+                expect(groupDetailsPage.memberList[0].userId).toEqual(req.data.userId);
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should return null if dismissData is undefined', (done) => {
+            groupDetailsPage.memberList = [{
+                groupId: '',
+                role: GroupMemberRole.MEMBER,
+                status: GroupEntityStatus.ACTIVE,
+                userId: 'sample-uid',
+                name: 'SOME_NAME'
+            }];
+            const req = {
+                data: {
+                    userId: 'sample-uid'
+                }
+            };
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: undefined }))
+            } as any)));
+
+            // act
+            groupDetailsPage.memberMenuClick(req, groupDetailsPage.memberList[0]);
+
+            // assert
+            setTimeout(() => {
+                expect(groupDetailsPage.memberList[0].userId).toEqual(req.data.userId);
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    it('should return group name', () => {
+        const name = 'new group';
+        groupDetailsPage.extractInitial(name);
+    });
+
+    it('should navigate To ActivityDetails page if loggeding user is admin', () => {
+        // arrange
+        groupDetailsPage.loggedinUser = { role: GroupMemberRole.ADMIN } as any;
+        mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+
+        // act
+        groupDetailsPage.onActivityCardClick({ data: { type: 'course' } });
+
+        // assert
+        expect(mockNavigationService.navigateTo).toHaveBeenCalledWith([`/${RouterLinks.MY_GROUPS}/${RouterLinks.ACTIVITY_DETAILS}`], {
+            loggedinUser: groupDetailsPage.loggedinUser,
+            group: groupDetailsPage.groupDetails,
+            memberList: groupDetailsPage.memberList,
+            activity: { type: 'course' },
+            isGroupCreatorOrAdmin: true,
+            corRelation: groupDetailsPage.corRelationList
+        });
+    });
+
+    it('should not navigate To course page if loggeding user is not a admin', () => {
+        // arrange
+        groupDetailsPage.loggedinUser = { role: GroupMemberRole.MEMBER } as any;
+        mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+
+        // act
+        groupDetailsPage.onActivityCardClick({ data: { type: 'course' } });
+
+        // assert
+        expect(mockNavigationService.navigateToDetailPage).toHaveBeenCalledWith({
+            type: 'course'
+        }, {
+            content: {
+                type: 'course'
+            },
+            corRelation: groupDetailsPage.corRelationList
+        });
+    });
+
+    describe('navigateToAddActivityPage', () => {
+        it('should return activity popup', (done) => {
+            mockCommonUtilService.networkInfo.isNetworkAvailable = true;
+            mockGroupService.getSupportedActivities = jest.fn(() => of({
+                data: {
+                    fields: [
+                        {
+                            index: 0,
+                            title: 'ACTIVITY_COURSE_TITLE',
+                            desc: 'ACTIVITY_COURSE_DESC',
+                            activityType: 'Content',
+                            isEnabled: true,
+                            filters: {
+                                contentTypes: [
+                                    'Course'
+                                ]
+                            }
+                        }
+                    ]
+                }
+            })) as any;
+            groupDetailsPage.activityList = [];
+            mockCommonUtilService.translateMessage = jest.fn(() => 'ACTIVITY_COURSE_TITLE');
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            // act
+            groupDetailsPage.navigateToAddActivityPage().then(() => {
+                // assert
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBe(true);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.ADD_ACTIVITY,
+                    InteractSubtype.ADD_ACTIVITY_CLICKED,
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined, undefined, undefined, groupDetailsPage.corRelationList, ID.ADD_ACTIVITY);
+                expect(mockGroupService.getSupportedActivities).toHaveBeenCalled();
+                expect(mockNavigationService.navigateTo)
+                    .toHaveBeenCalledWith([`/${RouterLinks.MY_GROUPS}/${RouterLinks.MY_GROUP_DETAILS}/${RouterLinks.ADD_ACTIVITY_TO_GROUP}`],
+                        {
+                            supportedActivityList: [
+                                {
+                                    index: 0,
+                                    title: 'ACTIVITY_COURSE_TITLE',
+                                    desc: 'ACTIVITY_COURSE_DESC',
+                                    activityType: 'Content',
+                                    isEnabled: true,
+                                    filters: {
+                                        contentTypes: [
+                                            'Course'
+                                        ]
+                                    }
+                                }
+                            ],
+                            activityList: [],
+                            groupId: 'sample-group-id',
+                            corRelation: groupDetailsPage.corRelationList
+                        });
+                done();
+            });
+        });
+
+        it('should not return activity popup if type is not content', (done) => {
+            mockCommonUtilService.networkInfo.isNetworkAvailable = true;
+            mockGroupService.getSupportedActivities = jest.fn(() => of({
+                data: {
+                    fields: [
+                        {
+                            index: 0,
+                            title: 'ACTIVITY_COURSE_TITLE',
+                            desc: 'ACTIVITY_COURSE_DESC',
+                            activityType: 'Content',
+                            isEnabled: true,
+                            filters: {
+                                contentTypes: [
+                                    'Course'
+                                ]
+                            }
+                        }
+                    ]
+                }
+            })) as any;
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Select activity');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Next');
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            // act
+            groupDetailsPage.navigateToAddActivityPage().then(() => {
+                // assert
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBe(true);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.ADD_ACTIVITY,
+                    InteractSubtype.ADD_ACTIVITY_CLICKED,
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined, undefined, undefined, groupDetailsPage.corRelationList, ID.ADD_ACTIVITY);
+                expect(mockGroupService.getSupportedActivities).toHaveBeenCalled();
+                done();
+            });
+        });
+
+        it('should not return activity popup if type is not content and dismissData is undefined', (done) => {
+            mockCommonUtilService.networkInfo.isNetworkAvailable = true;
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            mockGroupService.getSupportedActivities = jest.fn(() => of({
+                data: {
+                    fields: [
+                        {
+                            index: 0,
+                            title: 'ACTIVITY_COURSE_TITLE',
+                            desc: 'ACTIVITY_COURSE_DESC',
+                            activityType: 'Content',
+                            isEnabled: true,
+                            filters: {
+                                contentTypes: [
+                                    'Course'
+                                ]
+                            }
+                        }
+                    ]
+                }
+            })) as any;
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Select activity');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Next');
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            groupDetailsPage.corRelationList = [{ id: 'sample-group-id', type: 'GroupId' }];
+
+            // act
+            groupDetailsPage.navigateToAddActivityPage().then(() => {
+                // assert
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBe(true);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.ADD_ACTIVITY,
+                    InteractSubtype.ADD_ACTIVITY_CLICKED,
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined, undefined, undefined, groupDetailsPage.corRelationList, ID.ADD_ACTIVITY);
+                expect(mockGroupService.getSupportedActivities).toHaveBeenCalled();
+                expect(mockNavigationService.navigateTo).toHaveBeenCalledWith(
+                    [`/${RouterLinks.MY_GROUPS}/${RouterLinks.MY_GROUP_DETAILS}/${RouterLinks.ADD_ACTIVITY_TO_GROUP}`],
+                    {
+                        activityList: [],
+                        corRelation: [
+                            {
+                                id: 'sample-group-id',
+                                type: 'GroupId',
+                            },
+                        ],
+                        groupId: 'sample-group-id',
+                        supportedActivityList: [
+                            {
+                                activityType: 'Content',
+                                desc: 'ACTIVITY_COURSE_DESC',
+                                filters: {
+                                    contentTypes: [
+                                        'Course',
+                                    ],
+                                },
+                                index: 0,
+                                isEnabled: true,
+                                title: 'ACTIVITY_COURSE_TITLE',
+                            },
+                        ],
+                    });
+                done();
+            });
+        });
+
+        it('should not go to activity page if throws error should go to catch part', (done) => {
+            mockCommonUtilService.networkInfo.isNetworkAvailable = true;
+            mockGroupService.getSupportedActivities = jest.fn(() => throwError({ error: 'error' })) as any;
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            groupDetailsPage.corRelationList = [{ id: 'sample-group-id', type: 'GroupId' }];
+
+            // act
+            groupDetailsPage.navigateToAddActivityPage().then(() => {
+                // assert
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBe(true);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.ADD_ACTIVITY,
+                    InteractSubtype.ADD_ACTIVITY_CLICKED,
+                    Environment.GROUP,
+                    PageId.GROUP_DETAIL,
+                    undefined, undefined, undefined, groupDetailsPage.corRelationList, ID.ADD_ACTIVITY);
+                expect(mockGroupService.getSupportedActivities).toHaveBeenCalled();
+                done();
+            });
+        });
+
+        it('should not go to activity page if network is not available', (done) => {
+            mockCommonUtilService.networkInfo.isNetworkAvailable = false;
+            mockCommonUtilService.presentToastForOffline = jest.fn(() => Promise.resolve());
+
+            // act
+            groupDetailsPage.navigateToAddActivityPage().then(() => {
+                // assert
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBe(false);
+                expect(mockCommonUtilService.presentToastForOffline).toHaveBeenCalledWith('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+                done();
+            });
+        });
+    });
+
+    describe('getMemberName', () => {
+        it('should return memberNames', () => {
+            const member = {
+                name: 'member',
+                userId: 'sample-user-id'
+            };
+            groupDetailsPage.loggedinUser = {
+                userId: 'sample-user-id'
+            } as any;
+            mockCommonUtilService.translateMessage = jest.fn();
+            // act
+            groupDetailsPage.getMemberName(member);
+            // assert
+            expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('LOGGED_IN_MEMBER', { member_name: member.name });
+        });
+
+        it('should return memberNames for else part', () => {
+            const member = {
+                name: 'member',
+                userId: 'sample-user-id'
+            };
+            groupDetailsPage.loggedinUser = {
+                userId: 'member-user-id'
+            } as any;
+            mockCommonUtilService.translateMessage = jest.fn();
+            // act
+            groupDetailsPage.getMemberName(member);
+        });
+    });
+    describe('Search', () => {
+        it('should return filter memberList', () => {
+            mockFilterPipe.transform = jest.fn(() => []);
+            groupDetailsPage.onMemberSearch('');
+            expect(mockFilterPipe.transform).toHaveBeenCalled();
+        });
+        it('should return filtered activityList', () => {
+            // assert
+            groupDetailsPage.groupedActivityListMap = {
+                course: [
+                    { name: 'name1' },
+                    { name: 'name2' }
+                ]
+            } as any;
+            groupDetailsPage.filteredGroupedActivityListMap = {};
+            // act
+            groupDetailsPage.onActivitySearch('name1');
+            // assert
+            expect(groupDetailsPage.filteredGroupedActivityListMap).toEqual({ course: [{ name: 'name1' }] });
+        });
+    });
+
+    describe('showMemberMenu', () => {
+        it('should return showmenu if user role is admin', () => {
+            groupDetailsPage.loggedinUser = {
+                role: GroupMemberRole.ADMIN,
+                userId: 'loggedin-user-id'
+            } as any;
+            const member = {
+                userId: 'member-user-id'
+            };
+            groupDetailsPage.groupCreator = {
+                userId: 'creator-user-id'
+            } as any;
+            // act
+            const showMenu = groupDetailsPage.showMemberMenu(member);
+            // assert
+            expect(showMenu).toBeTruthy();
+        });
+
+        it('should return showmenu as false if user role is notadmin', () => {
+            groupDetailsPage.loggedinUser = {
+                role: GroupMemberRole.MEMBER,
+                userId: 'loggedin-user-id'
+            } as any;
+            const member = {
+                userId: 'member-user-id'
+            };
+            groupDetailsPage.groupCreator = {
+                userId: 'creator-user-id'
+            } as any;
+            // act
+            const showMenu = groupDetailsPage.showMemberMenu(member);
+            // assert
+            expect(showMenu).toBeFalsy();
+        });
+    });
+
+    describe('enableDF', () => {
+        beforeEach(() => {
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+        })
+        it('should enable DF with appropriate request', (done) => {
+            // arrange
+            // const req = {
+            //     cid: 'some_cid'
+            // }
+            // groupDetailsPage.forumDetails = req;
+            mockDiscussionService.attachForum = jest.fn(() => of({}) as any)
+            // act
+            groupDetailsPage.enableDF()
+            // assert
+            setTimeout(() => {
+                expect(mockDiscussionService.attachForum).toHaveBeenCalled()
+                done()
+            });
+        })
+
+        it('should show toast when enabling DF fails', (done) => {
+            // arrange
+            // const req = {
+            //     cid: 'some_cid'
+            // }
+            // groupDetailsPage.forumDetails = req;
+            mockDiscussionService.attachForum = jest.fn(() => throwError('err') as any)
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            groupDetailsPage.enableDF()
+            // assert
+            setTimeout(() => {
+                expect(mockDiscussionService.attachForum).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalled()
+                done()
+            });
+        })
+    })
+
+    describe('disableDF', () => {
+
+        beforeEach(() => {
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+        })
+        it('should disable DF with appropriate request', (done) => {
+            // arrange
+            const req = {
+                cid: 'some_cid'
+            }
+            groupDetailsPage.forumDetails = req;
+            mockDiscussionService.removeForum = jest.fn(() => of({}) as any)
+            // act
+            groupDetailsPage.disableDF()
+            // assert
+            setTimeout(() => {
+                expect(mockDiscussionService.removeForum).toHaveBeenCalledWith(
+                    {
+                        cid: ['some_cid']
+                    }
+                )
+                done()
+            });
+        })
+
+        it('should show toast when disabling DF fails', (done) => {
+            // arrange
+            const req = {
+                cid: 'some_cid'
+            }
+            groupDetailsPage.forumDetails = req;
+            mockDiscussionService.removeForum = jest.fn(() => throwError('err') as any)
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            groupDetailsPage.disableDF()
+            // assert
+            setTimeout(() => {
+                expect(mockDiscussionService.removeForum).toHaveBeenCalledWith(
+                    {
+                        cid: ['some_cid']
+                    }
+                );
+                expect(mockCommonUtilService.showToast).toHaveBeenCalled()
+                done()
+            });
+        })
+    })
+
+});
diff --git a/src/app/my-groups/group-details/group-details.page.ts b/src/app/my-groups/group-details/group-details.page.ts
new file mode 100644
index 000000000..de71f35aa
--- /dev/null
+++ b/src/app/my-groups/group-details/group-details.page.ts
@@ -0,0 +1,1011 @@
+import { Component, Inject, OnInit, OnDestroy, ViewChild } from '@angular/core';
+import { Subscription } from 'rxjs';
+import { Location } from '@angular/common';
+import {
+  AppHeaderService,
+  CommonUtilService, AppGlobalService, TelemetryGeneratorService
+} from '../../../services';
+import { Router } from '@angular/router';
+import { RouterLinks, MenuOverflow, ProfileConstants } from '@app/app/app.constant';
+import {
+  InteractType,
+  InteractSubtype,
+  Environment, PageId,
+  ImpressionType,
+  CorReleationDataType,
+  ID
+} from '@app/services/telemetry-constants';
+import { Platform, PopoverController } from '@ionic/angular';
+import {
+  GroupService, GetByIdRequest, Group,
+  GroupMember, GroupMemberRole, DeleteByIdRequest,
+  RemoveMembersRequest,
+  UpdateMembersRequest, RemoveActivitiesRequest,
+  CachedItemRequestSourceFrom, GroupUpdateMembersResponse,
+  GroupActivity,
+  Form,
+  GroupSupportedActivitiesFormField,
+  CorrelationData, ActivateAndDeactivateByIdRequest, DiscussionService, ProfileService, FormService, FormRequest
+} from '@project-sunbird/sunbird-sdk';
+import {
+  OverflowMenuComponent
+} from '@app/app/profile/overflow-menu/overflow-menu.component';
+import GraphemeSplitter from 'grapheme-splitter';
+import {
+  SbGenericPopoverComponent
+} from '@app/app/components/popups';
+import { FilterPipe } from '@app/pipes/filter/filter.pipe';
+import { ActivitiesGrouped } from '@project-sunbird/client-services/models';
+import {
+  ViewMoreActivityDelegateService,
+  ViewMoreActivityActionsDelegate
+} from '../view-more-activity/view-more-activity.page';
+import { NavigationService } from '@app/services/navigation-handler.service';
+import { DiscussionTelemetryService } from '@app/services/discussion/discussion-telemetry.service';
+import { AccessDiscussionComponent } from '@app/app/components/access-discussion/access-discussion.component';
+
+@Component({
+  selector: 'app-group-details',
+  templateUrl: './group-details.page.html',
+  styleUrls: ['./group-details.page.scss'],
+})
+export class GroupDetailsPage implements OnInit, OnDestroy, ViewMoreActivityActionsDelegate {
+
+  corRelationList: Array<CorrelationData> = [];
+  isGroupLoading = false;
+  userId: string;
+  headerObservable: any;
+  groupId: string;
+  groupDetails: Group;
+  activeTab = 'activities';
+  activityList: ActivitiesGrouped[] = [];
+  groupedActivityListMap: { [title: string]: GroupActivity[] };
+  filteredGroupedActivityListMap: { [title: string]: GroupActivity[] };
+  memberList: GroupMember[] = [];
+  filteredMemberList = [];
+  memberSearchQuery: string;
+  activitySearchQuery: string;
+  private unregisterBackButton: Subscription;
+  loggedinUser: GroupMember;
+  groupCreator: GroupMember;
+  flattenedActivityList = [];
+  isSuspended = false;
+  isGroupCreatorOrAdmin = false;
+  forumDetails;
+  // createForumRequest;
+  fetchForumIdReq;
+  createUserReq = {
+    username: '',
+    identifier: ''
+  };
+  @ViewChild(AccessDiscussionComponent, { static: false }) accessDiscussionComponent: AccessDiscussionComponent;
+
+  constructor(
+    @Inject('GROUP_SERVICE') public groupService: GroupService,
+    @Inject('DISCUSSION_SERVICE') private discussionService: DiscussionService,
+    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+    @Inject('FORM_SERVICE') private formService: FormService,
+    private appGlobalService: AppGlobalService,
+    private headerService: AppHeaderService,
+    private router: Router,
+    private location: Location,
+    private platform: Platform,
+    private popoverCtrl: PopoverController,
+    private navService: NavigationService,
+    private commonUtilService: CommonUtilService,
+    private filterPipe: FilterPipe,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+    private viewMoreActivityDelegateService: ViewMoreActivityDelegateService
+  ) {
+    const extras = this.router.getCurrentNavigation().extras.state;
+    this.groupId = extras.groupId;
+  }
+
+  ngOnInit() {
+    this.appGlobalService.getActiveProfileUid()
+      .then((uid) => {
+        this.userId = uid;
+        this.createUserReq.identifier = uid;
+      });
+
+    this.corRelationList.push({ id: this.groupId, type: CorReleationDataType.GROUP_ID });
+    this.telemetryGeneratorService.generateImpressionTelemetry(ImpressionType.VIEW, '', PageId.GROUP_DETAIL, Environment.GROUP,
+      undefined, undefined, undefined, undefined, this.corRelationList);
+
+    this.viewMoreActivityDelegateService.delegate = this;
+    this.generateDataForDF();
+  }
+
+  ngOnDestroy() {
+    this.viewMoreActivityDelegateService.delegate = undefined;
+  }
+
+  ionViewWillEnter() {
+    this.headerService.showHeaderWithBackButton();
+    this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
+      this.handleHeaderEvents(eventName);
+    });
+    this.handleDeviceBackButton();
+    this.fetchGroupDetails();
+  }
+
+  ionViewWillLeave() {
+    this.headerObservable.unsubscribe();
+    if (this.unregisterBackButton) {
+      this.unregisterBackButton.unsubscribe();
+    }
+  }
+
+  handleDeviceBackButton() {
+    this.unregisterBackButton = this.platform.backButton.subscribeWithPriority(10, () => {
+      this.handleBackButton(false);
+    });
+  }
+
+  handleHeaderEvents($event) {
+    switch ($event.name) {
+      case 'back':
+        this.handleBackButton(true);
+        break;
+    }
+  }
+
+  handleBackButton(isNavBack) {
+    this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.GROUP_DETAIL,
+      Environment.GROUP, isNavBack, undefined, this.corRelationList);
+
+    this.location.back();
+  }
+
+  navigateToAddUserPage() {
+    this.generateInteractTelemetry(InteractType.ADD_MEMBER, InteractSubtype.ADD_MEMBER_CLICKED, ID.ADD_MEMBER)
+    this.navService.navigateTo([`/${RouterLinks.MY_GROUPS}/${RouterLinks.ADD_MEMBER_TO_GROUP}`], {
+      groupId: this.groupId,
+      memberList: this.memberList,
+      corRelation: this.corRelationList
+    });
+  }
+
+  private async fetchGroupDetails() {
+    this.isGroupLoading = true;
+    const getByIdRequest: GetByIdRequest = {
+      from: CachedItemRequestSourceFrom.SERVER,
+      id: this.groupId,
+      userId: this.userId,
+      options: {
+        includeMembers: true,
+        includeActivities: true,
+        groupActivities: true
+      }
+    };
+    try {
+      this.groupDetails = await this.groupService.getById(getByIdRequest).toPromise();
+      this.isSuspended = this.groupDetails.status.toLowerCase() === 'suspended';
+      this.memberList = this.groupDetails.members;
+      this.activityList = this.groupDetails.activitiesGrouped;
+      this.activityList.forEach((a) => {
+        if (a.translations) {
+          a.title = this.commonUtilService.getTranslatedValue(a.translations, a.title);
+        }
+      });
+
+      if (this.memberList) {
+        this.memberList.sort((a, b) => {
+          if (b.userId === this.userId) {
+            return 1;
+          } else if (a.userId === this.userId) {
+            return -1;
+          }
+          if (b.role === GroupMemberRole.ADMIN && a.role === GroupMemberRole.MEMBER) {
+            return 1;
+          } else if (b.role === GroupMemberRole.MEMBER && a.role === GroupMemberRole.ADMIN) {
+            return -1;
+          }
+          return a.name.localeCompare(b.name);
+        });
+      }
+
+      this.loggedinUser = this.memberList.find(m => m.userId === this.userId);
+      this.groupCreator = this.memberList.find(m => m.userId === this.groupDetails.createdBy);
+
+      this.filteredMemberList = new Array(...this.memberList);
+
+      this.groupedActivityListMap = this.activityList.reduce((acc, activityGroup) => {
+        acc[activityGroup.title] = activityGroup.items.map((i) => {
+          const activity = {
+            ...i.activityInfo,
+            type: i.type,
+            cardImg: this.commonUtilService.getContentImg(i.activityInfo)
+          };
+          return activity;
+        });
+        return acc;
+      }, {});
+      this.filteredGroupedActivityListMap = { ...this.groupedActivityListMap };
+      this.isGroupLoading = false;
+      if (this.groupCreator.userId === this.userId || this.loggedinUser.role === GroupMemberRole.ADMIN) {
+        this.isGroupCreatorOrAdmin = true;
+      }
+      this.setFlattenedActivityList();
+    } catch (e) {
+      this.isGroupLoading = false;
+      console.error(e);
+    }
+  }
+
+  getMemberName(member) {
+    let memberName = member.name;
+    if (this.loggedinUser.userId === member.userId) {
+      memberName = this.commonUtilService.translateMessage('LOGGED_IN_MEMBER', { member_name: member.name });
+    }
+    return memberName;
+  }
+
+  showMemberMenu(member) {
+    let showMenu = false;
+    if (this.loggedinUser.role === GroupMemberRole.ADMIN
+      && member.userId !== this.groupCreator.userId
+      && member.userId !== this.loggedinUser.userId) {
+      showMenu = true;
+    }
+    return showMenu;
+  }
+
+  switchTabs(tab) {
+    this.activeTab = tab;
+    this.generateInteractTelemetry(InteractType.TOUCH, tab === 'activities' ? InteractSubtype.ACTIVITY_TAB_CLICKED : InteractSubtype.MEMBER_TAB_CLICKED)
+  }
+  
+
+  async groupMenuClick(event) {
+    this.generateInteractTelemetry( InteractType.TOUCH, InteractSubtype.GROUP_KEBAB_MENU_CLICKED);
+    let menuList = MenuOverflow.MENU_GROUP_NON_ADMIN;
+    if (this.groupDetails.status.toLowerCase() === 'suspended') {
+      if (this.groupCreator.userId === this.userId) {
+        menuList = MenuOverflow.MENU_GROUP_CREATOR_SUSPENDED;
+        this.isGroupCreatorOrAdmin = true;
+      } else if (this.loggedinUser.role === GroupMemberRole.ADMIN) {
+        menuList = MenuOverflow.MENU_GROUP_ADMIN__SUSPENDED;
+        this.isGroupCreatorOrAdmin = true;
+      }
+    } else {
+      if (this.groupCreator.userId === this.userId) {
+        if(this.forumDetails){
+          menuList = MenuOverflow.MENU_GROUP_CREATOR_DISABLE_DF;
+        } else {
+          menuList = MenuOverflow.MENU_GROUP_CREATOR;
+        }
+        
+      } else if (this.loggedinUser.role === GroupMemberRole.ADMIN) {
+        if(this.forumDetails){
+          menuList = MenuOverflow.MENU_GROUP_ADMIN_DISABLE_DF
+        } else {
+          menuList = MenuOverflow.MENU_GROUP_ADMIN;
+        }
+      }
+    }
+
+    const groupOptions = await this.popoverCtrl.create({
+      component: OverflowMenuComponent,
+      componentProps: {
+        list: menuList
+      },
+      event,
+      cssClass: 'group-option-popover'
+    });
+    await groupOptions.present();
+
+    const { data } = await groupOptions.onDidDismiss();
+    if (data) {
+      if (data.selectedItem === 'MENU_EDIT_GROUP_DETAILS') {
+        this.generateInteractTelemetry( InteractType.UPDATE_GROUP, InteractSubtype.EDIT_GROUP_CLICKED, ID.UPDATE_GROUP);
+        this.navService.navigateTo([`/${RouterLinks.MY_GROUPS}/${RouterLinks.CREATE_EDIT_GROUP}`],
+          {
+            groupDetails: this.groupDetails,
+            corRelation: this.corRelationList
+          });
+      } else if (data.selectedItem === 'MENU_DELETE_GROUP') {
+        this.showDeleteGroupPopup();
+      } else if (data.selectedItem === 'MENU_LEAVE_GROUP') {
+        this.showLeaveGroupPopup();
+      } else if (data.selectedItem === 'FRMELEMENTS_LBL_DEACTIVATEGRP') {
+        this.showDeactivateGroupPopup();
+      } else if (data.selectedItem === 'FRMELEMENTS_LBL_ACTIVATEGRP') {
+        this.showReactivateGroupPopup();
+      } else if (data.selectedItem === 'ENABLE_DISCUSSION_FORUM'){
+        this.enableDF();
+      } else if(data.selectedItem === 'DISABLE_DISCUSSION_FORUM') {
+        this.showDisableDFPopupPopup();
+      }
+    }
+  }
+
+  async activityMenuClick(event): Promise<boolean> {
+    const selectedActivity = event.data;
+    const groupOptions = await this.popoverCtrl.create({
+      component: OverflowMenuComponent,
+      componentProps: {
+        list: MenuOverflow.MENU_GROUP_ACTIVITY_ADMIN
+      },
+      event: event.event,
+      cssClass: 'group-option-popover group-option-popover-admin'
+    });
+    await groupOptions.present();
+
+    const { data } = await groupOptions.onDidDismiss();
+    if (data) {
+      return this.showRemoveActivityPopup(selectedActivity);
+    }
+    return false;
+  }
+
+  async memberMenuClick(event, selectedMember) {
+    let menuList = MenuOverflow.MENU_GROUP_MEMBER_NON_ADMIN;
+
+    if (selectedMember.role === GroupMemberRole.ADMIN) {  // Is admin and creator
+      menuList = MenuOverflow.MENU_GROUP_MEMBER_ADMIN;
+    }
+
+    const groupOptions = await this.popoverCtrl.create({
+      component: OverflowMenuComponent,
+      componentProps: {
+        list: menuList
+      },
+      event: event.event,
+      cssClass: 'group-option-popover'
+    });
+    await groupOptions.present();
+
+    const { data } = await groupOptions.onDidDismiss();
+    if (data) {
+      if (data.selectedItem === 'MENU_MAKE_GROUP_ADMIN') {
+        this.showMakeGroupAdminPopup(selectedMember);
+      } else if (data.selectedItem === 'MENU_REMOVE_FROM_GROUP') {
+        this.showRemoveMemberPopup(selectedMember);
+      } else if (data.selectedItem === 'DISMISS_AS_GROUP_ADMIN') {
+        this.showDismissAsGroupAdminPopup(selectedMember);
+      }
+    }
+  }
+
+  private async showDeactivateGroupPopup() {
+    this.generateInteractTelemetry( InteractType.SELECT_DEACTIVATE, InteractSubtype.DEACTIVATE_GROUP_CLICKED, ID.SELECT_DEACTIVATE);
+    const deleteConfirm = await this.popoverCtrl.create({
+      component: SbGenericPopoverComponent,
+      componentProps: {
+        sbPopoverHeading: this.commonUtilService.translateMessage('FRMELEMENTS_LBL_DEACTIVATEGRPQUES'),
+        actionsButtons: [
+          {
+            btntext: this.commonUtilService.translateMessage('FRMELEMENTS_BTN_DEACTIVATEGRP'),
+            btnClass: 'popover-color'
+          },
+        ],
+        icon: null,
+        sbPopoverContent: this.commonUtilService.translateMessage('FRMELEMENTS_MSG_DEACTIVATEGRPMSG', { group_name: this.groupDetails.name })
+      },
+      cssClass: 'sb-popover danger',
+    });
+    await deleteConfirm.present();
+
+    const { data } = await deleteConfirm.onDidDismiss();
+    if (data && data.isLeftButtonClicked) {
+      if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+        this.commonUtilService.presentToastForOffline('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+        return;
+      }
+      this.generateInteractTelemetry( InteractType.INITIATED, '', ID.DEACTIVATE_GROUP);
+      const loader = await this.commonUtilService.getLoader();
+      await loader.present();
+      const deactivateByIdRequest: ActivateAndDeactivateByIdRequest = {
+        id: this.groupId
+      };
+      try {
+        const resp = await this.groupService.suspendById(deactivateByIdRequest).toPromise();
+        // await loader.dismiss();
+        this.commonUtilService.showToast('FRMELEMENTS_MSG_DEACTIVATEGRPSUCCESS');
+        await loader.dismiss();
+        // this.location.back();
+        this.generateInteractTelemetry( InteractType.SUCCESS, '', ID.DEACTIVATE_GROUP);
+        this.fetchGroupDetails();
+      } catch (e) {
+        await loader.dismiss();
+        console.error(e);
+        this.commonUtilService.showToast('FRMELEMENTS_MSG_DEACTIVATEGRPFAILED');
+      }
+    }
+  }
+
+  private async showReactivateGroupPopup() {
+    this.generateInteractTelemetry( InteractType.TOUCH, InteractSubtype.REACTIVATE_GROUP_CLICKED);
+    const makeGroupAdminConfirm = await this.popoverCtrl.create({
+      component: SbGenericPopoverComponent,
+      componentProps: {
+        sbPopoverHeading: this.commonUtilService.translateMessage('FRMELEMENTS_LBL_ACTIVATEGRPQUES'),
+        actionsButtons: [
+          {
+            btntext: this.commonUtilService.translateMessage('FRMELEMENTS_BTN_ACTIVATEGRP'),
+            btnClass: 'popover-color'
+          },
+        ],
+        icon: null,
+        sbPopoverContent: this.commonUtilService.translateMessage('FRMELEMENTS_MSG_ACTIVATEGRPMSG')
+      },
+      cssClass: 'sb-popover',
+    });
+    await makeGroupAdminConfirm.present();
+
+    const { data } = await makeGroupAdminConfirm.onDidDismiss();
+    if (data && data.isLeftButtonClicked) {
+      if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+        this.commonUtilService.presentToastForOffline('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+        return;
+      }
+
+      this.generateInteractTelemetry( InteractType.INITIATED, '', ID.REACTIVATE_GROUP);
+      this.isGroupLoading = true;
+      const reActivateByIdRequest: ActivateAndDeactivateByIdRequest = {
+        id: this.groupId
+      };
+      try {
+        // const updateMemberResponse: GroupUpdateMembersResponse = await this.groupService.updateMembers(updateMembersRequest).toPromise();
+        const resp = await this.groupService.reactivateById(reActivateByIdRequest).toPromise();
+        // await loader.dismiss();
+        this.isGroupLoading = false;
+        // if (updateMemberResponse) {
+        this.commonUtilService.showToast('FRMELEMENTS_MSG_ACTIVATEGRPSUCCESS');
+        this.generateInteractTelemetry( InteractType.SUCCESS, '', ID.REACTIVATE_GROUP);
+
+        this.fetchGroupDetails();
+        // }
+      } catch (e) {
+        this.isGroupLoading = false;
+        this.commonUtilService.showToast('FRMELEMENTS_MSG_ACTIVATEGRPFAILED');
+      }
+    }
+  }
+
+  private async showDeleteGroupPopup() {
+    this.generateInteractTelemetry( InteractType.SELECT_DELETE, InteractSubtype.DELETE_GROUP_CLICKED, ID.SELECT_DELETE);  
+
+    const deleteConfirm = await this.popoverCtrl.create({
+      component: SbGenericPopoverComponent,
+      componentProps: {
+        sbPopoverHeading: this.commonUtilService.translateMessage('DELETE_GROUP_POPUP_TITLE'),
+        actionsButtons: [
+          {
+            btntext: this.commonUtilService.translateMessage('REMOVE'),
+            btnClass: 'popover-color'
+          },
+        ],
+        icon: null,
+        sbPopoverContent: this.commonUtilService.translateMessage('DELETE_GROUP_DESC', { group_name: this.groupDetails.name })
+      },
+      cssClass: 'sb-popover danger',
+    });
+    await deleteConfirm.present();
+
+    const { data } = await deleteConfirm.onDidDismiss();
+    if (data && data.isLeftButtonClicked) {
+      if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+        this.commonUtilService.presentToastForOffline('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+        return;
+      }
+      this.generateInteractTelemetry( InteractType.INITIATED, '', ID.DELETE_GROUP);  
+      const loader = await this.commonUtilService.getLoader();
+      await loader.present();
+      const deleteByIdRequest: DeleteByIdRequest = {
+        id: this.groupId
+      };
+      try {
+        await this.groupService.deleteById(deleteByIdRequest).toPromise();
+        await loader.dismiss();
+        this.commonUtilService.showToast('DELETE_GROUP_SUCCESS_MSG');
+        await loader.dismiss();
+        this.location.back();
+        this.generateInteractTelemetry( InteractType.SUCCESS, '', ID.DELETE_GROUP);  
+      } catch (e) {
+        await loader.dismiss();
+        console.error(e);
+        this.commonUtilService.showToast('DELETE_GROUP_ERROR_MSG');
+      }
+    }
+  }
+
+  private async showLeaveGroupPopup() {
+    this.generateInteractTelemetry( InteractType.TOUCH, InteractSubtype.LEAVE_GROUP_CLICKED);  
+    const leaveGroupConfirm = await this.popoverCtrl.create({
+      component: SbGenericPopoverComponent,
+      componentProps: {
+        sbPopoverHeading: this.commonUtilService.translateMessage('LEAVE_GROUP_POPUP_TITLE'),
+        actionsButtons: [
+          {
+            btntext: this.commonUtilService.translateMessage('LEAVE_GROUP'),
+            btnClass: 'popover-color'
+          },
+        ],
+        icon: null,
+        sbPopoverContent: this.commonUtilService.translateMessage('LEAVE_GROUP_POPUP_DESC', { group_name: this.groupDetails.name })
+      },
+      cssClass: 'sb-popover danger',
+    });
+    await leaveGroupConfirm.present();
+
+    const { data } = await leaveGroupConfirm.onDidDismiss();
+    if (data && data.isLeftButtonClicked) {
+      if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+        this.commonUtilService.presentToastForOffline('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+        return;
+      }
+      this.generateInteractTelemetry( InteractType.INITIATED, '', ID.LEAVE_GROUP);  
+      const loader = await this.commonUtilService.getLoader();
+      await loader.present();
+      const removeMembersRequest: RemoveMembersRequest = {
+        groupId: this.groupId,
+        removeMembersRequest: {
+          userIds: [this.userId]
+        }
+      };
+      try {
+        const removeMemberResponse = await this.groupService.removeMembers(removeMembersRequest).toPromise();
+
+        await loader.dismiss();
+        if (removeMemberResponse.error
+          && removeMemberResponse.error.members
+          && removeMemberResponse.error.members.length) {
+          this.commonUtilService.showToast('LEAVE_GROUP_ERROR_MSG');
+        } else {
+          this.location.back();
+
+          this.commonUtilService.showToast('LEAVE_GROUP_SUCCESS_MSG');
+        this.generateInteractTelemetry( InteractType.SUCCESS, '', ID.LEAVE_GROUP);  
+        }
+      } catch (e) {
+        console.error(e);
+        await loader.dismiss();
+        this.commonUtilService.showToast('LEAVE_GROUP_ERROR_MSG');
+      }
+    }
+  }
+
+  private async showRemoveActivityPopup(selectedActivity): Promise<boolean> {
+    this.generateInteractTelemetry( InteractType.TOUCH,  InteractSubtype.REMOVE_ACTIVITY_CLICKED);  
+    const removeActivityConfirm = await this.popoverCtrl.create({
+      component: SbGenericPopoverComponent,
+      componentProps: {
+        sbPopoverHeading: this.commonUtilService.translateMessage('REMOVE_ACTIVITY_POPUP_TITLE'),
+        actionsButtons: [
+          {
+            btntext: this.commonUtilService.translateMessage('REMOVE_ACTIVITY'),
+            btnClass: 'popover-color'
+          },
+        ],
+        icon: null,
+        sbPopoverContent: this.commonUtilService.translateMessage('REMOVE_ACTIVITY_GROUP_DESC')
+      },
+      cssClass: 'sb-popover danger',
+    });
+    await removeActivityConfirm.present();
+
+    const { data } = await removeActivityConfirm.onDidDismiss();
+    if (data && data.isLeftButtonClicked) {
+      if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+        this.commonUtilService.presentToastForOffline('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+        return false;
+      }
+      this.generateInteractTelemetry( InteractType.INITIATED, '', ID.REMOVE_ACTIVITY);  
+      this.isGroupLoading = true;
+      const removeActivitiesRequest: RemoveActivitiesRequest = {
+        groupId: this.groupId,
+        removeActivitiesRequest: {
+          activityIds: [selectedActivity.identifier]
+        }
+      };
+      try {
+        const removeActivitiesResponse = await this.groupService.removeActivities(removeActivitiesRequest).toPromise();
+
+        this.isGroupLoading = false;
+        if (removeActivitiesResponse.error
+          && removeActivitiesResponse.error.activities
+          && removeActivitiesResponse.error.activities.length) {
+          this.commonUtilService.showToast('REMOVE_ACTIVITY_ERROR_MSG');
+          return false;
+        } else {
+          this.commonUtilService.showToast('REMOVE_ACTIVITY_SUCCESS_MSG');
+          this.generateInteractTelemetry(InteractType.SUCCESS, '', ID.REMOVE_ACTIVITY);  
+          this.fetchGroupDetails();
+          return true;
+        }
+      } catch (e) {
+        console.error('showRemoveActivityPopup', e);
+        this.isGroupLoading = false;
+        this.commonUtilService.showToast('REMOVE_ACTIVITY_ERROR_MSG');
+        return false;
+      }
+    }
+  }
+
+  private async showRemoveMemberPopup(selectedMember) {
+    this.generateInteractTelemetry( InteractType.TOUCH, InteractSubtype.REMOVE_MEMBER_CLICKED);  
+    const removeMemberConfirm = await this.popoverCtrl.create({
+      component: SbGenericPopoverComponent,
+      componentProps: {
+        sbPopoverHeading: this.commonUtilService.translateMessage('REMOVE_MEMBER_POPUP_TITLE'),
+        actionsButtons: [
+          {
+            btntext: this.commonUtilService.translateMessage('REMOVE_MEMBER'),
+            btnClass: 'popover-color'
+          },
+        ],
+        icon: null,
+        sbPopoverContent: this.commonUtilService.translateMessage('REMOVE_MEMBER_GROUP_DESC', { member_name: selectedMember.name })
+      },
+      cssClass: 'sb-popover danger',
+    });
+    await removeMemberConfirm.present();
+
+    const { data } = await removeMemberConfirm.onDidDismiss();
+    if (data && data.isLeftButtonClicked) {
+      if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+        this.commonUtilService.presentToastForOffline('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+        return;
+      }
+      this.generateInteractTelemetry(InteractType.INITIATED, '', ID.REMOVE_MEMBER);  
+      this.isGroupLoading = true;
+      const removeMembersRequest: RemoveMembersRequest = {
+        groupId: this.groupId,
+        removeMembersRequest: {
+          userIds: [selectedMember.userId]
+        }
+      };
+      try {
+        const removeMemberResponse = await this.groupService.removeMembers(removeMembersRequest).toPromise();
+
+        this.isGroupLoading = false;
+        if (removeMemberResponse.error
+          && removeMemberResponse.error.members
+          && removeMemberResponse.error.members.length) {
+          this.commonUtilService.showToast('REMOVE_MEMBER_ERROR_MSG');
+        } else {
+          this.commonUtilService.showToast('REMOVE_MEMBER_SUCCESS_MSG', { member_name: selectedMember.name });
+          this.generateInteractTelemetry(InteractType.SUCCESS, '', ID.REMOVE_MEMBER);  
+          this.fetchGroupDetails();
+        }
+      } catch (e) {
+        // await loader.dismiss();
+        this.isGroupLoading = false;
+        console.error(e);
+        this.commonUtilService.showToast('REMOVE_MEMBER_ERROR_MSG');
+      }
+    }
+  }
+
+  private async showMakeGroupAdminPopup(selectedMember) {
+    this.generateInteractTelemetry(InteractType.TOUCH, InteractSubtype.MAKE_GROUP_ADMIN_CLICKED);  
+    const makeGroupAdminConfirm = await this.popoverCtrl.create({
+      component: SbGenericPopoverComponent,
+      componentProps: {
+        sbPopoverHeading: this.commonUtilService.translateMessage('MAKE_GROUP_ADMIN_POPUP_TITLE'),
+        actionsButtons: [
+          {
+            btntext: this.commonUtilService.translateMessage('MAKE_ADMIN'),
+            btnClass: 'popover-color'
+          },
+        ],
+        icon: null,
+        sbPopoverContent: this.commonUtilService.translateMessage('MAKE_GROUP_ADMIN_POPUP_DESC',
+          { member_name: selectedMember.name })
+      },
+      cssClass: 'sb-popover',
+    });
+    await makeGroupAdminConfirm.present();
+
+    const { data } = await makeGroupAdminConfirm.onDidDismiss();
+    if (data && data.isLeftButtonClicked) {
+      if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+        this.commonUtilService.presentToastForOffline('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+        return;
+      }
+      this.generateInteractTelemetry(InteractType.INITIATED, '', ID.MAKE_GROUP_ADMIN);  
+      this.isGroupLoading = true;
+      const updateMembersRequest: UpdateMembersRequest = {
+        groupId: this.groupId,
+        updateMembersRequest: {
+          members: [{
+            userId: selectedMember.userId,
+            role: GroupMemberRole.ADMIN
+          }]
+        }
+      };
+      try {
+        const updateMemberResponse: GroupUpdateMembersResponse = await this.groupService.updateMembers(updateMembersRequest).toPromise();
+
+        // await loader.dismiss();
+        this.isGroupLoading = false;
+        if (updateMemberResponse.error
+          && updateMemberResponse.error.members
+          && updateMemberResponse.error.members.length) {
+          this.commonUtilService.showToast('MAKE_GROUP_ADMIN_ERROR_MSG', { member_name: selectedMember.name });
+        } else {
+          this.commonUtilService.showToast('MAKE_GROUP_ADMIN_SUCCESS_MSG', { member_name: selectedMember.name });
+          this.generateInteractTelemetry(InteractType.SUCCESS, '', ID.MAKE_GROUP_ADMIN);  
+          this.fetchGroupDetails();
+        }
+      } catch (e) {
+        console.error('showMakeGroupAdminPopup', e);
+        this.isGroupLoading = false;
+        this.commonUtilService.showToast('MAKE_GROUP_ADMIN_ERROR_MSG', { member_name: selectedMember.name });
+      }
+    }
+  }
+
+  private async showDismissAsGroupAdminPopup(selectedMember) {
+    this.generateInteractTelemetry(InteractType.TOUCH,  InteractSubtype.DISMISS_GROUP_ADMIN_CLICKED);  
+
+    const dismissAsGroupAdminConfirm = await this.popoverCtrl.create({
+      component: SbGenericPopoverComponent,
+      componentProps: {
+        sbPopoverHeading: this.commonUtilService.translateMessage('DISMISS_AS_GROUP_ADMIN_POPUP_TITLE'),
+        actionsButtons: [
+          {
+            btntext: this.commonUtilService.translateMessage('DISMISS_AS_GROUP_ADMIN'),
+            btnClass: 'popover-color'
+          },
+        ],
+        icon: null,
+        sbPopoverContent: this.commonUtilService.translateMessage('DISMISS_AS_GROUP_ADMIN_POPUP_DESC',
+          { member_name: selectedMember.name })
+      },
+      cssClass: 'sb-popover',
+    });
+    await dismissAsGroupAdminConfirm.present();
+
+    const { data } = await dismissAsGroupAdminConfirm.onDidDismiss();
+    if (data && data.isLeftButtonClicked) {
+      if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+        this.commonUtilService.presentToastForOffline('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+        return;
+      }
+
+      this.generateInteractTelemetry(InteractType.INITIATED, '', ID.DISMISS_GROUP_ADMIN);  
+
+      this.isGroupLoading = true;
+      const updateMembersRequest: UpdateMembersRequest = {
+        groupId: this.groupId,
+        updateMembersRequest: {
+          members: [{
+            userId: selectedMember.userId,
+            role: GroupMemberRole.MEMBER
+          }]
+        }
+      };
+      try {
+        const updateMemberResponse: GroupUpdateMembersResponse = await this.groupService.updateMembers(updateMembersRequest).toPromise();
+        // await loader.dismiss();
+        this.isGroupLoading = false;
+        if (updateMemberResponse.error
+          && updateMemberResponse.error.members
+          && updateMemberResponse.error.members.length) {
+          this.commonUtilService.showToast('DISMISS_AS_GROUP_ADMIN_ERROR_MSG', { member_name: selectedMember.name });
+        } else {
+          this.commonUtilService.showToast('DISMISS_AS_GROUP_ADMIN_SUCCESS_MSG', { member_name: selectedMember.name });
+          this.generateInteractTelemetry(InteractType.SUCCESS, '', ID.DISMISS_GROUP_ADMIN);  
+          this.fetchGroupDetails();
+        }
+      } catch (e) {
+        // await loader.dismiss();
+        this.isGroupLoading = false;
+        console.error(e);
+        this.commonUtilService.showToast('DISMISS_AS_GROUP_ADMIN_ERROR_MSG', { member_name: selectedMember.name });
+      }
+    }
+  }
+
+  onMemberSearch(query) {
+    this.memberSearchQuery = query;
+    this.filteredMemberList = [...this.filterPipe.transform(this.memberList, 'name', query)];
+  }
+
+  onActivitySearch(query) {
+    this.activitySearchQuery = query;
+    for (const property in this.groupedActivityListMap) {
+      if (this.groupedActivityListMap[property].length) {
+        this.filteredGroupedActivityListMap[property] = this.groupedActivityListMap[property].filter(
+          (activity) => activity['name'].toLowerCase().includes(query.toLowerCase())
+        );
+      }
+    }
+    this.setFlattenedActivityList();
+  }
+
+  extractInitial(name) {
+    const splitter = new GraphemeSplitter();
+    const split: string[] = splitter.splitGraphemes(name.trim());
+    return split[0];
+  }
+
+  onActivityCardClick(event) {
+    const activity = event.data;
+    if (this.loggedinUser.role !== GroupMemberRole.ADMIN) {
+      this.navService.navigateToDetailPage(activity, {
+        content: activity,
+        corRelation: this.corRelationList
+      });
+    } else {
+      this.navService.navigateTo([`/${RouterLinks.MY_GROUPS}/${RouterLinks.ACTIVITY_DETAILS}`],
+        {
+          loggedinUser: this.loggedinUser,
+          group: this.groupDetails,
+          memberList: this.memberList,
+          activity,
+          isGroupCreatorOrAdmin: this.isGroupCreatorOrAdmin,
+          corRelation: this.corRelationList
+        });
+    }
+  }
+
+  async navigateToAddActivityPage() {
+    if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+      this.commonUtilService.presentToastForOffline('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+      return;
+    }
+    this.generateInteractTelemetry(InteractType.ADD_ACTIVITY, InteractSubtype.ADD_ACTIVITY_CLICKED, ID.ADD_ACTIVITY);  
+    try {
+      const supportedActivityResponse: Form<GroupSupportedActivitiesFormField>
+        = await this.groupService.getSupportedActivities().toPromise();
+      if (supportedActivityResponse && supportedActivityResponse.data && supportedActivityResponse.data.fields) {
+        const supportedActivityList = supportedActivityResponse.data.fields;
+        supportedActivityList.forEach(a => {
+          if (a.translations) {
+            a.title = this.commonUtilService.getTranslatedValue(a.translations, a.title);
+          }
+        });
+        this.navService.navigateTo([`/${RouterLinks.MY_GROUPS}/${RouterLinks.MY_GROUP_DETAILS}/${RouterLinks.ADD_ACTIVITY_TO_GROUP}`],
+          {
+            supportedActivityList,
+            groupId: this.groupId,
+            activityList: this.activityList,
+            corRelation: this.corRelationList
+          });
+      }
+    } catch (e) {
+      console.error('navigateToAddActivityPage', e);
+    }
+  }
+
+  navigateToViewMorePage(activityGroup) {
+    this.navService.navigateTo([`/${RouterLinks.MY_GROUPS}/${RouterLinks.MY_GROUP_DETAILS}/${RouterLinks.ACTIVITY_VIEW_MORE}`],
+      {
+        isMenu: this.loggedinUser.role === 'admin',
+        activityGroup,
+        groupId: this.groupId,
+        previousPageId: PageId.GROUP_DETAIL
+      });
+  }
+
+  onViewMoreCardClick(event: Event, activity: GroupActivity) {
+    const data = {
+      data: {
+        ...activity.activityInfo,
+        type: activity.type
+      }
+    };
+    this.onActivityCardClick(data);
+  }
+
+  onViewMoreCardMenuClick(event, activity) {
+    return this.activityMenuClick(event);
+  }
+
+  private setFlattenedActivityList() {
+    this.flattenedActivityList = [];
+    for (const key in this.filteredGroupedActivityListMap) {
+      if (this.filteredGroupedActivityListMap[key]) {
+        this.flattenedActivityList = [...this.flattenedActivityList , ...this.filteredGroupedActivityListMap[key]];
+      }
+    }
+  }
+
+  private generateInteractTelemetry(interactType, interactSubType, id?){
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      interactType,
+      interactSubType,
+      Environment.GROUP,
+      PageId.GROUP_DETAIL,
+      undefined,
+      undefined,
+      undefined,
+      this.corRelationList,
+      id
+    );
+  }
+
+  async enableDF(){
+    this.generateInteractTelemetry( InteractType.TOUCH, InteractSubtype.ENABLE_DISCUSSIONS_CLICKED);
+    const loader = await this.commonUtilService.getLoader();
+    await loader.present();
+    this.generateInteractTelemetry( InteractType.INITIATED, '', ID.ENABLE_DISCUSSIONS);
+    const request = {
+      context: {
+        type: 'group',
+        identifier: this.groupId
+      },
+      type: 'group'
+    }
+    this.discussionService.attachForum(request).toPromise()
+    .then(async (response) => {
+      this.generateInteractTelemetry( InteractType.SUCCESS, '', ID.ENABLE_DISCUSSIONS);
+      await loader.dismiss();
+      this.commonUtilService.showToast('DISCUSSION_FORUM_ENABLE_SUCCESS');
+      this.accessDiscussionComponent.fetchForumIds();
+      }).catch(async (err) => {
+      console.log('enableDF err', err)
+        await loader.dismiss();
+        this.commonUtilService.showToast('SOMETHING_WENT_WRONG')
+      });
+  }
+
+  async disableDF(){
+    const loader = await this.commonUtilService.getLoader();
+    await loader.present();
+    this.generateInteractTelemetry( InteractType.INITIATED, '', ID.DISABLE_DISCUSSIONS);
+    const removeForumReq = {...this.forumDetails}
+    removeForumReq.cid = [removeForumReq.cid];
+    this.discussionService.removeForum(removeForumReq).toPromise()
+    .then(async res => {
+      this.generateInteractTelemetry( InteractType.SUCCESS, '', ID.DISABLE_DISCUSSIONS);
+      await loader.dismiss();
+      this.forumDetails = '';
+      this.commonUtilService.showToast('DISCUSSION_FORUM_DISABLE_SUCCESS');
+      this.accessDiscussionComponent.fetchForumIds();
+    }).catch(async err => {
+      console.log('disableDF err', err)
+      await loader.dismiss();
+      this.commonUtilService.showToast('SOMETHING_WENT_WRONG')
+    });
+  }
+
+  private async showDisableDFPopupPopup() {
+    this.generateInteractTelemetry( InteractType.TOUCH, InteractSubtype.DISABLE_DISCUSSIONS_CLICKED);
+    const deleteConfirm = await this.popoverCtrl.create({
+      component: SbGenericPopoverComponent,
+      componentProps: {
+        sbPopoverHeading: this.commonUtilService.translateMessage('DISCUSSION_FORUM_DISABLE_CONFIRM'),
+        actionsButtons: [
+          {
+            btntext: this.commonUtilService.translateMessage('DISABLE_DISCUSSION_FORUM'),
+            btnClass: 'popover-color'
+          },
+        ],
+        icon: null,
+        sbPopoverContent: this.commonUtilService.translateMessage('DISCUSSION_FORUM_DISABLE_CONFIRM_DESC', { group_name: this.groupDetails.name })
+      },
+      cssClass: 'sb-popover danger',
+    });
+    await deleteConfirm.present();
+
+    const { data } = await deleteConfirm.onDidDismiss();
+    if (data && data.isLeftButtonClicked) {
+      if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+        this.commonUtilService.presentToastForOffline('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+        return;
+      }
+      this.disableDF();
+    }
+  }
+
+  async generateDataForDF() {
+    this.fetchForumIdReq =  {
+      identifier: [this.groupId],
+      type: 'group'
+    };
+    this.profileService.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS }).toPromise().then((p) => {
+      this.createUserReq.username = p.serverProfile['userName'];
+    });
+  }
+
+  assignForumData(e){
+    console.log('assignForumData', e)
+    this.forumDetails = e;
+  }
+  
+}
diff --git a/src/app/my-groups/group.interface.ts b/src/app/my-groups/group.interface.ts
new file mode 100644
index 000000000..4a0d7d651
--- /dev/null
+++ b/src/app/my-groups/group.interface.ts
@@ -0,0 +1,13 @@
+import { CorrelationData, GroupActivity } from '@project-sunbird/sunbird-sdk';
+
+
+export interface AddActivityToGroup {
+    groupId: string;
+    activityId: string;
+    activityType: string;
+    pageId: string;
+    corRelationList: Array<CorrelationData>;
+    activityList?: GroupActivity[];
+    source?: string;
+    noOfPagesToRevertOnSuccess?: number;
+}
diff --git a/src/app/my-groups/my-groups-routing.module.ts b/src/app/my-groups/my-groups-routing.module.ts
new file mode 100644
index 000000000..dd7fad74c
--- /dev/null
+++ b/src/app/my-groups/my-groups-routing.module.ts
@@ -0,0 +1,34 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { RouterLinks } from '../app.constant';
+import { MyGroupsPage } from './my-groups.page';
+
+const routes: Routes = [
+    { path: '', component: MyGroupsPage },
+    {
+        path: RouterLinks.CREATE_EDIT_GROUP,
+        loadChildren: './create-edit-group/create-edit-group.module#CreateEditGroupPageModule'
+    },
+    {
+        path: RouterLinks.MY_GROUP_DETAILS,
+        loadChildren: './group-details/group-details.module#GroupDetailsPageModule'
+    },
+    {
+        path: RouterLinks.ADD_MEMBER_TO_GROUP,
+        loadChildren: './add-member-to-group/add-member-to-group.module#AddMemberToGroupPageModule'
+    },
+    {
+        path: RouterLinks.ACTIVITY_DETAILS,
+        loadChildren: './activity-details/activity-details.module#ActivityDetailsPageModule'
+    },
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(routes)
+    ],
+    exports: [
+        RouterModule
+    ]
+})
+export class MyGroupsRoutingModule { }
diff --git a/src/app/my-groups/my-groups.module.ts b/src/app/my-groups/my-groups.module.ts
new file mode 100644
index 000000000..46670d125
--- /dev/null
+++ b/src/app/my-groups/my-groups.module.ts
@@ -0,0 +1,27 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { MyGroupsPage } from './my-groups.page';
+import { MyGroupsRoutingModule } from './my-groups-routing.module';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
+import { ComponentsModule } from '../components/components.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    TranslateModule.forChild(),
+    MyGroupsRoutingModule,
+    CommonConsumptionModule,
+    ComponentsModule
+  ],
+  declarations: [
+    MyGroupsPage,
+  ]
+})
+export class MyGroupsPageModule { }
diff --git a/src/app/my-groups/my-groups.page.html b/src/app/my-groups/my-groups.page.html
new file mode 100644
index 000000000..d6255c25c
--- /dev/null
+++ b/src/app/my-groups/my-groups.page.html
@@ -0,0 +1,50 @@
+<ion-content>
+  <div class="my-cr-bg">
+    <p class="my-cr-title">
+      {{'MY_GROUPS' | translate}}
+      <img *ngIf="!isGuestUser" src="assets/imgs/ic_group_add_blue.svg" (click)="createClassroom()" alt="{{'MY_GROUPS' | translate}}">
+    </p>
+
+    <div *ngIf="isGuestUser" class="my-cr-card">
+      <div></div>
+      <div>
+        <div class="my-cr-card-img">
+          <img src="assets/imgs/ic_my_groups.svg" alt="">
+        </div>
+        <p class="my-cr-subtitle">{{'LOGIN_TO_CREATE_GROUP_DESCRIPTION' | translate}}</p>
+      </div>
+      <div class="my-cr-btn">
+        <button class="sb-btn-large" (click)="login()">{{'SIGN_IN' | translate}}</button>
+      </div>
+    </div>
+
+    <div *ngIf="!isGuestUser && !groupList.length && !groupListLoader" class="my-cr-card">
+      <div></div>
+      <div>
+        <div class="my-cr-card-img">
+          <img src="assets/imgs/ic_my_groups.svg" alt="my-group">
+        </div>
+        <p class="my-cr-subtitle">{{'CREATE_GROUP_DESCRIPTION' | translate}}</p>
+      </div>
+      <div class="my-cr-btn">
+        <button class="sb-btn-large" (click)="createClassroom()">
+          <img src="assets/imgs/ic_group_add_white.svg" alt="">
+          {{'CREATE_GROUP' | translate}}
+        </button>
+      </div>
+    </div>
+
+    <div *ngFor="let group of groupList" class="mg-list-card-container">
+      <sb-group-card [isMobile]="true" [isAdmin]="group.memberRole === 'admin'" [group]="group"
+        [cardTitleColor]="group.cardTitleColor" [cardBgColor]="group.cardBgColor"
+        (cardClick)="navigateToGroupdetailsPage($event)" [isSuspended]="group.status === 'suspended'" [suspendBadgeText]="'Deactivated'"></sb-group-card>
+    </div>
+    <div *ngIf="!isGuestUser && !groupList.length && groupListLoader">
+      <div *ngFor="let item of [0,1,2,3,4,5,6,7,8,9,10]">
+        <sb-group-card [isMobile]="true" [isLoading]="true"></sb-group-card>
+      </div>
+    </div>
+
+  </div>
+
+</ion-content>
\ No newline at end of file
diff --git a/src/app/my-groups/my-groups.page.scss b/src/app/my-groups/my-groups.page.scss
new file mode 100644
index 000000000..3ee2e1e13
--- /dev/null
+++ b/src/app/my-groups/my-groups.page.scss
@@ -0,0 +1,70 @@
+@import "src/assets/styles/_variables.scss";
+.my-cr-bg {
+  height: 100%;
+  background: linear-gradient(#E5EDF5, #E5EDF5 88px, white 88px, white 100%);
+  padding: 0 8px;
+}
+
+.my-cr-title{
+  color: $blue;
+  font-family: "Noto Sans", sans-serif;
+  font-size: 16px;
+  font-weight: bold;
+  letter-spacing: 0;
+  line-height: 16px;
+  padding: 24px 16px 16px;
+  margin: 0;
+  position: relative;
+  img{
+    position: absolute;
+    right: 16px;
+    top: 20px;
+  }
+}
+
+.my-cr-card{
+  border-radius: 2px;
+  background-color: #FFFFFF;
+  box-shadow: 0 3px 5px 4px rgba(0,0,0,0.05);
+  margin: 0 8px;
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+  height: 80vh;
+  justify-content: space-between;
+}
+
+.my-cr-card-img{
+  padding-top: 48px;
+  padding-bottom: 16px;
+}
+
+.my-cr-subtitle{
+  color: $gray-800;
+  font-family: "Noto Sans", sans-serif;
+  font-size: 16px;
+  letter-spacing: 0;
+  line-height: 22px;
+  text-align: center;
+  padding: 20px 10%;
+}
+
+.mg-list-card-container{
+  margin-bottom: 8px;
+}
+
+.my-cr-btn{
+    padding: 0px 8px 24px;
+    ion-button{
+      --background: $blue !important;
+      
+    }
+    .sb-btn-large{
+      padding: 16px 0px 16px 0px;
+      img{
+        margin-right: 8px;
+        position: relative;
+        bottom: 2px;
+      }
+    }
+}
\ No newline at end of file
diff --git a/src/app/my-groups/my-groups.page.spec.ts b/src/app/my-groups/my-groups.page.spec.ts
new file mode 100644
index 000000000..976a78223
--- /dev/null
+++ b/src/app/my-groups/my-groups.page.spec.ts
@@ -0,0 +1,693 @@
+import { MyGroupsPage } from './my-groups.page';
+import {
+    AuthService, GroupMemberRole, SharedPreferences, GroupService, SystemSettingsService, ProfileService
+} from '@project-sunbird/sunbird-sdk';
+import { Router } from '@angular/router';
+import { Platform, PopoverController } from '@ionic/angular';
+import { AppHeaderService } from '@app/services/app-header.service';
+import { LoginHandlerService } from '@app/services/login-handler.service';
+import {
+    CommonUtilService, AppGlobalService, TelemetryGeneratorService,
+    InteractType, InteractSubtype, Environment, PageId, ImpressionType
+} from '@app/services';
+import { of, throwError } from 'rxjs';
+import { PreferenceKey, RouterLinks } from '../app.constant';
+import { SbProgressLoader } from '@app/services/sb-progress-loader.service';
+import { Location } from '@angular/common';
+
+describe('MyGroupsPage', () => {
+    let myGroupsPage: MyGroupsPage;
+    const mockAuthService: Partial<AuthService> = {};
+    const mockAppGlobalService: Partial<AppGlobalService> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        showToast: jest.fn()
+    };
+    const mockHeaderService: Partial<AppHeaderService> = {};
+    const mockLoginHandlerService: Partial<LoginHandlerService> = {};
+    const mockPopoverCtrl: Partial<PopoverController> = {};
+    const mockPreferences: Partial<SharedPreferences> = {};
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => ({
+            extras: {
+                state: {
+                    fromRegistrationFlow: false
+                }
+            }
+        })) as any
+    };
+    const mockGroupService: Partial<GroupService> = {};
+    const mockSbProgressLoader: Partial<SbProgressLoader> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateInteractTelemetry: jest.fn()
+    };
+    const mockPlatform: Platform<Platform> = {};
+    const mockLocation: Partial<Location> = {};
+    const mockSystemSettingService: Partial<SystemSettingsService> = {};
+    const mockProfileService: Partial<ProfileService> = {};
+
+    beforeAll(() => {
+        myGroupsPage = new MyGroupsPage(
+            mockAuthService as AuthService,
+            mockGroupService as GroupService,
+            mockPreferences as SharedPreferences,
+            mockSystemSettingService as SystemSettingsService,
+            mockProfileService as ProfileService,
+            mockAppGlobalService as AppGlobalService,
+            mockHeaderService as AppHeaderService,
+            mockRouter as Router,
+            mockLoginHandlerService as LoginHandlerService,
+            mockCommonUtilService as CommonUtilService,
+            mockPopoverCtrl as PopoverController,
+            mockSbProgressLoader as SbProgressLoader,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockPlatform as Platform,
+            mockLocation as Location
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should create a instance for myGroupesPage', () => {
+        expect(myGroupsPage).toBeTruthy();
+    });
+    describe('openAcceptGuidelinesPopup', () => {
+        it('should show acceptTermsAndConditions popup', (done) => {
+            // arrange
+            myGroupsPage.groupTncVersion = '3.4.0';
+            myGroupsPage.userId = 'sample-uid';
+            mockCommonUtilService.translateMessage = jest.fn(() => 'msg');
+            // mockGroupService.updateMembers = jest.fn(() => of('success') as any);
+            mockProfileService.acceptTermsAndConditions = jest.fn(() => of(true) as any);
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { isLeftButtonClicked: true } }))
+            } as any)));
+            const nanavigationExtras = {
+                state: {
+                    groupId: 'some_group'
+                }
+            }
+            // act
+            myGroupsPage.openAcceptGuidelinesPopup(true, nanavigationExtras);
+            // expect
+            setTimeout(() => {
+                expect(mockProfileService.acceptTermsAndConditions).toHaveBeenCalledWith(
+                    {
+                        tncType: 'groupsTnc',
+                        version: '3.4.0'
+                    }
+                );
+                done();
+            }, 0);
+        });
+
+        it('should fail while acceptTermsAndConditions popup', (done) => {
+            // arrange
+            myGroupsPage.groupTncVersion = '3.4.0';
+            myGroupsPage.userId = 'sample-uid';
+            mockCommonUtilService.translateMessage = jest.fn(() => 'msg');
+            // mockGroupService.updateMembers = jest.fn(() => of('success') as any);
+            mockProfileService.acceptTermsAndConditions = jest.fn(() => throwError('error') as any);
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { isLeftButtonClicked: true } }))
+            } as any)));
+            const nanavigationExtras = {
+                state: {
+                    groupId: 'some_group'
+                }
+            }
+            // act
+            myGroupsPage.openAcceptGuidelinesPopup(true, nanavigationExtras);
+            // expect
+            setTimeout(() => {
+                expect(mockProfileService.acceptTermsAndConditions).toHaveBeenCalledWith(
+                    {
+                        tncType: 'groupsTnc',
+                        version: '3.4.0'
+                    }
+                );
+                done();
+            }, 0);
+        });
+
+        it('should navigate to groupdetails after accepting guidelines', (done) => {
+            // arrange
+            myGroupsPage.groupTncVersion = '3.4.0';
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'msg');
+            mockGroupService.updateGroupGuidelines = jest.fn(() => of('success') as any);
+            mockProfileService.acceptTermsAndConditions = jest.fn(() => of(true) as any);
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { isLeftButtonClicked: true } }))
+            } as any)));
+            const navigationExtras = {
+                state: {
+                    groupId: 'sample_group_id'
+                }
+            };
+
+            // act
+            myGroupsPage.openAcceptGuidelinesPopup(false, navigationExtras);
+            // expect
+            setTimeout(() => {
+                expect(mockRouter.navigate).toHaveBeenCalledWith([`/${RouterLinks.MY_GROUPS}/${RouterLinks.MY_GROUP_DETAILS}`],
+                    navigationExtras);
+                done();
+            }, 0);
+        });
+
+        it('should not navigate to groupdetails after failure in accepting guidelines', () => {
+            // arrange
+            myGroupsPage.groupTncVersion = '3.4.0';
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'msg');
+            mockGroupService.updateMembers = jest.fn(() => throwError('error') as any);
+            mockProfileService.acceptTermsAndConditions = jest.fn(() => of(true) as any);
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { isLeftButtonClicked: true } }))
+            } as any)));
+            const navigationExtras = {
+                state: {
+                    groupId: 'sample_group_id'
+                }
+            };
+
+            // act
+            myGroupsPage.openAcceptGuidelinesPopup(false, navigationExtras);
+            // expect
+        });
+    });
+
+    describe('openinfopopup', () => {
+        it('should return undefined for backDrop clicked', (done) => {
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: undefined }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'ANDROID_NOT_SUPPORTED');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'ANDROID_NOT_SUPPORTED_DESC');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'INSTALL_CROSSWALK');
+            myGroupsPage.openinfopopup();
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'ANDROID_NOT_SUPPORTED');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'ANDROID_NOT_SUPPORTED_DESC');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'INSTALL_CROSSWALK');
+                done();
+            }, 0);
+        });
+
+        it('should close popup for clicked on close icpn', (done) => {
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { closeDeletePopOver: true } }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'ANDROID_NOT_SUPPORTED');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'ANDROID_NOT_SUPPORTED_DESC');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'INSTALL_CROSSWALK');
+            myGroupsPage.openinfopopup();
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'ANDROID_NOT_SUPPORTED');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'ANDROID_NOT_SUPPORTED_DESC');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'INSTALL_CROSSWALK');
+                done();
+            }, 0);
+        });
+
+        it('should delete popup', (done) => {
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: true } }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'ANDROID_NOT_SUPPORTED');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'ANDROID_NOT_SUPPORTED_DESC');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'INSTALL_CROSSWALK');
+            myGroupsPage.openinfopopup();
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'ANDROID_NOT_SUPPORTED');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'ANDROID_NOT_SUPPORTED_DESC');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'INSTALL_CROSSWALK');
+                done();
+            }, 0);
+        });
+
+        it('should not delete popup', (done) => {
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: false } }))
+            } as any)));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'ANDROID_NOT_SUPPORTED');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'ANDROID_NOT_SUPPORTED_DESC');
+            mockCommonUtilService.translateMessage = jest.fn(() => 'INSTALL_CROSSWALK');
+            myGroupsPage.openinfopopup();
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'ANDROID_NOT_SUPPORTED');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'ANDROID_NOT_SUPPORTED_DESC');
+                expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3, 'INSTALL_CROSSWALK');
+                done();
+            }, 0);
+        });
+    });
+
+    describe('handleHeaderEvents', () => {
+        it('should return popup for groupInfo', () => {
+            const data = {
+                name: 'groupInfo'
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(myGroupsPage, 'openinfopopup').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            myGroupsPage.handleHeaderEvents(data);
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.INFORMATION_ICON_CLICKED, Environment.GROUP, PageId.MY_GROUP,
+                undefined, undefined, undefined, undefined, undefined
+            );
+            expect(data.name).toBe('groupInfo');
+        });
+        it('should return popup for groupInfo', () => {
+            const data = {
+                name: 'groupInfo'
+            };
+            jest.spyOn(myGroupsPage, 'openinfopopup').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            myGroupsPage.handleHeaderEvents(data);
+            expect(data.name).toBe('groupInfo');
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.INFORMATION_ICON_CLICKED, Environment.GROUP, PageId.MY_GROUP,
+                undefined, undefined, undefined, undefined, undefined
+            );
+        });
+
+        it('should return back telemetry for back clicked', () => {
+            const data = {
+                name: 'back'
+            };
+            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+            mockLocation.back = jest.fn();
+            // act
+            myGroupsPage.handleHeaderEvents(data);
+            // assert
+            expect(data.name).toBe('back');
+            expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                PageId.MY_GROUP, Environment.GROUP, true
+            );
+        });
+    });
+
+    describe('fetchGroupList', () => {
+        it('should return groupList', (done) => {
+            myGroupsPage.groupListLoader = true;
+            mockGroupService.search = jest.fn(() => of([{ memberRole: GroupMemberRole.ADMIN }])) as any;
+            mockCommonUtilService.extractInitial = jest.fn(() => 'extract');
+            myGroupsPage.fetchGroupList();
+            setTimeout(() => {
+                expect(myGroupsPage.groupListLoader).toBeFalsy();
+                expect(mockGroupService.search).toHaveBeenCalled();
+                expect(mockCommonUtilService.extractInitial).toHaveBeenCalled();
+                expect(myGroupsPage.groupListLoader).toBeFalsy();
+                done();
+            }, 0);
+        });
+
+        it('should not return groupList', (done) => {
+            myGroupsPage.groupListLoader = true;
+            mockGroupService.search = jest.fn(() => throwError({ error: 'error' }));
+            myGroupsPage.fetchGroupList();
+            setTimeout(() => {
+                expect(myGroupsPage.groupListLoader).toBeFalsy();
+                expect(mockGroupService.search).toHaveBeenCalled();
+                expect(myGroupsPage.groupListLoader).toBeFalsy();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('ionViewWillEnter', () => {
+
+        let subscribeWithPriorityData;
+        beforeEach(() => {
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            mockHeaderService.headerEventEmitted$ = {
+                subscribe: jest.fn((fn) => fn({ name: 'sample-event' }))
+            } as any;
+            jest.spyOn(myGroupsPage, 'handleHeaderEvents').mockImplementation(() => {
+                return;
+            });
+            jest.spyOn(myGroupsPage, 'fetchGroupList').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            subscribeWithPriorityData = jest.fn((_, fn) => fn());
+            mockPlatform.backButton = {
+                subscribeWithPriority: subscribeWithPriorityData
+            } as any;
+            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+            mockLocation.back = jest.fn();
+        });
+        it('should open openinfopopup by invoked ionViewWillEnter', (done) => {
+            // arrange
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+            mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('sample-uid'));
+            mockPreferences.getBoolean = jest.fn(() => of(false));
+            jest.spyOn(myGroupsPage, 'openinfopopup').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            mockPreferences.putBoolean = jest.fn(() => of(true));
+            // act
+            myGroupsPage.ionViewWillEnter();
+            // assert
+            expect(myGroupsPage.isGuestUser).toBeFalsy();
+            expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+            setTimeout(() => {
+                expect(subscribeWithPriorityData).toBeTruthy();
+                expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+                expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+                expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                    PageId.MY_GROUP,
+                    Environment.GROUP,
+                    false);
+                expect(mockLocation.back).toHaveBeenCalled();
+                expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
+                expect(myGroupsPage.userId).toBe('sample-uid');
+                expect(mockPreferences.getBoolean).toHaveBeenCalledWith(PreferenceKey.CREATE_GROUP_INFO_POPUP);
+                done();
+            }, 0);
+        });
+        it('should not open openinfopopup by invoked ionViewWillEnter', (done) => {
+            // arrange
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+            mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('sample-uid'));
+            mockPreferences.getBoolean = jest.fn(() => of(true));
+            // act
+            myGroupsPage.ionViewWillEnter();
+            // assert
+            expect(myGroupsPage.isGuestUser).toBeTruthy();
+            expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+            setTimeout(() => {
+                expect(subscribeWithPriorityData).toBeTruthy();
+                expect(mockHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+                expect(mockHeaderService.headerEventEmitted$).not.toBeUndefined();
+                expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                    PageId.MY_GROUP,
+                    Environment.GROUP,
+                    false);
+                expect(mockLocation.back).toHaveBeenCalled();
+                expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
+                expect(myGroupsPage.userId).toBe('sample-uid');
+                expect(mockPreferences.getBoolean).toHaveBeenCalledWith(PreferenceKey.CREATE_GROUP_INFO_POPUP);
+                done();
+            }, 0);
+        });
+    });
+
+    describe('ionViewDidEnter', () => {
+        it('should invoked fetchGroupList', (done) => {
+
+            mockSbProgressLoader.hide = jest.fn(() => Promise.resolve());
+            myGroupsPage.isGuestUser = false;
+            jest.spyOn(myGroupsPage, 'fetchGroupList').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            // act
+            myGroupsPage.ionViewDidEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockSbProgressLoader.hide).toHaveBeenCalled();
+                expect(myGroupsPage.isGuestUser).toBeFalsy();
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    ImpressionType.VIEW,
+                    '',
+                    PageId.MY_GROUP,
+                    Environment.GROUP
+                );
+                done();
+            }, 0);
+        });
+
+        it('should return only impression event for else pare', (done) => {
+            mockSbProgressLoader.hide = jest.fn(() => Promise.resolve());
+            myGroupsPage.isGuestUser = true;
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            // act
+            myGroupsPage.ionViewDidEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockSbProgressLoader.hide).toHaveBeenCalled();
+                expect(myGroupsPage.isGuestUser).toBeTruthy();
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    ImpressionType.VIEW,
+                    '',
+                    PageId.MY_GROUP,
+                    Environment.GROUP
+                );
+                done();
+            }, 0);
+        });
+    });
+
+    describe('ionViewWillLeave', () => {
+        it('should unsubscribe headerService', () => {
+            myGroupsPage.headerObservable = {
+                unsubscribe: jest.fn()
+            };
+            myGroupsPage.ionViewWillLeave();
+            expect(myGroupsPage.headerObservable).toBeTruthy();
+        });
+
+        it('should unsubscribe headerService', () => {
+            myGroupsPage.headerObservable = undefined;
+            myGroupsPage.ionViewWillLeave();
+            expect(myGroupsPage.headerObservable).toBeUndefined();
+        });
+
+        it('should unsubscribe unregisterBackButton', () => {
+            myGroupsPage.unregisterBackButton = { unsubscribe: jest.fn() } as any;
+            myGroupsPage.ionViewWillLeave();
+            expect(myGroupsPage.unregisterBackButton).toBeDefined();
+        });
+    });
+
+    describe('ngOnDestroy', () => {
+        it('should unsubscribe headerService', () => {
+            myGroupsPage.headerObservable = {
+                unsubscribe: jest.fn()
+            };
+            myGroupsPage.ngOnDestroy();
+            expect(myGroupsPage.headerObservable).toBeTruthy();
+        });
+
+        it('should unsubscribe headerService', () => {
+            myGroupsPage.headerObservable = undefined;
+            myGroupsPage.ngOnDestroy();
+            expect(myGroupsPage.headerObservable).toBeUndefined();
+        });
+
+        it('should unsubscribe unregisterBackButton', () => {
+            myGroupsPage.unregisterBackButton = { unsubscribe: jest.fn() } as any;
+            myGroupsPage.ngOnDestroy();
+            expect(myGroupsPage.unregisterBackButton).toBeDefined();
+        });
+    });
+
+    it('should navigate to CREATE_EDIT_GROUP', () => {
+        mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        myGroupsPage.createClassroom();
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.SELECT_CREATE_GROUP,
+            InteractSubtype.CREATE_GROUP_CLICKED,
+            Environment.GROUP,
+            PageId.MY_GROUP,
+            undefined, undefined, undefined, undefined, InteractType.SELECT_CREATE_GROUP
+        );
+        expect(mockRouter.navigate).toHaveBeenCalledWith([`/${RouterLinks.MY_GROUPS}/${RouterLinks.CREATE_EDIT_GROUP}`]);
+    });
+
+    it('should return loggedIn user', () => {
+        mockLoginHandlerService.signIn = jest.fn(() => Promise.resolve());
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        myGroupsPage.login();
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH,
+            InteractSubtype.LOGIN_CLICKED,
+            Environment.GROUP,
+            PageId.MY_GROUP,
+            undefined, undefined, undefined, undefined, undefined
+        );
+        expect(mockLoginHandlerService.signIn).toHaveBeenCalledWith(
+            { skipRootNavigation: true, redirectUrlAfterLogin: RouterLinks.MY_GROUPS }
+        );
+    });
+
+    it('should navigate To GroupdetailsPage', () => {
+        // arrange
+        const data = {
+            data: {
+                id: 'sample-id',
+                visited: true
+            }
+        };
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+
+        // act
+        myGroupsPage.navigateToGroupdetailsPage(data);
+
+        // assert
+        expect(mockRouter.navigate).toHaveBeenCalledWith([`/${RouterLinks.MY_GROUPS}/${RouterLinks.MY_GROUP_DETAILS}`],
+            { state: { groupId: data.data.id } });
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.SELECT_GROUP, InteractSubtype.GROUP_CLICKED, Environment.GROUP, PageId.MY_GROUP,
+                { id: 'sample-id', type: 'Group', version: undefined }, undefined, undefined, undefined,
+                InteractType.SELECT_GROUP
+            );
+    });
+
+    it('should open groupguidelines popup', () => {
+        // arrange
+        const data = {
+            data: {
+                id: 'sample-id',
+                visited: false
+            }
+        };
+        jest.spyOn(myGroupsPage, 'openAcceptGuidelinesPopup').mockImplementation();
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+
+        // act
+        myGroupsPage.navigateToGroupdetailsPage(data);
+
+        // assert
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.SELECT_GROUP, InteractSubtype.GROUP_CLICKED, Environment.GROUP, PageId.MY_GROUP,
+            { id: 'sample-id', type: 'Group', version: undefined }, undefined, undefined, undefined,
+            InteractType.SELECT_GROUP
+        );
+        expect(myGroupsPage.openAcceptGuidelinesPopup).toHaveBeenCalled();
+    });
+
+    describe('goback', () => {
+        it('should go to tabs page', () => {
+            // arrange
+            myGroupsPage.fromRegistrationFlow = true;
+            // act
+            myGroupsPage.goback();
+            // assert
+            expect(mockRouter.navigate).toHaveBeenCalledWith(
+                [RouterLinks.TABS]
+            );
+        });
+        it('should go to previous page', () => {
+            // arrange
+            myGroupsPage.fromRegistrationFlow = false;
+            // act
+            myGroupsPage.goback();
+            // assert
+            expect(mockLocation.back).toHaveBeenCalled();
+        });
+    });
+
+    describe('checkIfUserAcceptedGuidelines', () => {
+        it('should open openAcceptGuidelinesPopup if grouplist is empty', () => {
+            // arrange
+            myGroupsPage.groupList = ['group1'] as any;
+            myGroupsPage.userId = 'sampleuserid';
+            const profile = {
+                allTncAccepted: {
+                    groupsTnc: {
+                        version: '3.4.0'
+                    }
+                }
+            };
+            const systemSetings = {
+                value: JSON.stringify({
+                    latestversion: '3.4.0'
+                })
+            };
+            mockProfileService.getServerProfilesDetails = jest.fn(() => of(profile) as any);
+            jest.spyOn(myGroupsPage, 'openAcceptGuidelinesPopup').mockImplementation();
+            mockSystemSettingService.getSystemSettings = jest.fn(() => of(systemSetings)) as any;
+            // act
+            myGroupsPage.checkIfUserAcceptedGuidelines();
+            // assert
+            setTimeout(() => {
+                expect(myGroupsPage.openAcceptGuidelinesPopup).toHaveBeenCalled();
+            });
+        });
+
+        it('should directly call  updateGroupTnc if grouplist is empty', () => {
+            // arrange
+            myGroupsPage.groupList = [];
+            myGroupsPage.userId = 'sampleuserid';
+            const profile = {
+                allTncAccepted: {
+                    groupsTnc: {
+                        version: '3.4.0'
+                    }
+                }
+            };
+            const systemSetings = {
+                value: JSON.stringify({
+                    latestversion: '3.4.0'
+                })
+            };
+            mockProfileService.acceptTermsAndConditions = jest.fn(() => of(true) as any);
+            mockProfileService.getServerProfilesDetails = jest.fn(() => of(profile) as any);
+            mockSystemSettingService.getSystemSettings = jest.fn(() => of(systemSetings)) as any;
+            // act
+            myGroupsPage.checkIfUserAcceptedGuidelines();
+            // assert
+            setTimeout(() => {
+                expect(mockProfileService.acceptTermsAndConditions).toHaveBeenCalled();
+            });
+        });
+
+        it('should directly call updateGroupTnc with userid when profile is managed', () => {
+            // arrange
+            myGroupsPage.groupList = [];
+            myGroupsPage.userId = 'sampleuserid';
+            const profile = {
+                allTncAccepted: {
+                    groupsTnc: {
+                        version: '3.4.0'
+                    }
+                },
+                managedBy: 'some_uid'
+            };
+            const systemSetings = {
+                value: JSON.stringify({
+                    latestversion: '3.4.0'
+                })
+            };
+            mockProfileService.getActiveProfileSession = jest.fn(() => of({uid: 'root_uid'} as any))
+            mockProfileService.acceptTermsAndConditions = jest.fn(() => of(true) as any);
+            mockProfileService.getServerProfilesDetails = jest.fn(() => of(profile) as any);
+            mockSystemSettingService.getSystemSettings = jest.fn(() => of(systemSetings)) as any;
+            // act
+            myGroupsPage.checkIfUserAcceptedGuidelines();
+            // assert
+            setTimeout(() => {
+                expect(mockProfileService.acceptTermsAndConditions).toHaveBeenCalledWith(
+                    {
+                        userId: 'root_uid'
+                    }
+                );
+            });
+        });
+    });
+});
diff --git a/src/app/my-groups/my-groups.page.ts b/src/app/my-groups/my-groups.page.ts
new file mode 100644
index 000000000..9e04b4273
--- /dev/null
+++ b/src/app/my-groups/my-groups.page.ts
@@ -0,0 +1,395 @@
+import { Component, OnInit, Inject, OnDestroy } from '@angular/core';
+import { Router, NavigationExtras } from '@angular/router';
+import { AppHeaderService } from '@app/services/app-header.service';
+import {
+  RouterLinks, PreferenceKey,
+  SystemSettingsIds, ProfileConstants
+} from '../app.constant';
+import {
+  AuthService, SharedPreferences, GroupService, Group,
+  GroupSearchCriteria, CachedItemRequestSourceFrom, SortOrder,
+  ObjectType, TelemetryObject,
+  GroupUpdateMembersResponse,
+  SystemSettingsService,
+  GetSystemSettingsRequest,
+  SystemSettings,
+  ProfileService,
+  ServerProfileDetailsRequest,
+  AcceptTermsConditionRequest
+} from '@project-sunbird/sunbird-sdk';
+import { LoginHandlerService } from '@app/services/login-handler.service';
+import {
+  CommonUtilService,
+  AppGlobalService,
+  TelemetryGeneratorService,
+  ImpressionType,
+  PageId,
+  Environment, InteractType, InteractSubtype, ID, CorReleationDataType
+} from '@app/services';
+import { Platform, PopoverController } from '@ionic/angular';
+import { MyGroupsPopoverComponent } from '../components/popups/sb-my-groups-popover/sb-my-groups-popover.component';
+import { animationGrowInTopRight } from '../animations/animation-grow-in-top-right';
+import { animationShrinkOutTopRight } from '../animations/animation-shrink-out-top-right';
+import { SbProgressLoader } from '@app/services/sb-progress-loader.service';
+import { Subscription } from 'rxjs';
+import { Location } from '@angular/common';
+import { GroupGuideLinesPopoverComponent } from '../components/popups/group-guidelines-popup/group-guidelines-popup.component';
+import { CsGroupUpdateGroupGuidelinesRequest } from '@project-sunbird/client-services/services/group/interface';
+
+interface GroupData extends Group {
+  initial: string;
+}
+@Component({
+  selector: 'app-my-groups',
+  templateUrl: './my-groups.page.html',
+  styleUrls: ['./my-groups.page.scss'],
+})
+export class MyGroupsPage implements OnInit, OnDestroy {
+  isGuestUser: boolean;
+  groupList: GroupData[] = [];
+  themeColors: string[] = ['#FFDFC7', '#C2ECE6', '#FFE59B', '#DAD4FF', '#80CBC4', '#E6EE9C', '#FFE082'];
+  fontColor: string[] = ['#AD632D', '#149D88', '#8D6A00', '#635CDC', '#00695C', '#9E9D24', '#FF8F00'];
+  groupListLoader = false;
+  headerObservable: any;
+  userId: string;
+  unregisterBackButton: Subscription;
+  fromRegistrationFlow = false;
+  groupTncVersion: string;
+  isGroupTncAcceptenceChecked: boolean;
+  constructor(
+    @Inject('AUTH_SERVICE') public authService: AuthService,
+    @Inject('GROUP_SERVICE') public groupService: GroupService,
+    @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
+    @Inject('SYSTEM_SETTINGS_SERVICE') private systemSettingsService: SystemSettingsService,
+    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+    private appGlobalService: AppGlobalService,
+    private headerService: AppHeaderService,
+    private router: Router,
+    private loginHandlerService: LoginHandlerService,
+    private commonUtilService: CommonUtilService,
+    private popoverCtrl: PopoverController,
+    private sbProgressLoader: SbProgressLoader,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+    private platform: Platform,
+    private location: Location
+  ) {
+    if (this.router.getCurrentNavigation()) {
+      const extras = this.router.getCurrentNavigation().extras.state;
+      if (extras) {
+        this.fromRegistrationFlow = extras.fromRegistrationFlow;
+      }
+    }
+  }
+
+  async ngOnInit() {
+    this.isGroupTncAcceptenceChecked = false;
+  }
+
+  private checkUserLoggedIn() {
+    this.isGuestUser = !this.appGlobalService.isUserLoggedIn();
+  }
+
+  async ionViewWillEnter() {
+    this.checkUserLoggedIn();
+    if (!this.isGuestUser) {
+      this.groupListLoader = true;
+    }
+    this.handleBackButton();
+    this.headerService.showHeaderWithBackButton(['groupInfo']);
+    this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
+      this.handleHeaderEvents(eventName);
+    });
+    try {
+      this.userId = await this.appGlobalService.getActiveProfileUid();
+      const groupInfoScreen = await this.preferences.getBoolean(PreferenceKey.CREATE_GROUP_INFO_POPUP).toPromise();
+      if (!groupInfoScreen) {
+        this.openinfopopup();
+        this.preferences.putBoolean(PreferenceKey.CREATE_GROUP_INFO_POPUP, true).toPromise().then();
+      }
+    } catch (err) {
+    }
+    if (!this.isGuestUser) {
+      this.fetchGroupList();
+    }
+  }
+
+  async ionViewDidEnter() {
+    this.sbProgressLoader.hide({ id: 'login' });
+    this.telemetryGeneratorService.generateImpressionTelemetry(
+      ImpressionType.VIEW,
+      '',
+      PageId.MY_GROUP,
+      Environment.GROUP
+    );
+  }
+
+  ionViewWillLeave() {
+    if (this.headerObservable) {
+      this.headerObservable.unsubscribe();
+    }
+    if (this.unregisterBackButton) {
+      this.unregisterBackButton.unsubscribe();
+    }
+  }
+
+  ngOnDestroy() {
+    if (this.headerObservable) {
+      this.headerObservable.unsubscribe();
+    }
+    if (this.unregisterBackButton) {
+      this.unregisterBackButton.unsubscribe();
+    }
+  }
+
+  handleHeaderEvents($event) {
+    switch ($event.name) {
+      case 'groupInfo':
+        this.generateInteractTelemetry(InteractType.TOUCH, InteractSubtype.INFORMATION_ICON_CLICKED);
+        this.openinfopopup();
+        break;
+      case 'back':
+        this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.MY_GROUP, Environment.GROUP, true);
+        this.goback();
+        break;
+    }
+  }
+
+  private handleBackButton() {
+    this.unregisterBackButton = this.platform.backButton.subscribeWithPriority(10, () => {
+      this.telemetryGeneratorService.generateBackClickedTelemetry(
+        PageId.MY_GROUP,
+        Environment.GROUP,
+        false);
+      this.goback();
+    });
+  }
+
+  goback() {
+    if (this.fromRegistrationFlow) {
+      this.router.navigate([RouterLinks.TABS]);
+    } else {
+      this.location.back();
+    }
+  }
+
+  createClassroom() {
+    this.generateInteractTelemetry(InteractType.SELECT_CREATE_GROUP, InteractSubtype.CREATE_GROUP_CLICKED, undefined, ID.SELECT_CREATE_GROUP);
+    this.router.navigate([`/${RouterLinks.MY_GROUPS}/${RouterLinks.CREATE_EDIT_GROUP}`]);
+  }
+
+  login() {
+    this.generateInteractTelemetry(InteractType.TOUCH, InteractSubtype.LOGIN_CLICKED);
+    this.loginHandlerService.signIn({ skipRootNavigation: true, redirectUrlAfterLogin: RouterLinks.MY_GROUPS });
+  }
+
+  async fetchGroupList() {
+    this.groupListLoader = true;
+    try {
+      const groupSearchCriteria: GroupSearchCriteria = {
+        from: CachedItemRequestSourceFrom.SERVER,
+        request: {
+          filters: {
+            userId: this.userId
+          },
+          sort_by: { name: SortOrder.ASC }
+        }
+      };
+      this.groupList = (await this.groupService.search(groupSearchCriteria).toPromise())
+        .map<GroupData>((group, index) => {
+          return {
+            ...group,
+            initial: this.commonUtilService.extractInitial(group.name),
+            cardBgColor: this.themeColors[index % this.themeColors.length],
+            cardTitleColor: this.fontColor[index % this.fontColor.length]
+          };
+        });
+      this.groupListLoader = false;
+      if (!this.isGroupTncAcceptenceChecked) {
+        this.checkIfUserAcceptedGuidelines();
+      }
+    } catch (e) {
+      console.error(e);
+      this.groupListLoader = false;
+    }
+  }
+
+  navigateToGroupdetailsPage(event) {
+    const telemetryObject = new TelemetryObject(event.data.id, ObjectType.GROUP, undefined);
+    this.telemetryGeneratorService.generateInteractTelemetry(InteractType.SELECT_GROUP,
+      InteractSubtype.GROUP_CLICKED, Environment.GROUP, PageId.MY_GROUP, telemetryObject, undefined, undefined, undefined,
+      ID.SELECT_GROUP);
+    const navigationExtras: NavigationExtras = {
+      state: {
+        groupId: event.data.id
+      }
+    };
+    if (event.data && event.data.hasOwnProperty('visited') && event.data.visited === false) {
+      this.openAcceptGuidelinesPopup(false, navigationExtras);
+    } else {
+      this.router.navigate([`/${RouterLinks.MY_GROUPS}/${RouterLinks.MY_GROUP_DETAILS}`], navigationExtras);
+    }
+  }
+
+  async openinfopopup() {
+    const popover = await this.popoverCtrl.create({
+      component: MyGroupsPopoverComponent,
+      componentProps: {
+        title: this.commonUtilService.translateMessage('ANDROID_NOT_SUPPORTED'),
+        body: this.commonUtilService.translateMessage('ANDROID_NOT_SUPPORTED_DESC'),
+        buttonText: this.commonUtilService.translateMessage('INSTALL_CROSSWALK')
+      },
+      cssClass: 'popover-my-groups',
+      enterAnimation: animationGrowInTopRight,
+      leaveAnimation: animationShrinkOutTopRight,
+      backdropDismiss: false,
+      showBackdrop: true
+    });
+    await popover.present();
+    const { data } = await popover.onDidDismiss();
+    if (data === undefined) { // Backdrop clicked
+    } else if (data.closeDeletePopOver) { // Close clicked
+    } else if (data.canDelete) {
+    }
+  }
+
+  async openAcceptGuidelinesPopup(shouldUpdateUserLevelGroupTnc, navigationExtras?, event?) {
+    const confirm = await this.popoverCtrl.create({
+      component: GroupGuideLinesPopoverComponent,
+      componentProps: {
+        icon: null,
+        shouldUpdateUserLevelGroupTnc
+      },
+      cssClass: 'sb-popover info',
+      backdropDismiss: !shouldUpdateUserLevelGroupTnc
+    });
+    await confirm.present();
+    const { data } = await confirm.onDidDismiss();
+    if (data == null) {
+      return;
+    }
+    if (data && data.isLeftButtonClicked) {
+      let corRelationList = [];
+      if (navigationExtras) {
+        corRelationList = [{ id: navigationExtras.state.groupId, type: CorReleationDataType.GROUP_ID }];
+      }
+      if (!shouldUpdateUserLevelGroupTnc) {
+        const request: CsGroupUpdateGroupGuidelinesRequest = {
+          userId: this.userId,
+          groups: [{
+            groupId: navigationExtras.state.groupId,
+            visited: true
+          }]
+        };
+        this.generateInteractTelemetry(InteractType.INITIATED, '', corRelationList, ID.ACCEPT_GROUP_GUIDELINES);
+
+        try {
+          const updateMemberResponse: GroupUpdateMembersResponse = await this.groupService.updateGroupGuidelines(request).toPromise();
+          if (updateMemberResponse.error) {
+            this.commonUtilService.showToast('SOMETHING_WENT_WRONG');
+          } else {
+            this.generateInteractTelemetry(InteractType.SUCCESS, '', corRelationList, ID.ACCEPT_GROUP_GUIDELINES);
+          }
+          this.router.navigate([`/${RouterLinks.MY_GROUPS}/${RouterLinks.MY_GROUP_DETAILS}`], navigationExtras);
+          // Incase of close button click data.isLeftButtonClicked = null so we have put the false condition check
+        } catch (err) {
+          this.commonUtilService.showToast('SOMETHING_WENT_WRONG');
+        }
+      } else {
+        this.updateGroupTnc(this.groupTncVersion);
+      }
+    }
+  }
+
+  checkIfUserAcceptedGuidelines() {
+    const getSystemSettingsRequest: GetSystemSettingsRequest = {
+      id: SystemSettingsIds.GROUPS_TNC
+    };
+    this.systemSettingsService.getSystemSettings(getSystemSettingsRequest).toPromise()
+      .then((res: SystemSettings) => {
+        if (res && res.value) {
+          const value = JSON.parse(res.value);
+          this.groupTncVersion = value.latestVersion;
+          const req: ServerProfileDetailsRequest = {
+            userId: this.userId,
+            requiredFields: ProfileConstants.REQUIRED_FIELDS,
+            from: CachedItemRequestSourceFrom.SERVER
+          };
+          this.profileService.getServerProfilesDetails(req).toPromise()
+            .then((profileDetails) => {
+              if (profileDetails.allTncAccepted
+                && profileDetails.allTncAccepted.groupsTnc
+                && profileDetails.allTncAccepted.groupsTnc.version) {
+                if (profileDetails.allTncAccepted.groupsTnc.version !== this.groupTncVersion) {
+                  if (this.groupList.length) {
+                    // this.updateGroupTnc(this.groupTncVersion);
+                    this.openAcceptGuidelinesPopup(true);
+                  } else {
+                    this.updateGroupTnc(this.groupTncVersion, profileDetails.managedBy);
+                  }
+                }
+              } else {
+                if (this.groupList.length) {
+                  this.openAcceptGuidelinesPopup(true);
+                } else {
+                  this.updateGroupTnc(this.groupTncVersion, profileDetails.managedBy);
+                }
+              }
+            });
+        }
+      }).catch(err => {
+        console.log('error :', err);
+      });
+  }
+
+  private async updateGroupTnc(latestVersion, managedBy?) {
+    this.isGroupTncAcceptenceChecked = true;
+    try {
+      const acceptTermsAndConditionsRequest: AcceptTermsConditionRequest = {
+        version: latestVersion,
+        tncType: 'groupsTnc'
+      };
+      if (managedBy) {
+        const userId = (await this.profileService.getActiveProfileSession().toPromise()).uid;
+        acceptTermsAndConditionsRequest.userId = userId;
+      }
+      const isTCAccepted = await this.profileService.acceptTermsAndConditions(acceptTermsAndConditionsRequest).toPromise();
+    } catch (err) {
+      console.error('acceptTermsAndConditions err', err);
+    }
+    if (this.groupList.length) {
+      this.generateInteractTelemetry(InteractType.INITIATED, '', [] , ID.ACCEPT_GROUP_GUIDELINES);
+      try {
+        const groupsData = [];
+        this.groupList.forEach((g) => {
+          const gdata = {
+            groupId: g.id,
+            visited: true
+          };
+          groupsData.push(gdata);
+        });
+        const request: CsGroupUpdateGroupGuidelinesRequest = {
+          userId: this.userId,
+          groups: groupsData
+        };
+        const groupsUpdateResponse = await this.groupService.updateGroupGuidelines(request).toPromise();
+        this.generateInteractTelemetry(InteractType.SUCCESS, '', ID.ACCEPT_GROUP_GUIDELINES);
+        this.fetchGroupList();
+      } catch (err) {
+        console.log('groupsUpdateResponse err', err);
+      }
+    }
+  }
+  private generateInteractTelemetry(interactType, interactSubType, correlationList?, id?) {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      interactType,
+      interactSubType,
+      Environment.GROUP,
+      PageId.MY_GROUP,
+      undefined,
+      undefined,
+      undefined,
+      correlationList,
+      id
+    );
+  }
+}
diff --git a/src/app/my-groups/view-more-activity/view-more-activity.page.html b/src/app/my-groups/view-more-activity/view-more-activity.page.html
new file mode 100644
index 000000000..266da05eb
--- /dev/null
+++ b/src/app/my-groups/view-more-activity/view-more-activity.page.html
@@ -0,0 +1,35 @@
+<ion-content class="activity-toc-container ion-no-padding">    
+    <div class="sb-textbook-container">
+      <div class="sb-textbook-items">
+        <div class="sb-textbook-title-container">
+          <span class="textbook-icon">
+            <ion-icon name="albums"></ion-icon>
+          </span>
+          <span class="textbook-title">
+            {{activityGroup.title | translate}}
+          </span>
+        </div>
+        <div class="sb-card-container sb-card-textbook-container">
+          <div *ngIf="activityGroup.title === 'ACTIVITY_COURSE_TITLE'">
+            <div class="sc-content" *ngFor="let activity of activityGroup.items; let i = index;">
+              <sb-course-card *ngIf="activity.type === 'Course' && activity.activityInfo" [section]="null"
+                [cardImg]="commonUtilService.getContentImg(activity.activityInfo)" [course]="activity.activityInfo"
+                (click)="onActivityCardClick($event, activity)" [isMenu]="isMenu"
+                (menuClick)="activityMenuClick($event, activity, i)">
+              </sb-course-card>
+            </div>
+          </div>
+          <div *ngIf="activityGroup.title !== 'ACTIVITY_COURSE_TITLE'">
+            <div class="sc-content" *ngFor="let activity of activityGroup.items; let i = index;">
+              <sb-library-card [content]="activity.activityInfo" [type]="'mobile_textbook'" (click)="onActivityCardClick($event, activity)"
+              [cardImg]="commonUtilService.getContentImg(activity.activityInfo)" [isMenu]="isMenu"
+              (menuClick)="activityMenuClick($event, activity, i)">
+              </sb-library-card>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+</ion-content>
+
+    
\ No newline at end of file
diff --git a/src/app/my-groups/view-more-activity/view-more-activity.page.scss b/src/app/my-groups/view-more-activity/view-more-activity.page.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/my-groups/view-more-activity/view-more-activity.page.ts b/src/app/my-groups/view-more-activity/view-more-activity.page.ts
new file mode 100644
index 000000000..3950407cc
--- /dev/null
+++ b/src/app/my-groups/view-more-activity/view-more-activity.page.ts
@@ -0,0 +1,126 @@
+import { GroupDetailsPageModule } from './../group-details/group-details.module';
+import { Location } from '@angular/common';
+import { AppHeaderService } from '../../../services/app-header.service';
+import { Component, ViewEncapsulation, OnInit, OnDestroy, Injectable } from '@angular/core';
+import { Platform} from '@ionic/angular';
+import { TelemetryGeneratorService, CommonUtilService } from '@app/services';
+import {
+    Environment,
+    ImpressionSubtype,
+    ImpressionType,
+    InteractSubtype,
+    InteractType,
+    PageId
+} from '@app/services/telemetry-constants';
+import { Router } from '@angular/router';
+import { Subscription } from 'rxjs';
+import { GroupActivity } from '@project-sunbird/sunbird-sdk';
+import { ActivitiesGrouped } from '@project-sunbird/client-services/models';
+
+@Injectable({ providedIn: GroupDetailsPageModule })
+export class ViewMoreActivityDelegateService {
+    delegate?: ViewMoreActivityActionsDelegate;
+}
+
+export interface ViewMoreActivityActionsDelegate {
+    onViewMoreCardClick(event: Event, activity: GroupActivity);
+    onViewMoreCardMenuClick(event: Event, activity: GroupActivity): Promise<boolean>;
+}
+
+@Component({
+    selector: 'view-more-activity',
+    templateUrl: 'view-more-activity.page.html',
+    styleUrls: ['./view-more-activity.page.scss'],
+    encapsulation: ViewEncapsulation.None,
+})
+export class ViewMoreActivityPage implements OnInit, OnDestroy {
+
+    unregisterBackButton: Subscription;
+    headerObservable: any;
+    activityGroup: ActivitiesGrouped;
+    groupId: string;
+    isMenu: boolean;
+    previousPageId?: string;
+
+    constructor(
+        public headerService: AppHeaderService,
+        public commonUtilService: CommonUtilService,
+        private router: Router,
+        private platform: Platform,
+        private telemetryGeneratorService: TelemetryGeneratorService,
+        private location: Location,
+        private viewMoreActivityDelegateService: ViewMoreActivityDelegateService
+    ) {
+        const extras = this.router.getCurrentNavigation().extras.state;
+        console.log('extras', extras);
+        if (extras) {
+            this.activityGroup = extras.activityGroup;
+            this.groupId = extras.groupId;
+            this.isMenu = extras.isMenu;
+            this.previousPageId = extras.previousPageId;
+        }
+    }
+
+    ngOnInit() {
+    }
+
+    ionViewWillEnter() {
+        this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
+            this.handleHeaderEvents(eventName);
+        });
+        this.headerService.showHeaderWithBackButton();
+        this.handleDeviceBackButton();
+        this.telemetryGeneratorService.generateImpressionTelemetry(
+            ImpressionType.VIEW,
+            '',
+            PageId.ADD_ACTIVITY_TO_GROUP,
+            Environment.GROUP
+        );
+    }
+
+    ionViewWillLeave() {
+        this.headerObservable.unsubscribe();
+        if (this.unregisterBackButton) {
+            this.unregisterBackButton.unsubscribe();
+        }
+    }
+
+    ngOnDestroy() {
+    }
+
+    handleBackButton(isNavBack: boolean) {
+        this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.ACTIVITY_TOC, Environment.GROUP, isNavBack);
+        this.location.back();
+    }
+
+    handleDeviceBackButton() {
+        this.unregisterBackButton = this.platform.backButton.subscribeWithPriority(10, () => {
+          this.handleBackButton(false);
+        });
+    }
+
+    handleHeaderEvents($event) {
+        switch ($event.name) {
+            case 'back':
+                this.handleBackButton(true);
+                break;
+        }
+    }
+
+    onActivityCardClick(event, activity: GroupActivity) {
+        if (this.viewMoreActivityDelegateService.delegate) {
+            this.viewMoreActivityDelegateService.delegate.onViewMoreCardClick(event, activity);
+        }
+    }
+
+    activityMenuClick(event, activity: GroupActivity, i) {
+        if (this.viewMoreActivityDelegateService.delegate) {
+            this.viewMoreActivityDelegateService.delegate.onViewMoreCardMenuClick(event, activity).then((isRemoved) => {
+                if (isRemoved) {
+                    this.activityGroup.items.splice(i, 1);
+                }
+            });
+        }
+    }
+
+}
diff --git a/src/app/notification/notification.page.html b/src/app/notification/notification.page.html
index f363d7f03..3ed37d92f 100644
--- a/src/app/notification/notification.page.html
+++ b/src/app/notification/notification.page.html
@@ -1,40 +1,42 @@
 <ion-content overflow-scroll="true">
+  <ng-container *ngIf="(notificationList$ | async) as notificationList">
   <!-- Shows Notification Count with Clear Button -->
-  <div class="sb-view-all-container" *ngIf="notificationList?.length">
-    <div class="sb-view-all-items">
-      <div class="sb-view-all-title">
-        <span class="page-heading">{{ 'NOTIFICATION' | translate }}</span>
-        <span class="clear-btn" (click)="clearAllNotifications()">{{'CLEAR' | translate}}</span>
-        <span class="page-info">{{'NEW_NOTIFICATIONS' | translate:{'%s': newNotificationCount} }}&lrm;</span>
+  <ng-container *ngIf="(unreadNotificationList$ | async) as unreadNotificationList">
+    <div class="sb-view-all-container">
+      <div class="sb-view-all-items">
+        <div class="sb-view-all-title">
+          <span class="page-heading">{{ 'NOTIFICATION' | translate }}</span>
+          <span class="clear-btn" *ngIf="notificationList.length" (click)="clearAllNotifications()">{{'CLEAR' | translate}}</span>
+          <span class="page-info">{{'NEW_NOTIFICATIONS' | translate:{'%s': unreadNotificationList?.length} }}&lrm;</span>
+        </div>
       </div>
-    </div>
-  </div>
+    </div> 
+  </ng-container>
 
   <!-- Shows various types of notifications with sliding delete buttons-->
-  <ion-list lines="none" *ngIf="notificationList?.length && commonUtilService?.networkInfo?.isNetworkAvailable">
-    <ion-item-sliding style="margin-bottom: 8px;" *ngFor="let item of notificationList;let index = index" #slidingItem>
-      <ion-item>
-        <app-notification-item (notificationClick)="updateNotificationCount($event);"
-          (generateNotification)="handleTelemetry($event)" [itemData]="item"></app-notification-item>
-      </ion-item>
-      <ion-item-options side="start">
-        <ion-button color="danger" class="delete-button" (click)="removeNotification(index, 'left')">
-          <img src="./assets/imgs/noun_delete.svg" alt="delete" />
-        </ion-button>
-      </ion-item-options>
-      <ion-item-options side="end">
-        <ion-button color="danger" class="delete-button" (click)="removeNotification(index, 'right')">
-          <img src="./assets/imgs/noun_delete.svg" alt="delete" />
-        </ion-button>
-      </ion-item-options>
-    </ion-item-sliding>
-  </ion-list>
-
-  <div class="oval-wrapper" *ngIf="!notificationList.length">
-    <div class="oval">
-      <img src="./assets/imgs/no_notification.svg" alt="delete" />
-    </div>
-    <h4>{{'MSG_NO_NEW_NOTIFICATION' | translate}}</h4>
-  </div>
-
+      <ion-list lines="none" *ngIf="notificationList.length">
+        <ion-item-sliding style="margin-bottom: 8px;" *ngFor="let item of notificationList" #slidingItem>
+          <ion-item>
+            <app-notification-item (generateNotification)="handleTelemetry($event)" [itemData]="item"></app-notification-item>
+          </ion-item>
+          <ion-item-options side="start">
+            <ion-button color="danger" class="delete-button-left" (click)="removeNotification(item, 'left')">
+              <img src="./assets/imgs/noun_delete.svg" alt="delete" />
+            </ion-button>
+          </ion-item-options>
+          <ion-item-options side="end">
+            <ion-button color="danger" class="delete-button-right" (click)="removeNotification(item, 'right')">
+              <img src="./assets/imgs/noun_delete.svg" alt="delete" />
+            </ion-button>
+          </ion-item-options>
+        </ion-item-sliding>
+      </ion-list>
+    
+      <div class="oval-wrapper" *ngIf="!notificationList.length">
+        <div class="oval">
+          <img src="./assets/imgs/no_notification.svg" alt="delete" />
+        </div>
+        <h4>{{'MSG_NO_NEW_NOTIFICATION' | translate}}</h4>
+      </div>
+    </ng-container>
 </ion-content>
\ No newline at end of file
diff --git a/src/app/notification/notification.page.scss b/src/app/notification/notification.page.scss
index 688a80c5f..dca78a314 100644
--- a/src/app/notification/notification.page.scss
+++ b/src/app/notification/notification.page.scss
@@ -1,5 +1,6 @@
 @import "src/assets/styles/base/_variables.scss";
 @import "src/assets/styles/_custom-mixins";
+@import "src/assets/styles/_variables.scss";
 :host {
   .clear-btn {
     @include rtl {
@@ -9,6 +10,7 @@
       float: right !important;
     }
     padding-top: 10px;
+    color: #e0005a
   }
   .sb-view-all-title {
     width: inherit;
@@ -17,10 +19,6 @@
     padding-bottom: 80px;
   }
 
-  ion-content {
-    --background: #d9e5f0;
-  }
-
   ion-list.list-md {
     margin-top: 0 !important;
     background: inherit;
@@ -62,7 +60,7 @@
     h4 {
       height: 22px;
       color: $gray-200;
-      font-family: "Noto Sans";
+      font-family: "Noto Sans", sans-serif;
       font-size: 16px;
       font-weight: bold;
       line-height: 22px;
@@ -73,8 +71,16 @@
       width: 80vw;
     }
   }
-  .delete-button {
-    height: 100%;
-    --border-radius: none;
+
+  .delete-button-left {
+    height: auto;
+    margin: 0 !important;
+    --border-radius: 0 0.5rem 0.5rem 0 !important;
+  }
+
+  .delete-button-right {
+    height: auto;
+    margin: 0 !important;
+    --border-radius: 0.5rem 0 0 0.5rem !important;
   }
 }
diff --git a/src/app/notification/notification.page.ts b/src/app/notification/notification.page.ts
index 2e9a784bc..7192d710c 100644
--- a/src/app/notification/notification.page.ts
+++ b/src/app/notification/notification.page.ts
@@ -1,8 +1,10 @@
+import { CorReleationDataType, ImpressionSubtype } from './../../services/telemetry-constants';
 import { Component, OnInit, Inject } from '@angular/core';
-import { Platform, Events } from '@ionic/angular';
+import { Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { Location } from '@angular/common';
-import { NotificationService, NotificationStatus } from 'sunbird-sdk';
-import { Subscription } from 'rxjs';
+import { NotificationService, Notification, CorrelationData } from 'sunbird-sdk';
+import { Observable, Subscription } from 'rxjs';
 
 import { AppHeaderService } from '@app/services/app-header.service';
 import { CommonUtilService } from '@app/services/common-util.service';
@@ -14,6 +16,7 @@ import {
   InteractSubtype,
   ImpressionType
 } from '@app/services/telemetry-constants';
+import { map, tap } from 'rxjs/operators';
 
 @Component({
   selector: 'app-notification',
@@ -22,29 +25,23 @@ import {
 })
 export class NotificationPage implements OnInit {
 
-  notificationList = [];
-  newNotificationCount = 0;
-  showClearNotificationButton: boolean;
+  notificationList$: Observable<Notification[]>;
+  unreadNotificationList$: Observable<Notification[]>;
   private unregisterBackButton: Subscription;
   private headerObservable: Subscription;
+  private loader?: any;
 
   constructor(
     @Inject('NOTIFICATION_SERVICE') private notificationService: NotificationService,
     private headerService: AppHeaderService,
-    public commonUtilService: CommonUtilService,
-    private events: Events,
-    public telemetryGeneratorService: TelemetryGeneratorService,
+    private telemetryGeneratorService: TelemetryGeneratorService,
     private platform: Platform,
-    private location: Location
+    private location: Location,
+    private commonUtilService: CommonUtilService,
 
   ) { }
 
   ionViewWillEnter() {
-    this.getNotifications();
-    this.events.subscribe('notification:received', () => {
-      this.getNotifications();
-    });
-
     this.unregisterBackButton = this.platform.backButton.subscribeWithPriority(10, () => {
       this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.NOTIFICATION, Environment.NOTIFICATION, false);
       this.location.back();
@@ -55,56 +52,55 @@ export class NotificationPage implements OnInit {
     });
   }
 
-
-  private getNotifications() {
-    this.notificationService.getAllNotifications({ notificationStatus: NotificationStatus.ALL }).subscribe((notificationList: any) => {
-      this.newNotificationCount = 0;
-      this.newNotificationCount = notificationList.filter(item => !item.isRead).length;
-      this.notificationList = notificationList;
-    });
-  }
-
-  ngOnInit() {
+  async ngOnInit() {
+    this.loader = await this.commonUtilService.getLoader();
+    this.notificationList$ = this.notificationService.notifications$.pipe(
+      tap(() => {
+        if (this.loader) {
+          this.loader.dismiss();
+          this.loader = undefined;
+        }
+      })
+    );
+    const corRelationList: Array<CorrelationData> = [];
+    this.unreadNotificationList$ = this.notificationList$.pipe(
+      map((notifications) => notifications.filter((n) => !n.isRead)),
+        tap((notifications) => {
+          corRelationList.push(
+              {id: notifications.length.toString(),
+                type: CorReleationDataType.NEW_NOTIFICATION});
+        })
+    );
     this.telemetryGeneratorService.generateImpressionTelemetry(
-      ImpressionType.VIEW, '',
+      ImpressionType.PAGE_LOADED,
+      ImpressionSubtype.HOME,
       PageId.NOTIFICATION,
-      Environment.NOTIFICATION, '', '', ''
+      Environment.HOME, '', '', '', undefined,
+      corRelationList
     );
   }
 
-  clearAllNotifications() {
-    this.notificationService.deleteNotification().subscribe((status) => {
-      this.notificationList = [];
-      this.newNotificationCount = 0;
-      this.events.publish('notification-status:update', { isUnreadNotifications: false });
-    });
-
+  async clearAllNotifications() {
+    if (!this.loader) {
+      this.loader = await this.commonUtilService.getLoader();
+      await this.loader.present();
+    }
+    this.notificationService.deleteAllNotifications().toPromise();
     const valuesMap = new Map();
     valuesMap['clearAllNotifications'] = true;
     this.generateClickInteractEvent(valuesMap, InteractSubtype.CLEAR_NOTIFICATIONS_CLICKED);
   }
 
-  removeNotification(index: number, swipeDirection: string) {
+  async removeNotification(notification: Notification, swipeDirection: string) {
+    if (!this.loader) {
+      this.loader = await this.commonUtilService.getLoader();
+      await this.loader.present();
+    }
     const valuesMap = new Map();
-    valuesMap['deleteNotificationId'] = this.notificationList[index].id;
+    valuesMap['deleteNotificationId'] = notification.id;
     valuesMap['swipeDirection'] = swipeDirection;
     this.generateClickInteractEvent(valuesMap, InteractSubtype.CLEAR_NOTIFICATIONS_CLICKED);
-
-    this.notificationService.deleteNotification(this.notificationList[index].id).subscribe((status) => {
-      if (!this.notificationList[index].isRead) {
-        this.updateNotificationCount();
-      }
-      this.notificationList.splice(index, 1);
-    });
-  }
-
-  updateNotificationCount(event?) {
-    if (this.newNotificationCount > 0) {
-      if (this.newNotificationCount === 1) {
-        this.events.publish('notification-status:update', { isUnreadNotifications: false });
-      }
-      this.newNotificationCount--;
-    }
+    this.notificationService.deleteNotification(notification).toPromise();
   }
 
   handleTelemetry(event) {
@@ -123,8 +119,12 @@ export class NotificationPage implements OnInit {
   }
 
   ionViewWillLeave() {
-    this.unregisterBackButton && this.unregisterBackButton.unsubscribe();
-    this.headerObservable && this.headerObservable.unsubscribe();
+    if (this.unregisterBackButton) {
+      this.unregisterBackButton.unsubscribe();
+    }
+    if (this.headerObservable) {
+      this.headerObservable.unsubscribe();
+    }
   }
 
   private handleHeaderEvents(event) {
diff --git a/src/app/page-filter/page-filter-options/page-filter-options.page.html b/src/app/page-filter/page-filter-options/page-filter-options.page.html
index 646c3c971..4affc4014 100644
--- a/src/app/page-filter/page-filter-options/page-filter-options.page.html
+++ b/src/app/page-filter/page-filter-options/page-filter-options.page.html
@@ -9,7 +9,7 @@
       <ion-row *ngIf="facets?.values && facets?.values?.length">
         <ion-col size="6" *ngFor="let facetValue of facets?.values; let index=index">
           <ion-item no-lines class="ion-no-padding">
-            <ion-label text-capitalize>{{ facetValue }}</ion-label>
+            <ion-label class="ion-text-capitalize">{{ facetValue }}</ion-label>
             <ion-checkbox [checked]="isSelected(facetValue)" (ionChange)="changeValue(facetValue, index)">
             </ion-checkbox>
           </ion-item>
@@ -20,7 +20,7 @@
       <ion-row *ngIf="facets?.values && facets?.values?.length">
         <ion-col size="12" *ngFor="let facetValue of facets?.values; let index=index">
           <ion-item no-lines class="ion-no-padding">
-            <ion-label text-capitalize>{{ facetValue }}</ion-label>
+            <ion-label class="ion-text-capitalize">{{ facetValue }}</ion-label>
             <ion-checkbox [checked]="isSelected(facetValue)" (ionChange)="changeValue(facetValue, index)">
             </ion-checkbox>
           </ion-item>
@@ -31,7 +31,7 @@
       <ion-row *ngIf="facets?.values && facets?.values?.length">
         <ion-col size="6" *ngFor="let facetValue of facets?.values; let index=index">
           <ion-item no-lines class="ion-no-padding">
-            <ion-label text-capitalize>{{ facetValue.orgName }}</ion-label>
+            <ion-label class="ion-text-capitalize">{{ facetValue.orgName }}</ion-label>
             <ion-checkbox [checked]="isSelected(facetValue.hashTagId)"
               (ionChange)="changeValue(facetValue.hashTagId, index)"></ion-checkbox>
           </ion-item>
diff --git a/src/app/page-filter/page-filter-options/page-filter-options.page.ts b/src/app/page-filter/page-filter-options/page-filter-options.page.ts
index ba7ccfea4..bf6c9d37d 100644
--- a/src/app/page-filter/page-filter-options/page-filter-options.page.ts
+++ b/src/app/page-filter/page-filter-options/page-filter-options.page.ts
@@ -51,7 +51,6 @@ export class PageFilterOptionsPage {
 
   handleDeviceBackButton() {
     this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10 , () => {
-      // migration-TODO
       this.viewCtrl.dismiss();
       this.backButtonFunc.unsubscribe();
     });
@@ -93,9 +92,8 @@ export class PageFilterOptionsPage {
   }
 
   confirm() {
-      // migration-TODO
     this.viewCtrl.dismiss();
-    if(this.backButtonFunc) {
+    if (this.backButtonFunc) {
       this.backButtonFunc.unsubscribe();
     }
   }
@@ -145,9 +143,9 @@ export class PageFilterOptionsPage {
 
   cancel() {
     this.facets.selected = [...this.prevSelectedTopic];
-      // migration-TODO
     this.viewCtrl.dismiss();
   }
+
   apply() {
     this.prevSelectedTopic = [...this.facets.selected];
     this.confirm();
diff --git a/src/app/page-filter/page-filter-options/page-filter-options.spec.data.ts b/src/app/page-filter/page-filter-options/page-filter-options.spec.data.ts
new file mode 100644
index 000000000..867e68577
--- /dev/null
+++ b/src/app/page-filter/page-filter-options/page-filter-options.spec.data.ts
@@ -0,0 +1,117 @@
+export const mockFacets = {
+    name: 'Topic',
+    translations: '{\"en\":\"Topic\"}',
+    code: 'topic',
+    frameworkCategory: true,
+    index: 1,
+    selected: ['topic1'],
+    values: [{
+        identifier: 'tpd_medium_assamese',
+        code: 'assamese',
+        translations: null,
+        name: 'Assamese',
+        description: 'Assamese',
+        index: 0,
+        category: 'topic',
+        status: 'Live'
+    }]
+};
+
+
+export const mockFacetsContetType = {
+    name: 'ContnetType',
+    translations: '{\"en\":\"Topic\"}',
+    code: 'contentType',
+    frameworkCategory: true,
+    index: 1,
+    selected: ['WorkSheet'],
+    selectedValuesIndices: [0],
+    values: [{
+        identifier: 'tpd_medium_assamese',
+        code: 'assamese',
+        translations: null,
+        name: 'Assamese',
+        description: 'Assamese',
+        index: 0,
+        category: 'topic',
+        status: 'Live'
+    }]
+};
+
+export const mockFacetsBoard = {
+    name: 'Board',
+    translations: '{\"en\":\"Topic\"}',
+    code: 'board',
+    frameworkCategory: true,
+    index: 1,
+    selectedValuesIndices: [0],
+    values: [{
+        identifier: 'tpd_medium_assamese',
+        code: 'assamese',
+        translations: null,
+        name: 'Assamese',
+        description: 'Assamese',
+        index: 0,
+        category: 'topic',
+        status: 'Live'
+    }]
+};
+
+export const mockFacetsBoardNew = {
+    name: 'Board',
+    translations: '{\"en\":\"Topic\"}',
+    code: 'board',
+    frameworkCategory: true,
+    index: 1,
+    selected: ['AP'],
+    selectedValuesIndices: [0],
+    values: [{
+        identifier: 'tpd_medium_assamese',
+        code: 'assamese',
+        translations: null,
+        name: 'Assamese',
+        description: 'Assamese',
+        index: 0,
+        category: 'topic',
+        status: 'Live'
+    }]
+};
+
+export const mockFacetsMedium = {
+    name: 'Medium',
+    translations: '{\"en\":\"Topic\"}',
+    code: 'medium',
+    frameworkCategory: true,
+    index: 1,
+    selected: ['English'],
+    selectedValuesIndices: [0],
+    values: [{
+        identifier: 'tpd_medium_assamese',
+        code: 'assamese',
+        translations: null,
+        name: 'Assamese',
+        description: 'Assamese',
+        index: 0,
+        category: 'topic',
+        status: 'Live'
+    }]
+};
+
+export const mockFacetsContentTypeWith = {
+    name: 'ContentType',
+    translations: '{\"en\":\"Topic\"}',
+    code: 'contentType',
+    frameworkCategory: true,
+    index: 1,
+    selectedValuesIndices: [0],
+    values: [{
+        identifier: 'tpd_medium_assamese',
+        code: 'assamese',
+        translations: null,
+        name: 'Assamese',
+        description: 'Assamese',
+        index: 0,
+        category: 'topic',
+        status: 'Live'
+    }]
+};
diff --git a/src/app/page-filter/page-filter-options/page-filter-options.spec.ts b/src/app/page-filter/page-filter-options/page-filter-options.spec.ts
new file mode 100644
index 000000000..12b8ccb8b
--- /dev/null
+++ b/src/app/page-filter/page-filter-options/page-filter-options.spec.ts
@@ -0,0 +1,337 @@
+import { PageFilterOptionsPage } from '../page-filter-options/page-filter-options.page';
+import {
+    AppGlobalService,
+} from '../../../services';
+import { PopoverController, NavParams, Platform } from '@ionic/angular';
+import {
+    mockFacets,
+    mockFacetsContetType,
+    mockFacetsBoard,
+    mockFacetsContentTypeWith,
+    mockFacetsBoardNew
+} from './page-filter-options.spec.data';
+
+describe('PageFilterOptionsPage', () => {
+    let pageFilterOptionsPage: PageFilterOptionsPage;
+
+    const mockPopOverController: Partial<PopoverController> = {
+        dismiss: jest.fn(),
+        create: jest.fn()
+    };
+
+    const mockNavParams: Partial<NavParams> = {
+        get: jest.fn((arg) => {
+            let value;
+            switch (arg) {
+                case 'facets':
+                    value = mockFacetsBoard;
+                    break;
+            }
+            return value;
+        })
+    };
+
+    const mockPlatform: Partial<Platform> = {
+    };
+
+    mockPlatform.backButton = {
+        subscribeWithPriority: jest.fn((_, fn) => {
+            return { unsubscribe: jest.fn() };
+        }),
+    } as any;
+
+
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        isUserLoggedIn: jest.fn(() => false)
+    };
+
+    beforeAll(() => {
+        pageFilterOptionsPage = new PageFilterOptionsPage(
+            mockNavParams as NavParams,
+            mockPopOverController as PopoverController,
+            mockAppGlobalService as AppGlobalService,
+            mockPlatform as Platform
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should be create a instance of PageFilterOptionsPage', () => {
+        expect(pageFilterOptionsPage).toBeTruthy();
+    });
+
+    describe('changeValue()', () => {
+        it('should populate selectedValuesIndices', () => {
+            // arrange
+            pageFilterOptionsPage.facets = mockFacetsBoardNew;
+            // act
+            pageFilterOptionsPage.changeValue('AP', 1);
+            // assert
+            expect(pageFilterOptionsPage.facets.selectedValuesIndices).toEqual([0]);
+        });
+
+    });
+
+});
+
+describe('PageFilterOptionsPage', () => {
+    let pageFilterOptionsPage: PageFilterOptionsPage;
+
+    const mockPopOverController: Partial<PopoverController> = {
+        dismiss: jest.fn(),
+        create: jest.fn()
+    };
+
+    const mockNavParams: Partial<NavParams> = {
+        get: jest.fn((arg) => {
+            let value;
+            switch (arg) {
+                case 'facets':
+                    value = mockFacets;
+                    break;
+            }
+            return value;
+        })
+    };
+
+    const mockPlatform: Partial<Platform> = {
+    };
+
+    mockPlatform.backButton = {
+        subscribeWithPriority: jest.fn((_, fn) => {
+            return { unsubscribe: jest.fn() };
+        }),
+    } as any;
+
+
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        isUserLoggedIn: jest.fn(() => false)
+    };
+
+    beforeAll(() => {
+        pageFilterOptionsPage = new PageFilterOptionsPage(
+            mockNavParams as NavParams,
+            mockPopOverController as PopoverController,
+            mockAppGlobalService as AppGlobalService,
+            mockPlatform as Platform
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should be create a instance of PageFilterOptionsPage', () => {
+        expect(pageFilterOptionsPage).toBeTruthy();
+    });
+
+    describe('isSelected()', () => {
+        it('should return false', () => {
+            // arrange
+            pageFilterOptionsPage.facets = {};
+            // act n assert
+            expect(pageFilterOptionsPage.isSelected('topic1')).toBeFalsy();
+        });
+
+        it('should return proper result', () => {
+            // arrange
+            pageFilterOptionsPage.facets = { selected: ['topic1'] };
+            // act n assert
+            expect(pageFilterOptionsPage.isSelected('topic1')).toBeTruthy();
+            pageFilterOptionsPage.facets =  { selected: undefined };
+        });
+    });
+
+    describe('isSelected()', () => {
+        it('should return false', () => {
+            // arrange
+            pageFilterOptionsPage.facets = {};
+            // act n assert
+            expect(pageFilterOptionsPage.isSelected('topic1')).toBeFalsy();
+        });
+
+        it('should return proper result', () => {
+            // arrange
+            pageFilterOptionsPage.facets = { selected: ['topic1'] };
+            // act n assert
+            expect(pageFilterOptionsPage.isSelected('topic1')).toBeTruthy();
+            pageFilterOptionsPage.facets =  { selected: undefined };
+        });
+    });
+
+    describe('getSelectedOptionCount()', () => {
+        it('should return proper message with filter added count', () => {
+            // arrange
+            // act
+            const output = pageFilterOptionsPage.getSelectedOptionCount({
+                code: 'contentType',
+                selected: ['WorkSheet']
+            });
+            // assert
+            expect(output).toEqual('1');
+        });
+
+        it('should return empty message if facets is empty', () => {
+            // arrange
+            // act
+            const output = pageFilterOptionsPage.getSelectedOptionCount({
+            });
+            // assert
+            expect(output).toEqual('');
+        });
+    });
+
+    describe('cancel()', () => {
+        it('should populate selected facets', () => {
+            // arrange
+            pageFilterOptionsPage.facets = { selected: ['topic1'] };
+            pageFilterOptionsPage.prevSelectedTopic = ['topic1'];
+            // act
+            pageFilterOptionsPage.cancel();
+            // assert
+            expect(pageFilterOptionsPage.facets.selected).toEqual(['topic1']);
+            expect(mockPopOverController.dismiss).toHaveBeenCalled();
+            pageFilterOptionsPage.facets =  { selected: undefined };
+        });
+
+    });
+
+    describe('apply()', () => {
+        it('should populate selected facets', () => {
+            // arrange
+            pageFilterOptionsPage.facets = { selected: ['topic1'] };
+            pageFilterOptionsPage.prevSelectedTopic = ['topic1'];
+            pageFilterOptionsPage.backButtonFunc = { unsubscribe: jest.fn() };
+            // act
+            pageFilterOptionsPage.apply();
+            // assert
+            expect(pageFilterOptionsPage.prevSelectedTopic).toEqual(['topic1']);
+            expect(mockPopOverController.dismiss).toHaveBeenCalled();
+            pageFilterOptionsPage.facets =  { selected: undefined };
+        });
+
+        it('should populate selected facets and should not unsubscribe', () => {
+            // arrange
+            pageFilterOptionsPage.facets = { selected: ['topic1'] };
+            pageFilterOptionsPage.prevSelectedTopic = ['topic1'];
+            pageFilterOptionsPage.backButtonFunc = { unsubscribe: jest.fn() };
+            pageFilterOptionsPage.backButtonFunc = undefined;
+            // act
+            pageFilterOptionsPage.apply();
+            // assert
+            expect(pageFilterOptionsPage.prevSelectedTopic).toEqual(['topic1']);
+            pageFilterOptionsPage.facets = { selected: undefined };
+        });
+
+    });
+
+    describe('toggleGroup()', () => {
+        it('should mark shownGroup as null', () => {
+            // arrange
+            pageFilterOptionsPage.shownGroup = true;
+            // act
+            pageFilterOptionsPage.toggleGroup(true);
+            // assert
+            expect(pageFilterOptionsPage.shownGroup).toEqual(null);
+        });
+
+        it('should mark shownGroup as true', () => {
+            // arrange
+            pageFilterOptionsPage.shownGroup = true;
+            // act
+            pageFilterOptionsPage.toggleGroup(false);
+            // assert
+            expect(pageFilterOptionsPage.shownGroup).toEqual(false);
+        });
+
+    });
+
+    describe('getItems()', () => {
+        it('should mark showTopicFilterList as true', () => {
+            // arrange
+            pageFilterOptionsPage.topicsVal = [[{ name: 'topic1' }]];
+            pageFilterOptionsPage.backButtonFunc = { unsubscribe: jest.fn() };
+            // act
+            pageFilterOptionsPage.getItems({ srcElement: { value: 'topic1' } });
+            // assert
+            expect(pageFilterOptionsPage.showTopicFilterList).toBeTruthy();
+        });
+
+        it('should mark showTopicFilterList as true', () => {
+            // arrange
+            pageFilterOptionsPage.topicsVal = [[{ name: 'topic2' }]];
+            pageFilterOptionsPage.backButtonFunc = { unsubscribe: jest.fn() };
+            // act
+            pageFilterOptionsPage.getItems({ srcElement: { value: 'topic1' } });
+            // assert
+            expect(pageFilterOptionsPage.showTopicFilterList).toBeTruthy();
+        });
+
+        it('should mark showTopicFilterList as false', () => {
+            // arrange
+            pageFilterOptionsPage.topicsVal = [[{ name: 'topic2' }]];
+            pageFilterOptionsPage.backButtonFunc = { unsubscribe: jest.fn() };
+            // act
+            pageFilterOptionsPage.getItems({ srcElement: { value: undefined } });
+            // assert
+            expect(pageFilterOptionsPage.showTopicFilterList).toBeFalsy();
+        });
+
+    });
+
+    describe('changeValue()', () => {
+        it('should populate selectedValuesIndices', () => {
+            // arrange
+            pageFilterOptionsPage.facets = mockFacetsContetType;
+            // act
+            pageFilterOptionsPage.changeValue('WorkSheet', 1);
+            // assert
+            expect(pageFilterOptionsPage.facets.selectedValuesIndices).toEqual([]);
+        });
+
+        it('should populate selectedValuesIndices with code other than contentType', () => {
+            // arrange
+            pageFilterOptionsPage.facets = mockFacetsBoard;
+            // act
+            pageFilterOptionsPage.changeValue('WorkSheet', 1);
+            // assert
+            expect(pageFilterOptionsPage.facets.selectedValuesIndices.length).toEqual(1);
+        });
+
+        it('should populate facets.selcted', () => {
+            // arrange
+            pageFilterOptionsPage.facets = mockFacetsBoard;
+            // act
+            pageFilterOptionsPage.changeValue('AP', 1);
+            // assert
+            expect(pageFilterOptionsPage.facets.selected).toEqual(['AP']);
+        });
+
+        it('should populate facets.selcted for contentType term', () => {
+            // arrange
+            pageFilterOptionsPage.facets = mockFacetsContentTypeWith;
+            // act
+            pageFilterOptionsPage.changeValue('AP', 1);
+            // assert
+            expect(pageFilterOptionsPage.facets.selectedValuesIndices).toEqual([1]);
+        });
+    });
+
+    describe('handleDeviceBackButton()', () => {
+        it('should dismiss the popup', () => {
+            // arrange
+            mockPlatform.backButton = {
+                subscribeWithPriority: jest.fn((_, fn) => fn()),
+            } as any;
+            // act
+            pageFilterOptionsPage.handleDeviceBackButton();
+            // assert
+            expect(mockPopOverController.dismiss).toHaveBeenCalled();
+        });
+
+    });
+});
+
+
diff --git a/src/app/page-filter/page-filter.page.html b/src/app/page-filter/page-filter.page.html
index 18b60d1d4..eb4633d29 100644
--- a/src/app/page-filter/page-filter.page.html
+++ b/src/app/page-filter/page-filter.page.html
@@ -4,12 +4,12 @@ <h4 class="subtitle ion-padding ion-no-margin">{{ 'AVAILABLE_FILTERS' | translat
     <div *ngFor="let facet of facetsFilter">
       <div class="flex-card-container filter-item" (click)="openFilterOptions(facet)">
         <div class="card-text">
-          <ion-label *ngIf="facet.name" text-capitalize>{{ facet?.name | translate  }}</ion-label>
-          <ion-label *ngIf="facet.orgName" text-capitalize>{{ facet?.orgName | translate  }}</ion-label>
+          <ion-label *ngIf="facet.name" class="ion-text-capitalize">{{ facet?.name | translate  }}</ion-label>
+          <ion-label *ngIf="facet.orgName" class="ion-text-capitalize">{{ facet?.orgName | translate  }}</ion-label>
           <ion-label class="text-end">{{ getSelectedOptionCount(facet) }}</ion-label>
         </div>
         <div class="card-icon">
-          <ion-icon name="ios-arrow-forward"></ion-icon>
+          <ion-icon name="arrow-forward"></ion-icon>
         </div>
       </div>
     </div>
diff --git a/src/app/page-filter/page-filter.page.scss b/src/app/page-filter/page-filter.page.scss
index 764646e3f..8a714aed4 100644
--- a/src/app/page-filter/page-filter.page.scss
+++ b/src/app/page-filter/page-filter.page.scss
@@ -64,8 +64,8 @@
   .item-native {
     width: auto;
     margin: 16px !important;
-    background-color: #F0F0F0;
-    color: #979797;
+    background-color: map-get($colors, white_f0);
+    color: map-get($colors, dark_gray);
     font-size: 1em;
     height: 2em;
     padding-top: 0.5em;
@@ -76,10 +76,10 @@
 
   .flex-card-container {
     display: flex !important;
-    flex-wrap: nowrap !important;;
-    align-items:center !important;;
-    justify-content:center !important;;
-    background-color:#f1f1f1;
+    flex-wrap: nowrap !important;
+    align-items:center !important;
+    justify-content:center !important;
+    background-color: map-get($colors, white_f1);
     padding: 23px;
     margin-bottom: 12px;
     .card-text {
diff --git a/src/app/page-filter/page-filter.page.spec.data.ts b/src/app/page-filter/page-filter.page.spec.data.ts
new file mode 100644
index 000000000..c339bdf84
--- /dev/null
+++ b/src/app/page-filter/page-filter.page.spec.data.ts
@@ -0,0 +1,247 @@
+export const mockFilter = [
+    {
+        name: 'Topic',
+        translations: '{\"en\":\"Topic\"}',
+        code: 'topic',
+        frameworkCategory: true,
+        index: 1,
+        values: []
+    },
+    {
+        name: 'Purpose',
+        translations: '{\"en\":\"Purpose\"}',
+        code: 'purpose',
+        frameworkCategory: true,
+        index: 2,
+        values: []
+    },
+    {
+        name: 'Medium',
+        translations: '{\"en\":\"Medium\"}',
+        code: 'medium',
+        frameworkCategory: true,
+        index: 3,
+        values: []
+    },
+    {
+        name: 'Class',
+        translations: '{\"en\":\"Class\"}',
+        code: 'gradeLevel',
+        frameworkCategory: true,
+        index: 4,
+        values: []
+    },
+    {
+        name: 'Subject',
+        translations: '{\"en\":\"Subject\"}',
+        code: 'subject',
+        frameworkCategory: true,
+        index: 5,
+        values: []
+    },
+    {
+        name: 'Organization',
+        translations: '{\"en\":\"Organization\"}',
+        code: 'channel',
+        frameworkCategory: false,
+        index: 6,
+        values: []
+    },
+    {
+        name: 'ContentType',
+        translations: '{\"en\":\"ContentType\"}',
+        code: 'contentType',
+        frameworkCategory: true,
+        index: 1,
+        selectedValuesIndices: [0, 1],
+        selected: {},
+        values: [{
+            name: 'Story',
+            code: 'Story'
+        },
+        {
+            name: 'Worksheet',
+            code: 'Worksheet',
+
+        }, {
+            name: 'Collection',
+            code: 'Collection',
+
+        }],
+        resourceTypeValues: [{
+            name: 'Story',
+            code: 'Story'
+        },
+        {
+            name: 'Worksheet',
+            code: 'Worksheet',
+
+        }, {
+            name: 'Collection',
+            code: 'Collection',
+
+        }]
+    },
+    {
+        name: 'ContentType',
+        translations: '{\"en\":\"ContentType\"}',
+        code: 'contentType',
+        frameworkCategory: true,
+        index: 1,
+        selectedValuesIndices: [0, 1],
+        values: [{
+            name: 'Story',
+            code: 'Story'
+        },
+        {
+            name: 'Worksheet',
+            code: 'Worksheet',
+
+        }, {
+            name: 'Collection',
+            code: 'Collection',
+
+        }],
+        resourceTypeValues: [{
+            name: 'Story',
+            code: 'Story'
+        },
+        {
+            name: 'Worksheet',
+            code: 'Worksheet',
+
+        }, {
+            name: 'Collection',
+            code: 'Collection',
+
+        }]
+    }
+];
+
+export const mockTopicCategoryTerms = [
+    {
+        name: 'Topic',
+        translations: '{\"en\":\"Topic\"}',
+        code: 'topic',
+        frameworkCategory: true,
+        index: 1,
+        values: []
+    },
+    {
+        name: 'Purpose',
+        translations: '{\"en\":\"Purpose\"}',
+        code: 'purpose',
+        frameworkCategory: true,
+        index: 2,
+        values: []
+    },
+    {
+        name: 'Medium',
+        translations: '{\"en\":\"Medium\"}',
+        code: 'medium',
+        frameworkCategory: true,
+        index: 3,
+        values: []
+    },
+    {
+        name: 'Class',
+        translations: '{\"en\":\"Class\"}',
+        code: 'gradeLevel',
+        frameworkCategory: true,
+        index: 4,
+        values: []
+    },
+    {
+        name: 'Subject',
+        translations: '{\"en\":\"Subject\"}',
+        code: 'subject',
+        frameworkCategory: true,
+        index: 5,
+        values: []
+    },
+    {
+        name: 'Organization',
+        translations: '{\"en\":\"Organization\"}',
+        code: 'channel',
+        frameworkCategory: false,
+        index: 6,
+        values: []
+    }
+];
+
+export const mockMediumCategoryTerms = [
+    {
+        identifier: 'tpd_medium_assamese',
+        code: 'assamese',
+        translations: null,
+        name: 'Assamese',
+        description: 'Assamese',
+        index: 3,
+        category: 'medium',
+        status: 'Live'
+    },
+    {
+        identifier: 'tpd_medium_bengali',
+        code: 'bengali',
+        translations: null,
+        name: 'Bengali',
+        description: 'Bengali',
+        index: 17,
+        category: 'medium',
+        status: 'Live'
+    }
+];
+
+export const mockGradeLevelCategoryTerms = [
+    {
+        identifier: 'tpd_gradelevel_class1',
+        code: 'class1',
+        translations: null,
+        name: 'Class 1',
+        description: 'Class 1',
+        index: 1,
+        category: 'gradeLevel',
+        status: 'Live'
+    },
+    {
+        identifier: 'tpd_gradelevel_class2',
+        code: 'class2',
+        translations: null,
+        name: 'Class 2',
+        description: 'Class 2',
+        index: 2,
+        category: 'gradeLevel',
+        status: 'Live'
+    }
+];
+
+export const mockSubjectCategoryTerms = [
+    {
+        identifier: 'tpd_subject_accountancy',
+        code: 'accountancy',
+        translations: null,
+        name: 'Accountancy',
+        description: 'Accountancy',
+        index: 16,
+        category: 'subject',
+        status: 'Live'
+    },
+    {
+        identifier: 'tpd_subject_assamese',
+        code: 'assamese',
+        translations: null,
+        name: 'Assamese',
+        description: 'Assamese',
+        index: 21,
+        category: 'subject',
+        status: 'Live'
+    }
+
+];
+
+
+export const mockRootOrgData = [{
+    orgName: 'QWL64',
+    hashTagId: '012547858902196224199',
+    slug: '173'
+}];
diff --git a/src/app/page-filter/page-filter.page.spec.ts b/src/app/page-filter/page-filter.page.spec.ts
new file mode 100644
index 000000000..85bac37b9
--- /dev/null
+++ b/src/app/page-filter/page-filter.page.spec.ts
@@ -0,0 +1,342 @@
+import { PageFilterPage } from '../page-filter/page-filter.page';
+import { FrameworkUtilService } from 'sunbird-sdk';
+import { PopoverController, NavParams, MenuController, Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { TranslateService } from '@ngx-translate/core';
+import {
+    AppGlobalService,
+    CommonUtilService,
+    FormAndFrameworkUtilService,
+    PageId,
+    ImpressionType,
+    Environment,
+    InteractType,
+    InteractSubtype
+} from '../../services';
+import { TelemetryGeneratorService } from '../../services/telemetry-generator.service';
+import {
+    mockFilter,
+    mockTopicCategoryTerms,
+    mockMediumCategoryTerms,
+    mockSubjectCategoryTerms,
+    mockGradeLevelCategoryTerms,
+    mockRootOrgData
+} from './page-filter.page.spec.data';
+import { of } from 'rxjs';
+import cloneDeep from 'lodash/cloneDeep';
+import map from 'lodash/map';
+
+jest.mock('lodash/cloneDeep', () => jest.fn());
+jest.mock('lodash/map', () => jest.fn());
+describe('PageFilterPage', () => {
+    let pageFilterPage: PageFilterPage;
+
+    const mockFrameworkUtilService: Partial<FrameworkUtilService> = {
+        getFrameworkCategoryTerms: jest.fn((arg) => {
+            let value;
+            switch (arg.currentCategoryCode) {
+                case 'topic':
+                    value = mockTopicCategoryTerms;
+                    break;
+                case 'purpose':
+                    value = mockTopicCategoryTerms;
+                    break;
+                case 'medium':
+                    value = mockMediumCategoryTerms;
+                    break;
+                case 'gradeLevel':
+                    value = mockGradeLevelCategoryTerms;
+                    break;
+                case 'subject':
+                    value = mockSubjectCategoryTerms;
+                    break;
+            }
+            return of(value);
+        })
+    };
+
+    const mockPopOverController: Partial<PopoverController> = {
+        dismiss: jest.fn(),
+        create: jest.fn()
+    };
+
+    const mockNavParams: Partial<NavParams> = {
+        get: jest.fn((arg) => {
+            let value;
+            switch (arg) {
+                case 'callback':
+                    value = { applyFilter: jest.fn() };
+                    break;
+                case 'filter':
+                    value = mockFilter;
+                    break;
+                case 'pageId':
+                    value = PageId.COURSES;
+                    break;
+            }
+            return value;
+        })
+    };
+
+    const mockPlatform: Partial<Platform> = {
+    };
+
+    mockPlatform.backButton = {
+        subscribeWithPriority: jest.fn((_, fn) => fn({
+            unsubscribe: jest.fn()
+        })),
+    } as any;
+
+    const mockTranslateService: Partial<TranslateService> = {
+        currentLang: 'en'
+    };
+
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        getCurrentUser: jest.fn(() => ({
+            syllabus: ''
+        }))
+    };
+
+    const mockEvents: Partial<Events> = {
+        subscribe: jest.fn((_, fn) => fn({
+        }))
+    };
+
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateImpressionTelemetry: jest.fn(),
+        generateInteractTelemetry: jest.fn()
+    };
+
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        getLoader: jest.fn(() => {
+            return {
+                present: jest.fn(),
+                dismiss: jest.fn()
+            };
+        }),
+        getTranslatedValue: jest.fn(),
+        translateMessage: jest.fn(() => ('FILTER_ADDED'))
+    };
+
+    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {
+        getCourseFrameworkId: jest.fn(() => Promise.resolve('11111111')),
+        getRootOrganizations: jest.fn(() => Promise.resolve(mockRootOrgData))
+    };
+
+    const mockMenuController: Partial<MenuController> = {
+        enable: jest.fn()
+    };
+
+    beforeAll(() => {
+        pageFilterPage = new PageFilterPage(
+            mockFrameworkUtilService as FrameworkUtilService,
+            mockPopOverController as PopoverController,
+            mockNavParams as NavParams,
+            mockPlatform as Platform,
+            mockTranslateService as TranslateService,
+            mockAppGlobalService as AppGlobalService,
+            mockEvents as Events,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockCommonUtilService as CommonUtilService,
+            mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
+            mockMenuController as MenuController
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should be create a instance of PageFilterPage', () => {
+        expect(pageFilterPage).toBeTruthy();
+    });
+
+    describe('ionViewWillEnter()', () => {
+        it('should dismiss the menu drawer', () => {
+            // arrange
+            // act
+            pageFilterPage.ionViewWillEnter();
+            // assert
+            expect(mockMenuController.enable).toBeCalledWith(false);
+        });
+    });
+
+    describe('initFilterValues()', () => {
+        it('should initialize the filter and generate impression telemetry', (done) => {
+            // arrange
+            // act
+            pageFilterPage.initFilterValues();
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toBeCalledWith(
+                    ImpressionType.VIEW, '',
+                    PageId.COURSE_PAGE_FILTER,
+                    Environment.HOME);
+                expect(pageFilterPage.filters).toBeDefined();
+                done();
+            }, 0);
+        });
+
+        it('should initialize the filter and generate impression telemetry for library filter', (done) => {
+            // arrange
+            mockNavParams.get =  jest.fn((arg) => {
+                let value;
+                switch (arg) {
+                    case 'callback':
+                        value = { applyFilter: jest.fn() };
+                        break;
+                    case 'filter':
+                        value = mockFilter;
+                        break;
+                    case 'pageId':
+                        value = PageId.LIBRARY;
+                        break;
+                }
+                return value;
+            });
+            // act
+            pageFilterPage.initFilterValues();
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toBeCalledWith(
+                    ImpressionType.VIEW, '',
+                    PageId.LIBRARY_PAGE_FILTER,
+                    Environment.HOME);
+                expect(pageFilterPage.filters).toBeDefined();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('cancel()', () => {
+        it('should generate interact telemetry and dismiss the popup', (done) => {
+            // arrange
+            (cloneDeep as any).mockImplementationOnce((data) => {
+                return require.requireActual('lodash/cloneDeep')(pageFilterPage.filters);
+            });
+            const applyFilterMock = jest.spyOn(pageFilterPage.callback, 'applyFilter');
+            // act
+            pageFilterPage.initFilterValues();
+            pageFilterPage.apply();
+            pageFilterPage.cancel();
+            // assert
+            setTimeout(() => {
+                expect(pageFilterPage.callback.applyFilter).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.CANCEL,
+                    Environment.HOME,
+                    PageId.LIBRARY);
+                expect(applyFilterMock.mock.calls[0][0]).toEqual({ contentType: ['Story', 'Worksheet'] });
+                expect(mockPopOverController.dismiss).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('apply()', () => {
+        it('should not invoke applyFilter() of callback', (done) => {
+            // arrange
+            (cloneDeep as any).mockImplementationOnce((data) => {
+                return require.requireActual('lodash/cloneDeep')(pageFilterPage.filters);
+            });
+            const applyFilterMock = jest.spyOn(pageFilterPage.callback, 'applyFilter');
+            // act
+            pageFilterPage.initFilterValues();
+            pageFilterPage.apply();
+            // assert
+            setTimeout(() => {
+                expect(pageFilterPage.callback.applyFilter).toHaveBeenCalled();
+                expect(applyFilterMock.mock.calls[0][0]).toEqual({ contentType: ['Story', 'Worksheet'] });
+                expect(mockPopOverController.dismiss).toHaveBeenCalledWith({ apply: true });
+                done();
+            }, 0);
+        });
+
+        it('should invoke applyFilter() of callback', (done) => {
+            // arrange
+            pageFilterPage.callback = undefined;
+            // act
+            pageFilterPage.initFilterValues();
+            pageFilterPage.apply();
+            // assert
+            setTimeout(() => {
+                expect(pageFilterPage.pagetAssemblefilter).not.toBe({ contentType: ['Story', 'Worksheet'] });
+                done();
+            }, 0);
+        });
+    });
+
+    describe('onLanguageChange()', () => {
+        it('should not update the selected values', () => {
+            // arrange
+            pageFilterPage.backButtonFunc = { unsubscribe: jest.fn()};
+            // act
+            pageFilterPage.onLanguageChange();
+            // assert
+            expect(pageFilterPage.filters).not.toEqual([
+                undefined,
+                undefined
+              ]);
+        });
+        it('should update the selected values', () => {
+            // arrange
+            pageFilterPage.backButtonFunc = { unsubscribe: jest.fn()};
+            pageFilterPage.filters[7] = pageFilterPage.filters[6];
+            delete  pageFilterPage.filters[7].resourceTypeValues;
+            // act
+            pageFilterPage.initFilterValues();
+            pageFilterPage.onLanguageChange();
+            // assert
+            expect(pageFilterPage.filters[6].selected).toEqual([
+                undefined,
+                undefined
+              ]);
+        });
+    });
+
+    describe('getSelectedOptionCount()', () => {
+        it('should return proper message with filter added count', () => {
+            // arrange
+            // act
+            const output = pageFilterPage.getSelectedOptionCount({
+                code: 'contentType',
+                selected: ['WorkSheet']
+            });
+            // assert
+            expect(output).toEqual('1 FILTER_ADDED');
+        });
+
+        it('should return empty message if facets is empty', () => {
+            // arrange
+            // act
+            const output = pageFilterPage.getSelectedOptionCount({
+            });
+            // assert
+            expect(output).toEqual('');
+        });
+    });
+
+    describe('openFilterOptions()', () => {
+        it('should open the popup window', () => {
+            // arrange
+            // act
+            pageFilterPage.openFilterOptions({
+            });
+            // assert
+            expect(mockPopOverController.create).toHaveBeenCalled();
+        });
+    });
+
+    describe('ionViewWillLeave()', () => {
+        it('should open the popup window', () => {
+            // arrange
+            pageFilterPage.backButtonFunc = { unsubscribe: jest.fn()};
+            // act
+            pageFilterPage.ionViewWillLeave();
+            // assert
+            expect( pageFilterPage.backButtonFunc.unsubscribe).toHaveBeenCalled();
+            expect(mockMenuController.enable).toHaveBeenCalledWith(true);
+        });
+    });
+});
diff --git a/src/app/page-filter/page-filter.page.ts b/src/app/page-filter/page-filter.page.ts
index 2ffb6c185..118f56b72 100644
--- a/src/app/page-filter/page-filter.page.ts
+++ b/src/app/page-filter/page-filter.page.ts
@@ -1,5 +1,6 @@
 import { Component, Inject, ViewEncapsulation } from '@angular/core';
-import { Events, NavParams, Platform, PopoverController, MenuController } from '@ionic/angular';
+import { NavParams, Platform, PopoverController, MenuController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import map from 'lodash/map';
 import cloneDeep from 'lodash/cloneDeep';
 import { TranslateService } from '@ngx-translate/core';
diff --git a/src/app/player/player-action-handler-delegate.ts b/src/app/player/player-action-handler-delegate.ts
index 919556d4e..5b7155672 100644
--- a/src/app/player/player-action-handler-delegate.ts
+++ b/src/app/player/player-action-handler-delegate.ts
@@ -1,6 +1,7 @@
 export interface HierarchyInfo {
     contentType: string;
     identifier: string;
+    primaryCategory: string;
 }
 export interface User {
     uid: string;
diff --git a/src/app/player/player.module.ts b/src/app/player/player.module.ts
index 7cb487666..6e0c66350 100644
--- a/src/app/player/player.module.ts
+++ b/src/app/player/player.module.ts
@@ -8,6 +8,14 @@ import { IonicModule } from '@ionic/angular';
 import { PlayerPage } from './player.page';
 import { CanvasPlayerService } from '@app/services/canvas-player.service';
 import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
+import { SunbirdPdfPlayerModule } from '@project-sunbird/sunbird-pdf-player-v8';
+import { SunbirdEpubPlayerModule } from '@project-sunbird/sunbird-epub-player-v8';
+import { QumlLibraryModule } from '@project-sunbird/sunbird-quml-player-v8';
+import { SunbirdVideoPlayerModule } from '@project-sunbird/sunbird-video-player-v8';
+
+
+
+
 
 const routes: Routes = [
   {
@@ -20,6 +28,10 @@ const routes: Routes = [
   imports: [
     CommonModule,
     FormsModule,
+    SunbirdPdfPlayerModule,
+    SunbirdEpubPlayerModule,
+    SunbirdVideoPlayerModule,
+    QumlLibraryModule,
     IonicModule,
     RouterModule.forChild(routes)
   ],
diff --git a/src/app/player/player.page.html b/src/app/player/player.page.html
index c0ae5ab8b..6cd46ebac 100644
--- a/src/app/player/player.page.html
+++ b/src/app/player/player.page.html
@@ -1,5 +1,23 @@
 <ion-content>
-  <div class="content-player">
-    <iframe #preview title="player" id="contentPlayer" src="./content-player/preview.html?isMobile=true" style="width:100%;height:100vh;border:none;"></iframe>
+  <div class="content-player" *ngIf="playerType === 'sunbird-old-player'">
+    <iframe #preview title="player" id="contentPlayer" src="./content-player/preview.html?isMobile=true"
+      style="width:100%;height:100vh;border:none;"></iframe>
   </div>
-</ion-content>
\ No newline at end of file
+  <div *ngIf="playerType === 'sunbird-pdf-player'" style="height:100vh;width:100%;">
+    <sunbird-pdf-player [playerConfig]="config" (playerEvent)="playerEvents($event)"
+      (telemetryEvent)="playerTelemetryEvents($event)"></sunbird-pdf-player>
+  </div>
+  <div *ngIf="playerType === 'sunbird-epub-player'" style="height:100vh;width:100%;">
+    <sunbird-epub-player [playerConfig]="config" (playerEvent)="playerEvents($event)"
+      (telemetryEvent)="playerTelemetryEvents($event)"></sunbird-epub-player>
+  </div>
+  <div *ngIf="playerType === 'sunbird-quml-player'" style="height:100vh;width:100%;background-color: white;">
+      <quml-player [QumlPlayerConfig]="config" (playerEvent)="playerEvents($event)" 
+      (telemetryEvent)="playerTelemetryEvents($event)"></quml-player>
+  </div>
+  <div *ngIf="playerType === 'sunbird-video-player'"  style="height:100vh;width:100%;">
+    <sunbird-video-player [playerConfig]="config" (playerEvent)="playerEvents($event)"
+      (telemetryEvent)="playerTelemetryEvents($event)"></sunbird-video-player>
+  </div>
+</ion-content>
+
diff --git a/src/app/player/player.page.spec.ts b/src/app/player/player.page.spec.ts
new file mode 100644
index 000000000..8afcd94e7
--- /dev/null
+++ b/src/app/player/player.page.spec.ts
@@ -0,0 +1,745 @@
+import { ActivatedRoute, Router } from '@angular/router';
+import { StatusBar } from '@ionic-native/status-bar/ngx';
+import { Platform, AlertController, PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { CourseService, ProfileService, SunbirdSdk, TelemetryService , ContentService } from '@project-sunbird/sunbird-sdk';
+import { AppGlobalService } from '../../services/app-global-service.service';
+import { DownloadPdfService } from '../../services/download-pdf/download-pdf.service';
+import { PlayerPage } from './player.page';
+import { CanvasPlayerService } from '@app/services/canvas-player.service';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { FormAndFrameworkUtilService, PageId } from '@app/services';
+import { Location } from '@angular/common';
+import { FileOpener } from '@ionic-native/file-opener/ngx';
+import { FileTransfer, FileTransferObject } from '@ionic-native/file-transfer/ngx';
+import { TelemetryGeneratorService } from '../../services/telemetry-generator.service';
+import { Observable, of, throwError } from 'rxjs';
+import { finalize } from 'rxjs/operators';
+import { EventTopics, RouterLinks, ShareItemType } from '../app.constant';
+import { PrintPdfService } from '@app/services/print-pdf/print-pdf.service';
+import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
+
+
+
+declare const cordova;
+
+describe('PlayerPage', () => {
+    let playerPage: PlayerPage;
+    const mockAlertCtrl: Partial<AlertController> = {};
+    const mockCourseService: Partial<CourseService> = {};
+    const mockCanvasPlayerService: Partial<CanvasPlayerService> = {
+        handleAction: jest.fn()
+    };
+    const mockPlatform: Partial<Platform> = {};
+    const mockScreenOrientation: Partial<ScreenOrientation> = {
+        unlock: jest.fn(),
+        ORIENTATIONS: {
+            LANDSCAPE: 'LANDSCAPE' } as any,
+        lock: jest.fn(() => Promise.resolve([]))
+
+    };
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+    };
+    const mockStatusBar: Partial<StatusBar> = {};
+    const mockEvents: Partial<Events> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+    };
+    const mockRoute: Partial<ActivatedRoute> = {};
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => ({
+            extras: {
+                state: {
+                    contentToPlay: {
+                        identifier: '123456',
+                        contentData: {
+                            downloadUrl: 'https://'
+                        }
+                    },
+                    config: {
+                        metadata: {
+                            mimeType: 'application/pdf',
+                            contentData: {
+                                downloadUrl: '12345'
+                            }
+                        }
+                    },
+                    course: {},
+                    navigateBackToContentDetails: {},
+                    corRelation: {},
+                    isCourse: true,
+                    childContent: true
+                }
+            }
+        })) as any
+    };
+    const mockLocation: Partial<Location> = {
+        back: jest.fn()
+    };
+    const mockPopoverCtrl: Partial<PopoverController> = {
+
+    };
+    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {
+        // getPdfPlayerConfiguration: jest.fn(() => Promise.resolve({}))
+    };
+    const mockDownloadPdfService: Partial<DownloadPdfService> = {
+        // downloadPdf: jest.fn(() => Promise.resolve({}))
+    };
+    const mockFileOpener: Partial<FileOpener> = {};
+    const mockTransfer: Partial<FileTransfer> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockprintPdfService: Partial<PrintPdfService> = {};
+    const mockContentService: Partial<ContentService> = {};
+
+    const mockprofileService: Partial<ProfileService> = {};
+    beforeAll(() => {
+        playerPage = new PlayerPage(
+            mockCourseService as CourseService,
+            mockprofileService as ProfileService,
+            mockContentService as ContentService,
+            mockCanvasPlayerService as CanvasPlayerService,
+            mockPlatform as Platform,
+            mockScreenOrientation as ScreenOrientation,
+            mockAppGlobalService as AppGlobalService,
+            mockStatusBar as StatusBar,
+            mockEvents as Events,
+            mockAlertCtrl as AlertController,
+            mockCommonUtilService as CommonUtilService,
+            mockRoute as ActivatedRoute,
+            mockRouter as Router,
+            mockLocation as Location,
+            mockPopoverCtrl as PopoverController,
+            mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
+            mockDownloadPdfService as DownloadPdfService,
+            mockFileOpener as FileOpener,
+            mockTransfer as FileTransfer,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockprintPdfService as PrintPdfService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should be data instance of player page', () => {
+        expect(playerPage).toBeTruthy();
+    });
+
+    describe('ionviewWillEnter', () => {
+        it('should initialize the backbutton', (done) => {
+            playerPage.previewElement = {
+                nativeElement: {
+                    src: '12346'
+                }
+            }
+            playerPage.config = {
+                context: {
+                    actor: {
+                        id: '123456'
+                    }
+                },
+                metadata: {
+                  basePath: 'basePath'
+                }
+            }
+            // playerPage.loadPdfPlayer = true;
+            mockStatusBar.hide = jest.fn();
+            mockPlatform.backButton = {
+                subscribeWithPriority: jest.fn((_, fn) => fn()),
+            } as any;
+            mockAlertCtrl.getTop = jest.fn(() => Promise.resolve(undefined));
+            jest.spyOn(playerPage, 'showConfirm').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            // mockLocation.back = jest.fn();
+            mockEvents.subscribe = jest.fn((_, fn) => fn({ showConfirmBox: true }));
+            playerPage.ionViewWillEnter();
+            setTimeout(() => {
+                // expect(playerPage.loadPdfPlayer).toBeTruthy();
+                expect(mockPlatform.backButton).toBeTruthy();
+                expect(mockAlertCtrl.getTop).toHaveBeenCalled();
+                // expect(mockLocation.back).toHaveBeenCalledWith();
+                expect(mockEvents.subscribe).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+    });
+
+    it('should return new  player config', (done) => {
+        playerPage.config = {
+            context: {
+                objectRollup: {
+                    l1: 'li'
+                },
+                dispatcher: {
+                    dispatch: jest.fn()
+                },
+                pdata: {
+                    pid: 'sunbird.app.contentplayer'
+                },
+                actor: {id: 'sample'}
+            },
+            metadata: {
+                identifier: 'identifier',
+                mimeType: 'application/pdf',
+                isAvailableLocally: true,
+                basePath: 'basePath',
+                contentData: {
+                    isAvailableLocally: true,
+                    basePath: 'basePath',
+                    streamingUrl: 'streamingurl'
+                }
+            }
+
+        }
+        mockprofileService.getActiveSessionProfile = jest.fn(() => of({
+            serverProfile: {
+                firstName: 'firstName',
+                lastName: 'lastname'
+            }
+        })) as any;
+        playerPage.getNewPlayerConfiguration();
+        setTimeout(() => {
+            expect(mockprofileService.getActiveSessionProfile).toBeCalled();
+            done();
+        }, 0)
+        //  expect(playerPage.getNewPlayerConfiguration()).toHaveBeenCalled();
+    })
+
+    it('should call the get question read api for instructions', (done) =>{
+        playerPage.config = {
+            context: {
+                objectRollup: {
+                    l1: 'li'
+                },
+                dispatcher: {
+                    dispatch: jest.fn()
+                },
+                pdata: {
+                    pid: 'sunbird.app.contentplayer'
+                }
+            },
+            metadata: {
+                identifier: 'identifier',
+                isAvailableLocally: true,
+                basePath: 'basePath',
+                instructions: 'int',
+                contentData: {
+                    mimeType: 'application/vnd.sunbird.questionset',
+                    isAvailableLocally: true,
+                    basePath: 'basePath',
+                    streamingUrl: 'streamingurl'
+                }
+            }
+        }
+
+        mockprofileService.getActiveSessionProfile = jest.fn(() => of({
+            serverProfile:{
+                firstName: 'firstName', 
+                lastName: 'lastname'
+            }
+        })) as any;
+
+        mockContentService.getQuestionSetRead = jest.fn(() => of(
+            {
+                questionset: {
+                    instructions:{
+                        default: 'sample instructions'
+                    }
+                }
+            }
+        )) as any;
+        playerPage.getNewPlayerConfiguration();
+        setTimeout(() =>{
+        expect(mockContentService.getQuestionSetRead).toHaveBeenCalled();
+         done()
+        } , 0)
+    });
+
+    it('should check if new player is enabled', () => {
+        const config = {
+            fields: [
+                {
+                    "name": "pdfPlayer",
+                    "code": "pdf",
+                    "values": [
+                        {
+                            "isEnabled": true
+                        }
+                    ]
+                },
+                {
+                    "name": "epubPlayer",
+                    "code": "epub",
+                    "values": [
+                        {
+                            "isEnabled": true
+                        }
+                    ]
+                }
+            ]
+        }
+        playerPage.checkIsPlayerEnabled(config, 'pdfPlayer');
+    })
+    it('should return a content', (done)=> {
+       mockContentService.nextContent = jest.fn(()=> of({
+        
+            identifier: 'identifier',
+            mimeType: 'application/pdf',
+            isAvailableLocally: true,
+            contentData: {
+                isAvailableLocally: true,
+                basePath: 'basePath',
+                streamingUrl: 'streamingurl'
+            }   
+       })) as any;
+       playerPage.getNextContent({} , '1234')
+       setTimeout(() =>{
+           expect(mockContentService.nextContent).toHaveBeenCalled();
+           done();
+       }, 0)
+    })
+
+    it('should player next content' , () => {
+        playerPage.nextContentToBePlayed = {
+            identifier: 'identifier',
+            mimeType: 'application/pdf',
+            isAvailableLocally: true,
+            contentData: {
+                isAvailableLocally: true,
+                basePath: 'basePath',
+                streamingUrl: 'streamingurl'
+            } 
+        }
+        mockEvents.publish = jest.fn(()=> []);
+        mockLocation.back = jest.fn();
+        playerPage.playNextContent();
+        expect(mockEvents.publish).toHaveBeenCalledWith(EventTopics.NEXT_CONTENT , {
+            content: playerPage.nextContentToBePlayed,
+            course : {}
+        });
+        expect(mockLocation.back).toHaveBeenCalled();
+    })
+    describe('ngOninit', () => {
+        it('should call getPdfPlayerConfiguration', (done) => {
+            const subscribeFn = jest.fn(() => { }) as any;
+            mockPlatform.pause = {
+                subscribe: subscribeFn
+            } as any;
+            mockFormAndFrameworkUtilService.getPdfPlayerConfiguration = jest.fn(() => Promise.resolve({}));
+            playerPage.config = {
+                context: {
+                    objectRollup: {
+                        l1: 'li'
+                    },
+                    dispatcher: {
+                        dispatch: jest.fn()
+                    },
+                    pdata: {
+                        pid: 'sunbird.app.contentplayer'
+                    }
+                },
+                metadata: {
+                    identifier: 'identifier',
+                    mimeType: 'application/pdf',
+                    isAvailableLocally: true,
+                    contentData: {
+                        isAvailableLocally: true,
+                        basePath: 'basePath',
+                        streamingUrl: 'streamingurl'
+                    }
+
+                }
+
+            };
+            jest.spyOn(playerPage, 'checkIsPlayerEnabled').mockImplementation(() => {
+                return {
+                    name: 'pdfPlayer'
+                }
+            })
+            jest.spyOn(playerPage, 'getNewPlayerConfiguration').mockImplementation(() => {
+
+                return Promise.resolve(playerPage.config);
+
+            })
+            jest.spyOn(playerPage , 'getNextContent').mockImplementation(() => {
+                
+                return Promise.resolve({contentId: 'sample content id',
+                 identifier: 'sampleid', name: 'sample name'});
+
+            })
+            jest.spyOn(SunbirdSdk, 'instance', 'get').mockReturnValue({
+                telemetryService: {
+                    saveTelemetry(request: string): Observable<boolean> {
+                        // for success
+                        return of(true);
+                        // for error
+                        return throwError(new Error('sample_error'));
+                    }
+                } as Partial<TelemetryService> as TelemetryService
+            } as Partial<SunbirdSdk> as SunbirdSdk);
+            playerPage.playerConfig = {};
+            playerPage.ngOnInit().then(() => {
+                jest.spyOn(SunbirdSdk, 'instance', 'get').mockReturnValue({
+                    telemetryService: {
+                        saveTelemetry(request: string): Observable<boolean> {
+                            done();
+                            return of(true);
+                        }
+                    } as Partial<TelemetryService> as TelemetryService
+                } as Partial<SunbirdSdk> as SunbirdSdk);
+                playerPage.config['context'].dispatcher.dispatch();
+            });
+            setTimeout(() => {
+                // expect(mockFormAndFrameworkUtilService.getPdfPlayerConfiguration).toHaveBeenCalled();
+                expect(playerPage.loadPdfPlayer).toBeFalsy();
+                done();
+            }, 0);
+        });
+        it('should check mimetype and load pdf player', (done) => {
+            mockFormAndFrameworkUtilService.getPdfPlayerConfiguration = jest.fn(() => Promise.resolve({}));
+            playerPage.playerConfig = true;
+            const subscribeFn = jest.fn(() => { }) as any;
+            mockPlatform.pause = {
+                subscribe: subscribeFn
+            } as any;
+            playerPage.config = {
+                context: {
+                    dispatcher: {
+                        // dispatch: jest.fn()
+                    },
+                    pdata: {
+                        pid: 'sunbird.app.contentplayer'
+                    },
+                    objectRollup: {
+                        l1: 'li'
+                    }
+                },
+                metadata: {
+                    identifier: 'li',
+                    mimeType: 'application/pdf',
+                    isAvailableLocally: true,
+                    contentData: {
+                        isAvailableLocally: true,
+                        basePath: 'basePath',
+                        streamingUrl: 'streamingurl'
+                    }
+                }
+            };
+            jest.spyOn(playerPage, 'checkIsPlayerEnabled').mockImplementation(() => {
+                return {
+                    name: 'pdfPlayer'
+                }
+            })
+            jest.spyOn(playerPage, 'getNewPlayerConfiguration').mockImplementation(() => {
+                return Promise.resolve(playerPage.config);
+            });
+            jest.spyOn(playerPage , 'getNextContent').mockImplementation(() => {
+                
+                return Promise.resolve({contentId: 'sample content id',
+                 identifier: 'sampleid', name: 'sample name'});
+
+            })
+            playerPage.playerConfig = {};
+            playerPage.ngOnInit().then(() => {
+                jest.spyOn(SunbirdSdk, 'instance', 'get').mockReturnValue({
+                    telemetryService: {
+                        saveTelemetry: jest.fn((request: string) => {
+                            return of(true).pipe(
+                                finalize(() => {
+                                    done();
+
+                                })
+                            );
+                        })
+                    } as Partial<TelemetryService> as TelemetryService
+                } as Partial<SunbirdSdk> as SunbirdSdk);
+                playerPage.config['context'].dispatcher.dispatch({});
+            });
+        });
+
+
+        it('should check mimetype and load video player', (done) => {
+            mockFormAndFrameworkUtilService.getPdfPlayerConfiguration = jest.fn(() => Promise.resolve({}));
+            playerPage.playerConfig = true;
+            const subscribeFn = jest.fn(() => { }) as any;
+            mockPlatform.pause = {
+                subscribe: subscribeFn
+            } as any;
+            playerPage.config = {
+                context: {
+                    dispatcher: {
+                        // dispatch: jest.fn()
+                    },
+                    pdata: {
+                        pid: 'sunbird.app.contentplayer'
+                    },
+                    objectRollup: {
+                        l1: 'li'
+                    }
+                },
+                config: {
+                    sideMenu: {
+                        showDownload: false,
+                        showPrint: false,
+                        showReplay: false,
+                        showExit: true,
+                        showShare: true
+                     }
+                },
+                metadata: {
+                    identifier: 'li',
+                    mimeType: 'video/mp4',
+                    isAvailableLocally: true,
+                    contentData: {
+                        isAvailableLocally: true,
+                        basePath: 'basePath',
+                        streamingUrl: 'streamingurl'
+                    }
+                }
+            };
+            jest.spyOn(playerPage , 'checkIsPlayerEnabled').mockImplementation(() => {
+                return {
+                    name: 'videoPlayer'
+                }
+            })
+            jest.spyOn(playerPage , 'getNewPlayerConfiguration').mockImplementation(() => {
+                return Promise.resolve(playerPage.config);
+            });
+            jest.spyOn(playerPage , 'getNextContent').mockImplementation(() => {
+                
+                return Promise.resolve({contentId: 'sample content id',
+                 identifier: 'sampleid', name: 'sample name'});
+
+            })
+            playerPage.playerConfig = {};
+            playerPage.ngOnInit().then(() => {
+                jest.spyOn(SunbirdSdk, 'instance', 'get').mockReturnValue({
+                    telemetryService: {
+                        saveTelemetry: jest.fn((request: string) => {
+                            return of(true).pipe(
+                                finalize(() => {
+                                    done();
+
+                                })
+                            );
+                        })
+                    } as Partial<TelemetryService> as TelemetryService
+                } as Partial<SunbirdSdk> as SunbirdSdk);
+                playerPage.config['context'].dispatcher.dispatch({});
+            });
+        });
+
+        it('should check mimetype and load quml player', (done) => {
+            mockFormAndFrameworkUtilService.getPdfPlayerConfiguration = jest.fn(() => Promise.resolve({}));
+            playerPage.playerConfig = true;
+            const subscribeFn = jest.fn(() => { }) as any;
+            mockPlatform.pause = {
+                subscribe: subscribeFn
+            } as any;
+            playerPage.config = {
+                context: {
+                    dispatcher: {
+                        // dispatch: jest.fn()
+                    },
+                    pdata: {
+                        pid: 'sunbird.app.contentplayer'
+                    },
+                    objectRollup: {
+                        l1: 'li'
+                    }
+                },
+                config: {
+                    sideMenu: {
+                        showDownload: false,
+                        showPrint: false,
+                        showReplay: false,
+                        showExit: true,
+                        showShare: true
+                     }
+                },
+                metadata: {
+                    identifier: 'li',
+                    mimeType: 'application/vnd.sunbird.questionset',
+                    isAvailableLocally: true,
+                    contentData: {
+                        isAvailableLocally: true,
+                        basePath: 'basePath',
+                        streamingUrl: 'streamingurl'
+                    }
+                }
+            };
+            jest.spyOn(playerPage , 'checkIsPlayerEnabled').mockImplementation(() => {
+                return {
+                    name: 'qumlPlayer'
+                }
+            })
+            jest.spyOn(playerPage , 'getNextContent').mockImplementation(() => {
+                
+                return Promise.resolve({contentId: 'sample content id',
+                 identifier: 'sampleid', name: 'sample name'});
+
+            })
+            jest.spyOn(playerPage , 'getNewPlayerConfiguration').mockImplementation(() => {
+                return Promise.resolve(playerPage.config);
+            });
+            playerPage.playerConfig = {};
+            playerPage.ngOnInit().then(() => {
+                jest.spyOn(SunbirdSdk, 'instance', 'get').mockReturnValue({
+                    telemetryService: {
+                        saveTelemetry: jest.fn((request: string) => {
+                            return of(true).pipe(
+                                finalize(() => {
+                                    done();
+
+                                })
+                            );
+                        })
+                    } as Partial<TelemetryService> as TelemetryService
+                } as Partial<SunbirdSdk> as SunbirdSdk);
+                playerPage.config['context'].dispatcher.dispatch({});
+            });
+        });
+
+
+    });
+    describe('pdfPlayerEvents', () => {
+        it('should exit the player', (done) => {
+            const event = {
+                edata: {
+                    type: 'EXIT'
+                }
+            };
+            playerPage.playerEvents(event);
+
+            setTimeout(() => {
+                // expect(playerPage.loadPdfPlayer).toBe(false);
+                // expect(mockLocation.back).toHaveBeenCalled();
+                done();
+            }, 50);
+        });
+        it('should call the download service to download the pdf', (done) => {
+            playerPage['content'] = {
+                contentData: {
+                    downloadUrl: 'https://'
+                }
+            };
+            const event = {
+                edata: {
+                    type: 'DOWNLOAD'
+                }
+            };
+
+            mockCommonUtilService.showToast = jest.fn();
+            mockDownloadPdfService.downloadPdf = jest.fn(() => Promise.resolve());
+            playerPage.playerEvents(event);
+            setTimeout(() => {
+                // expect(mockDownloadPdfService.downloadPdf).toHaveBeenCalled();
+                // expect(CommonUtilService.showToast).toHaveBeenCalledWith('PDF_DOWNLOADED');
+                done();
+            }, 100);
+
+        });
+        it('should call the download service to download the pdf for catch part', (done) => {
+            playerPage['content'] = {
+                contentData: {
+                    downloadUrl: 'https://'
+                }
+            };
+            const event = {
+                edata: {
+                    type: 'DOWNLOAD'
+                }
+            };
+            mockCommonUtilService.showToast = jest.fn();
+            mockDownloadPdfService.downloadPdf = jest.fn(() => Promise.reject({
+                reason: 'device-permission-denied'
+            }));
+            playerPage.playerEvents(event);
+            setTimeout(() => {
+                expect(mockDownloadPdfService.downloadPdf).toHaveBeenCalled();
+                // expect(CommonUtilService.showToast).toHaveBeenCalledWith('DEVICE_NEEDS_PERMISSION');
+                done();
+            }, 0);
+
+        });
+        it('should call the download service to download the pdf for catch part(user-permission-denied)', (done) => {
+            playerPage['content'] = {
+                contentData: {
+                    downloadUrl: 'https://'
+                }
+            };
+            const event = {
+                edata: {
+                    type: 'DOWNLOAD'
+                }
+            };
+            mockCommonUtilService.showToast = jest.fn();
+            mockDownloadPdfService.downloadPdf = jest.fn(() => Promise.reject({
+                reason: 'user-permission-denied'
+            }));
+            playerPage.playerEvents(event);
+            setTimeout(() => {
+                // expect(mockDownloadPdfService.downloadPdf).toHaveBeenCalled();
+                // expect(CommonUtilService.showToast).toHaveBeenCalledWith('DEVICE_NEEDS_PERMISSION');
+                done();
+            }, 0);
+
+        });
+        it('should call the download service to download the pdf for catch part(download-failed)', (done) => {
+            playerPage['content'] = {
+                contentData: {
+                    downloadUrl: 'https://'
+                }
+            };
+            const event = {
+                edata: {
+                    type: 'DOWNLOAD'
+                }
+            };
+            mockCommonUtilService.showToast = jest.fn();
+            mockDownloadPdfService.downloadPdf = jest.fn(() => Promise.reject({
+                reason: 'download-failed'
+            }));
+            playerPage.playerEvents(event);
+            setTimeout(() => {
+                expect(mockDownloadPdfService.downloadPdf).toHaveBeenCalled();
+                // expect(CommonUtilService.showToast).toHaveBeenCalledWith('DEVICE_NEEDS_PERMISSION');
+                done();
+            }, 0);
+
+        });
+        it('should handle the share event', (done) => {
+            const event = {
+                edata: {
+                    type: 'SHARE'
+                }
+            };
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({}))
+            } as any)));
+            playerPage.playerEvents(event);
+            setTimeout(() => {
+                expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                done();
+            }, 50);
+
+        });
+        it('should handle the content compatibility error', (done) => {
+            const event = {
+                edata: {
+                    type: 'compatibility-error'
+                }
+            };
+            global.window.cordova.plugins.InAppUpdateManager.checkForImmediateUpdate = jest.fn(() => { });
+            playerPage.playerEvents(event);
+            setTimeout(() => {
+                expect(global.window.cordova.plugins.InAppUpdateManager.checkForImmediateUpdate).toHaveBeenCalled();
+                done();
+            }, 50);
+        });
+    });
+
+});
diff --git a/src/app/player/player.page.ts b/src/app/player/player.page.ts
index 9af3c53d2..04fe29907 100644
--- a/src/app/player/player.page.ts
+++ b/src/app/player/player.page.ts
@@ -3,31 +3,64 @@ import { CanvasPlayerService } from '@app/services/canvas-player.service';
 import { AppGlobalService } from '@app/services/app-global-service.service';
 import { CommonUtilService } from '@app/services/common-util.service';
 import { Component, OnInit, ViewChild, ElementRef, Inject, OnDestroy } from '@angular/core';
-import { Platform, AlertController, Events } from '@ionic/angular';
+import { Platform, AlertController, PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
 import { PlayerActionHandlerDelegate, HierarchyInfo, User } from './player-action-handler-delegate';
 import { StatusBar } from '@ionic-native/status-bar/ngx';
-import { EventTopics, RouterLinks } from '../app.constant';
+import { EventTopics, ProfileConstants, RouterLinks, ShareItemType } from '../app.constant';
 import { Location } from '@angular/common';
 import { Subscription } from 'rxjs';
-import { CourseService, Course } from 'sunbird-sdk';
+import {
+  CourseService,
+  Course,
+  Content,
+  Rollup,
+  InteractType,
+  UpdateContentStateTarget,
+  UpdateContentStateRequest,
+  TelemetryErrorCode,
+  ErrorType, SunbirdSdk, ProfileService, ContentService
+} from 'sunbird-sdk';
+import { Environment, FormAndFrameworkUtilService, InteractSubtype, PageId, TelemetryGeneratorService } from '@app/services';
+import { SbSharePopupComponent } from '../components/popups/sb-share-popup/sb-share-popup.component';
+import { DownloadPdfService } from '@app/services/download-pdf/download-pdf.service';
+import { FileOpener } from '@ionic-native/file-opener/ngx';
+import { FileTransfer, FileTransferObject } from '@ionic-native/file-transfer/ngx';
+import { ContentUtil } from '@app/util/content-util';
+import { PrintPdfService } from '@app/services/print-pdf/print-pdf.service';
+
+declare const cordova;
+
 
 @Component({
   selector: 'app-player',
-  templateUrl: './player.page.html'
+  templateUrl: './player.page.html',
 })
+
 export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegate {
 
   config = {};
   backButtonSubscription: Subscription;
   course: Course;
   pauseSubscription: any;
-  isFromToc: boolean;
+  private navigateBackToContentDetails: boolean;
+  private navigateBackToTrackableCollection: boolean;
   corRelationList;
+  private isCourse = false;
+  playerConfig: any;
+  private isChildContent: boolean;
+  private content: Content;
+  public objRollup: Rollup;
+  nextContentToBePlayed: Content;
+  playerType: string = 'sunbird-old-player';  
 
-  @ViewChild('preview') previewElement: ElementRef;
+
+  @ViewChild('preview', { static: false }) previewElement: ElementRef;
   constructor(
     @Inject('COURSE_SERVICE') private courseService: CourseService,
+    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+    @Inject('CONTENT_SERVICE') private contentService: ContentService,
     private canvasPlayerService: CanvasPlayerService,
     private platform: Platform,
     private screenOrientation: ScreenOrientation,
@@ -38,7 +71,14 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat
     private commonUtilService: CommonUtilService,
     private route: ActivatedRoute,
     private router: Router,
-    private location: Location
+    private location: Location,
+    private popoverCtrl: PopoverController,
+    private formAndFrameworkUtilService: FormAndFrameworkUtilService,
+    private downloadPdfService: DownloadPdfService,
+    private fileOpener: FileOpener,
+    private transfer: FileTransfer,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+    private printPdfService: PrintPdfService
   ) {
     this.canvasPlayerService.handleAction();
 
@@ -47,56 +87,124 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat
     (window as any).onUserSwitch = this.onUserSwitch.bind(this);
 
     if (this.router.getCurrentNavigation().extras.state) {
+      this.content = this.router.getCurrentNavigation().extras.state.contentToPlay;
       this.config = this.router.getCurrentNavigation().extras.state.config;
       this.course = this.router.getCurrentNavigation().extras.state.course;
-      this.isFromToc = this.router.getCurrentNavigation().extras.state.isFromTOC;
+      this.navigateBackToContentDetails = this.router.getCurrentNavigation().extras.state.navigateBackToContentDetails;
       this.corRelationList = this.router.getCurrentNavigation().extras.state.corRelation;
+      this.isCourse = this.router.getCurrentNavigation().extras.state.isCourse;
+      this.isChildContent = this.router.getCurrentNavigation().extras.state.childContent;
     }
   }
 
-  ngOnInit() {
-    this.pauseSubscription =  this.platform.pause.subscribe(() => {
-      var iframes = window.document.getElementsByTagName('iframe');
+  async ngOnInit() {
+    this.playerConfig = await this.formAndFrameworkUtilService.getPdfPlayerConfiguration();
+    if(this.config['metadata'].hierarchyInfo) {
+      await this.getNextContent(this.config['metadata'].hierarchyInfo , this.config['metadata'].identifier)
+    }
+    if (this.config['metadata']['mimeType'] === 'application/pdf' && this.checkIsPlayerEnabled(this.playerConfig , 'pdfPlayer').name === "pdfPlayer") {
+      this.config = await this.getNewPlayerConfiguration();
+      this.playerType = 'sunbird-pdf-player'
+    } else if (this.config['metadata']['mimeType'] === "application/epub" && this.checkIsPlayerEnabled(this.playerConfig , 'epubPlayer').name === "epubPlayer"){ 
+      this.config = await this.getNewPlayerConfiguration();
+      this.playerType = 'sunbird-epub-player'
+    } else if(this.config['metadata']['mimeType'] === "application/vnd.sunbird.questionset" && this.checkIsPlayerEnabled(this.playerConfig , 'qumlPlayer').name === "qumlPlayer"){
+      this.config = await this.getNewPlayerConfiguration();
+      this.config['config'].sideMenu.showDownload = false;
+      this.config['config'].sideMenu.showPrint = false;
+       this.playerType = 'sunbird-quml-player';
+    } else if(["video/mp4", "video/webm"].includes(this.config['metadata']['mimeType']) && this.checkIsPlayerEnabled(this.playerConfig , 'videoPlayer').name === "videoPlayer"){
+      this.config = await this.getNewPlayerConfiguration();
+      this.config['config'].sideMenu.showPrint = false;
+       this.playerType = 'sunbird-video-player';
+    }
+    this.config['context'].dispatcher = {
+      dispatch: function (event) {
+        SunbirdSdk.instance.telemetryService.saveTelemetry(JSON.stringify(event)).subscribe(
+          (res) => console.log('response after telemetry', res),
+        );
+      }
+    };
+
+    this.pauseSubscription = this.platform.pause.subscribe(() => {
+      const iframes = window.document.getElementsByTagName('iframe');
       if (iframes.length > 0) {
         iframes[0].contentWindow.postMessage('pause.youtube', '*');
       }
     });
   }
-  ionViewWillEnter() {
-    this.screenOrientation.lock(this.screenOrientation.ORIENTATIONS.LANDSCAPE);
-    this.statusBar.hide();
+  async ionViewWillEnter() {
+    if (this.playerType === 'sunbird-old-player') {
+      this.screenOrientation.lock(this.screenOrientation.ORIENTATIONS.LANDSCAPE);
+      this.statusBar.hide();
+      this.config['uid'] = this.config['context'].actor.id;
+      this.config['metadata'].basePath = '/_app_file_' + this.config['metadata'].basePath;
+
+      if (this.config['metadata'].isAvailableLocally) {
+        this.config['metadata'].contentData.streamingUrl = '/_app_file_' + this.config['metadata'].contentData.streamingUrl;
+      }
+
+      // This is to reload a iframe as iframes reload method not working on cross-origin.
+      const src = this.previewElement.nativeElement.src;
+      this.previewElement.nativeElement.src = '';
+      this.previewElement.nativeElement.src = src;
+      this.previewElement.nativeElement.onload = () => {
+        setTimeout(() => {
+          this.previewElement.nativeElement.contentWindow['cordova'] = window['cordova'];
+          this.previewElement.nativeElement.contentWindow['Media'] = window['Media'];
+          this.previewElement.nativeElement.contentWindow['initializePreview'](this.config);
+          this.previewElement.nativeElement.contentWindow.addEventListener('message', resp => {
+            if (resp.data === 'renderer:question:submitscore') {
+              this.courseService.syncAssessmentEvents().subscribe();
+            } else if (resp.data && typeof resp.data === 'object') {
+              if (resp.data['player.pdf-renderer.error']) {
+                const pdfError = resp.data['player.pdf-renderer.error'];
+                if (pdfError.name === 'MissingPDFException') {
+                  const downloadUrl = this.config['metadata']['contentData']['streamingUrl'] ||
+                    this.config['metadata']['contentData']['artifactUrl'];
+                  this.telemetryGeneratorService.generateInteractTelemetry(
+                    InteractType.TOUCH,
+                    InteractSubtype.DOWNLOAD_PDF_CLICKED,
+                    Environment.PLAYER,
+                    PageId.PLAYER,
+                    ContentUtil.getTelemetryObject(this.config['metadata']['contentData']),
+                    undefined,
+                    ContentUtil.generateRollUp(this.config['metadata']['hierarchyInfo'], this.config['metadata']['identifier']));
+                  this.openPDF(downloadUrl);
+                }
+              } else if (resp.data && resp.data.event === 'renderer:contentNotComaptible'
+                  || resp.data && resp.data.data.event === 'renderer:contentNotComaptible') {
+                cordova.plugins.InAppUpdateManager.checkForImmediateUpdate(
+                    () => {},
+                    () => {}
+                );
+              } else if (resp.data && resp.data.event === 'renderer:maxLimitExceeded') {
+                this.closeIframe();
+              }
+            } else if (this.isJSON(resp.data)) {
+              const response = JSON.parse(resp.data);
+              if (response.event === 'renderer:navigate') {
+                this.navigateBackToTrackableCollection = true;
+                this.navigateBackToContentDetails = false;
+                this.closeIframe({
+                  identifier: response.data.identifier
+                });
+              }
+            }
+          });
+        }, 1000);
+      };
+    }
 
     this.backButtonSubscription = this.platform.backButton.subscribeWithPriority(10, async () => {
       const activeAlert = await this.alertCtrl.getTop();
       if (!activeAlert) {
         this.showConfirm();
       }
+      if (this.playerType !== 'sunbird-old-player') {
+        this.location.back();
+      }
     });
-    this.config['uid'] = this.config['context'].actor.id;
-    this.config['metadata'].basePath = '/_app_file_' + this.config['metadata'].basePath;
-
-    if (this.config['metadata'].isAvailableLocally) {
-      this.config['metadata'].contentData.streamingUrl = '/_app_file_' + this.config['metadata'].contentData.streamingUrl;
-    }
-
-    // This is to reload a iframe as iframes reload method not working on cross-origin.
-    const src = this.previewElement.nativeElement.src;
-    this.previewElement.nativeElement.src = '';
-    this.previewElement.nativeElement.src = src;
-    this.previewElement.nativeElement.onload = () => {
-      console.log('config', this.config);
-      setTimeout(() => {
-        this.previewElement.nativeElement.contentWindow['cordova'] = window['cordova'];
-        this.previewElement.nativeElement.contentWindow['Media'] = window['Media'];
-        this.previewElement.nativeElement.contentWindow['initializePreview'](this.config);
-        this.previewElement.nativeElement.contentWindow.addEventListener('message', resp => {
-            console.log('Player Response', resp);
-            if (resp.data === 'renderer:question:submitscore') {
-                this.courseService.syncAssessmentEvents().subscribe();
-            }
-        });
-      }, 1000);
-    };
 
     this.events.subscribe('endGenieCanvas', (res) => {
       if (res.showConfirmBox) {
@@ -119,7 +227,7 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat
     if (this.backButtonSubscription) {
       this.backButtonSubscription.unsubscribe();
     }
-    window.removeEventListener('renderer:question:submitscore', () => {});
+    window.removeEventListener('renderer:question:submitscore', () => { });
   }
 
   ngOnDestroy() {
@@ -129,6 +237,103 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat
 
   }
 
+  async playerEvents(event) {
+    if (event.edata) {
+      if (event.edata['type'] === 'EXIT') {
+        this.location.back();
+      } else if (event.edata['type'] === 'SHARE') {
+        const popover = await this.popoverCtrl.create({
+          component: SbSharePopupComponent,
+          componentProps: {
+            content: this.content,
+            corRelationList: this.corRelationList,
+            pageId: PageId.PLAYER_PAGE,
+            shareFromPlayer: true,
+            shareItemType: this.isChildContent ? ShareItemType.LEAF_CONTENT : ShareItemType.ROOT_CONTENT
+          },
+          cssClass: 'sb-popover',
+        });
+        await popover.present();
+      } else if (event.edata['type'] === 'DOWNLOAD') {
+        if (this.content.contentData.downloadUrl) {
+          this.downloadPdfService.downloadPdf(this.content).then((res) => {
+            this.commonUtilService.showToast('CONTENT_DOWNLOADED');
+          }).catch((error) => {
+            if (error.reason === 'device-permission-denied') {
+              this.commonUtilService.showToast('DEVICE_NEEDS_PERMISSION');
+            } else if (error.reason === 'user-permission-denied') {
+              this.commonUtilService.showToast('DEVICE_NEEDS_PERMISSION');
+            } else if (error.reason === 'download-failed') {
+              this.commonUtilService.showToast('SOMETHING_WENT_WRONG');
+            }
+          });
+        } else {
+          this.commonUtilService.showToast('ERROR_CONTENT_NOT_AVAILABLE');
+        }
+      } else if (event.edata['type'] === 'PRINT') {
+        this.printPdfService.printPdf(this.config['metadata'].streamingUrl);
+      } else if(event.edata.type === 'NEXT_CONTENT_PLAY') {
+           this.playNextContent();
+      } else if (event.edata.type === 'compatibility-error') {
+        cordova.plugins.InAppUpdateManager.checkForImmediateUpdate(
+          () => {},
+          () => {}
+        );
+      }
+    }
+  }
+
+  async getNewPlayerConfiguration() {
+      const nextContent = this.config['metadata'].hierarchyInfo ? { name: this.nextContentToBePlayed.contentData.name, identifier: this.nextContentToBePlayed.contentData.identifier } : undefined;
+      this.config['context']['pdata']['pid'] = 'sunbird.app.contentplayer';
+      if (this.config['metadata'].isAvailableLocally) {
+        this.config['metadata'].contentData.streamingUrl = '/_app_file_' + this.config['metadata'].contentData.streamingUrl;
+      }
+      this.config['metadata']['contentData']['basePath'] = '/_app_file_' + this.config['metadata'].basePath;
+      this.config['metadata']['contentData']['isAvailableLocally'] = this.config['metadata'].isAvailableLocally;
+      this.config['metadata'] = this.config['metadata'].contentData;
+      this.config['data'] = {};
+      this.config['config'] = {
+        nextContent,
+        sideMenu: {
+          showShare: true,
+          showDownload: true,
+          showReplay: false,
+          showExit: true,
+          showPrint: true
+        }
+      }
+
+      if(this.config['metadata']['mimeType'] === "application/vnd.sunbird.questionset"){
+       const questionSet = await this.contentService.getQuestionSetRead(this.content.identifier, {fields:'instructions'}).toPromise();
+       this.config['metadata']['instructions'] = questionSet && questionSet.questionset.instructions ? questionSet.questionset.instructions : undefined;
+      }
+      const profile = await this.profileService.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS }).toPromise();
+      this.config['context'].userData = {
+        firstName:  profile && profile.serverProfile && profile.serverProfile.firstName ? profile.serverProfile.firstName : profile.handle,
+        lastName: ''
+      };
+      return this.config;
+  }
+
+  getNextContent(hierarchyInfo, identifier) {
+    return new Promise((resolve) => {
+      this.contentService.nextContent(hierarchyInfo, identifier).subscribe((res) => {
+        this.nextContentToBePlayed = res;
+        resolve(res);
+      })
+    })
+  }
+
+  playNextContent(){
+    const content = this.nextContentToBePlayed;
+    this.events.publish(EventTopics.NEXT_CONTENT, {
+      content,
+      course: this.course
+    });
+    this.location.back();
+  }
+
   /**
    * This will trigger from player/ iframe when it unable to find consecutive content
    * @param identifier Content Identifier
@@ -146,11 +351,11 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat
         });
      */
     setTimeout(() => {
-        this.closeIframe(content);
+      this.closeIframe(content);
     }, 1000);
     this.events.publish(EventTopics.NEXT_CONTENT, {
-        content,
-        course: this.course
+      content,
+      course: this.course
     });
   }
 
@@ -176,12 +381,21 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat
       selectedUser: this.appGlobalService.getSelectedUser()
     });
 
-    if (this.isFromToc) {
+    if (this.navigateBackToContentDetails) {
       this.router.navigate([RouterLinks.CONTENT_DETAILS], {
         state: {
           content: content ? content : this.config['metadata'],
           corRelation: this.corRelationList,
-          shouldNavigateBack: true
+          shouldNavigateBack: true,
+          isCourse: this.isCourse,
+          course: this.course
+        },
+        replaceUrl: true
+      });
+    }  else if (this.navigateBackToTrackableCollection) {
+      this.router.navigate([RouterLinks.ENROLLED_COURSE_DETAILS], {
+        state: {
+          content
         },
         replaceUrl: true
       });
@@ -199,7 +413,7 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat
       && !this.previewElement.nativeElement.contentWindow['Renderer'].running) ? 'EXIT_APP' : 'EXIT_CONTENT';
     const stageId = this.previewElement.nativeElement.contentWindow['EkstepRendererAPI'].getCurrentStageId();
     this.previewElement.nativeElement.contentWindow['TelemetryService'].interact(
-      'TOUCH', 'DEVICE_BACK_BTN', 'EXIT', { type: type, stageId: stageId });
+      'TOUCH', 'DEVICE_BACK_BTN', 'EXIT', { type, stageId });
 
     const alert = await this.alertCtrl.create({
       header: this.commonUtilService.translateMessage('CONFIRM'),
@@ -210,22 +424,96 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat
           role: 'cancel',
           handler: () => {
             this.previewElement.nativeElement.contentWindow['TelemetryService'].interact(
-              'TOUCH', 'ALERT_CANCEL', 'EXIT', { type: type, stageId: stageId });
+              'TOUCH', 'ALERT_CANCEL', 'EXIT', { type, stageId });
           }
         },
         {
           text: this.commonUtilService.translateMessage('OKAY'),
           handler: () => {
             this.previewElement.nativeElement.contentWindow['TelemetryService'].interact(
-              'END', 'ALERT_OK', 'EXIT', { type: type, stageId: stageId });
+              'END', 'ALERT_OK', 'EXIT', { type, stageId });
             this.previewElement.nativeElement.contentWindow['TelemetryService'].interrupt('OTHER', stageId);
             this.previewElement.nativeElement.contentWindow['EkstepRendererAPI'].dispatchEvent('renderer:telemetry:end');
 
             this.closeIframe();
           }
         }
-      ]
+      ],
+      cssClass: 'player-exit-popup'
     });
     await alert.present();
   }
+
+  async openPDF(url) {
+    if (this.course) {
+      setTimeout(() => {
+        this.updateContentState();
+      }, 1000);
+    }
+    const loader = await this.commonUtilService.getLoader(undefined, this.commonUtilService.translateMessage('DOWNLOADING_2'));
+    await loader.present();
+    const fileTransfer: FileTransferObject = this.transfer.create();
+    const entry = await fileTransfer
+      .download(url, cordova.file.cacheDirectory + url.substring(url.lastIndexOf('/') + 1))
+      .catch((e) => {
+        this.telemetryGeneratorService.generateErrorTelemetry(Environment.PLAYER,
+          TelemetryErrorCode.ERR_DOWNLOAD_FAILED,
+          ErrorType.SYSTEM,
+          PageId.PLAYER,
+          JSON.stringify(e),
+        );
+      });
+    loader.dismiss();
+    const stageId = this.previewElement.nativeElement.contentWindow['EkstepRendererAPI'].getCurrentStageId();
+    try {
+      this.previewElement.nativeElement.contentWindow['TelemetryService'].exit(stageId);
+    } catch (err) {
+      console.error('End telemetry error:', err.message);
+    }
+
+    if (entry) {
+      const localUrl = entry.toURL();
+      this.fileOpener
+        .open(localUrl, 'application/pdf')
+        .catch((e) => {
+          console.log('Error opening file', e);
+          this.commonUtilService.showToast('ERROR_TECHNICAL_PROBLEM');
+        });
+    }
+    this.location.back();
+
+  }
+
+  private updateContentState() {
+    const updateContentStateRequest: UpdateContentStateRequest = {
+      userId: this.config['context']['actor']['id'],
+      contentId: this.config['metadata']['identifier'],
+      courseId: this.course['identifier'] || this.course['courseId'],
+      batchId: this.course['batchId'],
+      status: 2,
+      progress: 100,
+      target: [UpdateContentStateTarget.LOCAL, UpdateContentStateTarget.SERVER]
+    };
+
+    this.courseService.updateContentState(updateContentStateRequest).subscribe();
+  }
+
+  playerTelemetryEvents(event) {
+    SunbirdSdk.instance.telemetryService.saveTelemetry(JSON.stringify(event)).subscribe(
+      (res) => console.log('response after telemetry', res),
+    );
+  }
+
+  private isJSON(input): boolean {
+    try {
+      JSON.parse(input);
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  checkIsPlayerEnabled(config , playerType) {
+    return config.fields.find(ele =>   ele.name === playerType && ele.values[0].isEnabled)
+  }
 }
diff --git a/src/app/profile-settings/profile-settings.module.ts b/src/app/profile-settings/profile-settings.module.ts
index 89cf0067c..d21687194 100644
--- a/src/app/profile-settings/profile-settings.module.ts
+++ b/src/app/profile-settings/profile-settings.module.ts
@@ -8,6 +8,7 @@ import { IonicModule } from '@ionic/angular';
 
 import { ProfileSettingsPage } from './profile-settings.page';
 import { TranslateModule } from '@ngx-translate/core';
+import {PipesModule} from '@app/pipes/pipes.module';
 
 const routes: Routes = [
   {
@@ -17,15 +18,16 @@ const routes: Routes = [
 ];
 
 @NgModule({
-  imports: [
-    DirectivesModule,
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    TranslateModule,
-    ReactiveFormsModule,
-    RouterModule.forChild(routes)
-  ],
+    imports: [
+        DirectivesModule,
+        CommonModule,
+        FormsModule,
+        IonicModule,
+        TranslateModule,
+        ReactiveFormsModule,
+        RouterModule.forChild(routes),
+        PipesModule
+    ],
   declarations: [ProfileSettingsPage]
 })
 export class ProfileSettingsPageModule {}
diff --git a/src/app/profile-settings/profile-settings.page.html b/src/app/profile-settings/profile-settings.page.html
index 689a7ed7b..43cf006bf 100644
--- a/src/app/profile-settings/profile-settings.page.html
+++ b/src/app/profile-settings/profile-settings.page.html
@@ -1,95 +1,107 @@
 <ion-content class="padding-bottom-if-header">
-	<form [formGroup]="profileSettingsForm" class="ps-container">
-		<div class="back-btn-container">
-			<ion-icon *ngIf="!hideBackButton" ios="ios-arrow-back" md="md-arrow-back" (click)="handleBackButton(true)"
-				class="top-back-button"></ion-icon>
-		</div>
-		<div class="qr-container" *ngIf="showQRScanner">
-			<div class="qr-content">
-				<img #animatedQRImage class="qr-img" src="assets/imgs/qr_with_book.svg" alt="">
-				<div class="qr-instruction-container text-center">
-					<div class="qr-instruction">
-						<span class="title">{{'APP_QR_CODE' | translate: {'%s': appName} }}</span>
-						<div class="sub-title">{{'QR_CODE_DETAILS' | translate}}</div>
-					</div>
-					<div class="qr-btn-container">
-						<div class="qr-btn" (click)="openQRScanner()">
-							<img src="assets/imgs/ic_qr_scanner.svg" alt="">
-							<span>{{'SCAN_TAP' | translate}}</span>
+	<div class="">
+		<form [formGroup]="profileSettingsForm" class="ps-container">
+			<div class="back-btn-container">
+				<img src="assets/imgs/ic_back_black.svg" *ngIf="!hideBackButton"
+					 (click)="handleBackButton(true)"
+					 class="top-back-button" alt="back">
+			</div>
+			<div class="qr-container ui-container" *ngIf="showQRScanner">
+				<div class="qr-content">
+					<img #animatedQRImage class="qr-img" src="assets/imgs/qr_with_book.svg" alt="">
+					<div class="qr-instruction-container text-center">
+						<div class="qr-instruction">
+							<span class="title">{{'APP_QR_CODE' | translate: {'%s': appName} }}</span>
+							<div class="sub-title">{{'QR_CODE_DETAILS' | translate}}</div>
+						</div>
+						<div class="qr-btn-container">
+							<div class="qr-btn" (click)="openQRScanner()">
+								<img src="assets/imgs/ic_qr_scanner.svg" alt="">
+								<span>{{'SCAN_TAP' | translate}}</span>
+							</div>
 						</div>
 					</div>
 				</div>
-			</div>
-			<div class="qr-board">
-				<div class="or-container">
-					<span class="or-circle">{{'OR' | translate}}</span>
-				</div>
-				<div class="fill-in-style msg-size">
-					<div class="fill-in-head">{{'NO_QR_CODE_QSTN' | translate}}</div>
-					<div class="fill-in-content">{{'PROVIDE_BELOW_INFO' | translate}}</div>
-				</div>
-				<div class="board-select-dummy" (click)="boardClicked($event)">
-					<ion-item appCustomIonSelect>
-						<ion-label position="stacked" class="label-font text-uppercase align-text">
-							{{'BOARD' | translate }}</ion-label>
-						<ion-select multiple="false" class="ion-text-capitalize" formControlName="syllabus"
-							[interfaceOptions]="boardOptions" (ionCancel)="cancelEvent()"
-							okText="{{'BTN_SUBMIT' | translate}}" cancelText="{{'CANCEL' | translate}}"
-							placeholder="{{'BOARD_OPTION_TEXT' | translate}}">
-							<ion-select-option *ngFor="let eachSyllabus of syllabusList" value="{{eachSyllabus.code}}">
-								{{eachSyllabus.name}}&lrm;</ion-select-option>
-						</ion-select>
-					</ion-item>
+				<div class="qr-board">
+					<div class="or-container">
+						<span class="or-circle">{{'OR' | translate}}</span>
+					</div>
+					<div class="fill-in-style msg-size">
+						<div class="fill-in-head">{{'NO_QR_CODE_QSTN' | translate}}</div>
+						<div class="fill-in-content">{{'PROVIDE_BELOW_INFO' | translate}}</div>
+					</div>
+
+					<div class="board-select-dummy" (click)="boardClicked($event)">
+						<ion-item appCustomIonSelect>
+							<ion-label position="stacked" class="label-font text-uppercase align-text">
+								{{'BOARD' | translate }}</ion-label>
+							<ion-select multiple="false" class="ion-text-capitalize" formControlName="syllabus"
+										[interfaceOptions]="boardOptions" (ionCancel)="cancelEvent()"
+										okText="{{'BTN_SUBMIT' | translate}}" cancelText="{{'CANCEL' | translate}}"
+										placeholder="{{'BOARD_OPTION_TEXT' | translate}}">
+								<ion-select-option *ngFor="let eachSyllabus of syllabusList" value="{{eachSyllabus.code}}">
+									{{eachSyllabus.name}}&lrm;</ion-select-option>
+							</ion-select>
+						</ion-item>
+						<div class="ps-board">
+							<div class="ps-board-label">{{'BOARD' | translate}}</div>
+							<button class="sb-btn sb-btn-md sb-btn-primary PR35 W100 ellipsis btn-block"
+								[style.background-color]="btnColor">
+								{{ 'BOARD_OPTION_TEXT' | translate }}
+								<img class="arrow-icon" src="assets/imgs/ic_back.svg" alt="">
+							</button>
+						</div>
+					</div>
 				</div>
 			</div>
-		</div>
-		<div novalidate class="form-position" *ngIf="!showQRScanner">
-			<ion-item appCustomIonSelect>
-				<ion-label position="stacked" class="label-font text-uppercase align-text">{{'BOARD' | translate }}
-				</ion-label>
-				<ion-select multiple="false" #boardSelect class="ion-text-capitalize" formControlName="syllabus"
-					[disabled]="!syllabusList.length" [interfaceOptions]="boardOptions" (ionCancel)="cancelEvent()"
-					okText="{{'BTN_SUBMIT' | translate}}" cancelText="{{'CANCEL' | translate}}"
-					placeholder="{{'BOARD_OPTION_TEXT' | translate}}">
-					<ion-select-option *ngFor="let eachSyllabus of syllabusList" value="{{eachSyllabus.code}}">
-						{{eachSyllabus.name}}&lrm;</ion-select-option>
-				</ion-select>
-			</ion-item>
+			<div novalidate class="form-position" *ngIf="!showQRScanner">
+				<ion-item *ngIf="!!supportedProfileAttributes['board']" appCustomIonSelect (click)="onCategoryCliked('board')">
+					<ion-label position="stacked" class="label-font text-uppercase align-text">{{'BOARD' | translate }}
+					</ion-label>
+					<ion-select multiple="false" #boardSelect class="ion-text-capitalize" formControlName="syllabus"
+						[disabled]="!syllabusList.length" [interfaceOptions]="boardOptions" (ionCancel)="cancelEvent('board')"
+						okText="{{'BTN_SUBMIT' | translate}}" cancelText="{{'CANCEL' | translate}}"
+						placeholder="{{'BOARD_OPTION_TEXT' | translate}}">
+						<ion-select-option *ngFor="let eachSyllabus of syllabusList" value="{{eachSyllabus.code}}">
+							{{eachSyllabus.name | aliased}}&lrm;</ion-select-option>
+					</ion-select>
+				</ion-item>
 
-			<ion-item appCustomIonSelect>
-				<ion-label position="stacked" class="label-font text-uppercase align-text">{{'MEDIUM' | translate }}
-				</ion-label>
-				<ion-select formControlName="medium" #mediumSelect multiple="true" class="ion-text-capitalize"
-					[interfaceOptions]="mediumOptions" (ionCancel)="cancelEvent()" okText="{{'BTN_SUBMIT' | translate}}"
-					cancelText="{{'CANCEL' | translate}}" [disabled]="!mediumList.length || !boardControl.value.length"
-					placeholder="{{'MEDIUM_OPTION_TEXT' | translate}}">
-					<ion-select-option *ngFor="let medium of mediumList" class="ion-text-capitalize"
-						value="{{medium.code}}">
-						{{medium.name}}</ion-select-option>
-				</ion-select>
-			</ion-item>
+				<ion-item *ngIf="!!supportedProfileAttributes['medium']" appCustomIonSelect (click)="onCategoryCliked('medium')">
+					<ion-label position="stacked" class="label-font text-uppercase align-text">{{'MEDIUM' | translate }}
+					</ion-label>
+					<ion-select formControlName="medium" #mediumSelect multiple="true" class="ion-text-capitalize"
+						[interfaceOptions]="mediumOptions" (ionCancel)="cancelEvent('medium')" okText="{{'BTN_SUBMIT' | translate}}"
+						cancelText="{{'CANCEL' | translate}}" [disabled]="!mediumList.length || !boardControl.value.length"
+						placeholder="{{'MEDIUM_OPTION_TEXT' | translate}}">
+						<ion-select-option *ngFor="let medium of mediumList" class="ion-text-capitalize"
+							value="{{medium.code}}">
+							{{medium.name}}</ion-select-option>
+					</ion-select>
+				</ion-item>
 
-			<ion-item appCustomIonSelect>
-				<ion-label position="stacked" class="label-font text-uppercase align-text">{{'CLASS' | translate }}
-				</ion-label>
-				<ion-select multiple="true" #gradeSelect class="ion-text-capitalize" formControlName="grade"
-					[interfaceOptions]="classOptions" okText="{{'BTN_SUBMIT' | translate}}"
-					cancelText="{{'CANCEL' | translate}}" [disabled]="!gradeList.length || !mediumControl.value.length"
-					(ionCancel)="cancelEvent()" placeholder="{{'GRADE_OPTION_TEXT' | translate}}">
-					<ion-select-option *ngFor="let grade of gradeList" class="ion-text-capitalize"
-						value="{{grade.code}}">
-						{{grade.name}}</ion-select-option>
-				</ion-select>
-			</ion-item>
+				<ion-item *ngIf="!!supportedProfileAttributes['gradeLevel']" appCustomIonSelect (click)="onCategoryCliked('grade')">
+					<ion-label position="stacked" class="label-font text-uppercase align-text">{{'CLASS' | translate }}
+					</ion-label>
+					<ion-select multiple="true" #gradeSelect class="ion-text-capitalize" formControlName="grade"
+						[interfaceOptions]="classOptions" okText="{{'BTN_SUBMIT' | translate}}"
+						cancelText="{{'CANCEL' | translate}}" [disabled]="!gradeList.length || !mediumControl.value.length"
+						(ionCancel)="cancelEvent('grade')" placeholder="{{'GRADE_OPTION_TEXT' | translate}}">
+						<ion-select-option *ngFor="let grade of gradeList" class="ion-text-capitalize"
+							value="{{grade.code}}">
+							{{grade.name}}</ion-select-option>
+					</ion-select>
+				</ion-item>
 
-		</div>
-	</form>
+			</div>
+		</form>
+	</div>
 </ion-content>
 
-<ion-footer class="ion-padding" no-border style="background: white;" *ngIf="!showQRScanner">
+<div class="ion-padding ion-no-border" style="background: white;" *ngIf="!showQRScanner">
 	<button class="sb-btn sb-btn-md sb-btn-primary PR35 W100 ellipsis btn-block ion-text-uppercase"
 		[style.background-color]="btnColor" (click)="onSubmitAttempt()">
 		{{ 'CONTINUE' | translate }}
-		<ion-icon class="arrow-icon" [class.animate]="profileSettingsForm.valid" name="arrow-round-forward"></ion-icon>
+		<img class="arrow-icon" src="assets/imgs/ic_back.svg" [class.animate]="profileSettingsForm.valid" name="arrow-round-forward" alt="">
 	</button>
-</ion-footer>
\ No newline at end of file
+</div>
diff --git a/src/app/profile-settings/profile-settings.page.scss b/src/app/profile-settings/profile-settings.page.scss
index 384a021cf..7428af648 100644
--- a/src/app/profile-settings/profile-settings.page.scss
+++ b/src/app/profile-settings/profile-settings.page.scss
@@ -1,5 +1,6 @@
 @import "src/assets/styles/variables";
 @import "src/assets/styles/_custom-mixins";
+@import "src/assets/styles/_variables.scss";
 :host {
   .scroll-content,
   .fixed-content {
@@ -57,6 +58,9 @@
       font-size: 16px;
       margin-bottom: 8px;
     }
+    .fill-in-content{
+      font-size: 14px;
+    }
   }
   .item-select-disabled {
     .label-md {
@@ -69,11 +73,15 @@
     padding-bottom: 80px !important;
   }
   .board-select-dummy{
+    .ps-board{
+      display: none;
+    }
     width: 100vw;
     margin: 0 auto;
     ion-item{
       // z-index: -1;
       pointer-events: none;
+      display: block;
     }
   }
   .ps-container{
@@ -87,6 +95,7 @@
       flex-direction: column;
       flex-grow: 1;
       flex-shrink: 1;
+      height: 100vh;
     }
     .form-position{
       flex-grow: 1;
@@ -130,30 +139,40 @@
           border-radius: 15px;
           background-color: #999999;
           text-align: center;
-          color: #fff;
+          color: map-get($colors, white);
           font-size: 16px;
           line-height: 30px;
           margin: 0 auto;
         }
       }
   }
+
   .back-btn-container{
+    height: 32px;
+    @include ltr() {
+      top: 0;
+      left: 0;
+    }
+    @include rtl() {
+      top: 0;
+      right: 0;
+    }
     flex-grow: 0;
     flex-shrink: 0;
-    position: absolute;
     .top-back-button{
-      position: relative;
-      font-size: 22px;
+      position: absolute;
+      width: 30px;
       @include ltr() {
-        top: 20px;
-        left: 20px;
+        left: 16px;
+        transform: rotate(180deg);
       }
       @include rtl() {
-        top: 20px;
-        right: 20px;
+        right: 16px;
+        transform: rotate(0deg);
       }
     }
   }
+
   .qr-content {
     display: flex;
     flex-direction: column;
@@ -163,7 +182,7 @@
     padding: 0 32px;
 
     padding-top: 50px;
-    
+
     .qr-img{
       object-fit: contain;
       min-width: 0;
@@ -186,7 +205,7 @@
       }
       .sub-title {
         padding: 8px 10% 0 10%;
-        font-size: 12px;
+        font-size: 14px;
       }
     }
     .qr-btn-container {
@@ -194,10 +213,10 @@
       margin-top: 16px;
       .qr-btn {
         display: inline-block;
-        background-color: #006de5;
+        background-color: map-get($colors, primary);
         padding: 10px 20px;
         text-align: center;
-        color: #fff;
+        color: map-get($colors, white);
         border-radius: 5px;
         box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
         img {
@@ -214,7 +233,7 @@
   }
 
   .item-label-stacked ion-select {
-    border: 1px solid #006de5;
+    border: 1px solid map-get($colors, primary);
     border-radius: 5px;
     margin-top: 16px;
     padding-left: 8px;
@@ -232,7 +251,7 @@
     }
     // Not getting used because of shadow DOM
     .select-placeholder {
-      color: #006de5;
+      color: map-get($colors, primary);
       padding-left: 10px;
     }
   }
@@ -241,32 +260,32 @@
     --highlight-background: transparent;
   }
   .item-select ion-label {
-    color: #006de5;
+    color: map-get($colors, primary);
   }
 
   .item-label-stacked.item-select-disabled {
     ion-label {
-      color: #333;
+      color: map-get($colors, primary_black);
     }
 
     ion-select {
-      border-color: #333;
+      border-color: map-get($colors, primary_black);
       // Inside Shadow DOM
       .select-icon {
         .select-icon-inner {
-          border-color: #333;
+          border-color: map-get($colors, primary_black);
           animation: none;
         }
       }
       // Inside Shadow DOM
       .select-placeholder {
-        color: #333;
+        color: map-get($colors, primary_black);
       }
     }
   }
 
   .item-label-stacked.item-has-value {
-    ion-label {
+    label {
       color: #{$gray-800};
     }
     ion-select {
@@ -284,26 +303,33 @@
       }
     }
   }
-  .arrow-icon {
-    right: 15px;
-    top: 50%;
+  img.arrow-icon {
+    display: inline-block;
     width: 22px;
+    margin-top: -3px;
+    float: right;
+
     &.animate {
       position: relative;
-      animation: upDownAnimate 5s linear infinite;
+      animation: dropDown 5s linear infinite;
       animation-duration: 0.9s;
     }
+
+    @include rtl {
+      transform: rotate(180deg);
+      float: left !important;
+    }
   }
 
   ion-label {
     opacity: 1;
-    color: #979797;
-  }; 
+    color: map-get($colors, dark_gray);
+  }
 }
 
 
 .item-label-stacked ion-select {
-  border: 1px solid #006de5;
+  border: 1px solid map-get($colors, primary);
   margin-top: 16px;
   padding-right: 10px !important;
   .select-icon {
@@ -319,7 +345,7 @@
   }
   // Not getting used because of shadow DOM
   .select-placeholder {
-    color: #006de5;
+    color: map-get($colors, primary);
     padding-left: 10px;
   }
 }
@@ -329,3 +355,7 @@
   50% {right: 10px;}
   100% {right: 0;}
 }
+
+.framework-item {
+  padding: 14px;
+}
diff --git a/src/app/profile-settings/profile-settings.page.spec.ts b/src/app/profile-settings/profile-settings.page.spec.ts
index 42c7cb15a..c3471acdc 100644
--- a/src/app/profile-settings/profile-settings.page.spec.ts
+++ b/src/app/profile-settings/profile-settings.page.spec.ts
@@ -8,7 +8,8 @@ import {
     GetSuggestedFrameworksRequest
 } from 'sunbird-sdk';
 import { TranslateService } from '@ngx-translate/core';
-import { Events, Platform, AlertController } from '@ionic/angular';
+import { Platform, AlertController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { Router, ActivatedRoute } from '@angular/router';
 import { AppVersion } from '@ionic-native/app-version/ngx';
 import {
@@ -17,14 +18,15 @@ import {
     CommonUtilService,
     SunbirdQRScanner,
     ContainerService,
-    AppHeaderService, FormAndFrameworkUtilService
+    AppHeaderService,
+    FormAndFrameworkUtilService,
 } from '../../services';
+import { ProfileHandler } from '@app/services/profile-handler';
 import { SplashScreenService } from '../../services/splash-screen.service';
 import { Location } from '@angular/common';
-import { ImpressionType, PageId, Environment, InteractSubtype, InteractType } from '../../services/telemetry-constants';
+import { PageId, Environment, InteractSubtype, InteractType } from '../../services/telemetry-constants';
 import { of, Subscription } from 'rxjs';
 import { FormControl } from '@angular/forms';
-import { doesNotReject } from 'assert';
 
 describe('ProfileSettingsPage', () => {
     let profileSettingsPage: ProfileSettingsPage;
@@ -34,21 +36,32 @@ describe('ProfileSettingsPage', () => {
     };
     const mockAppVersion: Partial<AppVersion> = {};
     const mockCommonUtilService: Partial<CommonUtilService> = {
-        translateMessage: jest.fn(() => 'select-box')
+        translateMessage: jest.fn(() => 'select-box'),
+        isAccessibleForNonStudentRole: jest.fn(),
+        isDeviceLocationAvailable: jest.fn(),
+        handleToTopicBasedNotification: jest.fn()
     };
     const mockContainer: Partial<ContainerService> = {};
-    const mockEvents: Partial<Events> = {};
+    const mockEvents: Partial<Events> = {
+        publish: jest.fn()
+    };
     const mockFrameworkService: Partial<FrameworkService> = {};
     const mockFrameworkUtilService: Partial<FrameworkUtilService> = {};
     const mockHeaderService: Partial<AppHeaderService> = {};
     const mockLocation: Partial<Location> = {};
     const mockPlatform: Partial<Platform> = {};
-    const mockProfileService: Partial<ProfileService> = {};
+    const mockProfileService: Partial<ProfileService> = {
+        updateProfile: jest.fn()
+    };
     const mockRouter: Partial<Router> = {};
     const mockScanner: Partial<SunbirdQRScanner> = {};
     const mockSplashScreenService: Partial<SplashScreenService> = {};
     const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
-        generateInteractTelemetry: jest.fn()
+        generateInteractTelemetry: jest.fn(),
+        generateBackClickedNewTelemetry: jest.fn(),
+        generatePageLoadedTelemetry: jest.fn(),
+        generateAuditTelemetry: jest.fn(),
+        generateProfilePopulatedTelemetry: jest.fn()
     };
     const mockTranslate: Partial<TranslateService> = {};
     const mockActivatedRoute: Partial<ActivatedRoute> = {};
@@ -59,6 +72,9 @@ describe('ProfileSettingsPage', () => {
     } as any;
 
     const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {};
+    const mockProfileHandler: Partial<ProfileHandler> = {
+        getSupportedProfileAttributes: jest.fn
+    };
 
     beforeAll(() => {
         profileSettingsPage = new ProfileSettingsPage(
@@ -80,7 +96,8 @@ describe('ProfileSettingsPage', () => {
             mockAlertCtrl as AlertController,
             mockLocation as Location,
             mockSplashScreenService as SplashScreenService,
-            mockActivatedRoute as ActivatedRoute
+            mockActivatedRoute as ActivatedRoute,
+            mockProfileHandler as ProfileHandler
         );
     });
 
@@ -92,6 +109,44 @@ describe('ProfileSettingsPage', () => {
         expect(profileSettingsPage).toBeTruthy();
     });
 
+    describe('handleActiveScanner', () => {
+        it('should stop active scanner', (done) => {
+            mockRouter.getCurrentNavigation = jest.fn(() => ({
+                extras: {
+                    state: {
+                        id: 'sample-id',
+                        stopScanner: true
+                    }
+                }
+            })) as any;
+            mockScanner.stopScanner = jest.fn();
+            // act
+            profileSettingsPage.handleActiveScanner();
+            // assert
+            setTimeout(() => {
+                expect(mockScanner.stopScanner).toHaveBeenCalled();
+                done();
+            }, 600);
+        });
+
+        it('should not stop active scanner for else part', (done) => {
+            mockRouter.getCurrentNavigation = jest.fn(() => ({
+                extras: {
+                    state: {
+                        id: 'sample-id',
+                        stopScanner: false
+                    }
+                }
+            })) as any;
+            // act
+            profileSettingsPage.handleActiveScanner();
+            // assert
+            setTimeout(() => {
+                done();
+            }, 0);
+        });
+    });
+
     it('should fetch active profile by invoked ngOnInit()', (done) => {
         // arrange
         mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
@@ -99,7 +154,7 @@ describe('ProfileSettingsPage', () => {
             return;
         });
         mockAppVersion.getAppName = jest.fn(() => Promise.resolve('sunbird'));
-        mockProfileService.getActiveSessionProfile = jest.fn(() => of({} as any));
+        mockProfileService.getActiveSessionProfile = jest.fn(() => of({}));
         jest.spyOn(profileSettingsPage, 'handleBackButton').mockImplementation(() => {
             return;
         });
@@ -109,50 +164,54 @@ describe('ProfileSettingsPage', () => {
         // act
         profileSettingsPage.ngOnInit().then(() => {
             // assert
-           setTimeout(() => {
-               expect(mockAppVersion.getAppName).toHaveBeenCalled();
-               expect(mockProfileService.getActiveSessionProfile).toHaveBeenCalled();
-               done();
-           }, 0);
+            setTimeout(() => {
+                expect(mockAppVersion.getAppName).toHaveBeenCalled();
+                expect(mockProfileService.getActiveSessionProfile).toHaveBeenCalled();
+                done();
+            }, 0);
         });
     });
 
-    it('should fetch active profile by invoked ngOnInit()', (done) => {
+    it('should populate the supported userTypes', (done) => {
         // arrange
         mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+        mockProfileHandler.getSupportedProfileAttributes = jest.fn(() => Promise.resolve(
+            {board: 'board',
+            medium: 'medium',
+            gradeLevel: 'gradeLevel'}));
         jest.spyOn(profileSettingsPage, 'handleActiveScanner').mockImplementation(() => {
             return;
         });
         mockAppVersion.getAppName = jest.fn(() => Promise.resolve('sunbird'));
-        mockProfileService.getActiveSessionProfile = jest.fn(() => of({} as any));
+        mockProfileService.getActiveSessionProfile = jest.fn(() => of({}));
         jest.spyOn(profileSettingsPage, 'handleBackButton').mockImplementation(() => {
             return;
         });
         jest.spyOn(profileSettingsPage, 'fetchSyllabusList').mockImplementation(() => {
             return Promise.resolve();
         });
+        profileSettingsPage.profileSettingsForm['valueChanges'] = of({} as any);
         // act
         profileSettingsPage.ngOnInit().then(() => {
             // assert
-            expect(mockAppVersion.getAppName).toHaveBeenCalled();
-            expect(mockProfileService.getActiveSessionProfile).toHaveBeenCalled();
-            done();
+            setTimeout(() => {
+                expect(mockAppVersion.getAppName).toHaveBeenCalled();
+                expect(profileSettingsPage.supportedProfileAttributes).toEqual(
+                    { board: 'board',
+                    medium: 'medium',
+                    gradeLevel: 'gradeLevel'});
+                done();
+            }, 500);
         });
     });
 
-    xit('should subscribe formControl to call ngOnDestroy()', (done) => {
+    it('should subscribe formControl to call ngOnDestroy()', () => {
         // arrange
-        const data = jest.fn();
-        const mockFormControlSubscriptions = {
-            unsubscribe: data
-        } as Partial<Subscription>;
+        const formControlSubscriptions: Partial<Subscription> = { unsubscribe: jest.fn() };
         // act
         profileSettingsPage.ngOnDestroy();
         // assert
-        setTimeout(() => {
-            expect(data).toHaveBeenCalled();
-            done();
-        }, 0);
+        expect(formControlSubscriptions).not.toBeUndefined();
     });
 
     describe('onSubmitAttempt()', () => {
@@ -165,13 +224,13 @@ describe('ProfileSettingsPage', () => {
                     let value;
                     switch (arg) {
                         case 'syllabus':
-                            value = { value: { board: []}};
+                            value = { value: { board: [] } };
                             break;
                         case 'board':
-                            value = { value: { board: []}};
+                            value = { value: { board: [] } };
                             break;
                         case 'medium':
-                            value = { value: { medium: []}};
+                            value = { value: { medium: [] } };
                             break;
                         case 'grade':
                             value = [];
@@ -227,13 +286,13 @@ describe('ProfileSettingsPage', () => {
                     let value;
                     switch (arg) {
                         case 'syllabus':
-                            value = { value: { board: ['AP']}};
+                            value = { value: { board: ['AP'] } };
                             break;
                         case 'board':
-                            value = { value: { board: ['AP']}};
+                            value = { value: { board: ['AP'] } };
                             break;
                         case 'medium':
-                            value = { value: { medium: []}};
+                            value = { value: { medium: [] } };
                             break;
                         case 'grade':
                             value = [];
@@ -259,7 +318,7 @@ describe('ProfileSettingsPage', () => {
                     syllabus: [], board: ['AP'], medium: [], grade: []
                 }
             } as any;
-            profileSettingsPage.boardSelect = {open: jest.fn()};
+            profileSettingsPage.boardSelect = { open: jest.fn() };
             // act
             profileSettingsPage.onSubmitAttempt();
             // assert
@@ -288,16 +347,16 @@ describe('ProfileSettingsPage', () => {
                     let value;
                     switch (arg) {
                         case 'syllabus':
-                            value = { value: { board: ['AP']}};
+                            value = { value: { board: ['AP'] } };
                             break;
                         case 'board':
-                            value = { value: { board: ['AP']}};
+                            value = { value: { board: ['AP'] } };
                             break;
                         case 'medium':
-                            value = { value: { medium: ['English']}};
+                            value = { value: { medium: ['English'] } };
                             break;
                         case 'grade':
-                            value = { value: { medium: []}};
+                            value = { value: { medium: [] } };
                             break;
                     }
                     return value;
@@ -320,7 +379,7 @@ describe('ProfileSettingsPage', () => {
                     syllabus: [], board: ['AP'], medium: ['English'], grade: []
                 }
             } as any;
-            profileSettingsPage.boardSelect = {open: jest.fn()};
+            profileSettingsPage.boardSelect = { open: jest.fn() };
             // act
             profileSettingsPage.onSubmitAttempt();
             // assert
@@ -339,84 +398,63 @@ describe('ProfileSettingsPage', () => {
                 values
             );
         });
-      });
-
-    it('should control Scanner to called handleActiveScanner()', (done) => {
-    // arrange
-    mockRouter.getCurrentNavigation = jest.fn(() => ({
-        extras: null
-    }as any));
-    profileSettingsPage = new ProfileSettingsPage(
-        mockProfileService as ProfileService,
-        mockFrameworkService as FrameworkService,
-        mockFrameworkUtilService as FrameworkUtilService,
-        mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
-        mockTranslate as TranslateService,
-        mockTelemetryGeneratorService as TelemetryGeneratorService,
-        mockAppGlobalService as AppGlobalService,
-        mockEvents as Events,
-        mockScanner as SunbirdQRScanner,
-        mockPlatform as Platform,
-        mockCommonUtilService as CommonUtilService,
-        mockContainer as ContainerService,
-        mockHeaderService as AppHeaderService,
-        mockRouter as Router,
-        mockAppVersion as AppVersion,
-        mockAlertCtrl as AlertController,
-        mockLocation as Location,
-        mockSplashScreenService as SplashScreenService,
-        mockActivatedRoute as ActivatedRoute
-    );
-    mockScanner.stopScanner = jest.fn();
-    // act
-    profileSettingsPage.handleActiveScanner();
-    // assert
-    setTimeout(() => {
-        expect(mockRouter.getCurrentNavigation).toHaveBeenCalled();
-        done();
-    }, 0);
-    });
 
-    it('should control Scanner to called handleActiveScanner()', (done) => {
-        // arrange
-        mockRouter.getCurrentNavigation = jest.fn(() => ({
-            extras: {
-                state: {
-                    stopScanner: true,
-                    forwardMigration: true
+        it('should generate submit clicked telemetry  if grades is empty onSubmitAttempt()', () => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => Promise.resolve({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            jest.spyOn(mockProfileService, 'updateProfile').mockReturnValue(of({}));
+            mockCommonUtilService.showToast = jest.fn();
+            const values = new Map();
+            values['board'] = 'na';
+            profileSettingsPage.profileSettingsForm = {
+                valid: true,
+                get: jest.fn((arg) => {
+                    let value;
+                    switch (arg) {
+                        case 'syllabus':
+                            value = { board: ['AP', 'NCRT'] };
+                            break;
+                        case 'board':
+                            value = { value: { board: ['AP'] } };
+                            break;
+                        case 'medium':
+                            value = { medium: ['English'] };
+                            break;
+                        case 'grade':
+                            value = { grade: ['class1'] };
+                            break;
+                    }
+                    return value;
+                }),
+                controls: {
+                    syllabus: {
+                        validator: jest.fn()
+                    },
+                    board: {
+                        validator: jest.fn()
+                    },
+                    medium: {
+                        validator: jest.fn()
+                    },
+                    grade: {
+                        validator: jest.fn()
+                    }
+                },
+                value: {
+                    syllabus: [], board: ['AP'], medium: ['English'], grade: []
                 }
-            }
-        }as any));
-        profileSettingsPage = new ProfileSettingsPage(
-            mockProfileService as ProfileService,
-            mockFrameworkService as FrameworkService,
-            mockFrameworkUtilService as FrameworkUtilService,
-            mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
-            mockTranslate as TranslateService,
-            mockTelemetryGeneratorService as TelemetryGeneratorService,
-            mockAppGlobalService as AppGlobalService,
-            mockEvents as Events,
-            mockScanner as SunbirdQRScanner,
-            mockPlatform as Platform,
-            mockCommonUtilService as CommonUtilService,
-            mockContainer as ContainerService,
-            mockHeaderService as AppHeaderService,
-            mockRouter as Router,
-            mockAppVersion as AppVersion,
-            mockAlertCtrl as AlertController,
-            mockLocation as Location,
-            mockSplashScreenService as SplashScreenService,
-            mockActivatedRoute as ActivatedRoute
-        );
-        mockScanner.stopScanner = jest.fn();
-        // act
-        profileSettingsPage.handleActiveScanner();
-        // assert
-        setTimeout(() => {
-            expect(mockRouter.getCurrentNavigation).toHaveBeenCalled();
-            expect(mockScanner.stopScanner).toHaveBeenCalled();
-            done();
-        }, 500);
+            } as any;
+            profileSettingsPage.boardSelect = { open: jest.fn() };
+            // act
+            profileSettingsPage.onSubmitAttempt();
+            // assert
+
+        });
     });
 
     it('should handle all header events by invoked ionViewWillEnter()', (done) => {
@@ -534,7 +572,7 @@ describe('ProfileSettingsPage', () => {
         mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
         const values = new Map();
         values['medium'] = 'na';
-        profileSettingsPage.boardSelect = {open: jest.fn()};
+        profileSettingsPage.boardSelect = { open: jest.fn() };
         profileSettingsPage.mediumSelect = ['hindi'];
         profileSettingsPage.gradeSelect = ['class1'];
 
@@ -543,17 +581,16 @@ describe('ProfileSettingsPage', () => {
         // assert
         expect(mockAppGlobalService.generateSaveClickedTelemetry).toHaveBeenCalledWith(
             expect.anything(),
-            'failed',
+            'passed',
             PageId.ONBOARDING_PROFILE_PREFERENCES,
             InteractSubtype.FINISH_CLICKED
         );
         expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-            InteractType.TOUCH,
-            'submit-clicked',
-            Environment.HOME,
-            PageId.ONBOARDING_PROFILE_PREFERENCES,
-            undefined,
-            values
+            InteractType.SELECT_SUBMIT, '',
+            Environment.ONBOARDING,
+            PageId.MANUAL_PROFILE,
+            undefined, undefined, undefined,
+            []
         );
     });
 
@@ -592,50 +629,50 @@ describe('ProfileSettingsPage', () => {
             mockAlertCtrl as AlertController,
             mockLocation as Location,
             mockSplashScreenService as SplashScreenService,
-            mockActivatedRoute as ActivatedRoute
+            mockActivatedRoute as ActivatedRoute,
+            mockProfileHandler as ProfileHandler
         );
-        profileSettingsPage.boardSelect = {open: jest.fn()};
+        profileSettingsPage.boardSelect = { open: jest.fn() };
         profileSettingsPage.mediumSelect = ['hindi'];
         profileSettingsPage.gradeSelect = ['class1'];
 
         // act
         profileSettingsPage.onSubmitAttempt();
         // assert
-        expect(mockAppGlobalService.generateSaveClickedTelemetry).toHaveBeenCalledWith(
-            expect.anything(),
-            'failed',
-            PageId.ONBOARDING_PROFILE_PREFERENCES,
-            InteractSubtype.FINISH_CLICKED
-        );
-        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-            InteractType.TOUCH,
-            'submit-clicked',
-            Environment.HOME,
-            PageId.ONBOARDING_PROFILE_PREFERENCES,
-            undefined,
-            values
-        );
-
+        // expect(mockAppGlobalService.generateSaveClickedTelemetry).toHaveBeenCalledWith(
+        //     expect.anything(),
+        //     'failed',
+        //     PageId.ONBOARDING_PROFILE_PREFERENCES,
+        //     InteractSubtype.FINISH_CLICKED
+        // );
+        // expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+        //     InteractType.TOUCH,
+        //     'submit-clicked',
+        //     Environment.HOME,
+        //     PageId.ONBOARDING_PROFILE_PREFERENCES,
+        //     undefined,
+        //     values
+        // );
     });
 
     describe('boardClicked', () => {
 
-        it('should prevent assigning default values and open board details popup', (done) => {
-            // arrange
-            const payloadEvent: any = {
-                stopPropagation: jest.fn(),
-                preventDefault: jest.fn()
-            };
-            profileSettingsPage.boardSelect.open = jest.fn();
-            // act
-            profileSettingsPage.boardClicked(payloadEvent);
-            // assert
-            expect(profileSettingsPage.showQRScanner).toEqual(false);
-            setTimeout(() => {
-                expect(profileSettingsPage.boardSelect.open).toHaveBeenCalled();
-                done();
-            }, 0);
-        });
+        // it('should prevent assigning default values and open board details popup', (done) => {
+        //     // arrange
+        //     const payloadEvent: any = {
+        //         stopPropagation: jest.fn(),
+        //         preventDefault: jest.fn()
+        //     };
+        //     profileSettingsPage.boardSelect.open = jest.fn();
+        //     // act
+        //     profileSettingsPage.boardClicked(payloadEvent);
+        //     // assert
+        //     expect(profileSettingsPage.showQRScanner).toEqual(false);
+        //     setTimeout(() => {
+        //         expect(profileSettingsPage.boardSelect.open).toHaveBeenCalled();
+        //         done();
+        //     }, 0);
+        // });
 
         it('should skip assigning default values', () => {
             // arrange
@@ -697,11 +734,29 @@ describe('ProfileSettingsPage', () => {
 
     describe('cancelEvent', () => {
 
-        it('should generate interact event when event is canceled', () => {
+        it('should generate interact event when event is canceled board', () => {
             // arrange
             mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
             // act
-            profileSettingsPage.cancelEvent();
+            profileSettingsPage.cancelEvent('board');
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+        });
+
+        it('should generate interact event when event is canceled medium', () => {
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            // act
+            profileSettingsPage.cancelEvent('board');
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+        });
+
+        it('should generate interact event when event is canceled grade', () => {
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            // act
+            profileSettingsPage.cancelEvent('grade');
             // assert
             expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
         });
@@ -856,4 +911,83 @@ describe('ProfileSettingsPage', () => {
 
     });
 
+    describe('onCategoryCliked()', () => {
+        it('onCategoryCliked clicked for board', () => {
+            // act
+            profileSettingsPage.onCategoryCliked('board');
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toBeCalled();
+        });
+        it('onCategoryCliked clicked for medium', () => {
+            // act
+            profileSettingsPage.onCategoryCliked('medium');
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toBeCalled();
+        });
+        it('onCategoryCliked clicked for grade', () => {
+            // act
+            profileSettingsPage.onCategoryCliked('grade');
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toBeCalled();
+        });
+    });
+
+    describe('generateCategorySubmitTelemetry()', () => {
+        beforeAll(() => {
+            profileSettingsPage.profileSettingsForm = {
+                get: jest.fn((arg) => {
+                    let value;
+                    switch (arg) {
+                        case 'syllabus':
+                            value = { value: ['AP'] };
+                            break;
+                        case 'board':
+                            value = { value: ['AP'] };
+                            break;
+                        case 'medium':
+                            value = { value: ['English'] };
+                            break;
+                        case 'grade':
+                            value = { value: ['Class 1'] };
+                            break;
+                    }
+                    return value;
+                }),
+                controls: {
+                    syllabus: {
+                        validator: jest.fn()
+                    },
+                    board: {
+                        validator: jest.fn()
+                    },
+                    medium: {
+                        validator: jest.fn()
+                    },
+                    grade: {
+                        validator: jest.fn()
+                    }
+                },
+            } as any;
+        });
+        it('generateCategorySubmitTelemetry clicked for board', () => {
+            // arrange
+            // act
+            profileSettingsPage.generateCategorySubmitTelemetry('board');
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toBeCalled();
+        });
+        it('generateCategorySubmitTelemetry clicked for medium', () => {
+            // act
+            profileSettingsPage.generateCategorySubmitTelemetry('medium');
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toBeCalled();
+        });
+        it('generateCategorySubmitTelemetry clicked for grade', () => {
+            // act
+            profileSettingsPage.generateCategorySubmitTelemetry('grade');
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toBeCalled();
+        });
+    });
+
 });
diff --git a/src/app/profile-settings/profile-settings.page.ts b/src/app/profile-settings/profile-settings.page.ts
index 562a7bb90..f0b2703d9 100644
--- a/src/app/profile-settings/profile-settings.page.ts
+++ b/src/app/profile-settings/profile-settings.page.ts
@@ -1,14 +1,22 @@
-import {FormAndFrameworkUtilService} from './../../services/formandframeworkutil.service';
-import {AfterViewInit, Component, ElementRef, Inject, OnDestroy, OnInit, ViewChild} from '@angular/core';
-import {combineLatest, Observable, Subscription} from 'rxjs';
-import {delay, tap} from 'rxjs/operators';
-import {ActivatedRoute, NavigationExtras, Router} from '@angular/router';
-import {AppVersion} from '@ionic-native/app-version/ngx';
-import {TranslateService} from '@ngx-translate/core';
-import {FormControl, FormGroup} from '@angular/forms';
-import {ProfileConstants, RouterLinks} from '@app/app/app.constant';
-import {GUEST_STUDENT_TABS, GUEST_TEACHER_TABS, initTabs} from '@app/app/module.service';
-import {Environment, ImpressionType, InteractSubtype, InteractType, PageId} from '@app/services/telemetry-constants';
+import { FormAndFrameworkUtilService } from './../../services/formandframeworkutil.service';
+import { AfterViewInit, Component, ElementRef, Inject, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { combineLatest, Observable, Subscription } from 'rxjs';
+import { delay, tap } from 'rxjs/operators';
+import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
+import { AppVersion } from '@ionic-native/app-version/ngx';
+import { TranslateService } from '@ngx-translate/core';
+import { FormControl, FormGroup } from '@angular/forms';
+import { ProfileConstants, RouterLinks } from '@app/app/app.constant';
+import { GUEST_STUDENT_TABS, GUEST_TEACHER_TABS, initTabs } from '@app/app/module.service';
+import {
+  Environment,
+  ImpressionType,
+  InteractSubtype,
+  InteractType,
+  PageId,
+  CorReleationDataType,
+  AuditType
+} from '@app/services/telemetry-constants';
 import {
   Framework,
   FrameworkCategoryCode,
@@ -19,8 +27,9 @@ import {
   GetSuggestedFrameworksRequest,
   Profile,
   ProfileService,
-  ProfileType
-} from 'sunbird-sdk';
+  ProfileType,
+  CorrelationData,
+  AuditState} from 'sunbird-sdk';
 import {
   AppGlobalService,
   AppHeaderService,
@@ -29,10 +38,12 @@ import {
   SunbirdQRScanner,
   TelemetryGeneratorService
 } from 'services';
-import {AlertController, Events, Platform} from '@ionic/angular';
-import {Location} from '@angular/common';
-import {SplashScreenService} from '@app/services/splash-screen.service';
-import {CachedItemRequestSourceFrom} from '@project-sunbird/sunbird-sdk';
+import { AlertController, Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { Location } from '@angular/common';
+import { SplashScreenService } from '@app/services/splash-screen.service';
+import { CachedItemRequestSourceFrom } from '@project-sunbird/sunbird-sdk';
+import { ProfileHandler } from '@app/services/profile-handler';
 
 @Component({
   selector: 'app-profile-settings',
@@ -41,10 +52,10 @@ import {CachedItemRequestSourceFrom} from '@project-sunbird/sunbird-sdk';
 })
 export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
   public pageId = 'ProfileSettingsPage';
-  @ViewChild('boardSelect') boardSelect: any;
-  @ViewChild('mediumSelect') mediumSelect: any;
-  @ViewChild('gradeSelect') gradeSelect: any;
-  @ViewChild('animatedQRImage') animatedQRImageRef: ElementRef;
+  @ViewChild('boardSelect', { static: false }) boardSelect: any;
+  @ViewChild('mediumSelect', { static: false }) mediumSelect: any;
+  @ViewChild('gradeSelect', { static: false }) gradeSelect: any;
+  @ViewChild('animatedQRImage', { static: false }) animatedQRImageRef: ElementRef;
 
   private framework: Framework;
   private navParams: any;
@@ -64,6 +75,8 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
   public mediumList: { name: string, code: string }[] = [];
   public gradeList: { name: string, code: string }[] = [];
 
+  public supportedProfileAttributes: { [key: string]: string } = {};
+
   boardOptions = {
     title: this.commonUtilService.translateMessage('BOARD_OPTION_TEXT'),
     cssClass: 'ftue-changes'
@@ -112,18 +125,18 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
     private alertCtrl: AlertController,
     private location: Location,
     private splashScreenService: SplashScreenService,
-    private activatedRoute: ActivatedRoute
+    private activatedRoute: ActivatedRoute,
+    private profileHandler: ProfileHandler
   ) {
     this.profileSettingsForm = new FormGroup({
-      syllabus: new FormControl([], (c) => c.value.length ? undefined : { length: 'NOT_SELECTED' }),
-      board: new FormControl([], (c) => c.value.length ? undefined : { length: 'NOT_SELECTED' }),
-      medium: new FormControl([], (c) => c.value.length ? undefined : { length: 'NOT_SELECTED' }),
-      grade: new FormControl([], (c) => c.value.length ? undefined : { length: 'NOT_SELECTED' })
+      syllabus: new FormControl([]),
+      board: new FormControl([]),
+      medium: new FormControl([]),
+      grade: new FormControl([])
     });
   }
 
   async ngOnInit() {
-
     this.handleActiveScanner();
 
     this.appVersion.getAppName().then((appName) => {
@@ -134,36 +147,30 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
       requiredFields: ProfileConstants.REQUIRED_FIELDS
     }).toPromise();
 
-    this.formControlSubscriptions = combineLatest(
-      this.onSyllabusChange(),
-      this.onMediumChange(),
-      this.profileSettingsForm.valueChanges.pipe(
-        delay(250),
-        tap(() => {
-          this.btnColor = this.profileSettingsForm.valid ? '#006DE5' : '#8FC4FF';
-        })
-      )
-    ).subscribe();
 
+    this.supportedProfileAttributes = await this.profileHandler.getSupportedProfileAttributes();
+    const subscriptionArray: Array<any> = this.updateAttributeStreamsnSetValidators(this.supportedProfileAttributes);
+    this.formControlSubscriptions = combineLatest(subscriptionArray).subscribe();
     await this.fetchSyllabusList();
   }
 
+
   ngAfterViewInit() {
     plugins['webViewChecker'].getCurrentWebViewPackageInfo()
       .then((packageInfo) => {
         this.formAndFrameworkUtilService.getWebviewConfig().then((webviewVersion) => {
           if (parseInt(packageInfo.versionName.split('.')[0], 10) <= webviewVersion) {
             this.animatedQRImageRef.nativeElement.style.width =
-            this.animatedQRImageRef.nativeElement.style.height = 'auto';
+              this.animatedQRImageRef.nativeElement.style.height = 'auto';
             this.animatedQRImageRef.nativeElement.style.minWidth =
-            this.animatedQRImageRef.nativeElement.style.minHeight = 0;
+              this.animatedQRImageRef.nativeElement.style.minHeight = 0;
           }
         }).catch(() => {
           if (parseInt(packageInfo.versionName.split('.')[0], 10) <= 54) {
             this.animatedQRImageRef.nativeElement.style.width =
-            this.animatedQRImageRef.nativeElement.style.height = 'auto';
+              this.animatedQRImageRef.nativeElement.style.height = 'auto';
             this.animatedQRImageRef.nativeElement.style.minWidth =
-            this.animatedQRImageRef.nativeElement.style.minHeight = 0;
+              this.animatedQRImageRef.nativeElement.style.minHeight = 0;
           }
         });
       });
@@ -206,9 +213,16 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
     if (this.router.url === '/' + RouterLinks.PROFILE_SETTINGS) {
       setTimeout(() => {
         this.telemetryGeneratorService.generateImpressionTelemetry(
-            ImpressionType.VIEW, '',
-            PageId.ONBOARDING_PROFILE_PREFERENCES,
-            Environment.ONBOARDING
+          ImpressionType.VIEW, '',
+          PageId.ONBOARDING_PROFILE_PREFERENCES,
+          Environment.ONBOARDING
+        );
+
+        /* New Telemetry */
+        this.telemetryGeneratorService.generateImpressionTelemetry(
+          ImpressionType.PAGE_REQUEST, '',
+          PageId.SCAN_OR_MANUAL,
+          Environment.ONBOARDING
         );
       }, 350);
     }
@@ -222,7 +236,9 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
       this.handleHeaderEvents(eventName);
     });
 
-    if (this.navParams) {
+    if (history.state && history.state.hideBackButton !== undefined) {
+      this.hideBackButton = history.state.hideBackButton;
+    } else if (this.navParams) {
       this.hideBackButton = Boolean(this.navParams.hideBackButton);
     }
 
@@ -253,17 +269,36 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
 
     if (activePortal) {
       activePortal.dismiss();
-    } else {
+    } else if (!this.hideBackButton) {
       this.location.back();
     }
   }
 
-  cancelEvent() {
-    this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
-      InteractSubtype.CANCEL_CLICKED,
+  cancelEvent(category?: string) {
+    let correlationList: Array<CorrelationData> = [];
+
+    /* New Telemetry */
+    switch (category) {
+      case 'board':
+        correlationList = this.populateCData(this.syllabusControl.value, CorReleationDataType.BOARD);
+        break;
+      case 'medium':
+        correlationList = this.populateCData(this.mediumControl.value, CorReleationDataType.MEDIUM);
+        break;
+      case 'grade':
+        correlationList = this.populateCData(this.gradeControl.value, CorReleationDataType.CLASS);
+        break;
+    }
+    correlationList.push({ id: PageId.POPUP_CATEGORY, type: CorReleationDataType.CHILD_UI });
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_CANCEL, '',
       Environment.ONBOARDING,
-      PageId.ONBOARDING_PROFILE_PREFERENCES,
-      undefined);
+      PageId.MANUAL_PROFILE,
+      undefined,
+      undefined,
+      undefined,
+      correlationList
+    );
   }
 
   extractProfileForTelemetry(formVal): any {
@@ -289,12 +324,18 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
   }
 
   handleBackButton(isNavBack) {
+    this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.ONBOARDING_PROFILE_PREFERENCES, Environment.ONBOARDING, isNavBack);
+    /* New Telemetry */
+    this.telemetryGeneratorService.generateBackClickedNewTelemetry(
+      !isNavBack,
+      Environment.ONBOARDING,
+      this.showQRScanner ? PageId.SCAN_OR_MANUAL : PageId.MANUAL_PROFILE
+    );
+
     if (this.showQRScanner === false) {
       this.showQRScanner = true;
       this.resetProfileSettingsForm();
-      this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.ONBOARDING_PROFILE_PREFERENCES, Environment.ONBOARDING, isNavBack);
     } else {
-      this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.ONBOARDING_PROFILE_PREFERENCES, Environment.ONBOARDING, isNavBack);
       this.dismissPopup();
     }
   }
@@ -306,6 +347,12 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
       Environment.ONBOARDING,
       PageId.ONBOARDING_PROFILE_PREFERENCES,
     );
+    /* New Telemetry */
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_QRSCANER, '',
+      Environment.ONBOARDING,
+      PageId.SCAN_OR_MANUAL
+    );
     this.scanner.startScanner(PageId.ONBOARDING_PROFILE_PREFERENCES, true).then((scannedData) => {
       if (scannedData === 'skip') {
         this.telemetryGeneratorService.generateImpressionTelemetry(
@@ -324,6 +371,20 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
     if (this.profileSettingsForm.valid) {
       this.appGlobalService.generateSaveClickedTelemetry(this.extractProfileForTelemetry(this.profileSettingsForm.value), 'passed',
         PageId.ONBOARDING_PROFILE_PREFERENCES, InteractSubtype.FINISH_CLICKED);
+      /* New Telemetry */
+      let correlationList: Array<CorrelationData> = [];
+      correlationList = this.populateCData(this.syllabusControl.value, CorReleationDataType.BOARD);
+      correlationList = correlationList.concat(this.populateCData(this.mediumControl.value, CorReleationDataType.MEDIUM));
+      correlationList = correlationList.concat(this.populateCData(this.gradeControl.value, CorReleationDataType.CLASS));
+      this.telemetryGeneratorService.generateInteractTelemetry(
+        InteractType.SELECT_SUBMIT, '',
+        Environment.ONBOARDING,
+        PageId.MANUAL_PROFILE,
+        undefined,
+        undefined,
+        undefined,
+        correlationList
+      );
       this.submitProfileSettingsForm();
       return;
     }
@@ -392,12 +453,27 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
 
     this.frameworkUtilService.getActiveChannelSuggestedFrameworkList(getSuggestedFrameworksRequest).toPromise()
       .then(async (frameworks: Framework[]) => {
+
         if (!frameworks || !frameworks.length) {
           await this.loader.dismiss();
           this.commonUtilService.showToast('NO_DATA_FOUND');
           return;
         }
         this.syllabusList = frameworks.map(r => ({ name: r.name, code: r.identifier }));
+
+
+        /* New Telemetry */
+        const correlationList: Array<CorrelationData> = [];
+        correlationList.push({ id: this.syllabusList.length.toString(), type: CorReleationDataType.BOARD_COUNT });
+        this.telemetryGeneratorService.generatePageLoadedTelemetry(
+          PageId.SCAN_OR_MANUAL,
+          Environment.ONBOARDING,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          correlationList
+        );
         await this.loader.dismiss();
       });
   }
@@ -426,6 +502,9 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
             requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
           }).toPromise();
 
+          /* New Telemetry */
+          this.generateCategorySubmitTelemetry('board');
+
           const boardCategoryTermsRequet: GetFrameworkCategoryTermsRequest = {
             frameworkId: this.framework.identifier,
             requiredCategories: [FrameworkCategoryCode.BOARD],
@@ -434,7 +513,7 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
           };
 
           const boardTerm = (await this.frameworkUtilService.getFrameworkCategoryTerms(boardCategoryTermsRequet).toPromise())
-            .find(b => b.name === (this.syllabusList.find((s) => s.code === value[0])!.name));
+            .find(b => b.name === (this.syllabusList.find((s) => s.code === value[0]).name));
 
           this.boardControl.patchValue([boardTerm.code]);
 
@@ -451,10 +530,8 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
             .map(t => ({ name: t.name, code: t.code }));
 
         } catch (e) {
-          // todo
           console.error(e);
         } finally {
-          // todo
           this.mediumControl.patchValue([]);
           this.loader.dismiss();
         }
@@ -465,6 +542,10 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
   private onMediumChange(): Observable<string[]> {
     return this.mediumControl.valueChanges.pipe(
       tap(async () => {
+
+        /* New Telemetry */
+        this.generateCategorySubmitTelemetry('medium');
+
         await this.commonUtilService.getLoader().then((loader) => {
           this.loader = loader;
           this.loader.present();
@@ -484,10 +565,8 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
             .map(t => ({ name: t.name, code: t.code }));
 
         } catch (e) {
-          // todo
           console.error(e);
         } finally {
-          // todo
           this.gradeControl.patchValue([]);
           this.loader.dismiss();
         }
@@ -495,6 +574,17 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
     );
   }
 
+  private onGradeChange(): Observable<string[]> {
+    return this.gradeControl.valueChanges.pipe(
+      tap(async () => {
+
+        /* New Telemetry */
+        this.generateCategorySubmitTelemetry('grade');
+
+      })
+    );
+  }
+
   private async submitProfileSettingsForm() {
     await this.commonUtilService.getLoader().then((loader) => {
       this.loader = loader;
@@ -539,6 +629,21 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
         this.telemetryGeneratorService.generateProfilePopulatedTelemetry(
           PageId.ONBOARDING_PROFILE_PREFERENCES, profile, 'manual', Environment.ONBOARDING
         );
+        let correlationlist: Array<CorrelationData> = [{ id: PageId.MANUAL_PROFILE, type: CorReleationDataType.FROM_PAGE }];
+        correlationlist = correlationlist.concat(this.populateCData(this.boardControl.value, CorReleationDataType.BOARD));
+        correlationlist = correlationlist.concat(this.populateCData(this.mediumControl.value, CorReleationDataType.MEDIUM));
+        correlationlist = correlationlist.concat(this.populateCData(this.gradeControl.value, CorReleationDataType.CLASS));
+        correlationlist.push({ id: PageId.MANUAL, type: CorReleationDataType.FILL_MODE });
+        this.telemetryGeneratorService.generateAuditTelemetry(
+          Environment.ONBOARDING,
+          AuditState.AUDIT_UPDATED,
+          undefined,
+          AuditType.SET_PROFILE,
+          undefined,
+          undefined,
+          undefined,
+          correlationlist
+        );
         this.loader = await this.commonUtilService.getLoader(2000);
         await this.loader.present();
       })
@@ -549,6 +654,20 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
       });
   }
 
+
+  private populateCData(formControllerValues, correlationType): Array<CorrelationData> {
+    const correlationList: Array<CorrelationData> = [];
+    if (formControllerValues) {
+      formControllerValues.forEach((value) => {
+        correlationList.push({
+          id: value,
+          type: correlationType
+        });
+      });
+    }
+    return correlationList;
+  }
+
   private resetProfileSettingsForm() {
     this.profileSettingsForm.reset({
       syllabus: [],
@@ -565,8 +684,121 @@ export class ProfileSettingsPage implements OnInit, OnDestroy, AfterViewInit {
     }
 
     this.showQRScanner = false;
+
+    /* New Telemetry */
+    this.telemetryGeneratorService.generatePageLoadedTelemetry(
+      PageId.MANUAL_PROFILE,
+      Environment.ONBOARDING
+    );
+
+    const correlationList: Array<CorrelationData> = [];
+    correlationList.push({ id: this.syllabusList.length.toString(), type: CorReleationDataType.BOARD_COUNT });
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_CATEGORY, '',
+      Environment.ONBOARDING,
+      PageId.SCAN_OR_MANUAL,
+      undefined,
+      undefined,
+      undefined,
+      correlationList
+    );
+
     setTimeout(() => {
       this.boardSelect.open();
     }, 0);
   }
+
+  onCategoryCliked(category: string) {
+    const correlationList: Array<CorrelationData> = [];
+    const correlationData: CorrelationData = new CorrelationData();
+    switch (category) {
+      case 'board':
+        correlationData.id = this.syllabusList.length.toString();
+        correlationData.type = CorReleationDataType.BOARD_COUNT;
+        break;
+      case 'medium':
+        correlationData.id = this.mediumList.length.toString();
+        correlationData.type = CorReleationDataType.MEDIUM_COUNT;
+        break;
+      case 'grade':
+        correlationData.id = this.gradeList.length.toString();
+        correlationData.type = CorReleationDataType.CLASS_COUNT;
+        break;
+    }
+    correlationList.push(correlationData);
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_CATEGORY, '',
+      Environment.ONBOARDING,
+      PageId.MANUAL_PROFILE,
+      undefined,
+      undefined,
+      undefined,
+      correlationList
+    );
+  }
+
+  generateCategorySubmitTelemetry(category: string) {
+    let correlationList: Array<CorrelationData> = [];
+    switch (category) {
+      case 'board':
+        if (!this.syllabusControl.value.length) {
+          return;
+        }
+        correlationList = this.populateCData(this.syllabusControl.value, CorReleationDataType.BOARD);
+        break;
+      case 'medium':
+        if (!this.mediumControl.value.length) {
+          return;
+        }
+        correlationList = this.populateCData(this.mediumControl.value, CorReleationDataType.MEDIUM);
+        break;
+      case 'grade':
+        if (!this.gradeControl.value.length) {
+          return;
+        }
+        correlationList = this.populateCData(this.gradeControl.value, CorReleationDataType.CLASS);
+        break;
+    }
+    correlationList.push({ id: PageId.POPUP_CATEGORY, type: CorReleationDataType.CHILD_UI });
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_SUBMIT, '',
+      Environment.ONBOARDING,
+      PageId.MANUAL_PROFILE,
+      undefined,
+      undefined,
+      undefined,
+      correlationList
+    );
+  }
+
+  private updateAttributeStreamsnSetValidators(attributes: { [key: string]: string }): Array<any> {
+    const subscriptionArray = [];
+    console.log('attributes', attributes);
+    
+    Object.keys(attributes).forEach((attribute) => {
+      console.log('attribute', attribute);
+      switch (attribute) {
+        case 'board':
+          subscriptionArray.push(this.onSyllabusChange());
+          this.boardControl.setValidators((c) => c.value.length ? undefined : { length: 'NOT_SELECTED' });
+          break;
+        case 'medium':
+          subscriptionArray.push(this.onMediumChange());
+          this.mediumControl.setValidators((c) => c.value.length ? undefined : { length: 'NOT_SELECTED' });
+          break;
+        case 'gradeLevel':
+          subscriptionArray.push(this.onGradeChange());
+          this.gradeControl.setValidators((c) => c.value.length ? undefined : { length: 'NOT_SELECTED' });
+          break;
+      }
+    });
+    subscriptionArray.push(this.profileSettingsForm.valueChanges.pipe(
+      delay(250),
+      tap(() => {
+        this.btnColor = this.profileSettingsForm.valid ? '#006DE5' : '#8FC4FF';
+      })
+    ));
+    return subscriptionArray;
+  }
+
 }
diff --git a/src/app/profile/categories-edit/categories-edit.module.ts b/src/app/profile/categories-edit/categories-edit.module.ts
index 3c32baa6e..1cdf3af22 100644
--- a/src/app/profile/categories-edit/categories-edit.module.ts
+++ b/src/app/profile/categories-edit/categories-edit.module.ts
@@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular';
 
 import { CategoriesEditPage } from './categories-edit.page';
 import { TranslateModule } from '@ngx-translate/core';
+import {PipesModule} from '@app/pipes/pipes.module';
 
 const routes: Routes = [
   {
@@ -16,14 +17,15 @@ const routes: Routes = [
 ];
 
 @NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    ReactiveFormsModule,
-    IonicModule,
-    RouterModule.forChild(routes),
-    TranslateModule
-  ],
+    imports: [
+        CommonModule,
+        FormsModule,
+        ReactiveFormsModule,
+        IonicModule,
+        RouterModule.forChild(routes),
+        TranslateModule,
+        PipesModule
+    ],
   declarations: [CategoriesEditPage]
 })
 export class CategoriesEditPageModule {}
diff --git a/src/app/profile/categories-edit/categories-edit.page.html b/src/app/profile/categories-edit/categories-edit.page.html
index 74e06efa2..ae5728390 100644
--- a/src/app/profile/categories-edit/categories-edit.page.html
+++ b/src/app/profile/categories-edit/categories-edit.page.html
@@ -9,7 +9,7 @@
 
 <ion-content class="ion-padding-vertical">
   <form [formGroup]="profileEditForm">
-    <ion-item *ngIf="isBoardAvailable">
+    <ion-item *ngIf="isBoardAvailable || !!supportedProfileAttributes['board']">
       <ion-label position="stacked" class="label-font">{{'BOARD' | translate}} &lrm;<ion-text>
           <span style="color: red;">&nbsp;*</span>
         </ion-text>
@@ -19,11 +19,11 @@
         okText="{{'BTN_SUBMIT' | translate}}" cancelText="{{'CANCEL' | translate}}"
         [disabled]="!syllabusList.length">
         <ion-select-option *ngFor="let eachSyllabus of syllabusList" value="{{eachSyllabus?.code}}">
-          {{eachSyllabus?.name}}
+          {{eachSyllabus?.name | aliased}}
           &lrm;</ion-select-option>
       </ion-select>
     </ion-item>
-    <ion-item>
+    <ion-item *ngIf="!!supportedProfileAttributes['medium']">
       <ion-label position="stacked" class="label-font">{{'MEDIUM' | translate}}<ion-text>
           <span style="color: red;">&nbsp;*</span>
         </ion-text>
@@ -36,7 +36,7 @@
         </ion-select-option>
       </ion-select>
     </ion-item>
-    <ion-item>
+    <ion-item *ngIf="!!supportedProfileAttributes['gradeLevel']">
       <ion-label position="stacked" class="label-font">{{'CLASS' | translate}}<ion-text>
           <span style="color: red;">&nbsp;*</span>
         </ion-text>
@@ -51,7 +51,7 @@
         </ion-select-option>
       </ion-select>
     </ion-item>
-    <ion-item *ngIf="!showOnlyMandatoryFields">
+    <ion-item *ngIf="(!showOnlyMandatoryFields || !!supportedProfileAttributes['subject']) && userType!='administrator'">
       <ion-label position="stacked" class="label-font">{{'SUBJECTS' | translate}}</ion-label>
       <ion-select formControlName="subjects" multiple="true" [interfaceOptions]="subjectOptions"
         placeholder="{{ (subjectList.length ? 'SUBJECT_OPTION_TEXT':'NO_DATA_FOUND') | translate }}"
diff --git a/src/app/profile/categories-edit/categories-edit.page.scss b/src/app/profile/categories-edit/categories-edit.page.scss
index 35ced2177..6d4909649 100644
--- a/src/app/profile/categories-edit/categories-edit.page.scss
+++ b/src/app/profile/categories-edit/categories-edit.page.scss
@@ -2,7 +2,7 @@
 :host {
   .label-font {
     font-weight: 600 !important;
-    color: #979797 !important;
+    color: map-get($colors, dark_gray) !important;
     font-size: 1.4rem !important;
   }
   .select-text {
diff --git a/src/app/profile/categories-edit/categories-edit.page.spec.ts b/src/app/profile/categories-edit/categories-edit.page.spec.ts
new file mode 100644
index 000000000..d0141f623
--- /dev/null
+++ b/src/app/profile/categories-edit/categories-edit.page.spec.ts
@@ -0,0 +1,963 @@
+import { CategoriesEditPage } from './categories-edit.page';
+import {
+    FrameworkService,
+    FrameworkUtilService,
+    ProfileService
+} from 'sunbird-sdk';
+import { TranslateService } from '@ngx-translate/core';
+import { Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { Router, ActivatedRoute, NavigationExtras } from '@angular/router';
+import {
+    AppGlobalService,
+    CommonUtilService,
+    ContainerService,
+    AppHeaderService,
+    ActivePageService,
+    FormAndFrameworkUtilService
+} from '../../../services';
+import { Location } from '@angular/common';
+import { FormBuilder } from '@angular/forms';
+import { ProfileHandler } from '@app/services/profile-handler';
+import { SbProgressLoader } from '../../../services/sb-progress-loader.service';
+import { ExternalIdVerificationService } from '@app/services/externalid-verification.service';
+import { TncUpdateHandlerService } from '@app/services/handlers/tnc-update-handler.service';
+import { of, throwError } from 'rxjs';
+import { SharedPreferences } from '@project-sunbird/sunbird-sdk';
+import { PreferenceKey, RouterLinks } from '../../app.constant';
+
+describe('CategoryEditPage', () => {
+    let categoryEditPage: CategoriesEditPage;
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        generateSaveClickedTelemetry: jest.fn(),
+        closeSigninOnboardingLoader: jest.fn(),
+        getCurrentUser: jest.fn(() => ({ board: ['AP'] }))
+    };
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        translateMessage: jest.fn(() => 'select-box'),
+        showToast: jest.fn()
+    };
+    const mockContainer: Partial<ContainerService> = {};
+    const mockEvents: Partial<Events> = {};
+    const mockFrameworkService: Partial<FrameworkService> = {};
+    const mockFrameworkUtilService: Partial<FrameworkUtilService> = {};
+    const mockHeaderService: Partial<AppHeaderService> = {};
+    const mockLocation: Partial<Location> = {};
+    const mockProfileService: Partial<ProfileService> = {};
+    const mockRoterExtras = {
+        extras: {
+            state: {
+                contentType: 'contentType',
+                corRelationList: 'corRelationList',
+                source: 'source',
+                enrolledCourses: 'enrolledCourses' as any,
+                userId: 'userId',
+                shouldGenerateEndTelemetry: false,
+                isNewUser: true,
+                lastCreatedProfile: { id: 'sample-id' },
+                showOnlyMandatoryFields: true,
+                hasFilledLocation: true,
+                isRootPage: true,
+                profile: {
+                    serverProfile: {
+                        userType: 'teacher',
+                        firstName: 'sample-user',
+                    }
+                }
+            }
+        }
+    };
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => mockRoterExtras as any),
+        navigate: jest.fn(() => Promise.resolve(true))
+    };
+    const mockTranslate: Partial<TranslateService> = {};
+    const mockPlatform: Partial<Platform> = {};
+    const mockActivatedRoute: Partial<ActivatedRoute> = {};
+    mockActivatedRoute.snapshot = {
+        queryParams: {
+            reOnBoard: {}
+        }
+    } as any;
+
+    const mockProgressLoader: Partial<SbProgressLoader> = {};
+    const mockTncUpdateHandler: Partial<TncUpdateHandlerService> = {};
+    const mockExternalIdVerificationService: Partial<ExternalIdVerificationService> = {};
+    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {};
+    const mockActivePageService: Partial<ActivePageService> = {};
+    const mockFb: Partial<FormBuilder> = {
+        group: jest.fn(() => ({})) as any,
+        control: jest.fn()
+    };
+
+    const mockProfileHandler: Partial<ProfileHandler> = {
+        getSupportedProfileAttributes: jest.fn(() => Promise.resolve({ borad: 'board', medium: 'medium', gradeLevel: 'gradeLevel' }))
+    };
+    const mockSharedPreferences: Partial<SharedPreferences> = {};
+
+    beforeAll(() => {
+        categoryEditPage = new CategoriesEditPage(
+            mockProfileService as ProfileService,
+            mockFrameworkService as FrameworkService,
+            mockFrameworkUtilService as FrameworkUtilService,
+            mockSharedPreferences as SharedPreferences,
+            mockCommonUtilService as CommonUtilService,
+            mockFb as FormBuilder,
+            mockTranslate as TranslateService,
+            mockAppGlobalService as AppGlobalService,
+            mockEvents as Events,
+            mockContainer as ContainerService,
+            mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
+            mockHeaderService as AppHeaderService,
+            mockRouter as Router,
+            mockLocation as Location,
+            mockPlatform as Platform,
+            mockActivePageService as ActivePageService,
+            mockExternalIdVerificationService as ExternalIdVerificationService,
+            mockTncUpdateHandler as TncUpdateHandlerService,
+            mockProgressLoader as SbProgressLoader,
+
+            mockProfileHandler as ProfileHandler
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should be create a instance of CategoryEditPage', () => {
+        expect(categoryEditPage).toBeTruthy();
+    });
+
+    describe('get', () => {
+        it('should be initialized syllabus', () => {
+            // arrange
+            categoryEditPage.profileEditForm = {
+                get: jest.fn(() => ({
+                    syllabus: ['sample-syllabus']
+                })),
+            } as any;
+            expect(categoryEditPage.syllabusControl).toBeTruthy();
+        });
+
+        it('should be initialized boardControl', () => {
+            // arrange
+            categoryEditPage.profileEditForm = {
+                get: jest.fn(() => ({
+                    boards: ['sample-board']
+                })),
+            } as any;
+            expect(categoryEditPage.boardControl).toBeTruthy();
+        });
+
+        it('should be initialized mediumControl', () => {
+            // arrange
+            categoryEditPage.profileEditForm = {
+                get: jest.fn(() => ({
+                    medium: ['english']
+                })),
+            } as any;
+            expect(categoryEditPage.mediumControl).toBeTruthy();
+        });
+
+        it('should be initialized gradeControl', () => {
+            // arrange
+            categoryEditPage.profileEditForm = {
+                get: jest.fn(() => ({
+                    grades: ['sample-grade']
+                })),
+            } as any;
+            expect(categoryEditPage.gradeControl).toBeTruthy();
+        });
+
+        it('should be initialized subject', () => {
+            // arrange
+            categoryEditPage.profileEditForm = {
+                get: jest.fn(() => ({
+                    subjects: ['sample-grade']
+                })),
+            } as any;
+            expect(categoryEditPage.subjectControl).toBeTruthy();
+        });
+    });
+
+    describe('ngOnInit', () => {
+        it('should populate the supported attributes', (done) => {
+            // arrange
+            mockProfileHandler.getSupportedProfileAttributes = jest.fn(() => Promise.resolve(
+                {
+                    board: 'board',
+                    medium: 'medium',
+                    gradeLevel: 'gradeLevel'
+                }));
+            categoryEditPage['onSyllabusChange'] = jest.fn(() => of({} as any));
+            categoryEditPage['onMediumChange'] = jest.fn(() => of({} as any));
+            categoryEditPage['onGradeChange'] = jest.fn(() => of({} as any));
+            mockSharedPreferences.getString = jest.fn(() => of('userType'));
+            // act
+            categoryEditPage.ngOnInit().then(() => {
+                // assert
+                expect(mockSharedPreferences.getString).toHaveBeenCalledWith(PreferenceKey.SELECTED_USER_TYPE);
+                expect(categoryEditPage.supportedProfileAttributes).toEqual({
+                    board: 'board',
+                    medium: 'medium',
+                    gradeLevel: 'gradeLevel'
+                });
+                done();
+            });
+        });
+    });
+
+    it('should create a loader', (done) => {
+        const presentFn = jest.fn(() => Promise.resolve());
+        mockCommonUtilService.getLoader = jest.fn(() => Promise.resolve({
+            present: presentFn,
+            dismiss: jest.fn(() => Promise.resolve())
+        }));
+        categoryEditPage.initializeLoader();
+        setTimeout(() => {
+            expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
+    describe('getSyllabusDetails', () => {
+        it('should show a toast if framework is empty', (done) => {
+            // arrange
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => Promise.resolve({
+                present: presentFn,
+                dismiss: dismissFn
+            }));
+            mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList = jest.fn(() => of([]));
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            categoryEditPage.getSyllabusDetails();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('NO_DATA_FOUND');
+                done();
+            }, 0);
+        });
+    });
+
+    describe('getLoggedInFrameworkCategory', () => {
+        it('should return error message for board', (done) => {
+            // arrange
+            mockFrameworkService.getChannelDetails = jest.fn(() => of({
+                identifier: 'sample-id',
+                code: 'sample-code'
+            }));
+            mockFrameworkService.getFrameworkDetails = jest.fn(() => of({
+                name: 'sample-name',
+                identifier: 'sample-id',
+                categories: [{code: 'board', identifier: 'sample-id'}, {code: 'medium', identifier: 'sample-id1'}]
+            }));
+            mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList = jest.fn(() => of([{
+                name: 'sample-name',
+                identifier: 'sample-id'
+            }]));
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
+            };
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Turn on WiFi or mobile data and try again');
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            categoryEditPage.getLoggedInFrameworkCategory();
+            // assert
+            setTimeout(() => {
+                expect(mockFrameworkService.getChannelDetails).toHaveBeenCalled();
+                expect(mockFrameworkService.getFrameworkDetails).toHaveBeenCalled();
+                expect(mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList).toHaveBeenCalled();
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeFalsy();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('NEED_INTERNET_TO_CHANGE');
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('Turn on WiFi or mobile data and try again');
+                done();
+            }, 0);
+        });
+
+        it('should return error message for medium', (done) => {
+            // arrange
+            mockFrameworkService.getChannelDetails = jest.fn(() => of({
+                identifier: 'sample-id',
+                code: 'sample-code'
+            }));
+            mockFrameworkService.getFrameworkDetails = jest.fn(() => of({
+                name: 'sample-name',
+                identifier: 'sample-id',
+                categories: [{code: 'medium', identifier: 'sample-id1'}]
+            }));
+            mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList = jest.fn(() => of([{
+                name: 'sample-name',
+                identifier: 'sample-id'
+            }]));
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            // act
+            categoryEditPage.getLoggedInFrameworkCategory();
+            // assert
+            setTimeout(() => {
+                expect(mockFrameworkService.getChannelDetails).toHaveBeenCalled();
+                expect(mockFrameworkService.getFrameworkDetails).toHaveBeenCalled();
+                expect(mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList).toHaveBeenCalled();
+                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeTruthy();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('ionViewWillEnter', () => {
+        it('should subscribe back button for loggedIn User', () => {
+            // arrange
+            categoryEditPage.initializeLoader = jest.fn(() => Promise.resolve());
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+            categoryEditPage.getLoggedInFrameworkCategory = jest.fn(() => Promise.resolve());
+            mockHeaderService.getDefaultPageConfig = jest.fn(() => ({
+                actionButtons: [''],
+                showHeader: true,
+                showBurgerMenu: true
+            })) as any;
+            mockHeaderService.updatePageConfig = jest.fn();
+            categoryEditPage.isRootPage = true;
+            const subscribeWithPriorityData = jest.fn((_, fn) => fn());
+            mockPlatform.backButton = {
+                subscribeWithPriority: subscribeWithPriorityData,
+            } as any;
+            mockActivePageService.computePageId = jest.fn(() => 'sample-page');
+            mockCommonUtilService.showExitPopUp = jest.fn(() => Promise.resolve());
+            // act
+            categoryEditPage.ionViewWillEnter();
+            // assert
+            expect(categoryEditPage.initializeLoader).toHaveBeenCalled();
+            expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+            expect(categoryEditPage.getLoggedInFrameworkCategory).toHaveBeenCalled();
+            expect(categoryEditPage.disableSubmitButton).toBeFalsy();
+            expect(mockHeaderService.getDefaultPageConfig).toHaveBeenCalled();
+            expect(mockHeaderService.updatePageConfig).toHaveBeenCalled();
+            expect(categoryEditPage.isRootPage).toBeTruthy();
+            expect(mockPlatform.backButton).toBeTruthy();
+            expect(subscribeWithPriorityData).toHaveBeenCalled();
+            expect(mockActivePageService.computePageId).toHaveBeenCalled();
+            expect(mockCommonUtilService.showExitPopUp).toHaveBeenCalled();
+        });
+
+        it('should invoked getSyllabusDetails for guest User', () => {
+            // arrange
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => Promise.resolve({
+                present: presentFn,
+                dismiss: dismissFn
+            }));
+            categoryEditPage.initializeLoader = jest.fn(() => Promise.resolve());
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+            mockHeaderService.getDefaultPageConfig = jest.fn(() => ({
+                actionButtons: [''],
+                showHeader: true,
+                showBurgerMenu: true
+            })) as any;
+            mockHeaderService.updatePageConfig = jest.fn();
+            categoryEditPage.isRootPage = false;
+            mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList = jest.fn(() => of([]));
+            // act
+            categoryEditPage.ionViewWillEnter();
+            // assert
+            expect(categoryEditPage.initializeLoader).toHaveBeenCalled();
+            expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+            expect(categoryEditPage.disableSubmitButton).toBeFalsy();
+            expect(mockHeaderService.getDefaultPageConfig).toHaveBeenCalled();
+            expect(mockHeaderService.updatePageConfig).toHaveBeenCalled();
+            expect(categoryEditPage.isRootPage).toBeFalsy();
+        });
+    });
+
+    it('should hide progress loader', () => {
+        mockProgressLoader.hide = jest.fn(() => Promise.resolve());
+        categoryEditPage.ionViewDidEnter();
+        expect(mockProgressLoader.hide).toHaveBeenCalled();
+    });
+
+    describe('initializeForm', () => {
+        it('should initialized edit form data if board length is greaterthan 1', () => {
+            // arrange
+            categoryEditPage.profile = {
+                board: ['cbsc', 'ncrt']
+            };
+            // act
+            categoryEditPage.initializeForm();
+            // assert
+            expect(categoryEditPage.profile).toBeTruthy();
+        });
+    });
+
+    describe('submitForm', () => {
+        it('should navigate to TABS if location is filled and SSO user ', (done) => {
+            // arrange
+            const formVal = {
+                boards: ['cbsc'],
+                medium: ['english'],
+                grades: ['class1'],
+                syllabus: ['sample-syllabus']
+            };
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            categoryEditPage.loader = {
+                present: presentFn,
+                dismiss: dismissFn
+            };
+            categoryEditPage.boardList = [{
+                code: 'cbsc',
+                name: 'CBSC'
+            }];
+            categoryEditPage.mediumList = [{
+                code: 'english',
+                name: 'English'
+            }];
+            categoryEditPage.gradeList = [{
+                code: 'class1',
+                name: 'Class 1'
+            }];
+            categoryEditPage.isBoardAvailable = true;
+            mockAppGlobalService.showYearOfBirthPopup = jest.fn();
+            mockProfileService.updateServerProfile = jest.fn(() => of({}));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Profile updated successfully');
+            mockCommonUtilService.showToast = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            categoryEditPage.showOnlyMandatoryFields = true;
+            mockTncUpdateHandler.isSSOUser = jest.fn(() => Promise.resolve(false));
+            mockProfileService.getServerProfilesDetails = jest.fn(() => of({
+                userId: 'user-id',
+                firstName: 'sample-user-name'
+            }));
+            mockContainer.removeAllTabs = jest.fn();
+            mockContainer.addTab = jest.fn();
+            mockFormAndFrameworkUtilService.updateLoggedInUser = jest.fn(() => Promise.resolve());
+            categoryEditPage.hasFilledLocation = true;
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            mockExternalIdVerificationService.showExternalIdVerificationPopup = jest.fn(() => Promise.resolve());
+            // act
+            categoryEditPage.submitForm(formVal);
+            // assert
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockProfileService.updateServerProfile).toHaveBeenCalled();
+                expect(categoryEditPage.disableSubmitButton).toBeTruthy();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('PROFILE_UPDATE_SUCCESS');
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('Profile updated successfully');
+                expect(mockEvents.publish).toHaveBeenCalled();
+                expect(categoryEditPage.showOnlyMandatoryFields).toBeTruthy();
+                expect(mockProfileService.getServerProfilesDetails).toHaveBeenCalled();
+                expect(mockContainer.removeAllTabs).toHaveBeenCalled();
+                expect(mockContainer.addTab).toHaveBeenCalled();
+                expect(mockFormAndFrameworkUtilService.updateLoggedInUser).toHaveBeenCalled();
+                expect(categoryEditPage.hasFilledLocation).toBeTruthy();
+                expect(mockRouter.navigate).toHaveBeenCalled();
+                expect(mockExternalIdVerificationService.showExternalIdVerificationPopup).toHaveBeenCalled();
+                expect(mockTncUpdateHandler.isSSOUser).toHaveBeenCalled();
+                expect(mockAppGlobalService.showYearOfBirthPopup).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should navigate to DISTRICT_MAPPING if location is not updated ', (done) => {
+            // arrange
+            const formVal = {
+                boards: ['cbsc'],
+                medium: ['english'],
+                grades: ['class1'],
+                syllabus: ['sample-syllabus']
+            };
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            categoryEditPage.loader = {
+                present: presentFn,
+                dismiss: dismissFn
+            };
+            categoryEditPage.boardList = [{
+                code: 'cbsc',
+                name: 'CBSC'
+            }];
+            categoryEditPage.mediumList = [{
+                code: 'english',
+                name: 'English'
+            }];
+            categoryEditPage.gradeList = [{
+                code: 'class1',
+                name: 'Class 1'
+            }];
+            mockProfileService.updateServerProfile = jest.fn(() => of({}));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Profile updated successfully');
+            mockCommonUtilService.showToast = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            categoryEditPage.showOnlyMandatoryFields = true;
+            mockProfileService.getServerProfilesDetails = jest.fn(() => of({
+                userId: 'user-id',
+                firstName: 'sample-user-name'
+            }));
+            mockContainer.removeAllTabs = jest.fn();
+            mockContainer.addTab = jest.fn();
+            mockFormAndFrameworkUtilService.updateLoggedInUser = jest.fn(() => Promise.resolve());
+            categoryEditPage.hasFilledLocation = false;
+            mockTncUpdateHandler.isSSOUser = jest.fn(() => Promise.resolve(false));
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            // act
+            categoryEditPage.submitForm(formVal);
+            // assert
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockProfileService.updateServerProfile).toHaveBeenCalled();
+                expect(categoryEditPage.disableSubmitButton).toBeTruthy();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('PROFILE_UPDATE_SUCCESS');
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('Profile updated successfully');
+                expect(mockEvents.publish).toHaveBeenCalled();
+                expect(mockTncUpdateHandler.isSSOUser).toHaveBeenCalled();
+                expect(categoryEditPage.showOnlyMandatoryFields).toBeTruthy();
+                expect(mockProfileService.getServerProfilesDetails).toHaveBeenCalled();
+                expect(mockContainer.removeAllTabs).toHaveBeenCalled();
+                expect(mockContainer.addTab).toHaveBeenCalled();
+                expect(mockFormAndFrameworkUtilService.updateLoggedInUser).toHaveBeenCalled();
+                expect(categoryEditPage.hasFilledLocation).toBeFalsy();
+                expect(mockRouter.navigate).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should navigate to TABS if location is filled for getServerProfile catch part', (done) => {
+            // arrange
+            const formVal = {
+                boards: ['cbsc'],
+                medium: ['english'],
+                grades: ['class1'],
+                syllabus: ['sample-syllabus'],
+                subjects: ['math']
+            };
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            categoryEditPage.loader = {
+                present: presentFn,
+                dismiss: dismissFn
+            };
+            categoryEditPage.boardList = [{
+                code: 'cbsc',
+                name: 'CBSC'
+            }];
+            categoryEditPage.mediumList = [{
+                code: 'english',
+                name: 'English'
+            }];
+            categoryEditPage.gradeList = [{
+                code: 'class1',
+                name: 'Class 1'
+            }];
+            categoryEditPage.subjectList = [{
+                code: 'math',
+                name: 'math'
+            }];
+            categoryEditPage.profile = {
+                serverProfile: {
+                    dob: null
+                }
+            };
+            mockAppGlobalService.showYearOfBirthPopup = jest.fn();
+            categoryEditPage.isBoardAvailable = false;
+            mockProfileService.updateServerProfile = jest.fn(() => of({}));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Profile updated successfully');
+            mockCommonUtilService.showToast = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            categoryEditPage.showOnlyMandatoryFields = true;
+            mockProfileService.getServerProfilesDetails = jest.fn(() => throwError({ err: 'server error' }));
+            mockContainer.removeAllTabs = jest.fn();
+            mockContainer.addTab = jest.fn();
+            mockFormAndFrameworkUtilService.updateLoggedInUser = jest.fn(() => Promise.resolve());
+            categoryEditPage.hasFilledLocation = true;
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            mockExternalIdVerificationService.showExternalIdVerificationPopup = jest.fn(() => Promise.resolve());
+            // act
+            categoryEditPage.submitForm(formVal);
+            // assert
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockProfileService.updateServerProfile).toHaveBeenCalled();
+                expect(categoryEditPage.disableSubmitButton).toBeTruthy();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('PROFILE_UPDATE_SUCCESS');
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('Profile updated successfully');
+                expect(mockEvents.publish).toHaveBeenCalled();
+                expect(categoryEditPage.showOnlyMandatoryFields).toBeTruthy();
+                expect(mockProfileService.getServerProfilesDetails).toHaveBeenCalled();
+                expect(mockContainer.removeAllTabs).toHaveBeenCalled();
+                expect(mockContainer.addTab).toHaveBeenCalled();
+                expect(categoryEditPage.hasFilledLocation).toBeTruthy();
+                expect(mockRouter.navigate).toHaveBeenCalled();
+                expect(mockExternalIdVerificationService.showExternalIdVerificationPopup).toHaveBeenCalled();
+                expect(mockAppGlobalService.showYearOfBirthPopup).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should navigate to district mapping if location is not updated for getServerProfile catch part', (done) => {
+            // arrange
+            const formVal = {
+                boards: ['cbsc'],
+                medium: ['english'],
+                grades: ['class1'],
+                syllabus: ['sample-syllabus'],
+                subjects: ['math']
+            };
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            categoryEditPage.loader = {
+                present: presentFn,
+                dismiss: dismissFn
+            };
+            categoryEditPage.boardList = [{
+                code: 'cbsc',
+                name: 'CBSC'
+            }];
+            categoryEditPage.mediumList = [{
+                code: 'english',
+                name: 'English'
+            }];
+            categoryEditPage.gradeList = [{
+                code: 'class1',
+                name: 'Class 1'
+            }];
+            categoryEditPage.subjectList = [{
+                code: 'math',
+                name: 'math'
+            }];
+            const navigationExtras: NavigationExtras = {
+                state: {
+                    isShowBackButton: false
+                }
+            }
+            categoryEditPage.isBoardAvailable = false;
+            mockProfileService.updateServerProfile = jest.fn(() => of({}));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Profile updated successfully');
+            mockCommonUtilService.showToast = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            categoryEditPage.showOnlyMandatoryFields = true;
+            mockProfileService.getServerProfilesDetails = jest.fn(() => throwError({ err: 'server error' }));
+            mockContainer.removeAllTabs = jest.fn();
+            mockContainer.addTab = jest.fn();
+            mockFormAndFrameworkUtilService.updateLoggedInUser = jest.fn(() => Promise.resolve());
+            categoryEditPage.hasFilledLocation = false;
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            // act
+            categoryEditPage.submitForm(formVal);
+            // assert
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockProfileService.updateServerProfile).toHaveBeenCalled();
+                expect(categoryEditPage.disableSubmitButton).toBeTruthy();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('PROFILE_UPDATE_SUCCESS');
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('Profile updated successfully');
+                expect(mockEvents.publish).toHaveBeenCalled();
+                expect(categoryEditPage.showOnlyMandatoryFields).toBeTruthy();
+                expect(mockProfileService.getServerProfilesDetails).toHaveBeenCalled();
+                expect(mockContainer.removeAllTabs).toHaveBeenCalled();
+                expect(mockContainer.addTab).toHaveBeenCalled();
+                expect(categoryEditPage.hasFilledLocation).toBeFalsy();
+                expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.DISTRICT_MAPPING], navigationExtras);
+                done();
+            }, 0);
+        });
+
+        it('should navigate to previous page if showOnlyMandatoryFields are empty', (done) => {
+            // arrange
+            const formVal = {
+                boards: ['cbsc'],
+                medium: ['english'],
+                grades: ['class1'],
+                syllabus: ['sample-syllabus'],
+                subjects: ['math']
+            };
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            categoryEditPage.loader = {
+                present: presentFn,
+                dismiss: dismissFn
+            };
+            categoryEditPage.boardList = [{
+                code: 'cbsc',
+                name: 'CBSC'
+            }];
+            categoryEditPage.mediumList = [{
+                code: 'english',
+                name: 'English'
+            }];
+            categoryEditPage.gradeList = [{
+                code: 'class1',
+                name: 'Class 1'
+            }];
+            categoryEditPage.subjectList = [{
+                code: 'math',
+                name: 'math'
+            }];
+            categoryEditPage.isBoardAvailable = false;
+            mockProfileService.updateServerProfile = jest.fn(() => of({}));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Profile updated successfully');
+            mockCommonUtilService.showToast = jest.fn();
+            mockEvents.publish = jest.fn(() => []);
+            categoryEditPage.showOnlyMandatoryFields = false;
+            mockLocation.back = jest.fn();
+            // act
+            categoryEditPage.submitForm(formVal);
+            // assert
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockProfileService.updateServerProfile).toHaveBeenCalled();
+                expect(categoryEditPage.disableSubmitButton).toBeTruthy();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('PROFILE_UPDATE_SUCCESS');
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('Profile updated successfully');
+                expect(mockEvents.publish).toHaveBeenCalled();
+                expect(categoryEditPage.showOnlyMandatoryFields).toBeFalsy();
+                expect(mockLocation.back).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should failed to update server profiile', (done) => {
+            // arrange
+            const formVal = {
+                boards: ['cbsc'],
+                medium: ['english'],
+                grades: ['class1'],
+                syllabus: ['sample-syllabus'],
+                subjects: ['math']
+            };
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            categoryEditPage.loader = {
+                present: presentFn,
+                dismiss: dismissFn
+            };
+            categoryEditPage.boardList = [{
+                code: 'cbsc',
+                name: 'CBSC'
+            }];
+            categoryEditPage.mediumList = [{
+                code: 'english',
+                name: 'English'
+            }];
+            categoryEditPage.gradeList = [{
+                code: 'class1',
+                name: 'Class 1'
+            }];
+            categoryEditPage.subjectList = [{
+                code: 'math',
+                name: 'math'
+            }];
+            categoryEditPage.isBoardAvailable = false;
+            mockProfileService.updateServerProfile = jest.fn(() => throwError({ err: 'PROFILE_UPDATE_FAILED' }));
+            mockCommonUtilService.translateMessage = jest.fn(() => 'Profile updated failed');
+            mockCommonUtilService.showToast = jest.fn();
+            categoryEditPage.showOnlyMandatoryFields = false;
+            mockLocation.back = jest.fn();
+            // act
+            categoryEditPage.submitForm(formVal);
+            // assert
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockProfileService.updateServerProfile).toHaveBeenCalled();
+                expect(categoryEditPage.disableSubmitButton).toBeTruthy();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('PROFILE_UPDATE_FAILED');
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('Profile updated failed');
+                expect(categoryEditPage.showOnlyMandatoryFields).toBeFalsy();
+                done();
+            }, 0);
+        });
+    });
+
+    describe('onSubmit', () => {
+        it('should open board select popup', () => {
+            // arrange
+            categoryEditPage.profileEditForm = {
+                value: {
+                    boards: []
+                }
+            } as any;
+            categoryEditPage.isBoardAvailable = true;
+            categoryEditPage.showOnlyMandatoryFields = true;
+            const openFn = jest.fn(() => Promise.resolve());
+            categoryEditPage.boardSelect = {
+                open: openFn
+            } as any;
+            // act
+            categoryEditPage.onSubmit();
+            // assert
+            expect(categoryEditPage.isBoardAvailable).toBeTruthy();
+            expect(categoryEditPage.boardSelect).toBeTruthy();
+        });
+
+        it('should return error message if mandetoryMessage is false for board', () => {
+            // arrange
+            categoryEditPage.profileEditForm = {
+                value: {
+                    boards: []
+                }
+            } as any;
+            categoryEditPage.isBoardAvailable = true;
+            categoryEditPage.showOnlyMandatoryFields = false;
+            mockCommonUtilService.showToast = jest.fn();
+            mockCommonUtilService.translateMessage = jest.fn(() => 'sample-error-message');
+            // act
+            categoryEditPage.onSubmit();
+            // assert
+            expect(categoryEditPage.isBoardAvailable).toBeTruthy();
+            expect(categoryEditPage.showOnlyMandatoryFields).toBeFalsy();
+        });
+
+        it('should open board select popup', () => {
+            // arrange
+            categoryEditPage.profileEditForm = {
+                value: {
+                    boards: ['cbsc'],
+                    medium: []
+                }
+            } as any;
+            categoryEditPage.supportedProfileAttributes = { medium: 'sample-medium' };
+            categoryEditPage.showOnlyMandatoryFields = true;
+            const openFn = jest.fn(() => Promise.resolve());
+            categoryEditPage.mediumSelect = {
+                open: openFn
+            } as any;
+            // act
+            categoryEditPage.onSubmit();
+            // assert
+            expect(categoryEditPage.supportedProfileAttributes).toBeTruthy();
+            expect(categoryEditPage.mediumSelect).toBeTruthy();
+            expect(openFn).toHaveBeenCalled();
+        });
+
+        it('should return error message if mandetoryMessage is false for board', () => {
+            // arrange
+            categoryEditPage.profileEditForm = {
+                value: {
+                    boards: ['cbsc'],
+                    medium: []
+                }
+            } as any;
+            categoryEditPage.supportedProfileAttributes = { medium: 'sample-medium' };
+            categoryEditPage.showOnlyMandatoryFields = false;
+            mockCommonUtilService.showToast = jest.fn();
+            mockCommonUtilService.translateMessage = jest.fn(() => 'sample-error-message');
+            // act
+            categoryEditPage.onSubmit();
+            // assert
+            expect(categoryEditPage.supportedProfileAttributes).toBeTruthy();
+            expect(categoryEditPage.showOnlyMandatoryFields).toBeFalsy();
+            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('sample-error-message', false, 'redErrorToast');
+            expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'MEDIUM');
+            expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'PLEASE_SELECT', 'sample-error-message');
+        });
+
+        it('should open board select popup', () => {
+            // arrange
+            categoryEditPage.profileEditForm = {
+                value: {
+                    boards: ['cbsc'],
+                    medium: ['english'],
+                    grades: []
+                }
+            } as any;
+            categoryEditPage.supportedProfileAttributes = { gradeLevel: 'sample-gradeLevel' };
+            categoryEditPage.showOnlyMandatoryFields = true;
+            const openFn = jest.fn(() => Promise.resolve());
+            categoryEditPage.gradeSelect = {
+                open: openFn
+            } as any;
+            // act
+            categoryEditPage.onSubmit();
+            // assert
+            expect(categoryEditPage.supportedProfileAttributes).toBeTruthy();
+            expect(categoryEditPage.gradeSelect).toBeTruthy();
+            expect(openFn).toHaveBeenCalled();
+        });
+
+        it('should return error message if mandetoryMessage is false for board', () => {
+            // arrange
+            categoryEditPage.profileEditForm = {
+                value: {
+                    boards: ['cbsc'],
+                    medium: ['english'],
+                    grades: []
+                }
+            } as any;
+            categoryEditPage.supportedProfileAttributes = { gradeLevel: 'sample-gradeLevel' };
+            categoryEditPage.showOnlyMandatoryFields = false;
+            mockCommonUtilService.showToast = jest.fn();
+            mockCommonUtilService.translateMessage = jest.fn(() => 'sample-error-message');
+            // act
+            categoryEditPage.onSubmit();
+            // assert
+            expect(categoryEditPage.supportedProfileAttributes).toBeTruthy();
+            expect(categoryEditPage.showOnlyMandatoryFields).toBeFalsy();
+            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('sample-error-message', false, 'redErrorToast');
+            expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'CLASS');
+            expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'PLEASE_SELECT', 'sample-error-message');
+        });
+
+        it('should invoked submitForm if all required fields is not missing', () => {
+            // arrange
+            categoryEditPage.profileEditForm = {
+                value: {
+                    boards: ['cbsc'],
+                    medium: ['english'],
+                    grades: ['class 1']
+                }
+            } as any;
+            jest.spyOn(categoryEditPage, 'submitForm').mockImplementation(() => {
+                return Promise.resolve();
+            });
+            // act
+            categoryEditPage.onSubmit();
+            // assert
+            expect(categoryEditPage.profileEditForm).toBeTruthy();
+        });
+    });
+
+    describe('enableSubmitButton', () => {
+        it('should disable submit button', () => {
+            // arrange
+            categoryEditPage.profileEditForm = {
+                value: {
+                    boards: ['cbsc'],
+                    medium: ['english'],
+                    grades: []
+                }
+            } as any;
+            // act
+            categoryEditPage.enableSubmitButton();
+            // assert
+            expect(categoryEditPage.btnColor).toBe('#8FC4FF');
+        });
+
+        it('should enable submit button', () => {
+            // arrange
+            categoryEditPage.profileEditForm = {
+                value: {
+                    boards: ['cbsc'],
+                    medium: ['english'],
+                    grades: ['class 1']
+                }
+            } as any;
+            // act
+            categoryEditPage.enableSubmitButton();
+            // assert
+            expect(categoryEditPage.btnColor).toBe('#006DE5');
+        });
+    });
+});
diff --git a/src/app/profile/categories-edit/categories-edit.page.ts b/src/app/profile/categories-edit/categories-edit.page.ts
index d92436050..2fa5988a1 100644
--- a/src/app/profile/categories-edit/categories-edit.page.ts
+++ b/src/app/profile/categories-edit/categories-edit.page.ts
@@ -1,7 +1,8 @@
 import { tap } from 'rxjs/operators';
 import { Subscription, combineLatest, Observable } from 'rxjs';
-import { Component, Inject, ViewChild, ChangeDetectorRef, OnInit, OnDestroy } from '@angular/core';
-import { Events, IonSelect, Platform } from '@ionic/angular';
+import { Component, Inject, ViewChild, OnInit, OnDestroy } from '@angular/core';
+import { IonSelect, Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { FormBuilder, FormGroup, FormControl } from '@angular/forms';
 import { TranslateService } from '@ngx-translate/core';
 import { initTabs, LOGIN_TEACHER_TABS } from '@app/app/module.service';
@@ -10,29 +11,30 @@ import {
   FrameworkUtilService,
   GetSuggestedFrameworksRequest,
   GetFrameworkCategoryTermsRequest,
-  FrameworkDetailsRequest,
   Framework,
   FrameworkCategoryCodesGroup,
   Profile,
   ProfileService,
-  CategoryTerm,
   UpdateServerProfileInfoRequest,
   ServerProfileDetailsRequest,
   CachedItemRequestSourceFrom,
   Channel,
-  FrameworkCategoryCode
+  FrameworkCategoryCode,
+  SharedPreferences
 } from 'sunbird-sdk';
 import { CommonUtilService } from '@app/services/common-util.service';
 import { AppGlobalService } from '@app/services/app-global-service.service';
 import { AppHeaderService } from '@app/services/app-header.service';
 import { FormAndFrameworkUtilService } from '@app/services/formandframeworkutil.service';
 import { ContainerService } from '@app/services/container.services';
-import { ProfileConstants, RouterLinks } from '@app/app/app.constant';
-import { ActivatedRoute, Router, NavigationExtras } from '@angular/router';
+import { PreferenceKey, ProfileConstants, RouterLinks } from '@app/app/app.constant';
+import { Router, NavigationExtras } from '@angular/router';
 import { Location } from '@angular/common';
 import { Environment, ActivePageService } from '@app/services';
 import { ExternalIdVerificationService } from '@app/services/externalid-verification.service';
 import { TncUpdateHandlerService } from '@app/services/handlers/tnc-update-handler.service';
+import { SbProgressLoader } from '@app/services/sb-progress-loader.service';
+import { ProfileHandler } from '@app/services/profile-handler';
 
 
 @Component({
@@ -42,9 +44,9 @@ import { TncUpdateHandlerService } from '@app/services/handlers/tnc-update-handl
 })
 export class CategoriesEditPage implements OnInit, OnDestroy {
 
-  @ViewChild('boardSelect') boardSelect: IonSelect;
-  @ViewChild('mediumSelect') mediumSelect: IonSelect;
-  @ViewChild('gradeSelect') gradeSelect: IonSelect;
+  @ViewChild('boardSelect', { static: false }) boardSelect: IonSelect;
+  @ViewChild('mediumSelect', { static: false }) mediumSelect: IonSelect;
+  @ViewChild('gradeSelect', { static: false }) gradeSelect: IonSelect;
 
   private framework: Framework;
   private formControlSubscriptions: Subscription;
@@ -74,6 +76,8 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
   backButtonFunc: Subscription;
   isRootPage = false;
   hasFilledLocation = false;
+  public supportedProfileAttributes: { [key: string]: string } = {};
+  userType: string;
 
   /* Custom styles for the select box popup */
   boardOptions = {
@@ -119,6 +123,7 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
     @Inject('PROFILE_SERVICE') private profileService: ProfileService,
     @Inject('FRAMEWORK_SERVICE') private frameworkService: FrameworkService,
     @Inject('FRAMEWORK_UTIL_SERVICE') private frameworkUtilService: FrameworkUtilService,
+    @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
     private commonUtilService: CommonUtilService,
     private fb: FormBuilder,
     private translate: TranslateService,
@@ -127,13 +132,14 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
     private container: ContainerService,
     private formAndFrameworkUtilService: FormAndFrameworkUtilService,
     private headerService: AppHeaderService,
-    private route: ActivatedRoute,
     private router: Router,
     private location: Location,
     private platform: Platform,
     private activePageService: ActivePageService,
     private externalIdVerificationService: ExternalIdVerificationService,
     private tncUpdateHandlerService: TncUpdateHandlerService,
+    private sbProgressLoader: SbProgressLoader,
+    private profileHandler: ProfileHandler
 
   ) {
     this.appGlobalService.closeSigninOnboardingLoader();
@@ -152,12 +158,11 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
     this.initializeForm();
   }
 
-  ngOnInit() {
-    this.formControlSubscriptions = combineLatest(
-      this.onSyllabusChange(),
-      this.onMediumChange(),
-      this.onGradeChange(),
-    ).subscribe();
+  async ngOnInit() {
+    this.supportedProfileAttributes = await this.profileHandler.getSupportedProfileAttributes(false);
+    const subscriptionArray: Array<any> = this.updateAttributeStreamsnSetValidators(this.supportedProfileAttributes);
+    this.formControlSubscriptions = combineLatest(subscriptionArray).subscribe();
+    this.userType = await this.preferences.getString(PreferenceKey.SELECTED_USER_TYPE).toPromise();
   }
 
   ngOnDestroy() {
@@ -187,6 +192,10 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
     }
   }
 
+  ionViewDidEnter() {
+    this.sbProgressLoader.hide({ id: 'login' });
+  }
+
   /**
    * Initializes form with default values or empty values
    */
@@ -197,10 +206,10 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
     }
     this.profileEditForm = this.fb.group({
       syllabus: [],
-        boards: [],
-        medium: [],
-        grades: [],
-        subjects: []
+      boards: [],
+      medium: [],
+      grades: [],
+      subjects: []
     });
   }
 
@@ -261,7 +270,7 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
           const boards = await this.frameworkUtilService.getFrameworkCategoryTerms(boardCategoryTermsRequet).toPromise();
           this.boardList = boards.map(t => ({ name: t.name, code: t.code }));
 
-          const boardTerm = boards.find(b => b.name === (this.syllabusList.find((s) => s.code === value[0])!.name));
+          const boardTerm = boards.find(b => b.name === (this.syllabusList.find((s) => s.code === value[0]).name));
 
           this.boardControl.patchValue([boardTerm.code]);
 
@@ -285,8 +294,6 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
           // todo
           console.error(e);
         } finally {
-          // todo
-          // this.mediumControl.patchValue([]);
           this.loader.dismiss();
         }
       })
@@ -295,7 +302,7 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
 
   private onMediumChange(): Observable<string[]> {
     return this.mediumControl.valueChanges.pipe(
-      tap(async (value) => {
+      tap(async () => {
         await this.commonUtilService.getLoader().then((loader) => {
           this.loader = loader;
           this.loader.present();
@@ -319,11 +326,8 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
             this.gradeControl.patchValue([]);
           }
         } catch (e) {
-          // todo
           console.error(e);
         } finally {
-          // todo
-          // this.gradeControl.patchValue([]);
           this.loader.dismiss();
         }
       })
@@ -333,10 +337,6 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
   private onGradeChange(): Observable<string[]> {
     return this.gradeControl.valueChanges.pipe(
       tap(async () => {
-        // await this.commonUtilService.getLoader().then((loader) => {
-        //   this.loader = loader;
-        //   this.loader.present();
-        // });
         try {
           const nextCategoryTermsRequet: GetFrameworkCategoryTermsRequest = {
             frameworkId: this.framework.identifier,
@@ -355,11 +355,8 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
             this.subjectControl.patchValue([]);
           }
         } catch (e) {
-          // todo
           console.error(e);
         } finally {
-          // todo
-          // this.subjectControl.patchValue([]);
           this.loader.dismiss();
         }
       })
@@ -377,13 +374,13 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
       } else {
         this.showErrorToastMessage('BOARD');
       }
-    } else if (formVal.medium && !formVal.medium.length) {
+    } else if (formVal.medium && !formVal.medium.length && this.supportedProfileAttributes['medium']) {
       if (this.showOnlyMandatoryFields) {
         this.mediumSelect.open();
       } else {
         this.showErrorToastMessage('MEDIUM');
       }
-    } else if (formVal.grades && !formVal.grades.length) {
+    } else if (formVal.grades && !formVal.grades.length && this.supportedProfileAttributes['gradeLevel']) {
       if (this.showOnlyMandatoryFields) {
         this.gradeSelect.open();
       } else {
@@ -462,7 +459,7 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
         this.commonUtilService.showToast(this.commonUtilService.translateMessage('PROFILE_UPDATE_SUCCESS'));
         this.disableSubmitButton = true;
         this.events.publish('loggedInProfile:update', req.framework);
-
+        const isSSOUser = await this.tncUpdateHandlerService.isSSOUser(this.profile);
         if (this.showOnlyMandatoryFields) {
           const reqObj: ServerProfileDetailsRequest = {
             userId: this.profile.uid,
@@ -472,9 +469,12 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
           this.profileService.getServerProfilesDetails(reqObj).toPromise()
             .then(updatedProfile => {
               this.formAndFrameworkUtilService.updateLoggedInUser(updatedProfile, this.profile)
-                .then( async (value) => {
+                .then(async () => {
                   initTabs(this.container, LOGIN_TEACHER_TABS);
-                  if (this.hasFilledLocation || await this.tncUpdateHandlerService.isSSOUser(this.profile)) {
+                  if (this.hasFilledLocation || isSSOUser) {
+                    if (!isSSOUser) {
+                      this.appGlobalService.showYearOfBirthPopup(updatedProfile);
+                    }
                     this.router.navigate([RouterLinks.TABS]);
                     this.externalIdVerificationService.showExternalIdVerificationPopup();
                   } else {
@@ -483,12 +483,15 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
                         isShowBackButton: false
                       }
                     };
-                    this.router.navigate([RouterLinks.DISTRICT_MAPPING] , navigationExtras);
+                    this.router.navigate([RouterLinks.DISTRICT_MAPPING], navigationExtras);
                   }
                 });
-            }).catch(e => {
+            }).catch(() => {
               initTabs(this.container, LOGIN_TEACHER_TABS);
               if (this.hasFilledLocation) {
+                if (!isSSOUser) {
+                  this.appGlobalService.showYearOfBirthPopup(this.profile.serverProfile);
+                }
                 this.router.navigate([RouterLinks.TABS]);
                 this.externalIdVerificationService.showExternalIdVerificationPopup();
               } else {
@@ -497,7 +500,7 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
                     isShowBackButton: false
                   }
                 };
-                this.router.navigate([RouterLinks.DISTRICT_MAPPING] , navigationExtras);
+                this.router.navigate([RouterLinks.DISTRICT_MAPPING], navigationExtras);
               }
             });
         } else {
@@ -518,7 +521,8 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
 
   async getLoggedInFrameworkCategory() {
     try {
-      const activeChannelDetails: Channel = await this.frameworkService.getChannelDetails({ channelId: this.frameworkService.activeChannelId }).toPromise()
+      const activeChannelDetails: Channel = await this.frameworkService.getChannelDetails(
+        { channelId: this.frameworkService.activeChannelId }).toPromise();
       const defaultFrameworkDetails: Framework = await this.frameworkService.getFrameworkDetails({
         frameworkId: activeChannelDetails.defaultFramework, requiredCategories: []
       }).toPromise();
@@ -526,7 +530,7 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
         language: '',
         requiredCategories: []
       }).toPromise();
-      this.frameworkId =  activeChannelDetails.defaultFramework;
+      this.frameworkId = activeChannelDetails.defaultFramework;
       this.categories = defaultFrameworkDetails.categories;
       const boardCategory = defaultFrameworkDetails.categories.find((c) => c.code === 'board');
       const mediumCategory = defaultFrameworkDetails.categories.find((c) => c.code === 'medium');
@@ -557,4 +561,22 @@ export class CategoriesEditPage implements OnInit, OnDestroy {
       requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
     }).toPromise();
   }
+
+  private updateAttributeStreamsnSetValidators(attributes: { [key: string]: string }): Array<any> {
+    const subscriptionArray = [];
+    Object.keys(attributes).forEach((attribute) => {
+      switch (attribute) {
+        case 'board':
+          subscriptionArray.push(this.onSyllabusChange());
+          break;
+        case 'medium':
+          subscriptionArray.push(this.onMediumChange());
+          break;
+        case 'gradeLevel':
+          subscriptionArray.push(this.onGradeChange());
+          break;
+      }
+    });
+    return subscriptionArray;
+  }
 }
diff --git a/src/app/profile/certificate-view/certificate-view.module.ts b/src/app/profile/certificate-view/certificate-view.module.ts
new file mode 100644
index 000000000..c4f7276d1
--- /dev/null
+++ b/src/app/profile/certificate-view/certificate-view.module.ts
@@ -0,0 +1,26 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { Routes, RouterModule } from '@angular/router';
+
+import { IonicModule } from '@ionic/angular';
+
+import { TranslateModule } from '@ngx-translate/core';
+import { CertificateViewPage } from './certificate-view.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: CertificateViewPage
+  }
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    IonicModule,
+    RouterModule.forChild(routes),
+    TranslateModule,
+  ],
+  declarations: [CertificateViewPage]
+})
+export class CertificateViewPageModule {}
diff --git a/src/app/profile/certificate-view/certificate-view.page.html b/src/app/profile/certificate-view/certificate-view.page.html
new file mode 100644
index 000000000..4d4770cc8
--- /dev/null
+++ b/src/app/profile/certificate-view/certificate-view.page.html
@@ -0,0 +1,28 @@
+<ion-content hide-header-footer
+             class="main-container avoid-bottom-tabs-space" scrollEvents="true">
+
+  <div class="cert-container">
+    <strong class="label">{{'CERTIFICATE' | translate}}</strong>
+    <div class="cert-details">
+      <div class="cert-info">
+        <p class="title">{{pageData?.certificate?.name}}</p>
+        <p class="date">{{pageData?.certificate?.lastIssuedOn | date}}</p>
+      </div>
+      <div class="download-btn">
+        <button class="cert-btn" [ngClass]="{'highlight-cert-btn': onPopupOpen, '': !onPopupOpen }" (click)="showCertificateMenu($event)">
+          <img src="assets/imgs/download-cloud-white.svg" alt="Download">
+          <span>{{'DOWNLOAD' | translate}}</span>
+        </button>
+      </div>
+    </div>
+  </div>
+
+  <div #scrollWrap
+       class="scroll-wrap"
+       (pan)="onGestureEvent($event)"
+       (pinch)="onGestureEvent($event)"
+       (panend)="onGestureEvent($event)"
+       (pinchend)="onGestureEvent($event)">
+    <div #certificateContainer></div>
+  </div>
+</ion-content>
\ No newline at end of file
diff --git a/src/app/profile/certificate-view/certificate-view.page.scss b/src/app/profile/certificate-view/certificate-view.page.scss
new file mode 100644
index 000000000..954e17504
--- /dev/null
+++ b/src/app/profile/certificate-view/certificate-view.page.scss
@@ -0,0 +1,50 @@
+.scroll-wrap {
+  height: 100%;
+  padding: 32px;
+}
+
+.cert-container {
+  margin: 1rem;
+  .label {
+    font-size: 1.2rem;
+  }
+  .cert-details {
+    display: flex;
+    margin: 1rem 0;
+    .cert-info {
+      flex-grow: 1;
+      .title,
+      .date {
+        font-size: 1rem;
+        margin: 0;
+        color: var(--app-gray);
+      }
+      .date {
+        color: var(--app-medium-gray);
+      }
+    }
+    .download-btn{
+      width: 50%;
+      .cert-btn{
+        padding: 0.5rem;
+        background-color: var(--app-primary-medium);
+        img{
+          float: left;
+        }
+        span{
+          padding: 0 0.5rem;
+          line-height: 1.5;
+        }
+      }
+    }
+  }
+}
+
+.certificate-info {
+  display: flex;
+  margin: 1rem;
+}
+
+.highlight-cert-btn{
+  background-color: var(--app-primary);
+}
\ No newline at end of file
diff --git a/src/app/profile/certificate-view/certificate-view.page.spec.ts b/src/app/profile/certificate-view/certificate-view.page.spec.ts
new file mode 100644
index 000000000..d27975d57
--- /dev/null
+++ b/src/app/profile/certificate-view/certificate-view.page.spec.ts
@@ -0,0 +1,222 @@
+import {CourseService} from '@project-sunbird/sunbird-sdk';
+import {CertificateDownloadService} from 'sb-svg2pdf';
+import {AppGlobalService, AppHeaderService, CommonUtilService, TelemetryGeneratorService} from '@app/services';
+import {Router} from '@angular/router';
+import {FileOpener} from '@ionic-native/file-opener/ngx';
+import {PopoverController, ToastController} from '@ionic/angular';
+import {CertificateViewPage} from './certificate-view.page';
+import {ElementRef} from '@angular/core';
+import {EMPTY, of} from 'rxjs';
+
+describe('CertificateViewPage', () => {
+    const mockCourseService: Partial<CourseService> = {
+        certificateManager: {
+            getCertificate: jest.fn(() => of('data:image/svg+xml,<svg height="100" width="100">\n' +
+            '  <circle cx="50" cy="50" r="40" stroke="black" stroke-width="3" fill="red" />\n' +
+            '  Sorry, your browser does not support inline SVG.  \n' +
+                '</svg>')),
+            downloadCertificate: jest.fn(() => of({ path: 'SOME_DOWNLOAD_PATH' }))
+        } as any
+    };
+    const mockCertificateDownloadService: Partial<CertificateDownloadService> = {
+        buildBlob: jest.fn(() => Promise.resolve(new Blob())),
+    };
+    const mockAppHeaderService: Partial<AppHeaderService> = {
+        getDefaultPageConfig: jest.fn(() => ({})),
+        updatePageConfig: jest.fn()
+    };
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        showToast: jest.fn(),
+        translateMessage: jest.fn(() => 'MESSAGE'),
+        getLoader: jest.fn(() => Promise.resolve({
+            present: jest.fn(),
+            dismiss: jest.fn()
+        }))
+    };
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        getActiveProfileUid: jest.fn(() => Promise.resolve('SOME_UID')),
+    };
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => ({
+            extras: {
+                state: {
+                    request: {
+                        courseId: 'SOME_COURSE_ID',
+                        certificate: {
+                            name: 'SOME_CERTIFICATE_NAME',
+                            lastIssuedOn: new Date().toDateString(),
+                            token: 'SOME_CERTIFICATE_TOKEN',
+                        }
+                    }
+                }
+            }
+        }))
+    };
+    const mockFileOpener: Partial<FileOpener> = {
+        open: jest.fn(() => Promise.resolve())
+    };
+    const mockToastController: Partial<ToastController> = {
+        create: jest.fn(() => Promise.resolve({
+            present: jest.fn(),
+            dismiss: jest.fn()
+        }))
+    };
+    const mockPopoverController: Partial<PopoverController> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateInteractTelemetry: jest.fn(),
+    };
+    let certificateViewPage: CertificateViewPage;
+
+    beforeAll(() => {
+        certificateViewPage = new CertificateViewPage(
+            mockCourseService as CourseService,
+            mockCertificateDownloadService as CertificateDownloadService,
+            mockAppHeaderService as AppHeaderService,
+            mockCommonUtilService as CommonUtilService,
+            mockAppGlobalService as AppGlobalService,
+            mockRouter as Router,
+            mockFileOpener as FileOpener,
+            mockToastController as ToastController,
+            mockPopoverController as PopoverController,
+            mockTelemetryGeneratorService as TelemetryGeneratorService
+        );
+    });
+
+    it('should be able to create an instance', () => {
+        expect(CertificateViewPage).toBeTruthy();
+    });
+
+    describe('ngOnInit()', () => {
+        it('should update header with title and kebab menu options for download', () => {
+            // arrange
+            mockAppHeaderService.showHeaderWithBackButton = jest.fn();
+            // act
+            certificateViewPage.ngOnInit();
+            // assert
+            expect(mockAppHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+        });
+    });
+
+    describe('ngAfterViewInit()', () => {
+        it('should fetch and render certificate on screen', (done) => {
+            const htmlElement = document.createElement('div');
+            certificateViewPage.certificateContainer = new ElementRef(htmlElement);
+
+            certificateViewPage.ngAfterViewInit();
+
+            setTimeout(() => {
+                expect(mockCourseService.certificateManager.getCertificate).toHaveBeenCalled();
+                expect(certificateViewPage.certificateContainer.nativeElement.innerHTML).toBeTruthy();
+                done();
+            });
+        });
+    });
+    
+    describe('ngOnDestroy()', () => {
+        it('should unsubscribe header events',  () => {
+            const htmlElement = document.createElement('div');
+            certificateViewPage.certificateContainer = new ElementRef(htmlElement);
+            certificateViewPage.ngAfterViewInit();
+            certificateViewPage.ngOnDestroy();
+        });
+    });
+
+    describe('showCertificateMenu()', () => {
+        it('should skip the download', (done) => {
+            const htmlElement = document.createElement('div');
+            certificateViewPage.certificateContainer = new ElementRef(htmlElement);
+            mockPopoverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: null }))
+            } as any)));
+            certificateViewPage.pageData = {
+                certificate: {
+                    name: 'sample'
+                } as any,
+                courseId: 'sample_id'
+            };
+            certificateViewPage['activeUserId'] = 'user_id';
+
+            certificateViewPage.showCertificateMenu({});
+
+            expect(mockPopoverController.create).toHaveBeenCalled();
+            setTimeout(() => {
+                expect(mockFileOpener.open).not.toHaveBeenCalledWith('SOME_DOWNLOAD_PATH', 'application/pdf');
+                done();
+            });
+        });
+
+        it('should skip the download if the type is not PDF or PNG', (done) => {
+            const htmlElement = document.createElement('div');
+            certificateViewPage.certificateContainer = new ElementRef(htmlElement);
+            mockPopoverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { option: { label: 'JPEG', value: {} } } }))
+            } as any)));
+            certificateViewPage.pageData = {
+                certificate: {
+                    name: 'sample'
+                } as any,
+                courseId: 'sample_id'
+            };
+            certificateViewPage['activeUserId'] = 'user_id';
+
+            certificateViewPage.showCertificateMenu({});
+
+            expect(mockPopoverController.create).toHaveBeenCalled();
+            setTimeout(() => {
+                expect(mockFileOpener.open).not.toHaveBeenCalledWith('SOME_DOWNLOAD_PATH', 'application/pdf');
+                done();
+            });
+        });
+
+        it('should listen for download_as_pdf events and download certificate accordingly', (done) => {
+            const htmlElement = document.createElement('div');
+            certificateViewPage.certificateContainer = new ElementRef(htmlElement);
+            mockPopoverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { option: { label: 'PDF', value: {} } } }))
+            } as any)));
+            certificateViewPage.pageData = {
+                certificate: {
+                    name: 'sample'
+                } as any,
+                courseId: 'sample_id'
+            };
+            certificateViewPage['activeUserId'] = 'user_id';
+
+            certificateViewPage.showCertificateMenu({});
+
+            expect(mockPopoverController.create).toHaveBeenCalled();
+            setTimeout(() => {
+                expect(mockFileOpener.open).toHaveBeenCalledWith('SOME_DOWNLOAD_PATH', 'application/pdf');
+                done();
+            });
+        });
+
+        it('should listen for download_as_pdf events and download certificate accordingly', (done) => {
+            const htmlElement = document.createElement('div');
+            certificateViewPage.certificateContainer = new ElementRef(htmlElement);
+            mockPopoverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { option: { label: 'PNG', value: {} } } }))
+            } as any)));
+            certificateViewPage.pageData = {
+                certificate: {
+                    name: 'sample'
+                } as any,
+                courseId: 'sample_id'
+            };
+            certificateViewPage['activeUserId'] = 'user_id';
+
+            certificateViewPage.showCertificateMenu({});
+
+            expect(mockPopoverController.create).toHaveBeenCalled();
+            setTimeout(() => {
+                expect(mockFileOpener.open).toHaveBeenCalledWith('SOME_DOWNLOAD_PATH', 'image/png');
+                done();
+            });
+        });
+
+    })
+});
diff --git a/src/app/profile/certificate-view/certificate-view.page.ts b/src/app/profile/certificate-view/certificate-view.page.ts
new file mode 100644
index 000000000..6e259c782
--- /dev/null
+++ b/src/app/profile/certificate-view/certificate-view.page.ts
@@ -0,0 +1,257 @@
+import { AfterViewInit, Component, ElementRef, Inject, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
+import { ApplicationHeaderKebabMenuComponent } from '@app/app/components/application-header/application-header-kebab-menu.component';
+import { AppGlobalService, AppHeaderService, Environment, InteractSubtype, PageId, TelemetryGeneratorService } from '@app/services';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { FileOpener } from '@ionic-native/file-opener/ngx';
+import { PopoverController, ToastController } from '@ionic/angular';
+import { CourseCertificate } from '@project-sunbird/client-services/models';
+import { tap } from 'rxjs/operators';
+import { CertificateDownloadService } from 'sb-svg2pdf';
+import { CourseService, InteractType } from 'sunbird-sdk';
+
+@Component({
+  selector: 'app-certificate-view',
+  templateUrl: './certificate-view.page.html',
+  styleUrls: ['./certificate-view.page.scss'],
+  providers: [CertificateDownloadService]
+})
+export class CertificateViewPage implements OnInit, AfterViewInit, OnDestroy {
+  @ViewChild('certificateContainer', {static: true}) certificateContainer: ElementRef;
+  @ViewChild('scrollWrap', {static: true}) scrollWrap: ElementRef;
+
+  private activeUserId: string;
+
+  pageData: {
+    courseId: string;
+    certificate: CourseCertificate;
+  };
+
+  private gestureState = {
+    posX: 0,
+    posY: 0,
+    scale: 1,
+    last_scale: 1,
+    last_posX: 0,
+    last_posY: 0,
+    max_pos_x: 0,
+    max_pos_y: 0,
+    transform: ''
+  };
+  headerConfig: any;
+  onPopupOpen = false;
+
+  constructor(
+    @Inject('COURSE_SERVICE') private courseService: CourseService,
+    private certificateDownloadService: CertificateDownloadService,
+    private appHeaderService: AppHeaderService,
+    private commonUtilService: CommonUtilService,
+    private appGlobalService: AppGlobalService,
+    private router: Router,
+    private fileOpener: FileOpener,
+    private toastController: ToastController,
+    private popoverCtrl: PopoverController,
+    private telemetryGeneratorService: TelemetryGeneratorService
+  ) {
+  }
+
+  ngOnInit() {
+    this.appGlobalService.getActiveProfileUid().then((activeUserId) => this.activeUserId = activeUserId);
+    this.pageData = this.router.getCurrentNavigation().extras.state.request;
+
+    this.appHeaderService.showHeaderWithBackButton();
+  }
+
+  ngAfterViewInit() {
+    this.loadCertificate();
+  }
+
+  ngOnDestroy() {
+
+  }
+
+  public onGestureEvent(ev) {
+    /* istanbul ignore next */
+    (/* gesture based pan/zoom */() => {
+      const el = this.scrollWrap.nativeElement;
+
+      let {
+        posX,
+        posY,
+        scale,
+        last_scale,
+        last_posX,
+        last_posY,
+        max_pos_x,
+        max_pos_y,
+        transform
+      } = this.gestureState;
+
+      // pan
+      if (scale !== 1) {
+        posX = last_posX + ev.deltaX;
+        posY = last_posY + ev.deltaY;
+        max_pos_x = Math.ceil((scale - 1) * el.clientWidth / 2);
+        max_pos_y = Math.ceil((scale - 1) * el.clientHeight / 2);
+        if (posX > max_pos_x) {
+          posX = max_pos_x;
+        }
+        if (posX < -max_pos_x) {
+          posX = -max_pos_x;
+        }
+        if (posY > max_pos_y) {
+          posY = max_pos_y;
+        }
+        if (posY < -max_pos_y) {
+          posY = -max_pos_y;
+        }
+      }
+
+
+      // pinch
+      if (ev.type === 'pinch') {
+        scale = Math.max(.999, Math.min(last_scale * (ev.scale), 4));
+      }
+      if (ev.type === 'pinchend') {last_scale = scale; }
+
+      // panend
+      if (ev.type === 'panend') {
+        last_posX = posX < max_pos_x ? posX : max_pos_x;
+        last_posY = posY < max_pos_y ? posY : max_pos_y;
+      }
+
+      if (scale !== 1) {
+        transform =
+            'translate3d(' + posX + 'px,' + posY + 'px, 0) ' +
+            'scale3d(' + scale + ', ' + scale + ', 1)';
+      }
+
+      if (transform) {
+        el.style.webkitTransform = transform;
+      }
+
+      this.gestureState = {
+        posX,
+        posY,
+        scale,
+        last_scale,
+        last_posX,
+        last_posY,
+        max_pos_x,
+        max_pos_y,
+        transform
+      };
+    })();
+  }
+
+  private async loadCertificate() {
+    const loader = await this.commonUtilService.getLoader();
+    loader.present();
+
+    await this.courseService.certificateManager.getCertificate(this.pageData).pipe(
+      tap(this.initCertificateTemplate.bind(this)),
+    ).toPromise();
+
+    loader.dismiss();
+  }
+
+  private initCertificateTemplate(template: string) {
+    if (template.startsWith('data:image/svg+xml,')) {
+      template = decodeURIComponent(template.replace(/data:image\/svg\+xml,/, '')).replace(/\<!--\s*[a-zA-Z0-9\-]*\s*--\>/g, '');
+    }
+    this.certificateContainer.nativeElement.innerHTML = template;
+  }
+
+  private async listenActionEvents(option) {
+      const toast = await this.toastController.create({
+        message: this.commonUtilService.translateMessage('CERTIFICATE_DOWNLOAD_INFO')
+      });
+      await toast.present();
+
+      try {
+        const downloadRequest = await (async () => {
+          const baseFileName = `${this.pageData.certificate.name}_${this.pageData.courseId}_${this.activeUserId}`;
+          switch (option.label) {
+            case 'PDF': {
+              this.generateDownloadTypeTelemetry('pdf');
+              return {
+                fileName: baseFileName + '.pdf',
+                mimeType: 'application/pdf',
+                blob: await this.certificateDownloadService.buildBlob(
+                  this.certificateContainer.nativeElement.querySelector('svg'),
+                  'pdf'
+                )
+              };
+            }
+            case 'PNG': {
+              this.generateDownloadTypeTelemetry('png');
+              return {
+                fileName: baseFileName + '.png',
+                mimeType: 'image/png',
+                blob: await this.certificateDownloadService.buildBlob(
+                  this.certificateContainer.nativeElement.querySelector('svg'),
+                  'png'
+                )
+              };
+            }
+            default: {
+              toast.dismiss();
+              throw new Error('INVALID_OPTION');
+            }
+          }
+        })();
+
+        const { path } = await this.courseService.certificateManager.downloadCertificate(downloadRequest).toPromise();
+        await this.fileOpener.open(path, downloadRequest.mimeType);
+      } catch (e) {
+        this.commonUtilService.showToast(this.commonUtilService.translateMessage('SOMETHING_WENT_WRONG'));
+        console.error(e);
+      } finally {
+        toast.dismiss();
+      }
+
+  }
+
+  private generateDownloadTypeTelemetry(type: string) {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      type, '',
+      Environment.USER,
+      PageId.CERTIFICATE_VIEW,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      InteractSubtype.DOWNLOAD_CLICKED
+    );
+  }
+
+  async showCertificateMenu(event) {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH, InteractSubtype.DOWNLOAD_CLICKED,
+      Environment.USER,
+      PageId.CERTIFICATE_VIEW
+    );
+    const certificatePopover = await this.popoverCtrl.create({
+      component: ApplicationHeaderKebabMenuComponent,
+      event,
+      showBackdrop: false,
+      componentProps: {
+        options: [
+          { label: 'PDF', value: {} },
+          { label: 'PNG', value: {} },
+        ] || []
+      },
+      cssClass: 'certificate-popup'
+    });
+    this.onPopupOpen = true;
+    certificatePopover.present();
+    const { data } = await certificatePopover.onDidDismiss();
+    this.onPopupOpen = false;
+    if (!data) {
+      return;
+    }
+    this.listenActionEvents(data.option);
+  }
+}
+
+
diff --git a/src/app/user-and-groups/create-group/create-group.module.ts b/src/app/profile/framework-selection/framework-selection.module.ts
similarity index 62%
rename from src/app/user-and-groups/create-group/create-group.module.ts
rename to src/app/profile/framework-selection/framework-selection.module.ts
index 55d8c75bb..e732741ab 100644
--- a/src/app/user-and-groups/create-group/create-group.module.ts
+++ b/src/app/profile/framework-selection/framework-selection.module.ts
@@ -5,13 +5,14 @@ import { Routes, RouterModule } from '@angular/router';
 
 import { IonicModule } from '@ionic/angular';
 
-import { CreateGroupPage } from './create-group.page';
 import { TranslateModule } from '@ngx-translate/core';
+import { FrameworkSelectionPage } from './framework-selection.page';
+import { CommonFormElementsModule } from 'common-form-elements';
 
 const routes: Routes = [
   {
     path: '',
-    component: CreateGroupPage
+    component: FrameworkSelectionPage
   }
 ];
 
@@ -22,10 +23,9 @@ const routes: Routes = [
     ReactiveFormsModule,
     IonicModule,
     RouterModule.forChild(routes),
-    TranslateModule.forChild()
+    TranslateModule,
+    CommonFormElementsModule
   ],
-  declarations: [CreateGroupPage],
-  entryComponents: [CreateGroupPage],
-  exports: [CreateGroupPage]
+  declarations: [FrameworkSelectionPage]
 })
-export class CreateGroupPageModule {}
+export class FrameworkSelectionPageModule {}
diff --git a/src/app/profile/framework-selection/framework-selection.page.html b/src/app/profile/framework-selection/framework-selection.page.html
new file mode 100644
index 000000000..32d2780ce
--- /dev/null
+++ b/src/app/profile/framework-selection/framework-selection.page.html
@@ -0,0 +1,26 @@
+<ion-content>
+
+  <!-- Title -->
+  <div *ngIf="title" class="framework-header">
+    <h4>{{title}}</h4>
+    <p class="mb-0">{{subTitle}}</p>
+  </div>
+
+  <!-- SB-Forms -->
+  <div *ngIf="formConfig" class="framework-form-bg">
+    <sb-form
+            [platform]="'mobile'"
+            [config]='formConfig'
+            (valueChanges)="valueChanged($event)"
+            (statusChanges)="statusChanged($event)">
+    </sb-form>
+  </div>
+
+</ion-content>
+
+<!-- Submit -->
+<ion-footer>
+  <ion-button expand="block" class="M16 MB30" [disabled]="!isFrameworkFormValid" (click)="submitForm()" >
+    {{submitDetails?.label || 'Submit'}}
+  </ion-button>
+</ion-footer>
diff --git a/src/app/profile/framework-selection/framework-selection.page.scss b/src/app/profile/framework-selection/framework-selection.page.scss
new file mode 100644
index 000000000..b43ed9358
--- /dev/null
+++ b/src/app/profile/framework-selection/framework-selection.page.scss
@@ -0,0 +1,30 @@
+@import "src/assets/styles/base/_variables.scss";
+@import "src/assets/styles/_custom-mixins.scss";
+@import "src/assets/styles/_variables.scss";
+
+.framework-header {
+    background-color: $blue;
+    color: map-get($colors, white);
+    padding: 16px;
+
+    h4 {
+        padding:0;
+        font-weight: 700;
+        max-width: 1024px;
+        margin: 0 auto;
+    }
+}
+
+.framework-form-bg{
+    padding: 16px;  
+}
+
+ion-footer{
+    z-index: -10;
+}
+
+ion-button{
+    --background: #{$blue} !important;
+    height: 40px !important;
+    text-transform: capitalize !important;
+}
\ No newline at end of file
diff --git a/src/app/profile/framework-selection/framework-selection.page.ts b/src/app/profile/framework-selection/framework-selection.page.ts
new file mode 100644
index 000000000..6f16ba26e
--- /dev/null
+++ b/src/app/profile/framework-selection/framework-selection.page.ts
@@ -0,0 +1,139 @@
+import { Component, OnInit, OnDestroy, Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+import { FrameworkCommonFormConfigBuilder } from '@app/services/common-form-config-builders/framework-common-form-config-builder';
+import {
+  AppHeaderService,
+  CommonUtilService,
+  CorReleationDataType,
+  PageId,
+  TelemetryGeneratorService,
+  ImpressionType, Environment
+} from '@app/services';
+import { CorrelationData } from '@project-sunbird/sunbird-sdk';
+import { FieldConfigOptionsBuilder } from '@app/app/components/common-forms/field-config';
+
+@Injectable({ providedIn: 'root' })
+export class FrameworkSelectionDelegateService {
+  delegate?: FrameworkSelectionActionsDelegate;
+}
+
+export interface FrameworkSelectionActionsDelegate {
+  onFrameworkSelectionSubmit(formInput?: any,
+    formOutput?: any, router?: Router,
+    commonUtilService?: CommonUtilService, telemetryGeneratorService?: TelemetryGeneratorService, corRelation?: Array<CorrelationData>);
+}
+
+@Component({
+  selector: 'app-framework-selection',
+  templateUrl: './framework-selection.page.html',
+  styleUrls: ['./framework-selection.page.scss'],
+})
+export class FrameworkSelectionPage implements OnInit, OnDestroy {
+
+  private formConfigInput;
+
+  title: string;
+  subTitle: string;
+  formConfig; any;
+  submitDetails: { label?: string, navigateTo?: string };
+  isFrameworkFormValid = false;
+  selectedFrameworkData: any;
+  corRelation: Array<CorrelationData> = [];
+
+  constructor(
+    private router: Router,
+    private frameworkCommonFormConfigBuilder: FrameworkCommonFormConfigBuilder,
+    private appHeaderService: AppHeaderService,
+    public commonUtilService: CommonUtilService,
+    private frameworkSelectionDelegateService: FrameworkSelectionDelegateService,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+  ) {
+    this.getNavParams();
+  }
+
+  getNavParams() {
+    const paramData = this.router.getCurrentNavigation().extras && this.router.getCurrentNavigation().extras.state;
+    if (paramData) {
+      this.title = paramData.title;
+      this.subTitle = paramData.subTitle;
+      this.formConfig = paramData.formConfig;
+      this.corRelation = paramData.corRelation;
+      this.formConfigInput = paramData.formConfig && Array.isArray(paramData.formConfig) ?
+        JSON.parse(JSON.stringify(paramData.formConfig)) : [];
+      this.submitDetails = paramData.submitDetails;
+    }
+    this.corRelation.push({ id: PageId.FRAMEWORK_SELECTION, type: CorReleationDataType.FROM_PAGE });
+  }
+
+  ngOnInit(): void {
+    this.initializeFormConfig();
+    this.appHeaderService.showHeaderWithBackButton();
+    this.telemetryGeneratorService.generateImpressionTelemetry(
+      ImpressionType.VIEW,
+      '',
+      PageId.FRAMEWORK_SELECTION,
+      Environment.USER,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      this.corRelation);
+  }
+
+  ngOnDestroy(): void {
+    this.frameworkSelectionDelegateService.delegate = undefined;
+  }
+
+  initializeFormConfig() {
+    if (this.formConfig) {
+      this.formConfig.forEach(ele => {
+        if (ele.templateOptions.dataSrc) {
+          this.convertDataSrcToClosure(ele);
+        }
+      });
+    }
+  }
+
+  valueChanged(event) {
+    this.selectedFrameworkData = event;
+  }
+
+  statusChanged(event) {
+    this.isFrameworkFormValid = event.isValid;
+  }
+
+  submitForm() {
+    if (this.frameworkSelectionDelegateService.delegate) {
+      this.frameworkSelectionDelegateService.delegate.onFrameworkSelectionSubmit(
+        this.formConfigInput, this.selectedFrameworkData, this.router, this.commonUtilService,
+        this.telemetryGeneratorService, this.corRelation
+      );
+    }
+  }
+
+  convertDataSrcToClosure(ele) {
+    const dataSrc = ele.templateOptions.dataSrc;
+    switch (dataSrc.marker) {
+      case 'ACTIVE_CHANNEL.SUGGESTED_FRAMEWORK_LIST.MAPPED_TO_FRAMEWORKCATEGORIES':
+        ele.templateOptions.options = this.getClosure('board');
+        break;
+      case 'FRAMEWORK_CATEGORY_TERMS':
+        ele.templateOptions.options = this.getClosure(dataSrc.params.categoryCode, !!(ele.children && ele.children.other));
+        break;
+    }
+  }
+
+  getClosure(type: string, enableOtherOption?: boolean): FieldConfigOptionsBuilder<any> {
+    switch (type) {
+      case 'board':
+        return this.frameworkCommonFormConfigBuilder.getBoardConfigOptionsBuilder();
+      case 'medium':
+        return this.frameworkCommonFormConfigBuilder.getMediumConfigOptionsBuilder();
+      case 'grade':
+        return this.frameworkCommonFormConfigBuilder.getGradeConfigOptionsBuilder();
+      case 'subject':
+        return this.frameworkCommonFormConfigBuilder.getSubjectConfigOptionsBuilder(null, enableOtherOption);
+    }
+  }
+
+}
diff --git a/src/app/profile/guest-edit/guest-edit.module.ts b/src/app/profile/guest-edit/guest-edit.module.ts
index cf780b111..418497c4e 100644
--- a/src/app/profile/guest-edit/guest-edit.module.ts
+++ b/src/app/profile/guest-edit/guest-edit.module.ts
@@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular';
 
 import { GuestEditPage } from './guest-edit.page';
 import { TranslateModule } from '@ngx-translate/core';
+import {PipesModule} from '@app/pipes/pipes.module';
 
 const routes: Routes = [
   {
@@ -16,14 +17,15 @@ const routes: Routes = [
 ];
 
 @NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    ReactiveFormsModule,
-    IonicModule,
-    RouterModule.forChild(routes),
-    TranslateModule
-  ],
+    imports: [
+        CommonModule,
+        FormsModule,
+        ReactiveFormsModule,
+        IonicModule,
+        RouterModule.forChild(routes),
+        TranslateModule,
+        PipesModule
+    ],
   declarations: [GuestEditPage]
 })
 export class GuestEditPageModule {}
diff --git a/src/app/profile/guest-edit/guest-edit.page.html b/src/app/profile/guest-edit/guest-edit.page.html
index 0dc3dca46..80f85d533 100644
--- a/src/app/profile/guest-edit/guest-edit.page.html
+++ b/src/app/profile/guest-edit/guest-edit.page.html
@@ -1,6 +1,6 @@
 <ion-content>
   <form [formGroup]="guestEditForm">
-    <ion-list (ionChange)="onProfileTypeChange()" class="MT6">
+    <ion-list (ionChange)="onProfileTypeChange()" class="MT6" *ngIf="supportedUserTypes && supportedUserTypes.length">
       <ion-radio-group formControlName="profileType">
 
         <ion-label class="type-label ion-text-uppercase">
@@ -9,27 +9,13 @@
           </ion-text>
         </ion-label>
 
-        <ion-item lines="none" class="MT4">
-          <ion-label [ngClass]="{'highlight-radio': guestEditForm?.value?.profileType === ProfileType.STUDENT }">
-            {{ 'USER_TYPE_2' | translate | titlecase }}
+        <ion-item lines="none" *ngFor="let userType of supportedUserTypes">
+          <ion-label [ngClass]="{'highlight-radio': guestEditForm?.value?.profileType === userType.code }">
+            {{ userType.translations | translateJson }}
           </ion-label>
-          <ion-radio [value]="ProfileType.STUDENT" class="MR10" slot="start"></ion-radio>
+          <ion-radio [value]="userType.code" class="MR10" slot="start"></ion-radio>
         </ion-item>
 
-        <ion-item lines="none">
-          <ion-label [ngClass]="{'highlight-radio': guestEditForm?.value?.profileType === ProfileType.TEACHER }">
-            {{ 'USER_TYPE_1' | translate | titlecase }}
-          </ion-label>
-          <ion-radio [value]="ProfileType.TEACHER" class="MR10" slot="start"></ion-radio>
-        </ion-item>
-        <!-- <p class="ion-padding-start" *ngIf="guestEditForm?.value?.profileType === ProfileType.TEACHER">
-          {{ "IAM_ABOVE_18_YEARS_AGE" | translate }}</p> -->
-
-        <ion-item lines="none">
-          <ion-label [ngClass]="{'highlight-radio': guestEditForm?.value?.profileType === ProfileType.OTHER }">
-            {{ 'USER_TYPE_3' | translate | titlecase }}</ion-label>
-          <ion-radio [value]="ProfileType.OTHER" class="MR10" slot="start"></ion-radio>
-        </ion-item>
       </ion-radio-group>
     </ion-list>
     <ion-item class="ge-item-16">
@@ -42,33 +28,33 @@
     </ion-item>
 
     <!-- Syllabus -->
-    <ion-item class="ge-item-16" *ngIf="appGlobalService?.DISPLAY_FRAMEWORK_CATEGORIES_IN_PROFILE">
-      <ion-label position="stacked" class="label-font ge-label ion-text-uppercase">{{'BOARD' | translate }} &lrm;
+    <ion-item class="ge-item-16" *ngIf="!!supportedProfileAttributes['board']">
+      <ion-label *ngIf="!!supportedProfileAttributes['board']" position="stacked" class="label-font ge-label ion-text-uppercase">{{'BOARD' | translate }} &lrm;
         <ion-text>
           <span class="ge-danger">&nbsp;*</span>
         </ion-text>
       </ion-label>
-      <ion-select [disabled]="!syllabusList.length" multiple="false" formControlName="syllabus"
-        [interfaceOptions]="syllabusOptions" class="ion-text-capitalize"
+      <ion-select *ngIf="!!supportedProfileAttributes['board']" [disabled]="!syllabusList.length" multiple="false" formControlName="syllabus"
+        [interfaceOptions]="syllabusOptions" class="ion-text-capitalize" (ionChange)="onCategoryChanged('board',$event)"
         placeholder="{{ (syllabusList.length ? 'BOARD_OPTION_TEXT':'NO_DATA_FOUND') | translate }}"
         okText="{{'BTN_SUBMIT' | translate}}" cancelText="{{'CANCEL' | translate}}">
         <ion-select-option *ngFor="let eachSyllabus of syllabusList" value="{{eachSyllabus?.code}}">
-          {{eachSyllabus?.name}}&lrm;
+          {{eachSyllabus.name | aliased}}&lrm;
         </ion-select-option>
       </ion-select>
     </ion-item>
 
     <!-- Medium -->
-    <ion-item class="ge-item-16" *ngIf="appGlobalService?.DISPLAY_FRAMEWORK_CATEGORIES_IN_PROFILE">
-      <ion-label position="stacked" class="label-font ge-label ion-text-uppercase">
+    <ion-item class="ge-item-16" *ngIf="!!supportedProfileAttributes['medium']">
+      <ion-label *ngIf="!!supportedProfileAttributes['medium']" position="stacked" class="label-font ge-label ion-text-uppercase">
         {{'MEDIUM_OF_INSTRUCTION' | translate }}
         <ion-text>
           <span class="ge-danger">&nbsp;*</span>
         </ion-text>
       </ion-label>
-      <ion-select multiple="true" class="ion-text-capitalize"
+      <ion-select *ngIf="!!supportedProfileAttributes['medium']" multiple="true" class="ion-text-capitalize"
         [disabled]="(!mediumList.length || !(guestEditForm.value.boards != ''))" [interfaceOptions]="mediumOptions"
-        formControlName="medium"
+        formControlName="medium" (ionChange)="onCategoryChanged('medium', $event)"
         placeholder="{{ (mediumList.length ? 'MEDIUM_OPTION_TEXT':'NO_DATA_FOUND') | translate }}"
         okText="{{'BTN_SUBMIT' | translate}}" cancelText="{{'CANCEL' | translate}}">
         <ion-select-option *ngFor="let medium of mediumList" class="ion-text-capitalize" value="{{medium?.code}}">
@@ -78,14 +64,14 @@
     </ion-item>
 
     <!-- Grade -->
-    <ion-item class="ge-item-16" *ngIf="appGlobalService?.DISPLAY_FRAMEWORK_CATEGORIES_IN_PROFILE">
-      <ion-label position="stacked" class="label-font ge-label ion-text-uppercase">{{'CLASS' | translate }}<ion-text>
+    <ion-item class="ge-item-16" *ngIf="!!supportedProfileAttributes['gradeLevel']">
+      <ion-label *ngIf="!!supportedProfileAttributes['gradeLevel']" position="stacked" class="label-font ge-label ion-text-uppercase">{{'CLASS' | translate }}<ion-text>
           <span class="ge-danger">&nbsp;*</span>
         </ion-text>
       </ion-label>
-      <ion-select multiple="true" class="ion-text-capitalize"
+      <ion-select *ngIf="!!supportedProfileAttributes['gradeLevel']" multiple="true" class="ion-text-capitalize"
         [disabled]="(!gradeList.length || !(guestEditForm.value.medium != ''))" [interfaceOptions]="classOptions"
-        formControlName="grades"
+        formControlName="grades" (ionChange)="onCategoryChanged('grade',$event)"
         placeholder="{{ (gradeList.length ? 'GRADE_OPTION_TEXT':'NO_DATA_FOUND') | translate }}"
         okText="{{'BTN_SUBMIT' | translate}}" cancelText="{{'CANCEL' | translate}}">
         <ion-select-option *ngFor="let grade of gradeList" class="ion-text-capitalize" value="{{grade?.code}}">
@@ -95,12 +81,12 @@
     </ion-item>
 
     <!-- Subjects -->
-    <ion-item class="ge-item-16" *ngIf="appGlobalService?.DISPLAY_FRAMEWORK_CATEGORIES_IN_PROFILE">
-      <ion-label position="stacked" class="label-font ge-label ion-text-uppercase">{{'SUBJECTS' | translate }}
+    <ion-item class="ge-item-16" *ngIf="!!supportedProfileAttributes['subject']">
+      <ion-label *ngIf="!!supportedProfileAttributes['subject']" position="stacked" class="label-font ge-label ion-text-uppercase">{{'SUBJECTS' | translate }}
       </ion-label>
-      <ion-select multiple="true" [interfaceOptions]="subjectsOptions" class="ion-text-capitalize"
+      <ion-select *ngIf="!!supportedProfileAttributes['subject']" multiple="true" [interfaceOptions]="subjectsOptions" class="ion-text-capitalize"
         [disabled]="(!subjectList.length || !(guestEditForm.value.grades != ''))" formControlName="subjects"
-        (ionChange)="onSubjectChanged($event)"
+        (ionChange)="onCategoryChanged('subject', $event)"
         placeholder="{{ (subjectList.length ? 'SUBJECT_OPTION_TEXT':'NO_DATA_FOUND') | translate }}"
         okText="{{'BTN_SUBMIT' | translate}}" cancelText="{{'CANCEL' | translate}}">
         <ion-select-option *ngFor="let subject of subjectList" class="ion-text-capitalize" value="{{subject?.code}}">
@@ -112,6 +98,7 @@
   </form>
 </ion-content>
 
-<ion-footer class="ion-padding">
-  <ion-button expand="block" (click)="onSubmit()">{{'SAVE' | translate}}</ion-button>
-</ion-footer>
\ No newline at end of file
+  <div class="ion-padding ion-no-border" style="background: white;">
+    <button class="sb-btn sb-btn-md sb-btn-primary PR35 W100 ellipsis btn-block ion-text-uppercase"
+    [style.background-color]="btnColor" (click)="onSubmit()">{{'SAVE' | translate}}</button>
+  </div>
diff --git a/src/app/profile/guest-edit/guest-edit.page.scss b/src/app/profile/guest-edit/guest-edit.page.scss
index 72ceecfec..a574d56b2 100644
--- a/src/app/profile/guest-edit/guest-edit.page.scss
+++ b/src/app/profile/guest-edit/guest-edit.page.scss
@@ -44,7 +44,7 @@
     margin-bottom: 0 !important;
     margin-left: 16px;
     font-weight: 500 !important;
-    color: #999;
+    color: $gray-300;
     font-size: 12px;
   }
   .label-font {
@@ -62,7 +62,7 @@
 
 .red-toast {
   .toast-container {
-    background-color: #ff0000;
+    background-color: map-get($colors, vivid_red);
     #toast-hdr-6 {
       padding-left: 69px !important;
     }
@@ -71,7 +71,7 @@
     }
     .toast-message:before {
       content: "\f19f";
-      font-family: Ionicons;
+      font-family: Ionicons, sans-serif;
       -webkit-font-smoothing: antialiased;
       font-style: normal;
       font-variant: normal;
diff --git a/src/app/profile/guest-edit/guest-edit.page.spec.ts b/src/app/profile/guest-edit/guest-edit.page.spec.ts
new file mode 100644
index 000000000..67ad5b08e
--- /dev/null
+++ b/src/app/profile/guest-edit/guest-edit.page.spec.ts
@@ -0,0 +1,658 @@
+import { GuestEditPage } from './guest-edit.page';
+import {
+    FrameworkService,
+    FrameworkUtilService,
+    ProfileService,
+    Framework,
+    FrameworkCategoryCodesGroup,
+    GetSuggestedFrameworksRequest,
+    SharedPreferences
+} from 'sunbird-sdk';
+import { TranslateService } from '@ngx-translate/core';
+import { Events } from '@app/util/events';
+import { Router, ActivatedRoute } from '@angular/router';
+import {
+    AppGlobalService,
+    TelemetryGeneratorService,
+    CommonUtilService,
+    ContainerService,
+    AppHeaderService,
+    InteractType,
+    InteractSubtype,
+    Environment,
+    PageId,
+    ImpressionType,
+    ObjectType,
+    LoginHandlerService
+} from '../../../services';
+import { Location } from '@angular/common';
+import { of } from 'rxjs';
+import { FormBuilder, Validators } from '@angular/forms';
+import { ProfileHandler } from '@app/services/profile-handler';
+
+describe('GuestEditPage', () => {
+    let guestEditPage: GuestEditPage;
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        generateSaveClickedTelemetry: jest.fn()
+    };
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        translateMessage: jest.fn(() => 'select-box'),
+        showToast: jest.fn()
+    };
+    const mockContainer: Partial<ContainerService> = {};
+    const mockEvents: Partial<Events> = {};
+    const mockFrameworkService: Partial<FrameworkService> = {};
+    const mockFrameworkUtilService: Partial<FrameworkUtilService> = {};
+    const mockHeaderService: Partial<AppHeaderService> = {};
+    const mockLocation: Partial<Location> = {};
+    const mockProfileService: Partial<ProfileService> = {};
+    const mockRoterExtras = {
+        extras: {
+            state: {
+                contentType: 'contentType',
+                corRelationList: 'corRelationList',
+                source: 'source',
+                enrolledCourses: 'enrolledCourses' as any,
+                userId: 'userId',
+                shouldGenerateEndTelemetry: false,
+                isNewUser: true,
+                lastCreatedProfile: { id: 'sample-id' }
+            }
+        }
+    };
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => mockRoterExtras as any),
+        navigate: jest.fn(() => Promise.resolve(true))
+    };
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateInteractTelemetry: jest.fn(),
+        generateImpressionTelemetry: jest.fn()
+    };
+    const mockTranslate: Partial<TranslateService> = {};
+    const mockActivatedRoute: Partial<ActivatedRoute> = {};
+    mockActivatedRoute.snapshot = {
+        queryParams: {
+            reOnBoard: {}
+        }
+    } as any;
+    const mockSharedPreferences: Partial<SharedPreferences> = {
+        putString: jest.fn(),
+        getString: jest.fn(() => of('ka' as any))
+    };
+    const mockFb: Partial<FormBuilder> = {
+        group: jest.fn(() => ({})) as any,
+        control: jest.fn()
+    };
+
+    const mockProfileHandler: Partial<ProfileHandler> = {
+        getSupportedProfileAttributes: jest.fn(() => Promise.resolve({ borad: 'board', medium: 'medium', gradeLevel: 'gradeLevel' }))
+    };
+    const mockLoginHandlerService: Partial<LoginHandlerService> = {};
+
+    beforeAll(() => {
+        guestEditPage = new GuestEditPage(
+            mockProfileService as ProfileService,
+            mockFrameworkService as FrameworkService,
+            mockFrameworkUtilService as FrameworkUtilService,
+            mockSharedPreferences as SharedPreferences,
+            mockAppGlobalService as AppGlobalService,
+            mockCommonUtilService as CommonUtilService,
+            mockFb as FormBuilder,
+            mockTranslate as TranslateService,
+            mockEvents as Events,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockContainer as ContainerService,
+            mockHeaderService as AppHeaderService,
+            mockRouter as Router,
+            mockLocation as Location,
+            mockProfileHandler as ProfileHandler,
+            mockLoginHandlerService as LoginHandlerService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should be create a instance of guestEditPage', () => {
+        expect(guestEditPage).toBeTruthy();
+    });
+
+    it('should return syllabusControl', () => {
+        guestEditPage.guestEditForm = {
+            get: jest.fn(() => ({ Validators: '' })) as any
+        } as any;
+        expect(guestEditPage.syllabusControl).toBeTruthy();
+    });
+
+    it('should return boardControl', () => {
+        guestEditPage.guestEditForm = {
+            get: jest.fn(() => ({ Validators: '' })) as any
+        } as any;
+        expect(guestEditPage.boardControl).toBeTruthy();
+    });
+
+    it('should return mediumControl', () => {
+        guestEditPage.guestEditForm = {
+            get: jest.fn(() => ({ Validators: '' })) as any
+        } as any;
+        expect(guestEditPage.mediumControl).toBeTruthy();
+    });
+
+    it('should return gradeControl', () => {
+        guestEditPage.guestEditForm = {
+            get: jest.fn(() => ({ Validators: '' })) as any
+        } as any;
+        expect(guestEditPage.gradeControl).toBeTruthy();
+    });
+
+    it('should return subjectControl', () => {
+        guestEditPage.guestEditForm = {
+            get: jest.fn(() => ({ Validators: '' })) as any
+        } as any;
+        expect(guestEditPage.subjectControl).toBeTruthy();
+    });
+
+    describe('getSyllabusDetails', () => {
+        it('should fetch all the syllabus list details', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            })) as any;
+            guestEditPage.guestEditForm = {
+                syllabus: ['sampl'],
+                get: jest.fn(() => ({ name: 'sample-name', board: 'board', patchValue: jest.fn() }))
+            } as any;
+            guestEditPage.profile = {
+                syllabus: [{ name: 'sample-name' }]
+            };
+            guestEditPage.loader = mockCommonUtilService.getLoader;
+            const frameworkRes: Framework[] = [{
+                name: 'SAMPLE_STRING',
+                identifier: 'SAMPLE_STRING'
+            }];
+            const getSuggestedFrameworksRequest: GetSuggestedFrameworksRequest = {
+                from: 'server',
+                language: undefined,
+                requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
+            };
+            mockCommonUtilService.showToast = jest.fn();
+            mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList = jest.fn(() => of(frameworkRes));
+            // act
+            guestEditPage.getSyllabusDetails();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList).toHaveBeenCalledWith(getSuggestedFrameworksRequest);
+                done();
+            }, 0);
+        });
+
+        it('should show data not found toast message if syllabus list is empty.', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            })) as any;
+            guestEditPage.loader = mockCommonUtilService.getLoader;
+            const frameworkRes: Framework[] = [];
+            const getSuggestedFrameworksRequest: GetSuggestedFrameworksRequest = {
+                from: 'server',
+                language: undefined,
+                requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
+            };
+            mockCommonUtilService.showToast = jest.fn();
+            mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList = jest.fn(() => of(frameworkRes));
+            // act
+            guestEditPage.getSyllabusDetails();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+                expect(mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList).toHaveBeenCalledWith(getSuggestedFrameworksRequest);
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('NO_DATA_FOUND');
+                expect(guestEditPage.loader.dismiss).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+    });
+
+    describe('onSubjectChanged', () => {
+        it('should return newValue and oldValue for category changed', () => {
+            const event = {
+                detail: {
+                    value: ['math']
+                }
+            };
+            guestEditPage.profileForTelemetry = {
+                subject: ['english']
+            };
+            mockAppGlobalService.generateAttributeChangeTelemetry = jest.fn();
+            // act
+            guestEditPage.onCategoryChanged('subject', event);
+            expect(mockAppGlobalService.generateAttributeChangeTelemetry).toHaveBeenCalled();
+        });
+
+        it('should return newValue and oldValue if category is not changed', () => {
+            const event = {
+                detail: {
+                    value: ['math']
+                }
+            };
+            guestEditPage.profileForTelemetry = {
+                subject: ['math']
+            };
+            mockAppGlobalService.generateAttributeChangeTelemetry = jest.fn();
+            // act
+            guestEditPage.onCategoryChanged('subject', event);
+        });
+    });
+
+    describe('onSubmit', () => {
+        beforeEach(() => {
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            })) as any;
+        });
+        it('should show toast if form is invalid', () => {
+            // arrange
+            guestEditPage.isFormValid = false;
+            mockCommonUtilService.translateMessage = jest.fn(() => 'translated');
+            // act
+            guestEditPage.onSubmit();
+            // assert
+            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('translated');
+        });
+        it('should show toast if userType is not there', (done) => {
+            // arrange
+            guestEditPage.isFormValid = true;
+            guestEditPage.guestEditForm = {
+                value: {
+                    userType: ''
+                },
+            } as any;
+            // act
+            guestEditPage.onSubmit();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('USER_TYPE_SELECT_WARNING');
+                done();
+            }, 0);
+        });
+        it('should show toast if name is not there', (done) => {
+            // arrange
+            guestEditPage.isFormValid = true;
+            guestEditPage.guestEditForm = {
+                value: {
+                    profileType: 'userType'
+                },
+                getRawValue: jest.fn(() => { })
+            } as any;
+            mockCommonUtilService.translateMessage = jest.fn((arg) => {
+                let value;
+                switch (arg) {
+                    case 'PLEASE_SELECT':
+                        value = 'translated1';
+                        break;
+                    case 'FULL_NAME':
+                        value = 'translated2';
+                        break;
+                }
+                return value;
+            }
+            );
+            jest.spyOn(guestEditPage.guestEditForm, 'getRawValue').mockReturnValue({ name: '' });
+            // act
+            guestEditPage.onSubmit();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('translated1', false, 'red-toast');
+                done();
+            }, 0);
+        });
+        it('should show toast if boards are not there', (done) => {
+            // arrange
+            guestEditPage.isFormValid = true;
+            guestEditPage.guestEditForm = {
+                value: {
+                    syllabus: [],
+                    profileType: 'userType',
+                    boards: []
+                },
+                getRawValue: jest.fn(() => { })
+            } as any;
+            mockCommonUtilService.translateMessage = jest.fn((arg) => {
+                let value;
+                switch (arg) {
+                    case 'PLEASE_SELECT':
+                        value = 'translated1';
+                        break;
+                    case 'BOARD':
+                        value = 'translated2';
+                        break;
+                }
+                return value;
+            }
+            );
+            jest.spyOn(guestEditPage.guestEditForm, 'getRawValue').mockReturnValue({ name: 'name' });
+            mockAppGlobalService.generateSaveClickedTelemetry = jest.fn();
+            // act
+            guestEditPage.onSubmit();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('translated1', false, 'red-toast');
+                done();
+            }, 0);
+        });
+        // it('should show toast if medium is not there', (done) => {
+        //     // arrange
+        //     guestEditPage.isFormValid = true;
+        //     guestEditPage.guestEditForm = {
+        //         value: {
+        //             syllabus: [],
+        //             userType: 'userType',
+        //             boards: ['board'],
+        //             medium: []
+        //         },
+        //         getRawValue: jest.fn(() => { })
+        //     } as any;
+        //     mockCommonUtilService.translateMessage = jest.fn((arg) => {
+        //         let value;
+        //         switch (arg) {
+        //             case 'PLEASE_SELECT':
+        //                 value = 'translated1';
+        //                 break;
+        //             case 'MEDIUM':
+        //                 value = 'translated2';
+        //                 break;
+        //         }
+        //         return value;
+        //     }
+        //     );
+        //     jest.spyOn(guestEditPage.guestEditForm, 'getRawValue').mockReturnValue({ name: 'name' });
+        //     mockAppGlobalService.generateSaveClickedTelemetry = jest.fn();
+        //     // act
+        //     guestEditPage.onSubmit();
+        //     // assert
+        //     setTimeout(() => {
+        //         expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('translated1', false, 'red-toast');
+        //         done();
+        //     }, 0);
+        // });
+        // it('should show toast if grades are not there', (done) => {
+        //     // arrange
+        //     guestEditPage.isFormValid = true;
+        //     guestEditPage.guestEditForm = {
+        //         value: {
+        //             syllabus: [],
+        //             userType: 'userType',
+        //             boards: ['board'],
+        //             medium: ['medium'],
+        //             grades: []
+        //         },
+        //         getRawValue: jest.fn(() => { })
+        //     } as any;
+        //     mockCommonUtilService.translateMessage = jest.fn((arg) => {
+        //         let value;
+        //         switch (arg) {
+        //             case 'PLEASE_SELECT':
+        //                 value = 'translated1';
+        //                 break;
+        //             case 'CLASS':
+        //                 value = 'translated2';
+        //                 break;
+        //         }
+        //         return value;
+        //     }
+        //     );
+        //     jest.spyOn(guestEditPage.guestEditForm, 'getRawValue').mockReturnValue({ name: 'name' });
+        //     mockAppGlobalService.generateSaveClickedTelemetry = jest.fn();
+        //     // act
+        //     guestEditPage.onSubmit();
+        //     // assert
+        //     setTimeout(() => {
+        //         expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('translated1', false, 'red-toast');
+        //         done();
+        //     }, 0);
+        // });
+        // it('should call submitNewUserForm if new user', (done) => {
+        //     // arrange
+        //     guestEditPage.isFormValid = true;
+        //     guestEditPage.isNewUser = true;
+        //     jest.spyOn(guestEditPage, 'submitNewUserForm').mockImplementation();
+        //     guestEditPage.guestEditForm = {
+        //         value: {
+        //             syllabus: [],
+        //             userType: 'userType',
+        //             boards: ['board'],
+        //             medium: ['medium'],
+        //             grades: ['grade']
+        //         },
+        //         getRawValue: jest.fn(() => { })
+        //     } as any;
+        //     mockCommonUtilService.translateMessage = jest.fn((arg) => {
+        //         let value;
+        //         switch (arg) {
+        //             case 'PLEASE_SELECT':
+        //                 value = 'translated1';
+        //                 break;
+        //             case 'CLASS':
+        //                 value = 'translated2';
+        //                 break;
+        //         }
+        //         return value;
+        //     }
+        //     );
+        //     jest.spyOn(guestEditPage.guestEditForm, 'getRawValue').mockReturnValue({ name: 'name' });
+        //     mockAppGlobalService.generateSaveClickedTelemetry = jest.fn();
+        //     // act
+        //     guestEditPage.onSubmit();
+        //     // assert
+        //     setTimeout(() => {
+        //         expect(guestEditPage.submitNewUserForm).toHaveBeenCalled();
+        //         done();
+        //     }, 0);
+        // });
+        // it('should call submitEditForm if not new user', (done) => {
+        //         // arrange
+        //         guestEditPage.isFormValid = true;
+        //         guestEditPage.isNewUser = false;
+        //         jest.spyOn(guestEditPage, 'submitEditForm').mockImplementation();
+        //         guestEditPage.guestEditForm = {
+        //             value: {
+        //                 syllabus: [],
+        //                 userType: 'userType',
+        //                 boards: ['board'],
+        //                 medium: ['medium'],
+        //                 grades: ['grade']
+        //             },
+        //             getRawValue: jest.fn(() => { })
+        //         } as any;
+        //         mockCommonUtilService.translateMessage = jest.fn((arg) => {
+        //             let value;
+        //             switch (arg) {
+        //                 case 'PLEASE_SELECT':
+        //                     value = 'translated1';
+        //                     break;
+        //                 case 'CLASS':
+        //                     value = 'translated2';
+        //                     break;
+        //             }
+        //             return value;
+        //         }
+        //         );
+        //         jest.spyOn(guestEditPage.guestEditForm, 'getRawValue').mockReturnValue({ name: 'name' });
+        //         mockAppGlobalService.generateSaveClickedTelemetry = jest.fn();
+        //         // act
+        //         guestEditPage.onSubmit();
+        //         // assert
+        //         setTimeout(() => {
+        //             expect(guestEditPage.submitEditForm).toHaveBeenCalled();
+        //             done();
+        //         }, 0);
+        //     });
+    });
+
+    describe('ngOnInit', () => {
+        it('should generate INTERACT and IMPRESSION telemetry for new User', (done) => {
+            // arrange
+            mockProfileHandler.getSupportedUserTypes = jest.fn(() => Promise.resolve(
+                [{ code: 'teacher' }]));
+            // act
+            guestEditPage.ngOnInit().then(() => {
+                // assert
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.CREATE_USER_INITIATED,
+                    Environment.USER,
+                    PageId.CREATE_USER
+                );
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    ImpressionType.VIEW,
+                    '',
+                    PageId.CREATE_USER,
+                    Environment.USER, '',
+                    ''
+                );
+                done();
+            });
+        });
+
+        it('should generate INTERACT and IMPRESSION telemetry for existing User', (done) => {
+            // arrange
+            guestEditPage['isNewUser'] = false;
+            mockProfileHandler.getSupportedUserTypes = jest.fn(() => Promise.resolve(
+                [{ code: 'teacher' }]));
+            // act
+            guestEditPage.ngOnInit().then(() => {
+                // assert
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.EDIT_USER_INITIATED,
+                    Environment.USER,
+                    PageId.CREATE_USER
+                );
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    ImpressionType.VIEW,
+                    '',
+                    PageId.CREATE_USER,
+                    Environment.USER, undefined,
+                    ObjectType.USER
+                );
+                done();
+            });
+        });
+
+        it('should populate the supported attributes', (done) => {
+            // arrange
+            mockProfileHandler.getSupportedProfileAttributes = jest.fn(() => Promise.resolve(
+                {
+                    board: 'board',
+                    medium: 'medium',
+                    gradeLevel: 'gradeLevel'
+                }));
+            mockProfileHandler.getSupportedUserTypes = jest.fn(() => Promise.resolve(
+                [{ code: 'teacher' }]));
+
+            guestEditPage['onSyllabusChange'] = jest.fn(() => of({} as any));
+            guestEditPage['onMediumChange'] = jest.fn(() => of({} as any));
+            guestEditPage['onGradeChange'] = jest.fn(() => of({} as any));
+            // act
+            guestEditPage.ngOnInit().then(() => {
+                // assert
+                expect(guestEditPage.supportedProfileAttributes).toEqual({
+                    board: 'board',
+                    medium: 'medium',
+                    gradeLevel: 'gradeLevel'
+                });
+                done();
+            });
+        });
+
+    });
+
+    describe('onProfileTypeChange', () => {
+        it('should unsubscribe the previous subscription and create a new one', (done) => {
+            // arrange
+            guestEditPage['onSyllabusChange'] = jest.fn(() => of({} as any));
+            guestEditPage['onMediumChange'] = jest.fn(() => of({} as any));
+            guestEditPage['onGradeChange'] = jest.fn(() => of({} as any));
+            mockProfileHandler.getSupportedProfileAttributes = jest.fn(() => Promise.resolve(
+                {
+                    board: 'board',
+                    medium: 'medium',
+                    gradeLevel: 'gradeLevel'
+                }));
+            guestEditPage.guestEditForm = {
+                get: jest.fn((arg) => {
+                    let value;
+                    switch (arg) {
+                        case 'syllabus':
+                            value = { value: ['AP'] };
+                            break;
+                        case 'board':
+                            value = { value: ['AP'] };
+                            break;
+                        case 'medium':
+                            value = { value: ['English'] };
+                            break;
+                        case 'grade':
+                            value = { value: ['Class 1'] };
+                            break;
+                        case 'profileType':
+                            value = { value: '' };
+                            break;
+                    }
+                    return value;
+                }),
+                value: jest.fn((arg) => {
+                    let value;
+                    switch (arg) {
+                        case 'profileType':
+                            value = { value: '' };
+                            break;
+                    }
+                    return value;
+                }),
+                patchValue: jest.fn(),
+                controls: {
+                    syllabus: {
+                        validator: jest.fn()
+                    },
+                    board: {
+                        validator: jest.fn()
+                    },
+                    medium: {
+                        validator: jest.fn()
+                    },
+                    grade: {
+                        validator: jest.fn()
+                    },
+                    profileType: {
+                        validator: jest.fn()
+                    }
+                },
+            } as any;
+            guestEditPage['formControlSubscriptions'] = {
+                unsubscribe: jest.fn()
+            } as any;
+            // act
+            guestEditPage.onProfileTypeChange();
+
+            // assert
+            expect(guestEditPage['formControlSubscriptions'].unsubscribe).toHaveBeenCalled();
+            done();
+        });
+
+    });
+
+});
diff --git a/src/app/profile/guest-edit/guest-edit.page.ts b/src/app/profile/guest-edit/guest-edit.page.ts
index e97f7b7a1..560b7a28b 100644
--- a/src/app/profile/guest-edit/guest-edit.page.ts
+++ b/src/app/profile/guest-edit/guest-edit.page.ts
@@ -1,19 +1,12 @@
 import { Router } from '@angular/router';
-import {
-  AlertController,
-  Events,
-  Platform,
-  PopoverController
-} from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { TranslateService } from '@ngx-translate/core';
-import { Component, Inject, OnInit, ChangeDetectorRef, OnDestroy } from '@angular/core';
+import { Component, Inject, OnInit, OnDestroy } from '@angular/core';
 import { FormBuilder, FormGroup, FormControl } from '@angular/forms';
 import isEqual from 'lodash/isEqual';
 import {
-  CategoryTerm,
   Framework,
   FrameworkCategoryCodesGroup,
-  FrameworkDetailsRequest,
   FrameworkService,
   FrameworkUtilService,
   GetFrameworkCategoryTermsRequest,
@@ -40,11 +33,12 @@ import {
 import { ContainerService, } from '@app/services/container.services';
 import { AppHeaderService } from '@app/services/app-header.service';
 import { GUEST_STUDENT_TABS, GUEST_TEACHER_TABS, initTabs } from '@app/app/module.service';
-import { PreferenceKey, RouterLinks, RegexPatterns } from '@app/app/app.constant';
-import { SbGenericPopoverComponent } from '@app/app/components/popups/sb-generic-popover/sb-generic-popover.component';
+import { PreferenceKey, RegexPatterns } from '@app/app/app.constant';
 import { Location } from '@angular/common';
-import { Observable, merge, Subscription, combineLatest } from 'rxjs';
-import { tap } from 'rxjs/operators';
+import { Observable, Subscription, combineLatest } from 'rxjs';
+import { delay, tap } from 'rxjs/operators';
+import { ProfileHandler } from '@app/services/profile-handler';
+import { LoginHandlerService } from '@app/services';
 
 @Component({
   selector: 'app-guest-edit',
@@ -54,7 +48,6 @@ import { tap } from 'rxjs/operators';
 export class GuestEditPage implements OnInit, OnDestroy {
 
   private framework: Framework;
-
   ProfileType = ProfileType;
   guestEditForm: FormGroup;
   profile: any = {};
@@ -66,18 +59,26 @@ export class GuestEditPage implements OnInit, OnDestroy {
   isNewUser = false;
   unregisterBackButton: any;
   isCurrentUser = true;
-
   isFormValid = true;
-
   previousProfileType;
   profileForTelemetry: any = {};
-
+  btnColor = '#8FC4FF';
   private formControlSubscriptions: Subscription;
-
   public syllabusList: { name: string, code: string }[] = [];
   public mediumList: { name: string, code: string }[] = [];
   public gradeList: { name: string, code: string }[] = [];
   public subjectList: { name: string, code: string }[] = [];
+  public supportedProfileAttributes: { [key: string]: string } = {};
+  public supportedUserTypes: Array<any> = [];
+
+  private availableProfileTypes = [
+    { profileType: ProfileType.STUDENT, name: this.commonUtilService.translateMessage('USER_TYPE_2') },
+    { profileType: ProfileType.TEACHER, name: this.commonUtilService.translateMessage('USER_TYPE_1') },
+    { profileType: ProfileType.ADMIN, name: this.commonUtilService.translateMessage('LEADER') },
+    { profileType: ProfileType.PARENT, name: this.commonUtilService.translateMessage('USER_TYPE_5') },
+    { profileType: ProfileType.OTHER, name: this.commonUtilService.translateMessage('USER_TYPE_3') }
+  ];
+  public profileTypeList = [];
 
   syllabusOptions = {
     title: this.commonUtilService.translateMessage('BOARD').toLocaleUpperCase(),
@@ -134,65 +135,45 @@ export class GuestEditPage implements OnInit, OnDestroy {
     private fb: FormBuilder,
     private translate: TranslateService,
     private events: Events,
-    private platform: Platform,
-    private alertCtrl: AlertController,
     private telemetryGeneratorService: TelemetryGeneratorService,
     private container: ContainerService,
-    private popoverCtrl: PopoverController,
     private headerService: AppHeaderService,
     private router: Router,
-    private location: Location
+    private location: Location,
+    private profileHandler: ProfileHandler,
+    private loginHandlerService: LoginHandlerService
   ) {
     if (this.router.getCurrentNavigation().extras.state) {
       this.isNewUser = Boolean(this.router.getCurrentNavigation().extras.state.isNewUser);
       this.isCurrentUser = Boolean(this.router.getCurrentNavigation().extras.state.isCurrentUser);
     }
 
-    if (this.isNewUser) {
-      if (this.router.getCurrentNavigation().extras.state) {
-        this.profile = this.router.getCurrentNavigation().extras.state.lastCreatedProfile || {};
-      } else {
-        this.profile = {};
-      }
-
-      this.guestEditForm = this.fb.group({
-        name: [this.profile.handle || ''],
-        profileType: [this.profile.profileType || ProfileType.STUDENT],
-        syllabus: [],
-        boards: [],
-        medium: [],
-        grades: [],
-        subjects: []
-      });
-
+    if (this.router.getCurrentNavigation().extras.state) {
+      this.profile = this.router.getCurrentNavigation().extras.state.profile || {};
     } else {
-      if (this.router.getCurrentNavigation().extras.state) {
-        this.profile = this.router.getCurrentNavigation().extras.state.profile || {};
-      } else {
-        this.profile = {};
-      }
-
-      this.guestEditForm = this.fb.group({
-        name: [this.profile.handle || ''],
-        profileType: [this.profile.profileType || ProfileType.STUDENT],
-        syllabus: [],
-        boards: [],
-        medium: [],
-        grades: [],
-        subjects: []
-      });
+      this.profile = {};
     }
 
+    this.guestEditForm = this.fb.group({
+      name: [this.profile.handle || ''],
+      profileType: [this.profile.profileType || ProfileType.STUDENT],
+      syllabus: [],
+      boards: [],
+      medium: [],
+      grades: [],
+      subjects: []
+    });
+
     this.previousProfileType = this.profile.profileType;
     this.profileForTelemetry = Object.assign({}, this.profile);
 
   }
 
-  ngOnInit() {
+  async ngOnInit() {
     this.telemetryGeneratorService.generateImpressionTelemetry(
       ImpressionType.VIEW, '',
       PageId.CREATE_USER,
-      Environment.USER, this.isNewUser ? '' : this.profile.uid, this.isNewUser ? '' : ObjectType.USER,
+      Environment.USER, this.isNewUser ? '' : this.profile.uid, this.isNewUser ? '' : ObjectType.USER
     );
 
     this.telemetryGeneratorService.generateInteractTelemetry(
@@ -201,17 +182,14 @@ export class GuestEditPage implements OnInit, OnDestroy {
       Environment.USER,
       PageId.CREATE_USER
     );
+    this.addAttributeSubscription(this.profile.profileType || undefined);
+    this.supportedUserTypes = await this.profileHandler.getSupportedUserTypes();
+  }
 
-    // auto fill alert is called when it is new user , profile and profile.name is present
-    if (this.isNewUser && this.profile && this.profile.handle) {
-      this.showAutoFillAlert();
-    }
-
-    this.formControlSubscriptions = combineLatest(
-      this.onSyllabusChange(),
-      this.onMediumChange(),
-      this.onGradeChange(),
-    ).subscribe();
+  private async addAttributeSubscription(userType: string) {
+    this.supportedProfileAttributes = await this.profileHandler.getSupportedProfileAttributes(true, userType);
+    const subscriptionArray: Array<any> = this.updateAttributeStreamsnSetValidators(this.supportedProfileAttributes);
+    this.formControlSubscriptions = combineLatest(subscriptionArray).subscribe();
   }
 
 
@@ -220,9 +198,6 @@ export class GuestEditPage implements OnInit, OnDestroy {
       this.commonUtilService.translateMessage('EDIT_PROFILE');
     this.headerService.showHeaderWithBackButton([], headerTitle);
     this.getSyllabusDetails();
-    this.unregisterBackButton = this.platform.backButton.subscribeWithPriority(10, () => {
-      this.dismissPopup();
-    });
   }
 
   ionViewWillLeave() {
@@ -235,42 +210,11 @@ export class GuestEditPage implements OnInit, OnDestroy {
     this.formControlSubscriptions.unsubscribe();
   }
 
-  // shows auto fill alert on load
-  async showAutoFillAlert() {
-    const confirm = await this.popoverCtrl.create({
-      component: SbGenericPopoverComponent,
-      componentProps: {
-        sbPopoverHeading: this.commonUtilService.translateMessage('ALERT'),
-        sbPopoverMainTitle: this.commonUtilService.translateMessage('PREVIOUS_USER_SETTINGS'),
-        actionsButtons: [
-          {
-            btntext: this.commonUtilService.translateMessage('CANCEL'),
-            btnClass: 'sb-btn sb-btn-sm sb-btn-outline-info'
-          }, {
-            btntext: this.commonUtilService.translateMessage('OKAY'),
-            btnClass: 'popover-color'
-          }
-        ],
-        icon: null
-      },
-      cssClass: 'sb-popover',
-    });
-    await confirm.present();
-    const { data } = await confirm.onDidDismiss();
-    if (data.isLeftButtonClicked) {
-      this.guestEditForm.patchValue({
-        name: undefined,
-        syllabus: [],
-        boards: [],
-        grades: [],
-        subjects: [],
-        medium: []
-      });
-      this.guestEditForm.controls['profileType'].setValue(this.ProfileType.STUDENT);
-    }
-  }
-
   onProfileTypeChange() {
+    if (this.formControlSubscriptions) {
+      this.formControlSubscriptions.unsubscribe();
+    }
+    this.addAttributeSubscription(this.guestEditForm.value.profileType);
     this.guestEditForm.patchValue({
       syllabus: [],
       boards: [],
@@ -278,6 +222,7 @@ export class GuestEditPage implements OnInit, OnDestroy {
       subjects: [],
       medium: []
     });
+    this.btnColor = '#8FC4FF';
   }
 
   async getSyllabusDetails() {
@@ -335,7 +280,7 @@ export class GuestEditPage implements OnInit, OnDestroy {
           };
 
           const boardTerm = (await this.frameworkUtilService.getFrameworkCategoryTerms(boardCategoryTermsRequet).toPromise())
-            .find(b => b.name === (this.syllabusList.find((s) => s.code === value[0])!.name));
+            .find(b => b.name === (this.syllabusList.find((s) => s.code === value[0]).name));
 
           this.boardControl.patchValue([boardTerm.code]);
 
@@ -356,11 +301,8 @@ export class GuestEditPage implements OnInit, OnDestroy {
             this.mediumControl.patchValue([]);
           }
         } catch (e) {
-          // todo
           console.error(e);
         } finally {
-          // todo
-          // this.mediumControl.patchValue([]);
           this.loader.dismiss();
         }
       })
@@ -396,11 +338,8 @@ export class GuestEditPage implements OnInit, OnDestroy {
             this.gradeControl.patchValue([]);
           }
         } catch (e) {
-          // todo
           console.error(e);
         } finally {
-          // todo
-          // this.gradeControl.patchValue([]);
           this.loader.dismiss();
         }
       })
@@ -410,10 +349,6 @@ export class GuestEditPage implements OnInit, OnDestroy {
   private onGradeChange(): Observable<string[]> {
     return this.gradeControl.valueChanges.pipe(
       tap(async () => {
-        // await this.commonUtilService.getLoader().then((loader) => {
-        //   this.loader = loader;
-        //   this.loader.present();
-        // });
         try {
           const nextCategoryTermsRequet: GetFrameworkCategoryTermsRequest = {
             frameworkId: this.framework.identifier,
@@ -432,30 +367,30 @@ export class GuestEditPage implements OnInit, OnDestroy {
             this.subjectControl.patchValue([]);
           }
         } catch (e) {
-          // todo
           console.error(e);
         } finally {
-          // todo
-          // this.subjectControl.patchValue([]);
           this.loader.dismiss();
         }
       })
     );
   }
 
- 
   /**
    * This method is added as we are not getting subject value in reset form method
    */
-  onSubjectChanged(event) {
-    const oldAttribute: any = {};
-    const newAttribute: any = {};
-    oldAttribute.subject = this.profileForTelemetry.subject ? this.profileForTelemetry.subject : '';
-    newAttribute.subject = event ? event : '';
-    if (!isEqual(oldAttribute, newAttribute)) {
-      this.appGlobalService.generateAttributeChangeTelemetry(oldAttribute, newAttribute, PageId.GUEST_PROFILE);
+  onCategoryChanged(name, event) {
+    if (event.detail.value && event.detail.value.length) {
+      const oldAttribute: any = {};
+      const newAttribute: any = {};
+      oldAttribute[name] = this.profileForTelemetry[name] ? this.profileForTelemetry[name] : '';
+      newAttribute[name] = event.detail.value ? event.detail.value : '';
+      if (!isEqual(oldAttribute, newAttribute)) {
+        this.appGlobalService.generateAttributeChangeTelemetry(oldAttribute, newAttribute, PageId.GUEST_PROFILE);
+      }
+      if (name === 'subject') {
+        this.profileForTelemetry.subject = event.detail.value ? event.detail.value : '';
+      }
     }
-    this.profileForTelemetry.subject = event;
   }
 
   /**
@@ -470,25 +405,25 @@ export class GuestEditPage implements OnInit, OnDestroy {
     const loader = await this.commonUtilService.getLoader();
     const formVal = this.guestEditForm.value;
 
-    if (formVal.userType === '') {
+    if (!formVal.profileType) {
       this.commonUtilService.showToast('USER_TYPE_SELECT_WARNING');
       return false;
     } else if (!this.validateName()) {
       this.commonUtilService.showToast(
         this.commonUtilService.translateMessage('PLEASE_SELECT', this.commonUtilService.translateMessage('FULL_NAME')), false, 'red-toast');
-    } else if (formVal.boards.length === 0) {
+    } else if (formVal.boards && formVal.boards.length === 0) {
       this.appGlobalService.generateSaveClickedTelemetry(
         this.extractProfileForTelemetry(formVal), 'failed', PageId.EDIT_USER, InteractSubtype.SAVE_CLICKED);
       this.commonUtilService.showToast(
         this.commonUtilService.translateMessage('PLEASE_SELECT', this.commonUtilService.translateMessage('BOARD')), false, 'red-toast');
       return false;
-    } else if (formVal.medium.length === 0) {
+    } else if (formVal.medium && formVal.medium.length === 0 && !!this.supportedProfileAttributes['medium']) {
       this.appGlobalService.generateSaveClickedTelemetry(
         this.extractProfileForTelemetry(formVal), 'failed', PageId.EDIT_USER, InteractSubtype.SAVE_CLICKED);
       this.commonUtilService.showToast(
         this.commonUtilService.translateMessage('PLEASE_SELECT', this.commonUtilService.translateMessage('MEDIUM')), false, 'red-toast');
       return false;
-    } else if (formVal.grades.length === 0) {
+    } else if (formVal.grades && formVal.grades.length === 0 && !!this.supportedProfileAttributes['gradeLevel']) {
       this.appGlobalService.generateSaveClickedTelemetry(
         this.extractProfileForTelemetry(formVal), 'failed', PageId.EDIT_USER, InteractSubtype.SAVE_CLICKED);
       this.commonUtilService.showToast(
@@ -561,7 +496,7 @@ export class GuestEditPage implements OnInit, OnDestroy {
       });
     }
     this.profileService.updateProfile(req)
-      .subscribe((res: any) => {
+      .subscribe(() => {
         this._dismissLoader(loader);
         this.commonUtilService.showToast(this.commonUtilService.translateMessage('PROFILE_UPDATE_SUCCESS'));
         this.telemetryGeneratorService.generateInteractTelemetry(
@@ -576,7 +511,7 @@ export class GuestEditPage implements OnInit, OnDestroy {
         } else {
           this.location.back();
         }
-      }, (err: any) => {
+      }, () => {
         this._dismissLoader(loader);
         this.commonUtilService.showToast(this.commonUtilService.translateMessage('PROFILE_UPDATE_FAILED'));
       });
@@ -584,7 +519,11 @@ export class GuestEditPage implements OnInit, OnDestroy {
 
   publishProfileEvents(formVal) {
     // Publish event if the all the fields are submitted
-    if (formVal.syllabus.length && formVal.boards.length && formVal.grades.length && formVal.medium.length && formVal.subjects.length) {
+    if (formVal.syllabus && formVal.syllabus.length
+      && (formVal.boards && formVal.boards.length)
+      && (formVal.grades && formVal.grades.length)
+      && (formVal.medium && formVal.medium.length)
+      && (formVal.subjects && formVal.subjects.length)) {
       this.events.publish('onboarding-card:completed', { isOnBoardingCardCompleted: true });
     } else {
       this.events.publish('onboarding-card:completed', { isOnBoardingCardCompleted: false });
@@ -593,16 +532,13 @@ export class GuestEditPage implements OnInit, OnDestroy {
     this.events.publish('refresh:onboardingcard');
 
     if (this.previousProfileType && this.previousProfileType !== formVal.profileType) {
-      if (formVal.profileType === ProfileType.STUDENT) {
-        this.preferences.putString(PreferenceKey.SELECTED_USER_TYPE, ProfileType.STUDENT).toPromise().then();
-        initTabs(this.container, GUEST_STUDENT_TABS);
-      } else if (formVal.profileType === ProfileType.TEACHER) {
-        this.preferences.putString(PreferenceKey.SELECTED_USER_TYPE, ProfileType.TEACHER).toPromise().then();
-        initTabs(this.container, GUEST_TEACHER_TABS);
-      } else {
-        this.preferences.putString(PreferenceKey.SELECTED_USER_TYPE, ProfileType.OTHER).toPromise().then();
-        initTabs(this.container, GUEST_TEACHER_TABS);
-      }
+      if (this.previousProfileType && this.previousProfileType !== formVal.profileType) {
+        this.preferences.putString(PreferenceKey.SELECTED_USER_TYPE, formVal.profileType).toPromise().then();
+        if (formVal.profileType === ProfileType.ADMIN) {
+            this.preferences.putString(PreferenceKey.SELECTED_USER_TYPE, ProfileType.ADMIN).toPromise().then();
+            this.loginHandlerService.signIn();
+          }
+        }
     }
     this.location.back();
   }
@@ -636,13 +572,13 @@ export class GuestEditPage implements OnInit, OnDestroy {
       });
     }
 
-    this.profileService.createProfile(req, req.source).subscribe((res: any) => {
+    this.profileService.createProfile(req, req.source).subscribe(() => {
       this._dismissLoader(loader);
       this.commonUtilService.showToast(this.commonUtilService.translateMessage('USER_CREATED_SUCCESSFULLY'));
       this.telemetryGeneratorService.generateInteractTelemetry(
         InteractType.OTHER, InteractSubtype.CREATE_USER_SUCCESS, Environment.USER, PageId.CREATE_USER);
       this.location.back();
-    }, (err: any) => {
+    }, () => {
       this._dismissLoader(loader);
       this.commonUtilService.showToast(this.commonUtilService.translateMessage('FILL_THE_MANDATORY_FIELDS'));
     });
@@ -657,16 +593,28 @@ export class GuestEditPage implements OnInit, OnDestroy {
     }
   }
 
-  /**
-   * It will Dismiss active popup
-   */
-  async dismissPopup() {
-    const activePortal = await this.alertCtrl.getTop();
-    if (activePortal) {
-      await activePortal.dismiss();
-    } else {
-      this.location.back();
-    }
+  private updateAttributeStreamsnSetValidators(attributes: { [key: string]: string }): Array<any> {
+    const subscriptionArray = [];
+    Object.keys(attributes).forEach((attribute) => {
+      switch (attribute) {
+        case 'board':
+          subscriptionArray.push(this.onSyllabusChange());
+          break;
+        case 'medium':
+          subscriptionArray.push(this.onMediumChange());
+          break;
+        case 'gradeLevel':
+          subscriptionArray.push(this.onGradeChange());
+          break;
+      }
+    });
+    subscriptionArray.push(this.guestEditForm.valueChanges.pipe(
+     delay(250),
+      tap(() => {
+       this.btnColor = this.guestEditForm.valid ? '#006DE5' : '#8FC4FF';
+      })
+    ));
+    return subscriptionArray;
   }
 
 }
diff --git a/src/app/profile/guest-profile/guest-profile.module.ts b/src/app/profile/guest-profile/guest-profile.module.ts
index 46cc17126..c1123a771 100644
--- a/src/app/profile/guest-profile/guest-profile.module.ts
+++ b/src/app/profile/guest-profile/guest-profile.module.ts
@@ -1,13 +1,12 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { Routes, RouterModule } from '@angular/router';
+import { RouterModule, Routes } from '@angular/router';
+import { ComponentsModule } from '@app/app/components/components.module';
+import { PipesModule } from '@app/pipes/pipes.module';
 import { IonicModule } from '@ionic/angular';
 import { TranslateModule } from '@ngx-translate/core';
-
 import { GuestProfilePage } from './guest-profile.page';
-import { ComponentsModule } from '@app/app/components/components.module';
-import { RouterLinks } from '@app/app/app.constant';
 
 const routes: Routes = [
   {
@@ -16,15 +15,16 @@ const routes: Routes = [
 ];
 
 @NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    ReactiveFormsModule,
-    IonicModule,
-    RouterModule.forChild(routes),
-    TranslateModule,
-    ComponentsModule
-  ],
+    imports: [
+        CommonModule,
+        FormsModule,
+        ReactiveFormsModule,
+        IonicModule,
+        RouterModule.forChild(routes),
+        TranslateModule,
+        ComponentsModule,
+        PipesModule
+    ],
   declarations: [GuestProfilePage]
 })
 export class GuestProfilePageModule { }
diff --git a/src/app/profile/guest-profile/guest-profile.page.html b/src/app/profile/guest-profile/guest-profile.page.html
index 986e44904..6186c05a1 100644
--- a/src/app/profile/guest-profile/guest-profile.page.html
+++ b/src/app/profile/guest-profile/guest-profile.page.html
@@ -1,130 +1,174 @@
-<ion-content overflow-scroll="true" class="main-container avoid-bottom-tabs-space">
-  <ion-refresher (ionRefresh)="refreshProfileData($event)"></ion-refresher>
-  <div class="padding-top-10 padding-bottom-10 ion-text-center">
-    <p class="profile-name">
-      <span class="user">{{profile?.handle | titlecase}}</span>
-      <span>
-        <ion-icon class="editIcon" name="md-create" color="primary" (click)="editGuestProfile(false,'edit-profile')">
-        </ion-icon>
-      </span>
-    </p>
-
-    <p class="change-role ion-text-uppercase" (click)="editGuestProfile(true,'change-role')">
-      {{'CHANGE_ROLE' | translate }}
-    </p>
-    <p *ngIf="profile?.profileType === ProfileType.TEACHER" class="user-type">{{'USER_TYPE_1' | translate }}</p>
-    <p *ngIf="profile?.profileType === ProfileType.STUDENT" class="user-type">{{'USER_TYPE_2' | translate }}</p>
-    <p *ngIf="profile?.profileType === ProfileType.OTHER" class="user-type">{{'USER_TYPE_3' | translate }}</p>
-  </div>
-
-  <div class="details-container" *ngIf="appGlobalService?.DISPLAY_FRAMEWORK_CATEGORIES_IN_PROFILE">
-    <h2 class="section-title padding-left-10 ion-no-padding">
-      {{'PROFILE_DETAILS_TITLE' | translate}}
-    </h2>
-
-    <div class="grid-container">
-      <!-- Syllabus -->
-      <div [hidden]="true" class="grid-item info-title text-align-start ion-text-uppercase">
-        {{'SYLLABUS' | translate}}
+<ion-content overflow-scroll="true" class="ui-container main-container avoid-bottom-tabs-space">
+  <div class="ui-content">
+    <ion-refresher (ionRefresh)="refreshProfileData($event)"></ion-refresher>
+    <div class="profile-info padding-top-10 padding-bottom-10 ion-text-center">
+      <div class="profile-icon">
+        <img src="./assets/imgs/guest_profile.svg" alt="guest-profile">
       </div>
-      <div [hidden]="true" class="grid-item text-align-end" (click)="editGuestProfile(false,'syllabus')">
-        <div *ngIf="profile?.syllabus && profile?.syllabus !== ''" class="align-content">
-          <div class="ellipsis text-align width-100">{{syllabus}}</div>
-          <ion-icon class="icon-align" float="end" name="md-create" color="primary">
+      <p class="profile-name">
+        <span class="user">{{profile?.handle | titlecase}}</span>
+        <span>
+          <ion-icon class="editIcon" name="create" color="primary" (click)="editGuestProfile(false,'edit-profile')">
           </ion-icon>
+        </span>
+      </p>
+    </div>
+
+    <div class="content-preferences-info" *ngIf="appGlobalService?.DISPLAY_FRAMEWORK_CATEGORIES_IN_PROFILE">
+      <div class="content-header-info">{{ 'CONTENT_PREFERENCE' | translate }}</div>
+      <!-- <h2 class="section-title padding-left-10 ion-no-padding">
+        {{'PROFILE_DETAILS_TITLE' | translate}}
+      </h2> -->
+
+      <div class="grid-container">
+        <!-- Name -->
+        <!-- <div *ngIf="profile?.handle" class="grid-item info-title text-align-start ion-text-uppercase">{{ 'NAME' | translate}}</div>
+        <div *ngIf="profile?.handle" class="grid-item text-align-end" (click)="editGuestProfile(false,'edit-profile')">
+          <div *ngIf="profile?.handle" class="align-content">
+            <div class="ellipsis text-align width-100">{{profile?.handle | aliased}}&lrm;</div>
+            <ion-icon class="icon-align" float="end" name="create" color="primary">
+            </ion-icon>
+          </div>
+        </div> -->
+        <!-- Role -->
+        <div *ngIf="profile?.profileType" class="grid-item info-title text-align-start ion-text-uppercase">{{'FRMELEMNTS_LBL_PERSONA' | translate}}</div>
+        <div *ngIf="profile?.profileType" class="grid-item text-align-end" (click)="editGuestProfile(true,'change-role')">
+          <div *ngIf="profile?.profileType" class="align-content">
+            <div class="ellipsis text-align width-100">{{currentUserTypeConfig?.name}}&lrm;</div>
+            <ion-icon class="icon-align" float="end" name="create" color="primary">
+            </ion-icon>
+          </div>
         </div>
-        <div *ngIf="!profile?.syllabus?.length" class="vertical-align">
-          {{'ADD' | translate}}
+        <!-- Syllabus -->
+        <div [hidden]="true" class="grid-item info-title text-align-start ion-text-uppercase">
+          {{'SYLLABUS' | translate}}
+        </div>
+        <div [hidden]="true" class="grid-item text-align-end" (click)="editGuestProfile(false,'syllabus')">
+          <div *ngIf="profile?.syllabus && profile?.syllabus !== ''" class="align-content">
+            <div class="ellipsis text-align width-100">{{syllabus}}</div>
+            <ion-icon class="icon-align" float="end" name="create" color="primary">
+            </ion-icon>
+          </div>
+          <div *ngIf="!profile?.syllabus?.length" class="vertical-align">
+            {{'ADD' | translate}}
+          </div>
         </div>
-      </div>
 
-      <!-- Board -->
-      <div class="grid-item info-title text-align-start ion-text-uppercase">{{'BOARD' | translate}}</div>
-      <div class="grid-item text-align-end" (click)="editGuestProfile(false,'board')">
-        <div *ngIf="profile?.syllabus?.length && profile?.board?.length" class="align-content">
-          <div class="ellipsis text-align width-100">{{boards}}&lrm;</div>
-          <ion-icon class="icon-align" float="end" name="md-create" color="primary">
-          </ion-icon>
+        <!-- Board -->
+        <div *ngIf="!!supportedProfileAttributes['board']" class="grid-item info-title text-align-start ion-text-uppercase">{{'BOARD' | translate}}</div>
+        <div *ngIf="!!supportedProfileAttributes['board']" class="grid-item text-align-end" (click)="editGuestProfile(false,'board')">
+          <div *ngIf="profile?.syllabus?.length && profile?.board?.length" class="align-content">
+            <div class="ellipsis text-align width-100">{{boards | aliased}}&lrm;</div>
+            <ion-icon class="icon-align" float="end" name="create" color="primary">
+            </ion-icon>
+          </div>
+          <div *ngIf="!profile?.syllabus?.length || !profile?.board?.length" class="vertical-align">{{'ADD' | translate}}
+          </div>
+
         </div>
-        <div *ngIf="!profile?.syllabus?.length || !profile?.board?.length" class="vertical-align">{{'ADD' | translate}}
+        <!-- Medium -->
+
+        <div *ngIf="!!supportedProfileAttributes['medium']" class="grid-item info-title text-align-start ion-text-uppercase">{{'MEDIUM' | translate}}</div>
+        <div *ngIf="!!supportedProfileAttributes['medium']" class="grid-item text-align-end" (click)="editGuestProfile(false,'medium')">
+          <div *ngIf="profile?.syllabus?.length && profile?.board?.length && profile?.medium?.length"
+            class="align-content">
+            <div class="ellipsis text-align width-100">{{medium}}</div>
+            <ion-icon class="icon-align" float="end" name="create" color="primary">
+            </ion-icon>
+          </div>
+          <div *ngIf="!profile?.syllabus?.length || !profile?.board?.length || !profile?.medium?.length"
+            class="vertical-align">{{'ADD' | translate}}</div>
         </div>
 
-      </div>
-      <!-- Medium -->
-
-      <div class="grid-item info-title text-align-start ion-text-uppercase">{{'MEDIUM' | translate}}</div>
-      <div class="grid-item text-align-end" (click)="editGuestProfile(false,'medium')">
-        <div *ngIf="profile?.syllabus?.length && profile?.board?.length && profile?.medium?.length"
-          class="align-content">
-          <div class="ellipsis text-align width-100">{{medium}}</div>
-          <ion-icon class="icon-align" float="end" name="md-create" color="primary">
-          </ion-icon>
+
+        <!-- Class -->
+        <div *ngIf="!!supportedProfileAttributes['gradeLevel']" class="grid-item info-title text-align-start ion-text-uppercase">{{'CLASS' | translate}}</div>
+        <div *ngIf="!!supportedProfileAttributes['gradeLevel']" class="grid-item text-align-end" (click)="editGuestProfile(false,'class')">
+          <div
+            *ngIf="profile?.syllabus?.length && profile?.board?.length && profile?.medium?.length && profile?.grade?.length"
+            class="align-content">
+            <div class="ellipsis text-align width-100">{{grade}}</div>
+            <ion-icon class="icon-align" float="end" name="create" color="primary">
+            </ion-icon>
+          </div>
+          <div
+            *ngIf="!profile?.syllabus?.length || !profile?.board?.length || !profile?.medium?.length || !profile?.grade?.length"
+            class="vertical-align">{{'ADD' | translate}}</div>
         </div>
-        <div *ngIf="!profile?.syllabus?.length || !profile?.board?.length || !profile?.medium?.length"
-          class="vertical-align">{{'ADD' | translate}}</div>
-      </div>
 
 
-      <!-- Class -->
-      <div class="grid-item info-title text-align-start ion-text-uppercase">{{'CLASS' | translate}}</div>
-      <div class="grid-item text-align-end" (click)="editGuestProfile(false,'class')">
-        <div
-          *ngIf="profile?.syllabus?.length && profile?.board?.length && profile?.medium?.length && profile?.grade?.length"
-          class="align-content">
-          <div class="ellipsis text-align width-100">{{grade}}</div>
-          <ion-icon class="icon-align" float="end" name="md-create" color="primary">
-          </ion-icon>
+        <!-- Subject -->
+        <div *ngIf="!!supportedProfileAttributes['subject']" class="grid-item info-title text-align-start ion-text-uppercase">{{'SUBJECTS' | translate}}</div>
+        <div *ngIf="!!supportedProfileAttributes['subject']" class="grid-item text-align-end" (click)="editGuestProfile(false,'subjects')">
+          <div
+            *ngIf="profile?.syllabus?.length && profile?.board?.length && profile?.medium?.length && profile?.grade?.length && profile?.subject?.length"
+            class="align-content">
+            <div class="ellipsis text-align width-100">{{subjects}}</div>
+            <ion-icon class="icon-align" float="end" name="create" color="primary">
+            </ion-icon>
+          </div>
+          <div
+            *ngIf="!profile?.syllabus?.length || !profile?.board?.length || !profile?.medium?.length || !profile?.grade?.length || !profile?.subject?.length"
+            class="vertical-align">{{'ADD' | translate}}</div>
         </div>
-        <div
-          *ngIf="!profile?.syllabus?.length || !profile?.board?.length || !profile?.medium?.length || !profile?.grade?.length"
-          class="vertical-align">{{'ADD' | translate}}</div>
       </div>
 
-
-      <!-- Subject -->
-      <div class="grid-item info-title text-align-start ion-text-uppercase">{{'SUBJECTS' | translate}}</div>
-      <div class="grid-item text-align-end" (click)="editGuestProfile(false,'subjects')">
-        <div
-          *ngIf="profile?.syllabus?.length && profile?.board?.length && profile?.medium?.length && profile?.grade?.length && profile?.subject?.length"
-          class="align-content">
-          <div class="ellipsis text-align width-100">{{subjects}}</div>
-          <ion-icon class="icon-align" float="end" name="md-create" color="primary">
-          </ion-icon>
+      <!-- <h2 class="section-title padding-left-10 ion-no-padding">
+        {{'DEVICE_LOCATION' | translate}}
+      </h2> -->
+
+      <div class="grid-container">
+        <div class="grid-item info-title text-align-start ion-text-uppercase">{{'DISTRICT' | translate}}</div>
+        <div class="grid-item text-align-end" (click)="redirectToDistrictMappingPage()">
+          <div *ngIf="deviceLocation" class="align-content">
+            <div class="ellipsis text-align width-100">{{deviceLocation?.district}}</div>
+            <ion-icon class="icon-align" float="end" name="create" color="primary"></ion-icon>
+          </div>
+          <div *ngIf="!deviceLocation?.district" class="vertical-align">{{'ADD' | translate}}</div>
         </div>
-        <div
-          *ngIf="!profile?.syllabus?.length || !profile?.board?.length || !profile?.medium?.length || !profile?.grade?.length || !profile?.subject?.length"
-          class="vertical-align">{{'ADD' | translate}}</div>
-      </div>
-    </div>
 
-    <h2 class="section-title padding-left-10 ion-no-padding">
-      {{'DEVICE_LOCATION' | translate}}
-    </h2>
+        <div class="grid-item info-title text-align-start ion-text-uppercase">{{'STATE' | translate}}</div>
+        <div class="grid-item text-align-end" (click)="redirectToDistrictMappingPage()">
+          <div *ngIf="deviceLocation" class="align-content">
+            <div class="ellipsis text-align width-100">{{deviceLocation?.state}}</div>
+            <ion-icon class="icon-align" float="end" name="create" color="primary"></ion-icon>
+          </div>
+          <div *ngIf="!deviceLocation?.state" class="vertical-align">{{'ADD' | translate}}</div>
+        </div>
 
-    <div class="grid-container">
-      <div class="grid-item info-title text-align-start ion-text-uppercase">{{'STATE' | translate}}</div>
-      <div class="grid-item text-align-end" (click)="redirectToDistrictMappingPage()">
-        <div *ngIf="deviceLocation" class="align-content">
-          <div class="ellipsis text-align width-100">{{deviceLocation?.state}}</div>
-          <ion-icon class="icon-align" float="end" name="md-create" color="primary"></ion-icon>
+        <!-- <div *ngIf="deviceLocation && deviceLocation.block"class="grid-item info-title text-align-start ion-text-uppercase">{{'BLOCK' | translate}}</div>
+        <div *ngIf="deviceLocation && deviceLocation.block" class="grid-item text-align-end" (click)="redirectToDistrictMappingPage()">
+          <div *ngIf="deviceLocation" class="align-content">
+            <div class="ellipsis text-align width-100">{{deviceLocation?.block}}</div>
+            <ion-icon class="icon-align" float="end" name="create" color="primary"></ion-icon>
+          </div>
+          <div *ngIf="!deviceLocation?.block" class="vertical-align">{{'ADD' | translate}}</div>
         </div>
-        <div *ngIf="!deviceLocation?.state" class="vertical-align">{{'ADD' | translate}}</div>
-      </div>
 
-      <div class="grid-item info-title text-align-start ion-text-uppercase">{{'DISTRICT' | translate}}</div>
-      <div class="grid-item text-align-end" (click)="redirectToDistrictMappingPage()">
-        <div *ngIf="deviceLocation" class="align-content">
-          <div class="ellipsis text-align width-100">{{deviceLocation?.district}}</div>
-          <ion-icon class="icon-align" float="end" name="md-create" color="primary"></ion-icon>
+        <div *ngIf="deviceLocation && deviceLocation.cluster" class="grid-item info-title text-align-start ion-text-uppercase">{{'CLUSTER' | translate}}</div>
+        <div *ngIf="deviceLocation && deviceLocation.cluster" class="grid-item text-align-end" (click)="redirectToDistrictMappingPage()">
+          <div *ngIf="deviceLocation" class="align-content">
+            <div class="ellipsis text-align width-100">{{deviceLocation?.cluster}}</div>
+            <ion-icon class="icon-align" float="end" name="create" color="primary"></ion-icon>
+          </div>
+          <div *ngIf="!deviceLocation?.cluster" class="vertical-align">{{'ADD' | translate}}</div>
         </div>
-        <div *ngIf="!deviceLocation?.district" class="vertical-align">{{'ADD' | translate}}</div>
+
+        <div *ngIf="deviceLocation && deviceLocation.school" class="grid-item info-title text-align-start ion-text-uppercase">{{'SCHOOL' | translate}}</div>
+        <div *ngIf="deviceLocation && deviceLocation.school" class="grid-item text-align-end" (click)="redirectToDistrictMappingPage()">
+          <div *ngIf="deviceLocation" class="align-content">
+            <div class="ellipsis text-align width-100">{{deviceLocation?.school}}</div>
+            <ion-icon class="icon-align" float="end" name="create" color="primary"></ion-icon>
+          </div>
+          <div *ngIf="!deviceLocation?.school" class="vertical-align">{{'ADD' | translate}}</div>
+        </div> -->
+
       </div>
 
     </div>
 
-  </div>
-
-  <div *ngIf="showSignInCard" class="signin-card-bg">
-    <app-sign-in-card [source]="'profile'" (valueChange)="buttonClick($event)"></app-sign-in-card>
+    <div *ngIf="showSignInCard" class="signin-card-bg">
+      <app-sign-in-card [source]="'profile'" (valueChange)="onLoginClick($event)"></app-sign-in-card>
+    </div>
   </div>
 </ion-content>
\ No newline at end of file
diff --git a/src/app/profile/guest-profile/guest-profile.page.scss b/src/app/profile/guest-profile/guest-profile.page.scss
index b0723e958..e47e31167 100644
--- a/src/app/profile/guest-profile/guest-profile.page.scss
+++ b/src/app/profile/guest-profile/guest-profile.page.scss
@@ -3,6 +3,23 @@
 @import "src/assets/styles/fonts";
 
 :host {
+  .profile-info{
+    background-color: transparent;
+    border-radius: 0 0 0 16px;
+    .profile-icon{
+      width: 90px;
+      height: 90px;
+      border-radius: 60px;
+      background-color: map-get($colors, white);
+      box-shadow: 0 5px 2px 0 rgba(0,0,0,0.1);
+      margin: auto;
+      img{
+        position: relative;
+        top: 5px;
+        width: 75px;
+      }
+    }
+  }
   .profile-name {
     color: map-get($colors, dark);
     margin: 0;
@@ -62,7 +79,7 @@
 
   .vertical-align {
     vertical-align: sub;
-    color: #979797;
+    color: map-get($colors, dark_gray);
     font-size: 1rem;
     @extend .font-weight-700;
   }
@@ -80,7 +97,7 @@
   }
 
   .details-container {
-    border-top: solid #ccc;
+    border-top: solid map-get($colors, medium_gray);
     h2 {
       margin-top: 10px !important;
       margin-bottom: 10px;
@@ -89,6 +106,12 @@
   .grid-container {
     display: grid;
     grid-template-columns: 50% 50%;
+    border-style: double;
+    margin-top: 8px;
+    border-radius: 1rem;
+    background-color: aliceblue;
+    border-color: aliceblue;
+    padding: 10px;
   }
   .grid-item {
     padding: 0 10px 14px;
@@ -112,4 +135,21 @@
       }
     }
   }
+
+  .content-header-info {
+    font-weight: 600;
+    font-size: 1.3rem;
+  }
+
+  .content-preferences-info {
+    padding: 15px;
+    background-color: white;
+    text-align: center;
+    border-bottom: 0.3px solid map-get($colors, bright_blue_19);
+    border-top: 0.3px solid map-get($colors, bright_blue_19);
+    .container {
+      text-align: center;
+      @include margin(null, null, 10px, null);
+    }
+  }
 }
diff --git a/src/app/profile/guest-profile/guest-profile.page.ts b/src/app/profile/guest-profile/guest-profile.page.ts
index a1a8f6e2b..99bf069fc 100644
--- a/src/app/profile/guest-profile/guest-profile.page.ts
+++ b/src/app/profile/guest-profile/guest-profile.page.ts
@@ -1,6 +1,7 @@
 import { TranslateService } from '@ngx-translate/core';
 import { Component, Inject, OnInit } from '@angular/core';
-import { Events, ToastController } from '@ionic/angular';
+import { ToastController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import {
   Framework,
   FrameworkCategoryCodesGroup,
@@ -13,13 +14,15 @@ import {
   SharedPreferences,
   Profile
 } from 'sunbird-sdk';
-import { ActivatedRoute, Router, NavigationExtras } from '@angular/router';
+import { Router, NavigationExtras } from '@angular/router';
 import { AppGlobalService } from '@app/services/app-global-service.service';
 import { CommonUtilService } from '@app/services/common-util.service';
 import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
 import { AppHeaderService } from '@app/services/app-header.service';
 import { PageId, Environment, InteractType, InteractSubtype } from '@app/services/telemetry-constants';
 import { ProfileConstants, RouterLinks, PreferenceKey } from '@app/app/app.constant';
+import { ProfileHandler } from '@app/services/profile-handler';
+import { TagPrefixConstants } from '@app/services/segmentation-tag/segmentation-tag.service';
 
 @Component({
   selector: 'app-guest-profile',
@@ -43,6 +46,8 @@ export class GuestProfilePage implements OnInit {
   headerObservable: any;
   isUpgradePopoverShown = false;
   deviceLocation: any;
+  public supportedProfileAttributes: { [key: string]: string } = {};
+  public currentUserTypeConfig: any = {};
 
   constructor(
     @Inject('PROFILE_SERVICE') private profileService: ProfileService,
@@ -56,11 +61,11 @@ export class GuestProfilePage implements OnInit {
     private translate: TranslateService,
     private headerService: AppHeaderService,
     public toastController: ToastController,
-    private route: ActivatedRoute,
-    private router: Router
+    private router: Router,
+    private profileHandler: ProfileHandler
   ) { }
 
-  ngOnInit() {
+  async ngOnInit() {
     this.selectedLanguage = this.translate.currentLang;
 
     // Event for optional and forceful upgrade
@@ -71,7 +76,6 @@ export class GuestProfilePage implements OnInit {
       }
     });
 
-    // TODO: Need to make an get Profile user details API call.
     this.refreshProfileData();
 
     this.events.subscribe('refresh:profile', () => {
@@ -84,6 +88,7 @@ export class GuestProfilePage implements OnInit {
 
     this.refreshSignInCard();
     this.appGlobalService.generateConfigInteractEvent(PageId.GUEST_PROFILE);
+    this.supportedProfileAttributes = await this.profileHandler.getSupportedProfileAttributes();
   }
 
   ionViewWillEnter() {
@@ -109,8 +114,9 @@ export class GuestProfilePage implements OnInit {
   }
 
   async refreshProfileData(refresher: any = false, showLoader: boolean = true) {
-    this.loader = await this.commonUtilService.getLoader();
-
+    if (!this.loader) {
+      this.loader = await this.commonUtilService.getLoader();
+    }
     if (showLoader) {
       await this.loader.present();
     }
@@ -123,10 +129,20 @@ export class GuestProfilePage implements OnInit {
     }
 
     this.profileService.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS }).toPromise()
-      .then((res: any) => {
+      .then(async (res: any) => {
         this.profile = res;
+        const tagObj = {
+          board: res.board,
+          grade: res.grade,
+          syllabus: res.syllabus,
+          medium: res.medium,
+        };
+        window['segmentation'].SBTagService.pushTag(tagObj, TagPrefixConstants.USER_ATRIBUTE, true);
         this.getSyllabusDetails();
         this.refreshSignInCard();
+        this.supportedProfileAttributes = await this.profileHandler.getSupportedProfileAttributes(true, this.profile.profileType);
+        const supportedUserTypes = await this.profileHandler.getSupportedUserTypes();
+        this.currentUserTypeConfig = supportedUserTypes.find(userTypes => userTypes.code ===  this.profile.profileType);
         setTimeout(() => {
           if (refresher) { refresher.target.complete(); }
         }, 500);
@@ -139,7 +155,8 @@ export class GuestProfilePage implements OnInit {
   refreshSignInCard() {
     const profileType = this.appGlobalService.getGuestUserType();
 
-    if ((this.commonUtilService.isAccessibleForNonStudentRole(profileType) && this.appGlobalService.DISPLAY_SIGNIN_FOOTER_CARD_IN_PROFILE_TAB_FOR_TEACHER) ||
+    if ((this.commonUtilService.isAccessibleForNonStudentRole(profileType)
+      && this.appGlobalService.DISPLAY_SIGNIN_FOOTER_CARD_IN_PROFILE_TAB_FOR_TEACHER) ||
       (profileType === ProfileType.STUDENT && this.appGlobalService.DISPLAY_SIGNIN_FOOTER_CARD_IN_PROFILE_TAB_FOR_STUDENT)) {
       this.showSignInCard = true;
     } else {
@@ -161,23 +178,20 @@ export class GuestProfilePage implements OnInit {
       InteractType.TOUCH,
       InteractSubtype.EDIT_CLICKED,
       Environment.HOME,
-      PageId.GUEST_PROFILE,undefined,values);
+      PageId.GUEST_PROFILE, undefined, values);
     this.router.navigate([RouterLinks.GUEST_EDIT], navigationExtras);
   }
 
   getSyllabusDetails() {
     let selectedFrameworkId = '';
-
     const getSuggestedFrameworksRequest: GetSuggestedFrameworksRequest = {
       language: this.translate.currentLang,
       requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
     };
     this.frameworkUtilService.getActiveChannelSuggestedFrameworkList(getSuggestedFrameworksRequest).toPromise()
-      .then((result: Framework[]) => {
+      .then(async (result: Framework[]) => {
         if (result && result !== undefined && result.length > 0) {
-
           result.forEach(element => {
-
             if (this.profile && this.profile.syllabus && this.profile.syllabus.length && this.profile.syllabus[0] === element.identifier) {
               this.syllabus = element.name;
               selectedFrameworkId = element.identifier;
@@ -185,18 +199,18 @@ export class GuestProfilePage implements OnInit {
           });
 
           if (selectedFrameworkId !== undefined && selectedFrameworkId.length > 0) {
-            this.getFrameworkDetails(selectedFrameworkId);
+            this.getFrameworkDetails();
           } else {
-            this.loader.dismiss();
+            await this.loader.dismiss();
           }
         } else {
-          this.loader.dismiss();
+          await this.loader.dismiss();
           this.commonUtilService.showToast(this.commonUtilService.translateMessage('NO_DATA_FOUND'));
         }
       });
   }
 
-  getFrameworkDetails(frameworkId?: string): void {
+  getFrameworkDetails(): void {
     const frameworkDetailsRequest: FrameworkDetailsRequest = {
       frameworkId: (this.profile && this.profile.syllabus && this.profile.syllabus[0]) ? this.profile.syllabus[0] : '',
       requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
@@ -217,7 +231,6 @@ export class GuestProfilePage implements OnInit {
         if (this.profile.subject && this.profile.subject.length) {
           this.subjects = this.getFieldDisplayValues(this.profile.subject, 3);
         }
-
         await this.loader.dismiss();
       });
   }
@@ -232,7 +245,7 @@ export class GuestProfilePage implements OnInit {
     return this.commonUtilService.arrayToString(displayValues);
   }
 
-  buttonClick(isNetAvailable?) {
+  onLoginClick() {
     this.commonUtilService.showToast('NO_INTERNET_TITLE', false, '', 3000, 'top');
   }
 
diff --git a/src/app/user-and-groups/share-user-and-groups/share-user-and-groups.module.ts b/src/app/profile/manage-user-profiles/manage-user-profiles.module.ts
similarity index 54%
rename from src/app/user-and-groups/share-user-and-groups/share-user-and-groups.module.ts
rename to src/app/profile/manage-user-profiles/manage-user-profiles.module.ts
index dcc78e900..cd4acbc09 100644
--- a/src/app/user-and-groups/share-user-and-groups/share-user-and-groups.module.ts
+++ b/src/app/profile/manage-user-profiles/manage-user-profiles.module.ts
@@ -1,4 +1,3 @@
-import { TranslateModule } from '@ngx-translate/core';
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
@@ -6,12 +5,15 @@ import { Routes, RouterModule } from '@angular/router';
 
 import { IonicModule } from '@ionic/angular';
 
-import { ShareUserAndGroupsPage } from './share-user-and-groups.page';
+import { ManageUserProfilesPage } from './manage-user-profiles.page';
+import { TranslateModule } from '@ngx-translate/core';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
+import { PipesModule } from '@app/pipes/pipes.module';
 
 const routes: Routes = [
   {
     path: '',
-    component: ShareUserAndGroupsPage
+    component: ManageUserProfilesPage
   }
 ];
 
@@ -21,10 +23,10 @@ const routes: Routes = [
     FormsModule,
     IonicModule,
     RouterModule.forChild(routes),
-    TranslateModule.forChild()
+    TranslateModule,
+    CommonConsumptionModule,
+    PipesModule
   ],
-  declarations: [ShareUserAndGroupsPage],
-  entryComponents: [ShareUserAndGroupsPage],
-  exports: [ShareUserAndGroupsPage]
+  declarations: [ManageUserProfilesPage]
 })
-export class ShareUserAndGroupsPageModule { }
+export class ManageUserProfilesPageModule {}
diff --git a/src/app/profile/manage-user-profiles/manage-user-profiles.page.html b/src/app/profile/manage-user-profiles/manage-user-profiles.page.html
new file mode 100644
index 000000000..8c4d4d69b
--- /dev/null
+++ b/src/app/profile/manage-user-profiles/manage-user-profiles.page.html
@@ -0,0 +1,40 @@
+<ion-content>
+
+  <section>
+    <div>
+      <p class="mu-title">{{'USE_APP_AS' | translate: {'%s': appName} }}</p>
+    </div>
+
+    <div class="add-user">
+      <ion-button fill="outline" expand="block" (click)="addUser()" class="m-8 ion-text-capitalize">
+        <span class="add-size">+</span> {{'ADD_USER' | translate}}
+      </ion-button>
+    </div>
+
+    <div class="mx-8 manage-user-section">
+      <div class="manage-user-item" [ngClass]="{'mu-selected-user':selectedUserIndex===i, '':selectedUserIndex!==i}" *ngFor="let user of (manageProfileList$ | async); let i = index">
+        <sb-member-card 
+          [title]="user.firstName"
+          [identifier]="user.id"
+          [initial]="user.firstName | initial"
+          [cardImg]="selectedUserIndex === i ? 'assets/imgs/dark_blue_check.svg' : ''"
+          [indexOfMember] = "i"
+          [config]="sbCardConfig"
+          (cardClick)="selectUser(user, i)">
+        </sb-member-card>
+      </div>
+    </div>
+
+  </section>
+
+</ion-content>
+
+<ion-footer>
+  <ion-row>
+    <ion-col>
+      <ion-button class="ion-text-capitalize mb-16" expand="block" [disabled]="selectedUserIndex === -1"
+        (click)="switchUser()">{{'SWITCH_USER' | translate}}
+      </ion-button>
+    </ion-col>
+  </ion-row>
+</ion-footer>
diff --git a/src/app/profile/manage-user-profiles/manage-user-profiles.page.scss b/src/app/profile/manage-user-profiles/manage-user-profiles.page.scss
new file mode 100644
index 000000000..35e7e6a83
--- /dev/null
+++ b/src/app/profile/manage-user-profiles/manage-user-profiles.page.scss
@@ -0,0 +1,72 @@
+@import "src/assets/styles/_variables.scss";
+
+.mu-title{
+  font-size: 16px;
+  font-weight: bold;
+  color: map-get($colors, granite_gray);
+  margin: 16px;
+}
+
+.mu-selected-user{
+  border: 0.5px solid map-get($colors, primary_blue);
+  border-radius: 2px;
+  background-color: map-get($colors, pale_blue_e0);
+  position: relative;
+}
+
+.mu-selected-checkbox{
+  position: absolute;
+  right: 10px;
+  top: 30%;
+}
+
+.mu-dissable-checkbox{
+  display: none;
+}
+ion-button{
+  height: 40px !important;
+}
+
+.add-user{
+  padding: 0 8px;
+  ion-button{
+    --background: #{map-get($colors, light_grayish_green)} !important;
+    color: $green;
+  }
+}
+
+ion-footer{
+  ion-button{
+    --background: #{$blue} !important;
+  }
+}
+
+.add-size{
+  font-size: 24px;
+  padding-right: 8px;
+}
+
+.button-outline{
+  --background: #{map-get($colors, pale_blue)} !important;
+  --border-color: #{map-get($colors, pale_blue)} !important;
+}
+
+.sb-new-btn {
+  background-color: $blue;
+  color: map-get($colors, white);
+  width: 100%;
+  height: 40px;
+  box-shadow: 0 2px 7px 0 rgba(0, 0, 0, 0.25);
+  font-family: "Noto Sans", sans-serif;
+  font-size: 16px;
+}
+
+.sb-new-btn-success {
+  background-color: map-get($colors, light_grayish_green);
+  color: $green;
+  width: 100%;
+  height: 40px;
+  box-shadow: 0 2px 7px 0 rgba(0, 0, 0, 0.25);
+  font-family: "Noto Sans", sans-serif;
+  font-size: 16px;
+}
diff --git a/src/app/profile/manage-user-profiles/manage-user-profiles.page.spec.ts b/src/app/profile/manage-user-profiles/manage-user-profiles.page.spec.ts
new file mode 100644
index 000000000..88e6df6a1
--- /dev/null
+++ b/src/app/profile/manage-user-profiles/manage-user-profiles.page.spec.ts
@@ -0,0 +1,213 @@
+import { ManageUserProfilesPage } from './manage-user-profiles.page';
+import {
+  ProfileService,
+  SharedPreferences
+} from 'sunbird-sdk';
+import { Router } from '@angular/router';
+import { AppHeaderService } from '../../../services/app-header.service';
+import { CommonUtilService } from '../../../services/common-util.service';
+import { TelemetryGeneratorService } from '../../../services/telemetry-generator.service';
+import { TncUpdateHandlerService } from '../../../services/handlers/tnc-update-handler.service';
+import { Platform, PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { Location } from '@angular/common';
+import { of, Subscription } from 'rxjs';
+
+describe('ManageUserProfilesPage', () => {
+
+  let manageUserProfilesPage: ManageUserProfilesPage;
+
+  const mockProfileService: Partial<ProfileService> = {
+    getActiveSessionProfile: jest.fn(() => of({
+      uid: 'sample_uid'
+    })),
+    managedProfileManager: {
+      getManagedServerProfiles: jest.fn(() => of([
+        {
+          id: 'sample_uid_1'
+        },
+        {
+          id: 'sample_uid_2'
+        },
+      ])),
+    }
+  };
+  const mockSharedPreferences: Partial<SharedPreferences> = {};
+  const mockAppHeaderService: Partial<AppHeaderService> = {};
+  const mockRouter: Partial<Router> = {};
+  const mockCommonUtilService: Partial<CommonUtilService> = {};
+  const mockEvents: Partial<Events> = {};
+  const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+  const mockPlatform: Partial<Platform> = {};
+  const mockLocation: Partial<Location> = {};
+  const mockPopOverController: Partial<PopoverController> = {};
+  const mockTncUpdateHandlerService: Partial<TncUpdateHandlerService> = {};
+
+  beforeAll(() => {
+    manageUserProfilesPage = new ManageUserProfilesPage(
+        mockProfileService as ProfileService,
+        mockSharedPreferences as SharedPreferences,
+        mockAppHeaderService as AppHeaderService,
+        mockRouter as Router,
+        mockCommonUtilService as CommonUtilService,
+        mockEvents as Events,
+        mockTelemetryGeneratorService as TelemetryGeneratorService,
+        mockPlatform as Platform,
+        mockLocation as Location,
+        mockPopOverController as PopoverController,
+        mockTncUpdateHandlerService as TncUpdateHandlerService
+    );
+  });
+
+  describe('ngOnInit()', () => {
+    it('should get the app name', (done) => {
+      // arrange
+      mockSharedPreferences.getString = jest.fn(() => of('app-name'));
+      // act
+      manageUserProfilesPage.ngOnInit();
+      // assert
+      setTimeout(() => {
+        expect(mockSharedPreferences.getString).toHaveBeenCalledWith('app_name');
+        done();
+      }, 0);
+    });
+  });
+
+  describe('ionViewWillEnter()', () => {
+    it('should initiate the backbutton events and the telemetry events', () => {
+      // arrange
+      mockAppHeaderService.showHeaderWithBackButton = jest.fn();
+      const data = {name: 'back'};
+      const mockHeaderEventsSubscription = { unsubscribe: jest.fn() } as Partial<Subscription>;
+      mockAppHeaderService.headerEventEmitted$ = {
+        subscribe: jest.fn((fn) =>  {fn(data); return mockHeaderEventsSubscription; })
+      } as any;
+      let subscribeWithPriorityCallback;
+      const mockBackBtnFunc = {unsubscribe: jest.fn()};
+      const subscribeWithPriorityData = jest.fn((val, callback) => {
+        subscribeWithPriorityCallback = callback;
+        return mockBackBtnFunc;
+      });
+      mockPlatform.backButton = {
+        subscribeWithPriority: subscribeWithPriorityData,
+    } as any;
+      mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+      mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+      // act
+      manageUserProfilesPage.ionViewWillEnter();
+      // assert
+      expect(mockAppHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+      expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalled();
+    });
+  });
+
+  describe('ionViewWillLeave()', () => {
+    it('should unsubscribe to the backbutton events', () => {
+      // arrange
+      manageUserProfilesPage['headerObservable'] = null;
+      const mockbackButtonFuncSubscription = { unsubscribe: jest.fn() } as Partial<Subscription>;
+      manageUserProfilesPage['backButtonFunc'] = mockbackButtonFuncSubscription as any;
+      // act
+      manageUserProfilesPage.ionViewWillLeave();
+      // assert
+      expect(manageUserProfilesPage['backButtonFunc'].unsubscribe).toHaveBeenCalled();
+    });
+
+    it('should unsubscribe to the header events', () => {
+      // arrange
+      const mockHeaderEventsSubscription = { unsubscribe: jest.fn() } as Partial<Subscription>;
+      manageUserProfilesPage['headerObservable'] = mockHeaderEventsSubscription as any;
+      manageUserProfilesPage['backButtonFunc'] = null;
+      // act
+      manageUserProfilesPage.ionViewWillLeave();
+      // assert
+      expect(manageUserProfilesPage['headerObservable'].unsubscribe).toHaveBeenCalled();
+    });
+  });
+
+  describe('selectUser()', () => {
+    it('should temporarily save the selected user details', () => {
+      // arrange
+      const userDeatils = {
+        uid: 'userId'
+      };
+      // act
+      manageUserProfilesPage.selectUser(userDeatils, 1);
+      // assert
+      expect(manageUserProfilesPage['selectedUser'].uid).toEqual(userDeatils.uid);
+      expect(manageUserProfilesPage.selectedUserIndex).toEqual(1);
+    });
+  });
+
+  describe('addUser()', () => {
+    it('should navigate to add new users page on click of add user if device is online', () => {
+      // arrange
+      mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+      mockCommonUtilService.networkInfo = {
+        isNetworkAvailable: true
+      };
+      mockRouter.navigate = jest.fn();
+      // act
+      manageUserProfilesPage.addUser();
+      // assert
+      expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+      expect(mockRouter.navigate).toHaveBeenCalled();
+    });
+
+    it('should not navigate to add new users page on click of add user if device is offline', () => {
+      // arrange
+      mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+      mockCommonUtilService.networkInfo = {
+        isNetworkAvailable: false
+      };
+      mockCommonUtilService.showToast = jest.fn();
+      mockRouter.navigate = jest.fn();
+      // act
+      manageUserProfilesPage.addUser();
+      // assert
+      expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+      expect(mockCommonUtilService.showToast).toHaveBeenCalled();
+      expect(mockRouter.navigate).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('switchUser()()', () => {
+    it('should skip switching user, if there is no selected user', () => {
+      // arrange
+      manageUserProfilesPage['selectedUser'] = null;
+      mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+      // act
+      manageUserProfilesPage.switchUser();
+      // assert
+      expect(mockTelemetryGeneratorService.generateInteractTelemetry).not.toHaveBeenCalled();
+    });
+
+    it('should switching user, if there is no selected user', (done) => {
+      // arrange
+      manageUserProfilesPage['selectedUser'] = { id: 'uid' };
+      mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+      mockProfileService.managedProfileManager = {
+        switchSessionToManagedProfile: jest.fn(() => of())
+      };
+      mockEvents.publish = jest.fn(() => []);
+      mockTncUpdateHandlerService.checkForTncUpdate = jest.fn();
+      mockRouter.navigate = jest.fn();
+      mockCommonUtilService.translateMessage = jest.fn();
+      mockPopOverController.create = jest.fn(() => (Promise.resolve({
+        present: jest.fn(() => Promise.resolve({})),
+        onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: true } }))
+    } as any)));
+        // act
+      manageUserProfilesPage.switchUser();
+      // assert
+      setTimeout(() => {
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+        expect(mockEvents.publish).toHaveBeenCalled();
+        expect(mockTncUpdateHandlerService.checkForTncUpdate).toHaveBeenCalled();
+        expect(mockRouter.navigate).toHaveBeenCalled();
+        done();
+      }, 0);
+    });
+  });
+
+});
diff --git a/src/app/profile/manage-user-profiles/manage-user-profiles.page.ts b/src/app/profile/manage-user-profiles/manage-user-profiles.page.ts
new file mode 100644
index 000000000..a5d5ea352
--- /dev/null
+++ b/src/app/profile/manage-user-profiles/manage-user-profiles.page.ts
@@ -0,0 +1,212 @@
+import { Component, OnInit, Inject } from '@angular/core';
+import { AppHeaderService } from '@app/services/app-header.service';
+import { RouterLinks, ProfileConstants } from '@app/app/app.constant';
+import { Router } from '@angular/router';
+import { CommonUtilService } from '@app/services/common-util.service';
+import {
+  ProfileService,
+  CachedItemRequestSourceFrom,
+  SharedPreferences,
+  ServerProfile,
+  CorrelationData
+} from '@project-sunbird/sunbird-sdk';
+import { AppGlobalService } from '@app/services/app-global-service.service';
+import { Platform, PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { Observable, EMPTY, combineLatest, Subscription } from 'rxjs';
+import { catchError, map } from 'rxjs/operators';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import { InteractType, Environment, PageId, ID, CorReleationDataType, ImpressionType } from '@app/services/telemetry-constants';
+import { Location } from '@angular/common';
+import { ToastNavigationComponent } from '@app/app/components/popups/toast-navigation/toast-navigation.component';
+import { TncUpdateHandlerService } from '@app/services/handlers/tnc-update-handler.service';
+
+@Component({
+  selector: 'app-manage-user-profiles',
+  templateUrl: './manage-user-profiles.page.html',
+  styleUrls: ['./manage-user-profiles.page.scss'],
+})
+export class ManageUserProfilesPage implements OnInit {
+
+  private selectedUser: any;
+  private backButtonFunc: Subscription;
+  private headerObservable: any;
+
+  public sbCardConfig = {
+    size: 'medium',
+    isBold: false,
+    isSelectable: false,
+    view: 'horizontal'
+  };
+  public manageProfileList$: Observable<ServerProfile[]>;
+  public selectedUserIndex = -1;
+  public appName = '';
+
+  constructor(
+    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+    @Inject('SHARED_PREFERENCES') private sharedPreferences: SharedPreferences,
+    private appHeaderService: AppHeaderService,
+    private router: Router,
+    private commonUtilService: CommonUtilService,
+    private events: Events,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+    private platform: Platform,
+    private location: Location,
+    private popoverCtrl: PopoverController,
+    private tncUpdateHandlerService: TncUpdateHandlerService
+  ) {
+    this.manageProfileList$ = combineLatest([
+      this.profileService.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS }),
+      this.profileService.managedProfileManager.getManagedServerProfiles({
+        from: CachedItemRequestSourceFrom.SERVER,
+        requiredFields: ProfileConstants.REQUIRED_FIELDS
+      })
+    ]).pipe(
+      map(([activeProfile, profiles]) => {
+        return profiles.filter(p => p.id !== activeProfile.uid);
+      }),
+      catchError(err => {
+        this.commonUtilService.showToast('ERROR_WHILE_FETCHING_USERS');
+        console.error(err);
+        return EMPTY;
+      })
+    );
+  }
+
+  ngOnInit() {
+    this.sharedPreferences.getString('app_name').toPromise().then(value => {
+      this.appName = value;
+    });
+  }
+
+  ionViewWillEnter() {
+    this.appHeaderService.showHeaderWithBackButton();
+    this.handleBackButtonEvents();
+    this.headerObservable = this.appHeaderService.headerEventEmitted$.subscribe(eventName => {
+      this.handleHeaderEvents(eventName);
+    });
+    this.telemetryGeneratorService.generateImpressionTelemetry(
+      ImpressionType.VIEW,
+      '',
+      PageId.MANAGE_USERS,
+      Environment.USER,
+    );
+  }
+
+  ionViewWillLeave() {
+    if (this.headerObservable) {
+      this.headerObservable.unsubscribe();
+    }
+    if (this.backButtonFunc) {
+      this.backButtonFunc.unsubscribe();
+    }
+  }
+
+  private handleBackButtonEvents() {
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(0, async () => {
+      this.telemetryGeneratorService.generateBackClickedTelemetry(
+        PageId.MANAGE_USERS,
+        Environment.USER,
+        false
+      );
+      this.location.back();
+    });
+  }
+
+  selectUser(user, index) {
+    this.selectedUserIndex = index;
+    this.selectedUser = user;
+  }
+
+  switchUser() {
+    if (!this.selectedUser || !this.selectedUser.id) {
+      return;
+    }
+    const cData: Array<CorrelationData> = [
+      { id: this.selectedUser.id || '', type: CorReleationDataType.SWITCHED_USER }
+    ];
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_ADD,
+      '',
+      Environment.USER,
+      PageId.CREATE_MANAGED_USER,
+      undefined,
+      undefined,
+      undefined,
+      cData,
+      ID.BTN_SWITCH
+    );
+    this.profileService.managedProfileManager.switchSessionToManagedProfile({ uid: this.selectedUser.id }).toPromise().then(res => {
+      this.events.publish(AppGlobalService.USER_INFO_UPDATED);
+      this.events.publish('loggedInProfile:update');
+      this.showSwitchSuccessPopup(this.selectedUser.firstName);
+      this.router.navigate([RouterLinks.TABS]);
+      this.tncUpdateHandlerService.checkForTncUpdate();
+    }).catch(err => {
+      this.commonUtilService.showToast('ERROR_WHILE_SWITCHING_USER');
+      console.error(err);
+    });
+  }
+
+  addUser() {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_ADD,
+      '',
+      Environment.USER,
+      PageId.MANAGE_USERS,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      ID.BTN_ADD
+    );
+
+    if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+      this.commonUtilService.showToast('NEED_INTERNET_TO_CHANGE');
+      return;
+    }
+
+    this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.SUB_PROFILE_EDIT}`]);
+  }
+
+  private handleHeaderEvents($event) {
+    switch ($event.name) {
+      case 'back':
+        this.telemetryGeneratorService.generateBackClickedTelemetry(
+          PageId.MANAGE_USERS,
+          Environment.USER,
+          true
+        );
+        break;
+    }
+  }
+
+  private async showSwitchSuccessPopup(name) {
+    const confirm = await this.popoverCtrl.create({
+      component: ToastNavigationComponent,
+      componentProps: {
+        message: this.commonUtilService.translateMessage('SUCCESSFULLY_SWITCHED_USER', { '%app': this.appName, '%user': name }),
+        description: this.commonUtilService.translateMessage('UPDATE_YOUR_PREFERENCE_FROM_PROFILE', { app_name: this.appName }),
+        actionsButtons: [
+          {
+            btntext: this.commonUtilService.translateMessage('GO_TO_PROFILE'),
+            btnClass: 'btn-right'
+          }
+        ]
+      },
+      cssClass: 'sb-popover'
+    });
+    await confirm.present();
+    setTimeout(() => {
+      if (confirm) {
+        confirm.dismiss();
+      }
+    }, 3000);
+    const { data } = await confirm.onDidDismiss();
+    console.log(data);
+    if (data) {
+      this.router.navigate([`/${RouterLinks.PROFILE_TAB}`]);
+    }
+  }
+
+}
diff --git a/src/app/profile/personal-details-edit/personal-details-edit.page.scss b/src/app/profile/personal-details-edit/personal-details-edit.page.scss
index c162f9f38..ae6481e5c 100644
--- a/src/app/profile/personal-details-edit/personal-details-edit.page.scss
+++ b/src/app/profile/personal-details-edit/personal-details-edit.page.scss
@@ -3,7 +3,7 @@
 :host {
     .label-font {
        font-weight: 600 !important;
-        color: #979797 !important;
+        color: map-get($colors, dark_gray) !important;
         font-size: 14px !important;
     }
     .select-text {
@@ -44,9 +44,14 @@
     }
     
     .popover-alert .close-button{
-        background-color: #ffffff;
+        background-color: map-get($colors, white);
         box-shadow: unset;
-        color: black;
+        color: map-get($colors, black);
+        float: right;
+        ion-icon {
+          padding: 0;
+          margin-top: 10px;
+        }
     }
   
     .popover-alert .alert-header{
@@ -62,14 +67,6 @@
       border-radius: 5px;
     }
   
-    .popover-alert .close-button{
-      float: right;
-         ion-icon {
-        padding: 0;
-        margin-top: 10px;
-      }
-    } 
-  
     .popover-alert .alert-header-content{
       padding: 0;
       margin-left: -7px;
diff --git a/src/app/profile/personal-details-edit/personal-details-edit.page.ts b/src/app/profile/personal-details-edit/personal-details-edit.page.ts
index 741afe6c9..ab408525f 100644
--- a/src/app/profile/personal-details-edit/personal-details-edit.page.ts
+++ b/src/app/profile/personal-details-edit/personal-details-edit.page.ts
@@ -1,7 +1,7 @@
 import { Router } from '@angular/router';
 import { AppHeaderService, CommonUtilService } from '../../../services';
 import { Component, Inject, OnInit, ChangeDetectorRef } from '@angular/core';
-import { Events } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Location as loc } from '../../app.constant';
 import { LocationSearchCriteria, ProfileService } from 'sunbird-sdk';
diff --git a/src/app/profile/profile-routing.module.ts b/src/app/profile/profile-routing.module.ts
index 65fe08d47..828feeb16 100644
--- a/src/app/profile/profile-routing.module.ts
+++ b/src/app/profile/profile-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
+import { RouterModule, Routes } from '@angular/router';
 import { ProfilePage } from './profile.page';
 import { RouterLinks } from '../app.constant';
 
@@ -8,7 +8,21 @@ const routes: Routes = [
     { path: RouterLinks.GUEST_PROFILE, loadChildren: './guest-profile/guest-profile.module#GuestProfilePageModule' },
     { path: RouterLinks.GUEST_EDIT, loadChildren: './guest-edit/guest-edit.module#GuestEditPageModule' },
     { path: RouterLinks.PERSONAL_DETAILS_EDIT, loadChildren: './personal-details-edit/personal-details-edit.module#PersonalDetailsEditPageModule' },
-    { path: RouterLinks.CATEGORIES_EDIT, loadChildren: './categories-edit/categories-edit.module#CategoriesEditPageModule' }
+    { path: RouterLinks.CATEGORIES_EDIT, loadChildren: './categories-edit/categories-edit.module#CategoriesEditPageModule' },
+    { path: RouterLinks.SUB_PROFILE_EDIT, loadChildren: './sub-profile-edit/sub-profile-edit.module#SubProfileEditPageModule' },
+    { path: RouterLinks.MANAGE_USER_PROFILES, loadChildren: './manage-user-profiles/manage-user-profiles.module#ManageUserProfilesPageModule' },
+    {
+        path: RouterLinks.SELF_DECLARED_TEACHER_EDIT + '/:mode' ,
+        loadChildren: './self-declared-teacher-edit/self-declared-teacher-edit.module#SelfDeclaredTeacherEditPageModule'
+    },
+    {
+        path: RouterLinks.FRAMEWORK_SELECTION,
+        loadChildren: './framework-selection/framework-selection.module#FrameworkSelectionPageModule'
+    },
+    {
+        path: RouterLinks.CERTIFICATE_VIEW,
+        loadChildren: './certificate-view/certificate-view.module#CertificateViewPageModule'
+    }
 ];
 
 @NgModule({
diff --git a/src/app/profile/profile.module.ts b/src/app/profile/profile.module.ts
index d18c9ff37..82f682f9d 100644
--- a/src/app/profile/profile.module.ts
+++ b/src/app/profile/profile.module.ts
@@ -9,6 +9,8 @@ import { ProfileRoutingModule } from '@app/app/profile/profile-routing.module';
 import { TranslateModule } from '@ngx-translate/core';
 import { ComponentsModule } from '@app/app/components/components.module';
 import { DirectivesModule } from '@app/directives/directives.module';
+import { PipesModule } from '@app/pipes/pipes.module';
+import { CertificateDirectivesModule } from 'sb-svg2pdf';
 
 const routes: Routes = [
   {
@@ -25,7 +27,9 @@ const routes: Routes = [
     ProfileRoutingModule,
     TranslateModule,
     ComponentsModule,
-    DirectivesModule
+    DirectivesModule,
+    PipesModule,
+    CertificateDirectivesModule
   ],
   declarations: [ProfilePage],
   entryComponents: []
diff --git a/src/app/profile/profile.page.html b/src/app/profile/profile.page.html
index 87e963acb..05f831c41 100644
--- a/src/app/profile/profile.page.html
+++ b/src/app/profile/profile.page.html
@@ -4,7 +4,7 @@
     <div class="spinner-div" *ngIf="refresh">
         <ion-spinner icon="spiral" class="refreshspinner"></ion-spinner>
     </div>
-    <ion-refresher slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-refresher #refresher slot="fixed" (ionRefresh)="doRefresh($event)">
         <ion-refresher-content refreshingSpinner="circles"></ion-refresher-content>
     </ion-refresher>
     <div class="MT15 ion-text-center ion-padding-horizontal" *ngIf="profile?.firstName">
@@ -16,13 +16,29 @@
     <div style="margin-top: 16px" class="ion-text-center ion-padding-horizontal">
         <p class="profile-head">
             <span class="profile-name">{{ profile?.firstName | titlecase }}{{ profile?.lastName | titlecase }}</span>
-            <span *ngIf="!isCustodianOrgId && profile?.firstName" class="isymbol profile-symbol" item-right text-left
+            <!-- <span *ngIf="!isCustodianOrgId && profile?.firstName" class="isymbol profile-symbol ion-text-left" item-right
                 (click)="toggleTooltips($event, 'name')">
                 <ion-icon name="information-circle" class="information-icon-style"></ion-icon>
                 <span class="asPerStateRecord" *ngIf="informationProfileName">{{'STATE_RECORDS' | translate}}</span>
+            </span> -->
+        </p>
+        <p class="MT0 MB15">
+            <span class="app-name"> {{appName}} </span>
+            <span class="txt-uppercase"> {{'ID' | translate }}: </span>
+            <span>{{profile?.userName}}</span>
+            <span class="profile-share-icon" (click)="shareUsername()">
+                <ion-icon name="share-social" class="share-icon"></ion-icon>
             </span>
         </p>
-        <p class="MT0 MB30"><span>{{'USER_ID' | translate}}:</span><span>{{profile?.userName}}</span></p>
+        <div class="school-recent" *ngIf="organisationName">
+            <p class="bolder MB5" style="position: relative; font-size: 1.2rem;">{{organisationName}}
+                <!-- <span *ngIf="!isCustodianOrgId && organisationName" class="isymbol" item-right text-left
+                    (click)="toggleTooltips($event, 'org')">
+                    <ion-icon name="information-circle" class="information-icon-style"></ion-icon>
+                    <span class="asPerStateRecord" *ngIf="informationOrgName">{{'STATE_RECORDS' | translate}}</span>
+                </span> -->
+            </p>
+        </div>
     </div>
     <div class="roles-container ion-text-center ion-padding-horizontal">
         <div class="MB5 ion-text-center" *ngFor="let role of roles | slice : startLimit:rolesLimit;">
@@ -34,63 +50,104 @@
             <ion-button fill="clear" *ngIf="rolesLimit < roles?.length" (click)="showMoreItems()"
                 class="txt-capitalize">
                 + {{roles?.length - 2}} {{'MORE' | translate}}
-                <ion-icon class="ML10" name="ios-arrow-down"></ion-icon>
+                <ion-icon class="ML10" name="arrow-down"></ion-icon>
             </ion-button>
             <ion-button fill="clear" *ngIf="rolesLimit > DEFAULT_PAGINATION_LIMIT" (click)="showLessItems()"
                 class="txt-capitalize">
                 {{'SHOW_LESS' | translate }}
-                <ion-icon class="ML10" name="ios-arrow-up"></ion-icon>
+                <ion-icon class="ML10" name="arrow-up"></ion-icon>
             </ion-button>
         </div>
     </div>
-    <div class="school-recent" *ngIf="(organisationName !== profile.rootOrgName) && !(isDefaultChannelProfile$ | async)">
-        <p class="bolder MB5" style="position: relative;">{{organisationName}}
-            <span *ngIf="!isCustodianOrgId && organisationName" class="isymbol" item-right text-left
-                (click)="toggleTooltips($event, 'org')">
-                <ion-icon name="information-circle" class="information-icon-style"></ion-icon>
-                <span class="asPerStateRecord" *ngIf="informationOrgName">{{'STATE_RECORDS' | translate}}</span>
-            </span>
-        </p>
-        <div *ngIf="orgDetails && orgDetails?.block?.name">Block: {{orgDetails?.block?.name}}</div>
-        <div *ngIf="orgDetails">
-            <div><span *ngIf="orgDetails && orgDetails?.district?.name">{{'DISTRICT' | translate}}:
-                {{orgDetails?.district?.name}}</span></div>
-            <div><span *ngIf="orgDetails?.state?.name">{{'STATE' | translate}}: {{orgDetails?.state?.name}}</span></div>
-    </div>
-    </div>
-    <div class="school-recent" *ngIf="(organisationName == profile.rootOrgName) && !(isDefaultChannelProfile$ | async)">
-        <div *ngIf="orgDetails">
-            <span *ngIf="orgDetails && orgDetails?.state?.name" class="bolder">{{'STATE' | translate}}: </span>
-                <span>{{orgDetails?.state?.name}}</span>
+   <div *ngIf="profile" class="school-details text-center">
+    <div *ngIf="profile?.persona || profile?.framework" class="preference-info">{{ 'CONTENT_PREFERENCE' | translate }}</div>
+    <div class="location-mapping-block">
+    <div *ngIf="profile?.persona?.name" class="text-center">
+        <div>
+            <span class="bolder">{{'FRMELEMNTS_LBL_PERSONA' | translate}}: </span>
+            <span>{{profile?.persona?.name}}</span>
         </div>
     </div>
-    <div class="location text-center" *ngIf="isCustodianOrgId">
+    <div *ngIf="profile?.subPersona" class="text-center">
         <div>
+            <span class="bolder">{{'FRMELEMNTS_LBL_SUBPERSONA' | translate}}: </span>
+            <span>{{profile?.subPersona}}</span>
+        </div>
+    </div>
+    <div *ngIf="userLocation" class="location text-center">
+        <div *ngIf="userLocation?.school && userLocation?.school?.name && userLocation?.school?.name?.length">
+            <span class="bolder">{{'FRMELEMNTS_LBL_SCHOOL' | translate}}: </span>
+            <span>{{userLocation.school.name}}</span>
+            <span *ngIf="!(userLocation?.school && userLocation?.school?.name && userLocation?.school?.name?.length)"
+                class="lighter">{{'FRMELEMNTS_LBL_ADD_SCHOOL' | translate}}</span>
+        </div>
+        <div *ngIf="userLocation?.cluster && userLocation?.cluster?.name && userLocation?.cluster?.name?.length">
+            <span class="bolder">{{'FRMELEMNTS_LBL_CLUSTER' | translate}}: </span>
+            <span>{{userLocation.cluster.name}}</span>
+            <span *ngIf="!(userLocation?.cluster && userLocation?.cluster?.name && userLocation?.cluster?.name?.length)"
+                class="lighter">{{'FRMELEMNTS_LBL_ADD_CLUSTER' | translate}}</span>
+        </div>
+        <div *ngIf="userLocation?.block && userLocation?.block?.name && userLocation?.block?.name?.length">
+            <span class="bolder">{{'FRMELEMNTS_LBL_BLOCK' | translate}}: </span>
+            <span>{{userLocation.block.name}}</span>
+            <span *ngIf="!(userLocation?.block && userLocation?.block?.name && userLocation?.block?.name?.length)"
+                class="lighter">{{'FRMELEMNTS_LBL_ADD_BLOCK' | translate}}</span>
+        </div>
+        <div *ngIf="userLocation?.district && userLocation?.district?.name && userLocation?.district?.name?.length">
             <span class="bolder">{{'DISTRICT' | translate}}: </span>
-            <span
-                *ngIf="userLocation?.district && userLocation?.district?.name && userLocation?.district?.name?.length">{{userLocation.district.name}}</span>
+            <span>{{userLocation.district.name}}</span>
             <span
                 *ngIf="!(userLocation?.district && userLocation?.district?.name && userLocation?.district?.name?.length)"
                 class="lighter">{{'ADD_DISTRICT' | translate}}</span>
         </div>
-        <div>
+        <div *ngIf="userLocation?.state && userLocation?.state?.name && userLocation?.state?.name?.length">
             <span class="bolder">{{'STATE' | translate}}: </span>
-            <span
-                *ngIf="userLocation?.state && userLocation?.state?.name && userLocation?.state?.name?.length">{{userLocation.state.name}}</span>
+            <span>{{userLocation.state.name}}</span>
             <span *ngIf="!(userLocation?.state && userLocation?.state?.name && userLocation?.state?.name?.length)"
                 class="lighter">{{'ADD_STATE' | translate}}</span>
         </div>
-        <div class="container MT10 MB10">
-            <ion-button shape="round" (click)="navigateToEditPersonalDetails()" class="short-btn custom-round">
+        <div class="container MT10 MB10 edit-options">
+            <ion-button shape="round" (click)="onEditProfileClicked()"
+                class="custom-round ion-text-capitalize">
                 {{'EDIT' | translate }}
             </ion-button>
         </div>
     </div>
-    <div class="contacts" *ngIf="profile?.phone || profile?.email ">
+    </div>
+    <div class="framework-block" *ngIf="profile?.framework">
+        <div class="container" *ngIf="profile?.framework?.board">
+            <div>{{'BOARD' | translate }}: </div>
+            <div class="bolder">{{profile?.framework?.board.join(', ') | aliased}} &lrm;</div>
+        </div>
+        <div class="container" *ngIf="profile?.framework?.medium">
+            <div>{{'MEDIUM' | translate }}: </div>
+            <div class="bolder">{{profile?.framework?.medium.join(', ')}}</div>
+        </div>
+        <div class="container" *ngIf="profile?.framework?.gradeLevel">
+            <div>{{'CLASSES' | translate }}: </div>
+            <div class="bolder">{{profile?.framework?.gradeLevel.join(', ')}}</div>
+        </div>
+        <div class="container" *ngIf="profile?.framework?.subject">
+            <div>{{'SUBJECTS' | translate }}: </div>
+            <div class="bolder">{{profile?.framework?.subject.join(', ')}}</div>
+        </div>
+        <div class="container">
+            <ion-button shape="round" (click)="navigateToCategoriesEditPage()" class="custom-round">
+                {{'EDIT' | translate }}
+            </ion-button>
+        </div>
+    </div>
+   </div>
+    <div class="self-declare-btn text-center" *ngIf="!profile?.declarations?.length && isCustodianOrgId">
+        <ion-button shape="round" (click)="openSelfDeclareTeacherForm('add')">
+            {{'SUBMIT_MY_DETAILS' | translate}}
+        </ion-button>
+    </div>
+    <div class="contacts" *ngIf="!profile?.managedBy && (profile?.phone || profile?.email)">
         <div *ngIf="profile?.phone">
             <div class="phone" (click)="editMobileNumber();">
                 <span class="icon MR10 align-middle">
-                    <ion-icon name="md-call"></ion-icon>
+                    <ion-icon name="call"></ion-icon>
                 </span>
                 <span class="value align-middle">+91 {{ profile?.phone }}</span>
             </div>
@@ -98,7 +155,7 @@
         <div *ngIf="!profile?.phone">
             <div class="phone light" (click)="editMobileNumber();">
                 <span class="icon MR10 align-middle">
-                    <ion-icon name="md-call"></ion-icon>
+                    <ion-icon name="call"></ion-icon>
                 </span>
                 <span class="value align-middle">{{'ADD_PHONE' | translate}}</span>
             </div>
@@ -106,7 +163,7 @@
         <div *ngIf="profile?.email">
             <div class="email " (click)="editEmail();">
                 <span class="icon MR10 align-middle">
-                    <ion-icon name="md-mail"></ion-icon>
+                    <ion-icon name="mail"></ion-icon>
                 </span>
                 <span class="value align-middle">{{ profile?.email }}</span>
             </div>
@@ -114,7 +171,7 @@
         <div *ngIf="!profile?.email">
             <div class="email light" (click)="editEmail();">
                 <span class="icon MR10 align-middle">
-                    <ion-icon name="md-mail"></ion-icon>
+                    <ion-icon name="mail"></ion-icon>
                 </span>
                 <span class="value align-middle">{{'ADD_EMAIL' | translate}}</span>
             </div>
@@ -124,8 +181,8 @@
                 <span class="icon MR10 align-middle">
                     <ion-icon src="assets/imgs/recovery_icon.svg"></ion-icon>
                 </span>
-                <span class="value align-middle"
-                    *ngIf="profile?.recoveryEmail?.length > 0">{{ profile?.recoveryEmail }}</span>
+                <span class="value align-middle" *ngIf="profile?.recoveryEmail?.length > 0">{{ profile?.recoveryEmail
+                    }}</span>
                 <span class="value align-middle" *ngIf="profile?.recoveryPhone?.length > 0">
                     +91 {{ profile?.recoveryPhone }}
                 </span>
@@ -141,29 +198,24 @@
             </div>
         </div>
     </div>
-    <div class="school-details" *ngIf="profile?.framework">
-        <div class="container" *ngIf="profile?.framework?.board">
-            <div>{{'BOARD' | translate }}: </div>
-            <div class="bolder">{{profile?.framework?.board.join(', ')}} &lrm;</div>
-        </div>
-        <div class="container" *ngIf="profile?.framework?.medium">
-            <div>{{'MEDIUM' | translate }}: </div>
-            <div class="bolder">{{profile?.framework?.medium.join(', ')}}</div>
+
+    <div class="self-declare-teacher-details" *ngIf="isCustodianOrgId &&  profile?.declarations?.length">
+        <p class="declare-info">{{'MY_DETAILS' | translate | titlecase }}</p>
+
+        <div class="container" *ngIf="personaTenantDeclaration">
+            <div>{{personaTenantDeclaration}}</div>
         </div>
-        <div class="container" *ngIf="profile?.framework?.gradeLevel">
-            <div>{{'CLASSES' | translate }}: </div>
-            <div class="bolder">{{profile?.framework?.gradeLevel.join(', ')}}</div>
-        </div>
-        <div class="container" *ngIf="profile?.framework?.subject">
-            <div>{{'SUBJECTS' | translate }}: </div>
-            <div class="bolder">{{profile?.framework?.subject.join(', ')}}</div>
-        </div>
-        <div class="container">
-            <ion-button shape="round" (click)="navigateToCategoriesEditPage()" class="short-btn custom-round">
-                {{'EDIT' | translate }}
-            </ion-button>
+
+        <div class="container" *ngFor="let details of selfDeclaredDetails">
+            <div>{{ details.name | translate }}:</div>
+            <div class="bolder">{{ details.value }}</div>
         </div>
+
+        <ion-button shape="round" (click)="openSelfDeclareTeacherForm('edit')" class="custom-round">
+            {{'UPDATE' | translate }}
+        </ion-button>
     </div>
+
     <div class="badges ion-text-center ion-padding-horizontal" *ngIf="profile?.badgeAssertions?.length > 0">
         <p class="bolder f16">{{'MY_BADGES' | translate }} ({{profile?.badgeAssertions?.length}})&lrm;</p>
         <ion-avatar item-center="" *ngFor="let batch of profile.badgeAssertions | slice : startLimit:badgesLimit;">
@@ -173,51 +225,99 @@
             <ion-button shape="round" *ngIf="badgesLimit < profile?.badgeAssertions?.length" (click)="showMoreBadges()"
                 class="txt-capitalize custom-round">
                 + {{profile?.badgeAssertions?.length - 2}} {{'MORE' | translate}}
-                <ion-icon class="ML10" name="ios-arrow-down"></ion-icon>
+                <ion-icon class="ML10" name="arrow-down"></ion-icon>
             </ion-button>
             <ion-button shape="round" *ngIf="badgesLimit > DEFAULT_PAGINATION_LIMIT" (click)="showLessBadges()"
                 class="txt-capitalize custom-round">
                 {{'SHOW_LESS' | translate }}
-                <ion-icon class="ML10" name="ios-arrow-up"></ion-icon>
+                <ion-icon class="ML10" name="arrow-up"></ion-icon>
             </ion-button>
         </div>
     </div>
     <div class="bottom-block">
-        <div class="trainings" *ngIf="trainingsCompleted?.length > 0">
+        <div class="trainings" *ngIf="mappedTrainingCertificates?.length > 0">
             <div class="bolder heading f16">
-                {{'TRAININGS_ATTENDED' | translate}} ({{mappedTrainingCertificates?.length}})&lrm;
+                <span>{{'FRMELEMNTS_LBL_MY_LEARNINGS' | translate}} ({{mappedTrainingCertificates?.length}})&lrm;</span>
+                <ion-icon name="refresh-circle" class="refresh-icon"
+                    (click)="getEnrolledCourses(true, true)"></ion-icon>
             </div>
             <div class="content">
                 <div class="flex-nowrap"
-                    *ngFor="let certificate of (mappedTrainingCertificates | slice : startLimit:trainingsLimit);">
+                    *ngFor="let training of (mappedTrainingCertificates | slice : startLimit:myLearningLimit) |sortBy: 'status' : 'asc';">
                     <div class="training-1">
-                        <div class="fw">
-                            {{certificate.courseName}}
+                        <div class="fw sb__ellipsis sb__ellipsis--two" (click)="openEnrolledCourse(training)">
+                            {{training.courseName}}
                         </div>
-                        <div class="lighter">
-                            {{certificate.dateTime | date:'MMMM yyyy'}}
+                        <div class="batch-detail">
+                            {{training?.batch?.name}}
+                        </div>
+                        <div>
+                            <span [ngClass]="[training.style]"> {{ training.label | translate }}</span>
+                            <span class="lighter"> {{training.dateTime | date:'dd/MM/yyyy'}} </span>
                         </div>
                     </div>
-                    <div class="training-2" *ngIf="certificate?.certificate">
-                        <button class="sb-btn-tile"
-                            (click)="downloadTrainingCertificate(certificate, certificate?.certificate)">
-                            <img src="assets/imgs/ic_download_selected.png" class="cert-download"
-                                alt="download certificate">
-                            <span class="sb-btn-footer-text m-t-4">{{ 'DOWNLOAD' | translate }}</span>
+                    <div class="training-2" *ngIf="training?.certificate || training?.issuedCertificate">
+                        <button class="sb-btn-tile ion-activatable ripple-parent"
+                            (click)="downloadTrainingCertificate(training)">
+                            <ion-icon class="view-icon" name="eye"></ion-icon>
+                            <span class="sb-btn-footer-text m-t-4">{{ 'CERTIFICATE' | translate }}</span>
+                            <ion-ripple-effect type="unbounded"></ion-ripple-effect>
                         </button>
                     </div>
                 </div>
                 <div class="ion-text-center"
-                    *ngIf="mapTrainingsToCertificates(trainingsCompleted).length >= trainingsLimit">
+                    *ngIf="mapTrainingsToCertificates(mappedTrainingCertificates).length > myLearningLimit">
+                    <ion-button shape="round" class="txt-capitalize custom-round"
+                        *ngIf="myLearningLimit < mappedTrainingCertificates?.length"
+                        (click)="showMoreTrainings('myLearning')">
+                        + {{mappedTrainingCertificates?.length - myLearningLimit}} {{'MORE' | translate}}
+                        <ion-icon class="ML10" name="arrow-down"></ion-icon>
+                    </ion-button>
+                    <ion-button shape="round" class="txt-capitalize custom-round"
+                        *ngIf="myLearningLimit >= mappedTrainingCertificates?.length"
+                        (click)="showLessTrainings('myLearning')">
+                        {{'SHOW_LESS' | translate }}
+                        <ion-icon class="ML10" name="arrow-up"></ion-icon>
+                    </ion-button>
+                </div>
+            </div>
+        </div>
+        <div class="trainings" *ngIf="learnerPassbook?.length > 0">
+            <div class="bolder heading f16">
+                <span>{{'FRMELEMNTS_LBL_LEARNER_PASSBOOK' | translate}} ({{learnerPassbookCount}})&lrm;</span>
+            </div>
+            <div class="content">
+                <div class="flex-nowrap"
+                    *ngFor="let certificate of (learnerPassbook | slice : startLimit:learnerPassbookLimit) |sortBy: 'status' : 'asc';">
+                    <div class="training-1">
+                        <div class="fw sb__ellipsis sb__ellipsis--two" (click)="openEnrolledCourse(certificate)">
+                            {{certificate.courseName}}
+                        </div>
+                        <div>
+                            <span class="lighter">{{certificate.issuedOn | date:'dd/MM/yyyy'}} </span>
+                        </div>
+                    </div>
+                    <div class="training-2" *ngIf="certificate?.certificate || certificate?.issuedCertificate">
+                        <button class="sb-btn-tile ion-activatable ripple-parent"
+                            (click)="downloadTrainingCertificate(certificate)">
+                            <ion-icon class="view-icon" name="eye"></ion-icon>
+                            <span class="sb-btn-footer-text m-t-4">{{ 'CERTIFICATE' | translate }}</span>
+                            <ion-ripple-effect type="unbounded"></ion-ripple-effect>
+                        </button>
+                    </div>
+                </div>
+                <div class="ion-text-center" *ngIf="learnerPassbook.length >= learnerPassbookLimit">
                     <ion-button shape="round" class="txt-capitalize custom-round"
-                        *ngIf="trainingsLimit < mappedTrainingCertificates?.length" (click)="showMoreTrainings()">
-                        + {{mappedTrainingCertificates?.length - 2}} {{'MORE' | translate}}
+                        *ngIf="learnerPassbookLimit < learnerPassbook?.length"
+                        (click)="showMoreTrainings('learnerPassbook')">
+                        + {{learnerPassbookCount - learnerPassbookLimit}} {{'MORE' | translate}}
                         <ion-icon class="ML10" name="ios-arrow-down"></ion-icon>
                     </ion-button>
                     <ion-button shape="round" class="txt-capitalize custom-round"
-                        *ngIf="trainingsLimit > DEFAULT_PAGINATION_LIMIT" (click)="showLessTrainings()">
+                        *ngIf="learnerPassbookLimit >= learnerPassbook?.length"
+                        (click)="showLessTrainings('learnerPassbook')">
                         {{'SHOW_LESS' | translate }}
-                        <ion-icon class="ML10" name="ios-arrow-up"></ion-icon>
+                        <ion-icon class="ML10" name="arrow-up"></ion-icon>
                     </ion-button>
                 </div>
             </div>
@@ -238,8 +338,7 @@
                                         <img class="app-icon" alt="app"
                                             [src]="commonUtilService.convertFileSrc(courseItem?.appIcon)" />
                                     </ion-col>
-                                    <ion-col size="9"
-                                        style="margin-bottom: 5px; padding-left: 15px; padding: 0 0 0 15px;">
+                                    <ion-col size="9" style="margin-bottom: 5px; padding: 0 0 0 15px;">
                                         <div style="margin-bottom: 5px;" *ngIf="courseItem.resourceType">
                                             <ion-button fill="outline" class="badge">
                                                 {{courseItem?.resourceType}}
diff --git a/src/app/profile/profile.page.scss b/src/app/profile/profile.page.scss
index bfb04b5f9..3e317f9a5 100644
--- a/src/app/profile/profile.page.scss
+++ b/src/app/profile/profile.page.scss
@@ -2,9 +2,10 @@
 @import "src/assets/styles/base/_variables.scss";
 @import "src/assets/styles/_custom-mixins";
 @import "src/assets/styles/fonts";
+@import "src/assets/styles/_variables.scss";
 :host {
   .refreshspinner {
-    stroke: #024f9d !important;
+    stroke: $blue !important;
     width: 30px;
     left: 0;
     top: 0;
@@ -13,12 +14,12 @@
   }
   .spinner-div {
     padding: 40px;
-    background-color: #eceff0;
+    background-color: map-get($colors, light_gray);
     text-align: center;
     border: none !important;
   }
   .profile-last-login-text {
-    color: #bdbdbd;
+    color: map-get($colors, light_gray_bd);
     text-align: center;
     @include margin(0);
     font-size: 1.2rem;
@@ -40,6 +41,14 @@
       top: -6px;
      }
   }
+  .profile-share-icon{
+    .share-icon{
+      color: $blue;
+      position: relative;
+      top: 6px;
+      margin-left: 8px;
+    }
+  }
   
 
   ion-row {
@@ -66,13 +75,13 @@
   ion-card {
     border-radius: 4px;
     box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.16);
-    background-color: #ffffff;
-    border: solid 0.5px #cccccc;
+    background-color: map-get($colors, white);
+    border: solid 0.5px map-get($colors, medium_gray);
     width: 80vw;
     display: inline-block;
 
     .badge {
-      color: #006de5;
+      color: map-get($colors, primary);
       font-size: 11px;
       height: 20px;
       box-shadow: none;
@@ -84,9 +93,9 @@
     .top {
       min-height: 85px;
       .img-container {
-        border: 1px solid #c6dbd8;
+        border: 1px solid map-get($colors, pale_cyan);
         @include padding(0 !important);
-        background: #e9e9e9;
+        background: map-get($colors, white_e9);
         min-height: 85px;
         max-height: 85px;
         border-radius: 4px;
@@ -97,11 +106,10 @@
           transform: translateY(-56%);
           position: relative;
           top: 50%;
-          transform: perspective(1px) translateY(-50%);
         }
       }
       .info {
-        color: #616161;
+        color: map-get($colors, dark_gray_61);
       }
     }
     h6.name {
@@ -109,12 +117,8 @@
       white-space: normal;
       min-height: 32px;
       font-size: 14px !important;
-      color: #333333;
-      font-size: 14px !important;
-      color: #333333;
+      color: map-get($colors, primary_black);
       width: 100%;
-      white-space: normal;
-      min-height: 32px;
     }
 
     h6.second-line-ellipsis {
@@ -133,24 +137,24 @@
       font-stretch: normal;
       line-height: normal;
       letter-spacing: normal;
-      color: #666666;
+      color: map-get($colors, granite_gray);
       min-height: 20px;
     }
   }
 
   .roles-container {
-    color: #007aff;
+    color: map-get($colors, primary_blue);
     @include margin(5px, 0);
   }
   .roles {
-    border: 0.5px solid #007aff;
+    border: 0.5px solid map-get($colors, primary_blue);
     @include padding(4px, 15px);
     border-radius: 4px;
     display: inline-block;
   }
   .school-recent {
     margin: 0 auto;
-    @include padding(0, 16px, 16px, 16px);
+    @include padding(8px, 16px, 8px, 16px);
     text-align: center;
   }
 
@@ -162,6 +166,7 @@
     text-transform: initial;
   }
 .sb-btn-tile {
+    position: relative;
     flex-direction: column;
     background-color: $white;
     width:72px;
@@ -169,8 +174,12 @@
     display: flex;
     align-items: center;
     justify-content: center;
+    .view-icon{
+      color: $blue;
+    }
     .sb-btn-footer-text {
       font-weight: 400;
+      color: $blue;
     }
   }
   button.sb-btn-tile:focus {
@@ -185,7 +194,7 @@
 
   .contacts {
     padding: 15px;
-    background-color: #196dab;
+    background-color: map-get($colors, bright_blue_19);
     text-align: center;
 
     .phone {
@@ -193,11 +202,11 @@
       border-radius: 25px;
       @include padding($base-block-space, $base-block-space * 2);
       @include margin(null, null, 10px, null);
-      background-color: #fff;
-      color: #007aff;
+      background-color: map-get($colors, white);
+      color: map-get($colors, primary_blue);
 
       &.light {
-        color: #9b9b9b;
+        color: $signup-btn-bg-not-active-color;
       }
     }
 
@@ -205,22 +214,22 @@
       display: inline-block;
       border-radius: 25px;
       @include padding($base-block-space, $base-block-space * 2);
-      background-color: #fff;
-      color: #007aff;
-      border-bottom: 0.3px solid #196dab;
-      border-top: 0.3px solid #196dab;
+      background-color: map-get($colors, white);
+      color: map-get($colors, primary_blue);
+      border-bottom: 0.3px solid map-get($colors, bright_blue_19);
+      border-top: 0.3px solid map-get($colors, bright_blue_19);
       &.light {
-        color: #9b9b9b;
+        color: map-get($colors, gray_9b);
       }
     }
   }
 
   .school-details {
     padding: 15px;
-    background-color: #e0efff;
+    background-color: map-get($colors, pale_blue_e0);
     text-align: center;
-    border-bottom: 0.3px solid #196dab;
-    border-top: 0.3px solid #196dab;
+    border-bottom: 0.3px solid map-get($colors, bright_blue_19);
+    border-top: 0.3px solid map-get($colors, bright_blue_19);
     .container {
       text-align: center;
       @include margin(null, null, 10px, null);
@@ -230,19 +239,22 @@
   .trainings {
     .heading {
       @include padding(15px);
-      background-color: #fff;
+      background-color: map-get($colors, white);
       @include margin(null, null, 2px, null);
+      border-bottom: 0.5px solid map-get($colors, dark_gray);
     }
     .content {
-      @include padding(15px);
-      background-color: #fff;
+      @include margin(8px);
+      background-color: map-get($colors, white);
+      border: 0.5px solid map-get($colors, dark_gray);
+      border-radius: 4px;
     }
   }
 
   .contributions {
     min-height: 230px;
     @include margin(0, 0, 16px, 0);
-    background: #fff;
+    background: map-get($colors, white);
   }
 
   .short-btn {
@@ -251,10 +263,11 @@
 
   .custom-round {
     border-radius: 64px !important;
+    --background: #024F9D !important;
   }
 
   .bottom-block {
-    background: #fafafa;
+    background: map-get($colors, white_fa);
   }
 
   .align-middle {
@@ -277,12 +290,21 @@
 
   .training-2 {
     width: 20%;
+    .sb-btn-tile {
+      margin: 0.5rem 0 !important;
+    }
+  }
+
+  .batch-detail {
+    color: var(--app-primary);
   }
 
   .flex-nowrap {
     display: flex;
     justify-content: space-between;
     flex-wrap: nowrap;
+    border-bottom: 0.5px solid map-get($colors, dark_gray);
+    @include padding(null, 16px, null, 16px);
   }
 
   .margin-pull-up {
@@ -298,4 +320,117 @@
       height:25px;
       margin-bottom: 4px;
   }
-}
+  
+  .add-size{
+    font-size: 24px;
+    padding-right: 8px;
+  }
+
+  .enrolled-status-text {
+    font-family: "Noto Sans", sans-serif;
+    font-size: 12px;
+    font-weight: bold;
+  }
+
+  .ongoing-status-text{
+    @extend .enrolled-status-text;
+    color: $blue;
+  }
+
+  .completed-status-text{
+    @extend .enrolled-status-text;
+    color: $green;
+  }
+
+  .self-declare-btn{
+    margin: 8px 0 16px;
+    ion-button{
+      text-transform: none;
+      --background: #{map-get($colors, dark_green)};
+      --padding-start: 24px;
+      --padding-end: 24px;
+    }
+  }
+
+  .self-declare-teacher-details{
+    padding: 16px;
+    background-color: map-get($colors, bright_blue_19);
+    text-align: center;
+    color: map-get($colors, white);
+    font-size: 14px;
+    
+    .container{
+      @include margin(null, null, 8px, null);
+    }
+
+    ion-button{
+      text-transform: none;
+      --padding-start: 24px;
+      --padding-end: 24px;
+    }
+
+    .declare-info{
+      margin: 0;
+      font-size: 14px;
+      font-weight: bold;
+    }
+  }
+
+  .app-name{
+    text-transform: lowercase;
+    display: inline-block;
+  }
+  .app-name::first-letter{
+    text-transform: capitalize
+  }
+  .refresh-icon {
+    color: map-get($colors, primary_blue);
+    float: right;
+    height: 40px;
+    width: 40px;
+    margin-top: -8px;
+  }
+  ion-icon.refresh-icon.md.hydrated:active {
+    background: map-get($colors, white_e8);
+    border-radius: 18px;
+  }
+
+  .declared-error-container{
+    margin: auto;
+    @include margin(null, null, 8px, null);
+    width: 50%;
+    border: 1px solid map-get($colors, danger);
+    border-left: 5px solid map-get($colors, danger);
+    border-radius: 10px;
+    background: map-get($colors, white);
+    @include padding(8px, 0, 8px, 0);
+
+    .declared-status{
+      color: map-get($colors, danger);
+    }
+
+    .declared-message{
+      color: map-get($colors, black);
+    }
+  }
+  .preference-info {
+    font-size: 1.3rem;
+    font-weight: 600;
+    text-align: center;
+  }
+
+  .framework-block {
+    border-style: double;
+    margin-top: 8px;
+    border-radius: 1rem;
+    background-color: aliceblue;
+    border-color: aliceblue;
+  }
+  .location-mapping-block {
+    border-style: double;
+    border-radius: 1rem;
+    background-color: aliceblue;
+    border-color: aliceblue;
+  }
+
+}
\ No newline at end of file
diff --git a/src/app/profile/profile.page.spec.data.ts b/src/app/profile/profile.page.spec.data.ts
new file mode 100644
index 000000000..9d2b981ae
--- /dev/null
+++ b/src/app/profile/profile.page.spec.data.ts
@@ -0,0 +1,85 @@
+import {ProfileSource, ProfileType} from 'sunbird-sdk';
+
+export const mockProfileData = {
+    uid: '123',
+    userId: 'sample_user_id',
+    handle: 'sample_name',
+    medium: ['English', 'Bengali'],
+    board: ['CBSE'],
+    profileType: ProfileType.TEACHER,
+    source: ProfileSource.SERVER,
+    rootOrgId: 'sample_1',
+    rootOrg: {
+        rootOrgId: 'sample_org_id',
+        hashTagId: 'sample_hashTagId'
+    },
+    roleList: [{id: 'teacher', name: 'private'}, {id: 'state_teacher', name: 'public'}],
+    organisations: [{
+        organisationId: 'xyz',
+        roles: ['teacher', 'state_teacher'],
+        locations: {
+            state: 'tripura',
+            district: 'west_tripura',
+            block: 'dhaleshwar'
+        }
+    },
+        {
+            organisationId: 'abc',
+            roles: ['teacher', 'state_teacher'],
+            locations: {
+                state: 'west-bengal',
+                district: 'kolkata',
+                block: 'howrah'
+            }
+        }],
+    badgeAssertions: [
+        'sample_badge1', 'sampleBadge 2'
+    ],
+    mappedTrainingCertificates: [1, 2, 3],
+    phone: '99999999',
+    email: 'xyz@gmail.com',
+    recoveryEmail: 'abc@gmail.com',
+    recoveryPhone: '987654',
+    profileUserType: {
+        type: 'teacher'
+    },
+    declarations: [{
+        orgId: 'sample_org_id',
+        persona: 'sample_persona',
+        status: 'sample_status',
+        info: [{
+            data: 'sample_data'
+        }],
+        errorType: 'sample_,error_type',
+    }, {
+        orgId: 'sample_org_id2'
+    }],
+    userLocations: [ 'State', 'District', 'Block', 'Cluster' ]
+};
+
+export const mockFormData =  [
+                {
+                    code: 'tenant',
+                    templateOptions: {
+                        options: [{
+                            value: 'sample_org_id',
+                            label: 'sample_label'
+                        }
+                        ],
+                    },
+                },
+                {
+                    code: 'externalIds',
+                    children: [{
+                        code: 0,
+                        fieldName: 'sample_field_name'
+                    }],
+                    templateOptions: {
+                        options: [{
+                            value: 'sample_org_id',
+                            label: 'sample_label'
+                        }
+                        ],
+                    },
+                }
+            ];
diff --git a/src/app/profile/profile.page.spec.ts b/src/app/profile/profile.page.spec.ts
new file mode 100644
index 000000000..ef427d1ce
--- /dev/null
+++ b/src/app/profile/profile.page.spec.ts
@@ -0,0 +1,1299 @@
+import {ProfilePage} from './profile.page';
+import {
+    ProfileService,
+    AuthService,
+    ContentService,
+    CourseService,
+    FormService,
+    NetworkError,
+    CertificateAlreadyDownloaded, FrameworkService
+} from 'sunbird-sdk';
+import {NgZone} from '@angular/core';
+import {Router} from '@angular/router';
+import {PopoverController, ToastController} from '@ionic/angular';
+import {Events} from '@app/util/events';
+import {
+    AndroidPermissionsService,
+    AppGlobalService,
+    AppHeaderService,
+    CommonUtilService, Environment,
+    FormAndFrameworkUtilService, InteractSubtype, InteractType, PageId,
+    TelemetryGeneratorService
+} from '@app/services';
+import {SocialSharing} from '@ionic-native/social-sharing/ngx';
+import {AppVersion} from '@ionic-native/app-version/ngx';
+import {SbProgressLoader} from '@app/services/sb-progress-loader.service';
+import {FileOpener} from '@ionic-native/file-opener/ngx';
+import {TranslateService} from '@ngx-translate/core';
+import {CertificateDownloadAsPdfService} from 'sb-svg2pdf';
+import {of, throwError} from 'rxjs';
+import {mockFormData, mockProfileData} from './profile.page.spec.data';
+import {ContentFilterConfig, RouterLinks} from '@app/app/app.constant';
+import { NavigationService } from '../../services/navigation-handler.service';
+import { ProfileHandler } from '../../services/profile-handler';
+
+describe('Profile.page', () => {
+    let profilePage: ProfilePage;
+
+    const upgradeData = {upgradeText: ''};
+    const mockProfileService: Partial<ProfileService> = {
+        getActiveSessionProfile: jest.fn(() => of(
+            mockProfileData
+        )),
+        getServerProfilesDetails: jest.fn(() => of(
+            mockProfileData
+        )),
+        isDefaultChannelProfile: jest.fn(() => of(true))
+    };
+    const mockAuthService: Partial<AuthService> = {
+        getSession: jest.fn(() => of({
+            access_token: '',
+            refresh_token: '',
+            userToken: 'sample_user_token'
+        }))
+    };
+    const mockContentService: Partial<ContentService> = {};
+    const mockCourseService: Partial<CourseService> = {};
+    const mockFormService: Partial<FormService> = {};
+    const mockNgZone: Partial<NgZone> = {
+        run: jest.fn((fn) => fn())
+    };
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => ({
+            extras: {
+                state: {
+                    userId: 'sample_user_token',
+                    returnRefreshedUserProfileDetails: true
+                }
+            }
+        })),
+        navigate: jest.fn()
+    };
+    const mockPopoverController: Partial<PopoverController> = {};
+    const mockEvents: Partial<Events> = {
+        subscribe: jest.fn((topic, fn) => {
+            switch (topic) {
+                case 'force_optional_upgrade':
+                    return fn(upgradeData);
+                case 'loggedInProfile:update':
+                    return fn(upgradeData);
+            }
+        })
+    };
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        openPopover: jest.fn(() => Promise.resolve()),
+        setNativePopupVisible: jest.fn()
+    };
+
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {
+        getCustodianOrgId: jest.fn(() => Promise.resolve({
+            orgId: 'sample_org_id'
+        })),
+        updateLoggedInUser: jest.fn(() => Promise.resolve({}))
+    };
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        getUserLocation: jest.fn(() => {
+            return {state: 'tripura', district: 'west_tripura'};
+        }),
+        getOrgLocation: jest.fn(() => {
+            return {state: 'tripura', district: 'west_tripura', block: 'dhaleshwar'};
+        })
+    };
+    const mockSocialSharing: Partial<SocialSharing> = {};
+    const mockAppHeaderService: Partial<AppHeaderService> = {};
+    const mockAndroidPermissionService: Partial<AndroidPermissionsService> = {};
+    const mockAppVersion: Partial<AppVersion> = {};
+    const mockSbProgressLoader: Partial<SbProgressLoader> = {};
+    const mockFileOpener: Partial<FileOpener> = {};
+    const mockToastController: Partial<ToastController> = {};
+    const mockTranslateService: Partial<TranslateService> = {};
+    const mockCertificateDownloadPdfService: Partial<CertificateDownloadAsPdfService> = {};
+    const mockFrameworkService: Partial<FrameworkService> = {
+        setActiveChannelId: jest.fn(() => of(undefined))
+    };
+    const mockNavService: Partial<NavigationService> = {
+        navigateToDetailPage: jest.fn(),
+        navigateToTrackableCollection: jest.fn(),
+        navigateToEditPersonalDetails: jest.fn()
+    };
+
+    const mockProfileHandler: Partial<ProfileHandler> = {
+        getPersonaConfig: jest.fn(),
+        getSubPersona: jest.fn()
+    };
+
+    global.window.segmentation = {
+        init: jest.fn(),
+        SBTagService: {
+            pushTag: jest.fn(),
+            removeAllTags: jest.fn(),
+            restoreTags: jest.fn()
+        }
+    };
+
+    beforeAll(() => {
+        profilePage = new ProfilePage(
+            mockProfileService as ProfileService,
+            mockAuthService as AuthService,
+            mockContentService as ContentService,
+            mockCourseService as CourseService,
+            mockFormService as FormService,
+            mockFrameworkService as FrameworkService,
+            mockNgZone as NgZone,
+            mockRouter as Router,
+            mockPopoverController as PopoverController,
+            mockEvents as Events,
+            mockAppGlobalService as AppGlobalService,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
+            mockCommonUtilService as CommonUtilService,
+            mockSocialSharing as SocialSharing,
+            mockAppHeaderService as AppHeaderService,
+            mockAndroidPermissionService as AndroidPermissionsService,
+            mockAppVersion as AppVersion,
+            mockNavService as NavigationService,
+            mockSbProgressLoader as SbProgressLoader,
+            mockFileOpener as FileOpener,
+            mockToastController as ToastController,
+            mockTranslateService as TranslateService,
+            mockCertificateDownloadPdfService as CertificateDownloadAsPdfService,
+            mockProfileHandler as ProfileHandler
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should create instance of profilePage', () => {
+        // assert
+        expect(profilePage).toBeTruthy();
+    });
+
+    it('should generate telemetry and navigate to download', () => {
+        // arrange
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        mockRouter.navigate = jest.fn();
+        // act
+        profilePage.handleHeaderEvents({name: 'download'});
+        // assert
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH,
+            InteractSubtype.ACTIVE_DOWNLOADS_CLICKED,
+            Environment.HOME,
+            PageId.PROFILE
+        );
+        expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.ACTIVE_DOWNLOADS]);
+    });
+
+    it('should subscribe events with update_header and call headerService and also call defaultChannelProfile', () => {
+        // arrange
+        mockEvents.subscribe = jest.fn((topic, fn) => {
+            if (topic === 'update_header') {
+                return fn();
+            }
+        });
+        const headerData = jest.fn((fn => fn()));
+        mockAppHeaderService.headerEventEmitted$ = {
+            subscribe: headerData
+        } as any;
+        jest.spyOn(profilePage, 'handleHeaderEvents').mockImplementation();
+        mockAppHeaderService.showHeaderWithHomeButton = jest.fn();
+        // act
+        profilePage.ionViewWillEnter();
+        // assert
+        expect(mockEvents.subscribe).toHaveBeenCalled();
+        expect(mockAppHeaderService.showHeaderWithHomeButton).toHaveBeenCalled();
+    });
+
+    it('should unsubscribe headerObservable, events, and refresher set to true', () => {
+        // arrange
+        const unsubscribe = jest.fn();
+        profilePage.headerObservable = {unsubscribe};
+        mockEvents.unsubscribe = jest.fn();
+        profilePage.refresher = {disabled: true};
+        // act
+        profilePage.ionViewWillLeave();
+        // assert
+        expect(unsubscribe).toHaveBeenCalled();
+        expect(mockEvents.unsubscribe).toHaveBeenCalledWith('update_header');
+        expect(profilePage.refresher.disabled).toBeTruthy();
+    });
+
+    it('should should set disabled property of refresher to be false', () => {
+        // arrange
+        profilePage.refresher = {disabled: false};
+        // act
+        profilePage.ionViewDidEnter();
+        // assert
+        expect(profilePage.refresher.disabled).toBeFalsy();
+    });
+
+    it('should resetProfile to empty object when called', () => {
+        // act
+        profilePage.resetProfile();
+        // assert
+        expect(profilePage.profile).toStrictEqual({});
+    });
+
+    describe('refreshProfileData', () => {
+        it('should call getServerProfileDetails if userId matches userToken', (done) => {
+            // arrange
+            mockAuthService.getSession = jest.fn(() => of({userToken: 'sample_user_token'}));
+            profilePage.userId = 'sample_user_token';
+            mockProfileService.getServerProfilesDetails = jest.fn(() => of(mockProfileData));
+            mockNgZone.run = jest.fn((fn) => fn());
+            jest.spyOn(profilePage, 'resetProfile').mockImplementation();
+            mockProfileService.getActiveSessionProfile = jest.fn(() => of(mockProfileData));
+            mockFormAndFrameworkUtilService.updateLoggedInUser = jest.fn(() => Promise.resolve({status: undefined}));
+            mockRouter.navigate = jest.fn();
+            mockCommonUtilService.getOrgLocation = jest.fn(() => {
+                return {state: 'tripura', district: 'west_tripura', block: 'dhaleshwar'};
+            });
+            mockFrameworkService.setActiveChannelId = jest.fn(() => of(undefined));
+            mockProfileService.isDefaultChannelProfile = jest.fn(() => of(true));
+            // act
+            profilePage.refreshProfileData();
+            setTimeout(() => {
+                expect(mockAuthService.getSession).toHaveBeenCalled();
+                expect(mockProfileService.getServerProfilesDetails).toHaveBeenCalled();
+                expect(profilePage.resetProfile).toHaveBeenCalled();
+                expect(mockProfileService.getActiveSessionProfile).toHaveBeenCalled();
+                expect(mockFormAndFrameworkUtilService.updateLoggedInUser).toHaveBeenCalled();
+                expect(mockFrameworkService.setActiveChannelId).toHaveBeenCalledWith(mockProfileData.rootOrg.hashTagId);
+                done();
+            }, 0);
+        });
+
+        it('should go to reject part if session is null', () => {
+            // arrange
+            mockAuthService.getSession = jest.fn(() => of(null));
+            // act
+            profilePage.refreshProfileData().catch((result) => {
+                expect(result).toBe('session is null');
+            });
+        });
+
+        it('should handle catch part if getServerProfileDetails handles and error', () => {
+            // arrange
+            // const refresher = {target: {complete: jest.fn()}};
+            mockAuthService.getSession = jest.fn(() => of({userToken: 'sample_user_token'}));
+            profilePage.userId = 'another_user_id';
+            mockProfileService.getServerProfilesDetails = jest.fn(() => of(undefined));
+            profilePage.isLoggedInUser = false;
+            // act
+            profilePage.refreshProfileData(true);
+            expect(profilePage.isLoggedInUser).toBeFalsy();
+        });
+
+    });
+
+    describe('getEnrolledCourses', () => {
+        it('should fetch current user\s enrolled course and set into mappedTraining certificates', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCourseService.getEnrolledCourses = jest.fn(() => of([{
+                courseName: 'sample_course',
+                dateTime: '12/08/2020',
+                courseId: 'do_1234',
+                certificates: [{certName: 'sampleCert'}, {certName: 'sampleCert2'}],
+                status: 2
+            }]));
+            // act
+            profilePage.getEnrolledCourses(true, true);
+            // assert
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.REFRESH_CLICKED,
+                    Environment.USER,
+                    PageId.PROFILE);
+                expect(mockCourseService.getEnrolledCourses).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should handle else cases if certificates dont have length', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                dismiss: dismissFn,
+            }));
+            mockCourseService.getEnrolledCourses = jest.fn(() => of([{
+                courseName: 'sample_course',
+                dateTime: '12/08/2020',
+                courseId: 'do_1234',
+                certificate: [{certName: 'sampleCert'}, {certName: 'sampleCert2'}],
+                status: 2
+            }]));
+            profilePage.getEnrolledCourses(true, false);
+            // assert
+            setTimeout(() => {
+                expect(mockCourseService.getEnrolledCourses).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should throw error and get to catch part', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                dismiss: dismissFn,
+            }));
+            mockCourseService.getEnrolledCourses = jest.fn(() => throwError('error'));
+            jest.spyOn(console, 'error').mockImplementation();
+            // act
+            profilePage.getEnrolledCourses(true, false);
+
+            setTimeout(() => {
+                // assert
+                expect(console.error).toHaveBeenCalledWith('error while loading enrolled courses', 'error');
+                done();
+            }, 0);
+        });
+    });
+
+    describe('searchContent test-suites', () => {
+        it('should call for search Content and set the result data', (done) => {
+            // arrange
+            mockFormAndFrameworkUtilService.getSupportedContentFilterConfig = jest.fn(() =>
+                Promise.resolve(['sample_1', 'sample_2']));
+            mockContentService.searchContent = jest.fn(() => of({
+                    result:
+                        {
+                            contentDataList: ['sample_content_data_list']
+                        }
+                }
+                )
+            );
+            profilePage.userId = 'sample_user_id';
+            // act
+            profilePage.searchContent();
+            // assert
+            setTimeout(() => {
+                expect(mockFormAndFrameworkUtilService.getSupportedContentFilterConfig)
+                    .toHaveBeenCalledWith(ContentFilterConfig.NAME_DOWNLOADS);
+                expect(mockContentService.searchContent).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should call for search Content and throw error and go to catch block', (done) => {
+            // arrange
+            mockFormAndFrameworkUtilService.getSupportedContentFilterConfig = jest.fn(() =>
+                Promise.resolve(['sample_1', 'sample_2']));
+            mockContentService.searchContent = jest.fn(() => throwError('sample_search_error'));
+            profilePage.userId = undefined;
+            profilePage.loggedInUserId = 'sample_logged_in_user_id';
+            jest.spyOn(console, 'error').mockImplementation();
+            // act
+            profilePage.searchContent();
+            // assert
+            setTimeout(() => {
+                expect(mockFormAndFrameworkUtilService.getSupportedContentFilterConfig)
+                    .toHaveBeenCalledWith(ContentFilterConfig.NAME_DOWNLOADS);
+                expect(mockContentService.searchContent).toHaveBeenCalled();
+                expect(console.error).toHaveBeenCalledWith('Error', 'sample_search_error');
+                done();
+            }, 0);
+        });
+
+    });
+
+    describe('getSelfDeclaredDetails test-cases', () => {
+        it('checks if isCustodianOrgId is true and look for declarations and fetch form data from api', (done) => {
+            // arrange
+            profilePage.isCustodianOrgId = true;
+            mockFormAndFrameworkUtilService.getFormFields = jest.fn(() => Promise.resolve(mockFormData));
+            mockCommonUtilService.translateMessage = jest.fn(v => v);
+            // act
+            profilePage.getSelfDeclaredDetails();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('FRMELEMNTS_LBL_SHARE_DATA_WITH', {
+                    '%tenant': 'sample_label'
+                });
+                done();
+            }, 0);
+        });
+    });
+
+    describe('doRefresh()', () => {
+        it('should call loader and refresher to false', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                dismiss: dismissFn
+            }));
+            mockTelemetryGeneratorService.generatePullToRefreshTelemetry = jest.fn();
+            const refresher = {target: {complete: jest.fn()}};
+            mockEvents.publish = jest.fn();
+            mockSbProgressLoader.hide = jest.fn();
+            jest.spyOn(profilePage, 'getEnrolledCourses').mockImplementation();
+            jest.spyOn(profilePage, 'searchContent').mockImplementation();
+            jest.spyOn(profilePage, 'getSelfDeclaredDetails').mockImplementation();
+            jest.spyOn(profilePage, 'refreshProfileData').mockImplementation(() => Promise.resolve({}));
+            // act
+            profilePage.doRefresh(refresher).then(() => {
+                setTimeout(() => {
+                    // assert
+                    expect(mockTelemetryGeneratorService.generatePullToRefreshTelemetry)
+                        .toHaveBeenCalledWith(PageId.PROFILE, Environment.HOME);
+                    expect(refresher.target.complete).toHaveBeenCalled();
+                    expect(dismissFn).toHaveBeenCalled();
+                    expect(mockEvents.publish).toHaveBeenCalledWith('refresh:profile');
+                    expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({id: 'login'});
+                    done();
+                }, 500);
+            });
+        });
+        it('should call and present loader and go to catch block if refreshProfile data return some error', (done) => {
+            // arrange
+            const presentFn = jest.fn(() => Promise.resolve());
+            const dismissFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn
+            }));
+            jest.spyOn(profilePage, 'refreshProfileData').mockImplementation(() => Promise.reject({}));
+            // act
+            profilePage.doRefresh(false);
+            setTimeout(() => {
+                // assert
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+    it('should refresh the data and update the profile', (done) => {
+        // arrange
+        jest.spyOn(profilePage, 'doRefresh').mockImplementation();
+        mockAppVersion.getAppName = jest.fn(() => Promise.resolve('sample_app_name'));
+        // act
+        profilePage.ngOnInit().then(() => {
+
+            expect(mockAppVersion.getAppName).toHaveBeenCalled();
+            // assert
+            done();
+        });
+    });
+
+    it('should call interact telemetry and set rolelimit', () => {
+        // arrange
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        // act
+        profilePage.showMoreItems();
+        // assert
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH,
+            InteractSubtype.VIEW_MORE_CLICKED,
+            Environment.HOME,
+            PageId.PROFILE, null,
+            undefined,
+            undefined
+        );
+    });
+
+    it('should set roleLimit when called upon', () => {
+        // arrange
+        // act
+        profilePage.showLessItems();
+        // assert
+        expect(profilePage.rolesLimit).toBe(3);
+    });
+
+    it('should set badge limit and generate interact telemetry', () => {
+        // arrange
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        // act
+        profilePage.showMoreBadges();
+        // assert
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH,
+            InteractSubtype.VIEW_MORE_CLICKED,
+            Environment.HOME,
+            PageId.PROFILE, null,
+            undefined,
+            undefined
+        );
+    });
+
+    it('should set badge limit', () => {
+        // act
+        profilePage.showLessBadges();
+        // assert
+        expect(profilePage.badgesLimit).toBe(3);
+    });
+
+    it('should set trainings limit and generate interact telemetry', () => {
+        // arrange
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        // act
+        profilePage.showMoreTrainings('myLearning');
+        // assert
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH,
+            InteractSubtype.VIEW_MORE_CLICKED,
+            Environment.HOME,
+            PageId.PROFILE, null,
+            undefined,
+            undefined
+        );
+    });
+
+    it('should set trainings limit and generate interact telemetry', () => {
+        // arrange
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        // act
+        profilePage.showMoreTrainings('learnerPassbook');
+        // assert
+    });
+
+    it('should set default trainings limit when called upon', () => {
+        // act
+        profilePage.showLessTrainings('myLearning');
+        // assert
+        expect(profilePage.myLearningLimit).toBe(3);
+    });
+
+    it('should set default trainings limit when called upon', () => {
+        // act
+        profilePage.showLessTrainings('learnerPassbook');
+        // assert
+        expect(profilePage.myLearningLimit).toBe(3);
+    });
+
+    it('should go to catch part and called showToast message', (done) => {
+        // arrange
+        mockFileOpener.open = jest.fn(() => Promise.reject('error'));
+        mockCommonUtilService.showToast = jest.fn();
+        jest.spyOn(console, 'log').mockImplementation();
+        // act
+        profilePage.openpdf('file:///emulated/0/android/download/sample_file.pdf');
+        // assert
+        setTimeout(() => {
+            expect(console.log).toHaveBeenCalledWith('Error opening file', 'error');
+            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('CERTIFICATE_ALREADY_DOWNLOADED');
+            done();
+        }, 0);
+    });
+
+    it('should open file when path given as parameter', (done) => {
+        // arrange
+        mockFileOpener.open = jest.fn(() => Promise.resolve());
+        jest.spyOn(console, 'log').mockImplementation();
+        // act
+        profilePage.openpdf('file:///emulated/0/android/download/sample_file.pdf');
+        // assert
+        setTimeout(() => {
+            expect(console.log).toHaveBeenCalledWith('File is opened');
+            done();
+        }, 0);
+    });
+
+    describe('downloadTrainingCertificate()', () => {
+
+        it('should generate interact telemetry when permission requested and isAlwaysDenied set to false', (done) => {
+            // arrange
+            mockTranslateService.get = jest.fn(() => of('Certificate is getting downloaded'));
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() =>
+                Promise.resolve({hasPermission: false, isPermissionAlwaysDenied: false}));
+            mockPopoverController.dismiss = jest.fn();
+            mockAndroidPermissionService.requestPermission = jest.fn(() => of({
+                hasPermission: false,
+                isPermissionAlwaysDenied: false
+            }));
+            mockCommonUtilService.buildPermissionPopover = jest.fn(async (callback) => {
+                await callback(mockCommonUtilService.translateMessage('NOT_NOW'));
+                return {
+                    present: jest.fn(() => Promise.resolve())
+                };
+            });
+            mockCommonUtilService.translateMessage = jest.fn(v => v);
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.showSettingsPageToast = jest.fn();
+            mockCourseService.downloadCurrentProfileCourseCertificate = jest.fn(() => of({path: 'sample_url'}));
+            jest.spyOn(profilePage, 'openpdf').mockImplementation();
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: false};
+            mockToastController.create = jest.fn(() => {
+                return Promise.resolve({
+                    present: jest.fn(),
+                    dismiss: jest.fn()
+                });
+            }) as any;
+            const values = new Map();
+            values['courseId'] = 'do_1234';
+
+            profilePage.appName = 'sample_app_name';
+            // act
+            profilePage.downloadTrainingCertificate({
+                courseId: 'do_1234',
+                certificate: {
+                    id: 'sample_cert_id',
+                    url: 'https://sampleCertUrl.com',
+                    token: 'AXOBC'
+                },
+                courseName: 'sample_course',
+                dateTime: '1333065600000',
+                status: 0
+            });
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.NOT_NOW_CLICKED,
+                    Environment.SETTINGS,
+                    PageId.PERMISSION_POPUP
+                );
+                expect(mockCommonUtilService.showSettingsPageToast).toHaveBeenCalledWith(
+                    'FILE_MANAGER_PERMISSION_DESCRIPTION',
+                    'sample_app_name',
+                    PageId.PROFILE,
+                    true
+                );
+                done();
+            }, 0);
+        });
+
+        it('should generate interact telemetry when request permission has been set to false', (done) => {
+            // arrange
+            mockTranslateService.get = jest.fn(() => of('Certificate is getting downloaded'));
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() =>
+                Promise.resolve({hasPermission: false, isPermissionAlwaysDenied: false}));
+            mockPopoverController.dismiss = jest.fn();
+            mockAndroidPermissionService.requestPermission = jest.fn(() => of({
+                hasPermission: false,
+                isPermissionAlwaysDenied: false
+            }));
+            mockCommonUtilService.buildPermissionPopover = jest.fn(async (callback) => {
+                await callback(mockCommonUtilService.translateMessage('ALLOW'));
+                return {
+                    present: jest.fn(() => Promise.resolve())
+                };
+            });
+            mockCommonUtilService.translateMessage = jest.fn(v => v);
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.showSettingsPageToast = jest.fn();
+            mockCourseService.downloadCurrentProfileCourseCertificate = jest.fn(() => of({path: 'sample_url'}));
+            jest.spyOn(profilePage, 'openpdf').mockImplementation();
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: false};
+            mockToastController.create = jest.fn(() => {
+                return Promise.resolve({
+                    present: jest.fn(),
+                    dismiss: jest.fn()
+                });
+            }) as any;
+            const values = new Map();
+            values['courseId'] = 'do_1234';
+
+            profilePage.appName = 'sample_app_name';
+            // act
+            profilePage.downloadTrainingCertificate({
+                courseId: 'do_1234',
+                certificate: {
+                    id: 'sample_cert_id',
+                    url: 'https://sampleCertUrl.com',
+                    token: 'AXOBC'
+                },
+                courseName: 'sample_course',
+                dateTime: '1333065600000',
+                status: 0
+            });
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.DENY_CLICKED,
+                    Environment.SETTINGS,
+                    PageId.APP_PERMISSION_POPUP
+                );
+                expect(mockCommonUtilService.showSettingsPageToast).toHaveBeenCalledWith(
+                    'FILE_MANAGER_PERMISSION_DESCRIPTION',
+                    'sample_app_name',
+                    PageId.PROFILE,
+                    true
+                );
+                done();
+            }, 0);
+        });
+
+
+        it('should generate interact telemetry when permission popup for storage and ALLOW clicked and ', (done) => {
+            // arrange
+            mockTranslateService.get = jest.fn(() => of('Certificate is getting downloaded'));
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() =>
+                Promise.resolve({hasPermission: false, isPermissionAlwaysDenied: false}));
+            mockPopoverController.dismiss = jest.fn();
+            mockCommonUtilService.buildPermissionPopover = jest.fn(async (callback) => {
+                await callback(mockCommonUtilService.translateMessage('ALLOW'));
+                return {
+                    present: jest.fn(() => Promise.resolve())
+                };
+            });
+            mockCommonUtilService.translateMessage = jest.fn(v => v);
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.showSettingsPageToast = jest.fn();
+            mockCourseService.downloadCurrentProfileCourseCertificate = jest.fn(() => of({path: 'sample_url'}));
+            jest.spyOn(profilePage, 'openpdf').mockImplementation();
+            mockAndroidPermissionService.requestPermission = jest.fn(() => of({
+                hasPermission: false,
+                isPermissionAlwaysDenied: true
+            }));
+            mockToastController.create = jest.fn(() => {
+                return Promise.resolve({
+                    present: jest.fn(),
+                    dismiss: jest.fn()
+                });
+            }) as any;
+            const values = new Map();
+            values['courseId'] = 'do_1234';
+
+            profilePage.appName = 'sample_app_name';
+            // act
+            profilePage.downloadTrainingCertificate({courseId: 'do_1234'}, {
+                id: 'sample_cert_id', url:
+                    'https://sampleCertUrl.com', token: 'AXOBC'
+            });
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.showSettingsPageToast).toHaveBeenCalledWith(
+                    'FILE_MANAGER_PERMISSION_DESCRIPTION',
+                    'sample_app_name',
+                    PageId.PROFILE,
+                    true
+                );
+                done();
+            }, 0);
+        });
+
+        it('check for permission and returns isPermissionAlwaysDenied true', (done) => {
+            // arrange
+            mockTranslateService.get = jest.fn(() => of('Certificate is getting downloaded'));
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() =>
+                Promise.resolve({hasPermission: false, isPermissionAlwaysDenied: true}));
+            mockToastController.create = jest.fn(() => {
+                return Promise.resolve({
+                    present: jest.fn(),
+                    dismiss: jest.fn()
+                });
+            }) as any;
+            profilePage.appName = 'sample_app_name';
+            mockCommonUtilService.showSettingsPageToast = jest.fn();
+            // act
+            profilePage.downloadTrainingCertificate({
+                courseId: 'do_1234',
+                certificate: {
+                    id: 'sample_cert_id',
+                    url: 'https://sampleCertUrl.com',
+                    token: 'AXOBC'
+                },
+                courseName: 'sample_course',
+                dateTime: '1333065600000',
+                status: 0
+            });
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.showSettingsPageToast).toHaveBeenCalledWith(
+                    'FILE_MANAGER_PERMISSION_DESCRIPTION',
+                    'sample_app_name',
+                    PageId.PROFILE,
+                    true
+                );
+                expect(mockCommonUtilService.getGivenPermissionStatus).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+
+        it('check for permission whether available or not', (done) => {
+            // arrange
+            mockTranslateService.get = jest.fn(() => of('Certificate is getting downloaded'));
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve({hasPermission: true}));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const values = new Map();
+            values['courseId'] = 'sample_cert_id';
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            mockToastController.create = jest.fn(() => {
+                return Promise.resolve({
+                    present: jest.fn(),
+                    dismiss: jest.fn()
+                });
+            }) as any;
+            mockCourseService.downloadCurrentProfileCourseCertificate = jest.fn(() => of({path: 'sample_url'}));
+            jest.spyOn(profilePage, 'openpdf').mockImplementation();
+            // act
+            profilePage.downloadTrainingCertificate({courseId: 'sample_cert_id'}, {
+                id: 'sample_cert_id', url:
+                    'https://sampleCertUrl.com', identifier: 'sample_id', token: 'AXOBC'
+            });
+            // assert
+            setTimeout(() => {
+                expect(mockTranslateService.get).toHaveBeenCalledWith('CERTIFICATE_DOWNLOAD_INFO');
+                expect(mockCommonUtilService.getGivenPermissionStatus).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.DOWNLOAD_CERTIFICATE_CLICKED,
+                    Environment.USER, // env
+                    PageId.PROFILE, // page name
+                    {id: 'sample_cert_id', type: 'Certificate', version: undefined},
+                    values
+                );
+                expect(mockToastController.create).toHaveBeenCalledWith({message: 'Certificate is getting downloaded'});
+                expect(mockCourseService.downloadCurrentProfileCourseCertificate).toHaveBeenCalled();
+                expect(profilePage.openpdf).toHaveBeenCalledWith('sample_url');
+                done();
+            }, 0);
+        });
+
+        it('check for permission and calls for download certificate goes to catch block for networkError', (done) => {
+            // arrange
+            mockTranslateService.get = jest.fn(() => of('Certificate is getting downloaded'));
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve({hasPermission: true}));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const values = new Map();
+            values['courseId'] = 'do_1234';
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            mockToastController.create = jest.fn(() => {
+                return Promise.resolve({
+                    present: jest.fn(),
+                    dismiss: jest.fn()
+                });
+            }) as any;
+            jest.spyOn(profilePage, 'openpdf').mockImplementation();
+            const networkError = new NetworkError('no_internet');
+            mockCourseService.downloadCurrentProfileCourseCertificate = jest.fn(() => throwError(networkError));
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            profilePage.downloadTrainingCertificate({courseId: 'sample_cert_id'}, {
+                id: 'sample_cert_id', url:
+                    'https://sampleCertUrl.com', identifier: 'sample_id', token: 'AXOBC'
+            });
+            // assert
+            setTimeout(() => {
+                expect(mockTranslateService.get).toHaveBeenCalledWith('CERTIFICATE_DOWNLOAD_INFO');
+                expect(mockCommonUtilService.getGivenPermissionStatus).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.DOWNLOAD_CERTIFICATE_CLICKED,
+                    Environment.USER, // env
+                    PageId.PROFILE, // page name
+                    {id: 'sample_cert_id', type: 'Certificate', version: undefined},
+                    values
+                );
+                expect(mockToastController.create).toHaveBeenCalledWith({message: 'Certificate is getting downloaded'});
+                expect(mockCourseService.downloadCurrentProfileCourseCertificate).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('OFFLINE_CERTIFICATE_MESSAGE', false, '', 3000, 'top');
+                done();
+            }, 0);
+        });
+
+        it('should call for download legacyCertifcate if certificate has no identifeir', (done) => {
+            // arrange
+            mockTranslateService.get = jest.fn(() => of(undefined));
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve({hasPermission: true}));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const values = new Map();
+            values['courseId'] = 'do_1234';
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: false};
+            mockCertificateDownloadPdfService.download = jest.fn(() => Promise.resolve());
+            jest.spyOn(profilePage, 'openpdf').mockImplementation();
+            mockCertificateDownloadPdfService.download = jest.fn(() => Promise.resolve());
+            mockCourseService.certificateManager = {
+                    isCertificateCached: jest.fn(() => of(true))
+                }
+            // act
+            profilePage.downloadTrainingCertificate(
+                {
+                    courseId: 'sample_cert_id',
+                    issuedCertificate: {
+                        id: 'sample_cert_id',
+                        name: 'sample_cert_name',
+                        token: 'ABSCD'
+                    },
+                    courseName: 'sample_course',
+                    dateTime: '1333065600000',
+                    status: 0
+                });
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.DOWNLOAD_CERTIFICATE_CLICKED,
+                    Environment.USER, // env
+                    PageId.PROFILE, // page name
+                    {id: 'sample_cert_id', type: 'Certificate', version: undefined},
+                    values
+                );
+                done();
+            }, 0);
+        });
+    });
+
+    describe('navigateToDetailPage test-suites', () => {
+        it('should navigate to course-details page based on the contentType', () => {
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockRouter.navigate = jest.fn();
+            const values = new Map();
+            values['sectionName'] = 'Contributions';
+            values['positionClicked'] = 2;
+            // act
+            profilePage.navigateToDetailPage({
+                contentId: 'do_1234',
+                identifier: 'do_123',
+                contentType: 'Course',
+                primaryCategory: 'Course'
+            }, 'completed', 2);
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.CONTENT_CLICKED,
+                Environment.USER,
+                PageId.PROFILE,
+                {id: 'do_123', type: 'Course', version: ''},
+                values
+            );
+            expect(mockNavService.navigateToDetailPage).toBeCalled();
+        });
+    });
+
+    describe('navigateToCategoriesEditPage test-suites', () => {
+        it('should navigate to categories edit page if network is available', () => {
+            // arrange
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockRouter.navigate = jest.fn();
+            // act
+            profilePage.navigateToCategoriesEditPage();
+            // assert
+            expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeTruthy();
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.EDIT_CLICKED,
+                Environment.HOME,
+                PageId.PROFILE, null
+            );
+            expect(mockRouter.navigate).toHaveBeenCalledWith([`/${RouterLinks.PROFILE}/${RouterLinks.CATEGORIES_EDIT}`]);
+        });
+
+        it('should show toast of no internet if network is not available', () => {
+            // arrange
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: false};
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            profilePage.navigateToCategoriesEditPage();
+            // assert
+            expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeFalsy();
+            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('NEED_INTERNET_TO_CHANGE');
+        });
+    });
+
+    describe('onEditProfileClicked  test-suites', () => {
+        it('should generate telemetry and navigate to district mapping if network is available', () => {
+            // arrange
+            // act
+            profilePage.onEditProfileClicked();
+            // assert
+            expect(mockNavService.navigateToEditPersonalDetails).toHaveBeenCalledWith(
+                mockProfileData,
+                PageId.PROFILE
+            );
+        });
+    });
+
+    describe('update phone and email test-suites', () => {
+        it('should translate message and call editContactPop with ' +
+            'current user phone number and user Id if phone number available', (done) => {
+            // arrange
+            mockCommonUtilService.translateMessage = jest.fn(v => v);
+            mockPopoverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({
+                    data: {
+                        isEdited: true,
+                        OTPSuccess: true,
+                        value: '123456'
+                    }
+                }))
+            } as any)));
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockProfileService.updateServerProfile = jest.fn(() => of(mockProfileData));
+            jest.spyOn(profilePage, 'doRefresh').mockImplementation();
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            profilePage.editMobileNumber();
+            setTimeout(() => {
+                // assert
+                expect(mockProfileService.updateServerProfile).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('PHONE_UPDATE_SUCCESS');
+                done();
+            }, 0);
+        });
+
+        it('should update emailId when is any emailId is available', (done) => {
+            // arrange
+            mockPopoverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({
+                    data: {
+                        isEdited: true,
+                        OTPSuccess: true,
+                        value: '123456'
+                    }
+                }))
+            } as any)));
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockProfileService.updateServerProfile = jest.fn(() => throwError('sample_error'));
+            jest.spyOn(profilePage, 'doRefresh').mockImplementation();
+            mockCommonUtilService.translateMessage = jest.fn(v => v);
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            profilePage.editEmail();
+            setTimeout(() => {
+                expect(mockProfileService.updateServerProfile).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('SOMETHING_WENT_WRONG');
+                done();
+            }, 0);
+        });
+    });
+
+    it('should generate telemetry and generate popover and if edited set true and then update profile', (done) => {
+        // arrange
+        mockPopoverController.create = jest.fn(() => (Promise.resolve({
+            present: jest.fn(() => Promise.resolve({})),
+            onDidDismiss: jest.fn(() => Promise.resolve({data: {isEdited: true, value: '123456'}}))
+        } as any)));
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        mockProfileService.updateServerProfile = jest.fn(() => of(mockProfileData));
+        const dismissFn = jest.fn(() => Promise.resolve());
+        const presentFn = jest.fn(() => Promise.resolve());
+        mockCommonUtilService.getLoader = jest.fn(() => ({
+            present: presentFn,
+            dismiss: dismissFn,
+        }));
+        mockCommonUtilService.translateMessage = jest.fn(v => v);
+        mockCommonUtilService.showToast = jest.fn();
+        // act
+        profilePage.editRecoveryId();
+        // assert
+        setTimeout(() => {
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.RECOVERY_ACCOUNT_ID_CLICKED,
+                Environment.USER,
+                PageId.PROFILE
+            );
+            expect(mockProfileService.updateServerProfile).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
+    it('should go to else part if organisations list is equal to 1', () => {
+        // arrange
+        profilePage.profile.organisations = [{
+            organisationId: 'xyz',
+            roles: ['teacher', 'state_teacher'],
+            locations: {
+                state: 'tripura',
+                district: 'west_tripura',
+                block: 'dhaleshwar'
+            }
+        }];
+        mockCommonUtilService.getOrgLocation = jest.fn(() => {
+            return {state: 'tripura', district: 'west_tripura', block: 'dhaleshwar'};
+        });
+        // act
+        profilePage.getOrgDetails();
+        // assert
+        expect(mockCommonUtilService.getOrgLocation).toHaveBeenCalled();
+    });
+
+    describe('openEnrolledCourse test-suites', () => {
+        it('should get contentDetails and navigate to course-details page', (done) => {
+            // arrange
+            mockContentService.getContentDetails = jest.fn(() => of('sample_content'));
+            mockRouter.navigate = jest.fn();
+            // act
+            profilePage.openEnrolledCourse({courseId: 'do_123'});
+            setTimeout(() => {
+                // assert
+                expect(mockContentService.getContentDetails).toHaveBeenCalled();
+                expect(mockNavService.navigateToTrackableCollection).toHaveBeenCalledWith(
+                    {
+                        content: 'sample_content',
+                        resumeCourseFlag: false
+                    }
+                );
+                done();
+            });
+        });
+
+        it('should get contentDetails and throw console error', (done) => {
+            // arrange
+            mockContentService.getContentDetails = jest.fn(() => throwError('sample_error'));
+            jest.spyOn(console, 'error').mockImplementation();
+            // act
+            profilePage.openEnrolledCourse({courseId: 'do_123'});
+            setTimeout(() => {
+                // assert
+                expect(mockContentService.getContentDetails).toHaveBeenCalled();
+                expect(console.error).toHaveBeenCalledWith('sample_error');
+                done();
+            });
+        });
+    });
+
+    describe('openSelfDeclareTeacherForm test-suites', () => {
+        it('should check of networkAvailability and if true then generate telemetry and navigate to teacher edit', () => {
+            // arrange
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockRouter.navigate = jest.fn();
+            const type = 'add';
+            // act
+            profilePage.openSelfDeclareTeacherForm(type);
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                '',
+                Environment.USER,
+                PageId.PROFILE,
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                'btn-i-am-a-teacher'
+            );
+            expect(mockRouter.navigate).toHaveBeenCalledWith([`/${RouterLinks.PROFILE}/${RouterLinks.SELF_DECLARED_TEACHER_EDIT}/${type}`],
+                {
+                    state: {
+                        profile: profilePage.profile
+                    }
+                });
+        });
+
+        it('should show toast if network is unavailable', () => {
+            // arrange
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: false};
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+            const type = 'update';
+            // act
+            profilePage.openSelfDeclareTeacherForm(type);
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                '',
+                Environment.USER,
+                PageId.PROFILE,
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                'btn-update'
+            );
+            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('NEED_INTERNET_TO_CHANGE');
+            expect(mockRouter.navigate).toHaveBeenCalledWith([`/${RouterLinks.PROFILE}/${RouterLinks.SELF_DECLARED_TEACHER_EDIT}/${type}`],
+                {
+                    state: {
+                        profile: profilePage.profile
+                    }
+                });
+        });
+    });
+
+    describe('toggleTooltips test-cases', () => {
+        it('should go inside field has name in it and go inside dismiss message', () => {
+            // arrange
+            jest.useFakeTimers();
+            profilePage.informationProfileName = false;
+            const event = {stopPropagation: jest.fn()};
+            // act
+            profilePage.toggleTooltips(event, 'name');
+            jest.advanceTimersByTime(3001);
+            // assert
+            expect(profilePage.informationProfileName).toBe(false);
+            expect(profilePage.informationOrgName).toBe(false);
+            expect(event.stopPropagation).toHaveBeenCalled();
+            jest.useRealTimers();
+        });
+
+        it('should go inside field  name is org and set data and dismiss message called', () => {
+            // arrange
+            jest.useFakeTimers();
+            profilePage.informationProfileName = false;
+            const event = {stopPropagation: jest.fn()};
+            // act
+            profilePage.toggleTooltips(event, 'org');
+            jest.advanceTimersByTime(3001);
+            // assert
+            expect(profilePage.informationProfileName).toBe(false);
+            expect(profilePage.informationOrgName).toBe(false);
+            expect(event.stopPropagation).toHaveBeenCalled();
+            jest.useRealTimers();
+        });
+
+        it('should go to else part if field name is not org nor field', () => {
+            jest.useFakeTimers();
+            profilePage.informationProfileName = false;
+            const event = {stopPropagation: jest.fn()};
+            // act
+            profilePage.toggleTooltips(event, 'sample');
+            // assert
+            expect(profilePage.informationProfileName).toBe(false);
+            expect(profilePage.informationOrgName).toBe(false);
+            jest.useRealTimers();
+        });
+    });
+
+    it('shareUsername', () => {
+        // arrange
+        profilePage.profile = {
+            userName: 'some_username',
+            firstName: 'First',
+            lastName: 'Last'
+        };
+        mockCommonUtilService.translateMessage = jest.fn((key, fields) => {
+            switch (key) {
+                case 'SHARE_USERNAME':
+                    return 'SHARE_USERNAME';
+            }
+        });
+        mockSocialSharing.share = jest.fn();
+
+        // act
+        profilePage.shareUsername();
+
+        // assert
+        expect(mockSocialSharing.share).toHaveBeenCalledWith('SHARE_USERNAME');
+        expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('SHARE_USERNAME', {
+            app_name: profilePage.appName,
+            user_name: profilePage.profile.firstName + ' ' + profilePage.profile.lastName,
+            diksha_id: profilePage.profile.userName
+        });
+    });
+});
diff --git a/src/app/profile/profile.page.ts b/src/app/profile/profile.page.ts
index a8ad06fd8..c4e0eef6c 100644
--- a/src/app/profile/profile.page.ts
+++ b/src/app/profile/profile.page.ts
@@ -1,10 +1,17 @@
-import { Component, NgZone, OnInit, Inject } from '@angular/core';
+import { Component, NgZone, OnInit, Inject, ViewChild } from '@angular/core';
 import {
-  Events,
   PopoverController,
+  ToastController,
+  IonRefresher,
 } from '@ionic/angular';
-import { generateInteractTelemetry } from '@app/app/telemetryutil';
-import { ContentCard, ContentType, MimeType, ProfileConstants, RouterLinks, ContentFilterConfig } from '@app/app/app.constant';
+import { Events } from '@app/util/events';
+import {
+  ContentCard,
+  ProfileConstants,
+  RouterLinks,
+  ContentFilterConfig,
+  EventTopics,
+} from '@app/app/app.constant';
 import { FormAndFrameworkUtilService } from '@app/services/formandframeworkutil.service';
 import { AppGlobalService } from '@app/services/app-global-service.service';
 import { CommonUtilService } from '@app/services/common-util.service';
@@ -26,26 +33,54 @@ import {
   TelemetryObject,
   UpdateServerProfileInfoRequest,
   CachedItemRequestSourceFrom,
-  CourseCertificate
+  CourseCertificate,
+  CertificateAlreadyDownloaded,
+  NetworkError,
+  FormRequest,
+  FormService,
+  FrameworkService,
+  ProfileType,
+  Batch,
+  GetLearnerCerificateRequest
 } from 'sunbird-sdk';
-import { Environment, InteractSubtype, InteractType, PageId } from '@app/services/telemetry-constants';
-import { ActivatedRoute, Router, NavigationExtras } from '@angular/router';
+import { Environment, InteractSubtype, InteractType, PageId, ID } from '@app/services/telemetry-constants';
+import { Router, NavigationExtras } from '@angular/router';
 import { EditContactVerifyPopupComponent } from '@app/app/components/popups/edit-contact-verify-popup/edit-contact-verify-popup.component';
 import {
   EditContactDetailsPopupComponent
 } from '@app/app/components/popups/edit-contact-details-popup/edit-contact-details-popup.component';
-import { AccountRecoveryInfoComponent } from '../components/popups/account-recovery-id/account-recovery-id-popup.component';
+import {
+  AccountRecoveryInfoComponent
+} from '../components/popups/account-recovery-id/account-recovery-id-popup.component';
 import { SocialSharing } from '@ionic-native/social-sharing/ngx';
-import { TeacherIdVerificationComponent } from '../components/popups/teacher-id-verification-popup/teacher-id-verification-popup.component';
-import { Observable } from 'rxjs';
+import { AndroidPermissionsService } from '@app/services';
+import {
+  AndroidPermissionsStatus,
+  AndroidPermission
+} from '@app/services/android-permissions/android-permission';
+import { AppVersion } from '@ionic-native/app-version/ngx';
+import { SbProgressLoader } from '@app/services/sb-progress-loader.service';
+import { FileOpener } from '@ionic-native/file-opener/ngx';
+import { TranslateService } from '@ngx-translate/core';
+import { FieldConfig } from 'common-form-elements';
+import { CertificateDownloadAsPdfService } from 'sb-svg2pdf';
+import { NavigationService } from '@app/services/navigation-handler.service';
+import { ContentUtil } from '@app/util/content-util';
+import { CsPrimaryCategory } from '@project-sunbird/client-services/services/content';
+import { FormConstants } from '../form.constants';
+import { ProfileHandler } from '@app/services/profile-handler';
+import { TagPrefixConstants } from '@app/services/segmentation-tag/segmentation-tag.service';
 
 @Component({
   selector: 'app-profile',
   templateUrl: './profile.page.html',
   styleUrls: ['./profile.page.scss'],
+  providers: [CertificateDownloadAsPdfService]
 })
 export class ProfilePage implements OnInit {
 
+  @ViewChild('refresher', { static: false }) refresher: IonRefresher;
+
   profile: any = {};
   userId = '';
   isLoggedInUser = false;
@@ -57,19 +92,18 @@ export class ProfilePage implements OnInit {
   refresh: boolean;
   profileName: string;
   onProfile = true;
-  trainingsCompleted = [];
   roles = [];
-  userLocation = {
-    state: {},
-    district: {}
-  };
+  userLocation = {};
+  appName = '';
 
   imageUri = 'assets/imgs/ic_profile_default.png';
 
-  readonly DEFAULT_PAGINATION_LIMIT = 2;
+  readonly DEFAULT_PAGINATION_LIMIT = 3;
+  readonly DEFAULT_ENROLLED_COURSE_LIMIT = 3;
   rolesLimit = 2;
   badgesLimit = 2;
-  trainingsLimit = 2;
+  myLearningLimit = this.DEFAULT_ENROLLED_COURSE_LIMIT;
+  learnerPassbookLimit = this.DEFAULT_ENROLLED_COURSE_LIMIT;
   startLimit = 0;
   custodianOrgId: string;
   isCustodianOrgId: boolean;
@@ -85,16 +119,32 @@ export class ProfilePage implements OnInit {
   layoutPopular = ContentCard.LAYOUT_POPULAR;
   headerObservable: any;
   timer: any;
-  mappedTrainingCertificates: CourseCertificate[] = [];
-  isDefaultChannelProfile$: Observable<boolean>;
+  mappedTrainingCertificates: {
+    courseName: string,
+    batch: Batch,
+    dateTime: string,
+    courseId: string,
+    certificate?: string,
+    issuedCertificate?: string,
+    status: number,
+    style: string,
+    label: string
+  }[] = [];
+  isDefaultChannelProfile: boolean;
+  personaTenantDeclaration: string;
+  selfDeclaredDetails: any[] = [];
+  selfDeclarationInfo: any;
+  learnerPassbook: any[] = [];
+  learnerPassbookCount: any;
 
   constructor(
     @Inject('PROFILE_SERVICE') private profileService: ProfileService,
     @Inject('AUTH_SERVICE') private authService: AuthService,
     @Inject('CONTENT_SERVICE') private contentService: ContentService,
     @Inject('COURSE_SERVICE') private courseService: CourseService,
+    @Inject('FORM_SERVICE') private formService: FormService,
+    @Inject('FRAMEWORK_SERVICE') private frameworkService: FrameworkService,
     private zone: NgZone,
-    private route: ActivatedRoute,
     private router: Router,
     private popoverCtrl: PopoverController,
     private events: Events,
@@ -102,8 +152,17 @@ export class ProfilePage implements OnInit {
     private telemetryGeneratorService: TelemetryGeneratorService,
     private formAndFrameworkUtilService: FormAndFrameworkUtilService,
     private commonUtilService: CommonUtilService,
-    private socialShare: SocialSharing,
+    private socialSharing: SocialSharing,
     private headerService: AppHeaderService,
+    private permissionService: AndroidPermissionsService,
+    private appVersion: AppVersion,
+    private navService: NavigationService,
+    private sbProgressLoader: SbProgressLoader,
+    private fileOpener: FileOpener,
+    private toastController: ToastController,
+    private translate: TranslateService,
+    private certificateDownloadAsPdfService: CertificateDownloadAsPdfService,
+    private profileHandler: ProfileHandler
   ) {
     const extrasState = this.router.getCurrentNavigation().extras.state;
     if (extrasState) {
@@ -120,8 +179,16 @@ export class ProfilePage implements OnInit {
     });
 
     this.events.subscribe('loggedInProfile:update', (framework) => {
-      this.updateLocalProfile(framework);
-      this.refreshProfileData();
+      if (framework) {
+        this.updateLocalProfile(framework);
+        this.refreshProfileData();
+      } else {
+        this.doRefresh();
+      }
+    });
+
+    this.events.subscribe(EventTopics.SIGN_IN_RELOAD, async (data) => {
+      this.doRefresh();
     });
 
     this.formAndFrameworkUtilService.getCustodianOrgId().then((orgId: string) => {
@@ -130,13 +197,9 @@ export class ProfilePage implements OnInit {
 
   }
 
-  ngOnInit() {
+  async ngOnInit() {
     this.doRefresh();
-    this.events.subscribe('profilePicture:update', (res) => {
-      if (res.isUploading && res.url !== '') {
-        this.imageUri = res.url;
-      }
-    });
+    this.appName = await this.appVersion.getAppName();
   }
 
   ionViewWillEnter() {
@@ -147,21 +210,24 @@ export class ProfilePage implements OnInit {
       this.handleHeaderEvents(eventName);
     });
     this.headerService.showHeaderWithHomeButton();
-    this.isDefaultChannelProfile$ = this.profileService.isDefaultChannelProfile();
   }
 
   ionViewWillLeave(): void {
     this.headerObservable.unsubscribe();
     this.events.unsubscribe('update_header');
+    this.refresher.disabled = true;
   }
 
+  ionViewDidEnter() {
+    this.refresher.disabled = false;
+  }
 
   async doRefresh(refresher?) {
     const loader = await this.commonUtilService.getLoader();
     this.isRefreshProfile = true;
     if (!refresher) {
       await loader.present();
-    } else {
+    } else if (refresher.target) {
       this.telemetryGeneratorService.generatePullToRefreshTelemetry(PageId.PROFILE, Environment.HOME);
       refresher.target.complete();
       this.refresh = true;
@@ -173,16 +239,17 @@ export class ProfilePage implements OnInit {
             this.events.publish('refresh:profile');
             this.refresh = false;
             await loader.dismiss();
+            await this.sbProgressLoader.hide({ id: 'login' });
             resolve();
           }, 500);
           // This method is used to handle trainings completed by user
-
-          this.getEnrolledCourses();
+          this.getLearnerPassbook();
+          this.getEnrolledCourses(refresher);
           this.searchContent();
+          this.getSelfDeclaredDetails();
         });
       })
       .catch(async error => {
-        console.error('Error while Fetching Data', error);
         this.refresh = false;
         await loader.dismiss();
       });
@@ -221,9 +288,26 @@ export class ProfilePage implements OnInit {
           }
           that.profileService.getServerProfilesDetails(serverProfileDetailsRequest).toPromise()
             .then((profileData) => {
-              that.zone.run(() => {
+              that.zone.run(async () => {
                 that.resetProfile();
                 that.profile = profileData;
+                // ******* Segmentation
+                window['segmentation'].SBTagService.pushTag(profileData.framework, TagPrefixConstants.USER_ATRIBUTE, true);
+                let userLocation = [];
+                (profileData['userLocations'] || []).forEach(element => {
+                  userLocation.push({ name: element.name, code: element.code });
+                });
+                window['segmentation'].SBTagService.pushTag({ location: userLocation }, TagPrefixConstants.USER_LOCATION, true);
+                // *******
+                that.frameworkService.setActiveChannelId(profileData.rootOrg.hashTagId).toPromise();
+                that.isDefaultChannelProfile = await that.profileService.isDefaultChannelProfile().toPromise();
+                const role: string = (!that.profile.profileUserType.type ||
+                  (that.profile.profileUserType.type
+                    && that.profile.profileUserType.type === ProfileType.OTHER.toUpperCase())) ? '' : that.profile.profileUserType.type;
+                that.profile['persona'] =  await that.profileHandler.getPersonaConfig(role.toLowerCase());
+                that.userLocation = that.commonUtilService.getUserLocation(that.profile);
+                that.profile['subPersona'] = await that.profileHandler.getSubPersona(that.profile.profileUserType.subType,
+                      role.toLowerCase(), this.userLocation);
                 that.profileService.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS }).toPromise()
                   .then((activeProfile) => {
                     that.formAndFrameworkUtilService.updateLoggedInUser(profileData, activeProfile)
@@ -236,20 +320,16 @@ export class ProfilePage implements OnInit {
                           }); */
 
                           // Need to test thoroughly
-                          that.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.CATEGORIES_EDIT}`], {
-                            state: {
-                              showOnlyMandatoryFields: true,
-                              profile: frameWorkData['activeProfileData']
-                            }
-                          });
+                          // that.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.CATEGORIES_EDIT}`], {
+                          //   state: {
+                          //     showOnlyMandatoryFields: true,
+                          //     profile: frameWorkData['activeProfileData']
+                          //   }
+                          // });
                         }
                       });
-                    if (profileData && profileData.avatar) {
-                      that.imageUri = profileData.avatar;
-                    }
                     that.formatRoles();
                     that.getOrgDetails();
-                    that.userLocation = that.commonUtilService.getUserLocation(that.profile);
                     that.isCustodianOrgId = (that.profile.rootOrg.rootOrgId === this.custodianOrgId);
                     that.isStateValidated = that.profile.stateValidated;
                     resolve();
@@ -266,13 +346,6 @@ export class ProfilePage implements OnInit {
     });
   }
 
-  /**
-   * Method to convert Array to Comma separated string
-   */
-  arrayToString(stringArray: Array<string>): string {
-    return stringArray.join(', ');
-  }
-
   /**
    * Method to store all roles from different organizations into single array
    */
@@ -296,7 +369,7 @@ export class ProfilePage implements OnInit {
    */
   showMoreItems(): void {
     this.rolesLimit = this.roles.length;
-    generateInteractTelemetry(
+    this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
       InteractSubtype.VIEW_MORE_CLICKED,
       Environment.HOME,
@@ -315,7 +388,7 @@ export class ProfilePage implements OnInit {
 
   showMoreBadges(): void {
     this.badgesLimit = this.profile.badgeAssertions.length;
-    generateInteractTelemetry(
+    this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
       InteractSubtype.VIEW_MORE_CLICKED,
       Environment.HOME,
@@ -328,9 +401,17 @@ export class ProfilePage implements OnInit {
     this.badgesLimit = this.DEFAULT_PAGINATION_LIMIT;
   }
 
-  showMoreTrainings(): void {
-    this.trainingsLimit = this.trainingsCompleted.length;
-    generateInteractTelemetry(
+  async showMoreTrainings(listName): Promise<void> {
+    switch (listName) {
+      case 'myLearning':
+        this.myLearningLimit = this.mappedTrainingCertificates.length;
+        break;
+      case 'learnerPassbook':
+        await this.getLearnerPassbook();
+        this.learnerPassbookLimit = this.learnerPassbook.length;
+        break;
+    }
+    this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
       InteractSubtype.VIEW_MORE_CLICKED,
       Environment.HOME,
@@ -339,45 +420,53 @@ export class ProfilePage implements OnInit {
       undefined);
   }
 
-  showLessTrainings(): void {
-    this.trainingsLimit = this.DEFAULT_PAGINATION_LIMIT;
-  }
-
-
-  /**
-   *  Returns the Object with given Keys only
-   * @param keys - Keys of the object which are required in new sub object
-   * @param obj - Actual object
-   */
-  getSubset(keys, obj) {
-    return keys.reduce((a, c) => ({ ...a, [c]: obj[c] }), {});
+  showLessTrainings(listName): void {
+    switch (listName) {
+      case 'myLearning':
+        this.myLearningLimit = this.DEFAULT_ENROLLED_COURSE_LIMIT;
+        break;
+      case 'learnerPassbook':
+        this.learnerPassbookLimit = this.DEFAULT_ENROLLED_COURSE_LIMIT;
+        this.learnerPassbookCount = null;
+        this.getLearnerPassbook();
+        break;
+    }
   }
 
-
-
   /**
    * To get enrolled course(s) of logged-in user i.e, trainings in the UI.
    *
    * It internally calls course handler of genie sdk
    */
-  getEnrolledCourses() {
+  async getEnrolledCourses(refresher?, refreshCourseList?) {
+    const loader = await this.commonUtilService.getLoader();
+    if (refreshCourseList) {
+      await loader.present();
+      this.telemetryGeneratorService.generateInteractTelemetry(
+        InteractType.TOUCH,
+        InteractSubtype.REFRESH_CLICKED,
+        Environment.USER,
+        PageId.PROFILE
+      );
+    }
     const option = {
-      userId: this.profile.userId,
-      refreshEnrolledCourses: false,
-      returnRefreshedEnrolledCourses: true
+      userId: this.profile.userId || this.profile.id,
+      returnFreshCourses: !!refresher
     };
-    this.trainingsCompleted = [];
+    this.mappedTrainingCertificates = [];
     this.courseService.getEnrolledCourses(option).toPromise()
-      .then((res: Course[]) => {
-        this.trainingsCompleted = res.filter((course) => course.status === 2);
-        this.mappedTrainingCertificates = this.mapTrainingsToCertificates(this.trainingsCompleted);
+      .then(async (res: Course[]) => {
+        if (res.length) {
+          this.mappedTrainingCertificates = this.mapTrainingsToCertificates(res);
+        }
+        refreshCourseList ? await loader.dismiss() : false;
       })
       .catch((error: any) => {
         console.error('error while loading enrolled courses', error);
       });
   }
 
-  mapTrainingsToCertificates(trainings: Course[]): CourseCertificate[] {
+  mapTrainingsToCertificates(trainings: Course[]) {
     /**
      * If certificate is there loop through certificates and add certificates in accumulator
      * with Course_Name and Date
@@ -386,62 +475,163 @@ export class ProfilePage implements OnInit {
     return trainings.reduce((accumulator, course) => {
       const oneCert = {
         courseName: course.courseName,
+        batch: course.batch,
         dateTime: course.dateTime,
         courseId: course.courseId,
-        certificate: undefined
+        certificate: undefined,
+        issuedCertificate: undefined,
+        status: course.status,
+        style: 'completed-status-text',
+        label: 'COMPLETED'
       };
+      if(course.status === 0 || course.status === 1) {
+        oneCert.style = 'ongoing-status-text';
+        oneCert.label = 'ONGOING';
+        if(course.batch && course.batch.status === 2) {
+          oneCert.style = 'ongoing-status-text';
+          oneCert.label = 'BATCH_EXPIRED';
+        }
+      }
       if (course.certificates && course.certificates.length) {
         oneCert.certificate = course.certificates[0];
-        accumulator = accumulator.concat(oneCert);
-      } else {
-        accumulator = accumulator.concat(oneCert);
       }
+      if (course.issuedCertificates && course.issuedCertificates.length) {
+        oneCert.issuedCertificate = course.issuedCertificates[0];
+      }
+      accumulator = accumulator.concat(oneCert);
       return accumulator;
     }, []);
   }
 
-  // getCertificateCourse(certificate: CourseCertificate): Course {
-  //   return this.trainingsCompleted.find((course: Course) => {
-  //     return course.certificates ? course.certificates.indexOf(certificate) > -1 : undefined;
-  //   });
-  // }
+  async getLearnerPassbook() {
+    try {
+      const request: GetLearnerCerificateRequest = { userId: this.profile.userId || this.profile.id };
+      this.learnerPassbookCount ? request.size = this.learnerPassbookCount : null;
+      await this.courseService.getLearnerCertificates(request).toPromise().then(response => {
+        this.learnerPassbookCount = response.count;
+
+        this.learnerPassbook = response.content.filter((learnerCertificate: any) => (learnerCertificate &&
+          learnerCertificate._source && learnerCertificate._source.data && learnerCertificate._source.data.badge))
+          .map((learnerCertificate: any) => {
+            const oneCert: any = {
+              issuingAuthority: learnerCertificate._source.data.badge.issuer.name,
+              issuedOn: learnerCertificate._source.data.issuedOn,
+              courseName: learnerCertificate._source.data.badge.name,
+              courseId: learnerCertificate._source.related.courseId || learnerCertificate._source.related.Id
+            };
+            if (learnerCertificate._source.pdfUrl) {
+              oneCert.certificate = {
+                url: learnerCertificate._source.pdfUrl || undefined,
+                id: learnerCertificate._id || undefined,
+                issuedOn: learnerCertificate._source.data.issuedOn,
+                name: learnerCertificate._source.data.badge.issuer.name
+              };
+            } else {
+              oneCert.issuedCertificate = {
+                identifier: learnerCertificate._id,
+                name: learnerCertificate._source.data.badge.issuer.name,
+                issuedOn: learnerCertificate._source.data.issuedOn
+              };
+            }
+            return oneCert;
+          });
+      });
+    } catch (error) {
+      console.log('Learner Passbook API Error', error);
+    }
+  }
 
-  downloadTrainingCertificate(course: Course, certificate: CourseCertificate) {
-    const telemetryObject: TelemetryObject = new TelemetryObject(certificate.id, ContentType.CERTIFICATE, undefined);
+  async downloadTrainingCertificate(course: {
+    courseName: string,
+    dateTime: string,
+    courseId: string,
+    certificate?: CourseCertificate,
+    issuedCertificate?: CourseCertificate,
+    status: number
+  }) {
+    const telemetryObject: TelemetryObject = new TelemetryObject(course.courseId, 'Certificate', undefined);
 
     const values = new Map();
     values['courseId'] = course.courseId;
 
     this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
       InteractSubtype.DOWNLOAD_CERTIFICATE_CLICKED,
-      Environment.USER, // env
-      PageId.PROFILE, // page name
+      Environment.USER,
+      PageId.PROFILE,
       telemetryObject,
       values);
+    await this.checkForPermissions().then(async (result) => {
+      if (result) {
+        if (course.issuedCertificate) {
+          const request = { courseId: course.courseId, certificate: course.issuedCertificate };
+          if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+            if (!(await this.courseService.certificateManager.isCertificateCached(request).toPromise())) {
+              this.commonUtilService.showToast('OFFLINE_CERTIFICATE_MESSAGE', false, '', 3000, 'top');
+              return;
+            }
+          }
 
-    this.courseService.downloadCurrentProfileCourseCertificate({
-      courseId: course.courseId,
-      certificateToken: certificate.token
-    })
-      .subscribe();
+          this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.CERTIFICATE_VIEW}`], {
+            state: { request }
+          });
+        } else {
+          if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+            this.commonUtilService.showToast('OFFLINE_CERTIFICATE_MESSAGE', false, '', 3000, 'top');
+            return;
+          }
+          const downloadMessage = await this.translate.get('CERTIFICATE_DOWNLOAD_INFO').toPromise();
+          const toastOptions = {
+            message: downloadMessage || 'Certificate getting downloaded'
+          };
+          const toast = await this.toastController.create(toastOptions);
+          await toast.present();
+
+          await this.downloadLegacyCertificate(course, toast);
+        }
+      } else {
+        this.commonUtilService.showSettingsPageToast('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, PageId.PROFILE, true);
+      }
+    });
   }
 
-  shareTrainingCertificate(course: Course, certificate: CourseCertificate) {
-    this.courseService.downloadCurrentProfileCourseCertificate({
+  private async downloadLegacyCertificate(course, toast) {
+    const downloadRequest = {
       courseId: course.courseId,
-      certificateToken: certificate.token
-    })
-      .subscribe((res) => {
-        this.socialShare.share('', '', res.path, '');
+      certificate: course.certificate
+    };
+    this.courseService.downloadCurrentProfileCourseCertificate(downloadRequest).toPromise()
+      .then(async (res) => {
+        if (toast) {
+          await toast.dismiss();
+        }
+        this.openpdf(res.path);
+      }).catch(async (err) => {
+        await this.handleCertificateDownloadIssue(toast, err);
       });
   }
 
-  isResource(contentType) {
-    return contentType === ContentType.STORY ||
-      contentType === ContentType.WORKSHEET;
+  private async handleCertificateDownloadIssue(toast: any, err: any) {
+    if (toast) {
+      await toast.dismiss();
+    }
+    if (err instanceof CertificateAlreadyDownloaded) {
+      this.openpdf(err.filePath);
+    } else if (NetworkError.isInstance(err)) {
+      this.commonUtilService.showToast('OFFLINE_CERTIFICATE_MESSAGE', false, '', 3000, 'top');
+    } else {
+      this.commonUtilService.showToast(this.commonUtilService.translateMessage('SOMETHING_WENT_WRONG'));
+    }
   }
 
-
+  openpdf(path) {
+    this.fileOpener
+      .open(path, 'application/pdf')
+      .then(() => console.log('File is opened'))
+      .catch((e) => {
+        console.log('Error opening file', e);
+        this.commonUtilService.showToast('CERTIFICATE_ALREADY_DOWNLOADED');
+      });
+  }
 
   /**
    * Navigate to the course/content details page
@@ -450,14 +640,11 @@ export class ProfilePage implements OnInit {
     const identifier = content.contentId || content.identifier;
     let telemetryObject: TelemetryObject;
     if (layoutName === ContentCard.LAYOUT_INPROGRESS) {
-      telemetryObject = new TelemetryObject(identifier, ContentType.COURSE, undefined);
+      telemetryObject = new TelemetryObject(identifier, CsPrimaryCategory.COURSE, undefined);
     } else {
-      const telemetryObjectType = this.isResource(content.contentType) ? ContentType.RESOURCE : content.contentType;
-      telemetryObject = new TelemetryObject(identifier, telemetryObjectType, undefined);
-
+      telemetryObject = ContentUtil.getTelemetryObject(content);
     }
 
-
     const values = new Map();
     values['sectionName'] = 'Contributions';
     values['positionClicked'] = index;
@@ -468,28 +655,12 @@ export class ProfilePage implements OnInit {
       PageId.PROFILE,
       telemetryObject,
       values);
-    if (content.contentType === ContentType.COURSE) {
-      const navigationExtras: NavigationExtras = {
-        state: {
-          content
-        }
-      };
-      this.router.navigate([RouterLinks.ENROLLED_COURSE_DETAILS], navigationExtras)
-    } else if (content.mimeType === MimeType.COLLECTION) {
-      const navigationExtras: NavigationExtras = {
-        state: {
-          content
-        }
-      };
-      this.router.navigate([RouterLinks.COLLECTION_DETAIL_ETB], navigationExtras);
-    } else {
-      const navigationExtras: NavigationExtras = {
-        state: {
-          content
-        }
-      };
-      this.router.navigate([RouterLinks.CONTENT_DETAILS], navigationExtras);
-    }
+    this.navService.navigateToDetailPage(
+      content,
+      {
+        content
+      }
+    );
   }
 
   updateLocalProfile(framework) {
@@ -497,6 +668,9 @@ export class ProfilePage implements OnInit {
     this.profileService.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS })
       .toPromise()
       .then((resp: any) => {
+        if (framework.userType) {
+          resp.profileType = framework.userType;
+        }
         this.formAndFrameworkUtilService.updateLoggedInUser(this.profile, resp)
           .then((success) => {
             console.log('updateLocalProfile-- ', success);
@@ -517,29 +691,10 @@ export class ProfilePage implements OnInit {
     }
   }
 
-  navigateToEditPersonalDetails() {
-    if (this.commonUtilService.networkInfo.isNetworkAvailable) {
-      this.telemetryGeneratorService.generateInteractTelemetry(
-        InteractType.TOUCH,
-        InteractSubtype.EDIT_CLICKED,
-        Environment.HOME,
-        PageId.PROFILE, null);
-
-      const navigationExtras: NavigationExtras = {
-        state: {
-          profile: this.profile,
-          isShowBackButton: true
-        }
-      };
-
-      // this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.PERSONAL_DETAILS_EDIT}`], navigationExtras);
-      this.router.navigate([RouterLinks.DISTRICT_MAPPING], navigationExtras);
-    } else {
-      this.commonUtilService.showToast('NEED_INTERNET_TO_CHANGE');
-    }
+  onEditProfileClicked() {
+    this.navService.navigateToEditPersonalDetails(this.profile, PageId.PROFILE);
   }
 
-
   /**
    * Searches contents created by the user
    */
@@ -568,9 +723,7 @@ export class ProfilePage implements OnInit {
       });
   }
 
-
-
-  async editMobileNumber(event) {
+  async editMobileNumber() {
     const componentProps = {
       phone: this.profile.phone,
       title: this.profile.phone ?
@@ -584,7 +737,7 @@ export class ProfilePage implements OnInit {
     await this.showEditContactPopup(componentProps);
   }
 
-  async editEmail(event) {
+  async editEmail() {
     const componentProps = {
       email: this.profile.email,
       title: this.profile.email ?
@@ -598,7 +751,7 @@ export class ProfilePage implements OnInit {
     await this.showEditContactPopup(componentProps);
   }
 
-  async showEditContactPopup(componentProps) {
+  private async showEditContactPopup(componentProps) {
     const popover = await this.popoverCtrl.create({
       component: EditContactDetailsPopupComponent,
       componentProps,
@@ -608,11 +761,11 @@ export class ProfilePage implements OnInit {
     const { data } = await popover.onDidDismiss();
 
     if (data && data.isEdited) {
-      this.callOTPPopover(componentProps.type, data.value);
+      await this.callOTPPopover(componentProps.type, data.value);
     }
   }
 
-  async callOTPPopover(type: string, key?: any) {
+  private async callOTPPopover(type: string, key?: any) {
     if (type === ProfileConstants.CONTACT_TYPE_PHONE) {
       const componentProps = {
         key,
@@ -644,7 +797,7 @@ export class ProfilePage implements OnInit {
     }
   }
 
-  async openContactVerifyPopup(component, componentProps, cssClass) {
+  private async openContactVerifyPopup(component, componentProps, cssClass) {
     const popover = await this.popoverCtrl.create({ component, componentProps, cssClass });
     await popover.present();
     const { data } = await popover.onDidDismiss();
@@ -652,7 +805,7 @@ export class ProfilePage implements OnInit {
     return data;
   }
 
-  async updatePhoneInfo(phone) {
+  private async updatePhoneInfo(phone) {
     const req: UpdateServerProfileInfoRequest = {
       userId: this.profile.userId,
       phone,
@@ -661,7 +814,7 @@ export class ProfilePage implements OnInit {
     await this.updateProfile(req, 'PHONE_UPDATE_SUCCESS');
   }
 
-  async updateEmailInfo(email) {
+  private async updateEmailInfo(email) {
     const req: UpdateServerProfileInfoRequest = {
       userId: this.profile.userId,
       email,
@@ -670,14 +823,14 @@ export class ProfilePage implements OnInit {
     await this.updateProfile(req, 'EMAIL_UPDATE_SUCCESS');
   }
 
-  async updateProfile(request: UpdateServerProfileInfoRequest, successMessage: string) {
+  private async updateProfile(request: UpdateServerProfileInfoRequest, successMessage: string) {
     const loader = await this.commonUtilService.getLoader();
     this.profileService.updateServerProfile(request).toPromise()
       .then(async () => {
         await loader.dismiss();
         this.doRefresh();
         this.commonUtilService.showToast(this.commonUtilService.translateMessage(successMessage));
-      }).catch(async (e) => {
+      }).catch(async () => {
         await loader.dismiss();
         this.commonUtilService.showToast(this.commonUtilService.translateMessage('SOMETHING_WENT_WRONG'));
       });
@@ -721,7 +874,7 @@ export class ProfilePage implements OnInit {
   }
 
 
-  dismissMessage() {
+  private dismissMessage() {
     this.timer = setTimeout(() => {
       this.informationProfileName = false;
       this.informationOrgName = false;
@@ -778,14 +931,158 @@ export class ProfilePage implements OnInit {
     }
   }
 
-  async showTeacherIdVerificationPopup() {
-    const popover = await this.popoverCtrl.create({
-      component: TeacherIdVerificationComponent,
-      backdropDismiss: false,
-      cssClass: 'popover-alert'
+  async openEnrolledCourse(training) {
+    try {
+      const content = await this.contentService.getContentDetails({ contentId: training.courseId }).toPromise();
+      console.log('Content Data', content);
+      this.navService.navigateToTrackableCollection(
+        {
+          content,
+          resumeCourseFlag: (training.status === 1 || training.status === 0) && !(training.batch.status === 2)
+        }
+      );
+    } catch (err) {
+      console.error(err);
+    }
+  }
+
+  private async checkForPermissions(): Promise<boolean | undefined> {
+    return new Promise<boolean | undefined>(async (resolve) => {
+      const permissionStatus = await this.commonUtilService.getGivenPermissionStatus(AndroidPermission.WRITE_EXTERNAL_STORAGE);
+      if (permissionStatus.hasPermission) {
+        resolve(true);
+      } else if (permissionStatus.isPermissionAlwaysDenied) {
+        await this.commonUtilService.showSettingsPageToast('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, PageId.PROFILE, true);
+        resolve(false);
+      } else {
+        this.showStoragePermissionPopup().then((result) => {
+          if (result) {
+            resolve(true);
+          } else {
+            resolve(false);
+          }
+        });
+      }
     });
+  }
 
-    await popover.present();
+  private async showStoragePermissionPopup(): Promise<boolean | undefined> {
+    // await this.popoverCtrl.dismiss();
+    return new Promise<boolean | undefined>(async (resolve) => {
+      const confirm = await this.commonUtilService.buildPermissionPopover(
+        async (selectedButton: string) => {
+          if (selectedButton === this.commonUtilService.translateMessage('NOT_NOW')) {
+            this.telemetryGeneratorService.generateInteractTelemetry(
+              InteractType.TOUCH,
+              InteractSubtype.NOT_NOW_CLICKED,
+              Environment.SETTINGS,
+              PageId.PERMISSION_POPUP);
+            await this.commonUtilService.showSettingsPageToast('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, PageId.PROFILE, true);
+          } else if (selectedButton === this.commonUtilService.translateMessage('ALLOW')) {
+            this.telemetryGeneratorService.generateInteractTelemetry(
+              InteractType.TOUCH,
+              InteractSubtype.ALLOW_CLICKED,
+              Environment.SETTINGS,
+              PageId.PERMISSION_POPUP);
+            this.appGlobalService.isNativePopupVisible = true;
+            this.permissionService.requestPermission(AndroidPermission.WRITE_EXTERNAL_STORAGE)
+              .subscribe(async (status: AndroidPermissionsStatus) => {
+                if (status.hasPermission) {
+                  this.telemetryGeneratorService.generateInteractTelemetry(
+                    InteractType.TOUCH,
+                    InteractSubtype.ALLOW_CLICKED,
+                    Environment.SETTINGS,
+                    PageId.APP_PERMISSION_POPUP
+                  );
+                  resolve(true);
+                } else if (status.isPermissionAlwaysDenied) {
+                  await this.commonUtilService.showSettingsPageToast
+                    ('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, PageId.PROFILE, true);
+                  resolve(false);
+                } else {
+                  this.telemetryGeneratorService.generateInteractTelemetry(
+                    InteractType.TOUCH,
+                    InteractSubtype.DENY_CLICKED,
+                    Environment.SETTINGS,
+                    PageId.APP_PERMISSION_POPUP
+                  );
+                  await this.commonUtilService.showSettingsPageToast
+                    ('FILE_MANAGER_PERMISSION_DESCRIPTION', this.appName, PageId.PROFILE, true);
+                }
+                this.appGlobalService.setNativePopupVisible(false);
+                resolve(undefined);
+              });
+          }
+        }, this.appName, this.commonUtilService.translateMessage
+        ('FILE_MANAGER'), 'FILE_MANAGER_PERMISSION_DESCRIPTION', PageId.PROFILE, true
+      );
+      await confirm.present();
+    });
+  }
+
+  openSelfDeclareTeacherForm(type) {
+    if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+      this.commonUtilService.showToast('NEED_INTERNET_TO_CHANGE');
+    }
+    const telemetryId = type === 'add' ? ID.BTN_I_AM_A_TEACHER : ID.BTN_UPDATE;
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      '',
+      Environment.USER,
+      PageId.PROFILE,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      telemetryId
+    );
+
+    this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.SELF_DECLARED_TEACHER_EDIT}/${type}`], {
+      state: {
+        profile: this.profile
+      }
+    });
+  }
+
+  async getSelfDeclaredDetails() {
+
+    if (this.isCustodianOrgId && this.profile && this.profile.declarations && this.profile.declarations.length) {
+      this.selfDeclarationInfo = this.profile.declarations[0];
+      const tenantPersonaList = await this.formAndFrameworkUtilService.getFormFields(
+        FormConstants.TENANT_PERSONAINFO, this.profile.rootOrg.rootOrgId);
+      const tenantConfig: any = tenantPersonaList.find(config => config.code === 'tenant');
+      const tenantDetails = tenantConfig.templateOptions && tenantConfig.templateOptions.options &&
+        tenantConfig.templateOptions.options.find(tenant => tenant.value === this.selfDeclarationInfo.orgId);
+
+      this.personaTenantDeclaration = this.commonUtilService.translateMessage('FRMELEMNTS_LBL_SHARE_DATA_WITH', {
+          '%tenant': (tenantDetails && tenantDetails.label) || ''
+        });
+
+      if (this.selfDeclarationInfo.orgId) {
+        const formConfig = await this.formAndFrameworkUtilService.getFormFields(
+          FormConstants.SELF_DECLARATION, this.selfDeclarationInfo.orgId);
+        const externalIdConfig = formConfig.find(config => config.code === 'externalIds');
+        this.selfDeclaredDetails = [];
+        (externalIdConfig.children as FieldConfig<any>[]).forEach(config => {
+          if (this.profile.declarations[0].info[config.code]) {
+            this.selfDeclaredDetails.push({ name: config.fieldName, value: this.profile.declarations[0].info[config.code] });
+          }
+        });
+      }
+    }
+  }
+
+  shareUsername() {
+    let fullName = this.profile.firstName;
+    if (this.profile.lastName) {
+      fullName = fullName + ' ' + this.profile.lastName;
+    }
+    const translatedMsg = this.commonUtilService.translateMessage('SHARE_USERNAME', {
+      app_name: this.appName,
+      user_name: fullName,
+      diksha_id: this.profile.userName
+    });
+    this.socialSharing.share(translatedMsg);
   }
 
 }
diff --git a/src/app/profile/self-declared-teacher-edit/self-declared-teacher-edit.module.ts b/src/app/profile/self-declared-teacher-edit/self-declared-teacher-edit.module.ts
new file mode 100644
index 000000000..5028842bd
--- /dev/null
+++ b/src/app/profile/self-declared-teacher-edit/self-declared-teacher-edit.module.ts
@@ -0,0 +1,33 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { Routes, RouterModule } from '@angular/router';
+
+import { IonicModule } from '@ionic/angular';
+
+import { TranslateModule } from '@ngx-translate/core';
+import { SelfDeclaredTeacherEditPage } from './self-declared-teacher-edit.page';
+import { ComponentsModule } from '@app/app/components/components.module';
+import { CommonFormElementsModule } from 'common-form-elements';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: SelfDeclaredTeacherEditPage
+  }
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    ReactiveFormsModule,
+    IonicModule,
+    RouterModule.forChild(routes),
+    TranslateModule,
+    ComponentsModule,
+    CommonFormElementsModule
+  ],
+  declarations: [SelfDeclaredTeacherEditPage]
+})
+export class SelfDeclaredTeacherEditPageModule {}
diff --git a/src/app/profile/self-declared-teacher-edit/self-declared-teacher-edit.page.html b/src/app/profile/self-declared-teacher-edit/self-declared-teacher-edit.page.html
new file mode 100644
index 000000000..9e5117a20
--- /dev/null
+++ b/src/app/profile/self-declared-teacher-edit/self-declared-teacher-edit.page.html
@@ -0,0 +1,30 @@
+<ion-content>
+
+  <p *ngIf="editType === 'add'" class="title">{{'PLEASE_PROVIDE_FOLLOWING_DETAILS' | translate}}</p>
+  <p *ngIf="editType === 'edit'" class="title">{{'UPDATE_DETAILS' | translate}}</p>
+
+  <div class="declaration-container">
+    <sb-form *ngIf="tenantPersonaForm && tenantPersonaForm.length"
+             [platform]="'mobile'"
+             [config]="tenantPersonaForm"
+             (initialize)="tenantPersonaFormValueChanges($event && $event.value); tenantPersonaFormStatusChanges($event);"
+             (valueChanges)="tenantPersonaFormValueChanges($event)"
+             (statusChanges)="tenantPersonaFormStatusChanges($event)">
+    </sb-form>
+    
+    <sb-form *ngIf="teacherDetailsForm && teacherDetailsForm.length"
+             [platform]="'mobile'"
+             [config]="teacherDetailsForm"
+             (valueChanges)="declarationFormValueChanges($event)"
+             (statusChanges)="declarationFormStatusChanges($event)"
+             (linkClicked)="linkClicked($event)">
+    </sb-form>
+  </div>
+
+</ion-content>
+<ion-footer>
+  <ion-button expand="block" [disabled]="!isTenantPersonaFormValid || !isDeclarationFormValid" class="M16 MB30" (click)="submit()">
+    <span *ngIf="editType === 'add'">{{'BTN_SUBMIT' | translate}}</span> 
+    <span *ngIf="editType === 'edit'">{{'UPDATE' | translate}}</span> 
+  </ion-button>
+</ion-footer>
diff --git a/src/app/profile/self-declared-teacher-edit/self-declared-teacher-edit.page.scss b/src/app/profile/self-declared-teacher-edit/self-declared-teacher-edit.page.scss
new file mode 100644
index 000000000..705624c6d
--- /dev/null
+++ b/src/app/profile/self-declared-teacher-edit/self-declared-teacher-edit.page.scss
@@ -0,0 +1,27 @@
+@import "src/assets/styles/_variables.scss";
+
+.title{
+    font-size: 16px;
+    font-weight: bold;
+    color: $blue;
+    margin: 16px 16px 8px;
+}
+
+.sub-title{
+    line-height: 1;
+    margin: 0 16px;
+}
+
+ion-button{
+    --background: #{$blue} !important;
+    height: 40px !important;
+    text-transform: capitalize !important;
+}
+
+.declaration-container {
+    margin: 0 16px;
+}
+
+ion-footer{
+    z-index: -10;
+}
diff --git a/src/app/profile/self-declared-teacher-edit/self-declared-teacher-edit.page.ts b/src/app/profile/self-declared-teacher-edit/self-declared-teacher-edit.page.ts
new file mode 100644
index 000000000..ea6619d97
--- /dev/null
+++ b/src/app/profile/self-declared-teacher-edit/self-declared-teacher-edit.page.ts
@@ -0,0 +1,480 @@
+import { Location } from '@angular/common';
+import { Component, Inject } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { FormConstants } from '@app/app/form.constants';
+import {
+  AppHeaderService,
+  AuditType, CommonUtilService,
+  CorReleationDataType, Environment,
+  FormAndFrameworkUtilService, ID,
+  ImpressionType, InteractSubtype, InteractType,
+  PageId, TelemetryGeneratorService
+} from '@app/services';
+import { ConsentService } from '@app/services/consent-service';
+import { FormValidationAsyncFactory } from '@app/services/form-validation-async-factory/form-validation-async-factory';
+import { Platform, PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { ConsentStatus } from '@project-sunbird/client-services/models';
+import { FieldConfig } from 'common-form-elements';
+import { Subscription } from 'rxjs';
+import {
+  AuditState,
+  Consent, CorrelationData, LocationSearchResult, ProfileService,
+  ServerProfile, SharedPreferences,
+  TelemetryObject
+} from 'sunbird-sdk';
+import { PreferenceKey, ProfileConstants } from '../../../app/app.constant';
+
+@Component({
+  selector: 'app-self-declared-teacher-edit',
+  templateUrl: './self-declared-teacher-edit.page.html',
+  styleUrls: ['./self-declared-teacher-edit.page.scss'],
+})
+export class SelfDeclaredTeacherEditPage {
+
+  private profile: ServerProfile | any;
+  private backButtonFunc: Subscription;
+  private availableLocationDistrict: string;
+  private availableLocationState: string;
+  private declaredLatestFormValue: any;
+  private tenantPersonaLatestFormValue: any;
+  private selectedStateCode: any;
+
+  editType = 'add';
+  isDeclarationFormValid = false;
+  isTenantPersonaFormValid = false;
+  stateList: LocationSearchResult[] = [];
+  districtList: LocationSearchResult[] = [];
+  teacherDetailsForm: FieldConfig<any>[] = [];
+  tenantPersonaForm: FieldConfig<any>[] = [];
+  appName = '';
+  selectedTenant = '';
+
+  constructor(
+    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+    @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
+    private headerService: AppHeaderService,
+    private commonUtilService: CommonUtilService,
+    private router: Router,
+    private location: Location,
+    private events: Events,
+    private platform: Platform,
+    private activatedRoute: ActivatedRoute,
+    private popoverCtrl: PopoverController,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+    private formValidationAsyncFactory: FormValidationAsyncFactory,
+    private formnFrameworkService: FormAndFrameworkUtilService,
+    private consentService: ConsentService
+  ) {
+    const navigation = this.router.getCurrentNavigation();
+    if (navigation && navigation.extras && navigation.extras.state) {
+      this.profile = navigation.extras.state.profile;
+    }
+    this.editType = this.activatedRoute.snapshot.params['mode'];
+  }
+
+  async ionViewWillEnter() {
+    this.handleDeviceBackButton();
+    this.headerService.showHeaderWithBackButton();
+    await this.checkLocationAvailability();
+
+    this.generateTelemetryInteract(InteractType.SUBMISSION_INITIATED, ID.TEACHER_DECLARATION);
+
+    this.telemetryGeneratorService.generateImpressionTelemetry(
+      ImpressionType.VIEW,
+      '',
+      PageId.TEACHER_SELF_DECLARATION,
+      Environment.USER,
+    );
+  }
+
+  async ionViewDidEnter() {
+    this.appName = await this.commonUtilService.getAppName();
+    this.getTenantPersonaForm();
+  }
+
+  async getTenantPersonaForm() {
+    const personaTenantFormData: FieldConfig<any>[] = await this.formnFrameworkService.getFormFields(FormConstants.TENANT_PERSONAINFO,
+      this.profile.rootOrg.rootOrgId);
+
+    this.selectedTenant = (this.profile.declarations && this.profile.declarations.length && this.profile.declarations[0].orgId) || '';
+
+    personaTenantFormData.forEach(config => {
+      if (config.code === 'persona') {
+        config.default = this.profile.declarations && this.profile.declarations.length && this.profile.declarations[0].persona;
+      } else if (config.code === 'tenant') {
+        config.default = this.profile.declarations && this.profile.declarations.length && this.profile.declarations[0].orgId;
+      }
+    });
+
+    this.tenantPersonaForm = personaTenantFormData;
+    if (this.selectedTenant) {
+      this.initTenantSpecificForm(this.selectedTenant, false);
+    }
+  }
+
+  async initTenantSpecificForm(rootOrgId?, isFormLoaded?) {
+    const formConfig = await this.formnFrameworkService.getFormFields(FormConstants.SELF_DECLARATION, rootOrgId);
+    this.translateLabels(formConfig as any);
+    if (formConfig.length) {
+      this.initializeFormData(formConfig, isFormLoaded);
+    }
+  }
+
+  private translateLabels(fieldConfig: FieldConfig<any>[]) {
+    fieldConfig.forEach((config) => {
+      if (config.templateOptions) {
+        config.templateOptions.label = config.templateOptions.label
+          ? this.commonUtilService.translateMessage(config.templateOptions.label) : '';
+        config.templateOptions.placeHolder = config.templateOptions.placeHolder
+          ? this.commonUtilService.translateMessage(config.templateOptions.placeHolder) : '';
+      }
+
+      if (config.validations && config.validations.length) {
+        config.validations.forEach(validation => {
+          validation.message = validation.message ? this.commonUtilService.translateMessage(validation.message) : '';
+        });
+      }
+
+      if (config.asyncValidation && config.asyncValidation.message) {
+        config.asyncValidation.message = this.commonUtilService.translateMessage(config.asyncValidation.message);
+      }
+
+      if (config.templateOptions && config.templateOptions.labelHtml && config.templateOptions.labelHtml.values) {
+        for (const key in config.templateOptions.labelHtml.values) {
+          if (config.templateOptions.labelHtml.values[key]) {
+            if (config.code === 'tnc' && key === '$tnc') {
+              config.templateOptions.labelHtml.values[key] =
+                this.commonUtilService.translateMessage(config.templateOptions.labelHtml.values[key], { '%appName': this.appName });
+            }
+            if (config.code === 'tnc' && key === '$url') {
+              config.templateOptions.labelHtml.values[key] = this.profile.tncLatestVersionUrl || 'TNC_URL';
+            }
+            config.templateOptions.labelHtml.values[key] =
+              this.commonUtilService.translateMessage(config.templateOptions.labelHtml.values[key]);
+          }
+        }
+      }
+
+      if (config.children && config.children.length) {
+        this.translateLabels(config.children as FieldConfig<any>[]);
+      }
+    });
+  }
+
+  async initializeFormData(formConfig, isFormLoaded) {
+
+    this.teacherDetailsForm = formConfig.map((config: FieldConfig<any>) => {
+      if (config.code === 'externalIds' && config.children) {
+        config.children = (config.children as FieldConfig<any>[]).map((childConfig: FieldConfig<any>) => {
+          if (childConfig.asyncValidation) {
+            childConfig = this.assignDefaultValue(childConfig, false);
+
+            const telemetryData = {
+              type: InteractType.TOUCH,
+              subType: '',
+              env: Environment.USER,
+              pageId: PageId.TEACHER_SELF_DECLARATION,
+              id: ''
+            };
+
+            if (childConfig.asyncValidation.marker === 'MOBILE_OTP_VALIDATION') {
+              telemetryData['id'] = ID.VALIDATE_MOBILE;
+              childConfig.asyncValidation.asyncValidatorFactory =
+                this.formValidationAsyncFactory.mobileVerificationAsyncFactory(
+                  childConfig, this.profile, 'initialValue', telemetryData
+                );
+            } else if (childConfig.asyncValidation.marker === 'EMAIL_OTP_VALIDATION') {
+              telemetryData['id'] = ID.VALIDATE_EMAIL;
+              childConfig.asyncValidation.asyncValidatorFactory =
+                this.formValidationAsyncFactory.emailVerificationAsyncFactory(
+                  childConfig, this.profile, 'initialValue', telemetryData
+                );
+            }
+            return childConfig;
+          }
+
+          this.assignDefaultValue(childConfig, isFormLoaded);
+
+          return childConfig;
+        });
+        return config;
+      }
+
+      if (config.code === 'tnc' || config.code === 'consentInfo') {
+        if (this.editType === 'edit') {
+          return undefined;
+        }
+        return config;
+      }
+
+      if (config.code === 'name') {
+        config.templateOptions.labelHtml.values['$1'] = this.profile.firstName;
+      } else if (config.code === 'state') {
+        config.templateOptions.labelHtml.values['$1'] =
+          this.availableLocationState || this.commonUtilService.translateMessage('ENTER_LOCATION_FROM_PROFILE_PAGE');
+      } else if (config.code === 'district') {
+        config.templateOptions.labelHtml.values['$1'] =
+          this.availableLocationDistrict || this.commonUtilService.translateMessage('ENTER_LOCATION_FROM_PROFILE_PAGE');
+      }
+
+      return config;
+    }).filter((formData) => formData);
+
+  }
+
+  private assignDefaultValue(childConfig: FieldConfig<any>, isFormLoaded) {
+    if (isFormLoaded) {
+      if (this.declaredLatestFormValue && this.declaredLatestFormValue.children.externalIds) {
+        childConfig.default = '';
+      }
+      return childConfig;
+    }
+    if (this.profile.declarations && this.profile.declarations.length && this.profile.declarations[0].info &&
+      this.profile.declarations[0].info[childConfig.code]) {
+      childConfig.default = this.profile.declarations[0].info[childConfig.code];
+    }
+
+    if (this.editType === 'add') {
+      if (childConfig.code === 'declared-phone') {
+        childConfig.default = this.profile['maskedPhone'];
+      }
+
+      if (childConfig.code === 'declared-email') {
+        childConfig.default = this.profile['maskedEmail'];
+      }
+    }
+
+    return childConfig;
+  }
+
+  private async checkLocationAvailability() {
+    let stateId;
+    let availableLocationData;
+    if (this.profile && this.profile['userLocations'] && this.profile['userLocations'].length) {
+      for (const ele of this.profile['userLocations']) {
+        if (ele.type === 'district') {
+          this.availableLocationDistrict = ele.name;
+
+        } else if (ele.type === 'state') {
+          stateId = ele.id || null;
+          this.availableLocationState = ele.name;
+        }
+      }
+    } else if (await this.commonUtilService.isDeviceLocationAvailable()) {
+      availableLocationData = JSON.parse(await this.preferences.getString(PreferenceKey.DEVICE_LOCATION).toPromise());
+      this.availableLocationState = availableLocationData.state;
+      this.availableLocationDistrict = availableLocationData.district;
+    } else if (await this.commonUtilService.isIpLocationAvailable()) {
+      availableLocationData = JSON.parse(await this.preferences.getString(PreferenceKey.IP_LOCATION).toPromise());
+      this.availableLocationState = availableLocationData.state;
+      this.availableLocationDistrict = availableLocationData.district;
+    }
+  }
+
+  handleDeviceBackButton() {
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
+      this.location.back();
+    });
+  }
+
+  ionViewWillLeave(): void {
+    if (this.backButtonFunc) {
+      this.backButtonFunc.unsubscribe();
+    }
+  }
+
+  async submit() {
+    if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+      this.commonUtilService.showToast('NEED_INTERNET_TO_CHANGE');
+    }
+
+    const id = this.editType === 'add' ? ID.SUBMIT_CLICKED : ID.BTN_UPDATE;
+    this.generateTelemetryInteract(InteractType.TOUCH, id);
+
+    const loader = await this.commonUtilService.getLoader();
+    let telemetryValue;
+    try {
+
+      if (!this.declaredLatestFormValue || !this.tenantPersonaLatestFormValue) {
+        this.commonUtilService.showToast('SOMETHING_WENT_WRONG');
+        return;
+      }
+
+      await loader.present();
+
+      const declarations = [];
+      const declaredDetails = this.declaredLatestFormValue.children && this.declaredLatestFormValue.children.externalIds;
+      Object.keys(declaredDetails).forEach((key) => {
+        if (typeof declaredDetails[key] === 'string') {
+          declaredDetails[key] = declaredDetails[key].trim();
+        }
+        if (declaredDetails[key].length === 0 || declaredDetails[key] === null) {
+          delete declaredDetails[key];
+        }
+      });
+
+      let operation = '';
+      if (!this.profile.declarations || !this.profile.declarations.length) {
+        operation = 'add';
+      } else if (this.tenantPersonaLatestFormValue.tenant === this.profile.declarations[0].orgId) {
+        operation = 'edit';
+      } else if (this.tenantPersonaLatestFormValue.tenant !== this.profile.declarations[0].orgId) {
+        const tenantPersonaData = { persona: this.profile.declarations[0].persona, tenant: this.profile.declarations[0].orgId };
+        declarations.push(this.getDeclarationReqObject('remove', this.profile.declarations[0].info, tenantPersonaData));
+        operation = 'add';
+      }
+      declarations.push(this.getDeclarationReqObject(operation, declaredDetails, this.tenantPersonaLatestFormValue));
+
+      const req = { declarations };
+
+      if (operation === 'edit' || declarations.length === 2) {
+        telemetryValue = this.getUpdatedValues(declaredDetails);
+      }
+
+      try {
+        await this.profileService.updateServerProfileDeclarations(req).toPromise();
+      } catch (e) {
+
+      }
+
+      this.events.publish('loggedInProfile:update');
+
+      this.generateTelemetryInteract(InteractType.SUBMISSION_SUCCESS, ID.TEACHER_DECLARATION, telemetryValue);
+      this.location.back();
+      if (this.editType === 'add') {
+        const userDetails = await this.profileService.getActiveSessionProfile(
+          { requiredFields: ProfileConstants.REQUIRED_FIELDS }).toPromise();
+        this.generateTncAudit();
+        this.commonUtilService.showToast('THANK_YOU_FOR_SUBMITTING_YOUR_DETAILS');
+        this.updateConsent(userDetails, declarations[0].orgId);
+      } else {
+        this.commonUtilService.showToast(this.commonUtilService.translateMessage('FRMELEMNTS_MSG_UPDATED_SUCCESSFULLY'));
+      }
+    } catch (err) {
+      console.error(err);
+      this.generateTelemetryInteract(InteractType.SUBMISSION_FAILURE, ID.TEACHER_DECLARATION, telemetryValue);
+      this.commonUtilService.showToast('SOMETHING_WENT_WRONG');
+    } finally {
+      await loader.dismiss();
+    }
+  }
+
+  private getDeclarationReqObject(operation, declaredDetails, tenantPersonaDetails) {
+    return {
+      operation,
+      userId: this.profile.userId,
+      orgId: tenantPersonaDetails.tenant,
+      persona: tenantPersonaDetails.persona,
+      info: declaredDetails
+    };
+  }
+
+  generateTelemetryInteract(type, id, value?) {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      type,
+      this.editType === 'add' ? InteractSubtype.NEW : InteractSubtype.EXISTING,
+      Environment.USER,
+      PageId.TEACHER_SELF_DECLARATION,
+      undefined,
+      value || undefined,
+      undefined,
+      undefined,
+      id
+    );
+  }
+
+  getUpdatedValues(formVal) {
+    const telemetryValue = [];
+
+    for (const key in formVal) {
+      if (this.profile.declarations && this.profile.declarations.length && this.profile.declarations[0].info &&
+        this.profile.declarations[0].info[key] !== formVal[key]) {
+        telemetryValue.push(key);
+      }
+    }
+
+    const fieldsChanged = { fieldsChanged: telemetryValue };
+
+    return fieldsChanged;
+  }
+
+  private generateTncAudit() {
+    const corRelationList: Array<CorrelationData> = [{ id: PageId.TEACHER_SELF_DECLARATION, type: CorReleationDataType.FROM_PAGE }];
+    const telemetryObject = new TelemetryObject(ID.DATA_SHARING, 'TnC', this.profile.tncLatestVersion);
+    this.telemetryGeneratorService.generateAuditTelemetry(
+      Environment.USER,
+      AuditState.AUDIT_UPDATED,
+      [],
+      AuditType.TNC_DATA_SHARING,
+      telemetryObject.id,
+      telemetryObject.type,
+      telemetryObject.version,
+      corRelationList
+    );
+  }
+
+  private getStateIdFromCode(code) {
+    if (this.stateList && this.stateList.length) {
+      const selectedState = this.stateList.find(state => state.code === code);
+      return selectedState;
+    }
+    return null;
+  }
+
+  tenantPersonaFormValueChanges(event) {
+    this.tenantPersonaLatestFormValue = event;
+    if (event && event.tenant) {
+      if (!this.selectedTenant) {
+        this.selectedTenant = event.tenant;
+        this.initTenantSpecificForm(this.selectedTenant, false);
+      } else if (event.tenant !== this.selectedTenant) {
+        this.selectedTenant = event.tenant;
+        this.initTenantSpecificForm(this.selectedTenant, true);
+      }
+    }
+  }
+
+  declarationFormValueChanges(event) {
+    this.declaredLatestFormValue = event;
+    if (event && event.children && event.children.externalIds) {
+      if (!this.selectedStateCode && event.children.externalIds['declared-state']) {
+        this.selectedStateCode = event.children.externalIds['declared-state'];
+      }
+      if (event.children.externalIds['declared-state'] &&
+        this.selectedStateCode && this.selectedStateCode !== event.children.externalIds['declared-state']) {
+        this.selectedStateCode = event.children.externalIds['declared-state'];
+        const selectedState = this.getStateIdFromCode(this.selectedStateCode);
+        this.initTenantSpecificForm(selectedState && selectedState.id, true);
+      }
+    }
+  }
+
+  tenantPersonaFormStatusChanges(event) {
+    this.isTenantPersonaFormValid = event.isValid || event.valid;
+  }
+
+  declarationFormStatusChanges(event) {
+    this.isDeclarationFormValid = event.isValid;
+  }
+
+  linkClicked(event) {
+    this.commonUtilService.openLink(event);
+  }
+  // todo Move this to consent service
+  public updateConsent(profileDetails, orgId) {
+    const request: Consent = {
+      status: ConsentStatus.ACTIVE,
+      userId: profileDetails.uid,
+      consumerId: orgId,
+      objectId: orgId,
+      objectType: 'Organisation'
+    };
+    this.profileService.updateConsent(request).toPromise()
+      .catch((e) => {
+        if (e.code === 'NETWORK_ERROR') {
+          this.commonUtilService.showToast('ERROR_NO_INTERNET_MESSAGE');
+        }
+      });
+  }
+}
diff --git a/src/app/profile/self-declared-teacher-edit/self-declared-teacher-edit.spec.ts b/src/app/profile/self-declared-teacher-edit/self-declared-teacher-edit.spec.ts
new file mode 100644
index 000000000..462dc4a1e
--- /dev/null
+++ b/src/app/profile/self-declared-teacher-edit/self-declared-teacher-edit.spec.ts
@@ -0,0 +1,892 @@
+import { of, throwError } from 'rxjs';
+import { SelfDeclaredTeacherEditPage } from './self-declared-teacher-edit.page';
+import {
+    SharedPreferences,
+    ProfileService
+} from 'sunbird-sdk';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Platform, PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import {
+    AppHeaderService,
+    CommonUtilService,
+    FormAndFrameworkUtilService,
+    TelemetryGeneratorService
+} from '@app/services';
+import {
+    InteractSubtype,
+    PageId,
+    Environment,
+    ID,
+    InteractType,
+    ImpressionType
+} from '@app/services/telemetry-constants';
+import { FormValidationAsyncFactory } from '@app/services/form-validation-async-factory/form-validation-async-factory';
+import { Location } from '@angular/common';
+import { PreferenceKey } from '../../app.constant';
+import { mockTenantPersonaInfoForm, mockSelfDeclarationForm } from '../../../services/formandframeworkutil.service.spec.data';
+import { FormConstants } from '../../form.constants';
+import { FieldConfigValidationType } from 'common-form-elements';
+import { ConsentService } from '../../../services/consent-service';
+
+describe('SelfDeclaredTeacherEditPage', () => {
+    let selfDeclaredTeacherEditPage: SelfDeclaredTeacherEditPage;
+
+    const mockProfileService: Partial<ProfileService> = {
+        getActiveSessionProfile: jest.fn(() => of(
+            { uid: 'sanple_uid' }
+        )),
+        getServerProfilesDetails: jest.fn(() => of(
+        )),
+        isDefaultChannelProfile: jest.fn(() => of(true)),
+        updateServerProfileDeclarations: jest.fn(() => of({})),
+        updateConsent: jest.fn(() => of({}))
+    };
+    const mockSharedPreferences: Partial<SharedPreferences> = {
+
+    };
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        getUserLocation: jest.fn(() => {
+            return { state: 'tripura', district: 'west_tripura' };
+        }),
+        getOrgLocation: jest.fn(() => {
+            return { state: 'tripura', district: 'west_tripura', block: 'dhaleshwar' };
+        }),
+        isDeviceLocationAvailable: jest.fn(),
+        isIpLocationAvailable: jest.fn(),
+        getAppName: jest.fn(() => Promise.resolve('Sunbird')),
+        translateMessage: jest.fn(),
+        showToast: jest.fn(),
+        openLink: jest.fn()
+    };
+    const dismissFn = jest.fn(() => Promise.resolve());
+    const presentFn = jest.fn(() => Promise.resolve());
+    mockCommonUtilService.getLoader = jest.fn(() => ({
+        present: presentFn,
+        dismiss: dismissFn,
+    }));
+    const mockAppHeaderService: Partial<AppHeaderService> = {
+        showHeaderWithBackButton: jest.fn()
+    };
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => ({
+            extras: {
+                state: {
+                    profile: {},
+                }
+            }
+        } as any)),
+        navigate: jest.fn()
+    };
+
+    const mockLocation: Partial<Location> = {
+        back: jest.fn()
+    };
+    const mockEvents: Partial<Events> = {
+        publish: jest.fn()
+    };
+    const mockPlatform: Partial<Platform> = {};
+    const mockActivatedRoute: Partial<ActivatedRoute> = {
+    };
+    mockActivatedRoute.snapshot = {
+        params: {
+            mode: 'add'
+        }
+    } as any;
+    const mockPopOverController: Partial<PopoverController> = {};
+    mockPopOverController.create = jest.fn(() => (Promise.resolve({
+      present: jest.fn(() => Promise.resolve({})),
+      dismiss: jest.fn(() => Promise.resolve({})),
+      onDidDismiss: jest.fn(() => Promise.resolve({})),
+    } as any)));
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateImpressionTelemetry: jest.fn(),
+        generateInteractTelemetry: jest.fn(),
+        generateAuditTelemetry: jest.fn()
+    };
+    const mockFormValidationAsyncFactory: Partial<FormValidationAsyncFactory> = {
+        mobileVerificationAsyncFactory: jest.fn(),
+        emailVerificationAsyncFactory: jest.fn()
+    };
+    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {
+        getCustodianOrgId: jest.fn(() => Promise.resolve({
+            orgId: 'sample_org_id'
+        })),
+        updateLoggedInUser: jest.fn(() => Promise.resolve({}))
+    };
+    const mockConsentService: Partial<ConsentService> = {};
+
+    beforeAll(() => {
+        selfDeclaredTeacherEditPage = new SelfDeclaredTeacherEditPage(
+            mockProfileService as ProfileService,
+            mockSharedPreferences as SharedPreferences,
+            mockAppHeaderService as AppHeaderService,
+            mockCommonUtilService as CommonUtilService,
+            mockRouter as Router,
+            mockLocation as Location,
+            mockEvents as Events,
+            mockPlatform as Platform,
+            mockActivatedRoute as ActivatedRoute,
+            mockPopOverController as PopoverController,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockFormValidationAsyncFactory as FormValidationAsyncFactory,
+            mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
+            mockConsentService as ConsentService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create instance of SelfDeclaredTeacherEditPage', () => {
+        // arrange
+        // assert
+        expect(selfDeclaredTeacherEditPage).toBeTruthy();
+    });
+
+    describe('ionViewWillEnter', () => {
+
+        beforeEach(() => {
+            const subscribeWithPriorityData = jest.fn((_, fn) => fn());
+            mockPlatform.backButton = {
+                subscribeWithPriority: subscribeWithPriorityData
+            } as any;
+        });
+        it('should show app header with back button', () => {
+            // arrange
+            // act
+            selfDeclaredTeacherEditPage.ionViewWillEnter();
+            // assert
+            expect(mockAppHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+        });
+
+        it('should generate INTERACT and IMPRESSION telemetry', (done) => {
+            // arrange
+            // act
+            selfDeclaredTeacherEditPage.ionViewWillEnter().then(() => {
+                // assert
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.SUBMISSION_INITIATED,
+                    InteractSubtype.NEW,
+                    Environment.USER,
+                    PageId.TEACHER_SELF_DECLARATION,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    ID.TEACHER_DECLARATION);
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    ImpressionType.VIEW,
+                    '',
+                    PageId.TEACHER_SELF_DECLARATION,
+                    Environment.USER);
+                done();
+            });
+
+        });
+
+        describe('checkLocationAvailability', () => {
+            it('should populate available state and district if profile details has userLocation', () => {
+                // arrange
+                mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
+                mockCommonUtilService.isIpLocationAvailable = jest.fn(() => Promise.resolve(false));
+                selfDeclaredTeacherEditPage['profile'] = {
+                    userLocations: [
+                        { type: 'state', name: 'Odisha' },
+                        { type: 'district', name: 'Cuttack' },
+                        { type: 'block', name: 'CMC' }]
+                };
+
+                // act
+                selfDeclaredTeacherEditPage.ionViewWillEnter();
+                // assert
+                expect(selfDeclaredTeacherEditPage['availableLocationState']).toEqual('Odisha');
+                expect(selfDeclaredTeacherEditPage['availableLocationDistrict']).toEqual('Cuttack');
+            });
+
+            // tslint:disable-next-line:max-line-length
+            it('should populate available state and district if profile details doesnt have userLocation but device location is available', () => {
+                // arrange
+                mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(true));
+                mockCommonUtilService.isIpLocationAvailable = jest.fn(() => Promise.resolve(false));
+                selfDeclaredTeacherEditPage['profile'] = {
+                    userLocations: []
+                };
+                mockSharedPreferences.getString = jest.fn((key) => {
+                    switch (key) {
+                        case PreferenceKey.DEVICE_LOCATION:
+                            return of('{\"state\":\"Odisha\",\"district\":\"Cuttack\"}');
+                    }
+                });
+
+                // act
+                selfDeclaredTeacherEditPage.ionViewWillEnter();
+                // assert
+                expect(selfDeclaredTeacherEditPage['availableLocationState']).toEqual('Odisha');
+                expect(selfDeclaredTeacherEditPage['availableLocationDistrict']).toEqual('Cuttack');
+            });
+
+            // tslint:disable-next-line:max-line-length
+            it('should populate available state and district if profile details doesnt have userLocation but IP location is available', () => {
+                // arrange
+                mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
+                mockCommonUtilService.isIpLocationAvailable = jest.fn(() => Promise.resolve(true));
+                selfDeclaredTeacherEditPage['profile'] = {
+                    userLocations: []
+                };
+                mockSharedPreferences.getString = jest.fn((key) => {
+                    switch (key) {
+                        case PreferenceKey.IP_LOCATION:
+                            return of('{\"state\":\"Odisha\",\"district\":\"Cuttack\"}');
+                    }
+                });
+
+                // act
+                selfDeclaredTeacherEditPage.ionViewWillEnter();
+                // assert
+                expect(selfDeclaredTeacherEditPage['availableLocationState']).toEqual('Odisha');
+                expect(selfDeclaredTeacherEditPage['availableLocationDistrict']).toEqual('Cuttack');
+            });
+
+        });
+
+    });
+
+
+    describe('ionViewDidEnter', () => {
+
+        it('should show app header with back button', () => {
+            // arrange
+            selfDeclaredTeacherEditPage['profile'] = {
+                rootOrg: { rootOrgId: '0123456789' },
+                declarations: [
+                    {
+                        persona: 'teacher',
+                        errorType: null,
+                        orgId: '01269934121990553633',
+                        status: 'SUBMITTED',
+                        info: {
+                            'declared-email': 'consentuser1@yopmail.com',
+                            ' declared-ext-id': 'test 124',
+                            ' declared-phone': '123456789'
+                        }
+                    }
+                ]
+            };
+            mockFormAndFrameworkUtilService.getFormFields = jest.fn((key) => {
+                switch (key) {
+                    case FormConstants.TENANT_PERSONAINFO:
+                        return Promise.resolve(mockTenantPersonaInfoForm);
+                    case FormConstants.SELF_DECLARATION:
+                        return Promise.resolve(mockSelfDeclarationForm);
+                }
+            });
+            // act
+            selfDeclaredTeacherEditPage.ionViewDidEnter();
+            // assert
+            // expect(mockAppHeaderService.showHeaderWithBackButton).toHaveBeenCalled();
+        });
+    });
+
+    describe('submit', () => {
+
+        it('should show NO_NETWORK error if network is not available', () => {
+            // arrange
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: false };
+            // act
+            selfDeclaredTeacherEditPage.submit();
+            // assert
+           // expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('NEED_INTERNET_TO_CHANGE');
+        });
+
+        it('should invoke updateServerProfileDeclarations and show success popup if network is available', (done) => {
+            // arrange
+            selfDeclaredTeacherEditPage['editType'] = 'add';
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+            selfDeclaredTeacherEditPage['profile'] = {
+                rootOrg: { rootOrgId: '0123456789' },
+                declarations: [
+                ]
+            };
+            selfDeclaredTeacherEditPage['declaredLatestFormValue'] = {
+                externalIds: '',
+                children: {
+                    externalIds: {
+                        'declared-phone': '123456789',
+                        'declared-email': 'consentuser1@yopmail.com',
+                        'declared-ext-id': 'test 124',
+                        'declared-no': {},
+                        'declared-mob': ''
+                    }
+                }
+            };
+
+            selfDeclaredTeacherEditPage['tenantPersonaLatestFormValue'] = {
+                persona: 'teacher',
+                tenant: '01269934121990553633'
+            };
+            // act
+            selfDeclaredTeacherEditPage.submit().then(() => {
+                // assert
+                expect(mockProfileService.updateServerProfileDeclarations).toHaveBeenCalled();
+              //  expect(mockPopOverController.create).toHaveBeenCalled();
+                done();
+            });
+
+        });
+
+        it('should invoke updateServerProfileDeclarationspp and show success popup if network is available', (done) => {
+            // arrange
+            selfDeclaredTeacherEditPage['editType'] = 'add';
+            selfDeclaredTeacherEditPage['tenantPersonaLatestFormValue'] = {
+                persona: 'teacher',
+                tenant: '012699341219905536331'
+            };
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+            selfDeclaredTeacherEditPage['profile'] = {
+                rootOrg: { rootOrgId: '0123456789' },
+                declarations:  [
+                    {
+                        persona: 'teacher',
+                        errorType: null,
+                        orgId: '01269934121990553633',
+                        status: 'SUBMITTED'
+                    }
+                ]
+            };
+            selfDeclaredTeacherEditPage['declaredLatestFormValue'] = {
+                externalIds: '',
+                children: {
+                    externalIds: {
+                        'declared-phone': '123456789',
+                        'declared-email': 'consentuser1@yopmail.com',
+                        'declared-ext-id': 'test 124',
+                        'declared-no': {},
+                        'declared-mob': ''
+                    }
+                }
+            };
+
+            // act
+            selfDeclaredTeacherEditPage.submit().then(() => {
+                // assert
+                expect(mockProfileService.updateServerProfileDeclarations).toHaveBeenCalled();
+              //  expect(mockPopOverController.create).toHaveBeenCalled();
+                done();
+            });
+
+        });
+
+        it('should invoke updateServerProfileDeclarationspp and show success toast if network is available', (done) => {
+            // arrange
+            selfDeclaredTeacherEditPage['editType'] = 'edit';
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+            mockCommonUtilService.translateMessage = jest.fn(() => 'sample_translation');
+            selfDeclaredTeacherEditPage['profile'] = {
+                rootOrg: { rootOrgId: '0123456789' },
+                declarations: [
+                    {
+                        persona: 'teacher',
+                        errorType: null,
+                        orgId: '01269934121990553633',
+                        status: 'SUBMITTED',
+                        info: {
+                            'declared-email': 'consentuser1@yopmail.com',
+                            'declared-ext-id': 'test 124',
+                            'declared-phone': '123456789'
+                        }
+                    }
+                ]
+            };
+            selfDeclaredTeacherEditPage['declaredLatestFormValue'] = {
+                externalIds: '',
+                children: {
+                    externalIds: {
+                        'declared-phone': '123456789',
+                        'declared-email': 'consentuser1@yopmail.com',
+                        'declared-ext-id': 'test 124',
+                    }
+                }
+            };
+
+            selfDeclaredTeacherEditPage['tenantPersonaLatestFormValue'] = {
+                persona: 'teacher',
+                tenant: '01269934121990553633'
+            };
+            // act
+            selfDeclaredTeacherEditPage.submit().then(() => {
+                // assert
+                expect(mockProfileService.updateServerProfileDeclarations).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('sample_translation');
+                done();
+            });
+
+        });
+
+
+        it('should invoke updateServerProfileDeclarationspp and show error toast in case of any error', (done) => {
+            // arrange
+            selfDeclaredTeacherEditPage['editType'] = 'edit';
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+            mockCommonUtilService.translateMessage = jest.fn(() => 'sample_translation');
+            mockProfileService.updateServerProfileDeclarations = jest.fn(() =>  throwError({}));
+            selfDeclaredTeacherEditPage['profile'] = {
+                rootOrg: { rootOrgId: '0123456789' },
+                uid: 'sample_uid',
+                declarations: [
+                    {
+                        persona: 'teacher',
+                        errorType: null,
+                        orgId: '01269934121990553633',
+                        status: 'SUBMITTED',
+                        info: {
+                            'declared-email': 'consentuser1@yopmail.com',
+                            'declared-ext-id': 'test 124',
+                            'declared-phone': '123456789'
+                        }
+                    }
+                ]
+            };
+            selfDeclaredTeacherEditPage['declaredLatestFormValue'] = {
+                externalIds: '',
+                children: {
+                    externalIds: {
+                        'declared-phone': '123456789',
+                        'declared-email': 'consentuser1@yopmail.com',
+                        'declared-ext-id': 'test 124',
+                    }
+                }
+            };
+
+            selfDeclaredTeacherEditPage['tenantPersonaLatestFormValue'] = {
+                persona: 'teacher',
+                tenant: '01269934121990553633'
+            };
+            // act
+            selfDeclaredTeacherEditPage.submit().then(() => {
+                // assert
+                expect(mockProfileService.updateServerProfileDeclarations).toHaveBeenCalled();
+                done();
+            });
+
+        });
+    });
+
+    describe('tenantPersonaFormValueChanges', () => {
+
+        it('should invoke initTenantSpecificForm method with the given tenant in the event', () => {
+            // arrange
+            selfDeclaredTeacherEditPage['selectedTenant'] = undefined;
+            const initFormMock =   jest.spyOn(selfDeclaredTeacherEditPage, 'initTenantSpecificForm');
+            // act
+            selfDeclaredTeacherEditPage.tenantPersonaFormValueChanges({
+                tenant: '01234567890',
+                persona: 'teacher'
+            });
+            // assert
+            expect(initFormMock).toHaveBeenCalledWith('01234567890', false);
+        });
+
+        it('should invoke initTenantSpecificForm method with the given tenant in the event', () => {
+            // arrange
+            const initFormMock =   jest.spyOn(selfDeclaredTeacherEditPage, 'initTenantSpecificForm');
+            selfDeclaredTeacherEditPage['selectedTenant'] = '01234567891';
+            // act
+            selfDeclaredTeacherEditPage.tenantPersonaFormValueChanges({
+                tenant: '01234567890',
+                persona: 'teacher'
+            });
+            // assert
+            expect(initFormMock).toHaveBeenCalledWith('01234567890', true);
+        });
+
+        it('should not invoke initTenantSpecificForm method with the given tenant in the event', () => {
+            // arrange
+            const initFormMock =   jest.spyOn(selfDeclaredTeacherEditPage, 'initTenantSpecificForm');
+            selfDeclaredTeacherEditPage['selectedTenant'] = '01234567891';
+            // act
+            selfDeclaredTeacherEditPage.tenantPersonaFormValueChanges(undefined);
+            // assert
+            expect(initFormMock).not.toHaveBeenCalledWith('01234567890', true);
+        });
+
+    });
+
+    describe('declarationFormValueChanges', () => {
+
+        it('should not populate selected state code if the event doent contain declared state', () => {
+            // arrange
+            // act
+            selfDeclaredTeacherEditPage.declarationFormValueChanges({
+                children: undefined
+            });
+            // assert
+            expect(selfDeclaredTeacherEditPage['selectedStateCode']).toBeUndefined();
+        });
+
+        it('should populate selected state code if the event contains declared state', () => {
+            // arrange
+            // act
+            selfDeclaredTeacherEditPage.declarationFormValueChanges({
+                children: {
+                    externalIds: {
+                        'declared-phone': '123456789',
+                        'declared-email': 'consentuser1@yopmail.com',
+                        'declared-ext-id': 'test 124',
+                        'declared-state' : 'sample_state_code'
+                    }
+                }
+            });
+            // assert
+            expect(selfDeclaredTeacherEditPage['selectedStateCode']).toEqual('sample_state_code');
+        });
+
+        it('should initialize the tenant form is selected state and the declared-state is different', () => {
+            // arrange
+            selfDeclaredTeacherEditPage['selectedStateCode'] = 'sample_test_code_1';
+            selfDeclaredTeacherEditPage['stateList'] = [{
+                code: 'sample_state_code',
+                id: 'sample_state_id'
+            }];
+            const initFormMock =   jest.spyOn(selfDeclaredTeacherEditPage, 'initTenantSpecificForm');
+            // act
+            selfDeclaredTeacherEditPage.declarationFormValueChanges({
+                children: {
+                    externalIds: {
+                        'declared-phone': '123456789',
+                        'declared-email': 'consentuser1@yopmail.com',
+                        'declared-ext-id': 'test 124',
+                        'declared-state' : 'sample_state_code'
+                    }
+                }
+            });
+            // assert
+            expect(initFormMock).toHaveBeenCalledWith('sample_state_id', true);
+        });
+
+        it('should initialize the tenant form is selected state and the declared-state is different', () => {
+            // arrange
+            selfDeclaredTeacherEditPage['selectedStateCode'] = 'sample_test_code_1';
+            selfDeclaredTeacherEditPage['stateList'] = [];
+            const initFormMock =   jest.spyOn(selfDeclaredTeacherEditPage, 'initTenantSpecificForm');
+            // act
+            selfDeclaredTeacherEditPage.declarationFormValueChanges({
+                children: {
+                    externalIds: {
+                        'declared-phone': '123456789',
+                        'declared-email': 'consentuser1@yopmail.com',
+                        'declared-ext-id': 'test 124',
+                        'declared-state' : 'sample_state_code'
+                    }
+                }
+            });
+            // assert
+            expect(initFormMock).toHaveBeenCalledWith(null, true);
+        });
+    });
+
+    describe('tenantPersonaFormStatusChanges', () => {
+        it('should populate isTenantPersonaFormValid', () => {
+            // arrange
+            // act
+            selfDeclaredTeacherEditPage.tenantPersonaFormStatusChanges({ isValid: true});
+            // assert
+            expect(selfDeclaredTeacherEditPage['isTenantPersonaFormValid']).toBeTruthy();
+        });
+
+        it('should populate isTenantPersonaFormValid', () => {
+            // arrange
+            // act
+            selfDeclaredTeacherEditPage.tenantPersonaFormStatusChanges({ valid: true});
+            // assert
+            expect(selfDeclaredTeacherEditPage['isTenantPersonaFormValid']).toBeTruthy();
+        });
+    });
+
+    describe('declarationFormStatusChanges', () => {
+        it('should populate isDeclarationFormValid', () => {
+            // arrange
+            // act
+            selfDeclaredTeacherEditPage.declarationFormStatusChanges({ isValid: true});
+            // assert
+            expect(selfDeclaredTeacherEditPage['isDeclarationFormValid']).toBeTruthy();
+        });
+    });
+
+    describe('linkClicked', () => {
+        it('should invoke openLink method', () => {
+            // arrange
+            // act
+            selfDeclaredTeacherEditPage.linkClicked('sample_link');
+            // assert
+            expect(mockCommonUtilService.openLink).toHaveBeenCalledWith('sample_link');
+        });
+    });
+
+    describe('ionViewWillLeave', () => {
+        it('should invoke openLink method', () => {
+            // arrange
+            const unsubscribeFn = jest.fn();
+            selfDeclaredTeacherEditPage['backButtonFunc'] = {
+                unsubscribe: unsubscribeFn
+            } as any;
+            // act
+            selfDeclaredTeacherEditPage.ionViewWillLeave();
+            // assert
+            expect(unsubscribeFn).toHaveBeenCalled();
+        });
+    });
+
+
+    describe('assignDefaultValue', () => {
+        it('should update the default declared phone number ', () => {
+            // arrange
+            selfDeclaredTeacherEditPage['editType'] = 'add';
+            selfDeclaredTeacherEditPage['profile'] = {
+                rootOrg: { rootOrgId: '0123456789' },
+                maskedEmail: 'sample_masked_email',
+                maskedPhone: 1234567,
+                declarations: [
+                    {
+                        persona: 'teacher',
+                        errorType: null,
+                        orgId: '01269934121990553633',
+                        status: 'SUBMITTED',
+                        info: {
+                            'declared-email': 'consentuser1@yopmail.com',
+                            'declared-ext-id': 'test 124',
+                            'declared-phone': '123456789'
+                        }
+                    }
+                ]
+            };
+            selfDeclaredTeacherEditPage['declaredLatestFormValue'] = {
+                externalIds: '',
+                children: {
+                    externalIds: {
+                        'declared-phone': '123456789',
+                        'declared-email': 'consentuser1@yopmail.com',
+                        'declared-ext-id': 'test 124',
+                        'declared-no': {},
+                        'declared-mob': ''
+                    }
+                }
+            };
+            // act
+            const childConfig = selfDeclaredTeacherEditPage['assignDefaultValue']({
+                code: 'declared-phone',
+                fieldName: 'Mobile Number',
+                templateOptions: {
+                  labelHtml: {
+                    contents: '<span>$0&nbsp;<span class=\"required-asterisk\">*</span></span>',
+                    values: {
+                      $0: 'Mobile Number'
+                    }
+                  },
+                  placeHolder: 'Enter Mobile Number',
+                  prefix: '+91 -',
+                  label: ''
+                },
+                validations: [
+                  {
+                    type: FieldConfigValidationType.REQUIRED,
+                    value: true,
+                    message: 'Mobile number is required'
+                  },
+                  {
+                    type: FieldConfigValidationType.REQUIRED,
+                    value: '^[6-9*][0-9*]{9}$',
+                    message: 'Enter a valid mobile number'
+                  }
+                ],
+                asyncValidation: {
+                  marker: 'MOBILE_OTP_VALIDATION',
+                  message: 'Validate your mobile number',
+                  trigger: 'validate'
+                }
+              } as any, false);
+            // assert
+            expect(childConfig.default).toEqual(1234567);
+        });
+
+        it('should update the default declared email ', () => {
+            // arrange
+            selfDeclaredTeacherEditPage['editType'] = 'add';
+            selfDeclaredTeacherEditPage['profile'] = {
+                rootOrg: { rootOrgId: '0123456789' },
+                maskedEmail: 'sample_masked_email',
+                maskedPhone: 1234567,
+                declarations: [
+                    {
+                        persona: 'teacher',
+                        errorType: null,
+                        orgId: '01269934121990553633',
+                        status: 'SUBMITTED',
+                        info: {
+                            'declared-email': 'consentuser1@yopmail.com',
+                            'declared-ext-id': 'test 124',
+                            'declared-phone': '123456789'
+                        }
+                    }
+                ]
+            };
+            selfDeclaredTeacherEditPage['declaredLatestFormValue'] = {
+                externalIds: '',
+                children: {
+                    externalIds: {
+                        'declared-phone': '123456789',
+                        'declared-email': 'consentuser1@yopmail.com',
+                        'declared-ext-id': 'test 124',
+                        'declared-no': {},
+                        'declared-mob': ''
+                    }
+                }
+            };
+            // act
+            const childConfig = selfDeclaredTeacherEditPage['assignDefaultValue']({
+                code: 'declared-email',
+                fieldName: 'Emailid',
+                templateOptions: {
+                  labelHtml: {
+                    contents: '<span>$0&nbsp;<span class=\"required-asterisk\">*</span></span>',
+                    values: {
+                      $0: 'Email'
+                    }
+                  },
+                  placeHolder: 'Enter Email',
+                  label: ''
+                },
+                validations: [
+                  {
+                    type: FieldConfigValidationType.REQUIRED,
+                    value: true,
+                    message: 'Mobile number is required'
+                  }
+                ],
+                asyncValidation: {
+                  marker: 'MOBILE_OTP_VALIDATION',
+                  message: 'Validate your email id',
+                  trigger: 'validate'
+                }
+              } as any, false);
+            // assert
+            expect(childConfig.default).toEqual('sample_masked_email');
+        });
+
+        it('should not update the default declared email ', () => {
+            // arrange
+            selfDeclaredTeacherEditPage['editType'] = 'add';
+            selfDeclaredTeacherEditPage['profile'] = {
+                rootOrg: { rootOrgId: '0123456789' },
+                maskedEmail: 'sample_masked_email',
+                maskedPhone: 1234567,
+                declarations: [
+                    {
+                        persona: 'teacher',
+                        errorType: null,
+                        orgId: '01269934121990553633',
+                        status: 'SUBMITTED',
+                        info: {
+                            'declared-email': 'consentuser1@yopmail.com',
+                            'declared-ext-id': 'test 124',
+                            'declared-phone': '123456789'
+                        }
+                    }
+                ]
+            };
+            selfDeclaredTeacherEditPage['declaredLatestFormValue'] = {
+                externalIds: '',
+                children: {
+                    externalIds: {
+                        'declared-phone': '123456789',
+                        'declared-email': 'consentuser1@yopmail.com',
+                        'declared-ext-id': 'test 124',
+                        'declared-no': {},
+                        'declared-mob': ''
+                    }
+                }
+            };
+            // act
+            const childConfig = selfDeclaredTeacherEditPage['assignDefaultValue']({
+                code: 'declared-email',
+                fieldName: 'Emailid',
+                templateOptions: {
+                  labelHtml: {
+                    contents: '<span>$0&nbsp;<span class=\"required-asterisk\">*</span></span>',
+                    values: {
+                      $0: 'Email'
+                    }
+                  },
+                  placeHolder: 'Enter Email',
+                  label: ''
+                },
+                validations: [
+                  {
+                    type: FieldConfigValidationType.REQUIRED,
+                    value: true,
+                    message: 'Mobile number is required'
+                  }
+                ],
+                asyncValidation: {
+                  marker: 'MOBILE_OTP_VALIDATION',
+                  message: 'Validate your email id',
+                  trigger: 'validate'
+                }
+              } as any, true);
+            // assert
+            expect(childConfig.default).not.toEqual('sample_masked_email');
+        });
+    });
+
+    // describe('showAddedSuccessfullPopup', () => {
+    //     it('should open consent popup', (done) => {
+    //         mockProfileService.getActiveSessionProfile = jest.fn(() => of({}));
+    //         mockPopOverController.create = jest.fn(() => (Promise.resolve({
+    //             present: jest.fn(() => Promise.resolve({})),
+    //             onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: true } }))
+    //           } as any)));
+    //         mockCommonUtilService.translateMessage = jest.fn(() => 'sample-message');
+    //         mockConsentService.getConsent = jest.fn(() => Promise.resolve());
+    //         // act
+    //         selfDeclaredTeacherEditPage.showAddedSuccessfullPopup();
+    //         // assert
+    //         setTimeout(() => {
+    //             expect(mockProfileService.getActiveSessionProfile).toHaveBeenCalled();
+    //             expect(mockPopOverController.create).toHaveBeenCalled();
+    //             expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1,
+    //                 'THANK_YOU_FOR_SUBMITTING_YOUR_DETAILS');
+    //             expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2,
+    //                 'FRMELEMNTS_MSG_SELFDECLARATION_SUCCESS_INFO');
+    //             expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3,
+    //                 'OK');
+    //             expect(mockConsentService.getConsent).toHaveBeenCalled();
+    //             done();
+    //         }, 0);
+    //     });
+
+    //     it('should not open consent popup', (done) => {
+    //         mockProfileService.getActiveSessionProfile = jest.fn(() => of({}));
+    //         mockPopOverController.create = jest.fn(() => (Promise.resolve({
+    //             present: jest.fn(() => Promise.resolve({})),
+    //             onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: false } }))
+    //           } as any)));
+    //         mockCommonUtilService.translateMessage = jest.fn(() => 'sample-message');
+    //         // act
+    //         selfDeclaredTeacherEditPage.showAddedSuccessfullPopup();
+    //         // assert
+    //         setTimeout(() => {
+    //             expect(mockProfileService.getActiveSessionProfile).toHaveBeenCalled();
+    //             expect(mockPopOverController.create).toHaveBeenCalled();
+    //             expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1,
+    //                 'THANK_YOU_FOR_SUBMITTING_YOUR_DETAILS');
+    //             expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2,
+    //                 'FRMELEMNTS_MSG_SELFDECLARATION_SUCCESS_INFO');
+    //             expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(3,
+    //                 'OK');
+    //             done();
+    //         }, 0);
+    //     });
+    // });
+
+});
diff --git a/src/app/profile/sub-profile-edit/sub-profile-edit.module.ts b/src/app/profile/sub-profile-edit/sub-profile-edit.module.ts
new file mode 100644
index 000000000..1d9cec842
--- /dev/null
+++ b/src/app/profile/sub-profile-edit/sub-profile-edit.module.ts
@@ -0,0 +1,32 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { Routes, RouterModule } from '@angular/router';
+import { IonicModule } from '@ionic/angular';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { SubProfileEditPage } from './sub-profile-edit.page';
+import { DirectivesModule } from '@app/directives/directives.module';
+import { ComponentsModule } from '@app/app/components/components.module';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: SubProfileEditPage
+  }
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    ReactiveFormsModule,
+    IonicModule,
+    DirectivesModule,
+    RouterModule.forChild(routes),
+    TranslateModule,
+    ComponentsModule
+  ],
+  declarations: [SubProfileEditPage]
+})
+export class SubProfileEditPageModule {}
diff --git a/src/app/profile/sub-profile-edit/sub-profile-edit.page.html b/src/app/profile/sub-profile-edit/sub-profile-edit.page.html
new file mode 100644
index 000000000..fbb4aaf9d
--- /dev/null
+++ b/src/app/profile/sub-profile-edit/sub-profile-edit.page.html
@@ -0,0 +1,33 @@
+<ion-content>
+
+  <div>
+    <p class="sp-title">{{'ADD_USER' | translate}}</p>
+    <div class="text-center MT16">
+      <img src="assets/imgs/round_blue_profile.svg" alt="managed-user-profile">
+    </div>
+  </div>
+
+  <app-common-forms *ngIf="formInitilized" 
+    [config]="managedUserFormList" 
+    (valueChanges)="formValueChanges($event)"
+    (statusChanges)="formStatusChanges($event)">
+  </app-common-forms>
+</ion-content>
+
+<ion-footer>
+  <ion-row class="padding-12">
+
+    <ion-col>
+      <ion-button class="ion-text-capitalize mb-16" expand="block" (click)="onCancel()">
+        {{'CANCEL' | translate}}
+      </ion-button>
+    </ion-col>
+
+    <ion-col>
+      <ion-button class="ion-text-capitalize mb-16" expand="block" [disabled]="!isFormValid"
+        (click)="submitForm()">{{'ADD_USER' | translate}}
+      </ion-button>
+    </ion-col>
+
+  </ion-row>
+</ion-footer>
diff --git a/src/app/profile/sub-profile-edit/sub-profile-edit.page.scss b/src/app/profile/sub-profile-edit/sub-profile-edit.page.scss
new file mode 100644
index 000000000..38e8356f9
--- /dev/null
+++ b/src/app/profile/sub-profile-edit/sub-profile-edit.page.scss
@@ -0,0 +1,170 @@
+@import "src/assets/styles/_variables.scss";
+:host {
+  .label-font {
+    color: map-get($colors, primary_black) !important;
+    font-family: "Noto Sans", sans-serif !important;
+    font-size: 22px !important;
+    font-weight: normal;
+  }
+
+  .select-text:first-letter {
+    text-transform: capitalize;
+  }
+
+  .custom-footer-background .toolbar-background-ios,
+  .custom-footer-background .toolbar-background-md {
+    background: unset !important;
+  }
+  .padding-12 {
+    padding: 12px !important;
+  }
+  .item-select-disabled {
+    .label-md {
+      color: map-get($colors, medium_gray);
+      opacity: 1;
+    }
+    ion-select {
+      border-color: map-get($colors, primary_black);
+    }
+  }
+
+  .item-label-stacked ion-select {
+    border: 1px solid map-get($colors, thick_blue);
+    border-radius: 5px;
+    margin-top: 16px;
+    padding-left: 8px;
+    padding-right: 16px !important;
+    font-size: 14px;
+    font-family: "Noto Sans Bold", sans-serif;
+    .select-icon {
+      .select-icon-inner {
+        border: solid blue;
+        border-width: 0 2px 2px 0;
+        display: inline-block;
+        padding: 4px;
+        transform: rotate(45deg);
+        animation: upDownAnimate 5s linear infinite;
+        animation-duration: 0.9s;
+      }
+    }
+  }
+
+  .item-label-stacked.item-select-disabled {
+    ion-label {
+      color: map-get($colors, primary_black);
+    }
+    ion-select {
+      border-color: map-get($colors, primary_black);
+      .select-icon {
+        .select-icon-inner {
+          border-color: map-get($colors, primary_black);
+          animation: none;
+        }
+      }
+      .select-placeholder {
+        color: map-get($colors, primary_black);
+      }
+    }
+  }
+
+  ion-item {
+    --border-color: var(--ion-color-danger, #f1453d);
+  }
+
+  ion-button{
+    --background: #{$blue} !important;
+  }
+
+  .item-label-stacked ion-input {
+    border-radius: 5px;
+    margin-top: 16px;
+    padding-left: 16px !important;
+    padding-right: 16px !important;
+    font-size: 14px;
+  }
+
+  .sp-input-primary ion-input{
+    font-weight: bold;
+    border: 1px solid map-get($colors, primary);
+    --placeholder-opacity: 0.3 !important;
+  }
+
+  .sp-input-error ion-input{
+    border: 1px solid red;
+  }
+
+  ion-item.item-label-stacked {
+    --border-width: 0;
+    --highlight-background: transparent;
+  }
+  .item-select ion-label {
+    color: map-get($colors, primary);
+  }
+
+  ion-label {
+    color: map-get($colors, primary_black);
+    font-family: "Noto Sans", sans-serif;
+    font-size: 14px;
+    letter-spacing: 0;
+    line-height: 19px;
+  }
+
+}
+
+.sp-title{
+  font-size: 16px;
+  font-weight: bold;
+  color: $blue;
+  margin: 16px 16px 0;
+}
+
+.sp-input-title{
+  color: map-get($colors, primary_black);
+  font-family: "Noto Sans", sans-serif;
+  font-size: 14px;
+  letter-spacing: 0;
+  line-height: 19px;
+  margin: 16px 0 8px;
+}
+
+.sp-input-box{
+  border: 0.5px solid map-get($colors, primary_black);
+  border-radius: 2px;
+  ion-input{
+    margin: 0 8px;
+  }
+}
+
+.sp-error{
+  margin-top: 8px;
+  display: block;
+  font-size: 12px;
+  color: red;
+  line-height: 10px;
+}
+
+.input-item{
+  padding-top: 8px;
+}
+
+.sp-tnc-text{
+  padding: 0 8px;
+}
+
+ion-footer{
+  ion-button{
+    --background: #{$blue} !important;
+    height: 40px !important;
+    font-family: "Noto Sans", sans-serif;
+    font-size: 16px;
+  }
+}
+
+.blur-btn {
+  opacity: 0.5;
+}
+
+.tnc-link {
+  color: $blue;
+  text-decoration: underline;
+}
\ No newline at end of file
diff --git a/src/app/profile/sub-profile-edit/sub-profile-edit.page.ts b/src/app/profile/sub-profile-edit/sub-profile-edit.page.ts
new file mode 100644
index 000000000..8cb35ea32
--- /dev/null
+++ b/src/app/profile/sub-profile-edit/sub-profile-edit.page.ts
@@ -0,0 +1,236 @@
+
+import { Subscription } from 'rxjs';
+import { Component, Inject, ViewChild } from '@angular/core';
+import { Platform } from '@ionic/angular';
+import {
+  Profile,
+  ProfileService,
+  SharedPreferences,
+  CorrelationData,
+  FormService,
+  FormRequest,
+  CachedItemRequestSourceFrom,
+} from 'sunbird-sdk';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { AppGlobalService } from '@app/services/app-global-service.service';
+import { AppHeaderService } from '@app/services/app-header.service';
+import { Location } from '@angular/common';
+import { AddManagedProfileRequest } from '@project-sunbird/sunbird-sdk/profile/def/add-managed-profile-request';
+import { CommonFormsComponent } from '@app/app/components/common-forms/common-forms.component';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import { Environment, InteractType, ID, PageId, CorReleationDataType, ImpressionType } from '@app/services/telemetry-constants';
+import { ProfileConstants } from '@app/app/app.constant';
+import {LocationHandler} from '@app/services/location-handler';
+
+@Component({
+  selector: 'app-sub-profile-edit',
+  templateUrl: './sub-profile-edit.page.html',
+  styleUrls: ['./sub-profile-edit.page.scss'],
+  providers: [LocationHandler]
+})
+export class SubProfileEditPage {
+
+  private profile: Profile;
+  private appName = '';
+  private formValue: any;
+  private backButtonFunc: Subscription;
+  private headerObservable: any;
+
+  public isFormValid = false;
+
+  formInitilized = false;
+
+  @ViewChild('commonForms', { static: false }) commonForms: CommonFormsComponent;
+
+  managedUserFormList: any = [];
+
+  constructor(
+    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+    @Inject('SHARED_PREFERENCES') private sharedPreferences: SharedPreferences,
+    @Inject('FORM_SERVICE') private formService: FormService,
+    private commonUtilService: CommonUtilService,
+    private appGlobalService: AppGlobalService,
+    private headerService: AppHeaderService,
+    private location: Location,
+    private platform: Platform,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+    private locationHandler: LocationHandler
+  ) {
+    this.profile = this.appGlobalService.getCurrentUser();
+
+    this.sharedPreferences.getString('app_name').toPromise().then(value => {
+      this.appName = value;
+    });
+  }
+
+  ionViewWillEnter() {
+    this.headerService.showHeaderWithBackButton();
+    this.handleBackButtonEvents();
+    this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
+      this.handleHeaderEvents(eventName);
+    });
+    this.telemetryGeneratorService.generateImpressionTelemetry(
+      ImpressionType.VIEW,
+      '',
+      PageId.CREATE_MANAGED_USER,
+      Environment.USER,
+    );
+  }
+
+  ionViewWillLeave() {
+    if (this.headerObservable) {
+      this.headerObservable.unsubscribe();
+    }
+    if (this.backButtonFunc) {
+      this.backButtonFunc.unsubscribe();
+    }
+  }
+
+  ionViewDidEnter() {
+    this.getCreateManagedUserFormApi();
+  }
+
+  getCreateManagedUserFormApi() {
+    const req: FormRequest = {
+      type: 'user',
+      subType: 'manageduser',
+      action: 'create',
+      component: 'app'
+    };
+    this.formService.getForm(req).toPromise()
+    .then((res: any) => {
+        const data = res.form.data.fields;
+        if (data.length) {
+          this.managedUserFormList = data;
+          this.initializeFormData();
+          console.log('this.managedUserFormList', this.managedUserFormList);
+        }
+    }).catch((error: any) => {
+      console.log(error);
+    });
+  }
+
+  initializeFormData() {
+    for (let index = 0; index < this.managedUserFormList.length; index++) {
+      const formDetails: any = this.managedUserFormList[index];
+      if (formDetails.code === 'tnc' && formDetails.templateOptions && formDetails.templateOptions.labelHtml &&
+        formDetails.templateOptions.labelHtml.contents) {
+          formDetails.templateOptions.labelHtml.values['$url'] = this.profile.serverProfile.tncLatestVersionUrl;
+          formDetails.templateOptions.labelHtml.values['$appName'] = this.appName + ' ';
+      }
+    }
+    this.formInitilized = true;
+  }
+
+  handleBackButtonEvents() {
+    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(0, async () => {
+      this.telemetryGeneratorService.generateBackClickedTelemetry(
+        PageId.CREATE_MANAGED_USER,
+        Environment.USER,
+        false
+      );
+      this.location.back();
+    });
+  }
+
+  async submitForm() {
+
+    if (!this.profile || !this.profile.serverProfile || !this.formValue || !this.formValue.name ) {
+      return;
+    }
+
+    const cData: Array<CorrelationData> = [
+      { id: this.formValue.name, type: CorReleationDataType.NAME },
+      { id: this.profile.serverProfile.tncLatestVersion || '', type: CorReleationDataType.TNC_VERSION },
+      { id: this.profile.serverProfile['managedBy'] || this.profile.uid || '', type: CorReleationDataType.LIUA }
+    ];
+    this.generateTelemetryInteract(InteractType.SELECT_ADD, ID.BTN_ADD);
+
+    const loader = await this.commonUtilService.getLoader();
+    try {
+      await loader.present();
+      let parentProfile;
+      if (this.profile.serverProfile.managedBy) {
+        parentProfile = await this.profileService.getServerProfilesDetails({
+          from: CachedItemRequestSourceFrom.CACHE,
+          userId: this.profile.serverProfile.managedBy,
+          requiredFields: ProfileConstants.REQUIRED_FIELDS
+        }).toPromise();
+      } else {
+        parentProfile = this.profile.serverProfile;
+      }
+      const userDetails: AddManagedProfileRequest = {
+        firstName: this.formValue.name,
+        managedBy: parentProfile.userId,
+        framework: parentProfile['framework'] || undefined
+      };
+      const profileLocation = (await this.locationHandler.getAvailableLocation(parentProfile));
+      if (userDetails && userDetails.framework && userDetails.framework.subject) {
+        userDetails.framework.subject = [];
+      }
+      if (profileLocation && profileLocation.length) {
+        userDetails.profileLocation =  profileLocation;
+      }
+      const response = await this.profileService.managedProfileManager.addManagedProfile(userDetails).toPromise();
+      if (response) {
+        this.commonUtilService.showToast('SUCCESSFULLY_ADDED_USER', null, null, null, null, this.formValue.name);
+        this.location.back();
+      }
+      this.generateTelemetryInteract(InteractType.CREATE_SUCCESS, ID.MUA_USER_CREATION);
+
+    } catch (err) {
+      this.generateTelemetryInteract(InteractType.CREATE_FAILURE, ID.MUA_USER_CREATION);
+      if (err.response.body && err.response.body.params && err.response.body.params.status === 'MANAGED_USER_LIMIT_EXCEEDED') {
+        this.commonUtilService.showToast('FRMELEMNTS_MSG_USER_CREATION_LIMIT_EXCEEDED');
+      } else {
+        this.commonUtilService.showToast('ERROR_WHILE_ADDING_USER');
+      }
+    } finally {
+      await loader.dismiss();
+    }
+  }
+
+  onCancel() {
+    this.location.back();
+    this.generateTelemetryInteract(InteractType.SELECT_CANCEL, ID.BTN_CANCEL);
+  }
+
+  showTncDetails() {
+    this.commonUtilService.openLink(this.profile.serverProfile.tncLatestVersionUrl);
+  }
+
+  handleHeaderEvents($event) {
+    switch ($event.name) {
+      case 'back':
+        this.telemetryGeneratorService.generateBackClickedTelemetry(
+          PageId.CREATE_MANAGED_USER,
+          Environment.USER,
+          true
+        );
+        break;
+    }
+  }
+
+  generateTelemetryInteract(type, id?) {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      type,
+      '',
+      Environment.USER,
+      PageId.CREATE_MANAGED_USER,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      id
+    );
+  }
+
+  formValueChanges(event) {
+    this.formValue = event;
+  }
+
+  formStatusChanges(event) {
+    this.isFormValid = event.isValid;
+  }
+
+}
diff --git a/src/app/qrcoderesult/qrcoderesult.module.ts b/src/app/qrcoderesult/qrcoderesult.module.ts
index c731f7a84..c050dd9eb 100644
--- a/src/app/qrcoderesult/qrcoderesult.module.ts
+++ b/src/app/qrcoderesult/qrcoderesult.module.ts
@@ -1,16 +1,13 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { Routes, RouterModule } from '@angular/router';
-
-import { IonicModule } from '@ionic/angular';
-
-import { QrcoderesultPage } from './qrcoderesult.page';
+import { RouterModule, Routes } from '@angular/router';
 import { DirectivesModule } from '@app/directives/directives.module';
 import { PipesModule } from '@app/pipes/pipes.module';
+import { IonicModule } from '@ionic/angular';
 import { TranslateModule } from '@ngx-translate/core';
 import { ComponentsModule } from '../components/components.module';
-import { TextbookTocService } from '../collection-detail-etb/textbook-toc-service';
+import { QrcoderesultPage } from './qrcoderesult.page';
 
 const routes: Routes = [
   {
diff --git a/src/app/qrcoderesult/qrcoderesult.page.html b/src/app/qrcoderesult/qrcoderesult.page.html
index 45fb655ef..a38620cbc 100644
--- a/src/app/qrcoderesult/qrcoderesult.page.html
+++ b/src/app/qrcoderesult/qrcoderesult.page.html
@@ -18,10 +18,10 @@
 
   </ion-toolbar>
 </ion-header>
-<div #stickyPillsRef class="sb-chapter-dd" (click)="openTextbookToc()" *ngIf="results.length>1">
+<div #stickyPillsRef class="sb-chapter-dd" (click)="openTextbookToc()" *ngIf="(results.length>1 || (results.length===1 && results[0].contentData.trackable.enabled === 'Yes'))">
   <span class="pull-left">{{stckyParent || ('SELECT_CHAPTER' | translate)}}</span>
   <span class="pull-right">
-    <ion-icon name="ios-arrow-dropright-circle"></ion-icon>
+    <ion-icon md="caret-forward-circle" ios="chevron-forward-circle"></ion-icon>
   </span>
 </div>
 <div class="m-n" *ngIf="showSheenAnimation" style="margin-top: 50px;">
@@ -37,12 +37,11 @@
     </div>
   </div>
 </div>
-<ion-content *ngIf="results.length>1" class="ion-padding" [scrollEvents]="true" (ionScroll)="onScroll($event)">
+<ion-content *ngIf="(results.length>1 || (results.length===1 && results[0].contentData.trackable.enabled === 'Yes'))" class="ion-padding" [scrollEvents]="true" (ionScroll)="onScroll($event)">
   <div class="card-container" *ngFor="let content of results; let i = index"
   [ngClass]="{'offline': !content?.isAvailableLocally && !commonUtilService.networkInfo.isNetworkAvailable}">
     <ion-row class="P010">
       <ul class="breadcrumbs">
-        <!-- (click)="showSwitchUserAlert(true)" -->
         <li *ngFor="let result of paths[i]" (click)="navigateToDetailsPage(paths[i][0], paths[i], content?.identifier)">
           {{ (result?.contentData?.name?.length>30)? (result?.contentData?.name | slice:0:30)+'...' :
           (result?.contentData?.name) }}
@@ -52,7 +51,7 @@
     <ion-card [id]="content.identifier">
       <ion-row [attr.data-sticky-unit]="content.contentData.name" [attr.data-index]="i">
         <ion-col size="12">
-          <ion-card-content (click)="playOnline(content)">
+          <ion-card-content (click)="playOnline(content, true)">
             <ion-row class="top">
               <ion-col size="3" class="img-container">
                 <img class="app-icon" alt="app-icon"
@@ -79,18 +78,18 @@ <h6 class="name font-size-20">{{content?.contentData?.name}}</h6>
       <!-- download and play online -->
       <div class="ion-no-padding" *ngIf="content.contentData?.streamingUrl  &&  !content.isAvailableLocally">
         <ion-row class="ion-no-padding">
-          <ion-col class="ion-no-padding" style="z-index: 100;" *ngIf="!content?.downloadable"
+          <ion-col class="ion-no-padding btn-space" style="z-index: 100;" *ngIf="!content?.downloadable"
             (click)="navigateToDetailsPage(content)">
-            <button class="qr-result-btn ion-no-padding ion-text-uppercase" expand="block" color="light"
-              style="color:#0D7DFC; z-index: 100;">
-              <ion-icon class="downloadicon" name="arrow-round-down"></ion-icon>&nbsp;
+            <button class="qr-result-btn download-info ion-no-padding ion-text-uppercase" expand="block" color="light"
+              style="color:#0D7DFC; z-index: 100;" [ngClass]="!(content.contentData?.downloadUrl) ? 'download-disabled' : null">
+              <ion-icon class="downloadicon" name="arrow-down"></ion-icon>&nbsp;
               {{'DOWNLOAD'| translate}}
             </button>
           </ion-col>
           <ion-col class="ion-no-padding"
             *ngIf="content.contentData?.streamingUrl && !(content.mimeType === 'application/vnd.ekstep.h5p-archive')">
-            <button class="custom-btn play qr-result-btn ion-no-padding" expand="block" (click)="playContent(content)">
-              <ion-icon name="play"></ion-icon>&nbsp;{{'PLAY' | translate}}
+            <button class="custom-btn play qr-result-btn ion-no-padding" expand="block" (click)="playContent(content, true)">
+              <ion-icon name="play" style="margin-left: -1rem;"></ion-icon>&nbsp;<span class="play-btn-info">{{'PLAY' | translate}}</span>
             </button>
           </ion-col>
         </ion-row>
@@ -99,15 +98,15 @@ <h6 class="name font-size-20">{{content?.contentData?.name}}</h6>
       <div class="ion-no-padding" *ngIf="content.isAvailableLocally && !content.isUpdateAvailable">
         <button class="qr-result-btn default ion-no-padding ion-text-uppercase" expand="block"
           (click)="navigateToDetailsPage(content)" [disabled]="isDownloadStarted">
-          <ion-icon name="play"></ion-icon>&nbsp;{{'PLAY'|translate}}
+          <ion-icon name="play" style="margin-left: -1rem;"></ion-icon>&nbsp;<span class="play-btn-info">{{'PLAY' | translate}}</span>
         </button>
       </div>
 
       <!-- Download content if not available locally  -->
       <div class="ion-no-padding" *ngIf="!content.contentData?.streamingUrl && !content.isAvailableLocally">
-        <button class="qr-result-btn ion-no-padding ion-text-uppercase" expand="block" color="light"
+        <button class="qr-result-btn download-info ion-no-padding ion-text-uppercase" expand="block" color="light"
           style="color:#0D7DFC" (click)="navigateToDetailsPage(content)">
-          <ion-icon class="downloadicon" name="arrow-round-down"></ion-icon>&nbsp;{{'DOWNLOAD'| translate}}
+          <ion-icon class="downloadicon" name="arrow-down"></ion-icon>&nbsp;{{'DOWNLOAD'| translate}}
         </button>
       </div>
 
@@ -118,13 +117,13 @@ <h6 class="name font-size-20">{{content?.contentData?.name}}</h6>
             class="ion-no-padding">
             <button class="qr-result-btn ion-text-uppercase ion-no-margin" expand="block" color="light"
               style="color:#0D7DFC; z-index: 100;">
-              <ion-icon class="downloadicon" name="arrow-round-down"></ion-icon>&nbsp;{{ 'UPDATE' | translate }}
+              <ion-icon class="downloadicon" name="arrow-down"></ion-icon>&nbsp;{{ 'UPDATE' | translate }}
             </button>
           </ion-col>
           <ion-col class="ion-no-padding" *ngIf="content.contentData?.streamingUrl">
             <button class="custom-btn play qr-result-btn default ion-no-margin" expand="block"
               (click)="navigateToDetailsPage(content)">
-              <ion-icon name="play"></ion-icon>&nbsp;{{'PLAY' | translate}}
+              <ion-icon name="play" style="margin-left: -1rem;"></ion-icon>&nbsp;<span class="play-btn-info">{{'PLAY' | translate}}</span>
             </button>
           </ion-col>
         </ion-row>
diff --git a/src/app/qrcoderesult/qrcoderesult.page.scss b/src/app/qrcoderesult/qrcoderesult.page.scss
index 6efd2122c..b85bf6ae2 100644
--- a/src/app/qrcoderesult/qrcoderesult.page.scss
+++ b/src/app/qrcoderesult/qrcoderesult.page.scss
@@ -1,5 +1,6 @@
 @import "src/assets/styles/_custom-mixins.scss";
 @import "src/assets/styles/base/_variables.scss";
+@import "src/assets/styles/_variables.scss";
 :host{
     .toolbar-md{
         min-height: auto;
@@ -22,17 +23,17 @@
     }
     .badge {
         @include padding(5px, 15px);
-        color: #333;
+        color: map-get($colors, primary_black);
         border-radius: 100px;
-        border: solid 0.5px #c6dbd8;
+        border: solid 0.5px map-get($colors, pale_cyan);
         font-size: 11px;
         @include margin(null, 10px, null, null);
     }
     .sc-ion-card-md-h.sc-ion-card-md-s  {
         border-radius: 4px;
         box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.16);
-        background-color: #ffffff;
-        border: solid 0.5px #cccccc;
+        background-color: map-get($colors, white);
+        border: solid 0.5px map-get($colors, medium_gray);
         position: relative;
         .card-content-md {
             padding: 7px !important;
@@ -49,12 +50,12 @@
             font-stretch: normal;
             line-height: normal;
             letter-spacing: normal;
-            color: #666666;
+            color: map-get($colors, granite_gray);
         }
     
         .size{
             font-size: 11px;
-            color: #666666;
+            color: map-get($colors, granite_gray);
         }
     
         .name, .author{
@@ -70,7 +71,7 @@
             -webkit-line-clamp: 2;
             -webkit-box-orient: vertical;
             font-size: 14px !important;
-            color: #333333;
+            color: map-get($colors, primary_black);
             min-height: 32px;
         }
     
@@ -85,9 +86,9 @@
             min-height:15vh; 
             // background: #E9E9E9;
             .img-container {
-                border: 1px solid #c6dbd8;
+                border: 1px solid map-get($colors, pale_cyan);
                 padding: 0 !important;
-                background: #E9E9E9;
+                background: map-get($colors, white_e9);
                 min-height: 18vh;
                 max-height: 18vh;
                 border-radius: 4px;
@@ -98,7 +99,6 @@
                     transform: translateY(-56%);
                     position: relative;
                     top: 50%;
-                    transform: perspective(1px) translateY(-50%);
                 }
             }
             
@@ -111,7 +111,7 @@
         margin: 0;
         li{
             display: inline-block;
-            color: #007aff;
+            color: map-get($colors, primary_blue);
             font-weight: bold !important;
             font-size: 10px;
         }
@@ -119,7 +119,7 @@
     
         li:after{
             content: '\003e';
-            color: #979797;
+            color: map-get($colors, dark_gray);
             height: 0;
             width: 0;
             margin: 0 5px;
@@ -131,12 +131,12 @@
     }
     
     .custom-btn, .default{
-        background-color: #0076FE;
-        color: #fff;
+        background-color: map-get($colors, vived_blue_fe);
+        color: map-get($colors, white);
     }
 
     .default {
-        color: #fff;
+        color: map-get($colors, white);
     }
     
     .custom-btn.play .arrow-right{
@@ -144,7 +144,7 @@
         height: 0; 
         border-top: 8px solid transparent;
         border-bottom: 8px solid transparent;
-        border-left: 14px solid #fff;
+        border-left: 14px solid map-get($colors, white);
         margin-right: 8px;
     }
     
@@ -165,7 +165,7 @@
             padding-bottom: 16px;
         }
     
-        background-color: #ffffff;
+        background-color: map-get($colors, white);
         height: 100%;
         z-index: 1000;
         opacity: 1 !important;
@@ -186,8 +186,6 @@
         display: block;
         width: 100%;
         padding: $base-block-space * 1;
-        border-top-left-radius: 0px !important;
-        border-top-right-radius: 0px !important;
         font-weight: 700;
         height: 3.2rem;
     }
@@ -196,7 +194,7 @@
         color: $blue;
         font-weight: bolder;
         box-shadow: 0 3px 5px 4px rgba(0, 0, 0, 0.05);
-        background-color: #fff;
+        background-color: map-get($colors, white);
         position: relative;
         z-index: 10;
         padding: 8px 8px 0px 16px;
@@ -214,7 +212,17 @@
     }
     .offline{
         opacity: 0.5;
-    }      
+    }   
+    
+    .download-disabled{
+        opacity: 0.5 !important;
+        cursor: default;
+      }
+
+    .play-btn-info{
+        position: absolute;
+        margin-top: 2px;
+    }
 }
     
     
diff --git a/src/app/qrcoderesult/qrcoderesult.page.spec.ts b/src/app/qrcoderesult/qrcoderesult.page.spec.ts
index f5c984565..65c48f26e 100644
--- a/src/app/qrcoderesult/qrcoderesult.page.spec.ts
+++ b/src/app/qrcoderesult/qrcoderesult.page.spec.ts
@@ -1,7 +1,7 @@
-import { MimeType, ContentType, RouterLinks, EventTopics } from '@app/app/app.constant';
-import { ContentPlayerHandler } from './../../services/content/player/content-player-handler';
-import { RatingHandler } from './../../services/rating/rating-handler';
-import { QrcoderesultPage } from './qrcoderesult.page';
+import {MimeType, RouterLinks, EventTopics} from '@app/app/app.constant';
+import {ContentPlayerHandler} from './../../services/content/player/content-player-handler';
+import {RatingHandler} from './../../services/rating/rating-handler';
+import {QrcoderesultPage} from './qrcoderesult.page';
 import {
     FrameworkService,
     FrameworkUtilService,
@@ -12,22 +12,25 @@ import {
     DownloadEventType,
     ContentEventType
 } from 'sunbird-sdk';
-import { TranslateService } from '@ngx-translate/core';
-import { Events, Platform, NavController } from '@ionic/angular';
-import { Router } from '@angular/router';
+import {TranslateService} from '@ngx-translate/core';
+import {Platform, NavController} from '@ionic/angular';
+import {Events} from '@app/util/events';
+import {Router} from '@angular/router';
 import {
     AppGlobalService,
     TelemetryGeneratorService,
     CommonUtilService,
     AppHeaderService
 } from 'services';
-import { Location } from '@angular/common';
-import { ImpressionType, PageId, Environment, InteractSubtype, InteractType } from '@app/services/telemetry-constants';
-import { of, throwError } from 'rxjs';
-import { NgZone } from '@angular/core';
-import { CanvasPlayerService } from '../../services';
-import { File } from '@ionic-native/file/ngx';
-import { TextbookTocService } from '../collection-detail-etb/textbook-toc-service';
+import {Location} from '@angular/common';
+import {ImpressionType, PageId, Environment, InteractSubtype, InteractType} from '@app/services/telemetry-constants';
+import {of, throwError} from 'rxjs';
+import {NgZone} from '@angular/core';
+import {CanvasPlayerService, AuditType, ImpressionSubtype, CorReleationDataType} from '../../services';
+import {File} from '@ionic-native/file/ngx';
+import {TextbookTocService} from '../collection-detail-etb/textbook-toc-service';
+import {NavigationService} from '../../services/navigation-handler.service';
+import {CsContentType} from '@project-sunbird/client-services/services/content';
 
 describe('QrcoderesultPage', () => {
     let qrcoderesultPage: QrcoderesultPage;
@@ -56,7 +59,10 @@ describe('QrcoderesultPage', () => {
     const mockRoterExtras = {
         extras: {
             state: {
-                isAvailableLocally: false
+                isAvailableLocally: false,
+                content: {
+                    dialcodes: ['EQ3452']
+                }
             }
         }
     };
@@ -71,7 +77,7 @@ describe('QrcoderesultPage', () => {
     };
     const mockTranslate: Partial<TranslateService> = {};
     const mockContentService: Partial<ContentService> = {
-        getContentHeirarchy : jest.fn(() => of(undefined))
+        getContentHeirarchy: jest.fn(() => of(undefined))
     };
     const mockEventsBusService: Partial<EventsBusService> = {};
     const mockPlayerService: Partial<PlayerService> = {};
@@ -95,6 +101,12 @@ describe('QrcoderesultPage', () => {
         },
         resetTextbookIds: jest.fn()
     };
+    const mockNavigationService: Partial<NavigationService> = {
+        navigateToTrackableCollection: jest.fn(),
+        navigateToCollection: jest.fn(),
+        navigateToContent: jest.fn(),
+        navigateTo: jest.fn()
+    };
 
     beforeAll(() => {
         qrcoderesultPage = new QrcoderesultPage(
@@ -115,6 +127,7 @@ describe('QrcoderesultPage', () => {
             mockLocation as Location,
             mockFile as File,
             mockHeaderService as AppHeaderService,
+            mockNavigationService as NavigationService,
             mockRouter as Router,
             mockNavCtrl as NavController,
             mockRatingHandler as RatingHandler,
@@ -131,10 +144,117 @@ describe('QrcoderesultPage', () => {
         expect(qrcoderesultPage).toBeTruthy();
     });
 
+    describe('handleBackButton', () => {
+        it('should go back to previous route', () => {
+            // arrange
+            mockTelemetryGeneratorService.generateBackClickedNewTelemetry = jest.fn();
+            mockAppGlobalService.isProfileSettingsCompleted = false;
+            qrcoderesultPage.source = PageId.ONBOARDING_PROFILE_PREFERENCES;
+            // spyOn(qrcoderesultPage, 'calculateAvailableUserCount').and.stub();
+            spyOn(qrcoderesultPage, 'goBack').and.stub();
+            // act
+            qrcoderesultPage.handleBackButton(PageId.LIBRARY);
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                PageId.LIBRARY,
+                Environment.ONBOARDING,
+                PageId.DIAL_CODE_SCAN_RESULT);
+            expect(qrcoderesultPage.goBack).toHaveBeenCalled();
+            expect(mockTelemetryGeneratorService.generateBackClickedNewTelemetry).toHaveBeenLastCalledWith(
+                false,
+                Environment.ONBOARDING,
+                'qr-content-result'
+            );
+        });
+        it('should go back to tabs', (done) => {
+            // arrange
+            mockTelemetryGeneratorService.generateBackClickedNewTelemetry = jest.fn();
+            mockAppGlobalService.isProfileSettingsCompleted = true;
+            qrcoderesultPage.isSingleContent = true;
+            spyOn(qrcoderesultPage, 'goBack').and.stub();
+            mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(true));
+            // act
+            qrcoderesultPage.handleBackButton();
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.NAV_BACK_CLICKED,
+                Environment.ONBOARDING,
+                PageId.DIAL_CODE_SCAN_RESULT);
+            expect(mockTelemetryGeneratorService.generateBackClickedNewTelemetry).toHaveBeenLastCalledWith(
+                false,
+                Environment.ONBOARDING,
+                'qr-content-result'
+            );
+            setTimeout(() => {
+                expect(mockRouter.navigate).toHaveBeenCalled();
+                done();
+            }, 1000);
+        });
+        it('should call navigateForward', (done) => {
+            // arrange
+            mockTelemetryGeneratorService.generateBackClickedNewTelemetry = jest.fn();
+            mockAppGlobalService.isProfileSettingsCompleted = true;
+            qrcoderesultPage.isSingleContent = true;
+            spyOn(qrcoderesultPage, 'goBack').and.stub();
+            mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
+            qrcoderesultPage.source = '';
+            // act
+            qrcoderesultPage.handleBackButton();
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.NAV_BACK_CLICKED,
+                Environment.ONBOARDING,
+                PageId.DIAL_CODE_SCAN_RESULT);
+            expect(mockTelemetryGeneratorService.generateBackClickedNewTelemetry).toHaveBeenLastCalledWith(
+                false,
+                Environment.HOME,
+                'qr-content-result'
+            );
+            setTimeout(() => {
+                expect(mockNavCtrl.navigateForward).toHaveBeenCalled();
+                done();
+            }, 1000);
+        });
+        it('should go to profilesettings page', (done) => {
+            // arrange
+            mockAppGlobalService.isProfileSettingsCompleted = false;
+            mockAppGlobalService.isGuestUser = true;
+            qrcoderesultPage.isSingleContent = true;
+            // spyOn(qrcoderesultPage, 'goBack').and.stub();
+            // mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
+            // act
+            qrcoderesultPage.handleBackButton();
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.NAV_BACK_CLICKED,
+                Environment.ONBOARDING,
+                PageId.DIAL_CODE_SCAN_RESULT);
+            setTimeout(() => {
+                expect(mockRouter.navigate).toHaveBeenCalled();
+                done();
+            }, 1000);
+        });
+    });
+
+    it('should get event name back and trigger back button', () => {
+        // arrange
+        jest.spyOn(qrcoderesultPage, 'handleBackButton').mockImplementation();
+        // act
+        qrcoderesultPage.handleHeaderEvents({name: 'back'});
+        // assert
+        expect(qrcoderesultPage.handleBackButton).toHaveBeenCalledWith(InteractSubtype.NAV_BACK_CLICKED);
+    });
+
     describe('ionViewWillEnter', () => {
         beforeEach(() => {
             qrcoderesultPage.navData = {
-                content: {identifier: 'id'},
+                content: {identifier: 'id', dialcodes: ['EQ4523']},
+                corRelation: [{id: 'do-123', type: 'Content'}],
+                dialCode: 'EQ4523'
             };
             const data = jest.fn();
             const subscribeWithPriorityData = jest.fn((_, fn) => fn());
@@ -144,17 +264,18 @@ describe('QrcoderesultPage', () => {
             } as any;
             qrcoderesultPage.unregisterBackButton = {
                 unsubscribe: data
-            }as any;
+            } as any;
             const headerData = jest.fn((fn => fn()));
             mockHeaderService.headerEventEmitted$ = {
                 subscribe: headerData
-            }as any;
+            } as any;
             mockHeaderService.showHeaderWithBackButton = jest.fn();
             jest.spyOn(qrcoderesultPage, 'handleHeaderEvents').mockImplementation(() => {
                 return;
             });
         });
-        it('should assign varaibles from navigation extras', (done) => {
+
+        it('should check for contentData if network is  not available', (done) => {
             // arrange
             mockTelemetryGeneratorService.generatefastLoadingTelemetry = jest.fn();
             const mockContentHeirarchy = {
@@ -162,28 +283,107 @@ describe('QrcoderesultPage', () => {
                 children: [
                     {
                         identifier: 'id2',
-                        children : [],
+                        children: [],
                         mimeType: 'mime',
-                        contentData: {}
-                    },
+                        contentData: {
+                            appIcon: 'http:',
+                            trackable: {
+                                enabled: 'Yes'
+                            }
+                        }
+                    }
+                ],
+                contentData: {
+                    name: 'name1',
+                    trackable: {
+                        enabled: 'Yes'
+                    }
+                }
+            };
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: false};
+            mockContentService.getContentHeirarchy = jest.fn(() => of(mockContentHeirarchy));
+            mockTextbookTocService.textbookIds = {
+                unit: {
+                    identifier: 'parentid',
+                    contentData: {identifier: 'parentid'},
+                    mimeType: MimeType.COLLECTION,
+                    children: [{identifier: 'childid', basePath: 'basePath'}]
+                }
+            } as any;
+            const scrollObj = {
+                scrollTo: jest.fn()
+            };
+            qrcoderesultPage.ionContent = {
+                getScrollElement: jest.fn(() => Promise.resolve(scrollObj))
+            } as any;
+            // spyOn(qrcoderesultPage, 'getFirstChildOfChapter').and.stub();
+            spyOn(qrcoderesultPage, 'handleBackButton').and.stub();
+            spyOn(qrcoderesultPage, 'getChildContents').and.stub();
+            spyOn(qrcoderesultPage, 'subscribeSdkEvent').and.stub();
+            // qrcoderesultPage.chapterFirstChildId = 'id';
+            spyOn(document, 'getElementById').and.returnValue('element');
+            mockEvents.unsubscribe = jest.fn(() => true);
+            mockNavCtrl.navigateForward = jest.fn(() => Promise.resolve(true));
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            // act
+            qrcoderesultPage.ionViewWillEnter();
+            // assert
+            expect(mockHeaderService.hideHeader).toHaveBeenCalled();
+            expect(qrcoderesultPage.content).toEqual({identifier: 'id', dialcodes: ['EQ4523']});
+            expect(mockTelemetryGeneratorService.generatefastLoadingTelemetry).toHaveBeenCalledWith(
+                InteractSubtype.FAST_LOADING_INITIATED,
+                PageId.DIAL_CODE_SCAN_RESULT,
+                undefined,
+                undefined,
+                undefined,
+                [{id: 'do-123', type: 'Content'}]
+            );
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    ImpressionType.PAGE_REQUEST, '',
+                    PageId.QR_CONTENT_RESULT,
+                    Environment.HOME,
+                    '', '', '', undefined,
+                    [{id: 'do-123', type: 'Content'}]
+                );
+                expect(mockTextbookTocService.resetTextbookIds).toHaveBeenCalled();
+                expect(qrcoderesultPage.showSheenAnimation).toEqual(false);
+                expect(qrcoderesultPage.results.length).toEqual(1);
+               // expect(mockEvents.unsubscribe).toHaveBeenCalled();
+               // expect(mockNavCtrl.navigateForward).toHaveBeenCalled();
+                done();
+            }, 200);
+        });
+
+        it('should check for content data if https is available and network is true', (done) => {
+            // arrange
+            mockTelemetryGeneratorService.generatefastLoadingTelemetry = jest.fn();
+            const mockContentHeirarchy = {
+                identifier: 'id',
+                children: [
                     {
-                        identifier: 'id3',
-                        children : [],
+                        identifier: 'id2',
+                        children: [],
                         mimeType: 'mime',
-                        contentData: {}
+                        contentData: {
+                            appIcon: 'https:',
+                            trackable: {
+                                enabled: 'No'
+                            }
+                        }
                     }
                 ],
                 contentData: {
-                    name: 'name1'
+                    name: 'name1',
+                    trackable: {
+                        enabled: 'No'
+                    }
                 }
             };
+            qrcoderesultPage.backToPreviusPage = true;
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
             mockContentService.getContentHeirarchy = jest.fn(() => of(mockContentHeirarchy));
-            mockTextbookTocService.textbookIds = { unit : {
-                identifier: 'parentid',
-                contentData: {identifier: 'parentid'},
-                mimeType: MimeType.COLLECTION,
-                children: [{identifier: 'childid', basePath: 'basePath'}]
-            }} as any;
+            mockTextbookTocService.textbookIds = {} as any;
             const scrollObj = {
                 scrollTo: jest.fn()
             };
@@ -196,26 +396,111 @@ describe('QrcoderesultPage', () => {
             spyOn(qrcoderesultPage, 'subscribeSdkEvent').and.stub();
             // qrcoderesultPage.chapterFirstChildId = 'id';
             spyOn(document, 'getElementById').and.returnValue('element');
+            mockEvents.unsubscribe = jest.fn(() => true);
+            mockNavCtrl.navigateForward = jest.fn(() => Promise.resolve(true));
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
             // act
             qrcoderesultPage.ionViewWillEnter();
             // assert
             expect(mockHeaderService.hideHeader).toHaveBeenCalled();
-            expect(qrcoderesultPage.content).toEqual({identifier: 'id'});
+            expect(qrcoderesultPage.content).toEqual({identifier: 'id', dialcodes: ['EQ4523']});
             expect(mockTelemetryGeneratorService.generatefastLoadingTelemetry).toHaveBeenCalledWith(
                 InteractSubtype.FAST_LOADING_INITIATED,
                 PageId.DIAL_CODE_SCAN_RESULT,
                 undefined,
                 undefined,
                 undefined,
-                undefined
+                [{id: 'do-123', type: 'Content'}]
             );
             setTimeout(() => {
-                expect(mockTextbookTocService.resetTextbookIds).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    ImpressionType.PAGE_REQUEST, '',
+                    PageId.QR_CONTENT_RESULT,
+                    Environment.HOME,
+                    '', '', '', undefined,
+                    [{id: 'do-123', type: 'Content'}]
+                );
                 expect(qrcoderesultPage.showSheenAnimation).toEqual(false);
-                expect(qrcoderesultPage.results.length).toEqual(2);
+                expect(qrcoderesultPage.results.length).toEqual(1);
+                expect(mockEvents.unsubscribe).toHaveBeenCalled();
+                expect(mockNavCtrl.navigateForward).toHaveBeenCalled();
                 done();
             }, 200);
         });
+
+        it('should check for content data if http or https not available', (done) => {
+            // arrange
+            mockTelemetryGeneratorService.generatefastLoadingTelemetry = jest.fn();
+            const mockContentHeirarchy = {
+                identifier: 'id',
+                children: [
+                    {
+                        identifier: 'id2',
+                        children: [],
+                        mimeType: 'mime',
+                        contentData: {
+                            appIcon: 'sample:',
+                            trackable: {
+                                enabled: 'Yes'
+                            }
+                        },
+                        basePath: 'file://sample'
+                    }
+                ],
+                contentData: {
+                    name: 'name1',
+                    trackable: {
+                        enabled: 'Yes'
+                    }
+                }
+            };
+            qrcoderesultPage.backToPreviusPage = true;
+            mockContentService.getContentHeirarchy = jest.fn(() => of(mockContentHeirarchy));
+            mockTextbookTocService.textbookIds = {} as any;
+            const scrollObj = {
+                scrollTo: jest.fn()
+            };
+            qrcoderesultPage.ionContent = {
+                getScrollElement: jest.fn(() => Promise.resolve(scrollObj))
+            } as any;
+            // spyOn(qrcoderesultPage, 'getFirstChildOfChapter').and.stub();
+            spyOn(qrcoderesultPage, 'handleBackButton').and.stub();
+            spyOn(qrcoderesultPage, 'getChildContents').and.stub();
+            spyOn(qrcoderesultPage, 'subscribeSdkEvent').and.stub();
+            // qrcoderesultPage.chapterFirstChildId = 'id';
+            spyOn(document, 'getElementById').and.returnValue('element');
+            mockEvents.unsubscribe = jest.fn(() => true);
+            mockNavCtrl.navigateForward = jest.fn(() => Promise.resolve(true));
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            // act
+            qrcoderesultPage.ionViewWillEnter();
+            // assert
+            expect(mockHeaderService.hideHeader).toHaveBeenCalled();
+            expect(qrcoderesultPage.content).toEqual({identifier: 'id', dialcodes: ['EQ4523']});
+            expect(mockTelemetryGeneratorService.generatefastLoadingTelemetry).toHaveBeenCalledWith(
+                InteractSubtype.FAST_LOADING_INITIATED,
+                PageId.DIAL_CODE_SCAN_RESULT,
+                undefined,
+                undefined,
+                undefined,
+                [{id: 'do-123', type: 'Content'}]
+            );
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    ImpressionType.PAGE_REQUEST, '',
+                    PageId.QR_CONTENT_RESULT,
+                    Environment.HOME,
+                    '', '', '', undefined,
+                    [{id: 'do-123', type: 'Content'}]
+                );
+                expect(qrcoderesultPage.showSheenAnimation).toEqual(false);
+                expect(qrcoderesultPage.results.length).toEqual(1);
+                // expect(mockEvents.unsubscribe).toHaveBeenCalled();
+                // expect(mockNavCtrl.navigateForward).toHaveBeenCalled();
+                done();
+            }, 200);
+        });
+
     });
 
     describe('ionViewWillLeave', () => {
@@ -246,7 +531,12 @@ describe('QrcoderesultPage', () => {
         });
         it('should generate telemetry', () => {
             // arrange
+            qrcoderesultPage.corRelationList = [{id: 'do_123', type: 'Content'}];
+            qrcoderesultPage.content = {
+                children: ['child_1']
+            };
             spyOn(qrcoderesultPage, 'calculateAvailableUserCount').and.stub();
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
             // act
             qrcoderesultPage.ionViewDidEnter();
             // assert
@@ -256,82 +546,15 @@ describe('QrcoderesultPage', () => {
                 PageId.DIAL_CODE_SCAN_RESULT,
                 Environment.ONBOARDING
             );
-        });
-    });
-
-    describe('handleBackButton', () => {
-        it('should go back to previous route', () => {
-            // arrange
-            mockAppGlobalService.isProfileSettingsCompleted = false;
-            // spyOn(qrcoderesultPage, 'calculateAvailableUserCount').and.stub();
-            spyOn(qrcoderesultPage, 'goBack').and.stub();
-            // act
-            qrcoderesultPage.handleBackButton(PageId.LIBRARY);
-            // assert
-            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-                InteractType.TOUCH,
-                PageId.LIBRARY,
-                Environment.ONBOARDING,
-                PageId.DIAL_CODE_SCAN_RESULT);
-            expect(qrcoderesultPage.goBack).toHaveBeenCalled();
-        });
-        it('should go back to tabs', (done) => {
-            // arrange
-            mockAppGlobalService.isProfileSettingsCompleted = true;
-            qrcoderesultPage.isSingleContent = true;
-            spyOn(qrcoderesultPage, 'goBack').and.stub();
-            mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(true));
-            // act
-            qrcoderesultPage.handleBackButton();
-            // assert
-            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-                InteractType.TOUCH,
-                InteractSubtype.NAV_BACK_CLICKED,
-                Environment.ONBOARDING,
-                PageId.DIAL_CODE_SCAN_RESULT);
-            setTimeout(() => {
-                expect(mockRouter.navigate).toHaveBeenCalled();
-                done();
-            }, 1000);
-        });
-        it('should call navigateForward', (done) => {
-            // arrange
-            mockAppGlobalService.isProfileSettingsCompleted = true;
-            qrcoderesultPage.isSingleContent = true;
-            spyOn(qrcoderesultPage, 'goBack').and.stub();
-            mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
-            // act
-            qrcoderesultPage.handleBackButton();
-            // assert
-            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-                InteractType.TOUCH,
-                InteractSubtype.NAV_BACK_CLICKED,
-                Environment.ONBOARDING,
-                PageId.DIAL_CODE_SCAN_RESULT);
-            setTimeout(() => {
-                expect(mockNavCtrl.navigateForward).toHaveBeenCalled();
-                done();
-            }, 1000);
-        });
-        it('should go to profilesettings page', (done) => {
-            // arrange
-            mockAppGlobalService.isProfileSettingsCompleted = false;
-            mockAppGlobalService.isGuestUser = true;
-            qrcoderesultPage.isSingleContent = true;
-            // spyOn(qrcoderesultPage, 'goBack').and.stub();
-            // mockCommonUtilService.isDeviceLocationAvailable = jest.fn(() => Promise.resolve(false));
-            // act
-            qrcoderesultPage.handleBackButton();
-            // assert
-            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-                InteractType.TOUCH,
-                InteractSubtype.NAV_BACK_CLICKED,
-                Environment.ONBOARDING,
-                PageId.DIAL_CODE_SCAN_RESULT);
-            setTimeout(() => {
-                expect(mockRouter.navigate).toHaveBeenCalled();
-                done();
-            }, 1000);
+            expect(mockTelemetryGeneratorService.generatePageLoadedTelemetry).toHaveBeenLastCalledWith(
+                PageId.QR_CONTENT_RESULT,
+                Environment.HOME,
+                undefined,
+                'Content',
+                undefined,
+                undefined,
+                [{id: 'do_123', type: 'Content'}, {id: '1', type: 'ContentCount'}]
+            );
         });
     });
 
@@ -340,9 +563,21 @@ describe('QrcoderesultPage', () => {
             // arrange
             const content = {
                 identifier: 'parentid',
-                contentData: {identifier: 'parentid'},
+                contentData: {
+                    identifier: 'parentid',
+                    trackable: {
+                        enabled: 'No'
+                    }
+                },
                 children: [
-                    {identifier: 'childid', basePath: 'basePath', mimeType: 'content', contentData: {identifier: 'id2'}}
+                    {
+                        identifier: 'childid', basePath: 'basePath', mimeType: 'content', contentData: {
+                            identifier: 'id2',
+                            trackable: {
+                                enabled: 'No'
+                            }
+                        }
+                    }
                 ]
             };
             qrcoderesultPage.searchIdentifier = 'childid';
@@ -385,12 +620,6 @@ describe('QrcoderesultPage', () => {
             // assert
             expect(mockContentService.getChildContents).toHaveBeenCalled();
             setTimeout(() => {
-                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
-                    ImpressionType.VIEW,
-                    '',
-                    PageId.DIAL_LINKED_NO_CONTENT,
-                    Environment.HOME
-                );
                 expect(mockCommonUtilService.showContentComingSoonAlert).toHaveBeenCalled();
                 done();
             }, 0);
@@ -432,36 +661,73 @@ describe('QrcoderesultPage', () => {
     });
 
     describe('navigateToDetailsPage', () => {
+        it('should return a toast message if downloadUrl is undefined', () => {
+            const content = {
+                contentData: {
+                    contentType: CsContentType.COURSE,
+                    downloadUrl: '',
+                    trackable: {
+                        enabled: 'No'
+                    }
+                }
+            };
+            mockTelemetryGeneratorService.isCollection = jest.fn(() => {
+            });
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            // act
+            qrcoderesultPage.navigateToDetailsPage(content);
+            // assert
+            expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('DOWNLOAD_NOT_ALLOWED_FOR_QUIZ');
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+            expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeTruthy();
+        });
+
         it('should navigate to enrolled course details page', () => {
             // arrange
             const content = {
+                contentType: CsContentType.COURSE,
                 contentData: {
-                    contentType: ContentType.COURSE
+                    contentType: CsContentType.COURSE,
+                    downloadUrl: 'sample-url'
                 }
             };
+            qrcoderesultPage.corRelationList = [{id: 'do_123', type: 'Content'}];
+            mockTextbookTocService.setTextbookIds = jest.fn();
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockTelemetryGeneratorService.isCollection = jest.fn();
             // act
-            qrcoderesultPage.navigateToDetailsPage(content);
+            qrcoderesultPage.navigateToDetailsPage(content, [{identifier: 'do-123'}]);
             // assert
-            expect(mockRouter.navigate).toHaveBeenCalledWith(
-                [RouterLinks.ENROLLED_COURSE_DETAILS],
-                expect.anything()
-            );
+
         });
         it('should navigate to collection details ETB page', () => {
             // arrange
             const content = {
-                mimeType: MimeType.COLLECTION
+                mimeType: MimeType.COLLECTION,
+                contentType: CsContentType.COLLECTION,
+                contentData: {
+                    downloadUrl: 'sample-url'
+                }
             };
             const paths = [
                 {identifier: 'id1'},
                 {identifier: 'id2'},
             ];
+            qrcoderesultPage.corRelationList = [{id: 'do_123', type: 'Content'}];
             mockTextbookTocService.setTextbookIds = jest.fn();
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
             // act
             qrcoderesultPage.navigateToDetailsPage(content, paths, 'sampleId');
             // assert
-            expect(mockRouter.navigate).toHaveBeenCalledWith(
-                [RouterLinks.COLLECTION_DETAIL_ETB],
+            expect(mockNavigationService.navigateToCollection).toHaveBeenCalledWith(
                 expect.anything()
             );
             expect(mockTextbookTocService.setTextbookIds).toHaveBeenCalledWith(
@@ -471,8 +737,13 @@ describe('QrcoderesultPage', () => {
         it('should navigate to content details page', () => {
             // arrange
             const content = {
-                identifier: 'id'
+                identifier: 'id',
+                contentType: CsContentType.RESOURCE,
+                contentData: {
+                    downloadUrl: 'sample-url'
+                }
             };
+            qrcoderesultPage.corRelationList = [{id: 'd0_123', type: 'Content'}];
             mockTextbookTocService.setTextbookIds = jest.fn();
             mockCommonUtilService.networkInfo = {
                 isNetworkAvailable: true
@@ -480,37 +751,19 @@ describe('QrcoderesultPage', () => {
             // act
             qrcoderesultPage.navigateToDetailsPage(content);
             // assert
-            expect(mockRouter.navigate).toHaveBeenCalledWith(
-                [RouterLinks.CONTENT_DETAILS],
+            expect(mockNavigationService.navigateToContent).toHaveBeenCalledWith(
                 expect.anything()
             );
             expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
             expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeTruthy();
         });
-
-        it('should not navigate to content details page for offline', () => {
-            // arrange
-            const content = {
-                identifier: 'id'
-            };
-            mockTextbookTocService.setTextbookIds = jest.fn();
-            mockCommonUtilService.networkInfo = {
-                isNetworkAvailable: false
-            };
-            mockCommonUtilService.presentToastForOffline = jest.fn();
-            // act
-            qrcoderesultPage.navigateToDetailsPage(content);
-            // assert
-            expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeFalsy();
-            expect(mockCommonUtilService.presentToastForOffline).toHaveBeenCalledWith('OFFLINE_WARNING_ETBUI_1');
-        });
     });
 
     it('should get all the profiles', (done) => {
         // arrange
         qrcoderesultPage.identifier = 'sampleid';
         mockProfileService.getAllProfiles = jest.fn(() => of([{handle: 'handle1'}] as any));
-        mockAppGlobalService.isUserLoggedIn =  jest.fn(() => true);
+        mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
         // act
         qrcoderesultPage.calculateAvailableUserCount();
         // assert
@@ -541,7 +794,7 @@ describe('QrcoderesultPage', () => {
     describe('setContentDetails', () => {
         it('should set contentDetails', () => {
             // arrange
-            mockContentService.getContentDetails = jest.fn(() => of({ identifier: 'id'} as any));
+            mockContentService.getContentDetails = jest.fn(() => of({identifier: 'id'} as any));
             // spyOn(qrcoderesultPage, 'calculateAvailableUserCount').and.stub();
             // act
             qrcoderesultPage.setContentDetails('id', true);
@@ -590,13 +843,43 @@ describe('QrcoderesultPage', () => {
                     identifier: 'sampleId'
                 }
             };
-            mockEventsBusService.events = jest.fn(() => of(event as any));
-            spyOn(qrcoderesultPage, 'getChildContents').and.stub();
+            qrcoderesultPage.content = {
+                dialcodes: ['EQ2345'],
+                leafNodesCount: 4
+            };
+            mockEventsBusService.events = jest.fn(() => of(event));
+            mockZone.run = jest.fn((fn) => fn());
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            jest.spyOn(qrcoderesultPage, 'getChildContents').mockImplementation();
+            qrcoderesultPage.source = 'profile-settings';
+            mockAppGlobalService.isOnBoardingCompleted = true;
+            mockTelemetryGeneratorService.generateAuditTelemetry = jest.fn();
+            qrcoderesultPage.profile = {
+                board: ['sample-board'],
+                medium: ['sample-medium'],
+                grade: ['sample-class']
+            };
             // action
             qrcoderesultPage.subscribeSdkEvent();
             // assert
+            expect(qrcoderesultPage.showLoading).toBeFalsy();
             expect(qrcoderesultPage.isDownloadStarted).toEqual(false);
             expect(qrcoderesultPage.getChildContents).toHaveBeenCalled();
+            expect(mockTelemetryGeneratorService.generatePageLoadedTelemetry).toHaveBeenCalled();
+            expect(mockTelemetryGeneratorService.generateAuditTelemetry).toHaveBeenCalledWith(
+                Environment.ONBOARDING,
+                'Updated',
+                undefined,
+                AuditType.SET_PROFILE,
+                undefined,
+                undefined,
+                undefined,
+                [{id: 'sample-board', type: 'Board'},
+                    {id: 'sample-medium', type: 'Medium'},
+                    {id: 'sample-class', type: 'Class'},
+                    {id: ImpressionSubtype.AUTO, type: CorReleationDataType.FILL_MODE}],
+                {l1: undefined}
+            );
         });
         it('should call import contents', () => {
             // arrange
@@ -691,7 +974,7 @@ describe('QrcoderesultPage', () => {
                 Environment.HOME,
                 true,
                 'sampleId',
-                undefined);
+                qrcoderesultPage.corRelationList);
         });
         it('should get navigate to previous to previous route', () => {
             // arrange
@@ -706,9 +989,10 @@ describe('QrcoderesultPage', () => {
                 Environment.HOME,
                 true,
                 'sampleId',
-                undefined);
+                qrcoderesultPage.corRelationList);
         });
     });
+
     describe('cancelDownload', () => {
         it('should cancel ongoing download', (done) => {
             // arrange
@@ -726,7 +1010,7 @@ describe('QrcoderesultPage', () => {
                 done();
             }, 0);
         });
-        it('should cancel ongoing download', (done) => {
+        it('should cancel download', (done) => {
             // arrange
             mockTelemetryGeneratorService.generateCancelDownloadTelemetry = jest.fn();
             const content = {identifier: 'sampleId'} as any;
@@ -744,6 +1028,81 @@ describe('QrcoderesultPage', () => {
         });
     });
 
+    describe('playContent', () => {
+        it('should call contentService and open player', (done) => {
+            // arrange
+            qrcoderesultPage.cardData = {
+                hierarchyInfo: [
+                    'do-123',
+                    'do-1234'
+                ]
+            };
+            const mockContentData = {
+                identifier: 'do-123',
+                contentData: {
+                    streamingUrl: 'https://'
+                },
+                hierachyInfo: [
+                    'do-1234',
+                    'do-122345'
+                ],
+                isAvailableLocally: false
+            };
+            const mockData = {
+                metadata: {
+                    mimeType: 'application/vnd.ekstep.ecml-archive'
+                }
+            };
+            mockAppGlobalService.getCurrentUser = jest.fn(() => ({uid: 'sample-uid'}));
+            mockContentService.setContentMarker = jest.fn(() => of(true));
+            mockContentPlayerHandler.launchContentPlayer = jest.fn();
+            // act
+            qrcoderesultPage.playContent(mockContentData, false);
+            // assert
+            setTimeout(() => {
+                expect(mockContentPlayerHandler.launchContentPlayer).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should call contentService and check for metaData is not mimeType ecml', (done) => {
+            // arrange
+            qrcoderesultPage.cardData = {
+                hierarchyInfo: [
+                    'do-123',
+                    'do-1234'
+                ]
+            };
+            const mockContentData = {
+                identifier: 'do-123',
+                contentData: {
+                    streamingUrl: 'https://'
+                },
+                hierachyInfo: [
+                    'do-1234',
+                    'do-122345'
+                ],
+                isAvailableLocally: false
+            };
+            const mockData = {
+                metadata: {
+                    mimeType: 'youtube'
+                }
+            };
+            mockAppGlobalService.getCurrentUser = jest.fn(() => ({uid: 'sample-uid'}));
+            mockContentService.setContentMarker = jest.fn(() => of(true));
+            mockContentPlayerHandler.launchContentPlayer = jest.fn();
+            // act
+            qrcoderesultPage.playContent(mockContentData, false);
+            // assert
+            setTimeout(() => {
+                expect(mockContentPlayerHandler.launchContentPlayer).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+    });
+
     it('should get FirstChild Of Chapter', () => {
         // arrange
         const unit = {
@@ -765,7 +1124,7 @@ describe('QrcoderesultPage', () => {
         // act
         qrcoderesultPage.openTextbookToc();
         // assert
-        expect(mockRouter.navigate).toHaveBeenCalledWith(
+        expect(mockNavigationService.navigateTo).toHaveBeenCalledWith(
             [`/${RouterLinks.COLLECTION_DETAIL_ETB}/${RouterLinks.TEXTBOOK_TOC}`],
             expect.anything()
         );
@@ -779,6 +1138,103 @@ describe('QrcoderesultPage', () => {
         );
     });
 
+    describe('playOnline', () => {
+        it('should navigate to player', () => {
+            const content = {
+                identifier: 'do-123',
+                contentData: {
+                    contentType: CsContentType.COURSE,
+                    streamingUrl: ''
+                },
+                contentType: CsContentType.COURSE,
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            // act
+            qrcoderesultPage.playOnline(content, false);
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+        });
+
+        it('should go to play content if it has streaming url and availableLocally', () => {
+            mockAppGlobalService.isOnBoardingCompleted = false;
+            qrcoderesultPage.source = 'course';
+            const content = {
+                identifier: 'do-123',
+                contentData: {
+                    streamingUrl: 'https://'
+                },
+                hierachyInfo: [
+                    'do-1234',
+                    'do-122345'
+                ],
+                isAvailableLocally: false
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(qrcoderesultPage, 'playContent').mockImplementation();
+
+            qrcoderesultPage.playOnline(content, false);
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                InteractType.TOUCH,
+                InteractSubtype.CONTENT_CLICKED,
+                Environment.ONBOARDING,
+                PageId.DIAL_CODE_SCAN_RESULT,
+                {id: 'do-123', type: undefined, version: ''}
+            );
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                InteractType.SELECT_CARD,
+                '',
+                Environment.HOME,
+                PageId.QR_CONTENT_RESULT,
+                {id: 'do-123', type: undefined, version: ''},
+                undefined,
+                {l1: 'do-123'},
+                qrcoderesultPage.corRelationList
+            );
+        });
+    });
 
+    describe('skip-steps', () => {
+        it('should generate interact telemetry and check user is onboarded or not', () => {
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockAppGlobalService.isOnBoardingCompleted = true;
+            mockAppGlobalService.isProfileSettingsCompleted = true;
+            mockRouter.navigate = jest.fn();
+            // act
+            qrcoderesultPage.skipSteps();
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.NO_QR_CODE_CLICKED,
+                Environment.HOME,
+                PageId.DIAL_CODE_SCAN_RESULT
+            );
+            expect(mockRouter.navigate).toHaveBeenCalledWith([`/${RouterLinks.TABS}`], {
+                state: {
+                    loginMode: 'guest'
+                }
+            });
+        });
 
+        it('should to go to profile-settings page if onboarding is not completed', () => {
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockAppGlobalService.isOnBoardingCompleted = false;
+            mockAppGlobalService.DISPLAY_ONBOARDING_CATEGORY_PAGE = true;
+            mockRouter.navigate = jest.fn();
+            // act
+            qrcoderesultPage.skipSteps();
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.NO_QR_CODE_CLICKED,
+                Environment.ONBOARDING,
+                PageId.DIAL_CODE_SCAN_RESULT
+            );
+            expect(mockRouter.navigate).toHaveBeenCalledWith([`/${RouterLinks.PROFILE_SETTINGS}`], {
+                state: {
+                    showFrameworkCategoriesMenu: true
+                }
+            });
+        });
+    });
 });
diff --git a/src/app/qrcoderesult/qrcoderesult.page.ts b/src/app/qrcoderesult/qrcoderesult.page.ts
index 271c288f5..ec1d152da 100644
--- a/src/app/qrcoderesult/qrcoderesult.page.ts
+++ b/src/app/qrcoderesult/qrcoderesult.page.ts
@@ -1,14 +1,19 @@
 import { TextbookTocService } from './../collection-detail-etb/textbook-toc-service';
 import { CommonUtilService } from './../../services/common-util.service';
-import { Component, Inject, NgZone, OnDestroy, ViewChild, ViewChildren, QueryList, ElementRef } from '@angular/core';
-import { ContentType, MimeType, RouterLinks, EventTopics } from '../../app/app.constant';
+import {
+  Component, Inject, NgZone, OnDestroy,
+  ViewChild, ElementRef
+} from '@angular/core';
+import {
+  MimeType,
+  RouterLinks, EventTopics
+} from '../../app/app.constant';
 import { TranslateService } from '@ngx-translate/core';
 import { AppGlobalService } from '../../services/app-global-service.service';
 import { TelemetryGeneratorService } from '../../services/telemetry-generator.service';
 import find from 'lodash/find';
 import each from 'lodash/each';
 import { IonContent as iContent } from '@ionic/angular';
-// import map from 'lodash/map';
 import {
   ChildContentRequest,
   Content,
@@ -24,31 +29,38 @@ import {
   DownloadProgress,
   EventsBusEvent,
   EventsBusService,
-  Framework,
-  FrameworkCategoryCodesGroup,
-  FrameworkDetailsRequest,
   FrameworkService,
   FrameworkUtilService,
   GetAllProfileRequest,
-  GetSuggestedFrameworksRequest,
   MarkerType,
   NetworkError,
   PlayerService,
   Profile,
   ProfileService,
-  TelemetryObject
+  TelemetryObject,
+  AuditState,
+  TrackingEnabled
 } from 'sunbird-sdk';
 import { Subscription } from 'rxjs';
-import { Environment, ImpressionType, InteractSubtype, InteractType, PageId } from '../../services/telemetry-constants';
+import {
+  Environment, ImpressionType, InteractSubtype, InteractType,
+  PageId, CorReleationDataType, Mode, ObjectType,
+  AuditType, ImpressionSubtype
+} from '../../services/telemetry-constants';
 import { CanvasPlayerService } from '../../services/canvas-player.service';
 import { File } from '@ionic-native/file/ngx';
 import { AppHeaderService } from '../../services/app-header.service';
 import { Location } from '@angular/common';
 import { NavigationExtras, Router } from '@angular/router';
-import { Platform, Events, NavController } from '@ionic/angular';
+import { Platform, NavController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { RatingHandler } from '@app/services/rating/rating-handler';
 import { ContentPlayerHandler } from '@app/services/content/player/content-player-handler';
-import { mapTo, map } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
+import { ContentUtil } from '@app/util/content-util';
+import { UtilityService } from '@app/services';
+import { NavigationService } from '@app/services/navigation-handler.service';
+import {ContentInfo} from '@app/services/content/content-info';
 declare const cordova;
 
 @Component({
@@ -57,7 +69,7 @@ declare const cordova;
   styleUrls: ['./qrcoderesult.page.scss'],
 })
 export class QrcoderesultPage implements OnDestroy {
-  @ViewChild('stickyPillsRef') stickyPillsRef: ElementRef;
+  @ViewChild('stickyPillsRef', { static: false }) stickyPillsRef: ElementRef;
   unregisterBackButton: any;
   /**
    * To hold identifier
@@ -77,7 +89,7 @@ export class QrcoderesultPage implements OnDestroy {
   /**
    * Contains card data of previous state
    */
-  content: Content;
+  content: any;
 
   /**
    * Contains Parent Content Details
@@ -121,7 +133,9 @@ export class QrcoderesultPage implements OnDestroy {
   stckyindex: string;
   chapterFirstChildId: string;
   showSheenAnimation = true;
-  @ViewChild(iContent) ionContent: iContent;
+  @ViewChild(iContent, { static: false }) ionContent: iContent;
+  onboarding = false;
+  dialCode: string;
 
   constructor(
     @Inject('CONTENT_SERVICE') private contentService: ContentService,
@@ -141,6 +155,7 @@ export class QrcoderesultPage implements OnDestroy {
     private location: Location,
     private file: File,
     private headerService: AppHeaderService,
+    private navService: NavigationService,
     private router: Router,
     private navCtrl: NavController,
     private ratingHandler: RatingHandler,
@@ -185,12 +200,20 @@ export class QrcoderesultPage implements OnDestroy {
     this.shouldGenerateEndTelemetry = this.navData.shouldGenerateEndTelemetry;
     this.source = this.navData.source;
     this.isSingleContent = this.navData.isSingleContent;
-
+    this.onboarding = this.navData.onboarding;
+    this.dialCode = this.navData.dialCode;
     // check for parent content
     this.parentContent = this.navData.parentContent;
     this.isProfileUpdated = this.navData.isProfileUpdated;
     this.searchIdentifier = this.content.identifier;
     this.isQrCodeLinkToContent = this.navData.isQrCodeLinkToContent;
+    this.telemetryGeneratorService.generateImpressionTelemetry(
+      ImpressionType.PAGE_REQUEST, '',
+      PageId.QR_CONTENT_RESULT,
+      this.source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+      '', '', '', undefined,
+      this.corRelationList
+    );
 
     if (this.parentContent) {
       this.isParentContentAvailable = true;
@@ -204,12 +227,12 @@ export class QrcoderesultPage implements OnDestroy {
         this.getChildContents();
       } else {
         this.telemetryGeneratorService.generatefastLoadingTelemetry(
-            InteractSubtype.FAST_LOADING_INITIATED,
-            PageId.DIAL_CODE_SCAN_RESULT,
-            undefined,
-            undefined,
-            undefined,
-            this.corRelationList
+          InteractSubtype.FAST_LOADING_INITIATED,
+          PageId.DIAL_CODE_SCAN_RESULT,
+          undefined,
+          undefined,
+          undefined,
+          this.corRelationList
         );
         const getContentHeirarchyRequest: ContentDetailRequest = {
           contentId: this.identifier
@@ -223,14 +246,15 @@ export class QrcoderesultPage implements OnDestroy {
             this.results = [];
             this.findContentNode(content);
             this.telemetryGeneratorService.generatefastLoadingTelemetry(
-                InteractSubtype.FAST_LOADING_FINISHED,
-                PageId.DIAL_CODE_SCAN_RESULT,
-                undefined,
-                undefined,
-                undefined,
-                this.corRelationList
+              InteractSubtype.FAST_LOADING_FINISHED,
+              PageId.DIAL_CODE_SCAN_RESULT,
+              undefined,
+              undefined,
+              undefined,
+              this.corRelationList
             );
-            if (this.results && this.results.length === 1) {
+            if (this.results && this.results.length === 1 &&
+              !(this.results[0].contentData.trackable && this.results[0].contentData.trackable.enabled === TrackingEnabled.YES)) {
               this.backToPreviusPage = false;
               this.events.unsubscribe(EventTopics.PLAYER_CLOSED);
               this.navCtrl.navigateForward([RouterLinks.CONTENT_DETAILS], {
@@ -238,14 +262,16 @@ export class QrcoderesultPage implements OnDestroy {
                   content: this.results[0],
                   isSingleContent: this.isSingleContent,
                   resultsSize: this.results.length,
-                  corRelation: this.corRelationList
+                  corRelation: this.corRelationList,
+                  onboarding: this.onboarding,
+                  source: this.source
                 }
               });
             }
           }).catch((err) => {
             this.showSheenAnimation = false;
           });
-          // this.importContentInBackground([this.identifier], false);
+        // this.importContentInBackground([this.identifier], false);
       }
       this.backToPreviusPage = false;
     }
@@ -253,6 +279,7 @@ export class QrcoderesultPage implements OnDestroy {
       this.handleBackButton(InteractSubtype.DEVICE_BACK_CLICKED);
       this.unregisterBackButton.unsubscribe();
     });
+    this.generateNewImpressionEvent(this.dialCode);
     this.subscribeSdkEvent();
     this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
       this.handleHeaderEvents(eventName);
@@ -264,6 +291,21 @@ export class QrcoderesultPage implements OnDestroy {
       PageId.DIAL_CODE_SCAN_RESULT,
       !this.appGlobalService.isProfileSettingsCompleted ? Environment.ONBOARDING : this.appGlobalService.getPageIdForTelemetry());
 
+    if (this.corRelationList && this.corRelationList.length) {
+      this.corRelationList.push({
+        id: this.content.children ? this.content.children.length.toString() : '0',
+        type: CorReleationDataType.COUNT_CONTENT
+      });
+    }
+    this.telemetryGeneratorService.generatePageLoadedTelemetry(
+      PageId.QR_CONTENT_RESULT,
+      this.source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+      this.content.identifier,
+      ObjectType.CONTENT,
+      undefined, undefined,
+      this.corRelationList
+    );
+
     if (!AppGlobalService.isPlayerLaunched) {
       this.calculateAvailableUserCount();
     }
@@ -288,7 +330,12 @@ export class QrcoderesultPage implements OnDestroy {
     }
   }
 
- async handleBackButton(clickSource?) {
+  async handleBackButton(clickSource?) {
+    this.telemetryGeneratorService.generateBackClickedNewTelemetry(
+      clickSource === InteractSubtype.DEVICE_BACK_CLICKED ? true : false,
+      this.source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+      PageId.QR_CONTENT_RESULT
+    );
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
       clickSource || InteractSubtype.NAV_BACK_CLICKED,
@@ -309,8 +356,16 @@ export class QrcoderesultPage implements OnDestroy {
         };
         this.navCtrl.navigateForward([`/${RouterLinks.DISTRICT_MAPPING}`], navigationExtras);
       }
-    } else if (this.appGlobalService.isGuestUser && this.isSingleContent && !this.appGlobalService.isProfileSettingsCompleted) {
-      const navigationExtras: NavigationExtras = { state: { isCreateNavigationStack: false, hideBackButton: true, showFrameworkCategoriesMenu: true  } };
+    } else if (this.appGlobalService.isGuestUser
+      && this.isSingleContent
+      && !this.appGlobalService.isProfileSettingsCompleted) {
+      const navigationExtras: NavigationExtras = {
+        state: {
+          isCreateNavigationStack: false,
+          hideBackButton: true,
+          showFrameworkCategoriesMenu: true
+        }
+      };
       this.router.navigate([`/${RouterLinks.PROFILE_SETTINGS}`], navigationExtras);
     } else {
       this.goBack();
@@ -320,6 +375,7 @@ export class QrcoderesultPage implements OnDestroy {
   getChildContents() {
     this.showSheenAnimation = false;
     const request: ChildContentRequest = { contentId: this.identifier, hierarchyInfo: [] };
+    this.profile = this.appGlobalService.getCurrentUser();
     this.contentService.getChildContents(
       request).toPromise()
       .then(async (data: Content) => {
@@ -331,7 +387,6 @@ export class QrcoderesultPage implements OnDestroy {
         this.parents.splice(0, this.parents.length);
         this.parents.push(data);
         this.results = [];
-        this.profile = this.appGlobalService.getCurrentUser();
         const contentData = data.contentData;
         this.findContentNode(data);
 
@@ -341,22 +396,23 @@ export class QrcoderesultPage implements OnDestroy {
             PageId.DIAL_LINKED_NO_CONTENT,
             Environment.HOME);
           if (this.isProfileUpdated) {
-             if (!await this.commonUtilService.isDeviceLocationAvailable()) {
+            if (!await this.commonUtilService.isDeviceLocationAvailable()) {
               const navigationExtras: NavigationExtras = {
                 state: {
                   isShowBackButton: false
                 }
               };
               this.navCtrl.navigateForward([`/${RouterLinks.DISTRICT_MAPPING}`], navigationExtras);
-             } else {
-              this.navCtrl.navigateBack([RouterLinks.TABS]);
-             }
-             this.commonUtilService.showContentComingSoonAlert(this.source);
             } else {
-              this.commonUtilService.showContentComingSoonAlert(this.source);
-              window.history.go(-2);
+              this.navCtrl.navigateBack([RouterLinks.TABS]);
             }
-        } else if (this.results && this.results.length === 1) {
+            this.commonUtilService.showContentComingSoonAlert(this.source, data, this.dialCode);
+          } else {
+            this.commonUtilService.showContentComingSoonAlert(this.source, data, this.dialCode);
+            window.history.go(-2);
+          }
+        } else if (this.results && this.results.length === 1 &&
+          !(this.results[0].contentData.trackable && this.results[0].contentData.trackable.enabled === TrackingEnabled.YES)) {
           this.backToPreviusPage = false;
           this.events.unsubscribe(EventTopics.PLAYER_CLOSED);
           this.navCtrl.navigateForward([RouterLinks.CONTENT_DETAILS], {
@@ -364,9 +420,10 @@ export class QrcoderesultPage implements OnDestroy {
               content: this.results[0],
               isSingleContent: this.isSingleContent,
               resultsSize: this.results.length,
-              corRelation: this.corRelationList
+              corRelation: this.corRelationList,
+              onboarding: this.onboarding
             }
-           });
+          });
         }
       })
       .catch((err) => {
@@ -388,21 +445,21 @@ export class QrcoderesultPage implements OnDestroy {
     };
     this.profileService.getAllProfiles(profileRequest).pipe(
       map((profiles) => profiles.filter((profile) => !!profile.handle))
-      ).subscribe(profiles => {
-        if (profiles) {
-          this.userCount = profiles.length;
-        }
-        if (this.appGlobalService.isUserLoggedIn()) {
-          this.userCount += 1;
-        }
-      }, () => {
-      });
+    ).subscribe(profiles => {
+      if (profiles) {
+        this.userCount = profiles.length;
+      }
+      if (this.appGlobalService.isUserLoggedIn()) {
+        this.userCount += 1;
+      }
+    }, () => {
+    });
   }
 
   /**
    * Play content
    */
-  playContent(content: Content) {
+  playContent(content: Content, isStreaming: boolean, contentInfo?: ContentInfo) {
     const extraInfoMap = { hierarchyInfo: [] };
     if (this.cardData && this.cardData.hierarchyInfo) {
       extraInfoMap.hierarchyInfo = this.cardData.hierarchyInfo;
@@ -419,115 +476,114 @@ export class QrcoderesultPage implements OnDestroy {
       .then(() => {
       }).catch(() => {
       });
-    const request: any = {};
-    request.streaming = true;
     AppGlobalService.isPlayerLaunched = true;
     const values = new Map();
-    values['isStreaming'] = request.streaming;
-    const identifier = content.identifier;
-    let telemetryObject: TelemetryObject;
-    const objectType = this.telemetryGeneratorService.isCollection(content.mimeType) ? content.contentType : ContentType.RESOURCE;
-    telemetryObject = new TelemetryObject(identifier, objectType, undefined);
-    this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
-      InteractSubtype.CONTENT_PLAY,
-      !this.appGlobalService.isOnBoardingCompleted ? Environment.ONBOARDING : Environment.HOME,
-      PageId.DIAL_CODE_SCAN_RESULT,
-      telemetryObject,
-      values,
-      undefined,
-      this.corRelationList);
-    if (this.commonUtilService.networkInfo.isNetworkAvailable || content.isAvailableLocally) {
-      this.openPlayer(content, request);
-    } else {
-      this.commonUtilService.presentToastForOffline('OFFLINE_WARNING_ETBUI_1');
-    }
+    values['isStreaming'] = isStreaming;
+    const localContentInfo: ContentInfo = {
+      telemetryObject: ContentUtil.getTelemetryObject(content),
+      rollUp: ContentUtil.generateRollUp(content.hierarchyInfo, content.identifier),
+      correlationList: this.corRelationList,
+      hierachyInfo: content.hierarchyInfo,
+      course: undefined
+    };
+    this.interactEventForPlayAndDownload(content, true);
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
       content.isAvailableLocally ? InteractSubtype.PLAY_FROM_DEVICE : InteractSubtype.PLAY_ONLINE,
       !this.appGlobalService.isOnBoardingCompleted ? Environment.ONBOARDING : Environment.HOME,
       PageId.DIAL_CODE_SCAN_RESULT,
-      telemetryObject,
+      ContentUtil.getTelemetryObject(content),
       undefined,
       undefined,
       this.corRelationList);
+    this.contentPlayerHandler.launchContentPlayer(content,
+        isStreaming,
+        false,
+        contentInfo ? contentInfo : localContentInfo,
+        false,
+        false);
   }
 
-  playOnline(content) {
-    const identifier = content.identifier;
-    let telemetryObject: TelemetryObject;
-    const objectType = this.telemetryGeneratorService.isCollection(content.mimeType) ? content.contentType : ContentType.RESOURCE;
-    telemetryObject = new TelemetryObject(identifier, objectType, undefined);
-
+  playOnline(content, isStreaming: boolean) {
+    const telemetryObject = ContentUtil.getTelemetryObject(content);
     this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
       InteractSubtype.CONTENT_CLICKED,
       !this.appGlobalService.isOnBoardingCompleted ? Environment.ONBOARDING : Environment.HOME,
       PageId.DIAL_CODE_SCAN_RESULT,
       telemetryObject);
     if (content.contentData.streamingUrl && !content.isAvailableLocally) {
-      this.playContent(content);
+      const rollup = ContentUtil.generateRollUp(content.hierarchyInfo, content.identifier);
+      this.telemetryGeneratorService.generateInteractTelemetry(
+        InteractType.SELECT_CARD, '',
+        this.source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+        PageId.QR_CONTENT_RESULT,
+        telemetryObject,
+        undefined,
+        rollup,
+        this.corRelationList
+      );
+      const contentInfo: ContentInfo = {
+        telemetryObject,
+        rollUp: rollup,
+        correlationList: this.corRelationList,
+        hierachyInfo: content.hierarchyInfo,
+        course: undefined
+      };
+      this.playContent(content, isStreaming, contentInfo);
     } else {
       this.navigateToDetailsPage(content);
     }
   }
 
   navigateToDetailsPage(content, paths?, contentIdentifier?) {
-    if (content && content.contentData && content.contentData.contentType === ContentType.COURSE) {
-      // this.navCtrl.push(EnrolledCourseDetailsPage, {
-      //   content: content,
-      //   corRelation: this.corRelationList
-      // });
-      this.router.navigate([RouterLinks.ENROLLED_COURSE_DETAILS], {
-        state: {
-          content: content,
-          corRelation: this.corRelationList
-        }
+    this.interactEventForPlayAndDownload(content, false);
+    if (!(content.contentData.downloadUrl) && !paths && ContentUtil.isTrackable(content.contentData) === -1) {
+      this.commonUtilService.showToast('DOWNLOAD_NOT_ALLOWED_FOR_QUIZ');
+      return;
+    }
+    const corRelationList = [...this.corRelationList];
+    if (paths && paths.length) {
+      const rootId = paths[0].identifier ? paths[0].identifier : '';
+      corRelationList.push({
+        id: rootId,
+        type: CorReleationDataType.ROOT_ID
       });
-    } else if (content && content.mimeType === MimeType.COLLECTION) {
-      // this.navCtrl.push(CollectionDetailsEtbPage, {
-      //   content: content,
-      //   corRelation: this.corRelationList
-      // });
-      if (paths.length && paths.length >= 2) {
-        this.textbookTocService.setTextbookIds({ rootUnitId: paths[1].identifier, contentId: contentIdentifier });
-      }
-      this.router.navigate([RouterLinks.COLLECTION_DETAIL_ETB], {
-        state: {
-          content: content,
-          corRelation: this.corRelationList
+    }
+    switch (ContentUtil.isTrackable(content)) {
+      case 1:
+        this.navService.navigateToTrackableCollection({
+          content,
+          corRelation: corRelationList
+        });
+        break;
+      case 0:
+        if (paths && paths.length && paths.length >= 2) {
+          this.textbookTocService.setTextbookIds({ rootUnitId: paths[1].identifier, contentId: contentIdentifier });
         }
-      });
-    } else {
-      if (this.commonUtilService.networkInfo.isNetworkAvailable || content.isAvailableLocally) {
+        this.navService.navigateToCollection({
+          content,
+          corRelation: corRelationList
+        });
+        break;
+      case -1:
         this.telemetryGeneratorService.generateInteractTelemetry(
           InteractType.TOUCH,
           Boolean(content.isAvailableLocally) ? InteractSubtype.PLAY_FROM_DEVICE : InteractSubtype.DOWNLOAD_PLAY_CLICKED,
           !this.appGlobalService.isOnBoardingCompleted ? Environment.ONBOARDING : Environment.HOME,
           PageId.DIAL_CODE_SCAN_RESULT);
-        // this.navCtrl.push(ContentDetailsPage, {
-        //   content: content,
-        //   depth: '1',
-        //   isChildContent: true,
-        //   downloadAndPlay: true,
-        //   corRelation: this.corRelationList
-        // });
-        this.router.navigate([RouterLinks.CONTENT_DETAILS], {
-          state: {
-            content: content,
-            depth: '1',
-            isChildContent: true,
-            downloadAndPlay: true,
-            corRelation: this.corRelationList
-          }
+        this.navService.navigateToContent({
+          content,
+          depth: '1',
+          isChildContent: true,
+          downloadAndPlay: true,
+          corRelation: corRelationList,
+          onboarding: this.onboarding,
+          source: this.source
         });
-      } else {
-        this.commonUtilService.presentToastForOffline('OFFLINE_WARNING_ETBUI_1');
-      }
+        break;
     }
   }
 
-
-  /** funtion add elipses to the texts**/
-
   addElipsesInLongText(msg: string) {
     if (this.commonUtilService.translateMessage(msg).length >= 12) {
       return this.commonUtilService.translateMessage(msg).slice(0, 8) + '....';
@@ -536,10 +592,6 @@ export class QrcoderesultPage implements OnDestroy {
     }
   }
 
-  /**
-   * To set content details in local variable
-   * @param {string} identifier identifier of content / course
-   */
   setContentDetails(identifier, refreshContentDetails: boolean) {
     const option: ContentDetailRequest = {
       contentId: identifier,
@@ -594,8 +646,8 @@ export class QrcoderesultPage implements OnDestroy {
   }
 
   /**
-   * @param categoryList
-   * @param data
+   * categoryList
+   * data
    * @param categoryType
    * return the code of board,medium and subject based on Name
    */
@@ -606,12 +658,6 @@ export class QrcoderesultPage implements OnDestroy {
       return undefined;
     }
   }
-
-  /**
-   * comparing current profile data with qr result data, If not matching then reset current profile data
-   * @param {object} data
-   * @param {object} profile
-   */
   /**
    * Subscribe genie event to get content download progress
    */
@@ -631,12 +677,27 @@ export class QrcoderesultPage implements OnDestroy {
         // Get child content
         // if (res.data && res.data.status === 'IMPORT_COMPLETED' && res.type === 'contentImport') {
         if (event.payload && event.type === ContentEventType.IMPORT_COMPLETED) {
+          const corRelationList: Array<CorrelationData> = [];
+          corRelationList.push({ id: this.dialCode ? this.dialCode : '', type: CorReleationDataType.QR });
+          corRelationList.push({
+            id: this.content.leafNodesCount ? this.content.leafNodesCount.toString() : '0',
+            type: CorReleationDataType.COUNT_NODE
+          });
+          this.telemetryGeneratorService.generatePageLoadedTelemetry(
+            PageId.TEXTBOOK_IMPORT,
+            this.source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+            this.content.identifier,
+            ObjectType.TEXTBOOK,
+            undefined, undefined,
+            corRelationList
+          );
           this.showLoading = false;
           this.isDownloadStarted = false;
           this.results = [];
           this.parents = [];
           this.paths = [];
           this.getChildContents();
+          this.generateAuditEventForAutoFill();
         }
         // For content update available
         // if (res.data && res.type === 'contentUpdateAvailable' && res.data.identifier === this.identifier) {
@@ -653,31 +714,22 @@ export class QrcoderesultPage implements OnDestroy {
     }) as any;
   }
 
-  /**
-   * Function to get import content api request params
-   *
-   * @param {Array<string>} identifiers contains list of content identifier(s)
-   * @param {boolean} isChild
-   */
-  importContent(identifiers: Array<string>, isChild: boolean, isDownloadAllClicked?) {
-    const option: ContentImportRequest = {
+  importContent(identifiers: Array<string>, isChild: boolean) {
+    const contentImportRequest: ContentImportRequest = {
       contentImportArray: this.getImportContentRequestBody(identifiers, isChild),
       contentStatusArray: [],
       fields: ['appIcon', 'name', 'subject', 'size', 'gradeLevel']
     };
 
     // Call content service
-    this.contentService.importContent(option).toPromise()
+    this.contentService.importContent(contentImportRequest).toPromise()
       .then((data: ContentImportResponse[]) => {
-        this.zone.run(() => {
-          data = data;
-        });
       })
       .catch((error: any) => {
         this.zone.run(() => {
           this.isDownloadStarted = false;
           this.showLoading = false;
-          if (error instanceof NetworkError) {
+          if (NetworkError.isInstance(error)) {
             this.commonUtilService.showToast('NEED_INTERNET_TO_CHANGE');
           } else {
             this.commonUtilService.showToast('UNABLE_TO_FETCH_CONTENT');
@@ -686,12 +738,6 @@ export class QrcoderesultPage implements OnDestroy {
       });
   }
 
-  /**
-   * Function to get import content api request params
-   *
-   * @param {Array<string>} identifiers contains list of content identifier(s)
-   * @param {boolean} isChild
-   */
   getImportContentRequestBody(identifiers: Array<string>, isChild: boolean): Array<ContentImport> {
     const requestParams = [];
     identifiers.forEach((value) => {
@@ -737,18 +783,16 @@ export class QrcoderesultPage implements OnDestroy {
       const navigationExtras: NavigationExtras = { state: { loginMode: 'guest' } };
       this.router.navigate([`/${RouterLinks.TABS}`], navigationExtras);
     } else {
-      this.router.navigate([`/${RouterLinks.PROFILE_SETTINGS}`], { state: {showFrameworkCategoriesMenu: true } });
+      this.router.navigate([`/${RouterLinks.PROFILE_SETTINGS}`], { state: { showFrameworkCategoriesMenu: true } });
     }
   }
   private showAllChild(content: any) {
     this.zone.run(() => {
-      if (content.children === undefined || !content.children.length) {
-        if (content.mimeType !== MimeType.COLLECTION) {
+      if (content.children === undefined || !content.children.length || ContentUtil.isTrackable(content.contentData) === 1) {
+        if (content.mimeType !== MimeType.COLLECTION || ContentUtil.isTrackable(content.contentData) === 1) {
           if (content.contentData.appIcon) {
             if (content.contentData.appIcon.includes('http:') || content.contentData.appIcon.includes('https:')) {
-              if (this.commonUtilService.networkInfo.isNetworkAvailable) {
-                content.contentData.appIcon = content.contentData.appIcon;
-              } else {
+              if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
                 content.contentData.appIcon = this.defaultImg;
               }
             } else if (content.basePath) {
@@ -798,47 +842,10 @@ export class QrcoderesultPage implements OnDestroy {
     return false;
   }
 
-  private openPlayer(playingContent, request) {
-    this.playerService.getPlayerConfig(playingContent, request).subscribe((data) => {
-      data['data'] = {};
-      this.events.subscribe(EventTopics.PLAYER_CLOSED, () => {
-        this.setContentDetails(playingContent.identifier, true);
-        this.events.unsubscribe(EventTopics.PLAYER_CLOSED);
-      });
-      if (data.metadata.mimeType === 'application/vnd.ekstep.ecml-archive') {
-        if (!request.streaming) {
-          this.file.checkFile(`file://${data.metadata.basePath}/`, 'index.ecml').then((isAvailable) => {
-            this.canvasPlayerService.xmlToJSon(`${data.metadata.basePath}/index.ecml`).then((json) => {
-              data['data'] = json;
-              const navigationExtras: NavigationExtras = { state: { config: data } };
-              this.router.navigate([`/${RouterLinks.PLAYER}`], navigationExtras);
-            }).catch((error) => {
-              console.error('error1', error);
-            });
-          }).catch((err) => {
-            console.error('err', err);
-            this.canvasPlayerService.readJSON(`${data.metadata.basePath}/index.json`).then((json) => {
-              data['data'] = json;
-              const navigationExtras: NavigationExtras = { state: { config: data } };
-              this.router.navigate([`/${RouterLinks.PLAYER}`], navigationExtras);
-            }).catch((e) => {
-              console.error('readJSON error', e);
-            });
-          });
-        } else {
-          const navigationExtras: NavigationExtras = { state: { config: data } };
-          this.router.navigate([`/${RouterLinks.PLAYER}`], navigationExtras);
-        }
-
-      } else {
-        const navigationExtras: NavigationExtras = { state: { config: data } };
-        this.router.navigate([`/${RouterLinks.PLAYER}`], navigationExtras);
-      }
-    });
-  }
   handleHeaderEvents($event) {
     switch ($event.name) {
-      case 'back': this.handleBackButton(InteractSubtype.NAV_BACK_CLICKED);
+      case 'back':
+        this.handleBackButton(InteractSubtype.NAV_BACK_CLICKED);
         break;
     }
   }
@@ -855,10 +862,19 @@ export class QrcoderesultPage implements OnDestroy {
   }
 
   openTextbookToc() {
-    this.router.navigate([`/${RouterLinks.COLLECTION_DETAIL_ETB}/${RouterLinks.TEXTBOOK_TOC}`],
-      { state: { childrenData: this.childrenData, parentId: this.identifier,
-        stckyUnitTitle: this.stckyUnitTitle , stckyindex: this.stckyindex,
-        latestParentNodes: this.latestParents} });
+    this.navService.navigateTo([`/${RouterLinks.COLLECTION_DETAIL_ETB}/${RouterLinks.TEXTBOOK_TOC}`], {
+      childrenData: this.childrenData, parentId: this.identifier,
+      stckyUnitTitle: this.stckyUnitTitle, stckyindex: this.stckyindex,
+      latestParentNodes: this.latestParents
+    });
+    // this.router.navigate([`/${RouterLinks.COLLECTION_DETAIL_ETB}/${RouterLinks.TEXTBOOK_TOC}`],
+    //   {
+    //     state: {
+    //       childrenData: this.childrenData, parentId: this.identifier,
+    //       stckyUnitTitle: this.stckyUnitTitle, stckyindex: this.stckyindex,
+    //       latestParentNodes: this.latestParents
+    //     }
+    //   });
     const values = new Map();
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
@@ -906,4 +922,78 @@ export class QrcoderesultPage implements OnDestroy {
       });
     }
   }
+
+  private interactEventForPlayAndDownload(content, play) {
+    const telemetryObject = ContentUtil.getTelemetryObject(content);
+    if (this.corRelationList && this.corRelationList.length) {
+      this.corRelationList.push({ id: Mode.PLAY, type: CorReleationDataType.MODE });
+      this.corRelationList.push({ id: telemetryObject.type || '', type: CorReleationDataType.TYPE });
+      this.corRelationList.push({
+        id: this.commonUtilService.networkInfo.isNetworkAvailable ?
+          Mode.ONLINE : Mode.OFFLINE, type: InteractSubtype.NETWORK_STATUS
+      });
+    }
+    const rollup = ContentUtil.generateRollUp(content.hierarchyInfo, content.identifier);
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      play ? InteractType.PLAY : InteractType.DOWNLOAD,
+      undefined,
+      this.source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+      PageId.QR_CONTENT_RESULT,
+      telemetryObject,
+      undefined,
+      rollup,
+      this.corRelationList
+    );
+  }
+
+  generateNewImpressionEvent(dialcode?) {
+    const corRelationList: Array<CorrelationData> = [];
+    if (dialcode) {
+      corRelationList.push({ id: dialcode, type: CorReleationDataType.QR });
+    }
+    this.telemetryGeneratorService.generateImpressionTelemetry(
+      dialcode ? ImpressionType.PAGE_REQUEST : InteractType.PLAY,
+      dialcode ? '' : InteractSubtype.DOWNLOAD,
+      dialcode ? PageId.TEXTBOOK_IMPORT : PageId.QR_CONTENT_RESULT,
+      this.source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+      dialcode ? this.content.identifier : undefined,
+      dialcode ? ObjectType.TEXTBOOK : undefined,
+      undefined, undefined,
+      dialcode ? corRelationList : undefined
+    );
+  }
+
+  private generateAuditEventForAutoFill() {
+    if (this.source === PageId.ONBOARDING_PROFILE_PREFERENCES && this.appGlobalService.isOnBoardingCompleted) {
+      let correlationlist: Array<CorrelationData> = this.populateCData(this.profile.board, CorReleationDataType.BOARD);
+      correlationlist = correlationlist.concat(this.populateCData(this.profile.medium, CorReleationDataType.MEDIUM));
+      correlationlist = correlationlist.concat(this.populateCData(this.profile.grade, CorReleationDataType.CLASS));
+      correlationlist.push({ id: ImpressionSubtype.AUTO, type: CorReleationDataType.FILL_MODE });
+      const rollup = ContentUtil.generateRollUp(this.content.hierarchyInfo, this.content.identifier);
+      this.telemetryGeneratorService.generateAuditTelemetry(
+        Environment.ONBOARDING,
+        AuditState.AUDIT_UPDATED,
+        undefined,
+        AuditType.SET_PROFILE,
+        undefined,
+        undefined,
+        undefined,
+        correlationlist,
+        rollup
+      );
+    }
+  }
+
+  private populateCData(formControllerValues, correlationType): Array<CorrelationData> {
+    const correlationList: Array<CorrelationData> = [];
+    if (formControllerValues) {
+      formControllerValues.forEach((value) => {
+        correlationList.push({
+          id: value,
+          type: correlationType
+        });
+      });
+    }
+    return correlationList;
+  }
 }
diff --git a/src/app/qrscanner-alert/qrscanner-alert.page.html b/src/app/qrscanner-alert/qrscanner-alert.page.html
index 4ebf3f240..6b674eaed 100644
--- a/src/app/qrscanner-alert/qrscanner-alert.page.html
+++ b/src/app/qrscanner-alert/qrscanner-alert.page.html
@@ -8,12 +8,12 @@
       </ion-row>
 
       <ion-row>
-        <ion-col offset="2" size="7" text-center class="msg">
+        <ion-col offset="2" size="7" class="msg ion-text-center">
           <p> {{ messageKey | translate }}</p>
         </ion-col>
       </ion-row>
 
-      <ion-row text-center *ngIf="showOnlyPrimaryBtn">
+      <ion-row class="ion-text-center" *ngIf="showOnlyPrimaryBtn">
         <ion-col size="12">
           <a block (click)="tryAgain()"> {{ tryAgainKey | translate }}</a>
         </ion-col>
@@ -22,7 +22,7 @@
   </ion-content>
   <ion-footer class="ion-padding">
     <ion-button expand="block" slot="end" (click)="cancel()"> {{ skipKey | translate }}
-      <ion-icon name="arrow-round-forward" role="img" class="icon icon-md ion-md-arrow-round-forward pull-right"
+      <ion-icon name="arrow-forward" role="img" class="icon icon-md ion-md-arrow-round-forward pull-right"
         aria-label="arrow round-forward" ng-reflect-name="arrow-round-forward"></ion-icon>
     </ion-button>
   </ion-footer>
@@ -37,12 +37,12 @@
       </ion-row>
 
       <ion-row>
-        <ion-col offset="2" size="8" text-center class="msg">
+        <ion-col offset="2" size="8" class="ion-text-center msg">
           <p><strong> {{ messageKey | translate }} </strong></p>
         </ion-col>
       </ion-row>
 
-      <ion-row text-center *ngIf="!showOnlyPrimaryBtn">
+      <ion-row class="ion-text-center" *ngIf="!showOnlyPrimaryBtn">
         <ion-col size="12">
           <a block (click)="tryAgain()"> {{ tryAgainKey | translate }}</a>
         </ion-col>
@@ -52,7 +52,7 @@
 
   <ion-footer class="ion-padding">
     <ion-button class="arrow-icon" expand="block" slot="end" (click)="cancel()"> {{ skipKey | translate }}
-      <ion-icon name="arrow-round-forward" role="img" class="icon icon-md ion-md-arrow-round-forward pull-right"
+      <ion-icon name="arrow-forward" role="img" class="icon icon-md ion-md-arrow-round-forward pull-right"
         aria-label="arrow round-forward" ng-reflect-name="arrow-round-forward"></ion-icon>
     </ion-button>
   </ion-footer>
diff --git a/src/app/reports/group-report-alert/group-report-alert.component.html b/src/app/reports/group-report-alert/group-report-alert.component.html
deleted file mode 100644
index 51f84997b..000000000
--- a/src/app/reports/group-report-alert/group-report-alert.component.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<ion-header>
-  <ion-item class="background-color">
-      <span class="popover-header-text popover-header-color" slot="start">{{assessment?.index}}</span>
-      <ion-icon class="popover-header-color" slot="end" (click)="cancel()" ios="ios-close" md="md-close" item-end></ion-icon>
-  </ion-item>
-  <ion-segment [(ngModel)]="report" (ngModelChange)="getAssessmentByUser($event)">
-      <ion-segment-button value="questions">
-          {{ 'QUESTION' | translate }}
-      </ion-segment-button>
-      <ion-segment-button value="users">
-          {{ 'USER' | translate }}
-      </ion-segment-button>
-  </ion-segment>
-</ion-header>
-
-<ion-content>
-  <div [ngSwitch]="report">
-      <ion-list *ngSwitchCase="'users'" class="fromGroup">
-          <app-assessment-details [assessmentData]="fromUserAssessment" [columns]="fromUserColumns"></app-assessment-details>
-      </ion-list>
-      <ion-list class="margin0" *ngSwitchCase="'questions'">
-          <ion-item>
-            <ion-label>
-              <p>{{'ACCURACY' | translate}}</p>
-              <h3>{{assessment?.accuracy}}</h3>
-            </ion-label>
-          </ion-item>
-          <ion-item class="assessmentDetails">
-            <ion-label>
-              <p>{{'QUESTION' | translate}}</p>
-              <h3>{{assessment?.qtitle}}</h3>
-            </ion-label>
-          </ion-item>
-          <ion-item class="assessmentDetails">
-            <ion-label>
-              <p>{{ 'DESCRIPTION' | translate}}</p>
-              <h3 *ngIf="assessment?.qdesc">{{assessment?.qdesc}}</h3>
-              <h3 *ngIf="!assessmentDetails?.qdesc">{{'NO_DESCRIPTION' | translate}}</h3>
-            </ion-label>
-          </ion-item>
-      </ion-list>
-  </div>
-</ion-content>
\ No newline at end of file
diff --git a/src/app/reports/group-report-alert/group-report-alert.component.scss b/src/app/reports/group-report-alert/group-report-alert.component.scss
deleted file mode 100644
index 8b5939fb1..000000000
--- a/src/app/reports/group-report-alert/group-report-alert.component.scss
+++ /dev/null
@@ -1,162 +0,0 @@
-@import "src/assets/styles/_custom-mixins.scss";
-
-:host {
-  .msg {
-    color: white;
-    font-size: medium;
-    background-color: blue;
-  }
-  .twocolordiv {
-    position: relative;
-    z-index: 9;
-    background: red;
-    width: 60%;
-    height: 10px;
-  }
-  .twocolordiv:before {
-    content: "";
-    position: absolute;
-    z-index: -1;
-    top: 0;
-    @include ltr() {
-            right: 30%;
-            left: 0;
-        }
-    
-        @include rtl() {
-            left: 30%;
-            right: 0;
-        }
- 
-    background: green;
-  }
-  .row-align {
-    @include padding(10px, 16px !important);
-  }
-  .margin0 {
-    margin: 0 !important;
-  }
-  .scroll {
-    overflow-y: scroll;
-    overflow-x: hidden;
-    height: 40vh;
-    padding-bottom: 10px !important;
-  }
-  .toolbar-md {
-    padding: 0 !important;
-  }
-  .header-md::after,
-  .tabs-md[tabsPlacement="top"] > .tabbar::after,
-  .footer-md::before,
-  .tabs-md[tabsPlacement="bottom"] > .tabbar::before {
-    background-image: none;
-  }
-  .toolbar-background-md {
-    border-color: none !important;
-    background: none !important;
-  }
-  progress-bar {
-    padding: 8px !important;
-    margin-top: 12px !important;
-  }
-  .input-wrapper {
-    @include padding(null, 16px !important);
-  }
-  .item-ios {
-    @include padding(null, null, null, 0);
-  }
-  .item-md {
-    @include padding(null, null, null, 0 !important);
-  }
-  .text-center {
-    text-align: center !important;
-    font-size: 1.3rem !important;
-  }
-  .grid-align {
-    background-color: white;
-    padding-left: 0 !important;
-    padding-right: 0 !important;
-    padding: 0 !important;
-  }
-  .report-header {
-    background-color: dodgerblue !important;
-    padding: 12px !important;
-  }
-  .result {
-    color: white;
-  }
-  .text-alignment {
-    text-align: center;
-    font-size: 1rem;
-  }
-  .white {
-    color: white;
-  }
-  .icon-tickmark {
-    color: green;
-    font-weight: 600 !important;
-  }
-  .ellipsis {
-    max-width: 100%;
-    text-overflow: ellipsis;
-  }
-  .column-align {
-    color: dodgerblue;
-    text-align: center;
-    padding: 0 !important;
-  }
-  .text-align {
-    color: dodgerblue;
-    font-size: 1.1rem;
-  }
-  .icon-align {
-    color: dodgerblue;
-    font-size: 2.6rem;
-  }
-  .G:nth-child(even) {
-    background: lightgrey;
-  }
-  .G:nth-child(odd) {
-    background: #fff;
-  }
-  .assessmentDetails h3 {
-    white-space: normal;
-  }
-  .popover-header-color {
-    color: #fff;
-  }
-  .popover-header-text {
-    font-size:16px;
-  }
-  ion-item.background-color {
-    --ion-item-background:dodgerblue;
-    color:white;
-  }
-}
-.group-report-alert .popover-content {
-  margin: 0;
-  width: 100% !important;
-  max-height: 75vh !important;
-  box-shadow: unset;
-  position: fixed;
-  left: 0 !important;
-   @include ltr() {
-    left: 0 !important;
-  }
-
-  @include rtl() {
-    right: 0 !important;
-  } 
-  top: unset !important;
-  bottom: 0 !important;
-  transform-origin: bottom -100% !important;
-  transform: translateY(0) !important;
-  overflow-y: hidden;
-}
-.group-report-alert ion-backdrop {
-  background-color: #000 !important;
-  opacity: 0.4 !important;
-}
-.fromGroup ngx-datatable datatable-body {
-  height: calc(100vh - 50.5vh) !important;
-}
diff --git a/src/app/reports/group-report-alert/group-report-alert.component.spec.ts b/src/app/reports/group-report-alert/group-report-alert.component.spec.ts
deleted file mode 100644
index 3cd22f1b3..000000000
--- a/src/app/reports/group-report-alert/group-report-alert.component.spec.ts
+++ /dev/null
@@ -1,209 +0,0 @@
-import { GroupReportAlertComponent } from './group-report-alert.component';
-import { NavParams, ModalController, NavController, LoadingController, Platform, PopoverController } from '@ionic/angular';
-import { SummarizerService, SummaryRequest } from 'sunbird-sdk';
-import { TranslateService } from '@ngx-translate/core';
-import { CommonUtilService } from '@app/services/common-util.service';
-import { Location } from '@angular/common';
-import { of, throwError } from 'rxjs';
-
-describe('GroupReportAlertComponent', () => {
-    let groupReportAlertComponent: GroupReportAlertComponent;
-    const mockNavParams: Partial<NavParams> = {
-        get: jest.fn()
-    };
-    const mockModalCtrl: Partial<ModalController> = {};
-    const mockNavCtrl: Partial<NavController> = {};
-    const mockLoading: Partial<LoadingController> = {};
-    const mockPlatform: Partial<Platform> = {};
-    const mockSummarizerService: Partial<SummarizerService> = {};
-    const mockTranslate: Partial<TranslateService> = {};
-    const mockCommonUtilService: Partial<CommonUtilService> = {
-        translateMessage: jest.fn(() => 'first name')
-    };
-    const mockPopOverCtrl: Partial<PopoverController> = {};
-    const mockLocation: Partial<Location> = {};
-
-    beforeAll(() => {
-        groupReportAlertComponent = new GroupReportAlertComponent(
-            mockNavParams as NavParams,
-            mockModalCtrl as ModalController,
-            mockNavCtrl as NavController,
-            mockLoading as LoadingController,
-            mockPlatform as Platform,
-            mockSummarizerService as SummarizerService,
-            mockTranslate as TranslateService,
-            mockCommonUtilService as CommonUtilService,
-            mockPopOverCtrl as PopoverController,
-            mockLocation as Location
-        );
-    });
-
-    beforeEach(() => {
-        jest.clearAllMocks();
-    });
-
-    it('should be creaate a instance of groupReportAlertComponent', () => {
-        expect(groupReportAlertComponent).toBeTruthy();
-    });
-
-    it('should show assessment report for user by invoked getAssessmentByUser()', (done) => {
-        // arrange
-        const event = 'users';
-        const dismissFn = jest.fn(() => Promise.resolve());
-        mockCommonUtilService.getLoader = jest.fn(() => ({
-            dismiss: dismissFn
-        }));
-        const userData = new Map();
-        userData.set('uid', 'sampe-uid');
-        groupReportAlertComponent.assessment = {
-            qid: 'Q001',
-            uids: 'sample-user',
-            contentId: 'sample-content-id',
-            time: '2:06',
-            users: userData
-        };
-        const summaryRequest: SummaryRequest = {
-            qId: groupReportAlertComponent.assessment.qid,
-            uids: groupReportAlertComponent.assessment.uids,
-            contentId: groupReportAlertComponent.assessment.contentId,
-            hierarchyData: null
-        };
-        const assessmentResult = [{
-            time: '7.00s',
-            name: groupReportAlertComponent.assessment.uids,
-            max_score: '5',
-            result: '3.0',
-            res: '3.0/5',
-            uid: 'uid'
-        }];
-        mockSummarizerService.getDetailsPerQuestion = jest.fn(() => of(assessmentResult));
-        // act
-        groupReportAlertComponent.getAssessmentByUser(event).then(() => {
-            // assert
-            setTimeout(() => {
-                expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
-                expect(mockSummarizerService.getDetailsPerQuestion).toHaveBeenCalledWith(summaryRequest);
-                done();
-            }, 0);
-        });
-    });
-
-    it('should not show assessment report for user by invoked getAssessmentByUser() for catch part', (done) => {
-        // arrange
-        const event = 'users';
-        const dismissFn = jest.fn(() => Promise.resolve());
-        mockCommonUtilService.getLoader = jest.fn(() => ({
-            dismiss: dismissFn
-        }));
-        groupReportAlertComponent.assessment = {
-            qid: 'Q001',
-            uids: 'sample-user',
-            contentId: 'sample-content-id',
-            time: '2:06',
-        };
-        const summaryRequest: SummaryRequest = {
-            qId: groupReportAlertComponent.assessment.qid,
-            uids: groupReportAlertComponent.assessment.uids,
-            contentId: groupReportAlertComponent.assessment.contentId,
-            hierarchyData: null
-        };
-        const assessmentResult = [{
-            time: '7.00s',
-            name: groupReportAlertComponent.assessment.uids,
-            max_score: '5',
-            result: '3.0',
-            res: '3.0/5',
-            uid: 'uid'
-        }];
-        mockSummarizerService.getDetailsPerQuestion = jest.fn(() => throwError(assessmentResult));
-        // act
-        groupReportAlertComponent.getAssessmentByUser(event);
-        // assert
-        setTimeout(() => {
-            expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
-            expect(mockSummarizerService.getDetailsPerQuestion).toHaveBeenCalledWith(summaryRequest);
-            expect(dismissFn).toHaveBeenCalled();
-            done();
-        }, 0);
-    });
-
-    it('should be dismissed the popup by invocked cancel()', () => {
-        // arrange
-        mockPopOverCtrl.dismiss = jest.fn();
-        // act
-        groupReportAlertComponent.cancel();
-        // assert
-        expect(mockPopOverCtrl.dismiss).toHaveBeenCalled();
-    });
-
-    it('should used for bckbutton subscribe and unsubscribe', () => {
-        // arrange
-        const subscribeWithPriorityFn = jest.fn((_, fn) => fn());
-        mockPlatform.backButton = {
-            subscribeWithPriority: subscribeWithPriorityFn
-        } as any;
-        jest.spyOn(groupReportAlertComponent, 'dismissPopup').mockImplementation();
-        const unsubscribeFn = jest.fn();
-        groupReportAlertComponent.backButtonFunc = {
-            unsubscribe: unsubscribeFn
-        } as any;
-        // act
-        groupReportAlertComponent.ionViewWillEnter();
-        // assert
-        expect(subscribeWithPriorityFn).toHaveBeenCalled();
-        expect(groupReportAlertComponent.dismissPopup).toHaveBeenCalled();
-        expect(unsubscribeFn).toHaveBeenCalled();
-    });
-
-    it('should be unsubscribe device backbutton', () => {
-        // arrange
-        const unsubscribeFn = jest.fn();
-        groupReportAlertComponent.backButtonFunc = {
-            unsubscribe: unsubscribeFn
-        } as any;
-        // act
-        groupReportAlertComponent.ionViewWillLeave();
-        // assert
-        expect(unsubscribeFn).toHaveBeenCalled();
-    });
-
-    it('should dissmiss active popup', (done) => {
-        // arrange
-        const dismissFn = jest.fn();
-        mockPopOverCtrl.getTop = jest.fn(() => Promise.resolve({dismiss: dismissFn}as any));
-        groupReportAlertComponent = new GroupReportAlertComponent(
-            mockNavParams as NavParams,
-            mockModalCtrl as ModalController,
-            mockNavCtrl as NavController,
-            mockLoading as LoadingController,
-            mockPlatform as Platform,
-            mockSummarizerService as SummarizerService,
-            mockTranslate as TranslateService,
-            mockCommonUtilService as CommonUtilService,
-            mockPopOverCtrl as PopoverController,
-            mockLocation as Location
-        );
-        // act
-        groupReportAlertComponent.dismissPopup();
-        setTimeout(() => {
-            // assert
-            expect(mockPopOverCtrl.getTop).toHaveBeenCalled();
-            expect(dismissFn).toHaveBeenCalled();
-            done();
-        }, 0);
-    });
-
-    it('should not dissmiss active popup only for location back', (done) => {
-        // arrange
-        mockPopOverCtrl.getTop = jest.fn(() => (''));
-        mockLocation.back = jest.fn();
-        // act
-        groupReportAlertComponent.dismissPopup();
-        setTimeout(() => {
-            // assert
-            expect(mockPopOverCtrl.getTop).toHaveBeenCalled();
-            expect(mockLocation.back).toHaveBeenCalled();
-            done();
-        }, 0);
-    });
-});
diff --git a/src/app/reports/group-report-alert/group-report-alert.component.ts b/src/app/reports/group-report-alert/group-report-alert.component.ts
deleted file mode 100644
index 3d360bd0e..000000000
--- a/src/app/reports/group-report-alert/group-report-alert.component.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { Component, OnInit, Inject } from '@angular/core';
-import { NavParams, ModalController, Platform, NavController, LoadingController, PopoverController } from '@ionic/angular';
-import { SummarizerService, SummaryRequest, ReportSummary } from 'sunbird-sdk';
-import { TranslateService } from '@ngx-translate/core';
-import { CommonUtilService } from '@app/services/common-util.service';
-import { Location } from '@angular/common';
-import {Subscription} from 'rxjs';
-
-export interface QRAlertCallBack {
-  cancel(): any;
-}
-
-
-@Component({
-  selector: 'app-group-report-alert',
-  templateUrl: './group-report-alert.component.html',
-  styleUrls: ['./group-report-alert.component.scss'],
-})
-export class GroupReportAlertComponent implements OnInit {
-
-  callback: QRAlertCallBack;
-  reportSummary: ReportSummary;
-  report = 'users';
-  fromUserColumns = [{
-    name: this.commonUtilService.translateMessage('FIRST_NAME'),
-    prop: 'name'
-  }, {
-    name: this.commonUtilService.translateMessage('TIME'),
-    prop: 'time'
-  }, {
-    name: this.commonUtilService.translateMessage('RESULT'),
-    prop: 'res'
-  }];
-  assessment: any;
-  fromUserAssessment = { 'uiRows': [], showResult: false };
-  backButtonFunc: Subscription;
-
-  constructor(
-    navParams: NavParams,
-    private modalCtrl: ModalController,
-    private navCtrl: NavController,
-    private loading: LoadingController,
-    private platform: Platform,
-    @Inject('SUMMARIZER_SERVICE') public summarizerService: SummarizerService,
-    private translate: TranslateService,
-    private commonUtilService: CommonUtilService,
-    private popOverCtrl: PopoverController,
-    private location: Location
-  ) {
-    this.report = 'questions';
-    this.assessment = navParams.get('callback');
-  }
-
-  ngOnInit() { }
-
-  async getAssessmentByUser(event) {
-    if (event === 'users') {
-      const loader = await this.commonUtilService.getLoader();
-      const summaryRequest: SummaryRequest = {
-        qId: this.assessment['qid'],
-        uids: this.assessment['uids'],
-        contentId: this.assessment['contentId'],
-        hierarchyData: null
-      };
-      const that = this;
-      this.summarizerService.getDetailsPerQuestion(summaryRequest).toPromise()
-        .then((data: any) => {
-          if (data.length > 0) {
-            data.forEach(assessment => {
-              assessment.time = that.convertTotalTime(assessment.time);
-              assessment.name = that.assessment['users'].get(assessment.uid);
-              assessment.res = assessment.result + '/' + assessment.max_score;
-            });
-            that.fromUserAssessment['uiRows'] = data;
-          }
-        }).catch(async (error) => {
-          await loader.dismiss();
-        });
-    }
-  }
-
-  cancel() {
-    this.popOverCtrl.dismiss();
-  }
-
-  ionViewWillEnter() {
-    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(11, () => {
-      this.dismissPopup();
-      this.backButtonFunc.unsubscribe();
-    });
-  }
-
-  ionViewWillLeave() {
-    if (this.backButtonFunc) {
-      this.backButtonFunc.unsubscribe();
-    }
-  }
-  /**
-   * It will Dismiss active popup
-   */
-  async dismissPopup() {
-    const activePopover = await this.popOverCtrl.getTop();
-    if (activePopover) {
-      activePopover.dismiss();
-    } else {
-      this.location.back();
-    }
-  }
-
-  convertTotalTime(time: number): string {
-    const mm = Math.floor(time / 60);
-    const ss = Math.floor(time % 60);
-    return (mm > 9 ? mm : ('0' + mm)) + ':' + (ss > 9 ? ss : ('0' + ss));
-  }
-
-}
diff --git a/src/app/reports/group-report-list/group-report-list.component.html b/src/app/reports/group-report-list/group-report-list.component.html
deleted file mode 100644
index 352d52e86..000000000
--- a/src/app/reports/group-report-list/group-report-list.component.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<ion-header>
-  <ion-toolbar no-border-bottom>
-    <ion-buttons class="sb-hamburger" slot="start">
-        <ion-button class="color" (click)="goBack()">
-            <ion-icon slot="icon-only" name="arrow-back"></ion-icon>
-        </ion-button>
-    </ion-buttons>
-    <ion-title class="f16 color" ellipsis>
-        {{contentName}}
-    </ion-title>
-    <ion-buttons slot="end">
-        <ion-button class="color" icon-only (click)='importcsv()'>
-        <ion-icon ios="ios-download" md="md-download"></ion-icon>
-        </ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-
-  <ion-toolbar no-border-top>
-      <ion-segment [(ngModel)]="reportType" (ngModelChange)="fetchAssessment($event,false)">
-          <ion-segment-button value="users">
-              {{ 'BY_USERS' | translate }}
-          </ion-segment-button>
-          <ion-segment-button value="questions">
-              {{ 'BY_QUESTIONS' | translate }}
-          </ion-segment-button>
-      </ion-segment>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content class="no-scroll">
-  <div [ngSwitch]="reportType">
-      <ion-list *ngSwitchCase="'users'" class="fromGroup">
-          <app-assessment-details [assessmentData]="fromUserAssessment" [columns]="fromUserColumns"></app-assessment-details>
-      </ion-list>
-      <ion-list class="margin0 fromGroup" *ngSwitchCase="'questions'" (showQuestionFromUser)="showQuestionFromUser($event)">
-          <app-assessment-details [assessmentData]="fromQuestionAssessment" [columns]="fromQuestionColumns"></app-assessment-details>
-      </ion-list>
-  </div>
-</ion-content>
diff --git a/src/app/reports/group-report-list/group-report-list.component.scss b/src/app/reports/group-report-list/group-report-list.component.scss
deleted file mode 100644
index 99b3dcfd6..000000000
--- a/src/app/reports/group-report-list/group-report-list.component.scss
+++ /dev/null
@@ -1,144 +0,0 @@
-@import "src/assets/styles/_custom-mixins.scss";
-@import "src/assets/styles/fonts.scss";
-
-:host {
-  .G:nth-child(even) {
-    background: lightgrey;
-  }
-  .G:nth-child(odd) {
-    background: #fff;
-  }
-  .card {
-    background-color: white;
-    position: absolute;
-    z-index: 100;
-    height: 25%;
-    top: 3%;
-    bottom: 0;
-         @include ltr() {
-      right: 17px;
-      left: 17px;
-    }
-
-    @include rtl() {
-      left: 17px;
-      right: 17px;
-    }
- 
-    border-radius: 5px;
-    box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
-  }
-
-  .ellipsis {
-    max-width: 100%;
-    text-overflow: ellipsis;
-    // @include text-align("start" !important);
-    font-size: 1.5rem !important;
-  }
-  .text-center {
-    text-align: center !important;
-    font-size: 1.3rem !important;
-  }
-  .inner-card {
-    padding: 0 !important;
-  }
-  .toolbar-md {
-    padding: 0 !important;
-  }
-  .row-align {
-    @include padding(10px, 16px !important);
-  }
-  .header-md::after,
-  .tabs-md[tabsPlacement="top"] > .tabbar::after,
-  .footer-md::before,
-  .tabs-md[tabsPlacement="bottom"] > .tabbar::before {
-    background-image: none;
-  }
-  .toolbar-background-md {
-    border-color: none !important;
-    background: none !important;
-  }
-  .margin0 {
-    margin: 0 !important;
-  }
-  .ellipsis {
-    max-width: 100%;
-    text-overflow: ellipsis;
-  }
-  .column-align {
-    color: dodgerblue;
-    text-align: center;
-    padding: 0 !important;
-  }
-  .text-align {
-    color: dodgerblue;
-    font-size: 1.1rem;
-  }
-  .icon-align {
-    color: dodgerblue;
-    font-size: 2.6rem;
-  }
-  .result {
-    color: white;
-    //text-align: center;
-  }
-  .white {
-    color: white;
-  }
-  .icon-tickmark {
-    color: green;
-   font-weight: 600 !important;
-  }
-  .icon-close {
-    color: red;
-    font-weight: 600 !important;
-  }
-  .grid-align {
-    margin-top: 11%;
-    background-color: white;
-    @include padding(null, 0 !important);
-  }
-  .report-header {
-    background-color: dodgerblue !important;
-    padding-top: 32% !important;
-    height: 44vw !important;
-  }
-  .download-icon {
-    font-size: 1.8rem;
-    @include padding(null, 10px, null, null);
-  }
-  .share-icon {
-    font-size: 1.8rem;
-  }
-  .action-sheets-groups-page {
-    .icon-edition {
-      color: grey;
-    }
-    .icon-close {
-      color: grey;
-      float: right;
-      background-color: turquoise;
-    }
-    .action-sheet-cancel ion-icon,
-    .action-sheet-destructive {
-      color: red;
-    }
-  }
-  ion-content.no-scroll .scroll-content {
-    overflow: hidden;
-  }
-
-  .fromGroup ngx-datatable datatable-body {
-    height: calc(100vh - 40vh) !important;
-  }
-
-  ion-title.color,ion-button.color {
-    --color:#024f9d !important;
-    font-weight:bold !important;
-  }
-}
-.segment-md .segment-button {
-  font-weight: 700 !important;
-  color: black !important;
-  background-color: #ffffff;
-}
diff --git a/src/app/reports/group-report-list/group-report-list.component.ts b/src/app/reports/group-report-list/group-report-list.component.ts
deleted file mode 100644
index 8fa7cda64..000000000
--- a/src/app/reports/group-report-list/group-report-list.component.ts
+++ /dev/null
@@ -1,374 +0,0 @@
-import { AppGlobalService } from '@app/services/app-global-service.service';
-import { UtilityService } from '@app/services/utility-service';
-import { AppHeaderService } from '@app/services/app-header.service';
-import { CommonUtilService } from '@app/services/common-util.service';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import {
-  Environment,
-  InteractSubtype,
-  InteractType,
-  PageId
-} from '@app/services/telemetry-constants';
-import { Component, OnInit, Inject, NgZone } from '@angular/core';
-import { LoadingController, Platform } from '@ionic/angular';
-import { GroupReportAlertComponent } from '../group-report-alert/group-report-alert.component';
-import { TranslateService } from '@ngx-translate/core';
-import { File } from '@ionic-native/file/ngx';
-import { DatePipe } from '@angular/common';
-import { DeviceInfo, Profile, ReportSummary, SummarizerService, SummaryRequest } from 'sunbird-sdk';
-import { FileTransfer, FileTransferObject } from '@ionic-native/file-transfer/ngx';
-import { Router } from '@angular/router';
-import { Subscription } from 'rxjs';
-import { Location } from '@angular/common';
-
-@Component({
-  selector: 'app-group-report-list',
-  templateUrl: './group-report-list.component.html',
-  styleUrls: ['./group-report-list.component.scss'],
-})
-export class GroupReportListComponent implements OnInit {
-  isFromUsers: boolean;
-  isFromGroups: boolean;
-  uids: Array<string>;
-  users: Array<string>;
-  reportType = 'users';
-  expTime: any;
-  deviceId: string;
-  response: any;
-  responseByUser: any;
-
-
-  // Below variable stores group Report
-  groupReport: any;
-  profile: Profile;
-  currentGroupId: string;
-  fromUserColumns = [{
-    name: this.commonUtilService.translateMessage('FIRST_NAME'),
-    prop: 'userName'
-  }, {
-    name: this.commonUtilService.translateMessage('TIME'),
-    prop: 'totalTimespent'
-  }, {
-    name: this.commonUtilService.translateMessage('SCORE'),
-    prop: 'score'
-  }];
-  fromQuestionColumns = [{
-    name: this.commonUtilService.translateMessage('QUESTIONS'),
-    prop: 'index'
-  }, {
-    name: this.commonUtilService.translateMessage('MARKS'),
-    prop: 'maxScore'
-  }, {
-    name: this.commonUtilService.translateMessage('ACCURACY'),
-    prop: 'accuracy'
-  }];
-
-  fromUserAssessment: {};
-  fromQuestionAssessment: {};
-  contentName: string;
-  listOfReports: Array<ReportSummary> = [];
-  group: any;
-  groupInfo: any;
-  downloadDirectory: any;
-  reportSummary: ReportSummary;
-  report: ReportSummary;
-
-  fileTransfer: FileTransferObject = this.transfer.create();
-  private deviceBackButton: Subscription;
-
-  constructor(
-    private loading: LoadingController,
-    private zone: NgZone,
-    private transfer: FileTransfer,
-    @Inject('SUMMARIZER_SERVICE') public summarizerService: SummarizerService,
-    private translate: TranslateService,
-    private telemetryGeneratorService: TelemetryGeneratorService,
-    private appGlobalService: AppGlobalService,
-    private utilityService: UtilityService,
-    private file: File,
-    private datePipe: DatePipe,
-    @Inject('DEVICE_INFO') private deviceInfo: DeviceInfo,
-    private commonUtilService: CommonUtilService,
-    private headerService: AppHeaderService,
-    private router: Router,
-    private location: Location,
-    private platform: Platform,
-  ) {
-    const state = this.router.getCurrentNavigation().extras.state;
-    if (state) {
-      this.groupInfo = this.router.getCurrentNavigation().extras.state.group;
-      this.report = this.router.getCurrentNavigation().extras.state.report;
-      this.uids = this.router.getCurrentNavigation().extras.state.uids;
-      this.reportSummary = this.router.getCurrentNavigation().extras.state.report;
-      this.users = this.router.getCurrentNavigation().extras.state.users;
-
-    }
-    this.downloadDirectory = this.file.dataDirectory;
-    this.utilityService.getDownloadDirectoryPath()
-      .then((response: any) => {
-        this.downloadDirectory = response;
-        console.log('download path', this.downloadDirectory);
-      });
-  }
-
-  ngOnInit() {
-    this.deviceId = this.deviceInfo.getDeviceID();
-    this.profile = this.appGlobalService.getCurrentUser();
-    this.headerService.hideHeader();
-  }
-  ionViewWillEnter() {
-    this.fetchAssessment(this.reportType, false);
-    this.deviceBackButton = this.platform.backButton.subscribeWithPriority(10, () => {
-      this.goBack();
-      this.deviceBackButton.unsubscribe();
-    });
-  }
-
-  async fetchAssessment(event: string, fromUserList: boolean) {
-    const subType = (event === 'users') ? InteractSubtype.REPORTS_BY_USER_CLICKED : InteractSubtype.REPORTS_BY_QUESTION_CLICKED;
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      subType,
-      Environment.USER,
-      PageId.REPORTS_GROUP_ASSESMENT_DETAILS
-    );
-
-    const loader = await this.commonUtilService.getLoader();
-    this.reportSummary = this.report;
-    this.contentName = this.reportSummary.name;
-    const that = this;
-
-    const summaryRequest: SummaryRequest = {
-      qId: '',
-      uids: this.uids,
-      contentId: this.reportSummary.contentId,
-      hierarchyData: null
-    };
-    if (fromUserList) {
-      summaryRequest.uids = [this.reportSummary.uid];
-    }
-    if (event === 'users' && !this.fromUserAssessment) {
-      this.reportType = event;
-    //  await loader.present();
-      this.summarizerService.getReportsByUser(summaryRequest).toPromise()
-        .then((data: any) => {
-          this.groupReport = data;
-          let averageScore: any = 0;
-          let averageTime = 0;
-          data.forEach((report) => {
-            averageTime += report.totalTimespent;
-            averageScore += report.score;
-            report.totalTimespent = that.formatTime(report.totalTimespent);
-            report.name = this.reportSummary.name;
-            that.summarizerService.getLearnerAssessmentDetails(summaryRequest).toPromise()
-              .then(reportsMap => {
-                const data1 = reportsMap.get(report.uid);
-                const rows = data1.reportDetailsList.map(row => {
-                  return {
-                    index: 'Q' + (('00' + row.qindex).slice(-3)),
-                    result: row.score + '/' + row.maxScore,
-                    timespent: this.formatTime(row.timespent),
-                    qdesc: row.qdesc,
-                    score: row.score,
-                    maxScore: row.maxScore,
-                    qtitle: row.qtitle,
-                    qid: row.qid,
-                    name: report.userName,
-                    timestamp: report.createdAt,
-                  };
-                });
-                report.assessmentData = rows;
-              })
-              .catch(async (error: any) => {
-                console.log('error', error);
-                loader.present().then(() => {
-                  loader.dismiss();
-                });
-              });
-          });
-          this.response = data;
-          this.responseByUser = data;
-          averageScore = (averageScore / data.length).toFixed(2);
-          averageTime = averageTime / data.length;
-          this.appGlobalService.setAverageTime(averageTime);
-          this.appGlobalService.setAverageScore(averageScore);
-          const details = {
-            uiRows: data,
-            totalScore: averageScore,
-            uiTotalTime: that.formatTime(averageTime),
-            fromGroup: true,
-            fromUser: false,
-            questionsScore: this.reportSummary.totalQuestionsScore
-          };
-          that.zone.run(async () => {
-            loader.present().then(() => {
-              loader.dismiss();
-            });
-            that.fromUserAssessment = details;
-          });
-
-        })
-        .catch(async () => {
-          loader.present().then(() => {
-            loader.dismiss();
-          });
-        });
-    } else
-      if (event === 'questions') {
-        this.reportType = event;
-       // await loader.present();
-        this.summarizerService.getReportByQuestions(summaryRequest).toPromise()
-          .then((data: any) => {
-            this.response = data;
-            let averageTime = 0;
-            let averageScore: any = 0;
-            data.forEach((question) => {
-              question.index = 'Q' + (('00' + question.qindex).slice(-3));
-              averageTime += question.time_spent;
-              averageScore += question.maxScore;
-              question.accuracy = (question.correct_users_count || '0') + '/' + question.occurenceCount;
-              question.users = this.users;
-              question.uids = this.uids;
-            });
-            averageScore = (averageScore / data.length).toFixed(2);
-            averageTime = averageTime / data.length;
-            const details = {
-              uiRows: data,
-              totalScore: that.appGlobalService.getAverageScore(),
-              uiTotalTime: that.formatTime(that.appGlobalService.getAverageTime()),
-              showPopup: true,
-              popupCallback: GroupReportAlertComponent,
-              fromGroup: true,
-              fromUser: false
-            };
-            that.zone.run(async () => {
-              loader.present().then(() => {
-                loader.dismiss();
-              });
-              that.fromQuestionAssessment = details;
-            });
-          })
-          .catch(async (error: any) => {
-            console.log('error in 2nd one', error);
-            loader.present().then(() => {
-              loader.dismiss();
-            });
-          });
-      }
-  }
-
-  showQuestionFromUser() {
-    this.fetchAssessment('questions', true);
-  }
-
-
-  goToReportList() {
-    this.router.navigate(['user-report'], {
-      state: {
-        report: this.reportSummary
-      }
-    });
-  }
-
-  formatTime(time: number): string {
-    const mm = Math.floor(time / 60);
-    const ss = Math.floor(time % 60);
-    return (mm > 9 ? mm : ('0' + mm)) + ':' + (ss > 9 ? ss : ('0' + ss));
-  }
-  convertToCSV() {
-    let csv: any = '';
-    let line: any = '';
-    const values = this.responseByUser;
-    const valuesLength = values.length;
-    const fileExpTime = this.datePipe.transform(new Date(this.expTime), 'dd-MM-yyyy hh:mm:ss a');
-    // if (this.response && this.response[0].hasOwnProperty('assessmentData')) {
-    const contentStartTime = this.datePipe.transform(new Date(), 'dd-MM-yyyy hh:mm:ss a');
-    // Header
-    for (let m = 0; m < valuesLength; m++) {
-      line += 'Device ID' + ',' + this.deviceId + '\n';
-      line += 'Group name (Group ID)' + ',' + this.groupInfo.name + '(' + this.groupInfo.gid + ')' + '\n';
-      line += 'Content name (Content ID)' + ',' + values[m].name + '(' + values[m].contentId + ')' + '\n';
-      line += 'Content started time' + ',' + contentStartTime + '\n';
-      line += 'Average Time' + ',' + this.formatTime(this.appGlobalService.getAverageTime()) + '\n';
-      line += 'Average Score' + ',' + this.appGlobalService.getAverageScore() + '\n';
-      line += 'File export time' + ',' + fileExpTime + '\n';
-      line += '\n\n';
-      line += 'Name' + ',';
-      line += 'Time' + ',';
-      line += 'Score' + '\n';
-
-
-      for (let i = 0; i < this.groupReport.length; i++) {
-        line += '\"' + this.groupReport[i].userName + '\"' + ',';
-        line += '\"' + this.groupReport[i].totalTimespent + '\"' + ',';
-        line += '\"' + this.groupReport[i].score + '\"' + '\n';
-      }
-      line += '\n\n';
-      line += 'User name' + ',';
-      line += 'UserID' + ',';
-      line += 'Question#' + ',';
-      line += 'QuestionId' + ',';
-      line += 'Score' + ',';
-      line += 'Time' + '\n';
-      break;
-
-    }
-    line += '\n';
-    // Group Report
-
-    // Teams
-    for (let k = 0; k < values.length; k++) {
-      for (let j = 0; j < values[k].assessmentData.length; j++) {
-        line += '\"' + values[k].userName + '\"' + ',';
-        line += '\"' + values[k].uid + '\"' + ',';
-        line += '\"' + values[k].assessmentData[j].qtitle + '\"' + ',';
-        line += '\"' + values[k].assessmentData[j].qid + '\"' + ',';
-        line += '\"' + ' ' + values[k].assessmentData[j].score + '/' + values[k].assessmentData[j].maxScore + '\"' + ',';
-        line += '\"' + values[k].assessmentData[j].timespent + '\"' + '\n';
-      }
-      line += '\n\n';
-    }
-    csv += line + '\n';
-    return csv;
-  }
-
-  importcsv() {
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      InteractSubtype.DOWNLOAD_REPORT_CLICKED,
-      Environment.USER,
-      PageId.REPORTS_GROUP_ASSESMENT_DETAILS, undefined,
-    );
-    this.expTime = new Date().getTime();
-    const csv: any = this.convertToCSV();
-    const combineFilename = this.deviceId + '_' + this.groupInfo.gid + '_' + this.reportSummary.contentId + '_' + this.expTime + '.csv';
-    this.file.writeFile(this.downloadDirectory, combineFilename, csv)
-      .then(
-        _ => {
-          this.commonUtilService.showToast(
-              this.commonUtilService.translateMessage('CSV_DOWNLOAD_SUCCESS', combineFilename), false, 'custom-toast');
-        }
-      )
-      .catch(
-        () => {
-          this.file.writeExistingFile(this.downloadDirectory, combineFilename, csv)
-            .then(_ => {
-              this.commonUtilService.showToast(this.commonUtilService.translateMessage('CSV_DOWNLOAD_SUCCESS', combineFilename),
-                false, 'custom-toast');
-            })
-            .catch();
-        }
-      );
-  }
-
-  goBack() {
-    this.location.back();
-  }
-
-  ionViewWillLeave() {
-   if (this.deviceBackButton) {
-     this.deviceBackButton.unsubscribe();
-   }
-  }
-
-}
diff --git a/src/app/reports/report-alert/report-alert.component.html b/src/app/reports/report-alert/report-alert.component.html
deleted file mode 100644
index 3eb1a5852..000000000
--- a/src/app/reports/report-alert/report-alert.component.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<ion-content>
-    <ion-list class="report-alert-popover-list">
-        <ion-item class="popover-header">
-            <span slot="start" class="popover-header-text popover-header-color">{{assessmentDetails?.index}}</span>
-            <ion-icon (click)="cancel()" class="popover-header-color" ios="ios-close" md="md-close" slot="end">
-            </ion-icon>
-        </ion-item>
-        <div class="report-content">
-            <ion-item>
-                <ion-label>
-                    <p>{{'MARKS' | translate}}</p>
-                    <h3>{{assessmentDetails?.result}}</h3>
-                </ion-label>
-            </ion-item>
-            <ion-item class="assessmentDetails">
-                <ion-label>
-                    <p>{{'QUESTION' | translate}}</p>
-                    <h3>{{assessmentDetails?.qtitle}}</h3>
-                </ion-label>
-            </ion-item>
-            <ion-item class="assessmentDetails">
-                <ion-label>
-                    <p>{{ 'DESCRIPTION' | translate}}</p>
-                    <h3 *ngIf="assessmentDetails?.qdesc">{{assessmentDetails?.qdesc}}</h3>
-                    <h3 *ngIf="!assessmentDetails?.qdesc">{{'NO_DESCRIPTION' | translate}}</h3>
-                </ion-label>
-            </ion-item>
-        </div>
-    </ion-list>
-
-</ion-content>
\ No newline at end of file
diff --git a/src/app/reports/report-alert/report-alert.component.scss b/src/app/reports/report-alert/report-alert.component.scss
deleted file mode 100644
index bdebe7b43..000000000
--- a/src/app/reports/report-alert/report-alert.component.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-@import "src/assets/styles/base/_variables.scss";
-@import "src/assets/styles/_custom-mixins.scss";
-    .msg {
-      color: white;
-      font-size: medium;
-      background-color: blue;
-    }
-    .input-wrapper {
-     @include padding(null, 16px !important);
-    }
-    .row-align {
-     @include padding(10px, 16px !important);
-    }
-    .item-ios {
-       @include padding(null, null, null, 0 !important);
-    }
-    .item-md {
-      @include padding(null, null, null, 0 !important);
-    }
-    .assessmentDetails h3 {
-      white-space: normal;
-    }
-    ion-item.item.md.in-list.ion-focusable.hydrated.popover-header{
-      --ion-item-background : dodgerBlue;
-    }
-    .popover-header-text {
-      font-size: 16px;
-    }
-    .popover-header-color {
-      color: #fff;
-    }
-    ion-list.md.list-md.hydrated.report-alert-popover-list {
-      padding-top: 0px !important;
-    }
\ No newline at end of file
diff --git a/src/app/reports/report-alert/report-alert.component.ts b/src/app/reports/report-alert/report-alert.component.ts
deleted file mode 100644
index 99b62e6d4..000000000
--- a/src/app/reports/report-alert/report-alert.component.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Component, OnInit , ViewEncapsulation } from '@angular/core';
-import { NavParams, Platform, NavController, PopoverController } from '@ionic/angular';
-import { Location } from '@angular/common';
-import { Subscription } from 'rxjs';
-
-export interface QRAlertCallBack {
-  cancel(): any;
-}
-
-@Component({
-  selector: 'app-report-alert',
-  templateUrl: './report-alert.component.html',
-  styleUrls: ['./report-alert.component.scss'],
-  encapsulation: ViewEncapsulation.None
-})
-export class ReportAlertComponent implements OnInit {
-
-  callback: QRAlertCallBack;
-  assessmentDetails: any;
-  report = 'questions';
-  private backButtonFunc: Subscription;
-
-  constructor(
-    navParams: NavParams,
-    private navCtrl: NavController,
-    private platform: Platform,
-    private popOverCtrl: PopoverController,
-    private location: Location
-  ) {
-    this.assessmentDetails = navParams.get('callback');
-  }
-
-  ngOnInit() { }
-
-  cancel() {
-    this.popOverCtrl.dismiss();
-  }
-
-  ionViewWillEnter() {
-    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(11, () => {
-      this.dismissPopup();
-    });
-  }
-
-  ionViewWillLeave() {
-    this.backButtonFunc.unsubscribe();
-  }
-
-  /**
-   * It will Dismiss active popup
-   */
-  async dismissPopup() {
-    console.log('Fired ionViewWillLeave');
-    const activePopover = await this.popOverCtrl.getTop();
-
-    if (activePopover) {
-      await activePopover.dismiss();
-    } else {
-      this.location.back();
-
-    }
-  }
-
-}
diff --git a/src/app/reports/report-list/report-list.component.html b/src/app/reports/report-list/report-list.component.html
deleted file mode 100644
index 758a186a4..000000000
--- a/src/app/reports/report-list/report-list.component.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<ion-content class="ion-padding">
-  <ion-list>
-    <div *ngIf="listOfReports.length > 0 else emptyListOfReport">
-      <div class="flex-card-container" *ngFor="let report of listOfReports;let i=index"
-        (click)="goToGroupReportsList(report)" lines="none">
-        <div class="card-text">
-          <ion-label>
-            <h2 class="report-title">{{report.name}}</h2>
-            <p *ngIf="isFromUsers"><span>{{'SCORED' | translate}}: {{report.totalScore}}
-                <span *ngIf="report.totalQuestionsScore">/{{report.totalQuestionsScore}}</span>
-                <span *ngIf="!report.totalQuestionsScore && report.totalMaxScore">/{{report.totalMaxScore}}</span>
-              </span></p>
-          </ion-label>
-        </div>
-        <div class="card-icon">
-          <ion-icon name="ios-arrow-forward"></ion-icon>
-        </div>
-      </div>
-    </div>
-    <ng-template #emptyListOfReport>
-      <div text-center>
-      <div class="img-container">
-        <img class="image_style" alt="no_user" src="assets/imgs/ic_businessman.png">
-      </div>
-      <br />
-      <ion-row margin-top>
-        <ion-col size-md="6" offset-md="3" size-lg="6" offset-lg="3">
-          <div class="image-text">
-            <h6>
-              <strong>{{'NO_ASSESSMENT' | translate}}</strong>
-            </h6>
-            <p>{{'TAKE_ASSESSMENT' | translate}}</p>
-          </div>
-        </ion-col>
-      </ion-row>
-      </div>
-    </ng-template>
-  </ion-list>
-</ion-content>
\ No newline at end of file
diff --git a/src/app/reports/report-list/report-list.component.scss b/src/app/reports/report-list/report-list.component.scss
deleted file mode 100644
index e35708d9c..000000000
--- a/src/app/reports/report-list/report-list.component.scss
+++ /dev/null
@@ -1,54 +0,0 @@
-
-:host {
-  .settings-item-style {
-    padding-top: 5px;
-  }
-  ion-icon {
-    font-size: 22px !important;
-    font-weight: 550 !important;
-  }
-  .bgColor {
-    background-color: #f7f7f7;
-    border-radius: 3px;
-  }
-  .bgColor.item-block.item-md {
-    margin-bottom: 2rem;
-  }
-  .marginTop {
-    margin-top: 15px !important;
-  }
-  .header-md::after,
-  .tabs-md[tabsPlacement="top"] > .tabbar::after,
-  .footer-md::before,
-  .tabs-md[tabsPlacement="bottom"] > .tabbar::before {
-    background-image: none;
-  }
-  .item-md.item-block .item-inner {
-    border-bottom: 0 !important;
-  }
-  .flex-card-container {
-    display: flex;
-    flex-wrap: nowrap;
-    align-items:center;
-    justify-content:center;
-    background-color:#f1f1f1;
-    padding: 12px;
-    margin-bottom: 12px;
-    .card-text {
-      width: 100%;
-    }
-    .card-icon{
-      width: 20px;   
-    }
-  }
-  .report-title {
-    white-space: nowrap !important;
-    overflow: hidden !important;
-    text-overflow: ellipsis !important;
-    width: 79vw;
-    font-size: 16px !important;
-  }
-}
-.bgColor ion-label {
-  overflow: visible !important;
-}
diff --git a/src/app/reports/report-list/report-list.component.ts b/src/app/reports/report-list/report-list.component.ts
deleted file mode 100644
index 5b3996127..000000000
--- a/src/app/reports/report-list/report-list.component.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import { Component, OnInit, Inject, NgZone } from '@angular/core';
-import { LoadingController, Platform } from '@ionic/angular';
-import { LearnerAssessmentSummary, ReportSummary, SummarizerService, SummaryRequest, TelemetryObject } from 'sunbird-sdk';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import { AppHeaderService } from '@app/services/app-header.service';
-import { Environment, ImpressionType, InteractSubtype, InteractType, ObjectType, PageId } from '@app/services/telemetry-constants';
-import { CommonUtilService } from '@app/services/common-util.service';
-import { Router, NavigationExtras } from '@angular/router';
-import { RouterLinks } from '@app/app/app.constant';
-import { Subscription } from 'rxjs';
-import { Location } from '@angular/common';
-
-@Component({
-  selector: 'app-report-list',
-  templateUrl: './report-list.component.html',
-  styleUrls: ['./report-list.component.scss'],
-})
-export class ReportListComponent implements OnInit {
-
-  isFromUsers: boolean;
-  isFromGroups: boolean;
-  uids: Array<string>;
-  listOfUsers;
-  listOfReports: Array<LearnerAssessmentSummary> = [];
-  groupInfo: any;
-  handle: string;
-  assessment: {};
-  reportSummary: ReportSummary;
-  navData: any;
-  backButtonFunc: Subscription;
-
-  constructor(
-    @Inject('SUMMARIZER_SERVICE') public summarizerService: SummarizerService,
-    public ngZone: NgZone,
-    private telemetryGeneratorService: TelemetryGeneratorService,
-    private headerService: AppHeaderService,
-    private commonUtilService: CommonUtilService,
-    private router: Router,
-    private platform: Platform,
-    private location: Location
-  ) {
-    this.getNavData();
-  }
-
-  getNavData() {
-    const navigation = this.router.getCurrentNavigation();
-    if (navigation && navigation.extras && navigation.extras.state) {
-      this.navData = navigation.extras.state;
-      this.setNavData();
-    }
-  }
-
-  setNavData() {
-    this.isFromUsers = this.navData.isFromUsers;
-    this.isFromGroups = this.navData.isFromGroups;
-    this.uids = this.navData.uids;
-    this.handle = this.navData.handle;
-    this.groupInfo = this.navData.group;
-  }
-
-  ionViewWillEnter() {
-    this.headerService.showHeaderWithBackButton(null, this.commonUtilService.translateMessage('REPORTS'));
-    this.handleDeviceBackButton();
-  }
-
-  handleDeviceBackButton() {
-    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(11, () => {
-      this.goBack();
-    });
-  }
-
-  ionViewWillLeave() {
-    if (this.backButtonFunc) {
-      this.backButtonFunc.unsubscribe();
-      this.backButtonFunc = undefined;
-    }
-  }
-
-  async ngOnInit() {
-    this.telemetryGeneratorService.generateImpressionTelemetry(
-      ImpressionType.VIEW, '',
-      PageId.REPORTS_ASSESMENT_CONTENT_LIST,
-      Environment.USER
-    );
-    const loader = await this.commonUtilService.getLoader();
-    const summaryRequest: SummaryRequest = {
-        qId: '',
-        uids: this.uids,
-        contentId: '',
-        hierarchyData: null,
-      };
-    this.summarizerService.getSummary(summaryRequest).toPromise()
-        .then((list: LearnerAssessmentSummary[]) => {
-          this.ngZone.run(async () => {
-            loader.present().then(() => {
-              loader.dismiss();
-            });
-            this.listOfReports = list;
-          });
-        })
-        .catch(async err => {
-          console.log('get summary error :', err);
-          loader.present().then(() => {
-            loader.dismiss();
-          });
-        });
-  }
-
-  formatTime(time: number): string {
-    const mm = Math.floor(time / 60);
-    const ss = Math.floor(time % 60);
-    return (mm > 9 ? mm : ('0' + mm))
-      + ':' + (ss > 9 ? ss : ('0' + ss));
-  }
-
-
-  goToGroupReportsList(report: ReportSummary) {
-    const telemetryObject = new TelemetryObject(report.contentId, ObjectType.CONTENT, undefined);
-
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      InteractSubtype.CONTENT_CLICKED,
-      Environment.USER,
-      PageId.REPORTS_ASSESMENT_CONTENT_LIST,
-      telemetryObject
-    );
-    if (this.isFromUsers) {
-      const navigationExtras: NavigationExtras = { state: { report, handle: this.handle } };
-      this.router.navigate([`/${RouterLinks.REPORTS}/${RouterLinks.USER_REPORT}`], navigationExtras);
-    } else
-      if (this.isFromGroups) {
-        const uids = this.navData.uids;
-        const users = this.navData.users;
-
-        this.router.navigate([`${RouterLinks.REPORTS}/${RouterLinks.GROUP_REPORT}`], {
-          state: {
-            report,
-            uids,
-            users,
-            group: this.groupInfo
-          }
-        });
-      }
-  }
-
-  goBack() {
-    this.location.back();
-  }
-
-}
diff --git a/src/app/reports/report.page.spec.ts b/src/app/reports/report.page.spec.ts
deleted file mode 100644
index 5f719b6ee..000000000
--- a/src/app/reports/report.page.spec.ts
+++ /dev/null
@@ -1,446 +0,0 @@
-import { ReportsPage } from './reports.page';
-import {
-    ProfileService, GroupService, Profile,
-    ProfileSource, GetAllProfileRequest, ProfileType, Group, TelemetryObject, ObjectType
-} from 'sunbird-sdk';
-import { NgZone } from '@angular/core';
-import { LoadingController, Platform } from '@ionic/angular';
-import { ActivatedRoute, Router, NavigationExtras } from '@angular/router';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import { Location } from '@angular/common';
-import { AppHeaderService } from '@app/services/app-header.service';
-import { CommonUtilService } from '@app/services/common-util.service';
-import {
-    Environment,
-    ImpressionType,
-    InteractSubtype,
-    InteractType,
-    PageId
-} from '@app/services/telemetry-constants';
-import { of, throwError } from 'rxjs';
-import { RouterLinks } from '@app/app/app.constant';
-
-describe('ReportsPage', () => {
-    let reportsPage: ReportsPage;
-    const mockProfileService: Partial<ProfileService> = {};
-    const mockGroupService: Partial<GroupService> = {};
-    const mockNgZone: Partial<NgZone> = {};
-    const mockLoading: Partial<LoadingController> = {};
-    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
-    const mockHeaderService: Partial<AppHeaderService> = {};
-    const mockCommonUtilService: Partial<CommonUtilService> = {};
-    const mockRoute: Partial<ActivatedRoute> = {};
-    const mockRouter: Partial<Router> = {
-        getCurrentNavigation: jest.fn(() => ({
-            extras: {
-                state: {
-                    profile: {
-                        id: 'sample-uid-1',
-                        handle: 'f-name'
-                    }
-                }
-            }
-        }))
-    };
-    const mockLocation: Partial<Location> = {};
-    const mockPlatform: Partial<Platform> = {};
-
-
-    beforeAll(() => {
-        reportsPage = new ReportsPage(
-            mockProfileService as ProfileService,
-            mockGroupService as GroupService,
-            mockNgZone as NgZone,
-            mockLoading as LoadingController,
-            mockTelemetryGeneratorService as TelemetryGeneratorService,
-            mockHeaderService as AppHeaderService,
-            mockCommonUtilService as CommonUtilService,
-            mockRoute as ActivatedRoute,
-            mockRouter as Router,
-            mockLocation as Location,
-            mockPlatform as Platform,
-        );
-    });
-
-    beforeEach(() => {
-        jest.clearAllMocks();
-    });
-
-    it('should be create a instance for reportsPage', () => {
-        expect(reportsPage).toBeTruthy();
-    });
-
-    it('should generate Impression telemetry and enableBackBtn by invoked ngOnInit()', (done) => {
-        // arrange
-        mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn(() => { });
-        const presentFn = jest.fn(() => Promise.resolve());
-        const dismissFn = jest.fn(() => Promise.resolve());
-        mockCommonUtilService.getLoader = jest.fn(() => ({
-            present: presentFn,
-            dismiss: dismissFn,
-        }));
-        jest.spyOn(reportsPage, 'populateUsers').mockResolvedValue(['Current_user', 'group'])
-        jest.spyOn(reportsPage, 'enableBackBtn').mockImplementation(() => {
-            return;
-        });
-        jest.spyOn(reportsPage, 'populateGroups').mockResolvedValue({});
-        mockNgZone.run = jest.fn((fn) => fn());
-        // act
-        reportsPage.ngOnInit();
-        // assert
-        setTimeout(() => {
-            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
-                ImpressionType.VIEW,
-                '',
-                PageId.REPORTS_USER_GROUP,
-                Environment.USER
-            );
-            expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
-            expect(presentFn).toHaveBeenCalled();
-            expect(reportsPage.populateUsers).toHaveBeenCalled();
-            expect(mockNgZone.run).toHaveBeenCalled();
-            expect(reportsPage.populateGroups).toHaveBeenCalled();
-            expect(dismissFn).toHaveBeenCalled();
-            done();
-        }, 0);
-    });
-
-    it('should generate Impression telemetry and enableBackBtn by invoked ngOnInit()', (done) => {
-        // arrange
-        mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn(() => { });
-        const presentFn = jest.fn(() => Promise.resolve());
-        const dismissFn = jest.fn(() => Promise.resolve());
-        mockCommonUtilService.getLoader = jest.fn(() => ({
-            present: presentFn,
-            dismiss: dismissFn,
-        }));
-        jest.spyOn(reportsPage, 'populateUsers').mockRejectedValue('');
-        jest.spyOn(reportsPage, 'enableBackBtn').mockImplementation(() => {
-            return;
-        });
-        // act
-        reportsPage.ngOnInit();
-        // assert
-        setTimeout(() => {
-            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
-                ImpressionType.VIEW,
-                '',
-                PageId.REPORTS_USER_GROUP,
-                Environment.USER
-            );
-            expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
-            expect(presentFn).toHaveBeenCalled();
-            expect(reportsPage.populateUsers).toHaveBeenCalled();
-            expect(dismissFn).toHaveBeenCalled();
-            done();
-        }, 0);
-    });
-
-    it('should hide header by invoked ionViewWillEnter()', () => {
-        // arrange
-        mockHeaderService.hideHeader = jest.fn();
-        // act
-        reportsPage.ionViewWillEnter();
-        // assert
-        expect(mockHeaderService.hideHeader).toHaveBeenCalled();
-    });
-
-    it('should find all userProfile and populate users', (done) => {
-        // arrange
-        const profile: Profile[] = [{
-            uid: 'sample-uid-1',
-            handle: 'f-name',
-            source: ProfileSource.LOCAL,
-            profileType: ProfileType.TEACHER
-        }, {
-            uid: 'sample-uid-2',
-            handle: '',
-            source: ProfileSource.LOCAL,
-            profileType: ProfileType.TEACHER
-        }];
-        const getAllProfileRequest: GetAllProfileRequest = {
-            local: true
-        };
-        mockProfileService.getAllProfiles = jest.fn(() => of(profile));
-        mockProfileService.getActiveSessionProfile = jest.fn(() => of({
-            uid: 'sample-uid-1',
-            handle: 'f-name',
-            source: ProfileSource.LOCAL,
-            profileType: ProfileType.TEACHER
-        }));
-        reportsPage = new ReportsPage(
-            mockProfileService as ProfileService,
-            mockGroupService as GroupService,
-            mockNgZone as NgZone,
-            mockLoading as LoadingController,
-            mockTelemetryGeneratorService as TelemetryGeneratorService,
-            mockHeaderService as AppHeaderService,
-            mockCommonUtilService as CommonUtilService,
-            mockRoute as ActivatedRoute,
-            mockRouter as Router,
-            mockLocation as Location,
-            mockPlatform as Platform,
-        );
-        // act
-        reportsPage.populateUsers();
-        // assert
-        setTimeout(() => {
-            expect(mockProfileService.getAllProfiles).toHaveBeenCalledWith(getAllProfileRequest);
-            expect(mockProfileService.getActiveSessionProfile).toHaveBeenCalledWith({
-                requiredFields: ['completeness',
-                    'missingFields',
-                    'lastLoginTime',
-                    'topics',
-                    'organisations',
-                    'roles',
-                    'locations']
-            });
-            done();
-        }, 0);
-    });
-
-    it('should not find all userProfile and populate users for getActiveSessionProfile catch part', (done) => {
-        // arrange
-        const profile: Profile[] = [{
-            uid: 'sample-uid-1',
-            handle: 'f-name',
-            source: ProfileSource.LOCAL,
-            profileType: ProfileType.TEACHER
-        }, {
-            uid: 'sample-uid-2',
-            handle: '',
-            source: ProfileSource.LOCAL,
-            profileType: ProfileType.TEACHER
-        }];
-        const getAllProfileRequest: GetAllProfileRequest = {
-            local: true
-        };
-        mockProfileService.getAllProfiles = jest.fn(() => of(profile));
-        mockProfileService.getActiveSessionProfile = jest.fn(() => throwError(''));
-        // act
-        reportsPage.populateUsers().catch(() => {
-            // assert
-            setTimeout(() => {
-                expect(mockProfileService.getAllProfiles).toHaveBeenCalledWith(getAllProfileRequest);
-                expect(mockProfileService.getActiveSessionProfile).toHaveBeenCalledWith({
-                    requiredFields: ['completeness',
-                        'missingFields',
-                        'lastLoginTime',
-                        'topics',
-                        'organisations',
-                        'roles',
-                        'locations']
-                });
-                done();
-            }, 0);
-        });
-    });
-
-    it('should not find all userProfile and populate users for getAllProfiles catch part', (done) => {
-        // arrange
-        const profile: Profile[] = [{
-            uid: 'sample-uid-1',
-            handle: 'f-name',
-            source: ProfileSource.LOCAL,
-            profileType: ProfileType.TEACHER
-        }, {
-            uid: 'sample-uid-2',
-            handle: '',
-            source: ProfileSource.LOCAL,
-            profileType: ProfileType.TEACHER
-        }];
-        const getAllProfileRequest: GetAllProfileRequest = {
-            local: true
-        };
-        mockProfileService.getAllProfiles = jest.fn(() => throwError(profile));
-        // act
-        reportsPage.populateUsers().catch(() => {
-            // assert
-            setTimeout(() => {
-                expect(mockProfileService.getAllProfiles).toHaveBeenCalledWith(getAllProfileRequest);
-                done();
-            }, 0);
-        });
-    });
-
-    it('should return all active groups', (done) => {
-        // arrange
-        const group: Partial<Group>[] = [{
-            gid: 'group-1'
-        }];
-        mockGroupService.getAllGroups = jest.fn(() => of(group));
-        // act
-        reportsPage.populateGroups().then(() => {
-            setTimeout(() => {
-                // assert
-                expect(mockGroupService.getAllGroups).toHaveBeenCalledWith();
-                done();
-            }, 0);
-        });
-    });
-
-    it('should show user report list by invoked goToUserReportList()', () => {
-        // arrange
-        const uid = 'sample-uid-1';
-        const handle = 'f-name';
-        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn(() => { });
-        const telemetryObject: Partial<TelemetryObject> = {
-            id: uid,
-            type: ObjectType.USER,
-            version: undefined
-        };
-        mockRouter.navigate = jest.fn(() => Promise.resolve(true));
-        const navigationExtras: NavigationExtras = { state: { isFromUsers: true, uids: [uid], handle } };
-        // act
-        reportsPage.goToUserReportList(uid, handle);
-        // assert
-        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-            InteractType.TOUCH,
-            InteractSubtype.USER_CLICKED,
-            Environment.USER,
-            PageId.REPORTS_USER_GROUP,
-            telemetryObject
-        );
-        expect(mockRouter.navigate).toHaveBeenCalledWith([`/${RouterLinks.REPORTS}/${RouterLinks.REPORTS_LIST}`], navigationExtras);
-    });
-
-    it('should show group report list by invoked goToGroupUserReportList()', () => {
-        // arrange
-        const group: Partial<Group> = {
-            gid: 'group-1'
-        };
-        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn(() => { });
-        const telemetryObject: Partial<TelemetryObject> = {
-            id: group.gid,
-            type: ObjectType.GROUP,
-            version: undefined
-        };
-        const profile: Profile[] = [{
-            uid: 'sample-uid-1',
-            handle: 'f-name-1',
-            source: ProfileSource.LOCAL,
-            profileType: ProfileType.TEACHER
-        }, {
-            uid: 'sample-uid-2',
-            handle: 'f-name-2',
-            source: ProfileSource.LOCAL,
-            profileType: ProfileType.TEACHER
-        }];
-        const getAllProfileRequest: GetAllProfileRequest = { local: true, groupId: group.gid };
-        mockProfileService.getAllProfiles = jest.fn(() => of(profile));
-        // act
-        reportsPage.goToGroupUserReportList(group);
-        // assert
-        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-            InteractType.TOUCH,
-            InteractSubtype.GROUP_CLICKED,
-            Environment.USER,
-            PageId.REPORTS_USER_GROUP,
-            telemetryObject
-        );
-        expect(mockProfileService.getAllProfiles).toHaveBeenCalledWith(getAllProfileRequest);
-    });
-
-    it('should generate telemetry for user by invoked onSegmentChange()', () => {
-        // arrange
-        const data = 'users';
-        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn(() => { });
-        const subType = 'users-tab-clicked';
-        mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn(() => { });
-        // act
-        reportsPage.onSegmentChange(data);
-        // assert
-        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-            InteractType.TOUCH,
-            subType,
-            Environment.USER,
-            PageId.REPORTS_USER_GROUP
-        );
-        expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
-            ImpressionType.VIEW,
-            '',
-            PageId.REPORTS_USER_GROUP,
-            Environment.USER
-        );
-    });
-
-    it('should generate telemetry for user by invoked onSegmentChange()', () => {
-        // arrange
-        const data = 'groups';
-        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn(() => { });
-        const subType = 'groups-tab-clicked';
-        mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn(() => { });
-        // act
-        reportsPage.onSegmentChange(data);
-        // assert
-        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-            InteractType.TOUCH,
-            subType,
-            Environment.USER,
-            PageId.REPORTS_USER_GROUP
-        );
-        expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
-            ImpressionType.VIEW,
-            '',
-            PageId.REPORTS_USER_GROUP,
-            Environment.USER
-        );
-    });
-
-    it('should be enable device backbutton by invoked enableBackBtn()', () => {
-        // arrange
-        const subscribeWithPriorityData = jest.fn((_, fn) => fn());
-        mockPlatform.backButton = {
-            subscribeWithPriority: subscribeWithPriorityData,
-        } as any;
-        jest.spyOn(reportsPage, 'goBack').mockImplementation(() => {
-            return;
-        });
-        // act
-        reportsPage.enableBackBtn();
-        // assert
-        expect(subscribeWithPriorityData).toHaveBeenCalled();
-        expect(reportsPage.goBack).toHaveBeenCalled();
-    });
-
-    it('should go to previous page', () => {
-        // arrange
-        mockLocation.back = jest.fn();
-        reportsPage = new ReportsPage(
-            mockProfileService as ProfileService,
-            mockGroupService as GroupService,
-            mockNgZone as NgZone,
-            mockLoading as LoadingController,
-            mockTelemetryGeneratorService as TelemetryGeneratorService,
-            mockHeaderService as AppHeaderService,
-            mockCommonUtilService as CommonUtilService,
-            mockRoute as ActivatedRoute,
-            mockRouter as Router,
-            mockLocation as Location,
-            mockPlatform as Platform,
-        );
-        // act
-        reportsPage.goBack();
-        // assert
-        setTimeout(() => {
-            expect(mockLocation.back).toHaveBeenCalled();
-        }, 0);
-    });
-
-    it('should unsubscribe device backbutton by invoked ionViewWillLeave()', () => {
-        // arrange
-        const unsubscribeData = jest.fn();
-        const subscribeWithPriorityData = {
-            unsubscribe: unsubscribeData
-        } as any;
-        mockPlatform.backButton = {
-            subscribeWithPriority: subscribeWithPriorityData,
-        } as any;
-        // act
-        reportsPage.ionViewWillLeave();
-        // assert
-        setTimeout(() => {
-            expect(unsubscribeData).toHaveBeenCalled();
-        }, 0);
-    });
-});
diff --git a/src/app/reports/reports-routing.module.ts b/src/app/reports/reports-routing.module.ts
deleted file mode 100644
index 74801c173..000000000
--- a/src/app/reports/reports-routing.module.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { NgModule } from '@angular/core';
-import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
-import { RouterLinks } from '../app.constant';
-import { ReportsPage } from './reports.page';
-import { ReportListComponent } from './report-list/report-list.component';
-import { UserReportComponent } from './user-report/user-report.component';
-import { GroupReportListComponent } from './group-report-list/group-report-list.component';
-
-const routes: Routes = [
-    { path: '', component: ReportsPage },
-    { path: RouterLinks.REPORTS_LIST, component: ReportListComponent },
-    { path: RouterLinks.USER_REPORT, component: UserReportComponent },
-    { path: RouterLinks.GROUP_REPORT, component: GroupReportListComponent },
-];
-
-@NgModule({
-    imports: [
-        RouterModule.forChild(routes)
-    ],
-    exports: [
-        RouterModule
-    ]
-})
-export class ReportsRoutingModule { }
diff --git a/src/app/reports/reports.module.ts b/src/app/reports/reports.module.ts
deleted file mode 100644
index 9e2fcc2e5..000000000
--- a/src/app/reports/reports.module.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule, DatePipe } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { Routes, RouterModule } from '@angular/router';
-
-import { IonicModule } from '@ionic/angular';
-
-import { ReportsPage } from './reports.page';
-import { ReportsRoutingModule } from './reports-routing.module';
-import { TranslateModule } from '@ngx-translate/core';
-import { UserReportComponent } from './user-report/user-report.component';
-import { ReportListComponent } from './report-list/report-list.component';
-import { GroupReportListComponent } from './group-report-list/group-report-list.component';
-import { ReportAlertComponent } from './report-alert/report-alert.component';
-import { GroupReportAlertComponent } from './group-report-alert/group-report-alert.component';
-import { ComponentsModule } from '../components/components.module';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    TranslateModule,
-    ReportsRoutingModule,
-    ComponentsModule
-  ],
-  declarations: [
-    ReportsPage,
-    UserReportComponent,
-    ReportListComponent,
-    GroupReportListComponent,
-    GroupReportAlertComponent
-  ],
-  entryComponents: [
-    GroupReportAlertComponent
-  ],
-  exports: [
-    GroupReportAlertComponent
-  ],
-  providers: [
-    DatePipe
-  ]
-})
-export class ReportsPageModule {}
diff --git a/src/app/reports/reports.page.html b/src/app/reports/reports.page.html
deleted file mode 100644
index 83e4344a8..000000000
--- a/src/app/reports/reports.page.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<ion-header>
-  <ion-toolbar no-border-bottom>
-    <ion-buttons class="sb-hamburger" slot="start">
-      <ion-button class="color" (click)="goBack()">
-        <ion-icon slot="icon-only" name="arrow-back"></ion-icon>
-      </ion-button>
-    </ion-buttons>
-    <ion-title class="f16 color" ellipsis>
-      {{ 'REPORTS' | translate}}
-    </ion-title>
-  </ion-toolbar>
-
-  <ion-toolbar no-border-top>
-    <ion-segment [(ngModel)]="report" (ionChange)="onSegmentChange(report)">
-      <ion-segment-button value="users">
-        {{ 'USERS' | translate }}
-      </ion-segment-button>
-      <ion-segment-button value="groups">
-        {{ 'GROUPS' | translate }}
-      </ion-segment-button>
-    </ion-segment>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content>
-  <div [ngSwitch]="report">
-    <ion-list class="item-background radius" *ngSwitchCase="'users'" padding>
-      <!---Block shows current user-->
-      <div class="flex-card-container" lines="none" (click)="goToUserReportList(currentUser?.uid,currentUser?.handle)">
-        <div class="card-text">
-          <ion-label>
-            <h6><strong>{{currentUser?.handle}}</strong></h6>
-            <p *ngIf="currentUser?.profileType === ProfileType.TEACHER">{{'USER_TYPE_1' | translate | titlecase}}</p>
-            <p *ngIf="currentUser?.profileType === ProfileType.STUDENT">{{'USER_TYPE_2' | translate | titlecase}}</p>
-            <p *ngIf="currentUser?.profileType === ProfileType.OTHER">{{'USER_TYPE_3' | translate | titlecase}}</p>
-          </ion-label>
-        </div>
-        <div class="card-icon">
-          <ion-icon name="ios-arrow-forward"></ion-icon>
-        </div>
-      </div>
-      <!---Block shows list of users -->
-      <div *ngIf="otherUsers?.length > 0">
-        <ion-text>
-          <p color="dark_gray" class="subTitle ion-text-uppercase">{{ 'OTHER_USERS' | translate}}</p>
-        </ion-text>
-        <div>
-          <div class="flex-card-container" *ngFor="let user of otherUsers;let i=index" lines="none"
-            (click)="goToUserReportList(user?.uid,user?.handle)">
-            <div class="card-text">
-              <ion-label>
-                <h6><strong>{{user?.handle}}</strong></h6>
-                <p *ngIf="user?.profileType === ProfileType.TEACHER">{{'USER_TYPE_1' | translate | titlecase}}</p>
-                <p *ngIf="user?.profileType === ProfileType.STUDENT">{{'USER_TYPE_2' | translate | titlecase}}</p>
-                <p *ngIf="user?.profileType === ProfileType.OTHER">{{'USER_TYPE_3' | translate | titlecase}}</p>
-              </ion-label>
-            </div>
-            <div class="card-icon">
-              <ion-icon name="ios-arrow-forward"></ion-icon>
-            </div>
-          </div>
-        </div>
-      </div>
-    </ion-list>
-
-    <ion-list *ngSwitchCase="'groups'" padding>
-      <div *ngIf="!groups?.length">
-        <div class="img-container">
-          <img class="image_style" alt="no_user" src="assets/imgs/ic_businessman.png">
-        </div>
-        <ion-row class="ion-padding-top">
-          <ion-col size-md="6" offset-md="3" size-lg="6" offset-lg="3">
-            <div class="image-text">
-              <h6>
-                <strong>{{'NO_GROUPS_CREATED_YET' | translate}}</strong>
-              </h6>
-              <div class="description ion-text-center">
-                {{ 'NO_GROUP_MESSAGE' | translate }}
-              </div>
-            </div>
-          </ion-col>
-        </ion-row>
-      </div>
-      <div *ngIf="groups?.length">
-        <!-- block shows lists of groups -->
-        <div class="flex-card-container" (click)="goToGroupUserReportList(group)"
-          *ngFor="let group of groups;let i=index" lines="none">
-          <div class="card-text">
-            <ion-label>
-              <h6><strong>{{group?.name}}</strong></h6>
-              <p *ngIf="group?.profilesCount === 1">{{group?.profilesCount}} {{ 'USER' | translate}}</p>
-              <p *ngIf="group?.profilesCount > 1">{{group?.profilesCount}} {{ 'USERS' | translate}}</p>
-            </ion-label>
-          </div>
-          <div class="card-icon">
-            <ion-icon name="ios-arrow-forward"></ion-icon>
-          </div>
-        </div>
-      </div>
-    </ion-list>
-  </div>
-</ion-content>
\ No newline at end of file
diff --git a/src/app/reports/reports.page.scss b/src/app/reports/reports.page.scss
deleted file mode 100644
index 6e5ba3c62..000000000
--- a/src/app/reports/reports.page.scss
+++ /dev/null
@@ -1,91 +0,0 @@
-@import "src/assets/styles/_custom-mixins.scss";
-@import "src/assets/styles/_variables.scss";
-@import "src/assets/styles/fonts.scss";
-
-:host {
-  .settings-item-style {
-    padding-top: 5px;
-  }
-  ion-icon {
-    font-size: 22px !important;
-    font-weight: 550 !important;
-  }
-  .bgColor {
-    background-color: map-get($colors, light_gray) !important;
-    border-radius: 6px;
-    @include padding(5px, null, null, 18px !important);
-  }
-  .marginTop {
-    margin-top: 15px !important;
-  }
-  .header-md::after,
-  .tabs-md[tabsPlacement="top"] > .tabbar::after,
-  .footer-md::before,
-  .tabs-md[tabsPlacement="bottom"] > .tabbar::before {
-    background-image: none;
-  }
-  .item-md.item-block .item-inner {
-    border-bottom: 0 !important;
-  }
-  .subTitle {
-    font-size: 1.4rem;
-    font-weight: 700 !important;
-  }
-  .item-background.item-md {
-    background-color: map-get($colors, light_gray) !important;
-  }
-  .subTitle {
-    font-size: 1.4rem;
-    font-weight: 700 !important;
-  }
-  .radius {
-    border-radius: 6px;
-  }
-
-  .img-container {
-    position: absolute;
-    width: 100px;
-    height: 100px;
-    top: 27%;
-    margin-top: -144x;
-    @include ltr() {
-      left: 60%;
-      margin-left: -97px;
-    }
-    @include rtl() {
-      right: 60%;
-      margin-right: -97px;
-    }
-  }
-  .image-text {
-    text-align: center;
-    margin-top: 34vh;
-  }
-  .image_style {
-    width: 335px;
-    height: 102px;
-    border-radius: 50%;
-  }
-  .flex-card-container {
-    display: flex;
-    flex-wrap: nowrap;
-    align-items:center;
-    justify-content:center;
-    background-color:#f1f1f1;
-    padding: 12px;
-    margin-bottom: 12px;
-    .card-text {
-      width: 100%;
-    }
-    .card-icon{
-      width: 20px;   
-    }
-  }
-  ion-title.color {
-    color:#024f9d;
-    font-weight:bold;
-  }
-  ion-segment-button {
-    font-weight:bold;
-  }
-}
diff --git a/src/app/reports/reports.page.ts b/src/app/reports/reports.page.ts
deleted file mode 100644
index 0bead1354..000000000
--- a/src/app/reports/reports.page.ts
+++ /dev/null
@@ -1,218 +0,0 @@
-import { ActivatedRoute, Router, NavigationExtras } from '@angular/router';
-import { Component, Inject, OnInit, NgZone } from '@angular/core';
-import { LoadingController, Platform } from '@ionic/angular';
-import {
-  GetAllProfileRequest,
-  Group,
-  GroupService,
-  ObjectType,
-  Profile,
-  ProfileService,
-  ProfileType,
-  TelemetryObject
-} from 'sunbird-sdk';
-import { AppHeaderService } from '@app/services/app-header.service';
-import { CommonUtilService } from '@app/services/common-util.service';
-import {
-  Environment,
-  ImpressionType,
-  InteractSubtype,
-  InteractType,
-  PageId
-} from '@app/services/telemetry-constants';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import { ProfileConstants, RouterLinks } from '@app/app/app.constant';
-import { Location } from '@angular/common';
-import { Subscription } from 'rxjs';
-
-@Component({
-  selector: 'app-reports',
-  templateUrl: './reports.page.html',
-  styleUrls: ['./reports.page.scss'],
-})
-export class ReportsPage implements OnInit {
-
-  ProfileType = ProfileType;
-  report = 'users';
-  otherUsers;
-  currentUser: {};
-  groups;
-  currentGroups: {};
-  private profileDetails: any;
-  private deviceBackButton: Subscription;
-
-  constructor(
-    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
-    @Inject('GROUP_SERVICE') private groupService: GroupService,
-    private ngZone: NgZone,
-    private loading: LoadingController,
-    private telemetryGeneratorService: TelemetryGeneratorService,
-    private headerService: AppHeaderService,
-    private commonUtilService: CommonUtilService,
-    private route: ActivatedRoute,
-    private router: Router,
-    private location: Location,
-    private platform: Platform,
-  ) {
-    if (this.router.getCurrentNavigation().extras.state) {
-      this.profileDetails = this.router.getCurrentNavigation().extras.state.profile;
-    }
-  }
-
-  async ngOnInit() {
-    this.telemetryGeneratorService.generateImpressionTelemetry(
-      ImpressionType.VIEW,
-      '',
-      PageId.REPORTS_USER_GROUP,
-      Environment.USER
-    );
-    const loader = await this.commonUtilService.getLoader();
-    await loader.present();
-    let users, cUser, groups;
-    this.populateUsers()
-      .then(array => {
-        cUser = array[0];
-        users = array[1];
-        return this.populateGroups();
-      })
-      .then(data => {
-        groups = data;
-        this.ngZone.run(async () => {
-          this.groups = groups;
-          this.otherUsers = users;
-          this.currentUser = cUser;
-          await loader.dismiss();
-        });
-      })
-      .catch(async () => {
-        await loader.dismiss();
-      });
-    this.enableBackBtn();
-  }
-
-  ionViewWillEnter() {
-    this.headerService.hideHeader();
-  }
-
-  async populateUsers() {
-    const that = this;
-    return new Promise<Array<any>>((resolve, reject) => {
-      const getAllProfileRequest: GetAllProfileRequest = {
-        local: true
-      };
-      that.profileService.getAllProfiles(getAllProfileRequest).toPromise()
-        .then((data: Profile[]) => {
-          that.profileService.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS }).toPromise()
-            .then((profile: Profile) => {
-              if (this.profileDetails) {
-                if (this.profileDetails.id === profile.uid) {
-                  profile.handle = this.profileDetails.firstName;
-                }
-              }
-              data = that.filterOutCurrentUser(data, profile);
-              resolve([profile, data]);
-            }).catch(error => {
-              reject(error);
-            });
-        })
-        .catch((error) => {
-          reject(error);
-        });
-    });
-  }
-
-  async populateGroups() {
-    const that = this;
-
-    return new Promise<any>((resolve) => {
-
-      that.groupService.getAllGroups()
-        .subscribe((groups: Group[]) => {
-          if (groups) {
-            resolve(groups);
-          } else {
-            resolve();
-          }
-        });
-    });
-  }
-
-  filterOutCurrentUser(userList, currentUser) {
-    return userList.filter(user => {
-      return user.uid !== currentUser.uid;
-    });
-  }
-
-  goToUserReportList(uid: string, handle: string) {
-
-    const telemetryObject = new TelemetryObject(uid, ObjectType.USER, undefined);
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      InteractSubtype.USER_CLICKED,
-      Environment.USER,
-      PageId.REPORTS_USER_GROUP,
-      telemetryObject
-    );
-
-    const navigationExtras: NavigationExtras = { state: { isFromUsers: true, uids: [uid], handle: handle } };
-    this.router.navigate([`/${RouterLinks.REPORTS}/${RouterLinks.REPORTS_LIST}`], navigationExtras);
-  }
-
-  goToGroupUserReportList(group) {
-    const telemetryObject = new TelemetryObject(group.gid, ObjectType.GROUP, undefined);
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      InteractSubtype.GROUP_CLICKED,
-      Environment.USER,
-      PageId.REPORTS_USER_GROUP,
-      telemetryObject
-    );
-    const getAllProfileRequest: GetAllProfileRequest = { local: true, groupId: group.gid };
-    this.profileService.getAllProfiles(getAllProfileRequest).toPromise()
-      .then((result: Profile[]) => {
-        const map = new Map<string, string>();
-        const uids: Array<string> = [];
-        result.forEach(user => {
-          uids.push(user.uid);
-          map.set(user.uid, user.handle);
-        });
-
-        const navigationExtras: NavigationExtras = { state: { isFromGroups: true, uids: uids, users: map, group: group } };
-        this.router.navigate([`/${RouterLinks.REPORTS}/${RouterLinks.REPORTS_LIST}`], navigationExtras);
-      });
-  }
-
-
-  onSegmentChange(data) {
-    const subType = (data === 'users') ? InteractSubtype.USERS_TAB_CLICKED : InteractSubtype.GROUPS_TAB_CLICKED;
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      subType,
-      Environment.USER,
-      PageId.REPORTS_USER_GROUP
-    );
-
-    this.telemetryGeneratorService.generateImpressionTelemetry(
-      ImpressionType.VIEW,
-      '',
-      PageId.REPORTS_USER_GROUP,
-      Environment.USER
-    );
-  }
-
-  enableBackBtn() {
-    this.deviceBackButton = this.platform.backButton.subscribeWithPriority(10, () => {
-      this.goBack();
-    });
-  }
-
-  goBack() {
-    this.location.back();
-  }
-
-  ionViewWillLeave() {
-    this.deviceBackButton && this.deviceBackButton.unsubscribe();
-    this.deviceBackButton = undefined;
-  }
-
-}
diff --git a/src/app/reports/user-report/user-report.component.html b/src/app/reports/user-report/user-report.component.html
deleted file mode 100644
index e5e09a0a6..000000000
--- a/src/app/reports/user-report/user-report.component.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-title class="f16 color">{{contentName}}</ion-title>
-    <ion-buttons slot="start">
-      <ion-button class="color" icon-only (click)="goBack()">
-        <ion-icon name="arrow-back"></ion-icon>
-      </ion-button>
-    </ion-buttons>
-    <ion-buttons slot="end">
-      <ion-button class="color" icon-only (click)="importcsv()">
-        <ion-icon ios="ios-download" md="md-download"></ion-icon>
-      </ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content class="fromUser">
-  <app-assessment-details [assessmentData]="assessmentData" [columns]="columns"></app-assessment-details>
-</ion-content>
\ No newline at end of file
diff --git a/src/app/reports/user-report/user-report.component.scss b/src/app/reports/user-report/user-report.component.scss
deleted file mode 100644
index 62bb98c50..000000000
--- a/src/app/reports/user-report/user-report.component.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-@import "src/assets/styles/fonts.scss";
-
-:host {
-  .fromUser .ngx-datatable.scroll-vertical .datatable-body {
-    height: calc(100vh - 34vh) !important;
-  }
-  ion-title.color,ion-button.color {
-    --color:#024f9d !important;
-    font-weight:bold !important;
-  }
-}
-.toast-md.custom-toast {
-  .toast-message {
-    word-break: break-word;
-  }
-}
diff --git a/src/app/reports/user-report/user-report.component.ts b/src/app/reports/user-report/user-report.component.ts
deleted file mode 100644
index 08c8b044c..000000000
--- a/src/app/reports/user-report/user-report.component.ts
+++ /dev/null
@@ -1,271 +0,0 @@
-import { ReportAlertComponent } from './../report-alert/report-alert.component';
-import { Component, OnInit, NgZone, Inject, ViewEncapsulation } from '@angular/core';
-import { LoadingController, Platform } from '@ionic/angular';
-import {
-  SummarizerService,
-  SummaryRequest,
-  ReportSummary,
-  DeviceInfo,
-  Profile
-} from 'sunbird-sdk';
-import { TranslateService } from '@ngx-translate/core';
-import { File } from '@ionic-native/file/ngx';
-import { FileTransfer, FileTransferObject } from '@ionic-native/file-transfer/ngx';
-import { CommonUtilService } from '@app/services/common-util.service';
-import { AppGlobalService } from '@app/services/app-global-service.service';
-import { UtilityService } from '@app/services/utility-service';
-import { AppHeaderService } from '@app/services/app-header.service';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import {
-  ImpressionType,
-  PageId,
-  Environment,
-  InteractType,
-  InteractSubtype,
-} from '@app/services/telemetry-constants';
-import { AppVersion } from '@ionic-native/app-version/ngx';
-import { DatePipe } from '@angular/common';
-import { Router } from '@angular/router';
-import { Subscription } from 'rxjs';
-import { Location } from '@angular/common';
-
-@Component({
-  selector: 'app-user-report',
-  templateUrl: './user-report.component.html',
-  styleUrls: ['./user-report.component.scss'],
-  encapsulation: ViewEncapsulation.None
-})
-export class UserReportComponent implements OnInit {
-
-  profile: Profile;
-  downloadDirectory: string;
-  reportSummaryRequest: Partial<ReportSummary>;
-  totalScore;
-  maxTotalScore;
-  totalTime;
-  assessmentData;
-  columns = [
-    {
-      name: this.commonUtilService.translateMessage('QUESTION_MARKS'),
-      prop: 'index'
-    }, {
-      name: this.commonUtilService.translateMessage('TIME'),
-      prop: 'timespent'
-    }, {
-      name: this.commonUtilService.translateMessage('RESULT'),
-      prop: 'result'
-    }
-  ];
-  contentName: string;
-  deviceId: string;
-  version: string;
-  fileUrl: string;
-  expTime: any;
-  response: any;
-  handle: string;
-  fileTransfer: FileTransferObject = this.transfer.create();
-  private navData: any;
-  backButtonFunc: Subscription;
-
-  constructor(
-    @Inject('SUMMARIZER_SERVICE') public summarizerService: SummarizerService,
-    private transfer: FileTransfer,
-    private translate: TranslateService,
-    private file: File,
-    private datePipe: DatePipe,
-    private loading: LoadingController,
-    private zone: NgZone,
-    private appGlobalService: AppGlobalService,
-    private appVersion: AppVersion,
-    @Inject('DEVICE_INFO') private deviceInfo: DeviceInfo,
-    private telemetryGeneratorService: TelemetryGeneratorService,
-    private commonUtilService: CommonUtilService,
-    private utilityService: UtilityService,
-    private headerService: AppHeaderService,
-    private router: Router,
-    private platform: Platform,
-    private location: Location
-  ) {
-    this.getNavData();
-    this.downloadDirectory = this.file.dataDirectory;
-    this.utilityService.getDownloadDirectoryPath()
-      .then((response: any) => {
-        this.downloadDirectory = response;
-      });
-  }
-
-  getNavData() {
-    const navigation = this.router.getCurrentNavigation();
-    if (navigation && navigation.extras && navigation.extras.state) {
-      this.navData = navigation.extras.state;
-    }
-  }
-
-  ngOnInit() {
-    this.headerService.hideHeader();
-    this.telemetryGeneratorService.generateImpressionTelemetry(
-      ImpressionType.VIEW, '',
-      PageId.REPORTS_USER_ASSESMENT_DETAILS,
-      Environment.USER
-    );
-
-    this.deviceId = this.deviceInfo.getDeviceID();
-
-    this.appVersion.getAppName()
-      .then((appName: any) => {
-        return appName;
-      });
-    this.profile = this.appGlobalService.getCurrentUser();
-  }
-
-  async ionViewWillEnter() {
-
-    const loader = await this.commonUtilService.getLoader();
-
-    const that = this;
-
-    this.reportSummaryRequest = this.navData.report;
-    this.contentName = this.reportSummaryRequest.name;
-    this.handle = this.navData.handle;
-    const summaryRequest: SummaryRequest = {
-      qId: '',
-      uids: [this.reportSummaryRequest.uid],
-      contentId: this.reportSummaryRequest.contentId,
-      hierarchyData: null,
-    };
-
-    that.summarizerService.getLearnerAssessmentDetails(summaryRequest).toPromise()
-      .then(reportList => {
-        const data = reportList.get(this.reportSummaryRequest.uid);
-        const rows = data.reportDetailsList.map(row => {
-          this.response = data.reportDetailsList;
-          return {
-            'index': 'Q' + (('00' + row.qindex).slice(-3)),
-            'result': row.score + '/' + row.maxScore,
-            'timespent': that.formatTime(row.timespent),
-            'qdesc': row.qdesc,
-            'score': row.score,
-            'maxScore': row.maxScore,
-            'qtitle': row.qtitle,
-            'qid': row.qid
-          };
-        });
-        data['uiRows'] = rows;
-        data['uiTotalTime'] = that.formatTime(data['totalTime']);
-        data['fromUser'] = true;
-        data['fromGroup'] = false;
-        that.zone.run(async () => {
-          loader.present().then(() => {
-             loader.dismiss();
-          });
-          data['showResult'] = true;
-          that.assessmentData = data;
-          that.assessmentData['showPopup'] = true;
-          that.assessmentData['popupCallback'] = ReportAlertComponent;
-          that.assessmentData['totalQuestionsScore'] = that.reportSummaryRequest.totalQuestionsScore;
-          this.totalScore = data.totalScore;
-          this.maxTotalScore = data.maxTotalScore;
-          this.totalTime = data.totalTime;
-        });
-      })
-      .catch(async err => {
-        loader.present().then(() => {
-          loader.dismiss();
-       });
-      });
-
-    this.handleDeviceBackButton();
-  }
-
-  handleDeviceBackButton() {
-    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(11, () => {
-      this.goBack();
-    });
-  }
-
-  ionViewWillLeave() {
-    if (this.backButtonFunc) {
-      this.backButtonFunc.unsubscribe();
-      this.backButtonFunc = undefined;
-    }
-  }
-
-  formatTime(time: number): string {
-    const minutes: any = '0' + Math.floor(time / 60);
-    const seconds: any = '0' + Math.round(time % 60);
-    return minutes.substr(-2) + ':' + seconds.substr(-2);
-  }
-
-  goBack() {
-    this.location.back();
-  }
-
-
-  convertToCSV(teams) {
-    let csv: any = '';
-    let line: any = '';
-    const that = this;
-    const values = this.response;
-    const valuesLength = values.length;
-    const totalTimespent = values.totalTimespent;
-    const fileExpTime = this.datePipe.transform(new Date(this.expTime), 'dd-MM-yyyy hh:mm:ss a');
-    const contentStartTime = this.datePipe.transform(new Date(teams[0].timestamp), 'dd-MM-yyyy hh:mm:ss a');
-    for (let m = 0; m < valuesLength; m++) {
-      line += 'Device ID' + ',' + this.deviceId + '\n';
-      line += 'User name (User ID)' + ',' + this.handle + '(' + this.reportSummaryRequest.uid + ')' + '\n';
-      line += 'Content name (Content ID)' + ',' + this.reportSummaryRequest.name + '(' + this.reportSummaryRequest.contentId + ')' + '\n';
-      line += 'Content started time' + ',' + contentStartTime + '\n';
-      line += 'Total Time' + ',' + this.formatTime(this.totalTime) + '\n';
-      line += 'Total Score' + ',' + ' ' + this.totalScore + '/' +
-     (this.reportSummaryRequest.totalQuestionsScore || this.reportSummaryRequest.totalMaxScore) + '\n';
-      line += 'File export time' + ',' + fileExpTime + '\n';
-      line += '\n\n';
-      line += 'Question#' + ',';
-      line += 'QuestionId' + ',';
-      line += 'Score' + ',';
-      line += 'Time' + '\n';
-      break;
-    }
-    line += '\n';
-    for (let j = 0; j < valuesLength; j++) {
-      line += '\"' + values[j].qtitle + '\"' + ',';
-      line += '\"' + values[j].qid + '\"' + ',';
-      line += '\"' + ' ' + values[j].score + '/' + values[j].maxScore + '\"' + ',';
-      line += '\"' + this.formatTime(values[j].timespent) + '\"' + '\n';
-    }
-    csv += line + '\n';
-    return csv;
-
-  }
-
-  importcsv() {
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      InteractSubtype.DOWNLOAD_REPORT_CLICKED,
-      Environment.USER,
-      PageId.REPORTS_USER_ASSESMENT_DETAILS, undefined,
-    );
-    this.expTime = new Date().getTime();
-    const csv: any = this.convertToCSV(this.response);
-    const combineFilename = this.deviceId + '_' + this.response[0].uid + '_' + this.response[0].contentId + '_' + this.expTime + '.csv';
-
-    this.file.writeFile(this.downloadDirectory, combineFilename, csv)
-      .then(
-        _ => {
-          this.commonUtilService.showToast(this.commonUtilService.translateMessage('CSV_DOWNLOAD_SUCCESS', combineFilename), false, 'custom-toast');
-        }
-      )
-      .catch(
-        err => {
-          this.file.writeExistingFile(this.downloadDirectory, combineFilename, csv)
-            .then(
-              _ => {
-                this.commonUtilService.showToast(this.commonUtilService.translateMessage('CSV_DOWNLOAD_SUCCESS', combineFilename), false, 'custom-toast');
-              }
-            )
-            .catch();
-        }
-      );
-  }
-
-}
diff --git a/src/app/resources/explore-books-sort/explore-books-sort.component.html b/src/app/resources/explore-books-sort/explore-books-sort.component.html
index 0f2bf0dca..48fc37758 100644
--- a/src/app/resources/explore-books-sort/explore-books-sort.component.html
+++ b/src/app/resources/explore-books-sort/explore-books-sort.component.html
@@ -1,23 +1,23 @@
 <ion-content>
-  <h4 class="sort-heading">{{'SORT_BY' | translate}}</h4>
-  <form novalidate [formGroup]="sortForm" class="form-position">
-      <ion-item>
-          <ion-label position="stacked" class="label-font text-uppercase">{{'BOARD' | translate }}</ion-label>
-          <ion-select multiple="true" #boardSelect text-capitalize formControlName="board" [interfaceOptions]="boardOptions"
-              okText="{{'BTN_SUBMIT' | translate}}" cancelText="{{'CANCEL' | translate}}" placeholder="{{'BOARD_OPTION_TEXT' | translate}}">
-              <ion-select-option *ngFor="let board of boardList" value="{{board?.name}}">{{board?.name}}&lrm;</ion-select-option>
-          </ion-select>
-      </ion-item>
+    <h4 class="sort-heading">{{'SORT_BY' | translate}}</h4>
+    <form novalidate [formGroup]="sortForm" class="form-position">
+        <ion-item>
+            <ion-label position="stacked" class="label-font text-uppercase">{{'BOARD' | translate }}</ion-label>
+            <ion-select multiple="true" #boardSelect class="ion-text-capitalize" formControlName="board" [interfaceOptions]="boardOptions"
+                        okText="{{'BTN_SUBMIT' | translate}}" cancelText="{{'CANCEL' | translate}}" placeholder="{{'BOARD_OPTION_TEXT' | translate}}">
+                <ion-select-option *ngFor="let board of boardList" value="{{board?.name}}">{{board?.name | aliased}}&lrm;</ion-select-option>
+            </ion-select>
+        </ion-item>
 
-      <ion-item>
-          <ion-label position="stacked" class="label-font text-uppercase">{{'MEDIUM' | translate }}</ion-label>
-          <ion-select formControlName="medium" #mediumSelect multiple="true" text-capitalize [interfaceOptions]="mediumOptions"
-              okText="{{'BTN_SUBMIT' | translate}}" cancelText="{{'CANCEL' | translate}}" placeholder="{{'MEDIUM_OPTION_TEXT' | translate}}">
-              <ion-select-option *ngFor="let medium of mediumList" text-capitalize value="{{medium?.name}}">{{medium?.name}}</ion-select-option>
-          </ion-select>
-      </ion-item>
-  </form>
+        <ion-item>
+            <ion-label position="stacked" class="label-font text-uppercase">{{'MEDIUM' | translate }}</ion-label>
+            <ion-select formControlName="medium" #mediumSelect multiple="true" class="ion-text-capitalize" [interfaceOptions]="mediumOptions"
+                        okText="{{'BTN_SUBMIT' | translate}}" cancelText="{{'CANCEL' | translate}}" placeholder="{{'MEDIUM_OPTION_TEXT' | translate}}">
+                <ion-select-option *ngFor="let medium of mediumList" class="ion-text-capitalize" value="{{medium?.name}}">{{medium?.name}}</ion-select-option>
+            </ion-select>
+        </ion-item>
+    </form>
 </ion-content>
 <ion-footer class="bottom-button">
-  <ion-button expand="block" class="sort-by" (click)="dismiss()"> {{'SAVE' | translate}}</ion-button>
+    <ion-button expand="block" class="sort-by" (click)="dismiss()"> {{'SAVE' | translate}}</ion-button>
 </ion-footer>
diff --git a/src/app/resources/explore-books-sort/explore-books-sort.component.scss b/src/app/resources/explore-books-sort/explore-books-sort.component.scss
index 0f1adcd35..d5505b1b5 100644
--- a/src/app/resources/explore-books-sort/explore-books-sort.component.scss
+++ b/src/app/resources/explore-books-sort/explore-books-sort.component.scss
@@ -9,7 +9,7 @@
     margin-top: $base-block-space * 3;
   }
   .item-label-stacked ion-select {
-    border: 1px solid #006de5;
+    border: 1px solid map-get($colors, primary);
     margin-top: 8px;
     padding-right: 15px !important;
     padding-left: 15px !important;
@@ -41,18 +41,18 @@
 
   .item-label-stacked.item-select-disabled {
     .label-md {
-      color: #cccccc;
+      color: map-get($colors, medium_gray);
     }
     ion-select {
-      border-color: #cccccc;
+      border-color: map-get($colors, medium_gray);
       .select-icon {
         .select-icon-inner {
-          border-color: #cccccc;
+          border-color: map-get($colors, medium_gray);
           animation: none;
         }
       }
       .select-placeholder {
-        color: #cccccc;
+        color: map-get($colors, medium_gray);
       }
     }
   }
@@ -83,4 +83,4 @@
   ion-item.item-label-stacked {
     --border-width: 0;
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/resources/explore-books-sort/explore-books-sort.component.ts b/src/app/resources/explore-books-sort/explore-books-sort.component.ts
index 5e41edfa0..a9e88710a 100644
--- a/src/app/resources/explore-books-sort/explore-books-sort.component.ts
+++ b/src/app/resources/explore-books-sort/explore-books-sort.component.ts
@@ -11,8 +11,8 @@ import { TelemetryGeneratorService } from '@app/services/telemetry-generator.ser
   styleUrls: ['./explore-books-sort.component.scss'],
 })
 export class ExploreBooksSortComponent implements OnInit {
-  @ViewChild('boardSelect') boardSelect;
-  @ViewChild('mediumSelect') mediumSelect;
+  @ViewChild('boardSelect', { static: false }) boardSelect;
+  @ViewChild('mediumSelect', { static: false }) mediumSelect;
 
   categories;
   backButtonFunc = undefined;
@@ -30,12 +30,12 @@ export class ExploreBooksSortComponent implements OnInit {
   };
 
   constructor(
-    private navParams: NavParams,
-    private platform: Platform,
-    private commonUtilService: CommonUtilService,
-    private telemetryGeneratorService: TelemetryGeneratorService,
-    private fb: FormBuilder,
-    private modalCtrl: ModalController
+      private navParams: NavParams,
+      private platform: Platform,
+      private commonUtilService: CommonUtilService,
+      private telemetryGeneratorService: TelemetryGeneratorService,
+      private fb: FormBuilder,
+      private modalCtrl: ModalController
   ) {
     this.initForm();
   }
@@ -59,4 +59,4 @@ export class ExploreBooksSortComponent implements OnInit {
       this.modalCtrl.dismiss(null);
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/resources/explore-books/explore-books.module.ts b/src/app/resources/explore-books/explore-books.module.ts
index b86037b79..ac88be8d0 100644
--- a/src/app/resources/explore-books/explore-books.module.ts
+++ b/src/app/resources/explore-books/explore-books.module.ts
@@ -1,14 +1,13 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { Routes, RouterModule } from '@angular/router';
-
+import { NgModule } from '@angular/core';
+import { ReactiveFormsModule } from '@angular/forms';
+import { RouterModule, Routes } from '@angular/router';
+import { ComponentsModule } from '@app/app/components/components.module';
+import { DirectivesModule } from '@app/directives/directives.module';
 import { IonicModule } from '@ionic/angular';
-
-import { ExploreBooksPage } from './explore-books.page';
 import { TranslateModule } from '@ngx-translate/core';
-import { ComponentsModule } from '@app/app/components/components.module';
-import { ExploreBooksSortComponent } from '../explore-books-sort/explore-books-sort.component';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
+import { ExploreBooksPage } from './explore-books.page';
 
 const routes: Routes = [
   {
@@ -25,8 +24,9 @@ const routes: Routes = [
     RouterModule.forChild(routes),
     TranslateModule.forChild(),
     ComponentsModule,
+    DirectivesModule,
+    CommonConsumptionModule
   ],
-  declarations: [ExploreBooksPage, ExploreBooksSortComponent],
-  entryComponents: [ExploreBooksSortComponent],
+  declarations: [ExploreBooksPage]
 })
 export class ExploreBooksPageModule {}
diff --git a/src/app/resources/explore-books/explore-books.page.html b/src/app/resources/explore-books/explore-books.page.html
index 97fb3635e..5a93cd2ae 100644
--- a/src/app/resources/explore-books/explore-books.page.html
+++ b/src/app/resources/explore-books/explore-books.page.html
@@ -42,6 +42,7 @@
     </div>
   </form>
 
+  <div class="explore-results-section">
   <div class="empty-search-result ion-text-center" *ngIf="!showLoader && !contentSearchResult.length" padding-top>
     {{ 'EMPTY_SEARCH_RESULTS' | translate }}
   </div>
@@ -51,8 +52,9 @@
   </div>
   <ng-container *ngFor="let content of contentSearchResult; let i = index">
     <div class="sb-card-container sb-card-textbook-container">
-      <app-text-book-card [content]="content" [layoutName]="layoutName" (click)="openContent(content, i)">
-      </app-text-book-card>
+      <sb-library-card [content]="content" [type]="LibraryCardTypes.MOBILE_TEXTBOOK"
+        (click)="openContent(content, i)" [cardImg]="commonUtilService.getContentImg(content)">
+      </sb-library-card>
     </div>
   </ng-container>
 
@@ -65,7 +67,7 @@ <h6 class="offline-header">
     </ion-text>
     <p class="offline-content">{{ 'OFFLINE_WARNING_ETBUI' | translate }}</p>
   </div>
-
+  </div>
 </ion-content>
 <ion-button expand="block" class="sort-by" *ngIf="!showLoader && contentSearchResult.length && checkedSortByButton"
   (click)="openSortOptionsModal()"> {{'SORT_BY' | translate}}</ion-button>
\ No newline at end of file
diff --git a/src/app/resources/explore-books/explore-books.page.scss b/src/app/resources/explore-books/explore-books.page.scss
index 49c9cd3a5..d36ddb8c4 100644
--- a/src/app/resources/explore-books/explore-books.page.scss
+++ b/src/app/resources/explore-books/explore-books.page.scss
@@ -1,6 +1,7 @@
 @import "src/assets/styles/variables";
 @import "src/assets/styles/_custom-mixins";
 @import "src/assets/styles/fonts";
+@import "src/assets/styles/_variables.scss";
 :host {
   .scroll-content {
     padding-bottom: 30% !important;
@@ -32,9 +33,9 @@
     padding: 8px 8px;
     margin: 1rem 1rem;
 
-    border: 1px solid #80a7ce;
+    border: 1px solid map-get($colors, light_blue_80);
     border-radius: 4px;
-    background-color: #ffffff;
+    background-color: map-get($colors, white);
 
     input {
       border: none;
@@ -45,7 +46,7 @@
       flex-shrink: 0;
 
       ion-icon {
-        color: #999999;
+        color: $gray-300;
       }
     }
   }
@@ -53,11 +54,6 @@
   .sb-textbook-container {
     margin: 0 !important;
     padding: 0 !important;
-    app-text-book-card {
-      .sb-card.reverse {
-        border-bottom: 0.5px solid #979797 !important;
-      }
-    }
 
     &:last-child {
       margin-bottom: 0 !important;
@@ -78,7 +74,7 @@
   }
   .sort-by {
     border-radius: 4px;
-    --background: #024f9d;
+    --background: #{$blue};
     padding: 0 2rem 5px 2rem !important;
     margin-bottom: 0.2rem;
     height: 45px;
diff --git a/src/app/resources/explore-books/explore-books.page.ts b/src/app/resources/explore-books/explore-books.page.ts
index 7c8918420..037a4bf3f 100644
--- a/src/app/resources/explore-books/explore-books.page.ts
+++ b/src/app/resources/explore-books/explore-books.page.ts
@@ -4,7 +4,7 @@ import {
   ViewChild, ViewChildren, OnInit
 } from '@angular/core';
 import { Platform, ModalController } from '@ionic/angular';
-import { AudienceFilter, ContentType, MimeType, Search, ExploreConstants, RouterLinks } from 'app/app.constant';
+import { MimeType, Search, ExploreConstants } from 'app/app.constant';
 import { Map } from 'app/telemetryutil';
 import {
   Environment,
@@ -22,9 +22,9 @@ import {
   ContentService,
   CorrelationData,
   FilterValue,
-  ProfileType,
   SearchType
 } from 'sunbird-sdk';
+import { LibraryCardTypes } from '@project-sunbird/common-consumption-v8';
 import { AppGlobalService, AppHeaderService, CommonUtilService, TelemetryGeneratorService } from '@app/services';
 import { animate, group, state, style, transition, trigger } from '@angular/animations';
 import { TranslateService } from '@ngx-translate/core';
@@ -34,6 +34,8 @@ import { Router, NavigationExtras } from '@angular/router';
 import { Location } from '@angular/common';
 import { ExploreBooksSortComponent } from '../explore-books-sort/explore-books-sort.component';
 import { tap, switchMap, catchError, mapTo, debounceTime } from 'rxjs/operators';
+import { NavigationService } from '@app/services/navigation-handler.service';
+import { CsPrimaryCategory } from '@project-sunbird/client-services/services/content';
 
 @Component({
   selector: 'app-explore-books',
@@ -81,9 +83,10 @@ import { tap, switchMap, catchError, mapTo, debounceTime } from 'rxjs/operators'
 export class ExploreBooksPage implements OnInit, OnDestroy {
   public pageId = 'ExploreBooksPage';
 
-  @ViewChild('searchInput') public searchInputRef: ElementRef;
+  @ViewChild('searchInput', { static: false }) public searchInputRef: ElementRef;
   @ViewChildren('filteredItems') public filteredItemsQueryList: QueryList<any>;
 
+  LibraryCardTypes = LibraryCardTypes;
   categoryGradeLevels: Array<any>;
   subjects: any;
   mimeTypes = [
@@ -109,14 +112,13 @@ export class ExploreBooksPage implements OnInit, OnDestroy {
   ];
   headerObservable: any;
   unregisterBackButton: Subscription;
-  contentType: Array<string> = [];
-  audienceFilter = [];
+  primaryCategories: Array<string> = [];
   contentSearchResult: Array<any> = [];
   showLoader = false;
   searchFormSubscription?: Subscription;
   selectedGrade: string;
   selectedMedium: string;
-  selectedContentType = 'all';
+  selectedPrimartCategory = 'all';
 
   searchForm: FormGroup = new FormGroup({
     grade: new FormControl([]),
@@ -126,11 +128,11 @@ export class ExploreBooksPage implements OnInit, OnDestroy {
     query: new FormControl('', { updateOn: 'submit' }),
     mimeType: new FormControl([])
   });
-  layoutName = 'explore';
   boardList: Array<FilterValue>;
   mediumList: Array<FilterValue>;
   corRelationList: Array<CorrelationData>;
   checkedSortByButton = true;
+  currentSelectedClass: any;
 
   constructor(
     @Inject('CONTENT_SERVICE') private contentService: ContentService,
@@ -143,7 +145,8 @@ export class ExploreBooksPage implements OnInit, OnDestroy {
     private telemetryGeneratorService: TelemetryGeneratorService,
     private platform: Platform,
     private router: Router,
-    private location: Location
+    private location: Location,
+    private navService: NavigationService
   ) {
     const extras = this.router.getCurrentNavigation().extras.state;
     if (extras) {
@@ -152,7 +155,7 @@ export class ExploreBooksPage implements OnInit, OnDestroy {
       this.categoryGradeLevels = extras.categoryGradeLevels;
       this.subjects = extras.subjects;
       this.subjects.unshift({ name: this.commonUtilService.translateMessage('ALL'), selected: true });
-      this.contentType = extras.contentType;
+      this.primaryCategories = extras.primaryCategories;
 
       this.corRelationList = [
         ... this.populateCData(this.selectedGrade, CorReleationDataType.CLASS),
@@ -165,7 +168,6 @@ export class ExploreBooksPage implements OnInit, OnDestroy {
   }
 
   async ngOnInit() {
-    this.checkUserSession();
     this.telemetryGeneratorService.generateImpressionTelemetry(
       ImpressionType.VIEW,
       ImpressionSubtype.EXPLORE_MORE_CONTENT,
@@ -176,11 +178,9 @@ export class ExploreBooksPage implements OnInit, OnDestroy {
       undefined,
       undefined,
       this.corRelationList);
-
   }
 
   ionViewWillEnter() {
-
     this.searchFormSubscription = this.onSearchFormChange()
       .subscribe(() => { });
 
@@ -208,7 +208,7 @@ export class ExploreBooksPage implements OnInit, OnDestroy {
     if (profileAtributes) {
       profileAtributes.forEach((value) => {
         correlationList.push({
-          id: value,
+          id: value || '',
           type: correlationType
         });
       });
@@ -237,28 +237,12 @@ export class ExploreBooksPage implements OnInit, OnDestroy {
     }
   }
 
-  checkUserSession() {
-    const isGuestUser = !this.appGlobalService.isUserLoggedIn();
-
-    if (isGuestUser) {
-      const userType = this.appGlobalService.getGuestUserType();
-      if (userType === ProfileType.STUDENT) {
-        this.audienceFilter = AudienceFilter.GUEST_STUDENT;
-      } else if (this.commonUtilService.isAccessibleForNonStudentRole(userType)) {
-        this.audienceFilter = AudienceFilter.GUEST_TEACHER;
-      }
-    } else {
-      this.audienceFilter = AudienceFilter.LOGGED_IN_USER;
-    }
-  }
-
   union(arrA: { name: string }[], arrB: { name: string }[]): { name: string }[] {
     return [
       ...arrA, ...arrB.filter((bItem) => !arrA.find((aItem) => bItem.name === aItem.name))
     ];
   }
 
-
   private onSearchFormChange(): Observable<undefined> {
     const value = new Map();
     return this.searchForm.valueChanges.pipe(
@@ -269,9 +253,10 @@ export class ExploreBooksPage implements OnInit, OnDestroy {
           ...this.searchForm.getRawValue(),
           query: this.searchInputRef.nativeElement['value'],
           searchType: SearchType.SEARCH,
-          contentTypes: this.selectedContentType === ContentType.TEXTBOOK ? [ContentType.TEXTBOOK] : this.contentType,
+          primaryCategories: this.selectedPrimartCategory === CsPrimaryCategory.DIGITAL_TEXTBOOK ?
+            [CsPrimaryCategory.DIGITAL_TEXTBOOK] : this.primaryCategories,
           facets: Search.FACETS,
-          audience: this.audienceFilter,
+          audience: [],
           mode: 'soft',
           languageCode: this.translate.currentLang,
           fields: ExploreConstants.REQUIRED_FIELDS
@@ -287,6 +272,9 @@ export class ExploreBooksPage implements OnInit, OnDestroy {
           values);
         this.showLoader = true;
         this.contentSearchResult = [];
+        if (this.currentSelectedClass) {
+          searchCriteria.grade[0] = this.currentSelectedClass;
+        }
         return this.contentService.searchContent(searchCriteria).pipe(
           catchError(() => {
             this.zone.run(() => {
@@ -312,7 +300,7 @@ export class ExploreBooksPage implements OnInit, OnDestroy {
 
             this.fetchingBoardMediumList(facetFilters);
             this.showLoader = false;
-            const gradeLevel = result.filterCriteria.facetFilters.find((f) => f.name === 'gradeLevel').values;
+            const gradeLevel = result.filterCriteria.facetFilters.find((f) => f.name === 'se_gradeLevels').values;
             gradeLevel.sort((a, b) => b.count - a.count);
             this.categoryGradeLevels = this.union(this.categoryGradeLevels, gradeLevel);
             const subjects = result.filterCriteria.facetFilters.find((f) => f.name === 'subject').values;
@@ -334,7 +322,6 @@ export class ExploreBooksPage implements OnInit, OnDestroy {
       }),
       mapTo(undefined)
     );
-
   }
 
   openContent(content, index) {
@@ -353,11 +340,12 @@ export class ExploreBooksPage implements OnInit, OnDestroy {
       }
     };
 
-    if (content.mimeType === MimeType.COLLECTION) {
-      this.router.navigate([RouterLinks.COLLECTION_DETAIL_ETB], navigationExtras);
-    } else {
-      this.router.navigate([RouterLinks.CONTENT_DETAILS], navigationExtras);
-    }
+    this.navService.navigateToDetailPage(content, navigationExtras.state);
+    // if (content.mimeType === MimeType.COLLECTION) {
+    //   this.router.navigate([RouterLinks.COLLECTION_DETAIL_ETB], navigationExtras);
+    // } else {
+    //   this.router.navigate([RouterLinks.CONTENT_DETAILS], navigationExtras);
+    // }
 
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
@@ -432,7 +420,6 @@ export class ExploreBooksPage implements OnInit, OnDestroy {
   }
 
   onMimeTypeClicked(mimeType, index) {
-
     this.mimeTypes.forEach((value) => {
       value.selected = false;
     });
@@ -444,20 +431,19 @@ export class ExploreBooksPage implements OnInit, OnDestroy {
     this.generateMimeTypeClickedTelemetry(mimeType.name);
 
     if (idx === index) {
-      this.selectedContentType = ContentType.TEXTBOOK;
+      this.selectedPrimartCategory = CsPrimaryCategory.DIGITAL_TEXTBOOK;
     } else {
-      this.selectedContentType = 'all';
+      this.selectedPrimartCategory = 'all';
     }
-
   }
 
   fetchingBoardMediumList(facetFilters) {
     return facetFilters.filter(value => {
-      if (value.name === 'board') {
+      if (value.name === 'se_boards') {
         this.boardList = value.values;
       }
 
-      if (value.name === 'medium') {
+      if (value.name === 'se_mediums') {
         this.mediumList = value.values;
       }
     });
@@ -473,6 +459,7 @@ export class ExploreBooksPage implements OnInit, OnDestroy {
   }
 
   classClickedForTelemetry(currentClass: string) {
+    this.currentSelectedClass = currentClass;
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
       InteractSubtype.CLASS_CLICKED,
diff --git a/src/app/resources/relevant-contents/relevant-contents.module.ts b/src/app/resources/relevant-contents/relevant-contents.module.ts
new file mode 100644
index 000000000..d46c84966
--- /dev/null
+++ b/src/app/resources/relevant-contents/relevant-contents.module.ts
@@ -0,0 +1,35 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ReactiveFormsModule, FormsModule } from '@angular/forms';
+import { Routes, RouterModule } from '@angular/router';
+
+import { IonicModule } from '@ionic/angular';
+
+import { TranslateModule } from '@ngx-translate/core';
+import { ComponentsModule } from '@app/app/components/components.module';
+import { DirectivesModule } from '@app/directives/directives.module';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
+import { RelevantContentsPage } from './relevant-contents.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: RelevantContentsPage
+  }
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    ReactiveFormsModule,
+    FormsModule,
+    IonicModule,
+    RouterModule.forChild(routes),
+    TranslateModule.forChild(),
+    ComponentsModule,
+    DirectivesModule,
+    CommonConsumptionModule
+  ],
+  declarations: [RelevantContentsPage]
+})
+export class RelevantContentsPageModule {}
diff --git a/src/app/resources/relevant-contents/relevant-contents.page.html b/src/app/resources/relevant-contents/relevant-contents.page.html
new file mode 100644
index 000000000..f1afad531
--- /dev/null
+++ b/src/app/resources/relevant-contents/relevant-contents.page.html
@@ -0,0 +1,67 @@
+<ion-content>
+
+    <div class="p-16 rc-bg-color" *ngIf="isLoading">
+        <div class="sb-textbook-container">
+            <sb-library-cards-stack 
+                [contentList]="[1,2,3,4,5,6,7,8]"
+                [maxCardCount]="8"
+                [isLoading]="isLoading">
+            </sb-library-cards-stack>
+        </div>
+    </div>
+
+    <div class="p-16 rc-bg-color" *ngIf="relevantContentList?.length">
+        <p class="rc-title">{{'FRMELEMNTS_LBL_CONTENT_FOUND' | translate }}</p>
+        <div class="sb-textbook-container">
+            <sb-library-cards-stack 
+                [contentList]="relevantContentList"
+                [isOffline]="!commonUtilService.networkInfo.isNetworkAvailable" 
+                [maxCardCount]="relevantContentCount"
+                [viewMoreButtonText]="'SEE_MORE_CONTENT' | translate"
+                (viewMoreClick)="viewMoreContent(contentOrder.RELEVANT)"
+                (cardClick)="navigateToTextBookDetailPage($event)">
+            </sb-library-cards-stack>
+        </div>
+    </div>
+
+    <div class="p-16 mt-8" *ngIf="similarContentList?.length">
+        <p class="rc-title">{{'FRMELEMNTS_LBL_CONTENT_AVAIALABLE_IN_OTHER_BOARD' | translate }}</p>
+        <div class="sb-textbook-container">
+            <sb-library-cards-stack 
+                [contentList]="similarContentList"
+                [isOffline]="!commonUtilService.networkInfo.isNetworkAvailable" 
+                [maxCardCount]="similarContentCount"
+                [viewMoreButtonText]="'SEE_MORE_CONTENT' | translate"
+                (viewMoreClick)="viewMoreContent(contentOrder.SIMILAR)"
+                (cardClick)="navigateToTextBookDetailPage($event)">
+            </sb-library-cards-stack>
+        </div>
+    </div>
+
+    <div class="no-content-msg" *ngIf="!isLoading && !similarContentList?.length && !relevantContentList?.length">
+        <div>
+            <img src="assets/imgs/group.svg" alt="no data found">
+        </div>
+        <strong>{{'FRMELEMNTS_LBL_NO_MATCHING_CONTENT' | translate}}</strong>
+
+        <p class="mb-0">{{'FRMELEMNTS_LBL_CONTENT_TO_BE_ADDED' | translate}}</p>
+        <p [innerHTML]="'FRMELEMNTS_LBL_CLICK_HELP' | translate"></p>
+    </div>
+
+    <div *ngIf="similarContentList?.length || relevantContentList?.length">
+        <div class="text-center mt-32">
+            <p class="mb-0">{{ "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT_YET" | translate}}</p>
+        </div>
+        
+        <ion-button expand="block" class="M16 MB30" (click)="goToHelp()">
+            {{'FRMELEMNTS_BTN_SEEK_HELP' | translate}}
+        </ion-button>
+    </div>
+        
+</ion-content>
+
+<ion-footer *ngIf="!similarContentList?.length && !relevantContentList?.length">
+    <ion-button expand="block" class="M16 MB30" (click)="goToHelp()">
+        {{'FRMELEMNTS_BTN_SEEK_HELP' | translate}}
+    </ion-button>
+</ion-footer>
diff --git a/src/app/resources/relevant-contents/relevant-contents.page.scss b/src/app/resources/relevant-contents/relevant-contents.page.scss
new file mode 100644
index 000000000..a1f050082
--- /dev/null
+++ b/src/app/resources/relevant-contents/relevant-contents.page.scss
@@ -0,0 +1,22 @@
+@import "src/assets/styles/variables";
+@import "src/assets/styles/_custom-mixins";
+@import "src/assets/styles/fonts";
+
+.rc-title {
+  margin: 8px;
+  font-weight: bold;
+}
+
+.rc-bg-color {
+  background-color: map-get($colors, white_f2)
+}
+
+ion-button {
+  --background: #{$blue} !important;
+  height: 40px !important;
+}
+
+.no-content-msg {
+  text-align: center;
+  padding-top: 30%;
+}
\ No newline at end of file
diff --git a/src/app/resources/relevant-contents/relevant-contents.page.ts b/src/app/resources/relevant-contents/relevant-contents.page.ts
new file mode 100644
index 000000000..d567fb1d5
--- /dev/null
+++ b/src/app/resources/relevant-contents/relevant-contents.page.ts
@@ -0,0 +1,252 @@
+import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import { CorReleationDataType, Environment, InteractSubtype, InteractType, PageId, ImpressionType } from '@app/services';
+import {
+  ContentSearchCriteria,
+  ContentSearchResult,
+  ContentService,
+  SearchType,
+  GetSuggestedFrameworksRequest,
+  CachedItemRequestSourceFrom,
+  FrameworkCategoryCodesGroup,
+  FrameworkUtilService,
+  CorrelationData
+} from 'sunbird-sdk';
+import { ExploreConstants, RouterLinks, Search } from '@app/app/app.constant';
+import { Router } from '@angular/router';
+import { ContentUtil } from '@app/util/content-util';
+import { TranslateService } from '@ngx-translate/core';
+import { NavigationService } from '@app/services/navigation-handler.service';
+
+enum ContentOrder {
+  RELEVANT = 'RELEVANT',
+  SIMILAR = 'SIMILAR',
+}
+@Component({
+  selector: 'app-relevant-contents',
+  templateUrl: './relevant-contents.page.html',
+  styleUrls: ['./relevant-contents.page.scss'],
+})
+export class RelevantContentsPage implements OnInit, OnDestroy {
+  private displayCount = 4;
+  private formInput: any;
+  private searchRequest: ContentSearchCriteria = {
+    searchType: SearchType.SEARCH,
+    facets: Search.FACETS_ETB,
+    fields: ExploreConstants.REQUIRED_FIELDS
+  };
+  private selectedFramework = {
+    board: [],
+    medium: [],
+    grade: [],
+    subject: [],
+    primaryCategory: [],
+  };
+  private paramsData: any;
+  private defaultBoard = [];
+
+  relevantContentList: Array<any> = [];
+  similarContentList: Array<any>[];
+  contentOrder = ContentOrder;
+  relevantContentCount = this.displayCount;
+  similarContentCount = this.displayCount;
+  isLoading = false;
+  corRelation: Array<CorrelationData> = [];
+
+  constructor(
+    @Inject('FRAMEWORK_UTIL_SERVICE') private frameworkUtilService: FrameworkUtilService,
+    @Inject('CONTENT_SERVICE') private contentService: ContentService,
+    public commonUtilService: CommonUtilService,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+    private translate: TranslateService,
+    private router: Router,
+    private navService: NavigationService
+  ) {
+    this.getNavParam();
+  }
+  async ngOnInit() {
+    this.telemetryGeneratorService.generateImpressionTelemetry(
+      ImpressionType.VIEW,
+      '',
+      PageId.RELEVANT_CONTENTS,
+      Environment.USER,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      this.corRelation);
+  }
+
+  private getNavParam() {
+    this.isLoading = true;
+    const navExtras = this.router.getCurrentNavigation().extras && this.router.getCurrentNavigation().extras.state;
+    if (navExtras) {
+      this.formInput = navExtras.formInput;
+      this.corRelation = navExtras.corRelation;
+      this.paramsData = navExtras.formOutput;
+      this.selectedFramework.board = this.paramsData.board && this.paramsData.board.name ? [this.paramsData.board.name] : [];
+      this.selectedFramework.medium = this.paramsData.medium && this.paramsData.medium.name ? [this.paramsData.medium.name] : [];
+      this.selectedFramework.grade = this.paramsData.grade && this.paramsData.grade.name ? [this.paramsData.grade.name] : [];
+      this.selectedFramework.subject = this.paramsData.subject && this.paramsData.subject.name ? [this.paramsData.subject.name] : [];
+      this.selectedFramework.primaryCategory = [this.paramsData.primaryCategory];
+    }
+    this.getDefaultBoard();
+    this.prepareContentRequest();
+    this.getRelevantContents();
+    this.getSimilarContents();
+    this.corRelation.push({ id: PageId.RELEVANT_CONTENTS, type: CorReleationDataType.FROM_PAGE });
+  }
+
+  private prepareContentRequest() {
+    this.searchRequest.board = this.selectedFramework.board;
+    this.searchRequest.medium = this.selectedFramework.medium;
+    this.searchRequest.grade = this.selectedFramework.grade;
+    this.searchRequest.subject = this.selectedFramework.subject;
+    this.searchRequest.primaryCategories = this.selectedFramework.primaryCategory;
+    this.searchRequest.mode = 'hard';
+  }
+
+  private async getRelevantContents() {
+    this.relevantContentList = await this.fetchContentResult(this.searchRequest);
+  }
+
+  private async getSimilarContents() {
+    try {
+      const similarContentRequest: ContentSearchCriteria = { ...this.searchRequest };
+
+      if (this.selectedFramework.board && this.defaultBoard.length && this.selectedFramework.board.find(e => e === this.defaultBoard[0])) {
+        similarContentRequest.board = await this.getBoardList(this.searchRequest.board && this.searchRequest.board[0]);
+      } else {
+        similarContentRequest.board = this.defaultBoard[0];
+      }
+      similarContentRequest.mode = 'soft';
+
+      similarContentRequest.primaryCategories = this.getPrimaryCategoryList();
+      const contentList = await this.fetchContentResult(similarContentRequest);
+      contentList.sort((a) => {
+        const val = (a['primaryCategory'] !== this.searchRequest.primaryCategories[0]) ? 1 : -1;
+        return val;
+      });
+      this.similarContentList = contentList;
+      this.isLoading = false;
+    } catch (e) {
+      this.isLoading = false;
+    }
+
+  }
+
+  private async fetchContentResult(request: ContentSearchCriteria): Promise<any[]> {
+    try {
+      const result: ContentSearchResult = await this.contentService.searchContent(request).toPromise();
+      const contentList = result.contentDataList;
+      if (contentList && contentList.length) {
+        for (let i = 0; i < contentList.length; i++) {
+          contentList[i]['cardImg'] = ContentUtil.getAppIcon(contentList[i].appIcon,
+            contentList[i]['basePath'], this.commonUtilService.networkInfo.isNetworkAvailable);
+        }
+      }
+      return contentList || [];
+    } catch (e) {
+      console.log(e);
+      return [];
+    }
+  }
+
+  ngOnDestroy(): void {
+
+  }
+
+  navigateToTextBookDetailPage(event) {
+    const item = event.data;
+    const index = event.index;
+    const identifier = item.contentId || item.identifier;
+    const corRelationList = [{ id: item.name, type: CorReleationDataType.SUBJECT }];
+    const values = {};
+    values['sectionName'] = item.subject;
+    values['positionClicked'] = index;
+    this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
+      InteractSubtype.CONTENT_CLICKED,
+      Environment.HOME,
+      PageId.EXPLORE_MORE_CONTENT,
+      ContentUtil.getTelemetryObject(item),
+      values,
+      ContentUtil.generateRollUp(undefined, identifier),
+      corRelationList);
+    if (this.commonUtilService.networkInfo.isNetworkAvailable || item.isAvailableLocally) {
+      this.navService.navigateToDetailPage(
+        item,
+        { content: item, corRelation: corRelationList }
+      );
+    } else {
+      this.commonUtilService.presentToastForOffline('OFFLINE_WARNING_ETBUI_1');
+    }
+  }
+
+  viewMoreContent(type: ContentOrder) {
+    if (type === this.contentOrder.RELEVANT) {
+      this.relevantContentCount += this.displayCount;
+    } else {
+      this.similarContentCount += this.displayCount;
+    }
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      InteractSubtype.VIEW_MORE_CLICKED,
+      Environment.HOME,
+      PageId.RELEVANT_CONTENTS)
+  }
+
+  async goToHelp() {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      InteractSubtype.HELP_CLICKED,
+      Environment.HOME,
+      PageId.RELEVANT_CONTENTS);
+
+    this.router.navigate([`/${RouterLinks.FAQ_HELP}`], {
+      state: {
+        corRelation: this.corRelation
+      }
+    });
+  }
+
+  private getPrimaryCategoryList() {
+    const primaryCategoryConfig: any = this.formInput.find(e => e.code === 'primaryCategory');
+    const primaryCategoryList = [];
+    const list = (primaryCategoryConfig && primaryCategoryConfig.templateOptions && primaryCategoryConfig.templateOptions.options) || [];
+    list.forEach(element => {
+      primaryCategoryList.push(element.value);
+    });
+    return primaryCategoryList;
+  }
+
+  private getDefaultBoard() {
+    const boardConfig = this.formInput.find(e => e.code === 'board');
+    this.defaultBoard = boardConfig && boardConfig.templateOptions && boardConfig.templateOptions.dataSrc &&
+      boardConfig.templateOptions.dataSrc.params && boardConfig.templateOptions.dataSrc.params.relevantTerms ?
+      boardConfig.templateOptions.dataSrc.params.relevantTerms : [];
+  }
+
+  private async getBoardList(board) {
+    const getSuggestedFrameworksRequest: GetSuggestedFrameworksRequest = {
+      from: CachedItemRequestSourceFrom.CACHE,
+      language: this.translate.currentLang,
+      requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
+    };
+
+    try {
+      const list = await this.frameworkUtilService.getActiveChannelSuggestedFrameworkList(getSuggestedFrameworksRequest).toPromise();
+      const boardList = [];
+      list.forEach(element => {
+        if (element.name !== board) {
+          boardList.push(element.name);
+        }
+      });
+
+      return boardList || [];
+    } catch (e) {
+      return [];
+    }
+  }
+
+}
diff --git a/src/app/resources/resource.component.spec.ts b/src/app/resources/resource.component.spec.ts
index 4884ea86a..5c0892f1e 100644
--- a/src/app/resources/resource.component.spec.ts
+++ b/src/app/resources/resource.component.spec.ts
@@ -1,5 +1,4 @@
 import {ResourcesComponent} from '@app/app/resources/resources.component';
-import {Container} from 'inversify';
 import {
     ContentEventType,
     ContentSearchCriteria,
@@ -16,7 +15,6 @@ import {
     ProfileType,
     SearchType,
     SharedPreferences,
-    TelemetryObject
 } from 'sunbird-sdk';
 import {EventsBusServiceImpl} from 'sunbird-sdk/events-bus/impl/events-bus-service-impl';
 import {ContentServiceImpl} from 'sunbird-sdk/content/impl/content-service-impl';
@@ -24,15 +22,19 @@ import {ChangeDetectorRef, NgZone} from '@angular/core';
 import {
     AppGlobalService,
     AppHeaderService,
-    CommonUtilService, Environment,
+    CommonUtilService,
+    Environment,
     FormAndFrameworkUtilService,
     InteractSubtype,
     InteractType,
+    NotificationService,
     PageId,
     SunbirdQRScanner,
-    TelemetryGeneratorService
+    TelemetryGeneratorService,
+    ProfileHandler
 } from '@app/services';
-import {Events, MenuController, ToastController} from '@ionic/angular';
+import {MenuController, PopoverController, ToastController} from '@ionic/angular';
+import {Events} from '@app/util/events';
 import {AppVersion} from '@ionic-native/app-version/ngx';
 import {Network} from '@ionic-native/network/ngx';
 import {TranslateService} from '@ngx-translate/core';
@@ -40,15 +42,18 @@ import {Router} from '@angular/router';
 import {SplaschreenDeeplinkActionHandlerDelegate} from '@app/services/sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate';
 import {mockContentData} from '@app/app/content-details/content-details.page.spec.data';
 import {NEVER, of, Subscription} from 'rxjs';
-import {NotificationService} from '@app/services';
-import {ContentFilterConfig, EventTopics, RouterLinks} from '../app.constant';
+import {ContentFilterConfig, EventTopics, PreferenceKey, RouterLinks, ViewMore} from '../app.constant';
+import {ImpressionType} from '../../services/telemetry-constants';
+import {NavigationService} from '../../services/navigation-handler.service';
+import {FrameworkSelectionDelegateService} from '../profile/framework-selection/framework-selection.page';
+import { FormService } from '@project-sunbird/sunbird-sdk';
+import { ContentAggregatorHandler } from '../../services/content/content-aggregator-handler.service';
 
 describe('ResourcesComponent', () => {
     let resourcesComponent: ResourcesComponent;
-    const container = new Container();
 
     const mockProfileService: Partial<ProfileService> = {
-        getActiveSessionProfile: jest.fn(() => of({}))
+        getActiveSessionProfile: jest.fn(() => of({profileType: 'Student'}))
     };
     const mockSharedPreference: Partial<SharedPreferences> = {
         getString: jest.fn(() => of('en'))
@@ -90,8 +95,11 @@ describe('ResourcesComponent', () => {
     };
     const mockCommonUtilService: Partial<CommonUtilService> = {
         convertFileSrc: jest.fn(),
-        networkInfo: jest.fn(),
-        isAccessibleForNonStudentRole: jest.fn()
+        networkInfo: {
+            isNetworkAvailable: true
+        },
+        isAccessibleForNonStudentRole: jest.fn(),
+        presentToastForOffline: jest.fn()
     };
     const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {};
     const mockTranslateService: Partial<TranslateService> = {};
@@ -105,6 +113,21 @@ describe('ResourcesComponent', () => {
     };
     const mockAppNotificationService: Partial<NotificationService> = {};
     const mockChangeRef: Partial<ChangeDetectorRef> = {};
+    const mockPopoverCtrl: Partial<PopoverController> = {};
+    const mockNavService: Partial<NavigationService> = {
+        navigateToCollection: jest.fn(),
+        navigateToDetailPage: jest.fn()
+    };
+    const mockFrameworkSelectionDelegateService: Partial<FrameworkSelectionDelegateService> = {
+        delegate: {
+            onFrameworkSelectionSubmit: jest.fn()
+        }
+    };
+    const mockFormService: Partial<FormService> = {};
+    const mockContentAggregatorHandler: Partial<ContentAggregatorHandler> = {};
+    const mockProfileHandler: Partial<ProfileHandler> = {
+        getAudience: jest.fn(() => Promise.resolve(['Student']))
+    };
 
     const constructComponent = () => {
         resourcesComponent = new ResourcesComponent(
@@ -128,9 +151,14 @@ describe('ResourcesComponent', () => {
             mockToastCtrlService as ToastController,
             mockMenuController as MenuController,
             mockHeaderService as AppHeaderService,
+            mockNavService as NavigationService,
             mockRouter as Router,
             mockChangeRef as ChangeDetectorRef,
-            mockAppNotificationService as NotificationService
+            mockAppNotificationService as NotificationService,
+            mockPopoverCtrl as PopoverController,
+            mockFrameworkSelectionDelegateService as FrameworkSelectionDelegateService,
+            mockContentAggregatorHandler as ContentAggregatorHandler,
+            mockProfileHandler as ProfileHandler
         );
     };
     beforeAll(() => {
@@ -149,13 +177,9 @@ describe('ResourcesComponent', () => {
         // arrange
         mockQRScanner.startScanner = jest.fn();
         jest.spyOn(resourcesComponent, 'getGroupByPage').mockImplementation();
-        jest.spyOn(resourcesComponent, 'loadRecentlyViewedContent').mockImplementation();
         jest.spyOn(resourcesComponent, 'getLocalContent').mockImplementation();
         jest.spyOn(resourcesComponent, 'getPopularContent').mockImplementation();
         jest.spyOn(resourcesComponent, 'swipeDownToRefresh').mockImplementation();
-        mockProfileService.getActiveSessionProfile = jest.fn((profile) => {
-            return of(profile);
-        });
         mockTelemetryGeneratorService.generateStartSheenAnimationTelemetry = jest.fn();
         mockAppGlobalService.setSelectedBoardMediumGrade = jest.fn();
         mockAppGlobalService.openPopover = jest.fn();
@@ -169,14 +193,14 @@ describe('ResourcesComponent', () => {
         });
         mockEvents.subscribe = jest.fn((topic, fn) => {
             if (topic === 'savedResources:update') {
-                fn({update: 'sample_update_result'});
+                fn({ update: 'sample_update_result' });
             }
 
             if (topic === 'event:showScanner') {
-                fn({pageName: 'library'});
+                fn({ pageName: 'library' });
             }
             if (topic === 'onAfterLanguageChange:update') {
-                fn({selectedLanguage: 'ur'});
+                fn({ selectedLanguage: 'ur' });
                 resourcesComponent.selectedLanguage = 'ur';
             }
 
@@ -184,7 +208,7 @@ describe('ResourcesComponent', () => {
                 fn();
             }
             if (topic === 'force_optional_upgrade') {
-                fn({upgrade: 'sample_result'});
+                fn({ upgrade: 'sample_result' });
                 mockAppGlobalService.openPopover = jest.fn(() => Promise.resolve());
                 resourcesComponent.isUpgradePopoverShown = true;
             }
@@ -194,7 +218,6 @@ describe('ResourcesComponent', () => {
         // assert
         setTimeout(() => {
             expect(mockEvents.subscribe).toHaveBeenCalled();
-            expect(resourcesComponent.loadRecentlyViewedContent).toHaveBeenCalled();
             expect(resourcesComponent.getLocalContent).toHaveBeenCalled();
             expect(resourcesComponent.getPopularContent).toHaveBeenCalled();
             done();
@@ -286,24 +309,51 @@ describe('ResourcesComponent', () => {
             mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
             mockTelemetryGeneratorService.generateEndSheenAnimationTelemetry = jest.fn();
             jest.spyOn(resourcesComponent, 'generateExtraInfoTelemetry').mockImplementation();
-            mockContentService.searchContentGroupedByPageSection = jest.fn(() => of({
-                name: 'sample_name',
-                sections: [
-                    {
-                        contents: [
+            jest.spyOn(resourcesComponent, 'getCategoryData').mockImplementation();
+            mockContentService.buildContentAggregator = jest.fn(() => ({
+                handle: jest.fn(() => of({
+                    title: JSON.stringify({en: 'TV Programs'}),
+                    orientation: 'horizontal',
+                    section: {
+                        sections: [
                             {
-                                appIcon: 'https:',
-                            }
-                        ],
-                        name: 'mathematics',
-                        display: {
-                            name: {
-                                en: 'Mathematics'
-                            }
+                                contents: [
+                                    {
+                                        appIcon: 'https:',
+                                    }
+                                ],
+                                name: 'mathematics',
+                                display: {
+                                    name: {
+                                        en: 'Mathematics'
+                                    }
+                                },
+                            },
+                        ]
+                    }
+                }))
+            }));
+            mockContentAggregatorHandler.aggregate = jest.fn(() => Promise.resolve([{
+                title: JSON.stringify({en: 'TV Programs'}),
+                orientation: 'horizontal',
+                section: {
+                    sections: [
+                        {
+                            contents: [
+                                {
+                                    appIcon: 'https:',
+                                }
+                            ],
+                            name: 'mathematics',
+                            display: {
+                                name: {
+                                    en: 'Mathematics'
+                                }
+                            },
                         },
-                    },
-                ]
-            } as ContentsGroupedByPageSection));
+                    ]
+                }
+            }]));
             mockCommonUtilService.networkInfo.isNetworkAvailable = true;
             mockNgZone.run = jest.fn((fn) => fn());
             mockCommonUtilService.convertFileSrc = jest.fn(() => 'http://sample.png');
@@ -314,8 +364,8 @@ describe('ResourcesComponent', () => {
                 // assert
                 expect(mockAppGlobalService.setSelectedBoardMediumGrade).toHaveBeenCalled();
                 expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
-                expect(mockContentService.searchContentGroupedByPageSection).toHaveBeenCalled();
                 expect(mockNgZone.run).toHaveBeenCalled();
+                expect(mockContentAggregatorHandler.aggregate).toHaveBeenCalled();
                 done();
             }, 0);
         });
@@ -333,24 +383,31 @@ describe('ResourcesComponent', () => {
             mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
             mockTelemetryGeneratorService.generateEndSheenAnimationTelemetry = jest.fn();
             jest.spyOn(resourcesComponent, 'generateExtraInfoTelemetry').mockImplementation();
-            mockContentService.searchContentGroupedByPageSection = jest.fn(() => of({
-                name: 'sample_name',
-                sections: [
-                    {
-                        contents: [
-                            {
-                                appIcon: 'https:',
-                            }
-                        ],
-                        name: 'mathematics',
-                        display: {
-                            name: {
-                                en: 'Mathematics'
-                            }
+            jest.spyOn(resourcesComponent, 'getCategoryData').mockImplementation();
+            mockContentAggregatorHandler.aggregate = jest.fn(() => Promise.resolve([{
+                title: JSON.stringify({en: 'Digital Books'}),
+                orientation: 'vertical',
+                section: {
+                    sections: [
+                        {
+                            contents: [
+                                {
+                                    appIcon: 'https:',
+                                }
+                            ],
+                            name: 'mathematics',
+                            display: {
+                                name: {
+                                    en: 'Mathematics'
+                                }
+                            },
                         },
-                    },
-                ]
-            } as ContentsGroupedByPageSection));
+                    ],
+                    combination: {
+                        gradeLevel: ['class 1', 'class 2']
+                    }
+                }
+            }]));
             mockCommonUtilService.networkInfo.isNetworkAvailable = true;
             mockNgZone.run = jest.fn((fn) => fn());
             const fileSrcStack = [undefined, 'appIcon'];
@@ -362,8 +419,7 @@ describe('ResourcesComponent', () => {
                 // assert
                 expect(mockAppGlobalService.setSelectedBoardMediumGrade).toHaveBeenCalled();
                 expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
-                expect(mockContentService.searchContentGroupedByPageSection).toHaveBeenCalled();
-                expect(mockNgZone.run).toHaveBeenCalled();
+                expect(mockContentAggregatorHandler.aggregate).toHaveBeenCalled();
                 done();
             }, 0);
         });
@@ -380,25 +436,29 @@ describe('ResourcesComponent', () => {
             mockAppGlobalService.setSelectedBoardMediumGrade = jest.fn();
             mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
             mockTelemetryGeneratorService.generateEndSheenAnimationTelemetry = jest.fn();
+            jest.spyOn(resourcesComponent, 'getCategoryData').mockImplementation();
             jest.spyOn(resourcesComponent, 'generateExtraInfoTelemetry').mockImplementation();
-            mockContentService.searchContentGroupedByPageSection = jest.fn(() => of({
-                name: 'sample_name',
-                sections: [
-                    {
-                        contents: [
-                            {
-                                appIcon: 'https:',
-                            }
-                        ],
-                        name: 'mathematics',
-                        display: {
-                            name: {
-                                en: 'Mathematics'
-                            }
+            mockContentAggregatorHandler.aggregate = jest.fn(() => Promise.resolve([{
+                title: JSON.stringify({en: 'Digital Books'}),
+                orientation: 'vertical',
+                section: {
+                    sections: [
+                        {
+                            contents: [
+                                {
+                                    appIcon: 'https:',
+                                }
+                            ],
+                            name: 'mathematics',
+                            display: {
+                                name: {
+                                    en: 'Mathematics'
+                                }
+                            },
                         },
-                    },
-                ]
-            } as ContentsGroupedByPageSection));
+                    ]
+                }
+            }] as ContentsGroupedByPageSection));
             mockCommonUtilService.networkInfo.isNetworkAvailable = false;
             mockNgZone.run = jest.fn((fn) => fn());
             // act
@@ -408,8 +468,7 @@ describe('ResourcesComponent', () => {
                 // assert
                 expect(mockAppGlobalService.setSelectedBoardMediumGrade).toHaveBeenCalled();
                 expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
-                expect(mockContentService.searchContentGroupedByPageSection).toHaveBeenCalled();
-                expect(mockNgZone.run).toHaveBeenCalled();
+                expect(mockContentAggregatorHandler.aggregate).toHaveBeenCalled();
                 done();
             }, 0);
         });
@@ -425,9 +484,7 @@ describe('ResourcesComponent', () => {
             };
             mockAppGlobalService.setSelectedBoardMediumGrade = jest.fn();
             mockTelemetryGeneratorService.generateEndSheenAnimationTelemetry = jest.fn();
-            mockContentService.searchContentGroupedByPageSection = jest.fn(() => {
-                return of(Promise.reject('SERVER_ERROR'));
-            });
+            mockContentAggregatorHandler.aggregate = jest.fn(() => undefined);
             mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
             mockNgZone.run = jest.fn((fn) => fn());
             mockCommonUtilService.showToast = jest.fn(() => {
@@ -440,9 +497,7 @@ describe('ResourcesComponent', () => {
                 // assert
                 expect(mockAppGlobalService.setSelectedBoardMediumGrade).toHaveBeenCalled();
                 expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
-                expect(mockContentService.searchContentGroupedByPageSection).toHaveBeenCalled();
-                expect(mockNgZone.run).toHaveBeenCalled();
-                // expect(mockCommonUtilService.convertFileSrc).toHaveBeenCalledWith('http://sample.path');
+                expect(mockContentAggregatorHandler.aggregate).toHaveBeenCalled();
                 done();
             }, 0);
         });
@@ -451,11 +506,11 @@ describe('ResourcesComponent', () => {
 
     it('should call relevant methods inside when ngOnInit() called at the beginning', (done) => {
         // arrange
-        resourcesComponent.appliedFilter = 'sample_filter';
+        mockSharedPreference.getBoolean = jest.fn(() => of(false));
+        mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
         jest.spyOn(resourcesComponent, 'getCurrentUser').mockImplementation();
         jest.spyOn(resourcesComponent, 'scrollToTop').mockImplementation();
         jest.spyOn(resourcesComponent, 'getPopularContent').mockImplementation();
-        jest.spyOn(resourcesComponent, 'loadRecentlyViewedContent').mockImplementation();
         const data = jest.fn((fn) => fn());
         mockCommonUtilService.networkAvailability$ = {
             subscribe: data
@@ -466,11 +521,6 @@ describe('ResourcesComponent', () => {
             if (topic === EventTopics.TAB_CHANGE) {
                 fn('LIBRARY');
             }
-            if (resourcesComponent.appliedFilter) {
-            }
-            if (topic === 'event:update_recently_viewed') {
-                fn();
-            }
         });
         resourcesComponent.storyAndWorksheets = [{
             contents: [{
@@ -484,10 +534,14 @@ describe('ResourcesComponent', () => {
         resourcesComponent.ngOnInit();
         // assert
         setTimeout(() => {
+            expect(mockSharedPreference.getBoolean).toHaveBeenCalledWith(PreferenceKey.COACH_MARK_SEEN);
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                ImpressionType.PAGE_REQUEST, '',
+                PageId.LIBRARY,
+                Environment.ONBOARDING
+            );
             expect(resourcesComponent.getCurrentUser).toHaveBeenCalled();
             expect(resourcesComponent.scrollToTop).toHaveBeenCalled();
-            expect(resourcesComponent.getPopularContent).toHaveBeenCalled();
-            expect(resourcesComponent.loadRecentlyViewedContent).toHaveBeenCalled();
             expect(mockAppGlobalService.generateConfigInteractEvent).toHaveBeenCalled();
             expect(mockAppNotificationService.handleNotification).toHaveBeenCalled();
             expect(mockEvents.subscribe).toHaveBeenCalled();
@@ -497,11 +551,10 @@ describe('ResourcesComponent', () => {
 
     it('should appIcon is not avilable', (done) => {
         // arrange
-        resourcesComponent.appliedFilter = 'sample_filter';
+        mockSharedPreference.getBoolean = jest.fn(() => of(true));
         jest.spyOn(resourcesComponent, 'getCurrentUser').mockImplementation();
         jest.spyOn(resourcesComponent, 'scrollToTop').mockImplementation();
         jest.spyOn(resourcesComponent, 'getPopularContent').mockImplementation();
-        jest.spyOn(resourcesComponent, 'loadRecentlyViewedContent').mockImplementation();
         const data = jest.fn((fn) => fn());
         mockCommonUtilService.networkAvailability$ = {
             subscribe: data
@@ -512,11 +565,6 @@ describe('ResourcesComponent', () => {
             if (topic === EventTopics.TAB_CHANGE) {
                 fn('LIBRARY');
             }
-            if (resourcesComponent.appliedFilter) {
-            }
-            if (topic === 'event:update_recently_viewed') {
-                fn();
-            }
         });
         resourcesComponent.storyAndWorksheets = [{
             contents: [{
@@ -530,10 +578,9 @@ describe('ResourcesComponent', () => {
         resourcesComponent.ngOnInit();
         // assert
         setTimeout(() => {
+            expect(mockSharedPreference.getBoolean).toHaveBeenCalledWith(PreferenceKey.COACH_MARK_SEEN);
             expect(resourcesComponent.getCurrentUser).toHaveBeenCalled();
             expect(resourcesComponent.scrollToTop).toHaveBeenCalled();
-            expect(resourcesComponent.getPopularContent).toHaveBeenCalled();
-            expect(resourcesComponent.loadRecentlyViewedContent).toHaveBeenCalled();
             expect(mockAppGlobalService.generateConfigInteractEvent).toHaveBeenCalled();
             expect(mockAppNotificationService.handleNotification).toHaveBeenCalled();
             expect(mockEvents.subscribe).toHaveBeenCalled();
@@ -543,11 +590,10 @@ describe('ResourcesComponent', () => {
 
     it('should appIcon is not avilable', (done) => {
         // arrange
-        resourcesComponent.appliedFilter = 'sample_filter';
+        mockSharedPreference.getBoolean = jest.fn(() => of(true));
         jest.spyOn(resourcesComponent, 'getCurrentUser').mockImplementation();
         jest.spyOn(resourcesComponent, 'scrollToTop').mockImplementation();
         jest.spyOn(resourcesComponent, 'getPopularContent').mockImplementation();
-        jest.spyOn(resourcesComponent, 'loadRecentlyViewedContent').mockImplementation();
         const data = jest.fn((fn) => fn());
         mockCommonUtilService.networkAvailability$ = {
             subscribe: data
@@ -558,11 +604,6 @@ describe('ResourcesComponent', () => {
             if (topic === EventTopics.TAB_CHANGE) {
                 fn('LIBRARY');
             }
-            if (resourcesComponent.appliedFilter) {
-            }
-            if (topic === 'event:update_recently_viewed') {
-                fn();
-            }
         });
         resourcesComponent.storyAndWorksheets = [{
             contents: [{
@@ -577,10 +618,9 @@ describe('ResourcesComponent', () => {
         resourcesComponent.ngOnInit();
         // assert
         setTimeout(() => {
+            expect(mockSharedPreference.getBoolean).toHaveBeenCalledWith(PreferenceKey.COACH_MARK_SEEN);
             expect(resourcesComponent.getCurrentUser).toHaveBeenCalled();
             expect(resourcesComponent.scrollToTop).toHaveBeenCalled();
-            expect(resourcesComponent.getPopularContent).toHaveBeenCalled();
-            expect(resourcesComponent.loadRecentlyViewedContent).toHaveBeenCalled();
             expect(mockAppGlobalService.generateConfigInteractEvent).toHaveBeenCalled();
             expect(mockAppNotificationService.handleNotification).toHaveBeenCalled();
             expect(mockEvents.subscribe).toHaveBeenCalled();
@@ -590,7 +630,7 @@ describe('ResourcesComponent', () => {
 
     it('should call qrScanner else if part when subscribeMethod returns emptyString', (done) => {
         // arrange
-
+        mockSharedPreference.getBoolean = jest.fn(() => of(true));
         jest.spyOn(resourcesComponent, 'getCurrentUser').mockImplementation();
         jest.spyOn(resourcesComponent, 'scrollToTop').mockImplementation();
         mockAppGlobalService.generateConfigInteractEvent = jest.fn();
@@ -606,6 +646,7 @@ describe('ResourcesComponent', () => {
         resourcesComponent.ngOnInit();
         // assert
         setTimeout(() => {
+            expect(mockSharedPreference.getBoolean).toHaveBeenCalledWith(PreferenceKey.COACH_MARK_SEEN);
             expect(mockEvents.subscribe).toHaveBeenCalled();
             expect(mockQRScanner.startScanner).toHaveBeenCalledWith(PageId.LIBRARY);
             expect(mockAppGlobalService.getPageIdForTelemetry).toHaveBeenCalled();
@@ -631,13 +672,14 @@ describe('ResourcesComponent', () => {
 
     it('should check for subscription and unsubscribe all those events when ionViewWillLeave()', (done) => {
         // arrange
+        resourcesComponent.refresher = { disabled: false };
         mockHeaderService.showHeaderWithHomeButton = jest.fn();
         jest.spyOn(resourcesComponent, 'getCategoryData').mockImplementation();
         jest.spyOn(resourcesComponent, 'getCurrentUser').mockImplementation();
         jest.spyOn(resourcesComponent, 'getChannelId').mockImplementation();
         jest.spyOn(resourcesComponent, 'getPopularContent').mockImplementation();
-        const mockHeaderEventsSubscription = {unsubscribe: jest.fn()} as Partial<Subscription>;
-        const mockEventsBusSubscription = {unsubscribe: jest.fn()} as Partial<Subscription>;
+        const mockHeaderEventsSubscription = { unsubscribe: jest.fn() } as Partial<Subscription>;
+        const mockEventsBusSubscription = { unsubscribe: jest.fn() } as Partial<Subscription>;
         mockEventBusService.events = () => ({
             subscribe: jest.fn(() => mockEventsBusSubscription)
         });
@@ -645,7 +687,9 @@ describe('ResourcesComponent', () => {
             subscribe: jest.fn(() => mockHeaderEventsSubscription)
         };
         mockEvents.unsubscribe = jest.fn();
-        resourcesComponent.coachTimeout = {clearTimeout: jest.fn()};
+        resourcesComponent.coachTimeout = { clearTimeout: jest.fn() };
+        mockSharedPreference.getBoolean = jest.fn(() => of(false));
+        mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
         // act
         resourcesComponent.ionViewWillEnter().then(() => {
             resourcesComponent.ionViewWillLeave();
@@ -654,6 +698,11 @@ describe('ResourcesComponent', () => {
             expect(mockEventsBusSubscription.unsubscribe).toHaveBeenCalled();
             expect(mockHeaderEventsSubscription.unsubscribe).toHaveBeenCalled();
             expect(mockEvents.unsubscribe).toHaveBeenCalled();
+            expect(mockSharedPreference.getBoolean).toHaveBeenCalledWith(PreferenceKey.COACH_MARK_SEEN);
+            expect(mockTelemetryGeneratorService.generatePageLoadedTelemetry).toHaveBeenCalledWith(
+                PageId.LIBRARY,
+                Environment.ONBOARDING
+            );
             done();
         });
     });
@@ -674,14 +723,12 @@ describe('ResourcesComponent', () => {
             };
             resourcesComponent.guestUser = true;
             const profileType = jest.spyOn(mockAppGlobalService, 'getGuestUserType').mockReturnValue(ProfileType.TEACHER);
-            jest.spyOn(resourcesComponent, 'loadRecentlyViewedContent').mockImplementation();
             jest.spyOn(resourcesComponent, 'getLocalContent').mockImplementation();
             jest.spyOn(mockAppGlobalService, 'getCurrentUser').mockReturnValue(mockGuestProfile);
             // act
             resourcesComponent.getCurrentUser();
             // assert
             expect(resourcesComponent.getLocalContent).toHaveBeenCalled();
-            expect(resourcesComponent.loadRecentlyViewedContent).toHaveBeenCalled();
             expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalledWith();
         });
 
@@ -700,21 +747,18 @@ describe('ResourcesComponent', () => {
             };
             resourcesComponent.guestUser = true;
             const profileType = jest.spyOn(mockAppGlobalService, 'getGuestUserType').mockReturnValue(ProfileType.STUDENT);
-            jest.spyOn(resourcesComponent, 'loadRecentlyViewedContent').mockImplementation();
             jest.spyOn(resourcesComponent, 'getLocalContent').mockImplementation();
             jest.spyOn(mockAppGlobalService, 'getCurrentUser').mockReturnValue(mockGuestProfile);
             // act
             resourcesComponent.getCurrentUser();
             // assert
             expect(resourcesComponent.getLocalContent).toHaveBeenCalled();
-            expect(resourcesComponent.loadRecentlyViewedContent).toHaveBeenCalled();
             expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalledWith();
         });
 
         it('should assign audiance filter as loggedIn if current user is loggedIn', () => {
             // arrange
             mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
-            jest.spyOn(resourcesComponent, 'loadRecentlyViewedContent').mockImplementation();
             jest.spyOn(resourcesComponent, 'getLocalContent').mockImplementation();
             jest.spyOn(mockAppGlobalService, 'getCurrentUser').mockImplementation();
             // act
@@ -722,125 +766,10 @@ describe('ResourcesComponent', () => {
             // assert
             expect(resourcesComponent.audienceFilter).toEqual(['instructor', 'learner']);
             expect(resourcesComponent.getLocalContent).toHaveBeenCalled();
-            expect(resourcesComponent.loadRecentlyViewedContent).toHaveBeenCalled();
             expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalledWith();
         });
     });
 
-    describe('NavigateToViewMoreActivity from various pages', () => {
-        it('should navigate to viewMoreActivity when user clicked from savedResources', () => {
-            // arrange
-            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
-            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
-            // act
-            resourcesComponent.navigateToViewMoreContentsPage(resourcesComponent.savedResourcesSection);
-            // assert
-            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
-            expect(mockRouter.navigate).toHaveBeenCalled();
-        });
-        it('should navigate to ViewMoreAcitvity when user clicked on from recentlyViewed', () => {
-            // arrange
-            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
-            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
-            // act
-            resourcesComponent.navigateToViewMoreContentsPage(resourcesComponent.recentViewedSection);
-            // assert
-            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
-            expect(mockRouter.navigate).toHaveBeenCalled();
-        });
-    });
-
-    describe('loadRecentlyViewed test suites', () => {
-        it('should call getContents from contentService, then loop eachData and setContentData appIcon', (done) => {
-            // arrange
-            mockContentService.getContents = jest.fn(() => {
-                return of([{
-                    identifier: 'sampleIdentifier',
-                    contentData: {
-                        identifier: 'sample_identifier',
-                        appIcon: 'https:'
-                    },
-                    basePath: 'sample_base_path'
-                }]);
-            });
-            resourcesComponent.showLoader = true;
-            mockNgZone.run = jest.fn((fn) => fn());
-            mockCommonUtilService.networkInfo.isNetworkAvailable = true;
-            constructComponent();
-            // act
-            resourcesComponent.loadRecentlyViewedContent(false);
-            // assert
-            setTimeout(() => {
-                expect(mockContentService.getContents).toHaveBeenCalled();
-                done();
-            }, 0);
-        });
-
-        it('should catch throw error and call sheenEnd telemetry function', (done) => {
-            // arrange
-            mockContentService.getContents = jest.fn(() => {
-                return of(Promise.reject('new Error'));
-            });
-            mockNgZone.run = jest.fn((fn) => fn());
-            resourcesComponent.showLoader = true;
-            // act
-            resourcesComponent.loadRecentlyViewedContent(false);
-            // assert
-            setTimeout(() => {
-                expect(mockContentService.getContents).toHaveBeenCalled();
-                done();
-            }, 0);
-        });
-
-        it('should set contentData appIcon to default image when network is not available', (done) => {
-            // arrange
-            mockCommonUtilService.networkInfo.isNetworkAvailable = false;
-            mockContentService.getContents = jest.fn(() => {
-                return of([{
-                    identifier: 'sampleIdentifier',
-                    contentData: {
-                        identifier: 'sample_identifier',
-                        appIcon: 'https:'
-                    },
-                    basePath: 'sample_base_path'
-                }]);
-            });
-            mockNgZone.run = jest.fn((fn) => fn());
-            // act
-            resourcesComponent.loadRecentlyViewedContent(false);
-            // assert
-            setTimeout(() => {
-                expect(mockContentService.getContents).toHaveBeenCalled();
-                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBe(false);
-                done();
-            }, 0);
-        });
-
-        it('should set for basePath if contentData.appIcon is not available', (done) => {
-            // arrange
-            mockCommonUtilService.networkInfo.isNetworkAvailable = true;
-            mockContentService.getContents = jest.fn(() => {
-                return of([{
-                    identifier: 'sampleIdentifier',
-                    contentData: {
-                        identifier: 'sample_identifier',
-                        appIcon: 'other'
-                    },
-                    basePath: 'sample_base_path'
-                }]);
-            });
-            mockNgZone.run = jest.fn((fn) => fn());
-            // act
-            resourcesComponent.loadRecentlyViewedContent(false);
-            // assert
-            setTimeout(() => {
-                expect(mockContentService.getContents).toHaveBeenCalled();
-                expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBe(true);
-                done();
-            }, 0);
-        });
-    });
-
     it('should check for Textbook which is locally Available', () => {
         // arrange
         resourcesComponent.locallyDownloadResources = [
@@ -893,6 +822,7 @@ describe('ResourcesComponent', () => {
 
     it('should subscribe events and other methods when ionViewWillEnter()', (done) => {
         // arrange
+        resourcesComponent.refresher = { disabled: false };
         resourcesComponent.pageLoadedSuccess = false;
         mockHeaderService.showHeaderWithHomeButton = jest.fn();
         mockHeaderService.headerEventEmitted$ = NEVER;
@@ -906,39 +836,20 @@ describe('ResourcesComponent', () => {
         jest.spyOn(resourcesComponent, 'getCurrentUser').mockImplementation();
         jest.spyOn(resourcesComponent, 'getChannelId').mockImplementation();
         jest.spyOn(resourcesComponent, 'subscribeSdkEvent').mockImplementation();
+        mockSharedPreference.getBoolean = jest.fn(() => of(true));
         // act
         resourcesComponent.ionViewWillEnter().then(() => {
             // assert
             expect(mockHeaderService.showHeaderWithHomeButton).toHaveBeenCalled();
             expect(mockSplashScreenDeeplinkActionHandlerDelegate.isDelegateReady).toEqual(true);
+            expect(mockSharedPreference.getBoolean).toHaveBeenCalled();
             done();
         });
     });
 
-    it('should call toastController when in offline', (done) => {
-        // arrange
-        mockToastCtrlService.create = jest.fn(() => {
-            return Promise.resolve({
-                present: jest.fn(),
-                onDidDismiss: jest.fn((fn) => {
-                    fn();
-                })
-            });
-        });
-        mockCommonUtilService.translateMessage = jest.fn();
-        // act
-        resourcesComponent.presentToastForOffline('offline');
-        // assert
-        setTimeout(() => {
-            expect(mockToastCtrlService.create).toHaveBeenCalled();
-            expect(mockCommonUtilService.translateMessage).toHaveBeenCalled();
-            done();
-        }, 0);
-    });
-
     it('should be invoked classClickEvent', () => {
         // arrange
-        const event = {data: {index: 0}};
+        const event = { data: { index: 0 } };
         jest.spyOn(resourcesComponent, 'classClickHandler').mockImplementation(() => {
             return;
         });
@@ -949,7 +860,7 @@ describe('ResourcesComponent', () => {
     it('should handle else part when index does not match and classClicked is false ', () => {
         // arrange
         resourcesComponent.currentGrade = undefined;
-        resourcesComponent.categoryGradeLevels = [{selected: ' '}];
+        resourcesComponent.categoryGradeLevels = [{ selected: ' ' }];
         resourcesComponent.categoryGradeLevelsArray[0] = 'sample';
         // act
         resourcesComponent.classClickHandler(undefined, false);
@@ -957,31 +868,31 @@ describe('ResourcesComponent', () => {
         expect(resourcesComponent.currentGrade).toBe(undefined);
     });
 
-    it('should be handle medium click filter', () => {
-        // arrange
-        jest.spyOn(resourcesComponent, 'generateClassInteractTelemetry').mockImplementation(() => {
-            return;
-        });
-        const scrollIntoView = {
-            scrollIntoView: jest.fn()
-        } as any;
-        // Object.defineProperty(global.document, 'getElementById', {  scrollIntoView: jest.fn() } as any);
-        jest.spyOn(document, 'getElementById').mockReturnValue(scrollIntoView);
-        resourcesComponent.getGroupByPageReq = {grade: [{name: 'sample'}]};
-        resourcesComponent.currentGrade = 'class-v';
-        resourcesComponent.categoryGradeLevelsArray[0] = 'sample';
-        resourcesComponent.categoryGradeLevels = [{selected: 'classAnimate'}];
-        // act
-        resourcesComponent.classClickHandler(0, true);
-        // assert
-        expect(resourcesComponent.currentGrade).toBe('sample');
-        expect(resourcesComponent.categoryGradeLevelsArray[0]).toBe('sample');
-    });
+    // it('should be handle medium click filter', () => {
+    //     // arrange
+    //     jest.spyOn(resourcesComponent, 'generateClassInteractTelemetry').mockImplementation(() => {
+    //         return;
+    //     });
+    //     const scrollIntoView = {
+    //         scrollIntoView: jest.fn()
+    //     } as any;
+    //     // Object.defineProperty(global.document, 'getElementById', {  scrollIntoView: jest.fn() } as any);
+    //     jest.spyOn(document, 'getElementById').mockReturnValue(scrollIntoView);
+    //     resourcesComponent.getGroupByPageReq = { grade: [{ name: 'sample' }] };
+    //     resourcesComponent.currentGrade = 'class-v';
+    //     resourcesComponent.categoryGradeLevelsArray[0] = 'sample';
+    //     resourcesComponent.categoryGradeLevels = [{ selected: 'classAnimate' }];
+    //     // act
+    //     resourcesComponent.classClickHandler(0, true);
+    //     // assert
+    //     expect(resourcesComponent.currentGrade).toBe('sample');
+    //     expect(resourcesComponent.categoryGradeLevelsArray[0]).toBe('sample');
+    // });
 
     describe('mediuClickedEvent', () => {
         it('should be invoked mediumClickEvent', () => {
             // arrange
-            const event = {data: {index: 0, text: 'sample-text'}};
+            const event = { data: { index: 0, text: 'sample-text' } };
             jest.spyOn(resourcesComponent, 'mediumClickHandler').mockImplementation(() => {
                 return;
             });
@@ -989,52 +900,92 @@ describe('ResourcesComponent', () => {
             resourcesComponent.mediumClickEvent(event, true);
         });
 
-        it('should be handle medium click filter', () => {
+        // it('should be handle medium click filter', (done) => {
+        //     // arrange
+        //     jest.spyOn(resourcesComponent, 'generateClassInteractTelemetry').mockImplementation(() => {
+        //         return;
+        //     });
+        //     const scrollIntoView = {
+        //         scrollIntoView: jest.fn()
+        //     } as any;
+        //     // Object.defineProperty(global.document, 'getElementById', {  scrollIntoView: jest.fn() } as any);
+        //     jest.spyOn(document, 'getElementById').mockReturnValue(scrollIntoView);
+        //     resourcesComponent.getGroupByPageReq = { medium: [{ name: 'sample' }] };
+        //     resourcesComponent.currentMedium = 'hindi';
+        //     resourcesComponent.categoryGradeLevelsArray[0] = 'sample';
+        //     resourcesComponent.categoryMediumNamesArray = ['sample-text'];
+        //     resourcesComponent['profile'] = { profileType: 'Student'};
+        //     // act
+        //     // assert
+        //     setTimeout(() => {
+        //         expect(resourcesComponent.currentGrade).toBe('sample');
+        //         expect(resourcesComponent.categoryGradeLevelsArray[0]).toBe('sample');
+        //         done();
+        //     }, 1000);
+        // });
+    });
+
+    describe('getGradeLevelData', () => {
+        it('should fetch all the grade level data based on framework data from the api and call classclickHandler if found', () => {
             // arrange
-            jest.spyOn(resourcesComponent, 'generateClassInteractTelemetry').mockImplementation(() => {
+            const frameworkId = 'frame-id';
+            const categories = {};
+
+            const req: GetFrameworkCategoryTermsRequest = {
+                currentCategoryCode: 'gradeLevel',
+                language: undefined,
+                requiredCategories: {},
+                frameworkId
+            };
+            mockFrameworkUtilService.getFrameworkCategoryTerms = jest.fn(() => of([{ name: 'sunbird' }]));
+            jest.spyOn(resourcesComponent, 'classClickHandler').mockImplementation(() => {
                 return;
             });
-            const scrollIntoView = {
-                scrollIntoView: jest.fn()
-            } as any;
-            // Object.defineProperty(global.document, 'getElementById', {  scrollIntoView: jest.fn() } as any);
-            jest.spyOn(document, 'getElementById').mockReturnValue(scrollIntoView);
-            resourcesComponent.getGroupByPageReq = {medium: [{name: 'sample'}]};
-            resourcesComponent.currentMedium = 'hindi';
-            resourcesComponent.categoryGradeLevelsArray[0] = 'sample';
-            resourcesComponent.categoryMediumNamesArray = ['sample-text'];
+            resourcesComponent.searchGroupingContents = {
+                combination: {
+                    gradeLevel: 'class 1'
+                }
+            };
+            resourcesComponent.categoryGradeLevelsArray = ['class 1', 'class 2'];
             // act
-            resourcesComponent.mediumClickHandler(0, 'sample-text', true);
-            // assert
-            expect(resourcesComponent.currentGrade).toBe('sample');
-            expect(resourcesComponent.categoryGradeLevelsArray[0]).toBe('sample');
-        });
-    });
+            resourcesComponent.getGradeLevelData(frameworkId, categories);
 
-    it('should fetch all the grade level data based on framework data from the api and call classclickHandler if found', () => {
-        // arrange
-        const frameworkId = 'frame-id';
-        const categories = {};
+            // assert
+            expect(mockFrameworkUtilService.getFrameworkCategoryTerms).toHaveBeenLastCalledWith(req);
 
-        const req: GetFrameworkCategoryTermsRequest = {
-            currentCategoryCode: 'gradeLevel',
-            language: undefined,
-            requiredCategories: {},
-            frameworkId
-        };
-        mockFrameworkUtilService.getFrameworkCategoryTerms = jest.fn(() => of([{name: 'sunbird'}]));
-        jest.spyOn(resourcesComponent, 'classClickHandler').mockImplementation(() => {
-            return;
         });
-        resourcesComponent.getGroupByPageReq = {
-            grade: ['sunbird']
-        };
-        // act
-        resourcesComponent.getGradeLevelData(frameworkId, categories);
 
-        // assert
-        expect(mockFrameworkUtilService.getFrameworkCategoryTerms).toHaveBeenLastCalledWith(req);
+        it('should fetch all the grade level data based on framework data from the api and call classclickHandler if not found', () => {
+            // arrange
+            const frameworkId = 'frame-id';
+            const categories = {};
+
+            const req: GetFrameworkCategoryTermsRequest = {
+                currentCategoryCode: 'gradeLevel',
+                language: undefined,
+                requiredCategories: {},
+                frameworkId
+            };
+            mockFrameworkUtilService.getFrameworkCategoryTerms = jest.fn(() => of([{ name: 'sunbird' }]));
+            jest.spyOn(resourcesComponent, 'classClickHandler').mockImplementation(() => {
+                return;
+            });
+            resourcesComponent.searchGroupingContents = {
+                combination: {
+                    gradeLevel: undefined
+                }
+            };
+            resourcesComponent.getGroupByPageReq = {
+                grade: ['class 1']
+            };
+            resourcesComponent.categoryGradeLevelsArray = ['class 1', 'class 2'];
+            // act
+            resourcesComponent.getGradeLevelData(frameworkId, categories);
+
+            // assert
+            expect(mockFrameworkUtilService.getFrameworkCategoryTerms).toHaveBeenLastCalledWith(req);
 
+        });
     });
 
     it('should fetch all the grade level data based on framework data from the api and do not call classclickHandler if not found', () => {
@@ -1048,7 +999,7 @@ describe('ResourcesComponent', () => {
             requiredCategories: {},
             frameworkId
         };
-        mockFrameworkUtilService.getFrameworkCategoryTerms = jest.fn(() => of([{name: 'sunbird1'}]));
+        mockFrameworkUtilService.getFrameworkCategoryTerms = jest.fn(() => of([{ name: 'sunbird1' }]));
         jest.spyOn(resourcesComponent, 'classClickHandler').mockImplementation(() => {
             return;
         });
@@ -1063,84 +1014,6 @@ describe('ResourcesComponent', () => {
 
     });
 
-    it('should call recentlyViewedCardClick method and perform navigation to collection details page if mimetype is collection', () => {
-        // arrange
-        const event = {
-            data: {
-                identifier: 'do_123456789',
-                mimeType: 'application/vnd.ekstep.content-collection',
-                contentType: 'sample-content-type'
-            }
-        };
-        const course = {
-            isAvailableLocally: true,
-            mimeType: 'application/vnd.ekstep.content-collection'
-        };
-
-        const telemetryObject: Partial<TelemetryObject> = {
-            id: 'do_123456789',
-            type: 'sample-content-type',
-            version: ''
-        };
-        const values = {
-            sectionName: 'Recently Viewed',
-            positionClicked: undefined
-        };
-        mockTelemetryGeneratorService.isCollection = jest.fn(() => true);
-        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
-        // act
-        resourcesComponent.recentlyViewedCardClick(event, course);
-        // assert
-        expect(mockTelemetryGeneratorService.isCollection).toHaveBeenCalled();
-        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-            'TOUCH',
-            'content-clicked',
-            'home',
-            'library',
-            telemetryObject,
-            values
-        );
-    });
-
-    it('should call recentlyViewedCardClick method and perform navigation to content details page if mimetype is non collection', () => {
-        // arrange
-        const event = {
-            data: {
-                identifier: 'do_123456789',
-                mimeType: 'application/vnd.ekstep.content-collection',
-                contentType: 'sample-content-type'
-            }
-        };
-        const course = {
-            isAvailableLocally: true,
-            mimeType: 'vide0/mp4'
-        };
-
-        const telemetryObject: Partial<TelemetryObject> = {
-            id: 'do_123456789',
-            type: 'sample-content-type',
-            version: ''
-        };
-        const values = {
-            sectionName: 'Recently Viewed',
-            positionClicked: undefined
-        };
-        mockTelemetryGeneratorService.isCollection = jest.fn(() => true);
-        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
-        // act
-        resourcesComponent.recentlyViewedCardClick(event, course);
-        // assert
-        expect(mockTelemetryGeneratorService.isCollection).toHaveBeenCalled();
-        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-            'TOUCH',
-            'content-clicked',
-            'home',
-            'library',
-            telemetryObject,
-            values
-        );
-    });
-
     it('should check for subscription and unsubscribe all those events on ngOnDestroy()', () => {
         // arrange
         resourcesComponent.networkSubscription = true;
@@ -1158,11 +1031,10 @@ describe('ResourcesComponent', () => {
     it('should subscribe events and check for payload', (done) => {
         // arrange
         mockEventBusService.events = jest.fn(() => of({
-            payload: {currentCount: 1, totalCount: 10},
+            payload: { currentCount: 1, totalCount: 10 },
             type: ContentEventType.IMPORT_COMPLETED,
 
         }));
-        jest.spyOn(resourcesComponent, 'loadRecentlyViewedContent').mockImplementation();
         jest.spyOn(resourcesComponent, 'getLocalContent').mockImplementation();
         // act
         resourcesComponent.subscribeSdkEvent();
@@ -1176,8 +1048,7 @@ describe('ResourcesComponent', () => {
     describe('swipeDownToRefresh', () => {
         it('calls getCurrentUser and getCategoryData when called upon', (done) => {
             // arrange
-            const refresher = {target: {complete: jest.fn()}};
-            jest.spyOn(resourcesComponent, 'getCategoryData').mockImplementation();
+            const refresher = { target: { complete: jest.fn() } };
             jest.spyOn(resourcesComponent, 'getCurrentUser').mockImplementation();
             mockTelemetryGeneratorService.generatePullToRefreshTelemetry = jest.fn();
             jest.spyOn(resourcesComponent, 'getGroupByPage').mockImplementation();
@@ -1185,7 +1056,6 @@ describe('ResourcesComponent', () => {
             resourcesComponent.swipeDownToRefresh(refresher);
             // assert
             setTimeout(() => {
-                expect(resourcesComponent.getCategoryData).toHaveBeenCalled();
                 expect(resourcesComponent.getCurrentUser).toHaveBeenCalled();
                 expect(mockTelemetryGeneratorService.generatePullToRefreshTelemetry).toHaveBeenCalledWith(
                     PageId.LIBRARY, Environment.HOME
@@ -1204,7 +1074,7 @@ describe('ResourcesComponent', () => {
             resourcesComponent.swipeDownToRefresh(refresher);
             // assert
             setTimeout(() => {
-                expect(resourcesComponent.getPopularContent).toHaveBeenCalledWith(false, null, undefined);
+                expect(resourcesComponent.getPopularContent).toHaveBeenCalledWith(false, null);
                 done();
             }, 0);
         });
@@ -1300,52 +1170,50 @@ describe('ResourcesComponent', () => {
             Environment.HOME,
             PageId.LIBRARY,
             undefined,
-            {currentSelected: 'class 6', previousSelected: 'class 5'}
+            { currentSelected: 'class 6', previousSelected: 'class 5' }
         );
     });
 
     it('should generate interact telemetry when content clicked and check if network available which is' +
         ' set true then navigate to collection etb', () => {
-        // arrange
-        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
-        mockCommonUtilService.networkInfo.isNetworkAvailable = true;
-        mockRouter.navigate = jest.fn();
-        // act
-        resourcesComponent.navigateToDetailPage({
-            data: {subject: 'mathematics part 1', isAvailableLocally: true},
-            index: 0
-        }, 'mathematics');
-        // assert
-        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-            InteractType.TOUCH,
-            InteractSubtype.CONTENT_CLICKED,
-            Environment.HOME, PageId.LIBRARY, {id: undefined, type: undefined, version: undefined},
-            {positionClicked: 0, sectionName: 'mathematics part 1'}, {l1: undefined}, [{id: 'mathematics', type: 'Subject'}]);
-        expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBe(true);
-        expect(mockRouter.navigate).toHaveBeenCalled();
-    });
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.networkInfo.isNetworkAvailable = true;
+            mockRouter.navigate = jest.fn();
+            // act
+            resourcesComponent.navigateToDetailPage({
+                data: { subject: 'mathematics part 1', isAvailableLocally: true },
+                index: 0
+            }, 'mathematics');
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.CONTENT_CLICKED,
+                Environment.HOME, PageId.LIBRARY, { id: undefined, type: undefined, version: '' },
+                { positionClicked: 0, sectionName: 'mathematics' }, { l1: undefined }, [{ id: 'mathematics', type: 'Section' }]);
+            expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBe(true);
+            expect(mockNavService.navigateToDetailPage).toHaveBeenCalled();
+        });
 
     it('should cover else part after interact event called and check network availability' +
         ' which is set to false and call offline toast method', () => {
-        // arrange
-        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
-        mockCommonUtilService.networkInfo.isNetworkAvailable = false;
-        mockRouter.navigate = jest.fn();
-        jest.spyOn(resourcesComponent, 'presentToastForOffline').mockImplementation();
-        // act
-        resourcesComponent.navigateToDetailPage({
-            data: {subject: 'mathematics part 1', isAvailableLocally: false},
-            index: 0
-        }, 'mathematics');
-        // assert
-        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-            InteractType.TOUCH,
-            InteractSubtype.CONTENT_CLICKED,
-            Environment.HOME, PageId.LIBRARY, {id: undefined, type: undefined, version: undefined},
-            {positionClicked: 0, sectionName: 'mathematics part 1'}, {l1: undefined}, [{id: 'mathematics', type: 'Subject'}]);
-        expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBe(false);
-        expect(resourcesComponent.presentToastForOffline).toHaveBeenCalledWith('OFFLINE_WARNING_ETBUI_1');
-    });
+            // arrange
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockCommonUtilService.networkInfo.isNetworkAvailable = false;
+            mockRouter.navigate = jest.fn();
+            // act
+            resourcesComponent.navigateToDetailPage({
+                data: { subject: 'mathematics part 1', isAvailableLocally: false },
+                index: 0
+            }, 'mathematics');
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                InteractType.TOUCH,
+                InteractSubtype.CONTENT_CLICKED,
+                Environment.HOME, PageId.LIBRARY, { id: undefined, type: undefined, version: '' },
+                { positionClicked: 0, sectionName: 'mathematics' }, { l1: undefined }, [{ id: 'mathematics', type: 'Section' }]);
+            expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBe(false);
+        });
 
     it('should generate interact telemetry when textbook is clicked and also check for network available which is set to true ', () => {
         // arrange
@@ -1363,7 +1231,7 @@ describe('ResourcesComponent', () => {
             InteractSubtype.VIEW_MORE_CLICKED,
             Environment.HOME,
             PageId.LIBRARY,
-            {id: 'sample_doId', type: 'textbook', version: undefined});
+            { id: 'do_id1234', type: 'textbook', version: '' });
         expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBe(true);
         expect(mockRouter.navigate).toHaveBeenCalled();
     });
@@ -1373,9 +1241,8 @@ describe('ResourcesComponent', () => {
         mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
         mockCommonUtilService.networkInfo.isNetworkAvailable = false;
         mockRouter.navigate = jest.fn();
-        jest.spyOn(resourcesComponent, 'presentToastForOffline').mockImplementation();
         // act
-        resourcesComponent.navigateToTextbookPage({identifier: 'do_id1234', contentType: 'textbook'},
+        resourcesComponent.navigateToTextbookPage({ identifier: 'do_id1234', contentType: 'textbook' },
             'mathematics');
         // assert
         expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
@@ -1383,9 +1250,8 @@ describe('ResourcesComponent', () => {
             InteractSubtype.VIEW_MORE_CLICKED,
             Environment.HOME,
             PageId.LIBRARY,
-            {id: 'do_id1234', type: 'textbook', version: undefined});
+            { id: 'do_id1234', type: 'textbook', version: '' });
         expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBe(false);
-        expect(resourcesComponent.presentToastForOffline).toHaveBeenCalledWith('OFFLINE_WARNING_ETBUI_1');
     });
 
     it('should navigate to content player when launch contentPlayer called upon', () => {
@@ -1432,7 +1298,7 @@ describe('ResourcesComponent', () => {
             // arrange
             jest.spyOn(resourcesComponent, 'search').mockImplementation();
             // act
-            resourcesComponent.handleHeaderEvents({name: 'search'});
+            resourcesComponent.handleHeaderEvents({ name: 'search' });
             // assert
             expect(resourcesComponent.search).toHaveBeenCalled();
         });
@@ -1441,23 +1307,32 @@ describe('ResourcesComponent', () => {
             // arrange
             jest.spyOn(resourcesComponent, 'redirectToActivedownloads').mockImplementation();
             // act
-            resourcesComponent.handleHeaderEvents({name: 'download'});
+            resourcesComponent.handleHeaderEvents({ name: 'download' });
             // assert
             expect(resourcesComponent.redirectToActivedownloads).toHaveBeenCalled();
         });
 
-        it('should call notification method when event name is equal notification', () => {
+        // it('should call notification method when event name is equal notification', () => {
+        //     // arrange
+        //     jest.spyOn(resourcesComponent, 'redirectToNotifications').mockImplementation();
+        //     // act
+        //     resourcesComponent.handleHeaderEvents({ name: 'notification' });
+        //     // assert
+        //     expect(resourcesComponent.redirectToNotifications).toHaveBeenCalled();
+        // });
+
+        it('should call information method when event name is equal information', () => {
             // arrange
-            jest.spyOn(resourcesComponent, 'redirectToNotifications').mockImplementation();
+            jest.spyOn(resourcesComponent, 'appTutorialScreen').mockImplementation();
             // act
-            resourcesComponent.handleHeaderEvents({name: 'notification'});
+            resourcesComponent.handleHeaderEvents({ name: 'information' });
             // assert
-            expect(resourcesComponent.redirectToNotifications).toHaveBeenCalled();
+          //  expect(resourcesComponent.appTutorialScreen).toHaveBeenCalled();
         });
 
         it('should go default section if event is not matched at all', () => {
             jest.spyOn(console, 'warn').mockImplementation();
-            resourcesComponent.handleHeaderEvents({name: 'any_event'});
+            resourcesComponent.handleHeaderEvents({ name: 'any_event' });
 
             expect(console.warn).toHaveBeenCalledWith('Use Proper Event name');
         });
@@ -1467,7 +1342,7 @@ describe('ResourcesComponent', () => {
         // arrange
         mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
         // act
-        resourcesComponent.logScrollEnd({target: {scrollHeight: 10, scrollTop: 20, offsetHeight: 10}});
+        resourcesComponent.logScrollEnd({ target: { scrollHeight: 10, scrollTop: 20, offsetHeight: 10 } });
         // assert
         expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
             InteractType.SCROLL,
@@ -1485,35 +1360,176 @@ describe('ResourcesComponent', () => {
         expect(mockTelemetryGeneratorService.generateInteractTelemetry).not.toHaveBeenCalled();
     });
 
-    it('should generate interact event if event and horizontal scroll event', () => {
+    it('should fetch localContent when called upon', () => {
         // arrange
-        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        mockContentService.getContents = jest.fn((data) => of(data));
+        mockNgZone.run = jest.fn((fn) => fn());
         // act
-        resourcesComponent.onScroll({target: {scrollWidth: 10, scrollLeft: 20, offsetWidth: 10}});
+        resourcesComponent.getLocalContent();
         // assert
-        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
-            InteractType.SCROLL,
-            InteractSubtype.RECENTLY_VIEWED_END_REACHED,
-            Environment.HOME,
-            PageId.LIBRARY);
+        expect(mockContentService.getContents).toHaveBeenCalled();
     });
 
-    it('should cover else part if event is undefined and event target is undefined', () => {
-        // arrange
-        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
-        // act
-        resourcesComponent.onScroll(undefined);
-        // assert
-        expect(mockTelemetryGeneratorService.generateInteractTelemetry).not.toHaveBeenCalled();
+    describe('arrangeMediumsByUserData', () => {
+        it('should return slected medium if data is present', () => {
+            // arrange
+            const categoryMediumsParam = ['english', 'hindi'];
+            mockAppGlobalService.getCurrentUser = jest.fn(() => ({
+                name: 'sample-name',
+                board: ['cbsc'],
+                medium: ['english', 'hindi'],
+                grade: ['class 1', 'class 2']
+            }));
+            resourcesComponent.categoryMediumNamesArray = ['english', 'hindi'];
+            resourcesComponent.searchGroupingContents = {
+                combination: { medium: 'english' }
+            };
+            jest.spyOn(resourcesComponent, 'mediumClickHandler').mockImplementation(() => {
+                return 0;
+            });
+            // act
+            resourcesComponent.arrangeMediumsByUserData(categoryMediumsParam);
+            // assert
+            expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalled();
+        });
+
+        it('should return slected medium if data is not present', () => {
+            // arrange
+            const categoryMediumsParam = ['english', 'hindi'];
+            mockAppGlobalService.getCurrentUser = jest.fn(() => ({
+                name: 'sample-name',
+                board: ['cbsc'],
+                medium: ['english', 'hindi'],
+                grade: ['class 1', 'class 2']
+            }));
+            resourcesComponent.categoryMediumNamesArray = ['english', 'hindi'];
+            resourcesComponent.searchGroupingContents = {
+                combination: {}
+            };
+            resourcesComponent.getGroupByPageReq = {
+                medium: ['english']
+            };
+            jest.spyOn(resourcesComponent, 'mediumClickHandler').mockImplementation(() => {
+                return 0;
+            });
+            // act
+            resourcesComponent.arrangeMediumsByUserData(categoryMediumsParam);
+            // assert
+            expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalled();
+        });
     });
 
-    it('should fetch localContent when called upon', () => {
-        // arrange
-        mockContentService.getContents = jest.fn((data) => of(data));
-        mockNgZone.run = jest.fn((fn) => fn());
+    // it('should call setTimeout for ionViewDidEnter', (done) => {
+    //     // arrange
+    //     resourcesComponent.refresher = { disabled: false };
+    //     mockAppGlobalService.showTutorialScreen = jest.fn();
+    //     // act
+    //     resourcesComponent.ionViewDidEnter();
+    //     // assert
+    //     setTimeout(() => {
+    //         expect(mockAppGlobalService.showTutorialScreen).toHaveBeenCalled();
+    //         done();
+    //     }, 2000);
+    // });
+
+    it('should navigate To ViewMoreContentsPage for horizontal section', () => {
+        const request = {
+            searchCriteria: undefined,
+            title: JSON.stringify({en: 'TV Programs'}),
+            data: {sections: [{contents: {}}]},
+            dataSrc: {type: 'TRACKABLE_COLLECTIONS'}
+        };
+        mockCommonUtilService.getTranslatedValue = jest.fn(() => 'TV Programs');
+        const params = {
+            state: {
+                enrolledCourses: {},
+                headerTitle: 'TV Programs',
+                pageName: ViewMore.PAGE_COURSE_ENROLLED,
+                userId: 'sample-user'
+            }
+          };
+        mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+        mockAppGlobalService.getUserId = jest.fn(() => 'sample-user');
         // act
-        resourcesComponent.getLocalContent();
+        resourcesComponent.navigateToViewMoreContentsPage(request);
         // assert
-        expect(mockContentService.getContents).toHaveBeenCalled();
+        expect(mockCommonUtilService.getTranslatedValue).toHaveBeenCalledWith(request.title, '');
+        expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.VIEW_MORE_ACTIVITY], params);
+        expect(mockAppGlobalService.getUserId).toHaveBeenCalled();
+    });
+
+    describe('requestMoreContent()', () => {
+        it('should prepare the delegate and navigate to Framework details page', (done) => {
+            // act
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockFormAndFrameworkUtilService.getContentRequestFormConfig = jest.fn();
+            mockCommonUtilService.translateMessage = jest.fn();
+            mockRouter.navigate = jest.fn();
+            // act
+            resourcesComponent.requestMoreContent().then(() => {
+                // assert
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+                expect(mockFormAndFrameworkUtilService.getContentRequestFormConfig).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalled();
+                expect(mockRouter.navigate).toHaveBeenCalled();
+                done();
+            });
+        });
+    });
+
+    describe('onFrameworkSelectionSubmit()', () => {
+        it('should prepare the delegate navigation method for Frameworkdetails page when internet is available', (done) => {
+            // act
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            const formOutput = {
+                board: {
+                    name: 'State (Karnataka)',
+                    code: 'ka_k-12_1'
+                },
+                medium: {
+                    name: 'English',
+                    code: 'english',
+                    frameworkCode: 'ka_k-12_1'
+                },
+                grade: {
+                    name: 'Class 9',
+                    code: 'class9',
+                    frameworkCode: 'ka_k-12_1'
+                },
+                subject: 'other',
+                contenttype: 'digitextbbok',
+                children: {
+                    subject: {
+                        other: 'Cdc'
+                    }
+                }
+            };
+            mockRouter.navigate = jest.fn();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            // act
+            resourcesComponent.onFrameworkSelectionSubmit({}, formOutput, mockRouter, mockCommonUtilService,
+                mockTelemetryGeneratorService, []).then(() => {
+                // assert
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+                expect(mockRouter.navigate).toHaveBeenCalled();
+                done();
+            });
+        });
+
+        it('should show the offline toast when internet is now available', (done) => {
+            // act
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
+            };
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            resourcesComponent.onFrameworkSelectionSubmit({}, {}, mockRouter, mockCommonUtilService).then(() => {
+                // assert
+                expect(mockCommonUtilService.showToast).toHaveBeenCalled();
+                done();
+            });
+        });
     });
 });
diff --git a/src/app/resources/resources-routing.module.ts b/src/app/resources/resources-routing.module.ts
new file mode 100644
index 000000000..b7896a835
--- /dev/null
+++ b/src/app/resources/resources-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { RouterLinks } from '../app.constant';
+import { ResourcesComponent } from './resources.component';
+
+const routes: Routes = [
+    { path: '', component: ResourcesComponent, },
+    { path: RouterLinks.RELEVANT_CONTENTS, loadChildren: './relevant-contents/relevant-contents.module#RelevantContentsPageModule' }
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(routes)
+    ],
+    exports: [RouterModule]
+})
+export class ResourcesRoutingModule { }
diff --git a/src/app/resources/resources.component.html b/src/app/resources/resources.component.html
index 9bad8c0d3..b9be97018 100644
--- a/src/app/resources/resources.component.html
+++ b/src/app/resources/resources.component.html
@@ -1,4 +1,4 @@
-<ion-content hide-header-footer class="main-container avoid-bottom-tabs-space" (ionScrollEnd)="logScrollEnd($event)"
+<ion-content hide-header-footer class="main-container avoid-bottom-tabs-space ui-container" (ionScrollEnd)="logScrollEnd($event)"
   scrollEvents="true" #contentView>
   <div slot="fixed" class="fixed-container">
     <sb-library-filters [list]="categoryMediumNamesArray" [selectedItems]="mediumsSelected"
@@ -9,46 +9,61 @@
     </sb-library-filters>
   </div>
   <div class="scrollable-container">
-    <ion-refresher (ionRefresh)="swipeDownToRefresh($event)"></ion-refresher>
-
-    <ion-list class="m-n" *ngIf="showLoader || refresh" style="padding-top: 100px;">
-      <app-skeleton-item height="16px" width="40%" style="padding: 16px;"></app-skeleton-item>
-      <ion-item *ngFor="let i of [0,1,2,3,4,5,6,7,8]" class="animation-background">
-        <ion-avatar item-start>
-          <app-skeleton-item height="72px" width="72px"></app-skeleton-item>
-        </ion-avatar>
-        <ion-label style="padding-left: 40px;">
-          <app-skeleton-item height="12px" width="67%" style="padding-bottom: 8px;"></app-skeleton-item>
-          <app-skeleton-item height="12px" width="47%" style="padding-bottom: 8px;"></app-skeleton-item>
-        </ion-label>
-      </ion-item>
-    </ion-list>
-
-    <div *ngIf="recentlyViewedResources && recentlyViewedResources.length">
-      <div class="sb-recently-viewed-container" style="padding-bottom:40px;">
-
-        <div class="sb-recently-viewed-items">
-          <div class="sb-recenlty-viewed-title">{{ 'RECENTLY_VIEWED' | translate }}
-            <button class="sb-btn sb-btn-sm sb-btn-outline-info view-all-p8 ion-float-end"
-              (click)="navigateToViewMoreContentsPage(recentViewedSection);">
-              {{ 'VIEW_ALL' | translate }}</button>
+    <ion-refresher #libraryRefresher slot="fixed" (ionRefresh)="swipeDownToRefresh($event)"></ion-refresher>
+    <div *ngIf="!guestUser" style="padding-top: 5px;">
+      <ng-container *ngIf="searchApiLoader && dynamicResponse && dynamicResponse.length === 0">
+        <sb-course-cards-hlist [type]="courseCardType.MY_COURSE_RECENTLY_VIEWED_CARD_GRID" [isLoading]="searchApiLoader">
+        </sb-course-cards-hlist>
+      </ng-container>
+    </div>
+    <div *ngFor="let result of dynamicResponse; let i=index;">
+      <div *ngIf="result?.theme && result?.theme?.orientation === 'horizontal'">
+        <div *ngFor="let section of result?.data?.sections">
+          <div *ngIf="result?.dataSrc?.type === 'TRACKABLE_COLLECTIONS'" style="padding-top: 5px;">
+            <ng-container *ngIf="section.contents && section.contents.length">
+              <sb-course-cards-hlist [title]="result?.name"
+                [type]="courseCardType.MY_COURSE_RECENTLY_VIEWED_CARD_GRID" [contentList]="section.contents"
+                [viewMoreButtonText]="'VIEW_ALL' | translate" (viewMoreClick)="navigateToViewMoreContentsPage(result)"
+                (cardClick)="navigateToDetailPage($event, result?.name)" [hideProgress]="true"></sb-course-cards-hlist>
+            </ng-container>
           </div>
+          <div class="sb-recently-viewed-container" style="padding-bottom:40px;" *ngIf="section.contents?.length && (!result?.dataSrc || result?.dataSrc?.type!== 'TRACKABLE_COLLECTIONS')">
+            <div class="sb-recently-viewed-items">
+              <div class="sb-recenlty-viewed-title">{{result?.name}}
+                <button class="sb-btn sb-btn-sm sb-btn-outline-info view-all-p8 ion-float-end"
+                  (click)="navigateToViewMoreContentsPage(result);">
+                  {{ 'VIEW_ALL' | translate }}</button>
+              </div>
 
-          <div class="sb-card-scroll-container" (scroll)='onScroll($event)'>
-            <!-- Card style -->
-            <div class="sb-card-container sb-card-recently-container">
-              <div class="recently-viewed-card-size" *ngFor="let content of recentlyViewedResources">
-                <sb-library-card
-                  [isOffline]="!content?.isAvailableLocally && !commonUtilService.networkInfo.isNetworkAvailable"
-                  [content]="content?.contentData" [type]="'recently_viewed'"
-                  (cardClick)="recentlyViewedCardClick($event, content);"
-                  [cardImg]="(!(!content.isAvailableLocally && !commonUtilService.networkInfo.isNetworkAvailable)) ? (commonUtilService.convertFileSrc(content?.contentData?.courseLogoUrl) || commonUtilService.convertFileSrc(content?.contentData?.appIcon) || defaultImg) : 'assets/imgs/ic_offline_white_sm.png'">
-                </sb-library-card>
+              <div class="sb-card-scroll-container" (scroll)='onScroll($event)'>
+                <div class="sb-card-container sb-card-recently-container">
+                  <div class="recently-viewed-card-size" *ngFor="let content of section.contents">
+                    <sb-library-card
+                      [isOffline]="!content?.isAvailableLocally && !commonUtilService.networkInfo.isNetworkAvailable"
+                      [content]="content" [type]="'mobile_textbook'" [isLoading]="searchApiLoader"
+                      (cardClick)="navigateToDetailPage($event, result?.name);"
+                      [cardImg]="content?.appIcon || defaultAppIcon">
+                    </sb-library-card>
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
       </div>
+      <div *ngIf="!result?.theme || result?.theme?.orientation === 'vertical'">
+        <div class="section-header-style" *ngIf="result.data.sections.length">{{result.name}}</div>
+        <div *ngFor="let section of result.data.sections">
+          <div class="sb-textbook-container" *ngIf="section?.contents && section?.contents?.length">
+            <sb-library-cards-stack [title]="section?.name" [contentList]="section?.contents"
+              [isOffline]="!commonUtilService.networkInfo.isNetworkAvailable"
+              [viewMoreButtonText]="'VIEW_MORE' | translate" [maxCardCount]="3"
+              (viewMoreClick)="navigateToTextbookPage(section?.contents, section.name)"
+              (cardClick)="navigateToDetailPage($event, section.name)">
+            </sb-library-cards-stack>
+          </div>
+        </div>
+      </div>
     </div>
 
     <ion-list class="m-n" *ngIf="searchApiLoader && storyAndWorksheets && storyAndWorksheets.length === 0">
@@ -63,35 +78,26 @@
         </ion-label>
       </ion-item>
     </ion-list>
-
-    <div *ngFor="let items of storyAndWorksheets">
-      <div class="sb-textbook-container" *ngIf="items?.contents && items?.contents?.length">
-        <sb-library-cards-stack [title]="items?.name" [contentList]="items?.contents"
-          [isOffline]="!commonUtilService.networkInfo.isNetworkAvailable" [viewMoreButtonText]="'VIEW_MORE' | translate"
-          [maxCardCount]="3" (viewMoreClick)="navigateToTextbookPage(items?.contents, items.name)"
-          (cardClick)="navigateToDetailPage($event, items.name)">
-        </sb-library-cards-stack>
-      </div>
-    </div>
     <div class="sb-explore-container" *ngIf="storyAndWorksheets && storyAndWorksheets.length !== 0">
       <div class="text-center" *ngIf="commonUtilService?.networkInfo?.isNetworkAvailable">
-        <p class="information">{{'MORE_CONTENT' | translate:{'%s': appLabel} }}</p>
-        <ion-button class="explore-more-content" fill="outline" (click)="exploreOtherContents()">
-          {{'DATA' | translate}} </ion-button>
+        <p class="information">{{'FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT' | translate }}</p>
+        <ion-button class="explore-more-books" expand="block" (click)="requestMoreContent()">
+          {{'REQUEST_CONTENT' | translate}} </ion-button>
+        <ion-button class="explore-more-content" expand="block" fill="outline" (click)="exploreOtherContents()">
+          {{'SEE_MORE_BOOKS' | translate}} </ion-button>
       </div>
     </div>
     <div *ngIf="!searchApiLoader && storyAndWorksheets && storyAndWorksheets.length === 0">
       <div class="sb-nodownloads-container" *ngIf="commonUtilService?.networkInfo?.isNetworkAvailable">
         <div class="text-center">
-          <img style="width: 19.58%; height: 7.72%;" src="./assets/imgs/group.svg" alt="">
+          <img style="width: 30%;" src="./assets/imgs/group.svg" alt="">
         </div>
         <div class="text-center">
-          <p class="sb-nodownloads-title">
-            <strong>{{'NO_BOOKS_AVAILABLE' | translate}}</strong>
-          </p>
-          <p class="sub-heading">{{'NO_BOOKS_DEFINITION' | translate:{'%s': appLabel} }}</p>
-          <ion-button class="explore-more-books" (click)="exploreOtherContents()">
-            {{'DATA' | translate}} </ion-button>
+          <p class="sub-heading">{{'FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT' | translate }}</p>
+          <ion-button class="explore-more-books" expand="block" (click)="requestMoreContent()">
+            {{'REQUEST_CONTENT' | translate}} </ion-button>
+          <ion-button class="explore-more-content" expand="block" fill="outline" (click)="exploreOtherContents()">
+            {{'SEE_MORE_BOOKS' | translate}} </ion-button>
         </div>
       </div>
     </div>
@@ -111,7 +117,8 @@
       </ion-list>
     </div>
 
-    <div class="ion-padding" text-center class="mt-32 mb-32" *ngIf="!commonUtilService?.networkInfo?.isNetworkAvailable">
+    <div class="ion-padding ion-text-center mt-32 mb-32" style="padding-top: 34px;"
+      *ngIf="!commonUtilService?.networkInfo?.isNetworkAvailable">
       <img src="assets/imgs/outline-cloud_off.svg" alt="" />
       <ion-text>
         <h6 class="offline-header">
diff --git a/src/app/resources/resources.component.scss b/src/app/resources/resources.component.scss
index bebd2dfcb..09328a73e 100644
--- a/src/app/resources/resources.component.scss
+++ b/src/app/resources/resources.component.scss
@@ -1,103 +1,155 @@
 @import "src/assets/styles/variables";
 @import "src/assets/styles/_custom-mixins";
 @import "src/assets/styles/fonts";
+@import "src/assets/styles/_variables.scss";
 
-:host{
-    div.scrollable-container {
-      --background: green !important;
-    }
+:host {
+  div.scrollable-container {
+    --background: $green !important;
   }
+}
+
 // :host {
-  .spinner-align {
-    margin: 40px;
-    padding-top: 30px;
-  }
-  .fixed-container {
-    width: 100%;
-    margin-top: 56px;
-    position: relative;
-    z-index: 2;
-  }
-  .scrollable-container{
-    margin-top:108px;
-    z-index: 1;
-   }
-  .main-container {
-    background: #fff;
-    position: relative;
-  }
-  .offline-header {
-    color: $gray-300;
-    font-size: 16px;
-  }
-  .offline-content {
-    color: $gray-300 !important;
-    width: 65%;
-    margin: auto;
-  }
-  .view-all-p8 {
-    padding: 0 $base-block-space !important;
-  }
-  #couchMark {
-    position: fixed;
-  }
-  .animation-background {
-    padding: 0px 8px 0px 8px;
-    background-color: #f2f2f2;
-  }
-  .sb-view-more {
-    background: #edf4f9;
-    text-align: center;
-    padding: $base-block-space * 2;
-    color: $primary-color;
-    font-weight: bolder;
-  }
-  .explore-more-content {
-    border-radius: 4px;
-    --background: #F3F7FA;
-    --color: #024F90;
-  }
-  .explore-more-books {
-    --background: #024F9D;
-    border-radius: 4px;
-  }
+.spinner-align {
+  margin: 40px;
+  padding-top: 30px;
+}
+
+.fixed-container {
+  width: 100%;
+  margin-top: 56px;
+  position: relative;
+  z-index: 2;
+}
+
+.scrollable-container {
+  margin-top:108px;
+  z-index: 1;
+}
+
+.main-container {
+  background: map-get($colors, white);
+  position: relative;
+}
+
+.offline-header {
+  color: $gray-300;
+  font-size: 16px;
+}
+
+.offline-content {
+  color: $gray-300 !important;
+  width: 65%;
+  margin: auto;
+}
+
+.view-all-p8 {
+  padding: 0 $base-block-space !important;
+}
+
+#couchMark {
+  position: fixed;
+}
+
+.animation-background {
+  padding: 0 8px 0 8px;
+  background-color: map-get($colors, white_f2);
+}
+
+.sb-view-more {
+  background: $light-blue;
+  text-align: center;
+  padding: $base-block-space * 2;
+  color: $primary-color;
+  font-weight: bolder;
+}
+
+.explore-more-content {
+  border-radius: 4px;
+  --background: #{map-get($colors, white_f3)};
+  --color: #{map-get($colors, deep_blue)};
+  padding-left: 16px;
+  padding-right: 16px;
+  margin-top: 12px;
+}
+
+.explore-more-books {
+  --background: #{$blue};
+  border-radius: 4px;
+  padding-left: 16px;
+  padding-right: 16px;
+}
+
 .sub-heading {
   padding: 1em 4em !important;
   font-size: 12px;
-  color: #999999;
+  color: $gray-300;
   margin: 0;
 }
+
 .sb-nodownloads-container {
   & {
-    padding-top: 4rem;
+    padding-top: 7rem;
   }
 }
+
 .sb-nodownloads-title {
   & {
     margin: 0;
     font-size: 16px;
     padding-top: 4%;
-    color: #666666;
+    color: map-get($colors, granite_gray);
     font-weight: bold;
     letter-spacing: -0.46px
   }
 }
-  .sb-explore-container{
+
+.sb-explore-container {
   padding-bottom: 30px;
+}
+
+.sb--card-textbook-container {
+  .sb--card {
+    border-bottom: 0.5px solid rgba(151, 151, 151, 0.4);
+
+    &:last-child {
+      // .sb-card {
+      border-bottom: none;
+      // }
+    }
   }
-  .sb--card-textbook-container {
-    .sb--card {
-      border-bottom: 0.5px solid rgba(151, 151, 151, 0.4);
-      &:last-child {
-        // .sb-card {
-          border-bottom: none;
-        // }
+}
+
+.textbook-icon {
+  z-index: 1;
+}
+
+.sb-course-container {
+  margin-top: 130px;
+
+  .text-center {
+    padding: 16px;
+  }
+
+  .sb-course-heading {
+    background: map-get($colors , pale_blue);
+    padding: 16px;
+    font-size: 18px;
+    font-weight: bold;
+    line-height: 18px;
+
+    .sb-nodownloads-container {
+      & {
+        padding-top: 4rem;
       }
     }
   }
-  .textbook-icon {
-    z-index: 1;
-  }
+}
+
+#no-text-book {
+  max-width: 50%;
+  width: 50%;
+}
 
 .sb-card-recently-container {
   .recently-viewed-card-size{
@@ -110,6 +162,14 @@
     }
   }
 }
+.course-card-pd{
+  padding: 1px 0 12px;
+}
 
-
-// }
+.section-header-style{
+  margin-left: 10px;
+  font-weight: 700;
+  font-size: 18px;
+  padding-top: 14px;
+  padding-bottom: 4px;
+}
\ No newline at end of file
diff --git a/src/app/resources/resources.component.ts b/src/app/resources/resources.component.ts
index 5b79072de..668b3da72 100644
--- a/src/app/resources/resources.component.ts
+++ b/src/app/resources/resources.component.ts
@@ -1,23 +1,64 @@
-import { PageFilterCallback } from './../page-filter/page-filter.page';
-import { Component, OnInit, AfterViewInit, Inject, NgZone, ViewChild, OnDestroy, ChangeDetectorRef } from '@angular/core';
-import { IonContent as ContentView, Events, ToastController, MenuController } from '@ionic/angular';
-import { NavigationExtras, Router } from '@angular/router';
 import { animate, group, state, style, transition, trigger } from '@angular/animations';
+import { AfterViewInit, ChangeDetectorRef, Component, Inject, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { NavigationExtras, Router } from '@angular/router';
+import {
+  AudienceFilter,
+  ContentCard,
+  ContentFilterConfig,
+  EventTopics,
+  ExploreConstants,
+  PreferenceKey,
+  PrimaryCategory, ProfileConstants,
+  RouterLinks,
+  Search, ViewMore
+} from '@app/app/app.constant';
+import { SbTutorialPopupComponent } from '@app/app/components/popups/sb-tutorial-popup/sb-tutorial-popup.component';
+import { AppGlobalService } from '@app/services/app-global-service.service';
+import { AppHeaderService } from '@app/services/app-header.service';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { ContentAggregatorHandler } from '@app/services/content/content-aggregator-handler.service';
+import { AggregatorPageType, Orientation } from '@app/services/content/content-aggregator-namespaces';
+import { FormAndFrameworkUtilService } from '@app/services/formandframeworkutil.service';
+import { NavigationService } from '@app/services/navigation-handler.service';
+import { NotificationService } from '@app/services/notification.service';
+import { ProfileHandler } from '@app/services/profile-handler';
+import { SplaschreenDeeplinkActionHandlerDelegate } from '@app/services/sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate';
+import { SunbirdQRScanner } from '@app/services/sunbirdqrscanner.service';
+import {
+  CorReleationDataType,
+  Environment,
+  ID,
+  ImpressionType,
+  InteractSubtype,
+  InteractType,
+  PageId
+} from '@app/services/telemetry-constants';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import { ContentUtil } from '@app/util/content-util';
+import { applyProfileFilter } from '@app/util/filter.util';
+import { AppVersion } from '@ionic-native/app-version/ngx';
+import { Network } from '@ionic-native/network/ngx';
+import { IonContent as ContentView, IonRefresher, MenuController, PopoverController, ToastController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { TranslateService } from '@ngx-translate/core';
-import has from 'lodash/has';
+import { CsPrimaryCategory } from '@project-sunbird/client-services/services/content';
+import { CourseCardGridTypes, LibraryFiltersLayout } from '@project-sunbird/common-consumption-v8';
 import forEach from 'lodash/forEach';
+import has from 'lodash/has';
 import { Subscription } from 'rxjs';
-import { Network } from '@ionic-native/network/ngx';
-import { LibraryFiltersLayout } from '@project-sunbird/common-consumption';
 import {
   CategoryTerm,
+  ContentAggregatorRequest,
   ContentEventType,
+  ContentRequest,
   ContentSearchCriteria,
   ContentService,
+  CorrelationData,
   EventsBusEvent,
   EventsBusService,
   FrameworkCategoryCode,
   FrameworkCategoryCodesGroup,
+  FrameworkService,
   FrameworkUtilService,
   GetFrameworkCategoryTermsRequest,
   Profile,
@@ -25,41 +66,15 @@ import {
   ProfileType,
   SearchType,
   SharedPreferences,
-  TelemetryObject,
-  ContentRequest,
-  FrameworkService,
-  SortOrder,
-  CorrelationData
+  SortOrder
 } from 'sunbird-sdk';
-
-import {
-  AudienceFilter,
-  CardSectionName,
-  ContentCard,
-  ContentType,
-  PreferenceKey,
-  ViewMore,
-  Search,
-  ProfileConstants,
-  RouterLinks,
-  ContentFilterConfig,
-  MimeType,
-  EventTopics
-} from '@app/app/app.constant';
-import { AppGlobalService } from '@app/services/app-global-service.service';
-import { SunbirdQRScanner } from '@app/services/sunbirdqrscanner.service';
-import { AppVersion } from '@ionic-native/app-version/ngx';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import { CommonUtilService } from '@app/services/common-util.service';
-import { FormAndFrameworkUtilService } from '@app/services/formandframeworkutil.service';
+import { animationGrowInTopRight } from '../animations/animation-grow-in-top-right';
+import { animationShrinkOutTopRight } from '../animations/animation-shrink-out-top-right';
 import {
-  Environment, InteractSubtype, InteractType, PageId, CorReleationDataType, ID
-} from '@app/services/telemetry-constants';
-import { AppHeaderService } from '@app/services/app-header.service';
-import { SplaschreenDeeplinkActionHandlerDelegate } from '@app/services/sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate';
-import { ContentUtil } from '@app/util/content-util';
-import { NotificationService } from '@app/services/notification.service';
-import { applyProfileFilter } from '@app/util/filter.util';
+  FrameworkSelectionActionsDelegate, FrameworkSelectionDelegateService
+} from '../profile/framework-selection/framework-selection.page';
+import { PageFilterCallback } from './../page-filter/page-filter.page';
+import { OnTabViewWillEnter } from './../tabs/on-tab-view-will-enter';
 
 @Component({
   selector: 'app-resources',
@@ -70,7 +85,7 @@ import { applyProfileFilter } from '@app/util/filter.util';
       state('true', style({
         left: '{{left_indent}}',
       }), { params: { left_indent: 0 } }), // default parameters values required
-
+      
       transition('* => active', [
         style({ width: 5, opacity: 0 }),
         group([
@@ -103,15 +118,15 @@ import { applyProfileFilter } from '@app/util/filter.util';
     ])
   ]
 })
-export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
+export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy, FrameworkSelectionActionsDelegate, OnTabViewWillEnter {
+  @ViewChild('libraryRefresher', { static: false }) refresher: IonRefresher;
+
   pageLoadedSuccess = false;
   storyAndWorksheets: Array<any>;
   selectedValue: Array<string> = [];
   guestUser = false;
   showSignInCard = false;
-  recentlyViewedResources: Array<any>;
   userId: string;
-  showLoader = false;
 
   /**
    * Common consumption
@@ -134,15 +149,11 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
   searchApiLoader = true;
   isOnBoardingCardCompleted = false;
   public source = PageId.LIBRARY;
-  resourceFilter: any;
-  appliedFilter: any;
-  filterIcon = './assets/imgs/ic_action_filter.png';
   selectedLanguage = 'en';
   audienceFilter = [];
   profile: Profile;
   appLabel: string;
   mode = 'soft';
-  isFilterApplied = false;
   pageFilterCallBack: PageFilterCallback;
   getGroupByPageReq: ContentSearchCriteria = {
     searchType: SearchType.SEARCH
@@ -151,8 +162,6 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
   layoutName = 'textbook';
   layoutPopular = ContentCard.LAYOUT_POPULAR;
   layoutSavedContent = ContentCard.LAYOUT_SAVED_CONTENT;
-  savedResourcesSection = CardSectionName.SECTION_SAVED_RESOURCES;
-  recentViewedSection = CardSectionName.SECTION_RECENT_RESOURCES;
   categoryGradeLevels: any;
   categoryMediums: any;
   current_index: any;
@@ -164,18 +173,65 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
   refresh: boolean;
   private eventSubscription: Subscription;
 
-  toast: any;
-  headerObservable: any;
+  headerObservable: Subscription;
   scrollEventRemover: any;
   subjects: any;
+  searchGroupingContents: any;
   /**
    * Flag to show latest and popular course loader
    */
   pageApiLoader = true;
-  @ViewChild('contentView') contentView: ContentView;
+  dynamicResponse: any;
+  courseCardType = CourseCardGridTypes;
+  @ViewChild('contentView', { static: false }) contentView: ContentView;
   locallyDownloadResources;
   channelId: string;
   coachTimeout: any;
+  courseList = [];
+  subjectThemeAndIconsMap = {
+    Science: {
+      background: '#FFD6EB',
+      titleColor: '#FD59B3',
+      icon: 'assets/imgs/sub_science.svg'
+    },
+    Mathematics: {
+      background: '#FFDFD9',
+      titleColor: '#EA2E52',
+      icon: 'assets/imgs/sub_math.svg'
+    },
+    English: {
+      background: '#DAFFD8',
+      titleColor: '#218432',
+      icon: 'assets/imgs/sub_english.svg'
+    },
+    Social: {
+      background: '#DAD4FF',
+      titleColor: '#635CDC',
+      icon: 'assets/imgs/sub_social.svg'
+    },
+    Hindi: {
+      background: '#C2E2E9',
+      titleColor: '#07718A',
+      icon: 'assets/imgs/sub_hindi.svg'
+    },
+    Chemistry: {
+      background: '#FFE59B',
+      titleColor: '#8D6A00',
+      icon: 'assets/imgs/sub_chemistry.svg'
+    },
+    Geography: {
+      background: '#C2ECE6',
+      titleColor: '#149D88',
+      icon: 'assets/imgs/sub_geography.svg'
+    },
+    Sanskrit: {
+      background: '#FFDFC7',
+      titleColor: '#AD632D',
+      icon: 'assets/imgs/sub_science.svg'
+    },
+  };
+
+  private tutorialPopover;
 
   constructor(
     @Inject('PROFILE_SERVICE') private profileService: ProfileService,
@@ -198,9 +254,14 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
     public toastController: ToastController,
     public menuCtrl: MenuController,
     private headerService: AppHeaderService,
+    private navService: NavigationService,
     private router: Router,
     private changeRef: ChangeDetectorRef,
     private appNotificationService: NotificationService,
+    private popoverCtrl: PopoverController,
+    private frameworkSelectionDelegateService: FrameworkSelectionDelegateService,
+    private contentAggregatorHandler: ContentAggregatorHandler,
+    private profileHandler: ProfileHandler
   ) {
     this.preferences.getString(PreferenceKey.SELECTED_LANGUAGE_CODE).toPromise()
       .then(val => {
@@ -226,7 +287,6 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
     });
     this.events.subscribe('savedResources:update', (res) => {
       if (res && res.update) {
-        this.loadRecentlyViewedContent(true);
         this.getLocalContent();
       }
     });
@@ -256,6 +316,14 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   async ngOnInit() {
+    const isFirstTimeOnboarding = await this.preferences.getBoolean(PreferenceKey.COACH_MARK_SEEN).toPromise();
+    if (!isFirstTimeOnboarding) {
+      this.telemetryGeneratorService.generateImpressionTelemetry(
+        ImpressionType.PAGE_REQUEST, '',
+        PageId.LIBRARY,
+        Environment.ONBOARDING
+      );
+    }
     this.getCurrentUser();
     this.initNetworkDetection();
     this.appGlobalService.generateConfigInteractEvent(PageId.LIBRARY, this.isOnBoardingCardCompleted);
@@ -263,21 +331,11 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
 
     this.events.subscribe(EventTopics.TAB_CHANGE, (data: string) => {
       this.scrollToTop();
-      if (data.trim().toUpperCase() === 'LIBRARY') {
-        if (this.appliedFilter) {
-          this.filterIcon = './assets/imgs/ic_action_filter.png';
-          this.resourceFilter = undefined;
-          this.appliedFilter = undefined;
-          this.isFilterApplied = false;
-          this.getPopularContent();
-        }
-      } else if (data === '') {
+      if (data === '') {
         this.qrScanner.startScanner(this.appGlobalService.getPageIdForTelemetry());
       }
     });
-    this.events.subscribe('event:update_recently_viewed', () => {
-      this.loadRecentlyViewedContent();
-    });
+
   }
 
   generateNetworkType() {
@@ -296,6 +354,7 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   ionViewWillLeave(): void {
+    this.refresher.disabled = true;
     if (this.eventSubscription) {
       this.eventSubscription.unsubscribe();
     }
@@ -304,7 +363,6 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
     if (this.headerObservable) {
       this.headerObservable.unsubscribe();
     }
-    this.coachTimeout.clearTimeout();
   }
 
   ionViewDidLeave() {
@@ -334,96 +392,13 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
     }
 
     this.profile = this.appGlobalService.getCurrentUser();
-    this.loadRecentlyViewedContent();
     this.getLocalContent();
   }
 
-  navigateToViewMoreContentsPage(section: string) {
-    const values = {};
-    let headerTitle;
-    let pageName;
-    let showDownloadOnlyToggleBtn;
-    const uid = this.profile ? this.profile.uid : undefined;
-    if (section === this.savedResourcesSection) {
-      values['SectionName'] = this.savedResourcesSection;
-      headerTitle = 'SAVED_RESOURCES';
-      pageName = ViewMore.PAGE_RESOURCE_SAVED;
-    } else if (section === this.recentViewedSection) {
-      values['SectionName'] = this.recentViewedSection;
-      headerTitle = 'RECENTLY_VIEWED';
-      pageName = ViewMore.PAGE_RESOURCE_RECENTLY_VIEWED;
-      showDownloadOnlyToggleBtn = true;
-    }
-    this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
-      InteractSubtype.VIEWALL_CLICKED,
-      Environment.HOME,
-      this.source, undefined,
-      values);
-
-    const resourcesParams: NavigationExtras = {
-      state: {
-        headerTitle,
-        pageName,
-        showDownloadOnlyToggle: showDownloadOnlyToggleBtn,
-        uid,
-        audience: this.audienceFilter,
-      }
-    };
-    this.router.navigate([RouterLinks.VIEW_MORE_ACTIVITY], resourcesParams);
-  }
-
-  /**
-	 * Load/get recently viewed content
-	 */
-  async loadRecentlyViewedContent(hideLoaderFlag?: boolean) {
-    this.recentlyViewedResources = [];
-    if (!hideLoaderFlag) {
-      this.showLoader = true;
-    }
-    const requestParams: ContentRequest = {
-      uid: this.profile ? this.profile.uid : undefined,
-      contentTypes: [],
-      audience: this.audienceFilter,
-      recentlyViewed: true,
-      limit: 20
-    };
-
-    this.contentService.getContents(requestParams).toPromise()
-      .then(data => {
-        data.forEach((value) => {
-          value.contentData['lastUpdatedOn'] = value.lastUpdatedTime;
-          if (value.contentData.appIcon) {
-            if (value.contentData.appIcon.includes('http:') || value.contentData.appIcon.includes('https:')) {
-              if (this.commonUtilService.networkInfo.isNetworkAvailable) {
-                value.contentData.appIcon = value.contentData.appIcon;
-              } else {
-                value.contentData.appIcon = this.defaultImg;
-              }
-            } else if (value.basePath) {
-              value.contentData.appIcon = value.basePath + '/' + value.contentData.appIcon;
-            }
-          }
-        });
-        this.ngZone.run(() => {
-          this.recentlyViewedResources = data;
-          if (!hideLoaderFlag) {
-            this.showLoader = false;
-          }
-        });
-      })
-      .catch(() => {
-        this.ngZone.run(() => {
-          if (!hideLoaderFlag) {
-            this.showLoader = false;
-          }
-        });
-      });
-  }
-
   /**
    * Get popular content
    */
-  getPopularContent(isAfterLanguageChange = false, contentSearchCriteria?: ContentSearchCriteria, avoidRefreshList = false) {
+  getPopularContent(isAfterLanguageChange = false, contentSearchCriteria?: ContentSearchCriteria) {
     this.storyAndWorksheets = [];
     this.searchApiLoader = true;
 
@@ -435,8 +410,7 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
 
     this.mode = contentSearchCriteria.mode;
 
-    if (this.profile && !this.isFilterApplied) {
-
+    if (this.profile) {
       if (this.profile.board && this.profile.board.length) {
         contentSearchCriteria.board = applyProfileFilter(this.appGlobalService, this.profile.board,
           contentSearchCriteria.board, 'board');
@@ -455,30 +429,34 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
     }
     // swipe down to refresh should not over write current selected options
     if (contentSearchCriteria.grade) {
-      this.getGroupByPageReq.grade = [contentSearchCriteria.grade[0]];
+      this.getGroupByPageReq.grade = contentSearchCriteria.grade;
     }
     if (contentSearchCriteria.medium) {
-      this.getGroupByPageReq.medium = [contentSearchCriteria.medium[0]];
+      this.getGroupByPageReq.medium = contentSearchCriteria.medium;
     }
     if (contentSearchCriteria.board) {
-      this.getGroupByPageReq.board = [contentSearchCriteria.board[0]];
+      this.getGroupByPageReq.board = contentSearchCriteria.board;
     } else {
       this.getGroupByPageReq.channel = [this.channelId];
     }
 
     this.getGroupByPageReq.mode = 'hard';
     this.getGroupByPageReq.facets = Search.FACETS_ETB;
-    this.getGroupByPageReq.contentTypes = [ContentType.TEXTBOOK];
-    this.getGroupByPage(isAfterLanguageChange, avoidRefreshList);
+    this.getGroupByPageReq.primaryCategories = [CsPrimaryCategory.DIGITAL_TEXTBOOK];
+    this.getGroupByPageReq.fields = ExploreConstants.REQUIRED_FIELDS;
+    this.getGroupByPage(isAfterLanguageChange);
   }
 
-  getGroupByPage(isAfterLanguageChange = false, avoidRefreshList = false) {
+  // Make this method as private
+  async getGroupByPage(isAfterLanguageChange = false) {
+
     const selectedBoardMediumGrade = ((this.getGroupByPageReq.board && this.getGroupByPageReq.board.length
       && this.getGroupByPageReq.board[0]) ? this.getGroupByPageReq.board[0] + ', ' : '') +
       (this.getGroupByPageReq.medium && this.getGroupByPageReq.medium.length
         && this.getGroupByPageReq.medium[0]) + ' Medium, ' +
       (this.getGroupByPageReq.grade && this.getGroupByPageReq.grade.length && this.getGroupByPageReq.grade[0]);
     this.appGlobalService.setSelectedBoardMediumGrade(selectedBoardMediumGrade);
+
     this.storyAndWorksheets = [];
     this.searchApiLoader = !this.refresh;
     const reqvalues = {};
@@ -488,106 +466,83 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
       Environment.HOME,
       this.source, undefined,
       reqvalues);
+
     this.getGroupByPageReq.sortCriteria = [{
       sortAttribute: 'name',
       sortOrder: SortOrder.ASC
     }];
-    this.contentService.searchContentGroupedByPageSection(this.getGroupByPageReq).toPromise()
-      .then((response: any) => {
-        this.ngZone.run(() => {
-          const sections = response.sections;
-          const newSections = [];
-          sections.forEach(element => {
-            // element.display = JSON.parse(element.display);
-            if (element.display.name) {
-              if (has(element.display.name, this.selectedLanguage)) {
-                const langs = [];
-                forEach(element.display.name, (value, key) => {
-                  langs[key] = value;
-                });
-                element.name = langs[this.selectedLanguage];
-              }
-            }
-            newSections.push(element);
-          });
-          // END OF TEMPORARY CODE
-          if (this.profile.subject && this.profile.subject.length) {
-            this.storyAndWorksheets = this.orderBySubject([...newSections]);
-          } else {
-            this.storyAndWorksheets = newSections;
-          }
-          const sectionInfo = {};
-          for (let i = 0; i < this.storyAndWorksheets.length; i++) {
-            const sectionName = this.storyAndWorksheets[i].name,
-              count = this.storyAndWorksheets[i].contents.length;
-            // check if locally available
-            this.markLocallyAvailableTextBook();
-            for (let k = 0, len = this.storyAndWorksheets[i].contents.length; k < len; k++) {
-              const content = this.storyAndWorksheets[i].contents[k];
-              if (content.appIcon) {
-                if (content.appIcon.includes('http:') || content.appIcon.includes('https:')) {
-                  if (this.commonUtilService.networkInfo.isNetworkAvailable) {
-                    content.appIcon = content.appIcon;
-                  } else {
-                    this.imageSrcMap.set(content.identifier, content.appIcon);
-                    content.appIcon = this.defaultImg;
-                  }
-                } else if (content.basePath) {
-                  content.appIcon = content.basePath + '/' + content.appIcon;
-                }
-              }
-              // add custom attribute('cardImg') for common consumption
-              if (!(!content.isAvailableLocally && !this.commonUtilService.networkInfo.isNetworkAvailable)) {
-                if (this.commonUtilService.convertFileSrc(content.courseLogoUrl)) {
-                  this.storyAndWorksheets[i].contents[k].cardImg = this.commonUtilService.convertFileSrc(content.courseLogoUrl);
-                } else if (this.commonUtilService.convertFileSrc(content.appIcon)) {
-                  this.storyAndWorksheets[i].contents[k].cardImg = this.commonUtilService.convertFileSrc(content.appIcon);
-                } else {
-                  this.storyAndWorksheets[i].contents[k].cardImg = this.defaultImg;
-                }
-              } else {
-                this.storyAndWorksheets[i].contents[k].cardImg = 'assets/imgs/ic_offline_white_sm.png';
-              }
-            }
-
-            sectionInfo[sectionName] = count;
-            sectionInfo['board'] = (this.getGroupByPageReq.board && this.getGroupByPageReq.board.length
-              && this.getGroupByPageReq.board[0]) ? this.getGroupByPageReq.board[0] : '';
-            sectionInfo['medium'] = this.getGroupByPageReq.medium[0];
-            sectionInfo['grade'] = this.getGroupByPageReq.grade[0];
+    const audience: string[] = await this.profileHandler.getAudience(this.profile.profileType);
+    const request: ContentAggregatorRequest = {
+      userPreferences: {
+        board: this.getGroupByPageReq.board,
+        medium: this.getGroupByPageReq.medium,
+        gradeLevel: this.getGroupByPageReq.grade,
+        subject: this.profile.subject,
+      },
+      applyFirstAvailableCombination: {
+        medium: this.getGroupByPageReq.medium,
+        gradeLevel: this.getGroupByPageReq.grade
+      },
+      interceptSearchCriteria: (contentSearchCriteria: ContentSearchCriteria) => {
+        contentSearchCriteria.board = this.getGroupByPageReq.board;
+        contentSearchCriteria.medium = this.getGroupByPageReq.medium;
+        contentSearchCriteria.grade = this.getGroupByPageReq.grade;
+        // contentSearchCriteria.audience = audience;
+        return contentSearchCriteria;
+      }
+    };
+    // Get the book data
+    try {
+      this.dynamicResponse = await this.contentAggregatorHandler.aggregate(request, AggregatorPageType.LIBRARY);
+      if (this.dynamicResponse) {
+        this.dynamicResponse.forEach((val) => {
+          if (val.theme && val.theme.orientation === Orientation.VERTICAL) {
+            this.searchGroupingContents = val.data;
           }
-
-          const resValues = {};
-          resValues['pageRes'] = sectionInfo;
-          this.telemetryGeneratorService.generateInteractTelemetry(InteractType.OTHER,
-            InteractSubtype.RESOURCE_PAGE_LOADED,
-            Environment.HOME,
-            this.source, undefined,
-            resValues);
-          this.pageLoadedSuccess = true;
-          this.refresh = false;
-          this.searchApiLoader = false;
-          this.generateExtraInfoTelemetry(newSections.length);
         });
-      })
-      .catch(error => {
-        this.ngZone.run(() => {
-          this.refresh = false;
-          this.searchApiLoader = false;
-          if (error === 'SERVER_ERROR' || error === 'SERVER_AUTH_ERROR') {
-            if (!isAfterLanguageChange) {
-              this.commonUtilService.showToast('ERROR_FETCHING_DATA');
-            }
+        this.dynamicResponse = this.contentAggregatorHandler.populateIcons(this.dynamicResponse);
+      }
+      const newSections = [];
+      this.getCategoryData();
+      this.searchGroupingContents.sections.forEach(section => {
+        if (section.name) {
+          if (has(section.name, this.selectedLanguage)) {
+            const langs = [];
+            forEach(section.name, (value, key) => {
+              langs[key] = value;
+            });
+            section.name = langs[this.selectedLanguage];
           }
-          const errValues = {};
-          errValues['isNetworkAvailable'] = this.commonUtilService.networkInfo.isNetworkAvailable ? 'Y' : 'N';
-          this.telemetryGeneratorService.generateInteractTelemetry(InteractType.OTHER,
-            InteractSubtype.RESOURCE_PAGE_ERROR,
-            Environment.HOME,
-            this.source, undefined,
-            errValues);
-        });
+        }
+        newSections.push(section);
+      });
+      if (this.profile.subject && this.profile.subject.length) {
+        this.storyAndWorksheets = this.orderBySubject([...newSections]);
+      } else {
+        this.storyAndWorksheets = newSections;
+      }
+      this.pageLoadedSuccess = true;
+      this.refresh = false;
+      this.searchApiLoader = false;
+      this.generateExtraInfoTelemetry(newSections.length);
+    } catch (error) {
+      this.ngZone.run(() => {
+        this.refresh = false;
+        this.searchApiLoader = false;
+        if (error === 'SERVER_ERROR' || error === 'SERVER_AUTH_ERROR') {
+          if (!isAfterLanguageChange) {
+            this.commonUtilService.showToast('ERROR_FETCHING_DATA');
+          }
+        }
+        const errValues = {};
+        errValues['isNetworkAvailable'] = this.commonUtilService.networkInfo.isNetworkAvailable ? 'Y' : 'N';
+        this.telemetryGeneratorService.generateInteractTelemetry(InteractType.OTHER,
+          InteractSubtype.RESOURCE_PAGE_ERROR,
+          Environment.HOME,
+          this.source, undefined,
+          errValues);
       });
+    }
   }
 
   orderBySubject(searchResults: any[]) {
@@ -621,6 +576,7 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
       }
     }
   }
+
   generateExtraInfoTelemetry(sectionsCount) {
     const values = {};
     values['pageSectionCount'] = sectionsCount;
@@ -652,35 +608,26 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
     this.subscribeSdkEvent();
 
     this.splaschreenDeeplinkActionHandlerDelegate.isDelegateReady = true;
+    const isFirstTimeOnboarding = await this.preferences.getBoolean(PreferenceKey.COACH_MARK_SEEN).toPromise();
+    if (!isFirstTimeOnboarding) {
+      this.telemetryGeneratorService.generatePageLoadedTelemetry(
+        PageId.LIBRARY,
+        Environment.ONBOARDING
+      );
+    }
   }
 
   ionViewDidEnter() {
+    this.refresher.disabled = false;
     // Need timer to load the coach screen and for the coach screen to hide if user comes from deeplink.
     // this.coachTimeout = setTimeout(() => {
-    //   this.appGlobalService.showCouchMarkScreen();
+    //   this.appGlobalService.showNewTabsSwitchPopup();
     // }, 2000);
   }
 
-  // Offline Toast
-  async presentToastForOffline(msg: string) {
-    this.toast = await this.toastController.create({
-      duration: 3000,
-      message: this.commonUtilService.translateMessage(msg),
-      showCloseButton: true,
-      position: 'top',
-      closeButtonText: 'X',
-      cssClass: ['toastHeader', 'offline']
-    });
-    await this.toast.present();
-    this.toast.onDidDismiss(() => {
-      this.toast = undefined;
-    });
-  }
-
   subscribeSdkEvent() {
     this.eventSubscription = this.eventsBusService.events().subscribe((event: EventsBusEvent) => {
       if (event.payload && event.type === ContentEventType.IMPORT_COMPLETED) {
-        this.loadRecentlyViewedContent();
         this.getLocalContent();
       }
     }) as any;
@@ -690,14 +637,13 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
     this.refresh = true;
     this.storyAndWorksheets = [];
 
-    this.getCategoryData();
     this.getCurrentUser();
     if (refresher) {
       refresher.target.complete();
       this.telemetryGeneratorService.generatePullToRefreshTelemetry(PageId.LIBRARY, Environment.HOME);
-      this.getGroupByPage();
+      this.getGroupByPage(false);
     } else {
-      this.getPopularContent(false, null, avoidRefreshList);
+      this.getPopularContent(false, null);
     }
   }
 
@@ -709,18 +655,18 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
     this.qrScanner.startScanner(PageId.LIBRARY);
   }
 
-
   async search() {
     this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
       InteractSubtype.SEARCH_BUTTON_CLICKED,
       Environment.HOME,
       PageId.LIBRARY);
-    const contentTypes = await this.formAndFrameworkUtilService.getSupportedContentFilterConfig(
+    const primaryCategories = await this.formAndFrameworkUtilService.getSupportedContentFilterConfig(
       ContentFilterConfig.NAME_LIBRARY);
     this.router.navigate([RouterLinks.SEARCH], {
       state: {
-        contentType: contentTypes,
-        source: PageId.LIBRARY
+        primaryCategories,
+        source: PageId.LIBRARY,
+        searchWithBackButton: true
       }
     });
   }
@@ -778,10 +724,14 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
         }
       }
       this.categoryMediumNamesArray = categoryMediumsParam;
-
-      for (let i = 0, len = this.categoryMediumNamesArray.length; i < len; i++) {
-        if (this.getGroupByPageReq.medium[0].toLowerCase().trim() === this.categoryMediumNamesArray[i].toLowerCase().trim()) {
-          this.mediumClickHandler(i, this.categoryMediumNamesArray[i]);
+      if (this.searchGroupingContents.combination.medium) {
+        const indexOfSelectedmediums = this.categoryMediumNamesArray.indexOf(this.searchGroupingContents.combination.medium);
+        this.mediumClickHandler(indexOfSelectedmediums, this.categoryMediumNamesArray[indexOfSelectedmediums]);
+      } else {
+        for (let i = 0, len = this.categoryMediumNamesArray.length; i < len; i++) {
+          if ((this.getGroupByPageReq.medium[0].toLowerCase().trim()) === this.categoryMediumNamesArray[i].toLowerCase().trim()) {
+            this.mediumClickHandler(i, this.categoryMediumNamesArray[i]);
+          }
         }
       }
     }
@@ -798,13 +748,19 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
       .then((res: CategoryTerm[]) => {
         this.categoryGradeLevels = res;
         this.categoryGradeLevelsArray = res.map(a => (a.name));
-        for (let i = 0, len = this.categoryGradeLevelsArray.length; i < len; i++) {
-          if (this.getGroupByPageReq.grade[0] === this.categoryGradeLevelsArray[i]) {
-            this.classClickHandler(i);
+        if (this.searchGroupingContents.combination.gradeLevel) {
+          const indexOfselectedClass =
+            this.categoryGradeLevelsArray.indexOf(this.searchGroupingContents.combination.gradeLevel);
+          this.classClickHandler(indexOfselectedClass);
+        } else {
+          for (let i = 0, len = this.categoryGradeLevelsArray.length; i < len; i++) {
+            if (this.getGroupByPageReq.grade[0] === this.categoryGradeLevelsArray[i]) {
+              this.classClickHandler(i);
+            }
           }
         }
       })
-      .catch(err => {
+      .catch(() => {
       });
   }
 
@@ -843,7 +799,8 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
     this.getGroupByPageReq.grade = [this.categoryGradeLevelsArray[index]];
 
     if ((this.currentGrade) && (this.currentGrade !== this.categoryGradeLevelsArray[index]) && isClassClicked) {
-      this.getGroupByPage(false, !isClassClicked);
+      this.dynamicResponse = [];
+      this.getGroupByPage(false);
     }
 
     for (let i = 0, len = this.categoryGradeLevelsArray.length; i < len; i++) {
@@ -879,7 +836,8 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
     }
     this.getGroupByPageReq.medium = [mediumName];
     if (this.currentMedium !== mediumName && isMediumClicked) {
-      this.getGroupByPage(false, !isMediumClicked);
+      this.dynamicResponse = [];
+      this.getGroupByPage(false);
     }
     for (let i = 0, len = this.categoryMediumNamesArray.length; i < len; i++) {
       if (this.categoryMediumNamesArray[i] === mediumName) {
@@ -887,51 +845,54 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
       }
     }
     this.mediumsSelected = [index];
+    setTimeout(() => {
+      const el = document.getElementById('medium' + index);
+      if (el) {
+        el.scrollIntoView({ behavior: 'smooth', block: 'end', inline: 'start' });
+      }
+    }, 1000);
   }
 
   navigateToDetailPage(event, sectionName) {
+    event.data = event.data.content ? event.data.content : event.data;
     const item = event.data;
     const index = event.index;
     const identifier = item.contentId || item.identifier;
-    const telemetryObject: TelemetryObject = new TelemetryObject(identifier, item.contentType, item.pkgVersion);
-    const corRelationList = [{ id: sectionName, type: CorReleationDataType.SUBJECT }];
+    const corRelationList = [{ id: sectionName || '', type: CorReleationDataType.SECTION }];
     const values = {};
-    values['sectionName'] = item.subject;
+    values['sectionName'] = sectionName;
     values['positionClicked'] = index;
     this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
       InteractSubtype.CONTENT_CLICKED,
       Environment.HOME,
       PageId.LIBRARY,
-      telemetryObject,
+      ContentUtil.getTelemetryObject(item),
       values,
       ContentUtil.generateRollUp(undefined, identifier),
       corRelationList);
     if (this.commonUtilService.networkInfo.isNetworkAvailable || item.isAvailableLocally) {
-      this.router.navigate([RouterLinks.COLLECTION_DETAIL_ETB], { state: { content: item, corRelation: corRelationList } });
+      this.navService.navigateToDetailPage(item, { content: item, corRelation: corRelationList });
     } else {
-      this.presentToastForOffline('OFFLINE_WARNING_ETBUI_1');
+      this.commonUtilService.presentToastForOffline('OFFLINE_WARNING_ETBUI_1');
     }
   }
 
   navigateToTextbookPage(items, subject) {
-    const identifier = items.contentId || items.identifier;
-    let telemetryObject: TelemetryObject;
-    telemetryObject = new TelemetryObject(identifier, items.contentType, undefined);
     this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
       InteractSubtype.VIEW_MORE_CLICKED,
       Environment.HOME,
       PageId.LIBRARY,
-      telemetryObject);
+      ContentUtil.getTelemetryObject(items));
     if (this.commonUtilService.networkInfo.isNetworkAvailable || items.isAvailableLocally) {
 
       this.router.navigate([RouterLinks.TEXTBOOK_VIEW_MORE], {
         state: {
-          content: items,
+          contentList: items,
           subjectName: subject
         }
       });
     } else {
-      this.presentToastForOffline('OFFLINE_WARNING_ETBUI_1');
+      this.commonUtilService.presentToastForOffline('OFFLINE_WARNING_ETBUI_1');
     }
   }
 
@@ -950,10 +911,31 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
       case 'notification':
         this.redirectToNotifications();
         break;
+      // case 'information':
+      //   this.appTutorialScreen();
+      //   break;
       default: console.warn('Use Proper Event name');
     }
   }
 
+  async appTutorialScreen() {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      InteractSubtype.INFORMATION_ICON_CLICKED,
+      Environment.HOME,
+      PageId.LIBRARY
+    );
+    this.tutorialPopover = await this.popoverCtrl.create({
+      component: SbTutorialPopupComponent,
+      componentProps: { appLabel: this.appLabel },
+      enterAnimation: animationGrowInTopRight,
+      leaveAnimation: animationShrinkOutTopRight,
+      backdropDismiss: false,
+      showBackdrop: true
+    });
+    this.tutorialPopover.present();
+  }
+
   redirectToActivedownloads() {
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
@@ -982,27 +964,18 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
       );
     }
   }
-  onScroll(event) {
-    // Added Telemetry on reaching Horizontal Scroll End
-    if (event && event.target.scrollWidth <= event.target.scrollLeft + event.target.offsetWidth) {
-      this.telemetryGeneratorService.generateInteractTelemetry(InteractType.SCROLL,
-        InteractSubtype.RECENTLY_VIEWED_END_REACHED,
-        Environment.HOME,
-        this.source,
-      );
-    }
-  }
 
   scrollToTop() {
     this.contentView.scrollToTop();
   }
-  exploreOtherContents() {
+
+  async exploreOtherContents() {
     const navigationExtras = {
       state: {
         subjects: [...this.subjects],
         categoryGradeLevels: this.categoryGradeLevels,
         storyAndWorksheets: this.storyAndWorksheets,
-        contentType: ContentType.FOR_LIBRARY_TAB,
+        primaryCategories: PrimaryCategory.FOR_LIBRARY_TAB,
         selectedGrade: this.getGroupByPageReq.grade,
         selectedMedium: this.getGroupByPageReq.medium
       }
@@ -1010,25 +983,26 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
     this.router.navigate([RouterLinks.EXPLORE_BOOK], navigationExtras);
 
     const corRelationList: Array<CorrelationData> = [];
-    corRelationList.push({id: this.profile.board ? this.profile.board.join(',') : '', type: CorReleationDataType.BOARD});
-    corRelationList.push({id: this.currentGrade ? this.currentGrade : '', type: CorReleationDataType.CLASS});
-    corRelationList.push({id: this.currentMedium ? this.currentMedium : '', type: CorReleationDataType.MEDIUM});
+    corRelationList.push({ id: this.profile.board ? this.profile.board.join(',') : '', type: CorReleationDataType.BOARD });
+    corRelationList.push({ id: this.currentGrade ? this.currentGrade : '', type: CorReleationDataType.CLASS });
+    corRelationList.push({ id: this.currentMedium ? this.currentMedium : '', type: CorReleationDataType.MEDIUM });
 
     this.telemetryGeneratorService.generateInteractTelemetry(
-        this.storyAndWorksheets.length === 0 ? InteractType.WITHOUT_CONTENT : InteractType.WITH_CONTENT,
+      this.storyAndWorksheets.length === 0 ? InteractType.WITHOUT_CONTENT : InteractType.WITH_CONTENT,
       '',
       Environment.LIBRARY,
       PageId.LIBRARY,
       undefined,
       undefined, undefined, corRelationList,
-    ID.SEE_MORE_CONTENT_BUTTON_CLICKED);
+      ID.SEE_MORE_CONTENT_BUTTON_CLICKED);
   }
+
   async getLocalContent() {
     this.locallyDownloadResources = [];
 
     const requestParams: ContentRequest = {
       uid: this.profile ? this.profile.uid : undefined,
-      contentTypes: [],
+      primaryCategories: [],
       audience: this.audienceFilter,
       recentlyViewed: false,
     };
@@ -1045,45 +1019,6 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
     });
   }
 
-  recentlyViewedCardClick(event, course) {
-    const item = event.data;
-    const index = event.index;
-
-    const identifier = item.contentId || item.identifier;
-
-    const type = this.telemetryGeneratorService.isCollection(item.mimeType) ?
-      item.contentType : ContentType.RESOURCE;
-
-    const telemetryObject: TelemetryObject = new TelemetryObject(identifier, type, '');
-    const values = {};
-    values['sectionName'] = this.recentViewedSection;
-    values['positionClicked'] = index;
-
-    if (!course.isAvailableLocally && !this.commonUtilService.networkInfo.isNetworkAvailable) {
-      return false;
-    }
-
-    this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
-      InteractSubtype.CONTENT_CLICKED,
-      'home',
-      'library',
-      telemetryObject,
-      values);
-    if (course.mimeType === MimeType.COLLECTION) {
-      this.router.navigate([RouterLinks.COLLECTION_DETAIL_ETB], {
-        state: {
-          content: course
-        }
-      });
-    } else {
-      this.router.navigate([RouterLinks.CONTENT_DETAILS], {
-        state: {
-          content: course.contentData
-        }
-      });
-    }
-  }
-
   private initNetworkDetection() {
     this.networkFlag = this.commonUtilService.networkInfo.isNetworkAvailable;
     this.networkSubscription = this.commonUtilService.networkAvailability$.subscribe(async (available: boolean) => {
@@ -1094,9 +1029,7 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
               const content = this.storyAndWorksheets[i].contents[k];
               if (content.appIcon) {
                 if (content.appIcon.includes('http:') || content.appIcon.includes('https:')) {
-                  if (this.commonUtilService.networkInfo.isNetworkAvailable) {
-                    content.appIcon = content.appIcon;
-                  } else {
+                  if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
                     this.imageSrcMap.set(content.identifier, content.appIcon);
                     // this.imageSrcMap[content.identifier] = content.appIcon;
                     content.appIcon = this.defaultImg;
@@ -1136,5 +1069,168 @@ export class ResourcesComponent implements OnInit, AfterViewInit, OnDestroy {
     if (this.networkSubscription) {
       this.networkSubscription.unsubscribe();
     }
+    if (this.headerObservable) {
+      this.headerObservable.unsubscribe();
+    }
+    this.frameworkSelectionDelegateService.delegate = undefined;
+  }
+
+  onCourseCardClick(event) {
+    const corRelationList: Array<CorrelationData> = [];
+    corRelationList.push({ id: event.data.title || '', type: CorReleationDataType.SUBJECT });
+    corRelationList.push({ id: (event.data.contents.length).toString(), type: CorReleationDataType.COURSE_COUNT });
+
+    if (event.data.contents && event.data.contents.length > 1) {
+      const appliedFilter = {
+        board: this.getGroupByPageReq.board,
+        medium: this.getGroupByPageReq.medium,
+        gradeLevel: this.getGroupByPageReq.grade,
+      };
+      const curriculumCourseParams: NavigationExtras = {
+        state: {
+          theme: event.data.theme,
+          titleColor: event.data.titleColor,
+          subjectIcon: event.data.cardImg,
+          subjectName: event.data.title,
+          courseList: event.data.contents,
+          corRelationList,
+          appliedFilter
+        }
+      };
+      this.telemetryGeneratorService.generateInteractTelemetry(
+        InteractType.TOUCH,
+        InteractSubtype.SUBJECT_CARD_CLICKED,
+        Environment.HOME,
+        PageId.LIBRARY,
+        undefined,
+        undefined,
+        undefined,
+        corRelationList
+      );
+      this.router.navigate([RouterLinks.CURRICULUM_COURSES], curriculumCourseParams);
+    } else {
+      this.telemetryGeneratorService.generateInteractTelemetry(
+        InteractType.TOUCH,
+        InteractSubtype.SUBJECT_CARD_CLICKED,
+        Environment.HOME,
+        PageId.LIBRARY,
+        undefined,
+        undefined,
+        undefined,
+        corRelationList
+      );
+      console.log('Content Data', event);
+      this.navService.navigateToTrackableCollection(
+        {
+          content: event.data.contents[0],
+          corRelation: corRelationList
+        }
+      );
+      // this.router.navigate([RouterLinks.ENROLLED_COURSE_DETAILS], {
+      //   state: {
+      //     content: event.data.contents[0],
+      //     corRelation: corRelationList
+      //   }
+      // });
+    }
+  }
+
+  navigateToViewMoreContentsPage(section) {
+    let navState = {};
+    switch (section.dataSrc.type) {
+      case 'TRACKABLE_COLLECTIONS':
+        navState = {
+          enrolledCourses: section.data.sections[0].contents,
+          pageName: ViewMore.PAGE_COURSE_ENROLLED,
+          headerTitle: this.commonUtilService.getTranslatedValue(section.title, ''),
+          userId: this.appGlobalService.getUserId()
+        };
+        break;
+      case 'CONTENTS':
+      navState = {
+        requestParams: {
+          request: section.meta && section.meta.searchRequest
+        },
+        headerTitle: this.commonUtilService.getTranslatedValue(section.title, ''),
+        pageName: ViewMore.PAGE_TV_PROGRAMS
+      };
+      break;
+    }
+    const params: NavigationExtras = {
+      state: navState
+    };
+    this.router.navigate([RouterLinks.VIEW_MORE_ACTIVITY], params);
+  }
+
+  async requestMoreContent() {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      InteractSubtype.LET_US_KNOW_CLICKED,
+      Environment.LIBRARY,
+      PageId.LIBRARY,
+    );
+
+    const formConfig = await this.formAndFrameworkUtilService.getContentRequestFormConfig();
+    this.appGlobalService.formConfig = formConfig;
+    this.frameworkSelectionDelegateService.delegate = this;
+    this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.FRAMEWORK_SELECTION}`],
+      {
+        state: {
+          showHeader: true,
+          corRelation: [{ id: PageId.LIBRARY, type: CorReleationDataType.FROM_PAGE }],
+          title: this.commonUtilService.translateMessage('FRMELEMNTS_LBL_REQUEST_CONTENT'),
+          subTitle: this.commonUtilService.translateMessage('FRMELEMNTS_LBL_RELEVANT_CONTENT_SUB_HEADING'),
+          formConfig,
+          submitDetails: {
+            label: this.commonUtilService.translateMessage('BTN_SUBMIT')
+          }
+        }
+      });
+  }
+
+  async onFrameworkSelectionSubmit(formInput: any, formOutput: any, router: Router, commonUtilService: CommonUtilService,
+    telemetryGeneratorService: TelemetryGeneratorService, corRelation: Array<CorrelationData>) {
+    if (!commonUtilService.networkInfo.isNetworkAvailable) {
+      await commonUtilService.showToast('OFFLINE_WARNING_ETBUI');
+      return;
+    }
+    const selectedCorRelation: Array<CorrelationData> = [];
+
+    if (formOutput['children']) {
+      for (const key in formOutput['children']) {
+        if (formOutput[key] && formOutput['children'][key]['other']) {
+          formOutput[key] = formOutput['children'][key]['other'];
+        }
+      }
+
+      delete formOutput['children'];
+    }
+
+    for (const key in formOutput) {
+      if (typeof formOutput[key] === 'string') {
+        selectedCorRelation.push({ id: formOutput[key], type: key });
+      } else if (typeof formOutput[key] === 'object' && formOutput[key].name) {
+        selectedCorRelation.push({ id: formOutput[key].name, type: key });
+      }
+    }
+    telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.TOUCH,
+      InteractSubtype.SUBMIT_CLICKED,
+      Environment.HOME,
+      PageId.FRAMEWORK_SELECTION,
+      undefined,
+      undefined,
+      undefined,
+      selectedCorRelation);
+    const params = {
+      formInput,
+      formOutput,
+      corRelation
+    };
+    router.navigate([`/${RouterLinks.RESOURCES}/${RouterLinks.RELEVANT_CONTENTS}`], { state: params });
+  }
+
+  tabViewWillEnter() {
+    this.headerService.showHeaderWithHomeButton(['search', 'download', 'notification']);
   }
 }
diff --git a/src/app/resources/resources.module.ts b/src/app/resources/resources.module.ts
index d9e9d0430..9832575e7 100644
--- a/src/app/resources/resources.module.ts
+++ b/src/app/resources/resources.module.ts
@@ -1,13 +1,13 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { ResourcesComponent } from './resources.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterModule } from '@angular/router';
+import { NgModule } from '@angular/core';
+import { ReactiveFormsModule } from '@angular/forms';
+import { DirectivesModule } from '@app/directives/directives.module';
 import { IonicModule } from '@ionic/angular';
+import { TranslateModule } from '@ngx-translate/core';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
 import { ComponentsModule } from '../components/components.module';
-import { DirectivesModule } from '@app/directives/directives.module';
-import { ReactiveFormsModule } from '@angular/forms';
-import { CommonConsumptionModule } from '@project-sunbird/common-consumption';
+import { ResourcesRoutingModule } from './resources-routing.module';
+import { ResourcesComponent } from './resources.component';
 
 @NgModule({
   declarations: [
@@ -20,12 +20,7 @@ import { CommonConsumptionModule } from '@project-sunbird/common-consumption';
       scrollAssist: true,
     }),
     TranslateModule.forChild(),
-    RouterModule.forChild([
-      {
-        path: '',
-        component: ResourcesComponent
-      }
-    ]),
+    ResourcesRoutingModule,
     ComponentsModule,
     DirectivesModule,
     ReactiveFormsModule,
@@ -33,6 +28,7 @@ import { CommonConsumptionModule } from '@project-sunbird/common-consumption';
   ],
   exports: [
     ResourcesComponent
-  ]
+  ],
+  entryComponents: []
 })
 export class ResourcesModule { }
diff --git a/src/app/search-filter/filter-form-config-mapper.ts b/src/app/search-filter/filter-form-config-mapper.ts
new file mode 100644
index 000000000..14a4e5e0b
--- /dev/null
+++ b/src/app/search-filter/filter-form-config-mapper.ts
@@ -0,0 +1,149 @@
+import { Injectable } from '@angular/core';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { FilterValue } from 'sunbird-sdk';
+import { IFacetFilterFieldTemplateConfig } from 'common-form-elements';
+
+interface FilterFormConfigWithDefaults {
+    config: IFacetFilterFieldTemplateConfig[];
+    defaults: { [key: string]: string[] | string | undefined };
+}
+
+@Injectable()
+export class FilterFormConfigMapper {
+    constructor(
+        private commonUtilService: CommonUtilService,
+    ) {
+    }
+    private static order = [
+        'board',
+        'medium',
+        'gradeLevel',
+        'subject',
+        'channel',
+        'mimeType',
+        'primaryCategory',
+        'audience'
+    ];
+
+    private static buildDefault(filterValues: FilterValue[], multiple: boolean): string[] | string | undefined {
+        if (multiple) {
+            return filterValues
+                .filter(f => f.apply)
+                .map(f => f.name);
+        } else {
+            const filterValue = filterValues.find(f => f.apply);
+            return filterValue && filterValue.name;
+        }
+    }
+
+    map(facetFilters: { [key: string]: FilterValue[] }): FilterFormConfigWithDefaults {
+        const accumulator = (acc, key) => {
+            const { config, defaults } = acc;
+            switch (key) {
+                case 'board': {
+                    defaults[key] = FilterFormConfigMapper.buildDefault(facetFilters[key], false);
+                    config.push({
+                        facet: key,
+                        type: 'dropdown',
+                        labelText: this.commonUtilService.translateMessage('BOARD'),
+                        placeholderText: 'Select Board',
+                        multiple: false,
+                    });
+                    break;
+                }
+                case 'medium': {
+                    defaults[key] = FilterFormConfigMapper.buildDefault(facetFilters[key], true);
+                    config.push({
+                        facet: key,
+                        type: 'dropdown',
+                        labelText: this.commonUtilService.translateMessage('MEDIUM'),
+                        placeholderText: 'Select Medium',
+                        multiple: true,
+                    });
+                    break;
+                }
+                case 'gradeLevel': {
+                    defaults[key] = FilterFormConfigMapper.buildDefault(facetFilters[key], true);
+                    config.push({
+                        facet: key,
+                        type: 'dropdown',
+                        labelText: this.commonUtilService.translateMessage('CLASS'),
+                        placeholderText: 'Select Class',
+                        multiple: true,
+                    });
+                    break;
+                }
+                case 'subject': {
+                    defaults[key] = FilterFormConfigMapper.buildDefault(facetFilters[key], true);
+                    config.push({
+                        facet: key,
+                        type: 'dropdown',
+                        labelText: this.commonUtilService.translateMessage('SUBJECT'),
+                        placeholderText: 'Select Subject',
+                        multiple: true,
+                    });
+                    break;
+                }
+                case 'channel': {
+                    defaults[key] = FilterFormConfigMapper.buildDefault(facetFilters[key], true);
+                    config.push({
+                        facet: key,
+                        type: 'dropdown',
+                        labelText: this.commonUtilService.translateMessage('PUBLISHER'),
+                        placeholderText: 'Select Publisher',
+                        multiple: true,
+                    });
+                    break;
+                }
+                case 'mimeType': {
+                    defaults[key] = FilterFormConfigMapper.buildDefault(facetFilters[key], true);
+                    config.push({
+                        facet: key,
+                        type: 'dropdown',
+                        labelText: this.commonUtilService.translateMessage('FRMELEMNTS_LBL_MEDIA_TYPE'),
+                        placeholderText: 'Select Media Type',
+                        multiple: true,
+                    });
+                    break;
+                }
+                case 'primaryCategory': {
+                    defaults[key] = FilterFormConfigMapper.buildDefault(facetFilters[key], true);
+                    config.push({
+                        facet: key,
+                        type: 'dropdown',
+                        labelText: this.commonUtilService.translateMessage('FRMELEMENTS_LBL_CONTENT_TYPE'),
+                        placeholderText: 'Select Content Type',
+                        multiple: true,
+                    });
+                    break;
+                }
+                case 'audience': {
+                    defaults[key] = FilterFormConfigMapper.buildDefault(facetFilters[key], true);
+                    config.push({
+                        facet: key,
+                        type: 'dropdown',
+                        labelText: this.commonUtilService.translateMessage('FRMELEMNTS_LBL_MEANT_FOR'),
+                        placeholderText: this.commonUtilService.translateMessage('FRMELEMNTS_LBL_MEANT_FOR'),
+                        multiple: true,
+                    });
+                    break;
+                }
+            }
+            return acc;
+        };
+        const { config, defaults } = Object.keys(facetFilters).reduce<FilterFormConfigWithDefaults>(accumulator, { config: [], defaults: {} });
+
+        return {
+            defaults,
+            config: config.sort((a, b) => {
+                if (
+                    FilterFormConfigMapper.order.includes(a.facet) &&
+                    FilterFormConfigMapper.order.includes(b.facet)
+                ) {
+                    return FilterFormConfigMapper.order.indexOf(a.facet) - FilterFormConfigMapper.order.indexOf(b.facet);
+                }
+                return 1;
+            })
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/app/search-filter/search-filter.module.ts b/src/app/search-filter/search-filter.module.ts
new file mode 100644
index 000000000..477a10335
--- /dev/null
+++ b/src/app/search-filter/search-filter.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { Routes, RouterModule } from '@angular/router';
+import { SbSearchFilterModule } from 'common-form-elements';
+
+import { IonicModule } from '@ionic/angular';
+
+const routes: Routes = [];
+
+@NgModule({
+    imports: [
+        CommonModule,
+        FormsModule,
+        IonicModule,
+        RouterModule.forChild(routes),
+        SbSearchFilterModule
+    ],
+})
+export class SearchFilterPageModule {}
diff --git a/src/app/search-filter/search-filter.page.html b/src/app/search-filter/search-filter.page.html
new file mode 100644
index 000000000..a00650082
--- /dev/null
+++ b/src/app/search-filter/search-filter.page.html
@@ -0,0 +1,36 @@
+<ion-content>
+    <div>
+        <div class="filter-header px-16 pt-16">
+            <ion-button class="reset-button" fill="clear" (click)="resetFilter()">
+                <ion-icon name="refresh"></ion-icon>
+                {{'RESET' | translate}}
+            </ion-button>
+        </div>
+        <div class="p-16" *ngIf="searchResultFacets">
+            <sb-search-facet-filter [baseSearchFilter]="baseSearchFilter"
+                                    [searchResultFacets]="searchResultFacets"
+                                    [filterFormTemplateConfig]="filterFormTemplateConfig"
+                                    (searchFilterChange)="valueChanged($event)"
+                                    #sbSearchFilterComponent></sb-search-facet-filter>
+        </div>
+    </div>
+</ion-content>
+
+<div class="search-filter-footer">
+    <ion-row class="padding-12" style="--background: #FFFFFF !important;">
+
+        <ion-col>
+            <ion-button class= "cancel-button"
+                        class="ion-text-capitalize mb-16" expand="block" (click)="cancel()">
+                {{'CANCEL' | translate}}
+            </ion-button>
+        </ion-col>
+
+        <ion-col>
+            <ion-button class="ion-text-capitalize mb-16" expand="block"
+                        (click)="applyFilter()">{{'APPLY' | translate}}
+            </ion-button>
+        </ion-col>
+
+    </ion-row>
+</div>
diff --git a/src/app/search-filter/search-filter.page.scss b/src/app/search-filter/search-filter.page.scss
new file mode 100644
index 000000000..539d71a41
--- /dev/null
+++ b/src/app/search-filter/search-filter.page.scss
@@ -0,0 +1,630 @@
+@import "~@project-sunbird/sb-styles/assets/_variables.scss";
+@import "~@project-sunbird/sb-styles/assets/_colors.scss";
+
+.reset-button {
+  float: right;
+  ion-icon {
+    color: var(--app-primary);
+  }
+}
+
+.filter-header {
+  border-bottom: 1px solid var(--app-primary-header);
+  p {
+    display: inline-block;
+    margin-bottom: 0;
+    line-height: 3rem;
+    font-size: 1.1rem;
+  }
+}
+
+.cancel-button {
+  --background: #f3f7fb !important;
+  color: #000000 !important;
+}
+
+.search-filter-footer {
+  z-index: -10;
+}
+
+:host ::ng-deep {
+  --sbt-pill-bg-active: #004594;
+  --sbt-pill-text-hover: #ffffff;
+  --sbt-pill-hs: 212,100%;
+  --sbt-pill-bg: hsl(var(--sbt-pill-hs), 90%);
+  --sbt-box-shadow-black: rgba(0, 0, 0, 0.1);
+  --sbt-box-shadow-3px: 0.1875rem 0.1875rem 0.125rem 0 var(--sbt-box-shadow-black);
+  --sbt-theme-purple-selectbox: #6841B3;
+  --sbt-theme-purple-selectbox-lbg: #F2EEFF;
+  --sbt-bradius: 0.125rem;
+  --sbt-bradius-24: calc(var(--sbt-bradius) * 12);
+
+  .cfe-multiselect-container {
+    ul, li {
+      margin: 0;
+      padding: 0;
+      list-style: none;
+    }
+
+    margin-bottom: 1rem;
+
+    .cfe-multiselect-label {
+      margin: .5rem 0;
+      display: flex;
+      color: var(--gray-800);
+      font-size: var(--font-size-normal);
+    }
+
+    .cfe-multiselect-field {
+      display: flex;
+      flex-wrap: nowrap;
+      align-items: center;
+      justify-content: space-between;
+      position: relative;
+
+      box-sizing: border-box;
+
+      height: 2.5rem;
+      line-height: 2.5rem;
+      border-radius: var(--sbt-bradius-24) !important;
+
+      background: var(--sbt-theme-purple-selectbox-lbg);
+      color: var(--sbt-theme-purple-selectbox);
+
+      font-weight: 700;
+      font-size: .75rem;
+      width: 100%;
+      min-height: 2rem;
+
+      border: none;
+      padding: 0 1.25rem;
+      box-shadow: var(--sbt-box-shadow-3px);
+
+      border-color: var(--gray-200);
+
+      cursor: pointer;
+      word-wrap: break-word;
+      white-space: normal;
+      outline: 0;
+      min-width: 14em;
+
+      transition: box-shadow .1s ease, width .1s ease;
+
+      -webkit-tap-highlight-color: transparent;
+      text-align: left;
+
+      .cfe-multiselect-field-label-container {
+        height: 100%;
+        width: 100%;
+        overflow: hidden;
+
+        order: 1;
+        flex-grow: 1;
+
+        ul {
+          height: 100%;
+          width: 100%;
+          overflow: hidden;
+
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          padding-left: 0 !important;
+        }
+
+        .cfe-multiselect-field-label {
+          display: inline;
+          font-size: 0.75rem !important;
+        }
+      }
+
+      .cfe-multiselect-field-caret {
+        order: 2;
+        flex-shrink: 0;
+
+        box-sizing: border-box;
+        padding-top: 0.2rem;
+        padding-left: 1rem;
+      }
+    }
+
+    .cfe-multiselect-dropdown {
+      &[hidden] {
+        display: block;
+      }
+
+      overflow-x: hidden;
+      margin-top: .25rem;
+      border-radius: var(--sbt-bradius-24);
+      background: var(--sbt-theme-purple-selectbox-lbg);
+
+      width: 100%;
+      max-height: 200px;
+      position: absolute;
+      z-index: 10000;
+      top: 100%;
+      left: 0;
+
+      &::-webkit-scrollbar-track
+      {
+        -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+        background-color: #F5F5F5;
+      }
+
+      &::-webkit-scrollbar
+      {
+        width: 4px;
+        background-color: #F5F5F5;
+      }
+
+      &::-webkit-scrollbar-thumb
+      {
+        background-color: #999999;
+      }
+
+      -webkit-animation-iteration-count: 1;
+      animation-iteration-count: 1;
+      -webkit-animation-duration: .3s;
+      animation-duration: .3s;
+      -webkit-animation-timing-function: ease;
+      animation-timing-function: ease;
+      -webkit-animation-fill-mode: both;
+      animation-fill-mode: both;
+
+      opacity: 0;
+      transform: scaleY(0);
+
+      li {
+        position: relative;
+        display: flex;
+        padding: 0 1.25rem;
+        cursor: pointer;
+
+        & > div {
+          display: block;
+          text-transform: capitalize;
+          width: 100%;
+        }
+
+        &.selected-option {
+          color: var(--sbt-theme-purple-selectbox);
+          font-weight: 700;
+          background: rgba(0,0,0,.05);
+        }
+      }
+
+      .cfe-multiselect-dropdown-item {
+        flex-grow: 1;
+      }
+    }
+
+    &.closed {
+      .cfe-multiselect-dropdown {
+        -webkit-animation-name: slideOutY;
+        animation-name: slideOutY;
+        transform-origin: top center;
+      }
+    }
+
+    &.open {
+      .cfe-multiselect-field {
+        box-shadow: 0 2px 3px 0 rgba(34, 36, 38, .15);
+      }
+
+      .cfe-multiselect-dropdown {
+        -webkit-animation-name: slideInY;
+        animation-name: slideInY;
+        transform-origin: top center;
+      }
+    }
+  }
+
+  .cfe-multiselect-container {
+    .cfe-multiselect-pills-container {
+      display: flex;
+      align-items: center;
+      box-sizing: border-box;
+      flex-wrap: wrap;
+      justify-content: flex-start;
+      margin: 0 -.5rem 0 0;
+
+      .cfe-multiselect-pills-item {
+        display: unset;
+        width: 100px;
+        border-radius: 1rem;
+        flex-basis: 100px;
+        flex-grow: 1;
+
+        cursor: pointer;
+        transition: .25s ease-in-out;
+
+        font-size: 12px;
+        -webkit-appearance: none;
+        text-overflow: ellipsis;
+        text-transform: capitalize;
+        text-decoration: none;
+        text-align: center;
+        font-weight: 400;
+        font-style: normal;
+        font-stretch: normal;
+        white-space: normal;
+
+        padding: .5rem 1rem;
+        margin: 0 .5rem .5rem 0;
+
+        background-color: var(--sbt-pill-bg);
+
+        &.selected-option {
+          color: var(--sbt-pill-text-hover);
+          background-color: var(--sbt-pill-bg-active);
+          box-shadow: var(--sbt-box-shadow-3px);
+
+          &:hover {
+            background-color: var(--gray-100);
+            color: var(--black);
+          }
+        }
+      }
+    }
+  }
+
+  @-webkit-keyframes slideInY {
+    0% {
+      opacity: 0;
+      transform: scaleY(0)
+    }
+    100% {
+      opacity: 1;
+      transform: scaleY(1)
+    }
+  }
+
+  @keyframes slideInY {
+    0% {
+      opacity: 0;
+      transform: scaleY(0)
+    }
+    100% {
+      opacity: 1;
+      transform: scaleY(1)
+    }
+  }
+
+  @-webkit-keyframes slideOutY {
+    0% {
+      opacity: 1;
+      transform: scaleY(1)
+    }
+    100% {
+      opacity: 0;
+      transform: scaleY(0)
+    }
+  }
+
+  @keyframes slideOutY {
+    0% {
+      opacity: 1;
+      transform: scaleY(1)
+    }
+    100% {
+      opacity: 0;
+      transform: scaleY(0)
+    }
+  }
+
+  .cfe-multiselect-modal-container {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100vw;
+    height: 100vh;
+    z-index: 1;
+
+    label {
+      font-size: 14px;
+      font-weight: normal;
+      margin: 0
+    }
+
+    .list-border .placeholder {
+      margin: 0;
+      color: var(--gray-100);
+    }
+
+    .list-border ul[disabled] {
+      opacity: 0.3;
+      pointer-events: none;
+    }
+
+    .list-border ul {
+      list-style-type: none;
+      position: absolute;
+      margin: 0;
+      font-size: 14px;
+      font-weight: bold;
+    }
+
+    .list-border {
+      border: 0.5px solid var(--gray-400);
+      padding: 1.3rem;
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+      left: 0;
+      height: 40px;
+    }
+
+    .list-border li {
+      float: left;
+      font-size: 12px;
+      font-weight: 700;
+      margin-left: 4px;
+    }
+
+    .dropdown ul {
+      list-style-type: none;
+    }
+
+    .dropdown li {
+      cursor: pointer;
+      padding: 8px;
+      border: 1px solid var(--white);
+    }
+
+    .dropdown ul {
+      margin: 0;
+      padding: 0;
+    }
+
+    .row {
+      display: grid;
+      grid-template-columns: 1fr 10fr;
+      grid-gap: 0rem;
+
+      span {
+        font-size: inherit !important;
+        text-transform: capitalize;
+      }
+    }
+
+    .footer {
+      display: grid;
+      grid-template-columns: 1fr 1fr;
+      grid-gap: 0rem;
+      padding-left: 8px;
+      padding-bottom: 8px;
+      padding-top: 8px;
+    }
+
+    .sb-modal-container {
+      position: fixed;
+      height: 100vh;
+      overflow: hidden;
+      width: 100%;
+      left: 0;
+      top: 0;
+      right: 0;
+      z-index: 10;
+    }
+
+    .sb-modal-overlay {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      top: 0;
+      background: rgba(0, 0, 0, 0.6);
+      left: 0;
+      z-index: 10;
+    }
+
+    .fa .fa-close {
+      float: right;
+    }
+
+    .sb-modal {
+      display: block;
+      position: absolute;
+      bottom: 0;
+      width: 100%;
+      --border-top: 0.5px solid var(--white);
+      z-index: 11;
+      background: var(--white);
+    }
+
+    .sb-modal ul {
+      list-style-type: none;
+    }
+
+    .sb-modal li {
+      cursor: pointer;
+      padding-bottom: 8px;
+      padding-top: 8px;
+
+    }
+
+    .value-label {
+      width: 270px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    .sb-forms-radio {
+      margin-top: 6px;
+    }
+
+    .sb-form-button {
+      display: inline;
+      padding: 10px;
+    }
+
+    .sb-btn-primary-outline {
+      color: var(--primary-color);
+      background-color: transparent;
+      border: 0.5px solid var(--primary-color);
+      border-radius: 4px;
+      padding: 10px 40px;
+      font-size: 16px;
+      text-transform: uppercase;
+      width: 100%;
+    }
+
+    .sb-btn-primary {
+      color: var(--white);
+      background-color: var(--primary-color);
+      border: 0.5px solid var(--primary-color);
+      border-radius: 4px;
+      padding: 10px 40px;
+      font-size: 16px;
+      text-transform: uppercase;
+      width: 100%;
+    }
+
+    .header {
+      padding: 16px;
+      margin-left: 8px;
+      font-weight: bold;
+    }
+
+    .body {
+      padding-top: 8px;
+      border-bottom: 0.5px solid var(--gray-100);
+    ;
+      border-top: 0.5px solid var(--gray-100);
+      max-height: 300px;
+      overflow: scroll;
+    }
+
+    .list-with-ellipsis:nth-child(3) {
+      float: left;
+      font-size: 12px;
+      font-weight: 700;
+      margin-left: 4px;
+      width: 50px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    .list-with-ellipsis:nth-child(n+4) {
+      visibility: hidden;
+    }
+
+    /* The container */
+    .container {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin-bottom: 2px;
+      margin-right: 1rem;
+      cursor: pointer;
+      -webkit-user-select: none;
+      -moz-user-select: none;
+      -ms-user-select: none;
+      user-select: none;
+    }
+
+    /* Hide the browser's default checkbox */
+    .container input {
+      position: absolute;
+      opacity: 0;
+      cursor: pointer;
+      height: 0;
+      width: 0;
+    }
+
+    /* Create a custom checkbox */
+    .checkmark {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 15px;
+      width: 15px;
+      border: 0.4px solid var(--black);
+    }
+
+    /* On mouse-over, add a grey background color */
+    .container:hover input~.checkmark {
+      background-color: var(--white);
+    }
+
+    /* When the checkbox is checked, add a blue background */
+    .container input:checked~.checkmark {
+      background-color: var(--primary-600);
+    }
+
+    /* Create the checkmark/indicator (hidden when not checked) */
+    .checkmark:after {
+      content: "";
+      display: none;
+    }
+
+    /* Show the checkmark when checked */
+    .container input:checked~.checkmark:after {
+      display: block;
+    }
+
+    /* Style the checkmark/indicator */
+    .container .checkmark:after {
+      width: 5px;
+      height: 10px;
+      border: solid var(--white);
+      border-width: 0 2px 2px 0;
+      -webkit-transform: rotate(45deg);
+      -ms-transform: rotate(45deg);
+      transform: rotate(45deg);
+    }
+
+    .sb-modal-dropdown-web ul {
+      list-style-type: none;
+      display: block;
+      position: absolute;
+      top: 38px;
+      left: 0;
+      background-color: white;
+      width: 100%;
+      z-index: 999;
+      box-shadow: 2px 2px 2px 2px aliceblue;
+      border: 2px solid #80a7ce;
+      max-height: 314px;
+      overflow: scroll;
+    }
+
+    .sb-modal-dropdown-web ul li {
+      margin-top: 10px;
+      margin-bottom: 8px;
+      padding: 8px;
+      font-size: 13px;
+    }
+
+    .sb-modal-dropdown-web .selected-option {
+      font-weight: bold;
+      background-color: #eee;
+    }
+
+
+    /* width */
+    ::-webkit-scrollbar {
+      width: 6px;
+    }
+
+    /* Track */
+    ::-webkit-scrollbar-track {
+      background: #f1f1f1;
+    }
+
+    /* Handle */
+    ::-webkit-scrollbar-thumb {
+      background: #888;
+    }
+
+    /* Handle on hover */
+    ::-webkit-scrollbar-thumb:hover {
+      background: #555;
+    }
+
+    .cursor-pointer {
+      cursor: pointer;
+    }
+
+  }
+}
diff --git a/src/app/search-filter/search-filter.page.spec.data.ts b/src/app/search-filter/search-filter.page.spec.data.ts
new file mode 100644
index 000000000..713e40bd3
--- /dev/null
+++ b/src/app/search-filter/search-filter.page.spec.data.ts
@@ -0,0 +1,32 @@
+export const FilterCriteriaData = {
+  facetFilters: [
+      {
+          name: 'board',
+          values: [ { name: 'sample_board_1', apply: true }, { name: 'sample_board_2', apply: false } ]
+      },
+      {
+          name: 'medium',
+          values: [ { name: 'sample_medium_1', apply: true }, { name: 'sample_medium_2', apply: false } ]
+      },
+      {
+          name: 'gradeLevel',
+          values: [ { name: 'sample_gradeLevel_1', apply: true }, { name: 'sample_gradeLevel_2', apply: false } ]
+      },
+      {
+          name: 'subject',
+          values: [ { name: 'sample_subject_1', apply: true }, { name: 'sample_subject_2', apply: false } ]
+      },
+      {
+          name: 'mimeType',
+          values: [ { name: 'sample_mimeType_1', apply: true }, { name: 'sample_mimeType_2', apply: false } ]
+      },
+      {
+          name: 'primaryCategory',
+          values: [ { name: 'sample_primaryCategory_1', apply: true }, { name: 'sample_primaryCategory_2', apply: false } ]
+      },
+      {
+          name: 'audience',
+          values: [ { name: 'sample_audience_1', apply: true }, { name: 'sample_audience_2', apply: false } ]
+      }
+  ]
+}
\ No newline at end of file
diff --git a/src/app/search-filter/search-filter.page.spec.ts b/src/app/search-filter/search-filter.page.spec.ts
new file mode 100644
index 000000000..31a44876e
--- /dev/null
+++ b/src/app/search-filter/search-filter.page.spec.ts
@@ -0,0 +1,164 @@
+import { SearchFilterPage } from './search-filter.page';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ModalController } from '@ionic/angular';
+import { ContentService } from 'sunbird-sdk';
+import { CommonUtilService } from '@app/services';
+import { FilterFormConfigMapper } from '@app/app/search-filter/filter-form-config-mapper';
+import { Location } from '@angular/common';
+import {of} from 'rxjs';
+import { FormAndFrameworkUtilService } from '../../services';
+import { FilterCriteriaData } from './search-filter.page.spec.data';
+
+describe('SearchFilterPage', () => {
+    let searchFilterPage: SearchFilterPage;
+    const mockRouterExtras = {
+        extras: {
+            state: undefined
+        }
+    };
+    const mockRouter: Partial<Router> = {
+        navigate: () => Promise.resolve(),
+        getCurrentNavigation: jest.fn(() => mockRouterExtras),
+    };
+    const mockActivatedRoute: Partial<ActivatedRoute> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        getLoader: () => ({
+            present: () => Promise.resolve(),
+            dismiss: () => Promise.resolve(),
+        }),
+        translateMessage: (arg) => arg
+    };
+    const mockContentService: Partial<ContentService> = {};
+    const mockLocation: Partial<Location> = {};
+    const mockModalController: Partial<ModalController> = {};
+    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {
+        changeChannelIdToName: jest.fn(()=>Promise.resolve(FilterCriteriaData)),
+        changeChannelNameToId: jest.fn(()=>Promise.resolve(FilterCriteriaData))
+    };
+
+    JSON.parse = jest.fn().mockImplementationOnce(() => {
+        return FilterCriteriaData;
+    });
+
+    beforeAll(() => {
+        searchFilterPage = new SearchFilterPage(
+            mockContentService as ContentService,
+            mockActivatedRoute as ActivatedRoute,
+            mockRouter as Router,
+            mockLocation as Location,
+            mockModalController as ModalController,
+            mockCommonUtilService as CommonUtilService,
+            new FilterFormConfigMapper(mockCommonUtilService),
+            mockFormAndFrameworkUtilService as FormAndFrameworkUtilService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should create instance of filterFormPage', () => {
+        expect(searchFilterPage).toBeTruthy();
+    });
+
+    describe('when loaded', () => {
+        it('should initialise page with appropriate configurations', () => {
+            // arrange
+            searchFilterPage['initialFilterCriteria'] = FilterCriteriaData;
+            
+            // act
+            searchFilterPage.ngOnInit();
+            
+            // assert
+            setTimeout(() => {
+                expect(searchFilterPage.baseSearchFilter).toEqual({
+                    board: 'sample_board_1',
+                    medium: ['sample_medium_1'],
+                    gradeLevel: ['sample_gradeLevel_1'],
+                    subject: ['sample_subject_1'],
+                    mimeType: ['sample_mimeType_1'],
+                    primaryCategory: ['sample_primaryCategory_1'],
+                    audience: ['sample_audience_1'],
+                });
+                expect(searchFilterPage.filterFormTemplateConfig).toEqual([
+                    expect.objectContaining({ facet: 'board' }),
+                    expect.objectContaining({ facet: 'medium' }),
+                    expect.objectContaining({ facet: 'gradeLevel' }),
+                    expect.objectContaining({ facet: 'subject' }),
+                    expect.objectContaining({ facet: 'mimeType' }),
+                    expect.objectContaining({ facet: 'primaryCategory' }),
+                    expect.objectContaining({ facet: 'audience' }),
+                ]);
+            }, 0);
+        });
+    });
+
+    describe('when form is reset', () => {
+        it('should delegate form reset to SbSearchFacetFilterComponent', () => {
+            // arrange
+            searchFilterPage.searchFilterComponent = {
+                resetFilter: jest.fn()
+            };
+
+            // act
+            searchFilterPage.resetFilter();
+
+            // assert
+            expect(searchFilterPage.searchFilterComponent.resetFilter).toHaveBeenCalled();
+        });
+    });
+
+    describe('when form is applied', () => {
+        it('should dismiss current modal return selections', () => {
+            // arrange
+            mockModalController.dismiss = jest.fn(() => {}) as any;
+            searchFilterPage['initialFilterCriteria'] = FilterCriteriaData;
+
+            // act
+            searchFilterPage.ngOnInit();
+            searchFilterPage.applyFilter();
+            // assert
+            setTimeout(() => {
+                expect(mockModalController.dismiss).toHaveBeenCalledWith(expect.objectContaining({
+                    appliedFilterCriteria: FilterCriteriaData
+                }));
+            }, 0);
+        });
+    });
+
+    describe('when form is cancelled', () => {
+        it('should dismiss current modal', () => {
+            // arrange
+            mockModalController.dismiss = jest.fn(() => {}) as any;
+            // act
+            searchFilterPage.cancel();
+            // assert
+            setTimeout(() => {
+                expect(mockModalController.dismiss).toHaveBeenCalled();
+            });
+        });
+    });
+
+    describe('when a selection is made', () => {
+        it('should refresh form with new facets from search results', () => {
+            // arrange
+            const sampleFilterCriteria = FilterCriteriaData;
+            searchFilterPage['initialFilterCriteria'] = sampleFilterCriteria;
+            mockContentService.searchContent = jest.fn(() => of({filterCriteria: sampleFilterCriteria}));
+
+            // act
+            searchFilterPage.ngOnInit();
+            searchFilterPage.valueChanged({
+                board: 'sample_board_2',
+                medium: [
+                    'sample_medium_2'
+                ]
+            });
+
+            setTimeout(() => {
+                expect(mockContentService.searchContent).toHaveBeenCalled();
+            });
+        });
+    });
+});
diff --git a/src/app/search-filter/search-filter.page.ts b/src/app/search-filter/search-filter.page.ts
new file mode 100644
index 000000000..1613e141a
--- /dev/null
+++ b/src/app/search-filter/search-filter.page.ts
@@ -0,0 +1,138 @@
+import {Component, Inject, Input, OnInit, ViewChild} from '@angular/core';
+import {ActivatedRoute, Router} from '@angular/router';
+import {Location, TitleCasePipe} from '@angular/common';
+import {ModalController} from '@ionic/angular';
+import {ContentService, ContentSearchCriteria, ContentSearchResult, SearchType, ContentSearchFilter} from 'sunbird-sdk';
+import {FilterFormConfigMapper} from '@app/app/search-filter/filter-form-config-mapper';
+import {CommonUtilService, FormAndFrameworkUtilService} from '@app/services';
+import {FieldConfig, IFacetFilterFieldTemplateConfig, SbSearchFacetFilterComponent} from 'common-form-elements';
+
+@Component({
+    selector: 'app-search-filter.page',
+    templateUrl: './search-filter.page.html',
+    styleUrls: ['./search-filter.page.scss'],
+    providers: [FilterFormConfigMapper, TitleCasePipe]
+})
+export class SearchFilterPage implements OnInit {
+    @Input('initialFilterCriteria') initialFilterCriteria: ContentSearchCriteria;
+    @ViewChild('sbSearchFilterComponent', { static: false }) searchFilterComponent?: SbSearchFacetFilterComponent;
+    @Input('defaultFilterCriteria') readonly defaultFilterCriteria: ContentSearchCriteria;
+    @Input('resetData') resetData: boolean;
+
+    public config: FieldConfig<any>[];
+
+    public baseSearchFilter?: { [key: string]: string[] | string | undefined };
+    public filterFormTemplateConfig?: IFacetFilterFieldTemplateConfig[];
+    public searchResultFacets: ContentSearchFilter[];
+
+    private appliedFilterCriteria: ContentSearchCriteria;
+    private isPageLoadedFirstTime: boolean;
+
+    constructor(
+        @Inject('CONTENT_SERVICE') private contentService: ContentService,
+        private activatedRoute: ActivatedRoute,
+        private router: Router,
+        private location: Location,
+        private modalController: ModalController,
+        private commonUtilService: CommonUtilService,
+        private filterFormConfigMapper: FilterFormConfigMapper,
+        private formAndFrameworkUtilService: FormAndFrameworkUtilService
+    ) {
+    }
+
+    ngOnInit() {
+        this.isPageLoadedFirstTime = true;
+        this.initilizeSearchFilter();
+    }
+
+    private async initilizeSearchFilter(){
+        this.initialFilterCriteria = await this.formAndFrameworkUtilService.changeChannelIdToName(this.initialFilterCriteria);
+        this.appliedFilterCriteria = JSON.parse(JSON.stringify(this.initialFilterCriteria));
+        if (!this.filterFormTemplateConfig) {
+            const {config, defaults} = this.buildConfig(this.appliedFilterCriteria);
+            this.filterFormTemplateConfig = config;
+            this.baseSearchFilter = defaults;
+        }
+        this.searchResultFacets = this.appliedFilterCriteria.facetFilters || [];
+    }
+
+    resetFilter() {
+        if (this.searchFilterComponent) {
+            this.searchFilterComponent.resetFilter(true);
+        }
+    }
+
+    applyFilter() {
+        this.modalController.dismiss({
+            appliedFilterCriteria: this.formAndFrameworkUtilService.changeChannelNameToId(this.appliedFilterCriteria)
+        });
+    }
+
+    cancel() {
+        this.router.navigate([], { relativeTo: this.activatedRoute }).then(() => {
+            this.modalController.dismiss();
+        });
+    }
+
+    private async refreshForm(formValue) {
+        const searchCriteria: ContentSearchCriteria = {
+            ...JSON.parse(JSON.stringify(this.appliedFilterCriteria)),
+            limit: 0,
+            mode: 'hard',
+            searchType: SearchType.FILTER,
+            fields: [],
+        };
+
+        searchCriteria.facetFilters.forEach((facetFilter) => {
+            const selection = formValue[facetFilter.name];
+
+            facetFilter.values.forEach(f => {
+                f.apply = !(!selection || selection.indexOf(f.name) === -1);
+            });
+
+        });
+
+        this.formAndFrameworkUtilService.changeChannelNameToId(searchCriteria);
+
+        const loader = await this.commonUtilService.getLoader();
+        await loader.present();
+
+        try {
+            const contentSearchResult: ContentSearchResult = await this.contentService.searchContent(searchCriteria).toPromise();
+            this.appliedFilterCriteria = await this.formAndFrameworkUtilService.changeChannelIdToName(contentSearchResult.filterCriteria);
+            this.searchResultFacets = this.appliedFilterCriteria.facetFilters || [];
+        } catch (e) {
+            // todo show error toast
+            console.error(e);
+        } finally {
+            await loader.dismiss();
+        }
+    }
+
+    private buildConfig(filterCriteria: ContentSearchCriteria) {
+        return this.filterFormConfigMapper.map(
+            filterCriteria.facetFilters.reduce((acc, f) => {
+                acc[f.name] = f.values;
+                return acc;
+            }, {})
+        );
+    }
+
+    valueChanged(event) {
+        if (!event) {
+            return;
+        }
+        if (this.isPageLoadedFirstTime) {
+            this.isPageLoadedFirstTime = false;
+            if (this.resetData) {
+                setTimeout(() => {
+                    this.resetFilter();
+                }, 500);
+                this.resetData = false;
+            }
+            return;
+        }
+
+        this.refreshForm(event);
+    }
+}
diff --git a/src/app/search/filters/filters.page.html b/src/app/search/filters/filters.page.html
index f38c0971e..b994ae4a6 100644
--- a/src/app/search/filters/filters.page.html
+++ b/src/app/search/filters/filters.page.html
@@ -1,26 +1,28 @@
 <ion-content>
-  <h6 class="subtitle ion-padding ion-no-margin">{{ 'FILTER_BY' | translate }} </h6>
+  <div class="subtitle ion-padding ion-no-margin">
+    <h6 style="display:inline-block;" >{{ 'FILTER_BY' | translate }}</h6>
+    <ion-button color="dark" class="reset_button" fill="outline" (click)="reset()">{{ 'RESET' | translate}}
+      <ion-icon name="refresh"></ion-icon>
+    </ion-button>
+  </div>
   <div *ngIf="facetsFilter && facetsFilter.length">
     <div *ngFor="let facet of facetsFilter">
       <div class="flex-card-container filter-item" (click)="openFilterOptions(facet)">
         <div class="card-text">
-          <ion-label *ngIf="facet?.name === 'board'" text-capitalize>{{ 'BOARD' | translate }}</ion-label>
-          <ion-label *ngIf="facet?.name === 'subject'" text-capitalize>{{ 'SUBJECT' | translate }}</ion-label>
-          <ion-label *ngIf="facet?.name === 'medium'" text-capitalize>{{ 'MEDIUM' | translate }}</ion-label>
-          <ion-label *ngIf="facet?.name === 'gradeLevel'" text-capitalize>{{ 'CLASS' | translate }}</ion-label>
-          <ion-label *ngIf="facet?.name === 'resourceType'" text-capitalize>{{ 'RESOURCE_TYPE' | translate }}
-          </ion-label>
+          <ion-label class="ion-text-capitalize">{{ facet?.translatedName }}</ion-label>
           <ion-label class="text-end">{{ getSelectedOptionCount(facet) }}</ion-label>
         </div>
         <div class="card-icon">
-          <ion-icon name="ios-arrow-forward"></ion-icon>
+          <ion-icon name="arrow-forward"></ion-icon>
         </div>
       </div>
     </div>
   </div>
 </ion-content>
-<ion-footer>
-  <ion-toolbar padding-left padding-right>
-    <ion-button expand="full" color="primary" (click)="applyFilter()">{{ 'APPLY_FILTER' | translate }}</ion-button>
-  </ion-toolbar>
-</ion-footer>
\ No newline at end of file
+<ion-footer class="footer">
+  <ion-row>
+    <ion-col>
+    <ion-button expand="block" [disabled]="!shouldEnableFilter" (click)="applyFilter()">{{ 'APPLY_FILTER' | translate }}</ion-button>
+    </ion-col>
+  </ion-row>
+</ion-footer>
diff --git a/src/app/search/filters/filters.page.scss b/src/app/search/filters/filters.page.scss
index f50277927..3f5fc6f6a 100644
--- a/src/app/search/filters/filters.page.scss
+++ b/src/app/search/filters/filters.page.scss
@@ -32,7 +32,7 @@
       flex-wrap: nowrap;
       align-items:center;
       justify-content:center;
-      background-color:#f1f1f1;
+      background-color: map-get($colors, white_f1);
       padding: 23px;
       margin-bottom: 12px;
       .card-text {
@@ -44,5 +44,14 @@
     }
     .text-end {
       float: right;
-    }   
+    }
+    .footer{
+      background: #FFF;
+      bottom: 0;
+   }
+   .reset_button{
+     float: right;
+     height: 30px;
+     margin-top: 8px;
+   }
   }
\ No newline at end of file
diff --git a/src/app/search/filters/filters.page.spec.data.ts b/src/app/search/filters/filters.page.spec.data.ts
new file mode 100644
index 000000000..32c102d88
--- /dev/null
+++ b/src/app/search/filters/filters.page.spec.data.ts
@@ -0,0 +1,240 @@
+export const mockFilterCriteria = {
+    query: 'hindi',
+    limit: 100,
+    offset: 0,
+    facets: [
+      'board',
+      'gradeLevel',
+      'subject',
+      'medium',
+      'primaryCategory',
+      'publisher',
+      'mimeType',
+      'audience'
+    ],
+    primaryCategorie: [
+      'Course',
+      'Learning Resource',
+      'Explanation Content',
+      'Teacher Resource',
+      'Content Playlist',
+      'Digital Textbook',
+      'Practice Question Set',
+      'eTextBook',
+      'Course Assessment'
+    ],
+    sortCriteria: [],
+    mode: 'hard',
+    facetFilters: [
+      {
+        name: 'gradeLevel',
+        values: [
+          {
+            name: 'other',
+            count: 147,
+            apply: false
+          },
+          {
+            name: 'class 10',
+            count: 2860,
+            apply: false
+          }
+        ],
+        translatedName: 'Class'
+      },
+      {
+        name: 'audience',
+        values: [
+          {
+            name: 'instructor',
+            count: 40,
+            apply: false
+          },
+          {
+            name: 'student',
+            count: 13457,
+            apply: true
+          },
+          {
+            name: 'learner',
+            count: 1833,
+            apply: true
+          }
+        ]
+      },
+      {
+        name: 'primaryCategory',
+        values: [
+          {
+            name: 'template',
+            count: 3,
+            apply: false
+          },
+          {
+            name: 'course assessment',
+            count: 1,
+            apply: false
+          }
+        ]
+      },
+      {
+        name: 'subject',
+        values: [
+          {
+            name: 'physical education',
+            count: 1,
+            apply: false
+          }
+        ]
+      },
+      {
+        name: 'medium',
+        values: [
+          {
+            name: 'gujarati',
+            count: 12,
+            apply: false
+          }
+        ],
+        translatedName: 'Medium'
+      },
+      {
+        name: 'mimeType',
+        values: [
+          {
+            name: 'INTERACTION',
+            count: 3567,
+            values: [
+              {
+                name: 'application/vnd.ekstep.h5p-archive',
+                count: 85,
+                apply: false
+              },
+              {
+                name: 'application/vnd.ekstep.html-archive',
+                count: 54,
+                apply: false
+              },
+              {
+                name: 'application/vnd.ekstep.ecml-archive',
+                count: 3428,
+                apply: false
+              }
+            ],
+            apply: false
+          },
+          {
+            name: 'VIDEO',
+            count: 3815,
+            values: [
+              {
+                name: 'video/webm',
+                count: 94,
+                apply: false
+              },
+              {
+                name: 'video/x-youtube',
+                count: 803,
+                apply: false
+              },
+              {
+                name: 'video/mp4',
+                count: 2918,
+                apply: false
+              }
+            ],
+            apply: false
+          },
+          {
+            name: 'DOC',
+            count: 1690,
+            values: [
+              {
+                name: 'application/pdf',
+                count: 1610,
+                apply: false
+              },
+              {
+                name: 'application/epub',
+                count: 80,
+                apply: false
+              }
+            ],
+            apply: false
+          },
+          {
+            name: 'AUDIO',
+            count: 4221,
+            values: [
+              {
+                name: 'audio/ogg',
+                count: 4,
+                apply: false
+              },
+              {
+                name: 'audio/mp3',
+                count: 3236,
+                apply: false
+              },
+              {
+                name: 'audio/wav',
+                count: 981,
+                apply: false
+              }
+            ],
+            apply: false
+          }
+        ]
+      },
+      {
+        name: 'board',
+        values: [
+          {
+            name: 'other',
+            count: 38,
+            apply: false
+          },
+          {
+            name: 'state (kerala)',
+            count: 37,
+            apply: false
+          }
+        ],
+        translatedName: 'Board/Syllabus'
+      }
+    ],
+    impliedFiltersMap: [
+      {
+        compatibilityLevel: {
+          min: 1,
+          max: 4
+        }
+      },
+      {
+        contentType: []
+      },
+      {
+        language: []
+      },
+      {
+        topic: []
+      },
+      {
+        purpose: []
+      },
+      {
+        channel: []
+      }
+    ],
+    impliedFilters: [
+      {
+        name: 'objectType',
+        values: [
+          {
+            name: 'Content',
+            apply: true
+          }
+        ]
+      }
+    ]
+  };
diff --git a/src/app/search/filters/filters.page.spec.ts b/src/app/search/filters/filters.page.spec.ts
new file mode 100644
index 000000000..93b93777e
--- /dev/null
+++ b/src/app/search/filters/filters.page.spec.ts
@@ -0,0 +1,107 @@
+
+import { FiltersPage } from './filters.page';
+import { ContentService } from '@project-sunbird/sunbird-sdk';
+import { Platform, PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import {
+    CommonUtilService,
+    TelemetryGeneratorService,
+    AppHeaderService
+} from '../../../services';
+import { Router } from '@angular/router';
+import { of } from 'rxjs';
+import { Location } from '@angular/common';
+import { mockSupportedUserTypeConfig } from '../../../services/profile-handler.spec.data';
+import { mockFilterCriteria } from './filters.page.spec.data';
+describe('FiltersPage', () => {
+    let filtersPage: FiltersPage;
+
+    const mockContentService: Partial<ContentService> = {
+        searchContent: jest.fn(() => of({ filterCriteria: mockFilterCriteria } as any))
+    };
+
+    const mockPopOverConroller: Partial<PopoverController> = {};
+    const mockEvents: Partial<Events> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        getLoader: jest.fn(() => {
+            return {
+                present: jest.fn(),
+                dismiss: jest.fn()
+            };
+        }),
+        showToast: jest.fn(),
+        translateMessage: jest.fn(() => ('translated_message')),
+        deDupe: jest.fn((array, property) => {
+            return array.filter((obj, pos, arr) => {
+                return arr.map(mapObj => mapObj[property]).indexOf(obj[property]) === pos;
+            });
+        })
+    };
+    const mockPlatform: Partial<Platform> = {
+    };
+    mockPlatform.backButton = {
+        subscribeWithPriority: jest.fn((_, fn) => fn()),
+
+    } as any;
+
+    const mockLocation: Partial<Location> = {
+        back: jest.fn()
+    };
+
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => ({
+            extras: {
+                state: {
+                    filterCriteria: mockFilterCriteria,
+                    initialfilterCriteria: mockFilterCriteria,
+                    source: 'library',
+                    supportedUserTypesConfig: mockSupportedUserTypeConfig
+                }
+            }
+        })) as any
+    };
+    const mockAppHeaderService: Partial<AppHeaderService> = {
+    };
+
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateImpressionTelemetry: jest.fn(),
+        generateBackClickedTelemetry: jest.fn(),
+        generateInteractTelemetry: jest.fn()
+    };
+
+
+    beforeAll(() => {
+        filtersPage = new FiltersPage(
+            mockContentService as ContentService,
+            mockPopOverConroller as PopoverController,
+            mockEvents as Events,
+            mockCommonUtilService as CommonUtilService,
+            mockPlatform as Platform,
+            mockLocation as Location,
+            mockRouter as Router,
+            mockAppHeaderService as AppHeaderService,
+            mockTelemetryGeneratorService as TelemetryGeneratorService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create a instance of FiltersPage', () => {
+        expect(filtersPage).toBeTruthy();
+    });
+
+    describe('applyInterimFilter', () => {
+        it('should invoke searchContent API', (done) => {
+            // arrange
+            // act
+            filtersPage.applyInterimFilter().then(() => {
+                // assert
+                expect(mockContentService.searchContent).toHaveBeenCalled();
+                done();
+            });
+
+        });
+    });
+});
diff --git a/src/app/search/filters/filters.page.ts b/src/app/search/filters/filters.page.ts
index c0fa2eb0c..621b3869c 100644
--- a/src/app/search/filters/filters.page.ts
+++ b/src/app/search/filters/filters.page.ts
@@ -1,6 +1,6 @@
-import { Component } from '@angular/core';
-import { NavParams, PopoverController, NavController, Events, Platform } from '@ionic/angular';
-import orderBy from 'lodash/orderBy';
+import { Component, Inject, OnDestroy } from '@angular/core';
+import { PopoverController, Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import find from 'lodash/find';
 import { CommonUtilService } from '@app/services/common-util.service';
 import { Subscription } from 'rxjs';
@@ -12,23 +12,29 @@ import { TelemetryGeneratorService } from '@app/services/telemetry-generator.ser
 import {
   Environment, InteractSubtype, InteractType, PageId
 } from '@app/services/telemetry-constants';
+import { ContentService, ContentSearchResult, SearchType } from 'sunbird-sdk';
+import { ContentUtil } from '@app/util/content-util';
+
 @Component({
   selector: 'app-filters',
   templateUrl: './filters.page.html',
   styleUrls: ['./filters.page.scss']
 })
-export class FiltersPage {
+export class FiltersPage implements OnDestroy {
 
   filterCriteria: any;
+  initialFilterCriteria: any;
 
   facetsFilter: Array<any> = [];
 
   unregisterBackButton: Subscription;
+  source: string;
+  shouldEnableFilter = true;
+  supportedUserTypesConfig: Array<any> = [];
 
   constructor(
-    // private navParams: NavParams,
+    @Inject('CONTENT_SERVICE') private contentService: ContentService,
     private popCtrl: PopoverController,
-    private navCtrl: NavController,
     private events: Events,
     private commonUtilService: CommonUtilService,
     private platform: Platform,
@@ -38,9 +44,21 @@ export class FiltersPage {
     private telemetryGeneratorService: TelemetryGeneratorService
   ) {
     this.filterCriteria = this.router.getCurrentNavigation().extras.state.filterCriteria;
+    this.initialFilterCriteria = this.router.getCurrentNavigation().extras.state.initialfilterCriteria;
+    this.source = this.router.getCurrentNavigation().extras.state.source;
+    this.supportedUserTypesConfig = this.router.getCurrentNavigation().extras.state.supportedUserTypesConfig;
     this.init();
     this.handleBackButton();
-    console.log('filer ciriteria', this.filterCriteria);
+  }
+
+  async ionViewWillEnter() {
+    this.headerService.showHeaderWithBackButton([]);
+  }
+
+  ionViewWillLeave() {
+    if (this.unregisterBackButton) {
+      this.unregisterBackButton.unsubscribe();
+    }
   }
 
   async openFilterOptions(facet) {
@@ -48,7 +66,8 @@ export class FiltersPage {
       component: FilteroptionComponent,
       componentProps:
       {
-        facet: facet
+        facet,
+        source: this.source
       },
       cssClass: 'option-box'
     });
@@ -57,29 +76,38 @@ export class FiltersPage {
     this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
       InteractSubtype.FILTER_CLICKED,
       Environment.HOME,
-      PageId.LIBRARY_SEARCH_FILTER,
+      (this.source && this.source.match('courses')) ? PageId.COURSE_SEARCH_FILTER : PageId.LIBRARY_SEARCH_FILTER,
       undefined,
       values);
     await popUp.present();
+    const { data } = await popUp.onDidDismiss();
+    if (data && data.isFilterApplied) {
+      this.applyInterimFilter();
+    }
+  }
+
+  reset() {
+    this.filterCriteria = JSON.parse(JSON.stringify(this.initialFilterCriteria));
+    this.facetsFilter = [];
+    this.init();
   }
 
   applyFilter() {
-    this.navCtrl.pop();
     const values = {
       appliedFilter: {}
     };
     values.appliedFilter = this.filterCriteria;
     this.telemetryGeneratorService.generateInteractTelemetry(
-        InteractType.TOUCH,
-        InteractSubtype.APPLY_FILTER_CLICKED,
-        Environment.HOME,
-        PageId.LIBRARY_SEARCH_FILTER,
-        undefined,
-        values);
+      InteractType.TOUCH,
+      InteractSubtype.APPLY_FILTER_CLICKED,
+      Environment.HOME,
+      (this.source && this.source.match('courses')) ? PageId.COURSE_SEARCH_FILTER : PageId.LIBRARY_SEARCH_FILTER,
+      undefined,
+      values);
     this.events.publish('search.applyFilter', this.filterCriteria);
+    this.location.back();
   }
 
-
   getSelectedOptionCount(facet) {
     let count = 0;
 
@@ -115,9 +143,20 @@ export class FiltersPage {
         if (facet.name === 'gradeLevel') {
           const maxIndex: number = facet.values.reduce((acc, val) => (val.index && (val.index > acc)) ? val.index : acc, 0);
           facet.values.sort((i, j) => (i.index || maxIndex + 1) - (j.index || maxIndex + 1));
-      } else {
-        facet.values.sort((i, j) => i.name.localeCompare(j.name));
-      }
+        } else if (facet.name === 'audience') {
+          facet.values.sort((i, j) => i.name.localeCompare(j.name));
+          facet.values.forEach((element, index) => {
+            this.supportedUserTypesConfig.forEach((userType, newIndex) => {
+              if (userType['ambiguousFilters'].includes(element.name)) {
+                element.name = userType['code'];
+              }
+            });
+
+          });
+          facet.values = this.commonUtilService.deDupe(facet.values, 'name');
+        } else {
+          facet.values.sort((i, j) => i.name.localeCompare(j.name));
+        }
         facet.values.forEach((element, index) => {
           if (element.name.toUpperCase() === 'other'.toUpperCase()) {
             const elementVal = element;
@@ -152,15 +191,47 @@ export class FiltersPage {
     });
   }
 
-  ionViewWillEnter() {
-    this.headerService.showHeaderWithBackButton([], this.commonUtilService.translateMessage('FILTER'));
+  public async applyInterimFilter() {
+    this.filterCriteria.mode = 'hard';
+    this.filterCriteria.searchType = SearchType.FILTER;
+    this.filterCriteria.fields = [];
+    this.shouldEnableFilter = false;
+    const loader = await this.commonUtilService.getLoader();
+    await loader.present();
+    const modifiedCriteria = JSON.parse(JSON.stringify(this.filterCriteria));
+    modifiedCriteria.facetFilters.forEach(facet => {
+      if (facet.values && facet.values.length > 0) {
+        if (facet.name === 'audience') {
+          facet.values = ContentUtil.getAudienceFilter(facet, this.supportedUserTypesConfig);
+        }
+      }
+    });
+    this.contentService.searchContent(modifiedCriteria).toPromise()
+      .then(async (responseData: ContentSearchResult) => {
+        await loader.dismiss();
+        this.shouldEnableFilter = true;
+        if (responseData) {
+          this.facetsFilter = [];
+          this.filterCriteria = undefined;
+          this.filterCriteria = responseData.filterCriteria;
+          responseData.filterCriteria.facetFilters.forEach(element => {
+            this.initialFilterCriteria.facetFilters.forEach(item => {
+              if (element.name === item.name) {
+                element['translatedName'] = item.translatedName;
+                return;
+              }
+            });
+          });
+          this.init();
+        }
+      }).catch(async () => {
+        await loader.dismiss();
+        this.shouldEnableFilter = true;
+      });
   }
 
-  ionViewWillLeave() {
-    // Unregister the custom back button action for this page
-    if (this.unregisterBackButton) {
-      this.unregisterBackButton.unsubscribe();
-    }
+  ngOnDestroy() {
+    this.events.publish('update_back_header', true);
   }
 
 }
diff --git a/src/app/search/search.module.ts b/src/app/search/search.module.ts
index aadcc6403..fa3babe49 100644
--- a/src/app/search/search.module.ts
+++ b/src/app/search/search.module.ts
@@ -10,7 +10,7 @@ import { ComponentsModule } from '../components/components.module';
 import { PipesModule } from '../../pipes/pipes.module';
 import { DirectivesModule } from '../../directives/directives.module';
 import { TranslateModule } from '@ngx-translate/core';
-import { CommonConsumptionModule } from '@project-sunbird/common-consumption';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
 
 
 const routes: Routes = [
@@ -33,7 +33,9 @@ const routes: Routes = [
     CommonConsumptionModule
   ],
   entryComponents: [],
-  declarations: [SearchPage],
+  declarations: [
+    SearchPage
+  ],
 
 })
 export class SearchPageModule {}
diff --git a/src/app/search/search.page.html b/src/app/search/search.page.html
index 4db04bf03..8ccdf02c3 100644
--- a/src/app/search/search.page.html
+++ b/src/app/search/search.page.html
@@ -1,214 +1,231 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-input type="search" *ngIf="!dialCode" #searchInput dir="{{commonUtilService.getAppDirection()}}"
-      class="search-input" (keyup.enter)="handleSearch()"
-      (ngModelChange)="searchContentResult = undefined; filterIcon = false; isEmptyResult = false"
-      [(ngModel)]="searchKeywords" [placeholder]="'SEARCH_PLACEHOLDER' | translate"></ion-input>
-    <ion-buttons slot="start">
-      <ion-button icon-only (click)="goBack()">
-        <ion-icon name="arrow-back"></ion-icon>
-      </ion-button>
-    </ion-buttons>
-    <ion-buttons class="search-buttons-group" slot="primary" *ngIf="!dialCode">
-      <ion-button icon-only (click)="handleSearch()" *ngIf="searchKeywords && !filterIcon">
-        <img style="width: 18px; height: 18px" src="./assets/imgs/ic_action_search.svg" alt="search">
-      </ion-button>
-      <ion-button icon-only (click)="handleCancel()" *ngIf="filterIcon">
-        <img style="width: 18px; height: 18px" src="./assets/imgs/ic_action_close.svg" alt="close">
-      </ion-button>
-      <ion-button icon-only (click)="showFilter()" *ngIf="filterIcon">
-        <img style="width: 18px; height: 18px" src="./assets/imgs/ic_action_filter.svg" alt="filter">
-      </ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-header>
 <ion-content #contentView class="search-bg">
-  <ng-container *ngIf="searchHistory$">
-    <ng-container *ngIf="searchHistory$ | async as searchHistory">
-      <ng-container *ngIf="!(
-                  showLoader ||
-                  isEmptyResult ||
-                  displayDialCodeResult ||
-                  (dialCodeContentResult && dialCodeContentResult.length) ||
-                  (searchContentResult && searchContentResult.length) ||
-                  (!showLoader && showEmptyMessage)
-            )">
-        <ng-container *ngIf="!searchHistory.length && !searchKeywords">
-          <div class="sb-no-search-history text-center">
-            <span>
-              {{'SEARCH_TO_FIND_CONTENT' | translate: {'%s': appName} }}
-            </span>
-          </div>
-        </ng-container>
+  <div class="spinner-div" *ngIf="refresh">
+      <ion-spinner icon="spiral" class="refreshspinner"></ion-spinner>
+  </div>
+  <ion-refresher #refresher slot="fixed" (ionRefresh)="discoverCmp.doRefresh($event)">
+      <ion-refresher-content refreshingSpinner="circles"></ion-refresher-content>
+  </ion-refresher>
+  <div class="container-focus sticky-position">
+    <div class="search-info pt-16 mx-24">
+      <div [@labelVisibility]="searchInfolVisibility">
+        <strong class="title">{{'SEARCH_IN_APP' | translate: {'app_name': appName} }}</strong>
+        <p class="description">{{'SEARCH_IN_APP_DESCRIPTION' | translate: {'app_name': appName} }}</p>
+      </div>
+    </div>
+    <div class="search-container" [ngClass]="{'search-filter': filterIcon, '': !filterIcon}">
+      <div class="search-input d-flex">
+        <ion-input type="search" *ngIf="!dialCode" #searchInput dir="{{commonUtilService.getAppDirection()}}"
+          class="search-input" (keyup.enter)="handleSearch()" (ionFocus)="searchOnFocus()"
+          (ngModelChange)="searchContentResult = undefined; filterIcon = false; isEmptyResult = false"
+          [(ngModel)]="searchKeywords" [placeholder]="'SEARCH_HINT' | translate">
+        </ion-input>
+        <button (click)="handleSearch()" *ngIf="!filterIcon || isFromGroupFlow">
+          <img src="assets/imgs/search.svg" alt="search">
+        </button>
+        <button (click)="handleCancel()" *ngIf="filterIcon && searchKeywords">
+          <img src="assets/imgs/ic_action_close.svg" alt="search">
+        </button>
+      </div>
+      <div class="filter-btn" *ngIf="filterIcon">
+        <button (click)="showFilter()">
+          <img src="assets/imgs/filter.svg" alt="search">
+        </button>
+      </div>
+    </div>
+  </div>
 
-        <ng-container *ngIf="searchKeywords">
-          <div class="sb-search-history-entry sb-search-header-meta row">
-            <div class="col-auto invisible">
-              <img src="assets/imgs/icon_recent.svg" alt="recent">
-            </div>
-            <div class="col" (click)="handleSearch()">
-              {{'SEE_ALL_RESULTS_FOR' | translate: {'%s': searchKeywords} }}
-            </div>
-            <div class="col-auto">
-              <img style="width: 14px; height: 14px" src="./assets/imgs/ic_action_search.svg" alt="search">
+  <ng-container *ngIf="enableSearch">
+    <ng-container *ngIf="searchHistory$">
+      <ng-container *ngIf="searchHistory$ | async as searchHistory">
+        <ng-container *ngIf="!(
+                    showLoader ||
+                    isEmptyResult ||
+                    displayDialCodeResult ||
+                    (dialCodeContentResult && dialCodeContentResult.length) ||
+                    (searchContentResult && searchContentResult.length) ||
+                    (!showLoader && showEmptyMessage)
+              )">
+          <ng-container *ngIf="!searchHistory.length && !searchKeywords">
+            <div class="sb-no-search-history text-center">
+              <span>
+                {{'SEARCH_TO_FIND_CONTENT' | translate: {'%s': appName} }}
+              </span>
             </div>
-          </div>
-        </ng-container>
+          </ng-container>
 
-        <ng-container *ngIf="searchHistory.length">
-          <div (click)="onSearchHistoryTap(searchEntry)" *ngFor="let searchEntry of searchHistory"
-            class="sb-search-history-entry row">
-            <div class="col-auto">
-              <img style="width: 14px; height: 14px" src="./assets/imgs/icon_recent.svg" alt="recent">
-            </div>
-            <div class="col">
-              {{searchEntry.query}}
+          <ng-container *ngIf="searchKeywords">
+            <div class="sb-search-history-entry sb-search-header-meta row">
+              <div class="col-auto invisible">
+                <img src="assets/imgs/icon_recent.svg" alt="recent">
+              </div>
+              <div class="col" (click)="handleSearch()">
+                {{'FRMELEMENTS_LBL_SEARCH_SUB_HEADING' | translate: {'appName': appName, 'searchText': searchKeywords} }}
+              </div>
+              <div class="col-auto">
+                <img style="width: 14px; height: 14px" src="./assets/imgs/ic_action_search.svg" alt="search">
+              </div>
             </div>
-            <div class="col-auto">
-              <img style="width: 14px; height: 14px" src="./assets/imgs/ic_action_search_grey.svg" alt="search">
+          </ng-container>
+
+          <ng-container *ngIf="searchHistory.length">
+            <div (click)="onSearchHistoryTap(searchEntry)" *ngFor="let searchEntry of searchHistory"
+              class="sb-search-history-entry row">
+              <div class="col-auto">
+                <img style="width: 14px; height: 14px" src="./assets/imgs/icon_recent.svg" alt="recent">
+              </div>
+              <div class="col">
+                {{searchEntry.query}}
+              </div>
+              <div class="col-auto">
+                <img style="width: 14px; height: 14px" src="./assets/imgs/ic_action_search_grey.svg" alt="search">
+              </div>
             </div>
-          </div>
+          </ng-container>
         </ng-container>
       </ng-container>
     </ng-container>
-  </ng-container>
 
-  <ng-container *ngIf="isEmptyResult">
-    <div class="sb-no-search-history">
-      <span>
-        {{ 'EMPTY_SEARCH_RESULTS' | translate }}
-      </span>
-    </div>
-  </ng-container>
+    <ng-container *ngIf="isEmptyResult">
+      <div class="sb-no-search-history">
+        <span>
+          {{ 'EMPTY_SEARCH_RESULTS' | translate }}
+        </span>
+      </div>
+    </ng-container>
 
-  <div class="m-n" *ngIf="showLoader">
-    <div class="skeleton-header">
-      <app-skeleton-item height="12px" width="75%" style="height:12px; width:75%;"></app-skeleton-item>
-      <app-skeleton-item height="12px" width="40%" style="height:12px; width:40%; margin-top:8px;"></app-skeleton-item>
-    </div>
-    <div class="skeleton-search-card" *ngFor="let i of [0,1,2,3,4,5,6,7,8,9,10,11,12,13]">
-      <ion-avatar slot="end" class="skleton-avatar">
-        <app-skeleton-item height="56px" width="56px" style="height:56px; width:56px;"></app-skeleton-item>
-      </ion-avatar>
-      <div style=" flex: 22 auto;">
-        <app-skeleton-item height="12px" width="40%" style="height:12px; width:100%; padding-bottom: 8px;">
-        </app-skeleton-item>
-        <app-skeleton-item height="12px" width="30%"
-          style="height:12px; width:100%; padding-bottom: 8px;margin-top:8px;"></app-skeleton-item>
+    <div class="m-n" *ngIf="showLoader">
+      <div class="skeleton-header">
+        <app-skeleton-item height="12px" width="75%" style="height:12px; width:75%;"></app-skeleton-item>
+        <app-skeleton-item height="12px" width="40%" style="height:12px; width:40%; margin-top:8px;"></app-skeleton-item>
+      </div>
+      <div class="skeleton-search-card" *ngFor="let i of [0,1,2,3,4,5,6,7,8,9,10,11,12,13]">
+        <ion-avatar slot="end" class="skleton-avatar">
+          <app-skeleton-item height="56px" width="56px" style="height:56px; width:56px;"></app-skeleton-item>
+        </ion-avatar>
+        <div style=" flex: 22 auto;">
+          <app-skeleton-item height="12px" width="40%" style="height:12px; width:100%; padding-bottom: 8px;">
+          </app-skeleton-item>
+          <app-skeleton-item height="12px" width="30%"
+            style="height:12px; width:100%; padding-bottom: 8px;margin-top:8px;"></app-skeleton-item>
+        </div>
       </div>
     </div>
-  </div>
-  <!-- Testing here  -->
-  <ion-list no-lines *ngIf="displayDialCodeResult" class="collection-list" class="search-bg">
-    <div *ngFor="let resultlist of displayDialCodeResult">
-
-      <!-- Course -->
-      <div
-        *ngIf="resultlist && resultlist.isCourse && resultlist.dialCodeContentResult && resultlist.dialCodeContentResult.length">
-        <div class="sb-textbook-container">
-          <div class="sb-textbook-items">
-            <div class="sb-textbook-title-container">
-              <span class="textbook-icon">
-                <ion-icon ios="ios-albums" md="md-albums"></ion-icon>
-              </span>
-              <span class="textbook-title">
-                Courses
-              </span>
-            </div>
-            <!-- Card style -->
-            <div class="sb-card-container sb-card-textbook-container">
-              <div class="sb-card"
-                *ngFor="let content of resultlist.dialCodeContentResult; let last = last, let i = index"
-                (click)="openContent(undefined, content, i)">
-                <div class="img-container" style="display: flex;
-                  justify-content: center;
-                  flex-direction: column;
-                  text-align: center;
-                  overflow: hidden;">
-                  <img src="{{ content?.courseLogoUrl || content?.appIcon || defaultAppIcon }}" alt="content-logo">
-                </div>
-                <div class="sb-card-details">
-                  <div class="title">
-                    {{ (content.name && content.name.length > 30) ? (content.name | slice:0:30) + '...' : (content.name) }}
-                  </div>
-                  <div class="grade_ellipsis">
-                    <span class="info subject">{{ content.size | fileSize: 0}}</span>
-                  </div>
+    <!-- Testing here  -->
+    <ion-list no-lines *ngIf="displayDialCodeResult" class="collection-list" class="search-bg">
+      <div *ngFor="let resultlist of displayDialCodeResult">
+
+        <!-- Course -->
+        <div
+          *ngIf="resultlist && resultlist.isCourse && resultlist.dialCodeContentResult && resultlist.dialCodeContentResult.length">
+          <div class="sb-textbook-container">
+            <div class="sb-textbook-items">
+              <div class="sb-textbook-title-container">
+                <span class="textbook-title">
+                  {{'COURSES' | translate}}
+                </span>
+              </div>
+              <div class="sb-card-container sb-card-textbook-container">
+                <div *ngFor="let content of resultlist.dialCodeContentResult; let last = last, let i = index">
+                  <sb-course-card appContentDirection class="sb-card-grid__item" [course]="content"
+                    (click)="openContent(undefined, content, i);" [cardImg]="content?.appIcon || content?.courseLogoUrl || defaultAppIcon" [section]="null">
+                  </sb-course-card>
                 </div>
               </div>
             </div>
           </div>
         </div>
-      </div>
 
-      <div *ngIf="resultlist && !resultlist.isCourse">
-        <div class="px-8">
-          <div class="pt-8">
-            <p class="results-count" *ngIf="resultlist.dialCodeContentResult || resultlist.dialCodeResult">
-              {{'QR_SHOWING_MULTIPLE_BOOK_RESULT' | translate:{'%s': getContentCount(resultlist)} }}
-              <strong>"{{resultlist.dialCodeContentResult[0]?.dialcodes[0] || resultlist.dialCodeResult[0]?.content[0]?.dialcodes[0]}}"</strong>
-            </p>
-          </div>
-          <!-- Collection List -->
-          <div *ngFor="let result of resultlist.dialCodeResult" class="ion-no-padding ion-no-margin">
-
-            <div *ngIf="result && result.content && result.content.length">
-              <div *ngFor="let content of result.content; let last = last, let i = index"
-                class="content-list ion-no-padding">
-                <sb-library-card [content]="result" [type]="LibraryCardTypes.QRCODE_RESULT"
-                  (click)="openContent(result, content, i);" [cardImg]="result?.appIcon || defaultAppIcon"
-                  [moreInfoLabel]="'Section'" [section]="content.name">
-                </sb-library-card>
+        <div *ngIf="resultlist && !resultlist.isCourse">
+          <div class="px-8">
 
-                <div *ngIf="!last" class="inner-divider"></div>
+            <div class="pt-8">
+              <p class="results-count" *ngIf="resultlist.dialCodeContentResult || resultlist.dialCodeResult">
+                {{'QR_SHOWING_MULTIPLE_BOOK_RESULT' | translate:{'%s': getContentCount(displayDialCodeResult)} }}
+                <strong>"{{resultlist.dialCodeContentResult[0]?.dialcodes[0] || resultlist.dialCodeResult[0]?.content[0]?.dialcodes[0]}}"</strong>
+              </p>
+            </div>
+            <!-- Collection List -->
+            <div class="sb-textbook-title-container">
+              <span class="textbook-title">{{'TEXTBOOKS' | translate}}</span>
+            </div>
+            <div *ngFor="let result of resultlist.dialCodeResult" class="ion-no-padding ion-no-margin">
+
+              <div *ngIf="result && result.content && result.content.length">
+                <div *ngFor="let content of result.content; let last = last, let i = index"
+                  class="content-list ion-no-padding">
+                  <sb-library-card [content]="result" [type]="LibraryCardTypes.QRCODE_RESULT"
+                    [layoutConfig]="{layout: 'v3'}"
+                    (click)="openContent(result, content, i);" [cardImg]="result?.appIcon || defaultAppIcon"
+                    [moreInfoLabel]="'Section'" [section]="content.name">
+                  </sb-library-card>
+
+                  <div *ngIf="!last" class="inner-divider"></div>
+                </div>
               </div>
             </div>
-          </div>
 
-          <!-- Content List -->
-          <div no-lines *ngIf="resultlist.dialCodeContentResult && resultlist.dialCodeContentResult.length">
-            <div *ngFor="let content of resultlist.dialCodeContentResult; let last = last, let i = index"
-              class="content-list">
-              <sb-library-card [content]="content" [type]="LibraryCardTypes.QRCODE_RESULT"
-                (click)="openContent(content, content, i + ((resultlist && resultlist.dialCodeResult) ? resultlist.dialCodeResult.length : 0) )"
-                [cardImg]="content?.appIcon || defaultAppIcon" [moreInfoLabel]="'Section'">
-              </sb-library-card>
+            <!-- Content List -->
+            <div no-lines *ngIf="resultlist.dialCodeContentResult && resultlist.dialCodeContentResult.length">
+              <div *ngFor="let content of resultlist.dialCodeContentResult; let last = last, let i = index"
+                class="content-list">
+                <sb-library-card [content]="content" [type]="LibraryCardTypes.QRCODE_RESULT"
+                  [layoutConfig]="{layout: 'v3'}"
+                  (click)="openContent(content, content, i + ((resultlist && resultlist.dialCodeResult) ? resultlist.dialCodeResult.length : 0) )"
+                  [cardImg]="content?.appIcon || defaultAppIcon" [moreInfoLabel]="'Section'">
+                </sb-library-card>
 
-              <div *ngIf="!last" class="inner-divider"></div>
+                <div *ngIf="!last" class="inner-divider"></div>
+              </div>
             </div>
           </div>
         </div>
       </div>
-    </div>
-  </ion-list>
-
-  <!-- Testing here -->
+    </ion-list>
 
-  <div *ngIf="dialCodeContentResult && dialCodeContentResult.length">
-    <div class="sb-card-container sb-card-textbook-container">
-      <app-text-book-card class="tb-border-btm"
-        *ngFor="let content of dialCodeContentResult; let i = index; let last = last"
-        (click)="openContent(content, content,i)" [content]="content" [layoutName]="layoutName"></app-text-book-card>
-    </div>
-  </div>
-
-  <div *ngIf="searchContentResult && searchContentResult.length">
-    <div class="sb-search-history-entry sb-search-header-meta row">
-      <div class="col">
-        {{'SHOWING_RESULTS_FOR' | translate: {'%count': searchContentResult.length, '%query': searchKeywords} }}
+    <div *ngIf="searchContentResult && searchContentResult.length">
+      <div class="pills-filter">
+        <sb-pills-grid *ngIf="primaryCategoryFilters && primaryCategoryFilters.length" (select)="handleFilterSelect($event)"
+          [pillsViewType]="PillsViewType.SCROLL"
+          [pillBorder]="PillBorder.ROUND">
+          <sb-pill-item *ngFor="let filter of primaryCategoryFilters"
+            [name]="filter?.name | titlecase"
+            [theme]="(filter?.name === selectedPrimaryCategoryFilter?.name) ? {pillBgColor:appPrimaryColor, pillTextColor:'white'} : {pillBgColor:'white'}"
+            [value]="filter">
+          </sb-pill-item>
+        </sb-pills-grid>
+      </div>
+      <div class="sb-search-history-entry sb-search-header-meta row">
+        <div class="col" *ngIf="searchKeywords">
+          {{'SHOWING_RESULTS_FOR' | translate: {'%count': searchContentResult.length, '%query': searchKeywords} }}
+        </div>
+        <div class="col" *ngIf="!searchKeywords">
+          {{'RECOMMENDATION_BASED_ON_PROFILE' | translate }}
+        </div>
+      </div>
+      <div class="sc-container">
+        <div class="sc-content" *ngFor="let content of searchContentResult; let i = index; let last = last">
+          <sb-library-card [content]="content" [type]="'mobile_textbook'" [isSelected]="content.selected"
+            [layoutConfig]="{layout: 'v3'}"
+            (click)="openContent(undefined, content, i, undefined, true)" [cardImg]="content?.appIcon || defaultAppIcon">
+          </sb-library-card>
+        </div>
       </div>
     </div>
-    <div class="sb-card-container sb-card-textbook-container">
-      <app-text-book-card class="tb-border-btm"
-        *ngFor="let content of searchContentResult; let i = index; let last = last"
-        (click)="openContent(undefined, content,i)" [content]="content" [layoutName]="layoutName"></app-text-book-card>
+    <div class="empty-search-result ion-text-center ion-padding-top" *ngIf="!showLoader && showEmptyMessage">
+      {{ 'EMPTY_SEARCH_RESULTS' | translate }}
     </div>
-  </div>
-  <div class="empty-search-result ion-text-center" *ngIf="!showLoader && showEmptyMessage" padding-top>
-    {{ 'EMPTY_SEARCH_RESULTS' | translate }}
-  </div>
+  </ng-container>
+
+  <ng-container *ngIf="!enableSearch">
+    <app-discover (hideRefresher)="hideRefresher($event)"></app-discover>
+  </ng-container>
 </ion-content>
 
+<div class="add-to-group-btn-container" *ngIf="showAddToGroupButtons">	
+  <button class="open-btn add-to-group-btn" (click)="openSelectedContent()">{{'VIEW_ACTIVITY' | translate}}</button>	
+  <button class="add-btn add-to-group-btn" (click)="addActivityToGroup()">{{'ADD_TO_GROUP_ACTIVITY' | translate}}</button>	
+</div>
+
 <div class="loading-backdrop ion-text-center" *ngIf="showLoading">
   <div class="backdrop-container">
     <ion-label>{{ loadingDisplayText }}</ion-label>
diff --git a/src/app/search/search.page.scss b/src/app/search/search.page.scss
index 3462e40bc..4b1184559 100644
--- a/src/app/search/search.page.scss
+++ b/src/app/search/search.page.scss
@@ -1,6 +1,7 @@
 @import "src/assets/styles/variables";
 @import "src/assets/styles/_custom-mixins";
 @import "src/assets/styles/fonts";
+@import "src/assets/styles/_variables.scss";
 :host{
   .search-buttons-group {
     margin-right: 1rem;
@@ -10,12 +11,12 @@
     display: flex;
     height: 100%;
 
-    color: #666666;
+    color: map-get($colors, granite_gray);
 
     justify-content: center;
     align-items: center;
 
-    background-color: #F3F7FA;
+    background-color: map-get($colors, white_fa);
   }
 
   .sb-search-history-entry {
@@ -37,10 +38,7 @@
   }
 
   .sb-search-header-meta {
-    padding-top: 1rem;
-
-    color: #024F9D;
-    font-size: 1.2rem;
+    color: $blue;
     font-size: 12px;
   }
 
@@ -50,7 +48,7 @@
   }
   
   .collection-list {
-    margin-bottom: 0px !important;
+    margin-bottom: 0 !important;
   }
   
   .item-inner {
@@ -75,16 +73,36 @@
     .divider {
       width: 100%;
       height: 6px;
-      background-color: #f3f3f3;
+      background-color: map-get($colors, $gray-0);
       margin: 20px 0 0 0;
     }
   
     .inner-divider{
       width: 90%;
       height: 3px;
-      background-color: #f3f3f3;
+      background-color: map-get($colors, $gray-0);
       margin:  0 5%;
     }
+
+  .sb-textbook-title-container{
+    height: ($base-block-space * 3);
+    @include margin(null, null, $base-block-space, null);
+    margin-top: 16px;
+    .textbook-icon {
+        height: 17px;	
+        transform: scaleX(-1);
+          @include margin(0, ($base-block-space * 1), 0, 0);
+        color: $tertiary-color;
+    }
+    .textbook-title {
+        height: ($base-block-space * 3);	
+        color: $blue;	
+        font-size: 18px;	
+        font-weight: bold;
+        text-transform: capitalize;
+        line-height: ($base-block-space * 3);
+    }
+}
   
   
     ion-item {
@@ -101,9 +119,7 @@
   
     .content-list {
       margin-bottom: 0 !important;
-      padding-top: 16px;
-  
-  
+      margin-top: 16px;
       .label {
         margin-top: 0 !important;
         margin-bottom: 0 !important;
@@ -115,7 +131,7 @@
       font-size: 1.350em;
       padding: 11px;
       margin: 0;
-      background-color: #f3f3f3;
+      background-color: map-get($colors, $gray-0);
     }
   
     .view-collection {
@@ -127,7 +143,7 @@
       font-size: 14px;
       line-height: 14px;
       span.button-inner{
-        color:#2E92FF;
+        color: map-get($colors, vivid_blue);
       }
       
     }
@@ -148,51 +164,13 @@
     .empty-search-result {
       font-size: 1.2em;
     }
-     
-
-    .search-container{
-      justify-content: center;
-      display: flex;
-      align-items: center;
-      padding: 0 16px;
-      ion-avatar{
-        height: 44px;
-        width: 43px;
-      }
-      .search-item{
-        flex: 1 1 auto;
-        padding-left: 16px;
-        vertical-align: middle;
-        span {
-          color: grey;
-          @extend .font-weight-600;
-          font-size: 14px;
-        }
-        p {
-          @include margin(8px, 0);
-          font-size: 14px !important;
-          @extend .font-weight-600;
-        }
-        h3 {
-          
-          @include margin(8px, 0);
-          font-size: 16px !important;
-          line-height: 1;
-          @extend .font-weight-600;
-        }
-      }
-    }
 
   .ellipsis{
-  
     overflow: hidden !important;
     text-overflow: ellipsis !important;
     color: grey;
-  
-  
   }
   .subject{
-  
     color: grey;
     @extend .font-weight-600;
     font-size: 1.3rem;
@@ -205,9 +183,6 @@
   max-width: 60%;
   vertical-align: top;
   }
-  // .list-md {
-  //   margin: 16px 0 16px !important;
-  // }
   
     .loading-backdrop {
       .backdrop-container {
@@ -226,7 +201,7 @@
           padding-bottom: 16px;
       }
   
-      background-color: #ffffff;
+      background-color: map-get($colors, white);
       height: 100%;
       z-index: 1000;
       opacity: 1 !important;
@@ -237,69 +212,15 @@
     }
   
     ion-header .button-native {
-      --color : $primary-color;
+      --color : #{$primary-color};
     }
   
   .sb-textbook-container {
-    margin-top: ($base-block-space * 2);
     @include padding(($base-block-space * 1));
     width: 100%;
     &:last-child{
         margin-bottom: ($base-block-space * 2);
     }
-  
-    .sb-textbook-items {
-        .sb-textbook-title-container{
-            height: ($base-block-space * 3);
-            @include margin(null, null, $base-block-space, null);
-  
-            .textbook-icon {
-                height: 17px;	
-                transform: scaleX(-1);
-                 @include margin(0, ($base-block-space * 1), 0, 0);
-                color: $tertiary-color;
-            }
-            .textbook-title {
-                height: ($base-block-space * 3);	
-                color: #024F9D;	
-                font-size: 18px;	
-                font-weight: bold;
-                text-transform: capitalize;
-                line-height: ($base-block-space * 3)
-            }
-        }
-    }
-  
-    // .sb-view-all-container {
-    //   width: 100%;
-    //   .sb-view-all-items{
-    //       background-color: $primary-color;
-    //       height: ($base-block-space * 10);
-    //       width: 100%;
-    //       position: relative;
-    //       display: flex;
-    //       align-items: center;
-    //       @include padding(0, ($base-block-space * 1));
-    //       .sb-view-all-title{
-    //           color: $white-color;
-    //           .page-heading{
-    //               font-size: $font-size-base + 2;
-    //               font-weight: bold;
-    //               line-height: 22px;
-    //           }
-          
-    //           .page-info{
-    //               display: block;
-    //               font-size: $font-size-base - 2;
-    //               line-height: 15px;
-    //           }
-    //       }
-    //       .sb-card-scroll-container{
-    //         overflow-x: auto;
-    //         padding: 0 0 8px 0;
-    //       }
-    //   }
-    // }
     
       .sb-view-all-container
     {
@@ -318,12 +239,12 @@
       {
       @include padding($base-block-space * 2);
         .sb-card-res-count{
-              color: #979797;
+              color: map-get($colors, dark_gray);
               font-size: ($font-size-base  - 2);
               line-height: 15px;
         }
       .sb-card-result-content{
-              color: #979797;
+              color: map-get($colors, dark_gray);
               font-size: ($font-size-base  + 2);
               font-weight: 500;
               line-height: 22px;
@@ -333,7 +254,7 @@
     
   
   .sb-separator-line{
-      margin: 0px;
+      margin: 0;
    }
    .sb-card{
     @include margin(0); 
@@ -364,14 +285,14 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
-  };
+  }
 
   .col {
     flex: 1 1 auto;
   }
 
   .skeleton-header{
-    border-bottom: 1px solid #eee;
+    border-bottom: 1px solid map-get($colors, empty_color);
     @include padding(8px);
   }
 
@@ -379,7 +300,7 @@
     @include padding(8px);
     display: flex;
     flex-direction: row-reverse;
-    border-bottom: 1px solid #eee;
+    border-bottom: 1px solid map-get($colors, empty_color);
     box-shadow: 0 -1px 5px 0px rgba(0,0,0,0.1);
   }
 
@@ -397,4 +318,98 @@
 .results-count {
   margin: 0;
   @include padding(8px, null, null, 8px !important);
+}
+
+.add-to-group-btn-container {
+  text-align: center;
+  .add-to-group-btn{
+    color: white;
+    text-align: center;
+    text-decoration: none;
+    display: inline-block;
+    font-size: 16px;
+    cursor: pointer;
+    outline: none;
+    margin: 4px 0 8px;
+    width: 45%;
+    padding: 16px 0 16px 0;
+  }
+  .open-btn {
+    border: 1px solid $blue;
+    background-color: white;
+    color: $blue;
+    margin: 8px;
+  }
+  .add-btn {
+    background-color: $blue;
+    border: none;
+    margin: 8px;
+  }
+}
+.sc-container{
+  .sc-content{
+    margin: 1px 0;
+  }
+}
+
+.search-info {
+  display: flex;
+  .title {
+    font-size: 24px;
+  }
+  .description {
+    color: #333333;
+  }
+}
+
+.search-container {
+  margin: 1rem;
+  .search-input {
+    background-color: var(--app-white);
+    border-radius: 1rem;
+    padding: 0.7rem 1rem;
+    ion-input {
+      border: none;
+      width: 90%;
+      display: inline-block;
+      padding: 0.25rem;
+      font-size: 14px;
+    }
+    button{
+      background-color: transparent;
+      box-shadow: none !important;
+    }
+  }
+}
+
+.search-filter{
+  display: flex;
+  .search-input {
+    width: 85%;
+  }
+  .filter-btn{
+    display: flex;
+    width: 15%;
+    vertical-align: middle;
+    margin-left: 0.5rem;
+    button{
+      width: 100%;
+      box-shadow: 0 0 50px 0 rgba(0,0,0,0.1) !important;
+      background-color: var(--app-primary-header-light);
+    }
+  }
+}
+
+.spinner-div {
+  padding: 40px;
+  background-color: map-get($colors, light_gray);
+  text-align: center;
+  border: none !important;
+}
+
+.sticky-position {
+  position: sticky;
+  z-index: 9;
+  top: 0px;
+  padding-top: 0px !important;
 }
\ No newline at end of file
diff --git a/src/app/search/search.page.spec.ts b/src/app/search/search.page.spec.ts
index 33e262917..e1d80b4d1 100644
--- a/src/app/search/search.page.spec.ts
+++ b/src/app/search/search.page.spec.ts
@@ -1,5 +1,5 @@
 import { SearchPage } from './search.page';
-import { MimeType, ContentType, RouterLinks } from '@app/app/app.constant';
+import { MimeType, RouterLinks } from '@app/app/app.constant';
 import {
     FrameworkService,
     FrameworkUtilService,
@@ -14,7 +14,8 @@ import {
     ContentImportStatus
 } from 'sunbird-sdk';
 import { TranslateService } from '@ngx-translate/core';
-import { Events, Platform, NavController, PopoverController } from '@ionic/angular';
+import { Platform, NavController, PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { Router } from '@angular/router';
 import { AppVersion } from '@ionic-native/app-version/ngx';
 import {
@@ -27,8 +28,12 @@ import { Location } from '@angular/common';
 import { ImpressionType, PageId, Environment, InteractSubtype, InteractType, LogLevel, Mode } from '@app/services/telemetry-constants';
 import { of, throwError } from 'rxjs';
 import { NgZone, ChangeDetectorRef } from '@angular/core';
-import { FormAndFrameworkUtilService } from '../../services';
-
+import { FormAndFrameworkUtilService, AuditType, ImpressionSubtype, GroupHandlerService } from '../../services';
+import { SbProgressLoader } from '@app/services/sb-progress-loader.service';
+import { CsGroupAddableBloc } from '@project-sunbird/client-services/blocs';
+import { NavigationService } from '../../services/navigation-handler.service';
+import { ProfileHandler } from '@app/services/profile-handler';
+import { mockSupportedUserTypeConfig } from '../../services/profile-handler.spec.data';
 describe('SearchPage', () => {
     let searchPage: SearchPage;
     const mockAppGlobalService: Partial<AppGlobalService> = {
@@ -66,10 +71,10 @@ describe('SearchPage', () => {
     };
     const mockPlatform: Partial<Platform> = {};
     const mockProfileService: Partial<ProfileService> = {};
-    const mockRoterExtras = {
+    const mockRouterExtras = {
         extras: {
             state: {
-                contentType: 'contentType',
+                primaryCategories: 'primaryCategories',
                 corRelationList: 'corRelationList',
                 source: 'source',
                 enrolledCourses: 'enrolledCourses' as any,
@@ -79,7 +84,7 @@ describe('SearchPage', () => {
         }
     };
     const mockRouter: Partial<Router> = {
-        getCurrentNavigation: jest.fn(() => mockRoterExtras as any),
+        getCurrentNavigation: jest.fn(() => mockRouterExtras as any),
         navigate: jest.fn(() => Promise.resolve(true))
     };
     const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
@@ -105,7 +110,9 @@ describe('SearchPage', () => {
         putString: jest.fn(),
         getString: jest.fn(() => of('ka' as any))
     };
-    const mockCourseService: Partial<CourseService> = {};
+    const mockCourseService: Partial<CourseService> = {
+        getEnrolledCourses: jest.fn(() => of([]))
+    };
     const mocksearchHistoryService: Partial<SearchHistoryService> = {};
     const mockAppversion: Partial<AppVersion> = {
         getPackageName: jest.fn(() => Promise.resolve('org.sunbird.app')),
@@ -114,9 +121,27 @@ describe('SearchPage', () => {
     const mockchangeDetectionRef: Partial<ChangeDetectorRef> = {};
     const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {
         init: jest.fn(),
-        checkNewAppVersion: jest.fn(() => Promise.resolve({}))
+        checkNewAppVersion: jest.fn(() => Promise.resolve({})),
+        getFormFields: jest.fn(() => Promise.resolve([]))
     };
     const mockPopoverController: Partial<PopoverController> = {};
+    const mockSbProgressLoader: Partial<SbProgressLoader> = {};
+    const mockgroupHandlerService: Partial<GroupHandlerService> = {
+        addActivityToGroup: jest.fn()
+    };
+    const mockNavigationService: Partial<NavigationService> = {
+        navigateTo: jest.fn(),
+        navigateToCollection: jest.fn(),
+        navigateToDetailPage: jest.fn(),
+        navigateToContent: jest.fn(),
+        navigateToTrackableCollection: jest.fn()
+    };
+
+    const mockProfileHandler: Partial<ProfileHandler> = {
+        getSupportedUserTypes: jest.fn(() => Promise.resolve(mockSupportedUserTypeConfig))
+    };
+
+
     beforeAll(() => {
         searchPage = new SearchPage(
             mockContentService as ContentService,
@@ -144,6 +169,10 @@ describe('SearchPage', () => {
             mockLocation as Location,
             mockRouter as Router,
             mockNavCtrl as NavController,
+            mockSbProgressLoader as SbProgressLoader,
+            mockgroupHandlerService as GroupHandlerService,
+            mockNavigationService as NavigationService,
+            mockProfileHandler as ProfileHandler
         );
     });
 
@@ -154,7 +183,7 @@ describe('SearchPage', () => {
 
     it('should create a instance of searchPage', () => {
         expect(searchPage).toBeTruthy();
-        expect(searchPage.contentType).toEqual('contentType');
+        expect(searchPage.primaryCategories).toEqual('primaryCategories');
     });
 
     // arrange
@@ -172,17 +201,6 @@ describe('SearchPage', () => {
             done();
         }, 0);
     });
-    // });
-
-    it('should hide header on ionview will enter', () => {
-        // arrange
-        spyOn(searchPage, 'handleDeviceBackButton').and.stub();
-        // act
-        searchPage.ionViewWillEnter();
-        // assert
-        expect(mockHeaderService.hideHeader).toHaveBeenCalled();
-        expect(searchPage.handleDeviceBackButton).toHaveBeenCalled();
-    });
 
     it('should focus the search bar', (done) => {
         // arrange
@@ -191,12 +209,14 @@ describe('SearchPage', () => {
             setFocus: jest.fn()
         };
         jest.spyOn(searchPage, 'checkUserSession').mockImplementation();
+        mockSbProgressLoader.hide = jest.fn();
         // act
         searchPage.ionViewDidEnter();
         // assert
         expect(searchPage.checkUserSession).toHaveBeenCalled();
         setTimeout(() => {
             expect(searchPage.isFirstLaunch).toBe(false);
+            expect(mockSbProgressLoader.hide).toHaveBeenCalled();
             done();
         }, 200);
     });
@@ -330,10 +350,20 @@ describe('SearchPage', () => {
     });
 
     describe('openCollection', () => {
+        beforeEach(() => {
+            const state = {
+                pageIds: [],
+                groupId: 'g1',
+                params: {}
+            };
+            jest.spyOn(CsGroupAddableBloc.instance, 'state', 'get').mockReturnValue(state);
+            jest.spyOn(CsGroupAddableBloc.instance, 'updateState').mockImplementation();
+        });
         it('openCollection', () => {
             // arrange
             const collection = {
-                identifier: 'identifier'
+                identifier: 'identifier',
+                contentType: 'collection'
             };
             mockTelemetryGeneratorService.isCollection = jest.fn(() => true);
             // act
@@ -344,8 +374,8 @@ describe('SearchPage', () => {
                 InteractSubtype.CONTENT_CLICKED,
                 Environment.HOME,
                 PageId.DIAL_SEARCH,
-                expect.anything(),
-                expect.anything(),
+                { id: 'identifier', type: 'collection', version: '' },
+                { root: true },
                 undefined,
                 undefined
             );
@@ -354,7 +384,7 @@ describe('SearchPage', () => {
             // arrange
             const collection = {
                 identifier: 'identifier',
-                contentType: ContentType.COURSE
+                contentType: 'Course'
             };
             mockTelemetryGeneratorService.isCollection = jest.fn(() => true);
             searchPage.isDialCodeSearch = true;
@@ -365,8 +395,7 @@ describe('SearchPage', () => {
             searchPage.openCollection(collection);
             // assert
             expect(searchPage.enrolledCourses.length).toEqual(0);
-            expect(mockRouter.navigate).toHaveBeenCalledWith(
-                [RouterLinks.ENROLLED_COURSE_DETAILS],
+            expect(mockNavigationService.navigateToTrackableCollection).toHaveBeenCalledWith(
                 expect.anything()
             );
         });
@@ -374,7 +403,7 @@ describe('SearchPage', () => {
             // arrange
             const collection = {
                 identifier: 'identifier',
-                contentType: ContentType.COURSE
+                contentType: 'Course'
             };
             mockTelemetryGeneratorService.isCollection = jest.fn(() => true);
             searchPage.isDialCodeSearch = true;
@@ -399,7 +428,7 @@ describe('SearchPage', () => {
             // arrange
             const collection = {
                 identifier: 'identifier',
-                contentType: ContentType.COURSE
+                contentType: 'Course'
             };
             mockTelemetryGeneratorService.isCollection = jest.fn(() => true);
             searchPage.isDialCodeSearch = true;
@@ -421,7 +450,8 @@ describe('SearchPage', () => {
             // arrange
             const collection = {
                 identifier: 'identifier',
-                mimeType: MimeType.COLLECTION
+                mimeType: MimeType.COLLECTION,
+                contentType: 'collection'
             };
             mockTelemetryGeneratorService.isCollection = jest.fn(() => true);
             searchPage.isDialCodeSearch = true;
@@ -433,8 +463,7 @@ describe('SearchPage', () => {
             // act
             searchPage.openCollection(collection);
             // assert
-            expect(mockRouter.navigate).toHaveBeenCalledWith(
-                [RouterLinks.COLLECTION_DETAIL_ETB],
+            expect(mockNavigationService.navigateToCollection).toHaveBeenCalledWith(
                 expect.anything()
             );
         });
@@ -442,7 +471,8 @@ describe('SearchPage', () => {
             // arrange
             const collection = {
                 identifier: 'identifier',
-                mimeType: 'MimeType.COLLECTION'
+                mimeType: 'MimeType.COLLECTION',
+                contentType: 'collection'
             };
             mockTelemetryGeneratorService.isCollection = jest.fn(() => true);
             searchPage.isDialCodeSearch = true;
@@ -452,8 +482,7 @@ describe('SearchPage', () => {
             // act
             searchPage.openCollection(collection);
             // assert
-            expect(mockRouter.navigate).toHaveBeenCalledWith(
-                [RouterLinks.CONTENT_DETAILS],
+            expect(mockNavigationService.navigateToContent).toHaveBeenCalledWith(
                 expect.anything()
             );
         });
@@ -614,7 +643,8 @@ describe('SearchPage', () => {
         it('should set profile data accordingly', (done) => {
             // arrange
             const data = {
-                framework: 'framework1'
+                framework: 'framework1',
+                contentType: 'Resource'
             };
             const profile = {
                 syllabus: ['framework1']
@@ -637,7 +667,8 @@ describe('SearchPage', () => {
                 framework: 'framework1',
                 board: 'board',
                 medium: ['medium1'],
-                gradeLevel: ['grade1']
+                gradeLevel: ['grade1'],
+                contentType: 'Resource'
             };
             const profile = {
                 syllabus: ['framework']
@@ -688,7 +719,8 @@ describe('SearchPage', () => {
                 framework: 'framework1',
                 board: 'board',
                 medium: ['medium1'],
-                gradeLevel: ['grade1']
+                gradeLevel: ['grade1'],
+                contentType: 'Resource'
             };
             const profile = {
                 syllabus: ['framework1'],
@@ -740,7 +772,8 @@ describe('SearchPage', () => {
                 framework: 'framework1',
                 board: 'board',
                 medium: ['medium1'],
-                gradeLevel: ['grade1']
+                gradeLevel: ['grade1'],
+                contentType: 'Resource'
             };
             const profile = {
                 syllabus: ['framework1'],
@@ -796,7 +829,8 @@ describe('SearchPage', () => {
                 framework: 'framework1',
                 board: 'board',
                 medium: ['medium1'],
-                gradeLevel: ['grade1']
+                gradeLevel: ['grade1'],
+                contentType: 'Resource'
             };
             const profile = {
                 syllabus: ['framework1'],
@@ -920,6 +954,9 @@ describe('SearchPage', () => {
         it('should goto filter page on showFilter', (done) => {
             // arrange
             searchPage.source = 'source';
+            searchPage.initialFilterCriteria = {
+                facetFilters: [{ name: 'name' }]
+            };
             searchPage.responseData = {
                 filterCriteria: {
                     facetFilters: [{ name: 'name' }]
@@ -930,6 +967,7 @@ describe('SearchPage', () => {
             ];
             mockCommonUtilService.getTranslatedValue = jest.fn(() => 'translation');
             mockFormAndFrameworkUtilService.getLibraryFilterConfig = jest.fn(() => Promise.resolve(getLibraryFilterConfigResp));
+            searchPage.searchFilterConfig = [];
             // act
             searchPage.showFilter();
             // assert
@@ -989,8 +1027,60 @@ describe('SearchPage', () => {
             const searchContentResp = {
                 contentDataList: {
                     identifier: 'id'
+                },
+                filterCriteria: {}
+            };
+            mockContentService.searchContent = jest.fn(() => of(searchContentResp));
+            mocksearchHistoryService.addEntry = jest.fn(() => of(undefined));
+            window.cordova.plugins = {
+                Keyboard: { close: jest.fn() }
+            };
+            jest.spyOn(searchPage, 'updateFilterIcon').mockImplementation();
+            searchPage.profile = {
+                grade: ['grade1']
+            };
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
+            };
+            mockTelemetryGeneratorService.generateLogEvent = jest.fn();
+            // act
+            searchPage.handleSearch();
+            // assert
+            expect(searchPage.showLoader).toEqual(true);
+            expect(mocksearchHistoryService.addEntry).toHaveBeenCalled();
+            setTimeout(() => {
+                expect(searchPage.searchContentResult).toEqual(searchContentResp.contentDataList);
+                expect(searchPage.isEmptyResult).toBe(false);
+                expect(searchPage.responseData).toEqual(searchContentResp);
+                expect(searchPage.updateFilterIcon).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateLogEvent).toHaveBeenCalledWith(
+                    LogLevel.INFO,
+                    expect.anything(),
+                    Environment.HOME,
+                    ImpressionType.SEARCH,
+                    expect.anything()
+                );
+                done();
+            }, 0);
+        });
+        it('should handle search for preAppliedFilter', (done) => {
+            // arange
+            jest.spyOn(searchPage, 'scrollToTop').mockImplementation();
+            searchPage.preAppliedFilter = {
+                filters: {
+                    status: ['Live'],
+                    objectType: ['Content'],
+                    board: ['cbse'],
+                    medium: ['Hindi', 'English']
                 }
             };
+            // searchPage.searchKeywords = 'abcd';
+            const searchContentResp = {
+                contentDataList: {
+                    identifier: 'id'
+                },
+                filterCriteria: {}
+            };
             mockContentService.searchContent = jest.fn(() => of(searchContentResp));
             mocksearchHistoryService.addEntry = jest.fn(() => of(undefined));
             window.cordova.plugins = {
@@ -1126,7 +1216,8 @@ describe('SearchPage', () => {
                 isNetworkAvailable: true
             };
             const contentMock = {
-                identifier: 'id'
+                identifier: 'id',
+                contentType: 'Resource'
             };
             const getCourseBatchesResp = [
             ];
@@ -1142,8 +1233,7 @@ describe('SearchPage', () => {
             setTimeout(() => {
                 expect(searchPage.batches).toEqual(getCourseBatchesResp);
                 expect(searchPage.loader.dismiss).toHaveBeenCalled();
-                expect(mockRouter.navigate).toHaveBeenCalledWith(
-                    [RouterLinks.CONTENT_DETAILS],
+                expect(mockNavigationService.navigateToContent).toHaveBeenCalledWith(
                     expect.anything()
                 );
                 done();
@@ -1158,7 +1248,8 @@ describe('SearchPage', () => {
                 isNetworkAvailable: true
             };
             const contentMock = {
-                identifier: 'id'
+                identifier: 'id',
+                contentType: 'Resource'
             };
             mockCourseService.getCourseBatches = jest.fn(() => throwError({}));
             // act
@@ -1201,7 +1292,7 @@ describe('SearchPage', () => {
                     dialAssembleResp.sections
                 );
                 expect(searchPage.isDialCodeSearch).toBe(true);
-                expect(searchPage.contentType).toEqual(getSupportedContentFilterConfigResp);
+                expect(searchPage.primaryCategories).toEqual(getSupportedContentFilterConfigResp);
                 done();
             }, 0);
         });
@@ -1220,7 +1311,7 @@ describe('SearchPage', () => {
             // assert
             setTimeout(() => {
                 expect(searchPage.isDialCodeSearch).toBe(true);
-                expect(searchPage.contentType).toEqual(getSupportedContentFilterConfigResp);
+                expect(searchPage.primaryCategories).toEqual(getSupportedContentFilterConfigResp);
                 expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('SOMETHING_WENT_WRONG');
                 expect(mockLocation.back).toHaveBeenCalled();
                 done();
@@ -1236,14 +1327,28 @@ describe('SearchPage', () => {
             mockFormAndFrameworkUtilService.getSupportedContentFilterConfig = jest.fn(
                 () => Promise.resolve(getSupportedContentFilterConfigResp));
             mockpageService.getPageAssemble = jest.fn(() => throwError({}));
+            searchPage.source = PageId.ONBOARDING_PROFILE_PREFERENCES;
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            searchPage.source = PageId.ONBOARDING_PROFILE_PREFERENCES;
             // act
             searchPage.getContentForDialCode();
             // assert
             setTimeout(() => {
                 expect(searchPage.isDialCodeSearch).toBe(true);
-                expect(searchPage.contentType).toEqual(getSupportedContentFilterConfigResp);
+                expect(searchPage.primaryCategories).toEqual(getSupportedContentFilterConfigResp);
                 expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_OFFLINE_MODE');
                 expect(mockLocation.back).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    AuditType.TOAST_SEEN,
+                    ImpressionSubtype.OFFLINE_MODE,
+                    PageId.SCAN_OR_MANUAL,
+                    Environment.ONBOARDING,
+                    undefined,
+                    undefined,
+                    undefined,
+                    undefined,
+                    [{ id: 'abcdef', type: 'QR' }]
+                );
                 done();
             }, 0);
         });
@@ -1374,20 +1479,32 @@ describe('SearchPage', () => {
             // arrange
             const getContentDetailsResp = {
                 isAvailableLocally: true,
+                contentType: 'collection',
                 contentData: {
                     identifier: 'id1'
                 }
             };
+            const collection = {
+                identifier: 'identifier',
+                mimeType: MimeType.COLLECTION,
+                contentType: 'collection'
+            };
+            searchPage.isDialCodeSearch = true;
+            mockAppGlobalService.getProfileSettingsStatus = jest.fn(() => Promise.resolve({}));
+            mockAppGlobalService.setOnBoardingCompleted = jest.fn(() => Promise.resolve());
             mockContentService.getContentDetails = jest.fn(() => of(getContentDetailsResp));
+            mockZone.run = jest.fn((fn) => fn());
             mockAppGlobalService.getCurrentUser = jest.fn(() => { });
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockNavCtrl.navigateForward = jest.fn(() => Promise.resolve(true));
             // act
-            searchPage.checkParent('parent', 'child');
+            searchPage.checkParent('parent', collection);
             // assert
             setTimeout(() => {
-                expect(mockRouter.navigate).toHaveBeenCalledWith(
-                    [RouterLinks.CONTENT_DETAILS],
-                    expect.anything()
-                );
+                expect(mockContentService.getContentDetails).toHaveBeenCalled();
+                expect(mockZone.run).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+                expect(mockNavCtrl.navigateForward).toHaveBeenCalled();
                 done();
             }, 0);
         });
@@ -1396,12 +1513,18 @@ describe('SearchPage', () => {
             const getContentDetailsResp = undefined;
             mockContentService.getContentDetails = jest.fn(() => of(getContentDetailsResp));
             mockAppGlobalService.getCurrentUser = jest.fn(() => { });
+            const content = {
+                isAvailableLocally: true,
+                contentType: 'resource',
+                contentData: {
+                    identifier: 'id1'
+                }
+            };
             // act
-            searchPage.checkParent('parent', 'child');
+            searchPage.checkParent('parent', content);
             // assert
             setTimeout(() => {
-                expect(mockRouter.navigate).toHaveBeenCalledWith(
-                    [RouterLinks.CONTENT_DETAILS],
+                expect(mockNavigationService.navigateToContent).toHaveBeenCalledWith(
                     expect.anything()
                 );
                 done();
@@ -1411,6 +1534,7 @@ describe('SearchPage', () => {
             // arrange
             const getContentDetailsResp = {
                 isAvailableLocally: false,
+                contentType: 'collection',
                 contentData: {
                     identifier: 'id1'
                 }
@@ -1451,9 +1575,9 @@ describe('SearchPage', () => {
         it('should push not downloaded identifiers in to queue', (done) => {
             // arrange
             const importContentResp = [
-                {status: ContentImportStatus.ENQUEUED_FOR_DOWNLOAD, identifier: 'id1'}];
+                { status: ContentImportStatus.ENQUEUED_FOR_DOWNLOAD, identifier: 'id1' }];
             mockContentService.importContent = jest.fn(() => of(importContentResp));
-            const parent = {identifier: 'id'};
+            const parent = { identifier: 'id' };
             // act
             searchPage.downloadParentContent(parent);
             // assert
@@ -1474,69 +1598,439 @@ describe('SearchPage', () => {
                 done();
             }, 0);
         });
-        // it('should show toast when content not available', (done) => {
-        //     // arrange
-        //     mockCommonUtilService.networkInfo = {
-        //         isNetworkAvailable: true
-        //     };
-        //     const importContentResp = [
-        //         {status: 'status', identifier: 'id1'}];
-        //     mockContentService.importContent = jest.fn(() => of(importContentResp));
-        //     const parent = {identifier: 'id'};
-        //     // act
-        //     searchPage.downloadParentContent(parent);
-        //     // assert
-        //     expect(searchPage.downloadProgress).toEqual(0);
-        //     expect(searchPage.isDownloadStarted).toEqual(true);
-        //     setTimeout(() => {
-        //         expect(searchPage.showLoading).toBe(false);
-        //         expect(searchPage.isDownloadStarted).toBe(false);
-        //         expect(searchPage.queuedIdentifiers.length).toEqual(0);
-        //         expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_CONTENT_NOT_AVAILABLE');
-        //         done();
-        //     }, 0);
-        // });
-        // it('should show toast when network not available', (done) => {
-        //     // arrange
-        //     mockCommonUtilService.networkInfo = {
-        //         isNetworkAvailable: false
-        //     };
-        //     const importContentResp = [
-        //         {status: 'status', identifier: 'id1'}];
-        //     mockContentService.importContent = jest.fn(() => of(importContentResp));
-        //     const parent = {identifier: 'id'};
-        //     // act
-        //     searchPage.downloadParentContent(parent);
-        //     // assert
-        //     expect(searchPage.downloadProgress).toEqual(0);
-        //     expect(searchPage.isDownloadStarted).toEqual(true);
-        //     setTimeout(() => {
-        //         expect(searchPage.showLoading).toBe(false);
-        //         expect(searchPage.isDownloadStarted).toBe(false);
-        //         expect(searchPage.queuedIdentifiers.length).toEqual(0);
-        //         expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_OFFLINE_MODE');
-        //         done();
-        //     }, 0);
-        // });
-        // it('should handle error scenario while importing', (done) => {
-        //     // arrange
-        //     mockCommonUtilService.networkInfo = {
-        //         isNetworkAvailable: true
-        //     };
-        //     mockContentService.importContent = jest.fn(() => throwError({ CONNECTION_ERROR: 'CONNECTION_ERROR' }));
-        //     const parent = {identifier: 'id'};
-        //     // act
-        //     searchPage.downloadParentContent(parent);
-        //     // assert
-        //     expect(searchPage.downloadProgress).toEqual(0);
-        //     expect(searchPage.isDownloadStarted).toEqual(true);
-        //     setTimeout(() => {
-        //         expect(searchPage.showLoading).toBe(false);
-        //         expect(searchPage.isDownloadStarted).toBe(false);
-        //         expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_OFFLINE_MODE');
-        //         done();
-        //     }, 0);
-        // });
+
+        describe('handleDeviceBackButton', () => {
+            it('should handle Device BackButton for dialcode', () => {
+                // arrange
+                const subscribeWithPriorityData = jest.fn((_, fn) => fn());
+                mockPlatform.backButton = {
+                    subscribeWithPriority: subscribeWithPriorityData
+                } as any;
+                jest.spyOn(searchPage, 'navigateToPreviousPage').mockImplementation(() => {
+                    return Promise.resolve();
+                });
+                searchPage.displayDialCodeResult = [{ dialCodeResult: ['result-1', 'result-2'] }];
+                mockTelemetryGeneratorService.generateBackClickedNewTelemetry = jest.fn();
+                // act
+                searchPage.handleDeviceBackButton();
+                // assert
+                expect(searchPage.displayDialCodeResult[0].dialCodeResult.length).toBeGreaterThan(0);
+                expect(mockTelemetryGeneratorService.generateBackClickedNewTelemetry).toHaveBeenCalledWith(
+                    true,
+                    Environment.HOME,
+                    PageId.QR_BOOK_RESULT
+                );
+            });
+
+            it('should handle Device BackButton', () => {
+                // arrange
+                const subscribeWithPriorityData = jest.fn((_, fn) => fn());
+                mockPlatform.backButton = {
+                    subscribeWithPriority: subscribeWithPriorityData
+                } as any;
+                jest.spyOn(searchPage, 'navigateToPreviousPage').mockImplementation(() => {
+                    return Promise.resolve();
+                });
+                searchPage.displayDialCodeResult = [{ dialCodeResult: [] }];
+                mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+                // act
+                searchPage.handleDeviceBackButton();
+                // assert
+                expect(searchPage.displayDialCodeResult[0].dialCodeResult.length).toBe(0);
+                expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                    ImpressionType.SEARCH,
+                    Environment.HOME, false, undefined,
+                    [{ id: '', type: 'API' },
+                    { id: '', type: 'API' },
+                    { id: 'SearchResult', type: 'Section' },
+                    { id: 'filter', type: 'DiscoveryType' }]
+                );
+            });
+        });
+    });
+
+    describe('goBack', () => {
+        it('should generate beck telemetry for qrCode', () => {
+            searchPage.displayDialCodeResult = [{
+                dialCodeResult: ['result-1']
+            }];
+            mockTelemetryGeneratorService.generateBackClickedNewTelemetry = jest.fn();
+            searchPage.source = PageId.ONBOARDING_PROFILE_PREFERENCES;
+            // act
+            searchPage.goBack();
+            // assert
+            expect(mockTelemetryGeneratorService.generateBackClickedNewTelemetry).toHaveBeenCalledWith(
+                false,
+                Environment.ONBOARDING,
+                PageId.QR_BOOK_RESULT
+            );
+        });
+    });
+
+    describe('add activity', () => {
+        it('should addActivityToGroup', () => {
+            // arrange
+            searchPage.groupId = 'id1';
+            searchPage.searchContentResult = [
+                { identifier: 'some_id', selected: true, contentType: 'contentType' }
+            ];
+            searchPage.activityTypeData = {
+                activityType: 'some_activity_type'
+            }
+            // act
+            searchPage.addActivityToGroup();
+            // assert
+            expect(mockgroupHandlerService.addActivityToGroup).toHaveBeenCalledWith(
+                'id1',
+                'some_id',
+                'some_activity_type',
+                PageId.SEARCH,
+                expect.anything(),
+                -2
+            );
+        });
+
+        it('should not addActivityToGroup', () => {
+            // arrange
+            searchPage.searchContentResult = [
+                { identifier: 'id1', selected: true, contentType: 'contentType' }
+            ];
+            searchPage.activityList = [{
+                id: 'id1'
+            }];
+            // act
+            searchPage.addActivityToGroup();
+            // assert
+            expect(mockCommonUtilService.showToast).toHaveBeenCalled();
+        });
+        it('should open content', () => {
+            // arrange
+            const result = [
+                { identifier: 'some_id', selected: true, contentType: 'contentType' }
+            ];
+            searchPage.searchContentResult = result;
+            jest.spyOn(searchPage, 'openContent').mockImplementation();
+            // act
+            searchPage.openSelectedContent();
+            // assert
+            expect(searchPage.openContent).toHaveBeenCalledWith(
+                undefined,
+                result[0],
+                0,
+                undefined,
+                false
+            );
+        });
+    });
+
+    describe('searchOnFocus()', ()=> {
+        it('should animate the screen and show the search page', () => {
+            // arrange
+            mockHeaderService.showHeaderWithBackButton = jest.fn();
+            // act
+            searchPage.searchOnFocus();
+            // assert
+            expect(searchPage.enableSearch).toBeTruthy();
+        });
+    })
+
+    describe('handleHeaderEvents()', () => {
+        it('should animate the screen and show the discover page on heaser back button is clicked', () => {
+            // arrange
+            mockHeaderService.showHeaderWithHomeButton = jest.fn();
+            searchPage.isFromGroupFlow = false;
+            // act
+            searchPage.handleHeaderEvents({ name: 'back' });
+            // assert
+            expect(searchPage.enableSearch).toBeFalsy();
+        });
+
+        it('should navigate to previous screen if its from group flow', () => {
+            // arrange
+            mockHeaderService.showHeaderWithHomeButton = jest.fn();
+            searchPage.isFromGroupFlow = true;
+            // act
+            searchPage.handleHeaderEvents({ name: 'back' });
+            // assert
+            expect(mockLocation.back).toHaveBeenCalled();
+        });
+    });
+
+    describe('fetchPrimaryCategoryFilters()', () => {
+        it('should not assign any value to primaryCategoryFilters if the value is already assigned', () => {
+            // arrange
+            searchPage.primaryCategoryFilters = [];
+            // act
+            searchPage.fetchPrimaryCategoryFilters([]);
+            // assert
+            expect(searchPage.primaryCategoryFilters).toEqual([]);
+        });
+
+        it('should not assign any value to primaryCategoryFilters if the value is not assigned and primary category is not present i facetfilters', () => {
+            // arrange
+            searchPage.primaryCategoryFilters = [];
+            const facetFilters = [
+                {
+                    name: 'primaryCategory',
+                    value: [
+                        {
+                            name: 'category1'
+                        },
+                        {
+                            name: 'category2'
+                        },
+                        {
+                            name: 'category3'
+                        }
+                    ]
+                },
+                {
+                    name: 'medium',
+                    value: [
+                        {
+                            name: 'medium1'
+                        },
+                        {
+                            name: 'medium2'
+                        },
+                        {
+                            name: 'medium3'
+                        }
+                    ]
+                }
+            ]
+            // act
+            searchPage.fetchPrimaryCategoryFilters([]);
+            // assert
+            expect(searchPage.primaryCategoryFilters).toEqual([]);
+        });
+
+        it('should assign value to primaryCategoryFilters if the value is not assigned and primary category is present in facetfilters', () => {
+            // arrange
+            searchPage.primaryCategoryFilters = undefined;
+            const facetFilters = [
+                {
+                    name: 'board',
+                    value: [
+                        {
+                            name: 'board1'
+                        },
+                        {
+                            name: 'board2'
+                        }
+                    ]
+                },
+                {
+                    name: 'primaryCategory',
+                    value: [
+                        {
+                            name: 'category1'
+                        },
+                        {
+                            name: 'category2'
+                        }
+                    ]
+                }
+            ]
+            // act
+            searchPage.fetchPrimaryCategoryFilters(facetFilters);
+            // assert
+            setTimeout(() => {
+                expect(searchPage.primaryCategoryFilters).toEqual(facetFilters[1].value);
+            });
+        });
+    });
+
+    describe('handleFilterSelect', () => {
+        it('should terminate the flow if the event has no data', () => {
+            // arrange
+            const event = {};
+            searchPage.applyFilter = jest.fn();
+            // act
+            searchPage.handleFilterSelect(event);
+            // assert
+            expect(searchPage.applyFilter).not.toHaveBeenCalled();
+        });
+
+        it('should terminate the flow if the initialFilterCriteria does not have the facet primaryCategory', () => {
+            // arrange
+            const event = {
+                data: [
+                    {
+                        name: 'facet 1',
+                        value: {
+                            name: 'value1'
+                        }
+                    }
+                ]
+            };
+            searchPage.initialFilterCriteria = {
+                facetFilters: [
+                    {
+                        name: 'medium'
+                    },
+                    {
+                        name: 'grade'
+                    }
+                ]
+            }
+            searchPage.applyFilter = jest.fn();
+            // act
+            searchPage.handleFilterSelect(event);
+            // assert
+            expect(searchPage.applyFilter).not.toHaveBeenCalled();
+        });
+
+        it('should terminate the flow if the primaryCategory values does not have the value of the selected pill', () => {
+            // arrange
+            const event = {
+                data: [
+                    {
+                        name: 'facet 1',
+                        value: {
+                            name: 'value1'
+                        }
+                    }
+                ]
+            };
+            searchPage.initialFilterCriteria = {
+                facetFilters: [
+                    {
+                        name: 'primaryCategory',
+                        values: [
+                            {
+                                name: 'category 1',
+                                value: 'value 1'
+                            },
+                            {
+                                name: 'category 2',
+                                value: 'value 2'
+                            }
+                        ]
+                    },
+                    {
+                        name: 'grade',
+                        values: [
+                            {
+                                name: 'grade 1',
+                                value: 'value 1'
+                            },
+                            {
+                                name: 'grade 2',
+                                value: 'value 2'
+                            }
+                        ]
+                    }
+                ]
+            }
+            searchPage.applyFilter = jest.fn();
+            // act
+            searchPage.handleFilterSelect(event);
+            // assert
+            expect(searchPage.applyFilter).not.toHaveBeenCalled();
+        });
+
+        it('should not apply the filter if the primaryCategory values have the same value of the selected pill but its already applied is true', () => {
+            // arrange
+            const event = {
+                data: [
+                    {
+                        name: 'facet 1',
+                        value: {
+                            name: 'category 1'
+                        }
+                    }
+                ]
+            };
+            searchPage.initialFilterCriteria = {
+                facetFilters: [
+                    {
+                        name: 'primaryCategory',
+                        values: [
+                            {
+                                name: 'category 1',
+                                value: 'value 1',
+                                apply: true
+                            },
+                            {
+                                name: 'category 2',
+                                value: 'value 2',
+                                apply: false
+                            }
+                        ]
+                    },
+                    {
+                        name: 'grade',
+                        values: [
+                            {
+                                name: 'grade 1',
+                                value: 'value 1'
+                            },
+                            {
+                                name: 'grade 2',
+                                value: 'value 2'
+                            }
+                        ]
+                    }
+                ]
+            }
+            searchPage.applyFilter = jest.fn();
+            // act
+            searchPage.handleFilterSelect(event);
+            // assert
+            expect(searchPage.applyFilter).not.toHaveBeenCalled();
+        });
+
+        it('should apply the filter if the primaryCategory values have the same value of the selected pill', () => {
+            // arrange
+            const event = {
+                data: [
+                    {
+                        name: 'facet 1',
+                        value: {
+                            name: 'category 1'
+                        }
+                    }
+                ]
+            };
+            searchPage.initialFilterCriteria = {
+                facetFilters: [
+                    {
+                        name: 'primaryCategory',
+                        values: [
+                            {
+                                name: 'category 1',
+                                value: 'value 1',
+                                apply: false
+                            },
+                            {
+                                name: 'category 2',
+                                value: 'value 2',
+                                apply: false
+                            }
+                        ]
+                    },
+                    {
+                        name: 'grade',
+                        values: [
+                            {
+                                name: 'grade 1',
+                                value: 'value 1'
+                            },
+                            {
+                                name: 'grade 2',
+                                value: 'value 2'
+                            }
+                        ]
+                    }
+                ]
+            }
+            searchPage.applyFilter = jest.fn();
+            // act
+            searchPage.handleFilterSelect(event);
+            // assert
+            expect(searchPage.applyFilter).toHaveBeenCalled();
+        });
     });
 
 });
diff --git a/src/app/search/search.page.ts b/src/app/search/search.page.ts
index 40cead1e7..cd5831777 100644
--- a/src/app/search/search.page.ts
+++ b/src/app/search/search.page.ts
@@ -1,6 +1,7 @@
 import { Component, Inject, NgZone, OnDestroy, ViewChild, ChangeDetectorRef, OnInit, AfterViewInit } from '@angular/core';
 import { Router, NavigationExtras } from '@angular/router';
-import { Events, Platform, PopoverController, IonContent, NavController } from '@ionic/angular';
+import { Platform, PopoverController, IonContent, NavController, IonRefresher } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { TranslateService } from '@ngx-translate/core';
 import { Location } from '@angular/common';
 import each from 'lodash/each';
@@ -12,18 +13,20 @@ import {
   CorrelationData, DownloadEventType, DownloadProgress, EventsBusEvent, EventsBusService, PageAssembleCriteria,
   PageAssembleFilter, PageAssembleService, PageName, ProfileType, SearchType, SharedPreferences, TelemetryObject,
   NetworkError, CourseService, CourseBatchesRequest, CourseEnrollmentType, CourseBatchStatus, Course, Batch,
-  FetchEnrolledCourseRequest, Profile, ProfileService, Framework,
+  FetchEnrolledCourseRequest, Profile,
+  ProfileService, Framework,
   FrameworkCategoryCodesGroup,
   FrameworkDetailsRequest,
   FrameworkService,
   FrameworkUtilService,
-  GetSuggestedFrameworksRequest, SearchEntry, SearchHistoryService, SortOrder
+  GetSuggestedFrameworksRequest, SearchEntry,
+  SearchHistoryService, SortOrder,
+  GroupActivity
 } from 'sunbird-sdk';
 import { Map } from '@app/app/telemetryutil';
 import {
   BatchConstants,
-  RouterLinks, AudienceFilter,
-  ContentType, MimeType, Search, ContentCard,
+  RouterLinks, Search, ContentCard,
   ContentFilterConfig
 } from '@app/app/app.constant';
 import { AppGlobalService } from '@app/services/app-global-service.service';
@@ -31,7 +34,9 @@ import { FormAndFrameworkUtilService } from '@app/services/formandframeworkutil.
 import { CommonUtilService } from '@app/services/common-util.service';
 import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
 import {
-  Environment, ImpressionType, InteractSubtype, InteractType, LogLevel, Mode, PageId, CorReleationDataType
+  Environment, ImpressionType, InteractSubtype,
+  InteractType, LogLevel, Mode, PageId, CorReleationDataType,
+  AuditType, ImpressionSubtype, ObjectType
 } from '@app/services/telemetry-constants';
 import { AppHeaderService } from '@app/services/app-header.service';
 import { AppVersion } from '@ionic-native/app-version/ngx';
@@ -39,26 +44,63 @@ import { SearchHistoryNamespaces } from '@app/config/search-history-namespaces';
 import { featureIdMap } from '@app/app/feature-id-map';
 import { EnrollmentDetailsComponent } from '../components/enrollment-details/enrollment-details.component';
 import { ContentUtil } from '@app/util/content-util';
-import { LibraryCardTypes } from '@project-sunbird/common-consumption';
+import { LibraryCardTypes, PillBorder, PillsViewType, SelectMode } from '@project-sunbird/common-consumption-v8';
 import { Subscription, Observable, from } from 'rxjs';
 import { switchMap, tap, map as rxjsMap, share, startWith, debounceTime } from 'rxjs/operators';
-import { applyProfileFilter } from '@app/util/filter.util';
-
+import { SbProgressLoader } from '../../services/sb-progress-loader.service';
+import { applyProfileFilter, updateFilterInSearchQuery } from '@app/util/filter.util';
+import { GroupHandlerService } from '@app/services';
+import { NavigationService } from '@app/services/navigation-handler.service';
+import { CsGroupAddableBloc } from '@project-sunbird/client-services/blocs';
+import { CsContentType } from '@project-sunbird/client-services/services/content';
+import { ProfileHandler } from '@app/services/profile-handler';
+import { FormConstants } from '../form.constants';
+import { animate, state, style, transition, trigger } from '@angular/animations';
+import { DiscoverComponent } from '../components/discover/discover.page';
+import { OnTabViewWillEnter } from './../tabs/on-tab-view-will-enter';
 
 declare const cordova;
 @Component({
   selector: 'app-search',
   templateUrl: './search.page.html',
-  styleUrls: ['./search.page.scss']
+  styleUrls: ['./search.page.scss'],
+  animations: [
+    trigger('labelVisibility', [
+      state(
+        'show',
+        style({
+          maxHeight: '50vh',
+          overflow: 'hidden'
+        })
+      ),
+      state(
+        'hide',
+        style({
+          maxHeight: '0',
+          overflow: 'hidden'
+        })
+      ),
+      transition('* => show', [animate('500ms ease-out')]),
+      transition('show => hide', [animate('500ms ease-in')])
+    ])
+  ],
 })
-export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
+export class SearchPage implements OnInit, AfterViewInit, OnDestroy, OnTabViewWillEnter {
+
+  @ViewChild('refresher', { static: false }) refresher: IonRefresher;
+  @ViewChild(DiscoverComponent, { static: false }) discoverCmp: DiscoverComponent;
+
   public searchHistory$: Observable<SearchEntry[]>;
   appName: string;
   showLoading: boolean;
   downloadProgress: any;
-  @ViewChild('searchInput') searchBar;
-  contentType: Array<string> = [];
+  @ViewChild('searchInput', { static: false }) searchBar;
+  primaryCategories: Array<string> = [];
   source: string;
+  groupId: string;
+  activityTypeData: any;
+  activityList: GroupActivity[] = [];
+  isFromGroupFlow = false;
   dialCode: string;
   dialCodeResult: Array<any> = [];
   dialCodeContentResult: Array<any> = [];
@@ -78,7 +120,6 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
   contentData: any;
   childContent: any = undefined;
   loadingDisplayText = this.commonUtilService.translateMessage('LOADING_CONTENT');
-  audienceFilter = [];
   eventSubscription?: Subscription;
   displayDialCodeResult: any;
   profile: Profile;
@@ -103,8 +144,25 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
   isProfileUpdated: boolean;
   isQrCodeLinkToContent: any;
   LibraryCardTypes = LibraryCardTypes;
+  initialFilterCriteria: any;
+  showAddToGroupButtons = false;
+  supportedUserTypesConfig: Array<any>;
+  searchFilterConfig: Array<any>;
+  preAppliedFilter: any;
+  enableSearch = false;
+  searchInfolVisibility = 'show';
+  refresh: boolean = false;
+
+  @ViewChild('contentView', { static: false }) contentView: IonContent;
+  headerObservable: Subscription;
+  primaryCategoryFilters;
+  PillsViewType = PillsViewType;
+  PillBorder = PillBorder;
+  SelectMode = SelectMode;
+  appPrimaryColor: string;
+  selectedPrimaryCategoryFilter: any;
+  searchWithBackButton = false;
 
-  @ViewChild('contentView') contentView: IonContent;
   constructor(
     @Inject('CONTENT_SERVICE') private contentService: ContentService,
     @Inject('PAGE_ASSEMBLE_SERVICE') private pageService: PageAssembleService,
@@ -123,27 +181,44 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
     private appGlobalService: AppGlobalService,
     private platform: Platform,
     private formAndFrameworkUtilService: FormAndFrameworkUtilService,
-    private commonUtilService: CommonUtilService,
+    public commonUtilService: CommonUtilService,
     private telemetryGeneratorService: TelemetryGeneratorService,
     private translate: TranslateService,
     private headerService: AppHeaderService,
     private popoverCtrl: PopoverController,
     private location: Location,
     private router: Router,
-    private navCtrl: NavController
+    private navCtrl: NavController,
+    private sbProgressLoader: SbProgressLoader,
+    private groupHandlerService: GroupHandlerService,
+    private navService: NavigationService,
+    private profileHandler: ProfileHandler
   ) {
 
     const extras = this.router.getCurrentNavigation().extras.state;
 
     if (extras) {
       this.dialCode = extras.dialCode;
-      this.contentType = extras.contentType;
+      this.primaryCategories = extras.primaryCategories;
       this.corRelationList = extras.corRelation;
       this.source = extras.source;
+      this.searchWithBackButton = extras.searchWithBackButton;
+      if (this.source === PageId.GROUP_DETAIL) {
+        this.isFromGroupFlow = true;
+        this.searchOnFocus();
+      }
+      this.groupId = extras.groupId;
+      this.activityTypeData = extras.activityTypeData;
+      this.activityList = extras.activityList;
       this.enrolledCourses = extras.enrolledCourses;
       this.guestUser = extras.guestUser;
       this.userId = extras.userId;
       this.shouldGenerateEndTelemetry = extras.shouldGenerateEndTelemetry;
+      this.preAppliedFilter = extras.preAppliedFilter;
+      if (this.preAppliedFilter) {
+        this.enableSearch = true;
+        this.searchKeywords = this.preAppliedFilter.query;
+      }
     }
 
     this.checkUserSession();
@@ -154,24 +229,46 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
     this.selectedLanguageCode = this.translate.currentLang;
   }
 
-  ngOnInit(): void {
+  async ngOnInit() {
     this.getAppName();
+    this.supportedUserTypesConfig = await this.profileHandler.getSupportedUserTypes();
+    this.appPrimaryColor = getComputedStyle(document.querySelector('html')).getPropertyValue('--app-primary-medium');
   }
 
-  ionViewWillEnter() {
-    this.headerService.hideHeader();
+  async ionViewWillEnter() {
+    if (this.dialCode) {
+      this.enableSearch = true;
+    }
+    this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
+      this.handleHeaderEvents(eventName);
+    });
+    if(this.isFromGroupFlow || this.searchWithBackButton){
+      this.headerService.showHeaderWithBackButton();
+    } else {
+      this.headerService.showHeaderWithHomeButton();
+    }
     this.handleDeviceBackButton();
+    this.searchFilterConfig = await this.formAndFrameworkUtilService.getFormFields(FormConstants.SEARCH_FILTER);
+    if ((this.source === PageId.GROUP_DETAIL && this.isFirstLaunch) || this.preAppliedFilter) {
+      this.isFirstLaunch = false;
+      this.handleSearch(true);
+    }
   }
 
   ionViewDidEnter() {
-    if (!this.dialCode && this.isFirstLaunch) {
+    if (!this.dialCode && this.isFirstLaunch && this.source !== PageId.GROUP_DETAIL) {
       setTimeout(() => {
         this.isFirstLaunch = false;
-        this.searchBar.setFocus();
       }, 100);
     }
+    this.sbProgressLoader.hide({ id: this.dialCode });
 
     this.checkUserSession();
+    this.refresher ? this.refresher.disabled = false : null;
+  }
+
+  hideRefresher(hide) {
+    this.refresh = hide;
   }
 
   ngAfterViewInit() {
@@ -185,17 +282,18 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
           return from(this.searchHistoryService.getEntries({
             like: v,
             limit: 5,
-            namespace: this.source === PageId.LIBRARY ? SearchHistoryNamespaces.LIBRARY : SearchHistoryNamespaces.COURSE
+            namespace: SearchHistoryNamespaces.LIBRARY
           }).toPromise());
         }
 
         return from(this.searchHistoryService.getEntries({
           limit: 10,
-          namespace: this.source === PageId.LIBRARY ? SearchHistoryNamespaces.LIBRARY : SearchHistoryNamespaces.COURSE
+          namespace: SearchHistoryNamespaces.LIBRARY
         }).toPromise());
       }),
-      tap((v) => {
+      tap(() => {
         setTimeout(() => {
+          this.showAddToGroupButtons = false;
           this.changeDetectionRef.detectChanges();
         });
       }) as any
@@ -228,12 +326,19 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
     if (this.eventSubscription) {
       this.eventSubscription.unsubscribe();
     }
+    if (this.headerObservable) {
+      this.headerObservable.unsubscribe();
+    }
+    this.refresher.disabled = true;
   }
 
   ngOnDestroy() {
     if (this.eventSubscription) {
       this.eventSubscription.unsubscribe();
     }
+    if (this.headerObservable) {
+      this.headerObservable.unsubscribe();
+    }
   }
 
   private async getAppName() {
@@ -295,41 +400,57 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
   handleDeviceBackButton() {
     this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
       this.navigateToPreviousPage();
-      this.telemetryGeneratorService.generateBackClickedTelemetry(ImpressionType.SEARCH,
-        Environment.HOME, false, undefined, this.corRelationList);
+      if (this.displayDialCodeResult && this.displayDialCodeResult[0].dialCodeResult &&
+        this.displayDialCodeResult[0].dialCodeResult.length) {
+        this.telemetryGeneratorService.generateBackClickedNewTelemetry(
+          true,
+          this.source === PageId.ONBOARDING ? Environment.ONBOARDING : Environment.HOME,
+          PageId.QR_BOOK_RESULT
+        );
+      } else {
+        this.telemetryGeneratorService.generateBackClickedTelemetry(ImpressionType.SEARCH,
+          Environment.HOME, false, undefined, this.corRelationList);
+      }
     });
   }
 
   openCollection(collection) {
-    const identifier = collection.identifier;
-    let telemetryObject: TelemetryObject;
-    const objectType = this.telemetryGeneratorService.isCollection(collection.mimeType) ? collection.contentType : ContentType.RESOURCE;
-    telemetryObject = new TelemetryObject(identifier, objectType, undefined);
     const values = new Map();
     values.root = true;
     this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
       InteractSubtype.CONTENT_CLICKED,
       !this.appGlobalService.isOnBoardingCompleted ? Environment.ONBOARDING : Environment.HOME,
       PageId.DIAL_SEARCH,
-      telemetryObject,
+      ContentUtil.getTelemetryObject(collection),
       values,
       undefined,
       this.corRelationList);
     this.showContentDetails(collection, true);
   }
 
-  async openContent(collection, content, index?, isQrCodeLinkToSingleContent?) {
-    this.showLoader = false;
-    this.parentContent = collection;
-    this.isQrCodeLinkToContent = isQrCodeLinkToSingleContent;
-    this.generateInteractEvent(content.identifier, content.contentType, content.pkgVersion, index ? index : 0);
-    if (collection !== undefined) {
-      this.parentContent = collection;
-      this.childContent = content;
-      this.checkParent(collection, content);
+  async openContent(collection, content, index?, isQrCodeLinkToSingleContent?, markAsSelected?) {
+    if (markAsSelected && this.isFromGroupFlow) {
+      this.searchContentResult.forEach((element, idx) => {
+        if (idx === index) {
+          element.selected = true;
+        } else {
+          element.selected = false;
+        }
+      });
+      this.showAddToGroupButtons = true;
     } else {
       this.showLoader = false;
-      await this.checkRetiredOpenBatch(content);
+      this.parentContent = collection;
+      this.isQrCodeLinkToContent = isQrCodeLinkToSingleContent;
+      this.generateInteractEvent(content.identifier, content.contentType, content.pkgVersion, index ? index : 0);
+      if (collection !== undefined) {
+        this.parentContent = collection;
+        this.childContent = content;
+        this.checkParent(collection, content);
+      } else {
+        this.showLoader = false;
+        await this.checkRetiredOpenBatch(content);
+      }
     }
   }
 
@@ -369,81 +490,111 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
       this.appGlobalService.setOnBoardingCompleted();
     }
 
-    if (content.contentType === ContentType.COURSE) {
-      if (!this.guestUser) {
-        this.enrolledCourses = await this.getEnrolledCourses(false, false);
-      } else {
-        this.enrolledCourses = [];
-      }
-      if (this.enrolledCourses && this.enrolledCourses.length) {
-        for (let i = 0; i < this.enrolledCourses.length; i++) {
-          if (content.identifier === this.enrolledCourses[i].courseId) {
-            params.content = this.enrolledCourses[i];
+    switch (ContentUtil.isTrackable(content)) {
+      case 1:
+        if (!this.guestUser) {
+          this.enrolledCourses = await this.getEnrolledCourses(false);
+        } else {
+          this.enrolledCourses = [];
+        }
+        if (this.enrolledCourses && this.enrolledCourses.length) {
+          for (let i = 0; i < this.enrolledCourses.length; i++) {
+            if (content.identifier === this.enrolledCourses[i].courseId) {
+              params.content = this.enrolledCourses[i];
+            }
           }
         }
-      }
-      this.router.navigate([RouterLinks.ENROLLED_COURSE_DETAILS], {
-        state: {
-          content: params.content,
-          corRelation: params.corRelation,
-          isSingleContent: params.isSingleContent,
-          onboarding: params.onboarding,
-          parentContent: params.parentContent,
-          isQrCodeLinkToContent: params.isQrCodeLinkToContent,
-          isOnboardingSkipped: !this.appGlobalService.isOnBoardingCompleted
+        const correlationData: CorrelationData = new CorrelationData();
+        if (this.source === PageId.GROUP_DETAIL) {
+          correlationData.id = PageId.GROUP_DETAIL;
+          correlationData.type = CorReleationDataType.FROM_PAGE;
+          if (params && params.corRelation) {
+            params.corRelation.push(correlationData);
+          }
         }
-      });
-      if (this.isSingleContent) {
-        this.isSingleContent = false;
-        // migration-TODO
-        // const view = this.navCtrl.getActive();
-        // this.navCtrl.removeView(view);
-      }
-    } else if (content.mimeType === MimeType.COLLECTION) {
-      if (this.isDialCodeSearch && !isRootContent) {
-        params.isCreateNavigationStack = true;
-
-        this.navCtrl.navigateForward([RouterLinks.QRCODERESULT], {
-          state: {
+        if (CsGroupAddableBloc.instance.initialised) {
+          this.updateCsGroupAddableBloc(params, PageId.COURSE_DETAIL);
+        }
+        this.navService.navigateToTrackableCollection(
+          {
+            source: this.source,
+            groupId: this.groupId,
+            activityList: this.activityList,
             content: params.content,
             corRelation: params.corRelation,
             isSingleContent: params.isSingleContent,
             onboarding: params.onboarding,
             parentContent: params.parentContent,
-            isProfileUpdated: params.isProfileUpdated,
             isQrCodeLinkToContent: params.isQrCodeLinkToContent,
-            isAvailableLocally: params.isAvailableLocally
+            isOnboardingSkipped: !this.appGlobalService.isOnBoardingCompleted
           }
-        });
+        );
         if (this.isSingleContent) {
           this.isSingleContent = false;
-          // migration-TODO
-          // const view = this.navCtrl.getActive();
-          // this.navCtrl.removeView(view);
         }
-
-      } else {
-        this.router.navigate([RouterLinks.COLLECTION_DETAIL_ETB], {
-          state: {
+        break;
+      case 0:
+        if (this.isDialCodeSearch && !isRootContent) {
+          params.isCreateNavigationStack = true;
+
+          const corRelationList: Array<CorrelationData> = [];
+          corRelationList.push({ id: this.dialCode, type: CorReleationDataType.QR });
+
+          const telemetryObject = new TelemetryObject(content.identifier, ObjectType.TEXTBOOK, undefined);
+          this.telemetryGeneratorService.generateInteractTelemetry(
+            InteractType.SELECT_BOOK, '',
+            this.source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+            PageId.QR_BOOK_RESULT,
+            telemetryObject,
+            undefined, undefined,
+            corRelationList
+          );
+
+          this.navCtrl.navigateForward([RouterLinks.QRCODERESULT], {
+            state: {
+              content: params.content,
+              corRelation: params.corRelation,
+              isSingleContent: params.isSingleContent,
+              onboarding: params.onboarding,
+              parentContent: params.parentContent,
+              isProfileUpdated: params.isProfileUpdated,
+              isQrCodeLinkToContent: params.isQrCodeLinkToContent,
+              isAvailableLocally: params.isAvailableLocally,
+              source: params.source,
+              dialCode: this.dialCode
+            }
+          });
+          if (this.isSingleContent) {
+            this.isSingleContent = false;
+          }
+        } else {
+          if (CsGroupAddableBloc.instance.initialised) {
+            this.updateCsGroupAddableBloc(params, PageId.COLLECTION_DETAIL);
+          }
+          this.navService.navigateToCollection({
+            source: this.source,
+            groupId: this.groupId,
+            activityList: this.activityList,
             content: params.content,
             corRelation: params.corRelation,
             isSingleContent: params.isSingleContent,
             onboarding: params.onboarding,
             parentContent: params.parentContent
-          }
-        });
-
-      }
-    } else {
-      this.router.navigate([RouterLinks.CONTENT_DETAILS], {
-        state: {
+          });
+        }
+        break;
+      case -1:
+        if (CsGroupAddableBloc.instance.initialised) {
+          this.updateCsGroupAddableBloc(params, PageId.CONTENT_DETAIL);
+        }
+        this.navService.navigateToContent({
           content: params.content,
           corRelation: params.corRelation,
           isSingleContent: params.isSingleContent,
           onboarding: params.onboarding,
           parentContent: params.parentContent
-        }
-      });
+        });
+        break;
     }
   }
 
@@ -601,7 +752,7 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
                     this.setCurrentProfile(0, data);
                   }
                 }).catch((err) => {
-                  if (err instanceof NetworkError) {
+                  if (NetworkError.isInstance(err)) {
                     this.commonUtilService.showToast('ERROR_OFFLINE_MODE');
                   }
                 });
@@ -611,7 +762,7 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
           });
         })
         .catch((err) => {
-          if (err instanceof NetworkError) {
+          if (NetworkError.isInstance(err)) {
             this.commonUtilService.showToast('ERROR_OFFLINE_MODE');
           }
         });
@@ -663,41 +814,58 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
     this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
       InteractSubtype.FILTER_BUTTON_CLICKED,
       Environment.HOME,
-      this.source, undefined);
-    this.formAndFrameworkUtilService.getLibraryFilterConfig().then((data) => {
-      const filterCriteriaData = this.responseData.filterCriteria;
-      filterCriteriaData.facetFilters.forEach(element => {
-        data.forEach(item => {
-          if (element.name === item.code) {
-            element.translatedName = this.commonUtilService.getTranslatedValue(item.translations, item.name);
+      this.source || PageId.SEARCH, undefined);
+    const filterCriteriaData = this.responseData.filterCriteria;
+    filterCriteriaData.facetFilters.forEach(element => {
+      this.searchFilterConfig.forEach(item => {
+        if (element.name === item.code) {
+          element.translatedName = this.commonUtilService.getTranslatedValue(item.translations, item.name);
+          return;
+        }
+      });
+
+      this.initialFilterCriteria.facetFilters.forEach(newElement => {
+        this.searchFilterConfig.forEach(item => {
+          if (newElement.name === item.code) {
+            newElement.translatedName = this.commonUtilService.getTranslatedValue(item.translations, item.name);
             return;
           }
         });
       });
       this.router.navigate(['/filters'], {
         state: {
-          filterCriteria: this.responseData.filterCriteria
+          filterCriteria: this.responseData.filterCriteria,
+          initialfilterCriteria: this.initialFilterCriteria,
+          supportedUserTypesConfig: this.supportedUserTypesConfig,
+          source: this.source
         }
       });
     });
   }
 
   applyFilter() {
+    this.showAddToGroupButtons = false;
     this.showLoader = true;
     this.responseData.filterCriteria.mode = 'hard';
     this.responseData.filterCriteria.searchType = SearchType.FILTER;
-    this.contentService.searchContent(this.responseData.filterCriteria).toPromise()
+    const modifiedCriteria = JSON.parse(JSON.stringify(this.responseData.filterCriteria));
+    modifiedCriteria.facetFilters.forEach(facet => {
+      if (facet.values && facet.values.length > 0) {
+        if (facet.name === 'audience') {
+          facet.values = ContentUtil.getAudienceFilter(facet, this.supportedUserTypesConfig);
+        }
+      }
+    });
+    this.contentService.searchContent(modifiedCriteria).toPromise()
       .then((responseData: ContentSearchResult) => {
 
         this.zone.run(() => {
           this.responseData = responseData;
           if (responseData) {
-
             if (this.isDialCodeSearch) {
               this.processDialCodeResult(responseData.contentDataList);
             } else {
               this.searchContentResult = responseData.contentDataList;
-
               this.isEmptyResult = !(this.searchContentResult && this.searchContentResult.length > 0);
               const values = new Map();
               values.from = this.source;
@@ -705,6 +873,9 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
               values.searchCriteria = this.responseData.filterCriteria;
               this.telemetryGeneratorService.generateExtraInfoTelemetry(values, PageId.SEARCH);
             }
+            if (this.responseData.filterCriteria && this.responseData.filterCriteria.facetFilters) {
+              this.fetchPrimaryCategoryFilters(this.responseData.filterCriteria.facetFilters);
+            }
             this.updateFilterIcon();
           } else {
             this.isEmptyResult = true;
@@ -726,41 +897,86 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
     this.isEmptyResult = false;
   }
 
-  handleSearch() {
+  handleSearch(shouldApplyProfileFilter = false) {
     this.scrollToTop();
-    if (this.searchKeywords.length < 3) {
+    if (this.searchKeywords.length < 3 && this.source !== PageId.GROUP_DETAIL && !this.preAppliedFilter) {
       return;
     }
-
+    this.showAddToGroupButtons = false;
     this.addSearchHistoryEntry();
 
     this.showLoader = true;
 
     (window as any).cordova.plugins.Keyboard.close();
-
+    const facets = this.searchFilterConfig.reduce((acc, filterConfig) => {
+      acc.push(filterConfig.code);
+      return acc;
+    }, []);
     const contentSearchRequest: ContentSearchCriteria = {
       searchType: SearchType.SEARCH,
       query: this.searchKeywords,
-      contentTypes: this.contentType,
-      facets: Search.FACETS,
-      audience: this.audienceFilter,
+      primaryCategories: this.primaryCategories,
+      facets: facets ? facets : Search.FACETS,
       mode: 'soft',
       framework: this.currentFrameworkId,
-      languageCode: this.selectedLanguageCode
+      languageCode: this.selectedLanguageCode,
     };
 
+    if (this.profile && this.source === PageId.GROUP_DETAIL && shouldApplyProfileFilter) {
+      if (this.profile.board && this.profile.board.length) {
+        contentSearchRequest.board = applyProfileFilter(this.appGlobalService, this.profile.board,
+          contentSearchRequest.board, 'board');
+      }
+
+      if (this.profile.medium && this.profile.medium.length) {
+        contentSearchRequest.medium = applyProfileFilter(this.appGlobalService, this.profile.medium,
+          contentSearchRequest.medium, 'medium');
+      }
+
+      if (this.profile.grade && this.profile.grade.length) {
+        contentSearchRequest.grade = applyProfileFilter(this.appGlobalService, this.profile.grade,
+          contentSearchRequest.grade, 'gradeLevel');
+      }
+    }
+
     this.isDialCodeSearch = false;
 
     this.dialCodeContentResult = undefined;
     this.dialCodeResult = undefined;
     this.corRelationList = [];
-
-    this.contentService.searchContent(contentSearchRequest).toPromise()
+    let searchQuery;
+    if (this.activityTypeData ||  this.preAppliedFilter) {
+      const query = this.activityTypeData ? this.activityTypeData.searchQuery :
+        JSON.stringify({ request:  this.preAppliedFilter });
+      searchQuery = updateFilterInSearchQuery(query, undefined, false);
+      searchQuery.request.query = this.searchKeywords;
+      searchQuery.request.facets = contentSearchRequest.facets;
+      if (this.activityTypeData) {
+        searchQuery.request.mode = contentSearchRequest.mode;
+      }
+      searchQuery.request.searchType = SearchType.FILTER;
+      const profileFilters = {
+        board: contentSearchRequest.board || [],
+        medium: contentSearchRequest.medium || [],
+        gradeLevel: contentSearchRequest.grade || []
+      };
+      searchQuery.request.filters = {
+        ...searchQuery.request.filters,
+        ...profileFilters,
+        board: [...(searchQuery.request.filters.board || []), ...(profileFilters.board || [])],
+        medium: [...(searchQuery.request.filters.medium || []), ...(profileFilters.medium || [])],
+        gradeLevel: [...(searchQuery.request.filters.gradeLevel || []), ...(profileFilters.gradeLevel || [])]
+      };
+    }
+    this.contentService.searchContent(contentSearchRequest, searchQuery).toPromise()
       .then((response: ContentSearchResult) => {
         this.zone.run(() => {
           this.responseData = response;
+          this.preAppliedFilter = undefined;
           if (response) {
-
+            if (!this.initialFilterCriteria) {
+              this.initialFilterCriteria = JSON.parse(JSON.stringify(this.responseData.filterCriteria));
+            }
             this.addCorRelation(response.responseMessageId, 'API');
             this.searchContentResult = response.contentDataList;
             this.isEmptyResult = !this.searchContentResult || this.searchContentResult.length === 0;
@@ -773,6 +989,9 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
             values.searchCount = this.searchContentResult ? this.searchContentResult.length : 0;
             values.searchCriteria = response.request;
             this.telemetryGeneratorService.generateExtraInfoTelemetry(values, PageId.SEARCH);
+            if (response.filterCriteria && response.filterCriteria.facetFilters) {
+              this.fetchPrimaryCategoryFilters(response.filterCriteria.facetFilters);
+            }
           } else {
             this.isEmptyResult = true;
           }
@@ -790,10 +1009,13 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   private addSearchHistoryEntry() {
+    if (!this.searchKeywords) {
+      return;
+    }
     this.searchHistoryService
       .addEntry({
         query: this.searchKeywords,
-        namespace: this.source === PageId.LIBRARY ? SearchHistoryNamespaces.LIBRARY : SearchHistoryNamespaces.COURSE
+        namespace: SearchHistoryNamespaces.LIBRARY
       })
       .toPromise();
   }
@@ -805,7 +1027,7 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
     this.loader.onDidDismiss(() => { this.loader = undefined; });
     let retiredBatches: Array<any> = [];
     let anyOpenBatch = false;
-    await this.getEnrolledCourses(false, true);
+    await this.getEnrolledCourses(true);
     this.enrolledCourses = this.enrolledCourses || [];
     if (layoutName !== ContentCard.LAYOUT_INPROGRESS) {
       retiredBatches = this.enrolledCourses.filter((element) => {
@@ -829,12 +1051,11 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
   // TODO: SDK changes by Swayangjit
   async navigateToBatchListPopup(content: any, layoutName?: string, retiredBatched?: any) {
     const ongoingBatches = [];
-    const upcommingBatches = [];
     const courseBatchesRequest: CourseBatchesRequest = {
       filters: {
         courseId: layoutName === ContentCard.LAYOUT_INPROGRESS ? content.contentId : content.identifier,
         enrollmentType: CourseEnrollmentType.OPEN,
-        status: [CourseBatchStatus.NOT_STARTED, CourseBatchStatus.IN_PROGRESS]
+        status: [CourseBatchStatus.IN_PROGRESS]
       },
       sort_by: { createdDate: SortOrder.DESC },
       fields: BatchConstants.REQUIRED_FIELDS
@@ -849,11 +1070,9 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
             this.zone.run(async () => {
               this.batches = res;
               if (this.batches.length) {
-                this.batches.forEach((batch, key) => {
+                this.batches.forEach((batch) => {
                   if (batch.status === 1) {
                     ongoingBatches.push(batch);
-                  } else {
-                    upcommingBatches.push(batch);
                   }
                 });
                 this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
@@ -864,10 +1083,10 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
                 const popover = await this.popoverCtrl.create({
                   component: EnrollmentDetailsComponent,
                   componentProps: {
-                    upcommingBatches,
+                    upcommingBatches: [],
                     ongoingBatches,
                     retiredBatched,
-                    courseId: content.identifier
+                    content
                   },
                   cssClass: 'enrollement-popover'
                 });
@@ -909,6 +1128,7 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
 
     this.event.subscribe('search.applyFilter', (filterCriteria) => {
       this.responseData.filterCriteria = filterCriteria;
+      this.primaryCategoryFilters = undefined;
       this.applyFilter();
     });
   }
@@ -922,14 +1142,14 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
 
     this.showLoader = true;
 
-    const contentTypes = await this.formAndFrameworkUtilService.getSupportedContentFilterConfig(
+    const primaryCategories = await this.formAndFrameworkUtilService.getSupportedContentFilterConfig(
       ContentFilterConfig.NAME_DIALCODE);
-    this.contentType = contentTypes;
+    this.primaryCategories = primaryCategories;
 
     // Page API START
     const pageAssemblefilter: PageAssembleFilter = {};
     pageAssemblefilter.dialcodes = this.dialCode;
-    pageAssemblefilter.contentType = this.contentType;
+    pageAssemblefilter.primaryCategory = this.primaryCategories;
 
     const pageAssembleCriteria: PageAssembleCriteria = {
       name: PageName.DIAL_CODE,
@@ -940,7 +1160,6 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
     if (this.profile && this.profile.board && this.profile.board.length) {
       pageAssembleCriteria.userProfile = { board: applyProfileFilter(this.appGlobalService, this.profile.board, [], 'board') };
     }
-    // pageAssembleCriteria.hardRefresh = true;
 
     this.pageService.getPageAssemble(pageAssembleCriteria).toPromise()
       .then((res: any) => {
@@ -949,22 +1168,31 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
           if (sections && sections.length) {
             this.addCorRelation(sections[0].resmsgId, 'API');
             this.processDialCodeResult(sections);
-            // this.updateFilterIcon();  // TO DO
           }
           this.showLoader = false;
         });
-      }).catch(error => {
+      }).catch(() => {
         this.zone.run(() => {
           this.showLoader = false;
           if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
             this.commonUtilService.showToast('ERROR_OFFLINE_MODE');
+            const corRelationList: Array<CorrelationData> = [];
+            corRelationList.push({ id: this.dialCode, type: CorReleationDataType.QR });
+
+            this.telemetryGeneratorService.generateImpressionTelemetry(
+              AuditType.TOAST_SEEN,
+              ImpressionSubtype.OFFLINE_MODE,
+              PageId.SCAN_OR_MANUAL,
+              this.source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+              undefined, undefined, undefined, undefined,
+              corRelationList
+            );
           } else {
             this.commonUtilService.showToast('SOMETHING_WENT_WRONG');
           }
           this.location.back();
         });
       });
-    // Page API END
   }
 
   generateInteractEvent(identifier, contentType, pkgVersion, index) {
@@ -1058,7 +1286,7 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
         const dialCodeContentResult = [];
         const dialCodeContentCourseResult = []; // content type course
         contentArray.forEach((content) => {
-          if (content.contentType === ContentType.COURSE) {
+          if (content.contentType === CsContentType.COURSE) {
             dialCodeContentCourseResult.push(content);
           } else if (addedContent.indexOf(content.identifier) < 0) {
             dialCodeContentResult.push(content);
@@ -1078,7 +1306,9 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
           displayDialCodeResult.push(dialCodeCourseResultObj);
         }
       }
-
+      if (displayDialCodeResult.length && displayDialCodeResult[0].dialCodeResult) {
+        this.generateImpressionEvent(displayDialCodeResult[0].dialCodeResult);
+      }
       let isParentCheckStarted = false;
       if (dialCodeResultObj.dialCodeResult.length === 1 && dialCodeResultObj.dialCodeResult[0].content.length === 1
         && isAllContentMappedToCollection) {
@@ -1106,7 +1336,7 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
         '',
         PageId.DIAL_NOT_LINKED,
         Environment.HOME);
-      this.commonUtilService.showContentComingSoonAlert(this.source);
+      this.commonUtilService.showContentComingSoonAlert(this.source, undefined, this.dialCode);
     }
   }
 
@@ -1184,7 +1414,7 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
           });
         }
       }).catch((err) => {
-        if (err instanceof NetworkError) {
+        if (NetworkError.isInstance(err)) {
           this.commonUtilService.showToast('ERROR_OFFLINE_MODE');
         }
       });
@@ -1236,7 +1466,7 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
         });
       })
       .catch((err) => {
-        if (err instanceof NetworkError) {
+        if (NetworkError.isInstance(err)) {
           this.commonUtilService.showToast('ERROR_OFFLINE_MODE');
           this.showLoading = false;
           this.isDownloadStarted = false;
@@ -1350,18 +1580,6 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   checkUserSession() {
-    const isGuestUser = !this.appGlobalService.isUserLoggedIn();
-
-    if (isGuestUser) {
-      const userType = this.appGlobalService.getGuestUserType();
-      if (userType === ProfileType.STUDENT) {
-        this.audienceFilter = AudienceFilter.GUEST_STUDENT;
-      } else if (this.commonUtilService.isAccessibleForNonStudentRole(userType)) {
-        this.audienceFilter = AudienceFilter.GUEST_TEACHER;
-      }
-    } else {
-      this.audienceFilter = AudienceFilter.LOGGED_IN_USER;
-    }
     this.profile = this.appGlobalService.getCurrentUser();
   }
 
@@ -1375,13 +1593,28 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
     this.corRelationList.push(corRelation);
   }
 
-  private generateImpressionEvent() {
-    this.telemetryGeneratorService.generateImpressionTelemetry(
-      ImpressionType.SEARCH, '',
-      this.source ? this.source : PageId.SEARCH,
-      Environment.HOME, '', '', '',
-      undefined,
-      this.corRelationList);
+  private generateImpressionEvent(dialCodeResult?) {
+    if (dialCodeResult && dialCodeResult.length) {
+      const corRelationList: Array<CorrelationData> = [];
+      corRelationList.push({ id: this.dialCode, type: CorReleationDataType.QR });
+      corRelationList.push({ id: dialCodeResult.length.toString(), type: CorReleationDataType.COUNT_BOOK });
+      this.telemetryGeneratorService.generatePageLoadedTelemetry(
+        PageId.QR_BOOK_RESULT,
+        this.source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        corRelationList
+      );
+    } else {
+      this.telemetryGeneratorService.generateImpressionTelemetry(
+        ImpressionType.SEARCH, '',
+        this.source ? this.source : PageId.SEARCH,
+        Environment.HOME, '', '', '',
+        undefined,
+        this.corRelationList);
+    }
   }
 
   private generateLogEvent(searchResult) {
@@ -1405,7 +1638,7 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
    *
    * It internally calls course handler of genie sdk
    */
-  private getEnrolledCourses(refreshEnrolledCourses: boolean = true, returnRefreshedCourses: boolean = false): Promise<any> {
+  private getEnrolledCourses(returnRefreshedCourses: boolean = false): Promise<any> {
     this.showLoader = true;
     const option: FetchEnrolledCourseRequest = {
       userId: this.userId,
@@ -1428,7 +1661,7 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
           });
           return enrolledCourses;
         }
-      }, (err) => {
+      }, () => {
         this.showLoader = false;
         return [];
       });
@@ -1439,23 +1672,156 @@ export class SearchPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   goBack() {
-    this.telemetryGeneratorService.generateBackClickedTelemetry(ImpressionType.SEARCH,
-      Environment.HOME, true, undefined, this.corRelationList);
+    if (this.displayDialCodeResult && this.displayDialCodeResult[0].dialCodeResult && this.displayDialCodeResult[0].dialCodeResult.length) {
+      this.telemetryGeneratorService.generateBackClickedNewTelemetry(
+        false,
+        this.source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+        PageId.QR_BOOK_RESULT
+      );
+    } else {
+      this.telemetryGeneratorService.generateBackClickedTelemetry(ImpressionType.SEARCH,
+        Environment.HOME, true, undefined, this.corRelationList);
+    }
     this.navigateToPreviousPage();
   }
 
-  getContentCount(resultlist) {
+  getContentCount(displayDialCodeResult) {
     let totalCount = 0;
-    if (resultlist.dialCodeResult.length) {
-      for (let i = 0; i < resultlist.dialCodeResult.length; i++) {
-        if (resultlist.dialCodeResult[i].content && resultlist.dialCodeResult[i].content.length) {
-          totalCount += resultlist.dialCodeResult[i].content.length;
+    displayDialCodeResult.forEach(resultlist => {
+      if (resultlist.dialCodeResult.length) {
+        for (let i = 0; i < resultlist.dialCodeResult.length; i++) {
+          if (resultlist.dialCodeResult[i].content && resultlist.dialCodeResult[i].content.length) {
+            totalCount += resultlist.dialCodeResult[i].content.length;
+          }
         }
       }
+      if (resultlist.dialCodeContentResult.length) {
+        totalCount += resultlist.dialCodeContentResult.length;
+      }
+    });
+    return totalCount;
+  }
+
+  async addActivityToGroup() {
+    const content = this.searchContentResult.find((c) => c.selected);
+    if (this.activityList) {
+      const activityExist = this.activityList.find(activity => activity.id === content.identifier);
+      if (activityExist) {
+        this.commonUtilService.showToast('ACTIVITY_ALREADY_ADDED_IN_GROUP');
+        return;
+      }
     }
-    if (resultlist.dialCodeContentResult.length) {
-      totalCount += resultlist.dialCodeContentResult.length;
+    this.groupHandlerService.addActivityToGroup(
+      this.groupId,
+      content.identifier,
+      (this.activityTypeData && this.activityTypeData.activityType) || {},
+      PageId.SEARCH,
+      this.corRelationList,
+      -2);
+  }
+
+  openSelectedContent() {
+    let index = 0;
+    let content;
+    this.searchContentResult.forEach((element, idx) => {
+      if (element.selected) {
+        index = idx;
+        content = element;
+      }
+    });
+    this.openContent(undefined, content, index, undefined, false);
+  }
+
+  private updateCsGroupAddableBloc(params, pageId) {
+    const cData = {
+      type: CorReleationDataType.GROUP_ID,
+      id: CsGroupAddableBloc.instance.state.groupId
     }
-    return totalCount;
+    params.corRelation.push(cData)
+    CsGroupAddableBloc.instance.updateState(
+      {
+        pageIds: [pageId],
+        groupId: CsGroupAddableBloc.instance.state.groupId,
+        params: {
+          ...CsGroupAddableBloc.instance.state.params,
+          corRelation: params.corRelation,
+          noOfPagesToRevertOnSuccess: -3,
+          activityType: (this.activityTypeData && this.activityTypeData.activityType) || {}
+        }
+      }
+    );
   }
+
+  searchOnFocus() {
+    this.enableSearch = true;
+    this.searchInfolVisibility = 'hide';
+    this.headerService.showHeaderWithBackButton();
+    this.appGlobalService.isDiscoverBackEnabled = true;
+  }
+
+  handleHeaderEvents($event) {
+    switch ($event.name) {
+      case 'back':
+        if (this.isFromGroupFlow) {
+          this.location.back()
+        } else if(this.enableSearch) {
+          this.enableSearch = false;
+          this.searchInfolVisibility = 'show';
+          this.headerService.showHeaderWithHomeButton();
+          this.appGlobalService.isDiscoverBackEnabled = false; 
+        } else {
+          this.location.back()
+        }
+        break;
+      default: console.warn('Use Proper Event name');
+    }
+  }
+
+  fetchPrimaryCategoryFilters(facetFilters) {
+    if (!this.primaryCategoryFilters) {
+      setTimeout(() => {
+        for (let index = 0; index < facetFilters.length; index++) {
+          if (facetFilters[index].name === 'primaryCategory') {
+            this.primaryCategoryFilters = facetFilters[index].values;
+            break;
+          }
+        }
+      });
+    }
+  }
+
+  handleFilterSelect(event) {
+    if (!event || !event.data || !event.data.length) {
+      return;
+    }
+    if (this.initialFilterCriteria) {
+      this.responseData.filterCriteria = JSON.parse(JSON.stringify(this.initialFilterCriteria));
+    }
+    let primaryCategoryFilter = (this.responseData.filterCriteria as ContentSearchCriteria).facetFilters.find(facet => {
+      return facet.name === 'primaryCategory'
+    });
+    if (!primaryCategoryFilter) {
+      return;
+    }
+    let primaryCategoryFilterValue = primaryCategoryFilter.values.find(f => {
+      return f.name ===  (event.data[0].value && event.data[0].value.name);
+    })
+    if (!primaryCategoryFilterValue) {
+      return
+    }
+    if (!primaryCategoryFilterValue.apply) {
+      this.selectedPrimaryCategoryFilter = primaryCategoryFilterValue;
+      primaryCategoryFilterValue.apply = true;
+      this.applyFilter();
+    }
+  }
+
+  tabViewWillEnter() {
+    if(this.isFromGroupFlow || this.searchWithBackButton){
+      this.headerService.showHeaderWithBackButton();
+    } else {
+      this.headerService.showHeaderWithHomeButton();
+    }
+  }
+
 }
diff --git a/src/app/settings/about-us/about-us.component.ts b/src/app/settings/about-us/about-us.component.ts
index 06b232d05..e6efeca90 100644
--- a/src/app/settings/about-us/about-us.component.ts
+++ b/src/app/settings/about-us/about-us.component.ts
@@ -14,7 +14,7 @@ import {
   Environment,
   ImpressionType
 } from '../../../services';
-import { ContentType, AudienceFilter, RouterLinks, GenericAppConfig } from '../../app.constant';
+import { AudienceFilter, RouterLinks, GenericAppConfig, PrimaryCategory } from '../../app.constant';
 import { Router } from '@angular/router';
 import { Location } from '@angular/common';
 import { AppVersion } from '@ionic-native/app-version/ngx';
@@ -100,7 +100,7 @@ export class AboutUsComponent implements OnInit {
       server: true
     };
     const contentRequest: ContentRequest = {
-      contentTypes: ContentType.FOR_DOWNLOADED_TAB,
+      primaryCategories: PrimaryCategory.FOR_DOWNLOADED_TAB,
       audience: AudienceFilter.GUEST_TEACHER
     };
     const getUserCount = await this.profileService.getAllProfiles(allUserProfileRequest).pipe(
@@ -179,6 +179,7 @@ export class AboutUsComponent implements OnInit {
   }
 
   goBack() {
+    this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.SETTINGS_ABOUT_US, Environment.SETTINGS, true);
     this.location.back();
   }
 
diff --git a/src/app/settings/data-sync/data-sync.component.spec.ts b/src/app/settings/data-sync/data-sync.component.spec.ts
index 529c65b6a..f36561dfb 100644
--- a/src/app/settings/data-sync/data-sync.component.spec.ts
+++ b/src/app/settings/data-sync/data-sync.component.spec.ts
@@ -1,8 +1,25 @@
 import {DataSyncComponent} from '@app/app/settings/data-sync/data-sync.component';
-import {ArchiveObjectExportProgress, ArchiveObjectType, TelemetryService, ArchiveService, TelemetrySyncStat, ArchiveExportProgress, ObjectNotFoundError} from 'sunbird-sdk';
+import {
+    ArchiveExportProgress,
+    ArchiveObjectExportProgress,
+    ArchiveObjectType,
+    ArchiveService,
+    ObjectNotFoundError,
+    TelemetryAutoSyncModes,
+    TelemetryService,
+    TelemetrySyncStat
+} from 'sunbird-sdk';
 import {ChangeDetectorRef, NgZone} from '@angular/core';
 import {SocialSharing} from '@ionic-native/social-sharing/ngx';
-import {CommonUtilService, TelemetryGeneratorService} from '@app/services';
+import {
+    CommonUtilService,
+    Environment,
+    ImpressionType,
+    InteractSubtype,
+    InteractType,
+    PageId,
+    TelemetryGeneratorService
+} from '@app/services';
 import {Location} from '@angular/common';
 import {Platform} from '@ionic/angular';
 import {EMPTY, of, throwError} from 'rxjs';
@@ -11,15 +28,17 @@ describe('DataSyncComponent', () => {
     let dataSyncComponent: DataSyncComponent;
 
     const mockTelemetryService: Partial<TelemetryService> = {
-        lastSyncedTimestamp: jest.fn().mockImplementation(() => EMPTY)
+        lastSyncedTimestamp: jest.fn().mockImplementation(() => of(100))
     };
     const mockArchiveService: Partial<ArchiveService> = {};
     const mockZone: Partial<NgZone> = {};
-    const mockChangeDetectionRef: Partial<ChangeDetectorRef> = {};
+    const mockChangeDetectionRef: Partial<ChangeDetectorRef> = {
+        detectChanges: jest.fn()
+    };
     const mockSocialSharing: Partial<SocialSharing> = {};
     const mockCommonUtilService: Partial<CommonUtilService> = {};
     const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
-    const location: Partial<Location> = {};
+    const mockLocation: Partial<Location> = {};
     const mockPlatform: Partial<Platform> = {};
 
     beforeAll(() => {
@@ -31,7 +50,7 @@ describe('DataSyncComponent', () => {
             mockSocialSharing as SocialSharing,
             mockCommonUtilService as CommonUtilService,
             mockTelemetryGeneratorService as TelemetryGeneratorService,
-            location as Location,
+            mockLocation as Location,
             mockPlatform as Platform,
         );
     });
@@ -48,8 +67,10 @@ describe('DataSyncComponent', () => {
 
             mockCommonUtilService.getLoader = jest.fn().mockImplementation(() => {
                 return Promise.resolve({
-                    present: () => {},
-                    dismiss: () => {}
+                    present: () => {
+                    },
+                    dismiss: () => {
+                    }
                 });
             });
             mockCommonUtilService.showToast = jest.fn().mockImplementation();
@@ -128,4 +149,202 @@ describe('DataSyncComponent', () => {
             });
         });
     });
+
+    it('should check for dataSyncType if available generate telemetry and setSyncMode based on that', (done) => {
+        // arrange
+        dataSyncComponent.dataSyncType = TelemetryAutoSyncModes.ALWAYS_ON;
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        const data = jest.fn(() => of());
+        mockTelemetryService.autoSync = {setSyncMode: data};
+        const value = new Map();
+        value['dataSyncType'] = dataSyncComponent.dataSyncType;
+        // act
+        dataSyncComponent.onSelected();
+        // assert
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH,
+            InteractSubtype.DATA_SYNC_TYPE,
+            Environment.SETTINGS,
+            PageId.SETTINGS_DATASYNC,
+            undefined,
+            value
+        );
+        setTimeout(() => {
+            expect(mockTelemetryService.autoSync.setSyncMode).toHaveBeenCalledWith(dataSyncComponent.dataSyncType);
+            done();
+        }, 0);
+    });
+
+    it('should not call telemetry service and interact telemetry if dataSyncType not available', () => {
+        // arrange
+        dataSyncComponent.dataSyncType = undefined;
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        const data = jest.fn(() => of());
+        mockTelemetryService.autoSync = {setSyncMode: data};
+        // act
+        dataSyncComponent.onSelected();
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).not.toHaveBeenCalled();
+    });
+
+    it('should call init method and set dataSyncType and generateImpressionTelemetry', (done) => {
+        // arrange
+        mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+        const data = jest.fn(() => of(undefined));
+        mockTelemetryService.autoSync = {getSyncMode: data};
+        mockZone.run = jest.fn();
+        const subscribeWithPriorityData = jest.fn((_, fn) => fn());
+        mockPlatform.backButton = {
+            subscribeWithPriority: subscribeWithPriorityData,
+        } as any;
+
+        const unsubscribeFn = jest.fn();
+        dataSyncComponent.backButtonFunc = {
+            unsubscribe: unsubscribeFn,
+        } as any;
+        mockLocation.back = jest.fn();
+        mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+
+        dataSyncComponent.ngOnInit();
+        expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+            ImpressionType.VIEW, '',
+            PageId.SETTINGS_DATASYNC,
+            Environment.SETTINGS, '', '', ''
+        );
+        expect(mockTelemetryGeneratorService.generateBackClickedTelemetry)
+            .toHaveBeenCalledWith(PageId.SETTINGS_DATASYNC, Environment.SETTINGS, false);
+        setTimeout(() => {
+            expect(dataSyncComponent.dataSyncType).toBe(undefined);
+            expect(mockLocation.back).toHaveBeenCalled();
+            expect(unsubscribeFn).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
+    describe('onSyncClick  test cases', () => {
+        it('should start loader and generate telemetry and call sbSync handle on telemetry_error', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockTelemetryService.sync = jest.fn(() => of({
+                syncedEventCount: 2,
+                syncTime: 100,
+                syncedFileSize: 3000
+
+            }));
+            jest.spyOn(global.sbsync, 'onSyncSucces').mockImplementation((cb) => cb({telemetry_error: 'error'}));
+            mockCommonUtilService.showToast = jest.fn();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            dataSyncComponent.onSyncClick();
+            expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(global.sbsync.onSyncSucces).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('DATA_SYNC_FAILURE');
+                done();
+            }, 0);
+        });
+
+        it('should start loader and generate telemetry and call sbSync handle on syncedEventCount', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockTelemetryService.sync = jest.fn(() => of({
+                syncedEventCount: 2,
+                syncTime: 100,
+                syncedFileSize: 3000
+
+            }));
+            jest.spyOn(global.sbsync, 'onSyncSucces').mockImplementation((cb) => cb({syncedEventCount: 3}));
+            mockCommonUtilService.showToast = jest.fn();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            dataSyncComponent.onSyncClick();
+            expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(global.sbsync.onSyncSucces).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.SYNC_NOW_CLICKED,
+                    Environment.SETTINGS,
+                    PageId.SETTINGS_DATASYNC,
+                    undefined,
+                    undefined
+                );
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.OTHER, InteractSubtype.MANUALSYNC_SUCCESS, Environment.SETTINGS,
+                    PageId.SETTINGS_DATASYNC,
+                    undefined,
+                    undefined
+                );
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('DATA_SYNC_SUCCESSFUL');
+                done();
+            }, 0);
+        });
+
+        it('should show Toast and dismiss loader ', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockTelemetryService.sync = jest.fn(() => of({
+                syncedEventCount: 2,
+                syncTime: 100,
+                syncedFileSize: 3000
+
+            }));
+            jest.spyOn(global.sbsync, 'onSyncSucces').mockImplementation((cb) => cb({syncedEventCount: undefined}));
+            mockCommonUtilService.showToast = jest.fn();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            dataSyncComponent.onSyncClick();
+            expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(global.sbsync.onSyncSucces).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('DATA_SYNC_NOTHING_TO_SYNC');
+                done();
+            }, 0);
+        });
+
+        it('should throw error and go to catch part on sbSyncSuccess ()', (done) => {
+            // arrange
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockTelemetryService.sync = jest.fn(() => of({
+                syncedEventCount: 2,
+                syncTime: 100,
+                syncedFileSize: 3000
+
+            }));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            jest.spyOn(global.sbsync, 'onSyncSucces').mockImplementation((_, error) => error('error'));
+            mockCommonUtilService.showToast = jest.fn();
+
+            dataSyncComponent.onSyncClick();
+            setTimeout(() => {
+                expect(presentFn).toHaveBeenCalled();
+                expect(global.sbsync.onSyncSucces).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('DATA_SYNC_FAILURE');
+                done();
+            }, 0);
+        });
+    });
 });
diff --git a/src/app/settings/data-sync/data-sync.component.ts b/src/app/settings/data-sync/data-sync.component.ts
index 99196dfb3..b1d822cef 100644
--- a/src/app/settings/data-sync/data-sync.component.ts
+++ b/src/app/settings/data-sync/data-sync.component.ts
@@ -1,28 +1,18 @@
-import { Component, OnInit, NgZone, Inject, ChangeDetectorRef } from '@angular/core';
-import {
-  TelemetrySyncStat,
-  TelemetryService,
-  TelemetryImpressionRequest,
-  TelemetryAutoSyncModes,
-  ArchiveService,
-  ArchiveObjectType,
-  ObjectNotFoundError
-} from 'sunbird-sdk';
-import { CommonUtilService } from '@app/services';
-import { TelemetryGeneratorService } from '@app/services';
-
+import { Location } from '@angular/common';
+import { ChangeDetectorRef, Component, Inject, NgZone, OnInit } from '@angular/core';
 import {
-  PageId,
-  Environment,
+  CommonUtilService, Environment,
   ImpressionType,
-  InteractType,
-  InteractSubtype
+  InteractSubtype, InteractType, PageId, TelemetryGeneratorService
 } from '@app/services';
 import { SocialSharing } from '@ionic-native/social-sharing/ngx';
-import { Location } from '@angular/common';
 import { Platform } from '@ionic/angular';
-import { Subscription, Observable } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
+import {
+  ArchiveObjectType, ArchiveService,
+  ObjectNotFoundError, TelemetryAutoSyncModes, TelemetryImpressionRequest, TelemetryService
+} from 'sunbird-sdk';
 
 declare const cordova;
 
@@ -38,6 +28,7 @@ export class DataSyncComponent implements OnInit {
   dataSyncType?: TelemetryAutoSyncModes;
   OPTIONS = TelemetryAutoSyncModes;
   backButtonFunc: Subscription;
+  loader: any;
 
   constructor(
     @Inject('TELEMETRY_SERVICE') private telemetryService: TelemetryService,
@@ -51,23 +42,23 @@ export class DataSyncComponent implements OnInit {
     private platform: Platform
   ) {
     this.lastSyncDateTime = this.telemetryService.lastSyncedTimestamp().pipe(
-        map((ts) => {
-          if (ts) {
-            return window.dayjs(ts).format('DD/MM/YYYY, hh:mm a');
-          }
-
-          return undefined;
-        }),
-        tap(() => {
-          this.changeDetectionRef.detectChanges();
-        })
+      map((ts) => {
+        if (ts) {
+          return window.dayjs(ts).format('DD/MM/YYYY, hh:mm a');
+        }
+
+        return undefined;
+      }),
+      tap(() => {
+        this.changeDetectionRef.detectChanges();
+      })
     );
   }
 
-  async init() {
+  private async init() {
     this.zone.run(async () => {
       this.dataSyncType = (
-          await this.telemetryService.autoSync.getSyncMode().toPromise() as TelemetryAutoSyncModes | undefined
+        await this.telemetryService.autoSync.getSyncMode().toPromise() as TelemetryAutoSyncModes | undefined
       ) || TelemetryAutoSyncModes.ALWAYS_ON;
     });
   }
@@ -83,6 +74,7 @@ export class DataSyncComponent implements OnInit {
       PageId.SETTINGS_DATASYNC,
       Environment.SETTINGS, '', '', ''
     );
+    this.handleBackButton();
   }
 
   onSelected() {
@@ -92,7 +84,7 @@ export class DataSyncComponent implements OnInit {
     }
   }
 
-  generateSyncTypeInteractTelemetry(dataSyncType: string) {
+  private generateSyncTypeInteractTelemetry(dataSyncType: string) {
     const value = new Map();
     value['dataSyncType'] = dataSyncType;
     this.telemetryGeneratorService.generateInteractTelemetry(
@@ -120,80 +112,80 @@ export class DataSyncComponent implements OnInit {
         ignoreSyncThreshold: true
       }).toPromise();
     } catch (e) {
-      console.error(e);
     }
 
     return this.archiveService.export(
-      { objects: [{ type: ArchiveObjectType.TELEMETRY }],
-      filePath: cordova.file.externalCacheDirectory + '/tmp' })
-        .toPromise()
-        .then(async (r) => {
-          await loader.dismiss();
-          return this.social.share('', '', r.filePath, '');
-        })
-        .catch(async (e) => {
-          console.error(e);
-          await loader.dismiss();
-
-          if (e instanceof ObjectNotFoundError) {
-            this.commonUtilService.showToast('SHARE_TELEMETRY_NO_DATA_FOUND');
-          } else {
-            this.commonUtilService.showToast('SHARE_TELEMETRY_FAILED');
-          }
-        });
+      {
+        objects: [{ type: ArchiveObjectType.TELEMETRY }],
+        filePath: cordova.file.externalCacheDirectory + '/tmp'
+      })
+      .toPromise()
+      .then(async (r) => {
+        await loader.dismiss();
+        return this.social.share('', '', r.filePath, '');
+      })
+      .catch(async (e) => {
+        await loader.dismiss();
+
+        if (e instanceof ObjectNotFoundError) {
+          this.commonUtilService.showToast('SHARE_TELEMETRY_NO_DATA_FOUND');
+        } else {
+          this.commonUtilService.showToast('SHARE_TELEMETRY_FAILED');
+        }
+      });
   }
 
   async onSyncClick() {
-    const that = this;
-    const loader = await this.commonUtilService.getLoader();
-    await loader.present();
-    this.generateInteractEvent(InteractType.TOUCH, InteractSubtype.MANUALSYNC_INITIATED, null);
+    this.loader = await this.commonUtilService.getLoader();
+    await this.loader.present();
+    this.generateInteractEvent(InteractType.TOUCH, InteractSubtype.SYNC_NOW_CLICKED, null);
     this.telemetryService.sync({
       ignoreAutoSyncMode: true,
       ignoreSyncThreshold: true
-    }).subscribe((syncStat: TelemetrySyncStat) => {
-        that.zone.run(async () => {
-          if (syncStat.error) {
-            await loader.dismiss();
-            this.commonUtilService.showToast('DATA_SYNC_FAILURE');
-            console.error('Telemetry Data Sync Error: ', syncStat);
-            return;
-          } else if (!syncStat.syncedEventCount) {
-            await loader.dismiss();
-            this.commonUtilService.showToast('DATA_SYNC_NOTHING_TO_SYNC');
-            console.error('Telemetry Data Sync Error: ', syncStat);
-            return;
-          }
-
-          this.generateInteractEvent(InteractType.OTHER, InteractSubtype.MANUALSYNC_SUCCESS, syncStat.syncedFileSize);
-          await loader.dismiss();
-          this.commonUtilService.showToast('DATA_SYNC_SUCCESSFUL');
-          console.log('Telemetry Data Sync Success: ', syncStat);
-        });
-      }, async (error) => {
-        await loader.dismiss();
+    }).subscribe();
+
+    sbsync.onSyncSucces(async (syncStat) => {
+      if (syncStat.telemetry_error) {
+        if (this.loader) {
+          await this.loader.dismiss();
+        }
+
         this.commonUtilService.showToast('DATA_SYNC_FAILURE');
-        console.error('Telemetry Data Sync Error: ', error);
-      });
+        return;
+      } else if (!syncStat.syncedEventCount) {
+        if (this.loader) {
+          await this.loader.dismiss();
+        }
+        this.commonUtilService.showToast('DATA_SYNC_NOTHING_TO_SYNC');
+        return;
+      }
+
+      this.generateInteractEvent(InteractType.OTHER, InteractSubtype.MANUALSYNC_SUCCESS, syncStat.syncedFileSize);
+      if (this.loader) {
+        await this.loader.dismiss();
+      }
+      this.commonUtilService.showToast('DATA_SYNC_SUCCESSFUL');
+    }, async (error) => {
+      if (this.loader) {
+        await this.loader.dismiss();
+      }
+      this.commonUtilService.showToast('DATA_SYNC_FAILURE');
+    });
   }
 
-  generateInteractEvent(interactType: string, subtype: string, size: number) {
+  private generateInteractEvent(interactType: string, subtype: string, size: number) {
     /*istanbul ignore else */
-    if (size != null) {
       this.telemetryGeneratorService.generateInteractTelemetry(
         interactType,
         subtype,
         Environment.SETTINGS,
         PageId.SETTINGS_DATASYNC,
         undefined,
-        {
-          SizeOfFileInKB: (size / 1000) + ''
-        }
+        size ? { SizeOfFileInKB: (size / 1000) + '' } : undefined
       );
-    }
   }
 
-  handleBackButton() {
+  private handleBackButton() {
     this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
       this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.SETTINGS_DATASYNC, Environment.SETTINGS, false);
       this.location.back();
diff --git a/src/app/settings/permission/permission.component.scss b/src/app/settings/permission/permission.component.scss
index 0b80c3ae8..ae48ece99 100644
--- a/src/app/settings/permission/permission.component.scss
+++ b/src/app/settings/permission/permission.component.scss
@@ -2,7 +2,7 @@
 @import "src/assets/styles/_custom-mixins";
 :host {
   .permission-title {
-    color: #333333;
+    color: map-get($colors, primary_black);
     font-size: 16px;
     line-height: 22px;
   }
@@ -26,7 +26,7 @@
 
       .title {
         font-size: 14px;
-        color: #333333;
+        color: map-get($colors, primary_black);
         font-weight: bold;
         line-height: 19px;
       }
diff --git a/src/app/settings/permission/permission.component.ts b/src/app/settings/permission/permission.component.ts
index b66407bbb..2c5834200 100644
--- a/src/app/settings/permission/permission.component.ts
+++ b/src/app/settings/permission/permission.component.ts
@@ -1,19 +1,21 @@
+import { Location } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
-import { PageId, Environment, InteractType, InteractSubtype } from '@app/services/telemetry-constants';
-import { Observable, Subscription, of } from 'rxjs';
-import { Events, Platform } from '@ionic/angular';
-import { Router, NavigationExtras, ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
+import { RouterLinks } from '@app/app/app.constant';
 import { AndroidPermission, AndroidPermissionsStatus, PermissionAskedEnum } from '@app/services/android-permissions/android-permission';
-import { CommonUtilService } from '@app/services/common-util.service';
-import { SunbirdQRScanner } from '@app/services/sunbirdqrscanner.service';
 import { AndroidPermissionsService } from '@app/services/android-permissions/android-permissions.service';
 import { AppGlobalService } from '@app/services/app-global-service.service';
 import { AppHeaderService } from '@app/services/app-header.service';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { SunbirdQRScanner } from '@app/services/sunbirdqrscanner.service';
+import { Environment, InteractSubtype, InteractType, PageId } from '@app/services/telemetry-constants';
 import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import { Location } from '@angular/common';
-import { RouterLinks } from '@app/app/app.constant';
 import { AppVersion } from '@ionic-native/app-version/ngx';
+import { Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { of, Subscription } from 'rxjs';
 import { mergeMap } from 'rxjs/operators';
+
 declare const cordova;
 
 @Component({
diff --git a/src/app/settings/settings.page.ts b/src/app/settings/settings.page.ts
index 59da1586d..9e1a0a006 100644
--- a/src/app/settings/settings.page.ts
+++ b/src/app/settings/settings.page.ts
@@ -1,28 +1,24 @@
+import { Location } from '@angular/common';
 import { Component, Inject, OnInit } from '@angular/core';
+import { NavigationExtras, Router } from '@angular/router';
+import { SbAppSharePopupComponent, SbPopoverComponent } from '@app/app/components/popups';
 import { AppVersion } from '@ionic-native/app-version/ngx';
+import { SocialSharing } from '@ionic-native/social-sharing/ngx';
+import { Platform, PopoverController, ToastController } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable, Subscription } from 'rxjs';
+import { catchError, finalize, map, mergeMap, tap } from 'rxjs/operators';
+import { AppHeaderService, CommonUtilService, FormAndFrameworkUtilService, TelemetryGeneratorService, UtilityService } from 'services';
+import { Environment, ImpressionType, InteractSubtype, InteractType, PageId } from 'services/telemetry-constants';
 import {
-  ProfileService,
-  SharedPreferences,
+  ApiService, AuthService,
+  MergeServerProfilesRequest, ProfileService,
+  SdkConfig, SharedPreferences,
   TelemetryImpressionRequest,
-  AuthService,
-  SdkConfig,
-  ApiService,
-  MergeServerProfilesRequest,
   WebviewManualMergeSessionProvider,
   WebviewSessionProviderConfig
 } from 'sunbird-sdk';
-import { AppHeaderService, CommonUtilService, FormAndFrameworkUtilService, TelemetryGeneratorService, UtilityService } from 'services';
 import { PreferenceKey, RouterLinks } from '../app.constant';
-import { Environment, ImpressionType, InteractSubtype, InteractType, PageId } from 'services/telemetry-constants';
-import { SocialSharing } from '@ionic-native/social-sharing/ngx';
-import { Router, NavigationExtras } from '@angular/router';
-import { SbPopoverComponent, SbAppSharePopupComponent } from '@app/app/components/popups';
-import { PopoverController, ToastController } from '@ionic/angular';
-import { TranslateService } from '@ngx-translate/core';
-import { Location } from '@angular/common';
-import { Platform } from '@ionic/angular';
-import { Observable, Subscription } from 'rxjs';
-import { map, mergeMap, catchError, finalize, tap } from 'rxjs/operators';
 
 @Component({
   selector: 'app-settings',
diff --git a/src/app/storage-settings/storage-settings-interface.ts b/src/app/storage-settings/storage-settings-interface.ts
index d30107bb7..9d0241bdd 100644
--- a/src/app/storage-settings/storage-settings-interface.ts
+++ b/src/app/storage-settings/storage-settings-interface.ts
@@ -1,6 +1,5 @@
-import {StorageDestination} from 'sunbird-sdk';
-import {OnInit} from '@angular/core';
-import {Observable} from 'rxjs';
+import { OnInit } from '@angular/core';
+import { Observable } from 'rxjs';
 
 export interface StorageSettingsInterface extends OnInit {
   // eventBusService: EventBusService
@@ -17,7 +16,6 @@ export interface StorageSettingsInterface extends OnInit {
 
   availableInternalMemorySize: number;
 
-
   spaceTakenBySunbird$: Observable<number>;
 
   attemptTransfer();
diff --git a/src/app/tabs/on-tab-view-will-enter.ts b/src/app/tabs/on-tab-view-will-enter.ts
new file mode 100644
index 000000000..3451d7954
--- /dev/null
+++ b/src/app/tabs/on-tab-view-will-enter.ts
@@ -0,0 +1,3 @@
+export interface OnTabViewWillEnter {
+    tabViewWillEnter();
+}
diff --git a/src/app/tabs/tabs.module.ts b/src/app/tabs/tabs.module.ts
index 93776eecb..b025fb2d0 100644
--- a/src/app/tabs/tabs.module.ts
+++ b/src/app/tabs/tabs.module.ts
@@ -8,14 +8,34 @@ import { IonicModule } from '@ionic/angular';
 import { TabsPage } from './tabs.page';
 import { TranslateModule } from '@ngx-translate/core';
 import { RouterLinks } from '../app.constant';
+import { UserTypeSpecificTabGuard } from './usertype-specific-tab.guard';
 
 const routes: Routes = [
   {
     path: '',
     component: TabsPage,
     children: [
+      {
+        path: RouterLinks.HOME,
+        children: [
+          {
+            path: '',
+            loadChildren: '../home/home.module#HomePageModule'
+          }
+        ]
+      },
+      {
+        path: RouterLinks.SEARCH,
+        children: [
+          {
+            path: '',
+            loadChildren: '../search/search.module#SearchPageModule'
+          }
+        ]
+      },
       {
         path: RouterLinks.RESOURCES,
+        canActivate: [UserTypeSpecificTabGuard],
         children: [
           {
             path: '',
@@ -58,11 +78,6 @@ const routes: Routes = [
             loadChildren: '../download-manager/download-manager.module#DownloadManagerPageModule'
           }
         ]
-      },
-      {
-        path: '',
-        redirectTo: 'resources',
-        pathMatch: 'full'
       }
     ]
   }
@@ -76,6 +91,7 @@ const routes: Routes = [
     RouterModule.forChild(routes),
     TranslateModule.forChild()
   ],
-  declarations: [TabsPage]
+  declarations: [TabsPage],
+  providers: [UserTypeSpecificTabGuard]
 })
-export class TabsPageModule { }
\ No newline at end of file
+export class TabsPageModule { }
diff --git a/src/app/tabs/tabs.page.html b/src/app/tabs/tabs.page.html
index 6dfc76726..584087bca 100644
--- a/src/app/tabs/tabs.page.html
+++ b/src/app/tabs/tabs.page.html
@@ -1,9 +1,9 @@
-<ion-tabs (ionTabsDidChange)="ionTabsDidChange($event)" #myTabs>
+<ion-tabs (ionTabsDidChange)="ionTabsDidChange($event)" #tabRef>
   <ion-tab-bar slot="bottom" [ngClass]="{'rm-before': olderWebView}" >
     <ion-tab-button [tab]="tab.root" *ngFor="let tab of tabs; let i = index;" [disabled]="tab.disabled"
       [ngClass]="{'disabled': tab.disabled}" (click)="tab.label === '' ? openScanner(tab) : onTabClick(tab)">
       <ion-icon [name]="tab.icon" [id] = "tab.label === '' ? 'qrScannerIcon' : ''"></ion-icon>
-      <ion-label>{{tab.label | translate}}</ion-label>
+      <!-- <ion-label>{{tab.label | translate}}</ion-label> -->
     </ion-tab-button>
   </ion-tab-bar>
 </ion-tabs>
\ No newline at end of file
diff --git a/src/app/tabs/tabs.page.scss b/src/app/tabs/tabs.page.scss
index 7d13e72d6..32edbdb52 100644
--- a/src/app/tabs/tabs.page.scss
+++ b/src/app/tabs/tabs.page.scss
@@ -1,9 +1,8 @@
 @import "src/assets/styles/base/_variables.scss";
 @import "src/assets/styles/_custom-mixins.scss";
+@import "src/assets/styles/_variables.scss";
 
 ion-tabs {
-  ion-tab-button {
-  }
   .rm-before{
     &::before {
       position: relative !important;
@@ -13,6 +12,7 @@ ion-tabs {
     align-items: flex-end;
     contain: none;
     filter: drop-shadow(0px 5px 6px rgba(0, 0, 0, 0.3));
+    border-top: 2px solid var(--app-primary-header);
   }
 
   ion-tab-button.tab-layout-icon-top.tab-has-label.tab-has-icon ion-label {
@@ -30,7 +30,7 @@ ion-tabs {
 
     position: relative;
     
-    height: calc(56px + (56px / 2));
+    height: calc(64px + (64px / 2));
 
     &::before {
       content: "";
@@ -39,8 +39,8 @@ ion-tabs {
       left: 50%;
       transform: translateX(-40px);
       width: 80px;
-      height: 56px;
-      background-image: radial-gradient(circle at center 0px, rgba(255, 255, 255, 0) 25px, rgba(0, 0, 0, 0.1) 35px);
+      height: 64px;
+      // background-image: radial-gradient(circle at center 0px, rgba(255, 255, 255, 0) 25px, rgba(0, 0, 0, 0.1) 35px);
       z-index: 1;
     }
 
@@ -51,24 +51,25 @@ ion-tabs {
       left: 50%;
       transform: translateX(-40px);
       width: 80px;
-      height: 56px;
-      background-image: radial-gradient(circle at center 0px, rgba(255, 255, 255, 0) 36px, rgba(255, 255, 255, 1) 35px);
+      height: 64px;
+      // background-image: radial-gradient(circle at center 0px, rgba(255, 255, 255, 0) 36px, rgba(255, 255, 255, 1) 35px);
       z-index: 2;
     }
 
     ion-icon {
-      bottom: 10px;
+      bottom: 6px;
       position: relative;
-      background: $primary-color;
-      width: 56px;
-      height: 56px;
+      background: var(--app-white);
+      width: 64px;
+      height: 64px;
       margin: 0px;
       padding: 0px;
-      min-height: 56px;
+      min-height: 64px;
       display: flex;
       align-items: center;
       justify-content: center;
-      border-radius: 50%;
+      border: 0.5rem solid var(--app-tertiary-light);
+      border-radius: 1rem;
       color: $white;
 
       .icon-inner {
@@ -86,27 +87,38 @@ ion-tabs {
     background-size: contain;
   }
   ion-tab-button {
+    --color-selected: #{$blue};
     background: transparent;
+
     ion-icon[ng-reflect-name="courses"], ion-icon[aria-label="courses"] {
-      background-image: url(/assets/imgs/ic_courses1.png);
+      background-image: url(/assets/imgs/tab_course.svg);
     }
     ion-icon[ng-reflect-name="resources"], ion-icon[aria-label="resources"] {
-      background-image: url(/assets/imgs/ic_library.png);
+      background-image: url(/assets/imgs/tab_library.svg);
+    }
+    ion-icon[ng-reflect-name="home"], ion-icon[aria-label="home"] {
+      background-image: url(/assets/imgs/ic_home.png);
     }
     ion-icon[ng-reflect-name="groups"], ion-icon[aria-label="groups"] {
       background-image: url(/assets/imgs/ic_chat.png);
     }
     ion-icon[ng-reflect-name="profile"], ion-icon[aria-label="profile"] {
-      background-image: url(/assets/imgs/ic_profile1.png);
+      background-image: url(/assets/imgs/tab_profile.svg);
     }
     ion-icon[ng-reflect-name="qrscanner"], ion-icon[aria-label="qrscanner"] {
       background-image: url(/assets/imgs/ic_qr_scanner.svg);
-      background-size: 30px;
+      background-size: 46px;
       background-position: center center;
       background-repeat: no-repeat;
     }
     ion-icon[ng-reflect-name="downloads"], ion-icon[aria-label="downloads"] {
-      background-image: url(/assets/imgs/ic_dowload.png);
+      background-image: url(/assets/imgs/tab_download.svg);
+    }
+    ion-icon[ng-reflect-name="home"], ion-icon[aria-label="home"] {
+      background-image: url(/assets/imgs/tab_home.svg);
+    }
+    ion-icon[ng-reflect-name="discover"], ion-icon[aria-label="discover"] {
+      background-image: url(/assets/imgs/tab_search.svg);
     }
   }
   ion-tab-button.tab-disabled {
@@ -119,6 +131,10 @@ ion-tabs {
     ion-icon[aria-label="resources"] {
       background-image: url(/assets/imgs/ic_library_disabled.png);
     }
+    ion-icon[ng-reflect-name="home"],
+    ion-icon[aria-label="home"] {
+      background-image: url(/assets/imgs/ic_home.png);
+    }
     ion-icon[ng-reflect-name="downloads"],
     ion-icon[aria-label="downloads"] {
       background-image: url(/assets/imgs/ic_download_disabled.png);
@@ -126,25 +142,34 @@ ion-tabs {
   }
   ion-tab-button.tab-selected {
     ion-icon[ng-reflect-name="courses"], ion-icon[aria-label="courses"] {
-      background-image: url(/assets/imgs/ic_courses_selected.png);
+      background-image: url(/assets/imgs/tab_course_selected.svg);
     }
     ion-icon[ng-reflect-name="resources"], ion-icon[aria-label="resources"] {
-      background-image: url(/assets/imgs/ic_library_selected.png);
+      background-image: url(/assets/imgs/tab_library_selected.svg);
+    }
+    ion-icon[ng-reflect-name="home"], ion-icon[aria-label="home"] {
+      background-image: url(/assets/imgs/ic_home_blue.png);
     }
     ion-icon[ng-reflect-name="groups"], ion-icon[aria-label="groups"] {
       background-image: url(/assets/imgs/ic_chat_blue.png);
     }
     ion-icon[ng-reflect-name="profile"], ion-icon[aria-label="profile"] {
-      background-image: url(/assets/imgs/ic_profile_selected.png);
+      background-image: url(/assets/imgs/tab_profile_selected.svg);
     }
     ion-icon[ng-reflect-name="qrscanner"], ion-icon[aria-label="qrscanner"] {
       background-image: url(/assets/imgs/ic_qr_scanner.svg);
-      background-size: 30px;
+      background-size: 46px;
       background-position: center center;
       background-repeat: no-repeat;
     }
     ion-icon[ng-reflect-name="downloads"], ion-icon[aria-label="downloads"] {
-      background-image: url(/assets/imgs/ic_download_selected.png);
+      background-image: url(/assets/imgs/tab_download_selected.svg);
+    }
+    ion-icon[ng-reflect-name="home"], ion-icon[aria-label="home"] {
+      background-image: url(/assets/imgs/tab_home_selected.svg);
+    }
+    ion-icon[ng-reflect-name="discover"], ion-icon[aria-label="discover"] {
+      background-image: url(/assets/imgs/tab_search_selected.svg);
     }
   }
   .tab-button[aria-selected="true"] {
@@ -160,13 +185,4 @@ ion-tabs {
       font-size: 12px;
     }
   }
-
-  ion-tab-button.tab-selected,
-  ion-tab-button:not(.tab-selected) {
-    ion-icon:not([aria-label="qrscanner"]) {
-      font-size: 20px;
-      margin-top: 8px;
-      // height:20px;
-    }
-  }
 }
diff --git a/src/app/tabs/tabs.page.ts b/src/app/tabs/tabs.page.ts
index c7dc6e25d..aa45f6bae 100644
--- a/src/app/tabs/tabs.page.ts
+++ b/src/app/tabs/tabs.page.ts
@@ -1,12 +1,16 @@
-import { ProfileType, SharedPreferences, ProfileService } from 'sunbird-sdk';
-import { GUEST_TEACHER_TABS, initTabs, GUEST_STUDENT_TABS, LOGIN_TEACHER_TABS } from '@app/app/module.service';
-import { Component, ViewChild, ViewEncapsulation, Inject, OnInit, AfterViewInit } from '@angular/core';
-import { IonTabs, Events, ToastController } from '@ionic/angular';
-import { ContainerService } from '@app/services/container.services';
+import { AfterViewInit, Component, Inject, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
+import { Router } from '@angular/router';
+import { EventTopics, PreferenceKey, ProfileConstants, RouterLinks, SwitchableTabsConfig } from '@app/app/app.constant';
+import { GUEST_HOME_SEARCH_TABS, GUEST_STUDENT_TABS, GUEST_TEACHER_TABS, initTabs,
+  LOGGEDIN_HOME_SEARCH_TABS, LOGIN_ADMIN_TABS, LOGIN_TEACHER_TABS } from '@app/app/module.service';
+import { OnTabViewWillEnter } from '@app/app/tabs/on-tab-view-will-enter';
+import { PageId } from '@app/services';
 import { AppGlobalService } from '@app/services/app-global-service.service';
-import { ProfileConstants, EventTopics } from '@app/app/app.constant';
 import { CommonUtilService } from '@app/services/common-util.service';
-import { PageId } from '@app/services';
+import { ContainerService } from '@app/services/container.services';
+import { IonTabs, ToastController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { ProfileService, ProfileType, SharedPreferences } from 'sunbird-sdk';
 
 @Component({
   selector: 'app-tabs',
@@ -17,7 +21,7 @@ import { PageId } from '@app/services';
 export class TabsPage implements OnInit, AfterViewInit {
 
   configData: any;
-  @ViewChild('myTabs') tabRef: IonTabs;
+  @ViewChild('tabRef', { static: false }) tabRef: IonTabs;
   tabIndex = 0;
   tabs = [];
   headerConfig = {
@@ -37,6 +41,7 @@ export class TabsPage implements OnInit, AfterViewInit {
     @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
     @Inject('PROFILE_SERVICE') private profileService: ProfileService,
     private commonUtilService: CommonUtilService,
+    private router: Router
   ) {
 
   }
@@ -44,14 +49,7 @@ export class TabsPage implements OnInit, AfterViewInit {
   async ngOnInit() {
     this.checkAndroidWebViewVersion();
     const session = await this.appGlobalService.authService.getSession().toPromise();
-    if (!session) {
-      const profileType = this.appGlobalService.guestProfileType;
-      if (this.commonUtilService.isAccessibleForNonStudentRole(profileType)) {
-        initTabs(this.container, GUEST_TEACHER_TABS);
-      } else {
-        initTabs(this.container, GUEST_STUDENT_TABS);
-      }
-    } else {
+    if (session) {
       if ((await this.preferences.getString('SHOW_WELCOME_TOAST').toPromise()) === 'true') {
         this.preferences.putString('SHOW_WELCOME_TOAST', 'false').toPromise().then();
 
@@ -59,27 +57,44 @@ export class TabsPage implements OnInit, AfterViewInit {
           userId: session.userToken,
           requiredFields: ProfileConstants.REQUIRED_FIELDS,
         }).toPromise();
-
         this.commonUtilService.showToast(this.commonUtilService.translateMessage('WELCOME_BACK', serverProfile.firstName));
       }
-      initTabs(this.container, LOGIN_TEACHER_TABS);
     }
+    // initTabs(this.container, await this.getInitialTabs(session));
+    // this.tabs = this.container.getAllTabs();
+    this.refreshTabs();
+    this.events.subscribe('UPDATE_TABS', async (data) => {
+      this.refreshTabs(data);
+    });
+  }
 
+  private async refreshTabs(data?) {
+    initTabs(this.container, await this.getInitialTabs(await this.appGlobalService.authService.getSession().toPromise()));
     this.tabs = this.container.getAllTabs();
-    this.events.subscribe('UPDATE_TABS', () => {
-      this.tabs = this.container.getAllTabs();
-    });
+    // this.tabRef.outlet['navCtrl'].navigateRoot('/tabs/' + this.tabs[0].root);
+    if (!data || (data && !data.navigateToCourse)) {
+    this.router.navigate(['/tabs/' + this.tabs[0].root]);
+    }
   }
 
   ngAfterViewInit() {
-    setTimeout(async () => {
-      const backdropClipCenter = document.getElementById('qrScannerIcon').getBoundingClientRect().left +
-        ((document.getElementById('qrScannerIcon').getBoundingClientRect().width) / 2);
+    this.setQRStyles();
+    this.setQRTabRoot(this.tabRef.getSelected());
+  }
 
-      (document.getElementById('backdrop').getElementsByClassName('bg')[0] as HTMLDivElement).setAttribute(
-        'style',
-        `background-image: radial-gradient(circle at ${backdropClipCenter}px 56px, rgba(0, 0, 0, 0) 30px, rgba(0, 0, 0, 0.9) 30px);`
-      );
+  setQRStyles() {
+    setTimeout(async () => {
+      if (document.getElementById('qrScannerIcon') && document.getElementById('backdrop')) {
+        const backdropClipCenter = document.getElementById('qrScannerIcon').getBoundingClientRect().left +
+          ((document.getElementById('qrScannerIcon').getBoundingClientRect().width) / 2);
+
+        (document.getElementById('backdrop').getElementsByClassName('bg')[0] as HTMLDivElement).setAttribute(
+          'style',
+          `background-image: radial-gradient(circle at ${backdropClipCenter}px 56px, rgba(0, 0, 0, 0) 30px, rgba(0, 0, 0, 0.9) 30px);`
+        );
+      } else {
+        this.setQRStyles();
+      }
 
     }, 2000);
   }
@@ -96,6 +111,9 @@ export class TabsPage implements OnInit, AfterViewInit {
   }
 
   ionViewWillEnter() {
+    if (this.tabRef.outlet.component['tabViewWillEnter']) {
+      (this.tabRef.outlet.component as OnTabViewWillEnter).tabViewWillEnter();
+    }
     this.tabs = this.container.getAllTabs();
     this.events.publish('update_header');
     this.events.subscribe('return_course', () => {
@@ -103,6 +121,11 @@ export class TabsPage implements OnInit, AfterViewInit {
         this.tabRef.select('courses');
       }, 300);
     });
+    this.events.subscribe('to_profile', () => {
+      setTimeout(() => {
+        this.tabRef.select('profile');
+      }, 300);
+    });
   }
 
   openScanner(tab) {
@@ -110,8 +133,7 @@ export class TabsPage implements OnInit, AfterViewInit {
   }
 
   ionTabsDidChange(event: any) {
-    this.tabs[2].root = event.tab;
-    this.events.publish(EventTopics.TAB_CHANGE, event.tab);
+    this.setQRTabRoot(event.tab);
     if (event.tab === 'resources') {
       event.tab = PageId.LIBRARY;
       this.events.publish(EventTopics.TAB_CHANGE, event.tab);
@@ -119,6 +141,7 @@ export class TabsPage implements OnInit, AfterViewInit {
       this.events.publish(EventTopics.TAB_CHANGE, event.tab);
     }
     this.commonUtilService.currentTabName = this.tabRef.getSelected();
+    this.checkOnboardingProfileDetails();
   }
 
   public async onTabClick(tab) {
@@ -131,4 +154,59 @@ export class TabsPage implements OnInit, AfterViewInit {
     }
   }
 
+  async checkOnboardingProfileDetails() {
+    if (!this.appGlobalService.isUserLoggedIn() && !this.appGlobalService.isOnBoardingCompleted) {
+      this.router.navigate([`/${RouterLinks.PROFILE_SETTINGS}`], {
+        state: {
+          hideBackButton: true
+        }
+      });
+    }
+  }
+
+  private setQRTabRoot(tab: string) {
+    if (this.tabs && this.tabs[2]) {
+      this.tabs[2].root = tab;
+    }
+  }
+
+  private async getInitialTabs(session): Promise<any[]> {
+    const config = {
+      'GUEST_TEACHER': {
+        [SwitchableTabsConfig.RESOURCE_COURSE_TABS_CONFIG]: GUEST_TEACHER_TABS,
+        [SwitchableTabsConfig.HOME_DISCOVER_TABS_CONFIG]: GUEST_HOME_SEARCH_TABS
+      },
+      'GUEST_STUDENT': {
+        [SwitchableTabsConfig.RESOURCE_COURSE_TABS_CONFIG]: GUEST_STUDENT_TABS,
+        [SwitchableTabsConfig.HOME_DISCOVER_TABS_CONFIG]: GUEST_HOME_SEARCH_TABS
+      },
+      'LOGIN_USER': {
+        [SwitchableTabsConfig.RESOURCE_COURSE_TABS_CONFIG]: LOGIN_TEACHER_TABS,
+        [SwitchableTabsConfig.HOME_DISCOVER_TABS_CONFIG]: LOGGEDIN_HOME_SEARCH_TABS
+      },
+      'LOGIN_ADMIN': {
+        [SwitchableTabsConfig.RESOURCE_COURSE_TABS_CONFIG]: LOGIN_ADMIN_TABS,
+        [SwitchableTabsConfig.HOME_DISCOVER_TABS_CONFIG]: LOGIN_ADMIN_TABS
+      }
+    };
+    const defaultSwitchableTabsConfig = SwitchableTabsConfig.RESOURCE_COURSE_TABS_CONFIG;
+    const selectedSwitchableTabsConfig = (await this.preferences.getString(PreferenceKey.SELECTED_SWITCHABLE_TABS_CONFIG).toPromise()) ||
+      defaultSwitchableTabsConfig;
+
+
+    if (!session) {
+      const profileType = this.appGlobalService.guestProfileType;
+      if (this.commonUtilService.isAccessibleForNonStudentRole(profileType)) {
+        return config['GUEST_TEACHER'][selectedSwitchableTabsConfig];
+      } else {
+        return config['GUEST_STUDENT'][selectedSwitchableTabsConfig];
+      }
+    } else {
+      const selectedUserType = await this.preferences.getString(PreferenceKey.SELECTED_USER_TYPE).toPromise();
+      return selectedUserType === ProfileType.ADMIN ?
+        config['LOGIN_ADMIN'][selectedSwitchableTabsConfig] :
+        config['LOGIN_USER'][selectedSwitchableTabsConfig];
+    }
+  }
+
 }
diff --git a/src/app/tabs/usertype-specific-tab.guard.ts b/src/app/tabs/usertype-specific-tab.guard.ts
new file mode 100644
index 000000000..58397bfa3
--- /dev/null
+++ b/src/app/tabs/usertype-specific-tab.guard.ts
@@ -0,0 +1,19 @@
+import { Inject, Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree, Router, CanActivate } from '@angular/router';
+import { PreferenceKey, RouterLinks } from '../app.constant';
+import { ProfileType, SharedPreferences } from '@project-sunbird/sunbird-sdk';
+​
+​
+@Injectable()
+export class UserTypeSpecificTabGuard implements CanActivate {
+  constructor(@Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
+              private router: Router) {}
+
+  async canActivate(): Promise<boolean | UrlTree> {
+    const selectedUserType = await this.preferences.getString(PreferenceKey.SELECTED_USER_TYPE).toPromise();
+    if (selectedUserType === ProfileType.ADMIN) {
+        return this.router.createUrlTree([RouterLinks.HOME_TAB]);
+    }
+    return true;
+  }
+}
diff --git a/src/app/terms-and-conditions/terms-and-conditions.page.html b/src/app/terms-and-conditions/terms-and-conditions.page.html
index bd64167c3..d56507de7 100644
--- a/src/app/terms-and-conditions/terms-and-conditions.page.html
+++ b/src/app/terms-and-conditions/terms-and-conditions.page.html
@@ -1,16 +1,16 @@
 <ion-content class="ion-padding-horizontal ion-padding-top">
   <iframe title="terms-and-condition" (load)="onIFrameLoad()" *ngIf="tncLatestVersionUrl" height="100%" width="100%"
-    [src]="tncLatestVersionUrl" frameborder="0"></iframe>
+    [src]="tncLatestVersionUrl" style="border: 0"></iframe>
 </ion-content>
 
-<ion-footer class="ion-padding" tappable no-border>
-  <ion-grid class="ion-no-padding" class="ion-padding-vertical">
-    <ion-row nowrap align-items-center>
-      <ion-col size="auto" nowrap style="line-height: 0">
+<ion-footer class="ion-padding ion-tappable ion-no-border">
+  <ion-grid class="ion-padding-vertical ion-no-padding">
+    <ion-row class="ion-nowrap ion-align-items-center">
+      <ion-col size="auto" class="ion-nowrap" style="line-height: 0">
         <ion-checkbox class="ion-no-padding ion-no-margin" (ionChange)="onConfirmationChange($event)"></ion-checkbox>
       </ion-col>
-      <ion-col col>
-        <ion-label class="ion-no-padding ion-text-wrap ion-no-margin" padding-horizontal>
+      <ion-col>
+        <ion-label class="ion-no-padding ion-text-wrap ion-no-margin ion-padding-horizontal">
           {{"I_AGREE_TO_TNC" | translate}}
         </ion-label>
       </ion-col>
diff --git a/src/app/terms-and-conditions/terms-and-conditions.page.spec.ts b/src/app/terms-and-conditions/terms-and-conditions.page.spec.ts
new file mode 100644
index 000000000..3f1a300c9
--- /dev/null
+++ b/src/app/terms-and-conditions/terms-and-conditions.page.spec.ts
@@ -0,0 +1,409 @@
+
+import { TermsAndConditionsPage } from './terms-and-conditions.page';
+import { ProfileService } from 'sunbird-sdk';
+import { Platform } from '@ionic/angular';
+import { Injector } from '@angular/core';
+import {
+    CommonUtilService,
+    TelemetryGeneratorService,
+    FormAndFrameworkUtilService,
+    SplashScreenService,
+    ExternalIdVerificationService,
+    AppGlobalService,
+    LogoutHandlerService,
+    PageId,
+    Environment,
+    ImpressionType,
+    InteractType,
+    InteractSubtype
+} from '../../services';
+import {
+    TncUpdateHandlerService,
+} from '../../services/handlers/tnc-update-handler.service';
+import { AppVersion } from '@ionic-native/app-version/ngx';
+import { Router } from '@angular/router';
+import { SbProgressLoader } from '../../services/sb-progress-loader.service';
+import { DomSanitizer } from '@angular/platform-browser';
+import { of } from 'rxjs';
+import { RouterLinks } from '../app.constant';
+import { ConsentService } from '../../services/consent-service';
+import { SharedPreferences } from '@project-sunbird/sunbird-sdk';
+describe('TermsAndConditionsPage', () => {
+    let termsAndConditionsPage: TermsAndConditionsPage;
+
+    const mockProfileService: Partial<ProfileService> = {
+        getActiveSessionProfile: jest.fn(() => of({profileType: 'none', serverProfile: { tncLatestVersionUrl: 'sample_tnc_url' ,
+        declarations: [{name: 'sample-name'}]} })),
+        getServerProfilesDetails: jest.fn(() => of({ tncLatestVersionUrl: 'sample_tnc_url' })),
+    };
+
+    const mockPlatform: Partial<Platform> = {
+    };
+    mockPlatform.backButton = {
+        subscribeWithPriority: jest.fn((_, fn) => fn()),
+
+    } as any;
+    const mockLogoutHandlerService: Partial<LogoutHandlerService> = {
+        onLogout: jest.fn()
+    };
+
+    const mockTncUpdateHandlerService: Partial<TncUpdateHandlerService> = {
+        dismissTncPage: jest.fn(),
+        isSSOUser: jest.fn()
+    };
+
+    const mockSanitizer: Partial<DomSanitizer> = {
+        bypassSecurityTrustResourceUrl: jest.fn(() => 'some_safe_url')
+    };
+
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        getLoader: jest.fn(() => {
+            return {
+                present: jest.fn(),
+                dismiss: jest.fn()
+            };
+        }),
+        showToast: jest.fn(),
+        translateMessage: jest.fn(() => ('translated_message'))
+    };
+
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateImpressionTelemetry: jest.fn(),
+        generateBackClickedTelemetry: jest.fn(),
+        generateInteractTelemetry: jest.fn()
+    };
+
+    const mockAppVersion: Partial<AppVersion> = {
+        getAppName: jest.fn()
+    };
+
+    const mockInjector: Partial<Injector> = {
+        get: jest.fn(() => (mockTncUpdateHandlerService))
+    };
+
+    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {
+        updateLoggedInUser: jest.fn(() => Promise.resolve({ status: true }))
+    };
+
+    const mockRouter: Partial<Router> = {
+        navigate: jest.fn()
+    };
+
+    const mockSplashScreenService: Partial<SplashScreenService> = {
+    };
+
+    const mockExternalIdVerificationService: Partial<ExternalIdVerificationService> = {
+        showExternalIdVerificationPopup: jest.fn()
+    };
+
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        closeSigninOnboardingLoader: jest.fn()
+    };
+
+    const mockSbProgressLoader: Partial<SbProgressLoader> = {
+        hide: jest.fn()
+    };
+
+    const mockConsentService: Partial<ConsentService> = {};
+    const mockSharedPreferences: Partial<SharedPreferences> = {};
+
+    beforeAll(() => {
+        termsAndConditionsPage = new TermsAndConditionsPage(
+            mockProfileService as ProfileService,
+            mockPlatform as Platform,
+            mockLogoutHandlerService as LogoutHandlerService,
+            mockSanitizer as DomSanitizer,
+            mockCommonUtilService as CommonUtilService,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockAppVersion as AppVersion,
+            mockInjector as Injector,
+            mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
+            mockRouter as Router,
+            mockSplashScreenService as SplashScreenService,
+            mockExternalIdVerificationService as ExternalIdVerificationService,
+            mockAppGlobalService as AppGlobalService,
+            mockSbProgressLoader as SbProgressLoader,
+            mockConsentService as ConsentService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create a instance of TermsAndConditionsPage', () => {
+        expect(termsAndConditionsPage).toBeTruthy();
+    });
+
+    describe('ngOnint', () => {
+        it('should populate the tncUrl and generate impression telemetry', (done) => {
+            // arrange
+            mockAppGlobalService.closeSigninOnboardingLoader = jest.fn(() => Promise.resolve());
+            // act
+            termsAndConditionsPage.ngOnInit();
+            // assert
+            setTimeout(() => {
+                expect(termsAndConditionsPage.tncLatestVersionUrl).toBeDefined();
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(ImpressionType.VIEW, '',
+                    PageId.TERMS_N_CONDITIONS,
+                    Environment.HOME);
+                done();
+            });
+        });
+    });
+
+    describe('ionViewWillEnter', () => {
+        it('should show  warning Toast when back is clicked for first time', (done) => {
+            // arrange
+            termsAndConditionsPage['unregisterBackButtonAction'] = {
+                unsubscribe: jest.fn()
+            } as any;
+            // act
+            termsAndConditionsPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('translated_message');
+                done();
+            });
+        });
+
+        it('should logout and dismiss the tnc page if back button is clicked twice', (done) => {
+            // arrange
+            termsAndConditionsPage['unregisterBackButtonAction'] = {
+                unsubscribe: jest.fn()
+            } as any;
+            // act
+            termsAndConditionsPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockLogoutHandlerService.onLogout).toHaveBeenCalled();
+                expect(mockTncUpdateHandlerService.dismissTncPage).toHaveBeenCalled();
+                done();
+            });
+        });
+
+        it('should logout and dismiss the tnc page if back button is clicked twice and should not unsubscribe', (done) => {
+            // arrange
+            termsAndConditionsPage['unregisterBackButtonAction'] = undefined;
+            // act
+            termsAndConditionsPage.ionViewWillEnter();
+            // assert
+            setTimeout(() => {
+                expect(mockLogoutHandlerService.onLogout).toHaveBeenCalled();
+                expect(mockTncUpdateHandlerService.dismissTncPage).toHaveBeenCalled();
+                done();
+            });
+        });
+    });
+
+    describe('ionViewDidEnter', () => {
+        it('should hide the animated progress loader', () => {
+            // arrange
+            // act
+            termsAndConditionsPage.ionViewDidEnter();
+            // assert
+            expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({ id: 'login' });
+        });
+    });
+
+    describe('ionViewWillLeave', () => {
+        it('should not unsubscribe the backbutton subscription if its undefined', () => {
+            // arrange
+            termsAndConditionsPage['unregisterBackButtonAction'] = undefined;
+            // act
+            termsAndConditionsPage.ionViewWillLeave();
+            // assert
+            expect(termsAndConditionsPage['unregisterBackButtonAction']).toBeUndefined();
+        });
+
+        it('should unsubscribe the backbutton subscription', () => {
+            // arrange
+            termsAndConditionsPage['unregisterBackButtonAction'] = {
+                unsubscribe: jest.fn()
+            } as any;
+            // act
+            termsAndConditionsPage.ionViewWillLeave();
+            // assert
+            expect(termsAndConditionsPage['unregisterBackButtonAction'].unsubscribe).toHaveBeenCalled();
+        });
+    });
+
+    describe('onIFrameLoad', () => {
+        it('should generate Impression telemetry and dismiss the loader', () => {
+            // arrange
+            // act
+            termsAndConditionsPage.ngOnInit();
+            termsAndConditionsPage.onIFrameLoad();
+            // assert
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(ImpressionType.VIEW, '',
+                PageId.TERMS_N_CONDITIONS_STATIC_PAGE,
+                Environment.HOME);
+        });
+
+        it('should generate Impression telemetry', () => {
+            // arrange
+            termsAndConditionsPage['loading'] = undefined;
+            // act
+            termsAndConditionsPage.onIFrameLoad();
+            // assert
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(ImpressionType.VIEW, '',
+                PageId.TERMS_N_CONDITIONS_STATIC_PAGE,
+                Environment.HOME);
+        });
+    });
+
+    describe('onConfirmationChange', () => {
+        it('should generate Interact telemetry when check box is toggled', () => {
+            // arrange
+            // act
+            termsAndConditionsPage.onConfirmationChange({ target: { checked: true } });
+            // assert
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.TOUCH,
+                InteractSubtype.ACCEPTANCE_CHECKBOX_CLICKED,
+                Environment.HOME,
+                PageId.TERMS_N_CONDITIONS,
+                undefined,
+                { isChecked: true });
+        });
+    });
+
+    describe('dismissLoader', () => {
+        it('should generate Interact telemetry when check box is toggled', () => {
+            // arrange
+            // act
+            termsAndConditionsPage['dismissLoader'](undefined);
+            // assert
+        });
+    });
+
+    describe('onAcceptanceClick', () => {
+        it('should navigate to tabs page if Tnc is accepted and user location is available', (done) => {
+            // arrange
+            mockProfileService.acceptTermsAndConditions = jest.fn(() => of(true));
+            mockTncUpdateHandlerService.isSSOUser = jest.fn(() => Promise.resolve(true));
+            mockCommonUtilService.isUserLocationAvalable = jest.fn(() => true);
+            mockConsentService.getConsent = jest.fn(() => Promise.resolve());
+            const categoriesProfileData = {
+                hasFilledLocation: true,
+                showOnlyMandatoryFields: true,
+                profile: undefined,
+                isRootPage: true,
+                isUserLocationAvalable: true,
+                status: true
+              };
+            // act
+            // assert
+            termsAndConditionsPage.ngOnInit();
+            termsAndConditionsPage.onAcceptanceClick().then(() => {
+                expect(mockTncUpdateHandlerService.dismissTncPage).toHaveBeenCalled();
+                expect(mockAppGlobalService.closeSigninOnboardingLoader).toHaveBeenCalled();
+                setTimeout(() => {
+                   // expect(mockConsentService.getConsent).toHaveBeenCalled();
+                    // expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.USER_TYPE_SELECTION_LOGGEDIN],
+                    //     {state: {categoriesProfileData}});
+                   // expect(mockExternalIdVerificationService.showExternalIdVerificationPopup).toHaveBeenCalled();
+                    done();
+                }, 0);
+            });
+        });
+
+        it('should navigate to district mapping  page if Tnc is accepted and user location is not available', (done) => {
+            // arrange
+            mockProfileService.acceptTermsAndConditions = jest.fn(() => of(true));
+            mockCommonUtilService.isUserLocationAvalable = jest.fn(() => false);
+            mockTncUpdateHandlerService.isSSOUser = jest.fn(() => Promise.resolve(false));
+            const categoriesProfileData = {
+                hasFilledLocation: false,
+                showOnlyMandatoryFields: true,
+                profile: undefined,
+                isRootPage: true,
+                isUserLocationAvalable: false,
+                status: true
+              };
+            // act
+            termsAndConditionsPage.ngOnInit();
+            // assert
+            termsAndConditionsPage.onAcceptanceClick().then(() => {
+                setTimeout(() => {
+                    // expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.USER_TYPE_SELECTION_LOGGEDIN],
+                    //     {state: {categoriesProfileData}});
+                    done();
+                }, 0);
+            });
+        });
+
+        it('should navigate to category edit  page if Tnc is accepted but  BMG value is not filled', (done) => {
+            // arrange
+            mockProfileService.acceptTermsAndConditions = jest.fn(() => of(true));
+            mockCommonUtilService.isUserLocationAvalable = jest.fn(() => true);
+            mockFormAndFrameworkUtilService.updateLoggedInUser = jest.fn(() => Promise.resolve({ status: false }));
+            mockTncUpdateHandlerService.isSSOUser = jest.fn(() => Promise.resolve(true));
+            mockConsentService.getConsent = jest.fn(() => Promise.resolve());
+            const categoriesProfileData = {
+                hasFilledLocation: true,
+                showOnlyMandatoryFields: true,
+                profile: undefined,
+                isRootPage: true
+              };
+            // act
+            // assert
+            termsAndConditionsPage.ngOnInit();
+            termsAndConditionsPage.onAcceptanceClick().then(() => {
+                expect(mockTncUpdateHandlerService.dismissTncPage).toHaveBeenCalled();
+                setTimeout(() => {
+                    // expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.USER_TYPE_SELECTION_LOGGEDIN],
+                    //     {state: {categoriesProfileData}});
+                    done();
+                }, 0);
+            });
+        });
+
+        it('should dismiss the loader for any error scenarios', (done) => {
+            // arrange
+            mockProfileService.acceptTermsAndConditions = jest.fn(() => of(true));
+            mockCommonUtilService.isUserLocationAvalable = jest.fn(() => true);
+            mockFormAndFrameworkUtilService.updateLoggedInUser = jest.fn(() => Promise.reject({ status: false }));
+            // act
+            // assert
+            termsAndConditionsPage.ngOnInit();
+            termsAndConditionsPage.onAcceptanceClick().then(() => {
+                expect(termsAndConditionsPage['loader']).toBeUndefined();
+                done();
+            }).catch(() => {
+            });
+        });
+
+        it('should dismiss the loader  and logout if result is false', (done) => {
+            // arrange
+            mockProfileService.acceptTermsAndConditions = jest.fn(() => of(false));
+            mockCommonUtilService.isUserLocationAvalable = jest.fn(() => true);
+            mockFormAndFrameworkUtilService.updateLoggedInUser = jest.fn(() => Promise.reject({ status: false }));
+            // act
+            // assert
+            termsAndConditionsPage.ngOnInit();
+            termsAndConditionsPage.onAcceptanceClick().then(() => {
+                expect(termsAndConditionsPage['loader']).toBeUndefined();
+                expect(mockLogoutHandlerService.onLogout).toHaveBeenCalled();
+                expect(mockTncUpdateHandlerService.dismissTncPage).toHaveBeenCalled();
+                done();
+            }).catch(() => {
+            });
+        });
+
+
+        it('should dismiss the loader  and logout if result is false', (done) => {
+            // arrange
+            mockProfileService.acceptTermsAndConditions = jest.fn(() => of(false));
+            mockCommonUtilService.isUserLocationAvalable = jest.fn(() => true);
+            mockFormAndFrameworkUtilService.updateLoggedInUser = jest.fn(() => Promise.reject({ status: false }));
+            mockInjector.get = jest.fn(() => (undefined));
+            // act
+            // assert
+            termsAndConditionsPage.ngOnInit();
+            termsAndConditionsPage.onAcceptanceClick().then(() => {
+            }).catch(() => {
+                done();
+            });
+        });
+    });
+});
diff --git a/src/app/terms-and-conditions/terms-and-conditions.page.ts b/src/app/terms-and-conditions/terms-and-conditions.page.ts
index d44dfa9f0..fbb2465ae 100644
--- a/src/app/terms-and-conditions/terms-and-conditions.page.ts
+++ b/src/app/terms-and-conditions/terms-and-conditions.page.ts
@@ -1,24 +1,27 @@
-import { Component, Inject, OnInit, Injector } from '@angular/core';
+import { Component, Inject, Injector, OnInit } from '@angular/core';
 import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { AppGlobalService, FormAndFrameworkUtilService } from '@app/services';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { ConsentService } from '@app/services/consent-service';
+import { ExternalIdVerificationService } from '@app/services/externalid-verification.service';
+import { LogoutHandlerService } from '@app/services/handlers/logout-handler.service';
+import { TncUpdateHandlerService } from '@app/services/handlers/tnc-update-handler.service';
+import { SbProgressLoader } from '@app/services/sb-progress-loader.service';
+import { SplashScreenService } from '@app/services/splash-screen.service';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
 import { AppVersion } from '@ionic-native/app-version/ngx';
 import { Platform } from '@ionic/angular';
-import { ProfileService, ServerProfile, CachedItemRequestSourceFrom } from 'sunbird-sdk';
 import { Subscription } from 'rxjs';
+import { CachedItemRequestSourceFrom, ProfileService, ProfileType, ServerProfile } from 'sunbird-sdk';
 import { Environment, ImpressionType, InteractSubtype, InteractType, PageId } from '../../services/telemetry-constants';
-import { LogoutHandlerService } from '@app/services/handlers/logout-handler.service';
-import { TncUpdateHandlerService } from '@app/services/handlers/tnc-update-handler.service';
-import { CommonUtilService } from '@app/services/common-util.service';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
 import { ProfileConstants, RouterLinks } from '../app.constant';
-import { FormAndFrameworkUtilService, AppGlobalService } from '@app/services';
-import { Router, NavigationExtras } from '@angular/router';
-import { SplashScreenService } from '@app/services/splash-screen.service';
-import { ExternalIdVerificationService } from '@app/services/externalid-verification.service';
+import { FieldConfig } from '../components/common-forms/field-config';
+import { FormConstants } from '../form.constants';
 
 @Component({
   selector: 'app-terms-and-conditions',
-  templateUrl: './terms-and-conditions.page.html',
-  styleUrls: ['./terms-and-conditions.page.scss'],
+  templateUrl: './terms-and-conditions.page.html'
 })
 export class TermsAndConditionsPage implements OnInit {
   public tncLatestVersionUrl: SafeUrl;
@@ -42,7 +45,9 @@ export class TermsAndConditionsPage implements OnInit {
     private router: Router,
     private splashScreenService: SplashScreenService,
     private externalIdVerificationService: ExternalIdVerificationService,
-    private appGlobalService: AppGlobalService
+    private appGlobalService: AppGlobalService,
+    private sbProgressLoader: SbProgressLoader,
+    private consentService: ConsentService
   ) {
   }
 
@@ -69,6 +74,10 @@ export class TermsAndConditionsPage implements OnInit {
       subscribeWithPriority(999, async () => this.showToastOnFirstBackNavigation());
   }
 
+  ionViewDidEnter() {
+    this.sbProgressLoader.hide({id: 'login'});
+  }
+
   public ionViewWillLeave() {
     if (this.unregisterBackButtonAction) {
       this.unregisterBackButtonAction.unsubscribe();
@@ -87,15 +96,13 @@ export class TermsAndConditionsPage implements OnInit {
   }
 
   public onConfirmationChange(event) {
-    const valuesMap = new Map();
-    valuesMap['isChecked'] = event.target.checked;
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
       InteractSubtype.ACCEPTANCE_CHECKBOX_CLICKED,
       Environment.HOME,
       PageId.TERMS_N_CONDITIONS,
       undefined,
-      valuesMap
+      {isChecked :  event.target.checked }
     );
     this.termsAgreed = event.target.checked;
   }
@@ -112,7 +119,18 @@ export class TermsAndConditionsPage implements OnInit {
       );
       await loader.present();
       // await tncUpdateHandlerService.onAcceptTnc(this.userProfileDetails);
-      const isTCAccepted = await this.profileService.acceptTermsAndConditions({ version: this.userProfileDetails.tncLatestVersion })
+      let request;
+      if (this.userProfileDetails.managedBy) {
+        request = {
+          userId: this.userProfileDetails.userId,
+          version: this.userProfileDetails.tncLatestVersion
+        };
+      } else {
+        request = {
+          version: this.userProfileDetails.tncLatestVersion
+        };
+      }
+      const isTCAccepted = await this.profileService.acceptTermsAndConditions(request)
         .toPromise();
 
       if (isTCAccepted) {
@@ -126,67 +144,81 @@ export class TermsAndConditionsPage implements OnInit {
         const profile = await this.profileService.getActiveSessionProfile({
           requiredFields: ProfileConstants.REQUIRED_FIELDS
         }).toPromise();
-
         this.formAndFrameworkUtilService.updateLoggedInUser(serverProfile, profile)
           .then(async (value) => {
-            if (loader) {
-              await loader.dismiss();
-              loader = undefined;
-            }
+            this.dismissLoader(loader);
             if (!this.appGlobalService.signinOnboardingLoader) {
               this.appGlobalService.signinOnboardingLoader = await this.commonUtilService.getLoader();
               await this.appGlobalService.signinOnboardingLoader.present();
             }
+            const locationMappingConfig: FieldConfig<any>[] =
+            await this.formAndFrameworkUtilService.getFormFields(FormConstants.LOCATION_MAPPING);
             this.disableSubmitButton = false;
+            const categoriesProfileData = {
+              hasFilledLocation: this.commonUtilService.isUserLocationAvalable(profile, locationMappingConfig),
+              showOnlyMandatoryFields: true,
+              profile: value['profile'],
+              isRootPage: true
+            };
             if (value['status']) {
-              if (this.commonUtilService.isUserLocationAvalable(serverProfile)
-              ||  await tncUpdateHandlerService.isSSOUser(profile)) {
+              if (this.commonUtilService.isUserLocationAvalable(profile, locationMappingConfig)
+             || await tncUpdateHandlerService.isSSOUser(profile)) {
                 await tncUpdateHandlerService.dismissTncPage();
                 this.appGlobalService.closeSigninOnboardingLoader();
-                this.router.navigate(['/', RouterLinks.TABS]);
+                if (await tncUpdateHandlerService.isSSOUser(profile)) {
+                  await this.consentService.getConsent(profile, true);
+                }
+                categoriesProfileData['status'] = value['status'],
+                categoriesProfileData['isUserLocationAvalable'] = true;
+                if (profile.profileType === ProfileType.NONE || profile.profileType === ProfileType.OTHER.toUpperCase()) {
+                  this.router.navigate([RouterLinks.USER_TYPE_SELECTION_LOGGEDIN], {
+                    state: {categoriesProfileData}
+                  });
+                } else {
+                  this.router.navigate(['/', RouterLinks.TABS]);
+              }
                 this.externalIdVerificationService.showExternalIdVerificationPopup();
                 this.splashScreenService.handleSunbirdSplashScreenActions();
               } else {
                 // closeSigninOnboardingLoader() is called in District-Mapping page
-                const navigationExtras: NavigationExtras = {
-                  state: {
-                    isShowBackButton: false
-                  }
-                };
-                this.router.navigate(['/', RouterLinks.DISTRICT_MAPPING] , navigationExtras);
+                if (profile.profileType === ProfileType.NONE || profile.profileType === ProfileType.OTHER.toUpperCase()) {
+                  categoriesProfileData['status'] = value['status'],
+                    categoriesProfileData['isUserLocationAvalable'] = false;
+                  this.router.navigate([RouterLinks.USER_TYPE_SELECTION_LOGGEDIN], {
+                    state: { categoriesProfileData }
+                });
+                } else {
+                  this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.CATEGORIES_EDIT}`], {
+                    state: categoriesProfileData
+               });
+              }
               }
             } else {
               // closeSigninOnboardingLoader() is called in CategoryEdit page
               await tncUpdateHandlerService.dismissTncPage();
-              this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.CATEGORIES_EDIT}`], {
-                state: {
-                  hasFilledLocation: this.commonUtilService.isUserLocationAvalable(serverProfile),
-                  showOnlyMandatoryFields: true,
-                  profile: value['profile'],
-                  isRootPage: true
-                }
-              });
+              if (await tncUpdateHandlerService.isSSOUser(profile)) {
+                await this.consentService.getConsent(profile, true);
+              }
+              if (profile.profileType === ProfileType.NONE || profile.profileType === ProfileType.OTHER.toUpperCase()) {
+                this.router.navigate([RouterLinks.USER_TYPE_SELECTION_LOGGEDIN], {
+                  state: {categoriesProfileData}
+                });
+              } else {
+                this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.CATEGORIES_EDIT}`], {
+                  state: categoriesProfileData
+             });
             }
-            console.log("inside can load");
-          }).catch(async e => {
-            if (loader) {
-              await loader.dismiss();
-              loader = undefined;
             }
+          }).catch(async e => {
+            this.dismissLoader(loader);
           });
       } else {
-        if (loader) {
-          await loader.dismiss();
-          loader = undefined;
-        }
+        this.dismissLoader(loader);
         await this.logoutOnSecondBackNavigation();
       }
       await tncUpdateHandlerService.dismissTncPage();
     } catch (e) {
-      if (loader) {
-        await loader.dismiss();
-        loader = undefined;
-      }
+      this.dismissLoader(loader);
       await this.logoutOnSecondBackNavigation();
     }
   }
@@ -210,4 +242,11 @@ export class TermsAndConditionsPage implements OnInit {
       await this.logoutOnSecondBackNavigation();
     });
   }
+
+  private async dismissLoader(loader: any) {
+    if (loader) {
+      await loader.dismiss();
+      loader = undefined;
+    }
+  }
 }
diff --git a/src/app/textbook-view-more/textbook-view-more.module.ts b/src/app/textbook-view-more/textbook-view-more.module.ts
index ac93c0aff..a23676711 100644
--- a/src/app/textbook-view-more/textbook-view-more.module.ts
+++ b/src/app/textbook-view-more/textbook-view-more.module.ts
@@ -2,11 +2,10 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { Routes, RouterModule } from '@angular/router';
-
 import { IonicModule } from '@ionic/angular';
-
 import { TextbookViewMorePage } from './textbook-view-more.page';
 import { ComponentsModule } from '../components/components.module';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
 
 const routes: Routes = [
   {
@@ -21,8 +20,9 @@ const routes: Routes = [
     FormsModule,
     IonicModule,
     RouterModule.forChild(routes),
-    ComponentsModule
+    ComponentsModule,
+    CommonConsumptionModule
   ],
   declarations: [TextbookViewMorePage]
 })
-export class TextbookViewMorePageModule {}
+export class TextbookViewMorePageModule { }
diff --git a/src/app/textbook-view-more/textbook-view-more.page.html b/src/app/textbook-view-more/textbook-view-more.page.html
index 767143f77..1dce3a0cd 100644
--- a/src/app/textbook-view-more/textbook-view-more.page.html
+++ b/src/app/textbook-view-more/textbook-view-more.page.html
@@ -1,9 +1,9 @@
 <ion-content overflow-scroll="true">
-  <div class="sb-textbook-container">
+  <div class="sb-textbook-container p-0 m-0">
     <div class="sb-textbook-items">
       <div class="sb-textbook-title-container">
         <span class="textbook-icon">
-          <ion-icon ios="ios-albums" md="md-albums"></ion-icon>
+          <ion-icon name="albums"></ion-icon>
         </span>
         <span class="textbook-title">
           {{subjectName}}
@@ -11,8 +11,13 @@
       </div>
       <!-- Card style -->
       <div class="sb-card-container sb-card-textbook-container">
-        <app-text-book-card *ngFor="let item of content; let i = index" [content]="item" [layoutName]='layoutName'
-          (click)="navigateToDetailPage(item, i, item.name)"></app-text-book-card>
+        <div class="mb-1" *ngFor="let content of contentList; let i = index">
+          <sb-library-card [content]="content" [type]="LibraryCardTypes.MOBILE_TEXTBOOK"
+            [layoutConfig]="{layout: 'v3'}"
+            (click)="navigateToDetailPage(content, i, content.name)"
+            [cardImg]="commonUtilService.getContentImg(content)">
+          </sb-library-card>
+        </div>
       </div>
     </div>
   </div>
diff --git a/src/app/textbook-view-more/textbook-view-more.page.scss b/src/app/textbook-view-more/textbook-view-more.page.scss
index 54ec61336..77a5d917c 100644
--- a/src/app/textbook-view-more/textbook-view-more.page.scss
+++ b/src/app/textbook-view-more/textbook-view-more.page.scss
@@ -1,11 +1,12 @@
 :host {
+  .sb-textbook-container{
+    width: 100% !important;
+  }
   .sb-card-textbook-container {
     margin-bottom: 40px;
-    app-text-book-card {
-      border-bottom: 0.5px solid rgba(151, 151, 151, 0.4);
-      &:last-child {
-        border-bottom: 0.5px solid rgba(151, 151, 151, 0.4);
-      }
-    }
+  }
+  .sb-textbook-title-container{
+    margin-left: 1rem;
+    margin-top: 1rem;
   }
 }
diff --git a/src/app/textbook-view-more/textbook-view-more.page.ts b/src/app/textbook-view-more/textbook-view-more.page.ts
index 5db9b42d6..8bb443e85 100644
--- a/src/app/textbook-view-more/textbook-view-more.page.ts
+++ b/src/app/textbook-view-more/textbook-view-more.page.ts
@@ -1,27 +1,27 @@
-import { RouterLinks } from '@app/app/app.constant';
-import { Component, OnInit } from '@angular/core';
+import { Location } from '@angular/common';
+import { Component } from '@angular/core';
 import { Router } from '@angular/router';
-import { ToastController } from '@ionic/angular';
-import { Subscription } from 'rxjs';
-import { TelemetryObject } from 'sunbird-sdk';
-
 import { AppHeaderService } from '@app/services/app-header.service';
 import { CommonUtilService } from '@app/services/common-util.service';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import { NavigationService } from '@app/services/navigation-handler.service';
 import { Environment, InteractSubtype, InteractType, PageId } from '@app/services/telemetry-constants';
-import { Location } from '@angular/common';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import { ContentUtil } from '@app/util/content-util';
+import { LibraryCardTypes } from '@project-sunbird/common-consumption-v8';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-textbook-view-more',
   templateUrl: './textbook-view-more.page.html',
   styleUrls: ['./textbook-view-more.page.scss'],
 })
-export class TextbookViewMorePage implements OnInit {
+export class TextbookViewMorePage {
 
-  content: any;
+  LibraryCardTypes = LibraryCardTypes;
+  contentList: any;
   subjectName: any;
+  corRelationList: any;
   toast: any;
-  layoutName = 'textbook';
   // header
   private _appHeaderSubscription?: Subscription;
   private _headerConfig = {
@@ -34,15 +34,15 @@ export class TextbookViewMorePage implements OnInit {
     private headerService: AppHeaderService,
     private commonUtilService: CommonUtilService,
     private telemetryGeneratorService: TelemetryGeneratorService,
-    private toastController: ToastController,
     private router: Router,
-    private location: Location
+    private location: Location,
+    private navService: NavigationService
   ) {
-
     const extras = this.router.getCurrentNavigation().extras.state;
     if (extras) {
-      this.content = extras.content;
+      this.contentList = extras.contentList;
       this.subjectName = extras.subjectName;
+      this.corRelationList = extras.corRelation;
     }
   }
 
@@ -50,6 +50,12 @@ export class TextbookViewMorePage implements OnInit {
     this.initAppHeader();
   }
 
+  ionViewWillLeave() {
+    if (this._appHeaderSubscription) {
+      this._appHeaderSubscription.unsubscribe();
+    }
+  }
+
   private initAppHeader() {
     this._appHeaderSubscription = this.headerService.headerEventEmitted$.subscribe(eventName => {
       this.handleHeaderEvents(eventName);
@@ -69,10 +75,6 @@ export class TextbookViewMorePage implements OnInit {
   }
 
   navigateToDetailPage(item, index, sectionName) {
-    const identifier = item.contentId || item.identifier;
-    let telemetryObject: TelemetryObject;
-    telemetryObject = new TelemetryObject(identifier, item.contentType, undefined);
-
     const values = new Map();
     values['sectionName'] = item.subject;
     values['positionClicked'] = index;
@@ -80,25 +82,16 @@ export class TextbookViewMorePage implements OnInit {
       InteractSubtype.CONTENT_CLICKED,
       Environment.HOME,
       PageId.LIBRARY,
-      telemetryObject,
+      ContentUtil.getTelemetryObject(item),
       values);
     if (this.commonUtilService.networkInfo.isNetworkAvailable || item.isAvailableLocally) {
-      this.router.navigate([RouterLinks.COLLECTION_DETAIL_ETB], {
-        state: {
-          content: item
-        }
+      this.navService.navigateToDetailPage(item , {
+        content: item,
+        corRelation: this.corRelationList
       });
     } else {
       this.commonUtilService.showToast('OFFLINE_WARNING_ETBUI_1', false, 'toastHeader', 3000, 'top');
     }
   }
 
-  ngOnInit() {
-  }
-
-  ionViewWillLeave() {
-    if (this._appHeaderSubscription) {
-      this._appHeaderSubscription.unsubscribe();
-    }
-  }
 }
diff --git a/src/app/user-and-groups/add-or-remove-group-user/add-or-remove-group-user.page.html b/src/app/user-and-groups/add-or-remove-group-user/add-or-remove-group-user.page.html
deleted file mode 100644
index b064264bc..000000000
--- a/src/app/user-and-groups/add-or-remove-group-user/add-or-remove-group-user.page.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<ion-content class="ion-padding">
-  <ion-row>
-    <ion-col class="rm-padding-left" size-md="4">
-      <ion-text>
-        <p text-left color="title" class="ion-text-uppercase">
-          <strong *ngIf="addUsers">
-            {{uniqueUserList?.length + groupMembers?.length}}&nbsp;{{'USERS' | translate}}
-          </strong>
-          <strong *ngIf="!addUsers && groupMembers?.length">
-            {{groupMembers?.length}}&nbsp;{{'USERS' | translate}}
-          </strong>
-        </p>
-      </ion-text>
-    </ion-col>
-    <ion-col size-md="4" push-md="4" class="rm-padding-right">
-      <ion-button class="rm-padding-right ion-float-end ion-text-uppercase" *ngIf="addUsers  && uniqueUserList?.length"
-        fill="clear" (click)="selectAll()">
-        {{'SELECT_ALL' | translate}}
-      </ion-button>
-      <ion-button class="rm-padding-right ion-float-end ion-text-uppercase" *ngIf="!addUsers" fill="clear"
-        (click)="unselectAll()">
-        {{'UNSELECT_ALL' | translate}}
-      </ion-button>
-    </ion-col>
-  </ion-row>
-
-  <ion-item *ngFor="let user of groupMembers; let i = index;" class="item-background ion-margin-bottom" no-lines
-    (click)="toggleMemberSelect(i)">
-    <ion-label>
-      <h6 class="line-height-2">
-        <strong>{{user?.handle}}</strong>
-      </h6>
-      <p>
-        <span *ngIf="user?.profileType === ProfileType.TEACHER">{{'USER_TYPE_1' | translate | titlecase}}</span>
-        <span *ngIf="user?.profileType === ProfileType.STUDENT">{{'USER_TYPE_2' | translate | titlecase}}</span>
-        <span *ngIf="user?.profileType === ProfileType.OTHER">{{'USER_TYPE_3' | translate | titlecase}}</span>
-        <span *ngIf="user?.grade?.length">•</span> {{ getGradeNameFromCode(user) }}
-      </p>
-    </ion-label>
-    <ion-checkbox item-end mode="ios" checked="{{isGroupMemberSelected(i)}}" [disabled]="addUsers"></ion-checkbox>
-  </ion-item>
-
-  <div *ngIf="addUsers">
-    <ion-item *ngFor="let user of uniqueUserList; let i = index;" class="item-background ion-margin-bottom" no-lines
-      (click)="toggleSelect(i)">
-      <ion-label>
-        <h6 class="line-height-2">
-          <strong>{{user?.handle}}</strong>
-        </h6>
-        <p>
-          <span *ngIf="user?.profileType === ProfileType.TEACHER">{{'USER_TYPE_1' | translate | titlecase}}</span>
-          <span *ngIf="user?.profileType === ProfileType.STUDENT">{{'USER_TYPE_2' | translate | titlecase}}</span>
-          <span *ngIf="user?.profileType === ProfileType.OTHER">{{'USER_TYPE_3' | translate | titlecase}}</span>
-          <span *ngIf="user?.grade?.length">•</span> {{ getGradeNameFromCode(user) }}</p>
-      </ion-label>
-      <ion-checkbox item-end mode="ios" checked="{{isUserSelected(i)}}"></ion-checkbox>
-    </ion-item>
-  </div>
-</ion-content>
-
-<ion-footer class="ion-padding">
-  <ion-button expand="block" *ngIf="addUsers" (click)="add()" [disabled]="selectedUserLength === ''">
-    {{'ADD_USERS_TO_GROUP' | translate:{'%s': selectedUserLength} }}
-  </ion-button>
-  <ion-button expand="block" *ngIf="!addUsers" (click)="remove()" [disabled]="selectedGroupMemberLength === ''">
-    {{'REMOVE_USERS_FROM_GROUP' | translate:{'%s': selectedGroupMemberLength} }}
-  </ion-button>
-</ion-footer>
\ No newline at end of file
diff --git a/src/app/user-and-groups/add-or-remove-group-user/add-or-remove-group-user.page.scss b/src/app/user-and-groups/add-or-remove-group-user/add-or-remove-group-user.page.scss
deleted file mode 100644
index 30cc2d765..000000000
--- a/src/app/user-and-groups/add-or-remove-group-user/add-or-remove-group-user.page.scss
+++ /dev/null
@@ -1,45 +0,0 @@
-@import "src/assets/styles/base/_variables.scss";
-@import "src/assets/styles/_custom-mixins.scss";
-@import "src/assets/styles/_variables.scss";
-
-:host {
-  .item-background.item-md {
-    background-color: map-get($colors, light_gray) !important;
-  }
-  .checkbox-inner {
-     @include ltr() {
-      left: 7px;
-    }
-    @include rtl() {
-      right: 7px;
-    }
-     top: 4px;
-    position: absolute;
-    width: 4px;
-    height: 9px;
-    border-width: 0 1px 1px 0;
-    border-style: solid;
-    border-color: map-get($colors, dark_gray);
-    -webkit-transform: rotate(45deg);
-    transform: rotate(45deg);
-  }
-  .checkbox-ios .checkbox-icon {
-    background-color: transparent !important;
-  }
-  .checkbox-ios .checkbox-checked {
-    background-color: map-get($colors, primary) !important;
-  }
-  .checkbox-disabled .checkbox-icon {
-    background-color: map-get($colors, dark) !important;
-  }
-  .image-style {
-    margin-top: 20vh;
-    width: 50%;
-  }
-  .rm-padding-right {
-    @include padding(null, 0, null, null !important);
-  }
-  .rm-padding-left {
-    @include padding(null, null, null, 0 !important);
-  }
-}
diff --git a/src/app/user-and-groups/add-or-remove-group-user/add-or-remove-group-user.page.ts b/src/app/user-and-groups/add-or-remove-group-user/add-or-remove-group-user.page.ts
deleted file mode 100644
index c46aaccd0..000000000
--- a/src/app/user-and-groups/add-or-remove-group-user/add-or-remove-group-user.page.ts
+++ /dev/null
@@ -1,296 +0,0 @@
-import { Location } from '@angular/common';
-import { Component, Inject, NgZone } from '@angular/core';
-import { Router } from '@angular/router';
-import { PopoverController } from '@ionic/angular';
-import {
-  GetAllProfileRequest,
-  Group,
-  GroupService,
-  ObjectType,
-  Profile,
-  ProfileService,
-  ProfilesToGroupRequest,
-  ProfileType,
-  TelemetryObject,
-} from 'sunbird-sdk';
-
-import { AppHeaderService } from 'services/app-header.service';
-import { CommonUtilService } from 'services/common-util.service';
-import { TelemetryGeneratorService } from 'services/telemetry-generator.service';
-import {
-  Environment, InteractSubtype, InteractType, PageId
-} from 'services/telemetry-constants';
-import { SbGenericPopoverComponent } from 'app/components/popups/sb-generic-popover/sb-generic-popover.component';
-import { map } from 'rxjs/operators';
-
-@Component({
-  selector: 'app-add-or-remove-group-user',
-  templateUrl: './add-or-remove-group-user.page.html',
-  styleUrls: ['./add-or-remove-group-user.page.scss'],
-})
-export class AddOrRemoveGroupUserPage {
-  ProfileType = ProfileType;
-  addUsers = true;
-  userSelectionMap: Map<string, boolean> = new Map();
-  memberSelectionMap: Map<string, boolean> = new Map();
-  uniqueUserList: Array<Profile>;
-  groupInfo: Group;
-  groupMembers: Array<Profile>;
-  uid: any;
-  allUsers: Array<Profile> = [];
-  selectedUids: Array<string> = [];
-  selectedUserLength = '';
-  selectedGroupMemberLength = '';
-
-  constructor(
-    @Inject('GROUP_SERVICE') private groupService: GroupService,
-    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
-    private zone: NgZone,
-    private commonUtilService: CommonUtilService,
-    private telemetryGeneratorService: TelemetryGeneratorService,
-    private headerService: AppHeaderService,
-    private popoverCtrl: PopoverController,
-    private router: Router,
-    private location: Location
-  ) {
-    const extrasState = this.router.getCurrentNavigation().extras.state;
-    if (extrasState) {
-      this.addUsers = Boolean(extrasState.isAddUsers);
-      this.groupInfo = extrasState.groupInfo;
-      this.groupMembers = extrasState.groupMembers;
-
-      if (this.addUsers) {
-        this.headerService.showHeaderWithBackButton([], this.commonUtilService.translateMessage('ADD_USERS_TO_GROUP'));
-      } else {
-        this.headerService.showHeaderWithBackButton([], this.commonUtilService.translateMessage('REMOVE_USERS_FROM_GROUP'));
-      }
-    }
-  }
-
-  ionViewWillEnter() {
-    this.headerService.hideHeader();
-    this.getAllProfile();
-  }
-
-  getAllProfile() {
-    const req: GetAllProfileRequest = {
-      local: true
-    };
-
-    this.profileService.getAllProfiles(req).pipe(
-      map((profiles) => profiles.filter((profile) => !!profile.handle))
-    )
-      .subscribe((profiles) => {
-        this.allUsers = profiles;
-        const uniqueUserList = this.allUsers.filter(e => {
-          const found = this.groupMembers.find(m => {
-            return m.uid === e.uid;
-          });
-          return found === undefined;
-        });
-        this.zone.run(() => {
-          this.uniqueUserList = uniqueUserList;
-
-          if (!this.addUsers) {
-            this.groupMembers.forEach((element, index) => {
-              this.memberSelectionMap.set(this.groupMembers[index].uid, true);
-            });
-          }
-        });
-      }, (error) => {
-        console.log('Something went wrong while fetching user list', error);
-      });
-  }
-
-  toggleSelect(index: number) {
-    const value = this.userSelectionMap.get(this.uniqueUserList[index].uid);
-    this.userSelectionMap.set(this.uniqueUserList[index].uid, !value);
-  }
-
-  toggleMemberSelect(index: number) {
-    const value = this.memberSelectionMap.get(this.groupMembers[index].uid);
-    this.memberSelectionMap.set(this.groupMembers[index].uid, !value);
-  }
-
-  goToEditGroup(index) {
-    this.router.navigate(['GuestEditProfilePage']);
-  }
-
-  isUserSelected(index: number) {
-    this.getSelectedUids();
-    return Boolean(this.userSelectionMap.get(this.uniqueUserList[index].uid));
-  }
-
-  isGroupMemberSelected(index: number) {
-    this.getSelectedGroupMemberUids();
-    return Boolean(this.memberSelectionMap.get(this.groupMembers[index].uid));
-  }
-
-  selectAll() {
-    this.userSelectionMap.clear();
-    this.zone.run(() => {
-      this.uniqueUserList.forEach((element, index) => {
-        this.userSelectionMap.set(this.uniqueUserList[index].uid, true);
-      });
-    });
-  }
-
-  unselectAll() {
-    this.zone.run(() => {
-      this.memberSelectionMap.clear();
-      this.groupMembers.forEach((element, index) => {
-        this.memberSelectionMap.set(this.groupMembers[index].uid, false);
-      });
-    });
-  }
-
-  remove() {
-    this.groupMembers.forEach((item) => {
-      if (!Boolean(this.memberSelectionMap.get(item.uid))) {
-        this.selectedUids.push(item.uid);
-      }
-    });
-
-    this.deleteUsersFromGroupConfirmBox(this.selectedGroupMemberLength);
-  }
-
-  getSelectedUids() {
-    const selectedUids: Array<string> = [];
-    this.uniqueUserList.forEach((item) => {
-      if (Boolean(this.userSelectionMap.get(item.uid))) {
-        selectedUids.push(item.uid);
-      }
-    });
-
-    this.zone.run(() => {
-      this.selectedUserLength = (selectedUids.length) ? selectedUids.length.toString() : '';
-    });
-    return selectedUids;
-  }
-
-  getSelectedGroupMemberUids() {
-    const selectedUids: Array<string> = [];
-    this.groupMembers.forEach((item) => {
-      if (Boolean(this.memberSelectionMap.get(item.uid))) {
-        selectedUids.push(item.uid);
-      }
-    });
-
-    this.zone.run(() => {
-      this.selectedGroupMemberLength = (selectedUids.length) ? selectedUids.length.toString() : '';
-    });
-  }
-
-  async add() {
-    const loader = await this.commonUtilService.getLoader();
-    await loader.present();
-    const groupMembersUids: Array<string> = [];
-
-    this.groupMembers.forEach(element => {
-      groupMembersUids.push(element.uid);
-    });
-
-
-    const req: ProfilesToGroupRequest = {
-      groupId: this.groupInfo.gid,
-      uidList: groupMembersUids.concat(this.getSelectedUids())
-    };
-    this.groupService.addProfilesToGroup(req)
-      .subscribe(async (success) => {
-        console.log(success);
-        await loader.dismiss();
-        this.commonUtilService.showToast(this.commonUtilService.translateMessage('GROUP_MEMBER_ADD_SUCCESS'));
-        this.location.back();
-      },
-        async (error) => {
-          await loader.dismiss();
-          this.commonUtilService.showToast(this.commonUtilService.translateMessage('SOMETHING_WENT_WRONG'));
-          console.log('Error : ' + error);
-          loader.dismiss();
-        });
-  }
-
-  async deleteUsersFromGroupConfirmBox(length) {
-    const confirm = await this.popoverCtrl.create({
-      component: SbGenericPopoverComponent,
-      translucent: true,
-      componentProps: {
-        sbPopoverHeading: this.commonUtilService.translateMessage('REMOVE_MULTIPLE_USERS_FROM_GROUP', length),
-        sbPopoverMainTitle: this.commonUtilService.translateMessage('USER_DELETE_CONFIRM_SECOND_MESSAGE'),
-        actionsButtons: [
-          {
-            btntext: this.commonUtilService.translateMessage('CANCEL'),
-            btnClass: 'sb-btn sb-btn-sm  sb-btn-outline-info'
-          }, {
-            btntext: this.commonUtilService.translateMessage('YES'),
-            btnClass: 'popover-color'
-          }
-        ],
-        icon: null
-      },
-      cssClass: 'sb-popover'
-    });
-
-    await confirm.present();
-    const { data } = await confirm.onDidDismiss();
-
-    if (data && data.leftBtnClicked === null) {
-      return;
-    } else if (data && !data.leftBtnClicked) {
-      this.deleteUsersFromGroup();
-    }
-  }
-
-  async deleteUsersFromGroup() {
-    let telemetryObject: TelemetryObject;
-    telemetryObject = new TelemetryObject(this.groupInfo.gid, ObjectType.GROUP, undefined);
-
-    const valuesMap = new Map();
-    valuesMap['UIDS'] = this.selectedUids;
-
-    // Generate Delete users from group event
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      InteractSubtype.DELETE_USER_INITIATE,
-      Environment.USER,
-      PageId.REMOVE_USERS_FROM_GROUP,
-      telemetryObject,
-      valuesMap
-    );
-    const loader = await this.commonUtilService.getLoader();
-    const req: ProfilesToGroupRequest = {
-      groupId: this.groupInfo.gid,
-      uidList: this.selectedUids
-    };
-
-    this.groupService.addProfilesToGroup(req)
-      .subscribe(async (success) => {
-        await loader.dismiss();
-        this.commonUtilService.showToast(this.commonUtilService.translateMessage('GROUP_MEMBER_DELETE_SUCCESS'));
-        this.location.back();
-      }, async (error) => {
-        await loader.dismiss();
-        this.commonUtilService.showToast(this.commonUtilService.translateMessage('SOMETHING_WENT_WRONG'));
-        console.error('Error : ' + error);
-      });
-  }
-
-  getGradeNameFromCode(data: Profile | Group): string {
-    if (data.grade && data.grade.length > 0) {
-      const gradeName = [];
-      data.grade.forEach(code => {
-        if (data.gradeValue && data.gradeValue[code]) {
-          gradeName.push(data.gradeValue[code]);
-        }
-      });
-
-      if (gradeName.length === 0) {
-        return data.grade.join(',');
-      }
-
-      return gradeName.join(',');
-    }
-
-    return '';
-  }
-}
diff --git a/src/app/user-and-groups/create-group/create-group.page.html b/src/app/user-and-groups/create-group/create-group.page.html
deleted file mode 100644
index 92c7e2dcd..000000000
--- a/src/app/user-and-groups/create-group/create-group.page.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<ion-content class="ion-padding-top" padding-right>
-  <form [formGroup]="groupEditForm">
-    <ion-item class="cg-item-16 PT16">
-      <ion-label class="label-font cg-label ion-text-uppercase" position="stacked">
-        {{ 'GROUP_NAME' | translate }}
-        <span class="mandatory">*</span>
-      </ion-label>
-      <ion-input type="text" formControlName="name" dir="{{commonUtilService.getAppDirection()}}"
-        class="ion-text-capitalize" placeholder="{{'ENTER_GROUP_NAME' | translate}}"></ion-input>
-    </ion-item>
-    <!-- Syllabus -->
-    <ion-item class="cg-item-16">
-      <ion-label position="stacked" class="label-font cg-label ion-text-uppercase">
-        {{'SYLLABUS' | translate }}
-      </ion-label>
-      <ion-select class="ion-text-capitalize" formControlName="syllabus" placeholder="{{'SELECT' | translate }}"
-        (ionChange)="getClassList(null)" okText="{{'BTN_SUBMIT' | translate}}" cancelText="{{'CANCEL' | translate}}"
-        [interfaceOptions]="syllabusOptions">
-        <ion-select-option *ngFor="let eachSyllabus of syllabusList" value="{{eachSyllabus?.code}}">
-          {{eachSyllabus?.name}}&lrm;
-        </ion-select-option>
-      </ion-select>
-    </ion-item>
-    <ion-item class="cg-item-16">
-      <ion-label position="stacked" class="label-font cg-label ion-text-uppercase">{{'CLASS' | translate}}</ion-label>
-      <ion-select formControlName="class" [interfaceOptions]="classOptions"
-        [disabled]="!(groupEditForm.value.syllabus != '')" placeholder="{{'GRADE_OPTION_TEXT'|translate | titlecase}}"
-        okText="{{'BTN_SUBMIT' | translate}}" cancelText="{{'CANCEL' | translate}}">
-        <ion-select-option [value]="class?.code" *ngFor="let class of classList" class="ion-text-capitalize">
-          {{ class?.name }}
-        </ion-select-option>
-      </ion-select>
-    </ion-item>
-  </form>
-</ion-content>
-<ion-footer>
-  <div class="border">
-    <ion-row class="ion-padding">
-      <ion-col size-md="10" offset-md="1">
-        <ion-button expand="block" [disabled]="!groupEditForm.valid" *ngIf="!isEditGroup"
-          (click)="navigateToUsersList()">
-          {{'NEXT'| translate}}
-        </ion-button>
-        <ion-button expand="block" [disabled]="!groupEditForm.valid" *ngIf="isEditGroup" (click)="updateGroup()">
-          {{'SAVE' | translate}}
-        </ion-button>
-      </ion-col>
-    </ion-row>
-  </div>
-</ion-footer>
\ No newline at end of file
diff --git a/src/app/user-and-groups/create-group/create-group.page.scss b/src/app/user-and-groups/create-group/create-group.page.scss
deleted file mode 100644
index ab2a9c8b1..000000000
--- a/src/app/user-and-groups/create-group/create-group.page.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-@import "src/assets/styles/_helper.scss";
-@import "src/assets/styles/_variables.scss";
-
-
-.mandatory {
-    color: map-get($colors, red);
-}
-
-.label-font {
-    font-weight: 500 !important;
-    font-size: 18px;
-}
-
-.cg-label {
-    @extend .MB8;
-    color: map-get($colors, title);
-}
-
-.cg-item-16{
-    width: calc(100% - 16px);
-    --padding-start: 0px;
-    @extend .ML16;
-    @extend .MB6;
-}
diff --git a/src/app/user-and-groups/create-group/create-group.page.spec.ts b/src/app/user-and-groups/create-group/create-group.page.spec.ts
deleted file mode 100644
index 9e51b9f96..000000000
--- a/src/app/user-and-groups/create-group/create-group.page.spec.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { CreateGroupPage } from './create-group.page';
-import { FormBuilder } from '@angular/forms';
-import { CommonUtilService, TelemetryGeneratorService, AppHeaderService } from '../../../services';
-import { TranslateService } from '@ngx-translate/core';
-import { GroupService, FrameworkService, FrameworkUtilService, Framework, CategoryTerm } from 'sunbird-sdk';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Platform } from '@ionic/angular';
-import { NgZone, ChangeDetectorRef } from '@angular/core';
-import { Location } from '@angular/common';
-import { of, identity } from 'rxjs';
-
-describe('createGroupPage', () => {
-    let createGroupPage: CreateGroupPage;
-    const mockFormBuilder: Partial<FormBuilder> = {
-        group: jest.fn()
-    };
-    const mockTranslateService: Partial<TranslateService> = {};
-    const mockCommonUtilService: Partial<CommonUtilService> = {
-        translateMessage: jest.fn(() => 'string'),
-        getLoader: jest.fn(() => {
-            return { 
-                present: jest.fn(),
-                dismiss: jest.fn()
-            }
-        })
-    };
-    const mockGroupService: Partial<GroupService> = {};
-    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
-    const mockFrameworkService: Partial<FrameworkService> = {
-        getFrameworkDetails: jest.fn(() => {
-            return new Promise((resolve, reject) => {
-                resolve([1]);
-            });
-        })
-    };
-    const mockFrameworkUtilService: Partial<FrameworkUtilService> = {
-        getFrameworkCategoryTerms: jest.fn(),
-        getActiveChannelSuggestedFrameworkList: jest.fn()
-    };
-    const mockAppHeaderService: Partial<AppHeaderService> = {};
-    const mockActivatedRoute: Partial<ActivatedRoute> = {};
-    const mockRouter: Partial<Router> = {
-        getCurrentNavigation: jest.fn(() => {
-            return { extras: { state: ''}};
-        })
-    };
-    const mockPlatform: Partial<Platform> = {};
-    const mockNgZone: Partial<NgZone> = {};
-    const mockLocation: Partial<Location> = {};
-    const mockChangeDetectorRef: Partial<ChangeDetectorRef> = {
-        detectChanges: jest.fn()
-    };
-
-    beforeAll(() => {
-        createGroupPage = new CreateGroupPage(
-            mockFormBuilder as FormBuilder,
-            mockTranslateService as TranslateService,
-            mockCommonUtilService as CommonUtilService,
-            mockGroupService as GroupService,
-            mockTelemetryGeneratorService as TelemetryGeneratorService,
-            mockFrameworkService as FrameworkService,
-            mockFrameworkUtilService as FrameworkUtilService,
-            mockAppHeaderService as AppHeaderService,
-            mockActivatedRoute as ActivatedRoute,
-            mockRouter as Router,
-            mockPlatform as Platform,
-            mockNgZone as NgZone,
-            mockLocation as Location,
-            mockChangeDetectorRef as ChangeDetectorRef
-        );
-    });
-
-    beforeEach(() => {
-        jest.clearAllMocks();
-    });
-
-    it('should initialise classlist by calling getter of classlist', () => {
-        // act
-        createGroupPage.classList.push(1);
-        // // assert
-        expect(createGroupPage.classList).toEqual([1]);
-    });
-
-    it('should initialise syllabuslist', () => {
-        // act
-        createGroupPage.syllabusList.push(1);
-        // assert
-        expect(createGroupPage.syllabusList).toEqual([1]);
-    });
-
-    it('should check for classlist to be initialised', (done) => {
-        // arrange
-        createGroupPage.groupEditForm = {
-            patchValue: jest.fn()
-        } as any;
-        spyOn(createGroupPage.groupEditForm, 'patchValue').and.stub();
-        jest.spyOn(mockFrameworkService, 'getFrameworkDetails').mockReturnValue(of({} as Framework));
-        jest.spyOn(mockFrameworkUtilService, 'getFrameworkCategoryTerms').mockReturnValue(of([{identifier: 'q23123'}] as CategoryTerm[]));
-        // act
-        createGroupPage.getClassList('0114', false);
-        // assert
-        setTimeout(() => {
-            expect(createGroupPage.classList).toEqual([{identifier: 'q23123'}]);
-            done();
-        }, 0);
-    });
-});
\ No newline at end of file
diff --git a/src/app/user-and-groups/create-group/create-group.page.ts b/src/app/user-and-groups/create-group/create-group.page.ts
deleted file mode 100644
index 91dd0739d..000000000
--- a/src/app/user-and-groups/create-group/create-group.page.ts
+++ /dev/null
@@ -1,323 +0,0 @@
-import { Component, Inject, OnInit, NgZone, OnDestroy, ChangeDetectorRef } from '@angular/core';
-// import { IonicPage, NavController, NavParams } from 'ionic-angular';
-import { TranslateService } from '@ngx-translate/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import {
-  Environment,
-  ImpressionType,
-  InteractSubtype,
-  InteractType,
-  ObjectType,
-  PageId,
-  TelemetryGeneratorService,
-  AppHeaderService,
-  CommonUtilService
-} from '../../../services';
-import {
-  Framework,
-  FrameworkCategoryCode,
-  FrameworkCategoryCodesGroup,
-  FrameworkDetailsRequest,
-  FrameworkService,
-  FrameworkUtilService,
-  GetFrameworkCategoryTermsRequest,
-  GetSuggestedFrameworksRequest,
-  Group,
-  GroupService
-} from 'sunbird-sdk';
-import { ActivatedRoute, Router, NavigationExtras } from '@angular/router';
-import { Platform } from '@ionic/angular';
-import { Location } from '@angular/common';
-import { Subscription } from 'rxjs';
-import { RouterLinks } from '@app/app/app.constant';
-
-@Component({
-  selector: 'app-create-group',
-  templateUrl: './create-group.page.html',
-  styleUrls: ['./create-group.page.scss'],
-})
-export class CreateGroupPage implements OnInit {
-  groupEditForm: FormGroup;
-  group: Group;
-  isEditGroup = false;
-  categories: Array<any> = [];
-  loader: any;
-  isFormValid = true;
-  navData: any;
-  backButtonFunc: Subscription;
-
-  private _classList = [];
-  private _syllabusList: Array<any> = [];
-
-  get syllabusList() {
-    return this._syllabusList;
-  }
-  set syllabusList(v) {
-    this._syllabusList = v;
-    this.changeDetectionRef.detectChanges();
-  }
-
-  get classList() {
-    return this._classList;
-  }
-  set classList(v) {
-    this._classList = v;
-    this.changeDetectionRef.detectChanges();
-  }
-
-
-  /* Options for class ion-select box */
-  classOptions = {
-    header: this.commonUtilService.translateMessage('CLASS').toLocaleUpperCase(),
-    cssClass: 'select-box'
-  };
-
-  /* Options for syllabus ion-select box */
-  syllabusOptions = {
-    header: this.commonUtilService.translateMessage('SYLLABUS').toLocaleUpperCase(),
-    cssClass: 'select-box'
-  };
-  constructor(
-    private fb: FormBuilder,
-    private translate: TranslateService,
-    public commonUtilService: CommonUtilService,
-    @Inject('GROUP_SERVICE') private groupService: GroupService,
-    private telemetryGeneratorService: TelemetryGeneratorService,
-    @Inject('FRAMEWORK_SERVICE') private frameworkService: FrameworkService,
-    @Inject('FRAMEWORK_UTIL_SERVICE') private frameworkUtilService: FrameworkUtilService,
-    private headerService: AppHeaderService,
-    private route: ActivatedRoute,
-    private router: Router,
-    private platform: Platform,
-    private zone: NgZone,
-    private location: Location,
-    private changeDetectionRef: ChangeDetectorRef
-  ) {
-    this.navData = this.router.getCurrentNavigation().extras.state;
-    this.group = (this.navData && this.navData.groupInfo) ? this.navData.groupInfo : {};
-    this.groupEditForm = this.fb.group({
-      name: [this.group.name || '', Validators.required],
-      syllabus: [this.group.syllabus && this.group.syllabus[0] || []],
-      class: [this.group.grade || []]
-    });
-
-    this.isEditGroup = Boolean(this.group.hasOwnProperty('gid'));
-  }
-
-  ionViewDidEnter() {
-    const headerTitle = this.isEditGroup ? 'EDIT_GROUP' : 'CREATE_GROUP';
-    this.headerService.showHeaderWithBackButton([], this.commonUtilService.translateMessage(headerTitle));
-  }
-
-  ionViewWillEnter() {
-    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
-      this.location.back();
-    });
-  }
-
-  ngOnInit() {
-    this.loadTelemetry();
-    this.getSyllabusDetails();
-  }
-
-  ionViewWillLeave() {
-    if (this.backButtonFunc) {
-      this.backButtonFunc.unsubscribe();
-    }
-  }
-
-  loadTelemetry() {
-    this.telemetryGeneratorService.generateImpressionTelemetry(
-      ImpressionType.VIEW, '',
-      PageId.CREATE_GROUP_SYLLABUS_CLASS,
-      Environment.USER, this.isEditGroup ? this.group.gid : '', this.isEditGroup ? ObjectType.GROUP : ''
-    );
-
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      this.isEditGroup ? InteractSubtype.EDIT_GROUP_INITIATED : InteractSubtype.CREATE_GROUP_INITIATED,
-      Environment.USER,
-      PageId.CREATE_GROUP
-    );
-  }
-
-  /**
- * get Syllabus Details and store locally
- */
-  async getSyllabusDetails() {
-    const loader = await this.commonUtilService.getLoader();
-    await loader.present();
-
-    const getSuggestedFrameworksRequest: GetSuggestedFrameworksRequest = {
-      language: this.translate.currentLang,
-      requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
-    };
-    this.frameworkUtilService.getActiveChannelSuggestedFrameworkList(getSuggestedFrameworksRequest).toPromise()
-      .then(async (result: Framework[]) => {
-        if (result && result.length) {
-          result.forEach(element => {
-            // renaming the fields to text, value and checked
-            const value = { 'name': element.name, 'code': element.identifier };
-            this.syllabusList.push(value);
-          });
-
-          if (this.group && this.group.syllabus && this.group.syllabus[0] !== undefined) {
-            await loader.dismiss();
-            this.getClassList(this.group.syllabus[0], false);
-          } else {
-            await loader.dismiss();
-          }
-        } else {
-          await loader.dismiss();
-          this.commonUtilService.showToast(this.commonUtilService.translateMessage('NO_DATA_FOUND'));
-        }
-      });
-  }
-
-  /**Navigates to guest edit profile */
-  goToGuestEdit() {
-    this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.GUEST_EDIT}`]);
-  }
-
-  /**
- * Navigates to UsersList page
- */
-  navigateToUsersList() {
-    if (!this.isFormValid) {
-      this.commonUtilService.showToast(this.commonUtilService.translateMessage('NEED_INTERNET_TO_CHANGE'));
-      return;
-    }
-
-    const formValue = this.groupEditForm.value;
-    if (formValue.name) {
-      this.group.name = formValue.name;
-      this.group.grade = (!formValue.class.length) ? [] : [formValue.class];
-      this.group.syllabus = (!formValue.syllabus.length) ? [] : [formValue.syllabus];
-      this.group.gradeValue = {};
-
-      if (this.group.grade && this.group.grade.length) {
-        this.group.grade.forEach(gradeCode => {
-          for (let i = 0; i < this.classList.length; i++) {
-            if (this.classList[i].code === gradeCode) {
-              this.group.gradeValue[this.classList[i].code] = this.classList[i].name;
-              break;
-            }
-          }
-        });
-      }
-
-      const navigationExtras: NavigationExtras = { state: { group: this.group } }
-      this.router.navigate([`/${RouterLinks.USER_AND_GROUPS}/${RouterLinks.GROUP_MEMBERS}`], navigationExtras);
-    } else {
-      this.commonUtilService.showToast(this.commonUtilService.translateMessage('ENTER_GROUP_NAME'));
-    }
-  }
-
-  /**
-   * Internally calls Update group API if form is valid
-   */
-  async updateGroup() {
-    if(!this.commonUtilService.networkInfo.isNetworkAvailable) {
-      this.commonUtilService.showToast(this.commonUtilService.translateMessage('NEED_INTERNET_TO_CHANGE'));
-      return;
-    }
-
-    const formValue = this.groupEditForm.value;
-    if (formValue.name) {
-      const loader = await this.commonUtilService.getLoader();
-      await loader.present();
-
-      this.group.name = formValue.name;
-      this.group.grade = (!formValue.class.length) ? [] : Array.isArray(formValue.class) ? formValue.class : [formValue.class];
-      this.group.syllabus = (!formValue.syllabus.length) ? [] : [formValue.syllabus];
-      this.group.gradeValue = {};
-
-      if (this.group.grade && this.group.grade.length > 0) {
-        this.group.grade.forEach(gradeCode => {
-          for (let i = 0; i < this.classList.length; i++) {
-            if (this.classList[i].code === gradeCode) {
-              this.group.gradeValue[this.classList[i].code] = this.classList[i].name;
-              break;
-            }
-          }
-        });
-      }
-
-      this.groupService.updateGroup(this.group)
-        .subscribe(async (val) => {
-          loader.dismiss();
-          this.telemetryGeneratorService.generateInteractTelemetry(
-            InteractType.OTHER,
-            InteractSubtype.EDIT_GROUP_SUCCESS,
-            Environment.USER,
-            PageId.CREATE_GROUP
-          );
-          // this.navCtrl.popTo(this.navCtrl.getByIndex(this.navCtrl.length() - 2));
-          this.commonUtilService.showToast(this.commonUtilService.translateMessage('GROUP_UPDATE_SUCCESS'));
-          //this.router.navigate(['../'], { relativeTo: this.route });
-          this.location.back();
-        }, async (error) => {
-          loader.dismiss();
-          console.error('Error : ' + error);
-        });
-    } else {
-      this.commonUtilService.showToast(this.commonUtilService.translateMessage('ENTER_GROUP_NAME'));
-    }
-  }
-
-  /**
- *
- * @param frameworkId
- * @param isSyllabusChanged
- */
-  async getClassList(frameworkId, isSyllabusChanged: boolean = true) {
-    if (isSyllabusChanged) {
-      this.loader = await this.commonUtilService.getLoader();
-      await this.loader.present();
-    }
-
-    frameworkId = frameworkId ? frameworkId : this.groupEditForm.value.syllabus;
-    console.log('framework id', frameworkId);
-    this.groupEditForm.patchValue({
-      class: []
-    });
-
-    const frameworkDetailsRequest: FrameworkDetailsRequest = {
-      frameworkId: frameworkId,
-      requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
-    };
-    this.frameworkService.getFrameworkDetails(frameworkDetailsRequest).toPromise()
-      .then((framework: Framework) => {
-        this.isFormValid = true;
-        const request: GetFrameworkCategoryTermsRequest = {
-          currentCategoryCode: FrameworkCategoryCode.GRADE_LEVEL,
-          language: this.translate.currentLang,
-          requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES,
-          frameworkId: frameworkId
-        };
-        return this.frameworkUtilService.getFrameworkCategoryTerms(request).toPromise();
-      })
-      .then(async (classes) => {
-        if (isSyllabusChanged) {
-          await this.loader.dismiss();
-        }
-    this.classList = classes;
-
-        if (!isSyllabusChanged) {
-          this.groupEditForm.patchValue({
-            class: this.group.grade || []
-          });
-        }
-      })
-      .catch(async error => {
-        if (isSyllabusChanged) {
-          await this.loader.dismiss();
-        }
-        this.isFormValid = false;
-        if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
-          this.commonUtilService.showToast(this.commonUtilService.translateMessage('NEED_INTERNET_TO_CHANGE'));
-        }
-        console.error('Error : ' + error);
-      });
-  }
-}
diff --git a/src/app/user-and-groups/edit-delete-popover/edit-delete-popover.component.html b/src/app/user-and-groups/edit-delete-popover/edit-delete-popover.component.html
deleted file mode 100644
index 732d38d3e..000000000
--- a/src/app/user-and-groups/edit-delete-popover/edit-delete-popover.component.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<ion-list class="ion-no-padding">
-  <ion-item class="ed-pl-0" (click)="editUser()">
-    <ion-label class="ed-pl-16">
-      {{'EDIT' | translate}}
-    </ion-label>
-  </ion-item>
-  <ion-item class="ed-pl-0" *ngIf="!isCurrentUser" (click)="deleteUser()">
-    <ion-label class="ed-pl-16">
-      {{'DELETE' | translate}}
-    </ion-label>
-  </ion-item>
-</ion-list>
diff --git a/src/app/user-and-groups/edit-delete-popover/edit-delete-popover.component.scss b/src/app/user-and-groups/edit-delete-popover/edit-delete-popover.component.scss
deleted file mode 100644
index c8ee77a24..000000000
--- a/src/app/user-and-groups/edit-delete-popover/edit-delete-popover.component.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.ed-pl-0{
-    --padding-start: 0px;
-}
-
-.ed-pl-16{
-    padding-left: 16px;
-}
\ No newline at end of file
diff --git a/src/app/user-and-groups/edit-delete-popover/edit-delete-popover.component.ts b/src/app/user-and-groups/edit-delete-popover/edit-delete-popover.component.ts
deleted file mode 100644
index 93efb9096..000000000
--- a/src/app/user-and-groups/edit-delete-popover/edit-delete-popover.component.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Component, OnInit, Input } from '@angular/core';
-
-@Component({
-  selector: 'app-edit-delete-popover',
-  templateUrl: './edit-delete-popover.component.html',
-  styleUrls: ['./edit-delete-popover.component.scss'],
-})
-export class EditDeletePopoverComponent implements OnInit {
-  @Input('isCurrentUser') isCurrentUser = false;
-  @Input('delete') delete: any;
-  @Input('edit') edit: any;
-  constructor() { }
-
-  ngOnInit() { }
-
-  deleteUser() {
-    this.delete();
-  }
-  editUser() {
-    this.edit();
-  }
-
-}
diff --git a/src/app/user-and-groups/group-detail-nav-popover/group-detail-nav-popover.html b/src/app/user-and-groups/group-detail-nav-popover/group-detail-nav-popover.html
deleted file mode 100644
index 6a8a09929..000000000
--- a/src/app/user-and-groups/group-detail-nav-popover/group-detail-nav-popover.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<ion-list>
-  <ion-item (click)="goToEditGroup()">{{'EDIT_GROUP' | translate}}</ion-item>
-  <ion-item *ngIf="!isActiveGroup" (click)="deleteGroup()">{{'DELETE_GROUP' | translate}}</ion-item>
-  <ion-item (click)="addUsers()">{{'ADD_USERS' | translate}}</ion-item>
-  <ion-item *ngIf="noUsers" (click)="removeUser()">{{'REMOVE_USERS' | translate}}</ion-item>
-</ion-list>
\ No newline at end of file
diff --git a/src/app/user-and-groups/group-detail-nav-popover/group-detail-nav-popover.ts b/src/app/user-and-groups/group-detail-nav-popover/group-detail-nav-popover.ts
deleted file mode 100644
index e7172701f..000000000
--- a/src/app/user-and-groups/group-detail-nav-popover/group-detail-nav-popover.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Component } from '@angular/core';
-import { NavParams } from '@ionic/angular';
-
-@Component({
-  selector: 'app-group-detail-nav-popover',
-  templateUrl: './group-detail-nav-popover.html',
-  styleUrls: ['./group-detail-nav-popover.scss'],
-})
-export class GroupDetailNavPopover {
-
-  noUsers = false;
-  isActiveGroup = false;
-  constructor(private navParams: NavParams) {
-    this.isActiveGroup = this.navParams.get('isActiveGroup');
-    this.noUsers = Boolean(this.navParams.get('noUsers'));
-  }
-
-  goToEditGroup() {
-    this.navParams.get('goToEditGroup')();
-  }
-
-  deleteGroup() {
-    this.navParams.get('deleteGroup')();
-  }
-
-  addUsers() {
-    this.navParams.get('addUsers')();
-  }
-
-  removeUser() {
-    this.navParams.get('removeUser')();
-  }
-
-
-}
diff --git a/src/app/user-and-groups/group-details/group-details.page.html b/src/app/user-and-groups/group-details/group-details.page.html
deleted file mode 100644
index 92421311d..000000000
--- a/src/app/user-and-groups/group-details/group-details.page.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-buttons class="sb-hamburger" slot="start">
-      <ion-button class="color" icon-only (click)="goBack()">
-        <ion-icon name="arrow-back"></ion-icon>
-      </ion-button>
-    </ion-buttons>
-    <ion-title class="f16 color">{{group?.name}}</ion-title>
-    <ion-buttons slot="primary">
-      <ion-button class="color" *ngIf="!playConfig" icon-only (click)="presentPopoverNav($event)">
-        <ion-icon name="more" class="ion-float-end"></ion-icon>
-      </ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-header>
-<ion-content>
-  <div padding>
-    <ion-list>
-      <div *ngIf="isNoUsers" class="ion-text-center">
-        <div class="img-container">
-          <img class="image_style" src="assets/imgs/ic_businessman.png" alt="no-user">
-        </div>
-        <br />
-        <ion-row class="ion-margin-top">
-          <ion-col size-md="6" offset-md="3" size-lg="6" offset-lg="3">
-            <div class="image-text">
-              <h6>
-                <strong>{{'NO_USERS_IN_THIS_GROUP' | translate}}</strong>
-              </h6>
-              <p>{{'NO_USERS_SUGGESTION_MESSAGE' | translate}}</p>
-            </div>
-          </ion-col>
-        </ion-row>
-      </div>
-    </ion-list>
-    <ion-list lines="none" *ngIf="!isNoUsers">
-      <ion-item *ngFor="let user of userList; let i=index;" class="item-background gd-mb-16 ion-no-padding"
-        [ngClass]="i===selectedUserIndex ? 'blueBorder' : ''">
-        <ion-label class="ion-no-margin">
-          <ion-grid class="radius ion-no-padding">
-            <ion-row class="bg-color-white gd-row-padding radius">
-              <ion-col size="10" class="bg-color-white">
-                <div (click)="selectUser(i, user?.handle)"
-                  class="bg-color-white padding-left-0 rm-label-margin ion-no-padding">
-                  <h6 class="elipsis ion-no-margin"
-                    [ngStyle]="{'color': currentUserId === user?.uid ? 'dodgerblue' : 'black'}">
-                    <strong>{{user?.handle | titlecase}}</strong>
-                  </h6>
-                  <p>
-                    <span
-                      *ngIf="user?.profileType === ProfileType.TEACHER">{{'USER_TYPE_1' | translate | titlecase}}</span>
-                    <span
-                      *ngIf="user?.profileType === ProfileType.STUDENT">{{'USER_TYPE_2' | translate | titlecase}}</span>
-                      <span
-                      *ngIf="user?.profileType === ProfileType.OTHER">{{'USER_TYPE_3' | translate | titlecase}}</span>
-                    <span *ngIf="user?.grade?.length">•</span> {{ getGradeNameFromCode(user) }}
-                  </p>
-                </div>
-              </ion-col>
-              <ion-col size="2" class="advanced-menu" *ngIf="!playConfig">
-                <ion-icon class="gd-icon-font-size" name="more" item-end (click)="presentPopover($event , i)">
-                </ion-icon>
-              </ion-col>
-            </ion-row>
-          </ion-grid>
-        </ion-label>
-      </ion-item>
-    </ion-list>
-  </div>
-
-</ion-content>
-
-<ion-footer class="footer" *ngIf="userList.length && selectedUserIndex !== -1">
-  <ion-row>
-    <div *ngIf="playConfig && selectedUserIndex === -1 && !isNoUsers " class="error-message-contentplay">
-      <div>
-        <ion-icon ios="ios-information-circle" md="md-information-circle"></ion-icon>
-        {{ 'PLEASE_SELECT_USER' | translate }}
-      </div>
-    </div>
-  </ion-row>
-  <ion-row class="ion-padding">
-    <ion-col size-md="10" offset-md="1">
-      <ion-button expand="block" center *ngIf="!playConfig" (click)="switchAccountConfirmBox()">
-        {{'SWITCH_ACCOUNT' | translate}}
-      </ion-button>
-      <ion-button expand="block" center *ngIf="playConfig" (click)="play()">
-        {{'PLAY' | translate}}
-      </ion-button>
-    </ion-col>
-  </ion-row>
-</ion-footer>
-<ion-footer class="footer" *ngIf="playConfig && selectedUserIndex === -1">
-  <ion-row>
-    <div *ngIf="playConfig && selectedUserIndex === -1 && !isNoUsers" class="error-message-contentplay">
-      <div>
-        <ion-icon ios="ios-information-circle" md="md-information-circle"></ion-icon>
-        {{ 'PLEASE_SELECT_USER' | translate }}
-      </div>
-    </div>
-  </ion-row>
-  <ion-row class="ion-padding">
-    <ion-col size-md="10" offset-md="1">
-      <ion-button expand="block" center [disabled]="true" (click)="play()">
-        {{'PLAY' | translate}}
-      </ion-button>
-    </ion-col>
-  </ion-row>
-</ion-footer>
\ No newline at end of file
diff --git a/src/app/user-and-groups/group-details/group-details.page.scss b/src/app/user-and-groups/group-details/group-details.page.scss
deleted file mode 100644
index f3a9a9076..000000000
--- a/src/app/user-and-groups/group-details/group-details.page.scss
+++ /dev/null
@@ -1,116 +0,0 @@
-@import "src/assets/styles/_custom-mixins.scss";
-@import "src/assets/styles/_variables.scss";
-@import "src/assets/styles/fonts.scss";
-
-:host {
-  .scroll-content {
-    z-index: 11 !important;
-  }
-  .blueBorder {
-    border-color: map-get($colors, primary) !important;
-    border-style: solid !important;
-    border-width: 2px !important;
-    border-radius: 4px;
-  }
-  .item-background.item-md {
-    background-color: map-get($colors, light_gray) !important;
-    .item-native > .item-inner{
-      padding-right: 0px !important;
-    }
-  }
-  .bg-color-white {
-    background-color: map-get($colors, light_gray) !important;
-  }
-  .advanced-menu {
-    @include padding(0, 0, 0, 7% !important);
-  }
-  .advanced-menu ion-icon[item-end] {
-    @include margin(0, null, null, null !important);
-    @include padding(null, 8px, null, null !important);
-  }
-  .advanced-menu .item-md,
-  .advanced-menu .item-ios {
-    @include margin(0, null, null, null !important);
-  }
-  .padding-left-0 {
-    @include padding(null, null, null, 0 !important);
-  }
-  .rm-label-margin ion-label {
-    margin-top: 0 !important;
-    margin-bottom: 0 !important;
-  }
-  .image-text {
-    text-align: center;
-    margin-top: 38vh;
-    background-color: map-get($colors, light-gray);
-  }
-  .image_style {
-    width: 335px;
-    height: 102px;
-    border-radius: 50%;
-  }
-  .img-container {
-    position: absolute;
-    width: 100px;
-    height: 100px;
-    top: 30%;
-    @include ltr() {
-      left: 60%;
-    }
-    @include rtl() {
-      right: 60%;
-    }
-    @include margin(null, null, null, -97px);
-    margin-top: -144x;
-  }
-  .playcontent-label {
-    margin-top: 55.2vh;
-    background-color: #a1a1a1;
-    color: white;
-    width: 100%;
-  }
-
-  .error-message-contentplay {
-    width: -webkit-fill-available;
-    background-color: #a1a1a1;
-    padding: 5px 0px 5px 20px;
-    color: white;
-    // position: fixed !important;
-    // bottom: 93px;
-  }
-  .no-padding {
-    padding: 0px !important;
-  }
-  .playcontent-label {
-    font-size: 1.4rem !important;
-    @include padding(1px, 0px, 1px, 6px !important);
-  }
-  .footer {
-    background-color: white;
-  }
-
-  .icon.ion-md-information-circle {
-    vertical-align: text-bottom;
-  }
-  ion-title.color,ion-button.color {
-    color:#024f9d;
-    font-weight:bold;
-  }
-}
-
-.gd-mb-16{
-  margin-bottom: 16px !important;
-  --inner-padding-end: 0;
-}
-
-.gd-icon-font-size{
-  font-size: 28px;
-}
-
-.radius {
-  border-radius: 6px;
-}
-
-.gd-row-padding {
-  @include padding(12px, 16px, 16px, 18px !important);
-}
diff --git a/src/app/user-and-groups/group-details/group-details.page.ts b/src/app/user-and-groups/group-details/group-details.page.ts
deleted file mode 100644
index d9f78228e..000000000
--- a/src/app/user-and-groups/group-details/group-details.page.ts
+++ /dev/null
@@ -1,519 +0,0 @@
-import { Location } from '@angular/common';
-import { Subscription } from 'rxjs';
-import { SbGenericPopoverComponent } from 'app/components/popups/sb-generic-popover/sb-generic-popover.component';
-import { ActivatedRoute, Router, NavigationExtras } from '@angular/router';
-import { Component, Inject, NgZone } from '@angular/core';
-import {
-  AlertController, Events, LoadingController, PopoverController, ToastController, Platform
-} from '@ionic/angular';
-import {
-  AuthService,
-  GetAllProfileRequest,
-  Group,
-  GroupService,
-  Profile,
-  ProfileService,
-  ProfilesToGroupRequest,
-  ProfileType,
-  SharedPreferences,
-  TelemetryObject
-} from 'sunbird-sdk';
-
-import { AppGlobalService } from 'services/app-global-service.service';
-import {
-  CommonUtilService,
-  AppHeaderService,
-  ContainerService,
-  Environment,
-  InteractSubtype,
-  InteractType,
-  ObjectType,
-  PageId,
-  TelemetryGeneratorService
-} from './../../../services';
-import {
-  GUEST_STUDENT_SWITCH_TABS,
-  GUEST_STUDENT_TABS,
-  GUEST_TEACHER_SWITCH_TABS,
-  GUEST_TEACHER_TABS,
-  initTabs
-} from 'app/module.service';
-import { Map } from 'app/telemetryutil';
-import { PreferenceKey, RouterLinks } from 'app/app.constant';
-import { EditDeletePopoverComponent } from '../edit-delete-popover/edit-delete-popover.component';
-import { GroupDetailNavPopover } from '../group-detail-nav-popover/group-detail-nav-popover';
-import { map } from 'rxjs/operators';
-
-@Component({
-  selector: 'app-group-details',
-  templateUrl: './group-details.page.html',
-  styleUrls: ['./group-details.page.scss'],
-})
-export class GroupDetailsPage {
-  group: Group;
-  currentUserId: string;
-  currentGroupId: string;
-  userList: Array<Profile> = [];
-  selectedUserIndex = -1;
-  profileDetails: any;
-  userUids = [];
-  isNoUsers = true;
-  playConfig: any;
-  ProfileType = ProfileType;
-  isCurrentGroupActive = false;
-  backButtonFunc: Subscription;
-
-  constructor(
-    @Inject('GROUP_SERVICE') private groupService: GroupService,
-    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
-    @Inject('AUTH_SERVICE') private authService: AuthService,
-    @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
-    private zone: NgZone,
-    private popOverCtrl: PopoverController,
-    private container: ContainerService,
-    private event: Events,
-    private telemetryGeneratorService: TelemetryGeneratorService,
-    private appGlobalService: AppGlobalService,
-    private commonUtilService: CommonUtilService,
-    private headerService: AppHeaderService,
-    private route: ActivatedRoute,
-    private router: Router,
-    private location: Location
-  ) {
-
-    const extrasState = this.router.getCurrentNavigation().extras.state;
-
-    if (extrasState) {
-      this.group = extrasState.groupInfo;
-      this.currentUserId = extrasState.currentUserId;
-      this.currentGroupId = extrasState.currentGroupId;
-      this.profileDetails = extrasState.profile;
-      this.playConfig = extrasState.playConfig;
-      this.isCurrentGroupActive = (this.group.gid === this.currentGroupId);
-    }
-
-  }
-
-  ionViewWillEnter() {
-    this.headerService.hideHeader();
-    this.getAllProfile();
-  }
-
-
-  async getAllProfile() {
-    const loader = await this.commonUtilService.getLoader();
-    await loader.present();
-    const profileRequest: GetAllProfileRequest = {
-      local: true,
-      groupId: this.group.gid
-    };
-
-    this.zone.run(() => {
-      this.profileService.getAllProfiles(profileRequest).pipe(
-        map((profiles) => profiles.filter((profile) => !!profile.handle))
-      )
-      .toPromise()
-        .then((profiles) => {
-          this.zone.run(async () => {
-            await loader.dismiss();
-            if (profiles && profiles.length) {
-              this.userList = profiles;
-              this.userList.forEach((item) => {
-                this.userUids.push(item.uid);
-              });
-              this.isNoUsers = !this.userList.length;
-            }
-          });
-        }).catch(async () => {
-          await loader.dismiss();
-        });
-    });
-  }
-
-
-  selectUser(index: number, name: string) {
-    this.zone.run(() => {
-      this.selectedUserIndex = (this.selectedUserIndex === index) ? -1 : index;
-    });
-  }
-
-  /**
-   * Shows Prompt for switch Account
-   */
-  async switchAccountConfirmBox() {
-    // Generate Switch User click event
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      InteractSubtype.SWITCH_USER_CLICKED,
-      Environment.USER,
-      PageId.GROUP_DETAIL
-    );
-
-    const selectedUser = this.userList[this.selectedUserIndex];
-    const valuesMap = new Map();
-    const fromUser = new Map();
-    fromUser['uid'] = this.currentUserId;
-    fromUser['type'] = this.appGlobalService.isUserLoggedIn() ? 'signed-in' : 'guest';
-
-    const toUser = new Map();
-    toUser['uid'] = selectedUser.uid;
-    toUser['type'] = 'guest';
-
-    valuesMap['from'] = fromUser;
-    valuesMap['to'] = toUser;
-    valuesMap['gid'] = this.group.gid;
-
-    let telemetryObject: TelemetryObject;
-    telemetryObject = new TelemetryObject(selectedUser.uid, Environment.USER, undefined);
-
-    // Generate Switch user initiate interact event
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      InteractSubtype.SWITCH_USER_INITIATE,
-      Environment.USER,
-      PageId.GROUP_DETAIL,
-      telemetryObject,
-      valuesMap
-    );
-
-    if (this.appGlobalService.isUserLoggedIn()) {
-      const confirm = await this.popOverCtrl.create({
-        component: SbGenericPopoverComponent,
-        componentProps: {
-          sbPopoverHeading: this.commonUtilService.translateMessage('SWITCH_ACCOUNT_CONFIRMATION'),
-          sbPopoverMainTitle: this.commonUtilService.translateMessage('SIGNED_OUT_ACCOUNT_MESSAGE'),
-          actionsButtons: [
-            {
-              btntext: this.commonUtilService.translateMessage('CANCEL'),
-              btnClass: 'sb-btn sb-btn-sm  sb-btn-outline-info'
-            },
-            {
-              btntext: this.commonUtilService.translateMessage('OKAY'),
-              btnClass: 'popover-color'
-            }
-          ],
-          icon: null
-        },
-        cssClass: 'sb-popover info',
-      });
-      await confirm.present();
-      const { data } = await confirm.onDidDismiss();
-      if (data && data.isLeftButtonClicked === null) {
-        return;
-      }
-      if (data && !data.isLeftButtonClicked) {
-        this.logOut(selectedUser, false);
-      }
-    } else {
-      this.setAsCurrentUser(selectedUser, false);
-    }
-
-    // Generate Switch user success event
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.OTHER,
-      InteractSubtype.SWITCH_USER_SUCCESS,
-      Environment.USER,
-      PageId.GROUP_DETAIL,
-      telemetryObject,
-      valuesMap);
-  }
-
-  // takes to content details page and launches player
-  play() {
-    const selectedUser = this.userList[this.selectedUserIndex];
-    if (this.appGlobalService.isUserLoggedIn()) {
-      this.logOut(selectedUser, true);
-    } else {
-      this.setAsCurrentUser(selectedUser, true);
-    }
-  }
-
-  logOut(selectedUser: any, isBeingPlayed: boolean) {
-    const telemetryObject = new TelemetryObject(this.profileDetails.id, Environment.USER, undefined);
-
-
-    // Generate Logout initiate event
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      InteractSubtype.LOGOUT_INITIATE,
-      Environment.USER,
-      PageId.GROUP_DETAIL,
-      telemetryObject
-    );
-    if (isBeingPlayed) {
-      this.authService.resignSession().subscribe();
-      (<any>window).splashscreen.clearPrefs();
-      this.setAsCurrentUser(selectedUser, true);
-    } else {
-      if (this.commonUtilService.networkInfo.isNetworkAvailable) {
-        this.authService.resignSession().toPromise().then(() => {
-          (<any>window).splashscreen.clearPrefs();
-          this.setAsCurrentUser(selectedUser, false);
-        });
-      } else {
-        this.authService.resignSession().subscribe();
-        (<any>window).splashscreen.clearPrefs();
-        this.setAsCurrentUser(selectedUser, false);
-      }
-    }
-    // Generate Logout success event
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.OTHER,
-      InteractSubtype.LOGOUT_SUCCESS,
-      Environment.USER,
-      PageId.GROUP_DETAIL,
-      telemetryObject
-    );
-  }
-
-  async presentPopoverNav(myEvent) {
-    const popover = await this.popOverCtrl.create({
-      component: GroupDetailNavPopover,
-      componentProps: {
-        goToEditGroup: () => {
-          const navigationExtras: NavigationExtras = {
-            state: {
-              groupInfo: this.group
-            }
-          };
-          this.router.navigate([RouterLinks.CREATE_GROUP], navigationExtras);
-          popover.dismiss();
-        },
-        deleteGroup: async () => {
-
-          this.deleteGroupConfirmBox();
-          await popover.dismiss();
-        },
-        addUsers: async () => {
-          const navigationExtras: NavigationExtras = {
-            state: {
-              isAddUsers: true,
-              groupInfo: this.group,
-              groupMembers: this.userList
-            }
-          }
-
-          this.router.navigate([RouterLinks.ADD_OR_REMOVE_GROUP_USER], navigationExtras);
-          await popover.dismiss();
-        },
-        removeUser: async () => {
-          const navigationExtras: NavigationExtras = {
-            state: {
-              isAddUsers: false,
-              groupInfo: this.group,
-              groupMembers: this.userList
-            }
-          }
-          this.router.navigate([RouterLinks.ADD_OR_REMOVE_GROUP_USER], navigationExtras);
-
-          await popover.dismiss();
-        },
-        noUsers: this.userList.length,
-        isActiveGroup: this.isCurrentGroupActive
-      },
-      cssClass: 'user-popover',
-      event: myEvent
-    });
-
-    await popover.present();
-  }
-
-  async presentPopover(myEvent, index: number) {
-    const profile = this.userList[index];
-    let isActiveUser = false;
-    if (profile.uid === this.currentUserId && this.isCurrentGroupActive) {
-      isActiveUser = true;
-    }
-
-    const popover = await this.popOverCtrl.create({
-      component: EditDeletePopoverComponent,
-      componentProps: {
-        edit: async () => {
-          const navigationExtras: NavigationExtras = {
-            state: {
-              profile: this.userList[index]
-            }
-          };
-          this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.GUEST_EDIT}`], navigationExtras);
-          await popover.dismiss();
-        },
-        delete: async () => {
-          this.userDeleteGroupConfirmBox(index);
-          await popover.dismiss();
-
-        },
-        isCurrentUser: isActiveUser
-      },
-      cssClass: 'user-popover',
-      event: myEvent
-    });
-    await popover.present();
-  }
-
-
-  /** Delete alert box */
-  async deleteGroupConfirmBox() {
-    const confirm = await this.popOverCtrl.create({
-      component: SbGenericPopoverComponent,
-      componentProps: {
-        sbPopoverHeading: this.commonUtilService.translateMessage('GROUP_DELETE_CONFIRM', this.group.name),
-        sbPopoverMainTitle: this.commonUtilService.translateMessage('GROUP_DELETE_CONFIRM_MESSAGE'),
-        actionsButtons: [
-          {
-            btntext: this.commonUtilService.translateMessage('CANCEL'),
-            btnClass: 'sb-btn sb-btn-sm  sb-btn-outline-info'
-          },
-          {
-            btntext: this.commonUtilService.translateMessage('YES'),
-            btnClass: 'popover-color'
-          }
-        ],
-        icon: null
-      },
-      cssClass: 'sb-popover info',
-    });
-    await confirm.present();
-    const { data } = await confirm.onDidDismiss();
-    if (data && data.isLeftButtonClicked === null) {
-      return;
-    }
-    if (data && !data.isLeftButtonClicked) {
-      this.deleteGroup();
-    }
-  }
-
-  deleteGroup() {
-    const telemetryObject = new TelemetryObject(this.group.gid, ObjectType.GROUP, undefined);
-
-    // Generate Delete group event
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      InteractSubtype.DELETE_GROUP_INITIATE,
-      Environment.USER,
-      PageId.GROUP_DETAIL,
-      telemetryObject);
-    this.groupService.deleteGroup(this.group.gid).subscribe(() => {
-      this.location.back();
-    }, (error) => {
-    });
-  }
-
-  /* delete confirm box for user */
-  /** Delete alert box */
-  async userDeleteGroupConfirmBox(index) {
-
-    const confirm = await this.popOverCtrl.create({
-      component: SbGenericPopoverComponent,
-      componentProps: {
-        sbPopoverHeading: this.commonUtilService.translateMessage('USER_DELETE_CONFIRM_MESSAGE_FROM_GROUP', this.userList[index].handle),
-        sbPopoverMainTitle: this.commonUtilService.translateMessage('USER_DELETE_CONFIRM_SECOND_MESSAGE'),
-        actionsButtons: [
-          {
-            btntext: this.commonUtilService.translateMessage('CANCEL'),
-            btnClass: 'sb-btn sb-btn-sm sb-btn-outline-info'
-          },
-          {
-            btntext: this.commonUtilService.translateMessage('YES'),
-            btnClass: 'popover-color'
-          },
-        ],
-        icon: null
-      },
-      cssClass: 'sb-popover info',
-    });
-    await confirm.present();
-    const { data } = await confirm.onDidDismiss();
-    if (data && data.isLeftButtonClicked === null) {
-      return;
-    }
-    if (!data.isLeftButtonClicked) {
-      this.removeGroupMember(index);
-    }
-  }
-
-  removeGroupMember(index: number) {
-    const userListIndex = this.userList.indexOf(this.userList[index]);
-    this.userUids.forEach((item) => {
-      if (this.userList[index].uid === item) {
-        const elementIndex = this.userUids.indexOf(item);
-        this.userUids.splice(elementIndex, 1);
-
-      }
-    });
-    const req: ProfilesToGroupRequest = {
-      groupId: this.group.gid,
-      uidList: this.userUids
-    };
-
-    this.groupService.addProfilesToGroup(req).subscribe(
-      () => {
-        this.userList.splice(userListIndex, 1);
-        this.isNoUsers = !this.userList.length;
-      }, error => { });
-  }
-
-  getGradeNameFromCode(data: Profile | Group): string {
-    if (data.grade && data.grade.length > 0) {
-      const gradeName = [];
-      data.grade.forEach(code => {
-        if (data['gradeValue'] && data['gradeValue'][code]) {
-          gradeName.push(data['gradeValue'][code]);
-        }
-      });
-
-      if (gradeName.length === 0) {
-        return data.grade.join(',');
-      }
-
-      return gradeName.join(',');
-    }
-
-    return '';
-  }
-
-  navigateToAddUser() {
-    const navigationExtras: NavigationExtras = {
-      state: {
-        isNewUser: true
-      }
-    };
-
-    this.router.navigate(['GuestEditProfilePage'], navigationExtras);
-  }
-
-  private setAsCurrentUser(selectedUser, isBeingPlayed: boolean) {
-    this.groupService.setActiveSessionForGroup(this.group.gid)
-      .subscribe(() => {
-        this.profileService.setActiveSessionForProfile(selectedUser.uid).toPromise()
-          .then(() => {
-            if (isBeingPlayed) {
-              this.playConfig['selectedUser'] = selectedUser;
-              this.preferences.putString(PreferenceKey.SELECTED_USER_TYPE, selectedUser.profileType).toPromise().then();
-              this.event.publish('playConfig', this.playConfig);
-              // this.navCtrl.popTo(this.navCtrl.getByIndex(this.navCtrl.length() - 2));
-
-              this.router.navigate(['../'], { relativeTo: this.route });
-            } else {
-              if (selectedUser.profileType === ProfileType.STUDENT) {
-                initTabs(this.container, isBeingPlayed ? GUEST_STUDENT_TABS : GUEST_STUDENT_SWITCH_TABS);
-              } else {
-                initTabs(this.container, isBeingPlayed ? GUEST_TEACHER_TABS : GUEST_TEACHER_SWITCH_TABS);
-              }
-              this.preferences.putString(PreferenceKey.SELECTED_USER_TYPE, selectedUser.profileType).toPromise().then();
-
-              this.event.publish('refresh:profile');
-              this.event.publish(AppGlobalService.USER_INFO_UPDATED);
-
-              this.router.navigate([RouterLinks.TABS]);
-              this.commonUtilService.showToast(this.commonUtilService.translateMessage('SWITCHING_TO', selectedUser.handle));
-            }
-          }, () => {
-          });
-      }, () => {
-      });
-  }
-
-  goBack() {
-    this.location.back();
-  }
-}
diff --git a/src/app/user-and-groups/group-members/group-members.page.html b/src/app/user-and-groups/group-members/group-members.page.html
deleted file mode 100644
index 4af401ae9..000000000
--- a/src/app/user-and-groups/group-members/group-members.page.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<ion-header>
-  <ion-toolbar>
-    <ion-buttons class="sb-hamburger" slot="start">
-      <ion-button class="f18 color" icon-only (click)="goBack()">
-        <ion-icon name="arrow-back"></ion-icon>
-      </ion-button>
-    </ion-buttons>
-    <ion-title class="color f16">
-      {{'ADD_USERS_TO_GROUP' | translate:{'%s': ""} }}
-    </ion-title>
-    <ion-buttons slot="primary">
-      <ion-button class="color f18" icon-only (click)="goTOGuestEdit()">
-        <ion-icon name="add" class="ion-float-end"></ion-icon>
-      </ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-</ion-header>
-<ion-content class="ion-padding">
-  <div *ngIf="userList?.length">
-    <ion-row>
-      <ion-col class="rm-padding-left" size-md="4">
-        <ion-text>
-          <p *ngIf="userList.length" text-left class="gm-title-color ion-text-uppercase">
-            <strong>{{userList?.length}}&nbsp;{{'USERS' | translate}}</strong>
-          </p>
-        </ion-text>
-      </ion-col>
-      <ion-col size-md="4" push-md="4" class="rm-padding-right">
-        <ion-text class="gm-float-right">
-          <p *ngIf="userList.length" text-left class="ion-text-uppercase">
-            <a (click)="selectAll()" class="gm-primary-color">{{'SELECT_ALL' | translate}}</a>
-          </p>
-        </ion-text>
-      </ion-col>
-    </ion-row>
-  </div>
-  <div *ngIf="!userList?.length && !loading">
-    <div class="ion-text-center">
-      <img class="rounded image-style" src="assets/imgs/ic_businessman.png" alt="no-user" />
-      <h6>
-        <strong>{{'NO_USERS_ON_THIS_DEVICE' | translate}}</strong>
-      </h6>
-      <ion-text>
-        <p>{{'NO_USERS_SUGGESTION_MESSAGE' | translate}}</p>
-      </ion-text>
-      <ion-text>
-        <h6 color="primary">{{'CREATE_USER' | translate}}</h6>
-      </ion-text>
-    </div>
-  </div>
-  <div *ngIf="userList?.length">
-    <ion-item *ngFor="let user of userList; let i = index;" class="gm-item-background ion-margin-bottom" no-lines
-      (click)="toggleSelect(i)">
-      <ion-label class="PL16">
-        <h6 class="MT0">
-          <strong>{{user?.handle}}</strong>
-        </h6>
-        <p>
-          <span *ngIf="user?.profileType === ProfileType.TEACHER">{{'USER_TYPE_1' | translate | titlecase}}</span>
-          <span *ngIf="user?.profileType === ProfileType.STUDENT">{{'USER_TYPE_2' | translate | titlecase}}</span>
-          <span *ngIf="user?.profileType === ProfileType.OTHER">{{'USER_TYPE_3' | translate | titlecase}}</span>
-          <span *ngIf="user?.grade?.length">•</span> {{ getGradeNameFromCode(user) }}</p>
-      </ion-label>
-      <ion-checkbox item-end mode="ios" checked="{{isUserSelected(i)}}"></ion-checkbox>
-    </ion-item>
-  </div>
-
-</ion-content>
-<ion-footer>
-  <ion-row class="ion-padding">
-    <ion-col size-md="10" offset-md="1">
-      <ion-button expand="block" (click)="createGroup()" [disabled]="!userList?.length">
-        {{'CREATE_GROUP' | translate }}
-      </ion-button>
-    </ion-col>
-  </ion-row>
-</ion-footer>
\ No newline at end of file
diff --git a/src/app/user-and-groups/group-members/group-members.page.scss b/src/app/user-and-groups/group-members/group-members.page.scss
deleted file mode 100644
index 12a4ad353..000000000
--- a/src/app/user-and-groups/group-members/group-members.page.scss
+++ /dev/null
@@ -1,67 +0,0 @@
-@import "src/assets/styles/_custom-mixins.scss";
-@import "src/assets/styles/_variables.scss";
-@import "src/assets/styles/fonts.scss";
-
-:host {
-  .rounded {
-    border-radius: 50%;
-  }
-
-  .gm-item-background {
-    --padding-start: 0px;
-    background-color: map-get($colors, light_gray) !important;
-    --background: map-get($colors, light_gray) !important;
-    border-radius: 6px;
-  }
-  
-  .gm-title-color {
-    color: map-get($colors, title) !important;
-  }
-  .gm-primary-color {
-    color: map-get($colors, primary) !important;
-  }
-  .gm-float-right {
-    float: right;
-    font-weight: 600 !important;
-  }
-  
-  .checkbox-inner {
-      @include ltr() {
-        left: 7px;
-      }
-      @include rtl() {
-        right: 7px;
-      }
-
-    top: 4px;
-    position: absolute;
-    width: 4px;
-    height: 9px;
-    border-width: 0 1px 1px 0;
-    border-style: solid;
-    border-color: map-get($colors, dark_gray);
-    -webkit-transform: rotate(45deg);
-    transform: rotate(45deg);
-  }
-  .checkbox-ios .checkbox-icon {
-    background-color: transparent !important;
-  }
-  // .checkbox-ios .checkbox-checked {
-  //   background-color: map-get($colors, primary) !important;
-  // }
-  .image-style {
-    margin-top: 20vh;
-    width: 50%;
-  }
-  .rm-padding-right {
-    @include padding(null, 0, null, null !important);
-  }
-  .rm-padding-left {
-    @include padding(null, null, null, 0 !important);
-  }
-
-  ion-button.color,ion-title.color {
-    color:#024f9d;
-    font-weight:bold;
-  }
-}
diff --git a/src/app/user-and-groups/group-members/group-members.page.ts b/src/app/user-and-groups/group-members/group-members.page.ts
deleted file mode 100644
index 5c6eac2fc..000000000
--- a/src/app/user-and-groups/group-members/group-members.page.ts
+++ /dev/null
@@ -1,236 +0,0 @@
-import { Component, OnInit, Inject, NgZone, OnDestroy } from '@angular/core';
-import {
-  GetAllProfileRequest,
-  Group,
-  GroupService,
-  Profile,
-  ProfileService,
-  ProfilesToGroupRequest,
-  ProfileType
-} from 'sunbird-sdk';
-import {
-  CommonUtilService,
-  TelemetryGeneratorService,
-  Environment,
-  ImpressionType,
-  InteractSubtype,
-  InteractType,
-  ObjectType,
-  PageId,
-  AppHeaderService
-} from '../../../services';
-import { NavigationExtras, ActivatedRoute, Router } from '@angular/router';
-import { Location } from '@angular/common';
-import { Platform } from '@ionic/angular';
-import { Subscription } from 'rxjs';
-import { RouterLinks } from '@app/app/app.constant';
-import { map } from 'rxjs/operators';
-
-@Component({
-  selector: 'app-group-members',
-  templateUrl: './group-members.page.html',
-  styleUrls: ['./group-members.page.scss'],
-})
-export class GroupMembersPage implements OnInit {
-  ProfileType = ProfileType;
-  group: Group;
-  userList: Array<Profile> = [];
-  userSelectionMap: Map<string, boolean> = new Map();
-  lastCreatedProfileData: any;
-  loading: boolean;
-  backButtonFunc: Subscription;
-
-  constructor(
-    @Inject('GROUP_SERVICE') private groupService: GroupService,
-    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
-    private zone: NgZone,
-    private commonUtilService: CommonUtilService,
-    private telemetryGeneratorService: TelemetryGeneratorService,
-    private headerService: AppHeaderService,
-    private route: ActivatedRoute,
-    private router: Router,
-    private platform: Platform,
-    private location: Location
-  ) {
-    if (this.router.getCurrentNavigation().extras.state) {
-      this.group = this.router.getCurrentNavigation().extras.state.group;
-    }
-  }
-
-  ngOnInit() {
-    this.telemetryGeneratorService.generateImpressionTelemetry(
-      ImpressionType.VIEW, '',
-      PageId.CREATE_GROUP_USER_SELECTION,
-      Environment.USER, this.group.gid ? this.group.gid : '', this.group.gid ? ObjectType.GROUP : ''
-    );
-  }
-
-  ionViewWillLeave() {
-    if (this.backButtonFunc) {
-      this.backButtonFunc.unsubscribe();
-      this.backButtonFunc = undefined;
-    }
-  }
-
-  ionViewWillEnter() {
-    this.loading = true; // present only loader, untill users are fetched from service
-    this.headerService.hideHeader();
-    this.getAllProfile();
-    this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
-      this.location.back();
-    });
-  }
-
-  // method below fetches the last created user
-  getLastCreatedProfile() {
-    return new Promise((resolve, reject) => {
-      const req: GetAllProfileRequest = {
-        local: true
-      };
-      this.profileService.getAllProfiles(req).pipe(
-        map((profiles) => profiles.filter((profile) => !!profile.handle))
-      ).toPromise().then((lastCreatedProfile: any) => {
-          this.lastCreatedProfileData = lastCreatedProfile;
-          resolve(lastCreatedProfile);
-        }).catch(() => {
-          reject(null);
-        });
-    });
-  }
-
-  getAllProfile() {
-    const profileRequest: GetAllProfileRequest = {
-      local: true
-    };
-
-    this.zone.run(() => {
-      this.profileService.getAllProfiles(profileRequest).pipe(
-        map((profiles) => profiles.filter((profile) => !!profile.handle))
-        ).toPromise().then(async (profiles) => {
-          const loader = await this.commonUtilService.getLoader();
-          await loader.present();
-          this.zone.run(async () => {
-            if (profiles && profiles.length) {
-              this.userList = profiles;
-              await loader.dismiss();
-              this.loading = false;
-            }
-          });
-        });
-    });
-  }
-
-  toggleSelect(index: number) {
-    let value = this.userSelectionMap.get(this.userList[index].uid);
-    if (value) {
-      value = false;
-    } else {
-      value = true;
-    }
-
-    this.userSelectionMap.set(this.userList[index].uid, value);
-  }
-
-  isUserSelected(index: number) {
-    return Boolean(this.userSelectionMap.get(this.userList[index].uid));
-  }
-
-  selectAll() {
-    this.userSelectionMap.clear();
-    // this.zone.run(() => {
-    for (let i = 0; i < this.userList.length; i++) {
-      this.userSelectionMap.set(this.userList[i].uid, true);
-      console.log(this.userSelectionMap.get(this.userList[i].uid));
-      console.log(this.userSelectionMap);
-    }
-    this.telemetryGeneratorService.generateInteractTelemetry(
-        InteractType.TOUCH,
-        InteractSubtype.SELECT_ALL_CLICKED,
-        Environment.USER,
-        PageId.CREATE_GROUP,
-        undefined
-    );
-    // });
-  }
-
-
-  goTOGuestEdit() {
-    this.getLastCreatedProfile().then((response) => {
-      const navigationExtras: NavigationExtras = {
-        state: {
-          isNewUser: true,
-          lastCreatedProfile: this.lastCreatedProfileData
-        }
-      };
-      this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.GUEST_EDIT}`], navigationExtras);
-    }).catch((error) => {
-      const navigationExtras: NavigationExtras = { state: { isNewUser: true} };
-      this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.GUEST_EDIT}`], navigationExtras);
-    });
-  }
-
-  /**
- * Internally call create Group
- */
-  async createGroup() {
-    const loader = await this.commonUtilService.getLoader();
-    await loader.present();
-
-    const selectedUids: Array<string> = [];
-    this.userSelectionMap.forEach((value: Boolean, key: string) => {
-      if (value === true) {
-        selectedUids.push(key);
-      }
-    });
-    this.groupService.createGroup(this.group)
-      .toPromise().then(res => {
-        this.telemetryGeneratorService.generateInteractTelemetry(
-          InteractType.OTHER,
-          InteractSubtype.CREATE_GROUP_SUCCESS,
-          Environment.USER,
-          PageId.CREATE_GROUP
-        );
-        const req: ProfilesToGroupRequest = {
-          groupId: res.gid,
-          uidList: selectedUids
-        };
-        return this.groupService.addProfilesToGroup(req).toPromise();
-      })
-      .then(success => {
-        loader.dismiss();
-        this.commonUtilService.showToast(this.commonUtilService.translateMessage('GROUP_CREATE_SUCCESS'));
-        window.history.go(-2); // will navigate back to Users and group page;
-      })
-      .catch(error => {
-        loader.dismiss();
-        this.commonUtilService.showToast(this.commonUtilService.translateMessage('SOMETHING_WENT_WRONG'));
-        loader.dismiss();
-      });
-  }
-
-
-  getGradeNameFromCode(data: Profile | Group): string {
-    if (data.grade && data.grade.length > 0) {
-      const gradeName = [];
-      data.grade.forEach(code => {
-
-        if (data['gradeValue'] && data['gradeValue'][code]) {
-          gradeName.push(data['gradeValue'][code]);
-        }
-      });
-
-      if (gradeName.length === 0) {
-        return data.grade.join(',');
-      }
-
-      return gradeName.join(',');
-    }
-
-    return '';
-  }
-
-  goBack() {
-    this.location.back();
-  }
-
-}
diff --git a/src/app/user-and-groups/share-user-and-groups/share-user-and-groups.page.html b/src/app/user-and-groups/share-user-and-groups/share-user-and-groups.page.html
deleted file mode 100644
index 319b5e804..000000000
--- a/src/app/user-and-groups/share-user-and-groups/share-user-and-groups.page.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<ion-content class="ion-padding">
-  <div *ngIf="!checkUserGroups()">
-    <div class="ion-text-center">
-      <img class="rounded image-style" src="assets/imgs/ic_businessman.png" alt="no_user" />
-      <h6>
-        <strong>{{'NO_USERS_ON_THIS_DEVICE' | translate}}</strong>
-      </h6>
-      <ion-text>
-        <p>{{'NO_USERS_SUGGESTION_MESSAGE' | translate}}</p>
-      </ion-text>
-      <ion-text>
-        <h6 color="primary">{{'CREATE_USER' | translate}}</h6>
-      </ion-text>
-    </div>
-  </div>
-  <div *ngIf="checkUserGroups()">
-    <ion-row>
-      <ion-col size-md="6">
-        <ion-text>
-          <p *ngIf="groupList.length" item-start color="title" class="ion-text-uppercase">
-            <strong>{{'GROUPS' | translate}}</strong> {{ '(' + groupList?.length + ')'}}&lrm;
-          </p>
-        </ion-text>
-      </ion-col>
-      <ion-col size-md="6" class="padding-right0">
-        <ion-button fill="clear" class="padding-right0 ion-float-end" (click)="selectAll()">{{'SELECT_ALL' | translate}}
-        </ion-button>
-      </ion-col>
-    </ion-row>
-
-    <ion-item (click)="toggleGroupSelected(i)" *ngFor="let group of groupList; let i = index;"
-      class="item-background ion-margin-bottom" no-lines>
-      <ion-label>
-        <h6 class="padding-top">
-          <strong>{{group?.name}}</strong>
-        </h6>
-        <p>
-          <ion-text>
-            <span color="text_gray" *ngIf="group?.profilesCount > 1">{{group?.profilesCount}}
-              {{'USERS' | translate}}</span>
-          </ion-text>
-          <ion-text>
-            <span color="text_gray" *ngIf="group?.profilesCount === 1">{{group?.profilesCount}}
-              {{'USER' | translate}}</span>
-          </ion-text>
-        </p>
-      </ion-label>
-      <ion-checkbox item-end mode="ios" [checked]="isGroupSelected(group?.gid)"></ion-checkbox>
-    </ion-item>
-
-    <ion-text>
-      <p *ngIf="userList.length" item-start color="title" class="ion-text-uppercase">
-        <strong>{{'USERS' | translate}}</strong> {{ '(' + userList?.length + ')'}}&lrm;
-      </p>
-    </ion-text>
-    <ion-item (click)="toggleUserSelected(i)" *ngFor="let user of userList; let i = index;"
-      class="item-background ion-margin-bottom" no-lines>
-      <ion-label>
-        <h6 class="padding-top">
-          <strong>{{user?.handle}}</strong>
-        </h6>
-        <p *ngIf="user?.profileType === ProfileType.TEACHER">{{'USER_TYPE_1' | translate | titlecase}}</p>
-        <p *ngIf="user?.profileType === ProfileType.STUDENT">{{'USER_TYPE_2' | translate | titlecase}}</p>
-        <p *ngIf="user?.profileType === ProfileType.OTHER">{{'USER_TYPE_3' | translate | titlecase}}</p>
-      </ion-label>
-      <ion-checkbox item-end mode="ios" [checked]="isUserSelected(user?.uid)"></ion-checkbox>
-    </ion-item>
-  </div>
-</ion-content>
-<ion-footer>
-  <ion-row class="ion-padding">
-    <ion-col size-md="10" offset-md="1">
-      <ion-button class="ion-text-uppercase" expand="block" (click)="share()" [disabled]="!isShareEnabled()">
-        {{'SHARE' | translate }}
-      </ion-button>
-    </ion-col>
-  </ion-row>
-</ion-footer>
\ No newline at end of file
diff --git a/src/app/user-and-groups/share-user-and-groups/share-user-and-groups.page.scss b/src/app/user-and-groups/share-user-and-groups/share-user-and-groups.page.scss
deleted file mode 100644
index b792f6ef9..000000000
--- a/src/app/user-and-groups/share-user-and-groups/share-user-and-groups.page.scss
+++ /dev/null
@@ -1,53 +0,0 @@
-@import "src/assets/styles/_custom-mixins.scss";
-@import "src/assets/styles/_variables.scss";
-
-:host {
-  .rounded {
-    border-radius: 50%;
-  }
-
-  .item-background.item-md {
-    background-color: map-get($colors, light_gray) !important;
-    border-radius: 6px !important;
-  }
-
-  .padding-top {
-    @include padding(2px, null, null, null !important);
-  }
-
-  .checkbox-inner {
-    @include ltr() {
-      left: 7px;
-    }
-    @include rtl() {
-      right: 7px;
-    }
-
-    top: 4px;
-    position: absolute;
-    width: 4px;
-    height: 9px;
-    border-width: 0 1px 1px 0;
-    border-style: solid;
-    border-color: map-get($colors, dark_gray);
-    -webkit-transform: rotate(45deg);
-    transform: rotate(45deg);
-  }
-
-  .checkbox-ios .checkbox-icon {
-    background-color: transparent !important;
-  }
-
-  .checkbox-ios .checkbox-checked {
-    background-color: map-get($colors, primary) !important;
-  }
-
-  .image-style {
-    margin-top: 20vh;
-    width: 50%;
-  }
-
-  .padding-right0 {
-    @include padding(null, 0, null, null !important);
-  }
-}
diff --git a/src/app/user-and-groups/share-user-and-groups/share-user-and-groups.page.ts b/src/app/user-and-groups/share-user-and-groups/share-user-and-groups.page.ts
deleted file mode 100644
index a7d459b61..000000000
--- a/src/app/user-and-groups/share-user-and-groups/share-user-and-groups.page.ts
+++ /dev/null
@@ -1,307 +0,0 @@
-import { Component, OnInit, Inject, NgZone, OnDestroy } from '@angular/core';
-import { LoadingController, Platform } from '@ionic/angular';
-import {
-  GetAllProfileRequest,
-  Group,
-  GroupService,
-  Profile,
-  ProfileExportRequest,
-  ProfileExportResponse,
-  ProfileService,
-  ProfileType
-} from 'sunbird-sdk';
-import { SocialSharing } from '@ionic-native/social-sharing/ngx';
-import {
-  TelemetryGeneratorService,
-  InteractType,
-  InteractSubtype,
-  Environment,
-  PageId,
-  AppHeaderService,
-  CommonUtilService
-} from '../../../services';
-import { Subscription } from 'rxjs';
-import { Location } from '@angular/common';
-import { map } from 'rxjs/operators';
-
-declare const cordova;
-@Component({
-  selector: 'app-share-user-and-groups',
-  templateUrl: './share-user-and-groups.page.html',
-  styleUrls: ['./share-user-and-groups.page.scss'],
-})
-export class ShareUserAndGroupsPage implements OnInit, OnDestroy {
-  ProfileType = ProfileType;
-  groupName: Group;
-  userList: Array<Profile> = [];
-  groupList: Array<Group> = [];
-
-  selectedUserList: Array<string> = [];
-  selectedGroupList: Array<string> = [];
-
-  private userWeightMap: Map<string, number> = new Map();
-
-  private userGroupMap: Map<string, Array<Profile>> = new Map();
-  backButtonFunc: Subscription;
-  headerObservable: any;
-
-  constructor(
-    @Inject('GROUP_SERVICE') private groupService: GroupService,
-    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
-    private zone: NgZone,
-    private socialShare: SocialSharing,
-    private loadingCtrl: LoadingController,
-    private telemetryGeneratorService: TelemetryGeneratorService,
-    private headerService: AppHeaderService,
-    private commonUtilService: CommonUtilService,
-    private platform: Platform,
-    private location: Location
-  ) { }
-
-  ngOnInit() {
-    this.zone.run(() => {
-      this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
-        this.location.back();
-        this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.SHARE_USER_GROUP, Environment.USER, false);
-        this.backButtonFunc.unsubscribe();
-      });
-    });
-  }
-
-  ngOnDestroy() {
-    if (this.backButtonFunc) {
-      this.backButtonFunc.unsubscribe();
-    }
-    this.headerObservable.unsubscribe();
-  }
-
-  ionViewWillEnter() {
-    this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
-      this.handleHeaderEvents(eventName);
-    });
-    this.headerService.showHeaderWithBackButton([], this.commonUtilService.translateMessage('SHARE_THIS'));
-    this.getAllProfile();
-    this.getAllGroup();
-  }
-
-
-  getAllProfile() {
-    const profileRequest: GetAllProfileRequest = {
-      local: true
-    };
-    this.profileService.getAllProfiles(profileRequest).pipe(
-      map((profiles) => profiles.filter((profile) => !!profile.handle))
-    )
-    .toPromise()
-      .then((profiles) => {
-        this.zone.run(() => {
-          if (profiles && profiles.length) {
-            this.userList = profiles;
-          }
-
-          this.userList.forEach(profile => {
-            this.userWeightMap.set(profile.uid, 0);
-          });
-        });
-      });
-  }
-
-  getAllGroup() {
-    this.zone.run(() => {
-      this.groupService.getAllGroups().subscribe((groups: Group[]) => {
-        if (groups && groups.length) {
-          this.groupList = groups;
-        }
-
-        this.groupList.forEach(group => {
-          const gruopUserRequest: GetAllProfileRequest = {
-            local: true,
-            groupId: group.gid
-          };
-          this.profileService.getAllProfiles(gruopUserRequest).pipe(
-            map((profiles) => profiles.filter((profile) => !!profile.handle))
-          ).toPromise().then((profiles) => {
-              this.zone.run(() => {
-                if (profiles && profiles.length) {
-                  this.userGroupMap.set(group.gid, profiles);
-                }
-              });
-            }).catch(() => {
-            });
-        });
-      }, (error) => {
-        console.log('Something went wrong while fetching data', error);
-      });
-    });
-  }
-
-  checkUserGroups() {
-    const totalLength = this.userList.length + this.groupList.length;
-    if (totalLength > 0) {
-      return true;
-    }
-    return false;
-  }
-
-  toggleGroupSelected(index: number) {
-    const selectedGroup = this.groupList[index];
-    const allUser = this.userGroupMap.get(selectedGroup.gid);
-    console.log(selectedGroup, allUser);
-    if (this.selectedGroupList.indexOf(selectedGroup.gid) === -1) {
-      // Add User & Group
-      this.selectedGroupList.push(selectedGroup.gid);
-      allUser.forEach(profile => {
-        let userWeigth = this.userWeightMap.get(profile.uid);
-        if (this.selectedUserList.indexOf(profile.uid) === -1) {
-          this.selectedUserList.push(profile.uid);
-          userWeigth = 1;
-        } else {
-          userWeigth += 1;
-        }
-        this.userWeightMap.set(profile.uid, userWeigth);
-      });
-
-    } else {
-      // Remove User & Group
-      const selectedGroupIndex = this.selectedGroupList.indexOf(selectedGroup.gid);
-      this.selectedGroupList.splice(selectedGroupIndex, 1);
-      allUser.forEach(profile => {
-        if (this.selectedUserList.indexOf(profile.uid) > -1) {
-          let userWeigth = this.userWeightMap.get(profile.uid);
-          if (userWeigth === 1) {
-            const userIndex = this.selectedUserList.indexOf(profile.uid);
-            this.selectedUserList.splice(userIndex, 1);
-            userWeigth = 0;
-          } else {
-            userWeigth -= 1;
-          }
-          this.userWeightMap.set(profile.uid, userWeigth);
-        }
-      });
-    }
-  }
-
-
-  toggleUserSelected(index: number) {
-    const selectedUser = this.userList[index];
-
-    let userWeigth = this.userWeightMap.get(selectedUser.uid);
-
-    if (this.selectedUserList.indexOf(selectedUser.uid) === -1) {
-      // Add User
-      this.selectedUserList.push(selectedUser.uid);
-      userWeigth += 1;
-    } else {
-      // Remove User
-      const selectedUserIndex = this.selectedUserList.indexOf(selectedUser.uid);
-      this.selectedUserList.splice(selectedUserIndex, 1);
-      userWeigth = 0;
-
-      this.userGroupMap.forEach((value: Array<Profile>, gid: string) => {
-        const groupIndex = this.selectedGroupList.indexOf(gid);
-        if (groupIndex > -1) {
-          for (let i = 0; i < value.length; i++) {
-            if (value[i].uid === selectedUser.uid) {
-              this.selectedGroupList.splice(groupIndex, 1);
-              break;
-            }
-          }
-        }
-      });
-    }
-
-    this.userWeightMap.set(selectedUser.uid, userWeigth);
-  }
-
-
-  isUserSelected(uid: string) {
-    return this.selectedUserList.indexOf(uid) !== -1;
-  }
-
-
-  isGroupSelected(gid: string) {
-    return this.selectedGroupList.indexOf(gid) !== -1;
-  }
-
-
-  isShareEnabled() {
-    return this.selectedUserList.length > 0;
-  }
-
-
-  selectAll() {
-    this.zone.run(() => {
-      this.telemetryGeneratorService.generateInteractTelemetry(
-        InteractType.TOUCH,
-        InteractSubtype.SELECT_ALL_CLICKED,
-        Environment.USER,
-        PageId.SHARE_USER_GROUP,
-        undefined
-      );
-
-      for (let i = 0; i < this.userList.length; i++) {
-        this.toggleUserSelected(i);
-      }
-
-      for (let i = 0; i < this.groupList.length; i++) {
-        this.toggleGroupSelected(i);
-      }
-    });
-  }
-
-  async share() {
-
-    if (this.selectedUserList && this.selectedGroupList) {
-      const valueMap = new Map();
-      valueMap['UIDS'] = this.selectedUserList.concat(this.selectedGroupList);
-      // Generate Share initiate
-      this.telemetryGeneratorService.generateInteractTelemetry(
-        InteractType.TOUCH,
-        InteractSubtype.SHARE_USER_GROUP_INITIATE,
-        Environment.USER,
-        PageId.SHARE_USER_GROUP,
-        undefined,
-        valueMap
-      );
-    }
-    const profileExportRequest: ProfileExportRequest = {
-      userIds: this.selectedUserList,
-      groupIds: this.selectedGroupList,
-      destinationFolder: cordova.file.externalDataDirectory
-    };
-
-    const loader = await this.commonUtilService.getLoader();
-
-    await loader.present();
-    this.profileService.exportProfile(profileExportRequest).toPromise()
-      .then(async (path: ProfileExportResponse) => {
-        await loader.dismiss();
-        if (this.selectedUserList && this.selectedGroupList) {
-          const valueMap = new Map();
-          valueMap['UIDS'] = this.selectedUserList.concat(this.selectedGroupList);
-          // Generate Share initiate
-          this.telemetryGeneratorService.generateInteractTelemetry(
-            InteractType.OTHER,
-            InteractSubtype.SHARE_USER_GROUP_SUCCESS,
-            Environment.USER,
-            PageId.SHARE_USER_GROUP,
-            undefined,
-            valueMap
-          );
-        }
-        this.socialShare.share('', '', 'file://' + path.exportedFilePath, '');
-      }).catch(async () => {
-        await loader.dismiss();
-      });
-  }
-
-  handleHeaderEvents($event) {
-    switch ($event.name) {
-      case 'back':
-        this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.SHARE_USER_GROUP, Environment.USER,
-          true);
-        this.location.back();
-        break;
-    }
-  }
-}
diff --git a/src/app/user-and-groups/user-and-groups-routing.module.ts b/src/app/user-and-groups/user-and-groups-routing.module.ts
deleted file mode 100644
index 4819784b8..000000000
--- a/src/app/user-and-groups/user-and-groups-routing.module.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-import { UserAndGroupsPage } from './user-and-groups.page';
-import { RouterLinks } from '../app.constant';
-
-const routes: Routes = [
-    { path: '', component: UserAndGroupsPage },
-    { path: RouterLinks.GROUP_DETAILS, loadChildren: './group-details/group-details.module#GroupDetailsPageModule' },
-    { path: RouterLinks.ADD_OR_REMOVE_GROUP_USER, loadChildren: './add-or-remove-group-user/add-or-remove-group-user.module#AddOrRemoveGroupUserPageModule' },
-    { path: RouterLinks.CREATE_GROUP, loadChildren: './create-group/create-group.module#CreateGroupPageModule' },
-    { path: RouterLinks.GROUP_MEMBERS, loadChildren: './group-members/group-members.module#GroupMembersPageModule' },
-    { path: RouterLinks.SHARE_USER_AND_GROUPS, loadChildren: './share-user-and-groups/share-user-and-groups.module#ShareUserAndGroupsPageModule' }
-];
-
-@NgModule({
-    imports: [
-        RouterModule.forChild(routes)
-    ],
-    exports: [RouterModule]
-})
-export class UserAndGroupsRoutingModule { }
diff --git a/src/app/user-and-groups/user-and-groups.module.ts b/src/app/user-and-groups/user-and-groups.module.ts
deleted file mode 100644
index e757a525a..000000000
--- a/src/app/user-and-groups/user-and-groups.module.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { AddOrRemoveGroupUserPageModule } from './add-or-remove-group-user/add-or-remove-group-user.module';
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { Routes, RouterModule } from '@angular/router';
-
-import { IonicModule } from '@ionic/angular';
-
-import { UserAndGroupsPage } from './user-and-groups.page';
-import { TranslateModule } from '@ngx-translate/core';
-import { UserAndGroupsRoutingModule } from './user-and-groups-routing.module';
-import { CreateGroupPageModule } from './create-group/create-group.module';
-import { GroupDetailsPageModule } from './group-details/group-details.module';
-import { GroupMembersPageModule } from './group-members/group-members.module';
-import { ShareUserAndGroupsPageModule } from './share-user-and-groups/share-user-and-groups.module';
-import { EditDeletePopoverComponent } from './edit-delete-popover/edit-delete-popover.component';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    TranslateModule.forChild(),
-    // AddOrRemoveGroupUserPageModule,
-    // CreateGroupPageModule,
-    // GroupDetailsPageModule,
-    // GroupMembersPageModule,
-    // ShareUserAndGroupsPageModule,
-    UserAndGroupsRoutingModule
-  ],
-  exports: [
-    EditDeletePopoverComponent
-  ],
-  declarations: [
-    UserAndGroupsPage,
-    EditDeletePopoverComponent
-  ],
-  entryComponents: [
-    EditDeletePopoverComponent
-  ]
-})
-export class UserAndGroupsPageModule { }
diff --git a/src/app/user-and-groups/user-and-groups.page.html b/src/app/user-and-groups/user-and-groups.page.html
deleted file mode 100644
index b98dc69cc..000000000
--- a/src/app/user-and-groups/user-and-groups.page.html
+++ /dev/null
@@ -1,237 +0,0 @@
-<ion-header>
-  <ion-toolbar color="white">
-    <ion-buttons class="sb-hamburger" slot="start">
-      <ion-button class="f18 color" icon-only (click)="goBack()">
-        <ion-icon name="arrow-back"></ion-icon>
-      </ion-button>
-    </ion-buttons>
-    <ion-title class="color f16">{{'USERS_AND_GROUPS' | translate}}</ion-title>
-    <ion-buttons slot="primary">
-      <ion-button class="color f18" *ngIf="!playConfig" (click)="goToSharePage()" icon-only>
-        <ion-icon name="share" class="ion-float-end"></ion-icon>
-      </ion-button>
-    </ion-buttons>
-  </ion-toolbar>
-
-  <ion-toolbar no-border-top>
-    <ion-segment class="ion-no-padding" [(ngModel)]="segmentType" (ionChange)="onSegmentChange($event)">
-      <ion-segment-button value="users">
-        <ion-label>{{'USERS' | translate}}</ion-label>
-      </ion-segment-button>
-      <ion-segment-button value="groups">
-        <ion-label>{{'GROUPS' | translate}}</ion-label>
-      </ion-segment-button>
-    </ion-segment>
-  </ion-toolbar>
-</ion-header>
-<ion-content>
-  <div [ngSwitch]="segmentType">
-    <ion-list *ngSwitchCase="'users'">
-      <div padding>
-        <div class="custom-margin-top">
-          <div *ngIf="profileDetails?.handle">
-            <ion-text class="ion-padding-top ion-padding-start">
-              <p color="dark_gray" class="subTitle M0 ion-text-uppercase">{{ 'LOGGED_IN_AS' | translate}}</p>
-            </ion-text>
-            <ion-item class="item-background ug-logged-p0 ion-no-padding ion-margin-bottom" lines="none"
-              [ngClass]="i===selectedUserIndex ? 'blueBorder' : ''">
-              <ion-label class="ion-no-margin">
-                <ion-grid class="radius ion-no-padding">
-                  <ion-row class="bg-color-white ug-row-padding radius">
-                    <ion-col size="12" class="bg-color-white"
-                      (click)="selectUser(i,  profileDetails?.uid, profileDetails?.handle)">
-                      <div class="bg-color-white padding-left-0 rm-label-margin ion-no-padding">
-                        <ion-label>
-                          <h6 [ngStyle]="{'color': currentUserId === profileDetails?.uid ? 'dodgerblue' : 'black'}"
-                            class="padding-left-2 ion-no-margin elipsis" color="primary">
-                            <strong *ngIf="profileDetails">
-                              {{profileDetails.serverProfile ? profileDetails.serverProfile.firstName : profileDetails.handle}}&nbsp;{{profileDetails.serverProfile?.lastName}}
-                            </strong>
-                          </h6>
-                          <p *ngIf="profileDetails?.profileType === ProfileType.TEACHER">
-                            {{'USER_TYPE_1' | translate | titlecase}}</p>
-                          <p *ngIf="profileDetails?.profileType === ProfileType.STUDENT">
-                            {{'USER_TYPE_2' | translate | titlecase}}</p>
-                          <p *ngIf="profileDetails?.profileType === ProfileType.OTHER">
-                            {{'USER_TYPE_3' | translate | titlecase}}</p>
-                        </ion-label>
-                      </div>
-                    </ion-col>
-                  </ion-row>
-                </ion-grid>
-              </ion-label>
-            </ion-item>
-          </div>
-          <ion-label>
-            <p class="subTitle ug-dark-grey ug-top-left-padding ion-text-uppercase">{{'USERS' | translate}}</p>
-          </ion-label>
-          <div *ngIf="noUsersPresent" class="nouser">
-            <h6>{{'NO_USERS_CREATED_YET' | translate}}</h6>
-            <div class="description ion-text-center">
-              {{ 'NO_USERS_CREATED_YET_MSG' | translate }}
-            </div>
-          </div>
-          <div *ngIf="loadingUserList" class="nouser margin-bottom">
-            <div class="description ion-text-center">
-              <strong>{{'LOADING_USER_LIST' | translate}}</strong>
-            </div>
-          </div>
-          <ion-list *ngIf="!noUsersPresent && !loadingUserList" lines="none">
-            <ion-item *ngFor="let user of userList; let i=index;" class="item-background ug-mb-6 ion-no-padding">
-              <ion-label class="ion-no-margin">
-                <ion-grid class="radius">
-                  <ion-row [ngClass]="i===selectedUserIndex ? 'blueBorder' : ''"
-                    class="bg-color-white ug-row-padding radius">
-                    <ion-col size="11" class="bg-color-white" (click)="selectUser(i, user?.uid, user?.handle)">
-                      <div class="bg-color-white padding-left-0 rm-label-margin ion-no-padding">
-                        <ion-label>
-                          <p class="elipsis"
-                            [ngStyle]="{'color': currentUserId === user?.uid ? 'dodgerblue' : 'black'}">
-                            <strong>{{user?.handle}}</strong>
-                          </p>
-                          <p>
-                            <span
-                              *ngIf="user?.profileType === ProfileType.TEACHER">{{'USER_TYPE_1' | translate | titlecase}}</span>
-                            <span
-                              *ngIf="user?.profileType === ProfileType.STUDENT">{{'USER_TYPE_2' | translate | titlecase}}</span>
-                            <span
-                              *ngIf="user?.profileType === ProfileType.OTHER">{{'USER_TYPE_3' | translate | titlecase}}</span>
-                            <span *ngIf="user?.grade?.length" class="separator-dot"></span>
-                            {{ getGradeNameFromCode(user) }}
-                          </p>
-                        </ion-label>
-                      </div>
-                    </ion-col>
-                    <ion-col size="1" class="advanced-menu" *ngIf="!playConfig">
-                      <ion-icon class="ug-icon-font-size" name="more" item-end
-                        (click)="presentPopover($event ,i, true)"></ion-icon>
-                    </ion-col>
-                  </ion-row>
-                </ion-grid>
-              </ion-label>
-            </ion-item>
-          </ion-list>
-        </div>
-
-      </div>
-
-    </ion-list>
-    <ion-list *ngSwitchCase="'groups'">
-      <div class="ion-padding">
-        <div class="firstSection" *ngIf="showEmptyGroupsMessage">
-          <ion-row class="ion-padding-top">
-            <ion-col size-md="6" offset-md="3" size-lg="6" offset-lg="3">
-              <div class="ion-text-center ug-pt-30">
-                <img class="image_style" alt="no_group" src="assets/imgs/ic_businessman.png">
-              </div>
-              <div class="image-text">
-                <h6>
-                  <strong>{{'NO_GROUPS_CREATED_YET' | translate}}</strong>
-                </h6>
-                <div class="description ion-text-center">
-                  {{ 'NO_GROUP_MESSAGE' | translate }}
-                </div>
-              </div>
-            </ion-col>
-          </ion-row>
-        </div>
-        <ion-list lines="none" *ngIf="!showEmptyGroupsMessage">
-          <ion-item *ngFor="let group of groupList; let i = index" class="item-background ug-mb-6 ion-no-padding">
-            <ion-label class="ion-no-margin">
-              <ion-grid class="radius">
-                <ion-row class="bg-color-white ug-row-padding radius">
-                  <ion-col size="11" class="bg-color-white">
-                    <div class="bg-color-white padding-left-0 rm-label-margin ion-no-padding"
-                      (click)="goToGroupDetail(i)">
-                      <ion-label>
-                        <h6 class="elipsis ion-no-margin"
-                          [ngStyle]="{'color': currentGroupId === group?.gid ? 'dodgerblue' : 'black'}">
-                          <strong>{{group?.name}}</strong>
-                        </h6>
-                        <p>
-                          <ion-text>
-                            <span color="text_gray" *ngIf="group?.grade && group?.grade[0]">
-                              {{ getGradeNameFromCode(group) }}
-                            </span>
-                          </ion-text>
-                          <ion-text>
-                            <span *ngIf="group?.grade?.length" class="separator-dot"></span>
-                          </ion-text>
-                          <ion-text>
-                            <span color="text_gray" *ngIf="group?.profilesCount > 1">
-                              {{group?.profilesCount}} {{'USERS' | translate}}
-                            </span>
-                          </ion-text>
-                          <ion-text>
-                            <span color="text_gray" *ngIf="group?.profilesCount === 1">
-                              {{group?.profilesCount}} {{'USER' | translate}}
-                            </span>
-                          </ion-text>
-                          <ion-text>
-                            <span color="text_gray" *ngIf=" !group?.profilesCount || group?.profilesCount === 0">
-                              {{'NO_USERS' | translate}}
-                            </span>
-                          </ion-text>
-                        </p>
-                      </ion-label>
-                    </div>
-                  </ion-col>
-                  <ion-col size="1" class="advanced-menu" *ngIf="!playConfig">
-                    <ion-icon class="ug-icon-font-size" name="more" item-end
-                      (click)="presentPopover($event, i , false)"></ion-icon>
-                  </ion-col>
-                </ion-row>
-              </ion-grid>
-            </ion-label>
-          </ion-item>
-        </ion-list>
-      </div>
-    </ion-list>
-  </div>
-</ion-content>
-<ion-footer>
-  <ion-row *ngIf="segmentType === 'users'">
-    <div *ngIf="playConfig && selectedUserIndex === -1" class="error-message-contentplay">
-      <div>
-        <ion-icon ios="ios-information-circle" md="md-information-circle"></ion-icon>
-        {{ 'PLEASE_SELECT_USER' | translate }}
-      </div>
-    </div>
-  </ion-row>
-  <ion-row class="ion-padding">
-    <ion-col size-md="10" offset-md="1" *ngIf="!isLoggedIn; else disableSwitchButton">
-      <div *ngIf="selectedUserIndex !== -1; else enableCreateButton">
-        <ion-button *ngIf="!playConfig" expand="block" center (click)="switchAccountConfirmBox()"
-          [disabled]="!selectedUsername">
-          {{'SWITCH_ACCOUNT' | translate}}
-        </ion-button>
-        <ion-button *ngIf="playConfig" expand="block" (click)="play()" [disabled]="isCurUserSelected">
-          {{'PLAY' | translate}}
-        </ion-button>
-      </div>
-      <ng-template #enableCreateButton>
-        <ion-button fill="outline" expand="block" *ngIf="segmentType=='users' && !this.playConfig"
-          (click)="createUser()">
-          {{ 'CREATE_NEW_USER' | translate}}
-        </ion-button>
-        <ion-button expand="block" *ngIf="this.playConfig && segmentType=='users'" [disabled]="true">
-          {{ 'PLAY' | translate}}
-        </ion-button>
-        <ion-button fill="outline" expand="block" *ngIf="segmentType=='groups' && !this.playConfig"
-          (click)="createGroup()">
-          {{ 'CREATE_NEW_GROUP' | translate}}
-        </ion-button>
-      </ng-template>
-    </ion-col>
-    <ng-template #disableSwitchButton>
-      <ion-col>
-        <ion-button *ngIf="!playConfig" expand="block" center [disabled]="selectedUsername">
-          {{'SWITCH_ACCOUNT' | translate}}
-        </ion-button>
-        <ion-button *ngIf="playConfig" expand="block" [disabled]="isCurUserSelected">
-          {{'PLAY' | translate}}
-        </ion-button>
-      </ion-col>
-    </ng-template>
-  </ion-row>
-</ion-footer>
\ No newline at end of file
diff --git a/src/app/user-and-groups/user-and-groups.page.scss b/src/app/user-and-groups/user-and-groups.page.scss
deleted file mode 100644
index 2f8257248..000000000
--- a/src/app/user-and-groups/user-and-groups.page.scss
+++ /dev/null
@@ -1,232 +0,0 @@
-@import "src/assets/styles/_custom-mixins.scss";
-@import "src/assets/styles/_variables.scss";
-@import "src/assets/styles/fonts.scss";
-
-.img-container {
-  // position: absolute;
-  width: 100px;
-  height: 100px;
-  top: 30%;
-
-  @include ltr() {
-    left: 60%;
-  }
-  @include rtl() {
-    right: 60%;
-  }
-  @include margin(null, null, null, -97px);
-
-  margin-top: -144px;
-}
-
-.image-text {
-  text-align: center;
-  margin-top: 2vh;
-}
-.secondSection {
-  margin-top: 13vh;
-}
-.users-groups-toolbar {
-  position: fixed;
-  background-color: white;
-  z-index: 2;
-}
-
-.custom {
-  //background-color: white;
-  color: rgba(0, 0, 0, 0.5);
-  box-shadow: none;
-}
-.border {
-  border: 2px solid #d9d9d9;
-}
-.image_style {
-  width: 102px;
-  height: 102px;
-  border-radius: 50%;
-}
-
-.item-background {
-  --background: map-get($colors, light_gray) !important;
-  --padding-start: 0px !important;
-  .item-native > .item-inner {
-    padding-right: 0px !important;
-  }
-}
-.subTitle {
-  font-size: 14px;
-  font-weight: 600 !important;
-  color: map-get($colors, dark_gray) !important;
-}
-.radius {
-  border-radius: 6px;
-}
-.blueBorder {
-  border-color: map-get($colors, primary) !important;
-  border-style: solid !important;
-  border-width: 2px !important;
-  border-radius: 4px;
-}
-#tick {
-  position: relative;
-  width: 20px;
-  bottom: 16px;
-  @include ltr() {
-    right: 6px;
-  }
-  @include rtl() {
-    left: 6px;
-  }
-  height: 20px;
-}
-.elipsis {
-  width: 100%;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-}
-.nouser {
-  text-align: center;
-  background-color: #eceff0;
-  padding: 21px 0px 34px 0px;
-  margin-top: 2vh;
-}
-.radius {
-  //border-radius: 6px !important;
-  padding-left: 0px !important;
-  padding-right: 0px !important;
-}
-.bg-color-white {
-  background-color: map-get($colors, light_gray) !important;
-  padding-left: 10px;
-  padding-top: 6px;
-  padding-right: 10px;
-  padding-bottom: 6px;
-}
-
-.error-message-contentplay {
-  width: -webkit-fill-available;
-  background-color: #a1a1a1;
-
-  @include padding(1%, 0%, 1%, 5%);
-  color: white;
-  // position: fixed !important;
-  // bottom: 32px;
-}
-
-.advanced-menu {
-  padding: 0 !important;
-}
-.advanced-menu ion-icon[item-end] {
-  margin-top: 0 !important;
-  @include padding(null, 8px, null, null !important);
-}
-.advanced-menu .item-md,
-.advanced-menu .item-ios {
-  margin-top: 0 !important;
-}
-.padding-left-0 {
-  @include padding(null, null, null, 0 !important);
-}
-.rm-label-margin ion-label {
-  margin-top: 0 !important;
-  margin-bottom: 0 !important;
-}
-.header-md::after,
-.tabs-md[tabsPlacement="top"] > .tabbar::after,
-.footer-md::before,
-.tabs-md[tabsPlacement="bottom"] > .tabbar::before {
-  background-image: none;
-}
-
-.item-padding-left.item-md {
-  @include padding(null, null, null, 14px !important);
-}
-//.custom-margin-top{
-//margin-top: 7vh;
-//}
-
-.icon.ion-md-information-circle {
-  vertical-align: text-bottom;
-}
-
-h6:first-child {
-  margin-top: 0px !important;
-}
-.padding-left-2 {
-  @include padding(null, null, null, 2px !important);
-}
-
-.segment-md .segment-button {
-  font-weight: 700 !important;
-  color: map-get($colors, dark_gray) !important;
-  background-color: map-get($colors, white);
-}
-
-.segment-md .segment-button.segment-activated {
-  border-color: map-get($colors, primary) !important;
-  color: map-get($colors, primary) !important;
-}
-.description {
-  color: map-get($colors, dark_gray);
-  font-size: 1.1rem;
-  @include margin(null, 10%, null, 10%);
-  margin-top: 0px !important;
-}
-
-.ug-row-padding {
-  @include padding(12px, 16px, 16px, 18px !important);
-}
-
-.ug-dark-grey {
-  color: map-get($colors, dark_gray);
-}
-
-.separator-dot {
-  width: 4px;
-  height: 4px;
-  background-color: black;
-  border-radius: 50%;
-  display: inline-block;
-  vertical-align: middle;
-  margin: 0px 8px;
-  font-size: 12px;
-}
-
-.ug-top-left-padding {
-  @include padding(16px, 16px, 0px, 8px !important);
-}
-
-.ug-icon-font-size {
-  font-size: 28px;
-}
-
-.ug-mb-6 {
-  margin-bottom: 6px;
-  --border-radius: 10px;
-  --inner-padding-end: 0;
-  // --background: #ECEFF0 !important;
-  --padding-start: 10px;
-  --padding-end: 6px;
-  --padding-top: 10px;
-  --padding-bottom: 10px;
-}
-
-.ug-logged-p0{
-  margin-bottom: 6px;
-  --border-radius: 5px;
-  --inner-padding-end: 0;
-}
-
-.ug-pt-30 {
-  padding-top: 30%;
-}
-
-ion-button.color,ion-title.color {
-  color:#024f9d;
-  font-weight:bold;
-}
-
-ion-segment-button {
-  font-weight:bold;
-}
diff --git a/src/app/user-and-groups/user-and-groups.page.ts b/src/app/user-and-groups/user-and-groups.page.ts
deleted file mode 100644
index 6aa779cd4..000000000
--- a/src/app/user-and-groups/user-and-groups.page.ts
+++ /dev/null
@@ -1,730 +0,0 @@
-import { RouterLinks } from './../app.constant';
-import { Component, Inject, NgZone, OnInit } from '@angular/core';
-import { Platform, PopoverController, Events } from '@ionic/angular';
-import { Location } from '@angular/common';
-import {
-  AuthService,
-  GetAllProfileRequest,
-  Group,
-  GroupService,
-  Profile,
-  ProfileService,
-  ProfileType,
-  SharedPreferences,
-  TelemetryObject
-} from 'sunbird-sdk';
-import { AppGlobalService, CommonUtilService } from '../../services';
-import { TelemetryGeneratorService } from '../../services/telemetry-generator.service';
-import { Map } from '../telemetryutil';
-import { PreferenceKey } from '../app.constant';
-import {
-  Environment,
-  ImpressionType,
-  InteractSubtype,
-  InteractType,
-  ObjectType,
-  PageId,
-} from '../../services/telemetry-constants';
-import { AppHeaderService, ContainerService } from '../../services';
-import { Router, NavigationExtras } from '@angular/router';
-import { EditDeletePopoverComponent } from './edit-delete-popover/edit-delete-popover.component';
-import { SbGenericPopoverComponent } from '../components/popups/sb-generic-popover/sb-generic-popover.component';
-import { initTabs, GUEST_STUDENT_TABS, GUEST_STUDENT_SWITCH_TABS, GUEST_TEACHER_TABS, GUEST_TEACHER_SWITCH_TABS } from '../module.service';
-import { Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
-
-
-
-@Component({
-  selector: 'app-user-and-groups',
-  templateUrl: './user-and-groups.page.html',
-  styleUrls: ['./user-and-groups.page.scss'],
-
-
-})
-export class UserAndGroupsPage implements OnInit {
-  segmentType = 'users';
-  groupName: string;
-  showEmptyGroupsMessage = true;
-  currentUserId: string;
-  currentGroupId: string;
-  playConfig: any;
-
-  userList: Array<Profile> = [];
-  groupList: Array<Group> = [];
-
-  profileDetails: Profile;
-  loadingUserList = false;
-
-  userType: string;
-  noUsersPresent = false;
-  selectedUserIndex = -1;
-  lastCreatedProfileData: any;
-
-  selectedUsername: string;
-  isCurUserSelected: boolean;
-  ProfileType = ProfileType;
-  isLoggedIn = false;
-  headerObservable: Subscription;
-  backButtonFunc: Subscription;
-
-  constructor(
-    private zone: NgZone,
-    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
-    @Inject('GROUP_SERVICE') private groupService: GroupService,
-    @Inject('AUTH_SERVICE') private authService: AuthService,
-    private platform: Platform,
-    private appGlobalService: AppGlobalService,
-    private container: ContainerService,
-    private telemetryGeneratorService: TelemetryGeneratorService,
-    private commonUtilService: CommonUtilService,
-    @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
-    private headerService: AppHeaderService,
-    private popOverCtrl: PopoverController,
-    private router: Router,
-    private event: Events,
-    private location: Location
-  ) {
-    /* Check userList length and show message or list accordingly */
-
-    // TODO
-    this.currentUserId = this.router.getCurrentNavigation().extras.state.userId;
-    this.playConfig = this.router.getCurrentNavigation().extras.state.playConfig;
-    if (!this.currentUserId && this.appGlobalService.getCurrentUser()) {
-      this.currentUserId = this.appGlobalService.getCurrentUser().uid;
-    }
-
-    if (this.appGlobalService.isUserLoggedIn()) {
-      this.profileDetails = this.appGlobalService.getCurrentUser();
-    }
-  }
-
-  ngOnInit() {
-    this.telemetryGeneratorService.generateImpressionTelemetry(
-      ImpressionType.VIEW, '',
-      PageId.USERS_GROUPS,
-      Environment.USER
-    );
-  }
-
-  ionViewWillEnter() {
-    this.headerService.hideHeader();
-    this.headerObservable = this.headerService.headerEventEmitted$.subscribe(eventName => {
-      this.handleHeaderEvents(eventName);
-    });
-    this.zone.run(() => {
-      this.getAllProfile();
-      this.getAllGroup();
-      this.getCurrentGroup();
-      // this.getLastCreatedProfile();
-
-      this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
-        this.dismissPopup();
-        this.backButtonFunc.unsubscribe();
-      });
-    });
-
-    if (this.userList) {
-      this.noUsersPresent = false;
-      this.loadingUserList = true;
-    }
-  }
-
-  getCurrentGroup() {
-    this.groupService.getActiveSessionGroup().subscribe((val: Group) => {
-      const group = val;
-      if (group) {
-        this.zone.run(() => {
-          this.currentGroupId = group.gid;
-        });
-      }
-    }, () => { });
-  }
-
-  async dismissPopup() {
-    const activePortal = await this.popOverCtrl.getTop();
-    if (activePortal) {
-      activePortal.dismiss();
-    } else {
-      this.location.back();
-    }
-  }
-
-  async presentPopover(myEvent, index, isUser) {
-    let isCurrentUser = isUser ? this.currentUserId === this.userList[index].uid : this.currentGroupId === this.groupList[index].gid;
-    const popover = await this.popOverCtrl.create({
-      component: EditDeletePopoverComponent,
-      componentProps: {
-        edit: async () => {
-          if (isUser) {
-            this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.GUEST_EDIT}`], {
-              state: {
-                profile: this.userList[index],
-                isCurrentUser
-              }
-            });
-          } else {
-            this.router.navigate([`/${RouterLinks.USER_AND_GROUPS}/${RouterLinks.CREATE_GROUP}`], {
-              state: {
-                groupInfo: this.groupList[index]
-              }
-            });
-          }
-          await popover.dismiss();
-        },
-        delete: async () => {
-          if (isUser) {
-            this.deleteUserConfirmBox(index);
-          } else {
-            this.deleteGroupConfirmBox(index);
-          }
-          await popover.dismiss();
-        },
-        isCurrentUser
-      },
-      cssClass: 'user-popover',
-      event: myEvent
-    }
-    );
-    await popover.present();
-  }
-
-  async getAllProfile() {
-    const loader = await this.commonUtilService.getLoader();
-    await loader.present();
-
-    const profileRequest: GetAllProfileRequest = {
-      local: true
-    };
-    this.loadingUserList = true;
-    setTimeout(() => {
-      this.zone.run(() => {
-        this.profileService.getAllProfiles(profileRequest).pipe(
-          map((profiles) => profiles.filter((profile) => !!profile.handle))
-           ).subscribe(async (profiles) => {
-            const profileList: Array<Profile> = profiles;
-            if (profileList && profileList.length) {
-              this.userList = [...profileList].sort((prev: Profile, next: Profile) => {
-                if (prev.uid === this.currentUserId) {
-                  return -1;
-                }
-
-                if (next.uid === this.currentUserId) {
-                  return 1;
-                }
-
-                if (prev.handle < next.handle) {
-                  return -1;
-                }
-                if (prev.handle > next.handle) {
-                  return 1;
-                }
-                return 0;
-              });
-              this.noUsersPresent = false;
-              this.loadingUserList = false;
-            } else {
-              this.noUsersPresent = true;
-              this.loadingUserList = false;
-            }
-
-            await loader.dismiss();
-
-          }, async () => {
-            await loader.dismiss();
-            this.noUsersPresent = true;
-            this.loadingUserList = false;
-          });
-      });
-    }, 1000);
-  }
-
-  getAllGroup() {
-    this.zone.run(() => {
-      this.groupService.getAllGroups().subscribe((groups: Group[]) => {
-        if (groups && groups.length) {
-          this.showEmptyGroupsMessage = false;
-          this.groupList = [...groups].sort((prev: Group, next: Group) => {
-            if (prev.gid === this.currentGroupId) {
-              return -1;
-            }
-
-            if (next.gid === this.currentGroupId) {
-              return 1;
-            }
-
-            if (prev.name < next.name) {
-              return -1;
-            }
-            if (prev.name > next.name) {
-              return 1;
-            }
-            return 0;
-          });
-        } else {
-          this.showEmptyGroupsMessage = true;
-        }
-      }, () => {
-      });
-    });
-  }
-
-  /* Navigates to group details page */
-  goToGroupDetail(index) {
-    const navigationExtras: NavigationExtras = {
-      state: {
-        groupInfo: this.groupList[index],
-        currentUserId: this.currentUserId,
-        currentGroupId: this.currentGroupId,
-        profile: this.profileDetails,
-        playConfig: this.playConfig
-      }
-    };
-
-    this.router.navigate([`/${RouterLinks.USER_AND_GROUPS}/${RouterLinks.GROUP_DETAILS}`], navigationExtras);
-  }
-
-  /**
-   * Navigates to Create group Page
-   */
-  createGroup() {
-    // Generate create group click event
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      InteractSubtype.CREATE_GROUP_CLICKED,
-      Environment.USER,
-      PageId.USERS_GROUPS
-    );
-    this.router.navigate([`/${RouterLinks.USER_AND_GROUPS}/${RouterLinks.CREATE_GROUP}`]);
-  }
-
-
-  goToSharePage() {
-    const navigationExtras: NavigationExtras = {
-      state: {
-        isNewUser: true
-      }
-    };
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      InteractSubtype.SHARE_CLICKED,
-      Environment.USER,
-      PageId.USERS_GROUPS
-    );
-    this.router.navigate([`/${RouterLinks.USER_AND_GROUPS}/${RouterLinks.SHARE_USER_AND_GROUPS}`], navigationExtras);
-  }
-
-  /**
-   * Navigates to group Details page
-   */
-  gotToGroupDetailsPage() {
-    const navigationExtras: NavigationExtras = {
-      state: {
-        item: this.groupList
-      }
-    };
-
-    this.router.navigate([`/${RouterLinks.USER_AND_GROUPS}/${RouterLinks.GROUP_DETAILS}`], navigationExtras);
-  }
-
-  /**
-   * Navigates to Create User Page
-   */
-  createUser() {
-    this.getLastCreatedProfile().then(() => {
-      // Generate create user click event
-      this.telemetryGeneratorService.generateInteractTelemetry(
-        InteractType.TOUCH,
-        InteractSubtype.CREATE_USER_CLICKED,
-        Environment.USER,
-        PageId.USERS_GROUPS
-      );
-
-      const navigationExtras: NavigationExtras = {
-        state: {
-          isNewUser: true,
-          lastCreatedProfile: this.lastCreatedProfileData
-        }
-      };
-      this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.GUEST_EDIT}`], navigationExtras);
-    }).catch((error) => {
-      const navigationExtras: NavigationExtras = {
-        state: {
-          isNewUser: true
-        }
-      };
-      this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.GUEST_EDIT}`], navigationExtras);
-
-    });
-  }
-
-  selectUser(index: number, uid?: string, name?: string) {
-    this.isCurUserSelected = this.appGlobalService.getCurrentUser().uid === uid;
-    this.isLoggedIn = (this.currentUserId === uid);
-    this.zone.run(() => {
-      this.selectedUserIndex = (this.selectedUserIndex === index) ? -1 : index;
-    });
-    this.selectedUsername = name;
-    const values = new Map();
-    values.uid = this.currentUserId;
-    values.userName = this.selectedUsername;
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      InteractSubtype.USER_CLICKED,
-      Environment.USER,
-      PageId.USERS_GROUPS,
-      undefined,
-      values
-    );
-  }
-
-  onSegmentChange(event) {
-    this.telemetryGeneratorService.generateInteractTelemetry(
-        InteractType.TOUCH,
-        event.detail.value === 'groups' ? InteractSubtype.GROUP_CLICKED : InteractSubtype.USER_CLICKED,
-        Environment.USER,
-        PageId.USERS_GROUPS
-    );
-    this.zone.run(() => {
-      this.selectedUserIndex = -1;
-    });
-    this.telemetryGeneratorService.generateImpressionTelemetry(
-        ImpressionType.VIEW, '',
-        event.detail.value,
-        Environment.USER
-    );
-  }
-
-  /**
-   * Shows Prompt for switch Account
-   */
-  async switchAccountConfirmBox() {
-    // Generate Switch User click event
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      InteractSubtype.SWITCH_USER_CLICKED,
-      Environment.USER,
-      PageId.USERS_GROUPS
-    );
-
-    const selectedUser = this.userList[this.selectedUserIndex];
-
-    const valuesMap = new Map();
-    const fromUser = new Map();
-    fromUser.uid = this.currentUserId;
-    fromUser.type = this.appGlobalService.isUserLoggedIn() ? 'signedin' : 'guest';
-
-    const toUser = new Map();
-    toUser.uid = selectedUser.uid;
-    toUser.type = 'guest';
-
-    valuesMap.from = fromUser;
-    valuesMap.to = toUser;
-
-    const telemetryObject = new TelemetryObject(selectedUser.uid, ObjectType.USER, undefined);
-
-    // Generate Switch user initiate interact event
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      InteractSubtype.SWITCH_USER_INITIATE,
-      Environment.USER,
-      PageId.USERS_GROUPS,
-      telemetryObject,
-      valuesMap
-    );
-
-    const confirm = await this.popOverCtrl.create({
-      component: SbGenericPopoverComponent,
-      componentProps: {
-        sbPopoverHeading: this.commonUtilService.translateMessage('SWITCH_ACCOUNT_CONFIRMATION'),
-        sbPopoverMainTitle: this.commonUtilService.translateMessage('SIGNED_OUT_ACCOUNT_MESSAGE'),
-        actionsButtons: [
-          {
-            btntext: this.commonUtilService.translateMessage('CANCEL'),
-            btnClass: 'sb-btn sb-btn-sm  sb-btn-outline-info'
-          }, {
-            btntext: this.commonUtilService.translateMessage('YES'),
-            btnClass: 'popover-color'
-          }
-        ],
-        icon: null
-      },
-      cssClass: 'sb-popover',
-    });
-
-    if (this.appGlobalService.isUserLoggedIn()) {
-      await confirm.present();
-    } else {
-      this.setAsCurrentUser(selectedUser, false);
-    }
-
-    await confirm.onDidDismiss().then(response => {
-      if (response.data.isLeftButtonClicked == null) {
-        return;
-      }
-      if (!response.data.isLeftButtonClicked) {
-        this.logOut(selectedUser, false);
-      }
-    });
-
-    // Generate Switch user success event
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.OTHER,
-      InteractSubtype.SWITCH_USER_SUCCESS,
-      Environment.USER,
-      PageId.USERS_GROUPS,
-      telemetryObject,
-      valuesMap
-    );
-  }
-
-  // method below fetches the last created user
-  getLastCreatedProfile() {
-    return new Promise((resolve, reject) => {
-      this.profileService.getAllProfiles().pipe(
-        map((profiles) => (profiles.sort((p1, p2) => p2.createdAt - p1.createdAt))[0])
-      )
-      .toPromise().then((lastCreatedProfile: any) => {
-        this.lastCreatedProfileData = lastCreatedProfile;
-        resolve(lastCreatedProfile);
-      }).catch(() => {
-        reject(null);
-      });
-    });
-  }
-
-  logOut(selectedUser: any, isBeingPlayed: boolean) {
-    const telemetryObject = new TelemetryObject(this.profileDetails.uid, Environment.USER, undefined);
-
-    // Generate Logout success event
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      InteractSubtype.LOGOUT_INITIATE,
-      Environment.USER,
-      PageId.USERS_GROUPS,
-      telemetryObject
-    );
-    if (isBeingPlayed) {
-      this.setAsCurrentUser(selectedUser, true);
-    } else {
-      if (this.commonUtilService.networkInfo.isNetworkAvailable) {
-        this.authService.resignSession().subscribe(() => {
-          (window as any).splashscreen.clearPrefs();
-          this.setAsCurrentUser(selectedUser, false);
-        }, () => {
-        });
-      } else {
-        this.authService.resignSession().subscribe();
-        (window as any).splashscreen.clearPrefs();
-        this.setAsCurrentUser(selectedUser, false);
-      }
-    }
-
-    // Generate Logout success event
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.OTHER,
-      InteractSubtype.LOGOUT_SUCCESS,
-      Environment.USER,
-      PageId.USERS_GROUPS,
-      telemetryObject
-    );
-
-  }
-
-  /* condition for disabling the play button */
-  disablePlayButton() {
-    return this.selectedUserIndex === -1 && !this.userList.length;
-  }
-
-  /** Delete alert box */
-  async deleteGroupConfirmBox(index) {
-    const confirm = await this.popOverCtrl.create({
-      component: SbGenericPopoverComponent,
-      componentProps: {
-        sbPopoverHeading: this.commonUtilService.translateMessage('GROUP_DELETE_CONFIRM', this.groupList[index].name),
-        sbPopoverMainTitle: this.commonUtilService.translateMessage('GROUP_DELETE_CONFIRM_MESSAGE'),
-        actionsButtons: [
-          {
-            btntext: this.commonUtilService.translateMessage('CANCEL'),
-            btnClass: 'sb-btn sb-btn-sm  sb-btn-outline-info'
-          }, {
-            btntext: this.commonUtilService.translateMessage('YES'),
-            btnClass: 'popover-color'
-          }
-        ],
-        icon: null
-      },
-      cssClass: 'sb-popover info',
-    });
-    await confirm.present();
-    await confirm.onDidDismiss().then(response => {
-      if (response.data.isLeftButtonClicked == null) {
-        return;
-      }
-      if (!response.data.isLeftButtonClicked) {
-        this.deleteGroup(index);
-      }
-    });
-  }
-
-  /* Navigates to play content details page nd launch the player */
-  play() {
-    const selectedUser = this.userList[this.selectedUserIndex];
-    if (this.appGlobalService.isUserLoggedIn()) {
-      this.logOut(selectedUser, true);
-    } else {
-      this.setAsCurrentUser(selectedUser, true);
-    }
-
-  }
-
-  deleteGroup(index: number) {
-
-    const gid = this.groupList[index].gid;
-    const telemetryObject = new TelemetryObject(gid, ObjectType.GROUP, undefined);
-
-    // Generate Delete user event
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      InteractSubtype.DELETE_GROUP_INITIATE,
-      Environment.USER,
-      PageId.GROUPS,
-      telemetryObject
-    );
-    this.groupService.deleteGroup(gid).subscribe(() => {
-      this.groupList.splice(index, 1);
-      this.getAllGroup();
-    }, () => {
-    });
-  }
-
-  /** Delete alert box */
-  async deleteUserConfirmBox(index) {
-    const confirm = await this.popOverCtrl.create({
-      component: SbGenericPopoverComponent,
-      componentProps: {
-        sbPopoverHeading: this.commonUtilService.translateMessage('USER_DELETE_CONFIRM', this.userList[index].handle),
-        sbPopoverMainTitle: this.commonUtilService.translateMessage('USER_DELETE_CONFIRM_MESSAGE'),
-        actionsButtons: [
-          {
-            btntext: this.commonUtilService.translateMessage('CANCEL'),
-            btnClass: 'sb-btn sb-btn-sm  sb-btn-outline-info'
-          },
-          {
-            btntext: this.commonUtilService.translateMessage('YES'),
-            btnClass: 'popover-color'
-          }
-        ],
-        icon: null
-      },
-      cssClass: 'sb-popover info',
-    });
-    await confirm.present();
-    await confirm.onDidDismiss().then(response => {
-      if (response.data.isLeftButtonClicked == null) {
-        return;
-      }
-      if (!response.data.isLeftButtonClicked) {
-        this.deleteUser(index);
-      }
-    });
-  }
-
-  deleteUser(index: number) {
-    const uid = this.userList[index].uid;
-
-    const telemetryObject = new TelemetryObject(uid, ObjectType.USER, undefined);
-
-    // Generate Delete user event
-    this.telemetryGeneratorService.generateInteractTelemetry(
-      InteractType.TOUCH,
-      InteractSubtype.DELETE_USER_INITIATE,
-      Environment.USER,
-      PageId.USERS_GROUPS,
-      telemetryObject
-    );
-    this.profileService.deleteProfile(uid)
-      .subscribe(() => {
-        this.userList.splice(index, 1);
-        if (this.userList.length === 0) {
-          this.noUsersPresent = true;
-        }
-      }, () => {
-      });
-  }
-
-  getGradeNameFromCode(data: Profile | Group): string {
-    if (data.grade && data.grade.length > 0) {
-      const gradeName = [];
-      data.grade.forEach(code => {
-        if (data.gradeValue && data.gradeValue[code]) {
-          gradeName.push(data.gradeValue[code]);
-        }
-      });
-
-      if (gradeName.length === 0) {
-        return data.grade.join(',');
-      }
-
-      return gradeName.join(',');
-    }
-
-    return '';
-  }
-
-  private setAsCurrentUser(selectedUser, isBeingPlayed: boolean) {
-    this.groupService.removeActiveGroupSession()
-      .subscribe(() => {
-      }, () => { });
-    this.profileService.setActiveSessionForProfile(selectedUser.uid).subscribe(() => {
-      this.commonUtilService.showToast(this.commonUtilService.translateMessage('SWITCHING_TO', selectedUser.handle),
-        undefined, undefined, 1000);
-      setTimeout(() => {
-        if (isBeingPlayed) {
-          this.playConfig.selectedUser = selectedUser;
-          this.preferences.putString(PreferenceKey.SELECTED_USER_TYPE, selectedUser.profileType).toPromise().then();
-          this.event.publish('playConfig', this.playConfig);
-          this.location.back();
-
-        } else {
-          if (selectedUser.profileType === ProfileType.STUDENT) {
-            initTabs(this.container, isBeingPlayed ? GUEST_STUDENT_TABS : GUEST_STUDENT_SWITCH_TABS);
-            this.preferences.putString(PreferenceKey.SELECTED_USER_TYPE, selectedUser.profileType).toPromise().then();
-          } else {
-            initTabs(this.container, isBeingPlayed ? GUEST_TEACHER_TABS : GUEST_TEACHER_SWITCH_TABS);
-            this.preferences.putString(PreferenceKey.SELECTED_USER_TYPE, selectedUser.profileType).toPromise().then();
-          }
-          this.event.publish('refresh:profile');
-          this.event.publish(AppGlobalService.USER_INFO_UPDATED);
-
-          this.router.navigate([`/${RouterLinks.TABS}`]);
-
-        }
-      }, 1000);
-    }, () => {
-    });
-  }
-
-  ionViewWillLeave(): void {
-    if (this.backButtonFunc) {
-      this.backButtonFunc.unsubscribe();
-    }
-    if (this.headerObservable) {
-      this.headerObservable.unsubscribe();
-    }
-  }
-
-  handleHeaderEvents($event) {
-    switch ($event.name) {
-      case 'share': this.goToSharePage();
-        break;
-    }
-  }
-
-  goBack() {
-    this.telemetryGeneratorService.generateBackClickedTelemetry(
-      PageId.USERS_GROUPS, Environment.USER, true,
-    );
-    this.location.back();
-  }
-}
diff --git a/src/app/user-type-selection/user-type-selection.html b/src/app/user-type-selection/user-type-selection.html
index baaaab416..7df729774 100644
--- a/src/app/user-type-selection/user-type-selection.html
+++ b/src/app/user-type-selection/user-type-selection.html
@@ -1,55 +1,30 @@
-<ion-content padding>
-    <div class="back-btn-container">
-        <ion-icon *ngIf="!hideBackButton" ios="ios-arrow-back" md="md-arrow-back" (click)="handleBackButton(true)"
-                  class="top-back-button"></ion-icon>
-    </div>
-    <ion-title text-center class="title-class">{{'APP_TITLE' | translate:{'%s': appName} }}</ion-title>
-    <h6 class="gray-color" text-center>{{ 'ROLE_SELECTOR_QUERY' | translate }}</h6>
+<ion-content class="ui-container ion-padding">
+    <div class="ui-content">
+        <div class="back-btn-container">
+            <img src="assets/imgs/ic_back_black.svg" *ngIf="!hideBackButton && !categoriesProfileData"
+                 (click)="handleBackButton(true)"
+                 class="top-back-button" alt="back">
+        </div>
+        <div class="app-text-heading-welcome">
+            <p class="ion-text-center title-class">{{'APP_TITLE' | translate:{'%s': appName} }}</p>
+            <h6 class="gray-color ion-text-center">{{ 'ROLE_SELECTOR_QUERY' | translate }}</h6>
+        </div>
 
-    <ion-grid>
-        <!--    Teacher Card-->
-        <ion-row class="ion-justify-content-start ion-align-items-stretch">
-            <ion-col size="6">
-                <ion-card (click)="selectTeacherCard()" class="card-related-style" [class.selected]="selectedUserType === ProfileType.TEACHER">
-                    <img class="icon-check" alt="" [class.selected]="selectedUserType === ProfileType.TEACHER" [src]="selectCardImageUri"/>
-                    <ion-grid>
-                        <ion-row class="ion-align-items-end" style="height: 100%">
-                            <ion-col>
-                                <img class="thumbnail" alt="" [src]="teacherImageUri"/>
-                                <h4 class="card-title">{{ 'USER_TYPE_1' | translate }}</h4>
-                            </ion-col>
-                        </ion-row>
-                    </ion-grid>
-                </ion-card>
-            </ion-col>
-            <!-- Student card -->
-            <ion-col size="6">
-                <ion-card (click)="selectStudentCard()" class="card-related-style" [class.selected]="selectedUserType === ProfileType.STUDENT">
-                    <img class="icon-check" alt="" [class.selected]="selectedUserType === ProfileType.STUDENT" [src]="selectCardImageUri"/>
-                    <ion-grid>
-                        <ion-row class="ion-align-items-end" style="height: 100%">
-                            <ion-col>
-                                <img class="thumbnail" alt="" [src]="studentImageUri"/>
-                                <h4 class="card-title">{{ 'USER_TYPE_2' | translate }}</h4>
-                            </ion-col>
-                        </ion-row>
-                    </ion-grid>
-                </ion-card>
-            </ion-col>
-            <!-- Other card -->
-            <ion-col size="6">
-                <ion-card (click)="selectOtherCard()" class="card-related-style" [class.selected]="selectedUserType === ProfileType.OTHER">
-                    <img class="icon-check" alt="" [class.selected]="selectedUserType === ProfileType.OTHER" [src]="selectCardImageUri"/>
-                    <ion-grid>
-                        <ion-row class="ion-align-items-end" style="height: 100%">
-                            <ion-col>
-                                <img class="thumbnail" alt="" [src]="otherImageUri"/>
-                                <h4 class="card-title">{{ 'USER_TYPE_3' | translate }}</h4>
-                            </ion-col>
-                        </ion-row>
-                    </ion-grid>
-                </ion-card>
-            </ion-col>
-        </ion-row>
-    </ion-grid>
+        <div class="container">
+            <div class="card" *ngFor="let userTypeConfig of supportedUserTypeConfig;">
+                <div class="card-container" (click)="selectUserTypeCard(userTypeConfig?.name, userTypeConfig?.code)" [class.selected]="selectedUserType === userTypeConfig?.code">
+                    <img class="icon-check" alt="" [class.selected]="selectedUserType === userTypeConfig?.code" src="assets/imgs/ic_check.svg"/>
+                    <img class="thumbnail" alt="" src="assets/imgs/{{ userTypeConfig?.image }}"/>
+                    <h4 class="card-title">{{ userTypeConfig?.name }}</h4>
+                </div>
+            </div>
+        </div>  
+    </div>
 </ion-content>
+
+<div *ngIf="categoriesProfileData"> 
+	<button class="sb-btn sb-btn-md sb-btn-primary PR35 W100 ellipsis text-uppercase btn-block continue" [disabled]="!isUserTypeSelected" [class.disabled-button]="!isUserTypeSelected" (click)="onSubmitAttempt()">
+		<span>{{ 'CONTINUE' | translate }}</span>
+		<img class="arrow-icon" src="assets/imgs/ic_back.svg" name="arrow-forward" alt="">
+	</button>
+</div>
diff --git a/src/app/user-type-selection/user-type-selection.scss b/src/app/user-type-selection/user-type-selection.scss
index 90c2a8a9f..2c261cd48 100644
--- a/src/app/user-type-selection/user-type-selection.scss
+++ b/src/app/user-type-selection/user-type-selection.scss
@@ -1,31 +1,9 @@
 @import "src/assets/styles/variables";
 @import "src/assets/styles/_custom-mixins";
+@import "src/assets/styles/_variables.scss";
+@import "src/assets/styles/fonts";
 
-ion-content {
-  --ion-background-color: #EDF4F9;
-}
 :host {
-  .card-related-style {
-    //border-style: solid;
-    //border-width: 2px;
-    //border-radius: 6px !important;
-    //margin-inline-start: unset !important;
-    //margin-inline-end: unset !important;
-    text-align: center;
-    position: relative;
-    box-shadow: 0 20px 40px -10px #D8D8D8;
-    background-color: #FFFFFF;
-    border-radius: 4px;
-  }
-
-  .description {
-    color: map-get($colors, title);
-    font-size: 1rem;
-    line-height: 2rem;
-    font-weight: 500 !important;
-    @include padding(null, null, null, 35px !important);
-  }
-
   .card-title {
     font-weight: 700 !important;
     font-size: 1.4rem;
@@ -37,13 +15,12 @@ ion-content {
     width: 100%;
     height: auto;
   }
+
   .icon-check {
     visibility: hidden;
     width: auto;
     height: auto;
-    position: absolute;
-    top: 1rem;
-    right: 1rem;
+    margin-left: 124px;
     &.selected {
      visibility: visible;
     }
@@ -53,39 +30,6 @@ ion-content {
     @include padding(null, null, null, 0 !important);
   }
 
-  ion-card {
-    background-color: map-get($colors, white_f7) !important;
-    @include margin(20px, 0, 0, 0 !important);
-    height: calc(100% - 20px);
-    width: 100% !important;
-    &.selected {
-      border:3px solid #0076FE;
-    }
-    > ion-grid {
-      height: 100%;
-    }
-  }
-
-  ion-icon {
-    @include ltr {
-      float: right !important;
-    }
-    @include rtl {
-      float: left !important;
-    }
-  }
-
-  .arrow-icon {
-    right: 15px;
-    //position: absolute;
-    top: 50%;
-    //transform: translateY(-50%);
-    width: 22px;
-  }
-
-  .black-color {
-    color : black;
-  }
   .gray-color {
     color: map-get($colors, primary_black);
     padding: 0;
@@ -95,10 +39,11 @@ ion-content {
     font-weight: bold;
     font-size: 24px;
   }
+
   .title-class {
     font-size: 24px;
     font-weight: bold;
-    color: #024F9D;
+    color: $blue;
     margin-top: 4vh;
   }
 
@@ -116,15 +61,72 @@ ion-content {
     position: absolute;
     .top-back-button{
       position: relative;
-      font-size: 22px;
+      width: 22px;
       @include ltr() {
-        top: 20px;
-        left: 20px;
+        left: 16px;
+        transform: rotate(180deg);
       }
       @include rtl() {
-        top: 20px;
-        right: 20px;
+        right: 16px;
+        transform: rotate(0deg);
       }
     }
   }
+
+  .container {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+  }
+  .card {
+    width: 50%;
+    padding: 8px;
+    box-sizing: border-box;
+  }
+
+  .disabled-button {
+    opacity: 0.8;
+  }
+
+  .card-container {
+    display: flex;
+    flex-direction: column;
+    padding: 16px;
+    border-radius: 15px;
+    background-color: map-get($colors, white);
+    justify-content: center;
+    align-items: center;
+    height: 17rem;
+    &.selected {
+      border:3px solid map-get($colors, vived_blue_fe);
+    }
+  }
+
+  .continue {
+    position: fixed;
+    z-index: 2;
+    bottom: 32px;
+    width: 90vw;
+    left: 5vw;
+  }
+  img.arrow-icon {
+    display: inline-block;
+    width: 22px;
+    margin-top: -3px;
+    float: right;
+
+    &.animate {
+      position: relative;
+      animation: dropDown 5s linear infinite;
+      animation-duration: 0.9s;
+    }
+
+    @include rtl {
+      transform: rotate(180deg);
+      float: left !important;
+    }
+  }
+  .app-text-heading-welcome {
+    padding-top: 1em;
+  }
 }
diff --git a/src/app/user-type-selection/user-type-selection.spec.ts b/src/app/user-type-selection/user-type-selection.spec.ts
new file mode 100644
index 000000000..c4fa3f7dc
--- /dev/null
+++ b/src/app/user-type-selection/user-type-selection.spec.ts
@@ -0,0 +1,305 @@
+import { UserTypeSelectionPage } from './user-type-selection';
+import {
+    ProfileService,
+    SharedPreferences
+} from 'sunbird-sdk';
+import { Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { Router, ActivatedRoute } from '@angular/router';
+import {
+    AppGlobalService,
+    TelemetryGeneratorService,
+    CommonUtilService,
+    ContainerService,
+    AppHeaderService
+} from '../../services';
+import { of } from 'rxjs';
+import { NgZone } from '@angular/core';
+import { HasNotSelectedFrameworkGuard } from '@app/guards/has-not-selected-framework.guard';
+import { NativePageTransitions } from '@ionic-native/native-page-transitions/ngx';
+import {
+    CorReleationDataType, Environment, InteractSubtype, InteractType, LoginHandlerService, PageId,
+    SplashScreenService
+} from '../../services';
+import { ProfileType } from '@project-sunbird/sunbird-sdk';
+import { PreferenceKey, RouterLinks } from '../app.constant';
+import { ProfileHandler } from '../../services/profile-handler';
+import { TncUpdateHandlerService } from '../../services/handlers/tnc-update-handler.service';
+
+describe('UserTypeSelectionPage', () => {
+    let userTypeSelectionPage: UserTypeSelectionPage;
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        generateSaveClickedTelemetry: jest.fn(),
+    };
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        translateMessage: jest.fn(() => 'sample_translated_message'),
+        showToast: jest.fn()
+    };
+    const mockContainer: Partial<ContainerService> = {};
+    const mockEvents: Partial<Events> = {};
+    const mockHeaderService: Partial<AppHeaderService> = {};
+    const mockProfileService: Partial<ProfileService> = {
+        updateProfile: jest.fn(() => of({}))
+    };
+    const mockRouterExtras = {
+        extras: {
+            state: {
+                contentType: 'contentType',
+                corRelationList: 'corRelationList',
+                source: 'source',
+                enrolledCourses: 'enrolledCourses' as any,
+                userId: 'userId',
+                shouldGenerateEndTelemetry: false,
+                isNewUser: true,
+                lastCreatedProfile: { id: 'sample-id' }
+            }
+        }
+    };
+    const mockRouter: Partial<Router> = {
+        getCurrentNavigation: jest.fn(() => mockRouterExtras as any),
+        navigate: jest.fn(() => Promise.resolve(true))
+    };
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateInteractTelemetry: jest.fn(),
+        generateImpressionTelemetry: jest.fn()
+    };
+    const mockActivatedRoute: Partial<ActivatedRoute> = {};
+    mockActivatedRoute.snapshot = {
+        queryParams: {
+            reOnBoard: {}
+        }
+    } as any;
+    const mockSharedPreferences: Partial<SharedPreferences> = {
+    };
+
+    const mockNgZone: Partial<NgZone> = {
+        run: jest.fn((fn) => fn())
+    };
+
+    const mockPlatform: Partial<Platform> = {
+    };
+
+    const mockHasNotSelectedFrameworkGuard: Partial<HasNotSelectedFrameworkGuard> = {
+    };
+
+    const mockSplashScreenService: Partial<SplashScreenService> = {
+    };
+
+    const mockNativePageTransitions: Partial<NativePageTransitions> = {
+    };
+    const mockTncUpdateHandlerService: Partial<TncUpdateHandlerService> = {};
+    const mockProfileHandler: Partial<ProfileHandler> = {};
+    const mockLoginHandlerService: Partial<LoginHandlerService> = {};
+
+    beforeAll(() => {
+        userTypeSelectionPage = new UserTypeSelectionPage(
+            mockProfileService as ProfileService,
+            mockSharedPreferences as SharedPreferences,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockContainer as ContainerService,
+            mockNgZone as NgZone,
+            mockEvents as Events,
+            mockCommonUtilService as CommonUtilService,
+            mockAppGlobalService as AppGlobalService,
+            mockPlatform as Platform,
+            mockHeaderService as AppHeaderService,
+            mockRouter as Router,
+            mockHasNotSelectedFrameworkGuard as HasNotSelectedFrameworkGuard,
+            mockSplashScreenService as SplashScreenService,
+            mockNativePageTransitions as NativePageTransitions,
+            mockTncUpdateHandlerService as TncUpdateHandlerService,
+            mockProfileHandler as ProfileHandler,
+            mockLoginHandlerService as LoginHandlerService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should be create a instance of UserTypeSelectionPage', () => {
+        expect(userTypeSelectionPage).toBeTruthy();
+    });
+
+    describe('selectUserTypeCard', () => {
+        it('should update the selectedUserType , continueAs Message and save the userType in preference', () => {
+            // arrange
+            userTypeSelectionPage['profile'] = { uid: 'sample_uid' };
+            jest.useFakeTimers();
+            mockNgZone.run = jest.fn((fn) => fn());
+            jest.advanceTimersByTime(200);
+            mockSharedPreferences.putString = jest.fn(() => of(undefined));
+            // act
+            userTypeSelectionPage.selectUserTypeCard('USER_TYPE_1', ProfileType.TEACHER);
+            // assert
+            expect(userTypeSelectionPage.selectedUserType).toEqual(ProfileType.TEACHER);
+            expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(1, 'USER_TYPE_1');
+            expect(mockCommonUtilService.translateMessage).toHaveBeenNthCalledWith(2, 'CONTINUE_AS_ROLE', undefined);
+            expect(mockSharedPreferences.putString).toHaveBeenCalledWith(PreferenceKey.SELECTED_USER_TYPE, ProfileType.TEACHER);
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                InteractType.TOUCH,
+                InteractSubtype.USER_TYPE_SELECTED,
+                Environment.ONBOARDING,
+                PageId.USER_TYPE_SELECTION,
+                undefined,
+                { userType: 'TEACHER' }
+            );
+
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                InteractType.SELECT_USERTYPE, '',
+                Environment.ONBOARDING,
+                PageId.USER_TYPE,
+                undefined,
+                undefined,
+                undefined,
+                [{ id: 'teacher', type: CorReleationDataType.USERTYPE }]
+            );
+            jest.useRealTimers();
+            jest.clearAllTimers();
+        });
+    });
+
+    it('should return categories ProfileData', () => {
+        jest.spyOn(window.history, 'state', 'get').mockImplementation(() => {
+            return { categoriesProfileData: {}, forwardMigration: true };
+        });
+        // act
+        userTypeSelectionPage.getNavParams();
+        // assert
+        expect(userTypeSelectionPage.categoriesProfileData).toBeTruthy();
+    });
+
+    it('should invoked onboarding Splash screen', () => {
+        mockSplashScreenService.handleSunbirdSplashScreenActions = jest.fn(() => Promise.resolve(undefined));
+        userTypeSelectionPage.ionViewDidEnter();
+        expect(mockSplashScreenService.handleSunbirdSplashScreenActions).toHaveBeenCalled();
+    });
+
+    describe('ionViewWillEnter', () => {
+        it('should initialized all user-type', (done) => {
+            // arrange
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+            mockProfileHandler.getSupportedUserTypes = jest.fn(() => Promise.resolve([]));
+            (mockRouter as any).url = `/${RouterLinks.USER_TYPE_SELECTION}`;
+            jest.useFakeTimers();
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            jest.spyOn(userTypeSelectionPage, 'getNavParams').mockImplementation(() => {
+                return;
+            });
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn((fn) => fn({
+                    unsubscribe: jest.fn(() => { })
+                }))
+            });
+            jest.spyOn(userTypeSelectionPage, 'handleHeaderEvents').mockImplementation(() => {
+                return;
+            });
+            jest.advanceTimersByTime(450);
+            jest.runAllTimers();
+            mockCommonUtilService.getAppName = jest.fn(() => Promise.resolve('sunbird'));
+            mockCommonUtilService.showExitPopUp = jest.fn();
+            mockHeaderService.hideHeader = jest.fn();
+            mockAppGlobalService.getCurrentUser = jest.fn(() => ({ handle: 'sample-user' }));
+            const subscribeWithPriorityData = jest.fn((_, fn) => fn({
+                unsubscribe: jest.fn()
+            }));
+            mockPlatform.backButton = {
+                subscribeWithPriority: subscribeWithPriorityData
+            } as any;
+            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateBackClickedNewTelemetry = jest.fn();
+            jest.spyOn(userTypeSelectionPage, 'handleBackButton').mockImplementation(() => {
+                return;
+            });
+            userTypeSelectionPage.backButtonFunc = {
+                unsubscribe: jest.fn()
+            } as any;
+            // act
+            userTypeSelectionPage.ionViewWillEnter().then(() => {
+                expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+                expect(mockProfileHandler.getSupportedUserTypes).toHaveBeenCalled();
+                expect(mockHeaderService.headerEventEmitted$).toBeTruthy();
+                expect(mockCommonUtilService.getAppName).toHaveBeenCalled();
+                expect(mockHeaderService.hideHeader).toHaveBeenCalled();
+                expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalled();
+                expect(subscribeWithPriorityData).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                    PageId.USER_TYPE_SELECTION, Environment.HOME, false
+                );
+
+                expect(mockTelemetryGeneratorService.generateBackClickedNewTelemetry).toHaveBeenCalledWith(
+                    true,
+                    Environment.ONBOARDING,
+                    PageId.USER_TYPE
+                );
+                done();
+            });
+            // assert
+            jest.useRealTimers();
+            jest.clearAllTimers();
+        });
+
+        it('should set user for logged-in user', (done) => {
+            // arrange
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+            mockSharedPreferences.getString = jest.fn(() => of('teacher'));
+            mockProfileHandler.getSupportedUserTypes = jest.fn(() => Promise.resolve([]));
+            (mockRouter as any).url = `/${RouterLinks.ABOUT_US}`;
+            jest.spyOn(userTypeSelectionPage, 'getNavParams').mockImplementation(() => {
+                return;
+            });
+            mockHeaderService.headerEventEmitted$ = of({
+                subscribe: jest.fn((fn) => fn({
+                    unsubscribe: jest.fn(() => { })
+                }))
+            });
+            jest.spyOn(userTypeSelectionPage, 'handleHeaderEvents').mockImplementation(() => {
+                return;
+            });
+            mockCommonUtilService.getAppName = jest.fn(() => Promise.resolve('sunbird'));
+            mockCommonUtilService.showExitPopUp = jest.fn();
+            mockHeaderService.hideHeader = jest.fn();
+            mockAppGlobalService.getCurrentUser = jest.fn(() => ({ handle: 'sample-user' }));
+            const subscribeWithPriorityData = jest.fn((_, fn) => fn({
+                unsubscribe: jest.fn()
+            }));
+            mockPlatform.backButton = {
+                subscribeWithPriority: subscribeWithPriorityData
+            } as any;
+            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateBackClickedNewTelemetry = jest.fn();
+            jest.spyOn(userTypeSelectionPage, 'handleBackButton').mockImplementation(() => {
+                return;
+            });
+            userTypeSelectionPage.backButtonFunc = {
+                unsubscribe: jest.fn()
+            } as any;
+            mockAppGlobalService.isOnBoardingCompleted = true;
+            // act
+            userTypeSelectionPage.ionViewWillEnter();
+            setTimeout(() => {
+                expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+                expect(mockSharedPreferences.getString).toHaveBeenCalledWith(PreferenceKey.SELECTED_USER_TYPE);
+                expect(mockProfileHandler.getSupportedUserTypes).toHaveBeenCalled();
+                expect(mockHeaderService.headerEventEmitted$).toBeTruthy();
+                expect(mockCommonUtilService.getAppName).toHaveBeenCalled();
+                expect(mockHeaderService.hideHeader).toHaveBeenCalled();
+                expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalled();
+                expect(subscribeWithPriorityData).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                    PageId.USER_TYPE_SELECTION, Environment.HOME, false
+                );
+
+                expect(mockTelemetryGeneratorService.generateBackClickedNewTelemetry).toHaveBeenCalledWith(
+                    true,
+                    Environment.HOME,
+                    PageId.USER_TYPE
+                );
+                done();
+            }, 0);
+        });
+    });
+
+});
diff --git a/src/app/user-type-selection/user-type-selection.ts b/src/app/user-type-selection/user-type-selection.ts
index 6f86a5b28..78ec73a61 100644
--- a/src/app/user-type-selection/user-type-selection.ts
+++ b/src/app/user-type-selection/user-type-selection.ts
@@ -1,26 +1,37 @@
-import { Subscription } from 'rxjs';
-import { Component, Inject, NgZone, ViewChild, OnInit } from '@angular/core';
-import { IonRouterOutlet, Events, Platform } from '@ionic/angular';
-import { } from '@ionic/angular';
-import { Router, NavigationExtras } from '@angular/router';
-import { ProfileConstants, PreferenceKey, RouterLinks } from '@app/app/app.constant';
+import { Component, Inject, NgZone, OnDestroy, ViewChild } from '@angular/core';
+import { NavigationExtras, Router } from '@angular/router';
+import { PreferenceKey, ProfileConstants, RouterLinks } from '@app/app/app.constant';
+import { GUEST_STUDENT_TABS, GUEST_TEACHER_TABS, initTabs, LOGIN_TEACHER_TABS } from '@app/app/module.service';
+import { HasNotSelectedFrameworkGuard } from '@app/guards/has-not-selected-framework.guard';
+import { LoginHandlerService } from '@app/services';
 import { AppGlobalService } from '@app/services/app-global-service.service';
-import { CommonUtilService } from '@app/services/common-util.service';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
 import { AppHeaderService } from '@app/services/app-header.service';
-import { Profile, ProfileService, ProfileSource, ProfileType, SharedPreferences, } from 'sunbird-sdk';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { ContainerService } from '@app/services/container.services';
+import { TncUpdateHandlerService } from '@app/services/handlers/tnc-update-handler.service';
+import { ProfileHandler } from '@app/services/profile-handler';
+import { SplashScreenService } from '@app/services/splash-screen.service';
 import {
-  Environment,
+  AuditProps,
+  AuditType, CorReleationDataType, Environment,
   ImpressionType,
   InteractSubtype,
   InteractType,
-  PageId,
+  PageId
 } from '@app/services/telemetry-constants';
-import { ContainerService } from '@app/services/container.services';
-import { initTabs, GUEST_STUDENT_TABS, GUEST_TEACHER_TABS } from '@app/app/module.service';
-import { HasNotSelectedFrameworkGuard } from '@app/guards/has-not-selected-framework.guard';
-import { SplashScreenService } from '@app/services/splash-screen.service';
-import {NativePageTransitions, NativeTransitionOptions} from '@ionic-native/native-page-transitions/ngx';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import { NativePageTransitions, NativeTransitionOptions } from '@ionic-native/native-page-transitions/ngx';
+import { IonRouterOutlet, Platform } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { Subscription } from 'rxjs';
+import {
+  AuditState, CorrelationData, Profile,
+  ProfileService,
+  ProfileSource,
+  ProfileType,
+  SharedPreferences,
+  UpdateServerProfileInfoRequest
+} from 'sunbird-sdk';
 
 @Component({
   selector: 'page-user-type-selection',
@@ -28,8 +39,8 @@ import {NativePageTransitions, NativeTransitionOptions} from '@ionic-native/nati
   styleUrls: ['./user-type-selection.scss']
 })
 
-export class UserTypeSelectionPage {
-  selectedUserType?: ProfileType;
+export class UserTypeSelectionPage implements OnDestroy {
+  selectedUserType?: any;
   continueAs = '';
   profile: Profile;
   backButtonFunc: Subscription;
@@ -39,10 +50,13 @@ export class UserTypeSelectionPage {
   otherImageUri = 'assets/imgs/ic_other.svg';
   selectCardImageUri = 'assets/imgs/ic_check.svg';
   private navParams: any;
-  @ViewChild(IonRouterOutlet) routerOutlet: IonRouterOutlet;
+  @ViewChild(IonRouterOutlet, { static: false }) routerOutlet: IonRouterOutlet;
   appName = '';
   public hideBackButton = true;
   ProfileType = ProfileType;
+  categoriesProfileData: any;
+  supportedUserTypeConfig: Array<any>;
+  isUserTypeSelected = false;
 
   constructor(
     @Inject('PROFILE_SERVICE') private profileService: ProfileService,
@@ -58,12 +72,16 @@ export class UserTypeSelectionPage {
     private router: Router,
     public frameworkGuard: HasNotSelectedFrameworkGuard,
     private splashScreenService: SplashScreenService,
-    private nativePageTransitions: NativePageTransitions
+    private nativePageTransitions: NativePageTransitions,
+    private tncUpdateHandlerService: TncUpdateHandlerService,
+    private profileHandler: ProfileHandler,
+    private loginHandlerService: LoginHandlerService
   ) {
   }
 
   getNavParams() {
     this.navParams = window.history.state;
+    this.categoriesProfileData = this.navParams.categoriesProfileData;
   }
 
   ionViewDidEnter() {
@@ -79,12 +97,21 @@ export class UserTypeSelectionPage {
   }
 
   async ionViewWillEnter() {
+    if (this.appGlobalService.isUserLoggedIn()) {
+      this.selectedUserType = await this.preferences.getString(PreferenceKey.SELECTED_USER_TYPE).toPromise();
+    }
+    this.supportedUserTypeConfig = await this.profileHandler.getSupportedUserTypes();
     if (this.router.url === '/' + RouterLinks.USER_TYPE_SELECTION) {
       setTimeout(() => {
         this.telemetryGeneratorService.generateImpressionTelemetry(
-            ImpressionType.VIEW, '',
-            PageId.USER_TYPE_SELECTION,
-            this.appGlobalService.isOnBoardingCompleted ? Environment.HOME : Environment.ONBOARDING);
+          ImpressionType.VIEW, '',
+          PageId.USER_TYPE_SELECTION,
+          this.appGlobalService.isOnBoardingCompleted ? Environment.HOME : Environment.ONBOARDING);
+        /* New Telemetry */
+        this.telemetryGeneratorService.generatePageLoadedTelemetry(
+          PageId.USER_TYPE,
+          this.appGlobalService.isOnBoardingCompleted ? Environment.HOME : Environment.ONBOARDING
+        );
       }, 350);
     }
     this.getNavParams();
@@ -96,8 +123,17 @@ export class UserTypeSelectionPage {
     this.profile = this.appGlobalService.getCurrentUser();
     this.backButtonFunc = this.platform.backButton.subscribeWithPriority(10, () => {
       this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.USER_TYPE_SELECTION, Environment.HOME, false);
-      this.handleBackButton();
-      this.backButtonFunc.unsubscribe();
+      /* New Telemetry */
+      this.telemetryGeneratorService.generateBackClickedNewTelemetry(
+        true,
+        this.appGlobalService.isOnBoardingCompleted ? Environment.HOME : Environment.ONBOARDING,
+        PageId.USER_TYPE
+      );
+      if (this.categoriesProfileData) {
+        this.commonUtilService.showExitPopUp(PageId.USER_TYPE_SELECTION, Environment.HOME, false);
+      } else {
+        this.backButtonFunc.unsubscribe();
+      }
     });
     this.hideBackButton = false;
   }
@@ -115,46 +151,59 @@ export class UserTypeSelectionPage {
   handleBackButton(isBackClicked?) {
     if (isBackClicked) {
       this.telemetryGeneratorService.generateBackClickedTelemetry(
-          PageId.USER_TYPE_SELECTION,
-          this.appGlobalService.isOnBoardingCompleted ? Environment.HOME : Environment.ONBOARDING,
-          true);
+        PageId.USER_TYPE_SELECTION,
+        this.appGlobalService.isOnBoardingCompleted ? Environment.HOME : Environment.ONBOARDING,
+        true);
+      /* New Telemetry */
+      this.telemetryGeneratorService.generateBackClickedNewTelemetry(
+        false,
+        this.appGlobalService.isOnBoardingCompleted ? Environment.HOME : Environment.ONBOARDING,
+        PageId.USER_TYPE
+      );
+    }
+    if (!this.categoriesProfileData) {
+      this.router.navigate([`/${RouterLinks.LANGUAGE_SETTING}`]);
     }
-    this.router.navigate([`/${RouterLinks.LANGUAGE_SETTING}`]);
   }
+
   handleHeaderEvents($event) {
     if ($event.name === 'back') {
       this.telemetryGeneratorService.generateBackClickedTelemetry(
-          PageId.USER_TYPE_SELECTION,
-          this.appGlobalService.isOnBoardingCompleted ? Environment.HOME : Environment.ONBOARDING,
-          true);
+        PageId.USER_TYPE_SELECTION,
+        this.appGlobalService.isOnBoardingCompleted ? Environment.HOME : Environment.ONBOARDING,
+        true);
       this.handleBackButton();
     }
   }
 
-  selectTeacherCard() {
-    this.selectCard('USER_TYPE_1', ProfileType.TEACHER);
-    setTimeout(() => {
-      this.continue();
-    }, 50);
-  }
-
-  selectStudentCard() {
-    this.selectCard('USER_TYPE_2', ProfileType.STUDENT);
-    setTimeout(() => {
-      this.continue();
-    }, 50);
+  selectUserTypeCard(selectedUserTypeName: string, userType: string) {
+    this.selectCard(selectedUserTypeName, userType);
+    this.generateUserTypeClicktelemetry(userType);
+    if (!this.categoriesProfileData) {
+      setTimeout(() => {
+        this.continue();
+      }, 50);
+    }
   }
 
-  selectOtherCard() {
-    this.selectCard('USER_TYPE_3', ProfileType.OTHER);
-    setTimeout(() => {
-      this.continue();
-    }, 50);
+  generateUserTypeClicktelemetry(userType: string) {
+    const correlationlist: Array<CorrelationData> = [];
+    correlationlist.push({ id: userType, type: CorReleationDataType.USERTYPE });
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_USERTYPE, '',
+      Environment.ONBOARDING,
+      PageId.USER_TYPE,
+      undefined,
+      undefined,
+      undefined,
+      correlationlist
+    );
   }
 
   selectCard(userType, profileType) {
     this.zone.run(() => {
       this.selectedUserType = profileType;
+      this.isUserTypeSelected = true;
       this.continueAs = this.commonUtilService.translateMessage(
         'CONTINUE_AS_ROLE',
         this.commonUtilService.translateMessage(userType)
@@ -162,7 +211,7 @@ export class UserTypeSelectionPage {
 
       this.preferences.putString(PreferenceKey.SELECTED_USER_TYPE, this.selectedUserType).toPromise().then();
     });
-    const values = new Map();
+    const values = {};
     values['userType'] = (this.selectedUserType).toUpperCase();
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.TOUCH,
@@ -175,7 +224,7 @@ export class UserTypeSelectionPage {
   }
 
   continue() {
-    this.generateInteractEvent(this.selectedUserType);
+    // this.generateInteractEvent(this.selectedUserType);
     // When user is changing the role via the Guest Profile screen
     if (this.profile !== undefined && this.profile.handle) {
       // if role types are same
@@ -208,6 +257,18 @@ export class UserTypeSelectionPage {
             }
             this.profile = success;
             this.gotoNextPage();
+            const correlationlist: Array<CorrelationData> = [{ id: PageId.USER_TYPE, type: CorReleationDataType.FROM_PAGE }];
+            correlationlist.push({ id: this.selectedUserType, type: CorReleationDataType.USERTYPE });
+            this.telemetryGeneratorService.generateAuditTelemetry(
+              Environment.ONBOARDING,
+              AuditState.AUDIT_UPDATED,
+              [AuditProps.PROFILE_TYPE],
+              AuditType.SELECT_USERTYPE,
+              undefined,
+              undefined,
+              undefined,
+              correlationlist
+            );
           }).catch(() => {
             return 'null';
           });
@@ -217,7 +278,7 @@ export class UserTypeSelectionPage {
 
   /**
    * It will initializes tabs based on the user type and navigates to respective page
-   * @param isUserTypeChanged
+   * isUserTypeChanged
    */
 
   // changes
@@ -231,13 +292,14 @@ export class UserTypeSelectionPage {
       initTabs(this.container, GUEST_STUDENT_TABS);
     }
 
-    if (this.appGlobalService.isProfileSettingsCompleted && this.appGlobalService.isOnBoardingCompleted) {
+    if (this.appGlobalService.isProfileSettingsCompleted && this.appGlobalService.isOnBoardingCompleted && !isUserTypeChanged) {
       this.navigateToTabsAsGuest();
     } else if (this.appGlobalService.DISPLAY_ONBOARDING_CATEGORY_PAGE) {
       if (isUserTypeChanged) {
         this.updateProfile('ProfileSettingsPage', { showProfileSettingPage: true });
       } else {
-        this.navigateToProfileSettingsPage({ showProfileSettingPage: true });
+        this.selectedUserType === ProfileType.ADMIN ? this.loginHandlerService.signIn() :
+          this.navigateToProfileSettingsPage({ showProfileSettingPage: true });
       }
     } else {
       this.updateProfile('ProfileSettingsPage', { showTabsPage: true });
@@ -248,18 +310,32 @@ export class UserTypeSelectionPage {
     const values = new Map();
     values['userType'] = (userType).toUpperCase();
     this.telemetryGeneratorService.generateInteractTelemetry(
-        InteractType.TOUCH,
-        InteractSubtype.USER_TYPE_SELECTED,
+      InteractType.TOUCH,
+      InteractSubtype.USER_TYPE_SELECTED,
       this.appGlobalService.isOnBoardingCompleted ? Environment.HOME : Environment.ONBOARDING,
-        PageId.USER_TYPE_SELECTION,
+      PageId.USER_TYPE_SELECTION,
+      undefined,
+      values
+    );
+
+    /* New Telemetry */
+    const correlationlist: Array<CorrelationData> = [];
+    correlationlist.push({ id: userType, type: CorReleationDataType.USERTYPE });
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_CONTINUE, '',
+      this.appGlobalService.isOnBoardingCompleted ? Environment.HOME : Environment.ONBOARDING,
+      PageId.USER_TYPE,
+      undefined,
+      values,
       undefined,
-        values);
+      correlationlist
+    );
   }
 
   /**
    * Updates profile and navigates to desired page with given params
-   * @param page
-   * @param params
+   * page
+   * params
    */
   updateProfile(page: string, params = {}) {
     this.profile.profileType = this.selectedUserType;
@@ -267,12 +343,49 @@ export class UserTypeSelectionPage {
       .then((res: any) => {
         if (page === 'TabsPage') {
           this.navigateToTabsAsGuest();
+        } else if (this.categoriesProfileData) {
+          this.navigateToTabsAsLogInUser();
         } else {
-          this.navigateToProfileSettingsPage(params);
+          this.selectedUserType === ProfileType.ADMIN ? this.loginHandlerService.signIn() : this.navigateToProfileSettingsPage(params);
+          // this.navigateToProfileSettingsPage(params);
         }
       }).catch(error => {
         console.error('Error=', error);
       });
+    const request: UpdateServerProfileInfoRequest = {
+      userId: this.profile.uid,
+      profileUserType: {
+        type: this.selectedUserType
+      }
+    };
+    this.profileService.updateServerProfile(request).toPromise()
+      .then().catch((e) => console.log('server error for update profile', e));
+  }
+
+  async navigateToTabsAsLogInUser() {
+    if (this.categoriesProfileData.status) {
+      if (this.categoriesProfileData.showOnlyMandatoryFields) {
+        initTabs(this.container, LOGIN_TEACHER_TABS);
+        const isSSOUser = await this.tncUpdateHandlerService.isSSOUser(this.profile);
+        if (this.categoriesProfileData.hasFilledLocation || isSSOUser) {
+          if (!isSSOUser) {
+            this.appGlobalService.showYearOfBirthPopup(this.profile.serverProfile);
+          }
+          this.router.navigate([RouterLinks.TABS]);
+        } else {
+          const navigationExtras: NavigationExtras = {
+            state: {
+              isShowBackButton: false
+            }
+          };
+          this.router.navigate([RouterLinks.DISTRICT_MAPPING], navigationExtras);
+        }
+      }
+    } else {
+      this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.CATEGORIES_EDIT}`], {
+        state: this.categoriesProfileData
+      });
+    }
   }
 
   navigateToTabsAsGuest() {
@@ -280,7 +393,7 @@ export class UserTypeSelectionPage {
     this.router.navigate(['/tabs'], navigationExtras);
   }
 
-  navigateToProfileSettingsPage(params) {
+  async navigateToProfileSettingsPage(params) {
     const navigationExtras: NavigationExtras = { state: params };
     const options: NativeTransitionOptions = {
       direction: 'left',
@@ -292,4 +405,29 @@ export class UserTypeSelectionPage {
     this.nativePageTransitions.slide(options);
     this.router.navigate([`/${RouterLinks.PROFILE_SETTINGS}`], navigationExtras);
   }
+
+  async navigateToProfilePage() {
+    const navigationExtras: NavigationExtras = {};
+    const options: NativeTransitionOptions = {
+      direction: 'left',
+      duration: 500,
+      androiddelay: 500,
+      fixedPixelsTop: 0,
+      fixedPixelsBottom: 0
+    };
+    // this.nativePageTransitions.slide(options);
+    this.router.navigate([`/${RouterLinks.GUEST_PROFILE}`], navigationExtras);
+  }
+
+  onSubmitAttempt() {
+    setTimeout(() => {
+      this.continue();
+    }, 50);
+  }
+
+  ngOnDestroy() {
+    if (this.backButtonFunc) {
+      this.backButtonFunc.unsubscribe();
+    }
+  }
 }
diff --git a/src/app/view-more-activity/view-more-activity.component.html b/src/app/view-more-activity/view-more-activity.component.html
index 9e428fa69..bd2036522 100644
--- a/src/app/view-more-activity/view-more-activity.component.html
+++ b/src/app/view-more-activity/view-more-activity.component.html
@@ -1,49 +1,40 @@
-<ion-content overflow-scroll="true">
-  <div>
-    <div class="sb-view-all-container" *ngIf="localContentsCard">
-
-      <div class="sb-view-all-items">
-        <div class="sb-view-all-title">
-          <span class="page-heading">{{ 'RECENTLY_VIEWED' | translate }}</span>
-          <span class="page-info">{{'SHOW_RECENT' | translate:{'%s': searchList?.length} }}</span>
-        </div>
-      </div>
-
-    </div>
-    <div class="empty-search-result ion-text-center" *ngIf="!showLoader && searchList && searchList.length === 0"
-      padding-top>
+<ion-content overflow-scroll="true" class="ui-container">
+  <div class="ui-content">
+    <div class="empty-search-result ion-text-center ion-padding-top" *ngIf="!showLoader && searchList && searchList.length === 0">
       {{ 'EMPTY_SEARCH_RESULTS' | translate }}
     </div>
 
     <div>
-      <div class="view-more-course-bg" *ngIf="!localContentsCard">
+      <div class="view-more-course-bg">
         <p class="title" *ngIf="pageType === 'enrolledCourse'">{{'COURSES_IN_PROGRESS' | translate}}</p>
-        <p class="title" *ngIf="pageType === 'popularCourses'">{{title}}</p>
-        <p *ngIf="searchList && searchList.length" class="count-text">{{'SHOWING_ITEMS' | translate:{'%s': searchList.length} }}</p>
+        <p class="title" *ngIf="pageType === 'popularCourses' || pageType === 'tvPrograms'">{{title}}</p>
+        <p *ngIf="searchList && searchList.length" class="count-text">
+          {{'SHOWING_ITEMS' | translate:{'%s': searchList.length} }}</p>
         <ng-container *ngIf="!isLoading">
           <div *ngFor="let item of searchList; let i = index" class="mb-8">
             <sb-my-course-card *ngIf="pageType === 'enrolledCourse'" [course]="item" [section]="null"
-            [cardImg]="getContentImg(item)" (click)="openCourseDetails(item, i)"></sb-my-course-card>
-            <sb-course-card *ngIf="pageType === 'popularCourses'" [course]="item"  [section]="null"
-            [cardImg]="getContentImg(item)" (click)="openCourseDetails(item, i)"></sb-course-card>
+              [cardImg]="getContentImg(item)" (click)="openCourseDetails(item, i)" [hideProgress]="true">
+            </sb-my-course-card>
+            <sb-course-card *ngIf="pageType === 'popularCourses'" [course]="item" [section]="null"
+              [cardImg]="getContentImg(item)" (click)="openCourseDetails(item, i)"></sb-course-card>
+            <sb-library-card *ngIf="pageType === 'tvPrograms'" [isOffline]="!commonUtilService.networkInfo.isNetworkAvailable" [content]="item"
+              [type]="'mobile_textbook'" (cardClick)="navigateToDetailPage(item)" [isLoading]="isLoading"
+              [cardImg]="item?.appIcon || defaultAppIcon">
+            </sb-library-card>
           </div>
         </ng-container>
         <ng-container *ngIf="isLoading">
           <div *ngFor="let item of [0,1,2,3,4,5,6,7,8,9,10,11,12,13]" class="mb-8 mt-8">
-            <sb-my-course-card *ngIf="pageType === 'enrolledCourse'" [isLoading]="isLoading"></sb-my-course-card>
+            <sb-my-course-card *ngIf="pageType === 'enrolledCourse'" [isLoading]="isLoading">
+            </sb-my-course-card>
             <sb-course-card *ngIf="pageType === 'popularCourses'" [isLoading]="isLoading"></sb-course-card>
+            <sb-library-card *ngIf="pageType === 'tvPrograms'" [isOffline]="!commonUtilService.networkInfo.isNetworkAvailable" [content]="item"
+              [type]="'mobile_textbook'" (cardClick)="navigateToDetailPage(item)" [isLoading]="isLoading"
+              [cardImg]="item?.appIcon || defaultAppIcon">
+            </sb-library-card>
           </div>
         </ng-container>
       </div>
-
-      <ng-container *ngIf="localContentsCard && searchList && searchList.length">
-        <div class="sb-view-all-container">
-          <div class="sb-card-container sb-card-view-all-container">
-            <app-view-all-card *ngFor="let item of searchList" [userId]="userId" [content]="item" [type]="pageType"
-              [sectionName]="contentCard" (click)=navigateToDetailPage(item)></app-view-all-card>
-          </div>
-        </div>
-      </ng-container>
     </div>
     <div class="px-5">
       <ion-button expand="block" *ngIf="searchList && searchList.length && loadMoreBtn" (click)="loadMore();">
diff --git a/src/app/view-more-activity/view-more-activity.component.scss b/src/app/view-more-activity/view-more-activity.component.scss
index 995e8fc75..ff61f55f1 100644
--- a/src/app/view-more-activity/view-more-activity.component.scss
+++ b/src/app/view-more-activity/view-more-activity.component.scss
@@ -1,6 +1,7 @@
 @import "src/assets/styles/variables";
 @import "src/assets/styles/_custom-mixins";
 @import "src/assets/styles/fonts";
+@import "src/assets/styles/_variables.scss";
 
 :host {
   button {
@@ -26,14 +27,14 @@
       padding-bottom: 16px;
     }
 
-    background-color: #ffffff;
+    background-color: map-get($colors, white);
     height: 100%;
     z-index: 1000;
     opacity: 1 !important;
   }
 
   .downloads-only {
-    background: #f8f8f8;
+    background: map-get($colors, white_f8);
     @include margin(-16px, -16px, 16px, -16px);
     @include padding(0, 16px);
   }
@@ -67,32 +68,21 @@
         padding: 0 0 8px 0;
       }
     }
-    .sb-card-textbook-container,
-    .sb-card-view-all-container {
-      app-view-all-card {
-        border-bottom: 0.5px solid rgba(151, 151, 151, 0.4);
-        &:last-child {
-          .sb-card {
-            border-bottom: none;
-          }
-        }
-      }
-    }
   }
 
   .view-more-course-bg {
     background: linear-gradient(#008840, #008840 100px, white 100px, white 100%);
     padding: 8px;
     .title {
-      color: #FFFFFF;
-      font-family: "Noto Sans";
+      color: map-get($colors, white);
+      font-family: "Noto Sans", sans-serif;
       font-size: 16px;
       font-weight: bold;
       margin: 12px 0 0;
     }
     .count-text {
-      color: #FAFAFA;
-      font-family: "Noto Sans";
+      color: map-get($colors, white_fa);
+      font-family: "Noto Sans", sans-serif;
       font-size: 12px;
       margin: 0 0 12px;
     }
diff --git a/src/app/view-more-activity/view-more-activity.component.ts b/src/app/view-more-activity/view-more-activity.component.ts
index 975a21088..cb8861a6e 100644
--- a/src/app/view-more-activity/view-more-activity.component.ts
+++ b/src/app/view-more-activity/view-more-activity.component.ts
@@ -1,58 +1,44 @@
-import { Subscription } from 'rxjs';
-import { Events, Platform, PopoverController } from '@ionic/angular';
-import { ActivatedRoute, Router, NavigationExtras } from '@angular/router';
 import { Location } from '@angular/common';
-import { Component, Inject, NgZone, OnInit, Input } from '@angular/core';
+import { Component, Inject, Input, NgZone, OnInit } from '@angular/core';
+import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
+import { BatchConstants, ContentCard, PreferenceKey, RouterLinks, ViewMore } from '@app/app/app.constant';
+import { AppGlobalService } from '@app/services/app-global-service.service';
+import { AppHeaderService } from '@app/services/app-header.service';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { CourseUtilService } from '@app/services/course-util.service';
+import { NavigationService } from '@app/services/navigation-handler.service';
+import {
+  CorReleationDataType, Environment,
+  ImpressionType,
+  InteractSubtype,
+  InteractType,
+  PageId
+} from '@app/services/telemetry-constants';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import { ContentUtil } from '@app/util/content-util';
+import { Platform, PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { Subscription } from 'rxjs';
 import {
-  Content,
+  Batch, Content,
   ContentEventType,
   ContentImportRequest,
   ContentImportResponse,
   ContentImportStatus,
-  ContentRequest,
   ContentSearchCriteria,
   ContentSearchResult,
   ContentService,
-  Course,
-  CourseService,
+  CorrelationData, Course,
+  CourseBatchesRequest, CourseBatchStatus, CourseEnrollmentType, CourseService,
   DownloadEventType,
   DownloadProgress,
   EventsBusEvent,
   EventsBusService,
-  SearchType,
-  TelemetryObject,
-  CorrelationData,
-  LogLevel,
-  CourseEnrollmentType,
-  CourseBatchStatus,
-  Batch,
-  CourseBatchesRequest,
-  FetchEnrolledCourseRequest,
+  FetchEnrolledCourseRequest, LogLevel, SearchType,
   SharedPreferences,
-  SortOrder,
+  SortOrder
 } from 'sunbird-sdk';
-
-import {
-  Environment,
-  ImpressionType,
-  InteractSubtype,
-  InteractType,
-  PageId,
-  CorReleationDataType
-} from '@app/services/telemetry-constants';
-import {
-  ContentType, ViewMore, MimeType, RouterLinks, ContentFilterConfig,
-  ContentCard, BatchConstants, PreferenceKey
-} from '@app/app/app.constant';
-import { FormAndFrameworkUtilService } from '@app/services/formandframeworkutil.service';
-import { CourseUtilService } from '@app/services/course-util.service';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import { CommonUtilService } from '@app/services/common-util.service';
-import { AppHeaderService } from '@app/services/app-header.service';
 import { EnrollmentDetailsComponent } from '../components/enrollment-details/enrollment-details.component';
-import { AppGlobalService } from '@app/services/app-global-service.service';
-import { LocalCourseService } from '@app/services/local-course.service';
-import { ContentUtil } from '@app/util/content-util';
 
 @Component({
   selector: 'app-view-more-activity',
@@ -75,11 +61,6 @@ export class ViewMoreActivityComponent implements OnInit {
    */
   loadMoreBtn = true;
 
-  /**
-   * Flag to show / hide downloads only button
-   */
-  showDownloadsOnlyToggle = false;
-
   /**
    * value for downloads only toggle button, may have true/false
    */
@@ -92,10 +73,8 @@ export class ViewMoreActivityComponent implements OnInit {
   /**
    * Flag to switch between view-more-card in view
    */
-  localContentsCard = false;
   backButtonFunc: Subscription;
   headerTitle: string;
-  private corRelationList: Array<CorrelationData>;
   pageType = 'library';
   source = '';
   queuedIdentifiers: Array<any> = [];
@@ -106,8 +85,6 @@ export class ViewMoreActivityComponent implements OnInit {
   audience: any;
   defaultImg: string;
   private eventSubscription: Subscription;
-  // adding for ETBV2 integration, to show saved resources after recentlyViewed
-  savedResources: Array<any>;
   enrolledCourses: any;
   guestUser: any;
   userId: any;
@@ -155,16 +132,14 @@ export class ViewMoreActivityComponent implements OnInit {
     private location: Location,
     private platform: Platform,
     private zone: NgZone,
-    private formAndFrameworkUtilService: FormAndFrameworkUtilService,
     private appGlobalService: AppGlobalService,
     private popoverCtrl: PopoverController,
-    private localCourseService: LocalCourseService
+    private navService: NavigationService
   ) {
     this.route.queryParams.subscribe(params => {
       if (this.router.getCurrentNavigation().extras.state) {
         console.log('params from state : ', this.router.getCurrentNavigation().extras.state);
         this.uid = this.router.getCurrentNavigation().extras.state.uid;
-        this.showDownloadsOnlyToggle = this.router.getCurrentNavigation().extras.state.showDownloadOnlyToggle;
         this.title = this.router.getCurrentNavigation().extras.state.headerTitle;
         this.userId = this.router.getCurrentNavigation().extras.state.userId;
         this.pageName = this.router.getCurrentNavigation().extras.state.pageName;
@@ -178,8 +153,6 @@ export class ViewMoreActivityComponent implements OnInit {
         }
 
         if (this.headerTitle !== this.title) {
-          console.log('inside header title if condition');
-          this.headerTitle = this.headerTitle;
           this.offset = 0;
           this.loadMoreBtn = true;
           this.mapper();
@@ -214,16 +187,6 @@ export class ViewMoreActivityComponent implements OnInit {
   }
 
   subscribeUtilityEvents() {
-    this.events.subscribe('savedResources:update', async (res) => {
-      if (res && res.update) {
-        if (this.pageName === ViewMore.PAGE_RESOURCE_SAVED) {
-          this.getLocalContents(false, this.downloadsOnlyToggle, true);
-        } else if (this.pageName === ViewMore.PAGE_RESOURCE_RECENTLY_VIEWED) {
-          await this.getLocalContents(true, this.downloadsOnlyToggle, true);
-        }
-      }
-    });
-
     this.events.subscribe('viewMore:Courseresume', (data) => {
       this.resumeContentData = data.content;
       this.getContentDetails(data.content);
@@ -297,26 +260,17 @@ export class ViewMoreActivityComponent implements OnInit {
       case ViewMore.PAGE_COURSE_ENROLLED:
         this.pageType = 'enrolledCourse';
         this.loadMoreBtn = false;
-        this.localContentsCard = false;
         this.getEnrolledCourse();
         break;
 
       case ViewMore.PAGE_COURSE_POPULAR:
         this.pageType = 'popularCourses';
-        this.localContentsCard = false;
         this.search();
         break;
 
-      case ViewMore.PAGE_RESOURCE_SAVED:
-        this.loadMoreBtn = false;
-        this.localContentsCard = true;
-        this.getLocalContents();
-        break;
-
-      case ViewMore.PAGE_RESOURCE_RECENTLY_VIEWED:
-        this.loadMoreBtn = false;
-        this.localContentsCard = true;
-        await this.getLocalContents(true);
+      case ViewMore.PAGE_TV_PROGRAMS:
+        this.pageType = 'tvPrograms';
+        this.search();
         break;
 
       default:
@@ -333,8 +287,7 @@ export class ViewMoreActivityComponent implements OnInit {
     this.pageType = 'enrolledCourse';
     const option = {
       userId: this.userId,
-      refreshEnrolledCourses: false,
-      returnRefreshedEnrolledCourses: true
+      returnFreshCourses: true
     };
     this.courseService.getEnrolledCourses(option).toPromise()
       .then((data: Course[]) => {
@@ -353,82 +306,6 @@ export class ViewMoreActivityComponent implements OnInit {
       });
   }
 
-  /**
-   * Get local content
-   */
-  async getLocalContents(recentlyViewed?: boolean, downloaded?: boolean, hideLoaderFlag?: boolean) {
-    const loader = await this.commonUtilService.getLoader();
-    if (!hideLoaderFlag) {
-      await loader.present();
-    }
-
-    let contentTypes;
-    if (recentlyViewed) {
-      contentTypes = [];
-    } else {
-      contentTypes = await this.formAndFrameworkUtilService.getSupportedContentFilterConfig(
-        ContentFilterConfig.NAME_LIBRARY);
-    }
-
-    const requestParams: ContentRequest = {
-      uid: this.uid,
-      audience: this.audience,
-      recentlyViewed,
-      localOnly: downloaded,
-      contentTypes,
-      limit: recentlyViewed ? 20 : 0
-    };
-    this.contentService.getContents(requestParams).toPromise()
-      .then(data => {
-        const contentData = [];
-        data.forEach((value) => {
-          value.contentData['lastUpdatedOn'] = value.lastUpdatedTime;
-          if (value.contentData.appIcon) {
-            if (value.contentData.appIcon.includes('http:') || value.contentData.appIcon.includes('https:')) {
-              if (this.commonUtilService.networkInfo.isNetworkAvailable) {
-                value.contentData.appIcon = value.contentData.appIcon;
-              } else {
-                value.contentData.appIcon = this.defaultImg;
-              }
-            } else if (value.basePath) {
-              value.contentData.appIcon = value.basePath + '/' + value.contentData.appIcon;
-            }
-          }
-          contentData.push(value);
-          // if saved resources are available
-        });
-        this.ngZone.run(() => {
-          if ((this.pageName === ViewMore.PAGE_RESOURCE_RECENTLY_VIEWED) && recentlyViewed) {
-            this.searchList = contentData;
-          }
-          //
-          if ((this.pageName === ViewMore.PAGE_RESOURCE_RECENTLY_VIEWED) && !recentlyViewed) {
-            this.savedResources = contentData;
-            for (let i = 0; i < this.searchList.length; i++) {
-              const index = this.savedResources.findIndex((el) => {
-                return el.identifier === this.searchList[i].identifier;
-              });
-
-              if (index !== -1) {
-                this.savedResources.splice(index, 1);
-              }
-            }
-            this.searchList.push(...this.savedResources);
-          }
-          console.log('content data is =>', contentData);
-          if (!hideLoaderFlag) {
-            loader.dismiss();
-          }
-          this.loadMoreBtn = false;
-        });
-      })
-      .catch(async () => {
-        if (!hideLoaderFlag) {
-          await loader.dismiss();
-        }
-      });
-  }
-
   getContentDetails(content) {
     const identifier = content.contentId || content.identifier;
     this.contentService.getContentDetails({ contentId: identifier }).toPromise()
@@ -578,9 +455,6 @@ export class ViewMoreActivityComponent implements OnInit {
     if (!content.isAvailableLocally && !this.commonUtilService.networkInfo.isNetworkAvailable) {
       return false;
     }
-    const identifier = content.contentId || content.identifier;
-    const type = this.telemetryGeneratorService.isCollection(content.mimeType) ? content.contentType : ContentType.RESOURCE;
-    const telemetryObject: TelemetryObject = new TelemetryObject(identifier, type, content.pkgVersion);
 
     const values = new Map();
     values['sectionName'] = this.sectionName;
@@ -589,18 +463,10 @@ export class ViewMoreActivityComponent implements OnInit {
     this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
       InteractSubtype.CONTENT_CLICKED,
       this.env,
-      this.pageName ? this.pageName : this.layoutName,
-      telemetryObject,
+      PageId.VIEW_MORE,
+      ContentUtil.getTelemetryObject(content),
       values);
-    if (content.mimeType === MimeType.COLLECTION) {
-      this.router.navigate([RouterLinks.COLLECTION_DETAIL_ETB], {
-        state: { content }
-      });
-    } else {
-      this.router.navigate([RouterLinks.CONTENT_DETAILS], {
-        state: { content }
-      });
-    }
+    this.navService.navigateToDetailPage(content, { content });
   }
 
   getContentImg(content) {
@@ -646,12 +512,11 @@ export class ViewMoreActivityComponent implements OnInit {
 
   private async navigateToBatchListPopup(content: any, layoutName?: string, retiredBatches?: any, payload?: any) {
     const ongoingBatches = [];
-    const upcommingBatches = [];
     const courseBatchesRequest: CourseBatchesRequest = {
       filters: {
         courseId: layoutName === ContentCard.LAYOUT_INPROGRESS ? content.contentId : content.identifier,
         enrollmentType: CourseEnrollmentType.OPEN,
-        status: [CourseBatchStatus.NOT_STARTED, CourseBatchStatus.IN_PROGRESS]
+        status: [CourseBatchStatus.IN_PROGRESS]
       },
       sort_by: { createdDate: SortOrder.DESC },
       fields: BatchConstants.REQUIRED_FIELDS
@@ -671,8 +536,6 @@ export class ViewMoreActivityComponent implements OnInit {
                 batches.forEach((batch, key) => {
                   if (batch.status === 1) {
                     ongoingBatches.push(batch);
-                  } else {
-                    upcommingBatches.push(batch);
                   }
                 });
                 this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
@@ -685,10 +548,10 @@ export class ViewMoreActivityComponent implements OnInit {
                 const popover = await this.popoverCtrl.create({
                   component: EnrollmentDetailsComponent,
                   componentProps: {
-                    upcommingBatches,
+                    upcommingBatches: [],
                     ongoingBatches,
                     retiredBatches,
-                    courseId: content.identifier
+                    content
                   },
                   cssClass: 'enrollement-popover'
                 });
@@ -719,9 +582,6 @@ export class ViewMoreActivityComponent implements OnInit {
 
   private async navigateToDetailsPage(content: any, layoutName) {
     const identifier = content.contentId || content.identifier;
-    const type = this.telemetryGeneratorService.isCollection(content.mimeType) ? content.contentType : ContentType.COURSE;
-    const telemetryObject: TelemetryObject = new TelemetryObject(identifier, type, content.pkgVersion);
-
     const corRelationList: Array<CorrelationData> = [{
       id: this.sectionName,
       type: CorReleationDataType.SECTION
@@ -738,25 +598,19 @@ export class ViewMoreActivityComponent implements OnInit {
       InteractSubtype.CONTENT_CLICKED,
       this.env,
       PageId.VIEW_MORE,
-      telemetryObject,
+      ContentUtil.getTelemetryObject(content),
       values,
       ContentUtil.generateRollUp(undefined, identifier),
       this.commonUtilService.deDupe(corRelationList, 'type'));
 
     this.zone.run(async () => {
-      if (layoutName === 'enrolledCourse' || content.contentType === ContentType.COURSE) {
-        this.router.navigate([RouterLinks.ENROLLED_COURSE_DETAILS], {
-          state: { content }
-        });
-      } else if (content.mimeType === MimeType.COLLECTION) {
-        this.router.navigate([RouterLinks.COLLECTION_DETAIL_ETB], {
-          state: { content }
-        });
-
+      if (layoutName === 'enrolledCourse') {
+        this.navService.navigateToTrackableCollection({ content });
       } else {
-        this.router.navigate([RouterLinks.CONTENT_DETAILS], {
-          state: { content }
-        });
+        this.navService.navigateToDetailPage(
+          content,
+          { content }
+        );
       }
     });
   }
diff --git a/src/app/view-more-activity/view-more-activity.module.ts b/src/app/view-more-activity/view-more-activity.module.ts
index d9e9c00bc..1b2e1f283 100644
--- a/src/app/view-more-activity/view-more-activity.module.ts
+++ b/src/app/view-more-activity/view-more-activity.module.ts
@@ -5,7 +5,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { RouterModule } from '@angular/router';
 import { IonicModule } from '@ionic/angular';
 import { ComponentsModule } from '../components/components.module';
-import { CommonConsumptionModule } from '@project-sunbird/common-consumption';
+import { CommonConsumptionModule } from '@project-sunbird/common-consumption-v8';
 
 @NgModule({
   declarations: [
diff --git a/src/assets/dummy/allEvidenceList.json b/src/assets/dummy/allEvidenceList.json
new file mode 100644
index 000000000..4bec6bf55
--- /dev/null
+++ b/src/assets/dummy/allEvidenceList.json
@@ -0,0 +1,25 @@
+{
+    "result": true,
+    "data": {
+        "images": [{
+            "filePath": "5f5615e6ff083c29b9153821/4267621e-903e-4934-8ed7-38121a4e3c99/1600762862562.jpg",
+            "url": "https://storage.googleapis.com/download/storage/v1/b/sl-prod-storage/o/5f5615e6ff083c29b9153821%2F4267621e-903e-4934-8ed7-38121a4e3c99%2F1600762862562.jpg?alt=media",
+            "extension": "jpg"
+        }, {
+            "filePath": "5f5615e6ff083c29b9153821/4267621e-903e-4934-8ed7-38121a4e3c99/tmp_2020-8-12-24852719077216280089.jpg",
+            "url": "https://storage.googleapis.com/download/storage/v1/b/sl-prod-storage/o/5f5615e6ff083c29b9153821%2F4267621e-903e-4934-8ed7-38121a4e3c99%2Ftmp_2020-8-12-24852719077216280089.jpg?alt=media",
+            "extension": "jpg"
+        }, {
+            "filePath": "5f5615e6ff083c29b9153821/4267621e-903e-4934-8ed7-38121a4e3c99/tmp_IMG_20200912_1421565733909776634202412.jpg",
+            "url": "https://storage.googleapis.com/download/storage/v1/b/sl-prod-storage/o/5f5615e6ff083c29b9153821%2F4267621e-903e-4934-8ed7-38121a4e3c99%2Ftmp_IMG_20200912_1421565733909776634202412.jpg?alt=media",
+            "extension": "jpg"
+        }, {
+            "filePath": "5f5615e6ff083c29b9153821/4267621e-903e-4934-8ed7-38121a4e3c99/tmp_2020-8-12-18426572216325117430.jpg",
+            "url": "https://storage.googleapis.com/download/storage/v1/b/sl-prod-storage/o/5f5615e6ff083c29b9153821%2F4267621e-903e-4934-8ed7-38121a4e3c99%2Ftmp_2020-8-12-18426572216325117430.jpg?alt=media",
+            "extension": "jpg"
+        }],
+        "videos": [],
+        "documents": [],
+        "remarks": []
+    }
+}
\ No newline at end of file
diff --git a/src/assets/dummy/allStates.json b/src/assets/dummy/allStates.json
new file mode 100644
index 000000000..3365b9e5b
--- /dev/null
+++ b/src/assets/dummy/allStates.json
@@ -0,0 +1,145 @@
+{
+    "message": "Entities fetched successfull",
+    "status": 200,
+    "result": [{
+        "externalId": "AP",
+        "name": "Andhra Pradesh",
+        "_id": "5e26c474410aee393d9e4844"
+    }, {
+        "externalId": "AR",
+        "name": "Arunachal Pradesh",
+        "_id": "5e26c474410aee393d9e4845"
+    }, {
+        "externalId": "AS",
+        "name": "Assam",
+        "_id": "5e26c474410aee393d9e4846"
+    }, {
+        "externalId": "BR",
+        "name": "Bihar",
+        "_id": "5e26c474410aee393d9e4847"
+    }, {
+        "externalId": "CH",
+        "name": "Chandigarh",
+        "_id": "5fcf8318c9e73a3bc93a5d2d"
+    }, {
+        "externalId": "CG",
+        "name": "Chhattisgarh",
+        "_id": "5e26c474410aee393d9e4848"
+    }, {
+        "externalId": "DL",
+        "name": "Delhi",
+        "_id": "5dba74f5ef7a6518ddabbd8c"
+    }, {
+        "externalId": "DDKEF01",
+        "name": "Dummy KEF State",
+        "_id": "5de4c1fb1f6a980ca737c7f5"
+    }, {
+        "externalId": "GA",
+        "name": "Goa",
+        "_id": "5e0b165dc580aa5d1fb86253"
+    }, {
+        "externalId": "GJ",
+        "name": "Gujarat",
+        "_id": "5e26c474410aee393d9e4849"
+    }, {
+        "externalId": "HR",
+        "name": "Haryana",
+        "_id": "5e26c474410aee393d9e484a"
+    }, {
+        "externalId": "HP",
+        "name": "Himachal Pradesh",
+        "_id": "5e26c474410aee393d9e484b"
+    }, {
+        "externalId": "JK",
+        "name": "Jammu and Kashmir",
+        "_id": "5e74f3b7cfa232208c29e10b"
+    }, {
+        "externalId": "JH",
+        "name": "Jharkhand",
+        "_id": "5e26c474410aee393d9e484c"
+    }, {
+        "externalId": "KA",
+        "name": "Karnataka",
+        "_id": "5dca7951a31c183b48ef847c"
+    }, {
+        "externalId": "KL",
+        "name": "Kerala",
+        "_id": "5e26c474410aee393d9e484d"
+    }, {
+        "externalId": "UT-LAD",
+        "name": "Ladakh",
+        "_id": "5f4676bb7cc13e10cd53592e"
+    }, {
+        "externalId": "MP",
+        "name": "Madhya Pradesh",
+        "_id": "5e26c474410aee393d9e484e"
+    }, {
+        "externalId": "MH",
+        "name": "Maharashtra",
+        "_id": "5e26c474410aee393d9e484f"
+    }, {
+        "externalId": "MN",
+        "name": "Manipur",
+        "_id": "5e26c474410aee393d9e4850"
+    }, {
+        "externalId": "ML",
+        "name": "Meghalaya",
+        "_id": "5e26c474410aee393d9e4851"
+    }, {
+        "externalId": "MZ",
+        "name": "Mizoram",
+        "_id": "5e26c474410aee393d9e4852"
+    }, {
+        "externalId": "NEP",
+        "name": "NEPAL",
+        "_id": "5fe05561c007676d1cfa0f3c"
+    }, {
+        "externalId": "NL",
+        "name": "Nagaland",
+        "_id": "5e26c474410aee393d9e4853"
+    }, {
+        "externalId": "OD",
+        "name": "Odisha",
+        "_id": "5e26c474410aee393d9e4854"
+    }, {
+        "externalId": "PDC",
+        "name": "Puducherry",
+        "_id": "5f068f7aa894e17e01225867"
+    }, {
+        "externalId": "PBS",
+        "name": "Punjab",
+        "_id": "5da96a79f91e5f43e4104ec7"
+    }, {
+        "externalId": "RJ",
+        "name": "Rajasthan",
+        "_id": "5de4f9e9bedec30a7bb9671d"
+    }, {
+        "externalId": "SK",
+        "name": "Sikkim",
+        "_id": "5e26c474410aee393d9e4855"
+    }, {
+        "externalId": "TN",
+        "name": "Tamil Nadu",
+        "_id": "5e26c474410aee393d9e4856"
+    }, {
+        "externalId": "TS",
+        "name": "Telangana",
+        "_id": "5e26c474410aee393d9e4859"
+    }, {
+        "externalId": "TR",
+        "name": "Tripura",
+        "_id": "5e26c474410aee393d9e4857"
+    }, {
+        "externalId": "UP",
+        "name": "Uttar Pradesh",
+        "_id": "5e26c474410aee393d9e485a"
+    }, {
+        "externalId": "UKD",
+        "name": "Uttarakhand",
+        "_id": "5dedb487ae9bc541052b4c69"
+    }, {
+        "externalId": "WB",
+        "name": "West Bengal",
+        "_id": "5e26c474410aee393d9e4858"
+    }]
+}
\ No newline at end of file
diff --git a/src/assets/dummy/criteriaReport.json b/src/assets/dummy/criteriaReport.json
new file mode 100644
index 000000000..42d6d53c8
--- /dev/null
+++ b/src/assets/dummy/criteriaReport.json
@@ -0,0 +1,709 @@
+{
+    "entityName": "28170300402-MPPS PULIPADU_SC",
+    "observationName": "School safety checklist -Officials",
+    "observationId": "5f990e16be0e60389529e33a",
+    "entityType": "school",
+    "entityId": "5e6b4ffd135b2d734252d21f",
+    "districtName": "GUNTUR",
+    "response": [{
+        "criteriaId": "5d70f93a7afa105d7d66d91f",
+        "criteriaName": "Observation",
+        "questionArray": [{
+            "order": "462A01",
+            "question": "Let's start capturing your observation notes",
+            "responseType": "matrix",
+            "answers": [],
+            "chart": {},
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A02",
+            "question": "Name",
+            "responseType": "text",
+            "answers": ["test"],
+            "chart": {},
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A03",
+            "question": "Designation",
+            "responseType": "text",
+            "answers": ["abc"],
+            "chart": {},
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A04",
+            "question": "Date of visit",
+            "responseType": "date",
+            "answers": ["21 Dec 2020, 9:14:16 AM"],
+            "chart": {},
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A05",
+            "question": "School ID",
+            "responseType": "number",
+            "answers": ["2"],
+            "chart": {},
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A06",
+            "question": "Zone",
+            "responseType": "text",
+            "answers": ["test"],
+            "chart": {},
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A07",
+            "question": "HoS Name",
+            "responseType": "text",
+            "answers": ["test"],
+            "chart": {},
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A08",
+            "question": "HoS contact number",
+            "responseType": "number",
+            "answers": ["2"],
+            "chart": {},
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A09",
+            "question": "Are there any open drains, potholes/ pits inside or outside the school?",
+            "responseType": "radio",
+            "answers": ["Yes"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "Yes",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A10",
+            "question": "Can the entrance to school be monitored from the principal’s office?",
+            "responseType": "radio",
+            "answers": ["No"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "No",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A11",
+            "question": "Can visitors walk in directly into the school without supervision?",
+            "responseType": "radio",
+            "answers": ["Partially"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "Partially",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A12",
+            "question": "Are important phone numbers displayed?",
+            "responseType": "multiselect",
+            "answers": [
+                ["Child Line"]
+            ],
+            "chart": {
+                "type": "bar",
+                "data": [{
+                    "data": [100]
+                }],
+                "xAxis": {
+                    "categories": ["Child Line"],
+                    "title": {
+                        "text": "Responses"
+                    }
+                },
+                "yAxis": {
+                    "min": 0,
+                    "max": 100,
+                    "title": {
+                        "text": "Responses in percentage"
+                    }
+                }
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A13",
+            "question": "Are nursery classes (if applicable) situated on the ground floor?",
+            "responseType": "radio",
+            "answers": ["No"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "No",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A14",
+            "question": "Is the drinking water area clean?",
+            "responseType": "radio",
+            "answers": ["No"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "No",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A15",
+            "question": "Does the school have filtered drinking water facility?",
+            "responseType": "radio",
+            "answers": ["Partially"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "Partially",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A16",
+            "question": "Is the water tank clean? Ensure it does not  have mud, algae , dead insects.",
+            "responseType": "radio",
+            "answers": ["No"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "No",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A17",
+            "question": "Are the toilets clean overall?",
+            "responseType": "radio",
+            "answers": ["No"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "No",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A18",
+            "question": "Is there a soap/ hand-wash in the toilet?",
+            "responseType": "radio",
+            "answers": ["Partially"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "Partially",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A19",
+            "question": "Is there running water supply in the toilet?",
+            "responseType": "radio",
+            "answers": ["Partially"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "Partially",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A20",
+            "question": "Are the cisterns/flush functional?",
+            "responseType": "radio",
+            "answers": ["Partially"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "Partially",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A21",
+            "question": "Is the first-aid box fully equipped? (Check expiry date)",
+            "responseType": "radio",
+            "answers": ["No"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "No",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A22",
+            "question": "Does the school have a designated vehicle for emergency situations?",
+            "responseType": "radio",
+            "answers": ["Partially"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "Partially",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A23",
+            "question": "Are the corners of corridors and walls clean?",
+            "responseType": "radio",
+            "answers": ["No"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "No",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A24",
+            "question": "Are there abandoned objects lying in any corner of the school?",
+            "responseType": "radio",
+            "answers": ["Partially"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "Partially",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A25",
+            "question": "Does the MCD pick up garbage from school everyday?",
+            "responseType": "radio",
+            "answers": ["No"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "No",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A26",
+            "question": "Do you see students fighting or misbehaving during lunch break?",
+            "responseType": "radio",
+            "answers": ["No"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "No",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A27",
+            "question": "What do teachers do when such things happen?",
+            "responseType": "multiselect",
+            "answers": [
+                ["Talk to students fighting"]
+            ],
+            "chart": {
+                "type": "bar",
+                "data": [{
+                    "data": [100]
+                }],
+                "xAxis": {
+                    "categories": ["Talk to students fighting"],
+                    "title": {
+                        "text": "Responses"
+                    }
+                },
+                "yAxis": {
+                    "min": 0,
+                    "max": 100,
+                    "title": {
+                        "text": "Responses in percentage"
+                    }
+                }
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A28",
+            "question": "Do some students bully others in school?",
+            "responseType": "radio",
+            "answers": ["Partially"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "Partially",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A29",
+            "question": "What kinds of punishments are given to children who misbehave / don’t do homework etc?",
+            "responseType": "multiselect",
+            "answers": [
+                ["Standing inside/outside class"]
+            ],
+            "chart": {
+                "type": "bar",
+                "data": [{
+                    "data": [100]
+                }],
+                "xAxis": {
+                    "categories": ["Standing inside/outside class"],
+                    "title": {
+                        "text": "Responses"
+                    }
+                },
+                "yAxis": {
+                    "min": 0,
+                    "max": 100,
+                    "title": {
+                        "text": "Responses in percentage"
+                    }
+                }
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A30",
+            "question": "What happens when a child is hurt?",
+            "responseType": "multiselect",
+            "answers": [
+                ["Sent home/parents called"]
+            ],
+            "chart": {
+                "type": "bar",
+                "data": [{
+                    "data": [100]
+                }],
+                "xAxis": {
+                    "categories": ["Sent home/parents called"],
+                    "title": {
+                        "text": "Responses"
+                    }
+                },
+                "yAxis": {
+                    "min": 0,
+                    "max": 100,
+                    "title": {
+                        "text": "Responses in percentage"
+                    }
+                }
+            },
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A31",
+            "question": "Call 5 students of class 3/4/5 (randomly). Ask them to read a text from their Hindi books and record the count of students who could read it.",
+            "responseType": "number",
+            "answers": ["2"],
+            "chart": {},
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }, {
+            "order": "462A32",
+            "question": "Please record your overall comments on the state of the following in the school: \n1. Corporal punishment \n2. Bullying \n3. Reading level in school",
+            "responseType": "text",
+            "answers": ["T"],
+            "chart": {},
+            "instanceQuestions": [],
+            "criteriaName": "Observation",
+            "criteriaId": "5d70f93a7afa105d7d66d91f"
+        }]
+    }],
+    "allCriterias": [{
+        "criteriaId": "5d70f93a7afa105d7d66d91f",
+        "criteriaName": "Observation"
+    }]
+}
\ No newline at end of file
diff --git a/src/assets/dummy/entity.json b/src/assets/dummy/entity.json
new file mode 100644
index 000000000..f725d985b
--- /dev/null
+++ b/src/assets/dummy/entity.json
@@ -0,0 +1,408 @@
+{
+    "message": "Entities fetched successfull",
+    "status": 200,
+    "result": [{
+        "data": [{
+            "_id": "5bfe53ea1d0c350d61b78d0a",
+            "name": "Sachdeva Convent School, Street No.-5 Sangam Vihar (Wazirabad - Jagatpur Road), Delhi, North, 1207229",
+            "externalId": "1207229",
+            "addressLine1": "Street No.-5 Sangam Vihar (Wazirabad - Jagatpur Road)",
+            "addressLine2": "",
+            "districtName": "North",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d0b",
+            "name": "SMS Public School, A/61 Kh. 13/1, 13/2 near Peeli Kothi Nathupura Delhi, North, 1207235",
+            "externalId": "1207235",
+            "addressLine1": "A/61 Kh. 13/1, 13/2 near Peeli Kothi Nathupura",
+            "addressLine2": "",
+            "districtName": "North",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d0c",
+            "name": "Divyansh Public School, Kh.No.28/20 & 29/16/02 Sangam Vihar, Burari, Delhi, North, 1207250",
+            "externalId": "1207250",
+            "addressLine1": "Kh.No.28/20 & 29/16/02 Sangam Vihar, Burari",
+            "addressLine2": "",
+            "districtName": "North",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d0d",
+            "name": "United English Medium School, 17-A, Raj Niwas Marg, Delhi, North, 1207253",
+            "externalId": "1207253",
+            "addressLine1": "17-A, Raj Niwas Marg,",
+            "addressLine2": "",
+            "districtName": "North",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d0e",
+            "name": "A.P.J. International school, Main Jagatpur Road, Wazirabad, Delhi, North, 1207254",
+            "externalId": "1207254",
+            "addressLine1": "Main Jagatpur Road, Wazirabad",
+            "addressLine2": "",
+            "districtName": "North",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d0f",
+            "name": "Shri Shiv Middle School, Shiv Kutti, Teliwara, Delhi, North, 1208138",
+            "externalId": "1208138",
+            "addressLine1": "Shiv Kutti, Teliwara",
+            "addressLine2": "",
+            "districtName": "North",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d10",
+            "name": "B.C.C Modern Public School, 467/C-1 Fly Over Ring Road Azadpur Vill Delhi, North West, 1309169",
+            "externalId": "1309169",
+            "addressLine1": "467/C-1 Fly Over Ring Road Azadpur Vill",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d11",
+            "name": "Sant Gyaneshwar Public School, 8, Khampur, Delhi, North West, 1309230",
+            "externalId": "1309230",
+            "addressLine1": "8, Khampur,",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d12",
+            "name": "Tagore Modern Public School, BN(West ) ShalimarBagh, Delhi, North West, 1309236",
+            "externalId": "1309236",
+            "addressLine1": "BN(West ) ShalimarBagh",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d13",
+            "name": "Mata Ram Rakhi Sanatan Dharam Saraswati Bal Mandir, Mehendra Enclave, Gujranwala Town, Delhi, North West, 1309240",
+            "externalId": "1309240",
+            "addressLine1": "Mehendra Enclave, Gujranwala Town",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d14",
+            "name": "Silver Oak Public School, A-1 Swaroop Nagar, G.T.Karnal Road, Delhi, North West, 1309249",
+            "externalId": "1309249",
+            "addressLine1": "A-1 Swaroop Nagar, G.T.Karnal Road,",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d15",
+            "name": "KAMS Convent School, 122 Main Road, Kushak, No. 2, Delhi, North West, 1309282",
+            "externalId": "1309282",
+            "addressLine1": "122 Main Road, Kushak, No. 2",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d16",
+            "name": "Rao Mehar Chand Saraswati Vidya Mandir, Guru Nanak Nagar, Burari Road, Bhalaswa Dairy, Delhi, North West, 1309284",
+            "externalId": "1309284",
+            "addressLine1": "Guru Nanak Nagar, Burari Road, Bhalaswa Dairy",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d17",
+            "name": "Navjeevan Convent School, G-Block, Shradha Nand Colony, Bhalaswa Dairy, Delhi, North West, 1309285",
+            "externalId": "1309285",
+            "addressLine1": "Shradha Nand Colony, Bhalaswa Dairy,",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d18",
+            "name": "Rose Valley Public School, Main Rd, Near Balaji Mandir, Palla, Delhi, North West, 1309290",
+            "externalId": "1309290",
+            "addressLine1": "Main Rd, Near Balaji Mandir, Palla,",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d19",
+            "name": "S S International School, Kh No. 489 & 500, Vill Hiranki, Delhi, North West, 1309291",
+            "externalId": "1309291",
+            "addressLine1": "Kh No. 489 & 500, Vill Hiranki",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d1a",
+            "name": "Devraj Narayan Public School, Plot No.12, E-Block, Swami Shradha Nand Colony, Bhalswa Dairy, Delhi, North West, 1309293",
+            "externalId": "1309293",
+            "addressLine1": "Plot No.12, E-Block, Swami Shradha Nand Colony, Bhalswa Dairy",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d1b",
+            "name": "Savanu International School, Mukhmelpur Road, Zind Pur, Delhi, North West, 1309298",
+            "externalId": "1309298",
+            "addressLine1": "Mukhmelpur Road, Zind Pur",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d1c",
+            "name": "Shanti Vidya Mandir, Rajeev Nagar, Bhalswa Dairy, Behind MCD Primary School, Delhi, North West, 1309299",
+            "externalId": "1309299",
+            "addressLine1": "Rajeev Nagar, Bhalswa Dairy, Behind MCD Primary Schoo",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d1d",
+            "name": "Chaudhari Chhoturam Memorial Public School, Bhagat Singh Park, Delhi, North West, 1310248",
+            "externalId": "1310248",
+            "addressLine1": "Bhagat Singh Park",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d1e",
+            "name": "Maharishi Dayanand Public School, Ishwar Colony, Bawana, Delhi, North West, 1310266",
+            "externalId": "1310266",
+            "addressLine1": "Ishwar Colony, Bawana",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d1f",
+            "name": "Roop Krishna Public School, C- Block Shabad Dairy Delhi, North West, 1310268",
+            "externalId": "1310268",
+            "addressLine1": "C- Block Shabad Dairy",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d20",
+            "name": "Junior Model School, C-13 Suraj Park Badli , Delhi, North West, 1310274",
+            "externalId": "1310274",
+            "addressLine1": "C-13 Suraj Park Badli",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d21",
+            "name": "Orion Convent School, Shahbad Daulat Pur , Delhi, North West, 1310275",
+            "externalId": "1310275",
+            "addressLine1": "Shahbad Daulat Pur",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d22",
+            "name": "Rana Model School, New Sannoth Colony, Ghoga Mor, Delhi, North West, 1310286",
+            "externalId": "1310286",
+            "addressLine1": "New Sannoth Colony, Ghoga Mor",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d23",
+            "name": "DAV Public School, Ishwar Colony, Bawana, Delhi, North West, 1310423",
+            "externalId": "1310423",
+            "addressLine1": "Ishwar Colony, Bawana",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d24",
+            "name": "Mansa Vidhya Peeth, Village Bhor Garh Narela Delhi, North West, 1310432",
+            "externalId": "1310432",
+            "addressLine1": "Village Bhor Garh Narela",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d25",
+            "name": "Summerdales Public School, St. No-27 Swantantra Nagar, Narela, Delhi, North West, 1310433",
+            "externalId": "1310433",
+            "addressLine1": "St. No-27 Swantantra Nagar, Narela",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d26",
+            "name": "Herald Public School, Lampur Road, New Basti, Bankner, Delhi, North West, 1310434",
+            "externalId": "1310434",
+            "addressLine1": "Lampur Road, New Basti, Bankne",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d27",
+            "name": "Angiras Bharti Public School, Lampur Road Bakner Delhi, North West, 1310435",
+            "externalId": "1310435",
+            "addressLine1": "Lampur Road Bakner",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d28",
+            "name": "RAMA DEVI PUBLIC SCHOOL, Kh. No.134, Dariya Pur Road, Ghoga, Delhi, North West, 1310436",
+            "externalId": "1310436",
+            "addressLine1": "Kh. No.134, Dariya Pur Road, Ghoga,",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d29",
+            "name": "Apolo Convent School, Holambi Kalan, Delhi, North West, 1310438",
+            "externalId": "1310438",
+            "addressLine1": "Holambi Kalan",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d2a",
+            "name": "St.Ramjas Convent School, Plot No.342, Vill Bhalswa, Delhi, North West, 1310442",
+            "externalId": "1310442",
+            "addressLine1": "Plot No.342, Vill Bhalswa",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d2b",
+            "name": "Rising Era Convent School, Kh.No. 96, Naya Bans, Vill. Khera Khurd, Delhi, North West, 1310449",
+            "externalId": "1310449",
+            "addressLine1": "Kh.No. 96, Naya Bans, Vill. Khera Khurd,",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d2c",
+            "name": "Happy Child Modern Public School, Kh. No.63/19, Siraspur Road, Khera Garhi, Delhi, North West, 1310451",
+            "externalId": "1310451",
+            "addressLine1": "Kh. No.63/19, Siraspur Road, Khera Garhi,",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d2d",
+            "name": "White Leaf Public School, Plot No.80, Gali No-23, Pooth Khurd, Delhi, North West, 1310452",
+            "externalId": "1310452",
+            "addressLine1": "Plot No.80, Gali No-23, Pooth Khurd",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d2e",
+            "name": "Jai Hind International School, 48/20, Krishna Nagar Colony, Singhu Border Road, Narela, Delhi, North West, 1310454",
+            "externalId": "1310454",
+            "addressLine1": "48/20, Krishna Nagar Colony, Singhu Border Road, Narela",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d2f",
+            "name": "Gyanodaya Model Public School, Alipur, Delhi, North West, 1310455",
+            "externalId": "1310455",
+            "addressLine1": "Alipur",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d30",
+            "name": "New Ways Concept School, Plot No.-4, Behind CNG Station, Sect. B-2, Narela, Delhi, North West, 1310456",
+            "externalId": "1310456",
+            "addressLine1": "Plot No.-4, Behind CNG Station, Sect. B-2, Narela,",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d31",
+            "name": "GR International School, 154/423, V & PO Pooth Khurd, Delhi, North West, 1310459",
+            "externalId": "1310459",
+            "addressLine1": "154/423, V & PO Pooth Khurd",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d32",
+            "name": "Spring Field School, F D-Block Pitam Pura Delhi, North West, 1411188",
+            "externalId": "1411188",
+            "addressLine1": "F D-Block Pitam Pura",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d33",
+            "name": "Mother Land Public School, CU-Block Pitam Pura Delhi, North West, 1411197",
+            "externalId": "1411197",
+            "addressLine1": "CU-Block Pitam Pura",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d34",
+            "name": "Bloom Era Public School, 285/23 Onkar Nagar B-Blk Tri Nagar Delhi, North West, 1411199",
+            "externalId": "1411199",
+            "addressLine1": "285/23 Onkar Nagar B-Blk Tri Nagar",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d35",
+            "name": "Mahavira International School, 1149 Deva Ram Park Tri Nagar Delhi, North West, 1411201",
+            "externalId": "1411201",
+            "addressLine1": "1149 Deva Ram Park Tri Nagar",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d36",
+            "name": "Sant Namdev Public School, M.G. Enclave Pirampura Delhi, North West, 1411203",
+            "externalId": "1411203",
+            "addressLine1": "M.G. Enclave Pirampura",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d37",
+            "name": "St. Micheal Academy, F 242, RISHI NAGAR, RANI BAGH, Delhi, North West, 1411230",
+            "externalId": "1411230",
+            "addressLine1": "RISHI NAGAR, RANI BAGH,",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d38",
+            "name": "J.N.Modern Public School, 1220 Rani Bagh Delhi, North West, 1411241",
+            "externalId": "1411241",
+            "addressLine1": "1220 Rani Bagh",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d39",
+            "name": "Himalaya Foundation School, NS 26, behind JP Block Market, Maurya Enclave, Pitampura, Delhi, North West, 1411256",
+            "externalId": "1411256",
+            "addressLine1": "NS 26, behind JP Block Market, Maurya Enclave, Pitampura",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d3a",
+            "name": "Sun Smile Public School, A1/155 Aman Vihar New Delhi, North West, 1412137",
+            "externalId": "1412137",
+            "addressLine1": "A1/155 Aman Vihar",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }, {
+            "_id": "5bfe53ea1d0c350d61b78d3b",
+            "name": "R.K.Memorial Public School, Karan Vihar Delhi, North West, 1412150",
+            "externalId": "1412150",
+            "addressLine1": "Karan Vihar",
+            "addressLine2": "",
+            "districtName": "North West",
+            "selected": false
+        }],
+        "count": 6219
+    }]
+}
\ No newline at end of file
diff --git a/src/assets/dummy/obsAssessmentDetails.json b/src/assets/dummy/obsAssessmentDetails.json
new file mode 100644
index 000000000..f670723eb
--- /dev/null
+++ b/src/assets/dummy/obsAssessmentDetails.json
@@ -0,0 +1,1298 @@
+{
+    "message": "Assessment fetched successfully",
+    "status": 200,
+    "result": {
+        "entityProfile": {
+            "_id": "5e26c474410aee393d9e4845",
+            "entityTypeId": "5d7a290e6371783ceb11064c",
+            "entityType": "state"
+        },
+        "solution": {
+            "_id": "5f636fb0962d59425d855a1e",
+            "externalId": "be16debe-a72c-11ea-a92c-42010aa00002-1600352176727",
+            "name": "APSWREIS_School Leader NA Form",
+            "description": "APSWREIS_School Leader NA Form",
+            "registry": [],
+            "captureGpsLocationAtQuestionLevel": false,
+            "enableQuestionReadOut": false,
+            "scoringSystem": null,
+            "isRubricDriven": false
+        },
+        "program": {
+            "_id": "5f636fb0962d59425d855a1d",
+            "isAPrivateProgram": true,
+            "externalId": "Testing-1600352176701",
+            "name": "Testing",
+            "description": "APSWREIS_School Leader NA Form",
+            "imageCompression": {
+                "quality": 10
+            }
+        },
+        "assessment": {
+            "name": "APSWREIS_School Leader NA Form",
+            "description": "APSWREIS_School Leader NA Form",
+            "externalId": "be16debe-a72c-11ea-a92c-42010aa00002-1600352176727",
+            "submissionId": "5f63a80b6f817142413a0479",
+            "evidences": [{
+                "code": "OB",
+                "sections": [{
+                    "code": "S1",
+                    "questions": [{
+                        "_id": "",
+                        "question": "",
+                        "isCompleted": "",
+                        "showRemarks": "",
+                        "options": "",
+                        "sliderOptions": "",
+                        "children": "",
+                        "questionGroup": "",
+                        "fileName": "",
+                        "instanceQuestions": "",
+                        "isAGeneralQuestion": "",
+                        "autoCapture": "",
+                        "allowAudioRecording": "",
+                        "prefillFromEntityProfile": "",
+                        "entityFieldName": "",
+                        "isEditable": "",
+                        "deleted": "",
+                        "remarks": "",
+                        "value": "",
+                        "usedForScoring": "",
+                        "questionType": "",
+                        "canBeNotApplicable": "",
+                        "visibleIf": "",
+                        "validation": "",
+                        "externalId": "",
+                        "tip": "",
+                        "hint": "",
+                        "responseType": "pageQuestions",
+                        "modeOfCollection": "",
+                        "accessibility": "",
+                        "rubricLevel": "",
+                        "sectionHeader": "",
+                        "page": "p1",
+                        "questionNumber": "",
+                        "updatedAt": "",
+                        "createdAt": "",
+                        "__v": "",
+                        "evidenceMethod": "",
+                        "payload": "",
+                        "startTime": "",
+                        "endTime": "",
+                        "gpsLocation": "",
+                        "file": "",
+                        "pageQuestions": [{
+                            "_id": "5eda424f4f4da809a2a27ee9",
+                            "question": ["How long have you been part of the school as a school leader?", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [{
+                                "value": "R1",
+                                "label": "3-6 years"
+                            }, {
+                                "value": "R2",
+                                "label": "6-9 years"
+                            }, {
+                                "value": "R3",
+                                "label": "9-12 years"
+                            }, {
+                                "value": "R4",
+                                "label": "12-15 years"
+                            }, {
+                                "value": "R5",
+                                "label": "15+ years"
+                            }],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "SLNA_Q1_1591362100037",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "radio",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p1",
+                            "questionNumber": "1",
+                            "updatedAt": "2020-06-05T13:02:07.064Z",
+                            "createdAt": "2020-06-05T13:02:07.064Z",
+                            "__v": 0,
+                            "evidenceMethod": "OB",
+                            "payload": {
+                                "criteriaId": "5eda42474f4da809a2a27ee5",
+                                "responseType": "radio",
+                                "evidenceMethod": "OB",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5eda424f4f4da809a2a27eea",
+                            "question": ["Which of these activities do you usually engage in at school?", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [{
+                                "value": "R1",
+                                "label": "Observe classroom teaching and provide feedback/coaching  to teachers"
+                            }, {
+                                "value": "R2",
+                                "label": "Help teachers and peers in planning and prioritising tasks"
+                            }, {
+                                "value": "R3",
+                                "label": "Maintenance and utilisation of resources like library, toilets etc."
+                            }, {
+                                "value": "R4",
+                                "label": "Organise Parent Teacher Meetings"
+                            }, {
+                                "value": "R5",
+                                "label": "Plan and organise activities/events for students like fairs, morning assemblies, games and sports etc."
+                            }, {
+                                "value": "R6",
+                                "label": "Usage of teacher and student data to plan improvement in the school"
+                            }, {
+                                "value": "R7",
+                                "label": "Partner with other schools or organisations to organise events, share ideas, etc"
+                            }, {
+                                "value": "R8",
+                                "label": "Others"
+                            }],
+                            "sliderOptions": [],
+                            "children": ["5eda424f4f4da809a2a27eeb"],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "SLNA_Q2_1591362100037",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "multiselect",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p1",
+                            "questionNumber": "2",
+                            "updatedAt": "2020-06-05T13:02:07.099Z",
+                            "createdAt": "2020-06-05T13:02:07.081Z",
+                            "__v": 0,
+                            "evidenceMethod": "OB",
+                            "payload": {
+                                "criteriaId": "5eda42474f4da809a2a27ee6",
+                                "responseType": "multiselect",
+                                "evidenceMethod": "OB",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5eda424f4f4da809a2a27eeb",
+                            "question": ["If others, please mention below", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": [{
+                                "operator": "===",
+                                "value": "R8",
+                                "_id": "5eda424f4f4da809a2a27eea"
+                            }],
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "SLNA_Q3_1591362100037",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "text",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p1",
+                            "questionNumber": "2.1",
+                            "updatedAt": "2020-06-05T13:02:07.096Z",
+                            "createdAt": "2020-06-05T13:02:07.096Z",
+                            "__v": 0,
+                            "evidenceMethod": "OB",
+                            "payload": {
+                                "criteriaId": "5eda42474f4da809a2a27ee6",
+                                "responseType": "text",
+                                "evidenceMethod": "OB",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5eda424f4f4da809a2a27eec",
+                            "question": ["For what reasons do teachers usually approach you?", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [{
+                                "value": "R1",
+                                "label": "For guidance in classroom teaching"
+                            }, {
+                                "value": "R2",
+                                "label": "For managing students"
+                            }, {
+                                "value": "R3",
+                                "label": "For planning and organising school events like PTMs, Annual Days, fairs etc"
+                            }, {
+                                "value": "R4",
+                                "label": "For addressing their challenges and concerns"
+                            }, {
+                                "value": "R5",
+                                "label": "For clarifying HR processes like exit leave, salary, etc."
+                            }, {
+                                "value": "R6",
+                                "label": "For helping with personal issues"
+                            }, {
+                                "value": "R7",
+                                "label": "Others"
+                            }],
+                            "sliderOptions": [],
+                            "children": ["5eda424f4f4da809a2a27eed"],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "SLNA_Q4_1591362100037",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "multiselect",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p1",
+                            "questionNumber": "3",
+                            "updatedAt": "2020-06-05T13:02:07.125Z",
+                            "createdAt": "2020-06-05T13:02:07.111Z",
+                            "__v": 0,
+                            "evidenceMethod": "OB",
+                            "payload": {
+                                "criteriaId": "5eda42474f4da809a2a27ee6",
+                                "responseType": "multiselect",
+                                "evidenceMethod": "OB",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5eda424f4f4da809a2a27eed",
+                            "question": ["If others, please mention below", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": [{
+                                "operator": "===",
+                                "value": "R7",
+                                "_id": "5eda424f4f4da809a2a27eec"
+                            }],
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "SLNA_Q5_1591362100037",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "text",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p1",
+                            "questionNumber": "3.1",
+                            "updatedAt": "2020-06-05T13:02:07.122Z",
+                            "createdAt": "2020-06-05T13:02:07.122Z",
+                            "__v": 0,
+                            "evidenceMethod": "OB",
+                            "payload": {
+                                "criteriaId": "5eda42474f4da809a2a27ee6",
+                                "responseType": "text",
+                                "evidenceMethod": "OB",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5eda424f4f4da809a2a27eee",
+                            "question": ["What are some challenges you face in the school as a school leader?", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [{
+                                "value": "R1",
+                                "label": "Lack of support"
+                            }, {
+                                "value": "R2",
+                                "label": "Lack of time and resources"
+                            }, {
+                                "value": "R3",
+                                "label": "Lack of additional support staff"
+                            }, {
+                                "value": "R4",
+                                "label": "Difficulty in planning"
+                            }, {
+                                "value": "R5",
+                                "label": "Lack of motivation and cooperation among teachers"
+                            }, {
+                                "value": "R6",
+                                "label": "Lack of parent engagement"
+                            }, {
+                                "value": "R7",
+                                "label": "Lack of motivation in students"
+                            }, {
+                                "value": "R8",
+                                "label": "Others"
+                            }],
+                            "sliderOptions": [],
+                            "children": ["5eda424f4f4da809a2a27eef"],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "SLNA_Q6_1591362100037",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "multiselect",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p1",
+                            "questionNumber": "4",
+                            "updatedAt": "2020-06-05T13:02:07.153Z",
+                            "createdAt": "2020-06-05T13:02:07.142Z",
+                            "__v": 0,
+                            "evidenceMethod": "OB",
+                            "payload": {
+                                "criteriaId": "5eda42474f4da809a2a27ee6",
+                                "responseType": "multiselect",
+                                "evidenceMethod": "OB",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5eda424f4f4da809a2a27eef",
+                            "question": ["If others, please mention below", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": [{
+                                "operator": "===",
+                                "value": "R8",
+                                "_id": "5eda424f4f4da809a2a27eee"
+                            }],
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "SLNA_Q7_1591362100037",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "text",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p1",
+                            "questionNumber": "4.1",
+                            "updatedAt": "2020-06-05T13:02:07.151Z",
+                            "createdAt": "2020-06-05T13:02:07.151Z",
+                            "__v": 0,
+                            "evidenceMethod": "OB",
+                            "payload": {
+                                "criteriaId": "5eda42474f4da809a2a27ee6",
+                                "responseType": "text",
+                                "evidenceMethod": "OB",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5eda424f4f4da809a2a27ef0",
+                            "question": ["Who do you go to for support when facing such challenges?", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [{
+                                "value": "R1",
+                                "label": "District Coordinator (DCO)"
+                            }, {
+                                "value": "R2",
+                                "label": "Vice-principal"
+                            }, {
+                                "value": "R3",
+                                "label": "Teachers"
+                            }, {
+                                "value": "R4",
+                                "label": "Other school leaders"
+                            }, {
+                                "value": "R5",
+                                "label": "None"
+                            }, {
+                                "value": "R6",
+                                "label": "Others"
+                            }],
+                            "sliderOptions": [],
+                            "children": ["5eda424f4f4da809a2a27ef1"],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "SLNA_Q8_1591362100037",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "multiselect",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p1",
+                            "questionNumber": "5",
+                            "updatedAt": "2020-06-05T13:02:07.180Z",
+                            "createdAt": "2020-06-05T13:02:07.167Z",
+                            "__v": 0,
+                            "evidenceMethod": "OB",
+                            "payload": {
+                                "criteriaId": "5eda42474f4da809a2a27ee6",
+                                "responseType": "multiselect",
+                                "evidenceMethod": "OB",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5eda424f4f4da809a2a27ef1",
+                            "question": ["If others, please mention below", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": [{
+                                "operator": "===",
+                                "value": "R6",
+                                "_id": "5eda424f4f4da809a2a27ef0"
+                            }],
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "SLNA_Q9_1591362100037",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "text",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p1",
+                            "questionNumber": "5.1",
+                            "updatedAt": "2020-06-05T13:02:07.178Z",
+                            "createdAt": "2020-06-05T13:02:07.178Z",
+                            "__v": 0,
+                            "evidenceMethod": "OB",
+                            "payload": {
+                                "criteriaId": "5eda42474f4da809a2a27ee6",
+                                "responseType": "text",
+                                "evidenceMethod": "OB",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }]
+                    }, {
+                        "_id": "",
+                        "question": "",
+                        "isCompleted": "",
+                        "showRemarks": "",
+                        "options": "",
+                        "sliderOptions": "",
+                        "children": "",
+                        "questionGroup": "",
+                        "fileName": "",
+                        "instanceQuestions": "",
+                        "isAGeneralQuestion": "",
+                        "autoCapture": "",
+                        "allowAudioRecording": "",
+                        "prefillFromEntityProfile": "",
+                        "entityFieldName": "",
+                        "isEditable": "",
+                        "deleted": "",
+                        "remarks": "",
+                        "value": "",
+                        "usedForScoring": "",
+                        "questionType": "",
+                        "canBeNotApplicable": "",
+                        "visibleIf": "",
+                        "validation": "",
+                        "externalId": "",
+                        "tip": "",
+                        "hint": "",
+                        "responseType": "pageQuestions",
+                        "modeOfCollection": "",
+                        "accessibility": "",
+                        "rubricLevel": "",
+                        "sectionHeader": "",
+                        "page": "p2",
+                        "questionNumber": "",
+                        "updatedAt": "",
+                        "createdAt": "",
+                        "__v": "",
+                        "evidenceMethod": "",
+                        "payload": "",
+                        "startTime": "",
+                        "endTime": "",
+                        "gpsLocation": "",
+                        "file": "",
+                        "pageQuestions": [{
+                            "_id": "5eda424f4f4da809a2a27ef2",
+                            "question": ["Select the top 4 topics that you want to learn more about as a leader", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [{
+                                "value": "R1",
+                                "label": "How do I mentor/ coach teachers and other staff members?"
+                            }, {
+                                "value": "R2",
+                                "label": "How do I use data to plan improvements for school?"
+                            }, {
+                                "value": "R3",
+                                "label": "How do I plan and prioritise my tasks?"
+                            }, {
+                                "value": "R4",
+                                "label": "How do I motivate parents to take part in school development?"
+                            }, {
+                                "value": "R5",
+                                "label": "How do I plan capacity building for myself and teachers?"
+                            }, {
+                                "value": "R6",
+                                "label": "How do I collaborate with other schools or external organisations for school development?"
+                            }, {
+                                "value": "R7",
+                                "label": "How I do maintain and utilise school resources and infrastructure effectively?"
+                            }, {
+                                "value": "R8",
+                                "label": "How do I remotely support teachers and parents during CoVid '19?"
+                            }],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "SLNA_Q10_1591362100037",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "multiselect",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p2",
+                            "questionNumber": "6",
+                            "updatedAt": "2020-06-05T13:02:07.191Z",
+                            "createdAt": "2020-06-05T13:02:07.191Z",
+                            "__v": 0,
+                            "evidenceMethod": "OB",
+                            "payload": {
+                                "criteriaId": "5eda42474f4da809a2a27ee7",
+                                "responseType": "multiselect",
+                                "evidenceMethod": "OB",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5eda424f4f4da809a2a27ef3",
+                            "question": ["Session on time/ stress management", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [{
+                                "value": "R1",
+                                "label": "Not required"
+                            }, {
+                                "value": "R2",
+                                "label": "Not very important"
+                            }, {
+                                "value": "R3",
+                                "label": "Moderately important"
+                            }, {
+                                "value": "R4",
+                                "label": "Highly important"
+                            }, {
+                                "value": "R5",
+                                "label": "Compulsory"
+                            }],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "SLNA_Q11_1591362100037",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "radio",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "How important do you think the following are, for the upcoming engagement with Mantra4Change?",
+                            "page": "p2",
+                            "questionNumber": "7",
+                            "updatedAt": "2020-06-05T13:02:07.202Z",
+                            "createdAt": "2020-06-05T13:02:07.202Z",
+                            "__v": 0,
+                            "evidenceMethod": "OB",
+                            "payload": {
+                                "criteriaId": "5eda42474f4da809a2a27ee7",
+                                "responseType": "radio",
+                                "evidenceMethod": "OB",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5eda424f4f4da809a2a27ef4",
+                            "question": ["Session or workshops on personality development (inter-intra personal skills and leadership qualities) such as problem solving, reflection, goal setting, relationship building etc", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [{
+                                "value": "R1",
+                                "label": "Not required"
+                            }, {
+                                "value": "R2",
+                                "label": "Not very important"
+                            }, {
+                                "value": "R3",
+                                "label": "Moderately important"
+                            }, {
+                                "value": "R4",
+                                "label": "Highly important"
+                            }, {
+                                "value": "R5",
+                                "label": "Compulsory"
+                            }],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "SLNA_Q12_1591362100037",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "radio",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p2",
+                            "questionNumber": "8",
+                            "updatedAt": "2020-06-05T13:02:07.212Z",
+                            "createdAt": "2020-06-05T13:02:07.212Z",
+                            "__v": 0,
+                            "evidenceMethod": "OB",
+                            "payload": {
+                                "criteriaId": "5eda42474f4da809a2a27ee7",
+                                "responseType": "radio",
+                                "evidenceMethod": "OB",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5eda424f4f4da809a2a27ef5",
+                            "question": ["Session on digital literacy for example using email, google drive, Hangouts/Zooms etc", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [{
+                                "value": "R1",
+                                "label": "Not required"
+                            }, {
+                                "value": "R2",
+                                "label": "Not very important"
+                            }, {
+                                "value": "R3",
+                                "label": "Moderately important"
+                            }, {
+                                "value": "R4",
+                                "label": "Highly important"
+                            }, {
+                                "value": "R5",
+                                "label": "Compulsory"
+                            }],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "SLNA_Q13_1591362100037",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "radio",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p2",
+                            "questionNumber": "9",
+                            "updatedAt": "2020-06-05T13:02:07.225Z",
+                            "createdAt": "2020-06-05T13:02:07.225Z",
+                            "__v": 0,
+                            "evidenceMethod": "OB",
+                            "payload": {
+                                "criteriaId": "5eda42474f4da809a2a27ee7",
+                                "responseType": "radio",
+                                "evidenceMethod": "OB",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5eda424f4f4da809a2a27ef6",
+                            "question": ["Which language are you comfortable in for sessions, videos, and discussions?", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [{
+                                "value": "R1",
+                                "label": "English"
+                            }, {
+                                "value": "R2",
+                                "label": "Telugu"
+                            }, {
+                                "value": "R3",
+                                "label": "Both"
+                            }],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "SLNA_Q14_1591362100037",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "radio",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p2",
+                            "questionNumber": "10",
+                            "updatedAt": "2020-06-05T13:02:07.234Z",
+                            "createdAt": "2020-06-05T13:02:07.234Z",
+                            "__v": 0,
+                            "evidenceMethod": "OB",
+                            "payload": {
+                                "criteriaId": "5eda42474f4da809a2a27ee7",
+                                "responseType": "radio",
+                                "evidenceMethod": "OB",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5eda424f4f4da809a2a27ef7",
+                            "question": ["Which modes of learning do you enjoy?", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [{
+                                "value": "R1",
+                                "label": "Reading"
+                            }, {
+                                "value": "R2",
+                                "label": "Watching videos"
+                            }, {
+                                "value": "R3",
+                                "label": "Application or practice"
+                            }, {
+                                "value": "R4",
+                                "label": "Reflection and Discussions"
+                            }, {
+                                "value": "R5",
+                                "label": "Quiz and tests"
+                            }, {
+                                "value": "R6",
+                                "label": "Project work"
+                            }, {
+                                "value": "R7",
+                                "label": "Sessions by experts"
+                            }, {
+                                "value": "R8",
+                                "label": "Demonstrations"
+                            }],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "SLNA_Q15_1591362100037",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "multiselect",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p2",
+                            "questionNumber": "11",
+                            "updatedAt": "2020-06-05T13:02:07.246Z",
+                            "createdAt": "2020-06-05T13:02:07.246Z",
+                            "__v": 0,
+                            "evidenceMethod": "OB",
+                            "payload": {
+                                "criteriaId": "5eda42474f4da809a2a27ee7",
+                                "responseType": "multiselect",
+                                "evidenceMethod": "OB",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5eda424f4f4da809a2a27ef8",
+                            "question": ["As a school leader, have you attended any workshops or sessions in the last few years?", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [{
+                                "value": "R1",
+                                "label": "Yes"
+                            }, {
+                                "value": "R2",
+                                "label": "No"
+                            }],
+                            "sliderOptions": [],
+                            "children": ["5eda424f4f4da809a2a27ef9"],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "SLNA_Q16_1591362100037",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "radio",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p2",
+                            "questionNumber": "12",
+                            "updatedAt": "2020-06-05T13:02:07.267Z",
+                            "createdAt": "2020-06-05T13:02:07.257Z",
+                            "__v": 0,
+                            "evidenceMethod": "OB",
+                            "payload": {
+                                "criteriaId": "5eda42474f4da809a2a27ee7",
+                                "responseType": "radio",
+                                "evidenceMethod": "OB",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5eda424f4f4da809a2a27ef9",
+                            "question": ["What topics did you find useful from the sessions or workshops?", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": [{
+                                "operator": "===",
+                                "value": "R1",
+                                "_id": "5eda424f4f4da809a2a27ef8"
+                            }],
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "SLNA_Q17_1591362100037",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "text",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p2",
+                            "questionNumber": "12.1",
+                            "updatedAt": "2020-06-05T13:02:07.265Z",
+                            "createdAt": "2020-06-05T13:02:07.265Z",
+                            "__v": 0,
+                            "evidenceMethod": "OB",
+                            "payload": {
+                                "criteriaId": "5eda42474f4da809a2a27ee7",
+                                "responseType": "text",
+                                "evidenceMethod": "OB",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5eda424f4f4da809a2a27efa",
+                            "question": ["Do you have any other suggestions/feedback for the upcoming engagement on school leadership by Mantra4Change?", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": false
+                            },
+                            "externalId": "SLNA_Q18_1591362100037",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "text",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p2",
+                            "questionNumber": "13",
+                            "updatedAt": "2020-06-05T13:02:07.277Z",
+                            "createdAt": "2020-06-05T13:02:07.277Z",
+                            "__v": 0,
+                            "evidenceMethod": "OB",
+                            "payload": {
+                                "criteriaId": "5eda42474f4da809a2a27ee7",
+                                "responseType": "text",
+                                "evidenceMethod": "OB",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }]
+                    }],
+                    "name": "Observation Question"
+                }],
+                "modeOfCollection": "onfield",
+                "canBeNotAllowed": false,
+                "canBeNotApplicable": false,
+                "tip": null,
+                "description": null,
+                "notApplicable": false,
+                "name": "Observation",
+                "remarks": null,
+                "externalId": "OB",
+                "startTime": "",
+                "endTime": "",
+                "isSubmitted": false,
+                "submissions": []
+            }],
+            "submissions": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/assets/dummy/observationInstanceReport.json b/src/assets/dummy/observationInstanceReport.json
new file mode 100644
index 000000000..f12d80f18
--- /dev/null
+++ b/src/assets/dummy/observationInstanceReport.json
@@ -0,0 +1,762 @@
+{
+    "entityName": "28170300402-MPPS PULIPADU_SC",
+    "observationName": "School safety checklist -Officials",
+    "observationId": "5f990e16be0e60389529e33a",
+    "entityType": "school",
+    "entityId": "5e6b4ffd135b2d734252d21f",
+    "districtName": "GUNTUR",
+    "response": [{
+        "order": "462A01",
+        "question": "Let's start capturing your observation notes",
+        "responseType": "matrix",
+        "answers": [],
+        "chart": {},
+        "instanceQuestions": [{
+            "order": "462A02",
+            "question": "Name",
+            "responseType": "text",
+            "answers": ["test"],
+            "chart": {},
+            "instanceQuestions": []
+        }, {
+            "order": "462A03",
+            "question": "Designation",
+            "responseType": "text",
+            "answers": ["abc"],
+            "chart": {},
+            "instanceQuestions": []
+        }, {
+            "order": "462A04",
+            "question": "Date of visit",
+            "responseType": "date",
+            "answers": ["21 Dec 2020, 9:14:16 AM"],
+            "chart": {},
+            "instanceQuestions": []
+        }, {
+            "order": "462A05",
+            "question": "School ID",
+            "responseType": "number",
+            "answers": ["2"],
+            "chart": {},
+            "instanceQuestions": []
+        }, {
+            "order": "462A06",
+            "question": "Zone",
+            "responseType": "text",
+            "answers": ["test"],
+            "chart": {},
+            "instanceQuestions": []
+        }, {
+            "order": "462A07",
+            "question": "HoS Name",
+            "responseType": "text",
+            "answers": ["test"],
+            "chart": {},
+            "instanceQuestions": []
+        }, {
+            "order": "462A08",
+            "question": "HoS contact number",
+            "responseType": "number",
+            "answers": ["2"],
+            "chart": {},
+            "instanceQuestions": []
+        }, {
+            "order": "462A09",
+            "question": "Are there any open drains, potholes/ pits inside or outside the school?",
+            "responseType": "radio",
+            "answers": ["Yes"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "Yes",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A10",
+            "question": "Can the entrance to school be monitored from the principal’s office?",
+            "responseType": "radio",
+            "answers": ["No"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "No",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A11",
+            "question": "Can visitors walk in directly into the school without supervision?",
+            "responseType": "radio",
+            "answers": ["Partially"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "Partially",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A12",
+            "question": "Are important phone numbers displayed?",
+            "responseType": "multiselect",
+            "answers": [
+                ["Child Line"]
+            ],
+            "chart": {
+                "type": "bar",
+                "data": [{
+                    "data": [100]
+                }],
+                "xAxis": {
+                    "categories": ["Child Line"],
+                    "title": {
+                        "text": "Responses"
+                    }
+                },
+                "yAxis": {
+                    "min": 0,
+                    "max": 100,
+                    "title": {
+                        "text": "Responses in percentage"
+                    }
+                }
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A13",
+            "question": "Are nursery classes (if applicable) situated on the ground floor?",
+            "responseType": "radio",
+            "answers": ["No"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "No",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A14",
+            "question": "Is the drinking water area clean?",
+            "responseType": "radio",
+            "answers": ["No"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "No",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A15",
+            "question": "Does the school have filtered drinking water facility?",
+            "responseType": "radio",
+            "answers": ["Partially"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "Partially",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A16",
+            "question": "Is the water tank clean? Ensure it does not  have mud, algae , dead insects.",
+            "responseType": "radio",
+            "answers": ["No"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "No",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A17",
+            "question": "Are the toilets clean overall?",
+            "responseType": "radio",
+            "answers": ["No"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "No",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A18",
+            "question": "Is there a soap/ hand-wash in the toilet?",
+            "responseType": "radio",
+            "answers": ["Partially"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "Partially",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A19",
+            "question": "Is there running water supply in the toilet?",
+            "responseType": "radio",
+            "answers": ["Partially"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "Partially",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A20",
+            "question": "Are the cisterns/flush functional?",
+            "responseType": "radio",
+            "answers": ["Partially"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "Partially",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A21",
+            "question": "Is the first-aid box fully equipped? (Check expiry date)",
+            "responseType": "radio",
+            "answers": ["No"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "No",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A22",
+            "question": "Does the school have a designated vehicle for emergency situations?",
+            "responseType": "radio",
+            "answers": ["Partially"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "Partially",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A23",
+            "question": "Are the corners of corridors and walls clean?",
+            "responseType": "radio",
+            "answers": ["No"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "No",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A24",
+            "question": "Are there abandoned objects lying in any corner of the school?",
+            "responseType": "radio",
+            "answers": ["Partially"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "Partially",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A25",
+            "question": "Does the MCD pick up garbage from school everyday?",
+            "responseType": "radio",
+            "answers": ["No"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "No",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A26",
+            "question": "Do you see students fighting or misbehaving during lunch break?",
+            "responseType": "radio",
+            "answers": ["No"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "No",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A27",
+            "question": "What do teachers do when such things happen?",
+            "responseType": "multiselect",
+            "answers": [
+                ["Talk to students fighting"]
+            ],
+            "chart": {
+                "type": "bar",
+                "data": [{
+                    "data": [100]
+                }],
+                "xAxis": {
+                    "categories": ["Talk to students fighting"],
+                    "title": {
+                        "text": "Responses"
+                    }
+                },
+                "yAxis": {
+                    "min": 0,
+                    "max": 100,
+                    "title": {
+                        "text": "Responses in percentage"
+                    }
+                }
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A28",
+            "question": "Do some students bully others in school?",
+            "responseType": "radio",
+            "answers": ["Partially"],
+            "chart": {
+                "type": "pie",
+                "plotOptions": {
+                    "pie": {
+                        "allowPointSelect": true,
+                        "cursor": "pointer",
+                        "dataLabels": {
+                            "enabled": false
+                        },
+                        "showInLegend": true
+                    }
+                },
+                "data": [{
+                    "data": [{
+                        "name": "Partially",
+                        "y": 100
+                    }]
+                }]
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A29",
+            "question": "What kinds of punishments are given to children who misbehave / don’t do homework etc?",
+            "responseType": "multiselect",
+            "answers": [
+                ["Standing inside/outside class"]
+            ],
+            "chart": {
+                "type": "bar",
+                "data": [{
+                    "data": [100]
+                }],
+                "xAxis": {
+                    "categories": ["Standing inside/outside class"],
+                    "title": {
+                        "text": "Responses"
+                    }
+                },
+                "yAxis": {
+                    "min": 0,
+                    "max": 100,
+                    "title": {
+                        "text": "Responses in percentage"
+                    }
+                }
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A30",
+            "question": "What happens when a child is hurt?",
+            "responseType": "multiselect",
+            "answers": [
+                ["Sent home/parents called"]
+            ],
+            "chart": {
+                "type": "bar",
+                "data": [{
+                    "data": [100]
+                }],
+                "xAxis": {
+                    "categories": ["Sent home/parents called"],
+                    "title": {
+                        "text": "Responses"
+                    }
+                },
+                "yAxis": {
+                    "min": 0,
+                    "max": 100,
+                    "title": {
+                        "text": "Responses in percentage"
+                    }
+                }
+            },
+            "instanceQuestions": []
+        }, {
+            "order": "462A31",
+            "question": "Call 5 students of class 3/4/5 (randomly). Ask them to read a text from their Hindi books and record the count of students who could read it.",
+            "responseType": "number",
+            "answers": ["2"],
+            "chart": {},
+            "instanceQuestions": []
+        }, {
+            "order": "462A32",
+            "question": "Please record your overall comments on the state of the following in the school: \n1. Corporal punishment \n2. Bullying \n3. Reading level in school",
+            "responseType": "text",
+            "answers": ["T"],
+            "chart": {},
+            "instanceQuestions": []
+        }]
+    }],
+    "allQuestions": [{
+        "questionName": "Name",
+        "questionExternalId": "462A02",
+        "questionId": "5d70f9af7afa105d7d66d922"
+    }, {
+        "questionName": "Designation",
+        "questionExternalId": "462A03",
+        "questionId": "5d70f9af7afa105d7d66d923"
+    }, {
+        "questionName": "Date of visit",
+        "questionExternalId": "462A04",
+        "questionId": "5d70f9af7afa105d7d66d924"
+    }, {
+        "questionName": "School ID",
+        "questionExternalId": "462A05",
+        "questionId": "5d70f9af7afa105d7d66d925"
+    }, {
+        "questionName": "Zone",
+        "questionExternalId": "462A06",
+        "questionId": "5d70f9af7afa105d7d66d926"
+    }, {
+        "questionName": "HoS Name",
+        "questionExternalId": "462A07",
+        "questionId": "5d70f9af7afa105d7d66d927"
+    }, {
+        "questionName": "HoS contact number",
+        "questionExternalId": "462A08",
+        "questionId": "5d70f9af7afa105d7d66d928"
+    }, {
+        "questionName": "Are there any open drains, potholes/ pits inside or outside the school?",
+        "questionExternalId": "462A09",
+        "questionId": "5d70f9af7afa105d7d66d929"
+    }, {
+        "questionName": "Can the entrance to school be monitored from the principal’s office?",
+        "questionExternalId": "462A10",
+        "questionId": "5d70f9af7afa105d7d66d92a"
+    }, {
+        "questionName": "Can visitors walk in directly into the school without supervision?",
+        "questionExternalId": "462A11",
+        "questionId": "5d70f9af7afa105d7d66d92b"
+    }, {
+        "questionName": "Are important phone numbers displayed?",
+        "questionExternalId": "462A12",
+        "questionId": "5d70f9af7afa105d7d66d92c"
+    }, {
+        "questionName": "Are nursery classes (if applicable) situated on the ground floor?",
+        "questionExternalId": "462A13",
+        "questionId": "5d70f9af7afa105d7d66d92d"
+    }, {
+        "questionName": "Is the drinking water area clean?",
+        "questionExternalId": "462A14",
+        "questionId": "5d70f9af7afa105d7d66d92e"
+    }, {
+        "questionName": "Does the school have filtered drinking water facility?",
+        "questionExternalId": "462A15",
+        "questionId": "5d70f9af7afa105d7d66d92f"
+    }, {
+        "questionName": "Is the water tank clean? Ensure it does not  have mud, algae , dead insects.",
+        "questionExternalId": "462A16",
+        "questionId": "5d70f9af7afa105d7d66d930"
+    }, {
+        "questionName": "Are the toilets clean overall?",
+        "questionExternalId": "462A17",
+        "questionId": "5d70f9af7afa105d7d66d931"
+    }, {
+        "questionName": "Is there a soap/ hand-wash in the toilet?",
+        "questionExternalId": "462A18",
+        "questionId": "5d70f9af7afa105d7d66d932"
+    }, {
+        "questionName": "Is there running water supply in the toilet?",
+        "questionExternalId": "462A19",
+        "questionId": "5d70f9af7afa105d7d66d933"
+    }, {
+        "questionName": "Are the cisterns/flush functional?",
+        "questionExternalId": "462A20",
+        "questionId": "5d70f9af7afa105d7d66d934"
+    }, {
+        "questionName": "Is the first-aid box fully equipped? (Check expiry date)",
+        "questionExternalId": "462A21",
+        "questionId": "5d70f9af7afa105d7d66d935"
+    }, {
+        "questionName": "Does the school have a designated vehicle for emergency situations?",
+        "questionExternalId": "462A22",
+        "questionId": "5d70f9af7afa105d7d66d936"
+    }, {
+        "questionName": "Are the corners of corridors and walls clean?",
+        "questionExternalId": "462A23",
+        "questionId": "5d70f9af7afa105d7d66d937"
+    }, {
+        "questionName": "Are there abandoned objects lying in any corner of the school?",
+        "questionExternalId": "462A24",
+        "questionId": "5d70f9af7afa105d7d66d938"
+    }, {
+        "questionName": "Does the MCD pick up garbage from school everyday?",
+        "questionExternalId": "462A25",
+        "questionId": "5d70f9af7afa105d7d66d939"
+    }, {
+        "questionName": "Do you see students fighting or misbehaving during lunch break?",
+        "questionExternalId": "462A26",
+        "questionId": "5d70f9af7afa105d7d66d93a"
+    }, {
+        "questionName": "What do teachers do when such things happen?",
+        "questionExternalId": "462A27",
+        "questionId": "5d70f9af7afa105d7d66d93b"
+    }, {
+        "questionName": "Do some students bully others in school?",
+        "questionExternalId": "462A28",
+        "questionId": "5d70f9af7afa105d7d66d93c"
+    }, {
+        "questionName": "What kinds of punishments are given to children who misbehave / don’t do homework etc?",
+        "questionExternalId": "462A29",
+        "questionId": "5d70f9af7afa105d7d66d93d"
+    }, {
+        "questionName": "What happens when a child is hurt?",
+        "questionExternalId": "462A30",
+        "questionId": "5d70f9af7afa105d7d66d93e"
+    }, {
+        "questionName": "Call 5 students of class 3/4/5 (randomly). Ask them to read a text from their Hindi books and record the count of students who could read it.",
+        "questionExternalId": "462A31",
+        "questionId": "5d70f9af7afa105d7d66d93f"
+    }, {
+        "questionName": "Please record your overall comments on the state of the following in the school: \n1. Corporal punishment \n2. Bullying \n3. Reading level in school",
+        "questionExternalId": "462A32",
+        "questionId": "5d70f9af7afa105d7d66d940"
+    }]
+}
\ No newline at end of file
diff --git a/src/assets/dummy/programs.json b/src/assets/dummy/programs.json
new file mode 100644
index 000000000..0983584e1
--- /dev/null
+++ b/src/assets/dummy/programs.json
@@ -0,0 +1,2979 @@
+{
+    "message": "Successfully fetched user programs",
+    "status": 200,
+    "result": [{
+        "_id": "5f636fb0962d59425d855a1d",
+        "name": "Testing",
+        "externalId": "Testing-1600352176701",
+        "description": "APSWREIS_School Leader NA Form",
+        "solutions": [{
+            "programName": "Testing",
+            "programId": "5f636fb0962d59425d855a1d",
+            "_id": "5fe0525b261dfa6d0f820059",
+            "name": "School Needs Assessment - Secondary",
+            "externalId": "3153-School_Needs_Assessment-Secondary-Prod-Dec2020-TEMPLATE-1608536667802",
+            "description": "School Needs Assessment - Secondary",
+            "type": "assessment",
+            "subType": "school",
+            "allowMultipleAssessemts": true,
+            "showInHomeScreen": true,
+            "isAPrivateProgram": true,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5d80ee3bbbcc4b1bf8e79cb8",
+                "name": "PUNJAB GMS KOTLI DHOLE SHAH",
+                "externalId": "03020509002",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "submissionNumber": 1,
+                    "title": "Assessment 1",
+                    "_id": "5fe05262c007676d1cfa0f38",
+                    "status": "completed",
+                    "createdAt": "2020-12-21T07:44:34.054Z",
+                    "updatedAt": "2020-12-22T09:54:27.809Z",
+                    "submissionDate": "2020-12-21T10:02:33.308Z"
+                }]
+            }]
+        }, {
+            "programName": "Testing",
+            "programId": "5f636fb0962d59425d855a1d",
+            "_id": "5f636fb0962d59425d855a1f",
+            "name": "APSWREIS_School Leader NA Form",
+            "description": "APSWREIS_School Leader NA Form",
+            "type": "observation",
+            "subType": "state",
+            "solutionExternalId": "be16debe-a72c-11ea-a92c-42010aa00002-1600352176727",
+            "solutionId": "5f636fb0962d59425d855a1e",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": true,
+            "entityType": "state",
+            "entityTypeId": "5d7a290e6371783ceb11064c",
+            "entities": [{
+                "_id": "5e26c474410aee393d9e4845",
+                "name": "Arunachal Pradesh",
+                "externalId": "AR",
+                "entityType": "state",
+                "totalSubmissionCount": 2,
+                "submissions": [{
+                    "_id": "5f63a80b6f817142413a0479",
+                    "status": "started",
+                    "submissionNumber": 2,
+                    "entityId": "5e26c474410aee393d9e4845",
+                    "createdAt": "2020-09-17T18:16:43.895Z",
+                    "updatedAt": "2020-09-17T18:16:43.895Z",
+                    "observationName": "APSWREIS_School Leader NA Form",
+                    "observationId": "5f636fb0962d59425d855a1f",
+                    "title": "Observation 2",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5f63a800962d59425d856383",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5e26c474410aee393d9e4845",
+                    "createdAt": "2020-09-17T18:16:32.896Z",
+                    "updatedAt": "2020-09-17T18:16:32.896Z",
+                    "observationName": "APSWREIS_School Leader NA Form",
+                    "observationId": "5f636fb0962d59425d855a1f",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }]
+        }]
+    }, {
+        "_id": "5f990e01be0e60389529e336",
+        "name": "Delete this ",
+        "externalId": "Delete this -1603866113204",
+        "description": "Classroom Observations Form",
+        "solutions": [{
+            "programName": "Delete this ",
+            "programId": "5f990e01be0e60389529e336",
+            "_id": "5f990e16be0e60389529e33a",
+            "name": "School safety checklist -Officials",
+            "description": "School safety checklist -Officials",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "School_safety_checklist-Officials_Observation-prod-Aug2019-1603866134441",
+            "solutionId": "5f990e16be0e60389529e339",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": true,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5e6b4ffd135b2d734252d21f",
+                "name": "28170300402-MPPS PULIPADU_SC",
+                "externalId": "APGS0002",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "_id": "5fe06752261dfa6d0f820073",
+                    "status": "completed",
+                    "submissionNumber": 1,
+                    "entityId": "5e6b4ffd135b2d734252d21f",
+                    "createdAt": "2020-12-21T09:13:54.173Z",
+                    "updatedAt": "2020-12-21T09:15:48.825Z",
+                    "observationName": "School safety checklist -Officials",
+                    "observationId": "5f990e16be0e60389529e33a",
+                    "title": "Observation 1",
+                    "submissionDate": "2020-12-21T09:15:48.825Z",
+                    "ratingCompletedAt": ""
+                }]
+            }, {
+                "_id": "5e32caef5479754df11c2651",
+                "name": "Adarsh Sr. Sec. School",
+                "externalId": "AMB01",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e32caef5479754df11c2658",
+                "name": "Holy Heart Middle School",
+                "externalId": "AMB08",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }]
+        }, {
+            "programName": "Delete this ",
+            "programId": "5f990e01be0e60389529e336",
+            "_id": "5f990e01be0e60389529e338",
+            "name": "Classroom Observations Form",
+            "description": "Classroom Observations Form",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "CRO-2019-1603866113214",
+            "solutionId": "5f990e01be0e60389529e337",
+            "showInHomeScreen": false,
+            "isAPrivateProgram": true,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5e6b4ffd135b2d734252d21e",
+                "name": "28170400805-MPPS DACHEPALLI(IC)",
+                "externalId": "APGS0001",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }]
+        }]
+    }, {
+        "_id": "5f990c134c471038be63a6d9",
+        "name": "Delete this testing",
+        "externalId": "Delete this testing-1603865619592",
+        "description": "Peepul- SDMC Classroom Observation – Module 1",
+        "solutions": [{
+            "programName": "Delete this testing",
+            "programId": "5f990c134c471038be63a6d9",
+            "_id": "5f990c134c471038be63a6db",
+            "name": "Peepul- SDMC Classroom Observation – Module 1",
+            "description": "Peepul- SDMC Classroom Observation – Module 1",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "Peepul-SDMC_Classroom_Observation–Module1_Observation-prod-Aug2019-1603865619601",
+            "solutionId": "5f990c134c471038be63a6da",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": true,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5d2ccc7593fe690ade5e54e1",
+                "name": "G.H.S Agarwada",
+                "externalId": "GOA0003",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "_id": "5fdb633ec007676d1cfa0b8f",
+                    "status": "completed",
+                    "submissionNumber": 1,
+                    "entityId": "5d2ccc7593fe690ade5e54e1",
+                    "createdAt": "2020-12-17T13:55:10.355Z",
+                    "updatedAt": "2020-12-17T13:57:37.784Z",
+                    "observationName": "Peepul- SDMC Classroom Observation – Module 1",
+                    "observationId": "5f990c134c471038be63a6db",
+                    "title": "Observation 1",
+                    "submissionDate": "2020-12-17T13:57:37.784Z",
+                    "ratingCompletedAt": ""
+                }]
+            }]
+        }]
+    }, {
+        "_id": "5f1c5be0499e7a357a6c27a1",
+        "name": "Instance test Punjab",
+        "externalId": "3fc7f68c-6434-11ea-a6fc-42010aa00002-OBSERVATION-TEMPLATE",
+        "description": "Testing Automation of Observation Instance Type in staging on Oct 2019",
+        "solutions": [{
+            "programName": "Instance test Punjab",
+            "programId": "5f1c5be0499e7a357a6c27a1",
+            "_id": "5f9252e84c471038be63a684",
+            "name": "Instance test Punjab",
+            "description": "Testing Automation of Observation Instance Type in staging on Oct 2019",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "3fc7f68c-6434-11ea-a6fc-42010aa00002-OBSERVATION-TEMPLATE",
+            "solutionId": "5e69e697135b2d734252ccf8",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": false,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": []
+        }]
+    }, {
+        "_id": "5f632d7c6f8171424139f6de",
+        "name": "Test test",
+        "externalId": "Test test-1600335228689",
+        "description": "CRP School visit form",
+        "solutions": [{
+            "programName": "Test test",
+            "programId": "5f632d7c6f8171424139f6de",
+            "_id": "5f632d7c6f8171424139f6e0",
+            "name": "CRP School visit form",
+            "description": "CRP School visit form",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "CRP-School-Visit-Form-1600335228698",
+            "solutionId": "5f632d7c6f8171424139f6df",
+            "showInHomeScreen": false,
+            "isAPrivateProgram": true,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5e6b4ffd135b2d734252d21e",
+                "name": "28170400805-MPPS DACHEPALLI(IC)",
+                "externalId": "APGS0001",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "_id": "5f632d88962d59425d8555ec",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5e6b4ffd135b2d734252d21e",
+                    "createdAt": "2020-09-17T09:34:00.604Z",
+                    "updatedAt": "2020-09-17T09:34:00.604Z",
+                    "observationName": "CRP School visit form",
+                    "observationId": "5f632d7c6f8171424139f6e0",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }]
+        }]
+    }, {
+        "_id": "5f3976d6ef9b860797466006",
+        "name": "2.10 Prod Test Program",
+        "externalId": "2.10 Prod Test Program-1597601494155",
+        "description": "ಮಧ್ಯಾಹ್ನದ ಬಿಸಿಯೂಟ tool",
+        "solutions": [{
+            "programName": "2.10 Prod Test Program",
+            "programId": "5f3976d6ef9b860797466006",
+            "_id": "5f5c51d340e748299d2dc9c7",
+            "name": "MQSF School Evaluation Tool",
+            "description": "MQSF School Evaluation Tool",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "eb39f09c-8ca7-11ea-a085-42010aa00002-1599885779662",
+            "solutionId": "5f5c51d340e748299d2dc9c6",
+            "showInHomeScreen": false,
+            "isAPrivateProgram": true,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5e6b4ffd135b2d734252d21e",
+                "name": "28170400805-MPPS DACHEPALLI(IC)",
+                "externalId": "APGS0001",
+                "entityType": "school",
+                "totalSubmissionCount": 2,
+                "submissions": [{
+                    "_id": "5f624067962d59425d854f4e",
+                    "status": "started",
+                    "submissionNumber": 2,
+                    "entityId": "5e6b4ffd135b2d734252d21e",
+                    "createdAt": "2020-09-16T16:42:15.013Z",
+                    "updatedAt": "2020-09-16T16:42:15.013Z",
+                    "observationName": "MQSF School Evaluation Tool",
+                    "observationId": "5f5c51d340e748299d2dc9c7",
+                    "title": "Observation 2",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5f5c51df40e748299d2dc9c8",
+                    "status": "ratingPending",
+                    "submissionNumber": 1,
+                    "entityId": "5e6b4ffd135b2d734252d21e",
+                    "createdAt": "2020-09-12T04:43:11.930Z",
+                    "updatedAt": "2020-09-12T04:51:58.324Z",
+                    "observationName": "MQSF School Evaluation Tool",
+                    "observationId": "5f5c51d340e748299d2dc9c7",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }]
+        }, {
+            "programName": "2.10 Prod Test Program",
+            "programId": "5f3976d6ef9b860797466006",
+            "_id": "5f57745bff083c29b9153969",
+            "name": "APSWREIS_School Leader NA Form-Test State SOl",
+            "description": "APSWREIS_School Leader NA Form",
+            "type": "observation",
+            "subType": "state",
+            "solutionExternalId": "be16debe-a72c-11ea-a92c-42010aa00002-1599566939202",
+            "solutionId": "5f57745bff083c29b9153968",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": true,
+            "entityType": "state",
+            "entityTypeId": "5d7a290e6371783ceb11064c",
+            "entities": [{
+                "_id": "5e26c474410aee393d9e484d",
+                "name": "Kerala",
+                "externalId": "KL",
+                "entityType": "state",
+                "totalSubmissionCount": 2,
+                "submissions": [{
+                    "_id": "5f632bf0962d59425d8555da",
+                    "status": "started",
+                    "submissionNumber": 2,
+                    "entityId": "5e26c474410aee393d9e484d",
+                    "createdAt": "2020-09-17T09:27:12.458Z",
+                    "updatedAt": "2020-09-17T09:27:12.458Z",
+                    "observationName": "APSWREIS_School Leader NA Form-Test State SOl",
+                    "observationId": "5f57745bff083c29b9153969",
+                    "title": "Observation 2",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5f632beb6f8171424139f6c8",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5e26c474410aee393d9e484d",
+                    "createdAt": "2020-09-17T09:27:07.986Z",
+                    "updatedAt": "2020-09-17T09:27:07.986Z",
+                    "observationName": "APSWREIS_School Leader NA Form-Test State SOl",
+                    "observationId": "5f57745bff083c29b9153969",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }, {
+                "_id": "5e26c474410aee393d9e4846",
+                "name": "Assam",
+                "externalId": "AS",
+                "entityType": "state",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "_id": "5f632ce6962d59425d8555e3",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5e26c474410aee393d9e4846",
+                    "createdAt": "2020-09-17T09:31:18.905Z",
+                    "updatedAt": "2020-09-17T09:31:18.905Z",
+                    "observationName": "APSWREIS_School Leader NA Form-Test State SOl",
+                    "observationId": "5f57745bff083c29b9153969",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }]
+        }, {
+            "programName": "2.10 Prod Test Program",
+            "programId": "5f3976d6ef9b860797466006",
+            "_id": "5f5634cfff083c29b91538db",
+            "name": "KEF - Online Support from MTs-Test",
+            "description": "KEF - Online Support from MTs",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "bcd64b76-e87b-11ea-8a90-0adfd2b35fc6-OBSERVATION-TEMPLATE-1599485134998",
+            "solutionId": "5f5634ceff083c29b91538da",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": true,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5e6b4ffd135b2d734252d21f",
+                "name": "28170300402-MPPS PULIPADU_SC",
+                "externalId": "APGS0002",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "_id": "5f5634d840e748299d2da053",
+                    "status": "ratingPending",
+                    "submissionNumber": 1,
+                    "entityId": "5e6b4ffd135b2d734252d21f",
+                    "createdAt": "2020-09-07T13:25:44.034Z",
+                    "updatedAt": "2020-09-07T13:26:17.261Z",
+                    "observationName": "KEF - Online Support from MTs-Test",
+                    "observationId": "5f5634cfff083c29b91538db",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }]
+        }, {
+            "programName": "2.10 Prod Test Program",
+            "programId": "5f3976d6ef9b860797466006",
+            "_id": "5f524841ff083c29b915358c",
+            "name": "Kiran School Visit by DM/BM",
+            "description": "School Visit by DM/BM",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "School Visit by DM/BM-Observation-prod-Oct2019-1599227969689",
+            "solutionId": "5f524841ff083c29b915358b",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": true,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5e6b4ffd135b2d734252d21e",
+                "name": "28170400805-MPPS DACHEPALLI(IC)",
+                "externalId": "APGS0001",
+                "entityType": "school",
+                "totalSubmissionCount": 3,
+                "submissions": [{
+                    "_id": "5f55be29ff083c29b91537ed",
+                    "status": "started",
+                    "submissionNumber": 3,
+                    "entityId": "5e6b4ffd135b2d734252d21e",
+                    "createdAt": "2020-09-07T04:59:21.077Z",
+                    "updatedAt": "2020-09-07T04:59:21.077Z",
+                    "observationName": "Kiran School Visit by DM/BM",
+                    "observationId": "5f524841ff083c29b915358c",
+                    "title": "Observation 3",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5f524f7e40e748299d2d9dc2",
+                    "status": "completed",
+                    "submissionNumber": 2,
+                    "entityId": "5e6b4ffd135b2d734252d21e",
+                    "createdAt": "2020-09-04T14:30:22.125Z",
+                    "updatedAt": "2020-09-04T14:31:24.216Z",
+                    "observationName": "Kiran School Visit by DM/BM",
+                    "observationId": "5f524841ff083c29b915358c",
+                    "title": "Observation 2",
+                    "submissionDate": "2020-09-04T14:31:24.216Z",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5f52484b40e748299d2d9dbf",
+                    "status": "completed",
+                    "submissionNumber": 1,
+                    "entityId": "5e6b4ffd135b2d734252d21e",
+                    "createdAt": "2020-09-04T13:59:39.463Z",
+                    "updatedAt": "2020-09-04T14:00:02.310Z",
+                    "observationName": "Kiran School Visit by DM/BM",
+                    "observationId": "5f524841ff083c29b915358c",
+                    "title": "Observation 1",
+                    "submissionDate": "2020-09-04T14:00:02.310Z",
+                    "ratingCompletedAt": ""
+                }]
+            }]
+        }, {
+            "programName": "2.10 Prod Test Program",
+            "programId": "5f3976d6ef9b860797466006",
+            "_id": "5f51f3b440e748299d2d9d42",
+            "name": "School Visit by DM/BM-4th sept",
+            "description": "School Visit by DM/BM",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "School Visit by DM/BM-Observation-prod-Oct2019-1599206324080",
+            "solutionId": "5f51f3b440e748299d2d9d41",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": true,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5e6b4ffd135b2d734252d21e",
+                "name": "28170400805-MPPS DACHEPALLI(IC)",
+                "externalId": "APGS0001",
+                "entityType": "school",
+                "totalSubmissionCount": 4,
+                "submissions": [{
+                    "_id": "5f522c8aff083c29b915354c",
+                    "status": "started",
+                    "submissionNumber": 4,
+                    "entityId": "5e6b4ffd135b2d734252d21e",
+                    "createdAt": "2020-09-04T12:01:14.775Z",
+                    "updatedAt": "2020-09-04T12:01:14.775Z",
+                    "observationName": "School Visit by DM/BM-4th sept",
+                    "observationId": "5f51f3b440e748299d2d9d42",
+                    "title": "Observation 4",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5f51fa1640e748299d2d9d48",
+                    "status": "started",
+                    "submissionNumber": 3,
+                    "entityId": "5e6b4ffd135b2d734252d21e",
+                    "createdAt": "2020-09-04T08:25:58.858Z",
+                    "updatedAt": "2020-09-04T08:25:58.858Z",
+                    "observationName": "School Visit by DM/BM-4th sept",
+                    "observationId": "5f51f3b440e748299d2d9d42",
+                    "title": "Observation 3",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5f51f3c340e748299d2d9d43",
+                    "status": "started",
+                    "submissionNumber": 2,
+                    "entityId": "5e6b4ffd135b2d734252d21e",
+                    "createdAt": "2020-09-04T07:58:59.046Z",
+                    "updatedAt": "2020-09-04T07:58:59.046Z",
+                    "observationName": "School Visit by DM/BM-4th sept",
+                    "observationId": "5f51f3b440e748299d2d9d42",
+                    "title": "Observation 2",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5f51f3bcff083c29b915351b",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5e6b4ffd135b2d734252d21e",
+                    "createdAt": "2020-09-04T07:58:52.592Z",
+                    "updatedAt": "2020-09-04T07:58:52.592Z",
+                    "observationName": "School Visit by DM/BM-4th sept",
+                    "observationId": "5f51f3b440e748299d2d9d42",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }, {
+                "_id": "5e6b4ffd135b2d734252d21f",
+                "name": "28170300402-MPPS PULIPADU_SC",
+                "externalId": "APGS0002",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "_id": "5f523ad4ff083c29b9153588",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5e6b4ffd135b2d734252d21f",
+                    "createdAt": "2020-09-04T13:02:12.178Z",
+                    "updatedAt": "2020-09-04T13:02:12.178Z",
+                    "observationName": "School Visit by DM/BM-4th sept",
+                    "observationId": "5f51f3b440e748299d2d9d42",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }]
+        }, {
+            "programName": "2.10 Prod Test Program",
+            "programId": "5f3976d6ef9b860797466006",
+            "_id": "5f3977cfe6663307b3963565",
+            "name": "Apple Assessment 2.10 Test",
+            "externalId": "Apple-Assessment-Framework-2018-001-TEMPLATE-1597601743540",
+            "description": "Apple Assessment Framework 2018-001",
+            "type": "assessment",
+            "subType": "institutional",
+            "allowMultipleAssessemts": false,
+            "showInHomeScreen": false,
+            "isAPrivateProgram": true,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5e6b4ffd135b2d734252d21e",
+                "name": "28170400805-MPPS DACHEPALLI(IC)",
+                "externalId": "APGS0001",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "submissionNumber": 1,
+                    "title": "Assessment 1",
+                    "_id": "5f3977d6e6663307b3963567",
+                    "status": "completed",
+                    "createdAt": "2020-08-16T18:15:50.450Z",
+                    "updatedAt": "2020-12-18T10:01:14.190Z",
+                    "submissionDate": "2020-08-16T18:17:05.561Z"
+                }]
+            }, {
+                "_id": "5e6b4ffd135b2d734252d21f",
+                "name": "28170300402-MPPS PULIPADU_SC",
+                "externalId": "APGS0002",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "submissionNumber": 1,
+                    "title": "Assessment 1",
+                    "_id": "5f3a0823e6663307b39639c6",
+                    "status": "completed",
+                    "createdAt": "2020-08-17T04:31:31.882Z",
+                    "updatedAt": "2020-08-17T04:32:10.165Z",
+                    "submissionDate": "2020-08-17T04:32:10.167Z"
+                }]
+            }, {
+                "_id": "5e6b4ffd135b2d734252d220",
+                "name": "28161901201-MPPS DEVARAPALLE(M)",
+                "externalId": "APGS0003",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d221",
+                "name": "28173300202-MPPS (6TH W)CHINAPARIMI",
+                "externalId": "APGS0004",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d222",
+                "name": "28171700102-MPPS (DW) T CHERUVU",
+                "externalId": "APGS0005",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d223",
+                "name": "28173501305-MPPS SOWPADU",
+                "externalId": "APGS0006",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d224",
+                "name": "28171900802-MPPS DURGI(HW)",
+                "externalId": "APGS0007",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d225",
+                "name": "28160700701-MPPS(M) VEERILLAPADU",
+                "externalId": "APGS0008",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d226",
+                "name": "28160300503-MPUPS GUMMADIDURRU",
+                "externalId": "APGS0009",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d227",
+                "name": "28170800103-MPPS(MUSLIM) DODLERU",
+                "externalId": "APGS0010",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d228",
+                "name": "28170900702-MPUPS DIDIGU",
+                "externalId": "APGS0011",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d229",
+                "name": "28173600205-MPPS(HE) ENAMADALA",
+                "externalId": "APGS0012",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d22a",
+                "name": "28171700901-MPPS JULAKALLU (MAIN)",
+                "externalId": "APGS0013",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d22b",
+                "name": "28174500302-MPPS(LE)KAVURU",
+                "externalId": "APGS0014",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d22c",
+                "name": "28174000406-MPPS REDDIPALEM (MP)",
+                "externalId": "APGS0015",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d22d",
+                "name": "28171100304-MPPS(LE)TADEPALLI",
+                "externalId": "APGS0016",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d22e",
+                "name": "28175100902-MPPS G V PALEM",
+                "externalId": "APGS0017",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d22f",
+                "name": "28174801704-MPPS KASUKARRU",
+                "externalId": "APGS0018",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d230",
+                "name": "28172400503-MPPS BETHAPUDI (OLD UP)",
+                "externalId": "APGS0019",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d231",
+                "name": "28160100501-MPPS MALKAPURAM",
+                "externalId": "APGS0020",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d232",
+                "name": "28173901314-MPPS BC COLONY G VPALEM",
+                "externalId": "APGS0021",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d233",
+                "name": "28170500102-MPPS CHENNAYAPALEM (DG TO PS)",
+                "externalId": "APGS0022",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d234",
+                "name": "28171501504-MPPS GUDIPUDI",
+                "externalId": "APGS0023",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d235",
+                "name": "28174401505-MPPS (SC)KR PALEM",
+                "externalId": "APGS0024",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d236",
+                "name": "28162701401-MPUPS L AGRAHARAM",
+                "externalId": "APGS0025",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d237",
+                "name": "28175600316-MPPS M V RAJUPAELM",
+                "externalId": "APGS0026",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d238",
+                "name": "28162500101-MPPS RAMANAKKAPETA(MAIN)",
+                "externalId": "APGS0027",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d239",
+                "name": "28172801109-MPPS (JEN C) DUGGIRALA",
+                "externalId": "APGS0028",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d23a",
+                "name": "28164801603-MPPS VARAHAPATNAM",
+                "externalId": "APGS0029",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d23b",
+                "name": "28160501602-MPPS (HW) KODAVATIKALLU",
+                "externalId": "APGS0030",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d23c",
+                "name": "28160501603-MPPS (BC) KONDAPETA",
+                "externalId": "APGS0031",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d23d",
+                "name": "28161000301-MPPS THOLUKODU",
+                "externalId": "APGS0032",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d23e",
+                "name": "28162200106-MPUPS SITARAMPURAM",
+                "externalId": "APGS0033",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d23f",
+                "name": "28162500203-MPUPS SUREPALLI (DG)",
+                "externalId": "APGS0034",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d240",
+                "name": "28162100304-MPPS KATTUBADIPALEM",
+                "externalId": "APGS0035",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d241",
+                "name": "28162101101-MPPS KOTHAGUDEM",
+                "externalId": "APGS0036",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d242",
+                "name": "28161601703-MPPS NIDAMANURU(R.NAGAR)",
+                "externalId": "APGS0037",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d243",
+                "name": "28171600302-MPPS(H) CHOWTAPAPAYAPALEM",
+                "externalId": "APGS0038",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d244",
+                "name": "28172600202-MPPS ADAVITAKKELLA PADU",
+                "externalId": "APGS0039",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d245",
+                "name": "28171301201-MPPS (LE) KANTHERU",
+                "externalId": "APGS0040",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d246",
+                "name": "28170800407-MPPS YERRABALEM",
+                "externalId": "APGS0041",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d247",
+                "name": "28172200903-MPPS(LE) KUNKALAGUNTA",
+                "externalId": "APGS0042",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d248",
+                "name": "28172300801-MPPS MAIN ROAD NARENPADU",
+                "externalId": "APGS0043",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d249",
+                "name": "28171100102-MPPS PENUMAKA(LE)",
+                "externalId": "APGS0044",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d24a",
+                "name": "28171200804-MPPS HE CHINAKAKANI",
+                "externalId": "APGS0045",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d24b",
+                "name": "28171300802-MPPS RAVELA (LE)",
+                "externalId": "APGS0046",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d24c",
+                "name": "28173800105-MPPS BP VARIPALEM",
+                "externalId": "APGS0047",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d24d",
+                "name": "28171001105-MPPS(MAIN) RAYAPUDI",
+                "externalId": "APGS0048",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d24e",
+                "name": "28171200701-MPPS (HW) KAZA",
+                "externalId": "APGS0049",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d24f",
+                "name": "28161601403-MPPS RAMAVARAPPADU (MAIN)",
+                "externalId": "APGS0050",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }]
+        }, {
+            "programName": "2.10 Prod Test Program",
+            "programId": "5f3976d6ef9b860797466006",
+            "_id": "5f3976d6ef9b860797466008",
+            "name": "2.10-Prod Test Program",
+            "description": "ಮಧ್ಯಾಹ್ನದ ಬಿಸಿಯೂಟ tool",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "ಮಧ್ಯಾಹ್ನದ-ಬಿಸಿಯೂಟ-tool-1597601494169",
+            "solutionId": "5f3976d6ef9b860797466007",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": true,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5e6b4ffd135b2d734252d21e",
+                "name": "28170400805-MPPS DACHEPALLI(IC)",
+                "externalId": "APGS0001",
+                "entityType": "school",
+                "totalSubmissionCount": 5,
+                "submissions": [{
+                    "_id": "5f5615e6ff083c29b9153821",
+                    "status": "completed",
+                    "submissionNumber": 5,
+                    "entityId": "5e6b4ffd135b2d734252d21e",
+                    "createdAt": "2020-09-07T11:13:42.413Z",
+                    "updatedAt": "2020-09-22T08:21:40.968Z",
+                    "observationName": "2.10-Prod Test Program",
+                    "observationId": "5f3976d6ef9b860797466008",
+                    "title": "Observation 5",
+                    "submissionDate": "2020-09-22T08:21:40.968Z",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5f51ba9140e748299d2d9cec",
+                    "status": "completed",
+                    "submissionNumber": 4,
+                    "entityId": "5e6b4ffd135b2d734252d21e",
+                    "createdAt": "2020-09-04T03:54:57.083Z",
+                    "updatedAt": "2020-09-04T03:55:47.010Z",
+                    "observationName": "2.10-Prod Test Program",
+                    "observationId": "5f3976d6ef9b860797466008",
+                    "title": "Observation 4",
+                    "submissionDate": "2020-09-04T03:55:47.009Z",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5f50fb8140e748299d2d9b09",
+                    "status": "completed",
+                    "submissionNumber": 3,
+                    "entityId": "5e6b4ffd135b2d734252d21e",
+                    "createdAt": "2020-09-03T14:19:45.668Z",
+                    "updatedAt": "2020-09-03T14:20:22.986Z",
+                    "observationName": "2.10-Prod Test Program",
+                    "observationId": "5f3976d6ef9b860797466008",
+                    "title": "Observation 3",
+                    "submissionDate": "2020-09-03T14:20:22.986Z",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5f3cc289224ea019260eac5c",
+                    "status": "completed",
+                    "submissionNumber": 2,
+                    "entityId": "5e6b4ffd135b2d734252d21e",
+                    "createdAt": "2020-08-19T06:11:21.253Z",
+                    "updatedAt": "2020-08-19T06:11:39.776Z",
+                    "observationName": "2.10-Prod Test Program",
+                    "observationId": "5f3976d6ef9b860797466008",
+                    "title": "Observation 2",
+                    "submissionDate": "2020-08-19T06:11:39.775Z",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5f3976dee6663307b3963560",
+                    "status": "completed",
+                    "submissionNumber": 1,
+                    "entityId": "5e6b4ffd135b2d734252d21e",
+                    "createdAt": "2020-08-16T18:11:42.048Z",
+                    "updatedAt": "2020-08-19T06:11:03.722Z",
+                    "observationName": "2.10-Prod Test Program",
+                    "observationId": "5f3976d6ef9b860797466008",
+                    "title": "Observation 1",
+                    "submissionDate": "2020-08-19T06:11:03.722Z",
+                    "ratingCompletedAt": ""
+                }]
+            }, {
+                "_id": "5e6b4ffd135b2d734252d21f",
+                "name": "28170300402-MPPS PULIPADU_SC",
+                "externalId": "APGS0002",
+                "entityType": "school",
+                "totalSubmissionCount": 2,
+                "submissions": [{
+                    "_id": "5f50fb1eff083c29b91534cc",
+                    "status": "started",
+                    "submissionNumber": 2,
+                    "entityId": "5e6b4ffd135b2d734252d21f",
+                    "createdAt": "2020-09-03T14:18:06.035Z",
+                    "updatedAt": "2020-09-03T14:18:06.035Z",
+                    "observationName": "2.10-Prod Test Program",
+                    "observationId": "5f3976d6ef9b860797466008",
+                    "title": "Observation 2",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5f50fb1140e748299d2d9b08",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5e6b4ffd135b2d734252d21f",
+                    "createdAt": "2020-09-03T14:17:53.121Z",
+                    "updatedAt": "2020-09-03T14:17:53.121Z",
+                    "observationName": "2.10-Prod Test Program",
+                    "observationId": "5f3976d6ef9b860797466008",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }, {
+                "_id": "5e6b4ffd135b2d734252d220",
+                "name": "28161901201-MPPS DEVARAPALLE(M)",
+                "externalId": "APGS0003",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d221",
+                "name": "28173300202-MPPS (6TH W)CHINAPARIMI",
+                "externalId": "APGS0004",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d222",
+                "name": "28171700102-MPPS (DW) T CHERUVU",
+                "externalId": "APGS0005",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d223",
+                "name": "28173501305-MPPS SOWPADU",
+                "externalId": "APGS0006",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d224",
+                "name": "28171900802-MPPS DURGI(HW)",
+                "externalId": "APGS0007",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "_id": "5f991144be0e60389529e33b",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5e6b4ffd135b2d734252d224",
+                    "createdAt": "2020-10-28T06:35:48.063Z",
+                    "updatedAt": "2020-10-28T06:35:48.063Z",
+                    "observationName": "2.10-Prod Test Program",
+                    "observationId": "5f3976d6ef9b860797466008",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }, {
+                "_id": "5e6b4ffd135b2d734252d225",
+                "name": "28160700701-MPPS(M) VEERILLAPADU",
+                "externalId": "APGS0008",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d226",
+                "name": "28160300503-MPUPS GUMMADIDURRU",
+                "externalId": "APGS0009",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d227",
+                "name": "28170800103-MPPS(MUSLIM) DODLERU",
+                "externalId": "APGS0010",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d228",
+                "name": "28170900702-MPUPS DIDIGU",
+                "externalId": "APGS0011",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d229",
+                "name": "28173600205-MPPS(HE) ENAMADALA",
+                "externalId": "APGS0012",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d22a",
+                "name": "28171700901-MPPS JULAKALLU (MAIN)",
+                "externalId": "APGS0013",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d22b",
+                "name": "28174500302-MPPS(LE)KAVURU",
+                "externalId": "APGS0014",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d22c",
+                "name": "28174000406-MPPS REDDIPALEM (MP)",
+                "externalId": "APGS0015",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d22d",
+                "name": "28171100304-MPPS(LE)TADEPALLI",
+                "externalId": "APGS0016",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d22e",
+                "name": "28175100902-MPPS G V PALEM",
+                "externalId": "APGS0017",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d22f",
+                "name": "28174801704-MPPS KASUKARRU",
+                "externalId": "APGS0018",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d230",
+                "name": "28172400503-MPPS BETHAPUDI (OLD UP)",
+                "externalId": "APGS0019",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d231",
+                "name": "28160100501-MPPS MALKAPURAM",
+                "externalId": "APGS0020",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d232",
+                "name": "28173901314-MPPS BC COLONY G VPALEM",
+                "externalId": "APGS0021",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d233",
+                "name": "28170500102-MPPS CHENNAYAPALEM (DG TO PS)",
+                "externalId": "APGS0022",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d234",
+                "name": "28171501504-MPPS GUDIPUDI",
+                "externalId": "APGS0023",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d235",
+                "name": "28174401505-MPPS (SC)KR PALEM",
+                "externalId": "APGS0024",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d236",
+                "name": "28162701401-MPUPS L AGRAHARAM",
+                "externalId": "APGS0025",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d237",
+                "name": "28175600316-MPPS M V RAJUPAELM",
+                "externalId": "APGS0026",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d238",
+                "name": "28162500101-MPPS RAMANAKKAPETA(MAIN)",
+                "externalId": "APGS0027",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d239",
+                "name": "28172801109-MPPS (JEN C) DUGGIRALA",
+                "externalId": "APGS0028",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d23a",
+                "name": "28164801603-MPPS VARAHAPATNAM",
+                "externalId": "APGS0029",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d23b",
+                "name": "28160501602-MPPS (HW) KODAVATIKALLU",
+                "externalId": "APGS0030",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d23c",
+                "name": "28160501603-MPPS (BC) KONDAPETA",
+                "externalId": "APGS0031",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d23d",
+                "name": "28161000301-MPPS THOLUKODU",
+                "externalId": "APGS0032",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d23e",
+                "name": "28162200106-MPUPS SITARAMPURAM",
+                "externalId": "APGS0033",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d23f",
+                "name": "28162500203-MPUPS SUREPALLI (DG)",
+                "externalId": "APGS0034",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d240",
+                "name": "28162100304-MPPS KATTUBADIPALEM",
+                "externalId": "APGS0035",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d241",
+                "name": "28162101101-MPPS KOTHAGUDEM",
+                "externalId": "APGS0036",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d242",
+                "name": "28161601703-MPPS NIDAMANURU(R.NAGAR)",
+                "externalId": "APGS0037",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d243",
+                "name": "28171600302-MPPS(H) CHOWTAPAPAYAPALEM",
+                "externalId": "APGS0038",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d244",
+                "name": "28172600202-MPPS ADAVITAKKELLA PADU",
+                "externalId": "APGS0039",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d245",
+                "name": "28171301201-MPPS (LE) KANTHERU",
+                "externalId": "APGS0040",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d246",
+                "name": "28170800407-MPPS YERRABALEM",
+                "externalId": "APGS0041",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d247",
+                "name": "28172200903-MPPS(LE) KUNKALAGUNTA",
+                "externalId": "APGS0042",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d248",
+                "name": "28172300801-MPPS MAIN ROAD NARENPADU",
+                "externalId": "APGS0043",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d249",
+                "name": "28171100102-MPPS PENUMAKA(LE)",
+                "externalId": "APGS0044",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d24a",
+                "name": "28171200804-MPPS HE CHINAKAKANI",
+                "externalId": "APGS0045",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d24b",
+                "name": "28171300802-MPPS RAVELA (LE)",
+                "externalId": "APGS0046",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d24c",
+                "name": "28173800105-MPPS BP VARIPALEM",
+                "externalId": "APGS0047",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d24d",
+                "name": "28171001105-MPPS(MAIN) RAYAPUDI",
+                "externalId": "APGS0048",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d24e",
+                "name": "28171200701-MPPS (HW) KAZA",
+                "externalId": "APGS0049",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5e6b4ffd135b2d734252d24f",
+                "name": "28161601403-MPPS RAMAVARAPPADU (MAIN)",
+                "externalId": "APGS0050",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }]
+        }]
+    }, {
+        "_id": "5d97519482a97bfe6bb811ba",
+        "name": "PGM-PACE-MANTRA-NEEDS-ASSESSMENT-OCT2019",
+        "externalId": "PGM-MANTRA-NEEDS-ASSESSMENT-OCT2019",
+        "description": "PGM-MANTRA-NEEDS-ASSESSMENT-OCT2019",
+        "solutions": [{
+            "programName": "PGM-PACE-MANTRA-NEEDS-ASSESSMENT-OCT2019",
+            "programId": "5d97519482a97bfe6bb811ba",
+            "_id": "5db9196aef7a6518ddab9720",
+            "name": "CRP Visiting Form ",
+            "description": "CRP Visiting Form ",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "47b14664-fad0-11e9-8f85-42010aa00002-OBSERVATION-TEMPLATE",
+            "solutionId": "5db915b7ef7a6518ddab9710",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": false,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5beaa888af0065f0e0a10515",
+                "name": "Apple School",
+                "externalId": "9999999999",
+                "entityType": "school",
+                "totalSubmissionCount": 3,
+                "submissions": [{
+                    "_id": "5f5239f040e748299d2d9db6",
+                    "status": "completed",
+                    "submissionNumber": 3,
+                    "entityId": "5beaa888af0065f0e0a10515",
+                    "createdAt": "2020-09-04T12:58:24.685Z",
+                    "updatedAt": "2020-09-04T13:03:36.729Z",
+                    "observationName": "CRP Visiting Form ",
+                    "observationId": "5db9196aef7a6518ddab9720",
+                    "title": "Observation 3",
+                    "submissionDate": "2020-09-04T13:03:36.729Z",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5f3bd561224ea019260e9d51",
+                    "status": "completed",
+                    "submissionNumber": 2,
+                    "entityId": "5beaa888af0065f0e0a10515",
+                    "createdAt": "2020-08-18T13:19:29.836Z",
+                    "updatedAt": "2020-08-18T13:19:54.127Z",
+                    "observationName": "CRP Visiting Form ",
+                    "observationId": "5db9196aef7a6518ddab9720",
+                    "title": "Observation 2",
+                    "submissionDate": "2020-08-18T13:19:54.127Z",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5db91b46ef7a6518ddab972e",
+                    "status": "completed",
+                    "submissionNumber": 1,
+                    "entityId": "5beaa888af0065f0e0a10515",
+                    "createdAt": "2019-10-30T05:10:30.044Z",
+                    "updatedAt": "2020-08-16T17:24:30.322Z",
+                    "observationName": "CRP Visiting Form ",
+                    "observationId": "5db9196aef7a6518ddab9720",
+                    "title": "Observation 1",
+                    "submissionDate": "2020-08-16T17:24:30.322Z",
+                    "ratingCompletedAt": ""
+                }]
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d0a",
+                "name": "Sachdeva Convent School, Street No.-5 Sangam Vihar (Wazirabad - Jagatpur Road), Delhi",
+                "externalId": "1207229",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "_id": "5dd67d5bfa55ba0ff7c4fe70",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5bfe53ea1d0c350d61b78d0a",
+                    "createdAt": "2019-11-21T12:04:43.351Z",
+                    "updatedAt": "2019-11-21T12:04:43.351Z",
+                    "observationName": "CRP Visiting Form ",
+                    "observationId": "5db9196aef7a6518ddab9720",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d0b",
+                "name": "SMS Public School, A/61 Kh. 13/1, 13/2 near Peeli Kothi Nathupura Delhi",
+                "externalId": "1207235",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "_id": "5e4cfe91a68e8c7af714f6bd",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5bfe53ea1d0c350d61b78d0b",
+                    "createdAt": "2020-02-19T09:23:29.243Z",
+                    "updatedAt": "2020-02-19T09:23:29.243Z",
+                    "observationName": "CRP Visiting Form ",
+                    "observationId": "5db9196aef7a6518ddab9720",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d0c",
+                "name": "Divyansh Public School, Kh.No.28/20 & 29/16/02 Sangam Vihar, Burari, Delhi",
+                "externalId": "1207250",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d0d",
+                "name": "United English Medium School, 17-A, Raj Niwas Marg, Delhi",
+                "externalId": "1207253",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d0e",
+                "name": "A.P.J. International school, Main Jagatpur Road, Wazirabad, Delhi",
+                "externalId": "1207254",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d0f",
+                "name": "Shri Shiv Middle School, Shiv Kutti, Teliwara, Delhi",
+                "externalId": "1208138",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d10",
+                "name": "B.C.C Modern Public School, 467/C-1 Fly Over Ring Road Azadpur Vill Delhi",
+                "externalId": "1309169",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d11",
+                "name": "Sant Gyaneshwar Public School, 8, Khampur, Delhi",
+                "externalId": "1309230",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d12",
+                "name": "Tagore Modern Public School, BN(West ) ShalimarBagh, Delhi",
+                "externalId": "1309236",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d13",
+                "name": "Mata Ram Rakhi Sanatan Dharam Saraswati Bal Mandir, Mehendra Enclave, Gujranwala Town, Delhi",
+                "externalId": "1309240",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d14",
+                "name": "Silver Oak Public School, A-1 Swaroop Nagar, G.T.Karnal Road, Delhi",
+                "externalId": "1309249",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d15",
+                "name": "KAMS Convent School, 122 Main Road, Kushak, No. 2, Delhi",
+                "externalId": "1309282",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d16",
+                "name": "Rao Mehar Chand Saraswati Vidya Mandir, Guru Nanak Nagar, Burari Road, Bhalaswa Dairy, Delhi",
+                "externalId": "1309284",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d17",
+                "name": "Navjeevan Convent School, G-Block, Shradha Nand Colony, Bhalaswa Dairy, Delhi",
+                "externalId": "1309285",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d18",
+                "name": "Rose Valley Public School, Main Rd, Near Balaji Mandir, Palla, Delhi",
+                "externalId": "1309290",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d19",
+                "name": "S S International School, Kh No. 489 & 500, Vill Hiranki, Delhi",
+                "externalId": "1309291",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d1a",
+                "name": "Devraj Narayan Public School, Plot No.12, E-Block, Swami Shradha Nand Colony, Bhalswa Dairy, Delhi",
+                "externalId": "1309293",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d1b",
+                "name": "Savanu International School, Mukhmelpur Road, Zind Pur, Delhi",
+                "externalId": "1309298",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d1c",
+                "name": "Shanti Vidya Mandir, Rajeev Nagar, Bhalswa Dairy, Behind MCD Primary School, Delhi",
+                "externalId": "1309299",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d1d",
+                "name": "Chaudhari Chhoturam Memorial Public School, Bhagat Singh Park, Delhi",
+                "externalId": "1310248",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d1e",
+                "name": "Maharishi Dayanand Public School, Ishwar Colony, Bawana, Delhi",
+                "externalId": "1310266",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d1f",
+                "name": "Roop Krishna Public School, C- Block Shabad Dairy Delhi",
+                "externalId": "1310268",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d20",
+                "name": "Junior Model School, C-13 Suraj Park Badli , Delhi",
+                "externalId": "1310274",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d21",
+                "name": "Orion Convent School, Shahbad Daulat Pur , Delhi",
+                "externalId": "1310275",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d22",
+                "name": "Rana Model School, New Sannoth Colony, Ghoga Mor, Delhi",
+                "externalId": "1310286",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d23",
+                "name": "DAV Public School, Ishwar Colony, Bawana, Delhi",
+                "externalId": "1310423",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d24",
+                "name": "Mansa Vidhya Peeth, Village Bhor Garh Narela Delhi",
+                "externalId": "1310432",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d25",
+                "name": "Summerdales Public School, St. No-27 Swantantra Nagar, Narela, Delhi",
+                "externalId": "1310433",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d26",
+                "name": "Herald Public School, Lampur Road, New Basti, Bankner, Delhi",
+                "externalId": "1310434",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d27",
+                "name": "Angiras Bharti Public School, Lampur Road Bakner Delhi",
+                "externalId": "1310435",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d28",
+                "name": "RAMA DEVI PUBLIC SCHOOL, Kh. No.134, Dariya Pur Road, Ghoga, Delhi",
+                "externalId": "1310436",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d29",
+                "name": "Apolo Convent School, Holambi Kalan, Delhi",
+                "externalId": "1310438",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d2a",
+                "name": "St.Ramjas Convent School, Plot No.342, Vill Bhalswa, Delhi",
+                "externalId": "1310442",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d2b",
+                "name": "Rising Era Convent School, Kh.No. 96, Naya Bans, Vill. Khera Khurd, Delhi",
+                "externalId": "1310449",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d2c",
+                "name": "Happy Child Modern Public School, Kh. No.63/19, Siraspur Road, Khera Garhi, Delhi",
+                "externalId": "1310451",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d2d",
+                "name": "White Leaf Public School, Plot No.80, Gali No-23, Pooth Khurd, Delhi",
+                "externalId": "1310452",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d2e",
+                "name": "Jai Hind International School, 48/20, Krishna Nagar Colony, Singhu Border Road, Narela, Delhi",
+                "externalId": "1310454",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d2f",
+                "name": "Gyanodaya Model Public School, Alipur, Delhi",
+                "externalId": "1310455",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d30",
+                "name": "New Ways Concept School, Plot No.-4, Behind CNG Station, Sect. B-2, Narela, Delhi",
+                "externalId": "1310456",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d31",
+                "name": "GR International School, 154/423, V & PO Pooth Khurd, Delhi",
+                "externalId": "1310459",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d32",
+                "name": "Spring Field School, F D-Block Pitam Pura Delhi",
+                "externalId": "1411188",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d33",
+                "name": "Mother Land Public School, CU-Block Pitam Pura Delhi",
+                "externalId": "1411197",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d34",
+                "name": "Bloom Era Public School, 285/23 Onkar Nagar B-Blk Tri Nagar Delhi",
+                "externalId": "1411199",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d35",
+                "name": "Mahavira International School, 1149 Deva Ram Park Tri Nagar Delhi",
+                "externalId": "1411201",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d36",
+                "name": "Sant Namdev Public School, M.G. Enclave Pirampura Delhi",
+                "externalId": "1411203",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d37",
+                "name": "St. Micheal Academy, F 242, RISHI NAGAR, RANI BAGH, Delhi",
+                "externalId": "1411230",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d39",
+                "name": "Himalaya Foundation School, NS 26, behind JP Block Market, Maurya Enclave, Pitampura, Delhi",
+                "externalId": "1411256",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d3a",
+                "name": "Sun Smile Public School, A1/155 Aman Vihar New Delhi",
+                "externalId": "1412137",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d3b",
+                "name": "R.K.Memorial Public School, Karan Vihar Delhi",
+                "externalId": "1412150",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }]
+        }]
+    }, {
+        "_id": "5f1c5be0499e7a357a6c275a",
+        "name": "General",
+        "externalId": "General",
+        "description": "This observation solution would help resource persons to observe classrooms effectively",
+        "solutions": [{
+            "programName": "General",
+            "programId": "5f1c5be0499e7a357a6c275a",
+            "_id": "5da9a25e2a272c5370f53535",
+            "name": "Classroom Observation Solution ",
+            "description": "This observation solution would help resource persons to observe classrooms effectively",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "7bdedfc2-f194-11e9-8f85-42010aa00002-OBSERVATION-TEMPLATE",
+            "solutionId": "5da997ec2a272c5370f53529",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": false,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5beaa888af0065f0e0a10515",
+                "name": "Apple School",
+                "externalId": "9999999999",
+                "entityType": "school",
+                "totalSubmissionCount": 6,
+                "submissions": [{
+                    "_id": "5e53bc8457747721b044a6e7",
+                    "status": "started",
+                    "submissionNumber": 6,
+                    "entityId": "5beaa888af0065f0e0a10515",
+                    "createdAt": "2020-02-24T12:07:32.034Z",
+                    "updatedAt": "2020-02-24T12:07:32.034Z",
+                    "observationName": "Classroom Observation Solution ",
+                    "observationId": "5da9a25e2a272c5370f53535",
+                    "title": "Observation 6",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5e50c7b7ebe56721a18dca82",
+                    "status": "started",
+                    "submissionNumber": 5,
+                    "entityId": "5beaa888af0065f0e0a10515",
+                    "createdAt": "2020-02-22T06:18:31.372Z",
+                    "updatedAt": "2020-02-22T06:18:31.372Z",
+                    "observationName": "Classroom Observation Solution ",
+                    "observationId": "5da9a25e2a272c5370f53535",
+                    "title": "Observation 5",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5e50c7b357747721b044a1ed",
+                    "status": "started",
+                    "submissionNumber": 4,
+                    "entityId": "5beaa888af0065f0e0a10515",
+                    "createdAt": "2020-02-22T06:18:27.528Z",
+                    "updatedAt": "2020-02-22T06:18:27.528Z",
+                    "observationName": "Classroom Observation Solution ",
+                    "observationId": "5da9a25e2a272c5370f53535",
+                    "title": "Observation 4",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5db1358ff23c3718ec8a092b",
+                    "status": "started",
+                    "submissionNumber": 3,
+                    "entityId": "5beaa888af0065f0e0a10515",
+                    "createdAt": "2019-10-24T05:24:31.243Z",
+                    "updatedAt": "2019-10-24T05:24:31.243Z",
+                    "observationName": "Classroom Observation Solution ",
+                    "observationId": "5da9a25e2a272c5370f53535",
+                    "title": "Observation 3",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5db134b1ef7a6518ddab924a",
+                    "status": "completed",
+                    "submissionNumber": 2,
+                    "entityId": "5beaa888af0065f0e0a10515",
+                    "createdAt": "2019-10-24T05:20:49.214Z",
+                    "updatedAt": "2019-10-24T05:22:53.380Z",
+                    "observationName": "Classroom Observation Solution ",
+                    "observationId": "5da9a25e2a272c5370f53535",
+                    "title": "Observation 2",
+                    "submissionDate": "2019-10-24T05:22:53.379Z",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5da9abc02a272c5370f5353e",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5beaa888af0065f0e0a10515",
+                    "createdAt": "2019-10-18T12:10:40.227Z",
+                    "updatedAt": "2019-10-18T12:10:40.227Z",
+                    "observationName": "Classroom Observation Solution ",
+                    "observationId": "5da9a25e2a272c5370f53535",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d0a",
+                "name": "Sachdeva Convent School, Street No.-5 Sangam Vihar (Wazirabad - Jagatpur Road), Delhi",
+                "externalId": "1207229",
+                "entityType": "school",
+                "totalSubmissionCount": 3,
+                "submissions": [{
+                    "_id": "5da9aad72a272c5370f5353d",
+                    "status": "completed",
+                    "submissionNumber": 3,
+                    "entityId": "5bfe53ea1d0c350d61b78d0a",
+                    "createdAt": "2019-10-18T12:06:47.418Z",
+                    "updatedAt": "2020-08-16T17:26:17.398Z",
+                    "observationName": "Classroom Observation Solution ",
+                    "observationId": "5da9a25e2a272c5370f53535",
+                    "title": "Observation 3",
+                    "submissionDate": "2020-08-16T17:26:17.398Z",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5da9aad42a272c5370f5353c",
+                    "status": "completed",
+                    "submissionNumber": 2,
+                    "entityId": "5bfe53ea1d0c350d61b78d0a",
+                    "createdAt": "2019-10-18T12:06:44.567Z",
+                    "updatedAt": "2019-10-18T12:10:14.787Z",
+                    "observationName": "Classroom Observation Solution ",
+                    "observationId": "5da9a25e2a272c5370f53535",
+                    "title": "Observation 2",
+                    "submissionDate": "2019-10-18T12:10:14.787Z",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5da9a2672a272c5370f53536",
+                    "status": "completed",
+                    "submissionNumber": 1,
+                    "entityId": "5bfe53ea1d0c350d61b78d0a",
+                    "createdAt": "2019-10-18T11:30:47.869Z",
+                    "updatedAt": "2019-10-18T12:05:48.121Z",
+                    "observationName": "Classroom Observation Solution ",
+                    "observationId": "5da9a25e2a272c5370f53535",
+                    "title": "Observation 1",
+                    "submissionDate": "2019-10-18T12:05:48.121Z",
+                    "ratingCompletedAt": ""
+                }]
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d0b",
+                "name": "SMS Public School, A/61 Kh. 13/1, 13/2 near Peeli Kothi Nathupura Delhi",
+                "externalId": "1207235",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "_id": "5f3974fbe6663307b3963554",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5bfe53ea1d0c350d61b78d0b",
+                    "createdAt": "2020-08-16T18:03:39.004Z",
+                    "updatedAt": "2020-08-16T18:03:39.004Z",
+                    "observationName": "Classroom Observation Solution ",
+                    "observationId": "5da9a25e2a272c5370f53535",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d0c",
+                "name": "Divyansh Public School, Kh.No.28/20 & 29/16/02 Sangam Vihar, Burari, Delhi",
+                "externalId": "1207250",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d0d",
+                "name": "United English Medium School, 17-A, Raj Niwas Marg, Delhi",
+                "externalId": "1207253",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "_id": "5e50c7bdebe56721a18dca83",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5bfe53ea1d0c350d61b78d0d",
+                    "createdAt": "2020-02-22T06:18:37.788Z",
+                    "updatedAt": "2020-02-22T06:18:37.788Z",
+                    "observationName": "Classroom Observation Solution ",
+                    "observationId": "5da9a25e2a272c5370f53535",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d0e",
+                "name": "A.P.J. International school, Main Jagatpur Road, Wazirabad, Delhi",
+                "externalId": "1207254",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d0f",
+                "name": "Shri Shiv Middle School, Shiv Kutti, Teliwara, Delhi",
+                "externalId": "1208138",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d10",
+                "name": "B.C.C Modern Public School, 467/C-1 Fly Over Ring Road Azadpur Vill Delhi",
+                "externalId": "1309169",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d11",
+                "name": "Sant Gyaneshwar Public School, 8, Khampur, Delhi",
+                "externalId": "1309230",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d12",
+                "name": "Tagore Modern Public School, BN(West ) ShalimarBagh, Delhi",
+                "externalId": "1309236",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d13",
+                "name": "Mata Ram Rakhi Sanatan Dharam Saraswati Bal Mandir, Mehendra Enclave, Gujranwala Town, Delhi",
+                "externalId": "1309240",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d14",
+                "name": "Silver Oak Public School, A-1 Swaroop Nagar, G.T.Karnal Road, Delhi",
+                "externalId": "1309249",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d15",
+                "name": "KAMS Convent School, 122 Main Road, Kushak, No. 2, Delhi",
+                "externalId": "1309282",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d16",
+                "name": "Rao Mehar Chand Saraswati Vidya Mandir, Guru Nanak Nagar, Burari Road, Bhalaswa Dairy, Delhi",
+                "externalId": "1309284",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d17",
+                "name": "Navjeevan Convent School, G-Block, Shradha Nand Colony, Bhalaswa Dairy, Delhi",
+                "externalId": "1309285",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d18",
+                "name": "Rose Valley Public School, Main Rd, Near Balaji Mandir, Palla, Delhi",
+                "externalId": "1309290",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d19",
+                "name": "S S International School, Kh No. 489 & 500, Vill Hiranki, Delhi",
+                "externalId": "1309291",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d1a",
+                "name": "Devraj Narayan Public School, Plot No.12, E-Block, Swami Shradha Nand Colony, Bhalswa Dairy, Delhi",
+                "externalId": "1309293",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d1b",
+                "name": "Savanu International School, Mukhmelpur Road, Zind Pur, Delhi",
+                "externalId": "1309298",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d1c",
+                "name": "Shanti Vidya Mandir, Rajeev Nagar, Bhalswa Dairy, Behind MCD Primary School, Delhi",
+                "externalId": "1309299",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d1d",
+                "name": "Chaudhari Chhoturam Memorial Public School, Bhagat Singh Park, Delhi",
+                "externalId": "1310248",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d1e",
+                "name": "Maharishi Dayanand Public School, Ishwar Colony, Bawana, Delhi",
+                "externalId": "1310266",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d1f",
+                "name": "Roop Krishna Public School, C- Block Shabad Dairy Delhi",
+                "externalId": "1310268",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d20",
+                "name": "Junior Model School, C-13 Suraj Park Badli , Delhi",
+                "externalId": "1310274",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d21",
+                "name": "Orion Convent School, Shahbad Daulat Pur , Delhi",
+                "externalId": "1310275",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d22",
+                "name": "Rana Model School, New Sannoth Colony, Ghoga Mor, Delhi",
+                "externalId": "1310286",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d23",
+                "name": "DAV Public School, Ishwar Colony, Bawana, Delhi",
+                "externalId": "1310423",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d24",
+                "name": "Mansa Vidhya Peeth, Village Bhor Garh Narela Delhi",
+                "externalId": "1310432",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d25",
+                "name": "Summerdales Public School, St. No-27 Swantantra Nagar, Narela, Delhi",
+                "externalId": "1310433",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d26",
+                "name": "Herald Public School, Lampur Road, New Basti, Bankner, Delhi",
+                "externalId": "1310434",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d27",
+                "name": "Angiras Bharti Public School, Lampur Road Bakner Delhi",
+                "externalId": "1310435",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d28",
+                "name": "RAMA DEVI PUBLIC SCHOOL, Kh. No.134, Dariya Pur Road, Ghoga, Delhi",
+                "externalId": "1310436",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d29",
+                "name": "Apolo Convent School, Holambi Kalan, Delhi",
+                "externalId": "1310438",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d2a",
+                "name": "St.Ramjas Convent School, Plot No.342, Vill Bhalswa, Delhi",
+                "externalId": "1310442",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d2b",
+                "name": "Rising Era Convent School, Kh.No. 96, Naya Bans, Vill. Khera Khurd, Delhi",
+                "externalId": "1310449",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d2c",
+                "name": "Happy Child Modern Public School, Kh. No.63/19, Siraspur Road, Khera Garhi, Delhi",
+                "externalId": "1310451",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d2d",
+                "name": "White Leaf Public School, Plot No.80, Gali No-23, Pooth Khurd, Delhi",
+                "externalId": "1310452",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d2e",
+                "name": "Jai Hind International School, 48/20, Krishna Nagar Colony, Singhu Border Road, Narela, Delhi",
+                "externalId": "1310454",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d2f",
+                "name": "Gyanodaya Model Public School, Alipur, Delhi",
+                "externalId": "1310455",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d30",
+                "name": "New Ways Concept School, Plot No.-4, Behind CNG Station, Sect. B-2, Narela, Delhi",
+                "externalId": "1310456",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d31",
+                "name": "GR International School, 154/423, V & PO Pooth Khurd, Delhi",
+                "externalId": "1310459",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d32",
+                "name": "Spring Field School, F D-Block Pitam Pura Delhi",
+                "externalId": "1411188",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d33",
+                "name": "Mother Land Public School, CU-Block Pitam Pura Delhi",
+                "externalId": "1411197",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d34",
+                "name": "Bloom Era Public School, 285/23 Onkar Nagar B-Blk Tri Nagar Delhi",
+                "externalId": "1411199",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d35",
+                "name": "Mahavira International School, 1149 Deva Ram Park Tri Nagar Delhi",
+                "externalId": "1411201",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d36",
+                "name": "Sant Namdev Public School, M.G. Enclave Pirampura Delhi",
+                "externalId": "1411203",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d37",
+                "name": "St. Micheal Academy, F 242, RISHI NAGAR, RANI BAGH, Delhi",
+                "externalId": "1411230",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d39",
+                "name": "Himalaya Foundation School, NS 26, behind JP Block Market, Maurya Enclave, Pitampura, Delhi",
+                "externalId": "1411256",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d3a",
+                "name": "Sun Smile Public School, A1/155 Aman Vihar New Delhi",
+                "externalId": "1412137",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d3b",
+                "name": "R.K.Memorial Public School, Karan Vihar Delhi",
+                "externalId": "1412150",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }]
+        }]
+    }, {
+        "_id": "5f1c5be0499e7a357a6c2752",
+        "name": "Systemic School Improvement Program",
+        "externalId": "Systemic School Improvement Program",
+        "description": "This is the Support Visit Solution for the SSIP Program in Goa, by Adhyayan Foundation",
+        "solutions": [{
+            "programName": "Systemic School Improvement Program",
+            "programId": "5f1c5be0499e7a357a6c2752",
+            "_id": "5d9711ea5038454f39b19b6e",
+            "name": "Tool Support Visit ",
+            "description": "Includes questions of KhuShi Schools",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "GOA-Adhyayan-Support_Visit-Oct2019-OBSERVATION-TEMPLATE",
+            "solutionId": "5d95b3d93560224b0062ff4d",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": false,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5d2ccc7593fe690ade5e5606",
+                "name": "GHS Agonda",
+                "externalId": "GOA0296",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "_id": "5d9711fa63a0f64f48b9a994",
+                    "status": "completed",
+                    "submissionNumber": 1,
+                    "entityId": "5d2ccc7593fe690ade5e5606",
+                    "createdAt": "2019-10-04T09:33:46.877Z",
+                    "updatedAt": "2020-08-17T04:35:27.263Z",
+                    "observationName": "Tool Support Visit ",
+                    "observationId": "5d9711ea5038454f39b19b6e",
+                    "title": "Observation 1",
+                    "submissionDate": "2020-08-17T04:35:27.263Z",
+                    "ratingCompletedAt": ""
+                }]
+            }, {
+                "_id": "5d2ccc7593fe690ade5e560b",
+                "name": "GHS Baina",
+                "externalId": "GOA0301",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }]
+        }, {
+            "programName": "Systemic School Improvement Program",
+            "programId": "5f1c5be0499e7a357a6c2752",
+            "_id": "5d97115b63a0f64f48b9a992",
+            "name": "Test for new support visit form ",
+            "description": "Includes questions from KhuShi Schools ",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "GOA-Adhyayan-Support_Visit-Oct2019-OBSERVATION-TEMPLATE",
+            "solutionId": "5d95b3d93560224b0062ff4d",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": false,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5d2ccc7593fe690ade5e5606",
+                "name": "GHS Agonda",
+                "externalId": "GOA0296",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "_id": "5d97116e63a0f64f48b9a993",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5d2ccc7593fe690ade5e5606",
+                    "createdAt": "2019-10-04T09:31:26.096Z",
+                    "updatedAt": "2019-10-04T09:31:26.096Z",
+                    "observationName": "Test for new support visit form ",
+                    "observationId": "5d97115b63a0f64f48b9a992",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }]
+        }, {
+            "programName": "Systemic School Improvement Program",
+            "programId": "5f1c5be0499e7a357a6c2752",
+            "_id": "5d805892b5f7dc695d5b80a0",
+            "name": "Support visit",
+            "description": "Test",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "GOA-Adhyayan-Support_Visit-Oct2019-OBSERVATION-TEMPLATE",
+            "solutionId": "5d95b3d93560224b0062ff4d",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": false,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5bfe53ea1d0c350d61b78d0a",
+                "name": "Sachdeva Convent School, Street No.-5 Sangam Vihar (Wazirabad - Jagatpur Road), Delhi",
+                "externalId": "1207229",
+                "entityType": "school",
+                "totalSubmissionCount": 3,
+                "submissions": [{
+                    "_id": "5f3973dfe6663307b396354d",
+                    "status": "started",
+                    "submissionNumber": 2,
+                    "entityId": "5bfe53ea1d0c350d61b78d0a",
+                    "createdAt": "2020-08-16T17:58:55.414Z",
+                    "updatedAt": "2020-08-16T17:58:55.414Z",
+                    "observationName": "Support visit",
+                    "observationId": "5d805892b5f7dc695d5b80a0",
+                    "title": "Observation 2",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5f3973c7ef9b860797465ff8",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5bfe53ea1d0c350d61b78d0a",
+                    "createdAt": "2020-08-16T17:58:31.857Z",
+                    "updatedAt": "2020-08-16T17:58:31.857Z",
+                    "observationName": "Support visit",
+                    "observationId": "5d805892b5f7dc695d5b80a0",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5d80589e1db1f5694d0dbc11",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5bfe53ea1d0c350d61b78d0a",
+                    "createdAt": "2019-09-17T03:53:02.148Z",
+                    "updatedAt": "2019-09-17T03:53:02.148Z",
+                    "observationName": "Support visit",
+                    "observationId": "5d805892b5f7dc695d5b80a0",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }]
+        }]
+    }, {
+        "_id": "5f1c5be0499e7a357a6c274b",
+        "name": "Anekal Block Transformation Program",
+        "externalId": "Anekal Block Transformation Program",
+        "description": "ಮಧ್ಯಾಹ್ನದ ಬಿಸಿಯೂಟ tool",
+        "solutions": [{
+            "programName": "Anekal Block Transformation Program",
+            "programId": "5f1c5be0499e7a357a6c274b",
+            "_id": "5d8c92ac4003b76bebc82f67",
+            "name": "CRP classroom observation",
+            "description": "Test",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "AP-Demo-Observation-OBSERVATION-TEMPLATE",
+            "solutionId": "5d7ba1434558e677d3c1cab4",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": false,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5beaa888af0065f0e0a10515",
+                "name": "Apple School",
+                "externalId": "9999999999",
+                "entityType": "school",
+                "totalSubmissionCount": 2,
+                "submissions": [{
+                    "_id": "5f55bf1440e748299d2d9fe9",
+                    "status": "started",
+                    "submissionNumber": 2,
+                    "entityId": "5beaa888af0065f0e0a10515",
+                    "createdAt": "2020-09-07T05:03:16.927Z",
+                    "updatedAt": "2020-09-07T05:03:16.927Z",
+                    "observationName": "CRP classroom observation",
+                    "observationId": "5d8c92ac4003b76bebc82f67",
+                    "title": "Observation 2",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5d8c92bebf7e3b6bfa7df541",
+                    "status": "completed",
+                    "submissionNumber": 1,
+                    "entityId": "5beaa888af0065f0e0a10515",
+                    "createdAt": "2019-09-26T10:28:14.643Z",
+                    "updatedAt": "2020-09-04T13:25:20.794Z",
+                    "observationName": "CRP classroom observation",
+                    "observationId": "5d8c92ac4003b76bebc82f67",
+                    "title": "Observation 1",
+                    "submissionDate": "2020-09-04T13:25:20.794Z",
+                    "ratingCompletedAt": ""
+                }]
+            }]
+        }, {
+            "programName": "Anekal Block Transformation Program",
+            "programId": "5f1c5be0499e7a357a6c274b",
+            "_id": "5d7f35af4558e677d3c1cb73",
+            "name": "Ap demo",
+            "description": "Classroom Observation form",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "AP-Demo-Observation-OBSERVATION-TEMPLATE",
+            "solutionId": "5d7ba1434558e677d3c1cab4",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": false,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5d7c8cbce3be8677c3fedffa",
+                "name": "AP DEMO -Govt School Santhi Nagar , Vijayawada",
+                "externalId": "APD-S2",
+                "entityType": "school",
+                "totalSubmissionCount": 2,
+                "submissions": [{
+                    "_id": "5d7f368d4558e677d3c1cb75",
+                    "status": "started",
+                    "submissionNumber": 2,
+                    "entityId": "5d7c8cbce3be8677c3fedffa",
+                    "createdAt": "2019-09-16T07:15:25.117Z",
+                    "updatedAt": "2019-09-16T07:15:25.117Z",
+                    "observationName": "Ap demo",
+                    "observationId": "5d7f35af4558e677d3c1cb73",
+                    "title": "Observation 2",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5d7f35d24558e677d3c1cb74",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5d7c8cbce3be8677c3fedffa",
+                    "createdAt": "2019-09-16T07:12:18.501Z",
+                    "updatedAt": "2019-09-16T07:12:18.501Z",
+                    "observationName": "Ap demo",
+                    "observationId": "5d7f35af4558e677d3c1cb73",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }]
+        }, {
+            "programName": "Anekal Block Transformation Program",
+            "programId": "5f1c5be0499e7a357a6c274b",
+            "_id": "5d7c9d1ce3be8677c3fedffe",
+            "name": "AP Demo - CRP Classroom Observation",
+            "description": "CRP Classroom Observation",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "AP-Demo-Observation-OBSERVATION-TEMPLATE",
+            "solutionId": "5d7ba1434558e677d3c1cab4",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": false,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5d7c8cbce3be8677c3fedff9",
+                "name": "AP DEMO -Zilla Parishat High School",
+                "externalId": "APD-S1",
+                "entityType": "school",
+                "totalSubmissionCount": 2,
+                "submissions": [{
+                    "_id": "5f55bd5640e748299d2d9fe8",
+                    "status": "started",
+                    "submissionNumber": 2,
+                    "entityId": "5d7c8cbce3be8677c3fedff9",
+                    "createdAt": "2020-09-07T04:55:50.421Z",
+                    "updatedAt": "2020-09-07T04:55:50.421Z",
+                    "observationName": "AP Demo - CRP Classroom Observation",
+                    "observationId": "5d7c9d1ce3be8677c3fedffe",
+                    "title": "Observation 2",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5d7c9d2de3be8677c3fedfff",
+                    "status": "completed",
+                    "submissionNumber": 1,
+                    "entityId": "5d7c8cbce3be8677c3fedff9",
+                    "createdAt": "2019-09-14T07:56:29.290Z",
+                    "updatedAt": "2019-09-15T13:19:42.953Z",
+                    "observationName": "AP Demo - CRP Classroom Observation",
+                    "observationId": "5d7c9d1ce3be8677c3fedffe",
+                    "title": "Observation 1",
+                    "submissionDate": "2019-09-15T13:19:42.953Z",
+                    "ratingCompletedAt": ""
+                }]
+            }, {
+                "_id": "5d7c8cbce3be8677c3fedffa",
+                "name": "AP DEMO -Govt School Santhi Nagar , Vijayawada",
+                "externalId": "APD-S2",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d6b",
+                "name": "Vivekanand Model School, Mandir Marg, Nangloi Delhi",
+                "externalId": "1617197",
+                "entityType": "school",
+                "totalSubmissionCount": 6,
+                "submissions": [{
+                    "_id": "5dcc02020cf2d23b5bfb417a",
+                    "status": "started",
+                    "submissionNumber": 6,
+                    "entityId": "5bfe53ea1d0c350d61b78d6b",
+                    "createdAt": "2019-11-13T13:15:46.053Z",
+                    "updatedAt": "2019-11-13T13:15:46.053Z",
+                    "observationName": "AP Demo - CRP Classroom Observation",
+                    "observationId": "5d7c9d1ce3be8677c3fedffe",
+                    "title": "Observation 6",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5dcba6bfa31c183b48ef859d",
+                    "status": "started",
+                    "submissionNumber": 5,
+                    "entityId": "5bfe53ea1d0c350d61b78d6b",
+                    "createdAt": "2019-11-13T06:46:23.941Z",
+                    "updatedAt": "2019-11-13T06:46:23.941Z",
+                    "observationName": "AP Demo - CRP Classroom Observation",
+                    "observationId": "5d7c9d1ce3be8677c3fedffe",
+                    "title": "Observation 5",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5dcba6bd0cf2d23b5bfb4068",
+                    "status": "started",
+                    "submissionNumber": 4,
+                    "entityId": "5bfe53ea1d0c350d61b78d6b",
+                    "createdAt": "2019-11-13T06:46:21.833Z",
+                    "updatedAt": "2019-11-13T06:46:21.833Z",
+                    "observationName": "AP Demo - CRP Classroom Observation",
+                    "observationId": "5d7c9d1ce3be8677c3fedffe",
+                    "title": "Observation 4",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5dcba259a31c183b48ef8576",
+                    "status": "completed",
+                    "submissionNumber": 3,
+                    "entityId": "5bfe53ea1d0c350d61b78d6b",
+                    "createdAt": "2019-11-13T06:27:37.772Z",
+                    "updatedAt": "2019-11-13T06:29:01.670Z",
+                    "observationName": "AP Demo - CRP Classroom Observation",
+                    "observationId": "5d7c9d1ce3be8677c3fedffe",
+                    "title": "Observation 3",
+                    "submissionDate": "2019-11-13T06:29:01.670Z",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5d8c5b89bf7e3b6bfa7df53d",
+                    "status": "started",
+                    "submissionNumber": 2,
+                    "entityId": "5bfe53ea1d0c350d61b78d6b",
+                    "createdAt": "2019-09-26T06:32:41.739Z",
+                    "updatedAt": "2019-09-26T06:32:41.739Z",
+                    "observationName": "AP Demo - CRP Classroom Observation",
+                    "observationId": "5d7c9d1ce3be8677c3fedffe",
+                    "title": "Observation 2",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }, {
+                    "_id": "5d7f72634558e677d3c1cb9a",
+                    "status": "completed",
+                    "submissionNumber": 1,
+                    "entityId": "5bfe53ea1d0c350d61b78d6b",
+                    "createdAt": "2019-09-16T11:30:43.670Z",
+                    "updatedAt": "2019-10-18T09:20:58.185Z",
+                    "observationName": "AP Demo - CRP Classroom Observation",
+                    "observationId": "5d7c9d1ce3be8677c3fedffe",
+                    "title": "Observation 1",
+                    "submissionDate": "2019-10-18T09:20:58.185Z",
+                    "ratingCompletedAt": ""
+                }]
+            }, {
+                "_id": "5c0bbab781bdbe330655d15c",
+                "name": "Govt. Boys Sec. School, C-Block , Vivek Vihar, Delhi",
+                "externalId": "1001012",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "_id": "5d7f727ee3be8677c3fee0dd",
+                    "status": "completed",
+                    "submissionNumber": 1,
+                    "entityId": "5c0bbab781bdbe330655d15c",
+                    "createdAt": "2019-09-16T11:31:10.022Z",
+                    "updatedAt": "2019-10-18T09:23:53.648Z",
+                    "observationName": "AP Demo - CRP Classroom Observation",
+                    "observationId": "5d7c9d1ce3be8677c3fedffe",
+                    "title": "Observation 1",
+                    "submissionDate": "2019-10-18T09:23:53.648Z",
+                    "ratingCompletedAt": ""
+                }]
+            }]
+        }]
+    }, {
+        "_id": "5b98d7b6d4f87f317ff615ee",
+        "name": "DCPCR School Development Index 2018-19",
+        "externalId": "PROGID01",
+        "description": "DCPCR School Development Index 2018-19",
+        "solutions": [{
+            "programName": "DCPCR School Development Index 2018-19",
+            "programId": "5b98d7b6d4f87f317ff615ee",
+            "_id": "5d8047431db1f5694d0dbc09",
+            "name": "Safety Checklist ",
+            "description": "To assess the level of safery in schools ",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "School_safety_checklist-Officials_Observation-prod-Aug2019-OBSERVATION-TEMPLATE",
+            "solutionId": "5d70f93a7afa105d7d66d920",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": false,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5bfe53ea1d0c350d61b78d0d",
+                "name": "United English Medium School, 17-A, Raj Niwas Marg, Delhi",
+                "externalId": "1207253",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "_id": "5d804a901db1f5694d0dbc0c",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5bfe53ea1d0c350d61b78d0d",
+                    "createdAt": "2019-09-17T02:53:04.997Z",
+                    "updatedAt": "2019-09-17T02:53:04.997Z",
+                    "observationName": "Safety Checklist ",
+                    "observationId": "5d8047431db1f5694d0dbc09",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d12",
+                "name": "Tagore Modern Public School, BN(West ) ShalimarBagh, Delhi",
+                "externalId": "1309236",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "_id": "5e36d8e6d2fa204e000de156",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5bfe53ea1d0c350d61b78d12",
+                    "createdAt": "2020-02-02T14:12:54.276Z",
+                    "updatedAt": "2020-02-02T14:12:54.276Z",
+                    "observationName": "Safety Checklist ",
+                    "observationId": "5d8047431db1f5694d0dbc09",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }]
+        }, {
+            "programName": "DCPCR School Development Index 2018-19",
+            "programId": "5b98d7b6d4f87f317ff615ee",
+            "_id": "5d7f34de4558e677d3c1cb72",
+            "name": "Demo ap",
+            "description": "This is for demo",
+            "type": "observation",
+            "subType": "school",
+            "solutionExternalId": "School_safety_checklist-Officials_Observation-prod-Aug2019-OBSERVATION-TEMPLATE",
+            "solutionId": "5d70f93a7afa105d7d66d920",
+            "showInHomeScreen": true,
+            "isAPrivateProgram": false,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5bfe53ea1d0c350d61b78d0a",
+                "name": "Sachdeva Convent School, Street No.-5 Sangam Vihar (Wazirabad - Jagatpur Road), Delhi",
+                "externalId": "1207229",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "_id": "5d7f34ede3be8677c3fee0a1",
+                    "status": "started",
+                    "submissionNumber": 1,
+                    "entityId": "5bfe53ea1d0c350d61b78d0a",
+                    "createdAt": "2019-09-16T07:08:29.267Z",
+                    "updatedAt": "2019-09-16T07:08:29.267Z",
+                    "observationName": "Demo ap",
+                    "observationId": "5d7f34de4558e677d3c1cb72",
+                    "title": "Observation 1",
+                    "submissionDate": "",
+                    "ratingCompletedAt": ""
+                }]
+            }, {
+                "_id": "5bfe53ea1d0c350d61b78d0e",
+                "name": "A.P.J. International school, Main Jagatpur Road, Wazirabad, Delhi",
+                "externalId": "1207254",
+                "entityType": "school",
+                "totalSubmissionCount": 0,
+                "submissions": []
+            }]
+        }]
+    }, {
+        "_id": "5d7dbf6b639f5817a1de9239",
+        "name": "MANTRA SHAHASIDDHI 2019 : All schools assessment program",
+        "externalId": "APDEMO-PGM-MANTRA-SHALASIDDHI-2019-001",
+        "description": "APDEMO MANTRA SHAHASIDDHI 2019 : All schools assessment program",
+        "solutions": [{
+            "programName": "MANTRA SHAHASIDDHI 2019 : All schools assessment program",
+            "programId": "5d7dbf6b639f5817a1de9239",
+            "_id": "5d7dbfb6e3be8677c3fee052",
+            "name": "Mantra ShalaSiddhi School Assessment framework 2019",
+            "externalId": "Mantra-SHALASIDDHI-2019-001",
+            "description": "Mantra ShalaSiddhi School Assessment framework 2019",
+            "type": "assessment",
+            "subType": "institutional",
+            "allowMultipleAssessemts": false,
+            "showInHomeScreen": true,
+            "isAPrivateProgram": false,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5d7c8cbce3be8677c3fedff9",
+                "name": "AP DEMO -Zilla Parishat High School",
+                "externalId": "APD-S1",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "submissionNumber": 1,
+                    "title": "Assessment 1",
+                    "_id": "5d7e3ee84558e677d3c1cb62",
+                    "status": "started",
+                    "createdAt": "2019-09-15T13:38:48.628Z",
+                    "updatedAt": "2020-12-18T10:00:46.084Z",
+                    "submissionDate": ""
+                }]
+            }, {
+                "_id": "5d7c8cbce3be8677c3fedffa",
+                "name": "AP DEMO -Govt School Santhi Nagar , Vijayawada",
+                "externalId": "APD-S2",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "submissionNumber": 1,
+                    "title": "Assessment 1",
+                    "_id": "5d7e5779e3be8677c3fee087",
+                    "status": "started",
+                    "createdAt": "2019-09-15T15:23:37.848Z",
+                    "updatedAt": "2020-12-18T10:00:50.003Z",
+                    "submissionDate": ""
+                }]
+            }]
+        }]
+    }, {
+        "_id": "5d7c9a0b639f5817a1dd9317",
+        "name": "AP demo Excellence in school program",
+        "externalId": "PGM-APDEMO_Sept2019-Excellence-In-School-Program",
+        "description": "This is the demo program for AP excellence in school program",
+        "solutions": [{
+            "programName": "AP demo Excellence in school program",
+            "programId": "5d7c9a0b639f5817a1dd9317",
+            "_id": "5d7c8842639f5817a1dd7f4d",
+            "name": "AP Demo Sept 2019 - Mantra STL School Assessment framework 2019",
+            "externalId": "PGM-APDEMO_Sept2019-Mantra-STL-2019-001",
+            "description": "AP Demo Sept 2019 - Mantra STL School Assessment framework 2019",
+            "type": "assessment",
+            "subType": "institutional",
+            "allowMultipleAssessemts": false,
+            "showInHomeScreen": true,
+            "isAPrivateProgram": false,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5d7c8cbce3be8677c3fedff9",
+                "name": "AP DEMO -Zilla Parishat High School",
+                "externalId": "APD-S1",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "submissionNumber": 1,
+                    "title": "Assessment 1",
+                    "_id": "5d7c9c6e4558e677d3c1cb27",
+                    "status": "started",
+                    "createdAt": "2019-09-14T07:53:18.907Z",
+                    "updatedAt": "2020-12-18T10:00:56.416Z",
+                    "submissionDate": ""
+                }]
+            }, {
+                "_id": "5d7c8cbce3be8677c3fedffa",
+                "name": "AP DEMO -Govt School Santhi Nagar , Vijayawada",
+                "externalId": "APD-S2",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "submissionNumber": 1,
+                    "title": "Assessment 1",
+                    "_id": "5d7cace04558e677d3c1cb2a",
+                    "status": "started",
+                    "createdAt": "2019-09-14T09:03:28.382Z",
+                    "updatedAt": "2019-09-14T09:03:28.382Z",
+                    "submissionDate": ""
+                }]
+            }]
+        }]
+    }, {
+        "_id": "5d7c86cb639f5817a1dd7d7e",
+        "name": "AP demo School development index",
+        "externalId": "PGM-APDEMO_Sept2019-SDI",
+        "description": "This is the demo program for AP School development index",
+        "solutions": [{
+            "programName": "AP demo School development index",
+            "programId": "5d7c86cb639f5817a1dd7d7e",
+            "_id": "5d7c87a7639f5817a1dd7e8f",
+            "name": "AP Demo Sept 2019 - DCPCR Assessment Framework 2018",
+            "externalId": "PGM-APDEMO_Sept2019-EF-DCPCR-2018-001",
+            "description": "AP Demo Sept 2019 - DCPCR Assessment Framework 2018",
+            "type": "assessment",
+            "subType": "institutional",
+            "allowMultipleAssessemts": false,
+            "showInHomeScreen": true,
+            "isAPrivateProgram": false,
+            "entityType": "school",
+            "entityTypeId": "5d28233dd772d270e55b4072",
+            "entities": [{
+                "_id": "5d7c8cbce3be8677c3fedff9",
+                "name": "AP DEMO -Zilla Parishat High School",
+                "externalId": "APD-S1",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "submissionNumber": 1,
+                    "title": "Assessment 1",
+                    "_id": "5d7c8eade3be8677c3fedffc",
+                    "status": "started",
+                    "createdAt": "2019-09-14T06:54:37.315Z",
+                    "updatedAt": "2020-10-28T06:35:35.760Z",
+                    "submissionDate": ""
+                }]
+            }, {
+                "_id": "5d7c8cbce3be8677c3fedffa",
+                "name": "AP DEMO -Govt School Santhi Nagar , Vijayawada",
+                "externalId": "APD-S2",
+                "entityType": "school",
+                "totalSubmissionCount": 1,
+                "submissions": [{
+                    "submissionNumber": 1,
+                    "title": "Assessment 1",
+                    "_id": "5d7c8eb74558e677d3c1cb26",
+                    "status": "started",
+                    "createdAt": "2019-09-14T06:54:47.356Z",
+                    "updatedAt": "2020-09-07T04:55:33.771Z",
+                    "submissionDate": ""
+                }]
+            }]
+        }]
+    }]
+}
\ No newline at end of file
diff --git a/src/assets/dummy/projectDetails.json b/src/assets/dummy/projectDetails.json
new file mode 100644
index 000000000..76b1e87e0
--- /dev/null
+++ b/src/assets/dummy/projectDetails.json
@@ -0,0 +1,93 @@
+{
+    "message": "Successfully fetched projects",
+    "status": 200,
+    "result": {
+        "_id": "5fd7201c04b0890391b92062",
+        "userId": "e7719630-0457-47ca-a5ce-8190ffb34f13",
+        "status": "inProgress",
+        "isDeleted": false,
+        "categories": [
+            {
+                "_id": "5fc714ef94fda51a7fe90829",
+                "name": "Education Leader",
+                "externalId": "educationLeader"
+            },
+            {
+                "name": "tstts",
+                "externalId": "",
+                "_id": ""
+            }
+        ],
+        "tasks": [
+            {
+                "_id": "145415cc-8378-4399-baa9-94058ef156ea",
+                "status": "inProgress",
+                "name": "task 1",
+                "endDate": "",
+                "assignee": "",
+                "type": "simple",
+                "attachments": [],
+                "startDate": "",
+                "children": [],
+                "isDeleted": false,
+                "isDeletable": true,
+                "externalId": "task 1",
+                "isDeleteable": true,
+                "createdAt": "2020-12-14T08:19:41.663Z",
+                "updatedAt": "2020-12-15T09:37:17.115Z",
+                "isImportedFromLibrary": false,
+                "syncedAt": "2020-12-15T09:37:17.115Z",
+                "updatedBy": "e7719630-0457-47ca-a5ce-8190ffb34f13"
+            },
+            {
+                "_id": "1c59fa7e-61a1-4ddf-95d0-557aedbd1c78",
+                "status": "completed",
+                "name": "12345",
+                "endDate": "",
+                "assignee": "",
+                "type": "simple",
+                "attachments": [],
+                "startDate": "",
+                "children": [],
+                "isDeleted": false,
+                "isDeletable": true,
+                "externalId": "12345",
+                "isDeleteable": true,
+                "createdAt": "2020-12-15T10:13:56.457Z",
+                "updatedAt": "2020-12-15T10:13:56.457Z",
+                "isImportedFromLibrary": false,
+                "syncedAt": "2020-12-15T10:13:56.457Z",
+                "updatedBy": "e7719630-0457-47ca-a5ce-8190ffb34f13"
+            }
+        ],
+        "learningResources": [
+            {
+                "name": "\"Disadvantaged group\" in Right To Education act (RTE) : Did You Know?",
+                "id": "do_3128812241620254721830",
+                "link": "https://qa.bodh.shikshalokam.org/resources/play/content/do_3128812241620254721830",
+                "isChecked": true
+            },
+            {
+                "name": "\"Weaker section\" in Right To Education act, 2009 : Did You Know?",
+                "id": "do_3128812341787279361837",
+                "link": "https://qa.bodh.shikshalokam.org/resources/play/content/do_3128812341787279361837",
+                "isChecked": true
+            }
+        ],
+        "deleted": false,
+        "lastDownloadedAt": "2020-12-28T05:34:52.193Z",
+        "updatedAt": "2020-12-15T10:13:56.458Z",
+        "createdAt": "2020-12-14T08:19:40.735Z",
+        "description": "Karnataka Flash Visit-2019-FRAMEWORK",
+        "entityId": "5bfe53ea1d0c350d61b78d0a",
+        "lastSync": "2020-12-15T10:13:56.457Z",
+        "programExternalId": "Dummy program-1607933981574",
+        "programId": "5fd7201d08f9fd0f3644b84e",
+        "solutionExternalId": "e7719630-0457-47ca-a5ce-8190ffb34f13-1607933981574",
+        "solutionId": "5fd7201d08f9fd0f3644b84f",
+        "syncedAt": "2020-12-15T10:13:56.457Z",
+        "title": "Karnataka Flash Visit-2019-FRAMEWORK",
+        "entityName": "Sachdeva Convent School, Street No.-5 Sangam Vihar (Wazirabad - Jagatpur Road), Delhi",
+        "programName": "Karnataka Flash Visit-2019-FRAMEWORK"
+    }
+}
\ No newline at end of file
diff --git a/src/assets/dummy/projectFullReport.json b/src/assets/dummy/projectFullReport.json
new file mode 100644
index 000000000..3878102dd
--- /dev/null
+++ b/src/assets/dummy/projectFullReport.json
@@ -0,0 +1,157 @@
+{
+    "message": "Chart report data generated succesfully.",
+    "status": 200,
+    "result": [{
+        "title": {
+            "text": "second deletd project"
+        },
+        "series": [{
+            "name": "second deletd project",
+            "data": [{
+                "name": "sample",
+                "color": "#f5f5f5",
+                "start": null,
+                "end": null
+            }]
+        }],
+        "xAxis": {
+            "min": null,
+            "max": null
+        }
+    }, {
+        "title": {
+            "text": "Virtual Learning"
+        },
+        "series": [{
+            "name": "Virtual Learning",
+            "data": [{
+                "name": "Getting feedback (From students and parents)",
+                "color": "#f5f5f5",
+                "start": 1609990942054,
+                "end": 1609990942054
+            }, {
+                "name": "Mapping grades and teachers.",
+                "color": "#f5f5f5",
+                "start": 1609990942054,
+                "end": 1609990942054
+            }, {
+                "name": "Dividing students into groups of up to ten within the class",
+                "color": "#f5f5f5",
+                "start": 1609990942054,
+                "end": 1609990942054
+            }, {
+                "name": "Collating information from the school directory about student contact info",
+                "color": "#f5f5f5",
+                "start": 1609990942054,
+                "end": 1609990942054
+            }, {
+                "name": "Making resources and plans.",
+                "color": "#f5f5f5",
+                "start": 1609990942054,
+                "end": 1609990942055
+            }, {
+                "name": "Planning for monitoring and evaluation",
+                "color": "#f5f5f5",
+                "start": 1609990942055,
+                "end": 1609990942055
+            }, {
+                "name": "Having a timetable.",
+                "color": "#f5f5f5",
+                "start": 1609990942055,
+                "end": 1609990942055
+            }, {
+                "name": "Session for parents to orient them",
+                "color": "#f5f5f5",
+                "start": 1609990942055,
+                "end": 1609990942055
+            }, {
+                "name": "Scheduling calls and invitations.",
+                "color": "#f5f5f5",
+                "start": 1609990942056,
+                "end": 1609990942056
+            }, {
+                "name": "Taking classes.",
+                "color": "#f5f5f5",
+                "start": 1609990942056,
+                "end": 1609990942056
+            }, {
+                "name": "Recurring reflection cycles with the school team(SL and teachers)",
+                "color": "#f5f5f5",
+                "start": 1609990942056,
+                "end": 1609990942056
+            }]
+        }],
+        "xAxis": {
+            "min": 1609990942054,
+            "max": 1609990942056
+        }
+    }, {
+        "title": {
+            "text": "Template-05-01-20201"
+        },
+        "series": [{
+            "name": "Template-05-01-20201",
+            "data": [{
+                "name": "My test ",
+                "color": "#ef8c2b",
+                "start": null,
+                "end": null
+            }]
+        }],
+        "xAxis": {
+            "min": null,
+            "max": null
+        }
+    }, {
+        "title": {
+            "text": "isPrivateProgram testing"
+        },
+        "series": [{
+            "name": "isPrivateProgram testing",
+            "data": [{
+                "name": "task 1",
+                "color": "#f5f5f5",
+                "start": null,
+                "end": null
+            }]
+        }],
+        "xAxis": {
+            "min": null,
+            "max": null
+        }
+    }, {
+        "title": {
+            "text": "Qa test template – kiran"
+        },
+        "series": [{
+            "name": "Qa test template – kiran",
+            "data": [{
+                "name": "task 1",
+                "color": "#f5f5f5",
+                "start": null,
+                "end": null
+            }]
+        }],
+        "xAxis": {
+            "min": null,
+            "max": null
+        }
+    }, {
+        "title": {
+            "text": "test project wit isPrivateProgram"
+        },
+        "series": [{
+            "name": "test project wit isPrivateProgram",
+            "data": [{
+                "name": "task 1",
+                "color": "#f5f5f5",
+                "start": null,
+                "end": null
+            }]
+        }],
+        "xAxis": {
+            "min": null,
+            "max": null
+        }
+    }]
+}
\ No newline at end of file
diff --git a/src/assets/dummy/projectList.json b/src/assets/dummy/projectList.json
new file mode 100644
index 000000000..06cd42cb7
--- /dev/null
+++ b/src/assets/dummy/projectList.json
@@ -0,0 +1,29 @@
+{
+    "status": 200,
+    "message": "Users observations fetched successfully",
+    "result": {
+        "data": [
+            {
+                "_id": "5fd7201c04b0890391b92062",
+                "externalId": "Karnataka Flash Visit-2019-FRAMEWORK",
+                "name": "Karnataka Flash Visit-2019-FRAMEWORK",
+                "description": "Karnataka Flash Visit-2019-FRAMEWORK",
+                "programName": "Karnataka Flash Visit-2019-FRAMEWORK",
+                "solutionId": "5beaaa2baf0065f0e0a105c7",
+                "programId": "5beaaa2baf0065f0e0a105c7",
+                "entityId": "5beaaa2baf0065f0e0a105c7"
+            },
+            {
+                "_id": "",
+                "externalId": "PUNJAB-2019-FRAMEWORK",
+                "name": "PUNJAB-2019-FRAMEWORK",
+                "description": "PUNJAB-2019-FRAMEWORK",
+                "programName": "PUNJAB -2019-FRAMEWORK",
+                "solutionId": "5beaaa2baf0065f0e0a105c7",
+                "programId": "5beaaa2baf0065f0e0a105c7",
+                "entityId": "5beaaa2baf0065f0e0a105c7"
+            }
+        ],
+        "count": 2
+    }
+}
\ No newline at end of file
diff --git a/src/assets/dummy/projectOverAllReports.json b/src/assets/dummy/projectOverAllReports.json
new file mode 100644
index 000000000..c0e02c06e
--- /dev/null
+++ b/src/assets/dummy/projectOverAllReports.json
@@ -0,0 +1,32 @@
+{
+    "message": "Reports generated successfully.",
+    "status": 200,
+    "result": {
+        "dataAvailable": true,
+        "data": {
+            "categories": {
+                "total": 11,
+                "schoolProcess": 2,
+                "ting": 1,
+                "students": 1,
+                "community": 3,
+                "teachers": 2,
+                "educationLeader": 2
+            },
+            "tasks": {
+                "total": 15,
+                "overdue": 0,
+                "completed": 0,
+                "inProgress": 1,
+                "notStarted": 14
+            },
+            "projects": {
+                "total": 6,
+                "overdue": 0,
+                "completed": 0,
+                "inProgress": 1,
+                "notStarted": 5
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/assets/dummy/reportTypes.json b/src/assets/dummy/reportTypes.json
new file mode 100644
index 000000000..3008a9f4b
--- /dev/null
+++ b/src/assets/dummy/reportTypes.json
@@ -0,0 +1,14 @@
+{
+    "message": "Report types fetched successfully.",
+    "status": 200,
+    "result": [{
+        "label": "Weekly",
+        "value": 0
+    }, {
+        "label": "Monthly",
+        "value": 1
+    }, {
+        "label": "Quarterly",
+        "value": 2
+    }]
+}
\ No newline at end of file
diff --git a/src/assets/dummy/submissionCount.json b/src/assets/dummy/submissionCount.json
new file mode 100644
index 000000000..314e00f2a
--- /dev/null
+++ b/src/assets/dummy/submissionCount.json
@@ -0,0 +1,6 @@
+{
+    "result": false,
+    "data": {
+        "noOfSubmissions": 0
+    }
+}
\ No newline at end of file
diff --git a/src/assets/dummy/surveyReport.json b/src/assets/dummy/surveyReport.json
new file mode 100644
index 000000000..7e0ff1806
--- /dev/null
+++ b/src/assets/dummy/surveyReport.json
@@ -0,0 +1,49 @@
+{
+    "solutionName": "Survey and feedback ios test solution",
+    "response": [{
+        "order": "TSF01_1603872876577",
+        "question": "is electrical wiring / boards closed and insulated?",
+        "responseType": "text",
+        "answers": ["Yes"],
+        "chart": {},
+        "instanceQuestions": []
+    }, {
+        "order": "TSF02_1603872876577",
+        "question": "Name of the school?",
+        "responseType": "text",
+        "answers": ["Check"],
+        "chart": {},
+        "instanceQuestions": []
+    }, {
+        "order": "TSF03_1603872876577",
+        "question": "Grade?",
+        "responseType": "slider",
+        "answers": ["2"],
+        "chart": {},
+        "instanceQuestions": []
+    }, {
+        "order": "TSF04_1603872876577",
+        "question": "Which of the following is functional in the toilets of the school?",
+        "responseType": "text",
+        "answers": ["Taps"],
+        "chart": {},
+        "instanceQuestions": []
+    }],
+    "allQuestions": [{
+        "questionName": "is electrical wiring / boards closed and insulated?",
+        "questionExternalId": "TSF01_1603872876577",
+        "questionId": "5f9928804c471038be63a6e0"
+    }, {
+        "questionName": "Name of the school?",
+        "questionExternalId": "TSF02_1603872876577",
+        "questionId": "5f9928804c471038be63a6e1"
+    }, {
+        "questionName": "Grade?",
+        "questionExternalId": "TSF03_1603872876577",
+        "questionId": "5f9928804c471038be63a6de"
+    }, {
+        "questionName": "Which of the following is functional in the toilets of the school?",
+        "questionExternalId": "TSF04_1603872876577",
+        "questionId": "5f9928804c471038be63a6df"
+    }]
+}
\ No newline at end of file
diff --git a/src/assets/dummy/surveydetails.json b/src/assets/dummy/surveydetails.json
new file mode 100644
index 000000000..586ced84b
--- /dev/null
+++ b/src/assets/dummy/surveydetails.json
@@ -0,0 +1,597 @@
+{
+    "message": "Survey details fetched successfully",
+    "status": 200,
+    "result": {
+        "solution": {
+            "_id": "5fe45212b4eacd03141f89d2",
+            "externalId": "849f72ec-45c2-11eb-ade0-0adfd2b35fc6-1608798738561",
+            "name": "Survey of Diksha awareness - Test",
+            "description": "The survey is to understand if parents have been able to enroll child into diksha courses and the challenges if not.",
+            "captureGpsLocationAtQuestionLevel": false,
+            "enableQuestionReadOut": false
+        },
+        "assessment": {
+            "name": "Survey of Diksha awareness - Test",
+            "description": "The survey is to understand if parents have been able to enroll child into diksha courses and the challenges if not.",
+            "externalId": "849f72ec-45c2-11eb-ade0-0adfd2b35fc6-1608798738561",
+            "submissionId": "5fe45777c567d70331fc46b6",
+            "evidences": [{
+                "code": "SF",
+                "sections": [{
+                    "code": "SQ",
+                    "questions": [{
+                        "_id": "",
+                        "question": "",
+                        "isCompleted": "",
+                        "showRemarks": "",
+                        "options": "",
+                        "sliderOptions": "",
+                        "children": "",
+                        "questionGroup": "",
+                        "fileName": "",
+                        "instanceQuestions": "",
+                        "isAGeneralQuestion": "",
+                        "autoCapture": "",
+                        "allowAudioRecording": "",
+                        "prefillFromEntityProfile": "",
+                        "entityFieldName": "",
+                        "isEditable": "",
+                        "showQuestionInPreview": "",
+                        "deleted": "",
+                        "remarks": "",
+                        "value": "",
+                        "usedForScoring": "",
+                        "questionType": "",
+                        "canBeNotApplicable": "",
+                        "visibleIf": "",
+                        "validation": "",
+                        "file": "",
+                        "externalId": "",
+                        "tip": "",
+                        "hint": "",
+                        "responseType": "pageQuestions",
+                        "modeOfCollection": "",
+                        "accessibility": "",
+                        "rubricLevel": "",
+                        "sectionHeader": "",
+                        "page": "p1",
+                        "questionNumber": "",
+                        "updatedAt": "",
+                        "createdAt": "",
+                        "__v": "",
+                        "createdFromQuestionId": "",
+                        "evidenceMethod": "",
+                        "payload": "",
+                        "startTime": "",
+                        "endTime": "",
+                        "gpsLocation": "",
+                        "pageQuestions": [{
+                            "_id": "5fe45212b4eacd03141f89c9",
+                            "question": ["Which class does your child study in?", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "showQuestionInPreview": false,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": true,
+                                "IsNumber": "true"
+                            },
+                            "file": {
+                                "required": true,
+                                "type": ["image/jpeg", "docx", "pdf", "ppt"],
+                                "minCount": 0,
+                                "maxCount": 10,
+                                "caption": "FALSE"
+                            },
+                            "externalId": "Q1_1608798725523-1608798738568",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "number",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p1",
+                            "questionNumber": "1",
+                            "updatedAt": "2020-12-24T08:32:18.583Z",
+                            "createdAt": "2020-12-24T08:32:15.728Z",
+                            "__v": 0,
+                            "createdFromQuestionId": "5fe4520fc567d70331fc46aa",
+                            "evidenceMethod": "SF",
+                            "payload": {
+                                "criteriaId": "5fe45212b4eacd03141f89d1",
+                                "responseType": "number",
+                                "evidenceMethod": "SF",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": ""
+                        }, {
+                            "_id": "5fe45212b4eacd03141f89ca",
+                            "question": ["Are you currently living  in the vicinity of the school?", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [{
+                                "value": "R1",
+                                "label": "Yes"
+                            }, {
+                                "value": "R2",
+                                "label": "No"
+                            }],
+                            "sliderOptions": [],
+                            "children": ["5fe45212b4eacd03141f89cb"],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "showQuestionInPreview": false,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": true
+                            },
+                            "file": {
+                                "required": true,
+                                "type": ["image/jpeg", "docx", "pdf", "ppt"],
+                                "minCount": 0,
+                                "maxCount": 10,
+                                "caption": "FALSE"
+                            },
+                            "externalId": "Q2_1608798725523-1608798738570",
+                            "tip": "",
+                            "hint": "Use the name of the locality where the school is",
+                            "responseType": "radio",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p1",
+                            "questionNumber": "2",
+                            "updatedAt": "2020-12-24T08:32:18.584Z",
+                            "createdAt": "2020-12-24T08:32:15.746Z",
+                            "__v": 0,
+                            "createdFromQuestionId": "5fe4520fc567d70331fc46ab",
+                            "evidenceMethod": "SF",
+                            "payload": {
+                                "criteriaId": "5fe45212b4eacd03141f89d1",
+                                "responseType": "radio",
+                                "evidenceMethod": "SF",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": ""
+                        }, {
+                            "_id": "5fe45212b4eacd03141f89cb",
+                            "question": ["Are you planning to come back?", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [{
+                                "value": "R1",
+                                "label": "Yes"
+                            }, {
+                                "value": "R2",
+                                "label": "No"
+                            }],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "showQuestionInPreview": false,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": [{
+                                "operator": "===",
+                                "value": ["R2"],
+                                "_id": "5fe45212b4eacd03141f89ca"
+                            }],
+                            "validation": {
+                                "required": false
+                            },
+                            "externalId": "Q3_1608798725523-1608798738571",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "radio",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p1",
+                            "questionNumber": "2.1",
+                            "updatedAt": "2020-12-24T08:32:18.584Z",
+                            "createdAt": "2020-12-24T08:32:15.759Z",
+                            "__v": 0,
+                            "createdFromQuestionId": "5fe4520fc567d70331fc46ac",
+                            "evidenceMethod": "SF",
+                            "payload": {
+                                "criteriaId": "5fe45212b4eacd03141f89d1",
+                                "responseType": "radio",
+                                "evidenceMethod": "SF",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5fe45212b4eacd03141f89cc",
+                            "question": ["What type of device is available at home?", ""],
+                            "isCompleted": false,
+                            "showRemarks": true,
+                            "options": [{
+                                "value": "R1",
+                                "label": "Simple mobile phone without internet/data pack"
+                            }, {
+                                "value": "R2",
+                                "label": "Smart phone with internet/data pack"
+                            }, {
+                                "value": "R3",
+                                "label": "Smart phone without internet/data pack"
+                            }, {
+                                "value": "R4",
+                                "label": "TV"
+                            }, {
+                                "value": "R5",
+                                "label": "Radio"
+                            }],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "showQuestionInPreview": false,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "Q4_1608798725523-1608798738573",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "multiselect",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p1",
+                            "questionNumber": "3",
+                            "updatedAt": "2020-12-24T08:32:18.584Z",
+                            "createdAt": "2020-12-24T08:32:15.775Z",
+                            "__v": 0,
+                            "createdFromQuestionId": "5fe4520fc567d70331fc46ad",
+                            "evidenceMethod": "SF",
+                            "payload": {
+                                "criteriaId": "5fe45212b4eacd03141f89d1",
+                                "responseType": "multiselect",
+                                "evidenceMethod": "SF",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5fe45212b4eacd03141f89cd",
+                            "question": ["Does the child have a quiet place to study?", ""],
+                            "isCompleted": false,
+                            "showRemarks": true,
+                            "options": [{
+                                "value": "R1",
+                                "label": "Yes"
+                            }, {
+                                "value": "R2",
+                                "label": "No"
+                            }],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "showQuestionInPreview": false,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "Q5_1608798725523-1608798738575",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "radio",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p1",
+                            "questionNumber": "4",
+                            "updatedAt": "2020-12-24T08:32:18.584Z",
+                            "createdAt": "2020-12-24T08:32:15.789Z",
+                            "__v": 0,
+                            "createdFromQuestionId": "5fe4520fc567d70331fc46ae",
+                            "evidenceMethod": "SF",
+                            "payload": {
+                                "criteriaId": "5fe45212b4eacd03141f89d1",
+                                "responseType": "radio",
+                                "evidenceMethod": "SF",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5fe45212b4eacd03141f89ce",
+                            "question": ["Were you able to enroll your child in courses on Diksha?", ""],
+                            "isCompleted": false,
+                            "showRemarks": false,
+                            "options": [{
+                                "value": "R1",
+                                "label": "Yes"
+                            }, {
+                                "value": "R2",
+                                "label": "No"
+                            }],
+                            "sliderOptions": [],
+                            "children": ["5fe45212b4eacd03141f89cf"],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "showQuestionInPreview": false,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "Q6_1608798725523-1608798738576",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "radio",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p1",
+                            "questionNumber": "5",
+                            "updatedAt": "2020-12-24T08:32:18.584Z",
+                            "createdAt": "2020-12-24T08:32:15.802Z",
+                            "__v": 0,
+                            "createdFromQuestionId": "5fe4520fc567d70331fc46af",
+                            "evidenceMethod": "SF",
+                            "payload": {
+                                "criteriaId": "5fe45212b4eacd03141f89d1",
+                                "responseType": "radio",
+                                "evidenceMethod": "SF",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5fe45212b4eacd03141f89cf",
+                            "question": ["What are the challenges that you are facing in enrolment?", ""],
+                            "isCompleted": false,
+                            "showRemarks": true,
+                            "options": [{
+                                "value": "R1",
+                                "label": "Not able to use the app"
+                            }, {
+                                "value": "R2",
+                                "label": "Not aware of classrooms on DIKSHA"
+                            }, {
+                                "value": "R3",
+                                "label": "Not aware of the enrolment process in the classroom"
+                            }, {
+                                "value": "R4",
+                                "label": "Not aware of enrolment process in the courses"
+                            }, {
+                                "value": "R5",
+                                "label": "Don’t find the courses useful"
+                            }, {
+                                "value": "R6",
+                                "label": "Others"
+                            }],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "showQuestionInPreview": false,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": [{
+                                "operator": "===",
+                                "value": ["R2"],
+                                "_id": "5fe45212b4eacd03141f89ce"
+                            }],
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "Q7_1608798725523-1608798738577",
+                            "tip": "",
+                            "hint": "",
+                            "responseType": "multiselect",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p1",
+                            "questionNumber": "5.1",
+                            "updatedAt": "2020-12-24T08:32:18.584Z",
+                            "createdAt": "2020-12-24T08:32:15.815Z",
+                            "__v": 0,
+                            "createdFromQuestionId": "5fe4520fc567d70331fc46b0",
+                            "evidenceMethod": "SF",
+                            "payload": {
+                                "criteriaId": "5fe45212b4eacd03141f89d1",
+                                "responseType": "multiselect",
+                                "evidenceMethod": "SF",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }, {
+                            "_id": "5fe45212b4eacd03141f89d0",
+                            "question": ["On basis of the responses received above, do you think this student is a potential drop out?", ""],
+                            "isCompleted": false,
+                            "showRemarks": true,
+                            "options": [{
+                                "value": "R1",
+                                "label": "Yes"
+                            }, {
+                                "value": "R2",
+                                "label": "No"
+                            }],
+                            "sliderOptions": [],
+                            "children": [],
+                            "questionGroup": ["A1"],
+                            "fileName": [],
+                            "instanceQuestions": [],
+                            "isAGeneralQuestion": false,
+                            "autoCapture": false,
+                            "allowAudioRecording": false,
+                            "prefillFromEntityProfile": false,
+                            "entityFieldName": "",
+                            "isEditable": true,
+                            "showQuestionInPreview": false,
+                            "deleted": false,
+                            "remarks": "",
+                            "value": "",
+                            "usedForScoring": "",
+                            "questionType": "auto",
+                            "canBeNotApplicable": "false",
+                            "visibleIf": "",
+                            "validation": {
+                                "required": true
+                            },
+                            "externalId": "Q8_1608798725523-1608798738578",
+                            "tip": "Fill this based on the  parents' answers",
+                            "hint": "",
+                            "responseType": "radio",
+                            "modeOfCollection": "onfield",
+                            "accessibility": "No",
+                            "rubricLevel": "",
+                            "sectionHeader": "",
+                            "page": "p1",
+                            "questionNumber": "6",
+                            "updatedAt": "2020-12-24T08:32:18.584Z",
+                            "createdAt": "2020-12-24T08:32:15.833Z",
+                            "__v": 0,
+                            "createdFromQuestionId": "5fe4520fc567d70331fc46b1",
+                            "evidenceMethod": "SF",
+                            "payload": {
+                                "criteriaId": "5fe45212b4eacd03141f89d1",
+                                "responseType": "radio",
+                                "evidenceMethod": "SF",
+                                "rubricLevel": ""
+                            },
+                            "startTime": "",
+                            "endTime": "",
+                            "gpsLocation": "",
+                            "file": ""
+                        }]
+                    }],
+                    "name": "Survey Questions"
+                }],
+                "externalId": "SF",
+                "name": "Survey And Feedback",
+                "description": "Survey And Feedback",
+                "modeOfCollection": "",
+                "canBeNotApplicable": false,
+                "notApplicable": false,
+                "canBeNotAllowed": false,
+                "remarks": "",
+                "isActive": true,
+                "startTime": "",
+                "endTime": "",
+                "isSubmitted": false,
+                "submissions": []
+            }],
+            "submissions": {}
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/assets/dummy/surveylisting.json b/src/assets/dummy/surveylisting.json
new file mode 100644
index 000000000..5e94d0fb3
--- /dev/null
+++ b/src/assets/dummy/surveylisting.json
@@ -0,0 +1,15 @@
+{
+    "message": "survey list fetched successfully",
+    "status": 200,
+    "result": [{
+        "name": "Survey and feedback ios test solution",
+        "status": "active",
+        "solutionId": "5f992882be0e60389529e345"
+    }, {
+        "solutionId": "5fe45212b4eacd03141f89d2",
+        "surveyId": "5fe45777c567d70331fc46b5",
+        "status": "started",
+        "submissionId": "5fe45777c567d70331fc46b6",
+        "name": "Survey of Diksha awareness - Test"
+    }]
+}
\ No newline at end of file
diff --git a/src/assets/dummy/withScore.json b/src/assets/dummy/withScore.json
new file mode 100644
index 000000000..1501f224a
--- /dev/null
+++ b/src/assets/dummy/withScore.json
@@ -0,0 +1,76 @@
+{
+    "result": true,
+    "totalScore": "9",
+    "scoreAchieved": "5",
+    "observationName": "Observation Scoring Feature Automation Test May 2020",
+    "response": [{
+        "order": "TESTSCOQUES001_1597649279420-1611166979046",
+        "question": "is electrical wiring / boards closed and insulated?",
+        "chart": {
+            "type": "pie",
+            "credits": {
+                "enabled": false
+            },
+            "plotOptions": {
+                "pie": {
+                    "allowPointSelect": true,
+                    "cursor": "pointer",
+                    "dataLabels": {
+                        "enabled": false
+                    },
+                    "showInLegend": true,
+                    "borderColor": "#000000"
+                }
+            },
+            "data": [{
+                "data": [{
+                    "name": "2 out of 4",
+                    "y": 50,
+                    "color": "#6c4fa1"
+                }, {
+                    "name": "",
+                    "y": 50,
+                    "color": "#fff"
+                }]
+            }]
+        }
+    }, {
+        "order": "TESTSCOQUES003_1597649279420-1611166979039",
+        "question": "Grade?",
+        "chart": {
+            "type": "pie",
+            "credits": {
+                "enabled": false
+            },
+            "plotOptions": {
+                "pie": {
+                    "allowPointSelect": true,
+                    "cursor": "pointer",
+                    "dataLabels": {
+                        "enabled": false
+                    },
+                    "showInLegend": true,
+                    "borderColor": "#000000"
+                }
+            },
+            "data": [{
+                "data": [{
+                    "name": "3 out of 5",
+                    "y": 60,
+                    "color": "#6c4fa1"
+                }, {
+                    "name": "",
+                    "y": 40,
+                    "color": "#fff"
+                }]
+            }]
+        }
+    }],
+    "allQuestions": [{
+        "questionName": "is electrical wiring / boards closed and insulated?",
+        "questionExternalId": "TESTSCOQUES001_1597649279420-1611166979046"
+    }, {
+        "questionName": "Grade?",
+        "questionExternalId": "TESTSCOQUES003_1597649279420-1611166979039"
+    }]
+}
\ No newline at end of file
diff --git a/src/assets/faq/resources/images/Report_blue.png b/src/assets/faq/resources/images/Report_blue.png
new file mode 100644
index 000000000..f96ec009b
Binary files /dev/null and b/src/assets/faq/resources/images/Report_blue.png differ
diff --git a/src/assets/i18n/as.json b/src/assets/i18n/as.json
index 0d4121dc0..255566808 100644
--- a/src/assets/i18n/as.json
+++ b/src/assets/i18n/as.json
@@ -8,22 +8,46 @@
   "ACCOUNT_MERGE_FAILED": "একাউন্ট একেলগ কৰাটো বিফল হ’ল",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_CONTENT": "একাউণ্ট একত্ৰিতকৰণ সফলতাৰে আৰম্ভ হ’ল। এয়া সম্পূৰ্ণ হ’লে আপোনাক জাননী দিয়া হ’ব।",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_HEADING": "একাউণ্ট একেলগ কৰক",
-  "ACCURACY": "সঠিকতা",
   "ACTIVE": "সক্ৰিয়",
   "ACTIVE_DOWNLOADS": "সক্ৰিয় ডাউনল'ডসমূহ",
+  "ACTIVITIES": "কাৰ্য্যকলাপসমূহ",
+  "ACTIVITIESE_SEARCH_PLACEHOLDER": "গোটৰ কাৰ্যকলাপৰ সন্ধান কৰক",
+  "ACTIVITY_ALREADY_ADDED_IN_GROUP": "আপুনি এই কাৰ্য্যটো আগতে গোটটোৰ বাবে যোগ কৰিছিল",
+  "ACTIVITY_COLLECTION_TITLE": "সংগ্ৰহ",
+  "ACTIVITY_COURSE_TITLE": "পাঠ্যক্ৰমসমুহ",
+  "ACTIVITY_EXPLANATION_CONTENT_TITLE": "ব্যাখ্যা কৰা বিষয়বস্তু",
+  "ACTIVITY_PRACTICE_QUESTION_SET_TITLE": "অনুশীলনৰ প্ৰশ্নৰ সমষ্টি",
+  "ACTIVITY_PRACTICE_RESOURCE_TITLE": "অনুশীলনৰ সমল",
+  "ACTIVITY_RESOURCE_TITLE": "সমল",
+  "ACTIVITY_TEXTBOOK_TITLE": "পাঠ্যপুথি",
+  "ACTIVITY_TV_EPISODE_TITLE": "টিভিৰ পর্ব",
   "ADD": "সংযোজন কৰক",
+  "ADD_ACTIVITY": "কাৰ্য্যকলাপ যোগ কৰক",
+  "ADD_ACTIVITY_ERROR_MSG": "কাৰ্যটো যোগ কৰিব পৰা নাই। পাছত পুনৰ চেষ্টা কৰক",
+  "ADD_ACTIVITY_SUCCESS_MSG": "কাৰ্য সফলতাৰে যোগ কৰা হ’ল",
+  "ADD_ANOTHER_USER": "অন্য এগৰাকী ব্যৱহাৰকাৰী যোগ কৰক",
   "ADD_DISTRICT": "জিলা অন্তৰ্ভুক্ত কৰক",
+  "ADD_EDIT_SELF_DECLARED_TEACHER_INFO": "এই সবিশেষসমূহ অগ্ৰগতিক আগবঢ়াই নিয়া আৰু ইয়াৰ সত্যতা নিৰূপণ কৰিবলৈ আপোনাৰ ঘোষিত ৰাজ্যত উপলব্ধ কৰা হ’ব পাৰে",
   "ADD_EMAIL": "ইমেইল ঠিকনা সংযোগ কৰক",
+  "ADD_MEMBER": "সদস্য যোগ কৰক",
+  "ADD_MEMBER_CONFIRMATION": "আগবঢ়াৰ আগতে সদস্যৰ নাম আৰু {{app_name}} ID মিলিছেনে নাই আপুনি পৰীক্ষা কৰিব লাগিব",
+  "ADD_MEMBER_POPUP_DESC": "সদস্যসকলক তেওঁলোকৰ অনন্য {{%s}}ID চিনাক্ত কৰাত পথ প্ৰদৰ্শন কৰিবলৈ নিম্নোক্ত নিৰ্দেশনাসমূহ ব্যৱহাৰ কৰক",
+  "ADD_MEMBER_POPUP_STEP_1": "<span>প্ৰথম পদক্ষেপ</span>: প্ৰ’ফাইল টেবত ক্লিক কৰক",
+  "ADD_MEMBER_POPUP_STEP_2": "<span>দ্বিতীয় পদক্ষেপ</span>: আপোনাৰ {{%s}}IDটো শ্বেয়াৰ কৰিবৰ কাৰণে শ্বেয়াৰ চিহ্নত ক্লিক কৰক",
+  "ADD_MEMBER_POPUP_TITLE": "মই {{%s}} IDটো ক’ত চাব পাৰিম?",
   "ADD_PHONE": "ম'বাইল নম্বৰ যোগ দিয়ক",
   "ADD_RECOVERY_ACCOUNT": "ৰিক’ভাৰী একাউন্ট সংযোগ কৰক",
   "ADD_RECOVERY_ID": "ৰিক’ভাৰী একাউন্ট সংযোগ কৰক",
   "ADD_STATE": "ৰাজ্য অন্তৰ্ভুক্ত কৰক",
+  "ADD_TO_GROUP": "গোটত যোগ কৰক",
+  "ADD_TO_GROUP_ACTIVITY": "গোটত যোগ কৰক",
+  "ADD_USER": "ব্যৱহাৰকাৰী যোগ কৰক",
   "ADD_USERS": "ব্যৱহাৰকাৰী সংযোগ কৰক",
-  "ADD_USERS_TO_GROUP": "{{%s}} ব্যৱহাৰকাৰীক গ্ৰূপত অন্তৰ্ভুক্ত কৰক",
+  "AGREE_TO_SHARE_PROFILE_DETAILS": "মই ইয়াৰ সৈতে সংগতি ৰাখি মোৰ প্ৰ’ফাইলৰ সবিশেষ পাঠ্যক্ৰম প্ৰশাসকৰ সৈতে ভাগবতৰা কৰিবলৈ সন্মত হৈছোঁ",
   "ALL": "সকলো",
   "ALLOW": "অনুমতি দিয়ক",
   "ALL_ANNOUNCEMENTS": "সকলো ঘোষণা",
-  "ALREADY_ENROLLED_COURSE": " ইতিমধ্যে আপুনি এই প্রশিক্ষণত যোগদান কৰিলে",
+  "ALREADY_ENROLLED_COURSE": " ইতিমধ্যে আপুনি এই পাঠ্যক্ৰমত যোগদান কৰিলে",
   "ALWAYS_ON": "সদায়েই চলিত",
   "ANDROID_NOT_SUPPORTED": "Android সংস্কৰণটো গ্ৰহণযোগ্য় নহয়",
   "ANDROID_NOT_SUPPORTED_DESC": "আপোনাৰ ফ'নটো যিহেতু এটা অতি পুৰণি এণ্ড্ৰইড সংস্কৰণ, গতিকে এই বিষয়বস্তু খুলিব পৰা নাযাব। যদিহে আপোনাৰ Crosswalk আছে, ডিভাইচ মডেলৰ ওপৰত ভিত্তি কৰি আপুনি এই বিষয়বস্তু চাব পাৰিব।",
@@ -31,7 +55,8 @@
   "ANSWER": "উত্তৰ",
   "APPLY": "প্ৰয়োগ কৰক",
   "APPLY_FILTER": "ফিল্টাৰ প্ৰয়োগ কৰক",
-  "APP_QR_CODE": "আপুনি {{%s}} QR ক'ড দেখিছেনে?",
+  "APP_ID": "{{%s}} ID",
+  "APP_QR_CODE": "আপুনি এটা {{%s}} কিউ আৰ ক'ড দেখিছেনে?",
   "APP_RATING_RATE_EXPERIENCE": "আপোনাৰ এপ ব্যৱহাৰৰ অভিজ্ঞতাক Rate দিয়ক",
   "APP_RATING_RATE_ON_PLAYSTORE": "আপুনি Play Store ত আপোনাৰ Rate দিব বিচাৰে নেকি ?",
   "APP_RATING_REPORT_AN_ISSUE": "আপোনাৰ অনাকাংখিত অভিজ্ঞতাৰ বাবে আমি দুঃখিত। আপুনি ইয়াৰ বিষয়ে আমাক জনাব বিচাৰে নেকি ?",
@@ -39,13 +64,13 @@
   "APP_RATING_THANKS_FOR_RATING": "আপোনাৰ অভিজ্ঞতাৰ মূল্য়ায়ন কৰাৰ বাবে ধন্যবাদ!",
   "APP_TITLE": "{{%s}}! লৈ স্বাগতম",
   "APP_VERSION": "এপৰ সংস্কৰণ",
-  "ARE_YOU_STATE_TEACHER": "আপুনি {{%s}}ত চৰকাৰী স্কুলৰ শিক্ষক নেকি",
+  "ARE_YOU_STATE_TEACHER": "আপুনি {{%s}}ত চৰকাৰী বিদ্যালয়ৰ শিক্ষক নেকি",
   "AS_FILE": "ফাইল হিচাপে",
   "AS_LINK": "লিংক হিচাপে",
   "ATTACHMENT_DOWNLOADED": "Attachment ডাউনল’ড কৰা হ’ল",
   "ATTRIBUTIONS": "গুণাগুণ (সমূহ)",
-  "AUDIOS": "অডিঅ'",
-  "AUTHOR": "প্ৰস্তুতকৰ্তা",
+  "AUDIO": "অডিঅ'",
+  "AUTHOR": "লেখক",
   "AUTOMATIC_SYNC": "স্বয়ংক্ৰিয় Data Sync",
   "AUTO_MIGRATION_FAIL_MESSAGE": "একাউন্টসমুহ একেলগ কৰাত ব্য়ৰ্থ",
   "AUTO_MIGRATION_SUCCESS_MESSAGE": "একাউন্টবোৰ একেলগ কৰাত সফল হ'ল",
@@ -53,28 +78,24 @@
   "AVAILABLE_FILTERS": "Filters",
   "AVAILABLE_FOR_TEACHERS": "কেৱল শিক্ষকসকলৰ কাৰণে  উপলব্ধ",
   "AVATAR": "অৱতাৰ (Avatar)",
-  "AVERAGE_SCORE": "গড় স্ক’ৰ",
-  "AVERAGE_TIME": "গড় সময়",
   "BACK_TO_EXIT": "আপুনি এপটোৰ পৰা আঁতৰি যাব বিচাৰিছে নেকি?",
-  "BATCHEND_MAIN_HEADING": "আপুনি অংশগ্ৰহন কৰা  গোটটোৱে প্রশিক্ষণ সমাপ্ত কৰিলে",
-  "BATCHEND_SUB_HEADING": "আপুনি প্রশিক্ষণটো অব্যাহত ৰাখিব পাৰে, কিন্তু আপোনাৰ অগ্ৰগতি আগলৈ আপডেট  নহ'ব।",
+  "BATCHEND_MAIN_HEADING": "আপুনি অংশগ্ৰহন কৰা  গোটটোৱে {{%s}}ত  প্রশিক্ষণ সমাপ্ত কৰিলে",
+  "BATCHEND_SUB_HEADING": "আপুনি পাঠ্যক্ৰমটো অব্যাহত ৰাখিব পাৰে, কিন্তু আপোনাৰ অগ্ৰগতি আগলৈ আপডেট  নহ'ব।",
   "BATCHES_AVAILABLE": "গোট উপলব্ধ হয়",
-  "BATCHES_FOR_THIS_COURSE": "এই প্ৰশিক্ষণৰ বাবে গোটসমূহ",
+  "BATCHES_FOR_THIS_COURSE": "এই পাঠ্যক্ৰমৰ বাবে বেটছসমূহ",
   "BATCH_CREATED_BY": "_ৰ দ্ৱাৰা সৃষ্টি কৰা হৈছে",
   "BATCH_DETAILS": "গোটৰ সবিশেষ",
   "BATCH_ENROLLMENT_ENDED": "এই গোটত আৰু ব্যক্তি অন্তৰ্ভুক্ত কৰা বন্ধ হৈছে",
   "BATCH_EXPIRED": "গোট সমাপ্ত হ'ল",
   "BATCH_EXPIRED_BUTTON": "ঠিক আছে",
-  "BATCH_EXPIRED_DESCRIPTION": "গোটৰ সময়সীমা বন্ধ কৰি দিয়া হৈছে। আপুনি প্ৰশিক্ষণ অব্যাহত ৰাখিব পাৰে। অৱশ্যে, আপোনাৰ অগ্ৰগতি আগলৈ নথিবদ্ধ অথবা নিৰীক্ষণ কৰা নহ'ব।",
   "BOARD": "ব'ৰ্ড",
   "BOARD_OPTION_TEXT": "ব’ৰ্ড বাছি লওক",
+  "BROWES_RELEVANT_CONTENT": "আপোনাৰ অগ্ৰাধিকাৰৰ (ব’ৰ্ড, মাধ্যম, শ্ৰেণী) ভিত্তিত প্ৰাসংগিক সমল বিচাৰি পাবলৈ {{app_name}} লাইব্ৰেৰী ব্ৰাউজ কৰক",
   "BTN_CLICK_TO_OPEN_CONTENT": "বিষয়বস্তু চাবলৈ স্পৰ্শ কৰক",
   "BTN_LATER": "পাছত",
   "BTN_RATE_ON_PLAYSTORE": "প্লে’ ষ্ট’ৰত আমাক মূল্যায়ন কৰক",
-  "BTN_SUBMIT": "প্ৰদান কৰক",
+  "BTN_SUBMIT": "দাখিল কৰক",
   "BTN_VISIT_HELP_SECTION": "সহায় শাখাটো পৰিদর্শন কৰক",
-  "BY_QUESTIONS": "প্ৰশ্নৰ দ্বাৰা",
-  "BY_USERS": "ব্যৱহাৰকাৰীৰ দ্বাৰা",
   "CAMERA": "কেমেৰা",
   "CAMERA_PERMISSION_DESCRIPTION": "{{%s}}-এ QR ক’ড স্কেন কৰিবলৈ কেমেৰাৰ অনুমতি ব্য়ৱহাৰ কৰে",
   "CANCEL": "বাতিল কৰক",
@@ -84,25 +105,34 @@
   "CANCEL_DOWNLOAD": "ডাউনল'ড বাতিল কৰক",
   "CANCEL_DOWNLOAD_MESSAGE": "ডাউনল'ড বাতিল কৰিলে সক্ৰিয় ডাউনল'ডৰ পৰা বিষয়বস্তু আঁতৰি যাব",
   "CANCEL_DOWNLOAD_TITLE": "ডাউনল'ড বাতিল কৰিব বিচাৰিছে নেকি?",
-  "CERTIFIED_TRAINING": "উপযুক্ত প্রশিক্ষণ ",
+  "CERTIFICATE_ALREADY_DOWNLOADED": "এই প্ৰমাণপত্ৰ খন ইতিমধ্যে ডাউনল’ড কৰা হ’ল, অনুগ্ৰহ কৰি আপোনাৰ ডাউনল’ড ফ’ল্ডাৰ পৰীক্ষা কৰক",
+  "CERTIFICATE_DOWNLOADED": "প্ৰমাণ পত্ৰ ডাউনল’ড কৰা  হ’ল",
+  "CERTIFICATE_DOWNLOAD_INFO": "প্ৰমাণপত্ৰ ডাউনল’ড কৰি থকা আছে",
+  "CERTIFIED_TRAINING": "এখন প্ৰমাণপত্ৰ আৰ্জন কৰক",
   "CHANGE": "সলনি",
   "CHANGE_ROLE": "ভূমিকা সলনি কৰক",
-  "CHANGE_USER": "ব্যৱহাৰকাৰী সলনি কৰক",
+  "CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "আপুনি এই অধ্যায় সমাপ্ত কৰিলে।",
+  "CHARACTERS_REMAINING": "{{character_count}}টা আখৰ বাকী আছে",
   "CHECK_FOR_UPDATES": "আপডেট পৰীক্ষা কৰক",
   "CHOOSE_FROM_FOLLOWING": "তলত দিয়াবোৰৰ পৰা বাছি লওঁক",
   "CHOOSE_LANGUAGE": "আপোনাৰ পচন্দৰ ভাষাটো বাছনি কৰক",
+  "CHOOSE_USER": "ব্যৱহাৰকাৰী বাছনি কৰক",
   "CHOOSE_WHERE_TO_SAVE_DATA": "ডাটাসমূহ ক'ত সংৰক্ষণ কৰিব বাছনি কৰি লওঁক",
   "CLASS": "শ্ৰেণী",
   "CLASSES": "শ্ৰেণীসমূহ",
   "CLEAR": "খালী কৰক",
   "COACH_SCREEN": "QR ক'ডটো Scan কৰিলে আপোনাক বিষয়বস্তুলৈ লৈ যাব",
   "COMMUNITIES": "কমিউনিটী",
-  "COMPLETE_ASSESSMENT_TO_EARN_CERTIFICATE": "{{%s}}ৰদ্বাৰা মূল্যায়ন সম্পূৰ্ণ কৰক",
+  "COMPLETED": "সম্পূৰ্ণ",
+  "COMPLETE_ASSESSMENT_TO_EARN_CERTIFICATE": "{{%s}}ৰ ভিতৰত মূল্যায়ন সম্পূৰ্ণ কৰক",
   "COMPLETE_BY": "{{%s}}ৰ ভিতৰত সম্পূৰ্ণ কৰক",
-  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "প্রশিক্ষণ সম্পূর্ণ কৰক",
+  "COMPLETE_CHAPTER_TO_UNLOCK_ACHIEVEMENT": "এক নতুন কৃতিত্ব আনলক কৰিবলৈ {{%s}} বিষয়বস্তুসমূহ সম্পূৰ্ণ কৰক",
+  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}}ৰ ভিতৰত পাঠ্যক্ৰম সম্পূৰ্ণ কৰক",
   "CONFIRM": "নিশ্চিত কৰক",
+  "CONGRATULATIONS": "অভিনন্দন !",
   "CONNECT_TO_INTERNET_SUGGESTION": "বিষয়বস্তু চাবৰ বাবে ইণ্টাৰনেট সংযোগ কৰক",
   "CONSIDER_DOWNLOAD": "বিষয়বস্তু ডাউনল'ড কৰাটো গ্ৰহণ কৰক",
+  "CONTENTS": "বিষয়বস্তুসমূহ",
   "CONTENT_ALREADY_EXIST": "ফাইলটো ইতিমধ্যে অন্তৰ্ভুক্ত কৰা হৈছে। এটা নতুন ফাইল বাছি লওঁক",
   "CONTENT_ALREADY_EXISTS": "বিষয়বস্তু নিৰ্ধাৰিত ফ'ল্ডাৰত আছে। তথাপিও বিষয়বস্তুসমূহ নিৰ্ধাৰিত ফ'ল্ডাৰলৈ স্থানান্তৰ কৰিব নেকি?",
   "CONTENT_COMING_SOON": "ইয়াৰ বাবে আমি বিষয়বস্তু প্ৰস্তুত কৰি আছোঁ",
@@ -118,6 +148,8 @@
   "CONTENT_IS_BEING_ADDED": "আপোনাৰ ৰাজ্যই অতি শীঘ্ৰেই এই QR ক'ডটোৰ বাবে বিষয়বস্তু সংযোগ কৰিব। সোনকালেই এয়া উপলব্ধ হ'ব",
   "CONTENT_NOT_AVAILABLE": "বিষয়বস্তু উপলব্ধ নহয়",
   "CONTENT_PLAYER_EXIT_PERMISSION": "আপুনি এই বিষয়বস্তুৰ পৰা আঁতৰি যাব বিচাৰিছে নেকি?",
+  "CONTENT_PREFERENCE": "বিষয়বস্তুৰ অগ্ৰাধিকাৰ",
+  "CONTENT_PREFERENCE_SELECTION": "বিষয়বস্তুৰ অগ্ৰাধিকাৰ বাছি লওক",
   "CONTENT_RATING_SUB_HEADING": "বিষয়বস্তু ৰে’ট দিবলৈ তৰাসমূহত স্পৰ্শ কৰক",
   "CONTENT_RETIRED_BY_AUTHOR": "এই বিষয়বস্তু প্ৰস্তুতকৰ্তাৰ দ্বাৰা আঁতৰোৱা হৈছে আৰু গতিকে ই এতিয়া উপলব্ধ নহয়",
   "CONTENT_SIZE": "বিষয়বস্তুৰ অবয়ৱ (Size)",
@@ -126,51 +158,193 @@
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO_SDCARD": "বিষয়বস্তু সফলভাৱে SD কাৰ্ডলৈ স্থানান্তৰ হ'ল",
   "CONTINUE": "অব্যাহত ৰাখক",
   "CONTINUE_AS_ROLE": "'{{%s}}' হিচাপে আগবাঢ়ক",
-  "CONTINUE_NOW": "অব্যাহত ৰাখক",
+  "CONTINUE_LEARNING": "শিক্ষণ অব্যাহত ৰাখক",
   "CONTRIBUTIONS": "অৰিহণা (সমূহ)",
   "CONTRIBUTORS": "অৰিহণা যোগাওঁতা (সকল)",
   "COPYRIGHT": "কপিৰাইট",
-  "COURSES_BNAV": "প্রশিক্ষণসমূহ",
-  "COURSES_IN_PROGRESS": "মোৰ প্ৰশিক্ষণসমূহ",
+  "COURSES": "পাঠ্যক্ৰমসমূহ",
+  "COURSES_BNAV": "পাঠ্যক্ৰমসমুহ",
+  "COURSES_IN_PROGRESS": "মোৰ পাঠ্যক্ৰমসমূহ",
   "COURSE_COMPLETED_LABEL": "{{%s}}% সম্পূর্ণ",
-  "COURSE_ENDED": "প্রশিক্ষণ {{%s}}ত সমাপ্ত হ’ল",
+  "COURSE_COMPLETION_POPUP_DESC": "আপোনাৰ পঞ্জীকৃত যোগাযোগ সবিশেষৰ জৰিয়তে পাঠ্যক্ৰমটোৰ প্ৰমাণপত্ৰৰ বিষয়ে ৭ দিনৰ ভিতৰত আপোনাক জনোৱা হ’ব",
+  "COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "টোকা:  এই পাঠ্যক্ৰমৰ কোনো প্ৰমাণপত্ৰ নাই",
+  "COURSE_ENDED": "পাঠ্যক্ৰম {{%s}}ত সমাপ্ত হ’ল",
   "COURSE_ENDED_ON": " পাঠ্যক্ৰম {{%s}}ত সমাপ্ত হ’ল",
-  "COURSE_ENROLLED": "আপুনি প্ৰশিক্ষণত  যোগদান কৰিলে",
-  "COURSE_NOT_AVAILABLE": "এই প্ৰশিক্ষণটো সক্ৰিয় হৈ থকা নাই",
+  "COURSE_ENROLLED": "আপুনি পাঠ্যক্ৰমত  যোগদান কৰিলে",
+  "COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}}ত পাঠ্যক্ৰম শেহতীয়াকৈ উন্নীত কৰা হৈছিল",
+  "COURSE_NOT_AVAILABLE": "এই পাঠ্যক্ৰমটো সক্ৰিয় হৈ থকা নাই",
+  "COURSE_NO_CERTIFICATE_MESSAGE": "বৰ্তমান,  এই পাঠ্যক্ৰমৰ  কোনো প্ৰমাণপত্ৰ নাই। পাঠ্যক্ৰমৰ প্ৰস্তুতকৰ্তাই পাছত এখন প্ৰমাণপত্ৰ সংলগ্ন কৰিব পাৰে ।",
   "COURSE_PROGRESS_COMPLETED": "{{%s}}% সম্পূৰ্ণ  হল",
-  "COURSE_UNENROLLED": "আপুনি প্রশিক্ষণৰ পৰা  ওলাই আহিল",
-  "COURSE_WILL_BE_AVAILABLE": "{{%s}} ৰ পৰা পাঠ্যক্ৰম উপলব্ধ হ’ব",
-  "CREATE_GROUP": "দল গঠন কৰক",
-  "CREATE_NEW_GROUP": "এটা নতুন দল গঠন কৰক",
-  "CREATE_NEW_USER": "নতুন ব্যৱহাৰকাৰী সৃষ্টি কৰক",
+  "COURSE_UNENROLLED": "আপুনি পাঠ্যক্ৰমৰ পৰা  ওলাই আহিল",
+  "COURSE_WILL_BE_AVAILABLE": "{{%s}} ৰ পৰা গোটটো উপলব্ধ হ’ব",
+  "CREATE_GROUP": "গোট গঠন কৰক",
+  "CREATE_GROUP_DESCRIPTION": "গোট এটা সৃষ্টি কৰাৰ পৰা আপুনি এটা খোজহে দূৰত আছে",
+  "CREATE_GROUP_DESCRIPTION_POPUP": "মানুহৰ সৈতে যোগাযোগ কৰিবলৈ, কাৰ্যসমূহ বিনিময় কৰিবলৈ, অগ্ৰগতি নিৰীক্ষণ আৰু অন্যান্য সম্ভাৱনীয়তাৰ অনুসন্ধান কৰিবলৈ গোট সৃষ্টি কৰক বা তেনে গোটৰ অংশ হওক",
   "CREATE_USER": "ব্যৱহাৰকাৰী সৃষ্টি কৰক",
   "CREATORS": "{{%s}}ত সৃষ্টি কৰা হ'ল",
   "CREDITS": "ক্ৰেডিট (CREDITS)",
   "CREDITS_LICENCE_INFO": "ক্ৰেডিট  আৰু  লাইচেঞ্চ তথ্য",
-  "CSV_DOWNLOAD_SUCCESS": "‘ডাউনল'ড’ত  {{%s}} ছেভ কৰা হ'ল",
+  "CRS_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "আৰম্ভ কৰিবলৈ এটা পাঠ্যক্ৰম বাছি লওক",
+  "CRS_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "পাঠ্যক্ৰম",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "পাঠ্যক্ৰমসমূহ",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "পাঠ্যক্ৰমসমূহ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}ৰ লাইব্ৰেৰীয়ে {{%explainVideos}}, {{%quesBanks}} আৰু অন্য {{%interactiveMaterial}}ৰ সংগ্রহ ৰাখে। লাইব্ৰেৰীটোঅন্বেষণ কৰা আৰম্ভ কৰিবলৈ এখন পাঠ্যক্ৰমত ক্লিক কৰক! ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) ৰ কাৰণে কোনো পাঠ্যক্ৰম পোৱা নগ’ল",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "ব’ৰ্ডে পাঠ্যক্ৰমসমূহ সংযোজন কৰি আছে",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}}ত পাঠ্যক্ৰম বিচাৰি পোৱা নাই নেকি?",
+  "CRS_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>টোকা :</span> পাঠ্যক্ৰমটোৰ অগ্ৰগতি নিৰ্ণয় কৰিব পৰা নাই",
+  "CRS_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "আপোনাৰ ৰাজ্যৰ বৰ্ডে আপুনি  {{%s}}ত অনুৰোধ কৰা পাঠ্যক্ৰম আপল’ড কৰিলে আমি আপোনাক জাননী দিম",
+  "CRS_NONTRK_QR_CODE_DETAILS": "ডিজিটেল বিষয়বস্তুত তাৎক্ষণিক প্ৰৱেশাধিকাৰ পাবৰ বাবে আপোনাৰ  পাঠ্যক্ৰমত থকা QR ক'ড স্কেন কৰক।",
+  "CRS_NONTRK_SEE_MORE_BOOKS": "অধিক পাঠ্যক্ৰম আৰু বিষয়বস্তু চাওক",
+  "CRS_NONTRK_STUDENT_ROLE_DESC_1": "পাঠ্যক্ৰম আৰু ডিজিটেল বিষয়বস্তু ব্ৰাউজ কৰক",
+  "CRS_NONTRK_TEACHER_ROLE_DESC_1": "পাঠ্যক্ৰম আৰু ডিজিটেল বিষয়বস্তু ব্ৰাউজ কৰক",
+  "CRS_NONTRK_TUTORIAL_HEADING": "ভিডিঅ’, পাৰস্পৰিক ক্ৰিয়াশীল বিষয়বস্তু, ই-টেক্সটবুক আৰু বহুতো...",
+  "CRS_TRK_BATCHEND_MAIN_HEADING": "আপুনি {{%s}}ত সম্পূৰ্ণ হোৱা পাঠ্যক্ৰমৰ বেটছটোত যোগদান কৰিছে",
+  "CRS_TRK_BATCHEND_SUB_HEADING": "আপুনি পাঠ্যক্ৰমটো অব্যাহত ৰাখিব পাৰে, কিন্তু আপোনাৰ অগ্ৰগতি আপডেট  কৰা নহ'ব",
+  "CRS_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "আপুনি এই মডিউল সমাপ্ত কৰিলে",
+  "CRS_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}}ৰ ভিতৰত পাঠ্যক্ৰম সম্পূৰ্ণ কৰক",
+  "CRS_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "পাঠ্যক্ৰমসমূহ",
+  "CRS_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "আপুনি এই পাঠ্যক্ৰমত  যোগদান কৰিলে",
+  "CRS_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "এই পাঠ্যক্ৰমৰ বাবে বেটছসমূহ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "পাঠ্যক্ৰমসমূহ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "মোৰ পাঠ্যক্ৰমসমূহ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "পাঠ্যক্ৰম {{%s}}ত সমাপ্ত হ’ল",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}}ত পাঠ্যক্ৰম শেহতীয়াকৈ উন্নীত কৰা হৈছিল",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_NOT_AVAILABLE": "এই পাঠ্যক্ৰমটো সক্ৰিয় হৈ থকা নাই",
+  "CRS_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "পাঠ্যক্ৰমত যোগদান কৰক",
+  "CRS_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "শেহতীয়া পাঠ্যক্ৰমসমূহ",
+  "CRS_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "পাঠ্যক্ৰম এৰিব খুজিছে ?",
+  "CRS_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "এটা পাঠ্যক্ৰমত যোগদান কৰিবলৈ লগ ইন  কৰক",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_COURSES": "পাঠ্যক্ৰমসমূহ নাই",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "পাঠ্যক্ৰম, নতুবা লাইব্ৰেৰীৰ পৰা বিষয়বস্তু ডাউনল'ড কৰক",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "{{%s}} পাঠ্যক্ৰমসমূহ",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "({{%s}}) পাঠ্যক্ৰম",
+  "CRS_TRK_FRMELEMNTS_LBL_OVERLAY_LABEL_TAKE_COURSE": "এই পাঠ্যক্ৰমটোত যোগদান কৰিবলৈ লগ ইন কৰক",
+  "CRS_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "জনপ্ৰিয় পাঠ্যক্ৰমসমূহ",
+  "CRS_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "অনলাইন পাঠ্যক্ৰম লওক",
+  "CRS_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "এখন প্ৰমাণপত্ৰ অৰ্জন কৰিবৰ কাৰণে {{%s}}ৰ ভিতৰত পাঠ্যক্ৰম সম্পূর্ণ কৰক ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING": "পাঠ্যক্ৰম",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "উপস্থিত থকা পাঠ্যক্ৰম (সমূহ)",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "পাঠ্যক্ৰমৰ সবিশেষ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "পাঠ্যক্ৰম সমাপ্ত হ’ব",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "পাঠ্যক্ৰম শেষ হোৱাৰ তাৰিখ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "পাঠ্যক্ৰমৰ সবিশেষ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "এই পাঠ্যক্ৰমটো এইসকলৰ বাবে প্ৰাসংগিক:",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "পাঠ্যক্ৰমৰ মডিউলসমূহ",
+  "CRS_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "পাঠ্যক্ৰম এৰি দিয়ক",
+  "CRS_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "পাঠ্যক্ৰমসমূহ পৰীক্ষা কৰিব বিচাৰিছে নেকি ?",
+  "CRS_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "এই পাঠ্যক্ৰমৰ বেটছটো ‪{{batch_start_date}}ৰ পৰা উপলব্ধ হৈছে",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "আপোনাৰ পঞ্জীকৃত যোগাযোগ সবিশেষত আপোনাৰ প্ৰমাণপত্ৰৰ বিষয়ে ৭ দিনৰ ভিতৰত আপোনাক জনোৱা হ’ব",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "টোকা:  এই পাঠ্যক্ৰমৰ কোনো প্ৰমাণপত্ৰ নাই",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "আপুনি এই পাঠ্যক্ৰমত  যোগদান কৰিলে",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "বৰ্তমান,  এই পাঠ্যক্ৰমৰ  কোনো প্ৰমাণপত্ৰ নাই। পাঠ্যক্ৰমটোৰ প্ৰস্তুতকৰ্তাই পাছত এখন প্ৰমাণপত্ৰ সংলগ্ন কৰিব পাৰে ।",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "আপুনি পাঠ্যক্ৰমটোৰ পৰা  ওলাই আহিল",
+  "CRS_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "এই পাঠ্যক্ৰমৰ বাবে কোনো বেটছ্ নাই",
+  "CRS_TRK_FRMELEMNTS_MSG_OTHER_ROLE_DESC_2": "অনলাইন পাঠ্যক্ৰম লওক",
+  "CRS_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "পাঠ্যক্ৰমটো পঞ্জীকৃত ব্যৱহাৰকাৰীসকলৰ বাবে। পাঠ্যক্ৰমটোত  প্ৰৱেশাধিকাৰ পাবলৈ লগ ইন কৰক।",
+  "CRS_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "এই পাঠ্যক্ৰমৰ বাবে কোনো বেটছ্ উপলব্ধ নাই",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "পাঠ্যক্ৰমবিলাক কেৱল পঞ্জীয়নভুক্ত ব্যৱহাৰকাৰীসকলৰ কাৰণে",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "আপুনি এই পাঠ্যক্ৰম সফলতাৰে সম্পূর্ণ কৰিলে",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "পাঠ্যক্ৰমটো সমাপ্ত হ’ল। আপুনি পুনঃ মূল্যায়নটো কৰিব পাৰে, কিন্তু আপোনাৰ অগ্ৰগতি নথিভুক্ত কৰা নহ’ব।",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "পাঠ্যক্ৰমটো সমাপ্ত হ’ল। আপুনি মূল্যায়নটোত ভাগ ল'ব পাৰে, কিন্তু আপোনাৰ অগ্ৰগতি নথিভুক্ত কৰা নহ’ব।",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "কাৰ্যৰ সবিশেষ চাবলৈ আৰু প্ৰৱেশাধিকাৰ লাভ কৰিবলৈ  আপুনি এটা সক্ৰিয় বেটছত যোগদান কৰিব লাগিব",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "পাঠ্যক্ৰমৰ সবিশেষত প্ৰৱেশ কৰাৰ কাৰণে আপুনি লগ ইন কৰিব লাগিব",
   "CURRENT_LANGUAGE": "বৰ্তমানৰ ভাষা",
-  "DATA": "অধিক কিতাপ আৰু বিষয়বস্তু চাওক",
   "DATA_SYNC": "ডাটা Sync",
   "DATA_SYNC_FAILURE": "ডাটা Sync কৰিব পৰা নাই, কিছু সময়ৰ পাছত পুনৰ চেষ্টা কৰক",
   "DATA_SYNC_NOTHING_TO_SYNC": "Sync হ’বলৈ একো নাই",
   "DATA_SYNC_SUB": "ডাটা সঞ্চয় কৰক, Telemetry স্থানান্তৰ কৰক",
   "DATA_SYNC_SUCCESSFUL": "Telemetry  data সফলভাৱে Sync কৰা হ' ল",
-  "DELETE": "ডিলিট",
+  "DAYS_AGO": "{{%s}} দিনৰ আগতে",
+  "DAY_AGO": "{{%s}} দিনৰ আগতে",
+  "DELETE": "বিলোপ কৰক",
   "DELETE_ALL_CONTENT_WARNING": "বিষয়বস্তু ডিলিট কৰিলে  ডিভাইচৰ পৰাও আঁতৰি যাব",
   "DELETE_CONTENT": "বিষয়বস্তু ডিলিট কৰিব বিচাৰিছে নেকি?",
-  "DELETE_CONTENT_SIZE": "১টা আইটেম {{content_size}}",
+  "DELETE_CONTENT_SIZE": "১টা বস্তু {{content_size}}",
   "DELETE_CONTENT_WARNING": "বিষয়বস্তু ডিলিট কৰিলে ডিভাইচটোৰ পৰাও  আঁতৰি যাব",
-  "DELETE_GROUP": "দল ডিলিট কৰক",
+  "DELETE_GROUP_DESC": "{{group_name}} আঁতৰালে এপ্লিকেশ্যনটোৰ পৰা গোটটো স্থায়ীভাৱে আঁতৰি যাব",
+  "DELETE_GROUP_ERROR_MSG": "গোটটো বিলোপ কৰিব পৰা নগল। পাছত পুনৰ চেষ্টা কৰক",
+  "DELETE_GROUP_POPUP_TITLE": "গোটটো বিলোপ কৰিব নেকি?",
+  "DELETE_GROUP_SUCCESS_MSG": "গোট  সফলভাৱে বিলোপ কৰা হ' ল",
   "DELETE_PROGRESS": "বাছি লোৱা বিষয়বস্তু ডিলিট হৈ আছে",
-  "DESCRIPTION": "বৰ্ণনা",
+  "DETAIL_TUTORIAL": "{{%appName}}ৰ লাইব্ৰেৰীয়ে {{%explainVideos}}, {{%quesBanks}} আৰু অন্য {{%interactiveMaterial}}ৰ সংগ্রহ ৰাখে। লাইব্ৰেৰীৰ অন্বেষণ কৰা আৰম্ভ কৰিবলৈ এখন পাঠ্যপুথিত ক্লিক কৰক! ",
   "DEVICE_ID": "ডিভাইচ ID",
   "DEVICE_LOCATION": "ডিভাইচৰ অৱস্থান",
   "DEVICE_TAGS": "ডিভাইচ টেগ",
   "DEVICE_TAGS_SUB": "ডিভাইচ টেগবোৰ সংযোগ কৰক অথবা আতৰাই দিয়ক",
+  "DFLT_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "আৰম্ভ কৰিবলৈ এটা কার্য্য বাছি লওক",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "কার্য্য",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "কার্য্যসমূহ",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "কার্য্যসমূহ",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}ৰ লাইব্ৰেৰীয়ে {{%explainVideos}}, {{%quesBanks}} আৰু অন্য {{%interactiveMaterial}}ৰ সংগ্রহ ৰাখে। লাইব্ৰেৰীৰ অন্বেষণ কৰা আৰম্ভ কৰিবলৈ এটা বিষয়বস্তুত ক্লিক কৰক ! ",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) ৰ কাৰণে কোনো কার্য্য পোৱা নগ’ল",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "ব’ৰ্ডে বিষয়বস্তু সংযোজন কৰি আছে",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}}ত বিষয়বস্তু বিচাৰি পোৱা নাই নেকি?",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>টোকা :</span> অগ্ৰগতি নিৰ্ণয় কৰিব পৰা নাই",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "আপোনাৰ ৰাজ্যৰ বৰ্ডে আপুনি  {{%s}}ত অনুৰোধ কৰা বিষয়বস্তু আপল’ড কৰিলে আমি আপোনাক জাননী দিম",
+  "DFLT_NONTRK_QR_CODE_DETAILS": "এটা QR ক'ড স্কেন কৰি ডিজিটেল বিষয়বস্তুত তাৎক্ষণিক প্ৰৱেশাধিকাৰ লাভ কৰক",
+  "DFLT_NONTRK_SEE_MORE_BOOKS": "অধিক চাওক",
+  "DFLT_NONTRK_STUDENT_ROLE_DESC_1": "ডিজিটেল বিষয়বস্তুৰ বাবে  ব্ৰাউজ কৰক",
+  "DFLT_NONTRK_TEACHER_ROLE_DESC_1": "ডিজিটেল বিষয়বস্তুৰ বাবে  ব্ৰাউজ কৰক",
+  "DFLT_NONTRK_TUTORIAL_HEADING": "ভিডিঅ’, পাৰস্পৰিক ক্ৰিয়াশীল বিষয়বস্তু, ই টেক্সটবুক আৰু বহুতো...",
+  "DFLT_TRK_BATCHEND_MAIN_HEADING": "আপুনি {{%s}}ত সম্পূৰ্ণ হোৱা শিক্ষণ কাৰ্যৰ বেটছটোত যোগদান কৰিছে",
+  "DFLT_TRK_BATCHEND_SUB_HEADING": "আপুনি পাঠ্যক্ৰমটোৰ শিক্ষণ অব্যাহত ৰাখিব পাৰে, কিন্তু আপোনাৰ অগ্ৰগতি আপডেট  নহ'ব",
+  "DFLT_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "আপুনি এই শিক্ষণ কার্য্যটো সমাপ্ত কৰিলে",
+  "DFLT_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}}ৰ ভিতৰত শিক্ষণ সম্পূৰ্ণ কৰক",
+  "DFLT_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "এই শিক্ষণ কার্য্য সক্ৰিয় হৈ থকা নাই",
+  "DFLT_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "শিক্ষণৰ কার্য্যসমূহ",
+  "DFLT_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "আপুনি এই শিক্ষণ কার্য্যটোত যোগদান কৰিলে",
+  "DFLT_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "শিক্ষণ কার্য্যৰ বাবে বেটছসমূহ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "শিক্ষণৰ কার্য্যসমূহ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "মোৰ শিক্ষণ কার্য্যসমূহ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "কাৰ্য {{%s}}ত সমাপ্ত হ’ল",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}}ত শেহতীয়াকৈ উন্নীত কৰা হৈছিল",
+  "DFLT_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "যোগদান কৰক",
+  "DFLT_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "শেহতীয়া শিক্ষণ কার্য্যসমূহ",
+  "DFLT_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "কার্য্যটো এৰিব খুজিছে ?",
+  "DFLT_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "যোগদান কৰিবলৈ লগ ইন  কৰক",
+  "DFLT_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "বিষয়বস্তু ডাউনল’ড কৰক",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "কার্য্যসমূহ ({{%s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "কার্য্য ({{%s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "অনলাইন শিক্ষণ গ্ৰহণ কৰক",
+  "DFLT_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "জনপ্ৰিয় কার্য্যসমূহ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "অনলাইন শিক্ষণ গ্ৰহণ কৰক",
+  "DFLT_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "প্ৰমাণপত্ৰ অৰ্জন কৰিবলৈ {{%s}}ৰ ভিতৰত  কার্য্য সম্পূর্ণ কৰক ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING": "শিক্ষণ কাৰ্য",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "উপস্থিত থকা শিক্ষণ কার্য্য (সমূহ)",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "কার্য্যৰ সবিশেষ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "কার্য্য সমাপ্ত হ’ব",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "কার্য্য শেষ হোৱাৰ তাৰিখ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "কার্য্যৰ সবিশেষ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "এই কার্য্যটো এইসকলৰ বাবে প্ৰাসংগিক:",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "কার্য্যৰ সমলসমূহ",
+  "DFLT_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "কার্য্যটো ত্যাগ কৰক",
+  "DFLT_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "শিক্ষণ কার্য্যসমুহ পৰীক্ষা কৰিব বিচাৰিছে নেকি ?",
+  "DFLT_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "এই কার্য্যৰ বেটছটো ‪{{batch_start_date}}ৰ পৰা উপলব্ধ হৈছে",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "আপোনাৰ পঞ্জীকৃত যোগাযোগ সবিশেষত প্ৰমাণপত্ৰৰ বিষয়ে ৭ দিনৰ ভিতৰত আপোনাক জনোৱা হ’ব",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "টোকা:  এই কার্য্যৰ কোনো প্ৰমাণপত্ৰ নাই",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "আপুনি কার্য্যটোত  যোগদান কৰিলে",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "টোকা: বৰ্তমান,  এই কার্য্যৰ কোনো প্ৰমাণপত্ৰ নাই। পাঠ্যক্ৰমটোৰ প্ৰস্তুতকৰ্তাই পাছত এখন প্ৰমাণপত্ৰ সংলগ্ন কৰিব পাৰে ।",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "আপুনি কার্য্যটোৰ পৰা  ওলাই আহিল",
+  "DFLT_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "এই শিক্ষণ কার্য্যৰ বাবে কোনো বেটছ্ নাই",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "কার্য্যটো পঞ্জীকৃত ব্যৱহাৰকাৰীসকলৰ বাবে। কার্য্যটোত  প্ৰৱেশাধিকাৰ পাবলৈ লগ ইন কৰক",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "এই কার্য্যটো আৰম্ভ কৰিবলৈ লগ ইন কৰক",
+  "DFLT_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "এই কার্য্যৰ বাবে কোনো বেটছ্ উপলব্ধ নাই",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "কেৱল পঞ্জীয়নভুক্ত ব্যৱহাৰকাৰীসকলেহে শিক্ষণ কার্য্যত ভাগ ল’ব পাৰিব",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "আপুনি এই কার্য্যটো সফলতাৰে সম্পূর্ণ কৰিলে",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "কার্য্যটো সমাপ্ত হ’ল। আপুনি মূল্যায়নটো পুনৰ কৰিব পাৰে, কিন্তু আপোনাৰ অগ্ৰগতি নথিভুক্ত কৰা নহ’ব।",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "কার্য্যটো সমাপ্ত হ’ল। আপুনি মূল্যায়নটো কৰিব পাৰে, কিন্তু আপোনাৰ অগ্ৰগতি নথিভুক্ত কৰা নহ’ব।",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "কার্য্যৰ সবিশেষ চাবলৈ আৰু প্ৰৱেশাধিকাৰ লাভ কৰিবলৈ আপুনি এটা সক্ৰিয় বেটছত যোগদান কৰিব লাগিব",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "কার্য্যৰ সবিশেষৰ প্ৰৱেশযোগ্যতা লাভ কৰিবলৈ আপুনি লগ ইন কৰিব লাগিব",
   "DISMISS": "বাতিল কৰক",
+  "DISMISS_AS_GROUP_ADMIN": "গোট এডমিন হিচাপে অব্যাহতি লওক",
+  "DISMISS_AS_GROUP_ADMIN_ERROR_MSG": "গোটৰ এডমিন হিচাপে {{member_name}} অব্যাহতি ল’ব পৰা নাই",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_DESC": "গোট এডমিন হিচাপে {{member_name}} অব্যাহতি লোৱাটোৱে সদস্যজনৰ পৰা এডমিনৰ অনুমতি আঁতৰায়",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_TITLE": "গ্ৰূপ এডমিন হিচাপে অব্যাহতি ল’ব নেকি?",
+  "DISMISS_AS_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} এতিয়া গোটটোৰ এডমিন হিচাপে নাই",
   "DISTRICT": "জিলা",
   "DISTRICT_OPTION_TEXT": "জিলা বাছি লওঁক",
-  "DOCS": "নথিপত্ৰসমূহ",
+  "DOC": "নথিপত্ৰসমূহ",
   "DOWNLOAD": "ডাউনল'ড ",
   "DOWNLOADING": "ডাউনল’ড হৈ আছে {{%s}}%",
   "DOWNLOADING_1": "ডাউনল’ড হৈ আছে {{%s}}",
@@ -192,25 +366,34 @@
   "DOWNLOAD_NOT_ALLOWED_FOR_QUIZ": "এই বিষয়বস্তু ডাউনল’ড কৰিব নোৱাৰে",
   "DOWNLOAD_NOW": "এতিয়া ডাউনল’ড কৰক",
   "DOWNLOAD_PATH": "Internal Storage ত ফাইল সংৰক্ষিত হৈ আছে > Folder ডাউনল’ড কৰক",
-  "EDIT": "এডিট",
+  "EDIT": "সম্পাদনা",
   "EDIT_EMAIL_POPUP_TITLE": "ইমেইল ID সম্পাদনা কৰক",
-  "EDIT_GROUP": "দল এডিট কৰক",
+  "EDIT_GROUP": "দল সম্পাদনা কৰক",
   "EDIT_PERSONAL_DETAILS": "ব্যক্তিগত সবিশেষ এডিট কৰক",
   "EDIT_PHONE_POPUP_TITLE": "ম'বাইল নম্বৰ এডিট কৰক",
-  "EDIT_PROFILE": "প্ৰ'ফাইল এডিট কৰক",
+  "EDIT_PROFILE": "প্ৰ'ফাইল সম্পাদনা কৰক",
   "EMAIL_EDIT_SUCCESS": "ইমেইল ঠিকনা সফলভাৱে আপডেট কৰা হ'ল",
   "EMAIL_ID_PLACEHOLDER": "ইমেইল ঠিকনা",
-  "EMAIL_PLACEHOLDER": "ইমেইল ID দিয়ক",
+  "EMAIL_PLACEHOLDER": "ইমেইল ঠিকনা প্ৰৱেশ কৰক",
   "EMAIL_UPDATE_SUCCESS": "ইমেইল সফলভাৱে আপডেট কৰা হ'ল",
   "EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) ৰ কাৰণে কোনো কিতাপ পোৱা নগ’ল",
   "EMPTY_SEARCH_RESULTS": "কোনো ফলাফল পোৱা  নগ’ল",
+  "EMPTY_SEARCH_RESULT_GROUPS": "আমি দুঃখিত ! আপুনি বিচৰাৰ লগত মিলা কোনো ফলাফল নাই",
   "ENDORSE": "অনুমোদন জনাওক",
   "ENJOYED_THIS_CONTENT": "বিষয়বস্তু উপভোগ কৰিলেনে?",
   "ENROLL": "যোগদান",
+  "ENROLLMENT_ENDED_ON": "এই বেটছটোত নামভৰ্তি {{%s}} তাৰিখত শেষ হ’ল",
   "ENROLLMENT_LAST_DATE": "যোগদানৰ শেষ দিন:",
   "ENTER_GROUP_NAME": "গোটৰ নাম অন্তৰ্ভুক্ত  কৰক",
-  "ENTER_OTP": "OTP দিয়ক",
-  "ENTER_PHONE_POPUP_TITLE": "ম'বাইল নম্বৰ দিয়ক",
+  "ENTER_ID": "ID অন্তৰ্ভুক্ত কৰক",
+  "ENTER_ID_AS_REQUESTED_BY_STATE_BOARD_ORG": "আপোনাৰ ৰাজ্য / ব’ৰ্ড / সংগঠনৰদ্বাৰা অনুৰোধ কৰা মতে ID অন্তৰ্ভুক্ত কৰক",
+  "ENTER_LOCATION_FROM_PROFILE_PAGE": "প্ৰ’ফাইল পে’জৰ পৰা অৱস্থান প্ৰৱেশ কৰক",
+  "ENTER_MEMBER_ID": "{{app_name}} ID প্ৰৱেশ কৰক",
+  "ENTER_OTP": "অ'টিপি প্ৰৱেশ কৰক",
+  "ENTER_PHONE_POPUP_TITLE": "মোবাইল নম্বৰ প্ৰৱেশ কৰক",
+  "ENTER_SCHOOL_NAME": "বিদ্যালয়ৰ নাম অন্তৰ্ভুক্ত  কৰক",
+  "ENTER_THE_FOLLOWING_INFORMATION": "নিম্নোক্ত তথ্য প্ৰৱেশ কৰক",
+  "ENTER_UDISE_ID": "UDISE ID প্ৰৱেশ কৰক",
   "ERROR_BATCH_NOT_STARTED": "গোট আৰম্ভ হোৱা নাই",
   "ERROR_CANT_OPEN_EMPTY_CONTENT": "খালী ফাইল খুলিব নোৱাৰি",
   "ERROR_CONTENT_NOT_AVAILABLE": "বিষয়বস্তু উপলব্ধ নহয়",
@@ -223,21 +406,32 @@
   "ERROR_FAILED_TO_DOWNLOAD_ATTACHMENT": "Attachment ডাউনল’ড নহ’ল",
   "ERROR_FETCHING_DATA": "ডাটা অনুসন্ধান কৰিব পৰা নাই",
   "ERROR_LOW_MEMORY": "স্থানান্তৰৰ কাৰণে পৰ্যাপ্ত স্থান উপলব্ধ নাই",
+  "ERROR_MAXIMUM_ACTIVITY_COUNT_EXCEEDS": "আপুনি গোটটোত যোগ দিব পৰা কাৰ্য্যৰ  সৰ্বাধিক সংখ্যা অতিক্ৰম কৰিলে",
+  "ERROR_MAXIMUM_GROUP_COUNT_EXCEEDS": "আপুনি সৰ্বাধিক গোটৰ সংখ্যা অতিক্ৰম কৰিলে যিসমূহ প্ৰস্তুত কৰিব পাৰি",
+  "ERROR_MAXIMUM_MEMBER_COUNT_EXCEEDS": "আপুনি গোটটোত যোগ দিব পৰা সদস্যৰ সৰ্বাধিক সংখ্যা অতিক্ৰম কৰিলে",
   "ERROR_NAME_INVALID": "নামৰ বাবে কেৱল Alphabets নতুবা Space হে দিব",
   "ERROR_NO_BATCHES_FOUND": "এই প্ৰশিক্ষণৰ বাবে কোনো গোট নাই",
   "ERROR_NO_INTERNET_MESSAGE": "ইণ্টাৰনেটৰ প্ৰৱেশাধিকাৰ নাই",
   "ERROR_NO_OFFLINE_RESOURCE": "কোনো সমল সংৰক্ষিত হৈ থকা নাই",
   "ERROR_OFFLINE_MODE": "ইণ্টাৰনেট নাই, অফলাইন ম'ডত আছে",
-  "ERROR_OTP": "অশুদ্ধ OTP। শুদ্ধ OTP টো দিয়ক",
+  "ERROR_OTP": "অশুদ্ধ অ’টিপি। বাকী থকা প্ৰয়াসৰ সংখ্যা: {{%s}}",
+  "ERROR_OTP_LIMIT_EXCEEDED": "আপুনি সৰ্বাধিক অটিপিৰ সীমা অতিক্ৰম কৰিছে, পাছত পুনৰ চেষ্টা কৰক",
   "ERROR_PHONE_EXISTS": "ফ'ন নম্বৰটো ইতিমধ্যে পঞ্জীয়নভুক্ত হৈ আছে। বেলেগ এটা ফ'ন নম্বৰৰে চেষ্টা কৰক",
   "ERROR_PHONE_INVALID": "এটা সক্ৰিয় ফ'ন নম্বৰ দিয়ক",
+  "ERROR_PHONE_REQUIRED": "মোবাইল নম্বৰৰ প্ৰয়োজন আছে",
   "ERROR_SAME_EMAIL_UPDATED": "এই ইমেইল ID আপোনাৰ প্ৰ’ফাইলত আগৰ পৰাই সংযোগ হৈ আছে। আন এটা ইমেইল  ID দিয়ক",
   "ERROR_SAME_PHONE_UPDATED": "এই ম'বাইল নম্বৰটো ইতিমধ্যে আপোনাৰ প্ৰ’ফাইলৰ সৈতে লিংক কৰা হৈছে। বেলেগ এটা ম'বাইল নম্বৰ দিয়ক",
   "ERROR_SERVER_CONNECTION": "ছাৰ্ভাৰৰ লগত সংযোগ কৰিব পৰা নাই",
+  "ERROR_SPECIAL_CHARECTERS_NOT_ALLOWED": "বিশেষ চিহ্ন অন্তৰ্ভুক্ত কৰাৰ অনুমতি নাই",
   "ERROR_TECHNICAL_PROBLEM": "আমি এক কাৰিকৰী বিজুতিৰ সন্মুখীন হৈছোঁ আৰু সেয়েহে অনুৰোধটো ৰক্ষা কৰিব পৰা নাই",
   "ERROR_UPLOADING_IMG": "ফটোখন আপল'ড হৈ থাকোতে বিজুতি ঘটিল",
   "ERROR_USER_ACCOUNT_BLOCKED": "ব্য়ৱহাৰকাৰীৰ একাউণ্টটো  ব্লক কৰা হৈছে। অনুগ্ৰহ কৰি বিতং তথ্যৰ বাবে Admin ৰ লগত যোগাযোগ কৰক",
+  "ERROR_WHILE_ADDING_USER": "ব্যৱহাৰকাৰী যোগ কৰোঁতে হোৱা ত্ৰুটি",
+  "ERROR_WHILE_FETCHING_USERS": "ব্যৱহাৰকাৰীক আনোতে হোৱা ভুল",
   "ERROR_WHILE_LOGIN": "Log in কৰোতে বিজুতি ঘটিল",
+  "ERROR_WHILE_SWITCHING_USER": "ব্যৱহাৰকাৰী পৰিবর্তনতে হোৱা ভুল",
+  "EXPLORE_HEADING": "{{%s}}ত অধিক অনুসন্ধান কৰক",
+  "EXP_VIDEOS": "ব্যাখ্যা কৰা ভিডিঅ’",
   "EXTRACTING_CONTENT": "বিষয়বস্তু আহৰণ কৰি থকা হৈছে {{%s}}",
   "FEEDBACK_HINT": "মতামত (ঐচ্ছিক)",
   "FEEDBACK_HINT_1": "ইয়াত এটা মন্তব্য  দিয়ক",
@@ -252,23 +446,194 @@
   "FILTER": "ফিল্টাৰ (Filter)",
   "FILTER_ADDED": "সংযোগ কৰা হ'ল",
   "FILTER_BY": "_ ৰ দ্ৱাৰা Filter কৰক",
-  "FIRST_NAME": "নাম",
   "FOLLOW": "অনুসৰণ কৰক",
-  "FORCE_UPDATE_MESSAGE": "আপুনি {{%s}} এপটোৰ এটা পুৰণি সংস্কৰণ ব্যৱহাৰ কৰি আছে। গুগল প্লে’ ষ্ট’ৰৰ পৰা শেহতীয়া সংস্কৰণটো পাবলৈ, আপডেট নাও-ত টিপক",
+  "FORCE_UPDATE_MESSAGE": "আপুনি {{%s}} এপটোৰ এটা পুৰণি সংস্কৰণ ব্যৱহাৰ কৰি আছে। গুগল প্লে’ ষ্ট’ৰৰ পৰা শেহতীয়া সংস্কৰণটো পাবলৈ, আপডেট নাও-ত টেপ কৰক",
+  "FORUM": "মতামতৰ স্থান",
+  "FOR_SUPPORT": " {{%s}}ৰ বাবে সমর্থন",
   "FREE_SPACE": "খালী ঠাই ",
+  "FRMELEMENTS_BTN_ACTIVATEGRP": "সক্ৰিয় কৰক",
+  "FRMELEMENTS_BTN_ADD": "যোগ কৰক",
+  "FRMELEMENTS_BTN_BACK": "পিছুৱাই যাওক",
+  "FRMELEMENTS_BTN_DEACTIVATEGRP": "নিষ্ক্ৰিয় কৰক",
+  "FRMELEMENTS_BTN_NEXT": "পৰৱৰ্তী",
+  "FRMELEMENTS_LBL_ACTIVATEGRP": "গোট সক্ৰিয় কৰক",
+  "FRMELEMENTS_LBL_ACTIVATEGRPQUES": "গোট সক্ৰিয় কৰিব নেকি?",
+  "FRMELEMENTS_LBL_CONTENT_TYPE": "বিষয়বস্তুৰ ধৰণ",
+  "FRMELEMENTS_LBL_DEACTIVATEGRP": "গোটটো নিষ্ক্ৰিয় কৰক",
+  "FRMELEMENTS_LBL_DEACTIVATEGRPQUES": "গোট নিষ্ক্ৰিয় কৰিব নেকি?",
+  "FRMELEMENTS_LBL_REMARKS": "মন্তব্য ",
+  "FRMELEMENTS_MSG_ACTIVATEGRPFAILED": "গোট সক্ৰিয় কৰিব পৰা নাই, পাছত পুনৰ চেষ্টা কৰক",
+  "FRMELEMENTS_MSG_ACTIVATEGRPMSG": "গোট সক্ৰিয়কৰণে আপোনাক সদস্য আৰু  কাৰ্য্যক্রম যোগ কৰাত সৱল কৰিব।  আপুনি সদস্যৰ অগ্ৰগতিও নিৰ্ণয় কৰিব পাৰিব।",
+  "FRMELEMENTS_MSG_ACTIVATEGRPPOPUP": "এই গোটটো অস্থায়ীভাৱে নিষ্ক্ৰিয় কৰা হৈছে। গোটৰ প্ৰশাসকে গোটটো সক্ৰিয় কৰিব পাৰিব",
+  "FRMELEMENTS_MSG_ACTIVATEGRPSUCCESS": "গোট সফলভাৱে সক্ৰিয় কৰা হ' ল",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPFAILED": "গোট নিষ্ক্ৰিয় কৰিব পৰা নাই, পাছত পুনৰ চেষ্টা কৰক",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPMSG": "গোট নিষ্ক্ৰিয়কৰণে আপোনাৰ প্ৰৱেশাধিকাৰ নাইকিয়া কৰিব ।আপুনি গোটত সদস্য আৰু কাৰ্য্যক্রম যোগ কৰিব নোৱাৰিব। আপুনি কোনো সদস্যৰ অগ্ৰগতিও পৰীক্ষা কৰিব নোৱাৰিব।",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPSUCCESS": "গোট সফলভাৱে নিষ্ক্ৰিয় কৰা হ' ল",
+  "FRMELEMNTS_BTN_CLOSE": "বন্ধ কৰক",
+  "FRMELEMNTS_BTN_DONOT_SHARE": "ভাগবতৰা নকৰিব",
+  "FRMELEMNTS_BTN_EDIT_SETTING": "ছেটিংছ সম্পাদনা কৰক",
+  "FRMELEMNTS_BTN_PREVIEW_FORM": "প্ৰ-পত্ৰ খন পূৰ্বদৰ্শন কৰক",
+  "FRMELEMNTS_BTN_SAVE": "সংৰক্ষণ ",
+  "FRMELEMNTS_BTN_SAVE_EDITS": "সম্পাদনাসমূহ ছে’ভ কৰক",
+  "FRMELEMNTS_BTN_SAVE_FORM": "প্ৰ-পত্ৰ খন সংৰক্ষণ কৰক",
+  "FRMELEMNTS_BTN_SEEK_HELP": "সহায় বিচাৰক",
+  "FRMELEMNTS_BTN_SUBMIT_FORM": "প্ৰ-পত্ৰ খন দাখিল কৰক",
+  "FRMELEMNTS_BTN_VIEW_DETAILS": "সবিশেষ চাওক",
+  "FRMELEMNTS_CKBX_CERTMSG": "এই বাৰ্তাটো পুনৰ নেদেখুৱাব",
+  "FRMELEMNTS_LBL_ACCESSIBILITY": "মোৰ টিভি শ্ৰেণীসমূহ",
+  "FRMELEMNTS_LBL_ACCESSIBILITYMODE": "ডাৰ্ক ম’ডলৈ চুইছ কৰক",
+  "FRMELEMNTS_LBL_ACCESSIBILITYSKIP": "মুখ্য সমললৈ পাৰ হৈ যাওক",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXT": "স্থানৰ মানচিত্ৰ",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXTSIZE": "ফণ্টৰ আকাৰ বঢ়াওক",
+  "FRMELEMNTS_LBL_ADD_ATTACHMENTS": "এটাচমেণ্ট যোগ দিয়ক",
+  "FRMELEMNTS_LBL_ADD_ENTITY": "অনুষ্ঠান যোগ দিয়ক",
+  "FRMELEMNTS_LBL_ADD_NEW_TASK": "নতুন কাৰ্য্য যোগ কৰক ",
+  "FRMELEMNTS_LBL_ADD_REMARKS": "মন্তব্য যোগ কৰক",
+  "FRMELEMNTS_LBL_ADD_SUBTASK": "উপকৰ্ম যোগ দিয়ক",
+  "FRMELEMNTS_LBL_ADD_SUBTASK_PALCEHOLDER": "উপকৰ্মৰ নাম যোগ দিয়ক",
+  "FRMELEMNTS_LBL_ADD_TASK": "কাৰ্য্য যোগ কৰক ",
+  "FRMELEMNTS_LBL_ASSIGNED_TO": "দায়িত্ব দিয়া হৈছে",
+  "FRMELEMNTS_LBL_ASSIGN_TASK": "কাৰ্য ভগাই দিয়ক",
+  "FRMELEMNTS_LBL_ATTACH": "সংলগ্ন কৰক",
+  "FRMELEMNTS_LBL_ATTACHMENTS": "এটাচমেণ্টসমূহ",
+  "FRMELEMNTS_LBL_BLOCK": "ব্লক কৰক",
+  "FRMELEMNTS_LBL_CATEGORIES": "শ্ৰেণীসমূহ",
+  "FRMELEMNTS_LBL_CATEGORY_OVERVIEW": "শ্ৰেণীৰ অৱলোকন",
+  "FRMELEMNTS_LBL_CLICK_HELP": "<b>সহায় বিচাৰক</b> বাটনত ক্লিক কৰক",
+  "FRMELEMNTS_LBL_CLICK_HERE_TO_VIEW_LIBRARY": "লাইব্ৰেৰী দৰ্শন কৰিবলৈ ইয়াত ক্লিক কৰক",
+  "FRMELEMNTS_LBL_CLUSTER": "থুপ",
+  "FRMELEMNTS_LBL_CONSENT_POPUP_INFO": "আপুনি আপোনাৰ  প্ৰ’ফাইল  পৃষ্ঠাৰ পৰা এই সবিশেষসমূহ সম্পাদনা কৰিব পাৰিব",
+  "FRMELEMNTS_LBL_CONTENT_AVAIALABLE_IN_OTHER_BOARD": "আপোনাৰ প্ৰয়োজনৰ সৈতে খাপ খোৱাকৈ অন্য ব’ৰ্ডসমূহৰ মনোগ্ৰাহী বিষয়বস্তু থাকিব পাৰে !",
+  "FRMELEMNTS_LBL_CONTENT_FOUND": "আমি আপোনাৰ প্ৰয়োজনৰ সৈতে খাপ খোৱা কিছুমান বিষয়বস্তু বিচাৰি পাইছোঁ !",
+  "FRMELEMNTS_LBL_CONTENT_TO_BE_ADDED": "আপোনাৰ ব’ৰ্ডে এতিয়াও অধিক বিষয়বস্তু সংযোজন কৰিবলৈ আছে।",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT": "আপোনাৰ বিষয়বস্তু বিচাৰি পোৱা নাই নেকি? তলৰ বাটনবিলাকত ক্লিক কৰক",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT_YET": "আপোনাৰ বিষয়বস্তু এতিয়ালৈকে বিচাৰি পোৱা নাই নেকি? ",
+  "FRMELEMNTS_LBL_CRITERIA_WISE": "অৰ্হতা",
+  "FRMELEMNTS_LBL_DATA_SETTINGS": "প্ৰ’ফাইল ডাটাৰ ভাগবতৰা কৰা",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF": "প্ৰ’ফাইল ডাটাৰ ভাগবতৰা কৰাটো বন্ধ হৈ আছে",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF_INFO": "আপুনি পাঠ্যক্ৰম প্ৰশাসকৰ সৈতে আপোনাৰ প্ৰ’ফাইলৰ সবিশেষ ভাগবতৰা কৰিবলৈ সন্মত হোৱা নাই",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON": "প্ৰ’ফাইল ডাটাৰ ভাগবতৰা কৰাটো চলি আছে",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON_INFO": "আপুনি পাঠ্যক্ৰম প্ৰশাসকৰ সৈতে আপোনাৰ প্ৰ’ফাইলৰ সবিশেষ ভাগবতৰা কৰিবলৈ সন্মত হৈছে",
+  "FRMELEMNTS_LBL_DELETE_CONFIRMATION": "আপুনি নিশ্চিতনে যে আপুনি আপোনাৰ উপকৰ্ম ডিলিট কৰিব বিচাৰিছে?",
+  "FRMELEMNTS_LBL_DONOT_SHARE_PROFILE_INFO": "মোৰ প্ৰ’ফাইলৰ সবিশেষ ভাগবতৰা নকৰিব",
+  "FRMELEMNTS_LBL_DURATION": "সময়কাল",
+  "FRMELEMNTS_LBL_EMAIL_ID_PLACEHOLDER": "ৰাজ্য/ সংগঠনৰ বাবে ই-মেইল ID",
+  "FRMELEMNTS_LBL_END_DATE": "শেষ হোৱাৰ তাৰিখ ",
+  "FRMELEMNTS_LBL_FILES": "ফাইলসমূহ",
+  "FRMELEMNTS_LBL_IMAGES": "চিত্ৰ",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS": "প্ৰকল্পৰ প্ৰতিবেদনসমূহ ",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS_DESC": "প্ৰকল্পৰ প্ৰতিবেদনসমূহ চাওক",
+  "FRMELEMNTS_LBL_IN_PROGRESS": "অগ্ৰগতি অব্যাহত আছে",
+  "FRMELEMNTS_LBL_LEARNER_PASSBOOK": "শিকাৰুৰ পাছবুক",
+  "FRMELEMNTS_LBL_LEARNING_RESOURCES": "শিক্ষণৰ সমল",
+  "FRMELEMNTS_LBL_LINK_LEARNING_RESOURCES": "শিক্ষণৰ সমলসমূহ লিংক কৰক",
+  "FRMELEMNTS_LBL_MEDIA_TYPE": "মাধ্যমৰ ধৰণ",
+  "FRMELEMNTS_LBL_MOBILE_NUMBER_PLACEHOLDER": "ৰাজ্য/ সংগঠনৰ বাবে ম'বাইল নম্বৰ ",
+  "FRMELEMNTS_LBL_MY_LEARNINGS": "মোৰ শিক্ষণসমূহ",
+  "FRMELEMNTS_LBL_NEW_TASK": "নতুন কাৰ্য",
+  "FRMELEMNTS_LBL_NO_MATCHING_CONTENT": "মিল থকা কোনো বিষয়বস্তু পোৱা নগ’ল",
+  "FRMELEMNTS_LBL_OBJECTIVE": "উদ্দেশ্য ",
+  "FRMELEMNTS_LBL_OBSERVATION": "পৰ্যবেক্ষণ",
+  "FRMELEMNTS_LBL_OBSERVATION_DESC": "আপোনাৰ শ্ৰেণীকোঠা আৰু বিদ্যালয়ৰ পৰ্যবেক্ষণত সহজতে প্ৰৱেশাধিকাৰ লাভ কৰক আৰু লিপিবদ্ধ কৰক, আৰু আপোনাৰ উন্নতিৰ যাত্ৰাৰ পৰিকল্পনা কৰক",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS": "পৰ্যবেক্ষণৰ প্ৰতিবেদন",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS_DEC": "পৰ্যবেক্ষণৰ প্ৰতিবেদন চাওক",
+  "FRMELEMNTS_LBL_OBSERVE_AGAIN": "পুনৰ পৰ্যবেক্ষণ কৰক",
+  "FRMELEMNTS_LBL_OPEN_BATCH_NOT_RECOMMENDED": "( যদিহে আপুনি পূৰ্বৰ বেট্ছত ইতিমধ্যে এই পাঠ্যক্ৰম সম্পূৰ্ণ কৰিছে তেন্তে যোগদান কৰিবলৈ পৰামৰ্শ দিয়া নহয় কাৰণ  আপোনাৰ শিকাৰ ইতিহাস আৰু প্ৰমাণপত্ৰবোৰ ৰিছেট হৈ যাব) ",
+  "FRMELEMNTS_LBL_PERSONA": "ভূমিকা ",
+  "FRMELEMNTS_LBL_PROFCONF": "প্ৰ’ফাইলৰ নাম নিশ্চিত কৰক",
+  "FRMELEMNTS_LBL_PROFTITLE": "প্ৰ’ফাইলৰ নাম",
+  "FRMELEMNTS_LBL_PROGRAM_NAME": "কাৰ্য্যসূচীৰ নাম",
+  "FRMELEMNTS_LBL_PROJECT": "প্ৰকল্প",
+  "FRMELEMNTS_LBL_PROJECT_DESCRIPTION": "কাৰ্য সৃষ্টি কৰা আৰু সময়সূচী পৰিকল্পনা কৰাৰদ্বাৰা আপোনাৰ বিদ্যালয়ৰ উন্নতি পৰিচালনা আৰু অনুসৰণ কৰক",
+  "FRMELEMNTS_LBL_PROJECT_OVERVIEW": "প্ৰকল্পৰ অৱলোকন",
+  "FRMELEMNTS_LBL_PROJECT_STATUS": "প্ৰকল্পৰ স্থিতি",
+  "FRMELEMNTS_LBL_PROJECT_TITLE": "প্ৰকল্পৰ শীৰ্ষক",
+  "FRMELEMNTS_LBL_PROJECT_VIEW": "প্ৰকল্পৰ দৰ্শন",
+  "FRMELEMNTS_LBL_QUESTION_WISE": "প্ৰশ্নসমূহ",
+  "FRMELEMNTS_LBL_RELEVANT_CONTENT_SUB_HEADING": "বিশেষ ধৰণৰ বিষয়বস্তুৰ বিচাৰিবৰ বাবে সবিশেষ পূৰণ কৰক",
+  "FRMELEMNTS_LBL_REPORTS": "প্ৰতিবেদনসমূহ ",
+  "FRMELEMNTS_LBL_REPORTS_DESC": "প্ৰতিবেদনৰ তালিকা",
+  "FRMELEMNTS_LBL_REQUEST_CONTENT": "বিষয়বস্তুৰ বাবে অনুৰোধ কৰক",
+  "FRMELEMNTS_LBL_SCHOOL": "বিদ্যালয় ",
+  "FRMELEMNTS_LBL_SELECT_CATEGORIES": "শ্ৰেণী (সমূহ) বাছনি কৰক",
+  "FRMELEMNTS_LBL_SELECT_PROGRAM": "কার্য্যসূচী বাছি লওক",
+  "FRMELEMNTS_LBL_SET_DATE": "তাৰিখ স্থিৰ কৰক",
+  "FRMELEMNTS_LBL_SET_DATE_HINT": "আপোনাৰ প্ৰকল্পৰ বাবে এক সময়সূচী স্থিৰ কৰক",
+  "FRMELEMNTS_LBL_SHARE_PROFILE_INFORMATION": "মোৰ প্ৰ’ফাইলৰ সবিশেষ ভাগবতৰা কৰক",
+  "FRMELEMNTS_LBL_START_DATE": "আৰম্ভণি তাৰিখ",
+  "FRMELEMNTS_LBL_STATUS": "স্থিতি",
+  "FRMELEMNTS_LBL_SUBPERSONA": "উপ-ভূমিকা",
+  "FRMELEMNTS_LBL_SUBTASKS": "উপকৰ্ম",
+  "FRMELEMNTS_LBL_SURVEY": "জৰীপ",
+  "FRMELEMNTS_LBL_SURVEY_ACTION": "জৰীপ ক্ৰিয়াসমূহ",
+  "FRMELEMNTS_LBL_SURVEY_DESC": "জৰীপৰ তালিকাকৰণ",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS": "জৰীপৰ প্ৰতিবেদন",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS_DESC": "জৰীপৰ প্ৰতিবেদন চাওক",
+  "FRMELEMNTS_LBL_TAB_HOME": "হ’ম",
+  "FRMELEMNTS_LBL_TASK_DESCRIPTION": "কাৰ্য্যৰ বিৱৰণ ",
+  "FRMELEMNTS_LBL_TASK_OVERVIEW": "কাৰ্যৰ অৱলোকন",
+  "FRMELEMNTS_LBL_THIS_MONTH": "এই মাহ",
+  "FRMELEMNTS_LBL_TOTAL_TASKS": "মুঠ কাৰ্যসমূহ",
+  "FRMELEMNTS_LBL_UPCOMING": "আহিবলগীয়া ",
+  "FRMELEMNTS_LBL_UPDATE_DATA_SETTINGS": "ছেটিংছ আপডেট কৰক",
+  "FRMELEMNTS_LBL_USERTYPE_LEADER": "বিদ্যালয়ৰ মুৰব্বী বা বিষয়াসকল ",
+  "FRMELEMNTS_LBL_VIEW_ENTITY_REPORT": "বিদ্যমানতাৰ প্ৰতিবেদন চাওক",
+  "FRMELEMNTS_LBL_VIEW_FULL_REPORT": "সম্পূৰ্ণ প্ৰতিবেদন চাওক",
+  "FRMELEMNTS_LBL_VIEW_RESOURCES": "সমলসমূহ চাওক",
+  "FRMELEMNTS_MSG_BATCH_ALREADY_CLOSED": "বেটছটোত নামভৰ্তিৰ তাৰিখ ‪{endDate}ত‬ পাৰ হৈ গ’ল",
+  "FRMELEMNTS_MSG_CONSENT_DECLARATION_INFO": "আপুনি আপোনাৰ  প্ৰ’ফাইল  পৃষ্ঠাৰ পৰা আপোনাৰ সবিশেষসমূহ সম্পাদনা কৰিব পাৰিব",
+  "FRMELEMNTS_MSG_DATA_SETTINGS_SUBMITED_SUCCESSFULLY": "আপোনাৰ ডাটা ছেটিংছ সফলভাৱে দাখিল কৰা হ’ল",
+  "FRMELEMNTS_MSG_DELETE_TASK_CONFIRMATION": "আপুনি নিশ্চিতনে যে আপুনি এই কাৰ্যটো ডিলিট কৰিব বিচাৰিছে?",
+  "FRMELEMNTS_MSG_EDITCERTNAME": "আপুনি এইটো আপোনাৰ প্ৰ’ফাইল পৃষ্ঠাৰপৰা সম্পাদনা কৰিব পাৰে",
+  "FRMELEMNTS_MSG_LOAD_FROM_LIBRARY": "লাইব্ৰেৰীৰ পৰা ল’ড কৰক",
+  "FRMELEMNTS_MSG_NAMEONCERT": "এই নামটো আপোনাৰ পাঠ্যক্ৰমৰ প্ৰমাণপত্ৰত মুদ্ৰিত কৰা হ’ব। এইটো শুদ্ধ হয়নে নহয় পৰীক্ষা কৰক।",
+  "FRMELEMNTS_MSG_SELECT_IMAGE_SOURCE": "চিত্ৰৰ উৎস বাছনি কৰক",
+  "FRMELEMNTS_MSG_SELFDECLARATION_SUCCESS_INFO": "আপুনি আপোনাৰ প্ৰ’ফাইলৰ পৰা এই তথ্য সম্পাদনা কৰিব পাৰে",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED": "সফলভাৱে সংলগ্ন কৰা হ'ল",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_SYNCED": "প্ৰকল্পটো সফলতাৰে চিংক কৰা হ’ল",
+  "FRMELEMNTS_MSG_TICKET_SUBMISSION_SUCCESS": "আপোনাৰ মূল্যায়নৰ কাৰণে ধন্যবাদ।আমি আমাৰ কাৰণে প্রেৰণ কৰা প্ৰতিটো পৰামৰ্শতে সঁহাৰি জনাব নোৱাৰিব পাৰো, কিন্তু আপোনাৰ মূল্যায়ন আমাৰ কাৰণে মূল্যবান।ই {{app_name}}ক প্ৰতিগৰাকী ব্যৱহাৰকৰ্তাৰ বাবে অধিক উন্নত হোৱাত সহায় কৰে।",
+  "FRMELEMNTS_MSG_UNABLE_TO_ENROLL": "আপুনি এতিয়া বেট্ছৰ পৰা প্ৰস্থান কৰিব নোৱাৰিব। পাছত পুনৰ চেষ্টা কৰক",
+  "FRMELEMNTS_MSG_UPDATED_SUCCESSFULLY": "সফলভাৱে উন্নীত কৰা হ’ল",
+  "FRMELEMNTS_MSG_USER_CREATION_LIMIT_EXCEEDED": "আপুনি আপোনাৰ প্ৰ’ফাইলৰ অধিনত মেনেজ কৰিব পৰা ব্যৱহাৰকাৰী সৃষ্টি কৰাৰ সীমা পাৰ কৰিলে",
+  "FRMELEMNTS_MSG_USE_CAMERA": "কেমেৰা ব্যৱহাৰ কৰক",
+  "FRMELEMNTS_MSG_USE_FILE": "ফাইল ব্যৱহাৰ কৰক",
+  "FRMELEMNTS_MSG_YOUR_CHANGES_ARE_SAVED": "আপোনাৰ পৰিৱৰ্তনসমূহ সফলভাৱে ছে’ভ কৰা হ’ল।",
+  "FRMELENTS_LBL_ACCESSIBILITYNORMALMODE": "লাইট ম’ডলৈ চুইচ কৰক",
+  "FRMELMNTS_BLTPT_EARNCERT": "প্ৰমাণপত্ৰসমূহ কেৱল {{STATE}} ৰাজ্যৰ ব্যৱহাৰকাৰীৰ বাবে ইছ্যু কৰা হয়",
+  "FRMELMNTS_BLTPT_EARNCERT2": "আপুনি আপোনাৰ সকলো মূল্যায়নত {{PERCENTAGE}}ত কৈ অধিক স্ক’ৰ কৰক",
+  "FRMELMNTS_BLTPT_EARNCERT3": "প্ৰমাণপত্ৰ অৰ্জন কৰিবলৈ আপুনি মূল্যায়ন কেৱল {{ATTEMPTS}} বাৰহে চেষ্টা কৰিব পাৰিব।",
+  "FRMELMNTS_IMSG_DECLAREINFO": "এই পাঠ্যক্ৰমৰ বাবে প্ৰমাণপত্ৰসমূহ কেৱল ৰাজ্যৰদ্বাৰা স্বীকৃত শিক্ষকসকলৰ বাবে ইছ্যু কৰা হয়",
+  "FRMELMNTS_IMSG_LASTATTMPALRT": "এইটো হ’ল বাকী থকা প্ৰয়াসৰ অন্তিমটো",
+  "FRMELMNTS_IMSG_LASTATTMPTEXCD": "আপুনি দাখিল কৰিব পৰা প্ৰয়াসৰ সৰ্বোচ্চ সীমা অতিক্ৰম কৰিলে",
+  "FRMELMNTS_LBL_ACCESSIBILITYFNTDFLT": "ডিফল্টত পুনৰ স্থিৰ কৰক",
+  "FRMELMNTS_LBL_ACCESSIBILITYFONT": "ফণ্টৰ আকাৰ কমাওক",
+  "FRMELMNTS_LBL_AVSCORE": "উৎকৃষ্ট মূল্যায়ন স্ক’ৰসমূহৰ গড়",
+  "FRMELMNTS_LBL_BESTSCORE": "সৰ্বোত্তম স্ক’ৰ {{SCORE}}",
+  "FRMELMNTS_LBL_CERTQUES": "আপুনি আপোনাৰ প্ৰমাণপত্ৰ কেনেদৰে আৰ্জন কৰে?",
+  "FRMELMNTS_LBL_NOTIFNUMBER": "{{NUMBER}}তা নতুন জাননী",
+  "FRMELMNTS_LBL_SEELESS": "কমকৈ চাওক",
+  "FRMELMNTS_LBL_SEEMORE": "অধিক চাওক",
+  "FRMELMNTS_LBL_STATEUSERQUES": "আপুনি এগৰাকী ৰাজ্যিক শিক্ষক নেকি?",
+  "FRMELMNTS_LNK_DECLARELINK": "এতিয়া ঘোষণা কৰক",
+  "FRMELMNTS_PRMPT_DECLAREPROMPT": "প্ৰমাণপত্ৰ অৰ্জন কৰিবলৈ {instance}ত আপোনাৰ তথ্য ঘোষণা কৰক",
+  "FRMELMNTS_SCTTL_NOTIFHEADER": "জাননীসমূহ",
   "FROM": "পৰা",
   "FULL_NAME": "সম্পূৰ্ণ নাম",
+  "GET_STARTED": "আৰম্ভ কৰা হৈছে",
   "GOT_IT": "বুজিলোঁ",
+  "GO_TO_DOWNLOADS": "ডাউনল’ডবিলাকলৈ যাওক",
+  "GO_TO_PROFILE": "প্ৰ’ফাইললৈ যাওক",
   "GRADE_OPTION_TEXT": "শ্ৰেণীটো বাছি লওঁক",
   "GRANT_ACCESS": "প্ৰৱেশাধিকাৰ অনুমোদন কৰক",
-  "GROUPS": "দলসমূহ",
-  "GROUPS_YOU_FOLLOW": "আপুনি অনুসৰণ কৰা দলসমূহ",
-  "GROUP_CREATE_SUCCESS": "দলটো সফলভাৱে সৃষ্টি কৰা হ' ল",
-  "GROUP_DELETE_CONFIRM": "'{{%s}}'  ডিলিট কৰাটো নিশ্চিত কৰিছেনে?",
-  "GROUP_DELETE_CONFIRM_MESSAGE": "এই কাৰ্যই দলটো ডিলিট কৰি দিব, কিন্তু ব্যৱহাৰকাৰীসকলক নহয়। ব্যৱহাৰকাৰীসকলক ‘Users’ টেবটোত পোৱা যাব",
-  "GROUP_MEMBER_ADD_SUCCESS": "সদস্যসকলক সফলভাৱে  সংযোগ কৰা হ'ল",
-  "GROUP_MEMBER_DELETE_SUCCESS": "দলৰ সদস্যসকলক সফলভাৱে আঁতৰোৱা হ'ল",
-  "GROUP_NAME": "দলৰ নাম",
+  "GROUP_CREATED": "গোট সফলভাৱে সৃষ্টি কৰা হ' ল",
+  "GROUP_CREATED_BY": "{{group_creator_name}}ৰদ্বাৰা প্ৰস্তুত কৰা  হৈছে",
+  "GROUP_DESCRIPTION": "গোটৰ বৰ্ণনা",
+  "GROUP_DESCRIPTION_PLACEHOLDER": "গ্ৰূপটোৰ উদ্দেশ্য বুজি পোৱাত সদস্যসকলক সহায় কৰিবলৈ এটা বৰ্ণনা প্ৰৱেশ কৰক",
+  "GROUP_GUIDELINES": "গোটৰ নিৰ্দেশনাসমুহ",
+  "GROUP_MEMBER_SEARCH_PLACEHOLDER": "গোটৰ ভিতৰত বিচাৰক",
+  "GROUP_NAME": "গোটৰ নাম",
+  "GROUP_NAME_IS_REQUIRED": "আপুনি গোটৰ নাম প্ৰৱেশ কৰিব লাগিব",
+  "GROUP_TERMS_IS_REQUIRED": "আগবঢ়াৰ আগতে আপুনি {{app_name}} সেৱাৰ চৰ্তাৱলীত সন্মতি জনাব লাগিব",
   "GROUP_UPDATE_SUCCESS": "দলৰ সবিশেষ সফলভাৱে আপডেট হ'ল",
   "HABIT_REMINDER_NOTIFICATION_MESSAGE": "{{%s}} ত আজি কিবা এটা নতুন শিকক !",
   "HELP": "সহায়",
@@ -277,8 +642,9 @@
   "HIDE_CREDITS_INFO": "অনুজ্ঞাপত্ৰ সম্পৰ্কীয় তথ্য লুকুৱাই ৰাখক",
   "HINT_LANGUAGE": "পচন্দৰ ভাষাটো বাছি লওঁক",
   "HOBBIES": "ৰুচিসমূহ",
-  "IAM_ABOVE_18_YEARS_AGE": "মোৰ বয়স ১৮ বছৰতকৈ বেছি",
-  "IF_YES_LOGIN": "যদি হয়, তেন্তে log in ত  স্পৰ্শ কৰক",
+  "HOURS_AGO": "{{%s}} ঘণ্টাৰ আগতে",
+  "HOUR_AGO": "{{%s}} ঘণ্টাৰ আগতে",
+  "ID_IS_REQUIRED": "ID প্ৰয়োজনীয়",
   "IMPORTING": "অন্তৰ্ভুক্ত হৈ আছে...",
   "IMPORTING_COUNT": "অন্তৰ্ভুক্ত হৈ আছে",
   "IMPORT_ECAR": "অসংগত ফাইল ফৰ্মেট। আপুনি কেৱল .ecar, .epar আৰু .gsa ফাইলহে অন্তৰ্ভুক্ত কৰিব পাৰিব",
@@ -287,60 +653,97 @@
   "INACTIVE": "নিষ্ক্ৰিয়",
   "INCORRECT_TEACHER_ID_ERROR": "আপুনি এটা অশুদ্ধ ID দিছে। ID টো পুনৰ দিয়ক",
   "INSTALL_CROSSWALK": "Crosswalk ইনষ্টল কৰক",
+  "INSTANCE_TERMS_OF_USE": "{{app_name}} ব্যৱহাৰৰ চৰ্তাৱলী",
   "INSUFFICIENT_STORAGE": "পৰ্যাপ্ত ষ্ট’ৰেজ নাই",
   "INTERACTION": "সহাৰিমূলক",
+  "INTERACTIVE_MATERIAL": "পৰস্পৰ-প্ৰভাৱিত অধ্যয়ন সামগ্ৰী",
   "INTERNAL_MEMORY": "আভ্য়ন্তৰিণ ষ্ট’ৰেজ",
   "INTERNET_AVAILABLE": "আপুনি এতিয়া অনলাইন হৈ আছে",
   "INTERNET_CONNECTIVITY_NEEDED": "ইণ্টাৰনেটৰ সংযোগ নাই",
   "INVALID_CONTENT": "অচল বিষয়বস্তু",
   "INVALID_FORMAT": "নিষ্ক্ৰিয় ফৰ্মেট",
+  "INVALID_MEMBER_ID": "আপুনি এটা অচল {{app_name}} ID প্ৰৱেশ কৰিছে",
   "INVALID_QR": "অচল QR ক'ড",
   "ITEMS": "{{%s}} টা ফাইল (সমূহ)",
   "ITEMS_SELECTED": "ফাইলসমূহ বাছি লোৱা হ'ল",
-  "I_AGREE_TO_TNC": "ব্যৱহাৰৰ চৰ্তসমূহৰ সৈতে মই সন্মত ",
-  "JOIN_TRAINING": "প্রশিক্ষণত যোগদান কৰক",
+  "I_AGREE_TO": "মই {{app_name}}ৰ সৈতে সন্মত",
+  "I_AGREE_TO_TNC": "ব্যৱহাৰৰ নিয়ম আৰু চৰ্তাৱলীসমূহৰ সৈতে মই সন্মত ",
+  "I_AM_A_PERSONA_WITH_TENANT": "মই {{%tenant}}ৰ সৈতে এগৰাকী {{%persona}}",
+  "I_UNDERSTAND_AND_ACCEPT": "মই বুজি পাইছোঁ আৰু গ্ৰহণ কৰিছোঁ",
+  "JOIN_TRAINING": "পাঠ্যক্ৰমত যোগদান কৰক",
   "LANGUAGE": "ভাষা",
   "LANGUAGE_SETTINGS": "ভাষাৰ ছেটিংছ (Settings)",
   "LAST_DATE_TO_JOIN": "যোগদানৰ শেষ দিন",
   "LAST_SYNC": "শেষবাৰৰ বাবে Sync কৰা হৈছিল",
+  "LAST_UPDATED": "শেহতীয়াকৈ উন্নীত কৰা হৈছিল{{%s}}",
   "LAST_VIEWED": "অন্তিম দৰ্শন",
-  "LATEST_COURSES": "শেহতীয়া প্ৰশিক্ষণসমূহ",
-  "LEAVE_TRAINING_HEADING": "প্রশিক্ষণ এৰিব খুজিছে ?",
+  "LATEST_COURSES": "শেহতীয়া পাঠ্যক্ৰমসমূহ",
+  "LEAVE_GROUP": "গোট ত্যাগ কৰক",
+  "LEAVE_GROUP_ERROR_MSG": "গোটটোৰ পৰা আঁতৰিব পৰা নাই। পাছত পুনৰ চেষ্টা কৰক",
+  "LEAVE_GROUP_POPUP_DESC": "এই কাৰ্য্যটো কৰিব নোৱৰা হৈ থকা নাই। আপুনি {{group_name}}ৰ পৰা আঁতৰিব বিচাৰিছে নেকি?",
+  "LEAVE_GROUP_POPUP_TITLE": "গোটটো ত্যাগ কৰিব নেকি?",
+  "LEAVE_GROUP_SUCCESS_MSG": "আপুনি এই গোটটোৰ অংশ হৈ থকা নাই",
+  "LEAVE_TRAINING_HEADING": "পাঠ্যক্ৰম এৰিব খুজিছে ?",
   "LIBRARY_BNAV": "লাইব্ৰেৰী (Library)",
   "LICENSE": "অনুজ্ঞাপত্ৰৰ চৰ্তসমূহ",
   "LOAD": "ল’ড কৰক",
+  "LOADER_PROGRESS_DESCRIPTION": "আমি বিষয়সমূহ সাজু কৰি আছোঁ",
+  "LOADER_PROGRESS_DESC_SUB_HEADING": "অপেক্ষা কৰক...",
   "LOADING_CONTENT": "বিষয়বস্তু ল’ড হৈ আছে",
   "LOADING_CONTENTS": "কনটেন্ট ল’ড হৈ আছে {{%s}}%",
-  "LOADING_USER_LIST": "ব্যৱহাৰকাৰীৰ তালিকা ল’ড হৈ আছে, অনুগ্ৰহ কৰি অপেক্ষা কৰক",
   "LOAD_FILE": "ফাইল ল’ড কৰক",
-  "LOGGED_IN_AS": "এনেধৰণে Logged in হ'ব ",
-  "LOGGED_OUT": "লগ্ড্ আউট (Logged Out)",
-  "LOGIN_TO_JOIN_TRAINING": "প্ৰশিক্ষণত যোগদান কৰিবলৈ Log in কৰক",
+  "LOGGED_IN_MEMBER": "{{member_name}} (আপুনি)",
+  "LOGIN_TO_CREATE_GROUP_DESCRIPTION": "আপোনাৰ নিজৰ গোট,  অধ্যয়ন চক্ৰ বা শ্ৰেণীকোঠাটো সৃষ্টি কৰাৰ প্ৰথম পদক্ষেপটো হ’ল লগ ইন কৰা",
+  "LOGIN_TO_JOIN_TRAINING": "এটা পাঠ্যক্ৰমত যোগদান কৰিবলৈ লগ ইন  কৰক",
   "LOGOUT": "লগ আউট",
   "LOW_BANDWIDTH": "কম বেণ্ডৱিথ (Bandwith)",
   "LOW_BANDWIDTH_DETECTED": " কম বেণ্ডৱিথ (Bandwith) ৰ নেটৱৰ্ক ধৰা পৰিছে",
-  "MARKS": "নম্বৰসমূহ",
+  "MAINTENANCE_MESSAGE": "মেৰামতি চলি থকাৰ বাবে বৰ্তমান আমাৰ সেৱা ব্যাহত হৈ আছে। কিন্তু চিন্তা নকৰিব, আমি {{%timeLeft}} ঘণ্টাত উভতি আহিম। সোনকালেই উভতি আহক!",
+  "MAINTENANCE_SUB_TEXT": "আপুনি এতিয়াও আপুনি ডাউনল’ড কৰি থোৱা কনটেণ্টৰ প্ৰৱেশাধিকাৰ লাভ কৰিব পাৰে",
+  "MAKE_ADMIN": "এডমিন বনাওক",
+  "MAKE_GROUP_ADMIN_ERROR_MSG": "{{member_name}}ক গোটৰ এডমিন পাতিব পৰা নাই",
+  "MAKE_GROUP_ADMIN_POPUP_DESC": "এই ক্ৰিয়াই {{member_name}} গ্ৰূপ এডমিনৰ অনুমতি প্ৰদান কৰিব",
+  "MAKE_GROUP_ADMIN_POPUP_TITLE": "গোট এডমিন বনাব নেকি?",
+  "MAKE_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} এতিয়া গোটৰ এডমিন",
   "MEDIUM": "মাধ্যম",
   "MEDIUM_OF_INSTRUCTION": "নিৰ্দেশনাৰ মাধ্যম",
   "MEDIUM_OPTION_TEXT": "মাধ্যম বাছি লওঁক",
+  "MEMBERS": "সদস্যসকল",
+  "MEMBER_ADDED_TO_GROUP": "গোটত সদস্য সফলতাৰে যোগ কৰা হ’ল",
+  "MEMBER_ALREADY_EXISTS_IN_GROUP": "এই সদস্যজন ইতিমধ্যেই গোটৰ এটা অংশ হৈছে।",
+  "MEMBER_ID": "{{app_name}} ID ",
+  "MENU_DELETE_GROUP": "গোটটো বিলোপ কৰক",
+  "MENU_DISMISS_AS_GROUP_ADMIN": "গোট এডমিন হিচাপে অব্যাহতি লওক",
+  "MENU_EDIT_GROUP_DETAILS": "গোটৰ সবিশেষ সম্পাদনা কৰক",
+  "MENU_LEAVE_GROUP": "গোট ত্যাগ কৰক",
+  "MENU_MAKE_GROUP_ADMIN": "গ্ৰূপ এডমিন বনাওক",
+  "MENU_REMOVE_ACTIVITY": "কাৰ্যকলাপ আঁতৰাওক",
+  "MENU_REMOVE_FROM_GROUP": "গোটৰ পৰা আঁতৰাওক",
   "MERGE_ACCOUNT": "একাউন্ট একেলগ কৰক",
   "MICROPHONE": "মাইক্ৰ'ফ'ন",
   "MICROPHONE_PERMISSION_DESCRIPTION": "{{%s}}-এ মাইক্ৰ'ফ'নৰ অনুমতি ব্যৱহাৰ কৰে কেৱল সেইখিনি কনটেন্টৰ ক্ষেত্ৰতহে য'ত আপোনাৰ মাতটো ৰেকৰ্ড কৰিবলৈ অনুমতি দিয়া হয়।",
+  "MINUTES_AGO": "{{%s}} মিনিটৰ আগতে",
+  "MINUTE_AGO": "{{%s}} মিনিটৰ আগতে",
+  "MONTHS_AGO": "{{%s}} মাহৰ আগতে",
+  "MONTH_AGO": "{{%s}} মাহ আগতে",
   "MORE": "অধিক",
   "MORE_CONTENT": "{{%s}}ত অধিক কিতাপ আৰু কনটেন্ট বিচাৰক",
+  "MORE_COUNT": "অধিক ({{%s}})",
   "MORE_DETAILS": "অধিক সবিশেষ (অধিক তথ্য আগবঢ়াওক নতুবা বিষয়টোৰ এটা Screenshot সংলগ্ন কৰি দিয়ক)",
   "MOVE": "স্থানান্তৰ কৰক",
   "MOVE_FILES_TO_OTHER_DESTINATION": "ঠাই খালী কৰিবলৈ, ফাইলসমূহ {{%s}}লৈ নিয়ক",
   "MSG_ALREADY_IMPORTED": "ইতিমধ্যে অন্তৰ্ভুক্ত হৈছে",
   "MSG_IMPORTED_SUCCESSFULLY": "বিষয়বস্তু সফলভাৱে  অন্তৰ্ভুক্ত কৰা হ’ল",
-  "MSG_LOADING_BATCHES": "গোটসমূহ অনুসন্ধান কৰি থকা হৈছে...",
   "MSG_NO_DETAILS_TO_SHOW": "সবিশেষ উপলব্ধ নহয়",
   "MSG_NO_NEW_NOTIFICATION": "কোনো নতুন জাননী নাই",
   "MSG_RESOURCE_DELETED": "ডিভাইচৰ পৰা বিষয়বস্তু  ডিলিট কৰা হৈছে",
   "MULTIPLE_LICENSE": "অনুজ্ঞাপত্ৰৰ চৰ্তাৱলী {{%s}}",
   "MY_BADGES": "মোৰ Badge(s)",
+  "MY_DETAILS": "মোৰ সবিশেষ",
+  "MY_GROUPS": "মোৰ গোটসমূহ",
   "NAME": "নাম",
   "NAME_HINT": "নামটো দিয়ক",
+  "NAME_IS_REQUIRED": "আপুনি ব্যৱহাৰকাৰীৰ নাম প্ৰৱেশ কৰিব লাগিব",
   "NEED_INTERNET_FOR_DEEPLINK_CONTENT": "আপুনি অফলাইন হৈ আছে। বিষয়বস্তুৰ প্ৰৱেশাধিকাৰ পাবলৈ ইন্টাৰনেট সংযোগ কৰক।",
   "NEED_INTERNET_TO_CHANGE": "WiFi নতুবা ম’বাইল Data অন কৰক আৰু পুনৰ চেষ্টা কৰক",
   "NEW": "নতুন",
@@ -348,36 +751,32 @@
   "NEXT": "পাছৰ",
   "NIL": "নাই",
   "NO": "নহয়",
+  "NOTE": "টোকা",
   "NOTIFICATION": "জাননী",
   "NOT_AVAILABLE": "উপলব্ধ নহয়",
   "NOT_NOW": "এতিয়া নহয়",
   "NO_APP_FOR_INTENT": "ফাইলটো খুলিবলৈ কোনো App উপলব্ধ নহয়",
-  "NO_ASSESSMENT": "কোনো মূল্যাংকন উপলব্ধ নহয়",
   "NO_BATCHES_AVAILABLE": "কোনো গোট উপলব্ধ নহয়",
   "NO_BOOKS_AVAILABLE": "ব’ৰ্ডত/ পৰিষদত কিতাপ সংযোজন কৰি আছে",
-  "NO_BOOKS_DEFINITION": "আপোনাৰ ব’ৰ্ডত এতিয়াও অধিক কিতাপ সংযোজন কৰিবলৈ আছে। অধিক কিতাপ আৰু {{%s}} ত থকা কনটেন্ট চাবলৈ এই বাটনটোত টিপক",
+  "NO_BOOKS_DEFINITION": "আপোনাৰ ব’ৰ্ডত এতিয়াও অধিক কিতাপ সংযোজন কৰিবলৈ আছে। {{%s}} ত থকা বিষয়বস্তুৰ কাৰণে অনুৰোধ কৰিবলৈ,  <b>অধিক কিতাপ আৰু বিষয়বস্তু চাওক </b> বাটনটোত টিপক",
+  "NO_BOOKS_TEXT": "{{%s}}ত আপোনাৰ বিষয়ৰ পাঠ্যপুথি পোৱা নাই?",
   "NO_CONTENTS": "{{%s}} নাই",
   "NO_CONTENTS_FOUND": "বিষয়বস্তু বিচাৰি উলিয়াব পৰা নাই",
   "NO_CONTENTS_MESSAGE": "অন্য ধৰণৰ বিষয়বস্তু বাছি লওঁক",
+  "NO_CONTENT_AVAILABLE_IN_MODULE": "এই অধ্যায়টোত কোনো বিষয়বস্তু উপলব্ধ হৈ থকা নাই",
+  "NO_COURSES": "পাঠ্যক্ৰমসমূহ নাই",
   "NO_DATA_FOUND": "কোনো ডাটা পোৱা নগ’ল",
-  "NO_DESCRIPTION": "ব্যাখ্যা উপলব্ধ নহয়",
   "NO_DOWNLOADS": "এতিয়ালৈকে কোনো ডাউনল'ড নাই",
-  "NO_DOWNLOADS_INFO": "প্ৰশিক্ষণ নতুবা লাইব্ৰেৰী ৰ পৰা বিষয়বস্তু ডাউনল'ড কৰক",
+  "NO_DOWNLOADS_INFO": "পাঠ্যক্ৰম নতুবা লাইব্ৰেৰী ৰ পৰা বিষয়বস্তু ডাউনল'ড কৰক",
   "NO_FILTERS_SELECTED": "কোনো Filters বাছি লোৱা নাই",
-  "NO_GROUPS_CREATED_YET": "এতিয়ালৈকে কোনো দল গঠন হোৱা নাই",
-  "NO_GROUP_MESSAGE": "দলসমূহে ব্যৱহাৰকাৰীক ভালদৰে সংগঠিত হোৱাত সহায় কৰে।  সামগ্ৰিকভাৱে অধিক অগ্ৰগতি নিৰীক্ষণ কৰিবলৈ আপুনিও দল ব্যৱহাৰ কৰিব পাৰে",
   "NO_INTERNET": "ইণ্টাৰনেটৰ প্ৰৱেশাধিকাৰ নাই",
   "NO_INTERNET_TITLE": "আপুনি অফলাইন হৈ আছে",
-  "NO_PREVIEW": "Preview  উপলব্ধ নহয়",
-  "NO_QR_CODE": "মোৰ QR ক’ড নাই",
+  "NO_PREVIEW": "পূৰ্বদৰ্শন  উপলব্ধ নহয়",
+  "NO_QR_CODE": "মোৰ এটা QR ক’ড নাই",
   "NO_QR_CODE_QSTN": "QR ক’ড নাই নেকি?",
   "NO_RATING": "এতিয়ালৈকে Rating কৰা হোৱা নাই",
-  "NO_USERS": "কোনো ব্যৱহাৰকাৰী নাই",
-  "NO_USERS_CREATED_YET": "এতিয়ালৈকে কোনো ব্যৱহাৰকাৰী সৃষ্টি কৰা হোৱা নাই",
-  "NO_USERS_CREATED_YET_MSG": "আপুনি আপোনাৰ শিক্ষাৰ্থী বা অন্য শিক্ষকৰ বাবে Guest User একাউণ্ট বনাব পাৰে",
-  "NO_USERS_IN_THIS_GROUP": "এই দলত কোনো ব্যৱহাৰকাৰী নাই",
-  "NO_USERS_ON_THIS_DEVICE": "এই ডিভাইচটোত কোনো ব্যৱহাৰকাৰী নাই",
-  "NO_USERS_SUGGESTION_MESSAGE": "এটা গোটত অতি কমেও এজন ব্যৱহাৰকাৰী থাকিবই লাগিব",
+  "NUMBER_OF_COURSES": "{{%s}} পাঠ্যক্ৰমসমূহ",
+  "NUMBER_OF_COURSE_1": "({{%s}}) পাঠ্যক্ৰম",
   "NUMBER_OF_VOTES": "ভোটৰ সংখ্যা",
   "OFF": "বন্ধ",
   "OFFLINE_DOWNLOAD_MESSAGE": "ইণ্টাৰনেট সংযোগ হোৱাৰ লগে লগেই স্বয়ংক্ৰিয়ভাৱে ডাউনল'ড পুনৰ আৰম্ভ হ'ব",
@@ -385,25 +784,26 @@
   "OFFLINE_WARNING_ETBUI": "বিষয়বস্তু চাবৰ বাবে ইণ্টাৰনেট সংযোগ কৰক",
   "OFFLINE_WARNING_ETBUI_1": "বিষয়বস্তু চাবৰ বাবে ইণ্টাৰনেট সংযোগ কৰক",
   "OKAY": "অ'কে",
+  "ONGOING": "চলি থকা ",
+  "ONLY_DIGIT_NUMBER_IS_ALLOWED": "কেৱল ১১টা অংকৰ সংখ্যাৰহে অনুমতি দিয়া হৈছে",
   "ONLY_DOWNLOADED_CONTENT_CAN_BE_PLAYED_OFFLINE": "কেৱল ডাউনল’ড কৰি ৰখা বিষয়বস্তুহে অফলাইন হৈ থাকোতে দেখুৱাব পৰা যায়",
   "OPEN": "খোলক",
   "OPEN_SETTINGS": "Settings খোলক",
   "OPTIONAL": "ঐচ্ছিক",
   "OR": "অথবা",
-  "ORIGINAL_AUTHOR": "মূল বিষয়বস্তুৰ প্ৰস্তুতকৰ্তা",
+  "ORIGINAL_AUTHOR": "মূল বিষয়বস্তুৰ লেখক",
   "ORIGINAL_CONTENT": "বিষয়বস্তু",
   "ORIGINAL_CONTENT_DATA": "এই বিষয়বস্তু আহৰণ কৰা হৈছে :",
   "OTHER_ROLE_DESC_1": "ডিজিটেল বিষয়বস্তু  ব্ৰাউজ কৰক",
-  "OTHER_ROLE_DESC_2": "অনলাইন প্ৰশিক্ষণ লওঁক",
-  "OTHER_USERS": "অন্য ব্যৱহাৰকাৰীসকল",
+  "OTHER_ROLE_DESC_2": "অনলাইন পাঠ্যক্ৰম লওঁক",
   "OTP_FAILED": "OTP ৰ বৈধতা নিশ্চিতকৰণ বিফল হ’ল। পাছত পুনৰ চেষ্টা কৰক।",
   "OTP_PLACEHOLDER": "OTP দিয়ক",
   "OTP_RESENT": "OTP টো পুনৰ পঠিওৱা হ'ল",
   "OVERLAY_INFO_TEXT_COMMON": "সকলো  সুবিধাৰ প্ৰৱেশাধিকাৰ পাবলৈ  Sign in  কৰক",
-  "OVERLAY_INFO_TEXT_TAKE_COURSE": "প্ৰশিক্ষণ পঞ্জীকৃত ব্যৱহাৰকাৰীসকলৰ বাবে। প্ৰশিক্ষণত  প্ৰৱেশাধিকাৰ পাবলৈ Sign in কৰক।",
+  "OVERLAY_INFO_TEXT_TAKE_COURSE": "পাঠ্যক্ৰমটো পঞ্জীকৃত ব্যৱহাৰকাৰীসকলৰ বাবে। পাঠ্যক্ৰমটোত  প্ৰৱেশাধিকাৰ পাবলৈ লগ ইন কৰক।",
   "OVERLAY_LABEL_COMMON": "{{%s}}ৰ অসীমিত ব্যৱহাৰ লাভ কৰক।",
   "OVERLAY_LABEL_HOME": "আপোনাৰ ব্যক্তিগত ধৰণৰ Home Tab",
-  "OVERLAY_LABEL_TAKE_COURSE": "এই প্ৰশিক্ষণসমূহত অন্তৰ্ভুক্ত হ’বৰ বাবে Sign in কৰক",
+  "OVERLAY_LABEL_TAKE_COURSE": "এই পাঠ্যক্ৰমটোত যোগদান কৰিবলৈ লগ ইন কৰক",
   "OVERLAY_SIGN_IN": "লগ ইন (LOG IN)",
   "OVER_WIFI": "Wifi ৰ যোগেদি",
   "PEOPLE_WHO_FOLLOW_YOU": "অনুসৰণকাৰী",
@@ -416,34 +816,42 @@
   "PERMISSION_SETTING_MSG": "অনুমতি দিবলৈ Settings খোলক",
   "PHONE": "ফ'ন",
   "PHONE_EDIT_SUCCESS": "ম'বাইল নম্বৰ সফলভাৱে  আপডেট কৰা হ'ল",
-  "PHONE_PLACEHOLDER": "ম'বাইল নম্বৰ ",
+  "PHONE_PLACEHOLDER": "মোবাইল নম্বৰ",
   "PHONE_UPDATE_SUCCESS": "ম'বাইল নম্বৰ সফলভাৱে আপডেট কৰা হ'ল",
+  "PLANNED_MAINTENANCE_TEXT": "মেৰামতি চলি থকাৰ বাবে বৰ্তমান আমাৰ সেৱা ব্যাহত হৈ আছে। কিন্তু চিন্তা নকৰিব, আমি সোনকালেই উভতি আহিম",
+  "PLANNED_MAINTENANCE_TEXT_WITH_TIME": "মেৰামতি কার্য চলি থকাৰ বাবে বৰ্তমান আমাৰ কাম ব্যাহত হৈ আছে। কিন্তু চিন্তা নকৰিব, আমি উভতি আহিম",
   "PLAY": "প্লে’ (Play) কৰক",
   "PLAY_AS": "এনেধৰনে অংশগ্ৰহণ কৰক",
   "PLAY_FROM_DEVICE": "ডিভাইচৰ পৰা প্লে’ (Play) কৰক",
   "PLAY_ONLINE": "অনলাইন প্লে’ (Play) কৰক",
   "PLEASE_DOWNLOAD_TO_PLAY": "প্লে' (Play) কৰিবলৈ বিষয়বস্তু ডাউনল’ড কৰক ",
+  "PLEASE_ENTER": "প্ৰৱেশ কৰক{{%s}}",
+  "PLEASE_PROVIDE_FOLLOWING_DETAILS": "অনুগ্ৰহ কৰি নিম্নোক্ত সবিশেষ দিয়ক",
   "PLEASE_SELECT": "{{%s}} বাছি লওক",
   "PLEASE_SELECT_A_LANGUAGE": "ভাষা এটা বাছি লওঁক",
-  "PLEASE_SELECT_USER": "এগৰাকী ব্যৱহাৰকাৰী বাছি লওঁক",
-  "POPULAR_COURSES": "জনপ্ৰিয় প্ৰশিক্ষণসমূহ",
+  "PLEASE_VALIDATE_YOUR_EMAIL_ADDRESS": "আপোনাৰ ইমেইল ঠিকনাৰ বৈধতা নিশ্চিত কৰক",
+  "PLEASE_VALIDATE_YOUR_MOBILE_NUMBER": "আপোনাৰ মোবাইল নম্বৰৰ বৈধতা নিশ্চিত কৰক",
+  "POPULAR_COURSES": "জনপ্ৰিয় পাঠ্যক্ৰমসমুহ",
+  "POWER_OF_GROUPS": "আপুনি এতিয়ালৈকে গোটৰ ক্ষমতাৰ সম্ভাৱনা আৱিষ্কাৰ কৰিব পাৰিলেনে?",
+  "PREFERENCES_CAN_BE_UPDATED": "অগ্ৰাধিকাৰসমূহ এই ব্যৱহাৰকাৰী গৰাকীৰ প্ৰ’ফাইল  পৃষ্ঠাৰ পৰা আপডেট কৰিব পৰা যাব।",
   "PREVIEWS": "পূৰ্বলোকন",
   "PREVIOUS_USER_SETTINGS": "পুৰণি ব্যৱহাৰকাৰী Settings ৰ সৈতে আগবাঢ়িবনে?",
-  "PRINT": "প্ৰিণ্ট কৰক",
-  "PRIVATE": "ব্যক্তিগত",
+  "PRINT": "মুদ্ৰণ কৰক",
+  "PRIVACY_POLICY": "গোপনীয়তা নীতি",
   "PROFILE_BNAV": "প্ৰ’ফাইল",
   "PROFILE_DETAILS_TITLE": "প্ৰ’ফাইল উপলদ্ধ নহয়",
-  "PROFILE_UPDATE_FAILED": "প্ৰ’ফাইল আপডেট সফল হোৱা নাই, কিছুসময়ৰ পাছত পুনৰ চেষ্টা কৰক",
+  "PROFILE_UPDATE_FAILED": "প্ৰ’ফাইল উন্নীত কৰাটো সফল হোৱা নাই, কিছুসময়ৰ পাছত পুনৰ চেষ্টা কৰক",
   "PROFILE_UPDATE_SUCCESS": "প্ৰ’ফাইল সফলভাৱে আপডেট হ'ল",
+  "PROGRAMS_DESC": "আপোনাৰ  অৱস্থানৰ বাবে আৰু আপোনাৰ ভূমিকাৰ বাবে ডিজাইন কৰা সক্ৰিয় শৈক্ষিক কাৰ্যক্ৰম চাওক আৰু অংশগ্ৰহণ কৰক",
+  "PROGRESS_CANNOT_BE_TRACKED": "<span>টোকা :</span> {{collectionType}}ৰ ক্ষেত্ৰত অগ্ৰগতি নিৰ্ণয় কৰিব নোৱাৰি",
   "PROVIDE_BELOW_INFO": "তথ্যসমূহ তলত দিয়ক",
   "PUBLIC": "ৰাজহুৱা",
   "PUBLISHED_BY": "ৰদ্ৱাৰা {{%s}}ত প্ৰকাশিত",
   "PUBLISHED_DATE": "প্ৰকাশৰ দিনাংক",
+  "PUBLISHER": "প্ৰকাশক",
   "QR_CODE_DETAILS": "বিষয়বস্তুত তাৎক্ষণিক প্ৰৱেশাধিকাৰ পাবৰ বাবে আপোনাৰ  পাঠ্যপুথিত থকা QR ক'ড স্কেন কৰক",
   "QR_SHOWING_MULTIPLE_BOOK_RESULT": "ৰ বাবে {{%s}} ফলাফল দেখুওৱা হৈছে",
-  "QUESTION": "প্ৰশ্ন",
-  "QUESTIONS": "প্ৰশ্নসমূহ",
-  "QUESTION_MARKS": "প্ৰশ্ন ( নম্বৰসমূহ)",
+  "QUES_BANKS": "প্ৰশ্ন ভাণ্ডাৰ",
   "QUIZ": "কুইজ",
   "QUIZ_CONTENTS_ONLY_REGISTERED_USERS": "এই কুইজ কেৱল পঞ্জীভুক্ত ব্যৱহাৰকাৰীৰ বাবেহে",
   "RATE": "মূল্যায়ন (Rate)",
@@ -452,69 +860,84 @@
   "RATING_QUESTION": "আপুনি আমাক অলপ বেছিকৈ জনাবলৈ বিচাৰেনে?",
   "READ_LESS": "কমকৈ পঢ়ক",
   "READ_MORE": "অধিক  জানিবলৈ",
-  "RECENTLY_VIEWED": "শেহতীয়াকৈ চোৱা হৈছিল",
+  "RECOMMENDATION_BASED_ON_PROFILE": "আপোনাৰ প্ৰ’ফাইলৰ সবিশেষৰ ভিত্তিত দিয়া অনুমোদন",
   "RECOMMENDED": "অনুমোদিত",
   "RECOVERY_ACCOUNT_UPDATE_SUCCESS": "ৰিক’ভাৰী একাউন্ট সফলভাৱে আপডেট হ’ল",
   "RECOVERY_ID_DESCRIPTION": "যদি আপুনি প্ৰৱেশত বাধা পায়, তেতিয়া ৰিক’ভাৰী একাউন্টে আপোনাক পুনৰ প্ৰৱেশাধিকাৰ লাভ কৰাত সহায় কৰে। আপোনাৰ ৰিক’ভাৰী একাউন্ট বাছি  লওঁক আৰু সবিশেষ দিয়ক।",
   "REDO": "পুনৰ কৰক",
   "REDO_ASSESSMENT": "মূল্যায়ন পুনৰ কৰক",
   "REGISTER_TO_COMPLETE_ACCESS": " বিষয়বস্তুত সম্পূর্ণ প্ৰৱেশাধিকাৰৰ বাবে পঞ্জীয়নভুক্ত হওঁক",
-  "REMOVE": "ডিলিট ",
+  "REMOVE": "বিলোপ কৰক",
+  "REMOVE_ACTIVITY": "আঁতৰাওক",
+  "REMOVE_ACTIVITY_ERROR_MSG": "কাৰ্য্যটো আঁতৰাব পৰা নহল। পাছত পুনৰ চেষ্টা কৰক",
+  "REMOVE_ACTIVITY_GROUP_DESC": "কাৰ্যকলাপটো অপসাৰণ কৰিলে তাক গোটৰ কাৰ্যকলাপৰ পৰা আঁতৰ কৰা হয় আৰু আপুনি এই কাৰ্যকলাপটোত সদস্যসকলৰ অগ্ৰগতি পৰীক্ষা কৰিব নোৱাৰিব",
+  "REMOVE_ACTIVITY_POPUP_TITLE": "কাৰ্য্য আঁতৰাব নেকি?",
+  "REMOVE_ACTIVITY_SUCCESS_MSG": "গোটটোৰ পৰা কাৰ্য সফলতাৰে আঁতৰোৱা হ’ল",
   "REMOVE_FROM_DEVICE": "ডিভাইচৰ পৰা বিষয়বস্তু আঁতৰাই দিয়ক",
   "REMOVE_FROM_DEVICE_MSG": "আপুনি নিশ্চিতনে যে, আপুনি ডিভাইচটোৰ পৰা এই বিষয়বস্তু আঁতৰাব খুজিছে ? ",
-  "REMOVE_MULTIPLE_USERS_FROM_GROUP": "{{%s}} ব্যৱহাৰকাৰীসকলক আঁতৰাই দিয়াটো নিশ্চিত কৰক",
-  "REMOVE_USERS": "ব্যৱহাৰকাৰীক আঁতৰাওক",
-  "REMOVE_USERS_FROM_GROUP": "{{%s}} ব্যৱহাৰকাৰীক গ্ৰূপৰ পৰা আঁতৰাওক",
-  "REPORTS": "ৰিপ’ৰ্টসমূহ",
+  "REMOVE_MEMBER": "সদস্যক আঁতৰাওক",
+  "REMOVE_MEMBER_ERROR_MSG": "গোটটোৰ পৰা সদস্য আঁতৰাব পৰা নাই। পাছত পুনৰ চেষ্টা কৰক",
+  "REMOVE_MEMBER_GROUP_DESC": "{{member_name}} আঁতৰি অহাটোৱে তেওঁক/তাইক স্থায়ীভাৱে গোটটোৰ পৰা আঁতৰায়",
+  "REMOVE_MEMBER_POPUP_TITLE": "সদস্য আঁতৰাব নেকি?",
+  "REMOVE_MEMBER_SUCCESS_MSG": "{{member_name}} এতিয়া গোটটোৰ অংশ হিচাপে নাই",
+  "REQUEST_CONTENT": "আমাক ইয়াত জানিবলৈ দিয়ক",
   "RESEND_OTP": "অ'টিপিটো পুনৰ পঠিয়াওক",
+  "RESET": "পুনৰ সজ্জিত কৰক",
   "RESOURCE_TYPE": "সমলৰ প্ৰকাৰ",
-  "RESULT": "ফলাফল",
+  "RESPONSE_ACKNOWLEGED": "আপোনাৰ সঁহাৰিৰ বাবে আপোনাক ধন্যবাদ !",
   "RESULTS": "ফলাফলসমূহ",
   "RESUME": "পুনৰ আৰম্ভ কৰক",
   "RETRY": "পুনৰ চেষ্টা কৰক",
   "RETRY_ACTION": "পুনৰ চেষ্টা কৰক",
-  "ROLE_SELECTOR_QUERY": "আপুনি এগৰাকী",
+  "ROLE_SELECTOR_QUERY": "এই হিচাপে বিষয়বস্তু আৱিষ্কাৰ কৰক",
   "SAVE": "সংৰক্ষণ ",
   "SAVED_ON": "সংৰক্ষিত",
-  "SAVED_RESOURCES": "সংৰক্ষিত সমলসমূহ ",
   "SAVE_FILE_ON_DEVICE": "ডিভাইচটোত ফাইল সংৰক্ষণ কৰক",
   "SCAN_QR_CODE": "QR ক'ডটো স্কেন কৰক",
   "SCAN_QR_INSTRUCTION": "QR ক'ডটো স্কেন কৰিবলৈ আপোনাৰ ফ'নটো QR ক'ডটোৰ ফালে পোনাই লওঁক",
   "SCAN_TAP": "QR  কড স্কেন  কৰক",
-  "SCORE": "স্ক’ৰ",
-  "SCORED": "Score পালে",
+  "SCHOOL_OR_ORG_NAME": "বিদ্যালয় / সংগঠনৰ নাম",
+  "SCHOOL_UDISE_ID_OR_ORG_ID": "বিদ্যালয়ৰ UDEISE ID/ সংস্থাৰ ID",
   "SD_CARD": "SD কাৰ্ড",
+  "SEARCH_FOR_GROUP_MEMBER": "গোটৰ সদস্যৰ সন্ধান কৰক",
   "SEARCH_HINT": "অনুসন্ধান কৰক",
-  "SEARCH_PLACEHOLDER": "বিষয়বস্তু বিচাৰিবৰ বাবে Text এটা লিখক। যেনে 'Story'",
+  "SEARCH_PLACEHOLDER": "বিষয়বস্তু বিচাৰিবৰ বাবে টেক্সট্ এটা লিখক। যেনে ‘ষ্ট’ৰী’",
   "SEARCH_TO_FIND_CONTENT": "কনটেন্ট বিচাৰিবলৈ {{%s}} অনুসন্ধান কৰক ",
+  "SECONDS_AGO": "{{%s}} ছেকেণ্ডৰ আগতে",
+  "SECOND_AGO": "{{%s}} ছেকেণ্ডৰ আগতে",
   "SEE_ALL_RESULTS_FOR": "\"{{%s}}\" ৰ কাৰণে সকলো ফলাফল চাওক",
+  "SEE_MORE_BOOKS": "অধিক কিতাপ আৰু বিষয়বস্তু চাওক",
+  "SEE_MORE_CONTENT": "অধিক বিষয়বস্তু চাওক",
   "SELECT": "বাছি লওঁক",
   "SELECTED_TOPICS": "বাছি লোৱা বিষয়সমূহ",
-  "SELECT_ALL": "সকলো বাছি লওঁক",
-  "SELECT_CHAPTER": "অধ্যায়টো বাছি লওঁক",
+  "SELECT_ACTIVITY": "কাৰ্য্য বাছি লওক",
+  "SELECT_ALL": "সকলো বাছি লওক",
+  "SELECT_CHAPTER": "অধ্যায় বাছনি কৰক",
   "SELECT_YOUR_STATE": "আপোনাৰ ৰাজ্য বাছনি কৰক",
+  "SELF_DECLARED_INFO": "স্ব ঘোষিত তথ্য",
+  "SELF_DECLARE_TEACHER_TNC": "মই এই অনুসৰি {{%appName}}ৰ প্ৰশাসকৰ সৈতে এই সবিশেষ ভাগবতৰা কৰিবলৈ সন্মত হৈছোঁ",
   "SEND_FILE": "ফাইল প্ৰেৰণ কৰক",
   "SERVER_CONNECTION_ERROR": "ছাৰ্ভাৰৰ সৈতে সংযোগত বিফল",
   "SETTINGS": "ছেটিংছ (Settings)",
-  "SHARE": "Share কৰক",
+  "SHARE": "ভাগবতৰা কৰক",
   "SHARE_APP": "{{%s}} এপটো শ্ৱেয়াৰ কৰক",
   "SHARE_APP_LINK": "{{app_name}} এপটো ইয়াৰ পৰা লাভ কৰক: {{play_store_url}}",
   "SHARE_CONTENT_FAILED": "বিষয়বস্তু Share কৰিব পৰা নাই",
   "SHARE_CONTENT_FILE": "ফাইল ইয়াৰ পৰা পঠোৱা হৈছে: {{app_name}}\nনাম: {{content_name}}\n{{app_name}} এপটো ইয়াৰ পৰা লাভ কৰক: {{play_store_url}}",
-  "SHARE_CONTENT_LINK": "{{content_link}}ত {{app_name}}ত {{content_name}} চাওক\n{{app_name}} এপটো ইয়াৰ পৰা লাভ কৰক: {{play_store_url}}",
+  "SHARE_CONTENT_LINK": "মই {{app_name}}. {{content_link}} ত  {{content_name}} বিষয়বস্তুতো প্ৰকৃততে উপকাৰী আৰু আকৰ্ষনীয় পালো| \nএনেকুৱা আৰু অধিক আকৰ্ষনীয় বিষয়বস্তুৰ কাৰনে, {{app_name}} ম'বাইল এপপ ডাউনল'ড  কৰক",
   "SHARE_LINK": "লিংক Share  কৰক",
-  "SHARE_TELEMETRY": "Telemetry শ্ৱেয়াৰ কৰক",
+  "SHARE_TELEMETRY": "টেলিমেট্ৰী শ্ৱেয়াৰ কৰক",
   "SHARE_TELEMETRY_FAILED": "Telemetry শ্ৱেয়াৰ কৰিব পৰা নাই",
-  "SHARE_THIS": "Share কৰক",
+  "SHARE_TELEMETRY_NO_DATA_FOUND": "কোনো টেলিমেট্ৰী ডাটা পোৱা নগ’ল",
+  "SHARE_THIS": "ভাগবতৰা কৰক",
+  "SHARE_USERNAME": "নমস্কাৰ! আপুনি ‪{{user_name}}ৰ ‪{{app_name}}‬ ‬ID: ‪{{diksha_id}}‬ লাভ কৰিছে",
   "SHOW": "দেখুৱাওক",
-  "SHOWING_ITEMS": "{{%s}} আইটেম দেখুওৱা হৈছে",
+  "SHOWING_ITEMS": "{{%s}} বয়-বস্তু দেখুওৱা হৈছে",
   "SHOWING_RESULTS_FOR": "'{{%query}}' ৰ ফলাফল {{%count}} দেখুওৱা হৈছে",
   "SHOW_LESS": "কমকৈ দেখুৱাওক",
   "SHOW_MORE": "অধিক দেখুৱাওক",
-  "SHOW_RECENT": "{{%s}} ফাইলসমূহ দেখুৱাই থকা হৈছে",
-  "SIGNED_OUT_ACCOUNT_MESSAGE": "বৰ্তমানৰ  Logged in একাউণ্টৰ পৰা অপোনাক Logged out কৰি দিয়া হ’ব",
   "SIGNIN_TO_USE_FEATURE": "এই সুবিধা ব্যৱহাৰ কৰিবৰ কাৰণে Log in কৰক",
-  "SIGN_IN": "লগ ইন (Log in)",
+  "SIGN_IN": "লগ ইন কৰক",
   "SIZE": "আকাৰ  {{%s}}",
   "SKIP": "পাৰ হৈ যাওক",
   "SOMETHING_WENT_WRONG": "কাৰিকৰী সমস্যাৰ বাবে আমি অনুৰোধটো ৰক্ষা কৰিব পৰা নাই",
@@ -522,10 +945,13 @@
   "SPACE_AVAILABLE_ON_SDCARD": "SD  কাৰ্ডত থকা খালী ঠাই",
   "SPACE_TAKEN": "{{%s}}ৰদ্বাৰা লোৱা স্থান",
   "SPACE_TAKEN_BY_APP": "{{%s}} কনটেন্টৰদ্ৱাৰা ব্যৱহৃত স্থান :",
+  "SPECIAL_CHARACTERS_NOT_SUPPORTED": "এই স্থানত আপোনাক বিশেষ চিহ্ন অন্তৰ্ভুক্ত কৰিবলৈ অনুমতি দিয়া নহয়",
   "START": "আৰম্ভ ",
+  "START_AGAIN": "পুনৰ আৰম্ভ কৰক",
   "START_ASSESSMENT": "মূল্যায়ন আৰম্ভ কৰক",
   "START_COURSE": "আৰম্ভ",
   "START_COURSE_NOW": "এতিয়া আৰম্ভ কৰক",
+  "START_LEARNING": "শিক্ষণ আৰম্ভ কৰক",
   "STAR_RATINGS": "ৰেটিং (Rating)",
   "STATE": "ৰাজ্য",
   "STATE_OPTION_TEXT": "ৰাজ্য বাছি লওঁক",
@@ -537,34 +963,103 @@
   "SUBJECT": "বিষয়",
   "SUBJECTS": "বিষয়সমূহ",
   "SUBJECT_OPTION_TEXT": "বিষয়টো বাছি লওঁক",
+  "SUBMIT_MY_DETAILS": "সবিশেষ দাখিল কৰক",
+  "SUCCESSFULLY_ADDED_USER": "\"{{%s}}\" সফলতাৰে যোগ কৰা হ’ল",
+  "SUCCESSFULLY_SWITCHED_USER": "নমস্কাৰ\"{{%user}}\" ",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_PHONE": "সকলো বিষয়বস্তু ফ'ন ষ্ট’ৰেজলৈ স্থানান্তৰ হ'ব",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_SDCARD": "সকলো বিষয়বস্তু SD কাৰ্ডলৈ স্থানান্তৰ হ'ব",
   "SUPPORT": "সমৰ্থন",
   "SUPPORT_MESSAGE": "কিবা অসুবিধা পাইছে নেকি?  আমালৈ এটা বাৰ্তা পঠিয়াওক",
-  "SWITCHING_TO": "'{{%s}}' লৈ সলাই দিয়া হ'ল",
-  "SWITCH_ACCOUNT": "একাউণ্ট পৰিৱৰ্তন কৰক",
-  "SWITCH_ACCOUNT_CONFIRMATION": "একাউণ্ট পৰিৱৰ্তন?",
+  "SWITCH_TO_CLASSIC_THEME": "ক্লাছিক থীমটোলৈ যাওক",
+  "SWITCH_TO_JOYFUL_THEME": "আনন্দপূৰ্ণ থীমটোলৈ যাওক",
+  "SWITCH_USER": "ব্যৱহাৰকাৰী পৰিৱৰ্তন কৰক",
   "SYLLABUS": "পাঠ্য়সূচী (Syllabus)",
   "SYNCING_NOW": "এতিয়া Sync হৈ আছে",
   "SYNC_NOW": "এতিয়া Sync কৰক",
-  "TAKE_ASSESSMENT": "এগৰাকী ব্যৱহাৰকাৰীক অতি কমেও এটা মূল্যায়নৰ প্ৰয়োজন",
   "TAP_SCAN": " {{%s}} QR ক'ড স্কেন কৰিবলৈ টিপক",
+  "TBK_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "আৰম্ভ কৰিবলৈ এখন পাঠ্যপুথি বাছি লওক",
+  "TBK_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "পাঠ্যপুথি",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "পাঠ্যপুথিসমূহ",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "পাঠ্যপুথিসমূহ",
+  "TBK_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}ৰ লাইব্ৰেৰীয়ে {{%explainVideos}}, {{%quesBanks}} আৰু অন্য {{%interactiveMaterial}}ৰ সংগ্রহ ৰাখে। লাইব্ৰেৰীৰ অন্বেষণ কৰা আৰম্ভ কৰিবলৈ এখন পাঠ্যপুথিত ক্লিক কৰক! ",
+  "TBK_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) ৰ কাৰণে কোনো কিতাপ পোৱা নগ’ল",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "ব’ৰ্ডে কিতাপসমূহ সংযোজন কৰি আছে",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}}ত আপোনাৰ বিষয়ৰ পাঠ্যপুথি বিচাৰি পোৱা নাই?",
+  "TBK_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>টোকা :</span> পাঠ্যপুথিসমূহৰ অগ্ৰগতি নিৰ্ণয় কৰিব পৰা নাই",
+  "TBK_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "{{%s}}ত যেতিয়াই আপোনাৰ ৰাজ্যৰ ব’ৰ্ডে আপুনি অনুৰোধ কৰা কিতাপবিলাক আপল'ড কৰে আমি আপোনাক জাননী দিম",
+  "TBK_NONTRK_QR_CODE_DETAILS": "ডিজিটেল বিষয়বস্তুত তাৎক্ষণিক প্ৰৱেশাধিকাৰ পাবৰ বাবে আপোনাৰ  পাঠ্যপুথিৰ পৰা QR ক'ড স্কেন কৰক",
+  "TBK_NONTRK_SEE_MORE_BOOKS": "অধিক কিতাপ আৰু বিষয়বস্তু চাওক",
+  "TBK_NONTRK_STUDENT_ROLE_DESC_1": "পাঠ্যপুথি আৰু ডিজিটেল বিষয়বস্তুসমূহ ব্ৰাউজ কৰক",
+  "TBK_NONTRK_TEACHER_ROLE_DESC_1": "পাঠ্যপুথি আৰু ডিজিটেল বিষয়বস্তু ব্ৰাউজ কৰক",
+  "TBK_NONTRK_TUTORIAL_HEADING": "ভিডিঅ’, পাৰস্পৰিক ক্ৰিয়াশীল বিষয়বস্তু, ই-টেক্সটবুক আৰু বহুতো...",
+  "TBK_TRK_BATCHEND_MAIN_HEADING": "আপুনি {{%s}}ত সম্পূৰ্ণ হোৱা পাঠ্যপুথি পাঠৰ বেটছটোত যোগদান কৰিছে",
+  "TBK_TRK_BATCHEND_SUB_HEADING": "আপুনি পাঠ্যক্ৰমটোৰ শিক্ষণ অব্যাহত ৰাখিব পাৰে, কিন্তু আপোনাৰ অগ্ৰগতি আপডেট  নহ'ব",
+  "TBK_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "আপুনি এই অধ্যায়টো সমাপ্ত কৰিলে",
+  "TBK_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}}ৰ ভিতৰত পাঠ্যপুথি সম্পূৰ্ণ কৰক",
+  "TBK_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "এই পাঠ্যপুথি সক্ৰিয় হৈ থকা নাই",
+  "TBK_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "পাঠ্যপুথি",
+  "TBK_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "আপুনি এই পাঠ্যপুথি পঢ়িলে",
+  "TBK_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "এই পাঠ্যপুথিৰ বাবে বেটছসমূহ",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "কার্য্যসমূহ",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "মোৰ পাঠ্যপুথিসমূহ",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "ত বেটছটো সমাপ্ত হ’ল",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}}ত শেহতীয়াকৈ উন্নীত কৰা হৈছিল",
+  "TBK_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "যোগদান কৰক",
+  "TBK_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "শেহতীয়া পাঠ্যপুথিসমূহ",
+  "TBK_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "কার্য্যটো এৰিব খুজিছে ?",
+  "TBK_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "যোগদান কৰিবলৈ লগ ইন  কৰক",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_COURSES": "পাঠ্যপুথি নাই",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "বিষয়বস্তু ডাউনল’ড কৰক",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "পাঠ্যপুথিসমূহ ({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "পাঠ্যপুথি ({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "অনলাইন শিক্ষণ গ্ৰহণ কৰক",
+  "TBK_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "জনপ্ৰিয় পাঠ্যপুথিসমূহ",
+  "TBK_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "অনলাইন শিক্ষণ গ্ৰহণ কৰক",
+  "TBK_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "প্ৰমাণপত্ৰ অৰ্জন কৰিবলৈ {{%s}}ৰ ভিতৰত কার্য্য সম্পূর্ণ কৰক ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING": "শিক্ষণ কাৰ্য",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "উপস্থিত থকা শিক্ষণ কার্য্য (সমূহ)",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "পাঠ্যপুথিৰ সবিশেষ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "কার্য্য সমাপ্ত হ’ব",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "কার্য্য শেষ হোৱাৰ তাৰিখ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "কার্য্যৰ সবিশেষ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "এই কার্য্যটো এইসকলৰ বাবে প্ৰাসংগিক:",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "অধ্যায়",
+  "TBK_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "পাঠ্যপুথিৰ কার্য্যকলাপ বন্ধ কৰক",
+  "TBK_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "পাঠ্যপুথিৰ কার্য্যকলাপ পৰীক্ষা কৰিব বিচাৰিছে নেকি?",
+  "TBK_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "এই পাঠ্যপুথিৰ বেটছটো ‪{{batch_start_date}}ৰ পৰা উপলব্ধ হৈছে",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "প্ৰমাণপত্ৰৰ বিষয়ে আপোনাৰ পঞ্জীকৃত যোগাযোগ সবিশেষত  ৭ দিনৰ ভিতৰত আপোনাক জনোৱা হ’ব",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "টোকা:  এই পাঠ্যপুথিৰ কোনো প্ৰমাণপত্ৰ নাই",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "আপুনি এই পাঠ্যপুথি পঢ়িলে",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "টোকা: বৰ্তমান,  এই কার্য্যৰ কোনো প্ৰমাণপত্ৰ নাই। পাঠ্যক্ৰমটোৰ প্ৰস্তুতকৰ্তাই পাছত এখন প্ৰমাণপত্ৰ সংলগ্ন কৰিব পাৰে ।",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "আপুনি পাঠ্যপুথিখন পঢ়াটো বন্ধ কৰিলে",
+  "TBK_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "এই  পাঠ্যপুথিৰ কার্য্যৰ বাবে কোনো বেটছ্ উপলব্ধ নাই",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "পাঠ্যপুথিখন পঞ্জীকৃত ব্যৱহাৰকাৰীসকলৰ বাবে। পাঠ্যপুথিখনত প্ৰৱেশাধিকাৰ পাবলৈ লগ ইন কৰক",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "এই পাঠ্যপুথি পঢ়িবলৈ লগ ইন কৰক",
+  "TBK_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "এই কার্য্যৰ বাবে কোনো বেটছ্ উপলব্ধ নাই",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "কেৱল পঞ্জীয়নভুক্ত ব্যৱহাৰকাৰীসকলেহে শিক্ষণ কার্য্যত ভাগ ল’ব পাৰিব",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "আপুনি এই কাৰ্য সফলতাৰে সম্পূর্ণ কৰিলে",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "কার্য্যটো সমাপ্ত হ’ল। আপুনি পুনঃ মূল্যায়নটো কৰিব পাৰে, কিন্তু আপোনাৰ অগ্ৰগতি নথিভুক্ত কৰা নহ’ব।",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "কার্য্যটো সমাপ্ত হ’ল। আপুনি মূল্যায়নটো কৰিব পাৰে, কিন্তু আপোনাৰ অগ্ৰগতি নথিভুক্ত কৰা নহ’ব।",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "পাঠ্যপুথিৰ সবিশেষ চাবলৈ আৰু প্ৰৱেশাধিকাৰ লাভ কৰিবলৈ আপুনি এটা সক্ৰিয়  বেটছত যোগদান কৰিব লাগিব",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "পাঠ্যপুথিৰ সবিশেষৰ প্ৰৱেশযোগ্যতা লাভ কৰিবলৈ আপুনি লগ ইন কৰিব লাগিব",
   "TEACHER_ID_ENTER_LABEL": "সত্যাসত্য নিৰূপণৰ বাবে আপোনাৰ শিক্ষক হিচাপে থকা ID টো দিয়ক",
   "TEACHER_ID_PLACEHOLDER": "উদাহৰণস্বৰূপে, ER12345",
   "TEACHER_ID_VERIFICATION": "শিক্ষকৰ ID ৰ সত্যাসত্য নিৰূপণ",
   "TEACHER_PROFILE_FAILED": "শিক্ষকৰ প্ৰ’ফাইলটোৰ সত্যাসত্য নিৰূপণ কৰিব পৰা হোৱা নাই যিহেতু শিক্ষক ID টো ভুলকৈ দিয়া হৈছে",
   "TEACHER_PROFILE_VERIFIED": "শিক্ষকৰ প্ৰ’ফাইলৰ সফলতাৰে সত্যাসত্য নিৰূপণ কৰা হ’ল",
   "TEACHER_ROLE_DESC_1": "পাঠ্যপুথি আৰু ডিজিটেল বিষয়বস্তুসমূহ ব্ৰাউজ কৰক",
-  "TEACHER_ROLE_DESC_2": "অনলাইন প্রশিক্ষণ লওক",
+  "TEACHER_ROLE_DESC_2": "অনলাইন পাঠ্যক্ৰম লওক",
   "TEACHER_ROLE_DESC_3": "পাঠ পৰিকল্পনাসমূহ বাছনি কৰক",
   "TELL_US_MORE": "আমাক অলপ বেছিকৈ জনাওক...",
   "TERMS_OF_USE": "ব্যৱহাৰৰ চৰ্তাৱলী",
   "TEXTBOOK": "পাঠ্যপুথিসমূহ",
+  "TEXTBOOKS": "পাঠ্যপুথিসমূহ",
+  "THANKING_NOTE": "{{%s}}ত যেতিয়াই আপোনাৰ ৰাজ্যৰ বৰ্ডে আপুনি অনুৰোধ কৰা কিতাপবিলাক আপল'ড কৰে আমি আপোনাক জাননী দিম",
   "THANK_FOR_RATING": "বিষয়বস্তুৰ মান নিৰ্ধাৰণ  কৰাৰ বাবে ধন্যবাদ",
-  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "এই পাঠ্যক্ৰমৰ বাবে কোনো গোট উপলবদ্ধ নাই",
+  "THANK_YOU_FOR_SUBMITTING_YOUR_DETAILS": "আপোনাৰ সবিশেষ দাখিল কৰাৰ বাবে আপোনাক ধন্যবাদ",
+  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "এই পাঠ্যক্ৰমৰ বাবে কোনো বেটছ্ উপলব্ধ নাই",
   "THIS_IS_A_RESTRICTED_COMMUNITY": "এইটো এটা নিয়ন্ত্ৰিত পৰিসৰ",
   "TICKET_SUMMARY": "টিকটৰ সাৰাংশ",
-  "TIME": "সময়",
   "TIME_OUT": "ছাৰ্ভাৰৰ সময় উকলি গ'ল। কিছুসময়ৰ পাছত পুনৰ চেষ্টা কৰক",
   "TITLE": "শিৰোনাম",
   "TITLE_UPGRADE_POPUP": "আমি এই বিষয়বস্তুৰ অন্তৰ্গত হেৰোৱা ইমেজ আৰু অ’ডিঅ’ৰ ক্ষেত্ৰত হোৱা সমস্যা সংশোধন কৰিলোঁ। উত্তম অভিজ্ঞতাৰ বাবে, আমি আপোনাক DIKSHA ৰ শেহতীয়া সংস্কৰণটো উন্নীত কৰাৰ পৰামৰ্শ দিওঁ।",
@@ -573,21 +1068,20 @@
   "TOPICS": "বিষয়সমূহ",
   "TOPIC_YOU_MIGHT_LIKE": "ৰুচি থকা বিষয়সমূহৰ সন্ধান কৰক",
   "TOTAL_SIZE": "মুঠ পৰিসৰ (Size)",
-  "TOTAL_TIME": "মুঠ সময়",
   "TO_DO": "কৰিবলগীয়া",
-  "TO_EARN_CERTIFICATE": "এখন প্ৰমানপত্ৰ আৰ্জন কৰিবৰ কাৰনে প্রশিক্ষণ সম্পূর্ণ কৰক ",
-  "TRAINING": "প্ৰশিক্ষণ",
-  "TRAININGS_ATTENDED": "অংশগ্ৰহণ কৰা প্ৰশিক্ষণ (সমূহ)",
-  "TRAININGS_ONLY_REGISTERED_USERS": "প্ৰশিক্ষনবিলাক মাত্ৰ  পঞ্জীয়নভুক্ত ব্যৱহাৰকাৰী সকলৰ কাৰনে",
-  "TRAINING_COMPLETED_SUCCESSFULLY": "আপুনি এই প্রশিক্ষণ সফলতাৰে সম্পূর্ণ কৰিলে",
-  "TRAINING_DETAILS": "প্রশিক্ষণৰ সবিশেষ",
-  "TRAINING_ENDED_REDO_ASSESSMENT": "প্ৰশিক্ষণটো সমাপ্ত হ’ল। আপুনি মূল্যায়নটো পুনৰ কৰিব পাৰে, কিন্তু আপোনাৰ অগ্ৰগতি নথিভুক্ত কৰা নহ’ব।",
-  "TRAINING_ENDED_START_ASSESSMENT": "প্ৰশিক্ষণটোৰ অন্ত পৰিল। আপুনি মূল্যায়নটোত ভাগ ল'ব পাৰে, কিন্তু আপোনাৰ অগ্ৰগতি নথিভুক্ত কৰা নহ’ব।",
-  "TRAINING_ENDS_ON": "প্রশিক্ষণ সমাপ্ত হব",
-  "TRAINING_END_DATE": "প্রশিক্ষণৰ শেষদিন",
-  "TRAINING_INFO": "প্রশিক্ষণৰ তথ্য",
-  "TRAINING_IS_RELEVANT_TO_TEACHERS": "প্রশিক্ষণটো শিক্ষকসকলৰ বাবে প্ৰাসংগিক",
-  "TRAINING_MODULES": "প্রশিক্ষণৰ মডিয়ুলসমূহ",
+  "TO_EARN_CERTIFICATE": "এখন প্ৰমানপত্ৰ আৰ্জন কৰিবৰ কাৰনে পাঠ্যক্ৰম সম্পূর্ণ কৰক ",
+  "TRAINING": "পাঠ্যক্ৰম",
+  "TRAININGS_ATTENDED": "উপস্থিত থকা পাঠ্যক্ৰম (সমূহ)",
+  "TRAININGS_ONLY_REGISTERED_USERS": "পাঠ্যক্ৰমবিলাক মাত্ৰ  পঞ্জীয়নভুক্ত ব্যৱহাৰকাৰী সকলৰ কাৰনে",
+  "TRAINING_COMPLETED_SUCCESSFULLY": "আপুনি এই পাঠ্যক্ৰম সফলতাৰে সম্পূর্ণ কৰিলে",
+  "TRAINING_DETAILS": "পাঠ্যক্ৰমৰ সবিশেষ",
+  "TRAINING_ENDED_REDO_ASSESSMENT": "পাঠ্যক্ৰমটো সমাপ্ত হ’ল। আপুনি মূল্যায়নটো পুনৰ কৰিব পাৰে, কিন্তু আপোনাৰ অগ্ৰগতি নথিভুক্ত কৰা নহ’ব।",
+  "TRAINING_ENDED_START_ASSESSMENT": "পাঠ্যক্ৰমটো সমাপ্ত হ’ল। আপুনি মূল্যায়নটোত ভাগ ল'ব পাৰে, কিন্তু আপোনাৰ অগ্ৰগতি নথিভুক্ত কৰা নহ’ব।",
+  "TRAINING_ENDS_ON": "পাঠ্যক্ৰম সমাপ্ত হ’ব",
+  "TRAINING_END_DATE": "পাঠ্যক্ৰম শেষ হোৱাৰ দিন",
+  "TRAINING_INFO": "পাঠ্যক্ৰমৰ সবিশেষ",
+  "TRAINING_IS_RELEVANT_TO_TEACHERS": "এই পাঠ্যক্ৰমটো এইসকলৰ বাবে প্ৰাসংগিক:",
+  "TRAINING_MODULES": "পাঠ্যক্ৰমৰ অধ্যায়সমূহ",
   "TRANSFERRING_CONTENT_TO_PHONE": "বিষয়বস্তু ফ'নলৈ স্থানান্তৰ কৰি থকা হৈছে",
   "TRANSFERRING_CONTENT_TO_SDCARD": "বিষয়বস্তু  SD কাৰ্ডলৈ স্থানান্তৰ কৰি থকা হৈছে",
   "TRANSFERRING_FILES": "ফাইল স্থানান্তৰ হৈ আছে",
@@ -597,69 +1091,134 @@
   "TRY_AGAIN": "পুনৰ চেষ্টা কৰক",
   "TRY_BEFORE_RATING": "অনুগ্ৰহ কৰি মূল্যায়ন কৰাৰ আগতে বিষয়বস্তু চাই লওঁক",
   "TRY_DIFF_QR": "বেলেগ এটা QR ক'ডেৰে চেষ্টা কৰি চাবনে?",
+  "TUTORIAL_BUTTON": "আৰম্ভ কৰিবলৈ এখন পাঠ্যপুথি বাছি লওক",
+  "TUTORIAL_HEADING": "ভিডিঅ’, পাৰস্পৰিক ক্ৰিয়াশীল বিষয়বস্তু, ই-টেক্সটবুক আৰু বহুতো...",
+  "TVC_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "আৰম্ভ কৰিবলৈ এটা টিভি শ্ৰেণী বাছি লওক",
+  "TVC_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "টিভি শ্ৰেণীসমূহ",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "টিভি শ্ৰেণীসমূহ",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "টিভি শ্ৰেণীসমূহ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}ৰ লাইব্ৰেৰীয়ে {{%explainVideos}}, {{%quesBanks}} আৰু অন্য {{%interactiveMaterial}}ৰ সংগ্রহ ৰাখে। লাইব্ৰেৰীৰ অন্বেষণ কৰা আৰম্ভ কৰিবলৈ এটা টিভি শ্ৰেণীত ক্লিক কৰক ! ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) ৰ কাৰণে কোনো টিভি শ্ৰেণী পোৱা নগ’ল",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "ব’ৰ্ডে টিভি শ্ৰেণীসমূহ সংযোজন কৰি আছে",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}}ত টিভি শ্ৰেণী বিচাৰি পোৱা নাই নেকি?",
+  "TVC_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>টোকা :</span> টিভি শ্ৰেণীৰ বাবে অগ্ৰগতি নিৰ্ণয় কৰিব পৰা নাই",
+  "TVC_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "আপোনাৰ ৰাজ্যৰ বৰ্ডে আপুনি  {{%s}}ত অনুৰোধ কৰা টিভি শ্ৰেণী আপল’ড কৰিলে আমি আপোনাক জাননী দিম",
+  "TVC_NONTRK_QR_CODE_DETAILS": "আপোনাৰ  টিভি শ্ৰেণীৰ পৰা QR ক'ড স্কেন কৰি ডিজিটেল বিষয়বস্তুত তাৎক্ষণিক প্ৰৱেশাধিকাৰ লাভ কৰক",
+  "TVC_NONTRK_SEE_MORE_BOOKS": "অধিক টিভি শ্ৰেণী আৰু বিষয়বস্তু চাওক",
+  "TVC_NONTRK_STUDENT_ROLE_DESC_1": "টিভি শ্ৰেণীসমূহ আৰু ডিজিটেল বিষয়বস্তু ব্ৰাউজ কৰক",
+  "TVC_NONTRK_TEACHER_ROLE_DESC_1": "টিভি শ্ৰেণীসমূহ আৰু ডিজিটেল বিষয়বস্তু ব্ৰাউজ কৰক",
+  "TVC_NONTRK_TUTORIAL_HEADING": "ভিডিঅ’, পাৰস্পৰিক ক্ৰিয়াশীল বিষয়বস্তু, ই-টেক্সটবুক আৰু বহুতো...",
+  "TVC_TRK_BATCHEND_MAIN_HEADING": "আপুনি এটা টিভি শ্ৰেণীৰ বেটছত যোগদান কৰিলে যিটো {{%s}}ত সম্পূৰ্ণ হ’ল",
+  "TVC_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "আপুনি এই কার্য্যসূচী সমাপ্ত কৰিলে",
+  "TVC_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "টিভি শ্ৰেণীসমূহ",
+  "TVC_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "আপুনি এই টিভি শ্ৰেণীসমূহ চালে",
+  "TVC_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "টিভি শ্ৰেণীৰ বাবে বেটছসমূহ",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "কার্য্যসমূহ",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "মোৰ টিভি শ্ৰেণীসমূহ",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "ত বেটছটো সমাপ্ত হ’ল",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}}ত শেহতীয়াকৈ উন্নীত কৰা হৈছিল",
+  "TVC_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "শেহতীয়া টিভি শ্ৰেণীসমূহ",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "টিভি শ্ৰেণীসমূহ ({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "টিভি শ্ৰেণীসমূহ ({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "জনপ্ৰিয়  টিভি শ্ৰেণীসমূহ",
+  "TVC_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "প্ৰমাণপত্ৰ অৰ্জন কৰিবলৈ {{%s}}ৰ ভিতৰত  কার্য্য সম্পূর্ণ কৰক ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING": "শিক্ষণ কাৰ্য",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "উপস্থিত থকা শিক্ষণ কার্য্য (সমূহ)",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "টিভি শ্ৰেণীৰ সবিশেষ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "কার্য্য সমাপ্ত হ’ব",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "কার্য্য শেষ হোৱাৰ তাৰিখ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "কার্য্যৰ সবিশেষ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "এই কার্য্যটো এইসকলৰ বাবে প্ৰাসংগিক:",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "টিভিৰ কার্য্যসূচী",
+  "TVC_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "টিভি শ্ৰেণী চোৱাটো বন্ধ কৰক",
+  "TVC_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "টিভি শ্ৰেণীসমূহৰ শিক্ষণ পৰীক্ষা কৰিব বিচাৰিছে নেকি?",
+  "TVC_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "এই টিভি শ্ৰেণীৰ বেটছটো ‪{{batch_start_date}}ৰ পৰা উপলব্ধ হৈছে",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "আপোনাৰ পঞ্জীকৃত যোগাযোগ সবিশেষত প্ৰমাণপত্ৰৰ বিষয়ে ৭ দিনৰ ভিতৰত আপোনাক জনোৱা হ’ব",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "টোকা:  এই কার্য্যৰ কোনো প্ৰমাণপত্ৰ নাই",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "আপুনি এই টিভি শ্ৰেণীসমূহ চালে",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "টোকা: বৰ্তমান,  এই কার্য্যৰ কোনো প্ৰমাণপত্ৰ নাই। পাঠ্যক্ৰমটোৰ প্ৰস্তুতকৰ্তাই পাছত এখন প্ৰমাণপত্ৰ সংলগ্ন কৰিব পাৰে ।",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "আপুনি টিভি শ্ৰেণী চোৱাটো বন্ধ কৰিলে",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "টিভি শ্ৰেণীসমূহ পঞ্জীয়নকৃত ব্যৱহাৰকাৰীসকলৰ বাবে। টিভি শ্ৰেণীসমূহৰ প্ৰৱেশাধিকাৰ পাবলৈ লগ ইন কৰক",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "এই টিভি শ্ৰেণীসমূহ চাবলৈ লগ ইন কৰক",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "কেৱল পঞ্জীয়নভুক্ত ব্যৱহাৰকাৰীসকলেহে শিক্ষণ কার্য্যত ভাগ ল’ব পাৰিব",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "আপুনি এই কার্য্যটো সফলতাৰে সম্পূর্ণ কৰিলে",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "কার্য্যটো সমাপ্ত হ’ল। আপুনি পুনঃ মূল্যায়নটো কৰিব পাৰে, কিন্তু আপোনাৰ অগ্ৰগতি নথিভুক্ত কৰা নহ’ব।",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "কার্য্যটো সমাপ্ত হ’ল। আপুনি মূল্যায়নটো কৰিব পাৰে, কিন্তু আপোনাৰ অগ্ৰগতি নথিভুক্ত কৰা নহ’ব।",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "টিভি শ্ৰেণীসমূহ চাবলৈ আৰু প্ৰৱেশাধিকাৰ লাভ কৰিবলৈ আপুনি এটা সক্ৰিয়  বেটছত যোগদান কৰিব লাগিব",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "টিভি শ্ৰেণীৰ সবিশেষৰ প্ৰৱেশযোগ্যতা লাভ কৰিবলৈ আপুনি লগ ইন কৰিব লাগিব",
   "UNABLE_TO_FETCH_CONTENT": "ম্যাদ উকলি যোৱা  বিষয়বস্তু  অনুসন্ধান কৰাত অসফল হৈছে",
   "UNENROLL_CONFIRMATION_MESSAGE": "আপুনি পাছত এটা সক্ৰিয় বা আগন্তুক গোটত  পুণৰ যোগদান কৰিব পাৰে",
-  "UNENROLL_FROM_COURSE": "প্রশিক্ষণ এৰি দিয়ক",
+  "UNENROLL_FROM_COURSE": "পাঠ্যক্ৰম ত্যাগ কৰক",
   "UNIT_COMING_SOON": "শীঘ্ৰেই আহি আছে !",
   "UNKNOWN_QR": "আপুনি হয়তো এক অচল QR ক’ড স্কেন কৰিছে",
   "UNSELECT_ALL": "সকলো আনচিলেক্ট কৰক",
   "UPDATE": "আপডেট কৰক",
   "UPDATE_APP_BTN_ACTION_NO": "পাছত আপডেট কৰিব",
   "UPDATE_APP_BTN_ACTION_YES": "এতিয়া আপডেট কৰক",
-  "UPDATE_APP_SUPPORT_TITLE": "আপুনি {{app_name}} এপৰ এটা পুৰণি সংস্কৰণ ব্যৱহাৰ কৰি আছে।\nএই কনটেণ্ট ব্যৱহাৰ কৰিবলৈ আপোনাৰ এপটো  শেহতীয়া সংস্কৰণলৈ আপডেট কৰক।",
+  "UPDATE_APP_SUPPORT_TITLE": "আপুনি {{app_name}} এপৰ এটা পুৰণি সংস্কৰণ ব্যৱহাৰ কৰি আছে।\nএই কনটেণ্ট ব্যৱহাৰ কৰিবলৈ আপোনাৰ এপটো  শেহতীয়া সংস্কৰণলৈ উন্নীত কৰক।",
   "UPDATE_APP_TITLE": "App টোৰ নতুন সংস্কৰণ  উপলব্ধ হৈছে !",
   "UPDATE_CONFIRMATION_TEXT": "বিষয়বস্তু আপডেট কৰিবনে?",
   "UPDATE_CONTENT": "কনটেন্ট আপডেট কৰক ({{%s}})",
+  "UPDATE_DETAILS": "সবিশেষ আপডেট কৰক",
   "UPDATE_RECOVERY_ID": "ৰিক’ভাৰী ID আপডেট কৰক",
   "UPDATE_REQUIRED": "আপডেটৰ প্ৰয়োজন",
+  "UPDATE_YOUR_PREFERENCE_FROM_PROFILE": "আপুনি আপোনাৰ {{app_name}} প্ৰ’ফাইলৰ সৱিশেষ প্ৰ’ফাইল ছেটিংৰ পৰা উন্নীত কৰিব পাৰে।",
   "UPDATING": "আপডেট হৈ আছে ",
   "UPDATING_CONTENT": "আপডেট হৈ আছে... {{%s}} %",
-  "USER": "ব্য়ৱহাৰকাৰী",
   "USERNAME": "ব্যৱহাৰকাৰীৰ নাম: {{%s}}",
-  "USERS": "ব্যৱহাৰকাৰীসকল",
-  "USERS_AND_GROUPS": "ব্যৱহাৰকাৰী আৰু দলসমূহ (Groups)",
   "USER_CREATED_SUCCESSFULLY": "ব্যৱহাৰকাৰী সফলভাৱে সৃষ্টি কৰা হ'ল",
-  "USER_DELETE_CONFIRM": "'{{%s}}' ডিলিট কৰাটো নিশ্চিত কৰিছেনে?",
-  "USER_DELETE_CONFIRM_MESSAGE": "এই কাৰ্য অপৰিবৰ্তনীয়। এবাৰ ডিলিট কৰিলে ব্যৱহাৰকাৰীৰ তথ্য উপলব্ধ নহ’ব ",
-  "USER_DELETE_CONFIRM_MESSAGE_FROM_GROUP": "'{{%s}}' অপসাৰণ কৰাটো নিশ্চিত কৰিছেনে?",
-  "USER_DELETE_CONFIRM_SECOND_MESSAGE": "এই কাৰ্যই  ব্যৱহাৰকাৰীসকলক দলৰপৰা আঁতৰাব পাৰে। ব্যৱহাৰকাৰীৰ সবিশেষ Users  Tab তেই উপলব্ধ",
   "USER_ID": "ব্যৱহাৰকাৰীৰ ID",
-  "USER_IS_NOT_VERIFIED": "ব্যৱহাৰকাৰীৰ সত্যাসত্য নিৰূপণ  কৰা হোৱা নাই",
+  "USER_IS_NOT_VERIFIED": "আপোনাৰ ব্যৱহাৰকাৰী IDটোৰ সত্যাসত্য নিৰূপণ  কৰা হোৱা নাই",
   "USER_NAME": "ব্যৱহাৰকাৰীৰ নাম",
   "USER_TYPE": "ব্যৱহাৰকাৰীৰ প্ৰকাৰ",
   "USER_TYPE_1": "শিক্ষক",
   "USER_TYPE_2": "শিক্ষাৰ্থী",
   "USER_TYPE_3": "অন্য",
+  "USER_TYPE_5": "পিতৃ-মাতৃ",
   "USER_TYPE_SELECT_WARNING": "ব্যৱহাৰকাৰীৰ প্ৰকাৰ বাছি লওঁক",
   "USER_VERIFICATION": "ব্যৱহাৰকাৰীৰ সত্যাসত্য নিৰূপণ",
+  "USE_APP_AS": "{{%s}} এনেদৰে ব্যৱহাৰ কৰিব",
+  "VALIDATION_MAXIMUM_LENGTH": "সৰ্বাধিক দৈর্ঘ্য ১১টা সংখ্যা হ’ব লাগিব",
+  "VALIDATION_MINIMUM_LENGTH": "ন্যূনতম দৈর্ঘ্য ১১টা সংখ্যাৰ হ’ব লাগিব",
+  "VERIFY": "সত্যতা নিৰ্ণয় কৰক",
   "VERIFY_EMAIL_OTP_DESCRIPTION": "আপোনাৰ ইমেইল IDৰ সত্যতা নিৰ্ণয়ৰ বাবে OTP ৰ  সৈতে আপুনি এটা ইমেইল পাব",
   "VERIFY_EMAIL_OTP_TITLE": "ইমেইল IDৰ সত্যতা নিৰ্ণয় কৰক",
   "VERIFY_PHONE_OTP_DESCRIPTION": "ম'বাইল নম্বৰৰ সত্যতা নিৰ্ণয়ৰ বাবে আপুনি OTP ৰে সৈতে এটা SMS পাব",
   "VERIFY_PHONE_OTP_TITLE": "ম’বাইল নম্বৰৰ সত্যতা নিৰ্ণয় কৰক",
   "VERSION": "সংস্কৰণ",
-  "VIDEOS": "ভিডিঅ'",
+  "VERYFYING_PLEASE_WAIT": "সত্যতা নিৰ্ণয় কৰি থকা হৈছে",
+  "VIDEO": "ভিডিঅ'",
   "VIEW": "দৰ্শন কৰক",
+  "VIEW_ACTIVITY": "কাৰ্যকলাপ পৰীক্ষণ কৰক",
   "VIEW_ALL": "সকলো দেখুৱাওক",
   "VIEW_ALL_BATCHES": "আগুৱাই যাবলৈ এটা গোট বাছি লওঁক",
   "VIEW_CREDITS_INFO": "অনুজ্ঞাপত্ৰ সম্পৰ্কীয় তথ্যসমূহ দৰ্শন কৰক",
   "VIEW_DOWNLOADS_ONLY_MSG": "কেৱল ডাউনল'ডসমূহ দেখুৱাওক",
   "VIEW_MORE": "অধিক চাওক",
-  "VIEW_ONGOING_BATCHES": "চলি থকা গোটসমূহ",
+  "VIEW_ONGOING_BATCHES": "চলি থকা বেট্ছসমূহ",
+  "VIEW_OPEN_BATCHES": "বেট্ছসমূহ খোলক",
   "VIEW_RETIRED_BATCHES": "ম্যাদ উকলি যোৱা গোটসমূহ",
   "VIEW_UPCOMING_BATCHES": "আহিবলগীয়া গোটসমূহ",
   "WAITING_TO_DOWNLOAD": "ডাউনল'ড হ'বৰ বাবে ৰৈ আছে...",
   "WAIT_REQUEST": "বিষয়বস্তু আনি থকা হৈছে...",
-  "WANT_TO_CHECK_FREE_TRAININGS": "বিনামূলীয়া প্ৰশিক্ষণ বিচাৰিব খোজে নেকি?",
+  "WANT_TO_CHECK_FREE_TRAININGS": "পাঠ্যক্ৰমসমূহ পৰীক্ষা কৰিব বিচাৰিছে নেকি ?",
   "WARNING_PLEASE_MAKE_SOME_CHANGES": "সালসলনি কৰক",
   "WEBVIEW_UPDATE_TEXT": "ফলপ্ৰসূ অভিজ্ঞতাৰ বাবে, গুগল প্লে’ ষ্ট’ৰৰ পৰা Webview ৰ শেহতীয়া সংস্কৰণটো ডাউনল’ড কৰক।",
+  "WEEKS_AGO": "{{%s}} সপ্তাহৰ আগতে",
+  "WEEK_AGO": "{{%s}} সপ্তাহৰ আগতে",
+  "WELCOME": "স্বাগতম",
   "WELCOME_BACK": "আদৰণি {{%s}}",
+  "WHAT_IS_MEMBER_ID": "{{app_name}} IDটো মই ক’ত চাব পাৰিম?",
+  "YEARS_AGO": "{{%s}} বছৰৰ আগতে",
+  "YEAR_AGO": "{{%s}} বছৰৰ আগতে",
   "YES": "হয়",
+  "YOUR_ID_FROM_STATE_BOARD_ORG": "ৰাজ্য / ব’ৰ্ড / সংগঠনৰ পৰা আপোনাৰ ID",
   "YOUR_LOCATION": "আপোনাৰ অৱস্থান",
   "YOUR_LOCATION_DETAILS": "আপোনাৰ অৱস্থানৰ সবিশেষে আপোনাক প্ৰাসংগিক বিষয়বস্তু যোগান ধৰাত সহায় কৰে। আপোনাৰ অৱস্থান শুদ্ধ হৈ আছেনে নাই পৰীক্ষা কৰক, নহ’লে আপোনাৰ অৱস্থান পুনৰ বাছনি কৰি আৰু ছাবমিট কৰক।",
   "YOUR_PROGRESS": "আপোনাৰ অগ্ৰগতি : {{%s}}%",
   "YOUR_PROGRESS_LABEL": "আপোনাৰ অগ্ৰগতি",
   "YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET": "আপুনি ইণ্টাৰনেটৰ সৈতে সংযুক্ত হৈ থকা নাই",
-  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "প্রশিক্ষণৰ প্ৰৱেশাধিকাৰ আৰু সবিশেষ চাবৰ কাৰনে এটা সক্ৰিয়  গোটত যোগ দিয়ক",
-  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "প্রশিক্ষণৰ সবিশেষত প্ৰৱেশ কৰাৰ কাৰনে লগ ইন বাধ্য়তামুলক",
+  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "পাঠ্যক্ৰমৰ প্ৰৱেশাধিকাৰ আৰু সবিশেষ চাবৰ কাৰনে এটা সক্ৰিয়  গোটত যোগ দিয়ক",
+  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "পাঠ্যক্ৰমৰ সবিশেষত প্ৰৱেশ কৰাৰ কাৰনে লগ ইন বাধ্য়তামুলক",
   "YOU_MUST_LOGIN_TO_ACCESS_QUIZ_CONTENT": "এই বিষয়বস্তুত প্ৰৱেশাধিকাৰ পাবৰ বাবে আপুনি লগ ইন কৰিব লাগিব"
 }
\ No newline at end of file
diff --git a/src/assets/i18n/bn.json b/src/assets/i18n/bn.json
index 080b6b566..d500cd662 100644
--- a/src/assets/i18n/bn.json
+++ b/src/assets/i18n/bn.json
@@ -8,22 +8,46 @@
   "ACCOUNT_MERGE_FAILED": "অ্যাকাউন্ট একত্রিত করতে ব্যর্থ",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_CONTENT": "অ্যাকাউন্ট মার্জ এর সূচনা করা হয়েছে। এটি সম্পূর্ণ হলে আপনাকে জানানো হবে।",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_HEADING": "একাউন্ট একীভূত করুন ",
-  "ACCURACY": "সঠিকতা",
   "ACTIVE": "সক্রিয়",
   "ACTIVE_DOWNLOADS": "সক্রিয় ডাউনলোড",
-  "ADD": "যোগ\n",
+  "ACTIVITIES": "ক্রিয়াকলাপ",
+  "ACTIVITIESE_SEARCH_PLACEHOLDER": "গোষ্ঠীর ক্রিয়াকলাপ অনুসন্ধান করুন",
+  "ACTIVITY_ALREADY_ADDED_IN_GROUP": "আপনি গ্রুপটির জন্য এই ক্রিয়াকলাপটি আগে যুক্ত করেছেন।",
+  "ACTIVITY_COLLECTION_TITLE": "সংগ্রহ",
+  "ACTIVITY_COURSE_TITLE": "পাঠ্যধারাগুলি",
+  "ACTIVITY_EXPLANATION_CONTENT_TITLE": "বিষয়বস্তুর ব্যাখ্যা",
+  "ACTIVITY_PRACTICE_QUESTION_SET_TITLE": "অনুশীলনের প্রশ্নসেট",
+  "ACTIVITY_PRACTICE_RESOURCE_TITLE": "অনুশীলনের সংস্থান",
+  "ACTIVITY_RESOURCE_TITLE": " সংস্থান",
+  "ACTIVITY_TEXTBOOK_TITLE": "পাঠ্যপুস্তক",
+  "ACTIVITY_TV_EPISODE_TITLE": "টিভি পর্ব",
+  "ADD": "যোগ",
+  "ADD_ACTIVITY": "ক্রিয়াকলাপ যুক্ত করুন",
+  "ADD_ACTIVITY_ERROR_MSG": "ক্রিয়াকলাপ যোগ করতে পারেনি। পরে আবার চেষ্টা করুন",
+  "ADD_ACTIVITY_SUCCESS_MSG": "ক্রিয়াকলাপ সফলভাবে যুক্ত হয়েছে",
+  "ADD_ANOTHER_USER": "অন্য একজন ব্যবহারকারী যুক্ত করুন",
   "ADD_DISTRICT": "  জেলা যোগ করুন",
+  "ADD_EDIT_SELF_DECLARED_TEACHER_INFO": "অগ্রগতি বৈধকরণ এবং অনুসরণ করার জন্য এই বিবরণগুলি আপনার ঘোষিত রাজ্যে উপলব্ধ করা যেতে পারে",
   "ADD_EMAIL": "ইমেল আইডি যোগ করুন",
+  "ADD_MEMBER": "সদস্য যোগ করুন",
+  "ADD_MEMBER_CONFIRMATION": "আপনার এগিয়ে যাওয়ার আগে আপনাকে অবশ্যই সেই সদস্যের নাম এবং {{app_name}} আইডি মিলছে কিনা তা পরীক্ষা করে দেখতে হবে",
+  "ADD_MEMBER_POPUP_DESC": "সদস্যদের তাদের অনন্য {{%s}} আইডি সনাক্ত করতে নিম্নলিখিত নির্দেশাবলী ব্যবহার করুন",
+  "ADD_MEMBER_POPUP_STEP_1": "<span> পদক্ষেপ 1 </span>: প্রোফাইল ট্যাবে ক্লিক করুন",
+  "ADD_MEMBER_POPUP_STEP_2": "<span> ধাপ 2 </span>: আপনার {{%s}} ID শেয়ার করার জন্য শেয়ার আইকনে ক্লিক করুন",
+  "ADD_MEMBER_POPUP_TITLE": "আমি কোথায় {{%s}} আইডি দেখতে পারি ?",
   "ADD_PHONE": "ফোন নম্বর যোগ করুন",
   "ADD_RECOVERY_ACCOUNT": "রিকভারি একাউন্ট যোগ করুন ",
-  "ADD_RECOVERY_ID": "রিকভারি একাউন্ট যোগ করুন ",
+  "ADD_RECOVERY_ID": "রিকভারি একাউন্ট যোগ করুন ।",
   "ADD_STATE": "রাজ্য যোগ করুন",
+  "ADD_TO_GROUP": "গ্রুপে যোগ করুন",
+  "ADD_TO_GROUP_ACTIVITY": "গোষ্ঠী জন্য যুক্ত করুন",
+  "ADD_USER": "ব্যবহারকারী যুক্ত করুন",
   "ADD_USERS": "ব্যবহারকারী যুক্ত করুন",
-  "ADD_USERS_TO_GROUP": " ব্যবহারকারী দলে যুক্ত  {{%s}}  করুন\n ",
+  "AGREE_TO_SHARE_PROFILE_DETAILS": "আমি আমার প্রোফাইলের বিশদ বিবরণ  কোর্স প্রশাসকের সাথে শেয়ার করতে সম্মত এই শর্ত অনুসারে",
   "ALL": "সব",
   "ALLOW": "অনুমতি দিন",
   "ALL_ANNOUNCEMENTS": "সব ঘোষণা গুলি",
-  "ALREADY_ENROLLED_COURSE": "ব্যবহারকারী ইতিমধ্যেই এই প্রশিক্ষণটিতে যোগদান করেছেন",
+  "ALREADY_ENROLLED_COURSE": "আপনি ইতিমধ্যেই এই প্রশিক্ষণটিতে যোগদান করেছেন ।",
   "ALWAYS_ON": "সবসময় চালু\n",
   "ANDROID_NOT_SUPPORTED": "অ্যান্ড্রয়েড সংস্করণ সমর্থিত নয়",
   "ANDROID_NOT_SUPPORTED_DESC": "আপনার ফোনটি তে  বিষয়বস্তুটি খোলা যাবে না কারন আপনার ফোনটি অ্যান্ড্রয়েড এর  পুরানো সংস্করণে চলছে।  আপনার ডিভাইস মডেলের উপর ভিত্তি করে আপনি বিষয়বস্তুটি দেখতে পারবেন  যদি আপনি ক্রসওয়াক ইন্সটল করে থাকেন। ",
@@ -31,18 +55,21 @@
   "ANSWER": "উত্তর",
   "APPLY": "প্রযোজ্য",
   "APPLY_FILTER": "ফিল্টার প্রয়োগ করুন",
+  "APP_ID": "{{%s}} আইডি",
   "APP_QR_CODE": "আপনি কি একটি {{%s}} QR কোড দেখতে  পাচ্ছেন?",
   "APP_RATING_RATE_EXPERIENCE": "আপনার অ্যাপ্লিকেশনের অভিজ্ঞতার মূল্যায়ন করুন ",
   "APP_RATING_RATE_ON_PLAYSTORE": "আপনি কি প্লে স্টোরে আপনার মূল্যায়ন জমা দিতে চান?",
   "APP_RATING_REPORT_AN_ISSUE": "আমরা আপনার একটি খারাপ অভিজ্ঞতার জন্য দুঃখিত। আপনি কি এই সমস্যাটির রিপোর্ট করতে চান?",
   "APP_RATING_TAP_ON_STARS": "প্লে স্টোরে মূল্যায়ন করতে তারকাগুলির  ওপর  ক্লিক করুন\n\n",
   "APP_RATING_THANKS_FOR_RATING": "আপনার অভিজ্ঞতার মূল্যাঙ্কন করার জন্য আপনাকে ধন্যবাদ!",
+  "APP_TITLE": "{{%s}} স্বাগতম",
   "APP_VERSION": "অ্যাপলিকেশন সংস্করণ",
+  "ARE_YOU_STATE_TEACHER": "আপনি কি  {{%s}}  এর সরকারী বিদ্যালয়ের শিক্ষক",
   "AS_FILE": "ফাইল হিসাবে",
   "AS_LINK": "লিঙ্ক হিসাবে",
   "ATTACHMENT_DOWNLOADED": "সংযুক্তি টি ডাউনলোড করা হয়ে গেছে",
   "ATTRIBUTIONS": "কৃতজ্ঞতা স্বীকার",
-  "AUDIOS": "অডিও",
+  "AUDIO": "অডিও",
   "AUTHOR": "লেখক",
   "AUTOMATIC_SYNC": "স্বয়ংক্রিয় তথ্য সুসংগত ",
   "AUTO_MIGRATION_FAIL_MESSAGE": "একাউন্ট একীভূত করা যাচ্ছে না ",
@@ -51,28 +78,24 @@
   "AVAILABLE_FILTERS": "ফিল্টার/পরিশ্রুত",
   "AVAILABLE_FOR_TEACHERS": "কেবলমাত্র শিক্ষকদের প্রাপ্য ",
   "AVATAR": "অবতার",
-  "AVERAGE_SCORE": "গড় স্কোর",
-  "AVERAGE_TIME": "গড় সময়",
   "BACK_TO_EXIT": "আপনি কি প্রস্থান করতে চান?",
-  "BATCHEND_MAIN_HEADING": "যে ব্যাচ টি তে আপনি যোগদান করেছে সেটি উহার প্রশিক্ষিন {{%s}} তারিখে শেষ করেছে ",
+  "BATCHEND_MAIN_HEADING": "যে ব্যাচ টি তে আপনি যোগদান করেছে সেটি উহার প্রশিক্ষিন {{%s}} তারিখে শেষ করেছে ।",
   "BATCHEND_SUB_HEADING": "ক্রমাগত প্রশিক্ষণ লাভ করতে পারেন, কিন্তু আপনার উন্নতি আপডেট হবে না ",
   "BATCHES_AVAILABLE": "আরও ব্যাচ প্রাপ্তব্য ",
-  "BATCHES_FOR_THIS_COURSE": " ব্যাচ গুলি এই কোর্সের জন্য",
+  "BATCHES_FOR_THIS_COURSE": " এই কোর্সের জন্য ব্যাচ গুলি",
   "BATCH_CREATED_BY": "দ্বারা সৃষ্টি",
   "BATCH_DETAILS": "ব্যাচের বিবরণ",
   "BATCH_ENROLLMENT_ENDED": "এই ব্যাচের জন্য তালিকাভুক্তি বন্ধ হয়ে গেছে",
   "BATCH_EXPIRED": "ব্যাজটির মেয়াদ শেষ",
   "BATCH_EXPIRED_BUTTON": "ঠিক আছে",
-  "BATCH_EXPIRED_DESCRIPTION": "ব্যাচের সময়কাল সমাপ্ত। আপনি কোর্স চালিয়ে যেতে পারেন। তবে আপনার অগ্রগতির কোনো উল্লেখ বা নিরীক্ষণ করা হবে না I",
   "BOARD": "পর্ষদ",
   "BOARD_OPTION_TEXT": "পর্ষদ বাছাই   করুন",
+  "BROWES_RELEVANT_CONTENT": "আপনার পছন্দ (বোর্ড, মিডিইয়াম, ক্লাস) এর উপর নির্ভর করে প্রাসঙ্গিক কনটেন্ট খোঁজার জন্য {{app_name}} এর লাইব্রেরি তে ব্রাউজ করুন।",
   "BTN_CLICK_TO_OPEN_CONTENT": "বিষয়বস্তু টি দেখতে ক্লিক করুন",
   "BTN_LATER": "পরবর্তীতে",
   "BTN_RATE_ON_PLAYSTORE": "প্লে স্টোরে আমাদের মূল্যায়ন করুন",
   "BTN_SUBMIT": "জমা দিন",
   "BTN_VISIT_HELP_SECTION": "সাহায্য বিভাগ দেখুন",
-  "BY_QUESTIONS": "প্রশ্ন দ্বারা",
-  "BY_USERS": "ব্যবহারকারীদের দ্বারা",
   "CAMERA": "ক্যামেরা",
   "CAMERA_PERMISSION_DESCRIPTION": " {{%s}} QR কোড স্ক্যান করার জন্য ক্যামেরার অ্যাক্সেস প্রয়োজন",
   "CANCEL": "বাতিল",
@@ -82,23 +105,34 @@
   "CANCEL_DOWNLOAD": "ডাউনলোড হওয়া ক্যান্সেল করুন",
   "CANCEL_DOWNLOAD_MESSAGE": "ডাউনলোড বাতিল করলে সক্রিয় ডাউনলোড থেকে বিষয়বস্তু মুছে ফেলা হবে",
   "CANCEL_DOWNLOAD_TITLE": "ডাউনলোড বাতিল?",
-  "CERTIFIED_TRAINING": "সার্টিফাইড প্রশিক্ষণ ",
+  "CERTIFICATE_ALREADY_DOWNLOADED": "শংসাপত্রটি ইতিমধ্যে ডাউনলোড হয়েছে, দয়া করে আপনার ডাউনলোড ফোল্ডারটি পরীক্ষা করুন",
+  "CERTIFICATE_DOWNLOADED": "শংসাপত্রটি ডাউনলোড করা হয়েছে",
+  "CERTIFICATE_DOWNLOAD_INFO": "শংসাপত্র ডাউনলোড হচ্ছে",
+  "CERTIFIED_TRAINING": "একটি শংসাপত্র অর্জন করুন",
   "CHANGE": "পরিবর্তন",
   "CHANGE_ROLE": "ভূমিকা পরিবর্তন করুন",
-  "CHANGE_USER": "ব্যবহারকারী পরিবর্তন করুন",
+  "CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "আপনি এই মডিউলটি শেষ করেছেন",
+  "CHARACTERS_REMAINING": "{{character_count}} অক্ষর বাকি আছে",
   "CHECK_FOR_UPDATES": "আপডেট এর জন্য অনুসন্ধান করুন",
   "CHOOSE_FROM_FOLLOWING": "নিম্নলিখিত থেকে নির্বাচন করুন",
   "CHOOSE_LANGUAGE": "আপনার পছন্দের ভাষা নির্বাচন করুন",
+  "CHOOSE_USER": "ব্যবহারকারী চয়ন করুন।",
   "CHOOSE_WHERE_TO_SAVE_DATA": " কোথায় তথ্য সংরক্ষণ করবেন তা নির্বাচন করুন",
   "CLASS": "শ্রেনী",
   "CLASSES": "শ্রেণী",
   "CLEAR": "সাফ করুন",
-  "COACH_SCREEN": "QR কোড স্ক্যানিং আপনাকে  বিষয়বস্তুতে পুনঃনির্দেশিত করবে",
+  "COACH_SCREEN": "QR কোড স্ক্যান করলে আপনাকে বিষয়বস্তু দেখানো হবে",
   "COMMUNITIES": "সম্প্রদায়",
+  "COMPLETED": "সম্পন্ন",
+  "COMPLETE_ASSESSMENT_TO_EARN_CERTIFICATE": "{{%s}} দ্বারা  মূল্যায়ন সম্পূর্ণ করুন",
+  "COMPLETE_BY": "{{%s}} দ্বারা সম্পূর্ণ করুন",
+  "COMPLETE_CHAPTER_TO_UNLOCK_ACHIEVEMENT": "একটি নতুন কৃতিত্ব আনলক করতে সম্পূর্ণ {{%s}} বিষয়বস্তু সম্পূর্ণ করুন",
   "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}}এর মধ্যে প্রশিক্ষণ শেষ করুন",
   "CONFIRM": "নিশ্চিত ",
+  "CONGRATULATIONS": "অভিনন্দন!",
   "CONNECT_TO_INTERNET_SUGGESTION": "বিষয়বস্তুটি দেখতে ইন্টারনেট সংযোগ করুন",
   "CONSIDER_DOWNLOAD": "কন্টেন্ট ডাউনলোড বিবেচনা করুন",
+  "CONTENTS": "বিষয়বস্তু",
   "CONTENT_ALREADY_EXIST": "এই ফাইলটি ইতিমধ্যেই আনয়ন করা হয়েছে। দয়া করে একটি নতুন ফাইল নির্বাচন করুন",
   "CONTENT_ALREADY_EXISTS": "বিষয়বস্তু গন্তব্য ফোল্ডারে বিদ্যমান। যাই হোক, আপনি কি বিষয়বস্তু গন্তব্য ফোল্ডারে পাঠাবেন?",
   "CONTENT_COMING_SOON": "আমরা এই জন্য বিষইয়বস্তু  তৈরি করছি",
@@ -107,12 +141,16 @@
   "CONTENT_CREATING": "আমরা এই জন্য বিষইয়বস্তু  তৈরি করছি",
   "CONTENT_DELETE": "বিষয়বস্তু মুছে ফেললে বিষয়বস্তু টি ডিভাইস থেকে  সরে যাবে।",
   "CONTENT_DELETE_FAILED": "বিষয়বস্তু  মুছে ফেলা যায়ে নি",
+  "CONTENT_DERIVED_FROM": "এই বিষয়বস্তু থেকে প্রাপ্ত",
   "CONTENT_IMPORTED": "সফলভাবে আমদানি করা হয়েছে",
   "CONTENT_IMPORTED_FAILED": "আমদানি ব্যর্থ হয়েছে",
-  "CONTENT_IS_BEEING_ADDED": "বিষয়বস্তুটি যোগ করা হচ্ছে",
+  "CONTENT_IS_BEEING_ADDED": "{{content_name}} বিষয়বস্তুটি যোগ করা হচ্ছে ",
   "CONTENT_IS_BEING_ADDED": "আপনার রাজ্য শীঘ্রই এই QR কোডের জন্য সামগ্রী যোগ করবে। এটা শীঘ্রই পাওয়া যাবে।",
   "CONTENT_NOT_AVAILABLE": "বিষয়বস্তু উপলব্ধ নেই",
   "CONTENT_PLAYER_EXIT_PERMISSION": "আপনি কি এই বিষয়বস্তুটি ত্যাগ করতে চান?",
+  "CONTENT_PREFERENCE": "বিষয়বস্তুর পছন্দ",
+  "CONTENT_PREFERENCE_SELECTION": "পছন্দমত বিষয়বস্তু নির্বাচন করুন ",
+  "CONTENT_RATING_SUB_HEADING": "বিষয়বস্তুটি রেট করতে তারগুলিতে স্পর্শ করুন ।",
   "CONTENT_RETIRED_BY_AUTHOR": "এই বিষয়বস্তুটির লেখক  বিষয়বস্তু  টি সরিয়ে ফেলেছে  তাই আর এটি এখন উপলব্ধ নেই",
   "CONTENT_SIZE": "বিষয়বস্তুর আকার",
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO": "বিষয়বস্তু সফলভাবে স্থানান্তরিত হয়েছে",
@@ -120,47 +158,193 @@
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO_SDCARD": "কন্টেন্ট সফলভাবে  SD কার্ডে স্থানান্তরিত হয়েছে",
   "CONTINUE": "অবিরত",
   "CONTINUE_AS_ROLE": "চালিয়ে যান '{{%s}}'",
-  "CONTINUE_NOW": "ক্রমাগত চলুন ",
+  "CONTINUE_LEARNING": "ক্রমাগত শিখুন",
   "CONTRIBUTIONS": "অবদান(সমূহ)",
   "CONTRIBUTORS": "অবদানকারী(গণ)",
   "COPYRIGHT": "কপিরাইট",
+  "COURSES": "কোর্সগুলি",
   "COURSES_BNAV": "পাঠ্যক্রম",
-  "COURSES_IN_PROGRESS": "কোর্স টি অগ্রগতিতে আছে",
+  "COURSES_IN_PROGRESS": "আমার কোর্স",
   "COURSE_COMPLETED_LABEL": "{{%s}}% শেষ",
+  "COURSE_COMPLETION_POPUP_DESC": "কোর্স শংসাপত্র সম্পর্কে আপনার নিবন্ধিত যোগাযোগের মাধ্যমে আপনাকে 7 দিনের মধ্যে জানানো হবে",
+  "COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "দ্রষ্টব্য: এই কোর্সে একটি শংসাপত্র নেই",
   "COURSE_ENDED": "{{%s}} প্রশিক্ষণ  শেষ হয়েছে",
+  "COURSE_ENDED_ON": " {{%s}} তারিখে কোর্সটি শেষ হয়েছে ",
   "COURSE_ENROLLED": "আপনি এই প্রশিক্ষণে যোগদান করেছেন",
+  "COURSE_LAST_UPDATED_ON": "কোর্সটি শেষ বার আপডেটেড করা হয়েছে {{last_updated_on_date}}  তারিখে ",
   "COURSE_NOT_AVAILABLE": "এই কোর্স  আর সক্রিয় নেই",
+  "COURSE_NO_CERTIFICATE_MESSAGE": "বর্তমানে, এই কোর্সে শংসাপত্র নেই।  কোর্সের পরিচালক পরে একটি শংসাপত্র সংযুক্ত করতে পারেন।",
   "COURSE_PROGRESS_COMPLETED": "সমাপ্ত: {{%s}} %",
   "COURSE_UNENROLLED": "আপনি প্রশিক্ষণটি ত্যাগ করেছেন",
-  "COURSE_WILL_BE_AVAILABLE": "কোর্স পাওয়া যাবে {{%s}}",
-  "CREATE_GROUP": "দল গঠন করুন",
-  "CREATE_NEW_GROUP": "নতুন দল তৈরি করুণ",
-  "CREATE_NEW_USER": "নতুন ব্যবহারকারী তৈরি করুন",
+  "COURSE_WILL_BE_AVAILABLE": "{{%s}} থেকে ব্যাচটি পাওয়া যাবে",
+  "CREATE_GROUP": "গ্রুপ তৈরি করুন",
+  "CREATE_GROUP_DESCRIPTION": "আপনি একটি গ্রুপ তৈরি থেকে মাত্র এক ধাপ দূরে আছেন",
+  "CREATE_GROUP_DESCRIPTION_POPUP": "লোকের সাথে সংযোগ স্থাপন, ক্রিয়াকলাপ ভাগ করে নেওয়ার, অগ্রগতি পর্যালোচনা এবং অন্যান্য সম্ভাবনাগুলি ঘুরে দেখার জন্য একটি গ্রুপ তৈরি করুন বা তার একটি অংশ হোন",
   "CREATE_USER": "ব্যবহারকারী তৈরি করুন",
   "CREATORS": "{{%s}} তারিখে সৃষ্ট দ্বারা ",
   "CREDITS": "ক্রেডিটস",
   "CREDITS_LICENCE_INFO": "ক্রেডিট এবং লাইসেন্স তথ্য ",
-  "CSV_DOWNLOAD_SUCCESS": "{{%s}}ডাউনলোড' এ সংরক্ষিত",
+  "CRS_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "শুরু করার জন্য একটি কোর্স নির্বাচন করুন",
+  "CRS_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "কোর্স",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "কোর্সগুলি",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "কোর্সগুলি",
+  "CRS_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}'s লাইব্রেরিতে একটি হোস্ট রয়েছে {{%explainVideos}}, {{%quesBanks}} এবং অন্যান্য {{%interactiveMaterial}}। লাইব্রেরি অন্বেষণ শুরু করতে একটি কোর্সে ক্লিক করুন!",
+  "CRS_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "কোনো কোর্স {{%grade}}({{%medium}}) এর জন্য খুঁজে পাওয়া যায়নি",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "বোর্ড কোর্স যুক্ত করছে",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}} এ  কোনো কোর্স খুঁজে পাওয়া যায়নি? ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span> কোর্সের জন্য অগ্রগতি ট্র্যাক করা যাবেনা",
+  "CRS_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "আপনার রাজ্যের বোর্ড যখন আপনার অনুরোধ করা কোর্সটি {{%s}} এ আপলোড করবে, তখন আমরা আপনাকে অবহিত করব",
+  "CRS_NONTRK_QR_CODE_DETAILS": "আপনার কোর্স থেকে কিউ আর কোড স্ক্যান করে ডিজিটাল বিষয়বস্তুর তৎক্ষনাত অ্যাক্সেস পান।",
+  "CRS_NONTRK_SEE_MORE_BOOKS": "আরো কোর্স ও বিষয়বস্তু দেখুন",
+  "CRS_NONTRK_STUDENT_ROLE_DESC_1": "কোর্স ও ডিজিটাল বিষয়বস্তু ব্রাউজ করুন",
+  "CRS_NONTRK_TEACHER_ROLE_DESC_1": "কোর্স ও ডিজিটাল বিষয়বস্তু ব্রাউজ করুন",
+  "CRS_NONTRK_TUTORIAL_HEADING": "ভিডিও, ইন্টারেক্টিভ বিষয়বস্তু , ই-পাঠ্যপুস্তক এবং  আরও ...",
+  "CRS_TRK_BATCHEND_MAIN_HEADING": "আপনি একটি কোর্সের ব্যাচে যোগদান করেছেন যা সমাপ্ত হয়েছে {{%s}} এ",
+  "CRS_TRK_BATCHEND_SUB_HEADING": "আপনি কোর্সটি চালিয়ে যেতে পারেন, তবে আপনার অগ্রগতি আপডেট করা হবে না",
+  "CRS_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "আপনি এই মডিউলটি শেষ করেছেন",
+  "CRS_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "কোর্সটি {{%s}} এর মধ্যে সম্পূর্ণ করুন ",
+  "CRS_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "কোর্সগুলো",
+  "CRS_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "আপনি এই কোর্সে যোগদান করেছেন",
+  "CRS_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "কোর্সের জন্য ব্যাচসমূহ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "কোর্স গুলি",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "আমার কোর্সগুলি",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "{{%s}}-এ কোর্সটি শেষ হয়েছে",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "কোর্সের শেষ আপডেট হয়েছে {{last_updated_on_date}} এ  ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_NOT_AVAILABLE": "এই কোর্সটি এখন নিষ্ক্রিয়",
+  "CRS_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "কোর্সে যোগদান করুন",
+  "CRS_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "সাম্প্রতিক কোর্সগুলি",
+  "CRS_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "কোর্স ছেড়ে দেবেন?",
+  "CRS_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "কোর্সে যোগদান করার জন্য লগ ইন করুন",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_COURSES": "কোনো কোর্স নেই",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "কোর্স বা গ্রন্থাগার থেকে বিষয়বস্তু ডাউনলোড করুন",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "({{%s}}) কোর্স গুলি",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "({{%s}}) কোর্স",
+  "CRS_TRK_FRMELEMNTS_LBL_OVERLAY_LABEL_TAKE_COURSE": "এই কোর্সে যোগদান করার জন্য লগ ইন করুন",
+  "CRS_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "জনপ্রিয় কোর্সগুলি",
+  "CRS_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "অনলাইন কোর্স গ্রহণ করুন",
+  "CRS_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "শংসাপত্র অর্জন করার জন্য {{%s}} এর মধ্যে কোর্সটি সম্পন্ন করুন ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING": "কোর্স",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "যে কোর্স(গুলি) তে অংশগ্রহণ করেছিলেন",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "কোর্সের বিবরণ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "এ কোর্সটি সমাপ্ত হয়েছে",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "কোর্স সমাপ্ত হওয়ার দিন",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "কোর্সের বিবরণ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "এই কোর্সটির জন্য প্রাসঙ্গিক:",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "কোর্সের মডিউল",
+  "CRS_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "কোর্স ছেড়ে দিন",
+  "CRS_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "কোর্সগুলি চেক করতে চান ?",
+  "CRS_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "{{batch_start_date}} থেকে এই কোর্সের ব্যাচটি উপলব্ধ হবে",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "আপনাকে ৭ দিনের মধ্যে এই কোর্সের শংসাপত্র সম্পর্কে আপনার নথিভুক্ত যোগাযোগের ঠিকানা বা ফোন নম্বরে জানানো হবে",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "দ্রষ্টব্য: এই কোর্সে একটি শংসাপত্র নেই",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "আপনি কোর্সটিতে যোগদান করেছেন",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "বর্তমানে, এই কোর্সে শংসাপত্র নেই।  কোর্সের পরিচালক পরে একটি শংসাপত্র সংযুক্ত করতে পারেন।",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "আপনি কোর্সটি ছেড়ে গেছেন",
+  "CRS_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "এই কোর্সটির জন্য কোনো ব্যাচ নেই",
+  "CRS_TRK_FRMELEMNTS_MSG_OTHER_ROLE_DESC_2": "অনলাইন কোর্স গ্রহণ করুন",
+  "CRS_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "কোর্সটি নিবন্ধিত  ইউজারদের জন্য।  কোর্স অ্যাক্সেস করতে লগ ইন করুন।",
+  "CRS_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "এই কোর্সের জন্য কোনো ব্যাচ উপলব্ধ নেই",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "কেবলমাত্র নিবন্ধিত ইউজাররা কোর্সগুলি নিতে পারবেন",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "আপনি এই কোর্সটি সফলভাবে সম্পূর্ণ করেছেন",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "কোর্সটি শেষ হয়েছে।  আপনি মূল্যায়নটি আবারও করতে পারেন তবে, আপনার অগ্রগতি রেকর্ড করা হবে না।",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "কোর্সটি শেষ হয়েছে।  আপনি মূল্যায়ন নিতে পারেন তবে, আপনার অগ্রগতি রেকর্ড করা হবে না।",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "কোর্সের বিশদ বিবরণ দেখতে এবং অ্যাক্সেস করতে আপনাকে অবশ্যই একটি সক্রিয় ব্যাচে যোগদান করতে হবে",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "কোর্সের বিশদ বিবরণ অ্যাক্সেস করতে আপনাকে অবশ্যই লগ ইন করতে হবে",
   "CURRENT_LANGUAGE": "বর্তমান ভাষা",
-  "DATA": "আরও বই এবং বিষয়বস্তু দেখুন",
   "DATA_SYNC": "তথ্য সুসংগত\n",
   "DATA_SYNC_FAILURE": "ডেটা সিঙ্ক করা যায়নি, পরে আবার চেষ্টা করুন",
-  "DATA_SYNC_SUB": "তথ্য  সংরক্ষন, টেলিমেট্রি  তথ্য স্থানান্তর \n",
+  "DATA_SYNC_NOTHING_TO_SYNC": "সিঙ্ক করার কিছু নেই ",
+  "DATA_SYNC_SUB": "তথ্য  সংরক্ষন, টেলিমেট্রি  তথ্য স্থানান্তর ",
   "DATA_SYNC_SUCCESSFUL": "Telemetry তথ্য সিঙ্ক করা সফল হয়েছে",
+  "DAYS_AGO": "{{%s}}  দিন আগে",
+  "DAY_AGO": "{{%s}} দিন আগে",
   "DELETE": "মুছে ফেলা",
   "DELETE_ALL_CONTENT_WARNING": "বিষয়বস্তু মুছে ফেললে ডিভাইস থেকে নির্বাচিত বিষয়বস্তু (গুলি) সরিয়ে দেওয়া হবে",
   "DELETE_CONTENT": "বিষয়বস্তু মুছবেন?",
+  "DELETE_CONTENT_SIZE": "1 টি আইটেম ({{content_size}})",
   "DELETE_CONTENT_WARNING": "বিষয়বস্তু মুছে ফেললে ডিভাইস থেকেও বিষয়বস্তুটি  সরিয়ে দেওয়া হবে",
-  "DELETE_GROUP": "দল টি মুছুন",
+  "DELETE_GROUP_DESC": "{{group_name}} মোছা স্থায়ীভাবে অ্যাপ্লিকেশন থেকে গ্রুপ সরিয়ে ফেলবে",
+  "DELETE_GROUP_ERROR_MSG": "গোষ্ঠীটি মোছা যায়নি। পরে আবার চেষ্টা করুন",
+  "DELETE_GROUP_POPUP_TITLE": "গ্রুপ মুছবেন?",
+  "DELETE_GROUP_SUCCESS_MSG": "গ্রুপটি সফলভাবে মোছা হয়েছে",
   "DELETE_PROGRESS": "নির্বাচিত বিষয়বস্তু মুছে ফেলা হচ্ছে",
-  "DESCRIPTION": "বর্ণনা\n",
+  "DETAIL_TUTORIAL": "{{%appName}} এর গ্রন্থাগার একটি হোস্ট করেছে {{%explainVideos}}, {{%quesBanks}} এবং অন্যান্য {{%interactiveMaterial}}।  গ্রন্থাগার অন্বেষণ করার জন্য একটি পাঠ্যপুস্তকে ক্লিক করুন ",
   "DEVICE_ID": "ডিভাইস আইডি",
+  "DEVICE_LOCATION": "যন্ত্রটির অবস্থান ।",
   "DEVICE_TAGS": "যন্ত্র এর ট্যাগ",
   "DEVICE_TAGS_SUB": "ডিভাইস ট্যাগ যোগ করুন বা মুছে ফেলুন",
+  "DFLT_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "শুরু করার জন্য একটি কাজ নির্বাচন করুন",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "কাজ",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "কাজগুলি",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "কাজগুলি",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}-এর লাইব্রেরিতে {{%explainVideos}}, {{%quesBanks}} এবং অন্যান্য {{%interactiveMaterial}}-এর একটি হোস্ট রয়েছে। লাইব্রেরিটি সম্পর্কে আরও জানতে কোনও বিষয়বস্তুর ওপর ক্লিক করুন!",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}}({{%medium}})। এর জন্য কোনও কাজ  খুঁজে পাওয়া যায়নি",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "বোর্ড বিষয়বস্তু যুক্ত করছেন",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}} এর উপরে কোনো বিষয়বস্তু খুঁজে পাওয়া যায়নি ? ",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span> অগ্রগতি ট্র্যাক করা যাবেনা",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "আপনার রাজ্যের বোর্ড যখন আপনার অনুরোধ করা বিষয়বস্তুটি {{%s}}-এ আপলোড করবে তখন আমরা আপনাকে জানাব",
+  "DFLT_NONTRK_QR_CODE_DETAILS": "একটি QR কোড স্ক্যান করে ডিজিটাল বিষয়বস্তুর ওপর  দ্রুত অ্যাক্সেস পেয়ে যান",
+  "DFLT_NONTRK_SEE_MORE_BOOKS": "আরো দেখুন",
+  "DFLT_NONTRK_STUDENT_ROLE_DESC_1": "ডিজিটাল বিষয়বস্তু ব্রাউজ করুন",
+  "DFLT_NONTRK_TEACHER_ROLE_DESC_1": "ডিজিটাল বিষয়বস্তুর জন্য ব্রাউজ করুন",
+  "DFLT_NONTRK_TUTORIAL_HEADING": "ভিডিও, ইন্টারেক্টিভ বিষয়বস্তু, ই-পাঠ্যপুস্তক এবং  আরও ...",
+  "DFLT_TRK_BATCHEND_MAIN_HEADING": "আপনি একটি শিক্ষণ কাজের ব্যাচে যোগদান করেছেন, যা সম্পূর্ণ হবে {{%s}} তে",
+  "DFLT_TRK_BATCHEND_SUB_HEADING": "আপনি শেখা চালিয়ে যেতেপারেন, তবে আপনার অগ্রগতি আপডেট করা হবে না",
+  "DFLT_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "আপনি এই শিক্ষণের কার্যকলাপ সম্পূর্ণ করেছেন",
+  "DFLT_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "শিক্ষণ সম্পূর্ণ করুন {{%s}} এর মধ্যে",
+  "DFLT_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "এই শিক্ষণের কাজ এখন নিষ্ক্রিয়",
+  "DFLT_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "শিক্ষণের কাজগুলি",
+  "DFLT_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "আপনি এই শিক্ষণের কাজে যোগ দিয়েছেন",
+  "DFLT_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "শেখার কাজের জন্য ব্যাচসমূহ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "শেখার কাজ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "আমার শিক্ষণের কাজ গুলি",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "{{%s}} তারিখে কাজটি সমাপ্ত হয়েছে ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}} এ শেষ আপডেট হয়েছে ",
+  "DFLT_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "যোগদান করুন",
+  "DFLT_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "সর্বশেষ শেখার কাজ",
+  "DFLT_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "কাজ ছেড়ে দেবেন?",
+  "DFLT_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "যোগদানের জন্য লগ ইন করুন",
+  "DFLT_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "বিষয়বস্তু ডাউনলোড করুন",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "({{%s}}) এর কাজ গুলি",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "({{%s}}) এর কাজ",
+  "DFLT_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "অনলাইন শিক্ষণ গ্রহণ করুন",
+  "DFLT_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "জনপ্রিয় কাজ গুলি",
+  "DFLT_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": " অনলাইন শিক্ষণ গ্রহণ করুন",
+  "DFLT_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "শংসাপত্র অর্জন করার জন্য {{%s}} এর মধ্যে কাজটি সম্পন্ন করুন ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING": "শিক্ষণের কাজ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "শিক্ষণের কাজ (গুলি)তে উপস্থিত ছিলেন",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "কাজ গুলির বিবরণ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "এই তারিখে কাজ সমাপ্ত হয়েছে",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "কাজ সমাপ্ত হওয়ার দিন",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "কাজ গুলির বিবরণ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "এই কাজটি এর জন্য প্রাসঙ্গিক:",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "কাজের সম্পদ",
+  "DFLT_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "কাজ ছেড়ে দিন",
+  "DFLT_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "শিক্ষণের কাজগুলি চেক করতে চান ?",
+  "DFLT_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "{{batch_start_date}} থেকে কাজের ব্যাচটি উপলব্ধ হবে",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "আপনাকে ৭ দিনের মধ্যে শংসাপত্র সম্পর্কে আপনার নিবন্ধিত যোগাযোগের ঠিকানায় অবহিত করা হবে",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "দ্রষ্টব্য: এই টাস্কটির জন্য কোনও শংসাপত্র দেওয়া হয় না",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "আপনি এই কাজে যোগ দিয়েছেন",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": " বর্তমানে, এই কাজের একটি শংসাপত্র  নেই।  কোর্সের পরিচালক পরে একটি শংসাপত্র সংযুক্ত করতে পারেন।",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "আপনি কাজটি ছেড়ে গেছেন",
+  "DFLT_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "এই শিক্ষণ কাজের জন্য কোনো ব্যাচ নেই",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "কাজটি নিবন্ধিত ইউজারদের জন্য।  কাজ অ্যাক্সেস করতে লগ ইন করুন",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "কাজটি শুরু করার জন্য লগ ইন করুন",
+  "DFLT_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "এই কাজের জন্য কোন ব্যাচ উপলব্ধ নেই",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "কেবলমাত্র নিবন্ধিত ইউজাররা শিক্ষণের কাজ গ্রহণ করতে পারবেন ",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "আপনি এই কাজটি সফলভাবে সম্পন্ন করেছেন",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "কাজটি শেষ হয়েছে।  আপনি আবার মূল্যায়ন নিতে পারেন তবে, আপনার অগ্রগতি রেকর্ড করা হবে না।",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "কাজটি  শেষ হয়েছে।  আপনি মূল্যায়ন নিতে পারেন তবে, আপনার অগ্রগতি রেকর্ড করা হবে না।",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "কাজের বিশদ বিবরণ  দেখতে এবং অ্যাক্সেস করতে আপনাকে অবশ্যই একটি সক্রিয় ব্যাচে যোগদান করতে হবে",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "কাজের বিশদ বিবরণ অ্যাক্সেস করতে আপনাকে অবশ্যই লগ ইন করতে হবে",
   "DISMISS": "বাতিল",
+  "DISMISS_AS_GROUP_ADMIN": "গ্রুপ প্রশাসক হিসাবে বরখাস্ত করুন",
+  "DISMISS_AS_GROUP_ADMIN_ERROR_MSG": "{{member_name}} কে গ্রুপ প্রশাসক হিসাবে বরখাস্ত করতে পারেনি",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_DESC": "{{member_name}} কে গ্রুপ প্রশাসক হিসাবে বরখাস্ত করা হয়েছে , সদস্যের কাছ থেকে প্রশাসকের অনুমতিগুলি সরিয়ে দিন",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_TITLE": "গ্রুপ প্রশাসক হিসাবে বরখাস্ত করবেন?",
+  "DISMISS_AS_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} আর গ্রুপ অ্যাডমিন নন",
   "DISTRICT": "রাজ্য",
   "DISTRICT_OPTION_TEXT": "জেলা নির্বাচন করুন",
-  "DOCS": "কাগজপত্র",
+  "DOC": "কাগজপত্র",
   "DOWNLOAD": "ডাউনলোড",
   "DOWNLOADING": "ডাউনলোড হচ্ছে {{%s}}%",
   "DOWNLOADING_1": "ডাউনলোড হচ্ছে {{%s}} ",
@@ -179,7 +363,9 @@
   "DOWNLOAD_CONTENT": "ডাউনলোড করুন ({{%s}})",
   "DOWNLOAD_FILE_INFO": "অক্ষম বিকল্পগুলি সক্ষম করতে ফাইলটি ডাউনলোড করুন",
   "DOWNLOAD_FILE_SIZE": "ফাইলের আকার {{%s}}",
-  "DOWNLOAD_PATH": "ফাইলটি অভ্যন্তরীণ স্টোরেজে সংরক্ষিত > ফোল্ডার ডাউনলোড করুন",
+  "DOWNLOAD_NOT_ALLOWED_FOR_QUIZ": "এই বিষয়বস্তু ডাউনলোড করা যাবে না",
+  "DOWNLOAD_NOW": "এখনই ডাউনলোড করুন",
+  "DOWNLOAD_PATH": "ফাইলটি অভ্যন্তরীণ স্টোরেজে সংরক্ষিত > ফোল্ডার ডাউনলোড",
   "EDIT": " বদলানো",
   "EDIT_EMAIL_POPUP_TITLE": "ইমেইল আই ডি সম্পাদনা করুন",
   "EDIT_GROUP": "দল সম্পাদন করুন",
@@ -192,17 +378,27 @@
   "EMAIL_UPDATE_SUCCESS": "ইমেল সফলভাবে আপডেট হয়েছে",
   "EMPTY_LIBRARY_TEXTBOOK_FILTER": "এর জন্য কোন বই পাওয়া যায়নি  {{%grade}} ({{%medium}})",
   "EMPTY_SEARCH_RESULTS": "অনুসন্ধান টির ফলাফল খুঁজে পাওয়া যায় নি",
+  "EMPTY_SEARCH_RESULT_GROUPS": "দুঃখিত! আপনার অনুসন্ধানের সাথে মেলে কোনও ফলাফল নেই",
   "ENDORSE": "অনুমোদন ",
   "ENJOYED_THIS_CONTENT": "বিষয়বস্তু টি  উপভোগ করেছেন?",
-  "ENROLL": "নথিভুক্ত ",
+  "ENROLL": "নথিভুক্ত করুন",
+  "ENROLLMENT_ENDED_ON": "এই ব্যাচে নাম নথিভুক্ত করার সুযোগ {{%s}}-এ  বন্ধ হয়ে গেছে",
   "ENROLLMENT_LAST_DATE": "নথিভুক্তির জন্য শেষ তারিখ:",
   "ENTER_GROUP_NAME": "গোষ্ঠীর নাম লিখুন",
+  "ENTER_ID": "আইডি লিখুন",
+  "ENTER_ID_AS_REQUESTED_BY_STATE_BOARD_ORG": "আপনার রাজ্য / বোর্ড / সংগঠনের অনুরোধ হিসাবে আইডি লিখুন",
+  "ENTER_LOCATION_FROM_PROFILE_PAGE": "প্রোফাইল পৃষ্ঠা থেকে অবস্থান লিখুন",
+  "ENTER_MEMBER_ID": "{{app_name}} আইডি লিখুন",
   "ENTER_OTP": "OTP লিখুন",
   "ENTER_PHONE_POPUP_TITLE": "মোবাইল নম্বর লিখুন",
+  "ENTER_SCHOOL_NAME": "স্কুলের নাম লিখুন",
+  "ENTER_THE_FOLLOWING_INFORMATION": "নিম্নলিখিত তথ্য লিখুন",
+  "ENTER_UDISE_ID": "ইউডিআইএসই আইডি প্রবেশ করান",
   "ERROR_BATCH_NOT_STARTED": "ব্যাচ টি শুরু হয়নি",
   "ERROR_CANT_OPEN_EMPTY_CONTENT": "খালি ফাইল খুলতে পারবেন না",
   "ERROR_CONTENT_NOT_AVAILABLE": " বিষইয়বস্তু অনুপলব্ধ",
   "ERROR_CONTENT_NOT_FOUND": "বিষয়বস্তু এখনো যোগ করা হয়নি",
+  "ERROR_COULD_NOT_OPEN_FILE": "ফাইল খোলা যায়নি",
   "ERROR_DURATION_NOT_AVAILABLE": "সময়কাল অনুপলব্ধ",
   "ERROR_EMAIL_EXISTS": "এই ইমেল আইডি  টি ইতিমধ্যে বিদ্যমান। দয়া করে অন্য ইমেইল আইডি প্রদান করুন।\n",
   "ERROR_EMAIL_INVALID": "একটি বৈধ ইমেইল আইডি প্রদান করুন",
@@ -210,50 +406,235 @@
   "ERROR_FAILED_TO_DOWNLOAD_ATTACHMENT": "সংযুক্তি ডাউনলোড করা গেল না।",
   "ERROR_FETCHING_DATA": "তথ্য প্রদান করতে অক্ষম",
   "ERROR_LOW_MEMORY": "স্থানান্তর জন্য উপলব্ধ যথেষ্ট স্থান নেই",
+  "ERROR_MAXIMUM_ACTIVITY_COUNT_EXCEEDS": "আপনি গোষ্ঠীর  সাথে  যুক্ত করার সর্বাধিক সংখ্যক ক্রিয়াকলাপ অতিক্রম করেছেন",
+  "ERROR_MAXIMUM_GROUP_COUNT_EXCEEDS": "আপনি তৈরি করতে  পারে এমন সর্বাধিক গোষ্ঠীর সংখ্যা অতিক্রম করে গেছেন ",
+  "ERROR_MAXIMUM_MEMBER_COUNT_EXCEEDS": "আপনি গ্রুপটিতে সবচেয়ে বেশী যত জন সদস্য যোগ করা যায় সেই সংখ্যা অতিক্রম করেছেন",
   "ERROR_NAME_INVALID": "একটি বৈধ নাম লিখুন",
   "ERROR_NO_BATCHES_FOUND": "এই কোর্সের জন্য কোন ব্যাচ নেই\n",
   "ERROR_NO_INTERNET_MESSAGE": "কোন ইন্টারনেট সংযোগ নেই",
   "ERROR_NO_OFFLINE_RESOURCE": "কোন সম্পদ সংরক্ষিত  হয়েনি",
   "ERROR_OFFLINE_MODE": "কোন ইন্টারনেট সংযোগ নেই, অফলাইন মোড",
-  "ERROR_OTP": "OTP অকার্যকর। দয়া করে সঠিক OTP লিখুন।",
+  "ERROR_OTP": "OTP টি ভুল দেওয়া হয়েছে, দয়া করে সঠিক OTP লিখুন।প্রয়াসের সংখ্যা বাকি আছে :{{%s}}",
+  "ERROR_OTP_LIMIT_EXCEEDED": "আপনি OTP এর সর্বোচ্চ সীমা অতিক্রম করেছেন, পরে আবার চেষ্টা করুন",
   "ERROR_PHONE_EXISTS": "ফোন নম্বর টি  ইতিমধ্যে বিদ্যমান, অন্য ফোন নম্বর টি লিখুন।",
   "ERROR_PHONE_INVALID": "একটি বৈধ ফোন নম্বর প্রদান করুন",
+  "ERROR_PHONE_REQUIRED": "মোবাইল  নম্বরটি প্রয়োজন",
   "ERROR_SAME_EMAIL_UPDATED": "এই ইমেইল আই ডি টি আপনার প্রোফাইলের সাথে  ইতিমধ্যে যুক্ত করা আছে।অন্য কোন ইমেইল আই ডি প্রদান করুন",
   "ERROR_SAME_PHONE_UPDATED": "এই মোবাইল নম্বরটি ইতিমধ্যে আপনার প্রোফাইলের সাথে যুক্ত। অন্য কোন মোবাইল নম্বর প্রদান করুন",
   "ERROR_SERVER_CONNECTION": "সার্ভারের সাথে সংযোগ করতে অক্ষম",
+  "ERROR_SPECIAL_CHARECTERS_NOT_ALLOWED": "বিশেষ চিহ্নগুলি ব্যবহার করা নিষিদ্ধ",
   "ERROR_TECHNICAL_PROBLEM": "আমরা একটি প্রযুক্তিগত সমস্যার কারনে আপনার  অনুরোধ প্রক্রিয়া করতে অক্ষম",
   "ERROR_UPLOADING_IMG": " ছবি আপলোড করার সময় গলদ দেখা দিচ্ছে\n",
   "ERROR_USER_ACCOUNT_BLOCKED": "ব্যবহারকারীর অ্যাকাউন্ট ব্লক করা হয়েছে। বিস্তারিত জানার জন্য আপনার প্রশাসকের সাথে যোগাযোগ করুন",
+  "ERROR_WHILE_ADDING_USER": "ব্যবহারকারী যুক্ত করার সময় ত্রুটি ।",
+  "ERROR_WHILE_FETCHING_USERS": "ব্যবহারকারীদের আনার সময় ত্রুটি",
   "ERROR_WHILE_LOGIN": "লগ ইন করার সময় ত্র্রুটি",
-  "EXTRACTING_CONTENT": "বিষয়বস্তু বের করা হচ্ছে",
+  "ERROR_WHILE_SWITCHING_USER": "ব্যবহারকারীর স্যুইচ করার সময় ত্রুটি",
+  "EXPLORE_HEADING": " {{%s}} এ  আরও অন্বেষণ করুন ",
+  "EXP_VIDEOS": "ব্যাখ্যার ভিডিও",
+  "EXTRACTING_CONTENT": " {{%s}}বিষয়বস্তু বের করা হচ্ছে",
   "FEEDBACK_HINT": "প্রতিক্রিয়া (ঐচ্ছিক)",
   "FEEDBACK_HINT_1": "এখানে একটি মন্তব্য যোগ করুন",
   "FILES_DELETED": "ফাইল মুছে ফেলা হয়েছে",
   "FILE_MANAGER": "নথি ব্যবস্থাপক",
   "FILE_MANAGER_PERMISSION_DESCRIPTION": "{{%s}} ফাইল ডাউনলোড এবং SD কার্ডগুলিতে সামগ্রী সরানোর জন্য সঞ্চয়স্থান  ব্যবহারের অধিকার প্রয়োজন",
+  "FILE_NAME": "'{{%s}}' লোড হচ্ছে ",
+  "FILE_SAVED": "ফাইলগুলি ডাউনলোডে রাখা হয়েছে",
   "FILE_SIZE": "আকার [{{%s}}]",
   "FILL_IN": "আপনার প্রোফাইল সম্পূর্ণ করতে নীচের বিবরণ প্রদান করুন",
   "FILL_THE_MANDATORY_FIELDS": "সব বাধ্যতামূলক ক্ষেত্র পূরণ করুন",
   "FILTER": "পরিশ্রুতি",
   "FILTER_ADDED": "যোগ করা হয়েছে",
-  "FILTER_BY": "পরিশ্রুত দ্বারা\n",
-  "FIRST_NAME": "নাম",
+  "FILTER_BY": "পরিশ্রুত দ্বারা",
   "FOLLOW": "অনুকরন\n",
+  "FORCE_UPDATE_MESSAGE": "আপনি {{%s}} অ্যাপ্লিকেশনটির একটি পুরানো সংস্করণ ব্যবহার করছেন I গুগল প্লে স্টোর থেকে সর্বশেষতম সংস্করণটি পেতে, এখনই আপডেট বোতামটি স্পর্শ করুন ।",
+  "FORUM": "আলোচনা করুন",
+  "FOR_SUPPORT": "{{%s}} এর সাহায্যের জন্য",
   "FREE_SPACE": "মুক্ত স্থান :",
+  "FRMELEMENTS_BTN_ACTIVATEGRP": "সক্রিয় করুন",
+  "FRMELEMENTS_BTN_ADD": "যুক্ত করুন",
+  "FRMELEMENTS_BTN_BACK": "পিছনে",
+  "FRMELEMENTS_BTN_DEACTIVATEGRP": "নিষ্ক্রিয় করুন",
+  "FRMELEMENTS_BTN_NEXT": "পরবর্তী",
+  "FRMELEMENTS_LBL_ACTIVATEGRP": "গ্রুপটি সক্রিয় করুন",
+  "FRMELEMENTS_LBL_ACTIVATEGRPQUES": "গ্রুপটি সক্রিয় করতে চান?",
+  "FRMELEMENTS_LBL_CONTENT_TYPE": "বিষয়বস্তুর ধরন",
+  "FRMELEMENTS_LBL_DEACTIVATEGRP": "গ্রুপটি নিষ্ক্রিয় করুন",
+  "FRMELEMENTS_LBL_DEACTIVATEGRPQUES": "গ্রুপটি নিষ্ক্রিয় করতে চান?",
+  "FRMELEMENTS_LBL_REMARKS": "মন্তব্য",
+  "FRMELEMENTS_MSG_ACTIVATEGRPFAILED": "গ্রুপটিকে সক্রিয় করা যায়নি, পরে আবার চেষ্টা করুন",
+  "FRMELEMENTS_MSG_ACTIVATEGRPMSG": "গ্রুপটি সক্রিয় করা হলে আপনি  গ্রুপের সদস্য ও কার্যকলাপ যুক্ত করতে পারবেন  এবং গ্রুপের সদস্যদের অগ্রগতির ওপর লক্ষ্য রাখতে পারবেন। ",
+  "FRMELEMENTS_MSG_ACTIVATEGRPPOPUP": "এই গ্রুপটি সাময়িকভাবে নিষ্ক্রিয় করা আছে। গ্রুপটির প্রশাসক গ্রুপটিকে সক্রিয় করতে পারেন",
+  "FRMELEMENTS_MSG_ACTIVATEGRPSUCCESS": "গ্রুপটি সফলভাবে সক্রিয় করা হয়েছে",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPFAILED": "গ্রুপটি নিষ্ক্রিয় করা যায়নি, পরে আবার চেষ্টা করুন",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPMSG": "গ্রুপটি নিষ্ক্রিয় করা হলে আপনি সেটিতে অ্যাক্সেস করতে পারবেন না। আপনি গ্রুপটিতে কার্যকলাপ ও সদস্যদের যোগ করতে পারবেন না। আপনি সদস্যদের অগ্রগতির ওপরেও লক্ষ্য রাখতে পারবেন না।",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPSUCCESS": "গ্রুপটিকে সফলভাবে নিষ্ক্রিয় করা হয়েছে",
+  "FRMELEMNTS_BTN_CLOSE": "বন্ধ করুন",
+  "FRMELEMNTS_BTN_DONOT_SHARE": "শেয়ার করবেন না",
+  "FRMELEMNTS_BTN_EDIT_SETTING": "সেটিংস সম্পাদনা করুন",
+  "FRMELEMNTS_BTN_PREVIEW_FORM": "ফর্মের প্রাকদর্শন করুন",
+  "FRMELEMNTS_BTN_SAVE": "সংরক্ষণ করুন",
+  "FRMELEMNTS_BTN_SAVE_EDITS": "সম্পাদনা সংরক্ষণ করুন",
+  "FRMELEMNTS_BTN_SAVE_FORM": "ফর্মটি সংরক্ষণ করুন",
+  "FRMELEMNTS_BTN_SEEK_HELP": "সাহায্য চান",
+  "FRMELEMNTS_BTN_SUBMIT_FORM": "ফর্ম জমা দিন",
+  "FRMELEMNTS_BTN_VIEW_DETAILS": "বিস্তারিত দেখুন",
+  "FRMELEMNTS_CKBX_CERTMSG": "এই বার্তাটি পুনঃরায় দেখাবেন না",
+  "FRMELEMNTS_LBL_ACCESSIBILITY": "স্ক্রীন রিডার অ্যাক্সেস",
+  "FRMELEMNTS_LBL_ACCESSIBILITYMODE": "ডার্ক মোডে স্যুইচ করুন",
+  "FRMELEMNTS_LBL_ACCESSIBILITYSKIP": "মূল বিষয়বস্তু এ যান",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXT": "সাইট ম্যাপ",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXTSIZE": "ফন্টের আকার বৃদ্ধি করুন",
+  "FRMELEMNTS_LBL_ADD_ATTACHMENTS": "সংযুক্তি যোগ করুন ",
+  "FRMELEMNTS_LBL_ADD_ENTITY": "সত্তা যোগ করুন",
+  "FRMELEMNTS_LBL_ADD_NEW_TASK": "নতুন কাজ যুক্ত করুন",
+  "FRMELEMNTS_LBL_ADD_REMARKS": "মন্তব্য যোগ করুন",
+  "FRMELEMNTS_LBL_ADD_SUBTASK": "সাবটাস্ক যুক্ত করুন",
+  "FRMELEMNTS_LBL_ADD_SUBTASK_PALCEHOLDER": "সাবটাস্কের নাম যুক্ত করুন",
+  "FRMELEMNTS_LBL_ADD_TASK": "কাজ যুক্ত করুন",
+  "FRMELEMNTS_LBL_ASSIGNED_TO": "নিযুক্ত করা হয়েছে",
+  "FRMELEMNTS_LBL_ASSIGN_TASK": "টাস্ক নির্ধারণ করুন",
+  "FRMELEMNTS_LBL_ATTACH": "সংযুক্ত করুন",
+  "FRMELEMNTS_LBL_ATTACHMENTS": "সংযুক্তিসমূহ",
+  "FRMELEMNTS_LBL_BLOCK": "ব্লক",
+  "FRMELEMNTS_LBL_CATEGORIES": "শ্রেনী",
+  "FRMELEMNTS_LBL_CATEGORY_OVERVIEW": "শ্রেনীর ওভারভিউ",
+  "FRMELEMNTS_LBL_CLICK_HELP": "সহায়তা চাই</b> বোতামটিতে ক্লিক করুন<b>",
+  "FRMELEMNTS_LBL_CLICK_HERE_TO_VIEW_LIBRARY": "লাইব্রেরী দেখতে এখানে ক্লিক করুন ",
+  "FRMELEMNTS_LBL_CLUSTER": "সমূহ ",
+  "FRMELEMNTS_LBL_CONSENT_POPUP_INFO": "আপনি আপনার প্রোফাইল পৃষ্ঠা থেকে এই বিবরণগুলি সম্পাদনা করতে পারেন ।",
+  "FRMELEMNTS_LBL_CONTENT_AVAIALABLE_IN_OTHER_BOARD": "অন্য বোর্ডগুলিতে আপনার প্রয়োজন অনুসারে আকর্ষণীয় বিষয়বস্তু থাকতে পারে!",
+  "FRMELEMNTS_LBL_CONTENT_FOUND": "আমরা আপনার প্রয়োজন অনুযায়ী বিষয়বস্তু খুঁজে পেয়েছি।",
+  "FRMELEMNTS_LBL_CONTENT_TO_BE_ADDED": "আপনার বোর্ডের এখনও আরো বিষয়বস্তু যুক্ত করা বাকি",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT": "আপনার বিষয়বস্তু খুঁজে পাচ্ছেন না?  নীচের দুটি বোতামেই ক্লিক করুন",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT_YET": "এখনও পর্যন্ত আপনার বিষয়বস্তু খুঁজে পাওয়া যায়নি।",
+  "FRMELEMNTS_LBL_CRITERIA_WISE": "শর্তাবলী",
+  "FRMELEMNTS_LBL_DATA_SETTINGS": "প্রোফাইলের তথ্য শেয়ার করা হচ্ছে।",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF": "প্রোফাইলের তথ্য শেয়ার করা বন্ধ আছে",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF_INFO": "আপনি কোর্স প্রশাসকের সাথে আপনার প্রোফাইল বিবরণ শেয়ার করতে সম্মত হননি",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON": "প্রোফাইল তথ্য শেয়ার করা চালু আছে",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON_INFO": "আপনি কোর্স প্রশাসকের সাথে আপনার প্রোফাইল বিবরণ শেয়ার করতে সম্মত হয়েছেন ",
+  "FRMELEMNTS_LBL_DELETE_CONFIRMATION": "আপনি কি নিশ্চিত যে আপনি আপনার সাবটাস্ক ডিলিট  করতে চান? ",
+  "FRMELEMNTS_LBL_DONOT_SHARE_PROFILE_INFO": "আমার প্রোফাইল বিবরণ শেয়ার করবেন না",
+  "FRMELEMNTS_LBL_DURATION": "সময়কাল",
+  "FRMELEMNTS_LBL_EMAIL_ID_PLACEHOLDER": "রাষ্ট্র বা সংস্থার ইমেল অ্যাড্রেস লিখুন",
+  "FRMELEMNTS_LBL_END_DATE": "সমাপ্তির তারিখ",
+  "FRMELEMNTS_LBL_FILES": "ফাইল",
+  "FRMELEMNTS_LBL_IMAGES": "চিত্র",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS": "প্রকল্পের  প্রতিবেদন",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS_DESC": "প্রকল্পের প্রতিবেদনগুলি দেখুন",
+  "FRMELEMNTS_LBL_IN_PROGRESS": "প্রগতিশীল",
+  "FRMELEMNTS_LBL_LEARNER_PASSBOOK": "শিক্ষার্থীর পাসবুক",
+  "FRMELEMNTS_LBL_LEARNING_RESOURCES": "শিক্ষার সম্পদ",
+  "FRMELEMNTS_LBL_LINK_LEARNING_RESOURCES": "শিখনের রিসোর্সগুলিকে লিঙ্ক করুন",
+  "FRMELEMNTS_LBL_MEDIA_TYPE": "মিডিয়ার ধরণ",
+  "FRMELEMNTS_LBL_MOBILE_NUMBER_PLACEHOLDER": "রাষ্ট্র বা সংগঠনের জন্য মোবাইল নম্বর",
+  "FRMELEMNTS_LBL_MY_LEARNINGS": "আমার শিক্ষণ গুলি",
+  "FRMELEMNTS_LBL_NEW_TASK": "নতুন কাজ",
+  "FRMELEMNTS_LBL_NO_MATCHING_CONTENT": "উল্লেখ করা বিষয়বস্তু খুঁজে পাওয়া যায়নি",
+  "FRMELEMNTS_LBL_OBJECTIVE": "উদ্দেশ্য",
+  "FRMELEMNTS_LBL_OBSERVATION": "পর্যবেক্ষণ",
+  "FRMELEMNTS_LBL_OBSERVATION_DESC": "সহজেই আপনার শ্রেণীকক্ষ এবং স্কুল পর্যবেক্ষণগুলিকে  অ্যাক্সেস এবং রেকর্ড করুন এবং আপনার উন্নতির গতি পরিকল্পনা করুন ",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS": "পর্যবেক্ষণের প্রতিবেদন ",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS_DEC": "পর্যবেক্ষণের প্রতিবনেরগুলি দেখুন",
+  "FRMELEMNTS_LBL_OBSERVE_AGAIN": "পুনঃরায় পর্যবেক্ষণ করুন",
+  "FRMELEMNTS_LBL_OPEN_BATCH_NOT_RECOMMENDED": "আপনি যদি পূর্বে কোর্সটি সম্পন্ন করে থাকেন, আমরা আপনাকে ব্যাচে যোগ দান করার জন্য সুপারিশ করি না। আপনি যদি তা করেন, আপনার শেখার ইতিহাস এবং প্রত্যয়নপত্র পুনঃবিন্যাস করা হবে। ",
+  "FRMELEMNTS_LBL_PERSONA": "ভূমিকা",
+  "FRMELEMNTS_LBL_PROFCONF": "প্রোফাইল নামটি নিশ্চিত করুন",
+  "FRMELEMNTS_LBL_PROFTITLE": "প্রোফাইলের নাম",
+  "FRMELEMNTS_LBL_PROGRAM_NAME": "প্রোগ্রামের নাম",
+  "FRMELEMNTS_LBL_PROJECT": "প্রকল্প",
+  "FRMELEMNTS_LBL_PROJECT_DESCRIPTION": "কাজ গুলি তৈরি করে এবং সময়রেখা পরিকল্পনা করে আপনার বিদ্যালয়ের উন্নতিগুলি পরিচালনা এবং ট্র্যাক করুন",
+  "FRMELEMNTS_LBL_PROJECT_OVERVIEW": "প্রকল্পের ওভারভিউ",
+  "FRMELEMNTS_LBL_PROJECT_STATUS": "প্রকল্পের স্ট্যাটাস ",
+  "FRMELEMNTS_LBL_PROJECT_TITLE": "প্রকল্পের শিরোনাম",
+  "FRMELEMNTS_LBL_PROJECT_VIEW": "প্রকল্প দেখুন",
+  "FRMELEMNTS_LBL_QUESTION_WISE": "প্রশ্ন",
+  "FRMELEMNTS_LBL_RELEVANT_CONTENT_SUB_HEADING": "নির্দিষ্ট বিষয়বস্তু খোঁজার জন্য বিশদ বিবরণ পূরণ করুন ",
+  "FRMELEMNTS_LBL_REPORTS": "প্রতিবেদন",
+  "FRMELEMNTS_LBL_REPORTS_DESC": "প্রতিবেদনের তালিকা",
+  "FRMELEMNTS_LBL_REQUEST_CONTENT": "প্রয়োজনীয় বিষয়বস্তুর জন্য অনুরোধ করুন",
+  "FRMELEMNTS_LBL_SCHOOL": "বিদ্যালয়",
+  "FRMELEMNTS_LBL_SELECT_CATEGORIES": "শ্রেনী (গুলি) নির্বাচন করুন",
+  "FRMELEMNTS_LBL_SELECT_PROGRAM": "প্রোগ্রাম নির্বাচন করুন",
+  "FRMELEMNTS_LBL_SET_DATE": "তারিখ নির্ধারণ করুন",
+  "FRMELEMNTS_LBL_SET_DATE_HINT": "আপনার প্রকল্পের জন্য একটি সময়রেখা নির্ধারণ করুন",
+  "FRMELEMNTS_LBL_SHARE_PROFILE_INFORMATION": "আমার প্রোফাইলের বিস্তারিত বিবরণ শেয়ার করুন",
+  "FRMELEMNTS_LBL_START_DATE": "শুরুর তারিখ",
+  "FRMELEMNTS_LBL_STATUS": "অবস্থা",
+  "FRMELEMNTS_LBL_SUBPERSONA": "উপ-ভূমিকা",
+  "FRMELEMNTS_LBL_SUBTASKS": "সাবটাস্কগুলি",
+  "FRMELEMNTS_LBL_SURVEY": "জরিপ",
+  "FRMELEMNTS_LBL_SURVEY_ACTION": "জরিপের কার্যক্রম",
+  "FRMELEMNTS_LBL_SURVEY_DESC": "জরিপের তালিকা",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS": "জরিপের  প্রতিবেদন",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS_DESC": "জরিপের  প্রতিবেদন গুলি দেখুন",
+  "FRMELEMNTS_LBL_TAB_HOME": "হোম",
+  "FRMELEMNTS_LBL_TASK_DESCRIPTION": "কাজের বিবরণ",
+  "FRMELEMNTS_LBL_TASK_OVERVIEW": "কাজের ওভারভিউ",
+  "FRMELEMNTS_LBL_THIS_MONTH": "এই মাসে",
+  "FRMELEMNTS_LBL_TOTAL_TASKS": "সমস্ত কাজ",
+  "FRMELEMNTS_LBL_UPCOMING": "আসন্ন",
+  "FRMELEMNTS_LBL_UPDATE_DATA_SETTINGS": "সেটিংসের আপডেট করুন",
+  "FRMELEMNTS_LBL_USERTYPE_LEADER": "বিদ্যালয়ের প্রধান বা কর্মকর্তা",
+  "FRMELEMNTS_LBL_VIEW_ENTITY_REPORT": "সত্তার প্রতিবেদন দেখুন",
+  "FRMELEMNTS_LBL_VIEW_FULL_REPORT": "সম্পূর্ণ রিপোর্ট দেখুন",
+  "FRMELEMNTS_LBL_VIEW_RESOURCES": "রিসোর্সগুলি দেখুন ",
+  "FRMELEMNTS_MSG_BATCH_ALREADY_CLOSED": "এই ব্যাচের জন্য তালিকাভুক্তিগুলি {endDate} এ বন্ধ হয়েছে।",
+  "FRMELEMNTS_MSG_CONSENT_DECLARATION_INFO": "আপনি আপনার প্রোফাইল পৃষ্ঠা থেকে বিশদের সম্পাদনা করতে পারেন ",
+  "FRMELEMNTS_MSG_DATA_SETTINGS_SUBMITED_SUCCESSFULLY": "আপনার ডেটা সেটিংস সফলভাবে জমা দেওয়া হয়েছে",
+  "FRMELEMNTS_MSG_DELETE_TASK_CONFIRMATION": "আপনি কি নিশ্চিত যে আপনি কাজটি ডিলিট করতে চান? ",
+  "FRMELEMNTS_MSG_EDITCERTNAME": "আপনার প্রোফাইল পেজ থেকে আপনি এটি সম্পাদনা করতে পারেন। ",
+  "FRMELEMNTS_MSG_LOAD_FROM_LIBRARY": "লাইব্রেরি থেকে লোড করুন",
+  "FRMELEMNTS_MSG_NAMEONCERT": "আপনার কোর্সের শংসাপত্রে এই নামটি প্রিন্ট করা থাকবে। এটি সঠিক কি না পরীক্ষা করে নিন।",
+  "FRMELEMNTS_MSG_SELECT_IMAGE_SOURCE": "চিত্রের উৎস নির্বাচন করুন ",
+  "FRMELEMNTS_MSG_SELFDECLARATION_SUCCESS_INFO": "আপনার প্রোফাইল থেকে আপনি এই তথ্য সম্পাদনা করতে পারবেন",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED": "সফলভাবে সংযুক্ত করা হয়েছে",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_SYNCED": "প্রকল্পটি সফলভাবে সিঙ্ক করা হয়েছে",
+  "FRMELEMNTS_MSG_TICKET_SUBMISSION_SUCCESS": "আমরা আপনার প্রতিক্রিয়া গুরুত্বসহ গ্রহণ করছি। আমরা প্রতিটি রিপোর্টের ক্ষেত্রে প্রত্যুত্তর দিতে না পারলেও আপনার পাঠানো রিপোর্ট আমাদের {{app_name}}-কে  প্রত্যেক ব্যবহারকারীর জন্য আরও উন্নত করতে সহায়তা করবে।",
+  "FRMELEMNTS_MSG_UNABLE_TO_ENROLL": "আপনি এখনই ব্যাচটি ছাড়তে পারবেন না।  পরে আবার চেষ্টা করুন",
+  "FRMELEMNTS_MSG_UPDATED_SUCCESSFULLY": "সফলভাবে আপডেট করা হয়েছে",
+  "FRMELEMNTS_MSG_USER_CREATION_LIMIT_EXCEEDED": "আপনার প্রোফাইলের আওতায় আপনি সবচেয়ে বেশি সংখ্যক যতজন ব্যবহারকারীকে রাখতে পারেন সেই সংখ্যা আপনি অতিক্রম করেছেন। ",
+  "FRMELEMNTS_MSG_USE_CAMERA": "ক্যামেরা ব্যবহার করুন",
+  "FRMELEMNTS_MSG_USE_FILE": "ফাইল ব্যবহার করুন",
+  "FRMELEMNTS_MSG_YOUR_CHANGES_ARE_SAVED": "আপনার পরিবর্তনগুলি সফলভাবে সংরক্ষিত করা হয়েছে।",
+  "FRMELENTS_LBL_ACCESSIBILITYNORMALMODE": "লাইট মোডে স্যুইচ করুন",
+  "FRMELMNTS_BLTPT_EARNCERT": "শুধুমাত্র {{STATE}} রাজ্যে বসবাসকারী ব্যবহারকারীদের জন্য শংসাপত্র তৈরি করা হয়েছে",
+  "FRMELMNTS_BLTPT_EARNCERT2": "আপনার সমস্ত মূল্যায়নে  {{PERCENTAGE}} এর উপরে স্কোর প্রাপ্ত করুন",
+  "FRMELMNTS_BLTPT_EARNCERT3": "শংসাপত্রটি পাবার জন্য আপনি মূল্যায়ন প্রক্রিয়াটি মাত্র {{ATTEMPTS}} বার  প্রয়োগ করার চেষ্টা করতে পারবেন।",
+  "FRMELMNTS_IMSG_DECLAREINFO": "শুধুমাত্র রাজ্যের স্বীকৃত শিক্ষক/শিক্ষিকাদের ক্ষেত্রেই এই কোর্সটির জন্য শংসাপত্র দেওয়া হবে",
+  "FRMELMNTS_IMSG_LASTATTMPALRT": "এটাই হল আপনার চেষ্টা করার জন্য অবশিষ্ট সুযোগ",
+  "FRMELMNTS_IMSG_LASTATTMPTEXCD": "জমা দেবার জন্য সর্বোচ্চ সংখ্যক প্রচেষ্টা  আপনি অতিক্রম করেছেন",
+  "FRMELMNTS_LBL_ACCESSIBILITYFNTDFLT": "ডিফল্ট অবস্থা পুনরায় সেট করুন",
+  "FRMELMNTS_LBL_ACCESSIBILITYFONT": "ফন্টের আকার কম করুন",
+  "FRMELMNTS_LBL_AVSCORE": "সর্বোচ্চ প্রাপ্ত নম্বরগুলির গড়",
+  "FRMELMNTS_LBL_BESTSCORE": "সর্বোচ্চ নম্বর {{SCORE}}",
+  "FRMELMNTS_LBL_CERTQUES": "কেমন করে আপনি আপনার শংসাপত্রটি পাবেন?",
+  "FRMELMNTS_LBL_NOTIFNUMBER": "নতুন বিজ্ঞপ্তির সংখ্যা {{NUMBER}}-টি",
+  "FRMELMNTS_LBL_SEELESS": "সংক্ষিপ্ত আকারে দেখুন",
+  "FRMELMNTS_LBL_SEEMORE": "আরও বিস্তারিতভাবে দেখুন",
+  "FRMELMNTS_LBL_STATEUSERQUES": "আপনি কি রাজ্যের একজন শিক্ষক?",
+  "FRMELMNTS_LNK_DECLARELINK": "এখনই জানান",
+  "FRMELMNTS_PRMPT_DECLAREPROMPT": "একটি শংসাপত্র পাওয়ার জন্য {instance}-এ আপনার তথ্য জানান",
+  "FRMELMNTS_SCTTL_NOTIFHEADER": "বিজ্ঞপ্তিগুলি",
   "FROM": "থেকে",
   "FULL_NAME": "নাম",
+  "GET_STARTED": " শুরু করুন",
   "GOT_IT": "বুঝেছি",
+  "GO_TO_DOWNLOADS": "ডাউনলোডে যান।",
+  "GO_TO_PROFILE": "প্রোফাইলে যান।",
   "GRADE_OPTION_TEXT": "ক্লাস নির্বাচন করুন ",
   "GRANT_ACCESS": "প্রবেশাধিকার প্রদান করুন",
-  "GROUPS": "দল",
-  "GROUPS_YOU_FOLLOW": "আপনি অনুসরণ করা দল\n",
-  "GROUP_CREATE_SUCCESS": "দল টি সফলভাবে তৈরি হয়ে গেছে",
-  "GROUP_DELETE_CONFIRM": "'{{%s}}' মুছে ফেলা নিশ্চিত  করুন ?",
-  "GROUP_DELETE_CONFIRM_MESSAGE": "এই পদক্ষেপ দল টি থেকে মুছে ফেলা হবে কিন্তু ব্যবহারকারীদের মুছে ফেলা হবে না। ব্যবহারকারীদের 'ব্যবহারকারীর ট্যাব'  এর অধীনে পাওয়া যাবে",
-  "GROUP_MEMBER_ADD_SUCCESS": "সদস্য সফলভাবে যোগ করা হয়েছে",
-  "GROUP_MEMBER_DELETE_SUCCESS": "দল টি থেকে সদস্য দের সফলভাবে মুছে ফেলা হয়েছে",
-  "GROUP_NAME": "দলের নাম",
-  "GROUP_UPDATE_SUCCESS": "দলের বিস্তারিত তথ্য সফলভাবে আপডেট করা হয়েছে ",
+  "GROUP_CREATED": "গ্রুপটি সফলভাবে তৈরি হয়েছে",
+  "GROUP_CREATED_BY": "{{group_creator_name}} দ্বারা সৃষ্টি",
+  "GROUP_DESCRIPTION": "গ্রুপ বিবরণ",
+  "GROUP_DESCRIPTION_PLACEHOLDER": "সদস্যদের গোষ্ঠীর উদ্দেশ্য বুঝতে সহায়তা করার জন্য একটি বিবরণ প্রবেশ করুন।",
+  "GROUP_GUIDELINES": "গোষ্ঠীর নিয়মাবলি",
+  "GROUP_MEMBER_SEARCH_PLACEHOLDER": "গ্রুপের মধ্যে অনুসন্ধান করুন",
+  "GROUP_NAME": "গ্রুপের নাম",
+  "GROUP_NAME_IS_REQUIRED": "আপনাকে গ্রুপের নাম লিখতে হবে",
+  "GROUP_TERMS_IS_REQUIRED": "আপনাকে এগিয়ে যাওয়ার আগে আপনাকে {{app_name}} এর গোষ্ঠীর শর্তাবলীতে সম্মতি জানাতে হবে",
+  "GROUP_UPDATE_SUCCESS": "গ্রুপের বিস্তারিত তথ্য সফলভাবে আপডেট করা হয়েছে ",
   "HABIT_REMINDER_NOTIFICATION_MESSAGE": "আজ {{%s}} নতুন কিছু শিখুন!",
   "HELP": "সাহায্য করুন",
   "HELP_US_BY_RATING": "মান নির্ধারণ করে সাহায্য করুন {{%s}}",
@@ -261,97 +642,141 @@
   "HIDE_CREDITS_INFO": "অনুজ্ঞাপত্রর তথ্য গোপন করুন\n",
   "HINT_LANGUAGE": "পছন্দসই ভাষা নির্বাচন করুন",
   "HOBBIES": "শখ",
-  "IAM_ABOVE_18_YEARS_AGE": "আমার বয়স ১৮ বছরের উপরে",
+  "HOURS_AGO": "{{%s}} ঘন্টা আগে",
+  "HOUR_AGO": "{{%s}} ঘন্টা আগে",
+  "ID_IS_REQUIRED": "আইডি দরকার",
+  "IMPORTING": "আমদানি করা হচ্ছে ...",
   "IMPORTING_COUNT": "আমদানি করা হচ্ছে",
   "IMPORT_ECAR": "অসঙ্গতিপূর্ণ ফাইল বিন্যাস। আপনি শুধুমাত্র .ecar, .epar এবং .gsa  ফাইলগুলি আমদানি করতে পারবেন।",
   "IMPORT_ERROR": "আমদানি ব্যর্থ হয়েছে",
   "IMPORT_PROGRESS": "আমদানি হচ্ছে .. অনুগ্রহ করে অপেক্ষা করুন",
   "INACTIVE": "নিষ্ক্রিয়",
+  "INCORRECT_TEACHER_ID_ERROR": "আপনি একটি ভুল আইডি লিখেছেন। আবার আইডি লিখুন",
   "INSTALL_CROSSWALK": "ক্রসওয়াক ইনস্টল করুন ",
+  "INSTANCE_TERMS_OF_USE": "{{app_name}} ব্যবহারের শর্তাবলী",
   "INSUFFICIENT_STORAGE": "অপর্যাপ্ত সংরক্ষণের স্থান",
   "INTERACTION": "ইন্টারেক্টিভ",
+  "INTERACTIVE_MATERIAL": "ইন্টারেক্টিভ অধ্যয়ন উপাদান",
   "INTERNAL_MEMORY": "অভ্যন্তরীণ সংরক্ষণ",
   "INTERNET_AVAILABLE": "আপনি এখন অনলাইনে আছেন",
   "INTERNET_CONNECTIVITY_NEEDED": "ইন্টারনেট সংযোগ নেই",
   "INVALID_CONTENT": "অকার্যকর বিষয়বস্তু",
+  "INVALID_FORMAT": "ভুল ফরম্যাট",
+  "INVALID_MEMBER_ID": "আপনি একটি অবৈধ {{app_name}} আইডি প্রবেশ করিয়েছেন",
   "INVALID_QR": "অবৈধ কিউ আর কোড",
   "ITEMS": "{{%s}} ফাইল (গুলি)\n",
   "ITEMS_SELECTED": "ফাইল নির্বাচিত",
+  "I_AGREE_TO": "আমি {{app_name}} নার সাথে একমত",
   "I_AGREE_TO_TNC": "আমি ব্যবহারের শর্তাবলীতে সম্মতি জানাচ্ছি",
+  "I_AM_A_PERSONA_WITH_TENANT": "আমি একজন {{%persona}} সঙ্গে {{%tenant}}",
+  "I_UNDERSTAND_AND_ACCEPT": "আমি বুঝতে পেরেছি এবং গ্রহণ করলাম",
   "JOIN_TRAINING": "প্রশিক্ষণে যোগদান করুন ",
   "LANGUAGE": "ভাষা\n",
   "LANGUAGE_SETTINGS": "ভাষা ব্যাবস্থা",
-  "LAST_DATE_TO_JOIN": "যোগদান করার শেষ তারিখ ",
-  "LAST_SYNC": "শেষ সংগত করা হয়েছিল\n",
+  "LAST_DATE_TO_JOIN": " {{%s}} যোগদান করার শেষ তারিখ ",
+  "LAST_SYNC": "শেষ সংগত করা হয়েছিল",
+  "LAST_UPDATED": " {{%s}} এ সর্বশেষ আপডেট",
   "LAST_VIEWED": "শেষ দেখা",
-  "LATEST_COURSES": "সর্বশেষ পাঠক্রম",
+  "LATEST_COURSES": "নতুনতম পাঠক্রম",
+  "LEAVE_GROUP": "গ্রুপ পরিত্যাগ করুন",
+  "LEAVE_GROUP_ERROR_MSG": "গ্রুপ ছাড়তে পারেনি। পরে আবার চেষ্টা করুন",
+  "LEAVE_GROUP_POPUP_DESC": "এই ক্রিয়াটি পূর্বাবস্থায় ফেরানো যাবে না. আপনি কি {{group_name}} গ্রুপ ছেড়ে যেতে চান?",
+  "LEAVE_GROUP_POPUP_TITLE": "গ্রুপ পরিত্যাগ করবেন?",
+  "LEAVE_GROUP_SUCCESS_MSG": "আপনি আর এই গ্রুপের অংশ না",
   "LEAVE_TRAINING_HEADING": "প্রশিক্ষণ ছেড়ে দেবেন?",
   "LIBRARY_BNAV": "গ্রন্থাগার",
   "LICENSE": "অনুমতিপত্র",
+  "LOAD": "লোড ",
+  "LOADER_PROGRESS_DESCRIPTION": "আমরা জিনিস প্রস্তুত করছি",
+  "LOADER_PROGRESS_DESC_SUB_HEADING": "দয়া করে অপেক্ষা করুন।",
   "LOADING_CONTENT": "কন্টেন্ট লোড হচ্ছে",
   "LOADING_CONTENTS": "বিষয়বস্ত লোড হচ্ছে {{%s}}%",
-  "LOADING_USER_LIST": "ব্যবহারকারী তালিকা লোড হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন",
-  "LOGGED_IN_AS": "লগ ইন করুন",
-  "LOGGED_OUT": "প্রস্থান করা",
+  "LOAD_FILE": "ফাইল লোড করুন",
+  "LOGGED_IN_MEMBER": "{{member_name}} (আপনি)",
+  "LOGIN_TO_CREATE_GROUP_DESCRIPTION": "আপনার নিজস্ব গ্রুপ, স্টাডি সার্কেল বা শ্রেণিকক্ষ তৈরির দিকে প্রথম পদক্ষেপটি হল লগ ইন করা",
+  "LOGIN_TO_JOIN_TRAINING": "কোর্সে যোগদান করতে হলে লগ ইন করুন ",
   "LOGOUT": "লগ আউট",
   "LOW_BANDWIDTH": "দুর্বল ইন্টারনেট সংযোগ",
   "LOW_BANDWIDTH_DETECTED": "কম ব্যান্ডউইথের নেটওয়ার্ক সনাক্ত হয়েছে",
-  "MARKS": "চিহ্ন",
+  "MAINTENANCE_MESSAGE": "আমরা রক্ষণাবেক্ষণের জন্য বর্তমানে কাজ বন্ধ রেখেছি।  কিন্তু চিন্তা করবেন না, আমরা ফিরে আসবো {{%timeLeft}} ঘন্টার মধ্যে। এখুনি ফিরে আসছি!",
+  "MAINTENANCE_SUB_TEXT": "আপনি যে বিষয়বস্তু  ডাউনলোড করেছেন তা এখনও অ্যাক্সেস করতে পারবেন",
+  "MAKE_ADMIN": "অ্যাডমিন তৈরি করুন",
+  "MAKE_GROUP_ADMIN_ERROR_MSG": "{{member_name}} কে গ্রুপ প্রশাসক হিসাবে তৈরি করতে পারেনি",
+  "MAKE_GROUP_ADMIN_POPUP_DESC": "তার এই ক্রিয়াকলাপটি {{member_name}} গ্রুপ প্রশাসকদের অনুমতি দেবে",
+  "MAKE_GROUP_ADMIN_POPUP_TITLE": "গ্রুপ প্রশাসক করবেন?",
+  "MAKE_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} এখন গ্রুপ অ্যাডমিন",
   "MEDIUM": "মাধ্যাম",
   "MEDIUM_OF_INSTRUCTION": "শিক্ষার মাধ্যম",
   "MEDIUM_OPTION_TEXT": "মাধ্যম নির্বাচন করুন",
+  "MEMBERS": "সদস্য",
+  "MEMBER_ADDED_TO_GROUP": "সদস্য সাফল্যের সাথে গ্রুপে যুক্ত হয়েছেন",
+  "MEMBER_ALREADY_EXISTS_IN_GROUP": "এই সদস্য ইতিমধ্যে দলের একটি অংশ।",
+  "MEMBER_ID": "{{app_name}} আইডি",
+  "MENU_DELETE_GROUP": "গ্রুপটি মুছে ফেলুন",
+  "MENU_DISMISS_AS_GROUP_ADMIN": "গ্রুপ প্রশাসক হিসাবে বরখাস্ত করুন",
+  "MENU_EDIT_GROUP_DETAILS": "গ্রুপের বিস্তারিত সম্পাদনা করুন",
+  "MENU_LEAVE_GROUP": "গ্রুপ পরিত্যাগ করুন",
+  "MENU_MAKE_GROUP_ADMIN": "গ্রুপ প্রশাসক তৈরি করুন",
+  "MENU_REMOVE_ACTIVITY": "ক্রিয়াকলাপ সরান",
+  "MENU_REMOVE_FROM_GROUP": "গ্রুপ থেকে বাদ",
   "MERGE_ACCOUNT": "অ্যাকাউন্ট একত্রিত করুন",
   "MICROPHONE": "মাইক্রোফোন",
   "MICROPHONE_PERMISSION_DESCRIPTION": "{{%s}} কেবলমাত্র এমন সামগ্রীতে মাইক্রোফোন অনুমতি  ব্যবহার  করুন  যেটা\nআপনাকে আপনার ভয়েস রেকর্ড করতে দেয়।",
+  "MINUTES_AGO": "{{%s}}  মিনিট আগে",
+  "MINUTE_AGO": "{{%s}} মিনিট আগে",
+  "MONTHS_AGO": "{{%s}} মাস আগে",
+  "MONTH_AGO": "{{%s}} মাস আগে",
   "MORE": "আরো\n",
   "MORE_CONTENT": "{{%s}} এ আরও বই এবং বিষয়বস্তুর সন্ধান করুন",
+  "MORE_COUNT": "অধিক ({{%s}})",
   "MORE_DETAILS": "আরও বিস্তারিত (আরও তথ্য প্রদান করুন অথবা সমস্যাটির একটি স্ক্রিনশট সংযুক্ত করুন)",
   "MOVE": "স্থানান্তর করুন",
   "MOVE_FILES_TO_OTHER_DESTINATION": "ফাইলগুলি {{%s}} এর খালি স্থানেতে সরান",
   "MSG_ALREADY_IMPORTED": "ইতিমধ্যে আমদানি করা হয়ে গেছে\n",
   "MSG_IMPORTED_SUCCESSFULLY": "বিষয়বস্তু সফলভাবে আমদানি করা হয়েছে",
-  "MSG_LOADING_BATCHES": "ব্যাচ আনা হচ্ছে ...",
   "MSG_NO_DETAILS_TO_SHOW": "বিবরণ অনুপলব্ধ",
   "MSG_NO_NEW_NOTIFICATION": "কোন নতুন প্রজ্ঞাপন",
   "MSG_RESOURCE_DELETED": "বিষয়বস্তু ডিভাইস থেকে মুছে ফেলা হয়েছে",
-  "MY_BADGES": "আমার ব্যাজ (গুলি)\n",
+  "MULTIPLE_LICENSE": "লাইসেন্সের শর্তাদি {{%s}}",
+  "MY_BADGES": "আমার ব্যাজ (গুলি)",
+  "MY_DETAILS": "আমার বিশদ বিবরণ",
+  "MY_GROUPS": "আমার গ্রুপগুলি",
   "NAME": "নাম",
   "NAME_HINT": "নাম লিখুন",
+  "NAME_IS_REQUIRED": "আপনাকে ব্যবহারকারীর নাম লিখতে হবে",
+  "NEED_INTERNET_FOR_DEEPLINK_CONTENT": "আপনি অফলাইনে. সামগ্রীটি অ্যাক্সেস করতে ইন্টারনেটে সংযুক্ত হন",
   "NEED_INTERNET_TO_CHANGE": "ওয়াই ফাই বা মোবাইল ডেটা চালু করুন এবং আবার চেষ্টা করুন",
   "NEW": "নতুন",
   "NEW_NOTIFICATIONS": "{{%s}} নতুন বিজ্ঞপ্তি (গুলি)",
   "NEXT": "পরবর্তী",
   "NIL": "শুন্য",
   "NO": "না\n",
+  "NOTE": "দ্রষ্টব্য",
   "NOTIFICATION": "বিজ্ঞপ্তি",
   "NOT_AVAILABLE": "পাওয়া যায় নি",
   "NOT_NOW": "এখন নয়",
   "NO_APP_FOR_INTENT": "ফাইল খোলার জন্য কোন অ্যাপ্লিকেশন পাওয়া যাচ্ছে না\n",
-  "NO_ASSESSMENT": "কোন মূল্যায়ন উপলব্ধ নেই",
   "NO_BATCHES_AVAILABLE": "কোন ব্যাচ উপলব্ধ নেই",
   "NO_BOOKS_AVAILABLE": "বোর্ড বই যুক্ত করছে",
-  "NO_BOOKS_DEFINITION": "আপনার বোর্ডটির আরও বই যুক্ত করা বাকি আছে। {{%s}} এ আরও বই এবং বিষয়বস্তু দেখতে বোতামটি আলতো চাপুন",
+  "NO_BOOKS_DEFINITION": "আপনার বোর্ডের আরও বই যুক্ত করা বাকি আছে। {{%s}} এ আরও বই এবং বিষয়বস্তু দেখতে <b>See more books and content</b> বোতামটি ক্লিক করুন\n",
+  "NO_BOOKS_TEXT": "{{%s}} এ আপনার বিষয়ের পাঠ্যপুস্তক খুঁজে পাওয়া যায়নি",
   "NO_CONTENTS": "{{%s}} নেই",
   "NO_CONTENTS_FOUND": "বিষয় খুঁজে পাওয়া যায়নি",
   "NO_CONTENTS_MESSAGE": "অন্য প্রকারের বিষয়বস্তুর নির্বাচন করুন",
+  "NO_CONTENT_AVAILABLE_IN_MODULE": "এই মডিউলে কোনও বিষয়বস্তু উপলব্ধ নেই",
+  "NO_COURSES": "কোনো কোর্স নেই ",
   "NO_DATA_FOUND": "কোন তথ্য পাওয়া যায়ে নি",
-  "NO_DESCRIPTION": "বিবরণ  অনুপলব্ধ\n",
   "NO_DOWNLOADS": "এখনো কোন ডাউনলোড নেই",
   "NO_DOWNLOADS_INFO": "কোর্স বা লাইব্রেরি থেকে বিষয়বস্তু ডাউনলোড করুন",
   "NO_FILTERS_SELECTED": "কোন ফিল্টার নির্বাচিত করা হয়ে নি",
-  "NO_GROUPS_CREATED_YET": "কোন দল এখনো তৈরি করা হয়ে নি",
-  "NO_GROUP_MESSAGE": "দলগুলি ব্যবহারকারীকে আরও ভালভাবে সংগঠিত করতে সহায়তা করে। আপনি সামগ্রিক উন্নতি নিরীক্ষণ  করার  জন্যে  দল গুলি ব্যবহার করতে পারেন",
   "NO_INTERNET": "কোন ইন্টারনেট এক্সেস নেই",
-  "NO_INTERNET_TITLE": "আপনি ইন্টারনেট সংযোগে নেই\n",
+  "NO_INTERNET_TITLE": "আপনি ইন্টারনেট সংযোগে নেই",
   "NO_PREVIEW": "প্রাকদর্শন অনুপলব্ধ্য",
+  "NO_QR_CODE": "আমার কাছে কিউআর কোড নেই",
   "NO_QR_CODE_QSTN": "QR কোড নেই?",
-  "NO_RATING": "এখনো মান নির্ধারণ করা হয়ে নি\n",
-  "NO_USERS": "কোন ব্যবহারকারী নেই",
-  "NO_USERS_CREATED_YET": "কোন ব্যবহারকারী এখনো তৈরি করা হয়ে নি",
-  "NO_USERS_CREATED_YET_MSG": "আপনি আপনার ছাত্র ছা্ত্রী  এবং অন্যান্য শিক্ষক শিক্ষিকা দের  জন্য অতিথি  অ্যাকাউন্ট তৈরি করতে পারেন",
-  "NO_USERS_IN_THIS_GROUP": "এই দলে কোন ব্যবহারকারী নেই",
-  "NO_USERS_ON_THIS_DEVICE": "এই ডিভাইসে কোন ব্যবহারকারী নেই",
-  "NO_USERS_SUGGESTION_MESSAGE": "একটি দলে অন্তত একজন ব্যবহারকারী থাকতেই হবে",
+  "NO_RATING": "এখনো মান নির্ধারণ করা হয়ে নি",
+  "NUMBER_OF_COURSES": " ({{%s}}) কোর্সগুলি",
+  "NUMBER_OF_COURSE_1": "({{%s}}) কোর্স ",
   "NUMBER_OF_VOTES": "ভোট সংখ্যা",
   "OFF": "বন্ধ",
   "OFFLINE_DOWNLOAD_MESSAGE": "ইন্টারনেট সংযোগ হতেই ডাউনলোড স্বয়ংক্রিয়ভাবে পুনরায় শুরু হবে",
@@ -359,6 +784,8 @@
   "OFFLINE_WARNING_ETBUI": "বিষয়বস্তুটি দেখতে দয়া করে ইন্টারনেট সংযোগ স্থাপন করুন",
   "OFFLINE_WARNING_ETBUI_1": "বিষয়বস্তুটি দেখতে ইন্টারনেট সংযোগ করুন",
   "OKAY": "ঠিক আছে",
+  "ONGOING": "নিরন্তর",
+  "ONLY_DIGIT_NUMBER_IS_ALLOWED": "কেবল ১১ ডিজিটের নম্বর অনুমোদিত",
   "ONLY_DOWNLOADED_CONTENT_CAN_BE_PLAYED_OFFLINE": "শুধুমাত্র ডাউনলোড করা বিষয়বস্তু অফলাইনে চালানো যেতে পারে",
   "OPEN": "খোলা\n",
   "OPEN_SETTINGS": "সেটিংস টি খুলুন",
@@ -368,8 +795,7 @@
   "ORIGINAL_CONTENT": "বিষয়বস্তু",
   "ORIGINAL_CONTENT_DATA": "এই বিষয়বস্তুটি উদ্ভূত হয়েছে:",
   "OTHER_ROLE_DESC_1": "ডিজিটাল  বিষয়বস্তু ব্রাউজ করুন",
-  "OTHER_ROLE_DESC_2": "অনলাইন প্রশিক্ষণ নিন",
-  "OTHER_USERS": "অনান্য ব্যাবহারকারীরা",
+  "OTHER_ROLE_DESC_2": "অনলাইন প্রশিক্ষণ নিন।",
   "OTP_FAILED": "OTP যাচাই করতে ব্যর্থ। পরে আবার চেষ্টা করুন।",
   "OTP_PLACEHOLDER": "OTP প্রদান করুন\n",
   "OTP_RESENT": "OTP পুনরায়ে পাঠানো হয়েছে",
@@ -390,105 +816,145 @@
   "PERMISSION_SETTING_MSG": "অনুমতি প্রদান করার জন্য, সেটিংস খুলুন",
   "PHONE": "ফোন",
   "PHONE_EDIT_SUCCESS": "সফল ভাবে মোবাইল নম্বর আপডেট হয়েছে",
-  "PHONE_PLACEHOLDER": "ফোন নম্বর",
+  "PHONE_PLACEHOLDER": "মোবাইল নম্বর",
   "PHONE_UPDATE_SUCCESS": "ফোন নম্বর সফলভাবে আপডেট হয়েছে",
+  "PLANNED_MAINTENANCE_TEXT": "আমরা রক্ষণাবেক্ষণের জন্য বর্তমানে কাজ বন্ধ রেখেছি।  কিন্তু চিন্তা করবেন না, আমরা আবার দ্রুত কাজ চালু করব",
+  "PLANNED_MAINTENANCE_TEXT_WITH_TIME": "আমরা রক্ষণাবেক্ষণের জন্য ডাউন রয়েছি।  কিন্তু চিন্তা করবেন না, আমরা ফিরে আসবো।",
   "PLAY": "চালান\n",
   "PLAY_AS": "হিসাবে খেলুন",
   "PLAY_FROM_DEVICE": "ডিভাইস থেকে দেখুন",
   "PLAY_ONLINE": "অনলাইন এ দেখুন",
   "PLEASE_DOWNLOAD_TO_PLAY": "চালানোর জন্য বিষয়বস্তু  ডাউনলোড করুন",
+  "PLEASE_ENTER": "{{%s}} প্রবেশ করুন",
+  "PLEASE_PROVIDE_FOLLOWING_DETAILS": "নিম্নলিখিত বিবরণ প্রদান করুন",
   "PLEASE_SELECT": "নির্বাচন {{%s}}",
   "PLEASE_SELECT_A_LANGUAGE": "একটি ভাষা নির্বাচন করুন",
-  "PLEASE_SELECT_USER": "এক জন ব্যবহারকারী নির্বাচন করুন",
+  "PLEASE_VALIDATE_YOUR_EMAIL_ADDRESS": "নিজের ইমেল ঠিকানাটি যাচাই করুন",
+  "PLEASE_VALIDATE_YOUR_MOBILE_NUMBER": "আপনার মোবাইল নম্বরটি যাচাই করুন",
   "POPULAR_COURSES": "জনপ্রিয় কোর্স",
+  "POWER_OF_GROUPS": "আপনি এখনও গ্রুপের সম্ভাব্য অনুসন্ধান করেছেন?",
+  "PREFERENCES_CAN_BE_UPDATED": "আপনি প্রোফাইল পৃষ্ঠা থেকে এই ব্যবহারকারীর বিবরণ সম্পাদনা করতে পারেন",
   "PREVIEWS": "প্রাকদর্শন",
   "PREVIOUS_USER_SETTINGS": "আপনি আগের ব্যবহারকারীর সেটিংস ব্যবহার করতে চান?",
-  "PRIVATE": "ব্যক্তিগত\n",
+  "PRINT": "প্রিন্ট",
+  "PRIVACY_POLICY": "প্রাইভেসি পলিসি",
   "PROFILE_BNAV": "প্রোফাইল",
   "PROFILE_DETAILS_TITLE": "ব্যবহারকারীর বিবরন",
   "PROFILE_UPDATE_FAILED": "প্রোফাইল আপডেট ব্যর্থ হয়েছে, পরে আবার চেষ্টা করুন",
   "PROFILE_UPDATE_SUCCESS": "প্রোফাইল টি সফলভাবে আপডেট হয়ে গেছে",
+  "PROGRAMS_DESC": "আপনার অবস্থানের অনুযায়ী সক্রিয় শিক্ষামূলক প্রোগ্রামগুলি দেখুন এবং অংশগ্রহণ করুন এবং আপনার নির্বাচনের উপর ভিত্তি করে ডিজাইন করা হয়েছে ",
+  "PROGRESS_CANNOT_BE_TRACKED": "{{collectionType}} এর জন্য কাজের অগ্রগতি ট্র্যাক করা যাবে না",
   "PROVIDE_BELOW_INFO": "নীচে তথ্য সরবরাহ করুন",
   "PUBLIC": "প্রকাশ্য",
-  "PUBLISHED_BY": "তারিখে {{%s}} দ্বারা প্রকাশিত ",
+  "PUBLISHED_BY": " {{%s}} তারিখে প্রকাশিত ",
   "PUBLISHED_DATE": "প্রকাশনার তারিখ",
-  "QR_CODE_DETAILS": "এটি আপনার কিছু পাঠ্যপুস্তকে পাওয়া যাবে।  পাঠ্যসামগ্রী  এক্সেস করার জন্য স্ক্যান করুন  ",
-  "QUESTION": "প্রশ্ন",
-  "QUESTIONS": "প্রশ্ন",
-  "QUESTION_MARKS": "প্রশ্ন (বধক)",
+  "PUBLISHER": "প্রকাশক",
+  "QR_CODE_DETAILS": "আপনার পাঠ্য পুস্তক থেকে কিউআর কোড স্ক্যান করে ডিজিটাল পাঠ্যসামগ্রী তাৎক্ষণিক অ্যাক্সেস  পান ।",
+  "QR_SHOWING_MULTIPLE_BOOK_RESULT": "{{%s}}এর জন্য ফলাফল দেখাচ্ছে",
+  "QUES_BANKS": "প্রশ্ন বিচিত্রা",
   "QUIZ": "প্রশ্নতর",
+  "QUIZ_CONTENTS_ONLY_REGISTERED_USERS": "কুইজটি কেবল নিবন্ধিত ব্যবহারকারীদের জন্য",
   "RATE": "দর",
   "RATED_STARS": "আপনি {{%s}} তারা রেট দিয়েছেন",
   "RATE_THE_CONTENT": "দরের বিষয়বস্তু",
-  "READ_LESS": "অল্প পড়ুন\n\n",
+  "RATING_QUESTION": "আপনি আমাদের আরও বলতে চান?",
+  "READ_LESS": "অল্প পড়ুন",
   "READ_MORE": "বিস্তারিত পরুন",
-  "RECENTLY_VIEWED": "সম্প্রতি দেখা হয়েছে\n",
+  "RECOMMENDATION_BASED_ON_PROFILE": "আপনার প্রোফাইল বিবরণের উপর ভিত্তি করে প্রস্তাবনাগুলি",
   "RECOMMENDED": "প্রস্তাবিত",
   "RECOVERY_ACCOUNT_UPDATE_SUCCESS": "আপনার রিকভারি একাউন্ট সফলভাবে আপডেট হয়েগেছে ",
   "RECOVERY_ID_DESCRIPTION": "আটকে গেলে আপনার রিকভারি একাউন্ট আপনাকে প্রবেশ করতে সাহায্য করবে।একটি রিকভারি একাউন্ট নির্বাচন করুন এবং বিস্তারিত তথ্য লিখুন  ",
+  "REDO": "পুনরায় করুন",
+  "REDO_ASSESSMENT": "আবার পরীক্ষা দিন ",
   "REGISTER_TO_COMPLETE_ACCESS": "সম্পূর্ণ  তথ্য উপলব্ধি করতে হলে রেজিস্টার করুন",
   "REMOVE": "মুছে দাও",
+  "REMOVE_ACTIVITY": "অপসারণ",
+  "REMOVE_ACTIVITY_ERROR_MSG": "ক্রিয়াকলাপ সরানো যায়নি। পরে আবার চেষ্টা করুন",
+  "REMOVE_ACTIVITY_GROUP_DESC": "যদি এই ক্রিয়াকলাপ গ্রুপ থেকে সরিয়ে ফেলন, আপনি এতে আর সদস্যের অগ্রগতি পরীক্ষা করতে পারবেন না ",
+  "REMOVE_ACTIVITY_POPUP_TITLE": "কার্যকলাপ সরান?",
+  "REMOVE_ACTIVITY_SUCCESS_MSG": "গ্রুপ থেকে সফলভাবে কার্যকলাপ সরিয়ে দেওয়া হয়েছে",
   "REMOVE_FROM_DEVICE": "ডিভাইস থেকে বিষয়বস্তুটি মুছে ফেলা হয়েছে",
   "REMOVE_FROM_DEVICE_MSG": "আপনি কি নিশ্চিতরূপে ডিভাইস থেকে বিষয়বস্তুটি মুছে ফেলতে চান?",
-  "REMOVE_MULTIPLE_USERS_FROM_GROUP": "ব্যবহারকারীদের অপসারণ {{%s}} নিশ্চিত করুন ",
-  "REMOVE_USERS": "ব্যবহারকারী অপসারণ করুন",
-  "REMOVE_USERS_FROM_GROUP": "দল থেকে ব্যবহারকারী অপসারণ করুন  {{%s}}",
-  "REPORTS": "প্রতিবেদন",
+  "REMOVE_MEMBER": "সদস্যকে সরান",
+  "REMOVE_MEMBER_ERROR_MSG": "গ্রুপ থেকে সদস্যকে সরানো যায়নি। পরে আবার চেষ্টা করুন",
+  "REMOVE_MEMBER_GROUP_DESC": "{{member_name}} অপসারণ স্থায়ীভাবে তাকে গ্রুপ থেকে সরিয়ে দেওয়া হবে",
+  "REMOVE_MEMBER_POPUP_TITLE": "সদস্যকে সরাবেন?",
+  "REMOVE_MEMBER_SUCCESS_MSG": "{{member_name}} আর গ্রুপের অংশ নন",
+  "REQUEST_CONTENT": "এখানে আমাদের জানাতে পারেন",
   "RESEND_OTP": "OTP পুনরায় পাঠানো হয়েছে",
+  "RESET": "রিসেট করুন",
   "RESOURCE_TYPE": "বিষয়বস্তুর  প্রকার",
-  "RESULT": "ফল",
+  "RESPONSE_ACKNOWLEGED": "আপনার প্রতিক্রিয়ার জন্য ধন্যবাদ!",
   "RESULTS": "ফলাফল",
   "RESUME": "পুনরায় শুরু করুন ",
   "RETRY": "পুনরায় চেষ্টা করুন",
   "RETRY_ACTION": "আবার চেষ্টা কর",
-  "ROLE_SELECTOR_QUERY": "আপনি এক জন",
+  "ROLE_SELECTOR_QUERY": "বিষয়বস্তু  হিসাবে আবিষ্কার করুন",
   "SAVE": "সংরক্ষণ করুন",
   "SAVED_ON": "সংরক্ষিত",
-  "SAVED_RESOURCES": "সংরক্ষিত সম্পদ",
   "SAVE_FILE_ON_DEVICE": "ডিভাইসে ফাইল সেভ  করুন",
   "SCAN_QR_CODE": " QR কোড স্ক্যান করুন",
   "SCAN_QR_INSTRUCTION": "QR কোড টি স্ক্যান করতে আপনার ফোনকে QR কোডের দিকে নির্দেশ করুন",
-  "SCAN_TAP": "স্ক্যান করার জন্য ট্যাপ করুন",
-  "SCORE": "স্কোর",
-  "SCORED": "স্কোর হয়েছিল\n",
+  "SCAN_TAP": "QR কোডটি স্ক্যান করুন",
+  "SCHOOL_OR_ORG_NAME": "স্কুল / সংস্থার নাম",
+  "SCHOOL_UDISE_ID_OR_ORG_ID": "স্কুল ইউডিআইএসই আইডি / সংগঠন আইডি",
   "SD_CARD": "SD কার্ড",
+  "SEARCH_FOR_GROUP_MEMBER": "গ্রুপে সদস্যের জন্য অনুসন্ধান করুন",
   "SEARCH_HINT": "অনুসন্ধান",
   "SEARCH_PLACEHOLDER": "অনুসন্ধান করতে এখানে লিখুন",
   "SEARCH_TO_FIND_CONTENT": "বিষয়বস্তু খুঁজে পেতে {{%s}} এর অনুসন্ধান করুন",
+  "SECONDS_AGO": "{{%s}} সেকেন্ড আগে",
+  "SECOND_AGO": "{{%s}} সেকেন্ড আগে",
   "SEE_ALL_RESULTS_FOR": "\"{{%s}}\" এর জন্য সমস্ত ফলাফল দেখুন",
+  "SEE_MORE_BOOKS": "আরও বই এবং বিষয়বস্তু দেখুন",
+  "SEE_MORE_CONTENT": "আরও বিষয়বস্তু দেখুন",
   "SELECT": "নির্বাচন\n",
   "SELECTED_TOPICS": "নির্বাচিত বিষয়",
+  "SELECT_ACTIVITY": "কার্যকলাপ নির্বাচন করুন",
   "SELECT_ALL": "সব নির্বাচন করুন",
   "SELECT_CHAPTER": "অধ্যায় নির্বাচন করুন",
-  "SEND_FILE": "ফাইল পাঠান",
+  "SELECT_YOUR_STATE": "আপনার রাজ্য নির্বাচন করুন",
+  "SELF_DECLARED_INFO": "স্ব ঘোষিত তথ্য",
+  "SELF_DECLARE_TEACHER_TNC": "{{%appName}} এর অনুযায়ী আমি প্রশাসকদের সাথে এই বিবরণগুলি শেয়ার করতে সম্মত ",
+  "SEND_FILE": "ফাইল পাঠান।",
   "SERVER_CONNECTION_ERROR": "সার্ভারের সাথে সংযোগ করতে অক্ষম",
   "SETTINGS": "সেটিংস",
   "SHARE": "ভাগ",
   "SHARE_APP": "অ্যাপ্লিকেশন শেয়ার করুন {{%s}} ",
+  "SHARE_APP_LINK": "{{play_store_url}} থেকে {{app_name}} অ্যাপ পান।",
   "SHARE_CONTENT_FAILED": " বিষয়বস্তু ভাগ করতে অক্ষম",
+  "SHARE_CONTENT_FILE": "ফাইল পাঠানো হয়েছে: {{app_name}}\nনাম: {{content_name}}\n{{play_store_url}} থেকে {{app_name}}  অ্যাপ পান",
+  "SHARE_CONTENT_LINK": "আমি দেখছি {{app_name}}-তে  {{content_name}} সত্যি খুব কার্যকরী ও জরুরী।{{content_link}}",
   "SHARE_LINK": "লিঙ্ক শেয়ার  করুন",
   "SHARE_TELEMETRY": "টেলিমেট্রি তথ্য শেয়ার করুন",
   "SHARE_TELEMETRY_FAILED": "টেলিম্যাট্রি  তথ্য শেয়ার করতে অক্ষম",
+  "SHARE_TELEMETRY_NO_DATA_FOUND": "কোনও টেলিমেট্রি ডেটা পাওয়া যায় নি",
   "SHARE_THIS": "ভাগ",
+  "SHARE_USERNAME": "হাই! আপনি {{user_name}} এর {{app_name}} ID: {{diksha_id}} গ্রহণ করেছেন",
   "SHOW": "দেখান",
+  "SHOWING_ITEMS": "{{%s}} আইটেম দেখানো হচ্ছে ।",
   "SHOWING_RESULTS_FOR": "'{{%query}}' এর জন্য {{%count}} দেখানো হচ্ছে ",
   "SHOW_LESS": " কম প্রদর্শন",
   "SHOW_MORE": " বেশি প্রদর্শন",
-  "SHOW_RECENT": "{{%s}} ফাইল দেখানো হচ্ছে",
-  "SIGNED_OUT_ACCOUNT_MESSAGE": "আপনাকে  আপনার বর্তমানে লগ ইন অ্যাকাউন্ট থেকে লগ আউট করা হবে",
-  "SIGNIN_TO_USE_FEATURE": "এই বৈশিষ্ট্যটি ব্যবহার করতে সাইন ইন করুন",
-  "SIGN_IN": "প্রবেশ কর",
+  "SIGNIN_TO_USE_FEATURE": "এই বৈশিষ্ট্যটি ব্যবহার করতে লগ ইন করুন",
+  "SIGN_IN": "লগ ইন করুন ",
+  "SIZE": "আকার: {{%s}}",
   "SKIP": "বাদ ",
   "SOMETHING_WENT_WRONG": "প্রযুক্তিগত সমস্যার কারণে, আমরা অনুরোধ প্রক্রিয়া করতে অক্ষম",
   "SORT_BY": "ক্রমানুসারে\n",
   "SPACE_AVAILABLE_ON_SDCARD": "SD কার্ডে উপলব্ধ স্থান:",
   "SPACE_TAKEN": " দ্বারা  স্থান গৃহীত  {{%s}}",
-  "SPACE_TAKEN_BY_APP": "{{%s}} বিষয়বস্তু  দ্বারা স্থান নেওয়া হয়েছে:",
+  "SPACE_TAKEN_BY_APP": "বিষয়বস্তুটি  {{%s}} স্থান নিয়েছে:",
+  "SPECIAL_CHARACTERS_NOT_SUPPORTED": "এই ক্ষেত্রটিতে আপনাকে বিশেষ অক্ষর লেখার অনুমতি দেওয়া হয়নি",
+  "START": "শুরু",
+  "START_AGAIN": "আবার শুরু করুন",
+  "START_ASSESSMENT": "মূল্যায়ন শুরু করুন",
   "START_COURSE": "শুরু",
   "START_COURSE_NOW": "শুরু করুন ",
+  "START_LEARNING": "শেখা শুরু করো",
   "STAR_RATINGS": "নির্ধারণ",
   "STATE": "রাজ্য",
-  "STATE_OPTION_TEXT": "রাজ্য নির্বাচন কর",
+  "STATE_OPTION_TEXT": "রাজ্য নির্বাচন করুন",
   "STATE_RECORDS": "রাজ্যের সংরক্ষিত তথ্যানুযায়ী",
   "STORAGE": "সংগ্রহস্থল",
   "STORAGE_SETTINGS": "সংগ্রহস্থলের সেটিংস",
@@ -497,27 +963,103 @@
   "SUBJECT": "বিষয়",
   "SUBJECTS": "বিষইয়বস্তু",
   "SUBJECT_OPTION_TEXT": "বিষয় নির্বাচন করুন",
+  "SUBMIT_MY_DETAILS": "বিশদ বিবরণ জমা দিন",
+  "SUCCESSFULLY_ADDED_USER": "\"{{%s}}\" সফলভাবে যোগ করা হয়েছে",
+  "SUCCESSFULLY_SWITCHED_USER": "ওহে {{%user}}",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_PHONE": "সমস্ত বিষয়বস্তু ফোনে স্থানান্তর করা হবে",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_SDCARD": "সমস্ত বিষয়বস্তু SD কার্ডে স্থানান্তর করা হবে",
   "SUPPORT": "সমর্থন",
   "SUPPORT_MESSAGE": "কোন সমস্য? আমাদের একটি বার্তা পাঠান।",
-  "SWITCHING_TO": "পাল্টানো হয়েছে '{{%s}}'",
-  "SWITCH_ACCOUNT": "অ্যাকাউন্ট পরিবরতন করুন\n",
-  "SWITCH_ACCOUNT_CONFIRMATION": "অ্যাকাউন্ট পরিবরতন?",
+  "SWITCH_TO_CLASSIC_THEME": "ক্লাসিক থিমটিতে পরিবর্তন বা স্যুইচ করুন",
+  "SWITCH_TO_JOYFUL_THEME": "আনন্দের থিমে পরিবর্তন বা স্যুইচ করুন",
+  "SWITCH_USER": "ব্যবহারকারী পরিবর্তন",
   "SYLLABUS": "পাঠ্যক্রম",
   "SYNCING_NOW": "এখন সুসংগত হচ্ছে",
   "SYNC_NOW": "এখন সিঙ্ক করুন",
-  "TAKE_ASSESSMENT": "একটি ব্যবহারকারী কে  অন্তত একটি মূল্যায়ন নিতে হবে",
   "TAP_SCAN": "{{%s}} QR Code স্ক্যান করার জন্য ট্যাপ করুন",
+  "TBK_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "শুরু করার জন্য একটি পাঠ্যপুস্তক পছন্দ করুন",
+  "TBK_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "পাঠ্যপুস্তক",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "টেক্সটবুকগুলি",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "পাঠ্যপুস্তক গুলি",
+  "TBK_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}'s লাইব্রেরিতে একটি হোস্ট রয়েছে {{%explainVideos}}, {{%quesBanks}} এবং অন্যান্য {{%interactiveMaterial}}. লাইব্রেরি অন্বেষণ শুরু করতে একটি  পাঠ্যপুস্তকে ক্লিক করুন",
+  "TBK_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}}({{%medium}})। এর জন্য কোনো পুস্তক খুঁজে পাওয়া যায়নি",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "বোর্ড পাঠ্যপুস্তক যুক্ত করছে",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}}? এ আপনার বিষয়ের কোনো পাঠ্যপুস্তক পাওয়া যায়নি",
+  "TBK_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>দ্রষ্টব্য :</span> টেক্সটবুকের ক্ষেত্রে কাজের অগ্রগতি ট্র্যাক করা যায় না",
+  "TBK_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "আপনার  রাজ্যের বোর্ড যখন আপনার অনুরোধ করা বইগুলি {{%s}} এ আপলোড করবে তখন আমরা আপনাকে অবহিত করব",
+  "TBK_NONTRK_QR_CODE_DETAILS": "আপনার পাঠ্যপুস্তক থেকে একটি কিউ আর কোড স্ক্যান করে ডিজিটাল বিষয়বস্তুগুলির তৎক্ষণাৎ অ্যাক্সেস পান।",
+  "TBK_NONTRK_SEE_MORE_BOOKS": "আরো পাঠ্যপুস্তক ও বিষয়বস্তু দেখুন",
+  "TBK_NONTRK_STUDENT_ROLE_DESC_1": "পাঠ্যপুস্তক এবং ডিজিটাল বিষয়বস্তু ব্রাউজ করুন",
+  "TBK_NONTRK_TEACHER_ROLE_DESC_1": "পাঠ্যপুস্তক এবং ডিজিটাল বিষয়বস্তু ব্রাউজ করুন",
+  "TBK_NONTRK_TUTORIAL_HEADING": "ভিডিও, ইন্টারেক্টিভ বিষয়বস্তু, ই-টেক্সটবুক এবং আরও ...",
+  "TBK_TRK_BATCHEND_MAIN_HEADING": "আপনি একটি পাঠ্যপুস্তক পাঠের ব্যাচে যোগদান করেছেন যা {{%s}} এ সমাপ্ত হবে ",
+  "TBK_TRK_BATCHEND_SUB_HEADING": "আপনি শেখা চালিয়ে যেতে পারেন, তবে আপনার অগ্রগতি আপডেট করা হবে না",
+  "TBK_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "আপনি এই অধ্যায়টি সম্পূর্ণ করেছেন",
+  "TBK_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "পাঠ্য পুস্তক সম্পূর্ণ করুন {{%s}} এর মধ্যে",
+  "TBK_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "এই পাঠ্যপুস্তকটি নিষ্ক্রিয়",
+  "TBK_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "পাঠ্যপুস্তক",
+  "TBK_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "আপনি এই পাঠ্যপুস্তক পড়েছেন",
+  "TBK_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "পাঠ্যপুস্তকের জন্য ব্যাচসমূহ ",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "কাজ গুলি",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "আমার পাঠ্যপুস্তক গুলি",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "এ  ব্যাচটি সমাপ্ত হয়েছে\n",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}} তে শেষ আপডেট হয়েছে ",
+  "TBK_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "যোগদান করুন",
+  "TBK_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "সাম্প্রতিকতম পাঠ্যপুস্তক",
+  "TBK_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "কাজটা ছেড়ে দেবেন?",
+  "TBK_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "যোগদান করার জন্য লগ ইন করুন",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_COURSES": "কোনো পাঠ্যপুস্তক নেই",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "বিষয়বস্তু ডাউনলোড করুন",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "পাঠ্যপুস্তকের ({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "পাঠ্যপুস্তকের ({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "অনলাইন শিক্ষণ গ্রহণ করুন",
+  "TBK_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "জনপ্রিয় পাঠ্যপুস্তক",
+  "TBK_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": " অনলাইন শিক্ষণ গ্রহণ করুন",
+  "TBK_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "শংসাপত্র অর্জন করার জন্য {{%s}} এর মধ্যে কাজটি সম্পন্ন করুন ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING": "শিক্ষণের কাজ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "শিক্ষণের কাজ (গুলি)তে উপস্থিত ছিলেন",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "পাঠ্যপুস্তকের বিবরণ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "কাজ সমাপ্ত হয়েছে",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "কাজ সমাপ্ত হওয়ার দিন",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "কাজগুলির বিবরণ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "এই কাজটি এর জন্য প্রাসঙ্গিক:",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "অধ্যায়",
+  "TBK_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "পাঠ্যপুস্তকের ক্রিয়াকলাপ বন্ধ করুন",
+  "TBK_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "পাঠ্যপুস্তক কার্যক্রম চেক করতে চান  ?",
+  "TBK_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "পাঠ্যপুস্তকের ব্যাচ গুলি উপলব্ধ হবে {{batch_start_date}} এর থেকে",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "আপনাকে শংসাপত্র সম্পর্কে আপনার নিবন্ধিত যোগাযোগের ঠিকানায় ৭ দিনের মধ্যে অবহিত করা হবে",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "বিঃ দ্রঃ এই পাঠ্যপুস্তকে কোনো শংসাপত্র নেই",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "আপনি এই পাঠ্যপুস্তক পড়েছেন",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": " বর্তমানে, এই কাজের একটি শংসাপত্র  নেই।  কোর্সের পরিচালক পরে একটি শংসাপত্র সংযুক্ত করতে পারেন।",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "আপনি পাঠ্যপুস্তক পড়া বন্ধ করে দিয়েছেন",
+  "TBK_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "এই পাঠ্যপুস্তকের কাজের জন্য কোন ব্যাচ উপলব্ধ নেই",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "পাঠ্যপুস্তক নথিভুক্ত  ইউজারদের জন্য। পাঠ্যপুস্তক অ্যাকসেস করার জন্য লগ ইন করুন ",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "পাঠ্যপুস্তক পড়ার জন্য লগ ইন করুন ।",
+  "TBK_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "এই কাজের জন্য কোনও ব্যাচ উপলব্ধ নেই",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "কেবলমাত্র নিবন্ধিত ইউজাররা শিক্ষণের কাজগুলি গ্রহণ করতে পারবেন ",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "আপনি এই কাজটি সফলভাবে সম্পূর্ণ করেছেন",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "কাজটি শেষ হয়েছে।  আপনি মূল্যায়নটি আবারও করতে পারেন তবে, আপনার অগ্রগতি রেকর্ড করা হবে না।",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "কাজটি শেষ হয়েছে।  আপনি মূল্যায়ন নিতে পারেন তবে, আপনার অগ্রগতি রেকর্ড করা হবে না।",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "পাঠ্য পুস্তকের বিস্তারিত বিবরণ দেখতে এবং অ্যাক্সেস করতে, আপনাকে অবশ্যই একটি সক্রিয় ব্যাচে যোগদান করতে হবে",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "পাঠ্যপুস্তকের বিবরণ অ্যাকসেস করার জন্য আপনাকে লগ ইন করতে হবে",
+  "TEACHER_ID_ENTER_LABEL": "যাচাইকরণের জন্য আপনার শিক্ষক আইডি দিন",
+  "TEACHER_ID_PLACEHOLDER": "উদাহরণস্বরূপ, ER12345",
+  "TEACHER_ID_VERIFICATION": "শিক্ষক আইডি যাচাইকরণ",
+  "TEACHER_PROFILE_FAILED": "শিক্ষক হিসাবে আপনার প্রোফাইল যাচাই করা যায়নি, আপনার শিক্ষক ইডি টি ভুল",
+  "TEACHER_PROFILE_VERIFIED": "অধ্যাপকের প্রোফাইলটি সফলভাবে যাচাই করা হয়েছে ।",
   "TEACHER_ROLE_DESC_1": "পাঠ্যপুস্তক এবং ডিজিটাল বিষয়বস্তু ব্রাউজ করুন",
   "TEACHER_ROLE_DESC_2": "অনলাইন প্রশিক্ষণ নিন",
   "TEACHER_ROLE_DESC_3": "পাঠ পরিকল্পনা দৃষ্টিগোচর করুন",
+  "TELL_US_MORE": "আরও বলুন ...",
+  "TERMS_OF_USE": "ব্যবহারের শর্তাবলী",
   "TEXTBOOK": "পুস্তক ",
+  "TEXTBOOKS": "পাঠ্যবই",
+  "THANKING_NOTE": "আপনার রাজ্য বোর্ড আপনার অনুরোধকৃত বইগুলি  {{%s}} এ আপলোড করার সাথে সাথে আমরা আপনাকে জানাব। ",
   "THANK_FOR_RATING": "বিষয়বস্তুর মান নির্ধারণ করার জন্য আপনাকে ধন্যবাদ",
+  "THANK_YOU_FOR_SUBMITTING_YOUR_DETAILS": "আপনার বিশদ জমা দেওয়ার জন্য আপনাকে ধন্যবাদ",
   "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "এই প্রশিক্ষণটির জন্য কোনো ব্যাচ নেই ",
   "THIS_IS_A_RESTRICTED_COMMUNITY": "এটি একটি সীমাবদ্ধ সম্প্রদায়",
   "TICKET_SUMMARY": "টিকিটের সারাংশ",
-  "TIME": "সময়",
   "TIME_OUT": "সার্ভার এর সময় শেষ। পরে আবার চেষ্টা করুন",
   "TITLE": "শিরোনাম",
   "TITLE_UPGRADE_POPUP": "আমরা তথ্যসূচীর মধ্যে না পাওয়া অডিও ও ভিডিওগুলির সমস্যা সমাধান করেছি। আরও ভাল অভিজ্ঞতার জন্য, আমরা আপনাকে সুপারিশ করছি দীক্ষা-র সর্বশেষ সংস্করণে আপগ্রেড করতে।",
@@ -526,17 +1068,18 @@
   "TOPICS": "বিষয়",
   "TOPIC_YOU_MIGHT_LIKE": "আগ্রহের বিষয় অন্বেষণ করুন",
   "TOTAL_SIZE": "সর্বমোট আয়তন:",
-  "TOTAL_TIME": "মোট সময়",
   "TO_DO": "করার",
   "TO_EARN_CERTIFICATE": "সার্টিফিকেট উপার্জন করতে হলে {{%s}} এর মধ্যে প্রশিক্ষণ শেষ করুন ",
-  "TRAININGS_ATTENDED": "প্রশিক্ষণে অংশগ্রহণ করেছিলেন",
+  "TRAINING": "কোর্স ",
+  "TRAININGS_ATTENDED": "প্রশিক্ষণে অংশগ্রহণ করেছিলেন।",
   "TRAININGS_ONLY_REGISTERED_USERS": "প্রশিক্ষণ কেবলমাত্র রেজিস্টার্ড ব্যবহারকারীদের জন্য ",
-  "TRAINING_COMPLETED_SUCCESSFULLY": "আপনি সফলভাবে এই প্রশিক্ষণটি শেষ করেছেন",
-  "TRAINING_DETAILS": "প্রশিক্ষণের খুঁটিনাটি ",
+  "TRAINING_COMPLETED_SUCCESSFULLY": "আপনি সফলভাবে এই প্রশিক্ষণটি শেষ করেছেন ।",
+  "TRAINING_DETAILS": "প্রশিক্ষণের বিস্তারিত",
+  "TRAINING_ENDED_REDO_ASSESSMENT": "কোর্সটি সমাপ্ত হয়েছে | আপনি আবার পরীক্ষা দিতে পারেন কিন্তু আপনার উন্নতির কোনো উল্লেখ থাকবে না ",
   "TRAINING_ENDED_START_ASSESSMENT": "প্রশিক্ষণ টি সমাপ্ত হয়েছে। আপনি চাইলে মূল্যায়ন করতে পারেন, তবে আপনার অগ্রগতি রেকর্ড করা হবে না।",
   "TRAINING_ENDS_ON": "প্রশিক্ষণ শেষ হচ্ছে এই দিনে ",
   "TRAINING_END_DATE": "ট্রেনিং এর শেষ তারিখ ",
-  "TRAINING_INFO": "প্রশিক্ষণের তথ্য ",
+  "TRAINING_INFO": "প্রশিক্ষণের তথ্য ।",
   "TRAINING_IS_RELEVANT_TO_TEACHERS": "প্রশিক্ষণটি এই শিক্ষকদের জন্য প্রযোজ্য ",
   "TRAINING_MODULES": "প্রশিক্ষণ উপাদান ",
   "TRANSFERRING_CONTENT_TO_PHONE": "ফোনে বিষয়বস্তু স্থানান্তরিত করা হচ্ছে\n",
@@ -548,61 +1091,134 @@
   "TRY_AGAIN": "পুনরায় চেষ্টা করুন",
   "TRY_BEFORE_RATING": "রেটিং করার আগে বিষয় টি অন্বেষণ করুন\n",
   "TRY_DIFF_QR": "একটি ভিন্ন QR কোড দিয়ে চেষ্টা করুন?",
+  "TUTORIAL_BUTTON": "শুরু করার জন্য একটি পাঠ্যপুস্তক চয়ন করুন",
+  "TUTORIAL_HEADING": "ভিডিও, ইন্টারেক্টিভ বিষয়বস্তু, ই পাঠ্যপুস্তক এবং আরও অনেক কিছু ...",
+  "TVC_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "শুরু করার জন্য একটি টিভি ক্লাস নির্বাচন করুন",
+  "TVC_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "টিভি ক্লাসগুলি",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "টিভি ক্লাসগুলি",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "টিভির ক্লাসগুলি",
+  "TVC_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}'s লাইব্রেরিতে একটি হোস্ট রয়েছে {{%explainVideos}}, {{%quesBanks}} এবং অন্যান্য {{%interactiveMaterial}}. লাইব্রেরি অন্বেষণ শুরু করতে একটি  টিভি ক্লাসে ক্লিক করুন",
+  "TVC_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": " {{%grade}}({{%medium}})-এর জন্য কোনও টিভি ক্লাস  খুঁজে পাওয়া যায়নি",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "বোর্ড টিভি ক্লাস যুক্ত করছে",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}}? এ কোনো টিভি ক্লাস খুঁজে পাওয়া যায়নি?",
+  "TVC_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span> এ টিভি ক্লাসের জন্য অগ্রগতি ট্র্যাক করা যায় না",
+  "TVC_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "আপনার রাজ্যের বোর্ড যখন আপনার অনুরোধ করা টিভি ক্লাসটি {{%s}} এ আপলোড করবে তখন আমরা আপনাকে অবহিত করে দেব",
+  "TVC_NONTRK_QR_CODE_DETAILS": "টিভি ক্লাস থেকে কিউ আর কোড স্ক্যান করে ডিজিটাল বিষয়বস্তু তৎক্ষণাৎ অ্যাকসেস করুন।  ",
+  "TVC_NONTRK_SEE_MORE_BOOKS": "আরও টিভি ক্লাস এবং বিষয়বস্তু  দেখুন",
+  "TVC_NONTRK_STUDENT_ROLE_DESC_1": "টিভি ক্লাস গুলি ও ডিজিটাল বিষয়বস্তুর জন্য ব্রাউজ করুন",
+  "TVC_NONTRK_TEACHER_ROLE_DESC_1": "টিভি ক্লাস ও ডিজিটাল বিষয়বস্তু ব্রাউজ করুন",
+  "TVC_NONTRK_TUTORIAL_HEADING": "ভিডিও, ইন্টারেক্টিভ বিষয়বস্তু, ই-পাঠ্যপুস্তক এবং  আরও ...",
+  "TVC_TRK_BATCHEND_MAIN_HEADING": "আপনি একটি টিভি ক্লাসের ব্যাচে যোগ দিয়েছেন যা  {{%s}} এ সম্পূর্ণ হবে ",
+  "TVC_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "আপনি এই অনুষ্ঠানটি সম্পূর্ণ করেছেন",
+  "TVC_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "টিভি ক্লাসগুলি",
+  "TVC_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "আপনার এই টিভি ক্লাসটি দেখা হয়ে গেছে",
+  "TVC_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "টিভি ক্লাসগুলির জন্য ব্যাচসমূহ ",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "কাজ গুলি",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "আমার টিভি ক্লাস গুলি",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "এই তারিখে ব্যাচটি সমাপ্ত হয়েছে",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "শেষ আপডেট হয়েছে {{last_updated_on_date}} এ",
+  "TVC_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "সাম্প্রতিক  টিভি ক্লাসগুলি",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "টিভি ক্লাস গুলি ({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "টিভি ক্লাসগুলি ({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "জনপ্রিয় টিভি ক্লাসগুলি",
+  "TVC_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "শংসাপত্র অর্জন করার জন্য কাজটি {{%s}} এর মধ্যে সম্পন্ন করুন।",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING": "শিক্ষণের কাজ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "শিক্ষণের কাজ (গুলি) তে উপস্থিত ছিলেন",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "টিভি ক্লাস গুলির বিবরণ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "কাজ সমাপ্ত হয়েছে ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "কাজ সমাপ্ত হওয়ার দিন",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "কাজ গুলির বিবরণ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "এই কাজটি এর জন্য প্রাসঙ্গিক:",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "টিভির অনুষ্ঠান",
+  "TVC_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "টিভি ক্লাস দেখা বন্ধ করুন",
+  "TVC_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "শিক্ষণের টিভি ক্লাস চেক করতে চান?",
+  "TVC_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "{{batch_start_date}} থেকে এই টিভি ক্লাসের ব্যাচটি উপলব্ধ হবে ",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "আপনাকে শংসাপত্র সম্পর্কে ৭ দিনের মধ্যে আপনার নিবন্ধিত যোগাযোগের ঠিকানায় অবহিত করা হবে",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "দ্রষ্টব্য: এই কাজটির জন্য কোনও শংসাপত্র নেই",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "আপনি এই টিভি ক্লাসগুলি দেখেছেন",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": " বর্তমানে, এই কাজের একটি শংসাপত্র  নেই।  কোর্সের পরিচালক পরে একটি শংসাপত্র সংযুক্ত করতে পারেন।",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "আপনি টিভি ক্লাস দেখা বন্ধ করেছেন",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "টিভি ক্লাস গুলি নিবন্ধিত  ইউজারদের জন্য।  টিভি ক্লাস অ্যাক্সেস করতে লগ ইন করুন",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "এই টিভি ক্লাসটি দেখতে লগ ইন করুন",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "কেবলমাত্র নিবন্ধিত  ইউজাররা শিক্ষণের কাজে গ্রহণ করতে পারবেন ",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "আপনি সফলভাবে এই কাজটি সম্পন্ন করেছেন",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "কাজটি শেষ হয়েছে।  আপনি মূল্যায়নটি আবারও করতে পারেন তবে, আপনার অগ্রগতি রেকর্ড করা হবে না।",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "কাজটি শেষ হয়েছে। আপনি মূল্যায়ন নিতে পারেন তবে, আপনার অগ্রগতি রেকর্ড করা হবে না।",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "টিভি ক্লাসগুলি দেখতে এবং অ্যাক্সেস করতে আপনাকে অবশ্যই একটি সক্রিয় ব্যাচে যোগদান করতে হবে",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "টিভি ক্লাসের বিবরণ অ্যাক্সেস করতে হলে আপনাকে অবশ্যই লগ ইন করতে হবে",
   "UNABLE_TO_FETCH_CONTENT": "মুছে ফেলা বিষয় পুনরুদ্ধার  করতে অক্ষম",
-  "UNENROLL_CONFIRMATION_MESSAGE": "কোর্স থেকে তালিকামুক্ত ?",
-  "UNENROLL_FROM_COURSE": "তালিকা মুক্ত",
+  "UNENROLL_CONFIRMATION_MESSAGE": "আপনি একটি সক্রিয় বা আসন্ন ব্যাচে পুনরায় যোগদান করতে পারেন",
+  "UNENROLL_FROM_COURSE": "কোর্স ছেড়ে  দিন",
   "UNIT_COMING_SOON": "শীঘ্রই আসছে!",
   "UNKNOWN_QR": "আপনি একটি অকার্যকরী QR কোড স্ক্যান করেছেন বলে মনে হচ্ছে",
   "UNSELECT_ALL": "নির্বাচন মুক্ত করুন সব",
   "UPDATE": "আপডেট",
   "UPDATE_APP_BTN_ACTION_NO": "পরে আপডেট করুন",
   "UPDATE_APP_BTN_ACTION_YES": "এখন আপডেট করুন",
+  "UPDATE_APP_SUPPORT_TITLE": "আপনি {{app_name}} অ্যাপ্লিকেশনটির একটি পুরানো সংস্করণ ব্যবহার করছেন। এই সামগ্রীটি ব্যবহার করতে আপনার অ্যাপ্লিকেশনটিকে সর্বশেষতম সংস্করণে আপগ্রেড করুন।",
   "UPDATE_APP_TITLE": "অ্যাপ টির নতুন সংস্করণ পাওয়া যায় নি",
   "UPDATE_CONFIRMATION_TEXT": "আপনি কি বিষয়বস্তুটি আপডেট করতে চান?",
   "UPDATE_CONTENT": "({{%s}}) বিষয়বস্তু আপডেট করুন ",
-  "UPDATE_RECOVERY_ID": "রিকভারি একাউন্ট আপডেট করুন ",
+  "UPDATE_DETAILS": "বিস্তারিত আপডেট ",
+  "UPDATE_RECOVERY_ID": "রিকভারি একাউন্ট আপডেট করুন।",
+  "UPDATE_REQUIRED": "আপডেট প্রয়োজন",
+  "UPDATE_YOUR_PREFERENCE_FROM_PROFILE": "আপনি প্রোফাইল সেটিংস থেকে আপনার {{app_name}} প্রোফাইল বিবরণ সম্পাদনা করতে পারেন",
   "UPDATING": "আপডেট করা হচ্ছে",
   "UPDATING_CONTENT": "আপডেট হচ্ছে ... {{%s}}%",
-  "USER": "ব্যাবহারকারী",
   "USERNAME": "ব্যবহারকারীর নাম: {{%s}}",
-  "USERS": "ব্যাবহারকারী",
-  "USERS_AND_GROUPS": "ব্যবহারকারী এবং দল",
   "USER_CREATED_SUCCESSFULLY": "ব্যবহারকারী সফলভাবে তৈরি করা হয়েছে",
-  "USER_DELETE_CONFIRM": "'{{%s}}' মুছে ফেলা নিশ্চিত  করুন ?",
-  "USER_DELETE_CONFIRM_MESSAGE": "এই কর্মটি অপরিবর্তনীয়, একবার মুছে ফেললে ব্যবহারকারীর বিবরণ আর পাওয়া যাবে না",
-  "USER_DELETE_CONFIRM_MESSAGE_FROM_GROUP": "অপসারণ এর জন্য নিশ্চিত করুন {{%s}}'?",
-  "USER_DELETE_CONFIRM_SECOND_MESSAGE": "এই কাজ টি ব্যবহারকারীদের দল থেকে অপসারণ করে দেবে। সকল ব্যবহারকারীর বিবরণ ব্যবহারকারী ট্যাবের অধীনে উপলব্ধ",
   "USER_ID": "ব্যবহারকারীর প্রমানপত্র",
+  "USER_IS_NOT_VERIFIED": "আপনার ব্যবহারকারীর আইডি যাচাই করা হয়নি",
   "USER_NAME": "ব্যবহারকারীর নাম",
   "USER_TYPE": "ব্যবহারকারীর ধরন",
   "USER_TYPE_1": "শিক্ষক",
   "USER_TYPE_2": "ছাত্র",
   "USER_TYPE_3": "অন্যান্য",
+  "USER_TYPE_5": "অভিভাবক",
   "USER_TYPE_SELECT_WARNING": "ব্যবহারকারীর ধরন নির্বাচন করুন",
+  "USER_VERIFICATION": "ব্যবহারকারী যাচাইকরণ",
+  "USE_APP_AS": "{{%s}} হিসাবে ব্যবহার করুন",
+  "VALIDATION_MAXIMUM_LENGTH": "সর্বোচ্চ দৈর্ঘ্য 11 সংখ্যা হওয়া উচিত",
+  "VALIDATION_MINIMUM_LENGTH": "সর্বনিম্ন দৈর্ঘ্য 11 সংখ্যা হওয়া উচিত",
+  "VERIFY": "যাচাই করুন",
   "VERIFY_EMAIL_OTP_DESCRIPTION": "আপনি ইমেইল আইডি যাচাই এর জন্য ওটিপি যুক্ত একটি ইমেইল পাবেন",
   "VERIFY_EMAIL_OTP_TITLE": "ইমেইল আই ডি টি যাচাই করুন",
   "VERIFY_PHONE_OTP_DESCRIPTION": "মোবাইল নম্বর যাচাই  করার জন্যে আপনি  একটি OTP  পাবেন এসএমএস এর মাধ্যমে",
   "VERIFY_PHONE_OTP_TITLE": "মোবাইল নম্বর যাচাই করুন",
   "VERSION": "সংস্করণ",
-  "VIDEOS": "ভিডিও",
+  "VERYFYING_PLEASE_WAIT": "যাচাইকরণ",
+  "VIDEO": "ভিডিও",
   "VIEW": "দৃশ্য",
+  "VIEW_ACTIVITY": "কার্যকলাপ দেখুন",
   "VIEW_ALL": "সব কিছু দেখুন",
   "VIEW_ALL_BATCHES": "এগিয়ে যেতে একটি ব্যাচ নির্বাচন করুন",
   "VIEW_CREDITS_INFO": "অনুজ্ঞাপত্রের  তথ্য দেখুন",
   "VIEW_DOWNLOADS_ONLY_MSG": "শুধুমাত্র ডাউনলোড করা বিষইয়বস্তু দেখুন।",
   "VIEW_MORE": "আরো দেখুন",
   "VIEW_ONGOING_BATCHES": "বর্তমান ব্যাচ গুলি",
+  "VIEW_OPEN_BATCHES": "ব্যাচ ওপেন করুন ",
   "VIEW_RETIRED_BATCHES": "ব্যাচের মেয়াদ শেষ হয়ে গেছে",
   "VIEW_UPCOMING_BATCHES": "আসন্ন ব্যাচ",
   "WAITING_TO_DOWNLOAD": "ডাউনলোড করার জন্য অপেক্ষা করছে ...",
   "WAIT_REQUEST": "পাঠ্যসামগ্রী ",
+  "WANT_TO_CHECK_FREE_TRAININGS": "কোর্সগুলি দেখতে চান? ",
   "WARNING_PLEASE_MAKE_SOME_CHANGES": "পরিবর্তন করা",
+  "WEBVIEW_UPDATE_TEXT": "আরো ভালো কার্যকর অভিজ্ঞতার জন্য গুগল প্লে স্টোর থেকে ওয়েবভিউর সর্বশেষতম সংস্করণটি ডাউনলোড করুন।",
+  "WEEKS_AGO": "{{%s}} সপ্তাহ আগে ",
+  "WEEK_AGO": "{{%s}} সপ্তাহ আগে",
+  "WELCOME": "স্বাগতম",
   "WELCOME_BACK": "পুনরায় স্বাগত {{%s}}",
+  "WHAT_IS_MEMBER_ID": "আমি কোথায় {{app_name}} আইডি দেখতে পারি?",
+  "YEARS_AGO": "{{%s}} বছর আগে",
+  "YEAR_AGO": "{{%s}} বছর আগে",
   "YES": "হ্যাঁ",
+  "YOUR_ID_FROM_STATE_BOARD_ORG": "রাজ্য / বোর্ড / সংগঠন থেকে আপনার আইডি",
+  "YOUR_LOCATION": "তোমার অবস্থান",
   "YOUR_LOCATION_DETAILS": "আপনার অবস্থানের বিশদ বিবরণ আপনাকে প্রাসঙ্গিক বিষয়বস্তু সরবরাহ করতে আমাদের সহায়তা করে। আপনার অবস্থানটি সঠিক কিনা তা পরীক্ষা করুন, অন্যথায় আপনার অবস্থানটি আবার নির্বাচন করুন এবং এটি জমা দিন।",
   "YOUR_PROGRESS": "আপনার অগ্রগতি: {{%s}}%",
   "YOUR_PROGRESS_LABEL": "আপনার প্রগতি ",
   "YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET": "আপনি ইন্টারনেটের সাথে সংযুক্ত নন",
   "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "প্রশিক্ষণের খুঁটিনাটি জানতে হলে আপনাকে অবশ্যই একটি সক্রিয় দলে যোগদান করতে হবে  ",
-  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "প্রশিক্ষণ তথ্য লাভ করতে হলে লগ ইন করুন "
+  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "প্রশিক্ষণ তথ্য লাভ করতে হলে লগ ইন করুন ",
+  "YOU_MUST_LOGIN_TO_ACCESS_QUIZ_CONTENT": "এই বিষয়বস্তুটি অ্যাক্সেস করতে আপনাকে অবশ্যই লগইন করতে হবে"
 }
\ No newline at end of file
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 7904a1f86..3690beb9a 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -8,22 +8,46 @@
   "ACCOUNT_MERGE_FAILED": "Failed to merge account ",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_CONTENT": "Account merge has been successfully initiated. You will be notified once it is complete.",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_HEADING": "Merge Account",
-  "ACCURACY": "Accuracy",
   "ACTIVE": "Active",
   "ACTIVE_DOWNLOADS": "Active Downloads",
+  "ACTIVITIES": "Activities",
+  "ACTIVITIESE_SEARCH_PLACEHOLDER": "Search for group's activities",
+  "ACTIVITY_ALREADY_ADDED_IN_GROUP": "You have added this activity previously for the group",
+  "ACTIVITY_COLLECTION_TITLE": "Collection",
+  "ACTIVITY_COURSE_TITLE": "Courses",
+  "ACTIVITY_EXPLANATION_CONTENT_TITLE": "Explanation content",
+  "ACTIVITY_PRACTICE_QUESTION_SET_TITLE": "Practice question set",
+  "ACTIVITY_PRACTICE_RESOURCE_TITLE": "Practice resource",
+  "ACTIVITY_RESOURCE_TITLE": "Resource",
+  "ACTIVITY_TEXTBOOK_TITLE": "Textbook",
+  "ACTIVITY_TV_EPISODE_TITLE": "TV episode",
   "ADD": "Add",
+  "ADD_ACTIVITY": "Add activity",
+  "ADD_ACTIVITY_ERROR_MSG": "Could not add the activity. Try again later",
+  "ADD_ACTIVITY_SUCCESS_MSG": "Activity added successfully",
+  "ADD_ANOTHER_USER": "Add another user",
   "ADD_DISTRICT": "Add District",
+  "ADD_EDIT_SELF_DECLARED_TEACHER_INFO": "These details may be made available to your declared State to validate and follow progress",
   "ADD_EMAIL": "Add Email Address",
+  "ADD_MEMBER": "Add member",
+  "ADD_MEMBER_CONFIRMATION": "You have to check that the member's name and {{app_name}} ID match, before you proceed",
+  "ADD_MEMBER_POPUP_DESC": "Use the following instructions to guide members to identify their unique {{%s}} ID",
+  "ADD_MEMBER_POPUP_STEP_1": "<span>Step 1</span> : Click Profile tab",
+  "ADD_MEMBER_POPUP_STEP_2": "<span>Step 2</span> : Click share icon to share your {{%s}} ID",
+  "ADD_MEMBER_POPUP_TITLE": "Where can I see the {{%s}} ID?",
   "ADD_PHONE": "Add Mobile Number",
   "ADD_RECOVERY_ACCOUNT": "Add Recovery Account",
   "ADD_RECOVERY_ID": "Add Recovery Account",
   "ADD_STATE": "Add State",
+  "ADD_TO_GROUP": "Add to group",
+  "ADD_TO_GROUP_ACTIVITY": "Add for group",
+  "ADD_USER": "Add user",
   "ADD_USERS": "Add Users",
-  "ADD_USERS_TO_GROUP": "Add {{%s}} Users to Group",
+  "AGREE_TO_SHARE_PROFILE_DETAILS": "I agree to share my profile details with the course administrator in accordance with the",
   "ALL": "All",
   "ALLOW": "Allow",
   "ALL_ANNOUNCEMENTS": "All Announcements",
-  "ALREADY_ENROLLED_COURSE": "You have already joined this training ",
+  "ALREADY_ENROLLED_COURSE": "You have enrolled for this course ",
   "ALWAYS_ON": "Always on",
   "ANDROID_NOT_SUPPORTED": "Android version is not supported",
   "ANDROID_NOT_SUPPORTED_DESC": "This content cannot be opened as your phone is running on a very old version of Android. Based on your device model you may be able to view this content, if you have Crosswalk. ",
@@ -31,6 +55,7 @@
   "ANSWER": "Answer",
   "APPLY": "APPLY",
   "APPLY_FILTER": "APPLY FILTER",
+  "APP_ID": "{{%s}} ID",
   "APP_QR_CODE": "Have a {{%s}} QR Code?",
   "APP_RATING_RATE_EXPERIENCE": "Rate your app experience",
   "APP_RATING_RATE_ON_PLAYSTORE": "Would you like to submit your rating to the Play Store?",
@@ -44,7 +69,7 @@
   "AS_LINK": "As Link",
   "ATTACHMENT_DOWNLOADED": "Attachment downloaded",
   "ATTRIBUTIONS": "Attribution(s)",
-  "AUDIOS": "Audio",
+  "AUDIO": "Audio",
   "AUTHOR": "Author",
   "AUTOMATIC_SYNC": "Automatic Data Sync",
   "AUTO_MIGRATION_FAIL_MESSAGE": "Could not merge the accounts",
@@ -53,28 +78,24 @@
   "AVAILABLE_FILTERS": "Filters",
   "AVAILABLE_FOR_TEACHERS": "Available only for teachers ",
   "AVATAR": "Avatar",
-  "AVERAGE_SCORE": "Average Score",
-  "AVERAGE_TIME": "Average Time",
   "BACK_TO_EXIT": "Exit the app?",
-  "BATCHEND_MAIN_HEADING": "The batch you have joined has completed training on {{%s}}",
-  "BATCHEND_SUB_HEADING": "You may continue the training, but your progress will not be updated",
+  "BATCHEND_MAIN_HEADING": "You have joined the batch of a course that is completed on {{%s}}",
+  "BATCHEND_SUB_HEADING": "You may continue the course, but your progress will not be updated",
   "BATCHES_AVAILABLE": "Batches available",
-  "BATCHES_FOR_THIS_COURSE": "BATCHES FOR THIS TRAINING",
+  "BATCHES_FOR_THIS_COURSE": "Batches for the course",
   "BATCH_CREATED_BY": "Created by",
   "BATCH_DETAILS": "Batch Details",
   "BATCH_ENROLLMENT_ENDED": "Enrolment for this batch is closed",
   "BATCH_EXPIRED": "Batch Concluded",
   "BATCH_EXPIRED_BUTTON": "OK ",
-  "BATCH_EXPIRED_DESCRIPTION": "The batch duration is closed. You may continue to take the training. However, your progress will not be captured or monitored further. ",
   "BOARD": "Board",
   "BOARD_OPTION_TEXT": "Select Board",
+  "BROWES_RELEVANT_CONTENT": "Browse {{app_name}} library to find relevant content based on your preferences (Board, Medium, Class)",
   "BTN_CLICK_TO_OPEN_CONTENT": "Tap to view content",
   "BTN_LATER": "Later",
   "BTN_RATE_ON_PLAYSTORE": "Rate us on Play Store",
   "BTN_SUBMIT": "Submit",
   "BTN_VISIT_HELP_SECTION": "Visit help section",
-  "BY_QUESTIONS": "By Questions",
-  "BY_USERS": "By Users",
   "CAMERA": "Camera",
   "CAMERA_PERMISSION_DESCRIPTION": "{{%s}} uses camera permissions to scan QR codes",
   "CANCEL": "Cancel",
@@ -84,25 +105,34 @@
   "CANCEL_DOWNLOAD": "Cancel Download",
   "CANCEL_DOWNLOAD_MESSAGE": "Cancelling download will remove content from Active Downloads",
   "CANCEL_DOWNLOAD_TITLE": "Cancel Download?",
-  "CERTIFIED_TRAINING": "Certified Training",
+  "CERTIFICATE_ALREADY_DOWNLOADED": "The certificate is already downloaded, please check your Download folder",
+  "CERTIFICATE_DOWNLOADED": "The certificate has been downloaded",
+  "CERTIFICATE_DOWNLOAD_INFO": "Certificate is getting downloaded",
+  "CERTIFIED_TRAINING": "Earn a certificate",
   "CHANGE": "Change",
   "CHANGE_ROLE": "Change Role",
-  "CHANGE_USER": "Change User",
+  "CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "You have finished this module",
+  "CHARACTERS_REMAINING": "{{character_count}} Characters remaining",
   "CHECK_FOR_UPDATES": "Check for Updates",
   "CHOOSE_FROM_FOLLOWING": "Select from the following",
   "CHOOSE_LANGUAGE": "Choose Your Preferred Language",
+  "CHOOSE_USER": "Choose user",
   "CHOOSE_WHERE_TO_SAVE_DATA": "Select where to save the data",
   "CLASS": "Class",
   "CLASSES": "Classes",
   "CLEAR": "Clear",
   "COACH_SCREEN": "Scanning the QR code takes you to the content",
   "COMMUNITIES": "Community",
+  "COMPLETED": "Completed",
   "COMPLETE_ASSESSMENT_TO_EARN_CERTIFICATE": "Complete assessment by {{%s}}",
   "COMPLETE_BY": "Complete by {{%s}}",
-  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "Complete training by {{%s}}",
+  "COMPLETE_CHAPTER_TO_UNLOCK_ACHIEVEMENT": "Complete {{%s}} content to unlock a new achievement",
+  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "Complete course by {{%s}}",
   "CONFIRM": "Confirm",
+  "CONGRATULATIONS": "Congratulations!",
   "CONNECT_TO_INTERNET_SUGGESTION": "Connect to the internet to view the content",
   "CONSIDER_DOWNLOAD": "Consider downloading the content",
+  "CONTENTS": "Contents",
   "CONTENT_ALREADY_EXIST": "The file is already imported. Select a new file",
   "CONTENT_ALREADY_EXISTS": "Content exists in the Destination folder. Move content to destination folder anyway?",
   "CONTENT_COMING_SOON": "We are creating content for this",
@@ -118,6 +148,8 @@
   "CONTENT_IS_BEING_ADDED": "Your state will soon add content for this QR code. It will be available shortly",
   "CONTENT_NOT_AVAILABLE": "Content not available",
   "CONTENT_PLAYER_EXIT_PERMISSION": "Would you like to leave this content?",
+  "CONTENT_PREFERENCE": "Content preference",
+  "CONTENT_PREFERENCE_SELECTION": "Choose content preference",
   "CONTENT_RATING_SUB_HEADING": "Tap on the stars to rate the content",
   "CONTENT_RETIRED_BY_AUTHOR": "This content is removed by the author and hence not available any more",
   "CONTENT_SIZE": "Content size",
@@ -126,51 +158,193 @@
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO_SDCARD": "Content successfully moved to SD card",
   "CONTINUE": "Continue",
   "CONTINUE_AS_ROLE": "Continue as '{{%s}}'",
-  "CONTINUE_NOW": "Continue",
+  "CONTINUE_LEARNING": "Continue Learning",
   "CONTRIBUTIONS": "Contribution(s)",
   "CONTRIBUTORS": "Contributor(s)",
   "COPYRIGHT": "Copyright",
-  "COURSES_BNAV": "Trainings",
-  "COURSES_IN_PROGRESS": "My Trainings",
+  "COURSES": "Courses",
+  "COURSES_BNAV": "Courses",
+  "COURSES_IN_PROGRESS": "My courses",
   "COURSE_COMPLETED_LABEL": "{{%s}}% completed",
-  "COURSE_ENDED": "Training ended on {{%s}}",
+  "COURSE_COMPLETION_POPUP_DESC": "You will be notified on your registered contact details about the course certificate within 7 days",
+  "COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "Note: This course does not have a certificate",
+  "COURSE_ENDED": "Course ended on {{%s}}",
   "COURSE_ENDED_ON": "Course ended on {{%s}}",
-  "COURSE_ENROLLED": "You have joined the training",
-  "COURSE_NOT_AVAILABLE": "This training is inactive",
+  "COURSE_ENROLLED": "You have joined the course",
+  "COURSE_LAST_UPDATED_ON": "Course last updated on {{last_updated_on_date}}",
+  "COURSE_NOT_AVAILABLE": "This course is inactive",
+  "COURSE_NO_CERTIFICATE_MESSAGE": "Currently, this course does not have a certificate. The course creator may attach a certificate later.",
   "COURSE_PROGRESS_COMPLETED": "Completed: {{%s}} %",
-  "COURSE_UNENROLLED": "You have left the training",
+  "COURSE_UNENROLLED": "You have left the course",
   "COURSE_WILL_BE_AVAILABLE": "The batch is available from {{%s}}",
-  "CREATE_GROUP": "Create Group",
-  "CREATE_NEW_GROUP": "Create New Group",
-  "CREATE_NEW_USER": "Create New User",
+  "CREATE_GROUP": "Create group",
+  "CREATE_GROUP_DESCRIPTION": "You are just a step away from creating a group",
+  "CREATE_GROUP_DESCRIPTION_POPUP": "Create a group or be a part of one to connect with people, share activities, review progress and explore other possibilities",
   "CREATE_USER": "Create User",
   "CREATORS": "Created on {{%s}} by",
   "CREDITS": "CREDITS",
   "CREDITS_LICENCE_INFO": "Credits & License Info",
-  "CSV_DOWNLOAD_SUCCESS": "{{%s}} saved in ‘Downloads’",
+  "CRS_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "Choose a course to start",
+  "CRS_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "Course",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "Courses",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "Courses",
+  "CRS_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}'s library has a host of {{%explainVideos}}, {{%quesBanks}} and other {{%interactiveMaterial}}. Click on a course to start exploring the library!",
+  "CRS_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "No courses found for {{%grade}} ({{%medium}})",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "Board is adding courses",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "Could not find a course on {{%s}}?",
+  "CRS_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span> Progress cannot be tracked for the course",
+  "CRS_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "We will notify you when your State board uploads the course requested by you on {{%s}}",
+  "CRS_NONTRK_QR_CODE_DETAILS": "Get instant access to digital content by scanning a QR code from your course.",
+  "CRS_NONTRK_SEE_MORE_BOOKS": "See more courses and content",
+  "CRS_NONTRK_STUDENT_ROLE_DESC_1": "Browse courses and digital content",
+  "CRS_NONTRK_TEACHER_ROLE_DESC_1": "Browse courses and digital content",
+  "CRS_NONTRK_TUTORIAL_HEADING": "Videos, interactive content, eTextbooks and more...",
+  "CRS_TRK_BATCHEND_MAIN_HEADING": "You have joined the batch of a course that is completed on {{%s}}",
+  "CRS_TRK_BATCHEND_SUB_HEADING": "You may continue the course, but your progress will not be updated",
+  "CRS_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "You have finished this module",
+  "CRS_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "Complete course by {{%s}}",
+  "CRS_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "Courses",
+  "CRS_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "You have joined this course",
+  "CRS_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "Batches for the course",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "Courses",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "My courses",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "Course ended on {{%s}}",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "Course last updated on {{last_updated_on_date}}",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_NOT_AVAILABLE": "This course is inactive",
+  "CRS_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "Join course",
+  "CRS_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "Latest courses",
+  "CRS_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "Leave the course?",
+  "CRS_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "Log in to join a course",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_COURSES": "No courses",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "Download content from Courses, or Library",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "Courses ({{%s}})",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "Course ({{%s}})",
+  "CRS_TRK_FRMELEMNTS_LBL_OVERLAY_LABEL_TAKE_COURSE": "Log in to join this course",
+  "CRS_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "Popular Courses",
+  "CRS_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "Take online courses",
+  "CRS_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "Complete course by {{%s}} to earn a certificate",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING": "Course",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "Course(s) attended",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "Course details",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "Course ends on",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "Course end date",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "Course details",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "This course is relevant for:",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "Course modules",
+  "CRS_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "Leave course",
+  "CRS_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "Want to check courses?",
+  "CRS_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "The course's batch is available from {{batch_start_date}}",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "You will be notified on your registered contact details about the course certificate within 7 days",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "Note: This course does not have a certificate",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "You have joined the course",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "Currently, this course does not have a certificate. The course creator may attach a certificate later.",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "You have left the course",
+  "CRS_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "There are no batches for this course",
+  "CRS_TRK_FRMELEMNTS_MSG_OTHER_ROLE_DESC_2": "Take online course",
+  "CRS_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "The course is for registered users. Log in to access the course.",
+  "CRS_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "There are no batches available for this course",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "Only registered users can take courses",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "You have successfully completed this course",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "The course has ended. You may redo the assessment but, your progress will not be recorded.",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "The course has ended. You may take the assessment but, your progress will not be recorded.",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "You must join an active batch to view and access course details",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "You must log in to access course details",
   "CURRENT_LANGUAGE": "Current Language ",
-  "DATA": "See more books and content",
   "DATA_SYNC": "Data Sync",
   "DATA_SYNC_FAILURE": "Could not sync data,  try again later",
   "DATA_SYNC_NOTHING_TO_SYNC": "Nothing to sync",
   "DATA_SYNC_SUB": "Backup Data, Transfer Telemetry",
   "DATA_SYNC_SUCCESSFUL": "Telemetry data sync successful   ",
+  "DAYS_AGO": "{{%s}} days ago",
+  "DAY_AGO": "{{%s}} day ago",
   "DELETE": "Delete",
   "DELETE_ALL_CONTENT_WARNING": "Deleting content will remove selected content(s) from the device",
   "DELETE_CONTENT": "Delete Content?",
   "DELETE_CONTENT_SIZE": "1 item ({{content_size}})",
   "DELETE_CONTENT_WARNING": "Deleting content will remove content from the device",
-  "DELETE_GROUP": "Delete Group",
+  "DELETE_GROUP_DESC": "Deleting {{group_name}} will permanently remove the group from the application",
+  "DELETE_GROUP_ERROR_MSG": "Could not delete the group. Try again later",
+  "DELETE_GROUP_POPUP_TITLE": "Delete group?",
+  "DELETE_GROUP_SUCCESS_MSG": "Group deleted successfully",
   "DELETE_PROGRESS": "Deleting Selected Content",
-  "DESCRIPTION": "Description",
+  "DETAIL_TUTORIAL": "{{%appName}}'s library has a host of {{%explainVideos}}, {{%quesBanks}} and other {{%interactiveMaterial}}. Click on a textbook to start exploring the library!",
   "DEVICE_ID": "Device ID",
   "DEVICE_LOCATION": "Device Location",
   "DEVICE_TAGS": "Device Tags",
   "DEVICE_TAGS_SUB": "Add or remove device tags",
+  "DFLT_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "Choose a task to start",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "Task",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "Tasks",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "Tasks",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}'s library has a host of {{%explainVideos}}, {{%quesBanks}} and other {{%interactiveMaterial}}. Click on a content to start exploring the library!",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "No tasks found for {{%grade}} ({{%medium}})",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "Board is adding content",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "Could not find content on {{%s}}?",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span> Progress cannot be tracked",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "We will notify you when your State board uploads the content requested by you on {{%s}}",
+  "DFLT_NONTRK_QR_CODE_DETAILS": "Get instant access to digital content by scanning a QR code",
+  "DFLT_NONTRK_SEE_MORE_BOOKS": "See more",
+  "DFLT_NONTRK_STUDENT_ROLE_DESC_1": "Browse for digital content",
+  "DFLT_NONTRK_TEACHER_ROLE_DESC_1": "Browse for digital content",
+  "DFLT_NONTRK_TUTORIAL_HEADING": "Videos, interactive content, eTextbooks and more...",
+  "DFLT_TRK_BATCHEND_MAIN_HEADING": "You have joined the batch of a learning task that is completed on {{%s}}",
+  "DFLT_TRK_BATCHEND_SUB_HEADING": "You may continue learning, but your progress will not be updated",
+  "DFLT_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "You have finished this learning activity",
+  "DFLT_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "Complete learning by {{%s}}",
+  "DFLT_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "This learning task is inactive",
+  "DFLT_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "Learning tasks",
+  "DFLT_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "You have joined this learning task",
+  "DFLT_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "Batches for the learning task",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "Learning tasks",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "My learning tasks",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "Task ended on {{%s}}",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "Last updated on {{last_updated_on_date}}",
+  "DFLT_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "Join",
+  "DFLT_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "Latest learning tasks",
+  "DFLT_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "Leave the task?",
+  "DFLT_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "Log in to join",
+  "DFLT_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "Download content",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "Tasks ({{%s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "Task ({{%s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "Take online learning",
+  "DFLT_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "Popular Tasks",
+  "DFLT_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "Take online learning",
+  "DFLT_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "Complete task by {{%s}} to earn a certificate",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING": "Learning task",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "Learning task(s) attended",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "Task details",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "Task ends on",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "Task end date",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "Task details",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "This task is relevant for:",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "Task resources",
+  "DFLT_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "Leave task",
+  "DFLT_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "Want to check learning tasks?",
+  "DFLT_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "The task's batch is available from {{batch_start_date}}",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "You will be notified on your registered contact details about the certificate within 7 days",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "Note: This task does not have a certificate",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "You have joined the task",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "Currently, this task does not have a certificate. The creator may attach a certificate later",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "You have left the task",
+  "DFLT_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "There are no batches for this learning task",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "The task is for registered users. Log in to access the task",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "Log in to start this task",
+  "DFLT_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "There are no batches available for this task",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "Only registered users can take up learning tasks",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "You have successfully completed this task",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "The task has ended. You may redo the assessment but, your progress will not be recorded.",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "The task has ended. You may take the assessment but, your progress will not be recorded.",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "You must join an active batch to view and access task details",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "You must log in to access task details",
   "DISMISS": "CANCEL",
+  "DISMISS_AS_GROUP_ADMIN": "Dismiss as group admin",
+  "DISMISS_AS_GROUP_ADMIN_ERROR_MSG": "Could not dismiss {{member_name}} as group admin ",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_DESC": "Dismissing {{member_name}} as group admin removes admin permissions from the member",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_TITLE": "Dismiss as group admin?",
+  "DISMISS_AS_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} is no longer the group admin",
   "DISTRICT": "District",
   "DISTRICT_OPTION_TEXT": "Select district",
-  "DOCS": "Documents",
+  "DOC": "Documents",
   "DOWNLOAD": "Download",
   "DOWNLOADING": "DOWNLOADING {{%s}} %",
   "DOWNLOADING_1": "Downloading {{%s}}",
@@ -194,7 +368,6 @@
   "DOWNLOAD_PATH": "File is stored in the Internal storage > Download folder",
   "EDIT": "Edit",
   "EDIT_EMAIL_POPUP_TITLE": "Edit Email Address",
-  "EDIT_GROUP": "Edit Group",
   "EDIT_PERSONAL_DETAILS": "Edit personal details",
   "EDIT_PHONE_POPUP_TITLE": "Edit Mobile Number",
   "EDIT_PROFILE": "Edit profile",
@@ -204,14 +377,22 @@
   "EMAIL_UPDATE_SUCCESS": "Email updated successfully",
   "EMPTY_LIBRARY_TEXTBOOK_FILTER": "No books found for {{%grade}} ({{%medium}})",
   "EMPTY_SEARCH_RESULTS": "No results found",
+  "EMPTY_SEARCH_RESULT_GROUPS": "Sorry! there are no results to match your search",
   "ENDORSE": "Endorse",
   "ENJOYED_THIS_CONTENT": "Enjoyed this content?",
   "ENROLL": "Join",
-  "ENROLLMENT_ENDED_ON": "Enrollment ended on {{%s}}",
+  "ENROLLMENT_ENDED_ON": "Enrolments for this batch closed on {{%s}}",
   "ENROLLMENT_LAST_DATE": "Last date for joining: ",
   "ENTER_GROUP_NAME": "Enter group name",
+  "ENTER_ID": "Enter ID",
+  "ENTER_ID_AS_REQUESTED_BY_STATE_BOARD_ORG": "ID as requested by your State, Board or Org",
+  "ENTER_LOCATION_FROM_PROFILE_PAGE": "Enter location from the Profile page",
+  "ENTER_MEMBER_ID": "Enter {{app_name}} ID",
   "ENTER_OTP": "Enter OTP",
   "ENTER_PHONE_POPUP_TITLE": "Enter Mobile Number",
+  "ENTER_SCHOOL_NAME": "Enter school name",
+  "ENTER_THE_FOLLOWING_INFORMATION": "Enter the following information",
+  "ENTER_UDISE_ID": "Enter UDISE ID",
   "ERROR_BATCH_NOT_STARTED": "Batch not started",
   "ERROR_CANT_OPEN_EMPTY_CONTENT": "Cannot open blank file",
   "ERROR_CONTENT_NOT_AVAILABLE": "Content unavailable",
@@ -224,21 +405,32 @@
   "ERROR_FAILED_TO_DOWNLOAD_ATTACHMENT": "Failed to download attachment",
   "ERROR_FETCHING_DATA": "Unable to fetch data ",
   "ERROR_LOW_MEMORY": "Not enough space available for transfer",
+  "ERROR_MAXIMUM_ACTIVITY_COUNT_EXCEEDS": "You have exceeded the maximum number of activities that can be added for the group",
+  "ERROR_MAXIMUM_GROUP_COUNT_EXCEEDS": "You have exceeded the maximum number of groups that can be created",
+  "ERROR_MAXIMUM_MEMBER_COUNT_EXCEEDS": "You have exceeded the maximum number of members that can be added to the group",
   "ERROR_NAME_INVALID": "Enter only alphabets or space for a name ",
-  "ERROR_NO_BATCHES_FOUND": "There are no batches for this training",
+  "ERROR_NO_BATCHES_FOUND": "There are no batches for this course",
   "ERROR_NO_INTERNET_MESSAGE": "No internet access",
   "ERROR_NO_OFFLINE_RESOURCE": "No resources stored ",
   "ERROR_OFFLINE_MODE": "No internet, Offline mode",
   "ERROR_OTP": "Incorrect OTP. Number of attempts remaining : {{%s}}",
+  "ERROR_OTP_LIMIT_EXCEEDED": "You have exceeded the maximum OTP limit, try again later",
   "ERROR_PHONE_EXISTS": "This mobile number is already registered. Try with a different mobile number",
   "ERROR_PHONE_INVALID": "Enter a valid mobile number",
+  "ERROR_PHONE_REQUIRED": "Mobile number is required",
   "ERROR_SAME_EMAIL_UPDATED": "This email address is already linked to your profile. Enter another email address",
   "ERROR_SAME_PHONE_UPDATED": "This mobile number is already linked to your profile. Enter another mobile number",
   "ERROR_SERVER_CONNECTION": "Unable to connect to server",
+  "ERROR_SPECIAL_CHARECTERS_NOT_ALLOWED": "Special characters are not allowed",
   "ERROR_TECHNICAL_PROBLEM": "We encountred a technical problem and were unable to process the request",
   "ERROR_UPLOADING_IMG": "Error while uploading image",
   "ERROR_USER_ACCOUNT_BLOCKED": "User account is blocked. Contact your administrator for details",
+  "ERROR_WHILE_ADDING_USER": "Error while adding user",
+  "ERROR_WHILE_FETCHING_USERS": "Error while fetching users",
   "ERROR_WHILE_LOGIN": "Error while logging in",
+  "ERROR_WHILE_SWITCHING_USER": "Error while switching user",
+  "EXPLORE_HEADING": "Explore more on {{%s}}",
+  "EXP_VIDEOS": "Explanation videos",
   "EXTRACTING_CONTENT": "Extracting content {{%s}}",
   "FEEDBACK_HINT": "Feedback (optional)",
   "FEEDBACK_HINT_1": "Add a comment here",
@@ -253,23 +445,176 @@
   "FILTER": "Filter",
   "FILTER_ADDED": "Added",
   "FILTER_BY": "FILTER BY",
-  "FIRST_NAME": "NAME",
   "FOLLOW": "Follow",
   "FORCE_UPDATE_MESSAGE": "You are using an older version of the {{%s}} app. To get the latest version from Google Playstore, tap Update Now ",
+  "FOR_SUPPORT": "For {{%s}} support",
   "FREE_SPACE": "Free Space :",
+  "FRMELEMENTS_BTN_ACTIVATEGRP": "Activate",
+  "FRMELEMENTS_BTN_ADD": "Add",
+  "FRMELEMENTS_BTN_BACK": "Back",
+  "FRMELEMENTS_BTN_DEACTIVATEGRP": "Deactivate",
+  "FRMELEMENTS_BTN_NEXT": "Next",
+  "FRMELEMENTS_LBL_ACTIVATEGRP": "Activate group",
+  "FRMELEMENTS_LBL_ACTIVATEGRPQUES": "Activate group?",
+  "FRMELEMENTS_LBL_CONTENT_TYPE": "Content type",
+  "FRMELEMENTS_LBL_DEACTIVATEGRP": "Deactivate group",
+  "FRMELEMENTS_LBL_DEACTIVATEGRPQUES": "Deactivate group?",
+  "FRMELEMENTS_LBL_REMARKS": "Remarks",
+  "FRMELEMENTS_MSG_ACTIVATEGRPFAILED": "Could not activate group, try again later",
+  "FRMELEMENTS_MSG_ACTIVATEGRPSUCCESS": "Activated group successfully",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPFAILED": "Could not deactivate group, try again later",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPMSG": "Deactivating the group removes your access. You cannot add activities or members to the group. You also cannot track member progress",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPSUCCESS": "Group deactivated successfully",
+  "FRMELEMNTS_BTN_CLOSE": "Close",
+  "FRMELEMNTS_BTN_DONOT_SHARE": "Do not share",
+  "FRMELEMNTS_BTN_EDIT_SETTING": "Edit settings",
+  "FRMELEMNTS_BTN_PREVIEW_FORM": "Preview the form",
+  "FRMELEMNTS_BTN_SAVE": "Save",
+  "FRMELEMNTS_BTN_SAVE_EDITS": "Save edits",
+  "FRMELEMNTS_BTN_SAVE_FORM": "Save the form",
+  "FRMELEMNTS_BTN_SEEK_HELP": "Seek help",
+  "FRMELEMNTS_BTN_SUBMIT_FORM": "Submit the form",
+  "FRMELEMNTS_BTN_VIEW_DETAILS": "View details",
+  "FRMELEMNTS_CKBX_CERTMSG": "Do not show this message again",
+  "FRMELEMNTS_LBL_ACCESSIBILITY": "Screen reader access",
+  "FRMELEMNTS_LBL_ACCESSIBILITYMODE": "Switch to dark mode",
+  "FRMELEMNTS_LBL_ACCESSIBILITYSKIP": "Skip to main content",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXT": "Site map",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXTSIZE": "Increase font size",
+  "FRMELEMNTS_LBL_ADD_ATTACHMENTS": "Add attachment",
+  "FRMELEMNTS_LBL_ADD_ENTITY": "Add entity",
+  "FRMELEMNTS_LBL_ADD_NEW_TASK": "Add new task",
+  "FRMELEMNTS_LBL_ADD_REMARKS": "Add remarks",
+  "FRMELEMNTS_LBL_ADD_SUBTASK": "Add subtask",
+  "FRMELEMNTS_LBL_ADD_SUBTASK_PALCEHOLDER": "Add subtask name",
+  "FRMELEMNTS_LBL_ADD_TASK": "Add task",
+  "FRMELEMNTS_LBL_ASSIGNED_TO": "Assigned to",
+  "FRMELEMNTS_LBL_ASSIGN_TASK": "Assign task",
+  "FRMELEMNTS_LBL_ATTACH": "Attach",
+  "FRMELEMNTS_LBL_ATTACHMENTS": "Attachments",
+  "FRMELEMNTS_LBL_BLOCK": "Block",
+  "FRMELEMNTS_LBL_CATEGORIES": "Category",
+  "FRMELEMNTS_LBL_CATEGORY_OVERVIEW": "Category overview",
+  "FRMELEMNTS_LBL_CLICK_HELP": "Click the <b>Seek Help</b> button",
+  "FRMELEMNTS_LBL_CLICK_HERE_TO_VIEW_LIBRARY": "Click here to view library",
+  "FRMELEMNTS_LBL_CLUSTER": "Cluster",
+  "FRMELEMNTS_LBL_CONSENT_POPUP_INFO": "You can edit these details from your profile page",
+  "FRMELEMNTS_LBL_CONTENT_AVAIALABLE_IN_OTHER_BOARD": "Other boards may have interesting content to suit your need!",
+  "FRMELEMNTS_LBL_CONTENT_FOUND": "We've found content to match your need!",
+  "FRMELEMNTS_LBL_CONTENT_TO_BE_ADDED": "Your board is yet to add more content",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT": "Couldn't find your content? Click on either button below",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT_YET": "Couldn't find your content as yet?",
+  "FRMELEMNTS_LBL_CRITERIA_WISE": "Criteria",
+  "FRMELEMNTS_LBL_DATA_SETTINGS": "Profile data sharing",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF": "Profile data sharing is off",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF_INFO": "You have not agreed to share your profile details with the course administrator",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON": "Profile data sharing is on",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON_INFO": "You have agreed to share your profile details with the course administrator",
+  "FRMELEMNTS_LBL_DELETE_CONFIRMATION": "Are you sure you want to delete your subtask?",
+  "FRMELEMNTS_LBL_DONOT_SHARE_PROFILE_INFO": "Do not share my profile details",
+  "FRMELEMNTS_LBL_DURATION": "Duration",
+  "FRMELEMNTS_LBL_EMAIL_ID_PLACEHOLDER": "Email address of State or Org",
+  "FRMELEMNTS_LBL_END_DATE": "End date",
+  "FRMELEMNTS_LBL_FILES": "Files",
+  "FRMELEMNTS_LBL_IMAGES": "Images",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS_DESC": "View project reports",
+  "FRMELEMNTS_LBL_IN_PROGRESS": "In progress",
+  "FRMELEMNTS_LBL_LEARNER_PASSBOOK": "Learner passbook",
+  "FRMELEMNTS_LBL_LEARNING_RESOURCES": "Learning resources",
+  "FRMELEMNTS_LBL_LINK_LEARNING_RESOURCES": "Link learning resources",
+  "FRMELEMNTS_LBL_MEDIA_TYPE": "Media type",
+  "FRMELEMNTS_LBL_MOBILE_NUMBER_PLACEHOLDER": "Mobile number for State or Org",
+  "FRMELEMNTS_LBL_MY_LEARNINGS": "My learning",
+  "FRMELEMNTS_LBL_NEW_TASK": "New task",
+  "FRMELEMNTS_LBL_NO_MATCHING_CONTENT": "No matching content found ",
+  "FRMELEMNTS_LBL_OBJECTIVE": "Objective",
+  "FRMELEMNTS_LBL_OBSERVATION": "Observation",
+  "FRMELEMNTS_LBL_OBSERVATION_DESC": "Access and record your classroom and school observations easily, and plan your improvement journeys",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS": "Observation reports",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS_DEC": "View observation reports",
+  "FRMELEMNTS_LBL_OPEN_BATCH_NOT_RECOMMENDED": "If you have completed the course in an earlier batch, we recommend that you do not join the course. Your learning history and certificates will be reset. ",
+  "FRMELEMNTS_LBL_PERSONA": "Role",
+  "FRMELEMNTS_LBL_PROFCONF": "Confirm profile name",
+  "FRMELEMNTS_LBL_PROFTITLE": "Profile name",
+  "FRMELEMNTS_LBL_PROGRAM_NAME": "Program name",
+  "FRMELEMNTS_LBL_PROJECT": "Project",
+  "FRMELEMNTS_LBL_PROJECT_OVERVIEW": "Project overview",
+  "FRMELEMNTS_LBL_PROJECT_STATUS": "Project status",
+  "FRMELEMNTS_LBL_PROJECT_TITLE": "Project title",
+  "FRMELEMNTS_LBL_PROJECT_VIEW": "Project view",
+  "FRMELEMNTS_LBL_QUESTION_WISE": "Questions",
+  "FRMELEMNTS_LBL_RELEVANT_CONTENT_SUB_HEADING": "Fill in details to find specific content",
+  "FRMELEMNTS_LBL_REPORTS": "Reports",
+  "FRMELEMNTS_LBL_REQUEST_CONTENT": "Request content",
+  "FRMELEMNTS_LBL_SCHOOL": "School",
+  "FRMELEMNTS_LBL_SELECT_CATEGORIES": "Select category(s)",
+  "FRMELEMNTS_LBL_SELECT_PROGRAM": "Select program",
+  "FRMELEMNTS_LBL_SET_DATE": "Set date",
+  "FRMELEMNTS_LBL_SET_DATE_HINT": "Set a timeline for your project",
+  "FRMELEMNTS_LBL_SHARE_PROFILE_INFORMATION": "Share my profile details",
+  "FRMELEMNTS_LBL_START_DATE": "Start date",
+  "FRMELEMNTS_LBL_STATUS": "Status",
+  "FRMELEMNTS_LBL_SUBPERSONA": "Sub-role",
+  "FRMELEMNTS_LBL_SUBTASKS": "Subtasks",
+  "FRMELEMNTS_LBL_SURVEY": "Survey",
+  "FRMELEMNTS_LBL_SURVEY_ACTION": "Survey actions",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS": "Survey reports",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS_DESC": "View survey reports",
+  "FRMELEMNTS_LBL_TAB_HOME": "Home",
+  "FRMELEMNTS_LBL_TASK_OVERVIEW": "Task overview",
+  "FRMELEMNTS_LBL_THIS_MONTH": "This month",
+  "FRMELEMNTS_LBL_TOTAL_TASKS": "Total tasks",
+  "FRMELEMNTS_LBL_UPCOMING": "Upcoming",
+  "FRMELEMNTS_LBL_UPDATE_DATA_SETTINGS": "Update settings",
+  "FRMELEMNTS_LBL_USERTYPE_LEADER": "School head OR Officials",
+  "FRMELEMNTS_LBL_VIEW_ENTITY_REPORT": "View entity report",
+  "FRMELEMNTS_LBL_VIEW_FULL_REPORT": "View full report",
+  "FRMELEMNTS_LBL_VIEW_RESOURCES": "View resources",
+  "FRMELEMNTS_MSG_BATCH_ALREADY_CLOSED": "Enrolments for this batch closed on {endDate}",
+  "FRMELEMNTS_MSG_CONSENT_DECLARATION_INFO": "You can edit details from your Profile page",
+  "FRMELEMNTS_MSG_DATA_SETTINGS_SUBMITED_SUCCESSFULLY": "Your data settings submitted successfully",
+  "FRMELEMNTS_MSG_DELETE_TASK_CONFIRMATION": "Are you sure you want to delete the task?",
+  "FRMELEMNTS_MSG_EDITCERTNAME": "You may edit it from your profile page.",
+  "FRMELEMNTS_MSG_LOAD_FROM_LIBRARY": "Load from library",
+  "FRMELEMNTS_MSG_NAMEONCERT": "This name will be printed on your course certificate. Check if it is correct.",
+  "FRMELEMNTS_MSG_SELECT_IMAGE_SOURCE": "Select image source",
+  "FRMELEMNTS_MSG_SELFDECLARATION_SUCCESS_INFO": "You can edit this information from your profile",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED": "Attached successfully ",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_SYNCED": "The project is synced successfully",
+  "FRMELEMNTS_MSG_TICKET_SUBMISSION_SUCCESS": "Thanks for your feedback. We may not be able to respond to every suggestion sent to us, but your feedback is valuable. It helps make {{app_name}} better for everyone.",
+  "FRMELEMNTS_MSG_UNABLE_TO_ENROLL": "You could not leave the batch now. Try again later",
+  "FRMELEMNTS_MSG_UPDATED_SUCCESSFULLY": "Updated successfully",
+  "FRMELEMNTS_MSG_USER_CREATION_LIMIT_EXCEEDED": "You have exceeded the number of users that you can manage under your profile",
+  "FRMELEMNTS_MSG_USE_CAMERA": "Use camera",
+  "FRMELEMNTS_MSG_USE_FILE": "Use file",
+  "FRMELEMNTS_MSG_YOUR_CHANGES_ARE_SAVED": "Your changes are saved successfully.",
+  "FRMELENTS_LBL_ACCESSIBILITYNORMALMODE": "Switch to light mode",
+  "FRMELMNTS_IMSG_LASTATTMPALRT": "This is the last remaining attempt",
+  "FRMELMNTS_IMSG_LASTATTMPTEXCD": "You have exceeded the maximum number of attempts to submit the assessment",
+  "FRMELMNTS_LBL_ACCESSIBILITYFNTDFLT": "Reset to default",
+  "FRMELMNTS_LBL_ACCESSIBILITYFONT": "Decrease font size",
+  "FRMELMNTS_LBL_BESTSCORE": "Best score {{SCORE}}",
+  "FRMELMNTS_LBL_NOTIFNUMBER": "{{NUMBER}} new notification(s)",
+  "FRMELMNTS_LBL_SEELESS": "See less",
+  "FRMELMNTS_LBL_SEEMORE": "See more",
+  "FRMELMNTS_SCTTL_NOTIFHEADER": "Notifications",
   "FROM": "From",
   "FULL_NAME": "Name",
+  "GET_STARTED": "Get started",
   "GOT_IT": "Got it",
+  "GO_TO_DOWNLOADS": "Go to Downloads",
+  "GO_TO_PROFILE": "Go to profile",
   "GRADE_OPTION_TEXT": "Select Class",
   "GRANT_ACCESS": "Grant Access",
-  "GROUPS": "Groups",
-  "GROUPS_YOU_FOLLOW": "Groups you follow",
-  "GROUP_CREATE_SUCCESS": "Group created successfully",
-  "GROUP_DELETE_CONFIRM": "Confirm Delete of '{{%s}}'?",
-  "GROUP_DELETE_CONFIRM_MESSAGE": "This action will delete the Group but not the users. Users can be found under 'Users' tab",
-  "GROUP_MEMBER_ADD_SUCCESS": "Members added successfully",
-  "GROUP_MEMBER_DELETE_SUCCESS": "Group members deleted successfully",
-  "GROUP_NAME": "Group Name",
+  "GROUP_CREATED": "Group created successfully",
+  "GROUP_CREATED_BY": "Created by {{group_creator_name}}",
+  "GROUP_DESCRIPTION": "Group description",
+  "GROUP_DESCRIPTION_PLACEHOLDER": "Enter a description to help members understand the purpose of the group",
+  "GROUP_GUIDELINES": "Group guidelines",
+  "GROUP_MEMBER_SEARCH_PLACEHOLDER": "Search within group",
+  "GROUP_NAME": "Group name",
+  "GROUP_NAME_IS_REQUIRED": "You have to enter the group name",
+  "GROUP_TERMS_IS_REQUIRED": "You have to agree to {{app_name}}'s group guidelines before you proceed",
   "GROUP_UPDATE_SUCCESS": "Group details updated successfully",
   "HABIT_REMINDER_NOTIFICATION_MESSAGE": "Learn something new on {{%s}} today!",
   "HELP": "Help",
@@ -278,7 +623,9 @@
   "HIDE_CREDITS_INFO": "Hide licensing information",
   "HINT_LANGUAGE": "Select preferred language",
   "HOBBIES": "Hobbies",
-  "IAM_ABOVE_18_YEARS_AGE": "I am above 18 years of age",
+  "HOURS_AGO": "{{%s}} hours ago",
+  "HOUR_AGO": "{{%s}} hour ago",
+  "ID_IS_REQUIRED": "ID is required",
   "IMPORTING": "Importing...",
   "IMPORTING_COUNT": "Importing",
   "IMPORT_ECAR": "Incompatible file format. You can only import .ecar , .epar and .gsa files",
@@ -287,60 +634,97 @@
   "INACTIVE": "Inactive",
   "INCORRECT_TEACHER_ID_ERROR": "You have entered an incorrect ID. Enter the ID again",
   "INSTALL_CROSSWALK": "Install Crosswalk",
+  "INSTANCE_TERMS_OF_USE": "{{app_name}} Terms of Use",
   "INSUFFICIENT_STORAGE": "Insufficient storage space",
   "INTERACTION": "Interactive",
+  "INTERACTIVE_MATERIAL": "Interactive study material",
   "INTERNAL_MEMORY": "Internal storage",
   "INTERNET_AVAILABLE": "You are online now",
   "INTERNET_CONNECTIVITY_NEEDED": "No internet connectivity",
   "INVALID_CONTENT": "Invalid content",
   "INVALID_FORMAT": "Invalid format",
+  "INVALID_MEMBER_ID": "You have entered a invalid {{app_name}} ID",
   "INVALID_QR": "Invalid QR code",
   "ITEMS": "{{%s}} file(s)",
   "ITEMS_SELECTED": "files selected",
+  "I_AGREE_TO": "I agree to {{app_name}}'s",
   "I_AGREE_TO_TNC": "I agree to the terms and conditions of use",
-  "JOIN_TRAINING": "Join Training",
+  "I_AM_A_PERSONA_WITH_TENANT": "I am a {{%persona}} with {{%tenant}}",
+  "I_UNDERSTAND_AND_ACCEPT": "I understand and accept the",
+  "JOIN_TRAINING": "Join course",
   "LANGUAGE": "Language",
   "LANGUAGE_SETTINGS": "Language Settings",
-  "LAST_DATE_TO_JOIN": "Last Date To Join {{%s}}",
+  "LAST_DATE_TO_JOIN": "Last date to join {{%s}}",
   "LAST_SYNC": "Last synced on ",
+  "LAST_UPDATED": "Last updated {{%s}}",
   "LAST_VIEWED": "Last viewed",
-  "LATEST_COURSES": "Latest Trainings",
-  "LEAVE_TRAINING_HEADING": "Leave the Training?",
+  "LATEST_COURSES": "Latest courses",
+  "LEAVE_GROUP": "Leave group",
+  "LEAVE_GROUP_ERROR_MSG": "Could not leave the group. Try again later",
+  "LEAVE_GROUP_POPUP_DESC": "This action cannot be undone. Do you want to leave {{group_name}}?",
+  "LEAVE_GROUP_POPUP_TITLE": "Leave group?",
+  "LEAVE_GROUP_SUCCESS_MSG": "You are no longer part of this group",
+  "LEAVE_TRAINING_HEADING": "Leave the course?",
   "LIBRARY_BNAV": "Library",
   "LICENSE": "License terms",
   "LOAD": "Load",
+  "LOADER_PROGRESS_DESCRIPTION": "We are getting things ready",
+  "LOADER_PROGRESS_DESC_SUB_HEADING": "Please wait...",
   "LOADING_CONTENT": "Loading content",
   "LOADING_CONTENTS": "Loading content {{%s}} %",
-  "LOADING_USER_LIST": "Loading user list, please wait",
   "LOAD_FILE": "Load File",
-  "LOGGED_IN_AS": "Logged In As",
-  "LOGGED_OUT": "Logged out",
-  "LOGIN_TO_JOIN_TRAINING": "Log in to join training",
+  "LOGGED_IN_MEMBER": "{{member_name}} (You)",
+  "LOGIN_TO_CREATE_GROUP_DESCRIPTION": "The first step towards creating your own group, study circle or classroom is to log in",
+  "LOGIN_TO_JOIN_TRAINING": "Log in to join a course",
   "LOGOUT": "Log out",
   "LOW_BANDWIDTH": "Low Bandwidth",
   "LOW_BANDWIDTH_DETECTED": "Low bandwidth network detected",
-  "MARKS": "Marks",
+  "MAINTENANCE_MESSAGE": "We're currently down for maintenance. But don't worry, we'll be back in {{%timeLeft}} hours. Come back soon!",
+  "MAINTENANCE_SUB_TEXT": "You may still access the content you have downloaded ",
+  "MAKE_ADMIN": "Make admin",
+  "MAKE_GROUP_ADMIN_ERROR_MSG": "Could not make {{member_name}} as the group admin",
+  "MAKE_GROUP_ADMIN_POPUP_DESC": "This action will give {{member_name}} group admin permissions",
+  "MAKE_GROUP_ADMIN_POPUP_TITLE": "Make group admin?",
+  "MAKE_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} is now the group admin",
   "MEDIUM": "Medium",
   "MEDIUM_OF_INSTRUCTION": "Medium of instruction",
   "MEDIUM_OPTION_TEXT": "Select Medium",
+  "MEMBERS": "Members",
+  "MEMBER_ADDED_TO_GROUP": "Member added to group successfully",
+  "MEMBER_ALREADY_EXISTS_IN_GROUP": "This member is already a part of the group.",
+  "MEMBER_ID": "{{app_name}} ID",
+  "MENU_DELETE_GROUP": "Delete group",
+  "MENU_DISMISS_AS_GROUP_ADMIN": "Dismiss as group admin",
+  "MENU_EDIT_GROUP_DETAILS": "Edit group details",
+  "MENU_LEAVE_GROUP": "Leave group",
+  "MENU_MAKE_GROUP_ADMIN": "Make group admin",
+  "MENU_REMOVE_ACTIVITY": "Remove activity",
+  "MENU_REMOVE_FROM_GROUP": "Remove from group",
   "MERGE_ACCOUNT": "Merge Account",
   "MICROPHONE": "Microphone",
   "MICROPHONE_PERMISSION_DESCRIPTION": "{{%s}} uses microphone permissions only in content that allows you to record your voice.",
+  "MINUTES_AGO": "{{%s}} minutes ago",
+  "MINUTE_AGO": "{{%s}} minute ago",
+  "MONTHS_AGO": "{{%s}} months ago",
+  "MONTH_AGO": "{{%s}} month ago",
   "MORE": "More",
   "MORE_CONTENT": "Find more books and content on {{%s}} ",
+  "MORE_COUNT": "More ({{%s}})",
   "MORE_DETAILS": "More details  (provide more information or attach a screenshot of the issue)",
   "MOVE": "Move",
   "MOVE_FILES_TO_OTHER_DESTINATION": "To free space, move files to {{%s}} ",
   "MSG_ALREADY_IMPORTED": "Already Imported",
   "MSG_IMPORTED_SUCCESSFULLY": "Content imported successfully",
-  "MSG_LOADING_BATCHES": "Fetching batches...",
   "MSG_NO_DETAILS_TO_SHOW": "Details unavailable",
   "MSG_NO_NEW_NOTIFICATION": "No new notification",
   "MSG_RESOURCE_DELETED": "Content deleted from device",
   "MULTIPLE_LICENSE": "License terms {{%s}}",
   "MY_BADGES": "My Badge(s)",
+  "MY_DETAILS": "My details",
+  "MY_GROUPS": "My groups",
   "NAME": "NAME",
   "NAME_HINT": "Enter name",
+  "NAME_IS_REQUIRED": "You have to enter the user name",
   "NEED_INTERNET_FOR_DEEPLINK_CONTENT": "You are offline. Connect to the Internet to access the content",
   "NEED_INTERNET_TO_CHANGE": "Turn on WiFi or mobile data and try again",
   "NEW": "New",
@@ -348,36 +732,32 @@
   "NEXT": "Next",
   "NIL": "Nil",
   "NO": "No",
+  "NOTE": "Note",
   "NOTIFICATION": "Notification",
   "NOT_AVAILABLE": "Not available",
   "NOT_NOW": "Not Now",
   "NO_APP_FOR_INTENT": "No app is available to open the file",
-  "NO_ASSESSMENT": "No assessment available",
   "NO_BATCHES_AVAILABLE": "No batches available",
   "NO_BOOKS_AVAILABLE": "Board is adding books",
-  "NO_BOOKS_DEFINITION": "Your board is yet to add more books. Tap the button to see more books and content on {{%s}}",
+  "NO_BOOKS_DEFINITION": "Your board has to add more books. To request for content on {{%s}}, click the <b>See more books and content</b> button",
+  "NO_BOOKS_TEXT": "Couldn't find your subject textbook on {{%s}}?",
   "NO_CONTENTS": "No {{%s}} ",
   "NO_CONTENTS_FOUND": "Could not find content",
   "NO_CONTENTS_MESSAGE": "Select another content type ",
+  "NO_CONTENT_AVAILABLE_IN_MODULE": "There is no content available in this module",
+  "NO_COURSES": "No courses",
   "NO_DATA_FOUND": "No data found",
-  "NO_DESCRIPTION": "Description not available",
   "NO_DOWNLOADS": "No downloads yet",
-  "NO_DOWNLOADS_INFO": "Download content from Trainings or Library",
+  "NO_DOWNLOADS_INFO": "Download content from Courses, or Library",
   "NO_FILTERS_SELECTED": "No filters selected",
-  "NO_GROUPS_CREATED_YET": "No groups created yet",
-  "NO_GROUP_MESSAGE": "Groups help to organize the user better. You can also use groups to monitor better progress overall",
   "NO_INTERNET": "No internet access",
   "NO_INTERNET_TITLE": "You are offline",
   "NO_PREVIEW": "Preview unavailable",
   "NO_QR_CODE": "I don't have a QR Code ",
   "NO_QR_CODE_QSTN": "Don't have a QR Code?",
   "NO_RATING": "Not yet rated",
-  "NO_USERS": "No users",
-  "NO_USERS_CREATED_YET": "No users created yet",
-  "NO_USERS_CREATED_YET_MSG": "You can create guest user accounts for your students or other teachers",
-  "NO_USERS_IN_THIS_GROUP": "No users in this group",
-  "NO_USERS_ON_THIS_DEVICE": "No users on this device",
-  "NO_USERS_SUGGESTION_MESSAGE": "A group must have at least one user ",
+  "NUMBER_OF_COURSES": "Courses ({{%s}})",
+  "NUMBER_OF_COURSE_1": "Course ({{%s}})",
   "NUMBER_OF_VOTES": "Number of votes",
   "OFF": "Off",
   "OFFLINE_DOWNLOAD_MESSAGE": "Downloads will resume automatically when there is internet connectivity",
@@ -385,6 +765,8 @@
   "OFFLINE_WARNING_ETBUI": "Connect to the internet to view the content",
   "OFFLINE_WARNING_ETBUI_1": "Connect to the internet to view the content",
   "OKAY": "OK",
+  "ONGOING": "Ongoing",
+  "ONLY_DIGIT_NUMBER_IS_ALLOWED": "Only 11 digit number is allowed",
   "ONLY_DOWNLOADED_CONTENT_CAN_BE_PLAYED_OFFLINE": "Only downloaded content can be played offline",
   "OPEN": "OPEN",
   "OPEN_SETTINGS": "OPEN SETTINGS",
@@ -394,16 +776,15 @@
   "ORIGINAL_CONTENT": "Content",
   "ORIGINAL_CONTENT_DATA": "This content is derived from:",
   "OTHER_ROLE_DESC_1": "Browse digital content",
-  "OTHER_ROLE_DESC_2": "Take online training",
-  "OTHER_USERS": "Other Users",
+  "OTHER_ROLE_DESC_2": "Take online course",
   "OTP_FAILED": "Failed to validate OTP. Try again later.",
   "OTP_PLACEHOLDER": "Enter OTP",
   "OTP_RESENT": "OTP resent",
   "OVERLAY_INFO_TEXT_COMMON": "Login to access all the features ",
-  "OVERLAY_INFO_TEXT_TAKE_COURSE": "Training is for registered users. Log in to access the training.",
+  "OVERLAY_INFO_TEXT_TAKE_COURSE": "The course is for registered users. Log in to access the course.",
   "OVERLAY_LABEL_COMMON": "Get unlimited access to {{%s}}.",
   "OVERLAY_LABEL_HOME": "Your Personalized Home Tab",
-  "OVERLAY_LABEL_TAKE_COURSE": "Log in to join this training",
+  "OVERLAY_LABEL_TAKE_COURSE": "Log in to join this course",
   "OVERLAY_SIGN_IN": "LOGIN",
   "OVER_WIFI": "Over Wifi",
   "PEOPLE_WHO_FOLLOW_YOU": "Followers",
@@ -418,32 +799,39 @@
   "PHONE_EDIT_SUCCESS": "Mobile number updated successfully",
   "PHONE_PLACEHOLDER": "Mobile Number",
   "PHONE_UPDATE_SUCCESS": "Mobile number updated successfully",
+  "PLANNED_MAINTENANCE_TEXT": "We're currently down for maintenance. But don't worry, we'll be back soon",
+  "PLANNED_MAINTENANCE_TEXT_WITH_TIME": "We're currently down for maintenance. But don't worry, we'll back in",
   "PLAY": "PLAY",
   "PLAY_AS": "Play As",
   "PLAY_FROM_DEVICE": "Play From Device",
   "PLAY_ONLINE": "Play online",
   "PLEASE_DOWNLOAD_TO_PLAY": "Download content to play",
+  "PLEASE_ENTER": "Enter {{%s}}",
+  "PLEASE_PROVIDE_FOLLOWING_DETAILS": "Please provide the following details",
   "PLEASE_SELECT": "Select {{%s}}",
   "PLEASE_SELECT_A_LANGUAGE": "Select a language",
-  "PLEASE_SELECT_USER": "Select a user",
-  "POPULAR_COURSES": "Popular Trainings",
+  "PLEASE_VALIDATE_YOUR_EMAIL_ADDRESS": "Validate your email address",
+  "PLEASE_VALIDATE_YOUR_MOBILE_NUMBER": "Validate your mobile number",
+  "POPULAR_COURSES": "Popular Courses",
+  "POWER_OF_GROUPS": "Have you explored the potential of groups yet?",
+  "PREFERENCES_CAN_BE_UPDATED": "You can edit this user's details from the Profile page",
   "PREVIEWS": "PREVIEWS",
   "PREVIOUS_USER_SETTINGS": "Continue with previous user settings?",
   "PRINT": "Print",
-  "PRIVATE": "Private",
+  "PRIVACY_POLICY": "Privacy Policy",
   "PROFILE_BNAV": "Profile",
   "PROFILE_DETAILS_TITLE": "Profile Details",
   "PROFILE_UPDATE_FAILED": "Updating profile failed, try again later",
   "PROFILE_UPDATE_SUCCESS": "Profile updated successfully",
+  "PROGRESS_CANNOT_BE_TRACKED": "Progress cannot be tracked for {{collectionType}}",
   "PROVIDE_BELOW_INFO": "Provide information below",
   "PUBLIC": "Public",
   "PUBLISHED_BY": "Published on {{%s}} by",
   "PUBLISHED_DATE": "Published date",
+  "PUBLISHER": "Publisher",
   "QR_CODE_DETAILS": "Get instant access to digital content by scanning a QR code from your textbook.",
   "QR_SHOWING_MULTIPLE_BOOK_RESULT": "Showing {{%s}} results for",
-  "QUESTION": "Question",
-  "QUESTIONS": "Questions",
-  "QUESTION_MARKS": "Question (Marks)",
+  "QUES_BANKS": "Question banks",
   "QUIZ": "QUIZ",
   "QUIZ_CONTENTS_ONLY_REGISTERED_USERS": "The quiz is only for registered users",
   "RATE": "Rate",
@@ -452,7 +840,7 @@
   "RATING_QUESTION": "Would you like to tell us more?",
   "READ_LESS": "Read Less",
   "READ_MORE": "Read More",
-  "RECENTLY_VIEWED": "Recently Viewed",
+  "RECOMMENDATION_BASED_ON_PROFILE": "Recommendations based on your profile details",
   "RECOMMENDED": "Recommended",
   "RECOVERY_ACCOUNT_UPDATE_SUCCESS": "Recovery account updated successfully",
   "RECOVERY_ID_DESCRIPTION": "A recovery account helps you to regain access if you are locked out. Choose your recovery account type and enter details:",
@@ -460,39 +848,54 @@
   "REDO_ASSESSMENT": "Redo Assessment",
   "REGISTER_TO_COMPLETE_ACCESS": "Register to get complete access to the content",
   "REMOVE": "Delete",
+  "REMOVE_ACTIVITY": "Remove",
+  "REMOVE_ACTIVITY_ERROR_MSG": "Could not remove the activity. Try again later",
+  "REMOVE_ACTIVITY_GROUP_DESC": "Removing the activity takes it off from the group activity and you can no longer check member's progress on it",
+  "REMOVE_ACTIVITY_POPUP_TITLE": "Remove activity?",
+  "REMOVE_ACTIVITY_SUCCESS_MSG": "Activity removed for the group successfully",
   "REMOVE_FROM_DEVICE": "Delete Content from Device",
   "REMOVE_FROM_DEVICE_MSG": "Are you sure you want to delete this content from the device?",
-  "REMOVE_MULTIPLE_USERS_FROM_GROUP": "Confirm Removal of {{%s}} Users",
-  "REMOVE_USERS": "Remove Users",
-  "REMOVE_USERS_FROM_GROUP": "Remove {{%s}} Users from Group",
-  "REPORTS": "Reports",
+  "REMOVE_MEMBER": "Remove member",
+  "REMOVE_MEMBER_ERROR_MSG": "Could not remove member from the group. Try again later",
+  "REMOVE_MEMBER_GROUP_DESC": "Removing {{member_name}} permanently removes him/her from the group",
+  "REMOVE_MEMBER_POPUP_TITLE": "Remove member?",
+  "REMOVE_MEMBER_SUCCESS_MSG": "{{member_name}} is no longer part of the group",
+  "REQUEST_CONTENT": "Let us know here",
   "RESEND_OTP": "Resend OTP",
+  "RESET": "Reset",
   "RESOURCE_TYPE": "Resource Type",
-  "RESULT": "Result",
+  "RESPONSE_ACKNOWLEGED": "Thank you, for your response!",
   "RESULTS": "Results",
   "RESUME": "RESUME",
   "RETRY": "Retry",
   "RETRY_ACTION": "Try again",
-  "ROLE_SELECTOR_QUERY": "You are a",
+  "ROLE_SELECTOR_QUERY": "Discover content as a ",
   "SAVE": "Save",
   "SAVED_ON": "Saved on",
-  "SAVED_RESOURCES": "Saved Resources",
   "SAVE_FILE_ON_DEVICE": "Save file on device",
   "SCAN_QR_CODE": "Scan QR Code",
   "SCAN_QR_INSTRUCTION": "Point your phone to the QR code to scan it",
   "SCAN_TAP": "Scan QR code",
-  "SCORE": "Score",
-  "SCORED": "Scored",
+  "SCHOOL_OR_ORG_NAME": "School/Organization name",
+  "SCHOOL_UDISE_ID_OR_ORG_ID": "School UDISE ID/ Org ID",
   "SD_CARD": "SD Card",
+  "SEARCH_FOR_GROUP_MEMBER": "Search for group member",
   "SEARCH_HINT": "Search",
   "SEARCH_PLACEHOLDER": "Type text to search for content. e.g. 'Story'",
   "SEARCH_TO_FIND_CONTENT": "Search {{%s}} to find content",
+  "SECONDS_AGO": "{{%s}} seconds ago",
+  "SECOND_AGO": "{{%s}} second ago",
   "SEE_ALL_RESULTS_FOR": "See all results for \"{{%s}}\"",
+  "SEE_MORE_BOOKS": "See more books and content",
+  "SEE_MORE_CONTENT": "See more content",
   "SELECT": "Select",
   "SELECTED_TOPICS": "Selected Topics",
+  "SELECT_ACTIVITY": "Select activity",
   "SELECT_ALL": "Select All",
-  "SELECT_CHAPTER": "Select chapter",
+  "SELECT_CHAPTER": "Select module",
   "SELECT_YOUR_STATE": "Select your State",
+  "SELF_DECLARED_INFO": "Self declared info",
+  "SELF_DECLARE_TEACHER_TNC": "I agree to share these details with the Administrators of {{%appName}} as per the",
   "SEND_FILE": "Send file",
   "SERVER_CONNECTION_ERROR": "Unable to connect to server",
   "SETTINGS": "Settings",
@@ -501,21 +904,20 @@
   "SHARE_APP_LINK": "Get {{app_name}} app from: {{play_store_url}}",
   "SHARE_CONTENT_FAILED": "Unable to share content",
   "SHARE_CONTENT_FILE": "File sent from: {{app_name}}\nName: {{content_name}} \nGet {{app_name}} app from: {{play_store_url}}",
-  "SHARE_CONTENT_LINK": "See {{content_name}} on {{app_name}} at {{content_link}}\nGet {{app_name}} app from: {{play_store_url}}",
+  "SHARE_CONTENT_LINK": "I find {{content_name}} really interesting and helpful on {{app_name}}. {{content_link}}\n\n\nFor more such interesting content, download the {{app_name}} mobile app \n\n\n{{play_store_url}}",
   "SHARE_LINK": "Share link",
   "SHARE_TELEMETRY": "Share Telemetry",
   "SHARE_TELEMETRY_FAILED": "Unable to share telemetry",
   "SHARE_TELEMETRY_NO_DATA_FOUND": "No telemetry data found",
   "SHARE_THIS": "Share",
+  "SHARE_USERNAME": "Hi! You have received {{user_name}}’s {{app_name}} ID: {{diksha_id}}",
   "SHOW": "Show",
   "SHOWING_ITEMS": "Showing {{%s}} items",
   "SHOWING_RESULTS_FOR": "Showing {{%count}} results for '{{%query}}'",
   "SHOW_LESS": "Show Less",
   "SHOW_MORE": "Show More",
-  "SHOW_RECENT": "Showing {{%s}} files",
-  "SIGNED_OUT_ACCOUNT_MESSAGE": "You will be logged out from your currently logged in account",
   "SIGNIN_TO_USE_FEATURE": "Login to use this feature",
-  "SIGN_IN": "LOGIN",
+  "SIGN_IN": "Login",
   "SIZE": "Size: {{%s}}",
   "SKIP": "Skip",
   "SOMETHING_WENT_WRONG": "Due to a technical problem, we are unable to process the request",
@@ -523,10 +925,13 @@
   "SPACE_AVAILABLE_ON_SDCARD": "Space available on SD Card:",
   "SPACE_TAKEN": "Space taken by {{%s}}",
   "SPACE_TAKEN_BY_APP": "Space used by {{%s}} content: ",
+  "SPECIAL_CHARACTERS_NOT_SUPPORTED": "This field does not allow you to enter special characters ",
   "START": "Start",
+  "START_AGAIN": "Start again",
   "START_ASSESSMENT": "Start assessment",
   "START_COURSE": "START",
   "START_COURSE_NOW": "Start Now",
+  "START_LEARNING": "Start learning",
   "STAR_RATINGS": "Rating",
   "STATE": "State",
   "STATE_OPTION_TEXT": "Select State",
@@ -538,34 +943,105 @@
   "SUBJECT": "Subject",
   "SUBJECTS": "Subjects",
   "SUBJECT_OPTION_TEXT": "Select Subject",
+  "SUBMIT_MY_DETAILS": "Submit details",
+  "SUCCESSFULLY_ADDED_USER": "Successfully added \"{{%s}}\"",
+  "SUCCESSFULLY_SWITCHED_USER": "Hi \"{{%user}}\"",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_PHONE": "All content will be moved to phone storage",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_SDCARD": "All content will be moved to SD Card",
   "SUPPORT": "Support",
   "SUPPORT_MESSAGE": "Facing any problems? Send us a message",
-  "SWITCHING_TO": "Switched to '{{%s}}'",
-  "SWITCH_ACCOUNT": "SWITCH ACCOUNT",
-  "SWITCH_ACCOUNT_CONFIRMATION": "Switch accounts?",
+  "SWITCH_TO_CLASSIC_THEME": "Switch to classic theme",
+  "SWITCH_TO_JOYFUL_THEME": "Switch to joyful theme",
+  "SWITCH_TO_DARK_MODE": "Switch to dark mode",
+  "SWITCH_TO_DEFAULT":"Switch to default",
+  "SWITCH_USER": "Change user",
   "SYLLABUS": "Syllabus",
   "SYNCING_NOW": "Syncing Now",
   "SYNC_NOW": "Sync Now",
-  "TAKE_ASSESSMENT": "A user needs to take at least one assessment",
   "TAP_SCAN": "Tap to scan {{%s}} QR Code",
+  "TBK_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "Choose a textbook to start",
+  "TBK_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "Textbook",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "Textbooks",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "Textbooks",
+  "TBK_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}'s library has a host of {{%explainVideos}}, {{%quesBanks}} and other {{%interactiveMaterial}}. Click on a textbook to start exploring the library!",
+  "TBK_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "No books found for {{%grade}} ({{%medium}})",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "Board is adding books",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "Couldn't find your subject textbook on {{%s}}?",
+  "TBK_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span> Progress cannot be tracked for textbooks",
+  "TBK_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "We will notify you when your State board uploads the books requested by you on {{%s}}",
+  "TBK_NONTRK_QR_CODE_DETAILS": "Get instant access to digital content by scanning a QR code from your textbook",
+  "TBK_NONTRK_SEE_MORE_BOOKS": "See more books and content",
+  "TBK_NONTRK_STUDENT_ROLE_DESC_1": "Browse textbooks and digital content",
+  "TBK_NONTRK_TEACHER_ROLE_DESC_1": "Browse textbooks and digital content",
+  "TBK_NONTRK_TUTORIAL_HEADING": "Videos, interactive content, eTextbooks and more...",
+  "TBK_TRK_BATCHEND_MAIN_HEADING": "You have joined the batch of a textbook reading that is completed on {{%s}}",
+  "TBK_TRK_BATCHEND_SUB_HEADING": "You may continue learning, but your progress will not be updated",
+  "TBK_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "You have finished this chapter",
+  "TBK_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "Complete textbook by {{%s}}",
+  "TBK_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "This textbook is inactive",
+  "TBK_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "Textbook",
+  "TBK_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "You have read this textbook",
+  "TBK_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "Batches for the textbook",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "Tasks",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "My textbooks",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "The batch ended on",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "Last updated on {{last_updated_on_date}}",
+  "TBK_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "Join",
+  "TBK_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "Latest textbooks",
+  "TBK_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "Leave the task?",
+  "TBK_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "Log in to join",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_COURSES": "No textbooks",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "Download content",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "Textbooks ({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "Textbook ({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "Take online learning",
+  "TBK_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "Popular Textbooks",
+  "TBK_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "Take online learning",
+  "TBK_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "Complete task by {{%s}} to earn a certificate",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING": "Learning task",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "Learning task(s) attended",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "Textbook details",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "Task ends on",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "Task end date",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "Task details",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "This task is relevant for:",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "Chapter",
+  "TBK_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "Stop textbook activity",
+  "TBK_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "Want to check textbook activities?",
+  "TBK_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "The textbook's batch is available from {{batch_start_date}}",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "You will be notified on your registered contact details about the certificate within 7 days",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "Note: This textbook does not have a certificate",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "You have read this textbook",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "Currently, this task does not have a certificate. The creator may attach a certificate later.",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "You have stopped reading the textbook",
+  "TBK_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "There are no batches for this textbook task",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "The textbook is for registered users. Log in to access the textbook",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "Log in to read this textbook",
+  "TBK_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "There are no batches available for this task",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "Only registered users can take up learning tasks",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "You have successfully completed this task",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "The task has ended. You may redo the assessment but, your progress will not be recorded.",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "The task has ended. You may take the assessment but, your progress will not be recorded.",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "You must join an active batch to view and access textbook details",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "You must log in to access textbook details",
   "TEACHER_ID_ENTER_LABEL": "Enter your teacher ID for verification",
   "TEACHER_ID_PLACEHOLDER": "For example, ER12345",
   "TEACHER_ID_VERIFICATION": "Teacher ID Verification",
   "TEACHER_PROFILE_FAILED": "Could not verify your profile as teacher ID entered is incorrect",
   "TEACHER_PROFILE_VERIFIED": "Teacher profile verified successfully",
   "TEACHER_ROLE_DESC_1": "Browse textbooks and digital content",
-  "TEACHER_ROLE_DESC_2": "Take online training",
+  "TEACHER_ROLE_DESC_2": "Take online courses",
   "TEACHER_ROLE_DESC_3": "Discover lesson plans",
   "TELL_US_MORE": "Tell us more...",
   "TERMS_OF_USE": "Terms of Use",
   "TEXTBOOK": "Textbooks",
+  "TEXTBOOKS": "Textbooks",
+  "THANKING_NOTE": "We will notify you when your State board uploads the books requested by you on {{%s}}",
   "THANK_FOR_RATING": "Thank you for rating the content!",
-  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "There are no batches available for this training",
+  "THANK_YOU_FOR_SUBMITTING_YOUR_DETAILS": "Thank you for submitting your details",
+  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "There are no batches available for this course",
   "THIS_IS_A_RESTRICTED_COMMUNITY": "This is a restricted community",
   "TICKET_SUMMARY": "Ticket summary",
-  "TIME": "Time",
   "TIME_OUT": "Server timed out. Try again later",
   "TITLE": "Title",
   "TITLE_UPGRADE_POPUP": "We have corrected problems faced for missing images and audio within the content. For a better experience, we recommend that you upgrade to the latest version of DIKSHA.",
@@ -574,21 +1050,20 @@
   "TOPICS": "Topics",
   "TOPIC_YOU_MIGHT_LIKE": "Explore topics of interest",
   "TOTAL_SIZE": "Total Size : ",
-  "TOTAL_TIME": "Total Time",
   "TO_DO": "To Do",
-  "TO_EARN_CERTIFICATE": "Complete training by {{%s}} to earn a certificate",
-  "TRAINING": "Training",
-  "TRAININGS_ATTENDED": "Training(s) Attended",
-  "TRAININGS_ONLY_REGISTERED_USERS": "Trainings are only for registered users",
-  "TRAINING_COMPLETED_SUCCESSFULLY": "You have successfully completed this training",
-  "TRAINING_DETAILS": "Training Details",
-  "TRAINING_ENDED_REDO_ASSESSMENT": "The training has ended. You may redo the assessment but, your progress will not be recorded.",
-  "TRAINING_ENDED_START_ASSESSMENT": "The training has ended. You may take the assessment but, your progress will not be recorded.",
-  "TRAINING_ENDS_ON": "Training ends on",
-  "TRAINING_END_DATE": "Training end date",
-  "TRAINING_INFO": "Training Information",
-  "TRAINING_IS_RELEVANT_TO_TEACHERS": "Training is relevant to teachers of",
-  "TRAINING_MODULES": "Training Modules",
+  "TO_EARN_CERTIFICATE": "Complete course by {{%s}} to earn a certificate",
+  "TRAINING": "Course",
+  "TRAININGS_ATTENDED": "Course(s) attended",
+  "TRAININGS_ONLY_REGISTERED_USERS": "Only registered users can take courses ",
+  "TRAINING_COMPLETED_SUCCESSFULLY": "You have successfully completed this course",
+  "TRAINING_DETAILS": "Course details",
+  "TRAINING_ENDED_REDO_ASSESSMENT": "The course has ended. You may redo the assessment but, your progress will not be recorded.",
+  "TRAINING_ENDED_START_ASSESSMENT": "The course has ended. You may take the assessment but, your progress will not be recorded.",
+  "TRAINING_ENDS_ON": "Course ends on",
+  "TRAINING_END_DATE": "Course end date",
+  "TRAINING_INFO": "Course details",
+  "TRAINING_IS_RELEVANT_TO_TEACHERS": "This course is relevant for: ",
+  "TRAINING_MODULES": "Course modules",
   "TRANSFERRING_CONTENT_TO_PHONE": "Moving content to phone",
   "TRANSFERRING_CONTENT_TO_SDCARD": "Moving content to SD card",
   "TRANSFERRING_FILES": "Moving files",
@@ -598,9 +1073,64 @@
   "TRY_AGAIN": "TRY AGAIN",
   "TRY_BEFORE_RATING": "Please try the content before rating it.",
   "TRY_DIFF_QR": "Try a different QR code?",
+  "TUTORIAL_BUTTON": "Choose a textbook to start",
+  "TUTORIAL_HEADING": "Videos, interactive content, eTextbooks and more...",
+  "TVC_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "Choose a TV class to start",
+  "TVC_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "TV Classes",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "TV classes",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "TV classes",
+  "TVC_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}'s library has a host of {{%explainVideos}}, {{%quesBanks}} and other {{%interactiveMaterial}}. Click on a TV class to start exploring the library!",
+  "TVC_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "No TV classes found for {{%grade}} ({{%medium}})",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "Board is adding TV classes",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "Could not find TV classes on {{%s}}?",
+  "TVC_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span> Progress cannot be tracked for the TV class",
+  "TVC_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "We will notify you when your State board uploads the TV class requested by you on {{%s}}",
+  "TVC_NONTRK_QR_CODE_DETAILS": "Get instant access to digital content by scanning a QR code from your TV class.",
+  "TVC_NONTRK_SEE_MORE_BOOKS": "See more TV classes and content",
+  "TVC_NONTRK_STUDENT_ROLE_DESC_1": "Browse TV classes and digital content",
+  "TVC_NONTRK_TEACHER_ROLE_DESC_1": "Browse TV classes and digital content",
+  "TVC_NONTRK_TUTORIAL_HEADING": "Videos, interactive content, eTextbooks and more...",
+  "TVC_TRK_BATCHEND_MAIN_HEADING": "You have joined the batch of a TV class that is completed on {{%s}}",
+  "TVC_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "You have finished this program",
+  "TVC_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "TV Classes",
+  "TVC_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "You have watched this TV classes",
+  "TVC_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "Batches for the TV classes",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "Tasks",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "My TV Classes",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "The batch ended on",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "Last updated on {{last_updated_on_date}}",
+  "TVC_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "Latest TV classes",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "TV Classes ({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "TV Classes ({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "Popular TV Classes",
+  "TVC_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "Complete task by {{%s}} to earn a certificate",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING": "Learning task",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "Learning task(s) attended",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "TV Class details",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "Task ends on",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "Task end date",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "Task details",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "This task is relevant for:",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "TV Program",
+  "TVC_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "Stop watching TV class",
+  "TVC_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "Want to check learning TV classes?",
+  "TVC_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "The TVClass's batch is available from {{batch_start_date}}",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "You will be notified on your registered contact details about the certificate within 7 days",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "Note: This task does not have a certificate",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "You have watched this TV classes",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "Currently, this task does not have a certificate. The creator may attach a certificate later.",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "You have stopped watching the TV class",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "TV classes are for registered users. Log in to access the TV class",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "Log in to watch this TV class",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "Only registered users can take up learning tasks",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "You have successfully completed this task",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "The task has ended. You may redo the assessment but, your progress will not be recorded.",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "The task has ended. You may take the assessment but, your progress will not be recorded.",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "You must join an active batch to view and access TV classes",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "You must log in to access TV class details",
   "UNABLE_TO_FETCH_CONTENT": "Unable to fetch retired content",
   "UNENROLL_CONFIRMATION_MESSAGE": "You can rejoin an active or upcoming batch later",
-  "UNENROLL_FROM_COURSE": "Leave Training",
+  "UNENROLL_FROM_COURSE": "Leave course",
   "UNIT_COMING_SOON": "Coming soon!",
   "UNKNOWN_QR": "You seem to have scanned an invalid QR code",
   "UNSELECT_ALL": "Unselect All",
@@ -611,19 +1141,14 @@
   "UPDATE_APP_TITLE": "New version of the App is available!",
   "UPDATE_CONFIRMATION_TEXT": "Update Content?",
   "UPDATE_CONTENT": "Update Content ({{%s}})",
+  "UPDATE_DETAILS": "Update details",
   "UPDATE_RECOVERY_ID": "Update recovery account",
   "UPDATE_REQUIRED": "Update required",
+  "UPDATE_YOUR_PREFERENCE_FROM_PROFILE": "You can edit your {{app_name}} profile details from the Profile setting",
   "UPDATING": "Updating",
   "UPDATING_CONTENT": "Updating... {{%s}} %",
-  "USER": "User",
   "USERNAME": "User name: {{%s}}",
-  "USERS": "Users",
-  "USERS_AND_GROUPS": "Users and Groups",
   "USER_CREATED_SUCCESSFULLY": "User created successfully",
-  "USER_DELETE_CONFIRM": "Confirm Delete of '{{%s}}'?",
-  "USER_DELETE_CONFIRM_MESSAGE": "This action is irreversible, once deleted the user details will not be accessible",
-  "USER_DELETE_CONFIRM_MESSAGE_FROM_GROUP": "Confirm removal of '{{%s}}'?",
-  "USER_DELETE_CONFIRM_SECOND_MESSAGE": "This action removes users from the Group. All User details are available under Users Tab",
   "USER_ID": "User ID",
   "USER_IS_NOT_VERIFIED": "Your user ID is not verified",
   "USER_NAME": "User Name",
@@ -631,36 +1156,304 @@
   "USER_TYPE_1": "Teacher",
   "USER_TYPE_2": "Student",
   "USER_TYPE_3": "Other",
+  "USER_TYPE_5": "Parent",
   "USER_TYPE_SELECT_WARNING": "Choose user type",
   "USER_VERIFICATION": "User Verification",
+  "USE_APP_AS": "Use {{%s}} as",
+  "VALIDATION_MAXIMUM_LENGTH": "Maximum length should be 11 numbers",
+  "VALIDATION_MINIMUM_LENGTH": "Minimum length should be 11 numbers",
+  "VERIFY": "Verify",
   "VERIFY_EMAIL_OTP_DESCRIPTION": "You will receive an email with the OTP for email address verification",
   "VERIFY_EMAIL_OTP_TITLE": "Verify Email Address",
   "VERIFY_PHONE_OTP_DESCRIPTION": "You will receive an SMS with the OTP for mobile number verification",
   "VERIFY_PHONE_OTP_TITLE": "Verify Mobile Number",
   "VERSION": "Version",
-  "VIDEOS": "Video",
+  "VERYFYING_PLEASE_WAIT": "Verifying ",
+  "VIDEO": "Video",
   "VIEW": "View",
+  "VIEW_ACTIVITY": "View activity",
   "VIEW_ALL": "View all",
   "VIEW_ALL_BATCHES": "Select a batch to proceed",
   "VIEW_CREDITS_INFO": "View licensing information",
   "VIEW_DOWNLOADS_ONLY_MSG": "View Downloads Only",
   "VIEW_MORE": "VIEW MORE",
-  "VIEW_ONGOING_BATCHES": "Ongoing Batches",
+  "VIEW_ONGOING_BATCHES": "Ongoing batches",
+  "VIEW_OPEN_BATCHES": "Open batches",
   "VIEW_RETIRED_BATCHES": "Expired Batches",
   "VIEW_UPCOMING_BATCHES": "Upcoming Batches",
   "WAITING_TO_DOWNLOAD": "Waiting to download...",
   "WAIT_REQUEST": "Fetching content ...",
-  "WANT_TO_CHECK_TRAININGS": "Want to check trainings on {{%s}}?",
+  "WANT_TO_CHECK_FREE_TRAININGS": "Want to check courses?",
   "WARNING_PLEASE_MAKE_SOME_CHANGES": "Make changes",
   "WEBVIEW_UPDATE_TEXT": "For an effective experience, download the latest version of WebView from the Google Play store.",
+  "WEEKS_AGO": "{{%s}} weeks ago",
+  "WEEK_AGO": "{{%s}} week ago",
+  "WELCOME": "Welcome",
   "WELCOME_BACK": "WELCOME BACK {{%s}}",
+  "WHAT_IS_MEMBER_ID": "Where can I see the {{app_name}} ID?",
+  "YEARS_AGO": "{{%s}} years ago",
+  "YEAR_AGO": "{{%s}} year ago",
   "YES": "Yes",
+  "YOUR_ID_FROM_STATE_BOARD_ORG": "Your ID from State/ Board/ Org",
   "YOUR_LOCATION": "Your Location",
   "YOUR_LOCATION_DETAILS": "Your location details help us provide you with relevant content. Check if your location is correct, else reselect your location and submit it.",
   "YOUR_PROGRESS": "Your Progress: {{%s}}%",
   "YOUR_PROGRESS_LABEL": "Your Progress",
   "YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET": "You are not connected to the Internet",
-  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "You must join an active batch to view and access training details",
-  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "You must log in to access training details",
-  "YOU_MUST_LOGIN_TO_ACCESS_QUIZ_CONTENT": "You must login to access this content"
+  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "You must join an active batch to view and access course details",
+  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "You must log in to access course details",
+  "YOU_MUST_LOGIN_TO_ACCESS_QUIZ_CONTENT": "You must login to access this content",
+  
+
+
+
+  "CONTENT_DOWNLOADED": "Content downloaded",
+  "DEVICE_NEEDS_PERMISSION": "Permission denied for downloading pdf",
+  "EDIT_GROUP": "Update Group",
+  "FORUM": "Forum",
+  "FRMELEMENTS_LBL_FILES": "Files",
+  "FRMELEMENTS_LBL_ADD_IMAGE": "Add Images",
+  "FRMELEMENTS_LBL_CAMERA": "Camera",
+  "FRMELEMENTS_LBL_UPLOAD_FILE": "Upload File",
+  "FRMELEMENTS_LBL_UPLOAD_IMAGE": "Upload Image",
+  "FRMELEMENTS_LBL_DATE": "Date",
+  "FRMELEMENTS_LBL_CAPTURE": "Capture",
+  "FRMELEMENTS_LBL_TODAY": "Today",
+  "FRMELEMNTS_LBL_ENTITIES":"Entities",
+  "FRMELEMENTS_MSG_ACTIVATEGRPMSG": "This group is temporarily inactive. The group admin can re-activate the group if required. Group members can continue their discussions on the discussion forum.",
+  "FRMELEMENTS_MSG_ACTIVATEGRPPOPUP": "This group is temporarily deactivated. Group Admin can activate the group", "FRMELEMNTS_LBL_CLICK_BUTTON_BELOW": "Click the button below",
+  "FRMELEMNTS_LBL_FILTERS": "Click the button below",
+  "FRMELEMNTS_MSG_QUESTIONNAIRE_MSG": "This questions response is not required to complete the assessment.",
+  "FRMELEMNTS_MSG_ERROR_WHILE_STORING_FILE": "Error while storing file.",
+  "PROGRAMS": "Programs",
+  "PROGRAM_DESCRIPTION": "Text indicating the below cards are the combination of textbooks from all the classes(for teachers)",
+  "SOLUTION_DESCRIPTION": "Text Explaning what the program is about and what needs to be done in two or three lines",
+  "DOWNLOAD_CSV": "Download as CSV",
+  "FRMELEMNTS_BTN_ATTACH":"Attach",
+  "FRMELEMNTS_LBL_SYNCING_PROJECT":"Syncing Project",
+  "FRMELEMNTS_LBL_TODAY": "Today",
+  "FRMELEMNTS_LBL_THIS_WEEK": "This Week",
+  "FRMELEMNTS_LBL_FILTER": "Filters",
+  "FRMELEMNTS_LBL_VIEW_PROJECT": "View Project",
+  "FRMELEMNTS_LBL_ENTITY": "Entity",
+  "FRMELEMNTS_BTN_LOAD_MORE": "Load More",
+  "FRMELEMNTS_MSG_PROJECT_UPDATED_SUCCESS": "Your Project has been updated successfully",
+  "FRMELEMNTS_LBL_PROJECT_CREATE": "Project Created",
+  "FRMELEMNTS_BTN_CREATE_PROJECT": "Create project",
+  "FRMELEMNTS_MSG_PROJECT_CREATED_SUCCESS": "Your Project has been created successfully",
+  "FRMELEMNTS_BTN_ENTITY": "Entity",
+  "FRMELEMNTS_LBL_PAST": "Past",
+  "FRMELEMNTS_LBL_PROJECTS": "Projects",
+  "FRMELEMNTS_LBL_PROJECT_DESC": "Manage and track your school improvement easily, by creating tasks and planning project timelines.",
+  "FRMELEMNTS_LBL_VIEW_MORE": "View More",
+  "FRMELEMNTS_LBL_CREATE_NEW_PROGRAM": "Create new Program",
+  "FRMELEMNTS_BTN_IMPORT_PROJECT": "Import Project",
+  "FRMELEMNTS_LBL_CREATE_PROGRAM_INPUT_PLACEHOLDER": "Program name",
+  "FRMELEMNTS_LBL_CREATE_PROGRAM_INPUT_NAME": "Name",
+  "FRMELEMNTS_LBL_CREATE_PROGRAM": "Create Program",
+  "FRMELEMNTS_MSG_CREATE_PROGRAM_MESSAGE": "Enter your Program Name below and click 'save'",
+  "FRMELEMNTS_LBL_MY_PROGRAMS": "My Programs",
+  "FRMELEMNTS_BTN_ADD_PROGRAM": "Add Program",
+  "FRMELEMNTS_BTN_DELETE": "Delete",
+  "FRMELEMNTS_LBL_FROM": "From",
+  "FRMELEMNTS_LBL_TO": "To",
+  "FRMELEMENTS_BTN_CREATE_PROJECT": "Create and Continue",
+  "FRMELEMNTS_LBL_SEARCH": "Search",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS": "Improvement Reports",
+  "FRMELEMNTS_LBL_SURVEY_DESC": "Provide information and feedback through quick and easy surveys",
+  "FRMELEMNTS_LBL_REPORTS_DESC": "Make sense of data to enable your decision-making based on your programs with ease",
+  "FRMELEMNTS_BTN_SUBMIT": "Submit",
+  "FRMELEMNTS_LBL_CONTINUE": "Continue",
+  "FRMELEMNTS_LBL_SELECT_STATUS_PLACEHOLDER": "Select Status",
+  "FRMELEMNTS_LBL_SUBMITTTED": "Submitted",
+  "FRMELEMNTS_LBL_VIEW": "View",
+  "FRMELEMNTS_LBL_ECM_NOT_APPLICABLE": "ECM Not Applicable",
+  "FRMELEMNTS_LBL_ECM_NOT_ALLOWED": "ECM Not Applicable",
+  "FRMELEMNTS_LBL_CONFIRM": "Confirm",
+  "FRMELEMNTS_LBL_YES": "Yes",
+  "FRMELEMNTS_LBL_NO": "No",
+  "FRMELEMNTS_LBL_EVIDENCES": "Evidences",
+  "FRMELEMNTS_LBL_REMARKS": "Remarks",
+  "FRMELEMNTS_LBL_VIDEOS": "Videos",
+  "FRMELEMNTS_LBL_DOCUMENTS": "Documents",
+  "FRMELEMNTS_LBL_OBSERVE_AGAIN": "Observe Again",
+  "FRMELEMNTS_LBL_NO_DATA_FOUND":"No Data found",
+  "FRMELEMNTS_LBL_DELETE_ENTITY": "Are you sure to remove the entity form observation?",
+  "FRMELEMNTS_BTN_UPDATE": "Update",
+  "FRMELEMNTS_BTN_EDIT": "Edit",
+  "FRMELEMNTS_LBL_INSTANCE_NAME": "Instance Name",
+  "FRMELEMNTS_LBL_NOT_APPLICABLE": "Not Applicable",
+  "FRMELEMNTS_MSG_DELETE_SUBMISSION": "Are you sure to remove the submission ?",
+  "FRMELEMNTS_LBL_AUDIOS": "Audios",
+  "FRMELEMENTS_LBL_SELECTED_STATE": "Selected state",
+  "FRMELEMNTS_BTN_VIEW_MORE": "View More",
+  "FRMELEMENTS_LBL_SELECT_ENTITY": "Select Entity",
+  "FRMELEMENTS_LBL_TOTAL_SCORE": "Total Score",
+  "FRMELEMENTS_LBL_TOTAL_SCORE_ACHIEVED": "Total Score Achieved",
+  "FRMELEMENTS_LBL_TOTAL_SCHOOL": "Total Schools",
+  "FRMELEMENTS_LBL_TOTAL_SCHOOL_OBSERVED": "School Observed",
+  "FRMELEMENTS_LBL_HINT": "Hint",
+  "FRMELEMNTS_LBL_VIEW_ALL_EVIDNECES": "View All Evidence",
+  "FRMELEMENTS_LBL_TOTAL_SUBMISSIONS": "Total Submissions",
+  "FRMELEMNTS_MSG_SLOW_INTERNET": "You are connected to a slower data network. Image upload may take longer time. Do you want to continue?",
+  "FRMELEMNTS_MSG_NETWORK_CONNECTION_FOR_ACTION": "You need network connection for this action.",
+  "FRMELEMNTS_MSG_CONNECT_TO_INTERNET": "Please connect to internet.",
+  "FRMELEMNTS_MSG_OF": "Of",
+  "FRMELEMNTS_MSG_IMAGES": "Images",
+  "FRMELEMNTS_MSG_DONOT_CLOSE_APP": "Please don't close the app or go back.",
+  "FRMELEMENTS_MSG_QUESTION_FILTER": "Select the questions to filter Reports",
+  "FRMELEMENTS_MSG_CRITERIA_FILTER": "Select the criterias to filter Reports",
+  "FRMELEMENTS_MSG_SELECT_AT_LEAST_ONE_QUESTION": "Select at least one question",
+  "FRMELEMENTS_MSG_SELECT_AT_LEAST_ONE_CRITERIA": "Select at least one criteria",
+  "FRMELEMENTS_MSG_REDIRECTING": "Redirecting...",
+  "FRMELEMENTS_MSG_SUBMISSION_COMPLETED": "Submission completed successfully",
+  "FRMELEMENTS_MSG_ENABLE_TO_GET_GOOGLE_URLS": "Unable to get google urls",
+  "FRMELEMENTS_MSG_SOMETHING_WENT_WRONG ": "Something went Wrong , Please Try after sometime.",
+  "FRMELEMENTS_MSG_PLEASE_WAIT_WHILE_SUBMITTING ": "Please wait while submitting",
+  "FRMELEMENTS_MSG_SUBMISSION_NOT_ALLOWED": "Duplicate submission not allowed ! Reports will be generated based on original submission",
+  "FRMELEMENTS_MSG_ERROR_WHILE_DOWNLOADING": "Error while downloading ",
+  "FRMELEMENTS_MSG_SUCCESSFULLY DOWNLOADED": "Successfully Downloaded",
+  "FRMELEMNTS_BTN_UPLOAD_AND_SUBMIT": "Upload And Submit",
+  "FRMELEMENTS_BTN_APPLY_FILTER": "Apply Filter",
+  "FRMELEMNTS_BTN_PREVIEW": "Preview",
+  "FRMELEMNTS_BTN_FILTER": "Filter",
+  "FRMELEMNTS_BTN_REPORT_WITH_SCORE": "Report with score",
+  "FRMELEMNTS_BTN_REPORT_WITHOUT_SCORE": "Report without score",
+  "FRMELEMNTS_BTN_SELECT_ALL": "Select All",
+  "FRMELEMNTS_BTN_UNDO": "Undo",
+  "FRMELEMNTS_LBL_MEANT_FOR": "Meant For",
+  "SUBJECT_DESCRIPTION": "Explore {{%s}} from all the boards and mediums on {{%a}}",
+  "DISCOVER_BNAV": "Search",
+  "HOME_BNAV": "Home",
+  "ASSESSMENT_LAST_ATTEMPT_MESSAGE": "This is the last remaining attempt",
+  "BEST_SCORE": "Best score",
+  "APP_UPDATE": "Update {{%s}} app",
+  "SEARCH_IN_APP": "Search {{app_name}}",
+  "SEARCH_IN_APP_DESCRIPTION": "Search and find content on {{app_name}} from all boards, mediums, classes and subjects",
+  "FRMELEMNTS_LBL_TASK_DESCRIPTION": "Task Description (mandatory)",
+  "FRMELEMNTS_LBL_ADD_DESCRIPTION_HERE": "Add task description here",
+  "FRMELEMNTS_LBL_DESCRIPTION": "Description",
+  "FRMELEMNTS_BTN_DISCARD": "Discard",
+  "FRMELEMNTS_LBL_SPECIFY_OTHER": "specify other",
+  "FRMELEMNTS_BTN_CONTINUE": "Continue",
+  "FRMELEMNTS_MSG_DELETE_CONFIRM": "Are you sure you want to delete ",
+  "FRMELEMNTS_LBL_DISCARD_PROJECT": "Discard Project",
+  "FRMELEMNTS_MSG_DISCARD_PROJECT": "Would you like to discard your project?",
+  "FRMELEMNTS_MSG_NO_ENTITY_MAPPED": " No entity mapped to the Project",
+  "FRMELEMNTS_MSG_CANNOT_GET_PROJECT_DETAILS": "Cannot get project details",
+  "FRMELEMNTS_MSG_PROJCET_ALREADY_UPTODATE": "Your project is already upto date.",
+  "FRMELEMNTS_MSG_SYNC_FAILED": "Sync Failed",
+  "FRMELEMNTS_MSG_SYNCING_PROJECT": "Syncing Project",
+  "FRMELEMNTS_MSG_OFFLINE": "You are offline!",
+  "FRMELEMNTS_MSG_OFFLINE_SYNC": "You are working offline, please go online to sync your project",
+  "FRMELEMNTS_MSG_OFFLINE_SHARE_PROJECT": "You are working offline, please go online to sync and share your project",
+  "FRMELEMNTS_MSG_OFFLINE_SHARE_TASK": "You are working offline, please go online to sync and share your task",
+  "FRMELEMNTS_MSG_OFFLINE_SEARCH": "You are working offline, please go online to search" ,
+  "FRMELEMNTS_MSG_OFFLINE_CREATE_PROJECT": "You are working offline , please go online to create project",
+  "FRMELEMNTS_MSG_REQUIRED_FIELDS": "Please enter all required fields.",
+  "FRMELEMNTS_MSG_NO_TASK_FOUND": "No Task found, please try with some other tasks.",
+  "FRMELEMNTS_MSG_COMING_SOON": "Coming soon",
+  "FRMELEMNTS_MSG_YOU_ARE_WORKING_OFFLINE_TRY_AGAIN": "You are working offline, please check your network connection and try again",
+  "FRMELEMNTS_MSG_SOMETHING_WENT_WRONG": "Due to a technical problem, we are unable to process the request",
+  "FRMELEMNTS_MSG_PLEASE_NETWORK": "Please check your network connection and try again",
+  "FRMELEMNTS_MSG_NEW_TASK_ADDED_SUCCESSFUL": "New Task has been successfully created.",
+  "FRMELEMNTS_MSG_TASK_DELETED_SUCCESSFUL": "Task Deleted successfully",
+  "FRMELEMNTS_MSG_PROJECT_DELETED_SUCCESSFUL": "Project Deleted successfully",
+  "FRMELEMNTS_MSG_NO_SCHOOL_FOUND": "No schools found",
+  "FRMELEMNTS_MSG_SELECT_ENTITY_TO_SELECT_PROGRAM": "Please select the entity to select your program",
+  "FRMELEMNTS_MSG_NO_DATA_AVAILABLE": "No Data available",
+  "FRMELEMNTS_MSG_TASK_ADDED_SUCCESSFULLY": "Task Added Successfully",
+  "FRMELEMNTS_MSG_NO_DATA_AVAILABLE_FOR_ENTITY_OR_PROGRAM": "Sorry there is no data available for entity or program you selected",
+  "FRMELEMNTS_MSG_PLEASE_ADD_OTHERCATEGORIES":"Please add other categories.",
+  "FRMELEMNTS_LBL_VIEW_REPORT": "View Report",
+  "FRMELEMNTS_LBL_OK": "OK",
+  "FRMELEMNTS_LBL_SHARE": "Share",
+  "FRMELEMNTS_LBL_DOWNLOAD": "Download",
+  "FRMELEMNTS_LBL_DOWNLOADED": "Downloaded",
+  "FRMELEMNTS_LBL_UNDERTAKEN_PROJECTS_IN_WEEK": "Projects Undertaken this week",
+  "FRMELEMNTS_LBL_UNDERTAKEN_PROJECTS_IN_MONTH": "Projects Undertaken this week",
+  "FRMELEMNTS_LBL_UNDERTAKEN_PROJECTS_IN_QUARTER": "Projects Undertaken this  quater",
+  "FRMELEMNTS_LBL_CREATED_BY_ME": "Created by me",
+  "FRMELEMNTS_LBL_ASSIGNED_TO_ME": "Assigned to me",
+  "FRMELEMNTS_LBL_CREATE_NEW_PROJECT": "Create New Project",
+  "FRMELEMNTS_LBL_CREATE_NEW_PROJECT_SUBHEADING": "Create your own improvement projects",
+  "FRMELEMNTS_LBL_EXPLORE_PROJECTS": "Explore Projects",
+  "FRMELEMNTS_LBL_CREATE_TASKS_FOR_PROJECT": "Create Tasks for your Project",
+  "COPY_TRACE_ID": "Copy trace id",
+  "COPY_TRACE_ID_DESC": "Copy trace id for support",
+  "LEADER": "Head Teacher & Officials ",
+  "FRMELEMNTS_LBL_ADD_BLOCK": "Add Block",
+  "FRMELEMNTS_LBL_ADD_CLUSTER": "Add Cluster",
+  "FRMELEMNTS_LBL_ADD_SCHOOL": "Add School",
+  "FRMELEMNTS_LBL_PLEASE_ADD_OTHERCATEGORIES": "Please add other categories",
+  "FRMELEMNTS_LBL_COFIRM_DELETE": "Do you want to delete this file?",
+  "FRMELEMNTS_LBL_COFIRMATION_DELETE": "Confirm Delete",
+  "FRMELEMNTS_LBL_COFIRMATION_DELETE_INSTANCE": "Do you want to delete this instance?",
+  "FRMELEMNTS_LBL_THIS_QUARTER": "This Quarter",
+  "FRMELEMNTS_LBL_SHARE_DATA_WITH": "I wish to share my data with {{%tenant}}",
+  "PROGRAMS_DESC": "View and participate in educational programs active in your location and designed for the role you selected",
+  "PDF": "PDF",
+  "PNG": "PNG",
+  "YOUR_PREFERENCES": "Your preferences",
+  "SEARCH_OR_ENTER_QR_CODE": "Search or enter QR code",
+  "EXPLORE": "Explore {{%s}}",
+  "CERTIFICATE": "Certificate",
+  "ENABLE_DISCUSSION_FORUM": "Enable discussions",
+  "DISABLE_DISCUSSION_FORUM": "Disable discussions",
+  "DISCUSSION_FORUM_ENABLE_SUCCESS": "Discussion forum enabled successfully",
+  "DISCUSSION_FORUM_DISABLE_SUCCESS": "Discussion forum disabled successfully",
+  "DISCUSSION_FORUM_DISABLE_CONFIRM": "Disable discussion forum?",
+  "DISCUSSION_FORUM_DISABLE_CONFIRM_DESC": "Disabling the discussion forum clears all discussions held in the group to date. If you choose to enable discussions for the group again, there will be no past history of the discussions. They will begin afresh. Do you want to continue?",
+  "FRMELEMNTS_LBL_PROJECT_DESCRIPTION":"Manage and track your school improvements by creating tasks and scheduling them",
+  "OFFLINE_CERTIFICATE_MESSAGE": "You need to go online to view certificate",
+  "BATCH_ENDS_TEXT": "Batch ends in",
+  "FRMELEMNTS_LBL_SYNC_COURSE_PROGRESS": "Sync Progress now",
+  "FRMELEMNTS_MSG_SYNC_COURSE_PROGRESS_SUCCESS": "Progress synced successfully",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS_DESC":"Provides insight of the observations done.",
+  "JOYFULPOPUP_HEADING": "DIKSHA has got a new look & feel",
+  "JOYFUL_LEARNING_TEXT": "For joyful learning, we have redesigned our platform making it easier for you to find content",
+  "JOYFUL_WARNING_TEXT": "If you want to change the theme, go to your menu and switch theme",
+  "LETS_GO": "Let's go",
+  "SET_PREFERENCE": "Choose content preferences",
+  "FRMELEMNTS_LBL_OPEN_WITH": "Open With",
+  "FRMELEMNTS_LBL_OPEN_CONTENT_WITH": "Open Content With",
+  "FRMELEMNTS_LBL_NEW_EXPERIENCE_POPUP_HEADING": "We've made it easier for you to find content on {{app_name}}",
+  "FRMELEMNTS_LBL_NEW_EXPERIENCE_TEXT": "The new design makes it easier for you to find content you need and adds a splash of joy to your learning experience",
+  "FRMELEMNTS_LBL_NEW_EXPERIENCE_WARNING_TEXT": "If you want to go back to old design {{app_name}}, you can always do so from your preferences",
+  "FRMELEMNTS_LBL_SWITCH_TO_NEW_EXPERIENCE": "Switch to new experience",
+  "FRMELEMNTS_LBL_SHARE_MSG":"We need to sync your data to generate a shareable file.",
+  "FRMELEMNTS_BTN_DNTSYNC":"Dont Sync",
+  "FRMELEMNTS_BTN_SYNCANDSHARE":"Sync & Share",
+  "FRMELEMNTS_MSG_FILE_NOT_SHARED":"File not shared !",
+  "FRMELEMNTS_CLICK_TO_IMPROVE":"Click to improve",
+  "FRMELEMNTS_SUGGESTED_PROJECTS":"Suggested Projects",
+  "FRMELEMNTS_NO_SUGGESTIONS":"No Projects",
+  "FRMELEMNTS_BTN_PROJECT_IMPORTED":"Project Imported",
+  "FRMELEMNTS_LBL_IMPORT_PROJECT_MESSAGE":"Do you want to import the project to your Workspace?",
+  "FRMELEMNTS_LBL_SHARE_PROJECT_DETAILS": "Share Project Details",
+  "FRMELEMNTS_BTN_DO_NOT_SHARE": "Do not share",
+  "FRMELEMNTS_LBL_PROJECT_PRIVACY_POLICY": "I confirm that this Content complies with prescribed guidelines,including the",
+  "FRMELEMNTS_LBL_TCANDCP": "Terms of Use and Content Policy.",
+  "FRMELEMNTS_LBL_PROJECT_PRIVACY_POLICY_TC": "I have not shared any personal or sensitive information and have made sure that I do not violate others’ privacy rights and third party rights including intellectual property rights ",
+  "FRMELEMNTS_LBL_EVIDENCES_CONTENT_POLICY_TEXT": "I have made sure that I do not violate others’ copyright, privacy or third party rights.",
+  "FRMELEMNTS_LBL_EVIDENCES_CONTENT_POLICY": "I confirm that the Content submitted by me comply with the terms and policies of DIKSHA, including DIKSHA's",
+  "FRMELEMNTS_LBL_EVIDENCES_CONTENT_POLICY_LABEL": "Content Policy.",
+  "FRMELEMNTS_LBL_UPLOAD_EVIDENCES": "Upload Evidences",
+  "FRMELEMNTS_MSG_EVIDENCES_CONTENT_POLICY_REJECT": " Evidence not uploaded please click on attach and accept the content policy",
+  "FRMELEMNTS_BTN_DO_NOT_UPLOAD":"Do not Upload",
+  "FRMELEMNTS_BTN_UPLOAD":"Upload",
+  "FRMELEMNTS_MSG_PROJECT_PRIVACY_POLICY_TC_OFFLINE":"Dear User, your details will not be shared as you are working offline",
+  "FRMELEMNTS_BTN_VIEW_ALL_RESPONSES": "View All Responses",
+  "FRMELEMNTS_LBL_IMPORT_PROJECT_SUCCESS":"The Project is successfully added to your list of active projects!",
+  "IMPORT_CONTENT": "Import Content",
+  "FRMELEMNTS_MSG_ADD_ENTITY_TO_OBSERVE":"Add entity to observe",
+  "FRMELEMNTS_MSG_ASSESSMENTS_DONE" : "Assessments done",
+  "FRMELEMNTS_LBL_TOTAL_OBSERVATIONS": "Total observations",
+  "FRMELEMNTS_LBL_SWITCH_TO_HOME": "Try new {{appName}} experience",
+  "FRMELEMNTS_LBL_SWITCH_TO_LIBRARY": "Switch to classic {{appName}} experience",
+  "FRMELEMENTS_VENDOR_APP_DESCRIPTION": "{{appName}} supports the following 3rd party reader apps. Please install any of these apps of your choice",
+  "FRMELEMENTS_LBL_SEARCH_SUB_HEADING": "Search {{appName}} for \"{{searchText}}\"",
+  "FRMELEMENTS_LBL_SEE_MORE_COURSES": "See more courses and content",
+  "FRMELEMENTS_LBL_SLOW_INTERNET": "You are connected to a slower data network. Image upload may take longer time. Do you want to continue?",
+  "FRMELEMNTS_MSG_PLEASE_GO_ONLINE":" Dear user, please go online to use this feature."
 }
diff --git a/src/assets/i18n/gu.json b/src/assets/i18n/gu.json
index 1782ce501..bee310ef3 100644
--- a/src/assets/i18n/gu.json
+++ b/src/assets/i18n/gu.json
@@ -8,29 +8,54 @@
   "ACCOUNT_MERGE_FAILED": "એકાઉન્ટ મર્જ કરવામાં નિષ્ફળ થયા.",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_CONTENT": "એકાઉન્ટ મર્જ સફળતાપૂર્વક પ્રારંભ કરવામાં આવ્યું છે. એકવાર તે પૂર્ણ થઈ જાય ત્યારે તમને સૂચિત કરવામાં આવશે.",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_HEADING": "એકાઉન્ટ મર્જ કરો",
-  "ACCURACY": "ચોકસાઈ",
   "ACTIVE": "સક્રિય",
   "ACTIVE_DOWNLOADS": "સક્રિય ડાઉનલોડસ ",
+  "ACTIVITIES": "પ્રવૃત્તિઓ",
+  "ACTIVITIESE_SEARCH_PLACEHOLDER": "ગ્રુપની પ્રવૃત્તિઓ માટે શોધ કરો",
+  "ACTIVITY_ALREADY_ADDED_IN_GROUP": "આ પ્રવૃત્તિ પહેલાથી જ ઉમેરવામાં આવી છે",
+  "ACTIVITY_COLLECTION_TITLE": "સંગ્રહો",
+  "ACTIVITY_COURSE_TITLE": "કોર્સ",
+  "ACTIVITY_EXPLANATION_CONTENT_TITLE": "એક્સપ્લેનેશન કન્ટેન્ટ ",
+  "ACTIVITY_PRACTICE_QUESTION_SET_TITLE": "પ્રેક્ટિસ પ્રશ્ન સેટ",
+  "ACTIVITY_PRACTICE_RESOURCE_TITLE": "પ્રેક્ટિસ રિસોર્સ",
+  "ACTIVITY_RESOURCE_TITLE": "રિસોર્સ",
+  "ACTIVITY_TEXTBOOK_TITLE": "પાઠયપુસ્તક",
+  "ACTIVITY_TV_EPISODE_TITLE": "ટેલિવિઝન એપિસોડ",
   "ADD": "ઉમેરો",
+  "ADD_ACTIVITY": "પ્રવૃત્તિ ઉમેરો",
+  "ADD_ACTIVITY_ERROR_MSG": "પ્રવૃત્તિ ઉમેરી શક્યાં નથી. પછીથી ફરી પ્રયાસ કરો",
+  "ADD_ACTIVITY_SUCCESS_MSG": "પ્રવૃત્તિ સફળતાપૂર્વક ઉમેરવામાં આવી",
+  "ADD_ANOTHER_USER": "બીજા વપરાશકર્તા ઉમેરો",
   "ADD_DISTRICT": "જિલ્લો  ઉમેરો",
-  "ADD_EMAIL": "ઇ-મેઇલ ID ઉમેરો",
+  "ADD_EDIT_SELF_DECLARED_TEACHER_INFO": "પ્રગતિને માન્ય અને અનુસરવા માટે આ વિગતો તમારા ઘોષિત રાજ્યને ઉપલબ્ધ કરાઈ શકે છે.",
+  "ADD_EMAIL": "ઇ-મેઇલ એડ્રેસ ઉમેરો",
+  "ADD_MEMBER": "સભ્ય ઉમેરો",
+  "ADD_MEMBER_CONFIRMATION": "તમારે તપાસ કરવી પડશે કે તમે આગળ વધતા પહેલા સભ્યનું નામ અને {{app_name}} ID મેળ ખાય છે",
+  "ADD_MEMBER_POPUP_DESC": "સભ્યોને તેમની અનન્ય {{%s}} ID ઓળખવા માટે માર્ગદર્શન આપવા માટે નીચેની સૂચનાઓનો ઉપયોગ કરો.",
+  "ADD_MEMBER_POPUP_STEP_1": "<span>સ્ટેપ 2</span>: પ્રોફાઇલ ટેબને ક્લિક કરો",
+  "ADD_MEMBER_POPUP_STEP_2": "<span> પગલું 2 </span>: તમારી {{% s}} ID ને શેર કરવા માટે શેર આયકન પર ક્લિક કરો",
+  "ADD_MEMBER_POPUP_TITLE": "હું {{%s}} ID ક્યાંથી જોઈ શકું છું?",
   "ADD_PHONE": "ફોન નંબર ઉમેરો",
   "ADD_RECOVERY_ACCOUNT": "રિકવરી એકાઉન્ટ ઉમેરો.",
   "ADD_RECOVERY_ID": "રિકવરી એકાઉન્ટ ઉમેરો.",
   "ADD_STATE": "રાજ્ય ઉમેરો",
+  "ADD_TO_GROUP": " ગ્રુપમાં ઉમેરો",
+  "ADD_TO_GROUP_ACTIVITY": " ગ્રુપ માટે ઉમેરો",
+  "ADD_USER": "વપરાશકર્તા ઉમેરો",
   "ADD_USERS": "વપરાશકર્તાઓ ઉમેરો",
-  "ADD_USERS_TO_GROUP": "{{%s}} યુઝર્સને ગ્રુપમાં ઉમેરો",
+  "AGREE_TO_SHARE_PROFILE_DETAILS": "હું મારી પ્રોફાઇલની વિગતો કોર્સના સંચાલક સાથે શેર કરવા માટે સંમત છું",
   "ALL": "બધા",
   "ALLOW": "મંજૂરી આપી છે ",
   "ALL_ANNOUNCEMENTS": "બધી જાહેરાતો ",
-  "ALREADY_ENROLLED_COURSE": "તમે આ તાલીમ પહેલાથી જ જોડાઈ ગયા છો.",
+  "ALREADY_ENROLLED_COURSE": "તમે આ કોર્સમાં માટે નોંધણી કરી છે.",
   "ALWAYS_ON": "હંમેશાં ચાલુ",
-  "ANDROID_NOT_SUPPORTED": "એન્ડ્રોઇડ વર્જન સપોર્ટેડ નથી",
+  "ANDROID_NOT_SUPPORTED": "એન્ડ્રોઇડ વર્ઝન  સપોર્ટેડ નથી",
   "ANDROID_NOT_SUPPORTED_DESC": "આ કન્ટેન્ટ જોઈ શકાતું નથી કારણ કે તમારો ફોન Android ના જૂના વર્ઝન પર ચાલી રહ્યો છે. જો તમારી પાસે ક્રોસવૉક હોય તો, તમારા ડિવાઇસ મોડેલના આધારે તમે આ કન્ટેન્ટને જોઈ શકશો.",
   "ANNOUNCEMENT": "જાહેરાત",
   "ANSWER": "જવાબ",
   "APPLY": "અરજી કરો",
   "APPLY_FILTER": "ફિલ્ટર કરો",
+  "APP_ID": "{{%s}} ID",
   "APP_QR_CODE": " {{%s}} QR કોડ છે?",
   "APP_RATING_RATE_EXPERIENCE": "તમારા અનુભવ મુજબ એપ્લિકેશનને રેટ કરો",
   "APP_RATING_RATE_ON_PLAYSTORE": "શું તમે પ્લે સ્ટોર પર રેટિંગ્સ આપવા માંગો છો?",
@@ -44,7 +69,7 @@
   "AS_LINK": "લિંક તરીકે",
   "ATTACHMENT_DOWNLOADED": "જોડાયેલ કન્ટેન્ટ ડાઉનલોડ થઈ ગયું ",
   "ATTRIBUTIONS": "પ્રશંસા (ઓ)",
-  "AUDIOS": "ઑડિઓ",
+  "AUDIO": "ઑડિઓ",
   "AUTHOR": "લેખક",
   "AUTOMATIC_SYNC": "ઓટોમેટિક ડેટા સિંક ",
   "AUTO_MIGRATION_FAIL_MESSAGE": "એકાઉન્ટ્સ મર્જ કરી શક્યાં નથી",
@@ -53,56 +78,61 @@
   "AVAILABLE_FILTERS": "ફિલ્ટર કરો",
   "AVAILABLE_FOR_TEACHERS": "ફક્ત શિક્ષકો માટે ઉપલબ્ધ છે",
   "AVATAR": "અવતાર",
-  "AVERAGE_SCORE": "સરેરાશ પરિણામ",
-  "AVERAGE_TIME": "સરેરાશ સમય",
   "BACK_TO_EXIT": "એપ્લિકેશનમાંથી બહાર નીકળવા માંગો છો?",
-  "BATCHEND_MAIN_HEADING": "તમે જે બેચમાં જોડાયા છો. તે તાલીમ {{%s}} પૂર્ણ કરી છે.",
-  "BATCHEND_SUB_HEADING": "તમે તાલીમ ચાલુ રાખી શકો છો, પરંતુ તમારી પ્રગતિ અપડેટ થશે નહીં",
+  "BATCHEND_MAIN_HEADING": "તમે {{%s}} ના રોજ પૂર્ણ થયેલા કોર્સની બેચમાં જોડાયા છો.",
+  "BATCHEND_SUB_HEADING": "તમે કોર્સ ચાલુ રાખી શકો છો, પરંતુ તમારી પ્રગતિ અપડેટ થશે નહીં.",
   "BATCHES_AVAILABLE": "ઉપલબ્ધ બેચ",
-  "BATCHES_FOR_THIS_COURSE": "આ તાલીમ માટેના બેચ ",
+  "BATCHES_FOR_THIS_COURSE": "આ કોર્સ માટેની બેચ ",
   "BATCH_CREATED_BY": "દ્વારા બનાવેલ",
   "BATCH_DETAILS": "બેચની વિગતો",
   "BATCH_ENROLLMENT_ENDED": "આ બેચ માટે નોંધણી બંધ થઈ ગઈ છે",
   "BATCH_EXPIRED": "બેચ સમાપ્ત ગઈ ",
   "BATCH_EXPIRED_BUTTON": " બરાબર છે",
-  "BATCH_EXPIRED_DESCRIPTION": "બેચ સમયગાળો સમાપ્ત થયો છે. તમે તાલીમ ચાલુ રાખી શકો છો. જો કે, તમારી પ્રગતિ કેપ્ચર અથવા મોનિટર કરવામાં આવશે નહીં.",
   "BOARD": "બોર્ડ",
   "BOARD_OPTION_TEXT": "બોર્ડ પસંદ કરો",
+  "BROWES_RELEVANT_CONTENT": "તમારી પસંદગીઓ (બોર્ડ, મધ્યમ, વર્ગ) ના આધારે સંબંધિત સામગ્રી શોધવા માટે {{app_name}} લાઇબ્રેરી બ્રાઉઝ કરો.",
   "BTN_CLICK_TO_OPEN_CONTENT": "કન્ટેન્ટ જોવા માટે ટેપ કરો",
   "BTN_LATER": "પછીથી",
   "BTN_RATE_ON_PLAYSTORE": "પ્લે સ્ટોરમાં અમને રેટ કરો",
   "BTN_SUBMIT": "સબમિટ કરો",
   "BTN_VISIT_HELP_SECTION": "મદદ વિભાગની મુલાકાત કરો",
-  "BY_QUESTIONS": "પ્રશ્નો દ્વારા",
-  "BY_USERS": "વપરાશકર્તાઓ દ્વારા",
   "CAMERA": "કૅમેરો",
   "CAMERA_PERMISSION_DESCRIPTION": "{{%s}} QR કોડને સ્કેન કરવા માટે કૅમેરાની પરવાનગીનો ઉપયોગ કરો.",
-  "CANCEL": "કેન્સલ ",
+  "CANCEL": "રદ કરો",
   "CANCELLING_IN_PROGRESS": "પ્રક્રિયા ચાલું  છે ...",
-  "CANCEL_ALL": "બધા કેન્સલ કરો",
-  "CANCEL_ALL_DOWNLOAD_MESSAGE": "ડાઉનલોડ કેન્સલ કરવાથી સક્રિય ડાઉનલોડ્સમાંથી બધી સામગ્રીઓ દૂર થઈ જશે",
+  "CANCEL_ALL": "બધા રદ કરો",
+  "CANCEL_ALL_DOWNLOAD_MESSAGE": "ડાઉનલોડ રદ કરવાથી સક્રિય ડાઉનલોડ્સમાંથી બધા કન્ટેન્ટસ દૂર થઈ જશે",
   "CANCEL_DOWNLOAD": "ડાઉનલોડ રદ કરો",
-  "CANCEL_DOWNLOAD_MESSAGE": "ડાઉનલોડ કેન્સલ કરવાથી સક્રિય ડાઉનલોડ્સમાંથી કન્ટેન્ટ દૂર થશે",
-  "CANCEL_DOWNLOAD_TITLE": "ડાઉનલોડ કેન્સલ?",
-  "CERTIFIED_TRAINING": "પ્રમાણિત તાલીમ",
+  "CANCEL_DOWNLOAD_MESSAGE": "ડાઉનલોડ રદ કરવાથી સક્રિય ડાઉનલોડ્સમાંથી કન્ટેન્ટ દૂર થશે",
+  "CANCEL_DOWNLOAD_TITLE": "ડાઉનલોડ રદ કરો?",
+  "CERTIFICATE_ALREADY_DOWNLOADED": "પ્રમાણપત્ર પહેલેથી જ ડાઉનલોડ થયેલ છે, કૃપા કરીને તમારું ડાઉનલોડ ફોલ્ડર તપાસો",
+  "CERTIFICATE_DOWNLOADED": "પ્રમાણપત્ર ડાઉનલોડ કરવામાં આવ્યું છે",
+  "CERTIFICATE_DOWNLOAD_INFO": "પ્રમાણપત્ર ડાઉનલોડ થઈ રહ્યું છે",
+  "CERTIFIED_TRAINING": "પ્રમાણપત્ર કમાઓ",
   "CHANGE": "બદલો",
   "CHANGE_ROLE": "ભૂમિકા બદલો",
-  "CHANGE_USER": "વપરાશકર્તા બદલો",
+  "CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "તમે આ મોડ્યુલ સમાપ્ત કર્યું છે",
+  "CHARACTERS_REMAINING": "{{character_count}} અક્ષરો બાકી છે",
   "CHECK_FOR_UPDATES": "અપડેટ માટે ચકાસો",
   "CHOOSE_FROM_FOLLOWING": "નીચેનામાંથી પસંદ કરો",
   "CHOOSE_LANGUAGE": "તમારી મનપસંદ ભાષા પસંદ કરો",
+  "CHOOSE_USER": "વપરાશકર્તા પસંદ કરો",
   "CHOOSE_WHERE_TO_SAVE_DATA": "ડેટા સેવ કરવા માટે સ્થાન પસંદ કરો",
   "CLASS": "વર્ગ",
   "CLASSES": "વર્ગો",
   "CLEAR": "દૂર કરો",
   "COACH_SCREEN": "QR કોડને સ્કેન કરવાથી તમે કન્ટેન્ટ જોઈ શકશો  ",
   "COMMUNITIES": "સમુદાય",
+  "COMPLETED": "પૂર્ણ",
   "COMPLETE_ASSESSMENT_TO_EARN_CERTIFICATE": " {{%s}} દ્વારા અસેસમેન્ટ પૂર્ણ કરો",
   "COMPLETE_BY": "{{%s}} દ્વારા પૂર્ણ",
-  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} દ્વારા તાલીમ પૂર્ણ કરો.",
+  "COMPLETE_CHAPTER_TO_UNLOCK_ACHIEVEMENT": "નવી સિદ્ધિને અનલોક કરવા માટે વધુ કન્ટેન્ટ {{%s}} પૂર્ણ કરો",
+  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} દ્વારા કોર્સ પૂર્ણ કરો.",
   "CONFIRM": "પુષ્ટિ કરો",
+  "CONGRATULATIONS": "અભિનંદન",
   "CONNECT_TO_INTERNET_SUGGESTION": "કન્ટેન્ટ જોવા માટે ઇન્ટરનેટ ચાલુ કરો ",
   "CONSIDER_DOWNLOAD": "કન્ટેન્ટ ડાઉનલોડ કરવાનું ધ્યાનમાં લો",
+  "CONTENTS": "કન્ટેન્ટસ",
   "CONTENT_ALREADY_EXIST": "ફાઇલ પહેલેથી જ આયાત થઈ ગઈ છે. નવી ફાઇલ પસંદ કરો",
   "CONTENT_ALREADY_EXISTS": "આ કન્ટેન્ટ ડેસ્ટિનેશન ફોલ્ડરમાં છે. શું તમે આ કન્ટેન્ટને ડેસ્ટિનેશન ફોલ્ડરમાં પાછું મોકલવા માંગો છો?",
   "CONTENT_COMING_SOON": "અમે આ માટે કન્ટેન્ટ બનાવી રહ્યા છીએ",
@@ -118,66 +148,210 @@
   "CONTENT_IS_BEING_ADDED": "તમારું રાજ્ય ટૂંક સમયમાં આ QR કોડ માટે કન્ટેન્ટ ઉમેરશે. તે ટૂંક સમયમાં ઉપલબ્ધ થશે",
   "CONTENT_NOT_AVAILABLE": "કન્ટેન્ટ ઉપલબ્ધ નથી",
   "CONTENT_PLAYER_EXIT_PERMISSION": "શું તમે આ કન્ટેન્ટ છોડવા માગો છો?",
+  "CONTENT_PREFERENCE": "કન્ટેન્ટ પસંદગીઓ",
+  "CONTENT_PREFERENCE_SELECTION": "કન્ટેન્ટ પસંદગી પસંદ કરો",
   "CONTENT_RATING_SUB_HEADING": "કન્ટેન્ટને રેટિંગ આપવા માટે સ્ટાર પર ટેપ કરો",
-  "CONTENT_RETIRED_BY_AUTHOR": "આ કન્ટેન્ટ સર્જક દ્વારા દૂર કરવામાં આવી છે,  તેથી તે ઉપલબ્ધ નથી",
+  "CONTENT_RETIRED_BY_AUTHOR": "આ લેખક દ્વારા દૂર કરવામાં આવી છે,  તેથી તે ઉપલબ્ધ નથી",
   "CONTENT_SIZE": "કન્ટેન્ટની સાઈઝ",
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO": "કન્ટેન્ટ સફળતાપૂર્વક ટ્રાન્સફર થયું ",
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO_PHONE": "કન્ટેન્ટ સફળતાપૂર્વક મોબાઇલમાં ટ્રાન્સફર થયું ",
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO_SDCARD": "કન્ટેન્ટ સફળતાપૂર્વક SD કાર્ડમાં ટ્રાન્સફર થયું ",
   "CONTINUE": "ચાલુ રાખો",
   "CONTINUE_AS_ROLE": "'{{%s}}' તરીકે ચાલુ રાખો",
-  "CONTINUE_NOW": "ચાલુ રાખો",
+  "CONTINUE_LEARNING": "શીખવાનું ચાલુ રાખો",
   "CONTRIBUTIONS": "યોગદાન(s)",
   "CONTRIBUTORS": "સહયોગી(ઓ)",
   "COPYRIGHT": "કૉપિરાઇટ",
+  "COURSES": "કોર્સ",
   "COURSES_BNAV": "કોર્સ",
-  "COURSES_IN_PROGRESS": "મારા અભ્યાસક્રમો",
+  "COURSES_IN_PROGRESS": "મારો કોર્સ",
   "COURSE_COMPLETED_LABEL": "{{%s}}% પૂર્ણ",
-  "COURSE_ENDED": "{{%s}} ને તાલીમ સમાપ્ત થઈ ",
+  "COURSE_COMPLETION_POPUP_DESC": "તમને 7 દિવસની અંદર તમારી નોંધણી કરેલ સંપર્ક વિગતો પર કોર્સ સર્ટિફિકેટ વિશે સૂચિત કરવામાં આવશે",
+  "COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "નોંધ: આ અભ્યાસક્રમમાં પ્રમાણપત્ર નથી",
+  "COURSE_ENDED": "કોર્સ {{%s}} ના રોજ સમાપ્ત થયો",
   "COURSE_ENDED_ON": "{{%s}} પર અભ્યાસક્રમ સમાપ્ત થયો",
-  "COURSE_ENROLLED": "તમે તાલીમમાં જોડાયા છો.",
-  "COURSE_NOT_AVAILABLE": "આ તાલીમ હવે ઉપલબ્ધ નથી",
+  "COURSE_ENROLLED": "તમે કોર્સમાં જોડાયા છો.",
+  "COURSE_LAST_UPDATED_ON": "કોર્સ છેલ્લે {{last_updated_on_date}} પર અપડેટ કરાયો",
+  "COURSE_NOT_AVAILABLE": "આ કોર્સ નિષ્ક્રિય છે",
+  "COURSE_NO_CERTIFICATE_MESSAGE": "હાલમાં, આ કોર્સમાં પ્રમાણપત્ર નથી. કોર્સ નિર્માતા પછીથી પ્રમાણપત્ર જોડી શકે છે.",
   "COURSE_PROGRESS_COMPLETED": "{{%s}}% પૂર્ણ",
-  "COURSE_UNENROLLED": "તમે આ તાલીમ સફળતાપૂર્વક છોડી લીધી છે",
+  "COURSE_UNENROLLED": "તમે કોર્સ છોડી દીધો છે.",
   "COURSE_WILL_BE_AVAILABLE": " બેચ {{%s}}થી ઉપલબ્ધ થશે.",
   "CREATE_GROUP": "ગૃપ બનાવો",
-  "CREATE_NEW_GROUP": "નવું ગ્રુપ બનાવો",
-  "CREATE_NEW_USER": "નવા વપરાશકર્તા બનાવો",
+  "CREATE_GROUP_DESCRIPTION": "તમે ગ્રુપ બનાવવાથી ફક્ત એક સ્ટેપ દૂર છો",
+  "CREATE_GROUP_DESCRIPTION_POPUP": "લોકો સાથે જોડાવા, પ્રવૃત્તિઓ શેર કરવા, પ્રગતિની સમીક્ષા કરવા અને અન્ય સંભાવનાઓનું અન્વેષણ કરવા માટે એક ગ્રુપ બનાવો અથવા એકનો ભાગ બનો",
   "CREATE_USER": "વપરાશકર્તા બનાવો",
   "CREATORS": "દ્વારા {{%s}} પર બનાવેલ",
   "CREDITS": "ક્રેડિટસ ",
   "CREDITS_LICENCE_INFO": "ક્રેડિટ્સ અને લાઇસેંસ માહિતી",
-  "CSV_DOWNLOAD_SUCCESS": "{{%s}} તમારા ડાઉનલોડ ફોલ્ડરમાં રાખવામાં આવ્યું છે",
+  "CRS_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "શરૂ કરવા માટેનો કોર્સ પસંદ કરો",
+  "CRS_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "કોર્સ",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "કોર્સ",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "કોર્સ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}} ની લાઇબ્રેરીમાં {{%explainVideos}}, {{%quesBanks}} અને અન્ય {{%interactiveMaterial}} નું હોસ્ટ છે. પુસ્તકાલયની શોધખોળ શરૂ કરવા માટે પાઠયપુસ્તક પર ક્લિક કરો!",
+  "CRS_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}} માટે કોઈ કોર્સ મળ્યાં નથી ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "બોર્ડ કોર્સ ઉમેરી રહ્યું છે.",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}} પર કોઈ કોર્સ શોધી શક્યા નથી?",
+  "CRS_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span> નોંધ: </span> કોર્સ માટે પ્રગતિ ટ્રેક કરી શકાતી નથી",
+  "CRS_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "{{%s}}પર તમારું સ્ટેટ બોર્ડ તમારી વિનંતી કરેલો કોર્સ અપલોડ કરશે કે તરત જ અમે તમને જાણ કરીશું.",
+  "CRS_NONTRK_QR_CODE_DETAILS": "તમારી કોર્સમાંથી QR કોડ સ્કેન કરીને ડિજિટલ કન્ટેન્ટનો  તાત્કાલિક ઍક્સેસ મેળવો.",
+  "CRS_NONTRK_SEE_MORE_BOOKS": "વધુ પુસ્તકો અને કન્ટેન્ટ જુઓ",
+  "CRS_NONTRK_STUDENT_ROLE_DESC_1": "પાઠયપુસ્તકો અને ડિજિટલ કન્ટેન્ટ બ્રાઉઝ કરો.",
+  "CRS_NONTRK_TEACHER_ROLE_DESC_1": "પાઠયપુસ્તકો અને ડિજિટલ કન્ટેન્ટ બ્રાઉઝ કરો.",
+  "CRS_NONTRK_TUTORIAL_HEADING": "વિડિઓઝ, ઇન્ટરેક્ટિવ કન્ટેન્ટ, ઇ ટેક્સ્ટબુક અને વધુ ...",
+  "CRS_TRK_BATCHEND_MAIN_HEADING": "તમે {{%s}} ના રોજ પૂર્ણ થયેલા કોર્સની બેચમાં જોડાયા છો.",
+  "CRS_TRK_BATCHEND_SUB_HEADING": "તમે કોર્સ ચાલુ રાખી શકો છો, પરંતુ તમારી પ્રગતિ અપડેટ થશે નહીં.",
+  "CRS_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "તમે આ મોડ્યુલ સમાપ્ત કર્યું છે",
+  "CRS_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} દ્વારા કોર્સ પૂર્ણ કરો.",
+  "CRS_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "કોર્સ",
+  "CRS_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "તમે કોર્સમાં જોડાયા છો.",
+  "CRS_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "આ કોર્સ માટેની બેચ ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "કોર્સ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "મારા કોર્સ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "કોર્સ {{%s}} ના રોજ સમાપ્ત થયો",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "કોર્સ છેલ્લે {{last_updated_on_date}} પર અપડેટ કરાયો",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_NOT_AVAILABLE": "આ કોર્સ નિષ્ક્રિય છે",
+  "CRS_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "કોર્સમાં જોડાઓ",
+  "CRS_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "નવીનતમ કોર્સ ",
+  "CRS_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "કોર્સ છોડી દો?",
+  "CRS_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "કોર્સમાં જોડાવા માટે લૉગ ઇન કરો",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_COURSES": "કોર્સ નથી",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "કોર્સ અથવા લાઇબ્રેરીમાંથી કન્ટેન્ટ ડાઉનલોડ કરો",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "કોર્સ ({{%s}})",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "કોર્સ ({{%s}})",
+  "CRS_TRK_FRMELEMNTS_LBL_OVERLAY_LABEL_TAKE_COURSE": "આ કોર્સમાં જોડાવા માટે લોગ ઇન કરો.",
+  "CRS_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "લોકપ્રિય કોર્સ",
+  "CRS_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ઓનલાઇન કોર્સ લો.",
+  "CRS_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "પ્રમાણપત્ર લેવા માટે {{%s}} સુધીમાં કોર્સ પૂર્ણ કરો.",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING": "કોર્સ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "કોર્સમાં હાજરી આપી",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "કોર્સની વિગતો",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "કોર્સ સમાપ્ત થાય છે",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "કોર્સની અંતિમ તારીખ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "કોર્સની વિગતો",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "આ કોર્સ આ  માટે સંબંધિત છે:",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "કોર્સ મોડ્યુલ",
+  "CRS_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "કોર્સ છોડી દો",
+  "CRS_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "કોર્સ તપાસવા માંગો છો?",
+  "CRS_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "કોર્સની બેચ {{batch_start_date}}  પરથી ઉપલબ્ધ છે",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "તમને 7 દિવસની અંદર તમારી નોંધણી કરેલ સંપર્ક વિગતો પર કોર્સ સર્ટિફિકેટ વિશે સૂચિત કરવામાં આવશે",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "નોંધ: આ અભ્યાસક્રમમાં પ્રમાણપત્ર નથી",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "તમે કોર્સમાં જોડાયા છો.",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "નોંધ: હાલમાં, આ કોર્સ માટે કોઈ પ્રમાણપત્ર નથી. કોર્સ નિર્માતા પછીથી પ્રમાણપત્ર જોડી શકે છે.",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "તમે કોર્સ છોડી દીધો છે.",
+  "CRS_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "આ કોર્સ માટે કોઈ બૅચેસ નથી",
+  "CRS_TRK_FRMELEMNTS_MSG_OTHER_ROLE_DESC_2": "ઓનલાઇન કોર્સ લો",
+  "CRS_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "આ કોર્સ નોંધાયેલા વપરાશકર્તાઓ માટે છે. કોર્સ ઍક્સેસ કરવા માટે લૉગ ઇન કરો.",
+  "CRS_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "આ કોર્સ માટે કોઈ બેચ ઉપલબ્ધ નથી",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "ફક્ત નોંધાયેલા વપરાશકર્તાઓ જ કોર્સ લઈ શકે છે.",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "તમે આ કોર્સ સફળતાપૂર્વક પૂર્ણ કર્યો છે",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "કોર્સ સમાપ્ત થયો છે. તમે અસેસમેન્ટ ફરીથી કરી શકો છો પરંતુ, તમારી પ્રગતિ રેકોર્ડ કરવામાં આવશે નહીં.",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "કોર્સ સમાપ્ત થયો છે. તમે અસેસમેન્ટ કરી શકો છો પરંતુ, તમારી પ્રગતિ રેકોર્ડ કરવામાં આવશે નહીં.",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "કોર્સની માહિતી માટે અને ઍક્સેસ કરવા માટે તમારે સક્રિય બેચમાં જોડાવું આવશ્યક છે",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "કોર્સની વિગતોને એક્સેસ કરવા માટે તમારે લોગ ઇન કરવું આવશ્યક છે.",
   "CURRENT_LANGUAGE": "વર્તમાન ભાષા",
-  "DATA": "વધુ પુસ્તકો અને કન્ટેન્ટ જુઓ",
   "DATA_SYNC": "ડેટા સિંક",
   "DATA_SYNC_FAILURE": "ડેટા સમન્વયિત કરી શકાયા નથી, પછીથી ફરી પ્રયાસ કરો",
   "DATA_SYNC_NOTHING_TO_SYNC": "સિંક કરવા માટે કંઈ નથી",
   "DATA_SYNC_SUB": "તમારા ડેટા બૅકઅપ લો, ટેલિમેટ્રી ટ્રાન્સફર કરો",
   "DATA_SYNC_SUCCESSFUL": "ટેલિમેટ્રી ડેટા સફળતાપૂર્વક સમન્વયિત થયા.",
+  "DAYS_AGO": "{{%s}} દિવસો પહેલા",
+  "DAY_AGO": "{{%s}} દિવસ પહેલા",
   "DELETE": "કાઢી નાખો",
   "DELETE_ALL_CONTENT_WARNING": "તમારા ડિવાઇસ માંથી પસંદ કરેલ કન્ટેન્ટને દૂર કરવામાં આવશે",
   "DELETE_CONTENT": "કન્ટેન્ટ કાઢી નાખવું છે ?",
   "DELETE_CONTENT_SIZE": "૧ આઇટમ ({{content_size}})",
   "DELETE_CONTENT_WARNING": "કન્ટેન્ટ કાઢી નાખવાથી ડિવાઇસમાંથી કન્ટેન્ટ દૂર થઈ જશે",
-  "DELETE_GROUP": "ગ્રુપ કાઢી નાખો",
+  "DELETE_GROUP_DESC": "{{group_name}}ને કાઢી નાખવાથી એપ્લિકેશનમાંથી ગૃપ કાયમી રૂપે દૂર થઈ જશે",
+  "DELETE_GROUP_ERROR_MSG": "ગ્રુપ કાઢી નાખવામાં અસમર્થ. કૃપા કરીને પછીથી ફરી પ્રયાસ કરો...",
+  "DELETE_GROUP_POPUP_TITLE": "ગ્રુપ ડિલીટ કરી નાખવું છે?",
+  "DELETE_GROUP_SUCCESS_MSG": "ગ્રુપ સફળતાપૂર્વક કાઢી નાખ્યું",
   "DELETE_PROGRESS": "પસંદ કરેલ કન્ટેન્ટ કાઢી રહ્યાં છીએ ",
-  "DESCRIPTION": "વર્ણન",
+  "DETAIL_TUTORIAL": "{{%appName}} ની લાઇબ્રેરીમાં {{%explainVideos}}, {{%quesBanks}} અને અન્ય {{%interactiveMaterial}} નું હોસ્ટ છે. પુસ્તકાલયની શોધખોળ શરૂ કરવા માટે પાઠયપુસ્તક પર ક્લિક કરો!",
   "DEVICE_ID": "ડિવાઇસ ID",
   "DEVICE_LOCATION": "ડિવાઇસ લોકેશન",
   "DEVICE_TAGS": "ડિવાઇસ ટૅગ્સ",
   "DEVICE_TAGS_SUB": "ડિવાઇસ ટૅગ્સ ઉમેરો અથવા દૂર કરો",
-  "DISMISS": "કેન્સલ",
+  "DFLT_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "શરૂ કરવા માટે કોઈ કાર્ય પસંદ કરો",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "કાર્ય ",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "કાર્ય",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "કાર્ય",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}} ની લાઇબ્રેરીમાં {{%explainVideos}}, {{%quesBanks}} અને અન્ય {{%interactiveMaterial}} નું હોસ્ટ છે. પુસ્તકાલયની શોધખોળ શરૂ કરવા માટે પાઠયપુસ્તક પર ક્લિક કરો!",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": " {{%grade}} ({{%medium}}) માટે કોઈ પુસ્તકો મળ્યાં નથી",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "બોર્ડ કન્ટેન્ટ ઉમેરી રહ્યું છે.",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}} પર કોઈ કન્ટેન્ટ શોધી શક્યા નથી?",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span> નોંધ: </span>  પ્રગતિ ટ્રેક કરી શકાતી નથી",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "{{%s}}પર તમારું સ્ટેટ બોર્ડ તમારી વિનંતી કરેલો કન્ટેન્ટ અપલોડ કરશે કે તરત જ અમે તમને જાણ કરીશું.",
+  "DFLT_NONTRK_QR_CODE_DETAILS": "તમારી કોર્સમાંથી QR કોડ સ્કેન કરીને ડિજિટલ કન્ટેન્ટનો તાત્કાલિક ઍક્સેસ મેળવો.",
+  "DFLT_NONTRK_SEE_MORE_BOOKS": "વધુ જુઓ",
+  "DFLT_NONTRK_STUDENT_ROLE_DESC_1": "ડિજિટલ કન્ટેન્ટ બ્રાઉઝ કરો",
+  "DFLT_NONTRK_TEACHER_ROLE_DESC_1": "ડિજિટલ કન્ટેન્ટ બ્રાઉઝ કરો",
+  "DFLT_NONTRK_TUTORIAL_HEADING": "વિડિઓઝ, ઇન્ટરેક્ટિવ કન્ટેન્ટ, ઇ ટેક્સ્ટબુક અને વધુ ...",
+  "DFLT_TRK_BATCHEND_MAIN_HEADING": "તમે {{%s}} ના રોજ પૂર્ણ થયેલા અધ્યયન કાર્યની બેચમાં જોડાયા છો.",
+  "DFLT_TRK_BATCHEND_SUB_HEADING": "તમે ભણવાનું ચાલુ રાખી શકો છો, પરંતુ તમારી પ્રગતિ અપડેટ થશે નહીં",
+  "DFLT_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "તમે આ શીખવાની પ્રવૃત્તિ સમાપ્ત કરી છે",
+  "DFLT_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} દ્વારા પૂર્ણ શિક્ષણ",
+  "DFLT_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "આ શીખવાનું કાર્ય નિષ્ક્રિય છે",
+  "DFLT_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "શીખવાનું કાર્ય",
+  "DFLT_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "તમે આ શીખવાની ક્રિયામાં જોડાયા છો",
+  "DFLT_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "શીખવાની ક્રિયા માટેની બેચ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "શીખવાનું કાર્ય",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "મારા શીખવાની ક્રિયાઓ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "કાર્ય {{%s}} ના રોજ સમાપ્ત થયો",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "છેલ્લે {{last_updated_on_date}} પર અપડેટ કરાયું",
+  "DFLT_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "જોડાઓ",
+  "DFLT_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "નવીનતમ શીખવાની ક્રિયાઓ",
+  "DFLT_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "ટાસ્ક છોડી દો?",
+  "DFLT_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "જોડાવા માટે લૉગ ઇન કરો",
+  "DFLT_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "કન્ટેન્ટ ડાઉનલોડ કરો",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "કાર્ય ({{%s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "કાર્ય ({{%s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "ઓનલાઇન શિક્ષણ લો.",
+  "DFLT_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "લોકપ્રિય કાર્યો",
+  "DFLT_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ઓનલાઇન શિક્ષણ લો.",
+  "DFLT_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "પ્રમાણપત્ર લેવા માટે {{%s}} સુધીમાં કોર્સ પૂર્ણ કરો.",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING": "શીખવાનું કાર્ય",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "અધ્યયન કાર્ય (ઓ) માં ભાગ લીધો",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "કાર્ય વિગતો",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "કાર્ય સમાપ્ત થાય છે",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "કાર્ય સમાપ્તિ તારીખ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "કાર્ય વિગતો",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "આ કાર્ય આ માટે સંબંધિત છે:",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "કાર્ય સંસાધનો",
+  "DFLT_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "કાર્ય છોડી દો",
+  "DFLT_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "શીખવાની ક્રિયાઓ તપાસો?",
+  "DFLT_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "કાર્યની બેચ {{batch_start_date}} પરથી ઉપલબ્ધ છે",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "તમને 7 દિવસની અંદર તમારી નોંધણી કરેલ સંપર્ક વિગતો પર કોર્સ સર્ટિફિકેટ વિશે સૂચિત કરવામાં આવશે",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "નોંધ: આ કાર્યમાં પ્રમાણપત્ર નથી",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "તમે કાર્યમાં જોડાયા છો",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "નોંધ: હાલમાં, આ કોર્સ માટે કોઈ પ્રમાણપત્ર નથી. કોર્સ નિર્માતા પછીથી પ્રમાણપત્ર જોડી શકે છે.",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "તમે આ કાર્ય છોડી દીધો છે.",
+  "DFLT_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "આ શીખવાની ક્રિયા માટે કોઈ બેચ નથી",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "આ કાર્ય નોંધાયેલા વપરાશકર્તાઓ  માટે છે. કાર્ય ઍક્સેસ કરવા માટે લૉગ ઇન કરો.",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "આ કાર્ય શરૂ કરવા માટે લૉગ ઇન કરો",
+  "DFLT_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "આ કાર્ય માટે કોઈ બેચ ઉપલબ્ધ નથી",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "ફક્ત નોંધાયેલા વપરાશકર્તાઓ શીખવાની ક્રિયાઓ લઈ શકે છે",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "તમે સફળતાપૂર્વક કાર્ય પૂર્ણ કર્યું છે.",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "કાર્ય સમાપ્ત થયું છે. તમે અસેસમેન્ટ ફરીથી કરી શકો છો, પરંતુ, તમારી પ્રગતિ રેકોર્ડ કરવામાં આવશે નહીં.",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "કાર્ય સમાપ્ત થયું છે. તમે અસેસમેન્ટ કરી શકો છો પરંતુ, તમારી પ્રગતિ રેકોર્ડ કરવામાં આવશે નહીં.",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "કાર્યની માહિતી માટે અને ઍક્સેસ કરવા માટે તમારે સક્રિય બેચમાં જોડાવું આવશ્યક છે",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "accessકાર્યની વિગતોને એક્સેસ કરવા માટે તમારે લોગ ઇન કરવું આવશ્યક છે.",
+  "DISMISS": "રદ કરો",
+  "DISMISS_AS_GROUP_ADMIN": "ગ્રુપ એડમિન તરીકે કાઢી નાખો",
+  "DISMISS_AS_GROUP_ADMIN_ERROR_MSG": "{{member_name}} ની જૂથ એડમિન સ્થિતિને બરતરફ કરી શકી નથી",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_DESC": "{{member_name}} ને એડમિન તરીકે કાઢી નાખવાથી સભ્યની એડમિન પરવાનગી દૂર થાય છે",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_TITLE": "ગ્રુપ એડમિન તરીકે કાઢી નાખો?",
+  "DISMISS_AS_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}}  હવે ગ્રુપ એડમિન નથી",
   "DISTRICT": "જિલ્લો",
   "DISTRICT_OPTION_TEXT": "જિલ્લો પસંદ કરો",
-  "DOCS": "ડોક્યુમેન્ટ્સ ",
+  "DOC": "ડોક્યુમેન્ટ્સ ",
   "DOWNLOAD": "ડાઉનલોડ કરો",
-  "DOWNLOADING": "{{%s}}% ડાઉનલોડ થયું",
-  "DOWNLOADING_1": "{{%s}} ડાઉનલોડ કરી રહ્યું છે",
+  "DOWNLOADING": "{{%s}}% ડાઉનલોડ થઇ રહ્યું છે",
+  "DOWNLOADING_1": "{{%s}} ડાઉનલોડ થઇ રહ્યું છે",
   "DOWNLOADING_2": "ડાઉનલોડ થઇ રહ્યું છે",
   "DOWNLOADING_ATTACHMENT": "અટેચમેન્ટ ડાઉનલોડ થાય છે",
   "DOWNLOADING_CONTENT": "કન્ટેન્ટ ડાઉનલોડ કરી રહ્યા છીએ",
-  "DOWNLOADS": "ડાઉનલોડ ",
+  "DOWNLOADS": "ડાઉનલોડ કરો",
   "DOWNLOAD_ALL": "બધા કન્ટેન્ટ ડાઉનલોડ કરવા માંગો છો?",
   "DOWNLOAD_ALL_CONTENT": "બધું ડાઉનલોડ કરો",
   "DOWNLOAD_ALL_wSIZE": "{{%s}} ડાઉનલોડ કરો?",
@@ -188,29 +362,38 @@
   "DOWNLOAD_CONFIRMATION_TEXT": "કન્ટેન્ટ તમારા ડિવાઇસમાં  સાચવવામાં આવશે",
   "DOWNLOAD_CONTENT": "ડાઉનલોડ  ({{%s}})",
   "DOWNLOAD_FILE_INFO": "ડિસેબલ વિકલ્પોને ઈનેબલ કરવા માટે ફાઇલને ડાઉનલોડ કરો",
-  "DOWNLOAD_FILE_SIZE": "ફાઈલ સાઈઝ {{%s}}",
+  "DOWNLOAD_FILE_SIZE": "ફાઈલની સાઈઝ {{%s}}",
   "DOWNLOAD_NOT_ALLOWED_FOR_QUIZ": "આ કન્ટેન્ટ ડાઉનલોડ કરી શકાતું નથી.",
   "DOWNLOAD_NOW": "હવે ડાઉનલોડ કરો",
   "DOWNLOAD_PATH": "ફાઇલ ઇન્ટરનલ સ્ટોરેજ > ડાઉનલોડ ફોલ્ડરમાં સંગ્રહિત છે.",
   "EDIT": "સુધારો કરો",
-  "EDIT_EMAIL_POPUP_TITLE": "ઇ-મેઇલ ID માં  ફેરફાર કરો",
+  "EDIT_EMAIL_POPUP_TITLE": "ઇ-મેઇલ એડ્રેસમાં  સુધારો કરો",
   "EDIT_GROUP": "ગ્રૂપમાં સુધારો કરો",
-  "EDIT_PERSONAL_DETAILS": "વ્યક્તિગત વિગતોમાં ફેરફાર કરો",
+  "EDIT_PERSONAL_DETAILS": "વ્યક્તિગત વિગતોમાં સુધારો કરો",
   "EDIT_PHONE_POPUP_TITLE": "મોબાઇલ નંબરમાં ફેરફાર કરો",
   "EDIT_PROFILE": "પ્રોફાઇલમાં સુધારો કરો",
   "EMAIL_EDIT_SUCCESS": "ઇ-મેઇલ ID સફળતાપૂર્વક અપડેટ થયું ",
-  "EMAIL_ID_PLACEHOLDER": "ઇ-મેઇલ ID",
+  "EMAIL_ID_PLACEHOLDER": "ઇ-મેઇલ એડ્રેસ ",
   "EMAIL_PLACEHOLDER": "ઇ-મેઇલ ID દાખલ કરો",
   "EMAIL_UPDATE_SUCCESS": "ઇ-મેઇલ સફળતાપૂર્વક અપડેટ થયો",
-  "EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}} માટે કોઈ પુસ્તકો ઉપલબ્ધ નથી ",
+  "EMPTY_LIBRARY_TEXTBOOK_FILTER": "Books {{%grade}} ({{%medium}}) માટે કોઈ પુસ્તકો મળ્યાં નથી",
   "EMPTY_SEARCH_RESULTS": "કોઈ પરિણામ મળ્યું નથી",
+  "EMPTY_SEARCH_RESULT_GROUPS": "માફ કરશો! તમારી શોધ સાથે મેળ ખાતા પરિણામો નથી. ",
   "ENDORSE": "સમર્થન",
   "ENJOYED_THIS_CONTENT": "આ કન્ટેન્ટને આનંદ લીધો?",
   "ENROLL": "નોંધણી કરો",
+  "ENROLLMENT_ENDED_ON": "નોંધણી {{%s}}  પર સમાપ્ત થઈ",
   "ENROLLMENT_LAST_DATE": "નોંધણી માટેની છેલ્લી તારીખ:",
-  "ENTER_GROUP_NAME": "ગૃપનુ નામ દાખલ કરો",
+  "ENTER_GROUP_NAME": "ગૃપનું નામ દાખલ કરો",
+  "ENTER_ID": "ID દાખલ કરો",
+  "ENTER_ID_AS_REQUESTED_BY_STATE_BOARD_ORG": "તમારા રાજ્ય / બોર્ડ / સંગઠન દ્વારા વિનંતી કરેલી ID દાખલ કરો",
+  "ENTER_LOCATION_FROM_PROFILE_PAGE": "પ્રોફાઇલ પેઇઝથી સ્થાન દાખલ કરો",
+  "ENTER_MEMBER_ID": "{{app_name}} ID દાખલ કરો",
   "ENTER_OTP": "OTP દાખલ કરો",
   "ENTER_PHONE_POPUP_TITLE": "મોબાઇલ નંબર દાખલ કરો",
+  "ENTER_SCHOOL_NAME": "શાળાનું  નામ દાખલ કરો",
+  "ENTER_THE_FOLLOWING_INFORMATION": "નીચેની માહિતી દાખલ કરો",
+  "ENTER_UDISE_ID": "UDISE ID દાખલ કરો",
   "ERROR_BATCH_NOT_STARTED": "બેચ શરૂ થય નથી",
   "ERROR_CANT_OPEN_EMPTY_CONTENT": "ફાઇલ ખાલી હોવાથી ઓપન થતી નથી",
   "ERROR_CONTENT_NOT_AVAILABLE": "કન્ટેન્ટ ઉપલબ્ધ નથી",
@@ -223,21 +406,32 @@
   "ERROR_FAILED_TO_DOWNLOAD_ATTACHMENT": "અટેચમેન્ટ ડાઉનલોડ થઈ શક્યા નથી",
   "ERROR_FETCHING_DATA": "ડેટા લાવવામાં અસમર્થ",
   "ERROR_LOW_MEMORY": "ટ્રાન્સફર  માટે પૂરતી જગ્યા ઉપલબ્ધ નથી",
+  "ERROR_MAXIMUM_ACTIVITY_COUNT_EXCEEDS": "તમે જૂથ માટે ઉમેરી શકાય તેવી પ્રવૃત્તિઓની મહત્તમ સંખ્યાને વટાવી દીધી છે",
+  "ERROR_MAXIMUM_GROUP_COUNT_EXCEEDS": "તમે બનાવી શકાય તેવા જૂથોની મહત્તમ સંખ્યાને વટાવી દીધી છે",
+  "ERROR_MAXIMUM_MEMBER_COUNT_EXCEEDS": "તમે જૂથમાં ઉમેરી શકાય તેવા સભ્યોની મહત્તમ સંખ્યાને વટાવી દીધી છે",
   "ERROR_NAME_INVALID": "નામ માટે ફક્ત મૂળાક્ષરો અથવા ખાલી જગ્યા દાખલ કરો",
   "ERROR_NO_BATCHES_FOUND": "આ કોર્સ માટે કોઈ બૅચેસ નથી",
   "ERROR_NO_INTERNET_MESSAGE": "ઇન્ટરનેટ ઍક્સેસ નથી",
-  "ERROR_NO_OFFLINE_RESOURCE": "કોઈ રિસોર્સ સંગ્રહિત નથી",
+  "ERROR_NO_OFFLINE_RESOURCE": "કોઈ સંસાધનો સંગ્રહિત નથી",
   "ERROR_OFFLINE_MODE": "કોઈ ઇન્ટરનેટ નથી, ઑફલાઇન મોડ છે ",
   "ERROR_OTP": "અમાન્ય OTP.  {{%s}} પ્રયત્નો બાકી રહેલા છે. ",
+  "ERROR_OTP_LIMIT_EXCEEDED": "તમે મહત્તમ OTP મર્યાદા ઓળંગી ગઈ છે, પછીથી ફરી પ્રયાસ કરો",
   "ERROR_PHONE_EXISTS": "આ ફોન નંબર પહેલાથી જ અસ્તિત્વમાં છે. બીજો ફોન નંબર દાખલ કરો",
   "ERROR_PHONE_INVALID": "માન્ય ફોન નંબર દાખલ કરો",
+  "ERROR_PHONE_REQUIRED": "મોબાઇલ નંબર આવશ્યક છે",
   "ERROR_SAME_EMAIL_UPDATED": "આ ઇ-મેઇલ ID પહેલેથી જ તમારી પ્રોફાઇલ સાથે જોડાયેલ છે. બીજુ  ઇ-મેઇલ ID દાખલ કરો",
   "ERROR_SAME_PHONE_UPDATED": "આ મોબાઇલ નંબર પહેલેથી જ તમારી પ્રોફાઇલ સાથે જોડાયેલ છે. બીજો મોબાઇલ નંબર દાખલ કરો",
   "ERROR_SERVER_CONNECTION": "સર્વર સાથે સંપર્ક કરવામાં અસમર્થ છો ",
+  "ERROR_SPECIAL_CHARECTERS_NOT_ALLOWED": "વિશિષ્ટ અક્ષરોની મંજૂરી નથી",
   "ERROR_TECHNICAL_PROBLEM": "ટેકનિકલ પ્રોબલેમ કારણે તમારી વિનંતિ પર પ્રક્રિયા કરવામાં અસમર્થ છીએ ",
   "ERROR_UPLOADING_IMG": "ઇમેજ અપલોડ કરતી વખતે ભૂલ",
-  "ERROR_USER_ACCOUNT_BLOCKED": "યુઝરનું  ખાતું બંધ થઇ ગયું છે. કૃપા કરીને ઍડમીનનો સંપર્ક કરો.",
+  "ERROR_USER_ACCOUNT_BLOCKED": "વપરાશકર્તાનું ખાતું બંધ થઇ ગયું છે. કૃપા કરીને ઍડમીનનો સંપર્ક કરો.",
+  "ERROR_WHILE_ADDING_USER": "વપરાશકર્તા ઉમેરતી વખતે ભૂલ",
+  "ERROR_WHILE_FETCHING_USERS": "વપરાશકર્તાઓની  મેળવતી વખતે થતી ભૂલ",
   "ERROR_WHILE_LOGIN": "લૉગ ઇન કરતી વખતે ભૂલ",
+  "ERROR_WHILE_SWITCHING_USER": "વપરાશકર્તા સ્વિચ કરતી વખતે ભૂલ",
+  "EXPLORE_HEADING": "{{%s}} પર વધુ એક્સપ્લોર કરો",
+  "EXP_VIDEOS": "એક્સપ્લેનેશન વિડિઓઝ",
   "EXTRACTING_CONTENT": "{{%s}} કન્ટેન્ટ એક્સટ્રેક્ટ થઇ રહ્યું છે.",
   "FEEDBACK_HINT": "ફીડબેક (વૈકલ્પિક)",
   "FEEDBACK_HINT_1": "અહીં  ટિપ્પણી ઉમેરો",
@@ -252,23 +446,194 @@
   "FILTER": "ફિલ્ટર કરો",
   "FILTER_ADDED": "ઉમેરાયેલ",
   "FILTER_BY": "દ્વારા ફિલ્ટર કરો",
-  "FIRST_NAME": "નામ",
   "FOLLOW": "અનુસરો",
   "FORCE_UPDATE_MESSAGE": "તમે {{%s}} એપ્લિકેશનનું જૂનું વર્ઝન વાપરી રહ્યા છો. ગૂગલ પ્લેસ્ટોર પરથી નવું વર્ઝન મેળવવા માટે, અપડેટ પર ટેપ કરો",
+  "FORUM": "મંચ",
+  "FOR_SUPPORT": "{{%s}} સપોર્ટ માટે",
   "FREE_SPACE": "ખાલી જગ્યા:",
+  "FRMELEMENTS_BTN_ACTIVATEGRP": "સક્રિય",
+  "FRMELEMENTS_BTN_ADD": "ઉમેરો",
+  "FRMELEMENTS_BTN_BACK": "બેક(પાછળ )",
+  "FRMELEMENTS_BTN_DEACTIVATEGRP": "નિષ્ક્રિય કરો",
+  "FRMELEMENTS_BTN_NEXT": "આગળ",
+  "FRMELEMENTS_LBL_ACTIVATEGRP": "ગ્રુપ સક્રિય કરો",
+  "FRMELEMENTS_LBL_ACTIVATEGRPQUES": "ગ્રુપ સક્રિય કરો?",
+  "FRMELEMENTS_LBL_CONTENT_TYPE": "કન્ટેન્ટના પ્રકારો",
+  "FRMELEMENTS_LBL_DEACTIVATEGRP": "ગ્રૂપને  નિષ્ક્રિય કરો",
+  "FRMELEMENTS_LBL_DEACTIVATEGRPQUES": "ગ્રૂપને નિષ્ક્રિય કરવું છે?",
+  "FRMELEMENTS_LBL_REMARKS": "ટીકાઓ(રિમાર્કસ)",
+  "FRMELEMENTS_MSG_ACTIVATEGRPFAILED": "ગ્રુપને સક્રિય કરી શક્યું નહીં, પછીથી ફરી પ્રયાસ કરો",
+  "FRMELEMENTS_MSG_ACTIVATEGRPMSG": "ગ્રુપને સક્રિય કરવાથી તમને સભ્યો અને પ્રવૃત્તિઓ ઉમેરવા માટે સક્ષમ બનાવે છે. તમે સભ્યની પ્રગતિને પણ ચકાસી શકો છો",
+  "FRMELEMENTS_MSG_ACTIVATEGRPPOPUP": "આ જૂથ અસ્થાયીરૂપે નિષ્ક્રિય છે. જો જરૂરી હોય તો જૂથ એડમિન જૂથને ફરીથી સક્રિય કરી શકે છે. જૂથના સભ્યો ચર્ચા મંચ પર તેમની ચર્ચાઓ ચાલુ રાખી શકે છે.",
+  "FRMELEMENTS_MSG_ACTIVATEGRPSUCCESS": "ગ્રુપને સફળતાપૂર્વક સક્રિય થયું",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPFAILED": "ગ્રુપને નિષ્ક્રિય કરી શક્યું નહીં, પછીથી ફરી પ્રયાસ કરો",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPMSG": "ગ્રુપને સ્થગિત કરવાથી તે સક્રિય ગ્રુપની સૂચિમાંથી દૂર થશે.  તમે ગ્રુપમાં પ્રવૃત્તિઓ અથવા સભ્યો ઉમેરી શકતા નથી.  તમે તેના સભ્યની પ્રગતિ ચકાસી શકશો નહીં\n\n",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPSUCCESS": "ગ્રુપ સફળતાપૂર્વક નિષ્ક્રિય કર્યું",
+  "FRMELEMNTS_BTN_CLOSE": "બંધ કરો",
+  "FRMELEMNTS_BTN_DONOT_SHARE": "શેર કરશો નહીં",
+  "FRMELEMNTS_BTN_EDIT_SETTING": "સેટિંગ્સ અપડેટ કરો",
+  "FRMELEMNTS_BTN_PREVIEW_FORM": "ફોર્મનું પૂર્વાવલોકન કરો",
+  "FRMELEMNTS_BTN_SAVE": "સાચવો (સેવ કરો)",
+  "FRMELEMNTS_BTN_SAVE_EDITS": "સંપાદનો સાચવો",
+  "FRMELEMNTS_BTN_SAVE_FORM": "ફોર્મ સાચવો",
+  "FRMELEMNTS_BTN_SEEK_HELP": "મદદ મેળવો",
+  "FRMELEMNTS_BTN_SUBMIT_FORM": "ફોર્મ સબમિટ કરો",
+  "FRMELEMNTS_BTN_VIEW_DETAILS": "માહિતી જુઓ",
+  "FRMELEMNTS_CKBX_CERTMSG": "આ સંદેશ ફરીથી બતાવશો નહીં",
+  "FRMELEMNTS_LBL_ACCESSIBILITY": "સ્ક્રીન રીડર ઍક્સેસ",
+  "FRMELEMNTS_LBL_ACCESSIBILITYMODE": "ડાર્ક મોડ પર સ્વિચ કરો",
+  "FRMELEMNTS_LBL_ACCESSIBILITYSKIP": "મુખ્ય વિષયવસ્તુ પર જાઓ",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXT": "સાઇટ મેપ",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXTSIZE": "ફોન્ટ કદ વધારો",
+  "FRMELEMNTS_LBL_ADD_ATTACHMENTS": "જોડાણો ઉમેરો",
+  "FRMELEMNTS_LBL_ADD_ENTITY": "એન્ટિટી ઉમેરો",
+  "FRMELEMNTS_LBL_ADD_NEW_TASK": "નવું કાર્ય ઉમેરો",
+  "FRMELEMNTS_LBL_ADD_REMARKS": "ટિપ્પણી ઉમેરો",
+  "FRMELEMNTS_LBL_ADD_SUBTASK": "સબટાસ્ક  ઉમેરો",
+  "FRMELEMNTS_LBL_ADD_SUBTASK_PALCEHOLDER": "સબટાસ્કનું નામ ઉમેરો",
+  "FRMELEMNTS_LBL_ADD_TASK": "ટાસ્ક ઉમેરો",
+  "FRMELEMNTS_LBL_ASSIGNED_TO": "સોંપેલ",
+  "FRMELEMNTS_LBL_ASSIGN_TASK": "સોંપેલ કાર્ય",
+  "FRMELEMNTS_LBL_ATTACH": "જોડો",
+  "FRMELEMNTS_LBL_ATTACHMENTS": "અટેચમેન્ટ્સ ",
+  "FRMELEMNTS_LBL_BLOCK": "બ્લોક",
+  "FRMELEMNTS_LBL_CATEGORIES": "શ્રેણીઓ",
+  "FRMELEMNTS_LBL_CATEGORY_OVERVIEW": "વર્ગ અવલોકન",
+  "FRMELEMNTS_LBL_CLICK_HELP": "સહાય બટન પર ક્લિક કરો",
+  "FRMELEMNTS_LBL_CLICK_HERE_TO_VIEW_LIBRARY": "પુસ્તકાલય જોવા માટે અહીં ક્લિક કરો",
+  "FRMELEMNTS_LBL_CLUSTER": "ક્લસ્ટર",
+  "FRMELEMNTS_LBL_CONSENT_POPUP_INFO": "તમે આ વિગતોને તમારા પ્રોફાઇલ પેજથી બદલાવી શકો છો",
+  "FRMELEMNTS_LBL_CONTENT_AVAIALABLE_IN_OTHER_BOARD": "અન્ય બોર્ડમાં તમારી આવશ્યકતાને અનુરૂપ રસપ્રદ સામગ્રી હોઈ શકે છે!",
+  "FRMELEMNTS_LBL_CONTENT_FOUND": "અમને કેટલાક કન્ટેન્ટ મળ્યા છે જે તમારી જરૂરિયાત સાથે મેળ ખાય છે!",
+  "FRMELEMNTS_LBL_CONTENT_TO_BE_ADDED": "તમારું બોર્ડ હજી વધુ પુસ્તકો ઉમેરવા માટે બાકી છે.",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT": "તમારી કન્ટેન્ટ શોધી શકી નથી? નીચે બટનો પર ક્લિક કરો",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT_YET": "તમારી કન્ટેન્ટ શોધી શક્યા નથી? નીચે બટનો પર ક્લિક કરો",
+  "FRMELEMNTS_LBL_CRITERIA_WISE": "માપદંડ મુજબની",
+  "FRMELEMNTS_LBL_DATA_SETTINGS": " ડેટા સેટિંગ્સ",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF": "પ્રોફાઇલ ડેટા શેરિંગ બંધ છે",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF_INFO": "તમે તમારી પ્રોફાઇલ વિગતો કોર્સ સંચાલક સાથે શેર કરવા માટે સંમત થયા નથી",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON": "પ્રોફાઇલ ડેટા શેરિંગ ચાલુ છે",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON_INFO": "તમે તમારી પ્રોફાઇલ વિગતો કોર્સના સંચાલક સાથે શેર કરવા માટે સંમત થયા છો",
+  "FRMELEMNTS_LBL_DELETE_CONFIRMATION": "શું તમે ખરેખર તમારા સબટાસ્કને કાઢી નાખવા માંગો છો?",
+  "FRMELEMNTS_LBL_DONOT_SHARE_PROFILE_INFO": "મારી પ્રોફાઇલ વિગતો શેર કરશો નહીં",
+  "FRMELEMNTS_LBL_DURATION": "સમયગાળો",
+  "FRMELEMNTS_LBL_EMAIL_ID_PLACEHOLDER": "રાજ્ય / સંગઠન માટે ઇમેઇલ આઈડી",
+  "FRMELEMNTS_LBL_END_DATE": "અંતિમ તારીખ",
+  "FRMELEMNTS_LBL_FILES": "ફાઇલો",
+  "FRMELEMNTS_LBL_IMAGES": " છબીઓ",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS": "પ્રોજેક્ટ રિપોર્ટ્સ ",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS_DESC": "પ્રોજેક્ટ્સ રિપોર્ટ્સ જુઓ",
+  "FRMELEMNTS_LBL_IN_PROGRESS": "પ્રગતિમાં છે",
+  "FRMELEMNTS_LBL_LEARNER_PASSBOOK": "શીખનાર પાસબુક",
+  "FRMELEMNTS_LBL_LEARNING_RESOURCES": "શીખવાની સંસાધનો",
+  "FRMELEMNTS_LBL_LINK_LEARNING_RESOURCES": "લિંક શીખવાના સંસાધનો",
+  "FRMELEMNTS_LBL_MEDIA_TYPE": "મીડિયાના  પ્રકાર",
+  "FRMELEMNTS_LBL_MOBILE_NUMBER_PLACEHOLDER": "રાજ્ય / સંગઠન માટે મોબાઇલ નંબર",
+  "FRMELEMNTS_LBL_MY_LEARNINGS": "મારુ અધ્યયન",
+  "FRMELEMNTS_LBL_NEW_TASK": "નવું કાર્ય",
+  "FRMELEMNTS_LBL_NO_MATCHING_CONTENT": "મેળ ખાતી કોઈ કન્ટેન્ટ મળી નથી",
+  "FRMELEMNTS_LBL_OBJECTIVE": "ઉદ્દેશ્ય",
+  "FRMELEMNTS_LBL_OBSERVATION": "નિરીક્ષણ",
+  "FRMELEMNTS_LBL_OBSERVATION_DESC": "તમારા વર્ગખંડ અને શાળા નિરીક્ષણો સરળતાથી ઍક્સેસ કરો અને રેકોર્ડ કરો અને તમારી સુધારણાની મુસાફરીની યોજના બનાવો",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS": "નિરીક્ષણ અહેવાલો",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS_DEC": "નિરીક્ષણ અહેવાલો જુઓ",
+  "FRMELEMNTS_LBL_OBSERVE_AGAIN": "ફરીથી અવલોકન કરો",
+  "FRMELEMNTS_LBL_OPEN_BATCH_NOT_RECOMMENDED": "જો તમે અગાઉના બેચમાં આ અભ્યાસક્રમ પહેલાથી જ પૂર્ણ કરી લીધો હોય તો જોડાવાની ભલામણ કરવામાં આવતી નથી કારણ કે તમારો શીખવાનો ઇતિહાસ અને પ્રમાણપત્રો ફરીથી સેટ કરવામાં આવશે",
+  "FRMELEMNTS_LBL_PERSONA": "ભૂમિકા ",
+  "FRMELEMNTS_LBL_PROFCONF": "પ્રોફાઇલ નામની પુષ્ટિ",
+  "FRMELEMNTS_LBL_PROFTITLE": "પ્રોફાઇલ નામ",
+  "FRMELEMNTS_LBL_PROGRAM_NAME": "પ્રોગ્રામનું નામ",
+  "FRMELEMNTS_LBL_PROJECT": "પ્રોજેક્ટ",
+  "FRMELEMNTS_LBL_PROJECT_DESCRIPTION": "કાર્યો અને સમયરેખાઓનું આયોજન કરીને તમારા શાળા સુધારાને મેનેજ કરો અને ટ્રેક કરો",
+  "FRMELEMNTS_LBL_PROJECT_OVERVIEW": "પ્રોજેક્ટ અવલોકન",
+  "FRMELEMNTS_LBL_PROJECT_STATUS": "પ્રોજેક્ટ સ્થિતિ",
+  "FRMELEMNTS_LBL_PROJECT_TITLE": "પ્રોજેક્ટ શીર્ષક",
+  "FRMELEMNTS_LBL_PROJECT_VIEW": "પ્રોજેક્ટ વ્યૂ",
+  "FRMELEMNTS_LBL_QUESTION_WISE": "પ્રશ્નો",
+  "FRMELEMNTS_LBL_RELEVANT_CONTENT_SUB_HEADING": "તમારી વિશિષ્ટ કન્ટેન્ટ આવશ્યકતાઓ માટે વિગતો ભરો",
+  "FRMELEMNTS_LBL_REPORTS": "અહેવાલો ",
+  "FRMELEMNTS_LBL_REPORTS_DESC": "અહેવાલો સૂચિ \"",
+  "FRMELEMNTS_LBL_REQUEST_CONTENT": "કન્ટેન્ટની વિનંતી કરવા માંગો છો??",
+  "FRMELEMNTS_LBL_SCHOOL": "શાળા",
+  "FRMELEMNTS_LBL_SELECT_CATEGORIES": "શ્રેણીઓ પસંદ કરો",
+  "FRMELEMNTS_LBL_SELECT_PROGRAM": " કાર્યક્રમ પસંદ કરો",
+  "FRMELEMNTS_LBL_SET_DATE": "તારીખ સેટ કરો",
+  "FRMELEMNTS_LBL_SET_DATE_HINT": "તમારા પ્રોજેક્ટ માટે સમયરેખા સેટ કરો",
+  "FRMELEMNTS_LBL_SHARE_PROFILE_INFORMATION": "મારી પ્રોફાઇલ વિગતો શેર કરો",
+  "FRMELEMNTS_LBL_START_DATE": "પ્રારંભ તારીખ",
+  "FRMELEMNTS_LBL_STATUS": "સ્ટેટ્સ ",
+  "FRMELEMNTS_LBL_SUBPERSONA": "પેટા ભૂમિકા",
+  "FRMELEMNTS_LBL_SUBTASKS": "સબટાસ્ક્સ",
+  "FRMELEMNTS_LBL_SURVEY": "સર્વે ",
+  "FRMELEMNTS_LBL_SURVEY_ACTION": "સર્વે ક્રિયાઓ",
+  "FRMELEMNTS_LBL_SURVEY_DESC": "સર્વે સૂચિઓ",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS": "સર્વે રિપોર્ટ્સ",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS_DESC": "સર્વે રિપોર્ટ્સ જુઓ",
+  "FRMELEMNTS_LBL_TAB_HOME": "હોમ ",
+  "FRMELEMNTS_LBL_TASK_DESCRIPTION": "કાર્ય વર્ણન",
+  "FRMELEMNTS_LBL_TASK_OVERVIEW": "કાર્ય અવલોકન",
+  "FRMELEMNTS_LBL_THIS_MONTH": "આ મહિને",
+  "FRMELEMNTS_LBL_TOTAL_TASKS": "કુલ કાર્યો",
+  "FRMELEMNTS_LBL_UPCOMING": "આગામી ",
+  "FRMELEMNTS_LBL_UPDATE_DATA_SETTINGS": "સેટિંગ્સ અપડેટ કરો",
+  "FRMELEMNTS_LBL_USERTYPE_LEADER": "મુખ્ય શિક્ષક અથવા અધિકારીઓ",
+  "FRMELEMNTS_LBL_VIEW_ENTITY_REPORT": "એન્ટિટી રિપોર્ટ જુઓ",
+  "FRMELEMNTS_LBL_VIEW_FULL_REPORT": "સંપૂર્ણ અહેવાલ જુઓ",
+  "FRMELEMNTS_LBL_VIEW_RESOURCES": "સંસાધનો જુઓ",
+  "FRMELEMNTS_MSG_BATCH_ALREADY_CLOSED": "આ બેચ માટે નોંધણી {endDate} પર બંધ છે\n\n",
+  "FRMELEMNTS_MSG_CONSENT_DECLARATION_INFO": "તમે તમારા પ્રોફાઇલ પૃષ્ઠથી તમારી વિગતોને સંપાદિત કરી શકો છો",
+  "FRMELEMNTS_MSG_DATA_SETTINGS_SUBMITED_SUCCESSFULLY": "તમારી ડેટા સેટિંગ્સ સફળતાપૂર્વક સબમિટ થઈ છે",
+  "FRMELEMNTS_MSG_DELETE_TASK_CONFIRMATION": "શું તમે ખરેખર કાર્યને કાઢી નાખવા માંગો છો?",
+  "FRMELEMNTS_MSG_EDITCERTNAME": "તમે તેને તમારા પ્રોફાઇલ પૃષ્ઠથી સંપાદિત કરી શકો છો.",
+  "FRMELEMNTS_MSG_LOAD_FROM_LIBRARY": "લાઇબ્રેરીમાંથી લોડ કરો",
+  "FRMELEMNTS_MSG_NAMEONCERT": "આ નામ તમારા કોર્સના પ્રમાણપત્ર પર છાપવામાં આવશે. તે સાચું છે કે નહીં તે તપાસો.",
+  "FRMELEMNTS_MSG_SELECT_IMAGE_SOURCE": "છબીનો સ્રોત પસંદ કરો",
+  "FRMELEMNTS_MSG_SELFDECLARATION_SUCCESS_INFO": "જો તમને જરૂર હોય તો તમે તમારી પ્રોફાઇલમાંથી આ માહિતીને સંપાદિત કરી શકો છો",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED": "સફળતાપૂર્વક જોડાયેલ",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_SYNCED": "પ્રોજેક્ટને સફળતાપૂર્વક સમન્વયિત કર્યો",
+  "FRMELEMNTS_MSG_TICKET_SUBMISSION_SUCCESS": "અમે તમારા પ્રતિસાદની પ્રશંસા કરીએ છીએ. અમે દરેક રિપોર્ટનો જવાબ આપી શકતા નથી, પરંતુ તમારી સબમિશંસ અમને દરેક માટે {{app_name}} વધુ સારી બનાવવામાં મદદ કરે છે.",
+  "FRMELEMNTS_MSG_UNABLE_TO_ENROLL": "હવે નોંધણી દૂર કરાવી શકાતી નથી.પછી ફરીથી પ્રયાસ કરો",
+  "FRMELEMNTS_MSG_UPDATED_SUCCESSFULLY": "સફળતાપૂર્વક અપડેટ કર્યું",
+  "FRMELEMNTS_MSG_USER_CREATION_LIMIT_EXCEEDED": "વપરાશકર્તા બનાવવાની મર્યાદા ઓળંગી ગયા છો",
+  "FRMELEMNTS_MSG_USE_CAMERA": "કૅમેરો વાપરો",
+  "FRMELEMNTS_MSG_USE_FILE": "ફાઇલ વાપરો",
+  "FRMELEMNTS_MSG_YOUR_CHANGES_ARE_SAVED": "તમારા ફેરફારો સફળતાપૂર્વક સાચવવામાં આવ્યા છે.",
+  "FRMELENTS_LBL_ACCESSIBILITYNORMALMODE": "લાઇટ મોડ પર સ્વિચ કરો",
+  "FRMELMNTS_BLTPT_EARNCERT": "પ્રમાણપત્રો ફક્ત {{STATE}} રાજ્ય વપરાશકર્તાઓને જ આપવામાં આવે છે",
+  "FRMELMNTS_BLTPT_EARNCERT2": "તમારા આકારણીમાં {{PERCENTAGE}}ઉપરનો સ્કોર",
+  "FRMELMNTS_BLTPT_EARNCERT3": "પ્રમાણપત્ર કમાવવા માટે તમે ફક્ત આકારણીનો પ્રયાસ કરી શકો છો {attempts} વાર. ",
+  "FRMELMNTS_IMSG_DECLAREINFO": "આ અભ્યાસક્રમ માટેના પ્રમાણપત્રો ફક્ત રાજ્ય દ્વારા માન્ય શિક્ષકો માટે જ આપવામાં આવે છે",
+  "FRMELMNTS_IMSG_LASTATTMPALRT": "આ છેલ્લો બાકી પ્રયાસ છે",
+  "FRMELMNTS_IMSG_LASTATTMPTEXCD": "તમે સબમિટ કરી શકાય તેવા પ્રયત્નોની મહત્તમ સંખ્યાને વટાવી દીધી છે",
+  "FRMELMNTS_LBL_ACCESSIBILITYFNTDFLT": "ડિફોલ્ટ પર ફરીથી સેટ કરો",
+  "FRMELMNTS_LBL_ACCESSIBILITYFONT": "ફોન્ટ કદ ઘટાડો",
+  "FRMELMNTS_LBL_AVSCORE": "શ્રેષ્ઠ આકારણી સ્કોર્સની સરેરાશ",
+  "FRMELMNTS_LBL_BESTSCORE": "શ્રેષ્ઠ સ્કોર {{SCORE}}",
+  "FRMELMNTS_LBL_CERTQUES": "તમે તમારું પ્રમાણપત્ર કેવી રીતે કમાઇ શકો છો?",
+  "FRMELMNTS_LBL_NOTIFNUMBER": "{{NUMBER}} નવી સૂચના",
+  "FRMELMNTS_LBL_SEELESS": "ઓછું જુઓ",
+  "FRMELMNTS_LBL_SEEMORE": "વધુ જુઓ",
+  "FRMELMNTS_LBL_STATEUSERQUES": "શું તમે રાજ્ય શિક્ષક છો?",
+  "FRMELMNTS_LNK_DECLARELINK": "હવે ઘોષણા કરો",
+  "FRMELMNTS_PRMPT_DECLAREPROMPT": "તમારું પ્રમાણપત્ર કમાવવા માટે તમારી માહિતી {instance} પર જાહેર કરો",
+  "FRMELMNTS_SCTTL_NOTIFHEADER": "સૂચનાઓ",
   "FROM": "માંથી",
   "FULL_NAME": "નામ",
-  "GOT_IT": "ઠીક હૈ",
+  "GET_STARTED": "શરૂ કરો",
+  "GOT_IT": "બરાબર, સમજાયું",
+  "GO_TO_DOWNLOADS": "ડાઉનલોડ્સ પર જાઓ",
+  "GO_TO_PROFILE": "પ્રોફાઇલ પર જાઓ",
   "GRADE_OPTION_TEXT": "વર્ગ પસંદ કરો",
   "GRANT_ACCESS": "મંજૂરી આપો",
-  "GROUPS": "જૂથો",
-  "GROUPS_YOU_FOLLOW": "તમે અનુસરો છો તે ગ્રુપ ",
-  "GROUP_CREATE_SUCCESS": "ગૃપ સફળતાપૂર્વક બની ગયું છે",
-  "GROUP_DELETE_CONFIRM": "'{{%s}}' કાઢી નાંખવું જ છે તે નક્કી કરો ?",
-  "GROUP_DELETE_CONFIRM_MESSAGE": "આ પ્રક્રિયા ગૃપને કાઢી નાખશે પરંતુ યુઝર્સને નહીં. યુઝર્સ 'યુઝર્સ' ટેબ હેઠળ મળી શકે છે",
-  "GROUP_MEMBER_ADD_SUCCESS": "સફળતાપૂર્વક સભ્યો ઉમેરાયા",
-  "GROUP_MEMBER_DELETE_SUCCESS": "ગ્રુપના સભ્યો સફળતાપૂર્વક કાઢી નાખ્યાં",
-  "GROUP_NAME": "જૂથનું નામ",
+  "GROUP_CREATED": "ગ્રુપ સફળતાપૂર્વક બની ગયું છે",
+  "GROUP_CREATED_BY": "{{group_creator_name}} દ્વારા બનાવેલ",
+  "GROUP_DESCRIPTION": "ગ્રુપ વર્ણન",
+  "GROUP_DESCRIPTION_PLACEHOLDER": "સભ્યોને ગૃપના હેતુને સમજવામાં સહાય માટે વર્ણન દાખલ કરો",
+  "GROUP_GUIDELINES": "ગ્રુપ દિશાનિર્દેશો",
+  "GROUP_MEMBER_SEARCH_PLACEHOLDER": "ગ્રુપમાં શોધો",
+  "GROUP_NAME": "ગૃપનું  નામ",
+  "GROUP_NAME_IS_REQUIRED": "તમારે ગૃપનું  નામ દાખલ કરવું પડશે",
+  "GROUP_TERMS_IS_REQUIRED": "તમારે આગળ વધતા પહેલાં, તમારે {{app_name}} સેવાની શરતોથી સંમત થવું પડશે",
   "GROUP_UPDATE_SUCCESS": "ગ્રુપ વિગતો સફળતાપૂર્વક અપડેટ થઈ",
   "HABIT_REMINDER_NOTIFICATION_MESSAGE": "આજે {{%s}} પર કંઈક નવું શીખો!",
   "HELP": "મદદ",
@@ -277,8 +642,9 @@
   "HIDE_CREDITS_INFO": "લાઇસન્સિંગ માહિતી છુપાવો",
   "HINT_LANGUAGE": "પસંદગીની ભાષા ચયન કરો",
   "HOBBIES": "શોખ",
-  "IAM_ABOVE_18_YEARS_AGE": "મારી ઉંમર 18 વર્ષથી ઉપર છે",
-  "IF_YES_LOGIN": "જો હા, તો લોગ ઈન પર ક્લિક કરો",
+  "HOURS_AGO": "{{%s}} કલાક પહેલા",
+  "HOUR_AGO": "{{%s}} કલાક પહેલા",
+  "ID_IS_REQUIRED": "ID આવશ્યક છે.",
   "IMPORTING": "આયાત થઇ રહ્યું છે...",
   "IMPORTING_COUNT": "આયાત કરી રહ્યું છે",
   "IMPORT_ECAR": "અસંગત ફાઇલ ફોર્મેટ. તમે ફક્ત .ecar, .epar અને .gsa ફાઇલોને આયાત કરી શકો છો",
@@ -287,60 +653,97 @@
   "INACTIVE": "નિષ્ક્રિય",
   "INCORRECT_TEACHER_ID_ERROR": "તમે ખોટી ID દાખલ કરેલી છે. ફરીથી ID દાખલ કરો.",
   "INSTALL_CROSSWALK": "Crosswalk ઇન્સ્ટોલ કરો",
+  "INSTANCE_TERMS_OF_USE": "{{app_name}} ઉપયોગની શરતો",
   "INSUFFICIENT_STORAGE": "અપૂરતી સંગ્રહ જગ્યા",
   "INTERACTION": "ઇન્ટરેક્ટિવ",
+  "INTERACTIVE_MATERIAL": "ઇન્ટરેક્ટિવ અભ્યાસ સામગ્રી",
   "INTERNAL_MEMORY": "આંતરિક સંગ્રહ",
   "INTERNET_AVAILABLE": "તમે હવે ઑનલાઇન છો",
   "INTERNET_CONNECTIVITY_NEEDED": "ઇન્ટરનેટ કનેક્શન ઉપલબ્ધ નથી",
   "INVALID_CONTENT": "ઇનવેલિડ કન્ટેન્ટ",
   "INVALID_FORMAT": "ઇનવેલિડ ફોર્મેટ",
+  "INVALID_MEMBER_ID": "તમે ખોટી {{app_name}} ID દાખલ કરેલી છે.",
   "INVALID_QR": "અમાન્ય QR કોડ",
   "ITEMS": "{{%s}} ફાઇલ / ફાઇલો",
   "ITEMS_SELECTED": "પસંદ કરેલી ફાઇલસ ",
-  "I_AGREE_TO_TNC": "હું ઉપયોગના નિયમો અને શરતોને સ્વીકારું છું",
-  "JOIN_TRAINING": "તાલીમમાં જોડાઓ\n",
+  "I_AGREE_TO": "હું {{app_name}}ની સંમત છું",
+  "I_AGREE_TO_TNC": "હું ઉપયોગના નિયમો અને શરતોથી સંમત છું",
+  "I_AM_A_PERSONA_WITH_TENANT": "હું {{%tenant}} સાથે {{%persona}} છે.",
+  "I_UNDERSTAND_AND_ACCEPT": "હું સમજી અને સ્વીકારું છું",
+  "JOIN_TRAINING": "કોર્સમાં જોડાઓ",
   "LANGUAGE": "ભાષા",
   "LANGUAGE_SETTINGS": "ભાષા સેટિંગ્સ",
-  "LAST_DATE_TO_JOIN": "જોડાવાની છેલ્લી તારીખ",
+  "LAST_DATE_TO_JOIN": "જોડાવાની છેલ્લી તારીખ {{%s}}",
   "LAST_SYNC": "છેલ્લે સમન્વયિત થયેલ",
+  "LAST_UPDATED": "છેલ્લે અપડેટ થયેલ {{%s}}",
   "LAST_VIEWED": "છેલ્લે જોયેલું ",
   "LATEST_COURSES": "લેટેસ્ટ  કોર્સ ",
-  "LEAVE_TRAINING_HEADING": "તાલીમ છોડી દો?",
-  "LIBRARY_BNAV": "પુસ્તકાલય",
+  "LEAVE_GROUP": "ગૃપ છોડી દો",
+  "LEAVE_GROUP_ERROR_MSG": "ગ્રુપ છોડી શક્યું નથી. પછીથી ફરી પ્રયાસ કરો",
+  "LEAVE_GROUP_POPUP_DESC": "આ ક્રિયા પૂર્વવત્ કરી શકાતી નથી. શું તમે {{group_name}}ને છોડવા માંગો છો",
+  "LEAVE_GROUP_POPUP_TITLE": "ગૃપ છોડી દો?",
+  "LEAVE_GROUP_SUCCESS_MSG": "હવે તમે આ ગ્રુપનો ભાગ નથી",
+  "LEAVE_TRAINING_HEADING": "કોર્સ છોડી દો?",
+  "LIBRARY_BNAV": "લાઇબ્રેરી",
   "LICENSE": "લાઈસન્સની શરતો",
   "LOAD": "લોડ",
+  "LOADER_PROGRESS_DESCRIPTION": "અમે વસ્તુઓ તૈયાર કરી રહ્યા છીએ.",
+  "LOADER_PROGRESS_DESC_SUB_HEADING": "કૃપા કરી રાહ જુવો",
   "LOADING_CONTENT": "કન્ટેન્ટ લોડ થઈ રહ્યું છે",
   "LOADING_CONTENTS": "{{%s}}% કન્ટેન્ટ લોડ થયુ",
-  "LOADING_USER_LIST": "યુઝર્સની યાદી લોડ થઈ રહી છે, કૃપા કરીને રાહ જુઓ",
   "LOAD_FILE": "ફાઈલ લોડ કરો",
-  "LOGGED_IN_AS": "તરીકે લૉગ ઇન",
-  "LOGGED_OUT": "લૉગ આઉટ",
-  "LOGIN_TO_JOIN_TRAINING": "તાલીમમાં જોડાવા માટે લૉગ ઇન કરો",
+  "LOGGED_IN_MEMBER": "{{member_name}} (તમે)",
+  "LOGIN_TO_CREATE_GROUP_DESCRIPTION": "તમારું પોતાનું ગૃપ, અભ્યાસ વર્તુળ અથવા વર્ગખંડ બનાવવાની દિશામાં પ્રથમ સ્ટેપ લોગ ઇન કરવું છે",
+  "LOGIN_TO_JOIN_TRAINING": "કોર્સમાં જોડાવા માટે લૉગ ઇન કરો",
   "LOGOUT": "લૉગ આઉટ કરો",
   "LOW_BANDWIDTH": "લો બેન્ડવિડ્થ",
   "LOW_BANDWIDTH_DETECTED": "નેટવર્ક બેન્ડવિડ્થ ઓછી છે",
-  "MARKS": "ગુણ",
+  "MAINTENANCE_MESSAGE": "અમે હાલમાં જાળવણી માટે નીચે છીએ. પરંતુ ચિંતા કરશો નહીં, અમે {{%timeLeft}} કલાકોમાં પાછા આવીશું. જલ્દી પાછા આવજો!",
+  "MAINTENANCE_SUB_TEXT": "તમે હજી પણ ડાઉનલોડ કરેલી સામગ્રીને ઍક્સેસ કરી શકો છો",
+  "MAKE_ADMIN": "એડમિન બનાવો",
+  "MAKE_GROUP_ADMIN_ERROR_MSG": "ગ્રુપ એડમિન તરીકે {{member_name}}  બનાવી શકાયું નથી",
+  "MAKE_GROUP_ADMIN_POPUP_DESC": "આ ક્રિયા {{member_name}}  ગૃપ એડમિન પરવાનગી આપશે",
+  "MAKE_GROUP_ADMIN_POPUP_TITLE": "ગ્રુપ એડમિન બનાવો?",
+  "MAKE_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} હવે ગ્રુપ એડમિન છે",
   "MEDIUM": "માધ્યમ",
   "MEDIUM_OF_INSTRUCTION": "સૂચનાનું માધ્યમ",
   "MEDIUM_OPTION_TEXT": "માધ્યમ પસંદ કરો",
+  "MEMBERS": "સભ્યો",
+  "MEMBER_ADDED_TO_GROUP": "સભ્ય સફળતાપૂર્વક જૂથમાં ઉમેર્યા",
+  "MEMBER_ALREADY_EXISTS_IN_GROUP": "આ સભ્ય ગ્રુપમાં પહેલેથી જ ઉમેરેલ છે.",
+  "MEMBER_ID": "{{app_name}} ID",
+  "MENU_DELETE_GROUP": "ગ્રુપ કાઢી નાખો",
+  "MENU_DISMISS_AS_GROUP_ADMIN": "ગ્રુપ એડમિન તરીકે કાઢી નાખો",
+  "MENU_EDIT_GROUP_DETAILS": "ગ્રૂપ વિગતોમાં સુધારો કરો",
+  "MENU_LEAVE_GROUP": "ગૃપ છોડી દો",
+  "MENU_MAKE_GROUP_ADMIN": "ગ્રુપ એડમિન બનાવો",
+  "MENU_REMOVE_ACTIVITY": "પ્રવૃત્તિ દૂર કરો",
+  "MENU_REMOVE_FROM_GROUP": "ગ્રુપમાંથી દૂર કરો",
   "MERGE_ACCOUNT": "એકાઉન્ટ મર્જ કરો",
   "MICROPHONE": "માઇક્રોફોન",
   "MICROPHONE_PERMISSION_DESCRIPTION": "{{%s}} ફક્ત તે કન્ટેન્ટમાં માઇક્રોફોન પરવાનગીઓનો ઉપયોગ કરે છે જે તમને તમારી અવાજ  રેકોર્ડ કરવાની મંજૂરી આપે છે.",
+  "MINUTES_AGO": "{{%s}}  મીનીટ પહેલા",
+  "MINUTE_AGO": "{{%s}}  મીનીટ પહેલા",
+  "MONTHS_AGO": "{{%s}}મહિનાઓ પહેલા",
+  "MONTH_AGO": "{{%s}}મહિના પહેલા",
   "MORE": "વધુ",
   "MORE_CONTENT": "{{%s}} પર વધુ પુસ્તકો અને કન્ટેન્ટ શોધો",
+  "MORE_COUNT": "વધુ ({{%s}})",
   "MORE_DETAILS": "વધુ વિગતો (વધુ માહિતી પ્રદાન કરો અથવા સમસ્યાના સ્ક્રીનશોટને જોડો)",
   "MOVE": "મોકલો ",
   "MOVE_FILES_TO_OTHER_DESTINATION": "જગ્યા ખાલી કરવા માટે, ફાઇલોને {{%s}} પર ખસેડો",
   "MSG_ALREADY_IMPORTED": "પહેલેથી જ આયાત કરેલ છે",
   "MSG_IMPORTED_SUCCESSFULLY": "કન્ટેન્ટ સફળતાપૂર્વક  ઈમ્પોર્ટ  થઈ ગયેલ છે ",
-  "MSG_LOADING_BATCHES": "બૅચની વિગતો લાવી રહ્યું છે ...",
   "MSG_NO_DETAILS_TO_SHOW": "વિગતો ઉપલબ્ધ નથી ",
   "MSG_NO_NEW_NOTIFICATION": "કોઈ નવી સૂચના નથી",
   "MSG_RESOURCE_DELETED": "ડિવાઇસમાંથી કન્ટેન્ટ કાઢી નાખ્યું",
   "MULTIPLE_LICENSE": "લાઈસન્સની શરતો {{%s}}",
   "MY_BADGES": "મારો બેજ",
+  "MY_DETAILS": "મારી વિગતો",
+  "MY_GROUPS": "મારા ગૃપ્સ",
   "NAME": "નામ",
   "NAME_HINT": "નામ દાખલ કરો",
+  "NAME_IS_REQUIRED": "તમારે વપરાશકર્તાનું નામ દાખલ કરવું પડશે",
   "NEED_INTERNET_FOR_DEEPLINK_CONTENT": "તમે ઓફલાઇન છો. કન્ટેન્ટને એક્સેસ કરવા માટે ઇન્ટરનેટથી કનેક્ટ થાઓ.",
   "NEED_INTERNET_TO_CHANGE": "WiFi અથવા મોબાઇલ ડેટા ચાલુ કરો અને ફરી પ્રયાસ કરો",
   "NEW": "નવું",
@@ -348,36 +751,32 @@
   "NEXT": "આગળ",
   "NIL": "કંઈ નહિ",
   "NO": "ના",
+  "NOTE": "નોંધ",
   "NOTIFICATION": "સૂચના",
   "NOT_AVAILABLE": "ઉપલબ્ધ નથી",
   "NOT_NOW": "હવે  નહીં",
   "NO_APP_FOR_INTENT": "ફાઇલ ખોલવા માટે કોઈ એપ્લિકેશન ઉપલબ્ધ નથી",
-  "NO_ASSESSMENT": "કોઈ અસેસમેન્ટ ઉપલબ્ધ નથી",
   "NO_BATCHES_AVAILABLE": "કોઈ બેચ ઉપલબ્ધ નથી",
   "NO_BOOKS_AVAILABLE": "બોર્ડ પુસ્તકો ઉમેરી રહ્યું છે",
   "NO_BOOKS_DEFINITION": "બોર્ડ ટૂંક સમયમાં કેટલાક વધુ પુસ્તકો ઉમેરવાની તૈયારીમાં છે. {{%s}} પર વધુ પુસ્તકો અને કન્ટેન્ટ જોવા માટે આ બટન દબાવો",
+  "NO_BOOKS_TEXT": "Subject {{%s}} પર તમારા વિષયની પાઠયપુસ્તક મળી નથી?",
   "NO_CONTENTS": "ના {{%s}}",
   "NO_CONTENTS_FOUND": "કન્ટેન્ટ શોધી શકાયું નથી",
   "NO_CONTENTS_MESSAGE": "બીજી પ્રકારની કન્ટેન્ટ પસંદ કરો",
+  "NO_CONTENT_AVAILABLE_IN_MODULE": "આ મોડ્યુલમાં કોઈ કન્ટેન્ટ ઉપલબ્ધ નથી",
+  "NO_COURSES": "કોર્સ નથી",
   "NO_DATA_FOUND": "કોઈ ડેટા મળ્યો નથી",
-  "NO_DESCRIPTION": "વર્ણન ઉપલબ્ધ નથી",
   "NO_DOWNLOADS": "હજી સુધી કંઈ ડાઉનલોડ થયું નથી",
-  "NO_DOWNLOADS_INFO": "તાલીમ  અથવા પુસ્તકાલયમાંથી કન્ટેન્ટ ડાઉનલોડ કરો",
+  "NO_DOWNLOADS_INFO": "કોર્સ અથવા લાઇબ્રેરીમાંથી કન્ટેન્ટ ડાઉનલોડ કરો",
   "NO_FILTERS_SELECTED": "કોઈ ફિલ્ટર પસંદ કર્યું નથી",
-  "NO_GROUPS_CREATED_YET": "હજી સુધી કોઈ ગૃપ બનાવ્યું નથી",
-  "NO_GROUP_MESSAGE": "ગૃપ યુઝરને વધુ સારી રીતે ગોઠવવામાં મદદ કરે છે. તમે પ્રગતિની સારી દેખરેખ રાખવા માટે ગૃપનો ઉપયોગ કરી  શકો છો ",
   "NO_INTERNET": "ઇન્ટરનેટ કનેક્શન ઉપલબ્ધ નથી",
   "NO_INTERNET_TITLE": "તમે ઑફલાઇન છો",
-  "NO_PREVIEW": "પ્રીવ્યુ ઉપલબ્ધ નથી",
+  "NO_PREVIEW": "પૂર્વાવલોકન ઉપલબ્ધ નથી",
   "NO_QR_CODE": "મારી પાસે QR કોડ નથી",
   "NO_QR_CODE_QSTN": "QR કોડ નથી?",
   "NO_RATING": "હજુ સુધી રેટ કર્યું નથી",
-  "NO_USERS": "કોઈ યુઝર નથી",
-  "NO_USERS_CREATED_YET": "હજુ સુધી કોઈ યુઝર્સ બનાવેલ નથી",
-  "NO_USERS_CREATED_YET_MSG": "તમે તમારા વિદ્યાર્થીઓ અથવા અન્ય શિક્ષકો માટે અતિથિ યુઝર એકાઉન્ટ્સ બનાવી શકો છો",
-  "NO_USERS_IN_THIS_GROUP": "આ ગ્રુપમાં કોઈ યુઝર્સ નથી",
-  "NO_USERS_ON_THIS_DEVICE": "આ ડિવાઇસ પર કોઈ યુઝર નથી",
-  "NO_USERS_SUGGESTION_MESSAGE": "આ ગૃપમાં  ઓછામાં ઓછો એક યુઝર આવશ્યક છે",
+  "NUMBER_OF_COURSES": "કોર્સ ({{%s}})",
+  "NUMBER_OF_COURSE_1": "કોર્સ ({{%s}})",
   "NUMBER_OF_VOTES": "મતની સંખ્યા",
   "OFF": "બંધ",
   "OFFLINE_DOWNLOAD_MESSAGE": "જ્યારે ઇન્ટરનેટ કનેક્શન ચાલુ થશે ત્યારે ડાઉનલોડ્સ આપમેળે ફરીથી શરૂ થશે",
@@ -385,25 +784,26 @@
   "OFFLINE_WARNING_ETBUI": "કન્ટેન્ટ જોવા માટે ઇન્ટરનેટ ચાલુ કરો",
   "OFFLINE_WARNING_ETBUI_1": "કન્ટેન્ટ જોવા માટે ઇન્ટરનેટ ચાલુ કરો ",
   "OKAY": "બરાબર",
+  "ONGOING": "ચાલુ",
+  "ONLY_DIGIT_NUMBER_IS_ALLOWED": "ફક્ત 11 અંકનો નંબર માન્ય છે",
   "ONLY_DOWNLOADED_CONTENT_CAN_BE_PLAYED_OFFLINE": "ફક્ત ડાઉનલોડ કરેલુ કન્ટેન્ટ ઑફલાઇન જોઈ શકાય છે",
   "OPEN": "ખોલો",
   "OPEN_SETTINGS": "સેટિંગ્સ ખોલો",
   "OPTIONAL": "વૈકલ્પિક ",
   "OR": "અથવા",
-  "ORIGINAL_AUTHOR": "કન્ટેન્ટનો લેખક\n",
+  "ORIGINAL_AUTHOR": "કન્ટેન્ટનો લેખક",
   "ORIGINAL_CONTENT": "કન્ટેન્ટ",
   "ORIGINAL_CONTENT_DATA": "આ કન્ટેન્ટ આના પરથી લેવામાં આવ્યું છે:",
   "OTHER_ROLE_DESC_1": "ડિજિટલ કન્ટેન્ટ બ્રાઉઝ કરો",
-  "OTHER_ROLE_DESC_2": "ઓનલાઇન તાલીમ લો",
-  "OTHER_USERS": "અન્ય યુઝર્સ ",
-  "OTP_FAILED": "OTP વેલિડેશન નિષ્ફળ . પછીથી ફરી પ્રયાસ કરો.",
+  "OTHER_ROLE_DESC_2": "ઓનલાઇન કોર્સ લો",
+  "OTP_FAILED": "OTP માન્ય કરવામાં નિષ્ફળ. પછીથી ફરી પ્રયાસ કરો.",
   "OTP_PLACEHOLDER": "OTP લખો ",
   "OTP_RESENT": "OTP ફરીથી મોકલવામાં આવ્યો",
   "OVERLAY_INFO_TEXT_COMMON": "બધી સુવિધાઓ મેળવવા માટે સાઇન ઇન કરો",
-  "OVERLAY_INFO_TEXT_TAKE_COURSE": "આ તાલીમ રજિસ્ટર્ડ યુઝર્સ માટે છે. તાલીમ ઍક્સેસ કરવા માટે લૉગ ઇન કરો.",
+  "OVERLAY_INFO_TEXT_TAKE_COURSE": "આ કોર્સ નોંધાયેલા વપરાશકર્તાઓ  માટે છે. કોર્સ ઍક્સેસ કરવા માટે લૉગ ઇન કરો.",
   "OVERLAY_LABEL_COMMON": "{{%s}} માટે અનલિમિટેડ પરવાનગી મેળવો.",
   "OVERLAY_LABEL_HOME": "તમારું વ્યક્તિગત હોમ ટૅબ",
-  "OVERLAY_LABEL_TAKE_COURSE": "આ તાલીમમાં નોંધણી કરવા માટે લૉગ ઇન કરો",
+  "OVERLAY_LABEL_TAKE_COURSE": "આ કોર્સમાં જોડાવા માટે લૉગ ઇન કરો",
   "OVERLAY_SIGN_IN": "સાઇન ઇન કરો",
   "OVER_WIFI": "વાઇફાઇ પર ઉપલબ્ધ",
   "PEOPLE_WHO_FOLLOW_YOU": "તમારા અનુયાયીઓ",
@@ -418,32 +818,40 @@
   "PHONE_EDIT_SUCCESS": "મોબાઇલ નંબર સફળતાપૂર્વક અપડેટ થયો",
   "PHONE_PLACEHOLDER": "ફોન નંબર",
   "PHONE_UPDATE_SUCCESS": "ફોન નંબર સફળતાપૂર્વક અપડેટ થયો",
+  "PLANNED_MAINTENANCE_TEXT": "અમે હાલમાં જાળવણી માટે નીચે છીએ. પરંતુ ચિંતા કરશો નહીં, અમે જલ્દીથી પાછા આવીશું",
+  "PLANNED_MAINTENANCE_TEXT_WITH_TIME": "અમે હાલમાં જાળવણી માટે નીચે છીએ. પરંતુ ચિંતા કરશો નહીં, અમે પાછા આવીશું",
   "PLAY": "ચાલુ કરો",
   "PLAY_AS": "તરીકે ચલાવો",
   "PLAY_FROM_DEVICE": "ડિવાઇસ પરથી ચલાવો",
   "PLAY_ONLINE": "ઑનલાઇન ચલાવો ",
   "PLEASE_DOWNLOAD_TO_PLAY": "કન્ટેન્ટ જોવા માટે ડાઉનલોડ કરો",
+  "PLEASE_ENTER": "{{%s}} દાખલ કરો",
+  "PLEASE_PROVIDE_FOLLOWING_DETAILS": "કૃપા કરીને નીચેની વિગતો પ્રદાન કરો",
   "PLEASE_SELECT": "{{%s}} પસંદ કરો",
   "PLEASE_SELECT_A_LANGUAGE": "ભાષા પસંદ કરો",
-  "PLEASE_SELECT_USER": "યુઝર  પસંદ કરો",
+  "PLEASE_VALIDATE_YOUR_EMAIL_ADDRESS": "તમારું ઇ-મેઇલ સરનામું માન્ય કરો",
+  "PLEASE_VALIDATE_YOUR_MOBILE_NUMBER": "તમારો મોબાઇલ નંબર માન્ય કરો",
   "POPULAR_COURSES": "લોકપ્રિય કોર્સ",
+  "POWER_OF_GROUPS": "હવે તમે ગૃપ્સની સંભાવનાની શોધ કરી?",
+  "PREFERENCES_CAN_BE_UPDATED": "તમે આ વપરાશકર્તાની વિગતોને પ્રોફાઇલ પેઇઝથી સંપાદિત કરી શકો છો",
   "PREVIEWS": "પ્રીવ્યુ",
   "PREVIOUS_USER_SETTINGS": "શું તમે આગળનાં યુઝરના સેટિંગ્સનો ઉપયોગ કરવા માંગો છો?",
   "PRINT": "પ્રિન્ટ",
-  "PRIVATE": "ખાનગી",
+  "PRIVACY_POLICY": "પ્રાઇવસી પોલિસી",
   "PROFILE_BNAV": "પ્રોફાઇલ",
   "PROFILE_DETAILS_TITLE": "પ્રોફાઇલ વિગતો",
   "PROFILE_UPDATE_FAILED": "પ્રોફાઇલ અપડેટ થયું નથી, થોડા સમય પછી પ્રયાસ કરો",
   "PROFILE_UPDATE_SUCCESS": "પ્રોફાઇલ સફળતાપૂર્વક અપડેટ થઈ ગઈ",
+  "PROGRAMS_DESC": "તમારા સ્થાન માટે અને તમારી ભૂમિકા માટે રચાયેલ સક્રિય શૈક્ષણિક પ્રોગ્રામ્સમાં જુઓ અને તેમાં ભાગ લો",
+  "PROGRESS_CANNOT_BE_TRACKED": "{{collectionType}} માટે પ્રોગ્રેસ ટ્રેક કરી શકાતી નથી",
   "PROVIDE_BELOW_INFO": "નીચેની માહિતી આપો",
   "PUBLIC": "જાહેર",
   "PUBLISHED_BY": "દ્વારા {{%s}} પર પ્રકાશિત",
   "PUBLISHED_DATE": "પ્રકાશિત તારીખ",
-  "QR_CODE_DETAILS": "તમારી પાઠયપુસ્તકમાંથી QR કોડ સ્કેન કરીને ડિજિટલ સામગ્રીની તાત્કાલિક ઍક્સેસ મેળવો.",
+  "PUBLISHER": "પ્રકાશક",
+  "QR_CODE_DETAILS": "તમારી પાઠયપુસ્તકમાંથી QR કોડ સ્કેન કરીને ડિજિટલ કન્ટેન્ટનો તાત્કાલિક ઍક્સેસ મેળવો.",
   "QR_SHOWING_MULTIPLE_BOOK_RESULT": "માટે {{%s}} પરિણામો બતાવી રહ્યું છે",
-  "QUESTION": "પ્રશ્ન",
-  "QUESTIONS": "પ્રશ્નો",
-  "QUESTION_MARKS": "પ્રશ્ન (ગુણ)",
+  "QUES_BANKS": "પ્રશ્ન બેંક",
   "QUIZ": "ક્વિઝ",
   "QUIZ_CONTENTS_ONLY_REGISTERED_USERS": "પ્રશ્નોતરી ફક્ત નોંધાયેલા યુઝર્સ માટે જ છે",
   "RATE": "રેટ",
@@ -452,23 +860,31 @@
   "RATING_QUESTION": "તમે અમને વધુ કહેવા માંગો છો?",
   "READ_LESS": "ઓછું વાંચો",
   "READ_MORE": "વધુ વાંચો",
-  "RECENTLY_VIEWED": "તાજેતરમાં જોવાયેલ",
+  "RECOMMENDATION_BASED_ON_PROFILE": "તમારી પ્રોફાઇલ વિગતોના આધારે ભલામણો",
   "RECOMMENDED": "ભલામણ કરેલ",
   "RECOVERY_ACCOUNT_UPDATE_SUCCESS": "રિકવરી એકાઉન્ટ સફળતાપૂર્વક અપડેટ થઈ ગયું છે",
   "RECOVERY_ID_DESCRIPTION": "જો તમને લોક આઉટ કરવામાં આવે તો રિકવરી એકાઉન્ટ તમને ફરીથી એક્સેસ મેળવવામાં મદદ કરે છે. તમારું રિકવરી એકાઉન્ટ પ્રકાર પસંદ કરો અને વિગતો દાખલ કરો:",
   "REDO": "ફરીથી કરો",
   "REDO_ASSESSMENT": "અસેસમેન્ટ ફરીથી કરો",
-  "REGISTER_TO_COMPLETE_ACCESS": "સંપૂર્ણ કન્ટેન્ટને મેળવવા માટે નોંધણી કરો\n",
+  "REGISTER_TO_COMPLETE_ACCESS": "સંપૂર્ણ કન્ટેન્ટને મેળવવા માટે નોંધણી કરો",
   "REMOVE": "કાઢી નાખો",
+  "REMOVE_ACTIVITY": "દુર કરો",
+  "REMOVE_ACTIVITY_ERROR_MSG": "પ્રવૃત્તિ દૂર કરી શક્યાં નથી. પછીથી ફરી પ્રયાસ કરો",
+  "REMOVE_ACTIVITY_GROUP_DESC": "પ્રવૃત્તિને દૂર કરવું તે ગ્રુપ પ્રવૃત્તિથી દૂર થાય છે અને તમે તેના પર સભ્યની પ્રગતિ ચકાસી શકશો નહીં",
+  "REMOVE_ACTIVITY_POPUP_TITLE": "પ્રવૃત્તિ દૂર કરીએ?",
+  "REMOVE_ACTIVITY_SUCCESS_MSG": "પ્રવૃત્તિ ગ્રુપમાંથી સફળતાપૂર્વક દૂર થઈ",
   "REMOVE_FROM_DEVICE": "ડિવાઇસમાંથી કન્ટેન્ટ કાઢી નાખો",
   "REMOVE_FROM_DEVICE_MSG": "શું તમે ખરેખર ડિવાઇસમાંથી આ કન્ટેન્ટને કાઢી નાખવા માંગો છો?",
-  "REMOVE_MULTIPLE_USERS_FROM_GROUP": "'{{%s}}' યુઝરને કાઢી નાખવા માંગો છો?",
-  "REMOVE_USERS": "યુઝર્સને દૂર કરો",
-  "REMOVE_USERS_FROM_GROUP": "{{%s}} યુઝર્સને ગ્રુપમાંથી  દૂર કરો",
-  "REPORTS": "રિપોર્ટ",
+  "REMOVE_MEMBER": "સભ્યને દૂર કરો",
+  "REMOVE_MEMBER_ERROR_MSG": "ગ્રુપમાંથી સભ્યને દૂર કરી શક્યા નહીં. પછીથી ફરી પ્રયાસ કરો",
+  "REMOVE_MEMBER_GROUP_DESC": "{{member_name}} ને દૂર કરવાથી તે / તેણીને ગ્રુપમાંથી કાયમી ધોરણે દૂર કરવામાં આવે છે",
+  "REMOVE_MEMBER_POPUP_TITLE": "સભ્યને દૂર કરો?",
+  "REMOVE_MEMBER_SUCCESS_MSG": "{{member_name}} હવે ગ્રુપનો ભાગ નથી",
+  "REQUEST_CONTENT": "અમને અહીં જણાવો",
   "RESEND_OTP": "OTP ફરીથી મોકલો",
+  "RESET": "ફરીથી સેટ કરો",
   "RESOURCE_TYPE": "રિસોર્સના પ્રકારો",
-  "RESULT": "પરિણામ",
+  "RESPONSE_ACKNOWLEGED": "તમારી પ્રતિક્રિયા બદલ આભાર!",
   "RESULTS": "પરિણામો",
   "RESUME": "ફરી શરુ કરવું",
   "RETRY": "ફરી પ્રયાસ કરો",
@@ -476,23 +892,30 @@
   "ROLE_SELECTOR_QUERY": "તમે છો",
   "SAVE": "સાચવો",
   "SAVED_ON": "પર સાચવો",
-  "SAVED_RESOURCES": "સાચવેલ રિસોર્સ",
   "SAVE_FILE_ON_DEVICE": "ડિવાઇસ પર ફાઈલ સેવ કરો",
   "SCAN_QR_CODE": "QR કોડ સ્કેન કરો",
   "SCAN_QR_INSTRUCTION": "તમારા ફોનને  સ્કેન કરવા માટે QR કોડ પર નિર્દેશિત કરો",
   "SCAN_TAP": "QR કોડ સ્કેન કરો",
-  "SCORE": "સ્કોર",
-  "SCORED": "કરેલ સ્કોર ",
+  "SCHOOL_OR_ORG_NAME": "શાળા / સંસ્થા નામ",
+  "SCHOOL_UDISE_ID_OR_ORG_ID": "શાળા UDEISE ID / સંસ્થા ID",
   "SD_CARD": "SD કાર્ડ",
+  "SEARCH_FOR_GROUP_MEMBER": "ગ્રુપ સભ્ય માટે શોધ",
   "SEARCH_HINT": "શોધો",
-  "SEARCH_PLACEHOLDER": "કન્ટેન્ટ અહીં શોધો. દા.ત. 'વાર્તા'",
+  "SEARCH_PLACEHOLDER": "કન્ટેન્ટ શોધવા માટે લખો. દા.ત. 'વાર્તા'",
   "SEARCH_TO_FIND_CONTENT": "કન્ટેન્ટ  માટે {{%s}} સર્ચ કરો ",
+  "SECONDS_AGO": "{{%s}} સેકંડ પહેલા",
+  "SECOND_AGO": "{{%s}} સેકંડ પહેલા",
   "SEE_ALL_RESULTS_FOR": "\"{{%s}}\" માટેનાં બધા પરિણામો જુઓ",
+  "SEE_MORE_BOOKS": "વધુ પુસ્તકો અને કન્ટેન્ટ જુઓ",
+  "SEE_MORE_CONTENT": "વધુ કન્ટેન્ટ જુઓ",
   "SELECT": "પસંદ કરો",
   "SELECTED_TOPICS": "પસંદ કરેલ મુદ્દો",
+  "SELECT_ACTIVITY": "પ્રવૃત્તિ પસંદ કરો",
   "SELECT_ALL": "બધા પસંદ કરો",
-  "SELECT_CHAPTER": "પ્રકરણ પસંદ કરો",
+  "SELECT_CHAPTER": "મોડ્યુલ પસંદ કરો",
   "SELECT_YOUR_STATE": "તમારું રાજ્ય પસંદ કરો",
+  "SELF_DECLARED_INFO": "સ્વ-ઘોષિત માહિતી",
+  "SELF_DECLARE_TEACHER_TNC": "હું આ વિગતોને {{%appName}} ના સંચાલકો સાથે શેર કરવા માટે સંમત છું",
   "SEND_FILE": "ફાઇલ મોકલો",
   "SERVER_CONNECTION_ERROR": "સર્વરથી કનેક્ટ કરવામાં અસમર્થ",
   "SETTINGS": "સેટિંગ્સ",
@@ -501,20 +924,20 @@
   "SHARE_APP_LINK": " {{play_store_url}} પરથી {{app_name}} એપ મેળવો.",
   "SHARE_CONTENT_FAILED": "કન્ટેન્ટ શેર કરવામાં અસમર્થ",
   "SHARE_CONTENT_FILE": "ફાઇલ આનાથી મોકલાયેલ: {{app_name}}\nનામ: {{content_name}}\n{{app_name}} એપ {{play_store_url}} માંથી મેળવો ",
-  "SHARE_CONTENT_LINK": " {{content_name}} {{app_name}} પર {{content_link}} માંથી જુઓ .\n {{app_name}} એપ {{play_store_url}} માંથી મેળવો",
+  "SHARE_CONTENT_LINK": "મને {{app_name}} પર {{content_name}} ખરેખર રસપ્રદ અને સહાયક લાગે છે. {{content_link}}\n\nપ્લેસહોલ્ડરો:  {{content_name}} {{app_name}} {{content_link}}\n{{play_store_url}}\n",
   "SHARE_LINK": "લિંક શેર કરો",
   "SHARE_TELEMETRY": "ટેલીમેટ્રી શેર કરો",
   "SHARE_TELEMETRY_FAILED": "ટેલિમેટ્રી શેર કરવામાં અસમર્થ",
+  "SHARE_TELEMETRY_NO_DATA_FOUND": "કોઈ ટેલિમેટ્રી ડેટા મળ્યો નથી",
   "SHARE_THIS": "શેર કરો",
+  "SHARE_USERNAME": "હાય! તમે ‪{{user_name}}નું ‬ ‪{{app_name}}‬ ID મેળવ્યું છે:‪{{diksha_id}}‬",
   "SHOW": "બતાવો",
   "SHOWING_ITEMS": "{{%s}} વસ્તુઓને બતાવી રહ્યું છે.",
   "SHOWING_RESULTS_FOR": "'{{%query}}' માટે {{%count}} પરિણામો બતાવી રહ્યું છે",
   "SHOW_LESS": "ઓછુ બતાવો",
   "SHOW_MORE": "વધારે બતાવો",
-  "SHOW_RECENT": "{{%s}} ફાઇલો બતાવી રહ્યું છે",
-  "SIGNED_OUT_ACCOUNT_MESSAGE": "તમને કરંટ અકાઉન્ટમાંથી સાઇન આઉટ કરવામાં આવશે",
   "SIGNIN_TO_USE_FEATURE": "આ સુવિધાનો ઉપયોગ કરવા માટે સાઇન ઇન કરો",
-  "SIGN_IN": "સાઇન ઇન કરો",
+  "SIGN_IN": "લોગ ઇન કરો",
   "SIZE": "સાઈઝ: {{%s}}",
   "SKIP": "છોડો",
   "SOMETHING_WENT_WRONG": "ટેકનિકલ પ્રોબ્લેમને લીધે, અમે તમારી વિનંતી પર પ્રક્રિયા કરવામાં અસમર્થ છીએ",
@@ -522,10 +945,13 @@
   "SPACE_AVAILABLE_ON_SDCARD": "SD કાર્ડમાં ઉપલબ્ધ જગ્યા:",
   "SPACE_TAKEN": "{{%s}} દ્વારા રોકાયેલ જગ્યા",
   "SPACE_TAKEN_BY_APP": "{{%s}} કન્ટેન્ટ દ્વારા વપરાયેલી જગ્યા:",
+  "SPECIAL_CHARACTERS_NOT_SUPPORTED": "આ ક્ષેત્ર તમને વિશિષ્ટ અક્ષરો દાખલ કરવાની મંજૂરી આપતું નથી",
   "START": " શરુ કરો",
+  "START_AGAIN": "ફરી શરૂ કરો",
   "START_ASSESSMENT": "અસેસમેન્ટ શરુ કરો",
-  "START_COURSE": "શરૂઆત",
+  "START_COURSE": " શરુ કરો",
   "START_COURSE_NOW": "અત્યારે શરુ કરો",
+  "START_LEARNING": "શીખવાનું શરૂ કરો",
   "STAR_RATINGS": "રેટિંગ",
   "STATE": "રાજ્ય",
   "STATE_OPTION_TEXT": "રાજ્ય પસંદ કરો",
@@ -533,38 +959,107 @@
   "STORAGE": "સંગ્રહ",
   "STORAGE_SETTINGS": "સંગ્રહ સેટિંગ્સ",
   "STRUCTURE": "માળખું",
-  "STUDENT_ROLE_DESC_1": "ટેક્સટબૂક અને ડિજિટલ કન્ટેન્ટ બ્રાઉઝ કરો.",
+  "STUDENT_ROLE_DESC_1": "પાઠયપુસ્તકો અને ડિજિટલ કન્ટેન્ટ બ્રાઉઝ કરો.",
   "SUBJECT": "વિષય",
   "SUBJECTS": "વિષયો",
   "SUBJECT_OPTION_TEXT": "વિષય પસંદ કરો",
+  "SUBMIT_MY_DETAILS": " વિગતો સબમિટ કરો",
+  "SUCCESSFULLY_ADDED_USER": "\"{{%s}}\" સફળતાપૂર્વક ઉમેર્યું",
+  "SUCCESSFULLY_SWITCHED_USER": "હેલો {{%user}}",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_PHONE": "બધું  કન્ટેન્ટ ફોનમાં  ટ્રાન્સફર  થશે ",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_SDCARD": "બધા કન્ટેન્ટ SD કાર્ડમાં ટ્રાન્સફર થશે ",
   "SUPPORT": "સપોર્ટ",
   "SUPPORT_MESSAGE": "શું તમને કોઈ સમસ્યા આવી રહી છે? અમને મેસેજ મોકલો",
-  "SWITCHING_TO": "'{{%s}}' બદલાઈ ગયેલ છે",
-  "SWITCH_ACCOUNT": "એકાઉન્ટ બદલો",
-  "SWITCH_ACCOUNT_CONFIRMATION": "અકાઉન્ટ બદલવા માંગો છો?",
+  "SWITCH_TO_CLASSIC_THEME": " ક્લાસિક થીમ પર સ્વિચ કરો ",
+  "SWITCH_TO_JOYFUL_THEME": "આનંદકારક થીમ પર સ્વિચ કરો",
+  "SWITCH_USER": "વપરાશકર્તા બદલો",
   "SYLLABUS": "અભ્યાસક્ર્મ",
   "SYNCING_NOW": "હવે સમન્વયિત કરી રહ્યું છે",
   "SYNC_NOW": "હવે સમન્વયિત કરો",
-  "TAKE_ASSESSMENT": "યુઝરે ઓછામાં ઓછુ એક અસેસમેન્ટ લેવાની જરૂર છે",
   "TAP_SCAN": "{{%s}} QR કોડને સ્કેન કરવા માટે ટેપ કરો",
+  "TBK_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "શરૂ કરવા માટે એક પાઠયપુસ્તક પસંદ કરો",
+  "TBK_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "પાઠયપુસ્તક",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "પાઠયપુસ્તકો\n\n",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "પાઠયપુસ્તકો\n\n",
+  "TBK_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}} ની લાઇબ્રેરીમાં {{%explainVideos}}, {{%quesBanks}} અને અન્ય {{%interactiveMaterial}} નું હોસ્ટ છે. પુસ્તકાલયની શોધખોળ શરૂ કરવા માટે પાઠયપુસ્તક પર ક્લિક કરો!",
+  "TBK_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": " {{%grade}} ({{%medium}}) માટે કોઈ પુસ્તકો મળ્યાં નથી",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "બોર્ડ પુસ્તકો ઉમેરી રહ્યું છે.",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": " {{%s}} પર તમારા વિષયની પાઠયપુસ્તક મળી નથી?",
+  "TBK_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span> નોંધ: </span> પાઠયપુસ્તકો માટે પ્રગતિ ટ્રેક કરી શકાતી નથી",
+  "TBK_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "{{%s}}પર તમારું સ્ટેટ બોર્ડ તમારી વિનંતી કરેલી પુસ્તકો અપલોડ કરશે કે તરત જ અમે તમને જાણ કરીશું.",
+  "TBK_NONTRK_QR_CODE_DETAILS": "તમારી પાઠયપુસ્તકમાંથી QR કોડ સ્કેન કરીને ડિજિટલ કન્ટેન્ટનો તાત્કાલિક ઍક્સેસ મેળવો.",
+  "TBK_NONTRK_SEE_MORE_BOOKS": "વધુ પુસ્તકો અને કન્ટેન્ટ જુઓ",
+  "TBK_NONTRK_STUDENT_ROLE_DESC_1": "પાઠયપુસ્તકો અને ડિજિટલ કન્ટેન્ટ બ્રાઉઝ કરો.",
+  "TBK_NONTRK_TEACHER_ROLE_DESC_1": "પાઠયપુસ્તકો અને ડિજિટલ કન્ટેન્ટ બ્રાઉઝ કરો.",
+  "TBK_NONTRK_TUTORIAL_HEADING": "વિડિઓઝ, ઇન્ટરેક્ટિવ કન્ટેન્ટ, ઇ ટેક્સ્ટબુક અને વધુ ...",
+  "TBK_TRK_BATCHEND_MAIN_HEADING": "તમે {{%s}} ના રોજ પૂર્ણ થયેલા પાઠયપુસ્તકોની બેચમાં જોડાયા છો.",
+  "TBK_TRK_BATCHEND_SUB_HEADING": "તમે ભણવાનું ચાલુ રાખી શકો છો, પરંતુ તમારી પ્રગતિ અપડેટ થશે નહીં",
+  "TBK_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "તમે આ પ્રકરણ સમાપ્ત કર્યું છે",
+  "TBK_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} દ્વારા પાઠયપુસ્તક પૂર્ણ કરો.",
+  "TBK_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "આ પાઠયપુસ્તક નિષ્ક્રિય છે",
+  "TBK_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "પાઠયપુસ્તક",
+  "TBK_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "તમે આ પાઠયપુસ્તક વાંચ્યું છે",
+  "TBK_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "આ પાઠયપુસ્તક માટેની બેચ ",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "કાર્ય",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "પાઠયપુસ્તકો નથી",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "બેચનો અંત આવ્યો",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "છેલ્લે {{last_updated_on_date}} પર અપડેટ કરાયું",
+  "TBK_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "જોડાઓ",
+  "TBK_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "નવીનતમ પાઠયપુસ્તકો",
+  "TBK_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "ટાસ્ક છોડી દો?",
+  "TBK_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "જોડાવા માટે લૉગ ઇન કરો",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_COURSES": "પાઠયપુસ્તકો નથી",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "કન્ટેન્ટ ડાઉનલોડ કરો",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "પાઠયપુસ્તક ({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "પાઠયપુસ્તક ({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "ઓનલાઇન શિક્ષણ લો.",
+  "TBK_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "લોકપ્રિય પાઠયપુસ્તકો",
+  "TBK_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ઓનલાઇન શિક્ષણ લો.",
+  "TBK_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "પ્રમાણપત્ર લેવા માટે {{%s}} સુધીમાં કોર્સ પૂર્ણ કરો.",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING": "શીખવાનું કાર્ય",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "અધ્યયન કાર્ય (ઓ) માં ભાગ લીધો",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "પાઠયપુસ્તક વિગતો",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "કાર્ય સમાપ્ત થાય છે",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "કાર્ય સમાપ્તિ તારીખ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "કાર્ય વિગતો",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "આ કાર્ય આ માટે સંબંધિત છે:",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "પ્રકરણ",
+  "TBK_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "પાઠયપુસ્તક પ્રવૃત્તિ બંધ કરો",
+  "TBK_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "પાઠયપુસ્તક પ્રવૃત્તિઓ તપાસો?",
+  "TBK_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "પાઠયપુસ્તકની બેચ {{batch_start_date}}  પરથી ઉપલબ્ધ છે",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "તમને 7 દિવસની અંદર તમારી નોંધણી કરેલ સંપર્ક વિગતો પર કોર્સ સર્ટિફિકેટ વિશે સૂચિત કરવામાં આવશે",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "નોંધ: આ પાઠયપુસ્તકમાં પ્રમાણપત્ર નથી",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "તમે આ પાઠયપુસ્તક વાંચ્યું છે",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "નોંધ: હાલમાં, આ કોર્સ માટે કોઈ પ્રમાણપત્ર નથી. કોર્સ નિર્માતા પછીથી પ્રમાણપત્ર જોડી શકે છે.",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "તમે પાઠયપુસ્તક વાંચવાનું બંધ કર્યું છે",
+  "TBK_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "આ પાઠયપુસ્તક કાર્ય માટે કોઈ બેચ નથી",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "આ પાઠયપુસ્તક નોંધાયેલા વપરાશકર્તાઓ  માટે છે. પાઠયપુસ્તક ઍક્સેસ કરવા માટે લૉગ ઇન કરો.",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "આ પાઠયપુસ્તક વાંચવા માટે લૉગ ઇન કરો",
+  "TBK_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "આ કાર્ય માટે કોઈ બેચ ઉપલબ્ધ નથી",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "ફક્ત નોંધાયેલા વપરાશકર્તાઓ શીખવાની ક્રિયાઓ લઈ શકે છે",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "તમે સફળતાપૂર્વક કાર્ય પૂર્ણ કર્યું છે.",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "કાર્ય સમાપ્ત થયું છે. તમે અસેસમેન્ટ ફરીથી કરી શકો છો, પરંતુ, તમારી પ્રગતિ રેકોર્ડ કરવામાં આવશે નહીં.",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "કાર્ય સમાપ્ત થયું છે. તમે અસેસમેન્ટ કરી શકો છો પરંતુ, તમારી પ્રગતિ રેકોર્ડ કરવામાં આવશે નહીં.",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "પાઠયપુસ્તકની માહિતી માટે અને ઍક્સેસ કરવા માટે તમારે સક્રિય બેચમાં જોડાવું આવશ્યક છે",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "પાઠયપુસ્તકોની વિગતોને એક્સેસ કરવા માટે તમારે લોગ ઇન કરવું આવશ્યક છે.",
   "TEACHER_ID_ENTER_LABEL": "વેરિફિકેશન માટે તમારી શિક્ષક ID દાખલ કરો",
   "TEACHER_ID_PLACEHOLDER": "ઉદાહરણ તરીકે, ER12345",
   "TEACHER_ID_VERIFICATION": "શિક્ષક ID ની ચકાસણી",
   "TEACHER_PROFILE_FAILED": "તમારી પ્રોફાઇલ ચકાસી શકાઈ નથી કારણ કે દાખલ કરેલી શિક્ષક ID ખોટી છે.",
   "TEACHER_PROFILE_VERIFIED": "શિક્ષકની પ્રોફાઇલ સફળતાપૂર્વક ચકાસી છે.",
-  "TEACHER_ROLE_DESC_1": "ટેક્સટબૂક અને ડિજિટલ કન્ટેન્ટ બ્રાઉઝ કરો.",
-  "TEACHER_ROLE_DESC_2": "ઓનલાઇન તાલીમ લો.",
+  "TEACHER_ROLE_DESC_1": "પાઠયપુસ્તકો અને ડિજિટલ કન્ટેન્ટ બ્રાઉઝ કરો.",
+  "TEACHER_ROLE_DESC_2": "ઓનલાઇન કોર્સ લો.",
   "TEACHER_ROLE_DESC_3": "પાઠ યોજનાઓ શોધો.",
   "TELL_US_MORE": "અમને વધુ જણાવો...",
   "TERMS_OF_USE": "વાપરવા માટેનાં નિયમો",
   "TEXTBOOK": "પાઠયપુસ્તકો",
+  "TEXTBOOKS": "પાઠયપુસ્તકો",
+  "THANKING_NOTE": "{{%s}}પર તમારું સ્ટેટ બોર્ડ તમારી વિનંતી કરેલી પુસ્તકો અપલોડ કરશે કે તરત જ અમે તમને જાણ કરીશું.",
   "THANK_FOR_RATING": "કન્ટેન્ટને રેટિંગ આપવા બદલ આભાર",
-  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "આ તાલીમ માટે કોઈ બેચ ઉપલબ્ધ નથી",
+  "THANK_YOU_FOR_SUBMITTING_YOUR_DETAILS": "તમારી વિગતો સબમિટ કરવા બદલ આભાર",
+  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "આ કોર્સ માટે કોઈ બેચ ઉપલબ્ધ નથી",
   "THIS_IS_A_RESTRICTED_COMMUNITY": "આ સમુદાય પ્રતિબંધિત છે",
   "TICKET_SUMMARY": "ટિકિટ સારાંશ",
-  "TIME": "સમય",
   "TIME_OUT": "સર્વરનો સમય પૂરો થયો. પછી ફરીથી પ્રયત્ન કરો",
   "TITLE": "શીર્ષક",
   "TITLE_UPGRADE_POPUP": "અમે કન્ટેન્ટમાં ઇમેજ અને ઓડિયો ગુમ થવા માટેની સમસ્યાઓને સુધારી નાખી છે. વધુ સારા અનુભવ માટે, અમે તમને DIKSHA નું નવું વર્ઝન અપગ્રેડ કરવાની ભલામણ કરીએ છીએ.",
@@ -573,21 +1068,20 @@
   "TOPICS": "વિષયો",
   "TOPIC_YOU_MIGHT_LIKE": "રસના વિષયો સર્ચ કરો",
   "TOTAL_SIZE": "ટોટલ સાઈઝ :",
-  "TOTAL_TIME": "કુલ સમય",
   "TO_DO": "કરવા માટે",
-  "TO_EARN_CERTIFICATE": "પ્રમાણપત્ર લેવા માટે {{%s}} સુધીમાં તાલીમ પૂર્ણ કરો",
-  "TRAINING": "તાલીમ",
-  "TRAININGS_ATTENDED": "તાલીમમાં હાજર",
-  "TRAININGS_ONLY_REGISTERED_USERS": "તાલીમ ફક્ત નોંધાયેલા યુઝર્સ માટે જ છે",
-  "TRAINING_COMPLETED_SUCCESSFULLY": "તમે આ તાલીમ સફળતાપૂર્વક પૂર્ણ કરી લીધી છે",
-  "TRAINING_DETAILS": "તાલીમની વિગતો\n",
-  "TRAINING_ENDED_REDO_ASSESSMENT": "તાલીમ પુરી થઈ ગઈ છે. તમે અસેસમેન્ટ ફરીથી કરી શકો છો પરંતુ, તમારી પ્રગતિ રેકોર્ડ કરવામાં આવશે નહીં.",
-  "TRAINING_ENDED_START_ASSESSMENT": "તાલીમ પુરી થઈ ગઈ છે. તમે અસેસમેન્ટ લઇ શકો છો પરંતુ, તમારી પ્રગતિ રેકોર્ડ કરવામાં આવશે નહીં.",
-  "TRAINING_ENDS_ON": "તાલીમ પૂરી થાય છે.",
-  "TRAINING_END_DATE": "તાલીમની અંતિમ તારીખ",
-  "TRAINING_INFO": "તાલીમની માહિતી",
-  "TRAINING_IS_RELEVANT_TO_TEACHERS": "તાલીમ એ શિક્ષકો માટે સંબંધિત છે",
-  "TRAINING_MODULES": "તાલીમ વિભાગ",
+  "TO_EARN_CERTIFICATE": "પ્રમાણપત્ર લેવા માટે {{%s}} સુધીમાં કોર્સ પૂર્ણ કરો.",
+  "TRAINING": "કોર્સ",
+  "TRAININGS_ATTENDED": "કોર્સમાં હાજરી આપી",
+  "TRAININGS_ONLY_REGISTERED_USERS": "ફક્ત નોંધાયેલા વપરાશકર્તાઓ જ કોર્સ લઈ શકે છે.",
+  "TRAINING_COMPLETED_SUCCESSFULLY": "તમે સફળતાપૂર્વક કોર્સ  પૂર્ણ કર્યો છે.",
+  "TRAINING_DETAILS": "કોર્સની વિગતો",
+  "TRAINING_ENDED_REDO_ASSESSMENT": "કોર્સ સમાપ્ત થયો છે. તમે અસેસમેન્ટ ફરીથી કરી શકો છો પરંતુ, તમારી પ્રગતિ રેકોર્ડ કરવામાં આવશે નહીં.",
+  "TRAINING_ENDED_START_ASSESSMENT": "કોર્સ સમાપ્ત થયો છે. તમે અસેસમેન્ટ કરી શકો છો પરંતુ, તમારી પ્રગતિ રેકોર્ડ કરવામાં આવશે નહીં.",
+  "TRAINING_ENDS_ON": "કોર્સ સમાપ્ત થાય છે",
+  "TRAINING_END_DATE": "કોર્સની અંતિમ તારીખ",
+  "TRAINING_INFO": "કોર્સની વિગતો",
+  "TRAINING_IS_RELEVANT_TO_TEACHERS": "આ કોર્સ આ માટે સંબંધિત છે:",
+  "TRAINING_MODULES": "કોર્સ મોડ્યુલ",
   "TRANSFERRING_CONTENT_TO_PHONE": "કન્ટેન્ટ ફોનમાં ટ્રાન્સફર થાય છે ",
   "TRANSFERRING_CONTENT_TO_SDCARD": "કન્ટેન્ટ SD કાર્ડ માં ટ્રાન્સફર થાય છે ",
   "TRANSFERRING_FILES": "ફાઇલો મોકલવામાં આવી રહી છે",
@@ -597,9 +1091,64 @@
   "TRY_AGAIN": "ફરીથી પ્રયત્ન કરો",
   "TRY_BEFORE_RATING": "કૃપા કરી કન્ટેન્ટને રેટિંગ આપતા પહેલા જોઈ લો .",
   "TRY_DIFF_QR": "અલગ QR code માટે try કરવા માંગો છો?",
+  "TUTORIAL_BUTTON": "શરૂ કરવા માટે એક પાઠયપુસ્તક પસંદ કરો",
+  "TUTORIAL_HEADING": "વિડિઓઝ, ઇન્ટરેક્ટિવ કન્ટેન્ટ, ઇ ટેક્સ્ટબુક અને વધુ ...",
+  "TVC_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "શરૂ કરવા માટે એક ટેલિવિઝન વર્ગ  પસંદ કરો",
+  "TVC_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "ટેલિવિઝન વર્ગો",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "ટેલિવિઝન વર્ગો",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "ટેલિવિઝન વર્ગો",
+  "TVC_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}} ની લાઇબ્રેરીમાં {{%explainVideos}}, {{%quesBanks}} અને અન્ય {{%interactiveMaterial}} નું હોસ્ટ છે.ટીવી ટેલિવિઝન શોધખોળ શરૂ કરવા માટે લાઇબ્રેરી પર ક્લિક કરો!",
+  "TVC_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) માટે કોઈ ટેલિવિઝન વર્ગો મળ્યાં નથી",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "બોર્ડ ટેલિવિઝન વર્ગો ઉમેરી રહ્યું છે.",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}} પર કોઈ ટેલિવિઝન વર્ગો શોધી શક્યા નથી?",
+  "TVC_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span> નોંધ: </span> ટેલિવિઝન વર્ગ માટે પ્રગતિ ટ્રેક કરી શકાતી નથી",
+  "TVC_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "જ્યારે તમારું સ્ટેટ બોર્ડ {{%s}} પર તમારા દ્વારા વિનંતી કરેલા ટીવી વર્ગને અપલોડ કરે છે ત્યારે અમે તમને સૂચિત કરીશું.",
+  "TVC_NONTRK_QR_CODE_DETAILS": "તમારી ટેલિવિઝન વર્ગોમાંથી QR કોડ સ્કેન કરીને ડિજિટલ કન્ટેન્ટનો તાત્કાલિક ઍક્સેસ મેળવો.",
+  "TVC_NONTRK_SEE_MORE_BOOKS": "વધુ ટેલિવિઝન વર્ગો અને કન્ટેન્ટ જુઓ",
+  "TVC_NONTRK_STUDENT_ROLE_DESC_1": "ટેલિવિઝન વર્ગો અને ડિજિટલ કન્ટેન્ટ બ્રાઉઝ કરો.",
+  "TVC_NONTRK_TEACHER_ROLE_DESC_1": "ટેલિવિઝન વર્ગો અને ડિજિટલ કન્ટેન્ટ બ્રાઉઝ કરો.",
+  "TVC_NONTRK_TUTORIAL_HEADING": "વિડિઓઝ, ઇન્ટરેક્ટિવ કન્ટેન્ટ, ઇ ટેક્સ્ટબુક અને વધુ ...",
+  "TVC_TRK_BATCHEND_MAIN_HEADING": "તમે {{%s}} ના રોજ પૂર્ણ થયેલા ટેલિવિઝન વર્ગોની બેચમાં જોડાયા છો.",
+  "TVC_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "તમે આ પ્રોગ્રામ સમાપ્ત કરી લીધો છે",
+  "TVC_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "ટેલિવિઝન વર્ગો",
+  "TVC_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "તમે આ ટેલિવિઝન વર્ગો જોયા છે",
+  "TVC_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "આ ટેલિવિઝન વર્ગો  માટેની બેચ ",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "કાર્ય",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "મારા ટેલિવિઝન વર્ગો",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "બેચનો અંત આવ્યો",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "છેલ્લે {{last_updated_on_date}} પર અપડેટ કરાયું",
+  "TVC_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "નવીનતમ ટેલિવિઝન વર્ગો",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "ટેલિવિઝન વર્ગો ({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "ટેલિવિઝન વર્ગો ({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "લોકપ્રિય ટેલિવિઝન વર્ગો",
+  "TVC_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "પ્રમાણપત્ર લેવા માટે {{%s}} સુધીમાં કોર્સ પૂર્ણ કરો.",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING": "શીખવાનું કાર્ય",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "અધ્યયન કાર્ય (ઓ) માં ભાગ લીધો",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "ટેલિવિઝન વર્ગોની વિગતો",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "કાર્ય સમાપ્ત થાય છે",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "કાર્ય સમાપ્તિ તારીખ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "કાર્ય વિગતો",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "આ કાર્ય આ માટે સંબંધિત છે:",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "ટેલિવિઝન કાર્યક્રમો",
+  "TVC_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "ટેલિવિઝન વર્ગ જોવાનું બંધ કરો",
+  "TVC_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "ટેલિવિઝન વર્ગો શીખવાની તપાસ કરવા માંગો છો?",
+  "TVC_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "ટેલિવિઝન ક્લાસની બેચ {{batch_start_date}} પરથી ઉપલબ્ધ છે",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "તમને 7 દિવસની અંદર તમારી નોંધણી કરેલ સંપર્ક વિગતો પર કોર્સ સર્ટિફિકેટ વિશે સૂચિત કરવામાં આવશે",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "નોંધ: આ અભ્યાસક્રમમાં પ્રમાણપત્ર નથી",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "તમે આ ટેલિવિઝન વર્ગો જોયા છે",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "નોંધ: હાલમાં, આ કોર્સ માટે કોઈ પ્રમાણપત્ર નથી. કોર્સ નિર્માતા પછીથી પ્રમાણપત્ર જોડી શકે છે.",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "તમે ટેલિવિઝન વર્ગ જોવાનું બંધ કરી દીધું છે",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "ટેલિવિઝન વર્ગો નોંધાયેલા વપરાશકર્તાઓ માટે છે. ટેલિવિઝન વર્ગને ઍક્સેસ કરવા માટે લોગ ઇન કરો",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "આ ટેલિવિઝન વર્ગ જોવા માટે લોગ ઇન કરો",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "ફક્ત નોંધાયેલા વપરાશકર્તાઓ શીખવાની ક્રિયાઓ લઈ શકે છે",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "તમે સફળતાપૂર્વક કાર્ય પૂર્ણ કર્યું છે.",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "કાર્ય સમાપ્ત થયું છે. તમે આકારણી ફરીથી કરી શકો છો, પરંતુ, તમારી પ્રગતિ રેકોર્ડ કરવામાં આવશે નહીં.",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "કાર્ય સમાપ્ત થયું છે. તમે અસેસમેન્ટ કરી શકો છો પરંતુ, તમારી પ્રગતિ રેકોર્ડ કરવામાં આવશે નહીં.",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "ટેલિવિઝન વર્ગોની માહિતી માટે અને ઍક્સેસ કરવા માટે તમારે સક્રિય બેચમાં જોડાવું આવશ્યક છે",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": " ટેલિવિઝન વિગતોને એક્સેસ કરવા માટે તમારે લોગ ઇન કરવું આવશ્યક છે.",
   "UNABLE_TO_FETCH_CONTENT": "નિવૃત કન્ટેન્ટ મેળવવા માટે અસમર્થ",
   "UNENROLL_CONFIRMATION_MESSAGE": "તમે ફરીથી સક્રિય અથવા આગામી બેચમાં જોડાઇ શકો છો ",
-  "UNENROLL_FROM_COURSE": "તાલીમ છોડી દો",
+  "UNENROLL_FROM_COURSE": "કોર્સ છોડી દો",
   "UNIT_COMING_SOON": "ટૂક સમયમાં આવશે",
   "UNKNOWN_QR": " તમે અમાન્ય QR કોડ સ્કેન કર્યું છે",
   "UNSELECT_ALL": "બધાને નાપસંદ કરો",
@@ -610,56 +1159,66 @@
   "UPDATE_APP_TITLE": "એપ્લિકેશનનું નવું વર્ઝન ઉપલબ્ધ છે!",
   "UPDATE_CONFIRMATION_TEXT": "શું તમે આ કન્ટેન્ટને અપડેટ કરવા માંગો છો?",
   "UPDATE_CONTENT": "({{%s}}) અપડેટ કન્ટેન્ટ",
+  "UPDATE_DETAILS": "અપડેટ વિગતો",
   "UPDATE_RECOVERY_ID": "એકાઉન્ટને ફરીથી  મેળવવા માટે અપડેટ કરો",
   "UPDATE_REQUIRED": "અપડેટ કરવું આવશ્યક છે",
+  "UPDATE_YOUR_PREFERENCE_FROM_PROFILE": "તમે પ્રોફાઇલ સેટિંગથી તમારા {{app_name}} પ્રોફાઇલ વિગતોને સુધારી શકો છો",
   "UPDATING": "અપડેટ થઈ રહ્યું છે",
   "UPDATING_CONTENT": "{{%s}}%  અપડેટ થઇ રહ્યું છે... ",
-  "USER": "વપરાશકર્તા",
   "USERNAME": "યુઝરનું નામ: {{%s}}",
-  "USERS": "વપરાશકર્તાઓ",
-  "USERS_AND_GROUPS": "યુસર્સ અને ગૃપ્સ",
-  "USER_CREATED_SUCCESSFULLY": "યુઝર સફળતાપૂર્વક બનાવેલ છે",
-  "USER_DELETE_CONFIRM": "'{{%s}}' કાઢી નાંખવું જ છે તે નક્કી કરો?",
-  "USER_DELETE_CONFIRM_MESSAGE": "આ ક્રિયા સ્થાયી છે, એકવાર યુઝરને  કાઢી નાખવામાં આવે તે પછી, ફરીથી ઉપલબ્ધ કરવું મુશ્કેલ છે",
-  "USER_DELETE_CONFIRM_MESSAGE_FROM_GROUP": "'{{%s}}' યુઝર્સને દૂર કરવું છે તે નક્કી કરો?",
-  "USER_DELETE_CONFIRM_SECOND_MESSAGE": "આ પ્રક્રિયા ગ્રુપમાંથી યુઝર્સને દૂર કરે છે. બધા યુઝરની વિગતો યુઝર્સ ટૅબ હેઠળ ઉપલબ્ધ છે",
+  "USER_CREATED_SUCCESSFULLY": "વપરાશકર્તા સફળતાપૂર્વક બનાવેલ છે",
   "USER_ID": "વપરાશકર્તાની ID",
   "USER_IS_NOT_VERIFIED": "તમારી યુઝર ID ચકાસાયેલ નથી.",
-  "USER_NAME": "યુઝરનું નામ",
-  "USER_TYPE": "યુઝર ટાઈપ",
+  "USER_NAME": "વપરાશકર્તાનું નામ",
+  "USER_TYPE": "વપરાશકર્તાનો પ્રકાર",
   "USER_TYPE_1": "શિક્ષક",
   "USER_TYPE_2": "વિદ્યાર્થી",
   "USER_TYPE_3": "અન્ય",
-  "USER_TYPE_SELECT_WARNING": "વપરાશકર્તા પ્રકાર પસંદ કરો",
-  "USER_VERIFICATION": "યુઝરની ચકાસણી",
+  "USER_TYPE_5": "માતાપિતા",
+  "USER_TYPE_SELECT_WARNING": "વપરાશકર્તાનો પ્રકાર પસંદ કરો",
+  "USER_VERIFICATION": "વપરાશકર્તાની ચકાસણી",
+  "USE_APP_AS": "{{%s}}જેમ વાપરો",
+  "VALIDATION_MAXIMUM_LENGTH": "મહત્તમ લંબાઈ 11 સંખ્યાની હોવી જોઈએ",
+  "VALIDATION_MINIMUM_LENGTH": "ન્યૂનતમ લંબાઈ 11 સંખ્યાની હોવી જોઈએ",
+  "VERIFY": "ચકાસો",
   "VERIFY_EMAIL_OTP_DESCRIPTION": "ઇ-મેઇલ ID ચકાસણી માટે તમને OTP સાથે એક ઇમેઇલ પ્રાપ્ત થશે.",
-  "VERIFY_EMAIL_OTP_TITLE": "ઇ-મેઇલ ID ચકાસો",
+  "VERIFY_EMAIL_OTP_TITLE": "ઇ-મેઇલ એડ્રેસ ચકાસો",
   "VERIFY_PHONE_OTP_DESCRIPTION": "તમારા મોબાઇલ નંબરની ચકાસણી માટે તમને OTP સાથે એક SMS પ્રાપ્ત થશે",
-  "VERIFY_PHONE_OTP_TITLE": "મોબાઇલ નંબર વેરિફાઈ કરો",
+  "VERIFY_PHONE_OTP_TITLE": "મોબાઇલ નંબર ચકાસો",
   "VERSION": "વર્ઝન ",
-  "VIDEOS": "વિડિઓ",
+  "VERYFYING_PLEASE_WAIT": "ચકાસી રહયા છીએ",
+  "VIDEO": "વિડિઓ",
   "VIEW": "જુઓ",
+  "VIEW_ACTIVITY": "પ્રવૃત્તિ જુઓ",
   "VIEW_ALL": "બધુજ જુઓ",
   "VIEW_ALL_BATCHES": "આગળ વધવા માટે  બેચ પસંદ કરો",
   "VIEW_CREDITS_INFO": "પરવાનગી  માહિતી જુઓ",
   "VIEW_DOWNLOADS_ONLY_MSG": "ફક્ત ડાઉનલોડ્સ જુઓ",
-  "VIEW_MORE": "વધારે જોવો",
+  "VIEW_MORE": "વધુ જુઓ",
   "VIEW_ONGOING_BATCHES": "ચાલુ બૅચ",
+  "VIEW_OPEN_BATCHES": "બેચ ખોલો",
   "VIEW_RETIRED_BATCHES": "બેચ સમાપ્ત થઈ ગઈ",
   "VIEW_UPCOMING_BATCHES": "આગામી બેચ",
   "WAITING_TO_DOWNLOAD": "ડાઉનલોડ કરવા માટે રાહ જુએ છે ...",
   "WAIT_REQUEST": "કન્ટેન્ટ લાવી રહ્યું છે ...",
-  "WANT_TO_CHECK_FREE_TRAININGS": "ફ્રી તાલીમ તપાસવા માંગો છો?",
+  "WANT_TO_CHECK_FREE_TRAININGS": "કોર્સ તપાસવા માંગો છો?",
   "WARNING_PLEASE_MAKE_SOME_CHANGES": "ફેરફારો કરો",
   "WEBVIEW_UPDATE_TEXT": "અસરકારક અનુભવ માટે, વેબવ્યૂનું નવું વર્ઝન ગૂગલ પ્લે સ્ટોર પરથી ડાઉનલોડ કરો.",
+  "WEEKS_AGO": "{{%s}} અઠવાડિયા પહેલા",
+  "WEEK_AGO": "{{%s}} અઠવાડિયા પહેલા",
+  "WELCOME": "સ્વાગત",
   "WELCOME_BACK": "{{%s}} આપનું ફરીથી  સ્વાગત છે",
+  "WHAT_IS_MEMBER_ID": "હું {{app_name}} ID ક્યાંથી જોઈ શકું છું?",
+  "YEARS_AGO": "{{%s}} વર્ષો પહેલા",
+  "YEAR_AGO": "{{%s}} વર્ષ પહેલાં",
   "YES": "હા",
+  "YOUR_ID_FROM_STATE_BOARD_ORG": "રાજ્ય / બોર્ડ / સંગઠનમાંથી તમારી ID",
   "YOUR_LOCATION": "તમારું લોકેશન",
   "YOUR_LOCATION_DETAILS": "તમારા લોકેશનની વિગતો અમને તમારા સંબંધિત કન્ટેન્ટ આપવામાં સહાય કરે છે. તમારું લોકેશન સાચું છે કે નહીં તે તપાસો, નહીં તો તમારું લોકેશન ફરીથી પસંદ કરો અને સબમિટ કરો.",
   "YOUR_PROGRESS": "તમારી પ્રગતિ: {{%s}}%",
   "YOUR_PROGRESS_LABEL": "તમારી પ્રગતિ",
   "YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET": "તમે ઇન્ટરનેટથી જોડાયેલા નથી",
-  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "તાલીમની માહિતી માટે સક્રિય બેચમાં જોડાવું આવશ્યક છે",
-  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "તાલીમ વિગતોને એક્સેસ કરવા માટે તમારે સાઇન ઇન કરવું આવશ્યક છે.",
+  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "કોર્સની માહિતી માટે અને ઍક્સેસ કરવા માટે તમારે સક્રિય બેચમાં જોડાવું આવશ્યક છે",
+  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "કોર્સની વિગતોને એક્સેસ કરવા માટે તમારે લોગ ઇન કરવું આવશ્યક છે.",
   "YOU_MUST_LOGIN_TO_ACCESS_QUIZ_CONTENT": "આ કન્ટેન્ટને એકસેસ કરવા માટે તમારે લોગ ઈન કરવું આવશ્યક છે."
 }
\ No newline at end of file
diff --git a/src/assets/i18n/hi.json b/src/assets/i18n/hi.json
index a2dd5c89c..9496a6792 100644
--- a/src/assets/i18n/hi.json
+++ b/src/assets/i18n/hi.json
@@ -8,18 +8,42 @@
   "ACCOUNT_MERGE_FAILED": "अकाउंट मिलाने में असफ़ल",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_CONTENT": "अकाउंट मिलान आरम्भ किया गया। पूर्ण होने पर आपको सूचित किया जायेगा।",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_HEADING": "अकाउंट मिलायें",
-  "ACCURACY": "सटीकता",
   "ACTIVE": "सक्रिय",
   "ACTIVE_DOWNLOADS": "सक्रिय डाउनलोड",
+  "ACTIVITIES": "गतिविधिआँ ",
+  "ACTIVITIESE_SEARCH_PLACEHOLDER": "समूह गतिविधियों की खोज करें",
+  "ACTIVITY_ALREADY_ADDED_IN_GROUP": "आपने इस गतिविधि को समूह में पहले से जोड़ा है",
+  "ACTIVITY_COLLECTION_TITLE": "संग्रह",
+  "ACTIVITY_COURSE_TITLE": "कोर्स",
+  "ACTIVITY_EXPLANATION_CONTENT_TITLE": "स्पष्टीकरण सामग्री",
+  "ACTIVITY_PRACTICE_QUESTION_SET_TITLE": "अभ्यास प्रश्न संग्रह",
+  "ACTIVITY_PRACTICE_RESOURCE_TITLE": "अभ्यास संसाधन",
+  "ACTIVITY_RESOURCE_TITLE": "संसाधन ",
+  "ACTIVITY_TEXTBOOK_TITLE": "पाठ्यपुस्तक",
+  "ACTIVITY_TV_EPISODE_TITLE": "टीवी प्रकरण",
   "ADD": "जोड़े",
+  "ADD_ACTIVITY": "गतिविधि जोड़ें",
+  "ADD_ACTIVITY_ERROR_MSG": "गतिविधि जोड़ने में असमर्थ, पुनः प्रयास करें",
+  "ADD_ACTIVITY_SUCCESS_MSG": "गतिविधि सफलतापूर्वक जोड़ी गई",
+  "ADD_ANOTHER_USER": "अन्य उपयोगकर्ता को जोड़ें",
   "ADD_DISTRICT": "ज़िले का विवरण दें",
+  "ADD_EDIT_SELF_DECLARED_TEACHER_INFO": "ये विवरण आपके घोषित राज्य को उपलब्ध कराए जा सकते हैं ताकि आपके कोर्स की प्रगति मान्य की जा सके",
   "ADD_EMAIL": "ईमेल पता जोड़ें",
+  "ADD_MEMBER": "सदस्य जोड़े",
+  "ADD_MEMBER_CONFIRMATION": "आगे बढ़ने से पहले सदस्य का नाम और {{app_name}} ID का मिलान कीजिए",
+  "ADD_MEMBER_POPUP_DESC": "सदस्यों को उनके अद्वितीय पहचान {{%s}} ID जानने के लिए निम्न निर्देशों का उपयोग करें",
+  "ADD_MEMBER_POPUP_STEP_1": "<span>क्रम १ :</span> प्रोफाइल टैब पर क्लिक करें",
+  "ADD_MEMBER_POPUP_STEP_2": "<span> क्रम 2:</span> {{%s}} ID को शेयर करने के लिए शेयर आइकान पर क्लिक करें",
+  "ADD_MEMBER_POPUP_TITLE": "{{%s}} ID कहां देख सकते हैं?",
   "ADD_PHONE": "मोबाइल नंबर दर्ज करें",
   "ADD_RECOVERY_ACCOUNT": "अकाउंट बहाल करने के लिए ईमेल पता जोड़ें",
   "ADD_RECOVERY_ID": "अकाउंट बहाल करने के लिए अन्य ईमेल जोड़ें",
   "ADD_STATE": "राज्य का विवरण दें",
+  "ADD_TO_GROUP": "समूह में जोड़ें",
+  "ADD_TO_GROUP_ACTIVITY": "समूह के लिए जोड़ें",
+  "ADD_USER": "उपयोगकर्ता जोड़े",
   "ADD_USERS": "उपयोगकर्ताओं को जोड़ें",
-  "ADD_USERS_TO_GROUP": "{{%s}} उपयोगकर्ताओं को समूह से जोड़ें",
+  "AGREE_TO_SHARE_PROFILE_DETAILS": "मैं पाठ्यक्रम के अनुसार अपने प्रोफ़ाइल विवरण साझा करने के लिए सहमत हूं",
   "ALL": "सभी",
   "ALLOW": "स्वीकार करें",
   "ALL_ANNOUNCEMENTS": "सभी घोषणाएं",
@@ -31,6 +55,7 @@
   "ANSWER": "उत्तर ",
   "APPLY": "लागू करें",
   "APPLY_FILTER": "फिल्टर लागू करें",
+  "APP_ID": "{{%s}} ID",
   "APP_QR_CODE": "क्या आप {{%s}} QR कोड देख रहे है?",
   "APP_RATING_RATE_EXPERIENCE": "अपने अनुभव के अनुसार ऐप को रेट करें",
   "APP_RATING_RATE_ON_PLAYSTORE": "क्या आप प्ले स्टोर पर रेटिंग देना चाहते है?",
@@ -44,7 +69,7 @@
   "AS_LINK": "लिंक के रूप में",
   "ATTACHMENT_DOWNLOADED": "संलग्न डाउनलोड किया गया",
   "ATTRIBUTIONS": "आभार",
-  "AUDIOS": "ऑडियो",
+  "AUDIO": "ऑडियो",
   "AUTHOR": "रचयिता",
   "AUTOMATIC_SYNC": "स्वचालित डेटा सिंक",
   "AUTO_MIGRATION_FAIL_MESSAGE": "अकाउंट मिलाने में विफल",
@@ -53,28 +78,24 @@
   "AVAILABLE_FILTERS": "फ़िल्टर",
   "AVAILABLE_FOR_TEACHERS": "केवल शिक्षकों के लिए",
   "AVATAR": "अवतार",
-  "AVERAGE_SCORE": "औसत अंक",
-  "AVERAGE_TIME": "औसत समय",
   "BACK_TO_EXIT": "क्या आप ऐप बंद करना चाहते हैं?",
-  "BATCHEND_MAIN_HEADING": "आपके प्रशिक्षण बैच की समाप्ति तारीख {{%s}}",
-  "BATCHEND_SUB_HEADING": "आप प्रशिक्षण पूर्ण कर सकते है, परन्तु आपकी प्रगति दर्शायी नहीं जा सकती है",
+  "BATCHEND_MAIN_HEADING": "आप जिस कोर्स के बैच में शामिल होना चाहते हो वह {{%s}} को समाप्त हो गया है",
+  "BATCHEND_SUB_HEADING": "आप कोर्स पूर्ण कर सकते है, परन्तु आपकी प्रगति अपडेट नहीं की जाएगी",
   "BATCHES_AVAILABLE": "उप्लब्ध बैच",
-  "BATCHES_FOR_THIS_COURSE": "प्रशिक्षण के बैच",
+  "BATCHES_FOR_THIS_COURSE": "कोर्स के बैच",
   "BATCH_CREATED_BY": "के द्वारा बनाई गई",
   "BATCH_DETAILS": "बैच विवरण",
   "BATCH_ENROLLMENT_ENDED": "इस बैच में अन्य प्रतिभागी जोड़े नहीं जा सकते हैं",
   "BATCH_EXPIRED": "बैच समाप्त हो गया है",
   "BATCH_EXPIRED_BUTTON": "ठीक हैं ",
-  "BATCH_EXPIRED_DESCRIPTION": "बैच अवधि समाप्त होने से आपकी प्रगति दर्शायी नहीं जा सकती है| परन्तु आप यह कोर्स पूरा कर सकते है|",
   "BOARD": "बोर्ड",
   "BOARD_OPTION_TEXT": "बोर्ड चुनिए",
+  "BROWES_RELEVANT_CONTENT": "अपनी पसंद (बोर्ड, माध्यम, वर्ग) के आधार पर प्रासंगिक कंटेन्ट खोजने के लिए {{app_name}} लाइब्रेरी ब्राउज़ करें",
   "BTN_CLICK_TO_OPEN_CONTENT": "कंटेंट देखने के लिए टैप करें",
   "BTN_LATER": "बाद में",
   "BTN_RATE_ON_PLAYSTORE": "प्ले स्टोर में रेट करें",
-  "BTN_SUBMIT": "दाख़िल करें",
+  "BTN_SUBMIT": "जमा करें",
   "BTN_VISIT_HELP_SECTION": "सहायता केंद्र देखिये",
-  "BY_QUESTIONS": "प्रश्नों द्वारा",
-  "BY_USERS": "उपयोगकर्ताओं से",
   "CAMERA": "कैमरा",
   "CAMERA_PERMISSION_DESCRIPTION": "कैमरा की अनुमति देकर {{%s}} में QR कोड स्कैन कीजिये",
   "CANCEL": "रद्द  करें",
@@ -84,25 +105,34 @@
   "CANCEL_DOWNLOAD": "डाउनलोड रद्द करें",
   "CANCEL_DOWNLOAD_MESSAGE": "डाउनलोड रद्ध करने पर इस डाउनलोड सत्र की सभी फ़ाइल निष्काषित हो जायेंगी",
   "CANCEL_DOWNLOAD_TITLE": "डाउनलोड रद्द करना चाहते है?",
-  "CERTIFIED_TRAINING": "प्रमाणित प्रशिक्षण",
+  "CERTIFICATE_ALREADY_DOWNLOADED": "प्रमाण पत्र पहले से ही डाउनलोड किया गया है, कृपया अपने डाउनलोड फ़ोल्डर की जांच करें",
+  "CERTIFICATE_DOWNLOADED": "प्रमाण पत्र डाउनलोड हो गया है",
+  "CERTIFICATE_DOWNLOAD_INFO": "प्रमाण पत्र डाउनलोड हो रहा है",
+  "CERTIFIED_TRAINING": "प्रमाण पत्र अर्जित करें",
   "CHANGE": "बदलें",
   "CHANGE_ROLE": "भूमिका बदलें",
-  "CHANGE_USER": "उपयोगकर्ता बदलें",
+  "CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "आपने यह मॉड्यूल पूर्ण कर लिया हैं",
+  "CHARACTERS_REMAINING": "{{character_count}} अक्षर बाकी",
   "CHECK_FOR_UPDATES": "अपडेट के लिए जाँच",
-  "CHOOSE_FROM_FOLLOWING": "निम्नलिखित से चुनें",
+  "CHOOSE_FROM_FOLLOWING": "निम्नलिखित से चुनिए",
   "CHOOSE_LANGUAGE": "अपनी पसंद की भाषा चुनिये",
+  "CHOOSE_USER": "उपयोगकर्ता चुनिए",
   "CHOOSE_WHERE_TO_SAVE_DATA": "डेटा सहेजने की लिए जगह चुनिये",
   "CLASS": "कक्षा",
   "CLASSES": "कक्षाएँ",
   "CLEAR": "हटायें",
   "COACH_SCREEN": "QR कोड स्कैन करने पर आपको कंटेंट दिखाया जायेगा|",
-  "COMMUNITIES": "समुदायों",
+  "COMMUNITIES": "समुदाय",
+  "COMPLETED": "पूर्ण",
   "COMPLETE_ASSESSMENT_TO_EARN_CERTIFICATE": "{{%s}} तक पूरा मूल्यांकन करें",
-  "COMPLETE_BY": "{{%s}} तक पूर्ण",
-  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "प्रशिक्षण पूर्ण करने की तारीख {{%s}}",
+  "COMPLETE_BY": "{{%s}} तक पूर्ण करें",
+  "COMPLETE_CHAPTER_TO_UNLOCK_ACHIEVEMENT": "नई उपलब्धि प्राप्त करने के लिए  {{%s}} कंटेन्ट को पूरा करें",
+  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "कोर्स पूर्ण करने की तारीख {{%s}}",
   "CONFIRM": "पुष्टि करें",
+  "CONGRATULATIONS": "बधाइयाँ!",
   "CONNECT_TO_INTERNET_SUGGESTION": "इस कंटेंट को देखने के लिए इन्टरनेट से जुड़िये",
   "CONSIDER_DOWNLOAD": "कंटेंट डाउनलोड करने का विचार करें",
+  "CONTENTS": "कंटेंट",
   "CONTENT_ALREADY_EXIST": "यह फ़ाइल आयातित की जा चुकी है| नयी फाइल चयनित करें",
   "CONTENT_ALREADY_EXISTS": "गंतव्य फोल्डर में यह कंटेंट मौजूद है| क्या आप इस कंटेंट को गंतव्य फोल्डर में भेजना चाहते हैं?",
   "CONTENT_COMING_SOON": "हम इसके लिए कंटेंट तैयार कर रहे हैं",
@@ -114,63 +144,206 @@
   "CONTENT_DERIVED_FROM": "प्रशिक्षण का मूल",
   "CONTENT_IMPORTED": "सफलतापूर्वक आयातित किया गया",
   "CONTENT_IMPORTED_FAILED": "आयातित करने में असफ़ल",
-  "CONTENT_IS_BEEING_ADDED": "कंटेंट जोड़ा जा रहा है|",
+  "CONTENT_IS_BEEING_ADDED": "कंटेंट {{content_name}} में जोड़ा जा रहा है",
   "CONTENT_IS_BEING_ADDED": "आपका राज्य इस QR कोड के कंटेंट का सृजन करने में कार्यरत है, यह निकट भविष्य में प्रकाशित होगा",
   "CONTENT_NOT_AVAILABLE": "कंटेंट उपलब्ध नहीं हैं|",
   "CONTENT_PLAYER_EXIT_PERMISSION": "क्या आप इस कंटेंट को छोड़ना चाहते है?",
+  "CONTENT_PREFERENCE": "पसंदीदा कंटेंट",
   "CONTENT_RATING_SUB_HEADING": "कंटेंट को रेट करने के लिए तारों पर टैप करें",
-  "CONTENT_RETIRED_BY_AUTHOR": "यह कंटेंट रचयिता द्वारा हटाया जा चुका है, और इसलिए यह उपलब्ध नहीं हैं",
+  "CONTENT_RETIRED_BY_AUTHOR": "यह कंटेन्ट रचयिता द्वारा निवृत्त करने के कारण उपलब्ध नहीं है",
   "CONTENT_SIZE": "कंटेंट का आकार",
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO": "कंटेंट सफलतापूर्वक भेजा गया हैं|",
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO_PHONE": "कंटेंट सफलतापूर्वक मोबाइल में  भेजा गया",
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO_SDCARD": "कंटेंट सफलतापूर्वक SD कार्ड में भेजा गया",
   "CONTINUE": "जारी रखें",
   "CONTINUE_AS_ROLE": "'{{%s}}' के रूप में जारी रखें",
-  "CONTINUE_NOW": "जारी रखें",
+  "CONTINUE_LEARNING": "सीखना जारी रखें",
   "CONTRIBUTIONS": "योगदान",
   "CONTRIBUTORS": "सहयोगी",
   "COPYRIGHT": "कॉपीराईट",
-  "COURSES_BNAV": "प्रशिक्षण",
-  "COURSES_IN_PROGRESS": "मेरे पाठ्यक्रम",
+  "COURSES": "कोर्स",
+  "COURSES_BNAV": "कोर्स",
+  "COURSES_IN_PROGRESS": "मेरे कोर्स",
   "COURSE_COMPLETED_LABEL": "{{%s}}% पूर्ण",
-  "COURSE_ENDED": "{{%s}} को प्रशिक्षण  पूर्ण हुआ ",
-  "COURSE_ENDED_ON": "{{%s}} को प्रशिक्षण पूर्ण हुआ ",
-  "COURSE_ENROLLED": "प्रशिक्षण में नामांकित",
-  "COURSE_NOT_AVAILABLE": "यह पाठ्यक्रम निष्क्रिय किया गया है",
+  "COURSE_COMPLETION_POPUP_DESC": "प्रमाण-पत्र संबंधित सूचना आपके पंजीकृत संपर्क विवरण मे ७ दिनों के भीतर भेजी जाएगी",
+  "COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "टिप्पणी: इस कोर्स में  प्रमाण पत्र नहीं है",
+  "COURSE_ENDED": "{{%s}} को कोर्स पूर्ण हुआ ",
+  "COURSE_ENDED_ON": "{{%s}} को कोर्स पूर्ण हुआ ",
+  "COURSE_ENROLLED": "आप कोर्स में नामांकित हुए हैं",
+  "COURSE_LAST_UPDATED_ON": "कोर्स की अंतिम अद्यतन तारीख ‪{{last_updated_on_date}}‬",
+  "COURSE_NOT_AVAILABLE": "यह कोर्स निष्क्रिय किया गया है",
+  "COURSE_NO_CERTIFICATE_MESSAGE": "इस कोर्स में अभी कोई प्रमाणपत्र नहीं है। कोर्स निर्माता बाद में प्रमाण पत्र संलग्न कर सकता है।",
   "COURSE_PROGRESS_COMPLETED": "{{%s}}% पूर्ण",
-  "COURSE_UNENROLLED": "प्रशिक्षण से नामांकन रद्ध हुआ",
-  "COURSE_WILL_BE_AVAILABLE": "{{%s}} से पाठ्यक्रम उपलब्ध होगा",
+  "COURSE_UNENROLLED": "कोर्स से नामांकन रद्ध हुआ",
+  "COURSE_WILL_BE_AVAILABLE": "{{%s}} से बैच उपलब्ध होगा",
   "CREATE_GROUP": "समूह बनाएँ",
-  "CREATE_NEW_GROUP": "नया समूह बनाएँ",
-  "CREATE_NEW_USER": "नया उपयोगकर्ता बनाएँ",
+  "CREATE_GROUP_DESCRIPTION": "आप समूह बनाने से सिर्फ एक कदम दूर हैं",
+  "CREATE_GROUP_DESCRIPTION_POPUP": "लोगों से जुड़ने, गतिविधियों को साझा करने, प्रगति की समीक्षा करने और अन्य संभावनाओं की खोज करने  के लिए समूह बनाए या किसी समूह का हिस्सा बनें",
   "CREATE_USER": "उपयोगकर्ता बनाएँ",
   "CREATORS": "{{%s}} में रचियिता",
   "CREDITS": "क्रेडिट",
   "CREDITS_LICENCE_INFO": "क्रेडिट व लाइसेंस जानकारी",
-  "CSV_DOWNLOAD_SUCCESS": "{{%s}} आपके डाउनलोड फोल्डर में सहेजा गया हैं",
+  "CRS_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "शुरू करने के लिए एक कोर्स चुनें",
+  "CRS_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "कोर्स",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "कोर्स",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "कोर्स",
+  "CRS_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}} की लाइब्रेरी में कई {{%explainVideos}}, {{%quesBanks}} और अन्य ‪{{%interactiveMaterial}} हैं। पुस्तकालय में खोज शुरू करने के लिए कोर्स पर क्लिक करें!",
+  "CRS_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) के लिए कोई कोर्स उपलब्ध नहीं हैं",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "बोर्ड कोर्स जोड़ रहा है",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}} पर कोर्स नहीं मिल सका?",
+  "CRS_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span> टिप्पणी: </ span> कोर्स की प्रगति को ट्रैक नहीं कर सकते ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "जब आपका बोर्ड आपके द्वारा अनुरोध किया गया कोर्स {{%s}} पर अपलोड करेगा, तो हम आपको सूचित करेंगे",
+  "CRS_NONTRK_QR_CODE_DETAILS": "अपने कोर्स से QR कोड स्कैन करके डिजिटल कंटेंट तक त्वरित पहुंच प्राप्त करें।",
+  "CRS_NONTRK_SEE_MORE_BOOKS": "अधिक कोर्स और कंटेंट देखे",
+  "CRS_NONTRK_STUDENT_ROLE_DESC_1": "कोर्स और डिजिटल कंटेन्ट को ब्राउज़ करें",
+  "CRS_NONTRK_TEACHER_ROLE_DESC_1": "कोर्स और डिजिटल कंटेन्ट को ब्राउज़ करें",
+  "CRS_NONTRK_TUTORIAL_HEADING": "वीडियो, इन्टरएक्टिव कंटेन्ट, ई-पाट्यपुस्तके और अधिक...",
+  "CRS_TRK_BATCHEND_MAIN_HEADING": "आप जिस कोर्स के बैच में शामिल होना चाहते हो वह {{%s}} को समाप्त हो गया है",
+  "CRS_TRK_BATCHEND_SUB_HEADING": "आप कोर्स पूर्ण कर सकते है, परन्तु आपकी प्रगति अद्यतित नहीं की जाएगी",
+  "CRS_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "आपने इस मॉड्यूल को समाप्त कर दिया है",
+  "CRS_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} तक कोर्स पूर्ण कीजिए",
+  "CRS_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "कोर्स",
+  "CRS_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "आप इस कोर्स में शामिल हैं",
+  "CRS_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "कोर्स के बैच",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "कोर्स",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "मेरे कोर्स",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "{{%s}} को कोर्स पूर्ण हुआ ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}} पर अंतिम बार अद्यतित किया गया",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_NOT_AVAILABLE": "यह कोर्स निष्क्रिय किया गया है",
+  "CRS_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "कोर्स में नामांकन कीजिये",
+  "CRS_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "नवीनतम कोर्स",
+  "CRS_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "कोर्स छोड़ना चाहते है?",
+  "CRS_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "इस कोर्स में नामांकन के लिए लॉग इन करें",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_COURSES": "कोई कोर्स नहीं हैं",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "कोर्स और पुस्तक संग्रह से कटेंट डाउनलोड करें",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "कोर्स ({{%s}})",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "कोर्स ({{%s}}) ",
+  "CRS_TRK_FRMELEMNTS_LBL_OVERLAY_LABEL_TAKE_COURSE": "इस कोर्स में नामांकन के लिए लॉग इन करें",
+  "CRS_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "लोकप्रिय कोर्स",
+  "CRS_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ऑनलाइन कोर्स लीजिए",
+  "CRS_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "प्रमाणपत्र प्राप्त करने के लिए {{%s}} तक कोर्स पूर्ण करे",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING": "कोर्स",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "कोर्स में भाग लिया",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "कोर्स विवरण",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "कोर्स समाप्ति तारीख",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "कोर्स की अंतिम तिथि",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "कोर्स विवरण",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "यह कोर्स प्रासंगिक हैं:",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "कोर्स मॉड्यूल ",
+  "CRS_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "कोर्स छोड़े",
+  "CRS_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "कोर्स देखना चाहते हैं?",
+  "CRS_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "कोर्स का बैच {{batch_start_date}} से उपलब्ध है",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "प्रमाण-पत्र संबंधित सूचना आपके पंजीकृत संपर्क विवरण मे ७ दिनों के भीतर भेजी जाएगी",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "टिप्पणी: इस कोर्स में  प्रमाण पत्र नहीं है",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "आप इस कोर्स में शामिल हैं",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "टिप्पणी: इस कोर्स में अभी कोई प्रमाण-पत्र नहीं है। कोर्स निर्माता बाद में प्रमाण-पत्र संलग्न कर सकता है।",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "आपने कोर्स छोड़ दिया है",
+  "CRS_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "कोर्स के लिए कोई बैच नहीं है",
+  "CRS_TRK_FRMELEMNTS_MSG_OTHER_ROLE_DESC_2": "ऑनलाइन कोर्स लीजिए",
+  "CRS_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "कोर्स पंजीकृत उपयोगकर्ताओं के लिए हैं। कोर्स अभिगम हेतु लॉग इन करें। ",
+  "CRS_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "इस कोर्स के लिए कोई बैच नहीं है",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "कोर्स केवल पंजीकृत उपयोगकर्ताओं के लिए हैं ",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "आपने कोर्स सफलतापूर्वक पूर्ण किया हैं",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "कोर्स समाप्त हो गया है। आप मूल्यांकन फिर से कर सकते हैं लेकिन आपकी प्रगति दर्ज नहीं की जाएगी।",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "कार्य समाप्त हो गया है। आप मूल्यांकन कर सकते है लेकिन आपकी प्रगति दर्ज नहीं की जाएगी",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "कोर्स विवरण के लिए सक्रिय बैच में नामांकन किजिए",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "कोर्स के अभिगम के लिए लाॅग इन करें",
   "CURRENT_LANGUAGE": "वर्तमान भाषा",
-  "DATA": "अधिक पुस्तके और कंटेंट देखे",
   "DATA_SYNC": "डेटा सिंक",
   "DATA_SYNC_FAILURE": "डेटा सिंक में त्रुटी, पुनः प्रयास करें",
   "DATA_SYNC_NOTHING_TO_SYNC": "सिंक करने के लिए कुछ भी नहीं",
   "DATA_SYNC_SUB": "अपना डेटा बैक अप कीजिये, टेलीमेट्री ट्रांसफर कीजिए",
   "DATA_SYNC_SUCCESSFUL": "टेलीमेट्री डेटा सफलतापूर्वक समन्वयित हुआ",
-  "DELETE": "हटायें",
+  "DAYS_AGO": "{{%s}} दिन पहले ",
+  "DAY_AGO": "{{%s}} दिन पहले ",
+  "DELETE": "हटाएँ",
   "DELETE_ALL_CONTENT_WARNING": "हटायें जाने की क्रिया से चयनित कंटेंट आपके मोबाइल से हटाया जायेगा",
   "DELETE_CONTENT": "कंटेंट हटाना चाहते है?",
   "DELETE_CONTENT_SIZE": "1 वस्तु {{content_size}}",
   "DELETE_CONTENT_WARNING": "हटायें जाने की क्रिया से यह कंटेंट आपके मोबाइल से हटाया जायेगा",
-  "DELETE_GROUP": "समूह हटायें",
+  "DELETE_GROUP_DESC": "{{group_name}} समूह हटाने की प्रक्रिया स्थायी हैं",
+  "DELETE_GROUP_ERROR_MSG": "समूह हटाने में असफल, पुनः प्रयास करें",
+  "DELETE_GROUP_POPUP_TITLE": "समूह हटायें?",
+  "DELETE_GROUP_SUCCESS_MSG": "समूह सफलतापूर्वक हटाया गया",
   "DELETE_PROGRESS": "चुना गया कंटेंट हटाया जा रहा हैं",
-  "DESCRIPTION": "विवरण",
+  "DETAIL_TUTORIAL": "{{%appName}} की लाइब्रेरी में कई {{%explainVideos}}, {{%quesBanks}} और अन्य ‪{{%interactiveMaterial}} हैं। पुस्तकालय में खोज शुरू करने के लिए पाठ्यपुस्तक पर क्लिक करें!",
   "DEVICE_ID": "डिवाइस ID",
   "DEVICE_LOCATION": "उपकरण का स्थान",
   "DEVICE_TAGS": "डिवाइस टैग कीजिये",
   "DEVICE_TAGS_SUB": "डिवाइस टैग जोड़ें या हटाएं",
+  "DFLT_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "शुरू करने के लिए एक कार्य चुनें",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "कार्य",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "कार्य",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "कार्य",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}} की लाइब्रेरी में कई {{%explainVideos}}, {{%quesBanks}} और अन्य ‪{{%interactiveMaterial}} हैं। पुस्तकालय में खोज शुरू करने के लिए कंटेन्ट पर क्लिक करें!",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) के लिए कोई कार्य उपलब्ध नहीं हैं",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "बोर्ड कंटेन्ट जोड़ रहा है",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}} पर कंटेन्ट नहीं मिल सका?",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span> टिप्पणी: </ span> प्रगति को ट्रैक नहीं कर सकते ",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "जब आपका बोर्ड आपके द्वारा अनुरोध की गई सामग्री को {{%s}} पर अपलोड करेगा, तो हम आपको सूचित करेंगे",
+  "DFLT_NONTRK_QR_CODE_DETAILS": "QR कोड स्कैन करके डिजिटल कंटेंट तक त्वरित पहुंच प्राप्त करें।",
+  "DFLT_NONTRK_SEE_MORE_BOOKS": "और देखें",
+  "DFLT_NONTRK_STUDENT_ROLE_DESC_1": "डिजिटल कंटेन्ट ब्राउज़ करें",
+  "DFLT_NONTRK_TEACHER_ROLE_DESC_1": "डिजिटल कंटेन्ट ब्राउज़ करें",
+  "DFLT_NONTRK_TUTORIAL_HEADING": "वीडियो, इन्टरएक्टिव कंटेन्ट, ई-पाठ्यपुस्तके और अधिक...",
+  "DFLT_TRK_BATCHEND_MAIN_HEADING": "आप जिस कोर्स के बैच में शामिल होना चाहते हो वह {{%s}} को समाप्त हो गया है",
+  "DFLT_TRK_BATCHEND_SUB_HEADING": "आप अध्ययन पूर्ण कर सकते है, परन्तु आपकी प्रगति अपडेट नहीं की जाएगी",
+  "DFLT_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "आपने अध्ययन कार्य गतिविधि को समाप्त कर दिया हैं",
+  "DFLT_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} तक अध्ययन पूर्ण कीजिए ",
+  "DFLT_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "यह अध्ययन कार्य निष्क्रिय है",
+  "DFLT_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "अध्ययन कार्य",
+  "DFLT_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "आप अध्ययन कार्य में शामिल हो गए हैं",
+  "DFLT_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "अध्ययन कार्य के बैच",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "अध्ययन कार्य",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "मेरे अध्ययन कार्य",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "{{%s}} को कार्य पूर्ण हुआ ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}} पर अंतिम बार अद्यतित किया गया",
+  "DFLT_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "नामांकन करें",
+  "DFLT_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "नवीनतम अध्ययन कार्य",
+  "DFLT_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "कार्य छोड़ना चाहते है?",
+  "DFLT_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "नामांकन हेतु लॉग इन करें",
+  "DFLT_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "कंटेन्ट डाउनलोड करें",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "कार्य ({{%s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "कार्य ({{%s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "ऑनलाइन अध्ययन कीजिये",
+  "DFLT_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "लोकप्रिय कार्य",
+  "DFLT_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ऑनलाइन अध्ययन कीजिये",
+  "DFLT_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "प्रमाणपत्र प्राप्त करने के लिए {{%s}} तक कार्य पूर्ण करे",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING": "अध्ययन कार्य",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "अध्ययन कार्य मे भाग लिया",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "कार्य विवरण",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "कार्य समाप्ति तारीख",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "कार्य की अंतिम तिथि",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "कार्य विवरण",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "यह कार्य  प्रासंगिक हैं:",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "कार्य संसाधन",
+  "DFLT_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "कार्य छोड़े",
+  "DFLT_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "अध्ययन कार्य देखना चाहते हैं?",
+  "DFLT_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "कार्य का बैच {{batch_start_date}} से उपलब्ध है",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "आपको 7 दिनों के भीतर प्रमाणपत्र के बारे में आपके पंजीकृत संपर्क विवरणों पर सूचित कर दिया जाएगा",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "टिप्पणी: इस कार्य में प्रमाणपत्र नहीं है",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "आप कार्य में शामिल हो गए हैं",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "टिप्पणी: वर्तमान में इस कार्य के लिए प्रमाणपत्र नहीं है। बाद में निर्माता प्रमाण पत्र संलग्न कर सकते हैं ",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "आपने कार्य छोड़ दिया है",
+  "DFLT_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "इस अध्ययन कार्य के लिए कोई बैच उपलब्ध नहीं हैं",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "कार्य पंजीकृत उपयोगकर्ताओं के लिए है। कार्य अभिगम हेतु लॉग इन करें।",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "कार्य शुरू करने के लिए लॉग इन करें",
+  "DFLT_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "इस कार्य के लिए कोई बैच उपलब्ध नहीं हैं",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "केवल पंजीकृत उपयोगकर्ता ही अध्ययन कार्य ले सकते हैं",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "आपने कार्य सफलतापूर्वक पूर्ण किया हैं",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "कार्य समाप्त हो गया है। आप मूल्यांकन कर सकते है लेकिन आपकी प्रगति दर्ज नहीं की जाएगी",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "कार्य समाप्त हो गया है। आप मूल्यांकन कर सकते है लेकिन आपकी प्रगति दर्ज नहीं की जाएगी",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "कार्य जानकारी देखने के लिए सक्रिय बैच में नामांकन कीजिए",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "कार्य विवरण अभिगम के लिए लाॅग इन करें",
   "DISMISS": "रद्द",
+  "DISMISS_AS_GROUP_ADMIN": "समूह एडमिन की भूमिका से बर्खास्त करें",
+  "DISMISS_AS_GROUP_ADMIN_ERROR_MSG": "{{member_name}} को समूह ऐडमिन के ओहदे से नहीं हटाया जा सका",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_DESC": "{{member_name}} को व्यवस्थापक भूमिका से हटाने पर  उसकी व्यवस्थापक अनुमतियाँ खारिज हो जायेगी",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_TITLE": "समूह व्यवस्थापक की भूमिका से बर्खास्त करें",
+  "DISMISS_AS_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} अब समूह एडमिन नहीं है",
   "DISTRICT": "ज़िला",
   "DISTRICT_OPTION_TEXT": "ज़िला चुनिए",
-  "DOCS": "आलेख",
+  "DOC": "आलेख",
   "DOWNLOAD": "डाउनलोड",
   "DOWNLOADING": "{{%s}}% डाउनलोड हो गया है",
   "DOWNLOADING_1": "डाउनलोड हो रहा है {{%s}}",
@@ -188,29 +361,38 @@
   "DOWNLOAD_CONFIRMATION_TEXT": "यह कंटेंट आपके मोबाइल में सहेजा जायेगा",
   "DOWNLOAD_CONTENT": "डाउनलोड ({{%s}})",
   "DOWNLOAD_FILE_INFO": "अक्षम विकल्पों को सक्षम करने के लिए फ़ाइल डाउनलोड करें",
-  "DOWNLOAD_FILE_SIZE": "फ़ाइल का माप",
+  "DOWNLOAD_FILE_SIZE": "फ़ाइल का माप {{%s}}",
   "DOWNLOAD_NOT_ALLOWED_FOR_QUIZ": "इस कंटेंट के लिए डाउनलोड की अनुमति नहीं है।",
   "DOWNLOAD_NOW": "अभी डाउनलोड करें",
-  "DOWNLOAD_PATH": "फ़ाइल को इंटरनल स्टोरेज में स्टोर किया जाता है > डाउनलोड फ़ोल्डर",
-  "EDIT": "संशोधित करें",
-  "EDIT_EMAIL_POPUP_TITLE": "ईमेल पता अद्यतित करें",
-  "EDIT_GROUP": "समूह संशोधित करें",
+  "DOWNLOAD_PATH": "फ़ाइल को इंटरनल स्टोरेज में संग्रह किया जाता है > डाउनलोड फ़ोल्डर",
+  "EDIT": "संपादित करें",
+  "EDIT_EMAIL_POPUP_TITLE": "ईमेल पता संपादित करें",
+  "EDIT_GROUP": "समूह संपादित करें",
   "EDIT_PERSONAL_DETAILS": "व्यक्तिगत विवरण संशोधित करें",
   "EDIT_PHONE_POPUP_TITLE": "मोबाइल नंबर अद्यतित करें",
-  "EDIT_PROFILE": "प्रोफ़ाइल संशोधित करें",
+  "EDIT_PROFILE": "प्रोफ़ाइल संपादित करें",
   "EMAIL_EDIT_SUCCESS": "ईमेल पता सफलतापूर्वक अपडेट किया गया",
   "EMAIL_ID_PLACEHOLDER": "ईमेल पता",
   "EMAIL_PLACEHOLDER": "ईमेल पता दर्ज करें",
   "EMAIL_UPDATE_SUCCESS": "ईमेल सफलतापूर्वक अपडेट किया गया",
   "EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) के लिए कोई पुस्तक उपलब्ध नहीं हैं",
   "EMPTY_SEARCH_RESULTS": "कोई परिणाम नहीं मिला",
+  "EMPTY_SEARCH_RESULT_GROUPS": "क्षमा करें! आपकी खोज से मिलते हुए कोई परिणाम नहीं हैं।",
   "ENDORSE": "परान्कित कीजिए",
   "ENJOYED_THIS_CONTENT": "इस कंटेंट का आनंद लिया?",
-  "ENROLL": "नामांकन",
+  "ENROLL": "नामांकन करें",
+  "ENROLLMENT_ENDED_ON": "नामांकन की अंतिम तारीख {{%s}} थी",
   "ENROLLMENT_LAST_DATE": "नामांकन की अंतिम तारीख़",
   "ENTER_GROUP_NAME": "समूह का नाम दर्ज करें",
+  "ENTER_ID": "ID दर्ज करें",
+  "ENTER_ID_AS_REQUESTED_BY_STATE_BOARD_ORG": "अपने राज्य/बोर्ड/संस्था द्वारा अनुरोध किया गया ID दर्ज करें",
+  "ENTER_LOCATION_FROM_PROFILE_PAGE": "प्रोफाइल पेज से स्थान दर्ज करें",
+  "ENTER_MEMBER_ID": "{{app_name}} ID दर्ज करें",
   "ENTER_OTP": "OTP दर्ज करें",
   "ENTER_PHONE_POPUP_TITLE": "मोबाइल नंबर दर्ज करें",
+  "ENTER_SCHOOL_NAME": "विद्यालय का नाम दर्ज करें",
+  "ENTER_THE_FOLLOWING_INFORMATION": "निम्न  जानकारी प्रविष्ट करें",
+  "ENTER_UDISE_ID": "UDISE ID दर्ज करें",
   "ERROR_BATCH_NOT_STARTED": "बैच शुरू नहीं हुआ",
   "ERROR_CANT_OPEN_EMPTY_CONTENT": "खाली फ़ाइल नहीं खोल सकते ",
   "ERROR_CONTENT_NOT_AVAILABLE": "पाठ्यक्रम अनुपलब्ध",
@@ -223,21 +405,32 @@
   "ERROR_FAILED_TO_DOWNLOAD_ATTACHMENT": "संलग्न डाउनलोड करने में असफ़ल",
   "ERROR_FETCHING_DATA": "डेटा लाने में त्रुटि",
   "ERROR_LOW_MEMORY": "भेजने के लिए जगह उपलब्ध नहीं हैं",
+  "ERROR_MAXIMUM_ACTIVITY_COUNT_EXCEEDS": "समूह की गतिविधियों की संख्या अधिकतम पहुँच गयी है ",
+  "ERROR_MAXIMUM_GROUP_COUNT_EXCEEDS": "बनाए जा सके समूहों की संख्या अधिकतम पहुँच गयी है",
+  "ERROR_MAXIMUM_MEMBER_COUNT_EXCEEDS": "समूह के सदस्यों की संख्या अधिकतम पहुँच गयी है",
   "ERROR_NAME_INVALID": "नाम में केवल अक्षर सा खाली स्थान ही मान्य हैं",
-  "ERROR_NO_BATCHES_FOUND": "प्रशिक्षण के लिए कोई बैच नहीं है",
+  "ERROR_NO_BATCHES_FOUND": "कोर्स के लिए कोई बैच नहीं है",
   "ERROR_NO_INTERNET_MESSAGE": "इंटरनेट कनेक्शन उपलब्ध नहीं है",
   "ERROR_NO_OFFLINE_RESOURCE": "कोई संसाधन संग्रहित नहीं",
   "ERROR_OFFLINE_MODE": "कोई इंटरनेट नहीं, ऑफ़लाइन मोड ",
-  "ERROR_OTP": "यह OTP गलत है| शेष प्रयासों की संख्या: {{%s}}",
+  "ERROR_OTP": "यह OTP गलत है। शेष प्रयासों की संख्या: {{%s}}",
+  "ERROR_OTP_LIMIT_EXCEEDED": "आपने ‪अभी OTP‬ प्राप्त करने की सीमा को पार कर लिया है, पुनः प्रयास करें",
   "ERROR_PHONE_EXISTS": "यह मोबाइल नंबर पहले से पंजीकृत है| दूसरा मोबाइल नंबर दर्ज करें",
   "ERROR_PHONE_INVALID": "वैध मोबाइल नंबर दर्ज करें",
+  "ERROR_PHONE_REQUIRED": "मोबाईल नंबर जरुरी है",
   "ERROR_SAME_EMAIL_UPDATED": "यह ईमेल पता आपके प्रोफ़ाइल में मौजूद है| कोई अन्य ईमेल पता दर्ज करें|",
   "ERROR_SAME_PHONE_UPDATED": "यह मोबाइल नंबर आपके प्रोफाइल में मौजूद हैं| कोई अन्य मोबाइल नंबर दर्ज करें|",
   "ERROR_SERVER_CONNECTION": "सर्वर से संपर्क करने में असमर्थ",
+  "ERROR_SPECIAL_CHARECTERS_NOT_ALLOWED": "विशेष वर्णाक्षरों को दर्ज करने की अनुमति नहीं है",
   "ERROR_TECHNICAL_PROBLEM": "तकनीकी समस्या के कारण आपका अनुरोध को संसाधित करने में असमर्थ हैं",
   "ERROR_UPLOADING_IMG": "चित्र अपलोड करते समय त्रुटि हुई",
   "ERROR_USER_ACCOUNT_BLOCKED": "उपयोगकर्ता का अकाउंट ब्लाक है| कृपया एडमिन से संपर्क करें|",
+  "ERROR_WHILE_ADDING_USER": "उपयोगकर्ता जोड़ने में त्रुटि",
+  "ERROR_WHILE_FETCHING_USERS": "उपयोगकर्ताओं को लाने के दौरान त्रुटि",
   "ERROR_WHILE_LOGIN": "लॉग इन करने में त्रुटि",
+  "ERROR_WHILE_SWITCHING_USER": "उपयोगकर्ता बदलते समय त्रुटि",
+  "EXPLORE_HEADING": "{{%s}} पर अधिक खोज करें",
+  "EXP_VIDEOS": "स्पष्टीकरण वीडियो",
   "EXTRACTING_CONTENT": "कंटेंट अवतरित हो रहा हैं",
   "FEEDBACK_HINT": "प्रतिक्रिया (वैकल्पिक)",
   "FEEDBACK_HINT_1": "टिप्पणी दे",
@@ -252,23 +445,194 @@
   "FILTER": "फ़िल्टर",
   "FILTER_ADDED": "जोड़ा गया",
   "FILTER_BY": "फ़िल्टर करें",
-  "FIRST_NAME": "नाम",
   "FOLLOW": "अनुसरण",
   "FORCE_UPDATE_MESSAGE": "आपके पास {{%s}} एप का पुराना वर्ज़न हैं| नवीनतम वर्ज़न पाने के लिए गूगल प्लेसटोर पर जाए और 'अपडेट करें' दबायें ",
+  "FORUM": "नाम",
+  "FOR_SUPPORT": "{{%s}} के समर्थन के लिए",
   "FREE_SPACE": "उपलब्ध जगह:",
+  "FRMELEMENTS_BTN_ACTIVATEGRP": "सक्रिय करें",
+  "FRMELEMENTS_BTN_ADD": "जोड़े",
+  "FRMELEMENTS_BTN_BACK": "पीछे",
+  "FRMELEMENTS_BTN_DEACTIVATEGRP": "निष्क्रिय",
+  "FRMELEMENTS_BTN_NEXT": "अगला",
+  "FRMELEMENTS_LBL_ACTIVATEGRP": "समूह सक्रिय करें",
+  "FRMELEMENTS_LBL_ACTIVATEGRPQUES": "समूह सक्रिय करें?",
+  "FRMELEMENTS_LBL_CONTENT_TYPE": "कंटेन्ट का प्रकार",
+  "FRMELEMENTS_LBL_DEACTIVATEGRP": "समूह निष्क्रिय करें",
+  "FRMELEMENTS_LBL_DEACTIVATEGRPQUES": "समूह निष्क्रिय करें?",
+  "FRMELEMENTS_LBL_REMARKS": "टिप्पणीयाँ",
+  "FRMELEMENTS_MSG_ACTIVATEGRPFAILED": "समूह को सक्रिय नहीं किया जा सका, पुन: प्रयास करें",
+  "FRMELEMENTS_MSG_ACTIVATEGRPMSG": "समूह सक्रिय करने पर आप सदस्यों और गतिविधियों को जोड़ने में सक्षम होते है। आप सदस्य प्रगति को भी ट्रैक कर सकते हैं",
+  "FRMELEMENTS_MSG_ACTIVATEGRPPOPUP": "यह समूह अस्थायी रूप से निष्क्रिय किया गया। समूह का एडमिन समूह को एक्टिव कर सकता है",
+  "FRMELEMENTS_MSG_ACTIVATEGRPSUCCESS": "समूह सफलतापूर्वक सक्रिय किया गया",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPFAILED": "समूह को निष्क्रिय नहीं किया जा सका, पुनः प्रयास करें",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPMSG": "समूह को निष्क्रिय करने से आपकी पहुंच समाप्त हो जाती है। आप समूह में गतिविधियाँ या सदस्यों को नहीं जोड़ सकते। आप सदस्य की प्रगति को ट्रैक भी नहीं कर सकते।",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPSUCCESS": "समूह सफलतापूर्वक निष्क्रिय कर दिया गया",
+  "FRMELEMNTS_BTN_CLOSE": "समाप्त ",
+  "FRMELEMNTS_BTN_DONOT_SHARE": "साझा न करें",
+  "FRMELEMNTS_BTN_EDIT_SETTING": "सेटिंग्स बदलें",
+  "FRMELEMNTS_BTN_PREVIEW_FORM": "फॉर्म का पूर्वावलोकन करें",
+  "FRMELEMNTS_BTN_SAVE": "सहेजें",
+  "FRMELEMNTS_BTN_SAVE_EDITS": "संपादन सहेजें",
+  "FRMELEMNTS_BTN_SAVE_FORM": "फॉर्म सहेजें",
+  "FRMELEMNTS_BTN_SEEK_HELP": "मदद पाइए",
+  "FRMELEMNTS_BTN_SUBMIT_FORM": "फॉर्म सबमिट करें",
+  "FRMELEMNTS_BTN_VIEW_DETAILS": "विवरण देखें",
+  "FRMELEMNTS_CKBX_CERTMSG": "यह संदेश फिर से न दिखाएं",
+  "FRMELEMNTS_LBL_ACCESSIBILITY": "स्क्रीन रीडर का अभिगम",
+  "FRMELEMNTS_LBL_ACCESSIBILITYMODE": "डार्क मोड पर जाएँ",
+  "FRMELEMNTS_LBL_ACCESSIBILITYSKIP": "मुख्य कंटेन्ट पर जाएँ",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXT": "साइट का नक्शा",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXTSIZE": "फॉन्ट साइज़ बढ़ाएँ",
+  "FRMELEMNTS_LBL_ADD_ATTACHMENTS": "संलग्न जोड़ें",
+  "FRMELEMNTS_LBL_ADD_ENTITY": "अस्तित्व जोड़ें",
+  "FRMELEMNTS_LBL_ADD_NEW_TASK": "नया कार्य जोड़ें",
+  "FRMELEMNTS_LBL_ADD_REMARKS": "टिप्पणी जोड़ें",
+  "FRMELEMNTS_LBL_ADD_SUBTASK": "उपकार्य का नाम जोड़ें",
+  "FRMELEMNTS_LBL_ADD_SUBTASK_PALCEHOLDER": "उपकार्य का नाम जोड़ें",
+  "FRMELEMNTS_LBL_ADD_TASK": "कार्य जोड़ें",
+  "FRMELEMNTS_LBL_ASSIGNED_TO": "नियुक्त किये गये",
+  "FRMELEMNTS_LBL_ASSIGN_TASK": "कार्य सौंपे",
+  "FRMELEMNTS_LBL_ATTACH": "संलग्न करें",
+  "FRMELEMNTS_LBL_ATTACHMENTS": "अटैच्मन्ट ",
+  "FRMELEMNTS_LBL_BLOCK": "खण्ड",
+  "FRMELEMNTS_LBL_CATEGORIES": "श्रेणी",
+  "FRMELEMNTS_LBL_CATEGORY_OVERVIEW": "श्रेणी अवलोकन",
+  "FRMELEMNTS_LBL_CLICK_HELP": "हेल्प बटन क्लिक करें",
+  "FRMELEMNTS_LBL_CLICK_HERE_TO_VIEW_LIBRARY": "लाइब्रेरी को देखने के लिए यहां क्लिक करें",
+  "FRMELEMNTS_LBL_CLUSTER": "समूह",
+  "FRMELEMNTS_LBL_CONSENT_POPUP_INFO": "आप इन विवरणों को अपने प्रोफाइल पेज से संपादित कर सकते हैं",
+  "FRMELEMNTS_LBL_CONTENT_AVAIALABLE_IN_OTHER_BOARD": "अन्य बोर्डों में आपकी आवश्यकता के अनुरूप दिलचस्प कंटेन्ट हो सकता है!",
+  "FRMELEMNTS_LBL_CONTENT_FOUND": "हमें कुछ ऐसा कंटेन्ट मिला है जो आपकी आवश्यकता से मिलता है!",
+  "FRMELEMNTS_LBL_CONTENT_TO_BE_ADDED": "आपका बोर्ड अभी और सामग्री जोड़ रहा है",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT": "आपका कंटेन्ट नहीं मिल सका? नीचे दिए गए बटन को क्लिक करें",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT_YET": "आपका कंटेन्ट नहीं मिल सका?",
+  "FRMELEMNTS_LBL_CRITERIA_WISE": "मापदंड",
+  "FRMELEMNTS_LBL_DATA_SETTINGS": "डेटा  सेटिंग",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF": "प्रोफ़ाइल डेटा साझा नहीं किया जा रहा है",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF_INFO": "आप कोर्स ऐडमिन के साथ अपने प्रोफ़ाइल विवरण साझा करने के लिए सहमत नहीं हुए हैं",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON": "प्रोफ़ाइल डेटा साझा हो रहा है",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON_INFO": "आप कोर्स ऐडमिन के साथ अपने प्रोफ़ाइल विवरण साझा करने के लिए सहमत हुए हैं",
+  "FRMELEMNTS_LBL_DELETE_CONFIRMATION": "आप इस उपकार्य को हटाना चाहते हैं?",
+  "FRMELEMNTS_LBL_DONOT_SHARE_PROFILE_INFO": "मेरा प्रोफ़ाइल विवरण साझा न करें",
+  "FRMELEMNTS_LBL_DURATION": "अवधि",
+  "FRMELEMNTS_LBL_EMAIL_ID_PLACEHOLDER": "राज्य / संगठन के लिए मेल ID",
+  "FRMELEMNTS_LBL_END_DATE": "अंतिम तिथि",
+  "FRMELEMNTS_LBL_FILES": "फ़ाइलें",
+  "FRMELEMNTS_LBL_IMAGES": "इमेज ",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS": "प्रोजेक्ट  रिपोर्ट",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS_DESC": "प्रोजेक्ट रिपोर्ट देखें",
+  "FRMELEMNTS_LBL_IN_PROGRESS": "प्रगतिशील",
+  "FRMELEMNTS_LBL_LEARNER_PASSBOOK": "शिक्षार्थी पासबुक",
+  "FRMELEMNTS_LBL_LEARNING_RESOURCES": "अध्ययन के साधन",
+  "FRMELEMNTS_LBL_LINK_LEARNING_RESOURCES": "अध्ययन के साधनों को लिंक करें",
+  "FRMELEMNTS_LBL_MEDIA_TYPE": "मीडिया प्रकार",
+  "FRMELEMNTS_LBL_MOBILE_NUMBER_PLACEHOLDER": "राज्य/संगठन के लिए मोबाइल नंबर",
+  "FRMELEMNTS_LBL_MY_LEARNINGS": "मेरे अध्ययन",
+  "FRMELEMNTS_LBL_NEW_TASK": "नया कार्य",
+  "FRMELEMNTS_LBL_NO_MATCHING_CONTENT": "मिलता हुआ कोई कंटेन्ट उपलब्ध नहीं",
+  "FRMELEMNTS_LBL_OBJECTIVE": "उद्देश्य",
+  "FRMELEMNTS_LBL_OBSERVATION": "अवलोकन ",
+  "FRMELEMNTS_LBL_OBSERVATION_DESC": "अपनी कक्षा और स्कूल की टिप्पणियों को आसानी से एक्सेस और रिकॉर्ड करें, और अपनी सुधार यात्रा की योजना बनाएं",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS": "अवलोकन रिपोर्ट",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS_DEC": "अवलोकन रिपोर्ट देखें",
+  "FRMELEMNTS_LBL_OBSERVE_AGAIN": "पुनः निरीक्षण करें",
+  "FRMELEMNTS_LBL_OPEN_BATCH_NOT_RECOMMENDED": "कोर्स में पुनः शामिल होने पर आपके कोर्स का इतिहास और प्रमाण-पत्र रीसेट हो जाएंगे इसीलिए यह प्रक्रिया अनुशंसित नहीं हैं",
+  "FRMELEMNTS_LBL_PERSONA": "भूमिका",
+  "FRMELEMNTS_LBL_PROFCONF": "प्रोफाइल नाम की पुष्टि करें",
+  "FRMELEMNTS_LBL_PROFTITLE": "प्रोफाइल नाम",
+  "FRMELEMNTS_LBL_PROGRAM_NAME": "कार्यक्रम का नाम",
+  "FRMELEMNTS_LBL_PROJECT": "प्रोजेक्ट",
+  "FRMELEMNTS_LBL_PROJECT_DESCRIPTION": "कार्यों का नियोजन और समय-सीमा बनाकर अपने स्कूल के सुधारों को प्रबंधित और ट्रैक करें",
+  "FRMELEMNTS_LBL_PROJECT_OVERVIEW": "प्रोजेक्ट अवलोकन",
+  "FRMELEMNTS_LBL_PROJECT_STATUS": "प्रोजेक्ट अवस्था",
+  "FRMELEMNTS_LBL_PROJECT_TITLE": "प्रोजेक्ट का शीर्षक",
+  "FRMELEMNTS_LBL_PROJECT_VIEW": "प्रोजेक्ट देखें",
+  "FRMELEMNTS_LBL_QUESTION_WISE": "प्रश्न ",
+  "FRMELEMNTS_LBL_RELEVANT_CONTENT_SUB_HEADING": "अपने विशिष्ट कंटेन्ट की आवश्यकताओं के लिए विवरण भरें",
+  "FRMELEMNTS_LBL_REPORTS": "रिपोर्ट",
+  "FRMELEMNTS_LBL_REPORTS_DESC": "रिपोर्ट सूची",
+  "FRMELEMNTS_LBL_REQUEST_CONTENT": "कंटेन्ट का अनुरोध करना चाहते है?",
+  "FRMELEMNTS_LBL_SCHOOL": "विद्यालय",
+  "FRMELEMNTS_LBL_SELECT_CATEGORIES": "श्रेणी चुनिए",
+  "FRMELEMNTS_LBL_SELECT_PROGRAM": "कार्यक्रम चुनिए",
+  "FRMELEMNTS_LBL_SET_DATE": "निर्धारित तिथि",
+  "FRMELEMNTS_LBL_SET_DATE_HINT": "अपने प्रोजेक्ट के लिए एक टाइमलाइन सेट करें",
+  "FRMELEMNTS_LBL_SHARE_PROFILE_INFORMATION": "मेरे प्रोफ़ाइल का विवरण साझा करें",
+  "FRMELEMNTS_LBL_START_DATE": "आरंभ तिथि",
+  "FRMELEMNTS_LBL_STATUS": "अवस्था",
+  "FRMELEMNTS_LBL_SUBPERSONA": "सह-भूमिका",
+  "FRMELEMNTS_LBL_SUBTASKS": "उपकार्य",
+  "FRMELEMNTS_LBL_SURVEY": "सर्वेक्षण",
+  "FRMELEMNTS_LBL_SURVEY_ACTION": "सर्वेक्षण कार्रवाई",
+  "FRMELEMNTS_LBL_SURVEY_DESC": "सर्वेक्षण सूची ",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS": "सर्वेक्षण रिपोर्ट",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS_DESC": "सर्वेक्षण रिपोर्ट देखें",
+  "FRMELEMNTS_LBL_TAB_HOME": "होम ",
+  "FRMELEMNTS_LBL_TASK_DESCRIPTION": "कार्य विवरण",
+  "FRMELEMNTS_LBL_TASK_OVERVIEW": "कार्य अवलोकन",
+  "FRMELEMNTS_LBL_THIS_MONTH": "वर्तमान माह",
+  "FRMELEMNTS_LBL_TOTAL_TASKS": "कुल कार्य",
+  "FRMELEMNTS_LBL_UPCOMING": "आगामी",
+  "FRMELEMNTS_LBL_UPDATE_DATA_SETTINGS": "सेटिंग अद्यतित करें",
+  "FRMELEMNTS_LBL_USERTYPE_LEADER": "स्कूल प्रमुख या अधिकारी",
+  "FRMELEMNTS_LBL_VIEW_ENTITY_REPORT": "अस्तित्व रिपोर्ट देखें",
+  "FRMELEMNTS_LBL_VIEW_FULL_REPORT": "पूरी रिपोर्ट देखें",
+  "FRMELEMNTS_LBL_VIEW_RESOURCES": "संसाधन देखें",
+  "FRMELEMNTS_MSG_BATCH_ALREADY_CLOSED": "इस बैच के लिए नामांकन {endDate} पर बंद हुआ",
+  "FRMELEMNTS_MSG_CONSENT_DECLARATION_INFO": "आप अपने विवरणों को अपने प्रोफाइल पेज से संपादित कर सकते हैं",
+  "FRMELEMNTS_MSG_DATA_SETTINGS_SUBMITED_SUCCESSFULLY": "डेटा सेटिंग सफलतापूर्वक दाखिल की गई",
+  "FRMELEMNTS_MSG_DELETE_TASK_CONFIRMATION": "आप इस कार्य को हटाना चाहते हैं?",
+  "FRMELEMNTS_MSG_EDITCERTNAME": "आप इसे अपने प्रोफ़ाइल पेज से संपादित कर सकते हैं।",
+  "FRMELEMNTS_MSG_LOAD_FROM_LIBRARY": "पुस्तक संग्रह से लोड करें",
+  "FRMELEMNTS_MSG_NAMEONCERT": "यह नाम आपके कोर्स सर्टिफिकेट पर छपा जायेगा । यह सही है या नहीं इसकी पुष्टि करें।",
+  "FRMELEMNTS_MSG_SELECT_IMAGE_SOURCE": "छवि स्रोत चुनिए",
+  "FRMELEMNTS_MSG_SELFDECLARATION_SUCCESS_INFO": "आप प्रोफाइल पेज से इस उपयोगकर्ता के विवरण को संपादित कर सकते हैं",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED": "सफलतापूर्वक जोड़ा गया",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_SYNCED": "परियोजना को सफलतापूर्वक सिंक किया गया",
+  "FRMELEMNTS_MSG_TICKET_SUBMISSION_SUCCESS": "आपकी प्रतिक्रिया के लिए धन्यवाद। हमें भेजे गए हर सुझाव का जवाब देने में हम सक्षम नहीं हैं, लेकिन आपकी प्रतिक्रिया मूल्यवान है। यह {{app_name}} को बेहतर बनाने में मदद करता है।",
+  "FRMELEMNTS_MSG_UNABLE_TO_ENROLL": "नामांकन पूर्ण नहीं किया जा सका| पुनः प्रयास करें",
+  "FRMELEMNTS_MSG_UPDATED_SUCCESSFULLY": "सफलतापूर्वक अद्यतित किया गया",
+  "FRMELEMNTS_MSG_USER_CREATION_LIMIT_EXCEEDED": "उपयोगकर्ता निर्माण सीमा पार हो गई है",
+  "FRMELEMNTS_MSG_USE_CAMERA": "कैमरे का उपयोग करें",
+  "FRMELEMNTS_MSG_USE_FILE": "फ़ाइल का उपयोग करें",
+  "FRMELEMNTS_MSG_YOUR_CHANGES_ARE_SAVED": "आपके परिवर्तन सफलतापूर्वक सहेजे गए ",
+  "FRMELENTS_LBL_ACCESSIBILITYNORMALMODE": "लाइट मोड पर जाएँ",
+  "FRMELMNTS_BLTPT_EARNCERT": "प्रमाण-पत्र केवल {{STATE}} राज्य के उपयोगकर्ताओं को जारी किए जाते हैं  ",
+  "FRMELMNTS_BLTPT_EARNCERT2": "ऊपर स्कोर {{PERCENTAGE}} अपने सभी आकलन में",
+  "FRMELMNTS_BLTPT_EARNCERT3": "प्रमाण पत्र अर्जित करने के लिए आप मूल्यांकन का प्रयास कर सकते हैं {{ATTEMPTS}} केवल समय।",
+  "FRMELMNTS_IMSG_DECLAREINFO": "इस पाठ्यक्रम के लिए प्रमाण पत्र केवल राज्य द्वारा मान्यता प्राप्त शिक्षकों के लिए जारी किए जाते हैं",
+  "FRMELMNTS_IMSG_LASTATTMPALRT": "यह अंतिम शेष प्रयास है",
+  "FRMELMNTS_IMSG_LASTATTMPTEXCD": "आपने मूल्यांकन प्रस्तुत करने के लिए अधिकतम प्रयासों को पार कर लिया है",
+  "FRMELMNTS_LBL_ACCESSIBILITYFNTDFLT": "डिफ़ॉल्ट पर रीसेट करें",
+  "FRMELMNTS_LBL_ACCESSIBILITYFONT": "फॉन्ट साइज़ घटाएँ",
+  "FRMELMNTS_LBL_AVSCORE": "सर्वश्रेष्ठ मूल्यांकन स्कोर का औसत",
+  "FRMELMNTS_LBL_BESTSCORE": "सर्वश्रेष्ठ स्कोर {{SCORE}}",
+  "FRMELMNTS_LBL_CERTQUES": "आप अपना प्रमाण-पत्र कैसे प्राप्त कर सकते हैं?",
+  "FRMELMNTS_LBL_NOTIFNUMBER": "{{NUMBER}} नई अधिसूचना",
+  "FRMELMNTS_LBL_SEELESS": "कम देखें",
+  "FRMELMNTS_LBL_SEEMORE": "और देखें",
+  "FRMELMNTS_LBL_STATEUSERQUES": "क्या आप राज्य के शिक्षक हैं?",
+  "FRMELMNTS_LNK_DECLARELINK": "अभी घोषणा करें",
+  "FRMELMNTS_PRMPT_DECLAREPROMPT": "प्रमाण-पत्र अर्जित करने के लिए {instance} पर अपनी जानकारी घोषित करें",
+  "FRMELMNTS_SCTTL_NOTIFHEADER": "सूचनाएँ",
   "FROM": "से",
   "FULL_NAME": "नाम",
+  "GET_STARTED": "शुरू करें",
   "GOT_IT": "ठीक है",
+  "GO_TO_DOWNLOADS": "डाउनलोड में जाएँ",
+  "GO_TO_PROFILE": "प्रोफाइल पर जाएं",
   "GRADE_OPTION_TEXT": "कक्षा चुनिए",
   "GRANT_ACCESS": "अनुमति दीजिए",
-  "GROUPS": "समूहों",
-  "GROUPS_YOU_FOLLOW": "जिन समूहों का आप अनुसरण करते हैं",
-  "GROUP_CREATE_SUCCESS": "समूह सफलतापूर्वक बनाया गया",
-  "GROUP_DELETE_CONFIRM": "'{{%s}}' हटाने की पुष्टि करें?",
-  "GROUP_DELETE_CONFIRM_MESSAGE": "आप केवल समूह हटा रहे है | उपयोगकर्ताओ के नाम उपयोगकर्ता टैब में मौजूद हैं",
-  "GROUP_MEMBER_ADD_SUCCESS": "सदस्य सफलतापूर्वक जोड़े गये",
-  "GROUP_MEMBER_DELETE_SUCCESS": "समूह के सदस्यों को सफलतापूर्वक हटा दिया गया",
+  "GROUP_CREATED": "समूह सफलतापूर्वक बनाया गया",
+  "GROUP_CREATED_BY": "{{group_creator_name}} के द्वारा बनाया गया",
+  "GROUP_DESCRIPTION": "समूह का विवरण",
+  "GROUP_DESCRIPTION_PLACEHOLDER": "सदस्यों को समूह के उद्देश्य को समझने में मदद करने के लिए विवरण दें",
+  "GROUP_GUIDELINES": "समूह दिशानिर्देश",
+  "GROUP_MEMBER_SEARCH_PLACEHOLDER": "समूह के भीतर खोजें",
   "GROUP_NAME": "समूह का नाम",
+  "GROUP_NAME_IS_REQUIRED": "आपको समूह का नाम दर्ज करना होगा",
+  "GROUP_TERMS_IS_REQUIRED": "आगे बढ़ने से पहले आपको {{app_name}} समूह दिशानिर्देशों से सहमत होना होगा",
   "GROUP_UPDATE_SUCCESS": "समूह विवरण सफलतापूर्वक अपडेट किया गया",
   "HABIT_REMINDER_NOTIFICATION_MESSAGE": "आज {{%s}} से कुछ नया सीखे!",
   "HELP": "सहायता",
@@ -277,8 +641,9 @@
   "HIDE_CREDITS_INFO": "लाइसेंसिंग जानकारी छिपाएं",
   "HINT_LANGUAGE": "पसंदीदा भाषा चुनिये",
   "HOBBIES": "शौक",
-  "IAM_ABOVE_18_YEARS_AGE": "मेरी उम्र 18 साल के ऊपर हैं",
-  "IF_YES_LOGIN": "यदि हाँ, तो लॉगिन करें",
+  "HOURS_AGO": "{{%s}} घंटें पहले",
+  "HOUR_AGO": "{{%s}} घंटे पहले ",
+  "ID_IS_REQUIRED": "ID जरुरी है",
   "IMPORTING": "आयातित किया जा रहा हैं",
   "IMPORTING_COUNT": "आयातित हो रहा है",
   "IMPORT_ECAR": "फ़ाइल स्वरुप असंगत है| आप केवल  .ecar, .epar और .gsa फ़ाइल आयातित कर सकते है",
@@ -287,59 +652,97 @@
   "INACTIVE": "निष्क्रिय",
   "INCORRECT_TEACHER_ID_ERROR": "आपने एक गलत ID दर्ज की है। फिर से ID डालें",
   "INSTALL_CROSSWALK": "क्रॉसवॉक इनस्टॉल कीजिये",
+  "INSTANCE_TERMS_OF_USE": "{{app_name}} के उपयोग की शर्तें  ",
   "INSUFFICIENT_STORAGE": "अपर्याप्त स्टोरेज जगह",
   "INTERACTION": "इन्टरएक्टिव",
+  "INTERACTIVE_MATERIAL": "इन्टरएक्टिव अध्ययन सामग्री",
   "INTERNAL_MEMORY": "अंतरिम स्टोरेज",
   "INTERNET_AVAILABLE": "आप अभी ऑनलाइन है",
   "INTERNET_CONNECTIVITY_NEEDED": "इंटरनेट कनेक्शन उपलब्ध नहीं है",
   "INVALID_CONTENT": "कंटेंटअमान्य है",
   "INVALID_FORMAT": "अवैध प्रारूप",
+  "INVALID_MEMBER_ID": "आपने एक अमान्य {{app_name}} ID दर्ज किया है",
   "INVALID_QR": "QR कोड अमान्य",
   "ITEMS": "{{%s}} फ़ाइल/फ़ाइलें",
   "ITEMS_SELECTED": "चयनित फ़ाइल",
+  "I_AGREE_TO": "मुझे स्वीकार हैं {{app_name}} की ",
   "I_AGREE_TO_TNC": "मैं उपयोग के नियम एवं शर्तों को स्वीकार करता/करती हूँ",
-  "JOIN_TRAINING": "प्रशिक्षण मे भाग लिजिए",
+  "I_AM_A_PERSONA_WITH_TENANT": "मैं {{%tenant}} के साथ एक {{%persona}} हूं",
+  "I_UNDERSTAND_AND_ACCEPT": "मैं समझता हूं और स्वीकार करता हूं",
+  "JOIN_TRAINING": "कोर्स मे भाग लिजिए",
   "LANGUAGE": "भाषा",
   "LANGUAGE_SETTINGS": "भाषा सेटिंग्स",
-  "LAST_DATE_TO_JOIN": "नामांकन की अंतिम तारीख़",
+  "LAST_DATE_TO_JOIN": "नामांकन की अंतिम तारीख़ {{%s}}",
   "LAST_SYNC": "अंतिम बार समन्वयित हुआ",
+  "LAST_UPDATED": "अंतिम अद्यतन ‪{{%s}}‬",
   "LAST_VIEWED": "अंतिम बार देखा गया",
-  "LATEST_COURSES": "नवीनतम पाठ्यक्रम",
-  "LEAVE_TRAINING_HEADING": "प्रशिक्षण से नामांकन रद्ध करें",
+  "LATEST_COURSES": "नवीनतम कोर्स",
+  "LEAVE_GROUP": "समूह छोड़े",
+  "LEAVE_GROUP_ERROR_MSG": "समूह छोड़ने  में असमर्थ| पुनः प्रयास करें",
+  "LEAVE_GROUP_POPUP_DESC": "इस प्रक्रिया को पूर्ववत नहीं किया जा सकता| क्या आप {{group_name}} छोड़ना चाहते हैं?",
+  "LEAVE_GROUP_POPUP_TITLE": "क्या आप समूह छोड़ना  चाहते है?",
+  "LEAVE_GROUP_SUCCESS_MSG": "आप अब इस समूह का हिस्सा नहीं हैं",
+  "LEAVE_TRAINING_HEADING": "कोर्स से नामांकन रद्ध करें",
   "LIBRARY_BNAV": "पुस्तक संग्रह",
   "LICENSE": "लाइसेंस शर्तें",
   "LOAD": "लोड",
+  "LOADER_PROGRESS_DESCRIPTION": "हम तैयारी कर रहे है",
+  "LOADER_PROGRESS_DESC_SUB_HEADING": "प्रतीक्षा कीजिये...",
   "LOADING_CONTENT": "पाठ्यक्रम लोड करें",
   "LOADING_CONTENTS": "कंटेंट लोड हो रहा हैं {{%s}}%",
-  "LOADING_USER_LIST": "प्रतीक्षा कीजिये, उपयोगकर्ता सूची लोड हो रही हैं",
   "LOAD_FILE": "फाइल लोड करें",
-  "LOGGED_IN_AS": "के रूप में लॉग-इन हुए हैं ",
-  "LOGGED_OUT": "लॉग आउट",
+  "LOGGED_IN_MEMBER": "{{member_name}} (आप)",
+  "LOGIN_TO_CREATE_GROUP_DESCRIPTION": "अपने स्वयं के समूह, अध्ययन सर्कल या कक्षा बनाने की दिशा में पहला कदम लॉग इन करना है",
+  "LOGIN_TO_JOIN_TRAINING": "किसी कोर्स में शामिल होने के लिए लॉग इन करें",
   "LOGOUT": "लॉग आउट करें",
   "LOW_BANDWIDTH": "कम बैंडविड्थ",
   "LOW_BANDWIDTH_DETECTED": "नेटवर्क की बैंडविड्थ कम हैं",
-  "MARKS": "अंक",
+  "MAINTENANCE_MESSAGE": "वर्तमान में हम रखरखाव के लिए बंद हैं। लेकिन चिंता मत करें, हम जल्द ही अपनी सेवाओ के साथ {{%timeLeft}} घंटों में आपके समक्ष आएँगे। जल्दी वापस आईए!",
+  "MAINTENANCE_SUB_TEXT": "आप अभी भी आपके द्वारा डाउनलोड की गई कंटेन्ट तक पहुंच सकते हैं",
+  "MAKE_ADMIN": "एडमिन बनाएँ",
+  "MAKE_GROUP_ADMIN_ERROR_MSG": "{{member_name}} को समूह ऐडमिन नहीं बनाया जा सका",
+  "MAKE_GROUP_ADMIN_POPUP_DESC": "इस प्रक्रिया से {{member_name}} को समूह एडमिन की अनुमतियां मिलेंगी",
+  "MAKE_GROUP_ADMIN_POPUP_TITLE": "समूह एडमिन बनाएँ?",
+  "MAKE_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} समूह एडमिन हैं",
   "MEDIUM": "माध्यम",
   "MEDIUM_OF_INSTRUCTION": "निर्देश का माध्यम",
   "MEDIUM_OPTION_TEXT": "माध्यम चुनिए",
+  "MEMBERS": "सदस्य",
+  "MEMBER_ADDED_TO_GROUP": "सदस्य समूह में सफलतापूर्वक जोड़ा गया है ",
+  "MEMBER_ALREADY_EXISTS_IN_GROUP": "पहले ही इस समूह के सदस्य हैं",
+  "MEMBER_ID": "{{app_name}} ID",
+  "MENU_DELETE_GROUP": "समूह हटाएँ",
+  "MENU_DISMISS_AS_GROUP_ADMIN": "समूह व्यवस्थापक की भूमिका से बर्खास्त करें",
+  "MENU_EDIT_GROUP_DETAILS": "समूह विवरण संपादित करें",
+  "MENU_LEAVE_GROUP": "समूह छोड़े",
+  "MENU_MAKE_GROUP_ADMIN": "समूह एडमिन बनाएँ",
+  "MENU_REMOVE_ACTIVITY": "गतिविधि हटाएँ",
+  "MENU_REMOVE_FROM_GROUP": "समूह से हटाएं",
   "MERGE_ACCOUNT": "अकाउंट मिलायें",
   "MICROPHONE": "माइक्रोफ़ोन",
   "MICROPHONE_PERMISSION_DESCRIPTION": "{{%s}} कंटेंट में आवाज़ रिकॉर्ड करने के लिए माइक्रोफ़ोन की अनुमति दीजिए",
+  "MINUTES_AGO": "{{%s}} मिनट पहले",
+  "MINUTE_AGO": "{{%s}} मिनट पहले ",
+  "MONTHS_AGO": "{{%s}} महीने पहले ",
+  "MONTH_AGO": "{{%s}} महीने पहले",
   "MORE": "अधिक",
   "MORE_CONTENT": "{{%s}} पर अधिक पुस्तकें और कंटेंट ढूंढें",
+  "MORE_COUNT": "अधिक ({{%s}})",
   "MORE_DETAILS": "अधिक जानकारी (अधिक विवरण या त्रुटि का स्क्रीनशॉट भेजिए)",
   "MOVE": "भेजिए",
   "MOVE_FILES_TO_OTHER_DESTINATION": "जगह खाली करने के लिए फ़ाइल {{%s}} में भेजिए",
   "MSG_ALREADY_IMPORTED": "पहले से आयातित",
   "MSG_IMPORTED_SUCCESSFULLY": "कंटेंट सफलतापूर्वक आयातित",
-  "MSG_LOADING_BATCHES": "बैच लोड हो रही हैं...",
   "MSG_NO_DETAILS_TO_SHOW": "विवरण उपलब्ध नहीं हैं",
   "MSG_NO_NEW_NOTIFICATION": "कोई नई अधिसूचना नहीं",
   "MSG_RESOURCE_DELETED": "मोबाइल से कंटेंट हटाया गया",
   "MULTIPLE_LICENSE": "लाइसेंस शर्तें {{%s}}",
   "MY_BADGES": "मेरे पदक",
+  "MY_DETAILS": "मेरा विवरण",
+  "MY_GROUPS": "मेरे समूह",
   "NAME": "नाम",
   "NAME_HINT": "अपना नाम दर्ज करें",
+  "NAME_IS_REQUIRED": "उपयोगकर्ता का नाम आवश्यक है",
   "NEED_INTERNET_FOR_DEEPLINK_CONTENT": "आप ऑफलाइन हैं। कंटेंट तक पहुंचने के लिए इंटरनेट से जुड़ें",
   "NEED_INTERNET_TO_CHANGE": "इंटरनेट कनेक्शन उपलब्ध नहीं हैं, WiFi या मोबाइल डेटा चालू कर पुनः प्रयास करें",
   "NEW": "नया",
@@ -347,43 +750,41 @@
   "NEXT": "अगला",
   "NIL": "शून्य",
   "NO": "नहीं",
+  "NOTE": "टिप्पणी",
   "NOTIFICATION": "अधिसूचना",
   "NOT_AVAILABLE": "उपलब्ध नहीं हैं",
   "NOT_NOW": "अभी नहीं",
   "NO_APP_FOR_INTENT": "फ़ाइल  खोलने के लिए ऐप उपलब्ध नहीं हैं",
-  "NO_ASSESSMENT": "कोई मूल्यांकन उपलब्ध नहीं है",
   "NO_BATCHES_AVAILABLE": "कोई बैच उपलब्ध नहीं है",
   "NO_BOOKS_AVAILABLE": "बोर्ड द्वारा पुस्तकें जोड़ी जा रही हैं",
-  "NO_BOOKS_DEFINITION": "बोर्ड जल्द ही कुछ और पुस्तकें जोड़ने की प्रक्रिया में हैं। {{%s}} में अधिक पुस्तक और कंटेंट देखने के लिए यह बटन दबायें",
+  "NO_BOOKS_DEFINITION": "आपके बोर्ड को जल्द ही कुछ और पुस्तकें जोड़नी हैं । {{%s}} पर कंटेंट देखने का अनुरोध करने के लिए, <b>अधिक पुस्तकें और सामग्री</b> बटन देखें पर क्लिक करें",
+  "NO_BOOKS_TEXT": "{{%s}} पर आपके विषय की पाठ्यपुस्तक नहीं मिल रही है?",
   "NO_CONTENTS": "कोई {{%s}} नहीं हैं",
   "NO_CONTENTS_FOUND": "कोई पाठ्यक्रम नहीं मिल सका",
   "NO_CONTENTS_MESSAGE": "अन्य प्रकार का कंटेंट चुनिये",
+  "NO_CONTENT_AVAILABLE_IN_MODULE": "इस मॉड्यूल में कोई कंटेन्ट उपलब्ध नहीं है",
+  "NO_COURSES": "कोई कोर्स नहीं",
   "NO_DATA_FOUND": "कोई डेटा उपलब्ध नहीं",
-  "NO_DESCRIPTION": "विवरण उपलब्ध नहीं हैं",
   "NO_DOWNLOADS": "कुछ भी डाउनलोड नहीं किया गया हैं",
-  "NO_DOWNLOADS_INFO": "प्रशिक्षण और पुस्तक संग्रह से कटेंट डाउनलोड करें",
+  "NO_DOWNLOADS_INFO": "कोर्स और पुस्तक संग्रह से कटेंट डाउनलोड करें",
   "NO_FILTERS_SELECTED": "कोई फ़िल्टर चयनित नहीं है",
-  "NO_GROUPS_CREATED_YET": "अभी तक कोई समूह नहीं बनाया गया हैं",
-  "NO_GROUP_MESSAGE": "समग्र प्रगति की निगरानी और उपयोगकर्ताओं को व्यवस्थित करने के लिए समूहों का प्रयोग करें",
   "NO_INTERNET": "इंटरनेट कनेक्शन उपलब्ध नहीं है",
   "NO_INTERNET_TITLE": "आप ऑफलाइन हैं",
   "NO_PREVIEW": "कोई पूर्वावलोकन उपलब्ध नहीं  है",
   "NO_QR_CODE": "मेरे पास QR कोड नहीं है",
   "NO_QR_CODE_QSTN": "क्या आपके पास QR कोड मौजूद नहीं है?",
   "NO_RATING": "कोई रेटिंग उपलब्ध नहीं है",
-  "NO_USERS": "उपयोगकर्ताओं नहीं है",
-  "NO_USERS_CREATED_YET": "अभी तक कोई उपयोगकर्ता नहीं बनाया गया हैं",
-  "NO_USERS_CREATED_YET_MSG": "आप अपने छात्रों / अन्य शिक्षकों के लिए अतिथि उपयोगकर्ता खाते बना सकते हैं",
-  "NO_USERS_IN_THIS_GROUP": "इस समूह में कोई उपयोगकर्ता नहीं है",
-  "NO_USERS_ON_THIS_DEVICE": "इस मोबाइल पर कोई उपभोगकर्ता दर्ज नहीं हैं",
-  "NO_USERS_SUGGESTION_MESSAGE": "समूह में कम से कम एक उपयोगकर्ता होना चाहिए",
+  "NUMBER_OF_COURSES": "कोर्स ({{%s}})",
+  "NUMBER_OF_COURSE_1": "कोर्स ({{%s}}) ",
   "NUMBER_OF_VOTES": "वोटों की संख्या",
-  "OFF": "बंद",
+  "OFF": "बंद करें",
   "OFFLINE_DOWNLOAD_MESSAGE": "इंटरनेट कनेक्शन उपलब्ध होने पर डाउनलोड फिर से शुरू होगा",
   "OFFLINE_WARNING": "सुनिश्चित करें कि आपका मोबाइल इंटरनेट से जुड़ा हैं",
   "OFFLINE_WARNING_ETBUI": "इस कंटेंट को देखने के लिए इन्टरनेट से जुड़िये",
   "OFFLINE_WARNING_ETBUI_1": "कंटेंट देखने के लिए इन्टरनेट से जुड़िये",
   "OKAY": "ठीक हैं",
+  "ONGOING": "अविरत",
+  "ONLY_DIGIT_NUMBER_IS_ALLOWED": "केवल 11 अंकों की संख्या की अनुमति है",
   "ONLY_DOWNLOADED_CONTENT_CAN_BE_PLAYED_OFFLINE": "केवल डाउनलोड किये हुए कंटेंट ही ऑफलाइन चलाये जा सकते हैं",
   "OPEN": "खोलें",
   "OPEN_SETTINGS": "सेटिंग्स खोलें",
@@ -393,13 +794,12 @@
   "ORIGINAL_CONTENT": "कंटेंट",
   "ORIGINAL_CONTENT_DATA": "कंटेंट का मूल :",
   "OTHER_ROLE_DESC_1": "डिजिटल कंटेन्ट ब्राउज़ करें",
-  "OTHER_ROLE_DESC_2": "ऑनलाइन प्रशिक्षण लीजिए",
-  "OTHER_USERS": "अन्य उपयोगकर्ता",
+  "OTHER_ROLE_DESC_2": "ऑनलाइन कोर्स लीजिए",
   "OTP_FAILED": "OTP को मान्य करने में विफल। पुन: प्रयास करें।",
   "OTP_PLACEHOLDER": "OTP दर्ज करें",
   "OTP_RESENT": "OTP दोबारा भेजा गया",
   "OVERLAY_INFO_TEXT_COMMON": "सुविधाओं तक पहुंचने के लिए लाॅग इन करें",
-  "OVERLAY_INFO_TEXT_TAKE_COURSE": "सभी प्रशिक्षण पंजीकृत उपयोगकर्ताओं के लिए हैं| प्रशिक्षण तक पहुँचने के लिए लॉग इन करें| ",
+  "OVERLAY_INFO_TEXT_TAKE_COURSE": "कोर्स पंजीकृत उपयोगकर्ताओं के लिए हैं। कोर्स तक पहुँचने के लिए लॉग इन करें। ",
   "OVERLAY_LABEL_COMMON": "{{%s}} मे असीमित पहुंच प्राप्त करें",
   "OVERLAY_LABEL_HOME": "आपका व्यक्तिगत होम टैब",
   "OVERLAY_LABEL_TAKE_COURSE": "इस कोर्स में नामांकन के लिए लॉग इन करें",
@@ -417,41 +817,49 @@
   "PHONE_EDIT_SUCCESS": "मोबाइल नंबर सफलतापूर्वक अद्यतित किया गया",
   "PHONE_PLACEHOLDER": "मोबाइल नंबर",
   "PHONE_UPDATE_SUCCESS": "मोबाइल नंबर सफलतापूर्वक अपडेट किया गया",
+  "PLANNED_MAINTENANCE_TEXT": "वर्तमान में हम रखरखाव के लिए बंद हैं। लेकिन चिंता मत करें, हम जल्द ही आपके समक्ष आएँगे",
+  "PLANNED_MAINTENANCE_TEXT_WITH_TIME": "वर्तमान में हम रखरखाव के लिए बंद हैं। लेकिन चिंता मत करें, हम जल्द ही आपके समक्ष आएँगे",
   "PLAY": "चलाऐं",
   "PLAY_AS": "के रूप में चलाएँ",
   "PLAY_FROM_DEVICE": "डिवाइस से चलायें",
   "PLAY_ONLINE": "ऑनलाइन चलाइए",
   "PLEASE_DOWNLOAD_TO_PLAY": "चलाने के लिए डाउनलोड करें ",
+  "PLEASE_ENTER": "{{%s}} दर्ज करें",
+  "PLEASE_PROVIDE_FOLLOWING_DETAILS": "कृपया निम्न विवरण प्रदान करें",
   "PLEASE_SELECT": "{{%s}} चयनित करें",
   "PLEASE_SELECT_A_LANGUAGE": "भाषा चुनिये",
-  "PLEASE_SELECT_USER": "कृपया उपयोगकर्ता चयनित करें",
-  "POPULAR_COURSES": "लोकप्रिय प्रशिक्षण",
+  "PLEASE_VALIDATE_YOUR_EMAIL_ADDRESS": "अपना ईमेल पता सत्यापित करें",
+  "PLEASE_VALIDATE_YOUR_MOBILE_NUMBER": "अपने मोबाइल नंबर सत्यापित करे",
+  "POPULAR_COURSES": "लोकप्रिय कोर्स",
+  "POWER_OF_GROUPS": "क्या आपने अभी तक समूह की शक्ति की खोज की है?",
+  "PREFERENCES_CAN_BE_UPDATED": "आप प्रोफाइल पेज से इस उपयोगकर्ता के विवरण को संपादित कर सकते हैं",
   "PREVIEWS": "पूर्वावलोकन",
   "PREVIOUS_USER_SETTINGS": "आप पिछले उपयोगकर्ता की सेटिंग लागू करना चाहते हैं ?",
   "PRINT": "प्रिंट",
-  "PRIVATE": "निजी",
+  "PRIVACY_POLICY": "गोपनीयता नीति",
   "PROFILE_BNAV": "प्रोफ़ाइल",
   "PROFILE_DETAILS_TITLE": "प्रोफ़ाइल विवरण",
   "PROFILE_UPDATE_FAILED": "प्रोफ़ाइल अपडेट नहीं  हुआ, पुनः प्रयास कीजिए",
   "PROFILE_UPDATE_SUCCESS": "प्रोफ़ाइल को सफलतापूर्वक अपडेट किया गया",
+  "PROGRAMS_DESC": "अपने स्थान और भूमिका के लिए बनाए गए शिक्षात्मक कार्यक्रमों को देखें और उनमे सक्रिय भाग लें ",
+  "PROGRESS_CANNOT_BE_TRACKED": "{{collectionType}} की प्रगति को ट्रैक नहीं किया जा सकता है",
   "PROVIDE_BELOW_INFO": "निम्न जानकारी प्रदान करें",
   "PUBLIC": "सार्वजनिक",
   "PUBLISHED_BY": "{{%s}} में प्रकाशक",
   "PUBLISHED_DATE": "प्रकाशन की तारीख",
-  "QR_CODE_DETAILS": "यह आपकी पाठ्यपुस्तको में मिलेगा| कंटेंट खोजने के लिए स्कैन कीजिए",
+  "PUBLISHER": "प्रकाशक",
+  "QR_CODE_DETAILS": "अपनी पाठ्यपुस्तक से QR कोड स्कैन करके डिजिटल कंटेंट तक त्वरित पहुंच प्राप्त करें।",
   "QR_SHOWING_MULTIPLE_BOOK_RESULT": "के लिए {{%s}} परिणाम दिखा रहा है",
-  "QUESTION": "प्रश्न",
-  "QUESTIONS": "प्रश्न",
-  "QUESTION_MARKS": "प्रश्न (अंक)",
+  "QUES_BANKS": "प्रश्न बैंक",
   "QUIZ": "प्रश्नोत्तरी",
   "QUIZ_CONTENTS_ONLY_REGISTERED_USERS": "यह प्रश्नोत्तरी केवल पंजीकृत उपयोगकर्ताओं के लिए है",
   "RATE": "रेट",
   "RATED_STARS": "आपने {{%s}} स्टार की रेटिंग दी है",
-  "RATE_THE_CONTENT": "कंटेंट रेट कीजिये",
+  "RATE_THE_CONTENT": "कंटेंट की रेटिंग कीजिए",
   "RATING_QUESTION": "क्या आप हमें और बताना चाहेंगे?",
   "READ_LESS": "कम पढ़ें",
   "READ_MORE": "आगे पढ़े",
-  "RECENTLY_VIEWED": "हाल ही में देखे हुए",
+  "RECOMMENDATION_BASED_ON_PROFILE": "आपके प्रोफ़ाइल विवरण के आधार पर सिफारिशें",
   "RECOMMENDED": "अनुशंसित",
   "RECOVERY_ACCOUNT_UPDATE_SUCCESS": "अकाउंट बहाल करने के लिए पता सफलतापूर्वक अपडेट किया गया",
   "RECOVERY_ID_DESCRIPTION": "किसी कारण से आपका अकाउंट बंद हो जाता है तो उसे बहाल करने के लिए अकाउंट का प्रकार चुने",
@@ -459,15 +867,23 @@
   "REDO_ASSESSMENT": "फिर से मूल्यांकन करें",
   "REGISTER_TO_COMPLETE_ACCESS": "पूरा कंटेंट प्राप्त करने के लिए पंजीकृत कीजिए",
   "REMOVE": "हटायें",
+  "REMOVE_ACTIVITY": "हटाएँ",
+  "REMOVE_ACTIVITY_ERROR_MSG": "गतिविधि हटाने में असमर्थ, पुनः प्रयास करें",
+  "REMOVE_ACTIVITY_GROUP_DESC": "समूह गतिविधि सूची से गतिविधि हटाने पर व्यवस्थापक उस गतिविधि के लिए सदस्यो की प्रगति की जांच नहीं कर सकते ",
+  "REMOVE_ACTIVITY_POPUP_TITLE": "गतिविधि हटाएँ?",
+  "REMOVE_ACTIVITY_SUCCESS_MSG": "समूह गतिविधि सफलतापूर्वक हटाई गई",
   "REMOVE_FROM_DEVICE": "मोबाइल से कंटेंट हटायें",
   "REMOVE_FROM_DEVICE_MSG": "आप कंटेंट इस मोबाइल से हटाना चाहते हैं?",
-  "REMOVE_MULTIPLE_USERS_FROM_GROUP": "{{%s}} उपयोगकर्ताओ को हटाना चाहते हैं?",
-  "REMOVE_USERS": "उपयोगकर्ताओं को हटाएँ",
-  "REMOVE_USERS_FROM_GROUP": "{{%s}} उपयोगकर्ताओं को समूह से हटाएं",
-  "REPORTS": "रिपोर्ट",
+  "REMOVE_MEMBER": "सदस्य को हटाएँ",
+  "REMOVE_MEMBER_ERROR_MSG": "समूह से सदस्य को हटाया नहीं जा सका| पुनः प्रयास करें",
+  "REMOVE_MEMBER_GROUP_DESC": "{{member_name}} को निकालने पर उसे स्थायी रूप से समूह से निकाला जायेगा ",
+  "REMOVE_MEMBER_POPUP_TITLE": "सदस्य को हटाएँ",
+  "REMOVE_MEMBER_SUCCESS_MSG": "{{member_name}} अब समूह सदस्य नहीं हैं",
+  "REQUEST_CONTENT": "हमें जानकारी यहाँ बताये",
   "RESEND_OTP": "OTP दोबारा भेजे",
+  "RESET": "रीसेट",
   "RESOURCE_TYPE": "संसाधन के प्रकार",
-  "RESULT": "परिणाम",
+  "RESPONSE_ACKNOWLEGED": "आपकी प्रतिक्रिया के लिए धन्यवाद",
   "RESULTS": "परिणाम",
   "RESUME": "फिर से आरंभ करें",
   "RETRY": "फिर कोशिश करें",
@@ -475,23 +891,30 @@
   "ROLE_SELECTOR_QUERY": "आप है",
   "SAVE": "सहेजें",
   "SAVED_ON": "सहेजा गया",
-  "SAVED_RESOURCES": "सहेजें गए संसाधन",
   "SAVE_FILE_ON_DEVICE": "डिवाइस पर फ़ाइल सहेजें",
   "SCAN_QR_CODE": "QR कोड स्कैन करें",
   "SCAN_QR_INSTRUCTION": "फोन के कैमरे का उपयोग कर QR कोड स्कैन करें",
   "SCAN_TAP": "स्कैन करने के लिए टैप करें",
-  "SCORE": "अंक",
-  "SCORED": "प्राप्तांक",
+  "SCHOOL_OR_ORG_NAME": "विद्यालय/संस्था का नाम",
+  "SCHOOL_UDISE_ID_OR_ORG_ID": "विद्यालय UDISE ID/संस्था ID",
   "SD_CARD": "SD कार्ड",
+  "SEARCH_FOR_GROUP_MEMBER": "समूह के सदस्य की खोज करें",
   "SEARCH_HINT": "खोजें",
   "SEARCH_PLACEHOLDER": "यहाँ लिखकर कंटेंट खोजें",
   "SEARCH_TO_FIND_CONTENT": "कंटेंट खोजने के लिए {{%s}} देखें",
+  "SECONDS_AGO": "{{%s}} सेकेंड पहले",
+  "SECOND_AGO": "{{%s}} सेकेंड पहले",
   "SEE_ALL_RESULTS_FOR": "\"{{%s}}\" के सभी परीणाम",
+  "SEE_MORE_BOOKS": "अधिक पुस्तके और कंटेंट देखे",
+  "SEE_MORE_CONTENT": "अधिक कंटेंट देखें",
   "SELECT": "चुनिए",
   "SELECTED_TOPICS": "चयनित प्रसंग",
+  "SELECT_ACTIVITY": "गतिविधि चुनिये",
   "SELECT_ALL": "सभी चुनिए",
-  "SELECT_CHAPTER": "पाठ चुनिये",
+  "SELECT_CHAPTER": "मॉड्यूल चुनिये",
   "SELECT_YOUR_STATE": "अपना राज्य चुनें",
+  "SELF_DECLARED_INFO": "स्व-घोषित जानकारी",
+  "SELF_DECLARE_TEACHER_TNC": "मैं {{%appName}} के एडमिन के साथ इन विवरणों को साझा करने के लिए सहमत हूं",
   "SEND_FILE": "फ़ाइल भेजें",
   "SERVER_CONNECTION_ERROR": "सर्वर से संपर्क करने में असमर्थ",
   "SETTINGS": "सेटिंग्स",
@@ -499,19 +922,19 @@
   "SHARE_APP": "{{%s}} ऐप साझा करें",
   "SHARE_APP_LINK": "{{app_name}} ऐप से प्राप्त करें: {{play_store_url}}",
   "SHARE_CONTENT_FAILED": "कंटेंट साझा करने में असमर्थ",
-  "SHARE_CONTENT_FILE": "{{app_name}}: से फाइल भेजी\nनाम: {{content_name}}\n{{play_store_url}}: से {{app_name}} प्राप्त करें",
-  "SHARE_CONTENT_LINK": "{{content_link}} पर {{app_name}} पर {{content_name}} देखें\n{{play_store_url}} से {{app_name}} ऐप प्राप्त करें",
+  "SHARE_CONTENT_FILE": "फाइल इस एप से भेजी गई है: {{app_name}}\nनाम: {{content_name}}\n{{app_name}} एप यहाँ से प्राप्त करें: {{play_store_url}}",
+  "SHARE_CONTENT_LINK": "मुझे {{app_name}} पर {{content_name}} वास्तव में दिलचस्प और लाभदायक लगता है। {{Content_link}}\n\nऐसी रोचक सामग्री के लिए, {{app_name}} मोबाइल ऐप डाउनलोड करें\n\n{{play_store_url}}",
   "SHARE_LINK": "लिंक साझा करें",
   "SHARE_TELEMETRY": "टेलीमेट्री साझा करें",
   "SHARE_TELEMETRY_FAILED": "टेलीमेट्री साझा करने में असमर्थ",
+  "SHARE_TELEMETRY_NO_DATA_FOUND": "कोई  टेलीमेट्री डेटा उपलब्ध नहीं",
   "SHARE_THIS": "साझा करें",
+  "SHARE_USERNAME": "नमस्ते! आपको {{user_name}} का {{app_name}} ‪ID: {{diksha_id}} प्राप्त हुआ है",
   "SHOW": "दिखायें",
   "SHOWING_ITEMS": "{{%s}} वस्तु दिखा रहा है",
   "SHOWING_RESULTS_FOR": "'{{%query}}' के {{%count}} परिणाम उपलब्ध हैं",
-  "SHOW_LESS": "कम दिखाएं",
+  "SHOW_LESS": "कम देखें",
   "SHOW_MORE": "और दिखाएं",
-  "SHOW_RECENT": "{{%s}} फ़ाइलें दिखा रहा है",
-  "SIGNED_OUT_ACCOUNT_MESSAGE": "आपको वर्तमान खाते से लॉग आउट कर दिया जाएगा",
   "SIGNIN_TO_USE_FEATURE": "इस फ़ीचर के लिए लाॅग इन कीजिए",
   "SIGN_IN": "लाॅग इन करें",
   "SIZE": "आकार: {{%s}}",
@@ -521,13 +944,16 @@
   "SPACE_AVAILABLE_ON_SDCARD": "SD कार्ड में उपलब्ध जगह:",
   "SPACE_TAKEN": "{{%s}} के द्वारा ली गयी जगह",
   "SPACE_TAKEN_BY_APP": "{{%s}} कंटेंट के  द्वारा ली गई जगह",
+  "SPECIAL_CHARACTERS_NOT_SUPPORTED": "इस फ़ील्ड मे विशेष वर्णाक्षरों को दर्ज करने की अनुमति नहीं है",
   "START": "शुरू",
+  "START_AGAIN": "फिर से शुरू करें",
   "START_ASSESSMENT": "मूल्यांकन शुरू करें",
   "START_COURSE": "प्रारंभ",
   "START_COURSE_NOW": "अभी शुरु करें",
+  "START_LEARNING": "सीखना शुरू करें",
   "STAR_RATINGS": "रेटिंग",
   "STATE": "राज्य",
-  "STATE_OPTION_TEXT": "राज्य चुनिये",
+  "STATE_OPTION_TEXT": "राज्य चुनिए",
   "STATE_RECORDS": "राज्य अभिलेख के अनुसार",
   "STORAGE": "स्टोरेज",
   "STORAGE_SETTINGS": "स्टोरेज सेटिंग्स",
@@ -536,34 +962,103 @@
   "SUBJECT": "विषय",
   "SUBJECTS": "विषय",
   "SUBJECT_OPTION_TEXT": "विषय चुनिए",
+  "SUBMIT_MY_DETAILS": "विवरण जमा करें",
+  "SUCCESSFULLY_ADDED_USER": "\"{{%s}}\" को सफलतापूर्वक जोड़ा",
+  "SUCCESSFULLY_SWITCHED_USER": "नमस्ते  {{%user}}",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_PHONE": "सभी कंटेंट मोबाइल स्टोरेज में भेजे जायेंगे",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_SDCARD": "सभी कंटेंट SD कार्ड में भेजे जायेंगे",
   "SUPPORT": "समर्थन",
   "SUPPORT_MESSAGE": "आपको कोई समस्या का सामना करना पड़ रहा है? हमें संदेश भेजें",
-  "SWITCHING_TO": "'{{%s}}' बदला गया",
-  "SWITCH_ACCOUNT": "अकाउंट बदलिए",
-  "SWITCH_ACCOUNT_CONFIRMATION": "आप खाता बदलना चाहते हैं?",
+  "SWITCH_TO_CLASSIC_THEME": "क्लासिक थीम पर स्विच करें",
+  "SWITCH_TO_JOYFUL_THEME": "जॉयफुल थीम पर स्विच करें",
+  "SWITCH_USER": "उपयोगकर्ता बदलें",
   "SYLLABUS": "पाठ्यक्रम",
   "SYNCING_NOW": "अब सिंक हो रहा है",
   "SYNC_NOW": "अभी सिंक करें",
-  "TAKE_ASSESSMENT": "उपयोगकर्ता कम से कम एक प्रश्नावली पूर्ण करें",
   "TAP_SCAN": "{{%s}} QR कोड स्कैन करने के लिए टैप करें",
+  "TBK_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "पाठ्यपुस्तक चुनकर शुरुआत कीजिए",
+  "TBK_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "पाठ्यपुस्तक",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "पाठ्यपुस्तकें",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "पाठ्यपुस्तकें",
+  "TBK_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}} की लाइब्रेरी में कई {{%explainVideos}}, {{%quesBanks}} और अन्य ‪{{%interactiveMaterial}} हैं। पुस्तकालय में खोज शुरू करने के लिए पाठ्यपुस्तक पर क्लिक करें!",
+  "TBK_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) के लिए कोई पुस्तक उपलब्ध नहीं हैं",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "बोर्ड पाठ्यपुस्तकें जोड़ रहा है",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}} पर आपके विषय की पाठ्यपुस्तक नहीं मिल रही है?",
+  "TBK_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span> टिप्पणी: </ span> पाठ्यपुस्तकों की प्रगति को ट्रैक नहीं कर सकते ",
+  "TBK_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "जब आपका राज्य बोर्ड आपके द्वारा मांगी गई पुस्तकों को {{%s}} पर अपलोड करेगा तो हम आपको सूचित करेंगे",
+  "TBK_NONTRK_QR_CODE_DETAILS": "अपनी पाठ्यपुस्तक से QR कोड स्कैन करके डिजिटल कंटेंट तक त्वरित पहुंच प्राप्त करें।",
+  "TBK_NONTRK_SEE_MORE_BOOKS": "अधिक पुस्तके और कंटेंट देखे",
+  "TBK_NONTRK_STUDENT_ROLE_DESC_1": "पाठ्यपुस्तकों और डिजिटल कंटेन्ट को ब्राउज़ करें",
+  "TBK_NONTRK_TEACHER_ROLE_DESC_1": "पाठ्यपुस्तकों और डिजिटल कंटेन्ट को ब्राउज़ करें",
+  "TBK_NONTRK_TUTORIAL_HEADING": "वीडियो, इन्टरएक्टिव कंटेन्ट, ई-पाट्यपुस्तके और अधिक...",
+  "TBK_TRK_BATCHEND_MAIN_HEADING": "आप जिस पाठ्यपुस्तक के बैच में शामिल होना चाहते हो वह {{%s}} को समाप्त हो गया है",
+  "TBK_TRK_BATCHEND_SUB_HEADING": "आप अभ्यास पूर्ण कर सकते है, परन्तु आपकी प्रगति अद्यतित नहीं की जाएगी",
+  "TBK_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "आपने यह अध्याय पूर्ण कर लिया हैं",
+  "TBK_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} तक पाठ्यपुस्तक पूर्ण कीजिए",
+  "TBK_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "यह पाठ्यपुस्तक निष्क्रिय है",
+  "TBK_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "पाठ्यपुस्तक",
+  "TBK_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "आपने यह पाठ्यपुस्तक पढ़ ली है",
+  "TBK_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "पाठ्यपुस्तक के बैच",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "कार्य",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "मेरी पाठ्यपुस्तकें",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "बैच समाप्त हो गया",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}} पर अंतिम बार अद्यतित किया गया",
+  "TBK_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "नामांकन करें",
+  "TBK_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "नवीनतम पाठ्यपुस्तकें",
+  "TBK_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "कार्य छोड़ना चाहते है?",
+  "TBK_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "नामांकन हेतु लॉग इन करें",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_COURSES": "कोई पाठ्यपुस्तक नहीं है",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "कंटेन्ट डाउनलोड करें",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "({{%s}}) पाठ्यपुस्तक",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "पाठ्यपुस्तक({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "ऑनलाइन अध्ययन कीजिये",
+  "TBK_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "लोकप्रिय पाठ्यपुस्तकें",
+  "TBK_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ऑनलाइन अध्ययन कीजिये",
+  "TBK_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "प्रमाणपत्र प्राप्त करने के लिए {{%s}} तक कार्य पूर्ण करे",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING": "अध्ययन कार्य",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "अध्ययन कार्य मे भाग लिया",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "पाठ्यपुस्तक विवरण",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "कोर्स समाप्ति तारीख",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "कार्य की अंतिम तिथि",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "कार्य विवरण",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "यह कार्य प्रासंगिक हैं:",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "अध्याय",
+  "TBK_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "पाठ्यपुस्तक गतिविधि रोकें",
+  "TBK_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "पाठ्यपुस्तक गतिविधियाँ देखना चाहते हैं?",
+  "TBK_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "पाठ्यपुस्तक का बैच {{batch_start_date}} से उपलब्ध है",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "प्रमाण पत्र संबंधित सूचना आपके पंजीकृत संपर्क विवरण मे ७ दिनों के भीतर भेजी जाएगी",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "टिप्पणी: इस पाठयपुस्तक में प्रमाणपत्र नहीं है",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "आपने यह पाठ्यपुस्तक पढ़ ली है",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "टिप्पणी: फिलहाल इस कोर्स में प्रमाणपत्र नहीं है| कोर्स निर्माता बाद में प्रमाण पत्र संलग्न कर सकता है।",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "आपने पाठ्यपुस्तक पढ़ना बंद कर दिया है",
+  "TBK_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "इस पाठ्यपुस्तक कार्य के लिए कोई बैच उपलब्ध नहीं हैं",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "पाठ्यपुस्तक पंजीकृत उपयोगकर्ताओं के लिए है। पाठ्यपुस्तक अभिगम हेतु लॉग इन करें।",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "यह पाठ्यपुस्तक पढ़ने के लिए लॉग इन करें",
+  "TBK_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "इस कार्य के लिए कोई बैच उपलब्ध नहीं हैं",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "केवल पंजीकृत उपयोगकर्ता ही अभ्यास कार्य ले सकते हैं",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "आपने कार्य सफलतापूर्वक पूर्ण किया हैं",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "कार्य समाप्त हो गया है । आप मूल्यांकन फिर से कर सकते हैं लेकिन आपकी प्रगति दर्ज नहीं की जाएगी।",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "कार्य समाप्त हो गया है। आप मूल्यांकन कर सकते है लेकिन आपकी प्रगति दर्ज नहीं की जाएगी",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "पाठ्यपुस्तक विवरण देखने और अभिगम के लिए आपको एक सक्रिय बैच में शामिल होना होगा",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "पाठ्यपुस्तक का अभिगम करने के लिए लॉग इन करें",
   "TEACHER_ID_ENTER_LABEL": "सत्यापन के लिए अपनी शिक्षक ID दर्ज करें",
   "TEACHER_ID_PLACEHOLDER": "उदाहरण के लिए, ER12345",
   "TEACHER_ID_VERIFICATION": "शिक्षक ID सत्यापन",
   "TEACHER_PROFILE_FAILED": "शिक्षक प्रोफ़ाइल को सत्यापित नहीं किया जा सका क्योंकि शिक्षक ID गलत हैं",
   "TEACHER_PROFILE_VERIFIED": "शिक्षक प्रोफ़ाइल सफलतापूर्वक सत्यापित की गई",
   "TEACHER_ROLE_DESC_1": "पाठ्यपुस्तकों और डिजिटल कंटेन्ट को ब्राउज़ करें",
-  "TEACHER_ROLE_DESC_2": "ऑनलाइन प्रशिक्षण लीजिए",
+  "TEACHER_ROLE_DESC_2": "ऑनलाइन कोर्स लीजिए",
   "TEACHER_ROLE_DESC_3": "पाठ योजना खोजें",
   "TELL_US_MORE": "हमें और अधिक बताएँ",
   "TERMS_OF_USE": "उपयोग की शर्तें",
   "TEXTBOOK": "पाठ्यपुस्तकें",
+  "TEXTBOOKS": "पाठ्यपुस्तकें",
+  "THANKING_NOTE": "जब आपका राज्य बोर्ड आपके द्वारा मांगी गई पुस्तकों को {{%s}} पर अपलोड करेगा तो हम आपको सूचित करेंगे",
   "THANK_FOR_RATING": "रेटिंग के लिए धन्यवाद",
-  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "प्रशिक्षण के लिए कोई बैच नहीं है",
+  "THANK_YOU_FOR_SUBMITTING_YOUR_DETAILS": "अपना विवरण हमें भेजने के लिए धन्यवाद",
+  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "कोर्स के लिए कोई बैच नहीं है",
   "THIS_IS_A_RESTRICTED_COMMUNITY": "यह एक सीमित समुदाय है",
   "TICKET_SUMMARY": "टिकट सारांश",
-  "TIME": "समय",
   "TIME_OUT": "सर्वर का समय समाप्त हुआ। पुनः प्रयास करें।",
   "TITLE": "शीर्षक",
   "TITLE_UPGRADE_POPUP": "हमने कंटेंट में लापता छवियों और ऑडियो के लिए आने वाली समस्याओं को ठीक किया है। बेहतर अनुभव के लिए, हम अनुशंसा करते हैं कि आप DIKSHA के नवीनतम संस्करण में अपग्रेड करें।",
@@ -572,21 +1067,20 @@
   "TOPICS": "प्रसंग",
   "TOPIC_YOU_MIGHT_LIKE": "आपकी रुचि के अनुसार प्रसंग चुनिये",
   "TOTAL_SIZE": "कुल जगह :",
-  "TOTAL_TIME": "कुल समय",
   "TO_DO": "करने के लिए",
-  "TO_EARN_CERTIFICATE": "प्रमाणपत्र प्राप्त करने के लिए {{%s}} तक प्रशिक्षण पूर्ण करे",
-  "TRAINING": "प्रशिक्षण",
-  "TRAININGS_ATTENDED": "मेरे प्रशिक्षण",
-  "TRAININGS_ONLY_REGISTERED_USERS": "प्रशिक्षण केवल पंजीकृत उपयोगकर्ताओं के लिए हैं ",
-  "TRAINING_COMPLETED_SUCCESSFULLY": "आपने प्रशिक्षण सफलतापूर्वक पूर्ण किया हैं",
-  "TRAINING_DETAILS": "प्रशिक्षण विवरण",
-  "TRAINING_ENDED_REDO_ASSESSMENT": "प्रशिक्षण समाप्त हो गया है। आप मूल्यांकन फिर से कर सकते हैं लेकिन, आपकी प्रगति दर्ज नहीं की जाएगी।",
-  "TRAINING_ENDED_START_ASSESSMENT": "प्रशिक्षण समाप्त हो गया है। आप मूल्यांकन ले सकते हैं लेकिन, आपकी प्रगति दर्ज नहीं की जाएगी।",
-  "TRAINING_ENDS_ON": "प्रशिक्षण समाप्ति तारीख",
-  "TRAINING_END_DATE": "प्रशिक्षण की अंतिम तारीख",
-  "TRAINING_INFO": "प्रशिक्षण जानकारी",
-  "TRAINING_IS_RELEVANT_TO_TEACHERS": "यह प्रशिक्षण शिक्षकों के लिए प्रासंगिक हैं",
-  "TRAINING_MODULES": "प्रशिक्षण अनुभाग ",
+  "TO_EARN_CERTIFICATE": "प्रमाणपत्र प्राप्त करने के लिए {{%s}} तक कोर्स पूर्ण करे",
+  "TRAINING": "कोर्स",
+  "TRAININGS_ATTENDED": "कोर्स में भाग लिया",
+  "TRAININGS_ONLY_REGISTERED_USERS": "कोर्स केवल पंजीकृत उपयोगकर्ताओं के लिए हैं ",
+  "TRAINING_COMPLETED_SUCCESSFULLY": "आपने कोर्स सफलतापूर्वक पूर्ण किया हैं",
+  "TRAINING_DETAILS": "कोर्स विवरण",
+  "TRAINING_ENDED_REDO_ASSESSMENT": "कोर्स समाप्त हो गया है। आप मूल्यांकन फिर से कर सकते हैं लेकिन आपकी प्रगति दर्ज नहीं की जाएगी।",
+  "TRAINING_ENDED_START_ASSESSMENT": "कोर्स समाप्त हो गया है। आप मूल्यांकन ले सकते हैं लेकिन आपकी प्रगति दर्ज नहीं की जाएगी।",
+  "TRAINING_ENDS_ON": "कोर्स समाप्ति तारीख",
+  "TRAINING_END_DATE": "कोर्स की अंतिम तिथि",
+  "TRAINING_INFO": "कोर्स विवरण",
+  "TRAINING_IS_RELEVANT_TO_TEACHERS": "यह कोर्स शिक्षकों के लिए प्रासंगिक हैं",
+  "TRAINING_MODULES": "कोर्स अनुभाग ",
   "TRANSFERRING_CONTENT_TO_PHONE": "कंटेंट मोबाइल में भेजा जा रहा हैं",
   "TRANSFERRING_CONTENT_TO_SDCARD": "कंटेंट SD कार्ड में भेजा जा रहा हैं",
   "TRANSFERRING_FILES": "फ़ाइल भेजी जा रही हैं",
@@ -596,69 +1090,134 @@
   "TRY_AGAIN": "पुनः प्रयास करें",
   "TRY_BEFORE_RATING": "कृपया रेटिंग से पहले कंटेंट का आकलन करें",
   "TRY_DIFF_QR": "अलग QR कोड आजमायें ?",
+  "TUTORIAL_BUTTON": "पाठ्यपुस्तक चुनकर शुरुआत कीजिए",
+  "TUTORIAL_HEADING": "वीडियो, इन्टरएक्टिव कंटेन्ट, ई-पाट्यपुस्तके और अधिक...",
+  "TVC_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "टीवी कक्षा चुनकर शुरुआत कीजिए",
+  "TVC_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "टीवी कक्षाएँ",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "टीवी कक्षाएँ",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "टीवी कक्षाएँ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}} की लाइब्रेरी में कई {{%explainVideos}}, {{%quesBanks}} और अन्य ‪{{%interactiveMaterial}} हैं। पुस्तकालय में खोज शुरू करने के लिए टीवी कक्षा पर क्लिक करें!",
+  "TVC_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) के लिए कोई टीवी कक्षा उपलब्ध नहीं हैं",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "बोर्ड द्वारा टीवी कक्षाएँ जोड़ी जा रही हैं",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}} पर टीवी कक्षाएँ नहीं मिल सकीं?",
+  "TVC_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>नोट:</span> टीवी कक्षा के लिए प्रगति को ट्रैक नहीं किया जा सकता है",
+  "TVC_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "जब आपका बोर्ड आपके द्वारा अनुरोध की गई टीवी क्लास {{% s}} पर अपलोड करेगा, तो हम आपको सूचित करेंगे",
+  "TVC_NONTRK_QR_CODE_DETAILS": "अपनी टीवी कक्षा से QR कोड स्कैन करके डिजिटल कंटेंट तक त्वरित पहुंच प्राप्त करें।",
+  "TVC_NONTRK_SEE_MORE_BOOKS": "अधिक टीवी कक्षाएँ और कंटेंट देखे",
+  "TVC_NONTRK_STUDENT_ROLE_DESC_1": " टीवी कक्षाएँ और डिजिटल कंटेन्ट को ब्राउज़ करें",
+  "TVC_NONTRK_TEACHER_ROLE_DESC_1": "टीवी कक्षाएँ और डिजिटल कंटेन्ट को ब्राउज़ करें",
+  "TVC_NONTRK_TUTORIAL_HEADING": "वीडियो, इन्टरएक्टिव कंटेन्ट, ई-पाट्यपुस्तके और अधिक...",
+  "TVC_TRK_BATCHEND_MAIN_HEADING": "आप जिस टीवी कक्षा के बैच में शामिल होना चाहते हो वह {{%s}} को समाप्त हो गयी है",
+  "TVC_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "आपने यह कार्यक्रम समाप्त कर दिया है",
+  "TVC_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "टीवी कक्षाएँ",
+  "TVC_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "आप यह टीवी कक्षाएँ देख चुके हैं",
+  "TVC_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "टीवी कक्षाओं के लिए बैच",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "कार्य",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "मेरी टीवी कक्षाएँ",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "बैच समाप्त हो गया",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}} पर अंतिम बार अद्यतित किया गया",
+  "TVC_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "नवीनतम टीवी कक्षाएँ",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "टीवी कक्षाएँ ({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "टीवी कक्षाएं ({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "लोकप्रिय टीवी कक्षाएँ",
+  "TVC_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "प्रमाणपत्र प्राप्त करने के लिए {{%s}} तक कार्य पूर्ण करे",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING": "अध्ययन कार्य",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "अध्ययन कार्य मे भाग लिया",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "टीवी क्लास विवरण",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "कोर्स समाप्ति तारीख",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "कार्य की अंतिम तिथि",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "कार्य विवरण",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "यह कार्य प्रासंगिक हैं:",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "टीवी कार्यक्रम",
+  "TVC_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "टीवी कक्षाएँ देखना बंद करें",
+  "TVC_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "टीवी कक्षाएं देखना चाहते हैं?",
+  "TVC_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "टीवी कक्षा का बैच {{batch_start_date}} से उपलब्ध है",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "आपको 7 दिनों के भीतर प्रमाणपत्र के बारे में आपके पंजीकृत संपर्क विवरणों पर सूचित कर दिया जाएगा",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "टिप्पणी: इस कार्य में प्रमाणपत्र नहीं है",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "आप यह टीवी कक्षाएँ देख चुके हैं",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "टिप्पणी: वर्तमान में इस कार्य के लिए प्रमाणपत्र नहीं है। निर्माता बाद में प्रमाण पत्र संलग्न कर सकते हैं ",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "आपने टीवी क्लास देखना बंद कर दिया है",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "टीवी कक्षाएँ पंजीकृत उपयोगकर्ताओं के लिए हैं। टीवी कक्षा अभिगम के लिए लॉग इन करें",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "टीवी कक्षाओं को देखने के लिए लॉग इन करें",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "केवल पंजीकृत उपयोगकर्ता ही अध्ययन कार्य ले सकते हैं",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "आपने कार्य सफलतापूर्वक पूर्ण किया हैं",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "कार्य समाप्त हो गया है। आप मूल्यांकन फिर से कर सकते हैं लेकिन आपकी प्रगति दर्ज नहीं की जाएगी।",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "कार्य समाप्त हो गया है। आप मूल्यांकन कर सकते है लेकिन आपकी प्रगति दर्ज नहीं की जाएगी",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "टीवी कक्षाओं के अभिगम के लिए सक्रिय बैच में नामांकन किजिए",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "टीवी कक्षाओं के अभिगम के लिए लॉग इन करें",
   "UNABLE_TO_FETCH_CONTENT": "कंटेंट लाने में त्रुटि",
   "UNENROLL_CONFIRMATION_MESSAGE": "प्रशिक्षण से नामांकन रद्ध करना चाहते हैं?",
-  "UNENROLL_FROM_COURSE": "प्रशिक्षण से नामांकन रद्ध",
+  "UNENROLL_FROM_COURSE": "कोर्स से नामांकन रद्ध",
   "UNIT_COMING_SOON": "जल्द आ रहा है!",
   "UNKNOWN_QR": "आपने एक अमान्य QR कोड स्कैन किया है",
   "UNSELECT_ALL": "सभी चयन रद्द करें",
-  "UPDATE": "अपडेट करें",
+  "UPDATE": "अद्यतित करें",
   "UPDATE_APP_BTN_ACTION_NO": "बाद में अपडेट करें",
   "UPDATE_APP_BTN_ACTION_YES": "अभी अपडेट करें",
   "UPDATE_APP_SUPPORT_TITLE": "आप {{app_name}} ऐप के पुराने संस्करण का उपयोग कर रहे हैं। इस कंटेंट का उपयोग करने के लिए अपने ऐप को नवीनतम संस्करण में अपग्रेड करें।",
   "UPDATE_APP_TITLE": "ऐप का नया संस्करण उपलब्ध हैं!",
   "UPDATE_CONFIRMATION_TEXT": "क्या आप यह कंटेंट अपडेट करना चाहते है?",
   "UPDATE_CONTENT": "({{%s}}) कंटेंट अपडेट करें",
+  "UPDATE_DETAILS": "विवरण अपडेट करें",
   "UPDATE_RECOVERY_ID": "अकाउंट बहाल करने के लिए ईमेल अपडेट करें",
   "UPDATE_REQUIRED": "अपडेट की आवश्यकता हैं",
+  "UPDATE_YOUR_PREFERENCE_FROM_PROFILE": "आप अपने  {{app_name}} प्रोफाइल विवरण  को संपादित करने हेतु प्रोफाइल सेटिंग पर जा सकते हैं ",
   "UPDATING": "अपडेट हो रहा है",
   "UPDATING_CONTENT": "अपडेट हो रहा है... {{%s}} %",
-  "USER": "उपयोगकर्ता",
   "USERNAME": "उपयोगकर्ता का नाम: {{%s}}",
-  "USERS": "उपयोगकर्ताओं",
-  "USERS_AND_GROUPS": "उपयोगकर्ता और समूह",
   "USER_CREATED_SUCCESSFULLY": "उपयोगकर्ता सफलतापूर्वक बनाया गया",
-  "USER_DELETE_CONFIRM": " '{{%s}}'  को निश्चित हटाना चाहते हैं?",
-  "USER_DELETE_CONFIRM_MESSAGE": "यह क्रिया स्थायी है, एक बार उपयोगकर्ता हटाने के बाद, पुनः उपलब्ध करना मुश्किल है",
-  "USER_DELETE_CONFIRM_MESSAGE_FROM_GROUP": "'{{%s}}' उपयोगकर्ता हटाना चाहते हैं?",
-  "USER_DELETE_CONFIRM_SECOND_MESSAGE": "यह क्रिया समूह से उपयोगकर्ताओ को हटा रही हैं|  उपयोगकर्ता के विवरण उपयोगकर्ता टैब में मौजूद हैं",
   "USER_ID": "उपयोगकर्ता ID",
-  "USER_IS_NOT_VERIFIED": "उपयोगकर्ता सत्यापित नहीं हैं",
+  "USER_IS_NOT_VERIFIED": "उपयोगकर्ता ID सत्यापित नहीं हैं",
   "USER_NAME": "उपयोगकर्ता का नाम",
   "USER_TYPE": "उपयोगकर्ता के प्रकार",
   "USER_TYPE_1": "शिक्षक",
   "USER_TYPE_2": "विद्यार्थी",
   "USER_TYPE_3": "अन्य",
+  "USER_TYPE_5": "अभिभावक",
   "USER_TYPE_SELECT_WARNING": "उपयोगकर्ता का प्रकार चयनित कीजिए",
   "USER_VERIFICATION": "उपयोगकर्ता का सत्यापन",
+  "USE_APP_AS": "{{%s}} मे आपकी भूमिका चुनिए",
+  "VALIDATION_MAXIMUM_LENGTH": "अधिकतम 11 नंबर होने चाहिए",
+  "VALIDATION_MINIMUM_LENGTH": "न्यूनतम 11 नंबर होना चाहिए",
+  "VERIFY": "सत्यापित करें",
   "VERIFY_EMAIL_OTP_DESCRIPTION": "ईमेल पते के सत्यापन के लिए आपके ईमेल पर OTP भेजा हैं",
   "VERIFY_EMAIL_OTP_TITLE": "ईमेल पता सत्यापित करें",
   "VERIFY_PHONE_OTP_DESCRIPTION": "आपके मोबाइल नंबर सत्यापन के लिए आपको SMS पर OTP भेजा गया हैं",
   "VERIFY_PHONE_OTP_TITLE": "मोबाइल नंबर सत्यापित करें",
   "VERSION": "संस्करण",
-  "VIDEOS": "वीडियो",
+  "VERYFYING_PLEASE_WAIT": "सत्यापित हो रहा है ",
+  "VIDEO": "वीडियो",
   "VIEW": "देखें",
+  "VIEW_ACTIVITY": "गतिविधि देखें",
   "VIEW_ALL": "सभी देखें",
   "VIEW_ALL_BATCHES": "आगे बढ़ने की लिए बैच चुनिये",
   "VIEW_CREDITS_INFO": "लाइसेंसिंग जानकारी देखें",
   "VIEW_DOWNLOADS_ONLY_MSG": "केवल डाउनलोड देखें",
-  "VIEW_MORE": "और दिखाएं",
+  "VIEW_MORE": "अधिक देखें",
   "VIEW_ONGOING_BATCHES": "चालू बैच",
+  "VIEW_OPEN_BATCHES": "बैच - नामांकन हेतु उपलब्ध",
   "VIEW_RETIRED_BATCHES": "बैच की समय सीमा समाप्त",
   "VIEW_UPCOMING_BATCHES": "आगामी बैच ",
   "WAITING_TO_DOWNLOAD": "डाउनलोड प्रतीक्षारत...",
   "WAIT_REQUEST": "कंटेंट लोड हो रहा है...",
-  "WANT_TO_CHECK_FREE_TRAININGS": "मुफ़्त प्रशिक्षणों  को देखिए",
+  "WANT_TO_CHECK_FREE_TRAININGS": "कोर्स देखिए",
   "WARNING_PLEASE_MAKE_SOME_CHANGES": "परिवर्तन करें",
   "WEBVIEW_UPDATE_TEXT": "एक प्रभावी अनुभव के लिए, Google Play स्टोर से WebView का नवीनतम संस्करण डाउनलोड करें।",
+  "WEEKS_AGO": "{{%s}} हफ्ते पहले ",
+  "WEEK_AGO": "{{%s}} सप्ताह पहले",
+  "WELCOME": "स्वागत है ",
   "WELCOME_BACK": "{{%s}} आपका फिर से स्वागत है",
+  "WHAT_IS_MEMBER_ID": "{{app_name}} ID कहां देख सकते हैं?",
+  "YEARS_AGO": "{{%s}} साल पहले ",
+  "YEAR_AGO": "{{%s}} वर्ष पहले ",
   "YES": "हाँ",
+  "YOUR_ID_FROM_STATE_BOARD_ORG": "अपने राज्य/बोर्ड/संस्था द्वारा दिया गया ID",
   "YOUR_LOCATION": "आपका स्थान",
   "YOUR_LOCATION_DETAILS": "आपका स्थान विवरण आपको प्रासंगिक कंटेंट प्रदान करने में हमारी सहायता करता है। जांचें कि क्या आपका स्थान सही है, अन्यथा अपना स्थान चुनें और उसे सबमिट करें।",
   "YOUR_PROGRESS": "आपकी प्रगति : {{%s}}%",
   "YOUR_PROGRESS_LABEL": "आपकी प्रगति",
   "YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET": "आप इंटरनेट से जुड़े हुए नहीं हैं",
-  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "प्रशिक्षण जानकारी के लिए सक्रिय बैच में नामांकन किजिए",
-  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "प्रशिक्षण जानकारी के लिए लाॅग इन करें",
-  "YOU_MUST_LOGIN_TO_ACCESS_QUIZ_CONTENT": "इस कंटेंट तक पहुंचने के लिए आपको लॉगिन करना होगा"
+  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "कोर्स जानकारी के लिए सक्रिय बैच में नामांकन किजिए",
+  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "कोर्स के अभिगम के लिए लाॅग इन करें",
+  "YOU_MUST_LOGIN_TO_ACCESS_QUIZ_CONTENT": "इस कंटेंट तक पहुंचने के लिए आपको लॉग इन करना होगा"
 }
\ No newline at end of file
diff --git a/src/assets/i18n/kn.json b/src/assets/i18n/kn.json
index 907c5b527..2ce39684d 100644
--- a/src/assets/i18n/kn.json
+++ b/src/assets/i18n/kn.json
@@ -8,22 +8,46 @@
   "ACCOUNT_MERGE_FAILED": "ಖಾತೆ ವಿಲೀನಗೊಳಿಸಲು ವಿಫಲವಾಯಿತು",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_CONTENT": "ಅಕೌಂಟ್ ವಿಲೀನಗೊಳಿಸುವಿಕೆ ಯಶಸ್ವಿಯಾಗಿ ಆರಂಭವಾಯಿತು. ಇದು  ಪೂರ್ಣಗೊಂಡ ನಂತರ ನಿಮಗೆ ತಿಳಿಸಲಾಗುವುದು",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_HEADING": "ಅಕೌಂಟ್ ವಿಲೀನಗೊಳಿಸಿ",
-  "ACCURACY": "ಖಚಿತತೆ",
   "ACTIVE": "ಸಕ್ರಿಯ",
   "ACTIVE_DOWNLOADS": "ಸಕ್ರಿಯ ಡೌನ್ಲೋಡ್ ಗಳು",
+  "ACTIVITIES": "ಚಟುವಟಿಕೆಗಳು",
+  "ACTIVITIESE_SEARCH_PLACEHOLDER": "ಗುಂಪಿನ್ ಚಟುವಟಿಕೆಗಳನ್ನು ಹುಡುಕಿ. ",
+  "ACTIVITY_ALREADY_ADDED_IN_GROUP": "ಈ ಚಟುವಟಿಕೆಯನ್ನು ಈಗಾಗಲೇ ಗುಂಪಿಗೆಸೇರಿಸಲಾಗಿದೆ",
+  "ACTIVITY_COLLECTION_TITLE": "ಸಂಗ್ರಹ",
+  "ACTIVITY_COURSE_TITLE": "ಕೋರ್ಸ್ ಗಳು",
+  "ACTIVITY_EXPLANATION_CONTENT_TITLE": "ವಿವರಣಾತ್ಮಕ ಪಠ್ಯಾಂಶ",
+  "ACTIVITY_PRACTICE_QUESTION_SET_TITLE": "ಅಭ್ಯಾಸ ಪ್ರಶ್ನಾವಳಿ",
+  "ACTIVITY_PRACTICE_RESOURCE_TITLE": "ಅಭ್ಯಾಸ ಸಂಪನ್ಮೂಲ",
+  "ACTIVITY_RESOURCE_TITLE": "ಸಂಪನ್ಮೂಲ",
+  "ACTIVITY_TEXTBOOK_TITLE": "ಪಠ್ಯಪುಸ್ತಕ ",
+  "ACTIVITY_TV_EPISODE_TITLE": "ಟಿವಿ ಧಾರಾವಾಹಿ",
   "ADD": "ಸೇರಿಸಿ",
+  "ADD_ACTIVITY": "ಚಟುವಟಿಕೆ ಸೇರಿಸಿ",
+  "ADD_ACTIVITY_ERROR_MSG": "ಚಟುವಟಿಕೆ ಸೇರಿಸಲು ಆಗಲಿಲ್ಲ, ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ",
+  "ADD_ACTIVITY_SUCCESS_MSG": "ಚಟುವಟಿಕೆಯನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸೇರಿಸಲಾಯಿತು",
+  "ADD_ANOTHER_USER": "ಇನ್ನೊಬ್ಬರು ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿ",
   "ADD_DISTRICT": "ಜಿಲ್ಲೆ ಸೇರಿಸಿ",
-  "ADD_EMAIL": "ಇಮೇಲ್ ಐಡಿ  ಸೇರಿಸಿ ",
-  "ADD_PHONE": "ಮೊಬೈಲ್ ನಂಬರ್ ಸೇರಿಸಿ",
+  "ADD_EDIT_SELF_DECLARED_TEACHER_INFO": "ಈ ವಿವರಗಳನ್ನು ಮಾನ್ಯ ಮಾಡಲು ಮತ್ತು ಪ್ರಗತಿ ಅನುಸರಣೆ ಮಾಡಲು ನಿಮ್ಮ ಘೋಷಿತ ರಾಜ್ಯಕ್ಕೆ ಲಭಿಸುವಂತೆ ಮಾಡಬಹುದು",
+  "ADD_EMAIL": "ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ಸೇರಿಸಿ",
+  "ADD_MEMBER": "ಸದಸ್ಯರನ್ನು ಸೇರಿಸಿ",
+  "ADD_MEMBER_CONFIRMATION": "ನೀವು ಮುಂದುವರೆಯುವ ಮೊದಲು, ಸದಸ್ಯರ ಹೆಸರು ಮತ್ತು {{app_name}} ಐಡಿ ಹೊಂದಿಕೆಯಾಗುವುದನ್ನು ಪರಿಶೀಲಿಸಬೇಕು",
+  "ADD_MEMBER_POPUP_DESC": "ಸದಸ್ಯರಿಗೆ ಅವರ ವಿಶಿಷ್ಟ {{%s}} ಐಡಿಯನ್ನು ಗುರುತಿಸಲು ಮಾರ್ಗದರ್ಶನ ಮಾಡಲು ಈ ಕೆಳಗಿನ ಸೂಚನೆಗಳನ್ನು ಬಳಸಿ",
+  "ADD_MEMBER_POPUP_STEP_1": "<span>Step 1</span>: ಪ್ರೊಫೈಲ್ ಟ್ಯಬ್ ಒತ್ತಿರಿ",
+  "ADD_MEMBER_POPUP_STEP_2": "<span>Step 2</span>:  ನಿಮ್ಮ {{%s}} ಐಡಿ ಹಂಚಿಕೊಳ್ಳಲು ಶೇರ್ ಐಕಾನ್ ಒತ್ತಿರಿ",
+  "ADD_MEMBER_POPUP_TITLE": "{{%s}} ಐಡಿಯನ್ನು ನಾನು ಎಲ್ಲಿ ನೋಡಬಹುದು?",
+  "ADD_PHONE": "ಮೊಬೈಲ್ ಸಂಖ್ಯೆ ಸೇರಿಸಿ",
   "ADD_RECOVERY_ACCOUNT": "ರಿಕವರಿ ಅಕೌಂಟ್ ಸೇರಿಸಿ",
   "ADD_RECOVERY_ID": "ರಿಕವರಿ ಅಕೌಂಟ್ ಸೇರಿಸಿ",
   "ADD_STATE": "ರಾಜ್ಯ ಸೇರಿಸಿ",
+  "ADD_TO_GROUP": "ಗುಂಪಿಗೆ ಸೇರಿಸಿ",
+  "ADD_TO_GROUP_ACTIVITY": "ಗುಂಪಿಗೆ ಸೇರಿಸಿ",
+  "ADD_USER": "ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿ",
   "ADD_USERS": "ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿ",
-  "ADD_USERS_TO_GROUP": "ಗುಂಪಿಗೆ {{%s}} ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿ ",
+  "AGREE_TO_SHARE_PROFILE_DETAILS": "ನಾನು ಕೋರ್ಸ್ ಅಡ್ಮಿನಸ್ಟ್ರೇಟರ್ ಜೊತೆ ನನ್ನ ಪ್ರೊಫೈಲ್ ವಿವರಗಳನ್ನು ಇದಕ್ಕೆ ಅನುಗುಣವಾಗಿ ಹಂಚಿಕೊಳ್ಳಲು ಬಯಸುವೆ ",
   "ALL": "ಎಲ್ಲ",
   "ALLOW": "ಒಪ್ಪಿಗೆ ಕೊಡಿ",
   "ALL_ANNOUNCEMENTS": "ಎಲ್ಲ ಪ್ರಕಟಣೆಗಳು",
-  "ALREADY_ENROLLED_COURSE": "ನೀವು ಈಗಾಗಲೇ ಈ  ತರಬೇತಿಗೆ ಸೇರಿದ್ದೀರಿ",
+  "ALREADY_ENROLLED_COURSE": "ನೀವು ಈ  ಕೋರ್ಸ್ ಗೆ ಸೇರಿದ್ದೀರಿ",
   "ALWAYS_ON": "ಯಾವಾಗಲೂ ಆನ್",
   "ANDROID_NOT_SUPPORTED": "ಆಂಡ್ರಾಯಿಡ್ ಆವೃತ್ತಿ ಸಪೋರ್ಟ್ ಆಗುತ್ತಿಲ್ಲ.",
   "ANDROID_NOT_SUPPORTED_DESC": "ನಿಮ್ಮ ಫೋನು ತುಂಬ ಹಳೆಯ  ಆಂಡ್ರಾಯಿಡ್  ಆವೃತ್ತಿಯನ್ನು ಹೊಂದಿದೆ. ನಿಮ್ಮ ಡಿವೈಸ್ ಮಾದರಿಯನ್ನು ಅವಂಬಿಸಿ, ನೀವು ಕ್ರಾಸ್ ವಾಕ್ ಹೊಂದಿದ್ದರೆ, ಈ ಪಠ್ಯಾಂಶವನ್ನು ನೋಡಬಹುದು. ",
@@ -31,6 +55,7 @@
   "ANSWER": "ಉತ್ತರ",
   "APPLY": "ಅನ್ವಯಿಸಿ",
   "APPLY_FILTER": "ಫಿಲ್ಟರ್ ಹಾಕಿ",
+  "APP_ID": "{{%s}} ಐಡಿ",
   "APP_QR_CODE": "{{%s}} ಕ್ಯುಆರ್ ಕೋಡ್ ಇದೆಯೇ? ",
   "APP_RATING_RATE_EXPERIENCE": "ಆಪ್ ಕುರಿತ ನಿಮ್ಮ ಅನುಭವವನ್ನು ರೇಟ್ ಮಾಡಿ",
   "APP_RATING_RATE_ON_PLAYSTORE": "ನೀವು  ಪ್ಲೇ ಸ್ಟೋರಿಗೆ ನಿಮ್ಮ ರೇಟಿಂಗ್ ಅನ್ನು ಕೊಡಲು ಬಯಸುವಿರಾ? ",
@@ -44,7 +69,7 @@
   "AS_LINK": "ಲಿಂಕ್  ನಂತೆ ",
   "ATTACHMENT_DOWNLOADED": "ಡೌನ್ಲೋಡ್ ಮಾಡಿದ ಕಡತ/ಅಟ್ಯಾಚ್ಮೆಂಟ್",
   "ATTRIBUTIONS": "ಅಟ್ರಿಬ್ಯುಶನ್ ",
-  "AUDIOS": "ಆಡಿಯೋ",
+  "AUDIO": "ಆಡಿಯೋ",
   "AUTHOR": "ಲೇಖಕ/ಕಿ",
   "AUTOMATIC_SYNC": "ಆಟೋಮ್ಯಾಟಿಕ್ ಡೇಟಾ ಸಿಂಕ್",
   "AUTO_MIGRATION_FAIL_MESSAGE": "ಅಕೌಂಟ್ ಗಳ ವಿಲೀನ ಸಾಧ್ಯವಾಗಲಿಲ್ಲ",
@@ -53,28 +78,24 @@
   "AVAILABLE_FILTERS": "ಫಿಲ್ಟರ್ ಗಳು",
   "AVAILABLE_FOR_TEACHERS": "ಶಿಕ್ಷಕರಿಗೆ ಮಾತ್ರವೇ ಲಭ್ಯವಿದೆ",
   "AVATAR": "ಅವತಾರ್",
-  "AVERAGE_SCORE": "ಸರಾಸರಿ ಸ್ಕೋರ್",
-  "AVERAGE_TIME": "ಸರಾಸರಿ ಸಮಯ",
   "BACK_TO_EXIT": "ಆಪ್ ನಿಂದ ಹೊರಹೋಗಬೇಕೆ?  ",
-  "BATCHEND_MAIN_HEADING": "ನೀವು ಸೇರಿಕೊಂಡ ಬ್ಯಾಚ್  {{%s}} ರಂದು ತರಬೇತಿಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದೆ",
-  "BATCHEND_SUB_HEADING": "ನೀವು ತರಬೇತಿಯನ್ನು ಮುಂದುವರೆಸಬಹುದು, ಆದರೆ ನಿಮ್ಮ ಪ್ರಗತಿ ನವೀಕರಣವಾಗುವುದಿಲ್ಲ",
+  "BATCHEND_MAIN_HEADING": "ನೀವು {{%s}} ರಂದು ಪೂರ್ಣಗೊಂಡಿರುವ ಕೋರ್ಸ್ ನ ಬ್ಯಾಚ್ ಸೇರಿದ್ದೀರಿ  ",
+  "BATCHEND_SUB_HEADING": "ನೀವು ಕೋರ್ಸ್ ಮುಂದುವರೆಸಬಹುದು, ಆದರೆ ನಿಮ್ಮ ಪ್ರಗತಿಯು ನವೀಕರಣವಾಗುವುದಿಲ್ಲ",
   "BATCHES_AVAILABLE": "ಬ್ಯಾಚ್ ಗಳು ಲಭ್ಯವಿವೆ",
-  "BATCHES_FOR_THIS_COURSE": "ತರಬೇತಿಗೆ ಬ್ಯಾಚ್ ಗಳು",
+  "BATCHES_FOR_THIS_COURSE": "ಕೋರ್ಸ್ ಗೆ ಬ್ಯಾಚ್ ಗಳು",
   "BATCH_CREATED_BY": "ಇವರಿಂದ ರಚಿಸಲಾಯಿತು",
   "BATCH_DETAILS": "ಬ್ಯಾಚ್ ವಿವರಗಳು",
   "BATCH_ENROLLMENT_ENDED": "ಈ ಬ್ಯಾಚ್ ಗೆ ದಾಖಲಾತಿಯು ಕೊನೆಗೊಂಡಿದೆ",
   "BATCH_EXPIRED": "ಬ್ಯಾಚಿನ ಅವಧಿ ಮುಗಿಯಿತು.",
   "BATCH_EXPIRED_BUTTON": "ಸರಿ!",
-  "BATCH_EXPIRED_DESCRIPTION": "ಬ್ಯಾಚ್ ಅವಧಿ ಮುಗಿದಿದೆ.  ನೀವು ತರಬೇತಿಯನ್ನು ಪಡೆಯುವುದನ್ನು ಮುಂದುವರೆಸಬಹುದು, ಆದ್ರೆ ನಿಮ್ಮ ಪ್ರಗತಿಯನ್ನು ಸಂಗ್ರಹಿಸಲು ಅಥವಾ ಮುಂದೆ ನಿರ್ವಹಣೆ ಮಾಡಲಿ ಸಾಧ್ಯವಿಲ್ಲ. ",
   "BOARD": "ಮಂಡಳಿ",
   "BOARD_OPTION_TEXT": "ಮಂಡಳಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ",
+  "BROWES_RELEVANT_CONTENT": "ನಿಮ್ಮ ಆದ್ಯತೆಗಳನ್ನು (ಮಂಡಳಿ, ಮಾಧ್ಯಮ, ತರಗತಿ) ಆಧರಿಸಿ, ಸೂಕ್ತವಾದ ಪಠ್ಯಾಂಶವನ್ನು {{app_name}} ಗ್ರಂಥಾಲಯದಲ್ಲಿ ಹುಡುಕಿ",
   "BTN_CLICK_TO_OPEN_CONTENT": "ಕಂಟೆಂಟ್ ನೋಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ",
   "BTN_LATER": "ನಂತರ",
   "BTN_RATE_ON_PLAYSTORE": "ಪ್ಲೇ ಸ್ಟೋರ್  ನಲ್ಲಿ ನಮಗೆ ರೇಟಿಂಗ್ ಕೊಡಿ",
   "BTN_SUBMIT": "ಸಲ್ಲಿಸಿ",
   "BTN_VISIT_HELP_SECTION": "ಸಹಾಯ ವಿಭಾಗವನ್ನು ನೋಡಿರಿ",
-  "BY_QUESTIONS": "ಪ್ರಶ್ನೆಗಳ ಮೂಲಕ",
-  "BY_USERS": "ಬಳಕೆದಾರರ ಮೂಲಕ",
   "CAMERA": "ಕೆಮರಾ",
   "CAMERA_PERMISSION_DESCRIPTION": " ಕ್ಯುಆರ್ ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಲು  {{%s}} ವು ಕೆಮರಾ ಒಪ್ಪಿಗೆ ಬಳಸುತ್ತದೆ",
   "CANCEL": "ರದ್ದುಮಾಡಿ",
@@ -84,25 +105,34 @@
   "CANCEL_DOWNLOAD": "ಡೌನ್ಲೋಡ್ ರದ್ದು ಮಾಡಿ",
   "CANCEL_DOWNLOAD_MESSAGE": "ಡೌನ್ಲೋಡ್ ರದ್ದುಪಡಿಸಿದರೆ ಸಕ್ರಿಯ/ಆಕ್ಟಿವ್ ಡೌನ್ಲೋಡುಗಳಿಂದ ಎಲ್ಲ ಕಂಟೆಂಟ್ ಗಳನ್ನು ತೆಗೆದುಹಾಕುತ್ತದೆ",
   "CANCEL_DOWNLOAD_TITLE": "ಡೌನ್ಲೋಡ್ ರದ್ದುಪಡಿಸಬೇಕೆ? ",
-  "CERTIFIED_TRAINING": "ಪ್ರಮಾಣೀಕೃತ ತರಬೇತಿ",
+  "CERTIFICATE_ALREADY_DOWNLOADED": "ಪ್ರಮಾಣಪತ್ರವನ್ನು ಈಗಾಗಲೇ ಡೌನ್ಲೋಡ್ ಮಾಡಲಾಗಿದೆ, ನಿಮ್ಮ ಡೌನ್ಲೋಡ್ ಫೋಲ್ಡರ್ ಪರಿಶೀಲಿಸಿ",
+  "CERTIFICATE_DOWNLOADED": "ಪ್ರಮಾಣಪತ್ರವು ಡೌನ್ಲೋಡ್ ಆಗಿದೆ",
+  "CERTIFICATE_DOWNLOAD_INFO": "ಪ್ರಮಾಣಪತ್ರವು ಡೌನ್ಲೋಡ್ ಆಗುತ್ತಿದೆ",
+  "CERTIFIED_TRAINING": "ಪ್ರಮಾಣೀಕೃತ ಪಡೆಯಿರಿ",
   "CHANGE": "ಬದಲಿಸಿ",
-  "CHANGE_ROLE": "ರೋಲ್ ಬದಲಿಸಿ",
-  "CHANGE_USER": "ಬಳಕೆದಾರರನ್ನು ಬದಲಿಸಿ",
+  "CHANGE_ROLE": "ಪಾತ್ರ ಬದಲಿಸಿ",
+  "CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "ನೀವು ಈ ಮಾಡ್ಯೂಲನ್ನು ಮುಗಿಸಿದ್ದೀರಿ",
+  "CHARACTERS_REMAINING": "{{character_count}}  ಅಕ್ಷರಗಳು ಉಳಿದಿವೆ",
   "CHECK_FOR_UPDATES": "ಅಪ್ ಡೇಟ್ ಗಳನ್ನು ಪರೀಕ್ಷಿಸಿರಿ",
   "CHOOSE_FROM_FOLLOWING": "ಕೆಳಗಿನವುಗಳಿಂದ ಆಯ್ಕೆ ಮಾಡಿಕೊಳ್ಳಿ",
   "CHOOSE_LANGUAGE": "ಭಾಷೆ ಆಯ್ಕೆ ಮಾಡಿ",
+  "CHOOSE_USER": "ಬಳಕೆದಾರನ್ನು ಆಯ್ಕೆ ಮಾಡಿ.",
   "CHOOSE_WHERE_TO_SAVE_DATA": "ಡೇಟಾ ಎಲ್ಲಿ ಸೇವ್ ಮಾಡುವುದು ಎಂದು ಆಯ್ಕೆ ಮಾಡಿ",
   "CLASS": "ತರಗತಿ",
   "CLASSES": "ತರಗತಿಗಳು",
   "CLEAR": "ಕ್ಲಿಯರ್ ಮಾಡಿ",
   "COACH_SCREEN": "ಕ್ಯುಆರ್ ಕೋಡ್  ಸ್ಕ್ಯಾನ್ ಮಾಡಿದರೆ ಅದು ಕಂಟೆಂಟ್  ತೋರಿಸುತ್ತದೆ",
   "COMMUNITIES": "ಸಮುದಾಯಗಳು",
-  "COMPLETE_ASSESSMENT_TO_EARN_CERTIFICATE": "{{%s}} ರ ಒಳಗೆ ಮೌಲ್ಯಮಾಪನ ಪೂರ್ಣಗೊಳಿಸಿ",
+  "COMPLETED": "ಪೂರ್ಣಗೊಂಡಿತು",
+  "COMPLETE_ASSESSMENT_TO_EARN_CERTIFICATE": "{{%s}}  ಒಳಗೆ ಮೌಲ್ಯಮಾಪನ ಪೂರ್ಣಗೊಳಿಸಿ",
   "COMPLETE_BY": "ಮುಕ್ತಾಯಗೊಂಡಿದ್ದು {{%s}}",
-  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} ರ ಒಳಗೆ ತರಬೇತಿ ಪೂರ್ಣಗೊಳಿಸಿ ",
+  "COMPLETE_CHAPTER_TO_UNLOCK_ACHIEVEMENT": "ಹೊಸ ಸಾಧನೆಯನ್ನು ಗಳಿಸಲು {{%s}} ಪಠ್ಯಾಂಶ ಪೂರ್ಣಗೊಳಿಸಿ",
+  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} ಒಳಗೆ ಕೋರ್ಸ್  ಪೂರ್ಣಗೊಳಿಸಿ ",
   "CONFIRM": "ಖಚಿತಪಡಿಸಿ",
+  "CONGRATULATIONS": "ಅಭಿನಂದನೆಗಳು!",
   "CONNECT_TO_INTERNET_SUGGESTION": "ಪಠ್ಯಾಂಶ ನೋಡಲು ಅಂತರ್ಜಾಲಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿ",
   "CONSIDER_DOWNLOAD": "ಕಂಟೆಂಟ್ ಡೌನ್ಲೋಡ್ ಮಾಡುವುದನ್ನು ಪರಿಗಣಿಸಿ",
+  "CONTENTS": "ಪಠ್ಯಾಂಶಗಳು",
   "CONTENT_ALREADY_EXIST": "ಫೈಲ್ ಯಶಸ್ವಿಯಾಗಿ ಇಂಪೋರ್ಟ್ ಆಗಿದೆ.  ಹೊಸ ಫೈಲ್ ಆಯ್ಕೆ ಮಾಡಿ. ",
   "CONTENT_ALREADY_EXISTS": "ಕಂಟೆಂಟ್ ನಿಮ್ಮ ಡೆಸ್ಟಿನೇಶನ್ ಫೋಲ್ಡರಿನಲ್ಲಿ ಇದೆ. ಆದರೂ  ಡೆಸ್ಟಿನೇಶನ್ ಫೋಲ್ಡರಿಗೆ ವರ್ಗಾಯಿಸಬೇಕೆ? ",
   "CONTENT_COMING_SOON": "ನಾವು ಇದಕ್ಕೆ ಕಂಟೆಂಟ್ ರಚಿಸುತ್ತಿದ್ದೇವೆ ",
@@ -118,6 +148,8 @@
   "CONTENT_IS_BEING_ADDED": "ಈ QR  ಸಂಕೇತಕ್ಕೆ ನಿಮ್ಮ ರಾಜ್ಯವು ಸದ್ಯದಲ್ಲಿಯೇ ಕಂಟೆಂಟ್ ಸೇರಿಸುವುದು. ಅದು ಬೇಗನೆ ತಮಗೆ ದೊರೆಯಲಿದೆ. ",
   "CONTENT_NOT_AVAILABLE": "ಕಂಟೆಂಟ್ ಲಭ್ಯವಿಲ್ಲ",
   "CONTENT_PLAYER_EXIT_PERMISSION": "ಈ ಕಂಟೆಂಟ್  ನಿಂದ ಹೊರಹೋಗಲು ಬಯಸುವಿರಾ? ",
+  "CONTENT_PREFERENCE": "ಆದ್ಯತೆಯ ಪಠ್ಯಾಂಶ",
+  "CONTENT_PREFERENCE_SELECTION": "ಆದ್ಯತೆಯ ಪಠ್ಯಾಂಶ ಆರಿಸಿ",
   "CONTENT_RATING_SUB_HEADING": "ಪಠ್ಯಾಂಶವನ್ನು ರೇಟ್ ಮಾಡಲು ನಕ್ಷತ್ರದ ಮೇಲೆ ಟ್ಯಾಪ್ ಮಾಡಿ",
   "CONTENT_RETIRED_BY_AUTHOR": "ಲೇಖಕರು ಕಂಟೆಂಟ್ ಅನ್ನು ತೆಗೆದುಹಾಕಿದ್ದಾರೆ, ಆದ್ದರಿಂದ ಅದು ಇನ್ನು ಲಭ್ಯವಾಗುವುದಿಲ್ಲ",
   "CONTENT_SIZE": "ಪಠ್ಯಾಂಶ ಗಾತ್ರ",
@@ -126,58 +158,200 @@
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO_SDCARD": "ಕಂಟೆಂಟ್ ಎಸ್ ಡಿ ಕಾರ್ಡಿಗೆ ಯಶಸ್ವಿಯಾಗಿ   ವರ್ಗಾವಣೆಯಾಗಿದೆ",
   "CONTINUE": "ಮುಂದುವರೆಸಿ",
   "CONTINUE_AS_ROLE": "'{{%s}}' ಆಗಿ ಮುಂದುವರೆಯಿರಿ.",
-  "CONTINUE_NOW": "ಮುಂದುವರೆಯಿರಿ",
+  "CONTINUE_LEARNING": "ಕಲಿಯುವುದನ್ನು ಮುಂದುವರೆಸಿ",
   "CONTRIBUTIONS": "ಕೊಡುಗೆ(ಗಳು)",
   "CONTRIBUTORS": "ಕೊಡುಗೆದಾರ(ರು)",
   "COPYRIGHT": "ಕೃತಿಸ್ವಾಮ್ಯ",
-  "COURSES_BNAV": "ತರಬೇತಿಗಳು",
-  "COURSES_IN_PROGRESS": "ನನ್ನ ತರಬೇತಿಗಳು",
+  "COURSES": "ಕೋರ್ಸ್ ಗಳು",
+  "COURSES_BNAV": "ಕೋರ್ಸ್ ಗಳು",
+  "COURSES_IN_PROGRESS": "ನನ್ನ ಕೋರ್ಸ್ ಗಳು",
   "COURSE_COMPLETED_LABEL": "{{%s}}% ಪೂರ್ಣಗೊಂಡಿತು",
-  "COURSE_ENDED": "{{%s}} ರಂದು ತರಬೇತಿಯು ಪೂರ್ಣಗೊಂಡಿತು",
-  "COURSE_ENDED_ON": "ಕೋರ್ಸ್ ಕೊನೆಗೊಂಡಿದ್ದು{{%s}}",
-  "COURSE_ENROLLED": "ನೀವು ತರಬೇತಿಗೆ  ಸೇರಿದ್ದೀರಿ",
-  "COURSE_NOT_AVAILABLE": "ಈ ತರಬೇತಿ ಈಗ ಸಕ್ರಿಯವಾಗಿಲ್ಲ",
-  "COURSE_PROGRESS_COMPLETED": "{{%s}} %  ಪೂರ್ಣಗೊಂಡಿದೆ ",
-  "COURSE_UNENROLLED": "ನೀವು ತರಬೇತಿಯನ್ನು ಬಿಟ್ಟಿದ್ದೀರಿ",
-  "COURSE_WILL_BE_AVAILABLE": "ಬ್ಯಾಚ್  {{%s}} ದಿಂದ ದೊರೆಯುತ್ತದೆ",
+  "COURSE_COMPLETION_POPUP_DESC": "ನೀವು 7 ದಿನಗಳ ಒಳಗಾಗಿ ನಿಮ್ಮ ನೋಂದಾಯಿತ ಸಂಪರ್ಕ ವಿವರಕ್ಕೆ ಕೋರ್ಸ್ ಪ್ರಮಾಣಪತ್ರದ ಕುರಿತು ಸೂಚನೆ ಪಡೆಯುವಿರಿ",
+  "COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "ಟಿಪ್ಪಣಿ: ಈ ಕೋರ್ಸ್ ಗೆ ಪ್ರಮಾಣಪತ್ರ ಇಲ್ಲ ",
+  "COURSE_ENDED": "{{%s}} ರಂದು ಕೋರ್ಸ್ ಕೊನೆಗೊಂಡಿತು",
+  "COURSE_ENDED_ON": "ಕೋರ್ಸ್ ಕೊನೆಗೊಂಡಿದ್ದು {{%s}}",
+  "COURSE_ENROLLED": "ನೀವು ಕೋರ್ಸ್ ಗೆ ಸೇರಿದ್ದೀರಿ",
+  "COURSE_LAST_UPDATED_ON": " ಕೋರ್ಸ್ ಕೊನೆಯ ಬಾರಿ ಅಪ್ಡೇಟ್ ಆಗಿರುವುದು {{last_updated_on_date}}  ",
+  "COURSE_NOT_AVAILABLE": "ಈ ಕೋರ್ಸ್ ಈಗ ಸಕ್ರಿಯವಾಗಿಲ್ಲ",
+  "COURSE_NO_CERTIFICATE_MESSAGE": "ಪ್ರಸ್ತುತ, ಈ ಕೋರ್ಸ್ ಗೆ ಪ್ರಮಾಣಪತ್ರ ಇಲ್ಲ. ಕೋರ್ಸ್ ರಚಿಸಿದವರು ನಂತರ ಇದಕ್ಕೆ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಲಗತ್ತಿಸಬಹುದು. ",
+  "COURSE_PROGRESS_COMPLETED": " ಪೂರ್ಣಗೊಂಡಿದೆ: {{%s}} % ",
+  "COURSE_UNENROLLED": "ನೀವು ಕೋರ್ಸ್  ಬಿಟ್ಟಿದ್ದೀರಿ",
+  "COURSE_WILL_BE_AVAILABLE": "{{%s}} ರಿಂದ ಬ್ಯಾಚ್  ಲಭ್ಯವಿದೆ",
   "CREATE_GROUP": "ಗುಂಪು ರಚಿಸಿ",
-  "CREATE_NEW_GROUP": "ಹೊಸ ಗುಂಪು ರಚಿಸಿ",
-  "CREATE_NEW_USER": "ಹೊಸ ಬಳಕೆದಾರರನ್ನು ರೂಪಿಸಿ",
-  "CREATE_USER": "ಬಳಕೆದಾರರನ್ನು ರೂಪಿಸಿ",
+  "CREATE_GROUP_DESCRIPTION": "ಗುಂಪು ರಚನೆ ಮಾಡಲು ನೀವು ಇನ್ನು ಒಂದೇ ಹೆಜ್ಜೆ ದೂರವಿದ್ದೀರಿ",
+  "CREATE_GROUP_DESCRIPTION_POPUP": "ಜನರನ್ನು ಸಂಪರ್ಕಿಸಲು, ಚಟುವಟಿಕೆ ಹಂಚಿಕೊಳ್ಳಲು, ಪ್ರಗತಿಯನ್ನು ಪರಿಶೀಲಿಸಲು ಮತ್ತು ಬೇರೆ ಸಾಧ್ಯತೆಗಳನ್ನು ಅನ್ವೇಷಿಸಲು ನಿಮ್ಮ ಸ್ವಂತ ಗುಂಪು ರಚಿಸಿ, ಅಥವಾ ಬೇರೆ ಗುಂಪಿಗೆ ಸೇರಿ  ",
+  "CREATE_USER": "ಬಳಕೆದಾರರನ್ನು ರಚಿಸಿ",
   "CREATORS": "{{%s}} ದಲ್ಲಿ ಇವರು ರಚಿಸಿದ್ದಾರೆ  ",
   "CREDITS": "ಕೃತಜ್ಞತೆಗಳು ",
   "CREDITS_LICENCE_INFO": "ಕ್ರೆಡಿಟ್ಸ್ & ಪರವಾನಗಿ ಮಾಹಿತಿ",
-  "CSV_DOWNLOAD_SUCCESS": "{{%s}} 'ಡೌನ್ಲೋಡ್'ನಲ್ಲಿ ಸೇವ್ ಆಗಿದೆ",
+  "CRS_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "ಆರಂಭಿಸಲು ಒಂದು ಕೋರ್ಸ್ ಆಯ್ಕೆ ಮಾಡಿ",
+  "CRS_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "ಕೋರ್ಸ್",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "ಕೋರ್ಸ್ ಗಳು",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "ಕೋರ್ಸ್ ಗಳು",
+  "CRS_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": " {{%appName}}'s ಗ್ರಂಥಾಲಯವು ಸಾಕಷ್ಟು {{%explainVideos}},{{%quesBanks}}  ಮತ್ತು ಇತರೆ {{%interactiveMaterial}}‪  ಹೊಂದಿವೆ. ಗ್ರಂಥಾಲಯದಲ್ಲಿ ಹುಡುಕುವುದಕ್ಕಾಗಿ ಒಂದು ಕೋರ್ಸ್ ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ!",
+  "CRS_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) ಕ್ಕೆ ಯಾವುದೇ ಕೋರ್ಸ್ ಗಳು ಕಾಣುತ್ತಿಲ್ಲ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "ಮಂಡಳಿಯು ಕೋರ್ಸ್ ಗಳನ್ನು ಸೇರಿಸುತ್ತಿದೆ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}} ದಲ್ಲಿ  ಕೋರ್ಸ್ ಗಳು ಕಾಣಲಿಲ್ಲವೇ?",
+  "CRS_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span> ಈ ಕೋರ್ಸ್ ಗೆ ಪ್ರಗತಿಯನ್ನು ಟ್ರಾಕ್ ಮಾಡಲು ಆಗುವುದಿಲ್ಲ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "ನಿಮ್ಮ ರಾಜ್ಯ ಮಂಡಳಿಯು ನೀವು ಕೇಳಿರುವ ಕೋರ್ಸ್ ಗಳನ್ನು {{%s}} ದಲ್ಲಿ ಅಪ್ಲೋಡ್ ಮಾಡಿದೊಡನೆ ನಿಮಗೆ ಸೂಚನೆ ಕಳಿಸುತ್ತೇವೆ.",
+  "CRS_NONTRK_QR_CODE_DETAILS": "ನಿಮ್ಮ ಕೋರ್ಸಿನಲ್ಲಿರುವ QR ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ,  ಡಿಜಿಟಲ್ ಪಠ್ಯಾಂಶವನ್ನು ಕೂಡಲೇ ಪಡೆಯಿರಿ",
+  "CRS_NONTRK_SEE_MORE_BOOKS": "ಹೆಚ್ಚು ಕೋರ್ಸ್ ಮತ್ತು ಪಠ್ಯಾಂಶವನ್ನು ನೋಡಿ",
+  "CRS_NONTRK_STUDENT_ROLE_DESC_1": "ಕೋರ್ಸ್ ಮತ್ತು ಡಿಜಿಟಲ್ ಪಠ್ಯಾಂಶಗಳನ್ನು ಬ್ರೌಸ್ ಮಾಡಿ",
+  "CRS_NONTRK_TEACHER_ROLE_DESC_1": "ಕೋರ್ಸ್ ಮತ್ತು ಡಿಜಿಟಲ್ ಪಠ್ಯಾಂಶಗಳನ್ನು ಬ್ರೌಸ್ ಮಾಡಿ",
+  "CRS_NONTRK_TUTORIAL_HEADING": "ವಿಡಿಯೋಗಳು, ಇಂಟರಾಕ್ಟಿವ್ ಪಠ್ಯಾಂಶ, ಇ-ಪಠ್ಯಪುಸ್ತಕಗಳು ಮತ್ತು ಇನ್ನೂ ಹೆಚ್ಚು...",
+  "CRS_TRK_BATCHEND_MAIN_HEADING": "ನೀವು {{%s}} ರಂದು ಪೂರ್ಣಗೊಂಡಿರುವ ಕೋರ್ಸ್ ನ ಬ್ಯಾಚ್ ಸೇರಿದ್ದೀರಿ",
+  "CRS_TRK_BATCHEND_SUB_HEADING": "ನೀವು ಕೋರ್ಸ್ ಮುಂದುವರೆಸಬಹುದು, ಆದರೆ ನಿಮ್ಮ ಪ್ರಗತಿಯು ನವೀಕರಣವಾಗುವುದಿಲ್ಲ",
+  "CRS_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "ನೀವು ಈ ಮಾಡ್ಯೂಲನ್ನು ಮುಗಿಸಿದ್ದೀರಿ",
+  "CRS_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} ಒಳಗೆ ಕೋರ್ಸ್ ಪೂರ್ಣಗೊಳಿಸಿ",
+  "CRS_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "ಕೋರ್ಸ್ ಗಳು",
+  "CRS_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "ನೀವು ಈ ಕೋರ್ಸ್ ಗೆ ಸೇರಿದ್ದೀರಿ",
+  "CRS_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "ಕೋರ್ಸ್ ನ ಬ್ಯಾಚ್ ಗಳು",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "ಕೋರ್ಸ್ ಗಳು",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "ನನ್ನ ಕೋರ್ಸ್ ಗಳು",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "ಕೋರ್ಸ್ ಕೊನೆಗೊಂಡಿದ್ದು {{%s}}",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "ಕೋರ್ಸ್ ಕೊನೆಯ ಬಾರಿ ನವೀಕರಿಸಿದ್ದು {{last_updated_on_date}}",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_NOT_AVAILABLE": "ಈ ಕೋರ್ಸ್ ಈಗ ಸಕ್ರಿಯವಾಗಿಲ್ಲ",
+  "CRS_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "ಕೋರ್ಸ್ ಗೆ ಸೇರಿ",
+  "CRS_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "ಇತ್ತೀಚಿನ ಕೋರ್ಸ್ ಗಳು",
+  "CRS_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "ಕೋರ್ಸ್ ಅನ್ನು ಬಿಡುತ್ತೀರಾ?",
+  "CRS_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "ಕೋರ್ಸ್ ಸೇರಲು ಲಾಗಿನ್ ಆಗಿ",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_COURSES": "ಕೋರ್ಸ್ ಗಳು ಇಲ್ಲ",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "ಕೋರ್ಸ್ ಅಥವಾ ಲೈಬ್ರರಿಯಿಂದ ಪಠ್ಯಾಂಶವನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "({{%s}}) ಕೋರ್ಸ್ ಗಳು",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "({{%s}}) ಕೋರ್ಸ್",
+  "CRS_TRK_FRMELEMNTS_LBL_OVERLAY_LABEL_TAKE_COURSE": "ಈ ಕೋರ್ಸ್ ಸೇರಲು ಲಾಗ್ ಇನ್ ಆಗಿ",
+  "CRS_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "ಜನಪ್ರಿಯ ಕೋರ್ಸ್ ಗಳು",
+  "CRS_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ಆನ್ಲೈನ್ ಕೋರ್ಸ್ ತೆಗೆದುಕೊಳ್ಳಿ",
+  "CRS_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "ಪ್ರಮಾಣಪತ್ರ ಪಡೆಯಲು {{%s}}  ಒಳಗೆ ಕೋರ್ಸ್ ಪೂರ್ಣಗೊಳಿಸಿ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING": "ಕೋರ್ಸ್",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "ಹಾಜರಾದ ಕೋರ್ಸ್(ಗಳು)",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "ಕೋರ್ಸ್ ವಿವರಗಳು",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "ಕೋರ್ಸ್ ಕೊನೆಗೊಳ್ಳುವುದು",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "ಕೋರ್ಸ್ ಮುಕ್ತಾಯದ ದಿನಾಂಕ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "ಕೋರ್ಸ್ ವಿವರಗಳು",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "ಇವರಿಗೆ ಕೋರ್ಸ್ ಪ್ರಸ್ತುತವಾಗಿದೆ: ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "ಕೋರ್ಸ್ ಮಾಡ್ಯೂಲ್ ಗಳು",
+  "CRS_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "ಕೋರ್ಸ್ ಬಿಡಿ",
+  "CRS_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "ಕೋರ್ಸ್ ಗಳನ್ನು ಪರಿಶೀಲಿಸಬೇಕೆ?",
+  "CRS_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "{{batch_start_date}} ರಿಂದ ಕೋರ್ಸ್ ನ ಬ್ಯಾಚ್ ಲಭ್ಯವಿದೆ",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "ನೀವು 7 ದಿನಗಳ ಒಳಗಾಗಿ ನಿಮ್ಮ ನೋಂದಾಯಿತ ಸಂಪರ್ಕ ವಿವರಕ್ಕೆ ಕೋರ್ಸ್ ಪ್ರಮಾಣಪತ್ರದ ಕುರಿತು ಸೂಚನೆ ಪಡೆಯುವಿರಿ",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "ಟಿಪ್ಪಣಿ: ಈ ಕೋರ್ಸ್ ಗೆ ಪ್ರಮಾಣಪತ್ರ ಇಲ್ಲ",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "ನೀವು ಕೋರ್ಸ್ ಗೆ ಸೇರಿದ್ದೀರಿ",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "ಪ್ರಸ್ತುತ, ಈ ಕೋರ್ಸ್ ಗೆ ಪ್ರಮಾಣಪತ್ರ ಇಲ್ಲ. ಕೋರ್ಸ್ ರಚಿಸಿದವರು ನಂತರ ಇದಕ್ಕೆ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಲಗತ್ತಿಸಬಹುದು.",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "ನೀವು ಕೋರ್ಸ್ ಬಿಟ್ಟಿದ್ದೀರಿ",
+  "CRS_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "ಈ ಕೋರ್ಸ್ ಗೆ ಯಾವುದೇ ಬ್ಯಾಚ್ ಗಳಿಲ್ಲ",
+  "CRS_TRK_FRMELEMNTS_MSG_OTHER_ROLE_DESC_2": "ಆನ್ಲೈನ್ ಕೋರ್ಸ್ ತೆಗೆದುಕೊಳ್ಳಿ  ",
+  "CRS_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "ಕೋರ್ಸ್ ಗಳು ನೋಂದಾಯಿಸಿದ ಬಳಕೆದಾರರಿಗೆ ಮಾತ್ರ. ಕೋರ್ಸ್ ಗಾಗಿ ಲಾಗಿನ್ ಆಗಿ",
+  "CRS_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "ಈ ಕೋರ್ಸ್ ಗೆ ಯಾವುದೇ ಬ್ಯಾಚ್ ಗಳು ಲಭ್ಯವಿಲ್ಲ",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "ನೋಂದಾಯಿಸಿದ ಬಳಕೆದಾರರಷ್ಟೇ ಕೋರ್ಸ್ ತೆಗೆದುಕೊಳ್ಳಬಹುದು",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "ನೀವು ಈ ಕೋರ್ಸ್ ಯಶಸ್ವಿಯಾಗಿ ಪೂರ್ಣಗೊಳಿಸಿದಿರಿ",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "ಕೋರ್ಸ್ ಪೂರ್ಣಗೊಂಡಿದೆ. ನೀವು ಮೌಲ್ಯಮಾಪನವನ್ನು ಮತ್ತೆ ತೆಗೆದುಕೊಳ್ಳಬಹುದು, ಆದರೆ ನಿಮ್ಮ ಪ್ರಗತಿಯು ದಾಖಲಾಗುವುದಿಲ್ಲ.",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "ಕೋರ್ಸ್ ಪೂರ್ಣಗೊಂಡಿದೆ. ನೀವು ಮೌಲ್ಯಮಾಪನವನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು, ಆದರೆ ನಿಮ್ಮ ಪ್ರಗತಿಯು ದಾಖಲಾಗುವುದಿಲ್ಲ.",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "ಕೋರ್ಸ್ ವಿವರಗಳನ್ನು ನೋಡಲು ಮತ್ತು ಪಡೆಯಲು ನೀವು ಒಂದು ಸಕ್ರಿಯ ಬ್ಯಾಚ್ ಗೆ ಸೇರಬೇಕು.",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "ಕೋರ್ಸ್ ವಿವರಗಳನ್ನು ಪಡೆಯಲು ನೀವು ಲಾಗ್ ಇನ್ ಆಗಬೇಕು",
   "CURRENT_LANGUAGE": "ಪ್ರಸ್ತುತ ಭಾಷೆ",
-  "DATA": "ಹೆಚ್ಚು ಪುಸ್ತಕಗಳನ್ನು ಮತ್ತು ಪಠ್ಯಾಂಶವನ್ನು ನೋಡಿ. ",
   "DATA_SYNC": "ಡೇಟಾ ಸಿಂಕ್",
   "DATA_SYNC_FAILURE": "ಡೇಟಾ ಸಿಂಕ್ ಆಗಲಿಲ್ಲ, ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ. ",
   "DATA_SYNC_NOTHING_TO_SYNC": "ಸಿಂಕ್ ಮಾಡಲು ಏನೂ ಇಲ್ಲ",
   "DATA_SYNC_SUB": "ಡೇಟಾ ಬ್ಯಾಕ್ ಅಪ್ ಮಾಡಿ , ಟೆಲಿಮೆಟ್ರಿ ವರ್ಗಾಯಿಸಿ",
   "DATA_SYNC_SUCCESSFUL": "ಟೆಲಿಮೆಟ್ರಿ ಡೇಟಾ ಸಿಂಕ್ ಯಶಸ್ವಿಯಾಯಿತು",
+  "DAYS_AGO": "{{%s}} ದಿನಗಳ ಹಿಂದೆ",
+  "DAY_AGO": "{{%s}} ದಿನದ ಹಿಂದೆ",
   "DELETE": "ಡಿಲೀಟ್ ಮಾಡಿ",
   "DELETE_ALL_CONTENT_WARNING": "ಕಂಟೆಂಟ್ ಅಳಿಸಿಹಾಕಿದರೆ ಅದು ಡಿವೈಸಿನಿಂದ ಆಯ್ಕೆ ಮಾಡಿದ ಎಲ್ಲ ಕಂಟೆಂಟುಗಳನ್ನು ತೆಗೆದುಹಾಕುವುದು",
   "DELETE_CONTENT": "ಪಠ್ಯಾಂಶ ಡಿಲೀಟ್ ಮಾಡುವಿರಾ? ",
   "DELETE_CONTENT_SIZE": "1 ಪಠ್ಯಾಂಶ {{content_size}}",
   "DELETE_CONTENT_WARNING": "ಕಂಟೆಂಟ್ ಡಿಲೀಟ್ ಮಾಡಿದರೆ, ಅದು ಡಿವೈಸಿನಿಂದಲೂ ತೆಗೆದುಹಾಕುತ್ತದೆ",
-  "DELETE_GROUP": "ಗುಂಪನ್ನು ಡಿಲೀಟ್ ಮಾಡಿ",
+  "DELETE_GROUP_DESC": "{{group_name}} ನ್ನು ತೆಗೆದುಹಾಕುವುದು ಅಪ್ಲಿಕೇಶನ್ನಿನಿಂದ ಗುಂಪನ್ನು ಶಾಶ್ವತವಾಗಿ ತೆಗೆದುಹಾಕುವುದು",
+  "DELETE_GROUP_ERROR_MSG": "ಗುಂಪನ್ನು ಡಿಲೀಟ್ ಮಾಡಲು ಆಗಲಿಲ್ಲ. ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ",
+  "DELETE_GROUP_POPUP_TITLE": "ಗುಂಪು ಡಿಲೀಟ್ ಮಾಡುವುದೇ?",
+  "DELETE_GROUP_SUCCESS_MSG": "ಗುಂಪು ಯಶಸ್ವಿಯಾಗಿ ಡಿಲೀಟ್ ಆಯಿತು",
   "DELETE_PROGRESS": "ಆಯ್ದ ಕಂಟೆಂಟ್ ಗಳನ್ನು ಡಿಲೀಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ",
-  "DESCRIPTION": "ವಿವರಣೆ",
+  "DETAIL_TUTORIAL": "‪{{%appName}}'s‬ ಗ್ರಂಥಾಲಯವು ಸಾಕಷ್ಟು ‪{{%explainVideos}},‬ ‪{{%quesBanks}}‬ ಮತ್ತು ಇತರೆ ‪{{%interactiveMaterial}} ಹೊಂದಿವೆ. ಗ್ರಂಥಾಲಯದಲ್ಲಿ ಹುಡುಕುವುದನ್ನು ಆರಂಭಿಸಲು ಒಂದು ಪಠ್ಯಪುಸ್ತಕದ ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ! ",
   "DEVICE_ID": "ಡಿವೈಸ್  ಐಡಿ",
   "DEVICE_LOCATION": "ಡಿವೈಸ್ ಸ್ಥಳ",
   "DEVICE_TAGS": "ಡಿವೈಸಿನ ಟ್ಯಾಗ್",
   "DEVICE_TAGS_SUB": "ಡಿವೈಸ್ ಟ್ಯಾಗ್ ಸೇರಿಸಿ ಅಥವಾ ಡಿಲೀಟ್ ಮಾಡಿ",
+  "DFLT_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "ಆರಂಭಿಸಲು ಒಂದು ಟಾಸ್ಕ್ ಆಯ್ಕೆ ಮಾಡಿ",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "ಟಾಸ್ಕ್",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "ಟಾಸ್ಕ್ ಗಳು",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "ಟಾಸ್ಕ್ ಗಳು",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "‪{{%appName}}'s‬ ಗ್ರಂಥಾಲಯವು ಸಾಕಷ್ಟು ‪{{%explainVideos}},‬ ‪{{%quesBanks}}‬ ಮತ್ತು ಇತರೆ ‪{{%interactiveMaterial}} ಹೊಂದಿವೆ. ಗ್ರಂಥಾಲಯದಲ್ಲಿ ಹುಡುಕುವುದನ್ನು ಆರಂಭಿಸಲು ಒಂದು ಪಠ್ಯಾಂಶದ ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ!",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}}({{%medium}}) ಕ್ಕೆ ಯಾವುದೇ  ಟಾಸ್ಕ್ ಗಳು ಕಾಣುತ್ತಿಲ್ಲ",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "ಮಂಡಳಿಯು ಪಠ್ಯಾಂಶಗಳನ್ನು ಸೇರಿಸುತ್ತಿದೆ",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}}  ದಲ್ಲಿ ಪಠ್ಯಾಂಶಗಳು ಕಾಣಲಿಲ್ಲವೇ?",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span> ಪ್ರಗತಿಯನ್ನು ಟ್ರಾಕ್ ಮಾಡಲು ಆಗುವುದಿಲ್ಲ",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "ನಿಮ್ಮ ರಾಜ್ಯ ಮಂಡಳಿಯು ನೀವು ಕೇಳಿರುವ ಪಠ್ಯಾಂಶಗಳನ್ನು {{%s}} ದಲ್ಲಿ ಅಪ್ಲೋಡ್ ಮಾಡಿದೊಡನೆ ನಿಮಗೆ ಸೂಚನೆ ಕಳಿಸುತ್ತೇವೆ",
+  "DFLT_NONTRK_QR_CODE_DETAILS": "QR ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ, ಡಿಜಿಟಲ್ ಪಠ್ಯಾಂಶವನ್ನು ಕೂಡಲೇ ಪಡೆಯಿರಿ\n\n",
+  "DFLT_NONTRK_SEE_MORE_BOOKS": "ಇನ್ನೂ ಹೆಚ್ಚು ನೋಡಿ",
+  "DFLT_NONTRK_STUDENT_ROLE_DESC_1": "ಡಿಜಿಟಲ್ ಪಠ್ಯಾಂಶ ಬ್ರೌಸ್ ಮಾಡಿ",
+  "DFLT_NONTRK_TEACHER_ROLE_DESC_1": "ಡಿಜಿಟಲ್ ಪಠ್ಯಾಂಶ ಬ್ರೌಸ್ ಮಾಡಿ",
+  "DFLT_NONTRK_TUTORIAL_HEADING": "ವಿಡಿಯೋಗಳು, ಇಂಟರಾಕ್ಟಿವ್ ಪಠ್ಯಾಂಶ, ಇ-ಪಠ್ಯಪುಸ್ತಕಗಳು ಮತ್ತು ಇನ್ನೂ ಹೆಚ್ಚು...",
+  "DFLT_TRK_BATCHEND_MAIN_HEADING": "ನೀವು {{%s}} ರಂದು ಪೂರ್ಣಗೊಂಡಿರುವ ಕಲಿಕಾ ಟಾಸ್ಕ್ ಬ್ಯಾಚ್ ಸೇರಿದ್ದೀರಿ",
+  "DFLT_TRK_BATCHEND_SUB_HEADING": "ನೀವು ಕಲಿಕೆಯನ್ನು ಮುಂದುವರೆಸಬಹುದು, ಆದರೆ ನಿಮ್ಮ ಪ್ರಗತಿಯು ನವೀಕರಣವಾಗುವುದಿಲ್ಲ",
+  "DFLT_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "ನೀವು ಈ ಕಲಿಕಾ ಚಟುವಟಿಕೆಯನ್ನು ಮುಗಿಸಿದ್ದೀರಿ",
+  "DFLT_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} ಒಳಗೆ ಕಲಿಕೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಿ",
+  "DFLT_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "ಈ ಕಲಿಕಾ ಟಾಸ್ಕ್ ಈಗ ಸಕ್ರಿಯವಾಗಿಲ್ಲ",
+  "DFLT_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "ಕಲಿಕಾ ಟಾಸ್ಕ್ ಗಳು",
+  "DFLT_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "ನೀವು ಈ ಕಲಿಕಾ ಟಾಸ್ಕ್ ಸೇರಿದ್ದೀರಿ",
+  "DFLT_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "ಕಲಿಕಾ ಟಾಸ್ಕ್ ಗೆ ಬ್ಯಾಚ್ ಗಳು",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "ಕಲಿಕಾ ಟಾಸ್ಕ್ ಗಳು",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "ನನ್ನ  ಕಲಿಕಾ ಟಾಸ್ಕ್ ಗಳು",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "ಟಾಸ್ಕ್ ಕೊನೆಗೊಂಡಿದ್ದು {{%s}}",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "ಕೊನೆಯಬಾರಿ ನವೀಕರಿಸಿದ್ದು {{last_updated_on_date}}",
+  "DFLT_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "ಸೇರಿ",
+  "DFLT_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "ಇತ್ತೀಚಿನ ಕಲಿಕಾ ಟಾಸ್ಕ್ ಗಳು",
+  "DFLT_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "ಟಾಸ್ಕ್ ಅನ್ನು ಬಿಡುತ್ತೀರಾ?",
+  "DFLT_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "ಸೇರುವುದಕ್ಕೆ ಲಾಗಿನ್ ಆಗಿ",
+  "DFLT_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "ಪಠ್ಯಾಂಶ ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "ಟಾಸ್ಕ್ ಗಳು ({{%s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "ಟಾಸ್ಕ್  ({{%s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "ಆನ್ಲೈನ್ ಕಲಿಕೆಯನ್ನು ತೆಗೆದುಕೊಳ್ಳಿ",
+  "DFLT_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "ಜನಪ್ರಿಯ ಟಾಸ್ಕ್ ಗಳು",
+  "DFLT_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ಆನ್ಲೈನ್ ಕಲಿಕೆಯನ್ನು ತೆಗೆದುಕೊಳ್ಳಿ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "ಪ್ರಮಾಣಪತ್ರ ಪಡೆಯಲು {{%s}} ಒಳಗೆ ಟಾಸ್ಕ್ ಪೂರ್ಣಗೊಳಿಸಿ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING": "ಕಲಿಕಾ ಟಾಸ್ಕ್",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "ಹಾಜರಾದ ಕಲಿಕಾ ಟಾಸ್ಕ್(ಗಳು)",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "ಟಾಸ್ಕ್ ವಿವರಗಳು",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "ಟಾಸ್ಕ್  ಕೊನೆಗೊಳ್ಳುವುದು",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "ಟಾಸ್ಕ್ ಮುಕ್ತಾಯದ ದಿನಾಂಕ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "ಟಾಸ್ಕ್ ವಿವರಗಳು",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "ಈ ಟಾಸ್ಕ್ ಇವರಿಗೆ ಪ್ರಸ್ತುತವಾಗಿದೆ:",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "ಟಾಸ್ಕ್ ಸಂಪನ್ಮೂಲಗಳು",
+  "DFLT_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "ಟಾಸ್ಕ್ ಬಿಡಿ",
+  "DFLT_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": " ಕಲಿಕೆ ಟಾಸ್ಕ್ ಗಳನ್ನು ಪರಿಶೀಲಿಸಬೇಕೆ?",
+  "DFLT_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "{{batch_start_date}} ರಿಂದ ಟಾಸ್ಕ್ ನ ಬ್ಯಾಚ್ ಲಭ್ಯವಿದೆ",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "ನೀವು 7 ದಿನಗಳ ಒಳಗಾಗಿ ನಿಮ್ಮ ನೋಂದಾಯಿತ ಸಂಪರ್ಕ ವಿವರಕ್ಕೆ ಕೋರ್ಸ್ ಪ್ರಮಾಣಪತ್ರದ ಕುರಿತು ಸೂಚನೆ ಪಡೆಯುವಿರಿ",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "ಟಿಪ್ಪಣಿ: ಈ ಟಾಸ್ಕ್ ಗೆ ಪ್ರಮಾಣಪತ್ರ ಇಲ್ಲ",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "ನೀವು ಟಾಸ್ಕ್  ಸೇರಿದ್ದೀರಿ",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "ಪ್ರಸ್ತುತ, ಈ ಟಾಸ್ಕ್ ಗೆ ಪ್ರಮಾಣಪತ್ರ ಇಲ್ಲ. ಇದನ್ನು ರಚಿಸಿದವರು ನಂತರ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಲಗತ್ತಿಸಬಹುದು",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "ನೀವು ಟಾಸ್ಕ್  ಬಿಟ್ಟಿದ್ದೀರಿ",
+  "DFLT_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "ಈ  ಟಾಸ್ಕ್ ಗೆ ಯಾವುದೇ ಬ್ಯಾಚ್ ಗಳು ಲಭ್ಯವಿಲ್ಲ",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "ಈ ಟಾಸ್ಕ್ ನೋಂದಾಯಿಸಿದ ಬಳಕೆದಾರರಿಗೆ ಮಾತ್ರ.  ಟಾಸ್ಕ್  ಗಾಗಿ ಲಾಗಿನ್ ಆಗಿ",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "ಈ ಟಾಸ್ಕ್ ಆರಂಭಿಸಲು ಲಾಗಿನ್ ಆಗಿ",
+  "DFLT_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "ಈ ಟಾಸ್ಕ್ ಗೆ ಯಾವುದೇ ಬ್ಯಾಚ್ ಗಳು ಲಭ್ಯವಿಲ್ಲ",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "ನೋಂದಾಯಿಸಿದ ಬಳಕೆದಾರರು ಮಾತ್ರವೇ ಕಲಿಕಾ ಟಾಸ್ಕ್ ಗಳನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "ನೀವು ಈ ಟಾಸ್ಕ್ ಯಶಸ್ವಿಯಾಗಿ ಪೂರ್ಣಗೊಳಿಸಿದಿರಿ",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "ಟಾಸ್ಕ್ ಪೂರ್ಣಗೊಂಡಿದೆ. ನೀವು ಮೌಲ್ಯಮಾಪನವನ್ನು ಪುನಃ ತೆಗೆದುಕೊಳ್ಳಬಹುದು, ಆದರೆ ನಿಮ್ಮ ಪ್ರಗತಿಯು ದಾಖಲಾಗುವುದಿಲ್ಲ.",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "ಟಾಸ್ಕ್ ಪೂರ್ಣಗೊಂಡಿದೆ. ನೀವು ಮೌಲ್ಯಮಾಪನವನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು, ಆದರೆ ನಿಮ್ಮ ಪ್ರಗತಿಯು ದಾಖಲಾಗುವುದಿಲ್ಲ.",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "ಟಾಸ್ಕ್ ವಿವರಗಳನ್ನು ನೋಡಲು ಮತ್ತು ಪಡೆಯಲು ನೀವು ಒಂದು ಸಕ್ರಿಯ ಬ್ಯಾಚ್ ಗೆ ಸೇರಬೇಕು.",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "ಟಾಸ್ಕ್ ವಿವರಗಳನ್ನು ಪಡೆಯಲು ನೀವು ಲಾಗ್ ಇನ್ ಆಗಬೇಕು",
   "DISMISS": "ರದ್ದು ಮಾಡಿ",
+  "DISMISS_AS_GROUP_ADMIN": "ಗುಂಪು ಅಡ್ಮಿನ್ ಆಗಿ ತೆಗೆದುಹಾಕಿ",
+  "DISMISS_AS_GROUP_ADMIN_ERROR_MSG": "ಗುಂಪಿನ ಅಡ್ಮಿನ್  {{member_name}} ಅವರನ್ನು ತೆಗೆದುಹಾಕಲು ವಿಫಲವಾಯಿತು.",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_DESC": "{{member_name}} ಅವರನ್ನು ಗುಂಪಿನ ಅಡ್ಮಿನ್ ಆಗಿ ತೆಗೆದುಹಾಕುವುದು ಸದಸ್ಯರ ಅಡ್ಮಿನ್ ಒಪ್ಪಿಗೆಗಳನ್ನು ಇಲ್ಲವಾಗಿಸುತ್ತದೆ.",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_TITLE": "ಗುಂಪು ಅಡ್ಮಿನ್ ಆಗಿ ತೆಗೆದುಹಾಕುವುದೇ? ",
+  "DISMISS_AS_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} ಇನ್ನು ಮುಂದೆ ಗುಂಪಿನ ಅಡ್ಮಿನ್ ಅಲ್ಲ.",
   "DISTRICT": "ಜಿಲ್ಲೆ",
   "DISTRICT_OPTION_TEXT": "ಜಿಲ್ಲೆ ಆಯ್ಕೆ ಮಾಡಿ",
-  "DOCS": "ಡಾಕ್ಯುಮೆಂಟ್ಸ್",
-  "DOWNLOAD": "ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
+  "DOC": "ಡಾಕ್ಯುಮೆಂಟ್ಸ್",
+  "DOWNLOAD": "ಡೌನ್ಲೋಡ್  ",
   "DOWNLOADING": "ಡೌನ್ಲೋಡ್ ಆಗುತ್ತಿದೆ  {{%s}}% ",
   "DOWNLOADING_1": "ಡೌನ್ಲೋಡ್ ಆಗ್ತಿದೆ  {{%s}} ",
-  "DOWNLOADING_2": "ಡೌನ್ಲೋಡ್ ಆಗ್ತಿದೆ",
+  "DOWNLOADING_2": "ಡೌನ್ಲೋಡ್ ಆಗುತ್ತಿದೆ",
   "DOWNLOADING_ATTACHMENT": "ಕಡತ/ಅಟ್ಯಾಚ್ಮೆಂಟ್ ಡೌನ್ಲೋಡ್ ಆಗುತ್ತಿದೆ",
   "DOWNLOADING_CONTENT": "ಕಂಟೆಂಟ್ ಡೌನ್ಲೋಡ್ ಆಗುತ್ತಿದೆ",
-  "DOWNLOADS": "ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
+  "DOWNLOADS": "ಡೌನ್ಲೋಡ್  ",
   "DOWNLOAD_ALL": "ಎಲ್ಲ ಕಂಟೆಂಟ್ ಡೌನ್ಲೋಡ್ ಮಾಡುವುದೇ?",
   "DOWNLOAD_ALL_CONTENT": "ಎಲ್ಲವನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
   "DOWNLOAD_ALL_wSIZE": "{{%s}} ಎಲ್ಲ  ಡೌನ್ಲೋಡ್ ಮಾಡಬೇಕೆ? ",
@@ -193,51 +367,71 @@
   "DOWNLOAD_NOW": "ಈಗ ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
   "DOWNLOAD_PATH": "ಫೈಲ್ ಇಂಟರ್ನಲ್ ಸ್ಟೋರೇಜಿನಲ್ಲಿ ಸೇವ್ ಆಗಿದೆ > ಡೌನ್ಲೋಡ್ ಫೋಲ್ಡರ್",
   "EDIT": "ಪರಿಷ್ಕರಿಸಿ",
-  "EDIT_EMAIL_POPUP_TITLE": "ಇಮೇಲ್ ID ಪರಿಷ್ಕರಿಸಿ",
+  "EDIT_EMAIL_POPUP_TITLE": "ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ಪರಿಷ್ಕರಿಸಿ",
   "EDIT_GROUP": "ಗುಂಪನ್ನು ಪರಿಷ್ಕರಿಸಿ",
   "EDIT_PERSONAL_DETAILS": "ವೈಯಕ್ತಿಕ ವಿವರಗಳನ್ನು ಪರಿಷ್ಕರಿಸಿ",
   "EDIT_PHONE_POPUP_TITLE": "ಮೊಬೈಲ್ ಸಂಖ್ಯೆ ಪರಿಷ್ಕರಿಸಿ",
-  "EDIT_PROFILE": "ಪ್ರೊಫೈಲ್  ಪರಿಷ್ಕರಣೆ ಮಾಡಿ",
-  "EMAIL_EDIT_SUCCESS": "ಇಮೇಲ್ ಐಡಿಯನ್ನು ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಯಿತು",
+  "EDIT_PROFILE": "ಪ್ರೊಫೈಲ್  ಪರಿಷ್ಕರಿಸಿ",
+  "EMAIL_EDIT_SUCCESS": "ಇಮೇಲ್ ವಿಳಾಸ ಅಪ್ಡೇಟ್ ಯಶಸ್ವಿಯಾಯಿತು",
   "EMAIL_ID_PLACEHOLDER": "ಇಮೇಲ್ ವಿಳಾಸ",
-  "EMAIL_PLACEHOLDER": "ಇಮೇಲ್ ID ನಮೂದಿಸಿ",
+  "EMAIL_PLACEHOLDER": "ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ಹಾಕಿ",
   "EMAIL_UPDATE_SUCCESS": "ಮೊಬೈಲ್ ಸಂಖ್ಯೆಯನ್ನು ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ",
-  "EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}})ಗೆ ಯಾವುದೇ ಪಠ್ಯ ಪುಸ್ತಕಗಳು ಕಾಣುತ್ತಿಲ್ಲ",
+  "EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) ಕ್ಕೆ ಯಾವುದೇ ಪಠ್ಯಪುಸ್ತಕಗಳು ಕಾಣುತ್ತಿಲ್ಲ",
   "EMPTY_SEARCH_RESULTS": "ನೀವು ಹುಡುಕಿದ್ದು ಲಭ್ಯವಿಲ್ಲ.",
+  "EMPTY_SEARCH_RESULT_GROUPS": "ಕ್ಷಮಿಸಿ! ನಿಮ್ಮ ಶೋಧಕ್ಕೆ ಸರಿಹೊಂದುವ ಯಾವುದೇ ಫಲಿತಾಂಶಗಳು ಇಲ್ಲ.",
   "ENDORSE": "ಅನುಮೋದಿಸಿ",
   "ENJOYED_THIS_CONTENT": "ಈ ಪಠ್ಯಾಂಶ ಖುಷಿ ನೀಡಿತೇ? ",
   "ENROLL": "ಸೇರಿಕೊಳ್ಳಿ ",
+  "ENROLLMENT_ENDED_ON": "{{%s}} ರಂದು ಬ್ಯಾಚ್ ದಾಖಲಾತಿಯು ಮುಗಿದಿದೆ",
   "ENROLLMENT_LAST_DATE": "ಸೇರಲು ಕೊನೆಯ ದಿನಾಂಕ:",
   "ENTER_GROUP_NAME": "ಗುಂಪಿನ ಹೆಸರು ನಮೂದಿಸಿ",
+  "ENTER_ID": "ಐಡಿಯನ್ನು ನಮೂದಿಸಿ",
+  "ENTER_ID_AS_REQUESTED_BY_STATE_BOARD_ORG": "ನಿಮ್ಮ ರಾಜ್ಯ/ಮಂಡಳಿ/ಸಂಸ್ಥೆ ಕೇಳಿರುವ ಹಾಗೆ ಐಡಿ ನಮೂದಿಸಿ",
+  "ENTER_LOCATION_FROM_PROFILE_PAGE": "ಪ್ರೊಫೈಲ್ ಪುಟದಿಂದ ಸ್ಥಳ ನಮೂದಿಸಿ",
+  "ENTER_MEMBER_ID": "{{app_name}} ಐಡಿಯನ್ನು ನಮೂದಿಸಿ",
   "ENTER_OTP": " OTP ನಮೂದಿಸು",
-  "ENTER_PHONE_POPUP_TITLE": "ಮೊಬೈಲ್  ಸಂಖ್ಯೆ ಹಾಕಿ. ",
+  "ENTER_PHONE_POPUP_TITLE": "ಮೊಬೈಲ್  ಸಂಖ್ಯೆ ಹಾಕಿ",
+  "ENTER_SCHOOL_NAME": "ಶಾಲೆಯ ಹೆಸರು ನಮೂದಿಸಿ",
+  "ENTER_THE_FOLLOWING_INFORMATION": "ಕೆಳಗಿನ ಮಾಹಿತಿಯನ್ನು ನಮೂದಿಸಿ",
+  "ENTER_UDISE_ID": "UDISE ID ನಮೂದಿಸಿ",
   "ERROR_BATCH_NOT_STARTED": "ಬ್ಯಾಚ್ ಇನ್ನೂ ಆರಂಭವಾಗಿಲ್ಲ.",
   "ERROR_CANT_OPEN_EMPTY_CONTENT": "ಖಾಲಿ ಫೈಲ್ ತೆರೆಯಲಾಗುವುದಿಲ್ಲ",
   "ERROR_CONTENT_NOT_AVAILABLE": "ಕಂಟೆಂಟ್ ಲಭ್ಯ ಇಲ್ಲ",
   "ERROR_CONTENT_NOT_FOUND": "ಕಂಟೆಂಟ್ ಇನ್ನೂ ಸೇರಿಸಿಲ್ಲ",
   "ERROR_COULD_NOT_OPEN_FILE": "ಫೈಲ್ ತೆರೆಯಲು ಆಗಲಿಲ್ಲ",
   "ERROR_DURATION_NOT_AVAILABLE": "ಅವಧಿ ಲಭ್ಯವಿಲ್ಲ",
-  "ERROR_EMAIL_EXISTS": "ಇಮೇಲ್ ID ಈಗಾಗಲೇ ಈಗಾಗಲೇ ನೋಂದಣಿಯಾಗಿದೆ.  ಬೇರೆ ಇಮೇಲ್ ID ಯೊಂದಿಗೆ ಪ್ರಯತ್ನಿಸಿ ",
-  "ERROR_EMAIL_INVALID": "ಸರಿಯಾದ ಇಮೇಲ್ ಐಡಿಯನ್ನು ನಮೂದಿಸಿ",
+  "ERROR_EMAIL_EXISTS": "ಈ ಇಮೇಲ್ ವಿಳಾಸ ಈಗಾಗಲೇ ನೋಂದಣಿಯಾಗಿದೆ.  ಬೇರೆ ಇಮೇಲ್ ವಿಳಾಸದೊಂದಿಗೆ ಪ್ರಯತ್ನಿಸಿ ",
+  "ERROR_EMAIL_INVALID": "ಸರಿಯಾದ ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ಹಾಕಿ",
   "ERROR_EMPTY_FIELDS": "ವಿವರಗಳನ್ನು ನಮೂದಿಸಿ",
   "ERROR_FAILED_TO_DOWNLOAD_ATTACHMENT": "ಕಡತ/ಆಟ್ಯಾಚ್ಮೆಂಟ್ ಡೌನ್ಲೋಡ್ ಮಾಡಲು ವಿಫಲವಾಗಿದೆ",
   "ERROR_FETCHING_DATA": "ದತ್ತಾಂಶ ಪಡೆಯಲು ವಿಫಲ",
   "ERROR_LOW_MEMORY": "ವರ್ಗಾಯಿಸಲು ಸಾಕಷ್ಟು ಸ್ಥಳಾವಕಾಶ ಇಲ್ಲ",
+  "ERROR_MAXIMUM_ACTIVITY_COUNT_EXCEEDS": "ನೀವು ಗುಂಪಿಗೆ ಸೇರಿಸಬಹುದಾದ ಗರಿಷ್ಠ ಸಂಖ್ಯೆಯ ಚಟುವಟಿಕೆಗಳ ಮಿತಿಯನ್ನು ಮೀರಿದ್ದೀರಿ",
+  "ERROR_MAXIMUM_GROUP_COUNT_EXCEEDS": "ನೀವು ರಚಿಸಬಹುದಾದ ಗರಿಷ್ಠ ಸಂಖ್ಯೆಯ ಗುಂಪುಗಳ ಮಿತಿಯನ್ನು ಮೀರಿದ್ದೀರಿ",
+  "ERROR_MAXIMUM_MEMBER_COUNT_EXCEEDS": "ನೀವು ಗುಂಪಿಗೆ ಸೇರಿಸಬಹುದಾದ ಗರಿಷ್ಠ ಸಂಖ್ಯೆಯ ಸದಸ್ಯರ ಮಿತಿಯನ್ನು ಮೀರಿದ್ದೀರಿ",
   "ERROR_NAME_INVALID": "ಹೆಸರಿಗೆ ಕೇವಲ ಅಕ್ಷರಗಳನ್ನು ಅಥವಾ ಸ್ಪೇಸ್ ನಮೂದಿಸಿ",
-  "ERROR_NO_BATCHES_FOUND": "ಈ ತರಬೇತಿಗೆ ಯಾವುದೇ ಬ್ಯಾಚ್ ಗಳಿಲ್ಲ",
+  "ERROR_NO_BATCHES_FOUND": "ಈ ಕೋರ್ಸ್ ಗೆ ಯಾವುದೇ ಬ್ಯಾಚ್ ಗಳಿಲ್ಲ",
   "ERROR_NO_INTERNET_MESSAGE": "ಅಂತರ್ಜಾಲ ಲಭ್ಯತೆ ಇಲ್ಲ",
   "ERROR_NO_OFFLINE_RESOURCE": "ಯಾವುದೇ ಸಂಪನ್ಮೂಲ ಸಂಗ್ರಹವಾಗಿಲ್ಲ",
   "ERROR_OFFLINE_MODE": "ಅಂತರ್ಜಾಲ ಇಲ್ಲ, ಆಫ್ ಲೈನ್ ಆಗಿ",
   "ERROR_OTP": "OTP ಸರಿಯಾಗಿಲ್ಲ. ಉಳಿದಿರುವ ಪ್ರಯತ್ನಗಳ ಸಂಖ್ಯೆ: {{%s}}",
+  "ERROR_OTP_LIMIT_EXCEEDED": "ನಿಮ್ಮ ಗರಿಷ್ಟ ಒಟಿಪಿ ಮಿತಿ ಮೀರಿದೆ,  ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ ",
   "ERROR_PHONE_EXISTS": "ಮೊಬೈಲ್ ಸಂಖ್ಯೆ ಈಗಾಗಲೇ ನೋಂದಣಿಯಾಗಿದೆ,  ಬೇರೆ ಮೊಬೈಲ್ ಸಂಖ್ಯೆಯೊಂದಿಗೆ ಪ್ರಯತ್ನಿಸಿ",
-  "ERROR_PHONE_INVALID": "ಸರಿಯಾದ ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ",
-  "ERROR_SAME_EMAIL_UPDATED": "ಈ ಇಮೇಲ್ ID ಈಗಾಗಲೇ ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಜೊತೆಗೆ ಇದೆ. ದಯವಿಟ್ಟು ಇನ್ನೊಂದು ಇಮೇಲ್ ID ಯನ್ನು ನಮೂದಿಸಿ",
-  "ERROR_SAME_PHONE_UPDATED": "ಈ ಮೊಬೈಲ್ ಸಂಖ್ಯೆ ಈಗಾಗಲೇ ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಜೊತೆಗೆ ಇದೆ. ದಯವಿಟ್ಟು ಇನ್ನೊಂದು   ಮೊಬೈಲ್ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ",
+  "ERROR_PHONE_INVALID": "ಸರಿಯಾದ ಮೊಬೈಲ್ ಸಂಖ್ಯೆಯನ್ನು ಹಾಕಿ",
+  "ERROR_PHONE_REQUIRED": "ಮೊಬೈಲ್ ಸಂಖ್ಯೆ ಬೇಕು",
+  "ERROR_SAME_EMAIL_UPDATED": "ಈ ಇಮೇಲ್ ವಿಳಾಸ ಈಗಾಗಲೇ ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಜೊತೆಗೆ ಇದೆ. ದಯವಿಟ್ಟು ಇನ್ನೊಂದು ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ಹಾಕಿ",
+  "ERROR_SAME_PHONE_UPDATED": "ಈ ಮೊಬೈಲ್ ಸಂಖ್ಯೆ ಈಗಾಗಲೇ ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಜೊತೆಗೆ ಇದೆ. ದಯವಿಟ್ಟು ಇನ್ನೊಂದು   ಮೊಬೈಲ್ ಸಂಖ್ಯೆಯನ್ನು ಹಾಕಿ",
   "ERROR_SERVER_CONNECTION": "ಸರ್ವರ್ ಸಂಪರ್ಕ ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ",
+  "ERROR_SPECIAL_CHARECTERS_NOT_ALLOWED": "ವಿಶೇಷ ಕ್ಯಾರೆಕ್ಟರ್ ಗಳನ್ನು ಹಾಕಲು ಸಾಧ್ಯವಿಲ್ಲ",
   "ERROR_TECHNICAL_PROBLEM": "ನಾವು ಒಂದು ತಾಂತ್ರಿಕ ತೊಂದರೆ ಎದುರಿಸುತ್ತಿದ್ದೇವೆ ಮತ್ತು  ನಿಮ್ಮ ಬೇಡಿಕೆಯನ್ನು ಈಡೇರಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ",
   "ERROR_UPLOADING_IMG": "ಚಿತ್ರ ಅಪ್ ಲೋಡ್ ಮಾಡುವಾಗ ತಪ್ಪಾಗಿದೆ",
   "ERROR_USER_ACCOUNT_BLOCKED": "ಬಳಕೆದಾರ ಖಾತೆಯನ್ನು ತಡೆಯಲಾಗಿದೆ. ವಿವರಗಳಿಗೆ ನಿಮ್ಮ ಅಡ್ಮಿನಿಸ್ಟ್ರೇಟರ್ ಅವರನ್ನು ಸಂಪರ್ಕಿಸಿ",
+  "ERROR_WHILE_ADDING_USER": "ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸುವಾಗ ತಪ್ಪಾಯಿತು",
+  "ERROR_WHILE_FETCHING_USERS": "ಬಳಕೆದಾರರನ್ನು ಪಡೆಯುವಾಗ ತಪ್ಪಾಯಿತು",
   "ERROR_WHILE_LOGIN": "ಲಾಗಿನ್ ಆಗುವಾಗ ತಪ್ಪಾಯಿತು",
+  "ERROR_WHILE_SWITCHING_USER": "ಬಳಕೆದಾರರನ್ನು ಬದಲಿಸುವಾಗ ತಪ್ಪಾಯಿತು",
+  "EXPLORE_HEADING": "‪{{%s}}ದಲ್ಲಿ‬ ಇನ್ನೂ ಹೆಚ್ಚು ಅನ್ವೇಷಿಸಿ",
+  "EXP_VIDEOS": "ವಿವರಣೆಯ ವೀಡಿಯೋಗಳು",
   "EXTRACTING_CONTENT": "ಪಠ್ಯಾಂಶವನ್ನು ಪಡೆಯಲಾಗುತ್ತಿದೆ {{%s}} ",
   "FEEDBACK_HINT": "ಹಿಮ್ಮಾಹಿತಿ (ಐಚ್ಛಿಕ)",
   "FEEDBACK_HINT_1": "ನಿಮ್ಮ ಅಭಿಪ್ರಾಯ ಬರೆಯಿರಿ ",
@@ -251,24 +445,195 @@
   "FILL_THE_MANDATORY_FIELDS": "ಎಲ್ಲ ಕಡ್ಡಾಯ ವಿವರಗಳನ್ನು ತುಂಬಿರಿ. ",
   "FILTER": "ಫಿಲ್ಟರ್",
   "FILTER_ADDED": "ಸೇರಿಸಲಾಯಿತು",
-  "FILTER_BY": "ಇದರಿಂದ ಫಿಲ್ಟರ್ ಮಾಡಿ",
-  "FIRST_NAME": "ಹೆಸರು",
+  "FILTER_BY": "ಫಿಲ್ಟರ್ ಮಾಡಿ",
   "FOLLOW": "ಅನುಸರಿಸಿ",
   "FORCE_UPDATE_MESSAGE": "ನೀವು {{%s}} ಆಪ್ ನ ಹಳೆಯ ಆವೃತ್ತಿಯನ್ನು ಬಳಸುತ್ತಿದ್ದೀರಿ. ಗೂಗಲ್ ಪ್ಲೇ ಸ್ಟೋರ್ ನಿಂದ ಇತ್ತೀಚಿನ ಆವೃತ್ತಿಯನ್ನು ಪಡೆಯಲು, ಅಪ್ಡೇಟ್ ನೌ  ಒತ್ತಿ",
+  "FORUM": "ಚರ್ಚೆ",
+  "FOR_SUPPORT": "‪{{%s}}‬ ಸಹಾಯಕ್ಕೆ",
   "FREE_SPACE": "ಖಾಲಿ ಸ್ಥಳ:",
+  "FRMELEMENTS_BTN_ACTIVATEGRP": "ಸಕ್ರಿಯಗೊಳಿಸಿ",
+  "FRMELEMENTS_BTN_ADD": " ಸೇರಿಸಿ",
+  "FRMELEMENTS_BTN_BACK": "ಹಿಂದೆ",
+  "FRMELEMENTS_BTN_DEACTIVATEGRP": "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ",
+  "FRMELEMENTS_BTN_NEXT": "ಮುಂದೆ",
+  "FRMELEMENTS_LBL_ACTIVATEGRP": "ಗುಂಪನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ",
+  "FRMELEMENTS_LBL_ACTIVATEGRPQUES": "ಗುಂಪನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಬೇಕೆ?",
+  "FRMELEMENTS_LBL_CONTENT_TYPE": "ಪಠ್ಯಾಂಶ ವಿಧ",
+  "FRMELEMENTS_LBL_DEACTIVATEGRP": "ಗುಂಪನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ",
+  "FRMELEMENTS_LBL_DEACTIVATEGRPQUES": "ಗುಂಪನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಬೇಕೆ? ",
+  "FRMELEMENTS_LBL_REMARKS": "ರಿಮಾರ್ಕ್ ಗಳು",
+  "FRMELEMENTS_MSG_ACTIVATEGRPFAILED": "ಗುಂಪು ಸಕ್ರಿಯ ಮಾಡಲು ಆಗಲಿಲ್ಲ, ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ",
+  "FRMELEMENTS_MSG_ACTIVATEGRPMSG": "ಗುಂಪನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿದರೆ ನೀವು ಸದಸ್ಯರು ಹಾಗೂ ಚಟುವಟಿಕೆಗಳನ್ನು ಸೇರಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ. ನೀವು ಸದಸ್ಯರ ಪ್ರಗತಿಯನ್ನು ಕೂಡ ಪರಿಶೀಲಿಸುತ್ತಿರಬಹುದು",
+  "FRMELEMENTS_MSG_ACTIVATEGRPPOPUP": "ಈ ಗುಂಪು ತಾತ್ಕಾಲಿಕವಾಗಿ ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ. ಅಗತ್ಯವಿದ್ದರೆ ಗುಂಪಿನ ಅಡ್ಮಿನ್ ಗುಂಪನ್ನು ಮತ್ತೆ ಸಕ್ರಿಯಗೊಳಿಸಬಹುದು. ಗುಂಪಿನ ಸದಸ್ಯರು ತಮ್ಮ ಚರ್ಚೆಯನ್ನು ಚರ್ಚಾ ಫೋರಮ್ ನಲ್ಲಿ ಮುಂದುವರೆಸಬಹುದು. ",
+  "FRMELEMENTS_MSG_ACTIVATEGRPSUCCESS": "ಗುಂಪನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸಲಾಯಿತು",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPFAILED": " ಗುಂಪು ನಿಷ್ಕ್ರಿಯ ಮಾಡಲು ಆಗಲಿಲ್ಲ, ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPMSG": "ಗುಂಪನ್ನು ತೆಗೆದುಹಾಕುವುದು ನಿಮ್ಮ ಲಭ್ಯತೆಯನ್ನು ತೆಗೆದುಹಾಕುತ್ತದೆ. ನೀವು ಗುಂಪಿಗೆ ಚಟುವಟಿಕೆಗಳನ್ನು ಅಥವಾ ಸದಸ್ಯರನ್ನು ಸೇರಿಸಲು ಆಗುವುದಿಲ್ಲ. ನಿಮಗೆ ಗುಂಪಿನ ಸದಸ್ಯರ ಪ್ರಗತಿಯನ್ನು ನೋಡಲೂ ಆಗುವುದಿಲ್ಲ",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPSUCCESS": "ಗುಂಪನ್ನು ಯಶಸ್ವಿಯಾಗಿ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಯಿತು",
+  "FRMELEMNTS_BTN_CLOSE": "ಕ್ಲೋಸ್",
+  "FRMELEMNTS_BTN_DONOT_SHARE": "ಹಂಚಿಕೊಳ್ಳಬೇಡಿ",
+  "FRMELEMNTS_BTN_EDIT_SETTING": "ಸೆಟ್ಟಿಂಗ್ಸ್ ಪರಿಷ್ಕರಿಸಿ",
+  "FRMELEMNTS_BTN_PREVIEW_FORM": "ನಮೂನೆ ಪ್ರಿವ್ಯೂ ಮಾಡಿ",
+  "FRMELEMNTS_BTN_SAVE": "ಸೇವ್  ",
+  "FRMELEMNTS_BTN_SAVE_EDITS": "ಸೇವ್ ಎಡಿಟ್ಸ್",
+  "FRMELEMNTS_BTN_SAVE_FORM": "ನಮೂನೆ ಸೇವ್ ಮಾಡಿ",
+  "FRMELEMNTS_BTN_SEEK_HELP": "ಸಹಾಯ ಕೇಳಿ",
+  "FRMELEMNTS_BTN_SUBMIT_FORM": "ನಮೂನೆ ಸಲ್ಲಿಸಿ",
+  "FRMELEMNTS_BTN_VIEW_DETAILS": "ವಿವರಗಳನ್ನು ನೋಡಿ",
+  "FRMELEMNTS_CKBX_CERTMSG": "ಈ ಸಂದೇಶವನ್ನು ಪುನಃ ತೋರಿಸಬೇಡಿ",
+  "FRMELEMNTS_LBL_ACCESSIBILITY": "ಸ್ಕ್ರೀನ್ ರೀಡರ್ ಲಭ್ಯತೆ",
+  "FRMELEMNTS_LBL_ACCESSIBILITYMODE": "ಡಾರ್ಕ್ ಮೋಡ್ ಗೆ ಹೋಗಿ",
+  "FRMELEMNTS_LBL_ACCESSIBILITYSKIP": "ಮುಖ್ಯ ವಿಷಯಕ್ಕೆ ಹೋಗಿ",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXT": "ಸೈಟ್ ಮ್ಯಾಪ್",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXTSIZE": "ಫಾಂಟ್ ಗಾತ್ರ ಹೆಚ್ಚು ಮಾಡಿ",
+  "FRMELEMNTS_LBL_ADD_ATTACHMENTS": " ಅಟ್ಯಾಚ್ಮೆಂಟ್ ಸೇರಿಸಿ",
+  "FRMELEMNTS_LBL_ADD_ENTITY": "ಎಂಟಿಟಿ ಸೇರಿಸಿ",
+  "FRMELEMNTS_LBL_ADD_NEW_TASK": "ಹೊಸ ಟಾಸ್ಕ್ ಸೇರಿಸಿ",
+  "FRMELEMNTS_LBL_ADD_REMARKS": "ರಿಮಾರ್ಕ್  ಸೇರಿಸಿ",
+  "FRMELEMNTS_LBL_ADD_SUBTASK": "ಸಬ್ ಟಾಸ್ಕ್ ಸೇರಿಸಿ",
+  "FRMELEMNTS_LBL_ADD_SUBTASK_PALCEHOLDER": "ಸಬ್ ಟಾಸ್ಕ್ ಹೆಸರು ಸೇರಿಸಿ",
+  "FRMELEMNTS_LBL_ADD_TASK": "ಟಾಸ್ಕ್ ಸೇರಿಸಿ",
+  "FRMELEMNTS_LBL_ASSIGNED_TO": "ಇವರಿಗೆ ವಹಿಸಲಾಗಿದೆ",
+  "FRMELEMNTS_LBL_ASSIGN_TASK": " ಟಾಸ್ಕ್ ನಿಗದಿ ಮಾಡಿ",
+  "FRMELEMNTS_LBL_ATTACH": "ಲಗತ್ತಿಸಿ",
+  "FRMELEMNTS_LBL_ATTACHMENTS": "ಲಗತ್ತುಗಳು",
+  "FRMELEMNTS_LBL_BLOCK": "ಬ್ಲಾಕ್",
+  "FRMELEMNTS_LBL_CATEGORIES": "ವಿಭಾಗಗಳು",
+  "FRMELEMNTS_LBL_CATEGORY_OVERVIEW": "ವಿಭಾಗದ ಪಕ್ಷಿನೋಟ",
+  "FRMELEMNTS_LBL_CLICK_HELP": "<b>ಸಹಾಯ ಕೇಳಿ</b> ಬಟನ್ ಒತ್ತಿರಿ",
+  "FRMELEMNTS_LBL_CLICK_HERE_TO_VIEW_LIBRARY": "ಗ್ರಂಥಾಲಯ ನೋಡಲು ಇಲ್ಲಿ ಕ್ಲಿಕ್ ಮಾಡಿ",
+  "FRMELEMNTS_LBL_CLUSTER": "ಕ್ಲಸ್ಟರ್",
+  "FRMELEMNTS_LBL_CONSENT_POPUP_INFO": "ನೀವು ಈ ವಿವರಗಳನ್ನು ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಪುಟದಿಂದ ಪರಿಷ್ಕರಿಸಬಹುದು",
+  "FRMELEMNTS_LBL_CONTENT_AVAIALABLE_IN_OTHER_BOARD": "ಬೇರೆ ಮಂಡಳಿಗಳು ನಿಮ್ಮ ಅಗತ್ಯಕ್ಕೆ ಸರಿಹೊಂದುವ ಆಸಕ್ತಿದಾಯಕ ಪಠ್ಯಾಂಶ ಹೊಂದಿರಬಹುದು",
+  "FRMELEMNTS_LBL_CONTENT_FOUND": "ನಿಮ್ಮ ಅಗತ್ಯಗಳಿಗೆ ಸರಿಹೊಂದುವ ಪಠ್ಯಾಂಶಗಳು ನಮಗೆ ಸಿಕ್ಕಿವೆ! ",
+  "FRMELEMNTS_LBL_CONTENT_TO_BE_ADDED": "ನಿಮ್ಮ ಮಂಡಳಿಯು ಹೆಚ್ಚು ಪಠ್ಯಾಂಶವನ್ನು ಇನ್ನೂ ಸೇರಿಸಬೇಕಿದೆ.",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT": "ನಿಮ್ಮ ಪಠ್ಯಾಂಶ ಕಾಣಲಿಲ್ಲವೇ? ಕೆಳಗಿರುವ ಯಾವುದಾದರೂ ಬಟನ್ ಒತ್ತಿರಿ",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT_YET": "ನಿಮ್ಮ ಪಠ್ಯಾಂಶ ಇನ್ನೂ ಕಾಣಲಿಲ್ಲವೇ?  ",
+  "FRMELEMNTS_LBL_CRITERIA_WISE": "ಮಾನದಂಡ",
+  "FRMELEMNTS_LBL_DATA_SETTINGS": "ಪ್ರೊಫೈಲ್ ಡೇಟಾ ಹಂಚಿಕೆ",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF": "ಪ್ರೊಫೈಲ್ ಡೇಟಾ ಹಂಚಿಕೆ ಆಫ್ ಆಗಿದೆ",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF_INFO": "ನೀವು ಕೋರ್ಸ್ ಅಡ್ಮಿನಸ್ಟ್ರೇಟರ್ ಜೊತೆ ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ವಿವರಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಒಪ್ಪಿಲ್ಲ",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON": "ಪ್ರೊಫೈಲ್ ಡೇಟಾ ಹಂಚಿಕೆ ಆನ್ ಇದೆ",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON_INFO": "ನೀವು ಕೋರ್ಸ್ ಅಡ್ಮಿನಸ್ಟ್ರೇಟರ್ ಜೊತೆ ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ವಿವರಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಒಪ್ಪಿದ್ದೀರಿ",
+  "FRMELEMNTS_LBL_DELETE_CONFIRMATION": "ನಿಮ್ಮ ಸಬ್ ಟಾಸ್ಕ್ ಡಿಲೀಟ್ ಮಾಡಲು ಖಾತ್ರಿಯಾಗಿ ಬಯಸುವಿರಾ?",
+  "FRMELEMNTS_LBL_DONOT_SHARE_PROFILE_INFO": "ನನ್ನ ಪ್ರೊಫೈಲ್ ವಿವರಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಬೇಡಿ\n",
+  "FRMELEMNTS_LBL_DURATION": "ಅವಧಿ",
+  "FRMELEMNTS_LBL_EMAIL_ID_PLACEHOLDER": "ರಾಜ್ಯ ಅಥವಾ ಸಂಸ್ಥೆಯ ಇಮೇಲ್ ವಿಳಾಸ",
+  "FRMELEMNTS_LBL_END_DATE": "ಮುಕ್ತಾಯದ ದಿನಾಂಕ",
+  "FRMELEMNTS_LBL_FILES": "ಫೈಲುಗಳು",
+  "FRMELEMNTS_LBL_IMAGES": "ಚಿತ್ರಗಳು",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS": "ಪ್ರೊಜೆಕ್ಟ್ ವರದಿಗಳು",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS_DESC": "ಪ್ರೊಜೆಕ್ಟ್ ವರದಿಗಳನ್ನು ನೋಡಿ",
+  "FRMELEMNTS_LBL_IN_PROGRESS": "ಪ್ರಗತಿಯಲ್ಲಿದೆ",
+  "FRMELEMNTS_LBL_LEARNER_PASSBOOK": "ಕಲಿಕಾರ್ಥಿಗಳ ಪಾಸ್ ಬುಕ್",
+  "FRMELEMNTS_LBL_LEARNING_RESOURCES": "ಕಲಿಕಾ ಸಂಪನ್ಮೂಲಗಳು",
+  "FRMELEMNTS_LBL_LINK_LEARNING_RESOURCES": "ಕಲಿಕಾ ಸಂಪನ್ಮೂಲಗಳನ್ನು ಲಿಂಕ್ ಮಾಡಿ",
+  "FRMELEMNTS_LBL_MEDIA_TYPE": "ಮೀಡಿಯಾದ ವಿಧ",
+  "FRMELEMNTS_LBL_MOBILE_NUMBER_PLACEHOLDER": "ರಾಜ್ಯ ಅಥವಾ ಸಂಸ್ಥೆಯ ಮೊಬೈಲ್ ನಂಬರ್",
+  "FRMELEMNTS_LBL_MY_LEARNINGS": "ನನ್ನ ಕಲಿಕೆಗಳು",
+  "FRMELEMNTS_LBL_NEW_TASK": "ಹೊಸ ಟಾಸ್ಕ್",
+  "FRMELEMNTS_LBL_NO_MATCHING_CONTENT": "ಹೊಂದಿಕೆಯಾಗುವ ಯಾವುದೇ ಪಠ್ಯಾಂಶ ಕಾಣಲಿಲ್ಲ",
+  "FRMELEMNTS_LBL_OBJECTIVE": "ಉದ್ದೇಶ",
+  "FRMELEMNTS_LBL_OBSERVATION": "ವೀಕ್ಷಣೆ",
+  "FRMELEMNTS_LBL_OBSERVATION_DESC": "ನಿಮ್ಮ ತರಗತಿಕೋಣೆ ಮತ್ತು ಶಾಲಾ ವೀಕ್ಷಣೆಗಳನ್ನು ಸುಲಭವಾಗಿ ಪಡೆಯಿರಿ ಹಾಗೂ ರೆಕಾರ್ಡ್ ಮಾಡಿ ಮತ್ತು ನಿಮ್ಮ ಪ್ರಗತಿಯ ಪಯಣವನ್ನು ಯೋಜಿಸಿರಿ ",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS": "ವೀಕ್ಷಣಾ ವರದಿಗಳು",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS_DEC": "ವೀಕ್ಷಣಾ ವರದಿಗಳನ್ನು ನೋಡಿ",
+  "FRMELEMNTS_LBL_OBSERVE_AGAIN": "ಪುನಃ ವೀಕ್ಷಿಸಿ",
+  "FRMELEMNTS_LBL_OPEN_BATCH_NOT_RECOMMENDED": "ನೀವು ಹಿಂದಿನ ಬ್ಯಾಚಿನಲ್ಲಿ ಈ ಕೋರ್ಸನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ, ಹೀಗಾಗಿ ಮತ್ತೆ ಸೇರುವುದು ಬೇಡ ಎಂದು ನಮ್ಮ ಸಲಹೆ. ನಿಮ್ಮ ಲರ್ನಿಂಗ್ ಹಿಸ್ಟರಿ ಮತ್ತು ಪ್ರಮಾಣಪತ್ರಗಳು ಮತ್ತೆ ರಿಸೆಟ್ ಆಗುತ್ತವೆ.",
+  "FRMELEMNTS_LBL_PERSONA": "ಪಾತ್ರ",
+  "FRMELEMNTS_LBL_PROFCONF": "ಪ್ರೊಫೈಲ್ ಹೆಸರು ದೃಢೀಕರಿಸಿ",
+  "FRMELEMNTS_LBL_PROFTITLE": "ಪ್ರೊಫೈಲ್ ಹೆಸರು",
+  "FRMELEMNTS_LBL_PROGRAM_NAME": "ಪ್ರೊಗ್ರಾಮ್ ಹೆಸರು",
+  "FRMELEMNTS_LBL_PROJECT": "ಫ್ರೊಜೆಕ್ಟ್ ",
+  "FRMELEMNTS_LBL_PROJECT_DESCRIPTION": " ನಿಮ್ಮ ಶಾಲಾ ಪ್ರಗತಿಯನ್ನು ಟಾಸ್ಕ್ ಗಳು ಹಾಗೂ ಯೋಜನಾ ಕಾಲಮಿತಿಗಳನ್ನು ನಿರ್ವಹಿಸುತ್ತ, ಟ್ರಾಕ್ ಮಾಡಿ",
+  "FRMELEMNTS_LBL_PROJECT_OVERVIEW": "ಫ್ರೊಜೆಕ್ಟ್ ಪಕ್ಷಿನೋಟ",
+  "FRMELEMNTS_LBL_PROJECT_STATUS": "ಫ್ರೊಜೆಕ್ಟ್ ಸ್ಥಿತಿಗತಿ",
+  "FRMELEMNTS_LBL_PROJECT_TITLE": "ಪ್ರೊಜೆಕ್ಟ್ ಹೆಸರು",
+  "FRMELEMNTS_LBL_PROJECT_VIEW": "ಫ್ರೊಜೆಕ್ಟ್ ನೋಟ",
+  "FRMELEMNTS_LBL_QUESTION_WISE": "ಪ್ರಶ್ನೆಗಳು",
+  "FRMELEMNTS_LBL_RELEVANT_CONTENT_SUB_HEADING": "ನಿಮ್ಮ ಅಗತ್ಯದ ನಿರ್ದಿಷ್ಟ ಪಠ್ಯಾಂಶದ ವಿವರಗಳನ್ನು ತುಂಬಿರಿ ",
+  "FRMELEMNTS_LBL_REPORTS": "ವರದಿಗಳು",
+  "FRMELEMNTS_LBL_REPORTS_DESC": "ವರದಿಗಳ ಪಟ್ಟಿ",
+  "FRMELEMNTS_LBL_REQUEST_CONTENT": "ಪಠ್ಯಾಂಶ ಕೋರಿಕೆ",
+  "FRMELEMNTS_LBL_SCHOOL": "ಶಾಲೆ",
+  "FRMELEMNTS_LBL_SELECT_CATEGORIES": "ವಿಭಾಗಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ",
+  "FRMELEMNTS_LBL_SELECT_PROGRAM": "ಪ್ರೊಗ್ರಾಮ್ ಆಯ್ಕೆ ಮಾಡಿ",
+  "FRMELEMNTS_LBL_SET_DATE": "ದಿನಾಂಕ ನಿಗದಿಮಾಡಿ",
+  "FRMELEMNTS_LBL_SET_DATE_HINT": "ನಿಮ್ಮ ಪ್ರೊಜೆಕ್ಟ್ ಗೆ ಕಾಲಮಿತಿ ನಿಗದಿಮಾಡಿ",
+  "FRMELEMNTS_LBL_SHARE_PROFILE_INFORMATION": "ನನ್ನ ಪ್ರೊಫೈಲ್ ವಿವರಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಿ ",
+  "FRMELEMNTS_LBL_START_DATE": "ಆರಂಭದ ದಿನಾಂಕ",
+  "FRMELEMNTS_LBL_STATUS": "ಸ್ಥಿತಿಗತಿ",
+  "FRMELEMNTS_LBL_SUBPERSONA": "ಉಪ-ಪಾತ್ರ",
+  "FRMELEMNTS_LBL_SUBTASKS": "ಸಬ್ ಟಾಸ್ಕ್",
+  "FRMELEMNTS_LBL_SURVEY": "ಸಮೀಕ್ಷೆ",
+  "FRMELEMNTS_LBL_SURVEY_ACTION": "ಸಮೀಕ್ಷೆ ಕ್ರಿಯೆಗಳು",
+  "FRMELEMNTS_LBL_SURVEY_DESC": "ಸಮೀಕ್ಷೆ ಪಟ್ಟಿ",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS": "ಸಮೀಕ್ಷಾ ವರದಿಗಳು",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS_DESC": "ಸಮೀಕ್ಷಾ ವರದಿಗಳನ್ನು ನೋಡಿ",
+  "FRMELEMNTS_LBL_TAB_HOME": "ಹೋಂ",
+  "FRMELEMNTS_LBL_TASK_DESCRIPTION": "ಟಾಸ್ಕ್ ವಿವರಣೆ",
+  "FRMELEMNTS_LBL_TASK_OVERVIEW": "ಟಾಸ್ಕ್ ಪಕ್ಷಿನೋಟ",
+  "FRMELEMNTS_LBL_THIS_MONTH": "ಈ ತಿಂಗಳು ",
+  "FRMELEMNTS_LBL_TOTAL_TASKS": "ಒಟ್ಟು ಟಾಸ್ಕ್",
+  "FRMELEMNTS_LBL_UPCOMING": "ಬರಲಿರುವುದು",
+  "FRMELEMNTS_LBL_UPDATE_DATA_SETTINGS": "ಸೆಟ್ಟಿಂಗ್ಸ್ ನವೀಕರಿಸಿ",
+  "FRMELEMNTS_LBL_USERTYPE_LEADER": "ಶಾಲಾ ಮುಖ್ಯಸ್ಥರು ಅಥವಾ ಅಧಿಕಾರಿಗಳು",
+  "FRMELEMNTS_LBL_VIEW_ENTITY_REPORT": "ಎಂಟಿಟಿ ವರದಿ ನೋಡಿ",
+  "FRMELEMNTS_LBL_VIEW_FULL_REPORT": "ಪೂರ್ಣ ವರದಿ ನೋಡಿ",
+  "FRMELEMNTS_LBL_VIEW_RESOURCES": "ಸಂಪನ್ಮೂಲಗಳನ್ನು ನೋಡಿ",
+  "FRMELEMNTS_MSG_BATCH_ALREADY_CLOSED": "ಈ ಬ್ಯಾಚ್ ಗೆ ದಾಖಲಾತಿಯು {endDate} ರಂದು ಮುಗಿದಿದೆ",
+  "FRMELEMNTS_MSG_CONSENT_DECLARATION_INFO": "ನೀವು ನಿಮ್ಮ ವಿವರಗಳನ್ನು ಪ್ರೊಫೈಲ್ ಪುಟದಿಂದ ಪರಿಷ್ಕರಿಸಬಹುದು",
+  "FRMELEMNTS_MSG_DATA_SETTINGS_SUBMITED_SUCCESSFULLY": "ನಿಮ್ಮ ಡೇಟಾ ಸೆಟ್ಟಿಂಗ್ಸ್ ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸಲ್ಲಿಸಲಾಯಿತು",
+  "FRMELEMNTS_MSG_DELETE_TASK_CONFIRMATION": "ನಿಮ್ಮ ಟಾಸ್ಕ್ ಡಿಲೀಟ್ ಮಾಡಲು ಖಾತ್ರಿಯಾಗಿ ಬಯಸುವಿರಾ?",
+  "FRMELEMNTS_MSG_EDITCERTNAME": "ನೀವು ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಪುಟದಿಂದ ಪರಿಷ್ಕರಿಸಬಹುದು.",
+  "FRMELEMNTS_MSG_LOAD_FROM_LIBRARY": "ಲೈಬ್ರರಿಯಿಂದ ಲೋಡ್ ಮಾಡಿ",
+  "FRMELEMNTS_MSG_NAMEONCERT": "ನಿಮ್ಮ ಕೋರ್ಸ್ ಪ್ರಮಾಣಪತ್ರದಲ್ಲಿ ಈ ಹೆಸರನ್ನು ಮುದ್ರಿಸಲಾಗುವುದು. ಸರಿಯಾಗಿದೆಯೇ ಎಂದು ಪರೀಕ್ಷಿಸಿ.",
+  "FRMELEMNTS_MSG_SELECT_IMAGE_SOURCE": "ಇಮೇಜ್ ಸೋರ್ಸ್ ಆಯ್ಕೆ ಮಾಡಿ ",
+  "FRMELEMNTS_MSG_SELFDECLARATION_SUCCESS_INFO": "ನಿಮ್ಮ ಪ್ರೊಫೈಲಿನಿಂದ ಈ ಮಾಹಿತಿಯನ್ನು ಪರಿಷ್ಕರಿಸಬಹುದು",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED": "ಯಶಸ್ವಿಯಾಗಿ ಅಟ್ಯಾಚ್ ಆಯಿತು",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_SYNCED": "ಪ್ರೊಜೆಕ್ಟ್ ಯಶಸ್ವಿಯಾಗಿ ಸಿಂಕ್ ಆಯಿತು",
+  "FRMELEMNTS_MSG_TICKET_SUBMISSION_SUCCESS": "ನಿಮ್ಮ ಹಿಮ್ಮಾಹಿತಿಗೆ ಧನ್ಯವಾದಗಳು. ಪ್ರತಿಯೊಂದು ಸಲಹೆಗೆ ಪ್ರತಿಕ್ರಿಯಿಸಲು ನಮಗೆ ಆಗಲಿಕ್ಕಿಲ್ಲ, ಆದರೆ ನಿಮ್ಮ ಹಿಮ್ಮಾಹಿತಿಯು  ನಮಗೆ ಅಮೂಲ್ಯವಾಗಿದ್ದು, {{app_name}} ಅನ್ನು ಇನ್ನಷ್ಟು ಉತ್ತಮಗೊಳಿಸಲು ಸಹಾಯವಾಗುತ್ತದೆ.",
+  "FRMELEMNTS_MSG_UNABLE_TO_ENROLL": "ಈಗ ನೀವು ಬ್ಯಾಚ್ ಬಿಡುವುದಕ್ಕೆ ಸಾಧ್ಯವಿಲ್ಲ. ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ",
+  "FRMELEMNTS_MSG_UPDATED_SUCCESSFULLY": "ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಯಿತು",
+  "FRMELEMNTS_MSG_USER_CREATION_LIMIT_EXCEEDED": "ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಅಡಿಯಲ್ಲಿ ನೀವು ನಿರ್ವಹಣೆ ಮಾಡಬಹುದಾದ ಬಳಕೆದಾರರ ಗರಿಷ್ಟ ಸಂಖ್ಯೆಯನ್ನು ಮೀರಿದ್ದೀರಿ",
+  "FRMELEMNTS_MSG_USE_CAMERA": "ಕೆಮರಾ ಬಳಸಿ",
+  "FRMELEMNTS_MSG_USE_FILE": "ಫೈಲ್  ಬಳಸಿ",
+  "FRMELEMNTS_MSG_YOUR_CHANGES_ARE_SAVED": "ನೀವು ಮಾಡಿದ ಬದಲಾವಣೆಗಳು ಯಶಸ್ವಿಯಾಗಿ ಸೇವ್ ಆಗಿದೆ. ",
+  "FRMELENTS_LBL_ACCESSIBILITYNORMALMODE": "ಲೈಟ್ ಮೋಡ್ ಗೆ ಹೋಗಿ",
+  "FRMELMNTS_BLTPT_EARNCERT": "ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು {{STATE}} ರಾಜ್ಯದ ಬಳಕೆದಾರರಿಗೆ ಮಾತ್ರವೇ ನೀಡಲಾಗುವುದು",
+  "FRMELMNTS_BLTPT_EARNCERT2": "ನಿಮ್ಮ ಎಲ್ಲ ಮೌಲ್ಯಾಂಕನಗಳಲ್ಲಿ ಮೇಲಿನ {{PERCENTAGE}} ಗಿಂತ ಹೆಚ್ಚು ಸ್ಕೋರ್",
+  "FRMELMNTS_BLTPT_EARNCERT3": "ನೀವು ಪ್ರಮಾಣಪತ್ರವನ್ನು ಪಡೆಯಲು ಮೌಲ್ಯಾಂಕನವನ್ನು  {{ATTEMPTS}} ಸಲ ಮಾತ್ರ ಪ್ರಯತ್ನಿಸಬಹುದು.",
+  "FRMELMNTS_IMSG_DECLAREINFO": "ಈ ಕೋರ್ಸ್ ಗೆ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ರಾಜ್ಯವು ಗುರುತಿಸಿದ ಶಿಕ್ಷಕರಿಗೆ ಮಾತ್ರವೇ ನೀಡಲಾಗುವುದು",
+  "FRMELMNTS_IMSG_LASTATTMPALRT": "ಇದು ಉಳಿದಿರುವ ಕೊನೆಯ ಪ್ರಯತ್ನ",
+  "FRMELMNTS_IMSG_LASTATTMPTEXCD": "ನೀವು  ಮೌಲ್ಯಮಾಪನವನ್ನು ಸಲ್ಲಿಸಬಹುದಾದ ಗರಿಷ್ಠ ಸಂಖ್ಯೆಯ ಪ್ರಯತ್ನಗಳ ಮಿತಿಯನ್ನು ಮೀರಿದ್ದೀರಿ",
+  "FRMELMNTS_LBL_ACCESSIBILITYFNTDFLT": "ಡಿಫಾಲ್ಟ್ ಗೆ ರಿಸೆಟ್ ಮಾಡಿ",
+  "FRMELMNTS_LBL_ACCESSIBILITYFONT": "ಫಾಂಟ್ ಗಾತ್ರ ಕಡಿಮೆ ಮಾಡಿ",
+  "FRMELMNTS_LBL_AVSCORE": "ಅತ್ಯುತ್ತಮ ಮೌಲ್ಯಾಂಕನ ಅಂಕಗಳ ಸರಾಸರಿ",
+  "FRMELMNTS_LBL_BESTSCORE": "ಅತ್ತ್ಯುತ್ತಮ ಅಂಕ {{SCORE}}",
+  "FRMELMNTS_LBL_CERTQUES": "ನೀವು ನಿಮ್ಮ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಹೇಗೆ ಗಳಿಸುವಿರಿ?",
+  "FRMELMNTS_LBL_NOTIFNUMBER": "{{NUMBER}} ಹೊಸ ಸೂಚನೆ(ಗಳು)",
+  "FRMELMNTS_LBL_SEELESS": "ಕಡಿಮೆ ನೋಡಿ",
+  "FRMELMNTS_LBL_SEEMORE": "ಇನ್ನೂ ಹೆಚ್ಚು ನೋಡಿ",
+  "FRMELMNTS_LBL_STATEUSERQUES": "ನೀವು ರಾಜ್ಯದ ಶಿಕ್ಷಕರೇ? ",
+  "FRMELMNTS_LNK_DECLARELINK": "ಈಗ ಘೋಷಿಸಿ",
+  "FRMELMNTS_PRMPT_DECLAREPROMPT": "ನಿಮ್ಮ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಪಡೆಯಲು {instance} ದಲ್ಲಿ ನಿಮ್ಮ ಮಾಹಿತಿಯನ್ನು ಘೋಷಿಸಿ",
+  "FRMELMNTS_SCTTL_NOTIFHEADER": "ಸೂಚನೆಗಳು",
   "FROM": "ಇಂದ",
   "FULL_NAME": "ಹೆಸರು",
+  "GET_STARTED": "ಈಗ ಆರಂಭಿಸಿ",
   "GOT_IT": "ಗೊತ್ತಾಯಿತು",
+  "GO_TO_DOWNLOADS": "ಡೌನ್ಲೋಡ್ ಗಳಿಗೆ ಹೋಗಿ",
+  "GO_TO_PROFILE": "ಪ್ರೊಫೈಲ್ ಗೆ ಹೋಗಿ",
   "GRADE_OPTION_TEXT": "ತರಗತಿ ಆಯ್ಕೆ ಮಾಡಿಕೊಳ್ಳಿ",
   "GRANT_ACCESS": "ಲಭ್ಯತೆ ಕೊಡಿ",
-  "GROUPS": "ಗುಂಪುಗಳು",
-  "GROUPS_YOU_FOLLOW": "ನೀವು ಹಿಂಬಾಲಿಸುವ ಗುಂಪುಗಳು",
-  "GROUP_CREATE_SUCCESS": "ಗುಂಪು ರಚನೆ ಯಶಸ್ವಿಯಾಯಿತು. ",
-  "GROUP_DELETE_CONFIRM": "'{{%s}}' ಡಿಲೀಟ್ ಮಾಡಲು ಖಚಿತಪಡಿಸಿ ",
-  "GROUP_DELETE_CONFIRM_MESSAGE": "ಈ ಕ್ರಿಯೆಯು ಗುಂಪನ್ನು ಡಿಲೀಟ್ ಮಾಡುತ್ತದೆ, ಆದರೆ ಬಳಕೆದಾರರನ್ನು ಅಲ್ಲ. 'ಬಳಕೆದಾರರ' ಟ್ಯಾಬ್ ನಲ್ಲಿ ಬಳಕೆದಾರರನ್ನು ಕಾಣಬಹುದು.",
-  "GROUP_MEMBER_ADD_SUCCESS": "ಸದಸ್ಯರನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸೇರಿಸಲಾಯಿತು",
-  "GROUP_MEMBER_DELETE_SUCCESS": "ಗುಂಪಿನ ಸದಸ್ಯರ ಡಿಲೀಟ್ ಯಶಸ್ವಿಯಾಯಿತು",
+  "GROUP_CREATED": "ಗುಂಪು ರಚನೆ ಯಶಸ್ವಿಯಾಯಿತು.",
+  "GROUP_CREATED_BY": "ರಚಿಸಿದವರು {{group_creator_name}}",
+  "GROUP_DESCRIPTION": "ಗುಂಪಿನ ವಿವರಣೆ",
+  "GROUP_DESCRIPTION_PLACEHOLDER": "ಗುಂಪಿನ ಉದ್ದೇಶಗಳನ್ನು ಸದಸ್ಯರು ಅರ್ಥ ಮಾಡಿಕೊಳ್ಳಲು ಒಂದು ವಿವರಣೆಯನ್ನು ಬರೆಯಿರಿ.",
+  "GROUP_GUIDELINES": "ಗುಂಪಿನ ಮಾರ್ಗದರ್ಶನಗಳು",
+  "GROUP_MEMBER_SEARCH_PLACEHOLDER": "ಗುಂಪಿನೊಳಗೆ ಹುಡುಕಿ",
   "GROUP_NAME": "ಗುಂಪಿನ ಹೆಸರು",
+  "GROUP_NAME_IS_REQUIRED": "ಗುಂಪಿನ ಹೆಸರನ್ನು ನಮೂದಿಸಬೇಕು",
+  "GROUP_TERMS_IS_REQUIRED": "ನೀವು ಮುಂದುವರೆಯುವ ಮೊದಲು {{app_name}} ಗುಂಪಿನ ಮರ್ಗದರ್ಶನಗಳನ್ನು ಒಪ್ಪಬೇಕು",
   "GROUP_UPDATE_SUCCESS": "ಗುಂಪಿನ ವಿವರಗಳನ್ನು ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಯಿತು",
   "HABIT_REMINDER_NOTIFICATION_MESSAGE": "{{%s}} ದಲ್ಲಿ ಇಂದು ಹೊಸತೇನಾದರೂ ಕಲಿಯಿರಿ! ",
   "HELP": "ಸಹಾಯ",
@@ -277,8 +642,9 @@
   "HIDE_CREDITS_INFO": "ಕ್ರೆಡಿಟ್ಸ್ ಮತ್ತು ಲೈಸೆನ್ಸ್ ಮಾಹಿತಿಯನ್ನು ಮರೆಮಾಡಿ",
   "HINT_LANGUAGE": "ಬೇಕಿರುವ ಭಾಷೆ ಆಯ್ಕೆ ಮಾಡಿ",
   "HOBBIES": "ಹವ್ಯಾಸಗಳು",
-  "IAM_ABOVE_18_YEARS_AGE": "ನಾನು 18 ವರ್ಷಕ್ಕಿಂತ ಮೇಲ್ಪಟ್ಟಿರುವೆ",
-  "IF_YES_LOGIN": "ಹೌದಾದರೆ, ಲಾಗಿನ್ ಕ್ಲಿಕ್ ಮಾಡಿ",
+  "HOURS_AGO": "{{%s}} ಗಂಟೆಗಳ ಹಿಂದೆ",
+  "HOUR_AGO": "{{%s}} ಗಂಟೆಯ ಹಿಂದೆ",
+  "ID_IS_REQUIRED": "ಐಡಿ ಅಗತ್ಯವಿದೆ",
   "IMPORTING": "ಇಂಪೋರ್ಟ್ ಆಗುತ್ತಿದೆ",
   "IMPORTING_COUNT": "ಇಂಪೋರ್ಟ್ ಆಗುತ್ತಿದೆ. ",
   "IMPORT_ECAR": " ಫೈಲ್ ನಮೂನೆ ಹೊಂದಾಣಿಕೆಯಾಗುತ್ತಿಲ್ಲ.  ನೀವು .ecar , .epar and .gsa  ಫೈಲ್ ಮಾತ್ರ ಇಂಪೋರ್ಟ್ ಮಾಡಬಹುದು.",
@@ -287,59 +653,97 @@
   "INACTIVE": "ನಿಷ್ಕ್ರಿಯ ",
   "INCORRECT_TEACHER_ID_ERROR": "ನೀವು ತಪ್ಪಾದ ಐಡಿಯನ್ನು ನಮೂದಿಸಿದ್ದೀರಿ. ಮತ್ತೊಮ್ಮೆ ಐಡಿ ನಮೂದಿಸಿ. ",
   "INSTALL_CROSSWALK": "ಕ್ರಾಸ್ ವಾಕ್  ಇನ್ಸ್ಟಾಲ್ ಮಾಡಿ",
+  "INSTANCE_TERMS_OF_USE": "{{app_name}} ಬಳಕೆಯ ಕರಾರುಗಳು",
   "INSUFFICIENT_STORAGE": "ಸಂಗ್ರಹ ಸ್ಥಳ ಸಾಕಷ್ಟು ಇಲ್ಲ",
   "INTERACTION": "ಇಂಟರಾಕ್ಟಿವ್",
+  "INTERACTIVE_MATERIAL": "ಇಂಟರಾಕ್ಟಿವ್ ಅಧ್ಯಯನ ಸಾಮಗ್ರಿ",
   "INTERNAL_MEMORY": "ಆಂತರಿಕ ಸಂಗ್ರಹ",
   "INTERNET_AVAILABLE": "ನೀವು ಈಗ ಆನ್ಲೈನಿನಲ್ಲಿ ಇದ್ದೀರಿ",
   "INTERNET_CONNECTIVITY_NEEDED": "ಅಂತರ್ಜಾಲ  ಸಂಪರ್ಕವಿಲ್ಲ",
   "INVALID_CONTENT": "ಅಮಾನ್ಯ ಪಠ್ಯಾಂಶ",
   "INVALID_FORMAT": "ಅಮಾನ್ಯ ನಮೂನೆ",
+  "INVALID_MEMBER_ID": "ನೀವು ಮಾನ್ಯವಲ್ಲದ  {{app_name}} ಐಡಿ ನಮೂದಿಸಿದ್ದೀರಿ",
   "INVALID_QR": "QR  ಸಂಕೇತ ತಪ್ಪಾಗಿದೆ",
   "ITEMS": "{{%s}} ಫೈಲುಗಳು",
   "ITEMS_SELECTED": "ಆಯ್ಕೆ ಮಾಡಿದ ಫೈಲುಗಳು",
+  "I_AGREE_TO": "ನಾನು ಒಪ್ಪುವೆನು {{app_name}}",
   "I_AGREE_TO_TNC": "ಬಳಕೆಯ ಕರಾರುಗಳು ಮತ್ತು ಷರತ್ತುಗಳನ್ನು ಒಪ್ಪುತ್ತೇನೆ",
-  "JOIN_TRAINING": "ತರಬೇತಿಗೆ ಸೇರಿ",
+  "I_AM_A_PERSONA_WITH_TENANT": "ನಾನು ‪{{%tenant}}‬ ಜೊತೆಗೆ ‪{{%persona}}‬",
+  "I_UNDERSTAND_AND_ACCEPT": "ನಾನು ಅರ್ಥಮಾಡಿಕೊಂಡು, ಒಪ್ಪುತ್ತೇನೆ",
+  "JOIN_TRAINING": " ಕೋರ್ಸ್ ಗೆ ಸೇರಿ",
   "LANGUAGE": "ಭಾಷೆ",
   "LANGUAGE_SETTINGS": "ಭಾಷೆಯ ಸೆಟ್ಟಿಂಗ್ಸ್",
-  "LAST_DATE_TO_JOIN": "ಸೇರಲು ಕೊನೆಯ ದಿನಾಂಕ",
+  "LAST_DATE_TO_JOIN": "  ಸೇರಲು ಕೊನೆಯ ದಿನಾಂಕ {{%s}}",
   "LAST_SYNC": "ಕೊನೆ ಸಲ ಸಿಂಕ್ ಆದ ದಿನಾಂಕ",
+  "LAST_UPDATED": "ಕೊನೆಯಬಾರಿ ನವೀಕರಿಸಿದ್ದು ‪{{%s}}‬ ",
   "LAST_VIEWED": "ಕೊನೆಯ ಬಾರಿ ನೋಡಿದ್ದು",
-  "LATEST_COURSES": "ಇತ್ತೀಚಿನ  ತರಬೇತಿಗಳು",
-  "LEAVE_TRAINING_HEADING": "ತರಬೇತಿಯನ್ನು ಬಿಡುತ್ತೀರಾ? ",
+  "LATEST_COURSES": "ಇತ್ತೀಚಿನ  ಕೋರ್ಸ್ ಗಳು",
+  "LEAVE_GROUP": "ಗುಂಪನ್ನು ಬಿಡಿ",
+  "LEAVE_GROUP_ERROR_MSG": "ಗುಂಪನ್ನು ಬಿಡಲು ಆಗಲಿಲ್ಲ. ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ.",
+  "LEAVE_GROUP_POPUP_DESC": " ಈ ಕ್ರಿಯೆಯನ್ನುಒಮ್ಮೆ ಮಾಡಿದ್ದನ್ನು ರದ್ದುಪಡಿಸಲು  ಸಾಧ್ಯವಿಲ್ಲ. ನೀವು {{group_name}} ಬಿಡಲು ಇಚ್ಛಿಸಿದ್ದೀರಾ? ",
+  "LEAVE_GROUP_POPUP_TITLE": "ಗುಂಪು ಬಿಡುವಿರಾ?",
+  "LEAVE_GROUP_SUCCESS_MSG": "ನೀವು ಇನ್ನು ಮುಂದೆ ಈ ಗುಂಪಿನ ಭಾಗವಲ್ಲ",
+  "LEAVE_TRAINING_HEADING": "ಕೋರ್ಸ್  ಅನ್ನು ಬಿಡುತ್ತೀರಾ? ",
   "LIBRARY_BNAV": "ಗ್ರಂಥಾಲಯ",
-  "LICENSE": "ಪರವಾನಗಿ ನಿಯಮಗಳು",
+  "LICENSE": "ಪರವಾನಗಿ  ಕರಾರುಗಳು",
   "LOAD": "ಲೋಡ್  ಮಾಡಿ",
+  "LOADER_PROGRESS_DESCRIPTION": "ಎಲ್ಲವನ್ನು ಸಿದ್ಧ ಮಾಡುತ್ತಿದ್ದೇವೆ",
+  "LOADER_PROGRESS_DESC_SUB_HEADING": "ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ...",
   "LOADING_CONTENT": "ಪಠ್ಯಾಂಶ ಲೋಡ್ ಆಗುತ್ತಿದೆ",
   "LOADING_CONTENTS": " {{%s}}% ಕಂಟೆಂಟ್ ಲೋಡ್ ಆಗುತ್ತಿದೆ",
-  "LOADING_USER_LIST": "ಬಳಕೆದಾರರ ಪಟ್ಟಿ ಲೋಡ್ ಆಗುತ್ತಿದೆ, ದಯವಿಟ್ಟು ಕಾಯಿರಿ. ",
   "LOAD_FILE": "ಫೈಲ್ ಲೋಡ್ ಮಾಡಿ",
-  "LOGGED_IN_AS": "ಹೀಗೆ ಲಾಗಿನ್ ಆಗಿ",
-  "LOGGED_OUT": "ಲಾಗ್ ಔಟ್ ಆಯಿತು",
+  "LOGGED_IN_MEMBER": "{{member_name}} (ನೀವು)",
+  "LOGIN_TO_CREATE_GROUP_DESCRIPTION": "ನಿಮ್ಮದೇ ಗುಂಪು, ಅಧ್ಯಯನ ಗುಂಪು ಅಥವಾ ತರಗತಿಕೋಣೆಯನ್ನು ರಚಿಸಲು, ಮೊದಲು ನೀವು ಲಾಗಿನ್ ಆಗಬೇಕು",
+  "LOGIN_TO_JOIN_TRAINING": "ಕೋರ್ಸ್ ಸೇರಲು ಲಾಗಿನ್ ಆಗಿ",
   "LOGOUT": "ಲಾಗ್ ಔಟ್ ಆಗಿ",
   "LOW_BANDWIDTH": "ಕಡಿಮೆ ಬ್ಯಾಂಡ್ ವಿಡ್ತ್ ",
   "LOW_BANDWIDTH_DETECTED": "ಕಡಿಮೆ ಬ್ಯಾಂಡ್ ವಿಡ್ತ್  ನೆಟ್ ವರ್ಕ್ ಕಂಡುಬಂದಿದೆ",
-  "MARKS": "ಅಂಕಗಳು",
+  "MAINTENANCE_MESSAGE": "ನಾವು ಸದ್ಯ ಇದರ  ನಿರ್ವಹಣೆ ಮಾಡುತ್ತಿದ್ದೇವೆ, ಆದರೆ ಚಿಂತೆ ಬೇಡ,  ‪{{%timeLeft}}‬ ಗಂಟೆಗಳಲ್ಲಿ ಇದು ಸರಿಹೋಗುತ್ತದೆ. ನೀವು ಮತ್ತೆ ಬೇಗನೆ ಬನ್ನಿ!",
+  "MAINTENANCE_SUB_TEXT": "ನೀವು ಡೌನ್ಲೋಡ್ ಮಾಡಿದ ಪಠ್ಯಾಂಶಗಳನ್ನು ಈಗಲೂ ನೋಡಬಹುದು",
+  "MAKE_ADMIN": "ಅಡ್ಮಿನ್ ಮಾಡಿ",
+  "MAKE_GROUP_ADMIN_ERROR_MSG": "{{member_name}} ಅವರನ್ನು ಗುಂಪಿನ ಅಡ್ಮಿನ್ ಮಾಡಲು ಆಗಲಿಲ್ಲ",
+  "MAKE_GROUP_ADMIN_POPUP_DESC": "ಈ ಕ್ರಿಯೆಯು  {{member_name}}  ಗುಂಪು ಅಡ್ಮಿನ್ ಒಪ್ಪಿಗೆಗಳನ್ನು ಕೊಡುವುದು",
+  "MAKE_GROUP_ADMIN_POPUP_TITLE": "ಗುಂಪು ಅಡ್ಮಿನ್ ಮಾಡುವಿರಾ?",
+  "MAKE_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} ಈಗ ಗುಂಪಿನ ಅಡ್ಮಿನ್ ಆಗಿದ್ದಾರೆ",
   "MEDIUM": "ಮಾಧ್ಯಮ",
   "MEDIUM_OF_INSTRUCTION": "ಬೋಧನಾ ಮಾಧ್ಯಮ",
   "MEDIUM_OPTION_TEXT": "ಮಾಧ್ಯಮ ಆಯ್ಕೆ ಮಾಡಿ",
+  "MEMBERS": "ಸದಸ್ಯರು",
+  "MEMBER_ADDED_TO_GROUP": "ಗುಂಪಿಗೆ ಸದಸ್ಯರನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸೇರಿಸಲಾಯಿತು. ",
+  "MEMBER_ALREADY_EXISTS_IN_GROUP": "ಈ ಸದಸ್ಯರನ್ನು ಈಗಾಗಲೇ ಗುಂಪಿನ ಭಾಗವಾಗಿದ್ದಾರೆ",
+  "MEMBER_ID": "{{app_name}} ಐಡಿ",
+  "MENU_DELETE_GROUP": "ಗುಂಪು ಡಿಲೀಟ್ ಮಾಡಿ",
+  "MENU_DISMISS_AS_GROUP_ADMIN": "ಗುಂಪು ಅಡ್ಮಿನ್ ಆಗಿ ತೆಗೆದುಹಾಕಿ",
+  "MENU_EDIT_GROUP_DETAILS": "ಗುಂಪಿನ ವಿವರಗಳನ್ನು ಪರಿಷ್ಕರಿಸಿ",
+  "MENU_LEAVE_GROUP": "ಗುಂಪನ್ನು ಬಿಡಿ",
+  "MENU_MAKE_GROUP_ADMIN": "ಗುಂಪು ಅಡ್ಮಿನ್ ಮಾಡಿ",
+  "MENU_REMOVE_ACTIVITY": "ಚಟುವಟಿಕೆಯನ್ನು ತೆಗೆದುಹಾಕಿ",
+  "MENU_REMOVE_FROM_GROUP": "ಗುಂಪಿನಿಂದ ತೆಗೆದುಹಾಕಿ",
   "MERGE_ACCOUNT": "ಖಾತೆ  ವಿಲೀನಗೊಳಿಸಿ",
   "MICROPHONE": "ಮೈಕ್ರೋಫೋನ್",
   "MICROPHONE_PERMISSION_DESCRIPTION": "  ನಿಮ್ಮ ಮಾತನ್ನು ರೆಕಾರ್ಡ್ ಮಾಡಲು ಆಸ್ಪದವಿರುವ ಕಂಟೆಂಟ್ ಗಳಲ್ಲಿ ಮಾತ್ರವೇ  ಮೈಕ್ರೋಫೋನ್ ಒಪ್ಪಿಗೆಯನ್ನು {{%s}} ಬಳಸುತ್ತದೆ. ",
+  "MINUTES_AGO": "{{%s}} ನಿಮಿಷಗಳ ಹಿಂದೆ ",
+  "MINUTE_AGO": "{{%s}} ನಿಮಿಷಗಳ ಹಿಂದೆ",
+  "MONTHS_AGO": "{{%s}} ತಿಂಗಳಗಳ ಹಿಂದೆ",
+  "MONTH_AGO": "{{%s}} ತಿಂಗಳು ಹಿಂದೆ",
   "MORE": "ಇನ್ನೂ ಹೆಚ್ಚು",
   "MORE_CONTENT": "{{%s}} ದಲ್ಲಿ ಹೆಚ್ಚು ಪುಸ್ತಕಗಳು ಮತ್ತು ಪಠ್ಯಾಂಶವನ್ನು ನೋಡಿ",
+  "MORE_COUNT": " ಹೆಚ್ಚು ({{%s}})",
   "MORE_DETAILS": "ಹೆಚ್ಚಿನ ಮಾಹಿತಿ (ಅಗತ್ಯವಿದ್ದರೆ, ಸಮಸ್ಯೆ ಕುರಿತು ಹೆಚ್ಚಿನ ಮಾಹಿತಿ ಅಥವಾ ಸ್ಕ್ರೀನ್ ಶಾಟ್ ಅನ್ನು ಒದಗಿಸಿ) ",
   "MOVE": "ಮೂವ್",
   "MOVE_FILES_TO_OTHER_DESTINATION": "ಸ್ಥಳಾವಕಾಶ ಮಾಡಲು, {{%s}} ಗೆ ಫೈಲುಗಳನ್ನು ವರ್ಗಾಯಿಸಿ",
   "MSG_ALREADY_IMPORTED": "ಈಗಾಗಲೇ ಇಂಪೋರ್ಟ್ ಆಗಿದೆ",
   "MSG_IMPORTED_SUCCESSFULLY": "ಕಂಟೆಂಟ್ ಇಂಪೋರ್ಟ್ ಯಶಸ್ವಿಯಾಯಿತು. ",
-  "MSG_LOADING_BATCHES": "ಬ್ಯಾಚ್ ಪಡೆಯಲಾಗುತ್ತಿದೆ",
   "MSG_NO_DETAILS_TO_SHOW": "ವಿವರಗಳು ಲಭ್ಯವಿಲ್ಲ",
   "MSG_NO_NEW_NOTIFICATION": "ಯಾವುದೇ ಹೊಸ ನೋಟಿಫಿಕೇಷನ್ ಗಳಿಲ್ಲ",
   "MSG_RESOURCE_DELETED": "ಡಿವೈಸಿನಿಂದ ಕಂಟೆಂಟ್ ಡಿಲೀಟ್ ಆಗಿದೆ ",
   "MULTIPLE_LICENSE": "ಲೈಸೆನ್ಸ್ ಕರಾರುಗಳು {{%s}}",
   "MY_BADGES": "ನನ್ನ ಬ್ಯಾಡ್ಜ್ ಗಳು",
+  "MY_DETAILS": "ನನ್ನ ವಿವರಗಳು",
+  "MY_GROUPS": "ನನ್ನ ಗುಂಪುಗಳು",
   "NAME": "ಹೆಸರು",
   "NAME_HINT": "ಹೆಸರು ನಮೂದಿಸಿ",
+  "NAME_IS_REQUIRED": "ಬಳಕೆದಾರರ ಹೆಸರನ್ನು ನಮೂದಿಸಬೇಕು",
   "NEED_INTERNET_FOR_DEEPLINK_CONTENT": "ನೀವು ಆಫ್ಲೈನ್ ಆಗಿದ್ದೀರಿ. ಪಠ್ಯಾಂಶವನ್ನು ಪಡೆಯಲು ಅಂತರ್ಜಾಲ ಸಂಪರ್ಕ ಹೊಂದಿರಿ. ",
   "NEED_INTERNET_TO_CHANGE": "ವೈಫೈ ಅಥವಾ ಮೊಬೈಲ್ ಡೇಟಾ ಆನ್ ಮಾಡಿ ಮತ್ತು ಪುನಃ ಪ್ರಯತ್ನಿಸಿ. ",
   "NEW": "ಹೊಸ",
@@ -347,36 +751,32 @@
   "NEXT": "ಮುಂದೆ",
   "NIL": "ಏನೂ ಇಲ್ಲ",
   "NO": "ಇಲ್ಲ",
+  "NOTE": "ಟಿಪ್ಪಣಿ ",
   "NOTIFICATION": "ನೋಟಿಫಿಕೇಷನ್",
   "NOT_AVAILABLE": "ಲಭ್ಯವಿಲ್ಲ",
   "NOT_NOW": "ಈಗಲ್ಲ",
   "NO_APP_FOR_INTENT": "ಫೈಲ್ ತೆರೆಯಲು ಯಾವುದೇ ಆಪ್ ಲಭ್ಯವಿಲ್ಲ",
-  "NO_ASSESSMENT": "ಯಾವುದೇ ಮೌಲ್ಯಮಾಪನ ಲಭ್ಯವಿಲ್ಲ",
   "NO_BATCHES_AVAILABLE": "ಯಾವುದೇ ಬ್ಯಾಚ್ ಲಭ್ಯವಿಲ್ಲ",
   "NO_BOOKS_AVAILABLE": "ಮಂಡಳಿಯು ಪುಸ್ತಕಗಳನ್ನು ಸೇರಿಸುತ್ತಿದೆ",
-  "NO_BOOKS_DEFINITION": "ನಿಮ್ಮ ಮಂಡಳಿಯು  ಹೆಚ್ಚು ಪುಸ್ತಕಗಳನ್ನು ಇನ್ನೂ ಸೇರಿಸಬೇಕಿದೆ.  {{%s}} ದಲ್ಲಿ ಹೆಚ್ಚು ಪುಸ್ತಕಗಳನ್ನು ಮತ್ತು ಪಠ್ಯಾಂಶಗಳನ್ನು ನೋಡಲು ಬಟನ್ ಒತ್ತಿ. ",
+  "NO_BOOKS_DEFINITION": "ನಿಮ್ಮ ಮಂಡಳಿಯು ಪುಸ್ತಕಗಳನ್ನು ಇನ್ನೂ ಸೇರಿಸಬೇಕಿದೆ.  {{%s}} ದಲ್ಲಿ ಹೆಚ್ಚು ಪಠ್ಯಾಂಶಗಳು ಬೇಕೆಂದು ಹೇಳಲು,<b>See more books and content</b> ಬಟನ್ ಒತ್ತಿ. ",
+  "NO_BOOKS_TEXT": "ನಿಮ್ಮ ವಿಷಯದ ಪಠ್ಯಪುಸ್ತಕಗಳು {{%s}} ದಲ್ಲಿ ಕಾಣಲಿಲ್ಲವೇ? ",
   "NO_CONTENTS": "ಇಲ್ಲ {{%s}}",
   "NO_CONTENTS_FOUND": "ಕಂಟೆಂಟ್ ಸಿಗಲಿಲ್ಲ",
-  "NO_CONTENTS_MESSAGE": "ಬೇರೆ ವಿಧದ ಕಂಟೆಂಟ್ ಆಯ್ಕೆ ಮಾಡಿರಿ",
+  "NO_CONTENTS_MESSAGE": "ಬೇರೆ ವಿಧದ ಪಠ್ಯಾಂಶ ಆಯ್ಕೆ ಮಾಡಿರಿ",
+  "NO_CONTENT_AVAILABLE_IN_MODULE": "ಈ ಮಾಡ್ಯೂಲಿನಲ್ಲಿ ಯಾವುದೇ ಪಠ್ಯಾಂಶ ಲಭ್ಯವಿಲ್ಲ",
+  "NO_COURSES": "ಕೋರ್ಸ್ ಗಳು ಇಲ್ಲ",
   "NO_DATA_FOUND": "ಯಾವುದೇ ಡೇಟಾ ಸಿಗಲಿಲ್ಲ",
-  "NO_DESCRIPTION": "ವಿವರಣೆ ಲಭ್ಯವಿಲ್ಲ",
   "NO_DOWNLOADS": "ಇನ್ನೂ ಯಾವುದೇ ಡೌನ್ಲೋಡ್ ಗಳು ಇಲ್ಲ",
-  "NO_DOWNLOADS_INFO": "ತರಬೇತಿಯಿಂದ ಅಥವಾ ಲೈಬ್ರರಿಯಿಂದ ಪಠ್ಯಾಂಶವನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
+  "NO_DOWNLOADS_INFO": "ಕೋರ್ಸ್  ಅಥವಾ ಲೈಬ್ರರಿಯಿಂದ ಪಠ್ಯಾಂಶವನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
   "NO_FILTERS_SELECTED": "ಫಿಲ್ಟರ್ ಆಯ್ಕೆ ಮಾಡಿಕೊಂಡಿಲ್ಲ",
-  "NO_GROUPS_CREATED_YET": "ಇನ್ನೂ ಗುಂಪು ರಚನೆ ಆಗಿಲ್ಲ",
-  "NO_GROUP_MESSAGE": "ಗುಂಪುಗಳು ಬಳಕೆದಾರರಿಗೆ ಚೆನ್ನಾಗಿ ಸಂಘಟನೆ ಮಾಡಲು ಸಹಾಯ ಮಾಡುತ್ತದೆ. ನೀವು ಪ್ರಗತಿಯನ್ನು ಉತ್ತಮವಾಗಿ ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಲು ಗುಂಪುಗಳನ್ನು ಬಳಸಿಕೊಳ್ಳಬಹುದು. ",
   "NO_INTERNET": "ಅಂತರ್ಜಾಲ ಲಭ್ಯತೆ ಇಲ್ಲ",
   "NO_INTERNET_TITLE": "ನೀವು ಆಫ್ ಲೈನ್ ಆಗಿದ್ದೀರಿ",
   "NO_PREVIEW": "ಪ್ರಿವ್ಯೂ ಲಭ್ಯವಿಲ್ಲ",
   "NO_QR_CODE": "ನನ್ನ ಬಳಿ QR ಕೋಡ್ ಇಲ್ಲ",
   "NO_QR_CODE_QSTN": "QR ಕೋಡ್ ಇಲ್ಲವೇ? ",
   "NO_RATING": "ಇನ್ನೂ ರೇಟಿಂಗ್ ಮಾಡಿಲ್ಲ",
-  "NO_USERS": "ಬಳಕೆದಾರರು ಇಲ್ಲ",
-  "NO_USERS_CREATED_YET": "ಇನ್ನೂ ಬಳಕೆದಾರರು ಇಲ್ಲ",
-  "NO_USERS_CREATED_YET_MSG": "ನಿಮ್ಮ ವಿದ್ಯಾರ್ಥಿಗಳಿಗೆ/ಬೇರೆ ಶಿಕ್ಷಕರಿಗೆ ಅತಿಥಿ ಬಳಕೆದಾರ ಖಾತೆಗಳನ್ನು ನೀವು ರಚಿಸಬಹುದು. ",
-  "NO_USERS_IN_THIS_GROUP": "ಈ ಗುಂಪಿನಲ್ಲಿ ಯಾವುದೇ ಬಳಕೆದಾರರು ಇಲ್ಲ. ",
-  "NO_USERS_ON_THIS_DEVICE": "ಈ ಡಿವೈಸಿಗೆ ಯಾರೂ ಬಳಕೆದಾರರು ಇಲ್ಲ",
-  "NO_USERS_SUGGESTION_MESSAGE": "ಒಂದು ಗುಂಪು ಕನಿಷ್ಠ ಒಬ್ಬರು ಬಳಕೆದಾರರನ್ನು ಹೊಂದಿರಬೇಕು.",
+  "NUMBER_OF_COURSES": "{{%s}} ಕೋರ್ಸ್ ಗಳು",
+  "NUMBER_OF_COURSE_1": "({{%s}}) ಕೋರ್ಸ್ ಗಳು",
   "NUMBER_OF_VOTES": "ವೋಟ್ ಗಳ ಸಂಖ್ಯೆ",
   "OFF": "ಆಫ್",
   "OFFLINE_DOWNLOAD_MESSAGE": "ಅಂತರ್ಜಾಲ ಸಂಪರ್ಕ ಇದ್ದಾಗ ಡೌನ್ಲೋಡ್ ಗಳು ತಾವಾಗಿಯೇ ಶುರುವಾಗುತ್ತವೆ",
@@ -384,6 +784,8 @@
   "OFFLINE_WARNING_ETBUI": "ಪಠ್ಯಾಂಶ ನೋಡಲು ಅಂತರ್ಜಾಲಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿ",
   "OFFLINE_WARNING_ETBUI_1": "ಪಠ್ಯಾಂಶಗಳನ್ನು ನೋಡಲು ಅಂತರ್ಜಾಲಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿರಿ ",
   "OKAY": "ಓಕೆ",
+  "ONGOING": "ನಡೆಯುತ್ತಿರುವುದು",
+  "ONLY_DIGIT_NUMBER_IS_ALLOWED": " 11 ಅಂಕೆಯ ಸಂಖ್ಯೆ ಮಾತ್ರ ಹಾಕಬಹುದು",
   "ONLY_DOWNLOADED_CONTENT_CAN_BE_PLAYED_OFFLINE": "ಡೌನ್ಲೋಡ್ ಮಾಡಿದ ಪಠ್ಯಾಂಶವನ್ನು ಮಾತ್ರ ಆಫ್ ಲೈನಿನಲ್ಲಿ ನೋಡಬಹುದು",
   "OPEN": "ತೆರೆಯಿರಿ",
   "OPEN_SETTINGS": "ಸೆಟ್ಟಿಂಗ್ಸ್ ತೆರೆಯಿರಿ",
@@ -393,16 +795,15 @@
   "ORIGINAL_CONTENT": "ಪಠ್ಯಾಂಶ",
   "ORIGINAL_CONTENT_DATA": "ಈ ಕಂಟೆಂಟ್ ಅನ್ನು ಇಲ್ಲಿಂದ ಪಡೆಯಲಾಗಿದೆ:",
   "OTHER_ROLE_DESC_1": "ಡಿಜಿಟಲ್ ಪಠ್ಯಾಂಶ ಬ್ರೌಸ್ ಮಾಡಿ",
-  "OTHER_ROLE_DESC_2": "ಆನ್ಲೈನ್ ತರಬೇತಿ ತೆಗೆದುಕೊಳ್ಳಿ",
-  "OTHER_USERS": "ಬೇರೆ ಬಳಕೆದಾರರು",
+  "OTHER_ROLE_DESC_2": "ಆನ್ಲೈನ್ ಕೋರ್ಸ್  ತೆಗೆದುಕೊಳ್ಳಿ",
   "OTP_FAILED": "ಒಟಿಪಿ ಮಾನ್ಯಮಾಡಲು ವಿಫಲವಾಯಿತು. ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ",
   "OTP_PLACEHOLDER": "ಒಟಿಪಿಯನ್ನು ನಮೂದಿಸಿ",
   "OTP_RESENT": "ಒಟಿಪಿಯನ್ನು ಪುನಃ ಕಳಿಸಲಾಯಿತು",
   "OVERLAY_INFO_TEXT_COMMON": "ಎಲ್ಲ ಸೌಕರ್ಯಗಳ ಲಭ್ಯತೆಗೆ ಲಾಗಿನ್ ಆಗಿ  ",
-  "OVERLAY_INFO_TEXT_TAKE_COURSE": "ತರಬೇತಿಗಳು ನೋಂದಾಯಿಸಿದ ಬಳಕೆದಾರರಿಗೆ ಮಾತ್ರ.  ತರಬೇತಿಗಾಗಿ ಲಾಗಿನ್ ಆಗಿ",
+  "OVERLAY_INFO_TEXT_TAKE_COURSE": "ಕೋರ್ಸ್ ಗಳು ನೋಂದಾಯಿಸಿದ ಬಳಕೆದಾರರಿಗೆ ಮಾತ್ರ.  ಕೋರ್ಸ್ ಗಾಗಿ ಲಾಗಿನ್ ಆಗಿ",
   "OVERLAY_LABEL_COMMON": "{{%s}} ಗೆ ಮಿತಿಯಿಲ್ಲದ ಲಭ್ಯತೆ ಹೊಂದಿ.",
   "OVERLAY_LABEL_HOME": "ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಹೋಂ ಟ್ಯಾಬ್",
-  "OVERLAY_LABEL_TAKE_COURSE": "ತರಬೇತಿಗೆ ಸೇರಲು ಲಾಗ್ ಇನ್ ಮಾಡಿ",
+  "OVERLAY_LABEL_TAKE_COURSE": "ಕೋರ್ಸ್  ಗೆ ಸೇರಲು ಲಾಗ್ ಇನ್ ಆಗಿ",
   "OVERLAY_SIGN_IN": "ಲಾಗಿನ್",
   "OVER_WIFI": "ವೈಫೈ ಮೇಲೆ",
   "PEOPLE_WHO_FOLLOW_YOU": "ಅನುಯಾಯಿಗಳು",
@@ -414,35 +815,43 @@
   "PERMISSION_REQUIRED_TITLE": "ನಿಮಗೆ ಒಳ್ಳೆಯ ಅನುಭವ ನೀಡಲು  ಕೆಳಗಿನದನ್ನು ಪಡೆಯಲು  {{%s}} ಒಪ್ಪಿಗೆ ಬೇಕು",
   "PERMISSION_SETTING_MSG": "ಅನುಮತಿ ಕೊಡಲು, ಸೆಟಿಂಗ್ಸ್ ತೆರೆಯಿರಿ",
   "PHONE": "ಫೋನ್",
-  "PHONE_EDIT_SUCCESS": "ಮೊಬೈಲ್ ಸಂಖ್ಯೆಯನ್ನು ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ",
-  "PHONE_PLACEHOLDER": "ಮೊಬೈಲ್ ನಂಬರ್",
-  "PHONE_UPDATE_SUCCESS": "ಮೊಬೈಲ್ ಸಂಖ್ಯೆಯನ್ನು ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಯಿತು",
+  "PHONE_EDIT_SUCCESS": "ಮೊಬೈಲ್ ಸಂಖ್ಯೆ ಅಪ್ಡೇಟ್ ಯಶಸ್ವಿಯಾಯಿತು  ",
+  "PHONE_PLACEHOLDER": "ಮೊಬೈಲ್ ಸಂಖ್ಯೆ",
+  "PHONE_UPDATE_SUCCESS": "ಮೊಬೈಲ್ ಸಂಖ್ಯೆ ಅಪ್ಡೇಟ್ ಯಶಸ್ವಿಯಾಯಿತು",
+  "PLANNED_MAINTENANCE_TEXT": "ನಾವು ಸದ್ಯ ಇದರ ನಿರ್ವಹಣೆ ಮಾಡುತ್ತಿದ್ದೇವೆ, ಆದರೆ ಚಿಂತೆ ಬೇಡ, ಶೀಘ್ರದಲ್ಲಿಯೇ ಸರಿಹೋಗುತ್ತದೆ",
+  "PLANNED_MAINTENANCE_TEXT_WITH_TIME": "ನಾವು ಸದ್ಯ ಇದರ ನಿರ್ವಹಣೆ ಮಾಡುತ್ತಿದ್ದೇವೆ, ಆದರೆ ಚಿಂತೆ ಬೇಡ, ಶೀಘ್ರದಲ್ಲಿಯೇ ಸರಿಹೋಗುತ್ತದೆ",
   "PLAY": "ಪ್ಲೇ ಮಾಡಿ",
   "PLAY_AS": "ಹೀಗೆ ಪ್ಲೇ ಮಾಡಿ",
   "PLAY_FROM_DEVICE": "ಡಿವೈಸಿನಿಂದ ಪ್ಲೇ ಮಾಡಿ",
   "PLAY_ONLINE": "ಆನ್ಲೈನಿನಲ್ಲಿ ಪ್ಲೇ ಮಾಡಿ",
   "PLEASE_DOWNLOAD_TO_PLAY": "ಪ್ಲೇ ಮಾಡಲು ದಯವಿಟ್ಟು ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
+  "PLEASE_ENTER": "ನಮೂದಿಸಿ {{%s}}",
+  "PLEASE_PROVIDE_FOLLOWING_DETAILS": "ದಯವಿಟ್ಟು ಕೆಳಗಿನ ವಿವರಗಳನ್ನು ನೀಡಿ",
   "PLEASE_SELECT": " {{%s}} ಆಯ್ಕೆ ಮಾಡಿ",
   "PLEASE_SELECT_A_LANGUAGE": " ಭಾಷೆ  ಆಯ್ಕೆ ಮಾಡಿ",
-  "PLEASE_SELECT_USER": "ಒಬ್ಬರು ಬಳಕೆದಾರರನ್ನು ಆಯ್ಕೆ ಮಾಡಿಕೊಳ್ಳಿ.",
-  "POPULAR_COURSES": "ಜನಪ್ರಿಯ ತರಬೇತಿಗಳು",
+  "PLEASE_VALIDATE_YOUR_EMAIL_ADDRESS": "ನಿಮ್ಮ ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ವ್ಯಾಲಿಡೇಟ್ ಮಾಡಿ",
+  "PLEASE_VALIDATE_YOUR_MOBILE_NUMBER": "ನಿಮ್ಮ ಮೊಬೈಲ್ ಸಂಖ್ಯೆಯನ್ನು ವ್ಯಾಲಿಡೇಟ್ ಮಾಡಿ",
+  "POPULAR_COURSES": "ಜನಪ್ರಿಯ ಕೋರ್ಸ್ ಗಳು",
+  "POWER_OF_GROUPS": "ಗುಂಪುಗಳ ಸಾಮರ್ಥ್ಯವನ್ನು ಇನ್ನೂ ನೀವು ಕಂಡುಕೊಂಡಿಲ್ಲವೇ?",
+  "PREFERENCES_CAN_BE_UPDATED": "ಬಳಕೆದಾರರ ವಿವರಗಳನ್ನು ಪ್ರೊಫೈಲ್ ಪುಟದಿಂದ ಪರಿಷ್ಕರಿಸಬಹುದು",
   "PREVIEWS": "ಪ್ರಿವ್ಯೂಗಳು",
   "PREVIOUS_USER_SETTINGS": "ನೀವು ಈ ಮೊದಲಿನ ಬಳಕೆದಾರರ ಸೆಟಿಂಗ್ಸ್ ಅನ್ನು ಬಳಸಲು ಬಯಸುವಿರಾ? ",
   "PRINT": "ಮುದ್ರಿಸಿ",
-  "PRIVATE": "ಖಾಸಗಿ",
+  "PRIVACY_POLICY": "ಗೌಪ್ಯತಾ ನೀತಿ",
   "PROFILE_BNAV": "ಪ್ರೊಫೈಲ್",
   "PROFILE_DETAILS_TITLE": "ಪ್ರೊಫೈಲ್ ವಿವರಗಳು",
   "PROFILE_UPDATE_FAILED": "ಪ್ರೊಫೈಲ್ ಅಪ್ ಡೇಟ್ ವಿಫಲವಾಯಿತು, ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ",
   "PROFILE_UPDATE_SUCCESS": "ಪ್ರೊಫೈಲ್ ಯಶಸ್ವಿಯಾಗಿ ಅಪ್ ಡೇಟ್ ಆಯಿತು",
+  "PROGRAMS_DESC": "ನಿಮ್ಮ ಸ್ಥಳ ಮತ್ತು ನೀವು ಆಯ್ಕೆ ಮಾಡಿದ ಪಾತ್ರಕ್ಕೆ ಅನುಗುಣವಾಗಿ ವಿನ್ಯಾಸಪಡಿಸಿದ ಸಕ್ರಿಯ ಶೈಕ್ಷಣಿಕ ಕಾರ್ಯಕ್ರಮಗಳನ್ನು ನೋಡಿ ಮತ್ತು ಅದರಲ್ಲಿ ಭಾಗವಹಿಸಿ",
+  "PROGRESS_CANNOT_BE_TRACKED": "ಪ್ರಗತಿಯನ್ನು {{collectionType}}ಗಳಿಗೆ ಟ್ರಾಕ್ ಮಾಡಲು ಆಗುವುದಿಲ್ಲ",
   "PROVIDE_BELOW_INFO": "ಕೆಳಗಿನ ಮಾಹಿತಿಯನ್ನು ನೀಡಿರಿ ",
   "PUBLIC": "ಸಾರ್ವಜನಿಕ",
   "PUBLISHED_BY": "{{%s}} ದಲ್ಲಿ ಇವರಿಂದ ಪ್ರಕಟಿತವಾಗಿದೆ",
   "PUBLISHED_DATE": "ಪ್ರಕಟವಾದ ದಿನಾಂಕ",
-  "QR_CODE_DETAILS": "ಡಿಜಿಟಲ್ ಪಠ್ಯಾಂಶವನ್ನು ತಕ್ಷಣವೇ ಪಡೆಯಲು ನಿಮ್ಮ ಪಠ್ಯಾಪುಸ್ತಕದಲ್ಲಿರುವ QR ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ.",
+  "PUBLISHER": "ಪ್ರಕಾಶಕರು",
+  "QR_CODE_DETAILS": "ನಿಮ್ಮ ಪಠ್ಯಪುಸ್ತಕದಲ್ಲಿರುವ QR ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ, ಡಿಜಿಟಲ್ ಪಠ್ಯಾಂಶವನ್ನು ಕೂಡಲೇ ಪಡೆಯಿರಿ ",
   "QR_SHOWING_MULTIPLE_BOOK_RESULT": "{{%s}} ಫಲಿತಾಂಶಗಳನ್ನು ತೋರಿಸುತ್ತಿದೆ",
-  "QUESTION": "ಪ್ರಶ್ನೆ",
-  "QUESTIONS": "ಪ್ರಶ್ನೆಗಳು",
-  "QUESTION_MARKS": "ಪ್ರಶ್ನೆಗಳು (ಅಂಕಗಳು)",
+  "QUES_BANKS": "ಪ್ರಶ್ನೆಗಳ ಬ್ಯಾಂಕ್",
   "QUIZ": "ರಸಪ್ರಶ್ನೆ",
   "QUIZ_CONTENTS_ONLY_REGISTERED_USERS": "ರಸಪ್ರಶ್ನೆಯು ಕೇವಲ ನೋಂದಾಯಿಸಿದ ಬಳಕೆದಾರರಿಗೆ ಮಾತ್ರ",
   "RATE": "ರೇಟ್ ಮಾಡಿ",
@@ -451,47 +860,62 @@
   "RATING_QUESTION": "ನೀವು ಈ ಬಗ್ಗೆ ಇನ್ನೂ ಹೆಚ್ಚು ಹೇಳಲು ಬಯಸುವಿರಾ? ",
   "READ_LESS": "ಕಡಿಮೆ ಓದಿ",
   "READ_MORE": "ಇನ್ನಷ್ಟು ಓದಿ",
-  "RECENTLY_VIEWED": "ಇತ್ತೀಚೆಗೆ ನೋಡಿದ್ದು",
+  "RECOMMENDATION_BASED_ON_PROFILE": "ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ವಿವರಗಳನ್ನು ಆಧರಿಸಿ, ಶಿಫಾರಸುಗಳು",
   "RECOMMENDED": "ಶಿಫಾರಸು ಮಾಡಿದ",
-  "RECOVERY_ACCOUNT_UPDATE_SUCCESS": "ರಿಕವರಿ ಅಕೌಂಟ್ ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಣವಾಯಿತು",
+  "RECOVERY_ACCOUNT_UPDATE_SUCCESS": "ರಿಕವರಿ ಅಕೌಂಟ್ ಅಪ್ಡೇಟ್ ಯಶಸ್ವಿಯಾಯಿತು",
   "RECOVERY_ID_DESCRIPTION": "ನೀವೇನಾದರೂ ಲಾಕ್ ಔಟ್ ಆದರೆ ಪುನಃ ಲಭ್ಯತೆ ಪಡೆಯಲು ರಿಕವರಿ ಅಕೌಂಟ್ ಸಹಾಯ ಮಾಡುತ್ತದೆ. ನಿಮ್ಮ   ರಿಕವರಿ ಅಕೌಂಟ್ ವಿಧವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ ಮತ್ತು ವಿವರಗಳನ್ನು ನಮೂದಿಸಿ: ",
   "REDO": "ರೀಡು",
   "REDO_ASSESSMENT": "ಮತ್ತೆ ಮೌಲ್ಯಮಾಪನ ಮಾಡಿ",
   "REGISTER_TO_COMPLETE_ACCESS": "ಪಠ್ಯಾಂಶಗಳಿಗೆ ಪೂರ್ಣ ಲಭ್ಯತೆ ಪಡೆಯಲು ನೋಂದಾಯಿಸಿ",
   "REMOVE": "ಡಿಲೀಟ್ ಮಾಡಿ",
+  "REMOVE_ACTIVITY": "ತೆಗೆದುಹಾಕಿ",
+  "REMOVE_ACTIVITY_ERROR_MSG": "ಚಟುವಟಿಕೆ ತೆಗೆದುಹಾಕಲು ಆಗಲಿಲ್ಲ, ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ",
+  "REMOVE_ACTIVITY_GROUP_DESC": "ಚಟುವಟಿಕೆಯನ್ನು ತೆಗೆದುಹಾಕಿದರೆ ಅದು ಗುಂಪಿನ ಚಟುವಟಿಕೆ ಪಟ್ಟಿಯಿಂದ ತೆಗೆದುಹಾಕುತ್ತದೆ ಮತ್ತು ನೀವು ನಂತರ ಅದರಲ್ಲಿ ಸದಸ್ಯರ ಪ್ರಗತಿಯನ್ನು ನೋಡಲು ಸಾಧ್ಯವಿಲ್ಲ.",
+  "REMOVE_ACTIVITY_POPUP_TITLE": "ಚಟುವಟಿಕೆಯನ್ನು ತೆಗೆದುಹಾಕುವುದೇ?",
+  "REMOVE_ACTIVITY_SUCCESS_MSG": "ಗುಂಪಿಗೆ ಚಟುವಟಿಕೆಯನ್ನು ಯಶಸ್ವಿಯಾಗಿ ತೆಗೆದುಹಾಕಲಾಯಿತು",
   "REMOVE_FROM_DEVICE": "ಡಿವೈಸಿನಿಂದ ಕಂಟೆಂಟ್ ಡಿಲೀಟ್ ಮಾಡಿ",
   "REMOVE_FROM_DEVICE_MSG": "ಡಿವೈಸಿನಿಂದ ಕಂಟೆಂಟ್ ಅನ್ನು ಡಿಲೀಟ್ ಮಾಡಲು ಖಾತ್ರಿಯಾಗಿ ಬಯಸುವಿರಾ? ",
-  "REMOVE_MULTIPLE_USERS_FROM_GROUP": "{{%s}}  ಬಳಕೆದಾರರನ್ನು ತೆಗೆದುಹಾಕಲು ಖಚಿತಪಡಿಸಿ",
-  "REMOVE_USERS": "ಬಳಕೆದಾರರನ್ನು ತೆಗೆದುಹಾಕಿ",
-  "REMOVE_USERS_FROM_GROUP": "ಗುಂಪಿನಿಂದ  {{%s}} ಬಳಕೆದಾರರನ್ನು ತೆಗೆದುಹಾಕಿ ",
-  "REPORTS": "ವರದಿಗಳು",
+  "REMOVE_MEMBER": "ಸದಸ್ಯರನ್ನು ತೆಗೆದುಹಾಕಿ",
+  "REMOVE_MEMBER_ERROR_MSG": "ಗುಂಪಿನಿಂದ ಸದಸ್ಯರನ್ನು ತೆಗೆದುಹಾಕಲು ಆಗಲಿಲ್ಲ. ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ.",
+  "REMOVE_MEMBER_GROUP_DESC": " {{member_name}} ರನ್ನು ತೆಗೆದುಹಾಕಿದರೆ ಗುಂಪಿನಿಂದ ಅವರನ್ನು ಶಾಶ್ವತವಾಗಿ ತೆಗೆದುಹಾಕುತ್ತದೆ",
+  "REMOVE_MEMBER_POPUP_TITLE": "ಸದಸ್ಯರನ್ನು ತೆಗೆದುಹಾಕುವುದೇ? ",
+  "REMOVE_MEMBER_SUCCESS_MSG": "{{member_name}}  ಅವರು ಇನ್ನು ಮುಂದೆ ಗುಂಪಿನ ಭಾಗವಲ್ಲ",
+  "REQUEST_CONTENT": "ನಮಗೆ ಇಲ್ಲಿ ತಿಳಿಸಿ",
   "RESEND_OTP": "ಓಟಿಪಿ ಪುನಃ ಕಳಿಸಿ",
+  "RESET": "ಮರುಹೊಂದಿಸಿ",
   "RESOURCE_TYPE": "ಸಂಪನ್ಮೂಲದ ವಿಧ",
-  "RESULT": "ಫಲಿತಾಂಶ",
+  "RESPONSE_ACKNOWLEGED": "ನಿಮ್ಮ ಪ್ರತಿಕ್ರಿಯೆಗೆ ಧನ್ಯವಾದಗಳು!",
   "RESULTS": "ಫಲಿತಾಂಶಗಳು",
-  "RESUME": "ಪುನಃ",
+  "RESUME": "ಪುನರಾರಂಭಿಸಿ",
   "RETRY": "ಪುನಃ ಪ್ರಯತ್ನಿಸಿ",
   "RETRY_ACTION": "ಪುನಃ ಪ್ರಯತ್ನಿಸಿ",
-  "ROLE_SELECTOR_QUERY": "ನೀವು ಒಬ್ಬ",
+  "ROLE_SELECTOR_QUERY": " ಪಠ್ಯಾಂಶವನ್ನು ಹೀಗೆ ಹುಡುಕಿರಿ",
   "SAVE": "ಸೇವ್ ಮಾಡಿ",
   "SAVED_ON": "ಸೇವ್ ಮಾಡಿದ ದಿನಾಂಕ",
-  "SAVED_RESOURCES": "ಸೇವ್ ಮಾಡಿದ ಸಂಪನ್ಮೂಲಗಳು",
   "SAVE_FILE_ON_DEVICE": "ಫೈಲನ್ನು ಡಿವೈಸಿಗೆ ಸೇವ್ ಮಾಡಿ",
   "SCAN_QR_CODE": "QR  ಸಂಕೇತವನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ",
   "SCAN_QR_INSTRUCTION": "ಫೋನ್ ಕೆಮರಾ ಬಳಸಿ, QR  ಸಂಕೇತವನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ",
   "SCAN_TAP": "QR ಕೋಡ್ ಸ್ಕ್ಯಾನ್  ಮಾಡಿ",
-  "SCORE": "ಸ್ಕೋರ್",
-  "SCORED": "ಸ್ಕೋರುಗಳು",
+  "SCHOOL_OR_ORG_NAME": "ಶಾಲೆ/ಸಂಸ್ಥೆಯ ಹೆಸರು",
+  "SCHOOL_UDISE_ID_OR_ORG_ID": "ಶಾಲೆಯ UDEISE ID/ Org ID",
   "SD_CARD": "ಎಸ್ ಡಿ ಕಾರ್ಡ್",
+  "SEARCH_FOR_GROUP_MEMBER": "ಗುಂಪಿನ ಸದಸ್ಯರನ್ನು ಹುಡುಕಿ",
   "SEARCH_HINT": "ಹುಡುಕಿರಿ",
   "SEARCH_PLACEHOLDER": "ಕಂಟೆಂಟ್  ಗಾಗಿ ಇಲ್ಲಿ  ಟೈಪಿಸಿ. ಉದಾಃ 'ಕಥೆ' ",
   "SEARCH_TO_FIND_CONTENT": " ಕಂಟೆಂಟ್  ಗಾಗಿ  {{%s}} ನಲ್ಲಿ ಹುಡುಕಿ",
+  "SECONDS_AGO": "{{%s}} ಸೆಕೆಂಡ್ ಹಿಂದೆ",
+  "SECOND_AGO": "{{%s}} ಸೆಕೆಂಡ್  ಹಿಂದೆ",
   "SEE_ALL_RESULTS_FOR": "\"{{%s}}\" ಇದಕ್ಕೆ ಎಲ್ಲ ಫಲಿತಾಂಶಗಳನ್ನು ನೋಡಿ",
+  "SEE_MORE_BOOKS": "ಹೆಚ್ಚು ಪುಸ್ತಕಗಳನ್ನು ಮತ್ತು ಪಠ್ಯಾಂಶವನ್ನು ನೋಡಿ. ",
+  "SEE_MORE_CONTENT": "ಇನ್ನೂ ಹೆಚ್ಚು ಪಠ್ಯಾಂಶಗಳನ್ನು ನೋಡಿ",
   "SELECT": "ಆಯ್ಕೆ ಮಾಡಿ",
   "SELECTED_TOPICS": "ಆಯ್ಕೆ ಮಾಡಿದ ವಿಷಯಗಳು",
+  "SELECT_ACTIVITY": "ಚಟುವಟಿಕೆ ಆಯ್ಕೆಮಾಡಿ",
   "SELECT_ALL": "ಎಲ್ಲವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ",
-  "SELECT_CHAPTER": "ಅಧ್ಯಾಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ",
+  "SELECT_CHAPTER": "ಮಾಡ್ಯೂಲ್ ಆಯ್ಕೆ ಮಾಡಿ",
   "SELECT_YOUR_STATE": "ನಿಮ್ಮ ರಾಜ್ಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ",
+  "SELF_DECLARED_INFO": "ಸ್ವ ಘೋಷಿತ ವಿವರಗಳು",
+  "SELF_DECLARE_TEACHER_TNC": "‪{{%appName}}‬ ಆಡಳಿತಗಾರರೊಂದಿಗೆ ಈ ವಿವರಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಇದರಂತೆ ಒಪ್ಪುವೆನು ",
   "SEND_FILE": "ಫೈಲ್ ಕಳಿಸಿ",
   "SERVER_CONNECTION_ERROR": "ಸರ್ವರ್ ಸಂಪರ್ಕ ವಿಫಲ",
   "SETTINGS": "ಸೆಟ್ಟಿಂಗ್ಸ್",
@@ -500,18 +924,18 @@
   "SHARE_APP_LINK": "{{app_name}} ಆಪ್ ಅನ್ನು {{play_store_url}}ನಿಂದ ಪಡೆಯಿರಿ",
   "SHARE_CONTENT_FAILED": "ಕಂಟೆಂಟ್ ಹಂಚಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ",
   "SHARE_CONTENT_FILE": "ಫೈಲ್ ಕಳಿಸಿದ್ದು: {{app_name}}\nಹೆಸರು: {{content_name}}\n{{play_store_url}}ನಿಂದ {{app_name}} ಆಪ್ ಪಡೆಯಿರಿ",
-  "SHARE_CONTENT_LINK": "{{content_name}} ಅನ್ನು{{app_name}} ಆಪ್ ನ {{content_link}} ನಲ್ಲಿ  ನೋಡಿ\n{{play_store_url}}ನಿಂದ {{app_name}} ಆಪ್ ಅನ್ನು ಪಡೆಯಿರಿ",
+  "SHARE_CONTENT_LINK": "{{app_name}} ಆಪ್ ನ {{content_link}} ನಲ್ಲಿ   {{content_name}}   ತುಂಬ ಕುತೂಹಲಕಾರಿ ಮತ್ತು ಸಹಾಯಕ ಎಂದು ಅನ್ನಿಸಿತು. ",
   "SHARE_LINK": "ಲಿಂಕ್ ಹಂಚಿಕೊಳ್ಳಿ ",
   "SHARE_TELEMETRY": "ಟೆಲಿಮೆಟ್ರಿ ಹಂಚಿಕೊಳ್ಳಿ ",
   "SHARE_TELEMETRY_FAILED": "ಟೆಲಿಮೆಟ್ರಿ ಹಂಚಿಕೊಳ್ಳಲು ವಿಫಲ ",
+  "SHARE_TELEMETRY_NO_DATA_FOUND": "ಟೆಲಿಮೆಟ್ರಿ ಡೇಟಾ ಸಿಗಲಿಲ್ಲ",
   "SHARE_THIS": "ಹಂಚಿಕೊಳ್ಳಿ",
+  "SHARE_USERNAME": "ನೀವು {{user_name}} ಅವರ {{app_name}} ಐಡಿಯನ್ನು ಸ್ವೀಕರಿಸಿದ್ದೀರಿ: {{diksha_id}}",
   "SHOW": "ತೋರಿಸು",
   "SHOWING_ITEMS": "{{%s}} ಫೈಲುಗಳನ್ನು ತೋರಿಸುತ್ತಿದೆ",
   "SHOWING_RESULTS_FOR": "'{{%query}}' ಗೆ {{%count}} ನ ಫಲಿತಾಂಶಗಳನ್ನು ತೋರಿಸುತ್ತಿದೆ",
   "SHOW_LESS": "ಕಡಿಮೆ ತೋರಿಸಿ",
   "SHOW_MORE": "ಹೆಚ್ಚು ತೋರಿಸಿ",
-  "SHOW_RECENT": " {{%s}}  ಫೈಲುಗಳನ್ನು ತೋರಿಸುತ್ತಿದೆ",
-  "SIGNED_OUT_ACCOUNT_MESSAGE": "ನೀವು ಈಗ ಲಾಗಿನ್ ಆಗಿರುವ ಖಾತೆಯಿಂದ ಲಾಗ್  ಔಟ್ ಆಗುವಿರಿ.",
   "SIGNIN_TO_USE_FEATURE": "ಈ ಸೌಕರ್ಯ ಬಳಸಲು ಲಾಗಿನ್ ಆಗಿ",
   "SIGN_IN": "ಲಾಗಿನ್",
   "SIZE": "ಗಾತ್ರ: {{%s}}",
@@ -521,10 +945,13 @@
   "SPACE_AVAILABLE_ON_SDCARD": "ಎಸ್ ಡಿ ಕಾರ್ಡಿನಲ್ಲಿ ಲಭ್ಯವಿರುವ ಸ್ಥಳ",
   "SPACE_TAKEN": " {{%s}} ದಿಂದ ಸ್ಪೇಸ್ ಪಡೆಯಲಾಗಿದೆ",
   "SPACE_TAKEN_BY_APP": "{{%s}} ಕಂಟೆಂಟ್ ತೆಗೆದುಕೊಂಡ ಸ್ಥಳ",
+  "SPECIAL_CHARACTERS_NOT_SUPPORTED": "ಇಲ್ಲಿ ನೀವು ವಿಶೇಷ ಕ್ಯಾರೆಕ್ಟರ್ ಗಳನ್ನು ಹಾಕಲು ಸಾಧ್ಯವಿಲ್ಲ",
   "START": "ಆರಂಭಿಸಿ",
+  "START_AGAIN": "ಪುನಃ ಆರಂಭಿಸಿ",
   "START_ASSESSMENT": "ಮೌಲ್ಯಮಾಪನ ಆರಂಭಿಸಿ",
   "START_COURSE": "ಆರಂಭಿಸಿ",
   "START_COURSE_NOW": "ಈಗ ಆರಂಭಿಸಿ",
+  "START_LEARNING": "ಕಲಿಯಲು ಆರಂಭಿಸಿ",
   "STAR_RATINGS": "ರೇಟಿಂಗ್ ",
   "STATE": "ರಾಜ್ಯ",
   "STATE_OPTION_TEXT": "ರಾಜ್ಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ",
@@ -535,35 +962,104 @@
   "STUDENT_ROLE_DESC_1": "ಪಠ್ಯಪುಸ್ತಕಗಳು ಮತ್ತು ಡಿಜಿಟಲ್ ಪಠ್ಯಾಂಶಗಳನ್ನು ಬ್ರೌಸ್ ಮಾಡಿ",
   "SUBJECT": "ವಿಷಯ",
   "SUBJECTS": "ವಿಷಯಗಳು",
-  "SUBJECT_OPTION_TEXT": "ವಿಷಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ",
+  "SUBJECT_OPTION_TEXT": "ವಿಷಯ ಆಯ್ಕೆ ಮಾಡಿ",
+  "SUBMIT_MY_DETAILS": "ವಿವರಗಳನ್ನು ಸಲ್ಲಿಸಿ",
+  "SUCCESSFULLY_ADDED_USER": "\"{{%s}}\" ಯಶಸ್ವಿಯಾಗಿ ಸೇರಿಸಲಾಯಿತು",
+  "SUCCESSFULLY_SWITCHED_USER": "ಹಾಯ್  \"{{%user}}\" ",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_PHONE": "ಎಲ್ಲ ಕಂಟೆಂಟ್ ಗಳು ಫೋನಿಗೆ ವರ್ಗಾವಣೆ ಆಗಿವೆ",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_SDCARD": "ಎಸ್ ಡಿ ಕಾರ್ಡಿಗೆ ಎಲ್ಲ ಕಂಟೆಂಟ್ ಗಳು ವರ್ಗಾವಣೆಯಾಗಿವೆ",
   "SUPPORT": "ಬೆಂಬಲ",
   "SUPPORT_MESSAGE": "ಏನಾದರೂ ತೊಂದರೆ ಇದೆಯೇ? ನಮಗೆ ಸಂದೇಶ ಕಳಿಸಿ. ",
-  "SWITCHING_TO": " '{{%s}}' ಗೆ ಸ್ವಿಚ್ ಆಗ್ತಿದೆ",
-  "SWITCH_ACCOUNT": "ಖಾತೆ ಬದಲಿಸಿ",
-  "SWITCH_ACCOUNT_CONFIRMATION": "ನೀವು ಖಾತೆ/ಅಕೌಂಟ್ಸ್ ಬದಲಿಸುವಿರಾ?",
+  "SWITCH_TO_CLASSIC_THEME": "ಕ್ಲಾಸಿಕ್ ಥೀಮ್ ಗೆ ಹೋಗಿ",
+  "SWITCH_TO_JOYFUL_THEME": "ಜಾಯ್ ಫುಲ್ ಥೀಮ್ ಗೆ ಹೋಗಿ",
+  "SWITCH_USER": "ಬಳಕೆದಾರರನ್ನು ಬದಲಿಸಿ",
   "SYLLABUS": "ಪಠ್ಯವಸ್ತು",
   "SYNCING_NOW": "ಈಗ ಸಿಂಕ್ ಆಗ್ತಿದೆ",
   "SYNC_NOW": "ಈಗ ಸಿಂಕ್ ಮಾಡಿ",
-  "TAKE_ASSESSMENT": "ಬಳಕೆದಾರರು ಕನಿಷ್ಠ ಒಂದು ಮೌಲ್ಯಮಾಪನ ಕೊಡಬೇಕು",
   "TAP_SCAN": "{{%s}} ಕ್ಯುಆರ್  ಕೋಡ್  ಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ",
+  "TBK_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "ಶುರುಮಾಡಲು ಒಂದು ಪಠ್ಯಪುಸ್ತಕ ಆಯ್ಕೆ ಮಾಡಿ",
+  "TBK_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "ಪಠ್ಯಪುಸ್ತಕ",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "ಪಠ್ಯಪುಸ್ತಕಗಳು",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "ಪಠ್ಯಪುಸ್ತಕಗಳು",
+  "TBK_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "‪{{%appName}}'s‬ ಗ್ರಂಥಾಲಯವು ಸಾಕಷ್ಟು ‪{{%explainVideos}},‬ ‪{{%quesBanks}}‬ ಮತ್ತು ಇತರೆ ‪{{%interactiveMaterial}} ಹೊಂದಿವೆ. ಗ್ರಂಥಾಲಯದಲ್ಲಿ ಹುಡುಕುವುದನ್ನು ಆರಂಭಿಸಲು ಒಂದು ಪಠ್ಯಪುಸ್ತಕದ ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ!",
+  "TBK_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) ಕ್ಕೆ ಯಾವುದೇ ಪುಸ್ತಕಗಳು ಕಾಣುತ್ತಿಲ್ಲ",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "ಮಂಡಳಿಯು ಪುಸ್ತಕಗಳನ್ನು ಸೇರಿಸುತ್ತಿದೆ",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "ನಿಮ್ಮ ವಿಷಯದ ಪಠ್ಯಪುಸ್ತಕಗಳು {{%s}} ದಲ್ಲಿ ಕಾಣಲಿಲ್ಲವೇ?",
+  "TBK_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": " <span>Note :</span> ಪಠ್ಯಪುಸ್ತಕಗಳಿಗೆ ಪ್ರಗತಿಯನ್ನು ಟ್ರಾಕ್ ಮಾಡಲು ಆಗುವುದಿಲ್ಲ",
+  "TBK_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "ನಿಮ್ಮ ರಾಜ್ಯ ಮಂಡಳಿಯು ನೀವು ಕೇಳಿರುವ ಪುಸ್ತಕಗಳನ್ನು {{%s}} ದಲ್ಲಿ ಅಪ್ಲೋಡ್ ಮಾಡಿದೊಡನೆ ನಿಮಗೆ ಸೂಚನೆ ಕಳಿಸುತ್ತೇವೆ.",
+  "TBK_NONTRK_QR_CODE_DETAILS": "ನಿಮ್ಮ ಪಠ್ಯಪುಸ್ತಕದಲ್ಲಿರುವ QR ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ, ಡಿಜಿಟಲ್ ಪಠ್ಯಾಂಶವನ್ನು ಕೂಡಲೇ ಪಡೆಯಿರಿ",
+  "TBK_NONTRK_SEE_MORE_BOOKS": "ಹೆಚ್ಚು ಪುಸ್ತಕಗಳು ಮತ್ತು ಪಠ್ಯಾಂಶವನ್ನು ನೋಡಿ",
+  "TBK_NONTRK_STUDENT_ROLE_DESC_1": "ಪಠ್ಯಪುಸ್ತಕಗಳು ಮತ್ತು ಡಿಜಿಟಲ್ ಪಠ್ಯಾಂಶಗಳನ್ನು ಬ್ರೌಸ್ ಮಾಡಿ",
+  "TBK_NONTRK_TEACHER_ROLE_DESC_1": "ಪಠ್ಯಪುಸ್ತಕಗಳು ಮತ್ತು ಡಿಜಿಟಲ್ ಪಠ್ಯಾಂಶಗಳನ್ನು ಬ್ರೌಸ್ ಮಾಡಿ",
+  "TBK_NONTRK_TUTORIAL_HEADING": "ವಿಡಿಯೋಗಳು, ಇಂಟರಾಕ್ಟಿವ್ ಪಠ್ಯಾಂಶ, ಇ-ಪಠ್ಯಪುಸ್ತಕಗಳು ಮತ್ತು ಇನ್ನೂ ಹೆಚ್ಚು...",
+  "TBK_TRK_BATCHEND_MAIN_HEADING": "ನೀವು {{%s}} ರಂದು ಪೂರ್ಣಗೊಂಡಿರುವ ಪಠ್ಯಪುಸ್ತಕ ಓದುವ ಬ್ಯಾಚ್ ಸೇರಿದ್ದೀರಿ",
+  "TBK_TRK_BATCHEND_SUB_HEADING": "ನೀವು ಕಲಿಕೆಯನ್ನು ಮುಂದುವರೆಸಬಹುದು, ಆದರೆ ನಿಮ್ಮ ಪ್ರಗತಿಯು ನವೀಕರಣವಾಗುವುದಿಲ್ಲ",
+  "TBK_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "ನೀವು ಈ ಅಧ್ಯಾಯವನ್ನು ಮುಗಿಸಿದ್ದೀರಿ",
+  "TBK_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": " {{%s}} ಒಳಗೆ ಪಠ್ಯಪುಸ್ತಕವನ್ನು ಪೂರ್ಣಗೊಳಿಸಿ",
+  "TBK_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "ಈ ಪಠ್ಯಪುಸ್ತಕವು ಈಗ ಸಕ್ರಿಯವಾಗಿಲ್ಲ",
+  "TBK_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "ಪಠ್ಯಪುಸ್ತಕ ",
+  "TBK_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "ನೀವು ಈ ಪಠ್ಯಪುಸ್ತಕ ಓದಿದ್ದೀರಿ",
+  "TBK_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "ಪಠ್ಯಪುಸ್ತಕಕ್ಕೆ ಬ್ಯಾಚ್ ಗಳು",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "ಟಾಸ್ಕ್ ಗಳು",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "ನನ್ನ ಪಠ್ಯಪುಸ್ತಕಗಳು",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "ಬ್ಯಾಚ್ ಪೂರ್ಣಗೊಂಡ ದಿನಾಂಕ ",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "ಕೊನೆಯಬಾರಿ ನವೀಕರಿಸಿದ್ದು {{last_updated_on_date}} ",
+  "TBK_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "ಸೇರಿ",
+  "TBK_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "ಇತ್ತೀಚಿನ ಪಠ್ಯಪುಸ್ತಕಗಳು",
+  "TBK_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "ಟಾಸ್ಕ್ ಅನ್ನು ಬಿಡುತ್ತೀರಾ?",
+  "TBK_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "ಸೇರುವುದಕ್ಕೆ ಲಾಗಿನ್ ಆಗಿ",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_COURSES": "ಪಠ್ಯಪುಸ್ತಕಗಳು ಇಲ್ಲ",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "ಪಠ್ಯಾಂಶ ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "ಪಠ್ಯಪುಸ್ತಕಗಳು ({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "ಪಠ್ಯಪುಸ್ತಕ ({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "ಆನ್ಲೈನ್ ಕಲಿಕೆಯನ್ನು ತೆಗೆದುಕೊಳ್ಳಿ",
+  "TBK_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "ಜನಪ್ರಿಯ ಪಠ್ಯಪುಸ್ತಕಗಳು",
+  "TBK_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ಆನ್ಲೈನ್ ಕಲಿಕೆಯನ್ನು ತೆಗೆದುಕೊಳ್ಳಿ",
+  "TBK_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "ಪ್ರಮಾಣಪತ್ರ ಪಡೆಯಲು {{%s}} ಒಳಗೆ ಟಾಸ್ಕ್ ಪೂರ್ಣಗೊಳಿಸಿ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING": "ಕಲಿಕಾ ಟಾಸ್ಕ್",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "ಹಾಜರಾದ ಕಲಿಕಾ ಟಾಸ್ಕ್(ಗಳು)",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "ಪಠ್ಯಪುಸ್ತಕದ ವಿವರಗಳು ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "  ಟಾಸ್ಕ್ ಕೊನೆಗೊಳ್ಳುವುದು",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "ಟಾಸ್ಕ್ ಮುಕ್ತಾಯದ ದಿನಾಂಕ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "ಟಾಸ್ಕ್ ವಿವರಗಳು",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "ಈ ಟಾಸ್ಕ್ ಇವರಿಗೆ ಪ್ರಸ್ತುತವಾಗಿದೆ:",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "ಅಧ್ಯಾಯ",
+  "TBK_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "ಪಠ್ಯಪುಸ್ತಕ ಚಟುವಟಿಕೆಯನ್ನು ನಿಲ್ಲಿಸಿ",
+  "TBK_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "ಪಠ್ಯಪುಸ್ತಕದ ಚಟುವಟಿಕೆಗಳನ್ನು ಪರಿಶೀಲಿಸಬೇಕೆ?",
+  "TBK_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "{{batch_start_date}} ರಿಂದ ಪಠ್ಯಪುಸ್ತಕದ ಬ್ಯಾಚ್ ಲಭ್ಯವಿದೆ",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "ನೀವು 7 ದಿನಗಳ ಒಳಗಾಗಿ ನಿಮ್ಮ ನೋಂದಾಯಿತ ಸಂಪರ್ಕ ವಿವರಕ್ಕೆ ಕೋರ್ಸ್ ಪ್ರಮಾಣಪತ್ರದ ಕುರಿತು ಸೂಚನೆ ಪಡೆಯುವಿರಿ",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "ಟಿಪ್ಪಣಿ: ಈ ಪಠ್ಯಪುಸ್ತಕಕ್ಕೆ ಪ್ರಮಾಣಪತ್ರ ಇಲ್ಲ",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "ನೀವು ಈ ಪಠ್ಯಪುಸ್ತಕ ಓದಿದ್ದೀರಿ",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "ಪ್ರಸ್ತುತ, ಈ ಟಾಸ್ಕ್ ಗೆ ಪ್ರಮಾಣಪತ್ರ ಇಲ್ಲ. ಇದನ್ನು ರಚಿಸಿದವರು ನಂತರ  ಪ್ರಮಾಣಪತ್ರವನ್ನು ಲಗತ್ತಿಸಬಹುದು.",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "ನೀವು ಪಠ್ಯಪುಸ್ತಕ ಓದುವುದನ್ನು ನಿಲ್ಲಿಸಿದ್ದೀರಿ",
+  "TBK_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "ಈ ಪಠ್ಯಪುಸ್ತಕ ಟಾಸ್ಕ್ ಗೆ ಯಾವುದೇ ಬ್ಯಾಚ್ ಗಳು ಲಭ್ಯವಿಲ್ಲ",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "ಪಠ್ಯಪುಸ್ತಕವು ನೋಂದಾಯಿಸಿದ ಬಳಕೆದಾರರಿಗೆ ಮಾತ್ರ. ಪಠ್ಯಪುಸ್ತಕ ಪಡೆಯಲು ಲಾಗಿನ್ ಆಗಿ",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "ಈ ಪಠ್ಯಪುಸ್ತಕ ಓದಲು ಲಾಗ್ ಇನ್ ಆಗಿ",
+  "TBK_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "ಈ ಟಾಸ್ಕ್ ಗೆ ಯಾವುದೇ ಬ್ಯಾಚ್ ಗಳು ಲಭ್ಯವಿಲ್ಲ",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "ನೋಂದಾಯಿಸಿದ ಬಳಕೆದಾರರು ಮಾತ್ರವೇ ಕಲಿಕಾ ಟಾಸ್ಕ್ ಗಳನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "ನೀವು ಈ ಟಾಸ್ಕ್ ಯಶಸ್ವಿಯಾಗಿ ಪೂರ್ಣಗೊಳಿಸಿದಿರಿ",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "ಟಾಸ್ಕ್ ಪೂರ್ಣಗೊಂಡಿದೆ. ನೀವು ಮೌಲ್ಯಮಾಪನವನ್ನು ಪುನಃ ತೆಗೆದುಕೊಳ್ಳಬಹುದು, ಆದರೆ ನಿಮ್ಮ ಪ್ರಗತಿಯು ದಾಖಲಾಗುವುದಿಲ್ಲ.",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "ಟಾಸ್ಕ್ ಪೂರ್ಣಗೊಂಡಿದೆ. ನೀವು ಮೌಲ್ಯಮಾಪನವನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು, ಆದರೆ ನಿಮ್ಮ ಪ್ರಗತಿಯು ದಾಖಲಾಗುವುದಿಲ್ಲ.",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "ಪಠ್ಯಪುಸ್ತಕದ ವಿವರಗಳನ್ನು ನೋಡಲು ಮತ್ತು ಪಡೆಯಲು ನೀವು ಒಂದು ಸಕ್ರಿಯ ಬ್ಯಾಚ್ ಗೆ ಸೇರಬೇಕು.",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "ಪಠ್ಯಪುಸ್ತಕದ ವಿವರಗಳನ್ನು ಪಡೆಯಲು ನೀವು ಲಾಗ್ ಇನ್ ಆಗಬೇಕು",
   "TEACHER_ID_ENTER_LABEL": "ನಿಮ್ಮ ಶಿಕ್ಷಕ ಐಡಿಯನ್ನು ಪರಿಶೀಲನೆಗಾಗಿ ನಮೂದಿಸಿ",
   "TEACHER_ID_PLACEHOLDER": "ಉದಾಹರಣೆಗೆ ER12345",
   "TEACHER_ID_VERIFICATION": "ಶಿಕ್ಷಕರ ಐಡಿ ಪರಿಶೀಲನೆ",
   "TEACHER_PROFILE_FAILED": "ಶಿಕ್ಷಕ ಐಡಿಯನ್ನು ನಮೂದಿಸಿದ್ದು ತಪ್ಪಾಗಿದೆ, ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಪರಿಶೀಲಿಸಲು ಆಗಿಲ್ಲ",
   "TEACHER_PROFILE_VERIFIED": "ಶಿಕ್ಷಕರ ಪ್ರೊಫೈಲ್ ಪರಿಶೀಲನೆ ಯಶಸ್ವಿಯಾಯಿತು",
   "TEACHER_ROLE_DESC_1": "ಪಠ್ಯಪುಸ್ತಕಗಳು ಮತ್ತು ಡಿಜಿಟಲ್ ಪಠ್ಯಾಂಶಗಳನ್ನು ಬ್ರೌಸ್ ಮಾಡಿ",
-  "TEACHER_ROLE_DESC_2": "ಆನ್ಲೈನ್ ತರಬೇತಿ ತೆಗೆದುಕೊಳ್ಳಿ",
+  "TEACHER_ROLE_DESC_2": "ಆನ್ಲೈನ್ ಕೋರ್ಸ್ ತೆಗೆದುಕೊಳ್ಳಿ",
   "TEACHER_ROLE_DESC_3": "ಪಾಠಯೋಜನೆಯನ್ನು ಹುಡುಕಿರಿ",
   "TELL_US_MORE": "ಹೆಚ್ಚಿನ ವಿವರಗಳನ್ನು ನೀಡಿ...",
   "TERMS_OF_USE": "ಬಳಕೆಯ ಕರಾರುಗಳು",
   "TEXTBOOK": "ಪಠ್ಯಪುಸ್ತಕಗಳು",
+  "TEXTBOOKS": "ಪಠ್ಯಪುಸ್ತಕಗಳು",
+  "THANKING_NOTE": "ನಿಮ್ಮ ರಾಜ್ಯ ಮಂಡಳಿಯು ನೀವು ಕೇಳಿರುವ ಪುಸ್ತಕಗಳನ್ನು {{%s}} ದಲ್ಲಿ ಅಪ್ಲೋಡ್ ಮಾಡಿದೊಡನೆ  ನಿಮಗೆ ಸೂಚನೆ ಕಳಿಸುತ್ತೇವೆ. ",
   "THANK_FOR_RATING": "ಕಂಟೆಂಟ್ ರೇಟಿಂಗ್ ನೀಡಿದ್ದಕ್ಕೆ ಧನ್ಯವಾದಗಳು.",
-  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "ಈ ತರಬೇತಿಗೆ ಯಾವುದೇ ಬ್ಯಾಚ್ ಗಳು ಲಭ್ಯವಿಲ್ಲ",
+  "THANK_YOU_FOR_SUBMITTING_YOUR_DETAILS": "ನಿಮ್ಮ ವಿವರಗಳನ್ನು ಸಲ್ಲಿಸಿದ್ದಕ್ಕೆ ಧನ್ಯವಾದಗಳು",
+  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "ಈ ಕೋರ್ಸ್ ಗೆ ಯಾವುದೇ ಬ್ಯಾಚ್ ಗಳು ಲಭ್ಯವಿಲ್ಲ",
   "THIS_IS_A_RESTRICTED_COMMUNITY": "ಇದು ಒಂದು ನಿರ್ಬಂಧಿತ ಸಮುದಾಯ ",
   "TICKET_SUMMARY": "ಟಿಕೆಟ್ ಸಾರಾಂಶ",
-  "TIME": "ಸಮಯ",
   "TIME_OUT": "ಸರ್ವರ್ ಟೈಮ್ ಔಟ್ ಆಗಿದೆ, ಬಳಿಕ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ. ",
   "TITLE": "ಶೀರ್ಷಿಕೆ",
   "TITLE_UPGRADE_POPUP": "ನಾವು ಪಠ್ಯಾಂಶದ ಒಳಗೆ ಕಾಣೆಯಾದ ಚಿತ್ರಗಳು ಮತ್ತು ಆಡಿಯೋ ಸಮಸ್ಯೆ ಇದ್ದಿದ್ದನ್ನು ಸರಿಪಡಿಸಿದ್ದೇವೆ. ಒಳ್ಳೆಯ ಅನುಭವ ಪಡೆಯಲು, ನೀವು ದೀಕ್ಷಾದ ಇತ್ತೀಚಿನ ಆವೃತ್ತಿಗೆ ಅಪ್ ಡೇಟ್ ಮಾಡಿಕೊಳ್ಳಬೇಕೆಂದು ನಾವು ಸಲಹೆ ಮಾಡುತ್ತೇವೆ. ",
@@ -572,21 +1068,20 @@
   "TOPICS": "ವಿಷಯಗಳು",
   "TOPIC_YOU_MIGHT_LIKE": "ನಿಮ್ಮ ಆಸಕ್ತಿಯ ಕಂಟೆಂಟ್ ಹುಡುಕಿ",
   "TOTAL_SIZE": "ಒಟ್ಟು ಗಾತ್ರ",
-  "TOTAL_TIME": "ಒಟ್ಟು ಸಮಯ. ",
   "TO_DO": "ಮಾಡಬೇಕಿರುವುದು",
-  "TO_EARN_CERTIFICATE": " ಪ್ರಮಾಣಪತ್ರ ಪಡೆಯಲು {{%s}} ರ ಒಳಗೆ ತರಬೇತಿ ಪೂರ್ಣಗೊಳಿಸಿ",
-  "TRAINING": "ತರಬೇತಿ",
-  "TRAININGS_ATTENDED": "ಹಾಜರಾದ ತರಬೇತಿ(ಗಳು)",
-  "TRAININGS_ONLY_REGISTERED_USERS": "ತರಬೇತಿಗಳು ಕೇವಲ ನೋಂದಣಿ ಮಾಡಿದ ಬಳಕೆದಾರರಿಗೆ ಮಾತ್ರ",
-  "TRAINING_COMPLETED_SUCCESSFULLY": "ನೀವು ಈ ತರಬೇತಿಯನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಪೂರ್ಣಗೊಳಿಸಿದಿರಿ. ",
-  "TRAINING_DETAILS": "ತರಬೇತಿಯ ವಿವರಗಳು",
-  "TRAINING_ENDED_REDO_ASSESSMENT": "ತರಬೇತಿಯು ಪೂರ್ಣಗೊಂಡಿತು. ನೀವು ಮೌಲ್ಯಮಾಪನವನ್ನು ಮತ್ತೆ ತೆಗೆದುಕೊಳ್ಳಬಹುದು, ಆದರೆ ನಿಮ್ಮ ಪ್ರಗತಿಯು ದಾಖಲಾಗುವುದಿಲ್ಲ",
-  "TRAINING_ENDED_START_ASSESSMENT": "ತರಬೇತಿಯು ಪೂರ್ಣಗೊಂಡಿತು. ನೀವು ಮೌಲ್ಯಮಾಪನವನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು, ಆದರೆ ನಿಮ್ಮ ಪ್ರಗತಿಯು ದಾಖಲಾಗುವುದಿಲ್ಲ",
-  "TRAINING_ENDS_ON": "ರಂದು ತರಬೇತಿ ಮುಗಿಯುತ್ತದೆ",
-  "TRAINING_END_DATE": "ತರಬೇತಿಯು ಮುಗಿಯುವ ದಿನಾಂಕ",
-  "TRAINING_INFO": "ತರಬೇತಿಯ ಮಾಹಿತಿ",
-  "TRAINING_IS_RELEVANT_TO_TEACHERS": "ಶಿಕ್ಷಕರಿಗೆ ತರಬೇತಿಯು  ಪ್ರಸ್ತುತತೆ ಇದೆ",
-  "TRAINING_MODULES": "ತರಬೇತಿಯ ಕೈಪಿಡಿಗಳು",
+  "TO_EARN_CERTIFICATE": " ಪ್ರಮಾಣಪತ್ರ ಪಡೆಯಲು {{%s}} ಒಳಗೆ ಕೋರ್ಸ್  ಪೂರ್ಣಗೊಳಿಸಿ",
+  "TRAINING": "ಕೋರ್ಸ್ ",
+  "TRAININGS_ATTENDED": "ಹಾಜರಾದ ಕೋರ್ಸ್ (ಗಳು)",
+  "TRAININGS_ONLY_REGISTERED_USERS": "ನೋಂದಾಯಿಸಿದ ಬಳಕೆದಾರರಷ್ಟೇ ಕೋರ್ಸ್ ತೆಗೆದುಕೊಳ್ಳಬಹುದು",
+  "TRAINING_COMPLETED_SUCCESSFULLY": "ನೀವು ಈ  ಕೋರ್ಸ್ ಯಶಸ್ವಿಯಾಗಿ ಪೂರ್ಣಗೊಳಿಸಿದಿರಿ. ",
+  "TRAINING_DETAILS": "ಕೋರ್ಸ್ ವಿವರಗಳು",
+  "TRAINING_ENDED_REDO_ASSESSMENT": "ಕೋರ್ಸ್  ಪೂರ್ಣಗೊಂಡಿದೆ. ನೀವು ಮೌಲ್ಯಮಾಪನವನ್ನು ಪುನಃ ತೆಗೆದುಕೊಳ್ಳಬಹುದು, ಆದರೆ ನಿಮ್ಮ ಪ್ರಗತಿಯು ದಾಖಲಾಗುವುದಿಲ್ಲ",
+  "TRAINING_ENDED_START_ASSESSMENT": "ಕೋರ್ಸ್  ಪೂರ್ಣಗೊಂಡಿದೆ. ನೀವು ಮೌಲ್ಯಮಾಪನವನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು, ಆದರೆ ನಿಮ್ಮ ಪ್ರಗತಿಯು ದಾಖಲಾಗುವುದಿಲ್ಲ",
+  "TRAINING_ENDS_ON": "ಕೋರ್ಸ್ ಮುಕ್ತಾಯ ",
+  "TRAINING_END_DATE": "ಕೋರ್ಸ್ ಮುಕ್ತಾಯದ ದಿನಾಂಕ",
+  "TRAINING_INFO": "ಕೋರ್ಸ್ ವಿವರಗಳು",
+  "TRAINING_IS_RELEVANT_TO_TEACHERS": "ಈ ಕೋರ್ಸ್ ಇವರಿಗೆ ಪ್ರಸ್ತುತವಾಗಿದೆ: ",
+  "TRAINING_MODULES": "ಕೋರ್ಸ್ ಮಾಡ್ಯೂಲ್ ಗಳು",
   "TRANSFERRING_CONTENT_TO_PHONE": "ಕಂಟೆಂಟ್ ಅನ್ನು ಫೋನಿಗೆ ವರ್ಗಾಯಿಸಿ",
   "TRANSFERRING_CONTENT_TO_SDCARD": "ಕಂಟೆಂಟ್ ಅನ್ನು ಎಸ್ ಡಿ ಕಾರ್ಡಿಗೆ ವರ್ಗಾಯಿಸಲಾಗುತ್ತಿದೆ",
   "TRANSFERRING_FILES": "ಫೈಲುಗಳನ್ನು ವರ್ಗಾಯಿಸಲಾಗುತ್ತಿದೆ",
@@ -596,9 +1091,64 @@
   "TRY_AGAIN": "ಪುನಃ ಪ್ರಯತ್ನಿಸಿ",
   "TRY_BEFORE_RATING": "ರೇಟಿಂಗ್ ಮಾಡುವ ಮೊದಲು ಕಂಟೆಂಟ್ ನೋಡಿರಿ",
   "TRY_DIFF_QR": "ಬೇರೆ QR  ಸಂಕೇತವನ್ನು ಪ್ರಯತ್ನಿಸುವಿರಾ?",
+  "TUTORIAL_BUTTON": "ಶುರುಮಾಡಲು ಒಂದು ಪಠ್ಯಪುಸ್ತಕ ಆಯ್ಕೆ ಮಾಡಿ",
+  "TUTORIAL_HEADING": "ವಿಡಿಯೋಗಳು, ಇಂಟರಾಕ್ಟಿವ್ ಪಠ್ಯಾಂಶ, ಇ-ಪಠ್ಯಪುಸ್ತಕಗಳು ಮತ್ತು ಇನ್ನೂ ಹೆಚ್ಚು...",
+  "TVC_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "ಆರಂಭಿಸಲು ಒಂದು ಟಿವಿ ತರಗತಿ ಆಯ್ಕೆ ಮಾಡಿ",
+  "TVC_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "ಟಿವಿ ತರಗತಿಗಳು",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "ಟಿವಿ ತರಗತಿಗಳು",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "ಟಿವಿ ತರಗತಿಗಳು",
+  "TVC_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": " {{%appName}}'s ಗ್ರಂಥಾಲಯವು ಸಾಕಷ್ಟು ‪{{%explainVideos}},‬ ‪{{%quesBanks}}‬ ಮತ್ತು ಇತರೆ ‪{{%interactiveMaterial}} ಹೊಂದಿವೆ. ಗ್ರಂಥಾಲಯದಲ್ಲಿ ಹುಡುಕುವುದಕ್ಕಾಗಿ ಒಂದು ಟಿವಿ ತರಗತಿಯ ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ!",
+  "TVC_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) ಕ್ಕೆ ಯಾವುದೇ ಟಿವಿ ತರಗತಿಗಳು ಕಾಣುತ್ತಿಲ್ಲ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "ಮಂಡಳಿಯು ಟಿವಿ ತರಗತಿಗಳನ್ನು ಸೇರಿಸುತ್ತಿದೆ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}} ದಲ್ಲಿ ಟಿವಿ ತರಗತಿಗಳು ಕಾಣಲಿಲ್ಲವೇ? ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span> ಟಿವಿ ತರಗತಿಗೆ ಪ್ರಗತಿಯನ್ನು ಟ್ರಾಕ್ ಮಾಡಲು ಆಗುವುದಿಲ್ಲ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "ನಿಮ್ಮ ರಾಜ್ಯ ಮಂಡಳಿಯು ನೀವು ಕೇಳಿರುವ  ಟಿವಿ ತರಗತಿಗಳನ್ನು {{%s}} ದಲ್ಲಿ ಅಪ್ಲೋಡ್ ಮಾಡಿದೊಡನೆ ನಿಮಗೆ ಸೂಚನೆ ಕಳಿಸುತ್ತೇವೆ.",
+  "TVC_NONTRK_QR_CODE_DETAILS": "ನಿಮ್ಮ  ಟಿವಿ ತರಗತಿಯಲ್ಲಿರುವ QR ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ, ಡಿಜಿಟಲ್ ಪಠ್ಯಾಂಶವನ್ನು ಕೂಡಲೇ ಪಡೆಯಿರಿ. ",
+  "TVC_NONTRK_SEE_MORE_BOOKS": "ಹೆಚ್ಚು ಟಿವಿ ತರಗತಿ ಮತ್ತು ಪಠ್ಯಾಂಶವನ್ನು ನೋಡಿ",
+  "TVC_NONTRK_STUDENT_ROLE_DESC_1": "ಟಿವಿ ತರಗತಿ ಮತ್ತು ಡಿಜಿಟಲ್ ಪಠ್ಯಾಂಶಗಳನ್ನು ಬ್ರೌಸ್ ಮಾಡಿ",
+  "TVC_NONTRK_TEACHER_ROLE_DESC_1": "ಟಿವಿ ತರಗತಿ ಮತ್ತು ಡಿಜಿಟಲ್ ಪಠ್ಯಾಂಶಗಳನ್ನು ಬ್ರೌಸ್ ಮಾಡಿ",
+  "TVC_NONTRK_TUTORIAL_HEADING": "ವಿಡಿಯೋಗಳು, ಇಂಟರಾಕ್ಟಿವ್ ಪಠ್ಯಾಂಶ, ಇ-ಪಠ್ಯಪುಸ್ತಕಗಳು ಮತ್ತು ಇನ್ನೂ ಹೆಚ್ಚು...",
+  "TVC_TRK_BATCHEND_MAIN_HEADING": "ನೀವು {{%s}} ರಂದು ಪೂರ್ಣಗೊಂಡಿರುವ ಟಿವಿ ತರಗತಿಯ ಬ್ಯಾಚ್ ಸೇರಿದ್ದೀರಿ",
+  "TVC_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "ನೀವು ಈ ಕಾರ್ಯಕ್ರಮವನ್ನು ಮುಗಿಸಿದ್ದೀರಿ",
+  "TVC_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "ಟಿವಿ ತರಗತಿಗಳು",
+  "TVC_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "ಈ ಟಿವಿ ತರಗತಿಗಳನ್ನು ನೀವು ನೋಡಿದ್ದೀರಿ",
+  "TVC_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "ಟಿವಿ ತರಗತಿಗಳ ಬ್ಯಾಚ್ ಗಳು",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "ಟಾಸ್ಕ್ ಗಳು",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "ನನ್ನ ಟಿವಿ ತರಗತಿಗಳು",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "ಬ್ಯಾಚ್ ಪೂರ್ಣಗೊಂಡ ದಿನಾಂಕ",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "ಕೊನೆಯಬಾರಿ ನವೀಕರಿಸಿದ್ದು {{last_updated_on_date}}",
+  "TVC_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "ಇತ್ತೀಚಿನ ಟಿವಿ ತರಗತಿಗಳು",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "ಟಿವಿ ತರಗತಿಗಳು ({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "ಟಿವಿ ತರಗತಿಗಳು ({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "ಜನಪ್ರಿಯ ಟಿವಿ ತರಗತಿಗಳು",
+  "TVC_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "ಪ್ರಮಾಣಪತ್ರ ಪಡೆಯಲು {{%s}} ಒಳಗೆ ಟಾಸ್ಕ್ ಪೂರ್ಣಗೊಳಿಸಿ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING": "ಕಲಿಕಾ ಟಾಸ್ಕ್",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "ಹಾಜರಾದ ಕಲಿಕಾ ಟಾಸ್ಕ್(ಗಳು)",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "ಟಿವಿ ತರಗತಿಯ ವಿವರಗಳು",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "ಟಾಸ್ಕ್ ಕೊನೆಗೊಳ್ಳುವುದು",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "ಟಾಸ್ಕ್ ಮುಗಿಯುವ ದಿನಾಂಕ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "ಟಾಸ್ಕ್ ವಿವರಗಳು",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "ಈ ಟಾಸ್ಕ್ ಇವರಿಗೆ  ಪ್ರಸ್ತುತವಾಗಿದೆ: ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "ಟಿವಿ ಕಾರ್ಯಕ್ರಮ",
+  "TVC_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "ಟಿವಿ ತರಗತಿ ನೋಡುವುದನ್ನು ನಿಲ್ಲಿಸಿ",
+  "TVC_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "ಟಿವಿ ತರಗತಿಗಳ ಕಲಿಕೆಯನ್ನು ಪರಿಶೀಲಿಸಬೇಕೆ? ",
+  "TVC_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "{{batch_start_date}} ರಿಂದ ಟಿವಿ ತರಗತಿಯ ಬ್ಯಾಚ್ ಲಭ್ಯವಿದೆ ",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "ನೀವು 7 ದಿನಗಳ ಒಳಗಾಗಿ ನಿಮ್ಮ ನೋಂದಾಯಿತ ಸಂಪರ್ಕ ವಿವರಕ್ಕೆ ಕೋರ್ಸ್ ಪ್ರಮಾಣಪತ್ರದ ಕುರಿತು ಸೂಚನೆ ಪಡೆಯುವಿರಿ",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "ಟಿಪ್ಪಣಿ: ಈ  ಟಾಸ್ಕ್ ಗೆ ಪ್ರಮಾಣಪತ್ರ ಇಲ್ಲ",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "ಈ ಟಿವಿ ತರಗತಿಗಳನ್ನು ನೀವು ನೋಡಿದ್ದೀರಿ",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "ಪ್ರಸ್ತುತ, ಈ ಟಾಸ್ಕ್ ಗೆ ಪ್ರಮಾಣಪತ್ರ ಇಲ್ಲ. ಇದನ್ನು ರಚಿಸಿದವರು ನಂತರ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಲಗತ್ತಿಸಬಹುದು.",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "ನೀವು ಟಿವಿ ತರಗತಿ ನೋಡುವುದನ್ನು ನಿಲ್ಲಿಸಿದ್ದೀರಿ",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "ಟಿವಿ ತರಗತಿಗಳು ನೋಂದಾಯಿತ ಬಳಕೆದಾರರಿಗೆ ಮಾತ್ರ. ಟಿವಿ ತರಗತಿ ಪಡೆಯಲು  ಲಾಗಿನ್ ಆಗಿ",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "ಈ ಟಿವಿ ತರಗತಿಯನ್ನು ನೋಡಲು ನೀವು ಲಾಗಿನ್ ಆಗಿ",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "ನೋಂದಾಯಿಸಿದ ಬಳಕೆದಾರರು ಮಾತ್ರವೇ ಕಲಿಕಾ ಟಾಸ್ಕ್ ತೆಗೆದುಕೊಳ್ಳಬಹುದು",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "ನೀವು ಈ ಟಾಸ್ಕ್ ಯಶಸ್ವಿಯಾಗಿ ಪೂರ್ಣಗೊಳಿಸಿದಿರಿ",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "ಟಾಸ್ಕ್ ಪೂರ್ಣಗೊಂಡಿದೆ. ನೀವು ಮೌಲ್ಯಮಾಪನವನ್ನು ಪುನಃ ತೆಗೆದುಕೊಳ್ಳಬಹುದು, ಆದರೆ ನಿಮ್ಮ ಪ್ರಗತಿಯು ದಾಖಲಾಗುವುದಿಲ್ಲ.",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "ಟಾಸ್ಕ್ ಪೂರ್ಣಗೊಂಡಿದೆ. ನೀವು ಮೌಲ್ಯಮಾಪನವನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು, ಆದರೆ ನಿಮ್ಮ ಪ್ರಗತಿಯು ದಾಖಲಾಗುವುದಿಲ್ಲ.",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "ಟಿವಿ ತರಗತಿಗಳನ್ನು ನೋಡಲು ಮತ್ತು ಪಡೆಯಲು ನೀವು ಒಂದು ಸಕ್ರಿಯ ಬ್ಯಾಚ್ ಗೆ ಸೇರಬೇಕು.",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "ಟಿವಿ ತರಗತಿಯ ವಿವರಗಳನ್ನು ಪಡೆಯಲು ನೀವು ಲಾಗ್ ಇನ್ ಆಗಬೇಕು",
   "UNABLE_TO_FETCH_CONTENT": "ಕಂಟೆಂಟ್ ಪಡೆದುಕೊಳ್ಳಲು ವಿಫಲವಾಗಿದೆ",
   "UNENROLL_CONFIRMATION_MESSAGE": "ನೀವು ಈಗ ನಡೆಯುತ್ತಿರುವ ಅಥವಾ ಮುಂದಿನ ಬ್ಯಾಚ್ ಅನ್ನು ಪುನಃ ಸೇರಬಹುದು  ",
-  "UNENROLL_FROM_COURSE": "ತರಬೇತಿಯನ್ನು ಬಿಡುವುದು",
+  "UNENROLL_FROM_COURSE": "ಕೋರ್ಸ್ ಬಿಡಿ",
   "UNIT_COMING_SOON": "ಬೇಗನೆ ಬರಲಿದೆ!",
   "UNKNOWN_QR": "ಸ್ಕ್ಯಾನ್ ಮಾಡಿದ QR  ಸಂಕೇತಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಯಾವುದೇ ಕಂಟೆಂಟ್  ಲಭ್ಯವಿಲ್ಲ",
   "UNSELECT_ALL": "ಎಲ್ಲ ಆಯ್ಕೆಯನ್ನು ತೆಗೆದುಹಾಕಿ",
@@ -609,19 +1159,14 @@
   "UPDATE_APP_TITLE": "ಆಪ್ ನ ಹೊಸ ಆವೃತ್ತಿ ಲಭ್ಯವಿದೆ!",
   "UPDATE_CONFIRMATION_TEXT": "ಕಂಟೆಂಟ್  ಅಪ್ ಡೇಟ್ ಮಾಡಬೇಕೆ? ",
   "UPDATE_CONTENT": "({{%s}}) ಪಠ್ಯಾಂಶ ಪರಿಷ್ಕರಿಸಿ",
-  "UPDATE_RECOVERY_ID": "ರಿಕವರಿ ಅಕೌಂಟ್ ನವೀಕರಿಸಿ",
+  "UPDATE_DETAILS": "ವಿವರಗಳನ್ನು ನವೀಕರಿಸಿ",
+  "UPDATE_RECOVERY_ID": "ರಿಕವರಿ ಅಕೌಂಟ್ ಅಪ್ಡೇಟ್ ಮಾಡಿ",
   "UPDATE_REQUIRED": "ಅಪ್ ಡೇಟ್  ಅಗತ್ಯವಿದೆ",
+  "UPDATE_YOUR_PREFERENCE_FROM_PROFILE": "ನಿಮ್ಮ {{app_name}} ಪ್ರೊಫೈಲ್ ವಿವರಗಳನ್ನು  ಪ್ರೊಫೈಲ್ ಸೆಟ್ಟಿಂಗ್ ನಿಂದ ನೀವು ಪರಿಷ್ಕರಿಸಬಹುದು    ",
   "UPDATING": "ಅಪ್ಡೇಟ್ ಆಗುತ್ತಿದೆ",
   "UPDATING_CONTENT": "ಅಪ್ ಡೇಟ್ ಆಗ್ತಿದೆ... {{%s}} %",
-  "USER": "ಬಳಕೆದಾರ",
   "USERNAME": "ಬಳಕೆದಾರರ ಹೆಸರು:  {{%s}}",
-  "USERS": "ಬಳಕೆದಾರರು",
-  "USERS_AND_GROUPS": "ಬಳಕೆದಾರರು ಮತ್ತು ಗುಂಪುಗಳು",
   "USER_CREATED_SUCCESSFULLY": "ಬಳಕೆದಾರ ಸೇರ್ಪಡೆ ಯಶಸ್ವಿಯಾಯಿತು. ",
-  "USER_DELETE_CONFIRM": " '{{%s}}' ಡಿಲೀಟ್ ಮಾಡುವುದನ್ನು ಖಚಿತಪಡಿಸಿ",
-  "USER_DELETE_CONFIRM_MESSAGE": "ಈ ಕ್ರಿಯೆಯು ಶಾಶ್ವತ, ಒಮ್ಮೆ ಡಿಲೀಟ್ ಮಾಡಿದರೆ ಬಳಕೆದಾರರು ಮತ್ತೆ ಲಭ್ಯತೆ ಹೊಂದಲಾರರು.",
-  "USER_DELETE_CONFIRM_MESSAGE_FROM_GROUP": "'{{%s}}' ತೆಗೆದುಹಾಕುವುದನ್ನು ಖಚಿತಪಡಿಸಿ ",
-  "USER_DELETE_CONFIRM_SECOND_MESSAGE": "ಈ ಕ್ರಿಯೆಯು ಬಳಕೆದಾರರನ್ನು ಗುಂಪಿನಿಂದ ತೆಗೆದುಹಾಕುತ್ತದೆ.  ಬಳಕೆದಾರರು ಟ್ಯಾಬ್ ನಲ್ಲಿ ಬಳಕೆದಾರರನ್ನು ಇನ್ನೂ ಕಾಣಬಹುದು. ",
   "USER_ID": "ಬಳಕೆದಾರ ID",
   "USER_IS_NOT_VERIFIED": "ನಿಮ್ಮ ಬಳಕೆದಾರ ಐಡಿಯ ಪರಿಶೀಲನೆ ಆಗಿಲ್ಲ",
   "USER_NAME": "ಬಳಕೆದಾರರ ಹೆಸರು",
@@ -629,36 +1174,51 @@
   "USER_TYPE_1": "ಶಿಕ್ಷಕ/ಕಿ",
   "USER_TYPE_2": "ವಿದ್ಯಾರ್ಥಿ",
   "USER_TYPE_3": "ಇತರೆ",
+  "USER_TYPE_5": "ಪೋಷಕ",
   "USER_TYPE_SELECT_WARNING": "ಬಳಕೆದಾರ ವಿಧವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ. ",
   "USER_VERIFICATION": "ಬಳಕೆದಾರರ ಪರಿಶೀಲನೆ",
-  "VERIFY_EMAIL_OTP_DESCRIPTION": "ಇಮೇಲ್ ID ಪರಿಶೀಲನೆಗಾಗಿ OTP ಯೊಂದಿಗೆ ನೀವು ಇಮೇಲ್ ಅನ್ನು ಸ್ವೀಕರಿಸುತ್ತೀರಿ",
-  "VERIFY_EMAIL_OTP_TITLE": "ಇಮೇಲ್ ID ಅನ್ನು ಪರಿಶೀಲಿಸಿ",
-  "VERIFY_PHONE_OTP_DESCRIPTION": "ಮೊಬೈಲ್ ನಂಬರ್ ಪರಿಶೀಲಿಸಲು ಒಟಿಪಿಯೊಂದಿಗೆ ನಿಮಗೆ ಒಂದು ಸಂದೇಶ ಬರುತ್ತದೆ  ",
+  "USE_APP_AS": "ಇವರಾಗಿ {{%s}} ಬಳಸಿ",
+  "VALIDATION_MAXIMUM_LENGTH": "ಗರಿಷ್ಠ 11 ಸಂಖ್ಯೆಯಷ್ಟು ಉದ್ದ ಇರಬೇಕು",
+  "VALIDATION_MINIMUM_LENGTH": "ಕನಿಷ್ಠ  11 ಸಂಖ್ಯೆಯಷ್ಟು ಉದ್ದ ಇರಬೇಕು",
+  "VERIFY": "ಪರಿಶೀಲಿಸಿ",
+  "VERIFY_EMAIL_OTP_DESCRIPTION": "ಇಮೇಲ್ ವಿಳಾಸ ಪರಿಶೀಲನೆಗಾಗಿ OTP ಯೊಂದಿಗೆ ನೀವು ಇಮೇಲ್ ಅನ್ನು ಸ್ವೀಕರಿಸುತ್ತೀರಿ",
+  "VERIFY_EMAIL_OTP_TITLE": "ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ಪರಿಶೀಲಿಸಿ",
+  "VERIFY_PHONE_OTP_DESCRIPTION": "ಮೊಬೈಲ್ ಸಂಖ್ಯೆ ಪರಿಶೀಲಿಸಲು ಒಟಿಪಿಯೊಂದಿಗೆ ನಿಮಗೆ ಒಂದು ಎಸ್.ಎಂ.ಎಸ್. ಬರುತ್ತದೆ  ",
   "VERIFY_PHONE_OTP_TITLE": "ಮೊಬೈಲ್ ಸಂಖ್ಯೆಯನ್ನು ಪರಿಶೀಲಿಸಿ",
   "VERSION": "ಆವೃತ್ತಿ",
-  "VIDEOS": "ವಿಡಿಯೋ",
+  "VERYFYING_PLEASE_WAIT": "ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ",
+  "VIDEO": "ವಿಡಿಯೋ",
   "VIEW": "ನೋಡಿ",
+  "VIEW_ACTIVITY": "ಚಟುವಟಿಕೆ ವೀಕ್ಷಿಸಿ",
   "VIEW_ALL": "ಎಲ್ಲವನ್ನು ನೋಡಿ",
   "VIEW_ALL_BATCHES": "ಮುಂದುವರೆಯಲು  ಒಂದು ಬ್ಯಾಚ್  ಆಯ್ಕೆ ಮಾಡಿ",
   "VIEW_CREDITS_INFO": "ಕ್ರೆಡಿಟ್ಸ್ ಮತ್ತು ಲೈಸೆನ್ಸ್ ಮಾಹಿತಿಯನ್ನು ನೋಡಿ",
   "VIEW_DOWNLOADS_ONLY_MSG": "ಡೌನ್ಲೋಡ್ ಗಳನ್ನು ಮಾತ್ರ ನೋಡಿ",
   "VIEW_MORE": "ಹೆಚ್ಚು ನೋಡಿ",
-  "VIEW_ONGOING_BATCHES": "ಪ್ರಸ್ತುತ ನಡೆಯುತ್ತಿರುವ ಬ್ಯಾಚ್ ಗಳನ್ನು ನೋಡಿ",
+  "VIEW_ONGOING_BATCHES": "ಸದ್ಯ ನಡೆಯುತ್ತಿರುವ ಬ್ಯಾಚ್ ನೋಡಿ",
+  "VIEW_OPEN_BATCHES": " ಬ್ಯಾಚ್ ಗಳನ್ನು ತೆರೆಯಿರಿ",
   "VIEW_RETIRED_BATCHES": "ದಿನಾಂಕ ಕೊನೆಗೊಂಡ ಬ್ಯಾಚ್ ಗಳು",
   "VIEW_UPCOMING_BATCHES": "ಮುಂದೆ ಬರುವ ಬ್ಯಾಚ್ ಗಳು ",
   "WAITING_TO_DOWNLOAD": "ಡೌನ್ಲೋಡ್ ಗೆ ಕಾಯುತ್ತಿದ್ದೇವೆ...",
   "WAIT_REQUEST": "ಕಂಟೆಂಟ್ ಪಡೆಯಲಾಗುತ್ತಿದೆ. ",
-  "WANT_TO_CHECK_FREE_TRAININGS": "ಉಚಿತ ತರಬೇತಿಗಳನ್ನು ಪರಿಶೀಲಿಸುವಿರಾ? ",
+  "WANT_TO_CHECK_FREE_TRAININGS": "ಕೋರ್ಸ್ ಗಳನ್ನು ಪರಿಶೀಲಿಸುವಿರಾ? ",
   "WARNING_PLEASE_MAKE_SOME_CHANGES": "ಬದಲಾವಣೆಗಳನ್ನು ಮಾಡಿ",
   "WEBVIEW_UPDATE_TEXT": "ಒಳ್ಳೆಯ ಅನುಭವಕ್ಕಾಗಿ, ಗೂಗಲ್ ಪ್ಲೇ ಸ್ಟೋರ್ ನಿಂದ ಇತ್ತೀಚಿನ ವೆಬ್ ವ್ಯೂ  ಆವೃತ್ತಿಯನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
+  "WEEKS_AGO": "‪{{%s}} ವಾರಗಳ‬ ಹಿಂದೆ",
+  "WEEK_AGO": "‪{{%s}}‬ ವಾರದ ಹಿಂದೆ",
+  "WELCOME": "ಸ್ವಾಗತ",
   "WELCOME_BACK": "ಮರಳಿ ಸ್ವಾಗತ {{%s}}",
+  "WHAT_IS_MEMBER_ID": "{{app_name}} ಐಡಿಯನ್ನು ನಾನು ಎಲ್ಲಿ ನೋಡಬಹುದು?",
+  "YEARS_AGO": "{{%s}} ವರ್ಷಗಳ ಹಿಂದೆ",
+  "YEAR_AGO": " {{%s}} ವರ್ಷಗಳ ಹಿಂದೆ",
   "YES": "ಹೌದು",
+  "YOUR_ID_FROM_STATE_BOARD_ORG": " ರಾಜ್ಯ/ಮಂಡಳಿ/ಸಂಸ್ಥೆಯಿಂದ ನಿಮ್ಮ ಐಡಿ ",
   "YOUR_LOCATION": "ನಿಮ್ಮ ಸ್ಥಳ",
   "YOUR_LOCATION_DETAILS": "ನಿಮಗೆ ಸೂಕ್ತವಾದ ಪಠ್ಯಾಂಶಗಳನ್ನು ಒದಗಿಸಲು ನಿಮ್ಮ ಸ್ಥಳದ ವಿವರಗಳು ಸಹಾಯ ಮಾಡುತ್ತವೆ. ನಿಮ್ಮ ಸ್ಥಳವು ಸರಿಯಾಗಿದೆಯೇ ಎಂದು ನೋಡಿ, ಇಲ್ಲವಾದಲ್ಲಿ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ, ಸಲ್ಲಿಸಿ. ",
   "YOUR_PROGRESS": "ನಿಮ್ಮ ಪ್ರಗತಿ:  {{%s}}%",
   "YOUR_PROGRESS_LABEL": "ನಿಮ್ಮ ಪ್ರಗತಿ",
   "YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET": "ನೀವು ಅಂತರ್ಜಾಲಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ",
-  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "ತರಬೇತಿಯ ವಿವರಗಳನ್ನು ನೋಡಲು ಮತ್ತು ಪಡೆಯಲು ನೀವು ಯಾವುದಾದರೂ ಸಕ್ರಿಯ ಬ್ಯಾಚ್ ಗೆ ಸೇರಬೇಕು. ",
-  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "ತರಬೇತಿಯ ವಿವರಗಳನ್ನು ಪಡೆಯಲು ನೀವು ಲಾಗ್ ಇನ್ ಆಗಬೇಕು",
+  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "ಕೋರ್ಸ್ ವಿವರಗಳನ್ನು ನೋಡಲು ಮತ್ತು ಪಡೆಯಲು ನೀವು ಒಂದು  ಸಕ್ರಿಯ ಬ್ಯಾಚ್ ಗೆ ಸೇರಬೇಕು. ",
+  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "ಕೋರ್ಸ್ ವಿವರಗಳನ್ನು ಪಡೆಯಲು ನೀವು ಲಾಗ್ ಇನ್ ಆಗಬೇಕು",
   "YOU_MUST_LOGIN_TO_ACCESS_QUIZ_CONTENT": "ಈ ಪಠ್ಯಾಂಶವನ್ನು ಪಡೆಯಲಿ ನೀವು ಲಾಗಿನ್ ಆಗಬೇಕು"
 }
\ No newline at end of file
diff --git a/src/assets/i18n/mr.json b/src/assets/i18n/mr.json
index 9dc88f269..00d0446a0 100644
--- a/src/assets/i18n/mr.json
+++ b/src/assets/i18n/mr.json
@@ -3,27 +3,51 @@
   "ABOUT_US": "आमच्या बद्दल",
   "ACCOMPLISHMENTS": "गुणवत्ता / सर्टिफिकेट्स ",
   "ACCOUNT_MERGE_CONFIRMATION_BTN_MERGE": "एकत्र करा ",
-  "ACCOUNT_MERGE_CONFIRMATION_CONTENT": "आपली {{%s}} कडे दोन खाती असल्यास, त्यांचे वापर तपशील एकत्र करण्यासाठी, <b>Merge</b>to: <ul><li> क्लिक करा, आणि </li><li> दुसरे खाते डिलीट करा </li> </ul> . नाहीतर, <b>Cancel</b> क्लिक करा ",
+  "ACCOUNT_MERGE_CONFIRMATION_CONTENT": "तुमची {{%s}} ची दोन खाती असल्यास, <b>एकत्र करा </b> क्लिक करून: <ul><li>त्यांचे वापर तपशील एकत्र करा, आणि </li><li> दुसरे खाते डिलीट करा </li> </ul> नाहीतर, <b>कॅन्सल</b> क्लिक करा ",
   "ACCOUNT_MERGE_CONFIRMATION_HEADING": "खाती एकत्र करा ",
   "ACCOUNT_MERGE_FAILED": "खाती एकत्र करण्यास अयशस्वी ",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_CONTENT": "खाती एकत्र करण्यास यशस्वीरीत्या सुरुवात झालेली आहे. ते पूर्ण होताच आपल्याला कळवले जाईल. ",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_HEADING": "खाती एकत्र करा ",
-  "ACCURACY": "अचूकपणा",
   "ACTIVE": "सक्रिय",
   "ACTIVE_DOWNLOADS": "सक्रिय डाउनलोड्स",
+  "ACTIVITIES": "क्रियाकलाप ",
+  "ACTIVITIESE_SEARCH_PLACEHOLDER": "गटाचे क्रियाकलाप शोधा ",
+  "ACTIVITY_ALREADY_ADDED_IN_GROUP": "तुम्ही गटासाठी हा क्रियाकलाप आधी जोडलेला आहे ",
+  "ACTIVITY_COLLECTION_TITLE": "संग्रह ",
+  "ACTIVITY_COURSE_TITLE": "कोर्सेस ",
+  "ACTIVITY_EXPLANATION_CONTENT_TITLE": "स्पष्टीकरण सामग्री ",
+  "ACTIVITY_PRACTICE_QUESTION_SET_TITLE": "सराव प्रश्न संच",
+  "ACTIVITY_PRACTICE_RESOURCE_TITLE": "सराव स्रोत ",
+  "ACTIVITY_RESOURCE_TITLE": "स्रोत ",
+  "ACTIVITY_TEXTBOOK_TITLE": "पाठ्यपुस्तके ",
+  "ACTIVITY_TV_EPISODE_TITLE": "टीव्ही वर्गाचा भाग ",
   "ADD": "जोडा",
+  "ADD_ACTIVITY": "क्रियाकलाप जोडा ",
+  "ADD_ACTIVITY_ERROR_MSG": "क्रियाकलाप जोडता आले नाही.  पुनः प्रयत्न करा ",
+  "ADD_ACTIVITY_SUCCESS_MSG": "क्रियाकलाप यशस्वीरित्या जोडले ",
+  "ADD_ANOTHER_USER": "आणखी एक वापरकर्ता जोडा ",
   "ADD_DISTRICT": "जिल्हा जोडा ",
-  "ADD_EMAIL": "ई-मेल आयडी जोडा ",
-  "ADD_PHONE": "फोन नंबर जोडा ",
+  "ADD_EDIT_SELF_DECLARED_TEACHER_INFO": "तुमची प्रगती प्रमाणित करण्यासाठी व त्याची नोंद ठेवण्यासाठी, हे तपशील तुमच्या घोषित राज्याला पुरवले जातील ",
+  "ADD_EMAIL": "ई-मेल अॅड्रेस जोडा ",
+  "ADD_MEMBER": "सभासद जोडा ",
+  "ADD_MEMBER_CONFIRMATION": "पुढे जाण्याआधी सभासदाचे नाव व {{app_name}} ID जुळतात का, हे तपासून पाहणे आवश्यक आहे ",
+  "ADD_MEMBER_POPUP_DESC": "सभासदांना त्यांचा विशेष {{%s}} ID ओळखण्यास मार्गदर्शन करण्यासाठी खालील सूचना वापरा ",
+  "ADD_MEMBER_POPUP_STEP_1": "<span>क्रम १</span> : प्रोफाइल टॅब क्लिक करा  ",
+  "ADD_MEMBER_POPUP_STEP_2": "<span>क्रम २ </span> : {{%s}} ID इथे पहा ",
+  "ADD_MEMBER_POPUP_TITLE": "मला {{%s}} ID कुठे दिसेल? ",
+  "ADD_PHONE": "मोबाइल नंबर जोडा ",
   "ADD_RECOVERY_ACCOUNT": "रिकव्हरी खाते जोडा ",
   "ADD_RECOVERY_ID": "रिकव्हरी खाते जोडा ",
   "ADD_STATE": "राज्य जोडा ",
+  "ADD_TO_GROUP": "गटाला जोडा ",
+  "ADD_TO_GROUP_ACTIVITY": "गटात जोडा ",
+  "ADD_USER": "वापरकर्ता जोडा ",
   "ADD_USERS": "वापरकर्ते जोडा",
-  "ADD_USERS_TO_GROUP": "{{%s}} वापरकर्त्यास गटात समाविष्ट करा",
+  "AGREE_TO_SHARE_PROFILE_DETAILS": "च्या अनुसार मी माझे प्रोफाइल तपशील कोर्स प्रशासकाबरोबर सामायिक करण्यास मान्यता देतो/देते  ",
   "ALL": "सर्व ",
   "ALLOW": "परवानगी द्या ",
   "ALL_ANNOUNCEMENTS": "सर्व घोषणा",
-  "ALREADY_ENROLLED_COURSE": "या कोर्ससाठी वापरकर्ता  नोंदवलेला आहे",
+  "ALREADY_ENROLLED_COURSE": "तुम्ही  कोर्ससाठी आधीच नोंदणी केली आहे ",
   "ALWAYS_ON": "सदा चालू",
   "ANDROID_NOT_SUPPORTED": "Android च्या या आवृत्तीला समर्थन नाही  ",
   "ANDROID_NOT_SUPPORTED_DESC": "हे साहित्य तुमच्या फोनवर उघडु शकत नाही कारण तुमचा  फोन Android च्या जुन्या आवृत्तीवर चालत आहे. तुम्ही हे साहित्य Crosswalk ने पाहू शकता जर तुमच्या फोनचे मॉडेल असे करू देते.  ",
@@ -31,19 +55,21 @@
   "ANSWER": "उत्तर ",
   "APPLY": "अर्ज करा/लागू करा ",
   "APPLY_FILTER": "फिल्टर लागू करा",
+  "APP_ID": "{{%s}} ID ",
   "APP_QR_CODE": "{{%s}} QR कोड दिसतो आहे का?",
   "APP_RATING_RATE_EXPERIENCE": "तुमच्या ऍप अनुभवास रेट करा",
   "APP_RATING_RATE_ON_PLAYSTORE": "तुम्ही तुमचे रेटिंग प्ले स्टोर वर जमा करू इच्छिता?",
   "APP_RATING_REPORT_AN_ISSUE": "तुमच्या वाईट अनुभवासाठी आम्ही क्षमस्वी आहोत. तुम्ही एखाद्या समस्येची तक्रार करू इच्छिता का?",
   "APP_RATING_TAP_ON_STARS": "प्ले स्टोर वर रेट करण्यासाठी तारे टॅप करा",
   "APP_RATING_THANKS_FOR_RATING": "तुमच्या अनुभवाचे रेटिंग केल्याबद्दल धन्यवाद!",
+  "APP_TITLE": "{{%s}} वर तुमचे स्वागत!",
   "APP_VERSION": "अॅपची आवृत्ति",
   "ARE_YOU_STATE_TEACHER": "आपण {{%}} मध्ये सरकारी शालेय शिक्षक आहात का?",
   "AS_FILE": "फाईल म्हणून",
   "AS_LINK": "लिंक  म्हणून",
   "ATTACHMENT_DOWNLOADED": "अटाचमेंट डाऊनलोड झालं आहे",
   "ATTRIBUTIONS": "आभार",
-  "AUDIOS": "ऑडिओ ",
+  "AUDIO": "ऑडिओ ",
   "AUTHOR": "लेखक ",
   "AUTOMATIC_SYNC": "अॉटोमाटिक सिंक",
   "AUTO_MIGRATION_FAIL_MESSAGE": "खाती एकत्र करण्यास असमर्थ ",
@@ -52,28 +78,24 @@
   "AVAILABLE_FILTERS": "उपलब्ध फिल्टर्स",
   "AVAILABLE_FOR_TEACHERS": "फक्त शिक्षकांसाठी उपलब्ध ",
   "AVATAR": "अवतार",
-  "AVERAGE_SCORE": "सर्वसामान्य गुण",
-  "AVERAGE_TIME": "सर्वसामान्य  वेळ",
   "BACK_TO_EXIT": "ऍपमधून बाहेर पडण्यासाठी पुन्हा टॅप करा",
-  "BATCHEND_MAIN_HEADING": "आपल्या बॅचचे प्रशिक्षण ... रोजी संपले ",
-  "BATCHEND_SUB_HEADING": "आपण प्रशिक्षण चालू ठेवू शकता, पण आपली प्रगती उपडेट केली जाणार नाही ",
+  "BATCHEND_MAIN_HEADING": "या बॅचचे प्रशिक्षण {{%s}} रोजी संपले ",
+  "BATCHEND_SUB_HEADING": "तुम्ही कोर्स  चालू ठेवू शकता, पण तुमची प्रगती उपडेट केली जाणार नाही ",
   "BATCHES_AVAILABLE": "उपलब्ध बॅचेस ",
-  "BATCHES_FOR_THIS_COURSE": "या कोर्स साठीच्या बॅचेस",
+  "BATCHES_FOR_THIS_COURSE": "या कोर्स साठी बॅचेस",
   "BATCH_CREATED_BY": "च्या द्वारे निर्मित",
   "BATCH_DETAILS": "बॅचची माहिती",
   "BATCH_ENROLLMENT_ENDED": "या बॅच साठी नोंदणी संपली आहे ",
   "BATCH_EXPIRED": "बॅच पूर्ण झाली आहे",
   "BATCH_EXPIRED_BUTTON": "ठीक आहे",
-  "BATCH_EXPIRED_DESCRIPTION": "बॅचची कालावधी पूर्ण झाली  आहे. तुम्ही अभ्यास चालु ठेवू शकता. पण, तुमची प्रगती कॅप्चर केली जाणार नाही किंवा परीक्षण केले जाणार नाही.",
   "BOARD": "बोर्ड",
   "BOARD_OPTION_TEXT": "बोर्ड निवडा",
+  "BROWES_RELEVANT_CONTENT": "तुमच्या निवडीवर (बोर्ड, माध्यम, वर्ग) आधारित असलेली सामग्री शोधण्यासाठी {{app_name}} लायब्ररी ब्राउझ करा  ",
   "BTN_CLICK_TO_OPEN_CONTENT": "साहित्य पाहण्यासाठी टॅप करा",
   "BTN_LATER": "नंतर",
   "BTN_RATE_ON_PLAYSTORE": "प्ले स्टोर वर रेट करा",
   "BTN_SUBMIT": "सबमिट करा",
   "BTN_VISIT_HELP_SECTION": "सहायता क्षेत्राकडे जा",
-  "BY_QUESTIONS": "प्रश्नांद्वारा",
-  "BY_USERS": "वापरकर्त्यांद्वारे",
   "CAMERA": "कॅमेरा ",
   "CAMERA_PERMISSION_DESCRIPTION": "{{%s}} QR कोड्सच्या सकॅनिंग साठी कॅमेरा वापरण्याची आवश्यकता आहे ",
   "CANCEL": "रद्द करा",
@@ -83,23 +105,34 @@
   "CANCEL_DOWNLOAD": "डाऊनलोड रद्द करा",
   "CANCEL_DOWNLOAD_MESSAGE": "डाउनलोड रद्द केल्यास सक्रिय डाउनलोड्स मधून मजकूर काढून टाकला जाईल ",
   "CANCEL_DOWNLOAD_TITLE": "डाउनलोड रद्द करायचे का?",
-  "CERTIFIED_TRAINING": "प्रमाणित प्रशिक्षण ",
+  "CERTIFICATE_ALREADY_DOWNLOADED": "हे प्रमाणपत्र आधीच डाउनलोड झाले आहे, कृपया तुमचा डाउनलोड फोल्डर तपासून पहा ",
+  "CERTIFICATE_DOWNLOADED": "हे प्रमाणपत्र डाउनलोड झालेले आहे ",
+  "CERTIFICATE_DOWNLOAD_INFO": "प्रमाणपत्र डाउनलोड होत आहे ",
+  "CERTIFIED_TRAINING": "प्रमाणपत्र मिळवा",
   "CHANGE": "बदला",
   "CHANGE_ROLE": "भूमिका बदला",
-  "CHANGE_USER": "वापरकर्ता बदला",
+  "CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "तुम्ही हा विभाग संपवला आहे ",
+  "CHARACTERS_REMAINING": "{{character_count}} उर्वरित वर्ण",
   "CHECK_FOR_UPDATES": "अपडेट तपासून पहा",
   "CHOOSE_FROM_FOLLOWING": "खालीलमधून निवडा",
   "CHOOSE_LANGUAGE": "तुमच्या आवडीची भाषा निवडा",
+  "CHOOSE_USER": "वापरकर्ता निवडा ",
   "CHOOSE_WHERE_TO_SAVE_DATA": "डेटा जतन करण्याचे स्थान निवडा ",
   "CLASS": "इयत्ता",
   "CLASSES": "वर्ग ",
   "CLEAR": "काढून टाका ",
   "COACH_SCREEN": "QR कोड स्कॅन केल्यास तुम्ही मजकूराकडे जाल ",
   "COMMUNITIES": "समुदाय",
-  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "प्रशिक्षण ... पर्यंत पूर्ण करा ",
+  "COMPLETED": "पूर्ण ",
+  "COMPLETE_ASSESSMENT_TO_EARN_CERTIFICATE": "मूल्यांकन {{%s}} पर्यंत पूर्ण करा ",
+  "COMPLETE_BY": "{{%s}} पर्यंत पूर्ण करा ",
+  "COMPLETE_CHAPTER_TO_UNLOCK_ACHIEVEMENT": "नवीन यश अनलॉक करण्यासाठी {{%s}} सामग्री पूर्ण करा ",
+  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "कोर्स {{%s}} पर्यंत पूर्ण करा ",
   "CONFIRM": "पुष्टी",
+  "CONGRATULATIONS": "अभिनंदन!",
   "CONNECT_TO_INTERNET_SUGGESTION": "मजकूर पाहण्यासाठी इंटरनेटशी जोडा ",
   "CONSIDER_DOWNLOAD": "मजकूर डाउनलोड करण्याचा विचार करा",
+  "CONTENTS": "मजकूर ",
   "CONTENT_ALREADY_EXIST": "ही फाईल आधीच आयात केलेली आहे. कृपया नवीन फाईल निवडा.",
   "CONTENT_ALREADY_EXISTS": "'डेस्टिनेशन फोल्डर' मध्ये हा मजकूर आधीच उपलब्धआहे. तरीही मजकूर 'डेस्टिनेशन फोल्डर' ला हलवू इच्छिता?",
   "CONTENT_COMING_SOON": "आम्ही या साठी साहित्य तयार करत आहोत",
@@ -108,12 +141,15 @@
   "CONTENT_CREATING": "आम्ही या साठी साहित्य तयार करत आहोत",
   "CONTENT_DELETE": "मजकूर हटविल्याने मोबाईल वरून मजकूर  काढला जाईल",
   "CONTENT_DELETE_FAILED": "सामग्री हटविणे अयशस्वी झाले",
+  "CONTENT_DERIVED_FROM": "हा मजकूर इथून व्युत्पन्न झाला आहे ",
   "CONTENT_IMPORTED": "यशस्वीरीत्या आयात केले आहे ",
   "CONTENT_IMPORTED_FAILED": "ईम्पोर्ट अयशस्वी",
-  "CONTENT_IS_BEEING_ADDED": "मजकूर जोडला जात आहे",
+  "CONTENT_IS_BEEING_ADDED": "{{content_name}} मजकूर जोडला जात आहे",
   "CONTENT_IS_BEING_ADDED": "तुमचे राज्य लवकरच या QR कोडसाठी सामग्री जोडेल. ते लवकरच उपलब्ध होईल",
   "CONTENT_NOT_AVAILABLE": "मजकूर उपलब्ध नाही",
   "CONTENT_PLAYER_EXIT_PERMISSION": "तुम्ही हा मजकूर सोडून जाऊ इच्छिता का?",
+  "CONTENT_PREFERENCE": "प्राधान्य असलेली सामग्री ",
+  "CONTENT_PREFERENCE_SELECTION": "प्राधान्य असलेली सामग्री निवडा ",
   "CONTENT_RATING_SUB_HEADING": "सामग्री रेट करण्यासाठी तार्‍यांवर टॅप करा",
   "CONTENT_RETIRED_BY_AUTHOR": "हा मजकूर लेखकाने काढला आहे म्हणून यापुढे तो उपलब्ध नाही",
   "CONTENT_SIZE": "मजकूराचे आकारमान ",
@@ -122,48 +158,193 @@
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO_SDCARD": "मजकूर यशस्वीरीत्या एस डी कार्ड वर हलवलाआहे ",
   "CONTINUE": "पुढे",
   "CONTINUE_AS_ROLE": "'{{%s}}' म्हणून पुढे जा",
-  "CONTINUE_NOW": "पुढे ",
+  "CONTINUE_LEARNING": "पुढे शिका ",
   "CONTRIBUTIONS": "योगदान",
   "CONTRIBUTORS": "योगदानकर्ता",
   "COPYRIGHT": "कॉपीराईट ",
+  "COURSES": "कोर्सेस ",
   "COURSES_BNAV": "कोर्सेस ",
   "COURSES_IN_PROGRESS": "माझे कोर्स ",
   "COURSE_COMPLETED_LABEL": "{{%s}}% पूर्ण ",
-  "COURSE_ENDED": "{{%s}} अभ्यासक्रम संपला ",
-  "COURSE_ENROLLED": "नोंदणी केलेले कोर्स",
-  "COURSE_NOT_AVAILABLE": "हा अभ्यासक्रम आता सक्रिय नाही ",
+  "COURSE_COMPLETION_POPUP_DESC": "७ दिवसांच्या आत तुमच्या नोंदणीकृत संपर्क तपशीलावर कोर्स  प्रमाणपत्राबद्दल कळवले जाईल ",
+  "COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "टीप: या कोर्सला प्रमाणपत्र नाही ",
+  "COURSE_ENDED": "{{%s}} रोजी कोर्से संपला ",
+  "COURSE_ENDED_ON": "{{%s}} रोजी कोर्से संपला ",
+  "COURSE_ENROLLED": "तुमची  कोर्ससाठी नोंदणी झाली आहे ",
+  "COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}}ला कोर्स शेवटचा अपडेट केला ",
+  "COURSE_NOT_AVAILABLE": "हा कोर्स  आता सक्रिय नाही ",
+  "COURSE_NO_CERTIFICATE_MESSAGE": "सध्या  या कोर्सला प्रमाणपत्र नाही. कोर्सचा निर्माता कालांतराने प्रमाणपत्र जोडू शकतो. ",
   "COURSE_PROGRESS_COMPLETED": "पूर्ण: {{%s}} %",
-  "COURSE_UNENROLLED": "कोर्समधून यशस्वीरित्या नोंदणी रद्द केली आहे ",
-  "COURSE_WILL_BE_AVAILABLE": " {{%s}} पासून कोर्स उपलब्ध होईल",
+  "COURSE_UNENROLLED": "तुम्ही  यशस्वीरित्या  कोर्स  सोडला आहे ",
+  "COURSE_WILL_BE_AVAILABLE": " {{%s}} पासून बॅच उपलब्ध होईल",
   "CREATE_GROUP": "गट निर्माण करा",
-  "CREATE_NEW_GROUP": "नवीन गट तयार करा",
-  "CREATE_NEW_USER": "नवीन वापरकर्ता निर्कमाण करा",
+  "CREATE_GROUP_DESCRIPTION": "तुम्ही ग्रुप निर्माण करण्यापासून एकच पायरी दूर आहात ",
+  "CREATE_GROUP_DESCRIPTION_POPUP": "लोकांशी जोडले जाण्यासाठी, क्रियाकलाप शेअर करण्यासाठी, प्रगती जोखण्यासाठी व इतर शक्यता पडताळण्यासाठी ग्रुप निर्माण करा किंवा ग्रुपचे सभासद व्हा ",
   "CREATE_USER": "वापरकर्ता  निर्मिती",
-  "CREATORS": "{{%s}} रोजी यांनी निर्माण केले:  ",
+  "CREATORS": "{{%s}} वर निर्माण केले:  ",
   "CREDITS": "श्रेय",
   "CREDITS_LICENCE_INFO": "श्रेय व परवाना माहिती ",
-  "CSV_DOWNLOAD_SUCCESS": "{{%s}} डाउनलोड्स मध्ये जतन केले आहे  ",
+  "CRS_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "सुरू करण्यासाठी कोर्स निवडा ",
+  "CRS_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "कोर्स ",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "कोर्सेस ",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "कोर्सेस ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}च्या लायब्ररीमध्ये अनेक {{%explainVideos}}, {{%quesBanks}} आणि इतर {{%interactiveMaterial}} आहे. लायब्ररीचे अन्वेषण करण्यासाठी एखाद्या कोर्सवर क्लिक करा! ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}})साठी कोणतेही कोर्सेस सापडले नाहीत ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "बोर्ड कोर्सेस जोडत आहे ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}}वर कोर्स मिळाला नाही का? ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span> कोर्सच्या प्रगतीचा मागोवा घेऊ शकत नाही ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "तुम्ही {{%s}}ला मागवलेला कोर्स तुमच्या राज्य बोर्डाने अपलोड करताच आम्ही तुम्हाला सूचित करू.  ",
+  "CRS_NONTRK_QR_CODE_DETAILS": "तुमच्या कोर्समधील QR code स्कॅन करून डिजिटल सामग्रीवर त्वरित प्रवेश मिळवा ",
+  "CRS_NONTRK_SEE_MORE_BOOKS": "अधिक कोर्सेस व सामग्री पहा ",
+  "CRS_NONTRK_STUDENT_ROLE_DESC_1": "कोर्सेस व डिजिटल सामग्री ब्राऊज करा ",
+  "CRS_NONTRK_TEACHER_ROLE_DESC_1": "कोर्सेस व डिजिटल सामग्री ब्राऊज करा ",
+  "CRS_NONTRK_TUTORIAL_HEADING": "व्हिडिओ, परस्परसंवादी सामग्री, ई-पाठ्यपुस्तके आणि बरेच काही...",
+  "CRS_TRK_BATCHEND_MAIN_HEADING": "{{%s}} रोजी पूर्ण होणाऱ्या कोर्सच्या बॅचमध्ये तुम्ही सहभागी झाला आहात ",
+  "CRS_TRK_BATCHEND_SUB_HEADING": "तुम्ही कोर्स चालू ठेवू शकता, पण तुमची प्रगती अपडेट केली जाणार नाही ",
+  "CRS_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "तुम्ही हा विभाग पूर्ण केला आहे ",
+  "CRS_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} पर्यंत कोर्स पूर्ण करा ",
+  "CRS_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "कोर्सेस ",
+  "CRS_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "या कोर्समध्ये तुम्ही सहभागी झाला आहात ",
+  "CRS_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "कोर्ससाठी बॅचेस ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "कोर्सेस ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "माझे कोर्स ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "कोर्स {{%s}} रोजी संपला ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}} रोजी कोर्स शेवटचा अपडेट केला ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_NOT_AVAILABLE": "हा कोर्स निष्क्रिय आहे ",
+  "CRS_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "कोर्समध्ये सहभागी व्हा ",
+  "CRS_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "नवीनतम कोर्सेस ",
+  "CRS_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "कोर्स सोडायचा का?",
+  "CRS_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "कोर्समध्ये सहभागी होण्यासाठी लॉगिन करा ",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_COURSES": "कोर्सेस नाहीत ",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "कोर्सेस किंवा लायब्ररी मधून सामग्री डाउनलोड करा ",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "कोर्सेस ({{%s}})",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "कोर्से ({{%s}})",
+  "CRS_TRK_FRMELEMNTS_LBL_OVERLAY_LABEL_TAKE_COURSE": "या कोर्समध्ये सहभागी होण्यासाठी लॉगिन करा ",
+  "CRS_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "लोकप्रिय कोर्सेस ",
+  "CRS_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ऑनलाइन कोर्सेस घ्या ",
+  "CRS_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "प्रमाणपत्र मिळवण्यासाठी कोर्स {{%s}} पर्यंत पूर्ण करा ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING": "कोर्स ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "सहभाग घेतलेले  कोर्स  ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "कोर्स तपशील ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "कोर्स या दिवशी संपतो:",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "कोर्स संपण्याची तारीख ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "कोर्स तपशील ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "हा कोर्स यांना अनुरूप आहे: ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "कोर्स विभाग ",
+  "CRS_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "कोर्स सोडा ",
+  "CRS_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "कोर्सेस पहायचे आहेत का?",
+  "CRS_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "या कोर्सची बॅच {{batch_start_date}} पासून उपलब्ध आहे ",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "तुम्हाला ७ दिवसात तुमच्या नोंदणीकृत संपर्क तपशिलांवर कोर्स प्रमाणपत्राबद्दल सूचित केले जाईल ",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "सूचना: या कोर्सला प्रमाणपत्र नाही ",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "तुम्ही या कोर्समध्ये सहभागी झाला आहात ",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "सूचना: सध्या या कोर्सला प्रमाणपत्र नाही. कोर्सचा निर्माता कालांतराने प्रमाणपत्र जोडू शकतो.",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "तुम्ही कोर्स सोडलेला आहे ",
+  "CRS_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "या कोर्ससाठी बॅचेस नाहीत ",
+  "CRS_TRK_FRMELEMNTS_MSG_OTHER_ROLE_DESC_2": "ऑनलाइन कोर्स घ्या ",
+  "CRS_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "हा कोर्स नोंदणीकृत वापरकर्त्यांसाठी आहे. कोर्समध्ये प्रवेश करण्यासाठी लॉगिन करा.",
+  "CRS_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "या कोर्ससाठी बॅचेस उपलब्ध नाहीत ",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "फक्त नोंदणीकृत वापरकर्ते कोर्स घेऊ शकतात ",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "तुम्ही हा कोर्स यशस्वीरीत्या पूर्ण केला आहे ",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "हा कोर्स संपला आहे. तुम्ही पुन्हा चाचणी घेऊ शकता, पण तुमच्या प्रगतीचा अहवाल दिला जाणार नाही.",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "कोर्स संपलेला आहे. तुम्ही चाचणी घेऊ शकता, पण तुमची प्रगती नोंदवली जाणार नाही ",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "कोर्स तपशील पाहण्यासाठी व प्रवेश करण्यासाठी तुम्हाला सक्रिय बॅचमध्ये सहभागी व्हावे लागेल  ",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "कोर्स तपशील पाहण्यासाठी तुम्हाला लॉगिन करावे लागेल ",
   "CURRENT_LANGUAGE": "प्रचलित भाषा",
-  "DATA": "अधिक पुस्तके व मजकूर पहा ",
   "DATA_SYNC": "डेटा सिंक",
   "DATA_SYNC_FAILURE": "डेटा सिंक करणे शक्य झाले नाही, नंतर पुन्हा प्रयत्न करा",
+  "DATA_SYNC_NOTHING_TO_SYNC": "समक्रमित करण्यासाठी काही नाही ",
   "DATA_SYNC_SUB": "तुमचा डेटा बॅकअप करा, टेलिमेट्री ट्रान्स्फर करा",
   "DATA_SYNC_SUCCESSFUL": "टेलीमेट्री डेटा सिंक यशस्वी",
+  "DAYS_AGO": "{{%s}} दिवसांपूर्वी ",
+  "DAY_AGO": "{{%s}} दिवसापूर्वी ",
   "DELETE": "काढूण टाका",
   "DELETE_ALL_CONTENT_WARNING": "मजकूर हटवल्यामुळे डिव्हाइसवरून निवडलेला मजकूर काढला जाईल",
   "DELETE_CONTENT": "मजकूर खोडा?",
+  "DELETE_CONTENT_SIZE": "एक कलम ({{content_size}})",
   "DELETE_CONTENT_WARNING": "'मजकूर खोडा' निवडल्यास यंत्रावरून मजकूर काढून टाकला जाईल ",
-  "DELETE_GROUP": "गट काढा",
+  "DELETE_GROUP_DESC": "{{group_name}} डिलीट केल्याने ऍप वरून ग्रुप कायमस्वरूपी काढून टाकला जाईल ",
+  "DELETE_GROUP_ERROR_MSG": "गट काढू शकला नाहीत. पुनः प्रयत्न करा ",
+  "DELETE_GROUP_POPUP_TITLE": "गट डिलीट करायचा का? ",
+  "DELETE_GROUP_SUCCESS_MSG": "गट यशस्वीरीत्या डिलीट झाला आहे",
   "DELETE_PROGRESS": "निवडलेला मजकूर हटवित आहोत",
-  "DESCRIPTION": "अधिक माहिती ",
+  "DETAIL_TUTORIAL": "{{%appName}}च्या सामग्रीसंग्रहात अनेक {{%explainVideos}}, {{%quesBanks}} आणि इतर  {{%interactiveMaterial}} आहेत. सामग्रीसंग्रहाचे अन्वेषण करण्यासाठी पाठ्यपुस्तकावर क्लिक करा ",
   "DEVICE_ID": "डिव्हाइस अायडी",
   "DEVICE_LOCATION": "यंत्राचे स्थान ",
   "DEVICE_TAGS": "डिव्हाइस टॅग",
   "DEVICE_TAGS_SUB": "डिव्हाइस टॅग जोडा/काढा",
+  "DFLT_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "सुरू करण्यासाठी कार्य निवडा ",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "कार्य ",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "कार्ये ",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "कार्ये ",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}च्या लायब्ररीमध्ये अनेक {{%explainVideos}}, {{%quesBanks}} आणि इतर {{%interactiveMaterial}} आहे. लायब्ररीचे अन्वेषण करण्यासाठी एखाद्या सामग्रीवर क्लिक करा!",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}})साठी कोणतीही कार्ये सापडली नाहीत ",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "बोर्ड सामग्री जोडत आहे ",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}}वर सामग्री सापडली नाही?",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span> प्रगतीचा मागोवा घेतला जाऊ शकत नाही ",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "तुम्ही {{%s}}ला मागवलेली सामग्री तुमच्या राज्य बोर्डाने अपलोड करताच आम्ही तुम्हाला सूचित करू ",
+  "DFLT_NONTRK_QR_CODE_DETAILS": "QR code स्कॅन करून डिजिटल सामग्रीवर त्वरित प्रवेश मिळवा ",
+  "DFLT_NONTRK_SEE_MORE_BOOKS": "अधिक पहा ",
+  "DFLT_NONTRK_STUDENT_ROLE_DESC_1": "डिजिटल सामग्रीसाठी ब्राऊज करा ",
+  "DFLT_NONTRK_TEACHER_ROLE_DESC_1": "डिजिटल सामग्रीसाठी ब्राऊज करा ",
+  "DFLT_NONTRK_TUTORIAL_HEADING": "व्हिडिओ, परस्परसंवादी सामग्री, ई-पाठ्यपुस्तके आणि बरेच काही...",
+  "DFLT_TRK_BATCHEND_MAIN_HEADING": "तुम्ही {{%s}} रोजी संपणाऱ्या अभ्यास कार्याच्या बॅचमध्ये सहभागी झालाआहात ",
+  "DFLT_TRK_BATCHEND_SUB_HEADING": "तुम्ही अभ्यासक्रम चालू ठेवू शकता, पण तुमची प्रगती अपडेट केली जाणार नाही ",
+  "DFLT_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "ही अभ्यास क्रिया तुम्ही पूर्ण केली आहे ",
+  "DFLT_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} पर्यंत अभ्यासक्रम पूर्ण करा ",
+  "DFLT_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "हे अभ्यास कार्य निष्क्रिय आहे ",
+  "DFLT_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "अभ्यास कार्ये ",
+  "DFLT_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "तुम्ही या अभ्यास कार्यात सहभागी झाला आहात ",
+  "DFLT_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "अभ्यास कार्यासाठी बॅचेस ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "अभ्यास कार्य ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "माझी अभ्यास कार्ये ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "कार्य {{%s}} रोजी संपले ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "शेवटचे {{last_updated_on_date}} रोजी अपडेट केले ",
+  "DFLT_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "सहभागी व्हा ",
+  "DFLT_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "नवीनतम अभ्यास कार्य ",
+  "DFLT_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "कार्य सोडायचे का?",
+  "DFLT_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "सहभागी होण्यासाठी लॉगिन करा ",
+  "DFLT_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "सामग्री डाउनलोड करा ",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "कार्ये ({{%s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "कार्य ({{%s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "ऑनलाइन अभ्यासक्रम घ्या ",
+  "DFLT_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "लोकप्रिय कार्ये ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ऑनलाइन  अभ्यासक्रम घ्या  ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "प्रमाणपत्र मिळवण्यासाठी {{%s}} पर्यंत कार्य पूर्ण करा ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING": "अभ्यास कार्य ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "सहभाग घेतलेली अभ्यास कार्ये ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "कार्य तपशील ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "कार्य या दिवशी संपते:",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "कार्य संपण्याची तारीख ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "कार्य तपशील ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "हे कार्य यांना अनुरूप आहे:",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "कार्य संसाधने ",
+  "DFLT_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "कार्य सोडा ",
+  "DFLT_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "अभ्यास कार्ये पाहायची आहेत का?",
+  "DFLT_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "या कार्याची बॅच {{batch_start_date}}पासून उपलब्ध आहे ",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "तुम्हाला तुमच्या नोंदणीकृत संपर्क तपशिलांवर प्रमाणपत्राबद्दल ७ दिवसात कळवले जाईल ",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "सूचना: या कार्याला प्रमाणपत्र नाही ",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "तुम्ही कार्यात सहभागी झाला आहात ",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "सूचना: सध्या या कार्याला प्रमाणपत्र नाही. निर्माता कालांतराने प्रमाणपत्र जोडू शकतो.",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "तुम्ही कार्य सोडलेले आहे ",
+  "DFLT_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "या अभ्यास कार्यासाठी कोणतीही बॅच नाही ",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "हे कार्य नोंदणीकृत वापरकर्त्यांसाठी आहे. कार्यात प्रवेश करण्यासाठी लॉगिन करा ",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "हे कार्य सुरू करण्यासाठी लॉगिन करा ",
+  "DFLT_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "या कार्यासाठी बॅचेस उपलब्ध नाहीत ",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "फक्त नोंदणीकृत वापरकर्ते अभ्यास कार्यात सहभागी होऊ शकतात ",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "तुम्ही हे कार्य यशस्वीरीत्या पूर्ण केले आहे ",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "हे कार्य संपले आहे. तुम्ही पुन्हा चाचणी घेऊ शकता, पण तुमच्या प्रगतीचा अहवाल दिला जाणार नाही.",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "हे कार्य संपलेले आहे. तुम्ही चाचणी घेऊ शकता, पण तुमच्या प्रगतीचा मागोवा घेतला जाणार नाही.",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "कार्य तपशील पाहण्यासाठी व प्रवेश करण्यासाठी तुम्हाला सक्रिय बॅचमध्ये सहभागी व्हावे लागेल ",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "कार्य तपशील पाहण्यासाठी तुम्हाला लॉगिन करावे लागेल ",
   "DISMISS": "रद्द करा",
+  "DISMISS_AS_GROUP_ADMIN": "गट ऍडमिन म्हणून काढून टाका ",
+  "DISMISS_AS_GROUP_ADMIN_ERROR_MSG": "{{member_name}} ला गट एडमिन म्हणून काढता आले नाही  ",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_DESC": "{{member_name}} ला काढून टाकत आहोत, कारण ग्रुप ऍडमिनने या सभासदाची ऍडमिन परवानगी रद्द केली आहे ",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_TITLE": "ग्रुप ऍडमिन म्हणून काढून टाकायचे का? ",
+  "DISMISS_AS_GROUP_ADMIN_SUCCESS_MSG": "आता {{member_name}} गट एडमिन नाही ",
   "DISTRICT": "जिल्हा ",
   "DISTRICT_OPTION_TEXT": "जिल्हा निवडा ",
-  "DOCS": "डॉक्युमेंट्स ",
+  "DOC": "डॉक्युमेंट्स ",
   "DOWNLOAD": "डाउनलोड करा",
   "DOWNLOADING": "डाऊनलोड करीत आहे {{%s}} %",
   "DOWNLOADING_1": "{{%s}} डाउनलोड  चालू",
@@ -182,82 +363,278 @@
   "DOWNLOAD_CONTENT": "डाउनलोड ({{%s}})",
   "DOWNLOAD_FILE_INFO": "अक्षम पर्याय सक्षम करण्यासाठी फाईल डाउनलोड करा",
   "DOWNLOAD_FILE_SIZE": "फाईलचे वजन {{%s}}",
+  "DOWNLOAD_NOT_ALLOWED_FOR_QUIZ": "हा मजकूर डाउनलोड होऊ शकत नाही ",
+  "DOWNLOAD_NOW": "आता डाउनलोड करा ",
   "DOWNLOAD_PATH": "अंतर्गत स्टोरेज > डाउनलोड फोल्डर मध्ये फाइल  स्टोर केली आहे",
   "EDIT": "संपादित करा",
-  "EDIT_EMAIL_POPUP_TITLE": "ई-मेल ID मध्ये फेरबदल करा ",
+  "EDIT_EMAIL_POPUP_TITLE": "ई-मेल पत्त्यामध्ये फेरबदल करा ",
   "EDIT_GROUP": "गट संपादित करा",
   "EDIT_PERSONAL_DETAILS": "वैयक्तिक तपशीलात फेरबदल करा ",
   "EDIT_PHONE_POPUP_TITLE": "मोबाइल नंबर मध्ये फेरबदल करा ",
   "EDIT_PROFILE": "प्रोफाईल संपादित करा",
-  "EMAIL_EDIT_SUCCESS": "ई-मेल ID यशस्वीरित्या अपडेट केला आहे ",
-  "EMAIL_ID_PLACEHOLDER": "ई-मेल ID",
-  "EMAIL_PLACEHOLDER": "ई-मेल आयडी टाका ",
+  "EMAIL_EDIT_SUCCESS": "ई-मेल पत्ता यशस्वीरित्या अपडेट केला आहे ",
+  "EMAIL_ID_PLACEHOLDER": "ई-मेल पत्ता ",
+  "EMAIL_PLACEHOLDER": "ई-मेल पत्ता टाका ",
   "EMAIL_UPDATE_SUCCESS": "ई-मेल यशस्वीरित्या अपडेट केला आहे",
   "EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) साठी कोणतीही पुस्तके आढळली नाहीत",
   "EMPTY_SEARCH_RESULTS": "ह्याच्याशी संबंधित माहिती मिळाली नाही",
+  "EMPTY_SEARCH_RESULT_GROUPS": "क्षमस्व! तुमच्या शोधाशी जुळणारे कोणतेही निकाल नाहीत",
   "ENDORSE": "मान्यता ",
   "ENJOYED_THIS_CONTENT": "आवडलं का?",
   "ENROLL": "नोंदणी करा",
+  "ENROLLMENT_ENDED_ON": "नोंदणी {{%s}} रोजी संपली ",
   "ENROLLMENT_LAST_DATE": "नोंदणी साठी शेवटची तारीख ",
   "ENTER_GROUP_NAME": "गटाचे नाव लिहा",
+  "ENTER_ID": "ID प्रविष्ट करा ",
+  "ENTER_ID_AS_REQUESTED_BY_STATE_BOARD_ORG": "तुमच्या राज्य /बोर्ड /org ने मागितलेला ID प्रविष्ट करा ",
+  "ENTER_LOCATION_FROM_PROFILE_PAGE": "प्रोफाइल पृष्ठावरून इच्छित स्थानावर जा ",
+  "ENTER_MEMBER_ID": "{{app_name}} ID  प्रविष्ट करा ",
   "ENTER_OTP": "OTP टाका ",
   "ENTER_PHONE_POPUP_TITLE": "मोबाईल नंबर टाका ",
+  "ENTER_SCHOOL_NAME": "शाळेचे नाव प्रविष्ट करा ",
+  "ENTER_THE_FOLLOWING_INFORMATION": "खालील माहिती प्रविष्ट करा ",
+  "ENTER_UDISE_ID": "UDISE ID प्रविष्ट करा ",
   "ERROR_BATCH_NOT_STARTED": "बॅच अद्याप सुरु नाही",
   "ERROR_CANT_OPEN_EMPTY_CONTENT": "रिक्त फाइल उघडू शकत नाही",
   "ERROR_CONTENT_NOT_AVAILABLE": "साहित्य उपलब्ध नाही",
   "ERROR_CONTENT_NOT_FOUND": "साहित्य अद्याप उपलब्ध नाही",
+  "ERROR_COULD_NOT_OPEN_FILE": "फाईल उघडू शकलो नाही ",
   "ERROR_DURATION_NOT_AVAILABLE": "कालावधी उपलब्ध नाही",
-  "ERROR_EMAIL_EXISTS": " या ई-मेल IDची आधीच नोंद आहे. दुसरा ई-मेल आयडी टाका ",
-  "ERROR_EMAIL_INVALID": "वैध ई-मेल ID टाका ",
+  "ERROR_EMAIL_EXISTS": " हा  ई-मेल अॅड्रेसची   आधीच नोंद आहे. दुसरा ई-मेल अॅड्रेस टाका ",
+  "ERROR_EMAIL_INVALID": "वैध ई-मेल पत्ता टाका ",
   "ERROR_EMPTY_FIELDS": "तपशील लिहा",
   "ERROR_FAILED_TO_DOWNLOAD_ATTACHMENT": "अटाचमेंट डाउनलोड होऊ शकले नाही",
   "ERROR_FETCHING_DATA": "डेटा आणता आला नाही",
   "ERROR_LOW_MEMORY": "मजकूर स्थलांतरासाठी जागा अपूरी ",
+  "ERROR_MAXIMUM_ACTIVITY_COUNT_EXCEEDS": "ग्रुपवर जोडल्या जाणाऱ्या क्रियाकलापांची कमाल संख्या तुम्ही ओलांडली आहे ",
+  "ERROR_MAXIMUM_GROUP_COUNT_EXCEEDS": "निर्माण होऊ शकणाऱ्या ग्रुप्सची कमाल संख्या तुम्ही ओलांडली आहे ",
+  "ERROR_MAXIMUM_MEMBER_COUNT_EXCEEDS": "ग्रुपमध्ये सहभागी होऊ शकणाऱ्या सभासदांची कमाल संख्या तुम्ही ओलांडली आहे ",
   "ERROR_NAME_INVALID": "नावाच्या जागी केवळ अक्षरे अथवा स्पेस टाका ",
   "ERROR_NO_BATCHES_FOUND": "या कोर्ससाठी कोणतीही बॅच जोडण्यात आलेली नाही",
   "ERROR_NO_INTERNET_MESSAGE": "इंटरनेट उपलब्ध नाही",
   "ERROR_NO_OFFLINE_RESOURCE": "संसाधने संग्रहित नाहीत",
   "ERROR_OFFLINE_MODE": "इंटरनेट उपलब्ध नाही, ऑफलाइन मोड",
-  "ERROR_OTP": "OTP अवैध. योग्य OTP टाका ",
-  "ERROR_PHONE_EXISTS": "हा फोन नंबर आधीच नोंद केलेला आहे. दुसरा फोन नंबर टाका ",
-  "ERROR_PHONE_INVALID": "वैध फोन नंबर टाका ",
-  "ERROR_SAME_EMAIL_UPDATED": "हा ई-मेल ID व आपल्या वैयक्तिक माहितीशी जोडललेला ई-मेल ID एकच आहे ",
+  "ERROR_OTP": "OTP अवैध. उर्वरित प्रयत्नांची संख्या: {{%s}}",
+  "ERROR_OTP_LIMIT_EXCEEDED": "तुम्ही OTP मर्यादा पार केली आहे, नंतर पुन्हा प्रयत्न करा ",
+  "ERROR_PHONE_EXISTS": "हा मोबाइल नंबर आधीच नोंद केलेला आहे. दुसरा फोन नंबर टाका ",
+  "ERROR_PHONE_INVALID": "वैध मोबाइल नंबर टाका ",
+  "ERROR_PHONE_REQUIRED": "मोबाईल नंबर आवश्यक आहे ",
+  "ERROR_SAME_EMAIL_UPDATED": "हा ई-मेल पत्ता व आपल्या वैयक्तिक माहितीशी जोडललेला ई-मेल पत्ता एकच आहे. वेगळा ईमेल पत्ता टाका  ",
   "ERROR_SAME_PHONE_UPDATED": "हा मोबाईल नंबर आपल्या वैयक्तिक माहितीशी जोडलेला आहे . दुसरा मोबाईल नंबर टाका",
   "ERROR_SERVER_CONNECTION": "सर्व्हरशी जोडता आले नाही ",
+  "ERROR_SPECIAL_CHARECTERS_NOT_ALLOWED": "विशेष वर्णांना परवानगी नाही ",
   "ERROR_TECHNICAL_PROBLEM": "तांत्रिक समस्या आहे ज्या मुळे आम्ही  तुमची विनंती हाताळण्यास अक्षम आहोत",
   "ERROR_UPLOADING_IMG": "प्रतिमा उपलोड करताना चूक झाली",
   "ERROR_USER_ACCOUNT_BLOCKED": "वापरकर्त्याचा अकाउंट ब्लॉक केलेला आहे. कृपया ऍडमिनशी संपर्क साधा ",
+  "ERROR_WHILE_ADDING_USER": "वापरकर्ता जोडताना चूक झाली ",
+  "ERROR_WHILE_FETCHING_USERS": "वापरकर्ते आणताना चूक झाली ",
   "ERROR_WHILE_LOGIN": "लॉग इन करताना चूक",
-  "EXTRACTING_CONTENT": "मजकूर शोधून काढत आहोत",
+  "ERROR_WHILE_SWITCHING_USER": "वापरकर्ता बदलताना चूक झाली ",
+  "EXPLORE_HEADING": "{{%s}} वर अधिक अन्वेषण करा ",
+  "EXP_VIDEOS": "स्पष्टीकरण व्हिडिओ ",
+  "EXTRACTING_CONTENT": "{{%s}} मजकूर काढत आहोत",
   "FEEDBACK_HINT": "अभिप्राय (ऐच्छिक)",
   "FEEDBACK_HINT_1": "येथे कॉम्मेंट द्या",
   "FILES_DELETED": "फायली हटविल्या",
   "FILE_MANAGER": "फाईल व्यवस्थापक ",
   "FILE_MANAGER_PERMISSION_DESCRIPTION": "फाइल्स डाउनलोड करण्यासाठी व मजकूर SD कार्ड वर हलवण्यासाठी {{%s}} ला स्टोरेज अनुमतीची आवश्यकता आहे ",
+  "FILE_NAME": "'{{%s}}' लोड करत आहोत ",
+  "FILE_SAVED": "फाईल डाउनलोड्स मध्ये जतन झालेली आहे ",
   "FILE_SIZE": "आकार [{{%s}}]",
   "FILL_IN": "प्रोफाइल पूर्ण करण्यासाठी खालील तपशील भरा",
   "FILL_THE_MANDATORY_FIELDS": "सर्व आवश्यक फील्ड भरा",
   "FILTER": "फिल्टर",
   "FILTER_ADDED": "जोडलेले आहे",
   "FILTER_BY": "द्वारे फिल्टर",
-  "FIRST_NAME": "नाव",
   "FOLLOW": "फॉलो करा",
   "FORCE_UPDATE_MESSAGE": "तुम्ही {{%s}} अॅपची जुनी आवृत्ती वापरत आहात. Google Playstore मधून नवीन आवृत्ती मिळविण्यासाठी, 'आता अपडेट करा' हे बटण टॅप करा",
+  "FORUM": "मंच ",
+  "FOR_SUPPORT": "{{%s}} आधारासाठी ",
   "FREE_SPACE": "मोकळी स्पेस -",
+  "FRMELEMENTS_BTN_ACTIVATEGRP": "सक्रिय करा ",
+  "FRMELEMENTS_BTN_ADD": "जोडा ",
+  "FRMELEMENTS_BTN_BACK": "मागे ",
+  "FRMELEMENTS_BTN_DEACTIVATEGRP": "निष्क्रिय करा ",
+  "FRMELEMENTS_BTN_NEXT": "पुढील ",
+  "FRMELEMENTS_LBL_ACTIVATEGRP": "ग्रुप सक्रिय करा ",
+  "FRMELEMENTS_LBL_ACTIVATEGRPQUES": "ग्रुप सक्रिय करायचा का?",
+  "FRMELEMENTS_LBL_CONTENT_TYPE": "सामग्री प्रकार ",
+  "FRMELEMENTS_LBL_DEACTIVATEGRP": "ग्रुप निष्क्रिय करा ",
+  "FRMELEMENTS_LBL_DEACTIVATEGRPQUES": "ग्रुप निष्क्रय करायचा का?",
+  "FRMELEMENTS_LBL_REMARKS": "टिप्पण्या ",
+  "FRMELEMENTS_MSG_ACTIVATEGRPFAILED": "ग्रुप सक्रिय करू शकलो नाही, नंतर पुन्हा प्रयत्न करा ",
+  "FRMELEMENTS_MSG_ACTIVATEGRPMSG": "ग्रुप सक्रिय केल्याने हा ग्रुप सक्रिय ग्रुप्सच्या यादीत दर्शवला जाईल आणि तुम्ही सभासदांच्या प्रगतीचा मागोवा घेऊ शकाल ",
+  "FRMELEMENTS_MSG_ACTIVATEGRPPOPUP": "हा ग्रुप काही काळासाठी निष्क्रिय केला आहे. ग्रुप प्रशासक तो पुन्हा सक्रिय करू शकतात ",
+  "FRMELEMENTS_MSG_ACTIVATEGRPSUCCESS": "ग्रुप यशस्वीरीत्या सक्रिय केला ",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPFAILED": "ग्रुप निष्क्रिय करू शकलो नाही, नंतर पुन्हा प्रयत्न करा ",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPMSG": "ग्रुप निलंबित केल्याने तो सक्रिय ग्रुप्सच्या यादीतून रद्द केला जाईल व तुम्ही त्यावर सभासदांची प्रगती पाहू शकणार नाही ",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPSUCCESS": "ग्रुप यशस्वीरीत्या निष्क्रिय केला ",
+  "FRMELEMNTS_BTN_CLOSE": "बंद करा ",
+  "FRMELEMNTS_BTN_DONOT_SHARE": "सामायिक करू नका ",
+  "FRMELEMNTS_BTN_EDIT_SETTING": "सेटिंग बदला ",
+  "FRMELEMNTS_BTN_PREVIEW_FORM": "फॉर्मचे पूर्वावलोकन करा ",
+  "FRMELEMNTS_BTN_SAVE": "सेव्ह करा ",
+  "FRMELEMNTS_BTN_SAVE_EDITS": "फेरबदल सेव्ह करा ",
+  "FRMELEMNTS_BTN_SAVE_FORM": "फॉर्म सेव्ह करा ",
+  "FRMELEMNTS_BTN_SEEK_HELP": "मदत मागा ",
+  "FRMELEMNTS_BTN_SUBMIT_FORM": "फॉर्म सबमिट करा ",
+  "FRMELEMNTS_BTN_VIEW_DETAILS": "तपशील पहा ",
+  "FRMELEMNTS_CKBX_CERTMSG": "ही सूचना पुन्हा दाखवू नका ",
+  "FRMELEMNTS_LBL_ACCESSIBILITY": "स्क्रीन रीडर प्रवेश",
+  "FRMELEMNTS_LBL_ACCESSIBILITYMODE": "डार्क मोड वर जा",
+  "FRMELEMNTS_LBL_ACCESSIBILITYSKIP": "थेट मुख्य सामग्रीवर जा",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXT": "साइट नकाशा",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXTSIZE": "फॉन्ट आकार वाढवा",
+  "FRMELEMNTS_LBL_ADD_ATTACHMENTS": "अटॅचमेंट जोडा ",
+  "FRMELEMNTS_LBL_ADD_ENTITY": "एंटिटी जोडा ",
+  "FRMELEMNTS_LBL_ADD_NEW_TASK": "नवीन कार्य जोडा ",
+  "FRMELEMNTS_LBL_ADD_REMARKS": "टिप्पण्या जोडा ",
+  "FRMELEMNTS_LBL_ADD_SUBTASK": "उपकार्य जोडा ",
+  "FRMELEMNTS_LBL_ADD_SUBTASK_PALCEHOLDER": "उपकार्याचे नाव जोडा ",
+  "FRMELEMNTS_LBL_ADD_TASK": "कार्य जोडा ",
+  "FRMELEMNTS_LBL_ASSIGNED_TO": "यांना नियुक्त केले ",
+  "FRMELEMNTS_LBL_ASSIGN_TASK": "कार्य नियुक्त",
+  "FRMELEMNTS_LBL_ATTACH": "संलग्न करा ",
+  "FRMELEMNTS_LBL_ATTACHMENTS": "अटॅचमेंट्स ",
+  "FRMELEMNTS_LBL_BLOCK": "ब्लॉक करा ",
+  "FRMELEMNTS_LBL_CATEGORIES": "विभाग ",
+  "FRMELEMNTS_LBL_CATEGORY_OVERVIEW": "विभाग आढावा ",
+  "FRMELEMNTS_LBL_CLICK_HELP": "मदत बटण क्लिक करा ",
+  "FRMELEMNTS_LBL_CLICK_HERE_TO_VIEW_LIBRARY": "लायब्ररी पाहण्यासाठी इथे क्लिक करा ",
+  "FRMELEMNTS_LBL_CLUSTER": "समूह ",
+  "FRMELEMNTS_LBL_CONSENT_POPUP_INFO": "तुम्ही तुमच्या प्रोफाइल पृष्ठावरील हे तपशील बदलू शकता ",
+  "FRMELEMNTS_LBL_CONTENT_AVAIALABLE_IN_OTHER_BOARD": "तुमच्या गरजेनुसार असलेली चित्तवेधक सामग्री इतर बोर्डांकडे असू शकते!",
+  "FRMELEMNTS_LBL_CONTENT_FOUND": "तुमच्या गरजेशी अनुरूप अशी सामग्री आम्हाला मिळाली आहे!",
+  "FRMELEMNTS_LBL_CONTENT_TO_BE_ADDED": "तुमच्या बोर्डाला अजून सामग्री जोडायची आहे.",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT": "इच्छित सामग्री मिळाली नाही? खालील बटणांवर क्लिक करा ",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT_YET": "इच्छित सामग्री मिळाली नाही? खालील बटणांवर क्लिक करा ",
+  "FRMELEMNTS_LBL_CRITERIA_WISE": "निकष ",
+  "FRMELEMNTS_LBL_DATA_SETTINGS": "डेटा सेटिंग ",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF": "प्रोफाइल डेटा सामयिकरण बंद आहे ",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF_INFO": "तुम्ही कोर्स प्रशासकाबरोबर तुमचे प्रोफाइल तपशील सामायिक करण्यास मान्यता दिलेली नाही ",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON": "प्रोफाइल डेटा सामयिकारण चालू आहे ",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON_INFO": "तुम्ही तुमचे प्रोफाइल तपशील कोर्स प्रशासकाबरोबर सामायिक करण्यास मान्यता दिली आहे ",
+  "FRMELEMNTS_LBL_DELETE_CONFIRMATION": "तुम्ही नक्की तुमचे उपकार्य रद्द करू इच्छिता? ",
+  "FRMELEMNTS_LBL_DONOT_SHARE_PROFILE_INFO": "माझे प्रोफाइल तपशील सामायिक करू नका ",
+  "FRMELEMNTS_LBL_DURATION": "कालावधी ",
+  "FRMELEMNTS_LBL_EMAIL_ID_PLACEHOLDER": "राज्य किंवा Org चा ई-मेल ऍड्रेस ",
+  "FRMELEMNTS_LBL_END_DATE": "अंतिम तारीख ",
+  "FRMELEMNTS_LBL_FILES": "फाइल्स ",
+  "FRMELEMNTS_LBL_IMAGES": "प्रतिमा ",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS": "प्रकल्प अहवाल ",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS_DESC": "प्रकल्प अहवाल पहा ",
+  "FRMELEMNTS_LBL_IN_PROGRESS": "चालू आहे ",
+  "FRMELEMNTS_LBL_LEARNER_PASSBOOK": "अभ्यासकाचे पासबुक ",
+  "FRMELEMNTS_LBL_LEARNING_RESOURCES": "अभ्यास स्रोत ",
+  "FRMELEMNTS_LBL_LINK_LEARNING_RESOURCES": "अभ्यासक्रम स्रोत लिंक करा ",
+  "FRMELEMNTS_LBL_MEDIA_TYPE": "माध्यम प्रकार ",
+  "FRMELEMNTS_LBL_MOBILE_NUMBER_PLACEHOLDER": "राज्य किंवा Org साठी मोबाइल नंबर ",
+  "FRMELEMNTS_LBL_MY_LEARNINGS": "माझे अभ्यासक्रम ",
+  "FRMELEMNTS_LBL_NEW_TASK": "नवीन कार्य ",
+  "FRMELEMNTS_LBL_NO_MATCHING_CONTENT": "जुळणारा मजकूर सापडला नाही ",
+  "FRMELEMNTS_LBL_OBJECTIVE": "उद्दिष्ट ",
+  "FRMELEMNTS_LBL_OBSERVATION": "निरीक्षण ",
+  "FRMELEMNTS_LBL_OBSERVATION_DESC": "तुमचे वर्ग व शाळेचे निरीक्षण सहज पहा व रेकॉर्ड करा, आणि तुमचा सुधारणेचा प्रवास नियोजित करा ",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS": "निरीक्षणाचे अहवाल ",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS_DEC": "निरीक्षण अहवाल पहा ",
+  "FRMELEMNTS_LBL_OBSERVE_AGAIN": "पुन्हा निरीक्षण करा ",
+  "FRMELEMNTS_LBL_OPEN_BATCH_NOT_RECOMMENDED": "तुम्ही आधीच्या बॅचमधून कोर्स पूर्ण केला असल्यास, तुम्ही पुन्हा कोर्समध्ये सहभागी होऊ नये असा आमचा सल्ला आहे. तुमचा अभ्यासक्रम इतिहास व प्रमाणपत्रे रीसेट केली जातील.",
+  "FRMELEMNTS_LBL_PERSONA": "भूमिका ",
+  "FRMELEMNTS_LBL_PROFCONF": "प्रोफाइल नावाची खात्री करा ",
+  "FRMELEMNTS_LBL_PROFTITLE": "प्रोफाइल नाव ",
+  "FRMELEMNTS_LBL_PROGRAM_NAME": "कार्यक्रम नाव ",
+  "FRMELEMNTS_LBL_PROJECT": "प्रकल्प ",
+  "FRMELEMNTS_LBL_PROJECT_DESCRIPTION": "कार्ये निर्माण करून व टाइमलाईन नियोजित करून तुमच्या शाळेतील सुधारणांचे व्यवस्थापन करा व मागोवा घ्या ",
+  "FRMELEMNTS_LBL_PROJECT_OVERVIEW": "प्रकल्प आढावा ",
+  "FRMELEMNTS_LBL_PROJECT_STATUS": "प्रकल्प स्थिती ",
+  "FRMELEMNTS_LBL_PROJECT_TITLE": "प्रकल्प शीर्षक ",
+  "FRMELEMNTS_LBL_PROJECT_VIEW": "प्रकल्प दृश्य ",
+  "FRMELEMNTS_LBL_QUESTION_WISE": "प्रश्न ",
+  "FRMELEMNTS_LBL_RELEVANT_CONTENT_SUB_HEADING": "विशिष्ट सामग्रीची मागणी करण्यासाठी तपशील भरा ",
+  "FRMELEMNTS_LBL_REPORTS": "अहवाल ",
+  "FRMELEMNTS_LBL_REPORTS_DESC": "अहवाल यादी ",
+  "FRMELEMNTS_LBL_REQUEST_CONTENT": "सामग्री मागवायची का? ",
+  "FRMELEMNTS_LBL_SCHOOL": "शाळा ",
+  "FRMELEMNTS_LBL_SELECT_CATEGORIES": "विभाग (एक/अनेक) निवडा ",
+  "FRMELEMNTS_LBL_SELECT_PROGRAM": "कार्यक्रम निवडा ",
+  "FRMELEMNTS_LBL_SET_DATE": "तारीख सेट करा ",
+  "FRMELEMNTS_LBL_SET_DATE_HINT": "तुमच्या प्रकल्पासाठी टाइमलाइन तयार करा ",
+  "FRMELEMNTS_LBL_SHARE_PROFILE_INFORMATION": "माझे प्रोफाइल तपशील सामायिक करा ",
+  "FRMELEMNTS_LBL_START_DATE": "प्रारंभ तारीख ",
+  "FRMELEMNTS_LBL_STATUS": "स्थिती ",
+  "FRMELEMNTS_LBL_SUBPERSONA": "उप भूमिका ",
+  "FRMELEMNTS_LBL_SUBTASKS": "उपकार्ये ",
+  "FRMELEMNTS_LBL_SURVEY": "सर्वेक्षण ",
+  "FRMELEMNTS_LBL_SURVEY_ACTION": "सर्वेक्षण क्रिया ",
+  "FRMELEMNTS_LBL_SURVEY_DESC": "सूचीचे सर्वेक्षण करा ",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS": "सर्वेक्षण अहवाल ",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS_DESC": "सर्वेक्षण अहवाल पहा ",
+  "FRMELEMNTS_LBL_TAB_HOME": "मुख्यपृष्ठ ",
+  "FRMELEMNTS_LBL_TASK_DESCRIPTION": "कार्य वर्णन ",
+  "FRMELEMNTS_LBL_TASK_OVERVIEW": "कार्याचा आढावा ",
+  "FRMELEMNTS_LBL_THIS_MONTH": "हा महिना ",
+  "FRMELEMNTS_LBL_TOTAL_TASKS": "एकूण कार्ये ",
+  "FRMELEMNTS_LBL_UPCOMING": "आगामी ",
+  "FRMELEMNTS_LBL_UPDATE_DATA_SETTINGS": "सेटिंग अपडेट करा ",
+  "FRMELEMNTS_LBL_USERTYPE_LEADER": "शाळा प्रमुख किंवा अधिकारी",
+  "FRMELEMNTS_LBL_VIEW_ENTITY_REPORT": "एंटिटी अहवाल पहा ",
+  "FRMELEMNTS_LBL_VIEW_FULL_REPORT": "पूर्ण अहवाल पहा ",
+  "FRMELEMNTS_LBL_VIEW_RESOURCES": "स्रोत पहा ",
+  "FRMELEMNTS_MSG_BATCH_ALREADY_CLOSED": "या बॅचसाठी नोंदणी {endDate} रोजी बंद झाली  ",
+  "FRMELEMNTS_MSG_CONSENT_DECLARATION_INFO": "तुमच्या प्रोफाइल पृष्ठावरच्या तपशिलात तुम्ही फेरबदल करू शकता ",
+  "FRMELEMNTS_MSG_DATA_SETTINGS_SUBMITED_SUCCESSFULLY": "तुमचे डेटा सेटिंग यशस्वीरीत्या सबमिट केले आहेत ",
+  "FRMELEMNTS_MSG_DELETE_TASK_CONFIRMATION": "तुम्हाला कार्य नक्की रद्द करायचे आहे का? ",
+  "FRMELEMNTS_MSG_EDITCERTNAME": "तुम्ही तुमच्या प्रोफाइल पृष्ठावरून त्यात फेरबदल करू शकता ",
+  "FRMELEMNTS_MSG_LOAD_FROM_LIBRARY": "लायब्ररीमधून लोड करा ",
+  "FRMELEMNTS_MSG_NAMEONCERT": "हे नाव तुमच्या कोर्स प्रमाणपत्रावर छापले जाईल. ते योग्य आहे की नाही हे तपासा.",
+  "FRMELEMNTS_MSG_SELECT_IMAGE_SOURCE": "प्रतिमा स्रोत निवडा ",
+  "FRMELEMNTS_MSG_SELFDECLARATION_SUCCESS_INFO": "तुम्ही गरज पडल्यास तुमच्या प्रोफाइल वरील या माहितीत फेरबदल करू शकता ",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED": "यशस्वीरीत्या संलग्न केले  ",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_SYNCED": "हा प्रकल्प यशस्वीरीत्या समक्रमित केला आहे ",
+  "FRMELEMNTS_MSG_TICKET_SUBMISSION_SUCCESS": "आम्ही तुमच्या अभिप्रायासाठी आभारी आहोत. आम्ही प्रत्येक अहवालाला दाद देऊ शकत नाही, पण तुमच्या अभिप्रायांमुळे आम्हाला {{app_name}} सर्वांसाठी सुधारण्यात नक्कीच मदत होते. ",
+  "FRMELEMNTS_MSG_UNABLE_TO_ENROLL": "आता नोंदणी रद्द होऊ शकत नाही. नंतर पुन्हा प्रयत्न करा ",
+  "FRMELEMNTS_MSG_UPDATED_SUCCESSFULLY": "यशस्वीरीत्या अपडेट झाले आहे ",
+  "FRMELEMNTS_MSG_USER_CREATION_LIMIT_EXCEEDED": "वापरकर्ता निर्मितीची मर्यादा संपली ",
+  "FRMELEMNTS_MSG_USE_CAMERA": "कॅमेरा वापरा ",
+  "FRMELEMNTS_MSG_USE_FILE": "फाइल वापरा ",
+  "FRMELEMNTS_MSG_YOUR_CHANGES_ARE_SAVED": "तुमचे बदल यशस्वीरीत्या सेव्ह केले आहेत.",
+  "FRMELENTS_LBL_ACCESSIBILITYNORMALMODE": "लाईट मोड वर जा",
+  "FRMELMNTS_BLTPT_EARNCERT": "प्रमाणपत्रे फक्त {{STATE}} राज्याच्या वापरकर्त्यांनाच प्रदान केली जातील ",
+  "FRMELMNTS_BLTPT_EARNCERT2": " तुमच्या सर्व चाचण्यांमध्ये {{PERCENTAGE}} पेक्षा अधिक गुण मिळवा ",
+  "FRMELMNTS_BLTPT_EARNCERT3": "प्रमाणपत्र मिळवण्यासाठी तुम्ही चाचणी फक्त {{ATTEMPTS}} वेळा घेऊ शकता.",
+  "FRMELMNTS_IMSG_DECLAREINFO": "या कोर्सची प्रमाणपत्रे केवळ राज्य मान्यता असणाऱ्या शिक्षकांनाच प्रदान केली जातील ",
+  "FRMELMNTS_IMSG_LASTATTMPALRT": "हा उरलेला शेवटचा प्रयत्न आहे ",
+  "FRMELMNTS_IMSG_LASTATTMPTEXCD": "चाचणी सबमिट करण्यासाठी  प्रयत्नांची कमाल संख्या तुम्ही ओलांडली आहे",
+  "FRMELMNTS_LBL_ACCESSIBILITYFNTDFLT": "डीफॉल्ट वर रीसेट करा",
+  "FRMELMNTS_LBL_ACCESSIBILITYFONT": "फॉन्ट आकार कमी करा",
+  "FRMELMNTS_LBL_AVSCORE": "सर्वोत्तम चाचणी गुणांची सरासरी ",
+  "FRMELMNTS_LBL_BESTSCORE": "सर्वोत्तम गुण {{SCORE}}",
+  "FRMELMNTS_LBL_CERTQUES": "तुम्ही  प्रमाणपत्र कसे मिळवू शकता? ",
+  "FRMELMNTS_LBL_NOTIFNUMBER": "{{NUMBER}} नवीन सूचना ",
+  "FRMELMNTS_LBL_SEELESS": "कमी पहा ",
+  "FRMELMNTS_LBL_SEEMORE": "अधिक पहा ",
+  "FRMELMNTS_LBL_STATEUSERQUES": "तुम्ही राज्य शिक्षक आहात का? ",
+  "FRMELMNTS_LNK_DECLARELINK": "आता घोषित करा ",
+  "FRMELMNTS_PRMPT_DECLAREPROMPT": "प्रमाणपत्र मिळवण्यासाठी {instance} वर तुमची माहिती घोषित करा ",
+  "FRMELMNTS_SCTTL_NOTIFHEADER": "सूचना ",
   "FROM": "पासून ",
   "FULL_NAME": "नाव",
+  "GET_STARTED": "सुरु करा ",
   "GOT_IT": "समजले ",
+  "GO_TO_DOWNLOADS": "डाउनलोड्स वर जा ",
+  "GO_TO_PROFILE": "वैयक्तिक माहिती वर जा ",
   "GRADE_OPTION_TEXT": "वर्ग निवडा",
   "GRANT_ACCESS": "परवानग्यांसाठी मान्यता",
-  "GROUPS": "गट",
-  "GROUPS_YOU_FOLLOW": "आपण फॉलो करीत असलेले गट",
-  "GROUP_CREATE_SUCCESS": "गट यशस्वीरित्या तयार झाला",
-  "GROUP_DELETE_CONFIRM": "{{%s}} हटविण्याची पुष्टी करा",
-  "GROUP_DELETE_CONFIRM_MESSAGE": "गट काढला जाईल परंतु वापरकर्ते रहातील. वापरकर्ते 'वापरकर्ते' टॅब खालीआढळू शकतात",
-  "GROUP_MEMBER_ADD_SUCCESS": "सदस्य यशस्वीरित्या जोडले गेलेत",
-  "GROUP_MEMBER_DELETE_SUCCESS": "गटाचे सदस्य यशस्वीरित्या काढले गेलेत",
+  "GROUP_CREATED": "ग्रुप यशस्वीरीत्या निर्माण झाला आहे ",
+  "GROUP_CREATED_BY": "{{group_creator_name}} ने निर्माण केले ",
+  "GROUP_DESCRIPTION": "गटाचे वर्णन ",
+  "GROUP_DESCRIPTION_PLACEHOLDER": "सभासदांना गटाचे प्रयोजन कळण्यासाठी गटाचे वर्णन प्रविष्ट करा ",
+  "GROUP_GUIDELINES": "ग्रुप मार्गदर्शक तत्त्वे ",
+  "GROUP_MEMBER_SEARCH_PLACEHOLDER": "गटात शोधा ",
   "GROUP_NAME": "गटाचे नाव",
-  "GROUP_UPDATE_SUCCESS": "समूह तपशील यशस्वीरीत्या अपडेट केले आहेत",
+  "GROUP_NAME_IS_REQUIRED": "तुम्हाला ग्रुपचे नाव प्रविष्ट करावे लागेल ",
+  "GROUP_TERMS_IS_REQUIRED": "पुढे जाण्याआधी तुम्हाला {{app_name}}च्या सेवा अटी मान्य कराव्या लागतील ",
+  "GROUP_UPDATE_SUCCESS": "गटाचे तपशील यशस्वीरीत्या अपडेट केले आहेत",
   "HABIT_REMINDER_NOTIFICATION_MESSAGE": "आज {{%s}} वर काहीतरी नवीन शिका!",
   "HELP": "सहायता",
   "HELP_US_BY_RATING": "{{%s}} रेट करा",
@@ -265,98 +642,141 @@
   "HIDE_CREDITS_INFO": "श्रेय व लायसिन्सिंगची माहिती लपवा",
   "HINT_LANGUAGE": "पसंतीची भाषा निवडा",
   "HOBBIES": "छंद",
-  "IAM_ABOVE_18_YEARS_AGE": "माझे वय 18 वर्षांपेक्षा जास्त आहे",
+  "HOURS_AGO": "{{%s}} तासांपूर्वी ",
+  "HOUR_AGO": "{{%s}} तासापूर्वी ",
+  "ID_IS_REQUIRED": "ID आवश्यक आहे ",
+  "IMPORTING": "इम्पोर्ट करत आहोत... ",
   "IMPORTING_COUNT": "इमपोर्ट होतआहे",
   "IMPORT_ECAR": "विसंगत फाइल स्वरूप. आपण केवळ  .ecar, .epar आणि .gsa फाईल इम्पोर्ट करु शकता. ",
   "IMPORT_ERROR": " इम्पोर्ट अयशस्वी",
   "IMPORT_PROGRESS": "इमपोर्ट होतआहे ...कृपया प्रतीक्षा करा",
   "INACTIVE": "निष्क्रिय",
-  "INCORRECT_TEACHER_ID_ERROR": "एंटर केलेला ID चुकीचा आहे. ID पुन्हा एंटर करा ",
+  "INCORRECT_TEACHER_ID_ERROR": "प्रविष्ट केलेला ID चुकीचा आहे. ID पुन्हा प्रविष्ट करा ",
   "INSTALL_CROSSWALK": "क्रॉसवॉक इंस्टाॅल करा",
+  "INSTANCE_TERMS_OF_USE": "{{app_name}}  वापर अटी",
   "INSUFFICIENT_STORAGE": "अपूरी स्टोरेज स्पेस ",
   "INTERACTION": "परस्परसंवादी ",
+  "INTERACTIVE_MATERIAL": "परस्परसंवादी अभ्यास सामग्री ",
   "INTERNAL_MEMORY": "अंतर्गत स्टोरेज ",
   "INTERNET_AVAILABLE": "आपण आता ऑनलाइन आहात ",
   "INTERNET_CONNECTIVITY_NEEDED": "इंटरनेट कनेक्टिव्हिटी नाही ",
   "INVALID_CONTENT": "साहित्य अवैध आहे",
+  "INVALID_FORMAT": "अवैध स्वरूप ",
+  "INVALID_MEMBER_ID": "तुम्ही अवैध {{app_name}} ID प्रविष्ट केला आहे ",
   "INVALID_QR": "अवैध QR कोड ",
   "ITEMS": "{{%s}} फाइल",
   "ITEMS_SELECTED": "निवडलेल्या फाईल ",
+  "I_AGREE_TO": "मला {{app_name}} च्या अटी व नियम मान्य आहेत ",
   "I_AGREE_TO_TNC": "मला वापराचे नियम व अटी मान्य आहेत ",
-  "JOIN_TRAINING": "प्रशिक्षणात सामील व्हा ",
+  "I_AM_A_PERSONA_WITH_TENANT": "मी {{%tenant}} मध्ये {{%persona}} आहे ",
+  "I_UNDERSTAND_AND_ACCEPT": "मी हे समजून स्वीकार करतो /करते ",
+  "JOIN_TRAINING": "कोर्स मध्ये सामील व्हा ",
   "LANGUAGE": "भाषा",
   "LANGUAGE_SETTINGS": "भाषा",
-  "LAST_DATE_TO_JOIN": "सामील होण्याची शेवटची तारीख ",
+  "LAST_DATE_TO_JOIN": "सामील होण्याची शेवटची तारीख {{%s}}",
   "LAST_SYNC": "शेवटचे सिंक",
+  "LAST_UPDATED": "{{%s}}ला शेवटचे अपडेट केले ",
   "LAST_VIEWED": "शेवट पाहिलेले ",
   "LATEST_COURSES": "नवीन कोर्स",
-  "LEAVE_TRAINING_HEADING": "प्रशिक्षण सोडायचे आहे?",
+  "LEAVE_GROUP": "गट सोडा ",
+  "LEAVE_GROUP_ERROR_MSG": "गटातून बाहेर पडता आले नाही . पुनः प्रयत्न करा ",
+  "LEAVE_GROUP_POPUP_DESC": "ही क्रिया पूर्ववत करणे शक्य नाही. तुम्हांला {{group_name}} सोडायचे आहे का? ",
+  "LEAVE_GROUP_POPUP_TITLE": "गट सोडायचा का? ",
+  "LEAVE_GROUP_SUCCESS_MSG": "तुम्ही आता गटाचे सदस्य नाही ",
+  "LEAVE_TRAINING_HEADING": "कोर्स सोडायचा आहे?",
   "LIBRARY_BNAV": "संग्रह",
   "LICENSE": "परवाना",
+  "LOAD": "लोड करा ",
+  "LOADER_PROGRESS_DESCRIPTION": "आम्ही सर्व गोष्टी तयार करत आहोत ",
+  "LOADER_PROGRESS_DESC_SUB_HEADING": "कृपया थांबा... ",
   "LOADING_CONTENT": "साहित्य लोड होत आहे",
   "LOADING_CONTENTS": "साहित्य लोड होत आहे {{%s}} %",
-  "LOADING_USER_LIST": "वापरकर्ता सूची लोड होत आहे, कृपया प्रतीक्षा करा",
-  "LOGGED_IN_AS": "लॉग इन वापरकर्ता ",
-  "LOGGED_OUT": "लॉग आउट यशस्वी",
-  "LOGOUT": "साइन आउट करा",
+  "LOAD_FILE": "फाईल लोड करा ",
+  "LOGGED_IN_MEMBER": "{{member_name}} (तुम्ही)",
+  "LOGIN_TO_CREATE_GROUP_DESCRIPTION": "तुमचा स्वतःचा ग्रुप, अभ्यास मंडळ किंवा वर्ग निर्माण करण्यासाठी पहिली पायरी आहे लॉगिन करणे ",
+  "LOGIN_TO_JOIN_TRAINING": "कोर्स साठी नोंदणी करण्यास लॉग इन करा ",
+  "LOGOUT": "लॉगआउट करा",
   "LOW_BANDWIDTH": "कमी बॅन्डविड्थ",
   "LOW_BANDWIDTH_DETECTED": "कमी बॅन्डविड्थचे नेटवर्क आढळले आहे",
-  "MARKS": "गुण",
+  "MAINTENANCE_MESSAGE": "आम्ही सध्या देखभाल कार्यासाठी बंद आहोत. पण काळजी करू नका, आम्ही {{%timeLeft}} तासात परत येत आहोत. लवकर परत या!",
+  "MAINTENANCE_SUB_TEXT": "तुम्ही अजूनही डाउनलोड केलेली सामग्री पाहू शकता",
+  "MAKE_ADMIN": "ऍडमिन बनवा ",
+  "MAKE_GROUP_ADMIN_ERROR_MSG": "{{member_name}} ला गट एडमिन करता आले नाही ",
+  "MAKE_GROUP_ADMIN_POPUP_DESC": "ह्या कृतीने {{member_name}} ला गट ऍडमिन होण्याची परवानगी मिळेल ",
+  "MAKE_GROUP_ADMIN_POPUP_TITLE": "गट ऍडमिन बनवायचे का? ",
+  "MAKE_GROUP_ADMIN_SUCCESS_MSG": "आता {{member_name}} गट एडमिन आहे  ",
   "MEDIUM": "माध्यम",
   "MEDIUM_OF_INSTRUCTION": "शिक्षणाचे माध्यम",
   "MEDIUM_OPTION_TEXT": "माध्यम निवडा",
+  "MEMBERS": "सभासद ",
+  "MEMBER_ADDED_TO_GROUP": "सभासद यशस्वीरीत्या ग्रुपला जोडलेला आहे ",
+  "MEMBER_ALREADY_EXISTS_IN_GROUP": "सभासद आधीच गटाचा भाग आहे ",
+  "MEMBER_ID": "{{app_name}} ID ",
+  "MENU_DELETE_GROUP": "गट डिलीट करा ",
+  "MENU_DISMISS_AS_GROUP_ADMIN": "गट ऍडमिन म्हणून काढून टाका ",
+  "MENU_EDIT_GROUP_DETAILS": "गट तपशिलांमध्ये फेरबदल करा ",
+  "MENU_LEAVE_GROUP": "गट सोडा ",
+  "MENU_MAKE_GROUP_ADMIN": "गट ऍडमिन बनवा",
+  "MENU_REMOVE_ACTIVITY": "क्रियाकलाप काढून टाका ",
+  "MENU_REMOVE_FROM_GROUP": "गटातून काढून टाका ",
   "MERGE_ACCOUNT": "खाती एकत्र करा ",
   "MICROPHONE": "माइक्रोफोन ",
   "MICROPHONE_PERMISSION_DESCRIPTION": "माइक्रोफोन वापर फक्त त्याच मजकुरात केला जाईल, जिथे आपण आपला आवाज 'रेकॉर्ड' करू शकता. ",
+  "MINUTES_AGO": "{{%s}} मिनिटांपूर्वी ",
+  "MINUTE_AGO": "{{%s}} मिनिटापूर्वी ",
+  "MONTHS_AGO": "{{%s}} महिन्यांपूर्वी ",
+  "MONTH_AGO": "{{%s}} महिन्यापूर्वी ",
   "MORE": "अधिक",
   "MORE_CONTENT": "{{%s}} वर अधिक पुस्तके व मजकूर मिळावा.",
+  "MORE_COUNT": "आणखी ({{%s}})",
   "MORE_DETAILS": "अधिक तपशील (अधिक माहिती प्रदान करा किंवा समस्येचा स्क्रीनशॉट संलग्न करा)",
   "MOVE": "हलवा ",
   "MOVE_FILES_TO_OTHER_DESTINATION": "स्पेस मोकळी करण्यासाठी {{%s}} या ठिकाणी फाइल्स हलवा ",
   "MSG_ALREADY_IMPORTED": "इम्पोर्ट केलेले आहे",
   "MSG_IMPORTED_SUCCESSFULLY": "साहित्य यशस्वीपणे इम्पोर्ट करण्यात आले आहे",
-  "MSG_LOADING_BATCHES": "बॅच लोड होत आहेत",
   "MSG_NO_DETAILS_TO_SHOW": "तपशील उपलब्ध नाही",
   "MSG_NO_NEW_NOTIFICATION": "कोणतीही नवीन सूचना नाही",
   "MSG_RESOURCE_DELETED": "डिव्हाइसवरून साहित्य हटवले",
+  "MULTIPLE_LICENSE": "परवान्याच्या अटी {{%s}}",
   "MY_BADGES": "माझे बॅज",
+  "MY_DETAILS": "माझे तपशील ",
+  "MY_GROUPS": "माझे गट ",
   "NAME": "नाव",
   "NAME_HINT": "नाव लिहा ",
+  "NAME_IS_REQUIRED": "तुम्हाला वापरकर्त्याचे नाव प्रविष्ट करावे लागेल ",
+  "NEED_INTERNET_FOR_DEEPLINK_CONTENT": "तुम्ही ऑफलाईन आहात. मजकूर वापरण्यासाठी यंत्र इंटरनेटशी जोडा. ",
   "NEED_INTERNET_TO_CHANGE": "इंटरनेट कनेक्टिव्हिटी नाही, WiFi किंवा मोबाईल डेटा चालू करा",
   "NEW": "नवीन",
   "NEW_NOTIFICATIONS": "{{%s}} नवीन सूचना ",
   "NEXT": "पुढे",
   "NIL": " -",
   "NO": "नाही",
+  "NOTE": "सूचना ",
   "NOTIFICATION": "सूचना ",
   "NOT_AVAILABLE": "उपलब्ध नाही ",
   "NOT_NOW": "आत्ता नाही ",
   "NO_APP_FOR_INTENT": "ही फाईल उघडण्यासाठी कोणतेही अॅप उपलब्ध नाही",
-  "NO_ASSESSMENT": "कोणतेही मूल्यांकन उपलब्ध नाही",
   "NO_BATCHES_AVAILABLE": "बॅच उपलबध्द नाहीत ",
   "NO_BOOKS_AVAILABLE": "बोर्ड अधिक पुस्तके जोडत आहे ",
   "NO_BOOKS_DEFINITION": "आपला बोर्ड अधिक पुस्तके वाढवण्याच्या प्रक्रियेत आहे. {{%s}} वर अधिक पुस्तके व मजकूर पाहण्यासाठी खाली क्लिक करा ",
+  "NO_BOOKS_TEXT": "{{%s}} वर तुमच्या विषयाचे पाठ्यपुस्तक मिळाले नाही का? ",
   "NO_CONTENTS": "{{%s}} नाही ",
   "NO_CONTENTS_FOUND": "या साठी साहित्य शोधू शकलो नाही",
   "NO_CONTENTS_MESSAGE": "मजकुराचा इतर प्रकार निवडा ",
+  "NO_CONTENT_AVAILABLE_IN_MODULE": "या विभागात कोणतेही मजकूर उपलब्ध नाहीत  ",
+  "NO_COURSES": "एकही कोर्स नाही ",
   "NO_DATA_FOUND": "डेटा आढळला नाही",
-  "NO_DESCRIPTION": "वर्णन उपलब्ध नाही",
   "NO_DOWNLOADS": "अद्याप कोणतेही डाउनलोड नाहीत",
-  "NO_DOWNLOADS_INFO": "मजकूर कोर्स किंवा संग्रहालयातून डाउनलोड करा",
+  "NO_DOWNLOADS_INFO": "मजकूर कोर्स किंवा संग्रहातून डाउनलोड करा",
   "NO_FILTERS_SELECTED": "कोणतेही फिल्टर निवडलेले नाहीत",
-  "NO_GROUPS_CREATED_YET": "अद्याप कोणतेही गट तयार केले नाहीत",
-  "NO_GROUP_MESSAGE": "गट वापरकर्त्यांना संघटित करण्यास मदत करतात.  गटांचा वापर प्रगतीचे निरीक्षण करण्यासाठी करू शकता",
   "NO_INTERNET": "इंटरनेट उपलब्ध नाही",
   "NO_INTERNET_TITLE": "आपण ऑफलाइन आहात",
   "NO_PREVIEW": "प्रिव्ह्यू उपलब्ध नाही",
+  "NO_QR_CODE": "माझ्याकडे QR कोड नाही ",
   "NO_QR_CODE_QSTN": "QR कोड नाही?",
   "NO_RATING": "अद्याप रेट केलेले नाही",
-  "NO_USERS": "वापरकर्ते नाही",
-  "NO_USERS_CREATED_YET": "अद्याप वापरकर्ते निर्केमाण केलेले नाहीत",
-  "NO_USERS_CREATED_YET_MSG": "आपण आपल्या विद्यार्थ्यांसाठी अथवा इतर शिक्षकांसाठी अतिथी वापरकर्ता खाती निर्माण करू शकता",
-  "NO_USERS_IN_THIS_GROUP": "या गटात कोणतेही वापरकर्ते नाहीत",
-  "NO_USERS_ON_THIS_DEVICE": "या डिव्हाइसवर कोणतेही वापरकर्ते नाहीत",
-  "NO_USERS_SUGGESTION_MESSAGE": "गटामध्ये किमान एक वापरकर्ता असणे आवश्यक आहे",
+  "NUMBER_OF_COURSES": "कोर्सेस ({{%s}})",
+  "NUMBER_OF_COURSE_1": "कोर्स ({{%s}})",
   "NUMBER_OF_VOTES": "मतांची संख्या",
   "OFF": "बंद",
   "OFFLINE_DOWNLOAD_MESSAGE": "इंटरनेटशी संबंध संधल्यावर डाउनलोड केलेला मजकूर आपोआप सुरू होईल ",
@@ -364,6 +784,8 @@
   "OFFLINE_WARNING_ETBUI": "मजकूर पाहण्यासाठी इंटरनेटशी कनेक्ट करा ",
   "OFFLINE_WARNING_ETBUI_1": "मजकूर पाहण्यासाठी इंटरनेटशी कनेक्ट करा",
   "OKAY": "ठीक आहे",
+  "ONGOING": "चलत  ",
+  "ONLY_DIGIT_NUMBER_IS_ALLOWED": "फक्त ११ आकडी संख्येला परवानगी आहे ",
   "ONLY_DOWNLOADED_CONTENT_CAN_BE_PLAYED_OFFLINE": "फक्त डाउनलोड केलेला मजकूर ऑफलाईन चालवता येईल ",
   "OPEN": "उघडा",
   "OPEN_SETTINGS": "सेटिंग्ज उघडा",
@@ -373,17 +795,16 @@
   "ORIGINAL_CONTENT": "मजकुर",
   "ORIGINAL_CONTENT_DATA": "हा मजकूर ... इथून उत्पन्न झाला आहे ",
   "OTHER_ROLE_DESC_1": "डिजिटल मजकूर ब्राऊज करा ",
-  "OTHER_ROLE_DESC_2": "ऑनलाइन प्रशिक्षण घ्या ",
-  "OTHER_USERS": "इतर वापरकर्ते",
+  "OTHER_ROLE_DESC_2": "ऑनलाइन कोर्स घ्या ",
   "OTP_FAILED": "OTP प्रमाणित करण्यात अयशस्वी. पुन्हा प्रयत्न करा.",
   "OTP_PLACEHOLDER": "OTP टाका ",
   "OTP_RESENT": "OTP पुन्हा पाठवला आहे ",
-  "OVERLAY_INFO_TEXT_COMMON": "{{%s}} चे सारे गुण माहित करून घेण्यास साइन इन करा",
-  "OVERLAY_INFO_TEXT_TAKE_COURSE": "केवळ सभासद कोर्सेस घेऊ शकतात. हा कोर्स घेण्याकरता साईन ईन करा",
+  "OVERLAY_INFO_TEXT_COMMON": "सारे गुण माहित करून घेण्यास लॉग इन करा",
+  "OVERLAY_INFO_TEXT_TAKE_COURSE": "केवळ सभासद कोर्सेस घेऊ शकतात. हा कोर्स घेण्याकरता लॉग ईन करा",
   "OVERLAY_LABEL_COMMON": "{{%s}} ला पूर्ण प्रवेश मिळवा",
   "OVERLAY_LABEL_HOME": "वैयक्तिक होम टॅब",
-  "OVERLAY_LABEL_TAKE_COURSE": "या कोर्समध्ये नोंदणी करण्यासाठी साईन ईन करा",
-  "OVERLAY_SIGN_IN": " साईन ईन ",
+  "OVERLAY_LABEL_TAKE_COURSE": "या कोर्समध्ये नोंदणी करण्यासाठी लोंग  ईन करा",
+  "OVERLAY_SIGN_IN": "लॉग ईन ",
   "OVER_WIFI": "वाय फाय मार्फत",
   "PEOPLE_WHO_FOLLOW_YOU": "तुम्हाला फॉलो करणारे लोक ",
   "PEOPLE_YOU_FOLLOW": "तुम्ही ज्यांना फाॅलो  करता ",
@@ -395,38 +816,51 @@
   "PERMISSION_SETTING_MSG": "परवानग्या प्रदान करण्यासाठी, 'सेटिंग्ज उघडा' वर क्लिक करा",
   "PHONE": "फोन ",
   "PHONE_EDIT_SUCCESS": "मोबाइल नंबर यशस्वीरित्या अपडेट केला आहे ",
-  "PHONE_PLACEHOLDER": "फोन नंबर ",
-  "PHONE_UPDATE_SUCCESS": "फोन नंबर यशस्वीरित्या अपडेट केला आहे",
+  "PHONE_PLACEHOLDER": "मोबाइल नंबर ",
+  "PHONE_UPDATE_SUCCESS": "मोबाइल नंबर यशस्वीरित्या अपडेट केला आहे",
+  "PLANNED_MAINTENANCE_TEXT": "आम्ही  सध्या देखभाल कार्यासाठी बंद आहोत. पण काळजी करू नका, आम्ही लवकर परत येऊ ",
+  "PLANNED_MAINTENANCE_TEXT_WITH_TIME": "आम्ही सध्या देखभाल कार्यासाठी बंद आहोत. पण काळजी करू नका, आम्ही परत येत आहोत ",
   "PLAY": "प्ले ",
   "PLAY_AS": "म्हणून खेळा",
   "PLAY_FROM_DEVICE": "डिव्हाइसवरून चालवा ",
   "PLAY_ONLINE": "ऑनलाईन चालवा ",
   "PLEASE_DOWNLOAD_TO_PLAY": "कृपया सुरू करण्यासाठी डाउनलोड करा",
+  "PLEASE_ENTER": "{{%s}} प्रविष्ट करा ",
+  "PLEASE_PROVIDE_FOLLOWING_DETAILS": "कृपया खालील तपशील प्रदान करा ",
   "PLEASE_SELECT": "{{%s}} निवडा",
   "PLEASE_SELECT_A_LANGUAGE": "भाषा निवडा",
-  "PLEASE_SELECT_USER": "वापरकर्ता निवडा",
+  "PLEASE_VALIDATE_YOUR_EMAIL_ADDRESS": "तुमचा ई-मेल ऍड्रेस प्रस्थापित करा ",
+  "PLEASE_VALIDATE_YOUR_MOBILE_NUMBER": "तुमचा मोबाईल नंबर प्रस्थापित करा ",
   "POPULAR_COURSES": "लोकप्रिय कोर्स",
+  "POWER_OF_GROUPS": "तुम्ही ग्रुप्सच्या संभवतांचे अन्वेषण केले आहे का? ",
+  "PREFERENCES_CAN_BE_UPDATED": "तुम्ही प्रोफाइल पृष्ठावरून या वापरकर्त्याचे तपशील बदलू शकता",
   "PREVIEWS": "प्रिव्ह्यू ",
-  "PRIVATE": "खाजगी",
+  "PREVIOUS_USER_SETTINGS": "मागील वापरकर्ता सेटिंग वरून पुढे चालू करायचे का? ",
+  "PRINT": "छापा ",
+  "PRIVACY_POLICY": "गोपनीयता धोरण ",
   "PROFILE_BNAV": "प्रोफाइल",
   "PROFILE_DETAILS_TITLE": "प्रोफाईल तपशील",
   "PROFILE_UPDATE_FAILED": "प्रोफाइल अपडेट झाले नाही, पुन्हा प्रयत्न करा",
   "PROFILE_UPDATE_SUCCESS": "प्रोफाइल अपडेट झाले आहे",
+  "PROGRAMS_DESC": "तुमच्या स्थानासाठी उपलब्ध असणारे व तुमच्या भूमिकेसाठी योजलेले सक्रिय शैक्षणिक कार्यक्रम पहा व त्यात सहभागी व्हा  ",
+  "PROGRESS_CANNOT_BE_TRACKED": "{{collectionType}}साठी प्रगतीचा मागोवा घेतला जाऊ शकत नाही  ",
   "PROVIDE_BELOW_INFO": "खाली माहिती द्या",
   "PUBLIC": "सार्वजनिक",
-  "PUBLISHED_BY": "{{%s}} रोजी ... कडून प्रकाशित ",
+  "PUBLISHED_BY": "{{%s}} वर प्रकाशित ",
   "PUBLISHED_DATE": "प्रकाशनाची तारीख",
-  "QR_CODE_DETAILS": " हा मजकूर आपल्या काही पाठ्यपुस्तकांमध्ये दिसेल. त्वरित पाहण्यासाठी स्कॅन करा ",
-  "QUESTION": "प्रश्न",
-  "QUESTIONS": "प्रश्न",
-  "QUESTION_MARKS": "प्रश्न (गुण)",
+  "PUBLISHER": "प्रकाशक",
+  "QR_CODE_DETAILS": " हा मजकूर त्वरित पाहण्यासाठी तुमच्या पाठ्यपुस्तका मधील QR कोड स्कॅन करा ",
+  "QR_SHOWING_MULTIPLE_BOOK_RESULT": "{{%s}} निकाल दाखवत आहोत ",
+  "QUES_BANKS": "प्रश्न संचय ",
   "QUIZ": "प्रश्नोत्तरी ",
+  "QUIZ_CONTENTS_ONLY_REGISTERED_USERS": "ही प्रश्नोत्तरी फक्त नोंदणीकृत वापरकर्त्यांसाठी आहे ",
   "RATE": "रेट करा ",
   "RATED_STARS": "तुम्ही {{%s}} स्टार रेट केले आहे ",
   "RATE_THE_CONTENT": "मजकूर रेट करा ",
+  "RATING_QUESTION": "तुम्ही आम्हाला आणखी सांगू इच्छिता का? ",
   "READ_LESS": "कमी वाचा",
   "READ_MORE": "अधिक माहिती वाचा",
-  "RECENTLY_VIEWED": "नुकतेच पाहिलेले",
+  "RECOMMENDATION_BASED_ON_PROFILE": "तुमच्या प्रोफाइलवर बेतलेल्या शिफारसी ",
   "RECOMMENDED": "शिफारस केलेले",
   "RECOVERY_ACCOUNT_UPDATE_SUCCESS": "रिकव्हरी खाते यशस्वीरीत्या अपडेट केले आहे ",
   "RECOVERY_ID_DESCRIPTION": "आपला प्रवेश बंद झाल्यास, रिकव्हरी खात्याद्वारे आपण तो परत मिळवू शकता. आपल्या रिकव्हरी खात्याचा प्रकार निवडा आणि तपशील नोंदवा.",
@@ -434,64 +868,90 @@
   "REDO_ASSESSMENT": "चाचणी पुन्हा करा ",
   "REGISTER_TO_COMPLETE_ACCESS": "मजकुराचा पूर्ण लाभ घेण्यासाठी नोंदणी करा ",
   "REMOVE": "काढून टाका",
+  "REMOVE_ACTIVITY": "काढून टाका ",
+  "REMOVE_ACTIVITY_ERROR_MSG": "क्रियकलाप काढता आले नाही. पुनः प्रयत्न करा  ",
+  "REMOVE_ACTIVITY_GROUP_DESC": "क्रियाकलाप काढून टाकल्यास तो ग्रुपच्या क्रियाकलापावरून नाहीसा होईल व तुम्हाला त्यावरून सभासदाची प्रगती जोखता येणार नाही ",
+  "REMOVE_ACTIVITY_POPUP_TITLE": "क्रियाकलाप काढून टाकायचा? ",
+  "REMOVE_ACTIVITY_SUCCESS_MSG": "गटासाठी क्रियकलाप यशस्वीरित्या काढले ",
   "REMOVE_FROM_DEVICE": "डिव्हाइसवरून साहित्य काढा",
   "REMOVE_FROM_DEVICE_MSG": "तुम्ही डिव्हाइसवरून हे साहित्य काढू इच्छिता?",
-  "REMOVE_MULTIPLE_USERS_FROM_GROUP": "{{%s}} वापरकर्ते काढण्याची पुष्टी करा",
-  "REMOVE_USERS": "वापरकर्ते काढा",
-  "REMOVE_USERS_FROM_GROUP": "गटातून  {{%s}} वापरकर्ते काढा",
-  "REPORTS": "रिपोर्ट",
+  "REMOVE_MEMBER": "सभासद काढून टाका ",
+  "REMOVE_MEMBER_ERROR_MSG": "गटातून सदस्यांस बाहेर काढता आले नाही . पुनः प्रयत्न करा ",
+  "REMOVE_MEMBER_GROUP_DESC": "{{member_name}} काढून टाकल्याने त्याला /तिला गटातून कायमस्वरूपी काढून टाकले जाईल ",
+  "REMOVE_MEMBER_POPUP_TITLE": "सभासद काढून टाकायचा का? ",
+  "REMOVE_MEMBER_SUCCESS_MSG": "आता {{member_name}} गटाचा हिस्सा नाही",
+  "REQUEST_CONTENT": "आम्हाला इथे कल्पना द्या ",
   "RESEND_OTP": "OTP पुन्हा पाठवा ",
+  "RESET": "रीसेट करा ",
   "RESOURCE_TYPE": "संसाधन प्रकार",
-  "RESULT": "निकाल",
+  "RESPONSE_ACKNOWLEGED": "तुमच्या प्रतिसादासाठी आभारी आहोत!",
   "RESULTS": "परिणाम",
   "RESUME": "पुनः सुरु करा",
   "RETRY": "पुन्हा प्रयत्न करा ",
   "RETRY_ACTION": "पुन्हा प्रयत्न करा",
-  "ROLE_SELECTOR_QUERY": "तुम्ही",
+  "ROLE_SELECTOR_QUERY": "सामग्रीचा शोध घ्या ",
   "SAVE": "जतन करा ",
   "SAVED_ON": "वर जतन केले",
-  "SAVED_RESOURCES": "जतन केलेली संसाधने",
   "SAVE_FILE_ON_DEVICE": "डिव्हाइसवर फाईल सेव्ह करा",
   "SCAN_QR_CODE": "QR कोड स्कॅन करा",
   "SCAN_QR_INSTRUCTION": "तुमच्या फोनेच्या कॅमेराने QR कोड स्कॅन करा",
   "SCAN_TAP": "स्कॅन करण्यासाठी टॅप करा ",
-  "SCORE": "गुण",
-  "SCORED": "एकूण गुण",
+  "SCHOOL_OR_ORG_NAME": "शाळा / संस्थेचे नाव ",
+  "SCHOOL_UDISE_ID_OR_ORG_ID": "शाळा UDISE ID/ Org ID",
   "SD_CARD": "एस डी कार्ड ",
+  "SEARCH_FOR_GROUP_MEMBER": "गट सभासदाचा शोध घ्या ",
   "SEARCH_HINT": "शोधा",
   "SEARCH_PLACEHOLDER": "टाईप करून मजकूर शोधा",
   "SEARCH_TO_FIND_CONTENT": "मजकूर मिळवण्यासाठी {{%s}} शोधा ",
+  "SECONDS_AGO": "{{%s}} सेकंदांपूर्वी ",
+  "SECOND_AGO": "{{%s}} सेकंदापूर्वी ",
   "SEE_ALL_RESULTS_FOR": "\"{{%s}}\" साठी सर्व निकाल पहा ",
+  "SEE_MORE_BOOKS": "अधिक पुस्तके व मजकूर पहा ",
+  "SEE_MORE_CONTENT": "अधिक सामग्री पहा ",
   "SELECT": "निवडा",
   "SELECTED_TOPICS": "निवडलेले विषय ",
+  "SELECT_ACTIVITY": "क्रियाकलाप निवडा ",
   "SELECT_ALL": "सर्व निवडा",
-  "SELECT_CHAPTER": "धडा निवडा ",
+  "SELECT_CHAPTER": "विभाग निवडा ",
+  "SELECT_YOUR_STATE": "तुमचे राज्य निवडा ",
+  "SELF_DECLARED_INFO": "स्वयंघोषित माहिती ",
+  "SELF_DECLARE_TEACHER_TNC": "प्रमाणे {{%appName}}च्या प्रशासकांसोबत हे तपशील सामायिक करण्यास मी तयार आहे ",
   "SEND_FILE": "फाईल पाठवा",
   "SERVER_CONNECTION_ERROR": "सर्व्हरशी कनेक्ट करता आले नाही ",
   "SETTINGS": "सेटिंग्स",
   "SHARE": "शेअर",
   "SHARE_APP": "{{%s}} अॅप शेअर करा",
+  "SHARE_APP_LINK": "{{play_store_url}} इथून {{app_name}} ऍप मिळवा ",
   "SHARE_CONTENT_FAILED": "साहित्य शेअर करण्यास अक्षम ",
+  "SHARE_CONTENT_FILE": "फाईल इथून पाठवली : {{app_name}}\nनाव : {{content_name}}\n{{app_name}} ऍप इथून मिळवा : {{play_store_url}}",
+  "SHARE_CONTENT_LINK": "{{content_link}} वरून {{app_name}} वर {{content_name}} पहा \n{{app_name}} एप इथून मिळवा: {{play_store_url}}  ",
   "SHARE_LINK": "लिंक शेअर करा",
   "SHARE_TELEMETRY": "टेलिमेट्री शेअर करा",
   "SHARE_TELEMETRY_FAILED": "टेलीमेट्री शेअर करण्यास अक्षम ",
+  "SHARE_TELEMETRY_NO_DATA_FOUND": "टेलीमेट्री डेटा सापडला नाही ",
   "SHARE_THIS": "शेअर करा",
+  "SHARE_USERNAME": "नमस्कार! तुम्हाला ‪{{user_name}}‬चा ‪{{app_name}}‬ ID मिळालेला आहे: ‪{{diksha_id}}‬",
   "SHOW": "दाखवा",
+  "SHOWING_ITEMS": "{{%s}} कलम दाखवत आहोत ",
   "SHOWING_RESULTS_FOR": "'{{%query}}' साठी {{%count}} निकाल दाखवत आहोत ",
   "SHOW_LESS": "कमी माहिती दर्शवा",
   "SHOW_MORE": "अधिक माहिती दर्शवा",
-  "SHOW_RECENT": "{{%s}} फाईल दाखवत आहोत ",
-  "SIGNED_OUT_ACCOUNT_MESSAGE": "आपण  सध्या  ज्या खात्यातून लॉग इन  केले  आहे त्यांतून साईन आउट केले जाल",
-  "SIGNIN_TO_USE_FEATURE": "हे वैशिष्ट् वापरण्या साठी साइन ईन करा",
-  "SIGN_IN": "साइन इन करा",
+  "SIGNIN_TO_USE_FEATURE": "हे वैशिष्ट् वापरण्या साठी लॉग ईन करा",
+  "SIGN_IN": "लॉग इन करा",
+  "SIZE": "आकार: {{%s}}",
   "SKIP": "वगळा",
   "SOMETHING_WENT_WRONG": "तांत्रिकी समस्येमुळे आम्ही कार्य करण्यास अक्षम आहोत",
   "SORT_BY": "द्वारे वर्गीकरण ",
   "SPACE_AVAILABLE_ON_SDCARD": "एस डी कार्ड वर मोकळी स्पेस -",
   "SPACE_TAKEN": "{{%s}} ने व्यापलेली जागा ",
   "SPACE_TAKEN_BY_APP": "{{%s}} मजकुराने व्यापलेली जागा -",
+  "SPECIAL_CHARACTERS_NOT_SUPPORTED": "या क्षेत्रात विशेष वर्ण वापरण्याची परवानगी नाही ",
+  "START": "सुरु करा ",
+  "START_AGAIN": "पुन्हा सुरु करा ",
+  "START_ASSESSMENT": "मूल्यांकन सुरु करा ",
   "START_COURSE": "प्रारंभ करा",
   "START_COURSE_NOW": "सुरु करा ",
+  "START_LEARNING": "शिक्षण सुरु करा ",
   "STAR_RATINGS": "रेटिंग",
   "STATE": "राज्य ",
   "STATE_OPTION_TEXT": "राज्य निवडा ",
@@ -503,33 +963,103 @@
   "SUBJECT": "विषय",
   "SUBJECTS": "विषय",
   "SUBJECT_OPTION_TEXT": "विषय निवडा",
+  "SUBMIT_MY_DETAILS": "तपशील सबमिट करा ",
+  "SUCCESSFULLY_ADDED_USER": "\"{{%s}}\" यशस्वीरीत्या जोडलेले आहे ",
+  "SUCCESSFULLY_SWITCHED_USER": "नमस्कार {{%user}}",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_PHONE": "सगळे मजकूर फोनवर हलवले जातील ",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_SDCARD": "सगळे मजकूर एस डी कार्ड वर हलवले जातील ",
   "SUPPORT": "मदत",
   "SUPPORT_MESSAGE": "अडचण? आम्हाला संदेश पाठवा",
-  "SWITCHING_TO": "{{%s}} च्याकडे बदल केला आहे",
-  "SWITCH_ACCOUNT": "खाते बदला",
-  "SWITCH_ACCOUNT_CONFIRMATION": "खाते बदलायचे आहे का?",
+  "SWITCH_TO_CLASSIC_THEME": "क्लासिक थीम वर जा ",
+  "SWITCH_TO_JOYFUL_THEME": "आनंददायी थीम वर जा ",
+  "SWITCH_USER": "वापरकर्ता बदला ",
   "SYLLABUS": "अभ्यासक्रम",
   "SYNCING_NOW": "आत्ता सिंक होतय",
   "SYNC_NOW": "आत्ता सिंक करा",
-  "TAKE_ASSESSMENT": "वापरकर्त्यास कमीत कमी एक मूल्यांकन करणे आवश्यक आहे",
   "TAP_SCAN": "{{%s}} QR कोड स्कॅन करण्यासाठी टॅप करा ",
-  "TEACHER_ID_ENTER_LABEL": "आपला शिक्षक ID पडताळणीसाठी एंटर करा ",
+  "TBK_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "सुरू करण्यासाठी पाठ्यपुस्तक निवडा ",
+  "TBK_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "पाठ्यपुस्तक ",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "पाठ्यपुस्तके ",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "पाठ्यपुस्तके ",
+  "TBK_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}च्या लायब्ररीमध्ये अनेक {{%explainVideos}}, {{%quesBanks}} आणि इतर {{%interactiveMaterial}} आहे.  लायब्ररीचे अन्वेषण करण्यासाठी एखाद्या पाठ्यपुस्तकावर क्लिक करा! ",
+  "TBK_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}})साठी कोणतीही पुस्तके सापडली नाहीत ",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "बोर्ड पुस्तके जोडत आहे ",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "तुमच्या विषयाचे पाठ्यपुस्तक {{%s}} वर मिळाले नाही?",
+  "TBK_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span> पाठ्यपुस्तकांसाठी प्रगतीचा मागोवा घेऊ शकत नाही ",
+  "TBK_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "तुम्ही {{%s}}ला मागवलेली पुस्तके तुमच्या बोर्डाने अपलोड करताच आम्ही तुम्हाला सूचित करू ",
+  "TBK_NONTRK_QR_CODE_DETAILS": "तुमच्या पाठ्यपुस्तकातील QR code स्कॅन करून डिजिटल सामग्रीवर त्वरित प्रवेश मिळवा ",
+  "TBK_NONTRK_SEE_MORE_BOOKS": "अधिक पुस्तके व सामग्री पहा ",
+  "TBK_NONTRK_STUDENT_ROLE_DESC_1": "पाठ्यपुस्तके व डिजिटल सामग्री ब्राऊज करा ",
+  "TBK_NONTRK_TEACHER_ROLE_DESC_1": "पाठ्यपुस्तके व डिजिटल सामग्री ब्राऊज करा ",
+  "TBK_NONTRK_TUTORIAL_HEADING": "व्हिडिओ, परस्परसंवादी सामग्री, ई-पाठ्यपुस्तके आणि बरेच काही...",
+  "TBK_TRK_BATCHEND_MAIN_HEADING": "{{%s}}ला पूर्ण होणाऱ्या पाठ्यपुस्तक वाचनाच्या बॅचमध्ये तुम्ही सहभागी झाला आहात ",
+  "TBK_TRK_BATCHEND_SUB_HEADING": "तुम्ही अभ्यास चालू ठेवू शकता, पण तुमची प्रगती अपडेट केली जाणार नाही ",
+  "TBK_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "तुम्ही हा पाठ पूर्ण केला आहे ",
+  "TBK_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} पर्यंत पाठ्यपुस्तक पूर्ण करा ",
+  "TBK_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "हे पाठ्यपुस्तक निष्क्रिय आहे ",
+  "TBK_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "पाठ्यपुस्तक ",
+  "TBK_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "तुम्ही हे पाठ्यपुस्तक वाचलेले आहे ",
+  "TBK_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "पाठ्यपुस्तकासाठी बॅचेस ",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "कार्ये ",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "माझी पाठ्यपुस्तके ",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "बॅच या दिवशी संपली:",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}} रोजी शेवटचे अपडेट केले ",
+  "TBK_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "सहभागी व्हा ",
+  "TBK_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "नवीनतम पाठ्यपुस्तके ",
+  "TBK_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "कार्य सोडायचे का?",
+  "TBK_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "सहभागी होण्यासाठी लॉगिन करा ",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_COURSES": "पाठ्यपुस्तके नाहीत ",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "सामग्री डाउनलोड करा ",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "पाठ्यपुस्तके ({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "पाठ्यपुस्तक ({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "ऑनलाइन अभ्यासक्रम घ्या ",
+  "TBK_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "लोकप्रिय पाठ्यपुस्तके ",
+  "TBK_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ऑनलाइन अभ्यासक्रम घ्या ",
+  "TBK_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "प्रमाणपत्र मिळवण्यासाठी {{%s}} पर्यंत कार्य पूर्ण करा ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING": "अभ्यास कार्य ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "सहभाग घेतलेली अभ्यास कार्ये ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "पाठ्यपुस्तक तपशील ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "कार्य या दिवशी संपते: ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "कार्य संपण्याची तारीख ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "कार्य तपशील ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "हे कार्य यांच्यासाठी अनुरूप आहे:",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "पाठ ",
+  "TBK_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "पाठ्यपुस्तक क्रियाकलाप थांबवा ",
+  "TBK_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "पाठ्यपुस्तकातील क्रियाकलाप पाहायचा आहे का?",
+  "TBK_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "पाठ्यपुस्तकांची बॅच {{batch_start_date}} पासून उपलब्ध आहे ",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "तुम्हाला तुमच्या नोंदवलेल्या संपर्क तपशिलांवर ७ दिवसात प्रमाणपत्राबद्दल सूचित केले जाईल ",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "सूचना: या पाठ्यपुस्तकाला प्रमाणपत्र नाही ",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "तुम्ही हे पाठ्यपुस्तक वाचले आहे ",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "सूचना: सध्या या कार्याला प्रमाणपत्र नाही. निर्माता कालांतराने प्रमाणपत्र जोडू शकतो.",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "तुम्ही पाठ्यपुस्तकाचे वाचन थांबवले आहे  ",
+  "TBK_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "या पाठ्यपुस्तक कार्यासाठी कोणतीही बॅच नाही ",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "हे पाठ्यपुस्तक नोंदणीकृत वापरकर्त्यांसाठी आहे. त्यावर प्रवेश मिळवण्यासाठी लॉगिन करा ",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "हे पाठ्यपुस्तक वाचण्यासाठी लॉगिन करा ",
+  "TBK_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "या कार्यासाठी कोणतीही बॅच उपलब्ध नाही ",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "फक्त नोंदणीकृत वापरकर्ते अभ्यास कार्यात सहभागी होऊ शकतात ",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "तुम्ही हे कार्य यशस्वीरीत्या पूर्ण केले आहे ",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "हे कार्य संपले आहे. तुम्ही पुन्हा चाचणी घेऊ शकता, पण तुमच्या प्रगतीचा अहवाल दिला जाणार नाही.",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "हे कार्य संपले आहे. तुम्ही पुन्हा चाचणी घेऊ शकता, पण तुमच्या प्रगतीचा अहवाल दिला जाणार नाही.",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "पाठ्यपुस्तकाचे तपशील पाहण्यासाठी व प्रवेश मिळवण्यासाठी तुम्हाला सक्रिय बॅचमध्ये सहभागी व्हावे लागेल ",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "पाठ्यपुस्तक तपशील पाहण्यासाठी लॉगिन करणे आवश्यक आहे ",
+  "TEACHER_ID_ENTER_LABEL": "आपला शिक्षक ID पडताळणीसाठी प्रविष्ट करा ",
   "TEACHER_ID_PLACEHOLDER": "उदाहरणार्थ, ER12345 ",
   "TEACHER_ID_VERIFICATION": "शिक्षक ID पडताळणी ",
-  "TEACHER_PROFILE_FAILED": "एंटर केलेला शिक्षक ID चुकीचा असल्याने शिक्षकाची वैयक्तिक माहिती प्रस्थापित करू शकत नाही ",
+  "TEACHER_PROFILE_FAILED": "प्रविष्ट केलेला शिक्षक ID चुकीचा असल्याने शिक्षकाचे प्रोफाइल प्रस्थापित करू शकत नाही ",
   "TEACHER_PROFILE_VERIFIED": "शिक्षकाची वैयक्तिक माहिती यशस्वीरीत्या प्रस्थापित ",
   "TEACHER_ROLE_DESC_1": "पाठ्यपुस्तके व  डिजिटल मजकूर ब्राऊज करा ",
-  "TEACHER_ROLE_DESC_2": "ऑनलाइन प्रशिक्षण घ्या ",
+  "TEACHER_ROLE_DESC_2": "ऑनलाइन कोर्स घ्या ",
   "TEACHER_ROLE_DESC_3": " पाठ योजना शोधा ",
+  "TELL_US_MORE": "आम्हाला आणखी काही सांगा... ",
   "TERMS_OF_USE": "वापरण्याच्या अटी",
   "TEXTBOOK": "पाठ्यपुस्तके ",
+  "TEXTBOOKS": "पाठ्यपुस्तके ",
+  "THANKING_NOTE": "तुम्ही {{%s}}ला मागवलेली पुस्तके तुमच्या राज्य बोर्डाने अपलोड करताच आम्ही तुम्हाला सूचित करू   ",
   "THANK_FOR_RATING": "रेट करण्यासाठी आभार",
-  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "या प्रशिक्षणासाठी बॅचेस उपलब्ध नाहीत ",
+  "THANK_YOU_FOR_SUBMITTING_YOUR_DETAILS": "तुमचे तपशील सबमिट करण्याबद्दल आभार ",
+  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "या कोर्ससाठी बॅचेस उपलब्ध नाहीत ",
   "THIS_IS_A_RESTRICTED_COMMUNITY": "हा समुदाय प्रतिबंधित आहे",
   "TICKET_SUMMARY": "तिकीटाचा सारांश",
-  "TIME": "वेळ",
   "TIME_OUT": "सर्व्हर कालबाह्य झाले म्हणून पुन्हा प्रयत्न करा",
   "TITLE": "शीर्षक",
   "TITLE_UPGRADE_POPUP": "आम्ही मजकुरातील गमावलेल्या प्रतिमा आणि ऑडिओतल्या समस्या सुधारल्या आहेत. अनुभव सुधारण्यासाठी DIKSHAची नवीनतम आवृत्तीचा वापर करा.",
@@ -538,20 +1068,20 @@
   "TOPICS": "विषय ",
   "TOPIC_YOU_MIGHT_LIKE": "तुमच्या आवडीच्या विषयांची अधिक माहिती मिळवा",
   "TOTAL_SIZE": "एकूण आकारमान -",
-  "TOTAL_TIME": "एकूण वेळ",
   "TO_DO": "करावयाच्या गोष्टी ",
-  "TO_EARN_CERTIFICATE": "प्रमाणपत्र मिळवण्यासाठी {{%s}} पर्यंत प्रशिक्षण पूर्ण करा ",
-  "TRAININGS_ATTENDED": "घेतलेली प्रशिक्षण ",
-  "TRAININGS_ONLY_REGISTERED_USERS": "प्रशिक्षण फक्त नोंदणी झालेल्या वापरकर्त्यांसाठी आहे ",
-  "TRAINING_COMPLETED_SUCCESSFULLY": "आपण हे प्रशिक्षण यशस्वीरीत्या पूर्ण केलेले आहे ",
-  "TRAINING_DETAILS": "प्रशिक्षण तपशील ",
-  "TRAINING_ENDED_REDO_ASSESSMENT": "हे प्रशिक्षण संपलेले आहे. आपण चाचणी पुन्हा घेऊ शकता, परंतु आपली प्रगती रेकॉर्ड केली जाणार नाही.",
-  "TRAINING_ENDED_START_ASSESSMENT": "हे प्रशिक्षण संपलेले आहे. आपण चाचणी घेऊ शकता, परंतु आपली प्रगती रेकॉर्ड केली जाणार नाही. ",
-  "TRAINING_ENDS_ON": "प्रशिक्षण संपण्याची तारीख ",
-  "TRAINING_END_DATE": "प्रशिक्षण संपण्याची तारीख ",
-  "TRAINING_INFO": "प्रशिक्षण माहिती ",
-  "TRAINING_IS_RELEVANT_TO_TEACHERS": "हे प्रशिक्षण ... च्या शिक्षकांसाठी आहे ",
-  "TRAINING_MODULES": "प्रशिक्षणाचे विभाग ",
+  "TO_EARN_CERTIFICATE": "प्रमाणपत्र मिळवण्यासाठी {{%s}} पर्यंत कोर्स पूर्ण करा ",
+  "TRAINING": "कोर्स ",
+  "TRAININGS_ATTENDED": "घेतलेले  कोर्स  ",
+  "TRAININGS_ONLY_REGISTERED_USERS": "कोर्स फक्त नोंदणी झालेल्या वापरकर्त्यांसाठी आहे ",
+  "TRAINING_COMPLETED_SUCCESSFULLY": "तुमचा कोर्स यशस्वीरीत्या पूर्ण झाला आहे ",
+  "TRAINING_DETAILS": "कोर्सचा  तपशील ",
+  "TRAINING_ENDED_REDO_ASSESSMENT": "हा कोर्स  संपला आहे. तुम्ही चाचणी परत घेऊ शकता, परंतु तुमची प्रगती रेकॉर्ड केली जाणार नाही",
+  "TRAINING_ENDED_START_ASSESSMENT": "हा कोर्स  संपला आहे. तुम्ही चाचणी घेऊ शकता, परंतु तुमची प्रगती रेकॉर्ड केली जाणार नाही",
+  "TRAINING_ENDS_ON": "कोर्स संपण्याची तारीख ",
+  "TRAINING_END_DATE": "कोर्स संपण्याची तारीख ",
+  "TRAINING_INFO": "कोर्सची  माहिती ",
+  "TRAINING_IS_RELEVANT_TO_TEACHERS": "हा कोर्स खालील दिल्याप्रमाणे उपयुक्त आहे: ",
+  "TRAINING_MODULES": "कोर्सचे विभाग ",
   "TRANSFERRING_CONTENT_TO_PHONE": "मजकूर फोन वर हलवत आहोत",
   "TRANSFERRING_CONTENT_TO_SDCARD": "मजकूर एस डी कार्ड वर हलवीत आहोत ",
   "TRANSFERRING_FILES": "फाइल्स हलवतोय  ",
@@ -561,63 +1091,134 @@
   "TRY_AGAIN": "पुनः प्रयत्न करा",
   "TRY_BEFORE_RATING": "पहा आणि रेट करा",
   "TRY_DIFF_QR": "वेगळा QR कोड वापरण्याचा प्रयत्न करणार का?",
+  "TUTORIAL_BUTTON": "सुरु करण्यासाठी एक पाठ्यपुस्तक निवडा ",
+  "TUTORIAL_HEADING": "व्हिडिओ, परस्परसंवादी मजकूर, ई-पाठ्यपुस्तके  आणि बरेच काही... ",
+  "TVC_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "सुरू करण्यासाठी टीव्ही वर्ग निवडा ",
+  "TVC_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "टीव्ही वर्ग ",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "टीव्ही वर्ग ",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "टीव्ही वर्ग ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}च्या लायब्ररीमध्ये अनेक {{%explainVideos}}, {{%quesBanks}} आणि इतर {{%interactiveMaterial}} आहे. लायब्ररीचे अन्वेषण करण्यासाठी एखाद्या टीव्ही वर्गावर क्लिक करा!",
+  "TVC_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}})साठी कोणतेही टीव्ही वर्ग सापडले नाहीत ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "बोर्ड टीव्ही वर्ग जोडत आहे ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}}वर टीव्ही वर्ग सापडले नाहीत?",
+  "TVC_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span> टीव्ही वर्गाच्या प्रगतीचा मागोवा घेतला जाऊ शकत नाही ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "तुम्ही {{%s}}ला मागवलेला टीव्ही वर्ग तुमच्या राज्य बोर्डाने अपलोड करताच आम्ही तुम्हाला सूचित करू ",
+  "TVC_NONTRK_QR_CODE_DETAILS": "तुमच्या टीव्ही वर्गामधील QR code स्कॅन करून डिजिटल सामग्रीवर त्वरित प्रवेश मिळवा ",
+  "TVC_NONTRK_SEE_MORE_BOOKS": "अधिक टीव्ही वर्ग व सामग्री पहा ",
+  "TVC_NONTRK_STUDENT_ROLE_DESC_1": "टीव्ही वर्ग व डिजिटल सामग्री ब्राऊज करा ",
+  "TVC_NONTRK_TEACHER_ROLE_DESC_1": "टीव्ही वर्ग व डिजिटल सामग्री ब्राऊज करा ",
+  "TVC_NONTRK_TUTORIAL_HEADING": "व्हिडिओ, परस्परसंवादी सामग्री, ई-पाठ्यपुस्तके आणि बरेच काही...",
+  "TVC_TRK_BATCHEND_MAIN_HEADING": "{{%s}} रोजी पूर्ण होणाऱ्या टीव्ही वर्गाच्या बॅचमध्ये तुम्ही सहभागी झाला आहात ",
+  "TVC_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "हा कार्यक्रम तुम्ही पूर्ण केला आहे ",
+  "TVC_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "टीव्ही वर्ग ",
+  "TVC_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "तुम्ही हे टीव्ही वर्ग पहिले आहेत ",
+  "TVC_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "टीव्ही वर्गांसाठी बॅचेस ",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "कार्ये ",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "माझे टीव्ही वर्ग ",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "बॅच या दिवशी संपली:",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}} रोजी शेवटचे अपडेट केले ",
+  "TVC_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "नवीनतम टीव्ही वर्ग ",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "टीव्ही वर्ग ({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "टीव्ही वर्ग ({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "लोकप्रिय टीव्ही वर्ग ",
+  "TVC_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "प्रमाणपत्र मिळवण्यासाठी कार्य {{%s}} पर्यंत पूर्ण करा ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING": "अभ्यास कार्य ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "सहभाग घेतलेली अभ्यास कार्ये ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "टीव्ही वर्ग तपशील ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "कार्य या दिवशी संपते:",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "कार्य संपण्याची तारीख ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "कार्य तपशील ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "हे कार्य यांच्यासाठी अनुरूप आहे:",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "टीव्ही कार्यक्रम ",
+  "TVC_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "टीव्ही वर्ग पाहणे बंद करा ",
+  "TVC_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "तुम्हाला टीव्ही अभ्यास वर्ग पाहायचे आहेत का?",
+  "TVC_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "या टीव्ही वर्गाची बॅच {{batch_start_date}} पासून उपलब्ध आहे ",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "तुम्हाला ७ दिवसात तुमच्या नोंदवलेल्या संपर्क तपशिलांवर प्रमाणपत्राबद्दल सूचित केले जाईल.",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "सूचना: या कार्यासाठी प्रमाणपत्र नाही ",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "तुम्ही हे टीव्ही वर्ग पाहिलेले आहेत ",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "सूचना: सध्या या कार्याला प्रमाणपत्र नाही. निर्माता कालांतराने प्रमाणपत्र जोडू शकतो.",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "तुम्ही टीव्ही वर्ग पाहणे थांबवले आहे ",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "टीव्ही वर्ग नोंदणीकृत वापरकर्त्यांसाठी आहेत. टीव्ही वर्गात प्रवेश करण्यासाठी लॉगिन करा ",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "हा टीव्ही वर्ग पाहण्यासाठी लॉगिन करा ",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "फक्त नोंदणीकृत वापरकर्ते अभ्यास कार्यात सहभागी होऊ शकतात ",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "तुम्ही हे कार्य यशस्वीरीत्या पूर्ण केले आहे ",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "हे कार्य संपलेले आहे. तुम्ही चाचणी पुन्हा घेऊ शकता, पण तुमच्या प्रगतीचा मागोवा घेतला जाणार नाही.",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "कार्य संपलेले आहे. तुम्ही चाचणी घेऊ शकता, पण तुमच्या प्रगतीचा अहवाल दिला जाणार नाही.",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "टीव्ही वर्ग पाहण्यासाठी  व प्रवेश करण्यासाठी तुम्हाला सक्रिय बॅचमध्ये सहभागी व्हावे लागेल ",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "टीव्ही वर्गाचे तपशील पाहण्यासाठी तुम्हाला लॉगिन करावे लागेल ",
   "UNABLE_TO_FETCH_CONTENT": "साहित्य आणण्यात अक्षम",
   "UNENROLL_CONFIRMATION_MESSAGE": "कोर्स मधून नोंदणी रद्द करायची आहे का?  ",
-  "UNENROLL_FROM_COURSE": "नोंदणी रद्द करा  ",
+  "UNENROLL_FROM_COURSE": "कोर्से सोडा ",
   "UNIT_COMING_SOON": "लवकरच येत आहे!",
   "UNKNOWN_QR": "QR कोडशी जुळलेले विषय सापडले नाहीत",
   "UNSELECT_ALL": "निवडलेले सर्व काढा",
   "UPDATE": "अपडेट करा",
   "UPDATE_APP_BTN_ACTION_NO": "नंतर अपडेट करा",
   "UPDATE_APP_BTN_ACTION_YES": "आता अपडेट करा",
+  "UPDATE_APP_SUPPORT_TITLE": "तुम्ही {{app_name}} ऍपची  जुनी आवृत्ती वापरत आहात.  या मजकुराचा लाभ घेण्यासाठी तुमचा ऍप अपग्रेड करून नवीनतम आवृत्ती वापरा. ",
   "UPDATE_APP_TITLE": "अॅपची नवीन आवृत्ती उपलब्ध आहे!",
   "UPDATE_CONFIRMATION_TEXT": "आपल्याला हा मजकूर अपडेट करायचा आहे का?",
   "UPDATE_CONTENT": "{{%s}} साहित्य अपडेट करा",
+  "UPDATE_DETAILS": "तपशील अपडेट करा ",
   "UPDATE_RECOVERY_ID": "रिकव्हरी खाते अपडेट करा ",
   "UPDATE_REQUIRED": "अपडेट आवश्यक ",
+  "UPDATE_YOUR_PREFERENCE_FROM_PROFILE": "तुम्ही प्रोफाइल सेटिंग वरून आपला {{app_name}} प्रोफाइल तपशील संपादित करू शकता",
   "UPDATING": "अपडेट करत आहोत ",
   "UPDATING_CONTENT": "{{%s}} अपडेट होत आहे",
-  "USER": "वापरकर्ता",
   "USERNAME": "वापरकर्त्याचे नाव: {{%s}}",
-  "USERS": "वापरकर्ते",
-  "USERS_AND_GROUPS": "वापरकर्ते आणि गट",
   "USER_CREATED_SUCCESSFULLY": "वापरकर्ते यशस्वीरित्या निर्माण केले",
-  "USER_DELETE_CONFIRM": "{{%s}} हटविण्याची पुष्टी करा",
-  "USER_DELETE_CONFIRM_MESSAGE": "ही क्रिया अपरिवर्तनीय आहे.  वापरकर्त्याचे तपशील हटविल्यानंतर ते परत मिळणार नाहीत",
-  "USER_DELETE_CONFIRM_MESSAGE_FROM_GROUP": "{{%s}} काढण्याची पुष्टी करा",
-  "USER_DELETE_CONFIRM_SECOND_MESSAGE": "वापरकर्त्यांना ग्रुपमधून काढले आहे. वापरकर्त्यांचे तपशील 'वापरकर्ते' टॅब खाली उपलब्ध आहेत",
   "USER_ID": "वापरकर्त्याचा आयडी ",
+  "USER_IS_NOT_VERIFIED": "तुमचा वापरकर्ता ID प्रस्थापित झालेला नाही ",
   "USER_NAME": "वापरकर्त्याचे नाव",
   "USER_TYPE": "वापरकर्ता प्रकार",
   "USER_TYPE_1": "शिक्षक",
   "USER_TYPE_2": "विद्यार्थी",
   "USER_TYPE_3": "इतर ",
+  "USER_TYPE_5": "पालक ",
   "USER_TYPE_SELECT_WARNING": "वापरकर्ता प्रकार निवडा",
-  "VERIFY_EMAIL_OTP_DESCRIPTION": "ई-मेल ID प्रस्थापित करण्यासाठी तुम्हाला ई-मेल द्वारे OTP मिळेल ",
-  "VERIFY_EMAIL_OTP_TITLE": "ई-मेल ID प्रस्थापित करा ",
+  "USER_VERIFICATION": "वापरकर्ता प्रस्थापिकरण ",
+  "USE_APP_AS": "{{%s}} असे वापरा ",
+  "VALIDATION_MAXIMUM_LENGTH": "कमाल लांबी ११ आकड्यांची असली पाहिजे ",
+  "VALIDATION_MINIMUM_LENGTH": "कमान लांबी ११ आकड्यांची हवी ",
+  "VERIFY": "प्रस्थापित करा ",
+  "VERIFY_EMAIL_OTP_DESCRIPTION": "ई-मेल पत्ता प्रस्थापित करण्यासाठी तुम्हाला ई-मेल द्वारे OTP पाठवला जाईल ",
+  "VERIFY_EMAIL_OTP_TITLE": "ई-मेल पत्ता प्रस्थापित करा ",
   "VERIFY_PHONE_OTP_DESCRIPTION": "मोबाइल नंबर प्रस्थापित करण्यासाठी आपल्याला SMS द्वारे OTP मिळेल ",
   "VERIFY_PHONE_OTP_TITLE": "मोबाइल नंबर प्रस्थापित करा ",
   "VERSION": "आवृत्ती ",
-  "VIDEOS": "व्हिडिओ ",
+  "VERYFYING_PLEASE_WAIT": "पडताळत आहोत ",
+  "VIDEO": "व्हिडिओ ",
   "VIEW": "पहा",
+  "VIEW_ACTIVITY": "क्रियाकलाप पहा ",
   "VIEW_ALL": "सर्व पहा",
   "VIEW_ALL_BATCHES": "पुढे जाण्यासाठी एक बॅच निवडा",
   "VIEW_CREDITS_INFO": "श्रेय व लायसिन्सिंगची माहिती दाखवा",
   "VIEW_DOWNLOADS_ONLY_MSG": "केवळ डाउनलोड पहा",
   "VIEW_MORE": "अधिक पहा",
   "VIEW_ONGOING_BATCHES": "सुरु असलेली बॅच पहा",
+  "VIEW_OPEN_BATCHES": "उघड्या बॅचेस ",
   "VIEW_RETIRED_BATCHES": "कालबाह्य बॅच",
   "VIEW_UPCOMING_BATCHES": "आगामी बॅच पहा",
   "WAITING_TO_DOWNLOAD": "डाउनलोड होण्यासाठी प्रतीक्षा करा ...",
   "WAIT_REQUEST": "कृपया थांबा...",
+  "WANT_TO_CHECK_FREE_TRAININGS": "तुम्हाला कोर्स पहायचे आहेत का ?",
   "WARNING_PLEASE_MAKE_SOME_CHANGES": "बदल करा",
+  "WEBVIEW_UPDATE_TEXT": "प्रभावी अनुभवासाठी, गूगल प्ले स्टोर वरून वेबव्ह्यू ची नवीनतम आवृत्ती डाउनलोड करा. ",
+  "WEEKS_AGO": "‪{{%s}}‬ आठवड्यांपूर्वी ",
+  "WEEK_AGO": "‪{{%s}}‬ आठवड्यापूर्वी ",
+  "WELCOME": "स्वागत आहे ",
   "WELCOME_BACK": "पुन्हा एकदा आपले स्वागत आहे {{%s}}",
+  "WHAT_IS_MEMBER_ID": "मला {{app_name}} ID  कुठे दिसू शकेल? ",
+  "YEARS_AGO": "{{%s}} वर्षांपूर्वी ",
+  "YEAR_AGO": "{{%s}} वर्षापूर्वी ",
   "YES": "होय",
+  "YOUR_ID_FROM_STATE_BOARD_ORG": "तुमचा राज्य /बोर्ड /Org वरचा ID ",
   "YOUR_LOCATION": "आपले स्थान ",
-  "YOUR_LOCATION_DETAILS": "आपले स्थानिक तपशील आपल्याला उपयोगी असा मजकूर सुचविण्यास आम्हाला मदत करतात. आपण नमूद केलेले स्थान अचूक आहे का? नसल्यास, योग्य स्थान निवडा व क्लिक करा ",
+  "YOUR_LOCATION_DETAILS": "तुमच्यासाठी उपयुक्त मजकूर सुचवण्यासाठी तुमच्या स्थानिक तपशिलांची आम्हाला मदत होते. तुमचे स्थानिक तपशील अचूक आहेत का? नसल्यास, अचूक स्थान निवडा व सबमिट वर क्लिक करा ",
   "YOUR_PROGRESS": "तुमची प्रगती: {{%s}}%",
   "YOUR_PROGRESS_LABEL": "आपली प्रगती ",
   "YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET": "आपण इंटरनेटशी जोडलेले नाही आहात ",
-  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "प्रशिक्षण तपशील पाहण्यासाठी व सहभागी होण्यासाठी सक्रिय बॅचमध्ये सामील व्हा ",
-  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "प्रशिक्षण तपशील पाहण्यासाठी लॉगिन करा "
+  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "कोर्स  तपशील पाहण्यासाठी व सहभागी होण्यासाठी सक्रिय बॅचमध्ये सामील व्हा ",
+  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "कोर्स तपशील पाहण्यासाठी लॉगिन करा ",
+  "YOU_MUST_LOGIN_TO_ACCESS_QUIZ_CONTENT": "या मजकूरावर प्रवेश करण्यासाठी लॉगिन करणे आवश्यक आहे "
 }
\ No newline at end of file
diff --git a/src/assets/i18n/or.json b/src/assets/i18n/or.json
index ace22fea5..63692faf6 100644
--- a/src/assets/i18n/or.json
+++ b/src/assets/i18n/or.json
@@ -3,76 +3,99 @@
   "ABOUT_US": "ଆମ ବିଷୟରେ ",
   "ACCOMPLISHMENTS": "ଉପଲବ୍ଧି",
   "ACCOUNT_MERGE_CONFIRMATION_BTN_MERGE": " ମିଶ୍ରଣ କରନ୍ତୁ",
-  "ACCOUNT_MERGE_CONFIRMATION_CONTENT": " {{%s}}ରେ ଆପଣଙ୍କର ଦୁଇଟି ଆକାଉଣ୍ଟ ଥିଲେ, କ୍ଲିକ୍ କରନ୍ତୁ  <b>Merge</b> କୁ : <ul><li>ଉଭୟ ଆକାଉଣ୍ଟର ବ୍ୟବହାର ବିବରଣୀ ଯୋଗ କରନ୍ତୁ, ଏବଂ </li><li>ଅନ୍ୟ ଆକାଉଣ୍ଟ ଡିଲିଟ୍ କରନ୍ତୁ</li></ul>ଅନ୍ୟଥା,  କ୍ଲିକ କରନ୍ତୁ <b>ବାତିଲ କରନ୍ତୁ</b>",
-  "ACCOUNT_MERGE_CONFIRMATION_HEADING": "ଆକାଉଣ୍ଟ ମିଶ୍ରଣ କରନ୍ତୁ",
-  "ACCOUNT_MERGE_FAILED": "ଆକାଉଣ୍ଟ ମିଶ୍ରଣ କରିବା ବିଫଳ",
-  "ACCOUNT_MERGE_SUCCESS_POPOVER_CONTENT": "ଆଉଉଣ୍ଟ ମିଶ୍ରଣ ସଫଳତାର ସହ ଆରମ୍ଭ ହୋଇଛି | ଏହା ସଂପୂର୍ଣ୍ଣ ହେଲେ ଆପଣଙ୍କୁ ଜଣାଇଦିଆଯିବ |",
-  "ACCOUNT_MERGE_SUCCESS_POPOVER_HEADING": "ଆକାଉଣ୍ଟ ମିଶ୍ରଣ କରନ୍ତୁ",
-  "ACCURACY": "ସଠିକତା",
+  "ACCOUNT_MERGE_CONFIRMATION_CONTENT": "ଯଦି {{%s}}ରେ ଆପଣଙ୍କର ଦୁଇଟି ଆକାଉଣ୍ଟ ଥିଲେ, ଏଥିରେ କ୍ଲିକ୍ କରନ୍ତୁ,  <b>ମର୍ଜ୍ କରନ୍ତୁ</b> କୁ : <ul><li>ଉଭୟ ଆକାଉଣ୍ଟର ବ୍ୟବହାର ବିବରଣୀ ଯୋଗ କରନ୍ତୁ, ଏବଂ </li><li>ଅନ୍ୟ ଆକାଉଣ୍ଟ ଡିଲିଟ୍ କରନ୍ତୁ</li></ul>ଅନ୍ୟଥା, <b>ବାତିଲ କରନ୍ତୁ</b>ରେ କ୍ଲିକ କରନ୍ତୁ ",
+  "ACCOUNT_MERGE_CONFIRMATION_HEADING": "ଆକାଉଣ୍ଟ ମର୍ଜ୍ କରନ୍ତୁ",
+  "ACCOUNT_MERGE_FAILED": "ଆକାଉଣ୍ଟ ମର୍ଜ୍ କରିବାରେ ବିଫଳ ହେଲା",
+  "ACCOUNT_MERGE_SUCCESS_POPOVER_CONTENT": "ଆଉଉଣ୍ଟ ମର୍ଜ୍ ସଫଳତାର ସହ ଆରମ୍ଭ ହୋଇଛି | ଏହା ସଂପୂର୍ଣ୍ଣ ହେଲେ ଆପଣଙ୍କୁ ଜଣାଇଦିଆଯିବ |",
+  "ACCOUNT_MERGE_SUCCESS_POPOVER_HEADING": "ଆକାଉଣ୍ଟ ମର୍ଜ୍ କରନ୍ତୁ",
   "ACTIVE": "ସକ୍ରିୟ ",
   "ACTIVE_DOWNLOADS": "ସକ୍ରିୟ ଡାଉନଲୋଡ ",
+  "ACTIVITIES": "ଆକ୍ଟିଭିଟି ବା କାର୍ଯ୍ୟକଳାପ",
+  "ACTIVITIESE_SEARCH_PLACEHOLDER": "ଗ୍ରୁପ ଆକ୍ଟିଭିଟି ସର୍ଚ୍ଚ କରନ୍ତୁ",
+  "ACTIVITY_ALREADY_ADDED_IN_GROUP": "ଗ୍ରୁପରେ ପୂର୍ବରୁ ଏହି ଆକ୍ଟିଭିଟିକୁ ଆପଣ ଯୋଗ କରିଛନ୍ତି",
+  "ACTIVITY_COLLECTION_TITLE": "ସଂଗ୍ରହ",
+  "ACTIVITY_COURSE_TITLE": "ପାଠ୍ୟକ୍ରମଗୁଡ଼ିକ",
+  "ACTIVITY_EXPLANATION_CONTENT_TITLE": "ବିସ୍ତାରିତ ତଥ୍ୟ",
+  "ACTIVITY_PRACTICE_QUESTION_SET_TITLE": "ଅଭ୍ୟାସ ପ୍ରଶ୍ନପତ୍ର ସେଟ୍",
+  "ACTIVITY_PRACTICE_RESOURCE_TITLE": "ଅଭ୍ୟାସ ସାମଗ୍ରୀ",
+  "ACTIVITY_RESOURCE_TITLE": "ସମ୍ପଦ",
+  "ACTIVITY_TEXTBOOK_TITLE": "ପାଠ୍ୟପୁସ୍ତକ(ଖୁବ ଶୀଘ୍ର ଆସୁଅଛି)",
+  "ACTIVITY_TV_EPISODE_TITLE": "TV ଏପିସୋଡ୍",
   "ADD": "ଯୋଡନ୍ତୁ",
+  "ADD_ACTIVITY": "ଆକ୍ଟିଭିଟି ଯୋଗ କରନ୍ତୁ",
+  "ADD_ACTIVITY_ERROR_MSG": "ଆକ୍ଟିଭିଟି ଯୋଗ କରିହେଉନାହିଁ | କିଛି ସମୟ ପରେ ପୁଣିଥରେ ପ୍ରୟାସ କରନ୍ତୁ ",
+  "ADD_ACTIVITY_SUCCESS_MSG": "ଆକ୍ଟିଭିଟି ସଫଳତାର ସହ ଯୋଗ କରାଗଲା",
+  "ADD_ANOTHER_USER": "ଅନ୍ୟଏକ ବ୍ୟବହାରକାରୀ ଯୋଗ କରନ୍ତୁ",
   "ADD_DISTRICT": "ଜିଲ୍ଲା  ଯୋଗ କରନ୍ତୁ ",
+  "ADD_EDIT_SELF_DECLARED_TEACHER_INFO": "ସତ୍ୟାପନ କରିବା ପାଇଁ ଓ ପ୍ରଗତି ଯାଞ୍ଚ କରିବା ପାଇଁ ଏହିସବୁ ବିବରଣୀ ଆପଣଙ୍କ ଘୋଷିତ ରାଜ୍ୟକୁ ଦିଆଯାଇପାରେ",
   "ADD_EMAIL": "ଇ ମେଲ ଆଇଡି ଯୋଗ କରନ୍ତୁ ",
+  "ADD_MEMBER": "ସଦସ୍ୟ ଯୋଗ କରନ୍ତୁ",
+  "ADD_MEMBER_CONFIRMATION": "ଆପଣ ଆଗକୁ ଯିବା ପୂର୍ବରୁ ସଦସ୍ୟଙ୍କ ନାମ ଓ {{app_name}} ID ମେଳ ଖାଉଛି କି ନାହିଁ ତାହା ଆପଣଙ୍କୁ ଯାଂଚ କରିବାକୁ ପଡ଼ିବ",
+  "ADD_MEMBER_POPUP_DESC": "ସଦସ୍ୟମାନଙ୍କୁ ସେମାନଙ୍କର ୟୁନିକ୍ {{%s}} ID ଜଣାଇବା ପାଇଁ ନିମ୍ନ ସୂଚନା ବ୍ୟବହାର କରନ୍ତୁ ।",
+  "ADD_MEMBER_POPUP_STEP_1": "<span>Step 1</span> : ପ୍ରୋଫାଇଲ୍ ଟ୍ୟାବରେ କ୍ଲିକ୍ କରନ୍ତୁ",
+  "ADD_MEMBER_POPUP_STEP_2": "<span>ସୋପାନ 2</span>: ଏଠାରେ {{%s}} ID ଦେଖନ୍ତୁ",
+  "ADD_MEMBER_POPUP_TITLE": "ମୁଁ କେଉଁଠାରେ {{%s}}ID ଦେଖିପାରିବି ?",
   "ADD_PHONE": "ମୋବାଇଲ୍ ନମ୍ବର ଯୋଡନ୍ତୁ ",
-  "ADD_RECOVERY_ACCOUNT": "ରିକୋଭରି ଆକାଉଣ୍ଟ ଯୋଗ କରନ୍ତୁ",
-  "ADD_RECOVERY_ID": "ରିକୋଭରି ଆକାଉଣ୍ଟ ଯୋଗ କରନ୍ତୁ",
+  "ADD_RECOVERY_ACCOUNT": "ରିକଭରି ଆକାଉଣ୍ଟ ଯୋଗ କରନ୍ତୁ",
+  "ADD_RECOVERY_ID": "ରିକଭରି ଆକାଉଣ୍ଟ ଯୋଗ କରନ୍ତୁ",
   "ADD_STATE": "ରାଜ୍ୟ ଯୋଗ କରନ୍ତୁ ",
+  "ADD_TO_GROUP": "ଗ୍ରୁପରେ ଯୋଗ କରନ୍ତୁ",
+  "ADD_TO_GROUP_ACTIVITY": "ଗ୍ରୁପରେ ଯୋଗ କରନ୍ତୁ",
+  "ADD_USER": "ବ୍ୟବହାରକାରୀ ଯୋଗ କରନ୍ତୁ",
   "ADD_USERS": "ବ୍ୟବହାରକାରୀ ଯୋଡ଼ନ୍ତୁ ",
-  "ADD_USERS_TO_GROUP": "{{%s}} ବ୍ୟବହାରକାରୀଙ୍କୁ  ଗ୍ରୁପରେ ମିଶାନ୍ତୁ",
+  "AGREE_TO_SHARE_PROFILE_DETAILS": "ଏହା ଅନୁଯାୟୀ, ମୁଁ ମୋର ପ୍ରୋଫାଇଲ୍ ବିବରଣୀକୁ କୋର୍ସ ଆଡ଼ମିନିଷ୍ଟ୍ରେଟରଙ୍କ ସହିତ ସେୟାର କରିବାକୁ ରାଜି ହେଉଛି",
   "ALL": "ସମସ୍ତ",
   "ALLOW": "ଅନୁମତି ଦିଅନ୍ତୁ",
   "ALL_ANNOUNCEMENTS": "ସମସ୍ତ ଘୋଷଣା ",
-  "ALREADY_ENROLLED_COURSE": "ବ୍ୟବହାରକାରୀ ପୂର୍ବରୁ ହିଁ ଏହି ପାଠ୍ୟକ୍ରମରେ ସାମିଲ ଅଛନ୍ତି ",
+  "ALREADY_ENROLLED_COURSE": "ଆପଣ ଏହି ପାଠ୍ୟକ୍ରମରେ ନାମାଙ୍କନ କରିଛନ୍ତି",
   "ALWAYS_ON": "ସର୍ବଦା ଚାଲୁ ରହିବା",
-  "ANDROID_NOT_SUPPORTED": "Android ସଂସ୍କରଣ ସପୋର୍ଟ କରୁନାହିଁ\n",
+  "ANDROID_NOT_SUPPORTED": "Android ସଂସ୍କରଣ ସପୋର୍ଟ କରୁନାହିଁ",
   "ANDROID_NOT_SUPPORTED_DESC": "ଏହି ତଥ୍ୟ ଖୋଲିବ ନାହିଁ କାରଣ ଆପଣଙ୍କ ଫୋନରେ Android ର ବହୁତ ପୁରୁଣା ଭର୍ସନ ରହିଛି | ଯଦି ଆପଣଙ୍କର Crosswalk ଥିବ, ତେବେ ଆପଣଙ୍କ ଡିଭାଇସ୍ ମଡେଲ୍ ଅନୁସାରେ ଏହି ତଥ୍ୟ ଦେଖିପାରିବେ |",
   "ANNOUNCEMENT": "ଘୋଷଣା ",
   "ANSWER": "ଉତ୍ତର ",
   "APPLY": "ଲାଗୁ କରନ୍ତୁ",
   "APPLY_FILTER": "ଫିଲ୍ଟର ପ୍ରୟୋଗ କରନ୍ତୁ ",
-  "APP_QR_CODE": "ଆପଣ ଏକ{{%s}} QR କୋଡ଼ ଦେଖିପାରୁଛନ୍ତି କି ?",
+  "APP_ID": "{{%s}} ID",
+  "APP_QR_CODE": "ଆପଣଙ୍କ ପାଖରେ ଏକ {{%s}} QR କୋଡ଼୍ ଅଛି କି ?",
   "APP_RATING_RATE_EXPERIENCE": "ଆପ୍ ସହିତ ଆପଣଙ୍କ ଅନୁଭବକୁ ରେଟିଂ କରନ୍ତୁ",
   "APP_RATING_RATE_ON_PLAYSTORE": "ଆପଣ ଆପଣଙ୍କ ରେଟିଙ୍ଗକୁ ପ୍ଲେ ଷ୍ଟୋରରେ ଯାଇ ଦେବାକୁ ଚାହୁଁଛନ୍ତି କି ?",
   "APP_RATING_REPORT_AN_ISSUE": "ଆପଣଙ୍କୁ ଖରାପ ଅନୁଭୂତି ମିଳିଥିବାରୁ ଦୁଃଖିତ | ଆପଣ କୌଣସି ବିଷୟରେ ଅଭିଯୋଗ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି ? |",
   "APP_RATING_TAP_ON_STARS": "ପ୍ଲେ ଷ୍ଟୋରରେ ରେଟିଙ୍ଗ କରିବା ପାଇଁ ତାରକା ଚିହ୍ନ ଉପରେ ଟ୍ୟାପ କରନ୍ତୁ ",
   "APP_RATING_THANKS_FOR_RATING": "ଆପଣଙ୍କ ଅନୁଭବକୁ ରେଟିଂ କରିଥିବାରୁ ଧନ୍ୟବାଦ ",
+  "APP_TITLE": "{{%s}} କୁ ସ୍ୱାଗତ !",
   "APP_VERSION": "ଆପ ସଂସ୍କରଣ ",
+  "ARE_YOU_STATE_TEACHER": "ଆପଣ {{%s}} ରେ ଏକ ସରକାରୀ ବିଦ୍ୟାଳୟ ଶିକ୍ଷକ କି",
   "AS_FILE": "ଫାଇଲ ରୂପରେ  ",
   "AS_LINK": "ଲିଙ୍କ ରୂପରେ",
   "ATTACHMENT_DOWNLOADED": "ଆଟାଚମେଣ୍ଟ ଡାଉନଲୋଡ୍ ହେଲା",
   "ATTRIBUTIONS": "ଆଟ୍ରିବୁସନ୍",
-  "AUDIOS": "ଅଡିଓ ",
+  "AUDIO": "ଅଡିଓ ",
   "AUTHOR": "ଲେଖକ ",
   "AUTOMATIC_SYNC": "ସ୍ଵୟଚାଳିତ ଡାଟା Sync",
-  "AUTO_MIGRATION_FAIL_MESSAGE": "ଆକାଉଣ୍ଟ ମିଶ୍ରଣ ବିଫଳ ହେଲା",
+  "AUTO_MIGRATION_FAIL_MESSAGE": "ଆକାଉଣ୍ଟ ମିଶ୍ରଣ ହୋଇପାରୁନାହିଁ",
   "AUTO_MIGRATION_SUCCESS_MESSAGE": "ଆକାଉଣ୍ଟ ମିଶ୍ରଣ ସଫଳ ହେଲା",
   "AVAILABLE": "ଉପଲବ୍ଧ ",
   "AVAILABLE_FILTERS": "ଫିଲ୍ଟର ",
   "AVAILABLE_FOR_TEACHERS": "କେବଳ ଶିକ୍ଷକମାନଙ୍କ ପାଇଁ ଉପଲବ୍ଧ",
   "AVATAR": "ଅବତାର ",
-  "AVERAGE_SCORE": "ହାରାହାରି ସ୍କୋର୍",
-  "AVERAGE_TIME": "ହାରାହାରି ସମୟ ",
   "BACK_TO_EXIT": "ଆପ୍‌ରୁ ବାହାରିଯିବେ ?",
-  "BATCHEND_MAIN_HEADING": "ଆପଣଙ୍କ ବ୍ୟାଚ୍ ଟ୍ରେନିଂ ଶେଷ କରିଛି",
-  "BATCHEND_SUB_HEADING": "ଆପଣ ଟ୍ରେନିଂ ଜାରି ରଖି ପାରନ୍ତି, କିନ୍ତୁ ଆପଣଙ୍କ ପ୍ରଗତି ଅପଡେଟ୍ ହେବ ନାହିଁ ",
-  "BATCHES_AVAILABLE": "ବ୍ୟାଚ୍ ଉପଲବ୍ଧ",
-  "BATCHES_FOR_THIS_COURSE": "ଏହି ପାଠ୍ୟକ୍ରମରେ ଥିବା ବ୍ୟାଚ୍",
+  "BATCHEND_MAIN_HEADING": "ଆପଣ ଯେଉଁ ପାଠ୍ୟକ୍ରମରେ ଯୋଗ ଦେଇଛନ୍ତି ତାହା  {{%s}} ଦିନ ଶେଷ ହୋଇଯାଇଛି",
+  "BATCHEND_SUB_HEADING": "ଆପଣ ପାଠ୍ୟକ୍ରମ ଜାରି ରଖି ପାରନ୍ତି, କିନ୍ତୁ ଆପଣଙ୍କ ପ୍ରଗତି ଅପଡେଟ୍ ହେବ ନାହିଁ ",
+  "BATCHES_AVAILABLE": "ଉପଲବ୍ଧ ଥିବା ବ୍ୟାଚ୍",
+  "BATCHES_FOR_THIS_COURSE": "ଏହି କୋର୍ସ ପାଇଁ ଥିବା ବ୍ୟାଚ୍",
   "BATCH_CREATED_BY": "ପ୍ରସ୍ତୁତକର୍ତ୍ତା",
   "BATCH_DETAILS": "ବ୍ୟାଚ୍ ବିବରଣୀ ",
-  "BATCH_ENROLLMENT_ENDED": "ଏହି ବ୍ୟାଚ୍ ପାଇଁ ପଂଜିକରଣ ବନ୍ଦ ହୋଇଯାଇଛି",
+  "BATCH_ENROLLMENT_ENDED": "ଏହି ବ୍ୟାଚ୍ ପାଇଁ ନାମାଙ୍କନ ବନ୍ଦ ହୋଇଯାଇଛି",
   "BATCH_EXPIRED": "ବ୍ୟାଚ୍ ସମାପ୍ତ ହେଲା",
   "BATCH_EXPIRED_BUTTON": "ଠିକ୍",
-  "BATCH_EXPIRED_DESCRIPTION": "ଏହି ବ୍ୟାଚ୍ ସମୟସୀମା ଶେଷ ହୋଇଛି | ଆପଣ ପାଠ୍ୟକ୍ରମକୁ ଜାରିରଖି ପାରିବେ | ତେବେ, ଆପଣଙ୍କ ପ୍ରଗତି ରେକର୍ଡ ହେବ ନାହିଁ  କିମ୍ବା ନିରୀକ୍ଷଣ କରାଯିବ ନାହିଁ ",
   "BOARD": "ବୋର୍ଡ",
   "BOARD_OPTION_TEXT": "ବୋର୍ଡକୁ ବାଛନ୍ତୁ ",
+  "BROWES_RELEVANT_CONTENT": "ଆପଣଙ୍କ ପସନ୍ଦ (ବୋର୍ଡ, ମାଧ୍ୟମ, ଶ୍ରେଣୀ) ଆଧାରରେ ଉପଯୁକ୍ତ କଣ୍ଟେଣ୍ଟ ପାଇବା ପାଇଁ {{app_name}} ଲାଇବ୍ରେରି ବ୍ରାଉଜ୍ କରନ୍ତୁ",
   "BTN_CLICK_TO_OPEN_CONTENT": "ତଥ୍ୟ ଦେଖିବାପାଇଁ ଟ୍ୟାପ କରନ୍ତୁ ",
   "BTN_LATER": "ପରେ ",
   "BTN_RATE_ON_PLAYSTORE": "ଆମକୁ ପ୍ଲେଷ୍ଟୋରରେ ରେଟିଙ୍ଗ କରନ୍ତୁ ",
   "BTN_SUBMIT": "ସବମିଟ୍ କରନ୍ତୁ",
   "BTN_VISIT_HELP_SECTION": "ସହାୟତା ବିଭାଗକୁ ଯାଆନ୍ତୁ ",
-  "BY_QUESTIONS": "ପ୍ରଶ୍ନ  ଅନୁସାରେ",
-  "BY_USERS": "ବ୍ୟବହାରକାରୀଙ୍କ ଅନୁସାରେ",
   "CAMERA": "କ୍ୟାମେରା ",
   "CAMERA_PERMISSION_DESCRIPTION": "QR କୋଡ଼କୁ ସ୍କାନ କରିବା ପାଇଁ {{%s}} କ୍ୟାମେରା ଅନୁମତି ବ୍ୟବହାର କରେ",
   "CANCEL": "ବାତିଲ କରନ୍ତୁ ",
@@ -82,37 +105,52 @@
   "CANCEL_DOWNLOAD": "ଡାଉନଲୋଡ ବାତିଲ କରନ୍ତୁ ",
   "CANCEL_DOWNLOAD_MESSAGE": "ଡାଉନଲୋଡକୁ ରଦ୍ଦ କରାଗଲେ ସକ୍ରିୟ ଡାଉନଲୋଡରୁ ସମସ୍ତ ତଥ୍ୟ ଡିଲିଟ୍ ହୋଇଯିବ ",
   "CANCEL_DOWNLOAD_TITLE": "ଡାଉନଲୋଡ ବନ୍ଦ କରିବାକୁ ଚାହାନ୍ତି ? ",
-  "CERTIFIED_TRAINING": "ସାର୍ଟିଫାଏଡ୍ ଟ୍ରେନିଂ",
+  "CERTIFICATE_ALREADY_DOWNLOADED": "ଏହି ସାର୍ଟିଫିକେଟ୍ ଆଗରୁ ଡାଉନଲୋଡ୍ ହୋଇସାରିଛି, ଦୟାକରି ଆପଣଙ୍କର Download ଫୋଲଡର୍ ଯାଞ୍ଚ କରନ୍ତୁ",
+  "CERTIFICATE_DOWNLOADED": "ସାର୍ଟିଫିକେଟ୍ ଡାଉନଲୋଡ୍ ଶେଷ ହେଲା",
+  "CERTIFICATE_DOWNLOAD_INFO": "ସାର୍ଟିଫିକେଟ୍ ଡାଉନଲୋଡ୍ ହେଉଛି",
+  "CERTIFIED_TRAINING": "ସାର୍ଟିଫାଏଡ୍ ପାଠ୍ୟକ୍ରମ",
   "CHANGE": "ପରିବର୍ତ୍ତନ ",
   "CHANGE_ROLE": "ଭୂମିକା ବଦଳାନ୍ତୁ",
-  "CHANGE_USER": "ବ୍ୟବହାରକାରୀ ବଦଳାନ୍ତୁ ",
+  "CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "ଆପଣ ଏହି ମଡ୍ୟୁଲ୍ ଶେଷ କରିଛନ୍ତି",
+  "CHARACTERS_REMAINING": "{{character_count}}ଟି କ୍ୟାରେକ୍ଟର ରହିଲା",
   "CHECK_FOR_UPDATES": "ଅପଡେଟ୍ ପାଇଁ ଯାଞ୍ଚ କରନ୍ତୁ ",
   "CHOOSE_FROM_FOLLOWING": "ନିମ୍ନଲିଖିତ ମଧରୁ ଚୟନ କରନ୍ତୁ ",
   "CHOOSE_LANGUAGE": "ଆପଣଙ୍କ ପସନ୍ଦର ଭାଷା ଚୟନ କରନ୍ତୁ ",
+  "CHOOSE_USER": "ବ୍ୟବହାରକାରୀ ଚୟନ କରନ୍ତୁ",
   "CHOOSE_WHERE_TO_SAVE_DATA": "କେଉଁଠାରେ ଡାଟାକୁ ସେଭ୍ କରିବେ, ତାହା ସିଲେକ୍ଟ କରନ୍ତୁ",
   "CLASS": "ଶ୍ରେଣୀ ",
   "CLASSES": "ଶ୍ରେଣୀ",
   "CLEAR": "କାଟିଦିଅନ୍ତୁ",
-  "COACH_SCREEN": "QR କୋଡ଼କୁ ସ୍କାନ କରିବା ଦ୍ୱାରା ଏହା ଆପଣଙ୍କୁ ତଥ୍ୟ ନିକଟକୁ ନେଇଯିବ",
+  "COACH_SCREEN": "QR କୋଡ଼୍ ସ୍କାନ କରିବା ଦ୍ୱାରା ଏହା ଆପଣଙ୍କୁ କଣ୍ଟେଣ୍ଟକୁ ନେଇଯିବ",
   "COMMUNITIES": "ସମୁଦାୟ ",
-  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "ଏହି ଦିନ ସୁଦ୍ଧା ଟ୍ରେନିଂ ଶେଷ କରନ୍ତୁ",
+  "COMPLETED": "ସମ୍ପୂର୍ଣ୍ଣ ହେଲା",
+  "COMPLETE_ASSESSMENT_TO_EARN_CERTIFICATE": "{{%s}} ସୁଦ୍ଧା ମୂଲ୍ୟାୟନ ଶେଷ କରନ୍ତୁ",
+  "COMPLETE_BY": "{{%s}} ସୁଦ୍ଧା ଶେଷ କରନ୍ତୁ",
+  "COMPLETE_CHAPTER_TO_UNLOCK_ACHIEVEMENT": "ଏକ ନୂତନ ଉପଲବ୍ଧି ଅନଲକ୍ କରିବାକୁ ଅଧିକ {{%s}}ଟି କଣ୍ଟେଣ୍ଟ୍ ସମ୍ପୂର୍ଣ୍ଣ କରନ୍ତୁ ",
+  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} ସୁଦ୍ଧା ପାଠ୍ୟକ୍ରମ ଶେଷ କରନ୍ତୁ",
   "CONFIRM": "ନିଶ୍ଚିତ କରନ୍ତୁ",
+  "CONGRATULATIONS": "ଅଭିନନ୍ଦନ !",
   "CONNECT_TO_INTERNET_SUGGESTION": "ତଥ୍ୟ ଦେଖିବାପାଇଁ ଇଣ୍ଟରନେଟ ସହିତ ସଂଯୋଗ କରନ୍ତୁ ",
   "CONSIDER_DOWNLOAD": "ତଥ୍ୟ ଡାଉନଲୋଡ କରିବାପାଇଁ ବିଚାର କରନ୍ତୁ ",
+  "CONTENTS": "କଣ୍ଟେଣ୍ଟ୍",
   "CONTENT_ALREADY_EXIST": "ଫାଇଲ ପୂର୍ବରହିଁ ରହିଛି ,ଅନ୍ୟ ଏକ ଫାଇଲ ଚୟନ କରନ୍ତୁ ",
-  "CONTENT_ALREADY_EXISTS": "ଡେଷ୍ଟିନେସନ୍ ଫୋଲ୍ଡରରେ ତଥ୍ୟ ରହିଛି | ଯେ କୌଣସି ପ୍ରକାରେ ଡେଷ୍ଟିନେସନ୍ ଫୋଲ୍ଡରକୁ ତଥ୍ୟ ନେବା କି ?",
+  "CONTENT_ALREADY_EXISTS": "ଡେଷ୍ଟିନେସନ୍ ଫୋଲ୍ଡରରେ କଣ୍ଟେଣ୍ଟ୍ ରହିଛି | ଯେକୌଣସି ପ୍ରକାରେ ଡେଷ୍ଟିନେସନ୍ ଫୋଲ୍ଡରକୁ ତଥ୍ୟ ନେବେ କି ?",
   "CONTENT_COMING_SOON": "ଆମ୍ଭେ ଏହା ପାଇଁ ତଥ୍ୟ ପ୍ରସ୍ତୁତ କରୁଅଛୁ ",
   "CONTENT_COMMING_SOON": "ଖୁବଶୀଘ୍ର ତଥ୍ୟ ଉପଲବ୍ଧ ହେବ ",
   "CONTENT_CREATED_BY": "ପ୍ରସ୍ତୁତକର୍ତ୍ତା",
   "CONTENT_CREATING": "ଆମ୍ଭେ ଏହା ପାଇଁ ତଥ୍ୟ ପ୍ରସ୍ତୁତ କରୁଅଛୁ ",
   "CONTENT_DELETE": "ତଥ୍ୟ ଡିଲିଟ୍ ହେଲେ ଡିଭାଇସରୁ ତଥ୍ୟ ଡିଲିଟ୍ ହୋଇଯିବ",
   "CONTENT_DELETE_FAILED": "ତଥ୍ୟ ଡିଲିଟ୍ କରିବାରେ ବିଫଳ",
+  "CONTENT_DERIVED_FROM": "ଏହି କଣ୍ଟେଣ୍ଟ୍ ଏହିଠାରୁ ଆସିଅଛି",
   "CONTENT_IMPORTED": "ସଂଫଳତାର ସହ ଗୃହୀତ ହେଲା",
   "CONTENT_IMPORTED_FAILED": "ତଥ୍ୟ ଗ୍ରହଣ କରିବାରେ ବିଫଳ ହେଲା",
-  "CONTENT_IS_BEEING_ADDED": "ଏଥିରେ ତଥ୍ୟକୁ ଦିଆଯାଉଅଛି ",
+  "CONTENT_IS_BEEING_ADDED": "{{content_name}}ରେ କଣ୍ଟେଣ୍ଟ୍ ଯୋଗ କରାଯାଉଅଛି ",
   "CONTENT_IS_BEING_ADDED": "ଆପଣ ରାଜ୍ୟ  ତୁରନ୍ତ ଏହି QR କୋଡ଼ ପାଇଁ ତଥ୍ୟ ଯୋଡ଼ିଦେବ |  ଏହା ଖୁବ୍ ଶୀଘ୍ର ଉପଲବ୍ଧ ହେବ ",
   "CONTENT_NOT_AVAILABLE": "ତଥ୍ୟ ଉପଲବ୍ଧ ନାହିଁ ",
   "CONTENT_PLAYER_EXIT_PERMISSION": "ଆପଣ ଏହି ତଥ୍ୟରୁ ବାହାରିଯିବାକୁ ଚାହୁଁଛନ୍ତି କି ?",
+  "CONTENT_PREFERENCE": "କଣ୍ଟେଣ୍ଟ ଅଗ୍ରାଧିକାର",
+  "CONTENT_PREFERENCE_SELECTION": "କଣ୍ଟେଣ୍ଟ ଅଗ୍ରାଧିକାର ଚୟନ କରନ୍ତୁ",
+  "CONTENT_RATING_SUB_HEADING": "କଣ୍ଟେଣ୍ଟକୁ ରେଟ୍ କରିବା ପାଇଁ ଷ୍ଟାର୍ ଉପରେ ଟ୍ୟାପ୍ କରନ୍ତୁ",
   "CONTENT_RETIRED_BY_AUTHOR": "ଏହି ତଥ୍ୟ ଲେଖକ ଦ୍ୱାରା ହଟେଇ ଦିଆଯାଇଛି, ତେଣୁ ଏହା ଆଉ ଉପଲବ୍ଧ ନୁହେଁ",
   "CONTENT_SIZE": "ତଥ୍ୟର ଆକାର",
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO": "ତଥ୍ୟ ସଫଳତା ପୂର୍ବକ ଏଠାକୁ ଯାଇଛି",
@@ -120,47 +158,193 @@
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO_SDCARD": "ତଥ୍ୟ ସଫଳତା ପୂର୍ବକ SDକାର୍ଡକୁ ଚାଲିଗଲା",
   "CONTINUE": "ଜାରି ରଖିବା ",
   "CONTINUE_AS_ROLE": "'{{%s}}' ରୂପରେ କଣ୍ଟିନ୍ୟୁ କର",
-  "CONTINUE_NOW": "ଜାରି ରଖନ୍ତୁ",
+  "CONTINUE_LEARNING": "ଶିଖିବା ଜାରିରଖନ୍ତୁ",
   "CONTRIBUTIONS": "ଯୋଗଦାନ ",
   "CONTRIBUTORS": "ଯୋଗଦାନକର୍ତ୍ତା ",
   "COPYRIGHT": "କପିରାଇଟ ",
-  "COURSES_BNAV": "ଟ୍ରେନିଂ",
-  "COURSES_IN_PROGRESS": "  ମୋ କୋର୍ସ",
+  "COURSES": "ପାଠ୍ୟକ୍ରମଗୁଡ଼ିକ",
+  "COURSES_BNAV": "ପାଠ୍ୟକ୍ରମଗୁଡ଼ିକ",
+  "COURSES_IN_PROGRESS": "ମୋ ପାଠ୍ୟକ୍ରମଗୁଡ଼ିକ",
   "COURSE_COMPLETED_LABEL": "{{%s}}% ଶେଷ ହୋଇଛି",
-  "COURSE_ENDED": "କୋର୍ସ ଶେଷ ହେଲା",
-  "COURSE_ENROLLED": "ଆପଣ ଟ୍ରେନିଂରେ ଯୋଗ ଦେଇଛନ୍ତି",
-  "COURSE_NOT_AVAILABLE": "ଏହି କୋର୍ସ ଏବେ ଉପଲବ୍ଧ ନାହିଁ ",
-  "COURSE_PROGRESS_COMPLETED": "ଶେଷ ହୋଇଛି:{{%s}} ",
-  "COURSE_UNENROLLED": "ଟ୍ରେନିଂରୁ ଆପଣଙ୍କୁ ବାହାର କରିଦିଆଯାଇଛି",
+  "COURSE_COMPLETION_POPUP_DESC": "7 ଦିନ ମଧ୍ୟରେ ପାଠ୍ୟକ୍ରମ ସାର୍ଟିଫିକେଟ୍ ବିଷୟରେ ଆପଣଙ୍କୁ ଆପଣଙ୍କ ପଂଜୀକୃତ ମୋବାଇଲ୍ ନମ୍ବରରେ ସୂଚୀତ କରାଯିବ ",
+  "COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "ନୋଟ୍ : ଏହି ପାଠ୍ୟକ୍ରମରେ ସାର୍ଟିଫିକେଟ୍ ନାହିଁ ",
+  "COURSE_ENDED": "{{%s}}ରେ ପାଠ୍ୟକ୍ରମ ଶେଷ ହେଲା",
+  "COURSE_ENDED_ON": "{{%s}} ରେ ପାଠ୍ୟକ୍ରମ ଶେଷ ହୋଇଛି",
+  "COURSE_ENROLLED": "ଆପଣ ପାଠ୍ୟକ୍ରମରେ ଯୋଗ ଦେଇଛନ୍ତି",
+  "COURSE_LAST_UPDATED_ON": "କୋର୍ସ ଅପଡେଟ୍ ତାରିଖ  {{last_updated_on_date}}",
+  "COURSE_NOT_AVAILABLE": "ଏହି ପାଠ୍ୟକ୍ରମ ଏବେ ଉପଲବ୍ଧ ନାହିଁ ",
+  "COURSE_NO_CERTIFICATE_MESSAGE": "ନୋଟ୍: ଏବେ ଏହି କୋର୍ସରେ ସାର୍ଟିଫିକେଟ୍ ନାହିଁ । ପରେ କୋର୍ସ ପ୍ରସ୍ତୁତକର୍ତ୍ତା ସାର୍ଟିଫିକେଟ ଯୋଗ କରିପାରନ୍ତି ।",
+  "COURSE_PROGRESS_COMPLETED": "ଶେଷ ହୋଇଛି:  {{%s}}",
+  "COURSE_UNENROLLED": "ଆପଣ ପାଠ୍ୟକ୍ରମରୁ ବାହାରି ଯାଇଛନ୍ତି",
   "COURSE_WILL_BE_AVAILABLE": "{{%s}}ରୁ ପାଠ୍ୟକ୍ରମ ଉପଲବ୍ଧ ହେବ ",
-  "CREATE_GROUP": " ଗ୍ରୁପ୍ ଗଠନ କରନ୍ତୁ ",
-  "CREATE_NEW_GROUP": "ନୂଆ ଗ୍ରୁପ୍ ଗଠନ କରନ୍ତୁ ",
-  "CREATE_NEW_USER": "ନୂଆ ବ୍ୟବହାରକାରୀ କ୍ରିଏଟ୍ କରନ୍ତୁ ",
+  "CREATE_GROUP": "ଗ୍ରୁପ୍ ସୃଷ୍ଟି କରନ୍ତୁ",
+  "CREATE_GROUP_DESCRIPTION": "ଗ୍ରୁପ ତିଆରି କରିବା ଠାରୁ ଆପଣ ଆଉଗୋଟିଏ ସୋପାନ ପଛରେ ଅଛନ୍ତି",
+  "CREATE_GROUP_DESCRIPTION_POPUP": "ଲୋକମାନଙ୍କ ସହ ସମ୍ପର୍କ ରଖିବା, ଆକ୍ଚିଭିଟି ସେୟାର କରିବା, ପ୍ରଗତି ରିଭ୍ୟୁ କରିବା ଏବଂ ଅନ୍ୟାନ୍ୟ ସମ୍ଭାବନାକୁ ଖୋଜିବା  ପାଇଁ ଗୋଟିଏ ଗ୍ରୁପ ସୃଷ୍ଟି କରନ୍ତୁ କିମ୍ବା କୌଣସି ଗ୍ରୁପରେ ଭାଗ ନିଅନ୍ତୁ ",
   "CREATE_USER": "ବ୍ୟବହାରକାରୀ କ୍ରିଏଟ୍ କରନ୍ତୁ ",
   "CREATORS": "{{%s}}ରେ ଲେଖାଯାଇଛି, ଲେଖିଛନ୍ତି ",
   "CREDITS": "କ୍ରେଡିଟ୍",
   "CREDITS_LICENCE_INFO": "କ୍ରେଡିଟ୍ ଓ ଲାଇସେନସ୍ ସୂଚନା",
-  "CSV_DOWNLOAD_SUCCESS": "{{%s}} ‘Downloads’ରେ ସେଭ୍ ହୋଇଛି",
+  "CRS_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "ଆରମ୍ଭ କରିବା ପାଇଁ ଏକ କୋର୍ସ ଚୟନ କରନ୍ତୁ",
+  "CRS_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "କୋର୍ସ",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "କୋର୍ସଗୁଡ଼ିକ",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "କୋର୍ସଗୁଡ଼ିକ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}} ର ଲାଇବ୍ରେରୀରେ ଅନେକ {{%explainVideos}}, {{%quesBanks}} ଓ ଅନ୍ୟ {{%interactiveMaterial}} ରହିଛି । ଲାଇବ୍ରେରୀ ଅଧିକ ଦେଖିବା ପାଇଁ ଏକ କୋର୍ସରେ କ୍ଲିକ୍ କରନ୍ତୁ !",
+  "CRS_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) ପାଇଁ କୌଣସି କୋର୍ସ ମିଳିଲା ନାହିଁ ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "ବୋର୍ଡ କୋର୍ସ ଯୋଗ କରୁଛି ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}}ରେ କୌଣସି କୋର୍ସ ପାଇଲେ ନାହିଁ କି ?",
+  "CRS_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>ନୋଟ୍ :</span> ଏହି କୋର୍ସ ପାଇଁ ପ୍ରଗତି ଟ୍ରାକ୍ କରାଯାଇପାରିବ ନାହିଁ ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "ଆପଣ {{%s}}ରେ  ଅନୁରୋଧ କରିଥିବା କୋର୍ସ ଆପଣଙ୍କର ରାଜ୍ୟ ବୋର୍ଡ ଅପଲୋଡ଼୍ କଲେ ଆମେ ଆପଣଙ୍କୁ ଜଣାଇବୁ ",
+  "CRS_NONTRK_QR_CODE_DETAILS": "ଆପଣଙ୍କ କୋର୍ସରୁ QR କୋଡ଼୍ ସ୍କାନ୍ କରି ଡିଜିଟାଲ କଣ୍ଟେଣ୍ଟ୍ ଆକ୍ସେସ୍ କରନ୍ତୁ ।",
+  "CRS_NONTRK_SEE_MORE_BOOKS": "ଅଧିକ କୋର୍ସ ଓ କଣ୍ଟେଣ୍ଟ ଦେଖନ୍ତୁ",
+  "CRS_NONTRK_STUDENT_ROLE_DESC_1": "କୋର୍ସ ଓ ଡିଜିଟାଲ କଣ୍ଟେଣ୍ଟ୍ ବ୍ରାଉଜ୍ କରନ୍ତୁ",
+  "CRS_NONTRK_TEACHER_ROLE_DESC_1": "କୋର୍ସ ଓ ଡିଜିଟାଲ କଣ୍ଟେଣ୍ଟ୍ ବ୍ରାଉଜ୍ କରନ୍ତୁ",
+  "CRS_NONTRK_TUTORIAL_HEADING": "ଭିଡିଓ, ଇଣ୍ଟରଆକ୍ଟିଭ୍ କଣ୍ଟେଣ୍ଟ୍, ଇ-ପାଠ୍ୟପୁସ୍ତକ ଓ ଆହୁରି ଅନେକ...",
+  "CRS_TRK_BATCHEND_MAIN_HEADING": "ଆପଣ ଯେଉଁ କୋର୍ସ ବ୍ୟାଚରେ ଯୋଗ ଦେଇଛନ୍ତି ତାହା  {{%s}} ରେ ଶେଷ ହୋଇଯାଇଛି",
+  "CRS_TRK_BATCHEND_SUB_HEADING": "ଆପଣ କୋର୍ସ ଜାରି ରଖି ପାରନ୍ତି, କିନ୍ତୁ ଆପଣଙ୍କ ପ୍ରଗତି ଅପଡେଟ୍ ହେବ ନାହିଁ ",
+  "CRS_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "ଆପଣ ଏହି ମଡ୍ୟୁଲ୍ ଶେଷ କରିଛନ୍ତି",
+  "CRS_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} ସୁଦ୍ଧା କୋର୍ସ ଶେଷ କରନ୍ତୁ",
+  "CRS_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "କୋର୍ସଗୁଡ଼ିକ",
+  "CRS_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "ଆପଣ ଏହି କୋର୍ସରେ ଯୋଗ ଦେଇଛନ୍ତି",
+  "CRS_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "ଏହି କୋର୍ସ ପାଇଁ ଥିବା ବ୍ୟାଚ୍",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "କୋର୍ସଗୁଡ଼ିକ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "ମୋ କୋର୍ସଗୁଡ଼ିକ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "{{%s}}ରେ କୋର୍ସ ଶେଷ ହେଲା",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "ଶେଷଥର ପାଇଁ {{last_updated_on_date}} ରେ କୋର୍ସ ଅପଡେଟ୍ ହୋଇଥିଲା",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_NOT_AVAILABLE": "ଏହି କୋର୍ସ ଆଉ ସକ୍ରିୟ ନାହିଁ ",
+  "CRS_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "କୋର୍ସରେ ଯୋଗଦିଅନ୍ତୁ",
+  "CRS_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "ସଦ୍ୟତମ କୋର୍ସଗୁଡ଼ିକ",
+  "CRS_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "କୋର୍ସ ଛାଡ଼ିବେ କି ?",
+  "CRS_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "କୋର୍ସରେ ଯୋଗ ଦେବା ପାଇଁ ଲଗ୍ ଇନ୍ କରନ୍ତୁ",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_COURSES": "କୋର୍ସ ନାହିଁ ",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "କୋର୍ସ କିମ୍ବା ଲାଇବ୍ରେରୀରୁ କଣ୍ଟେଣ୍ଟ୍ ଡାଉନଲୋଡ କରନ୍ତୁ ",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "କୋର୍ସ ({{%s}})",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "କୋର୍ସ ({{%s}})",
+  "CRS_TRK_FRMELEMNTS_LBL_OVERLAY_LABEL_TAKE_COURSE": "ଏହି କୋର୍ସରେ  ଯୋଗ ଦେବା ପାଇଁ ଲଗ୍ ଇନ୍ କରନ୍ତୁ",
+  "CRS_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "ଲୋକପ୍ରିୟ କୋର୍ସଗୁଡ଼ିକ",
+  "CRS_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ଅନଲାଇନ୍ କୋର୍ସ ନିଅନ୍ତୁ",
+  "CRS_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "ସାର୍ଟିଫିକେଟ୍ ହାସଲ କରିବା ପାଇଁ  {{%s}} ସୁଦ୍ଧା ପାଠ୍ୟକ୍ରମ ଶେଷ କରନ୍ତୁ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING": "କୋର୍ସ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "ଭାଗନେଇଥିବା କୋର୍ସଗୁଡ଼ିକ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "କୋର୍ସ ବିବରଣୀ ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "କୋର୍ସ ଶେଷ ହେବା ତାରିଖ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "କୋର୍ସ ସରିବା ତାରିଖ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "କୋର୍ସ ବିବରଣୀ ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "ଏହି କୋର୍ସ ଏହିମାନଙ୍କ ପାଇଁ ଉଦ୍ଦିଷ୍ଟ:",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "କୋର୍ସ ମଡ୍ୟୁଲଗୁଡ଼ିକ ",
+  "CRS_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "କୋର୍ସ ଛାଡନ୍ତୁ",
+  "CRS_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "କୋର୍ସ ଦେଖିବା ପାଇଁ ଚାହୁଁଛନ୍ତି କି ?",
+  "CRS_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "ଏହି କୋର୍ସ ପାଇଁ ବ୍ୟାଚ୍ {{batch_start_date}} ରୁ ଉପଲବ୍ଧ ହେଉଛି",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "7 ଦିନ ମଧ୍ୟରେ କୋର୍ସ ସାର୍ଟିଫିକେଟ୍ ବିଷୟରେ ଆପଣଙ୍କୁ ଆପଣଙ୍କ ପଂଜିକୃତ ଯୋଗାଯୋଗ ବିବରଣୀ ମାଧ୍ୟମରେ ସୂଚୀତ କରାଯିବ ",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "ନୋଟ୍ : ଏହି କୋର୍ସରେ ସାର୍ଟିଫିକେଟ୍ ମିଳେ ନାହିଁ",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "ଆପଣ କୋର୍ସରେ ଯୋଗ ଦେଇଛନ୍ତି",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "ନୋଟ୍: ଏବେ ଏହି କୋର୍ସରେ ସାର୍ଟିଫିକେଟ୍ ନାହିଁ । ପରେ କୋର୍ସ ପ୍ରସ୍ତୁତକର୍ତ୍ତା ସାର୍ଟିଫିକେଟ ଯୋଗ କରିପାରନ୍ତି ।",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "ଆପଣ କୋର୍ସରୁ ବାହାରି ଯାଇଛନ୍ତି ",
+  "CRS_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "ଏହି କୋର୍ସ ପାଇଁ କୌଣସି ବ୍ୟାଚ୍ ନାହିଁ ",
+  "CRS_TRK_FRMELEMNTS_MSG_OTHER_ROLE_DESC_2": "ଅନଲାଇନ୍ କୋର୍ସ ନିଅନ୍ତୁ",
+  "CRS_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "ଏହି କୋର୍ସ ପଞ୍ଜୀକୃତ ବ୍ୟବହାରକାରୀଙ୍କ ପାଇଁ ଅଟେ | ଏହି କୋର୍ସ ପାଇବା ପାଇଁ ଲଗ୍ ଇନ୍ କରନ୍ତୁ ।",
+  "CRS_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "ଏହି କୋର୍ସ ପାଇଁ କୌଣସି ବ୍ୟାଚ୍ ଉପଲବ୍ଧ ନାହିଁ ",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "କେବଳ ପଂଜୀକୃତ ବ୍ୟବହାରକାରୀମାନେ କୋର୍ସରେ ନାମାଙ୍କନ କରିପାରିବେ",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "ଆପଣ ସଫଳତାର ସହ ଏହି କୋର୍ସ ଶେଷ କରିଛନ୍ତି",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "ଏହି କୋର୍ସ ସରିଯାଇଛି । ଆପଣ ମୂଲ୍ୟାୟନ ଆଉଥରେ ଦେଇପାରନ୍ତି, କିନ୍ତୁ ଏଥିରେ ଆପଣଙ୍କ ପ୍ରଗତି ରେକର୍ଡ କରାଯିବ ନାହିଁ ।",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "ଏହି କୋର୍ସ ସରିଯାଇଛି । ଆପଣ ମୂଲ୍ୟାୟନ ଦେଇପାରିବେ, କିନ୍ତୁ ଏଥିରେ ଆପଣଙ୍କର ପ୍ରଗତି ରେକର୍ଡ କରାଯିବ ନାହିଁ ।",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "କୋର୍ସ ବିବରଣୀ ଦେଖିବା ପାଇଁ ଓ ତାକୁ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ଏକ ସକ୍ରିୟ ବ୍ୟାଚ୍ ରେ ଯୋଗଦେବାକୁ ପଡିବ",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "କୋର୍ସ ବିବରଣୀ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ଲଗ୍ ଇନ୍ କରିବାକୁ ପଡ଼ିବ",
   "CURRENT_LANGUAGE": "ବର୍ତ୍ତମାନ ଭାଷା ",
-  "DATA": "ଅଧିକ ବହି ଓ ତଥ୍ୟ ଦେଖନ୍ତୁ",
   "DATA_SYNC": "ଡାଟା Sync",
   "DATA_SYNC_FAILURE": "ଡାଟା Sync ହୋଇପାରିବ ନାହିଁ ,ପୁଣିଥରେ ପ୍ରୟାସ କରନ୍ତୁ  ",
+  "DATA_SYNC_NOTHING_TO_SYNC": "ସିଙ୍କ୍ରୋନାଇଜ୍ କରିବା ପାଇଁ କିଛି ନାହିଁ",
   "DATA_SYNC_SUB": " ଡାଟାର ବ୍ୟାକଅପ ନିଅନ୍ତୁ ,ଟେଲିମେଟ୍ରି ସ୍ଥାନାସ୍ତରିତ କରନ୍ତୁ  ",
   "DATA_SYNC_SUCCESSFUL": "ଟେଲିମେଟ୍ରି ଡାଟା Sync ସଫଳ ହେଲା ",
+  "DAYS_AGO": "{{%s}} ଦିନ ପୂର୍ବରୁ",
+  "DAY_AGO": "{{%s}} ଦିନ ପୂର୍ବରୁ",
   "DELETE": "ଡିଲିଟ୍ କରନ୍ତୁ",
   "DELETE_ALL_CONTENT_WARNING": "ତଥ୍ୟକୁ ଡିଲିଟ୍ କଲେ ଚୟନ କରାଯାଇଥିବା ତଥ୍ୟ ଡିଭାଇସରୁ ଡିଲିଟ୍ ହୋଇଯିବ",
   "DELETE_CONTENT": "ତଥ୍ୟ ଡିଲିଟ୍ କରିବେ ?",
+  "DELETE_CONTENT_SIZE": "1ଟି ଆଇଟମ୍ {{content_size}}({{content_size}})",
   "DELETE_CONTENT_WARNING": "ତଥ୍ୟ ଡିଲିଟ୍ ହେଲେ ଡିଭାଇସରୁ ତଥ୍ୟ ଡିଲିଟ୍ ହୋଇଯିବ",
-  "DELETE_GROUP": "ଗ୍ରୁପ୍ ଡିଲିଟ୍ କରନ୍ତୁ",
+  "DELETE_GROUP_DESC": "{{group_name}} ଡିଲିଟ୍ କରିବା ଦ୍ୱାରା ଆପ୍ଲିକେସନରୁ ଗ୍ରୁପ୍ ସ୍ଥାୟୀ ଭାବରେ ବାହାରିଯିବ",
+  "DELETE_GROUP_ERROR_MSG": "ଗ୍ରୁପ ଡିଲିଟ୍ କରିପାରୁନାହିଁ | କିଛି ସମୟ ପରେ ପୁଣିଥରେ ପ୍ରୟାସ କରନ୍ତୁ",
+  "DELETE_GROUP_POPUP_TITLE": "ଗ୍ରୁପ୍ ଡିଲିଟ୍ କରିବେ ?",
+  "DELETE_GROUP_SUCCESS_MSG": "ଗ୍ରୁପ ସଫଳତାର ସହ ଡିଲିଟ୍ ହେଲା",
   "DELETE_PROGRESS": "ଚୟନ କରାଯାଇଥିବା ତଥ୍ୟକୁ ଡିଲିଟ୍ କରିବା",
-  "DESCRIPTION": "ବିବରଣୀ",
+  "DETAIL_TUTORIAL": "{{%appName}} ଲାଇବ୍ରେରୀରେ {{%explainVideos}}, {{%quesBanks}} ଓ ଅନ୍ୟ {{%interactiveMaterial}} ର ହୋଷ୍ଟ୍ ଅଛି । ଲାଇବ୍ରେରୀ ଦେଖିବା ପାଇଁ ଏକ ପାଠ୍ୟପୁସ୍ତକରେ କ୍ଲିକ୍ କରନ୍ତୁ!",
   "DEVICE_ID": "ଡିଭାଇସ ଆଇଡି ",
+  "DEVICE_LOCATION": "ଡିଭାଇସ୍ ଅବସ୍ଥିତି",
   "DEVICE_TAGS": "ଡିଭାଇସ ଟ୍ୟାଗ ",
   "DEVICE_TAGS_SUB": "ଡିଭାଇସ ଟ୍ୟାଗ ଯୋଡ଼ନ୍ଠୁ କିମ୍ବା ଲଗାନ୍ତୁ",
+  "DFLT_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "ଆରମ୍ଭ କରିବା ପାଇଁ ଏକ ଟାସ୍କ ଚୟନ କରନ୍ତୁ",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "ଟାସ୍କ",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "ଟାସ୍କଗୁଡ଼ିକ",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "ଟାସ୍କଗୁଡ଼ିକ",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}} ର ଲାଇବ୍ରେରୀରେ ଅନେକ {{%explainVideos}}, {{%quesBanks}} ଓ ଅନ୍ୟ {{%interactiveMaterial}} ରହିଛି । ଲାଇବ୍ରେରୀରେ ଅଧିକ ଦେଖିବା ପାଇଁ ଏକ କଣ୍ଟେଣ୍ଟ୍ ଉପରେ କ୍ଲିକ୍ କରନ୍ତୁ !",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) ପାଇଁ କୌଣସି ଟାସ୍କ ମିଳୁନାହିଁ ",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "ବୋର୍ଡ କଣ୍ଟେଣ୍ଟ୍ ସାମିଲ କରୁଛି",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}}ରେ କୌଣସି କଣ୍ଟେଣ୍ଟ୍ ପାଇଲେ ନାହିଁ କି ?",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>ନୋଟ୍ :</span> ପ୍ରଗତି ଟ୍ରାକ୍ କରାଯାଇପାରିବ ନାହିଁ ",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "ଆପଣ {{%s}}ରେ  ଅନୁରୋଧ କରିଥିବା କଣ୍ଟେଣ୍ଟ୍ ଆପଣଙ୍କର ରାଜ୍ୟ ବୋର୍ଡ ଅପଲୋଡ଼୍ କଲେ ଆମେ ଆପଣଙ୍କୁ ଜଣାଇବୁ ",
+  "DFLT_NONTRK_QR_CODE_DETAILS": "QR କୋଡ଼୍ ସ୍କାନ୍ କରି ସଙ୍ଗେ ସଙ୍ଗେ ଡିଜିଟାଲ କଣ୍ଟେଣ୍ଟ୍ ଆକ୍ସେସ୍ କରନ୍ତୁ ",
+  "DFLT_NONTRK_SEE_MORE_BOOKS": "ଅଧିକ ଦେଖନ୍ତୁ ",
+  "DFLT_NONTRK_STUDENT_ROLE_DESC_1": "ଡିଜିଟାଲ୍ କଣ୍ଟେଣ୍ଟ୍ ବ୍ରାଉଜ୍ କରନ୍ତୁ",
+  "DFLT_NONTRK_TEACHER_ROLE_DESC_1": "ଡିଜିଟାଲ୍ କଣ୍ଟେଣ୍ଟ୍ ବ୍ରାଉଜ୍ କରନ୍ତୁ",
+  "DFLT_NONTRK_TUTORIAL_HEADING": "ଭିଡିଓ, ଇଣ୍ଟରଆକ୍ଟିଭ୍ କଣ୍ଟେଣ୍ଟ୍, ଇ-ପାଠ୍ୟପୁସ୍ତକ ଓ ଆହୁରି ଅନେକ...",
+  "DFLT_TRK_BATCHEND_MAIN_HEADING": "ଆପଣ ଯେଉଁ ଶିକ୍ଷା ଟାସ୍କରେ ଯୋଗ ଦେଇଛନ୍ତି, ତାହା  {{%s}} ରେ ଶେଷ ହୋଇଯାଇଛି",
+  "DFLT_TRK_BATCHEND_SUB_HEADING": "ଆପଣ ଶିଖିବା ଜାରି ରଖି ପାରନ୍ତି, କିନ୍ତୁ ଆପଣଙ୍କ ପ୍ରଗତି ଅପଡେଟ୍ ହେବ ନାହିଁ ",
+  "DFLT_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "ଆପଣ ଏହି ଶିକ୍ଷା ଆକ୍ଟିଭିଟି ଶେଷ କରିଛନ୍ତି ",
+  "DFLT_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} ସୁଦ୍ଧା ଶିକ୍ଷା ଶେଷ କରନ୍ତୁ",
+  "DFLT_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "ଏହି ଶିକ୍ଷା ଟାସ୍କ ଆଉ ସକ୍ରିୟ ନାହିଁ ",
+  "DFLT_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "ଶିକ୍ଷଣ ଟାସ୍କଗୁଡ଼ିକ",
+  "DFLT_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "ଆପଣ ଏହି ଶିକ୍ଷଣ ଟାସ୍କରେ ଯୋଗ ଦେଇଛନ୍ତି",
+  "DFLT_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "ଶିକ୍ଷଣ ଟାସ୍କ ପାଇଁ ବ୍ୟାଚ୍",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "ଶିକ୍ଷଣ ଟାସ୍କଗୁଡ଼ିକ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "ମୋ ଶିକ୍ଷଣ ଟାସ୍କଗୁଡ଼ିକ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "ଟାସ୍କ {{%s}} ରେ ଶେଷ ହେଲା",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "ଶେଷଥର ପାଇଁ {{last_updated_on_date}} ରେ ଅପଡେଟ୍ ହୋଇଥିଲା",
+  "DFLT_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "ଯୋଗ ଦିଅନ୍ତୁ",
+  "DFLT_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "ସଦ୍ୟତନ ଶିକ୍ଷଣ ଟାସ୍କଗୁଡ଼ିକ",
+  "DFLT_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "ଟାସ୍କ ଛାଡ଼ିବେ କି ?",
+  "DFLT_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "ଯୋଗ ଦେବା ପାଇଁ ଲଗ୍ ଇନ୍ କରନ୍ତୁ ",
+  "DFLT_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "କଣ୍ଟେଣ୍ଟ୍ ଡାଉନଲୋଡ୍ କରନ୍ତୁ",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "({{%s}}) ଟାସ୍କ",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "({{%s}}) ଟାସ୍କ",
+  "DFLT_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "ଅନଲାଇନ୍ ଶିକ୍ଷା ନିଅନ୍ତୁ",
+  "DFLT_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "ଲୋକପ୍ରିୟ ଟାସ୍କଗୁଡ଼ିକ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ଅନଲାଇନ୍ ଶିକ୍ଷା ନିଅନ୍ତୁ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "ସାର୍ଟିଫିକେଟ୍ ହାସଲ କରିବା ପାଇଁ  {{%s}} ସୁଦ୍ଧା ଟାସ୍କ ଶେଷ କରନ୍ତୁ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING": "ଶିକ୍ଷଣ ଟାସ୍କ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "ଭାଗ ନେଇଥିବା ଶିକ୍ଷା ଟାସ୍କ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "ଟାସ୍କ ବିବରଣୀ ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "ଟାସ୍କ ଶେଷ ହେବା ତାରିଖ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "ଟାସ୍କ ସରିବା ତାରିଖ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "ଟାସ୍କ ବିବରଣୀ ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "ଏହି ଟାସ୍କ ଏହିମାନଙ୍କ ପାଇଁ ଉଦ୍ଦିଷ୍ଟ:",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "ଟାସ୍କ ସଂସାଧନ",
+  "DFLT_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "ଟାସ୍କ ଛାଡ଼ିବେ",
+  "DFLT_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "ଶିକ୍ଷା ଟାସ୍କ ଦେଖିବାକୁ ଚାହୁଁଛନ୍ତି କି ?",
+  "DFLT_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "ଏହି ଟାସ୍କ ପାଇଁ ବ୍ୟାଚ୍ {{batch_start_date}} ରୁ ଉପଲବ୍ଧ ହେବ ",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "7 ଦିନ ମଧ୍ୟରେ ସାର୍ଟିଫିକେଟ୍ ବିଷୟରେ ଆପଣଙ୍କୁ ଆପଣଙ୍କ ପଂଜିକୃତ ଯୋଗାଯୋଗ ମାଧ୍ୟମରେ ସୂଚୀତ କରାଯିବ ",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "ନୋଟ୍: ଏହି ଟାସ୍କରେ ସାର୍ଟିଫିକେଟ୍ ନାହିଁ",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "ଆପଣ ଟାସ୍କରେ ଯୋଗ ଦେଇଛନ୍ତି",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "ନୋଟ୍: ଏବେ ଏହି ଟାସ୍କରେ ସାର୍ଟିଫିକେଟ୍ ନାହିଁ । ପରେ ପ୍ରସ୍ତୁତକର୍ତ୍ତା ସାର୍ଟିଫିକେଟ ଯୋଗ କରିପାରନ୍ତି ।",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "ଆପଣ ଟାସ୍କରୁ ବାହାରି ଯାଇଛନ୍ତି ",
+  "DFLT_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "ଏହି ଶିକ୍ଷା ଟାସ୍କ ପାଇଁ କୌଣସି ବ୍ୟାଚ୍ ନାହିଁ ",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "ଏହି ଟାସ୍କ ପଞ୍ଜୀକୃତ ବ୍ୟବହାରକାରୀଙ୍କ ପାଇଁ ଅଟେ | ଏହି ଟାସ୍କ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଲଗ୍ ଇନ୍ କରନ୍ତୁ ",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "ଏହି ଟାସ୍କ ଆରମ୍ଭ କରିବା ପାଇଁ ଲଗ୍ ଇନ୍ କରନ୍ତୁ ",
+  "DFLT_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "ଏହି ଟାସ୍କ ପାଇଁ କୌଣସି ବ୍ୟାଚ୍ ଉପଲବ୍ଧ ନାହିଁ ",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "କେବଳ ପଞ୍ଜୀକୃତ ବ୍ୟବହାରକାରୀମାନେ ଶିକ୍ଷା ଟାସ୍କ ନେଇପାରିବେ",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "ଆପଣ ସଫଳତାର ସହ ଏହି ଟାସ୍କ ଶେଷ କରିଛନ୍ତି",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "ଏହି ଟାସ୍କ ସରିଯାଇଛି । ଆପଣ ମୂଲ୍ୟାୟନ ଆଉଥରେ ଦେଇପାରନ୍ତି, କିନ୍ତୁ ଏଥିରେ ଆଫଣଙ୍କ ପ୍ରଗତି ରେକର୍ଡ କରାଯିବ ନାହିଁ ।",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "ଏହି ଟାସ୍କ ସରିଯାଇଛି । ଆପଣ ମୂଲ୍ୟାୟନ ଦେଇପାରନ୍ତି, କିନ୍ତୁ ଏଥିରେ ଆପଣଙ୍କ ପ୍ରଗତି ରେକର୍ଡ କରାଯିବ ନାହିଁ ।",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "ଟାସ୍କ ବିବରଣୀ ଦେଖିବା ପାଇଁ ଓ ତାକୁ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ଏକ ସକ୍ରିୟ ବ୍ୟାଚ୍ ରେ ଯୋଗଦେବାକୁ ପଡିବ",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "ଟାସ୍କ ବିବରଣୀ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ଲଗ୍ ଇନ୍ କରିବାକୁ ପଡ଼ିବ",
   "DISMISS": "ବାତିଲ୍ କରନ୍ତୁ",
+  "DISMISS_AS_GROUP_ADMIN": "ଗ୍ରୁପ୍ ଆଡମିନ୍ ରୁ ବହିଷ୍କାର କରନ୍ତୁ",
+  "DISMISS_AS_GROUP_ADMIN_ERROR_MSG": "ଗ୍ରପୁ ଆଡମିନରୁ {{member_name}}ଙ୍କୁ ବାହାର କରିହେଉନାହିଁ",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_DESC": "{{member_name}}ଙ୍କୁ ଗ୍ରୁପ୍ ଆଡମିନ୍ ରୁ କାଢିଦେଲେ ସଦସ୍ୟଙ୍କ ଠାରୁ ଆଡମିନ୍ ଅନୁମତି ପ୍ରତ୍ୟାହୃତ ହୋଇଯିବ ",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_TITLE": "ଗ୍ରୁପ୍ ଆଡମିନ୍ ଭାବେ ବହିଷ୍କାର କରିବେ କି ?",
+  "DISMISS_AS_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} ଆଉ ଗ୍ରପ୍ ଆଡମିନ୍ ନାହାନ୍ତି",
   "DISTRICT": "ଜିଲ୍ଲା ",
   "DISTRICT_OPTION_TEXT": "ଜିଲ୍ଲା ଚୟନ କରନ୍ତୁ ",
-  "DOCS": "ଦସ୍ତାବିଜ ",
+  "DOC": "ଦସ୍ତାବିଜ ",
   "DOWNLOAD": "ଡାଉନଲୋଡ କରନ୍ତୁ",
   "DOWNLOADING": "ଡାଉନଲୋଡ ହେଉଛି {{%s}} ",
   "DOWNLOADING_1": "ଡାଉନଲୋଡ ହେଉଛି {{%s}} ",
@@ -177,6 +361,11 @@
   "DOWNLOAD_COMPLETED": "ଡାଉନଲୋଡ୍ ଶେଷ ହେଲା",
   "DOWNLOAD_CONFIRMATION_TEXT": "ତଥ୍ୟ ଆପଣଙ୍କ ଡିଭାଇସରେ ସେଭ୍ ହୋଇଯିବ",
   "DOWNLOAD_CONTENT": "ଡାଉନଲୋଡ କରନ୍ତୁ ({{%s}})",
+  "DOWNLOAD_FILE_INFO": "ବନ୍ଦ ହୋଇଥିବା ବିକଳ୍ପଗୁଡ଼ିକୁ ଚାଲୁ କରିବା ପାଇଁ ଫାଇଲ୍ ଡାଇନଲୋଡ୍ କରନ୍ତୁ",
+  "DOWNLOAD_FILE_SIZE": "ଫାଇଲ୍ ଆକାର {{%s}}",
+  "DOWNLOAD_NOT_ALLOWED_FOR_QUIZ": "ଏହି କଣ୍ଟେଣ୍ଟ୍ ଡାଉନଲୋଡ୍ ହୋଇପାରିବ ନାହିଁ",
+  "DOWNLOAD_NOW": "ଏବେ ଡାଉନଲୋଡ୍ କରନ୍ତୁ",
+  "DOWNLOAD_PATH": "ଫାଇଲ୍ Internal storage > Download ଫୋଲଡରରେ ଷ୍ଟୋର୍ ହୋଇଛି",
   "EDIT": "ସଂଶୋଧନ କରନ୍ତୁ ",
   "EDIT_EMAIL_POPUP_TITLE": " Email ଆଇଡି ସଂଶୋଧନ କରନ୍ତୁ ",
   "EDIT_GROUP": "ଗ୍ରୁପ୍ କୁ ସଂଶୋଧନ କରନ୍ତୁ",
@@ -184,72 +373,268 @@
   "EDIT_PHONE_POPUP_TITLE": "ମୋବାଇଲ ନମ୍ବର ସଂଶୋଧନ କରନ୍ତୁ ",
   "EDIT_PROFILE": "ପ୍ରୋଫାଇଲକୁ ସଂଶୋଧନ କରନ୍ତୁ",
   "EMAIL_EDIT_SUCCESS": "ଇ -ମେଲ ଆଇଡି ସଂଫଳତା ପୂର୍ବକ ଅପଡେଟ ହୋଇଗଲା ",
-  "EMAIL_ID_PLACEHOLDER": "ଇମେଲ୍ ଠିକଣା",
+  "EMAIL_ID_PLACEHOLDER": "ଇମେଲ୍ ଆଇଡି",
   "EMAIL_PLACEHOLDER": "ଇମେଲ ଆଇଡି ଲେଖନ୍ତୁ",
   "EMAIL_UPDATE_SUCCESS": "ଇମେଲ୍ ସଫଳତାପୂର୍ବକ ଅପଡେଟ୍ ହେଲା",
   "EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}}({{%medium}}) ପାଇଁ କୌଣସି ପାଠ୍ୟପୁସ୍ତକ ମିଳୁନାହିଁ",
-  "EMPTY_SEARCH_RESULTS": "କୋଣସି ଫଳାଫଳ ମିଳିଲା ନାହିଁ\n",
+  "EMPTY_SEARCH_RESULTS": "କୋଣସି ଫଳାଫଳ ମିଳିଲା ନାହିଁ",
+  "EMPTY_SEARCH_RESULT_GROUPS": "ଦୁଃଖିତ ! ଆପଣ ଯାହା ଖୋଜୁଛନ୍ତି ତାହା ସହିତ କୌଣସି ଫଳାଫଳ ମେଳ ଖାଉନାହିଁ ",
   "ENDORSE": "ସମର୍ଥନ ",
   "ENJOYED_THIS_CONTENT": "ଏହି ତଥ୍ୟ ଭଲ ଲାଗିଲା ?",
   "ENROLL": "ଯୋଗ ଦିଅନ୍ତୁ",
-  "ENROLLMENT_LAST_DATE": "ପଂଜିକରଣ ପାଇଁ ଶେଷ ତାରିଖ",
+  "ENROLLMENT_ENDED_ON": "{{%s}} ରେ ନାମଲେଖା ଶେଷ ହେଲା",
+  "ENROLLMENT_LAST_DATE": "ଯୋଗଦେବା ପାଇଁ ଶେଷ ତାରିଖ:",
   "ENTER_GROUP_NAME": "ଗ୍ରୁପ୍ ନାମ ଲେଖନ୍ତୁ",
+  "ENTER_ID": "ID ଦିଅନ୍ତୁ",
+  "ENTER_ID_AS_REQUESTED_BY_STATE_BOARD_ORG": "ଆପଣଙ୍କ ରାଜ୍ୟ/ ବୋର୍ଡ/ ସଂସ୍ଥା ଦ୍ୱାରା ଅନୁରୋଧ କରାଯାଇଥିବା ID ଦିଅନ୍ତୁ",
+  "ENTER_LOCATION_FROM_PROFILE_PAGE": "ପ୍ରୋଫାଇଲ ପେଜରୁ ଅବସ୍ଥିତି ଦିଅନ୍ତୁ",
+  "ENTER_MEMBER_ID": "{{app_name}} ID ଦିଅନ୍ତୁ",
   "ENTER_OTP": "OTP ଲେଖନ୍ତୁ",
   "ENTER_PHONE_POPUP_TITLE": "ମୋବାଇଲ ନମ୍ବର ଲେଖନ୍ତୁ",
+  "ENTER_SCHOOL_NAME": "ବିଦ୍ୟାଳୟ ନାମ ଦିଅନ୍ତୁ",
+  "ENTER_THE_FOLLOWING_INFORMATION": "ନିମ୍ନ ସୂଚନା ଦିଅନ୍ତୁ",
+  "ENTER_UDISE_ID": "UDISE ID ଦିଅନ୍ତୁ",
   "ERROR_BATCH_NOT_STARTED": "ବ୍ୟାଚ୍ ଆରମ୍ଭ ହୋଇନାହିଁ ",
   "ERROR_CANT_OPEN_EMPTY_CONTENT": "ଖାଲି ଫାଇଲ ଖୋଲି ପାରିବେ ନାହିଁ ",
   "ERROR_CONTENT_NOT_AVAILABLE": "ତଥ୍ୟ ଉପଲବ୍ଧ ନାହିଁ ",
   "ERROR_CONTENT_NOT_FOUND": "ଏହି ତଥ୍ୟ ଏ ପର୍ଯ୍ୟନ୍ତ ରଖାଯାଇ ନାହିଁ ",
+  "ERROR_COULD_NOT_OPEN_FILE": "ଫାଇଲ୍ ଓପନ୍ ହୋଇ ପାରୁନାହିଁ",
   "ERROR_DURATION_NOT_AVAILABLE": "ଅବଧି ଉପଲବ୍ଧ ନାହିଁ",
-  "ERROR_EMAIL_EXISTS": "ଏହି ଇ ମେଲ ଠିକଣାଟି ପୂର୍ବରୁହିଁ ରହିଛି | ଅନ୍ୟ ଏକ ଇ ମେଲ ଠିକଣା ଦିଅନ୍ତୁ",
+  "ERROR_EMAIL_EXISTS": "ଏହି ଇମେଲ ଆଇଡି ପୂର୍ବରୁ ରହିଛି | ଅନ୍ୟ ଏକ ଇମେଲ ଆଇଡି ଦେଇ ପ୍ରୟାସ କରନ୍ତୁ",
   "ERROR_EMAIL_INVALID": "ଠିକ୍ ଇ -ମେଲ ଆଇଡି ଲେଖନ୍ତୁ",
   "ERROR_EMPTY_FIELDS": "ବିସ୍ତୃତ ବିବରଣୀ ଲେଖନ୍ତୁ",
   "ERROR_FAILED_TO_DOWNLOAD_ATTACHMENT": "ଆଟାଚମେଣ୍ଟ ଡାଉନଲୋଡ କରିବାରେ ବିଫଳ ",
   "ERROR_FETCHING_DATA": "ଡାଟା ଆଣିବାରେ ଅସମର୍ଥ ",
   "ERROR_LOW_MEMORY": "ସ୍ଥାନାନ୍ତରଣ ନିମନ୍ତେ ପର୍ଯ୍ୟାପ୍ତ ସ୍ଥାନ ଉପଲବ୍ଧ ନାହିଁ |",
+  "ERROR_MAXIMUM_ACTIVITY_COUNT_EXCEEDS": "ଗ୍ରୁପରେ ଆକ୍ଟିଭିଟି ଯୋଗ କରିବାର ସର୍ବାଧିକ ସୀମାକୁ ଆପଣ ଅତିକ୍ରମ କରିଛନ୍ତି ",
+  "ERROR_MAXIMUM_GROUP_COUNT_EXCEEDS": "ଗ୍ରୁପ୍ ସୃଷ୍ଟି କରିବାର ସର୍ବାଧିକ ସୀମା ଆପଣ ଅତିକ୍ରମ କରିଛନ୍ତି ",
+  "ERROR_MAXIMUM_MEMBER_COUNT_EXCEEDS": "ଗ୍ରୁପରେ ସାମିଲ କରିବାର ସର୍ବାଧିକ ସଦସ୍ୟ ସଂଖ୍ୟାକୁ ଆପଣ ଅତିକ୍ରମ କରିଛନ୍ତି ",
   "ERROR_NAME_INVALID": "ନାମ ପାଇଁ କେବଳ ଅକ୍ଷର କିମ୍ବା ସ୍ପେସ୍ ବ୍ୟବହାର କରନ୍ତୁ",
-  "ERROR_NO_BATCHES_FOUND": "  ଏହି ପାଠ୍ୟକ୍ରମ ପାଇଁ କୌଣସି ବ୍ୟାଚ୍ ନାହିଁ | ",
+  "ERROR_NO_BATCHES_FOUND": "ଏହି ପାଠ୍ୟକ୍ରମ ପାଇଁ କୌଣସି ବ୍ୟାଚ୍ ନାହିଁ ",
   "ERROR_NO_INTERNET_MESSAGE": "ଇଣ୍ଟରନେଟର ସୁବିଧା ନାହିଁ ",
   "ERROR_NO_OFFLINE_RESOURCE": " କୌଣସି ସଂସାଧନ ଷ୍ଟୋର ହୋଇ ନାହିଁ",
   "ERROR_OFFLINE_MODE": "ଇଣ୍ଟରନେଟ ନାହିଁ ,ଅଫଲାଇନ ମୋଡ୍ ",
-  "ERROR_OTP": "ଭୁଲ OTP | ଠିକ OTP  ଦିଅନ୍ତୁ",
-  "ERROR_PHONE_EXISTS": "ଫୋନ ନମ୍ବର ପୂର୍ବରୁ ହିଁ ଅଛି ,ଅନ୍ୟ ଏକ ଫୋନ ନମ୍ବର ଲେଖନ୍ତୁ",
+  "ERROR_OTP": "ଭୁଲ୍ OTP । ବାକିଥିବା  ପ୍ରଚେଷ୍ଟା ସଂଖ୍ୟା : {{%s}}",
+  "ERROR_OTP_LIMIT_EXCEEDED": "ଆପଣ OTP ପାଇଁ ସର୍ବାଧିକ ସୀମା ଅତିକ୍ରମ କରିସାରିଛନ୍ତି, ଦୟାକରି କିଛି ସମୟ ପରେ ପୁଣିଥରେ ପ୍ରୟାସ କରନ୍ତୁ ।",
+  "ERROR_PHONE_EXISTS": "ଏହି ମୋବାଇଲ୍ ନମ୍ବର ପୂର୍ବରୁ ହିଁ ପଂଜୀକୃତ ଅଛି । ଅନ୍ୟ ଏକ ମୋବାଇଲ ନମ୍ବର ଦେଇ ଚେଷ୍ଟାକରନ୍ତୁ",
   "ERROR_PHONE_INVALID": "ଠିକ୍ ଫୋନ ନ ନମ୍ବର ଲେଖନ୍ତୁ",
+  "ERROR_PHONE_REQUIRED": "ମୋବାଇଲ ନମ୍ବର ଆବଶ୍ୟକ ଅଟେ",
   "ERROR_SAME_EMAIL_UPDATED": "ଏହି ଇ ମେଲ ଠିକଣାଟି ପୂର୍ବରୁହିଁ ଆପଣଙ୍କ ପ୍ରୋଫାଇଲ ସହିତ ଯୋଡ଼ା ଯାଇଛି | ଅନ୍ୟ ଏକ ଇ ମେଲ ଠିକଣା ଦିଅନ୍ତୁ",
   "ERROR_SAME_PHONE_UPDATED": "ଏହି ମୋବାଇଲ ନମ୍ବରରେ ଆପଣଙ୍କ ପ୍ରୋଫାଇଲରେ ପୂର୍ବରୁ ହିଁ ଯୋଡଯାଇଛି ,ଅନ୍ୟ ଏକ ମୋବାଇଲ ନମ୍ବର ଚୟନ କରନ୍ତୁ ",
   "ERROR_SERVER_CONNECTION": "Server ସହିତ ସଂଯୋଗ ପାଇଁ ଅସମର୍ଥ",
+  "ERROR_SPECIAL_CHARECTERS_NOT_ALLOWED": "ବିଶେଷ ଲିପି ସପୋର୍ଟ କରୁନାହିଁ",
   "ERROR_TECHNICAL_PROBLEM": "ଆମେ ଏକ ବୈଷୟିକ ସମସ୍ୟାର ସମ୍ମୁଖୀନ ହେଉଛୁ ଏବଂ ଆପଣଙ୍କ ଅନୁରୋଧ ଉପରେ କାମ କରିବାକୁ ଅସମର୍ଥ ",
   "ERROR_UPLOADING_IMG": "ଚିତ୍ର ଅପଲୋଡ କରିବା ସମୟରେ ତ୍ରୁଟି \n",
   "ERROR_USER_ACCOUNT_BLOCKED": "ବ୍ୟବହାରକାରୀଙ୍କ ଆକାଉଣ୍ଟ ବ୍ଲକ୍ କରାଯାଇଛି | ଅଧିକ ବିବରଣୀ ପାଇଁ ଆପଣଙ୍କ ଆଡମିନିଷ୍ଟ୍ରେଟରଙ୍କ ସହ ସମ୍ପର୍କ କରନ୍ତୁ ",
+  "ERROR_WHILE_ADDING_USER": "ବ୍ୟବହାରକାରୀ ଯୋଗ କରିବାରେ ତ୍ରୁଟି",
+  "ERROR_WHILE_FETCHING_USERS": "ବ୍ୟବହାରକାରୀ ଆଣିବାରେ ତ୍ରୁଟି",
   "ERROR_WHILE_LOGIN": "ଲଗ୍ ଇନ କରିବା ସମୟରେ ତ୍ରୁଟି",
-  "EXTRACTING_CONTENT": "ତଥ୍ୟ ବାହାର କରୁଛି",
+  "ERROR_WHILE_SWITCHING_USER": "ବ୍ୟବହାରକାରୀ ବଦଳାଇବାରେ ତ୍ରୁଟି",
+  "EXPLORE_HEADING": "{{%s}}ରେ ନିମ୍ନଲିଖିତକୁ ଏକ୍ସପ୍ଲୋର୍ କରନ୍ତୁ",
+  "EXP_VIDEOS": "ବ୍ୟାଖ୍ୟା ଭିଡିଓ",
+  "EXTRACTING_CONTENT": "କଣ୍ଟେଣ୍ଟ୍ ବାହାର କରୁଛି {{%s}}",
   "FEEDBACK_HINT": "ମତାମତ (ଇଛାଧିନ )",
   "FEEDBACK_HINT_1": "ଏଠାରେ ଏକ ଟିପ୍ପଣି ଯୋଡନ୍ତୁ ",
   "FILES_DELETED": "ଫାଇଲ ଡିଲିଟ୍ କରାଗଲା",
   "FILE_MANAGER": "ଫାଇଲ ମ୍ୟାନେଜର",
   "FILE_MANAGER_PERMISSION_DESCRIPTION": "ଫାଇଲ ଡାଉନଲୋଡ ଓ SD କାର୍ଡକୁ ତଥ୍ୟ ସ୍ଥାନାନ୍ତର କରିବା ପାଇଁ {{%s}} ଷ୍ଟେରଜ୍ ଅନୁମତି ଦରକରା କରେ",
+  "FILE_NAME": "'{{%s}}' ଲୋଡ୍ ହେଉଛି",
+  "FILE_SAVED": "ଫାଇଲ୍ Downloads ରେ ସେଭ୍ ହେଲା",
   "FILE_SIZE": "ଆକାର [{{%s}}]",
   "FILL_IN": "ଆପଣଙ୍କ ପ୍ରୋଫାଇଲ ପୁରା  କରିବାପାଇଁ ତଳେ ଦିଆଯାଇଥିବା ବିବରଣୀ ପ୍ରଦାନ କରନ୍ତୁ ",
   "FILL_THE_MANDATORY_FIELDS": "ସବୁ ଅନିବାର୍ଯ୍ୟ ତଥ୍ୟ ପୂରଣ କରନ୍ତୁ",
   "FILTER": "ଫିଲ୍ଟର କରନ୍ତୁ",
   "FILTER_ADDED": "ଯୋଗ କରାଗଲା ",
   "FILTER_BY": "ଏହି ଅନୁସାରେ ଫିଲଟର୍ କରନ୍ତୁ",
-  "FIRST_NAME": "ନାମ ",
   "FOLLOW": "ଅନୁସରଣ କରନ୍ତୁ",
+  "FORCE_UPDATE_MESSAGE": "ଆପଣ {{%s}} ଆପର ଏକ ପୁରୁଣା ଭର୍ସନ ବ୍ୟବହାର କରୁଛନ୍ତି । Google Playstore ରୁ ସଦ୍ୟତମ ଭର୍ସନ ପାଇବା ପାଇଁ, ଏବେ ଅପଡେଟ୍ କରନ୍ତୁ ଉପରେ ଟାପ୍ କରନ୍ତୁ",
+  "FORUM": "ଫୋରମ୍",
+  "FOR_SUPPORT": "{{%s}} ସପୋର୍ଟ ପାଇଁ",
   "FREE_SPACE": "ଖାଲି ସ୍ଥାନ ",
+  "FRMELEMENTS_BTN_ACTIVATEGRP": "ଆକ୍ଟିଭେଟ୍ କରନ୍ତୁ ",
+  "FRMELEMENTS_BTN_ADD": "ଯୋଗ କରନ୍ତୁ",
+  "FRMELEMENTS_BTN_BACK": "ପଛକୁ ଯାଆନ୍ତୁ",
+  "FRMELEMENTS_BTN_DEACTIVATEGRP": "ଡିଆକ୍ଟିଭେଟ୍ କରନ୍ତୁ",
+  "FRMELEMENTS_BTN_NEXT": "ପରବର୍ତ୍ତୀ",
+  "FRMELEMENTS_LBL_ACTIVATEGRP": "ଗ୍ରୁପ୍ ଆକ୍ଟିଭେଟ୍ କରନ୍ତୁ ",
+  "FRMELEMENTS_LBL_ACTIVATEGRPQUES": "ଗ୍ରୁପ୍ ଆକ୍ଟିଭେଟ୍ କରିବେ କି ?",
+  "FRMELEMENTS_LBL_CONTENT_TYPE": "କଣ୍ଟେଣ୍ଟ୍ ପ୍ରକାର",
+  "FRMELEMENTS_LBL_DEACTIVATEGRP": "ଗ୍ରୁପ ଡିଆକ୍ଟିଭେଟ୍ କରନ୍ତୁ",
+  "FRMELEMENTS_LBL_DEACTIVATEGRPQUES": "ଗ୍ରୁପ ଡିଆକ୍ଟିଭେଟ୍ କରିବେ କି ?",
+  "FRMELEMENTS_LBL_REMARKS": "ରିମାର୍କ",
+  "FRMELEMENTS_MSG_ACTIVATEGRPFAILED": "ଗ୍ରୁପ୍ ଆକ୍ଟିଭ୍ ହୋଇପାରୁନାହିଁ, କିଛି ସମୟ ପରେ ଆଉଥରେ ପ୍ରୟାସ କରନ୍ତୁ ",
+  "FRMELEMENTS_MSG_ACTIVATEGRPMSG": "ଗ୍ରୁପ୍ ଆକ୍ଟିଭେଟ୍ କରିବା ଦ୍ୱାରା ଏହା ଆକ୍ଟିଭ୍ ଗ୍ରୁପ୍ ସୂଚୀରେ ପ୍ରଦର୍ଶିତ ହେବ ଏବଂ ସଦସ୍ୟ ପ୍ରଗତି ଯାଞ୍ଚ କରିହେବ ",
+  "FRMELEMENTS_MSG_ACTIVATEGRPPOPUP": "ଏହି ଗ୍ରୁପ୍ ସାମୟିକ ଭାବରେ ଡିଆକ୍ଟିଭେଟ୍ ହୋଇଛି । ଆବଶ୍ୟକ ପଡିଲେ ଗ୍ରୁପ୍ ଆଡମିନ୍ ଏହି ଗ୍ରୁପ୍ ଆକ୍ଟିଭେଟ୍ କରିପାରିବେ । ଡିସକସନ୍ ଫୋରମରେ ଗ୍ରୁପ୍ ସଦସ୍ୟମାନେ ସେମାନଙ୍କ ଆଲୋଚନା ଜାରି ରଖିପାରିବେ ।",
+  "FRMELEMENTS_MSG_ACTIVATEGRPSUCCESS": "ଗ୍ରୁପ୍ ସଫଳତାର ସହ ଆକ୍ଟିଭେଟ୍ ହେଲା",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPFAILED": "ଗ୍ରୁପ୍ ଡିଆକ୍ଟିଭେଟ୍ ହୋଇପାରୁନାହିଁ, କିଛି ସମୟ ପରେ ଆଉଥରେ ଚେଷ୍ଟା କରନ୍ତୁ ",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPMSG": "ଗ୍ରୁପ୍ ସସପେଣ୍ଡ୍ କରିବା ଦ୍ୱାରା ଏହା ଆକ୍ଟିଭ୍ ଗ୍ରୁପ୍ ସୂଚୀରୁ ହଟିଯିବ ଏବଂ ଆପଣ ଏଥିରେ ସଦସ୍ୟ ପ୍ରଗତି ଦେଖିପାରିବେ ନାହିଁ ",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPSUCCESS": "ଗ୍ରୁପ୍ ସଫଳତାର ସହ ଡିଆକ୍ଟିଭେଟ୍ ହେଲା",
+  "FRMELEMNTS_BTN_CLOSE": "ବନ୍ଦ କରନ୍ତୁ ",
+  "FRMELEMNTS_BTN_DONOT_SHARE": "ସେୟାର୍ କରନ୍ତୁ ନାହିଁ ",
+  "FRMELEMNTS_BTN_EDIT_SETTING": "ସେଟିଂ ଏଡ଼ିଟ୍ କରନ୍ତୁ ",
+  "FRMELEMNTS_BTN_PREVIEW_FORM": "ଫର୍ମ ପ୍ରିଭିଉ କରନ୍ତୁ",
+  "FRMELEMNTS_BTN_SAVE": "ସେଭ୍ କରନ୍ତୁ",
+  "FRMELEMNTS_BTN_SAVE_EDITS": "ଏଡିଟ୍ ସେଭ୍ କରନ୍ତୁ",
+  "FRMELEMNTS_BTN_SAVE_FORM": "ଫର୍ମ ସେଭ୍ କରନ୍ତୁ",
+  "FRMELEMNTS_BTN_SEEK_HELP": "ସହାୟତା ହାସଲ କରନ୍ତୁ",
+  "FRMELEMNTS_BTN_SUBMIT_FORM": "ଫର୍ମ ଦାଖଲ କରନ୍ତୁ",
+  "FRMELEMNTS_BTN_VIEW_DETAILS": "ବିବରଣୀ ଦେଖନ୍ତୁ",
+  "FRMELEMNTS_CKBX_CERTMSG": "ଏହି ମେସେଜ୍ ଆଉ ପ୍ରଦର୍ଶିତ କରନ୍ତୁ ନାହିଁ",
+  "FRMELEMNTS_LBL_ACCESSIBILITY": "ସ୍କ୍ରିନ୍ ରିଡର୍ ଆକ୍ସେସ୍",
+  "FRMELEMNTS_LBL_ACCESSIBILITYMODE": "ଡାର୍କ ମୋଡ୍ କୁ ସ୍ୱିଚ୍ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_ACCESSIBILITYSKIP": "ମୁଖ୍ୟ କଣ୍ଟେଣ୍ଟକୁ ସ୍କିପ୍ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXT": "ସାଇଟ୍ ମ୍ୟାପ୍",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXTSIZE": "ଫଣ୍ଟ୍ ସାଇଜ୍ ବଡ଼ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_ADD_ATTACHMENTS": "ଆଟାଚମେଣ୍ଟ ଯୋଗ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_ADD_ENTITY": "ଏଣ୍ଟିଟି ଯୋଗକରନ୍ତୁ",
+  "FRMELEMNTS_LBL_ADD_NEW_TASK": "ନୂଆ ଟାସ୍କ ଯୋଗ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_ADD_REMARKS": "ରିମାର୍କ ଯୋଗକରନ୍ତୁ",
+  "FRMELEMNTS_LBL_ADD_SUBTASK": "ସବଟାସ୍କ ଯୋଗକରନ୍ତୁ",
+  "FRMELEMNTS_LBL_ADD_SUBTASK_PALCEHOLDER": "ସବଟାସ୍କ ନାମ ଯୋଗ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_ADD_TASK": "ଟାସ୍କ ଯୋଗ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_ASSIGNED_TO": "ଏହାଙ୍କୁ ଦିଆଯାଇଥିଲା",
+  "FRMELEMNTS_LBL_ASSIGN_TASK": "ଟାସ୍କ ଦିଅନ୍ତୁ",
+  "FRMELEMNTS_LBL_ATTACH": "ଆଟାଚ୍ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_ATTACHMENTS": "ଆଟାଚମେଣ୍ଟ",
+  "FRMELEMNTS_LBL_BLOCK": "ବ୍ଲକ୍ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_CATEGORIES": "ବିଭାଗ",
+  "FRMELEMNTS_LBL_CATEGORY_OVERVIEW": "ବିଭାଗ ଓଭରଭିଉ",
+  "FRMELEMNTS_LBL_CLICK_HELP": "ହେଲ୍ପ୍ ବା ସହାୟତା ବଟନ୍ ରେ କ୍ଲିକ୍ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_CLICK_HERE_TO_VIEW_LIBRARY": "ଲାଇବ୍ରେରୀ ଦେଖିବା ପାଇଁ ଏଠାରେ କ୍ଲିକ୍ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_CLUSTER": "କ୍ଲଷ୍ଟର୍",
+  "FRMELEMNTS_LBL_CONSENT_POPUP_INFO": "ଆପଣ ନିଜ ପ୍ରୋଫାଇଲ୍ ପେଜ୍ ରୁ ଏହିସବୁ ବିବରଣୀ ଏଡ଼ିଟ୍ କରିପାରିବେ ",
+  "FRMELEMNTS_LBL_CONTENT_AVAIALABLE_IN_OTHER_BOARD": "ଆପଣଙ୍କର ଆବଶ୍ୟକତା ପୂରଣ କରିବା ପାଇଁ ଅନ୍ୟ ବୋର୍ଡରେ ଉପଯୁକ୍ତ କଣ୍ଟେଣ୍ଟ୍ ଥାଇପାରେ ! ",
+  "FRMELEMNTS_LBL_CONTENT_FOUND": "ଆପଣଙ୍କ ଆବଶ୍ୟକତା ସହିତ ମେଳ ଖାଉଥିବା କଣ୍ଟେଣ୍ଟ୍ ଆମେ ପାଇଛୁ !",
+  "FRMELEMNTS_LBL_CONTENT_TO_BE_ADDED": "ଆପଣଙ୍କ ବୋର୍ଡ ଅଧିକ କଣ୍ଟେଣ୍ଟ ସାମିଲ କରିବାର ଅଛି ।",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT": "ନିଜ କଣ୍ଟେଣ୍ଟ୍ ପାଉନାହାଁନ୍ତି କି ? ତଳେ ଥିବା ବଟନ୍ ଉପରେ କ୍ଲିକ୍ କରନ୍ତୁ ",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT_YET": "ନିଜ କଣ୍ଟେଣ୍ଟ୍ ପାଉନାହାଁନ୍ତି କି ? ତଳେ ଥିବା ବଟନ୍ ଉପରେ କ୍ଲିକ୍ କରନ୍ତୁ ",
+  "FRMELEMNTS_LBL_CRITERIA_WISE": "ସର୍ତ୍ତ",
+  "FRMELEMNTS_LBL_DATA_SETTINGS": "ପ୍ରୋଫାଇଲ୍ ଡାଟା ସେୟାରିଂ",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF": "ପ୍ରୋଫାଇଲ ତଥ୍ୟ ସେୟାରିଙ୍ଗ୍ ଅଫ୍ ଅଛି",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF_INFO": "କୋର୍ସ ଆଡ଼ମିନିଷ୍ଟ୍ରେଟରଙ୍କ ସହିତ ନିଜ ପ୍ରୋଫାଇଲ୍ ବିବରଣୀ ସେୟାର କରିବା ପାଇଁ ଆପଣ ସମ୍ମତି ପ୍ରକାଶ କରିନାହାନ୍ତି ",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON": "ପ୍ରୋଫାଇଲ ତଥ୍ୟ ସେୟାରିଙ୍ଗ୍ ଅନ୍ ଅଛି",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON_INFO": "କୋର୍ସ ଆଡ଼ମିନିଷ୍ଟ୍ରେଟରଙ୍କ ସହିତ ନିଜ ପ୍ରୋଫାଇଲ୍ ବିବରଣୀ ସେୟାର କରିବା ପାଇଁ ଆପଣ ସମ୍ମତି ପ୍ରକାଶ କରିଛନ୍ତି",
+  "FRMELEMNTS_LBL_DELETE_CONFIRMATION": "ଆପଣ ନିଜ ସବଟାସ୍କ ଡିଲିଟ୍ କରିବା ପାଇଁ ନିଶ୍ଚିତ କି ?",
+  "FRMELEMNTS_LBL_DONOT_SHARE_PROFILE_INFO": "ମୋ ପ୍ରୋଫାଇଲ୍ ବିବରଣୀ ସେୟାର୍ କରନ୍ତୁ ନାହିଁ ",
+  "FRMELEMNTS_LBL_DURATION": "ଅବଧି",
+  "FRMELEMNTS_LBL_EMAIL_ID_PLACEHOLDER": "ରାଜ୍ୟ କିମ୍ବା ସଂସ୍ଥାର ଇମେଲ୍ ଆଡ୍ରେସ୍",
+  "FRMELEMNTS_LBL_END_DATE": "ଶେଷ  ତାରିଖ",
+  "FRMELEMNTS_LBL_FILES": "ଫାଇଲ",
+  "FRMELEMNTS_LBL_IMAGES": "ଚିତ୍ର",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS": "ପ୍ରୋଜେକ୍ଟ ରିପୋର୍ଟ",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS_DESC": "ପ୍ରୋଜେକ୍ଟ ରିପୋର୍ଟ ଦେଖନ୍ତୁ",
+  "FRMELEMNTS_LBL_IN_PROGRESS": "ଚାଲିଛି",
+  "FRMELEMNTS_LBL_LEARNER_PASSBOOK": "ଶିକ୍ଷାର୍ଥୀ ପାସବୁକ୍",
+  "FRMELEMNTS_LBL_LEARNING_RESOURCES": "ଶିକ୍ଷଣ ସମ୍ବଳ",
+  "FRMELEMNTS_LBL_LINK_LEARNING_RESOURCES": "ଶିକ୍ଷଣ ସମ୍ବଳକୁ ଲିଙ୍କ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_MEDIA_TYPE": "ମିଡ଼ିଆ ପ୍ରକାର",
+  "FRMELEMNTS_LBL_MOBILE_NUMBER_PLACEHOLDER": "ରାଜ୍ୟ କିମ୍ବା ସଂସ୍ଥା ପାଇଁ ମୋବାଇଲ ନମ୍ବର",
+  "FRMELEMNTS_LBL_MY_LEARNINGS": "ମୋ ଶିକ୍ଷା",
+  "FRMELEMNTS_LBL_NEW_TASK": "ନୂତନ ଟାସ୍କ",
+  "FRMELEMNTS_LBL_NO_MATCHING_CONTENT": "କୌଣସି କଣ୍ଟେଣ୍ଟ୍ ମେଳ ଖାଉନାହିଁ ",
+  "FRMELEMNTS_LBL_OBJECTIVE": "ଉଦ୍ଦେଶ୍ୟ",
+  "FRMELEMNTS_LBL_OBSERVATION": "ଅବଲୋକନ",
+  "FRMELEMNTS_LBL_OBSERVATION_DESC": "ଆପଣଙ୍କର ଶ୍ରେଣୀଗୃହ ଏବଂ ବିଦ୍ୟାଳୟ ଅବଲୋକନ ସହଜରେ ଆକ୍ସେସ୍ କରନ୍ତୁ ଏବଂ ରେକର୍ଡ କରନ୍ତୁ, ଏବଂ ଆଗକୁ ବଢିବା ପାଇଁ ଯୋଜନା କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS": "ଅବଲୋକନ ରିପୋର୍ଟ",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS_DEC": "ଅବଲୋକନ ରିପୋର୍ଟ ଦେଖନ୍ତୁ",
+  "FRMELEMNTS_LBL_OBSERVE_AGAIN": "ପୁଣିଥରେ ଅବଲୋକନ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_OPEN_BATCH_NOT_RECOMMENDED": "ଯଦି ଆପଣ ପୂର୍ବ ବ୍ୟାଚରୁ କୌଣସିଟିରେ କୋର୍ସ ଶେଷ କରିଛନ୍ତି, ତେବେ ଆମେ ସୁପାରିଶ କରୁଛୁ କି ଆପଣ ଏହି କୋର୍ସରେ ଯୋଗଦିଅନ୍ତୁ ନାହିଁ । ଆପଣଙ୍କର ଶିକ୍ଷଣ ଇତିହାସ ଏବଂ ସାର୍ଟିଫିକେଟ୍ ରିସେଟ୍ ହୋଇଯିବ ।",
+  "FRMELEMNTS_LBL_PERSONA": "ଭୂମିକା",
+  "FRMELEMNTS_LBL_PROFCONF": "ପ୍ରୋଫାଇଲ ନାମ କନଫର୍ମ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_PROFTITLE": "ପ୍ରୋଫାଇଲ ନାମ",
+  "FRMELEMNTS_LBL_PROGRAM_NAME": "ପ୍ରୋଗ୍ରାମ୍ ନାମ",
+  "FRMELEMNTS_LBL_PROJECT": "ପ୍ରୋଜେକ୍ଟ",
+  "FRMELEMNTS_LBL_PROJECT_DESCRIPTION": "ଟାସ୍କ ପ୍ରସ୍ତୁତିକରଣ ଓ ଟାଇମଲାଇନ୍ ପାଇଁ ଯୋଜନା କରି ନିଜର ବିଦ୍ୟାଳୟ ବିକାଶର ପରିଚାଳନା ଏବଂ ଟ୍ରାକ୍ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_PROJECT_OVERVIEW": "ପ୍ରୋଜେକ୍ଟ ଓଭରଭିଉ",
+  "FRMELEMNTS_LBL_PROJECT_STATUS": "ପ୍ରୋଜେକ୍ଟ ଷ୍ଟାଟସ୍",
+  "FRMELEMNTS_LBL_PROJECT_TITLE": "ପ୍ରୋଜେକ୍ଟ ଟାଇଟଲ୍",
+  "FRMELEMNTS_LBL_PROJECT_VIEW": "ପ୍ରୋଜେକ୍ଟ ଭିଉ",
+  "FRMELEMNTS_LBL_QUESTION_WISE": "ପ୍ରଶ୍ନ",
+  "FRMELEMNTS_LBL_RELEVANT_CONTENT_SUB_HEADING": "ଆପଣଙ୍କର ଆବଶ୍ୟକୀୟ କଣ୍ଟେଣ୍ଟର ବିବରଣୀ ପୂରଣ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_REPORTS": "ରିପୋର୍ଟ",
+  "FRMELEMNTS_LBL_REPORTS_DESC": "ରିପୋର୍ଟ ଲିଷ୍ଟ",
+  "FRMELEMNTS_LBL_REQUEST_CONTENT": "କଣ୍ଟେଣ୍ଟ୍ ପାଇଁ ଅନୁରୋଧ କରିବେ କି ?",
+  "FRMELEMNTS_LBL_SCHOOL": "ବିଦ୍ୟାଳୟ",
+  "FRMELEMNTS_LBL_SELECT_CATEGORIES": "ବିଭାଗ(ଗୁଡ଼ିକ) ଚୟନ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_SELECT_PROGRAM": "ପ୍ରୋଗ୍ରାମ୍ ଚୟନ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_SET_DATE": "ତାରିଖ ସେଟ୍ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_SET_DATE_HINT": "ଆପଣଙ୍କର ପ୍ରୋଜେକ୍ଟ ପାଇଁ ଏକ ଟାଇମଲାଇନ୍ ସେଟ୍ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_SHARE_PROFILE_INFORMATION": "ମୋ ପ୍ରୋଫାଇଲ୍ ବିବରଣୀ ସେୟାର୍ କରନ୍ତୁ ",
+  "FRMELEMNTS_LBL_START_DATE": "ଆରମ୍ଭ ତାରିଖ",
+  "FRMELEMNTS_LBL_STATUS": "ଷ୍ଟାଟସ୍",
+  "FRMELEMNTS_LBL_SUBPERSONA": "ସହ-ଭୂମିକା",
+  "FRMELEMNTS_LBL_SUBTASKS": "ସବଟାସ୍କ",
+  "FRMELEMNTS_LBL_SURVEY": "ସର୍ଭେ",
+  "FRMELEMNTS_LBL_SURVEY_ACTION": "ସର୍ଭେ କାର୍ଯ୍ୟ",
+  "FRMELEMNTS_LBL_SURVEY_DESC": "ସର୍ଭେ ଲିଷ୍ଟିଙ୍ଗ୍",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS": "ସର୍ଭେ ରିପୋର୍ଟ",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS_DESC": "ସର୍ଭେ ରିପୋର୍ଟ ଦେଖନ୍ତୁ",
+  "FRMELEMNTS_LBL_TAB_HOME": "ହୋମ୍",
+  "FRMELEMNTS_LBL_TASK_DESCRIPTION": "ଟାସ୍କ ବର୍ଣ୍ଣନା",
+  "FRMELEMNTS_LBL_TASK_OVERVIEW": "ଟାସ୍କ ଓଭରଭିଉ",
+  "FRMELEMNTS_LBL_THIS_MONTH": "ଏହି ମାସ",
+  "FRMELEMNTS_LBL_TOTAL_TASKS": "ମୋଟ ଟାସ୍କ",
+  "FRMELEMNTS_LBL_UPCOMING": "ଆସୁଅଛି",
+  "FRMELEMNTS_LBL_UPDATE_DATA_SETTINGS": "ସେଟିଂ ଅପଡେଟ୍ କରନ୍ତୁ",
+  "FRMELEMNTS_LBL_USERTYPE_LEADER": "ସ୍କୁଲ ମୁଖ୍ୟ ଓ ଅଧିକାରୀ",
+  "FRMELEMNTS_LBL_VIEW_ENTITY_REPORT": "ଏଣ୍ଟିଟି ରିପୋର୍ଟ ଦେଖନ୍ତୁ",
+  "FRMELEMNTS_LBL_VIEW_FULL_REPORT": "ସମ୍ପୂର୍ଣ୍ଣ ରିପୋର୍ଟ ଦେଖନ୍ତୁ",
+  "FRMELEMNTS_LBL_VIEW_RESOURCES": "ସମ୍ବଳ ଦେଖନ୍ତୁ",
+  "FRMELEMNTS_MSG_BATCH_ALREADY_CLOSED": "{endDate}ରେ ଏହି ବ୍ୟାଚ୍ ପାଇଁ ନାମାଙ୍କନ ବନ୍ଦ ହୋଇଛି",
+  "FRMELEMNTS_MSG_CONSENT_DECLARATION_INFO": "ଆପଣ ନିଜ ପ୍ରୋଫାଇଲ୍ ପେଜ୍ ରୁ ବିବରଣୀ ଏଡ଼ିଟ୍ କରିପାରିବେ ",
+  "FRMELEMNTS_MSG_DATA_SETTINGS_SUBMITED_SUCCESSFULLY": "ଆପଣଙ୍କର ଡାଟା ସେଟିଂସ୍ ସଫଳତାର ସହିତ ସବମିଟ୍ ହେଲା",
+  "FRMELEMNTS_MSG_DELETE_TASK_CONFIRMATION": "ଆପଣ ଏହି ଟାସ୍କ ଡିଲିଟ୍ କରିବା ପାଇଁ ନିଶ୍ଚିତ କି?",
+  "FRMELEMNTS_MSG_EDITCERTNAME": "ଆପଣ ଏହାକୁ ନିଜର ପ୍ରୋଫାଇଲ୍ ପେଜରୁ ଏଡିଟ୍ କରିପାରିବେ ।",
+  "FRMELEMNTS_MSG_LOAD_FROM_LIBRARY": "ଲାଇବ୍ରେରିରୁ ଲୋଡ୍ କରନ୍ତୁ",
+  "FRMELEMNTS_MSG_NAMEONCERT": "ଏହି ନାମ ଆପଣଙ୍କର କୋର୍ସ ସାର୍ଟିଫିକେଟ ଉପରେ ପ୍ରିଣ୍ଟ ହେବ । ଏହା ଠିକ୍ ଅଛି କି ନାହିଁ ଯାଞ୍ଚ କରନ୍ତୁ ।",
+  "FRMELEMNTS_MSG_SELECT_IMAGE_SOURCE": "ଇମେଜ୍ ଉତ୍ସ ଚୟନ କରନ୍ତୁ",
+  "FRMELEMNTS_MSG_SELFDECLARATION_SUCCESS_INFO": "ଆବଶ୍ୟକ ହେଲେ ଆପଣଙ୍କ ପ୍ରୋଫାଇଲରୁ ଆପଣ ଏହି ସୂଚନା ଏଡିଟ୍ କରିପାରିବେ",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED": "ସଫଳତାର ସହିତ ଆଟାଚ୍ ହୋଇଛି",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_SYNCED": "ଏହି ପ୍ରୋଜେକ୍ଟ ସଫଳତାର ସହିତ ସିଙ୍କ୍ରୋନାଇଜ୍ ହେଲା",
+  "FRMELEMNTS_MSG_TICKET_SUBMISSION_SUCCESS": "ଆମେ ଆପଣଙ୍କ ମତାମତକୁ ପ୍ରଶଂସା କରୁଛୁ | ଆମେ ପ୍ରତ୍ୟେକ ରିପୋର୍ଟ ର ଉତ୍ତର ରଖିପାରିବୁ ନାହିଁ, କିନ୍ତୁ ଆପଣଙ୍କ ମତାମତ ଆମକୁ {{app_name}}କୁ ଆହୁରି ଉନ୍ନତି ପାଇଁ ସହାୟକ ହେବ |",
+  "FRMELEMNTS_MSG_UNABLE_TO_ENROLL": "ଏବେ ନାମାଙ୍କନ ରଦ୍ଦ ହୋଇପାରିବ ନାହିଁ । କିଛି ସମୟ ପରେ ଆଉଥରେ ପ୍ରୟାସ କରନ୍ତୁ ",
+  "FRMELEMNTS_MSG_UPDATED_SUCCESSFULLY": "ସଫଳତାର ସହିତ ଅପଡେଟ୍ ହୋଇଛି ",
+  "FRMELEMNTS_MSG_USER_CREATION_LIMIT_EXCEEDED": "ଆପଣଙ୍କ ପ୍ରୋଫାଇଲ୍ ରେ ଆପଣ ଯେତିକି  ବ୍ୟବହାରକାରୀ ପରିଚାଳନା କରିପାରିବେ ତାହାର ସୀମା ଅତିକ୍ରମ କରିସାରିଛନ୍ତି",
+  "FRMELEMNTS_MSG_USE_CAMERA": "କ୍ୟାମେରା ବ୍ୟବହାର କରନ୍ତୁ",
+  "FRMELEMNTS_MSG_USE_FILE": "ଫାଇଲ୍ ବ୍ୟବହାର କରନ୍ତୁ",
+  "FRMELEMNTS_MSG_YOUR_CHANGES_ARE_SAVED": "ଆପଣଙ୍କର ପରିବର୍ତ୍ତନ ସଫଳତାର ସହିତ ସେଭ୍ ହୋଇଛି",
+  "FRMELENTS_LBL_ACCESSIBILITYNORMALMODE": "ଲାଇଟ୍ ମୋଡ୍ କୁ ସ୍ୱିଚ୍ କରନ୍ତୁ",
+  "FRMELMNTS_BLTPT_EARNCERT": "କେବଳ {{STATE}} ରାଜ୍ୟର ବ୍ୟବହାରକାରୀଙ୍କୁ ସାର୍ଟିଫିକେଟ୍ ଜାରୀ କରାଯାଉଛି",
+  "FRMELMNTS_BLTPT_EARNCERT2": "ନିଜର ସମସ୍ତ ମୂଲ୍ୟାୟନରେ {{PERCENTAGE}} ରୁ ଅଧିକ ସ୍କୋର କରନ୍ତୁ ",
+  "FRMELMNTS_BLTPT_EARNCERT3": "ସାର୍ଟିଫିକେଟ୍ ପାଇବା ପାଇଁ ଆପଣ କେବଳ {{ATTEMPTS}} ଥର ମୂଲ୍ୟାୟନର ପ୍ରୟାସ କରିପାରିବେ ।",
+  "FRMELMNTS_IMSG_DECLAREINFO": "କେବଳ ରାଜ୍ୟ ଦ୍ୱାରା ସ୍ୱୀକୃତ ଶିକ୍ଷକମାନଙ୍କୁ ଏହି କୋର୍ସ ପାଇଁ ସାର୍ଟିଫିକେଟ୍ ଜାରି କରାଯାଏ ",
+  "FRMELMNTS_IMSG_LASTATTMPALRT": "ଏହା ଶେଷ ବଳକା ପ୍ରୟାସ ଅଟେ",
+  "FRMELMNTS_IMSG_LASTATTMPTEXCD": "ଆପଣ ମୂଲ୍ୟାୟନ ଦାଖଲ କରିବାର ସର୍ବାଧିକ ପ୍ରୟାସ ସଂଖ୍ୟାକୁ ଅତିକ୍ରମ କରିଛନ୍ତି",
+  "FRMELMNTS_LBL_ACCESSIBILITYFNTDFLT": "ଡିଫଲ୍ଟରେ ରିସେଟ୍ କରନ୍ତୁ",
+  "FRMELMNTS_LBL_ACCESSIBILITYFONT": "ଫଣ୍ଟ୍ ସାଇଜ୍ ଛୋଟ କରନ୍ତୁ",
+  "FRMELMNTS_LBL_AVSCORE": "ସର୍ବୋତ୍ତମ ମୂଲ୍ୟାୟନ ସ୍କୋରର ହାରାହାରି",
+  "FRMELMNTS_LBL_BESTSCORE": "ସର୍ବୋତ୍ତମ ସ୍କୋର {{SCORE}}",
+  "FRMELMNTS_LBL_CERTQUES": "ଆପଣ କିପରି ନିଜର ସାର୍ଟିଫିକେଟ୍ ହାସଲ କରିବେ ?",
+  "FRMELMNTS_LBL_NOTIFNUMBER": "{{NUMBER}} ନୂତନ ନୋଟିଫିକେସନ୍",
+  "FRMELMNTS_LBL_SEELESS": "କମ୍ ଦେଖନ୍ତୁ",
+  "FRMELMNTS_LBL_SEEMORE": "ଅଧିକ ଦେଖନ୍ତୁ ",
+  "FRMELMNTS_LBL_STATEUSERQUES": "ଆପଣ ଜଣେ ରାଜ୍ୟ ଶିକ୍ଷକ କି?",
+  "FRMELMNTS_LNK_DECLARELINK": "ଏବେ ଘୋଷଣା କରନ୍ତୁ ",
+  "FRMELMNTS_PRMPT_DECLAREPROMPT": "ସାର୍ଟିଫିକେଟ୍ ପାଇବା ପାଇଁ {instance} ରେ ଆପଣଙ୍କର ସୂଚନା ଘୋଷିତ କରନ୍ତୁ ",
+  "FRMELMNTS_SCTTL_NOTIFHEADER": "ନୋଟିଫିକେସନ୍",
   "FROM": "ଏହିଠାରୁ ",
   "FULL_NAME": "ନାମ ",
+  "GET_STARTED": "ଆରମ୍ଭ କରନ୍ତୁ",
   "GOT_IT": "ବୁଝିହେଲା",
+  "GO_TO_DOWNLOADS": "ଡାଉନଲୋଡ୍ କୁ ଯାଆନ୍ତୁ",
+  "GO_TO_PROFILE": "ପ୍ରୋଫାଇଲକୁ ଯାଆନ୍ତୁ",
   "GRADE_OPTION_TEXT": "ଶ୍ରେଣୀ ଚୟନ କରନ୍ତୁ",
   "GRANT_ACCESS": "ଆକସେସ ଦିଅନ୍ତୁ",
-  "GROUPS": "ଗ୍ରୁପ୍",
-  "GROUPS_YOU_FOLLOW": "ଆପଣ ଅନୁସରଣ କରୁଥିବା ଗ୍ରୁପ୍",
-  "GROUP_CREATE_SUCCESS": "ଗ୍ରୁପ୍ ସଫଳତାର ସହ ଗଠନ ହେଲା",
-  "GROUP_DELETE_CONFIRM": "'{{%s}}' ଡିଲିଟ୍ କରିବା ପାଇଁ ନିଶ୍ଚିତ ?",
-  "GROUP_DELETE_CONFIRM_MESSAGE": "ଏହି କ୍ରିୟା ଗ୍ରୁପକୁ ଡିଲିଟ୍ କରିବ, ବ୍ୟବହାରକାରୀକୁ ନୁହେଁ |  'Users' ଟ୍ୟାବ୍ ଅଧିନରେ ବ୍ୟବହାରକାରୀଙ୍କୁ ଦେଖିହେବ",
-  "GROUP_MEMBER_ADD_SUCCESS": "ସଦସ୍ୟମାନଙ୍କୁ ସଫଳତାର ସହ ଯୋଡ଼ାଗଲା ",
-  "GROUP_MEMBER_DELETE_SUCCESS": "ସଫଳତାର ସହ ଗ୍ରୁପ୍ ସଦସ୍ୟଙ୍କୁ ଡିଲିଟ୍ କରାଗଲା",
+  "GROUP_CREATED": "ଗ୍ରୁପ୍ ସଫଳତାର ସହ ଗଠନ ହେଲା",
+  "GROUP_CREATED_BY": "ପ୍ରସ୍ତୁତକର୍ତ୍ତା :  {{group_creator_name}}",
+  "GROUP_DESCRIPTION": "ଗ୍ରୁପ୍ ବର୍ଣ୍ଣନା",
+  "GROUP_DESCRIPTION_PLACEHOLDER": "ସଦସ୍ୟମାନେ ଗ୍ରୁପର ଉଦ୍ଦେଶ୍ୟ ବୁଝିବା ଲାଗି ଗ୍ରୁପ ସମ୍ପର୍କରେ ଏକ ବର୍ଣ୍ଣନା ଦିଅନ୍ତୁ",
+  "GROUP_GUIDELINES": "ଗ୍ରୁପ ଗାଇଡଲାଇନ୍",
+  "GROUP_MEMBER_SEARCH_PLACEHOLDER": "ଗ୍ରୁପ ମଧ୍ୟରେ ଖୋଜନ୍ତୁ",
   "GROUP_NAME": "ଗ୍ରୁପ୍ ନାମ",
+  "GROUP_NAME_IS_REQUIRED": "ଆପଣଙ୍କୁ ଗ୍ରୁପ୍ ନାମ ଦେବାକୁ ପଡ଼ିବ",
+  "GROUP_TERMS_IS_REQUIRED": "ଆଗକୁ ଯିବା ପୂର୍ବରୁ ଆପଣଙ୍କୁ {{app_name}} ସେବା ସର୍ତ୍ତାବଳୀ ମାନିବାକୁ ପଡିବ",
+  "GROUP_UPDATE_SUCCESS": "ଗ୍ରୁପ ବିବରଣୀ ସଫଳତାର ସହ ଅପଡେଟ୍ ହେଲା",
   "HABIT_REMINDER_NOTIFICATION_MESSAGE": "ଆଜି {{%s}}ରେ କିଛି ନୂଆ ଶିଖନ୍ତୁ !",
   "HELP": "ସହାୟତା",
   "HELP_US_BY_RATING": "{{%s}}ରେଟିଂ କରି ଆମକୁ ସହାୟତା କରନ୍ତୁ ",
@@ -257,95 +642,141 @@
   "HIDE_CREDITS_INFO": "ଲାଇସେନସ ବାବଦରେ ତଥ୍ୟ ଲୁଚାନ୍ତୁ",
   "HINT_LANGUAGE": "ଆପଣଙ୍କ ପସନ୍ଦର ଭାଷା ଚୟନ କରନ୍ତୁ ",
   "HOBBIES": "ଅଭ୍ୟାସ ",
-  "IAM_ABOVE_18_YEARS_AGE": "ମୋର ବୟସ 18 ବର୍ଷରୁ ଅଧିକ |",
+  "HOURS_AGO": "{{%s}} ଘଣ୍ଟା ପୂର୍ବରୁ",
+  "HOUR_AGO": "{{%s}} ଘଣ୍ଟା ପୂର୍ବରୁ",
+  "ID_IS_REQUIRED": "ID ଆବଶ୍ୟକ ଅଟେ",
+  "IMPORTING": "ଆଣୁଅଛି...",
   "IMPORTING_COUNT": "ଆସୁଅଛି",
   "IMPORT_ECAR": "ଅଗ୍ରହଣୀୟ ଫାଇଲ୍ ଫର୍ମାଟ |   .ecar , .epar ଏବଂ .gsa ଫାଇଲ୍ ହିଁ ଗୃହୀତ ହେବ",
   "IMPORT_ERROR": "ତଥ୍ୟ ଗ୍ରହଣ କରିବାରେ ବିଫଳ ହେଲା",
   "IMPORT_PROGRESS": "ଚାଲୁହୋଇଅଛି.. ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ ",
   "INACTIVE": "ନିଷ୍କ୍ରିୟ ",
+  "INCORRECT_TEACHER_ID_ERROR": "ଆପଣ ଭୁଲ୍ ID ଦେଇଛନ୍ତି । ଆଉଥରେ ID ଦିଅନ୍ତୁ",
   "INSTALL_CROSSWALK": "crosswalk ଇନଷ୍ଟଲ୍ କରନ୍ତୁ ",
+  "INSTANCE_TERMS_OF_USE": "{{app_name}} ସର୍ତ୍ତାବଳୀ ",
   "INSUFFICIENT_STORAGE": "ଷ୍ଟୋରେଜ ସ୍ଥାନ ଯଥେଷ୍ଟ ନୁହେଁ",
   "INTERACTION": "ପରସ୍ପର ଆଲୋଚନାମୂଳକ ",
+  "INTERACTIVE_MATERIAL": "ଇଣ୍ଚରଆକ୍ଟିଭ୍ ପାଠ୍ୟ ସାମଗ୍ରୀ",
   "INTERNAL_MEMORY": "ଆଭ୍ୟନ୍ତର ଷ୍ଟୋରେଜ ",
   "INTERNET_AVAILABLE": "ଆପଣ ଏବେ ଅନଲାଇନ ଅଛନ୍ତି ",
   "INTERNET_CONNECTIVITY_NEEDED": "ଇଣ୍ଟରନେଟ୍ ସଂଯୋଗ ନାହିଁ ",
   "INVALID_CONTENT": "ଅନୁପଯୁକ୍ତ ତଥ୍ୟ",
+  "INVALID_FORMAT": "ଅବୈଧ ଫର୍ମାଟ୍",
+  "INVALID_MEMBER_ID": "ଆପଣ ଏକ ଅବୈଧ  {{app_name}} ID ଦେଇଛନ୍ତି",
   "INVALID_QR": "ଭୁଲ QR କୋଡ଼ ",
   "ITEMS": "{{%s}}ଫାଇଲ ",
   "ITEMS_SELECTED": "ସିଲେକ୍ଟ  ହୋଇଛି",
+  "I_AGREE_TO": "{{app_name}} ସହିତ ମୁଁ ଏକମତ ",
   "I_AGREE_TO_TNC": "ମୁଁ ଉପଯୋଗର ନିୟମ ଏବଂ ସର୍ତ୍ତାବଳୀରେ ସହମତ",
-  "JOIN_TRAINING": "ଟ୍ରେନିଂ ଜଏନ୍ କରନ୍ତୁ",
+  "I_AM_A_PERSONA_WITH_TENANT": "ମୁଁ {{%tenant}} ରେ ଜଣେ {{%persona}}",
+  "I_UNDERSTAND_AND_ACCEPT": "ମୁଁ ବୁଝୁଛି ଓ ରାଜି ହେଉଛି",
+  "JOIN_TRAINING": "ପାଠ୍ୟକ୍ରମରେ ନାମାଙ୍କନ କରନ୍ତୁ ",
   "LANGUAGE": "ଭାଷା ",
   "LANGUAGE_SETTINGS": "ଭାଷା ସେଟିଙ୍ଗ ",
-  "LAST_DATE_TO_JOIN": "ଜଏନ କରିବାର ଶେଷ ତାରିଖ",
+  "LAST_DATE_TO_JOIN": "ଯୋଗଦେବାର ଶେଷ ତାରିଖ {{%s}}",
   "LAST_SYNC": "ଶେଷଥର ପାଇଁ Sync ହୋଇଥିବା ଦିନ",
+  "LAST_UPDATED": "ପୂର୍ବଥର ଅପଡେଟ୍ ହୋଇଥିଲା: {{%s}}",
   "LAST_VIEWED": "ଶେଷଥର ପାଇଁ ଦେଖିଥିବା ",
-  "LATEST_COURSES": "ନବୀନତମ କୋର୍ସ",
+  "LATEST_COURSES": "ସଦ୍ୟତମ ପାଠ୍ୟକ୍ରମ",
+  "LEAVE_GROUP": "ଗ୍ରୁପ୍ ଛାଡନ୍ତୁ",
+  "LEAVE_GROUP_ERROR_MSG": "ଗ୍ରୁପ୍ ରୁ ବାହରି ହୋଇପାରୁନାହିଁ | କିଛି ସମୟ ପରେ ପୁଣିଥରେ ପ୍ରୟାସ କରନ୍ତୁ",
+  "LEAVE_GROUP_POPUP_DESC": "ଏହି ଆକ୍ସନକୁ ଆଉ ଫେରାଇ ହେବନାହିଁ | ଆପଣ {{group_name}} ଗ୍ରୁପ୍ ଛାଡିବାକୁ ଚାହୁଁଛନ୍ତି କି ",
+  "LEAVE_GROUP_POPUP_TITLE": "ଗ୍ରୁପ୍ ଛାଡିବେ କି ?",
+  "LEAVE_GROUP_SUCCESS_MSG": "ଆପଣ ଆଉ ଏହି ଗ୍ରୁପରେ ସଦସ୍ୟ ହୋଇ ନାହନ୍ତି",
+  "LEAVE_TRAINING_HEADING": "ପାଠ୍ୟକ୍ରମ ଛାଡିବେ ?",
   "LIBRARY_BNAV": "ଲାଇବ୍ରେରୀ",
   "LICENSE": "ଲାଇସେନ୍ସର ସର୍ତ୍ତ ",
+  "LOAD": "ଲୋଡ୍ କରନ୍ତୁ",
+  "LOADER_PROGRESS_DESCRIPTION": "ଆମେ ସବୁ ପ୍ରସ୍ତୁତ କରୁଛୁ",
+  "LOADER_PROGRESS_DESC_SUB_HEADING": "ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ...",
   "LOADING_CONTENT": "ତଥ୍ୟ ଲୋଡ୍ ହେଉଅଛି ",
   "LOADING_CONTENTS": "ତଥ୍ୟ ଲୋଡ୍ ହେଉଅଛି {{%s}}",
-  "LOADING_USER_LIST": "ବ୍ୟବହାରକାରୀଙ୍କ ସୂଚୀ ଲୋଡ଼ ହେଉଅଛି, ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ ",
-  "LOGGED_IN_AS": "କେଉଁ ରୂପରେ ଲଗ୍ ଇନ୍ କରିବେ",
-  "LOGGED_OUT": "ଲଗ ଆଉଟ ହୋଇଗଲା",
-  "LOGOUT": "ସାଇନ ଆଉଟ୍",
-  "LOW_BANDWIDTH": "କମ୍ ବ୍ୟାଣ୍ଡୱିଡଥ୍",
+  "LOAD_FILE": "ଫାଇଲ୍ ଲୋଡ୍ କରନ୍ତୁ",
+  "LOGGED_IN_MEMBER": "{{member_name}}(ଆପଣ)",
+  "LOGIN_TO_CREATE_GROUP_DESCRIPTION": "ଆପଣଙ୍କର ନିଜର ଗ୍ରୁପ୍, ଷ୍ଟଡ଼ି ସର୍କଲ କିମ୍ବା କ୍ଲାସରୁମ୍ ସୃଷ୍ଟି କରିବା ପାଇଁ ପ୍ରଥମ ସୋପାନ ହେଉଛି ଲଗ୍ ଇନ୍ କରିବା",
+  "LOGIN_TO_JOIN_TRAINING": "ପାଠ୍ୟକ୍ରମରେ ଯୋଗ ଦେବା ପାଇଁ ଲଗ୍ ଇନ୍ କରନ୍ତୁ",
+  "LOGOUT": "ଲଗ୍ ଆଉଟ୍ କରନ୍ତୁ",
+  "LOW_BANDWIDTH": "କମ୍ ବ୍ୟାଣ୍ଡୱିଥ୍",
   "LOW_BANDWIDTH_DETECTED": "କମ୍ ବ୍ୟାଣ୍ଡୱିଡଥ୍ ଥିବା ନେଟୱର୍କ ମିଳିଛି",
-  "MARKS": "ମାର୍କ",
+  "MAINTENANCE_MESSAGE": "ଆମର ମେଣ୍ଟେନାନ୍ସ ଚାଲୁଥିବାରୁ ଏବେ ସମସ୍ୟା ଦେଖାଦେଉଛି, ଚିନ୍ତା କରନ୍ତୁ ନାହିଁ, ଆମେ {{%timeLeft}} ଘଣ୍ଟା ମଧ୍ୟରେ ଠିକ୍ କରିଦେବୁ । ଜଲଦି ଫେରୁଛୁ!",
+  "MAINTENANCE_SUB_TEXT": "ଏହି ସମୟରେ ମଧ୍ୟ ଆପଣ ଡାଉନଲୋଡ୍ କରିଥିବା କଣ୍ଟେଣ୍ଟ୍ ଦେଖିପାରିବେ",
+  "MAKE_ADMIN": "ଆଡମିନ୍ କରନ୍ତୁ",
+  "MAKE_GROUP_ADMIN_ERROR_MSG": " {{member_name}}ଙ୍କୁ ଗ୍ରୁପ ଆଡମିନ୍ କରିହେଉନାହିଁ",
+  "MAKE_GROUP_ADMIN_POPUP_DESC": "ଏହି ପଦକ୍ଷେପ {{member_name}} ଙ୍କୁ ଗ୍ରୁପ୍ ଆଡମିନ୍ ହେବାର ଅନୁମତି ପ୍ରଦାନ କରିବ ",
+  "MAKE_GROUP_ADMIN_POPUP_TITLE": "ଗ୍ରୁପ୍ ଆଡମିନ୍ କରିବେ ?",
+  "MAKE_GROUP_ADMIN_SUCCESS_MSG": "ବର୍ତ୍ତମାନ {{member_name}} ହେଉଛନ୍ତି ଗ୍ରୁପ୍ ଆଡମିନ୍",
   "MEDIUM": "ମାଧ୍ୟମ",
   "MEDIUM_OF_INSTRUCTION": "ନିର୍ଦେଶର ମାଧ୍ୟମ ",
   "MEDIUM_OPTION_TEXT": "ମାଧ୍ୟମ ଚୟନ କରନ୍ତୁ ",
-  "MERGE_ACCOUNT": "ଆକାଉଣ୍ଟ ମିଶ୍ରଣ କରନ୍ତୁ",
+  "MEMBERS": "ସଦସ୍ୟମାନେ",
+  "MEMBER_ADDED_TO_GROUP": "ସଦସ୍ୟଙ୍କୁ ସଫଳତାର ସହ ଗ୍ରୁପରେ ଯୋଗ କରାଗଲା",
+  "MEMBER_ALREADY_EXISTS_IN_GROUP": "ଏହି ସଦସ୍ୟ ଜଣକ ପୂର୍ବରୁ ଗ୍ରପ୍ ରେ ଅଛନ୍ତି | ",
+  "MEMBER_ID": "{{app_name}}ID",
+  "MENU_DELETE_GROUP": "ଗ୍ରୁପ୍ ଡିଲିଟ୍ କରନ୍ତୁ",
+  "MENU_DISMISS_AS_GROUP_ADMIN": "ଗ୍ରୁପ୍ ଆଡମିନ୍ ରୁ ବହିଷ୍କାର କରନ୍ତୁ",
+  "MENU_EDIT_GROUP_DETAILS": "ଗ୍ରୁପ ବିବରଣୀ ସଂଶୋଧନ କରନ୍ତୁ",
+  "MENU_LEAVE_GROUP": "ଗ୍ରୁପ୍ ଛାଡନ୍ତୁ",
+  "MENU_MAKE_GROUP_ADMIN": "ଗ୍ରୁପ୍ ଆଡମିନ୍ କରନ୍ତୁ",
+  "MENU_REMOVE_ACTIVITY": "ଆକ୍ଟିଭିଟି ହଟାଇଦିଅନ୍ତୁ",
+  "MENU_REMOVE_FROM_GROUP": "ଗ୍ରୁପରୁ ବାହାର କରନ୍ତୁ",
+  "MERGE_ACCOUNT": "ଆକାଉଣ୍ଟ ମର୍ଜ୍ କରନ୍ତୁ",
   "MICROPHONE": "ମାଇକ୍ରୋଫନ ",
   "MICROPHONE_PERMISSION_DESCRIPTION": "ଯେଉଁ ତଥ୍ୟ ଆପଣଙ୍କୁ ଆପଣଙ୍କର ସ୍ୱର ରେକର୍ଡ କରିବାକୁ ଅନୁମତି ଦେଇଥାଏ, ସେହି ତଥ୍ୟ ପାଇଁ {{%s}} ମାଇକ୍ରୋଫୋନ୍ ଅନୁମତି ବ୍ୟବହାର କରେ |",
+  "MINUTES_AGO": "{{%s}} ମିନିଟ୍ ପୂର୍ବରୁ",
+  "MINUTE_AGO": "{{%s}} ମିନିଟ୍ ପୂର୍ବରୁ",
+  "MONTHS_AGO": "{{%s}} ମାସ ପୂର୍ବରୁ",
+  "MONTH_AGO": "{{%s}} ମାସ ପୂର୍ବରୁ",
   "MORE": "ଅଧିକ ",
-  "MORE_CONTENT": "{{%s}}ରେ ଅଧିକ ପୁସ୍ତକ ଓ ତଥ୍ୟ ଦେଖନ୍ତୁ",
+  "MORE_CONTENT": "{{%s}}ରେ ଅଧିକ ପୁସ୍ତକ ଓ କଣ୍ଟେଣ୍ଟ୍ ଦେଖନ୍ତୁ",
+  "MORE_COUNT": "ଅଧିକ ({{%s}})",
   "MORE_DETAILS": "ଅଧିକ ବିବରଣୀ (ଅଧିକ ସୂଚନା ଦିଅନ୍ତୁ କିମ୍ବା ସମସ୍ୟ ପାଇଁ ଏକ ସ୍କ୍ରିନସଟ ପ୍ରଦାନ କରନ୍ତୁ )",
   "MOVE": "ସ୍ଥାନାନ୍ତର କରନ୍ତୁ",
   "MOVE_FILES_TO_OTHER_DESTINATION": "ସ୍ଥାନ ଖାଲି କରିବା ପାଇଁ, {{%s}}କୁ ଫାଇଲ ସ୍ଥାନାନ୍ତରିତ କରନ୍ତୁ",
   "MSG_ALREADY_IMPORTED": "ପୂର୍ବରୁହିଁ  ଭର୍ତ୍ତି କରାଯାଇଛି ",
   "MSG_IMPORTED_SUCCESSFULLY": "ତଥ୍ୟ ସଫଳତାର ସହିତ ଗ୍ରହଣ ହୋଇଛି",
-  "MSG_LOADING_BATCHES": "ବ୍ୟାଚ ଆସୁଛି . . .",
   "MSG_NO_DETAILS_TO_SHOW": "ବିସ୍ତୃତ ବିବରଣୀ ଅନୁପଲବ୍ଧ ",
   "MSG_NO_NEW_NOTIFICATION": "କୌଣସି ନୂଆ ସୂଚନା ନାହିଁ ",
   "MSG_RESOURCE_DELETED": "ଡିଭାଇସ୍‌ରୁ ତଥ୍ୟ ଡିଲିଟ୍ ହୋଇଯାଇଛି",
+  "MULTIPLE_LICENSE": "ଲାଇସେନ୍ସ ସର୍ତ୍ତାବଳୀ {{%s}}",
   "MY_BADGES": "ମୋର ବ୍ୟାଚ୍",
+  "MY_DETAILS": "ମୋର ବିବରଣୀ",
+  "MY_GROUPS": "ମୋ ଗ୍ରୁପଗୁଡ଼ିକ",
   "NAME": "ନାମ ",
   "NAME_HINT": "ନାମ ଲେଖନ୍ତୁ",
+  "NAME_IS_REQUIRED": "ଆପଣଙ୍କୁ ବ୍ୟବହାରକାରୀଙ୍କ ନାମ ଦେବାକୁ ପଡ଼ିବ",
+  "NEED_INTERNET_FOR_DEEPLINK_CONTENT": "ଆପଣ ଅଫଲାଇନ୍ ଅଛନ୍ତି । ଏହି କଣ୍ଟେଣ୍ଟ୍ ଦେଖିବା ପାଇଁ ଇଣ୍ଟରନେଟରେ କନେକ୍ଟ କରନ୍ତୁ",
   "NEED_INTERNET_TO_CHANGE": "ୱାଇଫାଇ ଅଥବା ମୋବାଇଲ ଡାଟା ଅନ କରନ୍ତୁ ଏବଂ ପୁଣିଥରେ ପ୍ରୟାସ କରନ୍ତୁ ",
   "NEW": "ନୂଆ ",
   "NEW_NOTIFICATIONS": "{{%s}} ନୂଆ ସୂଚନା ",
   "NEXT": "ତା'ପରେ ",
   "NIL": "ଶୂନ୍ୟ ",
   "NO": "ନାହିଁ  ",
+  "NOTE": "ନୋଟ୍ କରନ୍ତୁ",
   "NOTIFICATION": "ସୂଚନା ",
   "NOT_AVAILABLE": "ଉପଲବ୍ଧ ନୁହେଁ ",
   "NOT_NOW": "ଏବେ ନୁହେଁ ",
   "NO_APP_FOR_INTENT": "ଫାଇଲ ଖୋଲିବା ପାଇଁ କୌଣସି ଆପ ଉପଲବ୍ଧ ନାହିଁ ",
-  "NO_ASSESSMENT": "କୌଣସି ଆସେସମେଣ୍ଟ ଉପଲବ୍ଧ ନାହିଁ ",
   "NO_BATCHES_AVAILABLE": "କୌଣସି ବ୍ୟାଚ୍ ଉପଲବ୍ଧ ନାହିଁ ",
-  "NO_BOOKS_AVAILABLE": "ବୋର୍ଡ ପୁସ୍ତକ ଯୋଡୁଛି",
-  "NO_BOOKS_DEFINITION": "ଆପଣଙ୍କ ବୋର୍ଡ ଅଧିକ ବହି ଯୋଡିବାକୁ ଅଛି | {{%s}}ରେ ଅଧିକ ବହି ଓ ତଥ୍ୟ ଦେଖିବା ପାଇଁ ବଟମ୍ କୁ ଟ୍ୟାପ୍ କରନ୍ତୁ ",
+  "NO_BOOKS_AVAILABLE": "ବୋର୍ଡ ପୁସ୍ତକ ସାମିଲ କରୁଛି",
+  "NO_BOOKS_DEFINITION": "ଆପଣଙ୍କ ବୋର୍ଡ ଅଧିକ ପୁସ୍ତକ ସାମିଲ କରିବ । {{%s}} ରେ କଣ୍ଟେଣ୍ଟ୍ ପାଇବାର ଅନୁରୋଧ କରିବା ପାଇଁ <b>See more books and content</b>  କ୍ଲିକ୍ କରନ୍ତୁ",
+  "NO_BOOKS_TEXT": "{{%s}}ରେ ଆପଣ ନିଜ ବିଷୟର ପାଠ୍ୟ ପୁସ୍ତକ ପାଉନାହାନ୍ତି କି ?",
   "NO_CONTENTS": "କିଛି ନାହିଁ   {{%s}}",
   "NO_CONTENTS_FOUND": "ତଥ୍ୟ ମିଳୁପାରୁନାହିଁ",
   "NO_CONTENTS_MESSAGE": "ଅନ୍ୟ ପ୍ରକାର ତଥ୍ୟ ଚୟନ କରନ୍ତୁ ",
+  "NO_CONTENT_AVAILABLE_IN_MODULE": "ଏହି ମଡ୍ୟୁଲରେ କୌଣସି କଣ୍ଟେଣ୍ଟ୍ ଉପଲବ୍ଧ ନାହିଁ",
+  "NO_COURSES": "ପାଠ୍ୟକ୍ରମ ନାହିଁ",
   "NO_DATA_FOUND": "କୌଣସି ଡାଟା ମିଳୁନାହିଁ",
-  "NO_DESCRIPTION": "ବର୍ଣ୍ଣନା ଉପଲବ୍ଧ ନାହିଁ ",
   "NO_DOWNLOADS": "ଏପର୍ଯ୍ୟନ୍ତ କୌଣସି ଡାଉନଲୋଡ ହୋଇନାହିଁ ",
-  "NO_DOWNLOADS_INFO": "କୋର୍ସ କିମ୍ବା ଲାଇବ୍ରେରୀରୁ ସାମଗ୍ରୀ ଡାଉନଲୋଡ କରନ୍ତୁ ",
+  "NO_DOWNLOADS_INFO": "ପାଠ୍ୟକ୍ରମ କିମ୍ବା ଲାଇବ୍ରେରୀରୁ କଣ୍ଟେଣ୍ଟ୍ ଡାଉନଲୋଡ କରନ୍ତୁ ",
   "NO_FILTERS_SELECTED": "କୌଣସି ଫିଲ୍ଟର ଚୟନ କରାଯାଇ ନାହିଁ |",
-  "NO_GROUPS_CREATED_YET": "ଏପର୍ଯ୍ୟନ୍ତ କୋଣସି ଗ୍ରୁପ୍ ତିଆରି ହୋଇନାହିଁ ",
-  "NO_GROUP_MESSAGE": "ବ୍ୟବହାରକାରୀମାନଙ୍କୁ ଠିକରେ ସଂଗଠିତ କରିବାରେ ଗ୍ରୁପଗୁଡିକ ସାହାଯ୍ୟ କରେ | ଆପଣ ଗ୍ରୁପଗୁଡିକୁ ମୋଟାମୋଟି ପ୍ରୋଗ୍ରେସ୍ ବା ଅଗ୍ରଗତି ମନିଟରିଂ କରିବା ପାଇଁ ମଧ୍ୟ ବ୍ୟବହାର କରିପାରିବ |",
   "NO_INTERNET": "ଇଣ୍ଟରନେଟ ର ଉପଲବ୍ଧ ନାହିଁ ",
   "NO_INTERNET_TITLE": "ଆପଣ ଅଫଲାଇନ ଅଛନ୍ତି ",
   "NO_PREVIEW": "ପ୍ରିଭ୍ୟୁ ଉପଲବ୍ଧ ନୁହେଁ",
+  "NO_QR_CODE": "ମୋ'ର QR କୋଡ୍ ନାହିଁ",
+  "NO_QR_CODE_QSTN": "QR କୋଡ୍ ନାହିଁ କି ?",
   "NO_RATING": "ବର୍ତ୍ତମାନ ପର୍ଯ୍ୟନ୍ତ ରେଟିଂ ହୋଇନାହିଁ",
-  "NO_USERS": "କୌଣସି ବ୍ୟବହାରକାରୀ ନାହାନ୍ତି",
-  "NO_USERS_CREATED_YET": "ଏପର୍ଯ୍ୟନ୍ତ କୋଣସି ବ୍ୟବହାରକାରୀ ହୋଇନାହାନ୍ତି",
-  "NO_USERS_CREATED_YET_MSG": "ଆପଣ ଆପଣଙ୍କ ଛାତ୍ର ବା ଅନ୍ୟ ଶିକ୍ଷକଙ୍କ ପାଇଁ ଗେଷ୍ଟ ବ୍ୟବହାରକାରୀ ଆକାଉଣ୍ଟ ଖୋଲିପାରିବେ",
-  "NO_USERS_IN_THIS_GROUP": "ଏହି ଗ୍ରୁପରେ କୌଣସି ବ୍ୟବହାରକାରୀ ନାହାନ୍ତି",
-  "NO_USERS_ON_THIS_DEVICE": "ଏହି ଡିଭାଇସରେ କୋୖଣସି ବ୍ୟବହାରକାରୀ ନାହାନ୍ତି ",
-  "NO_USERS_SUGGESTION_MESSAGE": "ଗୋଟିଏ ଗ୍ରୁପରେ ଅନୂନ୍ୟ ଗୋଟିଏ ବ୍ୟବହାରକାରୀ ରହିବା ଜରୁରୀ",
+  "NUMBER_OF_COURSES": "{{%s}} ପାଠ୍ୟକ୍ରମ",
+  "NUMBER_OF_COURSE_1": "({{%s}}) ପାଠ୍ୟକ୍ରମ",
   "NUMBER_OF_VOTES": "ଭୋଟ ସଂଖ୍ୟା ",
   "OFF": "ବନ୍ଦ ",
   "OFFLINE_DOWNLOAD_MESSAGE": "ଇଣ୍ଟରନେଟର ସଂଯୋଗ ହେବାପରେ ଆପେଆପେ ଡାଉନଲୋଡ ଆରମ୍ଭ ହୋଇଯିବ ",
@@ -353,6 +784,8 @@
   "OFFLINE_WARNING_ETBUI": "ତଥ୍ୟ ଦେଖିବାପାଇଁ ଇଣ୍ଟରନେଟ ସହିତ ସଂଯୋଗ କରନ୍ତୁ ",
   "OFFLINE_WARNING_ETBUI_1": "ତଥ୍ୟ ଦେଖିବାପାଇଁ ଇଣ୍ଟରନେଟ ସହିତ ସଂଯୋଗ କରନ୍ତୁ ",
   "OKAY": "ଠିକ୍ ଅଛି",
+  "ONGOING": "ଚାଲୁ ରହିଥିବା",
+  "ONLY_DIGIT_NUMBER_IS_ALLOWED": "କେବଳ 11 ଅଙ୍କ ବିଶିଷ୍ଟ ନମ୍ବର ପାଇଁ ଅନୁମତି ଅଛି",
   "ONLY_DOWNLOADED_CONTENT_CAN_BE_PLAYED_OFFLINE": "କେବଳ ଡାଉନଲୋଡ ହୋଇଥିବା  ତଥ୍ୟ ହିଁ  ଅଫଲାଇନରେ ଚାଲିପାରିବ |",
   "OPEN": "ଖୋଲନ୍ତୁ",
   "OPEN_SETTINGS": "ସେଟିଂ ଖୋଲନ୍ତୁ ",
@@ -361,16 +794,17 @@
   "ORIGINAL_AUTHOR": "ମୂଳ ତଥ୍ୟର ଲେଖକ ",
   "ORIGINAL_CONTENT": "ତଥ୍ୟ ",
   "ORIGINAL_CONTENT_DATA": "ଏହିଠାରୁ ତଥ୍ୟରୁ ଆସିଛି: ",
-  "OTHER_ROLE_DESC_2": "ଦରକାରୀ ସଂସଧାନ ଖୋଜନ୍ତୁ",
-  "OTHER_USERS": "ଅନ୍ୟ ବ୍ୟବହାରକାରୀ",
+  "OTHER_ROLE_DESC_1": "ଡିଜିଟାଲ୍ କଣ୍ଟେଣ୍ଟ୍ ବ୍ରାଉଜ୍ କରନ୍ତୁ",
+  "OTHER_ROLE_DESC_2": "ଅନଲାଇନ୍ ପାଠ୍ୟକ୍ରମ ନିଅନ୍ତୁ",
+  "OTP_FAILED": "OTP ପୁଷ୍ଟି କରିବାରେ ବିଫଳ ହେଲା । କିଛି ସମୟ ପରେ ପୁଣିଥରେ ଚେଷ୍ଟା କରନ୍ତୁ ।",
   "OTP_PLACEHOLDER": "OTP ଲେଖନ୍ତୁ",
   "OTP_RESENT": "OTP ପୁଣିଥରେ ପଠାଗଲା",
-  "OVERLAY_INFO_TEXT_COMMON": "ସମସ୍ତ ସୁବିଧା ବ୍ୟବହାର କରିବାପାଇଁ ସାଇନ ଇନ କରନ୍ତୁ ",
-  "OVERLAY_INFO_TEXT_TAKE_COURSE": "ପଞ୍ଜୀକୃତ ବ୍ୟବହାରକାରୀଙ୍କ ପାଇଁ କୋର୍ସ | ଏହି କୋର୍ସ ପାଇବା ପାଇଁ ସାଇନ ଇନ କରନ୍ତୁ ",
+  "OVERLAY_INFO_TEXT_COMMON": "ସମସ୍ତ ସୁବିଧା ବ୍ୟବହାର କରିବାପାଇଁ ଲଗ୍ ଇନ୍ କରନ୍ତୁ ",
+  "OVERLAY_INFO_TEXT_TAKE_COURSE": "ଏହି ପାଠ୍ୟକ୍ରମ ପଞ୍ଜୀକୃତ ବ୍ୟବହାରକାରୀଙ୍କ ପାଇଁ ଅଟେ | ଏହି ପାଠ୍ୟକ୍ରମ ପାଇବା ପାଇଁ ଲଗ୍ ଇନ୍ କରନ୍ତୁ ।",
   "OVERLAY_LABEL_COMMON": "{{%s}}ର ଅସୀମିତ ଏକସେସ ପାଆନ୍ତୁ",
   "OVERLAY_LABEL_HOME": "ଆପଣଙ୍କ ବ୍ୟକ୍ତିଗତ ହୋମ ଟ୍ୟାବ ",
-  "OVERLAY_LABEL_TAKE_COURSE": "ଏହି କୋର୍ସରେ  ଯୋଗ ଦେବା ପାଇଁ ପଂଜିକରଣ କରନ୍ତୁ",
-  "OVERLAY_SIGN_IN": "ସାଇନ ଇନ କରନ୍ତୁ",
+  "OVERLAY_LABEL_TAKE_COURSE": "ଏହି ପାଠ୍ୟକ୍ରମରେ  ଯୋଗ ଦେବା ପାଇଁ ଲଗ୍ ଇନ୍ କରନ୍ତୁ",
+  "OVERLAY_SIGN_IN": "ଲଗ୍ ଇନ୍ କରନ୍ତୁ",
   "OVER_WIFI": "ୱାଇଫାଇ ଉପରେ ",
   "PEOPLE_WHO_FOLLOW_YOU": "ଅନୁସରଣକାରୀ",
   "PEOPLE_YOU_FOLLOW": "ନିମ୍ନଲିଖିତ ",
@@ -384,95 +818,140 @@
   "PHONE_EDIT_SUCCESS": "ମୋବାଇଲ୍ ନମ୍ବର  ସଫଳତା ପୂର୍ବକ ଅପଡେଟ ହୋଇଗଲା ",
   "PHONE_PLACEHOLDER": "ମୋବାଇଲ ନମ୍ବର ",
   "PHONE_UPDATE_SUCCESS": "ମୋବାଇଲ୍ ନମ୍ବର  ସଫଳତା ପୂର୍ବକ ଅପଡେଟ ହୋଇଗଲା ",
+  "PLANNED_MAINTENANCE_TEXT": "ଆମର ମେଣ୍ଟେନାନ୍ସ ଚାଲୁଥିବାରୁ ଏବେ ସମସ୍ୟା ଦେଖାଦେଉଛି, ଚିନ୍ତା କରନ୍ତୁ ନାହିଁ, ଆମେ ଜଲଦି ଏହାକୁ ଠିକ୍ କରିଦେବୁ",
+  "PLANNED_MAINTENANCE_TEXT_WITH_TIME": "ଆମର ମେଣ୍ଟେନାନ୍ସ ଚାଲୁଥିବାରୁ ଏବେ ସମସ୍ୟା ଦେଖାଦେଉଛି, ଚିନ୍ତା କରନ୍ତୁ ନାହିଁ, ଆମେ ଏହି ସମୟ ମଧ୍ୟରେ ଠିକ୍ କରିଦେବୁ",
   "PLAY": "ଚଲାନ୍ତୁ",
   "PLAY_AS": "କେମିତି ଖେଳିବେ",
   "PLAY_FROM_DEVICE": "ଡିଭାଇସରେ ଖେଳନ୍ତୁ ",
   "PLAY_ONLINE": "ଅନଲାଇନ ଖେଳନ୍ତୁ",
   "PLEASE_DOWNLOAD_TO_PLAY": "ଖେଳିବା ପାଇଁ ତଥ୍ୟସମୂହକୁ ଡାଉନଲୋଡ କରନ୍ତୁ ",
+  "PLEASE_ENTER": "{{%s}} ଦିଅନ୍ତୁ",
+  "PLEASE_PROVIDE_FOLLOWING_DETAILS": "ଦୟାକରି ନିମ୍ନ ବିବରଣୀ ଦିଅନ୍ତୁ",
   "PLEASE_SELECT": "{{%s}}କୁ ସିଲେକ୍ଟ କରନ୍ତୁ",
   "PLEASE_SELECT_A_LANGUAGE": "ଏକ ଭାଷା ଚୟନ କରନ୍ତୁ ",
-  "PLEASE_SELECT_USER": "ବ୍ୟବହାରକାରୀ ବାଛନ୍ତୁ",
-  "POPULAR_COURSES": "ସବୁଠୁ ପ୍ରିୟ କୋର୍ସ",
+  "PLEASE_VALIDATE_YOUR_EMAIL_ADDRESS": "ଦୟାକରି ନିଜ ଇମେଲ୍ ଆଇଡି ଭାଲିଡେଟ୍ କରନ୍ତୁ",
+  "PLEASE_VALIDATE_YOUR_MOBILE_NUMBER": "ଦୟାକରି ନିଜ ମୋବାଇଲ୍ ନମ୍ବର ଭାଲିଡେଟ୍ କରନ୍ତୁ",
+  "POPULAR_COURSES": "ଲୋକପ୍ରିୟ ପାଠ୍ୟକ୍ରମଗୁଡ଼ିକ",
+  "POWER_OF_GROUPS": "ଆପଣ ଗ୍ରୁପର ଶକ୍ତି ଜାଣିଛନ୍ତି କି ?",
+  "PREFERENCES_CAN_BE_UPDATED": "ଆପଣ ପ୍ରୋଫାଇଲ୍ ପେଜରୁ ଏହି ବ୍ୟବହାରକାରୀଙ୍କ ବିବରଣୀ ଏଡ଼ିଟ୍ କରିପାରିବେ",
   "PREVIEWS": "ପ୍ରିଭ୍ୟୁ",
   "PREVIOUS_USER_SETTINGS": "ପୂର୍ବ ବ୍ୟବହାରକାରୀଙ୍କ ସେଟିଂ ସହ ଜାରି ରଖିବେ ?",
-  "PRIVATE": "ନିଜସ୍ୱ",
+  "PRINT": "ପ୍ରିଣ୍ଟ୍ କରନ୍ତୁ",
+  "PRIVACY_POLICY": "ପ୍ରାଇଭେସି ନୀତି",
   "PROFILE_BNAV": "ପ୍ରୋଫାଇଲ ",
   "PROFILE_DETAILS_TITLE": "ପ୍ରୋଫାଇଲ ବିବରଣୀ",
   "PROFILE_UPDATE_FAILED": "ପ୍ରୋଫାଇଲ ଅପଡେଟ ବିଫଳ ହେଲା, କିଛି ସମୟ ପରେ ପୁଣିଥରେ ଚେଷ୍ଟା କରନ୍ତୁ ",
   "PROFILE_UPDATE_SUCCESS": "ପ୍ରୋଫାଇଲର ସଫଳତାପୂର୍ବକ ଅପଡେଟ୍ ହେଲା",
+  "PROGRAMS_DESC": "ଆପଣଙ୍କ ଅବସ୍ଥିତି ଏବଂ ଆପଣଙ୍କ ଭୂମିକା ପାଇଁ ଡିଜାଇନ୍ ହୋଇଥିବା ଶିକ୍ଷଣ କାର୍ଯ୍ୟକ୍ରମ ଦେଖନ୍ତୁ ଏବଂ ସେଥିରେ ଅଂଶଗ୍ରହଣ କରନ୍ତୁ",
+  "PROGRESS_CANNOT_BE_TRACKED": "{{collectionType}} ପାଇଁ ପ୍ରଗତି ଟ୍ରାକ୍ କରିହେଉନାହିଁ",
+  "PROVIDE_BELOW_INFO": "ନିମ୍ନରେ ସୂଚନା ଦିଅନ୍ତୁ",
   "PUBLIC": "ସର୍ବସାଧାରଣ",
   "PUBLISHED_BY": "{{%s}}ରେ ପ୍ରକାଶିତ କଲେ ",
   "PUBLISHED_DATE": "ପ୍ରକାଶିତ ତାରିଖ ",
-  "QR_CODE_DETAILS": "ଏହା ଆପଣଙ୍କର କିଛି ପାଠ୍ୟ ପୁସ୍ତକରେ ମିଳିପାରେ |  ତୁରନ୍ତ ତଥ୍ୟ ପାଇବା ପାଇଁ ସ୍କାନ କରନ୍ତୁ ",
-  "QUESTION": "ପ୍ରଶ୍ନ ",
-  "QUESTIONS": "ପ୍ରଶ୍ନ ",
-  "QUESTION_MARKS": "ପ୍ରଶ୍ନ (ଚିହ୍ନ )",
+  "PUBLISHER": "ପ୍ରକାଶକ",
+  "QR_CODE_DETAILS": "ଆପଣଙ୍କ ପାଠ୍ୟପୁସ୍ତକରୁ ଏକ QR କୋଡ଼୍ ସ୍କାନ୍ କରି ସଙ୍ଗେ ସଙ୍ଗେ ଡିଜିଟାଲ୍ କଣ୍ଟେଣ୍ଟ୍ ଦେଖନ୍ତୁ ।",
+  "QR_SHOWING_MULTIPLE_BOOK_RESULT": "ଏଥିପାଇଁ {{%s}}ଟି ଫଳାଫଳ ଦେଖାଉଛି",
+  "QUES_BANKS": "ପ୍ରଶ୍ନ ବ୍ୟାଙ୍କ୍",
   "QUIZ": "କୁଇଜ ",
+  "QUIZ_CONTENTS_ONLY_REGISTERED_USERS": "ଏହି ପ୍ରଶ୍ନୋତ୍ତର କେବଳ ପଂଜୀକୃତ ବ୍ୟବହାରକାରୀଙ୍କ ପାଇଁ ଅଟେ",
   "RATE": "ରେଟିଂ କରନ୍ତୁ",
   "RATED_STARS": "ଆପଣ {{%s}} ଷ୍ଟାର୍ ରେଟିଂ କରିଛନ୍ତି",
   "RATE_THE_CONTENT": "ତଥ୍ୟକୁ ରେଟିଂ କରନ୍ତୁ ",
+  "RATING_QUESTION": "ଆପଣ ଆମକୁ ଅଧିକ ଜଣାଇବାକୁ ଚାହାଁନ୍ତି କି ?",
   "READ_LESS": "ଅଳ୍ପ ପଢ଼ନ୍ତୁ ",
   "READ_MORE": "ଅଧିକ ପଢନ୍ତୁ ",
-  "RECENTLY_VIEWED": "ନିକଟରେ ଦେଖିଥିବା",
+  "RECOMMENDATION_BASED_ON_PROFILE": "ଆପଣଙ୍କ ପ୍ରୋଫାଇଲ୍ ବିବରଣୀ ଭିତ୍ତିରେ ସୁପାରିଶ",
   "RECOMMENDED": "ଏପରି କରାଯାଇପାରେ",
-  "RECOVERY_ACCOUNT_UPDATE_SUCCESS": "ରିକୋଭରି ଆକାଉଣ୍ଟ ସଫଳତାର ସହ ଅପଡେଟ୍ ହେଲା",
-  "RECOVERY_ID_DESCRIPTION": "ଆପଣ ଯଦି ଲକ୍ ହୋଇଗଲେ, ତେବେ ଏକ ରିକଭରି ଆକାଉଣ୍ଟ ଆପଣଙ୍କୁ ଆକ୍ସେସ୍ ପାଇଁ ସହାଯ୍ୟ କରିଥାଏ | ଆପଣଙ୍କର ରିକଭରି ଆକାଉଣ୍ଟର ପ୍ରକାର ଚୟନ କରନ୍ତୁ ଓ ବିସ୍ତୃତ ବିବରଣୀ ଲେଖନ୍ତୁ :",
-  "REGISTER_TO_COMPLETE_ACCESS": "ସଂପୂର୍ଣ୍ଣ ତଥ୍ୟ ଦେଖିବାପାଇଁ ପଂଜିକୃତ ହୁଅନ୍ତୁ",
+  "RECOVERY_ACCOUNT_UPDATE_SUCCESS": "ରିକଭରି ଆକାଉଣ୍ଟ ସଫଳତାର ସହ ଅପଡେଟ୍ ହେଲା",
+  "RECOVERY_ID_DESCRIPTION": "ଯଦି ଆପଣ ଲକ୍ ଆଉଟ୍ ହୋଇଗଲେ, ତେବେ ଏକ ରିକଭରି ଆକାଉଣ୍ଟ ଆପଣଙ୍କୁ ନିଜ ଆକାଉଣ୍ଟ ଆଉଥରେ ବ୍ୟବହାର କରିବାରେ ସାହାଯ୍ୟ କରିବ । ଆପଣଙ୍କ ରିକଭରି ଆକାଉଣ୍ଟ ପ୍ରକାର ଚୟନ କରନ୍ତୁ ଓ ବିବରଣୀ ଦିଅନ୍ତୁ:",
+  "REDO": "ଆଉଥରେ କରନ୍ତୁ",
+  "REDO_ASSESSMENT": "ମୂଲ୍ୟାୟନ ଆଉଥରେ କରନ୍ତୁ",
+  "REGISTER_TO_COMPLETE_ACCESS": "କଣ୍ଟେଣ୍ଟକୁ ସମ୍ପୂର୍ଣ୍ଣ ହାସଲ କରିବା ପାଇଁ ପଂଜୀକରଣ କରନ୍ତୁ",
   "REMOVE": "ଡିଲିଟ୍ କରନ୍ତୁ",
+  "REMOVE_ACTIVITY": "ହଟାଇଦିଅନ୍ତୁ",
+  "REMOVE_ACTIVITY_ERROR_MSG": "ଆକ୍ଚିଭିଟିକୁ ହଟାଇ ହେଉନାହିଁ | କିଛି ସମୟ ପରେ ପୁଣିଥରେ ପ୍ରୟାସ କରନ୍ତୁ ",
+  "REMOVE_ACTIVITY_GROUP_DESC": "ଏହି ଆକ୍ଟିଭିଟିକୁ ହଟାଇଦେଲେ ଏହା ଗ୍ରୁପ୍ ଆକ୍ଟିଭିଟିରୁ ହଟିଯିବ ଏବଂ ଆପଣ ଆଉ ଏଥିରେ ସଦସ୍ୟଙ୍କ ପ୍ରଗତି ଯାଞ୍ଚ କରିପାରିବେ ନାହିଁ",
+  "REMOVE_ACTIVITY_POPUP_TITLE": "ଆକ୍ଟିଭିଟି ହଟାଇବେ କି ?",
+  "REMOVE_ACTIVITY_SUCCESS_MSG": "ଗ୍ରୁପରୁ ଏହି ଆକ୍ଚିଭିଟିକୁ ସଫଳତାର ସହ ହଟାଇଦିଆଯାଇଛି",
   "REMOVE_FROM_DEVICE": "ଡିଭାଇସ୍‌ରୁ ତଥ୍ୟ ଡିଲିଟ୍ କରନ୍ତୁ",
   "REMOVE_FROM_DEVICE_MSG": "ଆପଣ କଣ ସତରେ ଏହି ତଥ୍ୟକୁ ଡିଭାଇସରୁ ଡିଲିଟ୍ କରିବାକୁ ଚାହୁଁଛନ୍ତି ?",
-  "REMOVE_MULTIPLE_USERS_FROM_GROUP": "{{%s}} ବ୍ୟବହାରକାରୀଙ୍କୁ ହଟାଇବା ଲାଗି ନିଶ୍ଚିତ କରନ୍ତୁ",
-  "REMOVE_USERS": "ବ୍ୟବହାରକାରୀଙ୍କୁ  ଗ୍ରୁପରୁ ହଟାନ୍ତୁ ",
-  "REMOVE_USERS_FROM_GROUP": "{{%s}} ବ୍ୟବହାରକାରୀଙ୍କୁ  ଗ୍ରୁପରୁ ହଟାନ୍ତୁ ",
-  "REPORTS": "ରିପୋର୍ଟ ",
+  "REMOVE_MEMBER": "ସଦସ୍ୟ ହଟାନ୍ତୁ",
+  "REMOVE_MEMBER_ERROR_MSG": "ଗ୍ରୁପରୁ ସଦସ୍ୟଙ୍କୁ ହଟାଇ ହେଉନାହିଁ | କିଛି ସମୟ ପରେ ପୁଣିଥରେ ପ୍ରୟାସ କରନ୍ତୁ ",
+  "REMOVE_MEMBER_GROUP_DESC": "{{member_name}}ଙ୍କୁ ହଟାଇଦେଲେ ଗ୍ରୁପରୁ ସେ ସ୍ଥାୟୀଭାବେ ହଟିଯିବେ ",
+  "REMOVE_MEMBER_POPUP_TITLE": "ସଦସ୍ୟଙ୍କୁ ହଟାଇବେ କି ?",
+  "REMOVE_MEMBER_SUCCESS_MSG": "{{member_name}} ଆଉ ଗ୍ରୁପ୍ ରେ ନାହାନ୍ତି",
+  "REQUEST_CONTENT": "ଏଠାରେ ଆମକୁ ଜଣାନ୍ତୁ",
   "RESEND_OTP": "OTP ପୁଣିଥରେ ପଠାନ୍ତୁ ",
+  "RESET": "ରିସେଟ୍ କରନ୍ତୁ",
   "RESOURCE_TYPE": "ସଂସାଧନ ପ୍ରକାର ",
-  "RESULT": "ଫଳାଫଳ",
+  "RESPONSE_ACKNOWLEGED": "ଆପଣଙ୍କ ଉତ୍ତର ପାଇଁ ଧନ୍ୟବାଦ",
   "RESULTS": "ଫଳାଫଳ",
   "RESUME": "ପୁନଃଆରମ୍ଭ କରନ୍ତୁ",
+  "RETRY": "ଆଉଥରେ ଚେଷ୍ଟା କରନ୍ତୁ",
   "RETRY_ACTION": "ପୁଣିଥରେ ଚେଷ୍ଟା କରନ୍ତୁ ",
-  "ROLE_SELECTOR_QUERY": "ଆପଣ ଜଣେ ",
+  "ROLE_SELECTOR_QUERY": "କଣ୍ଟେଣ୍ଟକୁ ଏପରି ଦେଖନ୍ତୁ",
   "SAVE": "ସେଭ୍ କରନ୍ତୁ ",
   "SAVED_ON": "ଏଥିରେ ସେଭ୍ ହେବ",
-  "SAVED_RESOURCES": "ସୁରକ୍ଷିତ ସଂସାଧନ ",
+  "SAVE_FILE_ON_DEVICE": "ଫାଇଲ୍ ଡିଭାଇସରେ ସେଭ୍ କରନ୍ତୁ",
   "SCAN_QR_CODE": "QR କୋଡ଼ ସ୍କାନ କରନ୍ତୁ ",
   "SCAN_QR_INSTRUCTION": "ଏହାକୁ  ସ୍କାନ କରିବାପାଇଁ ଆପଣଙ୍କ ଫୋନକୁ QR କୋଡ଼ ଆଗରେ ରଖନ୍ତୁ",
-  "SCAN_TAP": "ସ୍କାନ କରିବାପାଇଁ ଟ୍ୟାପ କରନ୍ତୁ ",
-  "SCORE": "ସ୍କୋର",
-  "SCORED": "ରହିଥିବା ସ୍କୋର",
+  "SCAN_TAP": "QR କୋଡ଼ ସ୍କାନ କରନ୍ତୁ ",
+  "SCHOOL_OR_ORG_NAME": "ବିଦ୍ୟାଳୟ/ସଂସ୍ଥା ନାମ",
+  "SCHOOL_UDISE_ID_OR_ORG_ID": "ବିଦ୍ୟାଳୟ UDISE ID/ ସଂସ୍ଥା ID",
   "SD_CARD": "SD କାର୍ଡ ",
+  "SEARCH_FOR_GROUP_MEMBER": "ଗ୍ରୁପ ସଦସ୍ୟଙ୍କୁ ଖୋଜନ୍ତୁ",
   "SEARCH_HINT": "ଖୋଜନ୍ତୁ",
   "SEARCH_PLACEHOLDER": "ତଥ୍ୟ ଖୋଜିବା ପାଇଁ ଲେଖନ୍ତୁ, ଯେମିତିକି 'Story'",
   "SEARCH_TO_FIND_CONTENT": "ତଥ୍ୟ ପାଇବାପାଇଁ {{%s}} ଖୋଜନ୍ତୁ ",
+  "SECONDS_AGO": "{{%s}} ସେକେଣ୍ଡ ପୂର୍ବରୁ",
+  "SECOND_AGO": "{{%s}} ସେକେଣ୍ଡ ପୂର୍ବରୁ",
   "SEE_ALL_RESULTS_FOR": "\"{{%s}}\"ପାଇଁ ସମସ୍ତ ଫଳାଫଳ ଦେଖନ୍ତୁ",
+  "SEE_MORE_BOOKS": "ଅଧିକ ପୁସ୍ତକ ଓ କଣ୍ଟେଣ୍ଟ ଦେଖନ୍ତୁ",
+  "SEE_MORE_CONTENT": "ଅଧିକ ତଥ୍ୟ ଦେଖନ୍ତୁ",
   "SELECT": "ଚୟନ କରନ୍ତୁ",
   "SELECTED_TOPICS": "ଚୟନ କରାଯାଇଥିବା ବିଷୟ",
+  "SELECT_ACTIVITY": "ଆକ୍ଟିଭିଟି ଚୟନ କରନ୍ତୁ",
   "SELECT_ALL": "ସବୁ ସିଲେକ୍ଟ କରନ୍ତୁ",
-  "SELECT_CHAPTER": "ଅଧ୍ୟାୟର ଚୟନ କରନ୍ତୁ ",
+  "SELECT_CHAPTER": "ମଡ୍ୟୁଲ୍ ଚୟନ କରନ୍ତୁ",
+  "SELECT_YOUR_STATE": "ଆପଣଙ୍କ ରାଜ୍ୟ ଚୟନ କରନ୍ତୁ",
+  "SELF_DECLARED_INFO": "ଆତ୍ମଘୋଷିତ ସୂଚନା",
+  "SELF_DECLARE_TEACHER_TNC": "{{%appName}}ଙ୍କ  ଆଡ଼ମିନିଷ୍ଟ୍ରେଟରଙ୍କ ସହ ଏହି ସବୁ ବିବରଣୀ ପ୍ରଦାନ କରିବା ଲାଗି ମୁଁ ରାଜି",
+  "SEND_FILE": "ଫାଇଲ୍ ପଠାନ୍ତୁ",
   "SERVER_CONNECTION_ERROR": "Server ସହିତ ସଂଯୋଗ ପାଇଁ ଅସମର୍ଥ",
   "SETTINGS": "ସେଟିଙ୍ଗ ",
   "SHARE": "ସେୟାର ",
   "SHARE_APP": "{{%s}} ଆପକୁ ସେୟାର କରନ୍ତୁ ",
+  "SHARE_APP_LINK": "{{play_store_url}} ରୁ {{app_name}} ଆପ୍ ପାଆନ୍ତୁ",
   "SHARE_CONTENT_FAILED": "ତଥ୍ୟ ସେୟାର କରିବାରେ ଅସମର୍ଥ ",
+  "SHARE_CONTENT_FILE": "ଫାଇଲ୍ {{app_name}} ରୁ ପଠାଯାଇଛି\nନାମ: {{content_name}}\n{{play_store_url}} ରୁ {{app_name}} ଆପ୍ ପାଆନ୍ତୁ",
+  "SHARE_CONTENT_LINK": "{{app_name}} ରେ {{content_link}} କୁ ଯାଇ {{content_name}} ଦେଖନ୍ତୁ\n{{play_store_url}} ରୁ {{app_name}} ପାଆନ୍ତୁ",
+  "SHARE_LINK": "ଲିଙ୍କ୍ ସେୟାର୍ କରନ୍ତୁ",
   "SHARE_TELEMETRY": "ଟେଲିମେଟ୍ରି ସେୟାର କରନ୍ତୁ",
   "SHARE_TELEMETRY_FAILED": "ଟେଲିମେଟ୍ରି ସେୟାର କରିବାରେ ବିଫଳ",
+  "SHARE_TELEMETRY_NO_DATA_FOUND": "କୌଣସି ଟେଲିମେଟ୍ରି ଡାଟା ମିଳିଲା ନାହିଁ",
   "SHARE_THIS": "ସେୟାର କରନ୍ତୁ",
+  "SHARE_USERNAME": "ହାଏ ! {{app_name}} ର {{user_name}} ଙ୍କ ପାଇଁ ଗ୍ରହଣ କରିଥିବା ID ହେଉଛି : {{diksha_id}}",
   "SHOW": "ପ୍ରଦର୍ଶନ କରନ୍ତୁ ",
+  "SHOWING_ITEMS": "{{%s}} ଆଇଟମ୍ ଦେଖାଉଛି",
   "SHOWING_RESULTS_FOR": "'{{%query}}' ପାଇଁ {{%count}} ଫଳାଫଳ ଦେଖାଉଛି ",
   "SHOW_LESS": "ଅଳ୍ପରେ ଦେଖନ୍ତୁ ",
   "SHOW_MORE": "ଅଧିକ  ଦେଖନ୍ତୁ ",
-  "SHOW_RECENT": "{{%s}} ଫାଇଲ ଦେଖାଉଛି",
-  "SIGNED_OUT_ACCOUNT_MESSAGE": "ବର୍ତ୍ତମାନ ଲଗଇନ୍ ହୋଇଥିବା ଆକାଉଣ୍ଟରୁ ଆପଣ ସାଇନ ଆଉଟ୍ ହୋଇଯିବେ",
-  "SIGNIN_TO_USE_FEATURE": "ଏହି ସୁବିଧାର ଉପଯୋଗ କରିବାପାଇଁ ସାଇନ ଇନ କରନ୍ତୁ ",
-  "SIGN_IN": "ସାଇନ ଇନ କରନ୍ତୁ ",
+  "SIGNIN_TO_USE_FEATURE": "ଏହି ସୁବିଧାର ଉପଯୋଗ କରିବାପାଇଁ ଲଗ୍ ଇନ୍ କରନ୍ତୁ ",
+  "SIGN_IN": "ଲଗ୍ ଇନ୍ କରନ୍ତୁ",
+  "SIZE": "ଆକାର: {{%s}}",
   "SKIP": "ଛାଡି ଦିଅନ୍ତୁ",
   "SOMETHING_WENT_WRONG": "ବୈଷୟିକ ସମସ୍ୟା ଯୋଗୁଁ  ଆମେ ଆପଣଙ୍କ ଅନୁରୋଧ ଉପରେ କାମ କରିବାକୁ ଅସମର୍ଥ ",
   "SORT_BY": "ଏହି ଅନୁସାରେ ସଜାନ୍ତୁ",
   "SPACE_AVAILABLE_ON_SDCARD": "ଏସଡ଼ି କାର୍ଡରେ ସ୍ଥାନ ଉପଲବ୍ଧ ଅଛି ",
   "SPACE_TAKEN": "ସ୍ଥାନ {{%s}} ଦ୍ୱାରା ନିଆଯାଇଛି",
   "SPACE_TAKEN_BY_APP": "{{%s}} ତଥ୍ୟ ଦ୍ୱାରା ବ୍ୟବହାର ହେଉଥିବା ସ୍ଥାନ : ",
+  "SPECIAL_CHARACTERS_NOT_SUPPORTED": "ବିଶେଷ ଲିପି ସପୋର୍ଟ କରୁନାହିଁ",
+  "START": "ଆରମ୍ଭ କରନ୍ତୁ",
+  "START_AGAIN": "ଆଉଥରେ ଆରମ୍ଭ କରନ୍ତୁ",
+  "START_ASSESSMENT": "ମୂଲ୍ୟାୟନ ଆରମ୍ଭ କରନ୍ତୁ",
   "START_COURSE": "ଆରମ୍ଭ ",
-  "START_COURSE_NOW": "ବର୍ତ୍ତମାନ ଆରମ୍ଭ କରନ୍ତୁ",
+  "START_COURSE_NOW": "ଏବେ ଆରମ୍ଭ କରନ୍ତୁ",
+  "START_LEARNING": "ଶିଖିବା ଆରମ୍ଭ କରନ୍ତୁ",
   "STAR_RATINGS": "ରେଟିଂ",
   "STATE": "ରାଜ୍ୟ ",
   "STATE_OPTION_TEXT": "ରାଜ୍ୟ ଚୟନ କରନ୍ତୁ ",
@@ -480,50 +959,129 @@
   "STORAGE": "ସୁରକ୍ଷିତ ରହିବାସ୍ଥାନ",
   "STORAGE_SETTINGS": "ଷ୍ଟୋରେଜ୍ ସେଟିଙ୍ଗ ",
   "STRUCTURE": "ସଂରଚନା",
-  "STUDENT_ROLE_DESC_1": "ସଂସାଧନ ମାଧ୍ୟମରେ ବ୍ରାଉଜ କରନ୍ତୁ ",
+  "STUDENT_ROLE_DESC_1": "ପାଠ୍ୟପୁସ୍ତକ ଓ ଡିଜିଟାଲ କଣ୍ଟେଣ୍ଟ୍ ବ୍ରାଉଜ୍ କରନ୍ତୁ",
   "SUBJECT": "ବିଷୟ ",
   "SUBJECTS": "ବିଷୟ ",
   "SUBJECT_OPTION_TEXT": "ବିଷୟ ଚୟନ କରନ୍ତୁ ",
+  "SUBMIT_MY_DETAILS": "ମୋ ବିବରଣୀ ଦାଖଲ କରନ୍ତୁ",
+  "SUCCESSFULLY_ADDED_USER": "\"{{%s}}\" ଙ୍କୁ ସଫଳତାର ସହ ଯୋଗ କରାଗଲା",
+  "SUCCESSFULLY_SWITCHED_USER": "ହାଏ {{%user}}",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_PHONE": "ସମସ୍ତ ତଥ୍ୟ ଫୋନ ଷ୍ଟୋରେଜକୁ ଚାଲିଯିବ",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_SDCARD": "ସମସ୍ତ ତଥ୍ୟ SD କାର୍ଡକୁ ଚାଲିଯିବ",
   "SUPPORT": "ସହାୟତା",
   "SUPPORT_MESSAGE": " କୌଣସି ଅସୁବିଧା ହେଉଛି କି ? ଆମକୁ ମେସେଜ୍ କରନ୍ତୁ",
-  "SWITCHING_TO": "'{{%s}}'କୁ ନିଆଗଲା",
-  "SWITCH_ACCOUNT": "ଆକାଉଣ୍ଟ ବଦଳାନ୍ତୁ ",
-  "SWITCH_ACCOUNT_CONFIRMATION": "ଆକାଉଣ୍ଟ ବଦଳାଇବେ ?",
+  "SWITCH_TO_CLASSIC_THEME": "କ୍ଲାସିକ୍ ଥିମ୍ କରନ୍ତୁ ",
+  "SWITCH_TO_JOYFUL_THEME": "ଜୟଫୁଲ୍ ଥିମ୍ କରନ୍ତୁ",
+  "SWITCH_USER": "ବ୍ୟବହାରକାରୀ ବଦଳାନ୍ତୁ",
   "SYLLABUS": "ପାଠ୍ୟକ୍ରମ   ",
   "SYNCING_NOW": "ଏବେ ସିଙ୍କ୍ ହେଉଛି",
   "SYNC_NOW": "ଏବେ Sync କରନ୍ତୁ ",
-  "TAKE_ASSESSMENT": "ଜଣେ ବ୍ୟବହାରକାରୀ ଅନୂନ୍ୟ ଗୋଟିଏ ଆସେସମେଣ୍ଟ ବା ମୂଲ୍ୟାଙ୍କନ ନେବା ଦରକାର ",
   "TAP_SCAN": "{{%s}} QR କୋଡକୁ ସ୍କାନ କରିବାପାଇଁ ଟ୍ୟାପ କରନ୍ତୁ ",
-  "TEACHER_ROLE_DESC_1": "ପାଠ୍ୟକ୍ରମ ମାଧ୍ୟମରେ ବ୍ରାଉଜ କରନ୍ତୁ ",
-  "TEACHER_ROLE_DESC_2": "ଦରକାରୀ ସଂସଧାନ ଖୋଜନ୍ତୁ",
-  "TEACHER_ROLE_DESC_3": "ଗ୍ରୁପ୍ ମାଧ୍ୟମରେ ବ୍ରାଉଜ କରନ୍ତୁ ",
+  "TBK_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "ଆରମ୍ଭ କରିବା ପାଇଁ ଏକ ପାଠ୍ୟପୁସ୍ତକ ଚୟନ କରନ୍ତୁ",
+  "TBK_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "ପାଠ୍ୟପୁସ୍ତକ ",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "ପାଠ୍ୟପୁସ୍ତକ",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "ପାଠ୍ୟପୁସ୍ତକ ",
+  "TBK_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}} ର ଲାଇବ୍ରେରୀରେ ଅନେକ {{%explainVideos}}, {{%quesBanks}} ଓ ଅନ୍ୟ {{%interactiveMaterial}} ରହିଛି । ଲାଇବ୍ରେରୀ ଅଧିକ ଦେଖିବା ପାଇଁ ଏକ ପାଠ୍ୟପୁସ୍ତକରେ କ୍ଲିକ୍ କରନ୍ତୁ !",
+  "TBK_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) ପାଇଁ କୌଣସି ପୁସ୍ତକ ମିଳିଲା ନାହିଁ ",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "ବୋର୍ଡ ପୁସ୍ତକ ସାମିଲ କରୁଛି",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}}ରେ ଆପଣ ନିଜ ବିଷୟର ପାଠ୍ୟ ପୁସ୍ତକ ପାଇନାହାନ୍ତି କି ?",
+  "TBK_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>ନୋଟ୍ :</span> ପାଠ୍ୟପୁସ୍ତକ ପାଇଁ ପ୍ରଗତି ଟ୍ରାକ୍ କରାଯାଇପାରିବ ନାହିଁ ",
+  "TBK_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "ଆପଣ {{%s}}ରେ  ଅନୁରୋଧ କରିଥିବା ପୁସ୍ତକଗୁଡ଼ିକୁ ଆପଣଙ୍କର ରାଜ୍ୟ ବୋର୍ଡ ଅପଲୋଡ଼୍ କଲେ ଆମେ ଆପଣଙ୍କୁ ଜଣାଇବୁ ",
+  "TBK_NONTRK_QR_CODE_DETAILS": "ଆପଣଙ୍କର ପାଠ୍ୟପୁସ୍ତକରୁ QR କୋଡ୍ ସ୍କାନ୍ କରି ସଙ୍ଗେ ସଙ୍ଗେ ଡିଜିଟାଲ କଣ୍ଟେଣ୍ଟର ଆକ୍ସେସ୍ ପାଆନ୍ତୁ ",
+  "TBK_NONTRK_SEE_MORE_BOOKS": "ଅଧିକ ପୁସ୍ତକ ଓ କଣ୍ଟେଣ୍ଟ ଦେଖନ୍ତୁ",
+  "TBK_NONTRK_STUDENT_ROLE_DESC_1": "ପାଠ୍ୟପୁସ୍ତକ ଓ ଡିଜିଟାଲ କଣ୍ଟେଣ୍ଟ୍ ବ୍ରାଉଜ୍ କରନ୍ତୁ",
+  "TBK_NONTRK_TEACHER_ROLE_DESC_1": "ପାଠ୍ୟପୁସ୍ତକ ଓ ଡିଜିଟାଲ କଣ୍ଟେଣ୍ଟ୍ ବ୍ରାଉଜ କରନ୍ତୁ ",
+  "TBK_NONTRK_TUTORIAL_HEADING": "ଭିଡିଓ, ଇଣ୍ଟରଆକ୍ଟିଭ୍ କଣ୍ଟେଣ୍ଟ୍, ଇ-ପାଠ୍ୟପୁସ୍ତକ ଓ ଆହୁରି ଅନେକ...",
+  "TBK_TRK_BATCHEND_MAIN_HEADING": "ଆପଣ ପାଠ୍ୟପୁସ୍ତକ ପଢ଼ିବାର ଯେଉଁ ବ୍ୟାଚ୍ ରେ ଯୋଗ ଦେଇଛନ୍ତି, ତାହା {{%s}} ରେ ଶେଷ ହୋଇଛି",
+  "TBK_TRK_BATCHEND_SUB_HEADING": "ଆପଣ ଶିଖିବା ଜାରି ରଖି ପାରନ୍ତି, କିନ୍ତୁ ଆପଣଙ୍କ ପ୍ରଗତି ଅପଡେଟ୍ ହେବ ନାହିଁ ",
+  "TBK_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "ଆପଣ ଏହି ଅଧ୍ୟାୟ ଶେଷ କରିଛନ୍ତି",
+  "TBK_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} ସୁଦ୍ଧା ପାଠ୍ୟପୁସ୍ତକ ଶେଷ କରନ୍ତୁ",
+  "TBK_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "ଏହି ପାଠ୍ୟପୁସ୍ତକ ଆଉ ସକ୍ରିୟ ନାହିଁ ",
+  "TBK_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "ପାଠ୍ୟପୁସ୍ତକ ",
+  "TBK_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "ଆପଣ ଏହି ପାଠ୍ୟପୁସ୍ତକ ପଢ଼ିଛନ୍ତି ",
+  "TBK_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "ଏହି ପାଠ୍ୟପୁସ୍ତକ ପାଇଁ ଥିବା ବ୍ୟାଚ୍",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "ଟାସ୍କଗୁଡ଼ିକ",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "ମୋ ପାଠ୍ୟପୁସ୍ତକ ",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "ଏହି ବ୍ୟାଚ୍ ଶେଷ ହେବା ତାରିଖ ହେଉଛି",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "ଶେଷଥର ପାଇଁ {{last_updated_on_date}} ରେ ଅପଡେଟ୍ ହୋଇଥିଲା",
+  "TBK_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "ଯୋଗ ଦିଅନ୍ତୁ ",
+  "TBK_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "ସଦ୍ୟତନ ପାଠ୍ୟପୁସ୍ତକ ",
+  "TBK_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "ଟାସ୍କ ଛାଡ଼ିବେ କି ?",
+  "TBK_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "ଯୋଗ ଦେବା ପାଇଁ ଲଗ୍ ଇନ୍ କରନ୍ତୁ ",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_COURSES": "ପାଠ୍ୟପୁସ୍ତକ ନାହିଁ ",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "କଣ୍ଟେଣ୍ଟ୍ ଡାଉନଲୋଡ୍ କରନ୍ତୁ",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "ପାଠ୍ୟପୁସ୍ତକ ({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "ପାଠ୍ୟପୁସ୍ତକ ({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "ଅନଲାଇନ୍ ଶିକ୍ଷା ନିଅନ୍ତୁ",
+  "TBK_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "ଲୋକପ୍ରିୟ ପାଠ୍ୟପୁସ୍ତକ ",
+  "TBK_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ଅନଲାଇନ୍ ଶିକ୍ଷା ନିଅନ୍ତୁ",
+  "TBK_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "ସାର୍ଟିଫିକେଟ୍ ହାସଲ କରିବା ପାଇଁ   {{%s}} ସୁଦ୍ଧା ଟାସ୍କ ଶେଷ କରନ୍ତୁ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING": "ଶିକ୍ଷଣ ଟାସ୍କ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "ଭାଗ ନେଇଥିବା ଶିକ୍ଷା ଟାସ୍କ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "ପାଠ୍ୟପୁସ୍ତକ ବିବରଣୀ ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "ଟାସ୍କ ଶେଷ ହେବା ତାରିଖ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "ଟାସ୍କ ସରିବା ତାରିଖ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "ଟାସ୍କ ବିବରଣୀ ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "ଏହି ଟାସ୍କ ଏହିମାନଙ୍କ ପାଇଁ ଉଦ୍ଦିଷ୍ଟ:",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "ଅଧ୍ୟାୟ",
+  "TBK_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "ପାଠ୍ୟପୁସ୍ତକ ଆକ୍ଟିଭିଟି ବନ୍ଦ କରନ୍ତୁ ",
+  "TBK_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "ପାଠ୍ୟପୁସ୍ତକ ଆକ୍ଟିଭିଟି ଯାଞ୍ଚ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି ?",
+  "TBK_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "ଏହି ପାଠ୍ୟପୁସ୍ତକ ପାଇଁ ବ୍ୟାଚ୍ {{batch_start_date}} ରୁ ଉପଲବ୍ଧ ହେବ ",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "7 ଦିନ ମଧ୍ୟରେ ପାଠ୍ୟକ୍ରମ ସାର୍ଟିଫିକେଟ୍ ବିଷୟରେ ଆପଣଙ୍କୁ ଆପଣଙ୍କ ପଂଜୀକୃତ ଯୋଗାଯୋଗ ମାଧ୍ୟମରେ ସୂଚୀତ କରାଯିବ ",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "ନୋଟ୍: ଏହି ପାଠ୍ୟପୁସ୍ତକରେ ସାର୍ଟିଫିକେଟ୍ ନାହିଁ",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "ଆପଣ ଏହି ପାଠ୍ୟପୁସ୍ତକ ପଢ଼ିଛନ୍ତି ",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "ନୋଟ୍: ଏବେ ଏହି ଟାସ୍କରେ ସାର୍ଟିଫିକେଟ୍ ନାହିଁ । ପରେ ପ୍ରସ୍ତୁତକର୍ତ୍ତା ସାର୍ଟିଫିକେଟ ଯୋଗ କରିପାରନ୍ତି ।",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "ଆପଣ ପାଠ୍ୟପୁସ୍ତକ ପଢ଼ିବା ବନ୍ଦ କରିଛନ୍ତି ",
+  "TBK_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "ଏହି ପାଠ୍ୟପୁସ୍ତକ ଟାସ୍କ ପାଇଁ କୌଣସି ବ୍ୟାଚ୍ ନାହିଁ ",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "ଏହି ପାଠ୍ୟପୁସ୍ତକ ପଂଜୀକୃତ ବ୍ୟବହାରକାରୀଙ୍କ ପାଇଁ ଅଟେ | ଏହି ପାଠ୍ୟପୁସ୍ତକ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଲଗ୍ ଇନ୍ କରନ୍ତୁ ",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "ଏହି ପାଠ୍ୟପୁସ୍ତକ ପଢ଼ିବା ପାଇଁ ଲଗ୍ ଇନ୍ କରନ୍ତୁ",
+  "TBK_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "ଏହି ଟାସ୍କ ପାଇଁ କୌଣସି ବ୍ୟାଚ୍ ଉପଲବ୍ଧ ନାହିଁ ",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "କେବଳ ପଞ୍ଜୀକୃତ ବ୍ୟବହାରକାରୀମାନେ ଶିକ୍ଷା ଟାସ୍କ ନେଇପାରିବେ",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "ଆପଣ ସଫଳତାର ସହ ଏହି ଟାସ୍କ ଶେଷ କରିଛନ୍ତି",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "ଏହି ଟାସ୍କ ସରିଯାଇଛି । ଆପଣ ମୂଲ୍ୟାୟନ ଆଉଥରେ ଦେଇପାରନ୍ତି, କିନ୍ତୁ ଏଥିରେ ଆପଣଙ୍କ ପ୍ରଗତି ରେକର୍ଡ କରାଯିବ ନାହିଁ ।",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "ଏହି ଟାସ୍କ ସରିଯାଇଛି । ଆପଣ ମୂଲ୍ୟାୟନ ଦେଇପାରନ୍ତି, କିନ୍ତୁ ଏଥିରେ ଆପଣଙ୍କ ପ୍ରଗତି ରେକର୍ଡ କରାଯିବ ନାହିଁ ।",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "ପାଠ୍ୟପୁସ୍ତକ ବିବରଣୀ ଦେଖିବା ପାଇଁ ଓ ତାକୁ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ଏକ ସକ୍ରିୟ ବ୍ୟାଚ୍ ରେ ଯୋଗଦେବାକୁ ପଡିବ",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "ପାଠ୍ୟପୁସ୍ତକ ବିବରଣୀ ପାଇଁ ଆପଣଙ୍କୁ ଲଗ୍ ଇନ୍ କରିବାକୁ ପଡ଼ିବ",
+  "TEACHER_ID_ENTER_LABEL": "ଯାଂଚ କରିବା ପାଇଁ ନିଜ ଶିକ୍ଷକ ID ଦିଅନ୍ତୁ",
+  "TEACHER_ID_PLACEHOLDER": "ଉଦାହରଣ ସ୍ୱରୂପ, ER12345",
+  "TEACHER_ID_VERIFICATION": "ଶିକ୍ଷକ ID ଯାଂଚ",
+  "TEACHER_PROFILE_FAILED": "ଦେଇଥିବା ଶିକ୍ଷକ ID ଭୁଲ୍ ଥିବା ହେତୁ ଆପଣଙ୍କ ପ୍ରୋଫାଇଲ ଯାଞ୍ଚ ହୋଇପାରୁ ନାହିଁ",
+  "TEACHER_PROFILE_VERIFIED": "ଶିକ୍ଷକ ପ୍ରୋଫାଇଲ୍ ସଫଳତାର ସହ ଯାଞ୍ଚ ହେଲା",
+  "TEACHER_ROLE_DESC_1": "ପାଠ୍ୟପୁସ୍ତକ ଓ ଡିଜିଟାଲ କଣ୍ଟେଣ୍ଟ୍ ବ୍ରାଉଜ୍ କରନ୍ତୁ",
+  "TEACHER_ROLE_DESC_2": "ଅନଲାଇନ୍ ପାଠ୍ୟକ୍ରମ ନିଅନ୍ତୁ",
+  "TEACHER_ROLE_DESC_3": "ଲେସନ୍ ପ୍ଲାନ୍ ଦେଖନ୍ତୁ",
+  "TELL_US_MORE": "ଆମକୁ ଅଧିକ ଜଣାନ୍ତୁ...",
+  "TERMS_OF_USE": "ବ୍ୟବହାର ପାଇଁ ସର୍ତ୍ତାବଳୀ",
   "TEXTBOOK": "ପାଠ୍ୟପୁସ୍ତକ",
-  "THANK_FOR_RATING": "ତଥ୍ୟ ରେଟିଂ କରିଥିବାରୁ ଧନ୍ୟବାଦ ",
-  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "  ଏହି ଟ୍ରେନିଂ ପାଇଁ କୌଣସି ବ୍ୟାଚ୍ ଉପଲବ୍ଧ ନାହିଁ | ",
+  "TEXTBOOKS": "ପାଠ୍ୟପୁସ୍ତକ",
+  "THANKING_NOTE": " ଆପଣ ଅନୁରୋଧ କରିଥିବା ପୁସ୍ତକ {{%s}}ରେ ଆପଣ ରାଜ୍ୟ ବୋର୍ଡ ଅପଲୋଡ୍ କରିବା ମାତ୍ରେ ଆମେ ଆପଣଙ୍କୁ ଜଣାଇଦେବୁ ",
+  "THANK_FOR_RATING": "ଏହି କଣ୍ଟେଣ୍ଟକୁ ରେଟିଂ କରିଥିବାରୁ ଧନ୍ୟବାଦ !",
+  "THANK_YOU_FOR_SUBMITTING_YOUR_DETAILS": "ନିଜ ବିବରଣୀ ଦାଖଲ କରିଥିବାରୁ ଧନ୍ୟବାଦ",
+  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "ଏହି ପାଠ୍ୟକ୍ରମ ପାଇଁ କୌଣସି ବ୍ୟାଚ୍ ଉପଲବ୍ଧ ନାହିଁ ",
   "THIS_IS_A_RESTRICTED_COMMUNITY": "ଏହା ଏକ ପ୍ରତିବନ୍ଧିତ କମୁନିଟି ଅଟେ ",
   "TICKET_SUMMARY": "ଟିକେଟ ସାରାଂଶ ",
-  "TIME": "ସମୟ ",
   "TIME_OUT": "ସର୍ଭର ସମୟ ସମାପ୍ତ ହୋଇଗଲା | ପୁଣିଥରେ ପ୍ରୟାସ କରନ୍ତୁ ",
   "TITLE": "ଶିରୋନାମା ",
+  "TITLE_UPGRADE_POPUP": "କଣ୍ଟେଣ୍ଟ୍ ମଧ୍ୟରେ ଗାୟବ ହୋଇଯାଉଥିବା ଚିତ୍ର ଓ ଅଡିଓ ସମସ୍ୟାକୁ ଆମେ ସୁଧାର କରିଛୁ । ଉତ୍ତମ ଅଭିଜ୍ଞତା ପାଇଁ, ଆମେ ସୁପାରିଶ କରୁଛୁ କି ଆପଣ DIKSHA ର ସଦ୍ୟତମ ଭର୍ସନକୁ ଅପଡେଟ୍ କରନ୍ତୁ ।",
   "TNC_BACK_NAVIGATION_MESSAGE": "ଆପଣଙ୍କୁ {{app_name}} ଲଗ୍ ଇନ୍ କରିବାପାଇଁ ନିୟମ ଏବଂ ସର୍ତ୍ତାବଳୀକୁ ସ୍ୱୀକାର କରିବାକୁ ପଡିବ | ଯଦି ଆପଣ ଅତିଥି ଭାବରେ ବ୍ରାଉଜିଂ ଜାରି ରଖିବାକୁ ଚାହୁଁଛନ୍ତି, ତେବେ back ବଟନ୍ କୁ ଟ୍ୟାପ୍ କରନ୍ତୁ  ",
   "TO": "କେଉଁ ପର୍ଯ୍ୟନ୍ତ",
   "TOPICS": " ବିଷୟ",
   "TOPIC_YOU_MIGHT_LIKE": "ରୁଚିଥିବା ବିଷୟକୁ ଅନ୍ୱେଷଣ କରନ୍ତୁ  ",
   "TOTAL_SIZE": "ସମୁଦାୟ ଆକାର :",
-  "TOTAL_TIME": "ମୋଟ୍ ସମୟ ",
   "TO_DO": "କରିବାକୁ ହେବ",
-  "TO_EARN_CERTIFICATE": "ସାର୍ଟିଫିକେଟ୍ ହାସଲ କରିବା ପାଇଁ ",
-  "TRAININGS_ATTENDED": "ଟ୍ରେନିଂରେ ଭାଗନେଇଛନ୍ତି",
-  "TRAININGS_ONLY_REGISTERED_USERS": "କେବଳ ପଂଜିକୃତ ବ୍ୟବହାରକାରୀଙ୍କ ପାଇଁ ଟ୍ରେନିଂ ଉପଲବ୍ଧ",
-  "TRAINING_COMPLETED_SUCCESSFULLY": "ଆପଣ ଏହି ଟ୍ରେନିଂ ସଫଳତାର ସହ ଶେଷ କରିଛନ୍ତି",
-  "TRAINING_DETAILS": "ଟ୍ରେନିଂ ବିବରଣୀ",
-  "TRAINING_ENDS_ON": "ଟ୍ରେନିଂ ଶେଷ ହେବା ତାରିଖ",
-  "TRAINING_END_DATE": "ଟ୍ରେନିଂ ଶେଷ ତାରିଖ",
-  "TRAINING_INFO": "ଟ୍ରେନିଂ ସୂଚନା",
-  "TRAINING_IS_RELEVANT_TO_TEACHERS": "ଟ୍ରେନିଂ ପ୍ରାସଙ୍ଗିକ ଶିକ୍ଷକଙ୍କ ",
-  "TRAINING_MODULES": "ଟ୍ରେନିଂ ମଡ୍ୟୁଲ ସହିତ",
+  "TO_EARN_CERTIFICATE": "ସାର୍ଟିଫିକେଟ୍ ହାସଲ କରିବା ପାଇଁ   {{%s}} ସୁଦ୍ଧା ପାଠ୍ୟକ୍ରମ ଶେଷ କରନ୍ତୁ",
+  "TRAINING": "ପାଠ୍ୟକ୍ରମ",
+  "TRAININGS_ATTENDED": "ଭାଗନେଇଥିବା ପାଠ୍ୟକ୍ରମଗୁଡ଼ିକ",
+  "TRAININGS_ONLY_REGISTERED_USERS": "କେବଳ ପଂଜୀକୃତ ବ୍ୟବହାରକାରୀମାନେ ପାଠ୍ୟକ୍ରମରେ ନାମାଙ୍କନ କରିପାରିବେ",
+  "TRAINING_COMPLETED_SUCCESSFULLY": "ଆପଣ ସଫଳତାର ସହ ଏହି ପାଠ୍ୟକ୍ରମ ଶେଷ କରିଛନ୍ତି",
+  "TRAINING_DETAILS": "ପାଠ୍ୟକ୍ରମ ବିବରଣୀ",
+  "TRAINING_ENDED_REDO_ASSESSMENT": "ଏହି ପାଠ୍ୟକ୍ରମ ସରିଯାଇଛି । ଆପଣ ମୂଲ୍ୟାୟନ ଆଉଥରେ ଦେଇପାରନ୍ତି, କିନ୍ତୁ ଏଥିରେ ଆଫଣଙ୍କ ପ୍ରଗତି ରେକର୍ଡ କରାଯିବ ନାହିଁ ।",
+  "TRAINING_ENDED_START_ASSESSMENT": "ଏହି ପାଠ୍ୟକ୍ରମ ସରିଯାଇଛି । ଆପଣ ମୂଲ୍ୟାୟନ ଦେଇପାରିବେ, କିନ୍ତୁ ଏଥିରେ ଆପଣଙ୍କର ପ୍ରଗତି ରେକର୍ଡ କରାଯିବ ନାହିଁ ।",
+  "TRAINING_ENDS_ON": "ପାଠ୍ୟକ୍ରମ ଶେଷ ହେବା ତାରିଖ",
+  "TRAINING_END_DATE": "ପାଠ୍ୟକ୍ରମ ସରିବା ତାରିଖ",
+  "TRAINING_INFO": "ପାଠ୍ୟକ୍ରମ ବିବରଣୀ",
+  "TRAINING_IS_RELEVANT_TO_TEACHERS": "ଏହି ପାଠ୍ୟକ୍ରମ ଏହିମାନଙ୍କ ପାଇଁ ଉଦ୍ଦିଷ୍ଟ:",
+  "TRAINING_MODULES": "ପାଠ୍ୟକ୍ରମ ମଡ୍ୟୁଲ",
   "TRANSFERRING_CONTENT_TO_PHONE": "ଫୋନକୁ ତଥ୍ୟ ସ୍ଥାନାନ୍ତର କରାଯାଉଛି",
   "TRANSFERRING_CONTENT_TO_SDCARD": "ତଥ୍ୟକୁ SD କାର୍ଡକୁ ସ୍ଥାନାନ୍ତରିତ କରାଯାଉଛି",
   "TRANSFERRING_FILES": "ଫାଇଲଗୁଡିକୁ ସ୍ଥାନାନ୍ତର କରାଯାଉଛି",
@@ -533,59 +1091,134 @@
   "TRY_AGAIN": "ପୁଣିଥରେ ପ୍ରୟାସ କରନ୍ତୁ ",
   "TRY_BEFORE_RATING": "ରେଟିଂ କରିବା ପୂର୍ଵରୁ ଦୟାକରି ତଥ୍ୟକୁ ଦେଖିନିଅନ୍ତୁ",
   "TRY_DIFF_QR": "ଅଲଗା ଏକ QR କୋଡ଼ ପ୍ରୟାସ କରନ୍ତୁ ",
+  "TUTORIAL_BUTTON": "ଆରମ୍ଭ କରିବା ପାଇଁ ଏକ ପାଠ୍ୟପୁସ୍ତକ ଚୟନ କରନ୍ତୁ",
+  "TUTORIAL_HEADING": "ଭିଡିଓ, ଇଣ୍ଟରଆକ୍ଟିଭ୍ କଣ୍ଟେଣ୍ଟ୍, ଇ-ପାଠ୍ୟପୁସ୍ତକ ଓ ଆହୁରି ଅନେକ...",
+  "TVC_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "ଆରମ୍ଭ କରିବା ପାଇଁ ଏକ TV କ୍ଲାସ ଚୟନ କରନ୍ତୁ",
+  "TVC_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "TV କ୍ଲାସଗୁଡ଼ିକ",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "TV କ୍ଲାସଗୁଡ଼ିକ",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "TV କ୍ଲାସଗୁଡ଼ିକ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}} ର ଲାଇବ୍ରେରୀରେ ଅନେକ {{%explainVideos}}, {{%quesBanks}} ଓ ଅନ୍ୟ {{%interactiveMaterial}} ରହିଛି । ଲାଇବ୍ରେରୀରେ ଅଧିକ ଦେଖିବା ପାଇଁ ଏକ TV କ୍ଲାସରେ କ୍ଲିକ୍ କରନ୍ତୁ !",
+  "TVC_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) ପାଇଁ କୌଣସି TV କ୍ଲାସ୍ ମିଳୁନାହିଁ ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "ବୋର୍ଡ TV କ୍ଲାସ ଯୋଗ କରୁଛି",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}}ରେ କୌଣସି TV କ୍ଲାସ୍ ପାଇଲେ ନାହିଁ କି ?",
+  "TVC_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>ନୋଟ୍ :</span> ଏହି TV କ୍ଲାସ୍ ପାଇଁ ପ୍ରଗତି ଟ୍ରାକ୍ କରାଯାଇପାରିବ ନାହିଁ ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "ଆପଣ {{%s}}ରେ  ଅନୁରୋଧ କରିଥିବା TV କ୍ଲାସ୍ ଆପଣଙ୍କର ରାଜ୍ୟ ବୋର୍ଡ ଅପଲୋଡ଼୍ କଲେ ଆମେ ଆପଣଙ୍କୁ ଜଣାଇବୁ ",
+  "TVC_NONTRK_QR_CODE_DETAILS": "ଆପଣଙ୍କ TV କ୍ଲାସରୁ ଏକ QR କୋଡ଼୍ ସ୍କାନ୍ କରି ସଙ୍ଗେ ସଙ୍ଗେ ଡିଜିଟାଲ୍ କଣ୍ଟେଣ୍ଟ୍ ଆକ୍ସେସ୍ କରନ୍ତୁ ।",
+  "TVC_NONTRK_SEE_MORE_BOOKS": "ଅଧିକ TV କ୍ଲାସ୍ ଓ କଣ୍ଟେଣ୍ଟ୍ ଦେଖନ୍ତୁ ",
+  "TVC_NONTRK_STUDENT_ROLE_DESC_1": "TV କ୍ଲାସ୍ ଓ ଡିଜିଟାଲ କଣ୍ଟେଣ୍ଟ୍ ବ୍ରାଉଜ୍ କରନ୍ତୁ",
+  "TVC_NONTRK_TEACHER_ROLE_DESC_1": "TV କ୍ଲାସ୍ ଓ ଡିଜିଟାଲ କଣ୍ଟେଣ୍ଟ୍ ବ୍ରାଉଜ୍ କରନ୍ତୁ",
+  "TVC_NONTRK_TUTORIAL_HEADING": "ଭିଡିଓ, ଇଣ୍ଟରଆକ୍ଟିଭ୍ କଣ୍ଟେଣ୍ଟ୍, ଇ-ପାଠ୍ୟପୁସ୍ତକ ଓ ଆହୁରି ଅନେକ...",
+  "TVC_TRK_BATCHEND_MAIN_HEADING": "ଆପଣ ଯେଉଁ TV କ୍ଲାସରେ ଯୋଗ ଦେଇଛନ୍ତି, ତାହା {{%s}}ରେ ଶେଷ ହୋଇଛି ",
+  "TVC_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "ଆପଣ ଏହି ପ୍ରୋଗ୍ରାମ୍ ଶେଷ କରିଛନ୍ତି",
+  "TVC_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "TV କ୍ଲାସଗୁଡ଼ିକ",
+  "TVC_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "ଆପଣ ଏହି TV କ୍ଲାସ୍ ଦେଖି ସାରିଛନ୍ତି ",
+  "TVC_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "TV କ୍ଲାସ୍ ପାଇଁ ଥିବା ବ୍ୟାଚ୍",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "ଟାସ୍କଗୁଡ଼ିକ",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "ମୋ TV କ୍ଲାସଗୁଡ଼ିକ",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "ଏହି ବ୍ୟାଚ୍ ଶେଷ ହେବା ତାରିଖ ହେଉଛି",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "ଶେଷଥର ପାଇଁ {{last_updated_on_date}} ରେ ଅପଡେଟ୍ ହୋଇଥିଲା",
+  "TVC_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "ଲାଟେଷ୍ଟ TV କ୍ଲାସଗୁଡ଼ିକ",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "TV କ୍ଲାସଗୁଡ଼ିକ ({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "TV କ୍ଲାସଗୁଡ଼ିକ ({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "ଲୋକପ୍ରିୟ TV କ୍ଲାସଗୁଡ଼ିକ",
+  "TVC_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "ସାର୍ଟିଫିକେଟ୍ ହାସଲ କରିବା ପାଇଁ   {{%s}} ସୁଦ୍ଧା ଟାସ୍କ ଶେଷ କରନ୍ତୁ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING": "ଶିକ୍ଷଣ ଟାସ୍କ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "ଭାଗ ନେଇଥିବା ଶିକ୍ଷା ଟାସ୍କ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "TV କ୍ଲାସ୍ ବିବରଣୀ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "ଟାସ୍କ ଶେଷ ହେବା ତାରିଖ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "ଟାସ୍କ ସରିବା ତାରିଖ ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "ଟାସ୍କ ବିବରଣୀ ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "ଏହି ଟାସ୍କ ଏହିମାନଙ୍କ ପାଇଁ ଉଦ୍ଦିଷ୍ଟ:",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "TV କାର୍ଯ୍ୟକ୍ରମ",
+  "TVC_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "TV କ୍ଲାସ୍ ଦେଖିବା ବନ୍ଦ କରନ୍ତୁ ",
+  "TVC_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "TV କ୍ଲାସ୍ ଶିକ୍ଷା ଦେଖିବାକୁ ଚାହୁଁଛନ୍ତି କି ?",
+  "TVC_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "ଏହି TV କ୍ଲାସ୍ ପାଇଁ ବ୍ୟାଚ୍ {{batch_start_date}} ରୁ ଉପଲବ୍ଧ ହେଉଛି",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "7 ଦିନ ମଧ୍ୟରେ ସାର୍ଟିଫିକେଟ୍ ବିଷୟରେ ଆପଣଙ୍କୁ ଆପଣଙ୍କ ପଂଜୀକୃତ ଯୋଗାଯୋଗ ମାଧ୍ୟମରେ ସୂଚୀତ କରାଯିବ ",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "ନୋଟ୍: ଏହି ଟାସ୍କରେ ସାର୍ଟିଫିକେଟ୍ ନାହିଁ",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "ଆପଣ ଏହି TV କ୍ଲାସ୍ ଦେଖି ସାରିଛନ୍ତି ",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "ନୋଟ୍: ଏବେ ଏହି ଟାସ୍କରେ ସାର୍ଟିଫିକେଟ୍ ନାହିଁ । ପରେ ପ୍ରସ୍ତୁତକର୍ତ୍ତା ସାର୍ଟିଫିକେଟ ଯୋଗ କରିପାରନ୍ତି ।",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "ଆପଣ TV କ୍ଲାସ୍ ଦେଖିବା ବନ୍ଦ କରିଛନ୍ତି ",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "TV କ୍ଲାସ୍ ପଂଜୀକୃତ ବ୍ୟବହାରୀଙ୍କ ପାଇଁ ଉଦ୍ଦିଷ୍ଟ । TV କ୍ଲାସ୍ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଲଗ୍ ଇନ୍ କରନ୍ତୁ ",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "ଏହି TV କ୍ଲାସ୍ ଦେଖିବା ପାଇଁ ଲଗ୍ ଇନ୍ କରନ୍ତୁ ",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "କେବଳ ପଞ୍ଜୀକୃତ ବ୍ୟବହାରକାରୀମାନେ ଶିକ୍ଷା ଟାସ୍କ ନେଇପାରିବେ",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "ଆପଣ ସଫଳତାର ସହ ଏହି ଟାସ୍କ ଶେଷ କରିଛନ୍ତି",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "ଏହି ଟାସ୍କ ସରିଯାଇଛି । ଆପଣ ମୂଲ୍ୟାୟନ ଆଉଥରେ ଦେଇପାରନ୍ତି, କିନ୍ତୁ ଏଥିରେ ଆଫଣଙ୍କ ପ୍ରଗତି ରେକର୍ଡ କରାଯିବ ନାହିଁ ।",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "ଏହି ଟାସ୍କ ସରିଯାଇଛି । ଆପଣ ମୂଲ୍ୟାୟନ ଦେଇପାରନ୍ତି, କିନ୍ତୁ ଏଥିରେ ଆପଣଙ୍କ ପ୍ରଗତି ରେକର୍ଡ କରାଯିବ ନାହିଁ ।",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "TV କ୍ଲାସଗୁଡ଼ିକୁ ଦେଖିବା ପାଇଁ ଓ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ଏକ ସକ୍ରିୟ ବ୍ୟାଚରେ ଯୋଗ ଦେବାକୁ ପଡ଼ିବ",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "TV କ୍ଲାସ୍ ବିବରଣୀ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ଲଗ୍ ଇନ୍ କରିବାକୁ ପଡ଼ିବ",
   "UNABLE_TO_FETCH_CONTENT": "ଚାଲିଯାଇଥିବା ତଥ୍ୟ ଆଣିବାରେ ଅସମର୍ଥ ",
-  "UNENROLL_CONFIRMATION_MESSAGE": "ଆପଣ ଏହି ଟ୍ରେନିଂ ଛାଡିବା ପାଇଁ ଚାହୁଁଛନ୍ତି କି ?",
-  "UNENROLL_FROM_COURSE": "ଟ୍ରେନିଂ ଛାଡିଦିଅନ୍ତୁ",
+  "UNENROLL_CONFIRMATION_MESSAGE": "ଆପଣ ପରେ ଏକ ସକ୍ରିୟ କିମ୍ବା ଭବିଷ୍ୟତର ବ୍ୟାଚରେ ଆଉଥରେ ଯୋଗ ଦେଇପାରିବେ",
+  "UNENROLL_FROM_COURSE": "ପାଠ୍ୟକ୍ରମ ଛାଡିବେ",
   "UNIT_COMING_SOON": "ଶୀଘ୍ର ଆସୁଅଛି !",
   "UNKNOWN_QR": "ଆପଣ ଏକ ଅନୁପଯୁକ୍ତ QR କୋଡ଼ରେ ସ୍କାନ କଲାଭଳି ଜଣାପଡୁଛି",
   "UNSELECT_ALL": "ସବୁହଗୁଡିକୁ ଅନସିଲେକ୍ଟ କରନ୍ତୁ",
   "UPDATE": "ଅପଡେଟ କରନ୍ତୁ ",
   "UPDATE_APP_BTN_ACTION_NO": "ପରେ ଅପଡେଟ୍ କରନ୍ତୁ ",
   "UPDATE_APP_BTN_ACTION_YES": "ବର୍ତ୍ତମାନ ଅପଡେଟ କରନ୍ତୁ |",
+  "UPDATE_APP_SUPPORT_TITLE": "ଆପଣ {{app_name}} ଆପର ଏକ ପୁରୁଣା ଭର୍ସନ ବ୍ୟବହାର କରୁଛନ୍ତି । ଏହି କଣ୍ଟେଣ୍ଟ୍ ବ୍ୟବହାର କରିବା ପାଇଁ ସଦ୍ୟତମ ଆପକୁ ଅପଡେଟ୍ କରନ୍ତୁ ।",
   "UPDATE_APP_TITLE": "ଆପର ନୂଆ ସଂସ୍କରଣ ଉପଲବ୍ଧ ଅଛି  ",
   "UPDATE_CONFIRMATION_TEXT": "ତଥ୍ୟ ଅପଡେଟ କରନ୍ତୁ ?",
   "UPDATE_CONTENT": "ତଥ୍ୟ ଅପଡେଟ କରନ୍ତୁ ({{%s}})",
-  "UPDATE_RECOVERY_ID": "ରିକୋଭରି ଆକାଉଣ୍ଟକୁ ରିକୋଭର କରନ୍ତୁ",
+  "UPDATE_DETAILS": "ବିବରଣୀ ଅପଡେଟ୍ କରନ୍ତୁ",
+  "UPDATE_RECOVERY_ID": "ରିକଭରି ଆକାଉଣ୍ଟ ଅପଡ଼େଟ୍ କରନ୍ତୁ",
+  "UPDATE_REQUIRED": "ଅପଡେଟ୍ ଆବଶ୍ୟକ ଅଟେ",
+  "UPDATE_YOUR_PREFERENCE_FROM_PROFILE": "ପ୍ରୋଫାଇଲ୍ ସେଟିଙ୍ଗରୁ ଆପଣ ନିଜର {{app_name}} ପ୍ରୋଫାଇଲ୍ ବିବରଣୀ ଏଡିଟ୍ କରିପାରିବେ",
   "UPDATING": "ଅପଡେଟ୍ କରିବା",
   "UPDATING_CONTENT": "ଅପଡେଟ୍ ହେଉଛି . . . {{%s}}",
-  "USER": "ବ୍ୟବହାରକାରୀ",
   "USERNAME": "ବ୍ୟବହାରକାରୀଙ୍କ ନାମ :{{%s}}",
-  "USERS": "ବ୍ୟବହାରକାରୀ",
-  "USERS_AND_GROUPS": "ବ୍ୟବହାରକାରୀ ଓ ଗ୍ରୁପ୍",
   "USER_CREATED_SUCCESSFULLY": "ସଫଳତାର ସହ ବ୍ୟବହାରକାରୀ ସୃଷ୍ଟି ହେଲା",
-  "USER_DELETE_CONFIRM": "'{{%s}}' ଡିଲିଟ୍ କରିବା ପାଇଁ ନିଶ୍ଚିତ ?",
-  "USER_DELETE_CONFIRM_MESSAGE": "ଏହା ଅପଭିବର୍ତ୍ତନୀୟ ଅଟେ ,ଥରେ ଡିଲିଟ୍ ହେବା ପରେ ବ୍ୟବହାରକାରୀଙ୍କ ବିବରଣୀ ଉପଲବ୍ଧ ହେବନାହିଁ ",
-  "USER_DELETE_CONFIRM_MESSAGE_FROM_GROUP": "'{{%s}}'ହଟାଇବା ପାଇଁ ନିଶ୍ଚିତ ?",
-  "USER_DELETE_CONFIRM_SECOND_MESSAGE": "ଏହି କାର୍ଯ୍ୟ  ଗ୍ରୁପରୁ ବ୍ୟବହାରକାରୀମାନଙ୍କୁ ହଟାଇଦେବ | ୟୁଜର ଟ୍ୟାବ ରେ ସମସ୍ତ ବ୍ୟବହାରକାରୀଙ୍କ ବିବରଣୀ ଉପଲବ୍ଧ",
   "USER_ID": "ବ୍ୟବହାରକାରୀ ଆଇଡି",
+  "USER_IS_NOT_VERIFIED": "ଆପଣଙ୍କର ବ୍ୟବହାରକାରୀ ID ଯାଂଚ ହୋଇନାହିଁ",
   "USER_NAME": "ବ୍ୟବହାରକାରୀଙ୍କ ନାମ ",
   "USER_TYPE": "ବ୍ୟବହାରକାରୀଙ୍କ ପ୍ରକାର ",
   "USER_TYPE_1": "ଶିକ୍ଷକ ",
   "USER_TYPE_2": "ଛାତ୍ର ଛାତ୍ରୀ ",
+  "USER_TYPE_3": "ଅନ୍ୟ",
+  "USER_TYPE_5": "ପିତାମାତା",
   "USER_TYPE_SELECT_WARNING": "ବ୍ୟବହାରକାରୀଙ୍କ ପ୍ରକାର ଚୟନ କରନ୍ତୁ",
+  "USER_VERIFICATION": "ବ୍ୟବହାରକାରୀ ଯାଂଚ",
+  "USE_APP_AS": "{{%s}} ଙ୍କୁ ଏହିପରି ବ୍ୟବହାର କରନ୍ତୁ",
+  "VALIDATION_MAXIMUM_LENGTH": "ସର୍ବାଧିକ 11ଟି ଅଙ୍କ ରହିବା ଉଚିତ୍",
+  "VALIDATION_MINIMUM_LENGTH": "ସର୍ବନିମ୍ନ 11ଟି ଅଙ୍କ ରହିବା ଉଚିତ୍",
+  "VERIFY": "ଯାଂଚ୍ କରନ୍ତୁ",
   "VERIFY_EMAIL_OTP_DESCRIPTION": "ଆପଣଙ୍କ ଇ-ମେଲ ଯାଞ୍ଚ କରିବାପାଇଁ  ସେହି ଇମେଲରେ ଏକ ଓଟିପି ପାଇବେ",
   "VERIFY_EMAIL_OTP_TITLE": "Email ଆଇଡି ଯାଞ୍ଚ କରନ୍ତୁ  ",
   "VERIFY_PHONE_OTP_DESCRIPTION": "ମୋବାଇଲ ନମ୍ବର ଯାଞ୍ଚ ପାଇଁ ଆପଣଙ୍କ ନମ୍ବରକୁ  OTP ଥିବା ଏକ SMS ଆସିବ",
   "VERIFY_PHONE_OTP_TITLE": "ମୋବାଇଲ ନମ୍ବର ଯାଞ୍ଚ କରନ୍ତୁ ",
   "VERSION": "ସଂସ୍କରଣ ",
-  "VIDEOS": "ଭିଡିଓ ",
+  "VERYFYING_PLEASE_WAIT": "ଯାଞ୍ଚ କରୁଛି",
+  "VIDEO": "ଭିଡିଓ ",
   "VIEW": "ଭିଉ",
+  "VIEW_ACTIVITY": "ଆକ୍ଟିଭିଟି ଦେଖନ୍ତୁ",
   "VIEW_ALL": "ସବୁ ଦେଖନ୍ତୁ",
   "VIEW_ALL_BATCHES": "ଆଗକୁ ଯିବା ପାଇଁ ଏକ ବ୍ୟାଚ୍ କୁ ଚୟନ କରନ୍ତୁ",
   "VIEW_CREDITS_INFO": "ଲାଇସେନସ ସମ୍ବନ୍ଧୀୟ ତଥ୍ୟ ଦେଖନ୍ତୁ ",
   "VIEW_DOWNLOADS_ONLY_MSG": "କେବଳ ଡାଉନଲୋଡ ଦେଖନ୍ତୁ ",
   "VIEW_MORE": "ଅଧିକ ଦେଖନ୍ତୁ ",
   "VIEW_ONGOING_BATCHES": "ଚାଲୁଥିବା ବ୍ୟାଚ୍",
+  "VIEW_OPEN_BATCHES": "ଖୋଲା ବ୍ୟାଚ ଗୁଡିକ",
   "VIEW_RETIRED_BATCHES": "ସମୟ ସୀମା ସମାପ୍ତ ହୋଇଥିବା ବ୍ୟାଚ୍",
   "VIEW_UPCOMING_BATCHES": "ଆସିବାକୁ ଥିବା ବ୍ୟାଚ୍",
-  "WAITING_TO_DOWNLOAD": "ଡାଉନଲୋଡ଼ ପାଇଁ ଅପେକ୍ଷା\n",
+  "WAITING_TO_DOWNLOAD": "ଡାଉନଲୋଡ଼ ପାଇଁ ଅପେକ୍ଷା",
   "WAIT_REQUEST": "ତଥ୍ୟ ଆସୁଛି",
+  "WANT_TO_CHECK_FREE_TRAININGS": "ପାଠ୍ୟକ୍ରମ ଯାଞ୍ଚ କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି କି ?",
   "WARNING_PLEASE_MAKE_SOME_CHANGES": "ପରିବର୍ତ୍ତନ କରନ୍ତୁ ",
+  "WEBVIEW_UPDATE_TEXT": "ଏକ ପ୍ରଭାବୀ ଅଭିଜ୍ଞତା ପାଇଁ, Google Play store ରୁ WebView ର ସଦ୍ୟତମ ଭର୍ସନ ଡାଉନଲୋଡ୍ କରନ୍ତୁ ।",
+  "WEEKS_AGO": "{{%s}} ସପ୍ତାହ ପୂର୍ବରୁ ",
+  "WEEK_AGO": "{{%s}} ସପ୍ତାହ ପୂର୍ବରୁ ",
+  "WELCOME": "ସ୍ୱାଗତ",
   "WELCOME_BACK": "ପୁଣିଥରେ ସ୍ୱାଗତ {{%s}}",
+  "WHAT_IS_MEMBER_ID": "ମୁଁ କେଉଁଠାରେ {{app_name}} ID ଦେଖିପାରିବି ?",
+  "YEARS_AGO": "{{%s}} ବର୍ଷ ପୂର୍ବରୁ",
+  "YEAR_AGO": "{{%s}} ବର୍ଷ ପୂର୍ବରୁ",
   "YES": "ହଁ ",
+  "YOUR_ID_FROM_STATE_BOARD_ORG": "ରାଜ୍ୟ/ ବୋର୍ଡ/ ସଂସ୍ଥାରୁ ଆପଣଙ୍କର ID",
+  "YOUR_LOCATION": "ଆପଣଙ୍କର ଅବସ୍ଥିତି",
+  "YOUR_LOCATION_DETAILS": "ଆପଣଙ୍କ ଅବସ୍ଥିତି ସୂଚନା ଆପଣଙ୍କୁ ଉପଯୁକ୍ତ କଣ୍ଟେଣ୍ଟ୍ ଯୋଗାଇବାରେ ଆମକୁ ସାହାଯ୍ୟ କରେ । ଆପଣଙ୍କ ଅବସ୍ଥିତି ଠିକ୍ ଅଛି କି ନାହିଁ ଯାଞ୍ଚ କରନ୍ତୁ, ଅନ୍ୟଥା ଆପଣଙ୍କ ଅବସ୍ଥିତି ଆଉଥରେ ବାଛି ଦାଖଲ କରନ୍ତୁ ।",
   "YOUR_PROGRESS": "ଆପଣଙ୍କ ପ୍ରଗତି:{{%s}}% ",
-  "YOUR_PROGRESS_LABEL": "ଆପଣଙ୍କର ପ୍ରଗତି",
+  "YOUR_PROGRESS_LABEL": "ଆପଣଙ୍କ ପ୍ରଗତି ",
   "YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET": "ଆପଣ ଇଣ୍ଟରନେଟ ସହ ସଂଯୁକ୍ତ ନାହାନ୍ତି |",
-  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "ଟ୍ରେନିଂ ବିବରଣୀ ଦେଖିବା ପାଇଁ ଓ ତାକୁ ଉପଯୋଗ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ଏକ ସକ୍ରିୟ ବ୍ୟାଚ୍ ରେ ଯୋଗ ଦେବାକୁ ପଡିବ",
-  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "ଟ୍ରେନିଂ ବିବରଣୀ ପାଇଁ ଆପଣଙ୍କୁ ଲଗ୍ ଇନ୍ କରିବାକୁ ହେବ"
+  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "ପାଠ୍ୟକ୍ରମ ବିବରଣୀ ଦେଖିବା ପାଇଁ ଓ ତାକୁ ଉପଯୋଗ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ଏକ ସକ୍ରିୟ ବ୍ୟାଚ୍ ରେ ଯୋଗଦେବାକୁ ପଡିବ",
+  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "ପାଠ୍ୟକ୍ରମ ବିବରଣୀ ପାଇଁ ଆପଣଙ୍କୁ ଲଗ୍ ଇନ୍ କରିବାକୁ ପଡ଼ିବ",
+  "YOU_MUST_LOGIN_TO_ACCESS_QUIZ_CONTENT": "ଏହି କଣ୍ଟେଣ୍ଟ୍ ଦେଖିବା ପାଇଁ ଆପଣ ଲଗଇନ୍ କରିବା ଉଚିତ୍"
 }
\ No newline at end of file
diff --git a/src/assets/i18n/pa.json b/src/assets/i18n/pa.json
index d74496741..857045be5 100644
--- a/src/assets/i18n/pa.json
+++ b/src/assets/i18n/pa.json
@@ -8,22 +8,46 @@
   "ACCOUNT_MERGE_FAILED": "ਖਾਤਾ ਮਿਲਾਉਨ ਵਿਚ ਅਸਫਲ",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_CONTENT": "ਖਾਤਾ ਮਿਲਾਉਣਾ ਸਫਲਤਾਪੂਰਵਕ ਆਰੰਭ ਹੋ ਗਿਆ ਹੈ । ਪੂਰਾ ਹੋ ਜਾਣ 'ਤੇ ਤੁਹਾਨੂੰ ਸੂਚਿਤ ਕੀਤਾ ਜਾਵੇਗਾ।",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_HEADING": "ਖਾਤਾ ਮਿਲਾਓ",
-  "ACCURACY": "ਸ਼ੁੱਧਤਾ",
   "ACTIVE": "ਕਿਰਿਆਸ਼ੀਲ",
   "ACTIVE_DOWNLOADS": "ਕਿਰਿਆਸ਼ੀਲ ਡਾਊਨਲੋਡ",
+  "ACTIVITIES": "ਗਤੀਵਿਧੀਆਂ",
+  "ACTIVITIESE_SEARCH_PLACEHOLDER": "ਸਮੂਹ ਦੀਆਂ ਗਤੀਵਿਧੀਆਂ ਦੀ ਭਾਲ ਕਰੋ",
+  "ACTIVITY_ALREADY_ADDED_IN_GROUP": "ਤੁਸੀਂ ਪਹਿਲਾਂ ਇਸ ਗਤੀਵਿਧੀ ਨੂੰ ਸਮੂਹ ਲਈ ਸ਼ਾਮਲ ਕੀਤਾ ਹੈ",
+  "ACTIVITY_COLLECTION_TITLE": "ਸੰਗ੍ਰਹਿ",
+  "ACTIVITY_COURSE_TITLE": "ਕੋਰਸਿਸ",
+  "ACTIVITY_EXPLANATION_CONTENT_TITLE": "ਵਿਆਖਿਆ ਕੰਟੇਂਟ",
+  "ACTIVITY_PRACTICE_QUESTION_SET_TITLE": "ਅਭਿਆਸ ਪ੍ਰਸ਼ਨ ਸੈੱਟ",
+  "ACTIVITY_PRACTICE_RESOURCE_TITLE": "ਅਭਿਆਸ ਸਰੋਤ",
+  "ACTIVITY_RESOURCE_TITLE": "ਸਰੋਤ",
+  "ACTIVITY_TEXTBOOK_TITLE": "ਪਾਠ ਪੁਸਤਕ",
+  "ACTIVITY_TV_EPISODE_TITLE": "ਟੀਵੀ ਐਪੀਸੋਡ",
   "ADD": "ਜੋੜੋ",
+  "ADD_ACTIVITY": "ਗਤੀਵਿਧੀ ਸ਼ਾਮਲ ਕਰੋ",
+  "ADD_ACTIVITY_ERROR_MSG": "ਗਤੀਵਿਧੀ ਨੂੰ ਸ਼ਾਮਲ ਨਹੀਂ ਕਰ ਸਕਿਆ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ",
+  "ADD_ACTIVITY_SUCCESS_MSG": "ਗਤੀਵਿਧੀ ਸਫ਼ਲਤਾਪੂਰਵਕ ਸ਼ਾਮਲ ਕੀਤੀ ਗਈ",
+  "ADD_ANOTHER_USER": "ਹੋਰ ਉਪਭੋਗਤਾ ਸ਼ਾਮਲ ਕਰੋ",
   "ADD_DISTRICT": "ਜ਼ਿਲ੍ਹਾ ਸ਼ਾਮਲ ਕਰੋ",
+  "ADD_EDIT_SELF_DECLARED_TEACHER_INFO": "ਇਹ ਵੇਰਵੇ ਤੁਹਾਡੇ ਘੋਸ਼ਿਤ ਰਾਜ ਨੂੰ ਪ੍ਰਮਾਣਤ ਕਰਨ ਅਤੇ ਪ੍ਰਗਤੀ ਦੀ ਪਾਲਣਾ ਕਰਨ ਲਈ ਉਪਲੱਬਧ ਕਰਵਾਏ ਜਾ ਸਕਦੇ ਹਨ",
   "ADD_EMAIL": "ਈਮੇਲ ਪਤਾ ਸ਼ਾਮਲ ਕਰੋ",
+  "ADD_MEMBER": "ਮੈਂਬਰ ਸ਼ਾਮਲ ਕਰੋ",
+  "ADD_MEMBER_CONFIRMATION": "ਤੁਹਾਨੂੰ ਅੱਗੇ ਵਧਣ ਤੋਂ ਪਹਿਲਾਂ ਜਾਂਚ ਕਰਨੀ ਪਏਗੀ ਕਿ ਮੈਂਬਰ ਦਾ ਨਾਮ ਅਤੇ {{app_name}} ID ਮੇਲ ਖਾਂਦੀ ਹੋਵੇ",
+  "ADD_MEMBER_POPUP_DESC": "ਮੈਂਬਰਾਂ ਨੂੰ ਉਨ੍ਹਾਂ ਦੀ ਵਿਲੱਖਣ {{%s}} ID ਦੀ ਪਛਾਣ ਕਰਨ ਲਈ ਮਾਰਗ ਦਰਸ਼ਨ ਕਰਨ ਲਈ ਹੇਠਾਂ ਦਿੱਤੀਆਂ ਹਦਾਇਤਾਂ ਦੀ ਵਰਤੋਂ ਕਰੋ",
+  "ADD_MEMBER_POPUP_STEP_1": "<span>Step 1</span> : ਪ੍ਰੋਫਾਈਲ ਟੈਬ 'ਤੇ ਕਲਿਕ ਕਰੋ",
+  "ADD_MEMBER_POPUP_STEP_2": "<span>Step 2</span> : ਆਪਣੀ {{%s}} ID ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਸ਼ੇਅਰ ਆਈਕਨ 'ਤੇ ਕਲਿਕ ਕਰੋ",
+  "ADD_MEMBER_POPUP_TITLE": "ਮੈਂ {{%s}} ID ਕਿੱਥੇ ਵੇਖ ਸਕਦਾ ਹਾਂ?",
   "ADD_PHONE": "ਫੋਨ ਨੰਬਰ ਸ਼ਾਮਲ ਕਰੋ",
   "ADD_RECOVERY_ACCOUNT": "ਖਾਤਾ ਰਿਕਵਰੀ ਸ਼ਾਮਲ ਕਰੋ",
   "ADD_RECOVERY_ID": "ਰਿਕਵਰੀ ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ",
   "ADD_STATE": "ਰਾਜ ਸ਼ਾਮਲ ਕਰੋ",
+  "ADD_TO_GROUP": "ਸਮੂਹ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ",
+  "ADD_TO_GROUP_ACTIVITY": "ਸਮੂਹ ਲਈ ਸ਼ਾਮਲ ਕਰੋ",
+  "ADD_USER": "ਉਪਭੋਗਤਾ ਸ਼ਾਮਲ ਕਰੋ",
   "ADD_USERS": "ਉਪਭੋਗਤਾ ਜੋੜੋ",
-  "ADD_USERS_TO_GROUP": "{{%s}} ਉਪਭੋਗਤਾ ਨੂੰ ਸਮੂਹ ਵਿੱਚ ਜੋੜੋ",
+  "AGREE_TO_SHARE_PROFILE_DETAILS": "ਦੇ ਅਨੁਸਾਰ ਮੈਂ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਵੇਰਵਿਆਂ ਨੂੰ ਕੋਰਸ ਦੇ ਪ੍ਰਬੰਧਕ ਨਾਲ ਸਾਂਝਾ ਕਰਨ ਲਈ ਸਹਿਮਤ ਹਾਂ",
   "ALL": "ਸਭ",
   "ALLOW": "ਦੀ ਇਜਾਜ਼ਤ",
   "ALL_ANNOUNCEMENTS": "ਸਾਰੇ ਐਲਾਨ",
-  "ALREADY_ENROLLED_COURSE": "ਤੁਸੀ ਪਹਿਲਾਂ ਹੀ ਇਸ ਕੋਰਸ ਲਈ ਦਾਖਲ ਹੋ",
+  "ALREADY_ENROLLED_COURSE": "ਤੁਸੀਂ ਇਸ ਕੋਰਸ ਲਈ ਦਾਖਲਾ ਲਿਆ ਹੈ",
   "ALWAYS_ON": "ਹਮੇਸ਼ਾਂ ਜਾਰੀ ਰੱਖੋ",
   "ANDROID_NOT_SUPPORTED": "ਐਂਡਰੌਇਡ ਸੰਸਕਰਣ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈੈ",
   "ANDROID_NOT_SUPPORTED_DESC": "ਇਹ ਸਮੱਗਰੀ ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਕਿਉਂਕਿ ਤੁਹਾਡਾ ਫੋਨ ਐਨ੍ਡ੍ਰੌਇਡ ਦੇ ਬਹੁਤ ਪੁਰਾਣੇ ਸੰਸਕਰਣ ਤੇ ਚੱਲ ਰਿਹਾ ਹੈ। ਤੁਹਾਡੇ ਡਿਵਾਈਸ ਦੇ ਮਾਡਲ ਦੇ ਅਧਾਰ ਤੇ ਤੁਸੀਂ ਇਸ ਸਮਗਰੀ ਨੂੰ ਵੇਖਣ ਦੇ ਯੋਗ ਹੋ ਸਕਦੇ ਹੋ, ਜੇ ਤੁਹਾਡੇ ਕੋਲ ਕ੍ਰਾਸਵਾਕ ਹੈ",
@@ -31,20 +55,21 @@
   "ANSWER": "ਜਵਾਬ",
   "APPLY": "ਲਾਗੂ ਕਰੋ",
   "APPLY_FILTER": "ਫਿਲਟਰ ਲਾਗੂ ਕਰੋ",
-  "APP_QR_CODE": "ਕੀ ਤੁਸੀਂ ਇੱਕ {{%s}} QR ਕੋਡ ਵੇਖਦੇ ਹੋ?",
+  "APP_ID": "{{%s}} ID",
+  "APP_QR_CODE": "ਕੀ ਇੱਕ {{%s}} QR ਕੋਡ ਹੈ?",
   "APP_RATING_RATE_EXPERIENCE": "ਆਪਣੇ ਐਪ ਅਨੁਭਵ ਨੂੰ ਦਰਜਾ ਦਿਓ",
-  "APP_RATING_RATE_ON_PLAYSTORE": "ਕੀ ਤੁਸੀਂ ਆਪਣੀ ਰੇਟਿੰਗ ਨੂੰ ਪਲੇ ਸਟੋਰ ਤੇ ਜਮ੍ਹਾਂ ਕਰਨੀ ਚਾਹੋਗੇ?",
+  "APP_RATING_RATE_ON_PLAYSTORE": "ਕੀ ਤੁਸੀਂ ਆਪਣੀ ਰੇਟਿੰਗ ਪਲੇ ਸਟੋਰ ’ਤੇ ਜਮ੍ਹਾਂ ਕਰਨੀ ਚਾਹੋਗੇ?",
   "APP_RATING_REPORT_AN_ISSUE": "ਸਾਨੂੰ ਅਫਸੋਸ ਹੈ ਕਿ ਤੁਹਾਨੂੰ ਬੁਰਾ ਅਨੁਭਵ ਹੈ. ਕੀ ਤੁਸੀਂ ਕਿਸੇ ਮੁੱਦੇ ਦੀ ਰਿਪੋਰਟ ਕਰਨਾ ਚਾਹੋਗੇ?",
-  "APP_RATING_TAP_ON_STARS": "ਪਲੇ ਸਟੋਰ ਤੇ ਰੇਟ ਕਰਨ ਲਈ ਸਿਤਾਰਿਆਂ ਨੂੰ ਟੈਪ ਕਰੋ",
+  "APP_RATING_TAP_ON_STARS": "ਪਲੇ ਸਟੋਰ ’ਤੇ ਦਰਜਾ ਦੇਣ ਲਈ ਸਿਤਾਰਿਆਂ ਨੂੰ ਟੈਪ ਕਰੋ",
   "APP_RATING_THANKS_FOR_RATING": "ਆਪਣੇ ਤਜ਼ਰਬੇ ਨੂੰ ਦਰਜਾ ਦੇਣ ਲਈ ਧੰਨਵਾਦ!\n",
-  "APP_TITLE": "ਜੀ ਆਇਆਂ ਨੂੰ {{%s}} ਜੀ!",
+  "APP_TITLE": "{{%s}} ਵਿਚ ਤੁਹਾਡਾ ਸਵਾਗਤ ਹੈ!",
   "APP_VERSION": "ਐਪ ਸੰਸਕਰਣ",
   "ARE_YOU_STATE_TEACHER": "ਕੀ ਤੁਸੀਂ  {{%s}} ਵਿੱਚ ਸਰਕਾਰੀ ਸਕੂਲ ਦੇ ਅਧਿਆਪਕ ਹੋ",
   "AS_FILE": "ਫਾਇਲ ਦੇ ਰੂਪ ਵਿੱਚ",
   "AS_LINK": "ਲਿੰਕ ਦੇ ਤੌਰ ਤੇ",
   "ATTACHMENT_DOWNLOADED": "ਨੱਥੀ ਡਾਊਨਲੋਡ ਕੀਤੀ ਗਈ",
   "ATTRIBUTIONS": "ਗੁਣ",
-  "AUDIOS": "ਆਡੀਓ",
+  "AUDIO": "ਆਡੀਓ",
   "AUTHOR": "ਲੇਖਕ",
   "AUTOMATIC_SYNC": "ਆਟੋਮੈਟਿਕ ਡਾਟਾ ਸਿੰਕ",
   "AUTO_MIGRATION_FAIL_MESSAGE": "ਖਾਤੇ ਨੂੰ ਮਿਲਾ ਨਹੀਂ ਸਕਿਆ",
@@ -53,28 +78,24 @@
   "AVAILABLE_FILTERS": "ਉਪਲੱਬਧ ਫਿਲਟਰ",
   "AVAILABLE_FOR_TEACHERS": "ਸਿਰਫ਼ ਅਧਿਆਪਕਾਂ ਲਈ ਉਪੱਲਬਧ ਹੈ",
   "AVATAR": "ਅਵਤਾਰ",
-  "AVERAGE_SCORE": "ਔਸਤ ਸਕੋਰ",
-  "AVERAGE_TIME": "ਔਸਤ ਸਮਾਂ",
   "BACK_TO_EXIT": "ਐਪ ਤੋਂ ਬਾਹਰ ਆਓ?",
-  "BATCHEND_MAIN_HEADING": "ਜਿਸ ਸਮੂਹ ਵਿੱਚ ਤੁਸੀਂ ਸ਼ਾਮਲ ਹੋਏ ਉਸ ਨੇ ਸਿਖਲਾਈ ਪੂਰੀ ਕਰ ਲਈ ਹੈ {{%s}} ",
-  "BATCHEND_SUB_HEADING": "ਤੁਸੀਂ ਸਿਖਲਾਈ ਜਾਰੀ ਰੱਖ ਸਕਦੇ ਹੋ, ਪਰ ਤੁਹਾਡੀ ਤਰੱਕੀ ਅਪਡੇਟ ਨਹੀਂ ਹੋਵੇਗੀ",
+  "BATCHEND_MAIN_HEADING": "ਤੁਸੀਂ {{%s}} ਉਤੇ ਪੂਰਾ ਕਰ ਚੁੱਕੇ ਕੋਰਸ ਦੇ ਬੈ਼ਚ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋ ਗਏ ਹੋ",
+  "BATCHEND_SUB_HEADING": "ਤੁਸੀਂ ਕੋਰਸ ਜਾਰੀ ਰੱਖ ਸਕਦੇ ਹੋ, ਪਰ ਤੁਹਾਡੀ ਤਰੱਕੀ ਅਪਡੇਟ ਨਹੀਂ ਹੋਵੇਗੀ",
   "BATCHES_AVAILABLE": "ਬੈਚ ਉਪੱਲਬਧ ਹਨ",
-  "BATCHES_FOR_THIS_COURSE": "ਇਸ ਕੋਰਸ ਲਈ ਬੈਂਚ",
+  "BATCHES_FOR_THIS_COURSE": "ਕੋਰਸ ਲਈ ਬੈਚ",
   "BATCH_CREATED_BY": "ਦੁਆਰਾ ਬਣਾਇਆ",
   "BATCH_DETAILS": "ਬੈਚ ਵੇਰਵੇ",
   "BATCH_ENROLLMENT_ENDED": "ਇਸ ਬੈਚ ਲਈ ਦਾਖਲਾ ਬੰਦ ਹੈ",
   "BATCH_EXPIRED": "ਬੈਚ ਦਾ ਅੰਤ ਕੀਤਾ  ਗਿਆ",
   "BATCH_EXPIRED_BUTTON": "ਠੀਕ ਹੈ",
-  "BATCH_EXPIRED_DESCRIPTION": "ਬੈਚ ਦੀ ਮਿਆਦ ਬੰਦ ਹੈ। ਤੁਸੀਂ ਟ੍ਰੇਨਿੰਗ ਕੋਰਸ ਜਾਰੀ ਰੱਖ ਸਕਦੇ ਹੋ।ਹਾਲਾਂਕਿ, ਤੁਹਾਡੀ ਤਰੱਕੀ ਨੂੰ ਹੋਰ ਫਡਿਆਂ  ਜਾਂ ਨਿਗਰਾਨੀ ਨਹੀਂ ਕੀਤੀ ਜਾਵੇਗੀ।",
   "BOARD": "ਬੋਰਡ",
   "BOARD_OPTION_TEXT": "ਬੋਰਡ ਚੁਣੋ",
+  "BROWES_RELEVANT_CONTENT": "ਆਪਣੀ ਪਸੰਦ ਦੇ ਅਧਾਰ ’ਤੇ (ਬੋਰਡ, ਮਾਧਿਅਮ, ਕਲਾਸ) ਢੁੱਕਵੇਂ ਕੰਟੇਂਟ ਲੱਭਣ ਲਈ {{app_name}} ਲਾਇਬ੍ਰੇਰੀ ਨੂੰ ਬਰਾਊਜ਼ ਕਰੋ",
   "BTN_CLICK_TO_OPEN_CONTENT": "ਸਮੱਗਰੀ ਨੂੰ ਵੇਖਣ ਲਈ ਟੈਪ ਕਰੋ",
   "BTN_LATER": "ਬਾਅਦ ਵਿੱਚ",
-  "BTN_RATE_ON_PLAYSTORE": "ਸਾਨੂੰ ਪਲੇ ਸਟੋਰ  ਤੇ ਰੇਟ ਕਰੋ",
+  "BTN_RATE_ON_PLAYSTORE": "ਸਾਨੂੰ ਪਲੇ ਸਟੋਰ 'ਤੇ ਦਰਜਾ ਦਿਓ",
   "BTN_SUBMIT": "ਜਮ੍ਹਾਂ ਕਰੋ",
   "BTN_VISIT_HELP_SECTION": "ਸਹਾਇਤਾ ਭਾਗ ਤੇ ਜਾਓ",
-  "BY_QUESTIONS": "ਸਵਾਲਾਂ ਦੁਆਰਾ",
-  "BY_USERS": "ਉਪਭੋਗਤਾ ਦੁਆਰਾ",
   "CAMERA": "ਕੈਮਰਾ",
   "CAMERA_PERMISSION_DESCRIPTION": "{{%s}}QR ਕੋਡ ਸਕੈਨ ਕਰਨ ਲਈ ਕੈਮਰਾ ਅਨੁਮਤੀਆਂ ਦੀ ਵਰਤੋਂ ਕਰਦਾ ਹੈ",
   "CANCEL": "ਰੱਦ ਕਰੋ",
@@ -84,40 +105,51 @@
   "CANCEL_DOWNLOAD": "ਡਾਊਨਲੋਡ ਰੱਦ ਕਰੋ",
   "CANCEL_DOWNLOAD_MESSAGE": "ਡਾਊਨਲੋਡ ਨੂੰ ਰੱਦ ਕਰਣ ਤੇ ਕਿਰਿਆਸ਼ੀਲ ਡਾਊਨਲੋਡ ਸਮੱਗਰੀ ਨੂੰ ਹਟਾ ਦੇਵੇਗਾ",
   "CANCEL_DOWNLOAD_TITLE": "ਕੀ ਡਾਊਨਲੋਡ ਰੱਦ ਕਰੀਏ?",
-  "CERTIFIED_TRAINING": "ਪ੍ਰਮਾਣਿਤ ਸਿਖਲਾਈ",
+  "CERTIFICATE_ALREADY_DOWNLOADED": "ਸਰਟੀਫਿਕੇਟ ਪਹਿਲਾਂ ਹੀ ਡਾਊਨਲੋਡ ਕੀਤਾ ਗਿਆ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੇ ਡਾਊਨਲੋਡ ਫੋਲਡਰ ਦੀ ਜਾਂਚ ਕਰੋ",
+  "CERTIFICATE_DOWNLOADED": "ਸਰਟੀਫਿਕੇਟ ਡਾਊਨਲੋਡ ਕੀਤਾ ਗਿਆ ਹੈ",
+  "CERTIFICATE_DOWNLOAD_INFO": "ਸਰਟੀਫਿਕੇਟ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
+  "CERTIFIED_TRAINING": "ਇੱਕ ਸਰਟੀਫਿਕੇਟ ਕਮਾਓ",
   "CHANGE": "ਬਦਲੋ",
   "CHANGE_ROLE": "ਰੋਲ ਬਦਲੋ",
-  "CHANGE_USER": "ਉਪਭੋਗਤਾ ਬਦਲੋ",
+  "CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "ਤੁਸੀਂ ਇਸ ਮੋਡਿਊਲ ਨੂੰ ਪੂਰਾ ਕਰ ਲਿਆ ਹੈ",
+  "CHARACTERS_REMAINING": "{{character_count}} ਅੱਖਰ ਬਾਕੀ",
   "CHECK_FOR_UPDATES": "ਅੱਪਡੇਟ ਲਈ ਪੜਤਾਲ ਕਰੋ ",
   "CHOOSE_FROM_FOLLOWING": "ਹੇਠ ਲਿਖੇ ਵਿੱਚੋਂ ਚੁਣੋ",
   "CHOOSE_LANGUAGE": "ਆਪਣੀ ਪਸੰਦ ਦੀ ਭਾਸ਼ਾ ਚੁਣੋ",
+  "CHOOSE_USER": "ਉਪਭੋਗਤਾ ਚੁਣੋ",
   "CHOOSE_WHERE_TO_SAVE_DATA": " ਡੇਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਥਾਂ ਚੁਨੋਂ",
   "CLASS": "ਜਮਾਤ",
   "CLASSES": "ਕਲਾਸਾਂ",
   "CLEAR": "ਸਾਫ",
   "COACH_SCREEN": "QR ਕੋਡ ਨੂੰ ਸਕੈਨ ਕਰਨ ਨਾਲ ਤੁਹਾਨੂੰ ਕਂਟੇਂਟ ਦੀ ਦਿਸ਼ਾ ਤੇ ਭੇਜ ਦਿੱਤਾ ਜਾਵੇਗਾ",
   "COMMUNITIES": "ਬਰਾਦਰੀ",
+  "COMPLETED": "ਮੁਕੰਮਲ",
   "COMPLETE_ASSESSMENT_TO_EARN_CERTIFICATE": "ਦੁਆਰਾ ਮੁਕੰਮਲ ਮੁਲਾਂਕਣ {{%s}}",
-  "COMPLETE_BY": "ਦੁਆਰਾ ਪੂਰਾ ਕੀਤਾ ਗਿਆ {{%s}}",
-  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "ਸਿਖਲਾਈ ਪੂਰੀ ਕੀਤੀ {{%s}}",
+  "COMPLETE_BY": "{{%s}} ਤੱਕ ਪੂਰਾ ਕੀਤਾ ਗਿਆ",
+  "COMPLETE_CHAPTER_TO_UNLOCK_ACHIEVEMENT": "ਨਵੀਂ ਪ੍ਰਾਪਤੀ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ {{%s}} ਕੰਟੇਂਟ ਨੂੰ ਪੂਰਾ ਕਰੋ",
+  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} ਤੱਕ ਕੋਰਸ ਪੂਰਾ ਕਰੋ",
   "CONFIRM": "ਪੁਸ਼ਟੀ ਕਰੋ",
+  "CONGRATULATIONS": "ਵਧਾਈਆਂ!",
   "CONNECT_TO_INTERNET_SUGGESTION": "ਇਸ ਸਮੱਗਰੀ ਨੂੰ ਵੇਖਣ ਲਈ ਇੰਟਰਨੈਟ ਨਾਲ ਜੁੜੋ",
   "CONSIDER_DOWNLOAD": "ਸਮੱਗਰੀ ਨੂੰ ਡਾਊਨਲੋਡ ਕਰਨ 'ਤੇ ਵਿਚਾਰ ਕਰੋ",
+  "CONTENTS": "ਕੰਟੇਂਟਸ",
   "CONTENT_ALREADY_EXIST": "ਫਾਇਲ ਪਹਿਲਾਂ ਹੀ ਆਯਾਤ ਕੀਤੀ ਗਈ ਹੈ। ਇੱਕ ਨਵੀਂ ਫਾਈਲ ਚੁਣੋ",
   "CONTENT_ALREADY_EXISTS": "ਟਿਕਾਣਾ ਫੋਲਡਰ ਵਿੱਚ ਸਮਗਰੀ ਮੌਜੂਦ ਹੈ। ਕੀ ਤੁਸੀ ਟਿਕਾਣਾ ਫੋਲਡਰ ਵਿਚ ਸਮੱਗਰੀ ਨੂੰ ਭੇਜਨਾ ਚਾਹੁਂਦੇ ਹੋ?",
   "CONTENT_COMING_SOON": "ਅਸੀਂ ਇਸ ਲਈ ਸਮੱਗਰੀ ਬਣਾ ਰਹੇ ਹਾਂ",
   "CONTENT_COMMING_SOON": "ਸਮੱਗਰੀ ਛੇਤੀ ਹੀ ਉਪਲੱਬਧ ਹੋਵੇਗੀ",
   "CONTENT_CREATED_BY": "ਦੁਆਰਾ",
-  "CONTENT_CREATING": "ਅਸੀਂ ਇਸ ਲਈ ਸਮੱਗਰੀ ਬਣਾ ਰਹੇ ਹਾਂ",
+  "CONTENT_CREATING": "ਅਸੀਂ ਇਸ ਲਈ ਕੰਟੇਂਟ ਬਣਾ ਰਹੇ ਹਾਂ",
   "CONTENT_DELETE": "ਸਮੱਗਰੀ ਨੂੰ ਮਿਟਾਉਣ ਤੋਂ ਜੰਤਰ  ਤੋਂ  ਸਮੱਗਰੀ  ਹੱਟ ਜਾਵੇਗੀ",
   "CONTENT_DELETE_FAILED": "ਸਮਗਰੀ ਨੂੰ ਮਿਟਾਉਣ ਵਿਚ  ਅਸਫਲ",
   "CONTENT_DERIVED_FROM": "ਇਹ ਕੰਟੇਂਟ ਤੋਂ ਲਿਆ ਗਿਆ ਹੈ",
   "CONTENT_IMPORTED": "ਸਫਲਤਾਪੂਰਵਕ ਆਯਾਤ ਕੀਤਾ ਗਿਆ",
   "CONTENT_IMPORTED_FAILED": "ਆਯਾਤ ਅਸਫਲ",
-  "CONTENT_IS_BEEING_ADDED": "ਕੰਟੇਂਟ ਨੂੰ ਸ਼ਾਮਿਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ {{%s}}",
-  "CONTENT_IS_BEING_ADDED": "ਤੁਹਾਡਾ ਰਾਜ ਜਲਦੀ ਹੀ ਇਸ QR ਕੋਡ ਲਈ ਸਮਗਰੀ ਸ਼ਾਮਲ ਕਰੇਗਾ. ਇਹ ਛੇਤੀ ਹੀ ਉਪਲੱਬਧ ਹੋ ਜਾਵੇਗਾ",
+  "CONTENT_IS_BEEING_ADDED": "ਕੰਟੇਂਟ ਨੂੰ  {{content_name}} ਵਿੱਚ ਸ਼ਾਮਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
+  "CONTENT_IS_BEING_ADDED": "ਤੁਹਾਡਾ ਰਾਜ ਜਲਦੀ ਹੀ ਇਸ QR ਕੋਡ ਲਈ ਕੰਟੇਂਟ ਸ਼ਾਮਲ ਕਰੇਗਾ। ਇਹ ਛੇਤੀ ਹੀ ਉਪਲੱਬਧ ਹੋ ਜਾਵੇਗਾ",
   "CONTENT_NOT_AVAILABLE": "ਸਮੱਗਰੀ ਉਪੱਲਬਧ ਨਹੀਂ ਹੈ",
-  "CONTENT_PLAYER_EXIT_PERMISSION": "ਕੀ ਤੁਸੀਂ ਇਸ ਸਮਗਰੀ ਨੂੰ ਛੱਡਣਾ ਚਾਹੁੰਦੇ ਹੋ?",
+  "CONTENT_PLAYER_EXIT_PERMISSION": "ਕੀ ਤੁਸੀਂ ਇਸ ਕੰਟੇਂਟ ਨੂੰ ਛੱਡਣਾ ਚਾਹੋਗੇ?",
+  "CONTENT_PREFERENCE": "ਕੰਟੇੇਂਟ ਤਰਜੀਹ",
+  "CONTENT_PREFERENCE_SELECTION": "ਕੰਟੇੇਂਟ ਤਰਜੀਹ ਚੁਣੋ",
   "CONTENT_RATING_SUB_HEADING": "ਕੰਟੇਂਟ ਨੂੰ ਦਰਜਾਉਣ ਲਈ ਤਾਰਿਆਂ 'ਤੇ ਟੈਪ ਕਰੋ",
   "CONTENT_RETIRED_BY_AUTHOR": "ਇਹ ਸਮੱਗਰੀ ਲੇਖਕ ਦੁਆਰਾ ਹਟਾਈ ਗਈ ਹੈ ਅਤੇ ਇਸ ਲਈ ਕੋਈ ਹੋਰ ਉਪੱਲਬਧ ਨਹੀਂ ਹੈ",
   "CONTENT_SIZE": "ਸਮੱਗਰੀ ਦਾ ਅਕਾਰ",
@@ -125,52 +157,194 @@
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO_PHONE": "ਸਮੱਗਰੀ ਸਫਲਤਾਪੂਰਵਕ ਫੋਨ ਸਟੋਰੇਜ ਵਿੱਚ ਚਲੀ ਗਈ",
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO_SDCARD": "ਸਮੱਗਰੀ ਨੂੰ ਸਫਲਤਾਪੂਰਵਕ SD ਕਾਰਡ ਵਿੱਚ ਭੇਜਿਆ ਗਿਆ",
   "CONTINUE": "ਜਾਰੀ ਰੱਖੋ",
-  "CONTINUE_AS_ROLE": "'{{%s}}' ਜਾਰੀ ਰੱਖੋ",
-  "CONTINUE_NOW": "ਜਾਰੀ ਰੱਖੋ",
+  "CONTINUE_AS_ROLE": "'{{%s}}' ਦੇ ਤੋਰ 'ਤੇ ਜਾਰੀ ਰੱਖੋ",
+  "CONTINUE_LEARNING": "ਜਾਰੀ ਰੱਖੋ",
   "CONTRIBUTIONS": "ਯੋਗਦਾਨ",
   "CONTRIBUTORS": "ਸਹਿਯੋਗੀ",
   "COPYRIGHT": "ਕਾਪੀਰਾਈਟ",
-  "COURSES_BNAV": "ਸਿਖਲਾਈ",
-  "COURSES_IN_PROGRESS": "ਮੇਰੀ ਸਿਖਲਾਈ",
+  "COURSES": "ਕੋਰਸਿਸ",
+  "COURSES_BNAV": "ਕੋਰਸਿਸ",
+  "COURSES_IN_PROGRESS": "ਮੇਰੇ ਕੋਰਸਿਸ",
   "COURSE_COMPLETED_LABEL": "{{%s}}% ਨੂੰ ਪੂਰਾ ਕਰ ਲਿਆ",
-  "COURSE_ENDED": "{{%s}} ਸਿਖਲਾਈ 'ਤੇ ਖਤਮ ਹੋਇਆ",
-  "COURSE_ENDED_ON": "ਕੋਰਸ ਖਤਮ ਹੋਇਆ {{%s}}",
-  "COURSE_ENROLLED": "ਤੁਸੀਂ ਸਿਖਲਾਈ ਵਿਚ ਸ਼ਾਮਲ ਹੋ ਗਏ ਹੋ",
-  "COURSE_NOT_AVAILABLE": "ਇਹ ਕੋਰਸ ਹੁਣ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਹੈ",
+  "COURSE_COMPLETION_POPUP_DESC": "ਤੁਹਾਨੂੰ ਕੋਰਸ ਸਰਟੀਫਿਕੇਟ ਬਾਰੇ ਤੁਹਾਡੇ ਰਜਿਸਟਰਡ ਸੰਪਰਕ ਵੇਰਵਿਆਂ 'ਤੇ 7 ਦਿਨਾਂ ਦੇ ਅੰਦਰ ਸੂਚਿਤ ਕੀਤਾ ਜਾਵੇਗਾ",
+  "COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "ਨੋਟ: ਇਸ ਕੋਰਸ ਦਾ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ",
+  "COURSE_ENDED": "ਕੋਰਸ {{%s}} ਨੂੰ ਖ਼ਤਮ ਹੋਇਆ",
+  "COURSE_ENDED_ON": "ਕੋਰਸ {{%s}} ਨੂੰ ਖ਼ਤਮ ਹੋਇਆ",
+  "COURSE_ENROLLED": "ਤੁਸੀਂ ਕੋਰਸ ਵਿਚ ਸ਼ਾਮਲ ਹੋ ਗਏ ਹੋ",
+  "COURSE_LAST_UPDATED_ON": "ਕੋਰਸ ਨੂੰ ਆਖ਼ਰੀ ਵਾਰ {{last_updated_on_date}} ਨੂੰ ਅਪਡੇਟ ਕੀਤਾ ਗਿਆ",
+  "COURSE_NOT_AVAILABLE": "ਇਹ ਕੋਰਸ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਹੈ",
+  "COURSE_NO_CERTIFICATE_MESSAGE": "ਵਰਤਮਾਨ ਵਿੱਚ, ਇਸ ਕੋਰਸ ਦਾ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ। ਕੋਰਸ ਨਿਰਮਾਤਾ ਬਾਅਦ ਵਿੱਚ ਸਰਟੀਫਿਕੇਟ ਜੋੜ ਸਕਦਾ ਹੈ।",
   "COURSE_PROGRESS_COMPLETED": "ਮੁਕੰਮਲ: {{%s}} %",
-  "COURSE_UNENROLLED": "ਤੁਸੀਂ ਸਿਖਲਾਈ ਛੱਡ ਦਿੱਤੀ ਹੈ",
+  "COURSE_UNENROLLED": "ਤੁਸੀਂ ਕੋਰਸ ਛੱਡ ਦਿੱਤਾ ਹੈ",
   "COURSE_WILL_BE_AVAILABLE": "ਤੋਂ ਕੋਰਸ ਉਪਲੱਬਧ ਹੋਵੇਗਾ {{%s}}",
   "CREATE_GROUP": "ਸਮੂਹ ਬਣਾਓ",
-  "CREATE_NEW_GROUP": "ਨਵਾਂ ਸਮੂਹ ਬਣਾਓ",
-  "CREATE_NEW_USER": "ਨਵਾਂ ਉਪਭੋਗਤਾ ਬਣਾਓ",
+  "CREATE_GROUP_DESCRIPTION": "ਤੁਸੀਂ ਇੱਕ ਸਮੂਹ ਬਣਾਉਣ ਤੋਂ ਸਿਰਫ ਇੱਕ ਕਦਮ ਦੂਰ ਹੋ",
+  "CREATE_GROUP_DESCRIPTION_POPUP": "ਲੋਕਾਂ ਨਾਲ ਜੁੜਨ, ਕਿਰਿਆਵਾਂ ਨੂੰ ਸਾਂਝਾ ਕਰਨ, ਪ੍ਰਗਤੀ ਦੀ ਸਮੀਖਿਆ ਕਰਨ ਅਤੇ ਹੋਰ ਸੰਭਾਵਨਾਵਾਂ ਦੀ ਪੜਚੋਲ ਕਰਨ ਲਈ ਇੱਕ ਸਮੂਹ ਬਣਾਓ ਜਾਂ  ਇਸਦਾ ਇੱਕ ਹਿੱਸਾ ਬਣੋ",
   "CREATE_USER": "ਉਪਭੋਗਤਾ ਬਣਾਓ",
   "CREATORS": "{{%s}} ਦੁਆਰਾ ਤਿਆਰ ਕੀਤਾ ਗਿਆ",
   "CREDITS": "ਕ੍ਰੈਡਿਟ",
   "CREDITS_LICENCE_INFO": "ਕ੍ਰੈਡਿਟ ਅਤੇ ਲਾਇਸੈਂਸ ਜਾਣਕਾਰੀ",
-  "CSV_DOWNLOAD_SUCCESS": "{{%s}} 'ਡਾਉਨਲੋਡ' ਵਿੱਚ ਸੁਰੱਖਿਅਤ ",
+  "CRS_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਇੱਕ ਕੋਰਸ ਚੁਣੋ",
+  "CRS_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "ਕੋਰਸ",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "ਕੋਰਸਿਸ",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "ਕੋਰਸਿਸ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "of{{%appName}} ਦੀ ਲਾਇਬ੍ਰੇਰੀ ਵਿੱਚ ਬਹੁਤ ਸਾਰੇ {{%explainVideos}}, {{%quesBanks}} ਅਤੇ ਹੋਰ {{%interactiveMaterial}} ਹਨ। ਲਾਇਬ੍ਰੇਰੀ ਦੀ ਪੜਚੋਲ ਕਰਨ ਲਈ ਇੱਕ ਕੋਰਸ 'ਤੇ ਕਲਿਕ ਕਰੋ!",
+  "CRS_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) ਲਈ ਕੋਈ ਕੋਰਸਿਸ ਨਹੀਂ ਮਿਲੇ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "ਬੋਰਡ ਕੋਰਸ ਸ਼ਾਮਲ ਕਰ ਰਿਹਾ ਹੈ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}} 'ਤੇ ਕੋਈ ਕੋਰਸ ਨਹੀਂ ਲੱਭ ਸਕਿਆ?",
+  "CRS_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span> ਕੋਰਸ ਲਈ ਤਰੱਕੀ ਟਰੈਕ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ",
+  "CRS_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "ਅਸੀਂ ਤੁਹਾਨੂੰ ਸੂਚਿਤ ਕਰਾਂਗੇ ਜਦੋਂ ਤੁਹਾਡਾ ਸਟੇਟ ਬੋਰਡ ਤੁਹਾਡੇ ਦੁਆਰਾ ਬੇਨਤੀ ਕੀਤਾ ਕੋਰਸ {{%s}} 'ਤੇ ਅਪਲੋਡ ਕਰਦਾ ਹੈ",
+  "CRS_NONTRK_QR_CODE_DETAILS": "ਆਪਣੇ ਕੋਰਸ ਤੋਂ QR ਕੋਡ ਸਕੈਨ ਕਰਕੇ ਡਿਜੀਟਲ ਕੰਟੇਂਟ ਤੱਕ ਤੁਰੰਤ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰੋ।",
+  "CRS_NONTRK_SEE_MORE_BOOKS": "ਹੋਰ ਕੋਰਸਿਸ ਅਤੇ ਕੰਟੇਂਟ ਵੇਖੋ",
+  "CRS_NONTRK_STUDENT_ROLE_DESC_1": "ਕੋਰਸਿਸ ਅਤੇ ਡਿਜੀਟਲ ਕੰਟੇਂਟ ਬਰਾਊਜ਼ ਕਰੋ",
+  "CRS_NONTRK_TEACHER_ROLE_DESC_1": "ਕੋਰਸਿਸ ਅਤੇ  ਡਿਜੀਟਲ ਕੰਟੇਂਟ ਬਰਾਊਜ਼ ਕਰੋ",
+  "CRS_NONTRK_TUTORIAL_HEADING": "ਵਿਡੀਓਜ਼, ਇੰਟਰਐਕਟਿਵ ਕੰਟੇਂਟ , ਈਟੈਕਸਟਬੁੱਕਸ ਅਤੇ ਹੋਰ ਬਹੁਤ ਕੁਝ...",
+  "CRS_TRK_BATCHEND_MAIN_HEADING": "ਤੁਸੀਂ ਇੱਕ ਕੋਰਸ ਦੇ ਸਮੂਹ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋ ਗਏ ਹੋ ਜੋ {{%s}} ਨੂੰ ਪੂਰਾ ਕੀਤਾ ਗਿਆ",
+  "CRS_TRK_BATCHEND_SUB_HEADING": "ਤੁਸੀਂ ਕੋਰਸ ਜਾਰੀ ਰੱਖ ਸਕਦੇ ਹੋ, ਪਰ ਤੁਹਾਡੀ ਤਰੱਕੀ ਅਪਡੇਟ ਨਹੀਂ ਕੀਤੀ ਜਾਵੇਗੀ",
+  "CRS_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "ਤੁਸੀਂ ਇਸ ਮੋਡੀਊਲ ਨੂੰ ਪੂਰਾ ਕਰ ਲਿਆ ਹੈ",
+  "CRS_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} ਤੱਕ ਕੋਰਸ ਪੂਰਾ ਕਰੋ",
+  "CRS_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "ਕੋਰਸਿਸ",
+  "CRS_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "ਤੁਸੀਂ ਇਸ ਕੋਰਸ ਵਿਚ ਸ਼ਾਮਲ ਹੋ ਗਏ ਹੋ",
+  "CRS_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "ਕੋਰਸ ਲਈ ਬੈਚ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "ਕੋਰਸਿਸ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "ਮੇਰੇ ਕੋਰਸਿਸ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "ਕੋਰਸ {{%s}} ਨੂੰ ਖ਼ਤਮ ਹੋਇਆ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "ਕੋਰਸ ਨੂੰ ਆਖਰੀ ਵਾਰ {{last_updated_on_date}} ਨੂੰ ਅਪਡੇਟ ਕੀਤਾ ਗਿਆ",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_NOT_AVAILABLE": "ਇਹ ਕੋਰਸ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਹੈ",
+  "CRS_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "ਕੋਰਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਵੋ",
+  "CRS_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "ਨਵੀਨਤਮ ਕੋਰਸਿਸ",
+  "CRS_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "ਕੋਰਸ ਛੱਡੋ?",
+  "CRS_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "ਇੱਕ ਕੋਰਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਲੌਗ ਇਨ ਕਰੋ",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_COURSES": "ਕੋਈ ਕੋਰਸਿਸ ਨਹੀਂ",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "ਕੋਰਸਾਂ, ਜਾਂ ਲਾਇਬ੍ਰੇਰੀ ਤੋਂ ਕੰਟੇਂਟ ਡਾਊਨਲੋਡ ਕਰੋ",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "ਕੋਰਸਿਸ ({{%s}})",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "ਕੋਰਸ ({{%s}})",
+  "CRS_TRK_FRMELEMNTS_LBL_OVERLAY_LABEL_TAKE_COURSE": "ਇਸ ਕੋਰਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਲੌਗ ਇਨ ਕਰੋ",
+  "CRS_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "ਪ੍ਰਸਿੱਧ ਕੋਰਸਿਸ",
+  "CRS_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ਆਨਲਾਈਨ ਕੋਰਸਿਸ ਲਓ",
+  "CRS_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "ਸਰਟੀਫਿਕੇਟ ਹਾਸਿਲ ਕਰਨ ਲਈ {{%s}} ਤੱਕ ਕੋਰਸ ਪੂਰਾ ਕਰੋ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING": "ਕੋਰਸ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "ਜਿਹੜੇ ਕੋਰਸ(ਕੋਰਸਾਂ) ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਏ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "ਕੋਰਸ ਦੇ ਵੇਰਵੇ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "ਨੂੰ ਕੋਰਸ ਖ਼ਤਮ ਹੁੰਦਾ ਹੈ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "ਕੋਰਸ ਦੀ ਸਮਾਪਤੀ ਮਿਤੀ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "ਕੋਰਸ ਦੇ ਵੇਰਵੇ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "ਇਸ ਲਈ ਇਹ ਕੋਰਸ ਢੁਕਵਾਂ ਹੈ:",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "ਕੋਰਸ ਦੇ ਮੈਡੀਊਲ",
+  "CRS_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "ਕੋਰਸ ਛੱਡੋ",
+  "CRS_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "ਕੀ ਕੋਰਸਾਂ ਦੀ ਜਾਂਚ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?",
+  "CRS_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "ਕੋਰਸ ਦਾ ਬੈਚ {{batch_start_date}} ਤੋਂ ਉਪਲੱਬਧ ਹੈ",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "ਤੁਹਾਨੂੰ ਕੋਰਸ ਸਰਟੀਫਿਕੇਟ ਬਾਰੇ ਤੁਹਾਡੇ ਰਜਿਸਟਰਡ ਸੰਪਰਕ ਵੇਰਵਿਆਂ 'ਤੇ 7 ਦਿਨਾਂ ਦੇ ਅੰਦਰ ਸੂਚਿਤ ਕੀਤਾ ਜਾਵੇਗਾ",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "ਨੋਟ: ਇਸ ਕੋਰਸ ਦਾ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "ਤੁਸੀਂ ਕੋਰਸ ਵਿਚ ਸ਼ਾਮਲ ਹੋ ਗਏ ਹੋ",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "ਵਰਤਮਾਨ ਵਿੱਚ, ਇਸ ਕੋਰਸ ਦਾ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ। ਕੋਰਸ ਨਿਰਮਾਤਾ ਬਾਅਦ ਵਿੱਚ ਸਰਟੀਫਿਕੇਟ ਜੋੜ ਸਕਦਾ ਹੈ।",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "ਤੁਸੀਂ ਕੋਰਸ ਛੱਡ ਦਿੱਤਾ ਹੈ",
+  "CRS_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "ਇਸ ਕੋਰਸ ਲਈ ਕੋਈ ਬੈਚ ਨਹੀਂ ਹਨ",
+  "CRS_TRK_FRMELEMNTS_MSG_OTHER_ROLE_DESC_2": "ਆਨਲਾਈਨ ਕੋਰਸ ਲਓ",
+  "CRS_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "ਕੋਰਸ ਰਜਿਸਟਰਡ ਉਪਭੋਗਤਾਵਾਂ ਲਈ ਹੈ। ਕੋਰਸ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਲਈ ਲੌਗ ਇਨ ਕਰੋ।",
+  "CRS_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "ਇਸ ਕੋਰਸ ਲਈ ਕੋਈ ਬੈਚ ਉਪਲੱਬਧ ਨਹੀਂ ਹਨ",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "ਸਿਰਫ਼ ਰਜਿਸਟਰਡ ਉਪਭੋਗਤਾ ਹੀ ਕੋਰਸਿਸ ਲੈ ਸਕਦੇ ਹਨ",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "ਤੁਸੀਂ ਇਸ ਕੋਰਸ ਨੂੰ ਸਫ਼ਲਤਾਪੂਰਵਕ ਪੂਰਾ ਕਰ ਲਿਆ ਹੈ",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "ਕੋਰਸ ਖ਼ਤਮ ਹੋ ਗਿਆ ਹੈ। ਤੁਸੀਂ ਦੁਬਾਰਾ ਮੁਲਾਂਕਣ ਕਰ ਸਕਦੇ ਹੋ ਪਰ, ਤੁਹਾਡੀ ਤਰੱਕੀ ਦਰਜ ਨਹੀਂ ਕੀਤੀ ਜਾਏਗੀ।",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "ਕੋਰਸ ਖ਼ਤਮ ਹੋ ਗਿਆ ਹੈ। ਤੁਸੀਂ ਮੁਲਾਂਕਣ ਕਰ ਸਕਦੇ ਹੋ ਪਰ, ਤੁਹਾਡੀ ਤਰੱਕੀ ਦਰਜ ਨਹੀਂ ਕੀਤੀ ਜਾਏਗੀ।",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "ਕੋਰਸ ਦੇ ਵੇਰਵਿਆਂ ਨੂੰ ਵੇਖਣ ਅਤੇ ਐਕਸੈਸ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਇੱਕ ਸਰਗਰਮ ਬੈਚ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣਾ ਪਵੇਗਾ",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "ਕੋਰਸ ਦੇ ਵੇਰਵਿਆਂ ਨੂੰ ਵੇਖਣ ਲਈ ਤੁਹਾਨੂੰ ਲਾੱਗ ਇਨ ਕਰਨਾ ਪਵੇਗਾ",
   "CURRENT_LANGUAGE": "ਮੌਜੂਦਾ ਭਾਸ਼ਾ",
-  "DATA": "ਹੋਰ ਕਿਤਾਬਾਂ ਅਤੇ ਸਮੱਗਰੀ ਵੇਖੋ",
   "DATA_SYNC": "ਡਾਟਾ ਸਿੰਕ",
   "DATA_SYNC_FAILURE": "ਡਾਟਾ ਸਿੰਕ ਨਹੀਂ ਕਰ ਸਕਿਆ, ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ",
   "DATA_SYNC_NOTHING_TO_SYNC": "ਸਿੰਕ ਕਰਨ ਲਈ ਕੁਝ ਨਹੀਂ",
   "DATA_SYNC_SUB": "ਬੈਕਅੱਪ ਡੇਟਾ,ਟ੍ਰਾਂਸਫਰ ਟੈਲੀਮੈਟਰੀ",
-  "DATA_SYNC_SUCCESSFUL": "ਟੈਲੀਮੈਟਰੀ ਡਾਟਾ ਸਿੰਕ ਸਫਲ   ",
+  "DATA_SYNC_SUCCESSFUL": "ਟੈਲੀਮੈਟਰੀ ਡਾਟਾ ਸਿੰਕ ਸਫ਼ਲ   ",
+  "DAYS_AGO": "{{%s}} ਦਿਨ ਪਹਿਲਾਂ",
+  "DAY_AGO": "{{%s}} ਦਿਨ ਪਹਿਲਾਂ",
   "DELETE": "ਮਿਟਾਓ",
   "DELETE_ALL_CONTENT_WARNING": "ਸਮੱਗਰੀ ਨੂੰ ਮਿਟਾਉਣ ਤੇ ਜੰਤਰ ਤੋਂ ਚੁਣੀ ਗਈ ਸਮੱਗਰੀ (S) ਨੂੰ ਹਟਾ ਦੇਵੇਗਾ",
   "DELETE_CONTENT": "ਸਮੱਗਰੀ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?",
   "DELETE_CONTENT_SIZE": "1 ਆਈਟਮ  ({{content_size}})",
   "DELETE_CONTENT_WARNING": "ਸਮੱਗਰੀ ਮਿਟਾਉਣ ਤੇ  ਜੰਤਰ ਸਮੱਗਰੀ ਨੂੰ ਹਟਾ ਦੇਵੇਗਾ",
-  "DELETE_GROUP": "ਸਮੂਹ ਮਿਟਾਓ",
+  "DELETE_GROUP_DESC": "{{group_name}} ਨੂੰ ਮਿਟਾਉਣਾ ਸਮੂਹ ਨੂੰ ਪੱਕੇ ਤੌਰ 'ਤੇ ਐਪਲੀਕੇਸ਼ਨ ਤੋਂ ਹਟਾ ਦੇਵੇਗਾ",
+  "DELETE_GROUP_ERROR_MSG": "ਸਮੂਹ ਨੂੰ ਮਿਟਾ ਨਹੀਂ ਸਕਿਆ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ",
+  "DELETE_GROUP_POPUP_TITLE": "ਸਮੂਹ ਮਿਟਾਉਣਾ ਹੈ?",
+  "DELETE_GROUP_SUCCESS_MSG": "ਸਮੂਹ ਸਫ਼ਲਤਾਪੂਰਵਕ ਹਟਾਇਆ ਗਿਆ",
   "DELETE_PROGRESS": "ਚੁਣੀ ਗਈ ਸਮੱਗਰੀ ਨੂੰ ਮਿਟਾਉਣਾ",
-  "DESCRIPTION": "ਵੇਰਵਾ",
+  "DETAIL_TUTORIAL": "{{%appName}}'s ਲਾਇਬ੍ਰੇਰੀ {{%explainVideos}}, {{%quesBanks}} ਅਤੇ ਹੋਰ {{%interactiveMaterial}} ਦਾ ਹੋਸਟ ਹੈ। ਲਾਇਬ੍ਰੇਰੀ ਦੀ ਪੜਚੋਲ ਕਰਨ ਲਈ ਇੱਕ ਪਾਠ ਪੁਸਤਕ 'ਤੇ ਕਲਿਕ ਕਰੋ!",
   "DEVICE_ID": "ਜੰਤਰ ID ",
   "DEVICE_LOCATION": "ਜੰਤਰ ਸਥਾਨ",
   "DEVICE_TAGS": "ਜੰਤਰ ਟੈਗ",
   "DEVICE_TAGS_SUB": "ਜੰਤਰ ਟੈਗ ਜੋੜੋ ਜਾਂ ਹਟਾਓ",
+  "DFLT_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਕੋਈ ਕੰਮ ਚੁਣੋ",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "ਕੰਮ",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "ਕੰਮ",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "ਕੰਮ",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}} ਦੀ ਲਾਇਬ੍ਰੇਰੀ ਵਿੱਚ ਬਹੁਤ ਸਾਰੇ {{%explainVideos}}, {{%quesBanks}} ਅਤੇ ਹੋਰ {{%interactiveMaterial}} ਹਨ। ਲਾਇਬ੍ਰੇਰੀ ਦੀ ਪੜਚੋਲ ਕਰਨ ਲਈ ਕਿਸੇ ਕੰਟੇਂਟ 'ਤੇ ਕਲਿਕ ਕਰੋ!",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) ਲਈ ਕੋਈ ਕੰਮ ਨਹੀਂ ਮਿਲਿਆ",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "ਬੋਰਡ ਕੰਟੇਂਟ ਸ਼ਾਮਲ ਕਰ ਰਿਹਾ ਹੈ",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}} ਉੱਤੇ ਕੰਟੇਂਟ ਨਹੀਂ ਲੱਭ ਸਕਿਆ?",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span> ਤਰੱਕੀ ਟਰੈਕ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "ਅਸੀਂ ਤੁਹਾਨੂੰ ਸੂਚਿਤ ਕਰਾਂਗੇ ਜਦੋਂ ਤੁਹਾਡਾ ਸਟੇਟ ਬੋਰਡ ਤੁਹਾਡੇ ਦੁਆਰਾ ਬੇਨਤੀ ਕੀਤੇ ਕੰਟੇਂਟ {{%s}} 'ਤੇ ਅਪਲੋਡ ਕਰਦਾ ਹੈ",
+  "DFLT_NONTRK_QR_CODE_DETAILS": "QR ਕੋਡ ਨੂੰ ਸਕੈਨ ਕਰਕੇ ਡਿਜੀਟਲ ਕੰਟੇਂਟ ਤੱਕ ਤੁਰੰਤ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰੋ",
+  "DFLT_NONTRK_SEE_MORE_BOOKS": "ਹੋਰ ਵੇਖੋ",
+  "DFLT_NONTRK_STUDENT_ROLE_DESC_1": "ਡਿਜੀਟਲ ਕੰਟੇਂਟ ਲਈ ਬਰਾਊਜ਼ ਕਰੋ",
+  "DFLT_NONTRK_TEACHER_ROLE_DESC_1": "ਡਿਜੀਟਲ ਕੰਟੇਂਟ ਲਈ ਬਰਾਊਜ਼ ਕਰੋ",
+  "DFLT_NONTRK_TUTORIAL_HEADING": "ਵਿਡੀਓਜ਼, ਇੰਟਰਐਕਟਿਵ ਕੰਟੇਂਟ, ਈਟੈਕਸਟਬੁੱਕਸ ਅਤੇ ਹੋਰ ਬਹੁਤ ਕੁਝ...",
+  "DFLT_TRK_BATCHEND_MAIN_HEADING": "ਤੁਸੀਂ ਇਕ ਸਿਖਲਾਈ ਕਾਰਜ ਦੇ ਸਮੂਹ ਵਿਚ ਸ਼ਾਮਲ ਹੋ ਗਏ ਹੋ ਜੋ {{%s}} ਨੂੰ ਪੂਰਾ ਕੀਤਾ ਗਿਆ",
+  "DFLT_TRK_BATCHEND_SUB_HEADING": "ਤੁਸੀਂ ਸਿੱਖਣਾ ਜਾਰੀ ਰੱਖ ਸਕਦੇ ਹੋ, ਪਰ ਤੁਹਾਡੀ ਤਰੱਕੀ ਅਪਡੇਟ ਨਹੀਂ ਕੀਤੀ ਜਾਏਗੀ",
+  "DFLT_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "ਤੁਸੀਂ ਸਿੱਖਣ ਦੀ ਇਹ ਗਤੀਵਿਧੀ ਖ਼ਤਮ ਕਰ ਦਿੱਤੀ ਹੈ",
+  "DFLT_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "ਸਿੱਖਣਾ {{%s}} ਤੱਕ ਪੂਰਾ ਕਰ ਲਓ",
+  "DFLT_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "ਇਹ ਸਿੱਖਣ ਦਾ ਕੰਮ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਹੈ",
+  "DFLT_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "ਸਿਖਲਾਈ ਦੇ ਕੰਮ",
+  "DFLT_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "ਤੁਸੀਂ ਇਸ ਸਿੱਖਣ ਦੇ ਕੰਮ ਵਿਚ ਸ਼ਾਮਲ ਹੋ ਗਏ ਹੋ",
+  "DFLT_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "ਸਿੱਖਣ ਦੇ ਕੰਮ ਲਈ ਬੈਚਸ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "ਸਿੱਖਣ ਦੇ ਕੰਮ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "ਮੇਰੇ ਸਿਖਲਾਈ ਦੇ ਕੰਮ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "ਕੰਮ {{%s}} ਨੂੰ ਖ਼ਤਮ ਹੋਇਆ",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}} ਨੂੰ ਆਖ਼ਰੀ ਵਾਰ ਅਪਡੇਟ ਕੀਤਾ ਗਿਆ",
+  "DFLT_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "ਸ਼ਾਮਲ ਹੋਵੋ",
+  "DFLT_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "ਸਿਖਲਾਈ ਦੇ ਨਵੀਨਤਮ ਕੰਮ",
+  "DFLT_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "ਕੰਮ ਛੱਡੋ?",
+  "DFLT_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਲੌਗ ਇਨ ਕਰੋ",
+  "DFLT_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "ਕੰਟੇਂਟ ਡਾਊਨਲੋਡ ਕਰੋ",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "ਕੰਮ ({{%s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "ਕੰਮ ({{%s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "ਆਨਲਾਈਨ ਸਿਖਲਾਈ ਲਓ",
+  "DFLT_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "ਪ੍ਰਸਿੱਧ ਕੰਮ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ਆਨਲਾਈਨ ਸਿਖਲਾਈ ਲਓ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "ਸਰਟੀਫਿਕੇਟ ਹਾਸਿਲ ਕਰਨ ਲਈ ਕੰਮ {{%s}} ਤੱਕ ਪੂਰਾ ਕਰੋ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING": "ਸਿਖਲਾਈ ਦਾ ਕੰਮ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "ਸਿਖਲਾਈ ਦੇ ਕੰਮ/ਕੰਮਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਏ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "ਕੰਮ ਦੇ ਵੇਰਵੇ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "ਨੂੰ ਕੰਮ ਖ਼ਤਮ ਹੁੰਦਾ ਹੈ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "ਕੰਮ ਦੀ ਆਖ਼ਰੀ ਤਾਰੀਖ਼",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "ਕੰਮ ਦੇ ਵੇਰਵੇ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "ਇਹ ਕੰਮ ਇਸਦੇ ਲਈ ਢੁਕਵਾਂ ਹੈ:",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "ਕੰਮ ਦੇ ਸਰੋਤ",
+  "DFLT_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "ਕੰਮ ਛੱਡੋ",
+  "DFLT_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "ਕੀ ਸਿੱਖਣ ਦੇ ਕੰਮਾਂ ਦੀ ਜਾਂਚ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?",
+  "DFLT_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "ਟਾਸਕ ਦਾ ਬੈਚ {{batch_start_date}} ਤੋਂ ਉਪਲੱਬਧ ਹੈ",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "ਸਰਟੀਫਿਕੇਟ ਬਾਰੇ ਤੁਹਾਡੇ ਰਜਿਸਟਰਡ ਸੰਪਰਕ ਵੇਰਵਿਆਂ 'ਤੇ ਤੁਹਾਨੂੰ 7 ਦਿਨਾਂ ਦੇ ਅੰਦਰ ਸੂਚਿਤ ਕੀਤਾ ਜਾਵੇਗਾ",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "ਨੋਟ: ਇਸ ਕੰਮ ਦਾ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "ਤੁਸੀਂ ਕੰਮ ਵਿਚ ਸ਼ਾਮਲ ਹੋ ਗਏ ਹੋ",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "ਵਰਤਮਾਨ ਵਿੱਚ, ਇਸ ਕੰਮ ਦਾ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ। ਨਿਰਮਾਤਾ ਬਾਅਦ ਵਿੱਚ ਸਰਟੀਫਿਕੇਟ ਜੋੜ ਸਕਦਾ ਹੈ",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "ਤੁਸੀਂ ਕੰਮ ਛੱਡ ਦਿੱਤਾ ਹੈ",
+  "DFLT_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "ਇਸ ਸਿੱਖਣ ਦੇ ਕੰਮ ਲਈ ਕੋਈ ਬੈਚ ਨਹੀਂ ਹਨ",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "ਕੰਮ ਰਜਿਸਟਰਡ ਉਪਭੋਗਤਾਵਾਂ ਲਈ ਹੈ। ਕੰਮ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਲਈ ਲੌਗ ਇਨ ਕਰੋ",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "ਇਸ ਕੰਮ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਲੌਗ ਇਨ ਕਰੋ",
+  "DFLT_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "ਇਸ ਕੰਮ ਲਈ ਕੋਈ ਬੈਚਿਸ ਉਪਲੱਬਧ ਨਹੀਂ ਹਨ",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "ਸਿਰਫ਼ ਰਜਿਸਟਰਡ ਉਪਯੋਗਕਰਤਾ ਸਿੱਖਣ ਦੇ ਕੰਮ ਨੂੰ ਲੈ ਸਕਦੇ ਹਨ",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "ਤੁਸੀਂ ਇਸ ਕਾਰਜ ਨੂੰ ਸਫ਼ਲਤਾਪੂਰਵਕ ਪੂਰਾ ਕਰ ਲਿਆ ਹੈ",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "ਕੰਮ ਖ਼ਤਮ ਹੋ ਗਿਆ ਹੈ। ਤੁਸੀਂ ਦੁਬਾਰਾ ਮੁਲਾਂਕਣ ਕਰ ਸਕਦੇ ਹੋ ਪਰ, ਤੁਹਾਡੀ ਤਰੱਕੀ ਦਰਜ ਨਹੀਂ ਕੀਤੀ ਜਾਏਗੀ।",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "ਕੰਮ ਖ਼ਤਮ ਹੋ ਗਿਆ ਹੈ। ਤੁਸੀਂ ਮੁਲਾਂਕਣ ਕਰ ਸਕਦੇ ਹੋ ਪਰ, ਤੁਹਾਡੀ ਤਰੱਕੀ ਦਰਜ ਨਹੀਂ ਕੀਤੀ ਜਾਏਗੀ।",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "ਕੰਮ ਦੇ ਵੇਰਵਿਆਂ ਨੂੰ ਵੇਖਣ ਅਤੇ ਐਕਸੈਸ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਇੱਕ ਸਰਗਰਮ ਬੈਚ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣਾ ਪਵੇਗਾ",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "ਕੰਮ ਦੇ ਵੇਰਵਿਆਂ ਤੱਕ ਪਹੁੰਚਣ ਲਈ ਤੁਹਾਨੂੰ ਲਾੱਗ ਇਨ ਕਰਨਾ ਪਵੇਗਾ",
   "DISMISS": "ਰੱਦ ਕਰੋ",
+  "DISMISS_AS_GROUP_ADMIN": "ਸਮੂਹ ਪ੍ਰਬੰਧਕ ਵਜੋਂ ਬਰਖਾਸਤ ਕਰੋ",
+  "DISMISS_AS_GROUP_ADMIN_ERROR_MSG": "{{member_name}} ਨੂੰ ਗਰੁੱਪ ਪ੍ਰਬੰਧਕ ਵਜੋਂ ਖਾਰਜ ਨਹੀਂ ਕਰ ਸਕਿਆ",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_DESC": "ਗਰੁੱਪ ਐਡਮਿਨਿਸਟਰੇਟਰ ਵਜੋਂ {{member_name}} ਨੂੰ ਖਾਰਜ ਕਰਨ ਨਾਲ ਮੈਂਬਰ ਤੋਂ ਐਡਮਿਨ ਅਧਿਕਾਰਾਂ ਨੂੰ ਹਟਾ ਦਿੱਤਾ ਜਾਂਦਾ ਹੈ",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_TITLE": "ਸਮੂਹ ਪ੍ਰਬੰਧਕ ਵਜੋਂ ਬਰਖਾਸਤ ਕਰਨਾ ਹੈ?",
+  "DISMISS_AS_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} ਹੁਣ ਗਰੁੱਪ ਪ੍ਰਬੰਧਕ ਨਹੀਂ ਹੈ",
   "DISTRICT": "ਜ਼ਿਲ੍ਹਾ",
   "DISTRICT_OPTION_TEXT": "ਜ਼ਿਲ੍ਹਾ ਚੁਣੋ",
-  "DOCS": "ਦਸਤਾਵੇਜ਼",
+  "DOC": "ਦਸਤਾਵੇਜ਼",
   "DOWNLOAD": "ਡਾਉਨਲੋਡ",
   "DOWNLOADING": "{{%s}} % ਡਾਊਨਲੋਡ ਹੋ ਰਹੀ ਹੈ",
   "DOWNLOADING_1": "ਡਾਊਨਲੋਡਿੰਗ {{%s}}",
@@ -178,7 +352,7 @@
   "DOWNLOADING_ATTACHMENT": "ਡਾਉਨਲੋਡਿੰਗ ਨੱਥੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ",
   "DOWNLOADING_CONTENT": "ਸਮੱਗਰੀ ਡਾਡਾਊਨਲੋਡ  ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ",
   "DOWNLOADS": "ਡਾਉਨਲੋਡ ਕਰੋ",
-  "DOWNLOAD_ALL": "ਕੀ ਸਾਰੀ ਸਮੱਗਰੀ ਡਾਉਨਲੋਡ ਕਰੀਏ?",
+  "DOWNLOAD_ALL": "ਕੀ ਸਾਰੇ ਕੰਟੇਂਟ ਡਾਊਨਲੋਡ ਕਰੀਏ?",
   "DOWNLOAD_ALL_CONTENT": "ਸਭ ਡਾਊਨਲੋਡ ਕਰੋ",
   "DOWNLOAD_ALL_wSIZE": "ਸਭ ਨੂੰ ਡਾਊਨਲੋਡ ਕਰੋ {{%s}}?",
   "DOWNLOAD_AND_PLAY": "ਡਾਉਨਲੋਡ ਕਰੋ ਅਤੇ ਚਲਾਓ",
@@ -204,14 +378,22 @@
   "EMAIL_UPDATE_SUCCESS": "ਈਮੇਲ ਸਫਲਤਾਪੂਰਵਕ ਅਪਡੇਟ ਕੀਤੀ ਗਈ",
   "EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}}({{%medium}}) ਲਈ ਕੋਈ ਕਿਤਾਬਾਂ ਨਹੀਂ ਮਿਲੀਆਂ",
   "EMPTY_SEARCH_RESULTS": "ਕੋਈ ਨਤੀਜਾ ਨਹੀਂ ਮਿਲਿਆ",
+  "EMPTY_SEARCH_RESULT_GROUPS": "ਮਾਫ਼ ਕਰਨਾ! ਤੁਹਾਡੀ ਖੋਜ ਨਾਲ ਮੇਲ ਕਰਨ ਲਈ ਕੋਈ ਨਤੀਜੇ ਨਹੀਂ ਹਨ",
   "ENDORSE": "ਸਮਰਥਨ ਕਰੋ",
   "ENJOYED_THIS_CONTENT": "ਇਸ ਸਮੱਗਰੀ ਦਾ ਆਨੰਦ ਲਿਆ ਹੈ?",
   "ENROLL": "ਜੁੜੋ",
-  "ENROLLMENT_ENDED_ON": "ਦਾਖਲਾ {{%s}}  ਨੂੰ ਖਤਮ ਹੋਇਆ",
+  "ENROLLMENT_ENDED_ON": "ਇਸ ਬੈਚ ਲਈ ਦਾਖਲੇ {{%s}} ਨੂੰ ਬੰਦ ਹੋਏ",
   "ENROLLMENT_LAST_DATE": "ਦਾਖਲੇ ਲਈ ਆਖਰੀ ਮਿਤੀ:",
   "ENTER_GROUP_NAME": "ਸਮੂਹ ਦਾ ਨਾਮ ਦਰਜ ਕਰੋ",
+  "ENTER_ID": "ID ਦਰਜ ਕਰੋ",
+  "ENTER_ID_AS_REQUESTED_BY_STATE_BOARD_ORG": "ਤੁਹਾਡੇ ਰਾਜ, ਬੋਰਡ ਜਾਂ ਸੰਗਠਨ ਦੁਆਰਾ ਬੇਨਤੀ ਕੀਤੇ ਅਨੁਸਾਰ ID",
+  "ENTER_LOCATION_FROM_PROFILE_PAGE": "ਪ੍ਰੋਫਾਈਲ ਪੇਜ ਤੋਂ ਟਿਕਾਣਾ ਦਰਜ ਕਰੋ",
+  "ENTER_MEMBER_ID": "{{app_name}} ID ਦਰਜ ਕਰੋ",
   "ENTER_OTP": "OTP ਦਰਜ ਕਰੋ",
   "ENTER_PHONE_POPUP_TITLE": "ਮੋਬਾਈਲ ਨੰਬਰ ਦਰਜ ਕਰੋ",
+  "ENTER_SCHOOL_NAME": "ਸਕੂਲ ਦਾ ਨਾਮ ਦਰਜ ਕਰੋ",
+  "ENTER_THE_FOLLOWING_INFORMATION": "ਹੇਠ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਦਰਜ ਕਰੋ",
+  "ENTER_UDISE_ID": "UDISE ID ਦਾਖਲ ਕਰੋ",
   "ERROR_BATCH_NOT_STARTED": "ਬੈਚ ਸ਼ੁਰੂ ਨਹੀਂ ਹੋਇਆ",
   "ERROR_CANT_OPEN_EMPTY_CONTENT": "ਖਾਲੀ ਫਾਇਲ ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ",
   "ERROR_CONTENT_NOT_AVAILABLE": "ਸਮੱਗਰੀ ਅਣਉਪਲਬਧ",
@@ -224,21 +406,32 @@
   "ERROR_FAILED_TO_DOWNLOAD_ATTACHMENT": "ਨੱਥੀ ਨੂੰ ਡਾਊਨਲੋਡ ਕਰਨ ਵਿੱਚ ਅਸਫਲ",
   "ERROR_FETCHING_DATA": " ਡਾਟਾ ਲਿਆਨ ਵਿਚ ਅਸਮਰੱਥ ",
   "ERROR_LOW_MEMORY": "ਭੇਜਣ ਦੇ ਲਈ ਸਪੇਸ ਉਪਲੱਬਧ ਨਹੀ ਹੈ",
+  "ERROR_MAXIMUM_ACTIVITY_COUNT_EXCEEDS": "ਤੁਸੀਂ ਗਤੀਵਿਧੀਆਂ ਦੀ ਵੱਧ ਤੋਂ ਵੱਧ ਗਿਣਤੀ ਨੂੰ ਪਾਰ ਕਰ ਚੁੱਕੇ ਹੋ ਜੋ ਸਮੂਹ ਲਈ ਸ਼ਾਮਲ ਕੀਤੀਆਂ ਜਾ ਸਕਦੀਆਂ ਹਨ",
+  "ERROR_MAXIMUM_GROUP_COUNT_EXCEEDS": "ਤੁਸੀਂ ਬਣਾਏ ਜਾ ਸਕਣ ਵਾਲੇ ਸਮੂਹਾਂ ਦੀ ਵੱਧ ਤੋਂ ਵੱਧ ਗਿਣਤੀ ਨੂੰ ਪਾਰ ਕਰ ਚੁੱਕੇ ਹੋ",
+  "ERROR_MAXIMUM_MEMBER_COUNT_EXCEEDS": "ਤੁਸੀਂ ਸਮੂਹ ਵਿੱਚ ਸ਼ਾਮਲ ਕੀਤੇ ਜਾ ਸਕਣ ਵਾਲੇ ਮੈਂਬਰਾਂ ਦੀ ਵੱਧ ਤੋਂ ਵੱਧ ਗਿਣਤੀ ਨੂੰ ਪਾਰ ਕਰ ਲਿਆ ਹੈ",
   "ERROR_NAME_INVALID": "ਨਾਮ ਲਈ ਸਿਰਫ ਅੱਖਰ ਜਾਂ ਸਪੇਸ ਦਿਓ",
-  "ERROR_NO_BATCHES_FOUND": "ਇਸ ਕੋਰਸ ਲਈ ਕੋਈ ਬੈਚ ਨਹੀਂ ਹਨ",
+  "ERROR_NO_BATCHES_FOUND": "ਇਸ ਕੋਰਸ ਲਈ ਕੋਈ ਬੈਚੀਸ ਨਹੀਂ ਹਨ",
   "ERROR_NO_INTERNET_MESSAGE": "ਕੋਈ ਇੰਟਰਨੈਟ ਪਹੁੰਚ ਨਹੀਂ",
   "ERROR_NO_OFFLINE_RESOURCE": "ਕੋਈ ਸਰੋਤ ਸਟੋਰ ਨਹੀਂ ਕੀਤੇ ਗਏ",
   "ERROR_OFFLINE_MODE": "ਕੋਈ ਇੰਟਰਨੈਟ ਨਹੀਂ, ਆਫਲਾਈਨ ਮੋਡ",
-  "ERROR_OTP": "ਅਵੈਧ OTP ਸਹੀ OTP ਦਰਜ ਕਰੋ",
+  "ERROR_OTP": "ਗਲਤ OTP। ਬਾਕੀ ਕੋਸ਼ਿਸ਼ਾਂ ਦੀ ਗਿਣਤੀ: {{%s}}",
+  "ERROR_OTP_LIMIT_EXCEEDED": "ਤੁਸੀਂ OTP ਦੀ ਅਧਿਕਤਮ ਸੀਮਾ ਨੂੰ ਪਾਰ ਕਰ ਚੁੱਕੇ ਹੋ, ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ",
   "ERROR_PHONE_EXISTS": "ਫੋਨ ਨੰਬਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ | ਇੱਕ ਵੱਖਰੇ  ਫੋਨ ਨੰਬਰ ਨਾਲ ਕੋਸ਼ਿਸ਼ ਕਰੋ",
   "ERROR_PHONE_INVALID": "ਇੱਕ ਵੈਧ ਫੋਨ ਨੰਬਰ ਦਰਜ ਕਰੋ",
+  "ERROR_PHONE_REQUIRED": "ਮੋਬਾਈਲ ਨੰਬਰ ਲਾਜ਼ਮੀ ਹੈ",
   "ERROR_SAME_EMAIL_UPDATED": "ਇਹ email ਪਤਾ ਪਹਿਲਾਂ ਤੋਂ ਹੀ ਤੁਹਾਡੇ ਪ੍ਰੋਫਾਈਲ ਨਾਲ ਜੁੜਿਆ ਹੋਇਆ ਹੈ। ਇਕ ਹੋਰ email ਪਤਾ ਦਰਜ ਕਰੋ",
   "ERROR_SAME_PHONE_UPDATED": "ਇਹ ਮੋਬਾਈਲ ਨੰਬਰ ਪਹਿਲਾਂ ਤੋਂ ਹੀ ਤੁਹਾਡੇ ਪ੍ਰੋਫਾਈਲ ਨਾਲ ਜੁੜਿਆ ਹੋਇਆ ਹੈ। ਇਕ ਹੋਰ ਮੋਬਾਈਲ ਨੰਬਰ ਦਰਜ ਕਰੋ",
   "ERROR_SERVER_CONNECTION": "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਮਰੱਥ",
+  "ERROR_SPECIAL_CHARECTERS_NOT_ALLOWED": "ਵਿਸ਼ੇਸ਼ ਅੱਖਰਾਂ ਦੀ ਆਗਿਆ ਨਹੀਂ ਹੈ",
   "ERROR_TECHNICAL_PROBLEM": "ਸਾਨੂੰ ਇੱਕ ਤਕਨੀਕੀ ਸਮੱਸਿਆ ਆਈ ਹੈ ਅਤੇ  ਬੇਨਤੀ ਤੇ ਕਾਰਵਾਈ  ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ ਸਨ",
-  "ERROR_UPLOADING_IMG": "ਚਿੱਤਰ ਅਪਲੋਡ ਕਰਨ ਵੇਲੇ ਗਲਤੀ ਹੋਈ",
+  "ERROR_UPLOADING_IMG": "ਚਿੱਤਰ ਅਪਲੋਡ ਕਰਨ ਵੇਲੇ ਗ਼ਲਤੀ ਹੋਈ",
   "ERROR_USER_ACCOUNT_BLOCKED": "ਉਪਭੋਗਤਾ  ਖਾਤਾ ਬਲੌਕ ਕੀਤਾ ਗਿਆ ਹੈ. ਵੇਰਵਿਆਂ ਲਈ ਆਪਣੇ ਪ੍ਰਬੰਧਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ",
+  "ERROR_WHILE_ADDING_USER": "ਉਪਭੋਗਤਾ ਨੂੰ ਸ਼ਾਮਲ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ",
+  "ERROR_WHILE_FETCHING_USERS": "ਉਪਭੋਗਤਾਵਾਂ ਨੂੰ ਲਿਆਉਣ ਦੌਰਾਨ ਗ਼ਲਤੀ",
   "ERROR_WHILE_LOGIN": "ਲਾਗਇਨ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ",
+  "ERROR_WHILE_SWITCHING_USER": "ਉਪਭੋਗਤਾ ਨੂੰ ਬਦਲਣ ਦੌਰਾਨ ਗ਼ਲਤੀ",
+  "EXPLORE_HEADING": "{{%s}} 'ਤੇ ਹੋਰ ਪੜਚੋਲ ਕਰੋ",
+  "EXP_VIDEOS": "ਸਪੱਸ਼ਟੀਕਰਨ ਵੀਡੀਓ",
   "EXTRACTING_CONTENT": "ਸਮੱਗਰੀ ਨੂੰ ਬਾਹਰ ਲੈ ਕੇ ਆ ਰਿਹਾ ਹੈ {{%s}}",
   "FEEDBACK_HINT": "ਸੁਝਾਅ (ਵਿਕਲਪਿਕ)",
   "FEEDBACK_HINT_1": "ਇੱਥੇ ਇੱਕ ਟਿੱਪਣੀ ਸ਼ਾਮਲ ਕਰੋ",
@@ -253,23 +446,194 @@
   "FILTER": "ਫਿਲਟਰ",
   "FILTER_ADDED": "ਜੋੜਿਆ ਗਿਆ",
   "FILTER_BY": " ਫਿਲਟਰ ਦੁਆਰਾ",
-  "FIRST_NAME": "ਨਾਮ",
   "FOLLOW": "ਪਾਲਣਾ ਕਰੋ",
   "FORCE_UPDATE_MESSAGE": "ਤੁਸੀਂ  {%s}} ਐਪ ਦਾ ਪੁਰਾਣਾ ਸੰਸਕਰਣ ਵਰਤ ਰਹੇ ਹੋ। ਗੂਗਲ ਪਲੇਸਟੋਰ ਤੋਂ ਨਵੀਨਤਮ ਸੰਸਕਰਣ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ, ਹੁਣੇ ਅਪਡੇਟ ਕਰੋ ਨੂੰ ਟੈਪ ਕਰੋ",
+  "FORUM": "ਚਰਚਾ ਕਰੋ",
+  "FOR_SUPPORT": "{{%s}} ਸਹਾਇਤਾ ਲਈ",
   "FREE_SPACE": "ਖਾਲੀ ਸਪੇਸ :",
+  "FRMELEMENTS_BTN_ACTIVATEGRP": "ਕਿਰਿਆਸ਼ੀਲ ਕਰੋ",
+  "FRMELEMENTS_BTN_ADD": "ਸ਼ਾਮਲ ਕਰੋ",
+  "FRMELEMENTS_BTN_BACK": "ਵਾਪਸ",
+  "FRMELEMENTS_BTN_DEACTIVATEGRP": "ਅਕਿਰਿਆਸ਼ੀਲ ਕਰੋ",
+  "FRMELEMENTS_BTN_NEXT": "ਅਗਲਾ",
+  "FRMELEMENTS_LBL_ACTIVATEGRP": "ਸਮੂਹ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰੋ",
+  "FRMELEMENTS_LBL_ACTIVATEGRPQUES": "ਸਮੂਹ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰੋ?",
+  "FRMELEMENTS_LBL_CONTENT_TYPE": "ਕੰਟੇਂਟ ਦੀ ਕਿਸਮ",
+  "FRMELEMENTS_LBL_DEACTIVATEGRP": "ਸਮੂਹ ਨੂੰ ਅਕਿਰਿਆਸ਼ੀਲ ਕਰੋ",
+  "FRMELEMENTS_LBL_DEACTIVATEGRPQUES": "ਸਮੂਹ ਨੂੰ ਅਕਿਰਿਆਸ਼ੀਲ ਕਰੋ?",
+  "FRMELEMENTS_LBL_REMARKS": "ਟਿੱਪਣੀਆਂ",
+  "FRMELEMENTS_MSG_ACTIVATEGRPFAILED": "ਸਮੂਹ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਕਰ ਸਕਿਆ, ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ",
+  "FRMELEMENTS_MSG_ACTIVATEGRPMSG": "ਸਮੂਹ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਨ ਨਾਲ ਤੁਸੀਂ ਮੈਂਬਰਾਂ ਅਤੇ ਗਤੀਵਿਧੀਆਂ ਨੂੰ ਜੋੜ ਸਕਣ ਦੇ ਯੋਗ ਹੋ ਜਾਂਦੇ ਹੋ। ਤੁਸੀਂ ਮੈਂਬਰ ਦੀ ਤਰੱਕੀ ਬਾਰੇ ਵੀ ਪਤਾ ਲਗਾ ਸਕਦੇ ਹੋ",
+  "FRMELEMENTS_MSG_ACTIVATEGRPPOPUP": "ਇਹ ਸਮੂਹ ਅਸਥਾਈ ਤੌਰ ’ਤੇ ਨਾ-ਸਰਗਰਮ ਹੈ। ਸਮੂਹ ਪ੍ਰਬੰਧਕ ਲੋੜ ਪੈਣ 'ਤੇ ਸਮੂਹ ਨੂੰ ਮੁੜ ਸਰਗਰਮ ਕਰ ਸਕਦੇ ਹਨ। ਸਮੂਹ ਮੈਂਬਰ ਵਿਚਾਰ-ਵਟਾਂਦਰੇ ਵਾਲੇ ਫੋਰਮ ’ਤੇ ਆਪਣੇ ਵਿਚਾਰ-ਵਟਾਂਦਰੇ ਜਾਰੀ ਰੱਖ ਸਕਦੇ ਹਨ।",
+  "FRMELEMENTS_MSG_ACTIVATEGRPSUCCESS": "ਸਮੂਹ ਸਫ਼ਲਤਾਪੂਰਵਕ ਕਿਰਿਆਸ਼ੀਲ ਕੀਤਾ ਗਿਆ",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPFAILED": "ਸਮੂਹ ਨੂੰ ਅਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਕਰ ਸਕਿਆ, ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPMSG": "ਸਮੂਹ ਨੂੰ ਅਕਿਰਿਆਸ਼ੀਲ ਕਰਨ 'ਤੇ ਤੁਹਾਡੀ ਪਹੁੰਚ ਨੂੰ ਹਟਾ ਦਿੰਦਾ ਹੈ। ਤੁਸੀਂ ਗਤੀਵਿਧੀਆਂ ਜਾਂ ਮੈਂਬਰਾਂ ਨੂੰ ਸਮੂਹ ਵਿੱਚ ਸ਼ਾਮਲ ਨਹੀਂ ਕਰ ਸਕਦੇ। ਤੁਸੀਂ ਮੈਂਬਰਾਂ ਦੀ ਤਰੱਕੀ ਦੀ ਜਾਂਚ ਵੀ ਨਹੀਂ ਕਰ ਸਕਦੇ",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPSUCCESS": "ਸਮੂਹ ਸਫ਼ਲਤਾਪੂਰਵਕ ਅਕਿਰਿਆਸ਼ੀਲ ਹੋਇਆ",
+  "FRMELEMNTS_BTN_CLOSE": "ਬੰਦ ਕਰੋ",
+  "FRMELEMNTS_BTN_DONOT_SHARE": "ਸ਼ੇਅਰ ਨਾ ਕਰੋ",
+  "FRMELEMNTS_BTN_EDIT_SETTING": "ਸੈਟਿੰਗਜ਼ ਦੀ ਸੋਧ ਕਰੋ",
+  "FRMELEMNTS_BTN_PREVIEW_FORM": "ਫ਼ਾਰਮ ਦੀ ਝਲਕ ਵੇਖੋ",
+  "FRMELEMNTS_BTN_SAVE": "ਸੇਵ",
+  "FRMELEMNTS_BTN_SAVE_EDITS": "ਸੰਪਾਦਨਾਂ ਨੂੰ ਸੇਵ ਕਰੋ",
+  "FRMELEMNTS_BTN_SAVE_FORM": "ਫ਼ਾਰਮ ਨੂੰ ਸੇਵ ਕਰੋ",
+  "FRMELEMNTS_BTN_SEEK_HELP": "ਮਦਦ ਲਵੋ",
+  "FRMELEMNTS_BTN_SUBMIT_FORM": "ਫ਼ਾਰਮ ਜਮ੍ਹਾ ਕਰਾਓ",
+  "FRMELEMNTS_BTN_VIEW_DETAILS": "ਵੇਰਵਾ ਵੇਖੋ",
+  "FRMELEMNTS_CKBX_CERTMSG": "ਇਹ ਸੁਨੇਹਾ ਦੁਬਾਰਾ ਨਾ ਦਿਖਾਓ",
+  "FRMELEMNTS_LBL_ACCESSIBILITY": "ਸਕ੍ਰੀਨ ਰੀਡਰ ਐਕਸੈਸ",
+  "FRMELEMNTS_LBL_ACCESSIBILITYMODE": "ਡਾਰਕ ਮੋਡ ’ਤੇ ਜਾਓ",
+  "FRMELEMNTS_LBL_ACCESSIBILITYSKIP": "ਮੁੱਖ ਕੰਟੇਂਟ ਤੇ ਜਾਓ",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXT": "ਸਾਈਟ ਦਾ ਨਕਸ਼ਾ",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXTSIZE": "ਫੋਂਟ ਦਾ ਆਕਾਰ ਵਧਾਓ",
+  "FRMELEMNTS_LBL_ADD_ATTACHMENTS": "ਅਟੈਚਮੈਂਟ ਸ਼ਾਮਲ ਕਰੋ",
+  "FRMELEMNTS_LBL_ADD_ENTITY": "ਇਕਾਈ ਸ਼ਾਮਲ ਕਰੋ",
+  "FRMELEMNTS_LBL_ADD_NEW_TASK": "ਨਵਾਂ ਟਾਸਕ ਸ਼ਾਮਲ ਕਰੋ",
+  "FRMELEMNTS_LBL_ADD_REMARKS": "ਟਿੱਪਣੀਆਂ ਸ਼ਾਮਲ ਕਰੋ",
+  "FRMELEMNTS_LBL_ADD_SUBTASK": "ਸਬਟਾਸਕ ਸ਼ਾਮਲ ਕਰੋ",
+  "FRMELEMNTS_LBL_ADD_SUBTASK_PALCEHOLDER": "ਸਬਟਾਸਕ ਦਾ ਨਾਮ ਸ਼ਾਮਲ ਕਰੋ",
+  "FRMELEMNTS_LBL_ADD_TASK": "ਟਾਸਕ ਸ਼ਾਮਲ ਕਰੋ",
+  "FRMELEMNTS_LBL_ASSIGNED_TO": "ਨੂੰ ਦਿੱਤਾ",
+  "FRMELEMNTS_LBL_ASSIGN_TASK": "ਕਾਰਜ ਨਿਰਧਾਰਤ ਕਰੋ",
+  "FRMELEMNTS_LBL_ATTACH": "ਨੱਥੀ ਕਰੋ",
+  "FRMELEMNTS_LBL_ATTACHMENTS": "ਨੱਥੀ",
+  "FRMELEMNTS_LBL_BLOCK": "ਬਲਾਕ",
+  "FRMELEMNTS_LBL_CATEGORIES": "ਵਰਗ",
+  "FRMELEMNTS_LBL_CATEGORY_OVERVIEW": "ਵਰਗ ਬਾਰੇ ਸੰਖੇਪ ਜਾਣਕਾਰੀ",
+  "FRMELEMNTS_LBL_CLICK_HELP": "<b>ਸਹਾਇਤਾ ਲਓ</b> ਬਟਨ 'ਤੇ ਕਲਿਕ ਕਰੋ",
+  "FRMELEMNTS_LBL_CLICK_HERE_TO_VIEW_LIBRARY": "ਲਾਇਬ੍ਰੇਰੀ ਨੂੰ ਵੇਖਣ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ",
+  "FRMELEMNTS_LBL_CLUSTER": "ਕਲੱਸਟਰ",
+  "FRMELEMNTS_LBL_CONSENT_POPUP_INFO": "ਤੁਸੀਂ ਇਹਨਾਂ ਵੇਰਵਿਆਂ ਨੂੰ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਪੇਜ ਤੋਂ ਸੋਧ ਸਕਦੇ ਹੋ",
+  "FRMELEMNTS_LBL_CONTENT_AVAIALABLE_IN_OTHER_BOARD": "ਹੋਰ ਬੋਰਡਾਂ ਵਿੱਚ ਤੁਹਾਡੀ ਜ਼ਰੂਰਤ ਦੇ ਅਨੁਕੂਲ ਦਿਲਚਸਪ ਕੰਟੇਂਟ ਹੋ ਸਕਦੇ ਹਨ!",
+  "FRMELEMNTS_LBL_CONTENT_FOUND": "ਸਾਨੂੰ ਤੁਹਾਡੀ ਜ਼ਰੂਰਤ ਨਾਲ ਮੇਲ ਕਰਨ ਲਈ ਕੰਟੇਟ ਮਿਲ ਗਏ ਹਨ!",
+  "FRMELEMNTS_LBL_CONTENT_TO_BE_ADDED": "ਤੁਹਾਡੇ ਬੋਰਡ ਨੇ ਅਜੇ ਹੋਰ ਕੰਟੇਂਟ ਸ਼ਾਮਲ ਕਰਨੇ ਹਨ",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT": "ਤੁਹਾਡੇ ਕੰਟੇਂਟ ਨਹੀਂ ਲੱਭ ਸਕਿਆ? ਹੇਠਾਂ ਦਿੱਤੇ ਕਿਸੇ ਵੀ ਬਟਨ 'ਤੇ ਕਲਿਕ ਕਰੋ",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT_YET": "ਅਜੇ ਵੀ ਤੁਹਾਡੇ ਕੰਟੇਂਟ ਨਹੀਂ ਲੱਭ ਸਕੇ?",
+  "FRMELEMNTS_LBL_CRITERIA_WISE": "ਮਾਪਦੰਡ",
+  "FRMELEMNTS_LBL_DATA_SETTINGS": "ਪ੍ਰੋਫਾਈਲ ਡਾਟਾ ਸ਼ੇਅਰਿੰਗ",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF": "ਪ੍ਰੋਫਾਈਲ ਡੇਟਾ ਸ਼ੇਅਰਿੰਗ ਬੰਦ ਹੈ",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF_INFO": "ਤੁਸੀਂ ਕੋਰਸ ਪ੍ਰਬੰਧਕ ਨਾਲ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਵੇਰਵੇ ਸਾਂਝੇ ਕਰਨ ਲਈ ਸਹਿਮਤ ਨਹੀਂ ਹੋਏ ਹੋ",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON": "ਪ੍ਰੋਫਾਈਲ ਡੇਟਾ ਸ਼ੇਅਰਿੰਗ ਚਾਲੂ ਹੈ",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON_INFO": "ਤੁਸੀਂ ਕੋਰਸ ਪ੍ਰਬੰਧਕ ਨਾਲ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਵੇਰਵੇ ਸਾਂਝੇ ਕਰਨ ਲਈ ਸਹਿਮਤ ਹੋ ਗਏ ਹੋ",
+  "FRMELEMNTS_LBL_DELETE_CONFIRMATION": "ਕੀ ਤੁਸੀਂ ਪੱਕਾ ਆਪਣਾ ਸਬਟਾਸਕ ਮਿਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?",
+  "FRMELEMNTS_LBL_DONOT_SHARE_PROFILE_INFO": "ਮੇਰੇ ਪ੍ਰੋਫਾਈਲ ਦੇ ਵੇਰਵੇ ਸਾਂਝੇ ਨਾ ਕਰੋ",
+  "FRMELEMNTS_LBL_DURATION": "ਅਵਧੀ",
+  "FRMELEMNTS_LBL_EMAIL_ID_PLACEHOLDER": "ਰਾਜ ਜਾਂ ਸੰਗਠਨ ਦਾ ਈਮੇਲ ਪਤਾ",
+  "FRMELEMNTS_LBL_END_DATE": "ਅੰਤ ਦੀ ਮਿਤੀ",
+  "FRMELEMNTS_LBL_FILES": "ਫਾਈਲਾਂ",
+  "FRMELEMNTS_LBL_IMAGES": "ਚਿੱਤਰ",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS": "ਪ੍ਰੋਜੈਕਟ ਰਿਪੋਰਟਾਂ",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS_DESC": "ਪ੍ਰੋਜੈਕਟ ਰਿਪੋਰਟਾਂ ਵੇਖੋ",
+  "FRMELEMNTS_LBL_IN_PROGRESS": "ਤਰੱਕੀ ਹੋ ਰਹੀ ਹੈ",
+  "FRMELEMNTS_LBL_LEARNER_PASSBOOK": "ਲਰਨਰ ਪਾਸਬੁੱਕ",
+  "FRMELEMNTS_LBL_LEARNING_RESOURCES": "ਸਿੱਖਣ ਦੇ ਸਰੋਤ",
+  "FRMELEMNTS_LBL_LINK_LEARNING_RESOURCES": "ਸਿੱਖਣ ਦੇ ਸਰੋਤਾਂ ਨੂੰ ਲਿੰਕ ਕਰੋ",
+  "FRMELEMNTS_LBL_MEDIA_TYPE": "ਮੀਡੀਆ ਦੀ ਕਿਸਮ",
+  "FRMELEMNTS_LBL_MOBILE_NUMBER_PLACEHOLDER": "ਰਾਜ ਜਾਂ ਸੰਗਠਨ ਲਈ ਮੋਬਾਈਲ ਨੰਬਰ",
+  "FRMELEMNTS_LBL_MY_LEARNINGS": "ਮੇਰੀ ਸਿਖਲਾਈ",
+  "FRMELEMNTS_LBL_NEW_TASK": "ਨਵਾਂ ਕੰਮ",
+  "FRMELEMNTS_LBL_NO_MATCHING_CONTENT": "ਮੇਲ ਖਾਂਦੇ ਕੋਈ ਕੰਟੇਂਟ ਨਹੀਂ ਮਿਲੇ",
+  "FRMELEMNTS_LBL_OBJECTIVE": "ਉਦੇਸ਼",
+  "FRMELEMNTS_LBL_OBSERVATION": "ਨਿਰੀਖਣ",
+  "FRMELEMNTS_LBL_OBSERVATION_DESC": "ਆਪਣੇ ਕਲਾਸਰੂਮ ਅਤੇ ਸਕੂਲ ਦੇ ਨਿਰੀਖਣ ਤੱਕ ਅਸਾਨੀ ਨਾਲ ਪਹੁੰਚੋ ਅਤੇ ਰਿਕਾਰਡ ਕਰੋ, ਅਤੇ ਆਪਣੀਆਂ ਸੁਧਾਰ ਯਾਤਰਾਵਾਂ ਦੀ ਯੋਜਨਾ ਬਣਾਓ",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS": "ਨਿਰੀਖਣ ਰਿਪੋਰਟਾਂ",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS_DEC": "ਨਿਗਰਾਨੀ ਰਿਪੋਰਟਾਂ ਵੇਖੋ",
+  "FRMELEMNTS_LBL_OBSERVE_AGAIN": "ਫੇਰ ਵੇਖੋ",
+  "FRMELEMNTS_LBL_OPEN_BATCH_NOT_RECOMMENDED": "ਜੇ ਤੁਸੀਂ ਪਹਿਲੇ ਬੈਚ ਵਿਚ ਕੋਰਸ ਪੂਰਾ ਕਰ ਲਿਆ ਹੈ, ਤਾਂ ਅਸੀਂ ਸਿਫਾਰਸ਼ ਕਰਦੇ ਹਾਂ ਕਿ ਤੁਸੀਂ ਕੋਰਸ ਵਿਚ ਸ਼ਾਮਲ ਨਾ ਹੋਵੋ। ਤੁਹਾਡਾ ਸਿੱਖਣ ਦਾ ਇਤਿਹਾਸ ਅਤੇ ਸਰਟੀਫਿਕੇਟ ਰੀਸੈੱਟ ਕੀਤੇ ਜਾਣਗੇ।",
+  "FRMELEMNTS_LBL_PERSONA": "ਭੂਮਿਕਾ",
+  "FRMELEMNTS_LBL_PROFCONF": "ਪ੍ਰੋਫਾਈਲ ਨਾਮ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ",
+  "FRMELEMNTS_LBL_PROFTITLE": "ਪ੍ਰੋਫਾਈਲ ਨਾਮ",
+  "FRMELEMNTS_LBL_PROGRAM_NAME": "ਪ੍ਰੋਗਰਾਮ ਦਾ ਨਾਮ",
+  "FRMELEMNTS_LBL_PROJECT": "ਪ੍ਰੋਜੈਕਟ",
+  "FRMELEMNTS_LBL_PROJECT_DESCRIPTION": "ਕਾਰਜਾਂ ਅਤੇ ਟਾਈਮਲਾਈਨਜ਼ ਦੀ ਯੋਜਨਾ ਬਣਾ ਕੇ ਆਪਣੇ ਸਕੂਲ ਦੇ ਸੁਧਾਰਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ ਅਤੇ ਇਸ ਨੂੰ ਟਰੈਕ ਕਰੋ",
+  "FRMELEMNTS_LBL_PROJECT_OVERVIEW": "ਪ੍ਰੋਜੈਕਟ ਬਾਰੇ ਸੰਖੇਪ ਜਾਣਕਾਰੀ",
+  "FRMELEMNTS_LBL_PROJECT_STATUS": "ਪ੍ਰੋਜੈਕਟ ਦੀ ਸਥਿਤੀ",
+  "FRMELEMNTS_LBL_PROJECT_TITLE": "ਪ੍ਰੋਜੈਕਟ ਦਾ ਸਿਰਲੇਖ",
+  "FRMELEMNTS_LBL_PROJECT_VIEW": "ਪ੍ਰੋਜੈਕਟ ਬਾਰੇ ਜਾਣਕਾਰੀ",
+  "FRMELEMNTS_LBL_QUESTION_WISE": "ਪ੍ਰਸ਼ਨ",
+  "FRMELEMNTS_LBL_RELEVANT_CONTENT_SUB_HEADING": "ਖ਼ਾਸ ਕੰਟੇਂਟ ਲੱਭਣ ਲਈ ਵੇਰਵੇ ਭਰੋ",
+  "FRMELEMNTS_LBL_REPORTS": "ਰਿਪੋਰਟਾਂ",
+  "FRMELEMNTS_LBL_REPORTS_DESC": "ਰਿਪੋਰਟਾਂ ਦੀ ਸੂਚੀ",
+  "FRMELEMNTS_LBL_REQUEST_CONTENT": "ਕੰਟੇਂਟ ਲਈ ਬੇਨਤੀ",
+  "FRMELEMNTS_LBL_SCHOOL": "ਸਕੂਲ",
+  "FRMELEMNTS_LBL_SELECT_CATEGORIES": "ਵਰਗ (ਵਰਗਾਂ) ਦੀ ਚੋਣ ਕਰੋ\n",
+  "FRMELEMNTS_LBL_SELECT_PROGRAM": "ਪ੍ਰੋਗਰਾਮ ਦੀ ਚੋਣ ਕਰੋ",
+  "FRMELEMNTS_LBL_SET_DATE": "ਮਿਤੀ ਨਿਰਧਾਰਤ ਕਰੋ",
+  "FRMELEMNTS_LBL_SET_DATE_HINT": "ਆਪਣੇ ਪ੍ਰੋਜੈਕਟ ਲਈ ਸਮਾਂਰੇਖਾ ਨਿਰਧਾਰਤ ਕਰੋ",
+  "FRMELEMNTS_LBL_SHARE_PROFILE_INFORMATION": "ਮੇਰੇ ਪ੍ਰੋਫਾਈਲ ਦੇ ਵੇਰਵੇ ਸਾਂਝੇ ਕਰੋ",
+  "FRMELEMNTS_LBL_START_DATE": "ਸ਼ੁਰੂ ਦੀ ਮਿਤੀ",
+  "FRMELEMNTS_LBL_STATUS": "ਸਥਿਤੀ",
+  "FRMELEMNTS_LBL_SUBPERSONA": "ਉਪ-ਭੂਮਿਕਾ",
+  "FRMELEMNTS_LBL_SUBTASKS": "ਸਬਟਾਸਕ",
+  "FRMELEMNTS_LBL_SURVEY": "ਸਰਵੇਖਣ",
+  "FRMELEMNTS_LBL_SURVEY_ACTION": "ਸਰਵੇਖਣ ਦੀਆਂ ਕਾਰਵਾਈਆਂ",
+  "FRMELEMNTS_LBL_SURVEY_DESC": "ਸਰਵੇਖਣ ਸੂਚੀ",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS": "ਸਰਵੇ ਰਿਪੋਰਟਾਂ",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS_DESC": "ਸਰਵੇ ਰਿਪੋਰਟਾਂ ਵੇਖੋ",
+  "FRMELEMNTS_LBL_TAB_HOME": "ਘਰ",
+  "FRMELEMNTS_LBL_TASK_DESCRIPTION": "ਕਾਰਜ ਵੇਰਵਾ",
+  "FRMELEMNTS_LBL_TASK_OVERVIEW": "ਕੰਮ ਬਾਰੇ ਸੰਖੇਪ ਜਾਣਕਾਰੀ",
+  "FRMELEMNTS_LBL_THIS_MONTH": "ਇਸ ਮਹੀਨੇ",
+  "FRMELEMNTS_LBL_TOTAL_TASKS": "ਕੁੱਲ ਕੰਮ",
+  "FRMELEMNTS_LBL_UPCOMING": "ਆਉਣ ਵਾਲਾ",
+  "FRMELEMNTS_LBL_UPDATE_DATA_SETTINGS": "ਸੈਟਿੰਗਜ਼ ਅਪਡੇਟ ਕਰੋ",
+  "FRMELEMNTS_LBL_USERTYPE_LEADER": "ਸਕੂਲ ਮੁਖੀ ਜਾਂ ਅਧਿਕਾਰੀ",
+  "FRMELEMNTS_LBL_VIEW_ENTITY_REPORT": "ਇਕਾਈ ਦੀ ਰਿਪੋਰਟ ਵੇਖੋ",
+  "FRMELEMNTS_LBL_VIEW_FULL_REPORT": "ਪੂਰੀ ਰਿਪੋਰਟ ਵੇਖੋ",
+  "FRMELEMNTS_LBL_VIEW_RESOURCES": "ਸਰੋਤ ਵੇਖੋ",
+  "FRMELEMNTS_MSG_BATCH_ALREADY_CLOSED": "ਇਸ ਬੈਚ ਲਈ ਦਾਖਲੇ {endDate} ਨੂੰ ਬੰਦ ਹੋਏ",
+  "FRMELEMNTS_MSG_CONSENT_DECLARATION_INFO": "ਤੁਸੀਂ ਆਪਣੇ ਵੇਰਵਿਆਂ ਨੂੰ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਪੇਜ ਤੋਂ ਸੋਧ ਸਕਦੇ ਹੋ",
+  "FRMELEMNTS_MSG_DATA_SETTINGS_SUBMITED_SUCCESSFULLY": "ਤੁਹਾਡੀਆਂ ਡਾਟਾ ਸੈਟਿੰਗਜ਼ ਸਫ਼ਲਤਾਪੂਰਵਕ ਦਰਜ ਕੀਤੀਆਂ ਗਈਆਂ",
+  "FRMELEMNTS_MSG_DELETE_TASK_CONFIRMATION": "ਕੀ ਤੁਸੀਂ ਯਕੀਨਨ ਹੀ ਕਾਰਜ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?",
+  "FRMELEMNTS_MSG_EDITCERTNAME": "ਤੁਸੀਂ ਇਸਨੂੰ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਪੇਜ ਤੋਂ ਸੋਧ ਸਕਦੇ ਹੋ।",
+  "FRMELEMNTS_MSG_LOAD_FROM_LIBRARY": "ਲਾਇਬ੍ਰੇਰੀ ਤੋਂ ਲੋਡ ਕਰੋ",
+  "FRMELEMNTS_MSG_NAMEONCERT": "ਇਹ ਨਾਮ ਤੁਹਾਡੇ ਕੋਰਸ ਸਰਟੀਫਿਕੇਟ 'ਤੇ ਛਾਪਿਆ ਜਾਵੇਗਾ। ਜਾਂਚ ਕਰੋ ਕਿ ਕੀ ਇਹ ਸਹੀ ਹੈ।",
+  "FRMELEMNTS_MSG_SELECT_IMAGE_SOURCE": "ਚਿੱਤਰ ਸਰੋਤ ਦੀ ਚੋਣ ਕਰੋ",
+  "FRMELEMNTS_MSG_SELFDECLARATION_SUCCESS_INFO": "ਤੁਸੀਂ ਇਸ ਜਾਣਕਾਰੀ ਨੂੰ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਸੋਧ ਸਕਦੇ ਹੋ",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED": "ਸਫ਼ਲਤਾਪੂਰਕ ਜੋੜਿਆ ਗਿਆ",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_SYNCED": "ਪ੍ਰੋਜੈਕਟ ਨੂੰ ਸਫ਼ਲਤਾਪੂਰਵਕ ਸਿੰਕ ਕੀਤਾ ਗਿਆ",
+  "FRMELEMNTS_MSG_TICKET_SUBMISSION_SUCCESS": "ਤੁਹਾਡੀ ਫੀਡਬੈਕ ਲਈ ਧੰਨਵਾਦ। ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਅਸੀਂ ਸਾਨੂੰ ਭੇਜੇ ਗਏ ਹਰ ਸੁਝਾਅ ਦਾ ਜਵਾਬ ਨਾ ਦੇ ਸਕੀਏ, ਪਰ ਤੁਹਾਡੀ ਫੀਡਬੈਕ ਮਹੱਤਵਪੂਰਣ ਹੈ। ਇਹ ਹਰੇਕ ਲਈ {{app_name}} ਨੂੰ ਵਧੀਆ ਬਣਾਉਣ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ।",
+  "FRMELEMNTS_MSG_UNABLE_TO_ENROLL": "ਤੁਸੀਂ ਹੁਣ ਬੈਚ ਨੂੰ ਨਹੀਂ ਛੱਡ ਸਕਦੇ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ",
+  "FRMELEMNTS_MSG_UPDATED_SUCCESSFULLY": "ਸਫ਼ਲਤਾਪੂਰਵਕ ਅਪਡੇਟ ਕੀਤਾ ਗਿਆ",
+  "FRMELEMNTS_MSG_USER_CREATION_LIMIT_EXCEEDED": "ਤੁਸੀਂ ਉਹਨਾਂ ਉਪਭੋਗਤਾਵਾਂ ਦੀ ਸੰਖਿਆ ਨੂੰ ਪਾਰ ਕਰ ਚੁੱਕੇ ਹੋ ਜਿਹਨਾਂ ਨੂੰ ਤੁਸੀਂ ਆਪਣੀ ਪ੍ਰੋਫਾਈਲ ਦੇ ਅਧੀਨ ਪ੍ਰਬੰਧਿਤ ਕਰ ਸਕਦੇ ਹੋ",
+  "FRMELEMNTS_MSG_USE_CAMERA": "ਕੈਮਰਾ ਵਰਤੋ",
+  "FRMELEMNTS_MSG_USE_FILE": "ਫਾਈਲ ਦੀ ਵਰਤੋਂ ਕਰੋ",
+  "FRMELEMNTS_MSG_YOUR_CHANGES_ARE_SAVED": "ਤੁਹਾਡੀਆਂ ਤਬਦੀਲੀਆਂ ਸਫ਼ਲਤਾਪੂਰਵਕ ਸੇਵ ਹੋ ਗਈਆਂ ਹਨ।",
+  "FRMELENTS_LBL_ACCESSIBILITYNORMALMODE": "ਲਾਈਟ ਮੋਡ ’ਤੇ ਜਾਓ",
+  "FRMELMNTS_BLTPT_EARNCERT": "ਸਰਟੀਫਿਕੇਟ ਸਿਰਫ਼ {{STATE}} ਰਾਜ ਉਪਭੋਗਤਾਵਾਂ ਨੂੰ ਜਾਰੀ ਕੀਤੇ ਜਾਂਦੇ ਹਨ",
+  "FRMELMNTS_BLTPT_EARNCERT2": "ਆਪਣੇ ਸਾਰੇ ਮੁਲਾਂਕਣਾਂ ਵਿੱਚ {{PERCENTAGE}} ਤੋਂ ਉੱਪਰ ਅੰਕ ਪ੍ਰਾਪਤ ਕਰੋ",
+  "FRMELMNTS_BLTPT_EARNCERT3": "ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਤੁਸੀਂ ਸਿਰਫ਼ {{ATTEMPTS}} ਵਾਰ ਮੁਲਾਂਕਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ।",
+  "FRMELMNTS_IMSG_DECLAREINFO": "ਇਸ ਕੋਰਸ ਲਈ ਸਰਟੀਫਿਕੇਟ ਕੇਵਲ ਰਾਜ ਦੁਆਰਾ ਮਾਨਤਾ ਪ੍ਰਾਪਤ ਅਧਿਆਪਕਾਂ ਲਈ ਜਾਰੀ ਕੀਤੇ ਜਾਂਦੇ ਹਨ",
+  "FRMELMNTS_IMSG_LASTATTMPALRT": "ਇਹ ਆਖਰੀ ਬਾਕੀ ਬਚੀ ਕੋਸ਼ਿਸ਼ ਹੈ",
+  "FRMELMNTS_IMSG_LASTATTMPTEXCD": "ਤੁਸੀਂ ਭੇਜੀਆਂ ਜਾਣ ਵਾਲੀਆਂ ਕੋਸ਼ਿਸ਼ਾਂ ਦੀ ਵੱਧ ਤੋਂ ਵੱਧ ਗਿਣਤੀ ਨੂੰ ਪਾਰ ਕਰ ਚੁੱਕੇ ਹੋ",
+  "FRMELMNTS_LBL_ACCESSIBILITYFNTDFLT": "ਡਿਫੌਲਟ ’ਤੇ ਰੀਸੈਟ ਕਰੋ",
+  "FRMELMNTS_LBL_ACCESSIBILITYFONT": "ਫੋਂਟ ਦਾ ਆਕਾਰ ਘਟਾਓ",
+  "FRMELMNTS_LBL_AVSCORE": "ਸਭ ਤੋਂ ਵਧੀਆ ਮੁਲਾਂਕਣ ਸਕੋਰਾਂ ਦੀ ਔਸਤ",
+  "FRMELMNTS_LBL_BESTSCORE": "ਵਧੀਆ ਸਕੋਰ {{SCORE}}",
+  "FRMELMNTS_LBL_CERTQUES": "ਤੁਸੀਂ ਆਪਣਾ ਸਰਟੀਫਿਕੇਟ ਕਿਵੇਂ ਪ੍ਰਾਪਤ ਕਰਦੇ ਹੋ?",
+  "FRMELMNTS_LBL_NOTIFNUMBER": "{{NUMBER}} ਨਵੀਂ/ਨਵੀਆਂ ਨੋਟੀਫਿਕੇਸ਼ਨ/ਨੋਟੀਫਿਕੇਸ਼ਨਾਂ",
+  "FRMELMNTS_LBL_SEELESS": "ਘੱਟ ਵੇਖੋ",
+  "FRMELMNTS_LBL_SEEMORE": "ਹੋਰ ਵੇਖੋ",
+  "FRMELMNTS_LBL_STATEUSERQUES": "ਕੀ ਤੁਸੀਂ ਰਾਜ ਅਧਿਆਪਕ ਹੋ?",
+  "FRMELMNTS_LNK_DECLARELINK": "ਹੁਣ ਘੋਸ਼ਣਾ ਕਰੋ",
+  "FRMELMNTS_PRMPT_DECLAREPROMPT": "ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਆਪਣੀ ਜਾਣਕਾਰੀ {instance} ’ਤੇ ਘੋਸ਼ਿਤ ਕਰੋ",
+  "FRMELMNTS_SCTTL_NOTIFHEADER": "ਨੋਟੀਫਿਕੇਸ਼ਨਜ਼",
   "FROM": "ਤੋਂ",
   "FULL_NAME": "ਨਾਮ",
+  "GET_STARTED": "ਸ਼ੁਰੂ ਕਰੋ",
   "GOT_IT": "ਠੀਕ ਹੈ",
+  "GO_TO_DOWNLOADS": "ਡਾਊਨਲੋਡਸ 'ਤੇ ਜਾਓ",
+  "GO_TO_PROFILE": "ਪ੍ਰੋਫਾਈਲ 'ਤੇ ਜਾਓ",
   "GRADE_OPTION_TEXT": "ਕਲਾਸ ਚੁਣੋ",
   "GRANT_ACCESS": "ਆਗਿਆ ਦਿਓ",
-  "GROUPS": "ਸਮੂਹ",
-  "GROUPS_YOU_FOLLOW": "ਤੁਹਾਡੇ ਦੁਆਰਾ ਪਾਲਣਾ ਕੀਤੇ ਗਏ ਸਮੂਹ",
-  "GROUP_CREATE_SUCCESS": "ਸਮੂਹ ਸਫਲਤਾਪੂਰਵਕ ਬਣਾਇਆ ਗਿਆ",
-  "GROUP_DELETE_CONFIRM": "ਮਿਟਾਉਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ '{{%s}}'?",
-  "GROUP_DELETE_CONFIRM_MESSAGE": "ਇਹ ਕਾਰਵਾਈ ਸਮੂਹ ਨੂੰ ਮਿਟਾ ਦੇਵੇਗੀ ਪਰ ਉਪਭੋਗਤਾਵਾਂ ਨੂੰ ਨਹੀਂ। ਉਪਭੋਗਤਾ 'ਉਪਭੋਗਤਾ' ਟੈਬ ਦੇ ਹੇਠਾਂ ਲੱਭੇ ਜਾ ਸਕਦੇ ਹਨ",
-  "GROUP_MEMBER_ADD_SUCCESS": "ਸਦੱਸ ਸਫਲਤਾਪੂਰਵਕ ਜੋੜੇ ਗਏ",
-  "GROUP_MEMBER_DELETE_SUCCESS": "ਸਮੂਹ ਮੈਂਬਰ ਸਫਲਤਾਪੂਰਵਕ ਮਿਟਾ ਦਿੱਤੇ ਗਏ",
+  "GROUP_CREATED": "ਸਮੂਹ ਸਫ਼ਲਤਾਪੂਰਵਕ ਬਣਾਇਆ ਗਿਆ",
+  "GROUP_CREATED_BY": "{{group_creator_name}} ਦੁਆਰਾ ਬਣਾਇਆ ਗਿਆ",
+  "GROUP_DESCRIPTION": "ਸਮੂਹ ਦਾ ਵੇਰਵਾ",
+  "GROUP_DESCRIPTION_PLACEHOLDER": "ਮੈਂਬਰਾਂ ਨੂੰ ਸਮੂਹ ਦੇ ਉਦੇਸ਼ਾਂ ਨੂੰ ਸਮਝਣ ਵਿੱਚ ਸਹਾਇਤਾ ਲਈ ਵੇਰਵਾ ਦਾਖਲ ਕਰੋ",
+  "GROUP_GUIDELINES": "ਸਮੂਹ ਦੇ ਦਿਸ਼ਾ-ਨਿਰਦੇਸ਼",
+  "GROUP_MEMBER_SEARCH_PLACEHOLDER": "ਸਮੂਹ ਵਿੱਚ ਭਾਲ ਕਰੋ",
   "GROUP_NAME": "ਸਮੂਹ ਦਾ ਨਾਮ",
+  "GROUP_NAME_IS_REQUIRED": "ਤੁਹਾਨੂੰ ਸਮੂਹ ਦਾ ਨਾਮ ਦਰਜ ਕਰਨਾ ਪਏਗਾ",
+  "GROUP_TERMS_IS_REQUIRED": "ਅੱਗੇ ਵਧਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਨੂੰ ‪{{app_name}}‬ ਦੇ ਸਮੂਹ ਦਿਸ਼ਾ ਨਿਰਦੇਸ਼ਾਂ ਨਾਲ ਸਹਿਮਤ ਹੋਣਾ ਪਏਗਾ",
   "GROUP_UPDATE_SUCCESS": "ਗਰੁੱਪ ਦੇ ਵੇਰਵੇ ਸਫਲਤਾਪੂਰਵਕ ਅਪਡੇਟ ਹੋਏ",
   "HABIT_REMINDER_NOTIFICATION_MESSAGE": "ਅੱਜ {{%s}} ਤੇ ਕੁਝ ਨਵਾਂ ਸਿੱਖੋ!",
   "HELP": "ਮਦਦ",
@@ -278,8 +642,9 @@
   "HIDE_CREDITS_INFO": "ਲਾਇਸੈਂਸਿੰਗ ਜਾਣਕਾਰੀ ਨੂੰ ਲੁਕਾਓ ",
   "HINT_LANGUAGE": "ਮਨ ਪਸੰਦ ਭਾਸ਼ਾ ਚੁਣੋ",
   "HOBBIES": "ਸ਼ੌਕ",
-  "IAM_ABOVE_18_YEARS_AGE": "ਮੇਰੀ ਉਮਰ 18 ਸਾਲ ਤੋਂ ਉਪੱਰ ਹੈ",
-  "IF_YES_LOGIN": "ਜੇ ਹਾਂ,  ਲਾਗਇਨ 'ਤੇ  ਕਲਿਕ ਕਰੋ",
+  "HOURS_AGO": "{{%s}} ਘੰਟੇ ਪਹਿਲਾਂ",
+  "HOUR_AGO": "{{%s}} ਘੰਟੇ ਪਹਿਲਾਂ",
+  "ID_IS_REQUIRED": "ID ਲਾਜ਼ਮੀ ਹੈ",
   "IMPORTING": "ਆਯਾਤ ਕਰ ਰਿਹਾ ਹੈ ...",
   "IMPORTING_COUNT": "ਆਯਾਤ ਕਰ ਰਿਹਾ ਹੈ",
   "IMPORT_ECAR": "ਫਾਈਲ ਫੌਰਮੈਟ ਬੇਮੇਲ ਹੈ। ਤੁਸੀਂ ਸਿਰਫ .ecar, .epar ਅਤੇ .gsa ਫਾਈਲਾਂ ਆਯਾਤ ਕਰ ਸਕਦੇ ਹੋ  ",
@@ -288,105 +653,140 @@
   "INACTIVE": "ਨਿਸ਼ਕਿਰਿਆ",
   "INCORRECT_TEACHER_ID_ERROR": "ਤੁਸੀਂ ਗਲਤ ID ਦਾਖਲ ਕੀਤਾ ਹੈ। ID ਦੁਬਾਰਾ ਦਰਜ ਕਰੋ",
   "INSTALL_CROSSWALK": "ਕਰਾਸਵੋਕ ਇੰਸਟਾਲ ਕਰੋ",
+  "INSTANCE_TERMS_OF_USE": "{{app_name}} ਵਰਤੋਂ ਦੀਆਂ ਸ਼ਰਤਾਂ",
   "INSUFFICIENT_STORAGE": "ਘੱਟ ਸਟੋਰੇਜ ਸਪੇਸ",
   "INTERACTION": "ਪਰਸਪਰ",
+  "INTERACTIVE_MATERIAL": "ਇੰਟਰਐਕਟਿਵ ਅਧਿਐਨ ਸਮੱਗਰੀ",
   "INTERNAL_MEMORY": "ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ",
   "INTERNET_AVAILABLE": "ਤੁਸੀਂ ਹੁਣ ਔਨਲਾਈਨ ਹੋ",
   "INTERNET_CONNECTIVITY_NEEDED": "ਕੋਈ ਇੰਟਰਨੈਟ ਕਨੈਕਟੀਵਿਟੀ ਨਹੀਂ",
   "INVALID_CONTENT": "ਗਲਤ ਸਮੱਗਰੀ",
   "INVALID_FORMAT": "ਅਵੈਧ ਫਾਰਮੈਟ",
+  "INVALID_MEMBER_ID": "ਤੁਸੀਂ ਇੱਕ ਅਵੈਧ ​{{app_name}}​ ID ਦਰਜ ਕੀਤਾ  ਹੈ",
   "INVALID_QR": "ਅਪ੍ਰਮਾਣਿਕ QR ਕੋਡ",
   "ITEMS": "{{%s}} ਫਾਈਲਾਂ(s)",
   "ITEMS_SELECTED": "ਫਾਇਲਾਂ ਚੁਣੀਆਂ",
+  "I_AGREE_TO": "ਮੈਂ {{app_name}} ਨਾਲ ਸਹਿਮਤ ਹਾਂ",
   "I_AGREE_TO_TNC": "ਮੈਂ ਵਰਤਣ ਦੇ ਨਿਯਮਾਂ ਅਤੇ ਸ਼ਰਤਾਂ ਨਾਲ ਸਹਿਮਤ ਹਾਂ",
-  "JOIN_TRAINING": "ਸਿਖਲਾਈ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਵੋ",
+  "I_AM_A_PERSONA_WITH_TENANT": "ਮੈਂ {{%tenant}} ਦੇ ਨਾਲ ਇਕ {{%persona}} ਹਾਂ।",
+  "I_UNDERSTAND_AND_ACCEPT": "ਮੈਂ ਸਮਝਦਾ/ਸਮਝਦੀ ਹਾਂ ਅਤੇ ਸਵੀਕਾਰ ਕਰਦਾ/ਕਰਦੀ ਹਾਂ",
+  "JOIN_TRAINING": "ਕੋਰਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਵੋ",
   "LANGUAGE": "ਭਾਸ਼ਾ",
   "LANGUAGE_SETTINGS": "ਭਾਸ਼ਾ ਸੈਟਿੰਗ",
-  "LAST_DATE_TO_JOIN": "ਦਾਖਲੇ ਦੀ ਆਖਰੀ ਤਾਰੀਖ",
+  "LAST_DATE_TO_JOIN": "ਸ਼ਾਮਲ ਹੋਣ ਦੀ ਆਖਰੀ ਤਾਰੀਖ {{%s}}",
   "LAST_SYNC": "ਆਖਰੀ ਵਾਰ ਸਿੰਕ ਕੀਤਾ ਗਿਆ",
+  "LAST_UPDATED": "ਆਖ਼ਰੀ ਵਾਰ ਅਪਡੇਟ ਕੀਤਾ {{%s}}",
   "LAST_VIEWED": "ਆਖਰੀ ਵਾਰ ਵੇਖਿਆ ਗਿਆ",
-  "LATEST_COURSES": "ਨਵੀਨਤਮ ਕੋਰਸ",
-  "LEAVE_TRAINING_HEADING": "ਤੁਸੀਂ ਸਿਖਲਾਈ ਛੱਡਣਾ ਚਾਹੁੰਦੇ ਹੋ?",
+  "LATEST_COURSES": "ਨਵੀਨਤਮ ਕੋਰਸਿਸ",
+  "LEAVE_GROUP": "ਸਮੂਹ ਛੱਡੋ",
+  "LEAVE_GROUP_ERROR_MSG": "ਸਮੂਹ ਨੂੰ ਛੱਡ ਨਹੀਂ ਸਕਿਆ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ",
+  "LEAVE_GROUP_POPUP_DESC": "ਇਸ ਕਿਰਿਆ ਨੂੰ ਵਾਪਸ ਨਹੀਂ ਲਿਆ ਜਾ ਸਕਦਾ ਹੈ। ਕੀ ਤੁਸੀਂ {{group_name}} ਨੂੰ ਛੱਡਣਾ ਚਾਹੁੰਦੇ ਹੋ? ",
+  "LEAVE_GROUP_POPUP_TITLE": "ਸਮੂਹ ਛੱਡੋ?",
+  "LEAVE_GROUP_SUCCESS_MSG": "ਹੁਣ ਤੁਸੀਂ ਇਸ ਸਮੂਹ ਦਾ ਹਿੱਸਾ ਨਹੀਂ ਹੋ",
+  "LEAVE_TRAINING_HEADING": "ਕੋਰਸ ਛੱਡੋ?",
   "LIBRARY_BNAV": "ਲਾਇਬਰੇਰੀ",
   "LICENSE": "ਲਾਇਸੈਂਸ ਦੀਆਂ ਸ਼ਰਤਾਂ",
   "LOAD": "ਲੋਡ",
+  "LOADER_PROGRESS_DESCRIPTION": "ਅਸੀਂ ਚੀਜ਼ਾਂ ਤਿਆਰ ਕਰ ਰਹੇ ਹਾਂ।",
+  "LOADER_PROGRESS_DESC_SUB_HEADING": "ਕ੍ਰਿਪਾ ਕਰਕੇ ਉਡੀਕ ਕਰੋ...",
   "LOADING_CONTENT": "ਸਮੱਗਰੀ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ",
   "LOADING_CONTENTS": "ਸਮੱਗਰੀ ਨੂੰ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ {{%s}} %",
-  "LOADING_USER_LIST": "ਉਪਭੋਗੀ ਸੂਚੀ ਨੂੰ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕ ਕਰੋ",
   "LOAD_FILE": "ਫਾਇਲ ਲੋਡ ਕਰੋ",
-  "LOGGED_IN_AS": "ਦੇ ਤੌਰ ਤੇ ਲਾਗਇਨ",
-  "LOGGED_OUT": "ਲਾਗ ਆਉਟ",
-  "LOGIN_TO_JOIN_TRAINING": "ਸਿਖਲਾਈ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਲੌਗ ਇਨ ਕਰੋ",
+  "LOGGED_IN_MEMBER": "{{member_name}} (ਤੁਸੀਂ)",
+  "LOGIN_TO_CREATE_GROUP_DESCRIPTION": "ਆਪਣਾ ਸਮੂਹ, ਅਧਿਐਨ ਸਰਕਲ ਜਾਂ ਕਲਾਸਰੂਮ ਬਣਾਉਣ ਲਈ ਪਹਿਲਾ ਕਦਮ ਹੈ ਲੌਗਇਨ ਕਰਨਾ",
+  "LOGIN_TO_JOIN_TRAINING": "ਕੋਰਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਲੌਗ ਇਨ ਕਰੋ",
   "LOGOUT": "ਲਾੱਗ ਆਊਟ",
   "LOW_BANDWIDTH": "ਘੱਟ ਬੈਂਡਵਿਡਥ",
   "LOW_BANDWIDTH_DETECTED": "ਘੱਟ ਬੈਂਡਵਿਡਥ ਨੈਟਵਰਕ ਖੋਜਿਆ ਗਿਆ",
-  "MARKS": "ਨੰਬਰ",
+  "MAINTENANCE_MESSAGE": "ਅਸੀਂ ਇਸ ਸਮੇਂ ਦੇਖਭਾਲ ਲਈ ਰੁਕੇ ਹਾਂ, ਪਰ ਚਿੰਤਾ ਨਾ ਕਰੋ ਅਸੀਂ {{%timeLeft}} ਘੰਟਿਆਂ ਵਿਚ ਵਾਪਿਸ ਆਵਾਂਗੇ। ਜਲਦੀ ਵਾਪਿਸ ਆਉਣਾ!",
+  "MAINTENANCE_SUB_TEXT": "ਤੁਸੀਂ ਅਜੇ ਵੀ ਉਹ ਕੰਟੇਂਟ ਐਕਸੈਸ ਕਰ ਸਕਦੇ ਹੋ ਜੋ ਤੁਸੀਂ ਡਾਊਨਲੋਡ ਕੀਤੇ ਹਨ",
+  "MAKE_ADMIN": "ਐਡਮਿਨ ਬਣਾਓ",
+  "MAKE_GROUP_ADMIN_ERROR_MSG": "{{member_name}} ਨੂੰ ਗਰੁੱਪ ਪ੍ਰਬੰਧਕ ਨਹੀਂ ਬਣਾ ਸਕਿਆ",
+  "MAKE_GROUP_ADMIN_POPUP_DESC": "ਇਹ ਕਾਰਵਾਈ {{member_name}} ਸਮੂਹ ਪ੍ਰਬੰਧਕਾਂ ਨੂੰ ਅਧਿਕਾਰ ਦੇਵੇਗੀ",
+  "MAKE_GROUP_ADMIN_POPUP_TITLE": "ਸਮੂਹ ਪ੍ਰਬੰਧਕ ਬਣਾਓ?",
+  "MAKE_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} ਹੁਣ ਸਮੂਹ ਪ੍ਰਬੰਧਕ ਹੈ",
   "MEDIUM": "ਮਾਧਿਅਮ",
-  "MEDIUM_OF_INSTRUCTION": "ਹਿਦਾਇਤ ਦਾ ਮਾਧਿਅਮ",
+  "MEDIUM_OF_INSTRUCTION": "ਹਦਾਇਤ ਦਾ ਮਾਧਿਅਮ",
   "MEDIUM_OPTION_TEXT": "ਮਾਧਿਅਮ ਚੁਣੋ",
+  "MEMBERS": "ਮੈਂਂਬਰਸ",
+  "MEMBER_ADDED_TO_GROUP": "ਮੈਂਬਰ ਸਫ਼ਲਤਾਪੂਰਵਕ ਸਮੂਹ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਇਆ",
+  "MEMBER_ALREADY_EXISTS_IN_GROUP": "ਇਹ ਮੈਂਬਰ ਪਹਿਲਾਂ ਹੀ ਸਮੂਹ ਦਾ ਇਕ ਹਿੱਸਾ ਹੈ।",
+  "MEMBER_ID": "{{app_name}} ID",
+  "MENU_DELETE_GROUP": "ਸਮੂਹ ਹਟਾਓ",
+  "MENU_DISMISS_AS_GROUP_ADMIN": "ਸਮੂਹ ਪ੍ਰਬੰਧਕ ਵਜੋਂ ਬਰਖਾਸਤ ਕਰੋ",
+  "MENU_EDIT_GROUP_DETAILS": "ਸਮੂਹ ਦੇ ਵੇਰਵੇ ਸੰਪਾਦਿਤ ਕਰੋ",
+  "MENU_LEAVE_GROUP": "ਸਮੂਹ ਛੱਡੋ",
+  "MENU_MAKE_GROUP_ADMIN": "ਸਮੂਹ ਪ੍ਰਬੰਧਕ ਬਣਾਉ",
+  "MENU_REMOVE_ACTIVITY": "ਗਤੀਵਿਧੀ ਨੂੰ ਹਟਾਓ",
+  "MENU_REMOVE_FROM_GROUP": "ਸਮੂਹ ਵਿੱਚੋਂ ਹਟਾਓ",
   "MERGE_ACCOUNT": "ਖਾਤਾ ਮਿਲਾਉ",
   "MICROPHONE": "ਮਾਈਕ੍ਰੋਫੋਨ",
   "MICROPHONE_PERMISSION_DESCRIPTION": "{{%s}} ਸਿਰਫ ਸਮੱਗਰੀ ਵਿਚ ਮਾਈਕ੍ਰੋਫੋਨ ਅਨੁਮਤੀਆਂ ਦੀ ਵਰਤੋਂ ਕਰਦਾ ਹੈ ਜੋ ਤੁਹਾਨੂੰ ਆਪਣੀ ਅਵਾਜ਼ ਨੂੰ ਰਿਕਾਰਡ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ.",
+  "MINUTES_AGO": "{{%s}} ਮਿੰਟ ਪਹਿਲਾਂ",
+  "MINUTE_AGO": "{{%s}} ਮਿੰਟ ਪਹਿਲਾਂ",
+  "MONTHS_AGO": "{{%s}} ਮਹੀਨੇ  ਪਹਿਲਾਂ",
+  "MONTH_AGO": "{{%s}} ਮਹੀਨੇ ਪਹਿਲਾਂ",
   "MORE": "ਹੋਰ",
   "MORE_CONTENT": "{{%s}} ਤੇ ਵਧੇਰੇ ਕਿਤਾਬਾਂ ਅਤੇ ਸਮੱਗਰੀ ਲੱਭੋ",
+  "MORE_COUNT": "ਹੋਰ ({{%s}})",
   "MORE_DETAILS": "ਹੋਰ ਜਾਣਕਾਰੀ (ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਪ੍ਰਦਾਨ ਕਰੋ ਜਾਂ ਮੁੱਦੇ ਦਾ ਸਕ੍ਰੀਨਸ਼ਾਟ ਲਗਾਓ)",
   "MOVE": "ਸਥਾਨ ਦੀ ਬਦਲੀ",
   "MOVE_FILES_TO_OTHER_DESTINATION": "ਸਪੇਸ ਖਾਲੀ ਕਰਨ ਲਈ, {{%s}} ਫਾਇਲਾਂ ਨੂੰ ਭੇੇਜੋ ",
   "MSG_ALREADY_IMPORTED": "ਪਹਿਲਾਂ ਹੀ ਆਯਾਤ ਕੀਤਾ ਗਿਆ",
   "MSG_IMPORTED_SUCCESSFULLY": " ਸਮੱਗਰੀ ਸਫਲਤਾਪੂਰਵਕ ਏਮਪੋਰਟ ਕੀਤੀ ਗਈ",
-  "MSG_LOADING_BATCHES": "ਬੈਚ ਲਿਆ ਰਿਹਾ ਹੈ ...",
   "MSG_NO_DETAILS_TO_SHOW": "ਵੇਰਵੇ ਉਪਲੱਬਧ ਨਹੀਂ ਹਨ",
   "MSG_NO_NEW_NOTIFICATION": "ਕੋਈ ਨਵੀਂ ਸੂਚਨਾ ਨਹੀਂ",
   "MSG_RESOURCE_DELETED": "ਸਮੱਗਰੀ  ਜੰਤਰ ਤੋਂ ਮਿਟਾਈ ਗਈ",
   "MULTIPLE_LICENSE": "ਲਾਇਸੈਂਸ ਦੀਆਂ ਸ਼ਰਤਾਂ {{%s}}",
   "MY_BADGES": "ਮੇਰਾ ਬੈਜ (ਐੱਸ)",
+  "MY_DETAILS": "ਮੇਰੇ ਵੇਰਵੇ",
+  "MY_GROUPS": "ਮੇਰੇ ਸਮੂਹ",
   "NAME": "ਨਾਮ",
   "NAME_HINT": "ਨਾਮ ਦਰਜ ਕਰੋ",
+  "NAME_IS_REQUIRED": "ਤੁਹਾਨੂੰ ਉਪਭੋਗਤਾ ਦਾ ਨਾਮ ਦਰਜ ਕਰਨਾ ਪਵੇਗਾ",
   "NEED_INTERNET_FOR_DEEPLINK_CONTENT": "ਤੁਸੀਂ ਆਫਲਾਈਨ ਹੋ। ਕੰਟੇਂਟ ਨੂੰ ਐਕਸੈਸ ਕਰਨ ਲਈ ਇੰਟਰਨੈਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ।",
   "NEED_INTERNET_TO_CHANGE": "ਵਾਈਫਾਈ ਜਾਂ ਮੋਬਾਈਲ ਡਾਟਾ ਚਾਲੂ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ",
   "NEW": "ਨਵਾਂ",
   "NEW_NOTIFICATIONS": "{{%s}} ਨਵੀਂ ਸੂਚਨਾ(s)",
   "NEXT": "ਅਗਲਾ",
-  "NIL": "ਨੀਲ",
+  "NIL": "ਕੁਝ ਨਹੀਂ",
   "NO": "ਨਹੀਂ",
+  "NOTE": "ਨੋਟ",
   "NOTIFICATION": "ਸੂਚਨਾ",
   "NOT_AVAILABLE": "ਉਪੱਲਬਧ ਨਹੀਂ ਹੈ",
   "NOT_NOW": "ਹਾਲੇ ਨਹੀਂ",
   "NO_APP_FOR_INTENT": "ਫਾਈਲ ਖੋਲ੍ਹਣ ਲਈ ਕੋਈ ਐਪ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ",
-  "NO_ASSESSMENT": "ਕੋਈ ਮੁਲਾਂਕਣ ਉਪਲਬਧ ਨਹੀਂ",
   "NO_BATCHES_AVAILABLE": "ਕੋਈ ਬੈਚ ਉਪਲਬਧ ਨਹੀਂ",
   "NO_BOOKS_AVAILABLE": "ਬੋਰਡ ਅਜੇ ਹੋਰ ਕਿਤਾਬਾਂ ਸ਼ਾਮਿਲ ਕਰ ਰਿਹਾ ਹੈ",
-  "NO_BOOKS_DEFINITION": "ਤੁਹਾਡਾ ਬੋਰਡ ਅਜੇ ਹੋਰ ਕਿਤਾਬਾਂ ਸ਼ਾਮਲ ਕਰਨ ਵਾਲਾ ਹੈ। {{%s}} ਤੇ ਹੋਰ ਕਿਤਾਬਾਂ ਅਤੇ ਸਮੱਗਰੀ ਨੂੰ ਵੇਖਣ ਲਈ ਬਟਨ ਨੂੰ ਟੈਪ ਕਰੋ",
+  "NO_BOOKS_DEFINITION": "ਤੁਹਾਡਾ ਬੋਰਡ ਅਜੇ ਹੋਰ ਕਿਤਾਬਾਂ ਸ਼ਾਮਲ ਕਰਨ ਵਾਲਾ ਹੈ। {{%s}} ਉੱਤੇ ਕੰਟੇਂਟ ਲਈ ਬੇਨਤੀ ਕਰਨ ਲਈ, <b>See more books and content</b> ਬਟਨ 'ਤੇ ਕਲਿਕ ਕਰੋ",
+  "NO_BOOKS_TEXT": "{{%s}} ਉੱਤੇ ਤੁਹਾਡੇ ਵਿਸ਼ੇ ਦੀ ਪਾਠ ਪੁਸਤਕ ਨਹੀਂ ਲੱਭ ਸਕਿਆ?",
   "NO_CONTENTS": "ਨਹੀਂ {{%s}}",
   "NO_CONTENTS_FOUND": "ਸਮੱਗਰੀ ਨਹੀਂ ਲੱਭ ਸਕਿਆ",
   "NO_CONTENTS_MESSAGE": "ਇਕ ਹੋਰ ਸਮਗਰੀ ਦੀ ਕਿਸਮ ਚੁਣੋ",
+  "NO_CONTENT_AVAILABLE_IN_MODULE": "ਇਸ ਮੋਡੀਊਲ ਵਿੱਚ ਕੋਈ ਕੰਟੇਂਟ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ",
+  "NO_COURSES": "ਕੋਈ ਕੋਰਸਿਸ ਨਹੀਂ ਹਨ",
   "NO_DATA_FOUND": "ਕੋਈ ਡਾਟਾ ਨਹੀਂ ਮਿਲਿਆ",
-  "NO_DESCRIPTION": "ਵੇਰਵਾ ਉਪੱਲਬਧ ਨਹੀਂ ਹੈ",
   "NO_DOWNLOADS": "ਹਾਲੇ ਤੱਕ ਕੋਈ ਡਾਉਨਲੋਡ ਨਹੀਂ ਹਨ",
-  "NO_DOWNLOADS_INFO": "ਸਿਖਲਾਈ ਜਾਂ ਲਾਇਬ੍ਰੇਰੀ ਤੋਂ ਸਮੱਗਰੀ ਡਾਉਨਲੋਡ ਕਰੋ",
+  "NO_DOWNLOADS_INFO": "ਕੋਰਸਿਸ, ਜਾਂ ਲਾਇਬ੍ਰੇਰੀ ਤੋਂ ਕੰਟੇਂਟ ਡਾਊਨਲੋਡ ਕਰੋ",
   "NO_FILTERS_SELECTED": "ਕੋਈ ਫਿਲਟਰ ਨਹੀਂ ਚੁਣਿਆ",
-  "NO_GROUPS_CREATED_YET": "ਅਜੇ ਕੋਈ ਸਮੂਹ ਨਹੀਂ ਬਣਾਇਆ",
-  "NO_GROUP_MESSAGE": "ਸਮੂਹ ਉਪਭੋਗਤਾ ਨੂੰ ਵਧੀਆ ਢੰਗ ਨਾਲ ਸੰਗਠਿਤ ਕਰਨ ਵਿੱਚ ਮਦਦ ਕਰਦੇ ਹਨ। ਤੁਸੀਂ ਸਮੁੱਚੇ ਤੌਰ ਤੇ ਬਿਹਤਰ ਤਰੱਕੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਲਈ ਸਮੂਹਾਂ ਨੂੰ ਵਰਤ ਸਕਦੇ ਹੋ",
   "NO_INTERNET": "ਕੋਈ ਇੰਟਰਨੈਟ ਨਹੀਂ",
   "NO_INTERNET_TITLE": "ਤੁਸੀਂ ਔਫਲਾਈਨ ਹੋ",
   "NO_PREVIEW": "ਪੇਸ਼ਕਾਰੀ ਨਹੀ ਹੈ",
   "NO_QR_CODE": "ਮੇਰੇ ਕੋਲ QR ਕੋਡ ਨਹੀਂ ਹੈ",
   "NO_QR_CODE_QSTN": "ਕੀ QR ਕੋਡ ਨਹੀਂ ਹੈ?",
   "NO_RATING": "ਹਾਲੇ ਰੇਟ ਨਹੀਂ ਕੀਤਾ ਗਿਆ",
-  "NO_USERS": "ਕੋਈ ਉਪਭੋਗਤਾ ਨਹੀਂ ਹੈ",
-  "NO_USERS_CREATED_YET": "ਅਜੇ ਤੱਕ ਕੋਈ ਉਪਭੋਗਤਾ ਨਹੀਂ ਬਣਾਇਆ ਗਿਆ",
-  "NO_USERS_CREATED_YET_MSG": "ਤੁਸੀਂ ਆਪਣੇ ਵਿਦਿਆਰਥੀ ਜਾਂ ਦੂਜੇ ਅਧਿਆਪਕਾਂ ਲਈ ਮਹਿਮਾਨ ਉਪਭੋਗਤਾ ਖਾਤੇ ਬਣਾ ਸਕਦੇ ਹੋ",
-  "NO_USERS_IN_THIS_GROUP": "ਇਸ ਸਮੂਹ ਵਿੱਚ ਕੋਈ ਉਪਭੋਗਤਾ ਨਹੀਂ",
-  "NO_USERS_ON_THIS_DEVICE": "ਇਸ ਜੰਤਰ ਤੇ ਕੋਈ ਉਪਭੋਗੀ  ਨਹੀਂ",
-  "NO_USERS_SUGGESTION_MESSAGE": "ਇੱਕ ਸਮੂਹ ਵਿੱਚ ਘੱਟੋ ਘੱਟ ਇੱਕ ਉਪਭੋਗਤਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ",
-  "NUMBER_OF_VOTES": "ਵੋਟ ਦੀ ਗਿਣਤੀ",
+  "NUMBER_OF_COURSES": "{{%s}} ਕੋਰਸਿਸ",
+  "NUMBER_OF_COURSE_1": "ਕੋਰਸ ({{%s}})",
+  "NUMBER_OF_VOTES": "ਵੋਟਾਂ ਦੀ ਗਿਣਤੀ",
   "OFF": "ਬੰਦ",
   "OFFLINE_DOWNLOAD_MESSAGE": "ਜਦੋਂ ਇੰਟਰਨੈਟ ਕਨੈਕਟੀਵਿਟੀ ਹੋਵੇ ਤਾਂ ਸਵੈਚਲਿਤ ਤੌਰ ਤੇ ਡਾਉਨਲੋਡਸ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਹੋ ਜਾਣਗੇ",
   "OFFLINE_WARNING": "ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਤੁਹਾਡਾ ਜੰਤਰ ਇੰਟਰਨੈਟ ਨਾਲ ਜੁੜਿਆ ਹੈ",
   "OFFLINE_WARNING_ETBUI": "ਸਮੱਗਰੀ ਨੂੰ ਵੇਖਣ ਲਈ ਇੰਟਰਨੈਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ",
   "OFFLINE_WARNING_ETBUI_1": "ਸਮੱਗਰੀ ਨੂੰ ਵੇਖਣ ਲਈ ਇੰਟਰਨੈਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ",
   "OKAY": "ਠੀਕ ਹੈ",
-  "ONLY_DOWNLOADED_CONTENT_CAN_BE_PLAYED_OFFLINE": "ਸਿਰਫ ਡਾਉਨਲੋਡ ਕੀਤੀ ਸਮੱਗਰੀ ਨੂੰ ਔਫਲਾਈਨ ਚਲਾਇਆ ਜਾ ਸਕਦਾ ਹੈ",
+  "ONGOING": "ਚਲ ਰਿਹਾ ਹੈ",
+  "ONLY_DIGIT_NUMBER_IS_ALLOWED": "ਸਿਰਫ਼ 11 ਅੰਕ ਨੰਬਰ ਦੀ ਆਗਿਆ ਹੈ",
+  "ONLY_DOWNLOADED_CONTENT_CAN_BE_PLAYED_OFFLINE": "ਸਿਰਫ਼ ਡਾਊਨਲੋਡ ਕੀਤੇ ਕੰਟੇਂਟ ਨੂੰ ਔਫਲਾਈਨ ਚਲਾਇਆ ਜਾ ਸਕਦਾ ਹੈ",
   "OPEN": "ਖੋਲ੍ਹੋ",
   "OPEN_SETTINGS": "ਸੈਟਿੰਗਾਂ ਖੋਲੋ",
   "OPTIONAL": "ਵਿਕਲਪਿਕ",
@@ -395,16 +795,15 @@
   "ORIGINAL_CONTENT": "ਸਮੱਗਰੀ",
   "ORIGINAL_CONTENT_DATA": "ਇਹ ਸਮੱਗਰੀ ਨੂੰ ਇਸ ਤੋਂ ਲਿਆ ਗਿਆ ਹੈ:",
   "OTHER_ROLE_DESC_1": "ਡਿਜੀਟਲ ਕੰਟੇਂਟ ਨੂੂੰ ਬ੍ਰਾਉਜ਼ ਕਰੋ",
-  "OTHER_ROLE_DESC_2": "ਸੰਬੰਧਿਤ ਸਰੋਤ ਲੱਭੋ",
-  "OTHER_USERS": "ਹੋਰ ਉਪਭੋਗਤਾ",
-  "OTP_FAILED": "OTP ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।",
+  "OTHER_ROLE_DESC_2": "ਆਨਲਾਇਨ ਕੋਰਸ ਲਵੋ",
+  "OTP_FAILED": "OTP ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਵਿੱਚ ਅਸਫ਼ਲ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।",
   "OTP_PLACEHOLDER": "OTP ਦਰਜ ਕਰੋ",
   "OTP_RESENT": "OTP ਦੁਬਾਰਾ ਭੇਜਿਆ ਗਿਆ",
   "OVERLAY_INFO_TEXT_COMMON": "ਸਾਰੀਆਂ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੱਕ ਪਹੁੰਚ ਲਈ ਲੌਗ ਇਨ ਕਰੋ",
-  "OVERLAY_INFO_TEXT_TAKE_COURSE": "ਸਿਖਲਾਈ ਰਜਿਸਟਰਡ ਉਪਭੋਗਤਾਵਾਂ ਲਈ ਹੈ। ਕੋਰਸ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਲਈ ਲੌਗ ਇਨ ਕਰੋ।",
+  "OVERLAY_INFO_TEXT_TAKE_COURSE": "ਇਹ ਕੋਰਸ ਰਜਿਸਟਰਡ ਉਪਭੋਗਤਾਵਾਂ ਲਈ ਹੈ। ਕੋਰਸ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਲਈ ਲੌਗ ਇਨ ਕਰੋ।",
   "OVERLAY_LABEL_COMMON": "ਲਈ ਬੇਅੰਤ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰੋ {{%s}}.",
   "OVERLAY_LABEL_HOME": "ਤੁਹਾਡਾ ਨਿੱਜੀ ਹੋਮ ਟੈਬ",
-  "OVERLAY_LABEL_TAKE_COURSE": "ਇਸ ਕੋਰਸ ਵਿੱਚ ਦਾਖਲ ਹੋਣ ਲਈ ਸਾਈਨ ਇਨ ਕਰੋ",
+  "OVERLAY_LABEL_TAKE_COURSE": "ਇਸ ਕੋਰਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਲੌਗ ਇਨ ਕਰੋ",
   "OVERLAY_SIGN_IN": "ਲਾਗਇਨ",
   "OVER_WIFI": "ਵਾਈਫਾਈ ਉੱਤੇ",
   "PEOPLE_WHO_FOLLOW_YOU": "ਚੇਲੇ",
@@ -419,32 +818,40 @@
   "PHONE_EDIT_SUCCESS": "ਮੋਬਾਈਲ ਨੰਬਰ ਸਫਲਤਾਪੂਰਕ ਅਪਡੇਟ ਕੀਤਾ ਗਿਆ",
   "PHONE_PLACEHOLDER": "ਫੋਨ ਨੰਬਰ",
   "PHONE_UPDATE_SUCCESS": "ਫੋਨ ਨੰਬਰ ਸਫਲਤਾਪੂਰਵਕ ਅਪਡੇਟ ਕੀਤਾ ਗਿਆ",
-  "PLAY": "ਖੇਡੋ",
-  "PLAY_AS": "ਇਸ ਤਰ੍ਹਾਂ ਖੇਡੋ",
-  "PLAY_FROM_DEVICE": "ਜੰਤਰ ਤੋਂ ਚਲਾਓ",
-  "PLAY_ONLINE": "ਆਨਲਾਈਨ ਖੇਡੋ",
-  "PLEASE_DOWNLOAD_TO_PLAY": "ਖੇਡਣ ਲਈ ਸਮੱਗਰੀ ਡਾਉਨਲੋਡ ਕਰੋ",
+  "PLANNED_MAINTENANCE_TEXT": "ਅਸੀਂ ਇਸ ਸਮੇਂ ਦੇਖਭਾਲ ਲਈ ਰੁਕੇ  ਹਾਂ, ਪਰ ਚਿੰਤਾ ਨਾ ਕਰੋ ਅਸੀਂ ਜਲਦੀ ਹੀ ਵਾਪਿਸ ਆਵਾਂਗੇ",
+  "PLANNED_MAINTENANCE_TEXT_WITH_TIME": "ਅਸੀਂ ਇਸ ਸਮੇਂ ਦੇਖਭਾਲ ਲਈ ਰੁਕੇ ਹਾਂ, ਪਰ ਚਿੰਤਾ ਨਾ ਕਰੋ ਅਸੀਂ ਵਿੱਚ ਵਾਪਿਸ ਆਵਾਂਗੇ",
+  "PLAY": "ਚਲਾਓ",
+  "PLAY_AS": "ਇਸ ਤਰ੍ਹਾਂ ਚਲਾਓ",
+  "PLAY_FROM_DEVICE": "ਡਿਵਾਈਸ ਤੋਂ ਚਲਾਓ",
+  "PLAY_ONLINE": "ਆਨਲਾਈਨ ਚਲਾਓ",
+  "PLEASE_DOWNLOAD_TO_PLAY": "ਚਲਾਉਣ ਲਈ ਕੰਟੇਂਟ ਡਾਊਨਲੋਡ ਕਰੋ",
+  "PLEASE_ENTER": "{{%s}} ਦਰਜ ਕਰੋ",
+  "PLEASE_PROVIDE_FOLLOWING_DETAILS": "ਕਿਰਪਾ ਕਰਕੇ ਹੇਠ ਦਿੱਤੇ ਵੇਰਵੇ ਪ੍ਰਦਾਨ ਕਰੋ",
   "PLEASE_SELECT": "ਚੁਣੋ {{%s}}",
   "PLEASE_SELECT_A_LANGUAGE": "ਕੋਈ ਭਾਸ਼ਾ ਚੁਣੋ",
-  "PLEASE_SELECT_USER": "ਇੱਕ ਉਪਭੋਗਤਾ ਚੁਣੋ",
-  "POPULAR_COURSES": "ਪ੍ਰਸਿੱਧ ਕੋਰਸ",
+  "PLEASE_VALIDATE_YOUR_EMAIL_ADDRESS": "ਆਪਣਾ ਈਮੇਲ ਪਤਾ ਪ੍ਰਮਾਣਿਤ ਕਰੋ",
+  "PLEASE_VALIDATE_YOUR_MOBILE_NUMBER": "ਆਪਣੇ ਮੋਬਾਈਲ ਨੰਬਰ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰੋ",
+  "POPULAR_COURSES": "ਪ੍ਰਸਿੱਧ ਕੋਰਸਿਸ",
+  "POWER_OF_GROUPS": "ਕੀ ਤੁਸੀਂ ਅਜੇ ਸਮੂਹਾਂ ਦੀ ਸੰਭਾਵਨਾ ਦੀ ਪੜਚੋਲ ਕੀਤੀ ਹੈ?",
+  "PREFERENCES_CAN_BE_UPDATED": "ਤੁਸੀਂ ਪ੍ਰੋਫਾਈਲ ਪੇਜ ਤੋਂ ਇਸ ਉਪਭੋਗਤਾ ਦੇ ਵੇਰਵਿਆਂ ਨੂੰ ਸੰਪਾਦਿਤ ਕਰ ਸਕਦੇ ਹੋ",
   "PREVIEWS": "ਪੂਰਵਦਰਸ਼ਨ",
   "PREVIOUS_USER_SETTINGS": " ਪਿਛਲੇ ਉਪਭੋਗਤਾ ਸੈਟਿੰਗਾਂ ਨਾਲ ਜਾਰੀ ਰੱਖਣਾ ਹੈ?",
   "PRINT": "ਛਾਪੋ",
-  "PRIVATE": "ਨਿੱਜੀ",
+  "PRIVACY_POLICY": "ਪਰਾਈਵੇਟ ਨੀਤੀ",
   "PROFILE_BNAV": "ਪ੍ਰੋਫਾਈਲ",
-  "PROFILE_DETAILS_TITLE": "ਪ੍ਰੋਫਾਇਲ ਵਿਸਥਾਰ",
+  "PROFILE_DETAILS_TITLE": "ਪ੍ਰੋਫਾਈਲ ਦੇ ਵੇਰਵੇ",
   "PROFILE_UPDATE_FAILED": "ਪ੍ਰੋਫਾਈਲ ਅਪਡੇਟ ਅਸਫਲ, ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ",
   "PROFILE_UPDATE_SUCCESS": "ਪ੍ਰੋਫ਼ਾਈਲ ਨੂੰ ਸਫਲਤਾਪੂਰਵਕ ਅਪਡੇਟ ਕੀਤਾ ਗਿਆ",
+  "PROGRAMS_DESC": "ਤੁਹਾਡੇ ਸਥਾਨ ਅਤੇ ਤੁਹਾਡੀ ਭੂਮਿਕਾ ਲਈ ਤਿਆਰ ਕੀਤੇ ਗਏ ਸਰਗਰਮ ਵਿਦਿਅਕ ਪ੍ਰੋਗਰਾਮਾਂ ਨੂੰ ਵੇਖੋ ਅਤੇ ਇਹਨਾਂ ਵਿਚ ਹਿੱਸਾ ਲਓ",
+  "PROGRESS_CANNOT_BE_TRACKED": "{{collectionType}} ਲਈ ਤਰੱਕੀ ਟਰੈਕ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ",
   "PROVIDE_BELOW_INFO": "ਹੇਠਾਂ ਜਾਣਕਾਰੀ ਪ੍ਰਦਾਨ ਕਰੋ",
   "PUBLIC": "ਜਨਤਕ",
   "PUBLISHED_BY": "{{%s}} ਦੁਆਰਾ ਪ੍ਰਕਾਸ਼ਿਤ",
   "PUBLISHED_DATE": "ਪ੍ਰਕਾਸ਼ਿਤ ਤਾਰੀਖ",
-  "QR_CODE_DETAILS": "ਆਪਣੇ ਪਾਠ ਪੁਸਤਕ ਤੋਂ QR ਕੋਡ ਨੂੰ ਸਕੈਨ ਕਰਕੇ ਡਿਜੀਟਲ ਕੰਟੇਂਟ ਤੱਕ ਤੁਰੰਤ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰੋ।",
+  "PUBLISHER": "ਪ੍ਰਕਾਸ਼ਕ",
+  "QR_CODE_DETAILS": "ਆਪਣੀ ਪਾਠ ਪੁਸਤਕ ਤੋਂ QR ਕੋਡ ਨੂੰ ਸਕੈਨ ਕਰਕੇ ਡਿਜੀਟਲ ਕੰਟੇਂਟ ਤੱਕ ਤੁਰੰਤ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰੋ।",
   "QR_SHOWING_MULTIPLE_BOOK_RESULT": "{{%s}} ਲਈ ਨਤੀਜੇ ਦਿਖਾ ਰਿਹਾ ਹੈ",
-  "QUESTION": "ਪ੍ਰਸ਼ਨ",
-  "QUESTIONS": "ਸਵਾਲ",
-  "QUESTION_MARKS": "ਸਵਾਲ (ਨੰਬਰ)\n",
+  "QUES_BANKS": "ਪ੍ਰਸ਼ਨ ਬੈਂਕਸ",
   "QUIZ": "ਕੁਇਜ਼",
   "QUIZ_CONTENTS_ONLY_REGISTERED_USERS": "ਕੁਇਜ਼ ਸਿਰਫ ਰਜਿਸਟਰਡ ਉਪਭੋਗਤਾਵਾਂ ਲਈ ਹੈ",
   "RATE": "ਰੇਟ",
@@ -453,7 +860,7 @@
   "RATING_QUESTION": "ਕੀ ਤੁਸੀਂ ਸਾਨੂੰ ਹੋਰ ਦੱਸਣਾ ਚਾਹੁੰਦੇ ਹੋ?",
   "READ_LESS": "ਘੱਟ ਪੜ੍ਹੋ",
   "READ_MORE": "ਹੋਰ ਪੜ੍ਹੋ",
-  "RECENTLY_VIEWED": "ਹਾਲ ਹੀ ਵਿੱਚ ਵੇਖੇ ਗਏ",
+  "RECOMMENDATION_BASED_ON_PROFILE": "ਤੁਹਾਡੇ ਪ੍ਰੋਫਾਈਲ ਵੇਰਵਿਆਂ ਦੇ ਅਧਾਰ 'ਤੇ ਸਿਫਾਰਸ਼ਾਂ",
   "RECOMMENDED": "ਸੁਝਾਅ",
   "RECOVERY_ACCOUNT_UPDATE_SUCCESS": "ਰਿਕਵਰੀ ਖਾਤਾ ਸਫਲਤਾਪੂਰਵਕ ਅਪਡੇਟ ਕੀਤਾ ਗਿਆ",
   "RECOVERY_ID_DESCRIPTION": "ਕਿਸੇ ਵੀ ਕਾਰਨ ਤੁਹਾਡਾ ਖਾਤਾ ਬੰਦ ਹੋ ਜਾਂਦਾ ਹੈ ,ਤੇ ਊੂਸ ਨੂੂੂੂਂ ਦੁਬਾਰਾ ਸ਼ੁਰੂ  ਕਰਨ ਲਈ ਰਿਕਵਰੀ ਖਾਤਾ ਦੀ ਕਿਸਮ ਦੀ ਚੋਣ ਕਰੋ ਅਤੇ ਵੇਰਵੇ ਦਰਜ ਕਰੋ:\n",
@@ -461,59 +868,74 @@
   "REDO_ASSESSMENT": "ਮੁੜ ਮੁਲਾਂਕਣ",
   "REGISTER_TO_COMPLETE_ACCESS": "ਸਮੱਗਰੀ ਤੱਕ ਪੂਰੀ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਰਜਿਸਟਰ ਕਰੋ",
   "REMOVE": "ਮਿਟਾਓ",
+  "REMOVE_ACTIVITY": "ਹਟਾਓ",
+  "REMOVE_ACTIVITY_ERROR_MSG": "ਗਤੀਵਿਧੀ ਨੂੰ ਹਟਾ ਨਹੀਂ ਸਕਿਆ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ",
+  "REMOVE_ACTIVITY_GROUP_DESC": "ਗਤੀਵਿਧੀ ਨੂੰ ਹਟਾਉਣਾ ਇਸਨੂੰ ਸਮੂਹ ਦੀ ਗਤੀਵਿਧੀ ਤੋਂ ਦੂਰ ਕਰ ਦਿੰਦਾ ਹੈ ਅਤੇ ਤੁਸੀਂ ਹੁਣ ਮੈਂਬਰ ਦੀ ਤਰੱਕੀ ਨੂੰ ਚੈੱਕ ਨਹੀਂ ਕਰ ਸਕਦੇ",
+  "REMOVE_ACTIVITY_POPUP_TITLE": "ਗਤੀਵਿਧੀ ਹਟਾਓ?",
+  "REMOVE_ACTIVITY_SUCCESS_MSG": "ਸਮੂਹ ਲਈ ਗਤੀਵਿਧੀ ਨੂੰ ਸਫ਼ਲਤਾਪੂਰਵਕ ਹਟਾਇਆ ਗਿਆ",
   "REMOVE_FROM_DEVICE": "ਜੰਤਰ ਤੋਂ ਸਮਗਰੀ ਨੂੰ ਮਿਟਾਓ",
   "REMOVE_FROM_DEVICE_MSG": "ਕੀ ਤੁਸੀਂ ਨਿਸ਼ਚਤ ਰੂਪ ਤੋਂ ਇਸ ਸਮੱਗਰੀ ਨੂੰ ਜੰਤਰ ਤੋਂ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?",
-  "REMOVE_MULTIPLE_USERS_FROM_GROUP": "{{%s}} ਉਪਭੋਗੀਆਂ ਨੂੰ ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ",
-  "REMOVE_USERS": "ਉਪਭੋਗਤਾ ਹਟਾਓ",
-  "REMOVE_USERS_FROM_GROUP": "ਸਮੂਹ ਤੋਂ {{%s}} ਉਪਭੋਗਤਾ ਹਟਾਓ",
-  "REPORTS": "ਰਿਪੋਰਟ",
+  "REMOVE_MEMBER": "ਮੈਂਬਰ ਹਟਾਓ",
+  "REMOVE_MEMBER_ERROR_MSG": "ਸਮੂਹ ਵਿੱਚੋਂ ਮੈਂਬਰ ਹਟਾ ਨਹੀਂ ਸਕਿਆ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ",
+  "REMOVE_MEMBER_GROUP_DESC": "{{member_name}} ਨੂੰ ਹਟਾਉਣ 'ਤੇ ਉਸਨੂੰ ਸਮੂਹ ਵਿਚੋਂ ਪੱਕੇ ਤੌਰ 'ਤੇ ਹਟਾ ਦਿੱਤਾ ਜਾਂਦਾ ਹੈ",
+  "REMOVE_MEMBER_POPUP_TITLE": "ਮੈਂਬਰ ਹਟਾਓ?",
+  "REMOVE_MEMBER_SUCCESS_MSG": "{{member_name}} ਹੁਣ ਸਮੂਹ ਦਾ ਹਿੱਸਾ ਨਹੀਂ ਹੈ",
+  "REQUEST_CONTENT": "ਸਾਨੂੰ ਇੱਥੇ ਦੱਸੋ",
   "RESEND_OTP": "OTP ਦੁਬਾਰਾ ਭੇਜੋ",
+  "RESET": "ਰੀਸੈੱਟ",
   "RESOURCE_TYPE": "ਸਰੋਤ ਦੀ ਕਿਸਮ",
-  "RESULT": "ਨਤੀਜਾ",
+  "RESPONSE_ACKNOWLEGED": "ਤੁਹਾਡੇ ਜਵਾਬ ਲਈ ਧੰਨਵਾਦ!",
   "RESULTS": "ਨਤੀਜੇ",
   "RESUME": "ਮੁੜ ਚਾਲੂ ਕਰੋ",
   "RETRY": "ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ",
   "RETRY_ACTION": "ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ",
-  "ROLE_SELECTOR_QUERY": "ਤੁਸੀਂ ਇੱਕ ਹੋ",
+  "ROLE_SELECTOR_QUERY": "ਦੇ ਤੌਰ ’ਤੇ ਕੰਟੇਂਟ ਖੋਜੋ",
   "SAVE": "ਸੁਰੱਖਿਅਤ ਕਰੋ",
   "SAVED_ON": "ਤੇ ਸੁਰੱਖਿਅਤ ਕੀਤਾ",
-  "SAVED_RESOURCES": "ਸੰਭਾਲੇ ਸਰੋਤ",
   "SAVE_FILE_ON_DEVICE": "ਡਿਵਾਈਸ ਤੇ ਫਾਈਲ ਸੇਵ ਕਰੋ",
   "SCAN_QR_CODE": "ਸਕੈਨ QR ਕੋਡ",
   "SCAN_QR_INSTRUCTION": "ਆਪਣੇ ਫੋਨ ਨੂੰ ਸਕੈਨ ਕਰਨ ਲਈ QR ਕੋਡ ਵੱਲ ਇਸ਼ਾਰਾ ਕਰੋ",
   "SCAN_TAP": "QR ਕੋਡ ਸਕੈਨ ਕਰੋ",
-  "SCORE": "ਸਕੋਰ",
-  "SCORED": "ਸਕੋਰ ",
+  "SCHOOL_OR_ORG_NAME": "ਸਕੂਲ/ਸੰਗਠਨ ਦਾ ਨਾਮ",
+  "SCHOOL_UDISE_ID_OR_ORG_ID": "ਸਕੂਲ ਦੀ UDISE ID/ ਸੰਗਠਨ ID",
   "SD_CARD": "SD ਕਾਰਡ",
+  "SEARCH_FOR_GROUP_MEMBER": "ਸਮੂਹ ਦੇ ਮੈਂਬਰ ਦੀ ਭਾਲ ਕਰੋ",
   "SEARCH_HINT": "ਖੋਜ",
   "SEARCH_PLACEHOLDER": "ਸਮੱਗਰੀ ਦੀ ਖੋਜ ਕਰਨ ਲਈ ਟੈਕਸਟ ਟਾਈਪ ਕਰੋ। ਉਦਾਹਰਣ 'ਕਹਾਣੀ'",
   "SEARCH_TO_FIND_CONTENT": "ਸਮੱਗਰੀ ਨੂੰ ਲੱਭਣ ਲਈ {{%s}} ਖੋਜੋ",
+  "SECONDS_AGO": "{{%s}} ਸੇਕਿੰਡ ਪਹਿਲਾਂ",
+  "SECOND_AGO": "{{%s}} ਸੇਕਿੰਡ ਪਹਿਲਾਂ",
   "SEE_ALL_RESULTS_FOR": "ਲਈ ਸਾਰੇ ਨਤੀਜੇ ਵੇਖੋ \"{{%s}}\" ",
+  "SEE_MORE_BOOKS": "ਹੋਰ ਕਿਤਾਬਾਂ ਅਤੇ ਸਮੱਗਰੀ ਵੇਖੋ",
+  "SEE_MORE_CONTENT": "ਹੋਰ ਕੰਟੇਂਟ ਵੇਖੋ",
   "SELECT": "ਚੁਣੋ",
   "SELECTED_TOPICS": "ਚੁਣੇ ਗਏ ਵਿਸ਼ੇ",
+  "SELECT_ACTIVITY": "ਗਤੀਵਿਧੀ ਦੀ ਚੋਣ ਕਰੋ",
   "SELECT_ALL": "ਸਾਰਿਆ ਨੂੰ ਚੁਣੋ",
-  "SELECT_CHAPTER": "ਅਧਿਆਇ ਚੁਣੋ",
+  "SELECT_CHAPTER": "ਮੋਡਿਊਲ ਚੁਣੋ",
   "SELECT_YOUR_STATE": "ਆਪਣੇ ਰਾਜ ਦੀ ਚੋਣ ਕਰੋ",
+  "SELF_DECLARED_INFO": "ਸਵੈ ਘੋਸ਼ਿਤ ਕੀਤੀ ਜਾਣਕਾਰੀ",
+  "SELF_DECLARE_TEACHER_TNC": "ਦੇ ਅਨੁਸਾਰ ਮੈਂ ਇਹਨਾਂ ਵੇਰਵਿਆਂ ਨੂੰ {{%appName}} ਦੇ ਪ੍ਰਬੰਧਕਾਂ ਨਾਲ ਸਾਂਝਾ ਕਰਨ ਲਈ ਸਹਿਮਤ ਹਾਂ",
   "SEND_FILE": "ਫਾਈਲ ਭੇਜੋ",
   "SERVER_CONNECTION_ERROR": "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਮਰੱਥ",
   "SETTINGS": "ਸੈਟਿੰਗਜ਼",
   "SHARE": "ਸਾਂਝਾ ਕਰੋ",
   "SHARE_APP": "{{%s}} ਐਪ ਨੂੰ ਸਾਂਝਾ ਕਰੋ",
-  "SHARE_APP_LINK": "ਪਲੇ ਸਟੋਰ ਤੋਂ {{app_name}} ਪ੍ਰਾਪਤ ਕਰੋ: {{play_store_url}}",
+  "SHARE_APP_LINK": "{{app_name}} ਐਪ ਇਸ ਤੋਂ ਪ੍ਰਾਪਤ ਕਰੋ: {{play_store_url}}",
   "SHARE_CONTENT_FAILED": "ਸਮੱਗਰੀ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ",
-  "SHARE_CONTENT_FILE": "ਫਾਈਲ ਭੇਜੀ ਗਈ: {{app_name}}\nਨਾਮ: {{content_name}}\nਲਵੋ {{app_name}} ਤੋਂ ਐਪ: {{play_store_url}}",
-  "SHARE_CONTENT_LINK": "{{content_name}} ਦੇਖੋ {{app_name}} ਉਪੱਰ {{content_link}} ਅਤੇ {{app_name}}ਤੋ ਐਪ ਪ੍ਰਾਪਤ ਕਰੋ: {{play_store_url}}",
+  "SHARE_CONTENT_FILE": "ਫਾਈਲ ਭੇਜੀ ਗਈ: {{app_name}}\nਨਾਮ: {{content_name}}\n{{app_name}} ਐਪ ਇਸ ਤੋਂ ਪ੍ਰਾਪਤ ਕਰੋ: {{play_store_url}}",
+  "SHARE_CONTENT_LINK": "ਮੈਨੂੰ {{app_name}}.{{content_link}} 'ਤੇ {{content_name}} ਸੱਚਮੁੱਚ ਦਿਲਚਸਪ ਅਤੇ ਮਦਦਗਾਰ ਲੱਗਦਾ ਹੈ\n\nਅਜਿਹੇ ਹੋਰ ਦਿਲਚਸਪ ਕੰਟੇਂਟ ਲਈ, {{app_name}} ਮੋਬਾਈਲ ਐਪ ਡਾਊਨਲੋਡ ਕਰੋ",
   "SHARE_LINK": "ਲਿੰਕ ਨੂੰ ਸਾਂਝਾ ਕਰੋ",
   "SHARE_TELEMETRY": "ਸ਼ੇਅਰ ਟੈਲੀਮੈਟਰੀ",
   "SHARE_TELEMETRY_FAILED": "ਟੈਲੀਮੈਟਰੀ ਸਾਂਝੀ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ",
+  "SHARE_TELEMETRY_NO_DATA_FOUND": "ਕੋਈ ਟੈਲੀਮੈਟਰੀ ਡਾਟਾ ਨਹੀਂ ਮਿਲਿਆ",
   "SHARE_THIS": "ਸਾਂਝਾ ਕਰੋ",
+  "SHARE_USERNAME": "ਹਾਇ! ਤੁਸੀਂ ‪{{user_name}}‬'s ਦੀ ‪{{app_name}}‬ ID: ‪{{diksha_id}}‬ ਪ੍ਰਾਪਤ ਕੀਤਾ ਹੈ",
   "SHOW": "ਦਿਖਾਉ",
   "SHOWING_ITEMS": "{{%s}} ਇਕਾਈਆਂ ਦਿਖਾ ਰਿਹਾ ਹੈ",
   "SHOWING_RESULTS_FOR": "{{%count}} ਲਈ '{{%query}}' ਨਤੀਜੇ ਦਿਖਾ ਰਿਹਾ ਹੈ",
   "SHOW_LESS": "ਘੱਟ ਦਿਖਾਉ",
   "SHOW_MORE": "ਹੋਰ ਦਿਖਾਓ",
-  "SHOW_RECENT": "{{%s}} ਫਾਇਲਾਂ ਦਿਖਾ  ਰਿਹਾ ਹੈ",
-  "SIGNED_OUT_ACCOUNT_MESSAGE": "ਤੁਸੀਂ ਇਸ ਸਮੇਂ ਲੌਗ ਇਨ ਕੀਤੇ ਖਾਤੇ ਤੋਂ ਲੌਗ ਆਉਟ ਹੋਵੋਗੇ",
   "SIGNIN_TO_USE_FEATURE": "ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਦਾ ਉਪਯੋਗ ਕਰਨ ਲਈ ਲੌਗ ਇਨ ਕਰੋ",
   "SIGN_IN": "ਲਾਗਿਨ",
   "SIZE": "ਅਕਾਰ: {{%s}}",
@@ -523,49 +945,121 @@
   "SPACE_AVAILABLE_ON_SDCARD": "SD ਕਾਰਡ ਤੇ ਸਪੇਸ ਉਪਲਬਧ :",
   "SPACE_TAKEN": "{{%s}} ਜਗ੍ਹਾ ਲੈ ਕੇ",
   "SPACE_TAKEN_BY_APP": "{{%s}} ਸਮੱਗਰੀ ਦੁਆਰਾ ਵਰਤੀ ਸਪੇਸ:",
+  "SPECIAL_CHARACTERS_NOT_SUPPORTED": "ਇਹ ਖੇਤਰ ਤੁਹਾਨੂੰ ਵਿਸ਼ੇਸ਼ ਅੱਖਰ ਦਾਖਲ ਕਰਨ ਦੀ ਆਗਿਆ ਨਹੀਂ ਦਿੰਦਾ",
   "START": "ਸ਼ੁਰੂ ਕਰੋ",
+  "START_AGAIN": "ਦੁਬਾਰਾ ਸ਼ੂਰੋ ਕਰੋ",
   "START_ASSESSMENT": "ਮੁਲਾਂਕਣ ਸ਼ੁਰੂ ਕਰੋ",
   "START_COURSE": "ਸ਼ੁਰੂ ਕਰੋ",
   "START_COURSE_NOW": "ਹੁਣੇ ਸ਼ੁਰੂ ਕਰੋ",
-  "STAR_RATINGS": "ਸਟਾਰ ਰੇਟਿੰਗ",
+  "START_LEARNING": "ਸਿਖਲਾਈ ਸ਼ੁਰੂ ਕਰੋ",
+  "STAR_RATINGS": "ਰੇਟਿੰਗ",
   "STATE": "ਰਾਜ",
   "STATE_OPTION_TEXT": "ਰਾਜ ਚੁਣੋ",
   "STATE_RECORDS": "ਰਾਜ ਦੇ ਰਿਕਾਰਡ ਅਨੁਸਾਰ",
   "STORAGE": "ਸਟੋਰੇਜ",
   "STORAGE_SETTINGS": "ਸਟੋਰੇਜ ਸੈਟਿੰਗ",
   "STRUCTURE": "ਬਣਤਰ",
-  "STUDENT_ROLE_DESC_1": "ਸਰੋਤ ਦੁਆਰਾ ਬ੍ਰਾਉਜ਼ ਕਰੋ",
+  "STUDENT_ROLE_DESC_1": "ਪਾਠ ਪੁਸਤਕਾਂ ਅਤੇ ਡਿਜੀਟਲ ਕੰਟੇਂਟ ਬਰਾਊਜ਼ ਕਰੋ",
   "SUBJECT": "ਵਿਸ਼ਾ",
   "SUBJECTS": "ਵਿਸ਼ਾ",
   "SUBJECT_OPTION_TEXT": "ਵਿਸ਼ਾ ਚੁਣੋ",
+  "SUBMIT_MY_DETAILS": "ਵੇਰਵੇ ਭੇਜੋ",
+  "SUCCESSFULLY_ADDED_USER": "\"{{%s}}\" ਸਫ਼ਲਤਾਪੂਰਵਕ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ",
+  "SUCCESSFULLY_SWITCHED_USER": "ਹਾਇ \"{{%user}}\"",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_PHONE": "ਸਾਰੀ ਸਮੱਗਰੀ ਨੂੰ ਫੋਨ ਸਟੋਰੇਜ ਵਿੱਚ ਭੇਜਿਆ ਜਾਵੇਗਾ",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_SDCARD": "ਸਾਰੀ ਸਮੱਗਰੀ ਨੂੰ SD ਕਾਰਡ ਵਿੱਚ ਭੇਜਿਆ ਜਾਏਗਾ",
   "SUPPORT": "ਸਹਿਯੋਗ",
   "SUPPORT_MESSAGE": "ਕੋਈ ਵੀ ਮੁਸ਼ਕਲ ਸਾਹਮਣੇ ਆ ਰਹੀ ਹੈ? ਸਾਨੂੰ ਇਕ ਸੁਨੇਹਾ ਭੇਜੋ \n",
-  "SWITCHING_TO": "'{{%s}}' ਤਬਦੀਲੀ ਕਰੋ",
-  "SWITCH_ACCOUNT": "ਖਾਤਾ ਬਦਲੀ ਕਰੋ",
-  "SWITCH_ACCOUNT_CONFIRMATION": "ਖਾਤਾ ਬਦਲੋ?",
+  "SWITCH_TO_CLASSIC_THEME": "ਕਲਾਸਿਕ ਥੀਮ 'ਤੇ ਜਾਓ",
+  "SWITCH_TO_JOYFUL_THEME": "ਅਨੰਦਮਈ ਥੀਮ 'ਤੇ ਜਾਓ",
+  "SWITCH_USER": "ਉਪਭੋਗਤਾ ਬਦਲੇ",
   "SYLLABUS": "ਸਿਲੇਬਸ",
   "SYNCING_NOW": "ਹੁਣ ਸਿੰਕ ਕਰ ਰਿਹਾ ਹੈ",
   "SYNC_NOW": "ਹੁਣ ਸਿੰਕ ਕਰੋ",
-  "TAKE_ASSESSMENT": "ਇੱਕ ਉਪਭੋਗਤਾ ਨੂੰ ਘੱਟੋ ਘੱਟ ਇਕ ਮੁਲਾਂਕਣ ਲਾਜ਼ਮੀ ਹੈ",
   "TAP_SCAN": " QR ਕੋਡ ਨੂੰ {{%s}} ਸਕੈਨ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ",
+  "TBK_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਇੱਕ ਪਾਠ ਪੁਸਤਕ ਦੀ ਚੋਣ ਕਰੋ",
+  "TBK_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "ਪਾਠ ਪੁਸਤਕ",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "ਪਾਠ ਪੁਸਤਕਾਂ",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "ਪਾਠ ਪੁਸਤਕਾਂ",
+  "TBK_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}} ਦੀ ਲਾਇਬ੍ਰੇਰੀ   {{%explainVideos}}, {{%quesBanks}} ਅਤੇ ਹੋਰ {{%interactiveMaterial}} ਦੀ ਹੋਸਟ ਹੈ। ਲਾਇਬ੍ਰੇਰੀ ਦੀ ਪੜਚੋਲ ਕਰਨ ਲਈ ਇੱਕ ਪਾਠ ਪੁਸਤਕ 'ਤੇ ਕਲਿਕ ਕਰੋ!",
+  "TBK_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) ਲਈ ਕੋਈ ਕਿਤਾਬਾਂ ਨਹੀਂ ਮਿਲੀਆਂ",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "ਬੋਰਡ ਕਿਤਾਬਾਂ ਸ਼ਾਮਲ ਕਰ ਰਿਹਾ ਹੈ",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "ਤੁਹਾਡੇ ਵਿਸ਼ੇ ਦੀ ਪਾਠ ਪੁਸਤਕ {{%s}}? 'ਤੇ ਨਹੀਂ ਲੱਭੀ?",
+  "TBK_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span> ਪਾਠ ਪੁਸਤਕਾਂ ਲਈ ਤਰੱਕੀ ਟਰੈਕ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ",
+  "TBK_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "ਅਸੀਂ ਤੁਹਾਨੂੰ ਸੂਚਿਤ ਕਰਾਂਗੇ ਜਦੋਂ ਤੁਹਾਡਾ ਸਟੇਟ ਬੋਰਡ ਤੁਹਾਡੇ ਦੁਆਰਾ ਬੇਨਤੀਆਂ ਕੀਤੀਆਂ ਕਿਤਾਬਾਂ {{%s}} 'ਤੇ ਅਪਲੋਡ ਕਰਦਾ ਹੈ",
+  "TBK_NONTRK_QR_CODE_DETAILS": "ਆਪਣੀ ਪਾਠ ਪੁਸਤਕ ਤੋਂ QR ਕੋਡ ਨੂੰ ਸਕੈਨ ਕਰਕੇ ਡਿਜੀਟਲ ਕੰਟੇਂਟ ਤੱਕ ਤੁਰੰਤ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰੋ",
+  "TBK_NONTRK_SEE_MORE_BOOKS": "ਹੋਰ ਕਿਤਾਬਾਂ ਅਤੇ ਕੰਟੇਂਟ ਵੇਖੋ",
+  "TBK_NONTRK_STUDENT_ROLE_DESC_1": "ਪਾਠ ਪੁਸਤਕਾਂ ਅਤੇ ਡਿਜੀਟਲ ਕੰਟੇਂਟ ਬਰਾਊਜ਼ ਕਰੋ",
+  "TBK_NONTRK_TEACHER_ROLE_DESC_1": "ਪਾਠ ਪੁਸਤਕਾਂ ਅਤੇ ਡਿਜੀਟਲ ਕੰਟੇਂਟ ਬਰਾਊਜ਼ ਕਰੋ",
+  "TBK_NONTRK_TUTORIAL_HEADING": "ਵਿਡੀਓਜ਼, ਇੰਟਰਐਕਟਿਵ ਕੰਟੇਂਟ , ਈਟੈਕਸਟਬੁੱਕਸ ਅਤੇ ਹੋਰ ਬਹੁਤ ਕੁਝ...",
+  "TBK_TRK_BATCHEND_MAIN_HEADING": "ਤੁਸੀਂ ਪਾਠ ਪੁਸਤਕ ਪੜ੍ਹਨ ਦੇ ਸਮੂਹ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋ ਗਏ ਹੋ ਜੋ {{%s}} ਨੂੰ ਪੂਰਾ ਕੀਤਾ ਗਿਆ",
+  "TBK_TRK_BATCHEND_SUB_HEADING": "ਤੁਸੀਂ ਸਿੱਖਣਾ ਜਾਰੀ ਰੱਖ ਸਕਦੇ ਹੋ, ਪਰ ਤੁਹਾਡੀ ਤਰੱਕੀ ਅਪਡੇਟ ਨਹੀਂ ਕੀਤੀ ਜਾਏਗੀ",
+  "TBK_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "ਤੁਸੀਂ ਇਸ ਅਧਿਆਏ ਨੂੰ ਪੂਰਾ ਕਰ ਲਿਆ ਹੈ",
+  "TBK_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "ਪਾਠ ਪੁਸਤਕ ਨੂੰ {{%s}} ਤੱਕ ਪੂਰਾ ਕਰੋ",
+  "TBK_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "ਇਹ ਪਾਠ-ਪੁਸਤਕ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਹੈ",
+  "TBK_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "ਪਾਠ ਪੁਸਤਕ",
+  "TBK_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "ਤੁਸੀਂ ਇਹ ਪਾਠ ਪੁਸਤਕ ਪੜ੍ਹੀ ਹੈ",
+  "TBK_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "ਪਾਠ ਪੁਸਤਕ ਲਈ ਬੈਚ",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "ਕੰਮ",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "ਮੇਰੀਆਂ ਪਾਠ ਪੁਸਤਕਾਂ",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "ਨੂੰ ਬੈਚ ਖ਼ਤਮ ਹੋਇਆ",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}} ਨੂੰ ਆਖ਼ਰੀ ਵਾਰ ਅਪਡੇਟ ਕੀਤਾ ਗਿਆ",
+  "TBK_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "ਸ਼ਾਮਲ ਹੋਵੋ",
+  "TBK_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "ਨਵੀਨਤਮ ਪਾਠ ਪੁਸਤਕਾਂ",
+  "TBK_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "ਕੰਮ ਛੱਡੋ?",
+  "TBK_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਲੌਗ ਇਨ ਕਰੋ",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_COURSES": "ਕੋਈ ਪਾਠ ਪੁਸਤਕਾਂ ਨਹੀਂ",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "ਕੰਟੇਂਟ ਡਾਊਨਲੋਡ ਕਰੋ",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "ਪਾਠ ਪੁਸਤਕਾਂ ({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "ਪਾਠ ਪੁਸਤਕ ({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "ਆਨਲਾਈਨ ਸਿਖਲਾਈ ਲਓ",
+  "TBK_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "ਪ੍ਰਸਿੱਧ ਪਾਠ ਪੁਸਤਕਾਂ",
+  "TBK_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ਆਨਲਾਈਨ ਸਿਖਲਾਈ ਲਓ",
+  "TBK_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "ਸਰਟੀਫਿਕੇਟ ਹਾਸਿਲ ਕਰਨ ਲਈ {{%s}} ਤੱਕ ਕੰਮ ਪੂਰਾ ਕਰੋ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING": "ਸਿੱਖਣ ਦਾ ਕੰਮ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "ਸਿਖਲਾਈ ਦੇ ਕੰਮ(ਕੰਮਾਂ) ਵਿੱਚ ਸ਼ਮਲ ਹੋਏ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "ਪਾਠ ਪੁਸਤਕ ਦੇ ਵੇਰਵੇ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "ਨੂੰ ਕੰਮ ਖ਼ਤਮ ਹੁੰਦਾ ਹੈ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "ਕੰਮ ਖ਼ਤਮ ਹੋਣ ਦੀ ਮਿਤੀ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "ਕੰਮ ਦੇ ਵੇਰਵੇ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "ਇਹ ਕੰਮ ਇਸਦੇ ਲਈ ਢੁਕਵਾਂ ਹੈ:",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "ਅਧਿਆਏ",
+  "TBK_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "ਪਾਠ ਪੁਸਤਕ ਦੀ ਗਤੀਵਿਧੀ ਨੂੰ ਰੋਕੋ",
+  "TBK_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "ਕੀ ਪਾਠ ਪੁਸਤਕ ਦੀਆਂ ਗਤੀਵਿਧੀਆਂ ਦੀ ਜਾਂਚ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?",
+  "TBK_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "ਪਾਠ ਪੁਸਤਕ ਦਾ ਬੈਚ {{batch_start_date}} ਤੋਂ ਉਪਲੱਬਧ ਹੈ",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "ਸਰਟੀਫਿਕੇਟ ਬਾਰੇ ਤੁਹਾਡੇ ਰਜਿਸਟਰਡ ਸੰਪਰਕ ਵੇਰਵਿਆਂ 'ਤੇ ਤੁਹਾਨੂੰ 7 ਦਿਨਾਂ ਦੇ ਅੰਦਰ ਸੂਚਿਤ ਕੀਤਾ ਜਾਵੇਗਾ",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "ਨੋਟ: ਇਸ ਪਾਠ ਪੁਸਤਕ ਦਾ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "ਤੁਸੀਂ ਇਹ ਪਾਠ ਪੁਸਤਕ ਪੜ੍ਹੀ ਹੈ",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "ਵਰਤਮਾਨ ਵਿੱਚ, ਇਸ ਕੰਮ ਦਾ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ। ਨਿਰਮਾਤਾ ਬਾਅਦ ਵਿੱਚ ਸਰਟੀਫਿਕੇਟ ਜੋੜ ਸਕਦਾ ਹੈ।",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "ਤੁਸੀਂ ਪਾਠ ਪੁਸਤਕ ਪੜ੍ਹਨੀ ਬੰਦ ਕਰ ਦਿੱਤੀ ਹੈ",
+  "TBK_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "ਇਸ ਪਾਠ ਪੁਸਤਕ ਕੰਮ ਲਈ ਕੋਈ ਬੈਚਿਸ ਨਹੀਂ ਹਨ",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "ਪਾਠ ਪੁਸਤਕ ਰਜਿਸਟਰਡ ਉਪਭੋਗਤਾਵਾਂ ਲਈ ਹੈ। ਪਾਠ ਪੁਸਤਕ ਨੂੰ ਐਕਸੈਸ ਕਰਨ ਲਈ ਲੌਗ ਇਨ ਕਰੋ",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "ਇਸ ਪਾਠ ਪੁਸਤਕ ਨੂੰ ਪੜ੍ਹਨ ਲਈ ਲੌਗ ਇਨ ਕਰੋ",
+  "TBK_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "ਇਸ ਕੰਮ ਲਈ ਕੋਈ ਬੈਚ ਉਪਲੱਬਧ ਨਹੀਂ ਹਨ",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "ਸਿਰਫ਼ ਰਜਿਸਟਰਡ ਉਪਭੋਗਤਾ ਸਿੱਖਣ ਦੇ ਕੰਮ ਲੈ ਸਕਦੇ ਹਨ",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "ਤੁਸੀਂ ਇਸ ਕੰਮ ਨੂੰ ਸਫ਼ਲਤਾਪੂਰਵਕ ਪੂਰਾ ਕਰ ਲਿਆ ਹੈ",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "ਕੰਮ ਖ਼ਤਮ ਹੋ ਗਿਆ ਹੈ। ਤੁਸੀਂ ਦੁਬਾਰਾ ਮੁਲਾਂਕਣ ਕਰ ਸਕਦੇ ਹੋ ਪਰ, ਤੁਹਾਡੀ ਤਰੱਕੀ ਦਰਜ ਨਹੀਂ ਕੀਤੀ ਜਾਏਗੀ।",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "ਕੰਮ ਖ਼ਤਮ ਹੋ ਗਿਆ ਹੈ। ਤੁਸੀਂ ਮੁਲਾਂਕਣ ਕਰ ਸਕਦੇ ਹੋ ਪਰ, ਤੁਹਾਡੀ ਤਰੱਕੀ ਦਰਜ ਨਹੀਂ ਕੀਤੀ ਜਾਏਗੀ।",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "ਪਾਠ ਪੁਸਤਕ ਦੇ ਵੇਰਵਿਆਂ ਨੂੰ ਵੇਖਣ ਅਤੇ ਐਕਸੈਸ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਇੱਕ ਕਿਰਿਆਸ਼ੀਲ ਬੈਚ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣਾ ਪਵੇਗਾ",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "ਪਾਠ ਪੁਸਤਕ ਦੇ ਵੇਰਵਿਆਂ ਨੂੰ ਵੇਖਣ ਲਈ ਤੁਹਾਨੂੰ ਲਾੱਗ ਇਨ ਕਰਨਾ ਪਵੇਗਾ",
   "TEACHER_ID_ENTER_LABEL": "ਤਸਦੀਕ ਕਰਨ ਲਈ ਆਪਣੀ ਅਧਿਆਪਕ ਦੀ ID ਦਿਓ",
   "TEACHER_ID_PLACEHOLDER": "ਉਦਾਹਰਣ ਲਈ, ER12345",
   "TEACHER_ID_VERIFICATION": "ਅਧਿਆਪਕ ID ਤਸਦੀਕ",
   "TEACHER_PROFILE_FAILED": "ਅਧਿਆਪਕ ਪ੍ਰੋਫਾਈਲ ਦੀ ਤਸਦੀਕ ਨਹੀਂ ਕਰ ਸਕਿਆ ਕਿਉਂਕਿ ਦਿੱਤਾ ਗਿਆ ਅਧਿਆਪਕ ID ਗਲਤ ਹੈ",
   "TEACHER_PROFILE_VERIFIED": "ਅਧਿਆਪਕ ਪ੍ਰੋਫਾਈਲ ਦੀ ਸਫਲਤਾਪੂਰਵਕ ਤਸਦੀਕ ਕੀਤੀ ਗਈ",
-  "TEACHER_ROLE_DESC_1": "ਕੋਰਸ ਦੁਆਰਾ ਬ੍ਰਾਉਜ਼ ਕਰੋ",
-  "TEACHER_ROLE_DESC_2": "ਸੰਬੰਧਿਤ ਸਰੋਤ ਲੱਭੋ",
-  "TEACHER_ROLE_DESC_3": "ਸਮੂਹਾਂ ਰਾਹੀਂ ਬਰਾਊਜ਼ ਕਰੋ",
+  "TEACHER_ROLE_DESC_1": "ਪਾਠ ਪੁਸਤਕਾਂ ਅਤੇ ਡਿਜੀਟਲ ਕੰਟੇਂਟ ਬਰਾਊਜ਼ ਕਰੋ",
+  "TEACHER_ROLE_DESC_2": "ਆਨਲਾਇਨ ਕੋਰਸਿਸ ਲਵੋ",
+  "TEACHER_ROLE_DESC_3": "ਪਾਠ ਦੀਆਂ ਯੋਜਨਾਵਾਂ ਖੋਜੋ",
   "TELL_US_MORE": "ਸਾਨੂੰ ਹੋਰ ਦੱਸੋ ...",
   "TERMS_OF_USE": "ਵਰਤੋ ਦੀਆਂ ਸ਼ਰਤਾਂ",
-  "TEXTBOOK": "ਪਾਠ ਪੁਸਤਕਾਂ\n",
+  "TEXTBOOK": "ਪਾਠ ਪੁਸਤਕਾਂ",
+  "TEXTBOOKS": "ਪਾਠ ਪੁਸਤਕਾਂ",
+  "THANKING_NOTE": "ਅਸੀਂ ਤੁਹਾਨੂੰ ਸੂਚਿਤ ਕਰਾਂਗੇ ਜਦੋਂ ਤੁਹਾਡਾ ਸਟੇਟ ਬੋਰਡ ਤੁਹਾਡੇ ਦੁਆਰਾ ਬੇਨਤੀ ਕੀਤੀਆਂ ਕਿਤਾਬਾਂ {{%s}} 'ਤੇ ਅਪਲੋਡ ਕਰਦਾ ਹੈ",
   "THANK_FOR_RATING": "ਕੰਟੇਂਟ ਨੂੰ ਰੇਟਿੰਗ ਦੇਣ ਲਈ ਤੁਹਾਡਾ ਧੰਨਵਾਦ",
-  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "ਇਸ ਸਿਖਲਾਈ ਲਈ ਕੋਈ ਬੈਚ ਉਪੱਲਬਧ ਨਹੀਂ ਹਨ",
+  "THANK_YOU_FOR_SUBMITTING_YOUR_DETAILS": "ਆਪਣੇ ਵੇਰਵੇ ਭੇਜਣ ਲਈ ਧੰਨਵਾਦ",
+  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "ਇਸ ਕੋਰਸ ਲਈ ਕੋਈ ਬੈਂਚੀਸ ਉਪਲੱਬਧ ਨਹੀਂ ਹਨ",
   "THIS_IS_A_RESTRICTED_COMMUNITY": "ਇਹ ਇੱਕ ਸੀਮਤ ਬਰਾਦਰੀ  ਹੈ",
   "TICKET_SUMMARY": "ਟਿਕਟ ਸੰਖੇਪ",
-  "TIME": "ਸਮਾਂ",
   "TIME_OUT": "ਸਰਵਰ ਦਾ ਸਮਾਂ ਸਮਾਪਤ ਹੋਇਆ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ",
   "TITLE": "ਸਿਰਲੇਖ",
   "TITLE_UPGRADE_POPUP": "ਅਸੀਂ ਕੰਟੇਂਟ ਦੇ ਅੰਦਰ ਚਿੱਤਰਾਂ ਅਤੇ ਆਡੀਓ ਗੁੰਮ ਜਾਣ ਵਾਲੀਆਂ ਸਮੱਸਿਆਵਾਂ ਨੂੰ ਦਰੁਸਤ ਕੀਤਾ ਹੈ। ਬਿਹਤਰ ਤਜ਼ਰਬੇ ਲਈ, ਅਸੀਂ ਤੁਹਾਨੂੰ ਸਿਫਾਰਸ਼ ਕਰਦੇ ਹਾਂ ਕਿ ਤੁਸੀਂ DIKSHA ਦੇ ਨਵੀਨਤਮ ਸੰਸਕਰਣ ਤੇ ਅਪਗ੍ਰੇਡ ਕਰੋ।",
@@ -574,21 +1068,20 @@
   "TOPICS": "ਵਿਸ਼ੇ",
   "TOPIC_YOU_MIGHT_LIKE": "ਰੁਚੀ ਵਾਲੇ ਵਿਸ਼ਿਆਂ ਦੀ ਪੜਚੋਲ ਕਰੋ",
   "TOTAL_SIZE": "ਕੁੱਲ ਅਕਾਰ :",
-  "TOTAL_TIME": "ਕੁੱਲ ਸਮਾਂ",
   "TO_DO": "ਨੂੰ ਕਰੋ",
-  "TO_EARN_CERTIFICATE": "ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ {{%s}} ਸਿਖਲਾਈ ਨੂੰ ਪੂਰੀ ਕਰੋ",
-  "TRAINING": " ਸਿਖਲਾਈ",
-  "TRAININGS_ATTENDED": "ਸਿਖਲਾਈ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਏ",
-  "TRAININGS_ONLY_REGISTERED_USERS": "ਸਿਖਲਾਈ ਸਿਰਫ ਰਜਿਸਟਰਡ  ਉਪਭੋਗਤਾ ਲਈ ਹੈ",
-  "TRAINING_COMPLETED_SUCCESSFULLY": "ਤੁਸੀਂ ਇਸ ਸਿਖਲਾਈ ਨੂੰ ਸਫਲਤਾਪੂਰਵਕ ਪੂਰਾ ਕਰ ਲਿਆ ਹੈ",
-  "TRAINING_DETAILS": "ਸਿਖਲਾਈ ਦੇ ਵੇਰਵੇ",
-  "TRAINING_ENDED_REDO_ASSESSMENT": "ਸਿਖਲਾਈ ਖਤਮ ਹੋ ਗਈ ਹੈ। ਤੁਸੀਂ ਮੁਲਾਂਕਣ ਨੂੰ ਦੁਬਾਰਾ ਕਰ ਸਕਦੇ ਹੋ ਪਰ, ਤੁਹਾਡੀ ਤਰੱਕੀ ਦਰਜ ਨਹੀਂ ਕੀਤੀ ਜਾਏਗੀ।",
-  "TRAINING_ENDED_START_ASSESSMENT": "ਸਿਖਲਾਈ ਖਤਮ ਹੋ ਗਈ ਹੈ। ਤੁਸੀਂ ਮੁਲਾਂਕਣ ਕਰ ਸਕਦੇ ਹੋ ਪਰ, ਤੁਹਾਡੀ ਪ੍ਰਗਤੀ ਦਰਜ ਨਹੀਂ ਕੀਤੀ ਜਾਏਗੀ।",
-  "TRAINING_ENDS_ON": "ਸਿਖਲਾਈ ਦੀ ਸਮਾਪਤੀ ਮਿਤੀ",
-  "TRAINING_END_DATE": "ਸਿਖਲਾਈ ਦੀ ਆਖ਼ਰੀ ਮਿਤੀ",
-  "TRAINING_INFO": "ਸਿਖਲਾਈ ਜਾਣਕਾਰੀ",
-  "TRAINING_IS_RELEVANT_TO_TEACHERS": "ਸਿਖਲਾਈ  ਅਧਿਅਪਕਾ ਲਈ ਜਰੂਰੀ ਹੈ",
-  "TRAINING_MODULES": "ਸਿਖਲਾਈ ਵਿਭਾਗ",
+  "TO_EARN_CERTIFICATE": "ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ {{%s}} ਤੱਕ ਕੋਰਸ ਪੂਰਾ ਕਰੋ",
+  "TRAINING": "ਕੋਰਸ",
+  "TRAININGS_ATTENDED": "ਕੋਰਸ (ਕੋਰਸਿਸ) ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਏ",
+  "TRAININGS_ONLY_REGISTERED_USERS": "ਸਿਰਫ ਰਜਿਸਟਰਡ  ਉਪਭੋਗਤਾ ਕੋਰਸਿਸ ਲੈ ਸਕਦੇ ਹਨ",
+  "TRAINING_COMPLETED_SUCCESSFULLY": "ਤੁਸੀਂ ਇਸ ਕੋਰਸ ਨੂੰ ਸਫਲਤਾਪੂਰਵਕ ਪੂਰਾ ਕਰ ਲਿਆ ਹੈ",
+  "TRAINING_DETAILS": "ਕੋਰਸ ਦੇ ਵੇਰਵੇ",
+  "TRAINING_ENDED_REDO_ASSESSMENT": "ਕੋਰਸ ਖ਼ਤਮ ਹੋ ਗਿਆ ਹੈ। ਤੁਸੀਂ  ਦੁਬਾਰਾ ਮੁਲਾਂਕਣ ਕਰ ਸਕਦੇ ਹੋ ਪਰ, ਤੁਹਾਡੀ ਤਰੱਕੀ ਦਰਜ ਨਹੀਂ ਕੀਤੀ ਜਾਏਗੀ।",
+  "TRAINING_ENDED_START_ASSESSMENT": "ਕੋਰਸ ਖ਼ਤਮ ਹੋ ਗਿਆ ਹੈ। ਤੁਸੀਂ ਮੁਲਾਂਕਣ ਕਰ ਸਕਦੇ ਹੋ ਪਰ, ਤੁਹਾਡੀ ਤਰੱਕੀ ਦਰਜ ਨਹੀਂ ਕੀਤੀ ਜਾਏਗੀ।",
+  "TRAINING_ENDS_ON": "ਨੂੰ ਕੋਰਸ ਖ਼ਤਮ ਹੁੰਦਾ ਹੈ",
+  "TRAINING_END_DATE": "ਕੋਰਸ ਦੀ ਆਖ਼ਰੀ ਮਿਤੀ",
+  "TRAINING_INFO": "ਕੋਰਸ ਬਾਰੇ ਜਾਣਕਾਰੀ",
+  "TRAINING_IS_RELEVANT_TO_TEACHERS": "ਲਈ ਇਹ ਕੋਰਸ ਢੁੱਕਵਾਂ ਹੈ:",
+  "TRAINING_MODULES": "ਕੋਰਸ ਮੋਡਿਊਲ",
   "TRANSFERRING_CONTENT_TO_PHONE": "ਸਮਗਰੀ ਫੋਨ ਤੇ ਜਾ ਰਹੀ ਹੈ",
   "TRANSFERRING_CONTENT_TO_SDCARD": "ਸਮੱਗਰੀ ਨੂੰ SD ਕਾਰਡ ਵਿੱਚ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ",
   "TRANSFERRING_FILES": "ਫਾਈਲਾਂ ਜਾ  ਰਹੀਆ ਹੈ",
@@ -598,9 +1091,64 @@
   "TRY_AGAIN": "ਫਿਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ",
   "TRY_BEFORE_RATING": "ਕਿਰਪਾ ਕਰਕੇ ਰੇਟਿੰਗ ਦੇਣ ਤੋਂ ਪਹਿਲਾਂ ਸਮੱਗਰੀ ਨੂੰ ਅਜ਼ਮਾਓ",
   "TRY_DIFF_QR": "ਇੱਕ ਵੱਖਰੇ QR ਕੋਡ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ?",
+  "TUTORIAL_BUTTON": "ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਇੱਕ ਪਾਠ ਪੁਸਤਕ ਦੀ ਚੋਣ ਕਰੋ",
+  "TUTORIAL_HEADING": "ਵਿਡੀਓਜ਼, ਇੰਟਰਐਕਟਿਵ ਕੰਟੇਂਟ, ਈ ਟੈਕਸਟਬੁੱਕਸ ਅਤੇ ਹੋਰ ਬਹੁਤ ਕੁਝ ...",
+  "TVC_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਇੱਕ ਟੀਵੀ ਕਲਾਸ ਚੁਣੋ",
+  "TVC_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "ਟੀਵੀ ਕਲਾਸਾਂ",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "ਟੀਵੀ ਕਲਾਸਾਂ",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "ਟੀਵੀ ਕਲਾਸਾਂ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}'s ਦੀ ਲਾਇਬ੍ਰੇਰੀ ਵਿੱਚ ਬਹੁਤ ਸਾਰੇ {{%explainVideos}}, {{%quesBanks}} ਅਤੇ ਹੋਰ {{%interactiveMaterial}} ਹਨ। ਲਾਇਬ੍ਰੇਰੀ ਦੀ ਪੜਚੋਲ ਕਰਨ ਲਈ ਇੱਕ ਟੀਵੀ ਕਲਾਸ 'ਤੇ ਕਲਿਕ ਕਰੋ!",
+  "TVC_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) ਲਈ ਕੋਈ ਟੀਵੀ ਕਲਾਸਾਂ ਨਹੀਂ ਮਿਲੀਆਂ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": " ਬੋਰਡ ਟੀਵੀ ਕਲਾਸਾਂ ਸ਼ਾਮਲ ਕਰ ਰਿਹਾ ਹੈ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}} 'ਤੇ ਟੀਵੀ ਕਲਾਸਾਂ ਨਹੀਂ ਲੱਭੀਆਂ?",
+  "TVC_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span> ਟੀਵੀ ਕਲਾਸ ਲਈ ਤਰੱਕੀ ਟਰੈਕ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "ਅਸੀਂ ਤੁਹਾਨੂੰ ਸੂਚਿਤ ਕਰਾਂਗੇ ਜਦੋਂ ਤੁਹਾਡਾ ਸਟੇਟ ਬੋਰਡ ਤਹਾਡੇ ਦੁਆਰਾ ਬੇਨਤੀ ਕੀਤੀ ਟੀਵੀ ਕਲਾਸ ਨੂੰ {{%s}} 'ਤੇ ਅਪ'ਲੋਡ ਕਰਦਾ ਹੈ",
+  "TVC_NONTRK_QR_CODE_DETAILS": "ਆਪਣੀ ਟੀਵੀ ਕਲਾਸ ਤੋਂ QR ਕੋਡ ਨੂੰ ਸਕੈਨ ਕਰਕੇ ਡਿਜੀਟਲ ਕੰਟੇਂਟ ਤੱਕ ਤੁਰੰਤ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰੋ।",
+  "TVC_NONTRK_SEE_MORE_BOOKS": "ਹੋਰ ਟੀਵੀ ਕਲਾਸਾਂ ਅਤੇ ਕੰਟੇਂਟ ਵੇਖੋ",
+  "TVC_NONTRK_STUDENT_ROLE_DESC_1": "ਟੀਵੀ ਕਲਾਸਾਂ ਅਤੇ ਡਿਜੀਟਲ ਕੰਟੇਂਟ ਬਰਾਊਜ਼ ਕਰੋ",
+  "TVC_NONTRK_TEACHER_ROLE_DESC_1": "ਟੀਵੀ ਕਲਾਸਾਂ ਅਤੇ ਡਿਜੀਟਲ ਕੰਟੇਂਟ ਬਰਾਊਜ਼ ਕਰੋ",
+  "TVC_NONTRK_TUTORIAL_HEADING": "ਵਿਡੀਓਜ਼, ਇੰਟਰਐਕਟਿਵ ਕੰਟੇਂਟ, ਈਟੈਕਸਟਬੁੱਕਸ ਅਤੇ ਹੋਰ ਬਹੁਤ ਕੁਝ...",
+  "TVC_TRK_BATCHEND_MAIN_HEADING": "ਤੁਸੀਂ ਇੱਕ ਟੀਵੀ ਕਲਾਸ ਦੇ ਸਮੂਹ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋ ਗਏ ਹੋ ਜੋ {{%s}} ਨੂੰ ਪੂਰਾ ਹੋਇਆ",
+  "TVC_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "ਤੁਸੀਂ ਇਸ ਪ੍ਰੋਗਰਾਮ ਨੂੰ ਪੂਰਾ ਕਰ ਲਿਆ ਹੈ",
+  "TVC_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "ਟੀਵੀ ਕਲਾਸਾਂ",
+  "TVC_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "ਤੁਸੀਂ ਇਹ ਟੀਵੀ ਕਲਾਸਾਂ ਦੇਖੀਆਂ ਹਨ",
+  "TVC_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "ਟੀਵੀ ਕਲਾਸਾਂ ਲਈ ਬੈਚ",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "ਕੰਮ",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "ਮੇਰੀਆਂ ਟੀਵੀ ਕਲਾਸਾਂ",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "ਨੂੰ ਬੈਚ ਖ਼ਤਮ ਹੋਇਆ",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}} ਨੂੰ ਆਖ਼ਰੀ ਵਾਰ ਅਪਡੇਟ ਕੀਤਾ ਗਿਆ",
+  "TVC_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "ਤਾਜ਼ਾ ਟੀਵੀ ਕਲਾਸਾਂ",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "ਟੀਵੀ ਕਲਾਸਾਂ ({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "ਟੀਵੀ ਕਲਾਸਾਂ ({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "ਪ੍ਰਸਿੱਧ ਟੀਵੀ ਕਲਾਸਾਂ",
+  "TVC_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "ਸਰਟੀਫਿਕੇਟ ਹਾਸਿਲ ਕਰਨ ਲਈ {{%s}} ਤੱਕ ਕੰਮ ਪੂਰਾ ਕਰੋ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING": "ਸਿੱਖਣ ਦਾ ਕੰਮ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "ਜਿਹੜੇ ਸਿਖਲਾਈ  ਦੇ ਕੰਮ(ਕੰਮਾਂ) ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਏ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "ਟੀਵੀ ਕਲਾਸ ਦੇ ਵੇਰਵੇ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "ਨੂੰ ਕੰਮ ਖ਼ਤਮ ਹੁੰਦਾ ਹੈ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "ਕੰਮ ਖ਼ਤਮ ਹੋਣ ਦੀ ਮਿਤੀ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "ਕੰਮ ਦੇ ਵੇਰਵੇ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "ਇਹ ਕੰਮ ਇਸਦੇ ਲਈ ਢੁਕਵਾਂ ਹੈ:",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "ਟੀਵੀ ਪ੍ਰੋਗਰਾਮ",
+  "TVC_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "ਟੀਵੀ ਕਲਾਸ ਦੇਖਣਾ ਬੰਦ ਕਰੋ",
+  "TVC_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "ਟੀਵੀ ਕਲਾਸਾਂ ਸਿੱਖਣ ਦੀ ਜਾਂਚ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?",
+  "TVC_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "ਟੀਵੀ ਕਲਾਸ ਦਾ ਬੈਚ {{batch_start_date}} ਤੋਂ ਉਪਲੱਬਧ ਹੈ",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "ਸਰਟੀਫਿਕੇਟ ਬਾਰੇ ਤੁਹਾਡੇ ਰਜਿਸਟਰਡ ਸੰਪਰਕ ਵੇਰਵਿਆਂ 'ਤੇ ਤੁਹਾਨੂੰ 7 ਦਿਨਾਂ ਦੇ ਅੰਦਰ ਸੂਚਿਤ ਕੀਤਾ ਜਾਵੇਗਾ",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "ਨੋਟ: ਇਸ ਕੰਮ ਦਾ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "ਤੁਸੀਂ ਇਹ ਟੀਵੀ ਕਲਾਸਾਂ ਦੇਖੀਆਂ ਹਨ",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "ਵਰਤਮਾਨ ਵਿੱਚ, ਇਸ ਕੰਮ ਦਾ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਹੈ। ਨਿਰਮਾਤਾ ਬਾਅਦ ਵਿੱਚ ਸਰਟੀਫਿਕੇਟ ਜੋੜ ਸਕਦਾ ਹੈ।",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "ਤੁਸੀਂ ਟੀਵੀ ਕਲਾਸ ਨੂੰ ਦੇਖਣਾ ਬੰਦ ਕਰ ਦਿੱਤਾ ਹੈ",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "ਟੀਵੀ ਕਲਾਸਾਂ ਰਜਿਸਟਰਡ ਉਪਭੋਗਤਾਵਾਂ ਲਈ ਹਨ। ਟੀਵੀ ਕਲਾਸ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਲਈ ਲੌਗ ਇਨ ਕਰੋ",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "ਇਸ ਟੀਵੀ ਕਲਾਸ ਨੂੰ ਵੇਖਣ ਲਈ ਲੌਗ ਇਨ ਕਰੋ",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "ਸਿਰਫ਼ ਰਜਿਸਟਰਡ ਉਪਭੋਗਤਾ ਸਿੱਖਣ ਦੇ ਕੰਮ ਲੈ ਸਕਦੇ ਹਨ",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "ਤੁਸੀਂ ਇਸ ਕੰਮ ਨੂੰ ਸਫ਼ਲਤਾਪੂਰਵਕ ਪੂਰਾ ਕਰ ਲਿਆ ਹੈ",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "ਕੰਮ ਖ਼ਤਮ ਹੋ ਗਿਆ ਹੈ। ਤੁਸੀਂ ਦੁਬਾਰਾ ਮੁਲਾਂਕਣ ਕਰ ਸਕਦੇ ਹੋ ਪਰ, ਤੁਹਾਡੀ ਤਰੱਕੀ ਦਰਜ ਨਹੀਂ ਕੀਤੀ ਜਾਏਗੀ।",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "ਕੰਮ ਖ਼ਤਮ ਹੋ ਗਿਆ ਹੈ। ਤੁਸੀਂ  ਮੁਲਾਂਕਣ ਕਰ ਸਕਦੇ ਹੋ ਪਰ, ਤੁਹਾਡੀ ਤਰੱਕੀ ਦਰਜ ਨਹੀਂ ਕੀਤੀ ਜਾਏਗੀ।",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "ਟੀਵੀ ਕਲਾਸਾਂ ਨੂੰ ਵੇਖਣ ਅਤੇ ਐਕਸੈਸ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਇੱਕ ਸਰਗਰਮ ਬੈਚ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣਾ ਪਏਗਾ",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "ਟੀਵੀ ਕਲਾਸ ਦੇ ਵੇਰਵਿਆਂ ਨੂੰ ਵੇਖਣ ਲਈ ਤੁਹਾਨੂੰ ਲਾੱਗ ਇਨ ਕਰਨਾ ਪਵੇਗਾ",
   "UNABLE_TO_FETCH_CONTENT": " ਪਿਛਲੀ ਸਮੱਗਰੀ ਲਿਆਉਣ ਲਈ ਅਸਮਰੱਥ",
   "UNENROLL_CONFIRMATION_MESSAGE": "ਤੁਸੀਂ ਬਾਅਦ ਵਿੱਚ ਕਿਸੇ ਕਿਰਿਆਸ਼ੀਲ ਜਾਂ ਆਉਣ ਵਾਲੇ ਸਮੂਹ ਵਿੱਚ ਦੁਬਾਰਾ ਸ਼ਾਮਲ ਹੋ ਸਕਦੇ ਹੋ",
-  "UNENROLL_FROM_COURSE": " ਸਿਖਲਾਈ ਛੱਡੋ",
+  "UNENROLL_FROM_COURSE": "ਕੋਰਸ ਛੱਡੋ",
   "UNIT_COMING_SOON": "ਜਲਦੀ ਆ ਰਿਹਾ ਹੈ!",
   "UNKNOWN_QR": "ਜਾਪਦਾ ਹੈ ਕਿ ਤੁਸੀਂ ਇੱਕ ਅਪ੍ਰਮਾਣਿਕ QR ਕੋਡ ਸਕੈਨ ਕੀਤਾ ਹੈ",
   "UNSELECT_ALL": "ਸਭ ਦੀ ਚੋਣ ਹਟਾਓ",
@@ -611,19 +1159,14 @@
   "UPDATE_APP_TITLE": "ਐਪ ਦਾ ਨਵਾਂ ਸੰਸਕਰਣ ਉਪਲਬਧ ਹੈ!",
   "UPDATE_CONFIRMATION_TEXT": "ਸਮੱਗਰੀ ਨੂੰ ਅਪਡੇਟ ਕਰੀਏ?",
   "UPDATE_CONTENT": "ਸਮੱਗਰੀ ਅੱਪਡੇਟ ਕਰੋ ({{%s}})",
+  "UPDATE_DETAILS": "ਵੇਰਵਾ ਅਪਡੇਟ ਕਰੋ",
   "UPDATE_RECOVERY_ID": "ਰਿਕਵਰੀ ਖਾਤਾ ਅਪਡੇਟ ਕਰੋ",
   "UPDATE_REQUIRED": "ਅਪਡੇਟ ਦੀ ਜਰੂਰਤ ਹੈ",
+  "UPDATE_YOUR_PREFERENCE_FROM_PROFILE": "ਤੁਸੀਂ ਪ੍ਰੋਫਾਈਲ ਸੈਟਿੰਗ ਤੋਂ ਆਪਣੇ {{app_name}} ਪ੍ਰੋਫਾਈਲ ਵੇਰਵੇ ਨੂੰ ਸੋਧ ਸਕਦੇ ਹੋ",
   "UPDATING": "ਅਪਡੇਟ ਕਰ ਰਿਹਾ ਹੈ",
   "UPDATING_CONTENT": "ਅੱਪਡੇਟ ਹੋ ਰਿਹਾ ਹੈ ... {{%s}} %",
-  "USER": "ਉਪਭੋਗਤਾ",
   "USERNAME": "ਉਪਭੋਗਤਾ ਦਾ ਨਾਂ: {{%s}}",
-  "USERS": "ਉਪਭੋਗਤਾ",
-  "USERS_AND_GROUPS": "ਉਪਭੋਗਤਾ ਅਤੇ ਸਮੂਹ",
   "USER_CREATED_SUCCESSFULLY": "ਉਪਭੋਗਤਾ ਸਫਲਤਾਪੂਰਵਕ ਬਣਾਇਆ ਗਿਆ",
-  "USER_DELETE_CONFIRM": "  ਦੇ ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ '{{%s}}'?",
-  "USER_DELETE_CONFIRM_MESSAGE": "ਇਹ ਕਾਰਵਾਈ ਅਟੱਲ ਹੈ, ਇਕ ਵਾਰ ਮਿਟਣ ਤੇ ਉਪਭੋਗਤਾ ਵੇਰਵਾ ਪਹੁੰਚਯੋਗ ਨਹੀਂ ਹੋਵੇਗਾ",
-  "USER_DELETE_CONFIRM_MESSAGE_FROM_GROUP": " ਨੂੰ ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ '{{%s}}'?",
-  "USER_DELETE_CONFIRM_SECOND_MESSAGE": "ਇਹ ਕਾਰਵਾਈ ਸਮੂਹ ਤੋਂ ਉਪਭੋਗਤਾਵਾਂ ਨੂੰ ਹਟਾਉਂਦੀ ਹੈ।ਸਾਰੇ  ਉਪਭੋਗਤਾ ਵੇਰਵੇ ਉਪਭੋਗਤਾ ਟੈਬ ਅਧੀਨ ਉਪਲੱਬਧ ਹਨ",
   "USER_ID": "ਉਪਭੋਗਤਾ ID",
   "USER_IS_NOT_VERIFIED": "ਤੁਹਾਡੀ ਉਪਭੋਗਤਾ ID ਪ੍ਰਮਾਣਿਤ ਨਹੀਂ ਹੈ",
   "USER_NAME": "ਉਪਭੋਗਤਾ ਦਾ ਨਾਮ",
@@ -631,36 +1174,51 @@
   "USER_TYPE_1": "ਅਧਿਆਪਕ",
   "USER_TYPE_2": "ਵਿਦਿਆਰਥੀ",
   "USER_TYPE_3": "ਹੋਰ",
+  "USER_TYPE_5": "ਮਾਤਾ ਪਿਤਾ",
   "USER_TYPE_SELECT_WARNING": "ਉਪਭੋਗੀ ਕਿਸਮ ਚੁਣੋ",
   "USER_VERIFICATION": "ਉਪਭੋਗਤਾ ਤਸਦੀਕ",
-  "VERIFY_EMAIL_OTP_DESCRIPTION": "ਤੁਸੀਂ ਈਮੇਲ ਪਤਾ ਪ੍ਰਮਾਣਤ ਲਈ OTP ਨਾਲ ਇੱਕ email ਪ੍ਰਾਪਤ ਕਰੋਗੇ",
+  "USE_APP_AS": "{{%s}} ਨੂੰ ਇਸ ਤਰਾਂ ਵਰਤੋਂ",
+  "VALIDATION_MAXIMUM_LENGTH": "ਅਧਿਕਤਮ ਲੰਬਾਈ 11 ਸੰਖਿਆਵਾਂ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ",
+  "VALIDATION_MINIMUM_LENGTH": "ਘੱਟੋ ਘੱਟ ਲੰਬਾਈ 11 ਸੰਖਿਆਵਾਂ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ",
+  "VERIFY": "ਪੜਤਾਲ ਕਰੋ",
+  "VERIFY_EMAIL_OTP_DESCRIPTION": "ਤੁਸੀਂ ਈਮੇਲ ਪਤਾ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਲਈ OTP ਨਾਲ ਇੱਕ ਈਮੇਲ ਪ੍ਰਾਪਤ ਕਰੋਗੇ",
   "VERIFY_EMAIL_OTP_TITLE": "ਈਮੇਲ ਪਤਾ ਪ੍ਰਮਾਣਿਤ ਕਰੋ",
   "VERIFY_PHONE_OTP_DESCRIPTION": "ਤੁਹਾਨੂੰ ਮੋਬਾਈਲ ਨੰਬਰ ਤਸਦੀਕ ਲਈ OTP ਦੇ ਨਾਲ ਇੱਕ SMS ਪ੍ਰਾਪਤ ਕਰੇਗਾ",
   "VERIFY_PHONE_OTP_TITLE": "ਮੋਬਾਈਲ ਨੰਬਰ ਦੀ ਜਾਂਚ ਕਰੋ",
   "VERSION": "ਸੰਸਕਰਣ",
-  "VIDEOS": "ਵੀਡੀਓ",
+  "VERYFYING_PLEASE_WAIT": "ਪੜਤਾਲ ਕਰ ਰਿਹਾ ਹੈ",
+  "VIDEO": "ਵੀਡੀਓ",
   "VIEW": "ਵੇਖੋ",
+  "VIEW_ACTIVITY": "ਗਤੀਵਿਧੀ ਵੇਖੋ",
   "VIEW_ALL": "ਸਭ ਨੂੰ ਵੇਖੋ",
   "VIEW_ALL_BATCHES": "ਅੱਗੇ ਵਧਣ ਲਈ ਇੱਕ ਬੈਚ ਚੁਣੋ",
   "VIEW_CREDITS_INFO": "ਲਾਇਸੈਂਸਿੰਗ ਜਾਣਕਾਰੀ ਵੇਖੋ",
   "VIEW_DOWNLOADS_ONLY_MSG": "ਸਿਰਫ ਡਾਉਨਲੋਡਸ ਵੇਖੋ",
   "VIEW_MORE": "ਹੋਰ ਵੇਖੋ",
-  "VIEW_ONGOING_BATCHES": "ਚੱਲ ਰਹੇ ਬੈਂਚ",
+  "VIEW_ONGOING_BATCHES": "ਚੱਲ ਰਹੇ ਬੈਚ",
+  "VIEW_OPEN_BATCHES": "ਖੁੱਲੇ ਬੈਚ",
   "VIEW_RETIRED_BATCHES": "ਮਿਆਦ ਪੁੱਗੀਆਂ ਬੈਂਚ",
   "VIEW_UPCOMING_BATCHES": "ਆਉਣ ਵਾਲੇ ਜੱਥੇ",
   "WAITING_TO_DOWNLOAD": "ਡਾਊਨਲੋਡ ਦੀ ਉਡੀਕ ਕਰ ਰਿਹਾ ਹੈ ...",
   "WAIT_REQUEST": "ਸਮੱਗਰੀ ਲਿਆ ਰਿਹਾ ਹੈ....",
-  "WANT_TO_CHECK_FREE_TRAININGS": "ਮੁਫਤ ਸਿਖਲਾਈ ਦੀ ਜਾਂਚ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?",
+  "WANT_TO_CHECK_FREE_TRAININGS": "ਕੋਰਸਿਸ  ਦੀ ਜਾਂਚ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?",
   "WARNING_PLEASE_MAKE_SOME_CHANGES": "ਤਬਦੀਲੀਆਂ ਕਰੋ",
   "WEBVIEW_UPDATE_TEXT": "ਪ੍ਰਭਾਵਸ਼ਾਲੀ ਤਜ਼ਰਬੇ ਲਈ, ਗੂਗਲ ਪਲੇ ਸਟੋਰ ਤੋਂ ਵੈਬਵਿਓ ਦਾ ਨਵੀਨਤਮ ਸੰਸਕਰਣ ਡਾਊਨਲੋਡ ਕਰੋ।",
+  "WEEKS_AGO": "{{%s}} ਹਫ਼ਤੇ ਪਹਿਲਾਂ",
+  "WEEK_AGO": "{{%s}} ਹਫ਼ਤਾ ਪਹਿਲਾਂ",
+  "WELCOME": "ਸਵਾਗਤ ਹੈ",
   "WELCOME_BACK": " ਤੁਹਾਡਾ ਵਾਪਸ ਸਵਾਗਤ ਹੈ {{%s}}",
+  "WHAT_IS_MEMBER_ID": "ਮੈਂ {{app_name}} ID ਕਿੱਥੇ ਵੇਖ ਸਕਦਾ ਹਾਂ?",
+  "YEARS_AGO": "{{%s}} ਸਾਲ ਪਹਿਲਾਂ",
+  "YEAR_AGO": "{{%s}} ਸਾਲ ਪਹਿਲਾਂ",
   "YES": "ਹਾਂ",
+  "YOUR_ID_FROM_STATE_BOARD_ORG": "ਰਾਜ/ ਬੋਰਡ/ ਸੰਗਠਨ ਤੋਂ ਤੁਹਾਡੀ ID",
   "YOUR_LOCATION": "ਤੁਹਾਡਾ ਸਥਾਨ",
   "YOUR_LOCATION_DETAILS": "ਤੁਹਾਡੇ ਸਥਾਨ ਦੇ ਵੇਰਵੇ ਸਾਡੀ ਕਂਟੇਂਟ ਨੂੰ ਸੁਝਾਉਣ ਵਿਚ ਸਾਡੀ ਮਦਦ ਕਰਦੇ ਹਨ ਜੋ ਤੁਹਾਡੇ ਲਈ ਲਾਭਦਾਇਕ ਹੈ। ਕੀ ਸਥਾਨ ਸਹੀ ਦਿੱਤਾ ਗਿਆ ਹੈ? ਜੇ ਨਹੀਂ, ਤਾਂ ਆਪਣਾ ਸਹੀ ਟਿਕਾਣਾ ਚੁਣੋ ਅਤੇ ਇਸ ਨੂੰ ਜਮ੍ਹਾਂ ਕਰਵਾਓ।",
   "YOUR_PROGRESS": "ਤੁਹਾਡੀ ਤਰੱਕੀ: {{%s}}%",
   "YOUR_PROGRESS_LABEL": "ਤੁਹਾਡੀ ਤਰੱਕੀ",
   "YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET": "ਤੁਸੀਂ ਇੰਟਰਨੈਟ ਨਾਲ ਨਹੀਂ ਜੁੜੇ ਹੋ",
-  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "ਸਿਖਲਾਈ ਦੇ ਵੇਰਵਿਆਂ ਨੂੰ ਵੇਖਣ ਅਤੇ ਐਕ੍ਸੇਸ ਲਈ ਕਿਰਿਆਸ਼ੀਲ ਬੈਚ ਵਿੱਚ ਦਾਖਲਾ ਲਵੋ",
-  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "ਸਿਖਲਾਈ ਦੇ ਵੇਰਵਿਆਂ ਦੀ ਪਹੁੰਚ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਲਾੱਗ ਇਨ ਕਰਨਾ ਪਵੇਗਾ",
-  "YOU_MUST_LOGIN_TO_ACCESS_QUIZ_CONTENT": "ਤੁਹਾਨੂੰ ਇਸ ਕੰਟੇਂਟ ਨੂੰ ਐਕਸੈਸ ਕਰਨ ਲਈ ਲਾੱਗਇਨ ਕਰਨਾ ਪਵੇਗਾ"
+  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "ਕੋਰਸ ਦੇ ਵੇਰਵਿਆਂ ਨੂੰ ਵੇਖਣ ਅਤੇ ਐਕਸੈਸ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਇੱਕ ਸਰਗਰਮ ਬੈਚ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ",
+  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "ਕੋਰਸ ਦੇ ਵੇਰਵੇ ਦੀ ਪਹੁੰਚ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਲੌਗ ਇਨ ਕਰਨਾ ਪਵੇਗਾ",
+  "YOU_MUST_LOGIN_TO_ACCESS_QUIZ_CONTENT": "ਤੁਹਾਨੂੰ ਇਸ ਕੰਟੇਂਟ ਨੂੰ ਐਕਸੈਸ ਕਰਨ ਲਈ ਲਾੱਗ ਇਨ ਕਰਨਾ ਪਵੇਗਾ"
 }
\ No newline at end of file
diff --git a/src/assets/i18n/ta.json b/src/assets/i18n/ta.json
index 32920a086..3dbce7b10 100644
--- a/src/assets/i18n/ta.json
+++ b/src/assets/i18n/ta.json
@@ -3,26 +3,51 @@
   "ABOUT_US": "எங்களைப் பற்றி அறிய",
   "ACCOMPLISHMENTS": "சிறப்புத் தகுதிகள்",
   "ACCOUNT_MERGE_CONFIRMATION_BTN_MERGE": "இணை",
+  "ACCOUNT_MERGE_CONFIRMATION_CONTENT": "உங்களிடம் {{%s}} உடன் இரண்டு கணக்குகள் இருந்தால், <b> ஒன்றிணைத்தல் </ b> ஐக் கிளிக் செய்க: <ul> <li> இரு கணக்குகளின் பயன்பாட்டு விவரங்களையும் இணைத்து, </ li> <li> மற்ற கணக்கை நீக்கு < / li> </ul> வேறு, <b> ரத்துசெய் </ b> என்பதைக் கிளிக் செய்க",
   "ACCOUNT_MERGE_CONFIRMATION_HEADING": "கணக்கை ஒன்றிணைக்கவும்",
   "ACCOUNT_MERGE_FAILED": "கணக்கை ஒன்றிணைப்பதுத் தோல்வியடைந்தது",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_CONTENT": "கணக்கு இணைப்பு வெற்றிகரமாக தொடங்கப்பட்டது. அது முடிந்ததும் உங்களுக்கு அறிவிக்கப்படும்.",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_HEADING": "கணக்கை ஒன்றிணைத்தல்",
-  "ACCURACY": "துல்லியம்",
   "ACTIVE": "செயல்நிலை",
   "ACTIVE_DOWNLOADS": "பதிவிறக்க நிலைமை",
+  "ACTIVITIES": "செயல்பாடுகள்",
+  "ACTIVITIESE_SEARCH_PLACEHOLDER": "குழுவின் செயல்பாடுகளைத் தேடுங்கள்",
+  "ACTIVITY_ALREADY_ADDED_IN_GROUP": "இந்தச் செயல்பாட்டை நீங்கள் முன்பே குழுவில்  சேர்த்துள்ளீர்கள்",
+  "ACTIVITY_COLLECTION_TITLE": "தொகுப்பு",
+  "ACTIVITY_COURSE_TITLE": "பாடநெறிகள்",
+  "ACTIVITY_EXPLANATION_CONTENT_TITLE": "விளக்க உள்ளடக்கம்",
+  "ACTIVITY_PRACTICE_QUESTION_SET_TITLE": "பயிற்சி கேள்வி தொகுப்பு",
+  "ACTIVITY_PRACTICE_RESOURCE_TITLE": "பயிற்சி வளம் ",
+  "ACTIVITY_RESOURCE_TITLE": "வளம்",
+  "ACTIVITY_TEXTBOOK_TITLE": "பாடப்புத்தகம்",
+  "ACTIVITY_TV_EPISODE_TITLE": "டிவி எபிசோட்",
   "ADD": "சேர்",
+  "ADD_ACTIVITY": "செயல்பாட்டைச் சேர்க்கவும்",
+  "ADD_ACTIVITY_ERROR_MSG": "செயல்பாட்டைச் சேர்க்க முடியவில்லை. பின்னர் மீண்டும் முயற்சிக்கவும்",
+  "ADD_ACTIVITY_SUCCESS_MSG": "செயல்பாடு வெற்றிகரமாகச் சேர்க்கப்பட்டது",
+  "ADD_ANOTHER_USER": "மேலும் பயனரை இணையுங்கள்",
   "ADD_DISTRICT": "மாவட்டத்தை சேர்க்கவும் ",
+  "ADD_EDIT_SELF_DECLARED_TEACHER_INFO": "முன்னேற்றத்தை சரிபார்க்கவும் பின்பற்றவும் இந்த விவரங்கள் உங்கள் அறிவிக்கப்பட்ட மாநிலத்திற்கு கிடைக்கக்கூடும்",
   "ADD_EMAIL": "மின்னஞ்சல் முகவரியை  இணைக்கவும்",
+  "ADD_MEMBER": "உறுப்பினரைச் சேர்க்கவும்",
+  "ADD_MEMBER_CONFIRMATION": "நீங்கள் தொடர்வதற்கு முன், உறுப்பினரின் பெயர் மற்றும் {{app_name}} ஐடி பொருந்துமா என்பதை நீங்கள் சரிபார்க்க வேண்டும்",
+  "ADD_MEMBER_POPUP_DESC": "உறுப்பினர்களின் தனித்துவமான {{%s}} ஐடியை அடையாளம் காண வழிகாட்ட பின்வரும் வழிமுறைகளைப் பயன்படுத்தவும்",
+  "ADD_MEMBER_POPUP_STEP_1": "<span> முதல் படி </span>: சுயவிவர தாவலைக் கிளிக் செய்க",
+  "ADD_MEMBER_POPUP_STEP_2": "<span>Step 2</span>: உங்கள் {{% s}} ஐடியைப் பகிர பகிர் ஐகானைக் கிளிக் செய்க",
+  "ADD_MEMBER_POPUP_TITLE": "{{%s}} ஐடியை நான் எங்கே காணலாம்?",
   "ADD_PHONE": "அலைபேசி எண்ணை சேர்க்கவும்",
   "ADD_RECOVERY_ACCOUNT": "மீட்பு கணக்கைச் சேர்க்கவும்",
   "ADD_RECOVERY_ID": "மீட்பு கணக்கைச் சேர்க்கவும்",
   "ADD_STATE": "மாநிலத்தை சேர்க்கவும் ",
+  "ADD_TO_GROUP": "குழுவில் சேர்",
+  "ADD_TO_GROUP_ACTIVITY": "குழுவில்  சேர்க்கவும்",
+  "ADD_USER": "பயனரைச் சேர்க்கவும்",
   "ADD_USERS": "பயனர்களைச் சேர்க்கவும்",
-  "ADD_USERS_TO_GROUP": "{{%s}} பயனர்களை குழுவாக சேர்க்கவும்",
+  "AGREE_TO_SHARE_PROFILE_DETAILS": "எனது சுயவிவர விவரங்களை பாடநெறி நிர்வாகியுடன் பகிர்ந்து கொள்ள ஒப்புக்கொள்கிறேன்",
   "ALL": "அனைத்தும்",
   "ALLOW": "அனுமதி",
   "ALL_ANNOUNCEMENTS": "அறிவிப்புகள்",
-  "ALREADY_ENROLLED_COURSE": "இந்தப் பயிற்சியில்  நீங்கள் ஏற்கனவே இணைந்துவிட்டீர்கள்",
+  "ALREADY_ENROLLED_COURSE": "இந்தப் பாடநெறியில்  நீங்கள் ஏற்கனவே இணைந்துவிட்டீர்கள்",
   "ALWAYS_ON": "எப்போதும் இயங்குதல்",
   "ANDROID_NOT_SUPPORTED": "உங்கள் Android பதிப்பு ஆதரிக்கப்படவில்லை",
   "ANDROID_NOT_SUPPORTED_DESC": "தங்கள்  Android  மிக பழைய பதிப்பில் இயங்குவதால் இந்த உள்ளடக்கத்தை திறக்க முடியாது. தங்களுடைய கருவி மாதிரியை அடிப்படையாகக் கொண்டு இந்த உள்ளடக்கத்தை நீங்கள் காணலாம், உங்களிடம் crosswalk இருந்தால். இதை முயற்சி செய்ய விரும்பினால், அதை நிறுவ கீழே கிளிக் செய்யவும்.",
@@ -30,6 +55,7 @@
   "ANSWER": "பதில்",
   "APPLY": "சரி",
   "APPLY_FILTER": "பில்ட்டர் செய்க",
+  "APP_ID": "{{%s}} ஐடி",
   "APP_QR_CODE": "{{%s}} QR குறீயீடு உள்ளதா?",
   "APP_RATING_RATE_EXPERIENCE": "உங்கள் செயலியின் பயன்பாட்டு அனுபவத்தை மதிப்பிடுக",
   "APP_RATING_RATE_ON_PLAYSTORE": "பிலே ஸ்டோரில் உங்கள் மதிப்பீட்டை சமர்ப்பிக்க விரும்புகிறீர்களா?",
@@ -43,7 +69,7 @@
   "AS_LINK": "லின்க் வடிவத்தில்",
   "ATTACHMENT_DOWNLOADED": "இணைப்பு பதிவிறக்கப்பட்டது",
   "ATTRIBUTIONS": "சிறப்பளிப்பவர்(கள்)",
-  "AUDIOS": "ஒலி",
+  "AUDIO": "ஒலி",
   "AUTHOR": "ஆக்கியோன்",
   "AUTOMATIC_SYNC": "தரவு தானே சின்க் ஆகும்",
   "AUTO_MIGRATION_FAIL_MESSAGE": "கணக்குகளை ஒன்றிணைக்க முடியவில்லை",
@@ -52,28 +78,24 @@
   "AVAILABLE_FILTERS": "உள்ளதை தெரிவுசெய்க",
   "AVAILABLE_FOR_TEACHERS": "ஆசிரியர்களின் பயன்பாட்டிற்கு மட்டுமே",
   "AVATAR": "படம்",
-  "AVERAGE_SCORE": "சராசரி மதிப்பெண்",
-  "AVERAGE_TIME": "சராசரி நேரம்",
   "BACK_TO_EXIT": "பயன்பாட்டிலிருந்து வெளியேறவும்?",
-  "BATCHEND_MAIN_HEADING": "நீங்கள் சேர்ந்துள்ள தொகுதியின் பயிற்சி {{%s}} அன்று முடிந்தது ",
-  "BATCHEND_SUB_HEADING": "நீங்கள் பயிற்சியைத் தொடரலாம், ஆனால் உங்கள் முன்னேற்றம் புதுப்பிக்கப்படாது",
+  "BATCHEND_MAIN_HEADING": "நீங்கள் சேர்ந்துள்ள தொகுதியின் பாடநெறி {{%s}} அன்று முடிந்தது ",
+  "BATCHEND_SUB_HEADING": "நீங்கள் பாடநெறியைத் தொடரலாம், ஆனால் உங்கள் முன்னேற்றம் புதுப்பிக்கப்படாது",
   "BATCHES_AVAILABLE": "இருக்கும் தொகுதிகள் ",
-  "BATCHES_FOR_THIS_COURSE": "இந்தப் பயிற்சிகளுக்கான தொகுதிகள்",
+  "BATCHES_FOR_THIS_COURSE": "இந்தப் பாடநெறிக்கான தொகுதிகள்",
   "BATCH_CREATED_BY": "இவரால் உருவாக்கப்பட்டது ",
   "BATCH_DETAILS": "தொகுதி பற்றிய தகவல்கள்",
   "BATCH_ENROLLMENT_ENDED": "இந்த தொகுதிக்குப் பதிவு செய்யும் தேதி முடிந்துவிட்டது",
   "BATCH_EXPIRED": "தொகுதி முடிவடைந்தது",
   "BATCH_EXPIRED_BUTTON": "சரி!",
-  "BATCH_EXPIRED_DESCRIPTION": "இந்த தொகுதிக்கான நேரம் முடிவடைந்தது. தாங்கள் பயிற்சியை  தொடரலாம். எனினும், உங்கள் முன்னேற்றம் மேலும் கைப்பற்றப்படாது அல்லது கண்காணிக்கப்படாது.",
   "BOARD": "வாரியம்",
   "BOARD_OPTION_TEXT": "கல்வி வாரியத்தைத் தேர்வுசெய்க",
+  "BROWES_RELEVANT_CONTENT": "உங்கள் விருப்பங்களின் அடிப்படையில் (போர்டு, மொழிவழி கல்வி , வகுப்பு) தொடர்புடைய உள்ளடக்கத்தைக் கண்டறிய {{app_name}} நூலகத்தை உலாவுக.",
   "BTN_CLICK_TO_OPEN_CONTENT": "பாடத்தைத் திறக்க இங்குத் தொடுக",
   "BTN_LATER": "பின்னர்",
   "BTN_RATE_ON_PLAYSTORE": "பிலே ஸ்டோரில் எங்களை மதிப்பிடுங்கள்",
   "BTN_SUBMIT": "சமர்ப்பி",
   "BTN_VISIT_HELP_SECTION": "உதவி பிரிவைப் பார்வையிடவும்",
-  "BY_QUESTIONS": "கேள்விகள் மூலம்",
-  "BY_USERS": "பயனர்கள் மூலம்",
   "CAMERA": "நிழற்பட கருவி",
   "CAMERA_PERMISSION_DESCRIPTION": "QR குறீயீட்டை ஸ்கேன் செய்வதற்காக கேமராவை  அணுகுகிறது ",
   "CANCEL": "ரத்து",
@@ -83,23 +105,34 @@
   "CANCEL_DOWNLOAD": "பதிவிறக்கத்தை ரத்துசெய்",
   "CANCEL_DOWNLOAD_MESSAGE": "பதிவிறக்கத்தை ரத்துசெய்வதால் செயலில்லுள்ள பதிவிறக்கங்களில் இருந்து உள்ளடக்கத்தை  அகற்றிவிடும் ",
   "CANCEL_DOWNLOAD_TITLE": "பதிவிறக்கம் ரத்துசெய்?",
-  "CERTIFIED_TRAINING": "சான்றளிக்கப்பட்ட பயிற்சி",
+  "CERTIFICATE_ALREADY_DOWNLOADED": "சான்றிதழ் ஏற்கனவே பதிவிறக்கம் செய்யப்பட்டுள்ளது, தயவுசெய்து உங்கள் பதிவிறக்க கோப்புறையை சரிபார்க்கவும்",
+  "CERTIFICATE_DOWNLOADED": "சான்றிதழ் பதிவிறக்கம் செய்யப்பட்டுள்ளது",
+  "CERTIFICATE_DOWNLOAD_INFO": "சான்றிதழ் பதிவிறக்கம் செய்யப்படுகிறது",
+  "CERTIFIED_TRAINING": "சான்றிதழ் கிடைக்கும் ",
   "CHANGE": "மாற்று",
   "CHANGE_ROLE": "உங்கள் நிலையை  மாற்றுக",
-  "CHANGE_USER": "பயனர் மாற்று",
+  "CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "இந்த அத்தியாயத்தை முடித்துவிட்டீர்கள்",
+  "CHARACTERS_REMAINING": "{{character_count}} எழுத்துக்கள் மீதமுள்ளன ",
   "CHECK_FOR_UPDATES": "புதியவைகளை தேடி அறிய",
   "CHOOSE_FROM_FOLLOWING": "கீழ்கண்டவற்றிலிருந்து தேர்வு செய்யவும்",
   "CHOOSE_LANGUAGE": "தங்களுக்கு வசதியான மொழியை தேர்ந்தேடுங்கள்",
+  "CHOOSE_USER": "பயனாளியை தேர்ந்தெடு ",
   "CHOOSE_WHERE_TO_SAVE_DATA": "தரவை எங்கு சேமிப்பது என்று தேர்ந்தெடுக்கவும்",
   "CLASS": "வகுப்பு",
   "CLASSES": "வகுப்புகள்",
   "CLEAR": "நீக்கு",
   "COACH_SCREEN": "QR குறியீட்டை ஸ்கேன் செய்வதின் மூலம்  உள்ளடக்கத்திற்குச் செல்லலாம்",
   "COMMUNITIES": "சமூகங்கள்",
-  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": " {{%s}}மூலம் பயிற்சியை நிறைவுசெய்யவும் ",
+  "COMPLETED": "நிறைவடைந்தது ",
+  "COMPLETE_ASSESSMENT_TO_EARN_CERTIFICATE": "{{%s}} க்குள் மதிபீட்டை முடிக்கவும்",
+  "COMPLETE_BY": "{{%s}} க்குள் முடிக்கவும்",
+  "COMPLETE_CHAPTER_TO_UNLOCK_ACHIEVEMENT": "புதிய சாதனையைத் திறக்க {{%s}} உள்ளடக்கங்களை முடிக்கவும்",
+  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": " {{%s}}க்குள் பாடநெறியை முடிக்கவும்",
   "CONFIRM": "உறுதிசெய்யுங்கள்",
+  "CONGRATULATIONS": "வாழ்த்துக்கள்!",
   "CONNECT_TO_INTERNET_SUGGESTION": "உள்ளடக்கத்தை காண இணையத்துடன்  இணைக்கவும்",
   "CONSIDER_DOWNLOAD": "உள்ளடக்கத்தை பதிவிறக்கம் செய்துகொள்ளவும்",
+  "CONTENTS": "உள்ளடக்கங்கள்",
   "CONTENT_ALREADY_EXIST": "இந்த கோப்பு ஏற்கனவே இறக்குமதி செய்யப்பட்டுள்ளது. புதிய கோப்பை தேர்ந்தெடுக்கவும்.",
   "CONTENT_ALREADY_EXISTS": "இலக்கு கோப்புறையில் உள்ளடக்கம் உள்ளது. உள்ளடக்கத்தை இருந்தாலும்  இலக்கு கோப்புறையில் நகர்த்தவும்",
   "CONTENT_COMING_SOON": "விரைவில் உள்ளீடு சேர்க்கப்படும்",
@@ -108,13 +141,14 @@
   "CONTENT_CREATING": "இதற்கான உள்ளீடு உருவாகிக் கொண்டிருக்கிறது ",
   "CONTENT_DELETE": "உள்ளடக்கத்தை நீக்குவது, சாதனத்திலிருந்து உள்ளடக்கத்தை அகற்றும்",
   "CONTENT_DELETE_FAILED": "பாடத்தை நீக்குவது தோல்வி அடைந்தது",
-  "CONTENT_DERIVED_FROM": "இந்த உள்ளடக்கம் பெறப்பட்டது",
+  "CONTENT_DERIVED_FROM": "இந்த உள்ளடக்கம் இதிலிருந்து பெறப்பட்டது",
   "CONTENT_IMPORTED": "வெற்றிகரமாக பதிவிறக்கப்பட்டது ",
   "CONTENT_IMPORTED_FAILED": "இறக்கம் தோல்வியடைந்தது",
   "CONTENT_IS_BEEING_ADDED": "உள்ளடக்கம் {{%s}} வில் சேர்க்கப்படுகிறது",
   "CONTENT_IS_BEING_ADDED": "பாடங்கள் விரைவில் இணைக்கப்படும்",
   "CONTENT_NOT_AVAILABLE": "உள்ளடக்கம் கிடைக்கவில்லை",
   "CONTENT_PLAYER_EXIT_PERMISSION": "இந்த உள்ளடக்கத்தை விட்டு வெளியேற விரும்புகிறீர்களா ?",
+  "CONTENT_PREFERENCE": "உள் நுழை",
   "CONTENT_RATING_SUB_HEADING": "உள்ளடக்கத்தை மதிப்பிட நட்சத்திரங்களைத் தட்டவும்",
   "CONTENT_RETIRED_BY_AUTHOR": "இந்த உள்ளடக்கம் ஆசிரியரால் அகற்றப்பட்டுவிட்டது, இனிமேலும் கிடைக்காது",
   "CONTENT_SIZE": "பாடத்தின் அளவு",
@@ -123,50 +157,193 @@
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO_SDCARD": "உள்ளடக்கம் வெற்றிகரமாக SD கார்ட்க்கு மாற்றப்பட்டது",
   "CONTINUE": "தொடருங்கள்",
   "CONTINUE_AS_ROLE": "'{{%s}}' தொடரவும்",
-  "CONTINUE_NOW": "தொடரு",
+  "CONTINUE_LEARNING": "தொடரு",
   "CONTRIBUTIONS": "பங்களிப்புகள்",
   "CONTRIBUTORS": "பங்களிப்பாளர்கள்",
   "COPYRIGHT": "பதிப்புரிமை",
-  "COURSES_BNAV": "பயிற்சிகள்",
-  "COURSES_IN_PROGRESS": "என் பயிற்சிகள்",
+  "COURSES": "பாடநெறிகள் ",
+  "COURSES_BNAV": "பாடநெறிகள்",
+  "COURSES_IN_PROGRESS": "என் பாடநெறிகள்",
   "COURSE_COMPLETED_LABEL": "{{%s}}% நிறைவடைந்தது",
-  "COURSE_ENDED": "பயிற்சி {{%s}} இல் முடிந்தது",
-  "COURSE_ENROLLED": "நீங்கள் பயிற்சியில் இணைந்துவிட்டீர்கள்",
-  "COURSE_NOT_AVAILABLE": "இந்தப் பயிற்சி இனி செயலில் இல்லை ",
+  "COURSE_COMPLETION_POPUP_DESC": "7 நாட்களுக்குள் பாடநெறி சான்றிதழ் குறித்து உங்கள்  பதிவு செய்யப்பட்ட தொடர்பு விவரங்களில் உங்களுக்கு அறிவிக்கப்படும்",
+  "COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "குறிப்பு: இந்த பாடநெறிக்கு சான்றிதழ் இல்லை",
+  "COURSE_ENDED": "பாடநெறி {{%s}} இல் முடிந்தது",
+  "COURSE_ENDED_ON": "பாடநெறி {{%s}} இல் முடிந்தது",
+  "COURSE_ENROLLED": "நீங்கள் பாடநெறியில் இணைந்துவிட்டீர்கள்",
+  "COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}}  அன்று பாடநெறி  கடைசியாக புதுப்பிக்கப்பட்டது",
+  "COURSE_NOT_AVAILABLE": "இந்தப் பாடநெறி இனி செயலில் இல்லை ",
+  "COURSE_NO_CERTIFICATE_MESSAGE": "தற்போது, ​​இந்த பாடநெறிக்கு சான்றிதழ் இல்லை. பாடநெறி உருவாக்கியவர் பின்னர் ஒரு சான்றிதழை இணைக்கலாம்.",
   "COURSE_PROGRESS_COMPLETED": "நிறைவு : {{%s}}%",
-  "COURSE_UNENROLLED": "பதிவு செய்த பயிற்சியில் இருந்து வெற்றிகரமாக விளகிவிட்டிர்கள்.",
-  "COURSE_WILL_BE_AVAILABLE": "{{%s}}தில் இருந்துப் பாடநெறி கிடைக்கும்",
+  "COURSE_UNENROLLED": "நீங்கள் பாடநெறியில் இருந்து வெற்றிகரமாக விளகிவிட்டிர்கள்.",
+  "COURSE_WILL_BE_AVAILABLE": "{{%s}}தில் இருந்துத் தொகுதி ஆரம்பமாகும்",
   "CREATE_GROUP": "குழுவை உருவாக்கு",
-  "CREATE_NEW_GROUP": "புதிய குழுவை உருவாக்கவும்",
-  "CREATE_NEW_USER": "புதிய பயனரை உருவாக்கவும்",
+  "CREATE_GROUP_DESCRIPTION": "நீங்கள் ஒரு குழுவை உருவாக்குவதற்கு ஒரு படி தூரத்தில் இருக்கிறீர்கள்",
+  "CREATE_GROUP_DESCRIPTION_POPUP": "ஒரு குழுவை உருவாக்கவும் அல்லது மக்களுடன் இணையவும், செயல்பாடுகளைப் பகிரவும், முன்னேற்றத்தை மதிப்பாய்வு செய்யவும் மற்றும் பிற சாத்தியங்களை ஆராயவும் ஒரு பகுதியாக இருங்கள்",
   "CREATE_USER": "பயனர் உருவாக்கவும்",
   "CREATORS": "{{%s}}  அன்று தயாரிக்கப்பட்டது",
   "CREDITS": "சிறப்பளிப்பவர்",
   "CREDITS_LICENCE_INFO": "நன்மதிப்பு மற்றும் உரிமத் தகவல்",
-  "CSV_DOWNLOAD_SUCCESS": "{{%s}} 'பதிவிறக்கங்கள்' கீழ் சேமிக்கப்பட்டுள்ளது",
+  "CRS_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "தொடங்க ஒரு படிப்பைத் தேர்வுசெய்க",
+  "CRS_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "பாடநெறி",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "பாடநெறிகள்",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "பாடநெறிகள்",
+  "CRS_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": " {{%appName}}-ன்  நூலகத்தில் host {% {{%explainVideos}} , {{% quesBanks}} மற்றும் பிற {{%interactiveMaterial}}ஆகியவற்றின்  உள்ளன. நூலகத்தை ஆராயத் தொடங்க ஒரு பாடநெறியை  கிளிக் செய்க!",
+  "CRS_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}})க்கான பாடநெறிகள் எதுவும் இல்லை",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "வாரியம் பாடநெறிகளை சேர்க்கிறது",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{% S}  இல் ஒரு பாடத்திட்டத்தைக் கண்டுபிடிக்க முடியவில்லை?",
+  "CRS_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span> குறிப்பு: </ span>  இந்த பாடநெறிக்கான முன்னேற்றத்தைக் கண்காணிக்க முடியாது",
+  "CRS_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": " {{%s}}இல் நீங்கள் கோரிய பாடநெறியை உங்கள் மாநில வாரியம் பதிவேற்றும்போது நாங்கள் உங்களுக்கு அறிவிப்போம்.",
+  "CRS_NONTRK_QR_CODE_DETAILS": "உங்கள் பாடத்திட்டத்திலிருந்து QR குறியீட்டை ஸ்கேன் செய்வதன் மூலம் டிஜிட்டல் உள்ளடக்கத்திற்கு உடனடி அணுகலைப் பெறுங்கள்.",
+  "CRS_NONTRK_SEE_MORE_BOOKS": "மேலும் பாடநெறிகள் மற்றும் உள்ளடக்கத்தைப் பார்க்கவும்",
+  "CRS_NONTRK_STUDENT_ROLE_DESC_1": "பாடநெறிகள் மற்றும் டிஜிட்டல் உள்ளடக்கத்தை உலாவுக",
+  "CRS_NONTRK_TEACHER_ROLE_DESC_1": "பாடநெறிகள்  மற்றும் டிஜிட்டல் உள்ளடக்கத்தை உலாவுக",
+  "CRS_NONTRK_TUTORIAL_HEADING": "காணொளிகள், ஊடாடும் உள்ளடக்கம், E-பாடபுத்தகங்கள் மற்றும் பல ...",
+  "CRS_TRK_BATCHEND_MAIN_HEADING": " {{%s}} இல் முடிக்ககப்பட்ட ஒரு பாடத்தின் தொகுப்பில் சேர்ந்துள்ளீர்கள்",
+  "CRS_TRK_BATCHEND_SUB_HEADING": "நீங்கள் நிச்சயமாக தொடரலாம், ஆனால் உங்கள் முன்னேற்றம் புதுப்பிக்கப்படாது",
+  "CRS_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "இந்த மாடுயூல் முடித்துவிட்டீர்கள்",
+  "CRS_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": " {{%s}}க்குள் பாடநெறியை முடிக்கவும்",
+  "CRS_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "பாடநெறிகள்",
+  "CRS_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "நீங்கள் இந்த பாடத்திட்டத்தில் சேர்ந்துள்ளீர்கள்",
+  "CRS_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "பாடநெறிக்கான தொகுதிகள்",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "பாடநெறிகள்",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "எனது பாடநெறிகள்",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "பாடநெறி{{%s}} இல் முடிந்தது",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "{{last_updated_on_date}}  அன்று பாடநெறி  கடைசியாக புதுப்பிக்கப்பட்டது",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_NOT_AVAILABLE": "இந்த பாடநெறி செயலற்றது",
+  "CRS_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "பாடநெறியில் சேர்",
+  "CRS_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "சமீபத்திய பாடநெறிகள்",
+  "CRS_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "பாடநெறிகளை விடலாமா?  ",
+  "CRS_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "ஒரு பாடநெறியில் சேர உள்நுழைக",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_COURSES": "பாடநெறிகள் இல்லை",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "பாடநெறிகள் அல்லது நூலகத்திலிருந்து உள்ளடக்கத்தைப் பதிவிறக்குக",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "பாடநெறிகள் ({{%s}}) ",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "பாடநெறி ({{%s}})",
+  "CRS_TRK_FRMELEMNTS_LBL_OVERLAY_LABEL_TAKE_COURSE": "இந்த பாடத்திட்டத்தில் சேர உள்நுழைக",
+  "CRS_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "பிரபலமான பாடநெறிகள்",
+  "CRS_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ஆன்லைன் இல் பாடநெறிகளை எடுக்கவும்",
+  "CRS_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "சான்றிதழைப் பெற {{% s}} க்குள் பாடநெறியை முடிக்கவும்",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING": "பாடநெறி",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "பங்கேற்க பாடநெறிகள்",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "பாடநெறி விவரங்கள்",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "பாடநெறி முடிகிறது",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "பாடநெறி இறுதி தேதி",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "பாடநெறி விவரங்கள்",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "இந்த பாடநெறி கீழ்க்கண்டவைக்குப்  பொருத்தமானது:",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "பாடநெறி மாடுயூல்",
+  "CRS_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "பாடநெறிகளை விடு",
+  "CRS_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "பாடநெறிகளை சரிபார்க்க வேண்டுமா ",
+  "CRS_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "பாடநெறியின் தொகுதி {{batch_start_date}} லிருந்து கிடைக்கிறது",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "7 நாட்களுக்குள் பாடநெறி சான்றிதழ் குறித்த பதிவு செய்யப்பட்ட தொடர்பு விவரங்களில் உங்களுக்கு அறிவிக்கப்படும்",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "குறிப்பு: இந்த பாடநெறிக்கு சான்றிதழ் இல்லை",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "நீங்கள் பாடநெறியில் இணைந்துவிட்டீர்கள்",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "தற்போது, ​​இந்த பாடநெறிக்கு சான்றிதழ் இல்லை. பாடநெறி உருவாக்கியவர் பின்னர் ஒரு சான்றிதழை இணைக்கலாம்.",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "நீங்கள் பாடநெறியில் இருந்து விளகிவிட்டிர்கள்.",
+  "CRS_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "இந்த பாடநெறிக்கு தொகுதிகள் எதுவும் இல்லை",
+  "CRS_TRK_FRMELEMNTS_MSG_OTHER_ROLE_DESC_2": "ஆன்லைன் பாடநெறிகளை எடுத்துக் கொள்ளுங்கள்",
+  "CRS_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "பாடநெறி பதிவுசெய்த பயனர்களுக்கானது. பாடத்திட்டத்தை அணுக உள்நுழைக.",
+  "CRS_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "இந்த பாடநெறிக்கு எந்த தொகுப்பும் கிடைக்கவில்லை",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "பதிவுசெய்த பயனர்கள் மட்டுமே பாடநெறிகளை  எடுக்க முடியும்",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "இந்த பாடநெறியை வெற்றிகரமாக முடித்துவிட்டீர்கள்",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "பாடநெறி முடிந்துவிட்டது. நீங்கள் மதிப்பீட்டை மீண்டும் செய்யலாம், ஆனால், உங்கள் முன்னேற்றம் பதிவு செய்யப்படாது.",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "பாடநெறி முடிந்துவிட்டது. நீங்கள் மதிப்பீட்டை எடுக்கலாம், ஆனால், உங்கள் முன்னேற்றம் பதிவு செய்யப்படாது.",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "பாட விவரங்களை காண மற்றும் அணுக நீங்கள் செயலில் உள்ள குழுவில் சேர வேண்டும்",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "பாட விவரங்களை அணுக நீங்கள் உள்நுழைய வேண்டும்",
   "CURRENT_LANGUAGE": "நடப்பு மொழி",
-  "DATA": "மேலும் புத்தங்கள் மற்றும் பாடங்கள் காண",
   "DATA_SYNC": "தரவுகள் சின்க்",
   "DATA_SYNC_FAILURE": "தரவு இசைவு தோல்வியடைந்தது. சிறிது நேரம் கழித்து மீண்டும் முயற்சிக்கவும்",
   "DATA_SYNC_NOTHING_TO_SYNC": "ஒத்திசைக்க எதுவும் இல்லை",
   "DATA_SYNC_SUB": "தங்கள் தரவை காப்புகள், டெலிமெட்ரியை பரிமாறுங்கள்.",
   "DATA_SYNC_SUCCESSFUL": "தரவு இசைவு சரி பார்க்கப்பட்டது",
+  "DAYS_AGO": "{{%s}} நாட்கள் முன்பு",
+  "DAY_AGO": "{{%s}} நாள் முன்பு",
   "DELETE": "அகற்று",
   "DELETE_ALL_CONTENT_WARNING": "பாடத்தை நீக்குவது, கருவியில் இருந்து அதை அகற்றும்",
   "DELETE_CONTENT": "பாடத்தை நீக்கு?",
-  "DELETE_CONTENT_SIZE": "1 உருப்படி ({{content_size}})",
+  "DELETE_CONTENT_SIZE": "1 உள்ளடக்கம் ({{content_size}})",
   "DELETE_CONTENT_WARNING": "பாடத்தை நீக்குவது, கருவியில் இருந்து அதை அகற்றும்",
-  "DELETE_GROUP": "குழுவை நீக்கு",
+  "DELETE_GROUP_DESC": "{{Group_name} ஐ நீக்குவது, குழுவிலிருந்து நிரந்தரமாக பயன்பாட்டை நீக்கும்",
+  "DELETE_GROUP_ERROR_MSG": "குழுவை  அகற்ற முடியவில்லை. பின்னர் மீண்டும் முயற்சிக்கவும்",
+  "DELETE_GROUP_POPUP_TITLE": "குழுவை நீக்குவதா?",
+  "DELETE_GROUP_SUCCESS_MSG": "குழு வெற்றிகரமாக நீக்கப்பட்டது",
   "DELETE_PROGRESS": "தேர்ந்தெடுத்த உள்ளடக்கத்தை நீக்குகிறது",
-  "DESCRIPTION": "விவரங்கள்",
+  "DETAIL_TUTORIAL": "{{%appName}}-ன் நூலகத்தில் {{%explainVideos}}, {{%quesBanks}} மற்றும் பிற {{%interactiveMaterial}} கள் உள்ளன. நூலகத்தை ஆராயத் தொடங்க ஏதேனும் ஒரு பாடப்புத்தகத்தைச் சொடுக்குங்கள்!",
   "DEVICE_ID": "கருவியின் ஐடி",
-  "DEVICE_LOCATION": "சாதன இருப்பிடம்",
+  "DEVICE_LOCATION": "கருவி இருப்பிடம்",
   "DEVICE_TAGS": " கருவியின் குறிச்சொற்கள்",
   "DEVICE_TAGS_SUB": "கருவியின் குறிச்சொற்களை சேர்க்க அல்லது நீக்க",
+  "DFLT_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "தொடங்க ஒரு பணியைத் தேர்வுசெய்க",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "பணி",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "பணிகள் ",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "பணிகள்",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}-ன் நூலகத்தில் host {% {{%explainVideos}} , {{% quesBanks}} மற்றும் பிற {{%interactiveMaterial}}ஆகியவற்றின் உள்ளன. நூலகத்தை ஆராயத் தொடங்க ஒரு பாடத்திட்டத்தைக் கிளிக் செய்க!",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) -க்கான பணிகள் எதுவும் காணப்படவில்லை",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "வாரியம் உள்ளடக்கத்தைச் சேர்க்கிறது",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}}இல் உள்ளடக்கத்தைக் கண்டுபிடிக்க முடியவில்லை?",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span> குறிப்பு: </ span> முன்னேற்றத்தைக் கண்காணிக்க முடியாது",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "நீங்கள் கோரிய உள்ளடக்கத்தை  {{%s}}இல் உங்கள் மாநில வாரியம் பதிவேற்றும்போது நாங்கள் உங்களுக்கு அறிவிப்போம்",
+  "DFLT_NONTRK_QR_CODE_DETAILS": "QR குறியீட்டை ஸ்கேன் செய்வதன் மூலம் டிஜிட்டல் உள்ளடக்கத்திற்கு உடனடி அணுகலைப் பெறுக",
+  "DFLT_NONTRK_SEE_MORE_BOOKS": "மேலும் பார்க்க",
+  "DFLT_NONTRK_STUDENT_ROLE_DESC_1": "டிஜிட்டல் உள்ளடக்கத்திற்காக உலாவுக",
+  "DFLT_NONTRK_TEACHER_ROLE_DESC_1": "டிஜிட்டல் உள்ளடக்கத்திற்காக உலாவுக",
+  "DFLT_NONTRK_TUTORIAL_HEADING": "காணொளிகள், ஊடாடும் உள்ளடக்கம்,மின் பாட புத்தகங்கள் மற்றும் பல ...",
+  "DFLT_TRK_BATCHEND_MAIN_HEADING": " {{%s}} இல் முடிக்கப்பட்ட கற்றல் பணியின் தொகுப்பில் சேர்ந்துள்ளீர்கள்",
+  "DFLT_TRK_BATCHEND_SUB_HEADING": "நீங்கள் தொடர்ந்து கற்றுக் கொள்ளலாம், ஆனால் உங்கள் முன்னேற்றம் புதுப்பிக்கப்படாது",
+  "DFLT_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "இந்த கற்றல் செயல்பாட்டை முடித்துவிட்டீர்கள்",
+  "DFLT_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": " {{%s}} ன் முழுமையான கற்றல்",
+  "DFLT_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "இந்த கற்றல் பணி செயலற்றது",
+  "DFLT_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "கற்றல் பணிகள்",
+  "DFLT_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "இந்த கற்றல் பணியில் சேர்ந்துள்ளீர்கள்",
+  "DFLT_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "கற்றல் பணிக்கான தொகுதிகள்",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "கற்றல் பணிகள்",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "எனது கற்றல் பணிகள்",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "பணி {{%s}} அன்று முடிந்தது",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "கடைசியாக புதுப்பிக்கப்பட்ட நாள்{{last_updated_on_date}}",
+  "DFLT_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "சேர்",
+  "DFLT_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "சமீபத்திய கற்றல் பணிகள்",
+  "DFLT_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "பணியை விட்டு விலகலாமா?",
+  "DFLT_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "சேர உள்நுழைக ",
+  "DFLT_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "உள்ளடக்கத்தைப் பதிவிறக்குக",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "பணிகள் ({{%s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "பணி ({{%s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "ஆன்லைன் கற்றலை எடுத்துக் கொள்ளுங்கள்",
+  "DFLT_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "பிரபலமான பணிகள்",
+  "DFLT_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ஆன்லைன் கற்றலை எடுத்துக் கொள்ளுங்கள்",
+  "DFLT_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "சான்றிதழைப் பெறுவதற்கு {{%s}}க்குள்  பணியை முடிக்கவும்",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING": "கற்றல் பணி ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "கலந்து கொண்ட கற்றல் பணி(கள்) ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "பணி விவரங்கள் ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "பணி அன்று முடிகிறது",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "பணி இறுதி தேதி",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "பணி விவரங்கள் ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "இந்த பணி இதற்கு பொருத்தமானது:",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "பணி வளங்கள்",
+  "DFLT_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "பணியை விடுங்கள்",
+  "DFLT_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "கற்றல் பணிகளை சரிபார்க்க வேண்டுமா?",
+  "DFLT_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "பணியின் தொகுதி {{batch_start_date}} லிருந்து கிடைக்கிறது",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "சான்றிதழ் குறித்த உங்கள் பதிவு செய்யப்பட்ட தொடர்பு விவரங்களில் 7 நாட்களுக்குள் உங்களுக்கு அறிவிக்கப்படும்",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "குறிப்பு: இந்த பணிக்கு சான்றிதழ் இல்லை",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "நீங்கள் பணியில் சேர்ந்துள்ளீர்கள்",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "தற்போது, ​​இந்த பணிக்கு சான்றிதழ் இல்லை. உருவாக்கியவர் பின்னர் ஒரு சான்றிதழை இணைக்கலாம்.",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "நீங்கள் பணியை விட்டுவிட்டீர்கள்",
+  "DFLT_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "இந்த கற்றல் பணிக்கு தொகுதிகள் எதுவும் இல்லை",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "பணி பதிவு செய்யப்பட்ட பயனர்களுக்கானது. பணியை அணுக உள்நுழைக",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "இந்த பணியைத் தொடங்க உள்நுழைக",
+  "DFLT_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "இந்த பணிக்கு தொகுதிகள் எதுவும் கிடைக்கவில்லை",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "பதிவுசெய்த பயனர்கள் மட்டுமே கற்றல் பணிகளை மேற்கொள்ள முடியும்",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "இந்த பணியை வெற்றிகரமாக முடித்துவிட்டீர்கள்",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "பணி முடிந்தது. நீங்கள் மதிப்பீட்டை மீண்டும் செய்யலாம், ஆனால், உங்கள் முன்னேற்றம் பதிவு செய்யப்படாது.",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "பணி முடிந்தது. நீங்கள் மதிப்பீட்டை எடுக்கலாம், ஆனால், உங்கள் முன்னேற்றம் பதிவு செய்யப்படாது.",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "பணி விவரங்களைக் காண மற்றும் அணுக நீங்கள் செயலில் உள்ள குழுவில் சேர வேண்டும்",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "பணி விவரங்களை அணுக நீங்கள் உள்நுழைய வேண்டும்",
   "DISMISS": "ரத்து செய்யுங்கள்",
+  "DISMISS_AS_GROUP_ADMIN": "குழு நிர்வாகியாக நிராகரி",
+  "DISMISS_AS_GROUP_ADMIN_ERROR_MSG": "{{member_name}} அவர்களை குழு நிர்வாகியாக நிராகரிக்க முடியவில்லை",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_DESC": "குழு நிர்வாகியாக {{member_name}}  அவர்களை  நிராகரிப்பது உறுப்பினரிடமிருந்து நிர்வாக அனுமதிகளை நீக்குகிறது",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_TITLE": "குழு நிர்வாகியாக நிராகரிப்பதா?",
+  "DISMISS_AS_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} அவர்கள்  இனி குழு நிர்வாகி அல்ல",
   "DISTRICT": "மாவட்டம் ",
   "DISTRICT_OPTION_TEXT": "மாவட்டத்தை தேர்வு செய்க",
-  "DOCS": "ஆவணங்கள்",
+  "DOC": "ஆவணங்கள்",
   "DOWNLOAD": "பதிவிறக்கு",
   "DOWNLOADING": "பதிவிறக்கம்  நடைபெறுகிறது{{%s}} %",
   "DOWNLOADING_1": "பதிவிறக்கம் நடைபெறுகிறது {{%s}}",
@@ -200,13 +377,22 @@
   "EMAIL_UPDATE_SUCCESS": " மின்னஞ்சல் வெற்றிகரமாக புதுப்பிக்கப்பட்டது",
   "EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) க்கான புத்தகங்கள் கிடைக்கவில்லை",
   "EMPTY_SEARCH_RESULTS": "உங்கள் தேடலுக்குறிய முடிவுகள் இல்லை",
+  "EMPTY_SEARCH_RESULT_GROUPS": "மன்னிக்கவும்! உங்கள் தேடலுடன் பொருந்தக்கூடிய முடிவுகள் எதுவும் இல்லை",
   "ENDORSE": "ஆதரியுங்கள்",
   "ENJOYED_THIS_CONTENT": "இந்த பாடத்தை படித்து மகிழ்தீர்களா?",
   "ENROLL": "இணை",
+  "ENROLLMENT_ENDED_ON": "தொகுதி சேர்க்கை {{%s}} அன்று முடிந்தது",
   "ENROLLMENT_LAST_DATE": "சேர்க்கைக்கான கடைசி தேதி",
   "ENTER_GROUP_NAME": "குழு பெயரை உள்ளிடவும்",
+  "ENTER_ID": "ஐடியை உள்ளிடவும் ",
+  "ENTER_ID_AS_REQUESTED_BY_STATE_BOARD_ORG": "உங்கள் மாநிலம் / வாரியம் / அமைப்பு  கோரியபடி ஐடியை உள்ளிடவும்",
+  "ENTER_LOCATION_FROM_PROFILE_PAGE": "சுயவிவரப் பக்கத்திலிருந்து இருப்பிடத்தை உள்ளிடவும்",
+  "ENTER_MEMBER_ID": "{{app_name}} ஐடியை உள்ளிடவும்",
   "ENTER_OTP": "OTP ஐ  உள்ளிடவும் ",
   "ENTER_PHONE_POPUP_TITLE": "தொலைபேசி எண்னை உள்ளிடவும் ",
+  "ENTER_SCHOOL_NAME": "பள்ளியின் பெயரை உள்ளிடவும் ",
+  "ENTER_THE_FOLLOWING_INFORMATION": "பின்வரும் தகவலை உள்ளிடவும்",
+  "ENTER_UDISE_ID": "UDISE ஐடியை உள்ளிடவும்",
   "ERROR_BATCH_NOT_STARTED": "தொகுதி இன்னும் ஆரம்பிக்கவில்லை",
   "ERROR_CANT_OPEN_EMPTY_CONTENT": "காலியானக் கோப்புகளை திறக்க முடியாது",
   "ERROR_CONTENT_NOT_AVAILABLE": "பாடம் கிடைக்கவில்லை",
@@ -219,21 +405,32 @@
   "ERROR_FAILED_TO_DOWNLOAD_ATTACHMENT": "இணைப்பின் பதிவிறக்கம்  தோல்வியடைந்தது.",
   "ERROR_FETCHING_DATA": "தரவு பெறுவதில் சிக்கல் ஏற்பட்டுள்ளது",
   "ERROR_LOW_MEMORY": "இடமாற்றத்திற்கு போதுமான இடம் கிடைக்கவில்லை",
+  "ERROR_MAXIMUM_ACTIVITY_COUNT_EXCEEDS": "குழுவிற்குச் சேர்க்கக்கூடிய அதிகபட்ச செயல்பாடுகளை நீங்கள் மீறிவிட்டீர்கள்",
+  "ERROR_MAXIMUM_GROUP_COUNT_EXCEEDS": "நீங்கள் உருவாக்கக்கூடிய அதிகபட்ச குழுக்களின் எண்ணிக்கையை மீறிவிட்டீர்கள்",
+  "ERROR_MAXIMUM_MEMBER_COUNT_EXCEEDS": "குழுவில் சேர்க்கக்கூடிய அதிகபட்ச உறுப்பினர்களின் எண்ணிக்கையை நீங்கள் மீறிவிட்டீர்கள்",
   "ERROR_NAME_INVALID": "ஒரு பெயருக்கான எழுத்துக்கள் அல்லது இடைவெளியை மட்டுமே உள்ளிடவும் ",
   "ERROR_NO_BATCHES_FOUND": "இந்தப் பாடநெறிகளுக்கு எந்தத்  தொகுதிகளும் இல்லை",
   "ERROR_NO_INTERNET_MESSAGE": "தங்கள் கைப்பேசி இணையத்திடம் இணைக்கப்படவில்லை.",
   "ERROR_NO_OFFLINE_RESOURCE": "இன்னும் பாடங்கள் எதுவும் இல்லை",
   "ERROR_OFFLINE_MODE": "இணையம் இல்லை, ஆஃப்லைன் பயன்முறை",
   "ERROR_OTP": "தவறான OTP. சரியான OTP ஐ உள்ளிடவும்: {{%s}}",
-  "ERROR_PHONE_EXISTS": "இந்த அலைபேசி எண் ஏற்கனவே உள்ளது. வேறு அலைபேசி எண்ணை உள்ளிடவும்",
+  "ERROR_OTP_LIMIT_EXCEEDED": "நீங்கள் அதிகபட்ச OTP வரம்பை மீறிவிட்டீர்கள், பின்னர் மீண்டும் முயற்சிக்கவும்",
+  "ERROR_PHONE_EXISTS": "இந்த கைப்பேசி  எண் ஏற்கனவே உள்ளது. வேறு அலைபேசி எண்ணை உள்ளிடவும்",
   "ERROR_PHONE_INVALID": "சரியான அலைபேசி எண்ணை உள்ளிடவும்",
+  "ERROR_PHONE_REQUIRED": "கைப்பேசி  எண் தேவை",
   "ERROR_SAME_EMAIL_UPDATED": "இந்த  மின்னஞ்சல் முகவரி ஏற்கனவே உங்கள் சுயவிவரத்துடன் இணைக்கப்பட்டுள்ளது. மற்றொரு மின்னஞ்சல் முகவரியைத உள்ளிடவும்",
-  "ERROR_SAME_PHONE_UPDATED": "இந்த தொலைபேசி  எண் ஏற்கனவே உங்கள் சுயவிவரத்துடன் இணைக்கப்பட்டுள்ளது. மற்றொரு தொலைபேசி எண்ணை உள்ளிடவும் ",
+  "ERROR_SAME_PHONE_UPDATED": "இந்த கைப்பேசி  எண் ஏற்கனவே உங்கள் சுயவிவரத்துடன் இணைக்கப்பட்டுள்ளது. மற்றொரு கைப்பேசி எண்ணை உள்ளிடவும் ",
   "ERROR_SERVER_CONNECTION": "சேவையகத்துடன் தொடர்புகொள்ள முடியவில்லை",
+  "ERROR_SPECIAL_CHARECTERS_NOT_ALLOWED": "சிறப்பு எழுத்துக்கள் அனுமதிக்கப்படவில்லை",
   "ERROR_TECHNICAL_PROBLEM": "நாங்கள் தொழில்நுட்ப சிக்கலை எதிர்கொண்டோம் மற்றும் கோரிக்கையை செயல்படுத்த முடியவில்லை",
   "ERROR_UPLOADING_IMG": "படத்தைப்  பதிவேற்றம்  செய்வதில் பிழை",
   "ERROR_USER_ACCOUNT_BLOCKED": "தங்கள் பயனர் அக்கௌன்ட்  தடுக்கப்பட்டுள்ளது. விவரங்களுக்கு உங்கள் நிர்வாகியைத் தொடர்பு கொள்ளுங்கள்",
+  "ERROR_WHILE_ADDING_USER": "பயனரை இணைப்பதில் சிக்கல்",
+  "ERROR_WHILE_FETCHING_USERS": "பயனரை பெறும்போது சிக்கல் ஏற்ப்பட்டது",
   "ERROR_WHILE_LOGIN": "உள்நுழைவதில் பிழை",
+  "ERROR_WHILE_SWITCHING_USER": "பயனரை மாற்றும்போது சிக்கல் ஏற்ப்பட்டது",
+  "EXPLORE_HEADING": "{{%s}} வி/இல் மேலும் பாடங்களை ஆராயுங்கள்",
+  "EXP_VIDEOS": "விளக்கக் காணொளிகள் ",
   "EXTRACTING_CONTENT": "பாடங்களை எடுத்துக் கொண்டிருகிறோம்",
   "FEEDBACK_HINT": "தங்கள் கருத்து (கட்டாயம் இல்லை)",
   "FEEDBACK_HINT_1": "தங்கள் கருத்துகளை இந்து பதிவுசெய்க",
@@ -248,23 +445,194 @@
   "FILTER": "தெரிவு",
   "FILTER_ADDED": "வடிகட்டி சேர்க்கப்பட்டது",
   "FILTER_BY": "இதன் அடிப்படையில் தெரிவு செய்க",
-  "FIRST_NAME": "பெயர்",
   "FOLLOW": "பின்பற்று",
   "FORCE_UPDATE_MESSAGE": "நீங்கள் {{%s}}  செயலியின் பழைய  வகையை பயன்படுத்துகிறீர்கள். Google Playstore லிருந்து சமீபத்திய செயலியைப் பெற,  Update பொத்தானை தட்டவும்",
+  "FORUM": "கலந்துரையாடுங்கள்",
+  "FOR_SUPPORT": "{{%s}} ஆதரவுக்காக",
   "FREE_SPACE": "வெற்றிடம்",
+  "FRMELEMENTS_BTN_ACTIVATEGRP": "செயல்படுத்து ",
+  "FRMELEMENTS_BTN_ADD": "சேர்க்க ",
+  "FRMELEMENTS_BTN_BACK": "பின் செல் ",
+  "FRMELEMENTS_BTN_DEACTIVATEGRP": "செயலிழக்க",
+  "FRMELEMENTS_BTN_NEXT": "அடுத்தது",
+  "FRMELEMENTS_LBL_ACTIVATEGRP": "குழுவை செயல்படுத்து",
+  "FRMELEMENTS_LBL_ACTIVATEGRPQUES": "குழுவை செயல்படுத்தவா?",
+  "FRMELEMENTS_LBL_CONTENT_TYPE": "உள்ளடக்க வகை",
+  "FRMELEMENTS_LBL_DEACTIVATEGRP": "குழுவை செயலிழக்கச் செய்யுங்கள்",
+  "FRMELEMENTS_LBL_DEACTIVATEGRPQUES": "குழுவை செயலிழக்கச் செய்யவா?",
+  "FRMELEMENTS_LBL_REMARKS": "குறிப்புகள்",
+  "FRMELEMENTS_MSG_ACTIVATEGRPFAILED": "குழுவை செயல்படுத்த முடியவில்லை, பின்னர் மீண்டும் முயற்சிக்கவும்",
+  "FRMELEMENTS_MSG_ACTIVATEGRPMSG": "குழுவைச் செயல்படுத்துவது உறுப்பினர்களையும் செயல்பாடுகளையும் சேர்க்க உங்களுக்கு உதவுகிறது. உறுப்பினரின் முன்னேற்றத்தையும் நீங்கள் கண்காணிக்கலாம்",
+  "FRMELEMENTS_MSG_ACTIVATEGRPPOPUP": "இந்த குழு தற்காலிகமாக செயலற்றது. குழு நிர்வாகி தேவைப்பட்டால் குழுவை மீண்டும் செயல்படுத்த முடியும். குழு உறுப்பினர்கள் கலந்துரையாடல் மன்றத்தில் தங்கள் விவாதங்களைத் தொடரலாம்.",
+  "FRMELEMENTS_MSG_ACTIVATEGRPSUCCESS": "குழு வெற்றிகரமாக செயல்படுத்தப்பட்டது",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPFAILED": "குழுவை செயலிழக்க முடியவில்லை, பின்னர் மீண்டும் முயற்சிக்கவும்",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPMSG": "குழுவை இடைநிறுத்துவது செயலில் உள்ள குழுக்களின் பட்டியலிலிருந்து அதை அகற்றிவிடும், மேலும் அதில் உறுப்பினர்களின் முன்னேற்றத்தை நீங்கள் சரிபார்க்க முடியாது",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPSUCCESS": "குழு வெற்றிகரமாக செயலிழக்கப்பட்டது",
+  "FRMELEMNTS_BTN_CLOSE": "மூடு",
+  "FRMELEMNTS_BTN_DONOT_SHARE": "பகிர வேண்டாம்",
+  "FRMELEMNTS_BTN_EDIT_SETTING": "அமைப்புகளைத் திருத்து",
+  "FRMELEMNTS_BTN_PREVIEW_FORM": "படிவத்தை முன்னோட்டமிடுங்கள்",
+  "FRMELEMNTS_BTN_SAVE": "சேமி",
+  "FRMELEMNTS_BTN_SAVE_EDITS": "திருத்தங்களைச் சேமிக்கவும்",
+  "FRMELEMNTS_BTN_SAVE_FORM": "படிவத்தை சேமிக்கவும்",
+  "FRMELEMNTS_BTN_SEEK_HELP": "உதவிக்கு ",
+  "FRMELEMNTS_BTN_SUBMIT_FORM": "படிவத்தை சமர்ப்பிக்கவும்",
+  "FRMELEMNTS_BTN_VIEW_DETAILS": "விபரங்களை பார்க்க ",
+  "FRMELEMNTS_CKBX_CERTMSG": "இச்செய்தியை மீண்டும் காட்ட வேண்டாம்",
+  "FRMELEMNTS_LBL_ACCESSIBILITY": "திரை வாசகர் அணுகல்",
+  "FRMELEMNTS_LBL_ACCESSIBILITYMODE": "டார்க் மோடுக்கு மாறு",
+  "FRMELEMNTS_LBL_ACCESSIBILITYSKIP": "தவிர்த்து முக்கிய உள்ளடக்கத்திற்கு செல்ல",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXT": "தள வரைபடம்",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXTSIZE": "எழுத்துரு அளவை அதிகரிக்கவும்",
+  "FRMELEMNTS_LBL_ADD_ATTACHMENTS": "இணைப்புகளைச் சேர்க்கவும்",
+  "FRMELEMNTS_LBL_ADD_ENTITY": "நிறுவனத்தைச் சேர்க்கவும்",
+  "FRMELEMNTS_LBL_ADD_NEW_TASK": "புதிய பணியைச் சேர்க்கவும்",
+  "FRMELEMNTS_LBL_ADD_REMARKS": "குறிப்புகளைச் சேர்க்கவும்",
+  "FRMELEMNTS_LBL_ADD_SUBTASK": "துணை பணி சேர்க்கவும்",
+  "FRMELEMNTS_LBL_ADD_SUBTASK_PALCEHOLDER": "துணை பணி பெயரைச் சேர்க்கவும்",
+  "FRMELEMNTS_LBL_ADD_TASK": "பணி சேர்க்கவும்",
+  "FRMELEMNTS_LBL_ASSIGNED_TO": "ஒதுக்கப்படும்",
+  "FRMELEMNTS_LBL_ASSIGN_TASK": "பணியை ஒதுக்குங்கள்",
+  "FRMELEMNTS_LBL_ATTACH": "இணைக்கவும்",
+  "FRMELEMNTS_LBL_ATTACHMENTS": "இணைப்புகள் ",
+  "FRMELEMNTS_LBL_BLOCK": "தடைசெய் ",
+  "FRMELEMNTS_LBL_CATEGORIES": "வகைகள்",
+  "FRMELEMNTS_LBL_CATEGORY_OVERVIEW": "வகை கண்ணோட்டம்",
+  "FRMELEMNTS_LBL_CLICK_HELP": "<b>உதவிக்கு </b>  பட்டனை கிளிக் செய்க",
+  "FRMELEMNTS_LBL_CLICK_HERE_TO_VIEW_LIBRARY": "நூலகத்தைக் காண இங்கே கிளிக் செய்க",
+  "FRMELEMNTS_LBL_CLUSTER": "குறுவள மையம் ",
+  "FRMELEMNTS_LBL_CONSENT_POPUP_INFO": "இந்த விவரங்களை உங்கள் சுயவிவரப் பக்கத்திலிருந்து திருத்தலாம்",
+  "FRMELEMNTS_LBL_CONTENT_AVAIALABLE_IN_OTHER_BOARD": "உங்கள் தேவைக்கு ஏற்ப பிற பலகைகளில் சுவாரஸ்யமான உள்ளடக்கம் இருக்கலாம்!",
+  "FRMELEMNTS_LBL_CONTENT_FOUND": "உங்கள் தேவைக்கு பொருந்தக்கூடிய சில உள்ளடக்கத்தை நாங்கள் கண்டறிந்துள்ளோம்!",
+  "FRMELEMNTS_LBL_CONTENT_TO_BE_ADDED": "உங்கள் வாரியம் இன்னும் உள்ளடக்கத்தை சேர்க்கவில்லை.",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT": "உள்ளடக்கத்தைக் கண்டுபிடிக்க முடியவில்லையெனில்  கீழே உள்ள பட்டனை கிளிக் செய்யவும் ",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT_YET": "உங்கள் உள்ளடக்கத்தை இன்னும் கண்டுபிடிக்க முடியவில்லையா?",
+  "FRMELEMNTS_LBL_CRITERIA_WISE": "அளவுகோல்கள்",
+  "FRMELEMNTS_LBL_DATA_SETTINGS": "தரவு அமைப்புகள்",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF": "சுயவிவர தரவு பகிர்வு முடக்கப்பட்டுள்ளது\n",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF_INFO": "உங்கள் சுயவிவர விவரங்களை பாடநெறி நிர்வாகியுடன் பகிர்ந்து கொள்ள நீங்கள் ஒப்புக்கொள்ளவில்லை",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON": "எனது சுயவிவர விவரங்களைப் பகிரவும்",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON_INFO": "உங்கள் சுயவிவர விவரங்களை பாடநெறி நிர்வாகியுடன் பகிர்ந்து கொள்ள ஒப்புக்கொண்டீர்கள்",
+  "FRMELEMNTS_LBL_DELETE_CONFIRMATION": "உங்கள் துணைப்பணியை நீக்க விரும்புகிறீர்களா?",
+  "FRMELEMNTS_LBL_DONOT_SHARE_PROFILE_INFO": "எனது சுயவிவர விவரங்களை பகிர வேண்டாம்",
+  "FRMELEMNTS_LBL_DURATION": "காலம்",
+  "FRMELEMNTS_LBL_EMAIL_ID_PLACEHOLDER": "மாநில / அமைப்பின் மின்னஞ்சல் முகவரி ",
+  "FRMELEMNTS_LBL_END_DATE": "கடைசி தேதி",
+  "FRMELEMNTS_LBL_FILES": "கோப்புகள் ",
+  "FRMELEMNTS_LBL_IMAGES": "படங்கள்",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS": "முன்னேற்ற அறிக்கைகள்",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS_DESC": "திட்ட அறிக்கைகளைக் காண்க",
+  "FRMELEMNTS_LBL_IN_PROGRESS": "முன்னேற்றத்தில் உள்ளது",
+  "FRMELEMNTS_LBL_LEARNER_PASSBOOK": "கற்றல் பாஸ்புக்",
+  "FRMELEMNTS_LBL_LEARNING_RESOURCES": "கற்றல் வளங்கள்",
+  "FRMELEMNTS_LBL_LINK_LEARNING_RESOURCES": " கற்றல் வளங்களை இணை ",
+  "FRMELEMNTS_LBL_MEDIA_TYPE": "ஊடக வகை",
+  "FRMELEMNTS_LBL_MOBILE_NUMBER_PLACEHOLDER": "மாநில / அமைப்பின்  கைப்பேசி  எண்",
+  "FRMELEMNTS_LBL_MY_LEARNINGS": "எனது கற்றல்",
+  "FRMELEMNTS_LBL_NEW_TASK": "புதிய பணி",
+  "FRMELEMNTS_LBL_NO_MATCHING_CONTENT": "எந்த உள்ளடக்கமும் பொருந்தவில்லை",
+  "FRMELEMNTS_LBL_OBJECTIVE": "குறிக்கோள்",
+  "FRMELEMNTS_LBL_OBSERVATION": "கண்காணிப்பு ",
+  "FRMELEMNTS_LBL_OBSERVATION_DESC": "உங்கள் வகுப்பறை மற்றும் பள்ளி கண்காணிப்புகளை எளிதாக அணுகவும்  மற்றும் பதிவுசெய்யவும் முடியும் , உங்கள் முன்னேற்ற பயணங்களைத் திட்டமிடுங்கள்",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS": "கண்காணிப்பு அறிக்கைகள் ",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS_DEC": "கண்காணிப்பு அறிக்கைகளைக் காண்க",
+  "FRMELEMNTS_LBL_OBSERVE_AGAIN": "மீண்டும் கவனிக்கவும்",
+  "FRMELEMNTS_LBL_OPEN_BATCH_NOT_RECOMMENDED": "உங்கள் கற்றல் வரலாறு மற்றும் சான்றிதழ்கள் மீட்டமைக்கப்படும் என்பதால் முந்தைய தொகுப்பில் இந்த பாடநெறியை  நீங்கள் ஏற்கனவே முடித்திருந்தால் மறுபடி சேர பரிந்துரைக்கப்படவில்லை)",
+  "FRMELEMNTS_LBL_PERSONA": "பொறுப்பு ",
+  "FRMELEMNTS_LBL_PROFCONF": "சுயவிவரப் பெயரை உறுதிப்படுத்தவும்",
+  "FRMELEMNTS_LBL_PROFTITLE": "சுயவிவரப் பெயர்",
+  "FRMELEMNTS_LBL_PROGRAM_NAME": "நிகழ்ச்சியின் பெயர் ",
+  "FRMELEMNTS_LBL_PROJECT": "திட்டம்",
+  "FRMELEMNTS_LBL_PROJECT_DESCRIPTION": "பணிகளை உருவாக்குவதன் மூலமும் காலக்கெடுவைத் திட்டமிடுவதன் மூலமும் உங்கள் பள்ளி மேம்பாடுகளை நிர்வகிக்கவும் கண்காணிக்கவும் முடியும் ",
+  "FRMELEMNTS_LBL_PROJECT_OVERVIEW": "திட்டத்தின் கண்ணோட்டம் ",
+  "FRMELEMNTS_LBL_PROJECT_STATUS": "திட்டத்தின்  நிலை",
+  "FRMELEMNTS_LBL_PROJECT_TITLE": "திட்ட தலைப்பு",
+  "FRMELEMNTS_LBL_PROJECT_VIEW": "திட்டக் காட்சி",
+  "FRMELEMNTS_LBL_QUESTION_WISE": "கேள்விகள்",
+  "FRMELEMNTS_LBL_RELEVANT_CONTENT_SUB_HEADING": "உங்கள் குறிப்பிட்ட உள்ளடக்க தேவைகளுக்கான விவரங்களை நிரப்பவும்",
+  "FRMELEMNTS_LBL_REPORTS": "அறிக்கைகள்",
+  "FRMELEMNTS_LBL_REPORTS_DESC": "அறிக்கைகளின் பட்டியல் ",
+  "FRMELEMNTS_LBL_REQUEST_CONTENT": "உள்ளடக்கத்தைக் கோருகிறீர்களா?",
+  "FRMELEMNTS_LBL_SCHOOL": "பள்ளி ",
+  "FRMELEMNTS_LBL_SELECT_CATEGORIES": "வகை(களைத்) தேர்ந்தெடுக்கவும்",
+  "FRMELEMNTS_LBL_SELECT_PROGRAM": "நிகழ்ச்சியை தேர்ந்தெடு ",
+  "FRMELEMNTS_LBL_SET_DATE": "தேதி அமைக்கவும்",
+  "FRMELEMNTS_LBL_SET_DATE_HINT": "உங்கள் திட்டத்திற்கான காலவரிசை அமைக்கவும்",
+  "FRMELEMNTS_LBL_SHARE_PROFILE_INFORMATION": "எனது சுயவிவர விவரங்களைப் பகிரவும்",
+  "FRMELEMNTS_LBL_START_DATE": "தொடக்க தேதி",
+  "FRMELEMNTS_LBL_STATUS": "நிலை ",
+  "FRMELEMNTS_LBL_SUBPERSONA": "துணை பங்கு",
+  "FRMELEMNTS_LBL_SUBTASKS": "துணை பணிகள்",
+  "FRMELEMNTS_LBL_SURVEY": "கருத்தாய்வு",
+  "FRMELEMNTS_LBL_SURVEY_ACTION": "கணக்கெடுப்பு நடவடிக்கைகள்",
+  "FRMELEMNTS_LBL_SURVEY_DESC": "கருத்தாய்வு  பட்டியல்",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS": "கருத்தாய்வு அறிக்கைகள் ",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS_DESC": "கருத்தாய்வு அறிக்கைகளை காண்க ",
+  "FRMELEMNTS_LBL_TAB_HOME": "முகப்பு ",
+  "FRMELEMNTS_LBL_TASK_DESCRIPTION": "பணி விளக்கம்",
+  "FRMELEMNTS_LBL_TASK_OVERVIEW": "பணி கண்ணோட்டம்",
+  "FRMELEMNTS_LBL_THIS_MONTH": "இந்த மாதம்",
+  "FRMELEMNTS_LBL_TOTAL_TASKS": "மொத்த பணிகள்",
+  "FRMELEMNTS_LBL_UPCOMING": "வரவிருக்கும் ",
+  "FRMELEMNTS_LBL_UPDATE_DATA_SETTINGS": "அமைப்புகளைப் புதுப்பிக்கவும்",
+  "FRMELEMNTS_LBL_USERTYPE_LEADER": "தலைமை ஆசிரியர் & அதிகாரிகள்",
+  "FRMELEMNTS_LBL_VIEW_ENTITY_REPORT": "நிறுவன அறிக்கையைக் காண்க",
+  "FRMELEMNTS_LBL_VIEW_FULL_REPORT": "முழு அறிக்கையைக் காண்க",
+  "FRMELEMNTS_LBL_VIEW_RESOURCES": "வளங்களைக் காண்க",
+  "FRMELEMNTS_MSG_BATCH_ALREADY_CLOSED": "இந்த தொகுதிக்கான சேர்க்கை {endDate} அன்று  மூடப்பட்டது ",
+  "FRMELEMNTS_MSG_CONSENT_DECLARATION_INFO": "உங்கள் விவரங்களை உங்கள் சுயவிவரப் பக்கத்திலிருந்து திருத்தலாம்",
+  "FRMELEMNTS_MSG_DATA_SETTINGS_SUBMITED_SUCCESSFULLY": "உங்கள் தரவு அமைப்புகள் வெற்றிகரமாக சமர்ப்பிக்கப்படுகின்றன",
+  "FRMELEMNTS_MSG_DELETE_TASK_CONFIRMATION": "நீங்கள் உறுதியாக பணியை நீக்க விரும்புகிறீர்களா?",
+  "FRMELEMNTS_MSG_EDITCERTNAME": "உங்கள் சுயவிவரப் பக்கத்திலிருந்து அதைத் திருத்தலாம்.",
+  "FRMELEMNTS_MSG_LOAD_FROM_LIBRARY": "நூலகத்திலிருந்து ஏற்றவும்",
+  "FRMELEMNTS_MSG_NAMEONCERT": "இந்த பெயர் உங்கள் பாடநெறி சான்றிதழில் அச்சிடப்படும். அது சரியானதா என்று சரிபார்க்கவும்.",
+  "FRMELEMNTS_MSG_SELECT_IMAGE_SOURCE": "பட மூலத்தைத் தேர்ந்தெடுக்கவும்",
+  "FRMELEMNTS_MSG_SELFDECLARATION_SUCCESS_INFO": "உங்களுக்கு தேவைப்பட்டால் இந்த தகவலை உங்கள் சுயவிவரத்திலிருந்து திருத்தலாம்",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED": "வெற்றிகரமாக இணைக்கப்பட்டுள்ளது",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_SYNCED": "திட்டம் வெற்றிகரமாக ஒத்திசைக்கபட்டது ",
+  "FRMELEMNTS_MSG_TICKET_SUBMISSION_SUCCESS": "உங்கள் கருத்துக்கு நன்றி. எங்களுக்கு அனுப்பப்படும் ஒவ்வொரு பரிந்துரைக்கும் எங்களால் பதிலளிக்க முடியாமல் போகலாம், ஆனால் உங்கள் கருத்து மதிப்புமிக்கது. இது அனைவருக்கும் {{app_name}}சிறந்ததாக்க உதவுகிறது.",
+  "FRMELEMNTS_MSG_UNABLE_TO_ENROLL": "நீங்கள் இப்போது தொகுதியை விட்டு வெளியேற முடியவில்லை. பின்னர் மீண்டும் முயற்சிக்கவும்",
+  "FRMELEMNTS_MSG_UPDATED_SUCCESSFULLY": "வெற்றிகரமாக புதுப்பிக்கப்பட்டது",
+  "FRMELEMNTS_MSG_USER_CREATION_LIMIT_EXCEEDED": "உங்கள் சுயவிவரத்தின் கீழ் நீங்கள் நிர்வகிக்கக்கூடிய பயனர்களின் எண்ணிக்கையை மீறிவிட்டீர்கள்",
+  "FRMELEMNTS_MSG_USE_CAMERA": "கேமராவைப் பயன்படுத்தவும்",
+  "FRMELEMNTS_MSG_USE_FILE": "கோப்பைப் பயன்படுத்தவும்",
+  "FRMELEMNTS_MSG_YOUR_CHANGES_ARE_SAVED": "உங்கள் மாற்றங்கள் வெற்றிகரமாக சேமிக்கப்பட்டன.",
+  "FRMELENTS_LBL_ACCESSIBILITYNORMALMODE": "லைட் மோடுக்கு மாறு",
+  "FRMELMNTS_BLTPT_EARNCERT": "சான்றிதழ்கள் {{STATE}}  மாநில பயனர்களுக்கு மட்டுமே வழங்கப்படும் ",
+  "FRMELMNTS_BLTPT_EARNCERT2": "உங்கள் எல்லா மதிப்பீடுகளிலும் {{PERCENTAGE}}க்கு மேல் மதிப்பெண் பெறவேண்டும் ",
+  "FRMELMNTS_BLTPT_EARNCERT3": "சான்றிதழைப் பெற நீங்கள் மதிப்பீட்டை {{ATTEMPTS}} முறை மட்டுமே முயற்சி செய்யலாம்.",
+  "FRMELMNTS_IMSG_DECLAREINFO": "இந்த பாடநெறிக்கான சான்றிதழ்கள் மாநிலத்தால் அங்கீகரிக்கப்பட்ட ஆசிரியர்களுக்கு மட்டுமே வழங்கப்படுகின்றன",
+  "FRMELMNTS_IMSG_LASTATTMPALRT": "இது மீதமுள்ள கடைசி முயற்சி",
+  "FRMELMNTS_IMSG_LASTATTMPTEXCD": "மதிப்பீடுகளை சமர்ப்பிக்கக்கூடிய அதிகபட்ச முயற்சிகளை நீங்கள் தாண்டிவிட்டீர்கள்",
+  "FRMELMNTS_LBL_ACCESSIBILITYFNTDFLT": "இயல்புநிலைக்கு மீட்டமைக்க",
+  "FRMELMNTS_LBL_ACCESSIBILITYFONT": "எழுத்துரு அளவைக் குறைக்கவும்",
+  "FRMELMNTS_LBL_AVSCORE": "சிறந்த மதிப்பீட்டு மதிப்பெண்களின் சராசரி",
+  "FRMELMNTS_LBL_BESTSCORE": "சிறந்த மதிப்பெண் {{SCORE}}",
+  "FRMELMNTS_LBL_CERTQUES": "சான்றிதழை எவ்வாறு பெறுவீர்கள்? ",
+  "FRMELMNTS_LBL_NOTIFNUMBER": "{{NUMBER}} புதிய அறிவிப்பு (கள்)",
+  "FRMELMNTS_LBL_SEELESS": "குறைவாகக் காண்க",
+  "FRMELMNTS_LBL_SEEMORE": "மேலும் பார்க்க",
+  "FRMELMNTS_LBL_STATEUSERQUES": "நீங்கள் மாநில ஆசிரியரா?",
+  "FRMELMNTS_LNK_DECLARELINK": "இப்போது அறிவிக்கவும்",
+  "FRMELMNTS_PRMPT_DECLAREPROMPT": " சான்றிதழைப் பெற உங்கள் தகவலை {instance} இல் அறிவிக்கவும்",
+  "FRMELMNTS_SCTTL_NOTIFHEADER": "அறிவிப்புகள்",
   "FROM": "இதிலிருந்து",
   "FULL_NAME": "முழுப் பெயர்",
+  "GET_STARTED": "தொடங்கவும்",
   "GOT_IT": "அறிந்துகொண்டேன்",
+  "GO_TO_DOWNLOADS": "பதிவிறக்கங்களுக்குச் செல்லவும்",
+  "GO_TO_PROFILE": "சுயவிவரத்துக்கு செல்",
   "GRADE_OPTION_TEXT": "தங்கள் வகுப்பைத் தேர்வுசெய்க",
   "GRANT_ACCESS": "அனுமதி வழங்கு ",
-  "GROUPS": "குழுக்கள்",
-  "GROUPS_YOU_FOLLOW": "நீங்கள் பின்பற்றும் குழுக்கள்",
-  "GROUP_CREATE_SUCCESS": "குழு வெற்றிகரமாக உருவாக்கப்பட்டது",
-  "GROUP_DELETE_CONFIRM": "'{{%s}}' நீக்கப்பட்டதை உறுதிசெய்யவா?",
-  "GROUP_DELETE_CONFIRM_MESSAGE": "இந்த செயல் குழுவை நீக்கிவிடும், ஆனால் பயனர்கள்ளை இல்லை.  பயனர்கள் 'பயனர்கள்' தாவலில் கீழே காணலாம்",
-  "GROUP_MEMBER_ADD_SUCCESS": "உறுப்பினர்கலை வெற்றிகரமாக சேர்க்கப்பட்டது",
-  "GROUP_MEMBER_DELETE_SUCCESS": "குழு உறுப்பினர்கள் வெற்றிகரமாக நீக்கப்பட்டனர்",
+  "GROUP_CREATED": "குழு வெற்றிகரமாக உருவாக்கப்பட்டது",
+  "GROUP_CREATED_BY": "{{group_creator_name}} அவர்களால் உருவாக்கப்பட்டது ",
+  "GROUP_DESCRIPTION": "குழுவின் விவரம் ",
+  "GROUP_DESCRIPTION_PLACEHOLDER": "குழுவின் நோக்கத்தைப் புரிந்துகொள்ள உறுப்பினர்களுக்கு உதவ ஒரு விளக்கத்தை உள்ளிடவும்",
+  "GROUP_GUIDELINES": "குழு வழிகாட்டுதல்கள்",
+  "GROUP_MEMBER_SEARCH_PLACEHOLDER": "குழுவிற்குள் தேடுங்கள்",
   "GROUP_NAME": "குழு பெயர்",
+  "GROUP_NAME_IS_REQUIRED": "குழுவின் பெயரை உள்ளிட வேண்டும்",
+  "GROUP_TERMS_IS_REQUIRED": "நீங்கள் தொடர்வதற்கு முன் {{app_name}} s சேவை விதிமுறைகளை ஏற்க வேண்டும்",
   "GROUP_UPDATE_SUCCESS": "குழு விவரங்கள் வெற்றிகரமாகப் புதுப்பிக்கப்பட்டன",
   "HABIT_REMINDER_NOTIFICATION_MESSAGE": "இன்று {{%s}} வில் புதியவற்றைக் கற்றுக்கொள்ளுங்கள்!",
   "HELP": "உதவி",
@@ -273,9 +641,10 @@
   "HIDE_CREDITS_INFO": "பெயர் மற்றும் உரிமம் குறித்த விவரங்களை மறைக்கவும் ",
   "HINT_LANGUAGE": "தங்களுக்கு அனுகூலமான மொழியைத் தேர்வு செய்துகொள்ளுங்கள்",
   "HOBBIES": "விருப்பங்கள்",
-  "IAM_ABOVE_18_YEARS_AGE": "நான் 18 வயதுக்கு மேற்பட்டவர்",
-  "IF_YES_LOGIN": "ஆம் எனில், உள்நுழை என்பதைக் கிளிக் செய்க",
-  "IMPORTING": "இறக்குமதி செய்கிறது ...",
+  "HOURS_AGO": "{{%s}} மணி நேரத்திற்க்கு முன்பு",
+  "HOUR_AGO": "{{%s}} மணி நேரத்திற்க்கு முன்பு",
+  "ID_IS_REQUIRED": "ஐடி தேவை",
+  "IMPORTING": "இறக்குமதி செய்யப்படுகிறது ...",
   "IMPORTING_COUNT": "இறக்குமதி செய்கிறது",
   "IMPORT_ECAR": "பொருந்தாத கோப்பு வடிவமைப்பு. நீங்கள்  .ecar , .epar மற்றும் .gsa கோப்புகள் மட்டுமே இறக்கம் செய்யமுடியும்",
   "IMPORT_ERROR": "இறக்கம் தோல்வியடைந்தது",
@@ -283,95 +652,130 @@
   "INACTIVE": "செயல்படவில்லை",
   "INCORRECT_TEACHER_ID_ERROR": "நீங்கள் தவறான ஐடியை உள்ளிட்டுள்ளீர்கள். ஐடியை மீண்டும் உள்ளிடவும்",
   "INSTALL_CROSSWALK": "crosswalk  நிறுவவும்",
+  "INSTANCE_TERMS_OF_USE": "{{app_name}} பயன்பாட்டு விதிமுறைகள்",
   "INSUFFICIENT_STORAGE": "போதுமான சேமிப்பு இடம் இல்லை",
   "INTERACTION": "ஊடாடும்",
+  "INTERACTIVE_MATERIAL": "ஊடாடும் ஆய்வு பொருள்",
   "INTERNAL_MEMORY": "உள் சேமிப்பு",
   "INTERNET_AVAILABLE": "நீங்கள் இப்போது ஆன்லைன்னில்  இருக்கிறீர்கள் ",
   "INTERNET_CONNECTIVITY_NEEDED": "இணைய இணைப்பு தேவை",
   "INVALID_CONTENT": "தவறான பாடம்",
   "INVALID_FORMAT": "தவறான வடிவம்",
+  "INVALID_MEMBER_ID": "நீங்கள் தவறான {{app_name}} ஐடியை உள்ளிட்டுள்ளீர்கள்",
   "INVALID_QR": "தவறான QR குறியீடு ",
   "ITEMS": "{{%s}} கோப்பு(கள்)",
   "ITEMS_SELECTED": "கோப்புகள் தேர்ந்தெடுக்கப்பட்டன",
+  "I_AGREE_TO": "நான் {{app_name}} சேவை விதிமுறைகலாய்   ஒப்புக்கொள்கிறேன்",
   "I_AGREE_TO_TNC": "நான் விதிமுறைகள் மற்றும் நிபந்தனைகளுக்கு ஒப்புக்கொள்கிறேன்.",
-  "JOIN_TRAINING": "பயிற்சியில் இனையவும்",
+  "I_AM_A_PERSONA_WITH_TENANT": "நான் ‪{{%tenant}}‬ ‪{{%persona}}‬",
+  "I_UNDERSTAND_AND_ACCEPT": "நான் புரிந்துகொண்டு ஏற்றுக்கொள்கிறேன்",
+  "JOIN_TRAINING": "பாடநெறியில் இனையவும்",
   "LANGUAGE": "மொழி",
   "LANGUAGE_SETTINGS": "மொழி அமைப்புகள்",
   "LAST_DATE_TO_JOIN": "இணைய கடைசித் தேதி",
   "LAST_SYNC": "கடைசியாக சின்க் ஆனது",
+  "LAST_UPDATED": "‪{{%s}}‬ கடைசியாக புதுப்பிக்கப்பட்டது",
   "LAST_VIEWED": "கடைசியாக பார்த்தவை",
-  "LATEST_COURSES": "புதிய பயிற்சிகள்",
-  "LEAVE_TRAINING_HEADING": "பயிற்சியை விட்டுவிடலாமா?",
+  "LATEST_COURSES": "புதிய பாடநெறிகள்",
+  "LEAVE_GROUP": "குழுவிலிருந்து விலகு",
+  "LEAVE_GROUP_ERROR_MSG": "குழுவிலிருந்து வெளியேற முடியவில்லை. பின்னர் மீண்டும் முயற்சிக்கவும்",
+  "LEAVE_GROUP_POPUP_DESC": "இந்த செயலை தவிர்க்க முடியாது. நீங்கள் {{group_name}}  ஐ விட்டு வெளியேற விரும்புகிறீர்களா?",
+  "LEAVE_GROUP_POPUP_TITLE": "குழுவிலிருந்து விலகு?",
+  "LEAVE_GROUP_SUCCESS_MSG": "நீங்கள் இனி இந்த குழுவின் பகுதியாக இல்லை",
+  "LEAVE_TRAINING_HEADING": "பாடநெறியில் இருந்து வெளியேறவேண்டுமா?",
   "LIBRARY_BNAV": "நூலகம்",
   "LICENSE": "உரிம விதிமுறைகள்",
   "LOAD": "ஏற்றவும்",
+  "LOADER_PROGRESS_DESCRIPTION": "நாங்கள் விவரங்களை தயார் செய்கிறோம்",
+  "LOADER_PROGRESS_DESC_SUB_HEADING": "தயவுசெய்து காத்திருக்கவும்...",
   "LOADING_CONTENT": "பாடம்  ஏற்றப்பட்டுக்கொண்டிருகிறது",
   "LOADING_CONTENTS": "பாடம் ஏற்றப்பட்டுக்கொண்டிருக்கிறது {{%s}}%",
-  "LOADING_USER_LIST": "பயனர் பட்டியல் ஏற்றப்பட்டுக்கொண்டிருகிறது, தயவு செய்து காத்திருங்கள் ",
   "LOAD_FILE": "கோப்பை ஏற்றவும்",
-  "LOGGED_IN_AS": "இந்த பயனர் பெயரில் இருந்து உள்நுழைந்துள்ளீர்",
-  "LOGGED_OUT": "வெளியேற்றப்பட்டீர்கள்",
+  "LOGGED_IN_MEMBER": "{{member_name}} (நீங்கள்)",
+  "LOGIN_TO_CREATE_GROUP_DESCRIPTION": "உங்கள் சொந்த குழு, படிப்பு வட்டம் அல்லது வகுப்பறையை உருவாக்குவதற்கான முதல் படி உள்நுழைவது",
+  "LOGIN_TO_JOIN_TRAINING": "பாடநெறியில்  சேர உள்நுழைக",
   "LOGOUT": "வெளியேறு",
   "LOW_BANDWIDTH": "குறைந்த அலைவரிசை",
   "LOW_BANDWIDTH_DETECTED": "குறைந்த அலைவரிசையை நெட்வொர்க் கண்டறியப்பட்டது",
-  "MARKS": "மதிப்பெண்",
+  "MAINTENANCE_MESSAGE": "நாங்கள் தற்போது பராமரிப்புக்காக தற்காலிகமாக சேவையை நிறுத்தி உள்ளோம் . ஆனால் கவலைப்பட வேண்டாம், நாங்கள் மீண்டும்  வருவோம்",
+  "MAINTENANCE_SUB_TEXT": "நீங்கள் பதிவிறக்கிய உள்ளடக்கத்தை இன்னும் அணுகலாம்",
+  "MAKE_ADMIN": "நிர்வாகியை உருவாக்குங்கள்",
+  "MAKE_GROUP_ADMIN_ERROR_MSG": "{{member_name}} அவர்களை குழு நிர்வாகியாக  உருவாக்க முடியவில்லை",
+  "MAKE_GROUP_ADMIN_POPUP_DESC": "இந்த நடவடிக்கை {{member_name}} அவர்களுக்குக் குழு நிர்வாக அனுமதிகளை வழங்கும்",
+  "MAKE_GROUP_ADMIN_POPUP_TITLE": "குழுவின் நிர்வாகியாக்கு?",
+  "MAKE_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} அவர்கள்  இனி குழுவின்  நிர்வாகி ",
   "MEDIUM": "மீடியம்",
   "MEDIUM_OF_INSTRUCTION": "வகுப்பின் மொழி",
-  "MEDIUM_OPTION_TEXT": "மீடியம் தேர்வுசெய்க",
+  "MEDIUM_OPTION_TEXT": "மொழி வழி கல்வியை தேர்ந்தெடுக்கவும்",
+  "MEMBERS": "உறுப்பினர்கள்",
+  "MEMBER_ADDED_TO_GROUP": "உறுப்பினர் குழுவில் வெற்றிகரமாக சேர்க்கப்பட்டார்",
+  "MEMBER_ALREADY_EXISTS_IN_GROUP": "இந்த உறுப்பினர் ஏற்கனவே குழுவில்  இருக்கிறார் ",
+  "MEMBER_ID": "{{app_name}} ஐடி",
+  "MENU_DELETE_GROUP": "குழுவை நீக்கு",
+  "MENU_DISMISS_AS_GROUP_ADMIN": "குழு நிர்வாகியாக நிராகரி",
+  "MENU_EDIT_GROUP_DETAILS": "குழு விவரங்களைத் திருத்தவும்",
+  "MENU_LEAVE_GROUP": "குழுவிலிருந்து விலகு",
+  "MENU_MAKE_GROUP_ADMIN": "குழு நிர்வாகியை உருவாக்குங்கள்",
+  "MENU_REMOVE_ACTIVITY": "செயல்பாட்டை அகற்று",
+  "MENU_REMOVE_FROM_GROUP": "குழுவிலிருந்து அகற்று",
   "MERGE_ACCOUNT": "கணக்கை ஒன்றிணைக்கவும்",
   "MICROPHONE": "ஒலி வாங்கி",
   "MICROPHONE_PERMISSION_DESCRIPTION": "உங்கள் குரலை 'பதிவு' செய்யக்கூடிய உள்ளடக்கத்தில் மட்டுமே ஒலிவாங்கி பயன்படுத்தப்படும். சொற்களின் உச்சரிப்பை மேம்படுத்த இது பயன்படுகிறது",
+  "MINUTES_AGO": "{{%s}} நிமிடங்களுக்கு முன்பு",
+  "MINUTE_AGO": "{{%s}} நிமிடங்களுக்கு முன்பு",
+  "MONTHS_AGO": "{{%s}} மாதங்களுக்கு முன்பு",
+  "MONTH_AGO": "{{%s}} மாதத்திற்கு முன்பு",
   "MORE": "மேலும்",
   "MORE_CONTENT": "மேலும் புத்தகங்கள் மற்றும் உள்ளடக்கங்களை {{%s}} இல்க் கண்டறியவும் ",
+  "MORE_COUNT": "அதிகம் ({{%s}})",
   "MORE_DETAILS": "மேலும் விவரங்களுக்கு (மேலும் தகவலை வழங்கவும் அல்லது சிக்கலின் ஒரு ஸ்கிரீன்ஷாட்டை இணைக்கவும்)",
   "MOVE": "நகர்த்து ",
   "MOVE_FILES_TO_OTHER_DESTINATION": "இடத்தை விடுவிக்க, கோப்புகளை {{%s}} to க்கு நகர்த்தவும்",
   "MSG_ALREADY_IMPORTED": "முன்னரே இறக்கம் செய்யப்பட்டுள்ளது",
   "MSG_IMPORTED_SUCCESSFULLY": "வெற்றிகரமாகப் பாடம் இறக்கம் செய்யப்பட்டது",
-  "MSG_LOADING_BATCHES": "தொகுதிகள் ஏற்றப்பட்டுக்கொண்டிருக்கிறது..",
   "MSG_NO_DETAILS_TO_SHOW": "விவரம் எதுவும் இல்லை",
   "MSG_NO_NEW_NOTIFICATION": "புதிய அறிவிப்பு எதுவும் இல்லை",
   "MSG_RESOURCE_DELETED": "தங்கள் கருவியில் இருந்து   பாடம் நீக்கப் பட்டது",
+  "MULTIPLE_LICENSE": "உரிம விதிமுறைகள் {{%s}}",
   "MY_BADGES": "என் பதக்கங்கள்",
+  "MY_DETAILS": "எனது விவரங்கள்",
+  "MY_GROUPS": "எனது குழுக்கள்",
   "NAME": "பெயர்",
   "NAME_HINT": "தங்கள் பெயரை எழுதவும்",
+  "NAME_IS_REQUIRED": "நீங்கள் பயனர் பெயரை உள்ளிட வேண்டும்",
   "NEED_INTERNET_FOR_DEEPLINK_CONTENT": "நீங்கள் ஆஃப்லைனில் இருக்கிறீர்கள். உள்ளடக்கத்தை அணுக இணையத்துடன் இணைக்கவும்",
   "NEED_INTERNET_TO_CHANGE": "WiFi அல்லது mobile data வை ஆண் செய்து மீண்டும் ஒருமுறை முயற்சிக்கவும்",
   "NEW": "புதியது",
-  "NEW_NOTIFICATIONS": "புதிய அறிவிப்புகள்",
+  "NEW_NOTIFICATIONS": "{{%s}}புதிய அறிவிப்புகள்",
   "NEXT": "அடுத்து",
   "NIL": "எதுவும் இல்லை",
   "NO": "இல்லை",
+  "NOTE": "குறிப்பு",
   "NOTIFICATION": "அறிவிப்புகள்",
   "NOT_AVAILABLE": "கிடைக்கவில்லை",
   "NOT_NOW": "இப்போது இல்லை ",
   "NO_APP_FOR_INTENT": "கோப்பை திறக்க எந்த செயலியும் இல்லை",
-  "NO_ASSESSMENT": "மதிப்பீடு கிடைக்கவில்லை",
   "NO_BATCHES_AVAILABLE": "எந்தத் தொகுதிகளும் கிடைக்கவில்லை",
   "NO_BOOKS_AVAILABLE": "கல்வி வாரியம் புத்தகங்களைச் சேர்த்துக்கொண்டிருக்கிறது",
-  "NO_BOOKS_DEFINITION": "உங்கள்  கல்வி வாரியம் இன்னும் சில புத்தகங்களைச் சேர்க்கவிருக்கிறார்கள். மேலும் புத்தகங்கள் மற்றும் பாடங்களைக் காண பொத்தானை  {{%s}} தட்டவும்",
+  "NO_BOOKS_DEFINITION": "உங்கள்  கல்வி வாரியம் இன்னும் சில புத்தகங்களைச் சேர்க்கவிருக்கிறார்கள். {{%s}}வி/இல் உள்ளடக்கத்தைக் கோர, <b> மேலும் புத்தகங்கள் மற்றும் உள்ளடக்கத்தைக் காண்க </ b> பொத்தானைக் கிளிக் செய்க",
+  "NO_BOOKS_TEXT": "{{%s} இ/வில் உங்கள் பாடப்புத்தகத்தைக் கண்டுபிடிக்க முடியவில்லையா?",
   "NO_CONTENTS": " {{%s}} இல்லை",
   "NO_CONTENTS_FOUND": "உள்ளீட்டை கண்டுபிடிக்க முடியவில்லை",
   "NO_CONTENTS_MESSAGE": "மற்றொரு உள்ளடக்க வகையைத் தேர்ந்தெடுக்கவும்",
+  "NO_CONTENT_AVAILABLE_IN_MODULE": "இந்த மாடியுளில் எந்த உள்ளடக்கமும் கிடைக்கவில்லை",
+  "NO_COURSES": "பாடநெறிகள் இல்லை ",
   "NO_DATA_FOUND": "எந்தத் தரவும் இல்லை",
-  "NO_DESCRIPTION": "விளக்கம் கிடைக்கவில்லை",
   "NO_DOWNLOADS": "பதிவிறக்கங்கள் இதுவரை இல்லை ",
-  "NO_DOWNLOADS_INFO": "பயிற்சிகள் அல்லது நூலகத்திலிருந்து உள்ளடக்கத்தைப் பதிவிறக்கம் செய்யவும்",
+  "NO_DOWNLOADS_INFO": "பாடநெறிகள் அல்லது நூலகத்திலிருந்து உள்ளடக்கத்தைப் பதிவிறக்கம் செய்யவும்",
   "NO_FILTERS_SELECTED": "எந்த தெரிவும் செய்யவில்லை",
-  "NO_GROUPS_CREATED_YET": "குழுக்கள் இதுவரை உருவாக்கப்படவில்லை",
-  "NO_GROUP_MESSAGE": "குழுக்கள் பயனரை சிறந்த முறையில் ஒழுங்கமைக்க உதவுகின்றன. ஒட்டுமொத்த முன்னேற்றத்தை கண்காணிக்க குழுக்களைப் பயன்படுத்தலாம்",
   "NO_INTERNET": "இணைய வசதி இல்லை",
   "NO_INTERNET_TITLE": "முடக்கலை நிலையில் உள்ளீர்கள்",
   "NO_PREVIEW": "முன்னோட்ட  காணமுடியாது",
   "NO_QR_CODE": "என்னிடம் QR குறியீடு இல்லை",
   "NO_QR_CODE_QSTN": "QR குறியீடு இல்லையா?",
   "NO_RATING": "மதிப்பிடாதவை",
-  "NO_USERS": "பயனர்கள் இல்லை",
-  "NO_USERS_CREATED_YET": "பயனர்கள் இன்னும் உருவாக்கப்படவில்லை",
-  "NO_USERS_CREATED_YET_MSG": " தங்கள் மாணவர்கள் / பிற ஆசிரியர்கள் உள்நுழைய விருந்தினர் பயனர்  உருவாக்கலாம்.",
-  "NO_USERS_IN_THIS_GROUP": "இந்த குழுவில் பயனர்கள் இல்லை",
-  "NO_USERS_ON_THIS_DEVICE": "இந்த கருவியியில் பயனர்கள் இல்லை",
-  "NO_USERS_SUGGESTION_MESSAGE": "ஒரு குழுவில் குறைந்தது ஒரு பயனர் இருக்க வேண்டும்",
+  "NUMBER_OF_COURSES": "{{%s}} பாடநெறிகள் ",
+  "NUMBER_OF_COURSE_1": "({{%s}}) பாடநெறிகள்",
   "NUMBER_OF_VOTES": "மொத்த வாக்குகள்",
   "OFF": "நீக்கம்",
   "OFFLINE_DOWNLOAD_MESSAGE": "இணைய இணைப்பு இருந்தால் பதிவிறக்கங்கள் தானாக மீண்டும் தொடங்கும்",
@@ -379,6 +783,8 @@
   "OFFLINE_WARNING_ETBUI": "உள்ளடக்கத்தை பார்வையிட இணையத்துடன் இணைக்கவும் ",
   "OFFLINE_WARNING_ETBUI_1": "உள்ளடக்கத்தைப் பார்வையிட இணையத்துடன் இணைக்கவும்",
   "OKAY": "சரி",
+  "ONGOING": " தொடர்கிறது ",
+  "ONLY_DIGIT_NUMBER_IS_ALLOWED": "11 இலக்க எண் மட்டுமே அனுமதிக்கப்படுகிறது",
   "ONLY_DOWNLOADED_CONTENT_CAN_BE_PLAYED_OFFLINE": "பதிவிறக்கப்பட்ட உள்ளடக்கத்தை மட்டுமே ஆப்லைனில்  ப்லே  செய்ய முடியும் ",
   "OPEN": "திறந்திடுங்கள்",
   "OPEN_SETTINGS": "செட்டிங்க்ஸ்சை திறக்க",
@@ -389,15 +795,14 @@
   "ORIGINAL_CONTENT_DATA": "இந்த உள்ளடக்கம் இதனில் இருந்து பெறப்பட்டது:",
   "OTHER_ROLE_DESC_1": "டிஜிட்டல் உள்ளடக்கங்களை உலாவுக",
   "OTHER_ROLE_DESC_2": "ஆன்லைன் பயிற்சி எடுத்துக் கொள்ளுங்கள்",
-  "OTHER_USERS": "மற்ற பயனர்கள்",
   "OTP_FAILED": "OTP ஐ சரிபார்க்க முடியவில்லை. பின்னர் மீண்டும் முயற்சிக்கவும்",
   "OTP_PLACEHOLDER": "OTP ஐ உள்ளிடவும்",
   "OTP_RESENT": "OTP மறுமுறை அனுப்பப்பட்டுள்ளது ",
   "OVERLAY_INFO_TEXT_COMMON": "எல்லா அம்சங்களையும் பயன்ப்படுத்த உள் நுழையவும்",
-  "OVERLAY_INFO_TEXT_TAKE_COURSE": "பயிர்றிகள் பதிவு செய்த பயனர்களுக்கு மட்டும். பயிற்சி எடுத்துக்கொள்ள உள்நுழைக.",
+  "OVERLAY_INFO_TEXT_TAKE_COURSE": "பாடநெறிகள் பதிவு செய்த பயனர்கள் மட்டுமே எடுத்துக்கொள்ள முடியும். பாடநெறியை  எடுத்துக்கொள்ள உள்நுழைக.",
   "OVERLAY_LABEL_COMMON": "{{%s}} எல்லையற்ற அணுக்கம் பெற்றிடுக",
   "OVERLAY_LABEL_HOME": "உங்கள் தனிப்பட்ட முகப்பு தாவல்",
-  "OVERLAY_LABEL_TAKE_COURSE": "இந்த பயிற்சியை எடுத்துக்கொள்வதற்கு உள்நுழைக",
+  "OVERLAY_LABEL_TAKE_COURSE": "இந்த பாடநெறியை எடுத்துக்கொள்வதற்கு உள்நுழைக",
   "OVERLAY_SIGN_IN": "உள்நுழைக",
   "OVER_WIFI": "வைஃபை மீது",
   "PEOPLE_WHO_FOLLOW_YOU": "உங்களை பின்பற்றும் நபர்கள்",
@@ -412,41 +817,49 @@
   "PHONE_EDIT_SUCCESS": "தொலைபேசி எண் வெற்றிகரமாக புதுப்பிக்கப்பட்டது ",
   "PHONE_PLACEHOLDER": "அலைபேசி எண்",
   "PHONE_UPDATE_SUCCESS": "அலைபேசி எண் வெற்றிகரமாகப் புதுப்பிக்கப்பட்டது",
+  "PLANNED_MAINTENANCE_TEXT": "நாங்கள் தற்போது பராமரிப்புக்காக தற்காலிகமாக சேவையை நிறுத்தி உள்ளோம் . ஆனால் கவலைப்பட வேண்டாம், நாங்கள் மீண்டும்  வருவோம்",
+  "PLANNED_MAINTENANCE_TEXT_WITH_TIME": "நாங்கள் தற்போது பராமரிப்புக்காக தற்காலிகமாக சேவையை நிறுத்தி உள்ளோம் . ஆனால் கவலைப்பட வேண்டாம், நாங்கள் மீண்டும்  வருவோம்",
   "PLAY": "பிளே",
   "PLAY_AS": "இவராக விளையாடு",
   "PLAY_FROM_DEVICE": "கருவியில் இருந்து பாடம் பார்",
   "PLAY_ONLINE": "நிகழ்நிலையில் பாடம் பார்",
   "PLEASE_DOWNLOAD_TO_PLAY": "ப்லே செய்ய உள்ளடக்கத்தை  பதிவிறக்கவும் ",
+  "PLEASE_ENTER": "உள்ளிடுக {{%s}}",
+  "PLEASE_PROVIDE_FOLLOWING_DETAILS": "பின்வரும் விவரங்களை வழங்கவும்",
   "PLEASE_SELECT": "தேர்ந்தெடுங்கள் {{%s}}",
   "PLEASE_SELECT_A_LANGUAGE": "தயவுசெய்து ஒரு மொழியைத் தேர்ந்தெடுக்கவும்",
-  "PLEASE_SELECT_USER": "ஒரு பயனரைத் தேர்ந்தெடுக்கவும்",
+  "PLEASE_VALIDATE_YOUR_EMAIL_ADDRESS": "உங்கள் மின்னஞ்சல் முகவரியை சரிபார்க்கவும்",
+  "PLEASE_VALIDATE_YOUR_MOBILE_NUMBER": "உங்கள் கைப் பேசி எண்ணை சரிபார்க்கவும்",
   "POPULAR_COURSES": "புகழ்பெற்றப் பாடநெறிகள்",
+  "POWER_OF_GROUPS": "குழுக்களின் திறனை நீங்கள் இன்னும் ஆராய்ந்தீர்களா?",
+  "PREFERENCES_CAN_BE_UPDATED": "சுயவிவர தளத்தில் இருந்து உங்கள் விருப்பங்களை புதுபிக்க முடியும்",
   "PREVIEWS": "முன்னோட்டங்கள்",
   "PREVIOUS_USER_SETTINGS": "முன் உருவாக்கிய பயனரின் அமைப்புகளைப் பயணப்படுத்த விரும்புகிறீர்களா?",
   "PRINT": "அச்சிடுக",
-  "PRIVATE": "தனிப்பட்டவை",
+  "PRIVACY_POLICY": "தனியுரிமைக் கொள்கை",
   "PROFILE_BNAV": "சுயவிவரம்",
   "PROFILE_DETAILS_TITLE": "சுயவிவரங்கள்",
   "PROFILE_UPDATE_FAILED": "சுயவிவரத்தை புதுப்பிப்பது தோல்வியடைந்தது, மீண்டும்  முயற்சிக்கவும்.",
   "PROFILE_UPDATE_SUCCESS": "சுயவிவரம் வெற்றிகரமாக புதுபிக்கப்பட்டது",
+  "PROGRAMS_DESC": "உங்கள் இருப்பிடத்திற்கான மற்றும் உங்கள் பங்கிற்காக வடிவமைக்கப்பட்டுள்ள  கல்வித் திட்டங்களைக் காணலாம் மற்றும் பங்கேற்கலாம்",
+  "PROGRESS_CANNOT_BE_TRACKED": " {{collectionType}}க்கு முன்னேற்றத்தைக் கண்காணிக்க முடியாது\n",
   "PROVIDE_BELOW_INFO": "கீழ்க்கண்ட தகவல்களை அளிக்கவும்.",
   "PUBLIC": "பொது",
   "PUBLISHED_BY": " {{%s}} வில்  இவரால் வெளியிடப்பட்டது ",
   "PUBLISHED_DATE": "வெளியிடப்பட்ட தேதி",
+  "PUBLISHER": "வெளியீட்டாளர்",
   "QR_CODE_DETAILS": "பாடப்புத்தகத்தில் உள்ள QR குறியீட்டினை ஸ்கேன் செய்வதின் மூலம் digital ஆக்கம் செய்யப்பட்ட பாடப்பொருள் விரைவாக கிடைக்கும்.",
   "QR_SHOWING_MULTIPLE_BOOK_RESULT": "{{%s}} க்கான முடிவுகளைக் காட்டுகிறது",
-  "QUESTION": "கேள்வி",
-  "QUESTIONS": "கேள்விகள்",
-  "QUESTION_MARKS": "கேள்வி (மதிப்பெண்)",
+  "QUES_BANKS": "கேள்வி வங்கிகள்",
   "QUIZ": "வினாடி வினா",
-  "QUIZ_CONTENTS_ONLY_REGISTERED_USERS": "வினாடி வினா பதிவு செய்யப்பட்ட பயனர்களுக்கு மட்டுமே",
+  "QUIZ_CONTENTS_ONLY_REGISTERED_USERS": "வினாடி வினா பதிவு செய்யப்பட்ட பயனர்களுக்கு மட்டுமே எடுத்துக்கொள்ள முடியும்",
   "RATE": "மதீப்பீடு ",
   "RATED_STARS": "நீங்கள் {{%s}} நட்சத்திர மதிப்பீட்டை வழங்கினீர்கள்",
   "RATE_THE_CONTENT": "உள்ளடக்கத்தை மதிப்பிடுக ",
   "RATING_QUESTION": "எங்களுக்கு மேலும் சொல்ல விரும்புகிறீர்களா?",
   "READ_LESS": "குறைவாகப் படிக்க",
   "READ_MORE": "அதிகம் படிக்க",
-  "RECENTLY_VIEWED": "சமீபத்தில் பார்த்தவை",
+  "RECOMMENDATION_BASED_ON_PROFILE": "உங்கள் சுயவிவர விவரங்களின் அடிப்படையில் பரிந்துரைகள்",
   "RECOMMENDED": "பரிந்துரைக்கப்படுகிறது",
   "RECOVERY_ACCOUNT_UPDATE_SUCCESS": "மீட்பு கணக்கு வெற்றிகரமாக புதுப்பிக்கப்பட்டது",
   "RECOVERY_ID_DESCRIPTION": "உங்கள் கணக்கிலிருந்து வெளியேறிவிட்டால் அணுகலை மீண்டும் பெற மீட்டெடுப்பு கணக்கு உங்களுக்கு உதவும். உங்கள் மீட்டெடுப்பு கணக்கு வகையைத் தேர்ந்தெடுத்து விவரங்களை உள்ளிடவும்:",
@@ -454,15 +867,23 @@
   "REDO_ASSESSMENT": "மதிப்பீட்டை மீண்டும் செய்",
   "REGISTER_TO_COMPLETE_ACCESS": "உள்ளடக்கத்தை முழுமையாக அணுக பதிவுசெய்க",
   "REMOVE": "அகற்று",
+  "REMOVE_ACTIVITY": "அகற்று",
+  "REMOVE_ACTIVITY_ERROR_MSG": "செயல்பாட்டை அகற்ற முடியவில்லை. பின்னர் மீண்டும் முயற்சிக்கவும்",
+  "REMOVE_ACTIVITY_GROUP_DESC": "மொழிபெயர்க்கப்படாதது\nசெயல்பாட்டை நீக்குவது குழு செயல்பாட்டிலிருந்து விலகிச் செல்கிறது, மேலும் உறுப்பினரின் முன்னேற்றத்தை நீங்கள் இனி சரிபார்க்க முடியாது",
+  "REMOVE_ACTIVITY_POPUP_TITLE": "செயல்பாட்டை அகற்றுவதா?",
+  "REMOVE_ACTIVITY_SUCCESS_MSG": "குழுவிற்கான செயல்பாடு வெற்றிகரமாக அகற்றப்பட்டது",
   "REMOVE_FROM_DEVICE": "கருவியில் இருந்து பாடத்தை  நீக்கு",
   "REMOVE_FROM_DEVICE_MSG": "கருவியில் இருந்து பாடத்தை அகற்ற விரும்புகிறீர்களா?",
-  "REMOVE_MULTIPLE_USERS_FROM_GROUP": "{{%s}} பயனர்கள் அகற்றப்படுவதை உறுதிப்படுத்துக",
-  "REMOVE_USERS": "பயனர்களை அகற்று",
-  "REMOVE_USERS_FROM_GROUP": "{{%s}} குழுவிலிருந்து பயனர்களை அகற்றவும்",
-  "REPORTS": "அறிக்கைகள்",
+  "REMOVE_MEMBER": "உறுப்பினரை அகற்று",
+  "REMOVE_MEMBER_ERROR_MSG": "குழுவிலிருந்து உறுப்பினரை நீக்க முடியவில்லை. பின்னர் மீண்டும் முயற்சிக்கவும்",
+  "REMOVE_MEMBER_GROUP_DESC": "{{member_name}} ஐ நீக்குவது அவரை  நிரந்தரமாக குழுவிலிருந்து நீக்கிவிடும் ",
+  "REMOVE_MEMBER_POPUP_TITLE": "உறுப்பினரை நீக்குவதா?",
+  "REMOVE_MEMBER_SUCCESS_MSG": "{{member_name}} அவர்கள் இனி குழுவின் பகுதியாக இல்லை",
+  "REQUEST_CONTENT": "இங்கே எங்களுக்குத் தெரியப்படுத்துங்கள்",
   "RESEND_OTP": "OTP ஐ மீண்டும் அனுப்பு",
+  "RESET": "மீட்டமை",
   "RESOURCE_TYPE": "கல்வி வளம் வகை",
-  "RESULT": "முடிவு",
+  "RESPONSE_ACKNOWLEGED": "உங்கள் பதிலுக்கு நன்றி!",
   "RESULTS": "முடிவுகள்",
   "RESUME": "விட்ட இடத்தில் இருந்து தொடருக",
   "RETRY": "மீண்டும் முயற்சி செய்யுங்கள்",
@@ -470,40 +891,50 @@
   "ROLE_SELECTOR_QUERY": "தாங்கள்",
   "SAVE": "சேமி",
   "SAVED_ON": "சேமித்தவை",
-  "SAVED_RESOURCES": "சேமித்த பாடங்கள்",
   "SAVE_FILE_ON_DEVICE": "கருவியில் கோப்பை சேமிக்கவும்",
   "SCAN_QR_CODE": "QR குறியீட்டை ஸ்கேன் செய்க.",
   "SCAN_QR_INSTRUCTION": "தங்கள் கைபேசியில் உள்ள ஒளிப்படக் கருவி மூலம் QR  குறியீட்டை ஸ்கேன் செய்யவும்",
   "SCAN_TAP": "ஸ்கேன் QR குறியீடு",
-  "SCORE": "மதிப்பெண்",
-  "SCORED": "மதிப்பெண்",
+  "SCHOOL_OR_ORG_NAME": "பள்ளி / அமைப்பின் பெயர்",
+  "SCHOOL_UDISE_ID_OR_ORG_ID": "பள்ளி UDISE ஐடி  /அமைப்பின் ஐடி ",
   "SD_CARD": "SD கார்டு ",
+  "SEARCH_FOR_GROUP_MEMBER": "குழு உறுப்பினரைத் தேடுங்கள்",
   "SEARCH_HINT": "தேடு",
   "SEARCH_PLACEHOLDER": "பாடத்தைத் தேடு (உ-ம்: 'Story')",
   "SEARCH_TO_FIND_CONTENT": "உள்ளடக்கத்தைக் கண்டுபிடிக்க {{%s}}  இல் தேடுங்கள்",
+  "SECONDS_AGO": "{{%s}} வினாடிகள் முன் ",
+  "SECOND_AGO": "{{%s}} வினாடிகள் முன் ",
   "SEE_ALL_RESULTS_FOR": "எல்லா முடிவுகளையும் காண்க \"{{%s}}\"",
+  "SEE_MORE_BOOKS": "மேலும் புத்தங்கள் மற்றும் பாடங்கள் காண",
+  "SEE_MORE_CONTENT": "மேலும்  பாடங்கள் காண",
   "SELECT": "தேர்வு செய்யுங்கள்",
   "SELECTED_TOPICS": "தேர்வு செய்யப்பட்ட தலைப்புகள்",
+  "SELECT_ACTIVITY": "செயல்பாட்டைத் தேர்ந்தெடுக்கவும்",
   "SELECT_ALL": "அனைத்தையும் தெரிவுசெய்",
   "SELECT_CHAPTER": "அத்தியாயத்தைத் தேர்ந்தெடுக்கவும்",
   "SELECT_YOUR_STATE": "உங்கள் மாநிலத்தைத் தேர்ந்தெடுக்கவும்",
+  "SELF_DECLARED_INFO": "சுய அறிவிக்கப்பட்ட தகவல்",
+  "SELF_DECLARE_TEACHER_TNC": "இந்த விவரங்களை {{%appName}} நிர்வாகிகளுடன் பகிர்ந்து கொள்ள ஒப்புக்கொள்கிறேன்",
   "SEND_FILE": "கோப்பை அனுப்பவும்",
   "SERVER_CONNECTION_ERROR": "சேவையகத்துடன் தொடர்புகொள்ள முடியவில்லை",
   "SETTINGS": "அமைப்புகள்",
   "SHARE": "பகிர்",
   "SHARE_APP": "செயலியைப் பகிர",
+  "SHARE_APP_LINK": " {{app_name}}லிருந்து செயலியைப் பெறுக: {{play_store_url}}",
   "SHARE_CONTENT_FAILED": "உள்ளடக்கத்தை பகிர முடியவில்லை",
+  "SHARE_CONTENT_FILE": "{{app_name}} வில் இருந்துகோப்பை பெறப்பட்டது.\nபெயர்: {{content_name}}\n{{app_name}} செயலியை {{play_store_url}} மூலம் பெருக",
+  "SHARE_CONTENT_LINK": "{{content_name}}யை {{app_name}}வின் {{content_link}} மூலம் காணுங்கள்\n{{app_name}} செயலியை {{play_store_url}} இருந்து பெறவும்",
   "SHARE_LINK": "இணைப்பை (link)  பகிரவும்",
   "SHARE_TELEMETRY": "டெலிமெட்ரியைப் பகிர",
   "SHARE_TELEMETRY_FAILED": "டெலிமெட்ரியைப் பகிர முடியவில்லை",
+  "SHARE_TELEMETRY_NO_DATA_FOUND": "டெலிமெட்ரி தரவு எதுவும் கிடைக்கவில்லை",
   "SHARE_THIS": "பகிருங்கள்",
+  "SHARE_USERNAME": "வணக்கம்! நீங்கள் ‪{{user_name}}‬ அவர்களின் ‪{{app_name}}‬ ஐடி: ‪{{diksha_id}}‬ பெற்றுள்ளீர்கள்",
   "SHOW": "காட்டு",
   "SHOWING_ITEMS": "{{%s}} உருப்படிகளைக் காட்டுகிறது",
   "SHOWING_RESULTS_FOR": "'{{%query}}' க்கு {{%count}} முடிவுகளை காட்டுகிறது ",
   "SHOW_LESS": "குறைபாக காட்டவும்",
   "SHOW_MORE": "இன்னும் நிறைய காட்டவும்",
-  "SHOW_RECENT": "சமீபத்திய தகவல்களை காட்டுக",
-  "SIGNED_OUT_ACCOUNT_MESSAGE": "நீங்கள் தற்போது உள்நுழைந்த பயனர் உபயோகத்தில்  இருந்து வெளியேறிவிடுவீர்கள்",
   "SIGNIN_TO_USE_FEATURE": "இந்த அம்சத்தைப் பயன்படுத்த உள்நுழைக",
   "SIGN_IN": "உள்நுழைக",
   "SIZE": "அளவு: {{%s}}",
@@ -513,10 +944,13 @@
   "SPACE_AVAILABLE_ON_SDCARD": "SD கார்டில் உள்ள வெற்றிடம் ",
   "SPACE_TAKEN": "எடுக்கப்பட்ட இடம் {{%s}}",
   "SPACE_TAKEN_BY_APP": "உள்ளடக்கத்தால் எடுக்கப்பட்ட இடம்",
+  "SPECIAL_CHARACTERS_NOT_SUPPORTED": "சிறப்பு எழுத்துக்களை உள்ளிட இந்த புலம் உங்களை அனுமதிக்காது",
   "START": "தொடங்கு",
+  "START_AGAIN": "மீண்டும் தொடங்கு ",
   "START_ASSESSMENT": "மதிப்பீட்டைத் தொடங்குங்கள்",
   "START_COURSE": "ஆரம்பம்",
   "START_COURSE_NOW": "இப்போது துவக்கு",
+  "START_LEARNING": "கற்கத் தொடங்குங்கள்",
   "STAR_RATINGS": "நச்சத்திர நதிப்பேன்",
   "STATE": "மாநிலம் ",
   "STATE_OPTION_TEXT": "மாநிலத்தை தேர்வுசெய்",
@@ -528,34 +962,103 @@
   "SUBJECT": "பாடம்",
   "SUBJECTS": "பாடங்கள்",
   "SUBJECT_OPTION_TEXT": "தலைப்பைத் தேர்வுசெய்க",
+  "SUBMIT_MY_DETAILS": "விவரங்களைச் சமர்ப்பிக்கவும்",
+  "SUCCESSFULLY_ADDED_USER": "வெற்றிகரமாக \"{{%s}}\" இணைக்கப்பட்டார்",
+  "SUCCESSFULLY_SWITCHED_USER": "வணக்கம் {{%user}}",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_PHONE": "அனைத்து உள்ளடக்கமும் தொலைபேசிக்கு மாற்றப்படும்",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_SDCARD": "அனைத்து உள்ளடக்கங்களும்   SD கார்ட்க்கு மாற்றப்படும்",
   "SUPPORT": "உதவி",
   "SUPPORT_MESSAGE": "ஏதாவது சிக்கலை எதிர்கொள்கிறீர்களா? எங்களுக்கு செய்தி அனுப்பவும்",
-  "SWITCHING_TO": " '{{%s}}' மாற்றப்பட்டது",
-  "SWITCH_ACCOUNT": "பயனரை மாற்றவும்",
-  "SWITCH_ACCOUNT_CONFIRMATION": "பயனரை மாற்றவும்?",
+  "SWITCH_TO_CLASSIC_THEME": "கிளாசிக் தீம்க்கு மாறவும்",
+  "SWITCH_TO_JOYFUL_THEME": "மகிழ்ச்சியான  தீமுக்கு மாறவும்",
+  "SWITCH_USER": " பயனரை மாற்று ",
   "SYLLABUS": "கலைத் திட்டம் ",
   "SYNCING_NOW": "சின்க் ஆகிக்கொண்டிருக்கிறது",
   "SYNC_NOW": "இப்பொழுது ஒத்திசைவு செய்க",
-  "TAKE_ASSESSMENT": "ஒரு பயனர் குறைந்தது ஒரு மதிப்பீட்டை கொடுக்க வேண்டும்",
   "TAP_SCAN": "QR குறியீட்டை ஸ்கேன் செய்ய தட்டவும்",
+  "TBK_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "தொடங்க ஒரு பாடப்புத்தகத்தைத் தேர்வுசெய்க",
+  "TBK_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "பாட புத்தகங்கள்",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "பாடப்புத்தகங்கள்",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "பாடப்புத்தகங்கள்",
+  "TBK_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}-ன் நூலகத்தில் {{%explainVideos}}, {{%quesBanks}} மற்றும் பிற {{%interactiveMaterial}} கள் உள்ளன. நூலகத்தை ஆராயத் தொடங்க ஏதேனும் ஒரு பாடப்புத்தகத்தைச் சொடுக்குங்கள்!",
+  "TBK_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}})க்கான புத்தகங்கள் எதுவும் கிடைக்கவில்லை",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "வாரியம் புத்தகங்களைச் சேர்க்கிறது",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "பொருள் பாடப்புத்தகத்தை {{%s}} இல் கண்டுபிடிக்க முடியவில்லை?",
+  "TBK_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span> குறிப்பு: </ span> பாடப்புத்தகங்களுக்கான முன்னேற்றத்தைக் கண்காணிக்க முடியாது",
+  "TBK_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "நீங்கள் கோரிய புத்தகங்களை {{%s}}  இல் உங்கள் மாநில வாரியம் பதிவேற்றும்போது நாங்கள் உங்களுக்கு அறிவிப்போம்.",
+  "TBK_NONTRK_QR_CODE_DETAILS": "உங்கள் பாடப்புத்தகத்திலிருந்து QR குறியீட்டை ஸ்கேன் செய்வதன் மூலம் டிஜிட்டல் உள்ளடக்கத்திற்கு உடனடி அணுகலைப் பெறுங்கள்",
+  "TBK_NONTRK_SEE_MORE_BOOKS": "மேலும் புத்தகங்களையும் உள்ளடக்கத்தையும் காண்க",
+  "TBK_NONTRK_STUDENT_ROLE_DESC_1": "பாடப்புத்தகங்கள் மற்றும் டிஜிட்டல் உள்ளடக்கத்தை உலாவுக",
+  "TBK_NONTRK_TEACHER_ROLE_DESC_1": "பாடப்புத்தகங்கள் மற்றும் டிஜிட்டல் உள்ளடக்கத்தை உலாவுக",
+  "TBK_NONTRK_TUTORIAL_HEADING": "காணொளிகள், ஊடாடும் உள்ளடக்கம், E-பாடபுத்தகங்கள் மற்றும் பல ...",
+  "TBK_TRK_BATCHEND_MAIN_HEADING": "நீங்கள் {% s} இல் நிறைவடைந்த ஒரு பாடப்புத்தகத்தின்  வாசிப்பின் தொகுப்பில் சேர்ந்துள்ளீர்கள்",
+  "TBK_TRK_BATCHEND_SUB_HEADING": "நீங்கள் தொடர்ந்து கற்றுக் கொள்ளலாம், ஆனால் உங்கள் முன்னேற்றம் புதுப்பிக்கப்படாது",
+  "TBK_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "இந்த அத்தியாயத்தை முடித்துவிட்டீர்கள்",
+  "TBK_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "பாடபுத்தக்தை  {{%s}}க்குள் முடிக்கவும்",
+  "TBK_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "இந்த பாடப்புத்தகம் செயலற்றது",
+  "TBK_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "பாட புத்தகங்கள்",
+  "TBK_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "இந்த பாடப்புத்தகத்தை நீங்கள் படித்திருக்கிறீர்கள்",
+  "TBK_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "பாடப்புத்தகத்திற்கான தொகுப்புகள்",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "பணிகள்",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "எனது பாடப்புத்தகங்கள் ",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "தொகுதி முடிந்தது",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "கடைசியாக புதுப்பிக்கப்பட்ட நாள்{{last_updated_on_date}}",
+  "TBK_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "சேர்",
+  "TBK_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "சமீபத்திய பாடப்புத்தகங்கள்",
+  "TBK_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "பணியை விட்டு விடலாமா?",
+  "TBK_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "சேர உள்நுழைக",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_COURSES": "பாடப்புத்தகங்கள் இல்லை",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "உள்ளடக்கத்தைப் பதிவிறக்குக",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "பாட புத்தகங்கள் ({{%s}}) ",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "பாடபுத்தகம் ({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "ஆன்லைன் கற்றலை எடுத்துக் கொள்ளுங்கள்",
+  "TBK_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "பிரபலமான பாடப்புத்தகங்கள்",
+  "TBK_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ஆன்லைன் கற்றலை எடுத்துக் கொள்ளுங்கள்",
+  "TBK_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "சான்றிதழைப் பெறுவதற்கு {{%s}}க்குள்  பணியை முடிக்கவும்",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING": "கற்றல் பணி",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "கலந்து கொண்ட கற்றல் பணி (கள்) ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "பாடப்புத்தக விவரங்கள் ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "பணி முடிகிறது",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "பணி இறுதி தேதி",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "பணி விவரங்கள் ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "இந்த பணி இதற்கு பொருத்தமானது:",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "அத்தியாயம்",
+  "TBK_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "பாடப்புத்தக  செயல்பாட்டை நிறுத்துங்கள்",
+  "TBK_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "பாடப்புத்தக செயல்பாடுகளை பார்க்க வேண்டுமா?",
+  "TBK_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "{{batch_start_date}}தில் இருந்துத் பாடபுத்தகத்தின் தொகுதி ஆரம்பமாகும்",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "சான்றிதழ் குறித்த உங்கள் பதிவு செய்யப்பட்ட தொடர்பு விவரங்களில் 7 நாட்களுக்குள் உங்களுக்கு அறிவிக்கப்படும்",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "குறிப்பு: இந்த பாடப்புத்தகத்தில் சான்றிதழ் இல்லை",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "இந்த பாடப்புத்தகத்தை நீங்கள் படித்திருக்கிறீர்கள்",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "தற்போது, ​​இந்த பணிக்கு சான்றிதழ் இல்லை. உருவாக்கியவர் பின்னர் ஒரு சான்றிதழை இணைக்கலாம்.",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "பாடப்புத்தகத்தைப் படிப்பதை நிறுத்திவிட்டீர்கள்",
+  "TBK_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "இந்த பாடப்புத்தக பணிக்கு தொகுதிகள் எதுவும் இல்லை",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "பாடப்புத்தகம் பதிவுசெய்த பயனர்களுக்கானது. பாடப்புத்தகத்தை அணுக உள்நுழைக",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "இந்த பாடப்புத்தகத்தைப் படிக்க உள்நுழைக",
+  "TBK_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "இந்த பணிக்கு தொகுதிகள் எதுவும் கிடைக்கவில்லை",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "பதிவுசெய்த பயனர்கள் மட்டுமே கற்றல் பணிகளை மேற்கொள்ள முடியும்",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "இந்த பணியை வெற்றிகரமாக முடித்துவிட்டீர்கள்",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "பணி முடிந்தது. நீங்கள் மதிப்பீட்டை மீண்டும் செய்யலாம், ஆனால், உங்கள் முன்னேற்றம் பதிவு செய்யப்படாது.",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "பணி முடிந்தது. நீங்கள் மதிப்பீட்டை எடுக்கலாம், ஆனால், உங்கள் முன்னேற்றம் பதிவு செய்யப்படாது.",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "பாடபுத்தக விவரங்களைக் காணவும் அணுகவும் நீங்கள் செயலில் உள்ள குழுவில் சேர வேண்டும்",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "பாடப்புத்தக விவரங்களை அணுக நீங்கள் உள்நுழைய வேண்டும்",
   "TEACHER_ID_ENTER_LABEL": "சரிபார்ப்புக்கு உங்கள் ஆசிரியர் ஐடியை உள்ளிடவும்",
   "TEACHER_ID_PLACEHOLDER": "உதாரணத்திற்கு, ER12345 ",
   "TEACHER_ID_VERIFICATION": "ஆசிரியர் ஐடி சரிபார்ப்பு",
   "TEACHER_PROFILE_FAILED": "உள்ளிட்ட ஆசிரியர் ஐடி தவறானது என்பதால் உங்கள் சுயவிவரத்தை சரிபார்க்க முடியவில்லை",
   "TEACHER_PROFILE_VERIFIED": "ஆசிரியர் சுயவிவரம் வெற்றிகரமாக சரிபார்க்கப்பட்டது",
   "TEACHER_ROLE_DESC_1": "பாடப்புத்தகங்கள் மற்றும் டிஜிட்டல் உள்ளடக்கங்களை உலாவுக",
-  "TEACHER_ROLE_DESC_2": "ஆன்லைன் பயிற்சி எடுத்துக் கொள்ளுங்கள்",
+  "TEACHER_ROLE_DESC_2": "ஆன்லைன் பாடநெறிகளை எடுத்துக் கொள்ளுங்கள்",
   "TEACHER_ROLE_DESC_3": "பாடம் திட்டங்களை உங்கள் பார்வைக்கு",
   "TELL_US_MORE": "மேலும் சொல்லுங்கள்...",
   "TERMS_OF_USE": "பயன்பாட்டு விதிமுறைகளை",
   "TEXTBOOK": "பாடப்புத்தகங்கள்",
+  "TEXTBOOKS": "பாடப்புத்தகங்கள் ",
+  "THANKING_NOTE": "உங்கள் கோரப்பட்ட புத்தகங்களை {{%s}} இ/வில் உங்கள் மாநில வாரியம் பதிவேற்றியவுடன் நாங்கள் உங்களுக்கு அறிவிப்போம்.",
   "THANK_FOR_RATING": "உள்ளீட்டை மதிப்பிட்டதுக்கு நன்றி",
-  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "இந்த பயிற்சிக்கு எந்த தொகுதிகள் எதுவும் கிடைக்கவில்லை",
+  "THANK_YOU_FOR_SUBMITTING_YOUR_DETAILS": "உங்கள் விவரங்களை சமர்ப்பித்ததற்கு நன்றி",
+  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "இந்த பாடநெறிக்கு எந்த தொகுதிகள் எதுவும் கிடைக்கவில்லை",
   "THIS_IS_A_RESTRICTED_COMMUNITY": "இது ஒரு வரையறைப்படுத்திய சமூகம்",
   "TICKET_SUMMARY": "டிக்கெட் சுருக்கம்",
-  "TIME": "நேரம்",
   "TIME_OUT": "சேவையக நேரம் முடிந்தது, பிறகு மீண்டும் முயற்சிக்கவும்",
   "TITLE": "தலைப்பு",
   "TITLE_UPGRADE_POPUP": "பாடங்களில் உள்ள படங்கள் மற்றும் ஒலிகளிலிருந்த பிரச்சினையை நாங்கள் சரிசெய்துள்ளோம். சிறந்த அனுபவத்திற்காக DIKSHA செயலியைப் புதுக்கம் (Update) செய்து பயன்படுத்துமாறு பரிந்துரைக்கிறோம்.",
@@ -564,21 +1067,20 @@
   "TOPICS": "தலைப்பு ",
   "TOPIC_YOU_MIGHT_LIKE": "தங்களுக்குப் பிடித்தமான தலைப்புகளை முழுதும்தேடு",
   "TOTAL_SIZE": "மொத்த அளவு",
-  "TOTAL_TIME": "மொத்த நேரம்",
   "TO_DO": "செய்ய வேண்டியவை",
-  "TO_EARN_CERTIFICATE": "சான்றிதழைப் பெற {{%s}} மூலம் பயிற்சி முடிக்கவும்",
-  "TRAINING": "பயிற்சி",
-  "TRAININGS_ATTENDED": "பங்கேற்க பயிற்சிகள்",
-  "TRAININGS_ONLY_REGISTERED_USERS": "பயிற்சிகளைப் பதிவுசெய்யப்பட்ட பயனர்களுக்கு மட்டுமே எடுத்துக்கொள்ளமுடியும்",
-  "TRAINING_COMPLETED_SUCCESSFULLY": "இந்த பயிற்சியை வெற்றிகரமாக முடித்துவிட்டீர்கள்",
-  "TRAINING_DETAILS": "பயிற்சி விவரங்கள்",
-  "TRAINING_ENDED_REDO_ASSESSMENT": "பயிற்சி முடிந்தது. நீங்கள் மதிப்பீட்டை மீண்டும் செய்யலாம், ஆனால், உங்கள் முன்னேற்றம் பதிவு செய்யப்படாது.",
-  "TRAINING_ENDED_START_ASSESSMENT": "பயிற்சி முடிந்தது. நீங்கள் மதிப்பீட்டை எடுக்கலாம், ஆனால், உங்கள் முன்னேற்றம் பதிவு செய்யப்படாது.",
-  "TRAINING_ENDS_ON": "பயிற்சி அன்று முடிகிறது",
-  "TRAINING_END_DATE": "பயிற்சி முடிவு தேதி",
-  "TRAINING_INFO": "பயிற்சி தகவல்",
-  "TRAINING_IS_RELEVANT_TO_TEACHERS": "ஆசிரியர்களுக்குப் பொருத்தமானப் பயிற்சி",
-  "TRAINING_MODULES": "பயிற்சி மாடியுள்கள்",
+  "TO_EARN_CERTIFICATE": "சான்றிதழைப் பெற {{%s}} க்குள் பாடநெறியை முடிக்கவும்",
+  "TRAINING": "பாடநெறி",
+  "TRAININGS_ATTENDED": "பங்கேற்க பாடநெறிகள்",
+  "TRAININGS_ONLY_REGISTERED_USERS": "பாடநெறிகளைப் பதிவுசெய்யப்பட்ட பயனர்களுக்கு மட்டுமே எடுத்துக்கொள்ளமுடியும்",
+  "TRAINING_COMPLETED_SUCCESSFULLY": "இந்த பாடநெறியை வெற்றிகரமாக முடித்துவிட்டீர்கள்",
+  "TRAINING_DETAILS": "பாடநெறியின்  விவரங்கள்",
+  "TRAINING_ENDED_REDO_ASSESSMENT": "பாடநெறி எடுத்துக்கொள தொகுதிகள் முடிந்தது. நீங்கள் மதிப்பீட்டை மீண்டும் செய்யலாம், ஆனால், உங்கள் முன்னேற்றம் பதிவு செய்யப்படாது.",
+  "TRAINING_ENDED_START_ASSESSMENT": "பாடநெறி எடுத்துக்கொள தொகுதிகள் முடிந்தது. நீங்கள் மதிப்பீட்டை எடுக்கலாம், ஆனால், உங்கள் முன்னேற்றம் பதிவு செய்யப்படாது.",
+  "TRAINING_ENDS_ON": "பாடநெறி அன்று முடிகிறது",
+  "TRAINING_END_DATE": "பாடநெறி முடிவு தேதி",
+  "TRAINING_INFO": "பாடநெறியின் விவரங்கள் ",
+  "TRAINING_IS_RELEVANT_TO_TEACHERS": "கீழ்க்கண்ட ஆசிரியர்களுக்குப் பொருத்தமானப் பாடநெறி:",
+  "TRAINING_MODULES": "பாடநெறி மாடியுள்கள்",
   "TRANSFERRING_CONTENT_TO_PHONE": "உள்ளடக்கத்தை தொலைபேசிக்கு  மாற்றுகிறது",
   "TRANSFERRING_CONTENT_TO_SDCARD": "உள்ளடக்கம் SD கார்ட்க்கு மாற்றப்படுகிறது",
   "TRANSFERRING_FILES": "கோப்புகள் மாற்றப்படுகிறது",
@@ -588,31 +1090,82 @@
   "TRY_AGAIN": "மறுமுறை முயற்சிக்கவும்",
   "TRY_BEFORE_RATING": "மதிப்பீடு செய்வதற்கு முன் பாடத்தை ஒருமுறை முயற்சிக்கவும்.",
   "TRY_DIFF_QR": "வேறொரு QR  குறியீட்டை  முயற்சியுங்கள்?",
+  "TUTORIAL_BUTTON": "தொடங்க ஒரு பாடப்புத்தகத்தைத் தேர்வுசெய்க",
+  "TUTORIAL_HEADING": "காணொளிகள், ஊடாடும் உள்ளடக்கம், E-பாடபுத்தகங்கள் மற்றும் பல ...",
+  "TVC_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "தொடங்க டிவி  வகுப்பைத் தேர்வுசெய்க",
+  "TVC_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "டிவி  வகுப்புகள் ",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "தொலைக்காட்சி வகுப்புகள்",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "தொலைக்காட்சி வகுப்புகள் ",
+  "TVC_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}-ன் நூலகத்தில் {{%explainVideos}}, {{%quesBanks}} மற்றும் பிற {{%interactiveMaterial}} கள் உள்ளன. நூலகத்தை ஆராயத் தொடங்க டிவி வகுப்புகள் பொத்தானை  சொடுக்குங்கள்!",
+  "TVC_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}})க்கு டிவி வகுப்புகள் எதுவும் காணப்படவில்லை",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "வாரியம் டிவி வகுப்புகளைச் சேர்க்கிறது",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": " {{%s}}-இல் ல் டிவி வகுப்புகளைக் கண்டுபிடிக்க முடியவில்லை?",
+  "TVC_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span> குறிப்பு: </ span> டிவி வகுப்பிற்கு முன்னேற்றத்தைக் கண்காணிக்க முடியாது",
+  "TVC_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "{{%s}} ல் நீங்கள் கோரிய டிவி வகுப்பை உங்கள் மாநில வாரியம் பதிவேற்றும்போது நாங்கள் உங்களுக்கு அறிவிப்போம்.",
+  "TVC_NONTRK_QR_CODE_DETAILS": "உங்கள் டிவி வகுப்பிலிருந்து QR குறியீட்டை ஸ்கேன் செய்வதன் மூலம் டிஜிட்டல் உள்ளடக்கத்திற்கு உடனடி அணுகலைப் பெறுங்கள்.",
+  "TVC_NONTRK_SEE_MORE_BOOKS": " டிவி வகுப்புகள் மற்றும் உள்ளடக்கத்தைப் பார்க்கவும்",
+  "TVC_NONTRK_STUDENT_ROLE_DESC_1": "டிவி  வகுப்புகள் மற்றும் டிஜிட்டல் உள்ளடக்கத்தை உலாவுக",
+  "TVC_NONTRK_TEACHER_ROLE_DESC_1": "டிவி வகுப்புகள் மற்றும் டிஜிட்டல் உள்ளடக்கத்தை உலாவுக",
+  "TVC_NONTRK_TUTORIAL_HEADING": "காணொளிகள், ஊடாடும் உள்ளடக்கம், E-பாடபுத்தகங்கள் மற்றும் பல ...",
+  "TVC_TRK_BATCHEND_MAIN_HEADING": " {{%s}} இல் முடிக்கப்பட்ட டிவி  வகுப்பின் தொகுப்பில் சேர்ந்துள்ளீர்கள்",
+  "TVC_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "இந்த திட்டத்தை முடித்துவிட்டீர்கள்",
+  "TVC_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "டிவி  வகுப்புகள் ",
+  "TVC_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "இந்த டிவி வகுப்புகளை நீங்கள் பார்த்துள்ளீர்கள்",
+  "TVC_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "டிவி  வகுப்புகளுக்கான தொகுதிகள்",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "பணிகள்",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "எனது டிவி வகுப்புகள்",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "தொகுதி முடிவடைந்த நாள் ",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "கடைசியாக புதுப்பிக்கப்பட்ட நாள் {{last_updated_on_date}} ",
+  "TVC_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "சமீபத்திய டிவி வகுப்புகள்",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "டிவி வகுப்புகள் ({{% s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "டிவி வகுப்புகள் ({{% s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "பிரபலமான டிவி வகுப்புகள்",
+  "TVC_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "சான்றிதழைப் பெறுவதற்கு {{%s}} மூலம் பணியை முடிக்கவும்",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING": "கற்றல் பணி ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "கலந்து கொண்ட கற்றல் பணி(கள்) ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "டிவி வகுப்பு  விவரங்கள் ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "பணி முடிகிறது",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "பணி இறுதி தேதி",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "பணி விவரங்கள்",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "இந்த பணி இதற்கு பொருத்தமானது:",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "டிவி நிகழ்ச்சி ",
+  "TVC_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "டிவி  வகுப்பு பார்ப்பதை நிறுத்துங்கள்",
+  "TVC_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "டிவி  வகுப்புகளை காண வேண்டுமா?",
+  "TVC_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "டிவி வகுப்புக்களுக்கான தொகுதி தொடங்கும் நாள் {{batch_start_date}} ",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "சான்றிதழ் குறித்த உங்கள் பதிவு செய்யப்பட்ட தொடர்பு விவரங்களில் 7 நாட்களுக்குள் உங்களுக்கு அறிவிக்கப்படும்",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "குறிப்பு: இந்த பணிக்கு சான்றிதழ் இல்லை",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "இந்த டிவி  வகுப்புகளை நீங்கள் பார்த்துள்ளீர்கள்",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "குறிப்பு: தற்போது, ​​இந்த பணிக்கு சான்றிதழ் இல்லை. உருவாக்கியவர் பின்னர் ஒரு சான்றிதழை இணைக்கலாம்.",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "டிவி வகுப்பைப் பார்ப்பதை நிறுத்திவிட்டீர்கள்",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "டிவி வகுப்புகள் பதிவு செய்யப்பட்ட பயனர்களுக்கானவை. டிவி வகுப்பை அணுக உள்நுழைக",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "இந்த டிவி வகுப்பைப் பார்க்க உள்நுழைக",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "பதிவுசெய்த பயனர்கள் மட்டுமே கற்றல் பணிகளை மேற்கொள்ள முடியும்",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "இந்த பணியை வெற்றிகரமாக முடித்துவிட்டீர்கள்",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "பணி முடிந்தது. நீங்கள் மதிப்பீட்டை மீண்டும் செய்யலாம், ஆனால், உங்கள் முன்னேற்றம் பதிவு செய்யப்படாது.",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "பணி முடிந்தது. நீங்கள் மதிப்பீட்டை எடுக்கலாம், ஆனால், உங்கள் முன்னேற்றம் பதிவு செய்யப்படாது.",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "டிவி  வகுப்புகளைக் காண, அணுக நீங்கள் செயலில் உள்ள தொகுதியில் சேர வேண்டும்",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "டிவி வகுப்பு விவரங்களை அணுக நீங்கள் உள்நுழைய வேண்டும்",
   "UNABLE_TO_FETCH_CONTENT": "அகத்ற்றபட்டப் பாடத்தை எடுக்க முடியவில்லை",
   "UNENROLL_CONFIRMATION_MESSAGE": "சேவையில் இருக்கும் அல்லது வரப்போகும் தொகுதியில் நீங்கள் மறுபடியும் இணையலாம்",
-  "UNENROLL_FROM_COURSE": "பயிற்சியில் இருந்து விலகு",
+  "UNENROLL_FROM_COURSE": "பாடநெறியில் இருந்து விலகு",
   "UNIT_COMING_SOON": "விரைவில் வருகிறது",
   "UNKNOWN_QR": "நீங்கள் தவறான QR   குறியீட்டை ஸ்கேன் செய்திருக்கீர்கள் என்று தோன்றுகிறது",
   "UNSELECT_ALL": "அனைத்தையும் தேர்வுநீக்கு",
   "UPDATE": "மேம்படுத்து",
   "UPDATE_APP_BTN_ACTION_NO": "பின்னர் புதுப்பிக்கவும்",
   "UPDATE_APP_BTN_ACTION_YES": "இப்பொழுது மேம்படுத்து",
+  "UPDATE_APP_SUPPORT_TITLE": "நீங்கள் {{app_name}} செயலியின் பழைய பதிப்பைப் பயன்படுத்துகிறீர்கள். இந்த உள்ளடக்கத்தைப் பயன்படுத்த உங்கள் பயன்பாட்டை சமீபத்திய பதிப்பிற்கு மேம்படுத்தவும்.",
   "UPDATE_APP_TITLE": "செயலியின் புதிய பதிப்பு கிடைக்கிறது!",
   "UPDATE_CONFIRMATION_TEXT": "உள்ளடக்கத்தை புதுப்பிக்க விரும்புகிறீர்களா ?",
   "UPDATE_CONTENT": "உள்ளீட்டைப் புதுப்பிக்கவும் ({{%s}})",
+  "UPDATE_DETAILS": "விவரங்களைப் புதுப்பிக்கவும்",
   "UPDATE_RECOVERY_ID": "மீட்டெடுப்பு கணக்கைப் புதுப்பிக்கவும்",
   "UPDATE_REQUIRED": "புதுப்பிப்பு தேவை",
+  "UPDATE_YOUR_PREFERENCE_FROM_PROFILE": "உங்கள் சுயவிவர விவரங்களை நீங்கள் {{app_name}} சுயவிவர அமைப்பிலிருந்து  திருத்தலாம் ",
   "UPDATING": "புதுப்பிக்கப்படுகிறது ",
   "UPDATING_CONTENT": "உள்ளீடு புதுப்பிக்கப்படுகிறது {{%s}}%",
-  "USER": "பயனர்",
   "USERNAME": "பயனர் பெயர்: {{%s}}",
-  "USERS": "பயனர்கள்",
-  "USERS_AND_GROUPS": "பயனர்கள் மற்றும் குழுக்கள்",
   "USER_CREATED_SUCCESSFULLY": "பயனர் வெற்றிகரமாக உருவாக்கப்பட்டது",
-  "USER_DELETE_CONFIRM": "'{{%s}}' நீக்கப்பட்டதை உறுதிசெய்யவா?",
-  "USER_DELETE_CONFIRM_MESSAGE": "இந்த நடவடிக்கை நிரந்தரமானது, பயனர் நீக்கிவிட்டால் அணுகமுடியாது",
-  "USER_DELETE_CONFIRM_MESSAGE_FROM_GROUP": "'{{%s}}' ஐ அகற்றுவதை உறுதிப்படுத்தவா?",
-  "USER_DELETE_CONFIRM_SECOND_MESSAGE": "இந்த செயலானது குழுமத்திலிருந்து பயனர்களை அகற்றும். பயனர்கள் இன்னமும் பயனர்கள் பகுதியின் கீழ் காணலாம்",
   "USER_ID": "பயனர் முகவரி ",
   "USER_IS_NOT_VERIFIED": "உங்கள் பயனர் ஐடி சரிபார்க்கப்படவில்லை",
   "USER_NAME": "பயனர் பெயர்",
@@ -620,34 +1173,51 @@
   "USER_TYPE_1": "ஆசிரியர்",
   "USER_TYPE_2": "மாணவர்",
   "USER_TYPE_3": "மற்றவை",
+  "USER_TYPE_5": "பெற்றோர்",
   "USER_TYPE_SELECT_WARNING": "பயனர் வகையைத் தேர்வுசெய்க",
   "USER_VERIFICATION": "பயனர் சரிபார்ப்பு",
+  "USE_APP_AS": "{{%s}} வை இப்படி பயன்படுத்துங்கள்",
+  "VALIDATION_MAXIMUM_LENGTH": "அதிகபட்ச நீளம் 11 எண்களாக இருக்க வேண்டும்",
+  "VALIDATION_MINIMUM_LENGTH": "குறைந்தபட்ச நீளம் 11 எண்களாக இருக்க வேண்டும்",
+  "VERIFY": "சரிபார்க்கவும்",
   "VERIFY_EMAIL_OTP_DESCRIPTION": "நீங்கள் மின்னஞ்சல் முகவரியை சரிபார்த்துக்கொள்ள  உங்கள் மின்னஞ்சல் முகவரிக்கு OTP அனுப்பப்படும்",
   "VERIFY_EMAIL_OTP_TITLE": "மின்னஞ்சல் முகவரியை சரிபார்க்கவும் ",
   "VERIFY_PHONE_OTP_DESCRIPTION": "உங்கள் தொலைபேசி எண் சரிபார்ப்புக்காக குறுஞ்செய்தியில் OTP உங்கள் தொலைபேசி எண்ணிற்கு அனுப்பப்படும் ",
   "VERIFY_PHONE_OTP_TITLE": "தொலைபேசி எண்ணை  செரிபார்க்கவும் ",
   "VERSION": "பதிப்பு ",
-  "VIDEOS": "காணொளி",
+  "VERYFYING_PLEASE_WAIT": "சரிபார்க்கிறது",
+  "VIDEO": "காணொளி",
   "VIEW": "பார்க்க",
+  "VIEW_ACTIVITY": "செயல்பாட்டைக் காண்க",
   "VIEW_ALL": "அனைத்தையும் காட்டு",
   "VIEW_ALL_BATCHES": "தொடர ஒரு தொகுதி தேர்ந்தெடுக்கவும்",
   "VIEW_CREDITS_INFO": "உருவாக்கியவர் விவரங்களைப் பார்க்க",
   "VIEW_DOWNLOADS_ONLY_MSG": "பதிவிறக்கங்களை மட்டும் பார்",
   "VIEW_MORE": "மேலும் காட்டு",
   "VIEW_ONGOING_BATCHES": "நடப்பு தொகுதிகள்",
-  "VIEW_RETIRED_BATCHES": "காலாவதியான தொகுப்புகளும்",
-  "VIEW_UPCOMING_BATCHES": "வரப்போகும் தொகுதிகளை பாருங்கள்",
+  "VIEW_OPEN_BATCHES": "திறந்த தொகுதிகள் ",
+  "VIEW_RETIRED_BATCHES": "முடிவுபெற்ற  தொகுதிகள் ",
+  "VIEW_UPCOMING_BATCHES": "வரவிருக்கும்  தொகுதிகள் ",
   "WAITING_TO_DOWNLOAD": "பதிவிறக்குவதற்காக காத்திருக்கிறது ...",
   "WAIT_REQUEST": "உள்ளடக்கம் வந்துக் கொண்டிருக்கிறது ",
+  "WANT_TO_CHECK_FREE_TRAININGS": "பாடநெறிகளின் பட்டியலைப் பார்க்க வேண்டுமா?",
   "WARNING_PLEASE_MAKE_SOME_CHANGES": "இதைத் திருத்தவும்",
+  "WEBVIEW_UPDATE_TEXT": "பயனுள்ள அனுபவத்திற்கு, Google Play ஸ்டோரிலிருந்து WebView இன் சமீபத்திய பதிப்பைப் பதிவிறக்கவும்.",
+  "WEEKS_AGO": "‪{{%s}}‬ வாரங்களுக்கு முன்பு",
+  "WEEK_AGO": "‪{{%s}}‬ வாரத்திற்கு முன்பு",
+  "WELCOME": "வருக",
   "WELCOME_BACK": "மீண்டும் வரவேற்கிறோம் {{%s}}",
+  "WHAT_IS_MEMBER_ID": "{{app_name}} ஐடியை நான் எங்கே காணலாம்?",
+  "YEARS_AGO": "{{%s}} ஆண்டுகளுக்கு முன்பு",
+  "YEAR_AGO": "{{%s}} ஆண்டுகள்  முன்பு",
   "YES": "ஆம்",
+  "YOUR_ID_FROM_STATE_BOARD_ORG": "உங்கள் மாநில / வாரியம் /அமைப்பிலிருந்து தங்கள் ஐடி",
   "YOUR_LOCATION": "தங்களது இடம்",
   "YOUR_LOCATION_DETAILS": "உங்கள் இருப்பிட விவரங்கள் உங்களுக்கு பொருத்தமான உள்ளடக்கத்தை வழங்க எங்களுக்கு உதவுகின்றன. உங்கள் இருப்பிடம் சரியாக இருக்கிறதா என்று சரிபார்த்து, இல்லையெனில் உங்கள் இருப்பிடத்தை மீண்டும் தேர்ந்தெடுத்து சமர்ப்பிக்கவும்.",
   "YOUR_PROGRESS": "உங்கள் முன்னேற்றம்: {{%s}}%",
   "YOUR_PROGRESS_LABEL": "உங்கள் முன்னேற்றம்",
   "YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET": "நீங்கள் இணையத்துடன் இணைக்கப்படவில்லை ",
-  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "பயிற்சி விவரங்களைக் காணவும் அணுகவும் நீங்கள் செயலில் உள்ள குழுவில் சேர வேண்டும்",
-  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "பயிற்சி விவரங்களை அணுக நீங்கள் உள்நுழைய வேண்டும்",
+  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "பாடநெறி விவரங்களைக் காணவும் அணுகவும் நீங்கள் செயலில் உள்ள குழுவில் சேர வேண்டும்",
+  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "பாடநெறி  விவரங்களை அணுக நீங்கள் உள்நுழைய வேண்டும்",
   "YOU_MUST_LOGIN_TO_ACCESS_QUIZ_CONTENT": "இந்த உள்ளடக்கத்தை அணுக நீங்கள் உள்நுழைய வேண்டும்"
 }
\ No newline at end of file
diff --git a/src/assets/i18n/te.json b/src/assets/i18n/te.json
index 2c58e931a..065153c94 100644
--- a/src/assets/i18n/te.json
+++ b/src/assets/i18n/te.json
@@ -8,18 +8,42 @@
   "ACCOUNT_MERGE_FAILED": "ఖాతాను విలీనం చేయడంలో విఫలమైంది",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_CONTENT": "ఖాతా విలీనం విజయవంతంగా ప్రారంభించబడింది. అది పూర్తయిన తర్వాత మీకు తెలియజేయబడుతుంది.",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_HEADING": "ఖాతాను విలీనం చేయండి",
-  "ACCURACY": "మార్కుల శాతం",
   "ACTIVE": "ఏక్టివ్",
   "ACTIVE_DOWNLOADS": "యాక్టివ్ డౌన్లోడ్లు",
+  "ACTIVITIES": "కార్యకలాపాలు",
+  "ACTIVITIESE_SEARCH_PLACEHOLDER": "సమూహం యొక్క కార్యకలాపాల కోసం శోధించండి",
+  "ACTIVITY_ALREADY_ADDED_IN_GROUP": "ఈ కార్యాచరణ ఇప్పటికే జోడించబడింది",
+  "ACTIVITY_COLLECTION_TITLE": "కలెక్షన్",
+  "ACTIVITY_COURSE_TITLE": "కోర్సులు",
+  "ACTIVITY_EXPLANATION_CONTENT_TITLE": "వివరణ కంటెంట్",
+  "ACTIVITY_PRACTICE_QUESTION_SET_TITLE": "ప్రాక్టీస్ ప్రశ్న సెట్",
+  "ACTIVITY_PRACTICE_RESOURCE_TITLE": "ప్రాక్టీస్ రిసోర్సు",
+  "ACTIVITY_RESOURCE_TITLE": "రిసోర్సు",
+  "ACTIVITY_TEXTBOOK_TITLE": "పాఠ్య పుస్తకం",
+  "ACTIVITY_TV_EPISODE_TITLE": "టీవీ ఎపిసోడ్",
   "ADD": "కలుపు",
+  "ADD_ACTIVITY": "కార్యాచరణను జోడించండి.",
+  "ADD_ACTIVITY_ERROR_MSG": "కార్యాచరణను జోడించడం సాధ్యం కాలేదు. తరువాత మళ్ళీ ప్రయత్నించండి",
+  "ADD_ACTIVITY_SUCCESS_MSG": "కార్యాచరణ విజయవంతంగా జోడించబడింది",
+  "ADD_ANOTHER_USER": "మరొక వినియోగదారుని జోడించండి.",
   "ADD_DISTRICT": "జిల్లాను జోడించండి",
+  "ADD_EDIT_SELF_DECLARED_TEACHER_INFO": "అనువదించని\n\n పురోగతిని ధృవీకరించడానికి మరియు అనుసరించడానికి ఈ వివరాలు మీ ప్రకటించిన రాష్ట్రానికి అందుబాటులో ఉంచవచ్చు",
   "ADD_EMAIL": "ఇమెయిల్ ఐడిని జోడించండి",
+  "ADD_MEMBER": "సభ్యుని జొడించండి",
+  "ADD_MEMBER_CONFIRMATION": "మీరు కొనసాగడానికి ముందు సభ్యుడి పేరు మరియు {{app_name}} ID సరిపోతుందో లేదో తనిఖీ చేయాలి",
+  "ADD_MEMBER_POPUP_DESC": "వారి ప్రత్యేకమైన {{%s}} ID ని గుర్తించడానికి సభ్యులకు మార్గనిర్దేశం చేయడానికి క్రింది సూచనలను ఉపయోగించండి",
+  "ADD_MEMBER_POPUP_STEP_1": "ప్రొఫైల్ టాబ్ క్లిక్ చేయండి",
+  "ADD_MEMBER_POPUP_STEP_2": "<span>Step 2</span>ఇక్కడ {{%s}} ID చూడండి",
+  "ADD_MEMBER_POPUP_TITLE": "నేను ID ని ఎక్కడ చూడగలను?",
   "ADD_PHONE": "ఫోన్ నంబర్ను జోడించండి",
   "ADD_RECOVERY_ACCOUNT": "రికవరీ ఖాతాను జోడించండి",
   "ADD_RECOVERY_ID": "రికవరీ ఖాతాను జోడించండి",
   "ADD_STATE": "రాష్ట్రము జోడించండి",
+  "ADD_TO_GROUP": "సమూహానికి జోడించండి.",
+  "ADD_TO_GROUP_ACTIVITY": "సమూహ కార్యాచరణకు జోడించండి.",
+  "ADD_USER": "సభ్యుని జొడించండి",
   "ADD_USERS": "వాడకందారులను చేర్చాలి",
-  "ADD_USERS_TO_GROUP": "{{%s}} వాడకందారులను గుంపులో చేర్చు",
+  "AGREE_TO_SHARE_PROFILE_DETAILS": "నా ప్రొఫైల్ వివరాలను కోర్సు నిర్వాహకుడితో పంచుకోవడానికి నేను అంగీకరిస్తున్నాను",
   "ALL": "అన్ని",
   "ALLOW": "అనుమతించు",
   "ALL_ANNOUNCEMENTS": "అన్ని ప్రకటనలు",
@@ -31,7 +55,8 @@
   "ANSWER": "జవాబు",
   "APPLY": "ఫిల్టర్ చెయ్యండి",
   "APPLY_FILTER": "ఫిల్టర్ చెయ్యండి",
-  "APP_QR_CODE": "{{%s}} క్యూఆర్ కోడ్ ని చూసారా?",
+  "APP_ID": "{{%s}}ID",
+  "APP_QR_CODE": "{{%s}} QR కోడ్ ఉందా?",
   "APP_RATING_RATE_EXPERIENCE": "మీ అనువర్తన అనుభవాన్ని రేట్ చేయండి",
   "APP_RATING_RATE_ON_PLAYSTORE": "మీరు ప్లే స్టోర్కు మీ రేటింగ్ను సమర్పించాలనుకుంటున్నారా?",
   "APP_RATING_REPORT_AN_ISSUE": "క్షమించండి, మీరు చెడ్డ అనుభవాన్ని కలిగి ఉన్నారు. మీరు సమస్యను నివేదించాలనుకుంటున్నారా?",
@@ -44,7 +69,7 @@
   "AS_LINK": "లింకుగా",
   "ATTACHMENT_DOWNLOADED": "అటాచ్మెంటు  డౌన్లోడ్ చేయబడింది",
   "ATTRIBUTIONS": "క్రెడిట్లు",
-  "AUDIOS": "ఆడియో",
+  "AUDIO": "ఆడియో",
   "AUTHOR": "రచయిత",
   "AUTOMATIC_SYNC": "ఆటోమేటిక్ గా డేటా సమకాలీకరణ",
   "AUTO_MIGRATION_FAIL_MESSAGE": "ఖాతాలను విలీనం చేయలేకపోయింది",
@@ -53,10 +78,8 @@
   "AVAILABLE_FILTERS": "ఫిల్టర్లు",
   "AVAILABLE_FOR_TEACHERS": "ఉపాధ్యాయులకు మాత్రమే అందుబాటులో ఉంది",
   "AVATAR": "అవతారము",
-  "AVERAGE_SCORE": "సగటు స్కోరు",
-  "AVERAGE_TIME": "సగటు సమయం",
   "BACK_TO_EXIT": "ఆప్ మూసెయ్యాలంటే మళ్ళీ నొక్కండి",
-  "BATCHEND_MAIN_HEADING": "మీ బ్యాచ్ శిక్షణ పూర్తి చేసింది",
+  "BATCHEND_MAIN_HEADING": "మీరు  {{%s}} పూర్తి చేసిన కోర్సు యొక్క బ్యాచ్‌లో చేరారు",
   "BATCHEND_SUB_HEADING": "మీరు శిక్షణను కొనసాగించవచ్చు, కానీ మీ పురోగతి నవీకరించబడదు",
   "BATCHES_AVAILABLE": "బ్యాచ్‌లు అందుబాటులో ఉన్నాయి",
   "BATCHES_FOR_THIS_COURSE": "ఈ కోర్సుకు సంబంధించిన బేచ్‌లు",
@@ -65,16 +88,14 @@
   "BATCH_ENROLLMENT_ENDED": "ఈ బ్యాచ్ నమోదు ప్రక్రియ ముగిసింది",
   "BATCH_EXPIRED": "బాచ్ సమయం ముగిసిపోయింది",
   "BATCH_EXPIRED_BUTTON": "సరే",
-  "BATCH_EXPIRED_DESCRIPTION": "కోర్సు గడువు ముగిసింది. కావాలంటే  మీరు కోర్సు కొనసాగించవచ్చు. కానీ మీ పురోగతి ఇకపై పర్యవేక్షించబడదు. ",
   "BOARD": "బోర్డు",
   "BOARD_OPTION_TEXT": "బోర్డు ఎన్నుకోండి",
+  "BROWES_RELEVANT_CONTENT": "మీ ప్రాధాన్యతల ఆధారంగా (బోర్డు, మధ్యస్థం, తరగతి) సంబంధిత కంటెంట్‌ను కనుగొనడానికి {{app_name}} లైబ్రరీని బ్రౌజ్ చేయండి.",
   "BTN_CLICK_TO_OPEN_CONTENT": "కంటెంటు చూడాలంటే నొక్కండి",
   "BTN_LATER": "తర్వాత",
   "BTN_RATE_ON_PLAYSTORE": "ప్లే స్టోర్ లో మాకు రేట్ చేయండి",
   "BTN_SUBMIT": "సబ్మిట్ చెయ్యి",
   "BTN_VISIT_HELP_SECTION": "సహాయం విభాగాన్ని సందర్శించండి",
-  "BY_QUESTIONS": "ప్రశ్నల వివరాలు",
-  "BY_USERS": "వాడకందారుల వివరాలు",
   "CAMERA": "కెమెరా",
   "CAMERA_PERMISSION_DESCRIPTION": "క్యుఆర్ సంకేతాల స్కానింగ్ కోసం {{%s}} కు కెమెరా యాక్సెస్ అవసరం",
   "CANCEL": "రద్దు",
@@ -84,24 +105,34 @@
   "CANCEL_DOWNLOAD": "డౌన్‌లోడ్ వద్దు",
   "CANCEL_DOWNLOAD_MESSAGE": "డౌన్ లోడ్ రద్దు చేయడం వలన ఆక్టివ్ డౌన్లోడ్ల నుండి  కంటెంట్ తొలగిస్తుంది",
   "CANCEL_DOWNLOAD_TITLE": "డౌన్ లోడ్ రద్దు చేయాలా?",
+  "CERTIFICATE_ALREADY_DOWNLOADED": "అనువదించని సర్టిఫికేట్ ఇప్పటికే డౌన్‌లోడ్ చేయబడింది, దయచేసి మీ డౌన్‌లోడ్ ఫోల్డర్‌ను తనిఖీ చేయండి",
+  "CERTIFICATE_DOWNLOADED": "సర్టిఫికేట్ డౌన్‌లోడ్ చేయబడింది",
+  "CERTIFICATE_DOWNLOAD_INFO": "సర్టిఫికేట్ డౌన్‌లోడ్ అవుతోంది",
   "CERTIFIED_TRAINING": "సర్టిఫైడ్ శిక్షణ",
   "CHANGE": "మార్చు",
   "CHANGE_ROLE": "రోల్ మార్చాలి",
-  "CHANGE_USER": "వాడకందారును మార్చు",
+  "CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "మీరు ఈ మాడ్యూల్ పూర్తి చేసారు",
+  "CHARACTERS_REMAINING": "{{character_count}} అక్షరాలు మిగిలి ఉన్నాయి",
   "CHECK_FOR_UPDATES": "అప్డేట్  గురించి తెలుసుకోండి",
   "CHOOSE_FROM_FOLLOWING": "కిందవాటి నుండి ఎన్నుకోండి",
   "CHOOSE_LANGUAGE": "భాషను ఎన్నుకోండి",
+  "CHOOSE_USER": "వినియోగదారుని ఎంచుకొండి",
   "CHOOSE_WHERE_TO_SAVE_DATA": "డేటాను ఎక్కడ సేవ్ చేయాలో ఎంచుకోండి",
   "CLASS": "క్లాసు",
   "CLASSES": "తరగతులు",
   "CLEAR": "స్పష్టమైన",
   "COACH_SCREEN": "QR  కోడ్‌ను స్కాన్ చేయడం ద్వారా  మీరు కంటెంట్‌కి మళ్ళించబడతారు",
   "COMMUNITIES": "కమ్యూనిటీలు",
+  "COMPLETED": "పూర్తి",
   "COMPLETE_ASSESSMENT_TO_EARN_CERTIFICATE": "ద్వారా పూర్తి అంచనా {{%s}}",
+  "COMPLETE_BY": "{{%s}}  తేదీతో పూర్తి చేయండి",
+  "COMPLETE_CHAPTER_TO_UNLOCK_ACHIEVEMENT": "అనువదించని క్రొత్త విజయాన్ని అన్‌లాక్ చేయడానికి {{%s}} కంటెంట్‌ను పూర్తి చేయండి",
   "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} ద్వారా పూర్తి శిక్షణ",
   "CONFIRM": "నిర్ధారించండి",
+  "CONGRATULATIONS": "అభినందనలు!",
   "CONNECT_TO_INTERNET_SUGGESTION": "కంటెంట్‌ను వీక్షించడానికి ఇంటర్నెట్ సూచనకు కనెక్ట్ అవ్వండి",
   "CONSIDER_DOWNLOAD": "కంటెంట్ను డౌన్లోడ్ చేసుకోండి",
+  "CONTENTS": "విషయాలు",
   "CONTENT_ALREADY_EXIST": "ఫైల్ ఇప్పటికే దిగుమతి చేయబడింది. దయచేసి క్రొత్త ఫైల్ను ఎంచుకోండి",
   "CONTENT_ALREADY_EXISTS": "గమ్యం ఫోల్డర్‌లో కంటెంట్ ఉంది. ఐనపట్తికి గమ్యం ఫోల్డర్‌కు కంటెంట్‌ను తరలించాలా?",
   "CONTENT_COMING_SOON": "కంటెంట్ త్వరలో వస్తుంది",
@@ -117,6 +148,8 @@
   "CONTENT_IS_BEING_ADDED": "ఈ QR కోడ్ కోసం మీ రాష్ట్రం నుండి కంటెంటు త్వరలో వస్తుంది",
   "CONTENT_NOT_AVAILABLE": "కంటెంట్ అందుబాటులో లేదు",
   "CONTENT_PLAYER_EXIT_PERMISSION": "మీరు ఈ కంటెంట్ను వదిలివేయాలనుకుంటున్నారా?",
+  "CONTENT_PREFERENCE": "కంటెంట్ ప్రాధాన్యత",
+  "CONTENT_PREFERENCE_SELECTION": "కంటెంట్ ప్రాధాన్యతను ఎంచుకోండి",
   "CONTENT_RATING_SUB_HEADING": "కంటెంట్‌ను రేట్ చేయడానికి నక్షత్రాలపై నొక్కండి",
   "CONTENT_RETIRED_BY_AUTHOR": "ఈ కంటెంట్ రచయిత ద్వారా తీసివేయబడింది. అందుకే అందుబాటులో లేదు",
   "CONTENT_SIZE": "కంటెంట్ పరిమాణం",
@@ -125,50 +158,193 @@
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO_SDCARD": "కంటెంట్ విజయవంతంగా SD కార్డ్‌లో బదిలీ చేయబడింది",
   "CONTINUE": "కొనసాగించడానికి",
   "CONTINUE_AS_ROLE": "'{{%s}}'గా ప్రవేశిస్తున్నారు.",
-  "CONTINUE_NOW": "కొనసాగించు",
+  "CONTINUE_LEARNING": "కొనసాగించు",
   "CONTRIBUTIONS": "మీ కంటెంట్",
   "CONTRIBUTORS": "సహాయకులు",
   "COPYRIGHT": "కాపీరైట్",
+  "COURSES": "కోర్సులు",
   "COURSES_BNAV": "కోర్సులు",
   "COURSES_IN_PROGRESS": "నా కోర్సులు",
   "COURSE_COMPLETED_LABEL": "{{%s}}% పూర్తయింది",
+  "COURSE_COMPLETION_POPUP_DESC": "కోర్సు సర్టిఫికేట్ గురించి మీ రిజిస్టర్డ్ సంప్రదింపు వివరాలపై 7 రోజుల్లో మీకు తెలియజేయబడుతుంది",
+  "COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "గమనిక: ఈ కోర్సుకు సర్టిఫికేట్ లేదు",
   "COURSE_ENDED": "కోర్సు ముగిసింది",
+  "COURSE_ENDED_ON": "కోర్సు {{%s}}  తో ముగిసింది",
   "COURSE_ENROLLED": "నమోదు కాబడిన కోర్సులు",
+  "COURSE_LAST_UPDATED_ON": "కోర్సు చివరిగా నవీకరించబడింది {{last_updated_on_date}}",
   "COURSE_NOT_AVAILABLE": "ఈ కోర్సు ఇకపై అందుబాటులో లేదు",
+  "COURSE_NO_CERTIFICATE_MESSAGE": "ప్రస్తుతం, ఈ కోర్సుకు సర్టిఫికేట్ లేదు. కోర్సు సృష్టికర్త తరువాత ప్రమాణపత్రాన్ని అటాచ్ చేయవచ్చు.",
   "COURSE_PROGRESS_COMPLETED": "{{%s}} % పూర్తయింది",
   "COURSE_UNENROLLED": "విజయవంతంగా కోర్సు నుండి తీసివేయబడింది",
   "COURSE_WILL_BE_AVAILABLE": "కోర్సు {{%s}} నుండి అందుబాటులోకి వస్తుంది",
-  "CREATE_GROUP": "కొత్త గుంపు",
-  "CREATE_NEW_GROUP": "కొత్త గుంపును సృష్టించండి",
-  "CREATE_NEW_USER": "కొత్త వాడుకందారును సృష్టించాలి",
+  "CREATE_GROUP": "సమూహాన్ని సృష్టించండి",
+  "CREATE_GROUP_DESCRIPTION": "మీరు సమూహాన్ని సృష్టించడానికి ఒక అడుగు దూరంలో ఉన్నారు.",
+  "CREATE_GROUP_DESCRIPTION_POPUP": "వ్యక్తులతో కనెక్ట్ అవ్వడానికి, కార్యకాపాలను పంచుకోడనికి, పురోగతిని వెల్లడించడానికి మరియు ఇతర అవకాశాలను అన్వేషించడానికి ఒక సమూహాన్ని సృష్టించండి లేదా ఒకదానిలొ భాగం అవ్వండి",
   "CREATE_USER": "కొత్త వాడుకందారు",
   "CREATORS": "{{%s}} లో తయారు చేసినవారు",
   "CREDITS": "క్రెడిట్స్",
   "CREDITS_LICENCE_INFO": "క్రెడిట్స్ మరియు లైసెన్స్ సమాచారం",
-  "CSV_DOWNLOAD_SUCCESS": "{{%s}} 'డౌన్లోడ్లు' లో సేవ్ చేయబడ్డాయి",
+  "CRS_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "ప్రారంభించడానికి ఒక కోర్సును ఎంచుకోండి",
+  "CRS_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "కోర్సు",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "కోర్సులు",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "కోర్సులు",
+  "CRS_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}} యొక్క లైబ్రరీకి{{%explainVideos}}, {{%quesBanks}} మరియు ఇతర {{%interactiveMaterial}}. లైబ్రరీని అన్వేషించడం ప్రారంభించడానికి ఒక కోర్సుపై క్లిక్ చేయండి!",
+  "CRS_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "కోర్సులు కనుగొనబడలేదు{{%grade}} ({{%medium}})",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "బోర్డు కోర్సులను జోడిస్తోంది",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "కోర్సు కనుగొనలేకపోయారా{{%s}}?",
+  "CRS_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>గమనిక:</span>\nకోర్సు కోసం పురోగతిని ట్రాక్ చేయడం సాధ్యం కాదు",
+  "CRS_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "మీ స్టేట్ బోర్డు మీరు కోరిన కోర్సును అప్‌లోడ్ చేసినప్పుడు మేము మీకు తెలియజేస్తాము {{%s}}",
+  "CRS_NONTRK_QR_CODE_DETAILS": "మీ కోర్సు నుండి QR కోడ్‌ను స్కాన్ చేయడం ద్వారా డిజిటల్ కంటెంట్‌కు తక్షణ ప్రాప్యతను పొందండి.",
+  "CRS_NONTRK_SEE_MORE_BOOKS": "మరిన్ని కోర్సులు మరియు కంటెంట్ చూడండి",
+  "CRS_NONTRK_STUDENT_ROLE_DESC_1": "కోర్సులు మరియు డిజిటల్ కంటెంట్‌ను బ్రౌజ్ చేయండి",
+  "CRS_NONTRK_TEACHER_ROLE_DESC_1": "కోర్సులు మరియు డిజిటల్ కంటెంట్‌ను బ్రౌజ్ చేయండి",
+  "CRS_NONTRK_TUTORIAL_HEADING": "వీడియోలు, ఇంటరాక్టివ్ కంటెంట్, ఇ-పాఠ్యపుస్తకాలు మరియు మరిన్ని ...",
+  "CRS_TRK_BATCHEND_MAIN_HEADING": "మీరు పూర్తి చేసిన కోర్సు యొక్క బ్యాచ్‌లో చేరారు{{%s}}",
+  "CRS_TRK_BATCHEND_SUB_HEADING": "మీరు కోర్సును కొనసాగించవచ్చు, కానీ మీ పురోగతి నవీకరించబడదు",
+  "CRS_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "మీరు ఈ మాడ్యూల్ పూర్తి చేసారు",
+  "CRS_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}}ద్వారా కోర్సు పూర్తి",
+  "CRS_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "కోర్సులు",
+  "CRS_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "మీరు ఈ కోర్సులో చేరారు",
+  "CRS_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "కోర్సు కోసం బ్యాచ్‌లు",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "కోర్సులు",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "నా కోర్సులు",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "కోర్సు ముగిసింది{{%s}}",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "కోర్సు చివరిగా నవీకరించబడింది{{last_updated_on_date}}",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_NOT_AVAILABLE": "ఈ కోర్సు క్రియారహితంగా ఉంది",
+  "CRS_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "కోర్సులో చేరండి",
+  "CRS_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "తాజా కోర్సులు",
+  "CRS_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "కోర్సును వదిలివేయాలా?",
+  "CRS_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "కోర్సులో చేరడానికి లాగిన్ అవ్వండి",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_COURSES": "కోర్సులు లేవు",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "కోర్సులు లేదా లైబ్రరీ నుండి కంటెంట్‌ను డౌన్‌లోడ్ చేయండి",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "కోర్సులు({{%s}})",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "కోర్సు({{%s}})",
+  "CRS_TRK_FRMELEMNTS_LBL_OVERLAY_LABEL_TAKE_COURSE": "ఈ కోర్సులో చేరడానికి లాగిన్ అవ్వండి",
+  "CRS_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "ప్రసిద్ధ కోర్సులు",
+  "CRS_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ఆన్‌లైన్ కోర్సులు తీసుకోండి",
+  "CRS_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "సర్టిఫికేట్ సంపాదించడానికి {{%s}} ద్వారా కోర్సు పూర్తి చేయండి",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING": "కోర్సు",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "కోర్సు (లు) హాజరయ్యారు",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "కోర్సు వివరాలు",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "కోర్సు ముగుస్తుంది",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "కోర్సు ముగింపు తేదీ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "కోర్సు వివరాలు",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "ఈ కోర్సు దీనికి సంబంధించినది:",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "కోర్సు గుణకాలు",
+  "CRS_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "కోర్సు వదిలి",
+  "CRS_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "కోర్సులు తనిఖీ చేయాలనుకుంటున్నారా?",
+  "CRS_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "కోర్సు యొక్క బ్యాచ్ నుండి అందుబాటులో ఉంది{{batch_start_date}}",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "కోర్సు సర్టిఫికేట్ గురించి మీ రిజిస్టర్డ్ సంప్రదింపు వివరాలపై 7 రోజుల్లో మీకు తెలియజేయబడుతుంది",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "గమనిక: ఈ కోర్సుకు సర్టిఫికేట్ లేదు",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "మీరు కోర్సులో చేరారు",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "గమనిక: ప్రస్తుతం, ఈ కోర్సుకు సర్టిఫికేట్ లేదు.  కోర్సు సృష్టికర్త తరువాత ప్రమాణపత్రాన్ని అటాచ్ చేయవచ్చు.",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "మీరు కోర్సును విడిచిపెట్టారు",
+  "CRS_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "ఈ కోర్సు కోసం బ్యాచ్‌లు లేవు",
+  "CRS_TRK_FRMELEMNTS_MSG_OTHER_ROLE_DESC_2": "ఆన్‌లైన్ కోర్సు తీసుకోండి",
+  "CRS_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "కోర్సు నమోదిత వినియోగదారుల కోసం.  కోర్సును యాక్సెస్ చేయడానికి లాగిన్ అవ్వండి.",
+  "CRS_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "ఈ కోర్సు కోసం బ్యాచ్‌లు అందుబాటులో లేవు",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "నమోదిత వినియోగదారులు మాత్రమే కోర్సులు తీసుకోవచ్చు",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "మీరు ఈ కోర్సును విజయవంతంగా పూర్తి చేసారు",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "కోర్సు ముగిసింది.  మీరు అంచనాను పునరావృతం చేయవచ్చు, కానీ, మీ పురోగతి నమోదు చేయబడదు.",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "కోర్సు ముగిసింది.  మీరు అంచనా వేయవచ్చు కానీ, మీ పురోగతి నమోదు చేయబడదు.",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "కోర్సు వివరాలను వీక్షించడానికి మరియు యాక్సెస్ చేయడానికి మీరు తప్పనిసరిగా క్రియాశీల బ్యాచ్‌లో చేరాలి",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "కోర్సు వివరాలను యాక్సెస్ చేయడానికి మీరు తప్పక లాగిన్ అవ్వాలి",
   "CURRENT_LANGUAGE": "ప్రస్తుత భాష",
-  "DATA": "మరిన్ని పుస్తకాలు మరియు కంటెంట్ చూడండి",
   "DATA_SYNC": "డేటా సింక్ చెయ్యండి",
   "DATA_SYNC_FAILURE": "ఏదో సమస్య వచ్చింది. మళ్ళీ ప్రయత్నించండి.",
   "DATA_SYNC_NOTHING_TO_SYNC": "సమకాలీకరించడానికి ఏమీ లేదు",
   "DATA_SYNC_SUB": "మీ డేటా బేకప్ తీసుకొని టెలిమెట్రీ పంపించడానికి",
   "DATA_SYNC_SUCCESSFUL": "టెలీమెట్రి డేటా విజయవంతంగా సింక్ చేయబడింది",
+  "DAYS_AGO": "{{%s}} రోజుల క్రితం",
+  "DAY_AGO": "{{%s}} రోజు క్రితం",
   "DELETE": "తొలగించు",
   "DELETE_ALL_CONTENT_WARNING": "కంటెంట్ను తొలగించడం వలన పరికరం నుండి ఎంచుకున్న కంటెంట్ (లు) తీసివేయబడుతుంది",
   "DELETE_CONTENT": "కంటెంట్ తొలగించాలా?",
   "DELETE_CONTENT_SIZE": "1 అంశం ({{content_size}})",
   "DELETE_CONTENT_WARNING": "కంటెంట్ను తొలగించడం వలన పరికరం నుండి కంటెంట్ తీసివేయబడుతుంది",
-  "DELETE_GROUP": "గుంపును తొలగించాలి",
+  "DELETE_GROUP_DESC": "{{group_name}} తొలగించడం వలన సమూహం నుండి శాశ్వతంగా అప్లికేషన్ తొలగించబడుతుంది",
+  "DELETE_GROUP_ERROR_MSG": "గ్రూపు తొలగించడం సాధ్యం కాలేదు. తరువాత మళ్ళీ ప్రయత్నించండి",
+  "DELETE_GROUP_POPUP_TITLE": "గ్రూపు ను తొలగించాల?",
+  "DELETE_GROUP_SUCCESS_MSG": "సమూహం విజయవంతంగా తొలగించబడింది",
   "DELETE_PROGRESS": "ఎంచుకున్న కంటెంట్ తొలగిస్తోంది",
-  "DESCRIPTION": "వివరణ",
+  "DETAIL_TUTORIAL": "  {{%appName}}యొక్క లైబ్రరీకి  {{%explainVideos}}, {{%quesBanks}} మరియు ఇతర  {{%interactiveMaterial} ఉన్నాయి. లైబ్రరీని అన్వేషించడం ప్రారంభించడానికి పాఠ్య పుస్తకంపై క్లిక్ చేయండి!",
   "DEVICE_ID": "పరికరం యొక్క ఐడి",
   "DEVICE_LOCATION": "పరికర స్థానం",
   "DEVICE_TAGS": "డివైస్ టాగ్స్ ",
   "DEVICE_TAGS_SUB": "డివైస్ టాగులు మార్చండి",
+  "DFLT_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "ప్రారంభించడానికి ఒక పనిని ఎంచుకోండి",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "టాస్క్",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "పనులు",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "పనులు",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%explainVideos}}, {{%quesBanks}}మరియు ఇతర {{%interactiveMaterial}} .  లైబ్రరీని అన్వేషించడం ప్రారంభించడానికి కంటెంట్‌పై క్లిక్ చేయండి!",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "పనులు ఏవీ కనుగొనబడలేదు{{%grade}} ({{%medium}})",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "బోర్డు కంటెంట్‌ను జోడిస్తోంది",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "కంటెంట్‌ను కనుగొనలేకపోయారా{{%s}}?",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>గమనిక :</span>\nపురోగతిని ట్రాక్ చేయడం సాధ్యం కాదు",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "మీ స్టేట్ బోర్డు మీరు కోరిన కంటెంట్‌ను అప్‌లోడ్ చేసినప్పుడు మేము మీకు తెలియజేస్తాము{{%s}}",
+  "DFLT_NONTRK_QR_CODE_DETAILS": "QR కోడ్‌ను స్కాన్ చేయడం ద్వారా డిజిటల్ కంటెంట్‌కు తక్షణ ప్రాప్యతను పొందండి",
+  "DFLT_NONTRK_SEE_MORE_BOOKS": "ఇంకా చూడు",
+  "DFLT_NONTRK_STUDENT_ROLE_DESC_1": "డిజిటల్ కంటెంట్ కోసం బ్రౌజ్ చేయండి",
+  "DFLT_NONTRK_TEACHER_ROLE_DESC_1": "డిజిటల్ కంటెంట్ కోసం బ్రౌజ్ చేయండి",
+  "DFLT_NONTRK_TUTORIAL_HEADING": "వీడియోలు, ఇంటరాక్టివ్ కంటెంట్, ఇ-పాఠ్యపుస్తకాలు మరియు మరిన్ని ...",
+  "DFLT_TRK_BATCHEND_MAIN_HEADING": "మీరు పూర్తి చేసిన అభ్యాస పని యొక్క బ్యాచ్‌లో చేరారు {{%s}}",
+  "DFLT_TRK_BATCHEND_SUB_HEADING": "మీరు నేర్చుకోవడం కొనసాగించవచ్చు, కానీ మీ పురోగతి నవీకరించబడదు",
+  "DFLT_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "మీరు ఈ అభ్యాస కార్యాచరణను పూర్తి చేసారు",
+  "DFLT_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}}ద్వారా పూర్తి అభ్యాసం",
+  "DFLT_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "ఈ అభ్యాస పని క్రియారహితంగా ఉంది",
+  "DFLT_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "పనులు నేర్చుకోవడం",
+  "DFLT_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "పని ముగిసింది.  మీరు అంచనాను పునరావృతం చేయవచ్చు, కానీ, మీ పురోగతి నమోదు చేయబడదు.",
+  "DFLT_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "అభ్యాస పని కోసం బ్యాచ్‌లు",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "పనులు నేర్చుకోవడం",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "నా అభ్యాస పనులు",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "టాస్క్ ముగిసింది {{%s}}",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "చివరిగా నవీకరించబడింది{{last_updated_on_date}}",
+  "DFLT_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "చేరండి",
+  "DFLT_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "తాజా అభ్యాస పనులు",
+  "DFLT_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "పనిని వదిలేయాలా?",
+  "DFLT_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "చేరడానికి లాగిన్ అవ్వండి",
+  "DFLT_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "కంటెంట్‌ను డౌన్‌లోడ్ చేయండి",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "పనులు({{%s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "పని({{%s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "ఆన్‌లైన్ లెర్నింగ్ తీసుకోండి",
+  "DFLT_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "జనాదరణ పొందిన పనులు",
+  "DFLT_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ఆన్‌లైన్ లెర్నింగ్ తీసుకోండి",
+  "DFLT_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "ధృవీకరణ పత్రాన్ని సంపాదించడానికి {{%s}} ద్వారా పనిని పూర్తి చేయండి",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING": "నేర్చుకునే పని",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "అభ్యాస పని (లు) హాజరయ్యారు",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "టాస్క్ వివరాలు",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "టాస్క్ ముగుస్తుంది",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "టాస్క్ ముగింపు తేదీ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "టాస్క్ వివరాలు",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "ఈ పని దీనికి సంబంధించినది:",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "టాస్క్ వనరులు",
+  "DFLT_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "విధిని వదిలివేయండి",
+  "DFLT_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "అభ్యాస పనులను తనిఖీ చేయాలనుకుంటున్నారా?",
+  "DFLT_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "టాస్క్ యొక్క బ్యాచ్{{batch_start_date}} నుండి అందుబాటులో ఉంది ",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "మీ గురించి మీ రిజిస్టర్డ్ సంప్రదింపు వివరాలపై మీకు తెలియజేయబడుతుంది",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "గమనిక: ఈ పనికి సర్టిఫికేట్ లేదు",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "మీరు పనిలో చేరారు",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "గమనిక: ప్రస్తుతం, ఈ పనికి సర్టిఫికేట్ లేదు.  సృష్టికర్త తరువాత ప్రమాణపత్రాన్ని అటాచ్ చేయవచ్చు.",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "మీరు విధిని విడిచిపెట్టారు",
+  "DFLT_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "ఈ అభ్యాస పనికి బ్యాచ్‌లు లేవు",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "పని నమోదిత వినియోగదారుల కోసం.  పనిని యాక్సెస్ చేయడానికి లాగిన్ అవ్వండి",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "ఈ పనిని ప్రారంభించడానికి లాగిన్ అవ్వండి",
+  "DFLT_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "ఈ పనికి బ్యాచ్‌లు అందుబాటులో లేవు",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "నమోదు చేసుకున్న వినియోగదారులు మాత్రమే అభ్యాస పనులను చేపట్టగలరు",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "మీరు ఈ పనిని విజయవంతంగా పూర్తి చేసారు",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "పని ముగిసింది.  మీరు అంచనాను పునరావృతం చేయవచ్చు, కానీ, మీ పురోగతి నమోదు చేయబడదు.",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "పని ముగిసింది.  మీరు అంచనా వేయవచ్చు కానీ, మీ పురోగతి నమోదు చేయబడదు.",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "పని వివరాలను వీక్షించడానికి మరియు యాక్సెస్ చేయడానికి మీరు తప్పనిసరిగా క్రియాశీల బ్యాచ్‌లో చేరాలి",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "పని వివరాలను యాక్సెస్ చేయడానికి మీరు తప్పక లాగిన్ అవ్వాలి",
   "DISMISS": "రద్దు చెయ్యండి",
+  "DISMISS_AS_GROUP_ADMIN": "సమూహ నిర్వాహకుడిగా తొలగించండి",
+  "DISMISS_AS_GROUP_ADMIN_ERROR_MSG": " {{member_name}}'s యొక్క సమూహ నిర్వాహక స్థితిని తీసివేయడం సాధ్యం కాలేదు",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_DESC": "సమూహ నిర్వాహకుడిగా {{member_name}} తొలగించడం సభ్యుని నుండి నిర్వాహక అనుమతులను తొలగిస్తుంది",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_TITLE": "సమూహ నిర్వాహకుడిగా తొలగించాలా?",
+  "DISMISS_AS_GROUP_ADMIN_SUCCESS_MSG": " {member_name}} ఇకపై సమూహ నిర్వాహకుడు కాదు",
   "DISTRICT": "జిల్లా",
   "DISTRICT_OPTION_TEXT": "జిల్లాను ఎంచుకోండి",
-  "DOCS": "పత్రాలు",
+  "DOC": "పత్రాలు",
   "DOWNLOAD": "డౌన్‌లోడ్",
   "DOWNLOADING": "డౌన్లోడ్ అవుతోంది {{%s}} %",
   "DOWNLOADING_1": "డౌన్లోడ్ అవుతోంది {{%s}}",
@@ -189,7 +365,7 @@
   "DOWNLOAD_FILE_SIZE": "ఫైల్ పరిమాణం {{%s}}",
   "DOWNLOAD_NOT_ALLOWED_FOR_QUIZ": "ఈ కంటెంట్ కోసం డౌన్‌లోడ్ అనుమతించబడదు.",
   "DOWNLOAD_NOW": "ఇపుడు డౌన్లోడ్ చేసుకోండి",
-  "DOWNLOAD_PATH": "అంతర్గత నిల్వ / డౌన్‌లోడ్",
+  "DOWNLOAD_PATH": "ఫైల్ అంతర్గత నిల్వ> డౌన్‌లోడ్ ఫోల్డర్‌లో నిల్వ చేయబడుతుంది",
   "EDIT": "మార్చు",
   "EDIT_EMAIL_POPUP_TITLE": "ఇమెయిల్ ID ని సవరించండి",
   "EDIT_GROUP": "గుంపు సమాచారాన్ని మార్చాలి",
@@ -202,13 +378,22 @@
   "EMAIL_UPDATE_SUCCESS": "ఇమెయిల్ విజయవంతంగా నవీకరించబడింది",
   "EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) కోసం పుస్తకాలు కనుగొనబడలేదు",
   "EMPTY_SEARCH_RESULTS": "మీరు వెతికినవి దొరకాట్లేదు",
+  "EMPTY_SEARCH_RESULT_GROUPS": "క్షమించాలి! మీ శోధనతో సరిపోలడానికి ఫలితాలు లేవు",
   "ENDORSE": "ఆమోదించండి",
   "ENJOYED_THIS_CONTENT": "ఈ కంటెంటు నచ్చిందా ?",
   "ENROLL": "నమోదుకండి",
+  "ENROLLMENT_ENDED_ON": "ఈ బ్యాచ్ కోసం నమోదులు {{% s} on లో మూసివేయబడ్డాయి",
   "ENROLLMENT_LAST_DATE": "నమోదుకు చివరి తేదీ:",
   "ENTER_GROUP_NAME": "గుంపు పేరు ఇవ్వండి",
+  "ENTER_ID": "ID ని నమోదు చేయండి",
+  "ENTER_ID_AS_REQUESTED_BY_STATE_BOARD_ORG": "మీ రాష్ట్రం, బోర్డు ,ఆర్గ్ కోరిన ID  ని నమోదు చేయండి",
+  "ENTER_LOCATION_FROM_PROFILE_PAGE": "ప్రొఫైల్ పేజీ నుండి స్థానాన్ని నమోదు చేయండి",
+  "ENTER_MEMBER_ID": "ID ని తెలపండి {{app_name}}",
   "ENTER_OTP": "OTP నమోదు చేయండి",
   "ENTER_PHONE_POPUP_TITLE": "మొబైల్ సంఖ్యను నమోదు చేయండి",
+  "ENTER_SCHOOL_NAME": "స్కూలు పేరు నమోదు చేయండి",
+  "ENTER_THE_FOLLOWING_INFORMATION": "కింది సమాచారాన్ని నమోదు చేయండి",
+  "ENTER_UDISE_ID": "UDISE ID ని నమోదు చేయండి",
   "ERROR_BATCH_NOT_STARTED": "బేచ్ మొదలు కాలేదు",
   "ERROR_CANT_OPEN_EMPTY_CONTENT": "ఖాళీ ఫైల్ ఓపెన్ చేయలేము ",
   "ERROR_CONTENT_NOT_AVAILABLE": "కంటెంటు అందుబాటులో లేదు",
@@ -221,21 +406,32 @@
   "ERROR_FAILED_TO_DOWNLOAD_ATTACHMENT": "ఎటాచ్మెంట్ డౌన్లోడ్ కాలేదు",
   "ERROR_FETCHING_DATA": "డాటా తెచ్చుకోడంలో ఏదో ఇబ్బంది వచ్చింది",
   "ERROR_LOW_MEMORY": "బదిలీకి తగినంత స్థలం అందుబాటులో లేదు",
+  "ERROR_MAXIMUM_ACTIVITY_COUNT_EXCEEDS": "మీరు సమూహం కోసం జోడించగల గరిష్ట కార్యాచరణలను మించిపోయారు",
+  "ERROR_MAXIMUM_GROUP_COUNT_EXCEEDS": "మీరు ఉండగల గరిష్ట సమూహాల సంఖ్యను మించిపోయారు",
+  "ERROR_MAXIMUM_MEMBER_COUNT_EXCEEDS": "మీరు సమూహానికి చేర్చగల గరిష్ట సభ్యుల సంఖ్యను మించిపోయారు",
   "ERROR_NAME_INVALID": "పేరు కోసం అక్షరాలు లేదా స్పేస్ మాత్రమే నమోదు చేయండి",
   "ERROR_NO_BATCHES_FOUND": "ఈ కోర్సుకు బేచ్‌లు లేవు",
   "ERROR_NO_INTERNET_MESSAGE": "ఇంటర్నెట్టు లేదు",
   "ERROR_NO_OFFLINE_RESOURCE": "దిగుమతి అయిన వనరులు లేవు",
   "ERROR_OFFLINE_MODE": "ఇంటర్నెట్టు లేదు. ఆఫ్లైన్ ఉన్నారు.",
   "ERROR_OTP": "చెల్లని OTP. సరైన OTP ను  నమోదు చేయండి",
+  "ERROR_OTP_LIMIT_EXCEEDED": "మీరు OTP కోసం గరిష్ట పరిమితిని మించిపోయారు, దయచేసి కొంత సమయం తర్వాత ప్రయత్నించండి.",
   "ERROR_PHONE_EXISTS": "ఫోన్ నంబర్ ఇప్పటికే ఉంది. వేరైన ఫోన్ నంబర్ని నమోదు చేయండి",
   "ERROR_PHONE_INVALID": "చెల్లుబాటు అయ్యే ఫోన్ నంబర్ను నమోదు చేయండి",
+  "ERROR_PHONE_REQUIRED": "మొబైల్ నెంబర్ అవసరం",
   "ERROR_SAME_EMAIL_UPDATED": "ఈ  ఈమెయిల్   ఐడి  ఇప్పటికే మీ ప్రొఫైల్‌కు లింక్ చేయబడింది. మరొక  ఈమెయిల్  ఐడి ని నమోదు చేయండి.",
   "ERROR_SAME_PHONE_UPDATED": "ఈ మొబైల్ నంబర్‌ ఇప్పటికే మీ ప్రొఫైల్‌కు లింక్ చేయబడింది. మరొక మొబైల్ నంబర్‌ను నమోదు చేసుకోండి.",
   "ERROR_SERVER_CONNECTION": "సర్వర్‌కి కనెక్షన్ లేదు",
+  "ERROR_SPECIAL_CHARECTERS_NOT_ALLOWED": "ప్రత్యేక అక్షరాలు అనుమతించబడవు",
   "ERROR_TECHNICAL_PROBLEM": "ఏదో టెక్నికల్ సమస్య వచ్చింది",
   "ERROR_UPLOADING_IMG": "ఇమేజ్ అప్‌లోడ్ అవ్వలేదు.",
   "ERROR_USER_ACCOUNT_BLOCKED": "మీ వినియోగదారు ఖాతా నిరోధించబడింది. వివరాల కోసం మీ అడ్మినిస్ట్రేటర్ని సంప్రదించండి",
+  "ERROR_WHILE_ADDING_USER": "వినియోగదారుని జొడించేటప్పుడు లోపం",
+  "ERROR_WHILE_FETCHING_USERS": "వినియోగదారుని పొందేటప్పుడు లోపం",
   "ERROR_WHILE_LOGIN": "లాగిన్ చేస్తున్నప్పుడు లోపం",
+  "ERROR_WHILE_SWITCHING_USER": "వినియోగదారుని మార్చేటప్పుడు లోపం",
+  "EXPLORE_HEADING": "అన్వేషించండి కింది{{%s}}",
+  "EXP_VIDEOS": "వివరణ వీడియోలు",
   "EXTRACTING_CONTENT": "కంటెంట్‌ను సంగ్రహిస్తోంది",
   "FEEDBACK_HINT": "మీ అభిప్రాయం (ఐచ్ఛికం)",
   "FEEDBACK_HINT_1": "మీ అభిప్రాయము చెప్పండి",
@@ -250,23 +446,194 @@
   "FILTER": "ఫిల్టర్లు",
   "FILTER_ADDED": "సెలెక్ట్ చేసారు ",
   "FILTER_BY": "వడపోత వివరాలు",
-  "FIRST_NAME": "పేరు",
   "FOLLOW": "అనుసరించండి",
   "FORCE_UPDATE_MESSAGE": "మీరు {{%s}} ఆప్ యొక్క పాత వర్షన్ వాడుతున్నారు. దయచేసి గూగ్ల్ ప్లే స్టోర్ కి వెళ్ళి ఆప్ ని అప్‌డేట్ చెయ్యండి",
+  "FORUM": "ఫోరం",
+  "FOR_SUPPORT": "{{%s}} మద్దతు కోసం",
   "FREE_SPACE": "ఖాళి స్థలం :",
+  "FRMELEMENTS_BTN_ACTIVATEGRP": "సక్రియం చేయండి",
+  "FRMELEMENTS_BTN_ADD": "జోడించు",
+  "FRMELEMENTS_BTN_BACK": "తిరిగి",
+  "FRMELEMENTS_BTN_DEACTIVATEGRP": "నిష్క్రియం చేయండి",
+  "FRMELEMENTS_BTN_NEXT": "తరువాత",
+  "FRMELEMENTS_LBL_ACTIVATEGRP": "సమూహాన్ని సక్రియం చేయండి",
+  "FRMELEMENTS_LBL_ACTIVATEGRPQUES": "సమూహాన్ని సక్రియం చేయాలా?",
+  "FRMELEMENTS_LBL_CONTENT_TYPE": "కంటెంట్ రకం",
+  "FRMELEMENTS_LBL_DEACTIVATEGRP": "సమూహాన్ని నిష్క్రియం చేయండి",
+  "FRMELEMENTS_LBL_DEACTIVATEGRPQUES": "సమూహాన్ని నిష్క్రియం చేయాలా?",
+  "FRMELEMENTS_LBL_REMARKS": "వ్యాఖ్యలు",
+  "FRMELEMENTS_MSG_ACTIVATEGRPFAILED": "సమూహాన్ని సక్రియం చేయలేకపోయాము, తరువాత మళ్లీ ప్రయత్నించండి",
+  "FRMELEMENTS_MSG_ACTIVATEGRPMSG": "సమూహాన్ని సక్రియం చేయడం వలన క్రియాశీల సమూహాల జాబితాలో సమూహాన్ని ప్రదర్శిస్తుంది మరియు సభ్యుల పురోగతిని ట్రాక్ చేయవచ్చు",
+  "FRMELEMENTS_MSG_ACTIVATEGRPPOPUP": "ఈ సమూహం తాత్కాలికంగా నిష్క్రియం చేయబడింది.  సమూహ నిర్వాహకుడు సమూహాన్ని సక్రియం చేయవచ్చు",
+  "FRMELEMENTS_MSG_ACTIVATEGRPSUCCESS": "  విజయవంతంగా సమూహం సక్రియం చేయబడింది",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPFAILED": "సమూహాన్ని నిష్క్రియం చేయలేకపోయాము, తరువాత మళ్లీ ప్రయత్నించండి",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPMSG": "సమూహాన్ని సస్పెండ్ చేయడం క్రియాశీల సమూహాల జాబితా నుండి తీసివేయబడుతుంది మరియు మీరు దానిపై సభ్యుల పురోగతిని తనిఖీ చేయలేరు",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPSUCCESS": "సమూహం విజయవంతంగా నిష్క్రియం చేయబడింది",
+  "FRMELEMNTS_BTN_CLOSE": "ముగింపు",
+  "FRMELEMNTS_BTN_DONOT_SHARE": "భాగస్వామ్యం చేయవద్దు",
+  "FRMELEMNTS_BTN_EDIT_SETTING": "సెట్టింగులను నవీకరించండి",
+  "FRMELEMNTS_BTN_PREVIEW_FORM": "ఫారమ్‌ను పరిదృశ్యం చేయండి",
+  "FRMELEMNTS_BTN_SAVE": "సేవ్ చేయండి",
+  "FRMELEMNTS_BTN_SAVE_EDITS": "సవరణలను సేవ్ చేయండి",
+  "FRMELEMNTS_BTN_SAVE_FORM": "ఫారమ్‌ను సేవ్ చేయండి",
+  "FRMELEMNTS_BTN_SEEK_HELP": "సహాయం కోరండి",
+  "FRMELEMNTS_BTN_SUBMIT_FORM": "ఫారమ్‌ను సమర్పించండి",
+  "FRMELEMNTS_BTN_VIEW_DETAILS": "వివరాలను చూడండి",
+  "FRMELEMNTS_CKBX_CERTMSG": "ఈ సందేశం మరలా చూపించవద్దు",
+  "FRMELEMNTS_LBL_ACCESSIBILITY": "స్క్రీన్ రీడర్ యాక్సెస్",
+  "FRMELEMNTS_LBL_ACCESSIBILITYMODE": "డార్క్ మోడ్‌కు మారండి",
+  "FRMELEMNTS_LBL_ACCESSIBILITYSKIP": "ప్రధాన కంటెంట్‌కు దాటవేయి",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXT": "సైట్ మ్యాప్",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXTSIZE": "ఫాంట్ పరిమాణాన్ని పెంచండి",
+  "FRMELEMNTS_LBL_ADD_ATTACHMENTS": "జోడింపులను జోడించండి",
+  "FRMELEMNTS_LBL_ADD_ENTITY": "ఎంటిటీని జోడించండి",
+  "FRMELEMNTS_LBL_ADD_NEW_TASK": "క్రొత్త పనిని జోడించండి",
+  "FRMELEMNTS_LBL_ADD_REMARKS": "వ్యాఖ్యలను జోడించండి",
+  "FRMELEMNTS_LBL_ADD_SUBTASK": "సబ్ టాస్క్ జోడించండి",
+  "FRMELEMNTS_LBL_ADD_SUBTASK_PALCEHOLDER": "సబ్ టాస్క్ పేరుని జోడించండి",
+  "FRMELEMNTS_LBL_ADD_TASK": "టాస్క్ జోడించండి",
+  "FRMELEMNTS_LBL_ASSIGNED_TO": "కేటాయించిన",
+  "FRMELEMNTS_LBL_ASSIGN_TASK": "టాస్క్ కేటాయించండి",
+  "FRMELEMNTS_LBL_ATTACH": "అటాచ్ చేయండి",
+  "FRMELEMNTS_LBL_ATTACHMENTS": "జోడింపులు",
+  "FRMELEMNTS_LBL_BLOCK": "బ్లాక్",
+  "FRMELEMNTS_LBL_CATEGORIES": "కేటగిరీలు",
+  "FRMELEMNTS_LBL_CATEGORY_OVERVIEW": "వర్గం అవలోకనం",
+  "FRMELEMNTS_LBL_CLICK_HELP": "సహాయం బటన్ పై క్లిక్ చేయండి",
+  "FRMELEMNTS_LBL_CLICK_HERE_TO_VIEW_LIBRARY": "లైబ్రరీని చూడటానికి ఇక్కడ క్లిక్ చేయండి",
+  "FRMELEMNTS_LBL_CLUSTER": "క్లస్టర్",
+  "FRMELEMNTS_LBL_CONSENT_POPUP_INFO": "మీరు ఈ వివరాలను మీ ప్రొఫైల్ పేజీ నుండి సవరించవచ్చు",
+  "FRMELEMNTS_LBL_CONTENT_AVAIALABLE_IN_OTHER_BOARD": "మీ అవసరానికి తగినట్లుగా ఇతర బోర్డులలో ఆసక్తికరమైన కంటెంట్ ఉండవచ్చు!",
+  "FRMELEMNTS_LBL_CONTENT_FOUND": "మీ అవసరానికి సరిపోయే కొన్ని కంటెంట్‌ను మేము కనుగొన్నాము!",
+  "FRMELEMNTS_LBL_CONTENT_TO_BE_ADDED": "మీ బోర్డు ఇంకా ఎక్కువ కంటెంట్‌ను జోడించలేదు.",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT": "మీ కంటెంట్‌ను కనుగొనలేకపోయారా?  దిగువ బటన్లపై క్లిక్ చేయండి",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT_YET": "మీ కంటెంట్‌ను కనుగొనలేకపోయారా?  దిగువ బటన్లపై క్లిక్ చేయండి",
+  "FRMELEMNTS_LBL_CRITERIA_WISE": "ప్రమాణాల వారీగా",
+  "FRMELEMNTS_LBL_DATA_SETTINGS": "డేటా సెట్టింగ్‌లు",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF": "ప్రొఫైల్ డేటా భాగస్వామ్యం ఆపివేయబడింది",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF_INFO": "మీ ప్రొఫైల్ వివరాలను కోర్సు నిర్వాహకుడితో పంచుకోవడానికి మీరు అంగీకరించలేదు",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON": "ప్రొఫైల్ డేటా భాగస్వామ్యం ఆన్‌లో ఉంది",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON_INFO": "మీ ప్రొఫైల్ వివరాలను కోర్సు నిర్వాహకుడితో పంచుకోవడానికి మీరు అంగీకరించారు",
+  "FRMELEMNTS_LBL_DELETE_CONFIRMATION": "మీరు ఖచ్చితంగా మీ ఉప పనిని తొలగించాలనుకుంటున్నారా?",
+  "FRMELEMNTS_LBL_DONOT_SHARE_PROFILE_INFO": "నా ప్రొఫైల్ వివరాలను భాగస్వామ్యం చేయవద్దు",
+  "FRMELEMNTS_LBL_DURATION": "వ్యవధి",
+  "FRMELEMNTS_LBL_EMAIL_ID_PLACEHOLDER": "రాష్ట్రం / సంస్థ కోసం ఇమెయిల్ ID",
+  "FRMELEMNTS_LBL_END_DATE": "ఆఖరి తేది",
+  "FRMELEMNTS_LBL_FILES": "ఫైళ్లు",
+  "FRMELEMNTS_LBL_IMAGES": "చిత్రాలు",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS": "మెరుగుదల నివేదికలు",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS_DESC": "ప్రాజెక్టుల నివేదికలను చూడండి",
+  "FRMELEMNTS_LBL_IN_PROGRESS": "పురోగతిలో ఉంది",
+  "FRMELEMNTS_LBL_LEARNER_PASSBOOK": "అభ్యాసకుల పాస్‌బుక్",
+  "FRMELEMNTS_LBL_LEARNING_RESOURCES": "వనరులను నేర్చుకోవడం",
+  "FRMELEMNTS_LBL_LINK_LEARNING_RESOURCES": "లింక్ అభ్యాస వనరులు",
+  "FRMELEMNTS_LBL_MEDIA_TYPE": "మీడియా రకం",
+  "FRMELEMNTS_LBL_MOBILE_NUMBER_PLACEHOLDER": "రాష్ట్రం / సంస్థ కోసం మొబైల్ సంఖ్య",
+  "FRMELEMNTS_LBL_MY_LEARNINGS": "నా అభ్యాసాలు",
+  "FRMELEMNTS_LBL_NEW_TASK": "కొత్త పని",
+  "FRMELEMNTS_LBL_NO_MATCHING_CONTENT": "ఏ కంటెంట్ సరిపోలలేదు",
+  "FRMELEMNTS_LBL_OBJECTIVE": "ఆబ్జెక్టివ్",
+  "FRMELEMNTS_LBL_OBSERVATION": "పరిశీలన",
+  "FRMELEMNTS_LBL_OBSERVATION_DESC": "మీ తరగతి గది మరియు పాఠశాల పరిశీలనలను సులభంగా యాక్సెస్ చేయండి మరియు రికార్డ్ చేయండి మరియు మీ అభివృద్ధి ప్రయాణాలను ప్లాన్ చేయండి",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS": "పరిశీలన నివేదికలు",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS_DEC": "పరిశీలన నివేదికలను చూడండి",
+  "FRMELEMNTS_LBL_OBSERVE_AGAIN": "మళ్ళీ గమనించండి",
+  "FRMELEMNTS_LBL_OPEN_BATCH_NOT_RECOMMENDED": "(మీ అభ్యాస చరిత్ర మరియు ధృవపత్రాలు రీసెట్ చేయబడతాయి కాబట్టి మీరు మునుపటి బ్యాచ్‌లో ఈ కోర్సును పూర్తి చేసి ఉంటే చేరడానికి సిఫారసు చేయబడలేదు)",
+  "FRMELEMNTS_LBL_PERSONA": "పాత్ర",
+  "FRMELEMNTS_LBL_PROFCONF": "ప్రొఫైల్ పేరు నిర్ధారణ",
+  "FRMELEMNTS_LBL_PROFTITLE": "ఖాతాదారుని పేరు",
+  "FRMELEMNTS_LBL_PROGRAM_NAME": "ప్రోగ్రామ్ పేరు",
+  "FRMELEMNTS_LBL_PROJECT": "ప్రాజెక్ట్",
+  "FRMELEMNTS_LBL_PROJECT_DESCRIPTION": "పనులను సృష్టించడం మరియు సమయపాలనలను రూపొందించడం ద్వారా మీ పాఠశాల మెరుగుదలలను నిర్వహించండి మరియు ట్రాక్ చేయండి",
+  "FRMELEMNTS_LBL_PROJECT_OVERVIEW": "ప్రాజెక్టు అవలోకనం",
+  "FRMELEMNTS_LBL_PROJECT_STATUS": "ప్రాజెక్ట్ స్థితి",
+  "FRMELEMNTS_LBL_PROJECT_TITLE": "ప్రాజెక్టు యొక్క శీర్షిక",
+  "FRMELEMNTS_LBL_PROJECT_VIEW": "ప్రాజెక్ట్ వీక్షణ",
+  "FRMELEMNTS_LBL_QUESTION_WISE": "ప్రశ్న వారీగా",
+  "FRMELEMNTS_LBL_RELEVANT_CONTENT_SUB_HEADING": "మీ నిర్దిష్ట కంటెంట్ అవసరాలకు వివరాలను పూరించండి",
+  "FRMELEMNTS_LBL_REPORTS": "నివేదికలు",
+  "FRMELEMNTS_LBL_REPORTS_DESC": "నివేదికల జాబితా \"",
+  "FRMELEMNTS_LBL_REQUEST_CONTENT": "కంటెంట్‌ను అభ్యర్థించాలా?",
+  "FRMELEMNTS_LBL_SCHOOL": "పాఠశాల",
+  "FRMELEMNTS_LBL_SELECT_CATEGORIES": "వర్గాలను ఎంచుకోండి",
+  "FRMELEMNTS_LBL_SELECT_PROGRAM": "ప్రోగ్రామ్ ఎంచుకోండి",
+  "FRMELEMNTS_LBL_SET_DATE": "తేదీని సెట్ చేయండి",
+  "FRMELEMNTS_LBL_SET_DATE_HINT": "మీ ప్రాజెక్ట్ కోసం కాలక్రమం సెట్ చేయండి",
+  "FRMELEMNTS_LBL_SHARE_PROFILE_INFORMATION": "నా ప్రొఫైల్ వివరాలను పంచుకోండి",
+  "FRMELEMNTS_LBL_START_DATE": "ప్రారంబపు తేది",
+  "FRMELEMNTS_LBL_STATUS": "స్థితి",
+  "FRMELEMNTS_LBL_SUBPERSONA": "సుబ్రోల్",
+  "FRMELEMNTS_LBL_SUBTASKS": "ఉప పనులు",
+  "FRMELEMNTS_LBL_SURVEY": "సర్వే",
+  "FRMELEMNTS_LBL_SURVEY_ACTION": "సర్వే చర్యలు",
+  "FRMELEMNTS_LBL_SURVEY_DESC": "సర్వే జాబితా",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS": "సర్వే నివేదికలు",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS_DESC": "సర్వే నివేదికలను చూడండి",
+  "FRMELEMNTS_LBL_TAB_HOME": "హోమ్",
+  "FRMELEMNTS_LBL_TASK_DESCRIPTION": "టాస్క్ వివరణ",
+  "FRMELEMNTS_LBL_TASK_OVERVIEW": "టాస్క్ అవలోకనం",
+  "FRMELEMNTS_LBL_THIS_MONTH": "ఈ నెల",
+  "FRMELEMNTS_LBL_TOTAL_TASKS": "మొత్తం విధులు",
+  "FRMELEMNTS_LBL_UPCOMING": "రాబోయే",
+  "FRMELEMNTS_LBL_UPDATE_DATA_SETTINGS": "సెట్టింగులను నవీకరించండి",
+  "FRMELEMNTS_LBL_USERTYPE_LEADER": "ప్రధానోపాధ్యాయుడు & అధికారులు",
+  "FRMELEMNTS_LBL_VIEW_ENTITY_REPORT": "ఎంటిటీ నివేదికను చూడండి",
+  "FRMELEMNTS_LBL_VIEW_FULL_REPORT": "పూర్తి నివేదికను చూడండి",
+  "FRMELEMNTS_LBL_VIEW_RESOURCES": "వనరులను చూడండి",
+  "FRMELEMNTS_MSG_BATCH_ALREADY_CLOSED": "ఈ బ్యాచ్ కోసం నమోదు మూసివేయబడింది {endDate}",
+  "FRMELEMNTS_MSG_CONSENT_DECLARATION_INFO": "మీరు మీ ప్రొఫైల్ పేజీ నుండి మీ వివరాలను సవరించవచ్చు",
+  "FRMELEMNTS_MSG_DATA_SETTINGS_SUBMITED_SUCCESSFULLY": "ప్రొఫైల్ వాటా సెట్టింగులు విజయవంతంగా సమర్పించబడ్డాయి",
+  "FRMELEMNTS_MSG_DELETE_TASK_CONFIRMATION": "మీరు ఖచ్చితంగా పనిని తొలగించాలనుకుంటున్నారా?",
+  "FRMELEMNTS_MSG_EDITCERTNAME": "మీరు దీన్ని మీ ప్రొఫైల్ పేజీ నుండి సవరించవచ్చు.",
+  "FRMELEMNTS_MSG_LOAD_FROM_LIBRARY": "లైబ్రరీ నుండి లోడ్",
+  "FRMELEMNTS_MSG_NAMEONCERT": "ఈ పేరు మీ కోర్సు సర్టిఫికెట్‌లో ముద్రించబడుతుంది.  ఇది సరైనదేనా అని తనిఖీ చేయండి.",
+  "FRMELEMNTS_MSG_SELECT_IMAGE_SOURCE": "చిత్ర మూలాన్ని ఎంచుకోండి",
+  "FRMELEMNTS_MSG_SELFDECLARATION_SUCCESS_INFO": "మీకు అవసరమైతే ఈ సమాచారాన్ని మీ ప్రొఫైల్ నుండి సవరించవచ్చు",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED": "విజయవంతంగా జోడించబడింది",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_SYNCED": "ప్రాజెక్ట్ విజయవంతంగా సమకాలీకరించబడింది",
+  "FRMELEMNTS_MSG_TICKET_SUBMISSION_SUCCESS": "మీ అభిప్రాయాన్ని మేము అభినందిస్తున్నాము.  మేము ప్రతి నివేదికకు ప్రతిస్పందించలేము, కానీ మీ సమర్పణలు {{app_name}} అందరికీ మంచిగా చేయడానికి మాకు సహాయపడతాయి.",
+  "FRMELEMNTS_MSG_UNABLE_TO_ENROLL": "ఇప్పుడే నమోదు చేయలేరు.  తరువాత మళ్ళీ ప్రయత్నించండి",
+  "FRMELEMNTS_MSG_UPDATED_SUCCESSFULLY": "విజయవంతంగా నవీకరించబడింది",
+  "FRMELEMNTS_MSG_USER_CREATION_LIMIT_EXCEEDED": "వినియోగదారు సృష్టి పరిమితి మించిపోయింది",
+  "FRMELEMNTS_MSG_USE_CAMERA": "కెమెరాను ఉపయోగించండి",
+  "FRMELEMNTS_MSG_USE_FILE": "ఫైల్ ఉపయోగించండి",
+  "FRMELEMNTS_MSG_YOUR_CHANGES_ARE_SAVED": "మీ మార్పులు విజయవంతంగా సేవ్ చేయబడ్డాయి.",
+  "FRMELENTS_LBL_ACCESSIBILITYNORMALMODE": "లైట్ మోడ్‌కు మారండి",
+  "FRMELMNTS_BLTPT_EARNCERT": "రాష్ట్ర వినియోగదారులకు మాత్రమే {{STATE}}ధృవపత్రాలు ఇవ్వబడతాయి",
+  "FRMELMNTS_BLTPT_EARNCERT2": "మీ అన్ని మదింపులలో  {percentage} పైన స్కోరు చేయండి",
+  "FRMELMNTS_BLTPT_EARNCERT3": "ప్రమాణపత్రాన్ని సంపాదించడానికి మీరు అంచనా {attempts} సార్లు మాత్రమే ప్రయత్నించవచ్చు.",
+  "FRMELMNTS_IMSG_DECLAREINFO": "ఈ కోర్సు కోసం ధృవపత్రాలు రాష్ట్రంచే గుర్తించబడిన ఉపాధ్యాయులకు మాత్రమే ఇవ్వబడతాయి",
+  "FRMELMNTS_IMSG_LASTATTMPALRT": "ఇది మిగిలి ఉన్న చివరి ప్రయత్నం",
+  "FRMELMNTS_IMSG_LASTATTMPTEXCD": "మీరు సమర్పించగల గరిష్ట ప్రయత్నాలను మించిపోయారు",
+  "FRMELMNTS_LBL_ACCESSIBILITYFNTDFLT": "డిఫాల్ట్ రీసెట్",
+  "FRMELMNTS_LBL_ACCESSIBILITYFONT": "ఫాంట్ పరిమాణాన్ని తగ్గించండి",
+  "FRMELMNTS_LBL_AVSCORE": "ఉత్తమ అంచనా స్కోర్‌ల సగటు",
+  "FRMELMNTS_LBL_BESTSCORE": "ఉత్తమ స్కోరు{{SCORE}}",
+  "FRMELMNTS_LBL_CERTQUES": "మీరు మీ ప్రమాణపత్రాన్ని ఎలా సంపాదిస్తారు?",
+  "FRMELMNTS_LBL_NOTIFNUMBER": "{Number} కొత్త నోటిఫికేషన్ (s)",
+  "FRMELMNTS_LBL_SEELESS": "తక్కువ చూడండి",
+  "FRMELMNTS_LBL_SEEMORE": "ఇంకా చూడుము",
+  "FRMELMNTS_LBL_STATEUSERQUES": "మీరు రాష్ట్ర ఉపాధ్యాయులా?",
+  "FRMELMNTS_LNK_DECLARELINK": "ఇప్పుడే ప్రకటించండి",
+  "FRMELMNTS_PRMPT_DECLAREPROMPT": "ధృవీకరణ పత్రాన్ని సంపాదించడానికి మీ సమాచారాన్ని {instance}లో ప్రకటించండి",
+  "FRMELMNTS_SCTTL_NOTIFHEADER": "నోటిఫికేషన్‌లు",
   "FROM": "మొదలు తేదీ",
   "FULL_NAME": "పేరు",
+  "GET_STARTED": "మొదలు పెట్టు",
   "GOT_IT": "అర్ధమైంది",
+  "GO_TO_DOWNLOADS": "డౌన్‌లోడ్‌లకు వెళ్లండి",
+  "GO_TO_PROFILE": "ప్రోఫైల్ కు వెళ్ళండి ",
   "GRADE_OPTION_TEXT": "తరగతిని ఎన్నుకోండి ",
   "GRANT_ACCESS": "ప్రవేశాన్ని ఆమోదించండి",
-  "GROUPS": "గుంపులు",
-  "GROUPS_YOU_FOLLOW": "మీరు అనుసరిస్తున్నగుంపులు",
-  "GROUP_CREATE_SUCCESS": "గుంపు సృష్టించబడింది",
-  "GROUP_DELETE_CONFIRM": "'{{%s}}' తొలగించ వచ్చునా?",
-  "GROUP_DELETE_CONFIRM_MESSAGE": "గుంపును మాత్రమే తొలగిస్తున్నారు, అందులో వాడకందారులను కాదు",
-  "GROUP_MEMBER_ADD_SUCCESS": "గుంపులో సభ్యులు చేర్చబడ్డారు",
-  "GROUP_MEMBER_DELETE_SUCCESS": "గుంపులో సభులు తొలగొంచబడ్డారు",
+  "GROUP_CREATED": "సమూహం విజయవంతంగా సృష్టించబడింది",
+  "GROUP_CREATED_BY": "సృష్టికర్త",
+  "GROUP_DESCRIPTION": "గ్రూపు వివరణ",
+  "GROUP_DESCRIPTION_PLACEHOLDER": "సమూహం యొక్క ఉద్ధేశ్యాన్ని అర్థం చెసుకోవడానికి సభ్యులకు సహయపడటానికి వివరణను నమోదు చేయండి",
+  "GROUP_GUIDELINES": "సమూహ మార్గదర్శకాలు",
+  "GROUP_MEMBER_SEARCH_PLACEHOLDER": "గుంపులో శోధన",
   "GROUP_NAME": "గుంపు పేరు",
+  "GROUP_NAME_IS_REQUIRED": "మీ గ్రూపు పేరు రాయండి",
+  "GROUP_TERMS_IS_REQUIRED": "మీరు కొనసాగడానికి ముందు {{app_name}} సేవా నిబంధనలను అంగీకరించాలి",
   "GROUP_UPDATE_SUCCESS": "సమూహ వివరాలు విజయవంతంగా నవీకరించబడ్డాయి",
   "HABIT_REMINDER_NOTIFICATION_MESSAGE": "నేడు {{%s}} లో కొత్త విషయాలు నేర్చుకోండి!",
   "HELP": "సహాయం",
@@ -275,8 +642,9 @@
   "HIDE_CREDITS_INFO": "లైసెన్సింగ్ సమాచారం చూపొద్దు",
   "HINT_LANGUAGE": "కావలసిన భాషని ఎన్నుకోండి",
   "HOBBIES": "అభిరుచులు",
-  "IAM_ABOVE_18_YEARS_AGE": "నా వయస్సు 18 సంవత్సరాలు పైబడి ఉంది",
-  "IF_YES_LOGIN": "అవును అయితే, లాగిన్ క్లిక్ చేయండి",
+  "HOURS_AGO": "{{%s}} గంటల క్రితం",
+  "HOUR_AGO": "{{%s}} గంట క్రితం",
+  "ID_IS_REQUIRED": "ID అవసరం",
   "IMPORTING": "దిగుమతి అవుతోంది ...",
   "IMPORTING_COUNT": "దిగుమతి అవుతోంది",
   "IMPORT_ECAR": "అననుకూల ఫైల్ ఫార్మాట్. మీరు కేవలం .ecar, .epar  మరియు .gsa ఫైళ్లు మాత్రమే దిగుమతి చేసుకోవచ్చు",
@@ -285,59 +653,97 @@
   "INACTIVE": "ఆక్టివ్ కాదు",
   "INCORRECT_TEACHER_ID_ERROR": "మీరు తప్పు ID ని నమోదు చేసారు. ID ని మళ్ళీ నమోదు చేయండి",
   "INSTALL_CROSSWALK": "క్రాస్వాక్ను ఇన్స్టాల్ చేయండి",
+  "INSTANCE_TERMS_OF_USE": "{{app_name}} ఉపయోగ నిబంధనలు",
   "INSUFFICIENT_STORAGE": "తగినంత స్టోరేజి స్థలం లేదు",
   "INTERACTION": "పరస్పర చర్యలు",
+  "INTERACTIVE_MATERIAL": "ఇంటరాక్టివ్ స్టడీ మెటీరియల్",
   "INTERNAL_MEMORY": "అంతర్గత స్టోరేజి",
   "INTERNET_AVAILABLE": "మీరు ఇప్పుడు ఆన్లైన్లో ఉన్నారు",
   "INTERNET_CONNECTIVITY_NEEDED": "ఇంటర్నెట్ కనెక్టివిటీ అవసరం",
   "INVALID_CONTENT": "కంటెంటు సరిగా లేదు",
   "INVALID_FORMAT": "చెల్లని ఆకృతి",
+  "INVALID_MEMBER_ID": "మీరు చెల్లని ID ని నమోదు చేసారు {{app_name}}",
   "INVALID_QR": "చెల్లని QR కోడ్",
   "ITEMS": "{{%s}} ఫైల్/ఫైల్స్",
   "ITEMS_SELECTED": "ఫైల్లు ఎంచుకోబడ్డాయి",
+  "I_AGREE_TO": "నేను {{app_name}}  అంగీకరిస్తున్నాను",
   "I_AGREE_TO_TNC": "నేను ఉపయోగ నిబంధనలు మరియు షరతులకు అంగీకరిస్తున్నాను",
+  "I_AM_A_PERSONA_WITH_TENANT": "నేను {{%persona}} తో {{%tenant}}",
+  "I_UNDERSTAND_AND_ACCEPT": "నాకు అర్థం అయింది మరియు అంగికరిస్తాను",
   "JOIN_TRAINING": "శిక్షణలో చేరండి",
   "LANGUAGE": "భాష",
   "LANGUAGE_SETTINGS": "భాష సెట్టింగ్స్",
   "LAST_DATE_TO_JOIN": "చేరడానికి చివరి తేదీ",
   "LAST_SYNC": "చివరిసారి సింక్ అయిన సమయం",
+  "LAST_UPDATED": "చివరిగా నవీకరించబడింది:{{%s}}",
   "LAST_VIEWED": "చివరిగా వీక్షించారు",
   "LATEST_COURSES": "తాజా కోర్సులు",
+  "LEAVE_GROUP": "గ్రూపును వదిలి వెళ్ళు ",
+  "LEAVE_GROUP_ERROR_MSG": "సమూహాన్ని వదిలి వెళ్ళలేకపోయాము. తరువాత మళ్ళీ ప్రయత్నించండి",
+  "LEAVE_GROUP_POPUP_DESC": "ఈ చర్య రద్దు చేయబడదు.  మీరు బయలుదేరాలనుకుంటున్నారా?",
+  "LEAVE_GROUP_POPUP_TITLE": "బృందాన్ని వదులు?",
+  "LEAVE_GROUP_SUCCESS_MSG": "మీరు ఇకపై ఈ గ్రూపులో భాగం కాదు",
   "LEAVE_TRAINING_HEADING": "శిక్షణను వదిలివేయాలా?",
   "LIBRARY_BNAV": "లైబ్రరీ",
   "LICENSE": "లైసెన్స్",
   "LOAD": "లోడ్",
+  "LOADER_PROGRESS_DESCRIPTION": "మేము విషయాలు సిద్ధం చేస్తున్నాము.",
+  "LOADER_PROGRESS_DESC_SUB_HEADING": "దయచేసి వేచి ఉండండి",
   "LOADING_CONTENT": "కంటెంటు లోడ్ అవుతోంది",
   "LOADING_CONTENTS": "కంటెంటు లోడ్ అవుతోంది {{%s}} %",
-  "LOADING_USER_LIST": "వాడకందారుల జాబితా లోడ్ అవుతోంది, దయచేసి వేచి ఉండండి",
   "LOAD_FILE": "ఫైల్‌ను లోడ్ చేయండి",
-  "LOGGED_IN_AS": "లాగిన్ అయిన ఎకౌంట్",
-  "LOGGED_OUT": "లాగౌట్ అయ్యారు",
+  "LOGGED_IN_MEMBER": "{{member_name}} (మీరు)",
+  "LOGIN_TO_CREATE_GROUP_DESCRIPTION": "మీ స్వంత సమూహం, స్టడీ సర్కిల్ లేదా తరగతి గదిని సృష్టించే మొదటి అడుగు లాగిన్ అవ్వడం",
+  "LOGIN_TO_JOIN_TRAINING": "కోర్సులో చేరడానికి లాగిన్ అవ్వండి",
   "LOGOUT": "లాగౌట్",
   "LOW_BANDWIDTH": "తక్కువ బ్యాండ్విడ్త్",
   "LOW_BANDWIDTH_DETECTED": "తక్కువ బ్యాండ్విడ్త్ నెట్వర్క్ కనుగొనబడింది",
-  "MARKS": "మార్కులు",
+  "MAINTENANCE_MESSAGE": "మేము ప్రస్తుతం నిర్వహణ కోసం దిగుతున్నాము, కాని చింతించకండి మేము {{%timeLeft}}. గంటల్లో ఉంటాము. త్వరగ తిరిగి రా!",
+  "MAINTENANCE_SUB_TEXT": "ఈ సమయంలో మీరు డౌన్‌లోడ్ చేసిన కంటెంట్‌ను ఇప్పటికీ యాక్సెస్ చేయవచ్చు",
+  "MAKE_ADMIN": "అడ్మిన్ గా చేయండి ",
+  "MAKE_GROUP_ADMIN_ERROR_MSG": " {{member_name}} సమూహ నిర్వాహకుడిగా   చేయలేరు",
+  "MAKE_GROUP_ADMIN_POPUP_DESC": "ఈ చర్య గ్రూప్ అడ్మిన్ కు {{member_name}} అనుమతి ఇస్తుంది",
+  "MAKE_GROUP_ADMIN_POPUP_TITLE": "గ్రూపు అడ్మిన్ గా  చేయాలా?",
+  "MAKE_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} ఇప్పుడు సమూహ నిర్వాహకుడు",
   "MEDIUM": "మాధ్యమం",
   "MEDIUM_OF_INSTRUCTION": "బోధనా మాధ్యమం",
   "MEDIUM_OPTION_TEXT": "బోధనా మాధ్యమం ఎన్నుకోండి",
+  "MEMBERS": "సభ్యులు",
+  "MEMBER_ADDED_TO_GROUP": "సభ్యుడు సమూహానికి విజయవంతంగా జోడించబడ్డారు",
+  "MEMBER_ALREADY_EXISTS_IN_GROUP": "ఈ సభ్యుడు ఇప్పటికే గుంపులో చేర్చబడ్డారు.",
+  "MEMBER_ID": "{{app_name}} ID",
+  "MENU_DELETE_GROUP": "గ్రూపును తీసివేయు",
+  "MENU_DISMISS_AS_GROUP_ADMIN": "గ్రూపు అడ్మిన్ గా  తీసివేయు",
+  "MENU_EDIT_GROUP_DETAILS": "సమూహ వివరాలను సవరించండి",
+  "MENU_LEAVE_GROUP": "గ్రూపు వదిలి వెళ్ళు",
+  "MENU_MAKE_GROUP_ADMIN": "సమూహ నిర్వాహకుడిని చేయండి",
+  "MENU_REMOVE_ACTIVITY": " కార్యకలపాలు తొలగించు",
+  "MENU_REMOVE_FROM_GROUP": "గ్రూపు నుండి తొలగించు",
   "MERGE_ACCOUNT": "ఖాతాను విలీనం చేయండి",
   "MICROPHONE": "మైక్రోఫోన్",
   "MICROPHONE_PERMISSION_DESCRIPTION": "వాయిస్ రికార్డ్ చేయగల కంటెంట్లో మాత్రమే {{%s}} మైక్రోఫోన్ ప్రాప్యతను  వినియోగిస్తుంది.",
+  "MINUTES_AGO": "{{%s}} నిమిషాల ముందు",
+  "MINUTE_AGO": "{{%s}} నిమిషం క్రితం",
+  "MONTHS_AGO": "{{%s}} నెలల క్రితం",
+  "MONTH_AGO": " {{%s}} నెల క్రితం",
   "MORE": "మరింత",
   "MORE_CONTENT": "{{%s}} లో మరిన్ని పుస్తకాలు మరియు కంటెంట్‌ను కనుగొనండి",
+  "MORE_COUNT": "మరింత({{%s}})",
   "MORE_DETAILS": "మరిన్ని వివరాలు (మరింత సమాచారం అందించండి లేదా సమస్య యొక్క స్క్రీన్షాట్ను అటాచ్ చేయండి)",
   "MOVE": "కదలిక",
   "MOVE_FILES_TO_OTHER_DESTINATION": "ఖాళీ స్థలం కోసం  ఫైళ్లను {{%s}} కి తరలించండి",
   "MSG_ALREADY_IMPORTED": "ఇంతకుముందే ఇంపోర్ట్ అయ్యింది ",
   "MSG_IMPORTED_SUCCESSFULLY": "కంటెంటు సరిగా ఇంపోర్ట్ అయింది",
-  "MSG_LOADING_BATCHES": "లోడ్ అవుతున్నాయి",
   "MSG_NO_DETAILS_TO_SHOW": "వివరాలు లేవు",
   "MSG_NO_NEW_NOTIFICATION": "కొత్త ప్రకటనలేం లేవు",
   "MSG_RESOURCE_DELETED": "కంటెంటు తొలగించబడింది",
   "MULTIPLE_LICENSE": "లైసెన్స్ నిబంధనలు {{%s}}",
   "MY_BADGES": "బాడ్జిలు",
+  "MY_DETAILS": "నా వివరాలు",
+  "MY_GROUPS": "నా సమూహాలు",
   "NAME": "పేరు",
   "NAME_HINT": "మీ పేరు ఇవ్వండి",
+  "NAME_IS_REQUIRED": "మీరు వినియోగదారు పేరును నమోదు చేయాలి.",
   "NEED_INTERNET_FOR_DEEPLINK_CONTENT": "మీరు ఆఫ్‌లైన్‌లో ఉన్నారు. కంటెంట్‌ను పొందడానికి  ఇంటర్నెట్‌కు కనెక్ట్ చేయండి .",
   "NEED_INTERNET_TO_CHANGE": "ఇంటర్నెట్ లేదు. వైఫై కాని మొబైల్ డాటా కాని ఉందేమో చూసి తిరిగి ప్రయత్నించండి",
   "NEW": "కొత్తది",
@@ -345,36 +751,32 @@
   "NEXT": "ముందుకు సాగు",
   "NIL": "ఏమీ లేదు",
   "NO": "కాదు",
+  "NOTE": "గమనిక",
   "NOTIFICATION": "నోటిఫికేషన్",
   "NOT_AVAILABLE": "అందుబాటులో లేదు",
   "NOT_NOW": "ఇప్పుడు కాదు",
   "NO_APP_FOR_INTENT": "ఫైల్ ఓపెన్ చేయడానికి ఏ అప్లికేషన్ అందుబాటులో లేదు",
-  "NO_ASSESSMENT": "పరీక్షా ఫలితాలేవీ లేవు",
   "NO_BATCHES_AVAILABLE": "బ్యాచ్లు అందుబాటులో లేవు",
   "NO_BOOKS_AVAILABLE": "బోర్డు పుస్తకాలను జోడిస్తోంది",
   "NO_BOOKS_DEFINITION": "మీ బోర్డు ఇంకా ఎక్కువ పుస్తకాలను జోడించలేదు.{{%s}}  లో మరిన్ని పుస్తకాలు మరియు కంటెంట్‌ను చూడటానికి బటన్‌ను నొక్కండి.",
+  "NO_BOOKS_TEXT": "మీ విషయం యొక్క పాఠ్య పుస్తకం కనుగొనేందుకు కాలేదు{{%s}}?",
   "NO_CONTENTS": "{{%s}} లేవు",
   "NO_CONTENTS_FOUND": "కంటెంటు దొరకలేదు",
   "NO_CONTENTS_MESSAGE": "మరొక కంటెంట్ రకాన్ని ఎంచుకోండి",
+  "NO_CONTENT_AVAILABLE_IN_MODULE": "ఈ మాడ్యూల్‌లో కంటెంట్ అందుబాటులో లేదు.",
+  "NO_COURSES": "కోర్సులు లేవు",
   "NO_DATA_FOUND": "సమాచారం దొరకలేదు",
-  "NO_DESCRIPTION": "వివరణ లేదు",
   "NO_DOWNLOADS": "ఇంకా డౌన్లోడ్లు లేవు",
   "NO_DOWNLOADS_INFO": "కోర్సులు లేదా లైబ్రరీ నుండి కంటెంట్ను డౌన్లోడ్ చేయండి",
   "NO_FILTERS_SELECTED": "ఏ ఫిల్టరూ సెలెక్ట్ చెయ్యలేదు",
-  "NO_GROUPS_CREATED_YET": "గుంపులు లేవు",
-  "NO_GROUP_MESSAGE": "వాడకందారులను  ఒక పద్ధతిలో పెట్టి, వారి ప్రగతిని సులువుగా కనిపెట్టేందుకు గుంపులు ఉపయోగపడతాయి",
   "NO_INTERNET": "ఇంటర్నెట్ లేదు",
   "NO_INTERNET_TITLE": "ఇంటర్నెట్ లేదు",
   "NO_PREVIEW": "ప్రివ్యూ లేదు",
   "NO_QR_CODE": "నాకు QR కోడ్ లేదు",
   "NO_QR_CODE_QSTN": "QR కోడ్ లేదా?",
   "NO_RATING": "రేటింగ్ లేదు",
-  "NO_USERS": "సభ్యులు లేరు",
-  "NO_USERS_CREATED_YET": "వాడకందారులు లేరు",
-  "NO_USERS_CREATED_YET_MSG": "మీ విద్యార్థులకు కానీ ఉపాధ్యాయులకు కానీ గెస్ట్ ఎకౌంట్లు  తయారు చేయవచ్చు",
-  "NO_USERS_IN_THIS_GROUP": "ఈ గుంపులో సభ్యులు లేరు",
-  "NO_USERS_ON_THIS_DEVICE": "వాడకందారులు లేరు",
-  "NO_USERS_SUGGESTION_MESSAGE": "గుంపులో కనీసం ఒక వాడకందారు ఉండాలి",
+  "NUMBER_OF_COURSES": "కోర్సులు ({{%s}})",
+  "NUMBER_OF_COURSE_1": "కోర్సు ({{%s}})",
   "NUMBER_OF_VOTES": "ఓట్ల సంఖ్య",
   "OFF": "ఆఫ్",
   "OFFLINE_DOWNLOAD_MESSAGE": "ఇంటర్నెట్ కనెక్టివిటీ ఉన్నప్పుడు డౌన్లోడ్లు స్వయంచాలకంగా పునఃప్రారంభమవుతాయి",
@@ -382,6 +784,8 @@
   "OFFLINE_WARNING_ETBUI": "దయచేసి కంటెంట్ను వీక్షించడానికి ఇంటర్నెట్కు కనెక్ట్ చేయండి",
   "OFFLINE_WARNING_ETBUI_1": "కంటెంట్ను వీక్షించడానికి ఇంటర్నెట్కు కనెక్ట్ చేయండి",
   "OKAY": "సరే",
+  "ONGOING": "కొనసాగుతున్న",
+  "ONLY_DIGIT_NUMBER_IS_ALLOWED": "11 అంకెల సంఖ్య మాత్రమే అనుమతించబడుతుంది",
   "ONLY_DOWNLOADED_CONTENT_CAN_BE_PLAYED_OFFLINE": "ఆఫ్లైన్లో ఉన్నప్పుడు డౌన్లోడ్ చేసిన కంటెంట్ మాత్రమే ఉపయోగించవచ్చు",
   "OPEN": "ఓపెన్ చెయ్యండి",
   "OPEN_SETTINGS": "సెట్టింగ్సు ఓపెన్ చెయ్యండి",
@@ -392,7 +796,6 @@
   "ORIGINAL_CONTENT_DATA": "ఈ కంటెంట్ దీని నుండి తీసుకోబడింది:",
   "OTHER_ROLE_DESC_1": "డిజిటల్ కంటెంట్‌ను బ్రౌజ్ చేయండి",
   "OTHER_ROLE_DESC_2": "ఆన్‌లైన్ శిక్షణ తీసుకోండి",
-  "OTHER_USERS": "ఇతర వాడకందారులు",
   "OTP_FAILED": "otp ని ధృవీకరించడంలో విఫలమైంది. తరువాత మళ్ళీ ప్రయత్నించండి",
   "OTP_PLACEHOLDER": "OTP ను నమోదు చేయండి",
   "OTP_RESENT": "OTP  తిరిగి పంపబడింది",
@@ -415,32 +818,40 @@
   "PHONE_EDIT_SUCCESS": "మొబైల్ నంబర్ విజయవంతంగా నవీకరించబడింది",
   "PHONE_PLACEHOLDER": "ఫోను నంబరు",
   "PHONE_UPDATE_SUCCESS": "ఫోన్ నంబర్ విజయవంతంగా నవీకరించబడింది",
+  "PLANNED_MAINTENANCE_TEXT": "మేము ప్రస్తుతం నిర్వహణ కోసం దిగుతున్నాము, కాని చింతించకండి మేము త్వరలోనే వస్తాము",
+  "PLANNED_MAINTENANCE_TEXT_WITH_TIME": "మేము ప్రస్తుతం నిర్వహణ కోసం దిగుతున్నాము, కాని చింతించకండి",
   "PLAY": "ప్లే చెయ్యండి",
   "PLAY_AS": "ప్రస్తుత వాడకందారు",
   "PLAY_FROM_DEVICE": "పరికరం నుండి ప్లే చేయండి",
   "PLAY_ONLINE": "ప్లే ఆన్లైన్ ",
   "PLEASE_DOWNLOAD_TO_PLAY": "దయచేసి ప్లే చేయడానికి డౌన్లోడ్ చేయండి",
+  "PLEASE_ENTER": "దయచేసి{{%s}}నమోదు చెయ్యండి ",
+  "PLEASE_PROVIDE_FOLLOWING_DETAILS": "దయచేసి ఈ క్రింది వివరాలను అందించండి.",
   "PLEASE_SELECT": "{{%s}} ఎన్నుకోండి",
   "PLEASE_SELECT_A_LANGUAGE": "భాషను ఎన్నుకోండి",
-  "PLEASE_SELECT_USER": "వాడకందారును ఎన్నుకోండి",
+  "PLEASE_VALIDATE_YOUR_EMAIL_ADDRESS": "దయచేసి మీ ఇమెయిల్ చిరునామాను ధృవీకరించండి",
+  "PLEASE_VALIDATE_YOUR_MOBILE_NUMBER": "దయచేసి మీ మొబైల్ నంబర్‌ను ధృవీకరించండి",
   "POPULAR_COURSES": "జనాదరణ పొందిన కోర్సులు",
+  "POWER_OF_GROUPS": "మీరు ఇంకా సమూహాల సామర్థ్యాన్ని అన్వేషించారా?",
+  "PREFERENCES_CAN_BE_UPDATED": "మీరు ఈ వినియోగదారు వివరాలను ప్రొఫైల్ పేజీ నుండి సవరించవచ్చు.",
   "PREVIEWS": "ప్రివ్యూలు",
   "PREVIOUS_USER_SETTINGS": "ముందున్న యూజర్ సెట్టింగులను వాడతారా?",
   "PRINT": "ముద్రణ",
-  "PRIVATE": "ప్రైవేట్",
+  "PRIVACY_POLICY": "గోప్యతా విధానం",
   "PROFILE_BNAV": "ప్రొఫైలు",
   "PROFILE_DETAILS_TITLE": "ప్రొఫైల్ వివరాలు",
   "PROFILE_UPDATE_FAILED": "ప్రొఫైల్ అప్‌డేట్ కాలేదు. మళ్ళీ ప్రయత్నించండి.",
   "PROFILE_UPDATE_SUCCESS": "ప్రొఫైల్ అప్‌డేట్ అయ్యింది.",
+  "PROGRAMS_DESC": "మీ ప్రదేశంలో చురుకుగా మరియు మీ పాత్ర కోసం రూపొందించిన విద్యా కార్యక్రమాలను వీక్షించండి మరియు పాల్గొనండి",
+  "PROGRESS_CANNOT_BE_TRACKED": "<span>Note :</span>\nపాఠ్యపుస్తకాల కోసం పురోగతిని ట్రాక్ చేయడం సాధ్యం కాదు",
   "PROVIDE_BELOW_INFO": "దిగువ సమాచారాన్ని అందించండి",
   "PUBLIC": "పబ్లిక్",
   "PUBLISHED_BY": "{{%s}} ద్వారా ప్రచురించబడింది",
   "PUBLISHED_DATE": "ప్రచురించిన తేదీ",
+  "PUBLISHER": "ప్రచురణకర్త",
   "QR_CODE_DETAILS": "దీన్ని మీ పాఠ్యపుస్తకాల్లో చూడవచ్చు. కంటెంట్‌ను తక్షణమే చేరుకోవడానికి స్కాన్ చేయండి",
   "QR_SHOWING_MULTIPLE_BOOK_RESULT": "కోసం {{%s}} ఫలితాలను చూపుతోంది",
-  "QUESTION": "ప్రశ్న",
-  "QUESTIONS": "ప్రశ్నలు",
-  "QUESTION_MARKS": "ప్రశ్న",
+  "QUES_BANKS": "ప్రశ్న బ్యాంకులు",
   "QUIZ": "క్విజ్",
   "QUIZ_CONTENTS_ONLY_REGISTERED_USERS": "ఈ క్విజ్ నమోదిత వినియోగదారులకు మాత్రమే",
   "RATE": "రేట్",
@@ -449,7 +860,7 @@
   "RATING_QUESTION": "మీరు మాకు మరింత చెప్పాలనుకుంటున్నారా?",
   "READ_LESS": "తక్కువ చూపించు ",
   "READ_MORE": "ఇంకా చదవండి...",
-  "RECENTLY_VIEWED": "ఇటీవల వీక్షించారు",
+  "RECOMMENDATION_BASED_ON_PROFILE": " మీ ప్రొపైల్ ఆధారంగా సిఫార్సులు",
   "RECOMMENDED": "సిఫార్సులు",
   "RECOVERY_ACCOUNT_UPDATE_SUCCESS": "రికవరీ ఖాతా విజయవంతంగా నవీకరించబడింది",
   "RECOVERY_ID_DESCRIPTION": "మీరు లాక్ అవుట్ అయితే ప్రాప్యతను తిరిగి పొందడానికి రికవరీ ఖాతా మీకు సహాయపడుతుంది. మీ రికవరీ ఖాతా రకాన్ని ఎంచుకోండి మరియు వివరాలను నమోదు చేయండి:",
@@ -457,15 +868,23 @@
   "REDO_ASSESSMENT": "పరీక్ష మళ్ళీ రాయండి ",
   "REGISTER_TO_COMPLETE_ACCESS": "కంటెంట్‌కు పూర్తి ప్రాప్యత పొందడానికి నమోదు చేయండి",
   "REMOVE": "తొలగించు",
+  "REMOVE_ACTIVITY": "తొలగించు",
+  "REMOVE_ACTIVITY_ERROR_MSG": "కార్యాచరణను తొలగించడం సాధ్యం కాలేదు. తరువాత మళ్ళీ ప్రయత్నించండి",
+  "REMOVE_ACTIVITY_GROUP_DESC": "కార్యాచరణను తీసివేయడం సమూహ కార్యాచరణ నుండి తీసివేయబడుతుంది మరియు మీరు ఇకపై సభ్యుల పురోగతిని తనిఖీ చేయలేరు",
+  "REMOVE_ACTIVITY_POPUP_TITLE": "కార్యాచరణను తొలగించాలా?",
+  "REMOVE_ACTIVITY_SUCCESS_MSG": "సమూహం నుండి కార్యాచరణ విజయవంతంగా తొలగించబడింది",
   "REMOVE_FROM_DEVICE": "డివైస్ నుండి తొలగించు",
   "REMOVE_FROM_DEVICE_MSG": "డివైస్ నుంచి తొలగించు",
-  "REMOVE_MULTIPLE_USERS_FROM_GROUP": "{{%s}} వాడకందారులు తొలగించబడతారు, సరేనా?",
-  "REMOVE_USERS": "వాడకందార్లను తొలగించాలి",
-  "REMOVE_USERS_FROM_GROUP": "{{%s}} వాడకందార్లను గుంపునుంచి తొలగించు",
-  "REPORTS": "రిపోర్టులు",
+  "REMOVE_MEMBER": "సభ్యుని తొలగించు",
+  "REMOVE_MEMBER_ERROR_MSG": "గ్రూపు నుండి సభ్యుడిని తొలగించడం సాధ్యం కాలేదు. తరువాత మళ్ళీ ప్రయత్నించండి",
+  "REMOVE_MEMBER_GROUP_DESC": "{{member_name}} ను తొలగించడం వలన అతన్ని / ఆమెను సమూహం నుండి శాశ్వతంగా తొలగిస్తుంది",
+  "REMOVE_MEMBER_POPUP_TITLE": "సభ్యుని  తీసివేయాల?",
+  "REMOVE_MEMBER_SUCCESS_MSG": "{{member_name}} ఇకపై సమూహంలో భాగం కాదు",
+  "REQUEST_CONTENT": "మాకు ఇక్కడ తెలియజేయండి",
   "RESEND_OTP": "OTP ను మళ్ళీ పంపు",
+  "RESET": "రీసెట్ చేయండి",
   "RESOURCE_TYPE": "ఎలాంటి వనరు",
-  "RESULT": "ఫలితం",
+  "RESPONSE_ACKNOWLEGED": "మీ యొక్క ప్రతిస్పందనకు ధన్యవాదములు!",
   "RESULTS": "ఫలితాలు",
   "RESUME": "మళ్ళీ మొదలుపెట్టు",
   "RETRY": "మళ్లీ ప్రయత్నించు",
@@ -473,23 +892,30 @@
   "ROLE_SELECTOR_QUERY": "మీరు ఎవరు",
   "SAVE": "సేవ్ చెయ్యండి",
   "SAVED_ON": "సేవ్ చేసిన తేదీ",
-  "SAVED_RESOURCES": "సేవ్ అయిన వనరులు",
   "SAVE_FILE_ON_DEVICE": "పరికరంలో ఫైల్‌ను సేవ్ చేయండి",
   "SCAN_QR_CODE": "కోడ్‌ను స్కాన్ చేయండి",
   "SCAN_QR_INSTRUCTION": "మీ పరికరాన్ని ఉపయోగించి క్యూఆర్ కోడ్‌ను స్కాన్ చేయండి",
   "SCAN_TAP": "స్కాన్ చేయడానికి నొక్కండి",
-  "SCORE": "స్కోరు",
-  "SCORED": "స్కోరు",
+  "SCHOOL_OR_ORG_NAME": "స్కూలు/సంస్థ పేరు",
+  "SCHOOL_UDISE_ID_OR_ORG_ID": "స్కూలు  UDISE ID/ సంస్థ ID",
   "SD_CARD": "SD కార్డు",
+  "SEARCH_FOR_GROUP_MEMBER": "సమూహ సభ్యుని కోసం శోధించండి.",
   "SEARCH_HINT": "వెతకండి",
   "SEARCH_PLACEHOLDER": "కంటెంట్‌ను వెతకడానికి ఇక్కడ టైప్ చేయండి",
   "SEARCH_TO_FIND_CONTENT": "కంటెంట్‌ కనుగొనడానికి {{%s}} ను శోధించండి",
+  "SECONDS_AGO": "{{%s}} సెకన్ల క్రితం",
+  "SECOND_AGO": "సెకన్ల క్రితం",
   "SEE_ALL_RESULTS_FOR": "\"{{%s}}\" కోసం అన్ని ఫలితాలను చూడండి",
+  "SEE_MORE_BOOKS": "మరిన్ని పుస్తకాలు మరియు కంటెంట్ చూడండి",
+  "SEE_MORE_CONTENT": "మరింత కంటెంట్ చూడండి",
   "SELECT": "ఎన్నుకోండి",
   "SELECTED_TOPICS": "ఎంచుకున్న విషయాలు",
+  "SELECT_ACTIVITY": "కార్యాచరణను ఎంచుకోండి.",
   "SELECT_ALL": "అన్నిటినీ ఎన్నుకో",
   "SELECT_CHAPTER": "అధ్యాయాన్ని ఎంచుకోండి",
   "SELECT_YOUR_STATE": "మీ రాష్ట్రాన్ని ఎంచుకోండి",
+  "SELF_DECLARED_INFO": "స్వీయ ప్రకటించిన సమాచారం",
+  "SELF_DECLARE_TEACHER_TNC": " నిర్వాహకులతో ఈ వివరాలను పంచుకోవడానికి నేను అంగీకరిస్తున్నాను",
   "SEND_FILE": "ఫైల్ పంపించు",
   "SERVER_CONNECTION_ERROR": "సర్వర్‌కి కనెక్షన్ లేదు",
   "SETTINGS": "సెట్టింగ్స్ ",
@@ -502,14 +928,14 @@
   "SHARE_LINK": "భాగస్వామ్యం లింక్",
   "SHARE_TELEMETRY": "టెలిమెట్రీని షేర్ చేయండి",
   "SHARE_TELEMETRY_FAILED": "టెలీమెట్రీని షేర్ చేయడం కుదరలేదు",
+  "SHARE_TELEMETRY_NO_DATA_FOUND": "టెలిమెట్రీ డేటా కనుగొనబడలేదు",
   "SHARE_THIS": "షేర్ చెయ్యండి",
+  "SHARE_USERNAME": "{{user_name}}  యొక్క {{app_name}} ID \"{{diksha_id}}\"",
   "SHOW": "ప్రదర్శించు",
   "SHOWING_ITEMS": "{{%s}} అంశాలను చూపుతోంది",
   "SHOWING_RESULTS_FOR": "'{{%query}}' కోసం {{%count}} ఫలితాలను  చూపుతోంది",
   "SHOW_LESS": "తక్కువ చూపించు",
   "SHOW_MORE": "ఇంకా చూపించు",
-  "SHOW_RECENT": "{{%s}} ఫైల్లను చూపుతోంది",
-  "SIGNED_OUT_ACCOUNT_MESSAGE": "మీరు ప్రస్తుతం లాగిన్ అయిన ఖాతా నుండి లాగ్ అవుట్ అవుతారు",
   "SIGNIN_TO_USE_FEATURE": "ఈ ఫీచర్ కావాలంటే లాగిన్ అవ్వండి.",
   "SIGN_IN": "లాగిన్ అవ్వండి",
   "SIZE": "పరిమాణం: {{%s}}",
@@ -519,10 +945,13 @@
   "SPACE_AVAILABLE_ON_SDCARD": "SD కార్డ్‌లో స్థలం అందుబాటులో ఉంది:",
   "SPACE_TAKEN": "{{%s}} ద్వారా తీసుకున్న స్థలం",
   "SPACE_TAKEN_BY_APP": "{{%s}}కంటెంట్ వినియోగించుకున్న స్థలం :",
+  "SPECIAL_CHARACTERS_NOT_SUPPORTED": "ప్రత్యేక అక్షరాలు మద్దతు ఇవ్వవు",
   "START": "ప్రారంభం",
+  "START_AGAIN": "పునఃప్రారంభించండి.",
   "START_ASSESSMENT": "అసెస్‌మెంట్ (పరీక్ష)  ప్రారంభించండి",
   "START_COURSE": "మొదలుపెట్టండి",
   "START_COURSE_NOW": "ఇప్పుడే ప్రారంభించండి",
+  "START_LEARNING": "నేర్చుకొవడం మొదలు పెట్టు",
   "STAR_RATINGS": "రేటింగులు",
   "STATE": "రాష్ట్రము",
   "STATE_OPTION_TEXT": "రాష్ట్రము ఎంచుకోండి",
@@ -534,18 +963,85 @@
   "SUBJECT": "పాఠ్యాంశము",
   "SUBJECTS": "పాఠ్యాంశాలు",
   "SUBJECT_OPTION_TEXT": "పాఠ్యాంశం ఎన్నుకోండి ",
+  "SUBMIT_MY_DETAILS": "నా వివరాలను సమర్పించండి",
+  "SUCCESSFULLY_ADDED_USER": "విజయవంతంగా జోడించబడింది",
+  "SUCCESSFULLY_SWITCHED_USER": "హాయ్  {{%user}}",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_PHONE": "అన్ని కాంటెంట్స్ ఫోన్ కు పంపబడతాయి",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_SDCARD": "అన్ని విషయాలు SD కార్డ్‌కు బదిలీ చేయబడతాయి",
   "SUPPORT": "సహాయము",
   "SUPPORT_MESSAGE": "ఏదైనా సమస్యా? మెసేజ్ పంపండి.",
-  "SWITCHING_TO": "వాడకందారు  '{{%s}}'కి మారారు",
-  "SWITCH_ACCOUNT": "ఎకౌంట్ మార్చు",
-  "SWITCH_ACCOUNT_CONFIRMATION": "ఎకౌంట్ మార్చండి",
+  "SWITCH_TO_CLASSIC_THEME": "క్లాసిక్ థీమ్‌కు మారండి",
+  "SWITCH_TO_JOYFUL_THEME": "ఆనందకరమైన థీమ్‌కు మారండి",
+  "SWITCH_USER": "సభ్యుని మార్చండి",
   "SYLLABUS": "సిలబస్",
   "SYNCING_NOW": "సింక్ అవుతోంది",
   "SYNC_NOW": "సింక్",
-  "TAKE_ASSESSMENT": "కనీసం ఒక పరీక్షనైనా తీసుకోవాలి",
   "TAP_SCAN": "{{%s}} క్యూఆర్  కోడ్‌ను స్కాన్ చేయడానికి నొక్కండి",
+  "TBK_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "ప్రారంభించడానికి పాఠ్యపుస్తకాన్ని ఎంచుకోండి",
+  "TBK_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "పాఠ్య పుస్తకం",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "పాఠ్యపుస్తకాలు",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "పాఠ్యపుస్తకాలు",
+  "TBK_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "app {% appName library library యొక్క లైబ్రరీలో {{% వివరించే వీడియోలు}}, {{% quesBanks}} మరియు ఇతర {{% ఇంటరాక్టివ్ మెటీరియల్} has ఉన్నాయి. లైబ్రరీని అన్వేషించడం ప్రారంభించడానికి పాఠ్య పుస్తకంపై క్లిక్ చేయండి!",
+  "TBK_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) కోసం పుస్తకాలు కనుగొనబడలేదు",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "బోర్డు పుస్తకాలను జోడిస్తోంది",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "మీ విషయ పాఠ్యపుస్తకాన్ని కనుగొనలేకపోయారా{{%s}}?",
+  "TBK_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>గమనిక :</span>\nపాఠ్యపుస్తకాల కోసం పురోగతిని ట్రాక్ చేయడం సాధ్యం కాదు",
+  "TBK_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "మీ స్టేట్ బోర్డు మీరు కోరిన పుస్తకాలను అప్‌లోడ్ చేసినప్పుడు మేము మీకు తెలియజేస్తాము{{%s}}",
+  "TBK_NONTRK_QR_CODE_DETAILS": "మీ పాఠ్య పుస్తకం నుండి QR కోడ్‌ను స్కాన్ చేయడం ద్వారా డిజిటల్ కంటెంట్‌కు తక్షణ ప్రాప్యతను పొందండి",
+  "TBK_NONTRK_SEE_MORE_BOOKS": "మరిన్ని పుస్తకాలు మరియు కంటెంట్ చూడండి",
+  "TBK_NONTRK_STUDENT_ROLE_DESC_1": "పాఠ్యపుస్తకాలు మరియు డిజిటల్ కంటెంట్‌ను బ్రౌజ్ చేయండి",
+  "TBK_NONTRK_TEACHER_ROLE_DESC_1": "పాఠ్యపుస్తకాలు మరియు డిజిటల్ కంటెంట్‌ను బ్రౌజ్ చేయండి",
+  "TBK_NONTRK_TUTORIAL_HEADING": "వీడియోలు, ఇంటరాక్టివ్ కంటెంట్, ఇటెక్స్ట్‌బుక్‌లు మరియు మరిన్ని ...",
+  "TBK_TRK_BATCHEND_MAIN_HEADING": "మీరు పాఠ్యపుస్తక పఠనం యొక్క బ్యాచ్‌లో చేరారు",
+  "TBK_TRK_BATCHEND_SUB_HEADING": "మీరు నేర్చుకోవడం కొనసాగించవచ్చు, కానీ మీ పురోగతి నవీకరించబడదు",
+  "TBK_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "మీరు ఈ అధ్యాయాన్ని పూర్తి చేసారు",
+  "TBK_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}}ద్వారా పాఠ్య పుస్తకం పూర్తి చేయండి",
+  "TBK_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "ఈ పాఠ్య పుస్తకం క్రియారహితంగా ఉంది",
+  "TBK_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "పాఠ్య పుస్తకం",
+  "TBK_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "మీరు ఈ పాఠ్యపుస్తకాన్ని చదివారు",
+  "TBK_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "పాఠ్య పుస్తకం కోసం బ్యాచ్‌లు",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "పనులు",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "నా పాఠ్యపుస్తకాలు",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "బ్యాచ్ ముగిసింది",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "చివరిగా నవీకరించబడింది{{last_updated_on_date}}",
+  "TBK_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "చేరండి",
+  "TBK_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "తాజా పాఠ్యపుస్తకాలు",
+  "TBK_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "పనిని వదిలేయాలా?",
+  "TBK_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "చేరడానికి లాగిన్ అవ్వండి",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_COURSES": "పాఠ్యపుస్తకాలు లేవు",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "కంటెంట్‌ను డౌన్‌లోడ్ చేయండి",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "పాఠ్యపుస్తకాలు({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "పాఠ్య పుస్తకం({{%s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "ఆన్‌లైన్ లెర్నింగ్ తీసుకోండి",
+  "TBK_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "ప్రసిద్ధ పాఠ్యపుస్తకాలు",
+  "TBK_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "ఆన్‌లైన్ లెర్నింగ్ తీసుకోండి",
+  "TBK_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "ధృవీకరణ పత్రాన్ని సంపాదించడానికి {{%s}} ద్వారా పనిని పూర్తి చేయండి",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING": "నేర్చుకునే పని",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "అభ్యాస పని (లు) హాజరయ్యారు",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "పాఠ్యపుస్తక వివరాలు",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "టాస్క్ ముగుస్తుంది",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "టాస్క్ ముగింపు తేదీ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "టాస్క్ వివరాలు",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "ఈ పని దీనికి సంబంధించినది:",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "అధ్యాయం",
+  "TBK_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "పాఠ్యపుస్తక కార్యాచరణను ఆపండి",
+  "TBK_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "పాఠ్యపుస్తక కార్యకలాపాలను తనిఖీ చేయాలనుకుంటున్నారా?",
+  "TBK_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "పాఠ్య పుస్తకం యొక్క బ్యాచ్ నుండి అందుబాటులో ఉంది{{batch_start_date}}",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "సర్టిఫికేట్ గురించి మీ నమోదు చేసుకున్న సంప్రదింపు వివరాలపై 7 రోజుల్లో మీకు తెలియజేయబడుతుంది",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "గమనిక: ఈ పాఠ్యపుస్తకానికి సర్టిఫికేట్ లేదు",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "మీరు ఈ పాఠ్యపుస్తకాన్ని చదివారు",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "గమనిక: ప్రస్తుతం, ఈ పనికి సర్టిఫికేట్ లేదు.  సృష్టికర్త తరువాత ప్రమాణపత్రాన్ని అటాచ్ చేయవచ్చు.",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "మీరు పాఠ్య పుస్తకం చదవడం మానేశారు",
+  "TBK_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "ఈ పాఠ్యపుస్తక పనికి బ్యాచ్‌లు లేవు",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "పాఠ్య పుస్తకం నమోదిత వినియోగదారుల కోసం.  పాఠ్యపుస్తకాన్ని యాక్సెస్ చేయడానికి లాగిన్ అవ్వండి",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "ఈ పాఠ్యపుస్తకాన్ని చదవడానికి లాగిన్ అవ్వండి",
+  "TBK_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "ఈ పనికి బ్యాచ్‌లు అందుబాటులో లేవు",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "నమోదు చేసుకున్న వినియోగదారులు మాత్రమే అభ్యాస పనులను చేపట్టగలరు",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "మీరు ఈ పనిని విజయవంతంగా పూర్తి చేసారు",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "పని ముగిసింది.  మీరు అంచనాను పునరావృతం చేయవచ్చు, కానీ, మీ పురోగతి నమోదు చేయబడదు.",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "పని ముగిసింది.  మీరు అంచనా వేయవచ్చు కానీ, మీ పురోగతి నమోదు చేయబడదు.",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "పాఠ్యపుస్తక వివరాలను వీక్షించడానికి మరియు ప్రాప్యత చేయడానికి మీరు తప్పనిసరిగా క్రియాశీల బ్యాచ్‌లో చేరాలి",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "పాఠ్యపుస్తక వివరాలను యాక్సెస్ చేయడానికి మీరు తప్పక లాగిన్ అవ్వాలి",
   "TEACHER_ID_ENTER_LABEL": "ధృవీకరణ కోసం మీ ఉపాధ్యాయ ID ని నమోదు చేయండి",
   "TEACHER_ID_PLACEHOLDER": "ఉదాహరణకు, ER12345",
   "TEACHER_ID_VERIFICATION": "ఉపాధ్యాయ ID ధృవీకరణ",
@@ -557,11 +1053,13 @@
   "TELL_US_MORE": "మాకు మరింత చెప్పండి ...",
   "TERMS_OF_USE": "ఉపయోగించడానికి నియమాలు ",
   "TEXTBOOK": "పాఠ్యపుస్తకాలు",
+  "TEXTBOOKS": "పాఠ్యపుస్తకాలు",
+  "THANKING_NOTE": "మీ రాష్ట్ర బోర్డు అప్లోడ్లు వంటి మేము వెంటనే మీరు తెలియజేస్తాము",
   "THANK_FOR_RATING": "కంటెంట్‌ను రేటింగ్ చేసినందుకు ధన్యవాదాలు!",
+  "THANK_YOU_FOR_SUBMITTING_YOUR_DETAILS": "మీ వివరాలను సమర్పించినందుకు ధన్యవాదాలు.",
   "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "ఈ శిక్షణ కోసం బ్యాచ్‌లు అందుబాటులో లేవు",
   "THIS_IS_A_RESTRICTED_COMMUNITY": "ఇది కొందరికే పరిమితమైన కమ్యూనిటీ",
   "TICKET_SUMMARY": "టికెట్ సారాంశం",
-  "TIME": "తీసుకున్న సమయం",
   "TIME_OUT": "సర్వర్ ఎక్కువ సమయం తీసుకుంటోంది. తరువాత మళ్ళీ ప్రయత్నించండి",
   "TITLE": "శీర్షిక",
   "TITLE_UPGRADE_POPUP": "కంటెంట్‌లోని చిత్రాలు మరియు ఆడియో తప్పిపోయినందుకు మేము ఎదుర్కొన్న సమస్యలను సరిదిద్దుకున్నాము. మంచి అనుభవం కోసం, మీరు DIKSHA యొక్క తాజా సంస్కరణకు అప్‌గ్రేడ్ చేయాలని మేము సిఫార్సు చేస్తున్నాము.",
@@ -570,7 +1068,6 @@
   "TOPICS": "విషయాలు",
   "TOPIC_YOU_MIGHT_LIKE": "మీకు నచ్చిన విషయాలను చూడండి",
   "TOTAL_SIZE": "మొత్తం పరిమాణం :",
-  "TOTAL_TIME": "మొత్తం సమయం",
   "TO_DO": "చెయ్య వలసినవి",
   "TO_EARN_CERTIFICATE": "ప్రమాణపత్రాన్ని సంపాదించడానికి {{%s}} ద్వారా పూర్తి శిక్షణ",
   "TRAINING": "శిక్షణ",
@@ -594,6 +1091,61 @@
   "TRY_AGAIN": "మళ్ళీ ప్రయత్నించండి",
   "TRY_BEFORE_RATING": "దయచేసి రేటింగ్ ఇచ్చే ముందు కంటెంటుని చూడండి.",
   "TRY_DIFF_QR": "వేరే క్యూఆర్ కోడ్ ప్రయత్నిస్తారా?",
+  "TUTORIAL_BUTTON": "ప్రారంభించడానికి పాఠ్యపుస్తకాన్ని ఎంచుకోండి.",
+  "TUTORIAL_HEADING": "వీడియోలు, ఇంటరాక్టివ్ కంటెంట్, ఇటెక్స్ట్‌బుక్‌లు మరియు మరిన్ని ...",
+  "TVC_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "ప్రారంభించడానికి టీవీ తరగతిని ఎంచుకోండి",
+  "TVC_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "టీవీ క్లాసులు",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "టీవీ క్లాసులు",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "టీవీ క్లాసులు",
+  "TVC_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{%appName}}యొక్క లైబ్రరీకి {{%explainVideos}}, {{% quesBanks}} మరియు ఇతర{{%interactiveMaterial}}.  లైబ్రరీని అన్వేషించడం ప్రారంభించడానికి టీవీ క్లాస్‌పై క్లిక్ చేయండి!",
+  "TVC_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "టీవీ తరగతులు కనుగొనబడలేదు{{%grade}} ({{%medium}})",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "బోర్డు టీవీ తరగతులను జోడిస్తోంది",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "టీవీ తరగతులను కనుగొనలేకపోయారా{{%s}}?",
+  "TVC_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "<span>గమనిక:</span>\nటీవీ క్లాస్ కోసం పురోగతిని ట్రాక్ చేయడం సాధ్యం కాదు",
+  "TVC_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "మీ స్టేట్ బోర్డు మీరు కోరిన టీవీ క్లాస్‌ని అప్‌లోడ్ చేసినప్పుడు మేము మీకు తెలియజేస్తాము{{%s}}",
+  "TVC_NONTRK_QR_CODE_DETAILS": "QR కోడ్‌ను స్కాన్ చేయడం ద్వారా డిజిటల్ కంటెంట్‌కు తక్షణ ప్రాప్యతను పొందండి",
+  "TVC_NONTRK_SEE_MORE_BOOKS": "మరిన్ని టీవీ తరగతులు మరియు కంటెంట్ చూడండి",
+  "TVC_NONTRK_STUDENT_ROLE_DESC_1": "టీవీ తరగతులు మరియు డిజిటల్ కంటెంట్‌ను బ్రౌజ్ చేయండి",
+  "TVC_NONTRK_TEACHER_ROLE_DESC_1": "టీవీ తరగతులు మరియు డిజిటల్ కంటెంట్‌ను బ్రౌజ్ చేయండి",
+  "TVC_NONTRK_TUTORIAL_HEADING": "వీడియోలు, ఇంటరాక్టివ్ కంటెంట్, ఇటెక్స్ట్‌బుక్‌లు మరియు మరిన్ని ...",
+  "TVC_TRK_BATCHEND_MAIN_HEADING": "మీరు పూర్తి చేసిన టీవీ క్లాస్ యొక్క బ్యాచ్‌లో చేరారు{{%s}}",
+  "TVC_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "మీరు ఈ కార్యక్రమాన్ని పూర్తి చేసారు",
+  "TVC_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "టీవీ క్లాసులు",
+  "TVC_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "మీరు ఈ టీవీ క్లాసులు చూశారు",
+  "TVC_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "టీవీ తరగతుల కోసం బ్యాచ్‌లు",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "పనులు",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "నా టీవీ క్లాసులు",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "బ్యాచ్ ముగిసింది",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "చివరిగా నవీకరించబడింది{{last_updated_on_date}}",
+  "TVC_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "తాజా టీవీ తరగతులు",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "టీవీ క్లాసులు({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "టీవీ క్లాసులు({{%s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "జనాదరణ పొందిన టీవీ క్లాసులు",
+  "TVC_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "ధృవీకరణ పత్రాన్ని సంపాదించడానికి {{%s}} ద్వారా పనిని పూర్తి చేయండి",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING": "నేర్చుకునే పని",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "అభ్యాస పని (లు) హాజరయ్యారు",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "టీవీ క్లాస్ వివరాలు",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "టాస్క్ ముగుస్తుంది",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "టాస్క్ ముగింపు తేదీ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "టాస్క్ వివరాలు",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "ఈ పని దీనికి సంబంధించినది:",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "టీవీ ప్రోగ్రామ్",
+  "TVC_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "టీవీ క్లాస్ చూడటం మానేయండి",
+  "TVC_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "నేర్చుకునే టీవీ తరగతులను తనిఖీ చేయాలనుకుంటున్నారా?",
+  "TVC_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "టీవీక్లాస్ బ్యాచ్ నుండి లభిస్తుంది{{batch_start_date}}",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "సర్టిఫికేట్ గురించి మీ నమోదు చేసుకున్న సంప్రదింపు వివరాలపై 7 రోజుల్లో మీకు తెలియజేయబడుతుంది",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "గమనిక: ఈ పనికి సర్టిఫికేట్ లేదు",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "మీరు ఈ టీవీ క్లాసులు చూశారు",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "గమనిక: ప్రస్తుతం, ఈ పనికి సర్టిఫికేట్ లేదు.  సృష్టికర్త తరువాత ప్రమాణపత్రాన్ని అటాచ్ చేయవచ్చు.",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "మీరు టీవీ క్లాస్ చూడటం మానేశారు",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "టీవీ తరగతులు నమోదిత వినియోగదారుల కోసం.  టీవీ తరగతిని యాక్సెస్ చేయడానికి లాగిన్ అవ్వండి",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "ఈ టీవీ క్లాస్ చూడటానికి లాగిన్ అవ్వండి",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "నమోదు చేసుకున్న వినియోగదారులు మాత్రమే అభ్యాస పనులను చేపట్టగలరు",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "మీరు ఈ పనిని విజయవంతంగా పూర్తి చేసారు",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "పని ముగిసింది.  మీరు అంచనాను పునరావృతం చేయవచ్చు, కానీ, మీ పురోగతి నమోదు చేయబడదు.",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "పని ముగిసింది.  మీరు అంచనా వేయవచ్చు కానీ, మీ పురోగతి నమోదు చేయబడదు.",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "టీవీ తరగతులను వీక్షించడానికి మరియు ప్రాప్యత చేయడానికి మీరు తప్పనిసరిగా క్రియాశీల బ్యాచ్‌లో చేరాలి",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "టీవీ క్లాస్ వివరాలను యాక్సెస్ చేయడానికి మీరు తప్పక లాగిన్ అవ్వాలి",
   "UNABLE_TO_FETCH_CONTENT": "ఈ కంటెంటు ప్రస్తుతం ఉపయోగంలో లేదు",
   "UNENROLL_CONFIRMATION_MESSAGE": "కోర్సు నుండి తొలగించాలా?",
   "UNENROLL_FROM_COURSE": "నమోదు ఉపసంహరించు",
@@ -607,19 +1159,14 @@
   "UPDATE_APP_TITLE": "ఆప్ కొత్త వెర్షను వచ్చింది",
   "UPDATE_CONFIRMATION_TEXT": "మీరు నిజంగా కంటెంట్ను నవీకరించాలనుకుంటున్నారా?",
   "UPDATE_CONTENT": "({{%s}}) కంటెంటు అప్‌డేట్ చెయ్యండి",
+  "UPDATE_DETAILS": "నవీకరణ వివరాలు",
   "UPDATE_RECOVERY_ID": "రికవరీ ఖాతాను నవీకరించండి",
   "UPDATE_REQUIRED": "నవీకరణ అవసరం",
+  "UPDATE_YOUR_PREFERENCE_FROM_PROFILE": "మీరు ప్రొఫైల్ సెట్టింగ్ నుండి మీ {{app_name}} ప్రొఫైల్ వివరాలను సవరించవచ్చు",
   "UPDATING": "నవీకరిస్తోంది",
   "UPDATING_CONTENT": "అప్‌డేట్ అవుతోంది... {{%s}} %",
-  "USER": "వాడకందారు",
   "USERNAME": "పేరు: {{%s}}",
-  "USERS": "వాడకందారులు",
-  "USERS_AND_GROUPS": "వాడకందార్లు, గుంపులు",
   "USER_CREATED_SUCCESSFULLY": "వాడకందారు సృష్టించబడ్డారు",
-  "USER_DELETE_CONFIRM": "'{{%s}}' తొలగించ వచ్చునా?",
-  "USER_DELETE_CONFIRM_MESSAGE": "ఈ వాడకందారు సమాచారం పూర్తిగా తొలగిపోతుంది",
-  "USER_DELETE_CONFIRM_MESSAGE_FROM_GROUP": "'{{%s}}' తొలగించ వచ్చునా?",
-  "USER_DELETE_CONFIRM_SECOND_MESSAGE": "ఈ గుంపునుంచి వాడకందారులను తొలగిస్తున్నారు. వాడకందారుల పట్టిక కింద వాళ్ల వివరాలు చూడవచ్చు.",
   "USER_ID": "వినియోగదారుని ఐడి",
   "USER_IS_NOT_VERIFIED": "వినియోగదారు ధృవీకరించబడలేదు",
   "USER_NAME": "వాడకందారు పేరు",
@@ -627,29 +1174,45 @@
   "USER_TYPE_1": "ఉపాధ్యాయుడు",
   "USER_TYPE_2": "విద్యార్థి",
   "USER_TYPE_3": "ఇతర",
+  "USER_TYPE_5": "తల్లిదండ్రులు",
   "USER_TYPE_SELECT_WARNING": "ఎలాంటి వాడకందారు",
   "USER_VERIFICATION": "వినియోగదారు ధృవీకరణ",
+  "USE_APP_AS": "ఆప్ ను ఉపయోగించండి  {{%s}}",
+  "VALIDATION_MAXIMUM_LENGTH": "గరిష్ట పొడవు 11 సంఖ్యలు ఉండాలి",
+  "VALIDATION_MINIMUM_LENGTH": "కనిష్ట పొడవు 11 సంఖ్యలు ఉండాలి",
+  "VERIFY": "ధ్రువీకరించడం",
   "VERIFY_EMAIL_OTP_DESCRIPTION": "మీరు ఈమెయిల్ ఐడి ధృవీకరణ కోసం OTP తో ఈమెయిల్ ను అందుకుంటారు",
   "VERIFY_EMAIL_OTP_TITLE": "ఇమెయిల్ ఐడిని ధృవీకరించండి",
   "VERIFY_PHONE_OTP_DESCRIPTION": "మీరు మొబైల్ నంబర్ ధృవీకరణ కోసం OTP తో SMS ను అందుకుంటారు",
   "VERIFY_PHONE_OTP_TITLE": "మొబైల్ నంబర్ను ధృవీకరించండి",
   "VERSION": "వెర్షన్",
-  "VIDEOS": "వీడియో",
+  "VERYFYING_PLEASE_WAIT": "ధృవీకరిస్తోంది దయచేసి వేచి ఉండండి",
+  "VIDEO": "వీడియో",
   "VIEW": "చూడు",
+  "VIEW_ACTIVITY": "కార్యాచరణ వీక్షణ",
   "VIEW_ALL": "పూర్తిగా చూడండి",
   "VIEW_ALL_BATCHES": "కొనసాగడానికి బ్యాచ్ని ఎంచుకోండి",
   "VIEW_CREDITS_INFO": "లైసెన్స్ సమాచారం",
   "VIEW_DOWNLOADS_ONLY_MSG": "డౌన్లోడ్లను మాత్రమే వీక్షించండి",
   "VIEW_MORE": "మరిన్ని చూడండి",
   "VIEW_ONGOING_BATCHES": "జరుగుతున్న బ్యాచ్లను",
+  "VIEW_OPEN_BATCHES": "ఓపెన్ బ్యాచ్‌లు",
   "VIEW_RETIRED_BATCHES": "గడువు ముగిసిన బ్యాచ్లు",
   "VIEW_UPCOMING_BATCHES": "రాబోతున్న బేచ్‌లు",
   "WAITING_TO_DOWNLOAD": "డౌన్ లోడ్ చెయ్యడానికి వేచి ఉంది ...",
   "WAIT_REQUEST": "దయచేసి వేచి ఉండండి",
+  "WANT_TO_CHECK_FREE_TRAININGS": "కోర్సులు తనిఖీ చేయాలనుకుంటున్నారా?",
   "WARNING_PLEASE_MAKE_SOME_CHANGES": "మార్పులు చెయ్యండి",
   "WEBVIEW_UPDATE_TEXT": "సమర్థవంతమైన అనుభవం కోసం, గూగుల్ ప్లే స్టోర్ నుండి వెబ్‌వ్యూ యొక్క తాజా వెర్షన్‌ను డౌన్‌లోడ్ చేయండి.",
+  "WEEKS_AGO": "{{%s}}  వారాల క్రితం",
+  "WEEK_AGO": "{{%s}} వారం క్రితం",
+  "WELCOME": "స్వాగతం",
   "WELCOME_BACK": "మీకు తిరిగి స్వాగతం {{%s}}",
+  "WHAT_IS_MEMBER_ID": "నేను {{app_name}} ID ని ఎక్కడ చూడగలను?",
+  "YEARS_AGO": "{{%s}} సంవత్సరాల క్రితం",
+  "YEAR_AGO": "{{%s}} సంవత్సరం క్రితం",
   "YES": "అవును",
+  "YOUR_ID_FROM_STATE_BOARD_ORG": "మీ యొక్క ID  (రాష్ట్రం/ బోర్డు/ సంస్థ)నుండి",
   "YOUR_LOCATION": "నీప్రదేశం",
   "YOUR_LOCATION_DETAILS": "మీ స్థానం వివరాలు, మీకు సముచితమైన   కంటెంట్‌ను అందించడంలో మాకు సహాయపడతాయి. మీ స్థానం సరిగ్గా ఉందో లేదో తనిఖీ చేయండి, లేకపోతే మీ స్థానాన్ని మళ్లీ ఎంచుకుని సమర్పించండి.",
   "YOUR_PROGRESS": "మీ పురోగతి: {{%s}}%",
diff --git a/src/assets/i18n/ur.json b/src/assets/i18n/ur.json
index f146d39e4..9af455c1f 100644
--- a/src/assets/i18n/ur.json
+++ b/src/assets/i18n/ur.json
@@ -8,29 +8,54 @@
   "ACCOUNT_MERGE_FAILED": "اکاؤنٹ ضم کرنے میں ناکامی ہوئ۔",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_CONTENT": "اکاؤنٹ انضمام کامیابی کے ساتھ شروع کیا گیا ہے۔ ایک بار مکمل ہونے کے بعد آپ کو مطلع کیا جائے گا۔",
   "ACCOUNT_MERGE_SUCCESS_POPOVER_HEADING": "اکاؤنٹ ضم کریں",
-  "ACCURACY": "درستگی",
   "ACTIVE": "فعال",
   "ACTIVE_DOWNLOADS": "جاری ڈاؤن لوڈ",
+  "ACTIVITIES": "سرگرمیاں",
+  "ACTIVITIESE_SEARCH_PLACEHOLDER": "گروپ کی سرگرمیاں تلاش کریں",
+  "ACTIVITY_ALREADY_ADDED_IN_GROUP": "آپ نے اس سرگرمی کو پہلے گروپ کے لئے شامل کیا ہے",
+  "ACTIVITY_COLLECTION_TITLE": "مجموعہ",
+  "ACTIVITY_COURSE_TITLE": "کورسز",
+  "ACTIVITY_EXPLANATION_CONTENT_TITLE": "وضاحت مواد",
+  "ACTIVITY_PRACTICE_QUESTION_SET_TITLE": "پریکٹس سوال سیٹ",
+  "ACTIVITY_PRACTICE_RESOURCE_TITLE": "پریکٹس وسائل",
+  "ACTIVITY_RESOURCE_TITLE": "وسائل",
+  "ACTIVITY_TEXTBOOK_TITLE": "درسی کتابیں ",
+  "ACTIVITY_TV_EPISODE_TITLE": "ٹی وی کا قسط",
   "ADD": "شامل",
+  "ADD_ACTIVITY": "سرگرمی شامل کریں",
+  "ADD_ACTIVITY_ERROR_MSG": "سرگرمی شامل نہیں کر سکے۔ بعد میں دوبارہ کوشش کریں",
+  "ADD_ACTIVITY_SUCCESS_MSG": "سرگرمی کامیابی کے ساتھ شامل کی گئی",
+  "ADD_ANOTHER_USER": "دوسرا صارف شامل کریں",
   "ADD_DISTRICT": "ضلع شامل کریں",
+  "ADD_EDIT_SELF_DECLARED_TEACHER_INFO": "یہ تفصیلات آپ کے اعلان کردہ ریاست میں پیش رفت کو درست کرنے اور اس کی پیروی کرنے کے لئے موجود ہو سکتی ہیں ۔",
   "ADD_EMAIL": "ای میل آئی ڈی شامل کریں",
+  "ADD_MEMBER": "ممبر شامل کریں",
+  "ADD_MEMBER_CONFIRMATION": "آپ کو جانچ پڑتال کرنی ہوگی کہ آپ کے آگے بڑھنے سے پہلے اس ممبر کا نام اور {{app_name}} ID مماثل ہوں",
+  "ADD_MEMBER_POPUP_DESC": "ممبروں کو ان کی  ‪{{%s}}‬ ID  شناخت کرنے میں رہنمائی کیلئے درج ذیل تفصیلات کا استعمال کریں۔",
+  "ADD_MEMBER_POPUP_STEP_1": "<span/>مرحلہ نمبر 1<span> : پروفائل ٹیب پر کلک کریں",
+  "ADD_MEMBER_POPUP_STEP_2": "<span> مرحلہ 2 </span>: یہاں {{%s}} ID دیکھیں",
+  "ADD_MEMBER_POPUP_TITLE": "میں  {{%s}} آئ ڈی  کہاں دیکھ سکتا ہوں؟",
   "ADD_PHONE": "فون نمبر شامل کریں",
   "ADD_RECOVERY_ACCOUNT": "بحالی اکاؤنٹ شامل کریں",
   "ADD_RECOVERY_ID": "بازیافت اکاؤنٹ شامل کریں",
   "ADD_STATE": "ریاست شامل کریں",
+  "ADD_TO_GROUP": "گروپ میں شامل کریں",
+  "ADD_TO_GROUP_ACTIVITY": "گروپ میں شامل کریں",
+  "ADD_USER": "صارف شامل کریں",
   "ADD_USERS": "صارفین کو شامل کریں",
-  "ADD_USERS_TO_GROUP": "گروپ میں {{%s}} صارفین کو شامل کریں",
+  "AGREE_TO_SHARE_PROFILE_DETAILS": "میں اپنے پروفائل کی تفصیلات کو کورس کے منتظم کے ساتھ اشتراک کرنے سے اتفاق کرتا ہوں",
   "ALL": "سارے",
   "ALLOW": "اجازت دیں",
   "ALL_ANNOUNCEMENTS": "تمام اعيلانات",
-  "ALREADY_ENROLLED_COURSE": "اس ٹریننگ کے لئےآپ پہلے سے ہی داخل ہے",
+  "ALREADY_ENROLLED_COURSE": "آپ نے اس کورس کے لئے داخلہ لیا ہے",
   "ALWAYS_ON": "ہمیشہ تیار",
   "ANDROID_NOT_SUPPORTED": "Android ورژن کی حمایت نہیں کی جاتی ہے",
-  "ANDROID_NOT_SUPPORTED_DESC": "کیونکہ آپ کا فون Android کے پرانے ورژن  استعمال کر رہا ہے لہذا آپ اس مواد کو نہیں کھول سکتے.\nاگر آپ کے پاس crosswalk  ہے, آپ اپنے آلہ ماڈل کے مطابق اس مواد کو دیکھ سکتے ہیں",
+  "ANDROID_NOT_SUPPORTED_DESC": "کیونکہ آپ کا فون Android کے پرانے ورژن  استعمال کر رہا ہے لہذا آپ اس مواد کو نہیں کھول سکتے۔\nاگر آپ کے پاس crosswalk  ہے, آپ اپنے آلہ ماڈل کے مطابق اس مواد کو دیکھ سکتے ہیں",
   "ANNOUNCEMENT": "اعلان",
   "ANSWER": "جواب",
   "APPLY": "درخواست",
   "APPLY_FILTER": "مقطر لاگو کریں",
+  "APP_ID": "‪{{%s}} ‬‪ID‬",
   "APP_QR_CODE": "QR {{%s}}  کوہے؟",
   "APP_RATING_RATE_EXPERIENCE": "ایپ کے تجربے کی درجہ بندی دے",
   "APP_RATING_RATE_ON_PLAYSTORE": "کیا آپ اپنے ریٹنگز کو پلے اسٹور پر جمع کرنا چاہتے ہیں?",
@@ -44,37 +69,33 @@
   "AS_LINK": "لنک کے طور پر",
   "ATTACHMENT_DOWNLOADED": "منسلک  ڈونلوڈ ہو گی",
   "ATTRIBUTIONS": "انتبا",
-  "AUDIOS": "آڈیو",
+  "AUDIO": "آڈیو",
   "AUTHOR": " مصنف",
   "AUTOMATIC_SYNC": "خودکار ڈیٹا بروقت مطابقت پذیری",
   "AUTO_MIGRATION_FAIL_MESSAGE": "اکاؤنٹس کو ضم نہیں کیا جاسکا",
   "AUTO_MIGRATION_SUCCESS_MESSAGE": "اکاؤنٹس کامیابی کے ساتھ مل گئے",
   "AVAILABLE": "دستیاب",
-  "AVAILABLE_FILTERS": "موجود مقطر ",
+  "AVAILABLE_FILTERS": "مقطر",
   "AVAILABLE_FOR_TEACHERS": "صرف اساتذہ کے لئے دستیاب ہے",
   "AVATAR": "اوتار / تصویر",
-  "AVERAGE_SCORE": "اوسط سکور",
-  "AVERAGE_TIME": "اوسط وقت",
   "BACK_TO_EXIT": "کیا آپ ایپ سے باہر نکلنا چاہتے ہیں؟",
-  "BATCHEND_MAIN_HEADING": "آپ کے بیچ نے ٹریننگ  {{%s}} کو مکمل کرلی ہے",
-  "BATCHEND_SUB_HEADING": "آپ ٹریننگ جاری رکھ سکتے ہیں ، لیکن آپ کی پیشرفت اپڈیٹ نہیں ہوگی",
+  "BATCHEND_MAIN_HEADING": "آپ کسی کورس کے بیچ میں شامل ہو گئے ہیں جو {{%s}} پر مکمل ہوا ہے",
+  "BATCHEND_SUB_HEADING": "آپ کورس جاری رکھ سکتے ہیں ، لیکن آپ کی پیشرفت اپڈیٹ نہیں ہوگی",
   "BATCHES_AVAILABLE": "بیچز دستیاب ہیں۔",
-  "BATCHES_FOR_THIS_COURSE": "اس ٹریننگ کیلئے یہ  بیچز موجود ہیں",
+  "BATCHES_FOR_THIS_COURSE": "کورس کے لئے بیچ",
   "BATCH_CREATED_BY": "کے طرف سے تخلیق",
   "BATCH_DETAILS": "دستے کی تفصیلات ",
   "BATCH_ENROLLMENT_ENDED": "اس بیچ کیلئے اندراج بند کر دی گئی ہیں",
   "BATCH_EXPIRED": "بیچ کا اختتام",
   "BATCH_EXPIRED_BUTTON": "ٹھیک ہے",
-  "BATCH_EXPIRED_DESCRIPTION": "بیچ کی مدت ختم ہو گئی ہے. آپ ٹریننگ جاری کر سکتے ہیں. تاہم، آپ کی ترقی کی نگرانی نہیں کی جائے گی.",
   "BOARD": "بورڈ",
   "BOARD_OPTION_TEXT": "بورڈ منتخب کریں",
+  "BROWES_RELEVANT_CONTENT": "اپنی ترجیحات (بورڈ ، میڈیم ، کلاس) کی بنیاد پر متعلقہ مواد تلاش کرنے کے لئے {{app_name}} لائبریری کو براؤز کریں۔",
   "BTN_CLICK_TO_OPEN_CONTENT": "اجزا  ملاحضہ  کرنے کیلئے ٹاپ کریں",
   "BTN_LATER": "بعد میں",
   "BTN_RATE_ON_PLAYSTORE": "پلےسٹورپر ہمے درجہ بندی دیں",
   "BTN_SUBMIT": "پیش کرنا",
   "BTN_VISIT_HELP_SECTION": "مدد کے حصے کا دورہ کریں",
-  "BY_QUESTIONS": "سوالات سے",
-  "BY_USERS": "صارفین سے",
   "CAMERA": "کیمره",
   "CAMERA_PERMISSION_DESCRIPTION": "QR کوڈ سکیننگ کیلئے {{%s}} کو کیمرے کے رسائی کی ضرورت ہے",
   "CANCEL": "منسوخ کریں",
@@ -84,24 +105,34 @@
   "CANCEL_DOWNLOAD": "  ڈونلوڈ منسوخ کریں",
   "CANCEL_DOWNLOAD_MESSAGE": "ڈاؤن لوڈ منسوخ کرنے سےعملی ڈاؤن لوڈز سے مواد کو ہٹا دیں گے",
   "CANCEL_DOWNLOAD_TITLE": "ڈاؤن لوڈ منسوخ کریں؟",
-  "CERTIFIED_TRAINING": "سرٹفایئڈ ٹریننگ",
+  "CERTIFICATE_ALREADY_DOWNLOADED": "سرٹیفکیٹ پہلے ہی ڈاؤن لوڈ ہوچکا ہے ، برائے مہربانی اپنے ڈاؤن لوڈ کے فولڈر کو چیک کریں",
+  "CERTIFICATE_DOWNLOADED": "سرٹیفکیٹ ڈاؤن لوڈ کیا گیا ہے",
+  "CERTIFICATE_DOWNLOAD_INFO": "سرٹیفیکیٹ ڈاؤن لوڈ ہو رہا ہے",
+  "CERTIFIED_TRAINING": "سرٹفایئڈ حاصل کریں",
   "CHANGE": "تبدیل کریں",
   "CHANGE_ROLE": "کردار تبدیل کریں",
-  "CHANGE_USER": "صارف بدلو",
+  "CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "آپ نے یہ ماڈیول ختم کرلیا ہے",
+  "CHARACTERS_REMAINING": "{{character_count}} باقی حروف",
   "CHECK_FOR_UPDATES": "تازہ ترین معلومات فراہم کریں ",
   "CHOOSE_FROM_FOLLOWING": "مندرجہ ذیل سے منتخب کریں",
   "CHOOSE_LANGUAGE": "اپنی پیش کردہ زبان کا انتخاب کریں",
+  "CHOOSE_USER": "صارف کا انتخاب کریں",
   "CHOOSE_WHERE_TO_SAVE_DATA": "ڈیٹا کو محفوظ کرنے کی جگہ منتخب کریں۔",
   "CLASS": " کلاس",
   "CLASSES": "طبقه",
   "CLEAR": "ساف کریں",
   "COACH_SCREEN": "QR کوڈ کو اسکین کرنے پر آپ کو مواد پر منتقل کیا جائے گا",
   "COMMUNITIES": " برادری",
+  "COMPLETED": "مکمل",
   "COMPLETE_ASSESSMENT_TO_EARN_CERTIFICATE": " {{%s}} تک تشخیص مکمل کریں",
-  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} تک  ٹریننگ مکمل کریں",
+  "COMPLETE_BY": "{{%s}} بذریعہ مکمل",
+  "COMPLETE_CHAPTER_TO_UNLOCK_ACHIEVEMENT": "نئی کامیابی حاصل کرنے کے لئے {{%s}} مزید مواد کو مکمل کریں",
+  "COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "{{%s}} تک  کورس مکمل کریں",
   "CONFIRM": "تصدیق",
+  "CONGRATULATIONS": "مبارک ہو!",
   "CONNECT_TO_INTERNET_SUGGESTION": "مواد دیکھنے کے لئے انٹرنیٹ سے رابطہ کریں",
   "CONSIDER_DOWNLOAD": "مواد کو ڈاؤن لوڈ کرنے پر غور کریں",
+  "CONTENTS": "مواد",
   "CONTENT_ALREADY_EXIST": "فائل پہلے سے ہی درآمد کی گئی ہے. براہ کرم نئی فائل منتخب کریں",
   "CONTENT_ALREADY_EXISTS": "مطلوبہ فولڈر میں مواد موجود ہے. پھر بھی منزل فولڈر میں منتقل کریں؟",
   "CONTENT_COMING_SOON": "ہم اس کے لئے مواد  تخلیق کر رہے ہیں",
@@ -113,10 +144,12 @@
   "CONTENT_DERIVED_FROM": "یہ مواد ماخوذ ہے",
   "CONTENT_IMPORTED": "کامیابی سے درآمد کی گئی ہے",
   "CONTENT_IMPORTED_FAILED": "درآمد ناکام ہوگیا",
-  "CONTENT_IS_BEEING_ADDED": "مواد {{%s}} میں شامل کیا جا رہا ہے",
+  "CONTENT_IS_BEEING_ADDED": "مواد {{content_name}} میں شامل کیا جا رہا ہے",
   "CONTENT_IS_BEING_ADDED": "آپکی ریاست  اس QR  کوڈ پر مواد  جلد شامل کرے گی ۔ وہ جلد ہی دستیاب ہونگے۔",
   "CONTENT_NOT_AVAILABLE": "مواد دستیاب نہیں ہے",
   "CONTENT_PLAYER_EXIT_PERMISSION": "کیا آپ اس مواد کو چھوڑنا چاہتے ہیں؟",
+  "CONTENT_PREFERENCE": "مشمولات کی ترجیح",
+  "CONTENT_PREFERENCE_SELECTION": "مشمولات کی ترجیح منتخب کریں",
   "CONTENT_RATING_SUB_HEADING": "مواد کی درجہ بندی کرنے کے لئے ستاروں پر ٹیپ کریں",
   "CONTENT_RETIRED_BY_AUTHOR": "یہ مواد مصنف کی طرف سے ہٹا دیا گیا ہے اور اس وجہ سے مزید دستیاب نہیں ہے",
   "CONTENT_SIZE": "مواد کا سائز",
@@ -125,50 +158,193 @@
   "CONTENT_SUCCESSFULLY_TRANSFERRED_TO_SDCARD": "مواد ایس ڈی کارڈ میں کامیابی سے منتقل ہوگیا",
   "CONTINUE": "جاری رہے",
   "CONTINUE_AS_ROLE": "'{{%s}}' کے طور پر جاری رکھیں",
-  "CONTINUE_NOW": "جاری رہے",
+  "CONTINUE_LEARNING": "سیکھنا جاری رکھیں",
   "CONTRIBUTIONS": "شراکت",
   "CONTRIBUTORS": "شراکت دار",
   "COPYRIGHT": "کاپی رائٹ",
-  "COURSES_BNAV": "ٹریننگ",
-  "COURSES_IN_PROGRESS": "میری ٹریننگ",
+  "COURSES": "کورسز",
+  "COURSES_BNAV": "کورسز",
+  "COURSES_IN_PROGRESS": "میرے کورسز",
   "COURSE_COMPLETED_LABEL": "{{%s}}% مکمل ہوا",
-  "COURSE_ENDED": "ٹریننگ  {{%s}} پر ختم ہوئ",
-  "COURSE_ENROLLED": "آپ ٹریننگ میں شامل ہو گئے ہیں",
-  "COURSE_NOT_AVAILABLE": "یہ ٹریننگ فعال نہیں ہے",
+  "COURSE_COMPLETION_POPUP_DESC": "رابطے کیلئے دی گئی تفصیلات پر آپ کو 7 دن کے اندر کورس کے سرٹیفکیٹ کے بارے میں مطلع کیا جائے گا",
+  "COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "نوٹ: اس کورس میں سرٹیفکیٹ نہیں ہے",
+  "COURSE_ENDED": "کورس  {{%s}} پر ختم ہوئ",
+  "COURSE_ENDED_ON": "کورس  {{%s}} پر ختم ہوئ",
+  "COURSE_ENROLLED": "آپ کورس میں شامل ہو گئے ہیں",
+  "COURSE_LAST_UPDATED_ON": "کورس آخری بار {{last_updated_on_date}} کو اپ ڈیٹ ہوا",
+  "COURSE_NOT_AVAILABLE": "یہ کورس فعال نہیں ہے",
+  "COURSE_NO_CERTIFICATE_MESSAGE": "نوٹ: فی الحال ، اس کورس میں سرٹیفکیٹ نہیں ہے۔ کورس تخلیق کار بعد میں سرٹیفکیٹ منسلک کرسکتے ہیں۔",
   "COURSE_PROGRESS_COMPLETED": "مکمل کیا ہے: {{%s}} %",
-  "COURSE_UNENROLLED": "آپ نے  ٹریننگ چھوڑ دی ہے",
+  "COURSE_UNENROLLED": "آپ نے  کورس چھوڑ دی ہے",
   "COURSE_WILL_BE_AVAILABLE": "بیچ {{%s}} سے دستیاب ہو گا",
-  "CREATE_GROUP": "گروپ بنائیں",
-  "CREATE_NEW_GROUP": "نیا گروپ بنائیں",
-  "CREATE_NEW_USER": "نیا صارف بنائیں",
+  "CREATE_GROUP": "گروہ بنائیں",
+  "CREATE_GROUP_DESCRIPTION": "آپ گروپ بنانے سے صرف ایک قدم کے فاصلے پر ہیں",
+  "CREATE_GROUP_DESCRIPTION_POPUP": "لوگوں سے رابطہ قائم کرنے ، سرگرمیاں بانٹنے ، پیشرفت کا جائزہ لینے اور مزید دریافت کرنے کیلئے ایک گروپ بنائیں یا کسی کا ایک حصہ بنیں",
   "CREATE_USER": "صارف بنائیں",
   "CREATORS": "{{%s}} پر تخلیق کردہ",
   "CREDITS": "سہرا دینا",
   "CREDITS_LICENCE_INFO": "کریڈٹ اور لائسنس کی معلومات",
-  "CSV_DOWNLOAD_SUCCESS": "{{%s}}  ڈاؤن لوڈ فولڈر میں رکھی گئی ہیں",
+  "CRS_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "شروع کرنے کے لئے ایک کورس کا انتخاب کریں",
+  "CRS_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "کورس",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "کورسز",
+  "CRS_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "کورسز",
+  "CRS_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{appName%}} کی لائبریری میں {{explainVideos%}} ،‏  {{quesBanks%}} اور دیگر {{interactiveMaterial%}} کا مجموعہ دستیاب ہے ۔ لائبریری کی دریافت شروع کرنے کے لئے ایک کورس پر کلک کریں!",
+  "CRS_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "({{%grade}} ({{%medium}} کے لئے کوئی کورس نہیں ملا",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "بورڈ کورسز کا اضافہ کر رہا ہے",
+  "CRS_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{٪ s}} پر کوئی کورس نہیں مل سکا؟",
+  "CRS_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "‪<span>نوٹ :</span>‬کورس کے لئے ترقی کا سراغ نہیں لگایا جاسکتا",
+  "CRS_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "جب آپ کا اسٹیٹ بورڈ آپ کے ذریعہ ‪{{%s}}‬ پر درخواست کردہ کورس اپ لوڈ کرتا ہے تو ہم آپ کو مطلع کریں گے",
+  "CRS_NONTRK_QR_CODE_DETAILS": "اپنے کورس سے QR کوڈ اسکین کرکے ڈیجیٹل مواد تک فوری رسائی حاصل کریں۔",
+  "CRS_NONTRK_SEE_MORE_BOOKS": "مزید کورسز اور مشمولات دیکھیں",
+  "CRS_NONTRK_STUDENT_ROLE_DESC_1": "کورسز اور ڈیجیٹل مواد کو براؤز کریں",
+  "CRS_NONTRK_TEACHER_ROLE_DESC_1": "کورسز اور ڈیجیٹل مواد کو براؤز کریں",
+  "CRS_NONTRK_TUTORIAL_HEADING": "ویڈیوز ، انٹرایکٹو مواد ، ای ٹیکسٹ بوکس اور بہت کچھ ...",
+  "CRS_TRK_BATCHEND_MAIN_HEADING": "آپ اس کورس کے بیچ میں شامل ہو گئے ہیں جو‪ {{%s}}‬پر مکمل ہوچکا ہے",
+  "CRS_TRK_BATCHEND_SUB_HEADING": "آپ کورس جاری رکھ سکتے ہیں ، لیکن آپ کی پیشرفت تازہ نہیں ہوگی",
+  "CRS_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "آپ نے یہ ماڈیول ختم کرلیا ہے",
+  "CRS_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "‪{{%s}}‬بذریعہ کورس مکمل کریں\n",
+  "CRS_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "کورسز",
+  "CRS_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "آپ اس کورس میں شامل ہوگئے ہیں",
+  "CRS_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "کورس کے لئے بیچس",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "کورسز",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "میرے کورسز",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "‪{{%s}}‬ پر کورس ختم ہوا",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "کورس آخری بار {{last_updated_on_date}} کو اپ ڈیٹ ہوا",
+  "CRS_TRK_FRMELEMNTS_LBL_COURSE_NOT_AVAILABLE": "یہ کورس غیر فعال ہے",
+  "CRS_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "کورس میں شامل ہوں",
+  "CRS_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "تازہ ترین کورسز",
+  "CRS_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "کورس چھوڑ دیں؟",
+  "CRS_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "کسی کورس میں شامل ہونے کے لئے لاگ ان کریں",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_COURSES": "کوئی کورس نہیں ہے",
+  "CRS_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "کورسز یا لائبریری سے مواد ڈاؤن لوڈ کریں",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "‪({{%s}})‬کورسز",
+  "CRS_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "‪({{%s}})‬کورس",
+  "CRS_TRK_FRMELEMNTS_LBL_OVERLAY_LABEL_TAKE_COURSE": "اس کورس میں شامل ہونے کے لئے لاگ ان کریں",
+  "CRS_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "مقبول کورسز",
+  "CRS_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "آن لائن کورسز کریں",
+  "CRS_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "سرٹیفکیٹ حاصل کرنے کے لئے مکمل کورس {{٪ s}} کریں",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING": "کورس",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "کورس (زبانیں) نے شرکت کی",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "کورس کی تفصیلات",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "کورس ختم ہوتا ہے",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "کورس ختم ہونے کی تاریخ",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "کورس کی تفصیلات",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "اس کورس کے لئے متعلقہ ہے:",
+  "CRS_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "کورس کے ماڈیولز",
+  "CRS_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "کورس چھوڑ دو",
+  "CRS_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "کورسز چیک کرنا چاہتے ہیں؟",
+  "CRS_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "‪{{batch_start_date}}‬ سے کورس کا بیچ دستیاب ہے",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "آپ کو کورس کے سرٹیفکیٹ کے بارے میں رجسٹرڈ رابطے کی تفصیلات پر 7 دن کے اندر مطلع کیا جائے گا",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "نوٹ: اس کورس میں سرٹیفکیٹ نہیں ہے",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "آپ کورس میں شامل ہو گئے ہیں",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "نوٹ: فی الحال ، اس کورس میں سرٹیفکیٹ نہیں ہے۔ کورس تخلیق کار بعد میں ایک سرٹیفکیٹ منسلک کرسکتا ہے۔",
+  "CRS_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "آپ نے کورس چھوڑ دیا ہے",
+  "CRS_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "اس کورس کے لئے کوئی بیچز نہیں ہیں",
+  "CRS_TRK_FRMELEMNTS_MSG_OTHER_ROLE_DESC_2": "آن لائن کورس کریں",
+  "CRS_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "کورس رجسٹرڈ صارفین کے لئے ہے۔ کورس تک رسائی حاصل کرنے کے لئے لاگ ان کریں۔",
+  "CRS_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "اس کورس کے لئے کوئی بیچس دستیاب نہیں ہے",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "صرف رجسٹرڈ صارف ہی کورسز لے سکتے ہیں",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "آپ نے یہ کورس کامیابی کے ساتھ مکمل کرلیا ہے",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "کورس ختم ہوا۔ آپ اس تشخیص کو دوبارہ کر سکتے ہیں لیکن ، آپ کی پیشرفت ریکارڈ نہیں کی جائے گی۔",
+  "CRS_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "کورس ختم ہوا۔ آپ اس تشخیص کو لے سکتے ہیں لیکن ، آپ کی پیشرفت ریکارڈ نہیں ہوگی۔",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "آپ کو کورس کی تفصیلات دیکھنے اور ان تک رسائی کے لئے ایک فعال بیچ میں شامل ہونا ضروری ہے",
+  "CRS_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "آپ کو رسائی کے کورس کی تفصیلات میں لاگ ان کرنا ہوگا",
   "CURRENT_LANGUAGE": "موجودہ منتخب کردہ زبان:",
-  "DATA": "مزید کتابیں اور مواد دیکھیں۔",
   "DATA_SYNC": "ڈیٹا مطابقت پذیر",
   "DATA_SYNC_FAILURE": "بروقت مطابقت پذیری نہیں کر سکا ،کچھ دیر بعد پھر سے  کوشش کریں.",
   "DATA_SYNC_NOTHING_TO_SYNC": "سنک کرنے کے لئے کچھ بھی نہیں ہے",
   "DATA_SYNC_SUB": " ڈیٹا بیک اپ کریں ،  ٹیلیمتری منتقل کریں",
   "DATA_SYNC_SUCCESSFUL": "ٹیلیمیٹری ڈیٹا مطابقت پذیری کامیاب ہوئی ",
-  "DELETE": "خارج کرنا  ",
+  "DAYS_AGO": "{{%s}} دن پہلے",
+  "DAY_AGO": "{{%s}} دن پہلے",
+  "DELETE": "مٹا دیں",
   "DELETE_ALL_CONTENT_WARNING": "مواد حذف ڈوائس سے منتخب کردہ مواد کو حذف کرے گا",
   "DELETE_CONTENT": "مواد حذف( ڈیلیٹ ) کریں؟",
-  "DELETE_CONTENT_SIZE": "ایک آئٹم ({{content_size}})",
+  "DELETE_CONTENT_SIZE": "۱ آئٹم ({{content_size}})",
   "DELETE_CONTENT_WARNING": "مواد کو حذف کرنے سے ڈوائس سے مواد کو ہٹا دیا جائے گا",
-  "DELETE_GROUP": "گروپ خارج کریں",
+  "DELETE_GROUP_DESC": "{{group_name}} کو ہٹانے سے گروپ ایپ سے مستقل طور پر ختم کردیا جائے گا",
+  "DELETE_GROUP_ERROR_MSG": "گروپ کو نہیں ہٹا سکا۔ بعد میں دوبارہ کوشش کریں",
+  "DELETE_GROUP_POPUP_TITLE": "گروپ مٹا دیں",
+  "DELETE_GROUP_SUCCESS_MSG": "گروپ کامیابی کے ساتھ ہٹا دیا گیا",
   "DELETE_PROGRESS": "منتخب کردہ فہرست کو حذف کریں",
-  "DESCRIPTION": " تفصیل ",
+  "DETAIL_TUTORIAL": "{{appName%}} کی لائبریری میں {{explainVideos%}} ،‏  {{quesBanks%}} اور دیگر {{interactiveMaterial%}} کا مجموعہ دستیاب ہے ۔ لائبریری کی دریافت شروع کرنے کے لئے ایک درسی کتاب پر کلک کریں!",
   "DEVICE_ID": "آلہ کی شنا ختی ای ڈی ",
   "DEVICE_LOCATION": "ڈیوائس لوکیشن",
   "DEVICE_TAGS": "آلہ کے ٹیگز",
   "DEVICE_TAGS_SUB": "آلہ کے  ٹیگز شامل کرے یا ہٹائیں",
+  "DFLT_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "شروع کرنے کے لئے ایک کام کا انتخاب کریں",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "ٹاسک",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "ٹاسک",
+  "DFLT_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "ٹاسکس",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": " {{%appName}}لائبریری {{%quesBanks}}, {{%explainVideos}} اور دیگر{{%interactiveMaterial}} کا ایک میزبان ہے.‪لائبریری کی کھوج شروع کرنے کے لئے ایک مشمولات پر کلک کریں!",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "‪{{%grade}}‬‪({{%medium}})‬ کے لئے کوئی کام نہیں ملا",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "بورڈ مواد شامل کررہا ہے",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "‪{{%s}}‬پر مواد مل  نہیں  سکے؟",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "‪<span>نوٹ :</span>‬ترقی کا سراغ نہیں لگایا جاسکتا",
+  "DFLT_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "جب آپ کا اسٹیٹ بورڈ آپ کے ذریعہ ‪{{%s}}‬ پر درخواست کردہ مواد اپ لوڈ کرتا ہے تو ہم آپ کو مطلع کریں گے",
+  "DFLT_NONTRK_QR_CODE_DETAILS": "کیو آر کوڈ کو اسکین کرکے ڈیجیٹل مواد تک فوری رسائی حاصل کریں",
+  "DFLT_NONTRK_SEE_MORE_BOOKS": "دیکھیں مزید",
+  "DFLT_NONTRK_STUDENT_ROLE_DESC_1": "ڈیجیٹل مواد کے لئے براؤز کریں",
+  "DFLT_NONTRK_TEACHER_ROLE_DESC_1": "ڈیجیٹل مواد کے لئے براؤز کریں",
+  "DFLT_NONTRK_TUTORIAL_HEADING": "ویڈیوز ، انٹرایکٹو مواد ، ای ٹیکسٹ بوکس اور بہت کچھ ...",
+  "DFLT_TRK_BATCHEND_MAIN_HEADING": "آپ سیکھنے والے کام کے بیچ میں شامل ہو گئے ہیں جو ‪{{%s}}‬پر مکمل ہوچکا ہے",
+  "DFLT_TRK_BATCHEND_SUB_HEADING": "آپ سیکھنا جاری رکھ سکتے ہیں ، لیکن آپ کی پیشرفت تازہ نہیں ہوگی",
+  "DFLT_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "آپ نے یہ سیکھنے کی سرگرمی ختم کردی ہے",
+  "DFLT_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "مکمل سیکھیں بذریعہ‪{{%s}}‬",
+  "DFLT_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "سیکھنے کا یہ کام غیر فعال ہے",
+  "DFLT_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "سیکھنے کے کام",
+  "DFLT_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "آپ اس سیکھنے کے کام میں شامل ہوگئے ہیں",
+  "DFLT_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "سیکھنے کے کام کے لئے بیچز",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "سیکھنے کے کام",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "میرے سیکھنے کے کام",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "‪{{%s}}‬ پر کام ختم ہوا",
+  "DFLT_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "آخری بار {{last_updated_on_date}} کو اپ ڈیٹ ہوا",
+  "DFLT_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "شامل ہوں",
+  "DFLT_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "تازہ ترین سیکھنے کے کام",
+  "DFLT_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "کام چھوڑیں؟",
+  "DFLT_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "شامل ہونے کے لئے لاگ ان کریں",
+  "DFLT_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "مواد ڈاؤن لوڈ کریں",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "کام ({{٪ s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "ٹاسک ({{٪ s}})",
+  "DFLT_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "آن لائن سیکھیں",
+  "DFLT_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "مقبول کام",
+  "DFLT_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "آن لائن سیکھیں",
+  "DFLT_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "ایک سند حاصل کرنے کے لئے بذریعہ ‪ کے{{%s}}‬کام مکمل",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING": "سیکھنے کے کام",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "سیکھنے کے کام میں شرکت کی",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "ٹاسک کی تفصیلات",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "ٹاسک ختم ہوتا ہے",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "کام ختم ہونے کی تاریخ",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "ٹاسک کی تفصیلات",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "اس کام کے لئے متعلقہ ہے:",
+  "DFLT_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "ٹاسک وسائل",
+  "DFLT_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "کام چھوڑ دیں",
+  "DFLT_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "سیکھنے کے کاموں کی جانچ کرنا چاہتے ہیں؟",
+  "DFLT_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "ٹاسک بیچ‪{{batch_start_date}}‬سے  دستیاب ہے",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "آپ کو سند کے بارے میں رجسٹرڈ رابطے کی تفصیلات کے بارے میں 7 دن کے اندر مطلع کیا جائے گا",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "نوٹ: اس کام میں سند نہیں ہے",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "آپ اس کام میں شامل ہوگئے ہیں",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "نوٹ: فی الحال ، اس کام کے پاس سند نہیں ہے۔ تخلیق کنندہ بعد میں سرٹیفکیٹ منسلک کرسکتا ہے۔",
+  "DFLT_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "آپ نے کام چھوڑ دیا ہے",
+  "DFLT_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "اس سیکھنے کے کام کے لئے کوئی بیچز نہیں ہیں",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "کام رجسٹرڈ صارفین کے لئے ہے۔ کام تک رسائی حاصل کرنے کے لئے لاگ ان کریں",
+  "DFLT_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "اس کام کو شروع کرنے کے لئے لاگ ان کریں",
+  "DFLT_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "اس کام کے لئے کوئی بیچس دستیاب نہیں ہے",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "صرف رجسٹرڈ صارف سیکھنے کے کام انجام دے سکتے ہیں",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "آپ نے یہ کام کامیابی کے ساتھ مکمل کرلیا ہے",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "کام ختم ہوا۔ آپ اس تشخیص کو دوبارہ کر سکتے ہیں لیکن ، آپ کی پیشرفت ریکارڈ نہیں کی جائے گی۔",
+  "DFLT_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "کام ختم ہوا۔ آپ اس تشخیص کو لے سکتے ہیں لیکن ، آپ کی پیشرفت ریکارڈ نہیں ہوگی۔",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "آپ کو کام کی تفصیلات دیکھنے اور ان تک رسائی کے لئے ایک فعال بیچ میں شامل ہونا ضروری ہے",
+  "DFLT_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "کام کی تفصیلات تک رسائی کے لئے آپ کو لاگ ان کرنا ہوگا",
   "DISMISS": "منسوخ کریے ",
+  "DISMISS_AS_GROUP_ADMIN": "بطور گروپ منتظم برخاست کریں",
+  "DISMISS_AS_GROUP_ADMIN_ERROR_MSG": "{{member_name}} کو بطور گروپ منتظم برخاست نہیں کیا جاسکا",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_DESC": "{{member_name}} کو بطور گروپ منتظم برخاست کرنے سے ممبر کی ایڈمن اجازت ختم ہوجاتی ہے",
+  "DISMISS_AS_GROUP_ADMIN_POPUP_TITLE": "بطور گروپ منتظم برخاست کریں؟",
+  "DISMISS_AS_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} اب گروپ منتظم نہیں ہے",
   "DISTRICT": "ضلع",
   "DISTRICT_OPTION_TEXT": "ضلع منتخب کریں",
-  "DOCS": "دستاویزات",
+  "DOC": "دستاویزات",
   "DOWNLOAD": "ڈونلوڈ ",
   "DOWNLOADING": "ڈونلوڈ جاری ہیں {{%s}} %",
   "DOWNLOADING_1": "ڈونلوڈنگ {{%s}}",
@@ -202,18 +378,27 @@
   "EMAIL_UPDATE_SUCCESS": "ای میل کامیابی سے اپ ڈیٹ کیا گیا۔",
   "EMPTY_LIBRARY_TEXTBOOK_FILTER": "{{%grade}} ({{%medium}}) کے لئے کوئی کتاب نہیں ملی",
   "EMPTY_SEARCH_RESULTS": " کوئی نتیجہ نہیں ملا ",
+  "EMPTY_SEARCH_RESULT_GROUPS": " معافی چاہتے ہیں! آپ کی تلاش سے ملنے کا کوئی نتیجہ نہیں ہے",
   "ENDORSE": "تصديق کرنا",
   "ENJOYED_THIS_CONTENT": "  اس مواد کا لطف اٹھایا؟",
   "ENROLL": "اندراج",
+  "ENROLLMENT_ENDED_ON": "اندراج {{%s}} کو ختم ہوا",
   "ENROLLMENT_LAST_DATE": "داخلے کے لئے آخری تاریخ:",
-  "ENTER_GROUP_NAME": "مجموعا کا نام درج کریں",
+  "ENTER_GROUP_NAME": "گروپ کا نام درج کریں",
+  "ENTER_ID": "آی ڈی درج کریں",
+  "ENTER_ID_AS_REQUESTED_BY_STATE_BOARD_ORG": "اپنے ریاست / بورڈ / تنظیم کے ذریعہ درخواست کے مطابق ID درج کریں",
+  "ENTER_LOCATION_FROM_PROFILE_PAGE": "پروفائل صفحے سے مقام درج کریں",
+  "ENTER_MEMBER_ID": "{{app_name}} ID درج کریں",
   "ENTER_OTP": "OTP درج کریں",
   "ENTER_PHONE_POPUP_TITLE": "موبائل نمبر درج کریں",
+  "ENTER_SCHOOL_NAME": "اسکول کا نام درج کریں",
+  "ENTER_THE_FOLLOWING_INFORMATION": "درج ذیل معلومات درج کریں",
+  "ENTER_UDISE_ID": "UDISE ID درج کریں",
   "ERROR_BATCH_NOT_STARTED": "دستے ابھی شروع نہیں ہیں",
   "ERROR_CANT_OPEN_EMPTY_CONTENT": "خالی فائل نہیں کھول سکتے  ",
   "ERROR_CONTENT_NOT_AVAILABLE": "ممواد دستیاب نہیں ہیں ",
   "ERROR_CONTENT_NOT_FOUND": "مواد ابھی شامل  نہیں ہیں ",
-  "ERROR_COULD_NOT_OPEN_FILE": "فائل نہیں کھل سکی",
+  "ERROR_COULD_NOT_OPEN_FILE": "فائل نہیں کھل سکا",
   "ERROR_DURATION_NOT_AVAILABLE": "عرصہ دستیاب نہیں ہے",
   "ERROR_EMAIL_EXISTS": "ای میل آئ ڈی پہلے سے موجود ہے. مختلف ای میل آئ ڈی درج کریں",
   "ERROR_EMAIL_INVALID": "ایک درست ای میل آئ ڈی درج کریں",
@@ -221,21 +406,32 @@
   "ERROR_FAILED_TO_DOWNLOAD_ATTACHMENT": "اتاچمنٹ ڈونلڈ  ناکام ہوگیا  ",
   "ERROR_FETCHING_DATA": "ڈیٹا حاصل کرنے میں قاصر",
   "ERROR_LOW_MEMORY": "منتقل کیلئے خالی جگہ دستیاب نہیں ہے",
+  "ERROR_MAXIMUM_ACTIVITY_COUNT_EXCEEDS": "آپ نے گروپ میں شامل کی جانے والی سرگرمیوں کی زیادہ سے زیادہ تعداد کو عبور کرلیا ہے",
+  "ERROR_MAXIMUM_GROUP_COUNT_EXCEEDS": "آپ نے بنائے جانے والے گروپس کی زیادہ سے زیادہ تعداد کو عبور کرلیا ہے",
+  "ERROR_MAXIMUM_MEMBER_COUNT_EXCEEDS": "آپ نے گروپ میں شامل کیے جانے والے ممبروں کی زیادہ سے زیادہ تعداد سے تجاوز کر لیا ہے",
   "ERROR_NAME_INVALID": " نام کے لئے صرف حروف یا سپیس درج کریں",
-  "ERROR_NO_BATCHES_FOUND": "اس ٹریننگ کے لئے کوئی بھی بیچ موجود نہیں ہیں ",
+  "ERROR_NO_BATCHES_FOUND": "اس کورس کے لئے کوئی بھی بیچ موجود نہیں ہیں ",
   "ERROR_NO_INTERNET_MESSAGE": "انٹرنیٹ تک رسائی نہیں",
   "ERROR_NO_OFFLINE_RESOURCE": "کوئی وسائل ذخیرہ کردہ نہیں ہیں",
   "ERROR_OFFLINE_MODE": " انٹرنیٹ مجود  نہیں، آپ آف لائن موڈ میں ہے ",
   "ERROR_OTP": "غلط OTP. باقی کوششوں کی تعداد : {{%s}}",
+  "ERROR_OTP_LIMIT_EXCEEDED": "آپ نے او ٹی پی کی زیادہ سے زیادہ حد عبور کرلی ہے ، بعد میں دوبارہ کوشش کریں",
   "ERROR_PHONE_EXISTS": "یہ موبائل نمبر پہلے سے ہی موجود ہے. مختلف فون نمبر درج کریں",
   "ERROR_PHONE_INVALID": "درست فون نمبر درج کریں",
+  "ERROR_PHONE_REQUIRED": "موبائل نمبر مطلوب ہے",
   "ERROR_SAME_EMAIL_UPDATED": "یہ ای میل  آئ ڈی وہی ہے جو آپ کی پروفائل سے منسلک ہے۔ دوسرا ای میل  آئ ڈی درج کریں۔",
   "ERROR_SAME_PHONE_UPDATED": "یہ موبائل نمبر وہی ہے جو آپ کی پروفائل سے منسلک ہے",
   "ERROR_SERVER_CONNECTION": "سرور سے رابطہ  نہیں ہو پا رہا ہیں",
-  "ERROR_TECHNICAL_PROBLEM": "ہم ایک تکنیکی مسئلہ کا سامنا کر رہے ہیں اوردرخواست مکمل نہیں کی جا سکتی",
+  "ERROR_SPECIAL_CHARECTERS_NOT_ALLOWED": "خاص حروف کی اجازت نہیں ہے",
+  "ERROR_TECHNICAL_PROBLEM": "ہم ایک تکنیکی مسئلہ کا سامنا کر رہے ہیں اوردرخواست پر کارروائی کرنے سے قاصر تھے",
   "ERROR_UPLOADING_IMG": "تصویر لوڈ کرتے وقت کوئی خرابی ہو ی",
   "ERROR_USER_ACCOUNT_BLOCKED": "صارف کا اکاؤنٹ بلاک کر دیا گیا ہے. برائے مہربانی منتظم سے رابطہ کریں",
+  "ERROR_WHILE_ADDING_USER": "صارف کو شامل کرتے وقت خرابی",
+  "ERROR_WHILE_FETCHING_USERS": " صارفین کے بازیافت میں خرابی",
   "ERROR_WHILE_LOGIN": "لاگ ان کرتے وقت غلطی",
+  "ERROR_WHILE_SWITCHING_USER": "صارف کو تبدیل کرتے وقت خرابی",
+  "EXPLORE_HEADING": "{{%s}} پرمزید دریافت کریں",
+  "EXP_VIDEOS": "وضاحت ویڈیوز",
   "EXTRACTING_CONTENT": "مواد نکالا جا رہا ہے {{%s}}۔",
   "FEEDBACK_HINT": "اپنی رائے دیں",
   "FEEDBACK_HINT_1": " یہاں اپني  راۓ شامل کریں",
@@ -243,30 +439,201 @@
   "FILE_MANAGER": "فائل مینیجر",
   "FILE_MANAGER_PERMISSION_DESCRIPTION": "فائلوں کو ڈاؤن لوڈ کرنے اور ایسڈی کارڈ پر مواد منتقل کرنے کیلئے {{%s}} کو اسٹوریج رسائی کی ضرورت ہے",
   "FILE_NAME": " '{{%s}}' لوڈ ہو رہا ہے",
-  "FILE_SAVED": "ڈاؤن لوڈ میں فائل سیو ہوگئی",
+  "FILE_SAVED": "ڈاؤن لوڈ میں فائل محفوظ ہوگئی",
   "FILE_SIZE": "سائز [{{%s}}]",
   "FILL_IN": "اپنی پروفائل کو مکمل کرنے کیلئے ذیل میں تفصیلات فراہم کریں",
   "FILL_THE_MANDATORY_FIELDS": "تمام لازمی شعبوں کو بھریں",
   "FILTER": "مقطر",
   "FILTER_ADDED": "شامل کرنا ",
-  "FILTER_BY": "مقطر کریں",
-  "FIRST_NAME": "نام",
+  "FILTER_BY": "کے ذریعہ مقطر کریں",
   "FOLLOW": "پیروی",
-  "FORCE_UPDATE_MESSAGE": "آپ {{%s}} ایپ کا پرانا ورژن استعمال کر رہے ہیں۔گوگل پلے اسٹور سے تازہ ترین ورژن حاصل کرنے کے لئے ، ابھی اپ ڈیٹ پر ٹیپ کریں",
+  "FORCE_UPDATE_MESSAGE": "آپ {{%s}} ایپ کا پرانا ورژن استعمال کر رہے ہیں۔گوگل پلے اسٹور سے تازہ ترین ورژن حاصل کرنے کے لئے ،ابھی اپ ڈیٹ پر ٹیپ کریں",
+  "FORUM": "فورم",
+  "FOR_SUPPORT": "{{%s}} سپورٹ کے لئے",
   "FREE_SPACE": "خالی جگہ :",
+  "FRMELEMENTS_BTN_ACTIVATEGRP": "متحرک کریں",
+  "FRMELEMENTS_BTN_ADD": "شامل کریں",
+  "FRMELEMENTS_BTN_BACK": "پیچھے",
+  "FRMELEMENTS_BTN_DEACTIVATEGRP": "غیر فعال کریں",
+  "FRMELEMENTS_BTN_NEXT": "اگلے",
+  "FRMELEMENTS_LBL_ACTIVATEGRP": "گروپ چالو کریں",
+  "FRMELEMENTS_LBL_ACTIVATEGRPQUES": "گروپ چالو کریں ؟",
+  "FRMELEMENTS_LBL_CONTENT_TYPE": "مواد کی قسم",
+  "FRMELEMENTS_LBL_DEACTIVATEGRP": "گروپ کو غیر فعال کریں",
+  "FRMELEMENTS_LBL_DEACTIVATEGRPQUES": "غیر فعال گروپ ؟",
+  "FRMELEMENTS_LBL_REMARKS": "ریمارکس",
+  "FRMELEMENTS_MSG_ACTIVATEGRPFAILED": "گروپ کو متحرک نہیں کرسکے ، بعد میں دوبارہ کوشش کریں",
+  "FRMELEMENTS_MSG_ACTIVATEGRPMSG": "گروپ کو متحرک کرنے سے آپ ممبروں اور سرگرمیوں کو شامل کرسکتے ہیں۔ آپ ممبر کی ترقی کو بھی ٹریک کرسکتے ہیں",
+  "FRMELEMENTS_MSG_ACTIVATEGRPPOPUP": "یہ گروپ عارضی طور پر غیر فعال ہے ۔ گروپ ایڈمن گروپ کو چالو کر سکتا ہے",
+  "FRMELEMENTS_MSG_ACTIVATEGRPSUCCESS": "گروپ کامیابی کے ساتھ متحرک ہوگیا",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPFAILED": "گروپ کو غیر فعال نہیں کر سکے ، بعد میں دوبارہ کوشش کریں",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPMSG": "کسی گروپ کو غیر فعال کرنے سے آپ تک رسائی ختم ہوجاتی ہے۔ آپ کسی گروپ میں سرگرمیاں یا ممبران شامل نہیں کرسکتے ہیں۔ آپ ممبر کی پیشرفت کو بھی نہیں دیکھ سکتے ہیں۔",
+  "FRMELEMENTS_MSG_DEACTIVATEGRPSUCCESS": "گروپ کامیابی کے ساتھ غیر فعال ہوگیا",
+  "FRMELEMNTS_BTN_CLOSE": "بند کریں",
+  "FRMELEMNTS_BTN_DONOT_SHARE": "شیئر نہ کریں",
+  "FRMELEMNTS_BTN_EDIT_SETTING": "ترتیبات میں ترمیم کریں",
+  "FRMELEMNTS_BTN_PREVIEW_FORM": "فارم کا مشاہدہ کریں",
+  "FRMELEMNTS_BTN_SAVE": "محفوظ کریں",
+  "FRMELEMNTS_BTN_SAVE_EDITS": "ترامیم کو محفوظ کریں",
+  "FRMELEMNTS_BTN_SAVE_FORM": "فارم کو محفوظ کریں",
+  "FRMELEMNTS_BTN_SEEK_HELP": "مدد طلب کرنا",
+  "FRMELEMNTS_BTN_SUBMIT_FORM": "فارم جمع کروائیں",
+  "FRMELEMNTS_BTN_VIEW_DETAILS": "تفصیلات دیکھیں",
+  "FRMELEMNTS_CKBX_CERTMSG": "یہ پیغام دوبارہ نہ دکھائیں",
+  "FRMELEMNTS_LBL_ACCESSIBILITY": "اسکرین ریڈر تک رسائی",
+  "FRMELEMNTS_LBL_ACCESSIBILITYMODE": "ڈارک موڈ پر سوئچ کریں",
+  "FRMELEMNTS_LBL_ACCESSIBILITYSKIP": "اہم مواد پر جائیں",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXT": "سائٹ کا نقشہ",
+  "FRMELEMNTS_LBL_ACCESSIBILITYTEXTSIZE": "فانٹ سائز بڑھائیں",
+  "FRMELEMNTS_LBL_ADD_ATTACHMENTS": "منسلکہ شامل کریں",
+  "FRMELEMNTS_LBL_ADD_ENTITY": "مقام شامل کریں",
+  "FRMELEMNTS_LBL_ADD_NEW_TASK": "نیا کام شامل کریں",
+  "FRMELEMNTS_LBL_ADD_REMARKS": "ریمارکس شامل کریں",
+  "FRMELEMNTS_LBL_ADD_SUBTASK": "سب ٹاسک شامل کریں",
+  "FRMELEMNTS_LBL_ADD_SUBTASK_PALCEHOLDER": "سب ٹاسک نام شامل کریں",
+  "FRMELEMNTS_LBL_ADD_TASK": "کام شامل کریں",
+  "FRMELEMNTS_LBL_ASSIGNED_TO": "مقرر کیا",
+  "FRMELEMNTS_LBL_ASSIGN_TASK": "کام تفویض کریں",
+  "FRMELEMNTS_LBL_ATTACH": "منسلک کریں",
+  "FRMELEMNTS_LBL_ATTACHMENTS": "اٹیچمنٹ",
+  "FRMELEMNTS_LBL_BLOCK": "بلاک کریں",
+  "FRMELEMNTS_LBL_CATEGORIES": "قسم",
+  "FRMELEMNTS_LBL_CATEGORY_OVERVIEW": "زمرہ جائزہ",
+  "FRMELEMNTS_LBL_CLICK_HELP": "مدد کے بٹن پر کلک کریں",
+  "FRMELEMNTS_LBL_CLICK_HERE_TO_VIEW_LIBRARY": "لائبریری دیکھنے کے لئے یہاں کلک کریں",
+  "FRMELEMNTS_LBL_CLUSTER": "جھرمٹ",
+  "FRMELEMNTS_LBL_CONSENT_POPUP_INFO": "آپ اپنے پروفائل صفحہ سے ان تفصیلات میں ترمیم کرسکتے ہیں",
+  "FRMELEMNTS_LBL_CONTENT_AVAIALABLE_IN_OTHER_BOARD": "دوسرے بورڈوں میں آپ کی ضرورت کے مطابق دلچسپ مواد ہوسکتا ہے!",
+  "FRMELEMNTS_LBL_CONTENT_FOUND": "ہمیں کچھ ایسا مواد ملا ہے جو آپ کی ضرورت سے مماثل ہے!",
+  "FRMELEMNTS_LBL_CONTENT_TO_BE_ADDED": "ابھی آپ کے بورڈ میں مزید مواد شامل کرنا باقی ہے۔",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT": "آپ کا مواد نہیں مل سکا؟ نیچے بٹنوں پر کلک کریں",
+  "FRMELEMNTS_LBL_COULD_NOT_FIND_CONTENT_YET": "آپ کا مواد نہیں مل سکا؟ نیچے بٹنوں پر کلک کریں",
+  "FRMELEMNTS_LBL_CRITERIA_WISE": "معیار",
+  "FRMELEMNTS_LBL_DATA_SETTINGS": "ڈیٹا کی ترتیبات",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF": "پروفائل ڈیٹا کا اشتراک بند ہے",
+  "FRMELEMNTS_LBL_DATA_SHARING_OFF_INFO": "آپ نے اپنے پروفائل کی تفصیلات کورس کے منتظم کے ساتھ شیئر کرنے پر اتفاق نہیں کیا ہے",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON": "پروفائل ڈیٹا کا اشتراک جاری ہے",
+  "FRMELEMNTS_LBL_DATA_SHARING_ON_INFO": "آپ نے اپنے پروفائل کی تفصیلات کورس کے منتظم کے ساتھ شیئر کرنے پر اتفاق کیا ہے",
+  "FRMELEMNTS_LBL_DELETE_CONFIRMATION": "کیا آپ واقعی اپنا سب ٹاسک حذف کرنا چاہتے ہیں؟",
+  "FRMELEMNTS_LBL_DONOT_SHARE_PROFILE_INFO": "میری پروفائل کی تفصیلات شیئر نہ کریں",
+  "FRMELEMNTS_LBL_DURATION": "دورانیہ",
+  "FRMELEMNTS_LBL_EMAIL_ID_PLACEHOLDER": "ریاست / تنظیم کے لئے ای میل کی شناخت",
+  "FRMELEMNTS_LBL_END_DATE": "آخری تاریخ",
+  "FRMELEMNTS_LBL_FILES": "فائلوں",
+  "FRMELEMNTS_LBL_IMAGES": "تصاویر",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS": "پروجیکٹ کی رپورٹیں",
+  "FRMELEMNTS_LBL_IMPROVEMENT_REPORTS_DESC": "پروجیکٹ کی رپورٹیں دیکھیں",
+  "FRMELEMNTS_LBL_IN_PROGRESS": "کام جاری ہے",
+  "FRMELEMNTS_LBL_LEARNER_PASSBOOK": "لرنر پاس بک",
+  "FRMELEMNTS_LBL_LEARNING_RESOURCES": "سیکھنے کے وسائل",
+  "FRMELEMNTS_LBL_LINK_LEARNING_RESOURCES": "لنک سیکھنے کے وسائل",
+  "FRMELEMNTS_LBL_MEDIA_TYPE": "میڈیا کی قسم",
+  "FRMELEMNTS_LBL_MOBILE_NUMBER_PLACEHOLDER": "ریاست / تنظیم کے لئے موبائل نمبر",
+  "FRMELEMNTS_LBL_MY_LEARNINGS": "میری سیکھنے",
+  "FRMELEMNTS_LBL_NEW_TASK": "نیا کام",
+  "FRMELEMNTS_LBL_NO_MATCHING_CONTENT": "کوئی مشابہت نہیں ملا",
+  "FRMELEMNTS_LBL_OBJECTIVE": "مقصد",
+  "FRMELEMNTS_LBL_OBSERVATION": "مشاہدہ",
+  "FRMELEMNTS_LBL_OBSERVATION_DESC": "اپنے کلاس روم اور اسکول کے مشاہدات تک آسانی سے رسائی حاصل کریں اور ان کو ریکارڈ کریں ، اور اپنی اصلاح کے سفر کا منصوبہ بنائیں",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS": "مشاہداتی اطلاعات",
+  "FRMELEMNTS_LBL_OBSERVATION_REPORTS_DEC": "مشاہداتی رپورٹس دیکھیں",
+  "FRMELEMNTS_LBL_OBSERVE_AGAIN": "دوبارہ مشاہدہ کریں",
+  "FRMELEMNTS_LBL_OPEN_BATCH_NOT_RECOMMENDED": "(اگر آپ سابقہ ​​بیچ میں پہلے ہی یہ کورس مکمل کر چکے ہیں تو اس میں شامل ہونے کی سفارش نہیں کی جائے گی کیونکہ آپ کی سیکھنے کی تاریخ اور سرٹیفکیٹ دوبارہ ترتیب دیئے جائیں گے)",
+  "FRMELEMNTS_LBL_PERSONA": "کردار",
+  "FRMELEMNTS_LBL_PROFCONF": "پروفائل کے نام کی تصدیق کریں",
+  "FRMELEMNTS_LBL_PROFTITLE": "پروفائل کا نام",
+  "FRMELEMNTS_LBL_PROGRAM_NAME": "پروگرام کا نام",
+  "FRMELEMNTS_LBL_PROJECT": "پروجیکٹ",
+  "FRMELEMNTS_LBL_PROJECT_DESCRIPTION": "کاموں کی تشکیل اور ٹائم لائن کی منصوبہ بندی کرکے اپنے اسکول میں ہونے والی بہتری کا نظم و نسق کریں",
+  "FRMELEMNTS_LBL_PROJECT_OVERVIEW": "منصوبے کا جائزہ",
+  "FRMELEMNTS_LBL_PROJECT_STATUS": "پروجیکٹ کی حیثیت",
+  "FRMELEMNTS_LBL_PROJECT_TITLE": "پروجیکٹ کا عنوان",
+  "FRMELEMNTS_LBL_PROJECT_VIEW": "پروجیکٹ کا نظارہ",
+  "FRMELEMNTS_LBL_QUESTION_WISE": "سوالات",
+  "FRMELEMNTS_LBL_RELEVANT_CONTENT_SUB_HEADING": "اپنی مخصوص مشمولات کی ضروریات کے لئے تفصیلات بھریں",
+  "FRMELEMNTS_LBL_REPORTS": "رپورٹیں",
+  "FRMELEMNTS_LBL_REPORTS_DESC": "رپورٹوں کی فہرست",
+  "FRMELEMNTS_LBL_REQUEST_CONTENT": "مواد کی درخواست کریں؟",
+  "FRMELEMNTS_LBL_SCHOOL": "اسکول",
+  "FRMELEMNTS_LBL_SELECT_CATEGORIES": "زمرے منتخب کریں",
+  "FRMELEMNTS_LBL_SELECT_PROGRAM": "پروگرام منتخب کریں",
+  "FRMELEMNTS_LBL_SET_DATE": "تاریخ طے کریں",
+  "FRMELEMNTS_LBL_SET_DATE_HINT": "اپنے منصوبے کے لئے ایک ٹائم لائن طے کریں",
+  "FRMELEMNTS_LBL_SHARE_PROFILE_INFORMATION": "میرے پروفائل کی تفصیلات شیئر کریں",
+  "FRMELEMNTS_LBL_START_DATE": "شروع کرنے کی تاریخ",
+  "FRMELEMNTS_LBL_STATUS": "حالت",
+  "FRMELEMNTS_LBL_SUBPERSONA": "ذیلی کردار",
+  "FRMELEMNTS_LBL_SUBTASKS": "سب ٹاسکس",
+  "FRMELEMNTS_LBL_SURVEY": "سروے",
+  "FRMELEMNTS_LBL_SURVEY_ACTION": "سروے کی کاروائیاں",
+  "FRMELEMNTS_LBL_SURVEY_DESC": "سروے کی فہرست",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS": "سروے کی رپورٹیں",
+  "FRMELEMNTS_LBL_SURVEY_REPORTS_DESC": "سروے کی رپورٹیں دیکھیں",
+  "FRMELEMNTS_LBL_TAB_HOME": "گھر",
+  "FRMELEMNTS_LBL_TASK_DESCRIPTION": "کام کی تفصیل",
+  "FRMELEMNTS_LBL_TASK_OVERVIEW": "کام کا جائزہ",
+  "FRMELEMNTS_LBL_THIS_MONTH": "اس مہینے",
+  "FRMELEMNTS_LBL_TOTAL_TASKS": "تمام کام",
+  "FRMELEMNTS_LBL_UPCOMING": "آنے والا",
+  "FRMELEMNTS_LBL_UPDATE_DATA_SETTINGS": "ترتیبات کو اپ ڈیٹ کریں",
+  "FRMELEMNTS_LBL_USERTYPE_LEADER": "اسکول سربراہ یا عہدیدار",
+  "FRMELEMNTS_LBL_VIEW_ENTITY_REPORT": "مقام کی رپورٹ دیکھیں",
+  "FRMELEMNTS_LBL_VIEW_FULL_REPORT": "پوری رپورٹ دیکھیں",
+  "FRMELEMNTS_LBL_VIEW_RESOURCES": "وسائل دیکھیں",
+  "FRMELEMNTS_MSG_BATCH_ALREADY_CLOSED": "اس بیچ کے اندراجات ‪{endDate}‬پر بند ہوگئے",
+  "FRMELEMNTS_MSG_CONSENT_DECLARATION_INFO": "آپ اپنے پروفائل پیج سے اپنی تفصیلات میں ترمیم کرسکتے ہیں",
+  "FRMELEMNTS_MSG_DATA_SETTINGS_SUBMITED_SUCCESSFULLY": "آپ کے ڈیٹا کی ترتیبات کامیابی کے ساتھ جمع کرائی گئیں",
+  "FRMELEMNTS_MSG_DELETE_TASK_CONFIRMATION": "کیا آپ واقعی کام کو حذف کرنا چاہتے ہیں؟",
+  "FRMELEMNTS_MSG_EDITCERTNAME": "آپ اسے اپنے پروفائل پیج سے ایڈٹ کرسکتے ہیں۔",
+  "FRMELEMNTS_MSG_LOAD_FROM_LIBRARY": "لائبریری سے لوڈ کریں",
+  "FRMELEMNTS_MSG_NAMEONCERT": "یہ نام آپ کے کورس کے سرٹیفکیٹ پر پرنٹ کیا جائے گا. چیک کریں اگر یہ درست ہے.",
+  "FRMELEMNTS_MSG_SELECT_IMAGE_SOURCE": "تصویری ماخذ منتخب کریں",
+  "FRMELEMNTS_MSG_SELFDECLARATION_SUCCESS_INFO": "آپ اپنے پروفائل سے اس معلومات کی تدوین کر سکتے ہیں",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED": "کامیابی کے ساتھ منسلک ہوا",
+  "FRMELEMNTS_MSG_SUCCESSFULLY_SYNCED": "پروجیکٹ کو کامیابی کے ساتھ ہم آہنگ کیا گیا ہے",
+  "FRMELEMNTS_MSG_TICKET_SUBMISSION_SUCCESS": "آپ کی راے کا شکریہ.ہوسکتا ہے کہ ہمیں بھیجی گئی ہر مشورے کا جواب نہ دے سکیں ، لیکن آپ کی رائے قابل قدر ہے۔یہ ‪{{app_name}}‬ کوسب کے لئے بہتر بناتا ہے ۔",
+  "FRMELEMNTS_MSG_UNABLE_TO_ENROLL": "آپ اب بیچ نہیں چھوڑ سکتے ہیں۔ بعد میں دوبارہ کوشش کریں",
+  "FRMELEMNTS_MSG_UPDATED_SUCCESSFULLY": "کامیابی کے ساتھ اپ ڈیٹ ہوا",
+  "FRMELEMNTS_MSG_USER_CREATION_LIMIT_EXCEEDED": "آپ اپنے پروفائل کے تحت زیر انتظام صارفین کی تعداد سے تجاوز کر سکتے ہیں",
+  "FRMELEMNTS_MSG_USE_CAMERA": "کیمرا استعمال کریں",
+  "FRMELEMNTS_MSG_USE_FILE": "فائل کا استعمال کریں",
+  "FRMELEMNTS_MSG_YOUR_CHANGES_ARE_SAVED": "آپ کی تبدیلیاں کامیابی کے ساتھ محفوظ ہوگئیں۔",
+  "FRMELENTS_LBL_ACCESSIBILITYNORMALMODE": "لائٹ موڈ پر سوئچ کریں",
+  "FRMELMNTS_BLTPT_EARNCERT": "صرف سرکاری صارفین کو‪{{STATE}}‬‪‬ سرٹیفکیٹ جاری کردیئے گئے ہیں",
+  "FRMELMNTS_BLTPT_EARNCERT2": "آپ کے تمام جائزوں میں ‪{{PERCENTAGE}}‬سے اوپر اسکور کریں",
+  "FRMELMNTS_BLTPT_EARNCERT3": "سرٹیفکیٹ حاصل کرنے کے لئے آپ صرف ‪‪{{ATTEMPTS}}‬‬ بار تشخیص کی کوشش کر سکتے ہیں.",
+  "FRMELMNTS_IMSG_DECLAREINFO": "اس کورس کے لئے سرٹیفکیٹ صرف ریاست کی طرف سے تسلیم شدہ اساتذہ کے لئے جاری کیا جاتا ہے",
+  "FRMELMNTS_IMSG_LASTATTMPALRT": "یہ آخری بقیہ کوشش ہے",
+  "FRMELMNTS_IMSG_LASTATTMPTEXCD": "آپ کے پیش کردہ کوششوں کی زیادہ سے زیادہ تعداد سے تجاوز کر چکے ہیں",
+  "FRMELMNTS_LBL_ACCESSIBILITYFNTDFLT": "دوبارہ پہلے جیسا کر دیں",
+  "FRMELMNTS_LBL_ACCESSIBILITYFONT": "فانٹ سائز کم کریں",
+  "FRMELMNTS_LBL_AVSCORE": "بہترین تشخیص سکور کا اوسط",
+  "FRMELMNTS_LBL_BESTSCORE": "بہترین اسکور‪{{SCORE}}‬",
+  "FRMELMNTS_LBL_CERTQUES": "آپ اپنا سرٹیفکیٹ کیسے حاصل کرتے ہیں ؟",
+  "FRMELMNTS_LBL_NOTIFNUMBER": "‪{{NUMBER}}‬نئی اطلاعات",
+  "FRMELMNTS_LBL_SEELESS": "کم دیکھیں",
+  "FRMELMNTS_LBL_SEEMORE": " مزید دیکھیں",
+  "FRMELMNTS_LBL_STATEUSERQUES": "کیا آپ ریاستی استاد ہیں؟",
+  "FRMELMNTS_LNK_DECLARELINK": "ابھی اعلان کریں",
+  "FRMELMNTS_PRMPT_DECLAREPROMPT": "سرٹیفکیٹ حاصل کرنے کے لئے اپنی معلومات کو ‪{instance}‬  پر اعلان کریں",
+  "FRMELMNTS_SCTTL_NOTIFHEADER": "اطلاعات",
   "FROM": " کب سے",
   "FULL_NAME": " نام",
+  "GET_STARTED": "شروع کریں",
   "GOT_IT": "سمجھ گیا/گئ",
+  "GO_TO_DOWNLOADS": "ڈاؤن لوڈز پر جائیں",
+  "GO_TO_PROFILE": "پروفائل پر جائیں",
   "GRADE_OPTION_TEXT": "اپنی جماعت کا انتخاب کریں",
   "GRANT_ACCESS": "رسائی فراہم کریں",
-  "GROUPS": "مجموعات ",
-  "GROUPS_YOU_FOLLOW": "گروہ جن کی آپ پیروی کرتے ہو ",
-  "GROUP_CREATE_SUCCESS": "مجموعا کامیابی سے تیار",
-  "GROUP_DELETE_CONFIRM": "'{{%s}}' کو خارج کرنے کی تصدیق کرناچاہتےہے",
-  "GROUP_DELETE_CONFIRM_MESSAGE": "یہ کارروائی گروہ کو خارج کرے گا لیکن صارفین کو نہیں. صارفین 'صارفین' ٹیب کے تحت پایا جا سکتا ہے",
-  "GROUP_MEMBER_ADD_SUCCESS": "ارکان کو کامیابی سے شامل کیا گیا ہے",
-  "GROUP_MEMBER_DELETE_SUCCESS": "گروہ کے ممبران کو کامیابی سے حذف کر دیا گیا ہے",
-  "GROUP_NAME": "گروہ کا نام",
+  "GROUP_CREATED": "گروپ کامیابی سے تخلیق کیا گیا",
+  "GROUP_CREATED_BY": "{{group_creator_name}} کے ذریعہ تخلیق شدہ",
+  "GROUP_DESCRIPTION": "گروپ کی تفصیل",
+  "GROUP_DESCRIPTION_PLACEHOLDER": "ممبروں کو گروپ کے مقصد کو سمجھنے میں مدد کے لئے ایک تفصیل درج کریں",
+  "GROUP_GUIDELINES": "گروپ کی ہدایات",
+  "GROUP_MEMBER_SEARCH_PLACEHOLDER": "گروپ میں تلاش کریں",
+  "GROUP_NAME": "گروپ کا نام",
+  "GROUP_NAME_IS_REQUIRED": "آپ کو گروپ کا نام درج کرنا ہوگا",
+  "GROUP_TERMS_IS_REQUIRED": "آگے بڑھنے سے پہلے آپ کو {{app_name}} کی خدمات کی شرائط سے اتفاق کرنا ہوگا",
   "GROUP_UPDATE_SUCCESS": "گروپ کی تفصیلات کامیابی کے ساتھ اپ ڈیٹ کی گئیں۔",
   "HABIT_REMINDER_NOTIFICATION_MESSAGE": "{{%s}} پر آج کچھ نیا  سیکھیں!",
   "HELP": "مدد",
@@ -275,8 +642,9 @@
   "HIDE_CREDITS_INFO": "لائسنسنگ معلومات چھپائیں",
   "HINT_LANGUAGE": "اپنی پیش کردہ زبان کا انتخاب کریں",
   "HOBBIES": "مشغلے",
-  "IAM_ABOVE_18_YEARS_AGE": "میری عمر 18 سال سے اوپر ہے",
-  "IF_YES_LOGIN": "اگر ہاں ، تو لاگ ان پر کلک کریں",
+  "HOURS_AGO": "{{%s}} گھنٹے پہلے",
+  "HOUR_AGO": "{{%s}} گھنٹہ پہلے",
+  "ID_IS_REQUIRED": "ID ضروری ہے",
   "IMPORTING": "درآمد کر رہا ہے…",
   "IMPORTING_COUNT": "درآمد  جاری ہیں",
   "IMPORT_ECAR": "ناممکن فائل کی شکل, آپ صرف( .ecar  .epar اور .gsa ) فائلوں کو درآمد کرسکتے ہیں",
@@ -285,59 +653,97 @@
   "INACTIVE": "غیر فعال",
   "INCORRECT_TEACHER_ID_ERROR": "آپ نے ایک غلط آی ڈی داخل کیا ہے۔ دوبارہ  آی ڈی درج کریں",
   "INSTALL_CROSSWALK": "Crosswalk انسٹال کریں",
+  "INSTANCE_TERMS_OF_USE": "‪{{app_name}}‬استعمال کی شرائط",
   "INSUFFICIENT_STORAGE": "اسٹوریج کی جگہ موجود نہیں",
   "INTERACTION": "مل کر کام کرنا",
+  "INTERACTIVE_MATERIAL": "انٹرایکٹو مطالعہ مواد",
   "INTERNAL_MEMORY": "اندرونی اسٹوریج",
   "INTERNET_AVAILABLE": " آپ اب آن لائن ہیں",
   "INTERNET_CONNECTIVITY_NEEDED": "انٹرنیٹ کنیکٹوٹی موجود نہیں",
   "INVALID_CONTENT": "غلط_ مواد  ",
-  "INVALID_FORMAT": "غلط فارمیٹ",
+  "INVALID_FORMAT": "غلط شکل",
+  "INVALID_MEMBER_ID": "آپ نے ایک غلط {{app_name}} ID درج کیا ہے",
   "INVALID_QR": "غلط QR کوڈ",
   "ITEMS": "{{%s}} فائل",
   "ITEMS_SELECTED": "فائلیں منتخب ہوئیں",
+  "I_AGREE_TO": "میں {{app_name}} سے اتفاق کرتا ہوں",
   "I_AGREE_TO_TNC": "میں استعمال کی شرائط اور ضوابط سے اتفاق کرتا ہوں",
-  "JOIN_TRAINING": "ٹریننگ میں شامل ہوں",
+  "I_AM_A_PERSONA_WITH_TENANT": "میں ایک‪{{%persona}}‬کے ساتھ {{%tenant}}",
+  "I_UNDERSTAND_AND_ACCEPT": "میں سمجھتا ہوں اور قبول کرتا ہوں",
+  "JOIN_TRAINING": "کورس میں شامل ہوں",
   "LANGUAGE": "زبان",
   "LANGUAGE_SETTINGS": "زبان کی ترتیبات",
-  "LAST_DATE_TO_JOIN": "شامل ہونے کی آخری تاریخ",
+  "LAST_DATE_TO_JOIN": "شامل ہونے کی آخری تاریخ {{%s}}",
   "LAST_SYNC": "آخری مطابقت پذیری",
+  "LAST_UPDATED": "آخری اپ ڈیٹ ‪{{%s}}‬",
   "LAST_VIEWED": "آخری دیکھی گئ",
-  "LATEST_COURSES": "لیٹسٹ  ٹریننگ ",
-  "LEAVE_TRAINING_HEADING": "تربیت چھوڑ دو؟",
+  "LATEST_COURSES": "لیٹسٹ  کورسز ",
+  "LEAVE_GROUP": "گروپ چھوڑیں",
+  "LEAVE_GROUP_ERROR_MSG": "گروپ نہیں چھوڑ سکا۔ بعد میں دوبارہ کوشش کریں",
+  "LEAVE_GROUP_POPUP_DESC": "اس عمل کو واپس نہیں کیا جاسکتا۔ کیا آپ {{group_name}} چھوڑنا چاہتے ہیں؟",
+  "LEAVE_GROUP_POPUP_TITLE": "گروپ چھوڑیں گے؟",
+  "LEAVE_GROUP_SUCCESS_MSG": "اب آپ اس گروپ کا حصہ نہیں ہیں",
+  "LEAVE_TRAINING_HEADING": "کورس چھوڑ دیں؟",
   "LIBRARY_BNAV": "دار الکتب",
   "LICENSE": "اجازت دینے کی شرائط",
   "LOAD": "لوڈ کریں",
+  "LOADER_PROGRESS_DESCRIPTION": "ہم چیزیں تیار کر رہے ہیں",
+  "LOADER_PROGRESS_DESC_SUB_HEADING": "برائے مہربانی انتظار کریں...",
   "LOADING_CONTENT": "ممواد لوڈ ہو رہے ہیں",
   "LOADING_CONTENTS": "مواد ا لوڈ ہو رہے ہیں {{%s}} %",
-  "LOADING_USER_LIST": "صارف کی فہرست لوڈ ہورہے ہیں، براہ کرم انتظار کریں",
   "LOAD_FILE": "فائل لوڈ کریں",
-  "LOGGED_IN_AS": "لاگ ان صارف کا نام",
-  "LOGGED_OUT": "لاگ آؤٹ",
+  "LOGGED_IN_MEMBER": "{{member_name}} (آپ)",
+  "LOGIN_TO_CREATE_GROUP_DESCRIPTION": "اپنا گروپ ، اسٹڈی گروپ یا کلاس روم بنانے کی طرف پہلا قدم لاگ ان ہوگا",
+  "LOGIN_TO_JOIN_TRAINING": "کورس میں اندراج کے لنے لاگ ان کریں",
   "LOGOUT": "لوگ آوٹ",
   "LOW_BANDWIDTH": "کمزور بینڈ ودتھ",
   "LOW_BANDWIDTH_DETECTED": "کم بینڈوڈتھ نیٹ ورک کا پتہ چلا ہے",
-  "MARKS": "سکور",
-  "MEDIUM": "اوسط",
+  "MAINTENANCE_MESSAGE": "ہم اس وقت بحالی کیلئے نیچے ہیں۔ لیکن فکر نہ کریں ، ہم ‪{{%timeLeft}}‬ گھنٹوں میں واپس آجائیں گے۔ جلدی واپس انا!",
+  "MAINTENANCE_SUB_TEXT": "آپ اب بھی اپنے ڈاؤن لوڈ کردہ مواد تک رسائی حاصل کرسکتے ہیں",
+  "MAKE_ADMIN": "منتظم بنائیں",
+  "MAKE_GROUP_ADMIN_ERROR_MSG": "{{member_name}} کو گروپ منتظم نہیں بناسکے",
+  "MAKE_GROUP_ADMIN_POPUP_DESC": "یہ عمل{{member_name}} کو گروپ ایڈمن کی اجازت دے گا",
+  "MAKE_GROUP_ADMIN_POPUP_TITLE": "گروپ منتظم بنائیں؟",
+  "MAKE_GROUP_ADMIN_SUCCESS_MSG": "{{member_name}} اب گروپ منتظم ہیں",
+  "MEDIUM": "میڈیم",
   "MEDIUM_OF_INSTRUCTION": "ہدایات کے ذریعہ",
   "MEDIUM_OPTION_TEXT": "میڈیم منتخب کریں",
+  "MEMBERS": "ممبران",
+  "MEMBER_ADDED_TO_GROUP": "ممبر کامیابی سے گروپ میں شامل ہوا",
+  "MEMBER_ALREADY_EXISTS_IN_GROUP": "یہ ممبر پہلے ہی گروپ کا ایک حصہ ہے۔",
+  "MEMBER_ID": "{{app_name}} ID",
+  "MENU_DELETE_GROUP": "گروپ مٹا دیں",
+  "MENU_DISMISS_AS_GROUP_ADMIN": "بطور گروپ منتظم برخاست کریں",
+  "MENU_EDIT_GROUP_DETAILS": "گروپ کی تفصیلات میں ترمیم کریں",
+  "MENU_LEAVE_GROUP": "گروپ چھوڑیں",
+  "MENU_MAKE_GROUP_ADMIN": "گروپ منتظم بنائیں",
+  "MENU_REMOVE_ACTIVITY": "سرگرمی کو ہٹا دیں",
+  "MENU_REMOVE_FROM_GROUP": "گروپ سے ہٹائیں",
   "MERGE_ACCOUNT": "اکاؤنٹ ضم کریں۔",
   "MICROPHONE": "مائیکروفون",
   "MICROPHONE_PERMISSION_DESCRIPTION": " {{%s}} کو مائیکروفون کے رسائی کی ضرورت ہے صرف ان مواد کیلئے جو آپکو آواز ریکارڈ کرنے کی اجازت دیتا ہے۔",
+  "MINUTES_AGO": "{{%s}} منٹ پہلے",
+  "MINUTE_AGO": "{{%s}} منٹ پہلے",
+  "MONTHS_AGO": "{{%s}} ماہ پہلے",
+  "MONTH_AGO": "{{%s}} ماہ پہلے",
   "MORE": "مزید",
   "MORE_CONTENT": "{{%s}}  پر مزید کتابیں اور مواد تلاش کریں",
+  "MORE_COUNT": "اور ({{%s}})",
   "MORE_DETAILS": "مزید تفصیلات (مزید معلومات فراہم کریں یا مسئلے کا اسکرین شاٹ منسلک کریں)",
   "MOVE": "منتقل کریں",
   "MOVE_FILES_TO_OTHER_DESTINATION": "جگہ خالی کرنے کیلئے، فائلوں کو {{%s}}  پر منتقل کریں",
   "MSG_ALREADY_IMPORTED": "پہلے سے ہی درآمد",
   "MSG_IMPORTED_SUCCESSFULLY": "اجزا کامیابی سے درآمد",
-  "MSG_LOADING_BATCHES": "دستے  لوڈ ہو رہے ہیں",
   "MSG_NO_DETAILS_TO_SHOW": "تفصیلات موجود نہیں ",
   "MSG_NO_NEW_NOTIFICATION": " کوئی نئی اطلاعات نہیں ہے",
   "MSG_RESOURCE_DELETED": "اجزا  آلہ سے خارج کر  دیے گئے ہیں ",
   "MULTIPLE_LICENSE": "اجازت دینے کی شرائط{{%s}}",
   "MY_BADGES": "میرے بیج",
+  "MY_DETAILS": "میری تفصیلات",
+  "MY_GROUPS": "میرے گروپس",
   "NAME": "نام",
   "NAME_HINT": "آپنا نام ٹائپ کریں",
+  "NAME_IS_REQUIRED": "آپ کو صارف کا نام درج کرنا ہوگا",
   "NEED_INTERNET_FOR_DEEPLINK_CONTENT": "آپ آف لائن ہیں۔ مواد تک رسائی کے لئے انٹرنیٹ سے رابطہ کریں۔",
   "NEED_INTERNET_TO_CHANGE": "انٹرنیٹ تک رسائی نہیں ہے، وائی فائی یا موبائل ڈیٹا آن کر یں اور دوبارہ کوشش کریں",
   "NEW": "نیا",
@@ -345,36 +751,32 @@
   "NEXT": "اگلے",
   "NIL": "صفر",
   "NO": "نہیں",
+  "NOTE": "نوٹ",
   "NOTIFICATION": "اطلاع",
   "NOT_AVAILABLE": "دستیاب نہیں ہے",
   "NOT_NOW": "ابھی نہیں",
   "NO_APP_FOR_INTENT": "اس فائل کو کھولنے کیلئے کوئی اپلی کیشن دستیاب نہیں ہے",
-  "NO_ASSESSMENT": "کوئی تشخیص دستیاب نہیں ہے",
   "NO_BATCHES_AVAILABLE": "کوئی بیچ دستیاب نہیں ہے",
   "NO_BOOKS_AVAILABLE": "بورڈ کتابیں شامل کررہا ہے۔",
-  "NO_BOOKS_DEFINITION": "ابھی آپ کے بورڈ میں مزید کتابیں شامل نہیں ہیں۔ {{%s}}  پر مزید کتابیں اور مواد دیکھنے کے لئے بٹن دبائیں۔ ",
+  "NO_BOOKS_DEFINITION": "ابھی آپ کے بورڈ میں مزید کتابیں شامل ہونی باقی ہیں۔ {{%s}}  پر مزید کتابیں اور مواد دیکھنے کے لئے بٹن دبائیں۔ ",
+  "NO_BOOKS_TEXT": "آپکے مضمون کی درسی کتاب {{%s}} پر نہیں مل سکی؟",
   "NO_CONTENTS": "{{%s}} نہیں ہے",
   "NO_CONTENTS_FOUND": "مواد مل  نہیں  سکے ",
   "NO_CONTENTS_MESSAGE": "ایک اور مواد کی قسم منتخب کریں",
+  "NO_CONTENT_AVAILABLE_IN_MODULE": "اس ماڈیول میں کوئی مواد موجود نہیں ہے",
+  "NO_COURSES": "کوئی کورسز نہیں",
   "NO_DATA_FOUND": "کوئی ڈیٹا نہیں ملا",
-  "NO_DESCRIPTION": "تفصیل دستیاب نہیں ہے",
   "NO_DOWNLOADS": "ابھی تک کوئی ڈاؤن لوڈ نہیں",
-  "NO_DOWNLOADS_INFO": " ٹریننگ یا لائبریری سے مواد ڈاؤن لوڈ کریں",
+  "NO_DOWNLOADS_INFO": " کورسز یا لائبریری سے مواد ڈاؤن لوڈ کریں",
   "NO_FILTERS_SELECTED": "کوئی مقطر منتخب نہیں ",
-  "NO_GROUPS_CREATED_YET": "کوئی گروہ ابھی تک نہیں بنایا گیا",
-  "NO_GROUP_MESSAGE": " گروہ صارف کو بہترمنظم کرنے میں مدد کرتی ہیں. آپ مجموعی طور پر بہتر ترقی کی نگرانی کے لئے گروہ بھی استعمال کرسکتے ہیں",
   "NO_INTERNET": " انٹرنیٹ  کی رسائی منقطع ہیں",
   "NO_INTERNET_TITLE": "آپ آف لائن ہیں",
   "NO_PREVIEW": "پیش نظارہ موجود نہیں ",
   "NO_QR_CODE": "میرے پاس QR کوڈ نہیں ہے",
   "NO_QR_CODE_QSTN": "QR کوڈ نہیں ہے؟",
   "NO_RATING": "ابھی تک درجہ بندی نہیں",
-  "NO_USERS": "کوئی صارف نہیں",
-  "NO_USERS_CREATED_YET": "کوئی صارف ابھی تک نہیں بنایا گیا",
-  "NO_USERS_CREATED_YET_MSG": "آپ اپنے طالب علموں یا دیگر اساتذہ کے لئے مہمان صارف اکاؤنٹس بنا سکتے ہیں",
-  "NO_USERS_IN_THIS_GROUP": "اس گروپ میں صارفین نہیں ",
-  "NO_USERS_ON_THIS_DEVICE": "اس آلہ پر کوئی صارف نہیں",
-  "NO_USERS_SUGGESTION_MESSAGE": "ایک مجموعا میں کم از کم ایک صارف ہونا ضروری ہے",
+  "NUMBER_OF_COURSES": "کورس({{%s}})",
+  "NUMBER_OF_COURSE_1": " ({{%s}}) کورس",
   "NUMBER_OF_VOTES": "ووٹوں کی تعداد",
   "OFF": "بند",
   "OFFLINE_DOWNLOAD_MESSAGE": "جب انٹرنیٹ کنیکٹوٹی  موجود ہوگی تو ڈاؤن لوڈ خود ہی جاری ہوجاےگا  ",
@@ -382,6 +784,8 @@
   "OFFLINE_WARNING_ETBUI": "مواد کو دیکھنے کے لئے براہ مہربانی انٹرنیٹ سے رابطہ کریں",
   "OFFLINE_WARNING_ETBUI_1": "مواد دیکھنے کے لئے انٹرنیٹ سے رابطہ کریں",
   "OKAY": "ٹھیک",
+  "ONGOING": "جاری",
+  "ONLY_DIGIT_NUMBER_IS_ALLOWED": "صرف 11 ہندسے کی اجازت ہے",
   "ONLY_DOWNLOADED_CONTENT_CAN_BE_PLAYED_OFFLINE": "صرف ڈاؤن لوڈ کردہ مواد کو آف لائن چلایا جا سکتا ہے",
   "OPEN": "کھولیں",
   "OPEN_SETTINGS": "ترتیبات کھولیں",
@@ -391,16 +795,15 @@
   "ORIGINAL_CONTENT": "مواد",
   "ORIGINAL_CONTENT_DATA": "یہ مواد اخز کیا گیاہے:",
   "OTHER_ROLE_DESC_1": "ڈیجیٹل مواد کو براؤز کریں",
-  "OTHER_ROLE_DESC_2": "آن لائن ٹریننگ لیں",
-  "OTHER_USERS": "دوسرے صارفین",
+  "OTHER_ROLE_DESC_2": "آن لائن کورس لیں",
   "OTP_FAILED": "OTP کی توثیق کرنے میں ناکام۔ بعد میں دوبارہ کوشش کریں۔ ",
   "OTP_PLACEHOLDER": "OTP درج کریں",
   "OTP_RESENT": "OTP دوبارہ بھیج دیا گیا ہے",
   "OVERLAY_INFO_TEXT_COMMON": "تمام خصوصیات تک رسائی حاصل کرنے کیلئے لاگ ان کریں",
-  "OVERLAY_INFO_TEXT_TAKE_COURSE": "ٹریننگ درج شُدہ صارفین کیلئے ہیں. اس ٹریننگ تک رسائی حاصل کرنے کیلئے لاگ ان کریں",
+  "OVERLAY_INFO_TEXT_TAKE_COURSE": "یہ کورس درج شُدہ صارفین کیلئے ہیں. اس کورس تک رسائی حاصل کرنے کیلئے لاگ ان کریں",
   "OVERLAY_LABEL_COMMON": " {{%s}} لامحدود رسائی حاصل کریں",
   "OVERLAY_LABEL_HOME": "آپ کا ذاتی کردہ ہوم ٹیب",
-  "OVERLAY_LABEL_TAKE_COURSE": "اس ٹریننگ میں اندراج کے لنے لاگ ان کریں",
+  "OVERLAY_LABEL_TAKE_COURSE": "اس کورس میں اندراج کے لنے لاگ ان کریں",
   "OVERLAY_SIGN_IN": "لاگ ان",
   "OVER_WIFI": "وائی فائی پر  ",
   "PEOPLE_WHO_FOLLOW_YOU": "پیروکاروں",
@@ -415,32 +818,40 @@
   "PHONE_EDIT_SUCCESS": "موبائل نمبر کامیابی سے اپ ڈیٹ کیا گیا",
   "PHONE_PLACEHOLDER": "فون نمبر",
   "PHONE_UPDATE_SUCCESS": " موبائل نمبر کامیابی سے اپ ڈیٹ کیا گیا",
+  "PLANNED_MAINTENANCE_TEXT": "ہم اس وقت بحالی کیلئے نیچے ہیں۔ لیکن فکر نہ کریں ، ہم جلد ہی واپس آجائیں گے",
+  "PLANNED_MAINTENANCE_TEXT_WITH_TIME": "ہم اس وقت بحالی کیلئے نیچے ہیں۔ لیکن فکر نہ کریں ، ہم واپس آ جائیں گے",
   "PLAY": "چلائیں",
   "PLAY_AS": "کے طور پر کھیلنا",
   "PLAY_FROM_DEVICE": "آلہ سے کھیلے",
   "PLAY_ONLINE": "آن لائن کھیلے",
   "PLEASE_DOWNLOAD_TO_PLAY": "براہ کرم چلانے کے لئے ڈاؤن لوڈ کریں",
+  "PLEASE_ENTER": "{{%s}} درج کریں",
+  "PLEASE_PROVIDE_FOLLOWING_DETAILS": "درج ذیل تفصیلات فراہم کریں",
   "PLEASE_SELECT": "{{%s}}  منتخب کریں",
   "PLEASE_SELECT_A_LANGUAGE": "براہ کرم زبان منتخب کریں",
-  "PLEASE_SELECT_USER": "صارف منتخب کریں",
-  "POPULAR_COURSES": "مقبول  ٹریننگ",
+  "PLEASE_VALIDATE_YOUR_EMAIL_ADDRESS": "اپنے ای میل ایڈریس کی توثیق کریں",
+  "PLEASE_VALIDATE_YOUR_MOBILE_NUMBER": "اپنے موبائل نمبر کی توثیق کریں",
+  "POPULAR_COURSES": "مقبول  کورسز",
+  "POWER_OF_GROUPS": "کیا آپ نے ابھی تک گروپوں کی صلاحیت کی کھوج کی ہے؟",
+  "PREFERENCES_CAN_BE_UPDATED": "آپ پروفائل پیج سے اس صارف کی تفصیلات میں ترمیم کرسکتے ہیں",
   "PREVIEWS": "پیش نظارہ",
   "PREVIOUS_USER_SETTINGS": "پچھلے صارف کی ترتیبات کے ساتھ جاری رکھیں؟",
   "PRINT": "پرنٹ کریں",
-  "PRIVATE": "ذاتی",
+  "PRIVACY_POLICY": "رازداری کی پالیسی",
   "PROFILE_BNAV": "پروفائل",
   "PROFILE_DETAILS_TITLE": " ذاتی معلومات ",
   "PROFILE_UPDATE_FAILED": " آپکاپروفائل اپ ڈیٹ نہیں ہو پایا ، دوبارہ کوشش کریں ",
   "PROFILE_UPDATE_SUCCESS": "آپ کا پروفائل کامیابی سے اپ ڈیٹ کر دیا گیا ہے",
+  "PROGRAMS_DESC": "دیکھیں اور اس میں حصہ لیں\n آپ کے مقام کیلئے فعال تعلیمی پروگرام اور اپنے کردار کے لئے ڈیزائن کیا",
+  "PROGRESS_CANNOT_BE_TRACKED": "پیشرفت کو‪{{collectionType}}‬کے لئے  ٹریک نہیں کیا جاسکتا",
   "PROVIDE_BELOW_INFO": "ذیل میں معلومات فراہم کریں",
   "PUBLIC": "عوام",
   "PUBLISHED_BY": "{{%s}} پر شائع کردہ",
   "PUBLISHED_DATE": "شائع شدہ تاریخ",
+  "PUBLISHER": "ناشر",
   "QR_CODE_DETAILS": " ڈجٹل مواد کی فوری طور پر رسائی حاصل کرنے کے لئے اپنی درسی کتابوں سے QR کوڈ اسکین کریں",
   "QR_SHOWING_MULTIPLE_BOOK_RESULT": "{{%s}} کے لئے نتائج دکھا رہا ہے",
-  "QUESTION": "سوال",
-  "QUESTIONS": "سوالات",
-  "QUESTION_MARKS": "سوالات (سکور)",
+  "QUES_BANKS": "سوال بینکوں",
   "QUIZ": "کوئز",
   "QUIZ_CONTENTS_ONLY_REGISTERED_USERS": "کوئز صرف رجسٹرڈ صارفین کے لئے ہے",
   "RATE": "شرح",
@@ -449,47 +860,62 @@
   "RATING_QUESTION": "کیا آپ ہمیں مزید بتانا پسند کریں گے؟",
   "READ_LESS": "کم پڑا ",
   "READ_MORE": "اور پڑھئے ",
-  "RECENTLY_VIEWED": "حال ہی میں دیکھا ہوا",
+  "RECOMMENDATION_BASED_ON_PROFILE": "آپ کے پروفائل کی تفصیلات پر مبنی یہ سفارشات ہیں",
   "RECOMMENDED": "سفارش شدہ ",
   "RECOVERY_ACCOUNT_UPDATE_SUCCESS": "بازیابی اکاؤنٹ کامیابی کے ساتھ اپڈیٹ ہوا۔",
   "RECOVERY_ID_DESCRIPTION": "اگر آپ لاک آؤٹ ہو جاتے ہیں تو بازیابی کا اکاؤنٹ آپ کو دوبارہ رسائی حاصل کرنے میں مدد کرتا ہے۔ اپنے بازیافت اکاؤنٹ کی قسم کا انتخاب کریں اور تفصیلات درج کریں:",
   "REDO": "دوبارہ کریں",
   "REDO_ASSESSMENT": "تشخیص دوبارہ کریں",
   "REGISTER_TO_COMPLETE_ACCESS": "مواد کی مکمل رسائی حاصل کرنے کے لئے اندراج کریں۔",
-  "REMOVE": "خارج کریں",
+  "REMOVE": "مٹا دیں",
+  "REMOVE_ACTIVITY": "ہٹایئں",
+  "REMOVE_ACTIVITY_ERROR_MSG": "سرگرمی ہٹانے میں ناکامی ہوئ،بعد میں دوبارہ کوشش کریں",
+  "REMOVE_ACTIVITY_GROUP_DESC": "سرگرمی کو ہٹانے سے اسے گروپ کی فہرست سے ہٹاتا ہے اور آپ اس پر ممبر کی پیشرفت نہیں دیکھ پائینگے",
+  "REMOVE_ACTIVITY_POPUP_TITLE": "سرگرمی کو ہٹا دیں؟",
+  "REMOVE_ACTIVITY_SUCCESS_MSG": "سرگرمی کو گروپ سے کامیابی کے ساتھ ہٹا دیا گیا",
   "REMOVE_FROM_DEVICE": "آلہ سے مواد خارج کریں",
   "REMOVE_FROM_DEVICE_MSG": "کیا آپ واقعی یہ مواد آلہ سے خارج کرنا چاہتے ہیں؟",
-  "REMOVE_MULTIPLE_USERS_FROM_GROUP": " {{%s}} صارفین کو خارج کرنا چاہتے ہیں",
-  "REMOVE_USERS": "صارفین کو ہٹا دیں",
-  "REMOVE_USERS_FROM_GROUP": "گروپ سے {{%s}} صارفین کو ہٹا دیں",
-  "REPORTS": "رپورٹیں",
+  "REMOVE_MEMBER": "ممبر کو ہٹا دیں",
+  "REMOVE_MEMBER_ERROR_MSG": "گروپ سے ممبر کو نہیں ہٹا سکے۔ بعد میں دوبارہ کوشش کریں",
+  "REMOVE_MEMBER_GROUP_DESC": "{{member_name}} کو ہٹانااسے مستقل طور پر گروپ سے ہٹاتا ہے",
+  "REMOVE_MEMBER_POPUP_TITLE": "ممبر کو ہٹا دیں?",
+  "REMOVE_MEMBER_SUCCESS_MSG": "{{member_name}} اب اس گروپ کا حصہ نہیں ہے",
+  "REQUEST_CONTENT": "ہمیں یہاں بتائیں",
   "RESEND_OTP": "OTP دوبارہ بھیجیں",
+  "RESET": "ری سیٹ کریں",
   "RESOURCE_TYPE": "وسائل کا قسم ",
-  "RESULT": "نتیجہ",
+  "RESPONSE_ACKNOWLEGED": " جواب کیلئے شکریہ!",
   "RESULTS": "نتائج",
   "RESUME": "دو بارہ شروع",
   "RETRY": "دوبارہ کوشش کریں۔",
   "RETRY_ACTION": "دوبارہ کوشش کریں ",
-  "ROLE_SELECTOR_QUERY": "آپ ہیں ایک ",
+  "ROLE_SELECTOR_QUERY": "بطور مواد دریافت کریں ",
   "SAVE": "سیو  کرئے ",
   "SAVED_ON": "محفوظ کیا ",
-  "SAVED_RESOURCES": "محفوظ وسائل",
   "SAVE_FILE_ON_DEVICE": "ڈیوائس پر فائل کو محفوظ کریں",
   "SCAN_QR_CODE": " کیو آ ر  کوڈز اسکین کریں",
   "SCAN_QR_INSTRUCTION": "اپنے فون کیمرہ کے ساتھ QR کوڈ اسکین کریں",
   "SCAN_TAP": "QR  کوڈ اسکین کریں",
-  "SCORE": "سکور",
-  "SCORED": "اسکور",
+  "SCHOOL_OR_ORG_NAME": "اسکول/ تنظیم کا نام",
+  "SCHOOL_UDISE_ID_OR_ORG_ID": "اسکول  UDISE ID / تنظیم ID",
   "SD_CARD": "ایس ڈی کارڈ",
+  "SEARCH_FOR_GROUP_MEMBER": "گروپ ممبر کی تلاش کریں",
   "SEARCH_HINT": "تلاش کریں",
   "SEARCH_PLACEHOLDER": "مواد تلاش کرنے کے لئے یہاں درج کریں مثال کے طور پر \"کہانی\"",
   "SEARCH_TO_FIND_CONTENT": "مواد پانے کیلئے {{%s}} تلاش کریں",
+  "SECONDS_AGO": "{{%s}} سیکنڈ پہلے",
+  "SECOND_AGO": "{{%s}} سیکنڈ پہلے",
   "SEE_ALL_RESULTS_FOR": "\"{{%s}}\" کے لئے تمام نتائج دیکھیں",
+  "SEE_MORE_BOOKS": "مزید کتابیں اور مواد دیکھیں۔",
+  "SEE_MORE_CONTENT": "مزید مواد دیکھیں",
   "SELECT": "منتخب کریں",
   "SELECTED_TOPICS": "منتخب موضوعات",
+  "SELECT_ACTIVITY": "سرگرمی منتخب کریں",
   "SELECT_ALL": "تمام منتخب کریں",
-  "SELECT_CHAPTER": "باب کا انتخاب کریں",
+  "SELECT_CHAPTER": "ماڈیول کا انتخاب کریں",
   "SELECT_YOUR_STATE": "اپنی ریاست منتخب کریں",
+  "SELF_DECLARED_INFO": "خود اعلان معلومات",
+  "SELF_DECLARE_TEACHER_TNC": "میں ان تفصیلات کو {{%appName}} کے ایڈمنسٹریٹر کے ساتھ اشتراک کرنے پر اتفاق کرتا ہوں",
   "SEND_FILE": "فائل بھیجیں",
   "SERVER_CONNECTION_ERROR": "سرور سے رابطہ  نہیں ہو پا رہا ہیں",
   "SETTINGS": "ترتیبات",
@@ -498,18 +924,18 @@
   "SHARE_APP_LINK": "{{app_name}} ایپ لیں: {{play_store_url}} سے",
   "SHARE_CONTENT_FAILED": "مواد کا  اشتراک کرنے میں قاصر",
   "SHARE_CONTENT_FILE": "فائل بھیج دی گئی: {{app_name}} سے\nنام: {{content_name}}\n {{app_name}} حاصل کیجئے: {{play_store_url}} سے",
-  "SHARE_CONTENT_LINK": "{{content_name}} کو{{content_link}} کی{{app_name}} پردیکھیں\n{{app_name}} ایپ حاصل کری: {{play_store_url}} سے\n",
+  "SHARE_CONTENT_LINK": "{{content_name}} کو {{content_link}} کی{{app_name}} پردیکھیں\n{{app_name}} ایپ حاصل کری: {{play_store_url}} سے\n",
   "SHARE_LINK": "لنک شیئرکریں",
   "SHARE_TELEMETRY": "ٹیلیمیٹری کا اشتراک کریں",
   "SHARE_TELEMETRY_FAILED": "ٹیلیمیٹری کا اشتراک کرنے میں ناکام",
+  "SHARE_TELEMETRY_NO_DATA_FOUND": "ٹیلی میٹری کا کوئی ڈیٹا نہیں ملا",
   "SHARE_THIS": "تقسیم کرنا",
+  "SHARE_USERNAME": "ہائے! آپ ‪{{user_name}}'s‬‪{{app_name}}‬ID:‪{{diksha_id}}‬ وصول کر چکے ہیں",
   "SHOW": "دکھائیں",
   "SHOWING_ITEMS": "{{%s}} آئٹمز دکھا رہا ہے",
   "SHOWING_RESULTS_FOR": "'{{%query}}' کیلئے {{%count}} نتائج دکھا ے جا رہے ہیں",
   "SHOW_LESS": "کم دکھائیں",
   "SHOW_MORE": "مزید دکھائیں ",
-  "SHOW_RECENT": "{{%s}} فائل دکھا ئ جا رہی ہیں",
-  "SIGNED_OUT_ACCOUNT_MESSAGE": "آپ کو موجودہ لاگ ان اکاؤنٹ سے سائن آؤٹ کیا جائے گا",
   "SIGNIN_TO_USE_FEATURE": "اس خصوصیت کو استعمال کرنے کے لئے لاگ ان کریں",
   "SIGN_IN": "لاگ ان",
   "SIZE": "سائز: {{%s}}",
@@ -519,10 +945,13 @@
   "SPACE_AVAILABLE_ON_SDCARD": "ایس ڈی کارڈ پر جگہ دستیاب ہے:",
   "SPACE_TAKEN": "{{%s}} کی طرف سے لی گی جگہ",
   "SPACE_TAKEN_BY_APP": "{{%s}} مواد کی طرف سے لی جانے والی جگہ:",
+  "SPECIAL_CHARACTERS_NOT_SUPPORTED": "یہ فیلڈ آپ کو خصوصی حروف داخل کرنے کی اجازت نہیں دیتا ہے",
   "START": "شروع کریں",
+  "START_AGAIN": "دوبارہ کوشش کریں ",
   "START_ASSESSMENT": "تشخیص شروع کریں",
   "START_COURSE": "اِبتدا کرنا",
   "START_COURSE_NOW": "اب شروع کریں",
+  "START_LEARNING": "سیکھنا شروع کریں",
   "STAR_RATINGS": "درجہ بندی",
   "STATE": "ریاست",
   "STATE_OPTION_TEXT": "ریاست منتخب کریں",
@@ -534,34 +963,103 @@
   "SUBJECT": "مضامین",
   "SUBJECTS": "مضامین",
   "SUBJECT_OPTION_TEXT": "موضوع کا انتخاب کریں",
+  "SUBMIT_MY_DETAILS": "تفصیلات جمع کریں",
+  "SUCCESSFULLY_ADDED_USER": "\"{{%s}}\" کامیابی کے ساتھ  شامل کي گئی",
+  "SUCCESSFULLY_SWITCHED_USER": "ہیلو {{%user}}",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_PHONE": "تمام مواد فون پر منتقل ہو جائیں گے",
   "SUCCESSFUL_CONTENT_TRANSFER_TO_SDCARD": "تمام مواد ایس ڈی کارڈ میں منتقل ہو جائیں گے",
   "SUPPORT": "حمایت",
   "SUPPORT_MESSAGE": "کسی بھی مسائل کا سامنا کرنا پڑا ؟  ہمیں لکھیں",
-  "SWITCHING_TO": "'{{%s}} ' میں تبدیل",
-  "SWITCH_ACCOUNT": "کھاتہ بدلیں",
-  "SWITCH_ACCOUNT_CONFIRMATION": "اکاؤنٹس سوئچ کریں؟",
+  "SWITCH_TO_CLASSIC_THEME": "کلاسیک تھیم پر سوئچ کریں",
+  "SWITCH_TO_JOYFUL_THEME": "خوشگوار تھیم پر سوئچ کریں",
+  "SWITCH_USER": "صارف تبدیل کریں",
   "SYLLABUS": "نصاب",
   "SYNCING_NOW": "مطابقت داري کیجیے ",
   "SYNC_NOW": "ابھی سنک کرئے",
-  "TAKE_ASSESSMENT": "صارف کو کم سے کم ایک تشخیص کرنے کی ضرورت ہے",
   "TAP_SCAN": "{{%s}} کے QR کوڈ کو اسکین کرنے کیلئے ٹیپ کریں",
+  "TBK_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "شروع کرنے کے لئے نصابی کتاب منتخب کریں",
+  "TBK_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "درسی کتاب",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "درسی کتابیں",
+  "TBK_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "درسی کتابیں",
+  "TBK_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": " {{%appName}}لائبریری {{%quesBanks}}, {{%explainVideos}} اور دیگر{{%interactiveMaterial}} کا ایک میزبان ہے.‪لائبریری کی کھوج شروع کرنے کے لئے درسی کتاب پر کلک کریں!",
+  "TBK_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "‪{{%grade}}‬‪({{%medium}})‬کے لئے کوئی کتاب نہیں ملی",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "بورڈ کتابیں شامل کررہا ہے",
+  "TBK_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "آپ کی مضمون کی درسی کتاب {{٪ s}} پر نہیں مل سکی؟",
+  "TBK_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "‪<span>نوٹ :</span>‬نصابی کتب کے لئے ترقی کا سراغ نہیں لگایا جاسکتا",
+  "TBK_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "جب آپ کا اسٹیٹ بورڈ آپ کے ذریعہ درخواست کردہ کتابیں اپ لوڈ کرتا ہے تو ہم آپ کو {{%s}}پر مطلع کریں گے",
+  "TBK_NONTRK_QR_CODE_DETAILS": "اپنی درسی کتاب سے QR کوڈ اسکین کرکے ڈیجیٹل مواد تک فوری رسائی حاصل کریں",
+  "TBK_NONTRK_SEE_MORE_BOOKS": "مزید کتابیں اور مواد دیکھیں",
+  "TBK_NONTRK_STUDENT_ROLE_DESC_1": "درسی کتب اور ڈیجیٹل مواد کو براؤز کریں",
+  "TBK_NONTRK_TEACHER_ROLE_DESC_1": "درسی کتابیں اور ڈیجیٹل مواد کو براؤز کریں",
+  "TBK_NONTRK_TUTORIAL_HEADING": "ویڈیوز ، انٹرایکٹو مواد ، ای ٹیکسٹ بوکس اور بہت کچھ ...",
+  "TBK_TRK_BATCHEND_MAIN_HEADING": "آپ درسی کتاب پڑھنے کے بیچ میں شامل ہو گئے ہیں جو‪{{%s}}‬پر مکمل ہوچکے ہیں",
+  "TBK_TRK_BATCHEND_SUB_HEADING": "آپ سیکھنا جاری رکھ سکتے ہیں ، لیکن آپ کی پیشرفت تازہ نہیں ہوگی",
+  "TBK_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "آپ نے اس باب کو ختم کردیا ہے",
+  "TBK_TRK_COMPLETE_TRAINING_TO_EARN_CERTIFICATE": "‪{{%s}}‬کے بذریعہ مکمل نصابی کتاب",
+  "TBK_TRK_FRMELEMNTS_COURSE_NOT_AVAILABLE": "یہ درسی کتاب غیر فعال ہے",
+  "TBK_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "درسی کتاب",
+  "TBK_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "آپ نے یہ درسی کتاب پڑھی ہے",
+  "TBK_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "درسی کتاب کے لئے بیچز",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "کام",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "میری نصابی کتابیں",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "بیچ ختم ہوا",
+  "TBK_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "آخری بار {{last_updated_on_date}} کو اپ ڈیٹ ہوا",
+  "TBK_TRK_FRMELEMNTS_LBL_JOIN_TRAINING": "شامل ہوں",
+  "TBK_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "تازہ ترین درسی کتابیں",
+  "TBK_TRK_FRMELEMNTS_LBL_LEAVE_TRAINING_HEADING": "کام چھوڑ دو؟",
+  "TBK_TRK_FRMELEMNTS_LBL_LOGIN_TO_JOIN_TRAINING": "شامل ہونے کے لئے لاگ ان کریں",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_COURSES": "درسی کتابیں نہیں ہیں",
+  "TBK_TRK_FRMELEMNTS_LBL_NO_DOWNLOADS_INFO": "مواد ڈاؤن لوڈ کریں",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "درسی کتابیں‪({{%s}})‬",
+  "TBK_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "درسی کتاب ({{٪ s}})",
+  "TBK_TRK_FRMELEMNTS_LBL_OTHER_ROLE_DESC_2": "آن لائن سیکھنا لیں",
+  "TBK_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "مشہور درسی کتابیں",
+  "TBK_TRK_FRMELEMNTS_LBL_TEACHER_ROLE_DESC_2": "آن لائن سیکھنا لیں",
+  "TBK_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "سرٹیفکیٹ حاصل کرنے کے {{%s}}کام کو مکمل کریں",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING": "سیکھنا کام",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "سیکھنے کے کام میں شرکت کی",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "درسی کتاب کی تفصیلات",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "ٹاسک ختم ہوتا ہے",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "کام ختم ہونے کی تاریخ",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "ٹاسک کی تفصیلات",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "اس کام کے لئے متعلقہ ہے:",
+  "TBK_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "باب",
+  "TBK_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "درسی کتاب کی سرگرمی بند کریں",
+  "TBK_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "درسی کتاب کی سرگرمیاں دیکھنا چاہتے ہیں؟",
+  "TBK_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "درسی کتاب کا بیچ ‪‪{{batch_start_date}}‬سے دستیاب ہے",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "آپ کو سند کے بارے میں رجسٹرڈ رابطے کی تفصیلات کے بارے میں 7 دن کے اندر مطلع کیا جائے گا",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "نوٹ: اس درسی کتاب میں سند نہیں ہے",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "آپ نے یہ درسی کتاب پڑھی ہے",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "نوٹ: فی الحال ، اس کام کے پاس سند نہیں ہے۔ تخلیق کنندہ بعد میں سرٹیفکیٹ منسلک کرسکتا ہے۔",
+  "TBK_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "آپ نے درسی کتاب پڑھنا چھوڑ دیا ہے",
+  "TBK_TRK_FRMELEMNTS_MSG_ERROR_NO_BATCHES_FOUND": "اس درسی کتاب کے کام کیلئے کوئی بیچز نہیں ہیں",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "درسی کتاب رجسٹرڈ صارفین کے لئے ہے۔ درسی کتاب تک رسائی کے ل. لاگ ان کریں",
+  "TBK_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "اس درسی کتاب کو پڑھنے کے لئے لاگ ان کریں",
+  "TBK_TRK_FRMELEMNTS_MSG_THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "اس کام کے لئے کوئی بیچس دستیاب نہیں ہے",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "صرف رجسٹرڈ صارف سیکھنے کے کام انجام دے سکتے ہیں",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "آپ نے یہ کام کامیابی کے ساتھ مکمل کرلیا ہے",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "کام ختم ہوا۔ آپ اس تشخیص کو دوبارہ کر سکتے ہیں لیکن ، آپ کی پیشرفت ریکارڈ نہیں کی جائے گی۔",
+  "TBK_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "کام ختم ہوا۔ آپ اس تشخیص کو لے سکتے ہیں لیکن ، آپ کی پیشرفت ریکارڈ نہیں ہوگی۔",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "درسی کتاب کی تفصیلات دیکھنے اور ان تک رسائی کے ل  آپ کو ایک فعال بیچ میں شامل ہونا ضروری ہے",
+  "TBK_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "درسی کتاب کی تفصیلات تک رسائی کے لئے آپ کو لاگ ان کرنا ہوگا",
   "TEACHER_ID_ENTER_LABEL": "تصدیق کے لئے اپنا اساتذہ آی ڈی درج کریں",
   "TEACHER_ID_PLACEHOLDER": "مثال کے طور پر ، ER12345",
   "TEACHER_ID_VERIFICATION": "اساتذہ آی ڈی تصدیق",
   "TEACHER_PROFILE_FAILED": "اساتذہ کے پروفائل کی تصدیق نہیں ہوسکی کیونکہ درج کردہ اساتذہ کی آئ ڈی غلط ہے",
   "TEACHER_PROFILE_VERIFIED": "ٹیچر پروفائل کامیابی کے ساتھ تصدیق شدہ",
   "TEACHER_ROLE_DESC_1": "درسی کتب اور ڈیجیٹل مواد کو براؤز کریں",
-  "TEACHER_ROLE_DESC_2": "آن لائن ٹریننگ لیں",
+  "TEACHER_ROLE_DESC_2": "آن لائن کورسز لیں",
   "TEACHER_ROLE_DESC_3": "سبق کے منصوبے دریافت کریں",
   "TELL_US_MORE": "مزید بتائیں ...",
   "TERMS_OF_USE": "استعمال کرنے کی شرائط",
   "TEXTBOOK": "درسی کتاب",
+  "TEXTBOOKS": "درسی کتاب",
+  "THANKING_NOTE": "جیسے ہی آپ کا ریاستی بورڈ آپ کی درخواست کی کتابوں کو{{%s}} پر اپ لوڈ کرتا ہے آپ کو مطلع کریں گے",
   "THANK_FOR_RATING": " درجہ بندی کے لئے شکریہ",
-  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "اس ٹریننگ کے لئے کوئی بیچ دستیاب نہیں ہے",
+  "THANK_YOU_FOR_SUBMITTING_YOUR_DETAILS": "اپنی تفصیلات پیش کرنے کا شکریہ",
+  "THERE_ARE_NO_BATCHES_AVAILABLE_FOR_THIS_TRAINING": "اس کورس کے لئے کوئی بیچ دستیاب نہیں ہے",
   "THIS_IS_A_RESTRICTED_COMMUNITY": " یہ  ایک محدود برادری ہے",
   "TICKET_SUMMARY": "ٹکٹ کا خلاصہ",
-  "TIME": "وقت",
   "TIME_OUT": "سرور سے رسائی کا وقت منقطع ہوا، بعد میں دوبارہ کوشش کریں",
   "TITLE": "عنوان",
   "TITLE_UPGRADE_POPUP": "ہم نے مواد کے اندر موجود تصاویر اور آڈیو کی گمشدگیوں کے لئے درپیش مشکلات کو دور کردیا ہے۔ بہتر تجربے کیلئے، ہم تجویز کرتے ہیں کہ آپ DIKSHA کے تازہ ترین ورژن میں اپ گریڈ کریں۔",
@@ -570,21 +1068,20 @@
   "TOPICS": "موضوعات",
   "TOPIC_YOU_MIGHT_LIKE": "دلچسپی کے موضوعات کا تلاش کریں",
   "TOTAL_SIZE": "کل سائز :",
-  "TOTAL_TIME": "مکمل وقت",
   "TO_DO": "ایسا کرنے کے لئے",
-  "TO_EARN_CERTIFICATE": "سرٹیفکیٹ حاصل کرنے کے لئے  {{%s}} تک  ٹریننگ مکمل کریں",
-  "TRAINING": "ٹریننگ",
-  "TRAININGS_ATTENDED": "تربیت میں شرکت",
-  "TRAININGS_ONLY_REGISTERED_USERS": "ٹریننگ صرف رجسٹرڈ صارفین کے لئے ہے۔",
-  "TRAINING_COMPLETED_SUCCESSFULLY": "آپ نے یہ ٹریننگ کامیابی کے ساتھ مکمل کرلی ہے۔",
-  "TRAINING_DETAILS": "تربیت کی تفصیلات",
-  "TRAINING_ENDED_REDO_ASSESSMENT": "ٹریننگ ختم ہوچکی ہے۔ آپ اس تشخیص کو دوبارہ کر سکتے ہیں لیکن ، آپ کی پیشرفت ریکارڈ نہیں کی جائے گی۔",
-  "TRAINING_ENDED_START_ASSESSMENT": " یہ ٹریننگ ختم ہوچکی ہے۔ آپ اس تشخیص کو لے سکتے ہیں لیکن ، آپ کی پیشرفت ریکارڈ نہیں ہوگی۔",
-  "TRAINING_ENDS_ON": "تربیت ختم ہوتی ہے",
-  "TRAINING_END_DATE": "ٹریننگ کی اختتامی تاریخ",
-  "TRAINING_INFO": "تربیت کی معلومات۔",
-  "TRAINING_IS_RELEVANT_TO_TEACHERS": "ٹریننگ اساتذہ سے متعلق ہے",
-  "TRAINING_MODULES": "ٹریننگ ماڈیولز۔",
+  "TO_EARN_CERTIFICATE": "سرٹیفکیٹ حاصل کرنے کے لئے  {{%s}} تک  کورس مکمل کریں",
+  "TRAINING": "کورس",
+  "TRAININGS_ATTENDED": "کورس میں شرکت",
+  "TRAININGS_ONLY_REGISTERED_USERS": "کورس صرف رجسٹرڈ صارفین کے لئے ہے",
+  "TRAINING_COMPLETED_SUCCESSFULLY": "آپ نے یہ کورس کامیابی کے ساتھ مکمل کرلیا ہے",
+  "TRAINING_DETAILS": "کورس کی تفصیلات",
+  "TRAINING_ENDED_REDO_ASSESSMENT": "کورس ختم ہوچکی ہے۔ آپ اس تشخیص کو دوبارہ کر سکتے ہیں لیکن ، آپ کی پیشرفت ریکارڈ نہیں کی جائے گی۔",
+  "TRAINING_ENDED_START_ASSESSMENT": " یہ کورس ختم ہوچکی ہے۔ آپ اس تشخیص کو لے سکتے ہیں لیکن ، آپ کی پیشرفت ریکارڈ نہیں ہوگی۔",
+  "TRAINING_ENDS_ON": "کورس ختم ہوتی ہے",
+  "TRAINING_END_DATE": "کورس کی اختتامی تاریخ",
+  "TRAINING_INFO": "کورس کی تفصیلات",
+  "TRAINING_IS_RELEVANT_TO_TEACHERS": "اس کورس کے لئے متعلقہ ہے:",
+  "TRAINING_MODULES": "کورس کے ماڈیولز",
   "TRANSFERRING_CONTENT_TO_PHONE": "مواد کو فون پر منتقل کیا جا رہا ہے",
   "TRANSFERRING_CONTENT_TO_SDCARD": "ایس ڈی کارڈ میں مواد منتقل کیا جا رہا ہے",
   "TRANSFERRING_FILES": "فائلوں کو منتقل کیا جا رہا",
@@ -594,9 +1091,64 @@
   "TRY_AGAIN": "دوبارہ کوشش کریں",
   "TRY_BEFORE_RATING": "درجہ بندی سے قبل مواد کو استمعال کریں",
   "TRY_DIFF_QR": "مختلف QR کوڈ کا استعمال کریں؟",
+  "TUTORIAL_BUTTON": "شروع کرنے کے لئے درسی کتاب منتخب کریں",
+  "TUTORIAL_HEADING": "ویڈیوز ، انٹرایکٹو مواد ، ای درسی کتابیں اور بہت کچھ ...",
+  "TVC_NONTRK_FRMELEMNTS_BTN_TUTORIAL_BUTTON": "شروع کرنے کے لئے ایک ٹی وی کلاس کا انتخاب کریں",
+  "TVC_NONTRK_FRMELEMNTS_LBL_ACTIVITY_TEXTBOOK_TITLE": "ٹی وی کلاسز",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOK": "ٹی وی کلاسز",
+  "TVC_NONTRK_FRMELEMNTS_LBL_TEXTBOOKS": "ٹی وی کلاسز",
+  "TVC_NONTRK_FRMELEMNTS_MSG_DETAIL_TUTORIAL": "{{appName%}} کی لائبریری میں {{explainVideos%}} ،‏  {{quesBanks%}} اور دیگر {{interactiveMaterial%}} کا مجموعہ دستیاب ہے ۔ لائبریری کی دریافت شروع کرنے کے لئے ٹی وی کلاس پر کلک کریں!",
+  "TVC_NONTRK_FRMELEMNTS_MSG_EMPTY_LIBRARY_TEXTBOOK_FILTER": "‪{{%grade}}‬‪({{%medium}})‬کیلئے ٹی وی کی کوئی کلاس نہیں ملی",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_AVAILABLE": "بورڈ ٹی وی کلاسوں کو شامل کررہا ہے",
+  "TVC_NONTRK_FRMELEMNTS_MSG_NO_BOOKS_TEXT": "{{%s}}پر ٹی وی کلاس نہیں مل سکا؟",
+  "TVC_NONTRK_FRMELEMNTS_MSG_PROGRESS_CANNOT_BE_TRACKED": "‪ ٹی وی کے لئے<span>نوٹ :</span>‬ترقی کا سراغ نہیں لگایا جاسکتا",
+  "TVC_NONTRK_FRMELEMNTS_MSG_THANKING_NOTE": "جب آپ کا اسٹیٹ بورڈ آپ کے ذریعہ {{%s}}پر درخواست کردہ ٹی وی کلاس اپ لوڈ کرے گا تو ہم آپ کو مطلع کریں گے",
+  "TVC_NONTRK_QR_CODE_DETAILS": "اپنی ٹی وی کلاس سے QR کوڈ اسکین کرکے ڈیجیٹل مواد تک فوری رسائی حاصل کریں۔",
+  "TVC_NONTRK_SEE_MORE_BOOKS": "ٹی وی کی مزید کلاسیں اور مواد دیکھیں",
+  "TVC_NONTRK_STUDENT_ROLE_DESC_1": "ٹی وی کلاسز اور ڈیجیٹل مواد کو براؤز کریں",
+  "TVC_NONTRK_TEACHER_ROLE_DESC_1": "ٹی وی کلاسز اور ڈیجیٹل مواد کو براؤز کریں",
+  "TVC_NONTRK_TUTORIAL_HEADING": "ویڈیوز ، انٹرایکٹو مواد ، ای ٹیکسٹ بوکس اور بہت کچھ ...",
+  "TVC_TRK_BATCHEND_MAIN_HEADING": "آپ کسی ٹی وی کلاس کے بیچ میں شامل ہوچکے ہیں جو {{%s}}پر مکمل ہوچکا ہے",
+  "TVC_TRK_CHAPTER_TRAINING_COMPLETED_SUCCESSFULLY": "آپ نے یہ پروگرام ختم کردیا ہے",
+  "TVC_TRK_FRMELEMNTS_LBL_ACTIVITY_COURSE_TITLE": "ٹی وی کلاسز",
+  "TVC_TRK_FRMELEMNTS_LBL_ALREADY_ENROLLED_COURSE": "آپ نے یہ ٹی وی کلاس دیکھی ہے",
+  "TVC_TRK_FRMELEMNTS_LBL_BATCHES_FOR_THIS_COURSE": "ٹی وی کلاسوں کے لئے بیچز",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_BNAV": "ٹاسک",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSES_IN_PROGRESS": "میرے ٹی وی کلاسز",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_ENDED_ON": "بیچ ختم ہوچکاہے",
+  "TVC_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON": "آخری بار {{last_updated_on_date}} کو اپ ڈیٹ ہوا",
+  "TVC_TRK_FRMELEMNTS_LBL_LATEST_COURSES": "تازہ ترین ٹی وی کلاسز",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSES": "ٹی وی کلاسز ({{٪ s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_NUMBER_OF_COURSE_1": "ٹی وی کلاسز ({{٪ s}})",
+  "TVC_TRK_FRMELEMNTS_LBL_POPULAR_COURSES": "مشہور ٹی وی کلاسز",
+  "TVC_TRK_FRMELEMNTS_LBL_TO_EARN_CERTIFICATE": "سرٹیفکیٹ حاصل کرنے کے ‪{{%s}}‬ کام کو مکمل کریں",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING": "کام سیکھنا",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAININGS_ATTENDED": "سیکھنے کے کام (زبانیں) نے شرکت کی",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_DETAILS": "ٹی وی کلاس کی تفصیلات",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_ENDS_ON": "ٹاسک ختم ہوتا ہے",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_END_DATE": "کام ختم ہونے کی تاریخ",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_INFO": "ٹاسک کی تفصیلات",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_IS_RELEVANT_TO_TEACHERS": "اس کام کے لئے متعلقہ ہے:",
+  "TVC_TRK_FRMELEMNTS_LBL_TRAINING_MODULES": "ٹی وی پروگرام",
+  "TVC_TRK_FRMELEMNTS_LBL_UNENROLL_FROM_COURSE": "ٹی وی کلاس دیکھنا چھوڑ دو",
+  "TVC_TRK_FRMELEMNTS_LBL_WANT_TO_CHECK_FREE_TRAININGS": "ٹی وی کی کلاس سیکھنا چاہتے ہیں؟",
+  "TVC_TRK_FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE": "‪{{batch_start_date}}‬ سے ٹی وی کلاس کا بیچ دستیاب ہے",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_DESC": "آپ کو سند کے بارے میں رجسٹرڈ رابطے کی تفصیلات کے بارے میں 7 دن کے اندر مطلع کیا جائے گا",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_COMPLETION_POPUP_NO_CERTIFICATE": "نوٹ: اس کام میں سرٹیفکیٹ نہیں ہے",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_ENROLLED": "آپ نے یہ ٹی وی کلاس دیکھی ہے",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_NO_CERTIFICATE_MESSAGE": "نوٹ: فی الحال ، اس کام کے پاس سند نہیں ہے۔ تخلیق کنندہ بعد میں سرٹیفکیٹ منسلک کرسکتا ہے۔",
+  "TVC_TRK_FRMELEMNTS_MSG_COURSE_UNENROLLED": "آپ نے ٹی وی کلاس دیکھنا چھوڑ دیا ہے",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_INFO_TEXT_TAKE_COURSE": "ٹی وی کلاس رجسٹرڈ صارفین کے لئے ہیں۔ ٹی وی کلاس تک رسائی حاصل کرنے کے لئے لاگ ان کریں",
+  "TVC_TRK_FRMELEMNTS_MSG_OVERLAY_LABEL_TAKE_COURSE": "اس ٹی وی کلاس کو دیکھنے کے لئے لاگ ان کریں",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAININGS_ONLY_REGISTERED_USERS": "صرف رجسٹرڈ صارف سیکھنے کے کام انجام دے سکتے ہیں",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_COMPLETED_SUCCESSFULLY": "آپ نے یہ کام کامیابی کے ساتھ مکمل کرلیا ہے",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_REDO_ASSESSMENT": "کام ختم ہوا۔ آپ اس تشخیص کو دوبارہ کر سکتے ہیں لیکن ، آپ کی پیشرفت ریکارڈ نہیں کی جائے گی۔",
+  "TVC_TRK_FRMELEMNTS_MSG_TRAINING_ENDED_START_ASSESSMENT": "کام ختم ہوا۔ آپ اس تشخیص کو لے سکتے ہیں لیکن ، آپ کی پیشرفت ریکارڈ نہیں ہوگی۔",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_AN_ACTIVE_BATCH": "آپ کو ٹی وی کی کلاس دیکھنے اور ان تک رسائی کے لئے ایک فعال بیچ میں شامل ہونا ضروری ہے",
+  "TVC_TRK_FRMELEMNTS_MSG_YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "آپ کو رسائی ٹی وی کلاس کی تفصیلات میں لاگ ان کرنا ہوگا",
   "UNABLE_TO_FETCH_CONTENT": "ریٹائرڈ مواد حاصل کرنے میں قاصر",
   "UNENROLL_CONFIRMATION_MESSAGE": "آپ بعد میں کسی فعال یا آنے والے بیچ میں دوبارہ شامل ہو سکتے ہیں۔",
-  "UNENROLL_FROM_COURSE": "ٹریننگ چھوڈئیے",
+  "UNENROLL_FROM_COURSE": "کورس چھوڈئیے",
   "UNIT_COMING_SOON": "جلدی آ رہا ہے !",
   "UNKNOWN_QR": "لگتا ہے آپ نے ایک غلط QR کوڈ سکین کیا ہے",
   "UNSELECT_ALL": "سب کو غیر منتخب کریں",
@@ -607,55 +1159,66 @@
   "UPDATE_APP_TITLE": "اپلی کیشن کا نیا ورژن دستیاب ہے",
   "UPDATE_CONFIRMATION_TEXT": "کیا آپ واقعی مواد کو اپ ڈیٹ کرنا چاہتے ہیں؟",
   "UPDATE_CONTENT": "({{%s}}) مواد کو  اپ ڈیٹ کریں",
+  "UPDATE_DETAILS": "تفصیلات اپ ڈیٹ کریں",
   "UPDATE_RECOVERY_ID": "اپ ڈیٹ بحالی ای ڈی ",
   "UPDATE_REQUIRED": "اپ ڈیٹ کی ضرورت ہے",
+  "UPDATE_YOUR_PREFERENCE_FROM_PROFILE": "آپ پروفائل کی ترتیبات سے اپنے{{app_name}} پروفائل کی تفصیلات میں ترمیم کرسکتے ہیں",
   "UPDATING": "اپ ڈیٹ ہو رہا ہے",
   "UPDATING_CONTENT": "اپ ڈیٹ ہو رہا  ہیں {{%s}} %",
-  "USER": "صارف",
   "USERNAME": "صارف کا  نام : {{%s}}",
-  "USERS": "صارفین",
-  "USERS_AND_GROUPS": "صارفین اور مجموعات",
   "USER_CREATED_SUCCESSFULLY": "صارف کامیابی سے تخلیق کیا گیا",
-  "USER_DELETE_CONFIRM": "کیا آپ واقعی '{{%s}}'کو خارج کرنا چاہتے ہیں؟",
-  "USER_DELETE_CONFIRM_MESSAGE": "یہ عمل ناقابل قبول ہے. خارج  کردہ صارف کی تفصیلات دستیاب نہیں ہوگی",
-  "USER_DELETE_CONFIRM_MESSAGE_FROM_GROUP": "'{{%s}}' ہٹانے کی تصدیق کرنا چاہتے ہیں؟",
-  "USER_DELETE_CONFIRM_SECOND_MESSAGE": "یہ عمل صارفین کو گروپ سے  ہٹاتا ہے. تمام صارفین کی تفصیلات صارف ٹیب میں دستیاب ہیں",
   "USER_ID": "صارف کی آئ ڈی",
   "USER_IS_NOT_VERIFIED": "آپ کے صارف آئ ڈی کی تصدیق نہیں ہوئی ہے",
   "USER_NAME": "صارف کا نام",
   "USER_TYPE": "صارف کی قسم",
   "USER_TYPE_1": "استاد",
   "USER_TYPE_2": "طالب علم",
-  "USER_TYPE_3": "دیگر",
+  "USER_TYPE_3": "دوسرے",
+  "USER_TYPE_5": "والدین",
   "USER_TYPE_SELECT_WARNING": "صارف کی قسم منتخب کریں",
   "USER_VERIFICATION": "صارف کی تصدیق",
+  "USE_APP_AS": "بطور{{%s}} استعمال کریں",
+  "VALIDATION_MAXIMUM_LENGTH": "زیادہ سے زیادہ لمبائی 11 نمبر ہونی چاہئے",
+  "VALIDATION_MINIMUM_LENGTH": "کم سے کم لمبائی 11 نمبر ہونی چاہئے",
+  "VERIFY": "تصدیق",
   "VERIFY_EMAIL_OTP_DESCRIPTION": "آپ کو ای میل آئ ڈ ی کی تصدیق کے   لئے ایک ای میل میں OTP حاصل ہوگا",
   "VERIFY_EMAIL_OTP_TITLE": "ای میل آئ ڈی کی تصدیق کریں",
   "VERIFY_PHONE_OTP_DESCRIPTION": "آپ کو موبائل نمبر کی توثیق کے لئے OTP کے ساتھ ایک ایس ایم ایس مل جائے گا",
   "VERIFY_PHONE_OTP_TITLE": "موبائل نمبر کی تصدیق کریں",
   "VERSION": "ورژن",
-  "VIDEOS": "ویڈیو ز",
+  "VERYFYING_PLEASE_WAIT": "تصدیق کر رہے ہیں",
+  "VIDEO": "ویڈیو ز",
   "VIEW": "ملاحظہ کریں",
+  "VIEW_ACTIVITY": "سرگرمی دیکھیں",
   "VIEW_ALL": "سب دیکھیں",
   "VIEW_ALL_BATCHES": "آگے بڑھنے کے لئے ایک بیچ منتخب کریں",
   "VIEW_CREDITS_INFO": "لائسنسنگ معلومات دیکھیں",
   "VIEW_DOWNLOADS_ONLY_MSG": "صرف ڈاؤن لوڈ دیکھیں",
   "VIEW_MORE": "مزید دیکھیں",
   "VIEW_ONGOING_BATCHES": "دستے جو جاری ہیں ",
+  "VIEW_OPEN_BATCHES": " بیچ کھولیں",
   "VIEW_RETIRED_BATCHES": "بیچ ختم ہو گیا",
   "VIEW_UPCOMING_BATCHES": " آنے والے بیچ ملاحظہ کریں",
   "WAITING_TO_DOWNLOAD": "ڈاؤن لوڈ کرنے کا انتظار",
   "WAIT_REQUEST": "مواد لائے جارہے ہیں",
+  "WANT_TO_CHECK_FREE_TRAININGS": "کورسز چیک کرنا چاہتے ہیں؟",
   "WARNING_PLEASE_MAKE_SOME_CHANGES": "تبدیلیاں کیجیے ",
   "WEBVIEW_UPDATE_TEXT": " موثر تجربے کے لئے گوگل پلے اسٹور سے ویب ویو کا لیٹسٹ ورژن ڈاؤن لوڈ کریں۔",
+  "WEEKS_AGO": "{{٪ s}} ہفتے پہلے",
+  "WEEK_AGO": "{{%s}} ہفتے پہلے",
+  "WELCOME": "خوش آمدید",
   "WELCOME_BACK": "خوش آمدید {{%s}} ",
+  "WHAT_IS_MEMBER_ID": "میں {{app_name}} ID کہاں دیکھ سکتا ہوں؟",
+  "YEARS_AGO": "{{%s}} سال پہلے",
+  "YEAR_AGO": "{{%s}} سال پہلے",
   "YES": "جی ہاں",
+  "YOUR_ID_FROM_STATE_BOARD_ORG": "ریاست / بورڈ / تنظیم سے آپ کی ID",
   "YOUR_LOCATION": "آپ کا مقام",
   "YOUR_LOCATION_DETAILS": "آپ کے مقام کی تفصیلات آپ کو متعلقہ مواد فراہم کرنے میں ہماری مدد کرتی ہیں۔ چیک کریں کہ آیا آپ کا مقام درست ہے ، ورنہ اپنے مقام کو دوبارہ تلاش کریں اور اسے جمع کروائیں۔",
   "YOUR_PROGRESS": "آپ کی پیش رفت: {{%s}}%",
   "YOUR_PROGRESS_LABEL": "آپ کی ترقی",
   "YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET": "آپ انٹرنیٹ سے منسلک نہیں ہیں",
-  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "ٹریننگ کی تفصیلات دیکھنے اور ان تک رسائی کے لیے آپ کو ایک فعال بیچ میں شامل ہونا ضروری ہے۔",
-  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "ٹریننگ کی تفصیلات تک رسائی کے لیے آپ کو لاگ ان کرنا ہوگا",
+  "YOU_MUST_JOIN_AN_ACTIVE_BATCH": "کورس کی تفصیلات دیکھنے اور ان تک رسائی کے لیے آپ کو ایک فعال بیچ میں شامل ہونا ضروری ہے۔",
+  "YOU_MUST_JOIN_TO_ACCESS_TRAINING_DETAIL": "کورس کی تفصیلات تک رسائی کے لیے آپ کو لاگ ان کرنا ہوگا",
   "YOU_MUST_LOGIN_TO_ACCESS_QUIZ_CONTENT": "اس مواد تک رسائ کے لئے آپ کو لاگ ان کرنا ہوگا"
 }
\ No newline at end of file
diff --git a/src/assets/imgs/add_member_step_1.png b/src/assets/imgs/add_member_step_1.png
new file mode 100644
index 000000000..8e7ba03c9
Binary files /dev/null and b/src/assets/imgs/add_member_step_1.png differ
diff --git a/src/assets/imgs/add_member_step_2.svg b/src/assets/imgs/add_member_step_2.svg
new file mode 100644
index 000000000..f83e06364
--- /dev/null
+++ b/src/assets/imgs/add_member_step_2.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="284px" height="178px" viewBox="0 0 284 178" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Group 2@1x</title>
+    <defs>
+        <filter x="-4.5%" y="-7.5%" width="109.0%" height="115.0%" filterUnits="objectBoundingBox" id="filter-1">
+            <feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.19 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
+            <feMerge>
+                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
+                <feMergeNode in="SourceGraphic"></feMergeNode>
+            </feMerge>
+        </filter>
+        <rect id="path-2" x="0" y="0" width="266" height="160" rx="4"></rect>
+    </defs>
+    <g id="Home-Schooling-V3" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="DIKSHA-id-info1" transform="translate(-38.000000, -423.000000)">
+            <g id="Group-2" transform="translate(47.000000, 432.000000)">
+                <g id="Screenshot-2020-06-25-at-1.12.19-PM" filter="url(#filter-1)">
+                    <mask id="mask-3" fill="white">
+                        <use xlink:href="#path-2"></use>
+                    </mask>
+                    <use id="Mask" fill="#FFFFFF" xlink:href="#path-2"></use>
+                    <image mask="url(#mask-3)" x="0.807219662" y="0" width="264.385561" height="145" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAACUYAAAUWCAYAAABU1ftRAAAMTmlDQ1BJQ0MgUHJvZmlsZQAASImVlwdcU1cXwO8bmSSsQARkhL0EEQQCyAhhRRCQKYhKSAIJI4aEoOKmlCpYt4iCC62KKLZaAakTtc4iuK2jOFCp1OLAhcp3M6DWfuP3nd/vvvfPueeee87Jfe/dC4BeLV8my0f1ASiQFskTIkNZk9LSWaSHAAE6AAWuwIMvUMg48fExAMrQ/e/y+hq0hnLZTeXrn/3/VQyEIoUAACQecpZQISiA/CMAeKlAJi8CgMiGetsZRTIVZ0A2ksMAIctUnKPhMhVnabhabZOUwIW8GwAyjc+X5wCg2wL1rGJBDvSjewOyh1QokQKgR4YcJBDzhZCjII8qKJiuYmgHnLI+85PzN59Zwz75/Jxh1uSiFnKYRCHL58/6P8vxv6UgXzk0hwNsNLE8KkGVM6zbjbzp0SqmQe6VZsXGQTaE/FYiVNtDRqliZVSyxh41Fyi4sGaACdlDyA+LhmwOOUKaHxuj1WdlSyJ4kOEKQWdKinhJ2rGLRIrwRK3PWvn0hLghzpZzOdqxjXy5el6V/UllXjJH6/+GWMQb8v+qRJyUCpkKAEYtlqTEQtaFbKTIS4zW2GA2JWJu7JCNXJmgit8OMlskjQzV+McysuURCVp7WYFiKF+sXCzhxWq5ukicFKWpD7ZLwFfHbwK5SSTlJA/5ESkmxQzlIhSFhWtyx9pF0mRtvthdWVFognZsnyw/XmuPk0X5kSq9DWQzRXGidiw+rgguSI1/PEZWFJ+kiRPPzOWPj9fEgxeDGMAFYYAFlLBlgekgF0jae5t74S9NTwTgAznIASLgptUMjUhV90jhNRGUgD8giYBieFyoulcEiqH+47BWc3UD2ereYvWIPPAIcgGIBvnwt1I9Sjo8Wwp4CDWSf8wugLHmw6bq+6eOAzUxWo1yyC9Lb8iSGE4MI0YRI4jOuBkehAfgMfAaApsnzsb9hqL9y57wiNBJuE+4Sugi3JwmKZV/EcsE0AX9R2gzzvo8Y9wB+vTGQ/FA6B16xpm4GXDDx8J5OHgwnNkbarnauFW5s/5NnsMZfFZzrR3Fg4JSRlBCKE5fjtR10fUe9qKq6Of10cSaNVxV7nDPl/NzP6uzEN6jv7TEFmH7sdPYcewsdghrBizsKNaCXcAOq3h4DT1Ur6Gh2RLU8eRBP5J/zMfXzqmqpMKjwaPH44O2DxSJZqrej4A7XTZLLskRF7E48M0vYvGkAvdRLE8PTw8AVN8RzWvqJVP9fUCY5/7SFR4DwK8CKnP+0vFtATj4CADG6790ti/g47EcgMMdAqW8WKPDVRcCfBvowSfKFFgCW+AEM/IEPiAAhIBwMB7EgSSQBqbCOovhepaDGWAOWAjKQSVYDtaA9WAT2Ap2gj1gH2gGh8Bx8DM4DzrAVXALrp9u8BT0gddgAEEQEkJHGIgpYoXYI66IJ8JGgpBwJAZJQNKQTCQHkSJKZA7yFVKJrETWI1uQeuQH5CByHDmLdCI3kXtID/ICeY9iKA01Qi1QB3Q0ykY5aDSahE5Bc9BCtAQtQ5ei1WgduhttQo+j59GraBf6FO3HAKaDMTFrzA1jY1wsDkvHsjE5Ng+rwKqwOqwRa4X/9GWsC+vF3uFEnIGzcDe4hqPwZFyAF+Lz8CX4enwn3oSfxC/j9/A+/BOBTjAnuBL8CTzCJEIOYQahnFBF2E44QDgFn6ZuwmsikcgkOhJ94dOYRswlziYuIW4g7iUeI3YSHxD7SSSSKcmVFEiKI/FJRaRy0jrSbtJR0iVSN+ktWYdsRfYkR5DTyVJyKbmKvIt8hHyJ/Jg8QNGn2FP8KXEUIWUWZRllG6WVcpHSTRmgGlAdqYHUJGoudSG1mtpIPUW9TX2po6Njo+OnM1FHorNAp1rne50zOvd03tEMaS40Li2DpqQtpe2gHaPdpL2k0+kO9BB6Or2IvpReTz9Bv0t/q8vQddfl6Qp15+vW6DbpXtJ9pkfRs9fj6E3VK9Gr0tuvd1GvV5+i76DP1efrz9Ov0T+of12/34BhMMYgzqDAYInBLoOzBk8MSYYOhuGGQsMyw62GJwwfMDCGLYPLEDC+YmxjnGJ0GxGNHI14RrlGlUZ7jNqN+owNjccapxjPNK4xPmzcxcSYDkweM5+5jLmPeY35foTFCM4I0YjFIxpHXBrxxmSkSYiJyKTCZK/JVZP3pizTcNM80xWmzaZ3zHAzF7OJZjPMNpqdMusdaTQyYKRgZMXIfSN/NUfNXcwTzGebbzW/YN5vYWkRaSGzWGdxwqLXkmkZYplrudryiGWPFcMqyEpitdrqqNXvLGMWh5XPqmadZPVZm1tHWSutt1i3Ww/YONok25Ta7LW5Y0u1Zdtm2662bbPts7Oym2A3x67B7ld7ij3bXmy/1v60/RsHR4dUh28cmh2eOJo48hxLHBscbzvRnYKdCp3qnK44E53ZznnOG5w7XFAXbxexS43LRVfU1cdV4rrBtXMUYZTfKOmoulHX3WhuHLditwa3e+5M9xj3Uvdm92ej7Uanj14x+vToTx7eHvke2zxujTEcM35M6ZjWMS88XTwFnjWeV7zoXhFe871avJ6PdR0rGrtx7A1vhvcE72+827w/+vj6yH0afXp87XwzfWt9r7ON2PHsJewzfgS/UL/5fof83vn7+Bf57/P/M8AtIC9gV8CTcY7jROO2jXsQaBPID9wS2BXECsoM2hzUFWwdzA+uC74fYhsiDNke8pjjzMnl7OY8C/UIlYceCH3D9efO5R4Lw8IiwyrC2sMNw5PD14ffjbCJyIloiOiL9I6cHXksihAVHbUi6jrPgifg1fP6xvuOnzv+ZDQtOjF6ffT9GJcYeUzrBHTC+AmrJtyOtY+VxjbHgThe3Kq4O/GO8YXxP00kToyfWDPxUcKYhDkJpxMZidMSdyW+TgpNWpZ0K9kpWZnclqKXkpFSn/ImNSx1ZWrXpNGT5k46n2aWJklrSSelp6RvT++fHD55zeTuDO+M8oxrUxynzJxydqrZ1Pyph6fpTeNP259JyEzN3JX5gR/Hr+P3Z/GyarP6BFzBWsFTYYhwtbBHFChaKXqcHZi9MvtJTmDOqpwecbC4Stwr4UrWS57nRuVuyn2TF5e3I28wPzV/bwG5ILPgoNRQmic9Od1y+szpnTJXWbmsq9C/cE1hnzxavl2BKKYoWoqM4Ib9gtJJ+bXyXnFQcU3x2xkpM/bPNJgpnXlhlsusxbMel0SUfDcbny2Y3TbHes7COffmcuZumYfMy5rXNt92ftn87gWRC3YupC7MW/hLqUfpytJXX6V+1VpmUbag7MHXkV83lOuWy8uvfxPwzaZF+CLJovbFXovXLf5UIaw4V+lRWVX5YYlgyblvx3xb/e3g0uyl7ct8lm1cTlwuXX5tRfCKnSsNVpasfLBqwqqm1azVFatfrZm25mzV2KpNa6lrlWu7qmOqW9bZrVu+7sN68fqrNaE1e2vNaxfXvtkg3HBpY8jGxk0Wmyo3vd8s2XxjS+SWpjqHuqqtxK3FWx9tS9l2+jv2d/XbzbZXbv+4Q7qja2fCzpP1vvX1u8x3LWtAG5QNPbszdnfsCdvT0ujWuGUvc2/l9+B75fe//5D5w7V90fva9rP3N/5o/2PtAcaBiiakaVZTX7O4uaslraXz4PiDba0BrQd+cv9pxyHrQzWHjQ8vO0I9UnZk8GjJ0f5jsmO9x3OOP2ib1nbrxKQTV05OPNl+KvrUmZ8jfj5xmnP66JnAM4fO+p89eI59rvm8z/mmC94XDvzi/cuBdp/2pou+F1s6/DpaO8d1HrkUfOn45bDLP1/hXTl/NfZq57XkazeuZ1zvuiG88eRm/s3nvxb/OnBrwW3C7Yo7+neq7prfrfvN+be9XT5dh++F3btwP/H+rQeCB08fKh5+6C57RH9U9djqcf0TzyeHeiJ6On6f/Hv3U9nTgd7yPwz+qH3m9OzHP0P+vNA3qa/7ufz54IslL01f7ng19lVbf3z/3dcFrwfeVLw1fbvzHfvd6fep7x8PzPhA+lD90flj66foT7cHCwYHZXw5X70VwGBDs7MBeLEDAHoa3Dt0wGPCZM05Ty2I5myqJvCfWHMWVIsPADtCAEheAEAM3KNshM0eMg3eVVv1pBCAenkNN60osr08Nb5o8MRDeDs4+NICAFIrAB/lg4MDGwYHP26Dwd4E4Fih5nypEiI8G2x2V1FH99Nn4Av5F+6JgA8fNqwfAAAAOGVYSWZNTQAqAAAACAABh2kABAAAAAEAAAAaAAAAAAACoAIABAAAAAEAAAlGoAMABAAAAAEAAAUWAAAAAN0wZLcAAEAASURBVHgB7N3Zdtw4cABQWWptk7ecfFo+N1+U55wZ21ocl2bKU4K598Zm3z5HAxAogOClLNFmDfnlx8/PjQ8BAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQ2JHC7oWNxKAQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEPgQkBjlG4EAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgc0JSIza3Cl1QAQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQISIzyPUCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwOYEJEZt7pQ6IAIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEJEb5HiBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAYHMCEqM2d0odEAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECEqN8DxAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgsDkBiVGbO6UOiAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABiVG+BwgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQ2JyAxKjNnVIHRIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQICAxCjfAwQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIbE5AYtTmTqkDIkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEBAYpTvAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIENicgMWpzp9QBESBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECAgMcr3AAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECmxOQGLW5U+qACBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBCQGOV7gAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBzQlIjNrcKXVABAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhIjPI9QIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDA5gQkRm3ulDogAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQkRvkeIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEBgcwISozZ3Sh0QAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQISo3wPECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECCwOQGJUZs7pQ6IAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAGJUb4HCBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBDYnIDEqM2dUgdEgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgIDEKN8DBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhsTkBi1OZOqQMiQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQEBilO8BAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQ2JyAxanOn1AERIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQICAxyvcAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQKbE5AYtblT6oAIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEJAY5XuAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIHNCUiM2twpdUAECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECEiM8j1AgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgMDmBCRGbe6UOiACBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBCRG+R4gQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQGBzAhKjNndKHRABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAhKjfA8QIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQILA5AYlRmzulDogAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAYlRvgcIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIENicgMSozZ1SB0SAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAgMQo3wMECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECGxOYLe5I3JABAgQIECAAAECBAgQIECAAIErEvjx48cVHe1lHOqXL18uY6FWSYAAAQIECBAgQIAAAQIECBDYuIAnRm38BDs8AgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAtcoIDHqGs+6YyZAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECCwcQGv0tv4CXZ4BAgQIECAAAECBAgQIECAwDoEvPJuHefhFKs41rn2ir5TnD37IECAAAECBAgQIECAAAECBLYk4IlRWzqbjoUAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgQ8BiVG+EQgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQ2JyAxKjNnVIHRIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDADgEBAgQIECBAgAABAgQIECBAgEC/wI8fP/o7L7hnq8d1yFPy5cuXQ06391yHOmdrO669YUxAgAABAgQIECBAgAABAgQIEOgR8MSoHhjNBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhcroDEqMs9d1ZOgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgECPgFfp9cBoJkCAAAECBAgQIECAAAECBAicS+BQr0w71/q3st9TnAevtdvKd4vjIECAAAECBAgQIECAAAECBNYoIDFqjWfFmggQIECAAAECBAgQIECAAIGDC5wiyeXgizYhgSMILP2zIInrCCfDlAQIECBAgAABAgQIECBAgMBRBbxK76i8JidAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBA4BwCEqPOoW6fBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgcVeDLz0dn/zjqHkxOgAABAgQIECBAgAABAgQIEDiQwNr+GWMN61nDGg50ejczzRpeObeGNdQTurb11LWpEyBAgAABAgQIECBAgAABAtsV8MSo7Z5bR0aAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEDgagUkRl3tqXfgBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBLYrsNvuoTkyAgQIECBAgAABAgQIECBAgMB1CXit3nnOt9fEncfdXgkQIECAAAECBAgQIECAAAECYwISo8aE9BMgQIAAAQIECBAgQIAAAQJHFzh3Qs8p9n+KfRz9RNnBJIFjnes5CVhL1zBnH5Mw/gmas55jrWHOesUSIECAAAECBAgQIECAAAEC2xDwKr1tnEdHQYAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBAEZAYVTBUCRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBDYhoBX6W3jPDoKAgQIECBAgAABAgQIECCwaoE5r9Fa24Fc2tovbb1rO99L13OK178d6tyeYq1LHWPc0HGufe37HLexBAgQIECAAAECBAgQIECAwOEFJEYd3tSMBAgQIECAAAECBAgQIECAwBkEhpIpzrCcwV3GWiPB45LWPHhAV955zPN46kSgpcdy6nVe+becwydAgAABAgQIECBAgAABAgQmCniV3kQoYQQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIXI6AJ0ZdzrmyUgIECBAgQIAAAQIECBAgQODMAod80tPSJ/OcmcDuTyxwqO8TT3Q68YmzOwIECBAgQIAAAQIECBAgQGAVAl9+/uPKj1WsxCIIECBAgAABAgQIECBAgACBixI41T8pHGo/h5pnn5NU11Drh5pzn3mGxh5qrUP7OFXfKRKEDrWPOk/U4zzUtlOZ5X4Ote9DzZPr6itPtZ++/WsnQIAAAQIECBAgQIAAAQIEzi/giVHnPwdWQIAAAQIECBAgQIAAAQIECFyIQCamLEkUWjLmQlgs80gC9Xtmn++9WJ4koSOdJNMSIECAAAECBAgQIECAAAECqxaQGLXq02NxBAgQIECAAAECBAgQIECAAIHjCdTEm7697JuQ0zfvOdojOej9/X1ykpBkonOcJfskQIAAAQIECBAgQIAAAQIECBxOQGLU4SzNRIAAAQIECBAgQIAAAQIECEwUmJKQM3GqxWFL17B0XCx0n7GLD9TAkwsc6zzvk6i1ZE2xvxi3z3678Oeu5dD771qTNgIECBAgQIAAAQIECBAgQGCbAhKjtnleHRUBAgQIECBAgAABAgQIEDiIwNwEhoPsdMYk51jftewzT0MmpWSZ7ZdazjmOY5zrOftvjZeuZ5991jXM2f+h9ln3P7c+tN41rG/u8YgnQIAAAQIECBAgQIAAAQIE5gtIjJpvZgQBAgQIECBAgAABAgQIECBA4KIFMmEkkkOyftEHdITFp40EmiPgmpIAAQIECBAgQIAAAQIECBAgcCIBiVEngrYbAgQIECBAgAABAgQIECBAgMBUgZqsFPVM0pk6fmpc3c/UMdcSlzZZHuK44zy+v79/TJUJV1keYn5zECBAgAABAgQIECBAgAABAgQIfBb48vMfd358brJFgAABAgQIECBAgAABAgQIbFngVP8UsHQ/S8fNOWexj6X7mTNuTuyc9ffFxv7mJFHNWd+c2L71raF9TiLS1Ng0nxp/KIc5+5sTm+vLMVlm+6HLpfMvHTd3/afaz9x1iSdAgAABAgQIECBAgAABAgTGBTwxatxIBAECBAgQIECAAAECBAgQIHABAnMSd+bEnvrQY22RiLF0jflEolOve4v7m3oOlp6zPM9rTbyZc1xrPYYtfl86JgIECBAgQIAAAQIECBAgQGC6wO30UJEECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBC4DAFPjLqM82SVBAgQIECAAAECBAgQIEDgKgWmPrFnLTh1vXOettOuv87T9tnejkCe5yynHlk+nSmeDpb1LKfOcei4Ocdw7rUe+tjNR4AAAQIECBAgQIAAAQIECKxX4MvPf7T4sd7lWRkBAgQIECBAgAABAgQIECCwROBYf91fOu/ScXOOPfYxZz9TY6fGzV1rJIf0zd22t9tz9jUUe6x5h/Z5SX3HSuCp89Z6tcnvj77+Gju3PmfOqbERNzV27npr/D772GdsXUOtH2POOr86AQIECBAgQIAAAQIECBAgsJ+AJ0bt52c0AQIECBAgQIAAAQIECBAgcESBS0rcibVGksTUNcfTfnwI9H2/zPl+yu+7cybp9B1H1xk+5zq71qONAAECBAgQIECAAAECBAgQ2K6AxKjtnltHRoAAAQIECBAgQIAAAQIECCwUyCSPOckpsasct3C3hhFYJJDfd1kOTRJJSfUVfBErUWlITB8BAgQIECBAgAABAgQIECBwyQJepXfJZ8/aCRAgQIAAAQIECBAgQOCqBaYkQRwaaGifQ31L1xFzHmreOk+tz1lbjIskkr7xfe1z9hGx7Tzt9tz55sYv3V9fgk1Xe1dbu86udXS1xbi+9nbOuj1lDTX+EPV2n+320n30zRPtadMXM7TPdky7PTS2ry/mOMQ87fxjc471t/Ptu33q/e27XuMJECBAgAABAgQIECBAgMAWBTwxaotn1TERIECAAAECBAgQIECAAIGFAplAsXD4pGGxj0gYOPS+xuYb65+0+JlBS/d56nF5WJnIcXt7+3GOYnvoK8blmJxjLWUYTvmK9Wbc0rXPMVh6btu1zdlnO3bOdl1v7LNu13nmrKdvjjpfrc+Zu45r6337PdT87f5sEyBAgAABAgQIECBAgAABAucXkBh1/nNgBQQIECBAgAABAgQIECBAgMCKBCJ5YigBJF5DdomfTHaKMutxnPXrEo+rb815XH39Xe1x7ru+4pzHV/Z1jT13W6yt6xPtYRGfNqa2Z71rDm0ECBAgQIAAAQIECBAgQIAAgUsVkBh1qWfOugkQIECAAAECBAgQIECAwIoEMuEiy7GlTY0bm2eov+4j6pH4Udumjh2K26dvbC1j/e2+M+Epk57aso23/btAfI+MJQjFeYmvTJRqyznnLfYV4/v22df++8qXtdS11nrXbLnW6Mt1ZdkVf8i2sbXVfZ1qTXWf6gQIECBAgAABAgQIECBAgMB6Bb78/IeF7v+dbL1rtjICBAgQIECAAAECBAgQIHA1Asf6a/vSeZeOqycs58iy9nXVh+KG+rrmirYYk8kTfePb9nZ7aO6+vqXtud4oa/KTxKeloscdF+cpvmrCVNRzO/ae33+HXMmcOdvYdjvXFe35/ZdtU8u+OWP8UF87f8TOiW/H5/Y+c+wzNvffVR5r3q59aSNAgAABAgQIECBAgAABAtcq4IlR13rmHTcBAgQIECBAgAABAgQIEDigQCZPRDnlMzVuylxdMWPriSSVc37G1hcJE3d3d78lQp1zzfY9TSDOXXxF4lr7ifMe33tvb28fZSZMtXF1+xTJM31/Hoe+T2Nd2V/Xe4x63/q69nUKr679aiNAgAABAgQIECBAgAABAgTWKSAxap3nxaoIECBAgAABAgQIECBAgACBKxDIBJquJ0FdweFf3SHG+Y6Et/jKTyT9xFcmSWXS1JxkoJxLSYAAAQIECBAgQIAAAQIECBAg8FnAq/Q+e9giQIAAAQIECBAgQIAAAQKrEliaHLF03NDB55xZDsWO9S19YlPdd9TzqTVj+4v+OrZre8ocQ+PG1pNJMZkEFckx0eZDoEsgvp8yWSrKTJjqis0/B33fT33tXXO1bXVsrbdxdTvi8s9Dtk8dm/FZxrilY3OOKA81T50z523bpm4f4rim7kscAQIECBAgQIAAAQIECBC4VgGJUdd65h03AQIECBAgQIAAAQIECKxGoE3YOcTC5sw5NTYTHebE9x3L0BxDfX3zRXu7vnaedntsrq7+dh9dMdkWCVD5dCBJUKmi3Ecgvv8ySSoSpeJr6mcoCWeor52/xrb1/PPRjhnbrvN0xQ71D/W1c02NnRoX88+JbdcztH2seYf2qY8AAQIECBAgQIAAAQIECGxRwKv0tnhWHRMBAgQIECBAgAABAgQIENigQE26iHrXZ+mTqLrmmttWk6AiKUpiw1xB8WMC8T2V32cZ2yZK9f3ZyPhDlnVf+eeztuW+Yt3Zn21KAgQIECBAgAABAgQIECBAgMApBCRGnULZPggQIECAAAECBAgQIECAAIFBgUymyOSJ3G4H9bW3ccfergkqkagSiVA+BM4hkK9mvL+//9h9/BnJp0kNvX7vlGvNP7dZ1n3Hn6VI7ooyP7WebUoCBAgQIECAAAECBAgQIECAwBIBr9JbomYMAQIECBAgQIAAAQIECBDYQ6ArOWCP6TqHtvtotzsHjTTmHFmOhP/WXcfV+m+BpSHiIkki47MsIb3VNrbd7h3Y0RFryCf1RClxowNJ0yoF4vu+PlUq6tG25Hu4HdNuDwFkbJZT15DxOXe7ne1jZYxbOradu85T623cobZPsY9DrdU8BAgQIECAAAECBAgQIEBgbQISo9Z2RqyHAAECBAgQIECAAAECBDYvsE+CTsWZM8/U2LG4of4lfTkmbvxnvR5j1Pva9+kbGxv9u93uVzKUJ0KFiM8WBOLPUz5R6vX1dfDPV/657EvM6WtPp6H+vr5ojzUO9ef8bdk3JuKW9rX7GJurjR/abxvbt32IOfrm1k6AAAECBAgQIECAAAECBLYu4FV6Wz/Djo8AAQIECBAgQIAAAQIECBCYJBDJT/E0qEiIirpkhElsgi5MIL6v43s8vh4fH389TSqSpCJhyocAAQIECBAgQIAAAQIECBAgsCUBT4za0tl0LAQIECBAgAABAgQIECBwEQJDT0CacwBz5mlj2+2p+x0a19eX7VlO3VfGDY1r+8a2c84s86lQUUqEShXltQrEn598mlSU8dq9vk/8eYn4+uem1mNcu13nGuqrcbWeY7KsfVHvax/ra+ep2zHn2HHW+LY+tKY2tm/7EHP0za2dAAECBAgQIECAAAECBAhsXUBi1NbPsOMjQIAAAQIECBAgQIAAgbMItAk6SxcxZ545sX3riTmG5lnaN7S/7Mu5s8z2Wg711bi2HuMiuSC+MhnKU6FaJdsEPgtEYlQkSNWnSS1N0hkaV/uynuXnFQ1vjY3p64/2vr7hPf7eO3WeqXG/7+H3lkPO9fvsWggQIECAAAECBAgQIECAwGULeJXeZZ8/qydAgAABAgQIECBAgAABAosEliYYLdlZJiUN7XOob+o+++bI1+N5KtRUSXEE/haI5MH4ur+//0iYjESpSJKKr/bP26GSc2LemKudP1aU7YfaV57nrn1l37H2mfMrCRAgQIAAAQIECBAgQIAAgeMKSIw6rq/ZCRAgQIAAAQIECBAgQIDAZgVqMsFQMkMA1NhTgEiGOoWyfVyTQCQIxZ+r+Hp4ePh4zV5fktSxXPLnSJZ1P7G+SNyqSVO1XmPVCRAgQIAAAQIECBAgQIAAgesR8Cq96znXjpQAAQIECBAgQIAAAQIETijQdeO+a/dT47rGtm3tXO12G9+1HWOmjqtxUY8khNrWNX+21bhaz/5atv3tdsZKhkoJJYHTCcSfx3zdXiRKdX3yZ0NNVKr1dkztq/U2rm5HXKylxtd6jW3rETc1to6NMUv3Wefpqs9Zz5zYrn1pI0CAAAECBAgQIECAAAECWxaQGLXls+vYCBAgQIAAAQIECBAgQOBkAn3JOmMLWDou5h0b29ff177PnO1xxj4yaaBr3qlrGIqLefM1X16T154B2wROLxB/XseSpGJVbSJPu92uvPZnPcv8WdOOabczvm2P7aG+of4YN7T/sXm71pJtS8cuHZf7VRIgQIAAAQIECBAgQIAAga0JeJXe1s6o4yFAgAABAgQIECBAgAABAicQqMkAUe/6xGutjvHxZKhjqJqTwP4CkZQTSYrxFT8XpiRJzd1r/rzJMvaZ9TpXtksUqirqBAgQIECAAAECBAgQIEDg+gQ8Mer6zrkjJkCAAAECBAgQIECAAIEjCHTdmJ+ym33HLRk/NKbtq9tRz2SDfY+tzhtzjW1LhpoiLobAOgXiz3dfklT+TKkJTLUeR9Ru16Mc6su4iMmfMRmf5dj8U/pzP20Z+6j7afuHtk89bmgt+ggQIECAAAECBAgQIECAwCULSIy65LNn7QQIECBAgAABAgQIECBwUoG8sb7vTufMMye2rivGDY1d2pf7qOOznmXG1HKor8ZlPeIjMSCePHN/f//xyrzsUxIgcLkC8Wf79fX15uXl5SaeKhd/zvPP+5SjGkoYqn1Zz3Js7qG4vr5sz3JsH23/nHFzYtv95PYh5si5lAQIECBAgAABAgQIECBA4FIEJEZdypmyTgIECBAgQIAAAQIECBA4u8Dc5J6+Bc+Zpy82EwmG+vv2H+1942rf3H1MmbNrTe24eDpUJENF6UZ+l5g2AtsQiKdIRYJUJErlZ+zP/FB/29du133kz7falvW27Jsn4ob6xvrHxtZ1zImt42r9EHPU+dQJECBAgAABAgQIECBAgMAlCOwuYZHWSIAAAQIECBAgQIAAAQIECGxbIG7YRzJUPCHq9vZ22wfr6AgQ+BCI5Mf4iiSlSI6Kr3iKlA8BAgQIECBAgAABAgQIECBA4FACnhh1KEnzECBAgAABAgQIECBAgMDmBdonGy094KnzRNzU2HYtY+Nqf1uPJKXa1s6d223M3O2YJxKh4svToVJVSeC6BSIxKp8i1f5MyZ9N9clHffVQrH1Dqu287bh2u8411Ffj2nqMmzN2Tmy7r9w+xBw5l5IAAQIECBAgQIAAAQIECFyKgMSoSzlT1kmAAAECBAgQIECAAAECJxFob8Qv2encOfri+9pzTUP9S/ty7ihzjixrW43L+tS4uDnv6VCppiRAoEsgfp7kU6TilXtdnzbRp91ux2R/W7Zx7XbGt+2xfYy+sXnrOob2X+Om1A8515T9iSFAgAABAgQIECBAgAABAqcQ8Cq9UyjbBwECBAgQIECAAAECBAgQWKlAJB/EzfCa1FSX2tdeY6bW48lQkRAVT4fyIUCAwJBA/FyKnxfxFU+RiiSpeJLUIX4mDf3cy5+HkoSGzo4+AgQIECBAgAABAgQIECBwOQISoy7nXFkpAQIECBAgQIAAAQIECBBYLJDJBJkQEBPVtsUTjwysyQ0SDUawdBMg0Clwe3t78/Dw8JEkFU+PigSpvqdIdU4wo7H9uRg/tyIxq/78qvUZUwslQIAAAQIECBAgQIAAAQIEziDgVXpnQLdLAgQIECBAgAABAgQIEFiPQN4EP+SK2jnb7an7inFLx8aN/CmfnD/LsTFT543EgXxdniSCMVX9BAjMFZibIBU/h6b8LMqYLMfWFUlbSz5T19M1d11brXfFLm071rxL12McAQIECBAgQIAAAQIECBBYKuCJUUvljCNAgAABAgQIECBAgAABAkVgamJRGfJbNeaIm9FT55oa99uOBhrmztnGx2vy4skuXpc3gKyLAIG9BeJnTHxFsmY8QSq+6id/ltYEn/bnVcbXmGybWvbNmeP75u4a1xebc3WV7TxL5uiaVxsBAgQIECBAgAABAgQIENiKgMSorZxJx0GAAAECBAgQIECAAAECBHoE4sZ53Cxvb6BneF979k8pd7vdR0LU0qenTNmHGAIECLQC8TPn8fHx4+dPJkjt8zNt6OdlJh1lTLsW2wQIECBAgAABAgQIECBAgMD6BLxKb33nxIoIECBAgAABAgQIECBA4IQC+9xAr8scmqf25Q312lbnaetDcW1fbkc5lAg1tI+cI2Pqdte88bq8+JIQlWJKAgTOKRA/p15fXz+eINW++jMTm2J9ffW2b+hY8ufs0rnquKH9tGsaGjfUN7aP2n+oeeqc6gQIECBAgAABAgQIECBA4BwCEqPOoW6fBAgQIECAAAECBAgQIHA2gZroM3cRc8bOic115Jgss72Wta/Wa0xbz7gso7/W++K72vNmebwuL54SldttrG0CBAicWyATpN7e3j6WMvTzakpfjan1vuNsY9rtOi76hvprbFufM25ObN3P0nF1DnUCBAgQIECAAAECBAgQIHAOAa/SO4e6fRIgQIAAAQIECBAgQIDA1QpEQlLcYO5LTOprHwLLMYeeN/eZ88dToeLpUBKiUkZJgMCaBeJnVXxFYlS8Zi8SpeKTPyvnJvvkz8Ic3x57ts+dN+fJ+XO7lkvnrHOoEyBAgAABAgQIECBAgACBaxSQGHWNZ90xEyBAgAABAgQIECBAgMDFC+QN9CzjgGr9kAd4d3d3E0+IitKHAAEClyYQP7viK16tVxOkDn0c+TM4yn2TpA69NvMRIECAAAECBAgQIECAAIFrFfAqvWs9846bAAECBAgQIECAAAECVyqQN66nHP6c2DpfjFs6Nm7cT/nk/Fm2Y9r2drvG175alxBVldQJENiKQCZIRZJUfNqnMbXb9bjbvnY7Y7M9y2zvK+OJfEs+Mf/UfbTzzxk3J7bdj20CBAgQIECAAAECBAgQIHBOAYlR59S3bwIECBAgQIAAAQIECBA4ikBN7tlnB0PzLO2L9cwZOxSbx1Zjsp5lxtSy9kU9bnjXtrhBH0+IildQ+RAgQGCrApEg9f3794+nSLWJP3W71luL2pf1LNvYdrvG1fpQ3Jy+iF06b7ufoe2hfQyN00eAAAECBAgQIECAAAECBE4h4F84T6FsHwQIECBAgAABAgQIECBA4MACXQlNNblpye4kRC1RM4YAgUsViJ95T09PH4mgkSD1+vq616HUn8uRLJTbe01qMAECBAgQIECAAAECBAgQILCXgMSovfgMJkCAAAECBAgQIECAAAECxxPIRKcs2z31tbdxY9uRHHB/f+8JUWNQ+gkQ2KRAJkjlE6T2TZAKpPz5nGWFyycsRV/Wa786AQIECBAgQIAAAQIECBAgcDgBr9I7nKWZCBAgQIAAAQIECBAgQOCMAl03n6csZ864qbFt3Nh2XWcbm33Rnk8gqW1d9Wjrm6fGe0JUaigJECDwr0BNkMqfu30JTG173W7r+XP83z39W6ux/7b+W6v9ffV/o7trdVx3xOfWufE5eum4HK8kQIAAAQIECBAgQIAAAQKHFPDEqENqmosAAQIECBAgQIAAAQIErlIgb3aPJSPNxWnnjZv1Sz7tuuKm9ePj48cTotzAXiJqDAECWxbIJ0i9vb3dxCv2osyfo3N+ZuaYsKo/z3OObNvHsu4j58n5c1tJgAABAgQIECBAgAABAgSuWUBi1DWffcdOgAABAgQIECBAgAABAlclEDfLHx4eJERd1Vl3sAQILBW4u7u7eX5+/kiMygSppXMZR4AAAQIECBAgQIAAAQIECJxHwKv0zuNurwQIECBAgAABAgQIECBwYIGup2ZM2cXUcRmX5ZS5M6Yd07cd7ZG81Pb3zZPtUcaYdlzd9oSoqqVOgACB+QLx5Khv377d5NP78ud1fUJTPG2q71PjakzXPG1s3a71Os9YPcbNGTsntu576bg6hzoBAgQIECBAgAABAgQIEDiUgMSoQ0mahwABAgQIECBAgAABAgROKlCTfubueGjsUF/ffnJMll1xta/Wu2KzLeOyjPa+eo5py91u9/GUKDeqWxnbBAgQmC8QP4NfX19vXl5ePv087pqp/bmb21nGmFrvmqMrZmhM9A319+2jaz819hhz1vnVCRAgQIAAAQIECBAgQIDAsQS8Su9YsuYlQIAAAQIECBAgQIAAgU0JxM3wuDFcE5PqAfa115i2nmMOMW/OlfuIV0DFU6KGnl6SsUoCBAgQmCYQP6/v7+8/Xkkar9eLBKn8TE0eyp/XfT/7s33qfLn/LHP+3K7l0jnrHOoECBAgQIAAAQIECBAgQOCSBCRGXdLZslYCBAgQIECAAAECBAgQuHiBvGGdZRxQre97gHHTO1+bt+9cxhMgQIBAt0D+rI0kqXi9Xrxm71Cf/J0QZewntyU1HUrYPAQIECBAgAABAgQIECBwTQJepXdNZ9uxEiBAgAABAgQIECBA4MIE8mbwoZdd5631of1EXL1BPXVczBmxXfG1rdb71tE3T+7j4eHh40kmbp73CWonQIDAcQTi9XrxBKmhn+VTn+CXP8OzbFc8dZ4Y187Rbrdz53Yb125n3L7lsebdd13GEyBAgAABAgQIECBAgMB2BDwxajvn0pEQIECAAAECBAgQIECAQI/A0I3qniG/muvYWv8V8E9lad/SeWJ/cUM5yt1u9/GUKDeYW03bBAgQOI1A/ByOV5i2CVL15/LQ74kaN7bifebJsfn7Y+p+c1ysbeqYsePQT4AAAQIECBAgQIAAAQIETiEgMeoUyvZBgAABAgQIECBAgAABAgT+EYiby3lDOlHqDedsm1LGU0PiKVFxM96HAAECBM4rED/b49V6kSQVT496eXlZtKD6e6L+vpCQtIjTIAIECBAgQIAAAQIECBC4cgGv0rvybwCHT4AAAQIECBAgQIAAgTULLE0Yao9paJ7aV+vtHO12G9u3He31xnY7T2zXsbXe9uV2zPf4+Phx8z3afAgQIEBgfQLv7+833759u3l7e/v1e6AmN/XV40hqXz2yaM/fK9leY2t9aJ4cm+WccW1szrGkPORcS/ZvDAECBAgQIECAAAECBAhsX0Bi1PbPsSMkQIAAAQIECBAgQIDAxQi0SUFTFz5n3NzYofjaV+tD6864tswx2Z7bbRlPI4kvN5NbGdsECBBYp0C+Xi8Spfp+drftuZ1lHFmt9x1pG9Nu57hszzLb+8qpcTF+Tmzd39JxdQ51AgQIECBAgAABAgQIECDQCniVXitimwABAgQIECBAgAABAgSuVqBNSmq3p8LEuLjB2ze+r72dv8bF6/LiKVHx+jwfAgQIELgcgXi1XvwMr6/Xm5oElL9P4mjr74Q8+vxdM3W+HJfz5pxzx+c8SgIECBAgQIAAAQIECBAgsHYBiVFrP0PWR4AAAQIECBAgQIAAAQJXLxAJUfGUKB8CBAgQuEyBSDzKn+Vfv37tTHK6zCOzagIECBAgQIAAAQIECBAgsG4Br9Jb9/mxOgIECBAgQIAAAQIECFyVQD65YspBz4mt88W4qWPjtUdTPjlflu2Ytr1vO9rz6R8xRzxlJG6ke5JHK2qbAAEClysQP+tfXl4+niBVj6L+rK/1iKnbtd41vq+/xkZ96hMIc74s23nGtqeOmxo3tj/9BAgQIECAAAECBAgQIECgCkiMqhrqBAgQIECAAAECBAgQIHBSgTZBaM7Oh8YO9cU+hvprX623a5vSV2Om1HMfcXM4EqIiMcqHAAECBLYpEMm33759u3l7e/t0gG2C0NB29mX5aaKfG33tEdf2tds5V7TH77Ch/oztKvvGdcXWtqXj6hzqBAgQIECAAAECBAgQIEDgFgEBAgQIECBAgAABAgQIECCwn0AmPUVZ60tmjVfm/fHHH5KiluAZQ4AAgQsSiCc2PT8/7/VkwPZ3Tm5fEIOlEiBAgAABAgQIECBAgACBowr4X0+PymtyAgQIECBAgAABAgQIENiiQL3xnPUslx5v3CCPp0Td3d0tncI4AgQIELhAgUiIjScExtOjXl9fFx9B/h7KcuxJT4t3ZCABAgQIECBAgAABAgQIELggAa/Su6CTZakECBAgQIAAAQIECBDYgkDesN33WNp52u2h+Wtsrbdj4jVHUz45R5btmGgf6oub4g8PD72vKWrns02AAAEC2xSIxKhIkBr6RCJt1ydfPZdlV0xt65snYuoccxOs6th2rrr/OfV2zjljxRIgQIAAAQIECBAgQIDAdQtIjLru8+/oCRAgQIAAAQIECBAgcHKBvgShKQsZGtvX19ee+6v9tR797XYdkzdpMybLrnFtX95kjpvST09PN0M3p3OfSgIECBC4DoH4nfH9+/ebl5eXXwecv3Oioa/e1Rdz1fhfE86Yp45p99H2jfX3raVrntq2dFydQ50AAQIECBAgQIAAAQIErlPAq/Su87w7agIECBAgQIAAAQIECBA4s0C8Ni9eneRm75lPhN0TIEBgZQLxeyF/R8TTo6Y+vXBlh2E5BAgQIECAAAECBAgQIEBgFQKeGLWK02ARBAgQIECAAAECBAgQuB6B+vSkuUc9NDb78ukYuT22jxrXVa9tQ3PVuFqPMbGdbZ4SNaSojwABAgSqQPzuqE+PymTatswx2Z7bfWXGtWXGZ3tuj5U1vtbbcUN9bWzdXjquzqFOgAABAgQIECBAgAABAtcpIDHqOs+7oyZAgAABAgQIECBAgMDJBDIhaO4Ox8aN9ef+Im4otu1rt+s8cWM2+6PMesbUsqvv/v7+Jr7c4K1S6gQIECAwJvD29nYTT4/q+t0y9DslX9Vaf3/1xbft7XauMdr7+jImy6G4ob4c31fuM7ZvTu0ECBAgQIAAAQIECBAgsE0Br9Lb5nl1VAQIECBAgAABAgQIELhagbhpHDdMu24ez0Hpmmfp64xiPfFapLu7uzlLEEuAAAECBD4E4vfH8/PzR3LU6+vr5MSk/F2Yv9NisqxnOZc456zjJCpVDXUCBAgQIECAAAECBAgQWJOAxKg1nQ1rIUCAAAECBAgQIECAAIGzCdQbvVnPcp9F7Xa7m4eHh8k3sffZl7EECBAgsF2BSD56enq6eXl5+Xi93j5Hmr/fssyEYglO+6gaS4AAAQIECBAgQIAAAQJrFJAYtcazYk0ECBAgQIAAAQIECBC4UoG8QTv38Ntx7XY731h/G5/bQ+NqX9bjBnYkRvkQIECAAIFDCcQrWeMJUl+/fv14+lP+zon528Sm2tfVP7SmOradtx2XsWNxdVyOybY5Y3OMkgABAgQIECBAgAABAgQIjAl8+fkX0B9jQfoJECBAgAABAgQIECBAgMAcgaV/1RwaN6dvKDaOo/bXej3GbM9yaFzExA3djI0b1vHqvNvb2zqlOgECBAgQOJhA/M75/v37xxOk6qQ1wajWIya327KOr3HZnvG5XcvaV+s1JutD/UN9Ob6v3Gds35zaCRAgQIAAAQIECBAgQGAbAv6Fdhvn0VEQIECAAAECBAgQIECAwJ4CcYM5E5vacs7U8dq8eFKUpKg5amIJECBAYK5AJANFEu7z8/OvhKepc9Tfc7U+dbw4AgQIECBAgAABAgQIECBwKQKeGHUpZ8o6CRAgQIAAAQIECBAgcEECeZN17pKHxtW+qMcN4dpW99XXnjHZ35bZn2X2d21HX+2P9URCVDwtyocAAQIECJxSIH4fffv27eb19fXXbvMpSllGR1/916ASMyW2nbPOk/VDzZPzdZV1H1392ggQIECAAAECBAgQIEDgegUkRl3vuXfkBAgQIECAAAECBAgQOJhATRCaO+nQ2KG+up+Iq7G1XuOi3tdX27OeZc7Rbmd7vjrPjdkUURIgQIDAOQReXl4+Xq/Xte/2d1TdznqW7fi+9oirfVGv2+087fZQ7FBfO0/dXjquzqFOgAABAgQIECBAgAABAtsR8Cq97ZxLR0KAAAECBAgQIECAAIGrEcgEpSizvuTgc2yWMUetj80ZsfEao3hSlBuxY1r6CRAgQODYAvf3959erTf1d1rGteXc9cb49mvuHOIJECBAgAABAgQIECBAgMAhBSRGHVLTXAQIECBAgAABAgQIECBwNQK3t7c3f/zxx81ut7uaY3agBAgQILB+gfj99Pz87PfT+k+VFRIgQIAAAQIECBAgQIDACQT86+0JkO2CAAECBAgQIECAAAECBOYL5BMn+kbmUy36+mt7xkaZT3aqbTW21jMm2nJslJEMFU+KyrnqGHUCBAgQIHBugfj9FL+nIknq27dvH8vJ32O5tr7fYfm7L8uIe39///Q7r29szl3LnKe2RX3OHO1Y2wQIECBAgAABAgQIECBAYKrAl59/Mf0xNVgcAQIECBAgQIAAAQIECBAIgTl/lVwaOzau9tf60PoiLm/E5pi42dv3iZiMy3njRvPDw0PfEO0ECBAgQGBVAm9vbzd//fXXpzXl78IsP3X+3Ij27Iuy/v7siq1tOS7aar3GdPUNxY6Nbfvr9px56zh1AgQIECBAgAABAgQIENiGgFfpbeM8OgoCBAgQIECAAAECBAgQ6BHIxKYsIxEqvmI723qGfmqOG6vx6jxJUZ9YbBAgQIDAygXu7u5u/uM//uMmyqmf/B0ZZSYQ19+ZtT51TnEECBAgQIAAAQIECBAgQOAcAhKjzqFunwQIECBAgAABAgQIECBwNIG8WRtlre+zw7iZHElRc24q77M/YwkQIECAwCEFIrn36elp7+Tert+t+bv2kOs1FwECBAgQIECAAAECBAgQOJSAV+kdStI8BAgQIECAAAECBAgQ2LjA0hufQ+Pm9I3F9vVne5btaconYbTtsR1j7u/vP24kexVPl5A2AgQIELg0gdfX15uvX79+LLvvd1u0d/XVtlqvBre3/f8vbh1T63V81of6h/pyfF+5z9i+ObUTIECAAAECBAgQIECAwHoFJEat99xYGQECBAgQIECAAAECBFYl0JdY1C5yalyMq7FRj5uVta3O3bb3bXfN0xfbtYa6z8fHx4/EqNqmToAAAQIELl0gkoIjOSqTg9tkoanb+Xu7xtd6ONXtWu8yrP213hWbbVPjlsbnOCUBAgQIECBAgAABAgQIXKZA//++c5nHY9UECBAgQIAAAQIECBAgQGBvgbjJGq/Oi6dF+RAgQIAAga0JxFOdnp+fb3a73dYOzfEQIECAAAECBAgQIECAAIFPAp4Y9YnDBgECBAgQIECAAAECBAj0CbRPXdo3LsbHnEvnzXFZ5nxd66oxNS7bs4y+u7u7m6enp09PuOiaUxsBAgQIENiCwMvLy823b98+HUokCNcnMdV6BLbbOTjbs2xja3uO6SozLsuumGybEpOxUc6Nr2PVCRAgQIAAAQIECBAgQODyBCRGXd45s2ICBAgQIECAAAECBAicRKAmC43t8BCxMUfcrKxz1XqsoW7Xel1ftmc5dVzExROiHh4e6nTqBAgQIEBg8wJvb28fyVH1d2c96JpM1FWvbX3jor2NG9vOudq4bO8rp8ZPjevbj3YCBAgQIECAAAECBAgQWL+AV+mt/xxZIQECBAgQIECAAAECBDYtEDdh80ZslnMOuGv81HkyLsrHx0dJUXPgxRIgQIDAZgTq0xLr79WxA6y/R2t9bFxff913ztcXq50AAQIECBAgQIAAAQIECEwRkBg1RUkMAQIECBAgQIAAAQIECKxKIG+WZhmLq/U5i42nRfzxxx83u91uzjCxBAgQIEBgUwK3t7c3z8/PH6+UXXpg+bu4lllfOqdxBAgQIECAAAECBAgQIEBgHwGv0ttHz1gCBAgQIECAAAECBAhsWGDsRuZYfxdNjsmyKybbIqYvLtuzzDFZvr+/Z/W3ss4bN4Gfnp5uovQhQIAAAQIE/k40/v79+83Ly8sHR75uLsvWqO93aI2v9RwfbV3t2V/LObF1XNSH9jHU185jmwABAgQIECBAgAABAgQuU8D/DnuZ582qCRAgQIAAAQIECBAgcBSBvkSjfXZW54z60E3INrbut/Zle8xV22s9Y6Lsaq+vDaqx6gQIECBA4JoF4ndrvF42Ep6+ffv2QdH+Hq2/y2tftmeZjhnT1x5xbV+OjTLHZ9tQbMZMKY8175R9iyFAgAABAgQIECBAgACB0wj4X2JP42wvBAgQIECAAAECBAgQIHBAgbyRmWVMXetju7q/v/94UtShbqyO7U8/AQIECBC4NIH8XTln3fm7uJZZnzOPWAIECBAgQIAAAQIECBAgcCgBT4w6lKR5CBAgQIAAAQIECBAgQOBoAnlTNcvYUa3P2fHDw8NN3Oz1IUCAAAECBIYFdrvdx5Ocvn79OhzY0Vt/T0c9kpGz7AjXRIAAAQIECBAgQIAAAQIEjiLw5edfRn8cZWaTEiBAgAABAgQIECBAgMDqBeb8lfAQsTFH3hgNnHbOse0Ezbi2bPtzO8t4NVDc5PUhQIAAAQIEpgu8v7/fRHJU/t6tI9unL+Z2lhFb631j25ix7b55antbb+ds++v2nNg6Tp0AAQIECBAgQIAAAQIE1iXgVXrrOh9WQ4AAAQIECBAgQIAAgU0KxI3UvJma5ZwDzTFL5smxT09PkqLmoIslQIAAAQL/CNze3t48Pz/fRDn1k79/Iz7rWU6do8bF2ByfZe1XJ0CAAAECBAgQIECAAAECXQLT/ybbNVobAQIECBAgQIAAAQIECBBYuUA88SFu5t7d3a18pZZHgAABAgTWKxC/TyUZr/f8WBkBAgQIECBAgAABAgQIdAt4f0C3i1YCBAgQIECAAAECBAgQWChQn+iwcIqPYfk0iLYcm7PGRzJU3MT1OpwxNf0ECBAgQGBcIH6fxmtpo/z+/fuvAVN+z9bfzzEwxkTblLG/dvSz0jVP7VcnQIAAAQIECBAgQIAAAQJVQGJU1VAnQIAAAQIECBAgQIDAxgXyZuKhD7POW+td+2n763at59i8cRrbtb/Wa1+2S4pKQSUBAgQIEDiswMPDw0dC09evXwcnjt/JmfjUljkwf2/ndleZY7v6oq3OMRbbN0fbXueMvkPN2+7HNgECBAgQIECAAAECBAgcV8Cr9I7ra3YCBAgQIECAAAECBAgQWCiQNyTbcsp09/f3H6/PcxNzipYYAgQIECAwXyB/104dWX+f1/rU8eIIECBAgAABAgQIECBAgMASAYlRS9SMIUCAAAECBAgQIECAAIGDC9SbpLU+d0fxFIt4zY8PAQIECBAgcFyB3W73kYi8ZC/t7/rcXjKXMQQIECBAgAABAgQIECBAoE/gy8+/cP7o69ROgAABAgQIECBAgAABApcvcKi/9tV5ar0Vavva7RoffX392Z5lHRf19/f3X00ZEwlR8QQLHwIECBAgQOB0Am9vbzddr9WLJzf2Pb0x27NsV3t72///9NYxtd7OEdu1v9a7Yue0HXKuOfsVS4AAAQIECBAgQIAAAQLzBHbzwkUTIECAAAECBAgQIECAwLUIZLLR2PFGXNwcnBOfc04d08bnuCyjX1JUKikJECBAgMBpBe7u7j6eHPXnn38O7nhOMlH9HR+T9o1t4+bE9s05eBA6CRAgQIAAAQIECBAgQOCiBPr/t5uLOgyLJUCAAAECBAgQIECAAIFLF8gbm1HW+pTjenp68qSoKVBiCBAgQIDAkQTiCU9//PFHbwJTu9v2d31ut3G2CRAgQIAAAQIECBAgQIDAPgISo/bRM5YAAQIECBAgQIAAAQJXLLAkgaly1RugWc+yxmU995dltkdS1G7ngcjpoSRAgAABAucSiOSo5+fnm3wNXv7OzrJvXdEfnxqXbX1jhtoPNc/QPvQRIECAAAECBAgQIECAwGUIfPn5l8S//9Z5Geu1SgIECBAgQIAAAQIECBAYEVj617yxcX390d6+Sq/G1nosvd3Ow8n2tmz76xySolJHSYAAAQIE1iMQv8vjtXpR1tfVjdVrfz2atn3u9tBcU/tqXFtv19P22yZAgAABAgQIECBAgACB8wl4YtT57O2ZAAECBAgQIECAAAECFy0QNzv7kpimHFiOjdisZ9k3PvozJp5I4UlRfVLaCRAgQIDA+QQiUSheqxdPjqq/u/N3eLuybJ8S247t2j7UPF1zayNAgAABAgQIECBAgACByxKQGHVZ58tqCRAgQIAAAQIECBAgQOCnQCRF3d3dsSBAgAABAgRWKhDJUX5fr/TkWBYBAgQIECBAgAABAgSuSMCr9K7oZDtUAgQIECBAgAABAgSuQyCfujDlaKfG1icvjM07FJv7y7Kd6/39/VNTV1zcZI0nUPgQIECAAAEC6xeI3+Vfv369id/xUa+vnav1vt/tNabW88ijras9+2s5JzbGzZm37kedAAECBAgQIECAAAECBNYjIDFqPefCSggQIECAAAECBAgQILBIoCt5aOpEQ2NrX613zV37az1i2+0cX9uznmWOq9vRlq/Q7HVYAABAAElEQVTlyTmUBAgQIECAwPoF4vd5JEe9vb39WmybpFSTkLKe5a9B/1Rqe61Hd7tdx7Z97XaNHZurja3bY/PWWHUCBAgQIECAAAECBAgQOK6A/8X2uL5mJ0CAAAECBAgQIECAAIEikIlOtcx6CfutGjcYJUX9xqKBAAECBAhchED8Hn96errZ7XaT1pvXBrXM+qQJBBEgQIAAAQIECBAgQIAAgX8EJEb5ViBAgAABAgQIECBAgACBownkTcwoa33ODuNmqtfnzRETS4AAAQIE1icQv88fHx8nJ0flEeT1Q2xnPcuMURIgQIAAAQIECBAgQIAAgT6Baf+LTt9o7QQIECBAgAABAgQIECBwcQJDNxOH+uqBtnFj23EzND4Zl2Vt66tLigoZHwIECBAgcPkCmRwV1wH1tXpDR5bXEBFT63ktEWXbXrdrvd1PzpHtbWztb/tyjJIAAQIECBAgQIAAAQIE1i3giVHrPj9WR4AAAQIECBAgQIAAgYsWyBuKUdZ610HV/qjHDUivz+uS0kaAAAECBC5XIH6/x2v17u7uPq4N8hohrwPaI6vtWc+yjbVNgAABAgQIECBAgAABAgRaAYlRrYhtAgQIECBAgAABAgQIEFiFgCdFreI0WAQBAgQIEDi4QE2OOvjkJiRAgAABAgQIECBAgAABAkVAYlTBUCVAgAABAgQIECBAgACBvwXySQxRZn2KTY3PcVlOGZ8xkqJSQkmAAAECBLYpkMlRt7fz/ok6ryu6rjnGpHJMnWNsjH4CBAgQIECAAAECBAgQuGyBLz//Evjjsg/B6gkQIECAAAECBAgQIHB9AlP/KjcWN9afshHXxtbtWs8xUWZ7lrWtrx5JUfF6HR8CBAgQIEBg+wJxjfDnn39+XDNEslR+aj3acrstMz7L7O/ajr62P+PacihuqG/OPG2sbQIECBAgQIAAAQIECBA4vMC8/x3n8Ps3IwECBAgQIECAAAECBAisUCATmaLM+pRl1vgcl+WU8U9PT5KipkCJIUCAAAECGxGIJKM//vjjZuqTo/K6ouuaY4wkx9Q5xsboJ0CAAAECBAgQIECAAIHLFpAYddnnz+oJECBAgAABAgQIECBwdoGum4vZNmdxkRS12+3mDBFLgAABAgQIbEAgkqPiOmDOk5jysPOaoy2zX0mAAAECBAgQIECAAAEC1y3gVXrXff4dPQECBAgQIECAAAECFyKQN/vmLrcd1273zZdxWbZx0d7VV9tqvY5/f3+vmx/zSIr6RGKDAAECBAhcpUBcI/z1118fxx7XEZkoFWXWW5hsz7Lt73sSVcZn2Y5rt2tcrbdxY9v7jB2bWz8BAgQIECBAgAABAgQI/C7gf8X93UQLAQIECBAgQIAAAQIELlqgLyFp7KDacUPbbd/Q3EOx0ff4+OhJUUOA+ggQIECAwJUIRBLT8/Pzr+Soetj1emJOclHfuGiPebJ/6Zyxxjlj6zGpEyBAgAABAgQIECBAgMDxBbxK7/jG9kCAAAECBAgQIECAAIFNC+QNxSzjYGt96OAjKer+/n4oRB8BAgQIECBwRQKZHDX1kPOaoy2njhdHgAABAgQIECBAgAABAtsWkBi17fPr6AgQIECAAAECBAgQINArUG8gZr03uHTU2KxnWcI6qxkXZSRESYrqZNJIgAABAgSuWiCTo+J6Ib+mgNTrjFqfOjb3leWUcWIIECBAgAABAgQIECBAYN0CX37+Je/HupdodQQIECBAgAABAgQIELhOgaV/XRsaN9ZX+2s9zkC7nWcl29uy7c854nUzu93u4xV6GaMkQIAAAQIECLQCb29vv16rV19XN1av/e2cta+t1+2hcXP62th2e2ifbaxtAgQIECBAgAABAgQIEJgv4IlR882MIECAAAECBAgQIECAwCYEaiJT1qccWI3NepZTxt/d3UmKmgIlhgABAgQIXLnA3GuGvB6JstanMOaYWk4ZJ4YAAQIECBAgQIAAAQIE1i0gMWrd58fqCBAgQIAAAQIECBAgsCmBeDXO4+Pjpo7JwRAgQIAAAQLHE4jX7j48PBxvB2YmQIAAAQIECBAgQIAAgU0L7DZ9dA6OAAECBAgQIECAAAECVyKQT0WYcrg1ttaHxmZcW+aYbM/ttoz+eFXM8/PzR9n22yZAgAABAgQI9AlEYlRcS7y8vHxcR+R1RcR3XYPk6+myr43P/r79ZXuOj/g6R/ZnmXG5PXX+jFcSIECAAAECBAgQIECAwPEEJEYdz9bMBAgQIECAAAECBAgQWIVAe7OuLmqor8bVG4J1TK3X+LY9xkuKqkLqBAgQIECAwByBSI56f3//+Oq6zsi5al8mKGUZMbWeY7LsGtvVF21D8+QYJQECBAgQIECAAAECBAicX8Cr9M5/DqyAAAECBAgQIECAAAECqxfIG4W1zPqUxT89Pd3Ea/R8CBAgQIAAAQJLBCIRae71RF6rZBn7rfUl6zCGAAECBAgQIECAAAECBC5LwL9KX9b5sloCBAgQIECAAAECBAhcnMDj4+PN3d3dxa3bggkQIECAAIF1CURyVFxXeFrTus6L1RAgQIAAAQIECBAgQGDNAl6lt+azY20ECBAgQIAAAQIECFyVwKGeYHCMeXLOLNsT09cer73Z7fzVs/WyTYAAAQIECCwTiCdQxpOjvn79+muCeh3SJk3Vvl8D/qm0sW3/0Haddw3zDK1VHwECBAgQIECAAAECBK5ZwL9OX/PZd+wECBAgQIAAAQIECFysQL0ZN3QQU+NijjmxQ/E5z/39/U18+RAgQIAAAQIEDikQT6KMJ0dFclRXUlJei8Q+u/pzLTVuKDbjshyaM+bJuNzPWHzGKQkQIECAAAECBAgQIEDg8AJepXd4UzMSIECAAAECBAgQIEDg6gXihmU8LcqHAAECBAgQIHAMgXgiZSRH+RAgQIAAAQIECBAgQIAAgSEBiVFDOvoIECBAgAABAgQIECBwpQL5pIMoa72Lo/ZHPV9x4+kIXVraCBAgQIAAgUMJxJMpI0Eqr1ey7Jq/9kU9Pll2xWsjQIAAAQIECBAgQIAAgW0IfPn5l7+//xa4jeNxFAQIECBAgAABAgQIELgYgTl/HRuKndPXxo5tJ2bE5Ve0teMyLpKhnp6ePpKjsk1JgAABAgQIEDimQLxS7+3trXMXmagdZa13BWd/9tXtvnrG1rLG1vaoD/XtE9uOtU2AAAECBAgQIECAAAECfwt4YpTvBAIECBAgQIAAAQIECBD4TSATn6YkQ9XYeKVNPDHKhwABAgQIECBwKoG4/oiEo3rd0u679tVrlzbONgECBAgQIECAAAECBAhsS8C/Vm/rfDoaAgQIECBAgAABAgQILBI4xM3CeFLU3d3dov0bRIAAAQIECBBYKhBJUc/Pz7OexlSTo2p96RqMI0CAAAECBAgQIECAAIF1CkiMWud5sSoCBAgQIECAAAECBAgsEqg39rLeThTt+dX2zdmuc9zf39/sdrs5w8USIECAAAECBA4mEMlRkaQdn3qNEvWln5ynnaO2Z33pPowjQIAAAQIECBAgQIAAgeMK+Ffr4/qanQABAgQIECBAgAABAp8E2htrnzpnbMyZZyi2qy9fRRPL6epvlxlPiYrEKB8CBAgQIECAwDkF4pokXqv37du33mXktU1c78QnyxzQ9rftud2Oy/Yoc46oD8VF/9CnzhNx+8w1tB99BAgQIECAAAECBAgQ2LKAJ0Zt+ew6NgIECBAgQIAAAQIECEwUiBtvefOtLYemiBt08XQGN+qGlPQRIECAAAECpxKIZO0pCdv1eqfWT7VO+yFAgAABAgQIECBAgACB0wh4YtRpnO2FAAECBAgQIECAAAECRxXIG3qxk1of2mnGZTk2tsblvM/Pz5KiEkNJgAABAgQIrELg4eHh5u3t7eOaqL1+6UvmzrgoIya3++LbA63xOUcbY5sAAQIECBAgQIAAAQIETi8gMer05vZIgAABAgQIECBAgACBUYG8uTYa+E9A3rTLcW2Z82R7bkdZb/7FdsZkGW3tJ/riVTW3tx5E3NrYJkCAAAECBM4rENc28UTLv/7669NChq5t8loqyxzYNaa9dortOq7Wc54s63xDcRmvJECAAAECBAgQIECAAIH9BPwL9n5+RhMgQIAAAQIECBAgQGAVAnGTLW+0ZTm2sIzLMuJrvY6P9vq12+0mvaamzqFOgAABAgQIEDiVQCRvRxJ3fPIaZmjfeQ1Uy6wPjcu+uo8543K8kgABAgQIECBAgAABAgSOIyAx6jiuZiVAgAABAgQIECBAgMBmBe7u7n7daNzsQTowAgQIECBA4OIFIpE7XqvnQ4AAAQIECBAgQIAAAQLXK+BVetd77h05AQIECBAgQIAAAQIXKpBPIcjylIcRr3yJV9N49csp1e2LAAECBAgQWCoQiVHv7+83r6+vS6eYNS6vz7KMwa6bZhEKJkCAAAECBAgQIECAwEEFJEYdlNNkBAgQIECAAAECBAgQ+CxQb4p97vl9ayi29kX9UDfYYq6cO8tcWd3OuOfn54PtO/ejJECAAAECBAgcUyBeqff29vbrmueY+2rnrtdT0Vev4dq+tn9orjpPG2ebAAECBAgQIECAAAECBP4V8Cq9fy3UCBAgQIAAAQIECBAgQGBAIG4qxmv0fAgQIECAAAEClyQQSUSR3O1DgAABAgQIECBAgAABAtcnIDHq+s65IyZAgAABAgQIECBA4EoF8qkE+fSnYMi2MZLdbncTr6LxIUCAAAECBAhcosDt7e3H64CnrL1eH2U9yynjxRAgQIAAAQIECBAgQIDAegS8Sm8958JKCBAgQIAAAQIECBDYiMChbpxNnWcsru3PV69Ee9Rrf63n6YgbifG0KB8CBAgQIECAwCULRKL3+/v7zcvLy8dhtNc9eY2UZQTVeo3va2/HfOyo/KfOMRZbhv1WPdQ8v02sgQABAgQIECBAgAABAhsTkBi1sRPqcAgQIECAAAECBAgQINDeKBsSidiu+GiLG35RRlJUvfk3NJ8+AgQIECBAgMCaBe7v72/e3t4+EqTyeifX214T9V3/TI3LeZUECBAgQIAAAQIECBAgcD4Br9I7n709EyBAgAABAgQIECBA4KQCeRMvylofWsTT09NNPDHKhwABAgQIECCwBYFIdorrm76kpzjGvE6q9dq2BQfHQIAAAQIECBAgQIAAgWsR8K/b13KmHScBAgQIECBAgAABAhcvMCehKQ82b+K1ZfbXMufP2Lu7u5t45YwPAQIECBAgQGBLApEU9fDw8HFIef0zdHx5bZRlxNb60NiMzfgsx8boJ0CAAAECBAgQIECAAIHDCPgX7sM4moUAAQIECBAgQIAAAQKLBObcHMsnG+SYLGPHffVcVIzNmCzbcbGd+4h6vELPhwABAgQIECCwRYFI/o7X6r2+vv46vHqN9KvxZyWvj7LMvr747I8yxtRxtV7jsl7nHIvNMUoCBAgQIECAAAECBAgQ6BfwxKh+Gz0ECBAgQIAAAQIECBBYlUDcKMubZVmOLTDj2rJrXMTk19grZrrGayNAgAABAgQIXJJAPDUqko/yOqlv7dmfZcTVet+4bI/YjM8y+5QECBAgQIAAAQIECBAgcFwBiVHH9TU7AQIECBAgQIAAAQIELk4gbhLGa/R8CBAgQIAAAQJbFoikKE/I3PIZdmwECBAgQIAAAQIECBC4ufEqPd8FBAgQIECAAAECBAgQOKHA1KcE1CcLzFlezp9ljK31ru06/+3t7cdrZWqbOgECBAgQIEBgqwKRDB5J4S8vL78dYr2Gytfa1bao5xOnsv+3SUpDjs1ybEzGxRRjsWU3qgQIECBAgAABAgQIECBQBCRGFQxVAgQIECBAgAABAgQILBGoN62WjM8xdZ5az/4pZXtzLufJcmwOr9AbE9JPgAABAgQIbE0gEqPe3t5u3t/few8tr6VqglLWs+wdPNCR80bIGuYZWKouAgQIECBAgAABAgQIXKSAV+ld5GmzaAIECBAgQIAAAQIECHQL5M21KGu9O/pza7xKJp4Y5UOAAAECBAgQuDaBqa/U67rGymuuazNzvAQIECBAgAABAgQIELgEAf/ifQlnyRoJECBAgAABAgQIECBwZIHdbucVekc2Nj0BAgQIECCwXoFIDp+aHLXeo7AyAgQIECBAgAABAgQIEGgFvEqvFbFNgAABAgQIECBAgACBEwnMebpAG1u323p9DUv0tf3t4UV8vELGhwABAgQIECBwzQKRKB6v1Ht9ff10/dSa1Gut6KvXWm1s9NX4Wu+KrW1DsTVOnQABAgQIECBAgAABAgT6BTwxqt9GDwECBAgQIECAAAECBDYtkDfx4ukIbrxt+lQ7OAIECBAgQGCiQCaL53XSxGHCCBAgQIAAAQIECBAgQGClAhKjVnpiLIsAAQIECBAgQIAAAQKnELi/v7+5u7s7xa7sgwABAgQIECCweoFIFn96elr9Oi2QAAECBAgQIECAAAECBKYJSIya5iSKAAECBAgQIECAAAECRxXIpxJEmfUpO6yxWc+yb3z0x9ft7e1NJEb5ECBAgAABAgQI/CsQSePx5Ki8ZoqevuurbJ8S++8e/q7lmFq2MbYJECBAgAABAgQIECBAYD+B3X7DjSZAgAABAgQIECBAgMD1CeQNsClHPjU2X2WXZd4gy32087TbERdjs72WWc+5ch/xNISsZ5+SAAECBAgQIEDg5iN5/O3t7eb9/f0XR3tNFR15LZVlBmdstGc9+7KMvnZc9rVlO8fQuDmx7X5sEyBAgAABAgQIECBAYGsCnhi1tTPqeAgQIECAAAECBAgQuEiBvIEVZdanHEiNzXqWfeOjP54UFU+M8iFAgAABAgQIEPhdIBKPHh8ff12X9V1fZXuUtf77jL+35Jha/h6lhQABAgQIECBAgAABAgT2EfCv4PvoGUuAAAECBAgQIECAAIEzCLQ33fJm2tSleIXeVClxBAgQIECAwDULxDVTvFJvzmff67Q5+xJLgAABAgQIECBAgAABAuMCXqU3biSCAAECBAgQIECAAAECv54AsC9F3izbZ554gkHMk2XONWXuiPEKvRRTEiBAgAABAgSGBeIpm6+vr4PXgvUaLF9x15bDe+nurfNGRM7ZHd3feqh5+veghwABAgQIECBAgAABAusVkBi13nNjZQQIECBAgAABAgQIXKBAe+PpHIdQ1xD1uh039+7u7s6xLPskQIAAAQIECFycQCQjxSv1/vrrr0/XVPVAliYs1Tnm1uv1XYw9xxrmrlk8AQIECBAgQIAAAQIEziHgVXrnULdPAgQIECBAgAABAgQI7CGQN8JqmfWhaeOG2dzXwQzNp48AAQIECBAgcA0CkVQeyeVTPnlNVsusTxkvhgABAgQIECBAgAABAgQOKyAx6rCeZiNAgAABAgQIECBAgMAsgbhRljfLspw1wYxgr9CbgSWUAAECBAgQIFAEIrn8FE9lOuW1YTk8VQIECBAgQIAAAQIECGxWwKv0NntqHRgBAgQIECBAgAABApcgkDfYMimqLfMYsj22o57j+vrbdq/QSxElAQIECBAgQGC+QFx7RZJ5vFIvPvXarJ2tXqeNxdX+GFfH1nq7D9sECBAgQIAAAQIECBAgME3AE6OmOYkiQIAAAQIECBAgQIDAUQTiZljeEMvy0DuKm2peoXdoVfMRIECAAAEC1yYQr9Tb7Y77/xqf4trw2s6b4yVAgAABAgQIECBA4LoFJEZd9/l39AQIECBAgAABAgQIXIHA4+Pjp6cPXMEhO0QCBAgQIECAwFEEXFcdhdWkBAgQIECAAAECBAgQOJrAcf/3lqMt28QECBAgQIAAAQIECBBYj8DUJz3VJwDMWX3On2WMrfU6V7ZnGU81OPaTDer+1QkQIECAAAECWxbIJ3F+/fr102F2vfYur8ciMOoRk+WnwR0bOTbLrvnrsIzLtrH4jFMSIECAAAECBAgQIEBg6wISo7Z+hh0fAQIECBAgQIAAAQKLBNqbS4sm+TmozlPrMV+73e6j7c8bXNley1rPuJgvnmrgQ2CNAv/7v/978/b2tsalWRMBAisXuL+/v/mv//qvla/S8rYsEEnn8Vq9/D2W12F5zLldr8lqPfsjvq+97YvtvnHRN+dzqHnm7FMsAQIECBAgQIAAAQIEziUgMepc8vZLgAABAgQIECBAgACBiQJx8ypumtWbWLXeN41XvfTJaF+DwP/8z//c/N///d8almINBAhcmMB//ud/3vz3f//3ha3acrcmENdZf/755+Bh5TVcBGU9y8GBOgkQIECAAAECBAgQIEDgYAK3B5vJRAQIECBAgAABAgQIECCwGoF4ikE8UcOHAAECBAgQIEDg8AK3t7eezHl4VjMSIECAAAECBAgQIEDg4AISow5OakICBAgQIECAAAECBAgcXiCeLlC/hvYQcV6hNySkjwABAgQIECCwv0C8Ui8SpIY+9fot6j4ECBAgQIAAAQIECBAgcFqB4b+1nXYt9kaAAAECBAgQIECAAIGrFqg3zsYgamx7k+3h4WH0Jt3Y/PoJECBAgAABAgSGBeJVx13J6EPXaXXGNq69pqux6gQIECBAgAABAgQIECCwTEBi1DI3owgQIECAAAECBAgQILBKgbhB5xV6qzw1FkWAAAECBAhsUMDrizd4Uh0SAQIECBAgQIAAAQKbEpAYtanT6WAIECBAgAABAgQIEFijQD4NYM7a8okBbdk3R+4jnloQyVE+BAgQIECAAAECpxGIp3XmtVjsMa/f2r1n+5TYrrFLxrXz2CZAgAABAgQIECBAgMC1Ceyu7YAdLwECBAgQIECAAAECBPoE8mZVX39tH4pt+zJRqd7MyrlqbK1nf4yN9iyzvY2N/tvb25vdzl/z0khJgAABAgQIEDiFQFyHRXL69+/ff+0ur9WiLz9ZzzLba2zWsy/LGNM3LmLm9OWcUbb7a+epseoECBAgQIAAAQIECBC4RAFPjLrEs2bNBAgQIECAAAECBAhclEDccGpvOo0dQMa3Zd+4iIunFfgQIECAAAECBAicXqAmp+f1W7uKbI+y1tu4ru0cM3dc11zaCBAgQIAAAQIECBAgcE0CEqOu6Ww7VgIECBAgQIAAAQIEVitQb3LV+tQFx824u7u7qeHiCBAgQIAAAQIEDigQT1qKp0bN+bTXfLk9Zw6xBAgQIECAAAECBAgQIDAs4B0Lwz56CRAgQIAAAQIECBAgsAqBeqMs61nGAj0tahWnySIIECBAgACBKxaIRPWXl5ebt7e3X0+Eajm8qq4VsU2AAAECBAgQIECAAIHjCnhi1HF9zU6AAAECBAgQIECAwBUIRIJS/VpyyHmTLMqsxzw579CckRR1e+uvd0NG+ggQIECAAAECpxAYe2pUXttFmZ+89ssy2+eUXfPOGS+WAAECBAgQIECAAAECWxXwL+dbPbOOiwABAgQIECBAgACBixLIm2N5UysWn21DBxI30O7v74dC9BEgQIAAAQIECJxIIJLVp16b5bVeW55oqXZDgAABAgQIECBAgACBqxCQGHUVp9lBEiBAgAABAgQIECBwKoFMbKrlMfcdTyXY5+kCx1ybuQkQIECAAAEC1yhw7Fcc10SqrF+js2MmQIAAAQIECBAgQIDAFIHdlCAxBAgQIECAAAECBAgQ2KLAnBtJU2PbJKUYV8cO1evYsXERe3d3d7Pb+WvdFr83HRMBAgQIECBwuQJxnRbJ69++fft0HdgeUb32i756ndgVm/05Lss2tt3OcdE+NmZObLsf2wQIECBAgAABAgQIEFijgCdGrfGsWBMBAgQIECBAgAABAhcrEDeT2q9jHcyxn0ZwrHWblwABAgQIECCwdYFIXo/X6h3jk8lLec15jH2YkwABAgQIECBAgAABAlsROM7fzLai4zgIECBAgAABAgQIECCwUoG42RZPjPIhQIAAAQIECBBYn0A8mUkS+/rOixURIECAAAECBAgQIHB9AhKjru+cO2ICBAgQIECAAAECBFYgkP+nfywl61n2La8+FcCNtj4l7QQIECBAgACBdQhkInu9huu73sv2KbHrODqrIECAAAECBAgQIECAwGUISIy6jPNklQQIECBAgAABAgQIrEggb1hluWRp8RSB/NR6zhll3yeSouqYvjjtBAgQIECAAAEC5xV4fHwcXEBe+2VQXOPldV6W2Te1zDmznDpOHAECBAgQIECAAAECBLYoIDFqi2fVMREgQIAAAQIECBAgsHqBmviU9SyHFh83yO7v74dC9BEgQIAAAQIECKxE4Pb2dtK1W14HRlnrKzkMyyBAgAABAgQIECBAgMDFCkiMuthTZ+EECBAgQIAAAQIECFyjgKdFXeNZd8wECBAgQIDAJQtIar/ks2ftBAgQIECAAAECBAhcusDu0g/A+gkQIECAAAECBAgQIDBVIP/v+6nxS+OG9pN9UY69HiVjYx1Z3+38NW7peTGOAAECBAgQIHAOgXhqVFzDvb6+/rb7oevBvP7LQTV2qC/j9y1PsY9912g8AQIECBAgQIAAAQIExgT8i/qYkH4CBAgQIECAAAECBK5SoL0R1IcQcXGTqi++r71rvrHYx8fH0WSqrnm1ESBAgAABAgQInFcgnvrZJkZ1XfvV5Ke64ja2xrV9Ma72T52nxqkTIECAAAECBAgQIEBgKwJepbeVM+k4CBAgQIAAAQIECBDYtEDc3PK0qE2fYgdHgAABAgQIbFggnhrllXobPsEOjQABAgQIECBAgACB1QpIjFrtqbEwAgQIECBAgAABAgS2JpD/N38ts94ea7TXr3jKQN//+d+OtU2AAAECBAgQILA+gbiei09e4w2tMK8Rs8xxQ2P0ESBAgAABAgQIECBAgMDvAl6l97uJFgIECBAgQIAAAQIECPwmUG9K/dY5sSESm2KeLHNY19w1CSrqnhaVWkoCBAgQIECAwGUKxDVdJEe9vLx0HkC9JsxrwSxjQK13TtDTWOfdZ56e6TUTIECAAAECBAgQIEBg1QKeGLXq02NxBAgQIECAAAECBAhsSSBvStUy6+1xRnt+eVpUq2ObAAECBAgQIHCZAvE6vbzGGzqCvEbMMmJrfWisPgIECBAgQIAAAQIECBD4V0Bi1L8WagQIECBAgAABAgQIEFidwO3tradFre6sWBABAgQIECBAYJlAPjVq2WijCBAgQIAAAQIECBAgQGCugFfpzRUTT4AAAQIECBAgQIDAJgXm/h/4Nb6t1+0xrLHYeFqUDwECBAgQIECAwHYE4qlRc16n13Xk7TVk+5q97I/2qLf9OWfG5XZfXPYrCRAgQIAAAQIECBAgcGkCEqMu7YxZLwECBAgQIECAAAECqxOoN5RqPRZat6M+dLOpK3a389e21Z1wCyJAgAABAgQI7CEQ14ORHPX9+/dPswxdJ0ZgvVZsY4f6Pu3EBgECBAgQIECAAAECBK5MwKv0ruyEO1wCBAgQIECAAAECBC5H4PHx8XIWa6UECBAgQIAAAQKTBSIxqk1umjxYIAECBAgQIECAAAECBAhMFpAYNZlKIAECBAgQIECAAAECBOYJ5P+5H2WtT5nl9vb2xtOipkiJIUCAAAECBAhcnkA+NWrKyruuJfPacsp4MQQIECBAgAABAgQIELhmAYlR13z2HTsBAgQIECBAgACBKxDIG0nnuHmUTwGIMutBnmsa4ve0qCEdfQQIECBAgACByxcYe2pU1zVjXlNmeUqFXE+Wp9y3fREgQIAAAQIECBAgQGCpgMSopXLGESBAgAABAgQIECBAYEQgbhrFp948yrZ2aLZHGU+Luru7a0NsEyBAgAABAgQIbEggkpsiOSqvFfN6sD3E7I/2jMmyjbVNgAABAgT+n717WZIbxw4AWq/pid45/AleO7zy///IfIHX3rilqpLnavqqIYrPTDIJgCcjqsEkQBA4yMVVAyQIECBAgAABAj8LWBj1s4dvBAgQIECAAAECBAgQOF3gt99+O70NGkCAAAECBAgQIHC8QGydfMbbn47vmTsQIECAAAECBAgQIECgDgELo+oYB60gQIAAAQIECBAgQKBigXxKv0yPaq63RR0lq14CBAgQIECAQH0C+daoo1qWb5bKOPao+6iXAAECBAgQIECAAAECtQq81dow7SJAgAABAgQIECBAgMDRAjlRNHafYV75JP9wYmlYNr9HWl4X98m8qWNvixobDecIECBAgAABAv0KxHZ6f/zxx2wH52LK4YVlDJrXZRply3i0PD/Mi+/D/DjnQ4AAAQIECBAgQIAAgZYEvDGqpdHSVgIECBAgQIAAAQIEThGIyaPh3xENiYmn2E7FhwABAgQIECBA4DoCEQPG4qgjPrkIKmPZI+6hTgIECBAgQIAAAQIECNQsYGFUzaOjbQQIECBAgAABAgQINCVQTjiVk1BrOxETYp7KX6ulHAECBAgQIECgH4Etbw0t48zyuB8NPSFAgAABAgQIECBAgMB+Ah5F3s9STQQIECBAgAABAgQIVCCQk0NnNCUXNUUb4jjbkulSm456U8DSfeUTIECAAAECBAicK/Dy8vL9zaEfHx+TDcmYMmPOTOOC8niygp0zsj1n3X/n7qiOAAECBAgQIECAAIFOBbwxqtOB1S0CBAgQIECAAAECBNoQiAml+PO2qDbGSysJECBAgAABAkcJRDyYsWHco1x4dNQ91UuAAAECBAgQIECAAIHeBSyM6n2E9Y8AAQIECBAgQIAAgYcJjE1krZ3Q8raohw2TGxEgQIAAAQIEqhR4fX19ir+lT8aXY7Hn0rXyCRAgQIAAAQIECBAgcDUBW+ldbcT1lwABAgQIECBAgACBRYFysmmx8A4F3t7enmL7FB8CBAgQIECAAIFrC8Ri+bnt9O7VyTi3rOeMbfjK+zsmQIAAAQIECBAgQIDAkQIWRh2pq24CBAgQIECAAAECBJoSGE4U5SRR+TR+dqgsm8eZ5nVRNs+NXZfnvC0qJaQECBAgQIAAgWsLxBujMpYs48g4zvMhVB7H97Js5JXfIz8/kbd0bZaVEiBAgAABAgQIECBAoAcBjyT3MIr6QIAAAQIECBAgQIDArgI5kRRpHu96g6KytVumFJc4JECAAAECBAgQ6FQgFi399ttvh/Uu49syPexmKiZAgAABAgQIECBAgEAFAhZGVTAImkCAAAECBAgQIECAwHUFvC3qumOv5wQIECBAgACBMYHYZtmHAAECBAgQIECAAAECBPYRsDBqH0e1ECBAgAABAgQIECDQiMCZT8eX947jeCOAia9GfjiaSYAAAQIECBB4kEDEiLl4PuPHB936l9vk/SP1IUCAAAECBAgQIECAQIsCHj1pcdS0mQABAgQIECBAgACBHwI1TtLkBNKPRk4c5ITXRLbTBAgQIECAAAECFxWIOPHLly+Tva8tBh62JxZ3+RAgQIAAAQIECBAgQKAGAW+MqmEUtIEAAQIECBAgQIAAgcsJeFvU5YZchwkQIECAAAECqwXKt0atvkhBAgQIECBAgAABAgQIEPhFwMKoX0icIECAAAECBAgQIECAwHqBfDo+07iyPJ6qKd4C4En6KR3nCRAgQIAAAQIE1r5dNGPPYUqQAAECBAgQIECAAAECBJ6ebKXnV0CAAAECBAgQIECAwGUFcvJoK0BcN7w2FjnlufI4z8U9yuO1E11b26Y8AQIECBAgQIBAHwIvLy9Pr6+vTx8fH987VMaS5QL7PM40Ck+VXZK59bqleuUTIECAAAECBAgQIEDgLAFvjDpL3n0JECBAgAABAgQIEOhCICePMo1OlcdjnXx7e/O2qDEY5wgQIECAAAECBH4SWLOYPmPPYfpTRb4QIECAAAECBAgQIEDgogIWRl104HWbAAECBAgQIECAAIHzBGJhlA8BAgQIECBAgACBJYF4Y1T5Jqil8vIJECBAgAABAgQIECBA4GcBC6N+9vCNAAECBAgQIECAAIGLCsQT9vkXBPnE/d4cMbEVE1w+BAgQIECAAAECBJYEInY8elH9I2LgpX7KJ0CAAAECBAgQIECAwFECHlM+Sla9BAgQIECAAAECBAicLrBlcVP5JH5el2l0ZOp42MkoV5Yd5ttGbyjiOwECBAgQIECAwJxAbKf39evXn94cNYw3y1h2WFdZNsoNv5fXlsdL9QzzfSdAgAABAgQIECBAgECNAt4YVeOoaBMBAgQIECBAgAABAg8XiAmi/IublxNGezYmJrZ8CBAgQIAAAQIECKwVeHl5OfSNo4+Igdf2VTkCBAgQIECAAAECBAjsLWBh1N6i6iNAgAABAgQIECBAoGuBXDB1ywRSbKEXE1s+BAgQIECAAAECBLYIrN1O755YdUt7lCVAgAABAgQIECBAgEArAv6PfCsjpZ0ECBAgQIAAAQIECDQrkIuovC2q2SHUcAIECBAgQIDAqQKxMCpjymhILoA6tVFuToAAAQIECBAgQIAAgQYELIxqYJA0kQABAgQIECBAgACBnwVyUuiMCaHn5+fvjYk0j+PEUpuibLwxyocAAQIECBAgQIDAVoGIJecW2WcsmvWWsWoZs2b+0Wm2J9Oj76d+AgQIECBAgAABAgQITAlYGDUl4zwBAgQIECBAgAABAgRGBGJyJz7lJE+eGyn+41Q85X/GpNSPBjggQIAAAQIECBBoWmDNdnoZl26NVZuG0XgCBAgQIECAAAECBAjMCFgYNYMjiwABAgQIECBAgAABAnsJzD3hv9c91EOAAAECBAgQINCvQLx99OXF/9Lvd4T1jAABAgQIECBAgACBIwTejqhUnQQIECBAgAABAgQIEKhRIJ+gv6VteW2kwzc/ZV7WW36P45jAMomVOlICBAgQIECAAIFbBWKx/R9//LF4eRmvlrFpXFjmzVV063VzdcojQIAAAQIECBAgQIDAowU8XvJocfcjQIAAAQIECBAgQOByAt4Wdbkh12ECBAgQIECAwCECa7bTO+TGKiVAgAABAgQIECBAgECjAhZGNTpwmk2AAAECBAgQIECAQBsC8US+Caw2xkorCRAgQIAAAQK1C4gtax8h7SNAgAABAgQIECBAoDYBW+nVNiLaQ4AAAQIECBAgQIDAQwRia5CYWBpuEXLvzaO+ss54W9Ta7UruvbfrCbQk8J//+Z9PX758aanJXbb1H//4x9P//u//dtm3Izr1b//2b0//8R//cUTV6twg8Pvvv28orSiB/gQivnx/f/8Rc+4Va2YMm2nI7VV3f6OgRwQIECBAgAABAgQItCJgYVQrI6WdBAgQIECAAAECBAisEignclZdUBQqry2PiyLfDyNvLr8sbxu9UsMxgb8E/uu//uuvL45OE/if//kfC6M26P/7v//703//939vuEJRAgQI7C/w+vr69PLy8vT5+Tla+VycOpcXla1dCDVWz9prRxvtJAECBAgQIECAAAECBA4SsJXeQbCqJUCAAAECBAgQIECAQExYxZ8PAQIECBAgQIAAgT0FbNW8p6a6CBAgQIAAAQIECBDoWcD/oe95dPWNAAECBAgQIECAAIFdBPKJ+GG6VLkJqyUh+QQIECBAgAABArcIrI0zx+LXPHfLfV1DgAABAgQIECBAgACB1gRspdfaiGkvAQIECBAgQIAAgQsKnD15E9uCRBuGaQ5F2b7yeO2EVdYjJUCAAAECBAgQILBGIN9MmtvplTFouaVdHmcadZfHa+61R5mp9u1RtzoIECBAgAABAgQIECAwJ+CNUXM68ggQIECAAAECBAgQIPBPgZzIGaZzODlZNVdGHgECBAgQIECAAIFbBdYswh+LX/Pcrfd1HQECBAgQIECAAAECBFoSsDCqpdHSVgIECBAgQIAAAQIEmhFYM1HVTGc0lAABAgQIECBAoDoB8WZ1Q6JBBAgQIECAAAECBAhUKGBhVIWDokkECBAgQIAAAQIECLQvYKKq/THUAwIECBAgQIBAzQLeUFrz6GgbAQIECBAgQIAAAQK1CLzV0hDtIECAAAECBAgQIECAwBECt24VUl4Xx8/Pzz81r8z/KeOfX0xSDUV8J0CAAAECBAgQOEIgFuN/+fJlNladi2OHeXNtHMa/W66dq1ceAQIECBAgQIAAAQIEjhTwxqgjddVNgAABAgQIECBAgMAlBbwt6pLDrtMECBAgQIAAgYcLiDsfTu6GBAgQIECAAAECBAg0JmBhVGMDprkECBAgQIAAAQIECNQvYIKq/jHSQgIECBAgQIBADwLxptLX19ceuqIPBAgQIECAAAECBAgQOETAVnqHsKqUAAECBAgQIECAAIFHCgy39Zi7d1l2eFx+n6ujzMtrMo2JqZig8iFAgAABAgQIECDwCIGIPz8+Pn661dpt7jKGzYuH12V+nI/jYX5eF2mWjeO5cpHvQ4AAAQIECBAgQIAAgUcJWBj1KGn3IUCAAAECBAgQIECgOoFy8qY8Hmto5C+Vieu8LWpMzzkCBAgQIECAAIGjBCL+/PLly2T1a2LYvLgsa3FTqkgJECBAgAABAgQIEGhZwGPMLY+ethMgQIAAAQIECBAgUJ2AhVHVDYkGESBAgAABAgS6FrCdXtfDq3MECBAgQIAAAQIECNwpYGHUnYAuJ0CAAAECBAgQIECgP4F8Uj7S8nipp7GNiSfrl5TkEyBAgAABAgQI7C2wZnH+WGybse7e7VEfAQIECBAgQIAAAQIEahGwMKqWkdAOAgQIECBAgAABAgSqEcjFTZGWx9nAnFTKNM+vmZDKslICBAgQIECAAAECewmUcWjGqJnmPcZi24x1s4yUAAECBAgQIECAAAECvQlYGNXbiOoPAQIECBAgQIAAAQJ3C8QkUnzKyaQ8N1d5OSE1V04eAQIECBAgQIAAgT0FYoFTvL107jMW266JcefqlEeAAAECBAgQIECAAIHaBSyMqn2EtI8AAQIECBAgQIAAgSYEbKPXxDBpJAECBAgQIECgWwGL9LsdWh0jQIAAAQIECBAgQOAOAQuj7sBzKQECBAgQIECAAAECBFLARFRKSAkQIECAAAECBM4QEI+eoe6eBAgQIECAAAECBAjULvBWewO1jwABAgQIECBAgACBawrcuq3HrdeFcl4baWxHUn4yryyX+ZG3tHVJlpUSIECAAAECBAgQOEIg4teXl5enz8/Pn6ov49i5GDcuGub/VNHgy1y9g6I/fS2vi4wt9/ypIl8IECBAgAABAgQIECCwQsAbo1YgKUKAAAECBAgQIECAAIE5gZiAij8fAgQIECBAgAABAmcKWKx/pr57EyBAgAABAgQIECBQo4D/c1/jqGgTAQIECBAgQIAAAQJNCZiAamq4NJYAAQIECBAg0K2A7fS6HVodI0CAAAECBAgQIEDgRgFb6d0I5zICBAgQIECAAAECBNoTiG07hlt3TPViS1kTUFOKzhMgQIAAAQIECDxSIN5iurQ13ZZ4+JFtdy8CBAgQIECAAAECBAgcIWBh1BGq6iRAgAABAgQIECBAoAqB4aTP0vctjS7rso3eFjllCRAgQIAAAQIEjhKIRVHxNtP39/fvt4jvEbcuLZbK9pQxbpzL67KOzM/zeZ2UAAECBAgQIECAAAECtQrYSq/WkdEuAgQIECBAgAABAgSaEIiJJxNDTQyVRhIgQIAAAQIELiFgm+dLDLNOEiBAgAABAgQIECCwUsDCqJVQihEgQIAAAQIECBAgQGBMwDZ6YyrOESBAgAABAgQInCUgPj1L3n0JECBAgAABAgQIEKhRwFZ6NY6KNhEgQIAAAQIECBAgMCuQW3jMFnpQpifyHwTtNgQIECBAgAABAqsE4m2msdXz5+fnqvJHFCrjdW9XPUJYnQQIECBAgAABAgQIrBXwxqi1UsoRIECAAAECBAgQIEBgIBATTvHnQ4AAAQIECBAgQKAmAW+Nqmk0tIUAAQIECBAgQIAAgTMF/B/8M/XdmwABAgQIECBAgACBpgW8Larp4dN4AgQIECBAgEC3AuLUbodWxwgQIECAAAECBAgQ2ChgYdRGMMUJECBAgAABAgQIEOhPILb6yO0+hulcb004zenII0CAAAECBAgQOEsg3mq6tIVdGfeWx2e12X0JECBAgAABAgQIECBwhICFUUeoqpMAAQIECBAgQIAAgaYEYtIoJ46GaXYkJovyL89ZGJUSUgIECBAgQIAAgZoEIqbNWDVj2EyznWXcWx5nvpQAAQIECBAgQIAAAQI9CFgY1cMo6gMBAgQIECBAgAABAncJlJNEcRyfTKcqjommnECaKuM8AQIECBAgQIAAgbMEcmHU1P0z3h2LhaeucZ4AAQIECBAgQIAAAQKtCVgY1dqIaS8BAgQIECBAgAABAlUIvL29VdEOjSBAgAABAgQIECAwJiBeHVNxjgABAgQIECBAgACBqwn4P/lXG3H9JUCAAAECBAgQIFCpQD6xvrV5W68ry+dxpuUboPLcWHsib+kJ/LHrnCNAgAABAgQIECDwKIGIbeOvjGvL42hHGf/G9zJ/eO2wbJTPT3ldnJsrm9dkWl675bq8XkqAAAECBAgQIECAAIE5AW+MmtORR4AAAQIECBAgQIAAgRGBmLB5efHPqREapwgQIECAAAECBCoSsJi/osHQFAIECBAgQIAAAQIEThHwf/JPYXdTAgQIECBAgAABAgRaFrAtScujp+0ECBAgQIAAgesIiFuvM9Z6SoAAAQIECBAgQIDAuICt9MZdnCVAgAABAgQIECBAoEGB2IYj3uZUbsexRzeivrJOb4vaQ1UdBAgQIECAAAECRwtk3Jqx7F5b1WV9Zfv3qrus0zEBAgQIECBAgAABAgTuFbAw6l5B1xMgQIAAAQIECBAgUI1ATsZkOlzQtNTQqfJZX15vS5KUkBIgQIAAAQIECNQsEHFsLI4aW8gU7Z46P9ansmzUO4yRx65xjgABAgQIECBAgAABAmcL2Erv7BFwfwIECBAgQIAAAQIEdhPIyZpI83iPyrO+rDOfvN+jbnUQIECAAAECBAgQOFIgFvVnPLvXfbK+Mt2rbvUQIECAAAECBAgQIEBgTwELo/bUVBcBAgQIECBAgAABAt0LeFtU90OsgwQIECBAgACBrgTEr10Np84QIECAAAECBAgQILBRwFZ6G8EUJ0CAAAECBAgQIEDg8QL5pqbH3/nXO5pY+tXEGQIECBAgQIAAgXoFzo5fh7G8Lfjq/a1oGQECBAgQIECAAIEeBbwxqsdR1ScCBAgQIECAAAECBA4TsI3eYbQqJkCAAAECBAgQOEAgFiJZjHQArCoJECBAgAABAgQIEGhCwMKoJoZJIwkQIECAAAECBAgQqEXAwqhaRkI7CBAgQIAAAQIE1gqc/daote1UjgABAgQIECBAgAABAnsLWBi1t6j6CBAgQIAAAQIECBBoQiC39Mg0Gl0ej3UiJpQ8bT8m4xwBAgQIECBAgEDNAmsWRmUsXKZ5XHPftI0AAQIECBAgQIAAAQJzAm9zmfIIECBAgAABAgQIECDQq0AscIqJnkyjn+VxOQmUx2smlHr10i8CBAgQIECAAIF2Bco4NmPb6E256D+Ph2m7vdZyAgQIECBAgAABAgQIPD15Y5RfAQECBAgQIECAAAEClxTICaFMA6E8HkOxjd6YinMECBAgQIAAAQK1C+Rip7l2Zixcpnk8d508AgQIECBAgAABAgQI1CxgYVTNo6NtBAgQIECAAAECBAhUJVA+aV9VwzSGAAECBAgQIECAwIxALIwSy84AySJAgAABAgQIECBAoFsBC6O6HVodI0CAAAECBAgQIEBgT4F4W9SaJ+33vKe6CBAgQIAAAQIECOwlYGHUXpLqIUCAAAECBAgQIECgJYG3lhqrrQQIECBAgAABAgQIELhHILYCye1AIi0XOpV5Y/ewjd6YinMECBAgQIAAAQKtCEQ8OxYDl+0fxsdTeeV5xwQIECBAgAABAgQIEKhZwBujah4dbSNAgAABAgQIECBAoBoBT9hXMxQaQoAAAQIECBAgcIOAePYGNJcQIECAAAECBAgQINC8gIVRzQ+hDhAgQIAAAQIECBAg8AgBE0mPUHYPAgQIECBAgACBowTibVDegnqUrnoJECBAgAABAgQIEKhVwFZ6tY6MdhEgQIAAAQIECBDoXCC3tLulm3PXLm2Jd8v9TCLdouYaAgQIECBAgACB2gRisf/7+/suzSpj8nILvqi8zIvvw/w4N/a59bqxupwjQIAAAQIECBAgQIBACHhjlN8BAQIECBAgQIAAAQLNC5SLocrJlDxfprd01tuiblFzDQECBAgQIECAQG0C98S1SzF15kef49iHAAECBAgQIECAAAECNQhYGFXDKGgDAQIECBAgQIAAAQJVC9hypOrh0TgCBAgQIECAAIGVAuLalVCKESBAgAABAgQIECDQjYCt9LoZSh0hQIAAAQIECBAgQGAvgXzCPVMTSHvJqocAAQIECBAgQOBMgdjSLmPcbMfabe6yvJQAAQIECBAgQIAAAQItCVgY1dJoaSsBAgQIECBAgAABArsKxKRQTgxlGjfICaOcJLIwald2lREgQIAAAQIECJwkEPFtbKf3+fn5vQUZ72Zzypg4z0kJECBAgAABAgQIECDQsoCFUS2PnrYTIECAAAECBAgQIHCIQE4IZWph1CHMKiVAgAABAgQIEDhBIB8CyFsPF0fleSkBAgQIECBAgAABAgR6EHjpoRP6QIAAAQIECBAgQIAAgaMELIo6Sla9BAgQIECAAAECZwiIb89Qd08CBAgQIECAAAECBM4S8Maos+TdlwABAgQIECBAgACBSYF8U9NkgQdmmDh6ILZbESBAgAABAgQIHC5wdnw7jPW9serwIXcDAgQIECBAgAABApcW8MaoSw+/zhMgQIAAAQIECBAgsCTw+vq6VEQ+AQIECBAgQIAAgWYExLfNDJWGEiBAgAABAgQIECCwg4CFUTsgqoIAAQIECBAgQIAAgX4Fzn6ivl9ZPSNAgAABAgQIEDhDIN7Q5C1NZ8i7JwECBAgQIECAAAECZwhYGHWGunsSIECAAAECBAgQIPBwgdyyI9LyeKkhFkYtCcknQIAAAQIECBBoTWApxs14OfqVx5m21lftJUCAAAECBAgQIEDg2gIWRl17/PWeAAECBAgQIECAwGUE8qn48gn5PJcIMdmTf3GuLJtlpAQIECBAgAABAgRaF8iFURn7Zpr9KuPkPM40y0gJECBAgAABAgQIECDQgoCFUS2MkjYSIECAAAECBAgQIHC3QEz2xKec9MlzU5XnhNFUvvMECBAgQIAAAQIEWhRYinPLODmPM22xv9pMgAABAgQIECBAgMB1BSyMuu7Y6zkBAgQIECBAgAABAgsCSxNGC5fLJkCAAAECBAgQIFClgDi3ymHRKAIECBAgQIAAAQIEDhCwMOoAVFUSIECAAAECBAgQINCHgAmjPsZRLwgQIECAAAECBH4WEOf+7OEbAQIECBAgQIAAAQL9Crz12zU9I0CAAAECBAgQIECAwL+2zguH2Prj+fl5NUmUN2G0mktBAgQIECBAgACBhgQiLo6/LdvjDctuia0botFUAgQIECBAgAABAgQ6E/DGqM4GVHcIECBAgAABAgQIENhPwMKo/SzVRIAAAQIECBAgUJeAWLeu8dAaAgQIECBAgAABAgSOEbAw6hhXtRIgQIAAAQIECBAg0LhATBR5Cr7xQdR8AgQIECBAgACBSQELoyZpZBAgQIAAAQIECBAg0JGAhVEdDaauECBAgAABAgQIEKhdILbfyL/a22qiqPYR0j4CBAgQIECAAIF7BF5fX++5/CHX5r8dMn3ITd2EAAECBAgQIECAAIGuBN666o3OECBAgAABAgQIECBAYINATLBMfSyMmpJxngABAgQIECBAoAeBsXh3GB97g2oPI60PBAgQIECAAAECBK4tk1IPgAAAQABJREFU4I1R1x5/vSdAgAABAgQIECBAYELAJNAEjNMECBAgQIAAAQJdCIh3uxhGnSBAgAABAgQIECBAYEHAwqgFINkECBAgQIAAAQIECFxTYOwJ+mtK6DUBAgQIECBAgECPArEwyuKoHkdWnwgQIECAAAECBAgQKAVspVdqOCZAgAABAgQIECBAoEqB4ZYec43cUnauHpNEczryCBAgQIAAAQIEehCImPeW+Hnsmrn4uSw/V64HU30gQIAAAQIECBAgQKAuAW+Mqms8tIYAAQIECBAgQIAAgUoETNhUMhCaQYAAAQIECBAgcJiAt6QeRqtiAgQIECBAgAABAgQqEbAwqpKB0AwCBAgQIECAAAECBOoRiEVRFkbVMx5aQoAAAQIECBAgcIyAmPcYV7USIECAAAECBAgQIFCPgIVR9YyFlhAgQIAAAQIECBAgsEIgt+GINP9WXLZYJOuK1JPzi1wKECBAgAABAgQIdCAQcW/GwdGdOL73k3WU9d5bp+sJECBAgAABAgQIECBwq8DbrRe6jgABAgQIECBAgAABAjUI5MTLmrasnZzx5PwaTWUIECBAgAABAgRaF5iLe7fG2aXFXL1lOccECBAgQIAAAQIECBA4WsAbo44WVj8BAgQIECBAgAABAs0JeGNUc0OmwQQIECBAgAABAjcIiHtvQHMJAQIECBAgQIAAAQJNCVgY1dRwaSwBAgQIECBAgAABAo8Q8IT7I5TdgwABAgQIECBA4GwBce/ZI+D+BAgQIECAAAECBAgcLWBh1NHC6idAgAABAgQIECBAoDkBT843N2QaTIAAAQIECBAgcINALIyyOOoGOJcQIECAAAECBAgQINCMgIVRzQyVhhIgQIAAAQIECBAg8CgBk0OPknYfAgQIECBAgACBswXEvmePgPsTIECAAAECBAgQIHCkgIVRR+qqmwABAgQIECBAgACBJgW8MarJYdNoAgQIECBAgACBGwTEvjeguYQAAQIECBAgQIAAgWYELIxqZqg0lAABAgQIECBAgACBRwh4Yv4Ryu5BgAABAgQIECBQi4D4t5aR0A4CBAgQIECAAAECBI4QsDDqCFV1EiBAgAABAgQIECDQrIAn5psdOg0nQIAAAQIECBC4QUD8ewOaSwgQIECAAAECBAgQaEbAwqhmhkpDCRAgQIAAAQIECBB4hICJoUcouwcBAgQIECBAgEAtAuLfWkZCOwgQIECAAAECBAgQOELAwqgjVNVJgAABAgQIECBAgEAVAt++ffvejmE61zhbiczpyCNAgAABAgQIEOhNYE38W8bT5XFvFvpDgAABAgQIECBAgEB/Am/9dUmPCBAgQIAAAQIECBAg8C+BmOSJiZthmj45qRPf89gT86kjJUCAAAECBAgQuIJAuTAqY+Lod3k+jzMd5l/BSR8JECBAgAABAgQIEGhTwMKoNsdNqwkQIECAAAECBAh0J1BOwnTXOR0iQIAAAQIECBAgUKlAudjpjCYO/x1wdnvOMHBPAgQIECBAgAABAgSOE7CV3nG2aiZAgAABAgQIECBA4GSBnGQZpnPNMhEzpyOPAAECBAgQIECgR4GlGLiMp8vjHi30iQABAgQIECBAgACBvgQsjOprPPWGAAECBAgQIECAAIE7BZYmhe6s3uUECBAgQIAAAQIEqhMQA1c3JBpEgAABAgQIECBAgMBOAhZG7QSpGgIECBAgQIAAAQIE+hAwKdTHOOoFAQIECBAgQIDAegEx8HorJQkQIECAAAECBAgQaEvAwqi2xktrCRAgQIAAAQIECBA4WMCk0MHAqidAgAABAgQIEKhOQAxc3ZBoEAECBAgQIECAAAECOwlYGLUTpGoIECBAgAABAgQIEGhfwIRQ+2OoBwQIECBAgAABAtsFxMHbzVxBgAABAgQIECBAgEAbAhZGtTFOWkmAAAECBAgQIECAwAMETAg9ANktCBAgQIAAAQIEqhMQB1c3JBpEgAABAgQIECBAgMBOAhZG7QSpGgIECBAgQIAAAQIECBAgQIAAAQIECBAg0KrAt2/fWm26dhMgQIAAAQIECBAgQGBSwMKoSRoZBAgQIECAAAECBAhcTcCT8lcbcf0lQIAAAQIECBAIAXGw3wEBAgQIECBAgAABAr0KWBjV68jqFwECBAgQIECAAAECmwVMCG0mcwEBAgQIECBAgEAHAuLgDgZRFwgQIECAAAECBAgQGBWwMGqUxUkCBAgQIECAAAECBK4oYELoiqOuzwQIECBAgAABAuJgvwECBAgQIECAAAECBHoVsDCq15HVLwIECBAgQIAAAQIENguYENpM5gICBAgQIECAAIEOBMTBHQyiLhAgQIAAAQIECBAgMCpgYdQoi5MECBAgQIAAAQIECFxRwITQFUddnwkQIECAAAECBMTBfgMECBAgQIAAAQIECPQqYGFUryOrXwQIECBAgAABAgQIbBYwIbSZzAUECBAgQIAAAQIdCIiDOxhEXSBAgAABAgQIECBAYFTgbfSskwQIECBAgAABAgQIEGhU4Nu3bz9aHsfDSZ4y/0fBPw+GZYf5vhMgQIAAAQIECBDoVSBi4WGsXH4fxspzeb0a6RcBAgQIECBAgAABAu0JeGNUe2OmxQQIECBAgAABAgQIHCQwnOw56DaqJUCAAAECBAgQIFCdgFi4uiHRIAIECBAgQIAAAQIEdhCwMGoHRFUQIECAAAECBAgQINCHgMmgPsZRLwgQIECAAAECBAgQIECAAAECBAgQIECAQAhYGOV3QIAAAQIECBAgQIAAgT8FLIzyUyBAgAABAgQIELiqgFj4qiOv3wQIECBAgAABAgT6FrAwqu/x1TsCBAgQIECAAAECBAgQIECAAAECBAgQILAoYGHUIpECBAgQIECAAAECBAg0KGBhVIODpskECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECMwLWBg17yOXAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIEGBSyManDQNJkAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgXkBC6PmfeQSIECAAAECBAgQIECAAAECBAgQIECAAIHuBZ6fn7vvow4SIECAAAECBAgQIHA9AQujrjfmekyAAAECBAgQIECAwIiAiaARFKcIECBAgAABAgQIECBAgAABAgQIECBAgEDDAhZGNTx4mk6AAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwLiAhVHjLs4SIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQINCwgIVRDQ+ephMgQIAAAQIECBAgQIAAAQIECBAgQIAAgT0EbC29h6I6CBAgQIAAAQIECBCoTcDCqNpGRHsIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIELhb4O3uGlRAgAABAgQIECBAgACBCYFv375N5DhNgAABAgQIECBAgACBbQLDf194y9U2P6UJECBAgAABAgQIXFHAG6OuOOr6TIAAAQIECBAgQIDALwImVX4hcYIAAQIECBAgQOBCAuLhCw22rhIgQIAAAQIECBC4kICFURcabF0lQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgcBUBC6OuMtL6SYAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQOBCAhZGXWiwdZUAAQIECBAgQIAAAQIECBAgQIAAAQIECIwJ2EpvTMU5AgQIECBAgAABAgRaF7AwqvUR1H4CBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBH4RsDDqFxInCBAgQIAAAQIECBC4ooAn5K846vpMgAABAgQIECBAgAABAgQIECBAgAABAj0LWBjV8+jqGwECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIGLClgYddGB120CBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECPQtYGNXz6OobAQIECBAgQIAAAQKrBb59+7a6rIIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBA/QIWRtU/RlpIgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgMBGAQujNoIpToAAAQIECBAgQIAAAQIECBAgQIAAAQIEehPwBtXeRlR/CBAgQIAAAQIECBAIAQuj/A4IECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEOhOwMKo7oZUhwgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQsDDKb4AAAQIECBAgQIAAAQL/FLB1iJ8BAQIECBAgQIDAlQXEw1cefX0nQIAAAQIECBAg0K/AW79d0zMCBAgQIECAAAECBM4WeH5+/qkJJlt+4vCFAAECBAgQIECAAIENAsN/X2y4VFECBAgQIECAAAECBC4q4I1RFx143SZAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDQs4CFUT2Prr4RIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQuKiAhVEXHXjdJkCAAAECBAgQIECAAAECBAgQIECAAAECKWDb65SQEiBAgAABAgQIECDQk4CFUT2Npr4QIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIPBdwMIoPwQCBAgQIECAAAECBAj8U8AT8n4GBAgQIECAAAECBAgQIECAAAECBAgQIECgLwELo/oaT70hQIAAAQIECBAgQIAAAQIECBAgQIAAAQKbBTwosJnMBQQIECBAgAABAgQINCBgYVQDg6SJBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhsE7AwapuX0gQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQINCBgYVQDg6SJBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhsE7AwapuX0gQIECBAgAABAgQIECBAgAABAgQIECBAoDuBb9++ddcnHSJAgAABAgQIECBAgICFUX4DBAgQIECAAAECBAgQ+FPAZJCfAgECBAgQIECAAAECBAgQIECAAAECBAgQ6EfAwqh+xlJPCBAgQIAAAQIECBC4U8DCqDsBXU6AAAECBAgQINCsgFi42aHTcAIECBAgQIAAAQIEZgQsjJrBkUWAAAECBAgQIECAwLUETAZda7z1lgABAgQIECBA4C8BsfBfFo4IECBAgAABAgQIEOhH4K2frugJAQIECBAgQIAAAQIEnp6en59vZjAZdDOdCwkQIECAAAECBBoX2BoLR9x9T+zdOJfmEyBAgAABAgQIECDQiICFUY0MlGYSIECAAAECBAgQILCPQDl5M5z8GX7f545qIUCAAAECBAgQIFC3wFQcXMbOdfdA6wgQIECAAAECBAgQIDAuYCu9cRdnCRAgQIAAAQIECBC4oMDUhNAFKXSZAAECBAgQIECAAAECBAgQIECAAAECBAg0L2BhVPNDqAMECBAgQIAAAQIECOwlYGHUXpLqIUCAAAECBAgQaElAHNzSaGkrAQIECBAgQIAAAQJbBCyM2qKlLAECBAgQIECAAAECXQuYEOp6eHWOAAECBAgQIEBgQkAcPAHjNAECBAgQIECAAAECzQtYGNX8EOoAAQIECBAgQIAAAQJ7CZgQ2ktSPQQIECBAgAABAi0JiINbGi1tJUCAAAECBAgQIEBgi4CFUVu0lCVAgAABAgQIECBAoGsBE0JdD6/OESBAgAABAgQITAiIgydgnCZAgAABAgQIECBAoHkBC6OaH0IdIECAAAECBAgQIEBgLwETQntJqocAAQIECBAgQKAlAXFwS6OlrQQIECBAgAABAgQIbBGwMGqLlrIECBAgQIAAAQIECBAgQIAAAQIECBAgQKAzgVgY9fz83FmvdIcAAQIECBAgQIAAAQJPTxZG+RUQIECAAAECBAgQIEDgTwFPyvspECBAgAABAgQIXFFAHHzFUddnAgQIECBAgAABAtcQsDDqGuOslwQIECBAgAABAgQIrBQwKbQSSjECBAgQIECAAIFuBMTA3QyljhAgQIAAAQIECBAgMBCwMGoA4isBAgQIECBAgAABAtcWMCl07fHXewIECBAgQIDAFQXEwFccdX0mQIAAAQIECBAgcA0BC6OuMc56SYAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQOBSAhZGXWq4dZYAAQIECBAgQIAAgSUBT8svCcknQIAAAQIECBDoTUAM3NuI6g8BAgQIECBAgAABAilgYVRKSAkQIECAAAECBAgQ6E7g+fn5e5+G6VxHTQrN6cgjQIAAAQIECBDoUWApBi7j6fK4Rwt9IkCAAAECBAgQIECgL4G3vrqjNwQIECBAgAABAgQItCqQEyzR/qWJmbV9zHqGaV5f3jPv+/n5mdlSAgQIECBAgAABAt0LlPFvxMfDGDkAIp6O8xlX5/FY2a1ge9Sx9Z7KEyBAgAABAgQIECBwHQFvjLrOWOspAQIECBAgQIAAgcsJ5CTLMJ2DyMmeuTLyCBAgQIAAAQIECPQisCb+LePp8rgXA/0gQIAAAQIECBAgQKBfAQuj+h1bPSNAgAABAgQIECBA4AaB8on5Gy53CQECBAgQIECAAIGmBMS/TQ2XxhIgQIAAAQIECBAgsFHAwqiNYIoTIECAAAECBAgQINC3wJon5vsW0DsCBAgQIECAAIErCYh/rzTa+kqAAAECBAgQIEDgegIWRl1vzPWYAAECBAgQIECAAIEZAU/Mz+DIIkCAAAECBAgQ6E5A/NvdkOoQAQIECBAgQIAAAQKFgIVRBYZDAgQIECBAgAABAgQIhICn5v0OCBAgQIAAAQIEriIg9r3KSOsnAQIECBAgQIAAgWsKWBh1zXHXawIECBAgQIAAAQIEZgQ8NT+DI4sAAQIECBAgQKArAbFvV8OpMwQIECBAgAABAgQIDAQsjBqA+EqAAAECBAgQIECAAAFPzfsNECBAgAABAgQIXEEg4l6x7xVGWh8JECBAgAABAgQIXFfAwqjrjr2eEyBAgAABAgQIECAwIeCp+QkYpwkQIECAAAECBLoSsCiqq+HUGQIECBAgQIAAAQIERgQsjBpBcYoAAQIECBAgQIAAgWsLmCC69vjrPQECBAgQIEDgKgLi3quMtH4SIECAAAECBAgQuK7A23W7rucECBAgQIAAAQIECLQo8Pz8/L3ZmcaXPSZ0yvq8MarFX4Y2EyBAgAABAgQIbBWIuLeMg8vjrXVl+awj0zwvJUCAAAECBAgQIECAwBkCFkadoe6eBAgQIECAAAECBAjsJjCccJlbJLW27FwduzVcRQQIECBAgAABAgROFpiLeyN2zvg50r3KntxltydAgAABAgQIECBA4GICttK72IDrLgECBAgQIECAAAECywLeGLVspAQBAgQIECBAgED7AuLe9sdQDwgQIECAAAECBAgQmBewMGreRy4BAgQIECBAgAABAhcVmHsi/qIkuk2AAAECBAgQINCZgJi3swHVHQIECBAgQIAAAQIEfhGwld4vJE4QIECAAAECBAgQIFCbQG7hke2am8Apy86Vy7qm0nh6/vX1dSrbeQIECBAgQIAAAQLNC9z6xqiIucu4uzweQ1nKH7vGOQIECBAgQIAAAQIECOwh4I1ReyiqgwABAgQIECBAgACB7gTuWVTVHYYOESBAgAABAgQIdCcQ8a6Yt7th1SECBAgQIECAAAECBAYCFkYNQHwlQIAAAQIECBAgQIBACNz69Dw9AgQIECBAgAABAi0IWBTVwihpIwECBAgQIECAAAEC9wpYGHWvoOsJECBAgAABAgQIEOhSwMKoLodVpwgQIECAAAECBP4UEO/6KRAgQIAAAQIECBAgcAWBtyt0Uh8JECBAgAABAgQIEKhD4Pn5+UdDanhCfa49Jop+DJUDAgQIECBAgACBDgXG4t0yPi6Pz+p+DW04q+/uS4AAAQIECBAgQIDAPgLeGLWPo1oIECBAgAABAgQIEOhMYGyiqLMu6g4BAgQIECBAgMCFBcS7Fx58XSdAgAABAgQIECBwIQELoy402LpKgAABAgQIECBAgMA2AZNF27yUJkCAAAECBAgQaEfg4+OjncZqKQECBAgQIECAAAECBG4UsJXejXAuI0CAAAECBAgQIECgDYFbt9+I62Jh1MuL50naGGmtJECAAAECBAgQWCsQ21pv3do64uOMrTNdez/lCBAgQIAAAQIECBAgcJaA/8N/lrz7EiBAgAABAgQIECBQvYA3RlU/RBpIgAABAgQIECBwg8DWRVE33MIlBAgQIECAAAECBAgQqELAwqgqhkEjCBAgQIAAAQIECBCoUcDCqBpHRZsIECBAgAABAgTuFRDn3ivoegIECBAgQIAAAQIEWhGwMKqVkdJOAgQIECBAgAABAgTuEsjtPrZsAfLx8XHXPV1MgAABAgQIECBAoEaBpTg3Y+doex5nWmN/tIkAAQIECBAgQIAAAQJTAm9TGc4TIECAAAECBAgQIECgJ4HcLiTT6Ft5HN+Hkz2RH3/D81HWhwABAgQIECBAgECrAvnGqIhzx2LdMgbO40xb7bN2EyBAgAABAgQIECBwTQFvjLrmuOs1AQIECBAgQIAAgcsJ5IRPOfmT5+YwctJorow8AgQIECBAgAABAi0JLMW4ZZycx5m21E9tJUCAAAECBAgQIECAgIVRfgMECBAgQIAAAQIECBCYEViaNJq5VBYBAgQIECBAgACB6gTizU/x50OAAAECBAgQIECAAIErCNhK7wqjrI8ECBAgQIAAAQIEGhMYPo1+5sSNhVGN/Xg0lwABAgQIECBAYFbg7Ph2GOvPNlYmAQIECBAgQIAAAQIE7hTwxqg7AV1OgAABAgQIECBAgEDfAmdPHPWtq3cECBAgQIAAAQKPFhDfPlrc/QgQIECAAAECBAgQOFPAwqgz9d2bAAECBAgQIECAAIHqBUwcVT9EGkiAAAECBAgQILBBQHy7AUtRAgQIECBAgAABAgSaF7Awqvkh1AECBAgQIECAAAECBI4UiG38ztzK78i+qZsAAQIECBAgQOB6AhZGXW/M9ZgAAQIECBAgQIDAlQUsjLry6Os7AQIECBAgQIAAgYsLPD8/P5V/UxwfHx9TWc4TIECAAAECBAgQaEpgLrZdExs31VmNJUCAAAECBAgQIEDg8gJvlxcAQIAAAQIECBAgQIAAgYFATAjFW6IijY+n6gdAvhIgQIAAAQIECDQpEHFtxrjRgfK4yQ5pNAECBAgQIECAAAECBBYEvDFqAUg2AQIECBAgQIAAAQIELIzyGyBAgAABAgQIEOhBQFzbwyjqAwECBAgQIECAAAECWwQsjNqipSwBAgQIECBAgAABAlUKxJPu+bR7pns21ATSnprqIkCAAAECBAgQOEvgyLj26Jj8LDP3JUCAAAECBAgQIECgbQFb6bU9flpPgAABAgQIECBAoFmB4QKm2Lpu7ae8Nq4bXpv5kQ7zht/X3DMmkOK6rHfNNcoQIECAAAECBAgQqE3g4+Pj5iYNY+Hh94yz83ymW254yzVb6leWAAECBAgQIECAAIHrCXhj1PXGXI8JECBAgAABAgQIdCcQEyg5iZLp3p28ZxJp77aojwABAgQIECBAgMBWgVi4dGRM+4iYfGuflSdAgAABAgQIECBAgICFUX4DBAgQIECAAAECBAgQWCFw5CTSitsrQoAAAQIECBAgQOAugSO30burYS4mQIAAAQIECBAgQIDAgQK20jsQV9UECBAgQIAAAQIECLQjMHzTVG4Fkj2wMColpAQIECBAgAABAi0KjMWzwxi4xX5pMwECBAgQIECAAAECBOYELIya05FHgAABAgQIECBAgEBXAvdM/MQT9rFY6p46usLUGQIECBAgQIAAgaYEIp7dEstm2Uyb6qzGEiBAgAABAgQIECBA4E8BW+n5KRAgQIAAAQIECBAgQGClgO1HVkIpRoAAAQIECBAgUJ3A2BujqmukBhEgQIAAAQIECBAgQGBnAQujdgZVHQECBAgQIECAAAECbQjkk++ZRqvL47FemEwaU3GOAAECBAgQIECgdoF8++lcOzMWLtM8nrtOHgECBAgQIECAAAECBGoWsJVezaOjbQQIECBAgAABAgQIHCYQ2+LFJ9Ph8XASKMpZGPWdzH8IECBAgAABAgQaEyjj2GGcm13JbaPLNPKmyud1UgIECBAgQIAAAQIECNQs4I1RNY+OthEgQIAAAQIECBAgcJhATvBkGjcqj8dubCu9MRXnCBAgQIAAAQIEahdYE8dmLFymeVx7/7SPAAECBAgQIECAAAECUwIWRk3JOE+AAAECBAgQIECAAIGBQDw9v2ZSaXCZrwQIECBAgAABAgROFSjfGHVqQ9ycAAECBAgQIECAAAECDxawMOrB4G5HgAABAgQIECBAgEDbAiaV2h4/rSdAgAABAgQIXE3A4v6rjbj+EiBAgAABAgQIECBQClgYVWo4JkCAAAECBAgQIECgSoHYwqP8O7ORFkadqe/eBAgQIECAAAECWwXOjl/LON7WfFtHT3kCBAgQIECAAAECBO4VsDDqXkHXEyBAgAABAgQIECBwKQFb6V1quHWWAAECBAgQINC8gPi1+SHUAQIECBAgQIAAAQIE7hCwMOoOPJcSIECAAAECBAgQIHA9gZhYiu1IfAgQIECAAAECBAi0IHD2G6NaMNJGAgQIECBAgAABAgT6FXjrt2t6RoAAAQIECBAgQIAAgafvW/Clw9KCpnJrj7myMbn09uafU+kqJUCAAAECBAgQqFMgYtq5hVFl/BvHczFwWbbO3moVAQIECBAgQIAAAQIEfhXwf/J/NXGGAAECBAgQIECAAIFGBXKyJtO5iZ0tXcz68hoLo1JCSoAAAQIECBAgULNAbqM3jGfvbfPe9d3bHtcTIECAAAECBAgQIEBgSsBWelMyzhMgQIAAAQIECBAgQGBCYO6p+4lLnCZAgAABAgQIECDwcAFx68PJ3ZAAAQIECBAgQIAAgcoELIyqbEA0hwABAgQIECBAgACB+gXiyfu93kZVf2+1kAABAgQIECBAoFUBC6NaHTntJkCAAAECBAgQIEBgLwFb6e0lqR4CBAgQIECAAAECBO4SGG7HsXbh0dbrhuWnGj0sV7Yn8mynNyXnPAECBAgQIECAQA0CEb/mVnrZnohjh3Fu5kU6zJ8rO7yu/L7leO09ttSpLAECBAgQIECAAAECBFLAG6NSQkqAAAECBAgQIECAAIENAu/v7xtKK0qAAAECBAgQIEDgsQLeFvVYb3cjQIAAAQIECBAgQKBOAQuj6hwXrSJAgAABAgQIECBA4IEC5ZPx+cR6plPNMNE0JeM8AQIECBAgQIBADQJL8WrGu2OxcA3t1wYCBAgQIECAAAECBAjsIWBh1B6K6iBAgAABAgQIECBA4HICsTXJ0mTT5VB0mAABAgQIECBAoBoBbzitZig0hAABAgQIECBAgACBEwUsjDoR360JECBAgAABAgQIEKhDIBY5xV98hmm2MJ+kzyfr47yFUakjJUCAAAECBAgQqEng8/PzR1xbxrFlLFvGveVxTf3QFgIECBAgQIAAAQIECNwrYGHUvYKuJ0CAAAECBAgQIECgeYGcLIqO5GRRpnOd8xT+nI48AgQIECBAgACBswTWxKkZ747Fwme1230JECBAgAABAgQIECCwt4CFUXuLqo8AAQIECBAgQIAAgcsIlE/iX6bTOkqAAAECBAgQIFC9gDebVj9EGkiAAAECBAgQIECAwIMELIx6ELTbECBAgAABAgQIECCwn0A+1Z7pfjVvr8mk03YzVxAgQIAAAQIECBwnENvinR2jZpweqQ8BAgQIECBAgAABAgTOFLAw6kx99yZAgAABAgQIECBAoHmBNduUNN9JHSBAgAABAgQIEGhG4OxFUc1AaSgBAgQIECBAgAABApcQsDDqEsOskwQIECBAgAABAgQIHCVg4ukoWfUSIECAAAECBAjcIiA+vUXNNQQIECBAgAABAgQI9Crw1mvH9IsAAQIECBAgQIAAAQJjW3fE1iJ7fLLu3Krk9fV1j2rVQYAAAQIECBAgQOAugXijacaqUVF5fGvFWUemt9bjOgIECBAgQIAAAQIECDxawMKoR4u7HwECBAgQIECAAAECpwnMTeQMF0wNyw7zy07EU/kWRpUijgkQIECAAAECBM4Q+Pz8fIq4dRjLlm3JvEiHMW7mRfnh8bBsWadjAgQIECBAgAABAgQI1CpgK71aR0a7CBAgQIAAAQIECBBoRsB2Jc0MlYYSIECAAAECBLoWiLdF+RAgQIAAAQIECBAgQIDAXwIWRv1l4YgAAQIECBAgQIAAAQI3CcTCKE/Q30TnIgIECBAgQIAAgR0FLIzaEVNVBAgQIECAAAECBAh0IWArvS6GUScIECBAgAABAgQI9CdQbt2xZdFReV2o3HPtWtW4ZyyOenvzT6y1ZsoRIECAAAECBAjsKxBxb2ylt+UTcewwfl57/aOvW9su5QgQIECAAAECBAgQIFAKeGNUqeGYAAECBAgQIECAAAECEwI5aZTpsJin84civhMgQIAAAQIECDxSYGp754xfb13I9Mg+uBcBAgQIECBAgAABAgT2FrAwam9R9REgQIAAAQIECBAgcEmBWBi15e1Ul0TSaQIECBAgQIAAgcMELNQ/jFbFBAgQIECAAAECBAg0LGBhVMODp+kECBAgQIAAAQIECBwjkE/T59P1cZc8N3fHqaf0566RR4AAAQIECBAgQOBegVigv7Qwaiy2XRPj3ts21xMgQIAAAQIECBAgQOBMAQujztR3bwIECBAgQIAAAQIEqhTINz9FWh5nY3NSKdM8vzQZleWkBAgQIECAAAECBPYUKBfoZ4yaad5nLLbNWDfLSAkQIECAAAECBAgQINCbgIVRvY2o/hAgQIAAAQIECBAgcLdATCLFp5xMynNzldtOb05HHgECBAgQIECAwFECaxboj8W2a2Lco9qsXgIECBAgQIAAAQIECDxCwMKoRyi7BwECBAgQIECAAAEClxEon9a/TKd1lAABAgQIECBA4DSBeOvTmoVRpzXQjQkQIECAAAECBAgQIHCiwNuJ93ZrAgQIECBAgAABAgQI7CJQPum+tB1Ilo1ycZzl83w2KM/n96k068jrY1Lq7c0/taa8nCdAgAABAgQIENhXIBbmZywaNZfHS3daKlvml8dj9S7lj13jHAECBAgQIECAAAECBI4W8H/rjxZWPwECBAgQIECAAAEC1QoMJ2/mFkOVZefK5XZ6ZflqATSMAAECBAgQIECgeYGlt0VlXJrpXCybZZpH0QECBAgQIECAAAECBAj8KWArPT8FAgQIECBAgAABAgQI7CywNDm18+1UR4AAAQIECBAgcFGBWOQk9rzo4Os2AQIECBAgQIAAAQKrBCyMWsWkEAECBAgQIECAAAECBNYLmJxab6UkAQIECBAgQIDA7QLiztvtXEmAAAECBAgQIECAwDUEbKV3jXHWSwIECBAgQIAAAQKXFSi3A5nbNmQIVF43zIvvZf6w3o+Pj6c4V5YZq8M5AgQIECBAgAABAvcIxMKosZhz7FzeJ/Lm8rPcML3lmmEdvhMgQIAAAQIECBAgQODRAt4Y9Whx9yNAgAABAgQIECBA4BICnt6/xDDrJAECBAgQIEDgNIFYiB8L8n0IECBAgAABAgQIECBAYFrAwqhpGzkECBAgQIAAAQIECBC4WcDCqJvpXEiAAAECBAgQILBCQLy5AkkRAgQIECBAgAABAgQuL2Bh1OV/AgAIECBAgAABAgQIEFgSyG1Dhuncdbmd3lwZeQQIECBAgAABAgRuFVizMGosfs1zt97XdQQIECBAgAABAgQIEGhJwMKolkZLWwkQIECAAAECBAhcVCAmb8q/RzPENiXxGabZjrJt5UTTmsmqrENKgAABAgQIECBAYK3AcBu9Mh4t6xiLX/NcWe7o46n2HX1f9RMgQIAAAQIECBAgQMDCKL8BAgQIECBAgAABAgQILAjkYqdhunDZk4VRS0LyCRAgQIAAAQIEbhFYG2eOxa957pb7uoYAAQIECBAgQIAAAQKtCVgY1dqIaS8BAgQIECBAgAABAs0I2E6vmaHSUAIECBAgQIBAUwJrF0Y11SmNJUCAAAECBAgQIECAwAECFkYdgKpKAgQIECBAgAABAgTaFIin5/NvrgdZJtO5sl+/fp3LlkeAAAECBAgQIEBgk8Dn5+dTLMCf+mSMmulUuTifZTKdKyuPAAECBAgQIECAAAECLQq8tdhobSZAgAABAgQIECBAgMCUQEzq5Ofbt295+Eua5TIdls3zeeEwP88P0+F18TT/b7/9NizmOwECBAgQIECAAIGbBPJtUcO4c01lcc3UdXE+Yt6p/LL+NWXK8o4JECBAgAABAgQIECBwloA3Rp0l774ECBAgQIAAAQIECFxCYOmJ/ksg6CQBAgQIECBAgMAuArFwyRtJd6FUCQECBAgQIECAAAECFxGwMOoiA62bBAgQIECAAAECBAicJ/Dly5fzbu7OBAgQIECAAAEC3QjEFnpr32TaTad1hAABAgQIECBAgAABAncI2ErvDjyXEiBAgAABAgQIECDQlsBwy48tk0rDa8uel3lj24/kBFZZrrzeMQECBAgQIECAAIE1AvG2qIwpM43rpo4zL/MzXXOvLWXX1KcMAQIECBAgQIAAAQIEzhDwxqgz1N2TAAECBAgQIECAAIHLCby/v1+uzzpMgAABAgQIECCwn4AtmvezVBMBAgQIECBAgAABAtcRsDDqOmOtpwQIECBAgAABAgQInCgQT/f7ECBAgAABAgQIELhVwEL7W+VcR4AAAQIECBAgQIDAlQUsjLry6Os7AQIECBAgQIAAAQKbBXJLkUjL47mKolxssRdb6vkQIECAAAECBAgQ2CoQsWQsjFqKP8v88njr/ZQnQIAAAQIECBAgQIBALwJvvXREPwgQIECAAAECBAgQuI5ATvJEj2OS6JGfvF+mee81bYq3Rr2+vuYlUgIECBAgQIAAAQKrBGKB/TD+LC8sY9E4n2XjfBwP88trjzh+9P2O6IM6CRAgQIAAAQIECBDoQ8Abo/oYR70gQIAAAQIECBAgQOBBAjnJE2l5vOb28ZR/TlKtKa8MAQIECBAgQIAAgRBYu41eGZ+WxxQJECBAgAABAgQIECBwVQELo6468vpNgAABAgQIECBAgMApAmsntU5pnJsSIECAAAECBAhUJxAL68WQ1Q2LBhEgQIAAAQIECBAg0IiAhVGNDJRmEiBAgAABAgQIECDwWIF8I1Sme909ttPzIUCAAAECBAgQILBWIOLHfPvT2mvmymV8u2edc/eTR4AAAQIECBAgQIAAgTMF3s68uXsTIECAAAECBAgQIEDgSIGxyZ6prezKslEmvpdly/xoc5lX9mGp3Ofn59PHx8fT6+treZljAgQIECBAgAABAqMCYwvrhzHn6IV/nlwqW+aXx8M65/KGZX0nQIAAAQIECBAgQIBALQLeGFXLSGgHAQIECBAgQIAAAQKXEbAVymWGWkcJECBAgAABAncJxIL6qQX5d1XsYgIECBAgQIAAAQIECFxEwMKoiwy0bhIgQIAAAQIECBAgcIxAPjmfadylPB67azz1b4JrTMY5AgQIECBAgACBUmDsbVFlfhxn7DlMh+V8J0CAAAECBAgQIECAwBUFbKV3xVHXZwIECBAgQIAAAQIEvgvk5FFyrF2sVF6X12QadZXHZdkyL94a9be//S1vLSVAgAABAgQIECDwk0DElOWbRodxZRaOcpGXaZyfKpvXTKW3XjdVn/MECBAgQIAAAQIECBA4W8Abo84eAfcnQIAAAQIECBAgQKBpgZw8yjQ6Ux5PdW7N0/9T1zpPgAABAgQIECDQv8DaeDFjz2Hav5AeEiBAgAABAgQIECBAYFnAwqhlIyUIECBAgAABAgQIECCwu8Dn5+dPbwDY/QYqJECAAAECBAgQaFYg3v60dmFUs53UcAIECBAgQIAAAQIECDxAwFZ6D0B2CwIECBAgQIAAAQIE6hHIJ+mjRTHh9MhPee+4b0x2vb35Z9kjx8C9CBAgQIAAAQItCMQWeuXWeGe1eRi/ntUO9yVAgAABAgQIECBAgMCtAv4P/K1yriNAgAABAgQIECBAoAqB4WTNoxc7jSGUbZprT7w16uPj4+n19XWsGucIECBAgAABAgQuKrD0tqgy3ozjuZjzEYRlex5xP/cgQIAAAQIECBAgQIDAWgFb6a2VUo4AAQIECBAgQIAAAQIHCCxNeh1wS1USIECAAAECBAhULJBvi6q4iZpGgAABAgQIECBAgACBZgS8MaqZodJQAgQIECBAgAABAgQeJZBPvGd65BP4MfEVb456efHcyqPG130IECBAgAABAjULHLlwPuLbjHFrNtA2AgQIECBAgAABAgQI7CVgYdRekuohQIAAAQIECBAgQKB5gZwkyoVQmUbHMi+O43z5Pc5NfebKZf0x+fX3v/99qgrnCRAgQIAAAQIELiIQ2yzHX8SQ+Rddn4spM78sM3UcZTMGHbsuzvkQIECAAAECBAgQIECgJwGPJPc0mvpCgAABAgQIECBAgMAuAjmRFGke71LxRCWxMKqcoJoo5jQBAgQIECBAgEDnAke+LSroMr4t085JdY8AAQIECBAgQIAAgYsLWBh18R+A7hMgQIAAAQIECBAgUIfA0ZNgdfRSKwgQIECAAAECBKYEYnvl2GbZhwABAgQIECBAgAABAgT2E7Awaj9LNREgQIAAAQIECBAgcHGBfPI+GPJNU5lO0eQ13ho1JeQ8AQIECBAgQOAaAhEPZmwYPZ6KI/P8mrLXkNNLAgQIECBAgAABAgQITAu8TWfJIUCAAAECBAgQIECAQHsCOVGULX/kFnXlvcrjsk3l+WxjpHH+4+Pj6e3NP9NKF8cECBAgQIAAgSsIRCyYC6Om+lvGlFEm48o4H8fD/Kl69jr/6Pvt1W71ECBAgAABAgQIECBwLQFvjLrWeOstAQIECBAgQIAAAQIHCsTkUE4QDdM1t/3y5cuaYsoQIECAAAECBAh0JrBlW+UyziyPOyPRHQIECBAgQIAAAQIECOwiYGHULowqIUCAAAECBAgQIECAwP0Cn5+fT+/v7/dXpAYCBAgQIECAAIFmBOJtTxbINzNcGkqAAAECBAgQIECAQGMC9mhobMA0lwABAgQIECBAgACBxwjk0/d5t9yqJL7P5Y3lZx3DdFhP5MfbAmynN5TynQABAgQIECDQr0AujI/YcCw+HOv5XNm5vKhr7T3G7uscAQIECBAgQIAAAQIEWhOwMKq1EdNeAgQIECBAgAABAgR2EygnhcqFT8MblOUyryxf5pfns2yZlmXj/LD8x8fHU7w56uXFC35LN8cECBAgQIAAgV4FprbRG8aNc/0vyw6PI94sz62tZ66cPAIECBAgQIAAAQIECLQi4P+0tzJS2kmAAAECBAgQIECAwGUEbKVymaHWUQIECBAgQODiAvG2qFgU70OAAAECBAgQIECAAAECxwhYGHWMq1oJECBAgAABAgQIECDw48n8eEI/n9LPdMiT5yPNt0YNy/hOgAABAgQIECDQl0C8LSriv/wb612ZF8fxyXSsvHMECBAgQIAAAQIECBAg8JeAhVF/WTgiQIAAAQIECBAgQKBDgZxIOmPyKLfJizSPgzjbVHJnfpb11qhSxzEBAgQIECBAoD+BeFtULIjP+C/jwezpUsyY5R6VZnsyfdR93YcAAQIECBAgQIAAAQL3CFgYdY+eawkQIECAAAECBAgQIDAjEJNG8Sknj/Lc8LI8n2VzomxYzncCBAgQIECAAIH2BWIRVCyEz9gv07GelXlxHJ9Mx8o7R4AAAQIECBAgQIAAAQJ/CVgY9ZeFIwIECBAgQIAAAQIECFQl4K1RVQ2HxhAgQIAAAQIEdhOIRfCfn5+71aciAgQIECBAgAABAgQIEBgXeBs/7SwBAgQIECBAgAABAgSuJTB86n64lclQI8tHuTjO8nk+y+f5/D5My/LDsvnWqNfX1+FlvhMgQIAAAQIECDQqEDHf1AL4Mjac695SuTK/PB7WOZc3LOs7AQIECBAgQIAAAQIEWhSwMKrFUdNmAgQIECBAgAABAgSqEhhOKJULnIZ5cw0fKxuTZr///vvcZfIIECBAgAABAgQaEojF7xEvRuw3Fv9NdWWu/JZ6pup3ngABAgQIECBAgAABAj0K2Eqvx1HVJwIECBAgQIAAAQIEuhH4+Ph4ij8fAgQIECBAgACB9gXm3hbVfu/0gAABAgQIECBAgAABAvUJWBhV35hoEQECBAgQIECAAAECnQrkk/xlmsdzXZ7aamXuGnkECBAgQIAAAQL1CeTbopZaljFiplG+PF66Xj4BAgQIECBAgAABAgQI/EvAwii/BAIECBAgQIAAAQIECKwQiImo/FtRfLRIbrGXaRZaqtdbo1JKSoAAAQIECBBoV2DpbVEZE0aanzJuLI8zf01a1lvWveZaZQgQIECAAAECBAgQINC6gIVRrY+g9hMgQIAAAQIECBAg0IxATkSVaR4POxHnyz9vjRoK+U6AAAECBAgQaEsg3xaVMd5c6zNGzDTKlsdz18ojQIAAAQIECBAgQIAAgb8ELIz6y8IRAQIECBAgQIAAAQIEqhWIt0bFZJoPAQIECBAgQIBAewJLb4tqr0daTIAAAQIECBAgQIAAgTYELIxqY5y0kgABAgQIECBAgACBSgXyyf1I8/iopnpr1FGy6iVAgAABAgQIHCvw9evXp1u3wltqWcahZbp0jXwCBAgQIECAAAECBAhcReDtKh3VTwIECBAgQIAAAQIECAwXLs1NTq0tG3VE2bKu4bVr5cvrst7y2s/Pz+9vjXp780+50sUxAQIECBAgQKBmgYjrYmFUxnrDNNue58vveS7TMi+PIy1j0fg+LB/n4jN1/l+5P/93S9mfr/SNAAECBAgQIECAAAEC9Qh4Y1Q9Y6ElBAgQIECAAAECBAg0KJATRpHm8ZHd8NaoI3XVTYAAAQIECBDYX+DIt0VFazMOLdP9e6FGAgQIECBAgAABAgQItClgYVSb46bVBAgQIECAAAECBAg0LlAuosrjTOe6lm+NmisjjwABAgQIECBAoA6BfFvUUmsyDoy0PF66Tj4BAgQIECBAgAABAgQIzAvYf2HeRy4BAgQIECBAgAABAgR+EcjJqswYbl2S5+fS8pryuKy7PF/W9ccffzy9vr7+mDQr8xwTIECAAAECBAjUIxBv+5yK6aKVZewX37NsnI/jYX6UWfrccs1SnfIJECBAgAABAgQIECDQqoA3RrU6ctpNgAABAgQIECBAgMDlBGKSKyfJ3t/fL9d/HSZAgAABAgQItCQQb/qMbfQyhou2W7TU0ghqKwECBAgQIECAAAECPQhYGNXDKOoDAQIECBAgQIAAAQLNCZSTYnmc6ZrOLL19YE0dyhAgQIAAAQIECBwnEG/5XPvJODDS8njt9coRIECAAAECBAgQIECAwLiAhVHjLs4SIECAAAECBAgQIEDgJoGczCrTmypacdGWybYV1SlCgAABAgQIECCwk0C83fPj42On2n6uplw4lcc/l/CNAAECBAgQIECAAAECBFLgLQ+kBAgQIECAAAECBAgQuJrAcCLp27dvkwRry47VMbw2bxLnx8pH/tQ1eW2kOeH2+vpannZMgAABAgQIECBwokDEd/F2z/hETFfGdeXxsIlLZYfXZhw5PD9W7/Dc1Peluqauc54AAQIECBAgQIAAAQK1Cjz/8x9P0//nv9ZWaxcBAgQIECBAgAABAgQOENjyz6OybHk81qwyvzyOsvl9mJZ5U8dxTSyK+v3336OIDwECBAgQIECAQAUCX79+fco3e65d7JQLkjKNbpTH5fc4H3HgMD+7Pjw//J7lxtItZceud44AAQIECBAgQIAAAQK1CdhKr7YR0R4CBAgQIECAAAECBAhsEIgtWmLyzYcAAQIECBAgQOB8gViwlIuizm+NFhAgQIAAAQIECBAgQICAhVF+AwQIECBAgAABAgQIEKhAIJ/Oj7Q8zqbl+UhfXv71T7k8F1u15BunsryUAAECBAgQIEDg8QLDLfQyXsu0bFGci88wLcs4JkCAAAECBAgQIECAAIH7BCyMus/P1QQIECBAgAABAgQIEPg+mZWTXTmxtZUlFzZFmsdRR9a7VJ+3Ri0JySdAgAABAgQIHCvw+fn59P7+PnuTjO3KmDFjv0xnK5jIHKt3oqjTBAgQIECAAAECBAgQuJSAhVGXGm6dJUCAAAECBAgQIECgVoGcHMtJrWhnnlvT5ng7QUzG+RAgQIAAAQIECJwjsHULvYz1huk5rXdXAgQIECBAgAABAgQI9ClgYVSf46pXBAgQIECAAAECBAg0LjCcIMvvc93KrVvmysgjQIAAAQIECBDYXyDeFPXx8TFbccZzkZbHsxfJJECAAAECBAgQIECAAIG7BN7uutrFBAgQIECAAAECBAgQ6EggJ6iiS/duZZIsw3rm7jGWl9dnmvWOlc0JudfX1ywmJUCAAAECBAgQOFgg4rTybVERp5WxWt4+ysX5jOuyTKZZLtOp85EfeXP5WcdSukcdS/eQT4AAAQIECBAgQIAAgTMFvDHqTH33JkCAAAECBAgQIECgWYGcjFozmZRlxzqbecN68vswHasjzmU95aTcVFnnCRAgQIAAAQIE9hP4+vXr98qW4rYyvzwuW5IxXeZn3vD8MD/LZTosn+elBAgQIECAAAECBAgQuJqAhVFXG3H9JUCAAAECBAgQIECga4HPz8+nnJzruqM6R4AAAQIECBCoQCDe/mQ74woGQhMIECBAgAABAgQIECAwIWBh1ASM0wQIECBAgAABAgQIEGhVICbncouWVvug3QQIECBAgACBFgS8rbOFUdJGAgQIECBAgAABAgSuLPB25c7rOwECBAgQIECAAAECBGoSKLdEGS5sKvPG2jwsH4uj/v73v48VdY4AAQIECBAgQGAHgY+Pj6f39/dfairjtuFxGbNFXpn/S0VOECBAgAABAgQIECBAgMDdAt4YdTehCggQIECAAAECBAgQIFCfQGynF5N1PgQIECBAgAABAvsLxAKn//u//9u/YjUSIECAAAECBAgQIECAwK4CFkbtyqkyAgQIECBAgAABAgQI7C+QbxIo3yqQ5+buFpN15VsJ5srKI0CAAAECBAgQWC+wZuviMl7L40zX30lJAgQIECBAgAABAgQIELhHwFZ69+i5lgABAgQIECBAgAABAv8UKCe45hYileUSbq58ltmS5j0ytaXeFj1lCRAgQIAAAQLLArmFXsZby1dsL5F1Z7pUw9pyS/XIJ0CAAAECBAgQIECAQG8CFkb1NqL6Q4AAAQIECBAgQIDALgLDyaVbFzDN1TOXF53I/Lx3ptnBzM/vmZblYku9v/3tb08vL14YnD5SAgQIECBAgMCtAhFnxcLz8jOMyYbfo2xcl+eHadaV5+N7HJcxXZ7Lsvek5X3uqce1BAgQIECAAAECBAgQaEHA/xlvYZS0kQABAgQIECBAgACBSwvk5FWk5fFaFFvqrZVSjgABAgQIECAwLxCLzj8/P+cL/ZmbcVt8zeNMV1WgEAECBAgQIECAAAECBE5/TgAAAEAASURBVAjcLWBh1N2EKiBAgAABAgQIECBAgMDtAjE5lhNkmd5e2/iVMXkXk3g+BAgQIECAAAECtwtETDV8W9TttY1f+YjYcPzOzhIgQIAAAQIECBAgQKBPAVvp9TmuekWAAAECBAgQIECAQCMCU1ukxKTYMG+uS3OLqqKemMR7e3uzpd4cojwCBAgQIECAwIzAH3/88SO3jL3K4x8F/jzIvGGa5fJ8fs/4L87H8TA/y0kJECBAgAABAgQIECBAYJ2AN0atc1KKAAECBAgQIECAAAEChwjEZFdOeGV6yI3+WWk5mXfUPdRLgAABAgQIEOhRIN6++fHxcXjXHhkbHt4ZNyBAgAABAgQIECBAgEAFAhZGVTAImkCAAAECBAgQIECAAIFHCPw/e/fyI8lyFQ64prunZ65l0O8CXoAsWIDArNhYIIF4eMPCgJAt+FtAwAKxZQkbbywhBIINEmtAyAjJAgTseG6wkFggg5Fsz/T7/uY0nLln4uazOqs7q+orqW9ERpyIjPyyp6pm8tzMuJjnkXqPIW0fBAgQIECAwCEJxCP0JJgf0hl1LAQIECBAgAABAgQIHJOAxKhjOtuOlQABAgQIECBAgACBgxDIO0vVMuvtAeZdB7KMR+rlI1raWNsECBAgQIAAAQIfFYjvT/HK71MfjfiwJb+T1TLrH0apESBAgAABAgQIECBAgMBjCZw91o7shwABAgQIECBAgAABAvssUC9oDSUW1bg43ja29rd9U31yXJY5rs6dbW1MtMcdD16+fJkhSgIECBAgQIAAgR6Bm5ubjzxCL75z1e9dtZ7TxHewaM/vYl0xGdtXDo0Z6mvnmxPbjrVNgAABAgQIECBAgACBfRdwx6h9P4PWT4AAAQIECBAgQIDA0Qnkxa1aZn0KRlzgix8vAgQIECBAgACBfoFIapr7CL38TlbLrPfvSQ8BAgQIECBAgAABAgQI7EpAYtSuZM1LgAABAgQIECBAgACBRxCoF9qynuXQ7uMiX97BYChOHwECBAgQIEDgWAWmfF/K711R1vqxmjluAgQIECBAgAABAgQIrE3Ao/TWdkashwABAgQIECBAgACB1QvkRa9c6K4SjOp+2n1kX22v9ezPNWaZMVF6pF6qKAkQIECAAAEC7wq0d9iM71b5/arWc1R+x6ox2VfL7K9tS9cfYx9Lr9l8BAgQIECAAAECBAgQ2JWAxKhdyZqXAAECBAgQIECAAAECbwTaC1N50azFybgs27hsz3Ftf7ZPKXOuvOB3duavhlPcxBAgQIAAAQLHIRDfsyKBPL8zxVHX+lyFvrF97V3zz4ntGq+NAAECBAgQIECAAAECxyrgUXrHeuYdNwECBAgQIECAAAECByFQL5JlPcspBxgX/e7u7qaEiiFAgAABAgQIHIXAxcXF5EcO5/euKGv9KKAcJAECBAgQIECAAAECBPZAQGLUHpwkSyRAgAABAgQIECBAgMAuBPLiXSRHPeQOVLtYmzkJECBAgAABAk8hcH19fZ80nt+TnmIN9kmAAAECBAgQIECAAAECywl4XsJylmYiQIAAAQIECBAgQIDALIH2gttQclIbW3cUfX1j23E1Nsfc3t5u4iLg+fl5nVadAAECBAgQIHBUAnEXzUgYj1d8Z6rfo2q9RRmKHRrXNU/bZpsAAQIECBAgQIAAAQIEHibgjlEP8zOaAAECBAgQIECAAAECeyuQF+qijMSoSJDyIkCAAAECBAgco0AkjEdSVCY55fekY7RwzAQIECBAgAABAgQIEDgkAYlRh3Q2HQsBAgQIECBAgAABAkcvkBfx8qJegGTbGM7FxUXvnafGxuonQIAAAQIECOyzwNXV1f0j9MaOoes71tTvWmNz6ydAgAABAgQIECBAgACB5QU8Sm95UzMSIECAAAECBAgQIECgV6C9cJaPs2sHtHHR3xfbjh3brnPXOfNOCS9fvhybQj8BAgQIECBA4GAEbm5u7u+eWb8jxcG12w894Jgvvm9NnXdq3EPXZTwBAgQIECBAgAABAgQOWUBi1CGfXcdGgAABAgQIECBAgMCjCLQXrWqy0ZwFLDFP7jvL3H/O3bZnf5ZxYTB+zs78dTFNlAQIECBAgMDhCsR3o3yE3tBR5nepGhNjoz3L2je13jXv1LE1bql56pzqBAgQIECAAAECBAgQOAQBj9I7hLPoGAgQIECAAAECBAgQIPB/AnlRLMpanwMUj9S7u7ubM0QsAQIECBAgQGAvBeY+SrjrO1Z+59pLAIsmQIAAAQIECBAgQIDAgQtIjDrwE+zwCBAgQIAAAQIECBA4boG8UNeWYypx54Sxu0uNzaGfAAECBAgQILBmgevr683t7e3oEru+R2Xb6GABBAgQIECAAAECBAgQIPCkAp6N8KT8dk6AAAECBAgQIECAwLEL1ItqcxKR2nF1u5rmnFlGX42t9ejLuLhIGBcLz8/Po9mLAAECBAgQIHBQAnF3zEgEr6/6vSjqdTvi4ntSbct6ljlXu53tU8qHjJ0yvxgCBAgQIECAAAECBAgcm4A7Rh3bGXe8BAgQIECAAAECBAjsrUBcKMuLZVmOHUzGtWXXuIjJn+ifeheFrrm0ESBAgAABAgTWKhAJTpkUVb/79K2363tUtvWNqe11H3PG1TnUCRAgQIAAAQIECBAgQGA7AYlR27kZRYAAAQIECBAgQIAAgaMQ8Ei9ozjNDpIAAQIECByVwNXV1SbuGOVFgAABAgQIECBAgAABAocvIDHq8M+xIyRAgAABAgQIECBAgMC9QN6hYMpdCzK23lEBIwECBAgQIEBg3wVubm428ROv/L7THlNtz3qWbaxtAgQIECBAgAABAgQIEFi3wNm6l2d1BAgQIECAAAECBAgQ2D+BeuEsEou2fU2dp8a1+4r9Z3+uJcuMrf21Hv0RGxcP484K5+fnOURJgAABAgQIENg7gbhL1MXFxf268ztPltHYVa/fpbI/ywRot7O9q5wT2zU+25aaJ+dTEiBAgAABAgQIECBA4FAF3DHqUM+s4yJAgAABAgQIECBAgEAjkBfQoqz1Jux+s/ZHPRKj8u4KXfHaCBAgQIAAAQJrFogEp9evX99/B6rfc7rWnP3Rl/Usu+K1ESBAgAABAgQIECBAgMB6BSRGrffcWBkBAgQIECBAgAABAgRWJRB3WIg7LXgRIECAAAECBPZNIL7HtHfN3LdjsF4CBAgQIECAAAECBAgQmC/gUXrzzYwgQIAAAQIECBAgQIDAZIH27gLbXpBr55m8gJHAdt66vq6+uKj43nvvvb17wsj0ugkQIECAAAECTy4Qd768vb19525RXYvK7z5R1u9EXbFT22KunHfqmL64pebpm187AQIECBAgQIAAAQIEDlFAYtQhnlXHRIAAAQIECBAgQIDAXgrUi11DF+MiLvqnxk/FqPPFmK41xB2j4uLiixcvpk4rjgABAgQIECDwZALxKOD47tL1ar/7dMXMbWu/pw3tY6hv7n7FEyBAgAABAgQIECBAgEC3gEfpdbtoJUCAAAECBAgQIECAAIEegevr6038eBEgQIAAAQIE1iwQCd2Xl5drXqK1ESBAgAABAgQIECBAgMCOBdwxasfApidAgAABAgQIECBAgMBjCOQdB/JOUl13e2rXkWOizPhar/EZm21xkfHk5GRzenqaTUoCBAgQIECAwGoE4rtNPAI4vxuNLSy/67Tl2Ljsz3GxXevZryRAgAABAgQIECBAgACBpxF49uYvhh88za7tlQABAgQIECBAgAABAscnsO1fwdpxY9tVti8227OsY6LetsddF9rXxz72MRf/WhTbBAgQIECAwJMLRFLU7e3tO4lRkbBUk5ZqvS64tmc9y4xrt2t7fIfK/ixrf9bnlu1cc8eLJ0CAAAECBAgQIECAwDEKeJTeMZ51x0yAAAECBAgQIECAwMEJxIWyvFiW5dhBZlyWEV/r7fjoy5/oi4t+eSeGNtY2AQIECBAgQOCpBOKRvzc3N/e7z+8uWfatKfrjVcus942p7XX+OePqHOoECBAgQIAAAQIECBAgsLyAxKjlTc1IgAABAgQIECBAgACBoxGIOzFcXV0dzfE6UAIECBAgQGDdAvHdJB7560WAAAECBAgQIECAAAECBELgDAMBAgQIECBAgAABAgQIHI5A3qEgy/ZxeHGk2Rf17K9tUc9HwGR/xLavHBN3ZTg9Pd2cnfkrZmtkmwABAgQIEHg8gfjeEnezzO8osedaryvJ9iy7YmtfO7avr8apEyBAgAABAgQIECBAgMDTC/hX66c/B1ZAgAABAgQIECBAgMARCdSLaENJR2Mkc+YZis2+upZaz/5YT21v1xd3Zjg5Obn/aftsEyBAgAABAgR2LRDfU/IRv/X7S7vfti+/32R7lkPj+mJyzFh/xo2VS80zth/9BAgQIECAAAECBAgQOGQBj9I75LPr2AgQIECAAAECBAgQIDBRIC685cW3tpw4xeb169eDyVNT5xFHgAABAgQIEJgrEI/2jcfoTX3V7zu1PnW8OAIECBAgQIAAAQIECBDYDwGJUftxnqySAAECBAgQIECAAAECjypQLxDW+tAi6p0ahuL0ESBAgAABAgSWFIikqHi079Arvs+032lye2icPgIECBAgQIAAAQIECBDYb4Fnb/7h+oP9PgSrJ0CAAAECBAgQIECAwGEIDP31bKivPfoaW+ttXGzf3d11Nb+981MdPzX27Oxs8/Lly855NRIgQIAAAQIElhS4ubm5f4RezlkToLIty9qXSVFZZkyWNTbbsmzHtNsZ11UOxQ71dc2ljQABAgQIECBAgAABAgTGBSRGjRuJIECAAAECBAgQIECAwKMI1CSksR0Oxda+Wu+as/bXesTW7axn2def7c+fP9+8ePEiNr0IECBAgAABAjsRiEfnXVxcvDN3m1yU21lGcNazzAnqdq1nf5ZtX7udcVmO9c+Ny3glAQIECBAgQIAAAQIECIwLeJTeuJEIAgQIECBAgAABAgQIEJgpEI+zGXukzcwphRMgQIAAAQIE3grEnSzbpKi3nSoECBAgQIAAAQIECBAgQOD/BM5IECBAgAABAgQIECBAgMDhCnTdoaDe9WkXR577vLq62pycnGxOT093sRtzEiBAgAABAkcqEN9lHjMpKr7bxD7zO86RsjtsAgQIECBAgAABAgQI7KWAR+nt5WmzaAIECBAgQIAAAQIEjkFgTgJTX2y09/WF4dS+jGvLPA/ZnnPW7Y997GP3CVIZqyRAgAABAgQIbCsQ3zEiKSoeoxevSFZqE5bqdtazzDG1jHr7qvFdfWP97Zi+7aF5+sZoJ0CAAAECBAgQIECAAIHpAh6lN91KJAECBAgQIECAAAECBPZOIC62tT+7Poh2f3HxMh5340WAAAECBAgQeKhA3JEykqLy+8ZD55syPvYVr8fc55R1iSFAgAABAgQIECBAgACBcQGJUeNGIggQIECAAAECBAgQIHD0AvWCYGDMuTCYd3aod5E6elAABAgQIECAwGyBy8vLzc3NzeRx7feXGJhtkycRSIAAAQIECBAgQIAAAQJ7LXC216u3eAIECBAgQIAAAQIECBC4F6gX+cYSkDI24qI+Fj+FOOeM2K75oi0uZr548cIFySmgYggQIECAAIF3BK6vr98mRdXvHVGv2+8MeuBGnbfW22mH+tpY2wQIECBAgAABAgQIECDwuAISox7X294IECBAgAABAgQIECDw6AL1Yl2btFT7YmFtfy4227PM9hzf117njMfexONvIjnKiwABAgQIECAwVSDuEhXfIfKV3z9iu9a7tqMtvqdkXK1HX31lTG3L+lBfxigJECBAgAABAgQIECBAYH0CHqW3vnNiRQQIECBAgAABAgQIEFidQF4MrGXW5yw27vZQL2zOGSuWAAECBAgQOD6BSKy+uLjY6sDzu0qWMUmtbzWpQQQIECBAgAABAgQIECCwVwISo/bqdFksAQIECBAgQIAAAQIElhPIC4NRZn3K7DU261lOGV8fhTMlXgwBAgQIECBwnAJ3d3ezkqLy+0iUtT5FL8fUcso4MQQIECBAgAABAgQIECCwboFnb24d/MG6l2h1BAgQIECAAAECBAgQIDDnr25DsbUv6nHxr7ZV6bY9t7OM2FrvG1tjsh7ly5cvN2dnnvBe3dQJECBAgACB/xWI7wqvX7/eRHJUJiulTWzXV7udfdnelm1/brdljov2Wh+Ka/va7aF52ljbBAgQIECAAAECBAgQIPBwAXeMerihGQgQIECAAAECBAgQILCXAnlhLsqsTzmQGpv1LMfGZ1yUl5eXm3g8jhcBAgQIECBAoApkUlSU8Z0hvz/UmK56xtUx2dYVX9tyTC1rvzoBAgQIECBAgAABAgQI7KeAxKj9PG9WTYAAAQIECBAgQIAAgYMQiDtBSI46iFPpIAgQIECAwCICmRQVd4ryIkCAAAECBAgQIECAAAECDxWQGPVQQeMJECBAgAABAgQIECBwIALtHRLm3GEhCGp8rQ/xRJzkqCEhfQQIECBA4HgEIinq4uKi91G9XRL5naMtu2JrW43Peu1XJ0CAAAECBAgQIECAAIHDEHj25i+bHxzGoTgKAgQIECBAgAABAgQIHI/A1L/KjcX19Ud7XCSs/bUe0rndlu1ZyP5sr9tZj329fPlyc3Li/99JJyUBAgQIEDgmgfhOUB+z2yYr1e1ar0bZnmX01XrdjvbYZ9uf8/W11zkydqgcmmdonD4CBAgQIECAAAECBAgQWEbAvzgv42gWAgQIECBAgAABAgQIHK1AXvDLMiBqfQpMXJiMO0d5bM4ULTEECBAgQOCwBNqkqDlHl9852nLOHGIJECBAgAABAgQIECBA4HAFJEYd7rl1ZAQIECBAgAABAgQIEHh0gbgo2V6YzO2xxUiOGhPST4AAAQIEDk8gPv/j8Xk3NzeTDi6/V3R955g0gSACBAgQIECAAAECBAgQOCqBs6M6WgdLgAABAgQIECBAgACBAxHIi4JxOHFBcdtXnWdsrhrb7jP7anutZ3+7j9qexxAXR9977723CVbZriRAgAABAgQOT+Dq6mpze3t7/7nf9b0gjjja2778npHtWbZCfe1tXO6nq31u25x9zp1bPAECBAgQIECAAAECBAjME3j25i+Q2/8L+rx9iSZAgAABAgQIECBAgACBHQjM/WvdUHxfX9s+dTvi4uJgja/14MjtWp6cnEiO2sHviikJECBAgMCaBC4vLzfX19f3S4rvCzWhaKge3xn6+mOyvr7a3uUw1D/U1841J7Yda5sAAQIECBAgQIAAAQIElhXwKL1lPc1GgAABAgQIECBAgAABAgsI3N3dbV6/fv02aWqBKU1BgAABAgQIrEigJkWtaFmWQoAAAQIECBAgQIAAAQIHJiAx6sBOqMMhQIAAAQIECBAgQIDAmgTyjglR1nrXGmt/1CVHdSlpI0CAAAEC+y8Qj8+LO0Xl94Msu44svx9EX9az7IrXRoAAAQIECBAgQIAAAQIEqoBH6VUNdQIECBAgQIAAAQIECOyhQD6CbpulD42tfbXetZ/a31WvbXV82x7JUPnKvtPT083Lly/fXgzNfiUBAgQIECCwfwKREBV3i2qTm+IxuvXV9mdftrdl25/btcwx2dZuZ3uWY/0Z15bbjmvnsU2AAAECBAgQIECAAAECDxd492+bD5/PDAQIECBAgAABAgQIECBA4K1AXhiMstbfBjSVjMsyum9vbzcXFxceq9dY2SRAgAABAvsmkElRue78vM/vCNley9qX9SxrnDoBAgQIECBAgAABAgQIEOgSkBjVpaKNAAECBAgQIECAAAECBHYikBcya5n1oR1GctTr168lRw0h6SNAgAABAisWiMfnxZ2iprzyu0Etsz5lvBgCBAgQIECAAAECBAgQIJACZ1lREiBAgAABAgQIECBAgMDxCdSLjPnoui6FGpf9ffFtbF9czlPLdmzti8fsRXLUe++99/buU7VfnQABAgQIEFinQCRExd2i4pWf9VFmfe6qp46LuPgeMid+7lrEEyBAgAABAgQIECBAgMC6BZ69+YvhB+teotURIECAAAECBAgQIECAwByBbf+aNzau7W+36xprX1e9tk0ZFzExJn5OTk4kR1U0dQIECBAgsGKBTIrK5KS2zKVne25nWduznmVXTLZFGXHx3aHG13qNzfi2bcr20JxTxoshQIAAAQIECBAgQIAAgd0JeJTe7mzNTIAAAQIECBAgQIAAAQKNQF44rGXWm9DezbxzVJReBAgQIECAwDoFIiEpk6LmrjC/G9Qy63PnEk+AAAECBAgQIECAAAECxy0gMeq4z7+jJ0CAAAECBAgQIECAwJMJ1AucWc9ybFGRFPXq1auN5KgxKf0ECBAgQODxBSIp6uLi4u3j88ZWkJ//Udb62Dj9BAgQIECAAAECBAgQIEBgTMCj9MaE9BMgQIAAAQIECBAgQGDPBeLi5DavoXHRN9Rf99fG5XaWEVvrfWMjJuOizAun77333v3j9eo4dQIECBAgQOBpBOIzOu4UdXNzc7+A/LyOjXgcbn3Vvq722t9Xr+Paeo7Jsq+/bZ+y3TfnlLFiCBAgQIAAAQIECBAgQODxBN79m+jj7deeCBAgQIAAAQIECBAgQGDPBeKCYF4UzHLOIdUxWc+ya57oqz8RExdfX79+7c5RXWDaCBAgQIDAIwvE53LcKaomRbWf3V1Lys//jI2YbOuKH2tbap6x/egnQIAAAQIECBAgQIAAgfULSIxa/zmyQgIECBAgQIAAAQIECBAYEIiLsPFYvdvb24EoXQQIECBAgMAuBTJZ2efxLpXNTYAAAQIECBAgQIAAAQJzBSRGzRUTT4AAAQIECBAgQIAAAQLvCOQdHerdGd4JmLjRNU+2tVNke91n3DnKxdhWyjYBAgQIENi9QCZFRZmfzVn27b1+lkdMbvfF97XnfmrZF6udAAECBAgQIECAAAECBI5P4Nmbv6x+cHyH7YgJECBAgAABAgQIECBwnAIP+Svg0NjaV+tdym1/brdlOzb7s71v+8WLF5uzs7MMUxIgQIAAAQI7FIjP43h83t3d3f1e2gSnul3rdUnZnmX09dXruDaua7vG1zlr+5T6Q8ZOmV8MAQIECBAgQIAAAQIECOxGwB2jduNqVgIECBAgQIAAAQIECBCYKZAXHKOs9ZnT3F+cvbm5mTtMPAECBAgQIDBTIJKh4o6NmRQ1Z3j7WZ/bc+YQS4AAAQIECBAgQIAAAQIExgQkRo0J6SdAgAABAgQIECBAgACBJxHIC6RtOWUxceeKq6urKaFiCBAgQIAAgS0E4vG1r169mpwUVT/Pa32LXRtCgAABAgQIECBAgAABAgQmC3i2wGQqgQQIECBAgAABAgQIENh/gbwQmUfSPo4u2+eWc+atse3+u/pqTFd/rrX2RVskRsXY8/Pzt3egylglAQIECBAgsL1A3JkxkpDjFZ+/7WdwztzVl5/rOSbLHJNlX3v213JObB03VN/FnEP700eAAAECBAgQIECAAAECuxGQGLUbV7MSIECAAAECBAgQIEDgaAW6LiTmRdAulBo/FNeO7RsX7TFPlHHhNuovXrzovWjbzmubAAECBAgQ6Be4vr6+Tz7Oz+Esc0TdrvXs7yunxkZcfs73zaWdAAECBAgQIECAAAECBAikgEfppYSSAAECBAgQIECAAAECBFYlkBdI23LuIiM56vXr1/cXUeeOFU+AAAECBAh8KHB5ebn1o2rr53mtfzi7GgECBAgQIECAAAECBAgQWF5AYtTypmYkQIAAAQIECBAgQIAAgUYgLoA+5CJoHVvrzW46NyM+7iwRyVF3d3edMRoJECBAgACBfoH4HI1H50Wy8dRXfl5HfNaznDpHjYuxOT7L2q9OgAABAgQIECBAgAABAgS6BJ69+UvtB10d2ggQIECAAAECBAgQIEDg+ATm/BVxamzEzYlN9Tom61lmTC1rX1uv2++9997m9PS0DlUnQIAAAQIEegTiM7QmF9cEpRjSJim12zlttrdl25/bfWXf+LH4vv7annPXNnUCBAgQIECAAAECBAgQ2G8Bd4za7/Nn9QQIECBAgAABAgQIENgLgbjQmBcbs5yz8ByzzTw5Jsu448X19fWc3YslQIAAAQJHKRB3WsykqPwcnQoR8fnKepbZPqes+3/IPHP2KZYAAQIECBAgQIAAAQIE9l/gbP8PwREQIECAAAECBAgQIECAAIF5ApeXl/d3sTo/P583UDQBAgQIEDgSgdvb2/vH5x3J4TpMAgQIECBAgAABAgQIEDhQAY/SO9AT67AIECBAgAABAgQIECCwjUB95Nyc8UPjhvpiH7W/1tv9R19Xf22r9To+7njR9YpH6r148eLt3ay6YrQRIECAAIFjE7i5udlEEnHXq965qe3POzll2fafnPQ/wKCOiXp8pte2Oldfe8aM9WdcW247rp3HNgECBAgQIECAAAECBAisR8Ado9ZzLqyEAAECBAgQIECAAAECTy5QLwj2JRnNXWSdM8YOzTsUW/tyjixzTRnT197uPy78xkty1D2D/xAgQIAAgc3V1dX9T36mBklfve1LvvgcHhqTcTUm27rKqXFdY4fadjXv0D71ESBAgAABAgQIECBAgMDjCvT/LzqPuw57I0CAAAECBAgQIECAAAECkwXyQmaWMbDWJ0/0JjAeFfT69etN312l5swllgABAgQI7KtAJDPFXaIiMWrbV34W1zLr285pHAECBAgQIECAAAECBAgQeIiAxKiH6BlLgAABAgQIECBAgAABAk8uEBdc86JrW05dXCRFRXJUJEl5ESBAgACBYxOIz8GLi4vN9fX1rEOvn7u1PmsSwQQIECBAgAABAgQIECBAYIcCz978n0Af7HB+UxMgQIAAAQIECBAgQIDAgQhM/evj1Lhgidip8W1cbmeZ83Vx15gal+1ZRt/5+fn9T9c82ggQIECAwKEJRFJwJEXVz8JIcspEpzjeWu/aTpOMy7KNre05pqvMuCy7YrJtSkzGRjk3vo5VJ0CAAAECBAgQIECAAIH9E3DHqP07Z1ZMgAABAgQIECBAgACBgxKIC5R5kTLLOQfYNX7qPBlX54hHCLUXiOesRywBAgQIENgXgbhDVNwxMV75WZjllGPo+hzNtinj25i674fM085rmwABAgQIECBAgAABAgSOV+DseA/dkRMgQIAAAQIECBAgQIAAgW6Bm5ubTTxW6OXLl5uTE/9PUbeSVgIECBDYV4G4O9Tl5eUmPu+8CBAgQIAAAQIECBAgQIDAIQtIjDrks+vYCBAgQIAAAQIECBAgsEcCeWeILOsjfeYcRo7PMuaJ+pT5ckzsL+JfvXp1nxx1duavz3POgVgCBAgQWK9AJP7GnRGjrJ97U1Zc47Oe5ZTxNWbbcXUOdQIECBAgQIAAAQIECBAgMCbw7M0/9H4wFqSfAAECBAgQIECAAAECBAhUgTl/lZwam3FZ1v111WtcV7221fFt+5Tt58+fb87Pz2dfQK77VSdAgAABAk8tEHeIiqSoSEqKz7+anFTrsc66Xev1GLI9y6nj6hxZjznqPNneVU6Ni7FzYrv2pY0AAQIECBAgQIAAAQIE9lvA//K63+fP6gkQIECAAAECBAgQIHAwAnHhsl6kbROWph5o1zzZNmWOegE113B9ff320Xq1f8p8YggQIECAwBoErq6uNvGTr/g8m/uZlvH18zrbct6pZTuu3Z46jzgCBAgQIECAAAECBAgQIDAkcDLUqY8AAQIECBAgQIAAAQIECOy7QF5ozfLk5GQTP7GdbVOO8fb2dvPNb35zE6UXAQIECBDYF4FIYnr9+vU7SVFja8/PyCjjMzNe9TOz1sfm0k+AAAECBAgQIECAAAECBJ5SwB2jnlLfvgkQIECAAAECBAgQILCnAu0F0byz0kMPZ868Q7FDfe0aa2zXcWR/3h0jLi6/ePFiE4/X8yJAgAABAmsWuLu7u0+Kys+3/EyLNffV276u46tj2/6hvofEtmP7tufsv28O7QQIECBAgAABAgQIECBwOAISow7nXDoSAgQIECBAgAABAgQIrFJg7AJlXqxtFz80LpOUcmwbm+3tnF3bdWzU+8ZmX5TxKKK42Hx+fv7OheWu+bURIECAAIGnELi5udlcXFzcf07FZ1f81NfYdo0dqrfztLFj/W18bm87LscrCRAgQIAAAQIECBAgQIBACEiM8ntAgAABAgQIECBAgAABAgcvkBdXo8zEp6xnORchLjjHY/Vevnz59jFDc+cQT4AAAQIElhaIz7lI4I3PqW1e+bkYZb7ycXq5rSRAgAABAgQIECBAgAABAvsi8L8PiN+X1VonAQIECBAgQIAAAQIECBB4I5AXa6PM+jYwOTbLmKPWx+aMi8/xaL3r6+uxUP0ECBAgQGDnAnE3w7hLVCZFTf1My7i2nLvgGN/+zJ1DPAECBAgQIECAAAECBAgQWFLg2Zt/xP1gyQnNRYAAAQIECBAgQIAAAQIEtv2r5tC42hf1uPBa26p6X3vGZH9bZn+W2d+1HX21/+zsbPPixYtZiVU5r5IAAQIECDxUIJJ0Ly8v307TleSUbRFU628HlfbaX+s1NupDfW3/UOxQX7vPdvshY9u5bBMgQIAAAQIECBAgQIDAYQm4Y9RhnU9HQ4AAAQIECBAgQIAAgaMQyAugUWZ9mwPPsVnGHLU+NmfEZnw8Vu/Vq1f3j9cbG6efAAECBAgsJRBJunH3wkyKqp9N+Rk1tq+Ma8uxcW1/7ruWbYxtAgQIECBAgAABAgQIECDwmAJnj7kz+yJAgAABAgQIECBAgAABAocskBennz9/vjk/P3+bNHXIx+zYCBAgQODpBOKReZEQVe9g+HSrsWcCBAgQIECAAAECBAgQILA+AY/SW985sSICBAgQIECAAAECBAjsvcASF2jbOdrtPqSMy7IvLtvv7u6y+k6Z47N8p/PNRrQP9Z2cnGxevny5idKLAAECBAgsKRCfP1dXV5tIjBp69X0Gjd0ZKu/4NDR39s2NreOy/tAyj+eh8xhPgAABAgQIECBAgAABAocnIDHq8M6pIyJAgAABAgQIECBAgMCqBPqSh8YWOTaurz/a4wJp7a/1dr/Zl2X013qNb9vb7a7YuHNU3EHKiwABAgQILCEQj26td4kaSgqqfbXeriP7soz+Wu+Lz/a+2L72sflz3r5yaN6+MdoJECBAgAABAgQIECBA4DgF/G+rx3neHTUBAgQIECBAgAABAgQINAJxkTUvtLZlEzprM+7ocXFx0ZtsNWsywQQIECBw1ALX19eb169fP/gzpX7O1fpR4zp4AgQIECBAgAABAgQIEDhIAYlRB3laHRQBAgQIECBAgAABAgQIPFSgXijOejySKOq5PXUfcXePV69ejT7yaOp84ggQIEDguATisa+REBXJtnNe+ZlVH6mXn2FZzplPLAECBAgQIECAAAECBAgQ2DcBj9LbtzNmvQQIECBAgAABAgQIENhzgaHHz9VDmxqXYzI+yrjYm9vZ31fGxeauV47Pso1p29vtGh992R+P1YvH67kgXYXUCRAgQKBP4Obm5u2j8/KzI8t2TNvebmd8tmeZ7VlGe19fxtSyxtZ6jWnrU+Ni3JzYdj+2CRAgQIAAAQIECBAgQOC4BSRGHff5d/QECBAgQIAAAQIECBB4dIFMENpmx0Nj+/r62nP/tb/Wo7/drmPyIm3GZNk1ru07PT29T46K0osAAQIECHQJxGfH5eXl/d0G8zMn4vrqXX0xR42v+6nttd7OU8eM9Y31t/tp5+7b3nZc33zaCRAgQIAAAQIECBAgQOB4BM6O51AdKQECBAgQIECAAAECBAgQWIdAPhLJ3aPWcT6sggABAmsTqHeJWtvarIcAAQIECBAgQIAAAQIECOyTgMSofTpb1kqAAAECBAgQIECAAAECswW67jJR7+A0e8I3A+qcUc87ckyZN8dGGRe+4+fFixebszN/Rd/mXBhDgACBQxKIxNm4S1Q+5jU/M6YcY8ZmGWNqfcocXTExR37OdfVrI0CAAAECBAgQIECAAAECaxbwKL01nx1rI0CAAAECBAgQIECAwIELTEkk6iMYGlv7ar1vrtpe42v9ITExNudqy5w3EqMiQWqJi9g5p5IAAQIE9kfg+vr6PimqXXF8LtTPhlqP2HY7x2d7ltmeZdvebmdcW7Zx7fZYfNvftz02b9847QQIECBAgAABAgQIECBAoAr431GrhjoBAgQIECBAgAABAgQIHJxA14XVTE7a9mBjzpwj61mOzZlxUcYr54k7R93e3rp71BigfgIECByYQN4lKj4D4pWfD3mY7Xa2t2X7+RL9U8e2c9XtrnlrvzoBAgQIECBAgAABAgQIEFizgMSoNZ8dayNAgAABAgQIECBAgACBvRDIC89ZRrJTXkiecwAx7uLiYnN6enqfIHVycjJnuFgCBAgQ2COBeM+Pu0RdXV1tver83GnLrSc0kAABAgQIECBAgAABAgQIHJiAR+kd2Al1OAQIECBAgAABAgQIENgngbxb0kPX3M7Tbk+dP8ZNHTsUm3Nk2e6/bW+3M/78/HwTj9jLC97ZriRAgACB/RaIu0NFQlTcLarr1b7vt9s5JtuzzPYspybYxvi+OXKuvrId1273jRtrX2qesf3oJ0CAAAECBAgQIECAAIHDFpAYddjn19ERIECAAAECBAgQIEBgrwT6EoTGDmLOuKHYtq/dbteR/W3ZxrXbGR/ttd5uR19c1H758uV92c5jmwABAgT2SyDe1yMhKh6fWl9tElDdrvU6pq1nXJbRX+t98WNxU/rr3EP7rHFtfdtx7Ty2CRAgQIAAAQIECBAgQIBAFXBP/qqhToAAAQIECBAgQIAAAQIEthDIi7lR1voWU31kSNxN5NWrV/cX0tskqo8EayBAgACB1QpEMlS8n8fj85Z6tZ85ub3U/OYhQIAAAQIECBAgQIAAAQL7LnC27wdg/QQIECBAgAABAgQIECBAYG0CeWE6y7q+SG6K9rlJTnGHkbiYHnePOj09rVOqEyBAgMCKBSLB9fLychOPz5v7qp8jtV7n6WuvMeoECBAgQIAAAQIECBAgQOBYBTxK71jPvOMmQIAAAQIECBAgQIDAHgjMTR7qO6SheWpfrffNle1tbN92tI8lQtWxtR776to+OzvbnJ+fe7xengwlAQIEVigQ79+R0BqJrfk5UJOY+upxKLWvHtpS89Q5u/bXt/+u2HauOdtD+5kzj1gCBAgQIECAAAECBAgQINAnIDGqT0Y7AQIECBAgQIAAAQIECDy5QJsUtO2ChuYZ6ov99fW37e12XWvti3pe2M6Ytj/b27KNi+So58+f915Ab8fbJkCAAIHHEYjH5sVdouprKAmo7cvt+nlR2+q8tZ4x2dZu1/b8PMq2WvaNi5ihvjrHlPqSc03ZnxgCBAgQIECAAAECBAgQOD4Bj9I7vnPuiAkQIECAAAECBAgQIEDgQATiTiTxkwlSB3JYDoMAAQJ7KxCPy4s7ROVj8yT+7O2ptHACBAgQIECAAAECBAgQOBABd4w6kBPpMAgQIECAAAECBAgQIHCIAvUOSQ85vqF5hvrqPvPOGhmfZca029keZV9fbc96lnV81of64uL7ixcvNqenpxmuJECAAIFHEoj350iIijtF9b2GkqRqX9azbOfra4+4tm9su507t9tx2R7lUF+Nm1Jfcq4p+xNDgAABAgQIECBAgAABAscnIDHq+M65IyZAgAABAgQIECBAgMBBCAwlCY0d4NDYvr5ojwu4Q/1D+81xbTk0JvoyPuPqdlf97Ozs/g5SJycnOURJgAABAjsSiPfhuHNfJEW1ST5zt7uWWOfIepZj8XP7HzJv176ibWjOvjHaCRAgQIAAAQIECBAgQIDAkgIepbekprkIECBAgAABAgQIECBAgMCIQFwkjgvpWUZ4rY8MH+2Ou5XETz5ez0XpUTIBBAgQ2Eog3msvLy8/ksC61WRlUH4m5Pt3liVElQABAgQIECBAgAABAgQIEJgoIDFqIpQwAgQIECBAgAABAgQIECCwtEC92F3ruZ82gSrbp5Rx95K4i0k8Xi/uIuVFgAABAssI3N3d3SdE3d7ebjVhfb+v9TpZX3uNUSdAgAABAgQIECBAgAABAgTGBTxKb9xIBAECBAgQIECAAAECBAjsgUB9rNzYcufE5lw5Jstsn1LGmKFx2RdlXAzP7XbuaO/ri9i2L7dPT0/v7yAVpRcBAgQIbCcQ76mZdBoz5Pt1TWKq9XYvfY84XWqedn/tduxnaH1tfN2eM25ObN2HOgECBAgQIECAAAECBAgQ2IWAxKhdqJqTAAECBAgQIECAAAECBB5dIJOA5u54zri+2GiPC8FD/XVdbVxuz51nypwRk/PHnaPiEXt9F+frfOoECBAg8L8C8R4ad+CLpKg26Wdsuxq2sdmXnx+1v9Yjrm7Xes5Ry77+vvY6ttbnxufYbcfleCUBAgQIECBAgAABAgQIEFhSwL30l9Q0FwECBAgQIECAAAECBAgQ2EIgLyJHmclRMU3WM7Fpi6nfGXJzc7OJHwlS77DYIECAQKdAJkRFUtRS78Oxo3zPz/f4aJOwGgpeBAgQIECAAAECBAgQIEBgeQF3jFre1IwECBAgQIAAAQIECBAg8AQC2160njNuamwbN7ZdudrY7Iv2TJyqbV31aOubp8ZLkEoNJQECBD4UiPfPSIaKn3jl+++HER/WMskpW+p2W58zT86XZTtXV3u29ZV1jr6Y2j43PsduOy7HKwkQIECAAAECBAgQIECAwJICEqOW1DQXAQIECBAgQIAAAQIECKxCYCwpaOoih+apfXmxu7YN7WMorvZlPcuhOaOvxtV629duP3/+fBM/7lgSMl4ECByrQLxvxl314pF5+R4aST5Rr8k+ffVwq319jjUm61l2jRnqG4sfGjvU1zVvX9tS8/TNr50AAQIECBAgQIAAAQIECDxEwKP0HqJnLAECBAgQIECAAAECBAgQeCOQF4WzzAvqD8WJ+doL8jlntk/dV64txufYrEciQNwZJZKjzs/P3x5P7ktJgACBQxaI98SuhKg85m2SRofev3Pe+r6cbXPLJeaYu0/xBAgQIECAAAECBAgQIEBgnwQkRu3T2bJWAgQIECBAgAABAgQIECCwQ4F8dJQEqR0im5oAgdUIZELU5eXlatZkIQQIECBAgAABAgQIECBAgMCyAh6lt6yn2QgQIECAAAECBAgQIEBgBQJT76I0d6l13lqfM0+Oy3JsbI2r9Tquttd6jan1iOmLq+1x96hIknJHkqqnToDAvgvE+9zt7e39I/Pu7u5G3+Om3jEq3yuzbJ1qe623ce12xM6Jr+Pbce12jd22vos5t12LcQQIECBAgAABAgQIECBAoBWQGNWK2CZAgAABAgQIECBAgACBgxaoiT9zD3TO2L7YaI+LyEP9Q+vKcW05NCb6Mj7j2u1s74qN5CgJUlVInQCBfRXIR4dGYlRN6Kn19tjavna7jY/tjMmytg3Fd/U9dGyds66nto/Vtx03Nq9+AgQIECBAgAABAgQIECCwawGP0tu1sPkJECBAgAABAgQIECBAgMAOBOIidSQ3ZRm7qPUld3l1dXV/Z5VMkJp695Ql12AuAgQIbCsQ75WZEDXlDlHb7iffg6OMV5bbzmccAQIECBAgQIAAAQIECBAg8HABiVEPNzQDAQIECBAgQIAAAQIECBB4UoF68b3Wc1FtAlW2zy2vr6/vE6TOzs428Zi909PTuVOIJ0CAwKMJxHtfJHbGe9cSr/r+Wut17r72GqNOgAABAgQIECBAgAABAgQIPJ6AR+k9nrU9ESBAgAABAgQIECBAgMAKBeLC+RKvoXlqX9TjwnltG9r/UFzbl9tRbruPnCPXVLfbeSMxKu4iFYlSXgQIEFiLQNwVKpKh2oSomrTUV49jqH1Dx5TvszW+1sfmamPH9pX9Q+OG+nL8lHKpeabsSwwBAgQIECBAgAABAgQIENilgMSoXeqamwABAgQIECBAgAABAgRWL1ATfx6y2KF5hvrqPtvEo+gbGju1r2vedr+5PTRn13oiPh6tlwlSLqanpJIAgccWuL29vU+GisfmxXtRvvfFOobem9q+djuPI9unzrvUfnP/WeY6cruWQ301bqy+1Dxj+9FPgAABAgQIECBAgAABAgR2LeB/6dy1sPkJECBAgAABAgQIECBAgMCBC8TdWS4vL+8fWRUJUvHjovqBn3SHR2AlApGkFAlR8ci8eC/yIkCAAAECBAgQIECAAAECBAhUAXeMqhrqBAgQIECAAAECBAgQIHB0AnFRfYnX0DxDfUP7jnFDY7ftq/vMOdqyxtR6xtW2rno8Xi8SpOJuUl4ECBBYWiDei+LOUPG4vCnvS0PJmrUv61mOrXssrq8/2vv6HrLPbeds97nUPO28tgkQIECAAAECBAgQIECAwGMLSIx6bHH7I0CAAAECBAgQIECAAIFVC0y5wD52AHPnyPgo42J0bj9kP+0cuZ37iLmzbWg/bUzdbutda88EqdPT06Hd6CNAgMAkgXjfiWSouENU16sm9NR6xNbtWu+aJ9siLvZZ4/vqOSbLGpdtQ2WNr/WpY4bipvRN3eeUucQQIECAAAECBAgQIECAAIG1CEiMWsuZsA4CBAgQIECAAAECBAgQWIVATfbZdkFz5+iL72vPdQ31T+2LuLgY3hfftrfbuZYoa1+tR1/cOSruIBWJUi6+h4gXAQJTBeL9JB6XF3eIip98te8l7XbGZVn7az37o4z22F/tr/Uam/FtW25vO25s3px/Tlwd01cfWm/fGO0ECBAgQIAAAQIECBAgQGDtAmdrX6D1ESBAgAABAgQIECBAgAABArsTyAvhWdY9ZXJAm+RUY6bW7+7uNpeXl/c/7iI1VU0cgeMWiPeNOY/Lm6qV73dZtuP62ts42wQIECBAgAABAgQIECBAgMD6Bdwxav3nyAoJECBAgAABAgQIECBAYCUCUxOEpsaNHVbMs+1ckVAw9VX3EfVICqhtdZ62vd2eExt3kcokKYkIVU6dwPEKxHtK3B0qHpcXZX3le1N9v6j1Ghv12lfrXXGx34zJso3r2o73sW1esY85++nbx5w55sT27U87AQIECBAgQIAAAQIECBDYNwGJUft2xqyXAAECBAgQIECAAAECBJ5MYCgJaM6i5szTF5sX8Yf6h9ZUx7X1uHhe2/rmaWPa7TpurC8TpE5PT+swdQIEjkQg7w4Vd4gaer8YSu5p+9rtPsp8z8v4LDO+3c72KIf6xvrHxs7ZT43tq8/ZX98c2gkQIECAAAECBAgQIECAwL4JeJTevp0x6yVAgAABAgQIECBAgAABAgsL1IvlUY+khLZceJcfmS6SIeIn9vv8+fP7O0lteyeWj0yugQCBVQrEe03+2c+7Q9X3o10tur6/5T6836SEkgABAgQIECBAgAABAgQIHJaAO0Yd1vl0NAQIECBAgAABAgQIECCwQ4Ghu5jM2e2ceebE1jXEuKGx2/blPur4rGeZMbUc6qtxWY/4uItU/MRdpB4jWSL3rSRAYLcCcXeoeFReJEXFK/68T/0zPhRX+7Ke5dgRDcX19WV7lmP7aPvnjJsT2+4nt5eYI+dSEiBAgAABAgQIECBAgACBfRGQGLUvZ8o6CRAgQIAAAQIECBAgQGDVAnMTf/JgHjpum/FDY9q+uh31uLBe2/I4usqhuLZvaDv2WZOkuvaljQCBdQvEn/H27lCx4nxPqUk7tZ4xfUfXxnbF5T7qXHVcrfeN72ofa4t5x+bum+Oxx/WtQzsBAgQIECBAgAABAgQIENh3AYlR+34GrZ8AAQIECBAgQIAAAQIEViHQJvZMXdS242L+sbF9/X3tc+aMOfLCfd98fe1j+6njaj3GxT49ai8kvAisXyD+/PYlQ9XV53tJbav1of6+vmiP/Wd/lnXerA/1RUxff7TXfeR8WfaNy/6hctux244bWos+AgQIECBAgAABAgQIECCwzwJn+7x4aydAgAABAgQIECBAgAABAgSOSyCSEK6uru5/Tk5O7h+zF4lSUfciQODpBfqSoZ5+ZVZAgAABAgQIECBAgAABAgQIHKOAO0Yd41l3zAQIECBAgAABAgQIECCwuEAkA+ziNTTvUN/QWmLctmPv7u6Gpn7bF/Pn3VSicc7+ttlHJEbl4/YkSb09DSoEHkUg/nxPuTNU32Lm/JnNOyJlme81fXNne8TnmGybUuaYLKeMyZihMUN9OX6bclfzbrMWYwgQIECAAAECBAgQIECAwBoEJEat4SxYAwECBAgQIECAAAECBAgcnMCcRKChg58zz1KxQ/PUvrYeF+Rr29BxtX11XK0PxfX1SZJqZWwTWF4g/pzWZKixhJyh/rav3Z6y+hgTa6pjaz3maLfrvH190d7OW8e19b55to1rx3VtT91n11htBAgQIECAAAECBAgQIEDg0AU8Su/Qz7DjI0CAAAECBAgQIECAAAECOxKoF+OHkgcyqSDKx3jFHafq4/bcSeox1O3jGATiz/Dt7e3bhKjHPuah95lYy5w7Tz322u2PAAECBAgQIECAAAECBAgQeBoBiVFP426vBAgQIECAAAECBAgQIEDgaAQygSrLeuCZLJUJD7VviXpNkop9RJLU6enp/U/XepbYpzkIHJJAJEJlMtTUx1w+5Pjzz2WW7Vx97W2cbQIECBAgQIAAAQIECBAgQIBACHiUnt8DAgQIECBAgAABAgQIECDwyAKZDDRlt3Nih+Zr52m3h8bWvm0SI3JfWdb5uuptXLvdNSbb2th2O+OijASpTJRyp5kqo37MAvFnJhOhouz7MxQJStFXE5VqfciwjWu3+8ZmXJZ9cV3tMWbbcdseZ9c6sm3OWubE5vxKAgQIECBAgAABAgQIECBA4H8FJEb5TSBAgAABAgQIECBAgAABAo8s0JdoMHcZc+aZGjsWN9S/TV+OiQv/WW8d+tojbtu+dmzsP5OkImFKIkJ7FmwfskDeFSrLPNb8c9n356GvvY7Pelv2jX3IPvvmjH1v29eue2yuNn5ov21s3/YSc/TNrZ0AAQIECBAgQIAAAQIECBy6gEfpHfoZdnwECBAgQIAAAQIECBAgQIDAqEAkWF1fX9//RLC7SY2SCdhjgfh9n3JXqD0+REsnQIAAAQIECBAgQIAAAQIECNwLuGOUXwQCBAgQIECAAAECBAgQIPDIAkN3OZqzlDnzzIntW0POkWUb19cecUN97Tx1O8bF3VJyfJYZ025ne5RDfTVurB77j0Sp/HH3ljEx/WsTiD8L8RjMvCNUlEv8Ho/NUfuznmWsKetzvIbGjPUN9S+1hnaeJfa5xBztumwTIECAAAECBAgQIECAAIFjEZAYdSxn2nESIECAAAECBAgQIECAwGoFlkrgqQc4Z84aW+t1vm3qQ3O1fbkdZSQB5Pbc/Q6Nq3213u5jqC9iY32ZJBXlyclJO4VtAk8qEL/DNQkqkqL6XmNJN21/u13nHeqrcbUeY2K9dWytR2y73Y6v29vU2/nb7aE558QOzdP27Wredj+2CRAgQIAAAQIECBAgQIDAoQt4lN6hn2HHR4AAAQIECBAgQIAAAQIEZggMXYzP5IWxxKEZu3sbmvuNMvfztvP/KrX9oWvI/bX7iO1cQ1df7vfm5mYTPxkfyVGZLBX1ofm75tVG4CEC7d2g8ve0zjn0OznUV+fYtp5/pvr281jJhX373/a4jCNAgAABAgQIECBAgAABAgTWLyAxav3nyAoJECBAgAABAgQIECBAgACBNwI1qaHWEyeSQSLBIpNCssz+XZWxn7w7T+6jJkpFwlTXejNWSWCOQPy+1USoqD/W73q7zvp7HfVYR2325nuFAABAAElEQVSr8X3tNUadAAECBAgQIECAAAECBAgQILC0gEfpLS1qPgIECBAgQIAAAQIECBAgMFPgKZIa6j5rfebS34ZnQkSdq9bfBk6otOPa7b4pIi6TMyJm6rh2vnZcu93G923XcbGuekcpd5XqU9NeBeJ3KH7aRKiIeUiiUR1b63XfU+p1bNRjrbVtaI4aV+tDY7r62rHtdteYsbZ2jnZ7bPwS/U+xzyXWbQ4CBAgQIECAAAECBAgQILA2AYlRazsj1kOAAAECBAgQIECAAAECBIpATa4pzQ+ubjtv37hMiOjrbxc8NS7G1di2HskDta3dT9/23DFT4+fERXJU+xPHIyGi76wddnv87sSdxyIJqv5M/X2YGheKu4rNMxTzx/HU/fTVc0xfWcf1xdT2vvi+9jq2r/6QsX1zRvuu5h3apz4CBAgQIECAAAECBAgQIHBsAh6ld2xn3PESIECAAAECBAgQIECAAIE9FqiJBFFvky/y0LI9yrW+Ym03NzcfWV5Nloq7TLm71EeI9rohzntNfMr6mn9Xu8CH/vxFfPzeehEgQIAAAQIECBAgQIAAAQIEnlrAHaOe+gzYPwECBAgQIECAAAECBAgQGBDYVbLEtvNuO64eYs6RZe3rqg/FDfV1zRVtMSYTrPrGt+3t9tDcfX3btse+MzmqJk1l27bzGrdbgThv8ZOJT7XM378lVzBnzja23c51RXscQ19/xnWVQ2OG+tq5InZOfDs+tx8yx0PG5v67yl3N27UvbQQIECBAgAABAgQIECBA4FgFJEYd65l33AQIECBAgAABAgQIECCw9wKRsLD0a9s5c1yWS65r6pxtXN2OeiQh1LZt1zhnjqHYob5Y21h/rj8TpPrKjFMuKxDnJ34i4amrnHL+8neyL0Gmrz2OZKivPdI5se3Y3I458phyviwjptZzzFA5N35oruyLObeZd5sxuc+hclfzDu1THwECBAgQIECAAAECBAgQIPCugMSodz1sESBAgAABAgQIECBAgACBvRHIJIUlF/yQOaeOjbhIGJgTP+UYx+Yb6899jK1v6jwx35zY3P/S4/oSprK97lf9Q4E4d/EzJfHpIQkw246dM64vNtvjOLP+ocBHa0MxQ30fnWleItXUuafGtevZdlw7T7u9q3nb/dgmQIAAAQIECBAgQIAAAQIE+gXO+rv0ECBAgAABAgQIECBAgAABAgQI7LtAJPbE6/b2tvNQInkjfyIg60Nl50Qrbswkp64ylt3XvuJDsjQCBAgQIECAAAECBAgQIECAAIEJAhKjJiAJIUCAAAECBAgQIECAAAECBJYTiISbeGU5NHMkrDz2K9eVZd1/rCfutNS3rr72Oscu611rnrK/WHdde613jc/9RJk/GZd9Xdu1r9YjNrfrvvvqEd/Xl+1R5k/Ed71yn21fX3sbt6btvjVHe5oMxTzmscQ6+tbymOuwLwIECBAgQIAAAQIECBAgQODwBTxK7/DPsSMkQIAAAQIECBAgQIAAgSMUyESIpQ9923kfa9yc/QzFZl+UNbFkSc/cx5Q558ROmS9jdjVvzr/v5a6Sd6bOOzVujnP+Pte5a72da6hv29g5c267j3ZcbD9kv13z7WrOvn1pJ0CAAAECBAgQIECAAAECBOYLuGPUfDMjCBAgQIAAAQIECBAgQIAAgQMXyASKKDM5auyQM06y0ZiU/qUF5vyexr7jrmdeBAgQIECAAAECBAgQIECAAIFjEJAYdQxn2TESIECAAAECBAgQIECAAAECOxeoyVRjO4vkqTU/km9s/fqXE8jfm3bGuclOffO089omQIAAAQIECBAgQIAAAQIECByTgEfpHdPZdqwECBAgQIAAAQIECBAgQOCNwEPuaPSQsVPx6z5qfer4KXEx7y7mrnNGPZNbpqxpKKbOu0Tc0Bz65gvMSUqaE9u3kpwjf8ciLtv6xmzbvou7S7Vrbbe3XevYuG33s+24sfXoJ0CAAAECBAgQIECAAAECBHYv4I5Ruze2BwIECBAgQIAAAQIECBAgcDACcxIEpibzDOHscn9z5q5rXOK46nxT6lPXGnG7Wt+u5p1y/EvGTLWcu89dzTt3HX3xu17frufvOq6n2GfXOrQRIECAAAECBAgQIECAAAEC6xWQGLXec2NlBAgQIECAAAECBAgQIECAwJ4J1ESNqEcyUW2bcjg55lASkaYc87HGbPs7kl67uJtTzq0kQIAAAQIECBAgQIAAAQIECByCgMSoQziLjoEAAQIECBAgQIAAAQIECBDYKgFpjWyZSJXlnDVGMlUky0xNqpoaN2cNhxQ79Rw8JMFp6j6ewjXXluVTrME+CRAgQIAAAQIECBAgQIAAAQIPEXj25h/APnjIBMYSIECAAAECBAgQIECAAAEChyuwq382WGreOk+t7/KMPGQ/U8fWuKhn4s0uj8vcuxeo5zGTjbKcsvc5sXW+bcfVOcbq7T7a7bHxQ/1LzpX72cWcObeSAAECBAgQIECAAAECBAgQWI+AO0at51xYCQECBAgQIECAAAECBAgQIPAAgbmJDjX56AG73cnQeixRz+SopXaWx55zLzXvIc2TNvVcLHF8+/T4u10ZLOFoDgIECBAgQIAAAQIECBAgQIDAFAGJUVOUxBAgQIAAAQIECBAgQIAAAQIEDkigJvvU+gEd4iKHwmYRRpMQIECAAAECBAgQIECAAAECBJ5MQGLUk9HbMQECBAgQIECAAAECBAgQOF6BOQkneXejpbXmrCH3nXdu2nZN2+wz991XbruWvvm0P1xg7DyP9T98BR+dYdt9bjvuoyv4sGUXc344uxoBAgQIECBAgAABAgQIECBA4EMBiVEfWqgRIECAAAECBAgQIECAAAECjcBQAsMaEnKG1tccyv3j6Nq2bbbn7LPO/xCvbfdZ999Vn7KmiIn9T4nt2sea2vI4pnpOjWuPcdtx7Tzt9q7mbffTt/3U++9bV1/7vq237zi0EyBAgAABAgQIECBAgAABAtsLSIza3s5IAgQIECBAgAABAgQIECBAgMBeC0xJHImYTI7a64P9v8WfnJwcwmE4BgIECBAgQIAAAQIECBAgQIAAgQkC/iVoApIQAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgT2S+DZm//j74P9WrLVEiBAgAABAgQIECBAgAABAvsm8Bj//LCrfdR5o553UFrrOajrXesaD3FdU+6+9ZTHXddX60utaRdzdq3tsfbTtW9tBAgQIECAAAECBAgQIECAwP4JeJTe/p0zKyZAgAABAgQIECBAgAABAgSeSCCTMrLcdhn7kGC17bEZt6zAQ3/Xll2N2QgQIECAAAECBAgQIECAAAEC+yXgUXr7db6slgABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBCQLuGDUBSQgBAgQIECBAgAABAgQIECBAYEmBvAtQlkvN7TF6S0nOmyfO49Lnct4KRBMgQIAAAQIECBAgQIAAAQIECHQJPHvzD2YfdHVoI0CAAAECBAgQIECAAAECBAg8lsBT//PEY+y/7iPqkUhT2x7L2n72S6AmXNX6ro7iMfYxtvY1rGFsjfoJECBAgAABAgQIECBAgACB/RBwx6j9OE9WSYAAAQIECBAgQIAAAQIECByQQCZ+ZLnUoUm0Wkpy3jxLn8d5exdNgAABAgQIECBAgAABAgQIECDQJ3DS16GdAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEC+yrgjlH7euasmwABAgQIECBAgAABAgQIHJDA1Dvu7PMdkaYe49zTus8mc491X+J3da735fi71smkS0UbAQIECBAgQIAAAQIECBAgsGsBiVG7FjY/AQIECBAgQIAAAQIECBAgsHqBbZM21paUtO1xrP4EWeBsAb8Ls8kMIECAAAECBAgQIECAAAECBA5QwKP0DvCkOiQCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECxy4gMerYfwMcPwECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIEDFHj25pbvHxzgcTkkAgQIECBAgAABAgQIECBAgMA7Avv0TyD7tNZ3kG3MFtinR97t01pnnwgDCBAgQIAAAQIECBAgQIAAgYMUcMeogzytDooAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAcQtIjDru8+/oCRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBykwNlBHpWDIkCAAAECBAgQIECAAAECBAjsscBjPLLM4/rGf0Ee4zyMr0IEAQIECBAgQIAAAQIECBAgQIDAtgISo7aVM44AAQIECBAgQIAAAQIECBDYK4Ftk1wkEO3VabbYCQLb/lmYMLUQAgQIECBAgAABAgQIECBAgMCqBDxKb1Wnw2IIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEFhCQGLUEormIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEBgVQIepbeq02ExBAgQIECAAAECBAgQIECAwNoElnrsmEfyre3M7t96lvpd3L8jt2ICBAgQIECAAAECBAgQIECAwHYCEqO2czOKAAECBAgQIECAAAECBAgQILDXApJs9vr0WTwBAgQIECBAgAABAgQIECBAgMAEAY/Sm4AkhAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACB/RKQGLVf58tqCRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBCYIOBRehOQhBAgQIAAAQIECBAgQIAAAQIEHiqwq0fXffDBBw9dmvELC+zqXC+8TNMRIECAAAECBAgQIECAAAECBA5ewB2jDv4UO0ACBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECxycgMer4zrkjJkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIHDwAhKjDv4UO0ACBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECxydwdnyH7IgJECBAgAABAgQIECBAgAABAocj8OzZs8M5GEdCgAABAgQIECBAgAABAgQIECBAYEEBd4xaENNUBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAisQ0Bi1DrOg1UQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQILCggMSoBTFNRYAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAOgQkRq3jPFgFAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQILCkiMWhDTVAQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIrENAYtQ6zoNVECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECCwoIDEqAUxTUWAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwDoEJEat4zxYBQECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECCwpIjFoQ01QECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECKxDQGLUOs6DVRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgsKCAxKgFMU1FgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgMA6BCRGreM8WAUBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgsKSIxaENNUBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAisQ0Bi1DrOg1UQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQILCggMSoBTFNRYAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAOgQkRq3jPFgFAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQILCkiMWhDTVAQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIrENAYtQ6zoNVECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECCwoIDEqAUxTUWAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwDoEJEat4zxYBQECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECCwpIjFoQ01QECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECKxDQGLUOs6DVRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgsKCAxKgFMU1FgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgMA6BCRGreM8WAUBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgsKSIxaENNUBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAisQ0Bi1DrOg1UQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQILCggMSoBTFNRYAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAOgQkRq3jPFgFAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQILCkiMWhDTVAQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIrENAYtQ6zoNVECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECCwoIDEqAUxTUWAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwDoEJEat4zxYBQECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECCwpIjFoQ01QECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECKxDQGLUOs6DVRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgsKCAxKgFMU1FgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgMA6BCRGreM8WAUBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgsKSIxaENNUBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAisQ0Bi1DrOg1UQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQILCggMSoBTFNRYAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAOgQkRq3jPFgFAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQILCkiMWhDTVAQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIrENAYtQ6zoNVECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECCwoIDEqAUxTUWAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwDoEJEat4zxYBQECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECCwpIjFoQ01QECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECKxDQGLUOs6DVRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgsKCAxKgFMU1FgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgMA6BCRGreM8WAUBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgsKSIxaENNUBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAisQ0Bi1DrOg1UQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQILCggMSoBTFNRYAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAOgQkRq3jPFgFAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQILCkiMWhDTVAQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIrENAYtQ6zoNVECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECCwoIDEqAUxTUWAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwDoEJEat4zxYBQECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECCwpIjFoQ01QECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECKxDQGLUOs6DVRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgsKCAxKgFMU1FgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgMA6BCRGreM8WAUBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgsKSIxaENNUBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAisQ0Bi1DrOg1UQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQILCggMSoBTFNRYAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAOgQkRq3jPFgFAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQILCpwtOJepCBAgQIAAAQIECBAgQIAAAQIECBAgcHACX/va1zZf+cpXNl//+tc33/jGNzbf/OY378usx/bz58833/It37L5+Mc/fl9+67d+69vt999/f/PJT35yc3p6enA2DogAAQIECBAgQIAAAQIECKxZQGLUms+OtREgQIAAAQIECBAgQIDAownc3Nxs/umf/unR9ncoO3rvvfc23/u933soh+M4CBA4coHb29vNv//7v2/++Z//efOv//qvm3/5l3+5//nqV7/6YJkXL15svu/7vm/zAz/wA5vv//7v33zqU5+633758uWD5zYBAQIECBAgQIAAAQIECBAg0C3w7IM3r+4urQQIECBAgAABAgQIECBA4HgE/vM//3Pz2c9+9ngOeKEjjQv8v/d7v7fQbKYhQIDA4wtcXl5uvvzlL2/+5E/+ZPMXf/EXm9evXz/aIp49e7b5nu/5ns0P/dAPbX78x3988yM/8iObSDj1IkCAAAECBAgQIECAAAECBJYRcMeoZRzNQoAAAQIECBAgQIAAAQIECBAgQIDAnghcX1+/TYb60pe+tHn16tWTrDz+n9V/+7d/u//54z/+4835+fnmh3/4h++TpH7iJ35i84lPfOJJ1mWnBAgQIECAAAECBAgQIEDgUATcMepQzqTjIECAAAECBAgQIECAAIEHCbhj1HZ87hi1nZtRBAg8jcA3vvGNze/+7u9u/vAP/3AT9bW/fvAHf3Dzkz/5k5uf+Zmf2Xznd37n2pdrfQQIECBAgAABAgQIECBAYHUC7hi1ulNiQQQIECBAgAABAgQIECBAgAABAgQILClwcXGx+YM/+IPN7/zO72y+/vWvLzn1Tuf6x3/8x038fOELX9j82I/92OYXfuEXNj/6oz+6OTk52el+TU6AAAECBAgQIECAAAECBA5FQGLUoZxJx0GAAAECBAgQIECAAAECBAgQIECAwDsC8ci8P/qjP9p88Ytf3PzXf/3XO337tBGP3PvLv/zL+5/v+q7v2nz+85/f/PzP//zm/fff36fDsFYCBAgQIECAAAECBAgQIPDoAv7Xokcnt0MCBAgQIECAAAECBAgQIECAAAECBHYt8A//8A+bX/zFX9z85m/+5l4nRbVO//Ef/7H57d/+7c1nP/vZzW/8xm+03bYJECBAgAABAgQIECBAgACBIuCOUQVDlQABAgQIECBAgAABAgQIECBAgACB/RaIuyv9/u///ua3fuu3Njc3N/t9MAOrj7thXV5eDkToIkCAAAECBAgQIECAAAECBCRG+R0gQIAAAQIECBAgQIAAAQIECBAgQOAgBP7nf/5n8+u//uv3j5w7iAMaOYjPfe5zIxG6CRAgQIAAAQIECBAgQIDAcQtIjDru8+/oCRAgQIAAAQIECBAgQIAAAQIECByEwN/+7d9ufvVXf3Xz1a9+9SCOZ+wgvvu7v3vz6U9/eixMPwECBAgQIECAAAECBAgQOGoBiVFHffodPAECBAgQIECAAAECBAgQIECAAIH9F/jSl760+aVf+qWDfnRee5bcLaoVsU2AAAECBAgQIECAAAECBD4qcPLRJi0ECBAgQIAAAQIECBAgQIAAAQIECBDYD4E///M/P7qkqLOzs83P/uzP7scJskoCBAgQIECAAAECBAgQIPCEAhKjnhDfrgkQIECAAAECBAgQIECAAAECBAgQ2F7gz/7szza//Mu/fFR3igqtz3zmM5v3339/ezgjCRAgQIAAAQIECBAgQIDAkQhIjDqSE+0wCRAgQIAAAQIECBAgQIAAAQIECBySwJ/+6Z9ufuVXfmVze3t7SIc16Vg+//nPT4oTRIAAAQIECBAgQIAAAQIEjl3g7NgBHD8BAgQIECBAgAABAgQIECBAgAABAvsl8Fd/9Vf3SVF3d3f7tfAFVvvJT35y8+lPf3qBmUxBgAABAgQIECBAgAABAgQOX8Adow7/HDtCAgQIECBAgAABAgQIECBAgAABAgcj8NWvfnXza7/2a5tjTIqKk/i5z31u8+zZs4M5nw6EAAECBAgQIECAAAECBAjsUkBi1C51zU2AAAECBAgQIECAAAECBAgQIECAwGIC8di8eHze1772tcXm3KeJzs7ONj/3cz+3T0u2VgIECBAgQIAAAQIECBAg8KQCHqX3pPx2ToAAAQIECBAgQIAAAQIECBAgQIDAVIEvfOELm7/7u7+bGr6zuEhQ+vZv//bNd3zHd2w+8YlP3Nevrq42//3f//3Oz/X19aJr+Kmf+qnNt33bty06p8kIECBAgAABAgQIECBAgMAhC0iMOuSz69gIECBAgAABAgQIECBAgAABAgQIHIjAl7/85c0Xv/jFJzmaj3/845vPfOYzm5/+6Z/efOpTn9r8v//3/yY9zi7ubPX3f//3m7/+67/e/M3f/M3mK1/5yoPWH4/R8/r/7N0HuFTVuTDgRQepIio2wIYaC6BiryRYIkZvosaaSCyJXnty1SRqbIk1RqNJlPjc2GKJXsUSOypRLIBCbMGGgKiggHQQEP6sfX+8oDAz55zZc2b2ftfzzHPOmb32Wut71z5nBvY3axEgQIAAAQIECBAgQIAAAQKlCzRZ8u9SenU1CRAgQIAAAQIECBAgQIAAgXIIzJw5M/Tr168cTS3XRu/evcONN9643HN+IECAQK0LzJ49O8SkoEpuodemTZsQV2iKyVA77LBDaNGiRYMZJ0+enCRIPfvss2Ho0KFh0aJFJbe5zjrrhMGDB5eUkFVyoyoSIECAAAECBAgQIECAAIGMC1gxKuMTLDwCBAgQIECAAAECBAgQqE6BJk2aVOfAjIoAAQJVKHDTTTdVNClq5513Dr/85S/DGmusUVaNNddcMwwYMCB5TJ06NUl0uu+++8KkSZOK9nPggQdKiiqqpAIBAgQIECBAgAABAgQIEFheQGLU8h5+IkCAAAECBAgQIECAAAECBAgQIECgigRi0tDtt99ekRG1b98+/PSnP00Sl9LucLXVVgvHHHNMGDhwYHjuuefCPffcE+J2gSta4L958+Zh//33T3tI2idAgAABAgQIECBAgAABApkTkBiVuSkVEAECBAgQIECAAAECBAgQIECAAIHsCPzxj38MCxYsSD2gXXbZJZxzzjmhS5cuqfe1bAdNmzYNu+22W/L48MMPw7333hvuv//+MH369C+r7brrrhUf15ed+4YAAQIECBAgQIAAAQIECNSwgMSoGp48QydAgAABAgQIECBAgAABAnkSiIkRs2bNCrNnz04ey34fn5s7d25o2bJlaNeu3ZePtm3bJt/Hr3F1llatWuWJrKKxxiSOuDXYzJkzw4wZM8K8efNCixYtQuvWrZNHnJeYcNK5c+cQE0Gqqbi2qmk2lh/LmDFjwsMPP7z8kyn8tOeee4bLLrus0a/NddZZJ5x88snhJz/5SRgyZEiyitTo0aPDd7/73RSi1iQBAgQIECBAgAABAgQIEMi+gMSo7M+xCAkQIECAAAECBAgQIECAQM0JfPzxx+Htt98O77zzTvI1fj9x4sQGxdGsWbOw/vrrh0033fTLxyabbBLatGnToHbzenKcj7j912uvvRZeffXVEOeslBKT144//vhw9NFHl1K97HVcW2UnTbXBq6++OtX2Y+N9+vQJF198caMnRS0baEwq3GeffZLH2LFjQ48ePZY97HsCBAgQIECAAAECBAgQIECgRAGJUSVCqUaAAAECBAgQIECAAAECBAikI7Bo0aIwcuTI8Pzzz4d//etfSTJUXAGq3OWLL74I7777bvJ46KGHkuabNGmSJEv1798/7L///qFr167l7rZs7Z111llhxIgR9W5vu+22C5deemm9z48nxrl65plnkq2+hg8fXq+24upMsZ1KFNdWJZTT6+PNN99M/jak10MIG264YbjqqquqejW5DTbYIE0CbRMgQIAAAQIECBAgQIAAgUwLSIzK9PQKjgABAgQIECBAgAABAgQIVKdA3G5t2LBhYejQoeGFF14Ic+bMaZSBLlmyJMTVWG644YYwaNCgEJOHYoJU3Far2rbdi0bRrb7lxRdfDIsXL673qjhPPvlkkkDyySef1HcIX57XqVOnL78v9zeurXKLNl579913X6qdr7nmmuHaa68N7du3T7UfjRMgQIAAAQIECBAgQIAAAQKNJyAxqvHs9UyAAAECBAgQIECAAAECBHIlMHXq1PDYY4+Ff/zjH2HUqFEhruBUTSUmSb300kvJo127duGggw4Kxx57bGjdunU1DbPeY4mrcMWtCeP2gXUp48aNC5dffnmo7wpRK+qr3IlRrq0VKdf2c3Pnzk3+XqQZxbnnnhvWWGONNLvQNgECBAgQIECAAAECBAgQINDIAhKjGnkCdE+AAAECBAgQIECAAAECBLIuMGbMmHDHHXckSQ6V2kKtoaYxieimm24KcZWkX/7yl6Fv374NbbIqzo8JaXVJjIoresX458+fX9bxlysxyrVV1mmpqsYef/zxEJOj0iq77LJL2GGHHdJqXrsECBAgQIAAAQIECBAgQIBAlQhIjKqSiTAMAgQIECBAgAABAgQIECCQJYG4GtQzzzyTJESNHj26ZkObOHFiOOGEE5Lt9U4//fTQoUOHmo0lDjwmRh166KElxXD33XeHK664Itl+r6QT6lCpIYlRrq06QNdw1XvvvTe10Tdr1iycdtppqbWvYQIECBAgQIAAAQIECBAgQKB6BCRGVc9cGAkBAgQIECBAgAABAgQIEMiEQNxy7cILLwyTJk3KRDwxiAcffDAMGzYs/O53vwubb755zcZVSpJa3FLwuuuuCzfffHNqcdY3Mcq1ldqUVFXDb7/9dnjzzTdTG1PcJrNHjx6pta9hAgQIECBAgAABAgQIECBAoHoEmlbPUIyEAAECBAgQIECAAAECBAgQyILAeuutF6ZMmZKFUJaLYdq0aeHkk08O77777nLP19IPU6dODRMmTFjpkBcuXBjOOeecVJOiYuf1TYxyba106jJ14LHHHkstnvbt24fjjjsutfY1TIAAAQIECBAgQIAAAQIECFSXgMSo6poPoyFAgAABAgQIECBAgAABAjUvsNZaa4V999235uNYUQAzZ84MJ554Yhg/fvyKDtfEc3E7vRWVuXPnhpNOOimkmZQS+23Xrl1o3rx+i5i7tlY0c9l77qWXXkotqO9973v1TsxLbVAaJkCAAAECBAgQIECAAAECBFITkBiVGq2GCRAgQIAAAQIECBAgQIBAfgUGDhwYmjbN5n87xJWjYnLUxx9/XJMTvLLEqEsuuSS8/PLLqcdU39Wilg7MtbVUIptfZ8yYEd56663Ugttrr71Sa1vDBAgQIECAAAECBAgQIECAQPUJZPN/KKvP2YgIECBAgAABAgQIECBAgECuBLp16xb69++f2ZgnT54cTj311LBo0aKai3H06NFfG/NDDz0UHnnkka89n8YTDU2Mcm2lMSvV0+bIkSPDkiVLUhlQjx49Qs+ePVNpW6MECBAgQIAAAQIECBAgQIBAdQpIjKrOeTEqAgQIECBAgAABAgQIECBQ8wI/+tGPaj6GQgGMHTs23H///YWqVOWxiRMnhk8//fTLsU2YMCFcdtllX/6c9jcNTYyK43NtpT1Ljdf+8OHDU+t8n332Sa1tDRMgQIAAAQIECBAgQIAAAQLVKSAxqjrnxagIECBAgAABAgQIECBAgEDNC2y44YZhzz33rPk4CgVwww03hLlz5xaqUpXHlm6nt3DhwvCLX/wizJs3r2LjLEdilGurYtNV8Y7STIyyjV7Fp1OHBAgQIECAAAECBAgQIECg0QUkRjX6FBgAAQIECBAgQIAAAQIECBDIrsAxxxyT3eD+Hdm0adPCLbfcUnMxLk2M+v3vfx/GjBlT0fGXIzEqDti1VdFpq0hnkyZNCh988EEqfW266aYhbsOoECBAgAABAgQIECBAgAABAvkSkBiVr/kWLQECBAgQIECAAAECBAgQqKhATEbYeeedK9pnpTu77bbbwpQpUyrdbYP6e+qpp5KVou64444GtVOfk8uVGOXaqo9+dZ/z1ltvpTbAHXfcMbW2NUyAAAECBAgQIECAAAECBAhUr0Dz6h2akREgQIAAAQIECBAgQIAAAQJZEIgr+wwbNqwsoXTo0CH06NEjdOzYcblHfH7GjBnJajMTJ05Mvk6dOrUsfRZrZP78+eH++++vqRWMos3jjz9eLLRUjpcrMSoOzrWVyhQ1WqMTJkxIre+ePXum1raGCRAgQIAAAQIECBAgQIAAgeoVkBhVvXNjZAQIECBAgAABAgQIECBAIBMCW221Vejbt28YMWJEneJp0qRJ2GCDDcKWW24ZevXqlXzt3r17iM+XUubOnRseeuihMGjQoDB9+vRSTql3nRdeeKGmEqPqHWgZTixnYpRrqwwTUkVNjB8/PrXRbLzxxqm1rWECBAgQIECAAAECBAgQIECgegUkRlXv3BgZAQIECBAgQIAAAQIECBDIjEBc2afUxKi4RdqAAQPCPvvsExqSRLPKKquEQw45JHz7298O//3f/x3itnELFy5MxfS1114Ls2fPDu3atUul/Sw12pA5XZGDa2tFKrX5XForRrVq1Sqst956tYli1AQIECBAgAABAgQIECBAgECDBJo26GwnEyBAgAABAgQIECBAgAABAgRKENh2222TVZ9WVrVz587hiCOOCHfeeWe47bbbwqGHHtqgpKhl+4nJSqecckq4++67w5prrrnsobJ9/8UXX4SRI0eWrb0sN1TuxCjXVnaulrQSo+LKc82aNcsOlEgIECBAgAABAgQIECBAgACBkgUkRpVMpSIBAgQIECBAgAABAgQIECDQEIG4ss+ypXnz5mHPPfcMV111VXj44YfD6aefHjbaaKNlq5T1+3XXXTdcc801Ia4klUaJ2+nlucQtDmPSU5zDmKwUt0Ds0aNHiElvy25/WO7EqGju2qr9Ky9ufTllypRUArGNXiqsGiVAgAABAgQIECBAgAABAjUhYCu9mpgmgyRAgAABAgQIECBAgAABArUvsNNOO4XNNtssLFmypCxb5dVHJCbtDBw4MPzhD3+oz+kFz3nppZcKHs/SwdatWyfJTzvuuGOyEliXLl3CqquuutJVeebPnx/GjRsXxo4dGzp06FB2CtdW2Ukr3mBaq0XFQHr27FnxeHRIgAABAgQIECBAgAABAgQIVIeAxKjqmAejIECAAAECBAgQIECAAAECuRAYNGhQaNOmTaPGesghh4RbbrklzJo1q6zj+PDDD8PixYtD06bZXKC7ffv2Yf/99w8xCWnrrbcOLVu2LNkvJlJtuummyaPkk+pY0bVVR7Aqq57WalExzLS20KwyQsMhQIAAAQIECBAgQIAAAQIEViCQzf+pW0GgniJAgAABAgQIECBAgAABAgQaX6Cxk6KiQNu2bZMt/MqtEVfCmjlzZrmbbfT24paHhx9+eBg8eHA444wzwg477FCnpKhKBeDaqpR0Ov3EVcXSKmltn5nWeLVLgAABAgQIECBAgAABAgQIlE9AYlT5LLVEgAABAgQIECBAgAABAgQI1IhAXPEojTJ9+vQ0mm20Nvv16xfuueeeJCGqY8eOjTaOWurYtVW/2Zo7d279TizhrJgMqRAgQIAAAQIECBAgQIAAAQL5FLCVXj7nXdQECBAgQIAAAQIECBAgQCDXAltttVUq8X/22WehR48eqbRdyUZbtGgRrrjiirDLLrtUsttM9OXaqt80ppkY1a5du/oNylkECBAgQIAAAQIECBAgQIBAzQtYMarmp1AABAgQIECAAAECBAgQIECAQF0FOnfuXNdTSqqfhRWj4tZ5l156qaSokmb865VcW183KeWZefPmlVKtXnWsGFUvNicRIECAAAECBAgQIECAAIFMCEiMysQ0CoIAAQIECBAgQIAAAQIECBCoi0BcQaZZs2Z1OaWkurWeGNW0adNw0UUXhd13372keFX6uoBr6+smpTyT5opRq6yySilDUIcAAQIECBAgQIAAAQIECBDIoIDEqAxOqpAIECBAgAABAgQIECBAgACB4gJpJEvMnDmzeMdVXOO8884L/fv3r+IR1sbQXFt1n6e0Voxq0qRJSGM+6h6hMwgQIECAAAECBAgQIECAAIHGEJAY1Rjq+iRAgAABAgQIECBAgAABAgQaXSCujlTusmTJknI3WbH29txzzzBgwICK9ZfljlxbdZ/d+fPn1/2kEs5o3bp1iMlRCgECBAgQIECAAAECBAgQIJBPgfL/D2A+HUVNgAABAgQIECBAgAABAgQIEKhpgR/84Ac1PX6Dr22Bli1bphLAwoULU2lXowQIECBAgAABAgQIECBAgEBtCDSvjWEaJQECBAgQIECAAAECBAgQIECg/gJxJacFCxaEzz///MuvX3zxRf0bzNiZvXr1CltuuWXGoqpMOK6t8jjHlZ3SKIsWLQoxOapFixZpNK9NAgQIECBAgAABAgQIECBAoMoFJEZV+QQZHgECBAgQIECAAAECBAgQyLvArFmzwmeffbbSx4wZM5ZLeFo2AWrp91aNKXwVHXXUUYUrZPSoa6t6JjatxKgY4dy5c0PHjh2rJ1gjIUCAAAECBAgQIECAAAECBComIDGqYtQ6IkCAAAECBAgQIECAAAECBAoJxJVdxo0bF95+++3lHtOnTy90mmMNFOjWrVvYbbfdGthKdZ/u2qru+YmjkxhV/XNkhAQIECBAgAABAgQIECBAoBYFJEbV4qwZMwECBAgQIECAAAECBAgQyIBA3ILs1VdfDUOGDAmvvPJKeO+995ItrzIQWk2FEJOimjZtWlNjLjZY11Yxoeo7nmZi1Jw5c6ovYCMiQIAAAQIECBAgQIAAAQIEKiIgMaoizDohQIAAAQIECBAgQIAAAQIEosDixYvD6NGjk2Sop556Knz66adgGlmga9eujTyC8nTv2iqPY2O10qZNm9S6njdvXmpta5gAAQIECBAgQIAAAQIECBCobgGJUdU9P0ZHgAABAgQIECBAgAABAgQyITB79uxw6623hvvuuy9MmzYtEzFlJYhaT4xybWXjSrRiVDbmURQECBAgQIAAAQIECBAgQKDaBCRGVduMGA8BAgQIECBAgAABAgQIEMiQwOeffx7+9re/hb/85S9h5syZGYosO6HUamKUays712CMpH379qkFNGvWrNTa1jABAgQIECBAgAABAgQIECBQ3QISo6p7foyOAAECBAgQIECAAAECBAjUpMAXX3wRHnzwwTBo0KDwySef1GQMeRl0rSVGubayeWWuvfbaqQU2bty41NrWMAECBAgQIECAAAECBAgQIFDdAhKjqnt+jI4AAQIECBAgQIAAAQIECNScwLx588LZZ58dhg0bVnNjz9uAW7VqFTp16lQzYbu2amaq6jzQNBP03nvvvTqPxwkECBAgQIAAAQIECBAgQIBANgSaZiMMURAgQIAAAQIECBAgQIAAAQLVIDBlypRw3HHHSYqqhskoYQxrrLFGCbWqo4prqzrmIa1RtGzZMqy++uqpND927NhU2tUoAQIECBAgQIAAAQIECBAgUP0CEqOqf46MkAABAgQIECBAgAABAgQI1ITA+++/H44++ugwZsyYmhivQYbQunXrmmBwbdXENDV4kOuss06D21hRAxMmTAiLFi1a0SHPESBAgAABAgQIECBAgAABAhkXkBiV8QkWHgECBAgQIECAAAECBAgQqITAxIkTw49+9KMwadKkSnSnjxwJuLbyM9lrrbVWKsHGpKiYHKUQIECAAAECBAgQIECAAAEC+ROQGJW/ORcxAQIECBAgQIAAAQIECBAoq8CSJUvCxRdfHGbNmlXWdjVGwLWVr2sgrRWjoqLt9PJ1LYmWAAECBAgQIECAAAECBAgsFWi+9BtfCRAgQIAAAQIECBAgQIAAAQL1EbjvvvvCyJEj63NqWc9p27Zt6NChQ+jYsWPytU2bNqFVq1YrfVx//fVh/vz5ZR2Dxsor4Noqr2e1t7beeuulNsQ33ngjfOtb30qtfQ0TIECAAAECBAgQIECAAAEC1SkgMao658WoCBAgQIAAAQIECBAgQIBATQhMnjw5XHPNNRUda6dOnULv3r3DxhtvHHr27Jl87dq1a2jevG7/zfGXv/xFYlRFZ65unbm26uaVhdpbbrllamE8/fTT4dRTT02tfQ0TIECAAAECBAgQIECAAAEC1SlQt/8xrM4YjIoAAQIECBAgQIAAAQIECBBoJIGrrroqzJkzJ/XeW7duHfbYY4+w7777hu23377OSVCpD1AHZRdwbZWdtOob7NatW4iJj9OnTy/7WCdOnBjefvvtJJmy7I1rkAABAgQIECBAgAABAgQIEKhaAYlRVTs1BkaAAAECBAgQIECAAAECBKpbYNasWWHo0KGpD7Jfv37hzDPPDF26dEm9Lx1Uh4BrqzrmoTFG0atXr9T+rjz11FMSoxpjUvVJgAABAgQIECBAgAABAgQaUaBpI/atawIECBAgQIAAAQIECBAgQKCGBWJS1KJFi1KLoFWrVuGKK64Il19+uaSo1JSrs2HXVnXOSyVGFROj0ipDhgxJq2ntEiBAgAABAgQIECBAgAABAlUqIDGqSifGsAgQIECAAAECBAgQIECAQLULPPnkk6kNsXnz5klC1J577plaHxquXgHXVvXOTdoj22qrrVLr4v333w/jxo1LrX0NEyBAgAABAgQIECBAgAABAtUnIDGq+ubEiAgQIECAAAECBAgQIECAQNULzJ49O7z00kupjfPss88OO++8c2rta7h6BVxb1Ts3lRjZN77xjdCiRYvUuho8eHBqbWuYAAECBAgQIECAAAECBAgQqD4BiVHVNydGRIAAAQIECBAgQIAAAQIEql7gxRdfDAsXLkxlnFtuuWU44IADUml72Ubnzp277I++rxIB11aVTEQjDaNly5Zh6623Tq33v/3tb2HSpEmpta9hAgQIECBAgAABAgQIECBAoLoEJEZV13wYDQECBAgQIECAAAECBAgQqAmBiRMnpjbO0047LTRp0iS19mPDcVWitBK7Uh14Dhp3beVgkouEuNdeexWpUf/DCxYsCNdff339G3AmAQIECBAgQIAAAQIECBAgUFMCEqNqaroMlgABAgQIECBAgAABAgQIVIfA1KlTUxlI165dQ69evVJpe9lGP/vss2V/9H0VCbi2qmgyGmko/fr1C82bN0+t97///e/h3XffTa19DRMgQIAAAQIECBAgQIAAAQLVIyAxqnrmwkgIECBAgAABAgQIECBAgEDNCKSVvLLHHntUxGDy5MkV6UcndRdwbdXdLGtntG/fPuy0006phbVkyZJw3XXXpda+hgkQIECAAAECBAgQIECAAIHqEZAYVT1zYSQECBAgQIAAAQIECBAgQKBmBNJKXtl4440rYjB8+PCK9KOTugu4tupulsUz9t5771TDeu6558IjjzySah8aJ0CAAAECBAgQIECAAAECBBpfQGJU48+BERAgQIAAAQIECBAgQIAAgZoTSCt5ZbXVVquIxfPPP1+RfnRSdwHXVt3NsnjGbrvtFlq3bp1qaBdccEF46aWXUu1D4wQIECBAgAABAgQIECBAgEDjCkiMalx/vRMgQIAAAQIECBAgQIAAgZoUmDlzZirj7tSpUyrtLtvopEmTwpgxY5Z9yvdVJODaqqLJaMShtGnTJnzrW99KdQSLFi0K//Vf/+XvQarKGidAgAABAgQIECBAgAABAo0rIDGqcf31ToAAAQIECBAgQIAAAQIEalKgbdu2qYz7ww8/TKXdZRsdNGjQsj/6vsoEXFtVNiGNOJyBAweGpk3T/e/LuXPnhlNPPTVU4m9POSinT58eFixYUI6mtEGAAAECBAgQIECAAAECBHIhkO7/LOSCUJAECBAgQIAAAQIECBAgQCB/Ah07dkwl6Pfeey+Vdpc2+u6774YHH3xw6Y++VqGAa6sKJ6WRhtS9e/ew1157pd573L7x+OOPD88991zqfdWngylTpoR77rknnHDCCWHvvfcO06ZNq08zziFAgAABAgQIECBAgAABArkUaJ7LqAVNgAABAgQIECBAgAABAgQINEigFpNX5s+fH37961+HJUuWNCh2J6cr4NpK17fWWj/22GPDY489lvrv7eTJk8Npp50W+vfvH372s5+F1VZbrVGp4pafTz/9dBgyZEj45z//mXr8jRqszgkQIECAAAECBAgQIECAQIoCEqNSxNU0AQIECBAgQIAAAQIECBDIqkBaySvvvPNOKmSLFi0KP//5z8Nrr72WSvsaLZ+Aa6t8llloqUePHsmqUTE5qhLliSeeCC+88EKyvd6BBx4YmjRpUoluQ9zS75VXXgnDhw9PHnF1O4UAAQIECBAgQIAAAQIECBBouIDEqIYbaoEAAQIECBAgQIAAAQIECOROoEOHDqnE/NFHH4Vbbrkl/OAHPyhb+59//nm46KKLwrPPPlu2NjWUnoBrKz3bWm05rhr1+OOPV2zVpNmzZyeryw0aNCjsscceyWObbbYJzZuX779SZ82aFd56660wcuTIMGLEiPDGG2+EmMCpECBAgAABAgQIECBAgAABAuUVKN+/5ss7Lq0RIECAAAECBAgQIECAAAECVSyw+uqrpza66667Lmy++eYhJiI0/VAsqgAAQABJREFUtMRVV84555xg9ZWGSlbufNdW5axrpaf1118/HHbYYeH222+v6JA//fTTcPfddyePdu3ahV133TXstNNOoWvXrmHVVVdNtttr3779SscUt++MSVaffPJJeO+995JH/Fs0duzY5LmVnugAAQIECBAgQIAAAQIECBAgUDYBiVFlo9QQAQIECBAgQIAAAQIECBDIj0Dv3r1TC3bx4sXJtndXXXVV2GKLLerVz/Tp08Ndd90Vbr755rBgwYJ6teGkxhFwbTWOe7X3etJJJ4UXX3wxSSpqjLHGBKdHHnkkeSzbf4sWLULnzp2TRKklS5YkiVCx7pw5c6wAtSyU7wkQIECAAAECBAgQIECAQCMJSIxqJHjdEiBAgAABAgQIECBAgACBWhaIKzq1bt06xBVR0ijTpk0LRx99dOjbt28YOHBg2G677Yp2E7ehGjNmTHj44YfDAw88kNrYig5EhQYJuLYaxJfZk1u2bBkuvvjiZJvNatpybuHChWHy5MnJI7P4AiNAgAABAgQIECBAgAABAjUsIDGqhifP0AkQIECAAAECBAgQIECAQGMJNG/ePMSVfeIKLmmWESNGhPjo1q1b6N69e1h77bXDWmutFdZYY40k8SmuDBUfcXuq0aNHh7lz56Y5HG1XQMC1VQHkGu2iZ8+e4YQTTgjXXnttjUZg2AQIECBAgAABAgQIECBAgEClBSRGVVpcfwQIECBAgAABAgQIECBAICMC22yzTeqJUUupJkyYEOJDyYeAaysf81yfKI866qjw3HPPhVGjRtXndOcQIECAAAECBAgQIECAAAECORNomrN4hUuAAAECBAgQIECAAAECBAiUSWCHHXYoU0uaIbC8gGtreQ8//Z9A06ZNw+WXXx569Ojxf0/6jgABAgQIECBAgAABAgQIECCwEgGJUSuB8TQBAgQIECBAgAABAgQIECBQWGCzzTYL2267beFKjhKoh4Brqx5oOTpl1VVXDX/605/Cuuuum6OohUqAAAECBAgQIECAAAECBAjUR0BiVH3UnEOAAAECBAgQIECAAAECBAgkAj/+8Y9rWuLwww8Pffv2rekYsjp411ZWZ7Y8ca2++urh+uuvD127di1Pg1ohQIAAAQIECBAgQIAAAQIEMikgMSqT0yooAgQIECBAgAABAgQIECBQGYE+ffrUbGLRgAEDwhlnnBGOPPLIymDppU4Crq06ceWyckyKislRXbp0yWX8giZAgAABAgQIECBAgAABAgSKC0iMKm6kBgECBAgQIECAAAECBAgQIFBAoBZX9olbAJ5zzjlJVDvuuGNYc801C0ToUGMJuLYaS752+o3b6Q0aNChsuOGGtTNoIyVAgAABAgQIECBAgAABAgQqJiAxqmLUOiJAgAABAgQIECBAgAABAtkU6N27dzjmmGNqJrjNN988XHnllaF58+bJmJs2bRr233//mhl/ngbq2srTbNc/1m7duoWbb77Z73H9CZ1JgAABAgQIECBAgAABAgQyKyAxKrNTKzACBAgQIECAAAECBAgQIFA5gRNOOCHst99+leuwnj3FRJs//vGPoV27dsu1cMABB4QmTZos95wfqkPAtVUd81Dto2jdunX41a9+lTzi9woBAgQIECBAgAABAgQIECBAIApIjHIdECBAgAABAgQIECBAgAABAmUROPfcc0Pfvn3L0lYajeywww7huuuuC23btv1a82uttVbYfvvtv/a8J6pDwLVVHfNQC6OIq7/F1aPWX3/9WhiuMRIgQIAAAQIECBAgQIAAAQIpC0iMShlY8wQIECBAgAABAgQIECBAIC8CcWu6K664IsQEpGorRx11VLjmmmtCoZVkDjzwwGobtvH8fwHXlkuhLgIbbrhhuOOOO8LPf/7zsPrqq9flVHUJECBAgAABAgQIECBAgACBjAlIjMrYhAqHAAECBAgQIECAAAECBAg0pkDcou7aa68Np512WojJLI1d4niuvPLKcOqpp4ZmzZoVHM4ee+wROnXqVLCOg40n4NpqPPta7Dn+/fne974XBg8enPw9qvXf7ZYtW4ZvfvObyd8zyV61eEUaMwECBAgQIECAAAECBAg0loDEqMaS1y8BAgQIECBAgAABAgQIEMioQJMmTcKRRx6ZbGfVo0ePRoty3333Dffcc0+ICU+llJhIMWDAgFKqqtNIAq6tRoKv4W5btWqV/D26//77w/HHHx86d+5cM9E0bdo02eLz/PPPD48//ni47LLLkr9nxZI8ayZAAyVAgAABAgQIECBAgAABAhUQaPyPblYgSF0QIECAAAECBAgQIECAAAEClRfYZJNNwu233x4efvjhcOutt4bx48dXZBDbbLNN+MlPfhL69OlT5/7idnq33XZbnc9zQmUFXFuV9c5Cb23btk0So4499tjwyiuvhCeffDI8/fTTYerUqVUVXlwZLf7t2n777UP//v3DaqutVlXjMxgCBAgQIECAAAECBAgQIFBrAhKjam3GjJcAAQIECBAgQIAAAQIECNSQQNz+KSYbHXDAAWHo0KFJ0tHo0aPLHsGqq64a9t5772TrrPXXX7/e7ccVrnr37h3SGGO9B+XEFQq4tlbI4skiAnEVpm233TZ5nHnmmcnvekySeuGFF8LEiRPDkiVLirRQ3sPt27cPW2+9dfKISZ09e/YMcYwKAQIECBAgQIAAAQIECBAgUB6BJv/+x35l/7VfnnFrhQABAgQIECBAgAABAgQIEKhRgbhCy6hRo8LIkSOTlVvGjh1bp0hat24d1llnnRAToGIiQXxssMEGdWpD5WwKuLayOa+VimrevHnhvffeC+++++6Xj3feeSfMmDGjQUOIW9+ttdZaYd111/3ysd5664Vu3bqF7t27S4RqkK6TCRAgQIAAAQIECBAgQIBAYQGJUYV9HCVAgAABAgQIECBAgAABAgRSFpg9e3b47LPPwvTp05MEhPg1Pte8efMQk6CWPjp16hTWXnvt0Llz55RHpPmsCLi2sjKTjRvHnDlzwooec+fOTf5WxcSnNm3afPm3Kv7NWvpz3MKvS5cuyd+zxo1C7wQIECBAgAABAgQIECBAIJ8CEqPyOe+iJkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIJBpARvWZ3p6BUeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEAgnwISo/I576ImQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgkGkBiVGZnl7BESBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEMingMSofM67qAkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhkWkBiVKanV3AECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIE8ikgMSqf8y5qAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABApkWkBiV6ekVHAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIF8CkiMyue8i5oAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBApgUkRmV6egVHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAIJ8CEqPyOe+iJkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIJBpAYlRmZ5ewREgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBDIp4DEqHzOu6gJECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIZFpAYlSmp1dwBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBPIpIDEqn/MuagIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQKZFpAYlenpFRwBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBfApIjMrnvIuaAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQKYFJEZlenoFR4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQCCfAhKj8jnvoiZAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECCQaQGJUZmeXsERIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQyKeAxKh8zruoCRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECGRaQGJUpqdXcAQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgTyKSAxKp/zLmoCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECmRaQGJXp6RUcAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgXwKSIzK57yLmgABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgECmBSRGZXp6BUeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEAgnwISo/I576ImQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgkGkBiVGZnl7BESBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEMingMSofM67qAkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhkWkBiVKanV3AECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIE8ikgMSqf8y5qAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABApkWkBiV6ekVHAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIF8CkiMyue8i5oAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBApgUkRmV6egVHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAIJ8CEqPyOe+iJkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIJBpAYlRmZ5ewREgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBDIp4DEqHzOu6gJECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIZFpAYlSmp1dwBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBPIpIDEqn/MuagIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQKZFpAYlenpFRwBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBfApIjMrnvIuaAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQKYFJEZlenoFR4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQCCfAhKj8jnvoiZAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECCQaQGJUZmeXsERIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQyKeAxKh8zruoCRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECGRaQGJUpqdXcAQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgTyKSAxKp/zLmoCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECmRaQGJXp6RUcAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgXwKSIzK57yLmgABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgECmBSRGZXp6BUeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEAgnwISo/I576ImQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgkGkBiVGZnl7BESBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEMingMSofM67qAkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhkWkBiVKanV3AECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIE8ikgMSqf8y5qAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABApkWkBiV6ekVHAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIF8CkiMyue8i5oAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBApgUkRmV6egVHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAIJ8CEqPyOe+iJkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIJBpAYlRmZ5ewREgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBDIp4DEqHzOu6gJECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIZFpAYlSmp1dwBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBPIpIDEqn/MuagIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQKZFpAYlenpFRwBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBfApIjMrnvIuaAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQKYFJEZlenoFR4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQCCfAhKj8jnvoiZAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECCQaQGJUZmeXsERIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQyKeAxKh8zruoCRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECGRaQGJUpqdXcAQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgTyKSAxKp/zLmoCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECmRaQGJXp6RUcAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgXwKSIzK57yLmgABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgECmBSRGZXp6BUeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEAgnwISo/I576ImQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgkGkBiVGZnl7BESBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEMingMSofM67qAkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhkWkBiVKanV3AECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIE8ikgMSqf8y5qAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABApkWkBiV6ekVHAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIF8CkiMyue8i5oAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBApgUkRmV6egVHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAIJ8CEqPyOe+iJkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIJBpAYlRmZ5ewREgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBDIp4DEqHzOu6gJECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIZFpAYlSmp1dwBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBPIpIDEqn/MuagIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQKZFpAYlenpFRwBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBfApIjMrnvIuaAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQKYFJEZlenoFR4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQCCfAhKj8jnvoiZAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECCQaQGJUZmeXsERIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQyKeAxKh8zruoCRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECGRaQGJUpqdXcAQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgTyKSAxKp/zLmoCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECmRaQGJXp6RUcAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgXwKSIzK57yLmgABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgECmBSRGZXp6BUeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEAgnwISo/I576ImQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgkGkBiVGZnl7BESBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEMingMSofM67qAkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhkWkBiVKanV3AECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIE8ikgMSqf8y5qAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABApkWkBiV6ekVHAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIF8CkiMyue8i5oAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBApgUkRmV6egVHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAIJ8CEqPyOe+iJkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIJBpAYlRmZ5ewREgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBDIp4DEqHzOu6gJECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIZFpAYlSmp1dwBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBPIpIDEqn/MuagIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQKZFpAYlenpFRwBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBfApIjMrnvIuaAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQKYFJEZlenoFR4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQCCfAhKj8jnvoiZAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECCQaQGJUZmeXsERIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQyKeAxKh8zruoCRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECGRaQGJUpqdXcAQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgTyKSAxKp/zLmoCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECmRZonunoBEeAAAECBAgQIECAAAECZRf4/PPPw2effRamTZsW4vdt2rQJbdu2/fJr69atQ5MmTcrerwYJECBAgEAeBBYtWhTmzJmz3CO+rq6yyirJa238Gh/x9TYrZfHixUm8c+fODfPmzQtLv7Zo0SKJOb7XiPG2a9eupuPOUpzTp08PkydPTuarffv2IT46duwYWrVqlYnLcv78+WHKlCnJ+92mTZuGDh06JI94DTZv7rZKJiZZEAQIECBAgAABArkR8A4+N1MtUAIECBAgQIAAgTQF4g2cN998M5Uu4n+8L006WXojrBZuOIwePTp88cUXqZgs2+jmm29erxtkpcxZtO/Vq9ey3VX0+3hTdMyYMSX12b1799ClS5eS6pZaadasWeH5558Pw4YNCxMnTkxuDMWEqDiuQiXevF177bXD+uuvH3r06JF83WCDDcLGG29cr7kq1NdXj9XCvH51zPHneKN01KhRKzq03HPxeqzGm3E33nhjiNfLykrfvn3DLrvssrLDmXq+mv/2lfL7Ud/JqNXXqvrGm+fzXnnllbBkyZLMEdT3/URDIGbPnh3eeuut8O6774Z33nkn+Tp27NgkKaiUdmPSULdu3UJ8DxBfb+PX+Hrbs2fP0KxZs1KaaJQ6n376aRgxYkSIsY4fPz6MGzcufPDBByEmhJVSOnXqFLp27RrinO27776hd+/epZxW8TpZiTMmPz3yyCPJPE2aNClJhvrkk0+S5Pivosb3gPFa/MY3vhG22GKLsMcee4TVV1/9q9Wq6uf43nbo0KHJNRnjmjp1avIo9H43Jkdtttlmyb8Tttpqq7DlllsmiWFVFZjBECBAgAABAgQIECDwpUCTf/9HRvb+J+PL8HxDgAABAgQIECBAoDICb7/9djj88MMr09m/e4mfmI83wuKNh6U3wzbddNPk+4oNokhHu+66a/IJ8iLVGnz4nnvuSRzq2lApcxY/9T5kyJC6Nl2W+gsWLAgnn3xyePnll4u2F28+XX/99cnqEUUrF6kQb1A+++yzyaPcCR4tW7ZMbl7usMMOYfvtt09u3JZ7Zalqn9eV8ceElfg7U6w8/fTTVXfjLSbvHXnkkQWHHpPk7r777oJ1snKwmv/2lfL7Uc55qIXXqnLGm5e2tttuuySZM2vx3nvvvcl7q7TjikkXzzzzTHjqqafCyJEjU0kijyv3xNfZ+HobHzGJqLHL66+/niSfxITrmAxWrhLff59xxhnlaq7B7WQlzpik9o9//CMMHjw4vPDCC/VOhozv82Jy9H777Rf23nvvqknu/vjjj7/8PfznP//Z4L9pMc6dd945HHroocnvXIMvJA0QIECAAAECBAgQIFBWAStGlZVTYwQIECBAgAABAgQqIxC3dog3uONj2RJvfO24445hp512Sm5CxE8zK7UnED+/8qtf/aqkpKiYIPf73/++wUlRH330UbjqqquSm0RpicVkr+HDhyeP2Efnzp3DXnvtFb7zne8kSVJp9avddAUefPDBoh28//774dVXXw1xVQUlPwJeq/Iz1yItLBBf12Oi9V133RVi0nHan1ONK/g9+eSTySOOLK4gddBBByWrK8Ut6SpV4mqIMaH31ltvDTFhKKslS3HGbZJvueWW8Pe//z3ZNrmhcxav9aXv/f785z+HE088MfTv37/RtlyOq6DGcZT7eoxxPvfcc8kjJoPHhPH4/rbcHwBo6Hw4nwABAgQIECBAgEBeBSRG5XXmxU2AAAECBAgQIJBJgbi9xX333Zc84rZG/fr1C4ccckjVbjGSyUkoQ1AxQemJJ54o2lLcOu8Pf/hDiFvK1LfExIWbbropuQkWE5cqWeLNtzvvvDN5bLLJJmH//fdPrtemTZtWchj6aoDA559/Hh5++OGSWrj//vslRpUklf1KXquyP8ci/F+BmCwRV4aKiRhxu7zGKjGR/je/+U2SSB1faw8++ODUV8eKK0NdfvnlyVa8jRV3JfrNUpwxae/ss88OU6ZMSYUubsv8i1/8Itx+++3h4osvDuuuu24q/ayo0RjbddddlyQmruh4OZ+LyeAXXXRRePzxx8P5559f9VsJljN2bREgQIAAAQIECBCoVgH/21ytM2NcBAgQIECAAAECBBooELfAiP8hf+yxxybb/MWtMBYuXNjAVp2etsBtt90W7rjjjqLdxNXA4g2etdZaq2jdlVWIn2yPK0jceOONodJJUV8dU9xWJ16jkqK+KlPdP8eVQOLKJKWU+Pdo7ty5pVRVJ0cCXqtyNNk5C3XUqFHhsMMOC2eddVajJkUtyz579uzkPUZcuSqtEn+n40qWp5xySqaTorIW51//+tfw4x//OLWkqGWvt7ha0xFHHPHlimbLHiv39zEp8LTTTkv+PRSToypZXnrppWRrvfheSSFAgAABAgQIECBAoHEFJEY1rr/eCRAgQIAAAQIECFREIN4UiJ/MPvTQQ8OLL75YkT51UneBRx99NFx99dVFT2zVqlVSb6ONNipad2UVhg4dGn7605+GuHJLtZQBAwZUy1CMo0SBmMxWapk3b16SrFlqffXyJ+C1Kn9znsWIY8JMTFw+/vjjqyYhalnnuKLoUUcdtexTZfv+448/ThJQ4lZsWS5ZinPOnDnJKlG/+93vwhdffFGxaVva7w033JBKn/H38Prrr0+2tIsfBGisMmPGjPBf//VfydaEjTUG/RIgQIAAAQIECBAgEIKt9FwFBAgQIECAAAECBHIkMH78+HDSSSeFPffcM0mK6dq1a2rR33333SGulrD0EbeVKEdZc801Q58+fZLtAePX7t27l6PZRm9j+PDhyXYbxQYSV1SK2+H07t27WNWVHo/JcXGrlEreAFvpYP7/gRjXPvvsU6ya41Uk8MEHH4SRI0fWaURxO70DDzywTufUWmV/+xo+Y5V8rWr4aLVA4P8Exo0bF84555wwZsyY/3uyyr6Lr7VpvP+Lq+JceOGFJa8iWGUsJQ8nS3HG7XDjyrLvvPNOyfGXu2LcZjIm6x1zzDFla/rDDz9Mfg9fe+21srXZ0Ibi70bHjh3DLrvs0tCmnE+AAAECBAgQIECAQD0EJEbVA80pBAgQIECAAAECBGpdIN7UickxF110Udhjjz1SCSfedNt3332TR+xg+vTpIW5hER8xWSreNCwlMadHjx5JIlRMgoqPhmwdl0qgZWg0biMXP00eP91erPzyl78Mu+++e7FqKz0e/X/2s5/Ve1vF1q1bh1VXXTXErfzatm0blixZEuLWPHE7tfi1vlulbbfddqFLly4rHbcD1Sfw4IMP1nlQ8SZlTJJcf/3163xurZzgb1/5ZqoSr1XlG62W8i7w8ssvJ1t2xdXxylXia+1qq62WvO7G9wjxtXbmzJnJ11LeM6xoHEcfffSKnm7Qc1deeWW4884769VGfE+x8847h5j43rlz5yTeGPPS7xcvXvxlzDH2qVOnhjfffDPE15P4/qmSJWtxxi0P65oUFa/J7bffPmy++ebJHMV5iu8FY7J0TAycMGFCiMmtkydPLnlq/vSnP4VVVlkl2Xqy5JNWUvGRRx4Jl156aYgrUtWnxOswvkdZ9hqMMcZrL8YVHzHGuq64Gv/NEz+UEFex2mKLLeozNOcQIECAAAECBAgQINAAAYlRDcBzKgECBAgQIECAAIG6CMTtzw4++OC6nBLizbW4BUO8Ebbs15iA0tAS244JMj/5yU+ST4s3tL1i53fq1ClJwlqaiHXrrbeGa665puBp/fv3D5dccknBOrV+8KOPPgqnnnpqSTdw4mpfBxxwQL1D/vTTT5O+5s+fX3IbLVu2DP369UtuWm666abJCl1xdaeVlYULF4axY8cmN9riDct4w+31118Pxfr89re/vbImPV+FAvEGX30So2IocdWo0047rQqjSmdItfa3L++vVelcBdlqdZtttkkSIcodVUykiMkVhUr8fWrINrKF2o7Xfn3L888/nyQ4xxV46lOaNWsWevXqFXbbbbckCTwmCsdkjBYtWqy0ufjeMCaZx9fYN954I/k6ZcqUldaPB+KKoTHhvJzlpptuqnNSVEyGiu8tvvWtb4Wtt946xPgLlQ4dOix3eOl7hugdHSpRshbnsGHDwl133VUyXVyp9Ljjjgvx9z+u8FSsxPZj4tV7771XrGpyPG4lHROGttxyy5Lqr6hS/Bvy61//uuh7zq+eG38n4u9GvCY322yzrx5e4c/xfe1DDz2UJDrFD3+UUuI5cdXX2267LRR6L11KW+oQIECAAAECBAgQIFA3geL/iqlbe2oTIECAAAECBAgQILASgbjSTrmSAeKNr6WrL8Wvb7/9doifqK9PiZ9cjjctzj///NCQm4J17btJkyZFTymlTtFGqrhCvJFy8sknh2I3MmMIhx12WGjoKg8xGa3UT9DHayHeAPve974X2rdvX7JivIm7ySabJI8BAwYk58UbQc8991x48sknk69fTZKKvxvxhpRSOwIvvPBCiIl29SnxRmJM8ivlxmp92q/2c0r5u1ZKnbTi9FqVlmx22o2ru6RRYpLGFVdcUbDpmJwRV+2ppvLUU0+FX/ziFyWt+rjsuOPv+Te/+c0kaTyumFSX19rYTqzft2/f5LG03X/+85/h73//e3j88ceTVRyXPr/068CBA5d+W5avcRvgP/7xjyW31bNnzyRBe9ttty2aDFVKo/G9SiXeu2Ytzs8++yxccMEFpRAnK3n9/Oc/r/MWcPGa3nHHHZMk6vg3o9h73ZhwHbeh/Otf/5qsSlrS4L5SKa72FP89E1dmKqXEbe1OPPHEEK/Lupb4WnnQQQcl20DfeOONSXJgKau4xX+zxfdB3/nOd+rapfoECBAgQIAAAQIECDRAQGJUA/CcSoAAAQIECBAgQKCxBOJKAvFT9vERS9y+LN60ueOOO0LcyqWu5Yknnki2tYtbT/gEc1316lc/JgedfvrpyZYcxVrYZ599whlnnFGsWsHj8SbYvffeW7DO0oPx0/LxE/fdunVb+lSDvsabR0uv1xUlScVP6Ldp06ZBfTi5sgKDBw9eaYdxlbG4Mly8Mb+iEhMChw4dmiQErOi457Ij4LUqO3MpkhULvPLKKyEmjZSyNfCyLcRVkuLrelyJsZwlrjoVH3FF0H/84x9JklRczSqOL25/9o1vfKNs3cWtxGJCWCmJ+TER9phjjgkxMavWkmKzGOeFF14Ypk2bVvRaiO8Hf/e739V7q+P4b4q40mlMAIwr1MYVzgqVDz/8MFx11VXhvPPOK1St4LH4fvOHP/xhuPnmm1daL24DeMoppySrX620UokH4taC8YMvMUnqpz/9aUkrZMVkwr322ivE98cKAQIECBAgQIAAAQKVEVj5/geV6V8vBAgQIECAAAECBAiUQWCVVVZJEhFuuOGGEFcF2nvvvev8Sfy44sFvf/vbMoxGE8UE4g3KeDPxtddeK1Y17LDDDsmn3xu6gkz8BP5XV2paUefxJm28YVOupKiv9rE0SSom4cUVpOLXww8//KvV/FzFAnHVh2effXalI+zTp0/yN2ilFf59IG6np+RPwGtV/uY8yxHHv4V1TYpaZ511wmWXXRYGDRpU9qSoZa1jgmpMEIlJLY8++miSsBETU8pVFixYEM4888xQyhZi8X1F3DosrkJZa0lRWYxzxIgRBV/Dl14jcXW2P//5z/VOilraTvwak4euu+66sP766y/79Aq/j9v0xm2YG1L+8z//M3n//NU24iprF110UYjbIsYtActZ1l133XDttdcmK2wVazf+7RgyZEixao4TIECAAAECBAgQIFBGAYlRZcTUFAECBAgQIECAAIFqEFi62k9MPNh9993rNKS4jU2hT1jXqTGVVyoQk4HiSg7FSvxEe9xWqKE3EmfNmhX+9re/FesuuXF1zTXX1Hk7n6INr6TC0iSpcq+YsZLuPF0mgbhNU6HVUeKqJNttt12I2yqurMSt+CZPnryyw57PgYDXqhxMcoZDjFtmxe26pk6dWnKUcXXEu+++u+Kr5a266qrJdrxbbrllyWMtVvHyyy8Pb775ZrFqyfZrMQllo402Klq3GitkMc5HHnmkKHWnTp3CJZdcUtYVjWKbMfE+JgcWKkuWLEmSqArVKXYsrlQVVz5de+21v6wat2+88847w7777hsa+mGDLxv9yjdrrLFG+M1vfvOVZ1f8Y9xiWiFAgAABAgQIECBAoHICEqMqZ60nAgQIECBAgAABAhUV6Nq1a7ICVNyurS6JNfHTznFrGCUdgfjp+/vuu69o4z169AgxSakcW8zFlanidovFyoknnhhWW221YtUcz7lAsdWe4ipn8brt27fvSqXijc+4KoRCwGuVa6AWBf70pz+F0aNHlzz0/fffP0k0iSs51Xp58cUXQ6HtVJfGF5MfY3JNXd6DLj23Gr5mMc64AlZcIbZYOf/888Pqq69erFqdj8c243vbYtfEsGHDwqhRo+rc/rIndOzYMVx55ZVJsn/c6i7+zq655prLVknl+7iV5W677Va07ZggHhMsFQIECBAgQIAAAQIEKiMgMaoyznohQIAAAQIECBAg0GgCRxxxRLjxxhvDWmutVfIY4jYTpWy7VnKDKiYC8UZi3O6wWIk3juKWI/HT9eUoEydOLNpM27Ztw3/8x38UradCvgXijcoJEyasFKFz585h4403To4XW7HugQceCDFBSiEQBbxWuQ5qRWD8+PEhbk9baonbxZ533nl13uK41PYrXS+uAFWsxJV6rr766rIkdxfrK63jWYwzrlI0e/bsgmRxZbFddtmlYJ2GHIyJ/wcddFDRJuIqtg0tPXv2DHGVyyOPPDK1VaJWNMajjjpqRU8v91ych9dff3255/xAgAABAgQIECBAgEB6AhKj0rPVMgECBAgQIECAAIGqEdhiiy3C7bffXvJWJh988EEYNGhQ1Yw/CwOJN6NK2V6jffv2SVJUXEWlXCXOZ7ESb4IV2vqs2PmO50Og2CohcRu9pVvUFEuM+uijj8KIESPyASfKkgS8VpXEpFIjC8SEn1JXevnhD38YzjjjjC//Ljby0BvcfUzkGDlyZMF22rVrF37/+9/X9AqUWY2zlG30DjvssILzW46Dxx57bLJ9c6G2hg4dGmbOnFmoSknHVllllZLqlbNSTC6LHzgoVgolmhc713ECBAgQIECAAAECBOomIDGqbl5qEyBAgAABAgQIEKhZgZhw89vf/jbErSVKKbfddlsYM2ZMKVXVKSIQb7CdffbZYfHixQVrtmrVKllhYcMNNyxYr64HS1kxKm55oxAoJDBr1qwwZMiQQlXCzjvv/OXxLl26hJjoUqgU25av0LmOZVPAa1U25zUrUQ0fPjw8++yzJYUT//7FLWqzVEpZRenoo48OcVWgWi5ZjDOuUBST9AuVuOpjv379ClUpy7G4IurAgQMLtrVw4cLw2GOPFaxTrQfjVoF9+vQpOrxp06YVraMCAQIECBAgQIAAAQLlEZAYVR5HrRAgQIAAAQIECBCoCYF11lknXHrppaFp0+L/FIhJPH/+859rIq5qHmT8NPhpp51WdGvCZs2aJXPTq1evsodTyopRMYlFIVBIIN6gLLTFZvy7stNOOy3XxB577LHcz1/94emnnw4zZsz46tN+zrlAnl6r4u/Uk08+mazSGLexjVvfPvXUU2HBggU5vwqqM/y4WlQppXXr1uGCCy7IzPZ5MeZx48aFZ555pmD48b3EoYceWrBOtR/MapwxST8mGxUqMZknJvVUonz/+98P8QMBhcrDDz9c6HBVHytlC3OJUVU9hQZHgAABAgQIECCQMYHid0MyFrBwCBAgQIAAAQIECORdoG/fvuH0008viSFuYxFvECn1E5g6dWo46aSTwvTp04s2cM4554Rdd921aL36VIirBBQr8SauQqCQQLHVnXr37h06dOiwXBPf/OY3l/v5qz/E5I9Stvb56nl+zr5AHl6rHn300fDd7343WVEwbl8bf8euv/76cOaZZybP+92orut89OjR4e233y5pUKecckro3r17SXVrpdLNN99cdKhxi7Rafz+R1Tg//fTTovMXt4CrVInXSfw7X6i88cYbYe7cuYWqVO2xuCpWsSIxqpiQ4wQIECBAgAABAgTKJyAxqnyWWiJAgAABAgQIECBQMwKHHXZYiEkMpZS4pZ5Sd4E5c+aEU089NXz00UdFTz755JPD/vvvX7RefSt8NVllRe188sknK3racwQSgbit5r/+9a+CGivafme99dYLm266acHziiVcFTzZwUwLZPm1KiYex4TYlf3tnTRpUjj33HNrdiupLF6Y//M//1NSWDHZ4+CDDy6pbq1UmjJlStEk1nXXXTcceOCBtRLSCseZ5ThLSYwqtv3tCtEa8OTuu+9e8Oy4eu2rr75asE61Hmzbtm3RoVVqda6iA1GBAAECBAgQIECAQA4EJEblYJKFSIAAAQIECBAgQGBFAkcfffSKnv7ac3EbC59o/hpLwScWLVoUzjrrrBCTSYqVI444Ivzwhz8sVq1Bxzt27Fj0/MmTJxeto0J+BR544IGCwTdp0iSsKDEqnrTPPvsUPPedd94pmnRVsAEHMy2QxdequIrfJZdcUtK8xe1vS0loKKkxleotELf8HDJkSEnnH3/88SH+TcxSef7550N8b1OoxK3Raj3RI8txxqSvYqXSq5yVslLqqFGjig27Ko+Xslrs6quvXpVjNygCBAgQIECAAAECWRSQGJXFWRUTAQIECBAgQIAAgRIEdt5557DhhhsWrRm3unryySeL1lPhfwWWLFkSLrzwwvDiiy8WJfn2t78dTjvttKL1GlqhlMSoDz74oKHdOD+jAp9//nnRlULiCilrrLHGCgViYlTTpoX/+2Hw4MErPNeTBLL4WhVfH0pJUoizP2vWrJITclwt6Qk89NBDIb4fKlY22mij0KdPn2LVau748OHDi455zz33LFqn2itkOc5SEizbt29f0Snq0qVL2GCDDQr2GbewrMVSivfK3jfVYrzGTIAAAQIECBAgQKDaBQr/z2S1j974CBAgQIAAAQIECBCot0BczeCoo44q6fznnnuupHoqhXDdddeFuMpWsbLTTjuF8847ryKrSsTtbYqVYcOGhbgihkLgqwJPP/10kpzx1eeX/bnQVpDxxueOO+64bPWvff/YY4+F+fPnf+15TxDI4mtVXRNRx48f70JoZIH4d7CUcsghh5RSrabqxITvl156qeCYN9tss9C1a9eCdar9YNbjLJao07p160ZZ8avYdfP+++9X+6WzwvEV844nSYxaIZ0nCRAgQIAAAQIECKQiIDEqFVaNEiBAgAABAgQIEKgNgbiSy5prrll0sCNHjpS0UFQphNtuuy3cfPPNRWtuscUW4fLLL6/YDaitt9666JjiqkAPPvhg0Xoq5E+g2GpObdu2DcVWCtlvv/0KwsWtxUrdpqpgQw5mUiBrr1UTJ06s0zzVNZGqTo2rXFRg7ty54fXXXy9ar127dmHfffctWq/WKrz77rvhs88+KzjsYq8BBU+ukoNZj7PYKnXx+m2MUmw7ubiddy0mTkuMaoyrSZ8ECBAgQIAAAQIEVi4gMWrlNo4QIECAAAECBAgQyLxA8+bNwx577FE0zrh9zIgRI4rWy3OFuErU1VdfXZSgR48eSb34yfxKlbitT1x1pVi5/fbbi978LNaG49kSiAkZMTGyUOnfv38odj3vvvvuodhN1/vvv79QN47lWCBrr1Vz5syp02zGxEGl8QReeeWVsGjRoqIDGDBgQGjTpk3RerVWodhqUTGefv361VpYXxtv1uOMCfCFSinvEwudX99jcVXJYuWjjz4qVqWqjs+bNy98+OGHBccUvddee+2CdRwkQIAAAQIECBAgQKB8AhKjymepJQIECBAgQIAAAQI1KdCrV6+Sxv3888+XVC+PleI2dBdccEHR0OOWGXGrvU6dOhWtW84K7du3D5tuumnRJj/55JNwxhlnhGI3z4o2pEJmBEpZRSwmAxQrrVq1CjGBqlCJyQcTJkwoVMWxHAtk6bWqlO1Nl53q9dZbb9kffV9hgRdffLGkHnfYYYeS6tVapWIJQ6uttlqISd+1XrIeZ8eOHQtO0axZswoeT+tgvH6KlVpLjHr22WdD/FBJobLNNtuEYnNS6HzHCBAgQIAAAQIECBCom4DEqLp5qU2AAAECBAgQIEAgcwKl3mx+5513Mhd7OQJ67bXXwllnnRW++OKLgs116NAhSYrq2rVrwXppHfz+979fUtMxnnPPPVdyVEla2a4Ur+kHHnigYJAxYaN3794F6yw9WEoCVbH+lrbla/4EsvRaVddEp+7du+dvwqso4pdffrmk0cRtcrNWFi5cGEaNGlUwrI033rjg8Vo4mIc4iyXhxO3qSlkZrdzzGbfKK1YmTZpUrEpVHX/iiSeKjqdYsnjRBlQgQIAAAQIECBAgQKBOAhKj6sSlMgECBAgQIECAAIHsCay55pqhlGSdcePGZS/4BkY0duzYcOqpp4Z4M6lQiduMxW32Nthgg0LVUj22zz77hDjXpZSnnnoq/OAHPwiS4UrRym6duErclClTCga43377FTy+7MGY2FJspZyHHnqoUW7MLjtO31enQJZeq+LvQrNmzUqG7tu3b8l1VSyvwOLFi0Mp739islulV4Msb6Qrbm3ixIlF3+M0JDEqbisZff/1r3+FuCpQ3IKsMUoe4owJ+sVKsdf8YufX5/j48eOLntZY10XRga2gQrym40qyhUr8+5+F7ScLxegYAQIECBAgQIAAgWoTaF5tAzIeAgQIECBAgAABAgQqLxBXfHn00UcLdjx9+vQQH1m88Vcw8JUcjJ9eP+mkk8LMmTNXUuN/n443Py699NKw1VZbFayX9sHmzZsnyU5XXHFFSV299957Sf0TTzwxHHbYYSGer+RL4P777y8YcJMmTUIpq0At20isf/311y/71HLfx5uyMSFrt912W+55PxCIAll5rYrbjh111FHhpptuKjqxBx98cCh1tayijalQZ4GPP/44xNWEipXGfo0vNr76Ho8JQ8VKKYlRcQXCmCwSE6/j+6dPP/00ecydO/drzbds2TLE7dXidb/ddtslj1IS+L/WUB2eyEOcxVaMilyvv/56SR+WqANt0aqlJB4W+wBC0U4qWCGuFlVsG72Y7LrqqqtWcFS6IkCAAAECBAgQIEDA/2y7BggQIECAAAECBAgQSJJ2iiVGRab3338/9OnTJ/diM2bMSJKiPvnkk6IWcVu6XXbZpWi9SlSIN9iHDh0ahg8fXlJ38WbwNddcE+66664wcODA8J3vfCe0aNGipHNVqm2BmKD07LPPFgxi2223rfMN1LjCVKHEqNjh4MGDJUYVlM/vwZh8kpXXquOOOy6M+X/t3QW4HNXZOPCDtBCS4AR3GtxCgOBSpBC8UCjwYR/F3QrBi0ORD5cSSrFCg7u0UNzdrRR3CUGC/r93vv+FNNzszN6VO3v3d55nn3vvzpkz5/xm751N5t33ffbZdFPqKQgAAEAASURBVO+9947xhA4aNCjttNNOY9xuQ+MFimSziVnMO++8jZ9MNxzhjTfeyD1q//79x9gn9o8g2yiTWjQbUQSVREBaPDp+3yOYcOONN86CcRsRqN0O6wzDvBaBUSussEJet7ptj39XFMlO2iqBURHol/ceJ/Aii6tGgAABAgQIECBAgEBzBZTSa663oxEgQIAAAQIECBAopUC/fv0KzavoDcJCg7Vop7g5s8suu2SlX/KWEGX2qs2okzdmLdvHHnvsdNhhh6UpppiiqmEiu8MRRxyR1l577TRs2LDcsjpVDa5zKQWuvfbaFBk+KrXVV1+90uZOt0099dRpoYUW6nRbx5ORVaToDfSOfXxtD4GedK0ab7zx0sknn5xlFIzMOH369MlOYt++fbMA5D/+8Y/Z9l69erXHyS3pKl999dVCM5tjjjkK9Wu1TnmZlOJ9RWcBN5FhdM8990xrrrlmGjp0aM1/0yOr0KGHHprWWWedLHj2m2++qStlO6xzwIABuWb33Xdfbp96djjnnHMKDdcqgVFFXutRVnuVVVYptG6dCBAgQIAAAQIECBCon4CMUfWzNBIBAgQIECBAgACBlhWIG7FFWtzoaucWgSL77LNPeuKJJ3IZIrNBlEoqW4vSHVFOL8oAjhgxoqrpRYBUlAWMm/nxafcIlJp99tmrGqMMnT/77LO0++67l2EqP8whLwjph45N+iavjF7v3r3T8ssv36XZRLDgQw89NMZ9w+Kaa65Jm2222Rj72NCeAj3xWhXZWToytHz66aep6Brb8xXQ/FXnBcx0zKinlhnOW3+se/QMTo888kgaMmRIViqvw6deX998880sQCoyC8Z7mWoDvcc0j3ZY51xzzZXGH3/8isHtkb3p8ccfb0r558jSdeONN47plPzH8yNHjvyPn8v4Q7yGLrjggtyp7brrrinKbGsECBAgQIAAAQIECDRXQGBUc70djQABAgQIECBAgEApBSaccMJC8/riiy8K9eupnSJrUl55sVh73PCIrAZlbfPMM086++yzsxJN77zzTtXTjICqyBwVj7jRFgFSK6+8cppgggmqHqs7dohME1FSUOtcIG5q52VJiUCOuMHalfbLX/4yHXXUURVvzkbZJYFRXdHt2fv09GuVoKjyvX6LBhAXfW2Wb4WVZ5QXMDTZZJP9MMB3332XIgPQGWeckeL7RrYo+RbB53EtiYxrtbZ2WGcEsIVVXlaoSy65pOGBUfE+7A9/+ENuZsqO89oKZZwjUC9KUFdqiy++eFpsscUqdbGNAAECBAgQIECAAIEGCSil1yBYwxIgQIAAAQIECBBoJYGiN2Mj0067trjRFxkKirTIeLPvvvvm3iApMlaj+sw666zZDcz+/fvXdIinn346K88XZUHiBuWLL75Y03h27n6BIq/zrpTR61hZBNDlZZuKwKyHH364YxdfCWQCrlVeCM0W+PzzzwsdsqMUYqHOLdLp+++/T5GhqVIbNTDq2GOPTaeddlrDg6I65hMlV7feeut08803dzzVpa/tss7AWXLJJXONIotTBEg3skVZxEqZI0c/dtkD7//85z+nKANcqUXZySjFrREgQIAAAQIECBAg0D0CAqO6x91RCRAgQIAAAQIECJRKoGimg3bNGHXZZZels846q6pz9swzz6RTTjmlqn2a3blfv37p3HPPTZtvvnnNZT0iaO5vf/tb2mCDDdKWW26ZbrjhhlIHhjXbulWOF6W8/v73v1ec7nTTTZcWWGCBin3yNg4ePDivS8or55c7gA49TsC1qsed0tIvqEhgVARFRdBDT2sffvhh+uqrryouqyMwKrIMXXzxxRX7jroxMg7OOOOMad55500zzTRTipJ8XTGMzEMHHnhgivdcXW3tss7wWXPNNVPe39EIFDvooINSo97z/+lPf8rK5VZzvnr16lVN96b2vffeewu93//Nb36TZplllqbOzcEIECBAgAABAgQIEPhRQCm9Hy18R4AAAQIECBAgQKBtBeKT2FH+LTIdVWrtmDHqtttuS0ceeWQlljFuO//889MiiyySonRGWVuUJ9l+++3Tcsstl90Ie/nll2ue6qOPPpriEdkjNt5447T++ut3uexazZMxQFUCkSniyy+/rLjPaqutVnF7kY0LL7xwisC8d999d4zdI0Brzz33TD0xE8sYF21DRQHXqoo8NjZAoEhwSNFMZg2YXkOHLBIUNumkk6a77747/fGPf6w4lyjhu8Yaa2Ql2uJvf2fBORHkFCXyItAkyhY/99xzFcfs2BjBW3GtOO+889Ikk0zS8XThr+2yzgCJv6G//e1vs3KHlYDeeOONtOuuu2bntV7X4Ai8Puyww9Itt9xS6dCdbutq6d5OB6vjk5FRbciQISmCySq1OeaYIytfXamPbQQIECBAgAABAgQINFag532cqbFeRidAgAABAgQIECDQYwXK/Gns7kKPQLAoiffdd991eQqRySDKvZS9zTXXXOmiiy5K+++/f5pqqqnqMt2PPvoonXTSSWmttdZKl156aYqbnlq5BfLK6I011lipHoFRkRlk1VVXrYgRAVoRqKURGFXAtWpUDd83WqCdA6OKrP3WW29Ne++9d6fvk8Ybb7y04YYbZpmkotTYOuusk2abbbZOg6LiPI477rhZNsJtttkmXXDBBVlwdZT9LdLefvvttM8++xTp+pM+7bLOjoVHsHqR0nQPPvhgVqowbGttUTYvMop2JSgqjl1kvrXOsdr94z3KHnvskYYPH15x1wgsiw9Y/PznP6/Yz0YCBAgQIECAAAECBBorIDCqsb5GJ0CAAAECBAgQINASAvFJ5yKfmO/sE/4tscAuTjICeUaOHNnFvf9vtwgOiuCovE+T13SQOu0cWcOizMrll1+efv/736cpppiiLiNHYNgRRxyR1ltvvXTTTTfVZUyD1F/g2WefTfGo1AYOHFi3wLkiAVZ5gVqV5mpbzxNwrep557TsKypS3q2W4Okyr79IwNDrr7/e6fvH/v37p8iaudtuu6WiwU2jWyyzzDLpwgsvTGuvvfbomzr9OQJ57rrrrk63VXqyXdbZYRDv5XfccceOHyt+jaxdEdB23HHHpXg/W02L989RVnm77bbLAqzeeeedn+wecxkwYMBPnh/9ibIFxMa/D+J98vPPPz/6VH/y8wEHHJCiBLFGgAABAgQIECBAgED3CgiM6l5/RydAgAABAgQIECBQCoHIjFTkxl67BUZVOjnxye+55567Upcftt13333p3HPP/eHnsn8T5fUiiOnqq69OxxxzTBo0aFBdpvzaa69lJUciq0M7lmWsC2IDB7nqqqtyR1999dVz+xTtMNNMM6Uor1SpPfPMM+mFF16o1MW2NhJwrWqjk12SpRYJyIgSYT2xFQkY6mzdG220UfaeZ+aZZ+5sc1XPRcB2ZO7ccsstC+03dOjQQv1G7dQu6xx1zfEer0hwcuwTpQojQG2VVVZJW221VfrTn/6UHnjggRSllz/44IP09ddfZ0FTEVh9++23p2HDhqXDDz88rbzyymm//fZL999//6iH/uH7eK8ZAVdLLLHED8+N6Zsiv4dj2rfez0eA7kEHHVQoCC+yZC2//PL1noLxCBAgQIAAAQIECBDogsC4XdjHLgQIECBAgAABAgQI9DCBojf1Jp544h628q4tJwLE4mbOLLPMkpWJKVJm5PTTT0+RbScvEKRrM2rMXlHWZrnllssekRUiMklF8Ey1WQNGn93NN9+cIgvB0UcfnZXVGX17o3+OkiyHHnpoow9T1fhx4zHKEXVXi5Iw119/fcXD9+7du+43+AYPHpyefPLJise98sors3I1FTvZ2BYCrlVtcZpLtcgiARkjRowo1ZzrNZmuBAztsMMOabPNNqvXFH4YJ8rrvfjii+m222774bnOvnnsscdSlG1baKGFOtvc6XPtss7RFx9B6mGalymyY7/IkvTwww9nj47navkawUULLLBA+uc//5k7TN++fXP7NKvDsccem2XCyjterG2XXXbJ62Y7AQIECBAgQIAAAQJNEhAY1SRohyFAgAABAgQIECBQZoFPPvmk0PRkjEppmmmmSSeeeGKKbDfR4lPx8Qn6uGFUqcX2IUOGZJ+679OnT6WupdwWZUCi9Mq2226b3Zi89NJLs4wBXZ3sq6++mjbddNPMJIJjmtkiS8HSSy/dzEPmHqsrN2ZzB62iQ9xszgs6WWGFFdL4449fxaj5XVdaaaUUNxkr/f5cd911aaeddkqRpU1rbwHXqvY+/92x+iKBUR2ZzIqU3euONXT1mNVelyIDUSOCojrmH9mHHn/88fThhx92PNXp14suuqihgVGtus7RscYbb7wsyD+Cd4qUhBt9/1p+jmt6ZJSK9vHHH+cONe200+b2aUaHyJb117/+NfdQUT7y+OOPT/EBA40AAQIECBAgQIAAgXIIKKVXjvNgFgQIECBAgAABAgS6VSAvIKJjchNNNFHHt235da655kp//vOffwiKCoT55psvbbfddoU83nzzzSyQqlDnknaKmzwRIHPaaadlGaT+67/+K3U1k9jIkSNTZAy44447Srra9pnWFVdckbvYepbR6zhY/E3JC1IbPnx4uvXWWzt28bWNBVyr2vjkd9PSiwaD9sSsUdUERs0///xZybtGnqZ4r7HFFlvkHuLBBx9M3377bW6/jg7tss6O9Y76tV+/finKD8b7uma0yPwUJZo32WSTHw6Xl4U03nfGPLu7XXLJJSmyv+a1qaaaKp100kmpTFmu8uZsOwECBAgQIECAAIF2EPCxhXY4y9ZIgAABAgQIECBAIEegaBaOdg6MWmqppdIRRxzRacacCA6KG3F33313jnRKN910U1p00UXTmmuumdu37B2mn376tPPOO6ett946Rbmz8847LxUpKzjqur7//vu0//77/yTgbNQ+vm+swGuvvZa9fisdJbI1RYmiyNZR71Yky0q8vjqyS9T7+MZrHQHXqtY5Vz1lpkUzZUZgVNG+rWJTTXDR7rvvniIbY6NbZGs69dRT0+effz7GQ8W5iAxIc8455xj7jLqhXdY56ppH/T6C/4488sjsfVgE/lTK4DjqftV+Hx8kiCyrETg0asvLGBWZWou8Txh1zHp/H+9BovxzXot/J5188smlCOTKm6vtBAgQIECAAAECBNpNQGBUu51x6yVAgAABAgQIECDQiUDRYJZ2DYxad91105577pnGGWecTvRSGmussdLBBx+cNtxww/Tee+912mfUJ+PT8pFdoaMc36jbWvH7uKm2/vrrp1//+tfp2muvzW6uRbBN0RY3MeOm6rnnnptascxg0XWWtd9VV12VO7Wvvvoqy4CQ27FBHe6///4UGdfiBqnWvgKuVe177rtr5UVLeMW1v6f9fSqaLWvQoEEpMmo2o8V7hF/96lfpsssuq3i4hx56qHBgVLussyLY/26MMohhGxmk4n1BvQKkpphiirTeeutlWaI6Ky33/vvvV5xa0d/BioPUsPGGG25Ihx56aO4I8To64YQTesx7+9wF60CAAAECBAgQIECgxQSU0muxE2a6BAgQIECAAAECBBoh8OijjxYatqsl0woNXtJOO+64Y9p7773HGBTVMe1JJpkku3FS5FPtX375Zdpnn31SBJv0pBY3vCIT1rBhw7JMUpFlqGj797//nf7nf/6naHf96iQQNz6vvvrqOo3W2GGKBHA1dgZG724B16ruPgPtd/zpppuu0KKfeeaZQv1aqVPRgKHNN9+8qcsaOHBg7vEefvjh3D4dHdplnR3rrfQ1sjkNGTIkCzzbYIMNUmQG7UqLDxIss8wy6fjjj0/XXHNNVgKxs6CoCIzPC3gt+jvYlXnm7fOPf/wjHXjggSmym1ZqsbajjjoqzTvvvJW62UaAAAECBAgQIECAQDcKyBjVjfgOTYAAAQIECBAgQKAsAkVuNk855ZQpgn/aqUWGrE033bTwkhdaaKG01VZbpShFktdeeOGFLBAoMlH1tBY3xKK8YJQfjExaTzzxRKElXn/99VlAlaxRhbjq0umee+5Jedka6nKgOgwSAVzx+1Uk+LAOhzNECQVcq0p4Unr4lIoGZTz99NM9TqJIwFD0GTBgQFPXHiXZ8lpkGCza2mWdRT2iX2Q/22OPPbLHW2+9le67774Uf38/+OCD9NFHH6UofxePXr16ZWXjIitUPPr165c9llhiiTT55JPnHvKll17K7dNdGaPuvPPOLEgsr9RiBEVFJthYs0aAAAECBAgQIECAQHkFBEaV99yYGQECBAgQIECAAIGmCLzyyivZzY28g0XQj5YvsMUWW6QHH3wwe+T1vvjii9MiiyySfao+r28rbo9SgWeffXb6wx/+kGUMyFtDZNKKUnxRlk9rjsCVV17ZnAPV4SjvvPNOuvfee9Piiy9eh9EM0WoCrlWtdsZ6xnyLlsdr18CoGWaYISsn3MyzHVmNIlA/AnTG1IYPHz6mTT95vkhgVE9Y508WXvCJqaeeOq211lrZo+Auhbu9+OKLuX2LBifmDlRFhwgE22uvvXLLCUZQ1NFHH519EKCK4XUlQIAAAQIECBAgQKAbBJTS6wZ0hyRAgAABAgQIECBQJoEiGThivgKjip21yGZz6KGHFs6uFUFD7777brHBW7BXeOy3336Fg1kuu+yyFlxla045MkXdcccdLTX5VgrkainYFpisa1ULnKQeOMUoCVskY00E7kVZsJ7U+vbtm7ucmWeeObdPIzrkZTD95JNPCh+2XdZZGKSJHYsERs0999xNnFFKDzzwQNptt91yy113lM9beumlmzo/ByNAgAABAgQIECBAoGsCAqO65mYvAgQIECBAgAABAj1GwM3m+p/KKB9yyCGHFBo4bt5F4NB3331XqH8rduq4eRQZF/JalFV59tln87rZXgeByM6VVyKmDoep6xD//Oc/C2W4q+tBDVYKAdeqUpyGtpzEAgssUGjdPe3aFZmC8loEjnVHm3DCCSseduTIkSkeRVq7rLOIRbP7RFnpSi0C76JEX7NaZHzdddddc1878b72yCOP7LEZX5vl7TgECBAgQIAAAQIEmikgMKqZ2o5FgAABAgQIECBAoGQCUbqsSMaYKaecMnVHKYuScVU1nUGDBqXNNtus0D4PP/xwGjp0aKG+rdqpV69eacMNNyw0/ddee61QP51qE2jF7EvffPNNobKMtcnYu2wCrlVlOyPtNZ8FF1yw0IJvu+22Qv1apdPEE0+cevfuXXG67733XsXtjdrYp0+f3KE//fTT3D7RoV3WWQijiZ3i/Dz55JMVj7joootW3F7PjfFefJdddklxvanUOoKill122UrdbCNAgAABAgQIECBAoGQC45ZsPqZDgAABAgQIECBAgEATBa644opUpNyIMnpdOynbbLNNeuSRR9Jjjz2WO8CZZ56ZBg4cmIpmpsgdsIQdVl111XTSSSelzz77rOLs3nnnnYrbbaxdIF6Xr776asWBJptssrTIIotU7FPvjZEx7Pnnn6847FVXXZU23njjin1s7FkCrlU963y22moGDBhQaMrXXXdd2mmnnVJ3ZVEqNMkqO00zzTSpUlafKMnaHe3rr7/OPWw156Fd1pmL1sQO8cGMCHau1JoVGBUZCeN3t0hQ1NFHH52Uz6t01mwjQIAAAQIECBAgUE4BgVHlPC9mRYAAAQIECBAgQKDhAnEz4vzzzy90HIFRhZh+0ik+VX7YYYdlmZKGDx/+k+2jPhGl9KKk3oUXXpjySsSMul8rfT/BBBOkxRZbLN1yyy0Vp/3uu+9W3G5j7QIRaJLXNthgg7T55pvndavr9sgekZdp7eWXX05PPPFEmnfeeet6bIOVU8C1qpznpZ1mFWVgo0RuXhBQXOdvvfXWtPLKK/cYnmmnnbaUgVEjRoyoaDz22GOnvn37Vuwz6sZ2Weeoa+7u7+N3pVIbZ5xxUtGgxErj5G2LoKgdd9wxNyjqZz/7WTrmmGPSkksumTek7QQIECBAgAABAgQIlFBAKb0SnhRTIkCAAAECBAgQINAMgZtvvjm9/fbbuYeKT9y7CZDLNMYOU001VTrwwAPHuH3UDXE+DjnkkFGf6nHfTz311LlrEhiVS1RThyhfkxecFjeVV1tttZqO05Wd55lnnjTrrLPm7tqKZQBzF6VDpwKuVZ2yeLLJAksssUShIxYJOi00UEk69e/fv+JMPv7441S0ZF3FgarcmHfMCIoaa6yxCo/aLussDNLgjpGZ6Z577ql4lAh+zivlWHGAAhsff/zxLFPUF198UbF3/Fvo2GOP9e+hiko2EiBAgAABAgQIECi3gMCocp8fsyNAgAABAgQIECDQMIFzzz230Nhrr712ipJaWtcFlllmmSxrVJER4hP0w4YNK9K1JftEoFhey8vKkbe/7ZUFbrzxxjRy5MiKnSKz1xRTTFGxT6M2rrnmmrlD33TTTenzzz/P7adD6wu4VrX+OewJKxg8eHChZTzwwAPp9ddfL9S3FToVydhz9913N30peVk4J5pooqrm1C7rrAqlgZ3vuuuu3AxNjS7lGxkqI1NU3nuJ8cYbLx133HFp8cUXb6CIoQkQIECAAAECBAgQaLSAwKhGCxufAAECBAgQIECAQAkFzjvvvPTiiy/mzizKRmy66aa5/XTIF4ibL3PNNVd+x//tcfzxxxc6P4UGK1mnSSedNHdGvXr1yu2jQ9cFimQ0KRKc1PUZVN5z1VVXTVGGslKLG5mRSUjr2QKuVT37/LbS6hZccME0zTTTFJryySefXKhfK3SKLH55f4/vuOOOpi7lww8/TJGpqlKrNjCqXdZZyaxZ277//vt0zjnn5B5upZVWyu3T1Q5PPfVU2mGHHdJnn31WcYjxxx8/e08+aNCgiv1sJECAAAECBAgQIECg/AICo8p/jsyQAAECBAgQIECAQF0F7r///nTSSScVGjOCI/r161eor06VBSLI7PDDD099+vSp3PF/t0Y2nyFDhuR+mj53oBJ2yLuZGVOefPLJSzjznjGlZ599NsWjUpt44onT0ksvXalLQ7fF8ZdddtncYyinl0vU0h1cq1r69PW4yUdZtgjaLNKiVOntt99epGvp+0RgSF5Qd2T/+fbbb5u2lsj0k9dmmGGGvC7/sb1d1vkfi+6mHyJrZd77kHgPMNNMMzVkhs8880zafvvt04gRIyqOH6+JE044ITU6c1XFSdhIgAABAgQIECBAgEDdBARG1Y3SQAQIECBAgAABAgTKL/DWW29lATffffdd7mQjQ8Bmm22W20+H4gLTTTdd2nfffQvt8PLLL6djjz22UN9W6vTee+/lTlfpxlyiLne46qqrcveNklF5GUJyB6mxw1prrZU7wuOPP57+9a9/5fbTofUEXKta75y1w4xXX331NPbYxf4r9cgjj8zNRtMqZlFatVL79NNP08MPP1ypS123FQmMigxf1bZ2WWe1LvXs//XXX6dTTz01d8hG/fsjArK222673KCoyFx64oknpoEDB+bOVQcCBAgQIECAAAECBFpDoNi/5ltjLWZJgAABAgQIECBAgEAFgchCtOeee+aWH+kYYrXVVktTTTVVx4++1klgxRVXTL/+9a8LjXb55ZenyDzRk1qRG5oyRjXmjH/55Zfp+uuvzx18jTXWyO3T6A6RoaHI3x9Zoxp9Jpo/vmtV880dsZjAtNNOmyI4qkh799130ymnnFKka+n7xPvBvHbWWWfldanb9rvvvjt3rIUWWii3z+gd2mWdo6+7mT//7W9/S2+++WbFQ8a5i9KG9W7PPfdcFhQVgXyV2gQTTJBl1h0wYEClbrYRIECAAAECBAgQINBiAgKjWuyEmS4BAgQIECBAgACBrgjEDbptt902t3RFx9hxU2CLLbbo+NHXOgvstttuabbZZis06qGHHpoie0pPaB988EF68MEHc5cy66yz5vbRoXqB2267LeXdEIybkWXwj6wsUcozr1177bXpm2++yetme4sIuFa1yIlq42n+7ne/S1Eat0iLIJAbbrihSNdS95l66qnTwgsvXHGOkTGqGeUDn3jiidz3shFcPf3001ecb2cb22Wdna29Gc89//zz6fTTT889VCOyRb3wwgtZUNTw4cMrHr93795ZUNQCCyxQsZ+NBAgQIECAAAECBAi0noDAqNY7Z2ZMgAABAgQIECBAoCqBe++9N2244YYpyk4VaWONNVY67LDD0jTTTFOkuz5dEBhvvPFSlNkZf/zxc/ceMWJEVn6vJwR/XHrppSmvjONEE02UulICJxdSh3TFFVfkKpQhW1THJCMzS/w9qtQ++uijptyMrzQH2+oj4FpVH0ejNFYgMtkVzfr4/fffp/333z9dc801jZ1UE0YvEqh60kknpW+//bahs7n44otzx+9KtqiOQdtlnR3rbdbXCPDfaaed0ueff17xkP379095JQ0rDtDJxhdffDH7cMgnn3zSydYfn+rTp0+W5W3++ef/8UnfESBAgAABAgQIECDQYwQERvWYU2khBAgQIECAAAECBP5TIAJQzjjjjLTjjjsWLp8XI+y8885pqaWW+s/B/FR3gZlmmintvffehcaNoLYzzzyzUN+ydnr55ZfT0KFDc6e37LLLpnHHHTe3nw7VCbz22mu52boiUG+llVaqbuAG9o4AhEGDBuUeQTm9XKJSd3Ct+r/T8+GHH6ann366qut1qU9sD57cf//3f6cI4i3SIjjq4IMPLhSYWmS87urzy1/+Mre86b/+9a8UWbIa1SJb1M0335w7/FprrZXbZ0wd2mWdY1p/I57/+OOP0w477JDef//93OEjI1s920svvZS22Wab3L+rHUFRjSjhV8/1GIsAAQIECBAgQIAAga4LCIzqup09CRAgQIAAAQIECJRSID6tf8stt6QoRXHWWWeluClXtMXNpI033rhod/1qFFhttdVSPIq0c845JzewpbNxypBpKm6KDRkypFDJs+WXX76zZXiuRoGrrroqd4S4IRw3B8vUitzgvueee9I777xTpmmbSwEB16qUZU859dRTU/zuRVDiJptsklZYYYW04oorZsGwX3zxRQFJXZotMMkkk6QDDzyw8GHjfViUxT3//PNzsyYWHrTJHaN8YJRkzmvHHXdc9h40r1+126MM7D777JObkWquuebKLftX6djtss5KBvXcFlmadt111/Tvf/87d9h11103Lbfccrn9inaIQL14zcZ70Eqtb9++6bTTTktzzz13pW62ESBAgAABAgQIECDQ4gICo1r8BJo+AQIECBAgQIAAgQ6BKLl2wQUXpCgDEpmIIvNENS1KjxTNYFTNuPpWFvj973+fIntUXosbq/vtt1/uDZ7Rx9l8883TQQcdlB566KGqguRGH6erP7/77rtpyy23TFHKJK/NMMMMadFFF83rZnuVAhEcd/XVV+fuVaYyeh2TXXrppdPEE0/c8WOnXyPjUJH1dbqzJ5su4Fr1f+TvvfdeWmeddbJMeqOXeIoSkZElcO21105Rgkorn0D8bVp//fWrmtgJJ5yQNtpooy4FOVd1oAZ1XmWVVdIvfvGLiqPH3+N4r3LnnXdW7FfNxi+//DIrKfz222/n7hYfCqi1tcs6a3XK2//WW29N6623XopMX3ktMjXtvvvued0Kb3/llVeyTFGRia9Si8xvERQ155xzVupmGwECBAgQIECAAAECPUBAYFQPOImWQIAAAQIECBAg0L4CcZPoxhtvTEceeWQaPHhwOv7441ORG0eji0VgztFHH62E2egwTfi5V69e2fkbb7zxco8WZUgiyKmaFhlHrrnmmrT11lunyL4T2UkeffTRQtmbqjnO6H3j5uhll12Wfvvb36a4QVWkRVYpZfSKSFXXJzIq5ZWwmW666dKAAQOqG7gJvSN7R5GsahEYVU12vCZM3SFGEXCtGgXj/3972GGH5f5exu9tZCaKv6da+QSi9HD//v2rmtgLL7yQBWzsueee6fXXX69q3650jsDYJ598Mv3lL39Je+yxR1eG+GGfscceu1DwShxzr732SnfdddcP+3b1mwggjODqu+++O3eIGWecMUU53lpbu6yzVqcx7d+RJTRe43mBSTHGpJNOmv0bJK739WiRnSrK533wwQcVh4ug6wiKmmOOOSr2s5EAAQIECBAgQIAAgZ4hMG7PWIZVECBAgAABAgQIEOi5AvFJ+SghEo+42fDss8+mxx9/PD322GMpbhjV2lZeeeWszFnv3r1rHcr+XRSYbbbZspuNhx9+eO4IkYXhoosuygKOcjuP1uGNN97IspMMHTo0K5m28MILp8UXXzxFtrAIjImbgbW2eJ3+/e9/T8OGDcteq0XHi+CXgQMHFu2uXxUCV155ZW7vyBY11lhj5fbrjg4xtyhBVanFa/vBBx+sqYRSpfFtyxdwrco36ugRGfyKZtR5+OGHs9JkUWpPK5fAz3/+8xRZoCLw+LXXXqtqcpFN54477kgLLrhgWnLJJdMSSyxRKHtk3kHi9zACoR555JEUr53I1hPPRRtnnHHyds/dHtfpTTfdNJ177rkV+3711VcpAscis9YOO+yQZplllor9R98YpTYjqDsCV/ICe2PfeP8SwdX1eB8T47XLOmOt9WpxHY5S3nG9jqx3RVq8Jo844ojUr1+/It1z+7z66qvZ72OR18wBBxyQBWUV6Zt74Dp0GH/88UtXzrgOyzIEAQIECBAgQIAAgdIICIwqzakwEQIECBAgQIAAgZ4uEOWDNtlkk9xlRtaTyPIzfPjwLBjq66+/zt2nKx0iQ1F8mjuyCDW7RfaL0UsHdTaHzz//PMX66/Up8s6OUZbnoqTSAw88kG6++ebcKZ144olZdp/ZZ589t++YOsTrMW7MxiNa3JCZddZZszI5EagVj/gUf58+fbLHBBNM8JOh4mZr3FCKDBjxiPKN9957b9XZqCaffPK0yy67/GR8T9QuEOcnbr5XanEjuUhWpkpjNHJb3FCfb775soDQSse54oorSh8Y1Qp/+1yrKr3K6rOtSGnRUY/0/PPPJ4FRo4qU5/sI6DjjjDO6FBwVmZXiuh+PyPgZAcoRrDzzzDOnSSaZ5IdHXIsnnHDCLHNYvD/seMT7qMg6FUFZ8TWCQp577rmqr8HVam677bbZnIuUbL799tuzIMC4xmy88cYpSuZWygwZwTWRHeqvf/1risw/Rdt2222XBXkX7V+kXzusM7LOxr8HFlhggdyytZ2ZxfmKYPh47/rMM8901qXiczvttFPdzlsE5keQYtFAp912263i3Jq9cfXVV88yBDb7uI5HgAABAgQIECBAoF0EBEa1y5m2TgIECBAgQIAAgW4XiE+/F7mJ1IyJRqBBfEI7AmGa0T777LMsg0FHpqvIZhA33/NaZNRYZpll0pxzzpkFRsw///xp3nnnTZNNNlneri25fd99981uLOWV14lgsciMEJ/Kj1J89WgR5PTUU09lj87Gi+CZyCoWN9CibwSt1aO8U9xUjowQUdJEq7/Atddem+JvT6W22GKL1S1bQ6Xj1LJtzTXXzA2MiiC/CCiNAIKytFb829fO16pmvW6qzS5UTYBIs9bgOD8KxHXszDPPTFtttVXVmaN+HCVlwU2XXHLJqE+V8vsIbDrqqKOyEnfvvPNO7hzjvcJVV12VPSJD0LTTTpsFSEWQVLyHiXJrkWHo5ZdfzoK7cgccrUNkpYosVvVu7bDOyPDUESAfZbXnmWee7D12XEcnmmii1Ldv3+zDCXGOOh5Roi6+j6y1EYzXlRa2kUlso4026srune4TWXXrkUm308E9SYAAAQIECBAgQIBAywsIjGr5U2gBBAgQIECAAAECBIoLRKmsyBC1++67ZxmCiu9Zfc8bbrghK+USwVCRHSMyYXWlRTmWKBsYj/POOy8bIrIqRAaZeAwePLhuwUFdmV8994nsTFFOb4sttsjN+BA3yuPG5EEHHVTPKYxxrLix2VHScYydqtww9dRTp9NPPz27SVrlrroXEIjfuSJl9CLoqOxtxRVXTMcee2wWkDemucbfiuuvvz6tv/76Y+rSlOf97auduZnXqtpnW/0IRYJJRh317bffHvVH35dQYIoppsjKyx1yyCE/BJqUcJp1m1JcvyNT1u9+97uqglEi8DKCaboaUDP6AiK75cEHH9ywUrDtss5wfeWVV7LH6Mb1/jkC4+K97txzz13voY1HgAABAgQIECBAgACBMQqMPcYtNhAgQIAAAQIECBAg0GMEokzab37zm3T55ZenyEoUPze6HXbYYenSSy/NSqx1NShqTHOMjErXXXddOvLII1O1N5jHNGZZnp9rrrkKl5W75pprUgRhtGKLm5lnnXWWoKgGnrxHHnkk9+ZzZOqKbBtlb1HKsUgpsSKBYI1eq799XRfujmtV12fb9T0jiKaaNuWUU1bTXd9uEogsO8ccc0zae++9s+yK3TSNph02gtQjuHmqqaZq2jFHPdCSSy6Zhg4dmmU1GvX5en/fLuust1tn40WQ8wUXXCAoqjMczxEgQIAAAQIECBAg0FABgVEN5TU4AQIECBAgQIAAge4VmHzyydP222+fBRHttddeKW7uaOUX2GCDDbISgkVmGiUR80rvFRmnWX0i8GHHHXfMygB2183UZq21u49TJEho1VVXTVHSphVaZLvLa88//3xWjjKvn+3lEmi3a1WUEKumzTjjjNV017ebBdZdd930l7/8JQ0cOLCbZ9L4w8dr86KLLkrLLbdc4w82yhE23njjdNxxx6UImm1Ga5d1NsoyyjDvt99+WRnvyI6qESBAgAABAgQIECBAoNkCrfG/n81WcTwCBAgQIECAAAECLSwQNx+iPMUaa6yRVl555fSzn/2shVfTvlM/4IAD0kYbbZTySih99tlnWRaws88+u9MAl/nnnz+99tprKcrXdHdbaqmlUgToRWkarbECUfbwlltuyT1IK5TR61jEPPPMk2adddb00ksvdTzV6dcICJtzzjk73ebJ8gi087UqMuZV037xi19U013fEgjE36rIpvTQQw9lXyODX09tffv2zTJlDRs2LJ166qlp+PDhDVtqvH+I4OoiGQTrPYl2WWc93aIs6rLLLpu22267NPPMM9dzaGMRIECAAAECBAgQIECgKgGBUVVx6UyAAAECBAgQIECgfAJRCiuCXxZYYIHsMccccwiGKt9pqnpGE000UYqSXFtttVVuUNNTTz2VTjnllLTzzjv/5Dj7779/ljXs+uuvT1F674UXXvhJn0Y+EaWFVllllbT66quneG1qzRG48cYb08iRIyseLAIo4+Z9K7UI5IosIZValJfcZZddmlIytNI8bPtPAdeqHz0ik9CgQYPSvffe++OTY/guAgKj/JTWmgILLbRQVjb2/vvvz8oZ33nnnemLL75o6mKmmWaaLKPT8ssv39DjRqasX/3qV+m8885LF154YV3XGVnlttxyyxSZA7s7y2G7rLOWF0sEvsb7vgjwn3766WsZyr4ECBAgQIAAAQIECBCoi4DAqLowGoQAAQIECBAgQIBA/QXipkIElYz+iICZ+NT6FFNMkeabb74000wz1f/gRiyFQAS8bbvttunkk0/OnU/ciFx00UWzm+2jd5500kmzm1Nxg+qtt95Kjz322A+PF198MX333Xej71LTz3EDM27mxw3SpZdeOv385z+vaTw7Vy9wxRVX5O7UStmiOhYTpf9OPPHE9M0333Q89ZOvI0aMSP/4xz9S9NUaL+Ba1TXjIUOGpA033DDF63VMLUpOHXzwwWmcccYZUxfPt4jAIosskuIRAasREBd/o+6+++700Ucf1X0FHdfguA4vtthiafbZZ6/7McY0YLxm431LvLYja2EEZT/66KNj6l7x+SiTF0GESy65ZBo8eHCKvzVlae2yzmq8ozzyEksskT0WXnjh1KtXr2p215cAAQIECBAgQIAAAQINFRjr+/9tDT2CwQkQIECAAAECBAgQIECgtAKff/55evXVV9Obb775H48PPvggy/bw5ZdfZjdy42s84gZ97969s+C8uDEYjwjei9JQUb4sHnFTViNAgACBygLvv/9+OuGEE1JkORu9rbbaalnJsMkmm2z0TX7uQQLxGogA5Y5HBC9HidwImIuvcY2OYKrIkhSBQRFo3PF1kkkmSVNOOWXq169fiqCUeERmxvhapvbuu++mxx9/PD3zzDPZI36Ocq9Rci/+WzoC/mMtkVUuvs4444xZkHcEdnV3dqhqHFtxnfEae+KJJ7Lz8sYbb2TvA+O8xOsvXnuxPV5/8ZqLQKcIVotHnLMZZpgh+3BGnK8okzfttNNWw6UvAQIECBAgQIAAAQIEmiogMKqp3A5GgAABAgQIECBAgAABAgQIECBA4EeBjz/+OAuMefvtt7PggihxGQGnGgECBAgQIECAAAECBAgQIECAQO0CAqNqNzQCAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIlExi7ZPMxHQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECNQsIDCqZkIDECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBQNgGBUWU7I+ZDgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEDNAgKjaiY0AAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECZRMQGFW2M2I+BAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjULCAwqmZCAxAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgUDYBgVFlOyPmQ4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBAzQICo2omNAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAmUTEBhVtjNiPgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQI1CwgMKpmQgMQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFA2AYFRZTsj5kOAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQM0CAqNqJjQAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQJlExAYVbYzYj4ECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECNQsIDCqZkIDECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBQNgGBUWU7I+ZDgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEDNAgKjaiY0AAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECZRMQGFW2M2I+BAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjULCAwqmZCAxAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgUDYBgVFlOyPmQ4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBAzQICo2omNAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAmUTEBhVtjNiPgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQI1CwgMKpmQgMQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFA2AYFRZTsj5kOAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQM0CAqNqJjQAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQJlExAYVbYzYj4ECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECNQsIDCqZkIDECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBQNgGBUWU7I+ZDgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEDNAgKjaiY0AAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECZRMQGFW2M2I+BAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjULCAwqmZCAxAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgUDYBgVFlOyPmQ4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBAzQICo2omNAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAmUTEBhVtjNiPgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQI1CwgMKpmQgMQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFA2AYFRZTsj5kOAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQM0CAqNqJjQAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQJlExAYVbYzYj4ECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECNQsIDCqZkIDECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBQNgGBUWU7I+ZDgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEDNAgKjaiY0AAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECZRMQGFW2M2I+BAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjULCAwqmZCAxAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgUDYBgVFlOyPmQ4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBAzQICo2omNAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAmUTEBhVtjNiPgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQI1CwgMKpmQgMQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFA2AYFRZTsj5kOAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQM0CAqNqJjQAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQJlExAYVbYzYj4ECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECNQsIDCqZkIDECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBQNgGBUWU7I+ZDgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEDNAgKjaiY0AAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECZRMQGFW2M2I+BAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjULCAwqmZCAxAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgUDYBgVFlOyPmQ4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBAzQICo2omNAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAmUTEBhVtjNiPgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQI1CwgMKpmQgMQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFA2AYFRZTsj5kOAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQM0CAqNqJjQAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQJlExAYVbYzYj4ECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECNQsIDCqZkIDECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBQNgGBUWU7I+ZDgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEDNAgKjaiY0AAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECZRMQGFW2M2I+BAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjULCAwqmZCAxAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgUDYBgVFlOyPmQ4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBAzQICo2omNAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAmUTEBhVtjNiPgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQI1CwgMKpmQgMQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFA2AYFRZTsj5kOAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQM0CAqNqJjQAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQJlExAYVbYzYj4ECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECNQsIDCqZkIDECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBQNgGBUWU7I+ZDgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEDNAgKjaiY0AAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECZRMQGFW2M2I+BAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjULCAwqmZCAxAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgUDYBgVFlOyPmQ4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBAzQICo2omNAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAmUTEBhVtjNiPgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQI1CwgMKpmQgMQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFA2AYFRZTsj5kOAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQM0CAqNqJjQAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQJlExAYVbYzYj4ECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECNQsIDCqZkIDECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBQNgGBUWU7I+ZDgAABAgQIECBAgAABAgQIECBAgAABAgQIECDxwb5NAAACo0lEQVRAgAABAgQIECBAgEDNAgKjaiY0AAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECZRMQGFW2M2I+BAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjULCAwqmZCAxAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgUDYBgVFlOyPmQ4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBAzQICo2omNAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAmUTEBhVtjNiPgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQI1CwgMKpmQgMQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFA2AYFRZTsj5kOAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQM0CAqNqJjQAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQJlExAYVbYzYj4ECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECNQsIDCqZkIDECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBQNgGBUWU7I+ZDgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEDNAgKjaiY0AAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECZRMQGFW2M2I+BAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjULPD/AIbZVdI1iQIiAAAAAElFTkSuQmCC"></image>
+                </g>
+                <rect id="Rectangle" fill="#FFFFFF" x="144" y="123" width="44" height="12"></rect>
+                <text id="123456" font-family="NotoSans-Medium, Noto Sans" font-size="12" font-weight="400" fill="#333333">
+                    <tspan x="144.408" y="133.5">123456</tspan>
+                </text>
+                <g id="icon" transform="translate(195.000000, 110.000000)">
+                    <circle id="Oval-Copy" stroke="#FA6400" fill-opacity="0.306408435" fill="#FA6400" cx="18" cy="18" r="17.5"></circle>
+                    <path d="M22,23.08 C21.24,23.08 20.56,23.38 20.04,23.85 L12.91,19.7 C12.96,19.47 13,19.24 13,19 C13,18.76 12.96,18.53 12.91,18.3 L19.96,14.19 C20.5,14.69 21.21,15 22,15 C23.66,15 25,13.66 25,12 C25,10.34 23.66,9 22,9 C20.34,9 19,10.34 19,12 C19,12.24 19.04,12.47 19.09,12.7 L12.04,16.81 C11.5,16.31 10.79,16 10,16 C8.34,16 7,17.34 7,19 C7,20.66 8.34,22 10,22 C10.79,22 11.5,21.69 12.04,21.19 L19.16,25.35 C19.11,25.56 19.08,25.78 19.08,26 C19.08,27.61 20.39,28.92 22,28.92 C23.61,28.92 24.92,27.61 24.92,26 C24.92,24.39 23.61,23.08 22,23.08 L22,23.08 Z" id="Shape" fill="#024F9D"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/alert.svg b/src/assets/imgs/alert.svg
new file mode 100644
index 000000000..365023f1d
--- /dev/null
+++ b/src/assets/imgs/alert.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="19px" viewBox="0 0 21 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>E718E91A-22CC-4984-98E3-03F373334664</title>
+    <g id="Page-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Course-continue" transform="translate(-40.000000, -174.000000)" fill="#FFA11D" fill-rule="nonzero">
+            <g id="Certified-course-Copy" transform="translate(16.000000, 156.000000)">
+                <g id="noun_Error_905622-Copy" transform="translate(24.000000, 18.000000)">
+                    <path d="M20.6345208,14.8916882 L12.8612727,1.36943726 C12.3740074,0.52195665 11.4742733,0 10.4997428,0 C9.52521234,0 8.62523611,0.52171354 8.13797088,1.36943726 L0.365448926,14.8916882 C-0.121816309,15.7389257 -0.121816309,16.7830821 0.365448926,17.6308058 C0.852472102,18.4778002 1.75244833,19 2.7269788,19 L18.2729909,19 C19.2472793,19 20.1474976,18.4780434 20.6347629,17.6308058 C21.121786,16.7830821 21.121786,15.7389257 20.6345208,14.8916882 Z M11.3280695,15.261215 C11.3280695,15.6971108 10.9761154,16.0503493 10.5423452,16.0503493 L10.4997428,16.0503493 C10.0659727,16.0503493 9.7142606,15.6971108 9.7142606,15.261215 L9.7142606,15.2186708 C9.7142606,14.782775 10.0659727,14.4297797 10.4997428,14.4297797 L10.5423452,14.4297797 C10.9761154,14.4297797 11.3280695,14.782775 11.3280695,15.2186708 L11.3280695,15.261215 Z M11.285225,12.8303606 C11.285225,13.2662564 10.933755,13.6194948 10.4997428,13.6194948 C10.0659727,13.6194948 9.7142606,13.2662564 9.7142606,12.8303606 L9.20496798,5.66542979 C9.20496798,5.22977711 10.0662147,4.70587558 10.4999849,4.70587558 C10.9339971,4.70587558 11.7952438,5.22977711 11.7952438,5.66542979 L11.285225,12.8303606 Z" id="alert"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/all_content.svg b/src/assets/imgs/all_content.svg
new file mode 100644
index 000000000..dc96bcf5e
--- /dev/null
+++ b/src/assets/imgs/all_content.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>70430F7E-5905-47A2-A819-BAB051E6CB28</title>
+    <g id="Final-layouts" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Home-page-your-preferences" transform="translate(-295.000000, -735.000000)" fill="#024F9D" fill-rule="nonzero">
+            <g id="Group-12" transform="translate(8.000000, 258.000000)">
+                <g id="Group-2" transform="translate(8.000000, 431.000000)">
+                    <g id="noun_all-archive_2088819" transform="translate(279.000000, 46.000000)">
+                        <path d="M13.316875,13.193125 C13.75,13.193125 14.1097917,12.8333333 14.1097917,12.4025 L14.1097917,11.323125 C14.1120833,10.45 14.8179167,9.73958333 15.6910417,9.73958333 L18.02625,9.73958333 C18.02625,7.05833333 18.02625,7.60604167 18.02625,4.92479167 C18.02625,4.49166667 17.6710417,4.13416667 17.235625,4.13416667 L4.18229167,4.13416667 C3.95770833,4.13416667 3.77666667,3.966875 3.77666667,3.73770833 C3.77666667,3.52 3.953125,3.34354167 4.17083333,3.34354167 L17.235625,3.34354167 C18.1064583,3.34354167 18.8191667,4.05625 18.8191667,4.92479167 L18.8191667,5.96291667 L19.1995833,5.96291667 C20.68,5.96291667 21.8922917,7.17520833 21.8922917,8.655625 C21.8922917,12.16875 21.8922917,15.681875 21.8922917,19.195 C21.8922917,20.6754167 20.68,21.8854167 19.1995833,21.8854167 L2.80041667,21.8854167 C1.32,21.8854167 0.107708333,20.6754167 0.107708333,19.195 C0.107708333,15.681875 0.107708333,12.16875 0.107708333,8.655625 C0.107708333,7.17291667 1.31770833,5.96291667 2.80041667,5.96291667 L3.57729167,5.96291667 C3.79729167,5.96291667 3.97375,6.14166667 3.97375,6.359375 L3.97375,9.73958333 L6.30895833,9.73958333 C7.17979167,9.73958333 7.88791667,10.4522917 7.89020833,11.323125 L7.89020833,12.4025 C7.89020833,12.835625 8.25,13.193125 8.683125,13.193125 L13.316875,13.193125 Z M5.95833333,0.9075 C5.740625,0.9075 5.561875,0.72875 5.561875,0.511041667 C5.561875,0.293333333 5.740625,0.114583333 5.95833333,0.114583333 L16.0416667,0.114583333 C16.259375,0.114583333 16.438125,0.293333333 16.438125,0.511041667 C16.438125,0.72875 16.259375,0.9075 16.0416667,0.9075 L5.95833333,0.9075 Z M5.121875,2.48416667 C4.90416667,2.48416667 4.72541667,2.30541667 4.72541667,2.08770833 C4.72541667,1.87 4.90416667,1.69125 5.121875,1.69125 L16.878125,1.69125 C17.0958333,1.69125 17.2745833,1.87 17.2745833,2.08770833 C17.2745833,2.30541667 17.0958333,2.48416667 16.878125,2.48416667 L5.121875,2.48416667 Z M13.316875,13.9860417 L8.683125,13.9860417 C7.81,13.9860417 7.101875,13.2733333 7.101875,12.4025 L7.09958333,11.323125 C7.09958333,10.89 6.74208333,10.5325 6.30895833,10.5325 L2.80041667,10.5325 C1.75541667,10.5325 0.900625,11.3872917 0.900625,12.4322917 L0.900625,19.195 C0.900625,20.2377083 1.75770833,21.0925 2.80041667,21.0925 L19.1995833,21.0925 C20.2422917,21.0925 21.099375,20.2377083 21.099375,19.195 L21.099375,12.4322917 C21.099375,11.3872917 20.2445833,10.5325 19.1995833,10.5325 C18.0308333,10.5325 16.8620833,10.5325 15.6910417,10.5325 C15.2602083,10.5325 14.9004167,10.89 14.9004167,11.323125 L14.898125,12.4025 C14.898125,13.2733333 14.19,13.9860417 13.316875,13.9860417 Z" id="Shape"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/arrow_down.svg b/src/assets/imgs/arrow_down.svg
new file mode 100644
index 000000000..bdbafd30f
--- /dev/null
+++ b/src/assets/imgs/arrow_down.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="8px" viewBox="0 0 14 8" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>1965BAD5-EE02-47C0-A7C7-CCB2009C3965</title>
+    <g id="Textbook-TOC" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g transform="translate(-325.000000, -951.000000)" id="Stroke-1-Copy-2" stroke="#231F20" stroke-width="1.5">
+            <polyline transform="translate(332.000000, 955.000000) scale(1, -1) rotate(-180.000000) translate(-332.000000, -955.000000) " points="338 952 332 958 326 952"></polyline>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/arrow_up.svg b/src/assets/imgs/arrow_up.svg
new file mode 100644
index 000000000..97620a5cb
--- /dev/null
+++ b/src/assets/imgs/arrow_up.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="8px" viewBox="0 0 14 8" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>0DF4AADD-2710-45AE-8FCF-FDD743E8EEC5</title>
+    <g id="Textbook-TOC" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g transform="translate(-325.000000, -388.000000)" id="Group-18" stroke="#231F20" stroke-width="1.5">
+            <g transform="translate(8.000000, 381.000000)">
+                <polyline id="Stroke-1" transform="translate(324.000000, 11.000000) rotate(-180.000000) translate(-324.000000, -11.000000) " points="330 8 324 14 318 8"></polyline>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/book.gif b/src/assets/imgs/book.gif
new file mode 100644
index 000000000..1d1536d2b
Binary files /dev/null and b/src/assets/imgs/book.gif differ
diff --git a/src/assets/imgs/book_default.svg b/src/assets/imgs/book_default.svg
new file mode 100644
index 000000000..7dbb129b4
--- /dev/null
+++ b/src/assets/imgs/book_default.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="24px" viewBox="0 0 18 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>ADD53880-E7BE-4E00-99C1-75A2F4D18CCD</title>
+    <g id="Final-layouts" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Home-page-01" transform="translate(-311.000000, -518.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="Group-19-Copy" transform="translate(16.000000, 371.000000)">
+                <g id="Group-21" transform="translate(270.000000, 35.000000)">
+                    <g id="Group-Copy" transform="translate(25.000000, 112.000000)">
+                        <path d="M17.4473236,6.22639155 L3.16405053,6.22639155 C3.1372945,6.22639155 3.10994147,6.22580193 3.08318543,6.2251587 C2.2581986,6.20479 1.48596404,5.87208328 0.90878261,5.28841268 C0.330407198,4.70367003 0.0119398133,3.9313745 0.0119398133,3.11373179 C0.0119398133,1.39654275 1.4262107,0 3.16459325,0 L17.4473236,0 C17.7470129,0 17.9900424,0.239975508 17.9900424,0.536018556 C17.9900424,0.832061604 17.7470129,1.07203711 17.4473236,1.07203711 L3.16459325,1.07203711 C2.02472098,1.07203711 1.09737739,1.98771761 1.09737739,3.11319577 C1.09737739,4.22961522 1.98157484,5.12557024 3.11032137,5.1534432 C3.12806828,5.15387202 3.14630363,5.15435443 3.16405053,5.15435443 L17.4473236,5.15435443 C17.7470129,5.15435443 17.9900424,5.39432994 17.9900424,5.69037299 C17.9900424,5.98641604 17.7470129,6.22639155 17.4473236,6.22639155 Z" id="Path"></path>
+                        <path d="M3.09566797,23.889811 C2.79597865,23.889811 2.55294918,23.6503715 2.55294918,23.3543285 L2.55294918,5.76219948 C2.55294918,5.46615643 2.79597865,5.22618092 3.09566797,5.22618092 C3.39535728,5.22618092 3.63838675,5.46615643 3.63838675,5.76219948 L3.63838675,23.3532564 C3.63838675,23.6492995 3.39541155,23.889811 3.09566797,23.889811 Z" id="Path"></path>
+                        <path d="M0.554658601,21.3131698 C0.254969287,21.3131698 0.0119398133,21.0731943 0.0119398133,20.7771513 L0.0119398133,3.11373179 C0.0119398133,2.81768874 0.254969287,2.57771324 0.554658601,2.57771324 C0.854347916,2.57771324 1.09737739,2.81768874 1.09737739,3.11373179 L1.09737739,20.7771513 C1.09737739,21.0731943 0.854402188,21.3131698 0.554658601,21.3131698 Z" id="Path"></path>
+                        <path d="M17.4473236,23.890347 C17.1476343,23.890347 16.9046048,23.6503715 16.9046048,23.3543285 L16.9046048,5.70109336 C16.9046048,5.40505031 17.1476343,5.16507481 17.4473236,5.16507481 C17.7470129,5.16507481 17.9900424,5.40505031 17.9900424,5.70109336 L17.9900424,23.3543285 C17.9900424,23.6503715 17.7470129,23.890347 17.4473236,23.890347 Z" id="Path"></path>
+                        <path d="M14.9600434,4.50845207 L10.8755418,4.50845207 C10.5758525,4.50845207 10.332823,4.26847657 10.332823,3.97243352 C10.332823,3.67639047 10.5758525,3.43641496 10.8755418,3.43641496 L14.9595007,3.43641496 C15.2592443,3.43641496 15.5024908,3.67639047 15.5024908,3.97243352 C15.5024908,4.26847657 15.2597327,4.50845207 14.9600434,4.50845207 Z" id="Path"></path>
+                        <path d="M9.62722039,12.0720371 L5.54271879,12.0720371 C5.24302947,12.0720371 5,11.8320616 5,11.5360186 C5,11.2399755 5.24302947,11 5.54271879,11 L9.62667767,11 C9.92642125,11 10.1696678,11.2399755 10.1696678,11.5360186 C10.1696678,11.8320616 9.9269097,12.0720371 9.62722039,12.0720371 Z" id="Path-Copy"></path>
+                        <path d="M14.8107957,2.7905126 L6.42524773,2.7905126 C6.12555842,2.7905126 5.88252894,2.55053709 5.88252894,2.25449405 C5.88252894,1.958451 6.12555842,1.71847549 6.42524773,1.71847549 L14.8107957,1.71847549 C15.110485,1.71847549 15.3535145,1.958451 15.3535145,2.25449405 C15.3535145,2.55053709 15.110485,2.7905126 14.8107957,2.7905126 Z" id="Path"></path>
+                        <path d="M13.9282668,15.0720371 L5.54271879,15.0720371 C5.24302947,15.0720371 5,14.8320616 5,14.5360186 C5,14.2399755 5.24302947,14 5.54271879,14 L13.9282668,14 C14.2279561,14 14.4709856,14.2399755 14.4709856,14.5360186 C14.4709856,14.8320616 14.2279561,15.0720371 13.9282668,15.0720371 Z" id="Path-Copy-2"></path>
+                        <path d="M13.9282668,18.0720371 L5.54271879,18.0720371 C5.24302947,18.0720371 5,17.8320616 5,17.5360186 C5,17.2399755 5.24302947,17 5.54271879,17 L13.9282668,17 C14.2279561,17 14.4709856,17.2399755 14.4709856,17.5360186 C14.4709856,17.8320616 14.2279561,18.0720371 13.9282668,18.0720371 Z" id="Path-Copy-3"></path>
+                        <path d="M17.4473236,23.890347 L3.16405053,23.890347 C3.13686032,23.890347 3.10961584,23.8897574 3.08242563,23.8891142 C2.2570589,23.8680487 1.48514996,23.5350739 0.908239892,22.9514033 C0.330244382,22.3666071 0.0118855415,21.5944724 0.0118855415,20.7771513 C0.0118855415,20.4811082 0.254915015,20.2411327 0.554604329,20.2411327 C0.854293644,20.2411327 1.09732312,20.4811082 1.09732312,20.7771513 C1.09732312,21.8924987 1.98124921,22.7886681 3.10961584,22.8174523 C3.1272542,22.8178811 3.14559809,22.8183635 3.16399626,22.8183635 L17.4472693,22.8183635 C17.7469586,22.8183635 17.9899881,23.058339 17.9899881,23.3543821 C17.9899881,23.6503715 17.7470129,23.890347 17.4473236,23.890347 Z" id="Path"></path>
+                        <path d="M17.4201877,6.22639155 C16.0859135,6.22639155 14.8913895,5.39229307 14.4477169,4.1508741 C14.3286444,3.81988264 14.2680227,3.47055934 14.2680227,3.11373179 C14.2680769,1.39654275 15.6820765,0 17.4201877,0 C17.719877,0 17.9629064,0.239975508 17.9629064,0.536018556 C17.9629064,0.832061604 17.719877,1.07203711 17.4201877,1.07203711 C16.280641,1.07203711 15.3535145,1.98771761 15.3535145,3.11319577 C15.3535145,3.3479183 15.3929702,3.57647661 15.4709046,3.79297451 C15.7620732,4.60766911 16.5452707,5.15435443 17.4201877,5.15435443 C17.719877,5.15435443 17.9629064,5.39432994 17.9629064,5.69037299 C17.9629064,5.98641604 17.719877,6.22639155 17.4201877,6.22639155 Z" id="Path"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/book_english.svg b/src/assets/imgs/book_english.svg
new file mode 100644
index 000000000..ac83c8914
--- /dev/null
+++ b/src/assets/imgs/book_english.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="24px" viewBox="0 0 18 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>EC68660D-7FC9-4398-9C15-3C360D5101D7</title>
+    <g id="Final-layouts" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Home-page-01" transform="translate(-41.000000, -430.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="Group-19-Copy" transform="translate(16.000000, 371.000000)">
+                <g id="Group" transform="translate(25.000000, 59.000000)">
+                    <path d="M17.4473236,6.22639155 L3.16405053,6.22639155 C3.1372945,6.22639155 3.10994147,6.22580193 3.08318543,6.2251587 C2.2581986,6.20479 1.48596404,5.87208328 0.90878261,5.28841268 C0.330407198,4.70367003 0.0119398133,3.9313745 0.0119398133,3.11373179 C0.0119398133,1.39654275 1.4262107,0 3.16459325,0 L17.4473236,0 C17.7470129,0 17.9900424,0.239975508 17.9900424,0.536018556 C17.9900424,0.832061604 17.7470129,1.07203711 17.4473236,1.07203711 L3.16459325,1.07203711 C2.02472098,1.07203711 1.09737739,1.98771761 1.09737739,3.11319577 C1.09737739,4.22961522 1.98157484,5.12557024 3.11032137,5.1534432 C3.12806828,5.15387202 3.14630363,5.15435443 3.16405053,5.15435443 L17.4473236,5.15435443 C17.7470129,5.15435443 17.9900424,5.39432994 17.9900424,5.69037299 C17.9900424,5.98641604 17.7470129,6.22639155 17.4473236,6.22639155 Z" id="Path"></path>
+                    <path d="M3.09566797,23.889811 C2.79597865,23.889811 2.55294918,23.6503715 2.55294918,23.3543285 L2.55294918,5.76219948 C2.55294918,5.46615643 2.79597865,5.22618092 3.09566797,5.22618092 C3.39535728,5.22618092 3.63838675,5.46615643 3.63838675,5.76219948 L3.63838675,23.3532564 C3.63838675,23.6492995 3.39541155,23.889811 3.09566797,23.889811 Z" id="Path"></path>
+                    <path d="M0.554658601,21.3131698 C0.254969287,21.3131698 0.0119398133,21.0731943 0.0119398133,20.7771513 L0.0119398133,3.11373179 C0.0119398133,2.81768874 0.254969287,2.57771324 0.554658601,2.57771324 C0.854347916,2.57771324 1.09737739,2.81768874 1.09737739,3.11373179 L1.09737739,20.7771513 C1.09737739,21.0731943 0.854402188,21.3131698 0.554658601,21.3131698 Z" id="Path"></path>
+                    <path d="M17.4473236,23.890347 C17.1476343,23.890347 16.9046048,23.6503715 16.9046048,23.3543285 L16.9046048,5.70109336 C16.9046048,5.40505031 17.1476343,5.16507481 17.4473236,5.16507481 C17.7470129,5.16507481 17.9900424,5.40505031 17.9900424,5.70109336 L17.9900424,23.3543285 C17.9900424,23.6503715 17.7470129,23.890347 17.4473236,23.890347 Z" id="Path"></path>
+                    <path d="M12.2214844,16.2011609 L8.10007791,16.2011609 C7.8003886,16.2011609 7.55735912,15.9611853 7.55735912,15.6651423 C7.55735912,15.3690992 7.8003886,15.1291237 8.10007791,15.1291237 L12.2209417,15.1291237 C12.520631,15.1291237 12.7639318,15.3690992 12.7639318,15.6651423 C12.7639318,15.9611853 12.5211737,16.2011609 12.2214844,16.2011609 Z" id="Path"></path>
+                    <path d="M6.91505144,18.887257 C6.84265275,18.887257 6.76916863,18.8728917 6.69856091,18.8424995 C6.42378239,18.7242538 6.29803445,18.4083781 6.41775821,18.1369919 L9.66321656,10.7796012 C9.7829946,10.5081614 10.1028731,10.3840195 10.377543,10.5023188 C10.6523216,10.6205645 10.7780695,10.9364402 10.6583457,11.2078264 L7.41288738,18.5652171 C7.32393577,18.7669209 7.12443234,18.887257 6.91505144,18.887257 Z" id="Path"></path>
+                    <path d="M13.4059681,18.887257 C13.1965872,18.887257 12.9971381,18.7668673 12.9081322,18.5652171 L9.66321656,11.2077728 C9.54354707,10.9363866 9.66924074,10.6205109 9.94407354,10.5023188 C10.2187435,10.3840195 10.5386762,10.5082686 10.6583457,10.7797084 L13.9032614,18.1370455 C14.0229851,18.4084317 13.8972915,18.7243074 13.6224587,18.8425531 C13.551851,18.8728917 13.4783126,18.887257 13.4059681,18.887257 Z" id="Path"></path>
+                    <path d="M14.9600434,4.50845207 L10.8755418,4.50845207 C10.5758525,4.50845207 10.332823,4.26847657 10.332823,3.97243352 C10.332823,3.67639047 10.5758525,3.43641496 10.8755418,3.43641496 L14.9595007,3.43641496 C15.2592443,3.43641496 15.5024908,3.67639047 15.5024908,3.97243352 C15.5024908,4.26847657 15.2597327,4.50845207 14.9600434,4.50845207 Z" id="Path"></path>
+                    <path d="M14.8107957,2.7905126 L6.42524773,2.7905126 C6.12555842,2.7905126 5.88252894,2.55053709 5.88252894,2.25449405 C5.88252894,1.958451 6.12555842,1.71847549 6.42524773,1.71847549 L14.8107957,1.71847549 C15.110485,1.71847549 15.3535145,1.958451 15.3535145,2.25449405 C15.3535145,2.55053709 15.110485,2.7905126 14.8107957,2.7905126 Z" id="Path"></path>
+                    <path d="M17.4473236,23.890347 L3.16405053,23.890347 C3.13686032,23.890347 3.10961584,23.8897574 3.08242563,23.8891142 C2.2570589,23.8680487 1.48514996,23.5350739 0.908239892,22.9514033 C0.330244382,22.3666071 0.0118855415,21.5944724 0.0118855415,20.7771513 C0.0118855415,20.4811082 0.254915015,20.2411327 0.554604329,20.2411327 C0.854293644,20.2411327 1.09732312,20.4811082 1.09732312,20.7771513 C1.09732312,21.8924987 1.98124921,22.7886681 3.10961584,22.8174523 C3.1272542,22.8178811 3.14559809,22.8183635 3.16399626,22.8183635 L17.4472693,22.8183635 C17.7469586,22.8183635 17.9899881,23.058339 17.9899881,23.3543821 C17.9899881,23.6503715 17.7470129,23.890347 17.4473236,23.890347 Z" id="Path"></path>
+                    <path d="M17.4201877,6.22639155 C16.0859135,6.22639155 14.8913895,5.39229307 14.4477169,4.1508741 C14.3286444,3.81988264 14.2680227,3.47055934 14.2680227,3.11373179 C14.2680769,1.39654275 15.6820765,0 17.4201877,0 C17.719877,0 17.9629064,0.239975508 17.9629064,0.536018556 C17.9629064,0.832061604 17.719877,1.07203711 17.4201877,1.07203711 C16.280641,1.07203711 15.3535145,1.98771761 15.3535145,3.11319577 C15.3535145,3.3479183 15.3929702,3.57647661 15.4709046,3.79297451 C15.7620732,4.60766911 16.5452707,5.15435443 17.4201877,5.15435443 C17.719877,5.15435443 17.9629064,5.39432994 17.9629064,5.69037299 C17.9629064,5.98641604 17.719877,6.22639155 17.4201877,6.22639155 Z" id="Path"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/calculator.svg b/src/assets/imgs/calculator.svg
new file mode 100644
index 000000000..394acbd36
--- /dev/null
+++ b/src/assets/imgs/calculator.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="24px" viewBox="0 0 21 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>961B5B57-3260-430E-B09D-C8BB37445862</title>
+    <g id="Final-layouts" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Home-page-01" transform="translate(-40.000000, -518.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="Group-19-Copy" transform="translate(16.000000, 371.000000)">
+                <g id="calculator-copy" transform="translate(24.000000, 147.000000)">
+                    <g id="Group" transform="translate(8.742857, 17.739130)">
+                        <ellipse id="Oval" cx="2.62876545" cy="2.67632655" rx="1" ry="1"></ellipse>
+                        <path d="M0.489149246,0.00611306084 C0.752899272,0.00611306084 0.965799187,0.223973282 0.965799187,0.492591512 C0.965799187,0.761209742 0.752899272,0.979069963 0.489149246,0.979069963 C0.225958012,0.979069963 0.0130580967,0.761209742 0.0130580967,0.492591512 C0.0130580967,0.223973282 0.225958012,0.00611306084 0.489149246,0.00611306084 Z" id="Path"></path>
+                    </g>
+                    <g id="Group">
+                        <path d="M19.1453146,24 L1.42417856,24 C0.658488176,24 0.0355489188,23.3626634 0.0355489188,22.5792764 L0.0355489188,1.42072362 C0.0355489188,0.637336617 0.658488176,0 1.42417856,0 L19.1453146,0 C19.911005,0 20.5339443,0.637336617 20.5339443,1.42072362 L20.5339443,22.5792764 C20.5339443,23.3626634 19.911005,24 19.1453146,24 Z M1.42417856,1.1365789 C1.27104048,1.1365789 1.14645263,1.26404622 1.14645263,1.42072362 L1.14645263,22.5792764 C1.14645263,22.7359538 1.27104048,22.8634211 1.42417856,22.8634211 L19.1453146,22.8634211 C19.2984527,22.8634211 19.4230405,22.7359538 19.4230405,22.5792764 L19.4230405,1.42072362 C19.4230405,1.26404622 19.2984527,1.1365789 19.1453146,1.1365789 L1.42417856,1.1365789 Z" id="Shape"></path>
+                        <path d="M19.9784924,7.48380375 L0.591000776,7.48380375 C0.284224715,7.48380375 0.0355489188,7.22938056 0.0355489188,6.9155143 C0.0355489188,6.60164804 0.284224715,6.34722485 0.591000776,6.34722485 L19.9784924,6.34722485 C20.2852685,6.34722485 20.5339443,6.60164804 20.5339443,6.9155143 C20.5339443,7.22938056 20.2852685,7.48380375 19.9784924,7.48380375 Z" id="Path"></path>
+                        <path d="M13.51581,23.9471491 C13.209034,23.9471491 12.9603582,23.6927259 12.9603582,23.3788596 L12.9603582,6.96552377 C12.9603582,6.65165751 13.209034,6.39723432 13.51581,6.39723432 C13.8225861,6.39723432 14.0712619,6.65165751 14.0712619,6.96552377 L14.0712619,23.3788596 C14.0712619,23.6927259 13.8225861,23.9471491 13.51581,23.9471491 Z" id="Path"></path>
+                        <path d="M13.4752621,15.7404812 L0.631548761,15.7404812 C0.324772701,15.7404812 0.0760969044,15.486058 0.0760969044,15.1721917 C0.0760969044,14.8583254 0.324772701,14.6039023 0.631548761,14.6039023 L13.4752621,14.6039023 C13.7820381,14.6039023 14.0307139,14.8583254 14.0307139,15.1721917 C14.0307139,15.486058 13.7820381,15.7404812 13.4752621,15.7404812 Z" id="Path"></path>
+                        <path d="M5.19569667,11.6124266 L2.44898724,11.6124266 C2.14221118,11.6124266 1.89353538,11.3580034 1.89353538,11.0441371 C1.89353538,10.7302709 2.14221118,10.4758477 2.44898724,10.4758477 L5.19569667,10.4758477 C5.50247273,10.4758477 5.75114853,10.7302709 5.75114853,11.0441371 C5.75114853,11.3580034 5.50247273,11.6124266 5.19569667,11.6124266 Z" id="Path"></path>
+                        <path d="M3.82261968,13.0172381 C3.51584362,13.0172381 3.26716782,12.7628149 3.26716782,12.4489487 L3.26716782,9.63875734 C3.26716782,9.32489108 3.51584362,9.07046789 3.82261968,9.07046789 C4.12939574,9.07046789 4.37807154,9.32489108 4.37807154,9.63875734 L4.37807154,12.4489487 C4.37807154,12.7628149 4.12939574,13.0172381 3.82261968,13.0172381 Z" id="Path"></path>
+                        <path d="M11.6855962,11.6124266 L8.883897,11.6124266 C8.57712094,11.6124266 8.32844514,11.3580034 8.32844514,11.0441371 C8.32844514,10.7302709 8.57712094,10.4758477 8.883897,10.4758477 L11.6855962,10.4758477 C11.9923722,10.4758477 12.241048,10.7302709 12.241048,11.0441371 C12.241048,11.3580034 11.9923722,11.6124266 11.6855962,11.6124266 Z" id="Path"></path>
+                        <path d="M4.88575453,20.9596514 C4.74355886,20.9596514 4.60147427,20.9041864 4.49299453,20.7931995 L2.36622491,18.6172192 C2.14932096,18.3953021 2.14926542,18.0354613 2.36616937,17.8135442 C2.58307332,17.5916272 2.93478543,17.5915704 3.15168938,17.8135442 L5.27851454,19.9895245 C5.49541849,20.2114416 5.49541849,20.5712824 5.27851454,20.7931995 C5.17003479,20.9041296 5.02789466,20.9596514 4.88575453,20.9596514 Z" id="Path"></path>
+                        <path d="M2.75892937,20.9596514 C2.6167337,20.9596514 2.47453802,20.9041296 2.36605828,20.7930858 C2.14920987,20.571112 2.14926542,20.2112711 2.36622491,19.9894109 L4.49288344,17.8136011 C4.7096763,17.5915704 5.06138841,17.5915135 5.27840345,17.8134306 C5.49536295,18.0352908 5.49547404,18.3951317 5.27862563,18.6171055 L3.15157829,20.7932563 C3.04309854,20.9041864 2.90101396,20.9596514 2.75892937,20.9596514 Z" id="Path"></path>
+                        <path d="M9.22105628,20.9596514 C9.07891615,20.9596514 8.93672047,20.9041864 8.82829627,20.7931995 C8.61139232,20.5712824 8.61139232,20.2114416 8.82829627,19.9895245 L10.9551214,17.8135442 C11.1720254,17.5916272 11.5237375,17.5916272 11.740697,17.8135442 C11.9576009,18.0354613 11.9576009,18.3953021 11.740697,18.617276 L9.61387183,20.7932563 C9.50539208,20.9041864 9.36319641,20.9596514 9.22105628,20.9596514 Z" id="Path"></path>
+                        <path d="M18.1505003,14.7499526 L15.3115859,14.7499526 C15.0048098,14.7499526 14.756134,14.4955295 14.756134,14.1816632 C14.756134,13.8677969 15.0048098,13.6133737 15.3115859,13.6133737 L18.1505003,13.6133737 C18.4572764,13.6133737 18.7059522,13.8677969 18.7059522,14.1816632 C18.7059522,14.4955295 18.4572764,14.7499526 18.1505003,14.7499526 Z" id="Path"></path>
+                        <path d="M18.1505003,16.7338511 L15.3115859,16.7338511 C15.0048098,16.7338511 14.756134,16.4794279 14.756134,16.1655617 C14.756134,15.8516954 15.0048098,15.5972722 15.3115859,15.5972722 L18.1505003,15.5972722 C18.4572764,15.5972722 18.7059522,15.8516954 18.7059522,16.1655617 C18.7059522,16.4794279 18.4572764,16.7338511 18.1505003,16.7338511 Z" id="Path"></path>
+                        <path d="M7.05368313,23.9471491 C6.74690707,23.9471491 6.49823128,23.6927259 6.49823128,23.3788596 L6.49823128,6.96552377 C6.49823128,6.65165751 6.74690707,6.39723432 7.05368313,6.39723432 C7.36045919,6.39723432 7.60913499,6.65165751 7.60913499,6.96552377 L7.60913499,23.3788596 C7.60913499,23.6927259 7.36045919,23.9471491 7.05368313,23.9471491 Z" id="Path"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/cbse_board.png b/src/assets/imgs/cbse_board.png
new file mode 100644
index 000000000..8ae43cbf8
Binary files /dev/null and b/src/assets/imgs/cbse_board.png differ
diff --git a/src/assets/imgs/close.png b/src/assets/imgs/close.png
new file mode 100644
index 000000000..bc5cf8c40
Binary files /dev/null and b/src/assets/imgs/close.png differ
diff --git a/src/assets/imgs/close_tutorial.svg b/src/assets/imgs/close_tutorial.svg
new file mode 100644
index 000000000..f9f998496
--- /dev/null
+++ b/src/assets/imgs/close_tutorial.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Group 3</title>
+    <g id="Page-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Notify_Thankyou" transform="translate(-320.000000, -37.000000)">
+            <g id="Group-3" transform="translate(320.000000, 37.000000)">
+                <circle id="Oval" fill="#FFFFFF" cx="12" cy="12" r="12"></circle>
+                <path d="M12,0 C5.364,0 0,5.364 0,12 C0,18.636 5.364,24 12,24 C18.636,24 24,18.636 24,12 C24,5.364 18.636,0 12,0 L12,0 Z M18,16.308 L16.308,18 L12,13.692 L7.692,18 L6,16.308 L10.308,12 L6,7.692 L7.692,6 L12,10.308 L16.308,6 L18,7.692 L13.692,12 L18,16.308 L18,16.308 Z" id="Shape" fill="#024F9D"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/course.svg b/src/assets/imgs/course.svg
new file mode 100644
index 000000000..557b8592d
--- /dev/null
+++ b/src/assets/imgs/course.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="18px" viewBox="0 0 22 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>EAA755B5-3666-48B9-8A86-0AD803A56B1B@2x</title>
+    <g id="Final-layouts" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Home-page-your-preferences" transform="translate(-127.000000, -739.000000)" fill="#0531FF" fill-rule="nonzero">
+            <g id="Group-12" transform="translate(8.000000, 258.000000)">
+                <g id="Group-2" transform="translate(8.000000, 431.000000)">
+                    <g id="Group-17" transform="translate(111.000000, 50.000000)">
+                        <path d="M20.1058834,16.1095296 C20.2267715,16.2326254 20.3006475,16.4010722 20.3006475,16.569519 C20.3006475,16.7379658 20.2267715,16.9064126 20.1058834,17.0295083 C19.9782794,17.1461253 19.8036633,17.2173913 19.6290472,17.2173913 C19.4544311,17.2173913 19.279815,17.1461253 19.1522109,17.0295083 C19.0313228,16.9064126 18.9574468,16.7379658 18.9574468,16.569519 C18.9574468,16.4010722 19.0313228,16.2326254 19.1522109,16.1095296 C19.4074191,15.8698169 19.8573913,15.8698169 20.1058834,16.1095296 Z M10.654513,0.0871225765 C10.8688999,-0.0290408588 11.1311001,-0.0290408588 11.345487,0.0871225765 L11.345487,0.0871225765 L21.6433594,5.66692304 C22.1188802,5.92457933 22.1188802,6.58119724 21.6433594,6.83885353 L21.6433594,6.83885353 L20.205,7.617 L20.2090657,7.66316753 L20.2090657,14.4079813 C20.2090657,14.7797174 19.8947124,15.0810691 19.506938,15.0810691 C19.1514782,15.0810691 18.8577124,14.82785 18.81122,14.4993153 L18.8048104,14.4079813 L18.803,8.377 L17.454,9.108 L17.4542067,13.9649795 C17.4542067,14.1961185 17.317373,14.4072297 17.1012021,14.5096059 C13.260269,16.3286298 8.73973097,16.3286298 4.89879792,14.5096059 C4.70964835,14.4200268 4.58124134,14.2471973 4.55209505,14.0505446 L4.54579326,13.9649795 L4.545,9.108 L0.35664065,6.83885353 C-0.0871788255,6.59837433 -0.11676679,6.01035522 0.267876755,5.72353737 L0.35664065,5.66692304 Z M16.186,9.795 L11.345487,12.418654 C11.1311001,12.5348174 10.8688999,12.5348174 10.654513,12.418654 L10.654513,12.418654 L5.813,9.795 L5.81268085,13.5793224 L6.12090909,13.7106493 C9.2355488,14.9750507 12.7644512,14.9750507 15.8790909,13.7106493 L16.186383,13.5793224 L16.186,9.795 Z M11,1.44579263 L2.12885106,6.25253711 L11,11.0583841 L17.397,7.592 L12.0864661,5.59171952 C11.7556213,5.4671205 11.5787833,5.128463 11.6608227,4.8063819 L11.6896944,4.71912587 C11.8196691,4.40196473 12.1729377,4.23244074 12.5089148,4.31108703 L12.5999354,4.33876453 L18.972,6.738 L19.8702128,6.25253711 L11,1.44579263 Z" id="Combined-Shape"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/dark_blue_check.svg b/src/assets/imgs/dark_blue_check.svg
new file mode 100644
index 000000000..44837fe70
--- /dev/null
+++ b/src/assets/imgs/dark_blue_check.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 63.1 (101010) - https://sketch.com -->
+    <title>8744A1BB-F5A2-4DE3-8C76-9161FEB38BC4</title>
+    <desc>Created with sketchtool.</desc>
+    <defs>
+        <filter x="-75.0%" y="-75.0%" width="250.0%" height="250.0%" filterUnits="objectBoundingBox" id="filter-1">
+            <feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.25 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
+            <feMerge>
+                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
+                <feMergeNode in="SourceGraphic"></feMergeNode>
+            </feMerge>
+        </filter>
+    </defs>
+    <g id="Linked-Profile" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Linked-Profile---select-user" transform="translate(-316.000000, -382.000000)" fill-rule="nonzero">
+            <g id="check" filter="url(#filter-1)" transform="translate(320.000000, 384.000000)">
+                <path d="M8,0 C3.58,0 0,3.58 0,8 C0,12.416 3.58,16 8,16 C12.416,16 16,12.416 16,8 C16,3.58 12.416,0 8,0 Z" id="Path" fill="#024F9D"></path>
+                <polygon id="Path" fill="#FFFFFF" points="6.47619048 11.7184127 2.66666667 7.8777982 3.7447619 6.7909043 6.47619048 9.54462489 12.2552381 3.7184127 13.3333333 4.8053066"></polygon>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/darkmode.svg b/src/assets/imgs/darkmode.svg
new file mode 100644
index 000000000..b499d7fe7
--- /dev/null
+++ b/src/assets/imgs/darkmode.svg
@@ -0,0 +1 @@
+ <svg  viewBox="0 0 496 496" width="24" xmlns="http://www.w3.org/2000/svg"><path _ngcontent-flc-c0="" d="M8,256C8,393,119,504,256,504S504,393,504,256,393,8,256,8,8,119,8,256ZM256,440V72a184,184,0,0,1,0,368Z" fill="#004EA3" transform="translate(-8 -8)"></path></svg>
\ No newline at end of file
diff --git a/src/assets/imgs/default_circle.png b/src/assets/imgs/default_circle.png
new file mode 100644
index 000000000..c07aecefb
Binary files /dev/null and b/src/assets/imgs/default_circle.png differ
diff --git a/src/assets/imgs/documents.svg b/src/assets/imgs/documents.svg
new file mode 100644
index 000000000..19dbcd34e
--- /dev/null
+++ b/src/assets/imgs/documents.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="17px" height="20px" viewBox="0 0 17 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>0E02CBFF-B63D-4F06-A0A2-20A768F478C3</title>
+    <g id="Search-page" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Search-page-01" transform="translate(-171.000000, -329.000000)">
+            <g id="Group-20" transform="translate(172.000000, 330.000000)">
+                <path d="M13,18 L2,18 C0.896,18 0,17.104 0,16 L0,2 C0,0.896 0.896,0 2,0 L9.671,0 C10.202,0 10.711,0.211 11.086,0.586 L14.414,3.914 C14.789,4.289 15,4.798 15,5.329 L15,16 C15,17.104 14.104,18 13,18" id="Combined-Shape" stroke="#008840"></path>
+                <path d="M11.25,12 L3.75,12 C3.336,12 3,11.664 3,11.25 C3,10.836 3.336,10.5 3.75,10.5 L11.25,10.5 C11.664,10.5 12,10.836 12,11.25 C12,11.664 11.664,12 11.25,12" id="Fill-3" fill="#008C36"></path>
+                <path d="M6.75,9 L3.75,9 C3.336,9 3,8.664 3,8.25 C3,7.836 3.336,7.5 3.75,7.5 L6.75,7.5 C7.164,7.5 7.5,7.836 7.5,8.25 C7.5,8.664 7.164,9 6.75,9" id="Fill-5" fill="#008C36"></path>
+                <path d="M11.25,15 L3.75,15 C3.336,15 3,14.664 3,14.25 C3,13.836 3.336,13.5 3.75,13.5 L11.25,13.5 C11.664,13.5 12,13.836 12,14.25 C12,14.664 11.664,15 11.25,15" id="Fill-7" fill="#008C36"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/download-cloud-white.svg b/src/assets/imgs/download-cloud-white.svg
new file mode 100644
index 000000000..4c45b550d
--- /dev/null
+++ b/src/assets/imgs/download-cloud-white.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="17px" viewBox="0 0 24 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>B4C0CAAC-030D-4422-A5E7-A8444FC2561D</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Certificate-Download-in-Portal-Copy-2" transform="translate(-1032.000000, -211.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="Button" transform="translate(1016.000000, 205.000000)">
+                <path d="M35.35,12.3026087 C34.67,8.7026087 31.64,6 28,6 C25.11,6 22.6,7.71130435 21.35,10.2156522 C18.34,10.5495652 16,13.2104348 16,16.4347826 C16,19.8886957 18.69,22.6956522 22,22.6956522 L35,22.6956522 C37.76,22.6956522 40,20.3582609 40,17.4782609 C40,14.7234783 37.95,12.4904348 35.35,12.3026087 Z M34.9391304,20.6086957 L22.0521739,20.6086957 C19.8613913,20.6086957 18.0869565,18.7408696 18.0869565,16.4347826 C18.0869565,14.2956522 19.6036522,12.5113043 21.616,12.2921739 L22.6766957,12.1773913 L23.1723478,11.186087 C24.114087,9.27652174 25.957913,8.08695652 28,8.08695652 C30.5972174,8.08695652 32.8375652,10.0278261 33.3431304,12.7095652 L33.6405217,14.2747826 L35.1572174,14.3895652 C36.7036522,14.493913 37.9130435,15.8608696 37.9130435,17.4782609 C37.9130435,19.2 36.5747826,20.6086957 34.9391304,20.6086957 Z M28.9913043,12.2608696 L25.9652174,12.2608696 L25.9652174,15.3913043 L23.3043478,15.3913043 L27.4782609,19.5652174 L31.6521739,15.3913043 L28.9913043,15.3913043 L28.9913043,12.2608696 Z" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/dropdown_arrow.svg b/src/assets/imgs/dropdown_arrow.svg
new file mode 100644
index 000000000..73f49b9c5
--- /dev/null
+++ b/src/assets/imgs/dropdown_arrow.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="8px" viewBox="0 0 14 8" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 63.1 (101010) - https://sketch.com -->
+    <title>BE94B3C8-E695-41FA-A0FC-2CE95714B444@1.5x</title>
+    <desc>Created with sketchtool.</desc>
+    <g id="Schooling-@-home" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="My-classes-Copy" transform="translate(-316.000000, -248.000000)" fill="#333333">
+            <g id="Group" transform="translate(16.000000, 205.000000)">
+                <polygon id="Path" transform="translate(306.894756, 47.000000) rotate(-270.000000) translate(-306.894756, -47.000000) " points="304.599756 40.7073171 303.189756 42.1860976 307.769756 47 303.189756 51.8139024 304.599756 53.2926829 310.599756 47"></polygon>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/edit-icon.svg b/src/assets/imgs/edit-icon.svg
new file mode 100644
index 000000000..6113725b1
--- /dev/null
+++ b/src/assets/imgs/edit-icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="#0e65a7" fill-rule="evenodd" xmlns:v="https://vecta.io/nano"><path d="M18.884 12.247c-.28 0-.5.233-.5.52v4.626c-.001.863-.685 1.562-1.53 1.563H2.548c-.844-.001-1.528-.7-1.53-1.563V3.817c.001-.863.685-1.562 1.53-1.563h4.524c.28 0 .5-.233.5-.52s-.228-.52-.5-.52H2.548C1.14 1.214.002 2.38 0 3.817v13.578C.002 18.833 1.14 19.998 2.548 20h14.298c1.407-.002 2.546-1.167 2.548-2.605V12.77c0-.288-.228-.52-.5-.52zM7.88 9.15l7.332-7.332 2.365 2.365-7.332 7.332zm-1.213 3.577l2.424-.67-1.753-1.753zM18.935.4a1.4 1.4 0 0 0-1.978 0l-.593.593 2.634 2.634.593-.593a1.4 1.4 0 0 0 0-1.978L18.935.4z"/></svg>
\ No newline at end of file
diff --git a/src/assets/imgs/empty_circle.svg b/src/assets/imgs/empty_circle.svg
new file mode 100644
index 000000000..9cf571984
--- /dev/null
+++ b/src/assets/imgs/empty_circle.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>0A5AE039-B21E-4EB7-98C2-533D33CCFEB7</title>
+    <g id="Profile-Page" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Self-Declaration-Teacher-04" transform="translate(-304.000000, -325.000000)" stroke="#CCCCCC" stroke-width="2">
+            <g id="Group-3-Copy-6" transform="translate(16.000000, 290.000000)">
+                <circle id="Oval" cx="300" cy="47" r="11"></circle>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/empty_search_result.svg b/src/assets/imgs/empty_search_result.svg
new file mode 100644
index 000000000..25a694763
--- /dev/null
+++ b/src/assets/imgs/empty_search_result.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 734.4 548.64"><defs><style>.cls-1,.cls-4,.cls-6{fill:none;}.cls-1{opacity:0.08;}.cls-2{fill:#0c519b;}.cls-3{fill:#edf4f9;}.cls-4{stroke:#0c519b;stroke-dasharray:13 18;}.cls-4,.cls-6{stroke-linecap:round;stroke-miterlimit:10;}.cls-5{fill:#2c6da8;}.cls-6{stroke:#2c6da8;stroke-dasharray:12 8;}.cls-7{fill:#fff;}.cls-8{fill:#20bb83;}.cls-9{fill:#e55a28;}.cls-10{fill:#a03e20;}.cls-11{fill:#239e6f;}.cls-12{fill:#36ce94;}.cls-13{opacity:0.43;}.cls-14{clip-path:url(#clip-path);}.cls-15{fill:#e89074;}</style><clipPath id="clip-path"><path class="cls-1" d="M63.79,417.7c4.43-5,11-8.24,16.87-11.38,1.37-.72,3.93-2.62,5.42-1.74s.22,1.73-.84,3.67a77.52,77.52,0,0,1-6.13,9.21c-2.57,3.45-6.3,8.7-4.64,13.24,1.86,5.06,8.51,5.25,12.82,3.57,11.66-4.55,18.47-17,29.05-23.37.61-.37,2.74-1.13,2.92-1.53,1.11-.22.9-.45-.64-.67-1.29-.91-1.74-.6-1.37.91-2.22,2.94-3.54,7-5.79,10.09-3.27,4.53-7.27,9.74-7.52,15.5a5.45,5.45,0,0,0,2.68,4.67c9.14,5.76,18.84-2.08,24.8-8.5,4.31-4.64,9.14-8.53,13.82-12.76,1.87-1.68,9.16-10.76,11.54-10l-3.22-2.48c3.05,4.74-4.63,11.71-7,15.16-2.6,3.77-6.35,9.95-4.75,14.7,1.68,5,7.59,6.16,12.12,5,6.95-1.84,12.55-8.79,20.18-6.13,6.58,2.29,9.41-8.14,2.87-10.41-5.12-1.79-10-1.25-15,.73-2.58,1-4.86,2.48-7.32,3.74a16,16,0,0,1-2.37,1.12c-2,.37-1.78,1.16.56,2.37.79-.52,1.32-3.12,1.82-4,4.61-7.82,13.11-15.06,9.43-25.31-8.29-23.11-43.67,32.73-52.07,27.43l2.68,4.66c.13-3.19,4.19-7.48,6-10.05,2.73-3.79,5.79-8,6.88-12.67,1.39-5.94-.13-13.55-7.35-14.06-6.73-.48-13.14,5.58-17.94,9.51-6.28,5.14-13.25,16.46-22.23,16.29l4.66,2.68c-.41,2.49-.31,2.93.32,1.33.43-.9.87-1.79,1.33-2.67,1-1.59,2.49-3.25,3.59-4.79a65.72,65.72,0,0,0,6-9.84c2.56-5.37,2.79-13.25-3.5-16.22-5.48-2.57-12.48-.51-17.38,2.29-6.68,3.82-13.89,7.2-19.06,13.06-4.58,5.2,3,12.87,7.64,7.64Z"/></clipPath></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-2" d="M200.31,229.07a.84.84,0,0,1-.44.11h-1.79c-4.13.07-8.42.11-13,.07a1.22,1.22,0,1,1,.05-2.44c4.51,0,8.8,0,12.93-.07h1.79a1.29,1.29,0,0,1,1.25,1.2A1.39,1.39,0,0,1,200.31,229.07Zm-29.5-.77a.94.94,0,0,1-.54.08,113.57,113.57,0,0,1-14.67-2.44,1.25,1.25,0,0,1-.87-1.5,1.17,1.17,0,0,1,1.46-.83A115.83,115.83,0,0,0,170.54,226a1.23,1.23,0,0,1,1.08,1.31A1.19,1.19,0,0,1,170.81,228.3Zm-28.47-7.06a1.32,1.32,0,0,1-.92,0,71.5,71.5,0,0,1-13-7.37,1.21,1.21,0,0,1,1.42-2,71.37,71.37,0,0,0,12.55,7.18,1.18,1.18,0,0,1,.59,1.57A1.05,1.05,0,0,1,142.34,221.24Zm-23.68-17.1a1.29,1.29,0,0,1-1.36-.32,68.82,68.82,0,0,1-8.75-12.17,1.2,1.2,0,1,1,2.12-1.14,67.46,67.46,0,0,0,8.42,11.73,1.2,1.2,0,0,1-.11,1.69A.49.49,0,0,1,118.66,204.14Zm1.79-17.44a59.33,59.33,0,0,1-7.82,2.45,1.23,1.23,0,0,1-1.47-.93,1.19,1.19,0,0,1,.92-1.46,54.13,54.13,0,0,0,7.5-2.34,49.45,49.45,0,0,0,5.92-2.77,1.2,1.2,0,0,1,1.14,2.12A53.41,53.41,0,0,1,120.45,186.7Zm-22.27,4.19c-.11.05-.28.05-.39.1A141.42,141.42,0,0,1,83,190.67a1.22,1.22,0,0,1-1.14-1.3,1.24,1.24,0,0,1,1.31-1.15,135.23,135.23,0,0,0,14.61.33,1.22,1.22,0,0,1,1.25,1.2A1.25,1.25,0,0,1,98.18,190.89Zm39.71-16.25a1.1,1.1,0,0,1-1.2-.21,1.22,1.22,0,0,1-.16-1.69,30.66,30.66,0,0,0,4.07-6.3,23.11,23.11,0,0,0,2-6.25,1.25,1.25,0,0,1,1.42-1,1.23,1.23,0,0,1,1,1.42,26.29,26.29,0,0,1-2.22,6.9,33.67,33.67,0,0,1-4.4,6.79A1.32,1.32,0,0,1,137.89,174.64Zm-33.36,4s-.11,0-.16,0a1.2,1.2,0,0,1-1.47-.87,43.26,43.26,0,0,1-1.36-15,1.23,1.23,0,0,1,1.31-1.09,1.21,1.21,0,0,1,1.08,1.31,42.6,42.6,0,0,0,1.31,14.18A1.22,1.22,0,0,1,104.53,178.61ZM68.78,189.47a.87.87,0,0,1-.54.06l-5.16-.33c-3.37-.16-6.46-.22-9.45-.22a1.22,1.22,0,1,1-.06-2.44c3,0,6.2.06,9.62.22l5.22.32a1.27,1.27,0,0,1,1.14,1.31A1.29,1.29,0,0,1,68.78,189.47ZM1.64,210.77a1.1,1.1,0,0,1-1.14-.16,1.2,1.2,0,0,1-.27-1.69,49.55,49.55,0,0,1,10.7-10.59,1.2,1.2,0,1,1,1.41,1.95A46,46,0,0,0,2.18,210.34,1.16,1.16,0,0,1,1.64,210.77ZM39.34,190a.52.52,0,0,1-.27,0,72.06,72.06,0,0,0-14,3.53,1.27,1.27,0,0,1-1.57-.7,1.2,1.2,0,0,1,.71-1.52,75.93,75.93,0,0,1,14.5-3.64,1.18,1.18,0,0,1,1.36,1A1,1,0,0,1,39.34,190ZM142.61,147.1a1.19,1.19,0,0,1-1.52-.65,15.39,15.39,0,0,0-7.66-8,14.48,14.48,0,0,0-2.17-.82,1.22,1.22,0,1,1,.71-2.33,13.06,13.06,0,0,1,2.49.92,17.9,17.9,0,0,1,8.86,9.24,1.24,1.24,0,0,1-.71,1.68ZM107.47,150a1.29,1.29,0,0,1-1.09-.11,1.23,1.23,0,0,1-.44-1.68,30.31,30.31,0,0,1,10.82-10.65,1.19,1.19,0,0,1,1.19,2.07,27.47,27.47,0,0,0-9.94,9.78A.87.87,0,0,1,107.47,150Z"/><path class="cls-3" d="M95.79,410.77c-30.44-51.69-14.05-131.51,24.9-191.16C159.89,159.62,222,120,288,84.66c66.56-35.49,137.69-66.3,202.82-56.17S615.65,89.58,655.4,151.74c40.08,62.39,60.2,136,44.79,198.94-15.74,62.74-67.58,115-120.8,143.16s-108.29,33.08-158.24,32-95.59-7.71-156.64-23C203.13,487.27,126,462.8,95.79,410.77Z"/><path class="cls-4" d="M65.47,421.83C32.09,365.15,50.06,277.62,92.78,212.21c43-65.78,111.06-109.18,183.43-148,73-38.91,151-72.7,222.39-61.6s136.91,67,180.5,135.15c43.95,68.42,66,149.11,49.12,218.15C711,424.73,654.11,482,595.76,512.92S477,549.19,422.24,548s-104.81-8.45-171.76-25.24C183.17,505.71,98.6,478.88,65.47,421.83Z"/><path class="cls-5" d="M535.39,461,292.14,422.83a12.33,12.33,0,0,1-10.23-14.07l50.8-323.25a12.31,12.31,0,0,1,14.08-10.23L590,113.5a12.3,12.3,0,0,1,10.22,14.08l-50.8,323.26A12.34,12.34,0,0,1,535.39,461Z"/><path class="cls-6" d="M502.09,464.32,256,469.77a12.23,12.23,0,0,1-12.52-12l-7.34-327.1a12.23,12.23,0,0,1,12-12.53l246.14-5.44a12.22,12.22,0,0,1,12.53,12l7.27,327.1A12.28,12.28,0,0,1,502.09,464.32Z"/><path class="cls-7" d="M522.1,484.34,276,489.78a12.23,12.23,0,0,1-12.52-12l-7.33-327.11a12.22,12.22,0,0,1,12-12.52l246.14-5.45a12.21,12.21,0,0,1,12.53,12l7.28,327.1A12.3,12.3,0,0,1,522.1,484.34Z"/><path class="cls-5" d="M661.49,421.07c22.42-20.3,24.32-54.74,4.24-76.91s-54.53-23.69-77-3.39-24.31,54.73-4.23,76.91S639.08,441.37,661.49,421.07Z"/><path class="cls-5" d="M692.45,472.39,630.56,403.7a11.3,11.3,0,0,1,.79-15.91l.07-.09a11.3,11.3,0,0,1,15.91.79l61.89,68.69a11.3,11.3,0,0,1-.79,15.91l-.07.08A11.25,11.25,0,0,1,692.45,472.39Z"/><path class="cls-7" d="M652.27,410.88c16.75-15.16,18.18-40.87,3.2-57.42S614.76,335.8,598,351s-18.17,40.87-3.19,57.42S635.52,426.05,652.27,410.88Z"/><circle class="cls-8" cx="353.69" cy="280.95" r="7.53"/><circle class="cls-8" cx="433.76" cy="280.95" r="7.53"/><path class="cls-8" d="M415,315.94a2,2,0,0,1-2-2,19.27,19.27,0,0,0-38.53,0,2,2,0,0,1-4,0,23.27,23.27,0,0,1,46.53,0A2,2,0,0,1,415,315.94Z"/><ellipse class="cls-9" cx="120.9" cy="371.34" rx="66.53" ry="11.98"/><ellipse class="cls-10" cx="120.9" cy="371.34" rx="52.36" ry="9.42"/><path class="cls-9" d="M53.48,377s9.7,31.67,15.44,53.93A26.78,26.78,0,0,0,94.85,451h50.74a26.77,26.77,0,0,0,25.69-19.21L187.42,377S120.9,397.24,53.48,377Z"/><path class="cls-11" d="M118.36,296c3.25,10.1,6.5,22.68,8.76,31.61,6.79,26.79,3.45,43.11-1.13,44.58-4.16,1.34-12.69-12.69-21.81-34.54-4.27-10.22-12-21.42-16.12-34.3-4.26-13.22-4.43-26.53-7-37.53-5.18-22.61,3.3-56.81,7.41-58.14s4.92,30.87,13.64,51.26C106.75,269.67,113.86,282,118.36,296Z"/><path class="cls-8" d="M136.07,271.64c.73,14.49.71,32.24.64,44.83-.2,37.76-8.9,58-14.6,58.33-5.19.26-10.79-21.32-14.76-53.42-1.85-15-7.35-32.56-8.28-51-.95-19,2.83-36.57,3.22-52,.79-31.67,20.74-73.66,25.85-73.91s-3.55,42.45.38,72.48C130.59,232.79,135.07,251.62,136.07,271.64Z"/><path class="cls-12" d="M150.69,304.76c-2.05,10.27-5.18,22.7-7.44,31.5-6.79,26.41-16.33,39.11-20.29,38.32-3.6-.72-3.65-16.81-.72-40,1.37-10.84.68-24.08,3.3-37.18,2.68-13.45,8.37-25.11,11.35-35.84,6.12-22,27.19-48,30.75-47.27s-9.91,29.11-12.5,50.83C153.77,276.6,153.53,290.57,150.69,304.76Z"/><g class="cls-13"><g class="cls-14"><path class="cls-9" d="M53.48,377s9.7,31.67,15.44,53.93A26.78,26.78,0,0,0,94.85,451h50.74a26.77,26.77,0,0,0,25.69-19.21L187.42,377S120.9,397.24,53.48,377Z"/><path class="cls-15" d="M53.4,377.14s9.7,31.66,15.45,53.92a26.76,26.76,0,0,0,25.93,20.05h50.73a26.79,26.79,0,0,0,25.7-19.21l16.13-54.76S120.83,397.36,53.4,377.14Z"/></g></g></g></g></svg>
\ No newline at end of file
diff --git a/src/assets/imgs/filter.svg b/src/assets/imgs/filter.svg
new file mode 100644
index 000000000..6b0819a53
--- /dev/null
+++ b/src/assets/imgs/filter.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="19px" viewBox="0 0 20 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>B32404FA-5A47-42AC-B2F4-9AEE7F42345D</title>
+    <g id="Search-page" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Explore-by-Categories-" transform="translate(-312.000000, -159.000000)" fill="#0531FF" fill-rule="nonzero">
+            <g id="Group" transform="translate(312.000000, 159.000000)">
+                <path d="M1.04166667,3.58333333 L3.83333333,3.58333333 C4.20833333,4.5 5.10416667,5.16666667 6.16666667,5.16666667 C7.22916667,5.16666667 8.125,4.52083333 8.5,3.58333333 L18.9583333,3.58333333 C19.4791667,3.58333333 19.8958333,3.16666667 19.8958333,2.64583333 C19.8958333,2.125 19.4791667,1.70833333 18.9583333,1.70833333 L8.5,1.70833333 C8.125,0.75 7.22916667,0.104166667 6.16666667,0.104166667 C5.10416667,0.104166667 4.20833333,0.75 3.83333333,1.6875 L1.04166667,1.6875 C0.520833333,1.6875 0.104166667,2.10416667 0.104166667,2.625 C0.104166667,3.14583333 0.520833333,3.58333333 1.04166667,3.58333333 Z" id="Path"></path>
+                <path d="M18.9583333,8.22916667 L16.1666667,8.22916667 C15.7916667,7.3125 14.8958333,6.64583333 13.8333333,6.64583333 C12.7708333,6.64583333 11.875,7.29166667 11.5,8.22916667 L1.04166667,8.22916667 C0.520833333,8.22916667 0.104166667,8.64583333 0.104166667,9.16666667 C0.104166667,9.6875 0.520833333,10.1041667 1.04166667,10.1041667 L11.5,10.1041667 C11.875,11.0208333 12.7708333,11.6875 13.8333333,11.6875 C14.8958333,11.6875 15.7916667,11.0416667 16.1666667,10.1041667 L18.9583333,10.1041667 C19.4791667,10.1041667 19.8958333,9.6875 19.8958333,9.16666667 C19.8958333,8.64583333 19.4791667,8.22916667 18.9583333,8.22916667 Z" id="Path"></path>
+                <path d="M18.9583333,14.75 L8.5,14.75 C8.125,13.8333333 7.22916667,13.1666667 6.16666667,13.1666667 C5.10416667,13.1666667 4.20833333,13.8125 3.83333333,14.75 L1.04166667,14.75 C0.520833333,14.75 0.104166667,15.1666667 0.104166667,15.6875 C0.104166667,16.2083333 0.520833333,16.625 1.04166667,16.625 L3.83333333,16.625 C4.20833333,17.5416667 5.10416667,18.2083333 6.16666667,18.2083333 C7.22916667,18.2083333 8.125,17.5625 8.5,16.625 L18.9583333,16.625 C19.4791667,16.625 19.8958333,16.2083333 19.8958333,15.6875 C19.8958333,15.1875 19.4791667,14.75 18.9583333,14.75 Z" id="Path"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/folder.png b/src/assets/imgs/folder.png
new file mode 100644
index 000000000..dad44846c
Binary files /dev/null and b/src/assets/imgs/folder.png differ
diff --git a/src/assets/imgs/globe.svg b/src/assets/imgs/globe.svg
new file mode 100644
index 000000000..e51fa57c5
--- /dev/null
+++ b/src/assets/imgs/globe.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="17px" height="24px" viewBox="0 0 17 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>951EE67D-315D-4419-B671-4C976BA44410</title>
+    <g id="Final-layouts" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Home-page-your-preferences" transform="translate(-311.000000, -473.000000)" fill-rule="nonzero">
+            <g id="Group-12" transform="translate(8.000000, 258.000000)">
+                <g id="Group-19-Copy" transform="translate(8.000000, 156.000000)">
+                    <g id="Group-21" transform="translate(270.000000, 35.000000)">
+                        <g id="Group" transform="translate(25.000000, 24.000000)">
+                            <path d="M11.2566786,23.59447 L3.53144432,23.59447 C3.23724609,23.59447 2.99866955,23.3531072 2.99866955,23.0553527 L2.99866955,21.6962379 C2.99866955,21.3984834 3.23724609,21.1571206 3.53144432,21.1571206 C4.47339012,21.1571206 5.31906353,20.5898613 5.68598551,19.7119627 C5.80756472,19.4212167 5.86920676,19.1114938 5.86920676,18.7914737 C5.86920676,18.4937192 6.1077833,18.2523564 6.40198153,18.2523564 C6.69623304,18.2523564 6.93475631,18.4937192 6.93475631,18.7914737 C6.93475631,19.2566781 6.84477065,19.7077576 6.66725009,20.1320968 C6.20352293,21.2416003 5.21432,22.0102199 4.06416582,22.1932502 L4.06416582,22.5161815 L10.7238505,22.5161815 L10.7238505,22.1934119 C10.2210177,22.1134608 9.74306543,21.9202951 9.31966931,21.6233493 C8.76185412,21.232004 8.33648674,20.6889511 8.08943908,20.0528466 C7.9328033,19.6502876 7.85326002,19.2257867 7.85326002,18.7914737 C7.85326002,18.4937192 8.09183657,18.2523564 8.3860348,18.2523564 C8.68023303,18.2523564 8.91880957,18.4937192 8.91880957,18.7914737 C8.91880957,19.089983 8.97336571,19.3815377 9.08103949,19.6581588 C9.25072826,20.0950594 9.54311505,20.4680747 9.92676617,20.737256 C10.3183556,21.0119363 10.7782468,21.1571206 11.2566253,21.1571206 C11.5508235,21.1571206 11.7894001,21.3984834 11.7894001,21.6962379 L11.7894001,23.0553527 C11.7894001,23.3531072 11.5509301,23.59447 11.2566786,23.59447 Z" id="Path" fill="#FFFFFF"></path>
+                            <path d="M7.3861231,19.3014787 C7.0405121,19.3014787 6.69319623,19.2826635 6.35387197,19.2455184 C4.35005276,19.0267984 2.49722193,18.1862067 0.995969165,16.8146383 C0.777531507,16.615111 0.760376159,16.2742271 0.957502826,16.053189 C1.15473605,15.8322048 1.49155626,15.8147913 1.70999392,16.0143186 C3.04358246,17.232616 4.68900408,17.9792396 6.46825872,18.1734835 C7.07636784,18.2400645 7.7109026,18.2394715 8.31895845,18.171974 C10.3795715,17.9437117 12.2828028,16.9560488 13.6781932,15.3908833 C15.0837063,13.8143425 15.8577215,11.7757782 15.8577215,9.65073936 C15.8577215,4.92386642 12.0573858,1.07823466 7.38606982,1.07823466 C7.09187159,1.07823466 6.85329505,0.836871835 6.85329505,0.539117332 C6.85329505,0.24136283 7.09187159,-6.12905447e-15 7.38606982,-6.12905447e-15 C12.6448765,-6.12905447e-15 16.9232711,4.32927391 16.9232711,9.65073936 C16.9232711,12.0431264 16.0518114,14.3381489 14.4693637,16.1131388 C12.8986904,17.8749743 10.7556572,18.9867959 8.43494352,19.2438471 C8.09023824,19.2820705 7.73727495,19.3014787 7.3861231,19.3014787 Z" id="Path" fill="#FFFFFF"></path>
+                            <path d="M6.07405866,16.9547549 C5.89744382,16.9547549 5.72274697,16.9348615 5.55055417,16.8943738 C5.26392134,16.8269841 5.08560162,16.5372624 5.15219847,16.2472173 C5.21874203,15.9571722 5.50516175,15.7767296 5.79168803,15.8440654 C6.70246651,16.0581489 7.91937737,15.1534022 8.89185117,13.5391231 C9.43352328,12.6414928 9.87977544,11.5642824 10.1829776,10.4227554 C10.1839366,10.4188198 10.1848955,10.4148843 10.1859611,10.4110026 C10.4846879,9.2828457 10.6320534,8.13765266 10.6122342,7.09925877 C10.5794153,5.32248977 10.0603861,3.9666636 9.25765433,3.56054651 C9.18370519,3.52291612 9.10597335,3.49304902 9.02579075,3.47126868 C8.74160868,3.39401317 8.5731453,3.09830731 8.64949192,2.81074212 C8.72583855,2.52323085 9.0178524,2.35276195 9.30224758,2.42996355 C9.45206385,2.47066691 9.59767119,2.52673511 9.73507381,2.59665863 C10.9277434,3.20009266 11.6360675,4.83399556 11.6775174,7.07882622 C11.6992013,8.21307517 11.5403811,9.45762754 11.2182122,10.6784587 C11.2172532,10.6825021 11.216241,10.6865994 11.2151221,10.6906428 C10.885814,11.9345482 10.3970465,13.1137056 9.80145754,14.1007756 C8.70154402,15.9266042 7.34238229,16.9545932 6.07405866,16.9547549 Z" id="Path" fill="#FFFFFF"></path>
+                            <path d="M5.61496664,16.8938885 C5.56936111,16.8938885 5.52295643,16.8879043 5.47681814,16.8753968 C4.04914157,16.4884723 3.16127241,14.7721923 3.10170819,12.2843814 C3.07368423,11.1322338 3.23213145,9.86773409 3.55994777,8.62706337 C3.56096004,8.62301999 3.56191904,8.61903053 3.56298459,8.61504106 C3.88717804,7.39135254 4.36571634,6.22906948 4.94692034,5.25391405 C6.09206645,3.33099035 7.51281694,2.2753447 8.84464732,2.35464886 C8.97123461,2.36225041 9.09984644,2.38106561 9.22670012,2.41050142 C9.51349278,2.47708241 9.69261166,2.76631886 9.62686725,3.05652572 C9.56106956,3.34673258 9.27544901,3.52814556 8.98844324,3.46140283 C8.91902268,3.44528322 8.84938902,3.43503999 8.78140696,3.43099661 C7.88469373,3.37681532 6.76581343,4.28873229 5.85951026,5.81060661 C5.33083785,6.69767027 4.8938027,7.75978532 4.59523572,8.8830902 C4.59422344,8.88707966 4.59326445,8.89096131 4.5921989,8.89489686 C4.28841072,10.0409525 4.14136488,11.2039364 4.16704463,12.2580725 C4.21307637,14.1818049 4.83546386,15.585289 5.75258236,15.833876 C6.0368177,15.9109159 6.20554747,16.2065139 6.12936068,16.4940791 C6.06553426,16.7350107 5.85023998,16.8938885 5.61496664,16.8938885 Z" id="Path" fill="#FFFFFF"></path>
+                            <path d="M14.008407,12.0008596 C13.945433,12.0008596 13.8814468,11.9894843 13.8191121,11.9654935 C13.5551755,11.8639238 13.4172934,11.57307 13.499021,11.3038348 C14.3983449,7.89715242 12.3926077,4.38442562 9.02605713,3.47132259 L9.01204516,3.46765659 C9.00426665,3.46555404 8.99648813,3.46339757 8.98881618,3.46161848 C8.98375482,3.46048633 8.97880001,3.45924636 8.97379193,3.45789857 C7.34946819,3.03194196 5.65609685,3.26818318 4.20545769,4.12327718 C2.75748241,4.97686165 1.72016992,6.34794485 1.28340116,7.98497463 C1.22650081,8.22083846 1.01632116,8.39615942 0.765810462,8.39615942 C0.471612231,8.39615942 0.233035687,8.15533571 0.233035687,7.85758121 C0.233035687,7.81040844 0.239109319,7.762427 0.251203307,7.71692549 C0.759470442,5.79836864 1.97329121,4.19120596 3.66906005,3.19157461 C5.36221828,2.19350669 7.33849303,1.91683167 9.23474501,2.41244224 C9.25088809,2.41632388 9.267191,2.42058291 9.28338735,2.42489585 L9.29686655,2.42845402 C13.2365762,3.49693066 15.5803057,7.60381868 14.5275427,11.5854158 C14.5230142,11.6030989 14.5166741,11.6258496 14.5064449,11.6531829 C14.4255697,11.8684524 14.2231685,12.0008596 14.008407,12.0008596 Z" id="Path" fill="#5E2A41"></path>
+                            <path d="M11.3552419,15.8522599 C11.1882703,15.8522599 11.023856,15.7730636 10.9200182,15.6246985 C10.7499565,15.3817183 10.806697,15.0452552 11.0468719,14.873169 C12.2412996,14.0171046 13.1098291,12.7575647 13.4927876,11.3261004 L13.4931605,11.3246448 C13.4939597,11.3213562 13.4957178,11.3144015 13.4965703,11.3111129 C13.8680208,9.88757361 13.7410073,8.36715491 13.1390251,7.02987437 C13.017073,6.75891399 13.1352957,6.4391635 13.403015,6.31575955 C13.6706811,6.1924095 13.9866698,6.3118779 14.1087285,6.58289219 C14.8118314,8.14482292 14.9606354,9.9201363 14.5278091,11.5825046 L14.5268501,11.586548 C14.5258379,11.5905374 14.5239732,11.5980851 14.5229076,11.6020745 C14.0761227,13.277166 13.0603876,14.7513824 11.6627595,15.7530624 C11.5692042,15.8200207 11.4616903,15.8522599 11.3552419,15.8522599 Z" id="Path" fill="#FFFFFF"></path>
+                            <path d="M1.15825236,13.0871811 C0.956650387,13.0871811 0.763732641,12.9707317 0.673906813,12.773253 C-0.04160971,11.1992461 -0.192917746,9.40872959 0.247740271,7.73148166 L0.249498427,7.72468878 C0.250137757,7.72210102 0.250990197,7.71870458 0.251736081,7.71617073 C0.697721846,6.05622846 1.70455962,4.59241708 3.08663066,3.59429525 C3.32600637,3.42123859 3.65888405,3.47757635 3.82974492,3.7199635 C4.00065907,3.96235066 3.94509066,4.29902943 3.70555512,4.47197827 C2.52338117,5.32572448 1.66209747,6.57787839 1.28025779,7.99796736 L1.27897913,8.00298115 C1.27855291,8.0045985 1.27791358,8.00702453 1.27754063,8.00858797 C0.900442648,9.44393396 1.02985364,10.9760515 1.64201186,12.3226588 C1.76497628,12.5931879 1.64792566,12.9133157 1.38063255,13.037744 C1.30849485,13.0712771 1.23278755,13.0871811 1.15825236,13.0871811 Z" id="Path" fill="#FFFFFF"></path>
+                            <path d="M11.4240764,7.63163713 C11.3273778,7.63163713 11.2297202,7.63034325 11.1310503,7.62775549 C10.1330033,7.60214741 9.09579735,7.44531818 8.04857525,7.16158073 C7.00087366,6.87757372 6.02514994,6.4887623 5.14846904,6.0058749 C4.28617307,5.53134383 3.56719351,4.99308908 3.01145614,4.40604422 C2.90447497,4.29304523 2.85130404,4.13858811 2.86579552,3.98272929 C2.88023371,3.82692438 2.96084254,3.68513652 3.08673722,3.59424134 C4.7750472,2.3750275 6.9028431,1.92734446 8.92456354,2.36564685 C9.04917956,2.39260272 9.1742218,2.42317067 9.29590756,2.4563803 C9.42675704,2.49212378 9.54609859,2.52781335 9.66075172,2.56555156 C11.6271701,3.20796377 13.24883,4.67231427 14.1087818,6.58278436 C14.1728746,6.72521916 14.1726615,6.88884127 14.1081424,7.03106042 C14.0436234,7.17333349 13.9211918,7.28018654 13.7727074,7.32390896 C13.0782355,7.52839616 12.2893026,7.63163713 11.4240764,7.63163713 Z M4.26241131,4.1128183 C4.66087357,4.44938925 5.13371118,4.77048754 5.65764189,5.05880749 C5.65769517,5.0588614 5.65774845,5.05891531 5.65780173,5.05891531 C6.46069331,5.50109935 7.35783276,5.85815676 8.32423292,6.12011387 C9.2903667,6.38180142 10.243927,6.5264466 11.1583816,6.54995212 C11.7545033,6.56542478 12.3226543,6.52682398 12.8341714,6.43700704 C12.0525375,5.09325708 10.8056314,4.07276189 9.3322428,3.59143793 C9.2338393,3.55903698 9.13149326,3.52846903 9.01827862,3.4975776 C8.91465393,3.46927394 8.8080457,3.44323458 8.70143746,3.42016036 C7.187185,3.09178399 5.60313904,3.34463002 4.26241131,4.1128183 Z" id="Shape" fill="#FFFFFF"></path>
+                            <path d="M7.38862714,17.1581639 C6.74833842,17.1581639 6.10373421,17.0736303 5.46983879,16.9018675 C3.33005546,16.3214538 1.57546829,14.8178016 0.656058858,12.7764338 C0.591166891,12.6323278 0.592179163,12.466657 0.65877601,12.3233596 C0.725426134,12.1800622 0.850894594,12.0736405 1.0020428,12.032398 L1.01791949,12.0278694 C1.301995,11.9495357 1.59464818,12.1190881 1.6719538,12.4063837 C1.67594961,12.4213172 1.67935937,12.4362508 1.68202324,12.4511843 C2.48305012,14.1364651 3.95707809,15.3753028 5.74554973,15.8604006 C7.53428776,16.3452827 9.42329401,16.0176611 10.9498003,14.9627703 C10.9516117,14.9606138 10.9534232,14.9585112 10.9552879,14.9564087 C11.1499638,14.7331602 11.4866242,14.711919 11.7072995,14.9090203 C11.7285039,14.9279433 11.7486428,14.9484297 11.7672899,14.9698866 C11.8666524,15.084449 11.9134833,15.2362106 11.8961681,15.3876486 C11.8788529,15.5390867 11.79899,15.6760225 11.6763453,15.7645456 C10.4062635,16.6812068 8.90959257,17.15811 7.38862714,17.1581639 Z" id="Path" fill="#FFFFFF"></path>
+                            <path d="M7.39358195,17.1310463 C6.77593615,17.1310463 6.15482732,17.0524969 5.54357482,16.8927564 C5.52780468,16.8889826 5.51176816,16.8847775 5.49589147,16.8805184 L5.48198605,16.8768524 C5.48028117,16.8763672 5.47846974,16.8759359 5.47676486,16.8754507 C3.34678458,16.2982717 1.59619323,14.8030837 0.673853536,12.7731991 C0.609014846,12.6304409 0.608908291,12.4661718 0.673587149,12.3233596 C0.738319284,12.1804935 0.861283702,12.0733709 1.01051392,12.0299181 C1.78197179,11.80516 2.66989423,11.705046 3.64897444,11.732487 C4.64057485,11.7586342 5.67245303,11.91514 6.71503999,12.1975836 C7.7553893,12.4795419 8.72626477,12.8658734 9.60070801,13.3459035 C10.4627909,13.8183859 11.1821434,14.3545381 11.7385201,14.9392108 C11.8461939,15.0523716 11.8996844,15.2074217 11.8851397,15.3637657 C11.8705417,15.5201637 11.7892935,15.6623289 11.6625997,15.7531163 C10.3983784,16.6589951 8.90708853,17.1310463 7.39358195,17.1310463 Z M5.75151681,15.8336604 L5.76728694,15.8378116 C5.77490562,15.8398603 5.7825243,15.8419628 5.79003643,15.843688 C5.79499123,15.8448201 5.79994604,15.8460601 5.80479429,15.8473001 C7.39523355,16.2645769 9.06692096,16.0390102 10.4850076,15.2327602 C10.0870781,14.8987231 9.61530604,14.579997 9.09297365,14.2937257 C8.29168038,13.8539137 7.39901625,13.4990667 6.43948888,13.2390504 C5.47772385,12.978495 4.52922492,12.8342811 3.62041771,12.8102904 C3.02658694,12.7936856 2.46072686,12.8308847 1.95080812,12.9187608 C2.78982183,14.3513573 4.14450826,15.3978919 5.75151681,15.8336604 Z" id="Shape" fill="#FFFFFF"></path>
+                            <path d="M13.9731373,11.9776776 C13.9274785,11.9776776 13.8810738,11.9716934 13.8348823,11.9591859 L0.607096857,8.37265391 C0.323021346,8.29491319 0.155090737,7.99888386 0.231863582,7.71148041 C0.308636427,7.42402305 0.601183057,7.25414718 0.885258567,7.33178007 L0.904971234,7.33717125 L14.110753,10.9176651 C14.3949351,10.9947589 14.5636116,11.2903569 14.4874248,11.577976 C14.4236517,11.8188536 14.2083574,11.9776776 13.9731373,11.9776776 Z" id="Path" fill="#FFFFFF"></path>
+                            <path d="M9.28898149,3.3459239 C9.24332269,3.3459239 9.19691801,3.3399397 9.15077971,3.32743217 C8.86654437,3.25039231 8.69786787,2.95474036 8.77405467,2.66712127 L9.16937355,1.17430537 C9.24556034,0.8867941 9.53778731,0.716055641 9.82186282,0.793095507 C10.1060982,0.870135374 10.2747747,1.16578732 10.1985879,1.45340642 L9.80326898,2.94622231 C9.73949584,3.18704602 9.52420155,3.3459239 9.28898149,3.3459239 Z" id="Path" fill="#FFFFFF"></path>
+                            <path d="M5.1535304,18.9624818 C5.10792488,18.9624818 5.06146692,18.9564975 5.01527535,18.94399 C4.73109328,18.8668962 4.56241679,18.5712982 4.63860358,18.283733 L5.10105209,16.537532 C5.17723888,16.2499668 5.46925273,16.0792283 5.75359463,16.1563221 C6.0377767,16.2334159 6.20645319,16.5290139 6.1302664,16.816633 L5.66781789,18.5628341 C5.60409803,18.8036578 5.38880374,18.9624818 5.1535304,18.9624818 Z" id="Path" fill="#FFFFFF"></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/green_tick.svg b/src/assets/imgs/green_tick.svg
new file mode 100644
index 000000000..9a4a96edc
--- /dev/null
+++ b/src/assets/imgs/green_tick.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>8B4CB432-FD76-4469-94B8-BCC3D605009F</title>
+    <g id="Profile-Page" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Self-Declaration-Teacher-04.4" transform="translate(-304.000000, -325.000000)" fill-rule="nonzero">
+            <g id="Group-3-Copy-6" transform="translate(16.000000, 290.000000)">
+                <g id="Green" transform="translate(288.000000, 35.000000)">
+                    <path d="M12,0 C18.627417,0 24,5.372583 24,12 C24,18.627417 18.627417,24 12,24 C5.372583,24 0,18.627417 0,12 C0,5.372583 5.372583,0 12,0 Z" id="Oval" fill="#008840"></path>
+                    <path d="M12,2 C6.4771525,2 2,6.4771525 2,12 C2,17.5228475 6.4771525,22 12,22 C17.5228475,22 22,17.5228475 22,12 C22,6.4771525 17.5228475,2 12,2 Z" id="Path" fill="#008840"></path>
+                    <polygon id="Path" fill="#FFFFFF" points="16.59 7 10 13.9957537 7.41 11.2569002 6 12.7537155 10 17 18 8.507431"></polygon>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/guest_profile.svg b/src/assets/imgs/guest_profile.svg
new file mode 100644
index 000000000..6f77036f4
--- /dev/null
+++ b/src/assets/imgs/guest_profile.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="83px" height="82px" viewBox="0 0 83 82" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>25A79762-0D33-442C-B45D-A461A3EFBE39</title>
+    <defs>
+        <circle id="path-1" cx="41" cy="41" r="41"></circle>
+    </defs>
+    <g id="Profile" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Profile_interim_design-01" transform="translate(-139.000000, -121.000000)">
+            <g id="Group-6-Copy" transform="translate(131.000000, 113.000000)">
+                <g id="Profile" transform="translate(8.500000, 8.000000)">
+                    <mask id="mask-2" fill="white">
+                        <use xlink:href="#path-1"></use>
+                    </mask>
+                    <g id="Mask"></g>
+                    <g id="Group-6" mask="url(#mask-2)" fill="#AEB2B6">
+                        <g transform="translate(-7.500000, 5.000000)">
+                            <circle id="Oval" cx="48" cy="19" r="19"></circle>
+                            <circle id="Oval-Copy" cx="48" cy="91" r="48"></circle>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/header-background.svg b/src/assets/imgs/header-background.svg
new file mode 100644
index 000000000..3e1b5d330
--- /dev/null
+++ b/src/assets/imgs/header-background.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="298px" height="107px" viewBox="0 0 298 107" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>A2C9BCA2-0428-4941-AC51-18B1A43C3585</title>
+    <g id="Onboard-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.25">
+        <g id="On-boarding---01-" transform="translate(-31.000000, -58.000000)" fill="#FFFFFF">
+            <g id="Combined-Shape" transform="translate(0.000000, 24.000000)">
+                <path d="M103.855515,34 C130.382123,34 133.698435,151.463521 133.698435,151.463521 C133.698435,151.463521 142.982942,97.7091439 160.226015,97.7091439 C177.468116,97.7091439 156.909703,157.435798 165.530754,156.10895 C174.152776,154.782101 168.183609,45.2816149 192.72179,74.4810317 C217.259,103.681421 205.985094,148.808852 232.512674,148.144942 C259.039283,147.482004 223.228167,126.908561 238.48087,106.999028 C253.734544,87.0904672 292.198514,133.544748 295.514826,145.490273 C295.514826,145.490273 293.525428,81.1172186 311.430986,81.1172186 C329.337515,81.1172186 330,173.363813 330,173.363813 L51.4638118,180 C51.4638118,180 23.6102902,104.345331 32.8947974,81.1172186 C42.1793046,57.8910505 73.349138,105.672179 79.3173335,123.590953 C79.3173335,123.590953 77.327935,34 103.855515,34 Z M190.40367,101.266936 L190.299335,101.27128 C189.947796,101.312066 189.687558,101.607185 189.680874,101.951683 L189.68546,102.046707 L197.141831,166.402358 L197.159094,166.495911 C197.24437,166.82974 197.565183,167.057444 197.916722,167.016657 C198.268261,166.975871 198.528499,166.680752 198.535183,166.336255 L198.530597,166.24123 L191.074226,101.885579 L191.056963,101.792026 C190.988742,101.524963 190.769778,101.32582 190.504933,101.277728 L190.40367,101.266936 Z M48.335891,101.391925 C48.1829885,101.081507 47.8197662,100.923816 47.4816145,101.036221 C47.1127218,101.158845 46.9133573,101.556472 47.0363216,101.924345 L47.0363216,101.924345 L68.6277997,166.519717 L68.664109,166.608075 C68.8170115,166.918493 69.1802338,167.076184 69.5183855,166.963779 C69.8872782,166.841155 70.0866427,166.443528 69.9636784,166.075655 L69.9636784,166.075655 L48.3722003,101.480283 Z M314.364402,112.459188 L314.269397,112.462696 C313.917418,112.499482 313.653845,112.791623 313.64325,113.136022 L313.646756,113.231092 L313.899467,115.837175 L314.082391,117.866885 C314.227307,119.520289 314.370794,121.269228 314.508537,123.089596 L314.57691,124.005621 L314.681686,125.461477 C315.022224,130.305279 315.274524,135.052524 315.406304,139.522118 C315.747254,151.086122 315.244621,159.49832 313.695761,163.257055 C313.548587,163.614215 313.718613,164.023141 314.075526,164.170417 C314.432439,164.317693 314.841083,164.147549 314.988257,163.79039 C316.556117,159.985543 317.094997,152.134197 316.850987,141.293058 L316.836627,140.687703 L316.803766,139.480859 C316.672705,135.03564 316.423169,130.320491 316.086579,125.509729 L315.971201,123.902839 L315.902612,122.983918 C315.792069,121.52302 315.677838,120.107972 315.562127,118.751083 L315.475102,117.744514 L315.32939,116.118499 C315.291087,115.700397 315.254149,115.304494 315.218804,114.932058 L315.183997,114.567493 L315.037263,113.085768 C315.003844,112.765565 314.759534,112.518477 314.456817,112.468232 L314.364402,112.459188 Z M253.218707,122.041478 C252.998237,122.310217 253.011272,122.694127 253.233612,122.946926 L253.315444,123.025998 L254.206491,123.787339 L255.040964,124.526405 C255.718031,125.134296 256.447021,125.808192 257.217524,126.543667 C260.15385,129.346499 263.090409,132.462042 265.829676,135.80551 C273.107521,144.68863 277.673641,153.522628 278.226807,161.705553 C278.252863,162.091006 278.586241,162.382339 278.971427,162.356264 C279.356613,162.33019 279.647745,161.996581 279.621688,161.611129 C279.044783,153.077025 274.356192,144.006083 266.910835,134.918503 C264.132676,131.527565 261.157706,128.37127 258.182504,125.531329 C257.140807,124.53699 256.173097,123.652881 255.303962,122.889322 C255.075342,122.688473 254.865784,122.506767 254.676586,122.344751 L254.494223,122.189317 L254.202547,121.944674 C253.904154,121.699538 253.463674,121.742879 253.218707,122.041478 Z M106.029647,63.0263107 C105.675753,63.0263107 105.383281,63.289473 105.336994,63.6309082 L105.330612,63.7258287 L105.330612,159.79296 L105.336994,159.88788 C105.383281,160.229316 105.675753,160.492478 106.029647,160.492478 C106.383541,160.492478 106.676013,160.229316 106.7223,159.88788 L106.728682,159.79296 L106.728682,63.7258287 L106.7223,63.6309082 C106.676013,63.289473 106.383541,63.0263107 106.029647,63.0263107 Z"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_action_close_white.svg b/src/assets/imgs/ic_action_close_white.svg
new file mode 100644
index 000000000..4d6d3d651
--- /dev/null
+++ b/src/assets/imgs/ic_action_close_white.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 53.1 (72631) - https://sketchapp.com -->
+    <title>996639E1-E2E0-4DE4-A804-28A7C15DA304@1.5x</title>
+    <desc>Created with sketchtool.</desc>
+    <g id="Search-Page" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="04-Search-results-page" transform="translate(-290.000000, -42.000000)">
+            <g id="baseline-close-24px-(1)" transform="translate(290.000000, 42.000000)">
+                <polygon id="Path" fill="#FFFFFF" points="14 1.41 12.59 0 7 5.59 1.41 0 0 1.41 5.59 7 0 12.59 1.41 14 7 8.41 12.59 14 14 12.59 8.41 7"></polygon>
+                <polygon id="Path" fill="#FFFFFF" points="14 1.41 12.59 0 7 5.59 1.41 0 0 1.41 5.59 7 0 12.59 1.41 14 7 8.41 12.59 14 14 12.59 8.41 7"></polygon>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/assets/imgs/ic_action_course.png b/src/assets/imgs/ic_action_course.png
index 21384b397..b006f7b6d 100644
Binary files a/src/assets/imgs/ic_action_course.png and b/src/assets/imgs/ic_action_course.png differ
diff --git a/src/assets/imgs/ic_action_filter.svg b/src/assets/imgs/ic_action_filter.svg
index 10302b382..d64ab3f66 100644
--- a/src/assets/imgs/ic_action_filter.svg
+++ b/src/assets/imgs/ic_action_filter.svg
@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 53.1 (72631) - https://sketchapp.com -->
-    <title>E2E2D5D7-842D-4CC5-AAC1-AC33126A08D8</title>
-    <desc>Created with sketchtool.</desc>
-    <g id="Search-Page" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="04-Search-results-page" transform="translate(-323.000000, -40.000000)">
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>3F3D6620-0FF4-470A-8F30-5DE3F8BFFD7B</title>
+    <g id="Course" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Course--Landing-Logged-in-user-screen" transform="translate(-320.000000, -37.000000)">
             <g id="outline-tune-24px" transform="translate(320.000000, 37.000000)">
                 <polygon id="Path" points="0 0 24 0 24 24 0 24"></polygon>
-                <path d="M3,17 L3,19 L9,19 L9,17 L3,17 Z M3,5 L3,7 L13,7 L13,5 L3,5 Z M13,21 L13,19 L21,19 L21,17 L13,17 L13,15 L11,15 L11,21 L13,21 Z M7,9 L7,11 L3,11 L3,13 L7,13 L7,15 L9,15 L9,9 L7,9 Z M21,13 L21,11 L11,11 L11,13 L21,13 Z M15,9 L17,9 L17,7 L21,7 L21,5 L17,5 L17,3 L15,3 L15,9 Z" id="Shape" fill="#023C77" fill-rule="nonzero"></path>
+                <g id="Group-21" transform="translate(3.000000, 3.000000)" stroke="#024F9D" stroke-linecap="round">
+                    <line x1="18.75" y1="3.75" x2="16" y2="3.75" id="Stroke-1" stroke-width="1.5"></line>
+                    <line x1="10" y1="3.75" x2="0.75" y2="3.75" id="Stroke-3" stroke-width="1.5"></line>
+                    <line x1="18.75" y1="14.25" x2="10" y2="14.25" id="Stroke-5" stroke-width="1.5"></line>
+                    <line x1="4" y1="14.25" x2="0.75" y2="14.25" id="Stroke-7" stroke-width="1.5"></line>
+                    <line x1="18.75" y1="3.75" x2="16" y2="3.75" id="Stroke-9" stroke-width="2"></line>
+                    <line x1="10" y1="3.75" x2="0.75" y2="3.75" id="Stroke-11" stroke-width="2"></line>
+                    <line x1="18.75" y1="14.25" x2="10" y2="14.25" id="Stroke-13" stroke-width="2"></line>
+                    <line x1="4" y1="14.25" x2="0.75" y2="14.25" id="Stroke-15" stroke-width="2"></line>
+                    <path d="M16,3.75 C16,5.41 14.66,6.75 13,6.75 C11.34,6.75 10,5.41 10,3.75 C10,2.09 11.34,0.75 13,0.75 C14.66,0.75 16,2.09 16,3.75 Z" id="Stroke-17" stroke-width="2"></path>
+                    <path d="M10,14.25 C10,15.91 8.66,17.25 7,17.25 C5.34,17.25 4,15.91 4,14.25 C4,12.59 5.34,11.25 7,11.25 C8.66,11.25 10,12.59 10,14.25 Z" id="Stroke-19" stroke-width="2"></path>
+                </g>
             </g>
         </g>
     </g>
diff --git a/src/assets/imgs/ic_admin.svg b/src/assets/imgs/ic_admin.svg
new file mode 100644
index 000000000..d398db525
--- /dev/null
+++ b/src/assets/imgs/ic_admin.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="122px" height="123px" viewBox="0 0 122 123" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>FD9E3183-9807-49D0-B602-7F5C9BB9F79C</title>
+    <defs>
+        <polygon id="path-1" points="0.0196955325 0.200405405 20.181927 0.200405405 20.181927 10.1132135 0.0196955325 10.1132135"></polygon>
+        <polygon id="path-3" points="0.000159793187 0.0297828125 0.594979136 0.0297828125 0.594979136 0.127604167 0.000159793187 0.127604167"></polygon>
+        <polygon id="path-5" points="4.31873479e-06 0.0284834852 70.9929173 0.0284834852 70.9929173 43.9924606 4.31873479e-06 43.9924606"></polygon>
+    </defs>
+    <g id="Onboard-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="User-Role-Selection-Copy-2" transform="translate(-33.000000, -364.000000)">
+            <g id="Group-21" transform="translate(16.000000, 350.000000)">
+                <g id="Group-20" transform="translate(17.000000, 14.000000)">
+                    <circle id="Oval-Copy-2" fill="#E5EDF5" cx="61" cy="61" r="61"></circle>
+                    <g id="Group-5" transform="translate(45.000000, 26.000000)">
+                        <path d="M22.3790127,47.5176486 C22.3790127,47.5176486 20.3618235,44.7832515 20.5307694,31.5176486 L15.0177964,31.5176486 L9.76268833,31.5176486 C9.93163427,44.7832515 7.65785049,47.5176486 7.65785049,47.5176486" id="Fill-204" fill="#E2947A"></path>
+                        <path d="M20.8945771,41.1644319 C20.6130106,38.6490638 20.6683397,36.8598973 20.4828802,33.4822486 L14.8377991,33.8188703 L9.6995559,33.333627 C9.58777211,35.3635189 9.75544779,37.4556541 9.55982617,38.9101135 L20.8945771,41.1644319 Z" id="Fill-206" fill="#CB765A"></path>
+                        <path d="M26.4144072,21.555427 C26.4144072,21.555427 27.9895424,18.434373 29.8047586,19.3553189 C30.8222451,19.8710486 29.8936775,28.0719135 26.4144072,27.6755892 C26.4144072,27.6755892 25.7995964,27.4571027 25.755137,26.1347514 L26.4144072,21.555427 Z" id="Fill-208" fill="#E2947A"></path>
+                        <path d="M28.9971208,20.3843649 C28.9971208,20.3843649 29.9828505,23.5232027 28.6427154,24.2675811 C28.6427154,24.2675811 27.9288235,24.5089324 27.9694721,24.8493649 C28.0139316,25.1859865 27.696364,27.4610405 26.8922829,26.7331757 C26.8922829,26.7331757 26.2711208,25.7004459 27.0447154,25.3155541 C27.8195802,24.9281216 27.273364,24.9116081 26.6560127,24.088473 C26.6560127,24.088473 27.804337,20.1544459 28.9971208,20.3843649" id="Fill-210" fill="#CB765A"></path>
+                        <path d="M29.3196424,22.6979081 C29.2777235,22.1275568 29.2269127,21.5508541 29.0897235,21.0224216 C29.0579667,20.8890432 29.0071559,20.7670973 28.951264,20.6692865 C28.8788586,20.5727459 28.8394802,20.5676649 28.8013721,20.5879892 C28.6616424,20.6362595 28.6616424,20.6858 28.542237,20.7848811 C28.4533181,20.8776108 28.3618586,20.9754216 28.2818316,21.0833946 C27.9426694,21.5102054 27.6657505,22.0030703 27.4294802,22.5022865 C27.2046424,22.9837189 26.9480478,23.5502595 26.9810748,23.9834216 L26.9188316,23.8627459 C27.1411289,24.1117189 27.3545343,24.3530703 27.508237,24.6808 C27.5438045,24.7633676 27.5806424,24.8510162 27.5920748,24.9640703 C27.6174802,25.0631514 27.5844532,25.2397189 27.4701289,25.3451514 C27.3723181,25.4366108 27.1957505,25.4556649 27.1893991,25.4569351 L26.9645613,25.5280703 C26.9391559,25.5699892 26.916291,25.5992054 26.8756424,25.6284216 L26.7994262,25.8037189 C26.775291,25.935827 26.7460748,26.0793676 26.7727505,26.2241784 C26.775291,26.3003946 26.789264,26.3715297 26.81721,26.4413946 C26.8464262,26.5074486 26.8540478,26.5900162 26.9010478,26.6459081 C26.9709127,26.7843676 27.0738045,26.8885297 27.2071829,26.9838 C27.0636424,26.922827 26.9137505,26.8440703 26.8159397,26.7043405 C26.7511559,26.6459081 26.7295613,26.5658811 26.6825613,26.4947459 C26.6393721,26.4248811 26.6088856,26.3448541 26.5923721,26.2635568 C26.5364802,26.1035027 26.5275883,25.9269351 26.5415613,25.7490973 C26.5656964,25.6614486 26.5911018,25.5712595 26.6253991,25.4823405 C26.6889127,25.3946919 26.77021,25.3045027 26.8515072,25.2333676 L27.0699937,25.1406378 C27.2109937,25.0961784 27.19321,25.0961784 27.2198856,25.0809351 C27.2160748,25.0949081 27.212264,24.9831243 27.1347775,24.8662595 C26.9963181,24.6363405 26.7956154,24.3911784 26.5885613,24.1866649 L26.5313991,24.1282324 L26.5250478,24.0647189 C26.4666154,23.3444757 26.7321018,22.8223946 26.9709127,22.2787189 C27.2414802,21.7553676 27.5463451,21.2548811 27.9337775,20.7963135 C28.0277775,20.6807189 28.1344802,20.5714757 28.2526154,20.4673135 C28.3428045,20.3834757 28.5663721,20.2310432 28.7111829,20.2119892 C28.9550748,20.1421243 29.1900748,20.3504486 29.247237,20.5016108 C29.3183721,20.6591243 29.3590208,20.8115568 29.3793451,20.9601784 C29.4631829,21.5546649 29.407291,22.1300973 29.3196424,22.6979081" id="Fill-212" fill="#975238"></path>
+                        <path d="M3.78022346,21.555427 C3.78022346,21.555427 2.20508833,18.434373 0.389872113,19.3553189 C-0.630154914,19.8710486 0.300953194,28.0719135 3.78022346,27.6755892 C3.78022346,27.6755892 4.39503427,27.4571027 4.43949373,26.1347514 L3.78022346,21.555427 Z" id="Fill-214" fill="#E2947A"></path>
+                        <path d="M1.19636671,20.3843649 C1.19636671,20.3843649 0.213177518,23.5232027 1.55204238,24.2675811 C1.55204238,24.2675811 2.26212346,24.5089324 2.22274509,24.8493649 C2.18209644,25.1859865 2.49839373,27.4610405 3.30247482,26.7331757 C3.30247482,26.7331757 3.92236671,25.7004459 3.14623157,25.3155541 C2.37390725,24.9281216 2.92139373,24.9116081 3.53874509,24.088473 C3.53874509,24.088473 2.39423157,20.1544459 1.19636671,20.3843649" id="Fill-216" fill="#CB765A"></path>
+                        <path d="M0.872574815,22.6979081 C0.786196437,22.1300973 0.730304545,21.5546649 0.812872113,20.9601784 C0.835736978,20.8115568 0.875115356,20.6591243 0.946250491,20.5016108 C1.00468292,20.3504486 1.23968292,20.1421243 1.48230455,20.2119892 C1.62711536,20.2310432 1.84814238,20.3847459 1.94341265,20.4673135 C2.05900725,20.5714757 2.16443968,20.6832595 2.26098022,20.7988541 C2.64714238,21.2548811 2.95200725,21.7553676 3.22384509,22.2787189 C3.4626559,22.8223946 3.72814238,23.3444757 3.66716941,24.0647189 L3.66081806,24.130773 L3.60238563,24.1866649 C3.39660184,24.3911784 3.19970995,24.6363405 3.05870995,24.8662595 C2.97868292,24.9831243 2.97614238,25.0949081 2.97233157,25.0809351 C2.99773698,25.0961784 2.97868292,25.0961784 3.12222346,25.1406378 L3.34070995,25.2333676 C3.42073698,25.3019622 3.50203427,25.3934216 3.56681806,25.4810703 C3.60111536,25.5699892 3.62398022,25.6589081 3.6506559,25.7465568 C3.66589914,25.9256649 3.65700725,26.1022324 3.60111536,26.2622865 C3.58460184,26.3435838 3.55411536,26.4223405 3.51092617,26.4934757 C3.46519644,26.5658811 3.44487211,26.6459081 3.37881806,26.7043405 C3.28100725,26.8428 3.13238563,26.922827 2.98757482,26.9838 C3.12095319,26.8885297 3.22384509,26.7843676 3.29243968,26.6459081 C3.34070995,26.5900162 3.34833157,26.5074486 3.37754779,26.4388541 C3.40422346,26.3715297 3.41946671,26.2991243 3.42073698,26.2229081 C3.44614238,26.0780973 3.41819644,25.9332865 3.39025049,25.8037189 L3.31657482,25.6284216 C3.2746559,25.5979351 3.2530613,25.5699892 3.2276559,25.5268 L3.00281806,25.4569351 C2.99392617,25.4569351 2.81608833,25.4353405 2.71827752,25.3438811 C2.60649373,25.2371784 2.57600725,25.0618811 2.59760184,24.9628 C2.61284509,24.8497459 2.64714238,24.7633676 2.68652076,24.6808 C2.83768292,24.3530703 3.05108833,24.1117189 3.2746559,23.8614757 L3.21114238,23.9821514 C3.24416941,23.5502595 2.98757482,22.9837189 2.76400725,22.5022865 C2.52900725,22.0030703 2.25081806,21.5102054 1.9116559,21.0833946 C1.83162887,20.9754216 1.74016941,20.8776108 1.64870995,20.7861514 C1.53057482,20.6858 1.53057482,20.6362595 1.39338563,20.5879892 C1.35146671,20.5676649 1.31589914,20.5714757 1.24222346,20.6692865 C1.18379103,20.7670973 1.13552076,20.8890432 1.10249373,21.0224216 C0.967845086,21.5508541 0.913223464,22.1275568 0.872574815,22.6979081" id="Fill-218" fill="#975238"></path>
+                        <path d="M13.7501937,39.2064676 C13.7501937,39.2064676 7.77484238,35.1809811 5.93549103,32.7700081 C4.25365319,30.5635486 3.09516671,20.4585486 2.90589644,18.7131973 C2.89954509,18.6534946 2.89192346,18.5976027 2.88684238,18.5379 C2.88049103,18.4845486 2.87795049,18.4527919 2.87795049,18.4527919 L2.88049103,18.4553324 C2.85000455,18.0958459 2.82968022,17.7312784 2.82968022,17.3616297 C2.82968022,10.6291973 8.28803157,5.17338649 15.0179235,5.17338649 C21.7503559,5.17338649 27.2048964,10.6291973 27.2048964,17.3616297 C27.2048964,17.7973324 27.179491,18.2304946 27.1363018,18.6547649 C27.1363018,18.6547649 25.9397072,30.3526838 24.0990856,32.7700081 C22.2597343,35.1809811 16.2818424,39.2064676 16.2818424,39.2064676" id="Fill-220" fill="#E2947A"></path>
+                        <path d="M15.1407586,31.4075162 C12.9584343,31.3732189 11.1749748,31.1826784 11.1749748,31.1826784 C11.4087045,32.2801919 13.394137,32.6650838 15.1407586,32.6676243 C16.8924613,32.6650838 18.8728127,32.2801919 19.1090829,31.1826784 C19.1090829,31.1826784 17.3256235,31.3732189 15.1407586,31.4075162" id="Fill-222" fill="#F0F0ED"></path>
+                        <path d="M1.82273698,19.3734838 C1.82273698,19.3734838 3.0396559,20.0162405 3.53887211,22.5389973 C3.53887211,22.5389973 4.20830455,21.3868622 4.43949373,18.9720784 C4.66941265,16.5534838 5.07208833,15.8827811 5.96000725,14.1869703 C5.96000725,14.1869703 8.11946671,10.6734027 7.17438563,7.37451081 C6.57100725,5.2684027 3.38770995,4.24456486 2.19111536,6.56915946 C-0.161425185,11.1383216 1.33749373,18.5351054 1.82273698,19.3734838" id="Fill-224" fill="#090000"></path>
+                        <path d="M19.4576451,18.7532108 C19.4576451,18.7532108 18.6840505,19.4074 18.0108072,20.1860757 C17.6703748,20.5709676 17.3782127,20.9901568 17.1889424,21.3255081 C17.0949424,21.4931838 17.0530235,21.6468865 17.0060235,21.7510486 C16.9641045,21.8577514 16.94251,21.9187243 16.94251,21.9187243 C16.94251,21.9187243 16.9539424,21.8552108 16.9780775,21.7446973 C17.0060235,21.6367243 17.0238072,21.4677784 17.0924018,21.2823189 C17.22451,20.9114 17.4518883,20.4312378 17.7326181,19.9841027 C18.277564,19.0834811 18.9698613,18.2679676 18.9698613,18.2679676 L19.4576451,18.7532108 Z" id="Fill-226" fill="#975238"></path>
+                        <path d="M12.8248649,18.0146229 C12.8248649,18.0146229 12.6267027,18.7131608 12.0372973,18.7716535 C10.391027,18.9364454 7.45162162,18.1636668 5,19 C5,19 5.17910811,18.29865 6.61324324,18.0871764 C8.04991892,17.8768276 12.3485135,18.1282337 12.8248649,18.0146229" id="Fill-228" fill="#000000"></path>
+                        <path d="M17.3538235,18.1175357 C17.3538235,18.1175357 17.4668775,18.859649 18.0308775,18.9096453 C19.6136343,19.0505986 22.5657424,18.1572917 24.85731,19 C24.85731,19 24.7594991,18.2530677 23.3876072,18.0585039 C22.0182559,17.8633377 17.8034991,18.2283708 17.3538235,18.1175357" id="Fill-230" fill="#000000"></path>
+                        <path d="M12.4029451,22.5031757 C12.4029451,22.5031757 12.5833235,22.1779865 12.4969451,21.8477162 C12.4131072,21.5199865 9.40891806,19.0048514 7.4031613,22.0687432 C7.4031613,22.0687432 9.63883698,25.1897973 12.4029451,22.5031757" id="Fill-232" fill="#F0F0ED"></path>
+                        <path d="M11.5259505,21.9052595 C11.5259505,22.6140703 10.9555991,23.1856919 10.2467883,23.1856919 C9.54051806,23.1856919 8.9663559,22.6140703 8.9663559,21.9052595 C8.9663559,21.2002595 9.54051806,20.6260973 10.2467883,20.6260973 C10.9555991,20.6260973 11.5259505,21.2002595 11.5259505,21.9052595" id="Fill-234" fill="#2C1117"></path>
+                        <path d="M10.8461018,21.9052595 C10.8461018,22.2380703 10.5780748,22.5086378 10.2465343,22.5086378 C9.91372346,22.5086378 9.64442617,22.2380703 9.64442617,21.9052595 C9.64442617,21.5737189 9.91372346,21.3044216 10.2465343,21.3044216 C10.5780748,21.3044216 10.8461018,21.5737189 10.8461018,21.9052595" id="Fill-236" fill="#040000"></path>
+                        <path d="M8.35027482,22.9832108 L7.18162617,22.3315622 L6.97457211,22.2159676 L7.11430184,21.8806162 C7.28324779,21.6659405 7.41916671,21.4309405 7.6160586,21.2378595 C7.8167613,21.0460486 8.017464,20.8567784 8.26643698,20.7170486 C8.37949103,20.6357514 8.50270725,20.568427 8.63989644,20.521427 C8.77200455,20.4718865 8.89522076,20.3969405 9.03622076,20.3778865 C9.31059914,20.2978595 9.59386941,20.2800757 9.86951806,20.2940486 C10.4246262,20.3372378 10.9352748,20.5265081 11.3913018,20.7856432 C11.61741,20.9152108 11.8320856,21.0638324 12.0315181,21.2276973 C12.1293289,21.3166162 12.2322208,21.3941027 12.3160586,21.4957243 C12.402437,21.5960757 12.4913559,21.6799135 12.5485181,21.8336162 C12.5548694,22.0394 12.4837343,22.2197784 12.449437,22.401427 C12.449437,22.2121568 12.4811937,22.0292378 12.4418154,21.8539405 L12.4456262,21.8602919 C12.3173289,21.6989676 12.0861397,21.5516162 11.8917883,21.4207784 C11.683464,21.2924811 11.4662478,21.1806973 11.24141,21.0905081 C10.7942748,20.9101297 10.3191937,20.8123189 9.86316671,20.8389946 C9.41349103,20.8758324 8.98795049,21.0092108 8.62719373,21.2721568 C8.25373427,21.5147784 7.98062617,21.8945892 7.69354509,22.2566162 L7.79264034,22.146862 L8.35027482,22.9832108 Z" id="Fill-238" fill="#030000"></path>
+                        <path d="M9.99883157,21.4686676 C9.99883157,21.6363432 9.86164238,21.7735324 9.69396671,21.7735324 C9.5275613,21.7735324 9.38910184,21.6363432 9.38910184,21.4686676 C9.38910184,21.3009919 9.5275613,21.165073 9.69396671,21.165073 C9.86164238,21.165073 9.99883157,21.3009919 9.99883157,21.4686676" id="Fill-240" fill="#F0F0ED"></path>
+                        <path d="M18.0918505,22.5031757 C18.0918505,22.5031757 17.9102018,22.1779865 17.9965802,21.8477162 C18.0829586,21.5199865 21.083337,19.0048514 23.0878235,22.0687432 C23.0878235,22.0687432 20.8534181,25.1897973 18.0918505,22.5031757" id="Fill-242" fill="#F0F0ED"></path>
+                        <path d="M18.9677018,21.9052595 C18.9677018,22.6140703 19.5393235,23.1856919 20.2481343,23.1856919 C20.9531343,23.1856919 21.5285667,22.6140703 21.5285667,21.9052595 C21.5285667,21.2002595 20.9531343,20.6260973 20.2481343,20.6260973 C19.5393235,20.6260973 18.9677018,21.2002595 18.9677018,21.9052595" id="Fill-244" fill="#2C1117"></path>
+                        <path d="M19.6462802,21.9052595 C19.6462802,22.2380703 19.9143072,22.5086378 20.2483883,22.5086378 C20.5811991,22.5086378 20.8479559,22.2380703 20.8479559,21.9052595 C20.8479559,21.5737189 20.5811991,21.3044216 20.2483883,21.3044216 C19.9143072,21.3044216 19.6462802,21.5737189 19.6462802,21.9052595" id="Fill-246" fill="#040000"></path>
+                        <path d="M22.1421072,22.9832108 L22.6753594,22.1096266 L22.8001072,22.2566162 L22.798837,22.2566162 C22.5104856,21.8945892 22.234837,21.5147784 21.8651883,21.2708865 C21.5044316,21.0092108 21.078891,20.8758324 20.6292154,20.8389946 C20.1744586,20.8123189 19.6981072,20.9101297 19.2522424,21.0917784 C19.0274045,21.1806973 18.8101883,21.2937514 18.601864,21.4220486 C18.4062424,21.5528865 18.1750532,21.6989676 18.0467559,21.8602919 L18.0492964,21.8526703 C18.0149991,22.0292378 18.0429451,22.2121568 18.0467559,22.401427 C18.0111883,22.2197784 17.9413235,22.0406703 17.9413235,21.8425081 C18.0022964,21.6799135 18.0912154,21.5960757 18.1775937,21.4957243 C18.2614316,21.3941027 18.3643235,21.3166162 18.4595937,21.2289676 C18.6615667,21.0638324 18.8749721,20.9152108 19.1010802,20.7856432 C19.555837,20.5265081 20.0664856,20.3372378 20.6241343,20.2940486 C20.8985127,20.2800757 21.1817829,20.2978595 21.4561613,20.3766162 C21.5971613,20.3969405 21.7191072,20.4718865 21.8537559,20.521427 C21.9884045,20.568427 22.1116208,20.6357514 22.2246748,20.7170486 C22.4736478,20.8567784 22.6743505,21.0460486 22.8750532,21.2378595 C23.0719451,21.4309405 23.2091343,21.6659405 23.3742694,21.8780757 L23.5190802,22.2159676 L23.3094856,22.3315622 L22.1421072,22.9832108 Z" id="Fill-248" fill="#030000"></path>
+                        <path d="M20.4946937,21.4686676 C20.4946937,21.6363432 20.6318829,21.7735324 20.8033694,21.7735324 C20.9672343,21.7735324 21.1044235,21.6363432 21.1044235,21.4686676 C21.1044235,21.3009919 20.9672343,21.165073 20.8033694,21.165073 C20.6318829,21.165073 20.4946937,21.3009919 20.4946937,21.4686676" id="Fill-250" fill="#F0F0ED"></path>
+                        <path d="M14.5180721,29.1200135 C14.5180721,29.1200135 12.9048289,28.5560135 13.1690451,29.0590405 C13.4345316,29.559527 14.5180721,29.1200135 14.5180721,29.1200135" id="Fill-254" fill="#975238"></path>
+                        <path d="M17.5180721,29.1200135 C17.5180721,29.1200135 15.9048289,28.5560135 16.1690451,29.0590405 C16.4345316,29.559527 17.5180721,29.1200135 17.5180721,29.1200135" id="Fill-254" fill="#975238" transform="translate(16.828938, 29.074361) scale(-1, 1) translate(-16.828938, -29.074361) "></path>
+                        <path d="M3.98092617,5.87864054 L6.67898022,8.98318108 C6.67898022,8.98318108 9.77716941,13.3732351 13.9703316,14.2954514 C13.9703316,14.2954514 15.4171752,14.9858523 19.8275478,14.8467486 C19.8275478,14.8467486 16.7903316,13.8127486 15.6623316,12.3557486 C15.6623316,12.3557486 18.6246018,14.4796405 24.086764,14.8467486 C24.086764,14.8467486 25.0580363,14.8106171 25.2845777,14.8383078 C26.6550067,14.4757163 26.6565208,21.3175054 26.6565208,21.3175054 C26.6565208,21.3175054 27.2040072,20.366073 28.001737,19.5975595 C28.001737,19.5975595 29.3240883,12.3836946 28.7664397,10.4223973 C28.1846559,8.37599189 25.4268991,-0.500656757 11.2951424,0.244991892 C11.2951424,0.244991892 3.265764,0.820424324 3.98092617,5.87864054 Z" id="Fill-256" fill="#090000"></path>
+                        <path d="M3.22829103,12.7181568 C1.90848022,10.5917243 1.73572346,6.51288649 4.14796671,5.24642703 C3.37691265,5.29088649 2.64523698,5.69229189 2.19175049,6.56877838 C-0.160790049,11.1379405 1.33812887,18.5347243 1.82337211,19.3731027 C1.82337211,19.3731027 3.04029103,20.0158595 3.53823698,22.5386162 C3.53823698,22.5386162 4.20766941,21.3864811 4.4388586,18.9716973 C4.52523698,18.0723459 4.63320995,17.4143459 4.78437211,16.8579676 C4.50110184,15.6626432 4.0031559,13.9630216 3.22829103,12.7181568" id="Fill-260" fill="#000000"></path>
+                        <g id="Group-264" transform="translate(8.494450, 0.000000)">
+                            <mask id="mask-2" fill="white">
+                                <use xlink:href="#path-1"></use>
+                            </mask>
+                            <g id="Clip-263"></g>
+                            <path d="M0.521954054,0.635727027 C0.0278189189,1.03459189 -0.167802703,1.5299973 0.239954054,2.14226757 C1.74903514,4.38429459 15.6788189,0.723375676 20.181927,10.1132135 C19.429927,7.61713243 16.3177649,-0.470678378 2.80081892,0.244483784" id="Fill-262" fill="#2B101A" mask="url(#mask-2)"></path>
+                        </g>
+                    </g>
+                    <g id="Group-3" transform="translate(51.000000, 44.000000)" stroke="#131212" stroke-width="0.5">
+                        <path d="M8,4.09910182 C8.65287143,3.96696606 9.14931508,3.90089818 9.48933094,3.90089818 C9.82934681,3.90089818 10.3329032,3.96696606 11,4.09910182" id="Line-2"></path>
+                        <circle id="Oval" cx="15" cy="4" r="4"></circle>
+                        <circle id="Oval-Copy" cx="4" cy="4" r="4"></circle>
+                    </g>
+                    <g id="Group-18" transform="translate(25.000000, 67.000000)">
+                        <g id="Group-17" transform="translate(0.267241, 0.000000)">
+                            <polygon id="Fill-1" fill="#E7E7E7" points="20.0085255 31.4497081 51.8103929 31.4497081 51.8103929 6.86570694 20.0085255 6.86570694"></polygon>
+                            <g id="Group-16" transform="translate(0.000000, 0.013570)">
+                                <path d="M37.1346195,9.77801746 C37.0502746,9.94426961 36.6905672,10.0691995 36.3250727,10.0691995 L33.8983324,10.0691995 C33.5328811,10.0691995 33.1731305,9.94426961 33.0887856,9.77801746 L31.7001396,7.04111653 C31.4299595,6.50865439 31.7990818,6.01081718 32.5659595,6.01081718 L37.6574024,6.01081718 C38.4243233,6.01081718 38.7934456,6.50865439 38.5232655,7.04111653 L37.1346195,9.77801746 Z" id="Fill-2" fill="#D5533B"></path>
+                                <path d="M29.2282607,0.963342819 C29.2848793,0.973892258 35.2103338,6.01082593 35.2103338,6.01082593 L27.8396355,10.309394 L26.1458709,3.96476005 L29.2282607,0.963342819 Z" id="Fill-4" fill="#FEFEFE"></path>
+                                <path d="M41.0070341,1.06100083 C40.9504155,1.07155026 35.17733,6.01082593 35.17733,6.01082593 L42.6247723,10.309394 L44.1612917,3.95797514 L41.0070341,1.06100083 Z" id="Fill-6" fill="#FEFEFE"></path>
+                                <polygon id="Fill-8" fill="#D5533B" points="34.602338 47.8698617 35.1870083 47.8698617 35.1880448 47.8698617 39.6841501 47.8698617 39.579248 46.3155485 39.5540698 45.9430351 39.5470734 45.8442819 39.2926568 42.1892296 38.5614518 31.440358 38.5614518 31.4397452 38.5624451 31.3252772 37.7300089 18.7321361 37.1345418 9.6992775 33.0754493 9.6992775 32.4756634 18.7321361 31.6944907 30.4752813 31.6898696 30.551535 31.6862851 30.6069086 31.0853763 39.549506 30.6558782 45.9456178 30.6307431 46.3153734 30.5257547 47.8698617 34.5932255 47.8698617"></polygon>
+                                <g id="Group-12" transform="translate(34.593066, 47.837758)">
+                                    <mask id="mask-4" fill="white">
+                                        <use xlink:href="#path-3"></use>
+                                    </mask>
+                                    <g id="Clip-11"></g>
+                                    <polygon id="Fill-10" fill="#D5533B" mask="url(#mask-4)" points="0.0092723236 0.0935848958 0.000159793187 0.0935848958 0.594979136 0.0935848958 0.59394264 0.0935848958"></polygon>
+                                </g>
+                                <g id="Group-15" transform="translate(0.000000, 3.889058)">
+                                    <mask id="mask-6" fill="white">
+                                        <use xlink:href="#path-5"></use>
+                                    </mask>
+                                    <g id="Clip-14"></g>
+                                    <path d="M61.0287367,6.71971686 C61.0183285,6.6640806 61.0153486,6.65948438 61.0116777,6.63269493 C60.9892187,6.46708454 60.9193493,6.22746319 60.8647896,6.06600418 C60.8484267,6.01758101 60.8334407,5.97618824 60.8215238,5.94593083 C59.7835159,4.76807065 49.7957507,0.348993826 44.0649192,0.0986963488 L41.3334922,14.3795288 L39.1128851,25.9986196 L37.5324009,34.2673662 L35.6971546,41.1720397 L35.4996588,42.1802771 L35.0451552,43.0982096 L34.8560378,42.4545188 L34.6506387,42.0568793 L31.740157,26.8289174 L31.694508,26.5917082 L29.4510548,14.8539909 L26.2422349,0.0284834852 C26.2276375,0.0290525421 26.1219149,0.0364065079 26.1072744,0.0375883952 C25.0885712,0.0856080407 24.4095366,0.30036135 23.1976996,0.587428657 C23.1748967,0.592769037 23.152612,0.598722247 23.1304137,0.604018853 C22.8629976,0.668103412 22.592688,0.736871747 22.3200031,0.809798574 C16.891699,2.26347625 10.6611035,5.3706581 9.85362962,6.28635816 L9.65112415,6.76585424 L2.15858911,34.9756868 L11.5359496,43.9924606 L11.7089149,43.440563 L16.4875086,30.1247197 L18.7319119,24.3330339 C18.9373109,25.9871509 19.0923967,28.0393013 19.205893,30.290753 C19.3720347,33.5853296 19.4510244,37.3069178 19.4732659,40.8327942 C19.4803054,41.9104128 19.4820329,42.9692526 19.4795712,43.9924606 L34.925483,43.9745134 L34.925483,43.9924606 L51.3767963,43.9924606 C51.3713979,42.8599937 51.3711387,41.6757863 51.3774009,40.4644831 C51.3949782,36.9504694 51.4674897,33.21286 51.6266783,29.877355 C51.7355536,27.5966189 51.8852409,25.5041967 52.0859757,23.7996525 L54.3072306,29.5316311 L59.0858243,42.8474744 L59.4237221,43.9924606 L68.392888,34.6276065 L61.0287367,6.71971686 Z" id="Fill-13" fill="#252925" mask="url(#mask-6)"></path>
+                                </g>
+                            </g>
+                        </g>
+                    </g>
+                    <g id="Group-4" transform="translate(23.000000, 97.000000)">
+                        <rect id="Rectangle" fill="#7A7777" x="7.87942981" y="24" width="59" height="2"></rect>
+                        <path d="M2.76164854,0 L72.5425002,0 C73.6470697,-6.64219967e-15 74.5425002,0.8954305 74.5425002,2 C74.5425002,2.22727853 74.5037605,2.45289436 74.4279455,2.66715499 L66.8794298,24 L66.8794298,24 L7.87942981,24 L0.861437531,2.62385747 C0.516890566,1.57439991 1.08833351,0.444335962 2.13779107,0.099788996 C2.33914319,0.0336831664 2.54972247,4.83019397e-16 2.76164854,0 Z" id="Rectangle-Copy-4" fill="#8F8F8F"></path>
+                    </g>
+                    <path d="M61.3955804,49.0885185 L61.5049996,49 C60.990031,50.331556 61.2418935,51.8882582 61.9285549,53.5782151 L62,54 L61.6452742,53.7273626 C60.8637894,51.9621454 60.8426755,50.7349415 61.3116143,49.322306 L61.3955804,49.0885185 Z" id="Path-3" fill="#975238" fill-rule="nonzero"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_back_black.svg b/src/assets/imgs/ic_back_black.svg
new file mode 100644
index 000000000..5df98666c
--- /dev/null
+++ b/src/assets/imgs/ic_back_black.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" class="s-ion-icon">
+<path fill="black" d="M284.9 412.6l138.1-134c6-5.8 9-13.7 9-22.4v-.4c0-8.7-3-16.6-9-22.4l-138.1-134c-12-12.5-31.3-12.5-43.2 0-11.9 12.5-11.9 32.7 0 45.2l83 79.4h-214c-17 0-30.7 14.3-30.7 32 0 18 13.7 32 30.6 32h214l-83 79.4c-11.9 12.5-11.9 32.7 0 45.2 12 12.5 31.3 12.5 43.3 0z">
+</path>
+</svg>
diff --git a/src/assets/imgs/ic_burger_menu.png b/src/assets/imgs/ic_burger_menu.png
deleted file mode 100644
index 4e7ee4ede..000000000
Binary files a/src/assets/imgs/ic_burger_menu.png and /dev/null differ
diff --git a/src/assets/imgs/ic_burger_menu.svg b/src/assets/imgs/ic_burger_menu.svg
new file mode 100644
index 000000000..db2054e31
--- /dev/null
+++ b/src/assets/imgs/ic_burger_menu.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="19px" viewBox="0 0 24 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>A7666628-9C81-4C60-B950-78508E3EFA89</title>
+    <g id="Final-layouts" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
+        <g id="Home-page-01" transform="translate(-23.000000, -39.000000)" stroke="#333333" stroke-width="3">
+            <g id="Group-13" transform="translate(24.000000, 40.000000)">
+                <line x1="0.75" y1="0.75" x2="20.75" y2="0.75" id="Stroke-7"></line>
+                <line x1="0.75" y1="8.25" x2="11.75" y2="8.25" id="Stroke-9"></line>
+                <line x1="0.75" y1="15.75" x2="20.75" y2="15.75" id="Stroke-11"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_businessman.png b/src/assets/imgs/ic_businessman.png
deleted file mode 100644
index 39e05adff..000000000
Binary files a/src/assets/imgs/ic_businessman.png and /dev/null differ
diff --git a/src/assets/imgs/ic_chat.svg b/src/assets/imgs/ic_chat.svg
new file mode 100644
index 000000000..26e9e0fd8
--- /dev/null
+++ b/src/assets/imgs/ic_chat.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 19.5"><defs><style>.cls-1{fill:none;stroke:#024F9D;stroke-linecap:round;stroke-linejoin:round;stroke-width:1.5px;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M14.25,6.25v8.5a1,1,0,0,1-1,1h-5l-4.5,3v-3h-2a1,1,0,0,1-1-1V6.25a1,1,0,0,1,1-1h11.5A1,1,0,0,1,14.25,6.25Z"/><path class="cls-1" d="M20.25,1.75v8.5a1,1,0,0,1-1,1h-2v3l-3-2v-6a1,1,0,0,0-1-1H6.75V1.75a1,1,0,0,1,1-1h11.5A1,1,0,0,1,20.25,1.75Z"/><line class="cls-1" x1="3.75" y1="9.75" x2="11.25" y2="9.75"/><line class="cls-1" x1="3.75" y1="12.75" x2="8.25" y2="12.75"/></g></g></svg>
diff --git a/src/assets/imgs/ic_check_white.svg b/src/assets/imgs/ic_check_white.svg
new file mode 100644
index 000000000..3f6b05914
--- /dev/null
+++ b/src/assets/imgs/ic_check_white.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 63.1 (101010) - https://sketch.com -->
+    <title>1870815B-55E9-47CE-BD28-28A80EB67295</title>
+    <desc>Created with sketchtool.</desc>
+    <g id="Onboarding-FTUE-01" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="User-Role-Selection" transform="translate(-148.000000, -358.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="check" transform="translate(148.000000, 358.000000)">
+                <path d="M8,0 C3.58,0 0,3.58 0,8 C0,12.416 3.58,16 8,16 C12.416,16 16,12.416 16,8 C16,3.58 12.416,0 8,0 Z M6.4,12 L2.4,8 L3.532,6.868 L6.4,9.736 L12.468,3.668 L13.6,4.8 L6.4,12 Z" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/assets/imgs/ic_close.svg b/src/assets/imgs/ic_close.svg
new file mode 100644
index 000000000..03d4374bf
--- /dev/null
+++ b/src/assets/imgs/ic_close.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>6AD71132-BFA6-49DD-8EF1-72FB2B667D7E</title>
+    <g id="Page-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Notify_Thankyou" transform="translate(-320.000000, -37.000000)">
+            <g id="Group-3" transform="translate(320.000000, 37.000000)">
+                <circle id="Oval" fill="#FFFFFF" cx="12" cy="12" r="12"></circle>
+                <path d="M12,0 C5.364,0 0,5.364 0,12 C0,18.636 5.364,24 12,24 C18.636,24 24,18.636 24,12 C24,5.364 18.636,0 12,0 L12,0 Z M18,16.308 L16.308,18 L12,13.692 L7.692,18 L6,16.308 L10.308,12 L6,7.692 L7.692,6 L12,10.308 L16.308,6 L18,7.692 L13.692,12 L18,16.308 L18,16.308 Z" id="Shape" fill="#024F9D"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_coming_soon.png b/src/assets/imgs/ic_coming_soon.png
index 24e411dd5..72a8f1f91 100644
Binary files a/src/assets/imgs/ic_coming_soon.png and b/src/assets/imgs/ic_coming_soon.png differ
diff --git a/src/assets/imgs/ic_course_admin.svg b/src/assets/imgs/ic_course_admin.svg
new file mode 100644
index 000000000..a9d17f8da
--- /dev/null
+++ b/src/assets/imgs/ic_course_admin.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="45.424" height="33.715" viewBox="0 0 45.424 33.715">
+  <path id="ic_school_24px" data-name="ic school 24px" d="M297.7,402.936l-21.554,11.757L297.7,426.449l8.49-4.632,9.145-4.989v13.54h3.919V414.693ZM284,419.619v7.838l13.716,7.485,13.716-7.485v-7.838L297.719,427.1Z" transform="translate(-274.581 -402.082)" fill="none" stroke="#00408c" stroke-width="1.5"/>
+</svg>
diff --git a/src/assets/imgs/ic_courses1.png b/src/assets/imgs/ic_courses1.png
deleted file mode 100644
index 2ad5ea4a3..000000000
Binary files a/src/assets/imgs/ic_courses1.png and /dev/null differ
diff --git a/src/assets/imgs/ic_courses_selected.png b/src/assets/imgs/ic_courses_selected.png
deleted file mode 100644
index e01cd0473..000000000
Binary files a/src/assets/imgs/ic_courses_selected.png and /dev/null differ
diff --git a/src/assets/imgs/ic_courses_selected_joyful.svg b/src/assets/imgs/ic_courses_selected_joyful.svg
new file mode 100644
index 000000000..682381c4c
--- /dev/null
+++ b/src/assets/imgs/ic_courses_selected_joyful.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>476A6C34-DF16-42F6-9BF9-D660E79C127C</title>
+    <g id="Course" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Course--Landing-Logged-in-user-screen" transform="translate(-96.000000, -748.000000)">
+            <g id="Group-9-Copy-8" transform="translate(0.000000, 714.000000)">
+                <g id="courses" transform="translate(96.000000, 34.000000)">
+                    <rect id="Rectangle" x="0" y="0" width="24" height="24"></rect>
+                    <g id="Group-7" transform="translate(0.000000, 3.000000)" stroke="#004EA3" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5">
+                        <polygon id="Stroke-1" points="23.25 7.25 18.429 10.034 12 13.75 5.571 10.034 0.75 7.25 12 0.75"></polygon>
+                        <path d="M18.4287,10.5 L18.4287,17 C16.3177,17.531 14.1637,17.802 11.9997,17.802 C9.8357,17.802 7.6817,17.531 5.5717,17 L5.5717,10.5" id="Stroke-3"></path>
+                        <line x1="21.6431" y1="8.25" x2="21.6431" y2="14.75" id="Stroke-5"></line>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_dowload.png b/src/assets/imgs/ic_dowload.png
deleted file mode 100644
index b3941a3a5..000000000
Binary files a/src/assets/imgs/ic_dowload.png and /dev/null differ
diff --git a/src/assets/imgs/ic_download_selected.png b/src/assets/imgs/ic_download_selected.png
deleted file mode 100644
index 7cd9e9529..000000000
Binary files a/src/assets/imgs/ic_download_selected.png and /dev/null differ
diff --git a/src/assets/imgs/ic_download_selected_joyful.svg b/src/assets/imgs/ic_download_selected_joyful.svg
new file mode 100644
index 000000000..02e9a53b9
--- /dev/null
+++ b/src/assets/imgs/ic_download_selected_joyful.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>F5B85E5E-6611-4263-BC58-19DD58C82329</title>
+    <g id="Textbook" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g transform="translate(-240.000000, -892.000000)" id="Group-9-Copy-8">
+            <g transform="translate(0.000000, 858.000000)">
+                <g id="downloads" transform="translate(240.000000, 34.000000)">
+                    <rect id="Rectangle" x="0" y="0" width="24" height="24"></rect>
+                    <g id="Group-7" transform="translate(3.000000, 2.000000)" stroke="#004EA3" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5">
+                        <g id="Group-5" transform="translate(0.000000, 0.500000)">
+                            <polyline id="Stroke-1" points="0.75 13.75 0.75 18.25 18.75 18.25 18.75 13.75"></polyline>
+                            <line x1="9.75" y1="0.25" x2="9.75" y2="13.75" id="Stroke-3"></line>
+                        </g>
+                        <polyline id="Stroke-6" points="15.0532 9.75 9.7502 15.053 4.4472 9.75"></polyline>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_group_add_blue.svg b/src/assets/imgs/ic_group_add_blue.svg
new file mode 100644
index 000000000..c5377eba1
--- /dev/null
+++ b/src/assets/imgs/ic_group_add_blue.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="25px" viewBox="0 0 24 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>86D1DFBA-64E5-4CDC-AFD9-6CDB2BA53339</title>
+    <g id="Home-Schooling-V3" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="My-group-default" transform="translate(-280.000000, -36.000000)" fill="#024F9D" fill-rule="nonzero">
+            <g id="icon/group" transform="translate(280.000000, 36.500000)">
+                <path d="M11.9999999,16.6235245 C13.9143486,16.6235245 15.6492145,17.27697 16.9129511,18.4061171 C17.6647175,17.8279723 18.6710636,17.5155024 19.7766269,17.5155024 C22.0384495,17.5155024 23.8849964,18.823353 23.9948313,21.0294361 L24,21.2388754 L18.7236043,21.2385939 C18.8735549,21.735587 18.9655292,22.2637387 18.9920221,22.8184748 L18.9999999,23.1544701 L4.99999993,23.1544701 C4.99999993,22.4762457 5.09645489,21.8349856 5.27639559,21.2385939 L-5.837137e-08,21.2388754 C-5.837137e-08,18.9063709 1.89086848,17.5155024 4.22337303,17.5155024 C5.32893632,17.5155024 6.33528246,17.8279723 7.08809176,18.4050763 C8.35078537,17.27697 10.0856512,16.6235245 11.9999999,16.6235245 Z M19.8204514,12.0081735 C21.1394805,12.0081735 22.2087649,13.0774578 22.2087649,14.3964869 C22.2087649,15.715516 21.1394805,16.7848004 19.8204514,16.7848004 C18.5014223,16.7848004 17.432138,15.715516 17.432138,14.3964869 C17.432138,13.0774578 18.5014223,12.0081735 19.8204514,12.0081735 Z M4.17954849,12.0081735 C5.49857759,12.0081735 6.56786194,13.0774578 6.56786194,14.3964869 C6.56786194,15.715516 5.49857759,16.7848004 4.17954849,16.7848004 C2.86051939,16.7848004 1.79123503,15.715516 1.79123503,14.3964869 C1.79123503,13.0774578 2.86051939,12.0081735 4.17954849,12.0081735 Z M11.9999999,8.44674618 C13.9624078,8.44674618 15.5532538,10.0375921 15.5532538,12 C15.5532538,13.9624079 13.9624078,15.5532538 11.9999999,15.5532538 C10.037592,15.5532538 8.44674611,13.9624079 8.44674611,12 C8.44674611,10.0375921 10.037592,8.44674618 11.9999999,8.44674618 Z M6.03274577,1.31028952 L6.03226731,3.90928952 L8.63272397,3.91026772 L8.63272397,5.84676797 L6.03226731,5.84628952 L6.03274577,8.44674618 L4.09624552,8.44674618 L4.09526731,5.84628952 L1.49626731,5.84676797 L1.49626731,3.91026772 L4.09526731,3.90928952 L4.09624552,1.31028952 L6.03274577,1.31028952 Z" id="Combined-Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_group_add_white.svg b/src/assets/imgs/ic_group_add_white.svg
new file mode 100644
index 000000000..443cf0c51
--- /dev/null
+++ b/src/assets/imgs/ic_group_add_white.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>CB92D5EC-2341-48AE-9223-F84AF1E7FFB9</title>
+    <g id="Home-Schooling-V3" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="My-group-default" transform="translate(-114.000000, -572.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="Group-5" transform="translate(16.000000, 560.000000)">
+                <g id="icon/group-white" transform="translate(98.000000, 12.000000)">
+                    <path d="M12,16.6235245 C13.9143487,16.6235245 15.6492146,17.27697 16.9129512,18.4061171 C17.6647175,17.8279723 18.6710637,17.5155024 19.776627,17.5155024 C22.0384496,17.5155024 23.8849964,18.823353 23.9948314,21.0294361 L24.0000001,21.2388754 L18.7236043,21.2385939 C18.8735549,21.735587 18.9655293,22.2637387 18.9920221,22.8184748 L19,23.1544701 L4.99999999,23.1544701 C4.99999999,22.4762457 5.09645495,21.8349856 5.27639565,21.2385939 L3.80850906e-11,21.2388754 C3.80850906e-11,18.9063709 1.89086854,17.5155024 4.22337309,17.5155024 C5.32893637,17.5155024 6.33528252,17.8279723 7.08809182,18.4050763 C8.35078543,17.27697 10.0856513,16.6235245 12,16.6235245 Z M19.8204515,12.0081735 C21.1394806,12.0081735 22.208765,13.0774578 22.208765,14.3964869 C22.208765,15.715516 21.1394806,16.7848004 19.8204515,16.7848004 C18.5014224,16.7848004 17.432138,15.715516 17.432138,14.3964869 C17.432138,13.0774578 18.5014224,12.0081735 19.8204515,12.0081735 Z M4.17954855,12.0081735 C5.49857765,12.0081735 6.567862,13.0774578 6.567862,14.3964869 C6.567862,15.715516 5.49857765,16.7848004 4.17954855,16.7848004 C2.86051945,16.7848004 1.79123509,15.715516 1.79123509,14.3964869 C1.79123509,13.0774578 2.86051945,12.0081735 4.17954855,12.0081735 Z M12,8.44674618 C13.9624079,8.44674618 15.5532538,10.0375921 15.5532538,12 C15.5532538,13.9624079 13.9624079,15.5532538 12,15.5532538 C10.0375921,15.5532538 8.44674617,13.9624079 8.44674617,12 C8.44674617,10.0375921 10.0375921,8.44674618 12,8.44674618 Z M6.03274583,1.31028952 L6.03226737,3.90928952 L8.63272403,3.91026772 L8.63272403,5.84676797 L6.03226737,5.84628952 L6.03274583,8.44674618 L4.09624558,8.44674618 L4.09526737,5.84628952 L1.49626737,5.84676797 L1.49626737,3.91026772 L4.09526737,3.90928952 L4.09624558,1.31028952 L6.03274583,1.31028952 Z" id="Combined-Shape"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_import.png b/src/assets/imgs/ic_import.png
new file mode 100644
index 000000000..03e0bebe2
Binary files /dev/null and b/src/assets/imgs/ic_import.png differ
diff --git a/src/assets/imgs/ic_info_circle.svg b/src/assets/imgs/ic_info_circle.svg
new file mode 100644
index 000000000..589c1ed0f
--- /dev/null
+++ b/src/assets/imgs/ic_info_circle.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>info icon</title>
+    <g id="Page-2" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Library_landing-page" transform="translate(-320.000000, -37.000000)" fill="#024F9D">
+            <path d="M333.2,55 L333.2,47.8 L330.8,47.8 L330.8,55 L333.2,55 Z M320,49 C320,55.624 325.376,61 332,61 C338.624,61 344,55.624 344,49 C344,42.376 338.624,37 332,37 C325.376,37 320,42.376 320,49 Z M322.4,49 C322.4,43.708 326.708,39.4 332,39.4 C337.292,39.4 341.6,43.708 341.6,49 C341.6,54.292 337.292,58.6 332,58.6 C326.708,58.6 322.4,54.292 322.4,49 Z M333.2,45.4 L333.2,43 L330.8,43 L330.8,45.4 L333.2,45.4 Z" id="info-icon"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_info_white.svg b/src/assets/imgs/ic_info_white.svg
new file mode 100644
index 000000000..dbbc55a3f
--- /dev/null
+++ b/src/assets/imgs/ic_info_white.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 63.1 (101010) - https://sketch.com -->
+    <title>D834C996-CD65-4BBF-A589-93BA3594CE9C</title>
+    <desc>Created with sketchtool.</desc>
+    <g id="Course-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Course--Landing-Logged-in-user-screen" transform="translate(-8.000000, -217.000000)" fill="#FFFFFF">
+            <g id="Group-13" transform="translate(8.000000, 90.000000)">
+                <g id="Group-4-Copy-9" transform="translate(0.000000, 32.000000)">
+                    <g id="Group-Copy" transform="translate(0.000000, 92.000000)">
+                        <g id="ic_info" transform="translate(0.000000, 3.000000)">
+                            <path d="M6,0.166666667 C2.78,0.166666667 0.166666667,2.78 0.166666667,6 C0.166666667,9.22 2.78,11.8333333 6,11.8333333 C9.22,11.8333333 11.8333333,9.22 11.8333333,6 C11.8333333,2.78 9.22,0.166666667 6,0.166666667 L6,0.166666667 Z M6.58333333,8.91666667 L5.41666667,8.91666667 L5.41666667,5.41666667 L6.58333333,5.41666667 L6.58333333,8.91666667 L6.58333333,8.91666667 Z M6.58333333,4.25 L5.41666667,4.25 L5.41666667,3.08333333 L6.58333333,3.08333333 L6.58333333,4.25 L6.58333333,4.25 Z" id="Mask"></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/assets/imgs/ic_library.png b/src/assets/imgs/ic_library.png
deleted file mode 100644
index 2d5837379..000000000
Binary files a/src/assets/imgs/ic_library.png and /dev/null differ
diff --git a/src/assets/imgs/ic_library_selected.png b/src/assets/imgs/ic_library_selected.png
deleted file mode 100644
index 2b486855e..000000000
Binary files a/src/assets/imgs/ic_library_selected.png and /dev/null differ
diff --git a/src/assets/imgs/ic_maintenance.svg b/src/assets/imgs/ic_maintenance.svg
new file mode 100644
index 000000000..472fcce29
--- /dev/null
+++ b/src/assets/imgs/ic_maintenance.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1069 591.29"><defs><style>.cls-1,.cls-7{fill:#fff;}.cls-1,.cls-21,.cls-22,.cls-24{fill-rule:evenodd;}.cls-17,.cls-18,.cls-2,.cls-3,.cls-4{fill:none;}.cls-2{opacity:0.08;}.cls-17,.cls-3,.cls-4{stroke:#cadcea;}.cls-17,.cls-18,.cls-3,.cls-4,.cls-6{stroke-miterlimit:10;}.cls-3{stroke-dasharray:300 600;}.cls-4{stroke-dasharray:600 200;}.cls-5,.cls-6{fill:#cadcea;}.cls-18,.cls-6{stroke:#0c519b;}.cls-6{opacity:0.41;}.cls-21,.cls-8{fill:#e55a28;}.cls-9{fill:#a03e20;}.cls-10{fill:#239e6f;}.cls-11{fill:#20bb83;}.cls-12{fill:#36ce94;}.cls-13{opacity:0.43;}.cls-14{clip-path:url(#clip-path);}.cls-15{fill:#e89074;}.cls-16{clip-path:url(#clip-path-2);}.cls-17{stroke-linecap:round;stroke-width:4px;}.cls-19{fill:#0c519b;}.cls-20{mask:url(#mask);}.cls-22,.cls-25{fill:#024f9d;}.cls-23{mask:url(#mask-2-2);}.cls-24{fill:#008840;}.cls-26{mask:url(#mask-3);}</style><clipPath id="clip-path"><path class="cls-2" d="M34.52,574.55a14.29,14.29,0,0,1,4.13-2.78c.33-.18,1-.64,1.32-.43s.05.42-.21.9a18.65,18.65,0,0,1-1.49,2.25c-.63.84-1.54,2.13-1.14,3.24s2.08,1.28,3.13.87c2.86-1.11,4.52-4.16,7.11-5.71.14-.09.66-.28.71-.38.27,0,.22-.11-.16-.16-.31-.22-.42-.15-.33.22-.54.72-.87,1.71-1.42,2.47a7.52,7.52,0,0,0-1.83,3.79A1.34,1.34,0,0,0,45,580c2.23,1.41,4.61-.51,6.06-2.08,1.05-1.13,2.24-2.08,3.38-3.12.46-.41,2.24-2.63,2.82-2.43l-.79-.61c.75,1.16-1.13,2.86-1.71,3.71s-1.55,2.43-1.16,3.59a2.38,2.38,0,0,0,3,1.21c1.69-.45,3.06-2.15,4.93-1.5,1.6.56,2.3-2,.7-2.54a5,5,0,0,0-3.66.18,20,20,0,0,0-1.79.91,3.06,3.06,0,0,1-.58.27c-.48.09-.43.29.14.58.19-.12.32-.76.45-1,1.12-1.91,3.2-3.68,2.3-6.19-2-5.65-10.67,8-12.73,6.71l.66,1.14c0-.78,1-1.83,1.47-2.46a9.08,9.08,0,0,0,1.68-3.1c.34-1.45,0-3.31-1.79-3.43s-3.21,1.36-4.39,2.32c-1.53,1.26-3.23,4-5.43,4l1.14.66c-.1.61-.08.71.08.32.1-.22.21-.43.32-.65.24-.39.61-.79.88-1.17a16.05,16.05,0,0,0,1.48-2.41c.62-1.31.68-3.24-.86-4a4.86,4.86,0,0,0-4.25.56,17.37,17.37,0,0,0-4.66,3.19c-1.12,1.27.74,3.15,1.87,1.87Z"/></clipPath><clipPath id="clip-path-2"><path class="cls-2" d="M1017.52,574.55a14.29,14.29,0,0,1,4.13-2.78c.33-.18,1-.64,1.32-.43s0,.42-.21.9a18.65,18.65,0,0,1-1.49,2.25c-.63.84-1.54,2.13-1.14,3.24s2.08,1.28,3.13.87c2.86-1.11,4.52-4.16,7.11-5.71.14-.09.66-.28.71-.38.27,0,.22-.11-.16-.16-.31-.22-.42-.15-.33.22-.54.72-.87,1.71-1.42,2.47a7.52,7.52,0,0,0-1.83,3.79A1.34,1.34,0,0,0,1028,580c2.23,1.41,4.61-.51,6.06-2.08,1-1.13,2.24-2.08,3.38-3.12.46-.41,2.24-2.63,2.82-2.43l-.79-.61c.75,1.16-1.13,2.86-1.71,3.71s-1.55,2.43-1.16,3.59a2.38,2.38,0,0,0,3,1.21c1.69-.45,3.06-2.15,4.93-1.5,1.6.56,2.3-2,.7-2.54a5,5,0,0,0-3.66.18,20,20,0,0,0-1.79.91,3.06,3.06,0,0,1-.58.27c-.48.09-.43.29.14.58.19-.12.32-.76.45-1,1.12-1.91,3.2-3.68,2.3-6.19-2-5.65-10.67,8-12.73,6.71l.66,1.14c0-.78,1-1.83,1.47-2.46a9.08,9.08,0,0,0,1.68-3.1c.34-1.45,0-3.31-1.79-3.43s-3.21,1.36-4.39,2.32c-1.53,1.26-3.23,4-5.43,4l1.14.66c-.1.61-.08.71.08.32.1-.22.21-.43.32-.65.24-.39.61-.79.88-1.17a16.05,16.05,0,0,0,1.48-2.41c.62-1.31.68-3.24-.86-4a4.86,4.86,0,0,0-4.25.56,17.37,17.37,0,0,0-4.66,3.19c-1.12,1.27.74,3.15,1.87,1.87Z"/></clipPath><mask id="mask" x="536.41" y="0" width="18.12" height="18.44" maskUnits="userSpaceOnUse"><g id="mask-2"><polygon id="path-1" class="cls-1" points="536.41 0 554.52 0 554.52 18.44 536.41 18.44 536.41 0"/></g></mask><mask id="mask-2-2" x="498.12" y="43.98" width="41.53" height="55.08" maskUnits="userSpaceOnUse"><g id="mask-4"><polygon id="path-3" class="cls-1" points="498.12 43.98 539.65 43.98 539.65 99.05 498.12 99.05 498.12 43.98"/></g></mask><mask id="mask-3" x="498.12" y="0" width="93.51" height="150.97" maskUnits="userSpaceOnUse"><g id="mask-6"><polygon id="path-5" class="cls-1" points="498.12 150.97 591.63 150.97 591.63 0 498.12 0 498.12 150.97"/></g></mask></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path id="circle2" class="cls-3" d="M216.79,589.29c0-174.53,141.48-316,316-316s316,141.47,316,316"/><path id="circle1" class="cls-4" d="M110.9,589.29c0-233,188.88-421.9,421.89-421.9s421.89,188.89,421.89,421.9"/><g id="desktop"><path class="cls-5" d="M557.21,555.78c-1.11,14.06,10.57,22.75,10.57,22.75H500.86s11.68-8.69,10.57-22.75Z"/><path class="cls-6" d="M670.8,346.45H395.38a17.73,17.73,0,0,0-17.73,17.73v174a17.73,17.73,0,0,0,17.73,17.73H670.8a17.72,17.72,0,0,0,17.72-17.73v-174A17.72,17.72,0,0,0,670.8,346.45Z"/><path class="cls-7" d="M672.06,357.63H394.11a4.69,4.69,0,0,0-4.7,4.69V536.16a4.69,4.69,0,0,0,4.7,4.69H672.06a4.69,4.69,0,0,0,4.69-4.69V362.32A4.69,4.69,0,0,0,672.06,357.63Z"/><rect class="cls-6" x="454.26" y="578.53" width="157.63" height="9.93" rx="4.47"/></g><g id="plant2"><ellipse class="cls-8" cx="48.48" cy="563.22" rx="16.26" ry="2.93"/><ellipse class="cls-9" cx="48.48" cy="563.22" rx="12.8" ry="2.3"/><path class="cls-8" d="M32,564.6s2.37,7.74,3.78,13.18a6.54,6.54,0,0,0,6.33,4.91H54.52A6.56,6.56,0,0,0,60.8,578l3.94-13.39S48.48,569.55,32,564.6Z"/><path class="cls-10" d="M47.86,544.79c.79,2.47,1.59,5.54,2.14,7.73,1.66,6.55.85,10.53-.27,10.9s-3.11-3.11-5.34-8.45c-1-2.5-2.92-5.23-3.94-8.38s-1.08-6.49-1.7-9.18c-1.26-5.52.81-13.88,1.81-14.21s1.21,7.55,3.34,12.53C45,538.36,46.76,541.38,47.86,544.79Z"/><path class="cls-11" d="M52.19,538.85c.18,3.54.17,7.88.16,10.95C52.3,559,50.17,564,48.78,564.06s-2.64-5.21-3.61-13.06c-.45-3.67-1.8-8-2-12.47s.69-8.94.78-12.7c.19-7.75,5.07-18,6.32-18.07s-.87,10.38.09,17.72C50.85,529.35,51.94,534,52.19,538.85Z"/><path class="cls-12" d="M55.76,546.94c-.5,2.51-1.26,5.55-1.82,7.7-1.66,6.46-4,9.56-5,9.37s-.89-4.11-.17-9.77c.33-2.65.16-5.89.8-9.09s2-6.14,2.78-8.76C53.88,531,59,524.66,59.9,524.83s-2.42,7.12-3,12.43C56.52,540.06,56.46,543.47,55.76,546.94Z"/><g class="cls-13"><g class="cls-14"><path class="cls-8" d="M32,564.6s2.37,7.74,3.78,13.18a6.54,6.54,0,0,0,6.33,4.91H54.52A6.56,6.56,0,0,0,60.8,578l3.94-13.39S48.48,569.55,32,564.6Z"/><path class="cls-15" d="M32,564.63s2.37,7.74,3.78,13.18a6.54,6.54,0,0,0,6.33,4.91H54.5a6.56,6.56,0,0,0,6.28-4.7l3.94-13.39S48.46,569.58,32,564.63Z"/></g></g></g><g id="plant1"><ellipse class="cls-8" cx="1031.48" cy="563.22" rx="16.26" ry="2.93"/><ellipse class="cls-9" cx="1031.48" cy="563.22" rx="12.8" ry="2.3"/><path class="cls-8" d="M1015,564.6s2.37,7.74,3.78,13.18a6.54,6.54,0,0,0,6.33,4.91h12.41a6.56,6.56,0,0,0,6.28-4.7l3.94-13.39S1031.48,569.55,1015,564.6Z"/><path class="cls-10" d="M1030.86,544.79c.79,2.47,1.59,5.54,2.14,7.73,1.66,6.55.85,10.53-.27,10.9s-3.11-3.11-5.34-8.45c-1-2.5-2.92-5.23-3.94-8.38s-1.08-6.49-1.7-9.18c-1.26-5.52.81-13.88,1.81-14.21s1.21,7.55,3.34,12.53C1028,538.36,1029.76,541.38,1030.86,544.79Z"/><path class="cls-11" d="M1035.19,538.85c.18,3.54.17,7.88.16,10.95,0,9.23-2.18,14.19-3.57,14.26s-2.64-5.21-3.61-13.06c-.45-3.67-1.8-8-2-12.47s.69-8.94.78-12.7c.19-7.75,5.07-18,6.32-18.07s-.87,10.38.09,17.72C1033.85,529.35,1034.94,534,1035.19,538.85Z"/><path class="cls-12" d="M1038.76,546.94c-.5,2.51-1.26,5.55-1.82,7.7-1.66,6.46-4,9.56-5,9.37s-.89-4.11-.17-9.77c.33-2.65.16-5.89.8-9.09s2.05-6.14,2.78-8.76c1.49-5.39,6.65-11.73,7.51-11.56s-2.42,7.12-3.05,12.43C1039.52,540.06,1039.46,543.47,1038.76,546.94Z"/><g class="cls-13"><g class="cls-16"><path class="cls-8" d="M1015,564.6s2.37,7.74,3.78,13.18a6.54,6.54,0,0,0,6.33,4.91h12.41a6.56,6.56,0,0,0,6.28-4.7l3.94-13.39S1031.48,569.55,1015,564.6Z"/><path class="cls-15" d="M1015,564.63s2.37,7.74,3.78,13.18a6.54,6.54,0,0,0,6.33,4.91h12.41a6.56,6.56,0,0,0,6.28-4.7l3.94-13.39S1031.46,569.58,1015,564.63Z"/></g></g></g><line id="baseline" class="cls-17" x1="1067" y1="589.29" x2="2" y2="589.29"/><g id="crane"><rect class="cls-5" x="291.95" y="239.99" width="19.86" height="339.7" transform="translate(603.76 819.69) rotate(180)"/><rect class="cls-5" x="284.41" y="582.44" width="34.24" height="6.16" transform="translate(603.07 1171.04) rotate(180)"/><rect class="cls-5" x="284.41" y="231.09" width="34.24" height="6.16" transform="translate(603.07 468.34) rotate(180)"/><line class="cls-17" x1="143" y1="230.06" x2="774" y2="230.06"/><polyline class="cls-5" points="157.61 230.06 157.61 300.26 174 300.26 174 231.09"/></g><g id="lift"><polyline class="cls-18" points="730.61 230.06 730.61 300.26 747 300.26 747 231.09"/><polygon class="cls-18" points="730.91 304.03 746.66 304.03 739.13 312.25 730.91 304.03"/><circle class="cls-18" cx="739.13" cy="315.67" r="2.74"/><line class="cls-18" x1="739.13" y1="318.41" x2="739.13" y2="350.34"/><path class="cls-19" d="M723.37,366.22a15.76,15.76,0,1,1,31.51,0"/><rect class="cls-19" x="723.37" y="368.22" width="31.5" height="4.11"/></g><g id="logo"><g id="Artboard"><g id="Group"><g id="Group-3"><g id="Fill-1-Clipped"><g class="cls-20"><path id="Fill-1" class="cls-21" d="M545.46,0a9.14,9.14,0,0,1,9.06,9.22,9.06,9.06,0,1,1-18.11,0A9.14,9.14,0,0,1,545.46,0"/></g></g></g><path id="Fill-4" class="cls-22" d="M572.06,5.89a4.32,4.32,0,0,0-4.29,4.36V43.57l-.17.1c-.89.51-1.76,1-2.63,1.56-1.74,1.08-3.45,2.22-5.12,3.47A39.73,39.73,0,0,0,555,52.92a37.45,37.45,0,0,0-4,5c-.44.66-.86,1.33-1.27,2V32.29a4.29,4.29,0,1,0-8.57,0V60c-.41-.69-.83-1.37-1.28-2a37.38,37.38,0,0,0-4-5A40.53,40.53,0,0,0,531,48.71c-1.67-1.26-3.38-2.4-5.12-3.47-.87-.54-1.75-1.06-2.64-1.57l-.16-.09V10.26a4.29,4.29,0,1,0-8.57,0V46.18a4.36,4.36,0,0,0,2.58,4c.75.34,1.63.76,2.43,1.17s1.64.83,2.44,1.28c1.61.88,3.18,1.82,4.66,2.82a33,33,0,0,1,4,3.15,31.44,31.44,0,0,1,3.35,3.85,39.57,39.57,0,0,1,5.11,9.22,32.88,32.88,0,0,1,1.48,5,27.24,27.24,0,0,1,.53,4.6v.13a4.28,4.28,0,1,0,8.56,0v-.43a28.19,28.19,0,0,1,.51-4.3,34.12,34.12,0,0,1,1.49-5,39.94,39.94,0,0,1,5.11-9.22,30.69,30.69,0,0,1,3.36-3.85,32.13,32.13,0,0,1,4-3.15c1.48-1,3-1.93,4.66-2.82.8-.44,1.62-.86,2.44-1.28s1.68-.83,2.42-1.16a4.35,4.35,0,0,0,2.59-4V10.25a4.32,4.32,0,0,0-4.28-4.36Z"/><g id="Group-8"><g id="Fill-6-Clipped"><g class="cls-23"><path id="Fill-6" class="cls-24" d="M523.13,73.79c-5.37-4.18-12.47-7.2-16.44-8.69V48.34a4.29,4.29,0,1,0-8.57,0V68.13a4.36,4.36,0,0,0,3,4.24c.11,0,10.32,3.29,16.83,8.38l.11.09c.11.08,10.16,7.49,13.33,15.52a4.26,4.26,0,0,0,5.6,2.36,4.38,4.38,0,0,0,2.35-5.61c-4-10.13-15.15-18.53-16.22-19.32"/></g></g></g><path id="Fill-9" class="cls-25" d="M505.29,147.68a3.68,3.68,0,0,0,2.77-.81c.95-.94,1.51-2.57,1.51-5.42s-.51-4.35-1.43-5.34a3.51,3.51,0,0,0-2.82-.89H502v12.46Zm-6.93,2.87v-18.2h6.46c2.85,0,5.14.62,6.54,2.12s2.08,3.81,2.08,7c0,3.33-.76,5.74-2.24,7.19s-3.22,1.9-6,1.9Z"/><g id="Fill-11-Clipped"><g class="cls-26"><polygon id="Fill-11" class="cls-22" points="516.82 150.55 520.46 150.55 520.46 132.35 516.82 132.35 516.82 150.55"/></g></g><g id="Fill-13-Clipped"><g class="cls-26"><polygon id="Fill-13" class="cls-22" points="533.48 140.94 539.57 150.55 535.46 150.55 530.42 142.71 528.37 142.71 528.37 150.55 524.73 150.55 524.73 132.35 528.37 132.35 528.37 139.84 530.34 139.84 535.17 132.35 538.99 132.35 533.48 140.94"/></g></g><g id="Fill-14-Clipped"><g class="cls-26"><path id="Fill-14" class="cls-22" d="M551,145.34c0-2.14-1.37-2.33-3.9-2.47-3.5-.19-6.22-1.1-6.22-5.37,0-4,3-5.58,7.51-5.58a19,19,0,0,1,4.8.67v2.77a22,22,0,0,0-4.72-.54c-2.61,0-3.87.78-3.87,2.31,0,2.15,1.4,2.23,3.91,2.33,3.42.14,6.22,1.16,6.22,5.61,0,4-3.19,5.9-7.89,5.9a20.43,20.43,0,0,1-5.59-.8v-2.92a25,25,0,0,0,5.51.67c3.21,0,4.24-1,4.24-2.58"/></g></g><g id="Fill-15-Clipped"><g class="cls-26"><polygon id="Fill-15" class="cls-22" points="557.74 150.55 557.74 132.35 561.39 132.35 561.39 139.84 568.83 139.84 568.83 132.35 572.47 132.35 572.47 150.55 568.81 150.55 568.81 142.71 561.39 142.71 561.39 150.55 557.74 150.55"/></g></g><g id="Fill-16-Clipped"><g class="cls-26"><path id="Fill-16" class="cls-25" d="M585.5,143.54l-1.23-3.81c-.51-1.58-.88-2.9-1.19-4H583c-.32,1.15-.69,2.47-1.19,4l-1.23,3.81Zm.93,2.8H579.6l-1.34,4.21h-3.67l6.44-18.2h4.16l6.43,18.2H587.8Z"/></g></g><g id="Fill-17-Clipped"><g class="cls-26"><path id="Fill-17" class="cls-24" d="M587.34,44a4.32,4.32,0,0,0-4.28,4.36V65.1c-4,1.49-11.08,4.51-16.45,8.69v0a56.76,56.76,0,0,0-6.74,5.85c-11.41,11.61-18.09,27.25-18.37,27.91a4.39,4.39,0,0,0,2.25,5.73,4.26,4.26,0,0,0,5.63-2.28c.06-.15,6.33-14.79,16.54-25.19a48.44,48.44,0,0,1,5.74-5l.12-.09c6.5-5.09,16.72-8.34,16.82-8.38a4.33,4.33,0,0,0,3-4.24V48.34A4.32,4.32,0,0,0,587.34,44Z"/></g></g></g></g></g><g id="man3"><path class="cls-19" d="M701.5,542.84a19,19,0,1,1-19-19A19,19,0,0,1,701.5,542.84Z"/><path class="cls-7" d="M693.5,538.84a2,2,0,0,1-2,2,2,2,0,1,1,2-2Z"/><path class="cls-19" d="M683,565.34h0a11,11,0,0,1,11,11v11a0,0,0,0,1,0,0H672a0,0,0,0,1,0,0v-11A11,11,0,0,1,683,565.34Z"/></g><g id="man1"><path class="cls-19" d="M777.5,542.84a19,19,0,1,0,19-19A19,19,0,0,0,777.5,542.84Z"/><path class="cls-7" d="M784.5,541.84a2,2,0,0,0,2,2,2,2,0,1,0-2-2Z"/><path class="cls-19" d="M785,565.34h22a0,0,0,0,1,0,0v11a11,11,0,0,1-11,11h0a11,11,0,0,1-11-11v-11A0,0,0,0,1,785,565.34Z" transform="translate(1592 1152.68) rotate(180)"/></g><g id="man2"><path class="cls-19" d="M621.5,300.84a19,19,0,1,1-19-19A19,19,0,0,1,621.5,300.84Z"/><path class="cls-7" d="M615.5,301.84a2,2,0,0,1-2,2,2,2,0,1,1,2-2Z"/><path class="cls-19" d="M603,323.34h0a11,11,0,0,1,11,11v11a0,0,0,0,1,0,0H592a0,0,0,0,1,0,0v-11A11,11,0,0,1,603,323.34Z"/></g><g id="form1"><rect class="cls-5" x="440.7" y="382.62" width="78.83" height="56.42" rx="8.38"/><rect class="cls-5" x="440.7" y="444.5" width="14.11" height="14.11" rx="3.29"/><rect class="cls-5" x="460.08" y="444.5" width="58.71" height="14.11" rx="3.29"/><rect class="cls-5" x="440.7" y="464.08" width="14.11" height="14.11" rx="3.29"/><rect class="cls-5" x="460.08" y="464.08" width="58.71" height="14.11" rx="3.29"/><rect class="cls-5" x="440.7" y="483.67" width="14.11" height="14.11" rx="3.29"/><rect class="cls-5" x="460.08" y="483.67" width="58.71" height="14.11" rx="3.29"/><rect class="cls-5" x="440.7" y="503.25" width="14.11" height="14.11" rx="3.29"/><rect class="cls-5" x="460.08" y="503.25" width="58.71" height="14.11" rx="3.29"/></g><g id="form2"><rect class="cls-5" x="562.7" y="382.62" width="78.83" height="56.42" rx="8.38"/><rect class="cls-5" x="562.7" y="444.5" width="14.11" height="14.11" rx="3.29"/><rect class="cls-5" x="582.08" y="444.5" width="58.71" height="14.11" rx="3.29"/><rect class="cls-5" x="562.7" y="464.08" width="14.11" height="14.11" rx="3.29"/><rect class="cls-5" x="582.08" y="464.08" width="58.71" height="14.11" rx="3.29"/><rect class="cls-5" x="562.7" y="483.67" width="14.11" height="14.11" rx="3.29"/><rect class="cls-5" x="582.08" y="483.67" width="58.71" height="14.11" rx="3.29"/><rect class="cls-5" x="562.7" y="503.25" width="14.11" height="14.11" rx="3.29"/><rect class="cls-5" x="582.08" y="503.25" width="58.71" height="14.11" rx="3.29"/></g><g id="form3"><rect class="cls-5" x="699.79" y="391.62" width="78.83" height="56.42" rx="8.38"/><rect class="cls-5" x="699.79" y="453.5" width="14.11" height="14.11" rx="3.29"/><rect class="cls-5" x="719.17" y="453.5" width="58.71" height="14.11" rx="3.29"/><rect class="cls-5" x="699.79" y="473.08" width="14.11" height="14.11" rx="3.29"/><rect class="cls-5" x="719.17" y="473.08" width="58.71" height="14.11" rx="3.29"/><rect class="cls-5" x="699.79" y="492.67" width="14.11" height="14.11" rx="3.29"/><rect class="cls-5" x="719.17" y="492.67" width="58.71" height="14.11" rx="3.29"/><rect class="cls-5" x="699.79" y="512.25" width="14.11" height="14.11" rx="3.29"/><rect class="cls-5" x="719.17" y="512.25" width="58.71" height="14.11" rx="3.29"/></g><path id="cloud1" class="cls-5" d="M902.17,167.9a9,9,0,0,0-8.12-6.9,13.48,13.48,0,0,0-9.13-6.3,19,19,0,0,0-36.21-.45,14.12,14.12,0,1,0,13,24.54,19,19,0,0,0,9.39.16,18.57,18.57,0,0,0,2.71-.85,13.39,13.39,0,0,0,17,.43,9,9,0,0,0,11.41-10.63Z"/><path id="cloud2" class="cls-5" d="M409.17,153.9a9,9,0,0,0-8.12-6.9,13.48,13.48,0,0,0-9.13-6.3,19,19,0,0,0-36.21-.45,14.12,14.12,0,1,0,13,24.54,19,19,0,0,0,9.39.16,18.57,18.57,0,0,0,2.71-.85,13.39,13.39,0,0,0,16.95.43,9,9,0,0,0,11.41-10.63Z"/></g></g></svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_my_groups.svg b/src/assets/imgs/ic_my_groups.svg
new file mode 100644
index 000000000..4d6aa9f00
--- /dev/null
+++ b/src/assets/imgs/ic_my_groups.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="212px" height="177px" viewBox="0 0 212 177" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>E8264D54-290A-44D9-B508-946978DB9A18</title>
+    <g id="Home-Schooling-V3" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="My-group-default" transform="translate(-74.000000, -188.000000)">
+            <g id="Group-6" transform="translate(75.000000, 189.000000)">
+                <g id="no-member">
+                    <path d="M189.058824,21.9998411 C202.652406,35.2865295 204.214526,60.609193 197.177848,81.545793 C190.1069,102.596613 174.331491,119.215682 157.016808,134.863877 C139.536489,150.569183 120.271298,165.240794 99.4668341,167.096875 C78.6623702,168.952957 56.1558526,158.073463 38.8468812,142.32247 C21.4265339,126.525788 9.18374229,105.843328 8.72110356,85.6919936 C8.3784082,65.5834916 19.9672229,45.9261601 33.9577608,33.4047484 C47.9482988,20.8833366 64.4290897,15.2636928 79.833246,11.8256586 C95.2374023,8.3876245 109.770541,6.94559191 129.749681,6.97095436 C149.848763,7.01697966 175.510934,8.5846547 189.058824,21.9998411 Z" id="Path" fill="#EDF4F9" fill-rule="nonzero"></path>
+                    <path d="M196.669913,16.4315187 C211.492682,30.9542033 213.186958,58.6059672 205.527004,81.4673913 C197.812764,104.46045 180.612866,122.620244 161.727264,139.709795 C142.661663,156.879472 121.653217,172.904503 98.9676379,174.92194 C76.2820586,176.939377 51.7222049,165.075131 32.8651743,147.868253 C13.856716,130.609867 0.516795405,108.020296 0.00822700386,86.0059091 C-0.368913608,64.0401697 12.2710111,42.5666278 27.5280632,28.8881189 C42.7851152,15.2096101 60.762151,9.07145074 77.5591939,5.31701483 C94.3562368,1.56257893 110.210428,-0.017031301 131.99887,0 C153.907311,0.0659554683 181.892859,1.77433827 196.669913,16.4315187 Z" id="Path" stroke="#0C519B" stroke-width="0.5" stroke-linecap="round" stroke-dasharray="5"></path>
+                    <g id="Group" transform="translate(172.000000, 37.000000)" fill-rule="nonzero">
+                        <g>
+                            <path d="M0.26762253,49.2187759 C0.26762253,49.2187759 2.31180313,56.1486515 3.52464566,61.0238071 C4.16960993,63.6107541 6.4176096,65.4174574 8.99097818,65.4170644 L19.6901853,65.4170644 C22.1919049,65.4117288 24.3925455,63.6990398 25.0995768,61.2071058 L28.5017994,49.2187759 C28.5017994,49.2187759 14.4857812,53.6445539 0.26762253,49.2187759 Z" id="Path" fill="#E55A28"></path>
+                            <path d="M0.250540241,49.2453838 C0.250540241,49.2453838 2.29756789,56.1752593 3.50756337,61.0504149 C4.15388491,63.6372543 6.40313495,65.4428056 8.97674294,65.4407176 L19.673103,65.4407176 C22.1743491,65.4367441 24.3752391,63.7250638 25.0824946,61.2337137 L28.4847171,49.2453838 C28.4847171,49.2453838 14.4686989,53.6711618 0.250540241,49.2453838 Z" id="Path" fill="#E89074"></path>
+                            <ellipse id="Oval" fill="#E55A28" cx="14.3775934" cy="47.6929461" rx="14.3775934" ry="2.17842324"></ellipse>
+                            <ellipse id="Oval" fill="#A03E20" cx="13.9419087" cy="48.5643154" rx="11.3278008" ry="2.17842324"></ellipse>
+                            <path d="M0,49.8713693 C0,49.8713693 2.08190219,56.5815013 3.3171255,61.3020677 C3.9739914,63.8069837 6.26347377,65.5563971 8.88432914,65.5560166 L19.7809704,65.5560166 C22.3288547,65.5508502 24.5701041,63.8924698 25.2901824,61.4795541 L28.7551867,49.8713693 C28.7551867,49.8713693 14.4805286,54.1568077 0,49.8713693 Z" id="Path" fill="#E55A28"></path>
+                            <path d="M13.9962951,31.9851234 C14.6571595,34.1232503 15.3180238,36.7844751 15.7759672,38.6767746 C17.147055,44.3479562 16.4779642,47.800974 15.5456244,48.1096875 C14.7010343,48.3955334 12.9707214,45.4227366 11.1170106,40.7948923 C10.2504831,38.6310393 8.68470076,36.2613772 7.84285281,33.5344078 C6.97906746,30.735977 6.94341918,27.917537 6.43063231,25.5907518 C5.37763684,20.8028339 7.09972319,13.5623586 7.93608679,13.2822297 C8.77245038,13.0021008 8.93423875,19.8166657 10.7056843,24.1443718 C11.638024,26.4197047 13.0804084,29.0294773 13.9962951,31.9851234 Z" id="Path" fill="#239E6F"></path>
+                            <path d="M17.2891633,27.1458771 C17.4403762,30.2151126 17.4347758,33.9737105 17.4207746,36.6396261 C17.378771,44.6488148 15.5754166,48.9394516 14.3937155,49 C13.3184234,49.0538686 12.1535237,44.4829102 11.3330535,37.6808207 C10.9494206,34.5000286 9.80692285,30.7843371 9.61650655,26.8712763 C9.42048977,22.866682 10.2017566,19.1252467 10.2829636,15.8615023 C10.4481777,9.15094631 14.5841318,0.255025991 15.6454226,0.203319502 C16.7067134,0.152050708 14.9061593,9.1967131 15.7210291,15.5582973 C16.152266,18.9135753 17.0819456,22.9038675 17.2891633,27.1458771 Z" id="Path" fill="#20BB83"></path>
+                            <path d="M20.5790615,34.1925906 C20.1328965,36.3680658 19.4519078,39.0043982 18.9587781,40.870727 C17.49113,46.4668507 15.4100051,49.1718824 14.5558339,48.991547 C13.7721099,48.8398362 13.7603687,45.4306375 14.3973279,40.515781 C14.6908575,38.2258071 14.547028,35.4120017 15.1164755,32.6354083 C15.7035347,29.7729409 16.9363591,27.311219 17.5821242,25.0384198 C18.9147487,20.3640106 23.4938106,14.8652107 24.2687288,15.019784 C25.0436469,15.1743572 22.1142214,21.1912637 21.5506446,25.7941112 C21.2483091,28.2214836 21.1837325,31.1841373 20.5790615,34.1925906 Z" id="Path" fill="#36CE94"></path>
+                        </g>
+                    </g>
+                </g>
+                <g id="Group" transform="translate(52.000000, 77.000000)" fill="#003872" fill-rule="nonzero">
+                    <path d="M3.24073869,15.4330948 L4.59283496,8.94860117 C4.75022183,8.15605195 4.9076087,7.3022603 5.06499556,6.3872262 C5.22238243,5.4721921 5.3511535,4.64001542 5.45130878,3.89069616 L5.45130878,3.89069616 L5.53715617,3.89069616 L5.8805457,15.4330948 L9.25005546,15.4330948 L14.8086735,3.89069616 L14.8945209,3.89069616 C14.7657498,4.39504566 14.590478,5.05790501 14.3687056,5.8792742 C14.1469332,6.70064339 13.9144299,7.68052242 13.6711957,8.8189113 L13.6711957,8.8189113 L12.2976375,15.4330948 L15.5598381,15.4330948 L18.8220386,6.75015599e-14 L13.8858141,6.75015599e-14 L8.47742902,11.2830189 L8.39158163,11.2830189 L8.02673026,6.75015599e-14 L3.24073869,6.75015599e-14 L9.05941988e-14,15.4330948 L3.24073869,15.4330948 Z M18.8649623,20.6206897 C20.0525177,20.6206897 21.0755324,20.3288874 21.9340062,19.745283 C22.79248,19.1616786 23.5436446,18.257452 24.1875,17.0326032 L24.1875,17.0326032 L31.2484472,3.56647148 L27.4067768,3.56647148 L24.8528172,9.14313598 C24.6525067,9.57543555 24.4736579,10.0149401 24.3162711,10.4616497 C24.1588842,10.9083592 24.0229592,11.2974289 23.908496,11.6288585 L23.908496,11.6288585 L23.8226486,11.6288585 C23.8226486,11.2541989 23.8190717,10.8363093 23.8119177,10.3751898 C23.8047638,9.91407022 23.7797249,9.46736066 23.7368012,9.03506109 L23.7368012,9.03506109 L23.2431788,3.56647148 L19.6805124,3.56647148 L21.3974601,15.3682498 L21.1399179,15.8437794 C20.8251442,16.4345888 20.4638698,16.8921058 20.0560947,17.2163305 C19.6483197,17.5405552 19.1225044,17.7026675 18.4786491,17.7026675 C18.2354148,17.7026675 18.0136424,17.6882575 17.8133319,17.6594376 C17.6130213,17.6306176 17.4413265,17.6017976 17.2982476,17.5729777 L17.2982476,17.5729777 L17.2982476,20.4261548 C17.4556344,20.4837948 17.659522,20.5306272 17.9099102,20.5666522 C18.1602984,20.6026772 18.4786491,20.6206897 18.8649623,20.6206897 Z" id="My"></path>
+                    <path d="M39.6188121,15.7059139 C40.7846915,15.7059139 41.7814464,15.6275624 42.6090769,15.4708594 C43.4367073,15.3141564 44.2103619,15.1147162 44.9300405,14.8725389 L44.9300405,14.8725389 L46.6788597,6.75247454 L40.5040168,6.75247454 L39.856306,9.67997141 L42.4903299,9.67997141 L41.8642095,12.4792567 C41.576338,12.5504854 41.3172537,12.6003454 41.0869565,12.6288369 C40.8566594,12.6573283 40.5759847,12.6715741 40.2449325,12.6715741 C39.3237438,12.6715741 38.6472459,12.4115895 38.2154387,11.8916205 C37.7836315,11.3716515 37.5677279,10.5845751 37.5677279,9.53039128 C37.5677279,8.83235066 37.6684829,8.10225716 37.8699929,7.34011077 C38.071503,6.57796439 38.3809648,5.87280091 38.7983784,5.22462033 C39.215792,4.57643976 39.755551,4.04934786 40.4176554,3.64334465 C41.0797597,3.23734143 41.8714063,3.03433982 42.7925949,3.03433982 C43.4115186,3.03433982 43.9836631,3.12337562 44.5090285,3.3014472 C45.0343939,3.47951879 45.5417674,3.70388899 46.0311489,3.9745578 L46.0311489,3.9745578 L47.4129319,1.06842952 C46.1031167,0.356143172 44.5989884,6.92779167e-14 42.9005467,6.92779167e-14 C41.3892216,6.92779167e-14 40.0722096,0.263545947 38.9495109,0.790637842 C37.8268122,1.31772974 36.8876316,2.03713894 36.131969,2.94886546 C35.3763064,3.86059198 34.8113586,4.89696861 34.4371257,6.05799535 C34.0628928,7.2190221 33.8757764,8.43347031 33.8757764,9.70134 C33.8757764,11.6672503 34.3903466,13.1594902 35.4194871,14.1780597 C36.4486276,15.1966291 37.8484026,15.7059139 39.6188121,15.7059139 Z M51.558281,15.492228 L52.6809797,10.2782919 C52.940064,9.11014234 53.3466824,8.25896016 53.900835,7.7247454 C54.4549875,7.19053064 55.0847064,6.92342326 55.7899914,6.92342326 C56.0346822,6.92342326 56.2577826,6.94123042 56.4592926,6.97684474 C56.6608026,7.01245906 56.8335255,7.05875767 56.9774612,7.11574058 L56.9774612,7.11574058 L57.7547142,3.63266035 C57.4956299,3.57567745 57.1789713,3.54718599 56.8047383,3.54718599 C56.0274854,3.54718599 55.3509875,3.72881901 54.7752445,4.09208505 C54.1995016,4.45535108 53.6669394,5.03586445 53.1775579,5.83362516 L53.1775579,5.83362516 L53.0911965,5.83362516 L53.2855097,3.7608719 L50.478763,3.7608719 L47.9742813,15.492228 L51.558281,15.492228 Z M62.3534608,15.7059139 C63.4473723,15.7059139 64.3973482,15.4993508 65.2033883,15.0862248 C66.0094283,14.6730987 66.6823279,14.1139539 67.2220869,13.4087904 C67.7618459,12.7036269 68.1648659,11.8951819 68.431147,10.9834554 C68.6974281,10.0717289 68.8305687,9.1172652 68.8305687,8.12006432 C68.8305687,6.66700018 68.4275486,5.54158776 67.6215085,4.74382705 C66.8154684,3.94606635 65.7071633,3.54718599 64.2965931,3.54718599 C63.2170752,3.54718599 62.2742961,3.7501876 61.468256,4.15619082 C60.6622159,4.56219403 59.9893164,5.12133881 59.4495574,5.83362516 C58.9097984,6.5459115 58.50318,7.36147936 58.2297021,8.28032875 C57.9562242,9.19917813 57.8194853,10.171449 57.8194853,11.1971413 C57.8194853,12.6074683 58.2261037,13.7115121 59.0393406,14.5092728 C59.8525775,15.3070335 60.9572842,15.7059139 62.3534608,15.7059139 Z M62.7204969,12.9279971 C61.8712761,12.9279971 61.4466657,12.3652909 61.4466657,11.2398785 C61.4466657,10.6842952 61.5006416,10.1215889 61.6085934,9.55175987 C61.7165452,8.9819308 61.8784729,8.45127747 62.0943765,7.95979989 C62.3102801,7.46832232 62.5729628,7.07300339 62.8824246,6.77384313 C63.1918864,6.47468287 63.5481273,6.32510273 63.9511474,6.32510273 C64.3829546,6.32510273 64.6960148,6.48536716 64.890328,6.80589602 C65.0846413,7.12642487 65.1817979,7.55023525 65.1817979,8.07732714 C65.1817979,8.88933357 65.0810429,9.66572569 64.8795329,10.4065035 C64.6780228,11.1472813 64.3901514,11.7527247 64.0159185,12.2228337 C63.6416856,12.6929426 63.2098784,12.9279971 62.7204969,12.9279971 Z M73.9043032,15.7059139 C74.6959497,15.7059139 75.3724477,15.5207194 75.933797,15.1503305 C76.4951464,14.7799416 76.9845278,14.2528497 77.4019415,13.5690549 L77.4019415,13.5690549 L77.5098933,13.5690549 L77.3371704,15.492228 L80.1439171,15.492228 L82.6483989,3.7608719 L79.0643992,3.7608719 L77.9417005,9.01754511 C77.6826161,10.171449 77.333572,11.0974212 76.894568,11.7954619 C76.455564,12.4935025 75.9625841,12.8425228 75.4156284,12.8425228 C74.7679176,12.8425228 74.4440622,12.4792567 74.4440622,11.7527247 C74.4440622,11.2968614 74.5016365,10.8409982 74.6167851,10.3851349 L74.6167851,10.3851349 L76.0201584,3.7608719 L72.4361587,3.7608719 L71.0975564,10.0432374 C71.011195,10.4421178 70.9464239,10.8445596 70.9032432,11.2505628 C70.8600625,11.656566 70.8384721,12.0233935 70.8384721,12.3510452 C70.8384721,13.3197546 71.0867613,14.1210768 71.5833395,14.7550116 C72.0799178,15.3889465 72.8535724,15.7059139 73.9043032,15.7059139 Z M85.7574106,20.6206897 L86.4267118,17.5222441 C86.5850411,16.8242034 86.6965913,16.2187601 86.7613624,15.7059139 C86.8261334,15.1930677 86.8801093,14.6517301 86.9232901,14.081901 L86.9232901,14.081901 L87.0096515,14.081901 C87.297523,14.55201 87.6393703,14.9402061 88.0351936,15.2464892 C88.4310168,15.5527723 88.9455871,15.7059139 89.5789043,15.7059139 C90.399338,15.7059139 91.1442054,15.4815437 91.8135065,15.0328033 C92.4828077,14.5840629 93.0549522,13.9786195 93.5299401,13.2164731 C94.004928,12.4543267 94.3683658,11.6102674 94.6202533,10.6842952 C94.8721408,9.75832291 94.9980846,8.81098207 94.9980846,7.84227265 C94.9980846,6.36071705 94.6670324,5.27448038 94.004928,4.58356262 C93.3428237,3.89264487 92.5367836,3.54718599 91.5868078,3.54718599 C90.8959162,3.54718599 90.298583,3.71813472 89.7948079,4.06003216 C89.2910328,4.40192961 88.8664224,4.82217855 88.5209767,5.32077899 L88.5209767,5.32077899 L88.4346152,5.32077899 L88.5857478,3.7608719 L85.779001,3.7608719 L82.1734109,20.6206897 L85.7574106,20.6206897 Z M88.9096032,12.8425228 C88.5353703,12.8425228 88.240302,12.6893812 88.0243984,12.3830981 C87.8084948,12.076815 87.700543,11.6672503 87.700543,11.1544041 C87.700543,10.7127866 87.7509205,10.221309 87.8516755,9.67997141 C87.9524305,9.13863379 88.1035631,8.61866476 88.3050731,8.12006432 C88.5065831,7.62146388 88.7656674,7.21189923 89.082326,6.89137038 C89.3989846,6.57084152 89.7660208,6.41057709 90.1834344,6.41057709 C90.9606873,6.41057709 91.3493138,6.97328331 91.3493138,8.09869573 C91.3493138,8.65427908 91.2881411,9.21342386 91.1657957,9.77613007 C91.0434504,10.3388363 90.8707275,10.8516824 90.6476271,11.3146686 C90.4245267,11.7776547 90.1654424,12.1480436 89.8703742,12.4258353 C89.5753059,12.7036269 89.2550489,12.8425228 88.9096032,12.8425228 Z M99.8343251,15.7059139 C101.403225,15.7059139 102.651867,15.3568936 103.580253,14.658853 C104.508638,13.9608123 104.972831,12.9137514 104.972831,11.5176702 C104.972831,10.7626467 104.760526,10.1251504 104.335915,9.60518135 C103.911305,9.08521232 103.31757,8.64003335 102.55471,8.26964445 C101.993361,7.98472991 101.601136,7.74967542 101.378036,7.56448097 C101.154935,7.37928652 101.043385,7.17272348 101.043385,6.94479185 C101.043385,6.65987732 101.147739,6.44619141 101.356445,6.30373414 C101.565152,6.16127687 101.820638,6.09004824 102.122903,6.09004824 C102.569104,6.09004824 103.029698,6.17908403 103.504686,6.35715562 C103.979674,6.53522721 104.425875,6.75247454 104.843289,7.00889762 L104.843289,7.00889762 L105.987578,4.59424692 C105.383048,4.22385802 104.760526,3.95675064 104.120012,3.79292478 C103.479498,3.62909892 102.799401,3.54718599 102.079723,3.54718599 C100.53961,3.54718599 99.3737308,3.87483771 98.5820843,4.53014115 C97.7904378,5.18544458 97.3946145,6.0971711 97.3946145,7.26532071 C97.3946145,8.02034423 97.5781326,8.64003335 97.9451687,9.12438807 C98.3122048,9.60874278 98.8699557,10.0503603 99.6184215,10.4492407 C100.093409,10.7056637 100.453249,10.9229111 100.69794,11.1009827 C100.94263,11.2790543 101.108156,11.4428801 101.194518,11.5924602 C101.280879,11.7420404 101.32406,11.9023048 101.32406,12.0732535 C101.32406,12.4436424 101.136944,12.7036269 100.762711,12.8532071 C100.388478,13.0027872 100.014245,13.0775773 99.6400119,13.0775773 C98.4885261,13.0775773 97.344237,12.7641713 96.2071447,12.1373593 L96.2071447,12.1373593 L96.2071447,15.022119 C97.1283334,15.4779823 98.3373935,15.7059139 99.8343251,15.7059139 Z" id="Groups"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_new-theme-img.svg b/src/assets/imgs/ic_new-theme-img.svg
new file mode 100644
index 000000000..e32136753
--- /dev/null
+++ b/src/assets/imgs/ic_new-theme-img.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="672" height="293" xmlns:v="https://vecta.io/nano"><style><![CDATA[.B{fill:#fff}.C{fill:#000}.D{filter:url(#G)}.E{mask:url(#S)}.F{stroke:#4a00b2}.G{stroke-linecap:round}.H{filter:url(#C)}.I{mask:url(#T)}.J{fill:#ff4e00}]]></style><defs><rect id="A" width="672" height="293" rx="20"/><rect id="B" x="185" y="91" width="43" height="12" rx="3"/><filter x="-9.3%" y="-16.7%" width="118.6%" height="166.7%" id="C"><feOffset dy="2" in="SourceAlpha"/><feGaussianBlur stdDeviation="1"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0917832168 0"/></filter><rect id="D" x="185" y="137" width="52" height="127" rx="3"/><filter x="-7.7%" y="-1.6%" width="115.4%" height="106.3%" id="E"><feOffset dy="2" in="SourceAlpha"/><feGaussianBlur stdDeviation="1"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0917832168 0"/></filter><rect id="F" x="247" y="137" width="70" height="36" rx="3"/><filter x="-5.7%" y="-5.6%" width="111.4%" height="122.2%" id="G"><feOffset dy="2" in="SourceAlpha"/><feGaussianBlur stdDeviation="1"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.0917832168 0"/></filter><rect id="H" x="327" y="137" width="70" height="36" rx="3"/><rect id="I" x="407" y="137" width="70" height="36" rx="3"/><rect id="J" x="247" y="181" width="70" height="36" rx="3"/><rect id="K" x="327" y="181" width="70" height="36" rx="3"/><rect id="L" x="407" y="181" width="70" height="36" rx="3"/><rect id="M" x="247" y="228" width="70" height="36" rx="3"/><rect id="N" x="327" y="228" width="70" height="36" rx="3"/><path d="M0 0h228c8.837 0 16 7.163 16 16v55H16C7.163 71 0 63.837 0 55V0z" id="O"/><rect id="P" x="238" y="91" width="43" height="12" rx="3"/><rect id="Q" x="291" y="91" width="43" height="12" rx="3"/><rect id="R" x="344" y="91" width="43" height="12" rx="3"/></defs><g fill="none" fill-rule="evenodd"><mask id="S" class="B"><use xlink:href="#A"/></mask><use fill="#024f9d" xlink:href="#A"/><path d="M194.502 114c48.972 0 55.095 217.227 55.095 217.227s17.14-99.41 48.974-99.41-6.122 110.453 9.793 108 4.898-204.955 50.2-150.956 24.486 137.456 73.46 136.228-17.14-39.273 11.018-76.092 99.17 49.09 105.293 71.182c0 0-3.673-119.046 29.384-119.046S612 371.728 612 371.728L97.78 384s-51.422-139.91-34.28-182.865 74.685 45.4 85.703 78.547l-.004-.196C149.075 273.12 146.508 114 194.502 114zM354.22 238.397l-.13.01c-.664.077-1.15.646-1.142 1.302l.01.132 13.797 119.187a1.29 1.29 0 0 0 1.399.963c.664-.077 1.15-.646 1.142-1.302l-.01-.132L355.5 239.37c-.136-.535-.6-.923-1.143-.967l-.127-.004zm-262.78.32c-.28-.57-.942-.858-1.56-.652a1.29 1.29 0 0 0-.813 1.628h0L128.56 358.28c.28.57.942.858 1.56.652a1.29 1.29 0 0 0 .813-1.628h0L91.506 238.88zm491.65 20.377l-.132.007c-.665.07-1.158.633-1.157 1.29l.007.132.467 4.82.338 3.754.815 10.033.098 1.32.193 2.692c.63 8.958 1.094 17.737 1.338 26.003.63 21.385-.298 36.942-3.158 43.893-.272.66.042 1.417.7 1.69a1.29 1.29 0 0 0 1.685-.703c2.912-7.078 3.9-21.73 3.43-41.963l-.018-.76-.06-2.232c-.25-8.525-.737-17.587-1.394-26.826l-.143-1.982-.127-1.7-.69-8.53-.1-1.16-.27-3.007-.268-2.868-.27-2.74c-.065-.622-.56-1.094-1.156-1.153l-.13-.006zm-112.84 17.72c-.422.515-.38 1.26.075 1.725l.104.095 1.645 1.408 1.54 1.367c1.25 1.124 2.596 2.37 4.018 3.73 5.42 5.183 10.842 10.945 15.9 17.128 13.436 16.428 21.866 32.765 22.887 47.897a1.29 1.29 0 0 0 1.375 1.203c.71-.048 1.25-.665 1.2-1.378-1.065-15.782-9.72-32.557-23.466-49.363-5.13-6.27-10.62-12.108-16.114-17.36-1.923-1.84-3.7-3.474-5.314-4.886l-1.273-1.106-.222-.19-.538-.452a1.29 1.29 0 0 0-1.816.179zM198.516 167.68a1.29 1.29 0 0 0-1.284 1.161l-.007.132.012 177.834a1.29 1.29 0 0 0 2.563-.043l.007-.132-.012-177.834a1.29 1.29 0 0 0-1.279-1.118z" fill="#f5f5ef" opacity=".096" class="E"/><g class="E"><g transform="translate(125 178.871)"><path d="M363.92 99.926s-25.944 1.09-30.615-5.113 9.477-6.348 9.477-6.348-20.107-3.4-24.32-13.07 21.792-8.613 21.792-8.613-17.23-11.665-19.5-23.32S372 65.302 372 65.302s.952-19.254 5.535-21.604c0 0 9.978-5.53 6.13 20.003 0 0 14.978-15.286 19.655-8.427S387.382 74.19 387.382 74.19L363.92 99.926z" class="J"/><path d="M378.686 53s-6.646 6.822.97 30c0 0 3.456-17.61 18.344-23.33" class="F G"/><path d="M349.49 115.13s-12.297-28.528-8.896-30.393 12.035 10.93 12.035 10.93-2.616-15.74 4.186-19.6 10.203 14.802 10.203 14.802 12.82-20.27 20.93-14.802-9.157 24.666-9.157 24.666 16.483-9.6 18.837-2.133-7.325 16.53-7.325 16.53H349.49z" fill="#ffea54"/><path d="M358 91.574s5.857 14.557 5.857 23.555h3.962s7.482-21.954 13.18-28" class="F G"/><path d="M19.115 113.86S-1.193 94.73.055 86.465s11.978 2.504 11.978 2.504-12.477-18.03-8.235-28.55 22.96 10.268 22.96 10.268S22.764 48.648 30 38.13s21.71 55.848 21.71 55.848 15.472-13.775 20.713-12.02c0 0 11.73 3.506-10.73 19.784 0 0 22.96 0 21.212 8.765s-26.452 2.004-26.452 2.004l-37.338 1.35z" class="J"/><path d="M14 71.03S38.255 89.987 44 113c0 0 .3-29.088-10.84-58" class="F G"/><path d="M42.698 59S11.83 46.95 13.034 42.937s17.442-.995 17.442-.995-13.835-9.844-11.523-17.965S37.9 27.3 37.9 27.3 32.492 2.212 42.822.114 54.34 25.7 54.34 25.7 59.763 5.842 67.18 9.658s6.81 18.06 6.81 18.06L42.698 59z" fill="#ffea54"/><path d="M28 30.307S43.902 37.03 50.902 44L54 40.92S42.768 18.108 42.52 9" class="F G"/></g><path d="M476.5 26.5A15.45 15.45 0 0 1 492 42h0v299.5H163V42a15.45 15.45 0 0 1 15.5-15.5h0z" stroke="#fff" fill="#024f9d"/><path d="M185.5 58h284c8.837 0 16 7.163 16 16v278h-316V74c0-8.837 7.163-16 16-16z" fill="#f2f2ea"/><circle fill="#ff4747" cx="179" cy="42" r="2"/><circle fill="#ffc347" cx="186" cy="42" r="2"/><circle fill="#47ff5e" cx="193" cy="42" r="2"/></g><use xlink:href="#B" class="C H"/><use xlink:href="#B" class="B"/><use filter="url(#E)" xlink:href="#D" class="C"/><use xlink:href="#D" class="B"/><use xlink:href="#F" class="C D"/><use xlink:href="#F" class="B"/><use xlink:href="#H" class="C D"/><use xlink:href="#H" class="B"/><use xlink:href="#I" class="C D"/><use xlink:href="#I" class="B"/><use xlink:href="#J" class="C D"/><use xlink:href="#J" class="B"/><use xlink:href="#K" class="C D"/><use xlink:href="#K" class="B"/><use xlink:href="#L" class="C D"/><use xlink:href="#L" class="B"/><use xlink:href="#M" class="C D"/><use xlink:href="#M" class="B"/><use xlink:href="#N" class="C D"/><use xlink:href="#N" class="B"/><g fill="#556a63"><circle cx="189" cy="74" r="6"/><circle cx="205" cy="74" r="6"/></g><g transform="translate(242 58)"><mask id="T" class="B"><use xlink:href="#O"/></mask><use fill="#ffd954" xlink:href="#O"/><path d="M237.218 70.62s-6.606-6.377-6.2-9.132 3.896.835 3.896.835-4.06-6-2.68-9.516 7.468 3.423 7.468 3.423-1.3-7.346 1.055-10.852 7.063 18.616 7.063 18.616 5.033-4.592 6.738-4.007c0 0 3.815 1.17-3.49 6.595 0 0 7.468 0 6.9 2.922s-8.605.668-8.605.668l-12.146.45z" class="I J"/><path d="M236 56.528s7.277 6.537 9 14.472c0 0 .093-10.03-3.252-20" class="F G I"/><path d="M245.224 53s-10.627-4.085-10.212-5.445 6.005-.337 6.005-.337-4.763-3.337-3.967-6.1 6.523 1.126 6.523 1.126-1.862-8.504 1.694-9.215 3.966 8.674 3.966 8.674 1.867-6.732 4.42-5.44 2.344 6.122 2.344 6.122L245.224 53z" fill="#72e8fb" class="I"/><path d="M240 43.305s5.505 2.305 7.928 4.695L249 46.944s-3.888-7.822-3.974-10.944" class="F G I"/></g><use xlink:href="#P" class="C H"/><use xlink:href="#P" class="B"/><use xlink:href="#Q" class="C H"/><use xlink:href="#Q" class="B"/><use xlink:href="#R" class="C H"/><g class="B"><use xlink:href="#R"/><circle cx="471" cy="74" r="6"/></g><path d="M582 61V50m-1 11l-7-7m7 8h-11m11 1l-7 7m8 4V63m8 7l-7-7m11-1h-11m7-8l-7 7" stroke="#ffd954"/><g stroke="#fff"><path d="M38 28V15m-1 13l-9-9m9 10H24m13 1l-9 9m10 4V30m10 9l-9-9m13-1H39m9-10l-9 9m609 182v-7m-1 6l-4-4m5 5h-7m6 1l-4 4m5 2v-7m5 5l-4-4"/><path d="M655 210h-7m5-5l-4 4"/></g><g stroke="#ffdf5d"><path d="M17 271v-7m-1 6l-4-4m5 5h-7m6 1l-4 4m5 2v-7m5 5l-4-4"/><path d="M24 271h-7m5-5l-4 4"/></g></g></svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_observation.svg b/src/assets/imgs/ic_observation.svg
new file mode 100644
index 000000000..8a82e698d
--- /dev/null
+++ b/src/assets/imgs/ic_observation.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 480"><defs><style>.cls-1{fill:#024f9d;}</style></defs><path class="cls-1" d="M464,240a112.07,112.07,0,0,0-96-110.72V56a24,24,0,0,0-24-24H272V16A16,16,0,0,0,256,0H128a16,16,0,0,0-16,16V32H40A24,24,0,0,0,16,56V416a24,24,0,0,0,24,24H320v8a32,32,0,0,0,64,0V368a8,8,0,0,0-8-8V349.34A112.13,112.13,0,0,0,464,240Zm-16,0a96,96,0,1,1-96-96A96,96,0,0,1,448,240ZM344,48a8,8,0,0,1,8,8v72a111.34,111.34,0,0,0-16,1.28V80a16,16,0,0,0-16-16H272V48ZM128,16H256V96H128Zm128,96a16,16,0,0,0,16-16V80h48v52.72a111.93,111.93,0,0,0,8,216.62V360a8,8,0,0,0-8,8v24H64V80h48V96a16,16,0,0,0,16,16ZM40,424a8,8,0,0,1-8-8V56a8,8,0,0,1,8-8h72V64H64A16,16,0,0,0,48,80V392a16,16,0,0,0,16,16H320v16Zm328,24a16,16,0,0,1-32,0V376h32Zm-8-88H344v-8.41c2.66.2,5.3.41,8,.41s5.34-.21,8-.41Z" transform="translate(-16 0)"/><path class="cls-1" d="M272,240a80.09,80.09,0,0,0,80,80V304a64,64,0,0,1,0-128V160A80.09,80.09,0,0,0,272,240Z" transform="translate(-16 0)"/><path class="cls-1" d="M96,160v64a8,8,0,0,0,8,8h64a8,8,0,0,0,8-8V165.6l14.07-16.42-12.14-10.4L166.61,152H104A8,8,0,0,0,96,160Zm16,8h40.89l-17.35,20.23-9.88-9.89-11.32,11.32,16,16A8,8,0,0,0,136,208h.31a8,8,0,0,0,5.76-2.79L160,184.29V216H112Z" transform="translate(-16 0)"/></svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_offline.png b/src/assets/imgs/ic_offline.png
index cd975bf4a..372c63858 100644
Binary files a/src/assets/imgs/ic_offline.png and b/src/assets/imgs/ic_offline.png differ
diff --git a/src/assets/imgs/ic_open_with.svg b/src/assets/imgs/ic_open_with.svg
new file mode 100644
index 000000000..91e921f66
--- /dev/null
+++ b/src/assets/imgs/ic_open_with.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>0EC3313D-052E-4D3A-9353-74C987B37F63</title>
+    <g id="Home" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Player---Maths---9" transform="translate(-120.000000, -351.000000)" stroke="#024F9D" stroke-width="2">
+            <g id="Group-2" transform="translate(104.000000, 351.000000)">
+                <g id="open-with" transform="translate(16.000000, 0.000000)">
+                    <path d="M15,4 L20,4 L20,9 M20,12.8888889 L20,18 C20,19.1045695 19.1045695,20 18,20 L6,20 C4.8954305,20 4,19.1045695 4,18 L4,6 C4,4.8954305 4.8954305,4 6,4 L12,4 L12,4" id="Shape"></path>
+                    <line x1="20" y1="4" x2="12" y2="12" id="Path-5"></line>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_other.svg b/src/assets/imgs/ic_other.svg
index 1f61705c3..1a4f24cc4 100644
--- a/src/assets/imgs/ic_other.svg
+++ b/src/assets/imgs/ic_other.svg
@@ -1,158 +1,191 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="120px" height="114px" viewBox="0 0 120 114" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 63.1 (101010) - https://sketch.com -->
-    <title>197E2AB0-A530-4DE4-98D6-7416C5A61E89</title>
-    <desc>Created with sketchtool.</desc>
+<svg width="122px" height="123px" viewBox="0 0 122 123" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>1CC93D1A-1B79-41A8-80E4-5CF1E5C94184</title>
     <defs>
-        <rect id="path-1" x="0" y="0" width="148" height="130" rx="1"></rect>
-        <polygon id="path-3" points="0 0.319134884 19.6764 0.319134884 19.6764 27.7109488 0 27.7109488"></polygon>
+        <polygon id="path-1" points="0 0.8746 18.2162 0.8746 18.2162 26.8386 0 26.8386"></polygon>
+        <polygon id="path-3" points="0.0155049937 0.945 15.8879 0.945 15.8879 8.7487 0.0155049937 8.7487"></polygon>
+        <polygon id="path-5" points="0.0157 0.266 28.208 0.266 28.208 13.843 0.0157 13.843"></polygon>
     </defs>
-    <g id="Onboarding-FTUE-01" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="User-Role-Selection" transform="translate(-33.000000, -367.000000)">
-            <g id="Group" transform="translate(20.000000, 354.000000)">
-                <mask id="mask-2" fill="white">
-                    <use xlink:href="#path-1"></use>
-                </mask>
-                <g id="Mask"></g>
-                <path d="M99.0518,16.3808852 C119.88525,24.0103891 132.642297,45.698 129.944914,69.6911914 C128.545118,82.14169 120.643117,107.779874 118.266858,112.189504 C102.234907,141.940041 53.6887387,125.101386 32.6025475,110.751766 C8.69225046,94.4808744 15.4599044,60.0954831 34.7171047,39.1975816 C42.4807892,30.7727414 51.1070896,17.3483997 62.1693679,12.7842625 C73.8416621,7.96828941 88.0298842,12.3444956 99.0518,16.3808852 Z" id="Fill-1" fill="#94E1FF" opacity="0.811351" transform="translate(73.803074, 69.671415) rotate(87.000000) translate(-73.803074, -69.671415) "></path>
-                <g id="Group-300" transform="translate(13.000000, 31.000000)">
-                    <path d="M71.2568854,50 C75.2285587,79.4432094 77.2143953,94.164814 77.2143953,94.164814 C77.2143953,94.164814 59.2479843,96.3335838 45.6452969,92.0940644 C32.0426094,87.854545 39,83.5478832 39,83.5478832 L41.7061796,54.1867906 L71.2568854,50 Z" id="Fill-1" fill="#361808"></path>
-                    <path d="M65.7569854,15.7043871 C66.136033,15.0209484 66.7352362,14.4252336 67.4962798,14.1514848 C68.2566683,13.877425 69.1821734,13.9685709 69.7921877,14.4793612 C70.4025297,14.9904627 70.5964762,15.9364514 70.1374912,16.5741617 C71.1829025,16.3760049 72.3341325,16.9281687 72.7868929,17.844605 C73.2393257,18.7610413 72.9500439,19.9546483 72.1211845,20.5911143 C71.2919974,21.2275803 70.0025149,21.2459339 69.1533435,20.6340431 C69.0334373,21.2017608 68.5875568,21.6973083 68.0155455,21.8979537 C67.4432066,22.0989102 66.7650489,21.9978098 66.2847691,21.6410032 C65.0716203,20.7382543 65.3497632,18.640343 64,17.9338845" id="Fill-3" fill="#263238"></path>
-                    <path d="M63,20.3945487 C64.1511154,19.2362854 64.6993901,17.532871 64.4344094,15.9390715 C64.397783,15.7198418 64.3491969,15.4845353 64.447864,15.2850364 C64.6231474,14.9298843 65.1845031,14.9203844 65.4879789,15.1801715 C65.7918285,15.4392279 65.892738,15.8557642 65.9435665,16.2467238 C66.0784862,17.2876992 65.9704757,18.3579053 65.6303734,19.3528425 C65.4947062,19.7496482 65.3179278,20.1417039 65.0342601,20.4555677 C64.7513398,20.7690661 64.3473282,20.998161 63.9197711,21 C63.4914665,21.0018149 63.1222126,20.795739 63,20.3945487" id="Fill-5" fill="#E8505B"></path>
-                    <path d="M64,5.4634237 C63.4760433,4.10078615 60.9912544,2.93125819 59.6273306,2.251538 C57.5877515,1.23483518 55.7400967,1.50979255 54.6318447,2.50475455 C52.5073825,0.943252484 49.7324914,-0.532884912 47.1457746,0.18807888 C44.5583761,0.90936239 42.5307283,3.48149264 43.0949108,5.95674837 C43.4269432,7.41498157 44.5573534,8.69736994 44.5471265,10.1882144 C44.5399677,11.2049172 43.9993071,12.1391328 43.5755737,13.074947 C43.1518404,14.0101217 42.8382163,15.0946048 43.2789945,16.0233852 C43.6887511,16.8875826 44.6538269,17.4048861 45.1921012,18.2048202 C45.6304931,18.8564052 45.7549201,19.6454689 46.046045,20.366113 C47.1253209,23.0363966 50.5785945,24.4431552 53.5624548,23.8753363 C56.5459742,23.3071976 58.96872,21.1107359 60.2958271,18.5408437 C61.6229341,15.9709514 61.9890561,13.0576822 62.0524627,10.2026017" id="Fill-7" fill="#263238"></path>
-                    <path d="M52.9474815,6.04399024 C50.1947992,5.68370881 47.6809805,7.57768603 47.413697,10.2138366 C47.0946484,13.3589612 46.8236431,17.3120581 47.1430301,19.7088811 C47.7665789,24.3870564 51.4892636,25.0905245 51.4892636,25.0905245 C51.4892636,25.0905245 51.4591519,26.828068 51.4182136,28.8575136 C51.3637419,31.5659139 53.5618953,33.8324292 56.3984843,33.9911208 C59.4475468,34.162069 62.0148223,31.8426565 62,28.9310536 L61.8964055,8.64466094" id="Fill-9" fill="#FFBE9D"></path>
-                    <path d="M51.516411,25.1709467 C51.516411,25.1709467 55.0041027,25.4321092 58.5,23.5 C58.5,23.5 56.6380664,27.0586477 51.5,26.4242448 L51.516411,25.1709467 Z" id="Fill-11" fill="#EB996E"></path>
-                    <path d="M53.827044,15.0059084 C53.8303198,15.1014275 53.9102509,15.1765954 54.0055785,15.173313 C54.1012336,15.1700305 54.1759233,15.0899389 54.172975,14.9944198 C54.1696991,14.8985725 54.0897681,14.8234046 53.9941129,14.826687 C53.8987853,14.8299695 53.8237681,14.9100611 53.827044,15.0059084" id="Fill-17" fill="#EB996E"></path>
-                    <path d="M49.8270526,14.0059084 C49.8303284,14.1014275 49.9102595,14.1765954 50.005587,14.173313 C50.1012422,14.1700305 50.1756043,14.0899389 50.1729836,13.9944198 C50.1697077,13.8985725 50.0897767,13.8234046 49.9941215,13.826687 C49.8987939,13.8299695 49.8237767,13.9100611 49.8270526,14.0059084" id="Fill-19" fill="#EB996E"></path>
-                    <path d="M48.827044,15.0059084 C48.8303198,15.1014275 48.9102509,15.1765954 49.0055785,15.173313 C49.1012336,15.1700305 49.1759233,15.0899389 49.172975,14.9944198 C49.1696991,14.8985725 49.0897681,14.8234046 48.9941129,14.826687 C48.8987853,14.8299695 48.8237681,14.9100611 48.827044,15.0059084" id="Fill-21" fill="#EB996E"></path>
-                    <path d="M47.827044,14.0057441 C47.8303198,14.1015914 47.9102509,14.1764311 48.0055785,14.1731486 C48.1012336,14.1701944 48.1759233,14.0901028 48.172975,13.9942555 C48.1696991,13.8987364 48.0897681,13.8235685 47.9941129,13.8268509 C47.8987853,13.8301334 47.8237681,13.910225 47.827044,14.0057441" id="Fill-23" fill="#EB996E"></path>
-                    <path d="M54.827208,16.0055802 C54.8301563,16.1014275 54.9100873,16.1765954 55.0057425,16.173313 C55.10107,16.1700305 55.1757597,16.0899389 55.1728114,15.9940916 C55.1695356,15.8985725 55.0896045,15.8234046 54.9942769,15.826687 C54.8986218,15.8299695 54.8239321,15.9100611 54.827208,16.0055802" id="Fill-25" fill="#EB996E"></path>
-                    <path d="M54.8272076,15.0057441 C54.8304834,15.1015914 54.9104145,15.1764311 55.0057421,15.1731486 C55.1013972,15.1698662 55.1757593,15.0901028 55.172811,14.9942555 C55.1698628,14.8987364 55.0899317,14.8235685 54.9942766,14.8268509 C54.898949,14.8301334 54.8239317,14.910225 54.8272076,15.0057441" id="Fill-27" fill="#EB996E"></path>
-                    <path d="M52.2468611,4.54880915 C52.7761187,8.37572142 55.5601456,11.7408862 59.0586545,12.7832502 C57.9951078,14.5364843 58.8007869,17.7720651 58.857392,20.4950024 C58.9095945,23.0270797 58.9338089,23.7500041 60.5140342,24.9849024 C61.796454,25.2665048 62.4140784,21.5286605 63.3269927,20.4585046 C64.2402214,19.3883488 65.1050214,18.0774413 64.9896099,16.6372847 C64.9358351,15.963582 64.6679043,15.3257075 64.6119282,14.6523397 C64.549977,13.9053066 64.7518685,13.1659749 64.8534432,12.4239644 C65.3025102,9.13983148 63.6030997,5.68593349 60.8791371,4.07333313 C58.1551744,2.46073277 54.5940854,2.70382826 52,4.54311683" id="Fill-29" fill="#263238"></path>
-                    <path d="M65.6302158,13.9998943 C65.6328776,14.0025517 65.6724712,13.9550506 65.7460022,13.861045 C65.8135443,13.7643819 65.9000514,13.6072629 65.9519556,13.3863661 C66.0670766,12.9455692 65.983564,12.2573015 65.6115835,11.5401345 C65.4349095,11.177731 65.1570887,10.8169883 64.8120585,10.4954424 C64.4726846,10.1665886 64.0810737,9.84105662 63.6292405,9.55671436 C63.179071,9.27170775 62.669012,9.02623003 62.1117068,8.85981009 C61.557396,8.69206144 60.9718096,8.56550256 60.3745781,8.43695063 C59.7773465,8.30806652 59.1947546,8.18150764 58.6477637,8.01043724 C58.0997746,7.84102772 57.5840593,7.63607541 57.1109321,7.40421688 C56.1633469,6.94049984 55.3787942,6.3924102 54.7722465,5.87554507 C54.1650334,5.35735123 53.7285054,4.87802193 53.4410357,4.53687765 C53.2949718,4.3678003 53.1894997,4.22961528 53.1166341,4.13727048 C53.0434358,4.04492568 53.0035095,3.99775676 53.0001823,4 C52.9971878,4.00207504 53.0311252,4.05389442 53.099,4.1505575 C53.1662093,4.24755276 53.2663579,4.38972389 53.4080964,4.56378387 C53.68625,4.91456124 54.1164563,5.40518451 54.7213404,5.93434014 C55.3255591,6.46283141 56.1124408,7.02188284 57.0663477,7.49523298 C57.5424694,7.73174196 58.06251,7.94101255 58.6154899,8.11307948 C59.168137,8.28780381 59.7540561,8.41569139 60.3512877,8.5445755 C60.948852,8.67279526 61.5311112,8.79802544 62.0804311,8.9627845 C62.6287529,9.12488616 63.1301612,9.36372038 63.5750073,9.64241565 C64.0215169,9.92044657 64.4101333,10.2386707 64.7488418,10.560881 C65.0952028,10.8791052 65.3623766,11.2202494 65.5423779,11.5760094 C65.9163546,12.2759033 66.0095161,12.9462335 65.9103657,13.3773974 C65.8188678,13.8148726 65.6092545,13.9895969 65.6302158,13.9998943" id="Fill-31" fill="#455A64"></path>
-                    <path d="M53.0001373,4.00014818 C52.9975076,4.00296034 53.0326801,4.04584582 53.1023675,4.12458637 C53.1710688,4.20438148 53.2765861,4.3172195 53.41366,4.46134283 C53.6904375,4.74748037 54.1033027,5.14926809 54.6548854,5.59183217 C55.2094266,6.02631128 55.9020277,6.51914276 56.7662178,6.8537901 C57.1984772,7.02216834 57.672812,7.11707882 58.1606241,7.2049589 C58.6497511,7.2914329 59.1592583,7.35505808 59.6799419,7.42008933 C60.7206515,7.54733969 61.7130402,7.68443261 62.5788738,7.96424278 C63.441749,8.24756816 64.1721523,8.66236213 64.7010537,9.12285375 C65.2332423,9.5805332 65.5675448,10.0649282 65.7476803,10.4234789 C65.835447,10.6052149 65.9008612,10.7475806 65.9350475,10.8495215 C65.9738357,10.9493533 65.9958596,11.0013783 65.9994755,11 C66.0030913,10.9985662 65.9879705,10.944432 65.9554277,10.8414366 C65.9278157,10.736332 65.8679897,10.5893965 65.7854824,10.4023877 C65.6145509,10.0329398 65.2838643,9.53202339 64.7493747,9.05958009 C64.2185011,8.58291854 63.4811947,8.15406375 62.6081294,7.86195037 C61.7324343,7.57300067 60.7334714,7.43204102 59.692433,7.30443915 C59.1717495,7.23940789 58.6638858,7.17683727 58.1777172,7.0924724 C57.69122,7.00634992 57.2234595,6.91460312 56.7997466,6.75290377 C55.9483764,6.4298566 55.2564327,5.94862529 54.7005767,5.52574635 C54.146693,5.09372788 53.7272535,4.70354033 53.4429156,4.42865144 C53.307814,4.29542524 53.199667,4.18891459 53.1174884,4.10806491 C53.0431989,4.03459717 53.0027671,3.99733601 53.0001373,4.00014818" id="Fill-33" fill="#455A64"></path>
-                    <path d="M47,0.00566600088 C46.9982109,0.0295099841 47.4457514,0.0295099841 48.1412875,0.173862748 C48.3146332,0.210917586 48.5037702,0.253127881 48.7011618,0.316926647 C48.9028601,0.369447854 49.1074295,0.451290715 49.325278,0.530878065 C49.7530794,0.706485779 50.2067211,0.933325836 50.6449304,1.22106472 C51.0791918,1.51460348 51.4528002,1.83810834 51.7639611,2.15484665 C51.9125431,2.31885459 52.0589718,2.47094054 52.1734589,2.62882638 C52.2990717,2.77962346 52.3984853,2.93009833 52.4885676,3.0686512 C52.8438724,3.62382935 52.9741509,4.00855524 52.9989145,3.99985541 C53.0064513,3.99792212 52.9745098,3.90254618 52.9102678,3.73112728 C52.8794029,3.64477339 52.8377712,3.54037541 52.7753237,3.42405544 C52.7150296,3.30773547 52.6550943,3.17047145 52.5614231,3.03159636 C52.4752886,2.88885468 52.3780283,2.734191 52.2545689,2.57856068 C52.1415174,2.41616382 51.9958065,2.25956685 51.8475834,2.09104789 C51.5357047,1.76560974 51.1577896,1.43404948 50.7159913,1.13567748 C50.2695275,0.842783143 49.8061957,0.614332006 49.3690631,0.440979803 C49.1461901,0.362036886 48.936955,0.282449536 48.7313089,0.232506058 C48.5296106,0.171607236 48.3365257,0.133263533 48.1592322,0.100397502 C47.9840921,0.0604427192 47.8204365,0.0488429435 47.6786735,0.0304766321 C47.5369104,0.0108214567 47.413451,0.00534378489 47.3126018,0.00405492093 C47.1112624,-0.00174496689 47,-0.0014227509 47,0.00566600088" id="Fill-35" fill="#455A64"></path>
-                    <path d="M45.1099081,18 C45.1112339,17.998608 45.1002962,17.9850622 45.0767635,17.9599056 C45.0489219,17.9302337 45.0151143,17.8937889 44.9730206,17.8492811 C44.8818727,17.75188 44.7446537,17.610616 44.5872165,17.4142012 C44.4330937,17.2174637 44.2451634,16.9655753 44.1367802,16.6307992 C44.0837487,16.4640562 44.0552443,16.2769944 44.0741368,16.080902 C44.0946865,15.8851322 44.1606444,15.683557 44.2703533,15.4910123 C44.4841365,15.1004402 44.8460765,14.7537308 45.1735459,14.3299391 C45.4983638,13.9048572 45.7953402,13.4123687 46.0230442,12.8586012 C46.2517425,12.3058014 46.4174659,11.6943028 46.4827609,11.0476495 C46.5507075,10.4000286 46.4980075,9.72854126 46.4655257,9.04866836 C46.432381,8.36944051 46.4280722,7.69956575 46.5838522,7.08000416 C46.7373121,6.46141013 47.0518551,5.91022286 47.4406423,5.46578982 C47.8294294,5.01909913 48.2961065,4.67787261 48.7776988,4.4527534 C49.2586281,4.22344144 49.7541412,4.11442956 50.2075604,4.08314508 C51.1226851,4.01928606 51.8521996,4.25311331 52.310922,4.46178397 C52.5419405,4.56918325 52.7123041,4.6698096 52.825659,4.74140911 C52.8776961,4.77462871 52.9194584,4.80172042 52.9539289,4.8236518 C52.9834277,4.84203546 52.9990057,4.85042099 53,4.84945343 C53,4.84945343 52.7911885,4.65368358 52.3294831,4.42469413 C51.871755,4.20215509 51.1352801,3.95284686 50.2022573,4.00767532 C49.7402204,4.03508955 49.2324438,4.14152127 48.7385881,4.37309088 C48.2440694,4.6001452 47.7641344,4.94620954 47.364078,5.40160827 C46.9640217,5.85507188 46.6388724,6.41915997 46.4794465,7.05484757 C46.3180318,7.69118022 46.3226721,8.37169815 46.3558168,9.05382869 C46.38863,9.73628175 46.4413301,10.4009962 46.3757036,11.0376514 C46.3130601,11.673984 46.1523084,12.276452 45.9292447,12.8218339 C45.7078382,13.3688284 45.4178222,13.8555116 45.1009591,14.2770457 C44.7827701,14.6959997 44.4195044,15.049482 44.2017438,15.4555351 C44.0907091,15.6554977 44.0234254,15.8690062 44.0045329,16.0747741 C43.9872977,16.2815097 44.0207738,16.476957 44.0784456,16.6488604 C44.1964407,16.9939571 44.3929886,17.2452005 44.5537404,17.4400028 C44.7178065,17.63416 44.8603287,17.7715537 44.9571111,17.864117 C45.0021879,17.9060447 45.0389785,17.9395868 45.0691402,17.9673235 C45.0946616,17.9902225 45.1085824,18.0011882 45.1099081,18" id="Fill-37" fill="#455A64"></path>
-                    <path d="M64.7941841,13.9997982 C64.7951761,14.0014624 64.8123707,13.9928085 64.8447759,13.9748351 C64.8828025,13.9528676 64.929757,13.9259076 64.9882849,13.8926235 C65.1109618,13.8147388 65.2905133,13.6962476 65.498502,13.5128524 C65.9098502,13.1523861 66.4673525,12.5269787 66.7847916,11.574389 C67.1104973,10.6377757 67.1071906,9.35001552 66.4904991,8.17109426 C66.188932,7.58429635 65.7283147,7.04010203 65.1427057,6.62671406 C64.5594114,6.20866631 63.8683201,5.91443526 63.1398636,5.72205341 C62.4094231,5.52834021 61.6746839,5.4404703 60.9680513,5.39819955 C60.2604267,5.35426459 59.5782634,5.34627642 58.929828,5.3223119 C58.2817232,5.29834738 57.6663543,5.25973787 57.096948,5.17752626 C56.5268803,5.09897588 56.0050899,4.96883522 55.5428192,4.80940459 C54.6159633,4.48887913 53.9549625,4.02123815 53.559817,3.64346411 C53.3653856,3.45074943 53.2258447,3.28832323 53.1375569,3.17382608 C53.096885,3.12023875 53.0638185,3.07730232 53.0373652,3.0426869 C53.0142186,3.01339693 53.0016533,2.99875194 53,3 C53,3 53.1435089,3.27534245 53.5303878,3.67441828 C53.919912,4.06484026 54.5832274,4.54945612 55.517358,4.88262952 C55.9829353,5.04871696 56.5090244,5.18484875 57.084052,5.26805889 C57.6574263,5.35459743 58.2761019,5.39686818 58.92586,5.42349543 C60.2210775,5.48373957 61.6644333,5.44612859 63.1120877,5.82856239 C63.8312856,6.01861435 64.5098116,6.30718712 65.0805406,6.71458396 C65.6542456,7.11765388 66.1036203,7.64587185 66.4012194,8.21869046 C67.0089829,9.3686546 67.0215482,10.6277904 66.7110531,11.5504245 C66.4088247,12.4890349 65.8691783,13.1141094 65.4700648,13.4805669 C65.2686894,13.6669576 65.0944285,13.7907743 64.9763809,13.8739844 C64.9204984,13.9109297 64.8751972,13.9408854 64.8394853,13.9651827 C64.8087334,13.9864845 64.7935228,13.9978011 64.7941841,13.9997982" id="Fill-39" fill="#263238"></path>
-                    <path d="M48.0113171,12.9278184 C48.1031127,13.0494725 48.6842121,12.5494494 49.4976692,12.571794 C50.3103067,12.5797388 50.8991922,13.1011134 50.9893487,12.9824386 C51.0336073,12.9303012 50.9414019,12.7118204 50.6852756,12.4769535 C50.4332473,12.2420866 50.0004963,12.0097025 49.4935712,12.0002681 C48.9870558,11.9913302 48.5567636,12.2073283 48.3084236,12.4327608 C48.0539365,12.6591863 47.9662388,12.8731982 48.0113171,12.9278184" id="Fill-41" fill="#263238"></path>
-                    <path d="M54.0111187,12.928188 C54.1033203,13.0498255 54.6852152,12.5498705 55.497819,12.5717156 C56.3100131,12.5801557 56.899284,13.1014594 56.9894367,12.9823043 C57.0332838,12.9301739 56.9423115,12.7122193 56.6849664,12.4768879 C56.4329486,12.2420531 56.0002155,12.0097006 55.4937212,12.0002675 C54.986817,11.9913308 54.5569524,12.207796 54.3082129,12.4327013 C54.0545559,12.6595925 53.9664521,12.8735752 54.0111187,12.928188" id="Fill-43" fill="#263238"></path>
-                    <path d="M51.6007894,16.9756882 C51.6042905,16.9351806 51.2128044,16.8491019 50.5781513,16.7424077 C50.4171009,16.7199839 50.2652806,16.6801996 50.2401364,16.5543367 C50.2041706,16.4208785 50.2754656,16.2248506 50.357264,16.0132707 C50.5167229,15.573112 50.6835024,15.1116145 50.8585572,14.6280549 C51.5555935,12.6554787 52.0635706,11.0315573 51.9935487,11.0004533 C51.9235268,10.9693492 51.3016049,12.5429977 50.6042503,14.5155739 C50.436516,15.0023887 50.2757839,15.4660562 50.1226906,15.9098316 C50.0580794,16.1167098 49.9492272,16.3503519 50.0268879,16.6273951 C50.0679462,16.765555 50.1844372,16.8675473 50.287242,16.9015448 C50.3900469,16.9395207 50.4807571,16.9434991 50.5603275,16.9510943 C51.2003914,17.0042605 51.5976066,17.0165575 51.6007894,16.9756882" id="Fill-45" fill="#263238"></path>
-                    <path d="M52.067306,18.5889266 C52.3075172,18.165808 52.7207591,17.9410547 53.1267914,18.0133944 C53.4086218,18.0634406 53.6911076,18.2599861 53.8582395,18.583922 C54.0250437,18.907858 54.0542099,19.3619143 53.8942876,19.661737 C53.7137195,19.9997769 53.3457015,20.0689318 53.0373267,19.9379015 C52.7286242,19.8068713 52.4654733,19.5156929 52.2154308,19.2258794 C52.1466117,19.1462603 52.0758264,19.0625465 52.0335519,18.9542645 C51.991605,18.8455276 51.9840677,18.704943 52.0394506,18.6175895" id="Fill-47" fill="#EB996E"></path>
-                    <path d="M53.9103638,18.0000768 C53.8147185,17.9911693 53.8007578,18.7586433 53.2438168,19.2906018 C52.6880639,19.8243418 52.0072592,19.7217269 52.0004274,19.8293301 C51.9906252,19.8770745 52.1498361,19.9818272 52.4376632,19.9978608 C52.7201437,20.0163885 53.1345078,19.9173366 53.4749102,19.5920331 C53.8147185,19.2656607 53.9659094,18.8231339 53.9926426,18.5088758 C54.0226432,18.1882042 53.954028,17.9965138 53.9103638,18.0000768" id="Fill-49" fill="#263238"></path>
-                    <path d="M45.614253,59.7510223 C45.6168536,59.7388813 45.6207545,59.7267404 45.62303,59.7145994 C46.2728482,56.4762482 46.3518406,55.5236761 46.3518406,55.5236761 C46.3518406,55.5236761 42.923635,55.0879146 43.4739813,50.4848554 L44.0067737,46.5 L47.4265275,58.1005099 C47.4265275,58.1005099 46.6294518,58.7597304 45.614253,59.7510223 M65.4972602,60.1451108 C69.1426136,57.2007673 76,55.7966833 76,55.7966833 C76,55.7966833 75.6151152,42.3632187 74.575211,36.190368 C74.5498554,36.0407391 74.5228744,35.893407 74.4942681,35.748372 C73.5564364,30.9891211 69.3766652,28.119264 64.6150158,27.4518401 L61.3873794,27 L51.8553036,27.3488061 L46.0381465,29.1266344 C46.0381465,29.1266344 39.1671071,30.6888788 38.1037977,40.4396991 C37.061293,50.0011863 35.8286213,57.9003483 36.0197634,60.7140946 C36.1546682,62.6996315 37.973444,64.1158564 38.9814912,64.3481751 C39.8939673,64.5581806 41.0531728,64.7557171 42.03879,64.1539199 C41.6922636,64.7954213 41.4552864,65.4234691 41.3980738,66 L47.2165312,66 L51.7766362,61.9524711 L55.9437296,64.9680196 L61.526185,62.5874098 L65.3591048,59.9452774" id="Fill-51" fill="#E850AA"></path>
-                    <path d="M52.1742909,26.8705314 L52.0118258,29.5900161 C51.9560965,30.5288245 52.0977812,31.4689211 52.4274342,32.347182 L55.6757911,41 C55.6757911,41 55.1770611,35.9497585 57.2626593,34.0853462 C59.3482575,32.2206119 61.9631266,32.4093398 61.9987052,29.5285024 C62.0046874,29.0489533 61.9880001,25.9088567 61.9880001,25.9088567 L57.5696287,25.9784671 L52.1742909,26.8705314 Z" id="Fill-55" fill="#FFBE9D"></path>
-                    <path d="M67.9999567,28.0005445 C68.0018128,28.0052513 67.9439631,28.0395439 67.8332132,28.1010689 C67.7196791,28.1558698 67.5631444,28.25942 67.3642278,28.3962542 C66.9732004,28.677319 66.4593582,29.1853202 66.0083155,29.9569036 C65.5662441,30.7284871 65.19285,31.7730666 65.1291225,32.9780144 C65.0978774,33.5771262 65.1656266,34.2142289 65.2111021,34.8728485 C65.2686425,35.5314682 65.3277298,36.2136219 65.3889825,36.9115772 C65.6497705,39.7044068 65.9294294,42.2279386 66.1496917,44.051498 C66.2585854,44.9632777 66.3566516,45.6998961 66.4262569,46.2085697 C66.4596675,46.4523161 66.4862722,46.646977 66.5066898,46.7942335 C66.5249419,46.9283781 66.5326758,46.9989805 66.5280354,47 C66.5240138,47.0009977 66.5076179,46.9320763 66.4810132,46.7992765 C66.4540991,46.666813 66.4203792,46.4708072 66.3764504,46.2176471 C66.2916866,45.711327 66.17939,44.9760533 66.0587407,44.0649461 C65.8152766,42.2434039 65.521078,39.7205445 65.2599805,36.9256977 C65.1950155,36.2274062 65.1353096,35.54458 65.0845751,34.8846156 C65.0409557,34.2249874 64.9750626,33.5872123 65.0097106,32.9702817 C65.0814815,31.7401188 65.4715808,30.6814188 65.9309762,29.9037837 C66.3993429,29.1258124 66.9320559,28.6208371 67.336695,28.3501945 C67.5424175,28.2184033 67.7042113,28.1222496 67.8223857,28.0751813 C67.9374666,28.0217252 67.9981006,27.9958377 67.9999567,28.0005445" id="Fill-57" fill="#263238"></path>
-                    <path d="M43.9956861,47 C43.9806288,47.0016421 43.9263151,46.8651056 43.841349,46.6158932 C43.754232,46.3670123 43.6482933,46.0044614 43.5353638,45.5547525 C43.3073537,44.655666 43.0841835,43.4029764 43.0185768,42.0134189 C42.9551211,40.62353 43.0632108,39.3645439 43.2067927,38.4591608 C43.2783147,38.0058065 43.3503745,37.640273 43.4143679,37.3887409 C43.4762102,37.1372088 43.5176177,36.9986838 43.5337505,37 C43.5488078,37.001335 43.5364393,37.1421798 43.5014849,37.3953689 C43.4643795,37.6478952 43.4165189,38.0144229 43.3654318,38.4671144 C43.2627197,39.3718346 43.1809802,40.6255184 43.2438981,42.0091107 C43.3095047,43.3927031 43.5063248,44.6410845 43.6929274,45.5414965 C43.7848843,45.9912054 43.8671615,46.3554133 43.9273906,46.6066141 C43.9860064,46.8581462 44.0107433,46.9979967 43.9956861,47" id="Fill-61" fill="#263238"></path>
-                    <path d="M42.9996075,49.0002808 C43.006843,49.006405 42.9138154,49.1221199 42.7391304,49.3264742 C42.5461844,49.5475894 42.2939764,49.8367154 41.990431,50.1848268 C41.3399273,50.9255307 40.4706367,51.9141029 39.5096967,53.0074308 C38.5542694,54.1049489 37.6898024,55.097389 37.0423997,55.8409938 C36.7374761,56.187816 36.484579,56.4759749 36.2905994,56.6967678 C36.1114352,56.8975766 36.0084158,57.0058779 36.0004913,56.9997537 C35.9925667,56.9942742 36.0807706,56.8750138 36.2464974,56.664213 C36.4122243,56.4534121 36.6568522,56.1517155 36.9624649,55.7813636 C37.5733457,55.0406597 38.4312664,54.0272685 39.3980636,52.9216922 C40.3648609,51.8170829 41.2572362,50.8301224 41.9125635,50.1232627 C42.2402272,49.769994 42.5079398,49.4860253 42.6964066,49.2919854 C42.8841845,49.0985901 42.9920275,48.9938343 42.9996075,49.0002808" id="Fill-63" fill="#263238"></path>
-                    <path d="M45.9944176,57 C46.0052774,57.0006848 46,57.1214235 45.9809365,57.3404301 C45.9730725,57.4497657 45.9588425,57.583249 45.9281355,57.7365201 C45.8993009,57.8901265 45.8760835,58.06721 45.8210356,58.2573734 C45.7319105,58.6420603 45.5802481,59.0908058 45.3701675,59.5757729 C45.1507251,60.05638 44.8679963,60.570861 44.5099981,61.0786343 C44.1456337,61.5833891 43.7430729,62.0294515 43.3480016,62.4097784 C42.9446918,62.7840684 42.5537398,63.0963121 42.2013586,63.3300756 C42.0317214,63.4545035 41.8624586,63.5477406 41.7190346,63.635947 C41.5763596,63.7251594 41.4467912,63.7929073 41.3389423,63.844892 C41.1258659,63.9522153 41.0056594,64.0075538 41.0004168,63.9991692 C40.9839399,63.9750215 41.4576509,63.7392456 42.1328297,63.2522662 C42.4724787,63.0107888 42.8503241,62.6948559 43.2420251,62.3212367 C43.6262367,61.9412452 44.0190611,61.4998782 44.3778083,61.0031726 C44.7301895,60.5027778 45.0125437,59.9980229 45.2361054,59.5268066 C45.4503052,59.0515657 45.6113295,58.6118756 45.7131868,58.2345672 C45.9232673,57.4809565 45.9633362,56.9969956 45.9944176,57" id="Fill-65" fill="#263238"></path>
-                    <path d="M61.9428836,26 C61.9470229,25.9977248 61.9795005,26.0611721 62.0380875,26.1843933 C62.0944457,26.3082825 62.1861471,26.4879384 62.282943,26.7287041 C62.46953,27.212573 62.7150223,27.9298611 62.8653107,28.8551895 C63.0159176,29.7778463 63.0617683,30.9065399 62.8901465,32.1347454 C62.7293506,33.362951 62.3138286,34.6819863 61.6251127,35.9202099 C61.4983865,36.1255787 61.3764363,36.3322832 61.2490732,36.5306394 C61.1118395,36.7209812 60.9765162,36.9086515 60.8450139,37.0916468 L60.809989,37.1393992 L60.7587254,37.1066738 C59.7468257,36.4588438 58.5235033,36.4401435 57.5924792,36.8088056 C57.1177333,36.9841204 56.7267286,37.2823226 56.3888981,37.5845319 C56.0558436,37.89342 55.7864707,38.2266851 55.593834,38.5642913 C55.2053766,39.243845 55.1050782,39.8903393 55.0585907,40.3214468 C55.0191081,40.7578972 55.0296156,41 55.0162425,41 C55.0117848,41.0003326 55.0079639,40.9398907 55.0035062,40.8246838 C54.997138,40.7088091 54.9993669,40.5378354 55.0108295,40.3171056 C55.0433071,39.8806552 55.1302324,39.2208036 55.518053,38.5172068 C55.7106897,38.1679129 55.9826098,37.8222922 56.320122,37.5027183 C56.6595446,37.1918267 57.0613751,36.8789315 57.5510862,36.6935987 C58.5101302,36.3059025 59.7729351,36.3172562 60.8284567,36.9884615 L60.7424866,37.0034885 C60.8720785,36.8234986 61.0051729,36.6381658 61.1401778,36.4504955 C61.265312,36.2551447 61.3853517,36.0514455 61.510486,35.8487482 C62.1893312,34.6282231 62.6029428,33.327888 62.7685148,32.1153773 C62.9445943,30.9035345 62.909251,29.7868625 62.7720173,28.8712182 C62.635102,27.9529025 62.40553,27.2362823 62.2348635,26.7487401 C62.1460277,26.5066387 62.0619681,26.3243113 62.0138885,26.1964149 C61.9632617,26.0698543 61.9387443,26.0020659 61.9428836,26" id="Fill-67" fill="#263238"></path>
-                    <path d="M54.9993779,40 C54.9941692,40.0019087 54.9614288,39.9505466 54.903389,39.8507669 C54.8393963,39.7375741 54.7575453,39.5919938 54.6556036,39.411736 C54.443163,39.0299558 54.1470112,38.4718435 53.7463133,37.8002114 C53.3411507,37.1331592 52.8273496,36.3411371 52.0616706,35.6060384 C51.6654372,35.2537014 51.2171169,34.9033273 50.6683431,34.6605845 C50.1214295,34.4217674 49.5030823,34.2696442 48.8527387,34.2411824 C48.5949081,34.2369295 48.3385656,34.2532868 48.0985933,34.2572126 L48,34.2588483 L48.0141379,34.1793517 C48.2057437,33.1017304 48.5268229,32.1101488 48.8557151,31.2268527 C49.1901882,30.3438837 49.5432637,29.5701818 49.8751323,28.9368258 C50.2058848,28.3031426 50.519523,27.8120954 50.7576351,27.4862573 C50.8733427,27.3213754 50.9749123,27.2003311 51.0452298,27.119853 C51.1148031,27.0387206 51.1531243,26.9975001 51.1572169,27 C51.1702386,27.0086231 51.024767,27.1787394 50.8067457,27.5127562 C50.585748,27.8451372 50.2881079,28.3394559 49.9714933,28.9751019 C49.6541346,29.6100937 49.3133367,30.3841228 48.9889091,31.2651288 C48.668946,32.1458078 48.3556799,33.1344451 48.1677946,34.1993076 L48.0833392,34.1211195 C48.3303805,34.1165395 48.594164,34.0995279 48.8598077,34.1044351 C49.530986,34.133224 50.1731444,34.2922173 50.7390326,34.5408488 C51.3056648,34.7947146 51.7647746,35.156866 52.1662166,35.5199988 C52.9426851,36.2753806 53.4490452,37.0795072 53.8441624,37.7557194 C54.2340709,38.4365117 54.5149687,39.0005126 54.7110391,39.38949 C54.8014472,39.5740008 54.8747411,39.7228525 54.9316648,39.8389896 C54.9807754,39.942368 55.0042145,39.9976558 54.9993779,40" id="Fill-69" fill="#263238"></path>
-                    <path d="M55.0052572,40 C55.2727292,39.1331307 55.607516,38.8246309 56.0671032,38.3718574 C56.5269882,37.919391 57.1408633,37.5924732 57.7755881,37.629309 C58.3081492,37.6603125 58.8073509,37.9399576 59.3405078,37.9507014 C59.9603399,37.9635939 60.5340048,37.6105842 61.0031233,37.1924978 C62.9341044,35.4707309 63.5607871,32.3734537 62.4578374,30 C62.5653623,32.344599 61.8088157,34.7202014 60.3740577,36.5432667 C59.2568111,35.8832919 57.7854172,35.9185929 56.6994451,36.6319796 C55.613473,37.3456733 54.9328789,38.7055284 55.0052572,40" id="Fill-71" fill-opacity="0.3" fill="#000000"></path>
-                    <path d="M67.0040128,47 C67.0127609,46.9987383 67.0365059,47.1255411 67.0714984,47.3553117 C67.1068034,47.6108242 67.1527311,47.9381599 67.2070946,48.3306449 C67.3161339,49.1547045 67.4576663,50.2943411 67.6060722,51.5541068 C67.6338788,51.7918224 67.6610605,52.0254066 67.6873049,52.2488212 L67.6360658,52.1922525 C68.7105248,52.4264723 69.5840891,52.8863312 70.1505311,53.2826299 C70.4357829,53.4803025 70.6507372,53.6579536 70.7919572,53.786981 C70.9331772,53.9166441 71.0050369,53.9938699 70.9997255,53.9992725 C70.9853536,54.0164338 70.680106,53.7278699 70.1036661,53.3554064 C69.5309754,52.9829429 68.665222,52.5462835 67.6091966,52.3209621 L67.5642061,52.3114281 L67.5585823,52.2643934 C67.5320255,52.0412967 67.5045313,51.8077125 67.4760999,51.5699969 C67.3276939,50.3102312 67.2008459,49.1686878 67.1152391,48.3417679 C67.0771222,47.9473761 67.0455664,47.6181336 67.0208842,47.3616677 C67.0015133,47.1296725 66.9949522,47.0009629 67.0040128,47" id="Fill-73" fill="#263238"></path>
-                    <path d="M52.9997961,59.0038557 C53.0074989,59.030269 52.796222,59.0889653 52.4994806,59.262853 C52.2020057,59.4345396 51.8308039,59.7452629 51.5472673,60.1858518 C51.2659316,60.6282749 51.1397523,61.095277 51.1085743,61.4368159 C51.0751955,61.7794554 51.1104083,61.995531 51.0828983,61.9999332 C51.0689599,62.0043354 50.9941327,61.7908278 51.0003683,61.4298457 C51.0040363,61.0717985 51.1206787,60.5699455 51.4181537,60.1025764 C51.7170958,59.6374085 52.1235104,59.3208156 52.447395,59.1671047 C52.7723799,59.0108259 52.9975953,58.9891817 52.9997961,59.0038557" id="Fill-77" fill="#263238"></path>
-                    <path d="M54.5538813,41 C54.5590346,40.999671 54.5696848,41.0630844 54.5861755,41.1849571 C54.6026662,41.3203711 54.6243102,41.4970699 54.650764,41.7170352 C54.7016103,42.1797549 54.767573,42.8508802 54.8270081,43.6808692 C54.9506882,45.3411776 55.0434483,47.6422256 54.9788598,50.1827253 C54.9479398,51.4526448 54.8833513,52.6621235 54.7991801,53.7599681 C54.7198187,54.8581431 54.5823964,55.8496381 54.3432816,56.6551866 C54.1096636,57.463047 53.7712611,58.0694377 53.4912632,58.4505787 C53.3473133,58.6391676 53.2298172,58.7811872 53.1387749,58.8683806 C53.0515117,58.957886 53.0037575,59.0031341 53.0006655,59 C52.9872668,58.9889321 53.1775967,58.8052975 53.4448831,58.4201931 C53.7073598,58.0337677 54.0268667,57.4306797 54.2453681,56.6290946 C54.469023,55.8294912 54.595108,54.8469136 54.6665676,53.7507204 C54.7438676,52.6545271 54.8043334,51.4473604 54.8349099,50.1794225 C54.8994984,47.6435467 54.8228855,45.3467923 54.7253156,43.6871445 C54.6789356,42.8568252 54.6284329,42.1860302 54.595108,41.7219894 C54.5793044,41.5010333 54.5669364,41.3233436 54.5573168,41.187269 C54.5501021,41.0647358 54.5487279,41.0003316 54.5538813,41" id="Fill-79" fill="#263238"></path>
-                    <path d="M42,39.8249783 C42.0036863,39.8630547 40.886543,39.9720318 39.5062815,40.0685356 C38.1252809,40.1650394 37.0033333,40.212963 37,40.1748867 C36.9966815,40.1371386 38.1127162,40.0281615 39.4940864,39.9313295 C40.8747174,39.8348256 41.9966649,39.7872302 42,39.8249783" id="Fill-81" fill="#FFFFFF"></path>
-                    <path d="M54,44.7134231 C54.0013167,44.7239423 53.846281,44.7554999 53.564368,44.8041058 C53.2827862,44.8559762 52.8716768,44.9067585 52.3625107,44.9484725 C51.8533446,44.9927257 51.2444653,45.009774 50.5690003,44.9945393 C49.8935353,44.97205 49.1511532,44.9121995 48.3786253,44.7950375 C47.6060974,44.6717091 46.8782913,44.5026766 46.2236965,44.3180468 C45.5710893,44.126525 44.9906995,43.9241214 44.512673,43.7264332 C44.0343153,43.5309214 43.6526891,43.3568107 43.3952903,43.2211495 C43.1368976,43.0887528 42.9961067,43.0107657 43,43.000972 C43.0043885,42.991541 43.1524674,43.0510288 43.416823,43.1667399 C43.6798535,43.2849901 44.0654549,43.4438661 44.5458003,43.6252314 C45.0251519,43.8091358 45.6052104,43.9995693 46.2554987,44.1827483 C46.9077746,44.3583099 47.6309429,44.5222641 48.3981704,44.6445043 C49.165398,44.7609408 49.9018171,44.8244187 50.5726443,44.854888 C51.2438028,44.8773773 51.849038,44.8715736 52.3565478,44.841467 C52.8640575,44.8135367 53.2748357,44.7790773 53.5577425,44.7453434 C53.8409807,44.7152368 53.9983352,44.7032666 54,44.7134231" id="Fill-83" fill="#FFFFFF"></path>
-                    <path d="M64.9998847,40.0006645 C65.0045358,40.0095961 64.8683246,40.1014131 64.6174967,40.2603957 C64.3683299,40.4218792 63.9962408,40.635166 63.5281394,40.8802494 C63.0610347,41.1274763 62.4906088,41.3911374 61.8464295,41.6530122 C61.1999247,41.9077417 60.4776732,42.1567549 59.7062527,42.3661119 C58.9338356,42.5704671 58.1876641,42.7158737 57.5052792,42.8173368 C56.8222299,42.9116545 56.2032996,42.9670305 55.6830393,42.9848937 C55.162779,43.0049005 54.7411887,43.004186 54.4504941,42.9877519 C54.1597995,42.9741758 53.9996683,42.9620288 54,42.9516682 C54.0003327,42.9413075 54.1611284,42.9341622 54.4511586,42.9295178 C54.7411887,42.9277314 55.1611179,42.9123691 55.6777237,42.8791435 C56.1953262,42.8480615 56.8096055,42.7819676 57.4876714,42.6808618 C58.1650729,42.5722534 58.9052645,42.4239887 59.6730305,42.2210625 C60.4388032,42.0127774 61.157068,41.7694804 61.8022439,41.5233252 C62.4450943,41.2703821 63.0158524,41.0185107 63.4862794,40.7841453 C63.9573708,40.5529952 64.3347754,40.3543562 64.5915834,40.2093069 C64.8497202,40.0667584 64.9949014,39.9920902 64.9998847,40.0006645" id="Fill-85" fill="#FFFFFF"></path>
-                    <path d="M74,34.0169843 C74.000307,34.0288387 73.8831011,34.0460071 73.6714536,34.0668544 C73.4594985,34.0848403 73.1537171,34.1208122 72.7771814,34.1759963 C72.0244178,34.2843207 70.9889448,34.5071011 69.8762574,34.9203689 C68.7638776,35.3369069 67.7920834,35.862178 67.1066901,36.2897528 C66.7636858,36.5027227 66.4883595,36.6838083 66.3003993,36.8146152 C66.1112086,36.9429694 66.0047696,37.0091903 66.0001552,36.998971 C65.9955408,36.9891605 66.0939815,36.9033185 66.2760967,36.7561609 C66.4569815,36.6073681 66.7267705,36.409114 67.0670062,36.1806109 C67.7459393,35.722787 68.7201945,35.1750334 69.8411879,34.7556341 C70.9627965,34.3390961 72.0093441,34.1330754 72.7685679,34.0554088 C73.1481798,34.0153492 73.4561146,33.9977721 73.6693002,34.0002247 C73.8821782,33.9998159 73.9996918,34.0051299 74,34.0169843" id="Fill-87" fill="#FFFFFF"></path>
-                    <path d="M75,46.3032927 C74.9987835,46.3138225 74.8856534,46.3066773 74.6820192,46.2841133 C74.4789883,46.2600451 74.1845483,46.230712 73.8207218,46.202131 C73.0933704,46.1438409 72.0851547,46.1152599 70.9755744,46.2104045 C69.8659941,46.3081815 68.8710523,46.5105048 68.1566733,46.6936488 C67.7997854,46.7846567 67.511379,46.8647587 67.3128733,46.923801 C67.1137643,46.981339 67.0024443,47.0080397 67,46.9978859 C66.9979191,46.98698 67.1044122,46.9403479 67.3002028,46.8643826 C67.4953899,46.7869131 67.7813829,46.6902642 68.1376674,46.5849658 C68.8499347,46.3728648 69.8503067,46.1513622 70.9671274,46.053209 C72.0836463,45.9573123 73.098499,46.0039445 73.8273587,46.0911917 C74.1920903,46.1340632 74.4862286,46.1803192 74.6883544,46.2231907 C74.8904803,46.2645579 75.001197,46.2923868 75,46.3032927" id="Fill-89" fill="#FFFFFF"></path>
-                    <path d="M66.0918358,58.9999147 C66.0592968,58.9926671 66.2399114,58.6128289 66.4351449,57.9849264 C66.6313216,57.3576827 66.8124077,56.4754565 66.802033,55.4953882 C66.7878856,54.5156494 66.5841637,53.6357292 66.3719534,53.0107916 C66.1611578,52.3855245 65.9711117,52.0079923 66.0036506,52.0000859 C66.0163832,51.9967915 66.0748589,52.0883744 66.1691746,52.257045 C66.2663198,52.4250567 66.3837429,52.6747682 66.507768,52.9870723 C66.7562899,53.6116805 66.985477,54.5014837 66.9996244,55.4943999 C67.0099991,56.4869867 66.8039193,57.3797548 66.5709595,58.0069985 C66.4554228,58.3209498 66.3441303,58.571979 66.2512293,58.740979 C66.1606862,58.9109673 66.1045684,59.0032091 66.0918358,58.9999147" id="Fill-91" fill="#FFFFFF"></path>
-                    <path d="M41,50.0374493 C41,50.059122 40.7136947,50.0690983 40.2541929,50.1034993 C39.794691,50.1382444 39.1613496,50.2060144 38.4701688,50.3381144 C37.7793094,50.4715905 37.1633198,50.6432517 36.7211698,50.7818879 C36.2786984,50.9205241 36.0074959,51.017879 36.0001053,50.9972384 C35.9940001,50.9807259 36.2536347,50.8493139 36.6919288,50.6848769 C37.1295802,50.520096 37.7484617,50.3308902 38.4463904,50.1963822 C39.1446405,50.0629061 39.7863364,50.0102725 40.2500156,50.0016723 C40.7140161,49.993072 41.0003211,50.0195608 41,50.0374493" id="Fill-93" fill="#FFFFFF"></path>
-                    <path d="M43,60.9924353 C42.9996613,60.9973688 42.9665057,60.9996711 42.9021074,61 C42.8383468,60.9986844 42.7433434,61.0039468 42.6221981,60.9907908 C42.3795888,60.9750037 42.0285863,60.9207353 41.6103163,60.7911491 C40.7801524,60.5421724 39.6608339,59.9034503 38.8912426,58.756908 C38.1251582,57.6070766 37.9443967,56.3006893 38.013577,55.4116749 C38.0448197,54.9623987 38.1203761,54.6045565 38.1924257,54.364789 C38.2236684,54.2434252 38.2622436,54.1536358 38.2832846,54.0918027 C38.3062385,54.0299697 38.3205846,53.9987243 38.3250479,54 C38.355653,54.0079335 38.1455616,54.5295675 38.1079428,55.4172662 C38.0639479,56.291809 38.2568239,57.5610307 39.0012297,58.6789589 C39.7491424,59.7932691 40.8305233,60.4300178 41.6386898,60.6980706 C42.4564204,60.977306 43.0038057,60.9602032 43,60.9924353" id="Fill-95" fill="#FFFFFF"></path>
-                    <path d="M49.9999434,62.9972163 C49.9907561,63.0260914 48.8636661,62.827059 47.483268,62.5522293 C46.1022136,62.2776574 44.9905452,62.0317029 45.0000606,62.0028277 C45.009248,61.9736948 46.1360099,62.172985 47.5170642,62.4475569 C48.8977905,62.7223866 50.0091308,62.9683411 49.9999434,62.9972163" id="Fill-97" fill="#FFFFFF"></path>
-                    <path d="M62.9998953,60.0009399 C63.0039827,60.0100781 62.8882771,60.0814267 62.6747876,60.2012783 C62.4622414,60.3232388 62.1490816,60.4873757 61.7579462,60.6796303 C60.9759899,61.064491 59.8733278,61.5428429 58.6228894,61.9600389 C57.3718222,62.3754776 56.2144515,62.6496249 55.3714982,62.8053266 C54.9498643,62.8833531 54.6077781,62.9371282 54.3703929,62.9655973 C54.1326933,62.9951209 54.0009523,63.0067194 54,62.9961753 C53.9987514,62.9863341 54.127977,62.9554047 54.3625325,62.908659 C54.5974023,62.8633193 54.9366588,62.793728 55.3551485,62.702697 C56.1911846,62.521338 57.3397517,62.2324289 58.5854737,61.8187476 C59.8302526,61.403309 60.9332291,60.9432335 61.7221026,60.5836787 C62.1160677,60.4040771 62.4342582,60.2550534 62.6530928,60.1496121 C62.8728706,60.0452252 62.9961223,59.9921531 62.9998953,60.0009399" id="Fill-99" fill="#FFFFFF"></path>
-                    <path d="M54,52.0929429 C54.0022505,52.1085366 53.8941522,52.166456 53.6962441,52.2566766 C53.4986626,52.3502388 53.2089852,52.4610653 52.8487664,52.5757903 C52.1286552,52.806911 51.1175604,53.0101859 49.9964077,52.9996045 C48.8755816,52.9856815 47.8657931,52.7595731 47.1476415,52.5123017 C46.7880757,52.3897799 46.4990515,52.2722703 46.3027763,52.1742529 C46.1051948,52.0795769 45.9977497,52.0194298 46,52.0038361 C46.0023218,51.9887994 46.1143391,52.018316 46.3148598,52.0862599 C46.5147274,52.1564315 46.805058,52.2488798 47.1646237,52.3502388 C47.8834285,52.5540705 48.8857057,52.7523331 49.9973875,52.7662561 C51.1087427,52.7768375 52.1126527,52.6014085 52.8327639,52.4131704 C53.1929828,52.3196083 53.484293,52.2344 53.6844872,52.1681268 C53.8853345,52.1046382 53.9976784,52.0773492 54,52.0929429" id="Fill-101" fill="#FFFFFF"></path>
-                    <path d="M58.9998224,52.7737058 C59.0069148,52.7894615 58.8012339,52.880057 58.4477316,52.979515 C58.0953491,53.078973 57.5921588,53.1787593 57.0262563,53.2158509 C56.4599806,53.2516295 55.9452185,53.2168356 55.5801442,53.1633318 C55.2143234,53.1094997 54.9959507,53.0464768 55.0000569,53.0297364 C55.0086425,52.9867364 55.9041569,53.1541409 57.0150577,53.0786448 C58.1255853,53.0120112 58.9845176,52.732347 58.9998224,52.7737058" id="Fill-103" fill="#FFFFFF"></path>
-                    <path d="M50,30.0068313 C50.0021287,30.0287551 49.5911099,30.0696578 48.9339785,30.1707691 C48.2768471,30.271226 47.3750277,30.444326 46.4048239,30.719519 C45.4346202,30.9960209 44.5840891,31.3219331 43.980383,31.5801106 C43.3759645,31.8379609 43.01196,32.0176053 43.0002065,31.9986265 C42.9952201,31.9904459 43.0807006,31.9364545 43.2402642,31.8464686 C43.3994717,31.7551739 43.6363239,31.6337749 43.9344372,31.4927426 C44.5299514,31.2106779 45.3819072,30.8677502 46.360659,30.5883033 C47.3394108,30.3108198 48.25334,30.1511358 48.9183071,30.0748933 C49.2506126,30.0362812 49.5209447,30.013703 49.7082895,30.0061769 C49.8956343,29.9979963 49.9992794,29.9976691 50,30.0068313" id="Fill-105" fill="#FFFFFF"></path>
-                    <path d="M49.9958127,31.0001162 C50.0262899,31.0085411 49.8895697,31.7155826 49.6127112,32.5483492 C49.3375617,33.3824119 49.0302261,34.0158978 49.0025972,33.9996961 C48.9712655,33.9821983 49.2284704,33.3273262 49.5010564,32.5003922 C49.7756361,31.6747543 49.9624871,30.9897471 49.9958127,31.0001162" id="Fill-107" fill="#FFFFFF"></path>
-                    <path d="M59.9881528,33.0000533 C60.0712309,33.0089589 59.6987411,33.8929251 59.4522304,34.9955738 C59.1975481,36.0985525 59.1634997,36.9996702 59.0790596,37 C59.0409253,37 59.0014292,36.7740609 59.0000672,36.4079406 C58.9980243,36.0421501 59.0422873,35.5358487 59.1682665,34.9804013 C59.2949267,34.4249539 59.4794692,33.9265685 59.6456255,33.5696837 C59.8111009,33.2127989 59.9513804,32.9960952 59.9881528,33.0000533" id="Fill-109" fill="#FFFFFF"></path>
-                    <path d="M62.9938882,32.9997879 C62.9583826,33.0118409 62.8289781,32.5084481 62.5537366,31.9600335 C62.2826032,31.4087828 61.9759643,31.0337197 62.0014931,31.0018145 C62.0205663,30.9720364 62.3767957,31.3105858 62.6590796,31.8838155 C62.9448846,32.4542093 63.0244054,32.9934068 62.9938882,32.9997879" id="Fill-111" fill="#FFFFFF"></path>
-                    <path d="M54,51.5345472 C54.0029174,51.5441486 53.8953512,51.5829099 53.6977124,51.6419409 C53.4997013,51.6999051 53.2119897,51.7816951 52.8487213,51.8581509 C52.4861973,51.9335399 52.0443944,52.0053728 51.5467613,51.999683 C51.0498726,51.9954157 50.4990148,51.8865996 49.9786774,51.6543872 C48.9283255,51.1896069 48.2096048,50.4410511 47.7298374,49.9108389 C47.4893954,49.6405764 47.3059002,49.4140538 47.1812128,49.2565193 C47.0568975,49.0979179 46.9925067,49.0072377 47.0006952,49.0004812 C47.0196774,48.9855456 47.3163218,49.319462 47.8124661,49.8404284 C48.3104714,50.3510822 49.029192,51.0708337 50.0438126,51.5189004 C50.5474009,51.7432893 51.0699715,51.8506831 51.5501111,51.8620626 C52.0313673,51.8755757 52.4657262,51.8161891 52.8271336,51.7550244 C53.5499485,51.6238049 53.9936124,51.5100102 54,51.5345472" id="Fill-127" fill="#EB996E"></path>
-                    <path d="M17.6814144,23 C17.7539169,21.9958753 16.8709405,20.6107285 16.0530221,19.8148521 C15.23478,19.0186473 14.7282338,17.9386466 15.1545094,16.3334267 C15.4840072,15.0928055 16.2595246,15.1854333 16.565718,14.4562358 C16.7926119,13.9162355 16.6971288,13.3006877 16.7440612,12.7150304 C16.904926,10.7061241 19.0829129,9.13145159 21.0061702,9.63367817 C21.547673,7.7229836 23.303592,6.23075643 25.2520957,6.0248074 C27.2005994,5.81885838 29.2212819,6.91232618 30.1388912,8.66896956 C31.2510272,8.08232688 32.6525257,8.10236339 33.7478307,8.72086741 C34.8428121,9.33937142 35.5982619,10.5376203 35.6930977,11.8055043 C36.7770743,11.0109418 38.4404232,11.3170733 39.2981532,12.3583148 C40.1562069,13.3992279 40.2089654,14.9929514 39.5577379,16.1783901 C38.9065104,17.3638288 37.6435434,18.1350701 36.3216682,18.3410191 C35.0001166,18.5472966 33.6332509,18.2303256 32.4366366,17.6249603 C31.2396987,17.0192665 30.1977994,16.1376601 29.2491176,15.1811632" id="Fill-131" fill="#1A2E35"></path>
-                    <path d="M25.2906054,48 L25.2906054,48 C28.6505829,48.0053073 31.422417,45.3559775 31.5886812,41.980449 C31.7267984,39.1686713 31.8426597,36.4612057 31.8426597,36.4612057 C31.8426597,36.4612057 36.9860501,36.0824928 37.4609504,30.9791694 C37.9351962,25.8751816 38,14.0722928 38,14.0722928 C32.3260696,11.0492331 25.4712705,11.3515391 20.0840477,14.8622748 L19.5947465,15.181191 L19.0003846,41.5930987 C18.9620915,45.1157938 21.788256,47.9943445 25.2906054,48" id="Fill-133" fill="#FFBF9D"></path>
-                    <path d="M27.3145016,22.0512103 C27.8389689,22.2256641 28.122429,22.790966 27.9490806,23.3152198 C27.7748477,23.8390275 27.2096965,24.1227938 26.6852292,23.9487861 C26.161204,23.7747785 25.8773018,23.2094767 26.0510924,22.6852228 C26.2244408,22.160969 26.7900342,21.8772027 27.3145016,22.0512103" id="Fill-135" fill="#1A2E35"></path>
-                    <path d="M28.9866095,21.9863827 C28.887777,22.0889643 28.3343152,21.5801109 27.5216082,21.5245627 C26.7085211,21.4560398 26.0927188,21.8760974 26.0087112,21.7593246 C25.9676577,21.7078311 26.0706716,21.5188863 26.3398,21.3279142 C26.6043669,21.137753 27.0494931,20.9666485 27.5565797,21.0055728 C28.0632862,21.044497 28.4810434,21.2808807 28.7167208,21.5087498 C28.95772,21.7386461 29.0341251,21.941782 28.9866095,21.9863827" id="Fill-137" fill="#1A2E35"></path>
-                    <path d="M35.3142979,22.0512103 C35.8387914,22.2256641 36.1227078,22.790966 35.9489085,23.3152198 C35.7751093,23.8390275 35.2094877,24.1227938 34.6849942,23.9487861 C34.1613851,23.7747785 33.8770265,23.2094767 34.051268,22.6852228 C34.2246251,22.160969 34.7902467,21.8772027 35.3142979,22.0512103" id="Fill-139" fill="#1A2E35"></path>
-                    <path d="M36.986575,21.9864822 C36.8881238,22.0886687 36.3342883,21.5797641 35.5215907,21.5242103 C34.7088931,21.4560861 34.0927177,21.8757803 34.0087111,21.7594013 C33.9676581,21.7079026 34.0706708,21.5185333 34.3397961,21.327542 C34.6043599,21.1377672 35.0498611,20.9666455 35.5565617,21.0055737 C36.0632623,21.0440964 36.4810148,21.2809093 36.7170696,21.5083958 C36.958066,21.7387207 37.0340901,21.9414716 36.986575,21.9864822" id="Fill-141" fill="#1A2E35"></path>
-                    <path d="M31,27.8452459 C30.9996484,27.7835078 31.4724466,27.7247272 32.2368741,27.6799948 C32.4352805,27.6744495 32.5928799,27.6408077 32.6160976,27.5321191 C32.661126,27.4112307 32.6016745,27.1860898 32.5207641,26.933592 C32.3677379,26.399391 32.2122492,25.8585355 32.0500766,25.2921714 C31.404904,22.9553651 30.9750235,21.0344594 31.0886499,21.000448 C31.202628,20.9668062 31.8175471,22.8322586 32.4623679,25.1690649 C32.6136351,25.7387561 32.7578667,26.2825691 32.9006912,26.8200974 C32.9545142,27.0629833 33.0695477,27.3509713 32.9422018,27.6803645 C32.8743074,27.8448762 32.7100241,27.9543043 32.5774014,27.9787038 C32.4440751,28.0086486 32.333263,27.9994064 32.238633,27.9957095 C31.4738538,27.9602193 31.000352,27.9066144 31,27.8452459" id="Fill-143" fill="#1A2E35"></path>
-                    <path d="M31,36.5905175 C31,36.5905175 27.5037191,36.5901641 24,34 C24,34 25.3728685,38.0476395 30.8972828,37.9995753 L31,36.5905175 Z" id="Fill-145" fill="#FF9A6C"></path>
-                    <path d="M19.9999249,22.8080666 C20.0060174,22.3865517 19.640844,22.0236559 19.1633389,22.0036645 C18.060203,21.9575825 16.2465211,22.312685 16.0180498,24.9962842 C15.6917165,28.8295618 19.8982551,27.944855 19.9150097,27.8354103 C19.928718,27.7496842 19.9786009,24.2996327 19.9999249,22.8080666" id="Fill-147" fill="#FFBF9D"></path>
-                    <path d="M18.9962825,25.7527613 C18.9767142,25.7406824 18.909266,25.7899039 18.7643774,25.8285564 C18.623236,25.865699 18.3855021,25.8844212 18.1448538,25.8040966 C17.6564793,25.6443533 17.2934251,25.0482601 17.3350598,24.4313308 C17.3550444,24.1199974 17.4766176,23.8285942 17.6552303,23.591848 C17.8263487,23.3496662 18.0694951,23.1875071 18.3259645,23.1684829 C18.5816013,23.1407014 18.749389,23.2590746 18.7972688,23.3584234 C18.8509775,23.4571683 18.814339,23.5239042 18.8384871,23.5311515 C18.8505612,23.5405127 18.9463209,23.4795143 18.9230055,23.3360775 C18.9105151,23.2675298 18.8630516,23.1835815 18.7585486,23.1120141 C18.6511312,23.0392388 18.4866743,22.9960567 18.309727,23.0002843 C17.9412603,22.9984725 17.5857004,23.2231399 17.3891848,23.482836 C17.1722683,23.743438 17.0257143,24.06987 17.0028153,24.4198559 C16.9611806,25.1098624 17.384605,25.7805428 18.0565883,25.9605182 C18.384253,26.0414468 18.6711158,25.984374 18.8234986,25.9109948 C18.9792122,25.8348978 19.01252,25.7597067 18.9962825,25.7527613" id="Fill-149" fill="#FF9A6C"></path>
-                    <path d="M25.0419931,20.8720919 C25.2614861,21.0775089 26.0273764,20.9813081 27.0220998,20.9504673 C28.0144882,20.8924638 28.7912754,20.9201923 28.9722403,20.6969498 C29.1777231,20.4646532 28.2168576,19.9310216 26.9368712,20.0074164 C25.6537714,20.0453308 24.7964256,20.6598842 25.0419931,20.8720919" id="Fill-151" fill="#1A2E35"></path>
-                    <path d="M28.7076246,49.2304646 C28.7076246,49.2304646 39.5335492,65.1098685 40.1857438,65.4217972 C41.4704379,66.0361934 56.2899895,56.1059432 57.7024214,54.8582286 C57.8968418,54.5933187 58.2899131,50.9228495 59.0782864,49.8107436 C59.0782864,49.8107436 60.2470597,44.3623136 61.49377,44.7806077 C62.741043,45.1991884 60.810907,47.5495477 61.6226333,49.6192286 C62.4349223,51.6894829 66.1542325,46.7519508 66.3030724,46.3090006 L67.2622319,45.0317561 C67.2622319,45.0317561 68.2680972,47.9377383 68.1997265,49.151049 C67.9816718,53.0381156 64.3723737,57.6608521 64.3723737,57.6608521 C64.3723737,57.6608521 48.1637331,78.1202744 37.0612307,78.7550262 C33.8635637,78.9379403 28.1809169,69.6924672 24.3817002,62.7595092 C22.0874832,58.572842 23.2323408,53.2984384 27.0349338,50.473592 L28.7076246,49.2304646 Z" id="Fill-177-Copy" fill="#FFBF9D" transform="translate(45.703060, 61.757698) scale(-1, -1) rotate(-180.000000) translate(-45.703060, -61.757698) "></path>
-                    <path d="M34.0122216,20.6565921 C34.1205586,20.9231939 34.7775924,21.0031474 35.5065003,20.999906 C36.2354082,20.9885613 36.8896372,20.8951021 36.9895596,20.6263394 C37.0919363,20.3651399 36.4303446,19.9896825 35.4907231,20.0002169 C34.5514522,20.0091307 33.9017811,20.3975535 34.0122216,20.6565921" id="Fill-153" fill="#1A2E35"></path>
-                    <path d="M37.7953216,15.3380692 C37.7953216,15.3380692 34.73761,16.7396805 30.7578616,14.8588567 C28.146572,13.6246437 25.1026368,13.0218235 24.4315279,13.5190492 C23.7604189,14.0159643 23.6187185,16.5635862 21.0317016,17.3077166 C21.0317016,17.3077166 21.2094831,22.1684784 19.1623711,21.9954898 C17.1155872,21.8218801 18.3948272,14.2929945 18.3948272,14.2929945 L23.4022317,11.9776805 L28.8668825,11 L34.0159875,11.6872958 L38,12.7202581 L37.7953216,15.3380692 Z" id="Fill-155" fill="#1A2E35"></path>
-                    <path d="M3,45.9435056 C8.43719544,40.4161196 18.0080326,41.0193647 18.0080326,41.0193647 L25.9410118,46.6327403 L30.4396219,41.455902 C30.4396219,41.455902 35.1672122,41.9688746 39.5971616,44.2566595 L39.9024685,44.3502268 L39.8984688,44.4128246 C43.3781672,46.2805453 48.3057402,50.7602418 53,55.1078239 L47.3824869,60.2606115 L41.165359,65.7161747 C41.165359,65.7161747 41.1893569,65.7557102 41.1756914,65.8252267 C41.1110304,66.1560067 44.6538288,86.3348681 45.605413,92.0381868 C34.7348046,90.9614153 28.6134596,88.0352879 21.2095168,85.8927471 C18.7284925,85.1747923 18.3250052,84.5492179 15.9698759,83.9383952 C12.4888443,83.035669 9.96606294,80.0527189 9.65408998,76.5086949 C9.22979342,71.7291879 8.90748802,65.8107304 8.90748802,65.8107304" id="Fill-157" fill="#28AE6F"></path>
-                    <path d="M35.0027728,42 C35.0227698,41.9939114 35.1497681,42.3044922 35.3623674,42.8706923 C35.5767208,43.4365673 35.8679047,44.2609885 36.212063,45.2847669 C36.9014321,47.3316732 37.7791937,50.1818617 38.6088924,53.3624692 C39.4371878,56.5453532 40.0591986,59.4531049 40.4535248,61.5657047 C40.6513895,62.6223299 40.7983847,63.4792727 40.8860907,64.0731162 C40.9755508,64.6669597 41.0155448,64.9967282 40.9944953,65 C40.9741475,65.0029073 40.8948613,64.6793178 40.7692664,64.0916535 C40.6352516,63.4574832 40.4573838,62.6181021 40.2423288,61.6021289 C39.7943266,59.5012368 39.1400399,56.6055181 38.3138494,53.4291384 C37.4852032,50.2537344 36.6418224,47.4006189 36.0057785,45.3416796 C35.6974043,44.3468454 35.4423553,43.5247007 35.2497529,42.9035391 C35.0715343,42.3275825 34.9827759,42.0059443 35.0027728,42" id="Fill-159" fill="#1A2E35"></path>
-                    <path d="M41.00072,60.9986673 C40.954336,60.9422006 43.1547963,59.1064233 45.9152669,56.8981475 C48.6766652,54.6892646 50.9525769,52.9448663 50.9992702,53.0013331 C51.0459635,53.0574963 48.8461217,54.8932735 46.0844141,57.1021565 C43.3239435,59.3101287 41.0474133,61.0551341 41.00072,60.9986673" id="Fill-161" fill="#1A2E35"></path>
-                    <path d="M9.89154834,53 L5,69.0557227 L6.82055504,70 L8.61498252,65.4591124 C8.61498252,65.4591124 10.4589854,55.9204074 9.89154834,53" id="Fill-163" fill="#000000"></path>
-                    <path d="M34.437052,42.1261202 C36.8770248,43.584279 30.7620579,47.0926442 28,46.9981274 L30.0056695,41 C30.0056695,41 33.6183544,41.6366708 34.437052,42.1261202" id="Fill-165" fill-opacity="0.3" fill="#000000"></path>
-                    <path d="M18,41.1222358 L18,37 C18,37 25.9933813,39.0719753 26.2832717,43.8894069 C26.2832717,43.8894069 27.2999793,38.5641096 31.4182888,38.3087183 L32,45.799656 L27.2076391,50 L22.3502861,50 L18.5025625,46.656578 L18,41.454763" id="Fill-167" fill="#28AE6F"></path>
-                    <path d="M27.7768264,67 C27.7582813,66.9990403 27.7548814,66.6884055 27.7635358,66.1286256 C27.7749719,65.5685272 27.7848626,64.7583279 27.7873353,63.7576059 C27.7941352,61.7564805 27.7332454,58.9913528 27.4896864,55.9490433 C27.2427275,52.9064152 26.8600802,50.1686871 26.5333773,48.1959171 C26.3689441,47.2461711 26.2335648,46.4598668 26.1300213,45.8615363 C26.0317323,45.3109959 25.9856786,45.0041843 26.0039146,45 C26.0218416,44.9959007 26.1022037,45.2947473 26.2320194,45.839553 C26.3643078,46.3834028 26.53245,47.1767163 26.7194465,48.1608711 C27.0949848,50.1291807 27.5088497,52.8729622 27.7567359,55.9264227 C28.0012222,58.9789274 28.0318216,61.7552061 27.9764954,63.7604733 C27.949914,64.7631069 27.9112784,65.5739434 27.8676974,66.133086 C27.8265891,66.6925473 27.7953715,67.0012705 27.7768264,67" id="Fill-169" fill="#1A2E35"></path>
-                    <path d="M24.9993666,42.1946948 C24.9962316,42.2190688 24.8225529,42.1242077 24.5372683,42.2401491 C24.2394438,42.3406097 23.9735962,42.7299357 23.7554006,43.2859275 C23.2773139,44.3748545 22.6857403,45.9443455 22.2741155,47.8132421 L22.2327335,48 L22.0756703,47.9001982 C21.60981,47.6050746 21.1323503,47.2852475 20.6523826,46.9430227 C19.7216025,46.2776771 18.8704514,45.5991563 18.1268306,44.9272231 C17.7531392,44.5896096 17.4440287,44.1795327 17.267215,43.7444231 C17.0922823,43.308984 17.0242529,42.8732156 17.0048159,42.4809251 C16.9740929,41.6927211 17.0972983,41.0711829 17.1778676,40.6485896 C17.2650205,40.2253376 17.3311689,39.9964192 17.3484113,40 C17.3678483,40.0043243 17.3368119,40.2411478 17.2819495,40.6673643 C17.2336705,41.0919338 17.1424422,41.7128133 17.1963641,42.4674206 C17.2267735,42.8429127 17.3032674,43.2506839 17.4728706,43.647915 C17.6462359,44.0448167 17.9265044,44.407463 18.2920448,44.7295957 C19.0284552,45.3764961 19.8839953,46.0490881 20.8047433,46.706858 C21.2812626,47.0464477 21.7533928,47.3652866 22.2136101,47.6617277 L22.0151649,47.7490132 C22.4452862,45.8590364 23.0760472,44.2832871 23.6005318,43.2068765 C23.7290666,42.938762 23.8541529,42.6900808 24.0099622,42.5020054 C24.1626364,42.3112949 24.3479146,42.1946948 24.5071724,42.1472642 C24.8379144,42.0507561 25.0119066,42.1907422 24.9993666,42.1946948" id="Fill-171" fill="#1A2E35"></path>
-                    <path d="M31.2504025,39 C31.2731853,38.9993875 31.301944,39.2166765 31.3374254,39.6095153 C31.3777622,40.0572901 31.4274363,40.6130957 31.4860741,41.2707938 C31.555543,41.9714587 31.6589995,42.8025583 31.8334188,43.7186707 C31.9006469,44.1704353 32.0944877,44.6614839 31.9443451,45.2169825 C31.7527452,45.7623533 31.2530169,46.1693097 30.7241565,46.4983122 C29.9809133,46.9519183 29.2040562,47.2919694 28.682292,47.7722762 L28.4350423,48 L28.410392,47.6964706 C28.2815383,46.0836831 27.6264386,44.7569314 27.0404343,43.8942205 C26.4503216,43.0244508 25.9636655,42.5772898 26.0021348,42.5518166 C26.0148334,42.5429164 26.147422,42.6457297 26.3685275,42.8535046 C26.5873921,43.0618933 26.8873038,43.3816886 27.2099983,43.8131975 C27.8538934,44.6685427 28.5680044,46.0176985 28.7211349,47.6786701 L28.4496083,47.6025576 C29.0173117,47.0731459 29.8199396,46.7220462 30.5288217,46.2859338 C31.0341523,45.9765732 31.4800982,45.5929415 31.6373371,45.1522255 C31.7699257,44.7050644 31.6055905,44.2173918 31.5383625,43.7545786 C31.3788827,42.8286452 31.2982091,41.9883385 31.2578723,41.28307 C31.2167885,40.5781085 31.2100657,40.0072646 31.2115596,39.6131981 C31.2145475,39.2188248 31.2283666,39.0006151 31.2504025,39" id="Fill-173" fill="#1A2E35"></path>
-                    <path d="M57.3284365,39 C56.9971416,39.4037123 45,56.0092242 45,56.0092242 L46.6889482,57 L59,40.6056816 L57.3284365,39 Z" id="Fill-175" fill="#1A2E35"></path>
-                    <path d="M9.36082964,52.1305259 C9.36082964,52.1305259 21.870787,70.3451362 22.6244341,70.7029367 C24.1089694,71.4076853 41.2233922,56.4484675 42.8555357,55.0172655 C43.0801993,54.7133982 43.5448075,54.0717909 44.4558166,52.79614 C44.4558166,52.79614 45.8063991,46.5464703 47.2470421,47.0262782 C48.6883354,47.5064149 46.457956,50.2024153 47.3959509,52.576461 C48.3345959,54.9511645 52.6324655,49.2875247 52.8044583,48.7794348 L53.9128203,47.3143602 C53.9128203,47.3143602 55.0751536,50.6476927 54.9961474,52.0394314 C54.7441731,56.4981255 50.5734286,61.8006762 50.5734286,61.8006762 C50.5734286,61.8006762 31.8434439,85.2688371 19.0138856,85.9969348 C15.3188037,86.2067479 8.75218967,75.6016464 4.36198373,67.6491358 C1.71088847,62.8467823 3.03383508,56.796731 7.42794255,53.5564661 L9.36082964,52.1305259 Z" id="Fill-177" fill="#FFBF9D"></path>
-                    <path d="M52.003628,53.9992341 C51.9526442,53.9677124 52.4468264,53.0986691 52.9935982,51.9970032 C53.5431802,50.8969333 53.9378034,49.9792108 53.9944075,50.0003583 C54.0461942,50.0187128 53.7354737,50.9783313 53.1806729,52.0891744 C52.6290836,53.2012146 52.0497945,54.0287609 52.003628,53.9992341" id="Fill-179" fill="#FF9A6C"></path>
-                    <g id="Group-183" transform="translate(0.000000, 43.000000)">
+    <g id="Onboard-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="User-Role-Selection" transform="translate(-33.000000, -364.000000)">
+            <g id="Group" transform="translate(33.000000, 364.000000)">
+                <circle id="Oval" fill="#E5EDF5" cx="61" cy="61" r="61"></circle>
+                <g id="Group-318" transform="translate(7.000000, 40.000000)">
+                    <path d="M68.0925,47.3952 L73.5735,76.4622 C73.5735,76.4622 64.9745,81.9532 51.2665,81.8342 C37.5575,81.7152 37.3025,74.2652 37.3025,74.2652 L39.8855,50.7492 L68.0925,47.3952 Z" id="Fill-1" fill="#2E353A"></path>
+                    <path d="M43.9295,15.9118 C43.9295,15.9118 44.0755,26.1668 44.7185,26.7168 C45.3605,27.2658 54.9375,36.6488 59.6405,30.8568 C64.3435,25.0658 61.4265,16.5968 61.4265,16.5968 L43.9295,15.9118 Z" id="Fill-3" fill="#A56825"></path>
+                    <path d="M44.8591,18.8727 C44.8591,18.8727 44.9411,24.5167 47.8801,25.6527 C47.8801,25.6527 46.4571,27.5967 46.8261,28.4757 C47.1901,29.3547 51.1751,31.0777 52.0981,30.6377 C53.0191,30.1977 54.6721,25.0307 54.6721,25.0307 L50.2941,18.6167 L44.8591,18.8727 Z" id="Fill-5" fill="#030000"></path>
+                    <path d="M55.8445,23.7233 L53.1565,23.7233 L50.4675,23.7233 C50.6015,30.8333 47.3395,32.2993 47.3395,32.2993 C49.4075,35.8913 53.1565,35.6713 53.1565,35.6713 C53.1565,35.6713 56.9045,35.8913 58.9725,32.2993 C58.9725,32.2993 55.7115,30.8333 55.8445,23.7233" id="Fill-7" fill="#BB715A"></path>
+                    <path d="M56.9548,29.9509 C56.4308,28.8749 55.9828,27.3429 55.8688,25.1889 L53.1168,25.1889 L50.4438,25.1889 C50.3758,26.4829 50.1878,27.5549 49.9338,28.4349 C51.1948,29.1829 53.8918,30.4589 56.9548,29.9509" id="Fill-9" fill="#A35D4B"></path>
+                    <path d="M46.0652,16.6491 C46.0652,16.6491 44.9642,14.9011 43.8552,15.5051 C43.2332,15.8441 44.1132,20.5611 46.2862,20.1961 C46.2862,20.1961 46.6632,20.0451 46.6432,19.2781 L46.0652,16.6491 Z" id="Fill-11" fill="#D0846A"></path>
+                    <path d="M44.4002,16.072 C44.4002,16.072 43.8922,17.928 44.7612,18.306 C44.7612,18.306 45.2192,18.419 45.2062,18.618 C45.1912,18.816 45.4732,20.121 45.9522,19.67 C45.9522,19.67 46.3032,19.046 45.8032,18.852 C45.3032,18.659 45.6472,18.628 46.0022,18.126 C46.0022,18.126 45.1422,15.892 44.4002,16.072" id="Fill-13" fill="#A5644F"></path>
+                    <path d="M44.28,17.4235 C44.206,17.0915 44.15,16.7535 44.187,16.3985 C44.2,16.3095 44.216,16.2175 44.267,16.1215 C44.296,16.0245 44.467,15.9215 44.582,15.9575 C44.674,15.9675 44.801,16.0395 44.864,16.0835 C44.939,16.1385 45.009,16.1965 45.07,16.2595 C45.328,16.5045 45.537,16.7805 45.726,17.0735 C45.824,17.2205 45.898,17.3795 45.967,17.5445 C46.031,17.7125 46.099,17.8825 46.079,18.1105 L46.075,18.1535 L46.042,18.1895 C45.921,18.3145 45.804,18.4625 45.725,18.6015 C45.706,18.6335 45.691,18.6705 45.686,18.6935 C45.677,18.7255 45.685,18.7095 45.678,18.7185 C45.696,18.7275 45.692,18.7285 45.774,18.7465 L45.909,18.7905 C45.958,18.8185 46.014,18.8725 46.058,18.9185 C46.095,18.9675 46.106,19.0225 46.128,19.0735 C46.149,19.1805 46.149,19.2875 46.12,19.3845 C46.103,19.4845 46.05,19.5755 45.993,19.6535 C45.937,19.7385 45.847,19.7855 45.763,19.8255 C45.924,19.7195 45.995,19.5375 46.009,19.3665 C46.02,19.2805 45.998,19.1955 45.973,19.1225 C45.941,19.0415 45.9,19.0095 45.856,18.9745 L45.717,18.9445 C45.709,18.9445 45.61,18.9415 45.547,18.8955 C45.47,18.8435 45.436,18.7315 45.451,18.6685 C45.456,18.5985 45.475,18.5455 45.496,18.4945 C45.583,18.2955 45.708,18.1495 45.837,17.9955 L45.8,18.0735 C45.804,17.8265 45.622,17.5035 45.464,17.2355 C45.297,16.9545 45.104,16.6825 44.881,16.4515 C44.827,16.3935 44.765,16.3425 44.708,16.2925 C44.635,16.2405 44.62,16.2105 44.545,16.1885 C44.497,16.1745 44.484,16.1725 44.443,16.2285 C44.408,16.2785 44.38,16.3545 44.362,16.4305 C44.293,16.7425 44.282,17.0855 44.28,17.4235" id="Fill-15" fill="#975238"></path>
+                    <path d="M44.6619,17.8337 C44.6619,17.8337 44.5659,17.4857 44.6019,17.1087 C44.6139,16.9197 44.6959,16.7297 44.7949,16.5957 C44.9199,16.4867 45.0229,16.4237 45.0229,16.4237 L45.1279,16.7187 C45.1279,16.7187 45.0759,16.7447 44.9799,16.7837 C44.9039,16.8527 44.8049,16.9747 44.7549,17.1417 C44.6479,17.4667 44.6619,17.8337 44.6619,17.8337" id="Fill-17" fill="#975238"></path>
+                    <path d="M60.2195,16.6491 C60.2195,16.6491 61.3205,14.9011 62.4295,15.5051 C63.0515,15.8441 62.1705,20.5611 59.9995,20.1961 C59.9995,20.1961 59.6185,20.0451 59.6415,19.2781 L60.2195,16.6491 Z" id="Fill-19" fill="#D0846A"></path>
+                    <path d="M61.8845,16.072 C61.8845,16.072 62.3915,17.928 61.5225,18.306 C61.5225,18.306 61.0655,18.419 61.0795,18.618 C61.0945,18.816 60.8115,20.121 60.3335,19.67 C60.3335,19.67 59.9815,19.046 60.4815,18.852 C60.9805,18.659 60.6375,18.628 60.2805,18.126 C60.2805,18.126 61.1425,15.892 61.8845,16.072" id="Fill-21" fill="#A5644F"></path>
+                    <path d="M62.0056,17.4235 C62.0026,17.0855 61.9916,16.7425 61.9216,16.4305 C61.9036,16.3545 61.8776,16.2785 61.8426,16.2285 C61.8016,16.1725 61.7876,16.1745 61.7386,16.1885 C61.6636,16.2105 61.6496,16.2405 61.5756,16.2925 C61.5176,16.3425 61.4586,16.3935 61.4036,16.4515 C61.1816,16.6825 60.9866,16.9545 60.8206,17.2355 C60.6616,17.5035 60.4796,17.8265 60.4846,18.0735 L60.4476,17.9955 C60.5766,18.1505 60.7016,18.2955 60.7886,18.4945 C60.8086,18.5455 60.8296,18.5985 60.8336,18.6695 C60.8476,18.7315 60.8136,18.8445 60.7376,18.8965 C60.6736,18.9425 60.5736,18.9445 60.5656,18.9455 L60.4296,18.9745 C60.3846,19.0105 60.3446,19.0415 60.3106,19.1225 C60.2866,19.1955 60.2646,19.2805 60.2766,19.3675 C60.2876,19.5375 60.3606,19.7195 60.5216,19.8255 C60.4376,19.7855 60.3466,19.7385 60.2906,19.6545 C60.2346,19.5765 60.1816,19.4855 60.1636,19.3855 C60.1346,19.2875 60.1346,19.1805 60.1566,19.0745 C60.1796,19.0235 60.1906,18.9685 60.2266,18.9185 C60.2706,18.8725 60.3266,18.8185 60.3756,18.7905 L60.5096,18.7465 C60.5926,18.7285 60.5896,18.7275 60.6056,18.7185 C60.5996,18.7095 60.6076,18.7255 60.5976,18.6935 C60.5936,18.6705 60.5786,18.6345 60.5596,18.6015 C60.4796,18.4625 60.3626,18.3145 60.2426,18.1895 L60.2096,18.1535 L60.2056,18.1105 C60.1866,17.8825 60.2536,17.7125 60.3186,17.5445 C60.3856,17.3795 60.4626,17.2205 60.5586,17.0735 C60.7466,16.7805 60.9566,16.5045 61.2136,16.2595 C61.2766,16.1965 61.3446,16.1385 61.4206,16.0835 C61.4826,16.0395 61.6106,15.9675 61.7026,15.9575 C61.8186,15.9215 61.9876,16.0245 62.0186,16.1215 C62.0676,16.2175 62.0856,16.3095 62.0966,16.3985 C62.1346,16.7535 62.0786,17.0915 62.0056,17.4235" id="Fill-23" fill="#975238"></path>
+                    <path d="M61.6238,17.8337 C61.6238,17.8337 61.6388,17.4667 61.5298,17.1417 C61.4818,16.9747 61.3808,16.8527 61.3058,16.7837 C61.2088,16.7447 61.1578,16.7187 61.1578,16.7187 L61.2608,16.4237 C61.2608,16.4237 61.3638,16.4867 61.4888,16.5947 C61.5908,16.7287 61.6708,16.9187 61.6828,17.1087 C61.7198,17.4857 61.6238,17.8337 61.6238,17.8337" id="Fill-25" fill="#975238"></path>
+                    <path d="M52.5496,27.154 C52.5496,27.154 49.1496,25.35 47.9866,23.347 C47.0296,21.942 45.5576,15.5 45.4356,14.386 C45.4316,14.35 45.4266,14.313 45.4226,14.276 C45.4196,14.24 45.4166,14.222 45.4166,14.222 L45.4196,14.222 C45.3996,13.993 45.3866,13.759 45.3866,13.525 C45.3866,9.234 48.8646,5.756 53.1556,5.756 C57.4476,5.756 60.9256,9.234 60.9256,13.525 C60.9256,13.804 60.9106,14.08 60.8806,14.35 L60.8826,14.35 C60.8826,14.35 59.3736,21.807 58.3256,23.347 C57.0966,25.644 53.7646,27.154 53.7646,27.154 C53.7646,27.154 53.2936,27.502 52.5496,27.154" id="Fill-27" fill="#D0846A"></path>
+                    <path d="M46.072,16.3903 C46.072,16.3903 46.776,16.1153 48.929,12.2543 C51.046,8.4613 53.288,9.4943 53.288,9.4943 C53.288,9.4943 55.648,8.0023 60.023,15.9483 C61.133,17.9603 59.604,8.8633 59.604,8.8633 L52.4,8.3213 L46.438,9.0973 C46.438,9.0973 45.07,15.4673 46.072,16.3903" id="Fill-29" fill="#A35D4B"></path>
+                    <path d="M51.28,16.9948 C51.28,16.9948 51.399,16.9008 51.345,16.6898 C51.29,16.4798 49.375,14.8778 48.098,16.8318 C48.098,16.8318 49.91,18.5998 51.28,16.9948" id="Fill-31" fill="#F0F0ED"></path>
+                    <path d="M50.7263,16.7272 C50.7263,17.1782 50.3593,17.5432 49.9103,17.5432 C49.4583,17.5432 49.0943,17.1782 49.0943,16.7272 C49.0943,16.2762 49.4583,15.9122 49.9103,15.9122 C50.3593,15.9122 50.7263,16.2762 50.7263,16.7272" id="Fill-33" fill="#2C1117"></path>
+                    <path d="M50.2937,16.7272 C50.2937,16.9392 50.1217,17.1112 49.9097,17.1112 C49.6967,17.1112 49.5267,16.9392 49.5267,16.7272 C49.5267,16.5152 49.6967,16.3432 49.9097,16.3432 C50.1217,16.3432 50.2937,16.5152 50.2937,16.7272" id="Fill-35" fill="#040000"></path>
+                    <path d="M48.7654,17.3181 C48.5214,17.1861 48.2814,17.0501 48.0484,16.9011 L47.9754,16.8541 L48.0284,16.7851 C48.1314,16.6411 48.2094,16.4761 48.3384,16.3461 C48.4544,16.2051 48.5994,16.0921 48.7554,15.9901 C48.8294,15.9331 48.9224,15.9061 49.0044,15.8621 C49.0884,15.8171 49.1804,15.7991 49.2724,15.7751 C49.4524,15.7231 49.6484,15.7251 49.8284,15.7471 C50.1984,15.7911 50.5454,15.9221 50.8404,16.1291 C50.9884,16.2321 51.1304,16.3391 51.2494,16.4741 C51.3014,16.5381 51.3844,16.6191 51.3884,16.7231 C51.3904,16.8221 51.3584,16.9041 51.3274,16.9851 C51.3294,16.8991 51.3314,16.8091 51.3144,16.7351 C51.2934,16.6661 51.2274,16.6251 51.1604,16.5711 C51.0284,16.4691 50.8854,16.3801 50.7364,16.3041 C50.4364,16.1621 50.1244,16.0441 49.8044,16.0221 C49.6454,16.0061 49.4864,16.0261 49.3334,16.0551 C49.2584,16.0741 49.1774,16.0831 49.1074,16.1201 C49.0364,16.1541 48.9574,16.1721 48.8924,16.2181 C48.7514,16.2981 48.6254,16.3981 48.5084,16.5121 C48.3784,16.6131 48.2864,16.7561 48.1704,16.8781 L48.1484,16.7621 C48.3614,16.9371 48.5654,17.1261 48.7654,17.3181" id="Fill-37" fill="#030000"></path>
+                    <path d="M49.7507,16.4479 C49.7507,16.5559 49.6647,16.6429 49.5587,16.6429 C49.4497,16.6429 49.3637,16.5559 49.3637,16.4479 C49.3637,16.3419 49.4497,16.2549 49.5587,16.2549 C49.6647,16.2549 49.7507,16.3419 49.7507,16.4479" id="Fill-39" fill="#F0F0ED"></path>
+                    <path d="M48.2761,16.7272 C48.2761,16.7272 48.0091,17.2482 47.4691,16.8372 C47.4691,16.8372 47.8421,16.9532 48.2941,16.3942 L48.2761,16.7272 Z" id="Fill-41" fill="#030000"></path>
+                    <path d="M47.5818,16.3259 C47.5818,16.3259 47.8018,16.4369 48.0328,16.4149 C48.2668,16.4049 48.4498,16.2719 48.4498,16.2719 L48.5238,16.3989 C48.5218,16.3979 48.2838,16.5189 48.0318,16.4869 C47.7798,16.4719 47.5818,16.3259 47.5818,16.3259" id="Fill-43" fill="#030000"></path>
+                    <path d="M47.9646,15.9987 C47.9646,15.9957 48.0056,16.0327 48.0826,16.0557 C48.1516,16.0917 48.2526,16.1057 48.3566,16.1077 C48.4556,16.1337 48.5526,16.0737 48.6226,16.0637 C48.6936,16.0447 48.7396,16.0317 48.7396,16.0317 L48.7906,16.1697 C48.7906,16.1697 48.7346,16.1757 48.6486,16.1847 C48.5656,16.1837 48.4546,16.2257 48.3486,16.1817 C48.2376,16.1587 48.1376,16.1247 48.0706,16.0747 C47.9986,16.0387 47.9656,15.9967 47.9646,15.9987" id="Fill-45" fill="#030000"></path>
+                    <path d="M51.8953,14.446 C51.8953,14.446 51.5483,14.805 50.1823,14.26 C48.6753,13.661 47.3093,14.058 47.1753,14.21 C47.1753,14.21 49.3103,12.577 51.8953,14.446" id="Fill-47" fill="#030000"></path>
+                    <path d="M54.9236,16.9948 C54.9236,16.9948 54.8046,16.9008 54.8596,16.6898 C54.9126,16.4798 56.8286,14.8778 58.1066,16.8318 C58.1066,16.8318 56.2936,18.5998 54.9236,16.9948" id="Fill-49" fill="#F0F0ED"></path>
+                    <path d="M55.4783,16.7272 C55.4783,17.1782 55.8443,17.5432 56.2933,17.5432 C56.7473,17.5432 57.1103,17.1782 57.1103,16.7272 C57.1103,16.2762 56.7473,15.9122 56.2933,15.9122 C55.8443,15.9122 55.4783,16.2762 55.4783,16.7272" id="Fill-51" fill="#2C1117"></path>
+                    <path d="M55.9119,16.7272 C55.9119,16.9392 56.0829,17.1112 56.2939,17.1112 C56.5069,17.1112 56.6779,16.9392 56.6779,16.7272 C56.6779,16.5152 56.5069,16.3432 56.2939,16.3432 C56.0829,16.3432 55.9119,16.5152 55.9119,16.7272" id="Fill-53" fill="#040000"></path>
+                    <path d="M57.4382,17.3181 C57.6402,17.1261 57.8442,16.9371 58.0582,16.7621 L58.0352,16.8781 C57.9192,16.7561 57.8272,16.6131 57.6972,16.5121 C57.5772,16.3981 57.4522,16.2981 57.3112,16.2181 C57.2482,16.1721 57.1672,16.1541 57.0962,16.1201 C57.0262,16.0831 56.9472,16.0741 56.8712,16.0551 C56.7182,16.0261 56.5602,16.0061 56.4002,16.0221 C56.0802,16.0441 55.7692,16.1621 55.4672,16.3031 C55.3192,16.3801 55.1742,16.4691 55.0442,16.5701 C54.9772,16.6251 54.9122,16.6651 54.8922,16.7351 C54.8732,16.8091 54.8742,16.8991 54.8782,16.9851 C54.8452,16.9041 54.8142,16.8221 54.8162,16.7231 C54.8192,16.6191 54.9012,16.5381 54.9542,16.4741 C55.0732,16.3381 55.2162,16.2311 55.3642,16.1291 C55.6582,15.9221 56.0062,15.7911 56.3752,15.7471 C56.5582,15.7251 56.7512,15.7241 56.9322,15.7751 C57.0242,15.8001 57.1182,15.8171 57.2002,15.8621 C57.2832,15.9061 57.3742,15.9331 57.4482,15.9901 C57.6042,16.0921 57.7502,16.2051 57.8662,16.3461 C57.9942,16.4761 58.0752,16.6411 58.1782,16.7851 L58.2282,16.8541 L58.1542,16.9011 C57.9222,17.0501 57.6822,17.1861 57.4382,17.3181" id="Fill-55" fill="#030000"></path>
+                    <path d="M56.4519,16.4479 C56.4519,16.5559 56.5399,16.6429 56.6469,16.6429 C56.7539,16.6429 56.8409,16.5559 56.8409,16.4479 C56.8409,16.3419 56.7539,16.2549 56.6469,16.2549 C56.5399,16.2549 56.4519,16.3419 56.4519,16.4479" id="Fill-57" fill="#F0F0ED"></path>
+                    <path d="M57.9295,16.7272 C57.9295,16.7272 58.1945,17.2482 58.7355,16.8372 C58.7355,16.8372 58.3625,16.9532 57.9095,16.3942 L57.9295,16.7272 Z" id="Fill-59" fill="#030000"></path>
+                    <path d="M58.6228,16.3259 C58.6228,16.3259 58.4248,16.4719 58.1718,16.4869 C57.9208,16.5189 57.6818,16.3979 57.6818,16.3989 L57.7548,16.2719 C57.7548,16.2719 57.9368,16.4049 58.1718,16.4149 C58.4018,16.4369 58.6228,16.3259 58.6228,16.3259" id="Fill-61" fill="#030000"></path>
+                    <path d="M58.242,15.9987 C58.24,15.9967 58.206,16.0387 58.135,16.0747 C58.067,16.1247 57.967,16.1587 57.858,16.1817 C57.751,16.2257 57.64,16.1837 57.555,16.1847 C57.471,16.1757 57.415,16.1697 57.415,16.1697 L57.465,16.0317 C57.465,16.0317 57.512,16.0447 57.582,16.0637 C57.652,16.0737 57.749,16.1337 57.848,16.1077 C57.95,16.1057 58.053,16.0917 58.123,16.0557 C58.199,16.0327 58.24,15.9957 58.242,15.9987" id="Fill-63" fill="#030000"></path>
+                    <path d="M54.3093,14.446 C54.3093,14.446 54.6583,14.805 56.0213,14.26 C57.5293,13.661 58.8953,14.058 59.0303,14.21 C59.0303,14.21 56.8943,12.577 54.3093,14.446" id="Fill-65" fill="#030000"></path>
+                    <path d="M53.0242,21.2175 C53.0242,21.2175 52.1322,20.8355 52.1002,21.0925 C52.0662,21.3495 52.5942,21.4705 53.0242,21.2175" id="Fill-67" fill="#975238"></path>
+                    <path d="M53.2879,21.2175 C53.2879,21.2175 54.1799,20.8355 54.2129,21.0925 C54.2469,21.3495 53.7189,21.4705 53.2879,21.2175" id="Fill-69" fill="#975238"></path>
+                    <path d="M50.9021,22.7253 C50.9021,22.7253 52.3881,21.8653 53.1571,22.1433 C53.1571,22.1433 53.8931,21.8753 55.4121,22.7253 C55.4121,22.7253 54.8791,24.1183 53.2791,24.1193 C51.5031,24.1193 50.9021,22.7253 50.9021,22.7253" id="Fill-71" fill="#EE3A52"></path>
+                    <path d="M55.407,22.7321 C55.41,22.7291 55.412,22.7251 55.412,22.7251 C55.384,22.7111 55.361,22.7001 55.335,22.6861 C54.247,22.3901 53.157,22.3891 53.157,22.3891 C52.852,22.3141 51.571,22.5561 51.005,22.6701 C50.939,22.7051 50.902,22.7251 50.902,22.7251 C50.902,22.7251 50.903,22.7291 50.906,22.7321 L55.407,22.7321 Z" id="Fill-73" fill="#B52744"></path>
+                    <path d="M51.0281,22.8024 C51.0281,22.8024 51.8461,23.7384 53.2201,23.6884 C54.5701,23.6414 55.2861,22.9464 55.4121,22.7254 L51.0281,22.8024 Z" id="Fill-75" fill="#B52744"></path>
+                    <path d="M53.157,22.6345 C52.586,22.5605 50.902,22.7255 50.902,22.7255 C52.057,23.4585 53.157,23.3855 53.157,23.3855 C53.157,23.3855 54.255,23.4585 55.412,22.7255 C55.412,22.7255 53.727,22.5605 53.157,22.6345" id="Fill-77" fill="#55010E"></path>
+                    <path d="M51.8562,23.1765 C52.5962,23.4215 53.1572,23.3855 53.1572,23.3855 C53.1572,23.3855 53.7092,23.4205 54.4402,23.1815 C53.2252,22.6605 52.2582,22.9835 51.8562,23.1765" id="Fill-79" fill="#F06362"></path>
+                    <path d="M54.6355,23.4724 C54.6355,23.4724 53.5895,23.7364 53.7585,23.8844 C53.9255,24.0344 54.8605,23.4974 54.6355,23.4724" id="Fill-81" fill="#F27F93"></path>
+                    <path d="M53.6228,23.9118 C53.6228,23.9118 53.6488,23.6898 52.9318,23.8428 C52.2138,23.9928 53.7658,24.1508 53.6228,23.9118" id="Fill-83" fill="#F27F93"></path>
+                    <path d="M46.4382,20.1091 C46.4382,20.4281 46.1792,20.6871 45.8592,20.6871 C45.5402,20.6871 45.2822,20.4281 45.2822,20.1091 C45.2822,19.7901 45.5402,19.5331 45.8592,19.5331 C46.1792,19.5331 46.4382,19.7901 46.4382,20.1091" id="Fill-85" fill="#EA882D"></path>
+                    <path d="M46.2019,20.1091 C46.2019,20.2981 46.0499,20.4531 45.8589,20.4531 C45.6699,20.4531 45.5149,20.2981 45.5149,20.1091 C45.5149,19.9201 45.6699,19.7651 45.8589,19.7651 C46.0499,19.7651 46.2019,19.9201 46.2019,20.1091" id="Fill-87" fill="#B06226"></path>
+                    <path d="M60.9744,20.1091 C60.9744,20.4281 60.7174,20.6871 60.3984,20.6871 C60.0784,20.6871 59.8194,20.4281 59.8194,20.1091 C59.8194,19.7901 60.0784,19.5331 60.3984,19.5331 C60.7174,19.5331 60.9744,19.7901 60.9744,20.1091" id="Fill-89" fill="#EA882D"></path>
+                    <path d="M60.74,20.1091 C60.74,20.2981 60.588,20.4531 60.398,20.4531 C60.208,20.4531 60.053,20.2981 60.053,20.1091 C60.053,19.9201 60.208,19.7651 60.398,19.7651 C60.588,19.7651 60.74,19.9201 60.74,20.1091" id="Fill-91" fill="#B06226"></path>
+                    <path d="M45.282,15.8727 C45.282,15.8727 45.936,17.2027 46.643,15.1817 C47.247,13.4657 50.902,6.7077 53.156,8.9797 L53.156,4.5577 C53.156,4.5577 52.865,3.0677 51.345,3.2637 C49.679,3.4767 43.43,4.6317 44.955,15.5517 L45.282,15.8727 Z" id="Fill-93" fill="#030000"></path>
+                    <path d="M61.03,15.8727 C61.03,15.8727 60.377,17.2027 59.667,15.1817 C59.067,13.4657 55.41,6.7087 53.156,8.9797 L53.156,4.5577 C53.156,4.5577 53.447,3.0677 54.968,3.2637 C56.633,3.4767 62.759,4.7777 61.357,15.5517 L61.03,15.8727 Z" id="Fill-95" fill="#030000"></path>
+                    <path d="M53.156,8.9802 L53.156,4.5572 C53.156,4.5572 53.135,4.4502 53.076,4.2962 C53.052,4.4592 53.024,4.5712 53.024,4.5712 C50.961,3.7272 49.558,5.0832 49.558,5.0832 C52.164,4.4592 52.739,6.1832 52.739,6.1832 C51.31,5.8162 50.138,6.7692 50.138,6.7692 C52.119,6.3832 53.024,7.7952 53.024,7.7952 C50.59,6.5872 47.88,11.4612 47.88,11.4612 C48.079,10.3972 49.364,8.3212 49.364,8.3212 C47.927,9.6892 46.438,13.1102 46.438,13.1102 C47.279,8.7112 49.094,6.2192 49.094,6.2192 C45.522,9.2612 45.515,14.6732 45.515,14.6732 C44.848,10.9102 45.917,7.5332 46.746,5.6242 C45.274,7.3442 44.225,10.3332 44.955,15.5512 L45.282,15.8732 C45.282,15.8732 45.936,17.2032 46.643,15.1812 C47.247,13.4652 50.902,6.7082 53.156,8.9802" id="Fill-97" fill="#000000"></path>
+                    <path d="M61.5476,13.3513 C61.3556,12.3363 60.9746,11.4733 60.9746,11.4733 C61.2666,12.5963 61.1226,14.4293 61.1226,14.4293 C60.6056,11.1813 58.5076,8.5403 58.5076,8.5403 C59.5086,9.9833 60.7066,14.6733 60.3846,14.6733 C60.0626,14.6733 57.6276,9.8853 56.8406,8.6553 C56.0576,7.4253 53.7386,7.9553 53.7386,7.9553 C54.5916,6.6353 56.1356,7.0763 56.1356,7.0763 C54.7436,6.1473 53.5706,6.6113 53.5706,6.6113 C54.4286,5.2903 56.9926,6.6113 56.9926,6.6113 C55.3546,4.9243 53.5706,5.3163 53.5706,5.3163 C54.5226,4.4753 56.2936,5.3163 56.2936,5.3163 C55.2156,4.3543 53.5586,4.6813 53.1556,4.7793 L53.1556,8.9803 C55.4096,6.7083 59.0676,13.4653 59.6666,15.1813 C60.3766,17.2033 61.0296,15.8723 61.0296,15.8723 L61.3576,15.5513 C61.4596,14.7693 61.5216,14.0373 61.5476,13.3513" id="Fill-99" fill="#000000"></path>
+                    <path d="M51.3543,22.6862 L51.3543,22.6862 C51.3543,22.6862 53.2843,23.4372 54.8433,22.6772 C54.3013,22.6342 53.5133,22.5882 53.1573,22.6342 C52.7743,22.5842 51.8943,22.6432 51.3543,22.6862" id="Fill-101" fill="#FFFFFF"></path>
+                    <path d="M58.242,29.6999 C56.17,31.1789 53.96,31.1499413 53.96,31.1499413 C44.862,30.4379 43.607,17.4559 45.706,11.3169 C47.775,5.2559 53.142,6.0339 53.142,6.0339 C66.03,7.4009 58.242,29.6999 58.242,29.6999 M66.88,33.3709 C66.88,33.3709 66.245,32.0609 65.609,31.8169 C64.974,31.5729 64.104,31.0709 63.406,30.4839 C63.406,30.4839 62.78,26.9489 62.264,26.1669 C62.264,26.1669 65.93,10.4159 60.926,4.8609 C57.36,0.9039 52.562,2.2209 52.562,2.2209 C52.562,2.2209 45.824,1.2449 43.661,10.6269 C41.498,20.0099 43.661,26.9389 43.661,26.9389 C43.661,26.9389 42.466,28.2029 41.928,30.7079 C41.928,30.7079 40.953,31.0369 39.878,32.1609 C38.803,33.2839 37.315,34.0179 36.972,34.1649 C36.972,34.1649 35.752,34.7949 34.578,35.6739 C33.406,36.5539 33.064,40.4209 33.064,43.5969 C33.064,46.7719 32.137,57.2789 31.501,58.7459 C31.501,58.7459 32.673,59.9189 34.578,60.2109 C34.578,60.2109 33.991,62.6539 34.334,63.0459 C34.677,63.4369 46.922,63.6959 53.739,58.7119 C53.739,58.7119 55.914,60.9109 56.061,60.9599 C56.208,61.0089 59.726,60.7639 61.826,58.8579 C61.826,58.8579 63.391,59.8359 63.929,59.7379 C64.466,59.6399 66.469,55.7799 67.594,55.3399 C67.594,55.3399 68.765,56.2679 69.351,56.1709 C69.939,56.0729 73.555,51.1369 73.8,48.9879 C73.8,48.9879 73.301,39.6869 72.273,37.4879 C71.248,35.2879 68.737,34.7979 66.88,33.3709 Z" id="Fill-103" fill="#FDE37B"></path>
+                    <path d="M73.7996,48.988 C73.7996,48.988 73.3006,39.687 72.2736,37.488 C72.1486,37.219 72.0016,36.975 71.8346,36.754 C58.1536,58.676 42.2696,60.15 34.4226,60.946 C34.2776,61.698 34.1136,62.795 34.3336,63.046 C34.6766,63.437 46.9216,63.696 53.7386,58.712 C53.7386,58.712 55.9136,60.911 56.0616,60.96 C56.2076,61.009 59.7266,60.764 61.8256,58.858 C61.8256,58.858 61.8646,58.883 61.9346,58.924 C65.6926,56.427 69.3666,53.971 72.7016,51.722 C73.2786,50.691 73.7216,49.69 73.7996,48.988" id="Fill-105" fill="#E2C863"></path>
+                    <path d="M15.6189,22.7263 C15.6909,21.7393 14.8099,20.3753 13.9929,19.5923 C13.1769,18.8093 12.6709,17.7473 13.0969,16.1673 C13.4259,14.9473 14.1989,15.0383 14.5049,14.3213 C14.7309,13.7893 14.6369,13.1833 14.6829,12.6083 C14.8439,10.6313 17.0179,9.0813 18.9379,9.5763 C19.4789,7.6963 21.2319,6.2283 23.1779,6.0263 C25.1229,5.8233 27.1399,6.8993 28.0569,8.6263 C29.1669,8.0493 30.5659,8.0703 31.6599,8.6783 C32.7539,9.2873 33.5079,10.4653 33.6019,11.7123 C34.6839,10.9313 36.3459,11.2323 37.2019,12.2563 C38.0579,13.2813 38.1109,14.8493 37.4609,16.0153 C36.8099,17.1813 35.5499,17.9403 34.2299,18.1433 C32.9099,18.3453 31.5459,18.0343 30.3509,17.4383 C29.1559,16.8423 28.1159,15.9753 27.1689,15.0343" id="Fill-107" fill="#090000"></path>
+                    <path d="M22.992,46.3786076 L22.992,46.3786076 C26.161,46.3836 28.774,43.9226 28.931,40.7866 C29.061,38.1746 29.184,35.5916 29.184,35.5916 C29.184,35.5916 32.592,34.0016 33.994,31.1496 C34.657,29.8026 34.613,26.0286 34.82,23.9116 C35.27,19.3176 34.976,14.8596 34.976,14.8596 C29.627,12.0516 23.163,12.3326 18.083,15.5946 L17.622,15.8906 L17.061,40.4266 C17.025,43.6986 19.69,46.3736 22.992,46.3786076" id="Fill-109" fill="#FFBE9D"></path>
+                    <path d="M29.5974,27.1237 C29.6014,27.0837 29.9954,27.0937 30.6284,27.1417 C30.7924,27.1577 30.9244,27.1517 30.9514,27.0837 C30.9974,27.0097 30.9664,26.8557 30.9184,26.6827 C30.8334,26.3177 30.7464,25.9477 30.6564,25.5617 C30.3034,23.9687 30.0944,22.6677 30.1914,22.6567 C30.2874,22.6457 30.6524,23.9297 31.0054,25.5227 C31.0864,25.9107 31.1634,26.2807 31.2414,26.6467 C31.2664,26.8117 31.3394,27.0117 31.2084,27.2137 C31.1414,27.3137 30.9974,27.3687 30.8864,27.3717 C30.7744,27.3777 30.6834,27.3597 30.6064,27.3487 C29.9784,27.2467 29.5924,27.1637 29.5974,27.1237" id="Fill-111" fill="#A5644F"></path>
+                    <path d="M29.1843,35.5915 C29.1843,35.5915 26.1373,35.5915 23.0843,33.3285 C23.0843,33.3285 24.2813,36.8635 29.0943,36.8215 L29.1843,35.5915 Z" id="Fill-113" fill="#EB996E"></path>
+                    <path d="M17.5056,22.8542 C17.5106,22.4702 17.2146,22.1402 16.8276,22.1222 C15.9336,22.0802 14.4636,22.4032 14.2776,24.8472 C14.0146,28.3382 17.4236,27.5332 17.4376,27.4332 C17.4476,27.3552 17.4876,24.2122 17.5056,22.8542" id="Fill-115" fill="#FFBE9D"></path>
+                    <path d="M16.6863,26.0446 C16.6713,26.0316 16.6223,26.0826 16.5143,26.1216 C16.4103,26.1596 16.2343,26.1786 16.0553,26.0976 C15.6933,25.9336 15.4243,25.3246 15.4553,24.6936 C15.4693,24.3756 15.5603,24.0776 15.6923,23.8356 C15.8193,23.5886 15.9993,23.4226 16.1893,23.4036 C16.3793,23.3746 16.5033,23.4956 16.5393,23.5976 C16.5793,23.6986 16.5513,23.7666 16.5693,23.7736 C16.5793,23.7836 16.6493,23.7216 16.6323,23.5746 C16.6233,23.5046 16.5873,23.4186 16.5103,23.3456 C16.4303,23.2716 16.3093,23.2276 16.1773,23.2316 C15.9043,23.2306 15.6413,23.4596 15.4953,23.7256 C15.3343,23.9906 15.2253,24.3246 15.2083,24.6826 C15.1783,25.3876 15.4923,26.0726 15.9903,26.2566 C16.2333,26.3396 16.4453,26.2806 16.5583,26.2066 C16.6733,26.1286 16.6983,26.0516 16.6863,26.0446" id="Fill-117" fill="#EB996E"></path>
+                    <path d="M27.2537,22.6706 C27.2537,22.6706 26.8707,20.5776 24.7847,21.0416 C23.4747,21.3336 23.7397,22.7906 23.7397,22.7906 L27.2537,22.6706 Z" id="Fill-119" fill="#EB996E"></path>
+                    <path d="M27.1853,22.9938 C27.1853,22.9938 27.3113,22.8928 27.2533,22.6708 C27.1963,22.4468 25.1643,20.7468 23.8093,22.8208 C23.8093,22.8208 25.7303,24.6958 27.1853,22.9938" id="Fill-121" fill="#EFEFEC"></path>
+                    <path d="M26.5965,22.7097 C26.5965,23.1887 26.2085,23.5747 25.7305,23.5747 C25.2535,23.5747 24.8655,23.1887 24.8655,22.7097 C24.8655,22.2317 25.2535,21.8437 25.7305,21.8437 C26.2085,21.8437 26.5965,22.2317 26.5965,22.7097" id="Fill-123" fill="#2A191D"></path>
+                    <path d="M26.1384,22.7097 C26.1384,22.9347 25.9564,23.1167 25.7304,23.1167 C25.5064,23.1167 25.3244,22.9347 25.3244,22.7097 C25.3244,22.4837 25.5064,22.3027 25.7304,22.3027 C25.9564,22.3027 26.1384,22.4837 26.1384,22.7097" id="Fill-125" fill="#040000"></path>
+                    <path d="M24.5164,23.3376 C24.2584,23.1966 24.0034,23.0536 23.7574,22.8946 L23.6804,22.8456 L23.7344,22.7716 C23.8434,22.6186 23.9284,22.4436 24.0644,22.3066 C24.1874,22.1556 24.3414,22.0356 24.5074,21.9276 C24.5864,21.8676 24.6824,21.8376 24.7714,21.7926 C24.8594,21.7436 24.9584,21.7266 25.0544,21.6986 C25.2464,21.6456 25.4524,21.6466 25.6464,21.6696 C26.0374,21.7156 26.4074,21.8566 26.7194,22.0746 C26.8744,22.1836 27.0264,22.2966 27.1534,22.4416 C27.2094,22.5076 27.2954,22.5946 27.3004,22.7046 C27.3004,22.8086 27.2684,22.8966 27.2344,22.9836 C27.2384,22.8916 27.2404,22.7966 27.2204,22.7186 C27.1994,22.6436 27.1284,22.6016 27.0584,22.5426 C26.9184,22.4356 26.7654,22.3406 26.6094,22.2606 C26.2894,22.1086 25.9584,21.9836 25.6194,21.9616 C25.4504,21.9436 25.2824,21.9656 25.1204,21.9976 C25.0384,22.0166 24.9554,22.0256 24.8804,22.0646 C24.8044,22.1016 24.7214,22.1196 24.6524,22.1706 C24.5034,22.2546 24.3704,22.3596 24.2454,22.4816 C24.1054,22.5886 24.0084,22.7396 23.8864,22.8696 L23.8624,22.7466 C24.0874,22.9336 24.3034,23.1326 24.5164,23.3376" id="Fill-127" fill="#000000"></path>
+                    <path d="M25.5642,22.4138 C25.5642,22.5268 25.4722,22.6198 25.3572,22.6198 C25.2442,22.6198 25.1522,22.5268 25.1522,22.4138 C25.1522,22.3008 25.2442,22.2078 25.3572,22.2078 C25.4722,22.2078 25.5642,22.3008 25.5642,22.4138" id="Fill-129" fill="#EFEFEC"></path>
+                    <path d="M27.8386,20.2907 C27.8386,20.2907 27.4696,20.6707 26.0206,20.0937 C24.4236,19.4557 22.9716,19.8797 22.8316,20.0377 C22.8316,20.0377 25.0966,18.3067 27.8386,20.2907" id="Fill-131" fill="#000000"></path>
+                    <path d="M30.824,22.9792 C30.824,22.9792 31.207,20.8862 33.293,21.3502 C34.603,21.6422 34.337,23.0992 34.337,23.0992 L30.824,22.9792 Z" id="Fill-133" fill="#EB996E"></path>
+                    <path d="M30.8923,23.3024 C30.8923,23.3024 30.7653,23.2014 30.8243,22.9794 C30.8813,22.7554 32.9133,21.0554 34.2673,23.1294 C34.2673,23.1294 32.3473,25.0044 30.8923,23.3024" id="Fill-135" fill="#EFEFEC"></path>
+                    <path d="M31.4802,23.0183 C31.4802,23.4973 31.8692,23.8833 32.3472,23.8833 C32.8232,23.8833 33.2122,23.4973 33.2122,23.0183 C33.2122,22.5403 32.8232,22.1523 32.3472,22.1523 C31.8692,22.1523 31.4802,22.5403 31.4802,23.0183" id="Fill-137" fill="#2A191D"></path>
+                    <path d="M31.9392,23.0183 C31.9392,23.2433 32.1212,23.4253 32.3472,23.4253 C32.5702,23.4253 32.7532,23.2433 32.7532,23.0183 C32.7532,22.7923 32.5702,22.6113 32.3472,22.6113 C32.1212,22.6113 31.9392,22.7923 31.9392,23.0183" id="Fill-139" fill="#040000"></path>
+                    <path d="M33.5603,23.6462 C33.8183,23.5052 34.0743,23.3622 34.3203,23.2032 L34.3973,23.1542 L34.3433,23.0802 C34.2333,22.9272 34.1493,22.7522 34.0133,22.6152 C33.8893,22.4642 33.7353,22.3442 33.5703,22.2362 C33.4903,22.1762 33.3943,22.1472 33.3053,22.1012 C33.2183,22.0522 33.1183,22.0352 33.0223,22.0072 C32.8313,21.9542 32.6243,21.9552 32.4313,21.9782 C32.0403,22.0242 31.6693,22.1662 31.3583,22.3832 C31.2033,22.4922 31.0503,22.6052 30.9243,22.7502 C30.8683,22.8172 30.7813,22.9032 30.7772778,23.0132 C30.7763,23.1172 30.8093,23.2052 30.8423,23.2922 C30.8393,23.2002 30.8363,23.1052 30.8573,23.0272 C30.8773,22.9522 30.9493,22.9102 31.0193,22.8512 C31.1593,22.7442 31.3113,22.6492 31.4683,22.5692 C31.7873,22.4172 32.1193,22.2922 32.4583,22.2702 C32.6273,22.2522 32.7953,22.2742 32.9563,22.3062 C33.0393,22.3252 33.1213,22.3342 33.1973,22.3732 C33.2723,22.4102 33.3563,22.4282 33.4253,22.4792 C33.5733,22.5632 33.7063,22.6682 33.8323,22.7902 C33.9713,22.8972 34.0693,23.0482 34.1913,23.1782 L34.2143,23.0552 C33.9903,23.2422 33.7733,23.4412 33.5603,23.6462" id="Fill-141" fill="#000000"></path>
+                    <path d="M32.5134,22.7224 C32.5134,22.8354 32.6054,22.9284 32.7194,22.9284 C32.8334,22.9284 32.9244,22.8354 32.9244,22.7224 C32.9244,22.6094 32.8334,22.5164 32.7194,22.5164 C32.6054,22.5164 32.5134,22.6094 32.5134,22.7224" id="Fill-143" fill="#EFEFEC"></path>
+                    <path d="M30.239,20.5993 C30.239,20.5993 30.608,20.9793 32.057,20.4023 C33.653,19.7643 35.106,20.1883 35.245,20.3463 C35.245,20.3463 32.981,18.6153 30.239,20.5993" id="Fill-145" fill="#000000"></path>
+                    <path d="M35.6511,16.362 C35.6511,16.362 32.7741,17.755 29.0291,15.885 C26.5731,14.659 23.7091,14.06 23.0771,14.554 C22.4461,15.049 22.3121,17.58 19.8791,18.319 C19.8791,18.319 20.0461,23.149 18.1201,22.977 C16.1941,22.804 17.3971,15.323 17.3971,15.323 L22.1091,13.022 L27.2511,12.051 L32.0941,12.734 L35.8431,13.76 L35.6511,16.362 Z" id="Fill-147" fill="#090000"></path>
+                    <path d="M3.407,44.3122 C8.441,39.1352 17.303,39.7002 17.303,39.7002 L24.648,44.9582 L28.814,40.1092 C28.814,40.1092 33.191,40.5892 37.293,42.7332 L37.576,42.8202 L37.572,42.8782 C40.794,44.6282 41.9634425,51.9584801 46.3104425,56.0304801 L44.502,57.7242 L38.745,62.8332 C38.745,62.8332 38.767,62.8712 38.755,62.9362 C38.695,63.2462 39.555,70.2752 40.436,75.6172 C35.193,80.6202 28.511,82.7622 21.092,81.4612 C18.736,81.0492 17.596,80.4752 15.416,79.9032 C12.193,79.0572 9.857,76.2632 9.568,72.9442 C9.176,68.4662 8.877,62.9222 8.877,62.9222" id="Fill-149" fill="#67AD72"></path>
+                    <path d="M33.4197,41.0123099 C33.4377,41.0064 33.5487,41.3004 33.7357,41.8384 C33.9247,42.3754 34.1807,43.1584 34.4827,44.1294 C35.0897,46.0724 35.8617,48.7764 36.5927,51.7944 C37.3197,54.8154 37.8677,57.5744 38.2147,59.5784 C38.3887,60.5814 38.5177,61.3954 38.5957,61.9584 C38.6737,62.5224 38.7087,62.8344 38.6907,62.8374218 C38.6727,62.8404 38.6027,62.5334 38.4927,61.9764 C38.3747,61.3744 38.2177,60.5774 38.0287,59.6144 C37.6347,57.6194 37.0597,54.8714 36.3317,51.8574 C35.6037,48.8444 34.8607,46.1374 34.3027,44.1834 C34.0307,43.2394 33.8067,42.4584 33.6367,41.8694 C33.4807,41.3234 33.4017,41.0184 33.4197,41.0123099" id="Fill-151" fill="#263238"></path>
+                    <path d="M38.1492,59.5212 C38.1022,59.4632 40.2982,57.5972 43.0542,55.3522 C45.8102,53.1072 48.0822,51.3332 48.1282,51.3912 C48.1742,51.4482 45.9792,53.3142 43.2222,55.5592 C40.4672,57.8042 38.1962,59.5782 38.1492,59.5212" id="Fill-153" fill="#263238"></path>
+                    <path d="M10.0525,51.4196 L5.5465,66.2426 L7.2235,67.1146 L8.8765,62.9226 C8.8765,62.9226 10.5755,54.1156 10.0525,51.4196" id="Fill-155" fill="#000000"></path>
+                    <path d="M32.9314,41.0212 C35.3604,42.3012 29.2724,45.3832 26.5234,45.3002 L28.5194,40.0322 C28.5194,40.0322 32.1164,40.5912 32.9314,41.0212" id="Fill-157" fill="#000000" opacity="0.4"></path>
+                    <path d="M16.5789,40.0319 L16.5789,36.1059 C16.5789,36.1059 24.2459,38.0799 24.5239,42.6669 C24.5239,42.6669 25.4999,37.5959 29.4499,37.3529 L30.0079,44.4859 L25.4109,48.4849 L20.7519,48.4849 L17.0609,45.3019 L16.5789,40.3479" id="Fill-159" fill="#67AD72"></path>
+                    <path d="M26.2498,64.6706025 C26.2308,64.6696 26.2278,64.3686 26.2358,63.8266 C26.2478,63.2836 26.2578,62.4996 26.2608,61.5296 C26.2668,59.5916 26.2058,56.9126 25.9628,53.9666 C25.7168,51.0196 25.3348,48.3666 25.0078,46.4556 C24.8448,45.5366 24.7088,44.7746 24.6048,44.1946 C24.5068,43.6616 24.4618,43.3646 24.4788,43.359577 C24.4968,43.3566 24.5778,43.6466 24.7068,44.1736 C24.8398,44.7006 25.0068,45.4686 25.1938,46.4226 C25.5688,48.3286 25.9818,50.9866 26.2288,53.9436 C26.4738,56.9006 26.5048,59.5906 26.4488,61.5326 C26.4228,62.5036 26.3838,63.2896 26.3408,63.8306 C26.2998,64.3726 26.2688,64.6716 26.2498,64.6706025" id="Fill-161" fill="#263238"></path>
+                    <path d="M24.1716,41.3464 C24.1686,41.3694 23.9976,41.2804 23.7166,41.3884 C23.4236,41.4834 23.1616,41.8484 22.9466,42.3684 C22.4766,43.3894 21.8946,44.8604 21.4886,46.6114 L21.4476,46.7854 L21.2936,46.6924 C20.8346,46.4154 20.3646,46.1164 19.8926,45.7954 C18.9766,45.1714 18.1386,44.5364 17.4056,43.9074 C17.0376,43.5904 16.7346,43.2064 16.5606,42.7984 C16.3876,42.3904 16.3196,41.9824 16.3016,41.6154 C16.2716,40.8754 16.3926,40.2934 16.4716,39.8984 C16.5576,39.5014 16.6226,39.2864 16.6396,39.2903452 C16.6586,39.2934 16.6286,39.5164 16.5736,39.9154 C16.5266,40.3134 16.4376,40.8954 16.4896,41.6024 C16.5206,41.9534 16.5956,42.3354 16.7626,42.7074 C16.9326,43.0794 17.2086,43.4194 17.5686,43.7214 C18.2936,44.3274 19.1356,44.9574 20.0426,45.5744 C20.5116,45.8924 20.9766,46.1914 21.4296,46.4684 L21.2336,46.5504 C21.6566,44.7804 22.2776,43.3034 22.7946,42.2944 C22.9216,42.0434 23.0436,41.8104 23.1976,41.6344 C23.3476,41.4554 23.5296,41.3464 23.6876,41.3024 C24.0126,41.2114 24.1836,41.3424 24.1716,41.3464" id="Fill-163" fill="#263238"></path>
+                    <path d="M29.45,37.3531966 C29.469,37.3522 29.492,37.5712 29.521,37.9652 C29.554,38.4152 29.596,38.9752 29.644,39.6362 C29.702,40.3402 29.787,41.1762 29.931,42.0972 C29.987,42.5522 30.147,43.0452 30.023,43.6042 C29.864,44.1532 29.452,44.5622 29.014,44.8922 C28.4,45.3492 27.759,45.6912 27.328,46.1742 L27.123,46.4032 L27.103,46.0972 C26.997,44.4762 26.455,43.1422 25.971,42.2742 C25.483,41.4002 25.081,40.9502 25.113,40.9242 C25.124,40.9162 25.233,41.0192 25.416,41.2272 C25.596,41.4372 25.845,41.7582 26.111,42.1932 C26.643,43.0532 27.233,44.4102 27.359,46.0802 L27.136,46.0032 C27.604,45.4712 28.267,45.1182 28.853,44.6792 C29.271,44.3682 29.639,43.9822 29.769,43.5402 C29.879,43.0892 29.743,42.5992 29.687,42.1332 C29.555,41.2032 29.489,40.3582 29.456,39.6492 C29.422,38.9402 29.416,38.3662 29.418,37.9692 C29.42,37.5732 29.431,37.3531966 29.45,37.3531966" id="Fill-165" fill="#263238"></path>
+                    <path d="M54.1277,38.3376 C53.8157,38.7046 42.5277,53.7976 42.5277,53.7976 L44.1167,54.6976 L55.6997,39.7976 L54.1277,38.3376 Z" id="Fill-167" fill="#263238"></path>
+                    <path d="M10.9441,48.903 C10.9441,48.903 20.4971,70.414 20.9411,69.759 C23.2931,66.298 35.0711,59.763 40.1711,54.436 C40.3831,54.151 40.7661,52.127 41.6311,50.929 C41.6311,50.929 43.3781,45.03 44.7451,45.481 C46.1131,45.931 43.9961,48.461 44.8861,50.689 C45.7771,52.918 49.8571,47.603 50.0201,47.126 L51.0721,45.751 C51.0721,45.751 52.0351,48.879 52.1001,50.185 C52.3481,55.088 44.5021,57.724 44.5021,57.724 C44.5021,57.724 30.1241,81.369 17.9461,82.051 C14.4381,82.249 8.2061,72.297 4.0391,64.834 C1.5221,60.327 2.7781,54.65 6.9491,51.609 L10.9441,48.903 Z" id="Fill-169" fill="#FFBE9D"></path>
+                    <path d="M50.1023,50.9284 C50.0633,50.9044 50.4433,50.2324 50.8633,49.3804 C51.2863,48.5294 51.5893,47.8194 51.6323,47.8354 C51.6723,47.8504 51.4333,48.5924 51.0063,49.4514 C50.5823,50.3124 50.1373,50.9514 50.1023,50.9284" id="Fill-171" fill="#EB996E"></path>
+                    <g id="Group-175" transform="translate(0.000000, 41.054800)">
+                        <mask id="mask-2" fill="white">
+                            <use xlink:href="#path-1"></use>
+                        </mask>
+                        <g id="Clip-174"></g>
+                        <path d="M6.7732,0.8746 C6.7732,0.8746 -5.9718,5.4056 3.5032,26.8386 L18.2162,17.9586 L16.1242,12.9466 L6.7732,0.8746 Z" id="Fill-173" fill="#67AD72" mask="url(#mask-2)"></path>
+                    </g>
+                    <path d="M5.7966,42.2995 C5.7966,42.2995 6.3536,42.2075 7.3306,42.4295 C7.8146,42.5535 8.3946,42.7665 9.0026,43.1345 C9.6116,43.4995 10.2446,44.0125 10.8586,44.6575 C12.0966,45.9465 13.2506,47.7465 14.3206,49.8295 C15.4006,51.9135 16.4056,54.2875 17.4376,56.7815 C17.7466,57.5285 18.0516,58.2645 18.3396,58.9625 L18.3856,59.0725 L18.2806,59.1295 C14.0246,61.4495 10.3176,63.6235 7.6966,65.2495 C6.3866,66.0615 5.3426,66.7285 4.6256,67.1925 C4.2826,67.4115 4.0086,67.5875 3.7996,67.7225 C3.6096,67.8415 3.5086,67.9005 3.5036,67.8935 C3.4986,67.8865 3.5916,67.8135 3.7716,67.6805 C3.9526,67.5495 4.2196,67.3535 4.5716,67.1125 C5.2726,66.6225 6.3026,65.9315 7.6026,65.0995 C10.1996,63.4305 13.8966,61.2275 18.1526,58.8975 L18.0946,59.0645 C17.8056,58.3665 17.4996,57.6305 17.1906,56.8835 C16.1586,54.3905 15.1626,52.0215 14.1026,49.9435 C13.0496,47.8635 11.9226,46.0725 10.7226,44.7875 C10.1256,44.1445 9.5136,43.6315 8.9246,43.2615 C8.3356,42.8895 7.7746,42.6665 7.3046,42.5295 C6.3536,42.2815 5.7936,42.3375 5.7966,42.2995" id="Fill-176" fill="#263238"></path>
+                    <path d="M33.2136,10.5240615 C33.2236,10.5221 33.2436,10.5981 33.2766,10.7481 C33.3006,10.8971 33.3326,11.1221 33.3146,11.4131 C33.2856,11.9821 33.0776,12.8651 32.3416,13.6351 C31.6306,14.4071 30.2756,14.8941 28.9116,14.5021 C28.2436,14.3061 27.5686,13.8991 27.1546,13.2281 C26.9546,12.8961 26.8346,12.4831 26.8926,12.0691 C26.9476,11.6641 27.1516,11.2531 27.5236,11.0091 C27.8936,10.7581 28.3796,10.7651 28.7556,10.9301 C29.1356,11.0921 29.4496,11.4021 29.5976,11.7771 C29.8986,12.5311 29.6766,13.3451 29.2606,13.9111 C28.3766,15.0821 26.7786,15.1761 25.8946,14.6431 C25.4266,14.4281 25.0146,14.2261 24.6256,14.1561 C24.2386,14.0771 23.8966,14.1441 23.6456,14.2591 C23.1416,14.5021 22.9386,14.7701 22.9146,14.7411 C22.9076,14.7341 22.9596,14.6731 23.0656,14.5641 C23.1166,14.5081 23.1816,14.4391 23.2746,14.3761 C23.3626,14.3061 23.4656,14.2261 23.6016,14.1661 C23.8586,14.0281 24.2346,13.9381 24.6506,14.0081 C25.0696,14.0701 25.5046,14.2691 25.9696,14.4691 C26.2036,14.5641 26.4486,14.6681 26.7106,14.7141 C26.9666,14.7581 27.2546,14.7531 27.5366,14.6991 C28.1036,14.5971 28.6836,14.2871 29.0626,13.7651 C29.4336,13.2541 29.6176,12.5121 29.3566,11.8781 C29.1266,11.2581 28.2636,10.8381 27.6696,11.2331 C27.3796,11.4211 27.2026,11.7621 27.1556,12.1041 C27.1076,12.4501 27.2046,12.7971 27.3806,13.0941 C27.7416,13.6911 28.3616,14.0801 28.9816,14.2651 C30.2486,14.6431 31.5236,14.2111 32.2076,13.5031 C32.9206,12.7931 33.1516,11.9551 33.2106,11.4041 C33.2716,10.8411 33.1846,10.5271 33.2136,10.5240615" id="Fill-178" fill="#455A64"></path>
+                    <path d="M34.0593,12.2526 C34.0823,12.2406 34.2723,12.5816 34.3063,13.1956 C34.3443,13.7976 34.1693,14.6916 33.5443,15.4176 C32.9143,16.1406 32.0533,16.4396 31.4523,16.4866 C30.8393,16.5406 30.4753,16.4016 30.4843,16.3766 C30.4903,16.3306 30.8573,16.3986 31.4273,16.2996 C31.9893,16.2086 32.7683,15.9006 33.3423,15.2426 C33.9123,14.5816 34.1063,13.7676 34.1173,13.1976 C34.1333,12.6196 34.0143,12.2656 34.0593,12.2526" id="Fill-180" fill="#455A64"></path>
+                    <path d="M16.698,55.2077 C16.73,55.2727 13.345,57.0147 9.137,59.0947 C4.928,61.1757 1.491,62.8097 1.458,62.7427 C1.426,62.6767 4.81,60.9367 9.019,58.8547 C13.226,56.7737 16.665,55.1417 16.698,55.2077" id="Fill-182" fill="#E0E0E0"></path>
+                    <path d="M13.6121,49.3845 C13.6471,49.4495 10.6331,51.1355 6.8831,53.1485 C3.1301,55.1625 0.0601,56.7415 0.0261,56.6765 C-0.0089,56.6125 3.0041,54.9275 6.7571,52.9125 C10.5081,50.8995 13.5781,49.3205 13.6121,49.3845" id="Fill-184" fill="#E0E0E0"></path>
+                    <path d="M10.6316,44.6765 C10.6496,44.7095 10.0696,45.0425 9.1246,45.5685 C8.1146,46.1315 6.8446,46.8405 5.4396,47.6245 C4.0396,48.4215 2.7766,49.1435 1.7726,49.7155 C0.8336,50.2515 0.2486,50.5755 0.2296,50.5435 C0.2096,50.5135 0.7606,50.1315 1.6746,49.5535 C2.5886,48.9755 3.8686,48.2025 5.3076,47.3915 C6.7456,46.5805 8.0686,45.8845 9.0356,45.4015 C10.0046,44.9175 10.6156,44.6445 10.6316,44.6765" id="Fill-186" fill="#E0E0E0"></path>
+                    <path d="M21.906,43.5632 C21.899,43.5932 21.505,43.5422 20.915,43.2962 C20.325,43.0552 19.561,42.5912 18.839,41.9452 C18.115,41.2982 17.554,40.6252 17.164,40.1312 C16.776,39.6362 16.557,39.3142 16.585,39.2912 C16.614,39.2662 16.885,39.5462 17.308,40.0092 C17.733,40.4692 18.309,41.1142 19.016,41.7452 C19.722,42.3762 20.441,42.8472 20.994,43.1252 C21.546,43.4072 21.918,43.5222 21.906,43.5632" id="Fill-188" fill="#E0E0E0"></path>
+                    <path d="M29.3953,40.7819 C29.4603,40.8019 29.1493,41.6359 28.3293,42.3209 C27.5143,43.0129 26.6383,43.1779 26.6303,43.1099 C26.6053,43.0329 27.3953,42.7669 28.1573,42.1169 C28.9273,41.4769 29.3243,40.7439 29.3953,40.7819" id="Fill-190" fill="#E0E0E0"></path>
+                    <path d="M42.7449075,48.5085 C42.7459,48.5175 42.6469,48.5355 42.4589,48.5615 C42.2409,48.5885 41.9679,48.6215 41.6329,48.6635 C40.9149,48.7425 39.8739,48.8435 38.5869,48.9435 C36.0119,49.1485 32.4489,49.3495 28.5109,49.4925 C24.5709,49.6305 21.0029,49.6845 18.4199,49.6625 C17.1289,49.6545 16.0839,49.6295 15.3609,49.6015 C15.0249,49.5835 14.7499,49.5705 14.5309,49.5585 C14.3409,49.5455 14.2409,49.5345 14.2418926,49.5255 C14.2418926,49.5165 14.3419,49.5095 14.5319,49.5045 C14.7519,49.5025 15.0259,49.4995 15.3629,49.4965 C16.1219,49.4905 17.1569,49.4835 18.4199,49.4735 C20.9999,49.4465 24.5639,49.3625 28.5019,49.2265 C32.4359,49.0825 35.9979,48.9105 38.5739,48.7545 C39.8339,48.6735 40.8659,48.6085 41.6239,48.5595 C41.9599,48.5385 42.2339,48.5225 42.4539,48.5085 C42.6429,48.4985 42.7439,48.4985 42.7449075,48.5085" id="Fill-192" fill="#E0E0E0"></path>
+                    <path d="M38.6902099,54.5954 C38.6922,54.6144 38.3922,54.6604 37.8462,54.7284 C37.3012,54.7964 36.5112,54.8814 35.5342,54.9694 C33.5782,55.1504 30.8712,55.3354 27.8772,55.4574 C24.8812,55.5774 22.1682,55.6114 20.2052,55.5884 C19.2222,55.5804 18.4282,55.5594 17.8792,55.5344 C17.3312,55.5114 17.0272,55.4894 17.0281975,55.4704 C17.0281975,55.4524 17.3322,55.4394 17.8802,55.4314 C18.4752,55.4234 19.2572,55.4124 20.2042,55.4004 C22.1662,55.3734 24.8752,55.3104 27.8662,55.1914 C30.8562,55.0694 33.5612,54.9124 35.5192,54.7814 C36.4622,54.7174 37.2442,54.6644 37.8372,54.6244 C38.3842,54.5884 38.6882,54.5774 38.6902099,54.5954" id="Fill-194" fill="#E0E0E0"></path>
+                    <path d="M29.4881184,62.1052 C29.4921,62.1402 28.8421,62.2362 27.7871,62.3442 C26.7311,62.4532 25.2701,62.5702 23.6541,62.6512 C22.0371,62.7312 20.5711,62.7592 19.5101,62.7562 C18.4501,62.7532 17.7951,62.7222 17.7941,62.6862 C17.7941,62.6492 18.4491,62.6132 19.5071,62.5672 C20.6411,62.5172 22.0651,62.4542 23.6401,62.3842 C25.2151,62.2972 26.6371,62.2182 27.7711,62.1562 C28.8291,62.0962 29.4851,62.0672 29.4881184,62.1052" id="Fill-196" fill="#E0E0E0"></path>
+                    <path d="M17.7234043,44.2868 C17.7214,44.3628 16.1474,44.3808 14.2084,44.4618 C12.2704,44.5398 10.6994,44.6518 10.6913695,44.5758 C10.6834,44.5058 12.2484,44.2728 14.1984,44.1938 C16.1464,44.1128 17.7264,44.2158 17.7234043,44.2868" id="Fill-198" fill="#E0E0E0"></path>
+                    <path d="M39.3816,44.0095 C39.3816,44.0835 37.3386,44.1355 34.8196,44.1255 C32.2996,44.1165 30.2586,44.0485 30.2586,43.9755 C30.2586,43.9015 32.3006,43.8495 34.8206,43.8595 C37.3396,43.8675 39.3816,43.9365 39.3816,44.0095" id="Fill-200" fill="#E0E0E0"></path>
+                    <path d="M40.1697,75.2487 C40.1777,75.2657 40.0117,75.3597 39.7017,75.5177 C39.3947,75.6777 38.9387,75.8867 38.3667,76.1257 C37.2247,76.6057 35.6017,77.1737 33.7557,77.6007 C31.9077,78.0247 30.1997,78.2257 28.9627,78.2937 C28.3437,78.3287 27.8427,78.3397 27.4957,78.3307 C27.1487,78.3247 26.957699,78.3127 26.957699,78.2947 C26.9567,78.2517 27.7217,78.2227 28.9477,78.1047 C30.1747,77.9887 31.8637,77.7607 33.6947,77.3407 C35.5257,76.9167 37.1447,76.3827 38.2977,75.9497 C39.4517,75.5187 40.1517,75.2107 40.1697,75.2487" id="Fill-202" fill="#E0E0E0"></path>
+                    <path d="M85.9304,36.2448 C85.9304,36.2448 84.3424,34.4348 84.4754,25.6538 L80.1354,25.6538 L75.9984,25.6538 C76.1314,34.4348 74.3414,36.2448 74.3414,36.2448" id="Fill-204" fill="#BB715A"></path>
+                    <path d="M85.0047,33.3444 C84.5727,31.6234 84.5837,29.8594 84.4377,27.2004 L79.9937,27.4654 L75.9487,27.0834 C75.8607,28.6814 75.9927,30.3284 75.8387,31.4734" id="Fill-206" fill="#A35D4B"></path>
+                    <path d="M89.1072,17.8112 C89.1072,17.8112 90.3472,15.3542 91.7762,16.0792 C92.5772,16.4852 91.8462,22.9412 89.1072,22.6292 C89.1072,22.6292 88.6232,22.4572 88.5882,21.4162 L89.1072,17.8112 Z" id="Fill-208" fill="#D0846A"></path>
+                    <path d="M91.1404,16.8893 C91.1404,16.8893 91.9164,19.3603 90.8614,19.9463 C90.8614,19.9463 90.2994,20.1363 90.3314,20.4043 C90.3664,20.6693 90.1164,22.4603 89.4834,21.8873 C89.4834,21.8873 88.9944,21.0743 89.6034,20.7713 C90.2134,20.4663 89.7834,20.4533 89.2974,19.8053 C89.2974,19.8053 90.2014,16.7083 91.1404,16.8893" id="Fill-210" fill="#A5644F"></path>
+                    <path d="M91.3943,18.7106 C91.3613,18.2616 91.3213,17.8076 91.2133,17.3916 C91.1883,17.2866 91.1483,17.1906 91.1043,17.1136 C91.0473,17.0376 91.0163,17.0336 90.9863,17.0496 C90.8763,17.0876 90.8763,17.1266 90.7823,17.2046 C90.7123,17.2776 90.6403,17.3546 90.5773,17.4396 C90.3103,17.7756 90.0923,18.1636 89.9063,18.5566 C89.7293,18.9356 89.5273,19.3816 89.5533,19.7226 L89.5043,19.6276 C89.6793,19.8236 89.8473,20.0136 89.9683,20.2716 C89.9963,20.3366 90.0253,20.4056 90.0343,20.4946 C90.0543,20.5726 90.0283,20.7116 89.9383,20.7946 C89.8613,20.8666 89.7223,20.8816 89.7173,20.8826 L89.5403,20.9386 C89.5203,20.9716 89.5023,20.9946 89.4703,21.0176 L89.4103,21.1556 C89.3913,21.2596 89.3683,21.3726 89.3893,21.4866 C89.3913,21.5466 89.4023,21.6026 89.4243,21.6576 C89.4473,21.7096 89.4533,21.7746 89.4903,21.8186 C89.5453,21.9276 89.6263,22.0096 89.7313,22.0846 C89.6183,22.0366 89.5003,21.9746 89.4233,21.8646 C89.3723,21.8186 89.3553,21.7556 89.3183,21.6996 C89.2843,21.6446 89.2603,21.5816 89.2473,21.5176 C89.2033,21.3916 89.1963,21.2526 89.2073,21.1126 C89.2263,21.0436 89.2463,20.9726 89.2733,20.9026 C89.3233,20.8336 89.3873,20.7626 89.4513,20.7066 L89.6233,20.6336 C89.7343,20.5986 89.7203,20.5986 89.7413,20.5866 C89.7383,20.5976 89.7353,20.5096 89.6743,20.4176 C89.5653,20.2366 89.4073,20.0436 89.2443,19.8826 L89.1993,19.8366 L89.1943,19.7866 C89.1483,19.2196 89.3573,18.8086 89.5453,18.3806 C89.7583,17.9686 89.9983,17.5746 90.3033,17.2136 C90.3773,17.1226 90.4613,17.0366 90.5543,16.9546 C90.6253,16.8886 90.8013,16.7686 90.9153,16.7536 C91.1073,16.6986 91.2923,16.8626 91.3373,16.9816 C91.3933,17.1056 91.4253,17.2256 91.4413,17.3426 C91.5073,17.8106 91.4633,18.2636 91.3943,18.7106" id="Fill-212" fill="#975238"></path>
+                    <path d="M71.2888,17.8112 C71.2888,17.8112 70.0488,15.3542 68.6198,16.0792 C67.8168,16.4852 68.5498,22.9412 71.2888,22.6292 C71.2888,22.6292 71.7728,22.4572 71.8078,21.4162 L71.2888,17.8112 Z" id="Fill-214" fill="#D0846A"></path>
+                    <path d="M69.2547,16.8893 C69.2547,16.8893 68.4807,19.3603 69.5347,19.9463 C69.5347,19.9463 70.0937,20.1363 70.0627,20.4043 C70.0307,20.6693 70.2797,22.4603 70.9127,21.8873 C70.9127,21.8873 71.4007,21.0743 70.7897,20.7713 C70.1817,20.4663 70.6127,20.4533 71.0987,19.8053 C71.0987,19.8053 70.1977,16.7083 69.2547,16.8893" id="Fill-216" fill="#A5644F"></path>
+                    <path d="M68.9998,18.7106 C68.9318,18.2636 68.8878,17.8106 68.9528,17.3426 C68.9708,17.2256 69.0018,17.1056 69.0578,16.9816 C69.1038,16.8626 69.2888,16.6986 69.4798,16.7536 C69.5938,16.7686 69.7678,16.8896 69.8428,16.9546 C69.9338,17.0366 70.0168,17.1246 70.0928,17.2156 C70.3968,17.5746 70.6368,17.9686 70.8508,18.3806 C71.0388,18.8086 71.2478,19.2196 71.1998,19.7866 L71.1948,19.8386 L71.1488,19.8826 C70.9868,20.0436 70.8318,20.2366 70.7208,20.4176 C70.6578,20.5096 70.6558,20.5976 70.6528,20.5866 C70.6728,20.5986 70.6578,20.5986 70.7708,20.6336 L70.9428,20.7066 C71.0058,20.7606 71.0698,20.8326 71.1208,20.9016 C71.1478,20.9716 71.1658,21.0416 71.1868,21.1106 C71.1988,21.2516 71.1918,21.3906 71.1478,21.5166 C71.1348,21.5806 71.1108,21.6426 71.0768,21.6986 C71.0408,21.7556 71.0248,21.8186 70.9728,21.8646 C70.8958,21.9736 70.7788,22.0366 70.6648,22.0846 C70.7698,22.0096 70.8508,21.9276 70.9048,21.8186 C70.9428,21.7746 70.9488,21.7096 70.9718,21.6556 C70.9928,21.6026 71.0048,21.5456 71.0058,21.4856 C71.0258,21.3716 71.0038,21.2576 70.9818,21.1556 L70.9238,21.0176 C70.8908,20.9936 70.8738,20.9716 70.8538,20.9376 L70.6768,20.8826 C70.6698,20.8826 70.5298,20.8656 70.4528,20.7936 C70.3648,20.7096 70.3408,20.5716 70.3578,20.4936 C70.3698,20.4046 70.3968,20.3366 70.4278,20.2716 C70.5468,20.0136 70.7148,19.8236 70.8908,19.6266 L70.8408,19.7216 C70.8668,19.3816 70.6648,18.9356 70.4888,18.5566 C70.3038,18.1636 70.0848,17.7756 69.8178,17.4396 C69.7548,17.3546 69.6828,17.2776 69.6108,17.2056 C69.5178,17.1266 69.5178,17.0876 69.4098,17.0496 C69.3768,17.0336 69.3488,17.0366 69.2908,17.1136 C69.2448,17.1906 69.2068,17.2866 69.1808,17.3916 C69.0748,17.8076 69.0318,18.2616 68.9998,18.7106" id="Fill-218" fill="#975238"></path>
+                    <path d="M79.1375,31.7067 C79.1375,31.7067 74.4335,28.5377 72.9855,26.6397 C71.6615,24.9027 70.7495,16.9477 70.6005,15.5737 C70.5955,15.5267 70.5895,15.4827 70.5855,15.4357 C70.5805,15.3937 70.5785,15.3687 70.5785,15.3687 L70.5805,15.3707 C70.5565,15.0877 70.5405,14.8007 70.5405,14.5097 C70.5405,9.2097 74.8375,4.9147 80.1355,4.9147 C85.4355,4.9147 89.7295,9.2097 89.7295,14.5097 C89.7295,14.8527 89.7095,15.1937 89.6755,15.5277 C89.6755,15.5277 88.7335,24.7367 87.2845,26.6397 C85.8365,28.5377 81.1305,31.7067 81.1305,31.7067" id="Fill-220" fill="#D0846A"></path>
+                    <path d="M80.2322,25.5671 C78.5142,25.5401 77.1102,25.3901 77.1102,25.3901 C77.2942,26.2541 78.8572,26.5571 80.2322,26.5591 C81.6112,26.5571 83.1702,26.2541 83.3562,25.3901 C83.3562,25.3901 81.9522,25.5401 80.2322,25.5671" id="Fill-222" fill="#F0F0ED"></path>
+                    <path d="M69.7478,16.0935 C69.7478,16.0935 70.7058,16.5995 71.0988,18.5855 C71.0988,18.5855 71.6258,17.6785 71.8078,15.7775 C71.9888,13.8735 72.3058,13.3455 73.0048,12.0105 C73.0048,12.0105 74.7048,9.2445 73.9608,6.6475 C73.4858,4.9895 70.9798,4.1835 70.0378,6.0135 C68.1858,9.6105 69.3658,15.4335 69.7478,16.0935" id="Fill-224" fill="#090000"></path>
+                    <path d="M83.6306,15.6052 C83.6306,15.6052 83.0216,16.1202 82.4916,16.7332 C82.2236,17.0362 81.9936,17.3662 81.8446,17.6302 C81.7706,17.7622 81.7376,17.8832 81.7006,17.9652 C81.6676,18.0492 81.6506,18.0972 81.6506,18.0972 C81.6506,18.0972 81.6596,18.0472 81.6786,17.9602 C81.7006,17.8752 81.7146,17.7422 81.7686,17.5962 C81.8726,17.3042 82.0516,16.9262 82.2726,16.5742 C82.7016,15.8652 83.2466,15.2232 83.2466,15.2232 L83.6306,15.6052 Z" id="Fill-226" fill="#975238"></path>
+                    <path d="M78.6472,14.5612 C78.6472,14.5612 78.4912,15.8032 78.0272,15.9072 C76.7312,16.2002 74.4172,14.8262 72.4872,16.3132 C72.4872,16.3132 72.6282,15.0662 73.7572,14.6902 C74.8882,14.3162 78.2722,14.7632 78.6472,14.5612" id="Fill-228" fill="#000000"></path>
+                    <path d="M81.9744,14.6667 C81.9744,14.6667 82.0634,15.8987 82.5074,15.9817 C83.7534,16.2157 86.0774,14.7327 87.8814,16.1317 C87.8814,16.1317 87.8044,14.8917 86.7244,14.5687 C85.6464,14.2447 82.3284,14.8507 81.9744,14.6667" id="Fill-230" fill="#000000"></path>
+                    <path d="M78.0769,18.5573 C78.0769,18.5573 78.2189,18.3013 78.1509,18.0413 C78.0849,17.7833 75.7199,15.8033 74.1409,18.2153 C74.1409,18.2153 75.9009,20.6723 78.0769,18.5573" id="Fill-232" fill="#F0F0ED"></path>
+                    <path d="M77.3865,18.0866 C77.3865,18.6446 76.9375,19.0946 76.3795,19.0946 C75.8235,19.0946 75.3715,18.6446 75.3715,18.0866 C75.3715,17.5316 75.8235,17.0796 76.3795,17.0796 C76.9375,17.0796 77.3865,17.5316 77.3865,18.0866" id="Fill-234" fill="#2C1117"></path>
+                    <path d="M76.8513,18.0866 C76.8513,18.3486 76.6403,18.5616 76.3793,18.5616 C76.1173,18.5616 75.9053,18.3486 75.9053,18.0866 C75.9053,17.8256 76.1173,17.6136 76.3793,17.6136 C76.6403,17.6136 76.8513,17.8256 76.8513,18.0866" id="Fill-236" fill="#040000"></path>
+                    <path d="M74.8865,18.9352 L73.9665,18.4222 L73.8035,18.3312 L73.9135,18.0672 C74.0465,17.8982 74.1535,17.7132 74.3085,17.5612 C74.4665,17.4102 74.6245,17.2612 74.8205,17.1512 C74.9095,17.0872 75.0065,17.0342 75.1145,16.9972 C75.2185,16.9582 75.3155,16.8992 75.4265,16.8842 C75.6425,16.8212 75.8655,16.8072 76.0825,16.8182 C76.5195,16.8522 76.9215,17.0012 77.2805,17.2052 C77.4585,17.3072 77.6275,17.4242 77.7845,17.5532 C77.8615,17.6232 77.9425,17.6842 78.0085,17.7642 C78.0765,17.8432 78.1465,17.9092 78.1915,18.0302 C78.1965,18.1922 78.1405,18.3342 78.1135,18.4772 C78.1135,18.3282 78.1385,18.1842 78.1075,18.0462 L78.1105,18.0512 C78.0095,17.9242 77.8275,17.8082 77.6745,17.7052 C77.5105,17.6042 77.3395,17.5162 77.1625,17.4452 C76.8105,17.3032 76.4365,17.2262 76.0775,17.2472 C75.7235,17.2762 75.3885,17.3812 75.1045,17.5882 C74.8105,17.7792 74.5955,18.0782 74.3695,18.3632 L74.4475112,18.2767978 L74.8865,18.9352 Z" id="Fill-238" fill="#030000"></path>
+                    <path d="M76.1843,17.7429 C76.1843,17.8749 76.0763,17.9829 75.9443,17.9829 C75.8133,17.9829 75.7043,17.8749 75.7043,17.7429 C75.7043,17.6109 75.8133,17.5039 75.9443,17.5039 C76.0763,17.5039 76.1843,17.6109 76.1843,17.7429" id="Fill-240" fill="#F0F0ED"></path>
+                    <path d="M82.5554,18.5573 C82.5554,18.5573 82.4124,18.3013 82.4804,18.0413 C82.5484,17.7833 84.9104,15.8033 86.4884,18.2153 C86.4884,18.2153 84.7294,20.6723 82.5554,18.5573" id="Fill-242" fill="#F0F0ED"></path>
+                    <path d="M83.2449,18.0866 C83.2449,18.6446 83.6949,19.0946 84.2529,19.0946 C84.8079,19.0946 85.2609,18.6446 85.2609,18.0866 C85.2609,17.5316 84.8079,17.0796 84.2529,17.0796 C83.6949,17.0796 83.2449,17.5316 83.2449,18.0866" id="Fill-244" fill="#2C1117"></path>
+                    <path d="M83.7791,18.0866 C83.7791,18.3486 83.9901,18.5616 84.2531,18.5616 C84.5151,18.5616 84.7251,18.3486 84.7251,18.0866 C84.7251,17.8256 84.5151,17.6136 84.2531,17.6136 C83.9901,17.6136 83.7791,17.8256 83.7791,18.0866" id="Fill-246" fill="#040000"></path>
+                    <path d="M85.7439,18.9352 L86.1636942,18.2474848 L86.2619,18.3632 L86.2609,18.3632 C86.0339,18.0782 85.8169,17.7792 85.5259,17.5872 C85.2419,17.3812 84.9069,17.2762 84.5529,17.2472 C84.1949,17.2262 83.8199,17.3032 83.4689,17.4462 C83.2919,17.5162 83.1209,17.6052 82.9569,17.7062 C82.8029,17.8092 82.6209,17.9242 82.5199,18.0512 L82.5219,18.0452 C82.4949,18.1842 82.5169,18.3282 82.5199,18.4772 C82.4919,18.3342 82.4369,18.1932 82.4369,18.0372 C82.4849,17.9092 82.5549,17.8432 82.6229,17.7642 C82.6889,17.6842 82.7699,17.6232 82.8449,17.5542 C83.0039,17.4242 83.1719,17.3072 83.3499,17.2052 C83.7079,17.0012 84.1099,16.8522 84.5489,16.8182 C84.7649,16.8072 84.9879,16.8212 85.2039,16.8832 C85.3149,16.8992 85.4109,16.9582 85.5169,16.9972 C85.6229,17.0342 85.7199,17.0872 85.8089,17.1512 C86.0049,17.2612 86.1629,17.4102 86.3209,17.5612 C86.4759,17.7132 86.5839,17.8982 86.7139,18.0652 L86.8279,18.3312 L86.6629,18.4222 L85.7439,18.9352 Z" id="Fill-248" fill="#030000"></path>
+                    <path d="M84.447,17.7429 C84.447,17.8749 84.555,17.9829 84.69,17.9829 C84.819,17.9829 84.927,17.8749 84.927,17.7429 C84.927,17.6109 84.819,17.5039 84.69,17.5039 C84.555,17.5039 84.447,17.6109 84.447,17.7429" id="Fill-250" fill="#F0F0ED"></path>
+                    <path d="M81.1013,19.779 C81.1013,19.779 80.9713,21.571 81.0463,22.787 C81.0853,23.444 80.7503,23.826 80.4353,23.893 C80.4353,23.893 81.7623,24.103 81.9623,22.855 C82.0973,22.013 81.3033,21.091 81.1013,19.779" id="Fill-252" fill="#A5644F"></path>
+                    <path d="M79.742,23.7663 C79.742,23.7663 78.472,23.3223 78.68,23.7183 C78.889,24.1123 79.742,23.7663 79.742,23.7663" id="Fill-254" fill="#975238"></path>
+                    <path d="M77.2048,1.0349 C77.2048,1.0349 70.8838,1.4879 71.4468,5.4699 L73.5708,7.9139 C73.5708,7.9139 76.0098,11.3699 79.3108,12.0959 C79.3108,12.0959 77.5418,11.0079 76.7738,10.3519 C76.7738,10.3519 80.1638,12.1959 83.9218,12.5299 C83.9218,12.5299 81.5308,11.7159 80.6428,10.5689 C80.6428,10.5689 82.9748,12.2409 87.2748,12.5299 C87.2748,12.5299 85.6428,12.0049 85.0328,11.3699 C85.0328,11.3699 87.2328,11.9649 87.9528,12.5299 C88.6728,13.0949 89.2978,17.6239 89.2978,17.6239 C89.2978,17.6239 89.7288,16.8749 90.3568,16.2699 C90.3568,16.2699 91.3978,10.5909 90.9588,9.0469 C90.5008,7.4359 88.3298,0.4479 77.2048,1.0349" id="Fill-256" fill="#090000"></path>
+                    <path d="M75.3191,1.3679 C73.5071,1.8369 71.0901,2.9419 71.4471,5.4699 L73.5711,7.9139 C73.5711,7.9139 76.0091,11.3699 79.3111,12.0959 C79.3111,12.0959 77.5421,11.0079 76.7741,10.3519 C76.7741,10.3519 80.1641,12.1959 83.9221,12.5299 C83.9221,12.5299 81.5311,11.7159 80.6431,10.5689 C80.6431,10.5689 82.9741,12.2409 87.2751,12.5299 C87.2751,12.5299 85.6421,12.0049 85.0331,11.3699 C85.0331,11.3699 87.2331,11.9649 87.9531,12.5299 C88.6731,13.0949 89.2981,17.6239 89.2981,17.6239 C89.2981,17.6239 89.7291,16.8749 90.3571,16.2699 C90.3571,16.2699 91.3981,10.5909 90.9591,9.0469 C90.9401,8.9739 90.9151,8.8929 90.8871,8.8039 C89.0241,12.7789 74.3791,6.9619 72.7551,4.9149 C71.7051,3.5859 73.6091,2.2389 75.3191,1.3679" id="Fill-258" fill="#000000"></path>
+                    <path d="M70.8543,10.8542 C69.8153,9.1802 69.6793,5.9692 71.5783,4.9722 C70.9713,5.0072 70.3953,5.3232 70.0383,6.0132 C68.1863,9.6102 69.3663,15.4332 69.7483,16.0932 C69.7483,16.0932 70.7063,16.5992 71.0983,18.5852 C71.0983,18.5852 71.6253,17.6782 71.8073,15.7772 C71.8753,15.0692 71.9603,14.5512 72.0793,14.1132 C71.8563,13.1722 71.4643,11.8342 70.8543,10.8542" id="Fill-260" fill="#000000"></path>
+                    <g id="Group-264" transform="translate(75.000000, 0.054800)">
                         <mask id="mask-4" fill="white">
                             <use xlink:href="#path-3"></use>
                         </mask>
-                        <g id="Clip-182"></g>
-                        <path d="M7.31573333,0.319134884 C7.31573333,0.319134884 -6.45026667,5.09964651 3.78473333,27.7109488 L19.6764,18.3426698 L17.4157333,13.0552279 L7.31573333,0.319134884 Z" id="Fill-181" fill="#28AE6F" mask="url(#mask-4)"></path>
+                        <g id="Clip-263"></g>
+                        <path d="M0.4109,1.2877 C0.0219,1.6017 -0.1321,1.9917 0.1889,2.4737 C1.3769,4.2387 12.3429,1.3567 15.8879,8.7487 C15.2959,6.7837 12.8459,0.4167 2.2049,0.9797" id="Fill-262" fill="#2B101A" mask="url(#mask-4)"></path>
+                    </g>
+                    <path d="M84.4304,25.0056 C83.5504,24.3266 80.3764,24.1226 80.3764,24.1226 C80.3764,24.1226 77.2004,24.3266 76.3224,25.0056 C75.4444,25.6856 75.6924,26.5596 75.6924,26.5596 C75.6924,26.5596 76.1454,25.5326 76.7794,25.6606 C77.1364,25.7346 80.3764,25.9786 80.3764,24.9826 C80.3764,25.9786 83.6104,25.6456 83.9754,25.6606 C84.4714,25.6856 85.0604,26.4386 85.0604,26.4386 C85.0604,26.4386 85.3104,25.6856 84.4304,25.0056" id="Fill-265" fill="#000000"></path>
+                    <path d="M79.4304,72.4001 C79.4234,72.4081 79.2824,72.2991 79.0324,72.0981 C78.9094,71.9961 78.7564,71.8721 78.5704,71.7411 C78.3854,71.6081 78.1824,71.4461 77.9394,71.2951 C77.7014,71.1351 77.4394,70.9631 77.1454,70.7981 C76.8584,70.6221 76.5354,70.4631 76.2004,70.2901 C75.5174,69.9621 74.7464,69.6471 73.9114,69.3931 C73.0734,69.1471 72.2554,68.9871 71.5054,68.8861 C71.1294,68.8471 70.7734,68.8021 70.4364,68.7931 C70.1004,68.7681 69.7864,68.7691 69.5004,68.7711 C69.2134,68.7641 68.9554,68.7891 68.7284,68.7971 C68.4994,68.8051 68.3054,68.8251 68.1454,68.8421 C67.8264,68.8751 67.6484,68.8871 67.647383,68.8771 C67.6454,68.8671 67.8204,68.8351 68.1384,68.7851 C68.2974,68.7571 68.4924,68.7301 68.7214,68.7141 C68.9504,68.6971 69.2094,68.6661 69.4974,68.6661 C69.7864,68.6561 70.1024,68.6491 70.4424,68.6691 C70.7824,68.6721 71.1424,68.7131 71.5234,68.7501 C72.2804,68.8431 73.1084,69.0011 73.9534,69.2501 C74.7984,69.5061 75.5764,69.8291 76.2604,70.1661 C76.5984,70.3451 76.9224,70.5081 77.2084,70.6921 C77.5024,70.8621 77.7634,71.0421 77.9984,71.2081 C78.2404,71.3661 78.4404,71.5351 78.6214,71.6741 C78.8044,71.8131 78.9514,71.9431 79.0704,72.0531 C79.3094,72.2701 79.4374,72.3931 79.4304,72.4001" id="Fill-267" fill="#FAFAFA"></path>
+                    <path d="M62.8842646,60.3040477 L64.8903,47.417 C65.7923,43.574 66.8613,39.882 68.6583,39.445 L68.6583,40.634 L67.8893,69.8232284 C67.8893,69.8232284 66.6533517,69.8942874 62.6441929,67.5177568 C62.5042192,66.8156538 62.4464276,66.0981546 62.4708184,65.3652593 C62.4997769,64.4951082 62.6375923,62.8080376 62.8842646,60.3040477 Z" id="Fill-269" fill="#4EA7FF"></path>
+                    <path d="M86.7937,36.5661 C91.4807,37.4631 96.7587,40.1981 99.1867,47.2001 C100.0727,49.7571 106.5257,68.6221 106.5257,68.6221 L95.5217,68.3931 L93.7287,64.5031 L94.6037,70.8121 L95.3497,79.8141 L67.5617,80.2821 L67.7567,66.7231 L68.0227,39.7521 C68.0227,39.7521 68.3357,39.3421 73.1267,36.7001 C76.1037,35.0571 86.7937,36.5661 86.7937,36.5661" id="Fill-271" fill="#4EA7FF"></path>
+                    <path d="M89.5662,54.5944 C90.0222,60.2874 90.5482,62.0464 91.0042,67.7404 C91.0472,68.2784 91.0932,68.8264 91.3042,69.3234 C91.5152,69.8194 91.9252,70.2634 92.4542,70.3704 C93.2632,70.5354 94.3152,71.1204 94.5442,70.3264 L93.7762,64.8434 C93.7762,64.8434 93.5942,63.8124 93.0172,62.5294 C91.3122,58.7434 90.6802,58.5224 89.5662,54.5944" id="Fill-273" fill="#000000" opacity="0.3"></path>
+                    <path d="M73.1267,39.6179 L73.2187,39.0259 L74.1067,33.3449 C74.1607,33.0019 74.4697,32.7589 74.8147,32.7879 L85.7567,33.7009 C86.4437,33.7589 86.9567,34.3589 86.9057,35.0469 L86.6627,38.3479 L83.2457,42.8059 L78.3267,43.5729" id="Fill-275" fill="#4EA7FF"></path>
+                    <path d="M67.6336,50.3005 C67.6756,50.3005 67.7086,54.7515 67.7086,60.2395 C67.7086,65.7315 67.6756,70.1815 67.6336,70.1815 C67.5926,70.1815 67.5596,65.7315 67.5596,60.2395 C67.5596,54.7515 67.5926,50.3005 67.6336,50.3005" id="Fill-277" fill="#2E353A"></path>
+                    <path d="M95.7547,69.3025326 C95.7517,69.3035 95.7397,69.2815 95.7187,69.2385 C95.6947,69.1865 95.6647,69.1215 95.6287,69.0425 C95.5477,68.8595 95.4367,68.6065 95.2957,68.2865 C95.0067,67.6155 94.5987,66.6645 94.0947,65.4945 C93.0907,63.1215 91.7107,59.8625 90.1867,56.2615 C89.4287,54.4555 88.7077,52.7365 88.0507,51.1705 C87.7017,50.3975 87.4697,49.6045 87.3437,48.8595 C87.2117,48.1125 87.1587,47.4065 87.1527,46.7615 C87.1397,45.4725 87.3327,44.4305 87.5907,43.7565 C87.6227,43.6725 87.6507,43.5915 87.6817,43.5185 C87.7167,43.4475 87.7497,43.3795 87.7807,43.3175 C87.8407,43.1915 87.8957,43.0875 87.9527,43.0115 C88.0027,42.9395 88.0427,42.8815 88.0747,42.8335 C88.1037,42.7945 88.1187,42.7755 88.1207,42.777357 C88.1417,42.7885 87.8787,43.0995 87.6467,43.7765 C87.4067,44.4485 87.2327,45.4825 87.2587,46.7605 C87.2937,48.0315 87.4677,49.5775 88.1777,51.1165 C88.8377,52.6815 89.5637,54.3995 90.3237,56.2025 C91.8327,59.8105 93.1977,63.0755 94.1927,65.4535 C94.6777,66.6315 95.0707,67.5885 95.3497,68.2645 C95.4797,68.5885 95.5817,68.8445 95.6567,69.0315 C95.6877,69.1135 95.7127,69.1785 95.7337,69.2325 C95.7497,69.2785 95.7567,69.3015 95.7547,69.3025326" id="Fill-279" fill="#2E353A"></path>
+                    <path d="M90.2048,37.5563 C90.2048,37.5563 90.1028,37.6613 89.8858,37.8333 C89.6678,38.0053 89.3208,38.2313 88.8378,38.4453 C88.3518,38.6553 87.7278,38.8423 86.9888,38.9633 C86.2488,39.0853 85.3998,39.1653 84.4588,39.2123 C83.5178,39.2543 82.4858,39.2363 81.3828,39.2573 C80.2808,39.2833 79.0968,39.3543 77.9038,39.6813 C76.7208,39.9993 75.5008,40.5883 74.6318,41.6113 C74.2048,42.1193 73.8888,42.7393 73.7238,43.4063 C73.5548,44.0713 73.5498,44.7903 73.7568,45.4623 C73.8658,45.7953 74.0318,46.1053 74.2378,46.3823 C74.4478,46.6543 74.7168,46.8793 75.0158,47.0363 C75.3118,47.1963 75.6498,47.2743 75.9758,47.2393 C76.3008,47.2063 76.6058,47.0453 76.8178,46.8063 C77.2498,46.3153 77.3308,45.6063 77.2438,44.9873 C77.1978,44.6723 77.1068,44.3673 76.9708,44.0883 C76.8308,43.8113 76.6498,43.5553 76.4588,43.3173 C75.6728,42.3683 74.5688,41.8203 73.5118,41.5713 C72.4428,41.3183 71.3948,41.3693 70.4938,41.6053 C69.5868,41.8303 68.8158,42.2053 68.1838,42.5923 C67.5468,42.9793 67.0468,43.3843 66.6528,43.7313 C66.2578,44.0773 65.9778,44.3743 65.7838,44.5713 C65.6938,44.6673 65.6228,44.7433 65.5698,44.8013 C65.5198,44.8523 65.4948,44.8773 65.4928,44.8763 C65.4928,44.8763 65.8398,44.4043 66.6138,43.6873 C67.0028,43.3323 67.5018,42.9173 68.1388,42.5213 C68.7728,42.1243 69.5488,41.7383 70.4678,41.5023 C71.3798,41.2553 72.4498,41.1973 73.5398,41.4503 C74.6188,41.6983 75.7508,42.2533 76.5648,43.2293 C76.7638,43.4753 76.9488,43.7353 77.0968,44.0263 C77.2408,44.3193 77.3368,44.6373 77.3858,44.9663 C77.4338,45.2953 77.4338,45.6363 77.3678,45.9723 C77.3018,46.3053 77.1648,46.6393 76.9278,46.9053 C76.6918,47.1703 76.3518,47.3503 75.9918,47.3863 C75.6318,47.4253 75.2638,47.3383 74.9458,47.1683 C74.6268,47.0003 74.3438,46.7623 74.1198,46.4743 C73.9028,46.1823 73.7288,45.8573 73.6138,45.5083 C73.3968,44.8053 73.4038,44.0573 73.5788,43.3693 C73.7498,42.6813 74.0768,42.0423 74.5188,41.5163 C75.4188,40.4633 76.6668,39.8683 77.8678,39.5473 C79.0788,39.2193 80.2748,39.1543 81.3798,39.1333 C82.4868,39.1173 83.5178,39.1423 84.4548,39.1073 C85.3918,39.0673 86.2398,38.9933 86.9758,38.8803 C87.7118,38.7683 88.3308,38.5903 88.8138,38.3913 C89.2968,38.1883 89.6448,37.9733 89.8678,37.8093 C89.9818,37.7333 90.0588,37.6603 90.1178,37.6193 C90.1738,37.5763 90.2028,37.5543 90.2048,37.5563" id="Fill-281" fill="#FAFAFA"></path>
+                    <path d="M99.7136,49.5241 C99.7136,49.5291 99.6716,49.5361 99.5906,49.5441 C99.5106,49.5501 99.3916,49.5661 99.2366,49.5691 C98.9296,49.5851 98.4836,49.5801 97.9346,49.5391 C97.3846,49.4991 96.7346,49.4151 96.0166,49.3161 C95.2976,49.2181 94.5086,49.1081 93.6766,49.0631 C92.8466,49.0241 92.0506,49.0871 91.3486,49.2391 C90.6476,49.3951 90.0356,49.6311 89.5726,49.9151 C88.6316,50.4771 88.2926,51.1091 88.2616,51.0781 C88.2576,51.0751 88.2776,51.0381 88.3226,50.9691 C88.3706,50.9051 88.4276,50.7961 88.5316,50.6821 C88.7216,50.4381 89.0496,50.1231 89.5176,49.8241 C89.9846,49.5231 90.6056,49.2711 91.3176,49.1041 C92.0326,48.9421 92.8406,48.8741 93.6846,48.9141 C94.5256,48.9591 95.3176,49.0741 96.0356,49.1791 C96.7536,49.2861 97.3996,49.3801 97.9426,49.4331 C98.4876,49.4871 98.9306,49.5081 99.2366,49.5111 C99.5426,49.5141 99.7126,49.5111 99.7136,49.5241" id="Fill-283" fill="#FAFAFA"></path>
+                    <path d="M92.8035,62.4138 C92.7995,62.4508 92.2265,62.2088 91.1525,62.2738 C90.6175,62.3008 89.9695,62.4128 89.2375,62.6168 C88.5015,62.8148 87.6835,63.1058 86.7635,63.3888 C85.8475,63.6698 84.8065,63.9378 83.6635,63.9288 C82.5285,63.9298 81.3075,63.7028 80.1325,63.1948 C78.9545,62.6988 77.8245,61.9098 76.9115,60.8538 C76.4535,60.3298 76.0555,59.7308 75.7715,59.0648 C75.4915,58.3998 75.3365,57.6528 75.4435,56.9058 C75.5535,56.1668 75.9015,55.4608 76.4635,54.9818 C76.7435,54.7458 77.0735,54.5628 77.4315,54.4868 C77.7875,54.4088 78.1575,54.4228 78.5015,54.5198 C78.8435,54.6168 79.1675,54.7808 79.4235,55.0248 C79.6795,55.2658 79.8725,55.5788 79.9435,55.9208 C80.0185,56.2588 79.9845,56.6148 79.8655,56.9298 C79.7455,57.2458 79.5495,57.5208 79.3255,57.7548 C78.8745,58.2248 78.3135,58.5378 77.7465,58.7578 C77.4615,58.8628 77.1705,58.9478 76.8805,58.9948 C76.7365,59.0208 76.5935,59.0528 76.4505,59.0748 C76.3075,59.0918 76.1645,59.1078 76.0245,59.1248 C74.8915,59.2488 73.8235,59.1238 72.8855,58.9048 C71.9465,58.6808 71.1345,58.3398 70.4625,57.9728 C69.7895,57.6058 69.2535,57.2138 68.8505,56.8568 C68.7485,56.7688 68.6545,56.6848 68.5635,56.6058 C68.4805,56.5218 68.4015,56.4418 68.3275,56.3688 C68.1795,56.2238 68.0605,56.0958 67.9725,55.9838 C67.8855,55.8798 67.8175,55.7978 67.7665,55.7358 C67.7205,55.6808 67.6985,55.6498 67.6994674,55.6488 C67.7015,55.6468 67.7285,55.6738 67.7785,55.7268 C67.8315,55.7848 67.9045,55.8638 67.9945,55.9638 C68.0865,56.0718 68.2075,56.1958 68.3595,56.3368 C68.4335,56.4088 68.5135,56.4858 68.5985,56.5678 C68.6895,56.6448 68.7855,56.7268 68.8875,56.8128 C69.2945,57.1598 69.8315,57.5428 70.5025,57.8978 C71.1715,58.2558 71.9795,58.5858 72.9095,58.8018 C73.8395,59.0128 74.8945,59.1288 76.0115,59.0008 C76.1505,58.9838 76.2905,58.9678 76.4325,58.9498 C76.5735,58.9278 76.7135,58.8958 76.8555,58.8698 C77.1425,58.8218 77.4215,58.7378 77.6995,58.6348 C78.2505,58.4188 78.7965,58.1098 79.2265,57.6588 C79.4395,57.4348 79.6225,57.1748 79.7335,56.8808 C79.8425,56.5888 79.8735,56.2628 79.8025,55.9498 C79.6715,55.3198 79.1065,54.8298 78.4625,54.6618 C78.1415,54.5698 77.7935,54.5598 77.4635,54.6318 C77.1335,54.7018 76.8235,54.8728 76.5605,55.0968 C76.0315,55.5468 75.6965,56.2218 75.5915,56.9278 C75.4905,57.6388 75.6375,58.3608 75.9085,59.0078 C76.1845,59.6548 76.5745,60.2428 77.0245,60.7588 C77.9175,61.7968 79.0285,62.5768 80.1875,63.0678 C81.3435,63.5718 82.5445,63.7998 83.6645,63.8048 C84.7885,63.8188 85.8175,63.5608 86.7335,63.2878 C87.6515,63.0128 88.4745,62.7268 89.2145,62.5358 C89.9535,62.3388 90.6105,62.2328 91.1495,62.2158 C91.4185,62.1948 91.6585,62.2218 91.8665,62.2278 C92.0715,62.2588 92.2465,62.2728 92.3855,62.3048 C92.5165,62.3378 92.6195,62.3628 92.6985,62.3828 C92.7685,62.4008 92.8035,62.4118 92.8035,62.4138" id="Fill-285" fill="#FAFAFA"></path>
+                    <path d="M67.5369,59.3483 C67.5129,59.3583 67.3809,59.0443 67.1009,58.5763 C66.8239,58.1073 66.3779,57.4943 65.7699,56.9263 C65.1609,56.3603 64.5179,55.9583 64.0319,55.7143 C63.5449,55.4683 63.2219,55.3593 63.2299,55.3333 C63.2329,55.3243 63.3159,55.3433 63.4649,55.3863 C63.6139,55.4283 63.8239,55.5063 64.0769,55.6193 C64.5839,55.8413 65.2509,56.2393 65.8729,56.8173 C66.4929,57.3963 66.9349,58.0343 67.1939,58.5233 C67.3239,58.7673 67.4169,58.9723 67.4679,59.1183 C67.5209,59.2633 67.5469,59.3443 67.5369,59.3483" id="Fill-287" fill="#FAFAFA"></path>
+                    <path d="M102.2302,58.737 C102.2502,58.762 101.6862,58.996 101.1202,59.751 C100.8342,60.121 100.5462,60.599 100.2192,61.132 C99.8902,61.663 99.4822,62.224 98.9902,62.756 C98.0042,63.823 96.8902,64.553 96.0432,64.971 C95.6222,65.185 95.2622,65.321 95.0142,65.412 C94.7622,65.494 94.6232,65.535 94.6191507,65.525 C94.6162,65.515 94.7502,65.456 94.9932,65.357 C95.2332,65.251 95.5832,65.101 95.9952,64.877 C96.8222,64.439 97.9092,63.706 98.8802,62.654 C99.3652,62.129 99.7692,61.581 100.1022,61.057 C100.4352,60.533 100.7352,60.053 101.0372,59.685 C101.3382,59.316 101.6352,59.062 101.8622,58.921 C101.9742,58.85 102.0652,58.8 102.1292,58.774 C102.1942,58.745 102.2282,58.732 102.2302,58.737" id="Fill-289" fill="#FAFAFA"></path>
+                    <path d="M86.6902163,36.8991 C86.6912,36.9051 86.6462,36.9161 86.5582,36.9331 C86.4542,36.9521 86.3282,36.9741 86.1762,37.0021 C85.8432,37.0561 85.3612,37.1291 84.7632,37.2101 C83.5682,37.3721 81.9122,37.5591 80.0762,37.6941 C79.1592,37.7601 78.2802,37.8211 77.4782,37.7871 C76.6762,37.7571 75.9572,37.6271 75.3812,37.4281 C74.8032,37.2351 74.3752,36.9811 74.1012,36.7821 C73.9632,36.6821 73.8642,36.5961 73.7982,36.5361 C73.7342,36.4741 73.7022,36.4401 73.7052,36.4361 C73.7132,36.4261 73.8542,36.5501 74.1342,36.7341 C74.4142,36.9161 74.8422,37.1511 75.4142,37.3281 C75.9832,37.5091 76.6912,37.6281 77.4832,37.6491 C78.2752,37.6751 79.1482,37.6111 80.0642,37.5451 C81.8972,37.4101 83.5522,37.2401 84.7502,37.1051 C85.3312,37.0391 85.8092,36.9841 86.1682,36.9441 C86.5032,36.9061 86.6892,36.8891 86.6902163,36.8991" id="Fill-291" fill="#2E353A"></path>
+                    <path d="M106.3855,70.654 C107.2955,75.388 103.6965,79.791 98.8755,79.84 L77.0965,79.597 L77.6685,72.545 L96.3415,69.759" id="Fill-293" fill="#AA8776"></path>
+                    <path d="M79.0154,72.8659 C78.9154,72.8989 77.6584,72.3359 76.5314,71.8139 C75.3344,71.2609 74.0224,71.0059 72.7054,71.0729 L67.5144,71.3369 C67.5144,71.3369 67.8344,72.1929 68.3854,72.4979 C68.9364,72.8029 72.1634,72.8679 72.1634,72.8679 L71.9984,73.0379 C71.3184,73.7379 70.3904,74.1439 69.4144,74.1689 L68.9184,74.1809 C68.5504,74.1519 68.1864,74.0809 67.8344,73.9699 L66.5544,73.4519 C66.1664,73.2769 65.7574,73.3049 65.5884,73.6959 C65.4364,74.0489 65.5484,74.5349 66.6054,75.0669 C67.1964,75.3649 69.3874,76.1229 69.3874,76.1229 C69.3874,76.1229 69.4194,76.7279 69.5154,77.0479 C69.6114,77.3659 70.4714,77.6849 70.4714,77.6849 C70.4714,77.6849 71.0134,78.8019 71.2374,79.0559 C71.3364,79.1709 72.1174,79.4139 72.9464,79.6459 C74.2864,80.0219 75.7034,80.0129 77.0364,79.6149 L79.0154,79.0239 L79.0154,72.9979" id="Fill-295" fill="#AA8776"></path>
+                    <path d="M71.9138199,76.8034 C71.9108,76.8374 71.2958,76.8054 70.5638,76.6114 C69.8308,76.4194 69.2798,76.1454 69.2938,76.1154 C69.3088,76.0784 69.8758,76.2974 70.5978,76.4864 C71.3168,76.6764 71.9178,76.7654 71.9138199,76.8034" id="Fill-297" fill="#996552"></path>
+                    <path d="M71.7312093,78.0192 C71.7312093,78.0532 71.3962,78.0752 71.0012,77.9662 C70.6052,77.8602 70.3272,77.6712 70.3442,77.6422 C70.3622,77.6092 70.6562,77.7402 71.0352,77.8412 C71.4132,77.9452 71.7332,77.9822 71.7312093,78.0192" id="Fill-299" fill="#996552"></path>
+                    <path d="M72.6795,72.3991 C72.6915,72.4121 72.5425,72.5791 72.2785,72.8281 C72.0135,73.0741 71.6295,73.4031 71.1475,73.6841 C70.6645,73.9651 70.1775,74.1231 69.8225,74.1961 C69.4645,74.2681 69.2395,74.2731 69.2375,74.2591 C69.2255,74.2111 70.1365,74.1281 71.0815,73.5721 C71.5525,73.2971 71.9395,72.9851 72.2175,72.7581 C72.4945,72.5301 72.6665,72.3851 72.6795,72.3991" id="Fill-301" fill="#996552"></path>
+                    <g id="Group-305" transform="translate(79.000000, 66.054800)">
+                        <mask id="mask-6" fill="white">
+                            <use xlink:href="#path-5"></use>
+                        </mask>
+                        <g id="Clip-304"></g>
+                        <path d="M0.5447,5.86 L0.0157,13.836 L20.5317,13.843 C21.9247,13.843 23.2917,13.465 24.4847,12.749 C27.2567,11.084 28.6877,7.862 28.0637,4.69 C27.8517,3.394 27.3587,1.88 26.7387,0.266 L16.4247,1.964 L16.7547,3.248 L0.5447,5.86 Z" id="Fill-303" fill="#4EA7FF" mask="url(#mask-6)"></path>
                     </g>
-                    <path d="M6.46520648,44.020116 C6.46520648,44.020116 7.06312509,43.9228434 8.1152893,44.1561025 C8.63390571,44.2868837 9.25770537,44.5120097 9.91203139,44.8997988 C10.567021,45.2846601 11.2475599,45.825678 11.9085221,46.5059357 C13.2384099,47.8648245 14.479373,49.761478 15.6307479,51.9580825 C16.7900862,54.1550123 17.8714496,56.6567731 18.9810166,59.2857365 C19.3131568,60.0733519 19.6406516,60.8492556 19.9508924,61.5844935 L20,61.7012857 L19.887517,61.7611458 C15.3105529,64.207601 11.3248713,66.4982249 8.50848217,68.2126955 C7.09896039,69.0679789 5.97645281,69.7713348 5.20599387,70.2603005 C4.83768663,70.4919329 4.54304083,70.677369 4.31807479,70.8188861 C4.11434447,70.9447874 4.00551134,71.0065995 4.00020241,70.9994423 C3.99489348,70.9919598 4.09410417,70.9151827 4.28788023,70.7752923 C4.48265172,70.6367032 4.76966592,70.4304462 5.14792742,70.1753903 C5.90113232,69.6600731 7.00904033,68.9316671 8.40661701,68.0539362 C11.1997795,66.2952211 15.1731842,63.9720646 19.7504801,61.5155243 L19.6874366,61.6921766 C19.3765322,60.957264 19.0483737,60.181035 18.7152382,59.3937449 C17.6063347,56.7657574 16.5349256,54.2675753 15.3948322,52.0768267 C14.263034,49.8851021 13.05127,47.9975577 11.7608674,46.6425729 C11.1191501,45.9645925 10.4611742,45.4232492 9.82775208,45.0338334 C9.1953254,44.6414896 8.59143425,44.4069292 8.08675378,44.2621589 C7.0637887,44.0005964 6.4622202,44.0591552 6.46520648,44.020116" id="Fill-184" fill="#1A2E35"></path>
-                    <path d="M34.8881388,9 C34.8976,8.99794755 34.9204372,9.08397038 34.9546932,9.25253333 C34.9798142,9.42144455 35.0137438,9.67498552 34.994169,10.0034047 C34.9638281,10.6463121 34.7449165,11.6423659 33.9664916,12.5113009 C33.2141665,13.3823256 31.7825956,13.9318966 30.3405847,13.4888964 C29.6339342,13.2687894 28.9204324,12.8094205 28.4835879,12.0522803 C28.2715275,11.677193 28.1446175,11.211207 28.2056257,10.7438279 C28.2643501,10.2865486 28.4799992,9.82334878 28.8721479,9.54821504 C29.263644,9.26507107 29.7781352,9.27308129 30.1748513,9.4587095 C30.5767874,9.64155154 30.9095591,9.99156346 31.0651788,10.4147122 C31.3835957,11.2648406 31.1490243,12.1842749 30.7092436,12.8226548 C29.7742203,14.1439933 28.0855669,14.2502158 27.1502173,13.6484043 C26.6559534,13.406008 26.2204139,13.1782391 25.8096692,13.0995299 C25.400882,13.0100244 25.0384218,13.0855991 24.7728569,13.2158523 C24.2404221,13.4895929 24.0254255,13.7918918 24.0006307,13.7584578 C23.9934533,13.7514924 24.0476103,13.6835796 24.1591867,13.5592471 C24.2146486,13.4965584 24.282508,13.4185457 24.3810345,13.3461055 C24.4743411,13.2684411 24.5829813,13.1782391 24.7262036,13.1096298 C24.9982934,12.9546494 25.3946833,12.8529544 25.8360952,12.9330566 C26.2788121,13.0016659 26.7381676,13.2269969 27.2298215,13.4526763 C27.4774428,13.5599436 27.7364828,13.676266 28.0131401,13.7292031 C28.2842512,13.7790058 28.5879869,13.7734334 28.8871552,13.7117896 C29.4851656,13.5972085 30.0981833,13.2468484 30.4994669,12.6582711 C30.8916156,12.0822316 31.0867111,11.2439444 30.8097276,10.5285967 C30.567,9.82926938 29.6548139,9.35562142 29.0267889,9.80071119 C28.7204431,10.0131562 28.5341562,10.3976469 28.4842404,10.783879 C28.4323672,11.1732455 28.5351349,11.5657464 28.7214219,11.9007827 C29.1034569,12.5739896 29.7592129,13.0124623 30.4133378,13.2221212 C31.7542121,13.6487526 33.1006326,13.1611738 33.8245743,12.3611963 C34.5782044,11.5601741 34.8232157,10.6146195 34.8842238,9.99400135 C34.9488207,9.35840758 34.8568191,9.00421642 34.8881388,9" id="Fill-186" fill="#375A64"></path>
-                    <path d="M32.9998183,30.8351159 C33.0068076,30.8820951 32.8118434,30.9800803 32.4752543,30.9975297 C32.1412402,31.0167688 31.6678083,30.9259424 31.2050443,30.6436198 C30.743016,30.359955 30.4012769,29.9501176 30.2151413,29.6123148 C30.0264307,29.2731699 29.9752986,29.0244039 30.010245,29.0029277 C30.0908057,28.9438681 30.4980233,29.792178 31.3485085,30.2977635 C32.1883259,30.8275098 32.9913576,30.721471 32.9998183,30.8351159" id="Fill-188" fill="#1A2E35"></path>
-                    <path d="M36.736432,11.0003816 C36.7615898,10.9858488 36.9596273,11.386954 36.9947838,12.1106872 C37.0347783,12.8191611 36.8519001,13.8724255 36.1987635,14.7269539 C35.5404664,15.5771225 34.6402669,15.9295428 34.0122882,15.9854941 C33.3714081,16.0490751 32.9908149,15.8848545 33.0001685,15.8546989 C33.0069418,15.8009276 33.3901152,15.8808579 33.9858402,15.7645956 C34.5731793,15.6570529 35.3875841,15.2955496 35.9875021,14.5202249 C36.5832271,13.742357 36.7854575,12.7828291 36.7970689,12.1128672 C36.8144858,11.4316423 36.6899867,11.015641 36.736432,11.0003816" id="Fill-192" fill="#375A64"></path>
-                    <path d="M17.9997532,57.0020527 C18.0340973,57.0724591 14.4801265,58.9193993 10.062692,61.1272133 C5.64363751,63.3353548 2.03491043,65.0683349 2.00024228,64.9979284 C1.96622214,64.9278495 5.51922099,63.0809093 9.93827547,60.8727678 C14.3557099,58.6649538 17.965733,56.9319737 17.9997532,57.0020527" id="Fill-194" fill="#E1E1E1"></path>
-                    <path d="M13.9996912,52.0018641 C14.0356246,52.0643414 10.9307291,53.6813482 7.06519157,55.6128141 C3.19870002,57.5454644 0.0362476445,59.0606125 0.00031429926,58.9981352 C-0.0359370402,58.935954 3.0683224,57.3192433 6.93513194,55.3868891 C10.8000335,53.4551271 13.9637579,51.9393868 13.9996912,52.0018641" id="Fill-196" fill="#E1E1E1"></path>
-                    <path d="M10.999603,46.003031 C11.0178756,46.0431292 10.4041139,46.4396964 9.40564994,47.0665522 C8.33866394,47.7375527 6.99497942,48.5825573 5.5087038,49.5173229 C4.03025928,50.467907 2.69342696,51.3272586 1.63198798,52.0096632 C0.640049917,52.6486588 0.0210675149,53.0356613 0.000510903718,52.9974025 C-0.019719412,52.9609831 0.562065313,52.5059241 1.52887863,51.8165298 C2.49569194,51.1271356 3.84949162,50.207085 5.37002825,49.2395787 C6.89023859,48.273176 8.28874074,47.4428864 9.31232946,46.867165 C10.3359182,46.2907078 10.9819831,45.9647722 10.999603,46.003031" id="Fill-198" fill="#E1E1E1"></path>
-                    <path d="M23.9997117,44.9907318 C23.9920601,45.0264091 23.5465289,44.9665866 22.8822318,44.6790059 C22.2172391,44.3975517 21.3571309,43.8569867 20.5425844,43.1012767 C19.7269945,42.3459272 19.094695,41.5599456 18.6554242,40.9840636 C18.2182402,40.4045778 17.9716503,40.0287049 18.0026045,40.0016767 C18.0356454,39.9735673 18.3406656,40.3007894 18.8178466,40.8406337 C19.2967665,41.3783157 19.946456,42.1304219 20.742917,42.8677526 C21.5379867,43.604723 22.3483596,44.1546578 22.9719641,44.4786365 C23.5934819,44.8083812 24.0125803,44.9431621 23.9997117,44.9907318" id="Fill-200" fill="#E1E1E1"></path>
-                    <path d="M30.9909475,42.0018693 C31.0613815,42.0263697 30.7249004,43.0960903 29.8376316,43.9721784 C28.9567053,44.8585409 28.008683,45.0683753 28.0006716,44.9822286 C27.9726315,44.8842268 28.8275206,44.5431966 29.6510315,43.7101818 C30.4845567,42.8913931 30.914171,41.9524732 30.9909475,42.0018693" id="Fill-202" fill="#E1E1E1"></path>
-                    <path d="M45,50.0058564 C45.0012872,50.0135321 44.8976687,50.0294129 44.6988772,50.0519106 C44.4692274,50.0749377 44.1817592,50.1035231 43.8296513,50.1389901 C43.0741134,50.2072773 41.9788108,50.2930334 40.6233251,50.3787894 C37.9133282,50.5548011 34.1632486,50.7276366 30.0185092,50.8504478 C25.8721458,50.9687594 22.1162194,51.0145489 19.3974523,50.9960213 C18.0380687,50.9894043 16.9382186,50.9671713 16.178458,50.9430855 C15.8244011,50.9282634 15.534984,50.9163529 15.3040349,50.9065598 C15.1042689,50.8957079 14.9996759,50.8861795 15,50.8785038 C15.0003256,50.8705634 15.1052434,50.8644758 15.3053342,50.8605056 C15.5366081,50.8589175 15.8260252,50.8565354 16.1800821,50.8538886 C16.9791463,50.8491244 18.0682772,50.8422427 19.3971274,50.8340377 C22.1129711,50.8107459 25.8649997,50.7392825 30.0087646,50.6212356 C34.1502557,50.4981598 37.8987112,50.3517922 40.6096825,50.2170704 C41.9356093,50.1479892 43.0227913,50.0916125 43.8202314,50.0500579 C44.1739635,50.0323244 44.462731,50.0175023 44.69368,50.0058564 C44.8937709,49.9981808 44.9990135,49.9979161 45,50.0058564" id="Fill-204" fill="#E1E1E1"></path>
-                    <path d="M41,57.0086073 C41.001957,57.0269714 40.6831361,57.0728819 40.1044747,57.1405233 C39.5254856,57.2078587 38.6863281,57.29264 37.6482763,57.3795638 C35.571845,57.5583085 32.6972148,57.7428686 29.5188365,57.8637661 C26.3388198,57.9828272 23.4576363,58.0152706 21.3726856,57.9938457 C20.3300465,57.9849697 19.4866294,57.9638509 18.9037082,57.9402835 C18.3211148,57.9167162 17.9996726,57.8949852 18,57.876621 C18.0003279,57.8579508 18.3227531,57.8450958 18.9050189,57.837138 C19.5364349,57.8291802 20.3674006,57.8184678 21.3720303,57.8059189 C23.4546873,57.779903 26.3309558,57.7174648 29.5073681,57.5987097 C32.6821421,57.4781182 35.5544787,57.3232469 37.6325483,57.1928612 C38.6345566,57.1298109 39.4642117,57.0774729 40.0939893,57.0376839 C40.6755998,57.0018737 40.998025,56.9902431 41,57.0086073" id="Fill-206" fill="#E1E1E1"></path>
-                    <path d="M31,64.0254218 C31.0034699,64.0784918 30.3365401,64.2220114 29.2538084,64.3839901 C28.1710767,64.5464303 26.6722263,64.7213303 25.0134522,64.8422375 C23.3540447,64.9617603 21.8501275,65.0046777 20.7620122,64.9996015 C19.6732635,64.9954482 19.0003168,64.9493004 19,64.8953075 C18.9996834,64.8390072 19.6719968,64.7850143 20.7578953,64.717177 C21.9223307,64.6419562 23.3831793,64.5473532 24.9998349,64.4425978 C26.6145904,64.3129225 28.0751224,64.1957071 29.2386077,64.1020272 C30.3235562,64.0125005 30.9961863,63.9686601 31,64.0254218" id="Fill-208" fill="#E1E1E1"></path>
-                    <path d="M18,45.8977274 C17.9981547,45.979132 16.4306265,45.9975137 14.5012429,46.0838419 C12.5715521,46.1665595 11.0080172,46.2863686 11,46.2052923 C10.9920439,46.1301243 12.5503568,45.8829564 14.4904917,45.7995824 C16.429705,45.7129259 18.002148,45.8225595 18,45.8977274" id="Fill-210" fill="#E1E1E1"></path>
-                    <path d="M42,46.0182531 C41.9996956,46.0967035 39.9845748,46.1521768 37.4996956,46.1423295 C35.013903,46.1321539 32.9996956,46.0602684 33,45.981818 C33,45.9030394 35.0148163,45.8475661 37.5006089,45.8577417 C39.9854881,45.8679173 42,45.940131 42,46.0182531" id="Fill-212" fill="#E1E1E1"></path>
-                    <path d="M53.9997283,63.0042223 C54.0079035,63.0262069 53.8313209,63.1485212 53.5039891,63.3523784 C53.1779653,63.5590336 52.6949793,63.829644 52.0890395,64.1402264 C50.8787948,64.7621906 49.1584227,65.4968758 47.2029342,66.0500882 C45.2454836,66.5993034 43.4358392,66.8595211 42.1248771,66.9474595 C41.4692325,66.9930276 40.9375228,67.0078172 40.5706234,66.9962253 C40.2033971,66.9882309 40.0003271,66.9726419 40,66.9486587 C39.9996731,66.8930976 40.8090099,66.8551242 42.1091809,66.7036303 C43.4090248,66.5533356 45.1983949,66.2575429 47.1394953,65.7127246 C49.0786335,65.1639091 50.7931196,64.4727934 52.0157904,63.912386 C53.2387882,63.3531778 53.9804351,62.9542573 53.9997283,63.0042223" id="Fill-214" fill="#FF9A6C" transform="translate(47.000000, 65.000000) rotate(-30.000000) translate(-47.000000, -65.000000) "></path>
-                    <path d="M78.3747661,22.9341668 C78.0549808,23.770409 76.9805152,24.2293546 76.1488742,23.8843223 C75.3175649,23.5392901 74.891295,22.4581013 75.2668106,21.6449052 C75.561053,21.0068589 76.2560222,20.5462672 76.3223677,19.8479721 C76.4033092,19.001853 75.5345147,18.3996927 74.7629164,18.0306268 C73.9916499,17.66189 73.0896826,17.1825323 73.0060873,16.3370716 C72.9254775,15.5205832 73.6612492,14.8858292 74.277599,14.3396379 C74.8942806,13.7931174 75.5010103,12.9489737 75.1208505,12.2207186 C74.9264581,11.8480312 74.5220822,11.6337029 74.2606809,11.3038153 C73.6818163,10.5739141 73.9846836,9.41140568 74.7214505,8.83887606 C75.4582174,8.26601721 76.4799383,8.18634374 77.4011457,8.35062912 C78.3223532,8.51491451 79.1884939,8.89385734 80.0858169,9.15855764 C83.0441633,10.032332 86.3684052,9.60005403 89,8" id="Fill-218" fill="#263238"></path>
-                    <path d="M83.0881062,42.8754854 C86.4097917,43.5486408 89.6555397,41.4261744 90.3771118,38.1085747 L94.7599328,17.9670731 C95.9122595,13.0679236 92.8018063,8.18206441 87.8821171,7.16369255 L87.4218496,7.09591184 C82.7909882,6.4164435 78.415131,9.41341389 77.3669281,13.9839599 C76.3920099,18.2355378 75.3693407,22.9449678 75.060285,25.2571537 C74.4206193,30.0443321 79.0823199,31.4876624 79.0823199,31.4876624 L78.2453493,35.5199498 C77.5459947,38.8930367 79.7183379,42.1923622 83.0881062,42.8754854" id="Fill-220" fill="#9C7160"></path>
-                    <path d="M79.0076019,18.3974711 C78.9598796,18.6675543 79.1418055,18.9323762 79.4140887,18.989249 C79.6854029,19.0458713 79.9446049,18.8732485 79.9923271,18.6029148 C80.0402916,18.332581 79.8583657,18.0677591 79.5868093,18.0108863 C79.3147683,17.953763 79.0553241,18.1271374 79.0076019,18.3974711" id="Fill-222" fill="#263238"></path>
-                    <path d="M78.0077177,17.5815526 C78.0871463,17.6902544 78.7211042,17.3609414 79.5334088,17.4785532 C80.3468166,17.5844038 80.8818565,18.074453 80.9848195,17.9903428 C81.0344624,17.95399 80.9653301,17.7679495 80.7332956,17.5476947 C80.5053061,17.3292218 80.0960281,17.0897214 79.589303,17.0202235 C79.0825779,16.9507257 78.629173,17.0708323 78.3566887,17.2208764 C78.0786886,17.3716334 77.9683711,17.5320131 78.0077177,17.5815526" id="Fill-224" fill="#263238"></path>
-                    <path d="M86.0076022,19.3974269 C85.9598799,19.6677805 86.1418058,19.9326218 86.4138466,19.9892482 C86.685403,20.0458747 86.9446049,19.8732392 86.9923271,19.6028856 C87.0402916,19.332532 86.8583658,19.0676907 86.5868094,19.0108137 C86.3147685,18.9539367 86.0553244,19.1270733 86.0076022,19.3974269" id="Fill-226" fill="#263238"></path>
-                    <path d="M86.0076845,18.5815479 C86.0871062,18.6902494 86.7217441,18.3612938 87.5336101,18.4785488 C88.3465791,18.5847555 88.88194,19.0744467 88.984894,18.9903367 C89.0341649,18.9539841 88.9661417,18.7683006 88.7330244,18.5480465 C88.5050548,18.3292179 88.0958126,18.0897183 87.5894994,18.0202206 C87.0828186,17.950723 86.6294532,18.0708292 86.3566251,18.2212292 C86.0793846,18.3716293 85.9683414,18.5320085 86.0076845,18.5815479" id="Fill-228" fill="#263238"></path>
-                    <path d="M81.7779801,23.9885971 C81.7874975,23.9476255 81.3480547,23.8040611 80.6312935,23.6037919 C80.4484931,23.5579037 80.2788202,23.4952991 80.2663491,23.3645178 C80.2420632,23.2245589 80.3490523,23.0364173 80.4701535,22.8341815 C80.7097302,22.4120103 80.9611218,21.9695171 81.224328,21.5057187 C82.2791222,19.61152 83.0713665,18.0427998 82.9948988,18.0008448 C82.918103,17.9592177 82.0008193,19.4610724 80.9463533,21.355271 C80.6906954,21.8230027 80.4461958,22.2687736 80.2135109,22.6955337 C80.1127574,22.895475 79.9571966,23.1163939 80.0110193,23.4077838 C80.0408844,23.5529871 80.1619855,23.6732797 80.2761947,23.7224456 C80.3897476,23.7762004 80.4934548,23.7932446 80.5840345,23.8122554 C81.313595,23.9590976 81.7694472,24.0292409 81.7779801,23.9885971" id="Fill-230" fill="#263238"></path>
-                    <path d="M86.0010207,15.2947275 C86.0405111,15.4597612 86.7181777,15.4696684 87.4859787,15.6500844 C88.2580002,15.8172039 88.8551788,16.0948672 88.9826934,15.9676375 C89.0399695,15.906369 88.9552612,15.7449853 88.7258554,15.5609193 C88.4991627,15.3773747 88.1202361,15.1823586 87.6587114,15.0778111 C87.1968852,14.9743066 86.7564622,14.9842138 86.4547076,15.0483501 C86.1508429,15.111965 85.9853451,15.2165125 86.0010207,15.2947275" id="Fill-232" fill="#263238"></path>
-                    <path d="M79.0128321,14.6338605 C79.1367956,14.8322099 79.7660577,14.7264709 80.4881941,14.8126943 C81.2134787,14.8765635 81.799452,15.1079119 81.9702461,14.9400779 C82.0461983,14.8581124 81.9792974,14.6668596 81.7400283,14.4631878 C81.5046944,14.2602257 81.087154,14.064715 80.5905131,14.0132648 C80.0926916,13.9618146 79.6377654,14.0664891 79.3571751,14.2158721 C79.0730429,14.365255 78.9593114,14.5377019 79.0128321,14.6338605" id="Fill-234" fill="#263238"></path>
-                    <path d="M90,12.4592478 C90.0085391,12.4672929 90.0174495,12.4760085 90.0256173,12.4840537 C90.7778001,13.202753 91.1977008,14.1544263 91.1895329,15.1429731 C91.1891617,15.1775002 91.1887904,15.2106864 91.1884191,15.2421965 C91.1743111,16.644733 90.9095992,18.0388891 90.9103417,19.4414255 C90.9114555,20.8442972 91.2118088,22.3111947 92.183038,23.4060045 C92.5825191,23.8565324 93.3569778,24.2326428 93.8114061,23.8266984 C93.9870144,23.6694829 94.0490157,23.4395259 94.1039629,23.2216366 C94.9270573,19.9388835 96.409147,17.1261007 96.9653019,13.6529458 C97.116778,12.7076416 96.767789,11.7552979 96.0066958,11.0929145 C95.2856992,10.4653934 94.3902082,9.79496491 93.4338296,10.0591137 C92.474481,10.323933 91.0725845,11.6825564 90.2747361,12.2316373" id="Fill-236" fill="#263238"></path>
-                    <path d="M92.9229073,20.0358105 C93.0145629,20.0126233 96.5438303,19.5468931 95.9278766,22.7887864 C95.3119229,26.0306798 91.9884416,24.7785743 92,24.6845007 C92.0116189,24.5904272 92.9229073,20.0358105 92.9229073,20.0358105" id="Fill-238" fill="#9C7160"></path>
-                    <path d="M93.0060271,23.6193578 C93.0247292,23.611256 93.0640816,23.6718434 93.1669431,23.7370101 C93.267467,23.8000632 93.4498125,23.8613551 93.6617698,23.8264821 C94.091139,23.7581452 94.5450547,23.2346983 94.6864894,22.6164955 C94.7585705,22.3044 94.7449335,21.9937135 94.6709043,21.7267062 C94.6050573,21.4551197 94.4589471,21.2497566 94.2629646,21.1845899 C94.0693199,21.1099125 93.9041179,21.1962143 93.8382709,21.2856864 C93.7677484,21.3737494 93.7782683,21.4466657 93.7572284,21.4491314 C93.7447604,21.4558242 93.6867059,21.3783287 93.7455396,21.2405981 C93.7751513,21.1750791 93.8359331,21.1007539 93.9387947,21.0489728 C94.0432148,20.9968395 94.1846495,20.9845106 94.3233568,21.0207926 C94.6136291,21.0870161 94.8298722,21.3744539 94.9113043,21.6678801 C95.0087112,21.965181 95.0316992,22.3153198 94.9510463,22.6658108 C94.7889614,23.3565776 94.2664712,23.9430776 93.6867059,23.9976767 C93.4061743,24.0174029 93.1969444,23.9078524 93.0971999,23.8078128 C92.9962864,23.7035461 92.9916109,23.6235848 93.0060271,23.6193578" id="Fill-240" fill="#5A3327"></path>
-                    <path d="M93.7309875,11.0041557 C94.710367,9.89273427 92.8124106,7.83696174 91.2995374,7.1413529 C89.7863373,6.44543353 87.5833872,6.8891947 85.9279875,7.16743823 C84.8835557,7.3425826 83.8231061,7.64225337 82.7809627,7.45499796 C82.0820597,7.32985047 81.4485358,6.99353602 80.8192616,6.67833827 C80.1899874,6.36345106 79.5312926,6.05912219 78.8225828,6.00664099 C78.113546,5.95447033 77.3358612,6.20911285 76.9736608,6.79075363 C76.6121141,7.37239441 76.8628431,8.27326996 77.5457282,8.46207807 C76.7278352,7.87422649 75.3470278,8.30556608 75.05511,9.23966937 C74.7638459,10.1740832 75.6732697,11.2504137 76.6967801,11.1824055 C76.2901219,10.7901939 75.5058991,11.2361288 75.4784399,11.7860946 C75.4513076,12.3360603 75.9083077,12.8024909 76.399305,13.0947087 C77.6536038,13.8403144 79.2442782,13.8794424 80.6999447,13.6285264 C82.1559381,13.3782314 83.5491675,12.8661515 84.9976423,12.5810761 C86.4467709,12.2960007 88.8821438,11.7618725 90.191361,12.4164901 C91.1553764,12.8984476 91.6836398,14.1598597 92.297223,13.9831627 C92.8902118,13.8120553 93.3269445,13.3089811 93.5260239,12.7515624 C93.7251034,12.1938331 93.7290262,11.5929389 93.7309875,11.0041557" id="Fill-242" fill="#263238"></path>
-                    <path d="M77.7923325,7.24902499 C77.7943045,7.24490948 77.7469761,7.21884458 77.652648,7.17185917 C77.6063056,7.14682315 77.5468165,7.12041529 77.4725373,7.0984659 C77.40023,7.07034324 77.3141187,7.04530722 77.2138745,7.02918814 C76.8253875,6.94722089 76.1683776,7.01341202 75.5912344,7.54739949 L75.590577,7.54774245 L75.588605,7.55014317 C75.1978173,8.01382401 74.9434273,8.74364119 75.0108045,9.55062419 C75.0614195,10.3579502 75.4844169,11.2153482 76.1926991,11.8285592 C76.8940793,12.452059 77.8495209,12.8406318 78.869053,12.9520936 C79.8925291,13.0690426 80.9682636,12.9606675 82.0479421,12.7483758 C83.8105954,12.3978715 85.4099,11.6934333 86.7341085,10.8596995 C87.4016358,10.4556935 88.0336668,10.0698644 88.6679985,9.8119591 C89.2987148,9.54685164 89.9294311,9.43058847 90.5065744,9.41961378 C91.6680916,9.39869327 92.5771907,9.75811451 93.1461172,10.0705503 C93.7199738,10.3891594 93.9875106,10.6504944 94,10.6330034 C94,10.6330034 93.7482393,10.3531487 93.1766835,10.0122473 C92.6100577,9.67854797 91.6920844,9.29374775 90.504931,9.2992351 C89.9159557,9.30232173 89.2648619,9.41515531 88.6186981,9.67991981 C87.9695763,9.93782513 87.3276852,10.3239972 86.6591719,10.7235447 C85.3379215,11.544932 83.7606377,12.2332511 82.0170472,12.5813547 C80.9492008,12.7912457 79.8852983,12.8989349 78.8868011,12.7878161 C77.8899472,12.6821847 76.9660579,12.3100739 76.2853839,11.7133249 C75.5981364,11.1254928 75.1902579,10.3133655 75.1327407,9.5396495 C75.0597762,8.76559058 75.2937887,8.06458197 75.6599263,7.61324766 L75.6572969,7.61599133 C76.1943425,7.10120957 76.8270308,7.01512681 77.2063152,7.08097498 C77.5964456,7.14476539 77.7857591,7.26754479 77.7923325,7.24902499" id="Fill-246" fill="#455A64"></path>
-                    <path d="M79.0035502,5 C79.0035502,5 78.9685891,5.27415503 79.1180894,5.73977342 C79.2695875,6.19732916 79.6671452,6.82789605 80.4019942,7.29922549 C80.7642578,7.53640196 81.2027699,7.73628864 81.7025471,7.84278289 C82.1999936,7.9512928 82.7473845,7.97480888 83.3137544,7.92811266 C84.4528203,7.84143911 85.6454932,7.44804868 86.8957688,7.12117517 C88.1417158,6.79396571 89.3953209,6.62464993 90.4741206,6.91524149 C91.5529202,7.19407502 92.3780022,7.85655659 92.9064142,8.50795202 C93.4418185,9.16573038 93.7105195,9.81779769 93.8380443,10.2740096 C93.9629053,10.7345889 93.9772228,11.0023362 93.9972005,11 C94.0028609,10.9993127 94,10.9331318 93.9888765,10.8064809 C93.9832161,10.6788222 93.9499198,10.4943889 93.8999754,10.2575484 C93.7897647,9.78924245 93.5337162,9.11668255 92.9969801,8.43404433 C92.4679021,7.75745311 91.6288357,7.06440063 90.5127442,6.76675424 C89.3959868,6.45734981 88.1097513,6.63036098 86.8551473,6.9595861 C85.5948829,7.28948311 84.4165273,7.68220165 83.3007688,7.7749222 C82.7467186,7.82497786 82.2133121,7.80650094 81.730183,7.70739745 C81.2477198,7.61064558 80.8198626,7.42318883 80.4649242,7.19945012 C79.7437266,6.7549962 79.3445042,6.15634399 79.1783557,5.71760112 C79.014205,5.27146748 79.0245269,4.99700123 79.0035502,5" id="Fill-248" fill="#455A64"></path>
-                    <path d="M80.1001445,25.4512668 C80.1673196,25.7621277 80.2365554,26.0778814 80.4125295,26.361016 C80.5880915,26.6438244 80.8881129,26.8946659 81.2738547,26.9739306 C81.6847357,27.0584143 82.1360042,26.9302208 82.4401468,26.6953627 C82.7434652,26.4611569 82.9124333,26.1336602 82.9808448,25.8019231 C83.0426624,25.5021527 82.9647722,25.1188773 82.6008726,25.0223245 C82.4492134,24.9822029 82.2843664,25.0040577 82.1269376,25.026565 C81.4176837,25.1280106 80.709254,25.2294563 80,25.330902" id="Fill-250" fill="#AA6550"></path>
-                    <path d="M80.6514403,26.6696079 C80.6749606,26.6281539 80.9766343,26.8501428 81.5261236,26.8152975 C81.7923463,26.7984756 82.1107229,26.7056548 82.3476305,26.4854682 C82.5828337,26.2685859 82.7375906,25.9282429 82.6987309,25.5818921 C82.6915726,25.4956799 82.6646435,25.4115705 82.6363509,25.3352712 C82.5951051,25.259873 82.6053314,25.2655804 82.5340887,25.2550668 C82.4642094,25.2523632 82.3449035,25.2658808 82.2494587,25.2712879 C82.1499234,25.2778965 82.0524334,25.2848055 81.9566477,25.2911137 C81.5752094,25.3163465 81.2312673,25.3352712 80.942206,25.3475872 C80.3634016,25.3719189 80.0041201,25.3689149 80,25.3331684 C79.99628,25.2974219 80.348744,25.235241 80.9224353,25.1637479 C81.2091105,25.1283018 81.5510074,25.0901521 81.9310821,25.0520025 C82.0265269,25.0426903 82.124017,25.0330778 82.2232114,25.0234653 C82.3275189,25.0159555 82.4106922,24.9991337 82.549428,25.0000348 C82.6165802,25.0021376 82.7069119,25.0180583 82.7812225,25.0721287 C82.8538287,25.1252979 82.8879161,25.1898819 82.9114364,25.2424503 C82.9516596,25.3451841 82.98302,25.4476174 82.9929054,25.5560585 C83.0406278,25.9883211 82.8429207,26.3965525 82.5405653,26.6548887 C82.2320741,26.9189324 81.8380235,27.005445 81.5322593,26.9997376 C81.2207002,26.9967336 80.98277,26.9093199 80.8402846,26.830317 C80.6967766,26.7498123 80.6401914,26.6816235 80.6514403,26.6696079" id="Fill-252" fill="#263238"></path>
-                    <path d="M79.3386053,32 C79.3386053,32 82.7138749,33.4131403 86,32.386015 C86,32.386015 83.5215672,34.6790951 79,33.7987586 L79.3386053,32 Z" id="Fill-254" fill="#AA6550"></path>
-                    <path d="M83.9997391,75.9996185 C83.992825,76.0075303 83.8485719,75.8921497 83.5946361,75.6765528 C83.4689253,75.5667765 83.3133582,75.4352426 83.1238491,75.2948079 C82.9352829,75.1530547 82.728803,74.9799838 82.4811527,74.8181213 C82.2385308,74.6480174 81.9723382,74.4637381 81.672518,74.289019 C81.3808689,74.0994651 81.0515066,73.9306798 80.7095732,73.7447523 C80.0153354,73.3956436 79.2299571,73.0587323 78.3795236,72.7870935 C77.5259473,72.5243554 76.6934275,72.3535922 75.9297344,72.2454641 C75.546945,72.2039271 75.1833265,72.1557969 74.8404503,72.1459071 C74.4985169,72.1195344 74.1792115,72.1201937 73.8872482,72.122831 C73.5955991,72.1155785 73.3325493,72.1412919 73.1006129,72.1511817 C72.8686764,72.1594231 72.6700534,72.1795323 72.5078864,72.1989822 C72.1826097,72.2326074 72.0015862,72.246453 72,72.2355743 C71.9981292,72.2246956 72.1763242,72.1900814 72.5006581,72.1370063 C72.662825,72.1079964 72.8617623,72.0783271 73.0943273,72.0621738 C73.326578,72.0433832 73.5911993,72.0094284 73.8850482,72.0094284 C74.1788972,71.9998683 74.5007169,71.9926158 74.8464216,72.0133843 C75.1924406,72.0176698 75.5598304,72.0611848 75.9470196,72.0994252 C76.7185697,72.2003008 77.5611463,72.3680971 78.4232081,72.6338021 C79.2824414,72.9084079 80.0744194,73.2529014 80.7718001,73.6128888 C81.1156191,73.8037612 81.4452957,73.97881 81.7369448,74.1746274 C82.0364507,74.3562693 82.3017005,74.5478011 82.5421224,74.7251575 C82.7882013,74.8939428 82.9912243,75.0745959 83.1760191,75.2239313 C83.3617568,75.3722778 83.5126098,75.5113938 83.6326636,75.6287523 C83.875914,75.8598431 84.0066532,75.991377 83.9997391,75.9996185" id="Fill-256" fill="#FAFAFA"></path>
-                    <path d="M66.7041956,60.9150073 L69.0338747,48.6442899 C69.9836659,44.4779356 70.4892648,41.8554131 72.3804017,41.3808456 L73,41.2894982 L72.1908585,72.9432822 C72.1908585,72.9432822 75.4216365,80.5184947 66.6105901,70.3533187 L66.7041956,60.9150073 Z" id="Fill-258" fill="#D19A3C"></path>
-                    <path d="M105.275927,48.9403556 C106.208882,51.6510888 113,71.6434001 113,71.6434001 L101.419411,71.4010433 L99.5336929,67.2790151 L100.453983,73.9652504 L101.23886,83.5051473 C95.7456976,87.5196589 91.2894745,90.1961803 87.8701909,91.5347117 C84.4509073,92.873243 79.0580241,94.0523063 71.6915414,95.0719015 L72.2049058,69.6309555 L72.4854742,41.0469151 C72.4854742,41.0469151 72.8141029,40.6135511 77.8555656,37.8122202 C80.98728,36.0715685 92.2369672,37.6702731 92.2369672,37.6702731 C97.1683458,38.6217116 102.721911,41.5198543 105.275927,48.9403556 Z" id="Fill-260" fill="#D19A3C"></path>
-                    <path d="M95,57 C95.5501891,62.9973542 96.1833344,64.8496456 96.7331515,70.8473248 C96.7852316,71.4136098 96.8402877,71.9912724 97.0951082,72.5143221 C97.3495567,73.0370466 97.8435737,73.504508 98.480439,73.6179601 C99.4561969,73.7915514 100.724347,74.4082234 101,73.5721241 L100.07409,67.7958226 C100.07409,67.7958226 99.8560977,66.7094138 99.1593403,65.3580667 C97.1040362,61.3706665 96.3432947,61.1369358 95,57" id="Fill-262" fill-opacity="0.3" fill="#000000"></path>
-                    <path d="M77,40.9668828 L77.1007584,40.3636146 L78.0670313,34.5704143 C78.1254712,34.2207894 78.46234,33.9728106 78.8385047,34.0023918 L90.745459,34.9338858 C91.4934221,34.9924189 92.0516235,35.6048132 91.9962064,36.3062659 L91.730876,39.6728614 L88.0132274,44.2176709 L82.6595985,45" id="Fill-264" fill="#D19A3C"></path>
-                    <path d="M72.0794397,62.9994877 C72.0794397,69.0757075 72.0440603,74 72.0001638,74 C71.9562672,74 71.9205603,69.0757075 71.9205603,62.9994877 C71.9205603,56.9253171 71.9562672,52 72.0001638,52 C72.0440603,52 72.0794397,56.9253171 72.0794397,62.9994877 Z" id="Fill-266" fill="#263238"></path>
-                    <path d="M101.999514,72 C101.996931,72.0009475 101.984661,71.9778187 101.962705,71.9318868 C101.93752,71.8768337 101.906523,71.8090761 101.8681,71.725682 C101.783181,71.531856 101.666942,71.2650602 101.519384,70.9275749 C101.217486,70.2193769 100.789663,69.2153907 100.263038,67.9801163 C99.2120467,65.4753629 97.7684275,62.0343809 96.173698,58.2337621 C95.3813379,56.3280777 94.6267555,54.5126282 93.9393331,52.8600578 C93.5744729,52.0437082 93.3316634,51.2071616 93.1999262,50.420456 C93.0620543,49.6321216 93.0058723,48.8864615 93.0007061,48.2069303 C92.9864992,46.8459132 93.1883024,45.7461542 93.4585572,45.0346987 C93.4918144,44.945441 93.5205511,44.8604181 93.5531625,44.7825619 C93.5899714,44.7076376 93.624843,44.6366224 93.6571315,44.5704935 C93.7191255,44.43791 93.7769219,44.328781 93.8376243,44.2483188 C93.8892859,44.1720914 93.931261,44.1105231 93.9651639,44.0603564 C93.9948693,44.0186594 94.0110136,43.9984624 94.0132738,44 C94.0345842,44.0127957 93.7594861,44.3411598 93.5160307,45.0552214 C93.2664406,45.7650481 93.0833647,46.855686 93.1114557,48.2049757 C93.1469731,49.5464472 93.3287574,51.1788207 94.0723618,52.8033759 C94.7633359,54.4549691 95.521793,56.2681382 96.3180276,58.1725196 C97.89629,61.9799793 99.3250565,65.4271507 100.365069,67.9367905 C100.872645,69.1805346 101.284646,70.1907102 101.575566,70.9037945 C101.7115,71.2461662 101.819021,71.5165454 101.897482,71.7133032 C101.929448,71.7993033 101.955924,71.8690156 101.977235,71.9253717 C101.994348,71.9735839 102.002097,71.9986672 101.999514,72" id="Fill-268" fill="#263238"></path>
-                    <path d="M106,50.5708037 C106.000322,50.5756265 105.956021,50.5818677 105.871946,50.5892438 C105.787224,50.5954851 105.662405,50.6096698 105.501046,50.6125067 C105.178975,50.6269751 104.711067,50.6221523 104.135477,50.584421 C103.560212,50.5478244 102.879205,50.4706596 102.126089,50.3795937 C101.372973,50.2899463 100.546129,50.1883837 99.6743378,50.1478154 C98.8041634,50.1117862 97.9711759,50.1696599 97.2345511,50.3089538 C96.4998665,50.4527868 95.8602511,50.669813 95.3745573,50.9299607 C94.3886183,51.4474191 94.0329172,52.0284251 94.0005807,51.9989209 C93.9960536,51.996084 94.0180424,51.9623243 94.0649303,51.9001953 C94.1147284,51.8403358 94.1745509,51.7410428 94.2835248,51.6355085 C94.4827175,51.4116736 94.8258074,51.120887 95.3166751,50.8471219 C95.8059259,50.5699526 96.4558889,50.338458 97.2031848,50.1852631 C97.9517741,50.0360399 98.7986662,49.9736271 99.682422,50.0102237 C100.563591,50.0513594 101.394315,50.157461 102.146138,50.2542008 C102.898284,50.3520753 103.574763,50.4386021 104.145502,50.4873975 C104.715594,50.5373277 105.179622,50.5569026 105.5004,50.5591722 C105.820854,50.5622928 105.999028,50.5597396 106,50.5708037" id="Fill-272" fill="#211908"></path>
-                    <path d="M71.9978062,61.9997183 C71.9695163,62.0120099 71.8166079,61.6209822 71.4925278,61.0378976 C71.1698802,60.454813 70.6524265,59.6915791 69.9480448,58.9848099 C69.2411565,58.2803453 68.4952353,57.7802293 67.9301543,57.4763954 C67.3647153,57.1706409 66.9908594,57.0338964 67.00017,57.0031673 C67.0041091,56.9908757 67.1004379,57.0146907 67.2726837,57.0688507 C67.4456458,57.1199379 67.6898696,57.2175027 67.9831531,57.3573201 C68.5704362,57.6350343 69.3446472,58.1290046 70.0665758,58.8484495 C70.7859976,59.5701991 71.2998703,60.3637781 71.5995996,60.9725983 C71.7500014,61.2768163 71.8574312,61.5310996 71.9172338,61.7127854 C71.9795431,61.8933188 72.0085492,61.9947248 71.9978062,61.9997183" id="Fill-276" fill="#211908"></path>
-                    <path d="M107.999502,61.0010582 C108.019613,61.0268265 107.427002,61.2676485 106.832445,62.0457869 C106.532085,62.4272211 106.230427,62.9212722 105.885305,63.4690867 C105.540183,64.0169012 105.110727,64.5955741 104.594017,65.1437067 C103.558651,66.2434714 102.387377,66.996796 101.497325,67.4272217 C101.053272,67.648638 100.675714,67.7882957 100.414926,67.8815069 C100.150895,67.9667649 100.003634,68.0084395 100,67.9985776 C99.9964984,67.9883975 100.136947,67.926999 100.39287,67.8255165 C100.645224,67.7154446 101.013051,67.5617893 101.446076,67.3305111 C102.314719,66.879089 103.457774,66.1229014 104.478868,65.0387249 C104.988118,64.497591 105.413033,63.9329157 105.763021,63.3930544 C106.113008,62.8522386 106.427964,62.3578694 106.745516,61.9780259 C107.062418,61.5981824 107.374455,61.3363639 107.612213,61.1906618 C107.73093,61.1178107 107.825644,61.0665923 107.894084,61.0392334 C107.961227,61.0093295 107.996907,60.9959681 107.999502,61.0010582" id="Fill-278" fill="#211908"></path>
-                    <path d="M92,37.6810871 C92.0009833,37.6887969 91.9517402,37.7060306 91.8579122,37.7309741 C91.7447861,37.7586387 91.6090349,37.791292 91.4456676,37.8307481 C91.0869916,37.9119278 90.5666119,38.0194116 89.9221263,38.1377799 C88.6338206,38.3749698 86.8477604,38.6511624 84.8683879,38.8484427 C83.8798661,38.9468562 82.9326021,39.0352922 82.0675207,38.9858587 C81.2037703,38.9427745 80.4275262,38.7500293 79.8073294,38.4593242 C79.1844709,38.1745148 78.7223178,37.8017229 78.427192,37.5087502 C78.27913,37.3622639 78.1709949,37.2366394 78.1011229,37.1463893 C78.031251,37.0565927 77.996315,37.0067057 78.0003077,37.0008099 C78.0096239,36.9862974 78.1606804,37.1681581 78.4627934,37.4380014 C78.7649065,37.7055771 79.2267268,38.0502509 79.8429309,38.3114773 C80.4568059,38.5781459 81.2194083,38.7513899 82.073177,38.7835896 C82.9269458,38.8216852 83.8682208,38.7278069 84.8567425,38.6293935 C86.8327879,38.4316596 88.6175172,38.1813176 89.908152,37.9831302 C90.5343377,37.8860773 91.050392,37.8058046 91.4370168,37.7463937 C91.7983546,37.690611 91.9986542,37.666121 92,37.6810871" id="Fill-280" fill="#263238"></path>
-                    <path d="M112.851123,74.7093693 C113.809766,78.4668708 110.018431,81.9610533 104.941104,82 L82,81.8079608 L82.6023616,76.2104103 L102.272248,74" id="Fill-282" fill="#9C7160"></path>
-                    <path d="M84,75.8327973 C83.8964869,75.8663451 82.5902355,75.293524 81.419865,74.7639701 C80.1777083,74.2018091 78.8150535,73.9428325 77.4482325,74.0105552 L72.0565803,74.2789377 C72.0565803,74.2789377 72.3895526,75.1489862 72.961278,75.4587548 C73.5330034,75.7678963 76.8848394,75.8340514 76.8848394,75.8340514 L76.7133859,76.0071205 C76.0067411,76.7185223 75.0433966,77.131129 74.0297378,77.155898 L73.5144159,77.1687528 C73.132411,77.1389673 72.7548928,77.0668552 72.3895526,76.953357 L71.0595861,76.4275655 C70.657071,76.250107 70.2321226,76.2789518 70.0571439,76.6755685 C69.8988298,77.0339344 70.0148414,77.5280593 71.1124643,78.0692137 C71.7261717,78.3714576 74.0018566,79.1411762 74.0018566,79.1411762 C74.0018566,79.1411762 74.0345449,79.7566375 74.1342123,80.0808285 C74.2332387,80.404706 75.1273608,80.7285835 75.1273608,80.7285835 C75.1273608,80.7285835 75.6904334,81.8623115 75.922136,82.1216016 C76.0259695,82.2379216 76.8358069,82.484357 77.6972407,82.7207594 C79.0880972,83.1026401 80.5613155,83.0935477 81.9454421,82.6890927 L84,82.0889944 L84,75.9663614" id="Fill-284" fill="#9C7160"></path>
-                    <path d="M76.9999696,79.9836646 C76.9971427,80.0309772 76.2921919,79.985855 75.4543782,79.7103029 C74.6155045,79.4391316 73.9840523,79.0483645 74.0003068,79.0054327 C74.0176214,78.9550536 74.6660348,79.2647759 75.4921876,79.5320045 C76.3172804,79.8031758 77.00527,79.9293427 76.9999696,79.9836646" id="Fill-286" fill="#5A3327"></path>
-                    <path d="M77,81.1886601 C77.0004333,81.224767 76.5173015,81.2477441 75.9478644,81.1322021 C75.3770926,81.0189578 74.9753725,80.8190571 75.0011752,80.7875456 C75.0265329,80.7524235 75.4504967,80.8909426 75.9968004,80.9989349 C76.5417695,81.1095532 77.0026577,81.1486143 77,81.1886601" id="Fill-288" fill="#5A3327"></path>
-                    <path d="M77.999287,76.0010281 C78.0125529,76.0139224 77.8400957,76.193782 77.5331864,76.4599346 C77.22556,76.7234422 76.7798961,77.0758877 76.2191413,77.3770865 C75.6583864,77.6782852 75.0929705,77.8475649 74.6788581,77.9252616 C74.2640286,78.0029583 74.0022952,78.0085789 74.0001439,77.9930395 C73.9858024,77.942454 75.0456434,77.8528548 76.1434895,77.2567392 C76.6899029,76.9628142 77.1395107,76.628553 77.4629128,76.3855441 C77.7852392,76.1405515 77.9838698,75.9858194 77.999287,76.0010281" id="Fill-290" fill="#5A3327"></path>
-                    <path d="M84.5625575,74.768281 L84,82.9923616 L105.832682,83 C107.314445,83.0006357 108.768621,82.6104827 110.038891,81.8709106 C112.987638,80.1550013 114.509795,76.8320183 113.846088,73.5618619 C113.621131,72.2252857 113.096669,70.6630827 112.43756,69 L101.461285,70.7499601 L101.812022,72.0744435 L84.5625575,74.768281 Z" id="Fill-292" fill="#D19A3C"></path>
-                    <path d="M106,71.0022058 C106.000624,71.0087148 105.928072,71.0286246 105.788934,71.0611695 C105.635036,71.094863 105.432454,71.1392772 105.17962,71.1947949 C104.632494,71.3062132 103.86928,71.4616628 102.933009,71.6519545 C101.019322,72.0233488 98.4030398,72.5310487 95.5122516,73.0915862 C92.6183226,73.631448 89.9988992,74.1203868 88.0830139,74.4776145 C87.1439161,74.6441677 86.3781901,74.7793246 85.8291791,74.8765763 C85.5744606,74.9179274 85.3703089,74.9508552 85.2151536,74.9757424 C85.07476,74.996418 85.0006372,75.0040756 85,74.9979495 C84.9990668,74.9914405 85.0716192,74.9711478 85.2110705,74.938603 C85.3649695,74.9049095 85.5672367,74.8604953 85.8203848,74.8053605 C86.3675114,74.6939422 87.1307247,74.5381097 88.0666818,74.347818 C89.9806826,73.9768065 92.5969652,73.4691066 95.4883816,72.9085692 C98.3813683,72.3683244 101.000164,71.8797686 102.915735,71.5225408 C103.854833,71.3563706 104.620559,71.2204479 105.16957,71.123579 C105.424602,71.0822279 105.628754,71.0493002 105.784223,71.0244129 C105.924617,71.0037374 105.999054,70.9956969 106,71.0022058" id="Fill-294" fill="#263238"></path>
-                    <path d="M94.7142832,83 C94.6742858,82.9932981 94.8511709,82.4070531 94.8735832,81.4409874 C94.8728936,81.1996297 94.8787553,80.9354066 94.8401371,80.6533993 C94.8242761,80.3701216 94.7608319,80.0725531 94.6998013,79.7594233 C94.5505007,79.1382449 94.3115506,78.4697478 93.9546771,77.8120482 C93.5943556,77.1549838 93.1461087,76.5836649 92.7016547,76.0961859 C92.5864897,75.9777301 92.4737384,75.8614974 92.3644351,75.748758 C92.253063,75.6376064 92.1337603,75.5404282 92.0244571,75.4400742 C91.8089538,75.2365081 91.5824167,75.0735917 91.3827744,74.9167092 C90.5638618,74.3110921 89.9814857,74.0303551 90.00045,74.0008205 C90.0063117,73.9916108 90.1514747,74.0602072 90.4107683,74.1926363 C90.5407599,74.2580569 90.7000599,74.3380861 90.871773,74.4505079 C91.0431412,74.5629298 91.2534724,74.6724934 91.4562179,74.8309638 C91.6627563,74.9843529 91.8968791,75.1447287 92.1196233,75.3470245 C92.2323747,75.4467433 92.3551253,75.543604 92.4699455,75.6547555 C92.5830416,75.7681301 92.699241,75.8843628 92.8178541,76.0031362 C93.2764451,76.4931557 93.7364154,77.0727317 94.103633,77.7421815 C94.4677474,78.4129017 94.7073871,79.0963249 94.8508261,79.7308415 C94.9087534,80.0509579 94.9680599,80.3545604 94.978404,80.6432369 C95.0111605,80.9303254 94.9987475,81.1993122 94.9918514,81.4441631 C94.9959891,81.6890141 94.9473715,81.9081415 94.9277176,82.1012276 C94.9087534,82.2946313 94.8670319,82.4578652 94.833241,82.5909295 C94.7670384,82.8573756 94.7253169,83.0025078 94.7142832,83" id="Fill-296" fill="#211908"></path>
+                    <path d="M100.50561,68.6364 C100.5066,68.6414 100.4356,68.6574 100.2986,68.6844 C100.1476,68.7114 99.9486,68.7464 99.6996,68.7914 C99.1626,68.8814 98.4126,69.0064 97.4926,69.1594 C95.6116,69.4594 93.0416,69.8684 90.2006,70.3214 C87.3576,70.7554 84.7836,71.1504 82.9016,71.4384 C81.9786,71.5724 81.2266,71.6814 80.6866,71.7594 C80.4366,71.7924 80.2356,71.8194 80.0836,71.8394 C79.9446,71.8564 79.8715897,71.8624 79.8715897,71.8574 C79.8706,71.8524 79.9426,71.8354 80.0786,71.8094 C80.2306,71.7824 80.4296,71.7464 80.6776,71.7014 C81.2156,71.6124 81.9656,71.4874 82.8856,71.3324 C84.7656,71.0334 87.3366,70.6244 90.1776,70.1724 C93.0206,69.7384 95.5936,69.3434 97.4756,69.0554 C98.3986,68.9214 99.1516,68.8124 99.6906,68.7344 C99.9416,68.7004 100.1416,68.6744 100.2936,68.6544 C100.4326,68.6374 100.50561,68.6314 100.50561,68.6364" id="Fill-306" fill="#2E353A"></path>
+                    <path d="M90.0086,79.9040466 C89.9736,79.897 90.1316,79.328 90.1516,78.389 C90.1516,78.154 90.1556,77.898 90.1216,77.624 C90.1076,77.348 90.0506,77.059 89.9956,76.755 C89.8626,76.151 89.6486,75.502 89.3286,74.863 C89.0066,74.224 88.6056,73.669 88.2076,73.195 C88.1046,73.08 88.0036,72.967 87.9046,72.857 C87.8066,72.75 87.6986,72.655 87.6016,72.557 C87.4086,72.359 87.2056,72.201 87.0276,72.049 C86.2936,71.461 85.7736,71.187 85.7896,71.159 C85.7946,71.15 85.9246,71.216 86.1566,71.345 C86.2736,71.409 86.4156,71.487 86.5706,71.595 C86.7236,71.705 86.9106,71.812 87.0926,71.966 C87.2786,72.115 87.4876,72.27 87.6866,72.467 C87.7866,72.564 87.8976,72.658 88.0006,72.766 C88.1016,72.877 88.2046,72.989 88.3116,73.105 C88.7216,73.581 89.1336,74.144 89.4626,74.795 C89.7876,75.446 90.0026,76.111 90.1306,76.727 C90.1836,77.039 90.2366,77.334 90.2446,77.614 C90.2756,77.893 90.2636,78.154 90.2576,78.392 C90.2616,78.631 90.2176,78.842 90.1996,79.031 C90.1836,79.218 90.1466,79.378 90.1146,79.507 C90.0566,79.765 90.0196,79.907 90.0086,79.9040466" id="Fill-308" fill="#FAFAFA"></path>
+                    <path d="M102.495919,79.3034 C102.495919,79.3034 102.1509,79.3184 101.5449,79.1894 C101.2439,79.1164 100.8759,79.0124 100.4799,78.8144 C100.0869,78.6164 99.6609,78.3314 99.2809,77.9204 C98.9049,77.5114 98.5699,76.9764 98.3989,76.3394 C98.3169,76.0214 98.2529,75.6854 98.2479,75.3344 C98.2249,74.9864 98.2549,74.6224 98.3329,74.2604 C98.4119,73.8994 98.5469,73.5354 98.7579,73.2044 C98.9659,72.8744 99.2599,72.5814 99.6189,72.3844 C99.9749,72.1874 100.3949,72.0734 100.8219,72.1084 C101.2479,72.1374 101.6719,72.3494 101.9489,72.6914 C102.2289,73.0264 102.3869,73.4694 102.3269,73.9034 C102.2689,74.3414 101.9709,74.7024 101.6209,74.9124 C100.9029,75.3404 100.0719,75.3354 99.3529,75.2244 C97.8849,74.9804 96.7399,74.1034 96.1429,73.1694 C95.5269,72.2314 95.3739,71.3054 95.3539,70.6934 C95.3369,70.0724 95.4359,69.7384 95.4359,69.7384 C95.4559,69.7404 95.3769,70.0774 95.4129,70.6904 C95.4489,71.2944 95.6179,72.2014 96.2309,73.1114 C96.8249,74.0154 97.9479,74.8594 99.3759,75.0884 C100.0749,75.1944 100.8799,75.1884 101.5439,74.7884 C101.8659,74.5924 102.1299,74.2674 102.1799,73.8824 C102.2319,73.4994 102.0909,73.0934 101.8339,72.7864 C101.5779,72.4744 101.2019,72.2854 100.8089,72.2564 C100.4179,72.2234 100.0249,72.3274 99.6899,72.5124 C99.0049,72.8834 98.6189,73.6004 98.4679,74.2894 C98.3909,74.6394 98.3579,74.9914 98.3789,75.3294 C98.3819,75.6704 98.4419,75.9974 98.5189,76.3064 C98.6799,76.9254 98.9979,77.4474 99.3589,77.8494 C99.7239,78.2534 100.1359,78.5374 100.5179,78.7394 C100.9029,78.9414 101.2639,79.0514 101.5589,79.1324 C102.1539,79.2774 102.4989,79.2824 102.495919,79.3034" id="Fill-310" fill="#FAFAFA"></path>
+                    <path d="M29.5017,29.5329 C31.2577,29.5219 32.6907,29.3839 32.6907,29.3839 C32.4927,30.2629 30.9007,30.5559 29.4917,30.5479 C28.0877,30.5299 26.4967,30.2069 26.3157,29.3229 C26.3157,29.3229 27.7477,29.4889 29.5017,29.5329" id="Fill-312" fill="#F0F0ED"></path>
+                    <path d="M30.3982,31.0642 C30.3982,31.0642 29.1552,31.3152 28.0032,31.0422 C28.0032,31.0422 29.1462,32.2382 30.3982,31.0642" id="Fill-314" fill="#A5644F"></path>
+                    <path d="M25.3025,28.8435 C26.2075,28.1565 29.4505,27.9815 29.4505,27.9815 C29.4505,27.9815 32.6925,28.2175 33.5815,28.9215 C34.4725,29.6215 34.2085,30.5115 34.2085,30.5115 C34.2085,30.5115 33.7575,29.4615 33.1085,29.5845 C32.7405,29.6555 29.4335,29.8725 29.4425,28.8575 C29.4335,29.8725 26.1355,29.5015 25.7625,29.5155 C25.2565,29.5345 24.6475,30.2995 24.6475,30.2995 C24.6475,30.2995 24.3995,29.5275 25.3025,28.8435" id="Fill-316" fill="#20030C"></path>
                 </g>
             </g>
         </g>
diff --git a/src/assets/imgs/ic_parent.svg b/src/assets/imgs/ic_parent.svg
new file mode 100644
index 000000000..3a65821ed
--- /dev/null
+++ b/src/assets/imgs/ic_parent.svg
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="124px" height="126px" viewBox="0 0 124 126" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>85AFEEE7-4023-42FB-9D7E-41CE53BFBD8E</title>
+    <defs>
+        <rect id="path-1" x="0" y="0" width="124" height="126"></rect>
+        <polygon id="path-3" points="0 0 28.1443299 0 28.1443299 11.9072165 0 11.9072165"></polygon>
+        <path d="M37.9817481,58.5003904 L37.9817481,62.6255202 C39.5218943,67.4221514 43.5864714,70.2050261 50.1754794,70.9741442 C51.5023455,70.3194013 52.376777,69.8270611 52.7987738,69.4971238 C54.6128209,68.0788148 55.156642,66.9844491 55.2505082,66.6111377 C54.8883904,65.7022215 54.5768677,65.3662163 54.3159402,65.603122 C53.630186,66.2257438 50.1675108,66.9895879 50.1675108,66.9895879 C46.6829839,65.6862224 44.9407204,65.0345396 44.9407204,65.0345396 C44.0360113,62.9822195 43.5836567,61.9560595 43.5836567,61.9560595 C41.141993,61.9774191 39.9211611,61.988099 39.9211611,61.988099 L39.274861,58.6799599 L37.9817481,58.5003904 Z" id="path-5"></path>
+        <pattern id="pattern-6" patternUnits="objectBoundingBox" y="-19.2203823%" height="119.220382%" width="100%">
+            <use xlink:href="#image-7" transform="scale(0.0669331786,0.0669331786)"></use>
+        </pattern>
+        <image id="image-7" width="258" height="258" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQIAAAECCAYAAAAVT9lQAAAABGdBTUEAALGOfPtRkwAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAABAqADAAQAAAABAAABAgAAAADJFtnuAABAAElEQVR4Ae2d7a8udXX+D6CGRANRS4SEBhGLUGIEqQ8YRIREKgqh8qBBnrSkJQWLxRiDEkoiT4opiFohEE2giKGANAXB4F/Ql/0j+ub3ti/6pt2/ue57f2Y+s/Z37nNAPGefs78nmXOtda1rrZlZ85257z33POzb2tral2n4l/8Gs20Tv+uuu/aro6Zr7a/2xz72sVndmsv8l3jq13jLN4ddkfm5bjTve9/7tk488cTVsib23e9+d1zup5566j+jyXTNNdcMsLaD1Am2pre97W0jbz02OdSMf8UVV4zzju+Y9cSOPvroUe+6tskjB0QDwoPh//Ef/3GArX2nn376uC7Eg9jRxP7Nb37zl3/6p3868mjQgamLTS5Y+epHVyc0xmo//fTT/3HWWWcNqVN+NB/+8IdXHPrEsY2xmajxoQ99aJX7T//0TyuE34TUMKIPFzv42c9+dsf8iH3+85/f+od/+IdVHI7cV1999fgV50CCTPBBbJLhjOSB5KAhFwz/d3/3d+PCoXd+5RzD/vu///tBNi0jOaDnF/snP/lJc55VT+OYz2OPPfZ/aILYxCvneOzrr79+7K2XiTyQGHXxHXeMONxf/MVfjOuXnSx5v/vd744lbkwM/3vf+96YB3fZZZeNy2xtbE/o0RxI7I3kRJuaP/vZz8ZlZF7EQPiKxI2x7ZMDX5F4kMmab33rW2O/XBeb/Pi33XbbSnvDDTdsHXPMMWNeNPfff//oR/v2t799oEPNlzd+5W+66aYVBx+0TQ1yiQ3+zmKIW0WUuPWZz3xmcNcz8gB0Tevh4S6//PIxH87zxn7ve9+7agyaoG3XhYejRs1p6aqGXNeyBp5afOLCk9/KqZqW73xsI/M198///M+zQeR5Y1dMfjjXgTvvvPPG3pNXdWiJUwu0Ptyzzz77Lz/96U9nddG4BvnmLr300sFdLys882+huXwDwXcNONB1w8GDS7mOo4EDXRtNMB800Vi35Ie/+OKLRy06vq0wj5tvvnmlIe75oUlsmx+NVdKBbiAKHXfccVv5tPvkJz85LthDDz002ui8MOa2F2LHAlujhd2hq3XxN+V84AMfGJcvuj/7sz8bZhdq2hC2X3rppQuIg8SD5rDvuOOOcVnDwW9C61zf83B+S+84eeZiP/fcc/eYy86F9s///M9ny81Xd5bHeebCZ7r77ru3brzxxlkNaluPTYx8eM/HtvVozdU6jmGfeuqps+WjvuuhNcY+44wzBnnS19ud+cGFb03EjdWOz+QacOhb80ZT81q+64zxSuJTGJ8E/KU4uuAmLX9PoiEP/xe/+MX/qxw10dgPVyfy0bV8cojV2vfdd99ArTc8dfJngzn4cHVKzF/NHWeeIDUrUh/dj370o0GynhcxDuBoahwerPOwHk3FmpM4nG1z1IAz+u9a5zsneiZrzL344ot/RV1yjWiNxOGojR+EM8ZmQuNvGsRANNSFB2s8/re//e3VPGpO1aYG3Pe///0xx3xs/qSq88RfIYXAkLE9mYv9ne98Z6VZFRh84mByscFWvcSYnIOWGDXwrXUs/I9//ONxearum9/85hi78847m/NOvXe/+93NGMsFsjxG5lmXyzx6c9R8xzveMZv3KaecMvquuT+b2hWT1/+km8Z4+tH/pBuG2AMPPLD1pS99aRgv7Z0/jWJCYz/2Jj7x3/72t39iHfrgEm8NumjrRAykHkgd8nJSDC2xFqInhh886aSTxuVwLWtiO9aq8/zzz/9teH8dr3n4rrXEhXeMeVZEU/X4xMlr8XDR/Ou//uu3gvmAINfxFkdtzmnEr7rqP/roo2P9nNFPfGmiPvHqU5v54qPnQ+O6664b52nNN77xjSE1oannjhMLekIPtmLh8vc+moqJm7NPPeK///3vjyLuGNyxxx67nk8riMhoHTMBrQuHFn5/Ouf0v1/736+MF7A1jjzGbHss1Z/pOHigR+v5LM3LvyKR/853vnMwpx2deuZih//4xz8+atEFmdC9//3vH3VwwWrjn3DCCWMN6rb0zAfk1zP8HTMYA9s7ND4z/vWvf/04M4LDR1ux6vJbvLno48PZhwMd83wS3/S3VeLUuOCCC3Y0j7rURGufGkFOjhLfH1KPGtHDkWvfuiVt1VhHjJqg51U1iX3xi18ce9OKw1GnIvEljD6xhx9+eDWf2HCtWo5VbXxzsfNJ3uJr7ZbvWsThvBycbIbLryDoja3cFkcdcq1xLDwxsOagqb+0tXSF23lU8kyO1LOkXkeaTRMrOt4/ZdY7cu1ferTjU2Z7p6ef7mPsOlEzeO21147xJ5988r+jfeWVV06iRs2tvGuhZTmWEB1IjXxKh8tFRnDUCA9HHhyaTXFyrCGPmHEpBh/84Ac/uFre1p+ciace+PLLL79/u/60QRJk2g6uEg723ytehtgsC0g8V/hhEwuaq3bVHX98Lqya1vv1118/mhpg4jXvlltuWeX524XrYJNX/Vp7Ke782P0b2Xpb9W9k037LGPGYYjxVRFO/kQ38tOO80a8TmUnyXcM2CwFnLTYxahnJB1s5xCr+/Oc/H6jpq5Rzv/zlL69icNGdfPLJo95/p7F8RvKMS/MKTy42/lI+OmoanYNd9eadi00cbOVXrl8FOn1YuI/0yb10HB603hfhHeqrQIflmx9ZvKCOwVeMBm6TPrHzzz9/PGhw0ZHzqXPaaafNaoYnho3PPCtP3Dx2cnw5aPirrrpqtWx1eahjHpuY6xLLz5Ob4ujIBcMTq3bVEDeiCZq3vb8YNVo5xGoN/KX4gdbq15fs3G7ubfqIX+0/6PqSpaLMhLgxtqe6kR2rdv+kXm/I2pf47iP9B4kbY/dP6vlYdH/cz/BM5rHJi7+bPqm9XNh1PSqPn3WpNhcXhXds3xH1E8j2inslbbPRQRoR7Cendh6IGEj0ib6ZT+xNnpwaUtfzbOGvfvWrF5lf4mjCHXXUUUlcTY5Z42VEaw4t+cFc04Dvy87hXAebWBDOuL842r/5m79prhPx4KZ5OG6dbWrBgdv8egYhPSXIBqZARQrVvBbf0liX2ps0zBsNevjqowtaY10rVrX//u//fro51yU/yPX6aK3johli3NVnTWLx0VSfGPjggw/OBk5Lj5aa+EGmVgwu+LnPfW6QrpcLdDx2eE/h3vWud43LZ/2VV1650pNntP3MM8+8lprhzNtfiptH32+f33z7/D6f9XbD3UzbaMIx9TO48/MsDD76s4T0sp7BjZ4aINwmdCx2/019PUb7SfB1H/ZzEnw+iDOAGFAMwmDlrbGN1pg/P+zbdt1NdRKrDy9JHU/Uch0462w7bjua6jvPdnT282cGucSMrRuEkm8N9eDisyGtjd36dlDzUyfTD3/4w1nP0Lnmvffeu5Xbj8lxLJxzlmLO/chHPrKqFS2XI1MDHXVB4mDVhUfbwlw2X3Nbfn6OhQ/moEy9+LHtw5FTb0BDC1pPrVaMetZXe5N/9dVXD2U3L6vngZ2cL3zhC+tEFsxYixJjYfCXdObReua1TvX7jSDtbUMP6Ve/t399YGKMBQ/1vf0e+2wnthu3aKMJ5s9P/OjOOeec8SBGnutYS9xcbPiK1pUPhemoF1F/FNfURBpK8/hpqz+Kq/1NbFc/imvYwepOwQ05bN/EsYP4YL01vmrQgTVO7R/84AeDOR9n+MbY+KnJBOf4448//r/EQevCWY9/++23r/jB37fFV9WWEM7YH0aybmp6R0OD/WEk835kzNQe2WdMmYttnhrmrIdHV2PU6w8jmbaFe4Q9YHvj0VgaHR32v/3bv33cfuyzzz57tlMQD9qmRhAeDj+YKRf9tHRw6MjLs93MwcPV+bgOsRbnOo5Tl7hrcLYdPTFrl/LzTIKW3lwedoofpC41eahqzt5XXc7IW//pT396pSG36uGdEw3+mWeeOeY7Fw35xOL7b3jqGPPLCnrqgOjswwWZHI9dJ3KsI7eF6FzHOq4ODPfVr35161Of+lRzWZxjm/pw9Vbn8HXeNYdceGNsfgnMPTNFu7NxSWBCHDzMV3RYpWm9YnvdYhPHrnH86GgkdYKt5y6QQ0308PaXbHKdE60nYmgdoy6DwFrb6JxLPdAxbMewwSVN4tZgw1efOkFrrGvFqrb/HLz4c/C+rUceeaS5UWisN0K1aXT9hHKuNxY3zYS75JJLBtk0oNFVDr5i1cVHw8lGNPDW8De/NdExmed+cmItdO3EL7zwwrGv6F0zHL6xahODA+G4IQzfcWqai43WcdstPXFf+GId8SDzwLaOGNwSkhvM7eVBONfg5q/E8riuqnP9jDf7/DICRy5Yf1pnvomTA8eDQ+HrMifn1ltvHWA+3tFTB595oK+8fbS1Rssnj9hYH8OIyFjtPffcdx0g0otM/WTT1j6dbJrtZB6c9AskBsKD4f2cR/g8qjt24p7ggv6zavWz2Pa2okbybD/xxBP/gx90fC+dOxsb6ibwmKY0pT/bbz3ofP25e+WBAw/XH9c+7XT0Jlgn+nUgfL1KM7nkY1dcmnd0/XHt29vDTfOGMN+y+81D60+PVm/cRw9CtC2u3zw0/5RPr9yn2PjuIzxIXnwfvDm/1fqmQV1q7MmXvdA4N9dcbRIxP8IZroXh4Gk0vmPmrLPGywJf8+L3C0rmn8T0k/7Rs3JByWpHu+iii4bwlB/bE7Xgak186+BqTtVUP3pyQXOx+y9Y7W9Y9Dp4QL9gOcE2GwVMLPYeeWzTsLo7B2HWP3y/M246UNTxgQ8u9ZFeogOrPnx/jsX0bYi+pU+eav/QgfQVXQPXg9sBz8AF+oMt571yb7CPxAdbsm51UIX3RJyx5DxicEbXgHeNGrff/0Rdj0n3BJseguFjOw43bkgEQb+BhiQSDujNqkON1PHUz7D3M+weS/3q1PUOyT7C/nWork4dlmN+hHgLrlmeHQBYQVbYSAx0jOVqndzpPyPNvyq6b+5lbPv01Ho4vsmg94M50JAXTX8f5PRBR89A+hU/0+HwPshhmduDipUC0bGS1WelK6IP3x8FPj/ouof9UeDzHcvjyH3yeIKP1rZ9+CA1zZlPnKsv3+CjwFe1qVXxMDmntG4QzUkzvCIHalvnhlMv8ZamPzRi/anBswboV0X6Z3SfK0+vqYNfdcSN1AWdg1315skzEgdb+ZXrP6nOz8G4P/QxGJ7JPDZ58Rd/Ul0qAO8isbmklZkYrQ1vP7Z9zhmgIwbyTjbnEavzDN/fcTAdwFt9omfEgpn6W6emvtEjxiQ+vbKPjbZq4EHHY4dnIgbCH9ST816oJTsLRgzsTx2a94TLUdmI9KmiexmbbwKV708dmu+g6aPvWIxPb+kdfn/q0PqpQ3lXh3tDf0DHBns+oOP3G4PagywNZEqf6F3lHIvNtyhvgKVcNMaWXecRDVO/MWi+/ej14X5jEOOA9dmExPKwWOwgNmMFHI+qngliMLH+vMD3D21IH9OyNcbun9zznqQ3/ZN72uEyRpam9Co3Rr2RT27GHsh4jM9kLnZeV289cXA7tnOhnVRt/Iop+pnPfGag1wvkkxLM0Bgbn1r9Jp3pAENv6JORfplb0vebdOYHKvepXyY/6820Qy4NLA88dnSjm1trOOY/OVyTp+lQMzlcQx47Z4/Rg8zHfmwmz9d2ftMl10ie6zkP+5e//OV/oSGHOi2fvGB/7sPOr+z0h5725z6se3Sw/7wbdxw2BBsmmGkXP3V1tXz9Jplp5/I27I95mz7tOEDTn/oQnTrm+WDaS495mx0I3DDbHBQq0ljQDW3l5/ZOtI5Xm/nA4wdPOumk8RPdtayJ7VirzvPPP/+34VsXjrTy98cxf+a1hK6DHS355pZ4tInznoD8HUiu4y2OZePPBuYD1vz4jz766Fj/rLPOGrcBWiP14aofvnLx0fM8jOuuu26cJznB+iw/clvIfIgxD+oRh4/PyV04Y61jv9Y6nH4i3/GmIzeoNqCfdZ3+jGKjg/TKA6NyS1rz9edE10OX+z2o3UJ0xKqfx2nXGPNBC0bXipHvOJxz8wKQyjuek2W5nNl1PL+ai65q/AwB6qNxDfLh8NGSa94ceebIJQfNCy+8cB22NX7hyyuvvHKSY7HTj6997WuDmbas+89j2KgHHw0TMfv1gw5NA6cNTZAFiI8Nts6SE0NvHw5MzHFsMLpM3ENNHryRWmBi/Z176/7Rp9pX+KD7Bl/1VUO8IvmuG01/T8Z6Z6YvYHrDMzN3w3syhuWaDxz8LCgbGy4IV+PwaB0nBmdEb6x6Ys6zTRxs5VeuX746fZLQy/SPPrmXjsOD1vuXov5EoHkv6RNY+1d54iDxIBOxYM4J2Ucfrupvu+22lfaGG27YOuaYY9Z5EfXHcK+P2jSPxlW/NtrxGsOvteCDS/nWYPfHcC8+hnvcAdxretu/Ic4/6OkL40rYT8C5ObH7CbidByl6FPSkgbTaIVuxcHvxBFzWO/2hJ+5VOB7F7semozWSB4dfay/F0Scem5/xi359xIAEST6oNz7s51OSFdmEjsXurwZf77j9Ls91HzgZ63GSsY7PuDcm1orD1Tg8NRwnBmdEb6x6Ys6zTRxs5Vdu+8/k9YGAExeIaqH6AkjHnRN7aSIn6Bz75KK1LvZ99903wPrIRl59NTV8dHVKzA87cZx5gsynIvXR/ehHPxok02CJ3boJqVWHGjXmemgq1pzE4Wybowac0U+mcr5zomeyxtyLL774V9Ql14jWSByO2vhBOGNsJjS+YpAYiIa68GCNx8/LShKvOVWLJpiz/PbRhvvZz342LrM1sZmYVy5gqxpi8K5t27XQmqPOds40c0ROcuGWbY58OGMfZNNOmr4w7YVB5nHAGKmIhq+tHoOxuciHvoXrV59O44j+pS/1giliFd3rIW99IKDBxlYMDqQ4fwPiO05Nc7HROm67pSd+sC/BzHzra6y8Dvy9Fx2/+cZmHYz91VvzDx+2KUiv6N8SRpfYAd9hp7HOPEDPA5v6IDx/XlTe/mF3rUdWjhW07ZWKvWkiH8211147UNPRilpg62szMWO16wZIPFPr2gZiLBvL03qWf9Xee++9W7wXz/nR4ZNjzrHY+L6AhBOR5KNDCxIHq641X3KD/Q7A6QOOHrYwvdpFdwAOi7P+8Ah68vZmPVpaYlVvrWPhf/zjH+/8xKozJ4lPfM8Im5m0fOoRO5wuu2S96jpkXcLxLWA3nPVtLSM9Z3nBaPuTiaYdrtUn94p4+obteItvxVu6cEzUPiQn6FmIpYVkhU499dR0YTWRg2+kDpjYGWecMbhT42MzObfazknMOdhG57d4c7ZrXsuP3nzsyrlmtdGH7w9xnW9L97U/xHX69t0aQ+4Vcbj4tu3DB2vedmyaMeII+9el1delWdPSl/SIm2Li95fErg/qvqowPaJXoMcWXH/+xLTjumf0CqRf+GCL50Yya9AFW9O2dtpoIUiy7WR4OPxgpn7763rj0h8wvalnc2vvODO+l25/TX/SByb79M5Iz6wjt4Xoag20XAod/6tf/erWpz71qeayoK9Iffh6Z2T4Ou+aQy68MTaPWM83yZY2GibioPnY8A2cNgJBkp2I3cJ+YmrdQ3pDHysm3r9p9W9aGQeMlYoZM4foSV/zbwFZEC9c7H6mfd0T+pLfX72TP/zww2PP6B9adPbrBVDEQGqA4VsxaqPDt7bG7F999dWDdF7bcepVTE4/oB1ZB7R9n/zkJ1dfN7JxH3roodGuAwQ/uDRYqmaTjsFFDv6mnP5arufucf8vvfTScXv5vvNo8pW31VPy6TP9Pxxey9VPWK/3vdZ2hWN7ttDbvJ6wnn3S9AdWzBtNM91A247XDYHOPPZh9sCK1QHlK1/5yuKBhT5UZH158MhHP/rRsQZa+oQfJA9sceQtaahHHMwBk5jrPvDAA1v5E9cx4iA10NiPvYlPvHWXr3OwNyHzrJiccKBt1yOvPi1sdSCwENuFSIbLxTbY1ltX49HBtXTPPvvsv3ChUa2JD1IHP5+Msc1jt9Ccr0t3DWuYD/HEWvHKWUcNc+gdYx7Bxx577P+sJ+Y84sGLL754tlzheKoU87j55ptXGvKoSXzJj55Y7P4sy2m81V5Wn74Zq83l0uGJnX322Tu2JzFvD3KItXyWaelk/nggoLCLheuPgFpv8NoffxWnyZuwf6JOJ6UZqPTLYw6bfht38ycq61TR6+h1C7/Lnr+5PtJ7IVmZLGw+ZYgZ0cCxwezThNxwhB7Ovm3irrcUj+bcc88dwu2d1bWoB7qm84mTS6yFcDWHXHjriIUzv2RTw9hfN7ces/SEb5LuLTFjtfsl6xqDGYD9ctOdX/PqoNm046KtGnjQ8djhmYiB8IfkctNhueryZXngNqFjsfvzINY7265/HgQbjoEX31Pl4/evxTqSDv3Y6yeaPF5st8YO3C77Wjws9uYDs9cLLZh1Is76mbPOPNrEuRntkD2W3gvplal2FrqfL5gGi/vTD4z9wMh+xLhooXd89HC74MA4feVjoYJv9prluoKpFa7/0tB/aei/NKw/SLyP2GZfWUK0wUxv5S8Nq4IUzgKccMIJ49+tLJDjthNn6neNTb2gRyA9AisffykGH6x5xOCDXJdev6WgoU7w5Zdffr9rOBY9/q9+9asXrSMW7qijjhrHQGseS3nUrjn4+SDCznUIsZ1DXSN6tI45dymO3g+9oSYxcKkGfEXmTz7Y0p1//vmrnibGRX7OJ+e0004bzHVfiOMHmZiXNdat4ogJOMn2XmyOe4OdnvgZ8uGvuuqq2c4QjfX49NMx2+hyR2N4fGx8kFwwPLFqVw1xI5qgedv7i1GjlUOs1sBfih9orf7czZ3bzb1NH/GrveOoUYX9YaHzT/rawNqvGo9vDn2wP8dxGpjpB1N/juN8zPjZgoyfjCnuVqVv4fhzIfYbeYv4oN+31W+CmRpPU2k4fvqUM7rw8TPhB20Tg6+xpXx0NU69Jdx+3NSQvnM5+vMT1tvqEN3V19wmbKfg0rYmhrbqzKPdpEnMOUcfffRqDG/nTEFEteiBFnd+qwYcOhYMDN9fRTZ9Mrb65G3hODyYGLYfGsL9936kO7qg8/wrEZrLLrtsHDzWxvaEHs2BxN5IDsvKo8Gpv1QDvdE2y9nKh2shecwfH63/jAznODlom68i2865//77x75H//a3v31HLerUedx0000rLXzQ9iqvkggouoToyMdHz4CLv5cf+JC+8EAJehRsXS5L74LRoIe3v2ST6xxqgcTQwoPhOelore1o45Njv/ItzSa982MzUYc4fPXRMY+WrhWzLvaees1cbcjzzz//t+FaZ53d8GjINdp2Y9EvoWtjU4s6zoVraaM75BdoaACzrCz/kr+0Luj5in/dddetdg76A9an48C3MBwT9UF48liu/gDb9cHPfTpSHmA77sxeOQ8E2wyIcPV+5rPOOmscnAwg0HnMx1zOUcAzv1xPj00d+9jJ+/jHPz64Ow9Mrhmba8urNn7i8Pj9p9T5eZD0L316+umn/4Me0TP6F/REHHSMHGrho1nKQee8mpMY32paH2rkgnv+p9RnnnnmNZpBg2kq/lLcPDl33XXXaiA4Zts1Wzx1auxjH/vYrG6NL+XBe76Vq75rY1ds5UST+zZOPPHEcWfwmd2nnnrqP6PJdM011www/1SO77q287xDfHTkwwfNXXHFFTt6Ri45+EFOHrkGNdEbnWsbjbnY/Lx3+umnj+tS60dHXm4R5wErcK3aqUsddGDlqx9dndAYq52DYT78nBsNt32jTxzbGJuJGh/60IdW9eqHLPEWUsOILlzsoH+hIk5s9TIWHNAFKeTEz31u/Xpq9MSsdQ3iwXe84x0DTBsaG0xef8Dn1B/6mP5gB+3TOyMa65xfbXS1Brp+vmf6ZnQEn++ZjkxseAZEfAbJ/o4ofL1HT+6rr756vDnmEeRlJ4mjwbZPrfoi1qpBB9Y4tfMkJmL701oXLXqQ+OOPP/6/xEFiRmzyb7/99oGa7+jEqFMRPdiKt34VyNljaieXCS7og3WeS9iqDZf8J5544n/wg+HwuT3Y80EDZzzuuOO2rr/++q3++Lz5OLvjjjvG7UC/6OMSWsf2ABPbkdciKQImyT+DhO9X000by31qNfvNxKlTN1itxdft8K2cevBEU+vgt5CcYOItnzxi1sXuF6atx4t7WHtUe+f4Uiwaf0i7vnOiY7Jm5GLUBPtOeuSRRyIeUnZ+gpsnbqRm/eofDblGX02Vl4bWWvap4Xy4ls6x1t/F5FDPOxu5iTFZz4lLYi2kBnjhhReOfUXvmuHwjVWbGBwIxxl/fMepaS42Wsdtt/TEfUm6dcSDzAPbOmJwS0husL+kdtr+9IW+xTdne1vT76enSRWXmhh+F9w2OizutHFjs7xBYkuIhhx0+MQ38Wij6T/Xzg+c9A+kj0H6BrZi4Th4ozPWOvaph54/weM7Rs6xxx47fV2oAkQUwwfhW4gm2I/S04anL/Qsvjnb0VSfPGKJMxEjZwnJ7a8Sn/pLD+lZ7aV9NJwTo5+1Rs6v8PRmcio6t2WH89WddR6Jk2c073lWm3orfb+kd9qZ3BiaVptaecex+yW964MfvQLTH2yQnuGD8BWJB5ms8bms8Oix7R/SS3q1E7NMIMvKeoVfiqFp5RBzPnXggn/91389fVpRCIHPHtcYxerf++hYAH5D7+/ym47c9BekZ/SU3i0hOvLx0fef+qZeH8E/9Q2bfX4gZByYt13HWdUP8emoSZBB1YqhMVa7P7ByvZF2/QMrtz+V2M7ZjkvTz3/+8yE0/2RinHz5y19exfCjO/nkk0e9r+hkXkbyjEvzCk8uNv5SPjpqGp2DXfXmnYtNHGzlV24XfhNfXzJ6JF0lxd9vND8bKHa/pmF+0K/96dc0TAfCvXZNw+wTgCMayEAB4Vu4p+7U0rcoesEVl/GX+hXeU7T5s4kaxpzMo05Fz6NfIt7+85Ze1t7hE6eX4TPt1UvEVytfm4L/6KOPrgZpGsRNRcQq0kj46oevXHz0/c669d+29INe5b4FbGJBc9WuuuOPz8Wd00Ho9ddfP5oaYOI170i5s451owesJ77jNYYfjG7T05OoF+0FF1yw2nfIX5oHcepTI8gVltZssj0P286B9/y24+sVtBg7SU5c4q2xHT0+2N/SM+8Jl+G6t62+mYvN392Vf/DBB8cBSM+jsS58pv66+/W2oE97/HX3/RxBdhIuumAnYcepPny9dJfBBKID4Y2x+30P0zcV9yZ98y9X/b6H6RsjfUqPmMJ94AMfmB3w/fRnxqH1L7300gWqtW+r/52Z/s2bqgYN5jpesZUTzV79O7PVH3OxuVy734o8jbeMo/Qm06G6FXk1cz+4IQvDPeAM9HAsrDkW/u677x5fk20deeZa+ebQkmvEtj4cE3yrxqmnnro6WtaYc4gZY59xxhnDLKYeMD+4WgOfuLHa8ZnIC8IF4c3ZJk5ey3cd4pVzzWpTO3y9X57zR+Sg9XwSwycejl94zPWH0qy3/7XXXjuO2SeffPK/06NXXnnlJHoVrJP7jA2SF79OK8LFSAr2Bz7MG03zaGjQd34Rp4d54AMDHY7c/lPmerDTj9qf/lPmtLMepJ8y54M9G8ZT/1lw/SAWBqx7g+0DAAO6/yw4H0f0hZ4Z6V/lqu8a2BVbOdH0P9emb2TuWeztD/z1BqvBNLRy8c3VppNjHRry0Cxhfz7/uu/0q2L61p/PP+8Rt5J7TGHTP3xj7Jb/ZvjD/V2h+/ybct5xl8bRPNDNggNpmtGxaseHMy7xBzJv10EPV/2LL754CK2PjsbYTKxL9eHz50CN2bdNjpdjKR7NueeeO4TnR2/7tV6ti9/SOUZNI7Z1rgNvHfFw5pdsahj7T8pp3TQmD8VPyrONx8bJQi1N/Zrz9UZr9YedAvTGte0+78JrzsdPSc5vsD6PPfbY/3k9sInHN1ftPIYMrXtAHkhsSWse2/Pqd39OB5XaS/oE0r9xw9WNEJ/3qDl29tlnjwOFIi6KTc4mn/zcOtrSwaELhstbXszBw0VDrm10SxxxIzVBckEuLY5PXstu5ft3cudSO1y/w3Palu4hNn3Dp3dGNGwXtEuIrtZAf4Te4bneuVjprOxheHnksPjrHZGNxfq0+GhqvKWrmuR98YtfHA9CrTgcy1GR+BKybA8//PBqPtHBtWo5VrXMA038fmfo+sDS7wxd90FXqK53CgYL6EEUDh5sDTrrar71jpnPV89aY8kPn7/3g9SIzXPlmcfNN9+80rgOOWhaPhx5N9544zgv8vKLCnZ055xzzmxe5EYT21rHHIev6NzWpcEXXXTRqj556MHKx2/FrLMmWvyqqX7Vej7Y/dvm/FcVekt/ggfz2+Yw//UC5W/VzJwFgq++F7QVC5cLjJyPXXPN2/7lL3/5X14W7GioYT18sD9gdedXafpDH/sDVtc96g9YnY2V+ad93cGuvvrqHTsfAwttCzPocn14HlCB3jsxg/KNxMhxnf6q8tnGnB2A6Rc9Bs2Hg7cdTc5hmDvllFNGv5VjrW3mVzGa/lPo/MPtkP0U+p73vGfHQGAj33PPPcO2S3g+WOCCedNxjcevj+iOlryqN48NRov92muv5YWIqzpwrVrEjNjU6z+brvuavjC5l+4XfP/ZdNoX6Emrd45hB+kpuMt+Nl3v5F5g2yw06BWyzZ1PcM8+++y/uA52q06Lo04rz7Hkkg/WHDT9BNG6V5wgol8V6Z+RHpqL7Vxs8+idjw7OiN5Y9cScZ5s42Mqv3F7/GXfo1Xpj0hia15/bPx3905v+3P75Ts+4AdMjJsYQCB80d1Cf21/GuZfFyxR+Lz4MZrXx0og0YKk5xCsu5dDYIG8xJpd5gPCgebjg17/+9fFPkPjE8pvuMcccM6RNy+8a2OAnPvGJsU7/s2hrX7+adBo3jCnGCuMsuAf+LJoOArUB+EEmmuUmEQOJ9d/c172lH+lPtfufVDt74h7RMyPjDEQfhFvCfmVsu0c7dvA0kIaCNNV+bKYah0ePj455wFvXilkXu98R2e+I9DixnfHBt1B4sI6jJT66xGq85ZvDruj5Jsa0m+6IHJZxvdIVvTKx+wUg04GPDcsGBQ/mBSDePixPf6HMNJYZz2wb0Dx924Tus2uQc6Rcbjwe9VhJVpwVxTdW+7nnnrvH3KWXXrr6thCuP/1oOoC4R/S3P/1o+gaa/vSnH60PZowVxknwJz/5yfgtHD46pnC20YCJoWk8/WidjBhhy+8XF23+uuhGu4/h+3MW5oO09ir96hcXzXt0kC8ummaejcMGqgeCfsff+miavvSv4Osxwxhh3BgTw0e3CaN1Dj45R8pX8KWemK/rTg/ozx/jnY47dnwvxJLNArGArISRGFrHqPvBD35wx1edmlfz8cFal9rw6MDKo0/cGmz46lOn5lvXirle7H7is5/49DixnfFxsE58DvOadoDYLEjwzDPPnPnhmMgjJ3zsL33pS7OdGx687LLLBnNeh1itFR8Ou/quhY3GdZ1fbXTk46Prn0bTdvhjfBq537bZjmwHbx9sYmjhwfD9A+eAPnCmr3A0D3RzscElTeLWYMNXnzpBa6xrxaq2f7L2T1aPE9sZKwfrkzXz9byxK3r8khM8hD8prndcLxhNC8dCYqMLD4ddY/1qwH6TFGOCsVLRY8djrT9bctq/9tcz9xjbvYSjTu35Kh6yv6BiOhj+kX+i+aO9oGLThs+Gzo1Gwaeffvo/GAjOgVsNikEXJA465ji8ayzltPKcTx5f5/3zc81lfi+//PL7XQNdxVxObR354Y466qjVOpNDDFzKsx5tkClPN8b2K8jgqGskFjSPvb84Oj9vgRxi4DiPu+66a9zoO4KNAYEmOBYpdmJ8q0ADOr/WaMVqXss3h13RtRNjOoRfxca+s6xXXHHFyNEbYiw/fpCfl2LDk4feiMZ6OOcR768nm49xekl/DtXryf4YL84Z1m1+9GdAsLIMFJA4efjEjbE9tXIct92vCV8PQvcE232k/2A02GC4vX6bLb0z0p8gU43Dg4ljH0lPS16tFCv329/+9k+ykm4G9hJPHKRJFROnBjFzNf973/veQE05xCu6Fnq4fiv1NGjTm34r9fQJz1gxxmZiDIHw6MPHPlJupR7WZzoaYteVZaXNL2mj6Y+4mgZc7V364z5im4erPbam1uXPBHjnuh42aB22seqItfjD/W0/WSdPWVf7uXQ+vnnsFpr7zW9+85f4rgEHMr/4TNbbJse6mm+9Y+ZXDw0Owd+CFlKcmZHYH3y5Hiw+EUOv6B9Ye2cdMbglpO/Bb3/72wO0DyS33HLLGPv+978/2q26l1xyyTjIEj/vvPNWerTMA6yPt4+OGDlwPEUavi5z8m699dYxPz5a0Bx2EDs62/jmbBOnfsVoPRGnxhJS98orr1z1Ex28a9YY8wCJk7OJ5wlTno/1qZHzCHAtrPNpNsCJXsDwFIBHi2+sdr85qb+anfECMkbsh2tN0cD3m5OmXtA78E398pXGUiCIDzpWbTTBeuR3rf5ptf9Ps9pb/PTWk3n32NvCmiPh04r1Z71+8IMfjJ92xLz+LY5eEaMWfPWp59e+kQsmJ0/qzs+CrkMuSAzf+XA5J2adNeGJGc1Tx3nYIHpqOGfg1jv/q6++ejwBJ8T+/e9/fxTF0LR8av3iF7/4f9RAR8w8nGuaywYnZh4b9DzCMZHr+OOPP/6/xEHrwlmPf/vtt694ckBy8Y3EQMdih//d7353bOVvuummccNHw0RO0K9Ly2CsNZIDF/uJJ574H/yg47x0M5x5/IrHHXfcVt5j+MlPfnJczoceemi00TM//GCd95Jmk67m4G/K4UlQLIN/06950bz00ksXoAWX5kP8jjvuWPWAevCbMDHirk+Nii09+cZqH8C38fbRhkJ14bxgLTt55BqXeNew3vOtvGuRj6ZfkTbf2ehLq2fuMXbVLfHUpf/o7KPZZY/tHndWlpXlrOtefa+jbfLhcq8/ucSMHHjROxYOv9r13AD5Dz744LhOznV++Eytt2Rt19k5Y5JAF2Tmxuji//rXv34cGwzPbbuuxxOPEu9vWVr3L72oLz2ljxXd65z8o7fWVS71HcevOmv4NQKNc7D7yeb5hx/9S3/oEUgfd9vJ5mH5poVlIeFYeNDx1soSd6w/wHTa+egj/aVPfG0l3t8JsR6T9IM+GWN7oqfOcdx2v1htPSbdk6FvU9NpIojQmn5L7nTg7LfkTjujxww26HFkm3FlLjY8+fjoqsa6Vox8sN+p2rxTdX50oFkgjQXhW9gb3Gzw6ush/UofPYV/17veNdOgzRl/+l4xGrhnnnnmNWzz1ElsKW4efb//5H1beckJ/fCftk899dR/0s9rrrlmMKft2eo9NYL5sw+fvpMPHzR3sO4/2df/1ty5k7AhQDYSfhAOhOOSU3zHyTcXG63jtlt64rvtb83+U/HO8cT287Y2h802Bc07N3H72H/QT8XMFExRT56pbWYert/QMn0quI/0i34Sq7zj2EfSDS1e39g/+9nPVmOMfrDO6Myba+nggi2t49jWxcYn/q1vfau5DzAP62+77baV9oYbbli9cYsa0dx///2zOnnup3M32fkJOXE01WY+dZnQw6Nzfo2tNDWRBGP/3XgaZG7iYf678bgz5rwPA8brtzQ27r777q0bb7xxzEEHugZ1PZ7MoSXXiG19q06rxqmn9qs46Ru4qZ+DZj7I7ZNorDY/A4YndvbZZ4+DrLUQ6MjZ5JOfo3RLB4eO5e9PXc4mWH+742/cnItIv5gSz/kFehb89Kc/vdKQizYIB8IZ+3Mu1z0/7E6qs6G9ccO90ZsWap1+Geh8x3F/Wra5ui3iJ24e+4UXXrgO25qPfOQjY84rr7xykmOxc2Xd1772tVETjpuVqBcM74kYXPz6FCE0S/iVr3wlKzNOqRWfmi1Ez+W8H/3oR2f5SzXIA9Hhg+ZtJx6/cuGz3sQcf+CBB1YP8XWMOOj5msMOYrMMxrf8kQHMDGRm9s0t8dGg6/e9rwcP/aiYHjLRNxDefY7NSUh0RmvD249tn8vF0REDjz322HE7woF1nuH34ivEOcGe9ac3tt0n7KrLk7HM1e1hv+ocoz5c7vnBJs8+3I47ShPwRFKw2vgUM7oGvGvUuP1+gcd653VPsOkhGD6245XrJ2/nY9r9oY/uIXHHiMPtgZO30w7fP3XWOxkbPwOEn8N8BA1fJ+fUgYWWwdWKOz/2kfipw3qD9IN1x6dfQW5ssmaTTW1qUNM5aIhVv2pdixg5xOyjcX10xHbhFbfT32oseL8jbjo41g3IBmeD0jP8qq9x67i0mJr9jrj+8lzGh5HxASb2lr8818Vj49vOjOH3t4DkGZfyqUVtPgWrnrPe1EycXyti95uWpm8y/aalaawyri688MIdf+Z6LDHe4MDwNQYHMg++TeM73qpHXZC8qiUOEn/LLyRL4f6892lHSsNpOrbRG6zqiG3SJ3b++eeP8+A+fteizmmnnTaY07LFxsfGZ56VJ24eOzm+eCb8VVddtVq2ujzUMY9NzHWJ3XnnnQO9XodWHB0xMDyxalcNcSOaoHnb+4tRo5VDrNbAX4ofaC3f0dnKqc/8QMN8qw9vRLON64bHiQgkYVu02iiH3W+jZTCxTqDXzeuNXeP4ye83HE3nSehX+oINute2E7cGG7765DKPlq4Vsy52vx9m8X6Y9QHATcQGH3nkkeZGIx5cmtgQ/Svr/ECbvvSvrOsDB2PE4wluCa3tj8mb+khf6Bv7pX3soPQ7DwQIEbUwHDz6irztiBmiB+FB83DB/g7F/g7FjAMmxokRm3GD359YtT5I0A8j9nZfp69oNNpYxKuN0Z9fP28ugy+4659fv71DZbt621Y/65KdyOsWOyfF0AZvvvnmlSYxa62Bh6va+Ny7gCaYr/H40ZxzzjmzedU61joWPj5IzOjc1uO8Lrroolk+epBa9m3X+ScGZx08sSATsRaai83J9NjE9nPp/7pBJJDU75GfNkBro7BxiNE3+JZvDrsi+a4bTX9H43rHoS9gesOJtdNPP33caYgHsel1DtbcaAVnHfrUxUYHVr760dUJjbHaeUltXkrs3Gg4AKNPHNsYm4kaB/KOxiFnZ+Ivf/nL/wrPzLDxmQG58PjojdjkgvDB1kTt/tNiP0/DWPA48TjqL99ZH3ze1E+Lbu5hebOEDiCsC+iDDAPGsf5+xfmnCv1yj8wt8eyYiff7TKYPUPpljM1E30B49PSeaxTQGa1FT5x6+BvvM6EQSfYpXH+zrBp0YI1Tu7+nYBoEtUf9PQXrHYi+MHirzxjrV2U+dw+9Cea9jPTGd4Mmxp9Btafkr3h/jUhgFtz+tG1xzLSF5lYzKXVcr19cM/0NS9/YDiA9dN+wqwatEQ05jmHvL0YN9EFyiOGjwV+Ko9tfLc4BUI88/PpB5Tga5uFlsU0OupaPnlitfd999w3U+lsWdfKmJHPw4eqUmC/vd5x5gtSsSH10P/rRjwbJtF/HXnivwjQQSQhSCC6+jzTEN2G/73w67+E+pmf0eBMf3Vt+3/lQk23mZWhxddn6n1Lr/YK+sR3tm1vi3etd9KfUNDA2rQQLj8a+bQZPqwnkoql5m+IHqu2fHtNBnJ6xLSrSb3QH+unRqkONGosPh6YicTDxlm2OGnDGz372s+PBrtbCj54JDqTWiy+++FfYidWJfCMaONesHDFywOhi+6doYiAa1yQWrPH4m55VMORMSS3bM2oVd47jLT5ci/c8iFOrXxCyHhT0w4hNz+ivMRrriFXeGtuuDd9fYTbtM+nJwlftITTfdu5l7D/yK8zG+d97771b55133sqvy4S/GiRxRmJ7Z2Whayz+QTmLOSxHf1rOeiBlW7A9qs3Pqt5OttEbE4+Pbrc9LcfLx3LD2Wf5g/25BTu/sXgbu1e20Qw4DbII8IMktF4NnU8F4kHrK8/vu9bV+cTnCEm+a9qmzgknnLDaQahFHnF84uCben/8dp9YDjAvvKTuk08++d+x84xA4sSMLJ81lWPZW+harpH+xc9FKdQj3zrnEwcdI4da+GiWctA5r+Yk9sEPfnC1vPXck+tS4+WXX36/azCPiv1O2rR0flCgh0v8dnza4RHWDYFPQTB62/hwxtiemJdzHLfdH2U2bSP3Jbb7SC9B4sbY/VFm87Ho/rif4ZnMY5MX/3B/lNlqRVmxYF1xVnYTn7x+drs9aJ5//vm/Te9an3r0G3Svl7jwjrFdKqKpenzi5LV4uGh20dnt1fp7+b2cWVb8JQ3xb37zm6ta11133dhTcoLf+MY3hnJTPewWhmOiPghPHvPYZX9ir3d+Fo6FZiUqsjLo8KPrZ+ynQUPf6E/FxOFi9zP28w+hPXbGfjUWGA9gHi/vcQIfjrdFxbYGHy45B3LLwOooRhJFmGGQqcbwl3KJU6v6V1999RBa1ydWa5nHTs4XvvCFrZNPPnlsgOvEtvZAYuRY+53vfGdwp1qpiR+0TQy+xrw8VUsMHr/WsP/jH/94tu7O5VMu+jwdaKneu9/97mYseZ7IN7Isni851jmOHV2uokQX/5RTThl9dI4v2SxHxeg/85nPDPR6Xfy13fXJc324yy+/fMyHsw77ve9972rZ0QRtMz/zcNRwzLZ15mOTu6SBR3v00UePPYabaSBBZhB/iYNHE8ytyfh+CCccdY3Eguax9xdH16+OnLZVf/TY/EQZY2RpLDH23myc+sFNtXb9t+X+t+t8A7Y2bLhHH310PPLnNlHrqs2ggq9++MrFR8+nev/bdfram/70l6msx0gdO4wbkLGE7kB+Hl4NPhIoZCRGccdi7y+Ovn9q909txgtjouLSWGLsvdm457Op1q7/1N7e3/4Y9zRkT94xtRoH50bCgcTst+qjI5YHgWIH+cSFS73YtS4+8Wj6NQ/zr8b0LdiveZjGUGvsmPOYSu+O9GsehvWdBs655547rPPUrNj2rYVHY7+lC1c19rGtcx1464iHM79kU8PYL5edb5cj4nJZjWnGAsi2x/fLYvmJtI4rtCBxMDyTudjkGL/0pS9lJ1tNrTy0uWoUXfDhhx8eQpv3T8frnY/EQC/fYK8XlmC/tn/daPphxKZnwTpFYx3xyltj27Xh+8FqvkP1g9XOgwFjBWTcgeGZzI3jrSZu8ilkpFDNY2YV0dUa6Pq7E6ZPiv7uhPngZcww5sDKM8YYUzUOTz4+uppvXStGPniYvjthGnisCCsLPvjgg+MnHxxIk+zDgYk5jg0y3899bvHlC7P5U4/8/qDV+TcT+kJfjfSuctV3DeyKrZxo+oNW55/Y6VP6kokTkrvtQauzrwssrDcwdmKsUD/pNG1o+kNv6FOLT+xIP+m0vzH0h8Tpaf8FavpgfcuuG2ltmHA0PWgfvRGNdc6vNrpaA13/82D6ltb/POh/HrBfXHbZZdkxh91mZ0/QEMf3vhZuw7f7qXBNdtFNM2dmNR/eWO038SKGocT07ST2Jp9lypGzpYNDxzq//e1vXzW98vjJI9c2+UsccSM1QXJB/mSKT17LbuX7oajOpXa4+jo6dNTjbdT5E4w85v/MM8+8Zv2nP/3plYbcqod3DrWCZ5555pjvXDTkE4vvs/CtutmB0FMHRG8fLsjkeOw6kWMduS1E5zrWHfQPQ/5mYYG8MLHN81yBqrEfPXnB/n6/dT/oUe0PfAut7e/3m/pIX+hZfHO2o6k+ecQSZyJGzhKSe+WVV64OFujgqQfWuvjowVqn8jyzo/L2P//5z6+WKVxrWlim6Wuoi3mB+kMr14PQPanNXOqdeTZKcvnNOjc3oXG8xTFPXjnH8oA1P36/NHo+vls9oq/ENj7/f+jpEfnkLDcB25jmxDdW+1C9psnLyTJm2Tyh8TL74ZbEyc/RlKsT4ch99dVXjzfn+TB4qEdO9eHrI7ipC6ID4Y2x+7sipk9z9yZ9859FuWM1nCf09PiJJ574n6U41y4kp+bBGY877rit66+/fotHqCX20EMPreZvHfOrXHxiYNWEX9LVHPylnHGlmIkTlmxmTg4++oP+981CQ7zSLCPLzNl7TsZVLTryWDd08KDj2IlRH12w9RAXcmp9ePKJt/hWLHmeyEPrGPOgN9baRudc6oGOYTuGDS5pErcGG7761AlaY10rVrWH6bUAw6rND1R1vWt87AVGFVAAHh0Ng0d36qmnrjYYftU7Dw3cGWecMcjXG466IJoWOoea5qgBugYceuc75jiaWqfFt7ha1z76cDl4ONbvvZg+yfvzJqdeeIzEzhjyRBzOmhobvxFYTILF2CD6oLnYxGy/8MIL17V4X+udh346J3aebfC1r31tMKcDRZ7cgu+a4ZgqH7/eco1mCfsLWqaB1epr+raJT7z17cc52Jtwafskh2VAY46axPq5rna/Vj2jWaAba64/Omrf1sF8dNRq4ww7krcHA9pc1bHNQGudj00+j0Wven46dD1+8o02D0KlBlhrU9M1rMW+++67V+tLPkgeOvO280guNOQ4TiwcNvjII3v7bdNDT6amVLufBNy31U8Cbu27/fbbxx0nY4SJnQjfSAx0LHZ4v+eP+E033TQe/KJhIifYTwKu+5fe0Df3p3IH+MLY+YGAgsyEM+jmvXFyNjZf34m3EI6azofL1zbrrAlPzGieOs7DBtFTwznE4OL3P2fmA44+gvQMdO/gguZtE6tc+PwZF56Jeg888MDqAiJ4kFro8BOHw3YOOuOe/HOmNqXVNDep2v3pu/Odpf8J1f+E4oBzWP0J9bGPfWz1acsOzkqA8KB5uODXv/71sU58Yvkp8ZhjjhnSpp81XAMb/MQnPjHWec973jPWoSZ177nnniEl4WlexMCvfvWrYy1r69WOiTlOvtG2tdivvfZaXv204xOs5qE3YqN9/fXXj8bOm3uoCxe0TT5I3OhYtePDGZf4A5m366CHq35/BsZ6HNMfIzY9C9YpGuuIV94a2yv9DkIzotASpkBieXIKtnE1g/0M2uSTU+08xDNc5V13yXYOGjjmF+TvJ7hnn332X9AbW7ktjjrkWuNYeGJgzUFTH5nd0plzPWowb3w0IHHq4BM3xvbUynHcdn9r1XqfcU+w3Uf6D0aDDYZ7q95aNQ7GFGcGxx+fC+imje1PKDQsmPNuueWWVd4FF1ywqmWt6zmnVQeOHPTUw0fHGW/rbaM3kovuQJ70ita51CSGHwy36VXUznHPyDVWG58aQa5iS+xApuS4DrZz0RCrftUmbg15oOMtHXHHvvjFL47r04rDeVlsE19Clm2Pf6BNBwAakobRyE3NQ0MeSL4x9lt19GKZmJ8Rm3lzAYpz0ASxfVI03GOPPfZ/1Ki55BDHD2Ln8lJ8OOoYiS1pzWN7vn55B1d0ts7G1/n45Cx1uc21ar28nje249SqsSUeXWuevM2H+ks1nNuqZ25JS20jecwfH42fBeC62Nbfdtttq/Fwww03rP5UpkY0999//2ys5M5X526y8ytL4miqzXzqMqGHXxXYQeoThcLWjMmDrsZbuqpJfj/Kr3uXXriftvufLWnNzv7QI8aa0WMN3jVq3P6e/rMljch11TQkTTvnnHNmRyg3sm4Ex1KDOHxFz+eHP/zhjvlcdNFFg2Q+AMhp8cyvxpgvfK0BTz56+2iM1ebMcHhiZ5999mq98F3TNjnoWj7L1Z+nMI2t2qf+PIVp7DFeGFMt3/3DHnTrI27wTSSvcmqea9pGF2RynK+24XLG/1Of+tR4oCDX+mpXTX2bbfTMFy24VIs4edyQw81E1ATRkee6xNA6Zjs66lMn2Pp9u+ahh7e/ZEdbY/E9UQ+tY+TSG2tto3Mu9UDHsB3DBpc0iVuDDV996gStsa4Vq9rD9Wal1cZmZd2MutI1Vv09/bWqDLramzpYPWyXJwAAFg9JREFU6C06+g+G7+dT5gci98z9pIfEHaOfcP18yvStqvZm30knnbTjU7fVVLilxj///PN/m1i9scd5zPxAODae59eyqVn1+MTJbfFw0fQHhkzfDtIP+gfSR2L0rsbho/vwhz88jjF4sNaxH9s+l3t7XtjBI/KBIeVDhr6x3vSn9oo4enRLv7ANuukrFMm1KEXQosOv8SW/vwp9PrCX+kj/jP1V6OsDlHtS+9dfhT7v0X5fhT7f96dPABpLs6sf3hPxYLXxqWV0DXjXqHH7/U+QaWO7L7WP9B8kbozd/wSZj2n3hzHpHhJ3jDjcYfonyHQgyEqyoo8//vj/smIgMSM2zeh3qk0D63B7XFW2JT9Zsl1zQxk229jj4aWXXrqAOEi8pQ93xx13jH8qJIe8TWid63sezm/pHSfPXOznnnvuHnOXXnrp+CHnP3ujycltL4vz4MMx5TbrG2+8ccxZ0pPrZUQLB8IbsakT3xP8rAYCgi7imG0KgOSAtVYrF+0b/PoypKWPy790EKu6TTwPA7WG/GBrihYNeXDnnXfeOHjItQabGEg+cTDxXPp8oM/Now51M5hjm8duobnf/OY3f4nvGnAg84rPZL1tcqyr+dY7Zj4XfdUaS3743NMQpEbsnL+Iz3TzzTePy28t8SA8XHw4bHZ4NMHd/DP9sNzzDecFr3b/Wr4eRLUv8d3H2HBoW1z/Wj7tgK0+0VNi9BQeNH+Yfi0fVmHqRWu9Ev8jX2k5H7RZiMzUC3OkPLvd65Wn/3odEyOODboncGhdAxs9Gl++7Hzi/ZkO/RF1jB3GBD5o3nYda+iDb+SZDqvBn8IuHrv/5DMdDGl2v6lqZ0/6TVXTByf7EfsSyM7puGO75HL79Z8G559//uoTMgvI89fZAYynnXbaIJkGRGx8bPxWA1zLeuzEfTNH+Kuuumq1bK1cz8M2y+C65N95550DvV6HVhwdMdD1q101xI1oguZt7y9GjVYOsVoDfyl+oLX8VqxWTn1XAxrmW314I5pg+JaPnph1se+7774BptzY+VZmjvrh6pSYb9xynHmC1KxIfXS7/QE+w3JO5wiw60otNWJJlzrk7NmzsNs96I95n3bIOr7sM14qeiz1x7xP+xW9A7nLFt99S0/tWyN7OuNJQoJHHXVUslcTGye+NfhLHHyQKWfosf3TFBzzNBILmsfeXxxdf5329O2tf+va+QGYcbI0lhh7bzbOGGQeIPWIH8JvXdPOzcq+853vHA8ALCAxLzjckobHoFWd9a4XvvpoQcdtH0iua2AHr7322nG+qRnOyM925DhmbbXrCyvJb72amphrx27doVm1995771Z+soze+XV5ah5adPh+1wSXXDu3NR/iIBpqMo8l9BuNya214ucSWfhgHiZS52E/Gvv1TwRioPXhmJindS2uxpf8XXiV7fxT3yuOHey/Ra/71H+Lnj5J+y3jOw+8OTgcjreMD8s9P2L6CLbbT3B4WevRmVjQLz2t64sfHRMcSK3+hOL+hGLGAs+hyBjJ9SDwYHjGj+3E0YDWHcKXvExH+CzQJZdcsloBFp6vnPisCFiftcdKeSXhuIqLWvnpiTpobr311pGrNdCQT9w1qgYfLT41Wn6NUb9VA64idfs1GNMHTauP9KnV83D9GoydBxT/6fZWvSZw6PX8QMCArnx8YmDVhPfPLsT722t2bkx6417Gtu+eo4fr9wTs0XsCtvfDt/rXqNnA8yD0oLTNQOy/xa9PKnoHxaaP9A0/8UN4Vnj2VZVlq8scP7H+W/z0Acn2A+lR7Z3jS7FoduOfqsPy7vy0qitkP3adqBGssfjh+2Os9m0dro+xYpvW7Vy3N3G2OQj/uc99bqDW4wEkBob3FP5d73rX6iCGBsyfXdSpGA3cM8888xq2eeokthQ3j/6uu+6aHVQ31az59m2nRv2VrcaZ/xLPctR4yze3bc8PBFWA779L+k9KywOntbHoYSvGxgvuwp+UhkWf1vU73/nOymc9vOzWxSYGb25TPjo09rFb2B/cMn0I03tj7E0PbpkdCd38/jdo/xvU44GdDw6EB8OfccYZg7t8MCC3onMSi28OH3Q+HHrnO+Y4mlqnxbe4Wtc++nCHxRWRbkzs/o759QBkQ/K8BDYyPH0L+u9++OiYnPvxj398cNc7CfGKxMH6rsboEyNuH34ptjQvbjJzXq1LLhpjy27po8vkqzytI36g9chdQtepv1Ilhzg3lMX//ve/v+KJ1dpH4i9rwzpOg2ppxdGA0VnrHSEaJjT9ZpRpwNFDetSv1ZjGX3rSr9U4RNdqsLOCdaDiJ87U37E3HezYoVt9ol8gmj3+jr3VB0V6Qu+WbPoFogNrfvhM/aWx6z5wiTv9qkj/VkgQMn7lEnsjDzkgH1yqTTyIHS022HqxR2LEsTchy1DRNYiZoyaxvDOwFUcHoq9++P4I+flBgJPPORmZ/qRn7l+Lo688Zo4csObHf/TRR8f6Z5111spGV5H68NUPX7n46PMm79jXXXfdOE9ygvXlO+S2kPkQYx7UIw4fnz/14Iy1zrY/rZAFtiliznbiS34/Ez4dsDb1kf4Z+5nwaWx6jNGjcJvOhKMD3X+4yy+/fDDX2wjOOuz6LYOcxMmDw3cMmxha6rd4uE2aWpdzWvDOdT1sMGuxOFGkFrVPPtqx8HaD+oUp058R9AZ0H207XvtKLLgbL0zJcjEd6Dr5AamsL+j1xSZW6zPfTU9NIodaYE4QEjPG5lmBsWvMXGrlZHvVsFzwzBOfGiBxEB11QHjyKpLPS02q/rvf/a7XZ31EO6If1bx9UHqrL8v0BqkbAZ+NYaw2deCdS6zFEWvloQ8SB1sxuGiWJmolflj8JFZ2XP/NTC9YV68bsRNOOGG1o7R6Yz1x8A99SAjzD+YWeeo++eST/x079xcE0REHzWOD5MX3NDpc9UUCIicyI3PRveMd7xhgXbjGwofrb6yd+pN+0Cfs6tNPIxp66tyWja7WQNtfOjtth73+0tlhTEzNiM3gwcbvVxauD2itnYoe0Ut6h1/jS34/n7L5YEnfWtjPp6z33VZvGIebzqesvhEgbGEtHA2cbXPUgTP2v2un/qUvTP3v2vkH0oH8Xcu4OgKfDbD1yCOPjN8aWU/GCvsdfkX2v/ot3HWoEdx+6tO+rcsuu2zQTIPSImyKxIfDrr5rYaOpdVzDNjry8dH0r7XTdtjrX2vrGMFnzIGVr2Oqxhlr5OOjq/nWtWLkg7vsJrTpE6r1LD2vEA1gReqK1zi5IHmcj3A+MZBaYPh+F9p653ePsCu6b8Tqdqga4hXJD5ITfN/73rd14oknrj4YEvNZ6Keeeuo/0V5zzTWzPOq4ru18kuGnRmxqwVfuiiuumH1ALenJ42e2qovveWDDWw9HTTA8V9uefvrp47oQd01q5JcT3qUIZx25qYuNDqx89aOrE5pVIA5nVAm0in/+85+frVS0npgJXPX724XSrqln7k/LNkeeudjmsV944YXrsK3xeZ636sk2ru9l869QLMsm/MpXvrJjLEVPzRZSL0/Djv3Rj350rIG+VYM8MFpso3nb0cSvXPjD9cK7YdnnA5OVrDwr7QZgg5tyiFEnfh+w8wFFH0F6Brp3cEHztolVLvzhOmCzLq31oR/EQHoA1vx+peh4EJwfCGhUC/tLUKcdt/aHgQgm7sGHDSbeX4K64atq+YCi3+lfneh1+P4S1GncMdboF30CZzxkcM+8C34YMFnffoHR+Gkw7lyMBw+ScK2JgZZYv8Bo+pCgd+DhcIHRuIFZaG9cNn4rhq7vTH1nYpwEGRfVxt9LV+vVvtT9KH7OzQWffvrp/6BH5NFL58GhIccaYnDW1BiaAddftaoYPniIn6U2LNo0wLxcsRNj6mexp4OSexb7sDuLvb1t2d6sT/zsNLl7MBxTeD8u33zsxMHYTOg+9KEPreL1mw3xFlLDiC5c7KCvnSFOLCfgeWQ7HLmvvvrq8ebCM/3+978/qtZq+dSqzwShLjjopuKQoGMU7I8rnw6c6ZN7ZZvemat6eooWjK4/Kq4/Ks7jweMIPggPhnuTj4qbDgSeQctmZkHb1sKHsw6/aqvGOmJB89RwHE1iu+R986ujN8u1CR2LnXvZg5VnvTehc9DBxcfmQAP37LPP/gt6I3p0xgO1rUs9aoKJtzT11t+Wzpzr1fngowE931YtdM7HRk8N+Bbu9hPts42SFah/Bnhl6woTY8XxKzpu2/VqTvWTZ66/uHS9U9MXXyPAgz7oFz1HCxIHqy482hb2F5fOD2D0sWJ694UvfGHr5JNPHg944WpP6feBxJyL/Yc8ZXqY985vBCwIM1jStPhwS/nUe7Nxz29TLf4eRkMefv17yXE0dT3CeyIHXctHT6zW7s9qmMYevQFrX+FBemodsaD/LreGvGg8WQMfbq88Q3E8KtGINCE2k5ti2/Fqc8OI9bbRGxOPjy4n/sw5Rh7aqmtp4Tbd3EO9aOs7HZfmwbJQnxrB/mzHaRxt6pN75j73Zzuu9wd6R28Ya/D26aU5dOSjKX96rWd25plnDvH5zkgChSiOzl8NiRn7zUw7n01Hf9xb+pmYJ3hjbN4axc1G1ASjYXI9x7FrHD/51I+NvvX8SHLQoIe3v2ST65xoPRFD6xh16Y21ttE5l3qgY9iOYYNLmsStwYavPnWC1ljXilXtm7yZaVpYTiAxs1zDje2FwX7ppZcuIA56ocxh33HHHeNgDwe/Ca1zfZajYkvfqm8u9nPP9TPV9LfVQ8fc89hv8kz1MJvpIENNcywHyDJYi75y5DiOptZp8S3ONauNPnz9GZKHpZKDNoidGL45fl409853vnOQTwdKxyrPuzSoDzKvlQ9ZEREzMGKT009UTYM5PaEv9CnoaVPcMef3h5bM++re2KZ/xv7QkgzJqX/uzTguIUdiGLStJMexo+tfH9tH5fQo/QFrT4m5l3CgY7ZdCz5IHuhYtd/k18fVPFI/E48Sp3b+FGQ50OCjqX505vqt8NMO675UO36mt+qFrEOt+acVPhuSDWU+9puNU4caIPWI9zP/6x2EftCnFpqL3d+eNI3P9GOvnPlnX/W+BLffpzQjrFgHV3xz6MOdf/75Y+yhhx5a2S3taaedNqRNAzw2Pja+50es1oQHE//Wt741m/9VV10186nh+VQb33XJu/POOwd6vQ6tODpiYHhi1a4a4kY0QfO29xejRiuHWK2BvxQ/0Fr9wL5zu7m36SN+tQ/Kgd0bmAXxZcSOe6N7YckDHYt9UFZke0fzMrI8YF0ueHBTbjT9t+lpsKYfTJt+kqXn9Bjc7yeUtic5dfuEP1zfI8A67ZbnLQ693bfV7wibf1rvojvChvEyfWtq7QiJ85NZfSqQc2Mn/+WXX34/deBa+Ktf/epF69CEO+qoo1bfbmKHJwYu5VmPlvxgzjng+xcrOOoaiQXNY+8vjs5vZyaHGLhpHtEQB81Rw5x1h/pb9WojHjbPVVOz3dDY/Y60fVt/hDvSZoObgWuMnUfQwbFd8I2x8aNjgnP88ccf/1/ioHXhrMe//fbbVzw5ILn4RmKgY7HD+1sy8Ztuumm1Dol7Iifod37kMmNyweTZfuKJJ/4HP+j4T3/609n80Hneto877rit66+/fosL2xLjT3frtutMn4YH+bbHYVnWTWChvOJwfZAdEYNsta3Zpt7ODGY4a+CsqVzV1zi50fXrZJavkxn6tG+rP1R0OiozkDJwluylweec5JKP3Z/ROP8Up48gfQLpJz5o3nbi8SsXvj+jcT0el57ROGvaUhNpMGhdbbp97BbCUTNYp2isI155a2y7NnyuyDJv23XRe55oE+t3ab5/aMN0sKRPresAiFkf+4c//OGObV61995779Z55523mpfz2RbowapBB98vfpu2WXpCX/b5BFNInq1+II2N/u6779668cYbxw1KYZANQT38xFsa88TNUQcOhHd97P44tfXGrz2qPr2sSB/DH3aXzg4fMDyqn/Xy+thOPP5ePHm+WvFbbrll6MF6x8zPOthpSp0uueSSGcfRGh25YL2LLzpi5MD5UVPh8rOUtbFvvfXWkYvvGtSBIx7Erhr8/cWpWZHaIHHqLSHzvfLKK1f9RAdPPbDWxUcP1jqVZ6eovP3+/oppvNDPfKV2j+p2IWaMjU8d52GD6Fs5xKgT/638U3OoN1/YnOU0d8opp4x+eC/IJptYxdTY9DLGlp75Erv88ssHc72x4LzM2OU2yzGHeiC1yHNNx2yTC5ID1lqtXLS8dYdazkXjmDnz5IFVt4mvlwsnl3zsikvzji4fEMTJY/5GYiA51sDlKUoHeuacHOrmCd2xzWO30FzeQoTvGnAg84rPZL1tcqyr+dY7Zv6xxx77v1pjyQ9/8cUXj9sFXT6AB3u90Ln3mxmEi20fDn3uiHIcG7Q+HBP51rW4Gl/y+804m7cTfWthvxlnPs5rjzIu99CH1roZ7Lg0wz4c6FhspsQ3XWWWODXqnwzwIPOgNj41gvw+as0mm9rUoKZz0BCrftW6FjFyiNlH4/roiPVnLk5jkj7RG3rJT4HE+zMX5/shfTIyzkB6ukKENLSFTqBIsD8+fPpGRR/pD9fW94u1pgHK2EqP+uPDp4MdY4b+gOEP1nU0q0/o1oJ458eOLjaPIosNF9tvw4XfLddSszwsc65RhwtiE68+fPBgv7ueZcmJ2thMLBN+MBx8xapDH+Q8BRpyreHgZg3zq3oehuF4tV07sQsvvHC27LWmfZaBGjUW3xO67b+HB3fq1VIuGmPLZj41Ft+XLluXGJPnjwbO6Fi1Pe96kt01Fn8YoEC/a28+cGg0G4s+mafBaIjBg634gWq987Vy+oNY5x9G3k79Zrd1b+jJxtuxEYEMtvhLHDyaYL9hZN10ruXmIGDst2G3d1rGEWOvhWiCrXi4/cWo4XxyiOGjwV+Ko/P8W9pdf0BvLTQr5Sb0i3J2DkD6w2BwL6vtnvaLctY7be1fenQ4vDC0blv7jAWQdTwM7midNgorxEoYzz333CE87QybtOjQ2HdN+HDYLYSzznXgrSMezvySTQ1jvxx5vl34Dd+9db+WelsvYiK/X4683p/oW9BPBo9PjD7j5zwdfQz+oT//DzWmk0utGXNyBZ2RhYKzX2txi2y0jpFz7LHHpivNGPUdP/HEE2daNLU29UHrjj8+75icTtq8/vrrRzMPsJXHCRf/BOo62J5Xqw5c1TNv58fmJK31ttEb6zz6+yLmOx+9ok/xa08dc7zFt+ItHfNw7BD/bLzzQMBCslLB1sRKMECrvv+KMA06elqRvr7tbW8bQtNBKbb7ie9e918Rpp3WvaOnLc6x2HzQ0V/HyTcXG63jtlt64rv1V4Ss1bDc84bG34s3XtALNiR9CR4Gf+MNiz8dSPpTi+Zfq+s2pVfmq+2ddkkfvubFh6/omPNauoP51KJhWaZPexbGC8snUGLEbTsfu+r619HpYEuP3GNs+oZfta2+k0PM/lI+msQP8dfRNGacWK5N6Fjs/ubo9X5Z76uhr+6XOfhwsf8/RhUrtg86AKAAAAAASUVORK5CYII="></image>
+    </defs>
+    <g id="Onboard-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="User-Role-Selection-Copy-2" transform="translate(-204.000000, -364.000000)">
+            <g id="Group-11" transform="translate(188.000000, 350.000000)">
+                <g id="Group-14" transform="translate(16.000000, 14.000000)">
+                    <mask id="mask-2" fill="white">
+                        <use xlink:href="#path-1"></use>
+                    </mask>
+                    <g id="Mask"></g>
+                    <g mask="url(#mask-2)">
+                        <g transform="translate(1.000000, 1.000000)">
+                            <circle id="Oval" stroke="none" fill="#E5EDF5" fill-rule="evenodd" cx="61" cy="61" r="61"></circle>
+                            <g id="Group-13" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="translate(9.000000, 39.000000)">
+                                <g id="Group-7" transform="translate(23.752115, 0.000000)">
+                                    <path d="M2.89720976,18.1038274 C2.97514791,17.0354254 2.02148811,15.5589305 1.13710667,14.7113532 C0.253807702,13.8637759 -0.293924257,12.7141882 0.167209764,11.003879 C0.523343784,9.68326041 1.36009636,9.78176557 1.69133348,9.00563155 C1.93597265,8.42975526 1.83422007,7.77377588 1.88401389,7.1513532 C2.05829224,5.01130165 4.41159121,3.3334666 6.48994172,3.86929134 C7.07556028,1.8342398 8.9731376,0.24516763 11.0796324,0.0265078363 C13.1850448,-0.193234432 15.3683953,0.971507836 16.3610242,2.84094083 C17.5625706,2.2163532 19.076952,2.23908516 20.2611788,2.89722949 C21.4454056,3.55645629 22.2615912,4.83161093 22.3633438,6.18145629 C23.5345809,5.33604392 25.3336531,5.66186866 26.260251,6.77032227 C27.1868489,7.87985835 27.2442201,9.57717794 26.5406118,10.8393429 C25.8359211,12.1015078 24.4720036,12.9231058 23.0431376,13.142848 C21.6142716,13.3615078 20.1377768,13.0248584 18.8442201,12.3797037 C17.5506634,11.7345491 16.4248902,10.7960439 15.3997871,9.77743567" id="Fill-107" fill="#090000"></path>
+                                    <path d="M10.8784005,43.7068408 L10.8784005,43.7068408 C14.3087613,43.7122449 17.1372665,41.0482759 17.3072149,37.6536367 C17.4479366,34.826214 17.5810809,32.0301831 17.5810809,32.0301831 C17.5810809,32.0301831 21.2701531,30.3090491 22.7877819,27.2218326 C23.5054623,25.7637398 23.4578335,21.6784821 23.6819056,19.3868841 C24.169019,14.4139975 23.8507716,9.58832742 23.8507716,9.58832742 C18.060617,6.5487398 11.0635036,6.85291505 5.56453451,10.383946 L5.06551389,10.7043584 L4.45824585,37.263946 C4.41927677,40.8058017 7.30407059,43.7014202 10.8784005,43.7068408" id="Fill-109" fill="#FFBE9D"></path>
+                                    <path d="M18.0285757,22.8638996 C18.0329056,22.8206006 18.4594005,22.8314254 19.1446067,22.8833841 C19.3221324,22.9007037 19.465019,22.8942089 19.4942458,22.8206006 C19.5440397,22.7404975 19.510483,22.5737965 19.4585242,22.3865285 C19.3665139,21.9914254 19.2723386,21.5909099 19.1749159,21.1730748 C18.7928025,19.4486934 18.5665654,18.0403944 18.6715654,18.0284872 C18.775483,18.01658 19.1705861,19.4064769 19.5526995,21.1308584 C19.6403799,21.5508584 19.7237304,21.9513738 19.8081634,22.3475594 C19.8352252,22.5261676 19.9142458,22.7426625 19.7724417,22.9613223 C19.6999159,23.0695697 19.5440397,23.1291058 19.423885,23.1323532 C19.3026479,23.138848 19.2041428,23.1193635 19.1207922,23.1074563 C18.4409984,22.9970439 18.0231634,22.9071986 18.0285757,22.8638996" id="Fill-111" fill="#A5644F"></path>
+                                    <path d="M17.5814056,32.0300748 C17.5814056,32.0300748 14.2831067,32.0300748 10.9783129,29.5804357 C10.9783129,29.5804357 12.2740345,33.4069821 17.483983,33.3615181 L17.5814056,32.0300748 Z" id="Fill-113" fill="#EB996E"></path>
+                                    <path d="M4.93951389,18.2422759 C4.94492626,17.8266058 4.62451389,17.4693893 4.20559636,17.4499047 C3.2378644,17.4044408 1.64662729,17.75408 1.44528708,20.399647 C1.16059636,24.1785645 4.850751,23.3071728 4.86590564,23.1989254 C4.87673038,23.1144924 4.92002935,19.7122759 4.93951389,18.2422759" id="Fill-115" fill="#FFBE9D"></path>
+                                    <path d="M4.05264275,21.6958017 C4.03640564,21.6817295 3.9833644,21.7369357 3.86645719,21.7791522 C3.75387987,21.8202862 3.5633644,21.8408532 3.36960152,21.7531728 C2.97774585,21.575647 2.68656028,20.9164202 2.72011698,20.233379 C2.73527162,19.8891522 2.83377677,19.5665748 2.97666337,19.3046161 C3.1141376,19.0372449 3.30898296,18.8575542 3.51465306,18.8369872 C3.72032317,18.8055955 3.85454997,18.9365748 3.89351904,19.0469872 C3.93681801,19.1563171 3.90650873,19.2299254 3.92599327,19.2375027 C3.93681801,19.2483274 4.01259121,19.181214 3.99418915,19.0220903 C3.98444688,18.9463171 3.9454778,18.8532243 3.86212729,18.7742037 C3.77552935,18.6941006 3.64454997,18.6464718 3.50166337,18.6508017 C3.20614791,18.6497192 2.92145719,18.8976058 2.76341595,19.1855439 C2.5891376,19.4723996 2.47114791,19.833946 2.45274585,20.2214718 C2.42027162,20.9846161 2.76016853,21.7261109 3.29924069,21.9252862 C3.56228193,22.0151315 3.79176646,21.9512656 3.91408605,21.8711625 C4.03857059,21.7867295 4.06563244,21.703379 4.05264275,21.6958017" id="Fill-117" fill="#EB996E"></path>
+                                    <path d="M15.4915809,18.0435336 C15.4915809,18.0435336 15.0769933,15.7779151 12.818952,16.2801831 C11.4009108,16.5962656 11.6877665,18.1734305 11.6877665,18.1734305 L15.4915809,18.0435336 Z" id="Fill-119" fill="#EB996E"></path>
+                                    <path d="M15.4175397,18.3933893 C15.4175397,18.3933893 15.5539314,18.2840594 15.4911479,18.0437501 C15.4294469,17.8012759 13.2298592,15.9610697 11.7631067,18.2061212 C11.7631067,18.2061212 13.8425397,20.2357604 15.4175397,18.3933893" id="Fill-121" fill="#EFEFEC"></path>
+                                    <path d="M14.4216479,18.0858584 C14.4216479,18.6043635 14.0016479,19.0221986 13.4842252,19.0221986 C12.967885,19.0221986 12.547885,18.6043635 12.547885,18.0858584 C12.547885,17.5684357 12.967885,17.1484357 13.4842252,17.1484357 C14.0016479,17.1484357 14.4216479,17.5684357 14.4216479,18.0858584" id="Fill-123" fill="#2A191D"></path>
+                                    <path d="M13.9296891,18.0858584 C13.9296891,18.3294151 13.7326788,18.5264254 13.4880397,18.5264254 C13.2455654,18.5264254 13.0485551,18.3294151 13.0485551,18.0858584 C13.0485551,17.8412192 13.2455654,17.6452913 13.4880397,17.6452913 C13.7326788,17.6452913 13.9296891,17.8412192 13.9296891,18.0858584" id="Fill-125" fill="#040000"></path>
+                                    <path d="M12.5285242,18.7655439 C12.2492458,18.6129151 11.9732149,18.4581212 11.7069263,18.2860078 L11.6235757,18.2329666 L11.6820294,18.1528635 C11.800019,17.9872449 11.8920294,17.797812 12.0392458,17.649513 C12.1723902,17.4860594 12.3390912,17.3561625 12.5187819,17.2392553 C12.6042974,17.1743068 12.7082149,17.1418326 12.8045551,17.0931212 C12.8998129,17.04008 13.0069778,17.0216779 13.1108953,16.9913687 C13.3187304,16.9339975 13.5417201,16.93508 13.7517201,16.9599769 C14.1749675,17.0097707 14.575483,17.1623996 14.9132149,17.398379 C15.0809984,17.5163687 15.2455345,17.6386882 15.3830087,17.795647 C15.4436273,17.8670903 15.5367201,17.9612656 15.5421324,18.0803377 C15.5421324,18.1929151 15.5074933,18.2881728 15.4706891,18.382348 C15.475019,18.2827604 15.477184,18.1799254 15.4555345,18.0954924 C15.4328025,18.0143068 15.3559469,17.9688429 15.2801737,17.9049769 C15.1286273,17.7891522 14.9630087,17.6863171 14.7941428,17.5997192 C14.447751,17.4351831 14.089452,17.2998738 13.7224933,17.2760594 C13.5395551,17.2565748 13.3576995,17.2803893 13.1823386,17.3150285 C13.0935757,17.3355955 13.0037304,17.3453377 12.9225448,17.3875542 C12.8402768,17.4276058 12.7504314,17.4470903 12.6757407,17.5022965 C12.514452,17.5932243 12.370483,17.7068841 12.2351737,17.838946 C12.0836273,17.9547707 11.9786273,18.1182243 11.8465654,18.258946 L11.8205861,18.1258017 C12.0641428,18.3282243 12.2979572,18.5436367 12.5285242,18.7655439" id="Fill-127" fill="#000000"></path>
+                                    <path d="M13.6627407,17.7655542 C13.6627407,17.8878738 13.5631531,17.9885439 13.4386685,17.9885439 C13.3163489,17.9885439 13.2167613,17.8878738 13.2167613,17.7655542 C13.2167613,17.6432346 13.3163489,17.5425645 13.4386685,17.5425645 C13.5631531,17.5425645 13.6627407,17.6432346 13.6627407,17.7655542" id="Fill-129" fill="#EFEFEC"></path>
+                                    <path d="M16.1247201,15.4673532 C16.1247201,15.4673532 15.7252871,15.8786934 14.1567819,15.2541058 C12.4280706,14.5634872 10.856318,15.0224563 10.7047716,15.1934872 C10.7047716,15.1934872 13.1565757,13.3197243 16.1247201,15.4673532" id="Fill-131" fill="#000000"></path>
+                                    <path d="M19.3563386,18.3775852 C19.3563386,18.3775852 19.7709263,16.1119666 22.0289675,16.6142346 C23.4470087,16.9303171 23.1590706,18.5074821 23.1590706,18.5074821 L19.3563386,18.3775852 Z" id="Fill-133" fill="#EB996E"></path>
+                                    <path d="M19.4302716,18.7274408 C19.4302716,18.7274408 19.2927974,18.6181109 19.3566634,18.3778017 C19.4183644,18.1353274 21.617952,16.2951212 23.0836221,18.5401728 C23.0836221,18.5401728 21.0052716,20.569812 19.4302716,18.7274408" id="Fill-135" fill="#EFEFEC"></path>
+                                    <path d="M19.847885,18.4199099 C19.847885,18.9384151 20.2689675,19.3562501 20.7863902,19.3562501 C21.3016479,19.3562501 21.7227304,18.9384151 21.7227304,18.4199099 C21.7227304,17.9024872 21.3016479,17.4824872 20.7863902,17.4824872 C20.2689675,17.4824872 19.847885,17.9024872 19.847885,18.4199099" id="Fill-137" fill="#2A191D"></path>
+                                    <path d="M20.4485551,18.4199099 C20.4485551,18.6634666 20.6455654,18.8604769 20.8902046,18.8604769 C21.1315964,18.8604769 21.3296891,18.6634666 21.3296891,18.4199099 C21.3296891,18.1752707 21.1315964,17.9793429 20.8902046,17.9793429 C20.6455654,17.9793429 20.4485551,18.1752707 20.4485551,18.4199099" id="Fill-139" fill="#040000"></path>
+                                    <path d="M22.3183129,19.0995955 C22.5975912,18.9469666 22.8747046,18.7921728 23.1409933,18.6200594 L23.2243438,18.5670181 L23.1658902,18.4869151 C23.046818,18.3212965 22.9558902,18.1318635 22.8086737,17.9835645 C22.6744469,17.8201109 22.5077458,17.690214 22.3291376,17.5733068 C22.2425397,17.5083584 22.1386221,17.4769666 22.0422819,17.4271728 C21.9481067,17.3741315 21.8398592,17.3557295 21.7359417,17.3254202 C21.5291891,17.2680491 21.305117,17.2691315 21.0961995,17.2940285 C20.672952,17.3438223 20.2713541,17.4975336 19.9347046,17.7324305 C19.7669211,17.8504202 19.6013025,17.9727398 19.4649108,18.1296986 C19.4042922,18.2022243 19.310117,18.2953171 19.3057631,18.4143893 C19.3047046,18.5269666 19.3404263,18.6222243 19.3761479,18.7163996 C19.3729005,18.616812 19.3696531,18.5139769 19.392385,18.4295439 C19.4140345,18.3483584 19.4919727,18.3028944 19.5677458,18.2390285 C19.7192922,18.1232037 19.8838283,18.0203687 20.0537768,17.9337707 C20.3990861,17.7692346 20.7584675,17.6339254 21.1254263,17.6101109 C21.3083644,17.5906264 21.4902201,17.6144408 21.6644984,17.64908 C21.7543438,17.669647 21.8431067,17.6793893 21.9253747,17.7216058 C22.0065603,17.7616573 22.0974881,17.7811419 22.1721788,17.836348 C22.332385,17.9272759 22.4763541,18.0409357 22.6127458,18.1729975 C22.7632098,18.2888223 22.8692922,18.4522759 23.0013541,18.5929975 L23.026251,18.4598532 C22.7837768,18.6622759 22.5488799,18.8776882 22.3183129,19.0995955" id="Fill-141" fill="#000000"></path>
+                                    <path d="M20.9666737,18.0996058 C20.9666737,18.2219254 21.0662613,18.3225955 21.1896634,18.3225955 C21.3130654,18.3225955 21.4115706,18.2219254 21.4115706,18.0996058 C21.4115706,17.9772862 21.3130654,17.8766161 21.1896634,17.8766161 C21.0662613,17.8766161 20.9666737,17.9772862 20.9666737,18.0996058" id="Fill-143" fill="#EFEFEC"></path>
+                                    <path d="M18.7230912,15.8014047 C18.7230912,15.8014047 19.1225242,16.2127449 20.6910294,15.5881573 C22.4186582,14.8975388 23.9914933,15.3565078 24.1419572,15.5275388 C24.1419572,15.5275388 21.6912355,13.6537759 18.7230912,15.8014047" id="Fill-145" fill="#000000"></path>
+                                    <path d="M24.58155,11.2146367 C24.58155,11.2146367 21.4672716,12.7225233 17.4134056,10.6982965 C14.7548489,9.37118309 11.6546428,8.72278103 10.970519,9.2575233 C10.2874778,9.79334804 10.1424263,12.5330903 7.50876646,13.3330388 C7.50876646,13.3330388 7.68953966,18.5613893 5.6046943,18.3752037 C3.51984894,18.1879357 4.82206543,10.089946 4.82206543,10.089946 L9.92268399,7.59917278 L15.4887665,6.54809031 L20.7311891,7.28742021 L24.789385,8.39803876 L24.58155,11.2146367 Z" id="Fill-147" fill="#090000"></path>
+                                    <path d="M17.924983,25.4717965 C19.8258077,25.4598893 21.3769933,25.3105078 21.3769933,25.3105078 C21.1626634,26.2620027 19.4393644,26.5791676 17.9141582,26.5705078 C16.3943644,26.5510233 14.6721479,26.2013841 14.4762201,25.2444769 C14.4762201,25.2444769 16.0263232,25.4241676 17.924983,25.4717965" id="Fill-312" fill="#F0F0ED"></path>
+                                    <path d="M18.8954211,27.1293893 C18.8954211,27.1293893 17.5499056,27.4010903 16.3028953,27.1055748 C16.3028953,27.1055748 17.5401634,28.400214 18.8954211,27.1293893" id="Fill-314" fill="#A5644F"></path>
+                                </g>
+                                <g id="Group-6" transform="translate(71.174766, 30.822781) scale(-1, 1) translate(-71.174766, -30.822781) translate(59.174766, 10.822781)">
+                                    <path d="M2.45518315,19.965949 C2.45518315,19.965949 2.55470518,26.8159771 6.12172017,28.1947213 C6.12172017,28.1947213 4.39464894,30.5541215 4.84249805,31.620949 C5.28427875,32.6877766 10.1208064,34.7789528 11.241036,34.2449321 C12.3588383,33.7109115 14.3650566,27.4398103 14.3650566,27.4398103 L9.05155147,19.6552461 L2.45518315,19.965949 Z" id="Fill-5" fill="#030000"></path>
+                                    <path d="M14.7879788,24.8530409 L11.5255983,24.8530409 L8.26200415,24.8530409 C8.4246377,33.4823286 4.46560302,35.2615882 4.46560302,35.2615882 C6.97549993,39.6211383 11.5255983,39.354128 11.5255983,39.354128 C11.5255983,39.354128 16.0744831,39.6211383 18.58438,35.2615882 C18.58438,35.2615882 14.626559,33.4823286 14.7879788,24.8530409" id="Fill-7" fill="#FFCAAB"></path>
+                                    <path d="M16.1355313,32.4113745 C15.4995613,31.1054514 14.9558312,29.2460887 14.8174713,26.631815 L11.4774151,26.631815 L8.23323985,26.631815 C8.15070939,28.2023211 7.92253695,29.5033895 7.61426141,30.5714307 C9.14471595,31.4792658 12.4180196,33.0279256 16.1355313,32.4113745" id="Fill-9" fill="#E3A37F"></path>
+                                    <path d="M2.91900649,16.267203 C2.91900649,16.267203 1.58274126,14.1456847 0.236766564,14.8787494 C-0.518144402,15.290188 0.549896836,21.0151318 3.18723048,20.5721374 C3.18723048,20.5721374 3.64478906,20.3888712 3.62051539,19.4579762 L2.91900649,16.267203 Z" id="Fill-11" fill="#FFCAAB"></path>
+                                    <path d="M0.898223921,15.5667864 C0.898223921,15.5667864 0.281672843,17.8193825 1.33636356,18.2781547 C1.33636356,18.2781547 1.89223048,18.4153009 1.8764526,18.6568239 C1.85824735,18.8971332 2.20050602,20.4809898 2.78186028,19.9336186 C2.78186028,19.9336186 3.2078631,19.1762803 2.60102148,18.9408258 C1.99417987,18.7065849 2.4116869,18.6689607 2.84254445,18.0596918 C2.84254445,18.0596918 1.79877687,15.3483234 0.898223921,15.5667864" id="Fill-13" fill="#E3A37F"></path>
+                                    <path d="M0.752339197,17.2070793 C0.662526639,16.8041365 0.594560378,16.3939115 0.639466658,15.963054 C0.655244539,15.8550362 0.674663471,15.7433773 0.736561315,15.6268637 C0.771758129,15.5091365 0.97929796,15.3841271 1.11887153,15.4278197 C1.23053039,15.4399565 1.38466816,15.5273417 1.4611302,15.5807438 C1.55215644,15.6474963 1.63711427,15.71789 1.71114894,15.794352 C2.02427922,16.0917044 2.27793901,16.426681 2.50732514,16.7822902 C2.6262661,16.9607016 2.71607865,17.1536772 2.7998228,17.353935 C2.87749852,17.5578337 2.96002898,17.7641599 2.93575532,18.0408797 L2.93090058,18.093068 L2.89084904,18.1367606 C2.74399337,18.288471 2.60199243,18.4680962 2.50611146,18.6367981 C2.48305147,18.675636 2.46484623,18.7205423 2.45877781,18.748457 C2.44785466,18.7872948 2.45756413,18.7678759 2.44906834,18.7787991 C2.47091464,18.7897222 2.46605991,18.7909359 2.56558193,18.8127822 L2.72942917,18.8661843 C2.78889965,18.9001674 2.85686591,18.9657063 2.91026797,19.0215357 C2.95517425,19.0810062 2.96852476,19.1477588 2.9952258,19.2096566 C3.02071314,19.3395207 3.02071314,19.4693848 2.98551633,19.5871121 C2.96488371,19.7084804 2.9005585,19.8189256 2.83137856,19.9135929 C2.7634123,20.0167559 2.65418081,20.0737991 2.55223142,20.1223464 C2.74763442,19.993696 2.83380593,19.7728056 2.85079749,19.5652658 C2.86414801,19.460889 2.83744698,19.357726 2.8071049,19.2691271 C2.76826703,19.1708187 2.71850602,19.1319809 2.66510396,19.089502 L2.49640199,19.0530915 C2.48669252,19.0530915 2.36653789,19.0494504 2.29007584,18.993621 C2.19662223,18.9305095 2.155357,18.7945769 2.17356225,18.7181149 C2.17963067,18.6331571 2.20269065,18.5688319 2.228178,18.506934 C2.33376844,18.2654111 2.48547884,18.0882133 2.64204398,17.9013061 L2.5971377,17.9959734 C2.60199243,17.6961936 2.38110208,17.3041739 2.18934013,16.9789068 C1.98665504,16.6378619 1.75241417,16.30774 1.48176281,16.0273792 C1.41622392,15.9569856 1.34097556,15.8950877 1.27179562,15.8344036 C1.18319674,15.771292 1.16499149,15.7348815 1.07396525,15.7081805 C1.01570846,15.6911889 0.999930575,15.6887616 0.950169563,15.7567278 C0.90769065,15.817412 0.87370752,15.9096519 0.851861222,16.0018918 C0.768117079,16.380561 0.754766564,16.7968544 0.752339197,17.2070793" id="Fill-15" fill="#975238"></path>
+                                    <path d="M1.21584482,17.7049321 C1.21584482,17.7049321 1.09933123,17.2825704 1.14302383,16.8250118 C1.15758803,16.5956257 1.25711005,16.3650259 1.37726469,16.2023923 C1.52897509,16.0701008 1.65398446,15.9936388 1.65398446,15.9936388 L1.7814212,16.3516753 C1.7814212,16.3516753 1.71830968,16.3832311 1.60179609,16.4305648 C1.50955616,16.5143089 1.38940152,16.6623783 1.32871736,16.8650634 C1.19885326,17.2595104 1.21584482,17.7049321 1.21584482,17.7049321" id="Fill-17" fill="#975238"></path>
+                                    <path d="M20.0978429,16.267203 C20.0978429,16.267203 21.4341082,14.1456847 22.7800829,14.8787494 C23.5349938,15.290188 22.4657389,21.0151318 19.8308326,20.5721374 C19.8308326,20.5721374 19.3684193,20.3888712 19.396334,19.4579762 L20.0978429,16.267203 Z" id="Fill-19" fill="#FFCAAB"></path>
+                                    <path d="M22.1186255,15.5667864 C22.1186255,15.5667864 22.7339629,17.8193825 21.6792722,18.2781547 C21.6792722,18.2781547 21.124619,18.4153009 21.1416105,18.6568239 C21.1598158,18.8971332 20.8163434,20.4809898 20.2362028,19.9336186 C20.2362028,19.9336186 19.8089863,19.1762803 20.415828,18.9408258 C21.0214559,18.7065849 20.6051625,18.6689607 20.1718776,18.0596918 C20.1718776,18.0596918 21.2180726,15.3483234 22.1186255,15.5667864" id="Fill-21" fill="#E3A37F"></path>
+                                    <path d="M22.2656026,17.2070793 C22.2619615,16.7968544 22.248611,16.380561 22.1636532,16.0018918 C22.1418069,15.9096519 22.1102511,15.817412 22.0677722,15.7567278 C22.0180112,15.6887616 22.0010196,15.6911889 21.9415491,15.7081805 C21.8505229,15.7348815 21.8335313,15.771292 21.7437188,15.8344036 C21.6733251,15.8950877 21.6017178,15.9569856 21.5349653,16.0273792 C21.2655276,16.30774 21.0288593,16.6378619 20.8273879,16.9789068 C20.6344123,17.3041739 20.413522,17.6961936 20.4195904,17.9959734 L20.3746841,17.9013061 C20.5312492,18.089427 20.6829596,18.2654111 20.7885501,18.506934 C20.8128237,18.5688319 20.8383111,18.6331571 20.8431658,18.7193286 C20.8601574,18.7945769 20.8188921,18.9317231 20.7266522,18.9948347 C20.6489765,19.0506641 20.5276082,19.0530915 20.5178987,19.0543052 L20.3528378,19.089502 C20.298222,19.1331946 20.2496747,19.1708187 20.2084095,19.2691271 C20.1792811,19.357726 20.1525801,19.460889 20.1671443,19.5664795 C20.1804948,19.7728056 20.2690936,19.993696 20.4644966,20.1223464 C20.3625473,20.0737991 20.2521021,20.0167559 20.1841358,19.9148066 C20.1161696,19.8201393 20.0518444,19.7096941 20.0299981,19.5883258 C19.9948012,19.4693848 19.9948012,19.3395207 20.0215023,19.2108703 C20.049417,19.1489724 20.0627675,19.0822199 20.1064601,19.0215357 C20.1598622,18.9657063 20.2278284,18.9001674 20.2872989,18.8661843 L20.4499324,18.8127822 C20.5506682,18.7909359 20.5470271,18.7897222 20.566446,18.7787991 C20.5591639,18.7678759 20.5688734,18.7872948 20.5567366,18.748457 C20.5518818,18.7205423 20.5336766,18.6768497 20.5106166,18.6367981 C20.413522,18.4680962 20.271521,18.288471 20.125879,18.1367606 L20.0858275,18.093068 L20.0809727,18.0408797 C20.0579128,17.7641599 20.1392295,17.5578337 20.218119,17.353935 C20.2994357,17.1536772 20.3928893,16.9607016 20.5094029,16.7822902 C20.7375754,16.426681 20.9924489,16.0917044 21.3043654,15.794352 C21.3808275,15.71789 21.4633579,15.6474963 21.5555979,15.5807438 C21.6308462,15.5273417 21.7861977,15.4399565 21.8978565,15.4278197 C22.0386438,15.3841271 22.2437563,15.5091365 22.2813804,15.6268637 C22.3408509,15.7433773 22.3626972,15.8550362 22.3760477,15.963054 C22.4221677,16.3939115 22.3542014,16.8041365 22.2656026,17.2070793" id="Fill-23" fill="#975238"></path>
+                                    <path d="M21.8022183,17.7049321 C21.8022183,17.7049321 21.8204235,17.2595104 21.6881321,16.8650634 C21.6298753,16.6623783 21.5072933,16.5143089 21.416267,16.4305648 C21.2985398,16.3832311 21.2366419,16.3516753 21.2366419,16.3516753 L21.3616513,15.9936388 C21.3616513,15.9936388 21.4866607,16.0701008 21.6383711,16.2011786 C21.7621668,16.3638122 21.8592614,16.594412 21.8738256,16.8250118 C21.9187319,17.2825704 21.8022183,17.7049321 21.8022183,17.7049321" id="Fill-25" fill="#975238"></path>
+                                    <path d="M10.789014,29.0168239 C10.789014,29.0168239 6.66249102,26.8273394 5.25097744,24.3963319 C4.08948259,22.6911069 2.30294088,14.8725596 2.15487153,13.5205165 C2.1500168,13.4768239 2.14394838,13.4319176 2.13909365,13.3870113 C2.1354526,13.3433187 2.13181155,13.3214724 2.13181155,13.3214724 L2.1354526,13.3214724 C2.11117893,13.043539 2.09540105,12.7595371 2.09540105,12.4755352 C2.09540105,7.26762052 6.31659131,3.04643027 11.524506,3.04643027 C16.7336344,3.04643027 20.9548247,7.26762052 20.9548247,12.4755352 C20.9548247,12.8141529 20.9366194,13.1491294 20.9002089,13.4768239 L20.9026363,13.4768239 C20.9026363,13.4768239 19.0711883,22.5272597 17.7992483,24.3963319 C16.3076316,27.1841622 12.2636391,29.0168239 12.2636391,29.0168239 C12.2636391,29.0168239 11.6919943,29.4391857 10.789014,29.0168239" id="Fill-27" fill="#FFCAAB"></path>
+                                    <path d="M2.92725953,15.9531018 C2.92725953,15.9531018 3.78169252,15.6193389 6.39475251,10.933308 C8.96411989,6.3298075 11.6851977,7.58354227 11.6851977,7.58354227 C11.6851977,7.58354227 14.5494901,5.7727269 19.8593542,15.4166538 C21.2065426,17.8585844 19.3508209,6.81770815 19.3508209,6.81770815 L10.607447,6.15989184 L3.37146759,7.10171003 C3.37146759,7.10171003 1.71114894,14.8328722 2.92725953,15.9531018" id="Fill-29" fill="#E3A37F"></path>
+                                    <path d="M9.24812177,16.6867733 C9.24812177,16.6867733 9.39255007,16.5726871 9.32701117,16.3165999 C9.2602586,16.0617264 6.93605522,14.1174059 5.38618175,16.4889429 C5.38618175,16.4889429 7.58537575,18.6347349 9.24812177,16.6867733" id="Fill-31" fill="#F0F0ED"></path>
+                                    <path d="M8.57610536,16.3619917 C8.57610536,16.9093628 8.13068362,17.3523572 7.58573985,17.3523572 C7.03715504,17.3523572 6.59537434,16.9093628 6.59537434,16.3619917 C6.59537434,15.8146205 7.03715504,15.3728398 7.58573985,15.3728398 C8.13068362,15.3728398 8.57610536,15.8146205 8.57610536,16.3619917" id="Fill-33" fill="#2C1117"></path>
+                                    <path d="M8.051066,16.3619917 C8.051066,16.6192925 7.84231249,16.828046 7.58501164,16.828046 C7.32649712,16.828046 7.12017097,16.6192925 7.12017097,16.3619917 C7.12017097,16.1046908 7.32649712,15.8959373 7.58501164,15.8959373 C7.84231249,15.8959373 8.051066,16.1046908 8.051066,16.3619917" id="Fill-35" fill="#040000"></path>
+                                    <path d="M6.19619393,17.0791571 C5.90005522,16.9189509 5.60877125,16.75389 5.32598306,16.5730512 L5.23738418,16.5160081 L5.30170939,16.4322639 C5.42671877,16.2574935 5.52138606,16.0572358 5.67795119,15.899457 C5.81873845,15.7283276 5.99472252,15.5911814 6.1840571,15.4673858 C6.27386966,15.3982058 6.3867422,15.3654364 6.48626422,15.3120343 C6.58821361,15.2574186 6.69987247,15.2355723 6.81153132,15.2064439 C7.02999431,15.1433323 7.26787622,15.1457597 7.4863392,15.1724607 C7.93540199,15.2258628 8.35655007,15.3848553 8.71458662,15.6360877 C8.89421174,15.7610971 9.06655475,15.8909612 9.21098306,16.0548084 C9.27409459,16.1324842 9.37483029,16.2307925 9.37968503,16.3570156 C9.38211239,16.4771702 9.34327453,16.5766922 9.30565035,16.6750006 C9.30807772,16.5706238 9.31050508,16.4613923 9.28987247,16.3715798 C9.26438512,16.2878356 9.18428203,16.2380746 9.10296525,16.1725357 C8.94275907,16.04874 8.76920237,15.9407222 8.58836356,15.8484823 C8.2242586,15.6761393 7.84558943,15.5329246 7.4572108,15.5062236 C7.26423517,15.4868047 7.07125953,15.5110783 6.885566,15.5462752 C6.79453976,15.5693351 6.69623142,15.5802583 6.61127359,15.6251646 C6.52510208,15.6664298 6.42922111,15.6882761 6.3503317,15.7441055 C6.17920237,15.8412002 6.02627828,15.9625685 5.88427734,16.1009284 C5.72649852,16.2235104 5.61483967,16.3970671 5.47405241,16.5451365 L5.44735138,16.4043492 C5.70586591,16.6167438 5.95345729,16.8461299 6.19619393,17.0791571" id="Fill-37" fill="#030000"></path>
+                                    <path d="M7.39203601,16.0230099 C7.39203601,16.1540877 7.28765925,16.2596782 7.15900883,16.2596782 C7.02671736,16.2596782 6.9223406,16.1540877 6.9223406,16.0230099 C6.9223406,15.8943595 7.02671736,15.7887691 7.15900883,15.7887691 C7.28765925,15.7887691 7.39203601,15.8943595 7.39203601,16.0230099" id="Fill-39" fill="#F0F0ED"></path>
+                                    <path d="M5.60233873,16.3619917 C5.60233873,16.3619917 5.27828531,16.9943206 4.62289637,16.4954968 C4.62289637,16.4954968 5.07560021,16.6362841 5.62418503,15.9578351 L5.60233873,16.3619917 Z" id="Fill-41" fill="#030000"></path>
+                                    <path d="M4.75967847,15.8749406 C4.75967847,15.8749406 5.02668878,16.0096594 5.3070496,15.9829584 C5.59105147,15.9708216 5.8131555,15.8094017 5.8131555,15.8094017 L5.90296806,15.9635395 C5.9005407,15.9623258 5.61168409,16.1091814 5.30583592,16.0703436 C4.99998774,16.0521383 4.75967847,15.8749406 4.75967847,15.8749406" id="Fill-43" fill="#030000"></path>
+                                    <path d="M5.2242764,15.4778234 C5.2242764,15.4741824 5.27403742,15.5190887 5.36749102,15.5470034 C5.45123517,15.590696 5.57381717,15.6076875 5.70004023,15.6101149 C5.82019487,15.6416707 5.93792214,15.5688497 6.02287997,15.5567128 C6.10905147,15.5336529 6.1648809,15.517875 6.1648809,15.517875 L6.22677875,15.6853633 C6.22677875,15.6853633 6.15881249,15.6926454 6.05443573,15.7035685 C5.95370002,15.7023548 5.81898118,15.7533295 5.69033076,15.6999275 C5.55561192,15.6720127 5.4342436,15.6307475 5.35292683,15.5700634 C5.26554163,15.5263708 5.22549009,15.4753961 5.2242764,15.4778234" id="Fill-45" fill="#030000"></path>
+                                    <path d="M9.99490105,13.5933375 C9.99490105,13.5933375 9.57375297,14.0290498 7.91586169,13.3675924 C6.08684107,12.6405962 4.42894979,13.1224284 4.26631624,13.3069082 C4.26631624,13.3069082 6.85752992,11.3249635 9.99490105,13.5933375" id="Fill-47" fill="#030000"></path>
+                                    <path d="M13.670298,16.6867733 C13.670298,16.6867733 13.5258697,16.5726871 13.5926222,16.3165999 C13.6569474,16.0617264 15.9823645,14.1174059 17.5334517,16.4889429 C17.5334517,16.4889429 15.333044,18.6347349 13.670298,16.6867733" id="Fill-49" fill="#F0F0ED"></path>
+                                    <path d="M14.343528,16.3619917 C14.343528,16.9093628 14.7877361,17.3523572 15.3326799,17.3523572 C15.8836921,17.3523572 16.3242591,16.9093628 16.3242591,16.3619917 C16.3242591,15.8146205 15.8836921,15.3728398 15.3326799,15.3728398 C14.7877361,15.3728398 14.343528,15.8146205 14.343528,16.3619917" id="Fill-51" fill="#2C1117"></path>
+                                    <path d="M14.8697811,16.3619917 C14.8697811,16.6192925 15.0773209,16.828046 15.3334081,16.828046 C15.5919226,16.828046 15.7994624,16.6192925 15.7994624,16.3619917 C15.7994624,16.1046908 15.5919226,15.8959373 15.3334081,15.8959373 C15.0773209,15.8959373 14.8697811,16.1046908 14.8697811,16.3619917" id="Fill-53" fill="#040000"></path>
+                                    <path d="M16.7222258,17.0791571 C16.9673898,16.8461299 17.2149812,16.6167438 17.4747094,16.4043492 L17.4467947,16.5451365 C17.3060074,16.3970671 17.1943486,16.2235104 17.0365698,16.1009284 C16.8909278,15.9625685 16.7392174,15.8412002 16.568088,15.7441055 C16.491626,15.6882761 16.3933176,15.6664298 16.3071461,15.6251646 C16.2221883,15.5802583 16.1263073,15.5693351 16.0340674,15.5462752 C15.8483739,15.5110783 15.6566119,15.4868047 15.4624226,15.5062236 C15.074044,15.5329246 14.6965885,15.6761393 14.3300562,15.8472686 C14.150431,15.9407222 13.974447,16.04874 13.8166682,16.171322 C13.7353514,16.2380746 13.656462,16.2866219 13.6321883,16.3715798 C13.6091283,16.4613923 13.610342,16.5706238 13.6151967,16.6750006 C13.5751452,16.5766922 13.537521,16.4771702 13.5399484,16.3570156 C13.5435894,16.2307925 13.6431115,16.1324842 13.7074367,16.0548084 C13.851865,15.8897475 14.0254217,15.7598834 14.2050468,15.6360877 C14.5618697,15.3848553 14.9842314,15.2258628 15.4320805,15.1724607 C15.6541846,15.1457597 15.8884254,15.144546 16.1081021,15.2064439 C16.2197609,15.2367859 16.3338472,15.2574186 16.4333692,15.3120343 C16.5341049,15.3654364 16.6445501,15.3982058 16.7343626,15.4673858 C16.9236972,15.5911814 17.100895,15.7283276 17.2416822,15.899457 C17.3970337,16.0572358 17.495342,16.2574935 17.6203514,16.4322639 L17.6810355,16.5160081 L17.591223,16.5730512 C17.3096485,16.75389 17.0183645,16.9189509 16.7222258,17.0791571" id="Fill-55" fill="#030000"></path>
+                                    <path d="M15.52517,16.0230099 C15.52517,16.1540877 15.6319742,16.2596782 15.7618383,16.2596782 C15.8917024,16.2596782 15.9972928,16.1540877 15.9972928,16.0230099 C15.9972928,15.8943595 15.8917024,15.7887691 15.7618383,15.7887691 C15.6319742,15.7887691 15.52517,15.8943595 15.52517,16.0230099" id="Fill-57" fill="#F0F0ED"></path>
+                                    <path d="M17.3185084,16.3619917 C17.3185084,16.3619917 17.6401344,16.9943206 18.296737,16.4954968 C18.296737,16.4954968 17.8440332,16.6362841 17.2942347,15.9578351 L17.3185084,16.3619917 Z" id="Fill-59" fill="#030000"></path>
+                                    <path d="M18.1599549,15.8749406 C18.1599549,15.8749406 17.9196457,16.0521383 17.6125838,16.0703436 C17.3079493,16.1091814 17.017879,15.9623258 17.017879,15.9635395 L17.1064779,15.8094017 C17.1064779,15.8094017 17.3273683,15.9708216 17.6125838,15.9829584 C17.8917309,16.0096594 18.1599549,15.8749406 18.1599549,15.8749406" id="Fill-61" fill="#030000"></path>
+                                    <path d="M17.6977844,15.4778234 C17.695357,15.4753961 17.6540918,15.5263708 17.5679203,15.5700634 C17.4853898,15.6307475 17.3640215,15.6720127 17.23173,15.6999275 C17.1018659,15.7533295 16.9671471,15.7023548 16.863984,15.7035685 C16.7620346,15.6926454 16.6940683,15.6853633 16.6940683,15.6853633 L16.7547525,15.517875 C16.7547525,15.517875 16.8117956,15.5336529 16.8967534,15.5567128 C16.9817113,15.5688497 17.0994385,15.6416707 17.2195932,15.6101149 C17.3433889,15.6076875 17.4683982,15.590696 17.5533561,15.5470034 C17.645596,15.5190887 17.695357,15.4741824 17.6977844,15.4778234" id="Fill-63" fill="#030000"></path>
+                                    <path d="M12.9247324,13.5933375 C12.9247324,13.5933375 13.3483078,14.0290498 15.002558,13.3675924 C16.8327923,12.6405962 18.4906836,13.1224284 18.6545309,13.3069082 C18.6545309,13.3069082 16.0621035,11.3249635 12.9247324,13.5933375" id="Fill-65" fill="#030000"></path>
+                                    <path d="M11.365028,21.8117934 C11.365028,21.8117934 10.2824226,21.3481664 10.2435847,21.660083 C10.2023195,21.9719996 10.8431443,22.1188553 11.365028,21.8117934" id="Fill-67" fill="#975238"></path>
+                                    <path d="M11.6850763,21.8117934 C11.6850763,21.8117934 12.7676817,21.3481664 12.8077333,21.660083 C12.8489985,21.9719996 12.2081738,22.1188553 11.6850763,21.8117934" id="Fill-69" fill="#975238"></path>
+                                    <path d="M8.78947087,23.641785 C8.78947087,23.641785 10.5930041,22.5980174 11.5263265,22.9354214 C11.5263265,22.9354214 12.4195974,22.6101543 14.2631822,23.641785 C14.2631822,23.641785 13.6162891,25.3324457 11.6743959,25.3336594 C9.51889449,25.3336594 8.78947087,23.641785 8.78947087,23.641785" id="Fill-71" fill="#EE3A52"></path>
+                                    <path d="M14.2569924,23.650038 C14.2606335,23.646397 14.2630608,23.6415423 14.2630608,23.6415423 C14.2290777,23.6245507 14.201163,23.6112002 14.1696072,23.5942086 C12.8491199,23.2349584 11.5262052,23.2337447 11.5262052,23.2337447 C11.1560318,23.1427185 9.60130358,23.4364298 8.91435888,23.5747897 C8.83425579,23.6172686 8.78934951,23.6415423 8.78934951,23.6415423 C8.78934951,23.6415423 8.79056319,23.646397 8.79420424,23.650038 L14.2569924,23.650038 Z" id="Fill-73" fill="#B52744"></path>
+                                    <path d="M8.94239496,23.73536 C8.94239496,23.73536 9.93518784,24.8713675 11.6027886,24.8106833 C13.2412609,24.7536402 14.1102581,23.9101304 14.2631822,23.6419064 L8.94239496,23.73536 Z" id="Fill-75" fill="#B52744"></path>
+                                    <path d="M11.5262052,23.5315826 C10.8331921,23.44177 8.78934951,23.6420277 8.78934951,23.6420277 C10.1911536,24.5316575 11.5262052,24.4430587 11.5262052,24.4430587 C11.5262052,24.4430587 12.8588294,24.5316575 14.2630608,23.6420277 C14.2630608,23.6420277 12.2180046,23.44177 11.5262052,23.5315826" id="Fill-77" fill="#55010E"></path>
+                                    <path d="M9.94744604,24.1893989 C10.8455716,24.4867513 11.5264479,24.4430587 11.5264479,24.4430587 C11.5264479,24.4430587 12.1964011,24.4855376 13.0836035,24.1954673 C11.6089784,23.5631383 10.4353467,23.955158 9.94744604,24.1893989" id="Fill-79" fill="#F06362"></path>
+                                    <path d="M13.3206358,24.5485277 C13.3206358,24.5485277 12.0511232,24.8689401 12.2562356,25.0485652 C12.4589207,25.2306177 13.5937145,24.5788698 13.3206358,24.5485277" id="Fill-81" fill="#F27F93"></path>
+                                    <path d="M12.0915388,25.0818201 C12.0915388,25.0818201 12.1230946,24.8123825 11.2528837,24.998076 C10.3814592,25.1801285 12.2650955,25.3718904 12.0915388,25.0818201" id="Fill-83" fill="#F27F93"></path>
+                                    <path d="M3.37171033,20.466547 C3.37171033,20.8537119 3.05736638,21.1680559 2.66898774,21.1680559 C2.2818228,21.1680559 1.96869252,20.8537119 1.96869252,20.466547 C1.96869252,20.079382 2.2818228,19.7674654 2.66898774,19.7674654 C3.05736638,19.7674654 3.37171033,20.079382 3.37171033,20.466547" id="Fill-85" fill="#EA882D"></path>
+                                    <path d="M3.08491699,20.466547 C3.08491699,20.6959331 2.90043714,20.884054 2.66862364,20.884054 C2.43923751,20.884054 2.25111661,20.6959331 2.25111661,20.466547 C2.25111661,20.2371608 2.43923751,20.0490399 2.66862364,20.0490399 C2.90043714,20.0490399 3.08491699,20.2371608 3.08491699,20.466547" id="Fill-87" fill="#B06226"></path>
+                                    <path d="M21.0140524,20.466547 C21.0140524,20.8537119 20.7021358,21.1680559 20.3149709,21.1680559 C19.9265922,21.1680559 19.6122483,20.8537119 19.6122483,20.466547 C19.6122483,20.079382 19.9265922,19.7674654 20.3149709,19.7674654 C20.7021358,19.7674654 21.0140524,20.079382 21.0140524,20.466547" id="Fill-89" fill="#EA882D"></path>
+                                    <path d="M20.7295651,20.466547 C20.7295651,20.6959331 20.5450852,20.884054 20.3144854,20.884054 C20.0838856,20.884054 19.8957647,20.6959331 19.8957647,20.466547 C19.8957647,20.2371608 20.0838856,20.0490399 20.3144854,20.0490399 C20.5450852,20.0490399 20.7295651,20.2371608 20.7295651,20.466547" id="Fill-91" fill="#B06226"></path>
+                                    <path d="M1.96844979,15.3248993 C1.96844979,15.3248993 2.76219862,16.939098 3.62027266,14.4862442 C4.35333732,12.4035638 8.78934951,4.20149259 11.5249915,6.95898088 L11.5249915,1.59207366 C11.5249915,1.59207366 11.1718097,-0.216314341 9.32701117,0.0215675711 C7.30501492,0.280082098 -0.279291543,1.68188622 1.57157537,14.935307 L1.96844979,15.3248993 Z" id="Fill-93" fill="#030000"></path>
+                                    <path d="M21.0815332,15.3248993 C21.0815332,15.3248993 20.2889981,16.939098 19.427283,14.4862442 C18.699073,12.4035638 14.2606335,4.20270628 11.5249915,6.95898088 L11.5249915,1.59207366 C11.5249915,1.59207366 11.8781733,-0.216314341 13.7241855,0.0215675711 C15.7449681,0.280082098 23.1799915,1.85908397 21.4784076,14.935307 L21.0815332,15.3248993 Z" id="Fill-95" fill="#030000"></path>
+                                    <path d="M11.5249915,6.95958772 L11.5249915,1.59146682 C11.5249915,1.59146682 11.4995041,1.46160272 11.4278968,1.2746955 C11.3987684,1.47252587 11.3647853,1.60845839 11.3647853,1.60845839 C8.86095682,0.584109745 7.15815925,2.2298642 7.15815925,2.2298642 C10.3210177,1.47252587 11.0188856,3.56491574 11.0188856,3.56491574 C9.28453226,3.119494 7.86209552,4.27613411 7.86209552,4.27613411 C10.266402,3.80765239 11.3647853,5.5213731 11.3647853,5.5213731 C8.41068034,4.05524377 5.1215988,9.9707358 5.1215988,9.9707358 C5.36312177,8.67937685 6.92270471,6.15977048 6.92270471,6.15977048 C5.17864192,7.82008913 3.37146759,11.9720994 3.37146759,11.9720994 C4.39217519,6.63310693 6.59501024,3.60860834 6.59501024,3.60860834 C2.25973376,7.30063271 2.25123798,13.8690863 2.25123798,13.8690863 C1.44171127,9.30199634 2.73913864,5.2033881 3.74528203,2.88646682 C1.95874032,4.97400197 0.68558662,8.60170112 1.57157537,14.9347002 L1.96844979,15.3255062 C1.96844979,15.3255062 2.76219862,16.9397049 3.62027266,14.4856374 C4.35333732,12.402957 8.78934951,4.20209944 11.5249915,6.95958772" id="Fill-97" fill="#000000"></path>
+                                    <path d="M21.7097356,12.2647185 C21.4767085,11.03283 21.0142951,9.98542137 21.0142951,9.98542137 C21.3686907,11.3483876 21.1939203,13.573069 21.1939203,13.573069 C20.566446,9.63102587 18.0201386,6.42568847 18.0201386,6.42568847 C19.2350355,8.17703336 20.689028,13.8692077 20.298222,13.8692077 C19.907416,13.8692077 16.9520974,8.05809241 15.9969287,6.56526204 C15.0466147,5.07243168 12.2320833,5.71568378 12.2320833,5.71568378 C13.2673551,4.11362193 15.141282,4.64885623 15.141282,4.64885623 C13.451835,3.52134452 12.0281846,4.08449353 12.0281846,4.08449353 C13.0695248,2.48121799 16.1814086,4.08449353 16.1814086,4.08449353 C14.1933954,2.03700993 12.0281846,2.51277376 12.0281846,2.51277376 C13.183611,1.49206617 15.333044,2.51277376 15.333044,2.51277376 C14.0246935,1.3452105 12.0136204,1.74208491 11.524506,1.86102587 L11.524506,6.95970909 C14.260148,4.2022208 18.6998012,12.4030783 19.4267975,14.4857588 C20.2885126,16.9398262 21.0810477,15.3244139 21.0810477,15.3244139 L21.4791358,14.9348216 C21.6029315,13.9857213 21.6781799,13.0973052 21.7097356,12.2647185" id="Fill-99" fill="#000000"></path>
+                                    <path d="M9.33829843,23.59433 L9.33829843,23.59433 C9.33829843,23.59433 11.6807071,24.5058061 13.5728392,23.5834068 C12.9150229,23.5312185 11.9586405,23.475389 11.5265693,23.5312185 C11.0617286,23.4705343 9.99368737,23.5421416 9.33829843,23.59433" id="Fill-101" fill="#FFFFFF"></path>
+                                </g>
+                                <g id="Group-9" transform="translate(51.958763, 42.899927)">
+                                    <path d="M18.4017613,31.7884763 C18.3940446,31.7954148 18.2386087,31.7008771 17.9630131,31.5265461 C17.8274201,31.4380796 17.6587556,31.3305321 17.4537125,31.2169134 C17.2497717,31.1015601 17.0259881,30.9610545 16.7581092,30.8300894 C16.4957422,30.6913184 16.206918,30.5421397 15.8828176,30.3990321 C15.5664338,30.2463841 15.2103643,30.1084805 14.8410662,29.9584344 C14.0881391,29.6739539 13.2382023,29.4007486 12.317713,29.1804497 C11.3939166,28.9670894 10.4921678,28.8283185 9.66538101,28.7407193 C9.25088524,28.7068939 8.85843712,28.6678645 8.48693426,28.6600587 C8.11653378,28.6383757 7.77038572,28.639243 7.45510436,28.6409777 C7.13872062,28.6349064 6.85430597,28.6565894 6.60406517,28.663528 C6.35161961,28.6704665 6.13775743,28.6878129 5.96137625,28.7025573 C5.60971627,28.7311788 5.41349221,28.7415866 5.41237113,28.7329134 C5.41018506,28.7242402 5.60310198,28.6964861 5.95365957,28.6531201 C6.12893837,28.6288352 6.34390293,28.6054176 6.59634849,28.5915405 C6.84879405,28.5767961 7.13431109,28.5499092 7.45179721,28.5499092 C7.77038572,28.5412361 8.11873855,28.5351648 8.49354855,28.5525112 C8.86835856,28.5551132 9.26521621,28.5906732 9.68522389,28.622764 C10.5197273,28.7034246 11.4325,28.8404609 12.3640131,29.0564232 C13.2955262,29.2784567 14.1531796,29.5586006 14.9072092,29.8508869 C15.2798144,30.0061369 15.6369863,30.1475098 15.9522677,30.3070964 C16.2763681,30.4545405 16.5640899,30.6106578 16.8231497,30.7546327 C17.0899263,30.891669 17.3104028,31.0382458 17.509934,31.1588031 C17.7116699,31.2793603 17.8737201,31.3921117 18.0049036,31.4875168 C18.268373,31.6757249 18.409478,31.782405 18.4017613,31.7884763" id="Fill-267" fill="#FAFAFA"></path>
+                                    <path d="M0.439297647,21.4831061 L2.54313701,10.4621366 C3.4891139,7.17561305 4.61023286,4.01822431 6.49484536,3.64450305 L6.49484536,4.66133274 L5.68835287,29.6238845 C5.68835287,29.6238845 4.39214604,29.684654 0.187521289,27.6522513 C0.0407231279,27.0518146 -0.019886019,26.4382112 0.00569384897,25.811441 C0.0360642827,25.06729 0.180598882,23.6245117 0.439297647,21.4831061 Z" id="Fill-269" fill="#4EA7FF"></path>
+                                    <path d="M38.7986611,9.93747718 C39.7340051,12.1284341 45.8679838,28.4457556 45.8679838,28.4457556 L34.8916727,29.4826726 L5.41237113,38.2836783 L5.61823126,26.6656945 L5.89904559,3.55568327 C5.89904559,3.55568327 9.19116176,-0.931765035 14.6617517,0.198260296 C14.768398,0.220289559 15.8402849,4.04111639 19.1522214,4.07294008 C23.4118779,4.1138702 24.6049788,0.562669606 24.6049788,0.562669606 C29.5530117,1.33126106 36.2354386,3.93783688 38.7986611,9.93747718 Z" id="Fill-271" fill="#AA6CE5"></path>
+                                    <circle id="Oval" fill="#E8D7F8" cx="21" cy="18" r="1"></circle>
+                                    <circle id="Oval" fill="#E8D7F8" cx="21" cy="12" r="1"></circle>
+                                    <circle id="Oval" fill="#E8D7F8" cx="31" cy="18" r="1"></circle>
+                                    <circle id="Oval" fill="#E8D7F8" cx="25" cy="6" r="1"></circle>
+                                    <circle id="Oval" fill="#E8D7F8" cx="17" cy="6" r="1"></circle>
+                                    <circle id="Oval" fill="#E8D7F8" cx="16" cy="11" r="1"></circle>
+                                    <circle id="Oval" fill="#E8D7F8" cx="13" cy="21" r="1"></circle>
+                                    <circle id="Oval" fill="#E8D7F8" cx="32" cy="7" r="1"></circle>
+                                    <circle id="Oval" fill="#E8D7F8" cx="31" cy="12" r="1"></circle>
+                                    <circle id="Oval" fill="#E8D7F8" cx="36" cy="13" r="1"></circle>
+                                    <circle id="Oval" fill="#E8D7F8" cx="37" cy="19" r="1"></circle>
+                                    <circle id="Oval" fill="#E8D7F8" cx="36" cy="24" r="1"></circle>
+                                    <circle id="Oval" fill="#E8D7F8" cx="42" cy="25" r="1"></circle>
+                                    <circle id="Oval" fill="#E8D7F8" cx="26" cy="24" r="1"></circle>
+                                    <circle id="Oval" fill="#E8D7F8" cx="18" cy="22" r="1"></circle>
+                                    <circle id="Oval" fill="#E5EDF5" cx="28" cy="30" r="1"></circle>
+                                    <circle id="Oval" fill="#E5EDF5" cx="21" cy="31" r="1"></circle>
+                                    <path d="M28.1443299,16.6341938 C28.6401196,21.5982672 29.2120174,23.1320464 29.7078071,28.0969917 C29.7545592,28.5661067 29.8045731,29.0439413 30.0339846,29.4773058 C30.2633961,29.9097984 30.7091719,30.2969491 31.2843315,30.3902489 C32.1639233,30.5341224 33.3077189,31.0442196 33.556701,30.3518826 L32.7216868,25.570921 C32.7216868,25.570921 32.5238058,24.6719293 31.8964578,23.5532035 C30.0426826,20.2519595 29.3555355,20.0592562 28.1443299,16.6341938" id="Fill-273" fill="#000000" opacity="0.3"></path>
+                                    <path d="M5.95306701,13.3867711 C5.99853093,13.3867711 6.03425258,17.2643167 6.03425258,22.0452582 C6.03425258,26.8296843 5.99853093,30.7063587 5.95306701,30.7063587 C5.90868557,30.7063587 5.87296392,26.8296843 5.87296392,22.0452582 C5.87296392,17.2643167 5.90868557,13.3867711 5.95306701,13.3867711" id="Fill-277" fill="#2E353A"></path>
+                                    <path d="M34.6388653,29.6238845 C34.6360755,29.6245774 34.6249166,29.6088188 34.6053884,29.5780179 C34.5830705,29.5407702 34.5551731,29.4942107 34.5216962,29.437623 C34.4463732,29.3065399 34.3431529,29.1253159 34.2120351,28.8960997 C33.9432902,28.415462 33.5638856,27.7342601 33.0952093,26.8961883 C32.1615764,25.1964069 30.8782962,22.8619832 29.4611084,20.2825846 C28.7562341,18.9889457 28.0857667,17.7576249 27.4748137,16.6358981 C27.150274,16.0821977 26.9345341,15.5141713 26.817365,14.9805273 C26.6946165,14.4454508 26.6453311,13.9397425 26.6397516,13.4777286 C26.6276627,12.5544171 26.807136,11.8080318 27.0470536,11.3252452 C27.0768108,11.265076 27.1028484,11.2070556 27.1316757,11.1547657 C27.1642227,11.1039083 27.1949098,11.0551999 27.2237371,11.0107892 C27.2795319,10.9205354 27.3306771,10.8460401 27.3836822,10.7916012 C27.4301779,10.7400276 27.4673744,10.6984822 27.4971316,10.6640997 C27.5240991,10.636164 27.5380478,10.6225543 27.5399076,10.6238845 C27.5594358,10.6318662 27.3148686,10.8546357 27.0991288,11.3395712 C26.8759496,11.8209253 26.7141447,12.5615801 26.7383224,13.4770123 C26.7708694,14.3874304 26.9326743,15.4948312 27.5929127,16.5972179 C28.2066554,17.7182283 28.8817724,18.9488328 29.5885065,20.2403229 C30.9917456,22.8247355 32.2610771,25.1634571 33.1863408,26.86682 C33.6373487,27.7106221 34.0028046,28.3961218 34.2622504,28.8803411 C34.3831391,29.1124225 34.4779903,29.2957954 34.5477338,29.4297436 C34.5765611,29.4884803 34.5998089,29.5350398 34.6193371,29.5737201 C34.6342157,29.6066699 34.6407251,29.6231448 34.6388653,29.6238845" id="Fill-279" fill="#2E353A"></path>
+                                    <path d="M5.41025294,20.9639031 C5.38613797,20.9719864 5.25350562,20.718169 4.97216428,20.3398679 C4.69383731,19.9607585 4.24570074,19.4652488 3.63478812,19.0061141 C3.0228707,18.5485962 2.3767904,18.2236452 1.88846222,18.0264113 C1.39912924,17.8275608 1.07458191,17.7394522 1.08262023,17.7184355 C1.08563461,17.7111604 1.16903222,17.7265188 1.318746,17.7612772 C1.46845979,17.7952273 1.67946579,17.8582775 1.93367779,17.9496194 C2.44310658,18.12907 3.11330184,18.4507875 3.73828154,18.9180055 C4.36125165,19.3860319 4.80536905,19.90175 5.0656098,20.2970261 C5.19623256,20.49426 5.28967808,20.6599689 5.34092239,20.7779859 C5.39417629,20.8951945 5.42030084,20.9606697 5.41025294,20.9639031" id="Fill-287" fill="#FAFAFA"></path>
+                                    <path d="M46.4008511,30.3927086 C47.3380289,34.4593154 43.6315421,38.2415863 38.6665594,38.2836783 L16.2371134,38.0749361 L16.8261966,32.0171179 L36.0568796,29.6238845" id="Fill-293" fill="#AA8776"></path>
+                                    <path d="M17.3195876,32.2490216 C17.2152083,32.2772492 15.9031598,31.7956703 14.7268044,31.3491621 C13.4773835,30.876137 12.1079263,30.6580152 10.7332502,30.7153256 L5.31491775,30.9411459 C5.31491775,30.9411459 5.64893169,31.673351 6.22406195,31.9342419 C6.79919221,32.1951327 10.1675141,32.2507324 10.1675141,32.2507324 L9.99528813,32.396147 C9.2855085,32.9949129 8.31686807,33.3421971 7.29812554,33.3635816 L6.78040393,33.3738461 C6.39628789,33.3490401 6.01634703,33.2883081 5.64893169,33.193361 L4.31287592,32.7502742 C3.90788402,32.6005828 3.48097244,32.6245334 3.30457133,32.9589869 C3.14591471,33.260936 3.26281959,33.6766506 4.36610939,34.1317127 C4.98299139,34.3866159 7.26994311,35.0349938 7.26994311,35.0349938 C7.26994311,35.0349938 7.30334451,35.5524986 7.40354869,35.8262201 C7.50375287,36.0982309 8.40141535,36.3710971 8.40141535,36.3710971 C8.40141535,36.3710971 8.96715146,37.3265563 9.20096122,37.5438228 C9.30429679,37.6421915 10.1194996,37.8500488 10.9848044,38.0484969 C12.3834878,38.3701197 13.8625433,38.3624213 15.2539201,38.0219801 L17.3195876,37.5164507 L17.3195876,32.3619318" id="Fill-295" fill="#AA8776"></path>
+                                    <path d="M10.8247423,35.9456911 C10.8209996,35.9824953 10.0588046,35.9478561 9.15160664,35.7378561 C8.24316933,35.530021 7.56029216,35.2334231 7.57764294,35.2009489 C7.59623307,35.1608973 8.29893969,35.3979592 9.19374426,35.6025468 C10.0848308,35.8082169 10.829675,35.9045571 10.8247423,35.9456911" id="Fill-297" fill="#996552"></path>
+                                    <path d="M9.74226804,36.8517936 C9.74226804,36.8885977 9.4809534,36.9124121 9.17284472,36.7944224 C8.86395602,36.6796801 8.6471099,36.4750925 8.66037028,36.4437008 C8.67441067,36.4079791 8.90373714,36.5497832 9.19936547,36.6591131 C9.49421378,36.7716905 9.74382081,36.811742 9.74226804,36.8517936" id="Fill-299" fill="#996552"></path>
+                                    <path d="M10.8241073,31.7893728 C10.8354263,31.7969094 10.6948816,31.8937259 10.4458628,32.0380811 C10.1959007,32.1806971 9.83369154,32.3714316 9.37904356,32.5343384 C8.92345232,32.6972453 8.46408808,32.7888442 8.12923324,32.8311652 C7.79154864,32.8729065 7.5793167,32.8758052 7.57743019,32.8676889 C7.56611115,32.8398613 8.4254147,32.7917429 9.31678885,32.4694076 C9.76106105,32.3099791 10.1261,32.1291003 10.3883243,31.9974994 C10.6496054,31.8653187 10.811845,31.7812564 10.8241073,31.7893728" id="Fill-301" fill="#996552"></path>
+                                    <g id="Group-305" transform="translate(18.402062, 26.376462)">
+                                        <mask id="mask-4" fill="white">
+                                            <use xlink:href="#path-3"></use>
+                                        </mask>
+                                        <g id="Clip-304"></g>
+                                        <path d="M0.528092187,4.90601525 L0,11.9010774 L20.4807926,11.9072165 C21.8714021,11.9072165 23.2360562,11.5757053 24.4270089,10.9477634 C27.1942519,9.48753539 28.6227962,6.6617969 27.999867,3.87990909 C27.7882308,2.7432992 27.2960769,1.41550029 26.6771408,0 L16.3808406,1.48916945 L16.7102743,2.61525518 L0.528092187,4.90601525 Z" id="Fill-303" fill="#AA6CE5" mask="url(#mask-4)"></path>
+                                    </g>
+                                    <circle id="Oval" fill="#E8D7F8" cx="23" cy="34" r="1"></circle>
+                                    <path d="M32.0412371,38.1000725 C32.0412371,37.5477878 31.5935219,37.1000725 31.0412371,37.1000725 C30.4889524,37.1000725 30.0412371,37.5477878 30.0412371,38.1000725 C30.0412371,38.6523573 32.0412371,38.6523573 32.0412371,38.1000725 Z" id="Oval" fill="#E8D7F8"></path>
+                                    <circle id="Oval" fill="#E8D7F8" cx="41" cy="34" r="1"></circle>
+                                    <circle id="Oval" fill="#E8D7F8" cx="35" cy="33" r="1"></circle>
+                                    <circle id="Oval" fill="#E8D7F8" cx="43" cy="30" r="1"></circle>
+                                    <path d="M40.0515464,28.543127 C40.0526366,28.5481627 39.9744178,28.5642769 39.8234884,28.5914696 C39.6571357,28.6186623 39.4379026,28.6539121 39.1635859,28.6992333 C38.5719871,28.7898756 37.7457318,28.9157678 36.7321919,29.0698598 C34.6599436,29.372001 31.8286421,29.7839201 28.698787,30.2401533 C25.5667286,30.6772509 22.7310204,31.0750702 20.6576704,31.3651257 C19.6408255,31.5000821 18.8123669,31.6098601 18.217463,31.6884168 C17.9420446,31.7216523 17.7206082,31.748845 17.5531538,31.7689878 C17.4000211,31.7861091 17.3195876,31.7921519 17.3195876,31.7871162 C17.3184973,31.7820805 17.3978178,31.7649592 17.5476454,31.7387736 C17.7150998,31.7115809 17.9343329,31.675324 18.207548,31.6300028 C18.8002485,31.5403676 19.6265038,31.4144754 20.6400436,31.2583691 C22.7111902,30.9572351 25.5435934,30.5453159 28.6734485,30.0900899 C31.805507,29.6529923 34.6401135,29.255173 36.7134635,28.9651175 C37.7303083,28.8301611 38.5598687,28.7203831 39.1536708,28.6418264 C39.4301909,28.6075838 39.6505257,28.5813982 39.8179801,28.5612554 C39.9711127,28.5441341 40.0515464,28.5380913 40.0515464,28.543127" id="Fill-306" fill="#2E353A"></path>
+                                </g>
+                                <circle id="Oval" fill="#811212" cx="71.7" cy="24.5" r="1"></circle>
+                                <g id="Group-8" transform="translate(0.000000, 32.586900)">
+                                    <path d="M13.4302577,8.88310825 C18.879433,3.27913918 28.4723196,3.89073711 28.4723196,3.89073711 L36.4230928,9.5823866 L40.9326804,4.33346907 C40.9326804,4.33346907 48.9396887,6.07282091 53.379998,8.39364565 C51.3579801,11.9003223 50.2629354,14.6705467 50.0948636,16.7043188 C49.8857651,19.2345396 50.4150546,23.3103044 51.682732,28.9316134 C51.682732,28.9316134 51.7065464,28.9727474 51.6935567,29.0431082 C51.6286082,29.3786753 52.5595361,36.9873866 53.5131959,42.7699639 C47.8377835,48.1855825 40.6046907,50.5042423 32.5738144,49.0959433 C30.0235052,48.6499639 28.7894845,48.0286237 26.4296907,47.4094485 C22.9408763,46.4936753 20.4122165,43.4692423 20.0993814,39.8765103 C19.6750515,35.0291907 19.3513918,29.0279536 19.3513918,29.0279536" id="Fill-149" fill="#4EA7FF"></path>
+                                    <path d="M45.918232,5.31106231 C45.9377165,5.30466495 46.0578711,5.62291237 46.2602938,6.20528351 C46.4648814,6.78657216 46.7419948,7.63414948 47.0689021,8.68523196 C47.7259639,10.7884794 48.561634,13.7154897 49.3529227,16.9823969 C50.1398814,20.2525515 50.7330773,23.2390979 51.1086959,25.4083763 C51.2970464,26.4940979 51.4366856,27.375232 51.5211186,27.9846649 C51.6055515,28.5951804 51.6434381,28.9329124 51.6239536,28.9361834 C51.6044691,28.9394072 51.5286959,28.6070876 51.4096237,28.0041495 C51.2818918,27.3525 51.1119433,26.489768 50.9073557,25.4473454 C50.4808608,23.2878093 49.8584381,20.3131701 49.0703969,17.0505928 C48.2823557,13.7890979 47.4780773,10.8588402 46.8740567,8.74368557 C46.5796237,7.7218299 46.3371495,6.87641753 46.1531289,6.23884021 C45.9842629,5.64780928 45.8987474,5.31765464 45.918232,5.31106231" id="Fill-151" fill="#263238"></path>
+                                    <path d="M51.0377938,25.3464588 C50.9869175,25.2836753 53.3640309,23.2637784 56.3473299,20.8336237 C59.3306289,18.4034691 61.7900103,16.4831598 61.8398041,16.5459433 C61.8895979,16.6076443 59.513567,18.6275412 56.5291856,21.0576959 C53.5469691,23.4878505 51.0886701,25.4081598 51.0377938,25.3464588" id="Fill-153" fill="#263238"></path>
+                                    <path d="M20.6238402,16.5766856 L15.7462113,32.622201 L17.5615206,33.5661186 L19.3508505,29.0283866 C19.3508505,29.0283866 21.1899742,19.4950361 20.6238402,16.5766856" id="Fill-155" fill="#000000"></path>
+                                    <path d="M45.3896598,5.32068557 C48.0189897,6.70625258 41.4288866,10.0424381 38.4531649,9.95259278 L40.6137835,4.25011856 C40.6137835,4.25011856 44.5074433,4.85522165 45.3896598,5.32068557" id="Fill-157" fill="#000000" opacity="0.4"></path>
+                                    <path d="M27.6885,4.24979381 L27.6885,0 C27.6885,0 35.9878299,2.13680412 36.2887577,7.1021134 C36.2887577,7.1021134 37.3452526,1.6128866 41.6210258,1.34984536 L42.2250464,9.07113402 L37.2489124,13.3999485 L32.2056649,13.3999485 L28.2102526,9.95443299 L27.6885,4.59185567" id="Fill-159" fill="#4EA7FF"></path>
+                                    <path d="M38.157,30.9205543 C38.136433,30.9194691 38.1331856,30.5936443 38.1418454,30.0069433 C38.1548351,29.4191598 38.1656598,28.5705 38.1689072,27.5205 C38.1754021,25.4226649 38.1093711,22.5227165 37.8463299,19.3337474 C37.5800412,16.1436959 37.1665361,13.2718918 36.812567,11.2032835 C36.6361237,10.2084897 36.4889072,9.38364433 36.3763299,8.75580928 C36.2702474,8.17885052 36.2215361,7.85735567 36.2399381,7.85191835 C36.2594227,7.84869588 36.3471031,8.1626134 36.4867423,8.73307732 C36.6307113,9.30354124 36.8114845,10.1348814 37.0139072,11.1675619 C37.4198351,13.2307577 37.8668969,16.1079742 38.134268,19.3088505 C38.3994742,22.5097268 38.4330309,25.4215825 38.3724124,27.5237474 C38.344268,28.5748299 38.3020515,29.4256546 38.2555052,30.0112732 C38.2111237,30.5979742 38.177567,30.921634 38.157,30.9205543" id="Fill-161" fill="#263238"></path>
+                                    <path d="M35.9074021,5.67270619 C35.9041546,5.69760309 35.7190515,5.60126289 35.4148763,5.7181701 C35.0977113,5.82100515 34.8141031,6.21610825 34.5813711,6.77899485 C34.0726082,7.88420103 33.4426082,9.47652062 33.0031237,11.371933 L32.9587423,11.5602835 L32.7920412,11.4596134 C32.2951856,11.159768 31.7864227,10.8361082 31.2754948,10.488634 C30.2839485,9.8131701 29.3768351,9.12579897 28.5833814,8.44492268 C28.1850309,8.10177835 27.8570412,7.68610825 27.6686907,7.24445876 C27.4814227,6.80280928 27.4078144,6.36115979 27.3883299,5.96389175 C27.3558557,5.16286082 27.4868351,4.53286082 27.5723505,4.10528351 C27.6654433,3.67554124 27.7358041,3.44280928 27.7542062,3.44707983 C27.7747732,3.4503866 27.742299,3.69177835 27.6827629,4.12368557 C27.6318866,4.55451031 27.5355464,5.18451031 27.5918351,5.94981959 C27.6253918,6.32976804 27.7065773,6.7432732 27.8873505,7.14595361 C28.0713711,7.54863402 28.370134,7.91667526 28.7598247,8.24358247 C29.5446186,8.89956186 30.4560619,9.58152062 31.437866,10.2494072 C31.9455464,10.593634 32.4488969,10.9172938 32.9392577,11.2171392 L32.7270928,11.3059021 C33.1849794,9.38992268 33.8571959,7.79110825 34.4168351,6.69889175 C34.5543093,6.42719072 34.6863711,6.17497423 34.8530722,5.98445876 C35.0154433,5.79069588 35.2124536,5.67270619 35.3834845,5.62507732 C35.7352887,5.52657216 35.9203918,5.66837629 35.9074021,5.67270619" id="Fill-163" fill="#263238"></path>
+                                    <path d="M41.621134,1.35016641 C41.641701,1.34908763 41.6665979,1.58614948 41.6979897,2.01264433 C41.7337113,2.49975773 41.7791753,3.1059433 41.831134,3.82145876 C41.8939175,4.58352062 41.9859278,5.48846907 42.1418041,6.48542784 C42.2024227,6.97795361 42.3756186,7.5116134 42.2413918,8.11671649 C42.0692784,8.71099485 41.623299,9.1537268 41.1491753,9.5109433 C40.4845361,10.005634 39.7906701,10.3758402 39.3241237,10.8986753 L39.1022165,11.1465619 L39.080567,10.8153247 C38.9658247,9.06063402 38.3791237,7.6166134 37.8552062,6.67702577 C37.3269588,5.7309433 36.8918041,5.2438299 36.9264433,5.21568557 C36.9383505,5.20702577 37.0563402,5.31852062 37.254433,5.54367526 C37.4492784,5.77099485 37.7188144,6.11846907 38.0067526,6.58934536 C38.5826289,7.5202732 39.2212887,8.98919072 39.3576804,10.7969227 L39.1162887,10.7135722 C39.6228866,10.1376959 40.340567,9.75558247 40.9748969,9.28037629 C41.4273711,8.9437268 41.8257216,8.52589175 41.9664433,8.04743814 C42.0855155,7.55924227 41.938299,7.0288299 41.8776804,6.52439691 C41.7347938,5.51769588 41.6633505,4.60300515 41.6276289,3.83553093 C41.5908247,3.0680567 41.5843299,2.44671649 41.5864948,2.01697423 C41.5886598,1.58831443 41.600567,1.35016641 41.621134,1.35016641" id="Fill-165" fill="#263238"></path>
+                                    <path d="M23.6452383,12.4895687 C37.2775416,12.6969922 46.4304626,12.6715028 51.1040012,12.4131004 L51.3330159,15.039179 C40.1026861,15.4861573 31.9362603,15.5324038 26.8337383,15.1779185 C21.7312164,14.8234332 20.668383,13.9273166 23.6452383,12.4895687 Z" id="Path-4" fill="#E0F5EA" opacity="0.700985863"></path>
+                                    <path d="M23.6452383,19.4895687 C37.2775416,19.6969922 46.4304626,19.6715028 51.1040012,19.4131004 L51.3330159,22.039179 C40.1026861,22.4861573 31.9362603,22.5324038 26.8337383,22.1779185 C21.7312164,21.8234332 20.668383,20.9273166 23.6452383,19.4895687 Z" id="Path-4-Copy" fill="#E0F5EA" opacity="0.700985863"></path>
+                                    <path d="M25.6452383,28.4895687 C39.2775416,28.6969922 48.4304626,28.6715028 53.1040012,28.4131004 L53.3330159,31.039179 C42.1026861,31.4861573 33.9362603,31.5324038 28.8337383,31.1779185 C23.7312164,30.8234332 22.668383,29.9273166 25.6452383,28.4895687 Z" id="Path-4-Copy-2" fill="#E0F5EA" opacity="0.700985863"></path>
+                                    <path d="M23.6452383,35.4895687 C37.2775416,35.6969922 46.4304626,35.6715028 51.1040012,35.4131004 L51.3330159,38.039179 C40.1026861,38.4861573 31.9362603,38.5324038 26.8337383,38.1779185 C21.7312164,37.8234332 20.668383,36.9273166 23.6452383,35.4895687 Z" id="Path-4-Copy-3" fill="#E0F5EA" opacity="0.700985863"></path>
+                                    <g id="Group-10" transform="translate(40.051546, 7.462686)">
+                                        <path d="M6.93175764e-15,31.3745629 C1.49523917,32.2681998 4.64680229,34.3234003 6.32230298,34.8247355 C8.56653151,31.9520573 10.6770706,23.1871833 10.6748807,22.9082984 C8.70515207,23.0326734 6.41544723,23.2923815 5.78261424,23.6359194 C4.65885625,25.1141734 1.60975181,28.9643184 6.93175764e-15,31.3745629" id="Fill-104" fill="#FF2C5E"></path>
+                                        <path d="M31.7013253,31.4186581 C30.2060862,32.312295 27.054523,34.3674955 25.3784744,34.8688307 C23.1342459,31.9956046 21.0237068,23.2307306 21.0258967,22.9523937 C22.9956253,23.0767686 25.2853302,23.3364767 25.9187111,23.6800146 C27.0419212,25.1582687 30.0915735,29.0084137 31.7013253,31.4186581" id="Fill-106" fill="#FF2C5E"></path>
+                                        <path d="M5.12714347,42.0219576 C10.3106666,44.8908049 19.9674213,45.3868464 26.291397,41.334918 C26.291397,41.334918 24.6205786,27.1822334 23.816172,23.4060067 C19.4580929,22.2810554 11.3309841,22.6004928 7.33829282,23.2415822 C6.7547797,28.0608248 5.81196864,34.9046476 5.12714347,42.0219576" id="Fill-108" fill="#FF2C5E"></path>
+                                        <path d="M20.0658752,23.593922 C20.0769017,23.3476647 20.0354212,23.1103336 19.9766135,22.876678 C17.4463068,22.7055055 13.6448084,22.6508984 10.9349281,22.8667016 C10.9139253,22.9727656 10.8687694,23.0725286 10.8640438,23.1827931 C10.7789826,25.088793 12.7695186,26.7259576 15.3103267,26.8398976 C17.8516599,26.9527874 19.9808141,25.500447 20.0658752,23.593922" id="Fill-110" fill="#FFC19F"></path>
+                                        <path d="M18.9961541,18.0385549 L18.9360796,23.5875962 C18.9225493,24.7809675 17.3963329,25.7318761 15.5253648,25.7118513 C13.6543967,25.6912853 12.1487464,24.7068216 12.1611942,23.5139915 L12.2212687,17.9649501 L18.9961541,18.0385549 Z" id="Fill-112" fill="#FFC19F"></path>
+                                        <path d="M18.9858676,21.1722429 C18.9946107,20.9870946 18.9632384,20.808118 18.9184942,20.6322272 C17.0140392,20.5036521 14.1534993,20.4619937 12.1137832,20.625027 C12.0978398,20.7047436 12.063896,20.7793172 12.0602959,20.8626339 C11.9960083,22.2975325 13.4946802,23.5292824 15.4073641,23.6151706 C17.3195337,23.7005445 18.9220943,22.6066272 18.9858676,21.1722429" id="Fill-114" fill="#601805"></path>
+                                        <path d="M28.8383847,42.5894061 C29.2397138,40.9587655 30.4497571,30.9591178 30.8186056,28.3986486 C27.3861125,27.6213142 19.4756887,28.312217 16.28212,34.3905098 C16.2799193,34.4494154 18.7979984,42.3218534 18.9945341,43.1558914 C20.2155878,42.5409604 27.358036,42.0862307 28.8383847,42.5894061" id="Fill-116" fill="#FFF8E9"></path>
+                                        <path d="M16.2986896,34.410996 C16.3245611,34.5067758 18.8489654,42.4999887 19.0047453,43.1236585 C19.6757546,42.8038419 21.8919019,42.5528327 23.8108014,42.4372364 C25.6097009,42.3298969 27.9887841,42.3001721 28.8166742,42.5682456 C29.0985091,41.3902636 29.7700689,36.2076936 30.2610782,32.4155826 C30.4823626,30.7119125 30.6728214,29.2388847 30.7867664,28.4445725 C27.5886005,27.730077 19.5485986,28.2431046 16.2986896,34.410996 M18.9848321,43.2016064 L18.9710683,43.1729777 C18.8449919,42.6361896 17.7273717,39.1055005 16.9896322,36.764554 C16.3570481,34.7594441 16.2546454,34.4280119 16.2551938,34.4043381 C18.0246697,31.037163 21.1468493,29.4983705 23.4514594,28.813484 C26.3980129,27.9370054 29.2630848,28.0460147 30.8189444,28.3983679 L30.8398654,28.3961657 C30.8398654,28.3961657 30.5293541,30.7024274 30.3058301,32.427857 C29.8108839,36.249788 29.132604,41.483334 28.8540248,42.6152686 L28.8474182,42.640594 L28.8286994,42.6345379 C27.4198372,42.1544567 20.2400904,42.5695728 18.9848321,43.2016064" id="Fill-118" fill="#F7E3BF"></path>
+                                        <path d="M31.0211678,37.8002015 C31.0843688,37.655114 31.5399655,31.260822 31.6625205,30.0863827 C28.4986237,28.6888163 20.4116443,29.19992 16.2178457,34.4763787 C16.2167469,34.5346335 18.7925997,42.3155003 18.9887975,43.1481048 C20.2077524,42.5342307 29.3411205,38.8119669 31.0211678,37.8002015" id="Fill-120" fill="#F9E7D4"></path>
+                                        <path d="M16.2419631,34.4857924 C16.273286,34.5924003 18.8395682,42.480833 18.99948,43.116084 C19.4616306,42.8863825 20.8816034,42.2753106 22.668659,41.5142183 C25.7295138,40.2107448 29.9185436,38.4264369 31.0033061,37.7763487 C31.0428719,37.6059959 31.2055313,35.5035129 31.3500564,33.64392 C31.4698529,32.0997545 31.583055,30.6402159 31.6380076,30.105528 C29.9229398,29.3565253 27.0582655,29.2378278 24.3298734,29.8071358 C20.9590865,30.5094289 18.0872684,32.1706432 16.2419631,34.4857924 L16.2419631,34.4857924 Z M18.9791421,43.1941009 L18.9659509,43.1655199 C18.8378861,42.6208323 17.6792569,39.0509572 16.9108681,36.6935756 C16.2897813,34.7885429 16.1963435,34.498336 16.1974332,34.4747017 C18.0486112,32.1453514 20.9391382,30.4541265 24.3237864,29.7489457 C27.0681107,29.177326 29.9520421,29.2982455 31.670199,30.0572905 L31.688337,30.065535 C31.688337,30.065535 31.5174007,32.0832427 31.3953819,33.6518991 C31.1991624,36.1890112 31.0765939,37.734583 31.0414173,37.8164785 C29.9663326,38.4639478 25.7528357,40.2656491 22.6831279,41.5737789 C20.9407871,42.3152356 19.4364379,42.9561092 18.9972801,43.1770622 L18.9791421,43.1941009 Z" id="Fill-122" fill="#F7E3BF"></path>
+                                        <path d="M4.84285255,42.6287417 C3.44969923,40.3884675 4.18232944,38.3601111 2.64496191,36.2101084 C2.25195066,35.6602229 1.70536779,31.1521527 1.25401033,28.5953779 C4.66065826,27.7906406 12.0717275,28.1605335 15.9710214,34.3248654 C15.9748687,34.383762 14.0477925,42.3392124 13.8782582,43.1747742 C12.6375757,42.5703955 11.2240562,42.1680269 9.70540349,42.0375735 C7.96657641,41.887855 6.3070121,42.1135337 4.84285255,42.6287417" id="Fill-124" fill="#FFF8E9"></path>
+                                        <path d="M8.61227117,41.9619557 C8.97608324,41.9603045 9.3404457,41.9751652 9.70535857,42.0065378 C11.1809715,42.1336794 12.5789785,42.513453 13.8625031,43.135401 C13.9786368,42.5833533 15.9149316,34.490874 15.9463042,34.3334606 C12.2399343,28.4876997 5.15688212,27.7116407 1.28043977,28.6192444 C1.41803889,29.4046602 1.56114197,30.3480398 1.7136018,31.346459 C2.04714206,33.5430913 2.39279104,35.8151279 2.65973333,36.1888471 C3.46111059,37.3089039 3.65264857,38.419604 3.83813218,39.4950787 C4.01095667,40.4929475 4.18928513,41.5260417 4.84976089,42.5943613 C6.02760934,42.1815639 7.31058352,41.9674597 8.61227117,41.9619557 M13.8936043,43.2141883 L13.8721356,43.2037292 C12.5867631,42.5767316 11.1846887,42.194698 9.7044461,42.067537 C8.03538859,41.9249625 6.35422049,42.1280899 4.84865575,42.6582028 C4.17431687,41.5737558 3.97173997,40.5190347 3.79723759,39.5089026 C3.60401886,38.3936287 3.42236022,37.3400086 2.629668,36.23079 C2.35332668,35.8443525 2.00707431,33.5637109 1.67183156,31.3579347 C1.51769696,30.3467017 1.2281441,28.5714014 1.2281441,28.5714014 L1.25016333,28.566447 C2.88233864,28.1805601 5.62538403,28.0440408 8.4317347,28.8174662 C11.6680108,29.709245 14.2800418,31.6062015 15.9870901,34.304658 C15.9881834,34.3316315 15.8703806,34.8755065 15.2098037,37.6356168 C14.6692316,39.8964411 13.8936043,43.2141883 13.8936043,43.2141883" id="Fill-126" fill="#F7E3BF"></path>
+                                        <path d="M2.71889552,38.1738919 C2.65018813,38.0293316 0.782996132,31.4861895 0.507067259,30.2620987 C3.81766408,28.5581555 11.4898059,28.8181442 15.9398518,34.3312251 C15.9436937,34.3894889 14.0193371,42.3337121 13.8500421,43.1686442 C12.6111105,42.5645689 4.43053398,39.1720729 2.71889552,38.1738919" id="Fill-128" fill="#F9E7D4"></path>
+                                        <path d="M2.73280576,38.1495156 C3.86883806,38.8095904 7.81499767,40.5111657 10.6976728,41.7543708 C12.2008408,42.4018048 13.3929327,42.9162345 13.8337155,43.1289314 C13.949682,42.5782278 15.8804423,34.5083864 15.9145177,34.3391082 C13.3929327,31.2228513 10.106848,30.0527435 7.79246389,29.6191056 C5.09995192,29.1151184 2.32060246,29.3679364 0.532739344,30.2797301 C0.840517809,31.6235129 2.63167855,37.8758126 2.73280576,38.1495156 M13.865486,43.2075196 L13.8440472,43.1976248 C13.4218674,42.992032 12.2152467,42.4714535 10.6881431,41.8128969 C7.79775048,40.5666969 3.83981463,38.859837 2.71070349,38.2018302 C2.65078474,38.073747 0.779560621,31.5733871 0.486013713,30.2700168 L0.479417153,30.2436306 L0.498657119,30.2342854 C2.29182194,29.3107671 5.08876327,29.0529515 7.79939962,29.5603369 C10.1224881,29.9962596 13.4246159,31.1748449 15.9560626,34.3109594 C15.9576949,34.3378953 15.8395065,34.8810121 15.1804003,37.6367249 C14.6400321,39.8949472 13.865486,43.2075196 13.865486,43.2075196" id="Fill-130" fill="#F7E3BF"></path>
+                                        <path d="M0.164952948,32.4152966 C0.288127094,32.2833243 0.3200204,32.2547303 0.467939352,32.1161594 C6.02672258,30.6952576 10.8668067,32.0100316 13.9813529,34.3585887 C14.1012278,35.2625989 14.5746784,44.4841633 14.3723209,45.6543177 C9.9309031,44.3290959 4.13401985,31.5481286 0.164952948,32.4152966" id="Fill-132" fill="#CF79DB"></path>
+                                        <path d="M32.3323337,32.4152966 C32.2091595,32.2833243 32.1772662,32.2547303 32.0293473,32.1161594 C26.4705641,30.6952576 21.63048,32.0100316 18.5153838,34.3585887 C18.3960589,35.2625989 17.9231581,44.4841633 18.1249658,45.6543177 C22.5663835,44.3290959 28.3632668,31.5481286 32.3323337,32.4152966" id="Fill-134" fill="#CF79DB"></path>
+                                        <path d="M28.9772318,45.0842356 C29.8664248,41.4790721 31.4072527,36.319333 32.3305397,32.4177719 C26.7050329,30.6905268 21.6794702,32.343535 18.56537,34.6239824 C18.446591,35.5016274 17.7289677,44.7141509 17.9318818,45.8508002 C22.3728978,44.5640274 25.0074826,44.2412344 28.9772318,45.0842356" id="Fill-136" fill="#A841B7"></path>
+                                        <path d="M28.0766916,43.6064291 C28.3927276,42.335177 28.8011686,40.8479487 29.2325742,39.2759703 C29.7492766,37.3983446 30.2829291,35.4572929 30.6787943,33.7961902 C26.9973576,32.6966255 23.0233961,33.3429136 20.0155863,35.5267334 C19.8958425,36.5092882 19.4064788,42.9738103 19.5054451,44.2018671 C21.5777228,43.6053355 23.2000045,43.2575865 24.9349219,43.2575865 C25.9131025,43.2575865 26.9268236,43.3680351 28.0766916,43.6064291 M19.3647914,44.4425728 C19.3407083,44.4266998 19.3248353,44.4009746 19.3193619,44.3714181 C19.1551588,43.4507859 19.7380799,36.0616456 19.8201814,35.45081 C19.8245602,35.4212535 19.8409805,35.3944336 19.8634216,35.3763713 C22.956461,33.114747 27.0582548,32.4557452 30.8414947,33.6166612 C30.894587,33.6325342 30.9263329,33.6905526 30.912102,33.7480237 C30.5119937,35.4371264 29.9673867,37.4228895 29.4397474,39.3429713 C28.9958516,40.9565406 28.5771337,42.4797982 28.2580323,43.7715294 C28.244896,43.8279058 28.1901617,43.8618411 28.1403534,43.8508942 C24.8995312,43.1650725 22.7544911,43.4962155 19.4457983,44.4551617 L19.4195258,44.4595404 C19.4009161,44.4595404 19.3823064,44.454067 19.3647914,44.4425728" id="Fill-138" fill="#FFA727"></path>
+                                        <path d="M3.51809368,45.0842356 C2.62945057,41.4790721 1.0880727,36.319333 0.16478571,32.4177719 C5.79029252,30.6905268 10.8158552,32.343535 13.9299554,34.6239824 C14.0487345,35.5016274 14.7658079,44.7141509 14.5634436,45.8508002 C10.1224277,44.5640274 7.48784281,44.2412344 3.51809368,45.0842356" id="Fill-140" fill="#A841B7"></path>
+                                        <path d="M7.53234301,43.2578112 C9.26726164,43.2578112 10.8895445,43.6055604 12.9618236,44.2020925 C13.06079,42.9734879 12.5714259,36.5089613 12.4516821,35.5264057 C9.44387012,33.3425844 5.46990585,32.6968426 1.78901325,33.7958613 C2.18433193,35.4569653 2.71798481,37.398565 3.23468764,39.2761921 C3.66609351,40.8481716 4.0745348,42.3354009 4.39057103,43.606654 C5.53989312,43.3682598 6.55416165,43.2578112 7.53234301,43.2578112 M13.0593746,44.459765 L13.0325548,44.4553862 C9.72440733,43.4964394 7.57936598,43.1652963 4.33854184,43.850571 C4.28873354,43.8620652 4.23345179,43.8275826 4.22031553,43.7717535 C3.90121395,42.4800215 3.48304309,40.9562157 3.03914706,39.3431927 C2.5115074,37.4225625 1.96690006,35.4367982 1.56679156,33.7476945 C1.55201327,33.6907707 1.58430657,33.6327522 1.63739894,33.6163319 C5.42064104,32.4559625 9.52243737,33.1144174 12.6154786,35.3765904 C12.6379197,35.3941054 12.65434,35.4214726 12.6581715,35.4510292 C12.7408204,36.0618651 13.3237418,43.4510099 13.1595386,44.3716426 C13.1540652,44.4006518 13.1376448,44.4269243 13.114109,44.4427973 C13.096594,44.4542915 13.0779843,44.459765 13.0593746,44.459765" id="Fill-142" fill="#FFA727"></path>
+                                        <path d="M17.3115198,34.5311578 C17.313526,34.6622528 16.6431719,34.9268557 15.739179,34.9304749 C14.8347841,34.9344962 14.0972739,34.6694912 14.118989,34.5400047 C14.1338679,34.4491229 14.8367947,34.2235268 15.7411897,34.2199076 C16.6455847,34.2162884 17.3103089,34.4571655 17.3115198,34.5311578" id="Fill-144" fill="#481651"></path>
+                                        <path d="M14.159543,35.6459818 C14.1517818,35.1512073 14.1183118,34.6850522 14.1144312,34.3547174 C15.5618891,34.717552 16.6562138,34.7418057 17.9697915,34.3765457 C17.9906496,34.5948286 17.8815082,35.5402359 17.9086723,35.8007201 C16.9690859,36.2227336 14.9458463,36.3638898 14.159543,35.6459818" id="Fill-146" fill="#CF79DB"></path>
+                                        <path d="M14.7498177,45.8411397 C14.6184211,42.7932853 14.2669351,38.3685038 14.1191139,34.6636663 C15.7363874,34.9713534 16.9824655,35.0518338 18.4656049,34.6516216 C18.4694373,35.5352639 18.36432,43.8674528 18.2772698,45.7228827 C17.6701078,46.2725586 15.636745,46.3492066 14.7498177,45.8411397" id="Fill-148" fill="#8B2D9B"></path>
+                                        <path d="M17.0618373,36.2534369 C17.0625745,36.1826631 17.0633118,36.114101 17.064049,36.0481192 C16.8325597,36.2700245 16.2475701,36.4241049 15.4967044,36.4241049 C14.9548425,36.4241049 14.4992362,36.3426414 14.1947615,36.2154697 C14.1973418,36.2748165 14.2010279,36.3349005 14.2039768,36.3938786 C14.2220389,36.4012509 14.2353089,36.4100976 14.2574258,36.4171013 C14.5851232,36.5258423 15.0256163,36.5859263 15.4967044,36.5859263 C16.1152378,36.5859263 16.7208698,36.4760794 17.0618373,36.2534369" id="Fill-150" fill="#000000"></path>
+                                        <path d="M15.5634845,44.7614979 C15.943567,44.7614979 16.3236494,44.7106094 16.5979297,44.6045198 C16.5990797,44.5599565 16.5999422,44.5139556 16.6013798,44.4665171 C16.3641876,44.5700192 15.9967555,44.6358579 15.5634845,44.6358579 C15.2147403,44.6358579 14.917747,44.589282 14.6871675,44.5191307 C14.6894675,44.562544 14.6923426,44.6094074 14.6946426,44.6519583 C14.9381599,44.7195221 15.2363032,44.7614979 15.5634845,44.7614979" id="Fill-152" fill="#000000"></path>
+                                        <path d="M28.4505672,38.5742304 C28.0074561,38.30296 27.0547673,37.6101937 26.6267869,38.1246348 C26.4500829,38.3364635 27.3168513,38.9562786 28.135526,39.5588016 C28.4089579,39.7598227 28.5597238,39.7192942 29.4626976,40.0943175 C29.4459459,40.1856416 28.9374489,40.139169 28.3603238,39.892756 C28.0463634,39.7592823 27.3725104,38.7979475 26.7521549,39.368588 C26.6462406,39.4663967 27.6599922,40.476906 27.8999206,40.7098095 C28.2830496,41.0821309 30.9146969,42.4406445 31.0941028,42.4449676 C31.8463108,42.4622597 32.4985487,41.9688934 32.7946766,41.0026951 C32.9389578,40.2196855 32.5763633,38.0219628 31.8019997,36.6747971 C30.9292871,36.1187468 30.2759685,35.8447744 29.6058982,35.5427024 C27.6281098,35.1098586 26.7121669,34.816973 26.666775,35.2098287 C26.5592395,36.1511695 28.1587623,36.4689126 28.9542007,36.7266735 C29.5680716,36.9855152 30.1927501,37.3886382 30.4856357,37.6042495 C30.4742877,37.7733883 29.4572938,37.1978843 28.8596343,36.9476887 C28.35492,36.7736865 26.5532953,36.290047 26.4884498,36.6407532 C26.3149881,37.582094 27.2006698,37.5107639 28.4673189,38.0954543 C28.9536603,38.3602402 29.8134038,38.945471 29.8360997,39.0449008 C29.6820916,39.124877 29.4027155,38.9795149 28.4505672,38.5742304" id="Fill-154" fill="#FFC19F"></path>
+                                        <path d="M4.27876415,38.5148215 C4.70666188,38.2199994 5.62142175,37.4756413 6.07744929,37.9662901 C6.2651617,38.1686084 5.43262743,38.8356095 4.64715651,39.4820543 C4.38425095,39.6984374 4.23170081,39.665439 3.34885746,40.08955 C3.37049578,40.17989 3.87629145,40.1046969 4.43996962,39.8282673 C4.74669277,39.6773401 5.36825344,38.6803546 6.01902583,39.2169849 C6.13046317,39.3094887 5.17188571,40.3740939 4.94414241,40.6202298 C4.5817006,41.0124243 2.02513339,42.5135825 1.84607631,42.5271065 C1.09468574,42.5855299 0.416324486,42.1278795 0.0679475753,41.1779574 C-0.118682913,40.4027647 0.124207201,38.18646 0.825288686,36.7983619 C1.66810115,36.1946529 2.30589056,35.8857659 2.9599087,35.5471262 C4.91276685,35.0077912 5.81292086,34.6648238 5.87891773,35.0553955 C6.03795936,35.9901708 4.45619836,36.3942664 3.6750551,36.6955799 C3.07459179,36.9876972 2.47304656,37.4242503 2.19174843,37.6557803 C2.21230484,37.8240182 3.19738924,37.1938022 3.78162381,36.9114222 C4.27605936,36.7096448 6.05148331,36.129197 6.13533179,36.4754101 C6.35982933,37.4080215 5.47049449,37.3842194 4.23602848,38.0376966 C3.76431316,38.3287319 2.93664751,38.9600299 2.9187959,39.060648 C3.07675562,39.1320545 3.34885746,38.97139 4.27876415,38.5148215" id="Fill-156" fill="#FFC19F"></path>
+                                        <path d="M5.54888361,4.77050197 C5.54888361,4.77050197 1.15527976,10.2303106 1.86276661,20.0046836 L27.7385452,20.7818136 C27.7385452,20.7818136 30.55578,6.6403676 20.8527084,1.59068024 L5.54888361,4.77050197 Z" id="Fill-158" fill="#010000"></path>
+                                        <path d="M25.7471876,9.86996487 C25.5029709,15.0333248 20.5031587,18.9921771 14.5800749,18.7120462 C8.65699096,18.4319152 4.05278778,14.0194388 4.29755701,8.85607878 C4.54122119,3.69216627 9.54103333,-0.26613345 15.4646698,0.0139974768 C21.3872011,0.294128403 25.9908518,4.70660489 25.7471876,9.86996487" id="Fill-160" fill="#010000"></path>
+                                        <path d="M26.9328549,15.1126028 C26.8776061,16.2875607 25.8794443,17.1957459 24.7039602,17.1404971 C23.5279499,17.0847221 22.6208171,16.0870865 22.6760659,14.9110762 C22.7318409,13.7361182 23.7294765,12.8279331 24.9049606,12.8837081 C26.0804448,12.9389569 26.9881037,13.9371187 26.9328549,15.1126028" id="Fill-162" fill="#F4A179"></path>
+                                        <path d="M15.2807526,2.63894883 C15.9698543,2.56318083 16.6650396,2.5996822 17.3486108,2.71471683 C19.5619213,3.08802634 24.2794474,4.38493121 25.4552341,8.73025385 C27.0076485,14.4615226 25.1665414,21.4537479 18.6593419,22.4912718 C13.402591,23.3308034 6.26048887,19.7680481 6.78754659,12.6253929 C7.28031514,5.92904994 10.794955,3.13392958 15.2807526,2.63894883" id="Fill-164" fill="#FDB68D"></path>
+                                        <path d="M19.4267451,16.8579214 C19.3898328,16.8579214 19.3571795,16.8302371 19.3525655,16.7922599 C19.3522105,16.7904853 19.325591,16.588532 19.1914288,16.5370677 C19.0679143,16.4898624 18.8773187,16.5732702 18.638453,16.7791277 C18.6068646,16.8061021 18.5600143,16.8029077 18.5326849,16.7716742 C18.5057105,16.7400857 18.5096147,16.6925256 18.5404933,16.6659061 C18.8283388,16.4178123 19.0657847,16.327306 19.2460875,16.3975815 C19.4636575,16.4820541 19.4995051,16.7624461 19.5009248,16.7741587 C19.5058938,16.8153302 19.4771447,16.8522425 19.4359732,16.8572115 C19.4331338,16.8575664 19.4299395,16.8579214 19.4267451,16.8579214" id="Fill-166" fill="#010000"></path>
+                                        <path d="M17.93662,19.7246229 C16.8256487,19.7246229 16.1529429,19.1647336 16.1240048,19.1399895 C16.0745164,19.0980502 16.0682255,19.0238177 16.1105842,18.9743293 C16.1521041,18.924841 16.226756,18.9181307 16.2766637,18.9604894 C16.283374,18.9659415 16.9674035,19.5396707 18.0725032,19.4864078 C19.1457291,19.4390165 19.4896311,18.9495852 19.4934057,18.9449719 C19.5294734,18.891709 19.6028672,18.8766108 19.6565494,18.9126786 C19.7102317,18.948327 19.7253298,19.0204625 19.6901008,19.0749836 C19.6741639,19.0993084 19.2879032,19.6688436 18.082988,19.7216871 C18.0330803,19.7237841 17.9844308,19.7246229 17.93662,19.7246229" id="Fill-168" fill="#010000"></path>
+                                        <path d="M23.6301687,10.7962564 C23.6301687,10.7962564 22.4390489,9.91035549 20.4792266,10.7831821 C20.4792266,10.7831821 20.4553521,9.64255643 22.0576381,9.64660319 C23.3281057,9.64976987 23.6301687,10.7962564 23.6301687,10.7962564" id="Fill-170" fill="#010000"></path>
+                                        <path d="M12.3006177,10.7494269 C12.3006177,10.7494269 13.7351624,9.87499051 16.0739077,10.7656619 C16.0739077,10.7656619 16.1131424,9.62560251 14.1947038,9.61432819 C12.6731213,9.60575971 12.3006177,10.7494269 12.3006177,10.7494269" id="Fill-172" fill="#010000"></path>
+                                        <path d="M16.6273871,13.8582295 C16.6273871,13.8582295 16.7848852,13.7333345 16.7126568,13.4554557 C16.6394252,13.1775769 14.1069161,11.0568701 12.4185767,13.6415442 C12.4185767,13.6415442 14.8151559,15.9809426 16.6273871,13.8582295" id="Fill-174" fill="#FFFFFF"></path>
+                                        <path d="M15.662989,13.4975241 C15.662989,14.0858441 15.1832133,14.5636373 14.5963802,14.5636373 C14.005582,14.5636373 13.530267,14.0858441 13.530267,13.4975241 C13.530267,12.9077172 14.005582,12.4309153 14.5963802,12.4309153 C15.1832133,12.4309153 15.662989,12.9077172 15.662989,13.4975241" id="Fill-176" fill="#2C1117"></path>
+                                        <path d="M15.0205067,13.4936854 C15.0205067,13.7293459 14.8283462,13.9210841 14.5926857,13.9210841 C14.3561804,13.9210841 14.1665539,13.7293459 14.1665539,13.4936854 C14.1665539,13.2571801 14.3561804,13.0658643 14.5926857,13.0658643 C14.8283462,13.0658643 15.0205067,13.2571801 15.0205067,13.4936854" id="Fill-178" fill="#040000"></path>
+                                        <path d="M13.2664747,14.2319316 C12.9485063,14.0601101 12.635969,13.8833513 12.3323191,13.6893116 L12.2380148,13.6280879 L12.3066446,13.5377335 C12.4404481,13.3510999 12.5421585,13.1358293 12.7105237,12.9669703 C12.8616081,12.7818179 13.0507104,12.635671 13.2541312,12.5023612 C13.3504104,12.4297815 13.4703892,12.392751 13.5775307,12.3364647 C13.6871409,12.2772159 13.8076134,12.2549976 13.9266047,12.2229045 C14.1606374,12.1562497 14.4154071,12.1577309 14.6509209,12.1853803 C15.1318234,12.2431479 15.5840891,12.415463 15.9687123,12.6835637 C16.1602833,12.8178609 16.344942,12.9566018 16.5014575,13.1333606 C16.5686061,13.2158152 16.6767351,13.3209817 16.6821663,13.4572539 C16.684635,13.5856262 16.6416796,13.6927678 16.6011929,13.7989218 C16.6051429,13.6863491 16.6076116,13.5693328 16.5848995,13.4730536 C16.5582376,13.3822055 16.4713394,13.3293753 16.3834537,13.2587705 C16.2131135,13.126942 16.0269736,13.0099257 15.8324402,12.9116715 C15.4423857,12.7265191 15.0365317,12.5724723 14.6188278,12.5453166 C14.4119509,12.5240858 14.2040865,12.5497602 14.0060968,12.5882719 C13.9083363,12.6119715 13.802676,12.6233275 13.7103467,12.671714 C13.6194986,12.7166443 13.516307,12.7393563 13.43089,12.80058 C13.2487,12.9042654 13.0847784,13.0336252 12.9312254,13.1827346 C12.7623664,13.3135756 12.6418939,13.5011967 12.4913033,13.6586997 L12.4621726,13.5076154 C12.7396544,13.7357231 13.0062738,13.9811118 13.2664747,14.2319316" id="Fill-180" fill="#030000"></path>
+                                        <path d="M14.219479,13.0813389 C14.219479,13.1635655 14.1545028,13.2291168 14.0734262,13.2291168 C13.9914871,13.2291168 13.9265108,13.1635655 13.9265108,13.0813389 C13.9265108,13.0002623 13.9914871,12.9341361 14.0734262,12.9341361 C14.1545028,12.9341361 14.219479,13.0002623 14.219479,13.0813389" id="Fill-182" fill="#F0F0ED"></path>
+                                        <path d="M12.3099802,13.4779277 C12.3099802,13.4779277 12.0401662,14.0037389 11.4932458,13.5896146 C11.4932458,13.5896146 11.8709087,13.7062909 12.3276352,13.1405642 L12.3099802,13.4779277 Z" id="Fill-184" fill="#030000"></path>
+                                        <path d="M11.658812,12.9425269 C11.658812,12.9425269 11.8217243,13.0252448 11.9922075,13.0081405 C12.1652143,13.0014109 12.3006474,12.9032709 12.3006474,12.9032709 L12.3553254,12.9966441 C12.3542038,12.9963637 12.1783931,13.0855308 11.9916467,13.0622576 C11.8051807,13.0507612 11.658812,12.9425269 11.658812,12.9425269" id="Fill-186" fill="#030000"></path>
+                                        <path d="M12.2211794,12.4945581 C12.2211794,12.4920345 12.2520234,12.5195137 12.3086642,12.5363377 C12.3599774,12.5626953 12.4348442,12.5736309 12.5108326,12.5753133 C12.5845778,12.5941001 12.6563601,12.5497969 12.7079537,12.5425065 C12.7603885,12.5284865 12.7948777,12.5189529 12.7948777,12.5189529 L12.8321709,12.6204577 C12.8321709,12.6204577 12.7906717,12.6252245 12.7270209,12.6313933 C12.6658937,12.6311129 12.5837366,12.6619569 12.5049442,12.6288697 C12.4239086,12.6131673 12.3490418,12.5876509 12.2996914,12.5509185 C12.2469762,12.5240001 12.2220206,12.4925953 12.2211794,12.4945581" id="Fill-188" fill="#030000"></path>
+                                        <path d="M20.8131554,13.8577016 C20.8131554,13.8577016 20.6556584,13.733309 20.7278863,13.4549304 C20.7991111,13.177555 23.3336104,11.0568617 25.0234439,13.6410177 C25.0234439,13.6410177 22.6248735,15.9809028 20.8131554,13.8577016" id="Fill-190" fill="#FFFFFF"></path>
+                                        <path d="M21.2880727,13.4970842 C21.2880727,14.0858999 21.7658659,14.563693 22.352699,14.563693 C22.9454797,14.563693 23.4207947,14.0858999 23.4207947,13.4970842 C23.4207947,12.9077729 22.9454797,12.430971 22.352699,12.430971 C21.7658659,12.430971 21.2880727,12.9077729 21.2880727,13.4970842" id="Fill-192" fill="#2C1117"></path>
+                                        <path d="M21.9244711,13.4933188 C21.9244711,13.7289794 22.1149423,13.9211399 22.3497582,13.9211399 C22.5866858,13.9211399 22.7780016,13.7289794 22.7780016,13.4933188 C22.7780016,13.2572359 22.5866858,13.06592 22.3497582,13.06592 C22.1149423,13.06592 21.9244711,13.2572359 21.9244711,13.4933188" id="Fill-194" fill="#040000"></path>
+                                        <path d="M24.0815437,14.2319307 C24.3442108,13.9811132 24.6098403,13.7357268 24.8878132,13.5076212 L24.8572016,13.6587042 C24.7075999,13.5012026 24.5871285,13.3135833 24.4172836,13.1827435 C24.261757,13.0331417 24.0988244,12.9037831 23.9156487,12.8005924 C23.8322075,12.7393693 23.7270419,12.7161637 23.6361946,12.6717276 C23.5448536,12.6233415 23.4411692,12.6119856 23.3414347,12.5882863 C23.1434469,12.549775 22.9375593,12.5241008 22.7296968,12.5453314 C22.3119969,12.5724868 21.9081215,12.7255447 21.5151083,12.9106954 C21.3215642,13.0094424 21.1334511,13.1264577 20.9650874,13.2577912 C20.8772025,13.3288891 20.7912926,13.381225 20.7656184,13.472566 C20.7399441,13.5688444 20.7419191,13.6858596 20.7478439,13.7989249 C20.7048889,13.6927719 20.6639089,13.5856314 20.6663776,13.4572602 C20.6708212,13.3219768 20.7769743,13.2158237 20.8460972,13.1333699 C21.0006363,12.9556253 21.1882557,12.8168857 21.3798249,12.6825897 C21.7624697,12.415479 22.216706,12.2426717 22.6961228,12.1853984 C22.9355844,12.1577493 23.1854144,12.1567618 23.4219135,12.2229223 C23.5413974,12.2560026 23.6628563,12.2767394 23.7699968,12.3364814 C23.8791123,12.3922735 23.997115,12.4297973 24.0933934,12.5023764 C24.297306,12.6356849 24.4869003,12.7818305 24.6369958,12.9664875 C24.8048657,13.1358386 24.9100313,13.3511072 25.0438335,13.537739 L25.1095003,13.6275988 L25.013222,13.6893157 C24.7115498,13.8828599 24.3990154,14.0601108 24.0815437,14.2319307" id="Fill-196" fill="#030000"></path>
+                                        <path d="M22.7187427,13.0812024 C22.7187427,13.1633528 22.7853821,13.228556 22.8666708,13.228556 C22.9476722,13.228556 23.0134499,13.1633528 23.0134499,13.0812024 C23.0134499,13.000201 22.9476722,12.9341361 22.8666708,12.9341361 C22.7853821,12.9341361 22.7187427,13.000201 22.7187427,13.0812024" id="Fill-198" fill="#F0F0ED"></path>
+                                        <path d="M25.2346289,13.4775051 C25.2346289,13.4775051 25.5025868,14.0038236 26.0500195,13.5896021 C26.0500195,13.5896021 25.6730357,13.7063059 25.2146664,13.1400624 L25.2346289,13.4775051 Z" id="Fill-200" fill="#030000"></path>
+                                        <path d="M25.5751353,12.9422877 C25.5751353,12.9422877 25.4290469,13.0505221 25.2417397,13.0617381 C25.056115,13.0852916 24.8797434,12.9958441 24.8797434,12.9964049 L24.9332998,12.9027513 C24.9332998,12.9027513 25.068733,13.0008913 25.2417397,13.0079013 C25.4125033,13.0250057 25.5751353,12.9422877 25.5751353,12.9422877" id="Fill-202" fill="#030000"></path>
+                                        <path d="M25.0982884,12.4945252 C25.096606,12.4925624 25.0716504,12.5236868 25.0186549,12.5508856 C24.9687437,12.5870572 24.8944377,12.6131344 24.8142433,12.6288367 C24.7346097,12.6619239 24.6535741,12.6307995 24.5902037,12.6313603 C24.5282353,12.6249111 24.4861754,12.6204248 24.4861754,12.6204248 L24.5237489,12.51892 C24.5237489,12.51892 24.5579577,12.5284536 24.6103925,12.5424736 C24.6619861,12.549764 24.7337685,12.5937868 24.8075137,12.5752804 C24.8823805,12.573598 24.9578081,12.5626624 25.0102429,12.535744 C25.0663228,12.5194808 25.096606,12.4920016 25.0982884,12.4945252" id="Fill-204" fill="#030000"></path>
+                                        <path d="M19.8051608,2.76313289 C19.8051608,2.76313289 17.0364072,5.50937181 12.0820846,7.30944603 C8.05141198,8.77399696 7.52094471,15.0176955 7.52094471,15.0176955 L4.72253769,10.4269022 L9.69882585,3.54290879 C9.69882585,3.54290879 14.8074563,0.760426765 18.4537323,2.25572942 L19.8051608,2.76313289 Z" id="Fill-206" fill="#010000"></path>
+                                        <path d="M7.69169537,15.3091639 C7.63592038,16.484122 6.63775853,17.3923072 5.46280048,17.3370584 C4.28679008,17.2812834 3.37913104,16.2836477 3.43437985,15.1076373 C3.49068102,13.9321531 4.48831669,13.024494 5.66380092,13.080269 C6.83928515,13.1355178 7.74694418,14.1336797 7.69169537,15.3091639" id="Fill-208" fill="#FDB68D"></path>
+                                        <path d="M6.34923563,15.7398244 C6.3087289,15.7398244 6.27182277,15.7141701 6.2587706,15.6741135 C5.94776891,14.7132038 4.85813784,14.7879162 4.81133006,14.7915168 C4.75597086,14.7991681 4.71321375,14.756411 4.70871301,14.7042023 C4.70511241,14.6519936 4.74381884,14.606086 4.79602752,14.6020353 C4.80772946,14.6015852 6.08144113,14.5106701 6.43925059,15.6160538 C6.45545328,15.665562 6.42799872,15.7191209 6.37804042,15.7348736 C6.36858885,15.7384742 6.3586872,15.7398244 6.34923563,15.7398244" id="Fill-210" fill="#010000"></path>
+                                        <path d="M18.6616017,2.26253321 C18.6616017,2.26253321 18.2875838,2.93652227 22.0423568,5.13198625 C24.4794191,6.55671373 25.7171376,9.72397589 25.7171376,9.72397589 C25.7171376,9.72397589 26.8445965,6.62103185 22.2628761,3.26730119 L18.6616017,2.26253321 Z" id="Fill-212" fill="#010000"></path>
+                                        <path d="M7.54262547,8.07197833 C7.54262547,8.07197833 11.335963,1.94656468 18.3176057,2.21450764 C18.3176057,2.21450764 21.2563349,1.97249465 24.9848475,5.47412012 C24.9848475,5.47412012 23.0514446,1.041717 17.3522547,0.735419312 C11.6525247,0.429121619 8.27406652,3.80920039 7.54262547,8.07197833" id="Fill-214" fill="#FCA165"></path>
+                                    </g>
+                                    <path d="M13.7029025,25.5533892 C13.7029025,25.5533892 32.8841631,44.2304203 33.3647817,43.5213997 C35.9107611,39.7749564 48.6601425,32.7009873 54.1807611,26.9346471 C54.4102456,26.6261419 54.8248332,24.4352141 55.7611734,23.13841 C55.7611734,23.13841 57.6522559,16.7528945 59.1319982,17.2410904 C60.6128229,17.7282038 58.321225,20.4668636 59.284627,22.8786162 C60.2491116,25.2914512 64.6656064,19.5381007 64.8420497,19.0217605 L65.9808126,17.5333584 C65.9808126,17.5333584 67.0232353,20.9193378 67.0935961,22.3330491 C67.3620497,27.6404203 58.8689569,30.4938223 58.8689569,30.4938223 C58.8689569,30.4938223 43.3051425,56.0889254 30.1227714,56.8271729 C26.3254518,57.0415027 12.8705192,48.7154648 8.35984914,40.6369596 C5.63526151,35.7582483 4.86341797,31.7743686 9.37841797,28.4825645 L13.7029025,25.5533892 Z" id="Fill-169" fill="#FFBE9D" transform="translate(36.626663, 37.022842) rotate(35.000000) translate(-36.626663, -37.022842) "></path>
+                                    <path d="M63.9767165,16.0449742 C63.9345,16.0189948 64.3458402,15.2915722 64.8004794,14.3693041 C65.258366,13.4481186 65.5863557,12.6795619 65.6329021,12.6968814 C65.676201,12.7131186 65.4174897,13.5163144 64.9552732,14.4461598 C64.4963041,15.3781701 64.0146031,16.0698711 63.9767165,16.0449742" id="Fill-171" fill="#EB996E"></path>
+                                    <path d="M16.0983985,6.82072721 C16.0983985,6.82072721 8.50101953,9.73989623 8.27065105,20.6814184 C8.18978464,24.5222287 9.24743448,28.8623328 11.9123084,34.8904323 L27.4189896,27.4536265 L25.6602035,19.7580498 C24.6000737,15.0075566 23.5114196,12.0005976 22.3942411,10.737173 C21.0452195,9.21155535 18.9466053,7.90607343 16.0983985,6.82072721 Z" id="Fill-173" fill="#4EA7FF"></path>
+                                    <path d="M25.1695482,28.4369964 C25.150523,28.4360085 25.1475191,28.1394015 25.1555297,27.6053118 C25.1675456,27.0702366 25.1775588,26.2976788 25.1805628,25.3418355 C25.1865707,23.4321198 25.1254899,20.7922187 24.8821679,17.8892144 C24.6358419,14.9852246 24.2533357,12.370944 23.9259024,10.4878343 C23.7626864,9.58224669 23.6265062,8.83136777 23.5223683,8.25983263 C23.4242385,7.73461154 23.3791789,7.44194613 23.3962014,7.43699639 C23.4142252,7.43406289 23.4953326,7.71983046 23.6245035,8.23913911 C23.7576798,8.75844777 23.9249011,9.51523913 24.1121489,10.4553159 C24.4876458,12.3334986 24.9011931,14.9527062 25.1485204,17.86655 C25.393845,20.7803938 25.4248861,23.4311344 25.3688119,25.3447917 C25.3427775,26.3016204 25.3037258,27.0761491 25.2606688,27.6092534 C25.2196145,28.1433431 25.1885734,28.4379793 25.1695482,28.4369964" id="Fill-161-Copy" fill="#263238" transform="translate(24.392677, 17.936996) rotate(-13.000000) translate(-24.392677, -17.936996) "></path>
+                                    <path d="M9,16.4943548 C16.3105521,14.1715981 20.8589325,12.7930792 22.6451414,12.3587979 L23.6451938,15.3445824 L8.45817389,21.0546134 L9,16.4943548 Z" id="Path-5" fill="#E0F5EA" opacity="0.700985863"></path>
+                                    <path d="M9.11544665,26.9893508 C17.8346594,23.3179711 23.0873702,21.2651406 24.8735791,20.8308594 C24.9382222,20.3657099 24.9792216,20.1541991 24.9965775,20.1963268 C25.2311149,20.7656167 25.5679554,21.894254 26.0070988,23.5822386 L10.1524188,30.5525738 L9.11544665,26.9893508 Z" id="Path-5-Copy" fill="#E0F5EA" opacity="0.700985863"></path>
+                                    <polygon id="Path-6" fill="#E0F5EA" opacity="0.700985863" points="27.8077075 3.44707983 33.7744087 8.17881143 33.0991733 9.9543722 27.5918351 5.94981959"></polygon>
+                                    <polygon id="Path-6" fill="#E0F5EA" opacity="0.700985863" transform="translate(40.432578, 7.678307) scale(-1, 1) translate(-40.432578, -7.678307) " points="39.231812 5.43622162 41.865156 8.14483201 41.1899205 9.92039278 39 7.43027451"></polygon>
+                                </g>
+                            </g>
+                            <path d="M51.2669864,62.685209 C52.4415477,62.5982098 53.2253512,62.6063146 53.6183969,62.7095233 C54.0114426,62.812732 54.4794561,63.1483562 55.0224374,63.7163958 L55.8357371,63.9503773 L55.0224374,64.9075783 L53.6183969,64.2444769 C52.3076649,64.2217533 51.593268,64.2217533 51.4752062,64.2444769 C51.2981135,64.2785623 47.7983267,63.7703102 47.3569922,63.9503773 C46.9156577,64.1304445 46.4585854,64.6046474 45.9245085,64.5474956 C45.5684571,64.5093944 45.0986949,64.1396847 44.5152216,63.4383665 C45.5709739,63.6022632 46.1950677,63.5306905 46.3875028,63.2236485 C46.5799379,62.9166064 47.2155194,62.7452313 48.2942474,62.7095233 L51.2669864,62.685209 Z" id="Path-7" stroke="none" fill="#000000" fill-rule="evenodd"></path>
+                            <circle id="Oval" stroke="#000000" stroke-width="0.5" fill="none" cx="55" cy="58" r="3"></circle>
+                            <circle id="Oval-Copy-3" stroke="#000000" stroke-width="0.5" fill="none" cx="47" cy="58" r="3"></circle>
+                            <path d="M52,58.0221986 C51.5444993,57.4251518 50.8300365,57.4509507 49.8566116,58.0995955" id="Path-8" stroke="#000000" stroke-width="0.5" fill="none"></path>
+                            <line x1="37.6916964" y1="57.3067913" x2="43.9567732" y2="57.7655439" id="Path-9" stroke="#000000" stroke-width="0.5" fill="none"></line>
+                            <g id="Path-10" stroke="none" fill="none" opacity="0.578171503" fill-rule="evenodd">
+                                <use fill-opacity="0.535647946" fill="#8B8585" xlink:href="#path-5"></use>
+                                <use fill-opacity="0.3" fill="url(#pattern-6)" xlink:href="#path-5"></use>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_person_add_blue.svg b/src/assets/imgs/ic_person_add_blue.svg
new file mode 100644
index 000000000..a1eaf3f90
--- /dev/null
+++ b/src/assets/imgs/ic_person_add_blue.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>0062E55A-A0EA-4803-A2C5-F120BAEF88DF</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="My-group-Empty" transform="translate(-280.000000, -98.000000)">
+            <g id="group-section" transform="translate(8.000000, 82.000000)">
+                <g id="ic_person_add" transform="translate(272.000000, 16.000000)">
+                    <g id="Icon-24px">
+                        <polygon id="Shape" points="0 0 24 0 24 24 0 24"></polygon>
+                        <path d="M15,12 C17.21,12 19,10.21 19,8 C19,5.79 17.21,4 15,4 C12.79,4 11,5.79 11,8 C11,10.21 12.79,12 15,12 L15,12 Z M6,10 L6,7 L4,7 L4,10 L1,10 L1,12 L4,12 L4,15 L6,15 L6,12 L9,12 L9,10 L6,10 L6,10 Z M15,14 C12.33,14 7,15.34 7,18 L7,20 L23,20 L23,18 C23,15.34 17.67,14 15,14 L15,14 Z" id="Shape" fill="#024F9D"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_person_add_white.svg b/src/assets/imgs/ic_person_add_white.svg
new file mode 100644
index 000000000..02017333c
--- /dev/null
+++ b/src/assets/imgs/ic_person_add_white.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>0062E55A-A0EA-4803-A2C5-F120BAEF88DF</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="My-group-Empty" transform="translate(-280.000000, -98.000000)">
+            <g id="group-section" transform="translate(8.000000, 82.000000)">
+                <g id="ic_person_add" transform="translate(272.000000, 16.000000)">
+                    <g id="Icon-24px">
+                        <polygon id="Shape" points="0 0 24 0 24 24 0 24"></polygon>
+                        <path d="M15,12 C17.21,12 19,10.21 19,8 C19,5.79 17.21,4 15,4 C12.79,4 11,5.79 11,8 C11,10.21 12.79,12 15,12 L15,12 Z M6,10 L6,7 L4,7 L4,10 L1,10 L1,12 L4,12 L4,15 L6,15 L6,12 L9,12 L9,10 L6,10 L6,10 Z M15,14 C12.33,14 7,15.34 7,18 L7,20 L23,20 L23,18 C23,15.34 17.67,14 15,14 L15,14 Z" id="Shape" fill="#ffffff"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_profile1.png b/src/assets/imgs/ic_profile1.png
deleted file mode 100644
index 7a0d6ceff..000000000
Binary files a/src/assets/imgs/ic_profile1.png and /dev/null differ
diff --git a/src/assets/imgs/ic_profile_default.png b/src/assets/imgs/ic_profile_default.png
index 74c829e5f..6dc98541d 100644
Binary files a/src/assets/imgs/ic_profile_default.png and b/src/assets/imgs/ic_profile_default.png differ
diff --git a/src/assets/imgs/ic_profile_selected.png b/src/assets/imgs/ic_profile_selected.png
deleted file mode 100644
index dee26e05a..000000000
Binary files a/src/assets/imgs/ic_profile_selected.png and /dev/null differ
diff --git a/src/assets/imgs/ic_program.svg b/src/assets/imgs/ic_program.svg
new file mode 100644
index 000000000..3239f524a
--- /dev/null
+++ b/src/assets/imgs/ic_program.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 480 480" style="enable-background:new 0 0 480 480;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#024F9D;}
+</style>
+<g>
+	<g>
+		<path class="st0" d="M431.9,103.5c0-0.7-0.2-1.4-0.4-2.1c-0.1-0.3-0.2-0.5-0.3-0.7c-0.4-0.9-0.9-1.7-1.6-2.3l-96-96
+			c-0.7-0.7-1.5-1.2-2.3-1.6c-0.3-0.1-0.5-0.2-0.8-0.3c-0.7-0.2-1.3-0.4-2-0.4c-0.1,0-0.3-0.1-0.5-0.1H56c-4.4,0-8,3.6-8,8v464
+			c0,4.4,3.6,8,8,8h368c4.4,0,8-3.6,8-8V104C432,103.8,431.9,103.7,431.9,103.5z M336,27.3L404.7,96H336V27.3z M416,464H64V16h256
+			v88c0,4.4,3.6,8,8,8h88V464z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path class="st0" d="M376,152c-13.3,0-24,10.7-24,24v8h-16c-4.4,0-8,3.6-8,8v48h16v-40h8v208c0,2.1,0.8,4.2,2.3,5.7l16,16
+			c3.1,3.1,8.2,3.1,11.3,0l16-16c1.5-1.5,2.3-3.5,2.3-5.7V176C400,162.7,389.3,152,376,152z M384,404.7l-8,8l-8-8V224h16V404.7z
+			 M384,208h-16v-32c0-4.4,3.6-8,8-8s8,3.6,8,8V208z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<rect x="96" y="48" class="st0" width="192" height="16"/>
+	</g>
+</g>
+<g>
+	<g>
+		<rect x="96" y="96" class="st0" width="32" height="16"/>
+	</g>
+</g>
+<g>
+	<g>
+		<rect x="144" y="96" class="st0" width="144" height="16"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path class="st0" d="M296,168h-48v16h28.7l-56,56H176c-2.1,0-4.2,0.8-5.7,2.3l-40,40l11.3,11.3l37.7-37.7H224
+			c2.1,0,4.2-0.8,5.7-2.3l58.3-58.3V224h16v-48C304,171.6,300.4,168,296,168z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path class="st0" d="M112,312V144H96v176c0,4.4,3.6,8,8,8h200v-16H112z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<rect x="96" y="360" class="st0" width="32" height="16"/>
+	</g>
+</g>
+<g>
+	<g>
+		<rect x="144" y="360" class="st0" width="80" height="16"/>
+	</g>
+</g>
+<g>
+	<g>
+		<rect x="96" y="408" class="st0" width="128" height="16"/>
+	</g>
+</g>
+</svg>
diff --git a/src/assets/imgs/ic_project.svg b/src/assets/imgs/ic_project.svg
new file mode 100644
index 000000000..5827dfc47
--- /dev/null
+++ b/src/assets/imgs/ic_project.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 480 480" style="enable-background:new 0 0 480 480;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#024F9D;}
+</style>
+<g>
+	<g>
+		<g>
+			<path class="st0" d="M472,0H112c-4.4,0-8,3.6-8,8v120h16V16h344v440c0.1,4.2-3.2,7.7-7.4,8c-0.7,0-1.4-0.1-2.1-0.1
+				c-1.4,0-2.8-0.1-4.2-0.2c-0.1,0-0.2,0-0.4,0c-26.1-2.9-46.8-23.5-49.6-49.6c0-0.1,0-0.2-0.1-0.3c-0.2-1.9-0.3-3.8-0.3-5.7v-16
+				c0-4.4-3.6-8-8-8H120V240h-16v144H40c-4.4,0-8,3.6-8,8v16c0,39.7,32.3,72,72,72h352.8c13-0.3,23.3-11,23.2-24V8
+				C480,3.6,476.4,0,472,0z M104,464c-30.9,0-56-25.1-56-56v-8h336v8c0,2.6,0.2,5.3,0.5,7.9c0.1,0.7,0.2,1.4,0.3,2.1
+				c0.3,1.9,0.6,3.9,1,5.8c0.1,0.7,0.3,1.3,0.5,2c0.5,1.9,1,3.8,1.7,5.7c0.2,0.5,0.4,1.1,0.6,1.6c0.7,2,1.6,3.9,2.5,5.8
+				c0.2,0.4,0.4,0.8,0.6,1.2c1,2,2.1,4,3.3,5.9c0.2,0.3,0.3,0.5,0.5,0.8c1.3,2,2.7,4,4.2,5.9l0.3,0.3c1.7,2.2,3.6,4.3,5.6,6.3
+				c1.7,1.7,3.5,3.3,5.4,4.8L104,464z"/>
+			<path class="st0" d="M264,224c2.1,0,4.2-0.8,5.7-2.3l32-32c3.1-3.1,3.1-8.2,0-11.3l-32-32c-1.5-1.5-3.5-2.3-5.7-2.3H40
+				c-22.1,0-40,17.9-40,40s17.9,40,40,40L264,224L264,224z M261.9,161.2l22.8,22.8l-22.8,22.8l-5.7-22.8L261.9,161.2z M64,160h181.8
+				l-4,16H80v16h161.8l4,16H64V160z M16,184c0-13.3,10.7-24,24-24h8v48h-8C26.7,208,16,197.3,16,184z"/>
+			<path class="st0" d="M184,344h240c4.4,0,8-3.6,8-8V96c0-4.4-3.6-8-8-8c-2.1,0-4.2,0.8-5.7,2.3l-240,240c-3.1,3.1-3.1,8.2,0,11.3
+				C179.8,343.2,181.9,344,184,344z M416,115.3V136h-16v16h16v16h-16v16h16v16h-16v16h16v16h-16v16h16v16h-16v16h16v16h-16v16h16v16
+				h-16v-16h-16v16h-16v-16h-16v16h-16v-16h-16v16h-16v-16h-16v16h-16v-16h-16v16h-16v-16h-16v16h-20.7L416,115.3z"/>
+			<path class="st0" d="M299.9,296H376c4.4,0,8-3.6,8-8v-76.1c0-4.4-3.6-8-8-8c-2.1,0-4.2,0.8-5.7,2.3l-76.1,76.1
+				c-3.1,3.1-3.1,8.2,0,11.3C295.7,295.2,297.8,296,299.9,296z M368,231.2V280h-48.8L368,231.2z"/>
+			<rect x="208" y="48" class="st0" width="160" height="16"/>
+			<rect x="184" y="80" class="st0" width="208" height="16"/>
+			<rect x="136" y="248" class="st0" width="48" height="16"/>
+			<rect x="136" y="280" class="st0" width="32" height="16"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/src/assets/imgs/ic_qr_scanner.svg b/src/assets/imgs/ic_qr_scanner.svg
index bdd59fed6..1b21f541a 100644
--- a/src/assets/imgs/ic_qr_scanner.svg
+++ b/src/assets/imgs/ic_qr_scanner.svg
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 53.1 (72631) - https://sketchapp.com -->
-    <title>221CA116-48EF-4BEF-8068-990514CCAED4@1.5x</title>
-    <desc>Created with sketchtool.</desc>
-    <g id="Library" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Library_single_textbook" transform="translate(-166.000000, -784.000000)" fill="#FFFFFF">
-            <g id="QR-code" transform="translate(166.000000, 784.000000)">
-                <g id="QR-Code-Copy">
-                    <polygon id="Path" points="2.24 9.0342 0 9.0342 0 0 9.0342 0 9.0342 2.24 2.24 2.24"></polygon>
-                    <polygon id="Path" points="28 28 18.9658 28 18.9658 25.76 25.76 25.76 25.76 18.9658 28 18.9658"></polygon>
-                    <polygon id="Path" points="28 9.0342 25.76 9.0342 25.76 2.24 18.9658 2.24 18.9658 0 28 0"></polygon>
-                    <polygon id="Path" points="9.0342 28 0 28 0 18.9658 2.24 18.9658 2.24 25.76 9.0342 25.76"></polygon>
-                    <polygon id="Path" points="23.52 23.52 12.88 23.52 12.88 15.12 4.48 15.12 4.48 12.88 15.12 12.88 15.12 21.28 23.52 21.28"></polygon>
-                    <polygon id="Path" points="23.52 19.09264 21.28 19.09264 21.28 15.12 19.09264 15.12 19.09264 19.09264 16.85264 19.09264 16.85264 12.88 23.52 12.88"></polygon>
-                    <path d="M11.14764,11.14764 L4.48,11.14764 L4.48,4.48 L11.14764,4.48 L11.14764,11.14764 Z M6.72,8.90764 L8.90764,8.90764 L8.90764,6.72 L6.72,6.72 L6.72,8.90764 Z" id="Shape" fill-rule="nonzero"></path>
-                    <path d="M23.52,11.14764 L16.85264,11.14764 L16.85264,4.48 L23.52,4.48 L23.52,11.14764 Z M19.09264,8.90764 L21.28,8.90764 L21.28,6.72 L19.09236,6.72 L19.09236,8.90764 L19.09264,8.90764 Z" id="Shape" fill-rule="nonzero"></path>
-                    <path d="M11.14764,23.52 L4.48,23.52 L4.48,16.85264 L11.14764,16.85264 L11.14764,23.52 Z M6.72,21.28 L8.90764,21.28 L8.90764,19.09236 L6.72,19.09236 L6.72,21.28 Z" id="Shape" fill-rule="nonzero"></path>
-                    <rect id="Rectangle" x="12.88" y="4.48" width="2.24" height="6.66764"></rect>
+<svg width="38px" height="38px" viewBox="0 0 38 38" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>53146F08-9AB7-4B38-9DCA-F9B7248172EB</title>
+    <g id="Final-layouts" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Home-page-01" transform="translate(-161.000000, -1000.000000)">
+            <g id="Group-5-Copy" transform="translate(0.000000, 985.000000)">
+                <g id="Group-5" transform="translate(162.000000, 16.000000)">
+                    <g id="Group-18" stroke="#333333" stroke-linecap="round" stroke-width="2">
+                        <path d="M10,-1.16351373e-13 L4,-1.16351373e-13 C1.790861,-1.15945561e-13 -2.705415e-16,1.790861 0,4 L0,9.54563174 L0,9.54563174" id="Path-4"></path>
+                        <path d="M10,26.0181468 L4,26.0181468 C1.790861,26.0181468 -2.705415e-16,27.8090078 0,30.0181468 L0,35.5637785 L0,35.5637785" id="Path-4-Copy-2" transform="translate(5.000000, 30.790963) scale(1, -1) translate(-5.000000, -30.790963) "></path>
+                        <path d="M36,-1.16351373e-13 L30,-1.16351373e-13 C27.790861,-1.15945561e-13 26,1.790861 26,4 L26,9.54563174 L26,9.54563174" id="Path-4-Copy" transform="translate(31.000000, 4.772816) scale(-1, 1) translate(-31.000000, -4.772816) "></path>
+                        <path d="M36,26.0181468 L30,26.0181468 C27.790861,26.0181468 26,27.8090078 26,30.0181468 L26,35.5637785 L26,35.5637785" id="Path-4-Copy-3" transform="translate(31.000000, 30.790963) scale(-1, -1) translate(-31.000000, -30.790963) "></path>
+                    </g>
+                    <g id="Group-6-Copy" transform="translate(6.000000, 6.000000)" fill-rule="nonzero">
+                        <polygon id="Shape" fill="#F7B500" points="23.25 23.25 10.2573529 23.25 10.2573529 13.1842105 0 13.1842105 0 10.5 12.9926471 10.5 12.9926471 20.5657895 23.25 20.5657895"></polygon>
+                        <polygon id="Shape" fill="#B620E0" points="24 18 20.9763145 18 20.9763145 12.7245809 18.0236855 12.7245809 18.0236855 18 15 18 15 9.75 24 9.75"></polygon>
+                        <path d="M9,9 L0,9 L0,0 L9,0 L9,9 Z M3.02355856,5.97644144 L5.97644144,5.97644144 L5.97644144,3.02355856 L3.02355856,3.02355856 L3.02355856,5.97644144 Z" id="Shape" fill="#FF7648"></path>
+                        <path d="M24,9 L15,9 L15,0 L24,0 L24,9 Z M18.0236855,5.97644144 L20.9763145,5.97644144 L20.9763145,3.02355856 L18.0233076,3.02355856 L18.0233076,5.97644144 L18.0236855,5.97644144 Z" id="Shape" fill="#737EFD"></path>
+                        <path d="M9,24 L0,24 L0,15 L9,15 L9,24 Z M3.02355856,20.9763145 L5.97644144,20.9763145 L5.97644144,18.0233076 L3.02355856,18.0233076 L3.02355856,20.9763145 Z" id="Shape" fill="#4E52E0"></path>
+                        <rect id="Rectangle-path" fill="#F27515" x="11.25" y="0" width="2.25" height="9"></rect>
+                    </g>
                 </g>
             </g>
         </g>
diff --git a/src/assets/imgs/ic_report.svg b/src/assets/imgs/ic_report.svg
new file mode 100644
index 000000000..06b5a4aa4
--- /dev/null
+++ b/src/assets/imgs/ic_report.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#024F9D;}
+</style>
+<g id="Analysis-report-document-develop-infromation">
+	<path class="st0" d="M493.7,106.3l-88-88c-1.5-1.5-3.6-2.3-5.7-2.3H200c-13.2,0-24,10.8-24,24v48.4
+		C83.4,92.7,11.9,171.3,16.3,263.9c4.1,86.5,73.3,155.7,159.7,159.7V472c0,13.2,10.8,24,24,24h272c13.2,0,24-10.8,24-24V112
+		C496,109.9,495.2,107.8,493.7,106.3z M408,43.3l60.7,60.7H416c-4.4,0-8-3.6-8-8V43.3z M32,256c0.1-80.8,63.3-147.4,144-151.8v148.5
+		L71.2,357.5C46,329.7,32,293.5,32,256L32,256z M82.5,368.8L187.3,264h148.5c-4.3,83.7-75.5,148.1-159.2,143.8
+		C141.6,406,108.4,392.3,82.5,368.8L82.5,368.8z M480,472c0,4.4-3.6,8-8,8H200c-4.4,0-8-3.6-8-8v-48.4c89.5-4.3,159.8-78,160-167.6
+		c0-4.4-3.6-8-8-8H192V40c0-4.4,3.6-8,8-8h192v64c0,13.2,10.8,24,24,24h64V472z"/>
+	<path class="st0" d="M216,56c-4.4,0-8,3.6-8,8v160c0,4.4,3.6,8,8,8h160c4.4,0,8-3.6,8-8C383.9,131.3,308.7,56.1,216,56z M224,216
+		V72.2c77.6,4.2,139.6,66.2,143.8,143.8H224z"/>
+	<path class="st0" d="M392,320c-39.8,0-72,32.2-72,72s32.2,72,72,72s72-32.2,72-72C463.9,352.3,431.7,320.1,392,320z M392,448
+		c-30.9,0-56-25.1-56-56s25.1-56,56-56s56,25.1,56,56C448,422.9,422.9,448,392,448z"/>
+	<path class="st0" d="M376,404.7l-18.3-18.3l-11.3,11.3l24,24c3.1,3.1,8.2,3.1,11.3,0l48-48l-11.3-11.3L376,404.7z"/>
+	<path class="st0" d="M400,152h64v16h-64V152z"/>
+	<path class="st0" d="M400,200h64v16h-64V200z"/>
+	<path class="st0" d="M400,248h64v16h-64V248z"/>
+</g>
+</svg>
diff --git a/src/assets/imgs/ic_student.svg b/src/assets/imgs/ic_student.svg
index 5651066b3..9237d9668 100644
--- a/src/assets/imgs/ic_student.svg
+++ b/src/assets/imgs/ic_student.svg
@@ -1,133 +1,128 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="148px" height="123px" viewBox="0 0 148 123" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 63.1 (101010) - https://sketch.com -->
-    <title>6630B2CC-9A32-4572-9473-E2B8722EAC4A</title>
-    <desc>Created with sketchtool.</desc>
+<svg width="125px" height="124px" viewBox="0 0 125 124" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>34E64FB2-D37B-46DB-AF1D-46B10F2859C1</title>
     <defs>
-        <polygon id="path-1" points="0.133116342 0.0224021496 23.1353966 0.0224021496 23.1353966 23.7021882 0.133116342 23.7021882"></polygon>
+        <polygon id="path-1" points="0.1157 0.4967 16.068 0.4967 16.068 23.5388469 0.1157 23.5388469"></polygon>
     </defs>
-    <g id="Onboarding-FTUE-01" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="User-Role-Selection" transform="translate(-192.000000, -156.000000)">
-            <g id="Group-4" transform="translate(192.000000, 148.000000)">
-                <g id="Group-3" transform="translate(0.000000, 8.000000)">
-                    <path d="M101.432612,3.83088403 C123.549666,12.238064 131.383898,32.3042185 134.836208,57.9580636 C140.237667,98.0958866 133.868932,99.6097664 129.814462,105.834488 C109.746347,136.644543 54.7125162,123.656618 32.3271487,107.84434 C6.9436747,89.9149552 14.1283018,52.024658 34.5719894,28.9966317 C42.8140151,19.7130469 51.9718049,4.92036084 63.7156595,-0.108999281 C76.1071147,-5.41586487 89.7316062,-0.616935017 101.432612,3.83088403 Z" id="Fill-1" fill="#FFEE46" opacity="0.811351" transform="translate(76.500000, 61.057361) rotate(-270.000000) translate(-76.500000, -61.057361) "></path>
-                    <g id="Group-190" transform="translate(69.469388, 21.789623)">
-                        <path d="M41.8305911,32.0840306 C49.4346668,24.4622411 58.0442732,28.2079703 62.542008,32.2958906 C65.2367616,34.745772 66.9534237,38.1401237 67.8840684,41.6688257 C68.8147131,45.1975276 69.0085021,48.8789525 69.034798,52.5293734 C69.0553773,55.4856517 68.9278996,58.5940787 67.4147445,61.1289337 C65.9827637,63.527142 63.4880872,65.0882452 60.9322443,66.1980697 C56.363625,68.1817444 51.2982427,69.0004768 46.3409021,68.5555136" id="Fill-1" fill="#375A64"></path>
-                        <path d="M45.9197103,29.0938777 C45.91691,29.1053607 46.0198069,29.1432543 46.2187407,29.2052621 C46.4548318,29.2747338 46.7429429,29.3602815 47.0927921,29.464202 C47.8519421,29.6846741 48.9552248,29.9901198 50.2991717,30.4195811 C51.6402604,30.8530614 53.2288731,31.413428 54.8912285,32.2476623 C56.5455809,33.0841932 58.283394,34.2118161 59.7611068,35.7625847 C61.2468227,37.3070377 62.2169112,39.1540658 62.7931334,40.919565 C63.380217,42.6873609 63.6460338,44.3592743 63.8186718,45.7619133 C63.9890232,47.1674229 64.0644809,48.3145668 64.1267907,49.105166 C64.1559448,49.4703229 64.1805257,49.7711755 64.2005334,50.0163359 C64.2211128,50.2253251 64.2365473,50.3344128 64.2479803,50.3338409 C64.2588416,50.3332645 64.2651297,50.2236026 64.266273,50.0140393 C64.2622715,49.7671565 64.2576983,49.4645815 64.2525535,49.0988504 C64.2291158,48.3048063 64.1891004,47.1536434 64.0461882,45.7360767 C63.9015609,44.3213807 63.6580384,42.628798 63.0760997,40.8248309 C62.5078805,39.0260312 61.518356,37.119292 59.9954829,35.5380936 C58.4828995,33.9505796 56.7079292,32.8120479 55.0244228,31.9783878 C53.3323416,31.1481725 51.7231495,30.607901 50.3666263,30.1996831 C49.0078165,29.7960584 47.8942441,29.5244873 47.1242328,29.3413347 C46.7686671,29.2615284 46.4748395,29.1955016 46.2353185,29.1415319 C46.0312398,29.1001933 45.9226265,29.082969 45.9197103,29.0938777" id="Fill-3" fill="#1A2E35"></path>
-                        <path d="M63.9585544,45.8730679 C63.9202539,45.8856992 63.9751322,46.2083693 64.1992186,46.6849105 C64.3112618,46.9214587 64.467322,47.1953264 64.674259,47.4755097 C64.7708677,47.6087116 64.9017753,47.7798072 65.084703,47.8900432 C65.1750235,47.9463095 65.2773487,47.9962602 65.4025399,48.0175036 C65.5231578,48.0421919 65.702084,48.0106139 65.8089823,47.8940622 C65.9164524,47.7907159 65.961041,47.6184721 65.9313152,47.4846961 C65.9044477,47.3514942 65.8444246,47.2510186 65.7809715,47.166045 C65.6517789,46.9920787 65.4945754,46.8824168 65.3699559,46.7767739 C65.1378664,46.5930472 64.9046335,46.407598 64.6645409,46.2169815 C64.2563835,45.9052201 63.9905667,45.7295314 63.9608409,45.7639802 C63.9316868,45.7978548 64.1460552,46.0349771 64.5159122,46.3915219 C64.7399986,46.6005111 64.9583685,46.8031846 65.1755952,47.0052841 C65.3042162,47.122984 65.4379821,47.2269045 65.5248728,47.354939 C65.6209098,47.4904375 65.6472057,47.6075633 65.5774645,47.6661262 C65.5380207,47.7258374 65.3853904,47.7034457 65.2516245,47.6184721 C65.1138571,47.5386658 65.0183917,47.425559 64.9097784,47.2912088 C64.7011265,47.0351397 64.5330617,46.7882568 64.3998674,46.5746745 C64.1357656,46.1463615 64.0037146,45.8564177 63.9585544,45.8730679" id="Fill-5" fill="#1A2E35"></path>
-                        <path d="M51.7989738,64.9040018 C51.7944341,64.9464886 52.2580415,65.050409 53.0217646,65.1520329 C53.7820579,65.246767 54.8641895,65.3472425 56.0452165,65.1296412 C57.2296733,64.9085949 58.2083365,64.3252625 58.7485449,63.7488198 C59.3001862,63.1735254 59.4425268,62.6843529 59.4122294,62.6757407 C59.3619243,62.6470334 59.1498425,63.0833845 58.5896264,63.5828916 C58.0402717,64.0852694 57.1090554,64.5991302 55.9851933,64.8092676 C54.8590447,65.0182568 53.8020656,64.9591198 53.042344,64.9223744 C52.2803358,64.8798876 51.8041521,64.8574959 51.7989738,64.9040018" id="Fill-7" fill="#1A2E35"></path>
-                        <path d="M46.0660533,29.302465 C46.0894909,29.3001684 46.0912058,29.1198866 46.0934924,28.7977906 C46.1009239,28.4779912 46.0946357,28.005469 46.2341181,27.4657716 C46.3604525,26.9306675 46.7577486,26.3370004 47.4580187,26.1446614 C48.1468558,25.9391171 48.9871799,26.0608361 49.7943484,26.3329814 C50.6049468,26.6074232 51.3103617,27.0575537 51.7911185,27.6121789 C52.2821651,28.1604884 52.5091098,28.8121442 52.5742778,29.3627504 C52.7069003,30.5007079 52.1866997,31.113896 52.2535826,31.1339911 C52.2667306,31.1443257 52.4016397,31.0168653 52.5531267,30.7200317 C52.7011838,30.4249206 52.8463827,29.9437862 52.8029374,29.3420811 C52.7640652,28.748414 52.5394072,28.0255641 52.0180632,27.4169692 C51.5087239,26.803207 50.7547188,26.3140345 49.8995318,26.0252391 C49.0523479,25.7410367 48.153144,25.6089831 47.3694131,25.8581625 C46.9824067,25.981604 46.6422755,26.2147073 46.4210473,26.5057993 C46.1946743,26.795169 46.0734847,27.1172649 46.0117466,27.4106536 C45.8917003,28.0020241 45.9362889,28.4808619 45.9677296,28.8041062 C46.0043152,29.1279246 46.0449022,29.3041875 46.0660533,29.302465" id="Fill-9" fill="#1A2E35"></path>
-                        <path d="M66.4980481,53.026938 C66.5094811,53.0280767 66.5272022,52.9264528 66.5512115,52.7318173 C66.5723625,52.5371818 66.608948,52.2506829 66.6341006,51.8797845 C66.6946954,51.1385619 66.7478587,50.0620379 66.729566,48.7305931 C66.6906938,46.0866503 66.32884,42.3219743 64.6173227,38.5905988 C62.8960874,34.858075 60.0475602,32.2307824 57.6917944,31.0038322 C56.5141974,30.3751422 55.4840858,30.0254872 54.7598064,29.8624297 C54.4025258,29.76138 54.112128,29.73784 53.9206256,29.6999464 C53.7274082,29.6700908 53.6256547,29.6603303 53.6239397,29.6712391 C53.5953573,29.7585093 55.2811504,29.906639 57.5803229,31.2047833 C59.8692057,32.4638857 62.6331289,35.0647675 64.3229235,38.7283938 C66.0070016,42.3960391 66.403726,46.109042 66.5009064,48.7363346 C66.5483532,50.0591672 66.5300605,51.1316721 66.5083378,51.8728947 C66.4866151,52.6141173 66.4734672,53.0252059 66.4980481,53.026938" id="Fill-11" fill="#1A2E35"></path>
-                        <path d="M34.1563169,82.8348716 C34.1563169,82.8348716 36.7787649,90.3066458 37.0816096,90.3584547 C40.8103528,90.996347 52.5247894,82.3318768 51.9900674,80.6518953 C51.4553455,78.9719139 49.9149663,71.298554 49.9149663,71.298554 L29.7454727,70.8880395 L34.1563169,82.8348716 Z" id="Fill-53" fill="#1A2E35"></path>
-                        <path d="M41.5651744,73.4298417 C41.2118953,75.254478 51.6269278,85.033137 40.1867609,89.6935435 C32.559983,92.8004812 26.5382423,94.6754333 22.1215391,95.3183999 L20.8943446,70.8880969 L41.5651744,70.9816827 L41.5651744,73.4298417 Z" id="Fill-55" fill="#1A2E35"></path>
-                        <path d="M31.0353988,72.5903827 C31.1045684,72.8378397 31.1903157,73.1438596 31.2949275,73.5164804 C31.5424516,74.36392 31.8785812,75.5127864 32.2878819,76.9125546 C33.1339225,79.7769695 34.2755057,83.7431708 35.6663278,88.0871602 C37.0577216,92.432872 37.3641255,92.3260809 35.9750183,87.9872588 C34.5859111,83.6495849 33.4094574,79.6931442 32.5073952,76.8448053 C32.0575073,75.4203489 31.6865071,74.2691859 31.4149738,73.4785867 C31.2869244,73.1128557 31.1823126,72.8125773 31.0971369,72.5702876 C31.0211076,72.3641691 30.976519,72.2568038 30.9656577,72.2602487 C30.9547963,72.2636936 30.9788056,72.3773745 31.0353988,72.5903827 Z" id="Fill-57" fill="#375A64"></path>
-                        <path d="M40.5681041,71.9126032 C40.5492397,71.9177705 40.5766789,72.0957558 40.6738592,72.4063689 C40.7693246,72.7169819 40.9516807,73.1556295 41.2529397,73.6557108 C41.8411666,74.6518543 43.0239085,75.8931582 44.728566,76.5023272 C46.4360817,77.106903 48.1333077,76.8898758 49.2142961,76.4879735 C49.7619359,76.289319 50.1786681,76.0636796 50.4473431,75.8833977 C50.7171615,75.70369 50.8503557,75.5825451 50.8389227,75.5658949 C50.807482,75.5130734 50.2244,75.939664 49.14284,76.2692239 C48.0784294,76.6028028 46.4572327,76.7693051 44.8371793,76.1957332 C43.2188408,75.6169939 42.0635381,74.4629602 41.4455854,73.5311211 C40.8116266,72.5912439 40.6258407,71.8913598 40.5681041,71.9126032" id="Fill-59" fill="#375A64"></path>
-                        <polygon id="Fill-96" fill="#FFBF9D" points="70.5883114 69.7337762 70.268188 76.3347339 73.6449189 80.4352854 78.4833565 78.4395536 75.1963745 73.8601642 75.3987382 70.2424696"></polygon>
-                        <path d="M73.6447474,80.4351132 L74.9932676,80.7595057 C75.4002817,80.8576847 75.8255886,80.6992204 76.0696827,80.3581776 L76.3309263,79.9930207 L76.6590529,80.0642148 C77.0374846,80.1451694 77.4233477,79.9683324 77.6102769,79.6284379 L77.8000644,79.2822278 L77.8149273,79.2799312 C78.2305161,79.2328512 78.5294886,78.8567855 78.483185,78.4393813 L76.4018108,78.1660878 L73.6447474,80.4351132 Z" id="Fill-98" fill="#FFBF9D"></path>
-                        <path d="M76.7972205,80.0751236 C76.8057952,79.9838343 76.2958843,79.8626895 75.6733584,79.7203013 C75.050261,79.5802096 74.5386351,79.4693994 74.5071944,79.5555213 C74.4763253,79.6376242 74.9559389,79.8919709 75.6019023,80.0378041 C76.2472941,80.1847855 76.7892174,80.1629679 76.7972205,80.0751236" id="Fill-100" fill="#FF9A6C"></path>
-                        <path d="M77.8947295,79.2683335 C77.9095924,79.1787667 77.6003302,79.0507321 77.2144671,78.940496 C76.8274607,78.83026 76.4976192,78.7762902 76.4638919,78.8601156 C76.4301646,78.9427926 76.7205623,79.1380023 77.1258615,79.2534057 C77.530589,79.3693832 77.8798666,79.3556037 77.8947295,79.2683335" id="Fill-102" fill="#FF9A6C"></path>
-                        <path d="M46.2310312,36.9194317 C46.2310312,36.9194317 72.474296,48.0481056 76.3615096,74.0150114 L70.0362128,77.0361682 C70.0362128,77.0361682 61.9765327,61.7150795 50.3137487,57.3217135 L52.6740877,67.2234372 C53.2188692,69.5068162 51.5119251,71.7069441 49.1744522,71.7345031 L21.5432234,72.0623405 C21.5432234,72.0623405 19.0165346,71.282076 19.0165346,67.9623632 C19.0165346,64.6432246 20.9601414,62.4959182 20.9601414,62.4959182 L21.3488628,41.2140446 C21.3488628,41.2140446 24.8479266,33.4050834 32.2347757,32.8188802 C39.6216248,32.2332512 46.2310312,36.9194317 46.2310312,36.9194317" id="Fill-104" fill="#00C2F6"></path>
-                        <path d="M46.5129113,47.8237293 C46.4768974,47.7996152 46.2139389,48.3950047 46.2711038,49.3854067 C46.3088326,50.3671966 46.5403505,51.712995 47.0788439,53.115634 C47.3480906,53.8258527 47.7488166,54.4327251 48.1038106,54.9615137 C48.4650929,55.4960437 48.8275184,55.9547864 49.1625047,56.3130536 C49.8341923,57.0313104 50.3675409,57.3379044 50.3864053,57.3074747 C50.4189893,57.2649878 49.943949,56.8986826 49.3339994,56.1609049 C49.0293105,55.7923031 48.6943241,55.3306896 48.352478,54.7961596 C48.0094886,54.2535915 47.6356301,53.6725557 47.3801029,52.9950633 C46.8570441,51.6354853 46.5935138,50.3195424 46.4997634,49.3704789 C46.3871485,48.4122291 46.5592149,47.8398054 46.5129113,47.8237293" id="Fill-106" fill="#1A2E35"></path>
-                        <path d="M21.7409707,63.1154218 C21.7353547,63.1372394 21.9737324,63.2158974 22.4099006,63.3399129 C22.8454972,63.4679475 23.4851725,63.6183738 24.2814796,63.7728191 C25.8735222,64.0834321 28.1138148,64.3463911 30.5947717,64.2993111 C33.0763003,64.2470638 35.3045883,63.8945381 36.8829114,63.520769 C37.6729303,63.3347456 38.3063175,63.1590569 38.7361976,63.013798 C39.167221,62.8719839 39.4021687,62.7841395 39.395455,62.7628961 C39.3798744,62.7100747 38.4166458,62.9833682 36.8354645,63.2951295 C35.2554265,63.6091875 33.0454312,63.9215229 30.5884836,63.9737702 C28.1321076,64.0197019 25.9118227,63.7963591 24.3203517,63.5454572 C22.7277375,63.2962778 21.7542191,63.0620262 21.7409707,63.1154218" id="Fill-110" fill="#1A2E35"></path>
-                        <path d="M50.7916473,57.3414067 C50.8465256,57.3557603 51.062609,56.5243968 51.5622303,55.2406061 C52.0584216,53.9562413 52.8867411,52.233803 54.0889191,50.5130871 C55.2962419,48.7963902 56.6327574,47.4327932 57.6685855,46.5308097 C58.7044136,45.6259555 59.4104001,45.1413761 59.3783878,45.0948703 C59.3663832,45.0759235 59.1800256,45.1809922 58.8513274,45.388259 C58.5209142,45.5909325 58.063595,45.9193441 57.5211,46.3545469 C56.4361101,47.2209333 55.0498611,48.5816596 53.8236739,50.3259155 C52.6020599,52.0730421 51.7937481,53.8419862 51.3472902,55.1602256 C51.1220605,55.8199195 50.9682869,56.3624876 50.8893993,56.7437206 C50.8053669,57.1243795 50.7699247,57.3362394 50.7916473,57.3414067" id="Fill-114" fill="#FAFAFA"></path>
-                        <path d="M22.1425833,53.606127 C22.1347659,53.6267962 22.3857198,53.735884 22.8470406,53.9150176 C23.3060748,54.0987443 23.9869088,54.3243838 24.8380943,54.564951 C26.5393219,55.0495303 28.9591123,55.5151628 31.6641556,55.6041554 C34.3709139,55.6874066 36.8152853,55.3762194 38.5433804,55.0007279 C39.4082854,54.8147045 40.1016957,54.6327002 40.5715912,54.4788291 C41.0432017,54.3289769 41.2998721,54.2365394 41.2936968,54.215296 C41.2781494,54.1596038 40.2286018,54.4621788 38.499935,54.7745143 C36.7729832,55.0897205 34.3526211,55.3612916 31.6744453,55.2791887 C28.9979844,55.1907702 26.599345,54.7664763 24.8958308,54.3421823 C23.1906017,53.920759 22.162205,53.551009 22.1425833,53.606127" id="Fill-116" fill="#FAFAFA"></path>
-                        <path d="M24.4206761,45.814218 C24.4138163,45.8354614 24.6213249,45.9215833 25.0026149,46.0605266 C25.3833331,46.2006183 25.9412626,46.3826226 26.6358162,46.5910376 C28.0249234,47.0078677 29.9702452,47.5022075 32.1505146,47.8914786 C34.3313558,48.278453 36.3281259,48.4857198 37.7749697,48.5735641 C38.4986774,48.6177734 39.0851893,48.6390168 39.4904885,48.6384426 C39.8957877,48.6401651 40.1204458,48.6304046 40.1215915,48.6080129 C40.123304,48.5586363 39.2309598,48.490313 37.7938341,48.3433316 C36.3567084,48.1974984 34.3765161,47.9552088 32.2071079,47.571105 C30.038843,47.1841306 28.0963796,46.7282586 26.6969827,46.3694172 C25.2970141,46.0111501 24.435539,45.767138 24.4206761,45.814218" id="Fill-118" fill="#FAFAFA"></path>
-                        <path d="M58.6462197,62.4964349 C58.6553661,62.5171042 58.8308623,62.4568188 59.1435544,62.3276359 C59.4579613,62.2041945 59.8958445,61.9837224 60.4171885,61.6771284 C61.460448,61.0685335 62.8055382,60.0299032 63.9882801,58.5962604 C65.1653055,57.1574503 65.9250271,55.6336665 66.3228948,54.4888192 C66.522972,53.9169697 66.6555946,53.442725 66.7161894,53.1091461 C66.7825007,52.7772897 66.8087965,52.5924146 66.7870739,52.5872473 C66.7316239,52.5734678 66.5578426,53.2997626 66.1085264,54.4061422 C65.6626402,55.5119476 64.889199,56.9823357 63.7378978,58.3889937 C62.5820234,59.7904843 61.2918115,60.8331336 60.2959989,61.4819187 C59.2996146,62.135297 58.6222104,62.4441876 58.6462197,62.4964349" id="Fill-120" fill="#FAFAFA"></path>
-                        <path d="M6.27893605,13.3603798 L6.27893605,13.3603798 L6.10058155,13.2484213 C4.58399661,12.2574452 2.78558868,11.0368105 1.9258285,10.2852533 C0.326354445,8.88605924 0.445829098,8.73620711 0.635616584,8.57200132 C1.14609919,8.13105711 3.54016543,10.9231296 3.36352587,10.0154046 C3.18688632,9.10710549 0.0502479519,6.95118687 0.60188929,6.5119651 C1.3210238,5.94011558 3.77511319,8.91132167 4.00091457,9.14672157 C4.21985616,9.37580587 4.96014168,9.68584476 4.74520164,9.48431948 C4.43651115,9.19494984 0.869992697,5.43888604 1.57140609,4.87048139 C1.9595558,4.55527518 2.44374254,5.3263534 2.44374254,5.3263534 C2.44374254,5.3263534 5.20137759,8.47439648 5.523216,8.19478733 C5.85077091,7.91115916 4.29188394,6.00614239 3.72194983,5.40214069 C3.15944716,4.80560288 3.20632238,4.28657481 3.66992977,4.24868116 C3.98605169,4.22284459 5.77302664,6.03025652 6.32295303,6.64114798 C6.87287942,7.25146528 8.35173553,8.95495677 8.28542424,7.50351542 C8.28428094,7.48054958 8.28656753,7.45930617 8.28542424,7.43691448 C8.18195576,6.00901312 8.57296371,4.87450042 8.90852171,4.62359857 C9.23550497,4.37843818 9.67624639,4.6850322 9.65795362,5.09669496 C9.66024021,5.16387005 9.65395207,5.23219344 9.62594127,5.30281341 C9.61450829,5.33209486 9.60707685,5.37343338 9.59678717,5.40615971 C9.51847125,5.81035856 9.52247279,6.40804466 9.54190886,6.87195471 C9.56077328,7.31117648 9.65109383,7.74523093 9.81515711,8.15287467 C10.0049446,8.62367447 10.1861573,9.02270601 10.3473624,9.35341417" id="Fill-122" fill="#FFBF9D"></path>
-                        <path d="M10.3474767,8.80424342 C11.1249194,9.19523692 31.154359,32.8190525 31.154359,32.8190525 L21.8193299,41.737838 C21.8193299,41.737838 13.7539334,32.915509 9.09385033,25.1076962 C7.03134054,21.6524849 6.59517231,18.6008984 7.20340691,14.618621 L5.43815462,13.1424914 L10.3474767,8.80424342 Z" id="Fill-124" fill="#00C2F6"></path>
-                        <path d="M19.5192428,31.3506738 C19.4214908,31.3977538 20.6385317,33.3693715 21.1387246,36.125847 C21.6709298,38.8783034 21.2507678,41.1593858 21.3588095,41.1674771 C21.395395,41.1737395 21.5491686,40.6179661 21.6372026,39.6907201 C21.7269515,38.7663449 21.7183767,37.4670523 21.4577047,36.0661358 C21.1936029,34.6657934 20.7311388,33.4531969 20.3126917,32.6241299 C19.8953879,31.7933405 19.5506835,31.3311529 19.5192428,31.3506738" id="Fill-126" fill="#1A2E35"></path>
-                        <path d="M13.798865,32.0840306 C13.8463119,32.101255 14.1292782,31.3921846 14.644334,30.2754704 C15.1576748,29.157608 15.9271145,27.6424364 16.9223555,26.0554966 C17.9204547,24.4691309 18.9522813,23.1198875 19.7348688,22.1736948 C20.5168847,21.2263537 21.0330838,20.6642646 20.9970699,20.6286676 C20.9810638,20.6131656 20.83415,20.7354588 20.5820527,20.972007 C20.3276689,21.2068327 19.9778197,21.5650999 19.5616592,22.0232685 C18.7287665,22.9367349 17.6569245,24.2790885 16.6479639,25.8815303 C15.6424332,27.4851204 14.8975745,29.0341665 14.4339671,30.1824587 C14.2018776,30.7566048 14.0303829,31.2285529 13.929201,31.5598352 C13.8251609,31.8905434 13.777714,32.0765667 13.798865,32.0840306" id="Fill-130" fill="#FAFAFA"></path>
-                        <path d="M9.46319278,25.7174393 C9.57695095,25.7662417 10.2543551,23.051679 12.2597,20.352044 C14.2644732,17.6615954 16.5493545,16.0861384 16.4618922,15.9891078 C16.4395979,15.9575297 15.8588024,16.3232608 14.9984706,17.0242932 C14.1415686,17.7264739 13.0131334,18.7874959 11.999028,20.1579826 C10.9872092,21.5313401 10.3178081,22.9368498 9.9388048,23.9823698 C9.74958896,24.5059911 9.61639473,24.9366006 9.54665355,25.2397498 C9.47233917,25.5411765 9.44147012,25.7105496 9.46319278,25.7174393" id="Fill-132" fill="#FAFAFA"></path>
-                        <path d="M30.9862942,36.2342457 C25.6219395,41.5399299 22.1611761,48.7477601 21.3682988,56.2673516 C21.3134205,56.7852314 20.9698594,57.4931535 20.5051088,57.2617726 C20.2770208,57.1480917 20.2118528,56.8575738 20.1764106,56.6043753 C19.100567,48.9200039 21.1928026,40.8371751 25.8591738,34.6518991 C26.4982775,33.8050336 27.3386016,32.9179779 28.3961523,32.9518525 C29.2147538,32.9788373 29.9258852,33.5851356 30.3134632,34.3085597 C30.7010413,35.0331321 30.8256608,35.8656439 30.9445638,36.6797831" id="Fill-134" fill="#1A2E35"></path>
-                        <path d="M30.672859,37.4464978 L30.5682472,34.4339532 C30.5682472,34.4339532 24.4807564,33.1490142 23.3191656,27.4023859 C22.5840249,23.7645962 22.8675628,19.6341891 23.0922209,14.7200726 C23.2945847,10.2979993 27.2143822,6.93292903 31.7206917,7.32220008 L36.7014699,7.83089353 C43.2594279,8.28561724 44.2792498,15.244268 44.276967,16.5940855 L43.6652987,37.6130002 C43.6652987,37.6130002 41.428436,42.0936364 32.674774,39.9296797 C31.5314759,39.6471998 30.7140177,38.6286647 30.672859,37.4464978" id="Fill-136" fill="#FFBF9D"></path>
-                        <polygon id="Fill-138" fill="#375A64" points="22.9717744 13.6440654 23.0157914 13.6331566 22.9534817 13.3845514 22.9100363 13.394886"></polygon>
-                        <path d="M35.0349986,22.5696833 C35.1499001,22.5128429 35.1870573,22.3543785 35.1178877,22.2165835 C35.0487182,22.0782143 34.8989461,22.0121875 34.7840447,22.0690279 C34.6691432,22.1264425 34.6314144,22.2843327 34.7011556,22.4227019 C34.7703251,22.560497 34.9195255,22.6270979 35.0349986,22.5696833" id="Fill-140" fill="#FF9A6C"></path>
-                        <path d="M37.3897354,22.6241124 C37.5137832,22.6568387 37.6446909,22.5695685 37.6818481,22.430051 C37.7184336,22.2905335 37.6475491,22.151016 37.5235013,22.1182897 C37.3988818,22.0861375 37.2685458,22.1728335 37.2313886,22.312351 C37.1942314,22.4518685 37.2651159,22.591386 37.3897354,22.6241124" id="Fill-142" fill="#FF9A6C"></path>
-                        <path d="M39.1878575,22.7065023 C39.2873244,22.7874569 39.4462429,22.7576013 39.5428516,22.6404755 C39.6394603,22.5227756 39.636602,22.3620147 39.5371351,22.2816342 C39.4376681,22.2006796 39.2787497,22.2299611 39.182141,22.347661 C39.0855323,22.4647868 39.0883906,22.6255477 39.1878575,22.7065023" id="Fill-144" fill="#FF9A6C"></path>
-                        <path d="M37.0014714,24.3145707 C37.0917919,24.2232815 37.0763574,24.0636689 36.9677441,23.958026 C36.8597024,23.8523831 36.6984974,23.8414744 36.6087485,23.9327636 C36.5189996,24.0240528 36.5338624,24.1830913 36.6424758,24.2887342 C36.7510891,24.394377 36.9117225,24.40586 37.0014714,24.3145707" id="Fill-146" fill="#FF9A6C"></path>
-                        <path d="M38.1168158,24.4368064 C38.2122812,24.5223542 38.3757729,24.4970918 38.4803846,24.3811143 C38.5855681,24.2651368 38.5929995,24.1015051 38.4975341,24.0165315 C38.4020687,23.9309837 38.2391487,23.955672 38.1339653,24.0716495 C38.0287819,24.1882012 38.0213504,24.3518328 38.1168158,24.4368064" id="Fill-148" fill="#FF9A6C"></path>
-                        <path d="M24.6895227,22.7625964 C24.7564056,22.6517862 24.7369696,22.5157136 24.6883794,22.4181087 C24.6335011,22.3228005 24.5311759,22.2315113 24.4014116,22.2246215 C24.2739338,22.214861 24.1624623,22.419257 24.2773637,22.6357101 C24.3939801,22.8504408 24.6272129,22.8728325 24.6895227,22.7625964" id="Fill-150" fill="#FF9A6C"></path>
-                        <path d="M26.470038,22.7334298 C26.5929425,22.7707493 26.7238502,22.7007035 26.7627223,22.5766879 C26.8015944,22.4526723 26.7335682,22.3206187 26.6106637,22.2827251 C26.4877591,22.2448315 26.3568515,22.3148773 26.3179793,22.439467 C26.2791072,22.5634825 26.3471334,22.6955361 26.470038,22.7334298" id="Fill-152" fill="#FF9A6C"></path>
-                        <path d="M28.2048214,22.9184771 C28.3111481,22.9902453 28.4534887,22.9661312 28.5226583,22.8645073 C28.5918278,22.7634576 28.5609587,22.623366 28.454632,22.5515977 C28.3483053,22.4798295 28.2059647,22.5039436 28.1367951,22.6049933 C28.0681973,22.7066172 28.0984947,22.8467088 28.2048214,22.9184771" id="Fill-154" fill="#FF9A6C"></path>
-                        <path d="M25.6516652,24.7182529 C25.6842492,24.593089 25.6230828,24.4679252 25.5424802,24.388693 C25.4578762,24.3129057 25.3281118,24.2600843 25.2046356,24.2997004 C25.0823027,24.3358716 25.0485755,24.5609368 25.2229284,24.7257168 C25.3989963,24.8887743 25.6230828,24.8416943 25.6516652,24.7182529" id="Fill-156" fill="#FF9A6C"></path>
-                        <path d="M27.0015001,24.7283578 C27.1186882,24.7806051 27.2678886,24.7042437 27.3341999,24.5566882 C27.4005112,24.4097067 27.3593524,24.2483717 27.2421644,24.1955503 C27.1249763,24.143303 26.9757759,24.2202385 26.9094646,24.3672199 C26.8431533,24.5142013 26.8837404,24.6761105 27.0015001,24.7283578" id="Fill-158" fill="#FF9A6C"></path>
-                        <path d="M26.8415527,19.0440818 C26.7883894,19.4965089 27.1256623,19.9150614 27.5949862,19.9793658 C28.0631667,20.0436701 28.4867587,19.7307605 28.5404937,19.2783334 C28.5936571,18.8259062 28.2563841,18.4073537 27.7882035,18.3424752 C27.3188797,18.2775967 26.8952877,18.5916546 26.8415527,19.0440818" id="Fill-160" fill="#1A2E35"></path>
-                        <path d="M25.6499503,18.0522444 C25.7465589,18.1733892 26.4348244,17.7456503 27.3546077,17.8248825 C28.2749627,17.8903352 28.9112081,18.4225686 29.0203931,18.3174999 C29.0735564,18.2715682 28.9820926,18.0602824 28.7059861,17.8208635 C28.4344528,17.5825929 27.9576975,17.3328393 27.3837618,17.2874818 C26.8103978,17.2432725 26.3107766,17.4149422 26.015234,17.6090036 C25.7145466,17.803065 25.6019317,17.9977005 25.6499503,18.0522444" id="Fill-162" fill="#1A2E35"></path>
-                        <path d="M36.3293264,20.0364933 C36.2784496,20.4699736 36.6014314,20.8707276 37.0513192,20.9327354 C37.5000637,20.994169 37.9059345,20.6944647 37.9573829,20.2609844 C38.0088313,19.8275041 37.685278,19.426176 37.2359618,19.3641682 C36.7866456,19.3021604 36.3807748,19.603013 36.3293264,20.0364933" id="Fill-164" fill="#1A2E35"></path>
-                        <path d="M35.5262738,19.2958448 C35.6194526,19.4112482 36.2791356,19.0013079 37.1600468,19.0770952 C38.0421013,19.1402512 38.6520508,19.650093 38.7566626,19.5490433 C38.8075394,19.504834 38.7206487,19.3033087 38.4554036,19.0730761 C38.19416,18.8451401 37.737984,18.6062954 37.1880576,18.5626602 C36.6387029,18.5195993 36.159661,18.6849534 35.8766947,18.8704026 C35.5891552,19.057 35.4805419,19.2435975 35.5262738,19.2958448" id="Fill-166" fill="#1A2E35"></path>
-                        <path d="M32.3043454,28.269691 C32.2174548,28.112375 31.2033493,28.7525479 29.9371467,28.3374402 C28.6698007,27.9263516 28.1015816,26.7700214 27.9552394,26.8521243 C27.88264,26.8779608 27.9100791,27.2184295 28.185614,27.6834878 C28.4525741,28.1422306 29.008217,28.7066162 29.7828014,28.9603888 C30.5573859,29.2118648 31.2896683,29.0671799 31.7264082,28.8380956 C32.1740094,28.6084372 32.3535072,28.3357178 32.3043454,28.269691" id="Fill-168" fill="#1A2E35"></path>
-                        <path d="M35.2024918,17.2616452 C35.2859526,17.5705358 36.396095,17.5200109 37.673159,17.783544 C38.9559395,18.0212405 39.9649001,18.4874471 40.1581174,18.2319521 C40.2450081,18.109659 40.087233,17.8122513 39.6905085,17.4867105 C39.2977856,17.1611696 38.6552521,16.8298873 37.8875274,16.6788869 C37.1198027,16.5296089 36.4006682,16.5939133 35.9153382,16.7472103 C35.4254349,16.8987848 35.1676212,17.1152379 35.2024918,17.2616452" id="Fill-170" fill="#1A2E35"></path>
-                        <path d="M26.2294309,15.6132143 C26.4020689,15.8796181 27.1812266,15.682686 28.0930068,15.7458421 C29.0070737,15.7774201 29.7616504,16.0547327 29.9605843,15.8072757 C30.0491899,15.6861309 29.948008,15.4248944 29.6307428,15.1590647 C29.3180507,14.8949575 28.778414,14.6555386 28.1507434,14.6222381 C27.5236444,14.5900859 26.962285,14.7720903 26.6244404,15.002897 C26.2808793,15.2342779 26.1539732,15.4834573 26.2294309,15.6132143" id="Fill-172" fill="#1A2E35"></path>
-                        <path d="M31.3692419,24.9986084 C31.3766733,24.9543992 30.9930968,24.8378475 30.3722859,24.6851246 C30.2328036,24.6478051 30.0127187,24.6064666 29.8983889,24.5657022 C29.8618033,24.5427364 29.841224,24.4950823 29.8486554,24.4520213 C29.8475121,24.4319262 29.9235414,24.3027433 29.9658435,24.2200663 C30.1784969,23.8262021 30.3968668,23.4225774 30.6266698,22.9994317 C31.5744639,21.2672329 32.1575459,19.750913 32.0455027,19.7112969 C32.0014857,19.6969433 31.8339926,20.0563588 31.5293036,20.6236151 C31.1525869,21.3269441 30.7650088,22.0515165 30.3402736,22.8455605 C30.1093274,23.2807633 29.8903858,23.6958709 29.7005983,24.0822712 C29.6565813,24.1942297 29.601703,24.2378648 29.5656891,24.4187208 C29.5485396,24.5783335 29.6365736,24.7327788 29.7663379,24.8011021 C30.0092888,24.8820567 30.1464846,24.8740187 30.3191226,24.9096158 C30.9627994,25.0066465 31.3618104,25.0428177 31.3692419,24.9986084" id="Fill-174" fill="#1A2E35"></path>
-                        <path d="M30.5681329,34.4501441 C30.5681329,34.4501441 37.2421356,34.3869881 38.8936297,32.4578572 C38.8936297,32.4578572 38.2185122,36.0721069 30.6464488,36.1938259 L30.5681329,34.4501441 Z" id="Fill-176" fill="#FF9A6C"></path>
-                        <path d="M43.8634895,20.4889778 C44.678661,20.281137 45.5904412,20.6003622 46.1386527,21.2411092 C46.6868641,21.8818563 46.8680769,22.8050832 46.6525652,23.621519 C46.4364819,24.4379547 45.8442534,25.1349681 45.0988231,25.5253875 C44.3802602,25.9020273 43.4290362,25.9743697 42.8087969,25.4507485" id="Fill-178" fill="#FFBF9D"></path>
-                        <path d="M43.980163,24.1945742 C43.9675867,24.2301713 44.1728088,24.3444263 44.5249446,24.2720839 C44.6958676,24.233042 44.8976598,24.1440493 45.0714411,23.973528 C45.247509,23.8041549 45.3738434,23.5521047 45.4081424,23.274218 C45.4407264,22.9969054 45.3772733,22.7218894 45.2469373,22.5151969 C45.1183163,22.3079301 44.9433917,22.1730058 44.7861882,22.0949219 C44.4614915,21.9399025 44.2351185,22.0019102 44.23912,22.0398039 C44.2345469,22.0897546 44.4340524,22.119036 44.6684285,22.2924282 C44.9028046,22.4589305 45.1446122,22.8068631 45.0863039,23.2357502 C45.0411437,23.6663598 44.7238784,23.9459689 44.4569183,24.0516118 C44.1888149,24.1641445 43.9881661,24.1451976 43.980163,24.1945742" id="Fill-180" fill="#FF9A6C"></path>
-                        <path d="M39.6944529,10.3404861 C39.8682342,10.5144524 35.3070464,15.1690549 30.5303469,13.8100511 C31.4415555,13.8697622 33.3868772,13.2152357 34.4164172,12.2604307 C31.9148809,13.4001107 28.2866244,13.9151198 26.7757559,13.377719 C27.5446239,12.9643338 29.435639,12.0617762 29.6671568,11.1351044 C28.666771,12.0537381 25.7273515,13.9156939 23.2080942,14.4846727 C21.6932242,14.8268638 19.2620007,14.3474518 18.2959138,13.4305405 C21.4028264,12.5032945 21.8750086,11.872308 22.2500103,10.7332021 C22.7810723,9.12157397 23.1657921,5.96721528 24.5931998,4.36477351 C25.7439294,3.07351892 28.9554538,0.956068091 32.3224667,0.485268286 C35.7317816,0.00872702077 39.4103433,1.30342648 40.2306597,1.71221851 C40.9886664,2.0894325 41.8026946,2.89438534 42.1119568,3.70393134 C42.2320031,4.01856341 42.6464486,6.52126627 42.2771633,6.63092818 C43.7874601,6.18079763 44.4802988,6.87149539 45.4429558,8.00084078 C47.8215875,10.7911908 46.7394558,18.5392925 44.408271,20.1480499 C43.4816279,20.7876486 43.7846019,22.6444371 42.8168,22.4871211 C42.9905813,21.7797731 39.4509304,18.3750867 39.6944529,10.3404861" id="Fill-182" fill="#1A2E35"></path>
-                        <path d="M41.7669665,7.15357337 C42.7107591,6.41636978 42.9891522,3.81778451 42.5724201,2.8400137 C43.4979199,3.38832323 43.7174331,4.4677179 43.5567997,5.53562965 C43.3995962,6.58746532 42.9377038,6.94860321 41.9641855,7.23797285 L41.7669665,7.15357337 Z" id="Fill-184" fill="#1A2E35"></path>
-                        <path d="M40.0531055,14.9269375 C40.4504016,15.7938981 41.0917918,16.5931095 42.1236184,16.6355963 C43.0994233,16.6746382 44.3050312,16.0206858 45.3242814,15.1801359 C45.8067533,14.7828268 46.214339,13.8383565 46.7802716,12.9478558 C46.8631607,15.4873041 45.9193681,19.3559005 44.4084997,20.1482221 C43.4115437,20.6712692 43.7842589,22.6440352 42.816457,22.4872934 C42.9553678,21.924056 40.7367978,19.6435477 39.9530669,14.6754615 C39.9827927,14.7604351 40.0153767,14.8442604 40.0531055,14.9269375" id="Fill-186" fill="#1A2E35"></path>
-                        <path d="M50.6115779,38.9637363 C47.1268052,40.6034976 45.1088841,44.6150564 45.196918,48.4790597 C45.2855236,52.3436371 47.2171258,55.9952063 49.8701491,58.7953169 C50.3840616,59.3378849 50.9379895,59.8712667 51.2432501,60.5545005 C51.547939,61.2388827 51.5387927,62.1293833 51.0025858,62.6501338 C50.2097086,63.4206379 48.8891993,62.961321 47.9551247,62.3722471 C43.9758757,59.8655252 41.1279201,55.616844 40.3133202,50.9702796 C39.4992919,46.3237152 40.730624,41.3533324 43.618595,37.6328657 C44.1913874,36.8945138 44.8779379,36.1710897 45.7788568,35.9339673 C46.8335493,35.6560806 47.9711309,36.1240097 48.7737262,36.8652323 C49.5757498,37.6064549 50.0948071,37.999745 50.6115779,38.9637363" id="Fill-188" fill="#1A2E35"></path>
-                    </g>
-                    <g id="Group-336" transform="translate(0.000000, 30.850847)">
-                        <path d="M79.8877655,28.8185847 L79.8877655,28.8185847 L79.9783498,28.6140933 C80.7265301,26.8420259 81.5870807,24.7000357 81.8983925,23.5288054 C82.4785906,21.3494783 82.2842357,21.2891648 82.019936,21.2581465 C81.310168,21.174282 80.8555267,25.0492795 80.4736967,24.1474494 C80.0924401,23.2456192 81.576761,19.4866534 80.8314473,19.4297864 C79.8608196,19.355687 79.4589235,23.4236876 79.3998717,23.7648896 C79.3419666,24.0963265 78.8747122,24.8091744 78.9446571,24.5041605 C79.0449878,24.0670314 79.9605769,18.6474344 79.0077221,18.5658676 C78.4791227,18.5204889 78.5100819,19.4855046 78.5100819,19.4855046 C78.5100819,19.4855046 77.9459367,23.8895374 77.4976019,23.8361169 C77.0418139,23.7809732 77.2860475,21.1823238 77.4299503,20.3126609 C77.5721333,19.4539118 77.2241291,19.0265477 76.7941404,19.2695249 C76.5006015,19.4349561 75.9972281,22.0847283 75.8751113,22.9480727 C75.7524212,23.8108427 75.458309,26.186045 74.6579568,24.8729343 C74.6453438,24.8522554 74.6315841,24.8344486 74.6189711,24.8143441 C73.865631,23.4995103 72.8508577,22.7366883 72.4071094,22.7165838 C71.9748275,22.6964794 71.7678596,23.227238 72.0275728,23.578205 C72.0648385,23.6373696 72.1112772,23.6942366 72.1772088,23.7396153 C72.2047281,23.7579966 72.2356873,23.7901638 72.2643532,23.8131403 C72.5716518,24.1204519 72.9225225,24.647764 73.1793691,25.0670863 C73.4230293,25.463432 73.6001847,25.8976891 73.6965021,26.3531995 C73.8082992,26.8793628 73.8851238,27.3377452 73.9384424,27.7237515" id="Fill-191" fill="#FFBF9D"></path>
-                        <path d="M35.0586382,33.705585 C29.2778707,32.3959208 23.082594,35.3317512 19.4236772,40.0034611 C15.7647603,44.6757453 14.3475177,50.7823415 14.2517735,56.7200599 C14.184122,60.9345361 14.8199319,65.3799268 17.3895441,68.7172727 C20.4585166,72.7042809 25.6304202,74.3361913 30.5196779,75.4988054 C36.0057599,76.8027254 41.7848076,77.7907177 47.2382104,76.354108 C52.69104,74.9180728 57.7144542,70.4462591 58.1088971,64.8106824" id="Fill-193" fill="#375A64"></path>
-                        <polygon id="Fill-195" fill="#ECECEC" points="25.5829494 61.0659621 28.164028 62.9362544 21.3421146 77.3304971 18.6704517 75.7634954"></polygon>
-                        <path d="M6.66625756,53.4494036 L26.0633328,60.8507291 C26.0633328,60.8507291 18.5752235,76.4776645 18.2019934,76.4776645 C18.2019934,76.4776645 0.584497921,68.1779553 0.000275997318,67.9682941 C-0.00945975057,66.9337744 6.66625756,53.4494036 6.66625756,53.4494036" id="Fill-197" fill="#1A2E35"></path>
-                        <polygon id="Fill-199" fill="#1A2E35" points="18.6706237 75.7634954 21.2849548 77.1191127 28.1642 62.9362544 28.4950046 62.9362544 21.5744805 78.1461651 18.05144 76.4062648"></polygon>
-                        <path d="M72.3122826,26.8872322 L69.2370037,39.3928014 L56.5615113,32.3895448 L56.5729776,32.4981091 C54.6351621,31.4647381 51.9950317,30.5192525 48.7873163,30.5181037 C40.9219636,30.5140828 34.4463344,32.3895448 34.4463344,32.3895448 C34.4463344,32.3895448 20.9452637,36.7683034 5.81998254,65.2896863 L13.7524134,70.1974803 C13.7524134,70.1974803 25.8941466,51.9707468 30.3975611,49.8281822 L27.7000989,65.3545951 C27.1221942,67.772304 28.9338797,70.1015532 31.415201,70.1308483 L60.4830079,69.2364856 C60.4830079,69.2364856 61.7288283,69.611578 61.7288283,66.0973126 C61.7288283,62.5824727 61.3653446,60.3480019 61.3653446,60.3480019 L60.857958,49.0624883 C62.8112531,49.8810283 65.4645698,51.0005614 67.5147558,51.898945 C71.2052051,53.5147719 74.7729644,53.0931519 77.355763,49.4984685 C80.2533132,45.466656 82.2765532,26.8872322 82.2765532,26.8872322 L72.3122826,26.8872322 Z" id="Fill-201" fill="#FF4F5B"></path>
-                        <path d="M36.5680704,3.02997689 C35.4506732,1.62955534 33.4801785,1.05399242 31.7269714,1.41529888 C29.9743376,1.77660534 28.4607776,2.98172611 27.4998962,4.49415841 C26.5384416,6.00659072 26.0924,7.80393241 25.9765897,9.5932323 C25.8441532,11.644465 26.0373615,13.9673956 24.6350251,15.4671908 C23.0790395,17.1318428 20.2239147,16.9813464 18.6776755,18.6546146 C17.6789552,19.7356619 17.49492,21.4887737 18.2476868,22.7547824 C19.0004537,24.0202166 20.6269574,24.6928555 22.0516532,24.3269538 C21.2404079,25.0133786 20.5094272,25.8284722 20.0949181,26.8084226 C19.6798358,27.7877987 19.6133308,28.9498384 20.089185,29.9010681 C20.7209816,31.1636303 22.1634503,31.8224832 23.5583335,32.0218049 C26.4363909,32.4319366 29.4916037,31.1688 31.2442375,28.8458694 C31.9889779,30.018823 33.688293,30.3450902 34.9450066,29.7568902 C36.2022934,29.1686901 37.0118187,27.8515586 37.2721052,26.4856019 C37.531245,25.1202196 37.3087976,23.7065865 36.9504737,22.363032 C36.5921498,21.0200518 36.0990961,19.7138342 35.8032639,18.3553449 C34.8928346,14.1741847 35.9081812,9.82472118 37.1912673,5.74350906" id="Fill-245" fill="#1A2E35"></path>
-                        <g id="Group-249" transform="translate(32.679138, 0.000000)">
-                            <mask id="mask-2" fill="white">
-                                <use xlink:href="#path-1"></use>
-                            </mask>
-                            <g id="Clip-248"></g>
-                            <path d="M23.1353966,4.02848091 C21.3076582,1.48957062 18.0724235,0.322935602 14.9570123,0.076511957 C12.8655474,-0.0894937155 10.7121642,0.105232662 8.78237509,0.929516883 C6.65307124,1.83996322 4.89757086,3.47417131 3.49064796,5.31574289 C1.88019709,7.42499143 0.661322562,9.88003726 0.265732993,12.5056841 C-0.129856576,15.1313309 0.348290816,17.9338972 1.8521045,20.1206917 C3.35534486,22.3074861 5.93699679,23.7900489 8.58572695,23.6981426" id="Fill-247" fill="#1A2E35" mask="url(#mask-2)"></path>
-                        </g>
-                        <path d="M51.1448581,31.4707695 L51.2434688,28.6423545 C51.2434688,28.6423545 56.9726378,27.4360849 58.0659556,22.0400389 C58.758524,18.6245727 58.4913577,14.7467032 58.2798033,10.1335836 C58.0894616,5.98114417 54.4001589,2.82186667 50.1587508,3.18719403 L45.4707277,3.66453214 C39.2983838,4.09132181 38.3386491,10.6252821 38.3409383,11.8924396 L38.9165539,31.6270101 C38.9165539,31.6270101 40.5992428,39.3126707 48.6870429,36.7433164 C50.7423887,36.0902076 51.1064458,32.5805375 51.1448581,31.4707695" id="Fill-250" fill="#FFBF9D"></path>
-                        <polygon id="Fill-252" fill="#375A64" points="58.393091 9.12244251 58.3518121 9.11267747 58.4102905 8.87889094 58.4515694 8.88865598"></polygon>
-                        <path d="M47.039269,17.5030867 C46.9309119,17.4490917 46.8959395,17.3008929 46.9612977,17.1710753 C47.026656,17.0412577 47.167119,16.979221 47.2754761,17.0332159 C47.3838333,17.086062 47.4188057,17.2348353 47.3534474,17.3646529 C47.2886624,17.4944705 47.1476262,17.5565072 47.039269,17.5030867" id="Fill-254" fill="#FF9A6C"></path>
-                        <path d="M44.8232221,17.5535777 C44.7062652,17.584596 44.5830018,17.5024548 44.5486027,17.3720628 C44.5136303,17.240522 44.5801352,17.1095556 44.6970921,17.0791116 C44.814049,17.0486677 44.9373124,17.1302345 44.9722848,17.2612009 C45.0072573,17.3921673 44.940179,17.5231337 44.8232221,17.5535777" id="Fill-256" fill="#FF9A6C"></path>
-                        <path d="M43.1307294,17.6309512 C43.0367052,17.7073483 42.8876425,17.679202 42.7964849,17.5694889 C42.7059006,17.458627 42.7081939,17.3081305 42.8022181,17.2323079 C42.8956689,17.1564852 43.045305,17.1840571 43.1358893,17.2943446 C43.2264735,17.4040577 43.2241803,17.5551286 43.1307294,17.6309512" id="Fill-258" fill="#FF9A6C"></path>
-                        <path d="M45.1883111,19.1410285 C45.1040334,19.0554408 45.117793,18.9055187 45.2198437,18.8067195 C45.3218943,18.7073458 45.4732503,18.6970064 45.5581014,18.7825941 C45.6423792,18.8681818 45.6286195,19.0181038 45.5265689,19.1169031 C45.4245183,19.2162767 45.2725889,19.2266162 45.1883111,19.1410285" id="Fill-260" fill="#FF9A6C"></path>
-                        <path d="M44.1385082,19.2560262 C44.0484972,19.3364441 43.8954212,19.3128931 43.7962372,19.2037545 C43.6976265,19.0946158 43.6901733,18.9412472 43.7801843,18.8614037 C43.8701952,18.7809857 44.0232712,18.8045367 44.1224553,18.9131009 C44.2216393,19.022814 44.2285191,19.1756082 44.1385082,19.2560262" id="Fill-262" fill="#FF9A6C"></path>
-                        <path d="M56.7764483,17.6836825 C56.7139566,17.5797135 56.7317294,17.452768 56.7775949,17.3608617 C56.8291935,17.2712531 56.925511,17.1856654 57.0476278,17.1787725 C57.1674513,17.1690074 57.2723685,17.3614362 57.1645847,17.5647787 C57.0545076,17.7669725 56.8355,17.7882258 56.7764483,17.6836825" id="Fill-264" fill="#FF9A6C"></path>
-                        <path d="M55.1006964,17.6562255 C54.9848862,17.6918391 54.8616228,17.6257815 54.8255037,17.5091755 C54.7888113,17.3925694 54.8524497,17.2690704 54.9682599,17.2340311 C55.0840702,17.197843 55.2073336,17.2633262 55.244026,17.3810811 C55.280145,17.4976872 55.2165067,17.6206118 55.1006964,17.6562255" id="Fill-266" fill="#FF9A6C"></path>
-                        <path d="M53.4678288,17.8301006 C53.3674981,17.8973071 53.233915,17.8749049 53.16913,17.7795522 C53.1037718,17.6847738 53.1324377,17.553233 53.2327684,17.4860266 C53.3330991,17.4188201 53.4666822,17.4412223 53.5320405,17.5360006 C53.5968254,17.6313533 53.5681595,17.7628942 53.4678288,17.8301006" id="Fill-268" fill="#FF9A6C"></path>
-                        <path d="M55.8711215,19.5196822 C55.8407356,19.4025017 55.8980674,19.2853213 55.9737454,19.2106474 C56.0534367,19.1399945 56.1755534,19.0900205 56.291937,19.126783 C56.407174,19.1606734 56.4387065,19.3720578 56.2741642,19.5271496 C56.1090485,19.6799438 55.8980674,19.6357139 55.8711215,19.5196822" id="Fill-270" fill="#FF9A6C"></path>
-                        <path d="M54.6007056,19.5297919 C54.4900552,19.5786171 54.3501656,19.5068153 54.2876739,19.368956 C54.2246089,19.2305222 54.2635945,19.0788768 54.3736716,19.0300516 C54.484322,18.980652 54.624785,19.0524538 54.6872767,19.1908876 C54.7497684,19.328747 54.7107827,19.4803923 54.6007056,19.5297919" id="Fill-272" fill="#FF9A6C"></path>
-                        <path d="M55.7826585,13.9281057 C55.837697,14.3939555 55.4896929,14.8241917 55.0058123,14.8902493 C54.5230783,14.9568813 54.0862099,14.6340606 54.030598,14.1693596 C53.9761328,13.7035098 54.3235636,13.2726992 54.8062975,13.2066416 C55.2907514,13.1400096 55.7276199,13.4628303 55.7826585,13.9281057" id="Fill-274" fill="#1A2E35"></path>
-                        <path d="M55.8666496,13.2269184 C55.7668922,13.3509918 55.0576976,12.9109907 54.1088559,12.9925575 C53.1600143,13.0603383 52.5041382,13.6071805 52.3911946,13.4997651 C52.3367293,13.4520887 52.4307535,13.2349602 52.7156927,12.9885366 C52.9960453,12.7432617 53.487379,12.4864986 54.0790434,12.4399711 C54.6701345,12.3945924 55.1855475,12.5709375 55.4899795,12.7702592 C55.8001447,12.9707297 55.915955,13.1706258 55.8666496,13.2269184" id="Fill-276" fill="#1A2E35"></path>
-                        <path d="M47.3455356,15.0971532 C47.4005741,15.5630031 47.05257,15.9932392 46.5686894,16.0598713 C46.0859555,16.1259289 45.649087,15.8031082 45.5940485,15.3384072 C45.5390099,14.8731318 45.8870141,14.4417468 46.369748,14.3756891 C46.8536286,14.3090571 47.2904971,14.6318778 47.3455356,15.0971532" id="Fill-278" fill="#1A2E35"></path>
-                        <path d="M47.343529,14.302279 C47.2431983,14.4269269 46.5334303,13.9869257 45.585162,14.0684925 C44.6363204,14.1356989 43.9804443,14.6825412 43.868074,14.5751257 C43.8130354,14.5274494 43.905913,14.3108952 44.1919988,14.0638972 C44.4723514,13.8186224 44.9636851,13.5624337 45.5553495,13.5153317 C46.1464406,13.469953 46.6618536,13.6462981 46.9662856,13.8461942 C47.2758774,14.0460903 47.392261,14.2459864 47.343529,14.302279" id="Fill-280" fill="#1A2E35"></path>
-                        <path d="M47.9737204,19.7839127 C48.1411293,19.7603617 48.2363001,20.8856389 49.2642597,21.6048054 C50.2904993,22.3268439 51.477268,22.1005247 51.4990541,22.2573398 C51.5208402,22.3268439 51.2508073,22.4985937 50.7462873,22.5537375 C50.252087,22.6123277 49.5147997,22.5123796 48.8858697,22.0723784 C48.2586595,21.6318028 47.9525076,20.9987985 47.875683,20.5398416 C47.7942718,20.0734174 47.8963224,19.7839127 47.9737204,19.7839127" id="Fill-282" fill="#1A2E35"></path>
-                        <path d="M46.8816638,12.5190105 C46.8031192,12.809664 45.7585334,12.7619876 44.5562851,13.0095601 C43.348877,13.2324328 42.399462,13.6701363 42.2171468,13.4306056 C42.1357356,13.3157228 42.2842251,13.0354087 42.6574552,12.7298205 C43.0272455,12.4248066 43.6320962,12.1140485 44.3544771,11.9721683 C45.0768581,11.8320112 45.7539469,11.8917503 46.2114548,12.0353538 C46.6718294,12.1783829 46.914343,12.3817255 46.8816638,12.5190105" id="Fill-284" fill="#1A2E35"></path>
-                        <path d="M55.3271571,10.9713666 C55.1643348,11.2218111 54.4316341,11.0362754 53.5728034,11.0965889 C52.7122528,11.125884 52.0024848,11.3860936 51.8150098,11.1534559 C51.7318786,11.0397219 51.8270494,10.7944471 52.1257482,10.5451513 C52.4198605,10.2970044 52.9278204,10.0724085 53.5183382,10.0413902 C54.1088559,10.0109462 54.636882,10.1821216 54.9556469,10.3986757 C55.2784251,10.6152299 55.3982486,10.8495908 55.3271571,10.9713666" id="Fill-286" fill="#1A2E35"></path>
-                        <path d="M50.489498,19.7833383 C50.4826182,19.7431293 50.8438087,19.6334162 51.42802,19.4915359 C51.5604565,19.4564967 51.7662777,19.4180109 51.8752082,19.3795252 C51.9107539,19.357123 51.93082,19.3117443 51.9233669,19.2692377 C51.9239402,19.2491332 51.8528488,19.1285062 51.8132898,19.0509603 C51.6132017,18.6821865 51.4073805,18.3024988 51.1918128,17.9044298 C50.2991564,16.2782635 49.7487709,14.8560142 49.8531148,14.8192517 C49.8932471,14.8054658 50.0503363,15.1437957 50.3369954,15.6768519 C50.6890128,16.3328328 51.0542165,17.0152368 51.4549659,17.7631239 C51.6722535,18.1721068 51.8786481,18.5621339 52.0575234,18.9245892 C52.0988023,19.0291326 52.1504009,19.0710648 52.1842267,19.2393681 C52.1997063,19.3881414 52.1182951,19.5323193 51.9967516,19.5955049 C51.7697176,19.6713275 51.6395744,19.6644346 51.4773253,19.6977506 C50.8719013,19.7890824 50.4963779,19.8241217 50.489498,19.7833383" id="Fill-288" fill="#1A2E35"></path>
-                        <path d="M51.2434115,28.6575765 C51.2434115,28.6575765 44.9621371,28.5978374 43.4078714,26.7867098 C43.4078714,26.7867098 44.043108,30.1803482 51.1694534,30.2946566 L51.2434115,28.6575765 Z" id="Fill-290" fill="#FF9A6C"></path>
-                        <path d="M38.4719456,15.2452372 C37.6767532,15.0430434 36.7875367,15.3538015 36.2532041,15.9764663 C35.7182982,16.5997056 35.5417162,17.4986637 35.7526973,18.292504 C35.9631051,19.0863442 36.5404365,19.7641529 37.267404,20.144415 C37.9679989,20.5103168 38.8950544,20.5803953 39.4999051,20.07089" id="Fill-292" fill="#FFBF9D"></path>
-                        <path d="M38.3583139,18.8499154 C38.3703536,18.882657 38.1696922,18.9906468 37.8291412,18.9188451 C37.6634522,18.8809338 37.4679507,18.7941972 37.2999685,18.6293404 C37.129693,18.4656324 37.0075762,18.2215064 36.9743237,17.9538294 C36.9427912,17.6861524 37.0041363,17.4196243 37.129693,17.2203026 C37.254103,17.0198321 37.4232319,16.8888657 37.5757345,16.813043 C37.8899129,16.6613977 38.1094938,16.7194135 38.1060539,16.7538784 C38.1094938,16.7998315 37.9145656,16.8262545 37.6840917,16.9945579 C37.4530444,17.1553938 37.2133974,17.4971702 37.2713026,17.9182157 C37.3154481,18.3404101 37.6290531,18.6155544 37.8916329,18.7172257 C38.1553593,18.8252156 38.3508608,18.8045367 38.3583139,18.8499154" id="Fill-294" fill="#FF9A6C"></path>
-                        <path d="M40.4922616,5.35962812 C41.3195598,7.66130539 43.3238803,9.50172814 45.6842314,10.1272651 C46.4633709,10.3334797 47.3313746,10.4041327 48.0411426,10.0221473 C48.7514839,9.64016193 49.1860591,8.6768695 48.7721233,7.98412611 C49.2726301,8.54188219 49.7846033,9.1088289 50.4301596,9.4879422 C51.0762892,9.86762991 51.8904011,10.0359332 52.5812495,9.74642854 C53.272098,9.45692384 53.7462322,8.62115134 53.475626,7.92094056 C54.3430564,8.81070799 55.4082817,9.50574904 56.570971,9.94115492 C56.9774536,10.0928002 57.4223486,10.2140016 57.8408709,10.1002676 C58.6836486,9.8710764 59.0087201,8.81587771 58.9146959,7.94564036 C58.6739022,5.72265783 56.7148739,4.06374993 54.6767276,3.15272918 C50.0844487,1.10092205 44.384519,1.80917462 40.4314899,4.922499" id="Fill-296" fill="#1A2E35"></path>
-                        <path d="M40.7288127,4.60341197 C38.1488808,5.2323954 36.1887058,7.81725881 36.2758502,10.4762216 C36.3142625,11.6325172 36.6920792,12.7480294 37.066456,13.8428626 C37.4597523,14.9939885 37.8530486,16.1451143 38.2463449,17.2956657 C38.340369,17.5696613 38.4412731,17.8551451 38.6522542,18.0533179 C38.9933785,18.3744154 39.5558037,18.3709689 39.9582731,18.1320127 C40.3607424,17.892482 40.6198823,17.4645435 40.7683717,17.019947 C41.3141706,15.3840156 40.540191,13.5355511 41.0441378,11.8858338 C41.3892753,10.7559613 42.2779186,9.89491458 42.9739269,8.94138719 C43.6693619,7.9878598 44.195668,6.71840466 43.7003211,5.64654796 C43.172295,4.50576158 41.453487,4.16111312 40.5281514,5.01067156" id="Fill-298" fill="#1A2E35"></path>
-                        <path d="M37.8367663,22.9981616 C37.8310331,23.012522 37.5971193,22.9366993 37.2026764,22.7345056 C36.8053669,22.5369071 36.2612879,22.183068 35.6719167,21.6477141 C34.4897346,20.5879201 33.223848,18.666505 32.7044217,16.2786656 C32.1597693,13.9138028 32.2469137,11.6540577 32.692382,10.124393 C32.9062297,9.35697579 33.1722493,8.76590369 33.3935502,8.38219507 C33.6154243,7.99733763 33.766207,7.80376008 33.7799666,7.81237629 C33.8378718,7.84224583 33.2611136,8.65561618 32.8970566,10.1772391 C32.5129334,11.6850761 32.4613347,13.889103 32.9956673,16.212608 C33.5030539,18.5418571 34.7024356,20.42134 35.8169663,21.4943455 C36.9337901,22.5857323 37.8717387,22.9395714 37.8367663,22.9981616" id="Fill-300" fill="#375A64"></path>
-                        <path d="M37.306275,4.36503012 C37.5321624,4.12894593 37.4914568,3.71479337 37.2678627,3.47641152 C37.0442686,3.23802968 36.6870913,3.16105819 36.3643132,3.21103221 C36.0421083,3.26158065 35.7474228,3.42184219 35.4733766,3.60048497 C34.409298,4.29437719 33.5533339,5.30477158 33.0425074,6.46910894 C32.8710853,6.86085935 32.7598615,7.37438555 33.06888,7.66963439 C33.2517686,7.84425628 33.5355611,7.87699788 33.7797946,7.8126635 C34.0240282,7.74890354 34.2373026,7.60127912 34.4396839,7.44905938 C35.4401242,6.69715134 36.3052614,5.76545168 36.9823502,4.71197624" id="Fill-302" fill="#FF4F5B"></path>
-                        <path d="M60.4828359,69.2362558 C59.7753612,62.9205729 57.6500706,43.8276229 57.8060131,43.6679358 C57.9929149,43.4766559 40.6620785,43.6679358 40.6620785,43.6679358 L36.9796556,69.5274837 L29.9754269,69.669364 C29.9754269,69.669364 31.1969974,79.8367254 31.5378687,83.1610029 C34.142607,85.642619 38.0893106,87.7583407 43.3779795,89.508168 C46.9032691,90.6745574 52.5636592,90.866591 60.3591497,90.0842688 L60.7815347,69.235107 L60.4828359,69.2362558 Z" id="Fill-304" fill="#1A2E35"></path>
-                        <path d="M39.8973867,70.3194285 C39.9168795,70.3251726 39.883627,70.5049642 39.8010692,70.8249129 C39.7173647,71.1437127 39.5832083,71.6020951 39.3745204,72.1569791 C39.1623927,72.7084167 38.8797468,73.3626743 38.4382918,74.0226761 C37.9985567,74.6746361 37.3730666,75.3467006 36.5136625,75.7269627 C35.662285,76.0865459 34.7948545,76.2456586 33.9985155,76.2422669 C33.2033232,76.2381913 32.4964218,76.0693135 31.9425964,75.8510362 C31.3870511,75.6327588 30.9702487,75.3880584 30.6967759,75.2019482 C30.4233031,75.0152637 30.2857068,74.8946367 30.2960265,74.8791275 C30.3264124,74.8280047 30.9197967,75.2714523 32.0142612,75.6517145 C32.5594868,75.838399 33.2394422,75.9774073 33.9973689,75.9664934 C34.750709,75.9567283 35.5940601,75.7912971 36.3921191,75.4535416 C37.1832982,75.1042978 37.7766826,74.4850794 38.2118311,73.8664355 C38.6481263,73.2414729 38.9456784,72.6107663 39.1790189,72.07771 C39.6336603,71.0018324 39.8503746,70.3044937 39.8973867,70.3194285" id="Fill-306" fill="#375A64"></path>
-                        <path d="M54.3563574,53.8240939 C54.3695437,53.8568355 53.8581439,54.1153218 52.9786737,54.4019544 C52.1009235,54.6897359 50.8465033,54.9786662 49.4355672,55.0786142 C48.0240577,55.1756902 46.7415449,55.0631051 45.8328355,54.9005459 C44.9224062,54.7391355 44.3800471,54.5541742 44.3886469,54.5202837 C44.3995399,54.4737562 44.9568053,54.5851925 45.8632214,54.6914591 C46.7684908,54.7988746 48.0286443,54.8752717 49.4149277,54.7799189 C50.8006378,54.6816941 52.0378585,54.4312496 52.9201953,54.1986119 C53.802532,53.9676974 54.3391579,53.779864 54.3563574,53.8240939" id="Fill-308" fill="#375A64"></path>
-                        <path d="M55.6706894,56.6030518 C55.6810091,56.6001797 55.7091017,56.6760024 55.7549672,56.8236268 C55.8082858,56.9701024 55.8558712,57.1929751 55.9028833,57.4847774 C55.9894543,58.0660845 55.9837212,58.9443636 55.6632363,59.9599278 C55.3370182,60.9622803 54.6731157,62.10479 53.5522786,62.9733041 C52.439468,63.8475623 50.870296,64.3254748 49.2512454,64.2479289 C47.6293281,64.1634901 46.1306743,63.5517391 45.0453829,62.6608228 C43.9469052,61.780246 43.2296841,60.7049428 42.7779094,59.7560107 C42.3341611,58.7967392 42.1363663,57.9592435 42.0526618,57.3796597 C42.0125296,57.0884317 41.9895968,56.8621126 41.9873036,56.7075952 C41.9815704,56.5530778 41.982717,56.4720854 41.9936101,56.471511 C42.0675681,56.4514065 42.0532351,57.7989819 42.9676777,59.6635301 C43.4332121,60.5779973 44.1481399,61.6079218 45.2162317,62.4448431 C46.2694173,63.2903807 47.708446,63.8670924 49.2661516,63.9486592 C50.819844,64.023333 52.3184978,63.5741412 53.3860163,62.7533035 C54.4632813,61.9382099 55.1231705,60.8519928 55.4637215,59.8921469 C55.7979661,58.9196638 55.8369517,58.0701054 55.787073,57.4974145 C55.7389143,56.9218516 55.6385836,56.611668 55.6706894,56.6030518" id="Fill-310" fill="#375A64"></path>
-                        <path d="M60.2306332,76.8068612 C60.2249,76.8378796 59.8367636,76.7970962 59.2708985,76.5351633 C58.70618,76.2784002 57.9866657,75.7574067 57.4236672,74.9813732 C56.8635353,74.2036165 56.5935024,73.3563558 56.5252776,72.7388606 C56.4536128,72.1184934 56.5361706,71.736508 56.5671298,71.7404975 C56.6175818,71.7428266 56.6124219,72.120791 56.7333921,72.7043958 C56.8514956,73.2868516 57.1364348,74.0703525 57.6656075,74.8067513 C58.1987934,75.5391293 58.8523762,76.0538043 59.3683626,76.3479043 C59.884349,76.6454508 60.2449661,76.758036 60.2306332,76.8068612" id="Fill-312" fill="#375A64"></path>
-                        <path d="M50.8374733,72.9488893 C50.8128206,73.1688899 50.7824347,73.4365669 50.7457424,73.7593876 C50.6660512,74.4641937 50.5141218,75.4780346 50.316327,76.7302573 C49.9086978,79.2318307 49.2138361,82.6668269 48.2856339,86.4194742 C47.3608716,90.1738447 47.3695811,89.7844364 47.2441695,90.3201404 C46.9649376,91.512899 46.8889422,91.8962534 47.0383483,90.2730385 C47.0593551,90.0448115 47.0719193,90.0985965 47.9955349,86.3482469 C48.9231638,82.6001949 49.6484113,79.1818567 50.1087858,76.6940692 C50.3232069,75.4820555 50.4997889,74.4848726 50.6310787,73.7427296 C50.6895572,73.4222066 50.7382892,73.1574017 50.7778482,72.9402731 C50.8151139,72.757035 50.8391933,72.6616823 50.849513,72.6633173 C50.8598327,72.6645544 50.8552462,72.7627792 50.8374733,72.9488893 Z" id="Fill-314" fill="#375A64"></path>
-                        <path d="M37.3172254,31.7113916 C38.5166071,35.98733 39.5732325,39.5624834 40.7726142,43.8378474 C40.869505,44.1842191 40.9727023,44.5420791 41.2043229,44.8160746 C41.4365167,45.0906446 41.8349729,45.2577991 42.1629109,45.1124723 C42.6576845,44.8930461 42.6628444,44.2008771 42.5808599,43.6655232 C41.9834623,39.7664004 41.0202877,37.0890563 39.6483372,33.3927016 C39.4430893,32.8401152 38.9104767,31.4092497 38.9104767,31.4092497 C38.9104767,31.4092497 37.8148656,30.8715981 37.3172254,31.7113916" id="Fill-316" fill="#1A2E35"></path>
-                        <path d="M51.767195,30.7185168 C51.767195,30.7185168 53.9647237,44.3551073 54.8762997,44.5837241 C55.7878757,44.8117665 56.5618553,44.5837241 56.5618553,44.5837241 L54.2834887,31.4813387 C54.2834887,31.4813387 53.1379989,30.1061914 51.767195,30.7185168" id="Fill-318" fill="#1A2E35"></path>
-                        <path d="M42.3242427,43.0914538 C42.3529086,43.0719237 42.6263814,43.4056583 42.8752015,44.0507253 C42.9978916,44.3718228 43.108542,44.7710406 43.1653005,45.2259765 C43.1899532,45.449998 43.222059,45.6981449 43.157274,45.9744381 C43.1240216,46.1099998 43.0517835,46.2593475 42.9222136,46.3644653 C42.793217,46.4718807 42.6109018,46.5155362 42.4561059,46.4960061 C41.8306157,46.3903139 41.5089842,45.9106781 41.2561508,45.5453508 C41.0044641,45.155898 40.858268,44.7618499 40.7734169,44.4263921 C40.6111678,43.7485835 40.6862725,43.3154753 40.7183783,43.3189217 C40.7676837,43.3177729 40.7711236,43.7405417 40.9757982,44.3678019 C41.0818621,44.6785599 41.2389513,45.0398664 41.4849048,45.3925566 C41.7256985,45.734333 42.0587963,46.1387205 42.4859184,46.1978852 C42.6837132,46.2220106 42.8224562,46.0996604 42.8740548,45.8997643 C42.9268001,45.701017 42.9101739,45.4724002 42.8918277,45.2552717 C42.8522687,44.8221634 42.767991,44.4361572 42.6751134,44.1179318 C42.487065,43.4820554 42.2829638,43.1150047 42.3242427,43.0914538" id="Fill-320" fill="#375A64"></path>
-                        <path d="M42.0448647,44.2385587 C42.0207853,44.2075403 42.248966,44.0897855 42.5195722,44.2988722 C42.6411156,44.3982458 42.7695389,44.5763142 42.7529127,44.8210146 C42.7402997,45.0708847 42.5149856,45.2903109 42.2638723,45.3408594 C42.0150522,45.4023217 41.7186466,45.3012248 41.6005431,45.0800754 C41.4812929,44.8658189 41.5214252,44.6498392 41.5890767,44.5079589 C41.744446,44.202945 42.0007192,44.2121357 41.9921194,44.2506214 C42.0064524,44.2925536 41.8430567,44.3591857 41.7857249,44.5849304 C41.7582056,44.6917714 41.7622188,44.8348005 41.8333103,44.9341742 C41.8992419,45.0341222 42.0442914,45.082373 42.1990873,45.049057 C42.3527366,45.0134433 42.463387,44.9071767 42.4800132,44.7888474 C42.5017993,44.6687949 42.4444675,44.5378285 42.3739494,44.4528152 C42.2260333,44.2730236 42.0500246,44.2827886 42.0448647,44.2385587" id="Fill-322" fill="#375A64"></path>
-                        <path d="M56.280356,43.3752718 C56.3124618,43.3666556 56.4833107,43.6894763 56.6214803,44.2782507 C56.6833987,44.5706275 56.7269709,44.9497408 56.6140272,45.3575748 C56.5572687,45.5586197 56.4638178,45.7694297 56.2952623,45.9480725 C56.1324399,46.1278641 55.8652736,46.2530864 55.5963874,46.2341307 C55.0557483,46.1807102 54.7008643,45.7992992 54.5007763,45.4420137 C54.3029815,45.0732398 54.2364766,44.7107845 54.1992109,44.4143869 C54.1384392,43.8169962 54.1745582,43.4539665 54.2101039,43.4510944 C54.2565427,43.4464991 54.2961017,43.8141241 54.4073254,44.379922 C54.4680971,44.6590873 54.5552415,44.9933963 54.7392766,45.3053031 C54.9158587,45.6045729 55.2415034,45.9055658 55.6130136,45.9354354 C55.9845238,45.9630073 56.2516901,45.6160611 56.3503008,45.2783057 C56.4603779,44.9365293 56.4466183,44.5959017 56.4133658,44.31329 C56.3342479,43.7457689 56.2327706,43.3873345 56.280356,43.3752718" id="Fill-324" fill="#375A64"></path>
-                        <path d="M55.5127976,44.1824959 C55.508211,44.1664123 55.5500633,44.1273521 55.6475274,44.1193103 C55.7432715,44.1089709 55.8911876,44.1474566 56.0224775,44.2657859 C56.1468875,44.3806688 56.2758841,44.5857346 56.2260054,44.8511139 C56.1772734,45.1222373 55.890041,45.3152405 55.6142749,45.3152405 C55.3379355,45.3313241 55.0438233,45.1544045 54.9738785,44.8947694 C54.8999204,44.6426016 54.9945179,44.4254731 55.0982885,44.292209 C55.333349,44.0095973 55.5987953,44.0733572 55.5821691,44.1083965 C55.5879023,44.1532008 55.3952673,44.1824959 55.2731506,44.4111127 C55.2152454,44.5202514 55.1808463,44.6759176 55.2341649,44.8045864 C55.2800304,44.9332551 55.4285198,45.0205661 55.6056751,45.0159707 C55.7816838,45.0102266 55.9255867,44.9125762 55.9582658,44.7856307 C55.9978248,44.6581108 55.9427862,44.5070399 55.8694015,44.4105383 C55.7146056,44.2043236 55.5185308,44.2261514 55.5127976,44.1824959" id="Fill-326" fill="#375A64"></path>
-                        <path d="M12.9158848,69.6805077 C12.9158848,69.6805077 12.6366788,70.7575341 12.4899093,71.2745068 C12.3626327,71.7231242 12.3167672,72.1895484 12.3460065,72.6542494 C12.3781123,73.144799 12.4417506,73.7755057 12.5696006,74.1913815 C12.5845068,74.2246975 12.5971198,74.2677786 12.6125994,74.2970737 C12.6498651,74.3677266 12.6641981,74.4395284 12.6693579,74.5096069 C12.7352895,74.9415663 12.3047276,75.3143611 11.9314974,75.0937861 C11.5490941,74.8674669 11.0078817,73.7174899 10.9562831,72.2033343 C10.9545632,72.179209 10.9499766,72.1573812 10.94883,72.1326814 C10.8542325,70.5966981 9.48572188,72.5583223 8.97432203,73.2637028 C8.97432203,73.2637028 8.82640593,73.4963405 8.50248114,73.6893436 C8.17798303,73.8811979 7.69639573,73.3441207 7.69639573,73.3441207 C7.69639573,73.3441207 5.30737872,71.1383706 5.15086285,70.1699085 C4.99377366,69.2008719 7.39540367,66.2650415 7.39540367,66.2650415 L12.9158848,69.6805077 Z" id="Fill-328" fill="#FFBF9D"></path>
-                        <path d="M55.2541164,31.8651048 C57.2681833,38.1135813 58.4205529,43.8140667 60.4346198,50.0619688 C60.5326572,50.364685 60.6868798,50.7185241 61.0010582,50.7639028 C61.490672,50.8351301 61.6792937,50.1481309 61.6684006,49.6529859 C61.6110688,46.8659288 61.348489,44.4499431 61.2905839,41.6634603 C61.2343987,38.9349934 60.2947302,35.2455317 59.631401,33.4763363 C58.9210597,31.5813442 57.2716232,31.7651567 55.2541164,31.8651048" id="Fill-330" fill="#375A64"></path>
-                        <path d="M31.1350204,33.4189523 C33.5532766,36.2588556 32.9025604,39.6501964 31.6257808,43.1569944 C30.3495744,46.6649413 28.2569629,49.8764905 27.4216383,53.5148293 C27.1808446,54.5648583 27.1877245,55.9285173 28.1474591,56.412174 C28.9770506,56.8309219 29.9562781,56.2881006 30.6849656,55.71024 C36.0082252,51.4917429 38.6993809,44.4500005 38.441961,37.6552562 C38.3874958,36.2163489 38.2028873,34.7481465 37.5521712,33.464331 C36.9020283,32.18109 35.714113,31.1011915 34.2911372,30.9001465 C32.8687347,30.6991016 31.2812165,31.579104 30.9664648,32.9835464" id="Fill-332" fill="#375A64"></path>
-                        <path d="M32.5125894,40.1699567 C32.5217625,40.1711325 32.5183226,40.2538482 32.5034163,40.4112376 C32.4890833,40.5692015 32.4586975,40.8024136 32.3990724,41.1005345 C32.2878486,41.6979252 32.0315754,42.5526534 31.5987201,43.5705151 C30.7559424,45.603941 29.5147084,48.442121 28.0968925,51.7007722 L28.0945992,51.7070907 L28.090586,51.7139837 C27.7930338,52.2372749 27.4736956,52.7634382 27.2265954,53.3286617 C26.9640157,53.878376 26.9204435,54.5142524 27.0184809,55.1305987 C27.0660663,55.3879362 27.1526374,55.6383808 27.3011268,55.8267886 C27.4496162,56.0083034 27.6703437,56.151907 27.9036842,56.2288785 C28.3760985,56.3914376 28.9115777,56.3426124 29.3730988,56.1725859 C30.2932746,55.7647519 31.1314658,55.1501288 31.8481136,54.5389522 C32.2121706,54.2322151 32.501123,53.8772272 32.7992485,53.527409 C33.0904941,53.1770164 33.3685535,52.8323679 33.62712,52.4923148 C34.145973,51.8127829 34.5960278,51.1550788 34.9807243,50.5375836 C35.7501173,49.3025933 36.2620905,48.2370552 36.6078014,47.4989331 C36.7660372,47.151987 36.8950338,46.8688008 36.9982311,46.6436305 C37.0876687,46.4477553 37.1392674,46.3466584 37.1490138,46.3506793 C37.1587602,46.3547002 37.1255077,46.4626901 37.053843,46.6666071 C36.9833248,46.8699497 36.8692345,47.1669217 36.7138653,47.5454606 C36.4002602,48.3008152 35.9146597,49.3876066 35.1607462,50.6478711 C34.7840762,51.2780034 34.3397545,51.9494935 33.8249148,52.6416625 C33.5674949,52.9880342 33.2911555,53.3390012 33.0016298,53.6951379 C32.7109575,54.0438073 32.4048056,54.4246438 32.0304288,54.7451669 C31.2862617,55.3850642 30.4750164,55.9985384 29.4762961,56.4471558 C28.9597364,56.6378613 28.3674987,56.6993236 27.8067935,56.5103414 C27.5281608,56.4161375 27.2678743,56.2553015 27.067213,56.0117499 C26.874578,55.7647519 26.7794072,55.4729495 26.724942,55.1851681 C26.6131449,54.5165501 26.6710501,53.8059998 26.9548426,53.2103324 C27.2151291,52.6186859 27.5419204,52.0867784 27.838326,51.5698058 L27.8320195,51.5818685 C29.2647417,48.3599798 30.515722,45.5476484 31.427298,43.4969901 C31.881366,42.4952119 32.160572,41.6646092 32.301035,41.0781324 C32.4455111,40.4933788 32.4908033,40.1665372 32.5125894,40.1699567" id="Fill-334" fill="#1A2E35"></path>
+    <g id="Onboard-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="User-Role-Selection" transform="translate(-204.000000, -158.000000)">
+            <g id="Group" transform="translate(204.000000, 158.000000)">
+                <circle id="Oval" fill="#E5EDF5" cx="62" cy="61" r="61"></circle>
+                <g id="Group-216" transform="translate(0.000000, 39.000000)">
+                    <path d="M122.0625,74.0608 C121.2665,75.5898 118.4025,77.4028 114.2265,78.6128 C112.7145,70.8588 110.0945,56.3958 109.5235,54.2388 C109.5235,54.2388 115.1055,49.5028 117.8575,54.7888 C119.1215,57.2148 124.0685,70.2068 122.0625,74.0608" id="Fill-1" fill="#FFC19F"></path>
+                    <path d="M75.336,48.3206 C73.928,51.0996 68.815,48.9036 67.544,51.8756 C73.69,54.9836 78.831,57.1886 79.332,57.1366 C84.547,56.5956 88.387,46.5256 88.792,45.9816 C85.529,44.9236 81.287,45.6166 75.336,48.3206" id="Fill-3" fill="#F95006"></path>
+                    <path d="M113.7617,76.9202 C106.3967,76.7182 97.9587,81.9612 92.2507,81.3512 C86.8807,80.7782 86.0707,77.9882 78.9127,77.3122 C78.6177,76.2742 81.0137,74.5312 81.0447,73.9032 C81.5427,63.9442 82.0887,52.4222 82.6417,45.9722 C85.6247,45.4482 102.0487,42.7382 111.8677,46.7912 C113.4807,53.1562 113.8687,68.6072 113.7617,76.9202" id="Fill-5" fill="#F95006"></path>
+                    <path d="M87.042,46.8919 C86.997,46.4219 87.105,45.7979 87.196,45.3469 C87.56,45.2849 87.956,45.2149 88.349,45.1629 C92.743,44.5729 98.855,44.2929 104.494,44.9989 C104.51,45.0819 104.532,45.1779 104.538,45.2399 C104.881,48.8639 101.311,52.4669 96.479,52.9229 C91.646,53.3799 87.384,50.5159 87.042,46.8919" id="Fill-7" fill="#A02E07"></path>
+                    <path d="M89.1474835,36.1175 L89.1474835,46.7855 C89.1395,49.0835 92.0375,50.9575 95.6405,50.9695487 C99.2445,50.9805 102.1895,49.1275 102.1975,46.8285 L102.1975,36.1175 L89.1474835,36.1175 Z" id="Fill-9" fill="#FFC19F"></path>
+                    <path d="M89.2246,42.4739 C89.1406,42.1199 89.1336,41.7639 89.1526,41.4099 C92.6776,40.4989 98.0306,39.4229 101.9176,39.0269 C101.9766,39.1749 102.0686,39.3069 102.1066,39.4659 C102.7546,42.2069 100.3986,45.1029 96.8406,45.9329 C93.2846,46.7639 89.8736,45.2149 89.2246,42.4739" id="Fill-11" fill="#821C08"></path>
+                    <g id="Group-15" transform="translate(108.000000, 45.119500)">
+                        <mask id="mask-2" fill="white">
+                            <use xlink:href="#path-1"></use>
+                        </mask>
+                        <g id="Clip-14"></g>
+                        <path d="M5.7617,2.0927 C7.7317,3.2317 10.2367,8.2617 16.0687,16.8027 C12.7307,19.8647 2.9257,23.5657 2.5647,23.5388469 C-0.7353,17.9077 0.3937,0.6487 0.1157,0.4967 C1.2987,0.7667 4.7227,1.4917 5.7617,2.0927" id="Fill-13" fill="#F95006" mask="url(#mask-2)"></path>
                     </g>
+                    <path d="M68.9151,76.9202 C67.6161,72.4912 65.1771,43.5352 65.7161,41.5492 C70.4881,45.1662 81.1271,46.8702 81.4271,58.7782 L68.9151,76.9202 Z" id="Fill-16" fill="#FFFFFF"></path>
+                    <path d="M65.8125,41.7903 C65.4755,44.9063 67.6305,71.3113 68.9685,76.6003 L81.2875,58.7623 C81.0435,49.8343 74.8625,46.6543 69.8925,44.1193 C68.3785,43.3473 66.9465,42.6153 65.8125,41.7903 L65.8125,41.7903 Z M68.8635,77.2333 L68.7835,76.9573 C67.4115,72.2743 65.0785,43.3783 65.5835,41.5143 L65.6355,41.3163 L65.7975,41.4393 C66.9375,42.3023 68.4345,43.0663 70.0165,43.8753 C75.0595,46.4473 81.3335,49.6423 81.5625,58.7653 L68.8635,77.2333 Z" id="Fill-18" fill="#CCCCCC"></path>
+                    <path d="M68.9151,76.9202 C67.6161,72.4912 61.2181,46.8082 61.2011,45.7352 C71.1071,42.8412 80.7921,52.4502 81.4271,58.7782 C81.4191,58.8942 76.6231,76.8052 76.2381,78.4502 C74.7971,77.2362 70.8661,75.9292 68.9151,76.9202" id="Fill-20" fill="#FFFFFF"></path>
+                    <path d="M71.0938,76.4466 C72.9678,76.5676 75.1038,77.4216 76.1558,78.2116 C76.5308,76.7036 81.2258,59.0226 81.2868,58.7616 C80.9308,55.3026 77.8628,50.9986 73.8178,48.2706 C69.7998,45.5606 65.3708,44.6966 61.3478,45.8366 C61.6248,47.8816 67.6998,72.2026 69.0008,76.7266 C69.5908,76.4726 70.3208,76.3956 71.0938,76.4466 M76.3218,78.6986 L76.1498,78.5556 C74.6768,77.3146 70.7938,76.1176 68.9758,77.0416 L68.8298,77.1156 L68.7828,76.9576 C67.4958,72.5656 61.0828,46.8816 61.0638,45.7376 L61.0628,45.6346 L61.1628,45.6046 C65.2998,44.3936 69.8468,45.2636 73.9708,48.0436 C78.0868,50.8186 81.2058,55.2296 81.5628,58.7646 C81.5588,58.8396 81.3028,59.8086 79.8478,65.2866 C78.4028,70.7256 76.3218,78.6986 76.3218,78.6986" id="Fill-22" fill="#CCCCCC"></path>
+                    <path d="M69.2285,77.095 C67.9295,72.666 58.0145,50.853 57.9985,49.781 C71.1935,45.088 80.4615,54.116 81.4265,58.779 C81.4185,58.894 76.6235,76.805 76.2385,78.45 C74.7965,77.237 71.1795,76.104 69.2285,77.095" id="Fill-24" fill="#FFFFFF"></path>
+                    <path d="M71.5303,76.594 C73.2373,76.704 75.1073,77.418 76.1563,78.211 C76.5303,76.703 81.2153,59.063 81.2873,58.762 C80.8283,56.613 78.4733,53.278 74.3733,50.969 C70.9763,49.058 65.4113,47.323 58.1493,49.872 C58.3443,50.715 60.4373,55.574 62.6463,60.704 C65.4063,67.114 68.5263,74.36 69.3133,76.905 C69.9433,76.627 70.7183,76.541 71.5303,76.594 M76.3213,78.698 L76.1493,78.556 C74.7453,77.37 71.1683,76.263 69.2903,77.217 L69.1433,77.291 L69.0963,77.133 C68.3983,74.755 65.2093,67.347 62.3943,60.812 C59.5903,54.297 57.8703,50.28 57.8613,49.782 L57.8593,49.684 L57.9533,49.651 C65.3623,47.018 71.0463,48.784 74.5063,50.732 C78.7023,53.091 81.1043,56.557 81.5623,58.765 C81.5583,58.815 81.3023,59.809 79.8473,65.286 C78.4023,70.726 76.3213,78.698 76.3213,78.698" id="Fill-26" fill="#CCCCCC"></path>
+                    <path d="M99.6221,77.8235 C102.7111,73.6355 106.1061,74.0755 105.9731,67.0945 C105.9471,65.7745 106.2751,51.7335 106.2091,47.6245 C95.2051,46.9315 83.2961,49.9225 80.8128685,57.1225 C80.7971,57.2365 81.6151,75.6185 81.8141,77.3025 C84.3441,76.3255 87.1801,75.7795 90.1791,75.7915 C93.6131,75.8025 96.8321,76.5445 99.6221,77.8235" id="Fill-28" fill="#FFFFFF"></path>
+                    <path d="M80.9512,57.1634 C80.9702,57.7584 81.6942,74.5404 81.9332,77.1114 C84.5232,76.1334 87.2972,75.6424 90.1792,75.6534 C93.4622,75.6764 96.7132,76.3574 99.5782,77.6524 C100.5542,76.3534 101.5662,75.4924 102.4622,74.7314 C104.3972,73.0864 105.9252,71.7844 105.8352,67.0974 C105.8262,66.6034 106.1102,50.4154 106.0732,47.7534 C95.7322,47.1314 83.5072,49.8144 80.9512,57.1634 L80.9512,57.1634 Z M81.7002,77.4934 L81.6792,77.3184 C81.4672,75.5214 80.6712,57.1554 80.6781541,57.1024 C83.2822,49.5494 95.7392,46.8294 106.2172,47.4874 L106.3442,47.4964 C106.3442,47.4964 106.1002,66.6034 106.1102,67.0944 C106.2012,71.9094 104.6302,73.2474 102.6382,74.9394 C101.7342,75.7094 100.7092,76.5804 99.7332,77.9054 L99.6672,77.9934 L99.5662,77.9484 C96.7132,76.6404 93.4632,75.9354 90.1792,75.9294 C87.2682,75.9174 84.4722,76.4224 81.8642,77.4314 L81.7002,77.4934 Z" id="Fill-30" fill="#CCCCCC"></path>
+                    <path d="M99.6221,77.8235 C102.7111,73.6355 104.9311,69.6855 108.2881,65.7005 C109.1461,64.6815 108.1201,54.5785 107.8861,50.8915 C101.3331,48.6935 86.0481,48.2365 80.8128685,57.1225 C80.7971,57.2365 81.6151,75.6185 81.8141,77.3025 C84.3441,76.3255 87.1801,75.7795 90.1791,75.7915 C93.6131,75.8025 96.8321,76.5445 99.6221,77.8235" id="Fill-32" fill="#FFFFFF"></path>
+                    <path d="M80.9512,57.1634 C80.9742,57.8174 81.6952,74.5464 81.9332,77.1114 C84.5232,76.1334 87.2972,75.6424 90.1792,75.6534 C93.4622,75.6764 96.7132,76.3574 99.5782,77.6524 C100.7522,76.0564 101.8122,74.4764 102.8392,72.9494 C104.5292,70.4314 106.1272,68.0534 108.1812,65.6114 C108.8372,64.8354 108.2882,57.8544 107.9582,53.6844 C107.8752,52.6344 107.8022,51.7024 107.7552,50.9924 C101.1572,48.8154 86.1632,48.3734 80.9512,57.1634 L80.9512,57.1634 Z M81.7002,77.4934 L81.6792,77.3184 C81.4672,75.5214 80.6712,57.1554 80.6781541,57.1024 L80.6902,57.0524 C85.9882,48.0644 101.2932,48.5324 107.9302,50.7634 L108.0172,50.7924 C108.0172,50.7924 108.1432,52.5684 108.2302,53.6634 C108.6982,59.5984 109.0642,64.9924 108.3912,65.7894 C106.3472,68.2174 104.7532,70.5904 103.0642,73.1014 C102.0182,74.6604 100.9352,76.2714 99.7332,77.9054 L99.6672,77.9934 L99.5662,77.9484 C96.7132,76.6404 93.4632,75.9354 90.1792,75.9294 C87.2682,75.9174 84.4722,76.4224 81.8642,77.4314 L81.7002,77.4934 Z" id="Fill-34" fill="#CCCCCC"></path>
+                    <path d="M99.6221,77.8235 C102.7111,73.6355 106.8431,69.5945 110.2001,65.6095 C111.0591,64.5905 109.7301,57.3235 109.7301,55.6285 C104.6991,51.1745 91.0571,47.9065 80.8128685,57.1225 C80.7971,57.2365 81.6151,75.6185 81.8141,77.3025 C84.3441,76.3255 87.1801,75.7795 90.1791,75.7915 C93.6131,75.8025 96.8321,76.5445 99.6221,77.8235" id="Fill-36" fill="#FFFFFF"></path>
+                    <path d="M80.9512,57.1634 C80.9862,58.1034 81.6982,74.5684 81.9332,77.1114 C84.5232,76.1334 87.2972,75.6424 90.1792,75.6534 C93.4622,75.6764 96.7132,76.3574 99.5782,77.6524 C101.4802,75.0874 103.7892,72.5554 106.0212,70.1054 C107.3942,68.5974 108.8162,67.0394 110.0942,65.5204 C110.6462,64.8674 110.1842,61.0494 109.8782,58.5204 C109.7312,57.3054 109.6032,56.2494 109.5952,55.6894 C104.9492,51.6294 91.4402,47.7744 80.9512,57.1634 L80.9512,57.1634 Z M81.7002,77.4934 L81.6792,77.3184 C81.4672,75.5214 80.6712,57.1554 80.6781541,57.1024 L80.6902,57.0524 C91.3492,47.4644 105.1492,51.3914 109.8222,55.5244 L109.8692,55.6274 C109.8672,56.1514 109.9992,57.2334 110.1502,58.4864 C110.5782,62.0254 110.8862,65.0104 110.3042,65.6984 C109.0222,67.2194 107.5982,68.7794 106.2232,70.2904 C103.9702,72.7624 101.6382,75.3184 99.7332,77.9054 L99.6672,77.9934 L99.5662,77.9484 C96.7132,76.6404 93.4632,75.9354 90.1792,75.9294 C87.2682,75.9174 84.4722,76.4224 81.8642,77.4314 L81.7002,77.4934 Z" id="Fill-38" fill="#CCCCCC"></path>
+                    <path d="M83.4639,57.0823 C83.6719,57.4803 81.7309,58.7973 79.8019,58.8173 C77.8739,58.8383 76.3089,57.6063 76.2848894,57.1573 C76.2749,56.9403 83.3769,56.9143 83.4639,57.0823" id="Fill-40" fill="#481651"></path>
+                    <path d="M113.7617,83.4026 C112.9497,77.0126 112.2447,65.0436 111.4097,58.4116 C103.3637,51.0716 86.5307,54.7816 83.5167,56.5716 L83.2837,56.7236 C81.3467,58.2906 77.5977,58.0206 76.4817,56.7096 C73.9747,53.7636 65.6587,49.4406 57.9577,53.8926 C57.9767,53.9406 57.6697,54.5206 57.6897,54.5706 C59.7827,60.0066 66.4257,75.5036 69.0197,81.0806 C71.1417,78.4106 81.3907,79.0616 85.0927,82.9376 C85.4497,83.8886 88.7217,84.3496 90.3277,83.1246 C102.0107,78.5216 110.2927,82.3006 113.2847,83.6576 C113.3517,83.6876 113.7007,83.3756 113.7617,83.4026" id="Fill-42" fill="#F47193"></path>
+                    <path d="M68.959,81.3558 C66.365,75.7808 59.699,59.8128 57.689,54.5708 C65.83,49.7288 74.874,54.7208 76.699,57.6828 C76.691,57.7978 85.267,81.5508 84.883,83.1968 C81.215,79.3568 71.062,78.7108 68.959,81.3558" id="Fill-44" fill="#BF3452"></path>
+                    <path d="M74.6973,76.9749 C77.0043,76.9509 79.4153,77.4749 81.1673,78.6549 C80.4753,76.3209 75.1943,59.8749 75.1223,59.6089 C74.3713,58.3849 72.0173,56.7079 69.1023,55.9909 C66.9993,55.4719 63.8353,55.2639 60.6233,57.1449 C62.1973,61.3449 67.1233,73.5199 69.2683,78.3139 C70.6073,77.4689 72.6083,76.9959 74.6973,76.9749 L74.6973,76.9749 Z M81.8633,79.2559 L81.4503,79.5069 C78.3943,76.9089 72.0203,76.9629 69.3063,78.8999 L68.9273,78.7959 C66.8183,74.1319 61.5913,61.2069 60.0713,57.1219 L60.1763,56.8169 C63.5983,54.7309 66.9833,54.9489 69.2243,55.4959 C72.3233,56.2569 74.7633,58.0229 75.5713,59.3699 C75.5713,59.3699 76.3593,61.8349 77.1923,64.4329 L81.8633,79.2559 Z" id="Fill-46" fill="#FFA727"></path>
+                    <path d="M113.2852,83.6575 C112.4802,77.3275 111.7822,65.4695 110.9552,58.8995 C102.9822,51.6275 86.3152,55.3585 83.3291702,57.1325 C83.3132,57.2465 89.7372,81.7365 89.9362,83.4215 C101.8352,78.6805 110.4952,82.3775 113.2852,83.6575" id="Fill-48" fill="#BF3452"></path>
+                    <path d="M92.4434,80.0667 C95.6844,78.9017 98.6554,78.4647 101.2464,78.4377 C105.4644,78.3937 108.6764,79.4317 110.4324,80.1797 C110.1334,77.7057 109.8484,74.2697 109.5734,70.9397 C109.2814,67.4127 108.9784,63.7637 108.6554,61.1737 C102.5154,55.7067 89.8014,58.5197 87.3034,59.7837 C87.4344,60.3157 87.8674,61.9887 88.3964,64.0287 L92.4434,80.0667 Z M110.6354,80.8267 C108.1064,79.6707 101.2604,77.3427 92.3344,80.6467 L91.9934,80.4387 C91.8834,79.5347 89.3914,69.9077 87.9024,64.1557 C86.7474,59.6967 86.7474,59.6967 86.7594,59.6167 L86.8814,59.4337 C89.2664,58.0237 102.6034,54.9847 109.0674,60.8597 L109.1484,61.0157 C109.4784,63.6217 109.7844,67.3217 110.0824,70.8977 C110.3744,74.4267 110.6764,78.0767 110.9934,80.5627 L110.6354,80.8267 Z" id="Fill-50" fill="#FFA727"></path>
+                    <path d="M84.8828,83.1966 C85.2368,84.1386 88.4798,84.6026 90.0708,83.3886 C90.0128,83.0046 83.4638,57.0826 83.4638,57.0826 C81.5628,58.7646 77.3688,58.5086 76.2848,57.1576 L84.8828,83.1966 Z" id="Fill-52" fill="#B22248"></path>
+                    <path d="M89.124,79.554 C88.033,80.2 86.581,80.381 85.442,80.283 C84.816,80.23 84.255,80.096 83.798,79.91 L83.995,80.51 C84.419,80.642 84.881,80.747 85.398,80.791 C85.639,80.812 85.895,80.822 86.16,80.819 C87.178,80.808 88.32,80.601 89.259,80.094 C89.216,79.921 89.17,79.738 89.124,79.554 M84.221,60.081 L84.094,60.194 C82.995,61.166 81.19,61.392 79.853,61.279 C78.713,61.183 77.768,60.827 77.34,60.35 L77.611,61.175 C78.18,61.489 78.933,61.712 79.81,61.786 C80.049,61.808 80.304,61.818 80.568,61.815 C81.853,61.801 83.344,61.481 84.358,60.625 C84.312,60.439 84.265,60.256 84.221,60.081" id="Fill-54" fill="#000000"></path>
+                    <path d="M100.919,73.2142 C100.995,73.5542 101.085,74.2682 103.63,74.6862 C104.05,74.7552 101.639,74.7372 101.977,75.1172 C102.92,76.1792 104.648,77.8562 107.763,78.4372 C115.224,79.8272 118.69,77.1572 119.405,75.4642 C119.909,74.2732 117.974,67.5092 112.163,66.2302 C112.158,67.1002 112.634,69.9502 112.093,70.2032 C111.352,70.5492 109.423,69.7402 107.493,69.4602 C103.426,68.8692 100.494,69.7782 101.299,70.9242 C101.577,71.3192 108.214,72.7152 108.228,72.9582 C108.241,73.2002 100.862,72.9592 100.919,73.2142" id="Fill-56" fill="#FFC19F"></path>
+                    <path d="M75.6651,22.4173 C75.6651,22.4173 70.0571,-0.1347 95.9181,0.0263 L91.9791,10.2353 L75.6651,22.4173 Z" id="Fill-58" fill="#010000"></path>
+                    <path d="M113.9297,15.8616 C113.3967,25.0786 106.8137,32.9566 97.5927,33.4196 C88.3707,33.8826 80.5217,26.7816 80.0587,17.5606 C79.5967,8.3396 86.6967,0.4896 95.9177,0.0266 C105.1387,-0.4364 114.5517,5.1106 113.9297,15.8616" id="Fill-60" fill="#010000"></path>
+                    <path d="M83.1348469,26.8929 C83.1468,29.7339 80.8538,32.0459 78.0128,32.057955 C75.1718,32.0709 72.8598,29.7779 72.847745,26.9369 C72.8348,24.0959 75.1278,21.7839 77.9688,21.7708531 C80.8098,21.7589 83.1218,24.0519 83.1348469,26.8929" id="Fill-62" fill="#EB996E"></path>
+                    <path d="M89.0586,4.7054 C89.0586,4.7054 80.3026,4.3084 77.1526,14.3384 C74.0016,24.3684 77.1716,41.9654 89.7996,43.3794 C100.7846,44.6084 109.1336,38.9254 109.7266,27.5534 C110.3906,14.8094 108.0666,2.7364 89.0586,4.7054" id="Fill-64" fill="#FFBE9D"></path>
+                    <path d="M109.7949,22.2434 L106.7059,26.6274 L104.0799,25.5394 C104.0799,25.5394 106.3879,15.7024 103.0739,10.5684 L109.8409,10.2284 L109.7949,22.2434 Z" id="Fill-66" fill="#010000"></path>
+                    <path d="M116.917045,26.6038 C116.929,29.5368 114.562,31.9248 111.629,31.9368533 C108.695,31.9498 106.308,29.5828 106.294947,26.6488 C106.282,23.7158 108.649,21.3288 111.583,21.3157467 C114.516,21.3028 116.904,23.6698 116.917045,26.6038" id="Fill-68" fill="#FFBE9D"></path>
+                    <path d="M109.2041,28.4017 C109.1851,28.4017 109.1661,28.3997 109.1471,28.3937 C109.0291,28.3627 108.9591,28.2417 108.9911,28.1247 C109.0011,28.0847 110.0951,24.1547 114.2811,25.1587 C114.3991,25.1867 114.4731,25.3057 114.4441,25.4237 C114.4161,25.5437 114.2981,25.6207 114.1791,25.5887 C110.4171,24.6927 109.4571,28.0927 109.4181,28.2377 C109.3911,28.3377 109.3021,28.4017 109.2041,28.4017" id="Fill-70" fill="#010000"></path>
+                    <path d="M80.0371,6.0716 C80.0371,6.0716 76.8811,13.3756 88.3091,14.1376 C88.3091,14.1376 85.5411,11.5486 85.4351,9.4616 C85.4351,9.4616 89.7451,16.6156 110.7071,16.7696 C110.7071,16.7696 111.3591,8.4656 104.4601,5.0486 C97.5601,1.6316 80.0371,6.0716 80.0371,6.0716" id="Fill-72" fill="#010000"></path>
+                    <path d="M82.6445,3.2249 C82.6445,3.2249 77.9625,3.0709 74.6295,7.6849 C74.6295,7.6849 77.0045,7.1929 80.9845,7.6779 L82.6445,3.2249 Z" id="Fill-74" fill="#010000"></path>
+                    <path d="M86.9219,32.4075 C86.8169,32.4075 86.7229,32.3315 86.7039,32.2225 C86.6959,32.1735 86.5109,31.0035 87.2069,30.5425 C87.7589,30.1775 88.6209,30.3785 89.8419,31.1535 C89.9439,31.2195 89.9749,31.3555 89.9089,31.4585 C89.8449,31.5615 89.7069,31.5925 89.6049,31.5265 C88.5909,30.8825 87.8249,30.6655 87.4519,30.9105 C87.0709,31.1615 87.0979,31.8905 87.1409,32.1515 C87.1599,32.2715 87.0779,32.3855 86.9579,32.4045 C86.9459,32.4065 86.9339,32.4075 86.9219,32.4075" id="Fill-76" fill="#010000"></path>
+                    <path d="M86.4151,25.6028 C86.4151,25.6028 86.7071,25.0788 86.5681,24.5438 C86.4331,24.0148 81.5861,19.9588 78.3541,24.9008 C78.3541,24.9008 81.9581,29.9348 86.4151,25.6028" id="Fill-78" fill="#FFFFFF"></path>
+                    <path d="M85.6338,24.638 C85.6338,25.78 84.7138,26.703 83.5708,26.703 C82.4308,26.703 81.5058,25.78 81.5058,24.638 C81.5058,23.5 82.4308,22.575 83.5708,22.575 C84.7138,22.575 85.6338,23.5 85.6338,24.638" id="Fill-80" fill="#2C1117"></path>
+                    <path d="M84.5381,24.638 C84.5381,25.175 84.1051,25.61 83.5711,25.61 C83.0331,25.61 82.6001,25.175 82.6001,24.638 C82.6001,24.104 83.0331,23.669 83.5711,23.669 C84.1051,23.669 84.5381,24.104 84.5381,24.638" id="Fill-82" fill="#040000"></path>
+                    <path d="M79.8789,26.3763 L77.9939,25.3253 L77.6609,25.1383 L77.8879,24.5973 L77.8879,24.5943 C78.1589,24.2513 78.3769,23.8723 78.6939,23.5603 C79.0199,23.2513 79.3439,22.9463 79.7439,22.7223 C79.9279,22.5903 80.1259,22.4803 80.3459,22.4033 C80.5599,22.3263 80.7579,22.2033 80.9859,22.1743 C81.4289,22.0443 81.8849,22.0163 82.3299,22.0393 C83.2259,22.1083 84.0499,22.4143 84.7829,22.8303 C85.1499,23.0413 85.4959,23.2813 85.8189,23.5443 C85.9739,23.6883 86.1399,23.8133 86.2749,23.9783 C86.4149,24.1393 86.5579,24.2723 86.6499,24.5223 L86.6559591,24.5283 L86.6559591,24.5343 C86.6589,24.8543 86.5469,25.1473 86.4889,25.4383 C86.4909,25.1323 86.5419,24.8383 86.4789,24.5553 L86.4839,24.5653 C86.2779,24.3063 85.9059,24.0673 85.5929,23.8553 C85.2559,23.6493 84.9039,23.4693 84.5429,23.3233 C83.8219,23.0323 83.0549,22.8743 82.3209,22.9183 C81.5939,22.9783 80.9089,23.1933 80.3259,23.6163 C79.7249,24.0083 79.2839,24.6203 78.8209,25.2043 L78.7139,24.4763 L79.8789,26.3763 Z" id="Fill-84" fill="#030000"></path>
+                    <path d="M83.1719,23.9339 C83.1719,24.2049 82.9479,24.4249 82.6789,24.4249 C82.4099,24.4249 82.1879,24.2049 82.1879,23.9339 C82.1879,23.6629 82.4099,23.4429 82.6789,23.4429 C82.9479,23.4429 83.1719,23.6629 83.1719,23.9339" id="Fill-86" fill="#F0F0ED"></path>
+                    <path d="M92.0938,25.5442 C92.0938,25.5442 91.8028,25.0202 91.9398,24.4862 C92.0798,23.9562 96.9188,19.9012 100.1518,24.8432 C100.1518,24.8432 96.5468,29.8772 92.0938,25.5442" id="Fill-88" fill="#FFFFFF"></path>
+                    <path d="M94.1387,24.5794 C94.1387,25.7224 95.0617,26.6444 96.2037,26.6444 C97.3427,26.6444 98.2677,25.7224 98.2677,24.5794 C98.2677,23.4424 97.3427,22.5164 96.2037,22.5164 C95.0617,22.5164 94.1387,23.4424 94.1387,24.5794" id="Fill-90" fill="#2C1117"></path>
+                    <path d="M95.2334,24.5794 C95.2334,25.1164 95.6654,25.5524 96.2044,25.5524 C96.7414,25.5524 97.1704,25.1164 97.1704,24.5794 C97.1704,24.0464 96.7414,23.6104 96.2044,23.6104 C95.6654,23.6104 95.2334,24.0464 95.2334,24.5794" id="Fill-92" fill="#040000"></path>
+                    <path d="M98.627,26.3186 L99.79,24.4186 L99.687,25.1456 L99.685,25.1456 C99.22,24.5616 98.775,23.9496 98.179,23.5566 C97.599,23.1346 96.912,22.9196 96.186,22.8596 C95.452,22.8156 94.686,22.9756 93.964,23.2666 C93.603,23.4106 93.252,23.5926 92.917,23.7986 C92.601,24.0106 92.229,24.2476 92.022,24.5066 L92.025,24.4956 C91.969,24.7796 92.017,25.0746 92.022,25.3796 C91.964,25.0886 91.852,24.7976 91.852,24.4776 L91.852,24.4706 L91.856,24.4636 C91.95,24.2146 92.092,24.0816 92.232,23.9196 C92.367,23.7556 92.534,23.6306 92.687,23.4876 C93.013,23.2226 93.357,22.9826 93.722,22.7716 C94.455,22.3556 95.278,22.0506 96.177,21.9806 C96.621,21.9586 97.077,21.9856 97.52,22.1146 C97.747,22.1456 97.944,22.2686 98.161,22.3456 C98.377,22.4226 98.575,22.5316 98.76,22.6636 C99.16,22.8876 99.484,23.1936 99.81,23.5026 C100.127,23.8146 100.346,24.1936 100.613,24.5356 L100.613,24.5396 L100.847,25.0796 L100.51,25.2666 L98.627,26.3186 Z" id="Fill-94" fill="#030000"></path>
+                    <path d="M96.6026,23.8763 C96.6026,24.1463 96.8236,24.3673 97.0986,24.3673 C97.3636,24.3673 97.5866,24.1463 97.5866,23.8763 C97.5866,23.6053 97.3636,23.3843 97.0986,23.3843 C96.8236,23.3843 96.6026,23.6053 96.6026,23.8763" id="Fill-96" fill="#F0F0ED"></path>
+                    <path d="M85.9717,35.7474 L93.5157,34.6644 C93.5157,34.6644 93.7197,38.1134 90.2637,38.1884 C86.8077,38.2644 85.9717,35.7474 85.9717,35.7474" id="Fill-98" fill="#FFFFFF"></path>
+                    <path d="M77.6611,19.347 C77.6611,19.347 80.4271,17.288 84.9811453,19.316 C84.9811453,19.316 85.0361,16.666 81.3141,16.676 C78.3621,16.683 77.6611,19.347 77.6611,19.347" id="Fill-100" fill="#010000"></path>
+                    <path d="M100.3457,19.2513 C100.3457,19.2513 97.0157,17.2193 91.5817,19.2893 C91.5817,19.2893 91.4917,16.6413 95.9477,16.6153 C99.4807,16.5953 100.3457,19.2513 100.3457,19.2513" id="Fill-102" fill="#010000"></path>
+                    <path d="M0,57.3382 C2.729,58.9692 8.481,62.7202 11.539,63.6352 C15.635,58.3922 19.487,42.3952 19.4830031,41.8862 C15.888,42.1132 11.709,42.5872 10.554,43.2142 C8.503,45.9122 2.938,52.9392 0,57.3382" id="Fill-104" fill="#FF2C5E"></path>
+                    <path d="M57.2012,57.4173 C54.4722,59.0483 48.7202,62.7993 45.6612,63.7143 C41.5652,58.4703 37.7132,42.4733 37.7171969,41.9653 C41.3122,42.1923 45.4912,42.6663 46.6472,43.2933 C48.6972,45.9913 54.2632,53.0183 57.2012,57.4173" id="Fill-106" fill="#FF2C5E"></path>
+                    <path d="M9.1973,76.4143 C18.5603,81.5963 36.0033,82.4923 47.4263,75.1733 C47.4263,75.1733 44.4083,49.6093 42.9553,42.7883 C35.0833,40.7563 20.4033,41.3333 13.1913,42.4913 C12.1373,51.1963 10.4343,63.5583 9.1973,76.4143" id="Fill-108" fill="#FF2C5E"></path>
+                    <path d="M37.0137,43.2122 C37.0347,42.7432 36.9557,42.2912 36.8437,41.8462 C32.0247,41.5202 24.7847,41.4162 19.6237,41.8272 C19.5837,42.0292 19.4977,42.2192 19.4887,42.4292 C19.3267,46.0592 23.1177,49.1772 27.9567,49.3942 C32.7967,49.6092 36.8517,46.8432 37.0137,43.2122" id="Fill-110" fill="#FFC19F"></path>
+                    <path d="M34.4443,33.1546 L34.3333,43.4076 C34.3083,45.6126 31.4883,47.3696 28.0313,47.3326 C24.5743,47.2946 21.7923,45.4756 21.8153,43.2716 L21.9263,33.0186 L34.4443,33.1546 Z" id="Fill-112" fill="#FFC19F"></path>
+                    <path d="M35.1006,38.8704 C35.1176,38.5104 35.0566,38.1624 34.9696,37.8204 C31.2666,37.5704 25.7046,37.4894 21.7386,37.8064 C21.7076,37.9614 21.6416,38.1064 21.6346,38.2684 C21.5096,41.0584 24.4236,43.4534 28.1426,43.6204 C31.8606,43.7864 34.9766,41.6594 35.1006,38.8704" id="Fill-114" fill="#601805"></path>
+                    <path d="M52.0156,77.5179 C52.7446,74.5559 54.9426,56.3919 55.6126,51.7409 C49.3776,50.3289 35.0086,51.5839 29.2075974,62.6249 C29.2036,62.7319 33.7776,77.0319 34.1346,78.5469 C36.3526,77.4299 49.3266,76.6039 52.0156,77.5179" id="Fill-116" fill="#FFF8E9"></path>
+                    <path d="M29.2383,62.6634 C29.2853,62.8374 33.8713,77.3584 34.1543,78.4914 C35.3733,77.9104 39.3993,77.4544 42.8853,77.2444 C46.1533,77.0494 50.4753,76.9954 51.9793,77.4824 C52.4913,75.3424 53.7113,65.9274 54.6033,59.0384 C55.0053,55.9434 55.3513,53.2674 55.5583,51.8244 C49.7483,50.5264 35.1423,51.4584 29.2383,62.6634 M34.1173,78.6284 L34.0923,78.5764 C33.8633,77.6014 31.8333,71.1884 30.4933,66.9364 C29.3443,63.2944 29.1583,62.6924 29.159296,62.6494 C32.3733,56.5334 38.0443,53.7384 42.2303,52.4944 C47.5823,50.9024 52.7863,51.1004 55.6123,51.7404 L55.6503,51.7364 C55.6503,51.7364 55.0863,55.9254 54.6803,59.0594 C53.7813,66.0014 52.5493,75.5074 52.0433,77.5634 L52.0313,77.6094 L51.9973,77.5984 C49.4383,76.7264 36.3973,77.4804 34.1173,78.6284" id="Fill-118" fill="#F7E3BF"></path>
+                    <path d="M56.0283,68.8157 C56.1433,68.5517 56.9723,56.9167 57.1953,54.7797 C51.4383,52.2367 36.7233,53.1667 29.0922994,62.7677 C29.0903,62.8737 33.7773,77.0317 34.1343,78.5467 C36.3523,77.4297 52.9713,70.6567 56.0283,68.8157" id="Fill-120" fill="#F9E7D4"></path>
+                    <path d="M29.1367,62.7864 C29.1937,62.9804 33.8637,77.3354 34.1547,78.4914 C34.9957,78.0734 37.5797,76.9614 40.8317,75.5764 C46.4017,73.2044 54.0247,69.9574 55.9987,68.7744 C56.0707,68.4644 56.3667,64.6384 56.6297,61.2544 C56.8477,58.4444 57.0537,55.7884 57.1537,54.8154 C54.0327,53.4524 48.8197,53.2364 43.8547,54.2724 C37.7207,55.5504 32.4947,58.5734 29.1367,62.7864 L29.1367,62.7864 Z M34.1167,78.6284 L34.0927,78.5764 C33.8597,77.5854 31.7517,71.0904 30.3537,66.8014 C29.2237,63.3354 29.0537,62.8074 29.0556827,62.7644 C32.4237,58.5264 37.6827,55.4494 43.8407,54.1664 C48.8337,53.1264 54.0807,53.3464 57.2067,54.7274 L57.2397,54.7424 C57.2397,54.7424 56.9287,58.4134 56.7067,61.2674 C56.3497,65.8834 56.1267,68.6954 56.0627,68.8444 C54.1067,70.0224 46.4407,73.3004 40.8557,75.6804 C37.6857,77.0294 34.9487,78.1954 34.1497,78.5974 L34.1167,78.6284 Z" id="Fill-122" fill="#F7E3BF"></path>
+                    <path d="M8.7695,77.5901 C6.2385,73.5201 7.5695,69.8351 4.7765,65.9291 C4.0625,64.9301 3.0695,56.7401 2.2495,52.0951 C8.4385,50.6331 21.9025,51.3051 28.9865105,62.5041 C28.9935,62.6111 25.4925,77.0641 25.1845,78.5821 C22.9305,77.4841 20.3625,76.7531 17.6035,76.5161 C14.4445,76.2441 11.4295,76.6541 8.7695,77.5901" id="Fill-124" fill="#FFF8E9"></path>
+                    <path d="M15.6191,76.3811 C16.2801,76.3781 16.9421,76.4051 17.6051,76.4621 C20.2861,76.6931 22.8261,77.3831 25.1581,78.5131 C25.3691,77.5101 28.8871,62.8071 28.9441,62.5211 C22.2101,51.9001 9.3411,50.4901 2.2981,52.1391 C2.5481,53.5661 2.8081,55.2801 3.0851,57.0941 C3.6911,61.0851 4.3191,65.2131 4.8041,65.8921 C6.2601,67.9271 6.6081,69.9451 6.9451,71.8991 C7.2591,73.7121 7.5831,75.5891 8.7831,77.5301 C10.9231,76.7801 13.2541,76.3911 15.6191,76.3811 M25.2111,78.6521 L25.1721,78.6331 C22.8371,77.4941 20.2901,76.8001 17.6011,76.5691 C14.5691,76.3101 11.5151,76.6791 8.7801,77.6421 C7.5551,75.6721 7.1871,73.7561 6.8701,71.9211 C6.5191,69.8951 6.1891,67.9811 4.7491,65.9661 C4.2471,65.2641 3.6181,61.1211 3.0091,57.1141 C2.7291,55.2771 2.2031,52.0521 2.2031,52.0521 L2.2431,52.0431 C5.2081,51.3421 10.1911,51.0941 15.2891,52.4991 C21.1681,54.1191 25.9131,57.5651 29.0141138,62.4671 C29.0161,62.5161 28.8021,63.5041 27.6021,68.5181 C26.6201,72.6251 25.2111,78.6521 25.2111,78.6521" id="Fill-126" fill="#F7E3BF"></path>
+                    <path d="M4.9336,69.4954 C4.8086,69.2324 1.4116,57.3284 0.9096,55.1014 C6.9326,52.0014 20.8906,52.4744 28.9866105,62.5044 C28.9936,62.6104 25.4926,77.0634 25.1846,78.5824 C22.9306,77.4834 8.0476,71.3114 4.9336,69.4954" id="Fill-128" fill="#F9E7D4"></path>
+                    <path d="M4.96,69.4534 C7.027,70.6544 14.207,73.7504 19.452,76.0124 C22.187,77.1904 24.356,78.1264 25.158,78.5134 C25.369,77.5114 28.882,62.8284 28.944,62.5204 C24.356,56.8504 18.377,54.7214 14.166,53.9324 C9.267,53.0154 4.21,53.4754 0.957,55.1344 C1.517,57.5794 4.776,68.9554 4.96,69.4534 M25.211,78.6514 L25.172,78.6334 C24.404,78.2594 22.209,77.3124 19.431,76.1144 C14.173,73.8474 6.973,70.7424 4.919,69.5454 C4.81,69.3124 1.406,57.4874 0.872,55.1164 L0.86,55.0684 L0.895,55.0514 C4.157,53.3714 9.245,52.9024 14.176,53.8254 C18.402,54.6184 24.409,56.7624 29.0140307,62.4674 C29.017,62.5164 28.802,63.5044 27.603,68.5174 C26.62,72.6254 25.211,78.6514 25.211,78.6514" id="Fill-130" fill="#F7E3BF"></path>
+                    <path d="M0.2959,58.9622 C0.5199,58.7222 0.5779,58.6702 0.8469,58.4182 C10.9559,55.8342 19.7579,58.2252 25.4219,62.4962 C25.6399,64.1402 26.5009,80.9102 26.1329,83.0382 C18.0559,80.6282 7.5139,57.3852 0.2959,58.9622" id="Fill-132" fill="#CF79DB"></path>
+                    <path d="M58.3516,58.9622 C58.1276,58.7222 58.0696,58.6702 57.8006,58.4182 C47.6916,55.8342 38.8896,58.2252 33.2246,62.4962 C33.0076,64.1402 32.1476,80.9102 32.5146,83.0382 C40.5916,80.6282 51.1336,57.3852 58.3516,58.9622" id="Fill-134" fill="#CF79DB"></path>
+                    <path d="M52.2539,81.9964 C53.8709,75.4404 56.6729,66.0574 58.3519,58.9624 C48.1219,55.8214 38.9829,58.8274 33.3199,62.9744 C33.1039,64.5704 31.7989,81.3234 32.1679,83.3904 C40.2439,81.0504 45.0349,80.4634 52.2539,81.9964" id="Fill-136" fill="#A841B7"></path>
+                    <path d="M50.6729,79.385 C51.2509,77.06 51.9979,74.34 52.7869,71.465 C53.7319,68.031 54.7079,64.481 55.4319,61.443 C48.6989,59.432 41.4309,60.614 35.9299,64.608 C35.7109,66.405 34.8159,78.228 34.9969,80.474 C38.7869,79.383 41.7539,78.747 44.9269,78.747 C46.7159,78.747 48.5699,78.949 50.6729,79.385 M34.7399,80.893 C34.6959,80.864 34.6669,80.817 34.6569,80.763 C34.3569,79.081 35.4219,65.581 35.5719,64.465 C35.5799,64.411 35.6099,64.362 35.6509,64.329 C41.3019,60.197 48.7959,58.993 55.7079,61.114 C55.8049,61.143 55.8629,61.249 55.8369,61.354 C55.1059,64.44 54.1109,68.068 53.1469,71.576 C52.3359,74.524 51.5709,77.307 50.9879,79.667 C50.9639,79.77 50.8639,79.832 50.7729,79.812 C44.8519,78.559 40.9329,79.164 34.8879,80.916 L34.8399,80.924 C34.8059,80.924 34.7719,80.914 34.7399,80.893" id="Fill-138" fill="#FFA727"></path>
+                    <path d="M6.3936,81.9964 C4.7776,75.4404 1.9746,66.0574 0.2956,58.9624 C10.5256,55.8214 19.6646,58.8274 25.3276,62.9744 C25.5436,64.5704 26.8476,81.3234 26.4796,83.3904 C18.4036,81.0504 13.6126,80.4634 6.3936,81.9964" id="Fill-140" fill="#A841B7"></path>
+                    <path d="M13.7207,78.7474 C16.8937,78.7474 19.8607,79.3834 23.6507,80.4744 C23.8317,78.2274 22.9367,66.4044 22.7177,64.6074 C17.2167,60.6134 9.9487,59.4324 3.2167,61.4424 C3.9397,64.4804 4.9157,68.0314 5.8607,71.4654 C6.6497,74.3404 7.3967,77.0604 7.9747,79.3854 C10.0767,78.9494 11.9317,78.7474 13.7207,78.7474 M23.8077,80.9244 L23.7587,80.9164 C17.7147,79.1644 13.7957,78.5594 7.8747,79.8114 C7.7837,79.8324 7.6827,79.7694 7.6587,79.6674 C7.0757,77.3074 6.3117,74.5234 5.5007,71.5764 C4.5367,68.0674 3.5417,64.4394 2.8107,61.3534 C2.7837,61.2494 2.8427,61.1434 2.9397,61.1134 C9.8517,58.9934 17.3457,60.1964 22.9967,64.3294 C23.0377,64.3614 23.0677,64.4114 23.0747,64.4654 C23.2257,65.5814 24.2907,79.0814 23.9907,80.7634 C23.9807,80.8164 23.9507,80.8644 23.9077,80.8934 C23.8757,80.9144 23.8417,80.9244 23.8077,80.9244" id="Fill-142" fill="#FFA727"></path>
+                    <path d="M33.2666112,62.9515 C33.2716,63.2775 31.6046,63.9355 29.3566,63.9445 C27.1076,63.9545 25.2736,63.2955 25.3276,62.9735 C25.3646,62.7475 27.1126,62.1865 29.3616,62.1775 C31.6106,62.1685 33.2636,62.7675 33.2666112,62.9515" id="Fill-144" fill="#481651"></path>
+                    <path d="M25.4121,65.0813 C25.3961,64.0613 25.3271,63.1003 25.3191,62.4193 C28.3031,63.1673 30.5591,63.2173 33.2671,62.4643 C33.3101,62.9143 33.0851,64.8633 33.1411,65.4003 C31.2041,66.2703 27.0331,66.5613 25.4121,65.0813" id="Fill-146" fill="#CF79DB"></path>
+                    <path d="M26.4795,83.3899 C26.2395,77.8229 25.5975,69.7409 25.3275,62.9739 C28.2815,63.5359 30.5575,63.6829 33.2665,62.9519 C33.2735,64.5659 33.0815,79.7849 32.9225,83.1739 C31.8135,84.1779 28.0995,84.3179 26.4795,83.3899" id="Fill-148" fill="#8B2D9B"></path>
+                    <path d="M33.2412,66.014 C33.2432,65.822 33.2452,65.636 33.2472,65.457 C32.6192,66.059 31.0322,66.477 28.9952,66.477 C27.5252,66.477 26.2892,66.256 25.4632,65.911 C25.4702,66.072 25.4802,66.235 25.4882,66.395 C25.5372,66.415 25.5732,66.439 25.6332,66.458 C26.5222,66.753 27.7172,66.916 28.9952,66.916 C30.6732,66.916 32.3162,66.618 33.2412,66.014" id="Fill-150" fill="#000000"></path>
+                    <path d="M29.3945,81.5843 C30.7165,81.5843 32.0385,81.4073 32.9925,81.0383 C32.9965,80.8833 32.9995,80.7233 33.0045,80.5583 C32.1795,80.9183 30.9015,81.1473 29.3945,81.1473 C28.1815,81.1473 27.1485,80.9853 26.3465,80.7413 C26.3545,80.8923 26.3645,81.0553 26.3725,81.2033 C27.2195,81.4383 28.2565,81.5843 29.3945,81.5843" id="Fill-152" fill="#000000"></path>
+                    <path d="M51.1484,70.1897 C50.3284,69.6877 48.5654,68.4057 47.7734,69.3577 C47.4464,69.7497 49.0504,70.8967 50.5654,72.0117 C51.0714,72.3837 51.3504,72.3087 53.0214,73.0027 C52.9904,73.1717 52.0494,73.0857 50.9814,72.6297 C50.4004,72.3827 49.1534,70.6037 48.0054,71.6597 C47.8094,71.8407 49.6854,73.7107 50.1294,74.1417 C50.8384,74.8307 55.7084,77.3447 56.0404,77.3527 C57.4324,77.3847 58.6394,76.4717 59.1874,74.6837 C59.4544,73.2347 58.7834,69.1677 57.3504,66.6747 C55.7354,65.6457 54.5264,65.1387 53.2864,64.5797 C49.6264,63.7787 47.9314,63.2367 47.8474,63.9637 C47.6484,65.7057 50.6084,66.2937 52.0804,66.7707 C53.2164,67.2497 54.3724,67.9957 54.9144,68.3947 C54.8934,68.7077 53.0114,67.6427 51.9054,67.1797 C50.9714,66.8577 47.6374,65.9627 47.5174,66.6117 C47.1964,68.3537 48.8354,68.2217 51.1794,69.3037 C52.0794,69.7937 53.6704,70.8767 53.7124,71.0607 C53.4274,71.2087 52.9104,70.9397 51.1484,70.1897" id="Fill-154" fill="#FFC19F"></path>
+                    <path d="M7.9092,70.0804 C8.7002,69.5354 10.3912,68.1594 11.2342,69.0664 C11.5812,69.4404 10.0422,70.6734 8.5902,71.8684 C8.1042,72.2684 7.8222,72.2074 6.1902,72.9914 C6.2302,73.1584 7.1652,73.0194 8.2072,72.5084 C8.7742,72.2294 9.9232,70.3864 11.1262,71.3784 C11.3322,71.5494 9.5602,73.5174 9.1392,73.9724 C8.4692,74.6974 3.7432,77.4724 3.4122,77.4974 C2.0232,77.6054 0.7692,76.7594 0.1252,75.0034 C-0.2198,73.5704 0.2292,69.4734 1.5252,66.9074 C3.0832,65.7914 4.2622,65.2204 5.4712,64.5944 C9.0812,63.5974 10.7452,62.9634 10.8672,63.6854 C11.1612,65.4134 8.2372,66.1604 6.7932,66.7174 C5.6832,67.2574 4.5712,68.0644 4.0512,68.4924 C4.0892,68.8034 5.9102,67.6384 6.9902,67.1164 C7.9042,66.7434 11.1862,65.6704 11.3412,66.3104 C11.7562,68.0344 10.1122,67.9904 7.8302,69.1984 C6.9582,69.7364 5.4282,70.9034 5.3952,71.0894 C5.6872,71.2214 6.1902,70.9244 7.9092,70.0804" id="Fill-156" fill="#FFC19F"></path>
+                    <path d="M10.0117,9.3987 C10.0117,9.3987 2.0627,19.2767 3.3427,36.9607 L50.1577,38.3667 C50.1577,38.3667 55.2547,12.7817 37.6997,3.6457 L10.0117,9.3987 Z" id="Fill-158" fill="#010000"></path>
+                    <path d="M46.5303,18.6556 C46.0883,28.0006 37.0393,35.1656 26.3193,34.6586 C15.5993,34.1516 7.2663,26.1656 7.7093,16.8206 C8.1503,7.4746 17.1993,0.3106 27.9203,0.8176 C38.6393,1.3246 46.9713,9.3106 46.5303,18.6556" id="Fill-160" fill="#010000"></path>
+                    <path d="M48.7676,28.1399 C48.6626,30.3729 46.7656,32.0989 44.5316,31.9939 C42.2966,31.8879 40.5726,29.9919 40.6776,27.7569 C40.7836,25.5239 42.6796,23.7979 44.9136,23.9039 C47.1476,24.0089 48.8726,25.9059 48.7676,28.1399" id="Fill-162" fill="#F4A179"></path>
+                    <path d="M27.5332,5.5267 C28.7792,5.3897 30.0362,5.4557 31.2722,5.6637 C35.2742,6.3387 43.8042,8.6837 45.9302,16.5407 C48.7372,26.9037 45.4082,39.5467 33.6422,41.4227 C24.1372,42.9407 11.2232,36.4987 12.1762,23.5837 C13.0672,11.4757 19.4222,6.4217 27.5332,5.5267" id="Fill-164" fill="#FDB68D"></path>
+                    <path d="M35.7822,31.5276 C35.6782,31.5276 35.5862,31.4496 35.5732,31.3426 C35.5722,31.3376 35.4972,30.7686 35.1192,30.6236 C34.7712,30.4906 34.2342,30.7256 33.5612,31.3056 C33.4722,31.3816 33.3402,31.3726 33.2632,31.2846 C33.1872,31.1956 33.1982,31.0616 33.2852,30.9866 C34.0962,30.2876 34.7652,30.0326 35.2732,30.2306 C35.8862,30.4686 35.9872,31.2586 35.9912,31.2916 C36.0052,31.4076 35.9242,31.5116 35.8082,31.5256 C35.8002,31.5266 35.7912,31.5276 35.7822,31.5276" id="Fill-166" fill="#010000"></path>
+                    <path d="M33.2705,36.6663 C30.6215,36.6663 29.0175,35.3313 28.9485,35.2723 C28.8305,35.1723 28.8155,34.9953 28.9165,34.8773 C29.0155,34.7593 29.1935,34.7433 29.3125,34.8443 C29.3285,34.8573 30.9595,36.2253 33.5945,36.0983 C36.1535,35.9853 36.9735,34.8183 36.9825,34.8073 C37.0685,34.6803 37.2435,34.6443 37.3715,34.7303 C37.4995,34.8153 37.5355,34.9873 37.4515,35.1173 C37.4135,35.1753 36.4925,36.5333 33.6195,36.6593 C33.5005,36.6643 33.3845,36.6663 33.2705,36.6663" id="Fill-168" fill="#010000"></path>
+                    <path d="M43.7256,20.6468 C43.7256,20.6468 41.0836,18.6818 36.7365555,20.6178 C36.7365555,20.6178 36.6836,18.0878 40.2376,18.096776 C43.0556,18.1038 43.7256,20.6468 43.7256,20.6468" id="Fill-170" fill="#010000"></path>
+                    <path d="M22.0654,20.5559 C22.0654,20.5559 25.2464,18.6169 30.4324,20.5919 C30.4324,20.5919 30.5194,18.0639 26.2654,18.0389 C22.8914,18.0199 22.0654,20.5559 22.0654,20.5559" id="Fill-172" fill="#010000"></path>
+                    <path d="M30.668,25.9485 C30.668,25.9485 30.982,25.6995 30.838,25.1455 C30.692,24.5915 25.643,20.3635 22.277,25.5165 C22.277,25.5165 27.055,30.1805 30.668,25.9485" id="Fill-174" fill="#FFFFFF"></path>
+                    <path d="M28.5742,25.2434 C28.5742,26.4304 27.6062,27.3944 26.4222,27.3944 C25.2302,27.3944 24.2712,26.4304 24.2712,25.2434 C24.2712,24.0534 25.2302,23.0914 26.4222,23.0914 C27.6062,23.0914 28.5742,24.0534 28.5742,25.2434" id="Fill-176" fill="#2C1117"></path>
+                    <path d="M27.4346,25.2434 C27.4346,25.8014 26.9796,26.2554 26.4216,26.2554 C25.8616,26.2554 25.4126,25.8014 25.4126,25.2434 C25.4126,24.6834 25.8616,24.2304 26.4216,24.2304 C26.9796,24.2304 27.4346,24.6834 27.4346,25.2434" id="Fill-178" fill="#040000"></path>
+                    <path d="M24.0361,26.8001 C23.3921,26.4521 22.7591,26.0941 22.1441,25.7011 L21.9531,25.5771 L22.0921,25.3941 C22.3631,25.0161 22.5691,24.5801 22.9101,24.2381 C23.2161,23.8631 23.5991,23.5671 24.0111,23.2971 C24.2061,23.1501 24.4491,23.0751 24.6661,22.9611 C24.8881,22.8411 25.1321,22.7961 25.3731,22.7311 C25.8471,22.5961 26.3631,22.5991 26.8401,22.6551 C27.8141,22.7721 28.7301,23.1211 29.5091,23.6641 C29.8971,23.9361 30.2711,24.2171 30.5881,24.5751 C30.7241,24.7421 30.9431,24.9551 30.9541,25.2311 C30.9591,25.4911 30.8721,25.7081 30.7901,25.9231 C30.7981,25.6951 30.8031,25.4581 30.7571,25.2631 C30.7031,25.0791 30.5271,24.9721 30.3491,24.8291 C30.0041,24.5621 29.6271,24.3251 29.2331,24.1261 C28.4431,23.7511 27.6211,23.4391 26.7751,23.3841 C26.3561,23.3411 25.9351,23.3931 25.5341,23.4711 C25.3361,23.5191 25.1221,23.5421 24.9351,23.6401 C24.7511,23.7311 24.5421,23.7771 24.3691,23.9011 C24.0001,24.1111 23.6681,24.3731 23.3571,24.6751 C23.0151,24.9401 22.7711,25.3201 22.4661,25.6391 L22.4071,25.3331 C22.9691,25.7951 23.5091,26.2921 24.0361,26.8001" id="Fill-180" fill="#030000"></path>
+                    <path d="M26.001,24.5061 C26.001,24.7921 25.775,25.0201 25.493,25.0201 C25.208,25.0201 24.982,24.7921 24.982,24.5061 C24.982,24.2241 25.208,23.9941 25.493,23.9941 C25.775,23.9941 26.001,24.2241 26.001,24.5061" id="Fill-182" fill="#F0F0ED"></path>
+                    <path d="M22.7451,25.2434 C22.7451,25.2434 22.0421,26.6134 20.6171,25.5344 C20.6171,25.5344 21.6011,25.8384 22.7911,24.3644 L22.7451,25.2434 Z" id="Fill-184" fill="#030000"></path>
+                    <path d="M20.9141,24.1829 C20.9141,24.1829 21.4951,24.4779 22.1031,24.4169 C22.7201,24.3929 23.2031,24.0429 23.2031,24.0429 L23.3981,24.3759 C23.3941,24.3749 22.7671,24.6929 22.1011,24.6099 C21.4361,24.5689 20.9141,24.1829 20.9141,24.1829" id="Fill-186" fill="#030000"></path>
+                    <path d="M21.9229,23.3216 C21.9229,23.3126 22.0329,23.4106 22.2349,23.4706 C22.4179,23.5646 22.6849,23.6036 22.9559,23.6096 C23.2189,23.6766 23.4749,23.5186 23.6589,23.4926 C23.8459,23.4426 23.9689,23.4086 23.9689,23.4086 L24.1019,23.7706 C24.1019,23.7706 23.9539,23.7876 23.7269,23.8096 C23.5089,23.8086 23.2159,23.9186 22.9349,23.8006 C22.6459,23.7446 22.3789,23.6536 22.2029,23.5226 C22.0149,23.4266 21.9259,23.3146 21.9229,23.3216" id="Fill-188" fill="#030000"></path>
+                    <path d="M37.3564,25.9475 C37.3564,25.9475 37.0424,25.6995 37.1864,25.1445 C37.3284,24.5915 42.3814,20.3635 45.7504,25.5155 C45.7504,25.5155 40.9684,30.1805 37.3564,25.9475" id="Fill-190" fill="#FFFFFF"></path>
+                    <path d="M38.1875,25.2425 C38.1875,26.4305 39.1515,27.3945 40.3355,27.3945 C41.5315,27.3945 42.4905,26.4305 42.4905,25.2425 C42.4905,24.0535 41.5315,23.0915 40.3355,23.0915 C39.1515,23.0915 38.1875,24.0535 38.1875,25.2425" id="Fill-192" fill="#2C1117"></path>
+                    <path d="M39.3291,25.2425 C39.3291,25.8005 39.7801,26.2555 40.3361,26.2555 C40.8971,26.2555 41.3501,25.8005 41.3501,25.2425 C41.3501,24.6835 40.8971,24.2305 40.3361,24.2305 C39.7801,24.2305 39.3291,24.6835 39.3291,25.2425" id="Fill-194" fill="#040000"></path>
+                    <path d="M43.9893,26.8001 C44.5213,26.2921 45.0593,25.7951 45.6223,25.3331 L45.5603,25.6391 C45.2573,25.3201 45.0133,24.9401 44.6693,24.6751 C44.3543,24.3721 44.0243,24.1101 43.6533,23.9011 C43.4843,23.7771 43.2713,23.7301 43.0873,23.6401 C42.9023,23.5421 42.6923,23.5191 42.4903,23.4711 C42.0893,23.3931 41.6723,23.3411 41.2513,23.3841 C40.4053,23.4391 39.5873,23.7491 38.7913,24.1241 C38.3993,24.3241 38.0183,24.5611 37.6773,24.8271 C37.4993,24.9711 37.3253,25.0771 37.2733,25.2621 C37.2213,25.4571 37.2253,25.6941 37.2373,25.9231 C37.1503,25.7081 37.0673,25.4911 37.0723,25.2311 C37.0813,24.9571 37.2963,24.7421 37.4363,24.5751 C37.7493,24.2151 38.1293,23.9341 38.5173,23.6621 C39.2923,23.1211 40.2123,22.7711 41.1833,22.6551 C41.6683,22.5991 42.1743,22.5971 42.6533,22.7311 C42.8953,22.7981 43.1413,22.8401 43.3583,22.9611 C43.5793,23.0741 43.8183,23.1501 44.0133,23.2971 C44.4263,23.5671 44.8103,23.8631 45.1143,24.2371 C45.4543,24.5801 45.6673,25.0161 45.9383,25.3941 L46.0713,25.5761 L45.8763,25.7011 C45.2653,26.0931 44.6323,26.4521 43.9893,26.8001" id="Fill-196" fill="#030000"></path>
+                    <path d="M40.7539,24.5061 C40.7539,24.7921 40.9859,25.0191 41.2689,25.0191 C41.5509,25.0191 41.7799,24.7921 41.7799,24.5061 C41.7799,24.2241 41.5509,23.9941 41.2689,23.9941 C40.9859,23.9941 40.7539,24.2241 40.7539,24.5061" id="Fill-198" fill="#F0F0ED"></path>
+                    <path d="M45.2832,25.2425 C45.2832,25.2425 45.9812,26.6135 47.4072,25.5345 C47.4072,25.5345 46.4252,25.8385 45.2312,24.3635 L45.2832,25.2425 Z" id="Fill-200" fill="#030000"></path>
+                    <path d="M47.1104,24.1829 C47.1104,24.1829 46.5894,24.5689 45.9214,24.6089 C45.2594,24.6929 44.6304,24.3739 44.6304,24.3759 L44.8214,24.0419 C44.8214,24.0419 45.3044,24.3919 45.9214,24.4169 C46.5304,24.4779 47.1104,24.1829 47.1104,24.1829" id="Fill-202" fill="#030000"></path>
+                    <path d="M46.1074,23.3216 C46.1014,23.3146 46.0124,23.4256 45.8234,23.5226 C45.6454,23.6516 45.3804,23.7446 45.0944,23.8006 C44.8104,23.9186 44.5214,23.8076 44.2954,23.8096 C44.0744,23.7866 43.9244,23.7706 43.9244,23.7706 L44.0584,23.4086 C44.0584,23.4086 44.1804,23.4426 44.3674,23.4926 C44.5514,23.5186 44.8074,23.6756 45.0704,23.6096 C45.3374,23.6036 45.6064,23.5646 45.7934,23.4686 C45.9934,23.4106 46.1014,23.3126 46.1074,23.3216" id="Fill-204" fill="#030000"></path>
+                    <path d="M35.9375,5.7747 C35.9375,5.7747 30.8955,10.7757 21.8735,14.0537 C14.5335,16.7207 13.5675,28.0907 13.5675,28.0907 L8.4715,19.7307 L17.5335,7.1947 C17.5335,7.1947 26.8365,2.1277 33.4765,4.8507 L35.9375,5.7747 Z" id="Fill-206" fill="#010000"></path>
+                    <path d="M14.252,28.4925 C14.146,30.7255 12.249,32.4515 10.016,32.3465 C7.781,32.2405 6.056,30.3445 6.161,28.1095 C6.268,25.8755 8.164,24.1505 10.398,24.2565 C12.632,24.3615 14.357,26.2585 14.252,28.4925" id="Fill-208" fill="#FDB68D"></path>
+                    <path d="M12.0918,29.5149 C12.0018,29.5149 11.9198,29.4579 11.8908,29.3689 C11.1998,27.2339 8.7788,27.3999 8.6748,27.4079 C8.5518,27.4249 8.4568,27.3299 8.4468,27.2139 C8.4388,27.0979 8.5248,26.9959 8.6408,26.9869 C8.6668,26.9859 11.4968,26.7839 12.2918,29.2399 C12.3278,29.3499 12.2668,29.4689 12.1558,29.5039 C12.1348,29.5119 12.1128,29.5149 12.0918,29.5149" id="Fill-210" fill="#010000"></path>
+                    <path d="M33.4766,4.8509 C33.4766,4.8509 32.7846,6.0979 39.7316,10.1599 C44.2406,12.7959 46.5306,18.6559 46.5306,18.6559 C46.5306,18.6559 48.6166,12.9149 40.1396,6.7099 L33.4766,4.8509 Z" id="Fill-212" fill="#010000"></path>
+                    <path d="M13.5303,15.6936 C13.5303,15.6936 20.5523,4.3546 33.4763,4.8506 C33.4763,4.8506 38.9163,4.4026 45.8183,10.8846 C45.8183,10.8846 42.2393,2.6796 31.6893,2.1126 C21.1383,1.5456 14.8843,7.8026 13.5303,15.6936" id="Fill-214" fill="#FCA165"></path>
                 </g>
-                <rect id="Rectangle" x="0" y="0" width="148" height="130"></rect>
             </g>
         </g>
     </g>
diff --git a/src/assets/imgs/ic_survey.svg b/src/assets/imgs/ic_survey.svg
new file mode 100644
index 000000000..5929f593c
--- /dev/null
+++ b/src/assets/imgs/ic_survey.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#024F9D;}
+</style>
+<g>
+	<path class="st0" d="M486.9,356c-3.4-2.3-8.1-1.5-10.4,2l-17.2,25.2c-5.6,8.2-8.7,17.7-9.1,27.6l-1.8,47.4
+		c-0.2,4.2,3.2,7.8,7.5,7.8c4,0,7.3-3.2,7.5-7.2l1.8-47.4c0.3-7,2.5-13.8,6.5-19.7l17.2-25.2C491.2,363,490.3,358.3,486.9,356
+		L486.9,356z"/>
+	<path class="st0" d="M501.5,276.9l-45.2-70.2V76.4c0-16.7-13.6-30.3-30.3-30.3H86c-16.7,0-30.3,13.6-30.3,30.3V134
+		c0,4.1,3.4,7.5,7.5,7.5s7.5-3.4,7.5-7.5V76.4C70.7,67.9,77.6,61,86,61h339.9c8.5,0,15.3,6.9,15.3,15.3V303c0,2.1-0.4,4.2-1.3,6.1
+		l-15.3-16.5V86.4c0-4.9-3.9-8.8-8.7-8.8h-50.9c-4.1,0-7.5,3.4-7.5,7.5s3.4,7.5,7.5,7.5h44.7v183.7l-25-27.1
+		c-8.6-9.4-22.8-9.8-32-1.9H232.7c-4.1,0-7.5,3.4-7.5,7.5c0,4.1,3.4,7.5,7.5,7.5h112c-0.5,4.7,0.3,9.5,2.7,13.8l6,10.8H158.6l6-10.8
+		c0.7-1.3,1.3-2.6,1.7-4l2.5,1.9c1.3,1,2.9,1.5,4.5,1.5c2.1,0,4.2-0.9,5.7-2.6l22.7-26.4c2.7-3.1,2.3-7.9-0.8-10.6
+		c-3.1-2.7-7.9-2.3-10.6,0.8l-18.2,21.1l-9.5-7.1c-0.6-0.8-1.3-1.6-2.1-2.4c-9.3-9.1-24.3-8.8-33.2,0.9L110.8,267V92.6h224.3
+		c4.1,0,7.5-3.4,7.5-7.5s-3.4-7.5-7.5-7.5H104.5c-4.8,0-8.7,4-8.7,8.8v196.9L72,309.1c-0.8-1.9-1.3-4-1.3-6.1V164
+		c0-4.1-3.4-7.5-7.5-7.5s-7.5,3.4-7.5,7.5v42.8l-45.2,70.2c-14.3,22.2-13.9,50.6,1,72.4l28.9,42.3c4,5.8,6.2,12.6,6.5,19.7l1.8,47.4
+		c0.2,4,3.5,7.3,7.8,7.2c4.1-0.2,7.4-3.6,7.2-7.8l-1.8-47.4c-0.4-9.9-3.5-19.4-9.1-27.6l-28.9-42.3c-11.5-16.8-11.8-38.8-0.7-55.9
+		l32.6-50.6V303c0,6.4,2,12.5,5.6,17.6l-4.1,4.4c-2.8,3-2.6,7.8,0.4,10.6c3,2.8,7.8,2.6,10.6-0.4l70-75.9c3.1-3.3,8.4-3.6,11.7-0.3
+		c2.6,2.6,3.2,6.6,1.4,9.8l-42.1,76c-3.1,5.6-2.5,12.4,1.6,17.3c8.2,9.9,10.6,23.7,6.4,35.8c-2.1,6-3.2,12.2-3.4,18.6l-0.8,34.8
+		c-0.1,4.2,3.3,7.7,7.5,7.7c4.1,0,7.4-3.2,7.5-7.3l0.8-34.8c0.1-4.8,1-9.5,2.5-14c6-17.1,2.5-36.3-9-50.3c-0.1-0.2-0.1-0.4,0-0.5
+		l10.3-18.7h246.4l10.3,18.7c0.1,0.2,0.1,0.4-0.1,0.5c-11.5,14-14.9,33.2-9,50.3c1.6,4.5,2.4,9.2,2.5,14l0.8,34.8
+		c0.1,4,3.4,7.4,7.7,7.3c4.1-0.1,7.4-3.5,7.3-7.7l-0.8-34.8c-0.1-6.3-1.3-12.6-3.4-18.6c-4.2-12.1-1.8-25.9,6.4-35.8
+		c4.1-4.9,4.7-11.7,1.6-17.3l-42.1-76c-1.8-3.2-1.2-7.2,1.4-9.8c3.3-3.3,8.6-3,11.7,0.3l70,75.9c2.8,3,7.6,3.2,10.6,0.4
+		c3-2.8,3.2-7.6,0.4-10.6l-4.1-4.4c3.6-5.1,5.6-11.2,5.6-17.6v-68.5l32.6,50.6c9.5,14.7,10.7,33,3.3,48.8c-1.8,3.8-0.1,8.2,3.6,10
+		c3.7,1.7,8.2,0.2,10-3.6C515.4,319.7,513.8,296,501.5,276.9L501.5,276.9z M141.1,318.3l9.1-16.5h211.5l9.1,16.5H141.1z"/>
+	<path class="st0" d="M90.9,195.1v-10.8c0-4.1-3.4-7.5-7.5-7.5c-4.1,0-7.5,3.4-7.5,7.5v10.8c0,4.1,3.4,7.5,7.5,7.5
+		C87.6,202.6,90.9,199.2,90.9,195.1z"/>
+	<path class="st0" d="M200.8,116.6c-3.1-2.7-7.9-2.3-10.6,0.8l-18.2,21.1l-11-8.1c-3.3-2.5-8-1.8-10.5,1.6c-2.5,3.3-1.8,8,1.6,10.5
+		l16.6,12.3c1.3,1,2.9,1.5,4.5,1.5c2.1,0,4.2-0.9,5.7-2.6l22.7-26.4C204.3,124,204,119.3,200.8,116.6z"/>
+	<path class="st0" d="M373.9,128H232.7c-4.1,0-7.5,3.4-7.5,7.5s3.4,7.5,7.5,7.5h141.1c4.1,0,7.5-3.4,7.5-7.5S378,128,373.9,128z"/>
+	<path class="st0" d="M373.9,187.6H232.7c-4.1,0-7.5,3.4-7.5,7.5s3.4,7.5,7.5,7.5h141.1c4.1,0,7.5-3.4,7.5-7.5
+		S378,187.6,373.9,187.6z"/>
+	<path class="st0" d="M193.1,176.5c-2.9-2.9-7.7-2.9-10.6,0l-8,8l-8-8c-2.9-2.9-7.7-2.9-10.6,0c-2.9,2.9-2.9,7.7,0,10.6l8,8l-8,8
+		c-2.9,2.9-2.9,7.7,0,10.6c1.5,1.5,3.4,2.2,5.3,2.2c1.9,0,3.8-0.7,5.3-2.2l8-8l8,8c1.5,1.5,3.4,2.2,5.3,2.2s3.8-0.7,5.3-2.2
+		c2.9-2.9,2.9-7.7,0-10.6l-8-8l8-8C196,184.2,196,179.4,193.1,176.5L193.1,176.5z"/>
+</g>
+</svg>
diff --git a/src/assets/imgs/ic_switch.svg b/src/assets/imgs/ic_switch.svg
new file mode 100644
index 000000000..fe4c887f6
--- /dev/null
+++ b/src/assets/imgs/ic_switch.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 26 14" id="switchlayout">
+<path xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#004EA3" d="M19,1.5H7C4,1.5,1.5,4,1.5,7S4,12.5,7,12.5h12c3,0,5.5-2.5,5.5-5.5S22,1.5,19,1.5z M19,11c-2.2,0-4-1.8-4-4 s1.8-4,4-4s4,1.8,4,4S21.2,11,19,11z"></path><path stroke="#004EA3" fill="#004EA3" xmlns="http://www.w3.org/2000/svg" d="M19,0.5H7C3.4,0.5,0.5,3.4,0.5,7s2.9,6.5,6.5,6.5h12c3.6,0,6.5-2.9,6.5-6.5S22.6,0.5,19,0.5z M19,12.5H7 C4,12.5,1.5,10,1.5,7S4,1.5,7,1.5h12c3,0,5.5,2.5,5.5,5.5S22,12.5,19,12.5z M19,3c-2.2,0-4,1.8-4,4s1.8,4,4,4s4-1.8,4-4 S21.2,3,19,3z"></path>
+    </svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_switchNewExperience.svg b/src/assets/imgs/ic_switchNewExperience.svg
new file mode 100644
index 000000000..d35533cd0
--- /dev/null
+++ b/src/assets/imgs/ic_switchNewExperience.svg
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="328px" height="231px" viewBox="0 0 328 231" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>ic_switchNewExperience4</title>
+    <defs>
+        <rect id="path-1" x="0" y="0" width="239.015773" height="231"></rect>
+    </defs>
+    <g id="ic_switchNewExperience4" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="ic_switchNewExperience" transform="translate(44.000000, 0.000000)">
+            <mask id="mask-2" fill="white">
+                <use xlink:href="#path-1"></use>
+            </mask>
+            <g id="path-1"></g>
+            <g id="Group-23" mask="url(#mask-2)">
+                <g transform="translate(15.302839, 6.558360)" id="Group">
+                    <path d="M50.7820226,134.082019 C69.2716981,134.082019 71.583246,216.160803 71.583246,216.160803 C71.583246,216.160803 78.0547681,178.599406 90.0735983,178.599406 C102.091752,178.599406 87.7620505,220.33399 93.7711271,219.406842 C99.7808814,218.479693 95.6202304,141.965158 112.723925,162.368536 C129.826943,182.772593 121.968763,214.305827 140.459116,213.841913 C158.948791,213.378679 133.987594,199.002784 144.619089,185.090803 C155.251262,171.179502 182.061562,203.639885 184.373111,211.986937 C184.373111,211.986937 182.986453,167.005636 195.467051,167.005636 C207.948326,167.005636 208.410095,231.463846 208.410095,231.463846 L14.2637624,236.100946 C14.2637624,236.100946 -5.15080309,183.236507 1.32071874,167.005636 C7.79224058,150.776124 29.5183541,184.163655 33.6783279,196.684573 L33.6779634,196.667376 C33.6752404,196.535952 33.6581047,195.656169 33.6551679,194.196498 L33.65514,193.347106 C33.6796531,180.382868 34.8803193,134.082019 50.7820226,134.082019 Z M111.108141,181.085449 L111.035416,181.088484 C110.79241,181.116748 110.611996,181.319804 110.604486,181.55796 L110.607531,181.630321 L115.804798,226.599461 L115.816831,226.664832 C115.876271,226.898099 116.099884,227.057209 116.344916,227.028708 C116.587922,227.000444 116.768336,226.797389 116.775846,226.559232 L116.772801,226.486871 L111.575534,181.517731 L111.563501,181.45236 C111.51595,181.265747 111.363326,181.126594 111.178723,181.092989 L111.108141,181.085449 Z M11.8194222,180.991859 C11.7176899,180.775938 11.4760233,180.66625 11.2510372,180.744438 C11.0055978,180.829733 10.8729525,181.106316 10.9547656,181.362202 L10.9547656,181.362202 L25.3204576,226.293683 L25.3446156,226.355144 C25.446348,226.571065 25.6880145,226.680753 25.9130007,226.602565 C26.1584401,226.51727 26.2910854,226.240687 26.2092722,225.984801 L26.2092722,225.984801 L11.8435803,181.05332 L11.8194222,180.991859 Z M197.517652,188.906363 L197.445492,188.908595 C197.202181,188.934087 197.019477,189.135074 197.009271,189.373129 L197.011496,189.445519 L197.187642,191.266545 L197.315144,192.684825 C197.413347,193.808064 197.51061,194.994403 197.604167,196.228361 L197.659835,196.974327 L197.732867,197.99162 C197.970229,201.376274 198.146089,204.693458 198.237943,207.81663 C198.475592,215.897091 198.125245,221.775196 197.045653,224.40165 C196.94307,224.651219 197.061582,224.93696 197.310359,225.039871 C197.559136,225.142781 197.84397,225.023892 197.946554,224.774323 C199.038626,222.117507 199.414476,216.637111 199.245276,209.069971 L199.234911,208.631095 L199.212006,207.7878 C199.120653,204.681661 198.946721,201.386903 198.712111,198.025337 L198.631689,196.902507 L198.583881,196.260402 C198.50683,195.239584 198.427207,194.250806 198.346555,193.302667 L198.285896,192.599317 L198.184331,191.463123 C198.157633,191.17097 198.131887,190.894329 198.10725,190.634086 L198.082989,190.379342 L197.980711,189.343973 C197.957842,189.124296 197.793272,188.953868 197.587595,188.914514 L197.517652,188.906363 Z M154.891711,195.601862 C154.738039,195.789646 154.747124,196.057907 154.902101,196.234552 L154.959139,196.289805 L155.58022,196.8218 L156.161868,197.33823 C156.6338,197.762999 157.141923,198.233891 157.678982,198.747811 C159.725671,200.706318 161.772522,202.883334 163.681856,205.219614 C168.754688,211.426781 171.937381,217.599624 172.32295,223.317523 C172.341113,223.586862 172.573485,223.790433 172.841969,223.772213 C173.110452,223.753993 173.313378,223.520882 173.295216,223.251543 C172.8931,217.288254 169.62504,210.949845 164.43545,204.599809 C162.499006,202.230359 160.425382,200.024867 158.351596,198.04043 C157.625508,197.345626 156.950992,196.727846 156.345184,196.194302 C156.18583,196.053956 156.039763,195.926988 155.907888,195.813777 L155.780777,195.705167 L155.577472,195.53422 C155.369484,195.362929 155.062459,195.393213 154.891711,195.601862 Z M52.2974443,154.364438 C52.0528103,154.364438 51.8502846,154.545297 51.8154834,154.781002 L51.8102004,154.853232 L51.8102004,221.981079 L51.8146484,222.047406 C51.846912,222.285988 52.0507717,222.469875 52.2974443,222.469875 C52.5420783,222.469875 52.744604,222.289014 52.7794051,222.05331 L52.7846881,221.981079 L52.7846881,154.853232 L52.7802401,154.786906 C52.7479765,154.548325 52.5441168,154.364438 52.2974443,154.364438 Z" id="Combined-Shape-Copy-2" fill="#F5F5EF" fill-rule="nonzero" opacity="0.0962146577"></path>
+                    <g id="Group-17" transform="translate(30.605678, 192.378549)">
+                        <path d="M132.595237,36.8171048 C132.595237,36.8171048 123.142317,37.2206638 121.440513,34.9225725 C119.738988,32.6247626 124.893391,32.5704482 124.893391,32.5704482 C124.893391,32.5704482 117.567446,31.3068638 116.032557,27.7271771 C114.497668,24.1477718 123.972457,24.5358526 123.972457,24.5358526 C123.972457,24.5358526 117.694499,20.2137749 116.871279,15.8956371 C116.048058,11.5774993 135.535746,23.9876427 135.535746,23.9876427 C135.535746,23.9876427 135.882584,16.8535973 137.552277,15.9828779 C137.552277,15.9828779 141.187846,13.933845 139.785547,23.3944053 C139.785547,23.3944053 145.242775,17.730508 146.947069,20.2720293 C148.651086,22.8135505 141.143834,27.2805605 141.143834,27.2805605 L132.595237,36.8171048 Z" id="Fill-1" fill="#FF4E00" fill-rule="nonzero"></path>
+                        <path d="M137.975502,19.3554104 C137.975502,19.3554104 135.553965,21.8411639 138.329076,30.2860098 C138.329076,30.2860098 139.588198,23.8694573 145.012618,21.7852888" id="Stroke-7" stroke="#4A00B2" stroke-linecap="round"></path>
+                        <path d="M127.338037,41.9453158 C127.338037,41.9453158 122.857674,31.5510811 124.096777,30.8713667 C125.336155,30.1913727 128.48193,34.8540292 128.48193,34.8540292 C128.48193,34.8540292 127.528731,29.1193754 130.007212,27.7124141 C132.485693,26.3054527 133.724796,33.1053931 133.724796,33.1053931 C133.724796,33.1053931 138.395853,25.7196848 141.351208,27.7124141 C144.306287,29.7057025 138.014739,36.6996873 138.014739,36.6996873 C138.014739,36.6996873 144.020383,33.2024153 144.878097,35.9226711 C145.736086,38.6423677 142.209196,41.9453158 142.209196,41.9453158 L127.338037,41.9453158 Z" id="Fill-9" fill="#FFEA54" fill-rule="nonzero"></path>
+                        <path d="M130.438486,33.3631151 C130.438486,33.3631151 132.479882,38.6669689 132.479882,41.9453158 L133.860856,41.9453158 C133.860856,41.9453158 136.46829,33.9461824 138.454259,31.743423" id="Stroke-11" stroke="#4A00B2" stroke-linecap="round"></path>
+                        <path d="M7.04864683,41.5300045 C7.04864683,41.5300045 -0.4397921,34.5594898 0.0203710798,31.5483467 C0.48053426,28.5372037 4.43715814,32.4606888 4.43715814,32.4606888 C4.43715814,32.4606888 -0.163638516,25.8909975 1.40058224,22.0586084 C2.96508138,18.2262195 9.86641553,25.7999013 9.86641553,25.7999013 C9.86641553,25.7999013 8.39406044,17.7699104 11.0626171,13.9375213 C13.7311739,10.1051324 19.0682873,34.2859252 19.0682873,34.2859252 C19.0682873,34.2859252 24.7734199,29.2670773 26.7059382,29.9061309 C26.7059382,29.9061309 31.0308597,31.1836859 22.7490359,37.1145998 C22.7490359,37.1145998 31.2148692,37.1145998 30.5706965,40.3082114 C29.9265237,43.5020989 20.816796,41.038361 20.816796,41.038361 L7.04864683,41.5300045 Z" id="Fill-15" fill="#FF4E00" fill-rule="nonzero"></path>
+                        <path d="M5.10094637,25.9250197 C5.10094637,25.9250197 13.9385173,32.8316973 16.0312315,41.2166092 C16.0312315,41.2166092 16.1442986,30.6183787 12.0811051,20.084117" id="Stroke-19" stroke="#4A00B2" stroke-linecap="round"></path>
+                        <path d="M15.7441511,22.2702369 C15.7441511,22.2702369 4.68138113,17.8048774 5.1132708,16.3182931 C5.54488952,14.8317088 11.3640203,15.9496606 11.3640203,15.9496606 C11.3640203,15.9496606 6.40595939,12.3023009 7.2345156,9.29325024 C8.06334277,6.28419952 14.0249917,10.5241745 14.0249917,10.5241745 C14.0249917,10.5241745 12.0866362,1.22874765 15.7885864,0.451115214 C19.4902656,-0.326517228 19.9167363,9.93211987 19.9167363,9.93211987 C19.9167363,9.93211987 21.8599689,2.57376585 24.5176889,3.98746462 C27.175409,5.4011634 26.9578385,10.6789161 26.9578385,10.6789161 L15.7441511,22.2702369 Z" id="Fill-23" fill="#FFEA54" fill-rule="nonzero"></path>
+                        <path d="M10.2018927,10.8654519 C10.2018927,10.8654519 15.9959271,13.2454123 18.5464326,15.7118773 L19.6750789,14.6221884 C19.6750789,14.6221884 15.5826871,6.54751608 15.4920372,3.32386465" id="Stroke-25" stroke="#4A00B2" stroke-linecap="round"></path>
+                    </g>
+                    <path d="M150.842271,36.0709779 C153.961286,36.0709779 156.785025,37.3352086 158.829009,39.379193 C160.872993,41.4231774 162.137224,44.2469155 162.137224,47.3659306 L162.137224,47.3659306 L162.137224,224.077287 L46.2728707,224.077287 L46.2728707,47.3659306 C46.2728707,44.2469155 47.5371013,41.4231774 49.5810857,39.379193 C51.6250701,37.3352086 54.4488083,36.0709779 57.5678233,36.0709779 L57.5678233,36.0709779 L150.842271,36.0709779 Z" id="Rectangle" stroke="#FFFFFF" fill="#024F9D" fill-rule="nonzero"></path>
+                    <g id="Group-16" transform="translate(50.280757, 44.451104)">
+                        <rect id="Mask" fill="#F3F7FB" fill-rule="nonzero" x="0" y="19.6750789" width="107.84858" height="160.315457"></rect>
+                        <g id="Rectangle">
+                            <g id="path-3-link" fill="#000000" fill-rule="nonzero">
+                                <path d="M11.659306,0 L96.1892744,0 C102.628531,0 107.84858,5.2200491 107.84858,11.659306 L107.84858,55.3817035 L107.84858,55.3817035 L11.659306,55.3817035 C5.2200491,55.3817035 0,50.1616544 0,43.7223975 L0,11.659306 C0,5.2200491 5.2200491,0 11.659306,0 Z" id="path-3"></path>
+                            </g>
+                            <g id="path-3-link" fill="#FFD954">
+                                <path d="M11.659306,0 L96.1892744,0 C102.628531,0 107.84858,5.2200491 107.84858,11.659306 L107.84858,55.3817035 L107.84858,55.3817035 L11.659306,55.3817035 C5.2200491,55.3817035 0,50.1616544 0,43.7223975 L0,11.659306 C0,5.2200491 5.2200491,0 11.659306,0 Z" id="path-3"></path>
+                            </g>
+                        </g>
+                        <g id="notification" transform="translate(94.731861, 7.287066)" fill="#333333" fill-rule="nonzero">
+                            <path d="M3.92227415,5.60543557 C3.89318857,6.13660603 3.45326045,6.55835962 2.9148265,6.55835962 C2.37639255,6.55835962 1.93646442,6.13660603 1.90737885,5.60543557 L0.33661181,5.60543557 C0.150515844,5.60543557 0,5.45530075 0,5.26944239 L0,4.93278331 C0,4.56163037 0.301422656,4.26013104 0.672886229,4.26013104 C0.672449879,4.26013104 0.672652269,2.91474235 0.672652269,2.91474235 C0.672652269,1.96712583 1.2652417,1.13630099 2.13006552,0.813772688 L2.13006552,0.784228845 C2.13006552,0.351241694 2.48191389,0 2.9148265,0 C3.34820352,0 3.69958748,0.351030324 3.69958748,0.784228845 L3.69958748,0.813791372 C4.56438996,1.13636262 5.15700073,1.96732542 5.15700073,2.91474235 L5.15700073,4.2599356 C5.52767611,4.26013104 5.829653,4.56151339 5.829653,4.93278331 L5.829653,5.26944239 C5.829653,5.45456452 5.67864274,5.60543557 5.49304119,5.60543557 L3.92227415,5.60543557 Z M5.20657413,4.99029508 L5.20657413,4.78195438 C5.20657413,4.66728472 5.11271831,4.57361368 4.99801604,4.57361368 C4.76778184,4.57361368 4.58155205,4.38747432 4.58155205,4.1567507 L4.58155205,2.90680995 C4.58155205,2.15936309 4.08526886,1.50930886 3.37793211,1.30526071 L3.22733754,1.26181811 L3.22733754,0.927157085 C3.22733754,0.754853894 3.08748339,0.6151405 2.9148265,0.6151405 C2.74253418,0.6151405 2.60231546,0.755117452 2.60231546,0.927157085 L2.60231546,1.26181477 L2.45171278,1.3052531 C1.74434656,1.50927875 1.24810094,2.15918084 1.24810094,2.90680995 L1.24810094,4.1567507 C1.24810094,4.3868136 1.06141563,4.57361368 0.831636953,4.57361368 C0.716627044,4.57361368 0.623078864,4.66718567 0.623078864,4.78195438 L0.623078864,4.99029508 L5.20657413,4.99029508 Z" id="Shape"></path>
+                        </g>
+                        <g id="Group-13" stroke-linecap="round" transform="translate(6.558360, 8.015773)" stroke="#333333">
+                            <line x1="0" y1="0.728706625" x2="6.55835962" y2="0.728706625" id="Stroke-7"></line>
+                            <line x1="0" y1="2.9148265" x2="3.64353312" y2="2.9148265" id="Stroke-9"></line>
+                            <line x1="0" y1="5.10094637" x2="6.55835962" y2="5.10094637" id="Stroke-11"></line>
+                        </g>
+                        <g id="Rectangle-Copy-22" transform="translate(4.372240, 34.249211)">
+                            <g id="path-5-link" fill="#000000" fill-rule="nonzero">
+                                <rect id="path-5" x="0" y="0" width="98.3753943" height="15.3028391" rx="4"></rect>
+                            </g>
+                            <g id="path-5-link" fill="#FFD954">
+                                <rect id="path-5" x="0" y="0" width="98.3753943" height="15.3028391" rx="4"></rect>
+                            </g>
+                        </g>
+                        <rect id="Rectangle-Copy-3" fill-opacity="0.6" fill="#FF8B2E" fill-rule="nonzero" x="4.37223975" y="96.1892744" width="78.7003155" height="21.1324921" rx="8"></rect>
+                        <path d="M91.0883281,96.1892744 L107.84858,96.1892744 L107.84858,96.1892744 L107.84858,117.321767 L91.0883281,117.321767 C87.8686996,117.321767 85.2586751,114.711742 85.2586751,111.492114 L85.2586751,102.018927 C85.2586751,98.799299 87.8686996,96.1892744 91.0883281,96.1892744 Z" id="Rectangle-Copy-26" fill-opacity="0.6" fill="#F7B500" fill-rule="nonzero"></path>
+                        <path d="M91.0883281,121.694006 L107.84858,121.694006 L107.84858,121.694006 L107.84858,142.826498 L91.0883281,142.826498 C87.8686996,142.826498 85.2586751,140.216474 85.2586751,136.996845 L85.2586751,127.523659 C85.2586751,124.304031 87.8686996,121.694006 91.0883281,121.694006 Z" id="Rectangle-Copy-28" fill-opacity="0.6" fill="#B620E0" fill-rule="nonzero"></path>
+                        <rect id="Rectangle-Copy-33" fill-opacity="0.6" fill="#8F98FF" fill-rule="nonzero" x="4.37223975" y="121.694006" width="78.7003155" height="21.1324921" rx="8"></rect>
+                        <g id="Mask-Copy-14" opacity="0.754561" transform="translate(4.372240, 154.485804)">
+                            <g id="path-7-link" fill="#000000" fill-rule="nonzero">
+                                <rect id="path-7" x="0" y="0" width="23.318612" height="23.318612" rx="4"></rect>
+                            </g>
+                            <g id="path-7-link" fill="#FFFFFF">
+                                <rect id="path-7" x="0" y="0" width="23.318612" height="23.318612" rx="4"></rect>
+                            </g>
+                        </g>
+                        <g id="Mask-Copy-14" transform="translate(9.473186, 150.113565)">
+                            <g id="path-9-link" fill="#000000" fill-rule="nonzero">
+                                <rect id="path-9" x="0" y="0" width="13.1167192" height="13.1167192" rx="4"></rect>
+                            </g>
+                            <g id="path-9-link" fill="#FFFFFF">
+                                <rect id="path-9" x="0" y="0" width="13.1167192" height="13.1167192" rx="4"></rect>
+                            </g>
+                        </g>
+                        <g id="Mask-Copy-15" opacity="0.754561" transform="translate(29.876972, 154.485804)">
+                            <g id="path-11-link" fill="#000000" fill-rule="nonzero">
+                                <rect id="path-11" x="0" y="0" width="23.318612" height="23.318612" rx="4"></rect>
+                            </g>
+                            <g id="path-11-link" fill="#FFFFFF">
+                                <rect id="path-11" x="0" y="0" width="23.318612" height="23.318612" rx="4"></rect>
+                            </g>
+                        </g>
+                        <g id="Mask-Copy-17" opacity="0.754561" transform="translate(54.652997, 154.485804)">
+                            <g id="path-13-link" fill="#000000" fill-rule="nonzero">
+                                <rect id="path-13" x="0" y="0" width="23.318612" height="23.318612" rx="4"></rect>
+                            </g>
+                            <g id="path-13-link" fill="#FFFFFF">
+                                <rect id="path-13" x="0" y="0" width="23.318612" height="23.318612" rx="4"></rect>
+                            </g>
+                        </g>
+                        <g id="Mask-Copy-20" transform="translate(59.753943, 150.113565)">
+                            <g id="path-15-link" fill="#000000" fill-rule="nonzero">
+                                <rect id="path-15" x="0" y="0" width="13.1167192" height="13.1167192" rx="4"></rect>
+                            </g>
+                            <g id="path-15-link" fill="#FFFFFF">
+                                <rect id="path-15" x="0" y="0" width="13.1167192" height="13.1167192" rx="4"></rect>
+                            </g>
+                        </g>
+                        <g id="Mask-Copy-18" opacity="0.754561" transform="translate(79.429022, 154.485804)">
+                            <g id="path-17-link" fill="#000000" fill-rule="nonzero">
+                                <rect id="path-17" x="0" y="0" width="23.318612" height="23.318612" rx="4"></rect>
+                            </g>
+                            <g id="path-17-link" fill="#FFFFFF">
+                                <rect id="path-17" x="0" y="0" width="23.318612" height="23.318612" rx="4"></rect>
+                            </g>
+                        </g>
+                        <g id="Mask-Copy-16" transform="translate(34.977918, 150.113565)">
+                            <g id="path-19-link" fill="#000000" fill-rule="nonzero">
+                                <rect id="path-19" x="0" y="0" width="13.1167192" height="13.1167192" rx="4"></rect>
+                            </g>
+                            <g id="path-19-link" fill="#FFFFFF">
+                                <rect id="path-19" x="0" y="0" width="13.1167192" height="13.1167192" rx="4"></rect>
+                            </g>
+                        </g>
+                        <g id="Mask-Copy-21" transform="translate(84.529968, 150.113565)">
+                            <g id="path-21-link" fill="#000000" fill-rule="nonzero">
+                                <rect id="path-21" x="0" y="0" width="13.1167192" height="13.1167192" rx="4"></rect>
+                            </g>
+                            <g id="path-21-link" fill="#FFFFFF">
+                                <rect id="path-21" x="0" y="0" width="13.1167192" height="13.1167192" rx="4"></rect>
+                            </g>
+                        </g>
+                        <g id="Rectangle-Copy-21" transform="translate(5.829653, 61.211356)">
+                            <g id="path-23-link" fill="#000000" fill-rule="nonzero">
+                                <rect id="path-23" x="0" y="0" width="77.2429022" height="29.148265" rx="8"></rect>
+                            </g>
+                            <g id="path-23-link" fill="#FFFFFF">
+                                <rect id="path-23" x="0" y="0" width="77.2429022" height="29.148265" rx="8"></rect>
+                            </g>
+                        </g>
+                        <g id="Rectangle-Copy-20" transform="translate(85.258675, 61.211356)">
+                            <g id="path-25-link" fill="#000000" fill-rule="nonzero">
+                                <path d="M5.829653,0 L22.5899054,0 L22.5899054,0 L22.5899054,29.148265 L5.829653,29.148265 C2.61002455,29.148265 0,26.5382404 0,23.318612 L0,5.829653 C0,2.61002455 2.61002455,0 5.829653,0 Z" id="path-25"></path>
+                            </g>
+                            <g id="path-25-link" fill="#FFFFFF">
+                                <path d="M5.829653,0 L22.5899054,0 L22.5899054,0 L22.5899054,29.148265 L5.829653,29.148265 C2.61002455,29.148265 0,26.5382404 0,23.318612 L0,5.829653 C0,2.61002455 2.61002455,0 5.829653,0 Z" id="path-25"></path>
+                            </g>
+                        </g>
+                    </g>
+                    <g id="Group-13-Copy" transform="translate(4.372240, 13.845426)" stroke="#FFFFFF">
+                        <line x1="10.2018927" y1="9.47318612" x2="10.2018927" y2="0" id="Stroke-1"></line>
+                        <line x1="9.47318612" y1="9.47318612" x2="2.9148265" y2="2.9148265" id="Stroke-3"></line>
+                        <line x1="9.47318612" y1="10.2018927" x2="0" y2="10.2018927" id="Stroke-4"></line>
+                        <line x1="9.47318612" y1="10.9305994" x2="2.9148265" y2="17.488959" id="Stroke-6"></line>
+                        <line x1="10.2018927" y1="20.4037855" x2="10.2018927" y2="10.9305994" id="Stroke-7"></line>
+                        <line x1="17.488959" y1="17.488959" x2="10.9305994" y2="10.9305994" id="Stroke-9"></line>
+                        <line x1="20.4037855" y1="10.2018927" x2="10.9305994" y2="10.2018927" id="Stroke-10"></line>
+                        <line x1="17.488959" y1="2.9148265" x2="10.9305994" y2="9.47318612" id="Stroke-12"></line>
+                    </g>
+                    <g id="Group-13-Copy-3" transform="translate(16.031546, 151.570978)" stroke="#FFDF5D">
+                        <line x1="5.10094637" y1="5.10094637" x2="5.10094637" y2="0" id="Stroke-1"></line>
+                        <line x1="4.37223975" y1="4.37223975" x2="1.45741325" y2="1.45741325" id="Stroke-3"></line>
+                        <line x1="5.10094637" y1="5.10094637" x2="0" y2="5.10094637" id="Stroke-4"></line>
+                        <line x1="4.37223975" y1="5.829653" x2="1.45741325" y2="8.7444795" id="Stroke-6"></line>
+                        <line x1="5.10094637" y1="10.2018927" x2="5.10094637" y2="5.10094637" id="Stroke-7"></line>
+                        <line x1="8.7444795" y1="8.7444795" x2="5.829653" y2="5.829653" id="Stroke-9"></line>
+                        <line x1="10.2018927" y1="5.10094637" x2="5.10094637" y2="5.10094637" id="Stroke-10"></line>
+                        <line x1="8.7444795" y1="1.45741325" x2="5.829653" y2="4.37223975" id="Stroke-12"></line>
+                    </g>
+                    <g id="Group-13" transform="translate(188.006309, 0.000000)" stroke="#FFD954">
+                        <line x1="8.7444795" y1="8.01577287" x2="8.7444795" y2="0" id="Stroke-1"></line>
+                        <line x1="8.01577287" y1="8.01577287" x2="2.9148265" y2="2.9148265" id="Stroke-3"></line>
+                        <line x1="8.01577287" y1="8.7444795" x2="0" y2="8.7444795" id="Stroke-4"></line>
+                        <line x1="8.01577287" y1="9.47318612" x2="2.9148265" y2="14.5741325" id="Stroke-6"></line>
+                        <line x1="8.7444795" y1="17.488959" x2="8.7444795" y2="9.47318612" id="Stroke-7"></line>
+                        <line x1="14.5741325" y1="14.5741325" x2="9.47318612" y2="9.47318612" id="Stroke-9"></line>
+                        <line x1="17.488959" y1="8.7444795" x2="9.47318612" y2="8.7444795" id="Stroke-10"></line>
+                        <line x1="14.5741325" y1="2.9148265" x2="9.47318612" y2="8.01577287" id="Stroke-12"></line>
+                    </g>
+                    <g id="Group-13-Copy-2" transform="translate(182.176656, 121.694006)" stroke="#FFFFFF">
+                        <line x1="5.10094637" y1="5.10094637" x2="5.10094637" y2="0" id="Stroke-1"></line>
+                        <line x1="4.37223975" y1="4.37223975" x2="1.45741325" y2="1.45741325" id="Stroke-3"></line>
+                        <line x1="5.10094637" y1="5.10094637" x2="0" y2="5.10094637" id="Stroke-4"></line>
+                        <line x1="4.37223975" y1="5.829653" x2="1.45741325" y2="8.7444795" id="Stroke-6"></line>
+                        <line x1="5.10094637" y1="10.2018927" x2="5.10094637" y2="5.10094637" id="Stroke-7"></line>
+                        <line x1="8.7444795" y1="8.7444795" x2="5.829653" y2="5.829653" id="Stroke-9"></line>
+                        <line x1="10.2018927" y1="5.10094637" x2="5.10094637" y2="5.10094637" id="Stroke-10"></line>
+                        <line x1="8.7444795" y1="1.45741325" x2="5.829653" y2="4.37223975" id="Stroke-12"></line>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_teacher.svg b/src/assets/imgs/ic_teacher.svg
index c6cdfb20c..60a738515 100644
--- a/src/assets/imgs/ic_teacher.svg
+++ b/src/assets/imgs/ic_teacher.svg
@@ -1,81 +1,92 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="131px" height="125px" viewBox="0 0 131 125" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 63.1 (101010) - https://sketch.com -->
-    <title>09AC5C28-4B9B-484A-98E6-DCB20C8207D0</title>
-    <desc>Created with sketchtool.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="148" height="130" rx="1"></rect>
-    </defs>
-    <g id="Onboarding-FTUE-01" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="User-Role-Selection" transform="translate(-32.000000, -153.000000)">
-            <g id="Group-160" transform="translate(20.000000, 148.000000)">
-                <mask id="mask-2" fill="white">
-                    <use xlink:href="#path-1"></use>
-                </mask>
-                <g id="Mask"></g>
-                <path d="M98.2740986,27.2904075 C117.687458,34.6148436 129.574934,55.4352695 127.061415,78.4690866 C125.757035,90.4217486 118.393665,115.034783 116.179382,119.268093 C101.240233,147.829046 56.0031636,131.663689 36.3542909,117.887843 C14.0738147,102.267547 20.3801585,69.2570653 38.3247115,49.1947721 C45.5591925,41.1068014 53.59749,28.2192357 63.9057195,23.8375967 C74.7823837,19.2141917 88.0034803,23.4154141 98.2740986,27.2904075 Z" id="Fill-1" fill="#94EED3" opacity="0.811351" mask="url(#mask-2)" transform="translate(74.746426, 78.450101) rotate(87.000000) translate(-74.746426, -78.450101) "></path>
-                <path d="M27.204,61.894 C27.652,61.754 27.883,61.509 27.897,61.159 L27.897,61.159 L27.33,60.823 L27.183,60.487 L26.805,60.298 L26.721,60.13 L26.364,59.773 L25.86,58.996 L25.671,58.807 L25.713,58.576 L25.23,57.904 L25.188,57.526 L24.915,57.148 L24.873,56.665 L24.894,56.539 L25.44,56.413 L25.44,56.497 L25.902,56.455 L26.112,56.35 L26.595,56.413 L27.183,55.993 L27.498,56.098 C27.708,55.986 27.813,55.825 27.813,55.615 C27.813,55.559 27.799,55.475 27.771,55.363 L27.771,55.363 L27.141,55.321 C26.861,55.181 26.651,55.111 26.511,55.111 C26.315,55.111 26.1715,55.1425 26.0805,55.2055 C25.9895,55.2685 25.902,55.3 25.818,55.3 C25.762,55.3 25.678,55.286 25.566,55.258 L25.566,55.258 L24.936,55.258 C24.852,55.286 24.719,55.307 24.537,55.321 C24.453,55.209 24.411,55.153 24.411,55.153 L24.411,55.153 L24.3135,55.056 C24.3239286,55.0249524 24.3368571,54.9725714 24.3522857,54.8988571 L24.369,54.817 L24.327,54.502 L24.327,54.082 L24.159,53.935 L24.243,53.788 L23.865,53.326 L23.823,52.99 L23.634,52.297 L23.319,51.835 L23.193,51.31 C23.165,51.058 23.053,50.813 22.857,50.575 C22.815,50.491 22.759,50.407 22.689,50.323 L22.689,50.323 L22.626,49.777 L22.038,49.462 L21.576,49 L21.177,49.336 C20.967,49.35 20.694,49.56 20.358,49.966 L20.358,49.966 L20.463,50.281 L20.358,50.365 C20.358,50.477 20.183,50.722 19.833,51.1 L19.833,51.1 L19.686,51.1 L19.686,51.667 L19.518,51.751 L19.413,51.709 L19.014,52.465 L18.867,52.486 L18.762,52.675 L18.468,52.738 C18.454,53.102 18.3,53.389 18.006,53.599 C17.95,53.697 17.922,53.809 17.922,53.935 L17.922,53.935 L17.922,54.061 C17.81,54.103 17.733,54.138 17.691,54.166 L17.691,54.166 L17.25,54.397 L17.208,54.796 C16.998,54.894 16.858,55.062 16.788,55.3 L16.788,55.3 L16.578,55.405 L15.759,55.342 L15.759,55.741 L15.318,56.098 C15.374,56.336 15.458,56.532 15.57,56.686 L15.57,56.686 L15.045,57.463 L14.688,57.589 C14.576,58.009 14.331,58.317 13.953,58.513 C13.897,58.723 13.743,58.863 13.491,58.933 C13.463,59.129 13.365,59.276 13.197,59.374 L13.197,59.374 L13.029,59.479 L12.378,59.563 L12.336,59.983 L12.252,60.088 L12.252,60.403 L12,60.928 C12.238,61.124 12.49,61.222 12.756,61.222 C12.84,61.222 12.952,61.208 13.092,61.18 L13.092,61.18 L13.89,60.739 L14.31,60.088 L14.394,60.088 L15.066,59.269 L15.15,59.248 C15.29,59.192 15.626,58.779 16.158,58.009 L16.158,58.009 L16.494,57.925 C16.634,57.757 16.858,57.47 17.166,57.064 L17.166,57.064 L17.25,57.001 L17.628,57.106 L17.838,57.337 L18.384,57.085 L18.489,57.085 C18.615,57.141 18.811,57.169 19.077,57.169 L19.077,57.169 L19.35,57.274 L19.686,57.085 L19.77,57.085 L20.253,57.148 L20.694,56.917 L20.862,56.917 C20.932,56.931 21.044,56.938 21.198,56.938 C21.338,56.938 21.443,56.931 21.513,56.917 L21.513,56.917 L21.618,57.148 L21.954,56.938 L22.059,57.043 L22.542,56.77 L22.983,56.833 L23.256,57.19 L23.34,57.778 L23.529,58.009 L23.97,58.996 L24.243,59.248 L24.285,59.584 L24.453,59.731 L24.453,59.899 L24.831,60.298 L25.104,60.781 L25.314,60.886 L25.566,61.306 L25.902,61.306 L26.175,61.516 L26.406,61.516 L27.204,61.894 Z M22.269,55.741 L21.786,55.489 L21.051,55.573 C20.939,55.559 20.771,55.552 20.547,55.552 C20.365,55.552 20.232,55.559 20.148,55.573 L20.148,55.573 L20.064,55.552 C19.938,55.496 19.826,55.468 19.728,55.468 C19.644,55.468 19.56,55.489 19.476,55.531 L19.476,55.531 L19.392,55.531 C19.224,55.531 19.014,55.489 18.762,55.405 L18.762,55.405 L18.573,55.405 L18.846,55.132 L18.993,54.712 C19.343,54.53 19.553,54.229 19.623,53.809 L19.623,53.809 L20.106,53.599 L20.19,53.221 L20.61,52.843 L20.778,52.486 L21.282,51.856 L21.366,51.709 L21.429,51.793 L21.534,51.835 L21.723,52.108 L21.786,52.864 L21.933,52.864 L21.975,52.948 L22.038,53.305 L22.29,53.662 L22.395,54.523 L22.542,54.607 C22.542,54.803 22.598,54.95 22.71,55.048 L22.71,55.048 L22.458,55.258 L22.6725,55.473 L22.6598333,55.496 C22.6100556,55.5613333 22.5167222,55.6266667 22.3798333,55.692 L22.269,55.741 Z M34.074,61.111 L34.234,61.015 L34.314,61.095 L34.586,60.951 C34.7246667,60.8763333 34.8313333,60.8016667 34.906,60.727 L34.906,60.727 L35.146,60.487 C35.1353333,60.391 35.098,60.279 35.034,60.151 L35.034,60.151 L34.858,60.167 L34.97,59.927 L34.762,59.607 L34.506,59.575 L34.49,59.527 C34.5006667,59.4843333 34.506,59.4256667 34.506,59.351 L34.506,59.351 L34.506,59.287 L34.618,58.919 L34.458,58.887 L34.474,58.839 L34.698,58.471 L34.538,58.359 L34.634,58.231 L34.554,57.975 L34.666,57.719 L34.666,57.463 L34.81,57.335 L34.714,57.223 L34.666,56.999 L34.794,56.871 L34.746,56.679 L34.81,56.503 L34.794,56.439 C34.8046667,56.4176667 34.81,56.3803333 34.81,56.327 C34.81,56.263 34.794,56.1936667 34.762,56.119 L34.762,56.119 L34.762,56.055 L34.794,56.007 C34.8686667,55.9323333 34.906,55.8203333 34.906,55.671 L34.906,55.671 L34.874,55.591 L34.922,55.511 L35.002,55.175 L35.21,54.935 L35.082,54.551 L35.242,54.343 L35.002,54.247 L34.794,53.847 L34.218,53.991 L33.914,53.927 L33.578,53.623 L33.578,53.623 L33.578,53.687 C33.5673333,53.7296667 33.562,53.767 33.562,53.799 C33.4873333,53.639 33.3273333,53.559 33.082,53.559 L33.082,53.559 L32.698,53.479 L32.698,53.367 L31.466,53.303 L30.938,53.543 L30.858,53.575 L30.682,53.655 L30.602,53.575 C30.5166667,53.735 30.3833333,53.9216667 30.202,54.135 C30.0206667,54.3483333 29.9086667,54.5083333 29.866,54.615 L29.866,54.615 L29.866,54.711 C29.8233333,54.7536667 29.802,54.807 29.802,54.871 C29.802,54.8816667 29.8073333,54.8976667 29.818,54.919 L29.818,54.919 L29.818,54.967 L29.754,55.031 L29.77,55.319 C29.6313333,55.4896667 29.562,55.6763333 29.562,55.879 L29.562,55.879 L29.562,55.943 L29.37,56.183 L29.45,56.311 C29.3646667,56.4176667 29.306,56.5243333 29.274,56.631 C29.146,56.695 29.082,56.791 29.082,56.919 C29.082,56.9616667 29.0873333,56.999 29.098,57.031 C29.0873333,57.0523333 29.082,57.0843333 29.082,57.127 C29.082,57.191 29.114,57.2496667 29.178,57.303 L29.178,57.303 L29.066,57.351 C29.002,57.5216667 28.97,57.6443333 28.97,57.719 C28.97,57.783 28.9753333,57.8256667 28.986,57.847 C28.9646667,57.911 28.954,57.9643333 28.954,58.007 C28.954,58.0283333 28.9593333,58.0496667 28.97,58.071 L28.97,58.071 L28.97,58.135 L28.858,58.663 L28.826,58.999 L28.73,59.223 L28.826,59.431 L28.842,59.623 L28.858,59.719 L28.778,59.767 C28.7993333,60.2043333 29.05,60.5403333 29.53,60.775 C29.6686667,60.967 29.8713333,61.0683333 30.138,61.079 L30.138,61.079 L30.346,60.919 L30.65,60.855 L31.194,60.247 L31.706,59.927 L31.786,59.719 L32.138,59.415 L32.25,59.223 L32.65,58.855 L32.874,58.503 L33.002,58.439 L33.146,58.023 L33.418,57.575 L33.514,57.959 L33.386,58.631 L33.482,59.575 L33.482,59.671 C33.482,59.8523333 33.514,60.0496667 33.578,60.263 L33.578,60.263 L33.578,60.535 L34.074,61.111 Z M29.93,59.751 L29.866,59.719 L29.866,59.671 L29.834,59.367 L30.01,59.143 L29.898,58.839 L30.01,58.679 L29.946,58.583 L30.09,58.279 L30.058,58.199 C30.0793333,58.1243333 30.09,58.023 30.09,57.895 L30.09,57.895 L30.138,57.815 L30.138,57.591 L30.186,57.559 L30.218,57.415 L30.346,57.271 L30.346,56.983 L30.474,56.823 C30.474,56.631 30.5326667,56.4336667 30.65,56.231 L30.65,56.231 L30.618,56.167 L30.89,55.959 L30.73,55.735 L30.794,55.591 L30.906,55.207 C30.9806667,55.1003333 31.114,54.967 31.306,54.807 L31.306,54.807 L31.354,54.791 L31.418,54.711 L31.786,54.583 L31.738,54.519 L32.154,54.519 L32.298,54.599 L32.426,54.551 L32.458,54.583 L32.714,54.583 L33.034,54.631 L33.53,55.031 L33.658,55.063 L33.722,55.175 L33.706,55.351 L33.562,55.479 L33.53,55.655 L33.418,55.831 L33.434,55.895 L33.306,56.135 L32.49,57.223 C32.4366667,57.2763333 32.386,57.335 32.338,57.399 C32.29,57.463 32.2553333,57.5163333 32.234,57.559 L32.234,57.559 L32.01,57.591 L32.058,57.863 L31.93,57.863 L31.834,58.119 C31.7166667,58.183 31.626,58.2256667 31.562,58.247 L31.562,58.247 L31.45,58.519 L31.354,58.551 L30.41,59.319 L30.362,59.431 L30.138,59.463 L30.17,59.591 C30.1166667,59.6336667 30.0633333,59.6816667 30.01,59.735 L30.01,59.735 L29.93,59.751 Z" id="Aa" fill="#000000" fill-rule="nonzero" mask="url(#mask-2)"></path>
-                <path d="M47.6065,61.495 L48.0055,61.369 L48.3415,61.012 C48.3695,61.012 48.4115,61.019 48.4675,61.033 L48.4675,61.033 L48.5725,61.033 C48.8385,61.033 49.0695,60.956 49.2655,60.802 L49.2655,60.802 L49.3915,60.949 C49.5175,60.907 49.5945,60.872 49.6225,60.844 L49.6225,60.844 L49.6225,60.823 L50.0635,61.012 L50.4415,60.697 L50.7355,60.76 L51.1135,60.718 L51.2605,60.634 L51.6385,60.718 L51.7855,60.613 L52.0165,60.739 L52.6255,60.298 L52.7725,60.382 C53.1505,60.312 53.4795,60.179 53.7595,59.983 L53.7595,59.983 L54.0535,60.025 L54.2845,59.836 L54.8305,59.878 L55.1455,59.542 L55.7545,59.479 L56.1745,59.185 L56.6575,59.08 L56.9305,58.681 L57.1825,58.618 L57.2665,58.345 L57.6445,58.03 L57.7285,57.61 L57.8125,57.358 C57.8125,57.19 57.7075,57.036 57.4975,56.896 C57.1195,56.658 56.8885,56.497 56.8045,56.413 C56.5945,56.413 56.4055,56.329 56.2375,56.161 L56.2375,56.161 L55.9015,56.161 C55.6635,56.049 55.3555,55.965 54.9775,55.909 L54.9775,55.909 L54.7885,55.804 C54.2845,55.804 53.9415,55.755 53.7595,55.657 C53.5915,55.727 53.4585,55.762 53.3605,55.762 C53.2765,55.762 53.1155,55.72 52.8775,55.636 C52.7515,55.636 52.6395,55.671 52.5415,55.741 C52.4435,55.601 52.2265,55.531 51.8905,55.531 C51.7085,55.531 51.5685,55.538 51.4705,55.552 L51.4705,55.552 L51.4285,55.468 L50.6305,55.594 L49.9375,55.51 L49.5175,55.573 L48.7825,55.342 L49.0555,55.3 L49.4125,55.09 L49.8535,55.09 L50.2735,54.859 C50.6375,54.859 51.0015,54.768 51.3655,54.586 L51.3655,54.586 L51.7645,54.523 L52.0375,54.166 L52.0795,54.187 L52.5205,54.04 C52.5905,54.04 52.6745,54.047 52.7725,54.061 L52.7725,54.061 L53.2135,53.767 L53.3815,53.809 L53.7175,53.62 C54.0255,53.564 54.3335,53.361 54.6415,53.011 L54.6415,53.011 L54.9775,52.402 L54.8305,51.751 L54.3895,51.478 L54.2635,51.184 L53.7805,51.184 L53.6125,51.016 L53.1925,50.89 C53.0665,50.89 52.9125,50.855 52.7305,50.785 L52.7305,50.785 L52.4785,50.554 L51.8695,50.533 C51.7295,50.393 51.5685,50.323 51.3865,50.323 L51.3865,50.323 L51.2815,50.197 L50.7775,50.281 C50.6795,50.281 50.4905,50.253 50.2105,50.197 L50.2105,50.197 L50.0425,50.113 C49.9025,50.015 49.7135,49.952 49.4755,49.924 L49.4755,49.924 L49.2445,49.966 C49.1605,49.938 49.0275,49.924 48.8455,49.924 C48.7055,49.924 48.6005,49.931 48.5305,49.945 L48.5305,49.945 L47.3125,49.798 L46.7245,49.588 L46.5775,49.63 L46.4725,49.546 C46.2905,49.546 46.0805,49.574 45.8425,49.63 C45.5625,49.574 45.1145,49.546 44.4985,49.546 L44.4985,49.546 L44.4565,49.567 L44.2255,49.462 L44.1415,49.462 C43.8755,49.462 43.6725,49.574 43.5325,49.798 C43.2385,49.854 43.0915,50.022 43.0915,50.302 C43.0915,50.61 43.4415,50.967 44.1415,51.373 L44.1415,51.373 L44.5615,51.121 L44.7715,51.436 L45.1285,51.205 L45.2125,51.31 L45.4435,51.163 L45.6535,51.31 L45.8845,51.121 L45.9055,51.142 L46.0525,51.646 L46.1575,51.814 L46.1155,52.297 L46.2415,52.381 L46.1995,52.591 L46.4515,53.095 L46.4725,53.578 L46.4095,53.746 L46.5355,54.061 L46.4725,54.145 L46.5565,54.46 L46.3885,54.523 L46.5355,54.985 C46.3955,55.069 46.3185,55.118 46.3045,55.132 C45.9685,55.328 45.7655,55.594 45.6955,55.93 C45.7515,56.14 46.0105,56.364 46.4725,56.602 L46.4725,56.602 L46.4935,56.896 C46.5495,57.078 46.5985,57.246 46.6405,57.4 L46.6405,57.4 L46.5775,57.862 L46.6615,58.135 L46.5145,58.471 L46.5775,58.933 L46.4725,59.269 L46.5145,59.731 L46.4935,60.109 L46.8295,60.781 C46.7735,60.795 46.7455,60.823 46.7455,60.865 C46.7455,60.893 46.7525,60.921 46.7665,60.949 L46.7665,60.949 L46.7665,61.012 C46.7665,61.026 46.7525,61.047 46.7245,61.075 L46.7245,61.075 L47.1865,60.928 L47.2705,61.306 L47.6065,61.495 Z M48.1315,54.313 L48.1315,54.271 L48.2365,53.914 L48.1105,53.578 L48.1525,53.137 L48.0265,52.654 L48.1525,52.339 L48.0055,51.94 L48.0055,51.436 L48.0895,51.394 L48.4885,51.541 L48.6145,51.436 L48.6985,51.457 L48.9295,51.415 L49.1815,51.646 L49.6645,51.583 C49.9865,51.625 50.2175,51.646 50.3575,51.646 L50.3575,51.646 L50.4625,51.646 L50.8615,51.856 L51.0085,51.772 L51.3655,51.877 L51.7855,52.192 L52.0165,52.024 C52.1005,52.052 52.1985,52.08 52.3105,52.108 L52.3105,52.108 L52.5205,52.213 L52.7515,52.213 L52.8985,52.381 L52.9615,52.402 L52.9615,52.57 C52.7375,52.612 52.5485,52.696 52.3945,52.822 L52.3945,52.822 L52.3315,52.822 L51.7645,52.99 C51.7085,53.06 51.6455,53.095 51.5755,53.095 L51.5755,53.095 L51.4915,53.095 C51.2395,53.095 51.0015,53.207 50.7775,53.431 L50.7775,53.431 L50.6725,53.515 L50.4205,53.494 C50.2945,53.648 50.0145,53.781 49.5805,53.893 L49.5805,53.893 L49.0555,53.914 L49.0135,54.082 L48.7615,54.271 L48.7825,54.208 C48.6425,54.236 48.5375,54.264 48.4675,54.292 L48.4675,54.292 L48.1315,54.313 Z M48.3205,59.752 L48.2785,59.437 L48.2155,59.395 L48.1945,59.29 L48.3415,58.954 L48.2995,58.555 L48.1525,58.303 L48.1945,58.009 L48.1525,57.862 L48.2575,57.547 L48.1315,57.253 L48.1525,57.064 L48.1525,56.938 C48.1525,56.7 48.2715,56.581 48.5095,56.581 C48.5375,56.609 48.6145,56.665 48.7405,56.749 L48.7405,56.749 L49.6645,56.833 L49.6855,56.707 L50.0005,56.917 L50.4625,56.812 C50.5885,56.784 50.6935,56.77 50.7775,56.77 C50.9735,56.77 51.1905,56.805 51.4285,56.875 L51.4285,56.875 L52.1425,56.896 C52.4225,56.938 52.6815,56.959 52.9195,56.959 C53.0455,57.029 53.1575,57.071 53.2555,57.085 C53.3675,57.085 53.4865,57.05 53.6125,56.98 C53.7105,57.008 53.8015,57.057 53.8855,57.127 L53.8855,57.127 L54.3055,57.085 L54.4945,57.253 L54.8935,57.211 L55.3765,57.421 L55.4815,57.421 L55.5655,57.526 L55.9015,57.568 L55.9645,57.61 L55.8595,57.736 L55.7125,57.988 L55.2505,58.114 L55.0825,58.345 L54.8515,58.45 L54.5575,58.429 C54.3895,58.653 54.1305,58.772 53.7805,58.786 L53.7805,58.786 L53.0665,58.828 L52.5625,59.059 L52.2685,59.038 L51.7645,59.248 L51.1765,59.437 L50.5885,59.416 L50.2315,59.584 C50.1335,59.612 50.0635,59.647 50.0215,59.689 L50.0215,59.689 L49.8745,59.626 L49.2655,59.605 L48.9085,59.731 L48.3205,59.752 Z M61.6315,61.198 L61.9465,61.063 L62.1415,61.183 L62.2615,61.033 L62.3065,61.033 L62.4265,60.898 L62.5315,60.958 C62.6115,61.038 62.6515,61.103 62.6515,61.153 L62.6515,61.153 L62.8015,60.958 L62.9515,61.093 L63.0715,60.823 C63.2115,60.813 63.3415,60.748 63.4615,60.628 L63.4615,60.628 L63.7765,60.448 L63.9715,60.118 L64.2715,59.833 L64.1815,59.698 L64.3015,59.578 L64.3015,59.398 L64.6465,58.978 L64.6015,58.618 L64.7365,58.483 L64.6615,58.213 L64.7215,57.973 L64.6615,57.838 L64.6765,57.193 C64.6965,57.113 64.7065,57.058 64.7065,57.028 C64.7065,56.978 64.6865,56.903 64.6465,56.803 L64.6465,56.803 L64.6015,56.473 C64.6515,56.393 64.6865,56.283 64.7065,56.143 L64.7065,56.143 L64.5265,56.068 C64.5565,56.008 64.5715,55.948 64.5715,55.888 C64.5715,55.828 64.5415,55.7555 64.4815,55.6705 C64.4215,55.5855 64.3915,55.518 64.3915,55.468 L64.3915,55.468 L64.3915,55.423 L64.3315,54.943 L64.2265,54.883 L64.1365,54.778 L64.1365,54.553 L63.9865,54.433 L63.9415,54.118 L63.8215,54.103 L63.8065,53.953 L63.5515,53.593 L63.4615,53.578 L63.1765,53.413 L62.7115,53.413 L62.4565,53.608 L62.2165,53.668 L62.3215,53.773 L62.2015,53.818 L61.9765,53.863 L61.9915,54.073 L61.9615,54.163 L61.8865,54.208 L61.6915,54.268 L61.6615,54.388 C61.5715,54.448 61.5265,54.543 61.5265,54.673 L61.5265,54.673 L61.4365,54.793 L61.4215,54.853 L61.3165,54.958 L61.1365,55.153 L61.0765,55.333 L61.0765,55.303 L61.0315,55.348 C60.9915,55.388 60.9615,55.428 60.9415,55.468 C60.8215,55.628 60.7415,55.798 60.7015,55.978 L60.7015,55.978 L60.6115,56.203 L60.5515,56.173 L60.4465,56.488 L60.4165,56.953 L60.2215,56.908 L60.2665,56.428 L60.2815,56.203 L60.2965,56.038 L60.2815,55.978 C60.3115,55.868 60.3265,55.773 60.3265,55.693 L60.3265,55.693 L60.3565,55.603 L60.3115,55.423 L60.4765,55.108 C60.4165,55.028 60.3615,54.963 60.3115,54.913 L60.3115,54.913 L60.3265,54.868 C60.3565,54.778 60.3715,54.688 60.3715,54.598 L60.3715,54.598 L60.4465,54.358 L60.4015,54.238 L60.4315,54.118 C60.4315,53.908 60.4165,53.773 60.3865,53.713 C60.4165,53.593 60.4365,53.503 60.4465,53.443 L60.4465,53.443 L60.5365,53.053 L60.6415,52.858 L60.4465,52.768 L60.4615,52.663 L60.3565,52.393 L60.4165,52.153 L60.3565,52.093 C60.3765,52.053 60.3865,52.018 60.3865,51.988 C60.3865,51.928 60.3515,51.863 60.2815,51.793 C60.3015,51.653 60.3115,51.543 60.3115,51.463 L60.3115,51.463 L60.3265,51.238 L60.1015,51.073 L60.0715,50.923 L59.8015,50.608 L59.2765,50.878 L59.2765,50.908 L59.0365,50.953 L59.2765,51.463 L59.2015,51.628 L59.2615,51.778 C59.2315,51.848 59.2165,51.928 59.2165,52.018 C59.2865,52.118 59.3215,52.208 59.3215,52.288 C59.3215,52.348 59.3065,52.408 59.2765,52.468 C59.3065,52.508 59.3315,52.543 59.3515,52.573 C59.3015,52.603 59.2665,52.653 59.2465,52.723 L59.2465,52.723 L59.3665,53.158 L59.3365,53.263 C59.3565,53.343 59.3665,53.453 59.3665,53.593 C59.3665,53.703 59.3615,53.783 59.3515,53.833 L59.3515,53.833 L59.3515,54.028 L59.3065,54.073 L59.4115,54.673 L59.2765,55.153 L59.3365,55.303 L59.3515,55.513 L59.2765,55.603 L59.2765,55.933 L59.3215,56.068 L59.1865,56.488 L59.2615,56.578 L59.2165,56.788 L59.2015,57.673 L59.1415,57.823 L59.1415,58.348 C59.1315,58.368 59.1265,58.388 59.1265,58.408 C59.1265,58.488 59.1415,58.583 59.1715,58.693 L59.1715,58.693 L59.1115,58.873 L59.2015,59.023 L59.2015,59.293 L59.2765,59.413 L59.2315,59.518 L59.5465,60.193 C59.7265,60.263 59.9015,60.303 60.0715,60.313 L60.0715,60.313 L60.1765,60.628 L60.4165,60.718 L60.4915,60.793 L60.7015,60.898 C60.9415,60.988 61.1415,61.033 61.3015,61.033 C61.3615,61.033 61.4065,61.028 61.4365,61.018 L61.4365,61.018 L61.6315,61.198 Z M61.9615,60.043 L61.6015,60.043 L61.5415,59.983 L61.5415,59.773 L61.2715,59.653 L60.9715,59.698 L60.7765,59.593 L60.4465,59.518 L60.5665,59.398 L60.5965,59.338 L60.7765,59.263 L60.6865,58.993 C60.7765,58.813 60.8215,58.633 60.8215,58.453 L60.8215,58.453 L60.8215,58.378 C60.8115,58.348 60.8065,58.328 60.8065,58.318 L60.8065,58.318 L60.9115,58.258 L61.0315,57.733 L61.2715,57.403 L61.2565,57.163 L61.3465,57.028 C61.4765,56.828 61.5415,56.643 61.5415,56.473 L61.5415,56.473 L61.6915,56.098 L61.8415,55.918 L61.9015,55.693 L62.0815,55.528 C62.2115,55.338 62.3165,55.188 62.3965,55.078 C62.5765,55.068 62.6865,54.973 62.7265,54.793 L62.7265,54.793 L62.8015,54.793 L62.8615,54.718 L62.9365,54.688 L63.2665,55.213 L63.4615,55.648 L63.5965,56.143 L63.7015,56.833 L63.7015,57.088 L63.7315,57.358 L63.6865,57.493 L63.7165,57.733 L63.6715,58.123 L63.6715,58.468 L63.4915,58.798 L63.4915,58.948 C63.2515,59.148 63.0865,59.378 62.9965,59.638 L62.9965,59.638 L62.5765,59.638 L62.6365,59.818 L62.5165,59.863 L62.4715,59.863 C62.3515,59.863 62.2615,59.908 62.2015,59.998 L62.2015,59.998 L61.9615,60.043 Z" id="Bb" fill="#000000" fill-rule="nonzero" mask="url(#mask-2)"></path>
-                <g id="Group-125" mask="url(#mask-2)">
-                    <g transform="translate(81.000000, 138.000000) scale(-1, 1) translate(-81.000000, -138.000000) translate(16.000000, 5.000000)">
-                        <path d="M66.2034958,125.732694 C66.2034958,125.732694 71.3633848,166.417945 70.2399835,203.319512 C69.5591552,225.677262 59.7325103,266 59.7325103,266 L37.1765231,265.043776 L41.2774228,212.230063 L39.360299,179.802281 C38.5714247,170.512454 34.1387684,157.935565 29.972764,150.667148 C28.4538867,148.017103 27.3574968,145.133066 26.8054926,142.124 C25.5442634,135.249528 27.341567,130.350367 30.5850247,122 L66.2034958,125.732694 Z" id="Fill-3" fill="#1A2E35"></path>
-                        <path d="M119.886955,91.8999527 C118.474992,92.4337528 114.625335,93.966321 115.948655,91.6569332 C115.96976,91.6211124 115.984534,91.5852916 116.004233,91.5487684 C117.36906,89.3103198 117.677905,87.134382 117.338105,86.4439537 C117.006747,85.7703823 116.028152,85.8996181 115.712976,86.5865345 C115.65388,86.6925922 115.606744,86.8098877 115.593378,86.947552 C115.587749,87.0044438 115.565237,87.0788949 115.554684,87.1421081 C115.345035,87.8641429 114.838502,88.8355187 114.418501,89.5744104 C114.019605,90.2753742 113.50885,90.9061012 112.898196,91.4321752 C112.400104,91.8620248 110.855176,94.3498142 110.435879,94.6750109 L76.3806307,94.5689532 L76.0197254,86.7782811 L66.8106605,87.9329751 L63.4,99.7433024 C66.9949825,105.278669 74.4206265,111.167327 80.8852634,109.799815 L115.855087,102.729774 C118.900621,102.400363 122.233191,101.973323 124.044049,101.525914 C127.836017,100.588954 127.764961,100.244794 127.591192,99.8170511 C127.124055,98.6707856 120.864846,101.21055 121.913089,99.8788595 C122.96274,98.5485735 129.90788,97.6685057 129.370392,96.4899312 C128.67039,94.9559583 122.162839,97.735933 121.595802,97.9304891 C121.044947,98.1187239 119.572481,98.0028331 120.093086,97.8553357 C120.840926,97.6432204 129.829086,94.5169779 129.155818,93.001969 C128.783657,92.1626385 127.34496,93.0132069 127.34496,93.0132069 C127.34496,93.0132069 120.190875,95.8283 119.896804,95.102051 C119.598512,94.3652663 123.74646,92.5700123 125.18586,92.0636046 C126.607672,91.5635181 126.96506,90.6799385 126.236918,90.2290179 C125.740233,89.9220828 121.298917,91.3661526 119.886955,91.8999527" id="Fill-9" fill="#FFBF9D"></path>
-                        <path d="M37.8904837,45.7226505 C36.1817755,44.0743722 33.2630829,45.5076881 31.8300407,47.399637 C30.396297,49.2908857 29.3806116,51.7282929 27.2047442,52.679869 C25.0288768,53.6300446 22.1964615,52.8129076 20.3699113,54.327447 C17.8517411,56.4154528 19.265143,61.2566573 16.5421523,63.0715839 C15.461233,63.7927931 14.0352051,63.7675858 12.8806346,64.3620583 C10.1569425,65.7631648 10.1899102,69.5981775 10.6100728,72.6272563 C11.2006854,76.8774894 11.8481147,81.284568 14.1979393,84.8780106 C16.5477638,88.4721534 21.1225566,91.0005869 25.191611,89.6141847 C29.100737,88.2809979 31.1075573,84.0699762 32.6984236,80.2629716 C34.89814,74.997444 37.0985578,69.7305159 39.299677,64.464288 C40.5720895,61.4177041 41.8578293,58.3249068 42.2723804,55.0493564 C42.6869316,51.7752065 42.1292866,48.2377802 40.0425021,45.6771373" id="Fill-11" fill="#1A2E35"></path>
-                        <path d="M36.1934534,42.0096235 C35.0375754,41.8687879 34.1564713,43.3022695 34.4606154,44.4408559 C34.7647595,45.5781198 35.8429698,46.3371774 36.9414129,46.7266242 C37.5562278,46.9434978 38.2193402,47.0777214 38.8576512,46.950771 C39.4966148,46.8231594 40.1035976,46.3933794 40.3091886,45.7678842 C40.5252222,45.109329 40.3587915,44.6656639 39.7779154,44.2980367 C39.0182079,43.8166831 38.5730872,43.4384767 37.9732837,43.1032483 C37.0556301,42.5914795 37.1104544,42.5220535 36.1934534,42.0096235" id="Fill-13" fill="#FF4F5B"></path>
-                        <path d="M34.9754144,12.1950765 C34.9253179,10.4332042 36.5277112,9.07182167 38.1412372,8.42650939 C39.7533716,7.7811971 41.5464101,7.53778983 42.9845982,6.55354708 C44.2578852,5.68180943 45.1130052,4.32254967 46.1914723,3.21165023 C48.8354562,0.486054913 52.96355,-0.643949168 56.5948531,0.363643701 C60.2268521,1.37123657 63.2187286,4.47680195 64.1350777,8.19017791 C64.7550224,10.6999616 64.3319849,13.6661338 62.3865694,15.3338981 C60.1294421,17.2691274 56.7827152,16.8389192 53.8903359,16.2374769 C50.9972609,15.6353269 47.7228956,15.0409603 45.3085209,16.7688689 C43.8522424,17.8111331 43.0173001,19.5050779 42.126695,21.0737811 C41.2367857,22.6417767 40.1193546,24.2430286 38.4355544,24.8324421 C36.7517541,25.4218557 34.4660996,24.4043567 34.4,22.5943689" id="Fill-15" fill="#1A2E35"></path>
-                        <path d="M34.2597977,12.7574726 C34.4524287,14.2121872 33.3908491,15.5149479 32.3334878,16.5423793 C31.2768295,17.5691137 30.0823767,18.6585813 29.896073,20.11469 C29.6774298,21.8147614 30.9302343,23.4890424 30.5667663,25.1647175 C30.3361715,26.2283948 29.5009686,27.0481094 28.995488,28.0135046 C28.2854248,29.368543 28.2481641,31.0086693 28.6840444,32.4738394 C29.1192217,33.9397066 29.8138182,37.2108977 30.8416521,38.3498549 C33.6819047,41.4983675 38.2045148,44.2161118 42.3580327,45.1612929 C46.5108475,46.1078681 50.8239538,46.1134444 55.0765993,45.8534499 C58.5587208,45.6415509 62.5617897,45.7997781 65.4632061,41.0515673 C66.9655872,38.5917265 67.710099,35.3212325 68.5087442,32.5567868 C69.1963103,30.176408 69.7910761,27.6280436 69.0760917,25.2553322 C68.6598963,23.8731094 67.8211782,22.6449315 67.410607,21.2599206 C66.897393,19.5319677 67.0843998,17.6820336 66.8777081,15.8920445 C66.4312823,12.0158261 64.005116,8.41493688 60.5637704,6.52178648 C57.1231278,4.62863607 52.7579971,4.49201697 49.2034632,6.16699504" id="Fill-17" fill="#1A2E35"></path>
-                        <path d="M56.4,53 C56.4,53 66.4555066,52.9713363 69.6786169,59.744126 C72.9017272,66.5155174 77.4,89.5529303 77.4,89.5529303 L66.9270252,92 L56.4,53 Z" id="Fill-19" fill="#2983E9"></path>
-                        <path d="M61.9415188,127 L32.564423,126.542925 C28.0957008,126.473523 25.0121906,122.019846 26.6058912,117.878831 C29.0045695,111.642421 32.5714904,107.717325 32.8746822,101.705247 C33.295193,93.3650312 27.1006097,81.636011 27.1006097,81.636011 L20.4,61.7238066 C25.4998418,56.834086 32.1940908,53.2195484 42.2326375,52.275955 C44.9967008,51.8336017 48.0766773,51.9689015 50.9905697,52.3586771 C58.7873345,53.4018175 65.2144355,58.9098512 67.3487928,66.4207426 C68.6703981,71.0679051 69.7594857,77.0210961 69.7594857,84.0216338 C69.7594857,84.0216338 67.7650631,98.7391672 68.1834537,101.495638 C68.3891153,102.847234 69.3919805,109.249788 71.0436338,115.095721 C72.7334511,121.074149 68.2011222,127 61.9415188,127" id="Fill-21" fill="#2983E9"></path>
-                        <path d="M74.4,73.5311399 C74.4025971,73.5492911 74.1127309,73.6253864 73.5763798,73.6484245 C73.0426579,73.6665756 72.253249,73.6198015 71.3290951,73.314024 C70.4115141,73.0103408 69.3532724,72.4406731 68.441607,71.4667927 C67.9946478,70.9788053 67.5792386,70.3532879 67.4379206,69.5860516 C67.3084339,68.8244003 67.5029926,67.9315021 68.1385949,67.3785893 C68.7972025,66.8235822 69.7101825,66.9359799 70.3188358,67.347872 C70.9524662,67.7716321 71.3146346,68.45649 71.5098507,69.1099323 C71.8969962,70.4468362 71.667601,71.7453435 71.2607366,72.6731478 C70.8479566,73.6135184 70.276769,74.2215828 69.8495286,74.5643607 C69.6313073,74.7326082 69.4551528,74.8512889 69.3250088,74.9127237 C69.1981512,74.9797434 69.1297927,75.0083664 69.1245344,74.9978946 C69.1081021,74.9678754 69.3690474,74.8184772 69.7653951,74.4547556 C70.1545125,74.0889396 70.6731167,73.4787808 71.0392289,72.5691276 C71.40074,71.6720406 71.5847821,70.4440437 71.2094678,69.2132544 C71.0221393,68.6100768 70.6823188,68.0041068 70.1433385,67.6501589 C69.6175041,67.3010978 68.858988,67.2270968 68.3509006,67.6634232 C67.8428131,68.0976552 67.6574565,68.8711745 67.7678817,69.5204281 C67.8855371,70.1899273 68.2523066,70.7686706 68.6683731,71.2350162 C69.5215394,72.1704999 70.5271976,72.7464506 71.4046838,73.0703793 C73.1918634,73.7112555 74.4071981,73.4452709 74.4,73.5311399" id="Fill-23" fill="#FAFAFA"></path>
-                        <path d="M58.3849693,53 L56.7309249,58.5390681 L45.1749753,78.3562802 L23.9833608,96.0382855 L18.4,194 L70.0855693,173.116586 L71.0561936,120.630991 L71.4,116.670911 L68.7229217,106.548294 C67.4783704,101.554236 67.6006592,96.2855716 69.1708484,90.7275893 C70.3112796,85.3405357 71.7389149,80.6855329 69.724293,76.3079388 C67.7089722,71.9310453 70.0038104,61.4819825 67.3805393,56.4080645 C64.9165931,54.6280251 61.405854,53.2928203 58.3849693,53" id="Fill-25" fill="#FF4F5B"></path>
-                        <path d="M63.4,129.958555 C63.4,129.958555 63.0212596,129.962143 62.3123699,129.848742 C61.6062961,129.737495 60.5566888,129.49275 59.3339069,128.860432 C58.1083091,128.23888 56.7574061,127.173773 55.4994261,125.665829 C54.8672682,124.914368 54.2520055,124.063862 53.6529338,123.120768 C53.0742771,122.168344 52.5554571,121.05802 52.4139608,119.79195 C52.2675367,118.541669 52.5807998,117.115545 53.5304444,116.078429 C53.9992831,115.562384 54.6511519,115.191319 55.3600416,115.064281 C56.0682273,114.926477 56.8158349,115.016911 57.5085335,115.271704 C58.9256089,115.7655 60.0111183,117.053103 60.5834394,118.510807 C61.1712476,119.979994 61.366949,121.627896 61.256427,123.281539 C61.145905,124.939489 60.6932574,126.611793 59.9125636,128.156342 C59.5429836,128.940818 59.0495062,129.66644 58.5327982,130.37699 C57.9738524,131.054524 57.3895639,131.731341 56.6919376,132.293321 C55.3431465,133.470394 53.669125,134.296498 51.8845814,134.719239 C50.0922942,135.10107 48.1880771,135.106811 46.3605919,134.653926 C44.5239551,134.234773 42.8189592,133.379242 41.3645738,132.243798 C39.9383469,131.07462 38.7613225,129.606868 38.0453931,127.941741 C37.3238321,126.291687 37.0542147,124.419854 37.4948949,122.703769 C37.9433187,120.999167 39.085145,119.529979 40.5803602,118.782825 C41.3216321,118.398123 42.1614587,118.240941 42.971015,118.296206 C43.7840911,118.361519 44.5514096,118.666553 45.2089101,119.097907 C46.5232071,119.977123 47.4059754,121.369514 47.7136067,122.832242 C47.9994153,124.312195 47.6960077,125.793584 47.1053836,127.023768 C46.5098318,128.262565 45.6341031,129.28102 44.6471484,130.033198 C42.6471925,131.539708 40.3691716,132.018432 38.4501713,132.137574 C36.5058283,132.24308 34.8416623,131.986852 33.5055424,131.7378 C32.1673108,131.480136 31.144454,131.211706 30.4510515,131.031557 C30.1194854,130.941841 29.8590195,130.870786 29.664726,130.817674 C29.4880315,130.767433 29.3979244,130.738724 29.4,130.732264 C29.4014442,130.725805 29.4943672,130.74303 29.6738775,130.78107 C29.8695789,130.824851 30.1328607,130.883705 30.4686505,130.959066 C31.1669808,131.114095 32.1940613,131.359558 33.5301811,131.594973 C34.864189,131.821057 36.5206115,132.052882 38.4375,131.928716 C40.3304537,131.793065 42.5606052,131.297833 44.4922768,129.822904 C45.4412175,129.087234 46.284564,128.0939 46.8505494,126.898166 C47.4144229,125.710328 47.6924879,124.289946 47.4158308,122.895402 C47.1208708,121.517366 46.2740045,120.194595 45.0336236,119.373515 C44.4134331,118.970152 43.6975037,118.690238 42.9456724,118.632103 C42.1973608,118.584015 41.4201868,118.728996 40.7296001,119.091448 C39.3336435,119.790514 38.2495421,121.190082 37.8342046,122.794202 C37.4209789,124.412677 37.6751092,126.203406 38.3741434,127.79389 C39.066842,129.400163 40.2072603,130.818392 41.5905456,131.950247 C43.0005814,133.051241 44.6577079,133.883087 46.4429554,134.290038 C48.2204594,134.730722 50.0690635,134.724263 51.8057376,134.356069 C53.5332603,133.946964 55.1509649,133.15244 56.46315,132.011254 C57.1403614,131.467935 57.7091627,130.810497 58.2533253,130.153059 C58.757362,129.461887 59.239576,128.757797 59.6007085,127.994853 C60.3645072,126.49265 60.8072993,124.866281 60.9199332,123.257136 C61.0325671,121.652298 60.8446092,120.046743 60.2856634,118.635691 C59.7365731,117.231817 58.7242758,116.030342 57.4043471,115.562384 C56.1182086,115.052797 54.6018746,115.296824 53.7352974,116.27724 C52.8518251,117.229664 52.5378581,118.574684 52.6716109,119.763241 C52.79762,120.971893 53.2903934,122.056379 53.8514511,122.995166 C54.4336276,123.929647 55.0390349,124.782306 55.6557056,125.530178 C56.8848232,127.034534 58.2012321,128.098206 59.3993753,128.731241 C60.5954067,129.374325 61.6274149,129.641319 62.3257452,129.774099 C63.0254834,129.911185 63.4021031,129.937023 63.4,129.958555" id="Fill-27" fill="#FAFAFA"></path>
-                        <path d="M33.9781101,101 C35.5011698,100.694677 36.7373055,99.4822865 37.4198469,98.0679445 C38.1017132,96.652918 38.3015472,95.0510012 38.370409,93.4778367 C38.470326,91.1988704 38.3170749,88.9075817 37.9126809,86.6628444 C37.5406925,84.5988362 36.904059,82.4786925 35.4377089,81 C34.4230109,83.2036625 33.1402922,85.2799932 31.626009,87.1660106 C31.1824584,87.7184665 30.4,89.068458 30.4,89.068458 C30.4,89.068458 30.8232972,90.0323464 30.9826243,90.4588396 C32.3146264,94.0337156 33.4461194,97.3676194 33.9781101,101" id="Fill-29" fill="#000000"></path>
-                        <path d="M60.4,58 C59.3492726,60.9822841 58.2767866,63.9568639 57.1614855,66.9160349 C56.0342522,69.8710036 54.8789433,72.8154664 53.6941552,75.7480224 C51.2915901,81.599827 48.7949719,87.4145105 46.1334099,93.1542518 C44.801927,96.0223715 43.4367534,98.8946935 41.7571337,101.596819 C40.9197805,102.952785 39.9876723,104.232408 39.0829377,105.528139 L36.3652246,109.414634 C34.5683895,112.015203 32.8361281,114.658495 31.2245916,117.373929 C30.4279479,118.737599 29.6607836,120.119479 28.9925855,121.549687 C28.3229837,122.977093 27.7284839,124.452126 27.4,126 C27.6933895,124.445122 28.2570061,122.951879 28.8964267,121.506963 C29.5358474,120.057844 30.2742343,118.654952 31.0421006,117.27027 C32.5841501,114.503708 34.3164114,111.849209 36.0746427,109.217823 C37.8223456,106.583635 39.6907734,104.013884 41.3703931,101.358685 C43.017024,98.6754697 44.3590352,95.8150544 45.672269,92.9434328 C48.2980347,87.1952868 50.8627361,81.4184245 53.2947805,75.5834295 C54.5272971,72.6732861 55.7310362,69.751236 56.905998,66.8172792 C58.0928918,63.8875247 59.2643441,60.9507663 60.4,58" id="Fill-33" fill="#1A2E35"></path>
-                        <path d="M60.4,66 C59.6864236,72.1537123 58.9155935,78.3095374 57.7349108,84.4019802 C56.5451513,90.485972 54.974166,96.5263005 52.6239721,102.279296 C51.5061288,105.184316 49.9351435,107.892147 48.3620636,110.54575 C46.7750194,113.202171 45.1300233,115.820562 43.4724593,118.430502 C40.1754849,123.661651 36.7095423,128.78012 33.4,134 C36.618076,128.720963 39.9436773,123.508829 43.2022498,118.257962 C44.8297905,115.631824 46.4454616,112.996531 47.9989915,110.328138 C49.5399535,107.649181 51.1018619,104.990648 52.1847944,102.099009 C54.4525989,96.3586897 56.0577967,90.3697712 57.2901474,84.3118365 C58.5329713,78.2517891 59.4469356,72.1220212 60.4,66" id="Fill-35" fill="#1A2E35"></path>
-                        <path d="M20.4,106.981673 L22.4978174,108 C22.4978174,108 59.4710703,90.4549405 60.035521,90.0639196 C60.6484521,89.6394424 60.4960851,87.102337 59.5195507,86.5907339 C58.5437089,86.0791308 35.5016536,74 35.5016536,74 L20.4,106.981673 Z" id="Fill-37" fill="#1F0288"></path>
-                        <path d="M20.4,107.700163 L21.5918847,109.858157 L23.9917795,110 C23.9917795,110 58.8971742,89.6712503 59.1201267,89.6162066 C59.3725258,89.5541061 59.7784677,87.8230538 58.6223396,87.2091054 C57.4648092,86.595157 35.6189652,75 35.6189652,75 L20.4,107.700163 Z" id="Fill-39" fill="#FFFFFF"></path>
-                        <polygon id="Fill-41" fill="#1F0288" points="21.4 109.299135 43.263307 121 60.4 89.9272615 36.7213534 78"></polygon>
-                        <polygon id="Fill-43" fill="#1C687B" points="37.4 92.9329674 48.8029073 99 52.4 92.636546 40.8414427 86"></polygon>
-                        <polygon id="Fill-45" fill="#51B6E2" points="36.4 92.9329674 47.8029073 99 51.4 92.636546 39.8414427 86"></polygon>
-                        <path d="M21.4,110.671852 L23.3616289,112 C23.3616289,112 63.1792414,99.9763584 63.8058631,99.6698086 C64.4853494,99.3372443 64.7059709,96.7828972 63.7988145,96.1269088 C62.891658,95.4723266 41.477973,80 41.477973,80 L21.4,110.671852 Z" id="Fill-47" fill="#FFD900"></path>
-                        <path d="M22.4,111.189036 L23.2574773,113.504738 L25.5908718,114 C25.5908718,114 62.7396516,98.9843703 62.9654864,98.9631448 C63.2225906,98.9383817 63.8695204,97.2813773 62.8237317,96.5016938 C61.7779429,95.7227177 42.0260851,81 42.0260851,81 L22.4,111.189036 Z" id="Fill-49" fill="#FFFFFF"></path>
-                        <polygon id="Fill-51" fill="#FFD900" points="22.4 113.077495 42.1009833 128 63.4 99.4165626 41.955266 84"></polygon>
-                        <polygon id="Fill-53" fill="#7C241C" points="40.4 98.344146 50.8766403 106 55.4 100.242184 44.8507925 92"></polygon>
-                        <polygon id="Fill-55" fill="#FCFF94" points="39.4 98.344146 49.8766403 106 54.4 100.241499 43.8507925 92"></polygon>
-                        <path d="M48.200062,106.949188 L19.4961917,100.311221 L31.1520568,81.1743119 L13.5443505,78 C2.97691056,94.2314749 1.85117196,112.291461 4.82638855,114.604799 C9.86862737,118.525759 47.5819266,117.84192 47.5819266,117.84192 C47.9437963,117.872265 48.1845734,117.889908 48.1845734,117.889908 C48.4767445,117.956246 58.4,120 58.4,120 L57.9994088,107.798871 L55.8915531,105.921665 C54.9305567,105.065632 53.5703772,104.823571 52.374236,105.297107 L48.200062,106.949188 Z" id="Fill-57" fill="#FFBF9D"></path>
-                        <path d="M57.6081249,119.987036 C57.5937437,120.002901 57.511565,120.001579 57.3752855,119.987036 C56.2528622,119.862762 51.4810225,118.761486 51.4063769,118.153338 C51.3235135,117.471155 52.063806,115.973261 52.7198655,116.000363 C53.375925,116.027465 58.6791865,117.560394 58.6791865,117.560394 C58.6791865,117.560394 59.5023426,117.853892 59.389347,119.27709 C59.3194951,120.155599 57.6081249,119.987036 57.6081249,119.987036" id="Fill-59" fill="#FFBF9D"></path>
-                        <path d="M59.6082218,117.987036 C59.5938404,118.002901 59.5109757,118.00224 59.3753789,117.987036 C58.2529391,117.862762 53.4803442,116.761486 53.4063823,116.153338 C53.3235177,115.471155 54.0631363,113.973261 54.7192055,114.000363 C55.3752746,114.028126 60.6786144,115.561055 60.6786144,115.561055 C60.6786144,115.561055 61.5017826,115.854553 61.3894701,117.27709 C61.3189324,118.155599 59.6082218,117.987036 59.6082218,117.987036" id="Fill-61" fill="#FFBF9D"></path>
-                        <path d="M61.6081324,114.987036 C61.5937512,115.002901 61.5115725,115.00224 61.3759777,114.987036 C60.2528692,114.862762 55.4810279,113.761486 55.4063823,113.153338 C55.3235188,112.471155 56.0631268,110.973261 56.7191865,111.000363 C57.375931,111.027465 62.6785096,112.560394 62.6785096,112.560394 C62.6785096,112.560394 63.5023507,112.854553 63.3893551,114.27709 C63.3188184,115.155599 61.6081324,114.987036 61.6081324,114.987036" id="Fill-63" fill="#FFBF9D"></path>
-                        <path d="M62.6081324,111.986926 C62.5937512,112.00279 62.5115725,112.002129 62.3759777,111.986926 C61.2528692,111.862656 56.4810279,110.76141 56.4063823,110.153279 C56.3235188,109.471775 57.0631268,107.973261 57.7191865,108.000363 C58.3752462,108.028125 63.6785096,109.561012 63.6785096,109.561012 C63.6785096,109.561012 64.5023507,109.854501 64.3893551,111.276999 C64.3195032,112.156145 62.6081324,111.986926 62.6081324,111.986926" id="Fill-65" fill="#FFBF9D"></path>
-                        <path d="M53.4001199,116.015657 C53.3867296,116.084449 54.4966358,116.356822 55.8765795,116.62416 C57.2580109,116.891499 58.3872586,117.052574 58.399905,116.984341 C58.4118075,116.915549 57.3033891,116.643736 55.9227016,116.376397 C54.542014,116.108499 53.4127663,115.947424 53.4001199,116.015657" id="Fill-67" fill="#FF9A6C"></path>
-                        <path d="M54.4002436,113.014833 C54.3776762,113.109021 55.9260864,113.627058 57.8588691,114.170997 C59.7916518,114.715721 61.3771889,115.079917 61.3997562,114.984943 C61.4223235,114.890755 59.8753694,114.372718 57.9411307,113.828779 C56.0090759,113.28484 54.4228109,112.920644 54.4002436,113.014833" id="Fill-69" fill="#FF9A6C"></path>
-                        <path d="M55.4002436,110.014833 C55.3776786,110.109021 56.9259277,110.627058 58.8585095,111.170997 C60.7918192,111.715721 62.3764634,112.079917 62.3997563,111.984943 C62.4223213,111.890755 60.8748001,111.372718 58.9414904,110.828779 C57.0089086,110.28484 55.4235364,109.920644 55.4002436,110.014833" id="Fill-71" fill="#FF9A6C"></path>
-                        <path d="M61.3998454,108.968883 C61.3791929,109.110806 59.7930827,108.754607 57.8730908,108.158159 C55.9551641,107.551508 54.3917716,107.178612 54.4,107.05153 C54.4082936,106.904042 56.0260709,107.061734 57.9536354,107.673023 C59.8791347,108.270399 61.4177442,108.840874 61.3998454,108.968883" id="Fill-73" fill="#FF9A6C"></path>
-                        <path d="M20.4,101.091529 C20.3966919,101.148265 19.958914,101.135172 19.2803908,101.255502 C18.6031724,101.371467 17.6897758,101.665746 16.8213966,102.228116 C15.9556271,102.795474 15.3364746,103.501867 14.9763354,104.06299 C14.6122816,104.622243 14.4654857,105.0169 14.4087246,104.999443 C14.3734936,104.990714 14.4361265,104.563014 14.7603823,103.945778 C15.0800712,103.330412 15.7083576,102.551697 16.6237115,101.951919 C17.5416751,101.355881 18.5294483,101.080307 19.2451597,101.021077 C19.9654382,100.956859 20.4051735,101.056615 20.4,101.091529" id="Fill-75" fill="#FF9A6C"></path>
-                        <path d="M65.0522722,19.5257348 C64.7276454,14.572025 61.4198112,8.50014019 56.4664554,9.0327372 L41.0033099,12.9637772 C39.4984133,13.1255082 38.3678168,14.4075055 38.4006992,15.9153685 L40.1392712,53.0870147 C40.1028906,53.094683 40.0693085,53.1016542 40.0322283,53.1100196 C40.0322283,53.1100196 43.5562471,63.5946518 53.7819884,60.3914015 C55.8088065,59.7563283 56.7344124,57.546469 57.1366976,55.2731721 L57.2416416,55.2871144 C57.2451397,55.0166332 57.2486379,54.7656713 57.252136,54.5084353 C57.589356,51.8844888 57.3123039,49.4034511 57.3123039,49.4034511 C57.3416882,46.4030617 57.3388897,45.1719539 57.3409886,45.1998386 C57.3409886,45.1998386 63.6914986,44.1346446 64.9886061,35.8724198 C65.6343614,31.7643122 65.4125798,25.0301668 65.0522722,19.5257348" id="Fill-77" fill="#FFBF9D"></path>
-                        <path d="M62.3993457,23.9415932 C62.4191282,24.4936777 61.9878696,24.966009 61.4352783,24.9983227 C60.8846653,25.029949 60.4204358,24.6105573 60.4006533,24.0584729 C60.3808708,23.507076 60.8127888,23.0340572 61.3640613,23.0017434 C61.9159932,22.9694296 62.3795632,23.3901963 62.3993457,23.9415932" id="Fill-79" fill="#1A2E35"></path>
-                        <path d="M63.3839411,21.9815084 C63.2598829,22.1036565 62.4943045,21.580517 61.4096244,21.5848354 C60.3262712,21.5755818 59.5308392,22.0962536 59.4134151,21.9722547 C59.3556982,21.9179667 59.48241,21.697113 59.8287115,21.4614534 C60.1683789,21.2276447 60.750192,20.9987711 61.4262098,21 C62.1015641,21.0024726 62.6707723,21.2325799 62.9978349,21.4688564 C63.3321949,21.7057497 63.4456385,21.9266034 63.3839411,21.9815084" id="Fill-81" fill="#1A2E35"></path>
-                        <path d="M51.3993458,23.9418834 C51.4191278,24.494138 50.9878784,24.9666148 50.4352988,24.9982508 C49.8846974,25.0305746 49.4204778,24.6110537 49.4006957,24.0587991 C49.3802542,23.5072322 49.8128225,23.0340677 50.3640833,23.0017439 C50.9160035,22.9694202 51.3795637,23.3903166 51.3993458,23.9418834" id="Fill-83" fill="#1A2E35"></path>
-                        <path d="M52.3842772,22.9815084 C52.2595684,23.1036565 51.4934049,22.580517 50.4094992,22.5848354 C49.3262569,22.5755818 48.5309062,23.0962536 48.4134942,22.9722547 C48.3557831,22.9179667 48.4811553,22.697113 48.8287481,22.4620704 C49.1690441,22.2270278 49.7501343,21.9987712 50.4260828,22 C51.101368,22.0024726 51.670518,22.2325799 51.9975471,22.4682395 C52.3312096,22.7057497 52.4453049,22.9266034 52.3842772,22.9815084" id="Fill-85" fill="#1A2E35"></path>
-                        <path d="M56.8808881,31.9525449 C56.8760477,31.8845965 57.4907733,31.7545449 58.4866772,31.5981906 C58.7395859,31.566043 58.9785786,31.5046703 59.0209318,31.2971722 C59.0802262,31.0757921 58.9737383,30.7477405 58.8509142,30.3926556 C58.6113164,29.654722 58.3614329,28.882449 58.0994484,28.0714527 C57.055746,24.7675561 56.300045,22.0503532 56.4107682,22.0006705 C56.5208864,21.9517185 57.4562857,24.589283 58.4999882,27.8931796 C58.7510818,28.7085597 58.9912846,29.4852165 59.2193865,30.2289951 C59.3161937,30.5745818 59.4813709,30.9676593 59.3531014,31.425032 C59.2859414,31.6537183 59.1001927,31.8188401 58.9380406,31.8729065 C58.7770987,31.9328179 58.6343081,31.9364711 58.5096689,31.9452386 C57.5071095,32.0131869 56.8851234,32.0204932 56.8808881,31.9525449" id="Fill-87" fill="#1A2E35"></path>
-                        <path d="M57.4,44.9541069 C57.4,44.9541069 51.8778282,45.3278574 46.4,42 C46.4,42 49.0793273,47.7223944 57.2932981,46.9235116 L57.4,44.9541069 Z" id="Fill-89" fill="#FF9A6C"></path>
-                        <path d="M54.4172811,34.5624556 C54.5461206,34.401997 55.4811278,35.3910927 56.9263398,35.2282392 C58.3722879,35.0701755 59.241771,33.8791095 59.3794453,34.0100309 C59.4508592,34.057929 59.3433702,34.4427104 58.9435994,34.9105151 C58.554872,35.3719335 57.8333704,35.8836448 56.9484266,35.9834325 C56.0649552,36.0808253 55.3184219,35.7327658 54.9031903,35.3599589 C54.4783878,34.9839589 54.348812,34.6263198 54.4172811,34.5624556" id="Fill-91" fill="#1A2E35"></path>
-                        <path d="M52.994335,18.5554078 C52.8872202,18.7581682 51.7939794,18.6638504 50.5106098,18.7713818 C49.2232234,18.8606876 48.1882263,19.118125 48.0168425,18.9367797 C47.9411927,18.8497522 48.1212795,18.659294 48.5390273,18.4624569 C48.9534279,18.2656197 49.614862,18.0788067 50.3860888,18.0191177 C51.1566461,17.9607956 51.8629346,18.042811 52.3308925,18.1717576 C52.8028673,18.3002485 53.0405283,18.4592674 52.994335,18.5554078" id="Fill-93" fill="#1A2E35"></path>
-                        <path d="M63.3703062,18.9124102 C63.1656588,19.1135301 62.3620437,18.9064631 61.3958517,18.8983534 C60.4310857,18.8642928 59.6124964,19.0362179 59.4242494,18.8264476 C59.3415348,18.7242657 59.469172,18.5231458 59.8264135,18.3328388 C60.1779505,18.1425318 60.7669355,17.986826 61.4300784,18.0008828 C62.0939344,18.0160208 62.6693713,18.1971369 63.0059341,18.4020413 C63.3482014,18.6080271 63.4601513,18.8140128 63.3703062,18.9124102" id="Fill-95" fill="#1A2E35"></path>
-                        <path d="M35.4,39.5226276 C37.6636714,39.988634 40.1287742,39.277548 41.8187136,37.6706782 C43.5100422,36.0630981 44.3838374,33.6002256 44.0934985,31.2581171 C43.8371945,29.1909239 42.7480761,27.0875016 43.4489182,25.131127 C44.3748077,22.5453596 47.9199992,21.7490285 48.8611697,19.1682337 C49.4078127,17.6679203 48.9174316,15.9132924 49.5370066,14.4428148 C50.1190737,13.0604237 51.5415956,12.2640926 52.9259151,11.7519117 C54.3109292,11.2404413 55.7945751,10.8866742 56.9566255,9.96318583 C58.1193705,9.03898709 58.8438287,7.29572521 58.0943653,6 C51.9555718,6.75228783 45.9042967,8.25544273 40.112104,10.4682629 C38.76946,10.9811542 37.3580515,11.5970499 36.5648288,12.8181856 C35.7243739,14.1103589 35.7646602,15.7790314 35.8355084,17.3290711 C36.1800255,24.8860474 36.5245425,32.4430237 36.8697541,40" id="Fill-97" fill="#1A2E35"></path>
-                        <path d="M35.9385404,42.9994756 C35.9342909,43.0043626 35.8889634,42.9750411 35.8039742,42.9136056 C35.7012789,42.8375093 35.5787528,42.745356 35.4300217,42.6343532 C35.1056462,42.3830262 34.6282902,42.0102243 34.03974,41.4991926 C33.4554393,40.9846702 32.7500289,40.3312198 32.0672823,39.4522732 C31.39091,38.5803078 30.7272859,37.4437509 30.4978151,36.0474894 C30.2478052,34.689625 30.4319485,32.9792046 31.5807192,31.6953421 C32.1466056,31.0663263 32.872555,30.595088 33.5347625,30.0526404 C34.2097184,29.5206648 34.7699389,28.8448742 35.0603187,28.0022304 C35.6814481,26.3162445 35.4045249,24.3635728 35.6439112,22.368315 C35.9095024,20.3828311 36.6297859,18.3331191 38.0229005,16.6687754 C38.7191037,15.8456792 39.5534144,15.1335858 40.5116676,14.6644419 C41.4635466,14.1694672 42.4954572,13.9649149 43.4480445,13.687757 C44.4098389,13.4259579 45.2916019,13.0336084 46.0239255,12.4360085 C46.761915,11.8509749 47.3660466,11.1367871 47.8951044,10.4030517 C48.9482622,8.92720322 49.7280381,7.35501272 50.7323272,6.043225 C51.2323469,5.38907646 51.7741531,4.79287278 52.3860753,4.31325694 C52.9958728,3.8336411 53.665871,3.48108506 54.3457846,3.26117386 C55.6999459,2.8059926 57.1298892,2.95678884 58.0725611,3.62769252 C59.0031928,4.32512516 59.3445661,5.33113161 59.3962679,6.10256611 C59.4352212,6.89843519 59.1625476,7.495337 58.8912904,7.80670333 C58.7588489,7.96797154 58.6405722,8.07199302 58.5492088,8.12993788 C58.4642196,8.19346778 58.4188921,8.22278927 58.4153508,8.21720422 C58.4118096,8.21231731 58.4493465,8.17252386 58.5251286,8.10131452 C58.6065765,8.03569022 58.7135213,7.92538556 58.8317979,7.76202296 C59.0754336,7.44646785 59.3112787,6.87120809 59.2532027,6.11303807 C59.1837949,5.37581198 58.8289649,4.4235616 57.9521597,3.79245138 C57.0668555,3.18577574 55.7169437,3.05382902 54.4286491,3.5048215 C53.7820229,3.72124204 53.1431875,4.06751491 52.5645527,4.53177187 C51.9830849,4.99672697 51.4604013,5.57966616 50.9773793,6.22334273 C50.004253,7.5134884 49.2407667,9.08149012 48.1720275,10.5964339 C47.6358873,11.3483207 47.0175909,12.0890375 46.2456056,12.7061851 C45.4835358,13.3365972 44.5252826,13.7631551 43.5493233,14.0291429 C42.5769052,14.3132821 41.5747408,14.5171363 40.678813,14.9862802 C39.7701368,15.4323858 38.9754878,16.1109689 38.3076143,16.8998567 C36.9697427,18.4950855 36.2650406,20.4847582 36.0029905,22.4129954 C35.7586466,24.3412326 36.0419439,26.3232258 35.3797364,28.1174219 C35.0695258,29.0124256 34.4391893,29.7608218 33.7415696,30.2990806 C33.0545735,30.8526983 32.342789,31.309974 31.8080653,31.8964038 C30.7315354,33.0776411 30.5296861,34.6917194 30.7556157,36.0056015 C30.9595898,37.3536921 31.5835521,38.4609275 32.2330113,39.3301003 C32.8867199,40.2048581 33.5701747,40.8673843 34.1367694,41.3937749 C34.7076135,41.9187692 35.1686799,42.3090243 35.477474,42.5778046 C35.7869763,42.8451887 35.9470393,42.9890037 35.9385404,42.9994756" id="Fill-99" fill="#375A64"></path>
-                        <path d="M20.5092883,61.382795 L8.06208361,85.2581549 C6.47367219,88.2601163 7.87311983,89.3623164 10.8756218,90.9031399 L20.0497786,94.4699524 C23.060648,96.015007 25.4160711,93.9876076 26.8650259,90.9031399 C30.2154723,83.7702201 33.0471399,78.0321511 33.3190804,78.1485061 C33.7137428,78.3184551 33.1356949,57.9859315 20.5092883,61.382795" id="Fill-101" fill="#2983E9"></path>
-                        <path d="M30.4,83.9956759 C30.3985386,84.0074628 30.2556721,83.9949826 29.9824226,83.9603152 C29.7119473,83.9201011 29.312476,83.8431396 28.8138304,83.6857499 C27.8227809,83.3779038 26.3982773,82.7109041 25.0791898,81.3463974 C23.7628764,80.0061578 22.6698785,77.8429155 22.6261863,75.3094259 C22.5984453,74.0516946 22.8245349,72.7176951 23.388372,71.4613505 C23.675492,70.8373383 24.066641,70.2285797 24.6200752,69.7564105 C25.1679612,69.2821612 25.9010188,68.984022 26.6548822,69.0006623 C27.4052779,69.0006623 28.1764795,69.3868566 28.5606932,70.041376 C28.9532292,70.6820286 29.0378395,71.454417 28.8838766,72.147764 C28.7271396,72.849431 28.3290553,73.4457094 27.8602313,73.9164919 C27.3865527,74.3886612 26.8386667,74.7485082 26.2734426,75.0209935 C23.9806437,76.1213351 21.5019798,75.8037822 19.8673376,74.8816308 C18.2014868,73.9483859 17.3082246,72.5984394 16.8733834,71.654101 C16.6521485,71.1749982 16.5439583,70.7777105 16.4718316,70.5107719 C16.4142688,70.2389799 16.392076,70.0961504 16.4024789,70.0933771 C16.4378488,70.0836702 16.5307813,70.6653883 16.991283,71.5965532 C17.4524781,72.5062243 18.3568368,73.7972362 19.9796889,74.6708534 C21.5678648,75.5326836 23.9570638,75.8065556 26.1382049,74.7394947 C27.1944458,74.2201779 28.2673314,73.3361606 28.5634673,72.0756559 C28.6993985,71.4599638 28.6168688,70.7680036 28.2770408,70.2216462 C27.9476157,69.6648887 27.3109583,69.3445624 26.6486404,69.339709 C25.9821614,69.325842 25.3316335,69.5858471 24.835762,70.0143355 C24.3315682,70.4421306 23.961225,71.008595 23.6858949,71.6014066 C23.1435571,72.8008967 22.916774,74.0898286 22.9354992,75.3038791 C22.9618532,77.7548604 23.9917401,79.8550082 25.2511844,81.1806875 C26.5134027,82.5313273 27.89144,83.2205141 28.8547484,83.5602541 C29.8277662,83.9069275 30.4075544,83.9582352 30.4,83.9956759" id="Fill-103" fill="#FAFAFA"></path>
-                        <path d="M31.4058506,68.0003987 C31.4235682,67.987337 31.6659457,68.2953165 32.0117943,68.9119628 C32.3633125,69.5258594 32.7694011,70.4807331 33.061388,71.7215878 C33.6673316,74.1916105 33.5376384,77.8777395 32.0330555,81.4703747 C30.5490249,85.0437613 28.5795308,87.9503173 27.0543953,89.9349973 C26.2889928,90.9297435 25.6341483,91.7038168 25.1656936,92.224907 C24.6979476,92.7459972 24.4229697,93.0189165 24.4017085,92.9989804 C24.3776125,92.9783567 24.6093594,92.66694 25.0360004,92.1135395 C25.4626415,91.5594514 26.0785071,90.7578799 26.8084743,89.74526 C28.2613217,87.72277 30.1677411,84.8196512 31.6298017,81.2978238 C33.0989494,77.7883705 33.2732911,74.2129216 32.7594792,71.7882709 C32.2676372,69.3347471 31.3101753,68.0457706 31.4058506,68.0003987" id="Fill-105" fill="#1A2E35"></path>
-                        <path d="M57.4,18.5 C57.4,18.7760473 57.1759269,19 56.8997313,19 C56.6240731,19 56.4,18.7760473 56.4,18.5 C56.4,18.2239527 56.6240731,18 56.8997313,18 C57.1759269,18 57.4,18.2239527 57.4,18.5" id="Fill-107" fill="#FF4F5B"></path>
-                        <path d="M69.8421621,110 C69.8288693,110.003439 69.7705287,109.841977 69.6700942,109.531634 C69.5703982,109.221291 69.4190081,108.762767 69.2676179,108.162351 C68.9478523,106.967112 68.5542378,105.213395 68.3120135,103.014434 C68.0638813,100.81757 67.9752627,98.171967 68.2654887,95.2586583 C68.409494,93.8027029 68.642118,92.2803454 68.9929001,90.7230393 C69.3422052,89.1629373 69.8384696,87.586759 70.2667931,85.9616528 C70.6936395,84.3386435 71.0259594,82.7282156 71.0230055,81.1625219 C71.0392522,79.5968281 70.6737003,78.1066232 69.9957677,76.8212166 C69.3318664,75.5288203 68.4678346,74.4111666 67.6458967,73.3815832 C66.8187894,72.3540967 66.0153137,71.4132825 65.3388581,70.5109117 C63.946807,68.7320319 63.1366849,67.0740741 62.7755639,65.8858244 C62.6906377,65.5859661 62.6042345,65.3231532 62.5532788,65.0896971 C62.5170929,64.8639296 62.4860764,64.666121 62.4587523,64.4934753 C62.410012,64.17125 62.3908113,64.0014001 62.4041041,64 C62.4173969,63.9993032 62.4624447,64.1649592 62.5348166,64.4808939 C62.5724795,64.6500447 62.6153119,64.8436595 62.6647906,65.0659321 C62.7268237,65.2937964 62.8243042,65.5503186 62.9180922,65.8431872 C63.3198301,67.004876 64.1491529,68.613207 65.5589277,70.3592351 C66.2442452,71.2455296 67.0573213,72.1730633 67.8984599,73.1984529 C68.7351675,74.2245415 69.6213539,75.3484859 70.3140563,76.6744328 C71.0230055,77.992691 71.413666,79.5555889 71.3996347,81.1632208 C71.4070196,82.7750466 71.0695302,84.4148312 70.6397298,86.0490241 C70.2084524,87.6860128 69.7114496,89.2565993 69.3614059,90.7978291 C69.0084083,92.3404568 68.770615,93.848136 68.6184863,95.290811 C68.311275,98.1782578 68.3703541,100.80429 68.5823004,102.989271 C68.7890772,105.177748 69.1391208,106.928668 69.4138386,108.130199 C69.5423357,108.73341 69.6693557,109.196128 69.7446816,109.512762 C69.8214844,109.828697 69.8554549,109.99645 69.8421621,110" id="Fill-109" fill="#1A2E35"></path>
-                        <path d="M40.3135312,52 L40.1543819,52.9337383 L33.4,54.3984799 C33.4,54.3984799 37.2293994,65.385421 44.8517411,68.1156055 C44.8517411,68.1156055 48.5857911,69.4651815 50.0812339,68.8300464 L56.3132975,58.3437655 L57.4,55.0874049 L40.3135312,52 Z" id="Fill-111" fill="#FFBF9D"></path>
-                        <path d="M109.675677,94 C109.176279,94.2733682 108.877966,94.7228157 108.687193,95.2003537 C108.485371,95.674466 108.369729,96.1814647 108.280603,96.6884634 C108.11561,97.7065716 108.081728,98.7479743 108.156122,99.7749892 C108.237145,100.795153 108.401402,101.837926 108.846293,102.73408 C109.079051,103.159548 109.396515,103.585701 109.884128,103.665177 C110.374687,103.789871 110.921226,103.528835 111.4,103.253411 C111.022137,103.639141 110.513163,104.01528 109.84067,103.999522 C109.148289,103.976227 108.651837,103.460322 108.342476,102.993061 C107.71786,102.006469 107.523404,100.900663 107.421756,99.8208932 C107.358411,98.7342716 107.426176,97.6394285 107.720806,96.5802123 C107.864438,96.0512893 108.064787,95.5299028 108.365309,95.0523649 C108.673198,94.5926404 109.101885,94.1288051 109.675677,94" id="Fill-113" fill="#1A2E35"></path>
-                        <path d="M108.675806,94 C108.166134,94.3050648 107.871526,94.803603 107.68224,95.3275029 C107.481907,95.8499536 107.369219,96.4035629 107.280837,96.9586214 C107.118066,98.0709124 107.084186,99.2071158 107.154892,100.329551 C107.233699,101.444741 107.388368,102.583118 107.821442,103.580195 C108.049027,104.052646 108.360575,104.535243 108.852571,104.64611 C109.351195,104.793932 109.918316,104.504809 110.4,104.188875 C110.021429,104.6164 109.494817,105.035955 108.795122,104.99755 C108.08438,104.933059 107.612271,104.34974 107.309561,103.83671 C106.704141,102.749056 106.518538,101.549811 106.419844,100.374478 C106.360186,99.1926234 106.427946,98.0027982 106.720345,96.8484793 C106.861756,96.2724068 107.060617,95.7035805 107.357435,95.1775067 C107.662354,94.6724469 108.087326,94.1536193 108.675806,94" id="Fill-115" fill="#1A2E35"></path>
-                        <path d="M107.675614,94 C107.159992,94.3077802 106.867561,94.8091641 106.67899,95.3318232 C106.480844,95.8537731 106.368881,96.4069265 106.281225,96.9593707 C106.119173,98.067805 106.084552,99.1989328 106.153793,100.317296 C106.231136,101.429276 106.381403,102.561822 106.807159,103.563881 C107.031823,104.042571 107.343406,104.525516 107.835456,104.653876 C108.077799,104.743941 108.356971,104.679407 108.628041,104.604944 C108.892481,104.497859 109.146609,104.354606 109.4,104.194334 C109.021386,104.623382 108.48514,105.047466 107.769899,104.995697 C107.051711,104.906341 106.588388,104.321984 106.290801,103.807126 C105.696363,102.719258 105.515895,101.52856 105.4194,100.359846 C105.360472,99.1854586 105.428976,98.0025613 105.719197,96.8529951 C105.860625,96.280694 106.058035,95.7140664 106.352676,95.1885707 C106.656892,94.6829317 107.078966,94.1602727 107.675614,94" id="Fill-117" fill="#1A2E35"></path>
-                        <path d="M47.303734,107 C46.6820727,107.179987 46.2007427,107.62035 45.8448297,108.142526 C45.4773919,108.658299 45.2062201,109.245925 44.9757241,109.846355 C44.5262568,111.05362 44.2469499,112.337005 44.1269563,113.627505 C44.0571296,114.272043 44.0408593,114.921562 44.082213,115.56112 C44.1167874,116.200679 44.2245782,116.833123 44.438126,117.408654 C44.6489621,117.985609 45.0408053,118.464388 45.5960296,118.64153 C46.1600669,118.828631 46.8013882,118.655047 47.4,118.443757 C46.8651136,118.795195 46.226504,119.072645 45.5268808,118.983007 C44.8238679,118.869181 44.2374588,118.286536 43.9581519,117.642709 C43.3669974,116.339404 43.3392022,114.910179 43.4530944,113.557075 C43.5934258,112.196857 43.9161203,110.854425 44.4943941,109.62155 C44.7804804,109.006179 45.1350375,108.416419 45.5939958,107.916297 C46.0549879,107.435384 46.6515658,107.017074 47.303734,107" id="Fill-119" fill="#1A2E35"></path>
-                        <path d="M46.3850001,107 C45.7440968,107.185386 45.2586466,107.637565 44.897968,108.160889 C44.5270622,108.679424 44.2536556,109.265683 44.019794,109.862887 C43.56298,111.062769 43.2759371,112.333795 43.1423019,113.612346 C43.0645753,114.250595 43.0454846,114.894317 43.0754843,115.529831 C43.1007114,116.163975 43.1975287,116.795384 43.4007087,117.375486 C43.6018432,117.953537 43.9707036,118.468651 44.5454712,118.646513 C45.1202387,118.856526 45.7884146,118.65951 46.4,118.43992 C45.8545503,118.791538 45.1931926,119.093903 44.4670628,118.97282 C44.1029751,118.917409 43.7791144,118.712869 43.5050259,118.470703 C43.2541191,118.208699 43.0488937,117.903598 42.909804,117.582079 C42.3479908,116.279585 42.3411727,114.877215 42.4645807,113.539833 C42.619352,112.198346 42.9493491,110.873962 43.533662,109.650822 C43.8234322,109.039935 44.1793381,108.452992 44.6416067,107.949507 C45.1059207,107.464492 45.710688,107.0301 46.3850001,107" id="Fill-121" fill="#1A2E35"></path>
-                        <path d="M44.4,106 C43.7532783,106.205319 43.268746,106.70084 42.9097578,107.268913 C42.5392331,107.831906 42.2664292,108.466 42.0329851,109.110976 C41.5749188,110.408184 41.2858281,111.778667 41.1453544,113.156406 C41.0645991,113.844913 41.0428833,114.539223 41.0679921,115.224828 C41.0869934,115.910433 41.1772494,116.593135 41.372691,117.223601 C41.5681326,117.848263 41.9203347,118.427944 42.4998733,118.623831 C43.0760189,118.864699 43.7553142,118.637615 44.3687836,118.39457 L43.9358262,118.669538 C43.7872091,118.754422 43.6223053,118.805933 43.4641876,118.876307 C43.3019982,118.936524 43.1269151,118.956839 42.9545465,118.998193 C42.7787848,118.98731 42.5935224,119.023585 42.4164035,118.968447 C42.0445215,118.912583 41.7289648,118.664459 41.4575181,118.402551 C41.2138947,118.112348 41.011667,117.781516 40.8800153,117.431822 C40.3391578,116.022161 40.3432295,114.516007 40.4708095,113.077326 C40.6323202,111.634291 40.9641638,110.209395 41.5477741,108.888971 C41.8368648,108.23021 42.1911027,107.595391 42.6518835,107.046907 C43.1140214,106.520189 43.7179902,106.040628 44.4,106" id="Fill-123" fill="#1A2E35"></path>
+<svg width="122px" height="128px" viewBox="0 0 122 128" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>CB48EB24-3EBA-49CD-91AF-FAEBF8DCF1EC</title>
+    <g id="Onboard-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="User-Role-Selection" transform="translate(-33.000000, -158.000000)">
+            <g id="Group-34" transform="translate(33.000000, 158.000000)">
+                <circle id="Oval" fill="#E5EDF5" cx="61" cy="61" r="61"></circle>
+                <g id="Group-129" transform="translate(19.435758, 12.000000)">
+                    <polygon id="Fill-1" fill="#FFBE9D" points="64.0446141 52.2711932 19.1093675 52.2711932 31.4478195 82.6835238 61.8365523 67.1030742"></polygon>
+                    <g id="Group-128" transform="translate(0.386348, 0.000000)">
+                        <path d="M56.5919403,31.8097176 L43.1773746,24.3540115 L43.1773746,24.3508778 L43.1749471,24.3533847 L43.1749471,24.3508778 L43.1749471,24.3540115 L29.7609883,31.8097176 C29.7609883,31.8097176 27.1568487,38.8480145 35.3370392,41.6771215 C35.3370392,41.6771215 32.0980989,46.2993334 35.9372476,48.3707111 C35.9372476,48.3707111 33.683887,54.3686186 43.1749471,54.6468915 L43.1773746,54.6468915 C52.6654003,54.3686186 50.4175017,48.3707111 50.4175017,48.3707111 C54.2572573,46.2993334 51.012855,41.6771215 51.012855,41.6771215 C59.1936524,38.8480145 56.5919403,31.8097176 56.5919403,31.8097176" id="Fill-2" fill="#000000"></path>
+                        <path d="M49.7769356,38.4437041 L42.9385658,38.4437041 L36.1008029,38.4437041 C36.4394442,51.8271228 30.953819,52.8480833 30.953819,52.8480833 C36.2167177,59.6093608 42.9385658,60.933037 42.9385658,60.933037 C42.9385658,60.933037 50.9470081,58.8729406 56.2080861,52.1122898 C56.2080861,52.1122898 49.4413287,51.8271228 49.7769356,38.4437041" id="Fill-4" fill="#FFBE9D"></path>
+                        <path d="M52.509067,49.8890529 C50.7770198,47.6822992 49.7956883,44.334251 49.7665578,39.7402424 L42.8462587,39.7402424 L36.1153074,39.7402424 C36.0461226,42.6013132 35.9113943,44.9998495 35.2929795,46.9195559 C38.3589578,48.5522152 45.0662407,51.000264 52.509067,49.8890529" id="Fill-6" fill="#946451" opacity="0.4"></path>
+                        <path d="M30.276597,25.2974441 C30.276597,25.2974441 28.2684176,22.0070559 26.2468868,23.1433366 C25.1156548,23.7826121 26.7147944,32.6616461 30.6753199,31.9728582 C30.6753199,31.9728582 31.3665608,31.6876912 31.3307547,30.2455611 L30.276597,25.2974441 Z" id="Fill-8" fill="#FFBE9D"></path>
+                        <path d="M27.2392636,24.2123054 C27.2392636,24.2123054 26.3167998,27.7063842 27.901981,28.4177348 C27.901981,28.4177348 28.7352329,28.6295731 28.7079231,29.0024838 C28.6836477,29.3760212 29.1958579,31.8334711 30.0667365,30.9811038 C30.0667365,30.9811038 30.7112474,29.8084722 29.7978869,29.4437092 C28.8875608,29.0783194 29.5156858,29.021286 30.1626242,28.0780414 C30.1626242,28.0780414 28.5926151,23.8713585 27.2392636,24.2123054" id="Fill-10" fill="#946451" opacity="0.4"></path>
+                        <path d="M27.0229094,26.7571856 C26.8875743,26.1323252 26.7874384,25.49493 26.8548025,24.8255711 C26.8760435,24.6582313 26.9063877,24.4846242 26.9974203,24.3060031 C27.051433,24.1211146 27.3609439,23.9268251 27.5715326,23.9957665 C27.7384258,24.0145687 27.9708624,24.1486912 28.0861703,24.2326745 C28.2233261,24.3342065 28.3489511,24.4457663 28.464866,24.5617133 C28.9303461,25.0242478 29.3126831,25.5438158 29.6592139,26.096601 C29.8333896,26.3711134 29.9735798,26.6706954 30.0973842,26.9828122 C30.2157266,27.2986895 30.3395309,27.6177004 30.302511,28.0476445 L30.2952284,28.128494 L30.2351469,28.193675 C30.0142411,28.430583 29.8018316,28.710736 29.6580001,28.9702066 C29.6221939,29.0341342 29.595491,29.1005687 29.5869947,29.1444405 C29.5706088,29.2046076 29.5845671,29.1757776 29.5730363,29.1908193 C29.6039874,29.2083681 29.5967048,29.2115018 29.7459983,29.2453458 L29.993607,29.329329 C30.0816052,29.3788415 30.1859892,29.4841339 30.2642773,29.5699974 C30.3304277,29.6615015 30.3510617,29.7655405 30.3911161,29.8626853 C30.4311704,30.061362 30.4311704,30.264426 30.3771577,30.4474342 C30.3468135,30.6348297 30.2497121,30.8071833 30.1465418,30.9538406 C30.0445853,31.112406 29.8776921,31.2026566 29.726578,31.2772388 C30.019703,31.0773085 30.1489693,30.7351082 30.1732447,30.414217 C30.1944856,30.2518912 30.1550382,30.0920723 30.1113425,29.9541894 C30.0506541,29.8006379 29.9772211,29.7410976 29.8946849,29.6752898 L29.6416142,29.6188832 C29.6288697,29.6188832 29.4468044,29.611989 29.3302827,29.5254988 C29.1943407,29.428354 29.1330454,29.2152622 29.1585345,29.0980617 C29.1658171,28.9651927 29.202837,28.8661677 29.2392501,28.7690229 C29.3988606,28.3948588 29.6246215,28.1203464 29.8619131,27.8320457 L29.7915146,27.9780763 C29.8030454,27.5130348 29.4686523,26.9044696 29.1785617,26.39869 C28.8751196,25.8728546 28.5255544,25.3595541 28.1165145,24.9258496 C28.0175924,24.8142897 27.9077464,24.7202787 27.8021486,24.6256408 C27.6680272,24.5278693 27.6419312,24.4720894 27.5053823,24.4300978 C27.417991,24.4025212 27.3949294,24.398134 27.3148207,24.5059334 C27.2535254,24.6018247 27.2061884,24.7422146 27.1728098,24.8869917 C27.0477917,25.4748743 27.0277645,26.1210439 27.0229094,26.7571856" id="Fill-12" fill="#A37866"></path>
+                        <path d="M27.7174883,27.5265724 C27.7174883,27.5265724 27.5433125,26.8716284 27.6106767,26.1615313 C27.6300969,25.8042892 27.7793904,25.4470471 27.9626694,25.1944706 C28.1914647,24.9901532 28.3808126,24.8742061 28.3808126,24.8742061 L28.5677328,25.4276181 C28.5677328,25.4276181 28.4748796,25.4771306 28.2982763,25.551086 C28.1599067,25.6789411 27.9766278,25.9083281 27.8892365,26.2223252 C27.6919991,26.8359042 27.7174883,27.5265724 27.7174883,27.5265724" id="Fill-14" fill="#A37866"></path>
+                        <path d="M56.0774847,25.2974441 C56.0774847,25.2974441 58.0832366,22.0070559 60.1023399,23.1433366 C61.2359994,23.7826121 59.6332185,32.6616461 55.6763343,31.9728582 C55.6763343,31.9728582 54.9826658,31.6876912 55.0239339,30.2455611 L56.0774847,25.2974441 Z" id="Fill-16" fill="#FFBE9D"></path>
+                        <path d="M59.110752,24.2123054 C59.110752,24.2123054 60.0338227,27.7063842 58.4504621,28.4177348 C58.4504621,28.4177348 57.6196378,28.6295731 57.6439132,29.0024838 C57.6681885,29.3760212 57.1541577,31.8334711 56.2869204,30.9811038 C56.2869204,30.9811038 55.6430164,29.8084722 56.5539494,29.4437092 C57.4636686,29.0783194 56.838578,29.021286 56.1873914,28.0780414 C56.1873914,28.0780414 57.7592212,23.8713585 59.110752,24.2123054" id="Fill-18" fill="#946451" opacity="0.4"></path>
+                        <path d="M59.3300192,26.7571856 C59.3215228,26.1210439 59.3045301,25.4748743 59.179512,24.8869917 C59.1473471,24.7422146 59.0981895,24.6018247 59.0332529,24.5059334 C58.9586062,24.398134 58.9325101,24.4037747 58.8463326,24.4288443 C58.7091768,24.4720894 58.6836877,24.5266158 58.5495663,24.6256408 C58.4439685,24.7202787 58.3335156,24.8142897 58.2364141,24.9258496 C57.8279811,25.3595541 57.4753815,25.8728546 57.1725463,26.39869 C56.8830626,26.9044696 56.5492764,27.5130348 56.5589865,27.9780763 L56.4910155,27.8320457 C56.7283072,28.1203464 56.9528543,28.3948588 57.1136786,28.7690229 C57.1500916,28.8649142 57.1877184,28.9639392 57.1968217,29.0980617 C57.2229177,29.2127553 57.1616224,29.428354 57.0226459,29.5254988 C56.907338,29.6132425 56.7258796,29.6176297 56.7101006,29.6188832 L56.4600644,29.6752898 C56.3787419,29.7410976 56.3022745,29.8006379 56.2409793,29.9541894 C56.2009249,30.0920723 56.1566224,30.2518912 56.1784702,30.4154705 C56.2033524,30.7363616 56.3350463,31.0773085 56.6275644,31.2772388 C56.4740227,31.2039101 56.3083434,31.114913 56.2076006,30.9550941 C56.1038235,30.8084368 56.0073289,30.6354564 55.975164,30.4486877 C55.9235789,30.264426 55.9235789,30.0626155 55.9612057,29.8626853 C56.0030807,29.7655405 56.0237148,29.6615015 56.0898651,29.5699974 C56.1699738,29.4841339 56.2743579,29.380095 56.3623561,29.329329 L56.6081441,29.2453458 C56.7592583,29.2115018 56.7513688,29.2083681 56.7811061,29.1920728 C56.7695753,29.177031 56.7835336,29.2058611 56.765934,29.145694 C56.7592583,29.1018222 56.7295209,29.0341342 56.6961423,28.9702066 C56.5504901,28.710736 56.3362601,28.430583 56.1171749,28.193675 L56.0577003,28.128494 L56.0510245,28.0476445 C56.0140046,27.6177004 56.137809,27.2986895 56.2561514,26.9828122 C56.3799557,26.6706954 56.5183253,26.3711134 56.692501,26.096601 C57.0390318,25.5438158 57.4213688,25.0242478 57.8868489,24.5617133 C58.0021569,24.4457663 58.1289956,24.3342065 58.2649377,24.2326745 C58.3790319,24.1486912 58.6145029,24.0133153 58.7820029,23.9957665 C58.9938054,23.9280785 59.3021025,24.1211146 59.3536877,24.3060031 C59.4441134,24.4846242 59.4762783,24.6582313 59.4969123,24.8255711 C59.5648834,25.49493 59.4653544,26.1323252 59.3300192,26.7571856" id="Fill-20" fill="#A37866"></path>
+                        <path d="M58.7432837,26.1616567 C58.8094341,26.8717538 58.6340446,27.5266977 58.6340446,27.5266977 C58.6340446,27.5266977 58.6601406,26.8360296 58.4622964,26.223704 C58.3755119,25.9084535 58.1940536,25.6784397 58.0550771,25.5505846 C57.8809014,25.477256 57.7862275,25.4277434 57.7862275,25.4277434 L57.9725409,24.8737048" id="Fill-22" fill="#A37866"></path>
+                        <path d="M42.0960286,45.069167 C42.0960286,45.069167 35.895494,41.6772469 33.7768616,37.9061487 C32.0357112,35.2613034 29.3514629,23.1351263 29.1281296,21.0380523 C29.1190263,20.9684841 29.1129575,20.8995426 29.1044611,20.8306012 C29.0983923,20.7647934 29.094751,20.7278157 29.094751,20.7278157 L29.0983923,20.7290692 C29.0613724,20.2972449 29.0395245,19.8578998 29.0395245,19.4173011 C29.0395245,11.3398683 35.3814632,4.78854885 43.2017714,4.78854885 C51.025114,4.78854885 57.3615907,11.3398683 57.3615907,19.4173011 C57.3615907,19.9406295 57.3342809,20.4601975 57.2826958,20.9716178 L57.2826958,20.9703643 C57.2826958,20.9703643 54.5359384,35.0074735 52.6254674,37.9061487 C50.3842445,42.2300321 44.3081211,45.069167 44.3081211,45.069167 C44.3081211,45.069167 43.4530214,45.7253644 42.0960286,45.069167" id="Fill-24" fill="#FFBE9D"></path>
+                        <path d="M30.2866713,24.8078343 C30.2866713,24.8078343 31.5714449,24.2920268 35.4979849,17.0243428 C39.3553401,9.88702093 43.4427044,11.8274098 43.4427044,11.8274098 C43.4427044,11.8274098 47.7430849,9.02149217 55.7230037,23.9767763 C57.742107,27.7679302 54.9559022,10.6403631 54.9559022,10.6403631 L41.8235376,9.62128292 L30.9542438,11.0809618 C30.9542438,11.0809618 28.4599502,23.0711361 30.2866713,24.8078343" id="Fill-26" fill="#A37866"></path>
+                        <path d="M46.165247,21.3423975 C46.165247,21.3423975 46.003209,21.662662 45.8241782,22.1452522 C45.620872,22.6209484 45.3920767,23.2752655 45.2051564,23.9502652 C44.9660441,24.6146102 44.8665151,25.3065318 44.7718412,25.8260998 C44.6765604,26.3488014 44.6122307,26.6966425 44.6122307,26.6966425 C44.6122307,26.6966425 44.6407542,26.3444142 44.6832361,25.8160719 C44.725718,25.2871029 44.7584897,24.5713651 44.9259897,23.8800702 C45.0461528,23.177494 45.2160803,22.4824387 45.3756908,21.9685114 C45.5134535,21.442676 45.6396854,21.1199046 45.6396854,21.1199046 L46.165247,21.3423975 Z" id="Fill-28" fill="#946451" opacity="0.4"></path>
+                        <path d="M39.9002613,25.3745958 C39.9002613,25.3745958 39.242399,21.6617845 35.6575347,22.4846949 C33.4053879,23.0030094 33.8629785,25.5889411 33.8629785,25.5889411 L39.9002613,25.3745958 Z" id="Fill-30" fill="#946451" opacity="0.4"></path>
+                        <path d="M39.782283,25.9486902 C39.782283,25.9486902 39.9995475,25.7700692 39.9000186,25.3745958 C39.8004896,24.977869 36.3090855,21.9613666 33.981685,25.6422141 C33.981685,25.6422141 37.2825275,28.9702066 39.782283,25.9486902" id="Fill-32" fill="#EFEFEC"></path>
+                        <path d="M38.7712142,25.4443521 C38.7712142,26.2929588 38.1042486,26.9804933 37.2825275,26.9804933 C36.463234,26.9804933 35.7950547,26.2929588 35.7950547,25.4443521 C35.7950547,24.5969988 36.463234,23.9082109 37.2825275,23.9082109 C38.1042486,23.9082109 38.7712142,24.5969988 38.7712142,25.4443521" id="Fill-34" fill="#2A191D"></path>
+                        <path d="M37.9829931,25.4443521 C37.9829931,25.8435858 37.6710547,26.1663572 37.2826489,26.1663572 C36.8984913,26.1663572 36.5835184,25.8435858 36.5835184,25.4443521 C36.5835184,25.0444916 36.8984913,24.7217202 37.2826489,24.7217202 C37.6710547,24.7217202 37.9829931,25.0444916 37.9829931,25.4443521" id="Fill-36" fill="#040000"></path>
+                        <path d="M35.1969097,26.5582581 C34.7544912,26.3100689 34.3145003,26.053732 33.8927158,25.7723254 L33.7598082,25.6845817 L33.8520546,25.5529662 C34.0414024,25.2834678 34.1858408,24.9744846 34.4188843,24.7281756 C34.6312937,24.4618108 34.8965021,24.248719 35.1811307,24.0563097 C35.3170728,23.9510172 35.4821452,23.8977443 35.6356869,23.8168948 C35.7849804,23.7304046 35.9567286,23.6990675 36.1211942,23.6508085 C36.4513391,23.5555439 36.8045456,23.5580509 37.1371181,23.598789 C37.8089388,23.6796386 38.4461671,23.9309616 38.9820457,24.3176605 C39.2484678,24.5113233 39.509428,24.7118803 39.7272994,24.9675905 C39.8244008,25.0866712 39.9724805,25.2395959 39.980389,25.435139 C39.9815838,25.6206542 39.9245367,25.7760859 39.8668827,25.9296373 C39.8729515,25.766058 39.8771997,25.599345 39.8426073,25.4595819 C39.807408,25.3273396 39.6854243,25.251504 39.5640475,25.1487185 C39.3249352,24.9575626 39.0621544,24.7889694 38.792091,24.6466993 C38.2440747,24.3778276 37.6748174,24.1565882 37.0909949,24.1171035 C36.8002974,24.08702 36.5114206,24.1233709 36.2340746,24.1804043 C36.0944913,24.2136216 35.9518735,24.2311703 35.8213934,24.299485 C35.6915202,24.3659195 35.5482956,24.39851 35.4293463,24.4868805 C35.1750619,24.6372982 34.9456597,24.8240669 34.7290021,25.0396657 C34.4898898,25.2301948 34.3236035,25.4990665 34.1136216,25.7297071 L34.0723535,25.5103479 C34.4595455,25.8406401 34.8309586,26.1960021 35.1969097,26.5582581" id="Fill-38" fill="#000000"></path>
+                        <path d="M36.9961996,24.9192061 C36.9961996,25.1210166 36.8390166,25.2858494 36.6417793,25.2858494 C36.4469695,25.2858494 36.2891797,25.1210166 36.2891797,24.9192061 C36.2891797,24.7180224 36.4469695,24.5544431 36.6417793,24.5544431 C36.8390166,24.5544431 36.9961996,24.7180224 36.9961996,24.9192061" id="Fill-40" fill="#EFEFEC"></path>
+                        <path d="M34.3037584,25.4443521 C34.3037584,25.4443521 33.8200718,26.4233209 32.8344921,25.6518032 C32.8344921,25.6518032 33.5166298,25.8692822 34.3383508,24.8169847 L34.3037584,25.4443521 Z" id="Fill-42" fill="#000000"></path>
+                        <path d="M33.040772,24.6859959 C33.040772,24.6859959 33.4419223,24.8965808 33.8637068,24.8558426 C34.2903463,24.8395474 34.6223119,24.5875977 34.6223119,24.5875977 L34.7564332,24.8270126 C34.7564332,24.8257591 34.3206905,25.0526392 33.8618861,24.9930988 C33.4055093,24.9611351 33.040772,24.6859959 33.040772,24.6859959" id="Fill-44" fill="#000000"></path>
+                        <path d="M33.7354115,24.0715395 C33.737839,24.0665255 33.8136995,24.1367205 33.9508553,24.1780854 C34.0789079,24.2451466 34.2652213,24.2739767 34.449714,24.2796173 C34.632993,24.3259961 34.8071687,24.2156898 34.9364351,24.1956341 C35.0657014,24.1605366 35.1518789,24.1367205 35.1518789,24.1367205 L35.2435184,24.3961911 C35.2435184,24.3961911 35.1391343,24.4074724 34.9849858,24.4237677 C34.8302303,24.4231409 34.6317793,24.50023 34.4345419,24.4149933 C34.2360908,24.3755087 34.0540256,24.3084474 33.9302213,24.2156898 C33.8003481,24.1473751 33.7390528,24.0665255 33.7354115,24.0715395" id="Fill-46" fill="#000000"></path>
+                        <path d="M40.9053827,21.1514297 C40.9053827,21.1514297 40.270582,21.827056 37.7811435,20.8010817 C35.0374206,19.6710684 32.5413064,20.4225304 32.3015871,20.7026834 C32.3015871,20.7026834 36.192321,17.630401 40.9053827,21.1514297" id="Fill-48" fill="#000000"></path>
+                        <path d="M46.3057407,25.3745958 C46.3057407,25.3745958 46.9623893,21.6617845 50.5484673,22.4846949 C52.8042554,23.0030094 52.340596,25.5889411 52.340596,25.5889411 L46.3057407,25.3745958 Z" id="Fill-50" fill="#946451" opacity="0.4"></path>
+                        <path d="M46.4248114,25.9486902 C46.4248114,25.9486902 46.2051193,25.7700692 46.3058621,25.3745958 C46.4066048,24.977869 49.8967952,21.9613666 52.2266231,25.6422141 C52.2266231,25.6422141 48.9209256,28.9702066 46.4248114,25.9486902" id="Fill-52" fill="#EFEFEC"></path>
+                        <path d="M47.4335134,25.4443521 C47.4335134,26.2929588 48.1029065,26.9804933 48.9209863,26.9804933 C49.7427073,26.9804933 50.4084591,26.2929588 50.4084591,25.4443521 C50.4084591,24.5969988 49.7427073,23.9082109 48.9209863,23.9082109 C48.1029065,23.9082109 47.4335134,24.5969988 47.4335134,25.4443521" id="Fill-54" fill="#2A191D"></path>
+                        <path d="M48.2229482,25.4443521 C48.2229482,25.8435858 48.5373141,26.1663572 48.9208649,26.1663572 C49.3092707,26.1663572 49.6206022,25.8435858 49.6206022,25.4443521 C49.6206022,25.0444916 49.3092707,24.7217202 48.9208649,24.7217202 C48.5373141,24.7217202 48.2229482,25.0444916 48.2229482,25.4443521" id="Fill-56" fill="#040000"></path>
+                        <path d="M51.0078785,26.5582581 C51.3744365,26.1960021 51.7476702,25.8406401 52.1354692,25.5103479 L52.0960217,25.7297071 C51.884826,25.4990665 51.717326,25.2301948 51.4788206,25.0396657 C51.2615561,24.8240669 51.0321539,24.6372982 50.7766557,24.4868805 C50.6589202,24.39851 50.5163024,24.3659195 50.3846086,24.3007385 C50.256556,24.2311703 50.1115108,24.2136216 49.9731412,24.1804043 C49.6945814,24.1233709 49.4044908,24.08702 49.1162209,24.1171035 C48.529364,24.1565882 47.9613205,24.3778276 47.413911,24.6466993 C47.1438476,24.7889694 46.8822806,24.9575626 46.6419545,25.1487185 C46.5181501,25.251504 46.398594,25.3285931 46.3621809,25.4583284 C46.3300161,25.599345 46.3379056,25.766058 46.3403331,25.9296373 C46.2784309,25.7760859 46.2219907,25.6206542 46.2231852,25.435139 C46.2335215,25.2389692 46.382815,25.0866712 46.4762751,24.9675905 C46.696574,24.7118803 46.9575342,24.5100699 47.2227425,24.3176605 C47.7610487,23.9297081 48.398277,23.6796386 49.0700977,23.598789 C49.4020633,23.5580509 49.7546629,23.5555439 50.0854147,23.6508085 C50.2529147,23.6990675 50.4210216,23.7304046 50.5733495,23.8168948 C50.722643,23.8977443 50.8913568,23.9510172 51.0260851,24.0575632 C51.3107137,24.248719 51.5771358,24.4618108 51.7883315,24.7281756 C52.0213749,24.9744846 52.1688478,25.2834678 52.3569818,25.5529662 L52.4486213,25.6845817 L52.3132862,25.7723254 C51.8927155,26.053732 51.4527246,26.3100689 51.0078785,26.5582581" id="Fill-58" fill="#000000"></path>
+                        <path d="M49.2097417,24.9192061 C49.2097417,25.1210166 49.3681384,25.2858494 49.5629482,25.2858494 C49.7565443,25.2858494 49.9167617,25.1210166 49.9167617,24.9192061 C49.9167617,24.7180224 49.7565443,24.5544431 49.5629482,24.5544431 C49.3681384,24.5544431 49.2097417,24.7180224 49.2097417,24.9192061" id="Fill-60" fill="#EFEFEC"></path>
+                        <path d="M51.8998161,25.4443521 C51.8998161,25.4443521 52.387144,26.4233209 53.3702962,25.6518032 C53.3702962,25.6518032 52.690586,25.8692822 51.8676512,24.8169847 L51.8998161,25.4443521 Z" id="Fill-62" fill="#000000"></path>
+                        <path d="M53.1663224,24.6859959 C53.1663224,24.6859959 52.8027989,24.9611351 52.3446014,24.9930988 C51.8876177,25.0513857 51.4482336,24.8257591 51.4482336,24.8270126 L51.5835688,24.5875977 C51.5835688,24.5875977 51.9167481,24.8382939 52.3446014,24.8558426 C52.7639583,24.8978343 53.1663224,24.6859959 53.1663224,24.6859959" id="Fill-64" fill="#000000"></path>
+                        <path d="M52.468163,24.0715395 C52.4657355,24.0665255 52.4044402,24.1473751 52.274567,24.2156898 C52.1525833,24.3084474 51.9686974,24.3755087 51.7702463,24.4162468 C51.5742228,24.50023 51.3745579,24.4218875 51.2173749,24.4237677 C51.0644401,24.4074724 50.9600561,24.3961911 50.9600561,24.3961911 L51.0541231,24.1367205 C51.0541231,24.1367205 51.1390869,24.1605366 51.2671394,24.1956341 C51.395192,24.2150631 51.5705815,24.3272496 51.756288,24.2796173 C51.9377463,24.2739767 52.1258804,24.2464001 52.2521123,24.1780854 C52.3892681,24.1367205 52.4657355,24.0665255 52.468163,24.0715395" id="Fill-66" fill="#000000"></path>
+                        <path d="M45.3005586,21.1514297 C45.3005586,21.1514297 45.9353593,21.827056 48.4247978,20.8010817 C51.1733758,19.6710684 53.6622074,20.4225304 53.9055679,20.7026834 C53.9055679,20.7026834 50.0148341,17.630401 45.3005586,21.1514297" id="Fill-68" fill="#000000"></path>
+                        <path d="M42.9625377,33.8961997 C42.9625377,33.8961997 41.3360884,33.177955 41.2747931,33.661172 C41.2147115,34.1431355 42.1784435,34.3712691 42.9625377,33.8961997" id="Fill-70" fill="#87533C"></path>
+                        <path d="M43.442583,33.8961997 C43.442583,33.8961997 45.0690323,33.177955 45.1272932,33.661172 C45.1861609,34.1431355 44.2266772,34.3712691 43.442583,33.8961997" id="Fill-72" fill="#87533C"></path>
+                        <path d="M39.0912848,36.7348332 C39.0912848,36.7348332 41.8016291,35.1153355 43.2017107,35.6386639 C43.2017107,35.6386639 44.5441383,35.1353912 47.309709,36.7348332 C47.309709,36.7348332 46.3399083,39.3564896 43.4214027,39.3564896 C40.1891381,39.3577426 39.0912848,36.7348332 39.0912848,36.7348332" id="Fill-74" fill="#CD3C52"></path>
+                        <path d="M47.3061284,36.7464906 C47.3097697,36.7427302 47.3097697,36.7345825 47.3097697,36.7345825 C47.2630396,36.7082594 47.2199509,36.6856968 47.1732208,36.6600004 C45.1862823,36.105335 43.2017714,36.1040815 43.2017714,36.1040815 C42.6495069,35.9605579 40.3142169,36.4161983 39.2800865,36.6299168 C39.1611372,36.6957246 39.0913455,36.7345825 39.0913455,36.7345825 C39.0913455,36.7345825 39.0980212,36.7427302 39.1004488,36.7464906 L47.3061284,36.7464906 Z" id="Fill-76" fill="#9B2B44"></path>
+                        <path d="M39.3236001,36.8792969 C39.3236001,36.8792969 40.8122867,38.6416915 43.3168973,38.5489339 C45.7796329,38.45931 47.0801855,37.1481686 47.3095876,36.7351466 L39.3236001,36.8792969 Z" id="Fill-78" fill="#9B2B44"></path>
+                        <path d="M43.2019535,36.5628556 C42.1611473,36.4243459 39.0915276,36.7345825 39.0915276,36.7345825 C41.1986291,38.1159188 43.2019535,37.9761556 43.2019535,37.9761556 C43.2019535,37.9761556 45.2058847,38.1159188 47.3099518,36.7345825 C47.3099518,36.7345825 44.246401,36.4243459 43.2019535,36.5628556" id="Fill-80" fill="#490615"></path>
+                        <path d="M40.830736,37.5831266 C42.1798393,38.0444077 43.2018321,37.976093 43.2018321,37.976093 C43.2018321,37.976093 44.2092596,38.0444077 45.542584,37.594408 C43.3244227,36.6123054 41.5668864,37.2208706 40.830736,37.5831266" id="Fill-82" fill="#D36362"></path>
+                        <path d="M45.900949,38.1407377 C45.900949,38.1407377 43.9910848,38.6352361 44.2975613,38.9172693 C44.6034309,39.1986759 46.309382,38.1902502 45.900949,38.1407377" id="Fill-84" fill="#D87E91"></path>
+                        <path d="M44.0548076,38.965779 C44.0548076,38.965779 44.1015377,38.5515035 42.7906681,38.8366705 C41.4834398,39.120584 44.3127334,39.420166 44.0548076,38.965779" id="Fill-86" fill="#D87E91"></path>
+                        <path d="M30.9540617,31.8097176 C30.9540617,32.4101351 30.4843335,32.898366 29.9023316,32.898366 C29.3209367,32.898366 28.8493878,32.4101351 28.8493878,31.8097176 C28.8493878,31.2111803 29.3209367,30.7248296 29.9023316,30.7248296 C30.4843335,30.7248296 30.9540617,31.2111803 30.9540617,31.8097176" id="Fill-88" fill="#D38738"></path>
+                        <path d="M30.5308815,31.8097176 C30.5308815,32.1694667 30.2480735,32.4571406 29.9021496,32.4571406 C29.5550119,32.4571406 29.2752383,32.1694667 29.2752383,31.8097176 C29.2752383,31.4549824 29.5550119,31.163548 29.9021496,31.163548 C30.2480735,31.163548 30.5308815,31.4549824 30.5308815,31.8097176" id="Fill-90" fill="#9D622F"></path>
+                        <path d="M57.4524413,31.8097176 C57.4524413,32.4101351 56.982713,32.898366 56.4019249,32.898366 C55.8193162,32.898366 55.3514086,32.4101351 55.3514086,31.8097176 C55.3514086,31.2111803 55.8193162,30.7248296 56.4019249,30.7248296 C56.982713,30.7248296 57.4524413,31.2111803 57.4524413,31.8097176" id="Fill-92" fill="#D38738"></path>
+                        <path d="M57.0263479,31.8097176 C57.0263479,32.1694667 56.7477882,32.4571406 56.4018642,32.4571406 C56.0541196,32.4571406 55.7743461,32.1694667 55.7743461,31.8097176 C55.7743461,31.4549824 56.0541196,31.163548 56.4018642,31.163548 C56.7477882,31.163548 57.0263479,31.4549824 57.0263479,31.8097176" id="Fill-94" fill="#9D622F"></path>
+                        <g id="Group-98" transform="translate(27.309784, 0.000000)" fill="#000000">
+                            <path d="M1.5397256,23.8346315 C1.5397256,23.8346315 2.72861151,26.3390869 4.02248836,22.5316378 C5.12216231,19.3020435 11.7815013,6.58547682 15.8919272,10.8617279 L15.8919272,2.53547908 C15.8919272,2.53547908 15.3590829,-0.267931605 12.5904778,0.0993383846 C9.5554505,0.501705848 -1.83333611,2.6746155 0.943158546,23.2310803 L1.5397256,23.8346315 Z" id="Fill-96"></path>
+                        </g>
+                        <g id="Group-101" transform="translate(43.088770, 0.000000)" fill="#000000">
+                            <path d="M14.4632614,23.8346315 C14.4632614,23.8346315 13.2749823,26.3390869 11.983533,22.5316378 C10.8844659,19.3020435 4.22087877,6.58547682 0.112880439,10.8617279 L0.112880439,2.53547908 C0.112880439,2.53547908 0.643904007,-0.267931605 3.41554359,0.0993383846 C6.45239152,0.501705848 17.6160241,2.95163484 15.067111,23.2310803 L14.4632614,23.8346315 Z" id="Fill-99"></path>
+                        </g>
+                        <path d="M43.2019535,10.8616026 L43.2019535,2.53535374 C43.2019535,2.53535374 43.1643266,2.33291652 43.0508393,2.04524259 C43.010785,2.35171874 42.9622342,2.55979662 42.9622342,2.55979662 C39.2019805,0.974142909 36.6415366,3.52685736 36.6415366,3.52685736 C41.3940458,2.35297222 42.4433484,5.59572807 42.4433484,5.59572807 C39.8386019,4.90443319 37.701763,6.700045 37.701763,6.700045 C41.309082,5.97302591 42.9622342,8.62915256 42.9622342,8.62915256 C38.524091,6.35471093 33.5852683,15.5295665 33.5852683,15.5295665 C33.9451506,13.5283838 36.2889369,9.62128292 36.2889369,9.62128292 C33.6726597,12.19656 30.953819,18.6338127 30.953819,18.6338127 C32.4898426,10.3558229 35.7949333,5.66466953 35.7949333,5.66466953 C29.2824602,11.3905716 29.2751776,21.5776133 29.2751776,21.5776133 C28.0577682,14.4929376 30.0040454,8.13653445 31.5188281,4.54217713 C28.8357935,7.78305275 26.92775,13.4055426 28.2525779,23.230955 L28.8497519,23.8345062 C28.8497519,23.8345062 30.0386378,26.3389616 31.3319078,22.5315125 C32.4321886,19.3019182 39.0915276,6.58535147 43.2019535,10.8616026" id="Fill-102" fill="#000000"></path>
+                        <path d="M58.4967067,19.0875729 C58.1447139,17.1804013 57.4522592,15.5527559 57.4522592,15.5527559 C57.9863172,17.6680054 57.7223226,21.1182124 57.7223226,21.1182124 C56.7786179,15.0037312 52.9552482,10.0330515 52.9552482,10.0330515 C54.7789348,12.7468383 56.9631106,21.5788668 56.3786813,21.5776133 C55.7918243,21.5776133 51.3530742,12.5625765 49.9165796,10.2480235 C48.4831194,7.93347049 44.2634544,8.92873456 44.2634544,8.92873456 C45.8140432,6.4468418 48.6354473,7.27288591 48.6354473,7.27288591 C46.0968512,5.5267866 43.9587986,6.400463 43.9587986,6.400463 C45.5172769,3.91731675 50.1939256,6.400463 50.1939256,6.400463 C47.2098766,3.22602187 43.9587986,3.96244207 43.9587986,3.96244207 C45.6890251,2.38117555 48.9212897,3.96244207 48.9212897,3.96244207 C46.9531646,2.15366871 43.9320957,2.76850124 43.2020141,2.95276297 L43.2020141,10.8616026 C47.3094056,6.58535147 53.9729928,19.3019182 55.0720598,22.5315125 C56.3635092,26.3389616 57.5517882,23.8345062 57.5517882,23.8345062 L58.1556378,23.230955 C58.3370962,21.7574878 58.4475491,20.3805387 58.4967067,19.0875729" id="Fill-104" fill="#000000"></path>
+                        <path d="M39.9185892,36.6613792 L39.9185892,36.6613792 C39.9185892,36.6613792 43.4348756,38.0734258 46.2781275,36.645084 C45.2907271,36.5654879 43.8542325,36.4764907 43.2018321,36.562981 C42.505736,36.4702233 40.9029552,36.5792762 39.9185892,36.6613792" id="Fill-106" fill="#FFFFFF"></path>
+                        <path d="M44.0707687,18.732587 C44.0707687,19.0898292 43.7897814,19.3818903 43.4426437,19.3818903 C43.0936853,19.3818903 42.8139118,19.0898292 42.8139118,18.732587 C42.8139118,18.3740914 43.0936853,18.082657 43.4426437,18.082657 C43.7897814,18.082657 44.0707687,18.3740914 44.0707687,18.732587" id="Fill-108" fill="#CD3C52"></path>
+                        <polygon id="Fill-110" fill="#A72A3E" points="31.8134703 66.4138208 32.7765953 66.4138208 32.7765953 51.6459321 31.8134703 51.6459321"></polygon>
+                        <path d="M54.1241069,51.3408348 C54.1241069,51.3408348 26.481144,67.3120654 18.9806637,77.0534945 C18.9806637,77.0534945 15.2968773,88.6381677 16.9779462,95.5987488 C18.6590151,102.559957 20.7284898,109.90473 20.7284898,109.90473 L45.2994055,101.622353 L76.72447,108.302154 L86.294425,95.5987488 L81.1213451,62.5062185 C81.1213451,62.5062185 78.1470063,52.4771155 69.4825223,51.6454307 L54.1241069,51.3408348 Z" id="Fill-112" fill="#CE3506"></path>
+                        <path d="M26.9180399,52.031879 C26.9180399,52.031879 27.2384747,61.9024166 29.6957483,67.2441267 C29.6957483,67.2441267 20.1130487,74.9925207 18.980603,77.0538706 L16.9778855,96.852606 C16.9778855,96.852606 7.76538523,90.0436962 1.97692489,94.2108944 C4.04882713,80.1048438 6.11648119,65.629643 8.31400843,60.2710109 C8.31400843,60.2710109 11.9346788,52.031879 18.6595613,52.031879 L26.9180399,52.031879 Z" id="Fill-113" fill="#055AE2"></path>
+                        <path d="M16.8682823,90.291196 C17.1601935,83.9003222 18.9802389,77.0538079 18.9802389,77.0538079 C26.4813261,67.3123788 54.124289,51.3411482 54.124289,51.3411482 L69.4820975,51.6457441 C50.8726041,63.3845955 33.4629205,76.5705909 16.8682823,90.291196" id="Fill-114" fill="#E5A025"></path>
+                        <path d="M71.4238231,52.031879 C71.4238231,52.031879 38.415398,72.525043 17.3152524,92.9210623 L16.9778248,95.5991248 C16.9778248,95.5991248 46.3030704,71.9396673 73.5788684,52.9055554 C73.5788684,52.9055554 72.4439952,52.1196227 71.4238231,52.031879" id="Fill-115" fill="#E5A025"></path>
+                        <polygon id="Fill-116" fill="#024F9D" points="29.695809 67.8821487 33.2624667 115.946885 65.6288084 115.946885 68.9575675 67.8821487"></polygon>
+                        <path d="M69.0668067,97.2697646 C69.0668067,97.2697646 57.2301396,99.7704595 37.3983817,93.8045158 L32.203454,91.9618984 C32.203454,91.9618984 27.6663886,87.4318174 17.5350658,87.0432382 C17.5350658,87.0432382 15.3715241,90.3436542 16.8019498,97.4533996 C16.8019498,97.4533996 20.2102108,98.0582042 28.3278923,98.5295132 L35.2931008,101.886336 C35.2931008,101.886336 62.1513626,113.622053 79.4548415,114.154783 C79.4548415,114.154783 86.6864721,113.799421 87.8055664,106.776166 L85.828338,93.5839031 C80.7614629,91.6698373 75.0270152,93.7869671 69.0668067,97.2697646" id="Fill-117" fill="#EFAC8F"></path>
+                        <polygon id="Fill-118" fill="#A72A3E" points="35.6413916 102.619748 36.8933935 102.999552 39.7839823 92.8469815 38.5319805 92.4671767"></polygon>
+                        <polygon id="Fill-119" fill="#A72A3E" points="33.6761189 102.022965 34.9281207 102.40277 37.8181027 92.2501991 36.5667078 91.8703943"></polygon>
+                        <polygon id="Fill-120" fill="#A72A3E" points="31.7405228 101.435396 32.9925247 101.815201 35.8831135 91.6626298 34.6317186 91.282825"></polygon>
+                        <polygon id="Fill-121" fill="#A72A3E" points="29.8374557 100.857666 31.0894576 101.237471 33.9800464 91.0849003 32.7286515 90.7050955"></polygon>
+                        <path d="M1.97710695,94.2107691 L-0.000121376816,107.403032 C1.11897286,114.426287 8.35060354,114.781649 8.35060354,114.781649 C25.6540824,114.248919 52.5129511,102.513202 52.5129511,102.513202 L59.4775527,99.1563791 C67.5952342,98.6850702 69.0669281,97.2698899 69.0669281,97.2698899 C73.3284681,90.6684312 68.4472994,82.9614021 68.4472994,82.9614021 C60.3047357,88.3845885 57.5670817,92.5423856 57.5670817,92.5423856 L50.4070633,94.4313817 C45.7559037,96.3742776 16.9780676,96.8524807 16.9780676,96.8524807 C11.0925058,93.2499757 5.77255998,91.3873027 1.97710695,94.2107691" id="Fill-122" fill="#FFBE9D"></path>
+                        <polygon id="Fill-123" fill="#A72A3E" points="53.6416341 102.567728 52.3720326 102.879845 49.9948676 92.5862574 51.2644691 92.2735139"></polygon>
+                        <polygon id="Fill-124" fill="#A72A3E" points="55.6341559 102.076865 54.3645544 102.388982 51.9873894 92.0953942 53.2569909 91.7826506"></polygon>
+                        <polygon id="Fill-125" fill="#A72A3E" points="57.5964548 101.593335 56.3268534 101.906078 53.9496884 91.6124906 55.218683 91.299747"></polygon>
+                        <polygon id="Fill-126" fill="#A72A3E" points="59.525618 101.118391 58.2560165 101.430507 55.8788515 91.1369198 57.148453 90.8241762"></polygon>
+                        <polygon id="Fill-127" fill="#FFFFFF" points="67.1370974 66.556467 30.9097592 66.556467 29.695991 67.8820233 68.9577496 67.8820233"></polygon>
+                        <g id="Group-24" transform="translate(31.332650, 21.081275)" stroke="#333333" stroke-width="0.25">
+                            <path d="M9.91218676,3.95273899 C10.7750379,3.82216445 11.4311502,3.75687718 11.8805236,3.75687718 C12.3298971,3.75687718 12.9954097,3.82216445 13.8770615,3.95273899" id="Line-2"></path>
+                            <ellipse id="Oval" cx="18.8331549" cy="3.95273899" rx="4.95609338" ry="3.95273899"></ellipse>
+                            <ellipse id="Oval-Copy" cx="4.95609338" cy="3.95273899" rx="4.95609338" ry="3.95273899"></ellipse>
+                        </g>
                     </g>
                 </g>
             </g>
diff --git a/src/assets/imgs/ic_thankyou.svg b/src/assets/imgs/ic_thankyou.svg
new file mode 100644
index 000000000..372270e05
--- /dev/null
+++ b/src/assets/imgs/ic_thankyou.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 943.22 704.47"><defs><style>.cls-1,.cls-4{fill:none;}.cls-1{opacity:0.08;}.cls-2{fill:#0c519b;}.cls-3{fill:#edf4f9;}.cls-4{stroke:#0c519b;stroke-linecap:round;stroke-miterlimit:10;stroke-dasharray:13 18;}.cls-5{fill:#e55a28;}.cls-6{fill:#a03e20;}.cls-7{fill:#239e6f;}.cls-8{fill:#20bb83;}.cls-9{fill:#36ce94;}.cls-10{opacity:0.43;}.cls-11{clip-path:url(#clip-path);}.cls-12{fill:#e89074;}</style><clipPath id="clip-path"><path class="cls-1" d="M81.94,536.41c5.69-6.45,14.14-10.58,21.68-14.62,1.75-.93,5-3.37,6.95-2.24,1.75,1,.29,2.23-1.07,4.72a101.73,101.73,0,0,1-7.88,11.83c-3.3,4.43-8.09,11.17-6,17,2.39,6.51,10.93,6.75,16.46,4.59,15-5.84,23.73-21.84,37.32-30,.78-.47,3.52-1.45,3.75-2,1.43-.29,1.15-.58-.82-.87q-2.48-1.74-1.76,1.17c-2.85,3.78-4.54,9-7.43,13-4.21,5.81-9.34,12.51-9.66,19.91a7,7,0,0,0,3.43,6c11.75,7.4,24.21-2.67,31.86-10.91,5.54-6,11.75-11,17.76-16.39,2.4-2.17,11.76-13.82,14.82-12.79l-4.14-3.19c3.93,6.09-5.95,15-9,19.47-3.34,4.85-8.15,12.78-6.1,18.88,2.15,6.37,9.75,7.91,15.57,6.36,8.92-2.37,16.12-11.28,25.92-7.87,8.45,2.94,12.08-10.46,3.69-13.38-6.58-2.29-12.8-1.6-19.22,1-3.31,1.31-6.24,3.18-9.4,4.79a18.89,18.89,0,0,1-3.05,1.44c-2.52.48-2.28,1.49.73,3,1-.66,1.69-4,2.33-5.11,5.92-10,16.84-19.35,12.11-32.51-10.65-29.69-56.09,42-66.88,35.23l3.43,6c.18-4.1,5.39-9.61,7.77-12.91,3.51-4.87,7.44-10.31,8.83-16.28,1.79-7.63-.15-17.4-9.43-18.06-8.65-.61-16.88,7.17-23,12.22-8.07,6.6-17,21.14-28.57,20.92l6,3.44q-.81,4.8.41,1.72c.55-1.16,1.11-2.3,1.7-3.44,1.27-2,3.2-4.17,4.62-6.15a84.77,84.77,0,0,0,7.75-12.64c3.29-6.89,3.58-17-4.5-20.83-7-3.31-16-.66-22.32,2.93-8.59,4.91-17.85,9.26-24.48,16.79-5.89,6.67,3.89,16.52,9.81,9.81Z"/></clipPath></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-2" d="M257.3,294.1a1,1,0,0,1-.56.14h-2.3c-5.3.1-10.81.14-16.68.1a1.57,1.57,0,0,1,.07-3.14c5.8.05,11.31,0,16.61-.09h2.3a1.67,1.67,0,0,1,1.61,1.54A1.77,1.77,0,0,1,257.3,294.1Zm-37.89-1a1.22,1.22,0,0,1-.7.09,144.82,144.82,0,0,1-18.84-3.13,1.58,1.58,0,0,1-1.11-1.92,1.51,1.51,0,0,1,1.88-1.07,149.33,149.33,0,0,0,18.42,3,1.54,1.54,0,0,1,.35,3Zm-36.57-9.07a1.71,1.71,0,0,1-1.18,0A91.41,91.41,0,0,1,165,274.58a1.55,1.55,0,1,1,1.81-2.51,93.17,93.17,0,0,0,16.12,9.22,1.51,1.51,0,0,1,.77,2A1.35,1.35,0,0,1,182.84,284.05Zm-30.42-22a1.69,1.69,0,0,1-1.75-.41A88.05,88.05,0,0,1,139.44,246a1.54,1.54,0,1,1,2.72-1.46A86.71,86.71,0,0,0,153,259.64a1.53,1.53,0,0,1-.14,2.17C152.77,261.94,152.63,262,152.42,262.08Zm2.3-22.39a77.9,77.9,0,0,1-10.05,3.14,1.59,1.59,0,0,1-1.88-1.19,1.54,1.54,0,0,1,1.18-1.89,70.68,70.68,0,0,0,9.64-3,62.31,62.31,0,0,0,7.6-3.56,1.55,1.55,0,0,1,1.47,2.73A72,72,0,0,1,154.72,239.69Zm-28.61,5.37c-.14.07-.35.07-.49.14a183.68,183.68,0,0,1-19.05-.42,1.57,1.57,0,0,1,.21-3.14,178.81,178.81,0,0,0,18.77.42,1.56,1.56,0,0,1,1.61,1.53A1.61,1.61,0,0,1,126.11,245.06Zm51-20.87a1.39,1.39,0,0,1-1.53-.28,1.54,1.54,0,0,1-.21-2.16,40.13,40.13,0,0,0,5.23-8.1,30.26,30.26,0,0,0,2.58-8,1.56,1.56,0,1,1,3.07.56,33.32,33.32,0,0,1-2.86,8.86,43.17,43.17,0,0,1-5.65,8.72A1.65,1.65,0,0,1,177.12,224.19Zm-42.85,5.1c-.07,0-.14.07-.2.07a1.55,1.55,0,0,1-1.89-1.12A55.58,55.58,0,0,1,130.44,209a1.54,1.54,0,1,1,3.07.28,54.75,54.75,0,0,0,1.67,18.21A1.57,1.57,0,0,1,134.27,229.29Zm-45.91,14a1.15,1.15,0,0,1-.7.07L81,242.9c-4.33-.22-8.3-.29-12.14-.29a1.57,1.57,0,1,1-.07-3.13c3.91-.07,8,.07,12.35.27l6.7.42a1.61,1.61,0,0,1,1.46,1.68A1.64,1.64,0,0,1,88.36,243.24ZM2.11,270.6a1.41,1.41,0,0,1-1.47-.21,1.55,1.55,0,0,1-.35-2.16A63.2,63.2,0,0,1,14,254.62a1.55,1.55,0,0,1,1.81,2.51A59,59,0,0,0,2.8,270,1.42,1.42,0,0,1,2.11,270.6Zm48.43-26.66a.66.66,0,0,1-.36.07,92.38,92.38,0,0,0-18,4.54,1.63,1.63,0,0,1-2-.91,1.55,1.55,0,0,1,.91-1.95A98,98,0,0,1,49.7,241a1.52,1.52,0,0,1,1.74,1.32A1.29,1.29,0,0,1,50.54,243.94Zm132.65-55.13a1.52,1.52,0,0,1-1.95-.84,19.77,19.77,0,0,0-9.84-10.32,19.06,19.06,0,0,0-2.79-1.05,1.57,1.57,0,1,1,.91-3,17.6,17.6,0,0,1,3.2,1.19,23,23,0,0,1,11.38,11.86,1.59,1.59,0,0,1-.91,2.16ZM138,192.58a1.66,1.66,0,0,1-1.39-.14,1.57,1.57,0,0,1-.56-2.16A38.79,38.79,0,0,1,150,176.6a1.53,1.53,0,0,1,1.53,2.65,35.55,35.55,0,0,0-12.77,12.56A1.11,1.11,0,0,1,138,192.58Z"/><path class="cls-3" d="M123.05,527.51C83.94,461.11,105,358.57,155,282,205.38,204.89,285.14,154,369.91,108.6,455.41,63,546.77,23.44,630.44,36.45s160.38,78.47,211.44,158.32c51.49,80.15,77.34,174.68,57.54,255.55C879.2,530.91,812.61,598,744.25,634.21S605.15,676.7,541,675.3s-122.78-9.9-201.21-29.57C260.93,625.77,161.85,594.34,123.05,527.51Z"/><path class="cls-4" d="M84.1,541.72c-42.88-72.81-19.8-185.25,35.08-269.27C174.38,188,261.84,132.2,354.8,82.37,448.55,32.39,548.73-11,640.47,3.25S816.33,89.3,872.33,176.86c56.46,87.88,84.8,191.53,63.09,280.22C913.25,545.44,840.23,619,765.27,658.71s-152.53,46.6-222.89,45.06-134.64-10.86-220.63-32.42C235.29,649.46,126.65,615,84.1,541.72Z"/><ellipse class="cls-5" cx="155.3" cy="476.85" rx="85.47" ry="15.38"/><ellipse class="cls-6" cx="155.3" cy="476.85" rx="67.26" ry="12.11"/><path class="cls-5" d="M68.69,484.15s12.46,40.66,19.85,69.26a34.37,34.37,0,0,0,33.3,25.76H187a34.4,34.4,0,0,0,33-24.68l20.72-70.34S155.3,510.12,68.69,484.15Z"/><path class="cls-7" d="M152,380c4.18,13,8.35,29.13,11.26,40.6,8.71,34.42,4.43,55.37-1.46,57.27-5.35,1.72-16.3-16.3-28-44.37-5.49-13.13-15.38-27.52-20.71-44.06-5.47-17-5.69-34.08-8.93-48.21-6.65-29,4.24-73,9.52-74.68,5.13-1.65,6.32,39.65,17.52,65.85C137.13,346.25,146.26,362.1,152,380Z"/><path class="cls-8" d="M174.79,348.79c.93,18.61.91,41.41.82,57.58-.26,48.5-11.43,74.57-18.76,74.93-6.66.34-13.86-27.38-18.95-68.62-2.38-19.29-9.45-41.83-10.64-65.55-1.22-24.36,3.63-47,4.13-66.77,1-40.68,26.64-94.62,33.22-94.94,6.39-.32-4.57,54.53.47,93.1C167.75,298.88,173.5,323.08,174.79,348.79Z"/><path class="cls-9" d="M193.57,391.34c-2.63,13.19-6.66,29.15-9.57,40.46C175.29,465.72,163,482,157.94,481c-4.62-.93-4.68-21.59-.92-51.36,1.76-13.92.88-30.93,4.24-47.75,3.45-17.28,10.75-32.27,14.58-46,7.86-28.32,34.93-61.64,39.5-60.72s-12.74,37.39-16.06,65.29C197.52,355.16,197.21,373.1,193.57,391.34Z"/><g class="cls-10"><g class="cls-11"><path class="cls-5" d="M68.69,484.15s12.46,40.66,19.85,69.26a34.37,34.37,0,0,0,33.3,25.76H187a34.4,34.4,0,0,0,33-24.68l20.72-70.34S155.3,510.12,68.69,484.15Z"/><path class="cls-12" d="M68.6,484.3S81.05,525,88.44,553.56a34.39,34.39,0,0,0,33.3,25.77h65.18a34.41,34.41,0,0,0,33-24.68l20.73-70.35S155.21,510.28,68.6,484.3Z"/></g></g><path class="cls-2" d="M363,343.47h-2.53q-5.71.54-11.35,1.16t-11.35,1.17c-1.2.12-2.3.18-3.31.18a14.33,14.33,0,0,1-3.13-.36l-1.52-.63a1.11,1.11,0,0,1-.62-1.16,1,1,0,0,1,.44-1.25,6.6,6.6,0,0,1,1.17-.54c1.54-.47,3-.94,4.46-1.41s2.86-.87,4.29-1.22q3.23-.69,6.44-1.05c2.15-.23,4.23-.52,6.26-.87s3.78-.52,5.63-.87,3.79-.64,5.84-.87a11.9,11.9,0,0,1,1.45-.26,1.86,1.86,0,0,0,1.26-.79,6.59,6.59,0,0,1,3.7-1.51,10.17,10.17,0,0,1,3.89.63,15.91,15.91,0,0,0,4.51.36q6.44-.36,12.87-.36a94.36,94.36,0,0,1,12.87.89q2,.18,3.84.27a28.93,28.93,0,0,1,3.84.43,7.54,7.54,0,0,1,3.4,1.23,2.71,2.71,0,0,1,1.52,2c.06.76-.39,1.37-1.34,1.84a34,34,0,0,1-4,1.48,9.17,9.17,0,0,1-4.2.26,126.65,126.65,0,0,0-27-.71l-2.68.53a3.66,3.66,0,0,0-.18,1.16v1.17q-.18,8-.18,16.08t-.17,16.09c0,3.7-.07,7.36-.18,11s-.18,7.3-.18,11q.18,14,1.61,27.89.53,4.65,1.07,9.2c.36,3,.77,6.11,1.25,9.21a17.88,17.88,0,0,0,.09,1.79,2.44,2.44,0,0,1-.63,1.79q-2.5,3.75-6.48,2.14a18.49,18.49,0,0,1-3.88-2.14,8,8,0,0,1-2.62-3.4q-.9-2-1.62-3.84a21.37,21.37,0,0,1-1.08-3.85A132.44,132.44,0,0,1,361,416.94q-.92-10.19-1.26-20.55V392.1c0-1.43-.07-2.92-.18-4.47,0-3.82.11-7.57.35-11.27s.48-7.44.72-11.26l1.62-16.62c.12-.72.21-1.49.28-2.33A15.78,15.78,0,0,1,363,343.47Z"/><path class="cls-2" d="M445,436.07a10.69,10.69,0,0,0,2.15-2.41,20.38,20.38,0,0,0,1.25-2.41c.72-1.67,1.4-3.28,2.06-4.83s1.34-3.16,2.05-4.83c.95-2.38,1.88-4.79,2.77-7.24s1.88-4.85,3-7.24a16,16,0,0,1,1.25-2.59c.48-.77,1-1.58,1.43-2.41a2.19,2.19,0,0,1,1.61-.54c.6,0,.9.42.9,1.25v1.79a4.77,4.77,0,0,1-.36,1.79q-2.51,7.5-4.92,15.1a149.32,149.32,0,0,1-5.63,14.93,6.78,6.78,0,0,0-.62,1.16,6.76,6.76,0,0,1-.63,1.16,7.46,7.46,0,0,1-3.75,3.4,14.17,14.17,0,0,1-8.94.71,10.22,10.22,0,0,1-5.9-4.29,27.46,27.46,0,0,1-1.79-3.48,28.67,28.67,0,0,1-1.25-3.67,32.36,32.36,0,0,1-1.25-5.72q-.36-2.85-.72-5.9c-.12-1.66-.21-3.24-.26-4.73s-.16-3.07-.27-4.74a51,51,0,0,1,.27-8c.29-2.62.68-5.31,1.16-8.05.36-2.5.74-5,1.16-7.51s.8-5,1.16-7.5c.12-.72.21-1.4.27-2.06a4,4,0,0,0-.27-1.88c-.6-.23-1-.18-1.25.18a5.88,5.88,0,0,1-.71.89,69.44,69.44,0,0,0-10.19,15.74A106.23,106.23,0,0,0,410,420.16c-.12,1-.27,1.94-.45,2.95s-.33,2.06-.45,3.13a9.31,9.31,0,0,0-.35,2.59,24.13,24.13,0,0,1-.18,2.77,8.07,8.07,0,0,0,.09,1.34,11.3,11.3,0,0,1,.09,1.34,3.53,3.53,0,0,1-1.61,2.51,8.7,8.7,0,0,1-6.62,1.78,1.57,1.57,0,0,0-.62-.17,1,1,0,0,1-.63-.36,16.32,16.32,0,0,1-2.23-2.33,7,7,0,0,1-1.34-3.21c-.24-1.31-.54-2.65-.9-4s-.65-2.77-.89-4.2a170,170,0,0,1-3-20.46,150.44,150.44,0,0,1-.36-20.83q.36-7,1.07-13.85t1.79-13.68c.6-3.34,1.13-6.64,1.61-9.92a68.64,68.64,0,0,1,2.15-9.74,89.37,89.37,0,0,1,5.18-15,50.24,50.24,0,0,1,4.65-8.58A21.24,21.24,0,0,1,412.1,307a9.93,9.93,0,0,1,7.15-2,5.74,5.74,0,0,1,4.83,3.75,7.22,7.22,0,0,1,.45,1.61c.05.48.14,1,.26,1.61a39.24,39.24,0,0,1,1,7.87,73,73,0,0,1-.27,8,93.36,93.36,0,0,1-2.15,14.3A75.16,75.16,0,0,1,418.72,356l-1.08,2.14c-.83,1.79-1.67,3.58-2.5,5.36l-2.5,5.37c-.84,1.67-1.7,3.33-2.59,5s-1.88,3.34-2.95,5a7,7,0,0,0-1.26,3.75q0,5.55-.08,11.08a78.36,78.36,0,0,0,.62,11.27,35.56,35.56,0,0,1,.18,3.57c0,1.19.06,2.45.18,3.76.59-.24.92-.57,1-1a8.07,8.07,0,0,0,.09-1.16,146.81,146.81,0,0,1,4.74-15.1,90.36,90.36,0,0,1,6.88-14.4c.83-1.3,1.67-2.59,2.5-3.84s1.73-2.53,2.68-3.84a6.64,6.64,0,0,1,.9-1.07,7.06,7.06,0,0,0,.89-1.08,9.39,9.39,0,0,1,6.88-3.48,14.6,14.6,0,0,1,6.53,1.16,9.1,9.1,0,0,1,5.18,6.26,32.37,32.37,0,0,1,1.43,9.29,77,77,0,0,1-.17,9c-.25,2.92-.48,5.87-.72,8.85q-.54,5.71-1.25,11.17a57.55,57.55,0,0,0-.36,11.17q.18,2.5.27,5a46.66,46.66,0,0,0,.45,5,2.54,2.54,0,0,0,.09.72C444.78,435.24,444.87,435.6,445,436.07ZM418.36,311.12a12.42,12.42,0,0,0-.81,1.52,6.42,6.42,0,0,1-.62,1.16,37.24,37.24,0,0,0-2.77,7.33c-.66,2.5-1.28,5-1.88,7.51a146.14,146.14,0,0,0-3.57,19.93q-1.08,9.92-2,20.11a14.73,14.73,0,0,0-.18,2.68,1.68,1.68,0,0,0,1.25-1.25q2-4.29,3.84-8.58t3.67-8.76a65.55,65.55,0,0,0,4.47-15.2,86.06,86.06,0,0,0,1.07-15.73,40,40,0,0,0-.71-5.27A27.9,27.9,0,0,0,418.36,311.12Z"/><path class="cls-2" d="M493.26,408.9a6.23,6.23,0,0,0-1.34,1.88,9.2,9.2,0,0,1-1.16,1.87c-.48.84-1,1.64-1.52,2.42a8.54,8.54,0,0,1-2.06,2.05,14.24,14.24,0,0,1-7.24,3.67,19.89,19.89,0,0,1-8.13-.45,11.42,11.42,0,0,1-3.58-1.25,27.28,27.28,0,0,1-3-2,16.05,16.05,0,0,1-6.25-11.62q-.36-9.11,4.38-15.37a25.72,25.72,0,0,1,13.14-8.94,14.62,14.62,0,0,1,4.91-.89,36.05,36.05,0,0,1,4.92.35,13.58,13.58,0,0,1,6.79,3.58,4.82,4.82,0,0,1,1,.89,4.64,4.64,0,0,0,1,.9c.35-.48.77-1.07,1.25-1.79a3.84,3.84,0,0,1,2.23-1.7,10.45,10.45,0,0,1,3.58-.62,15.41,15.41,0,0,1,3.66.44,4,4,0,0,1,2.5,1.52,13.59,13.59,0,0,1,2.15,6.26v10.19q0,2-.18,4t-.36,4a49.61,49.61,0,0,0,.54,12.52l.36,1.43a13,13,0,0,0,.53,1.61,2.84,2.84,0,0,1,1-.45,1.58,1.58,0,0,0,.8-.45A33.63,33.63,0,0,0,518,417.3a43.63,43.63,0,0,0,3.66-6.61c.6-1.31,1.22-2.59,1.88-3.85s1.28-2.53,1.88-3.84a1.06,1.06,0,0,1,.53-.27,3.52,3.52,0,0,0,.72-.27,1,1,0,0,0,.35.45.29.29,0,0,1,.18.27c-.24,1.55-.44,3.07-.62,4.56a16.7,16.7,0,0,1-1.16,4.38c-1.08,2.38-2.21,4.68-3.4,6.88s-2.44,4.38-3.75,6.52a9.94,9.94,0,0,1-8.58,4.65,12,12,0,0,1-4.65-.18,11.26,11.26,0,0,1-8.05-6.61A19.16,19.16,0,0,1,495,418.2a53.46,53.46,0,0,1-1-5.55v-1.87A3,3,0,0,0,493.26,408.9Zm-13.77,6.44a31,31,0,0,0,6-4.47,20,20,0,0,0,4.2-5.9c.72-1.43,1.37-2.92,2-4.47s1.19-3.16,1.79-4.83c.12-.59.2-1.16.27-1.7a3.63,3.63,0,0,0-.27-1.7,13.67,13.67,0,0,0-3.22-4.2A9.31,9.31,0,0,0,485,386a15.13,15.13,0,0,0-1.7,2.77,27.69,27.69,0,0,1-1.52,2.77A33.92,33.92,0,0,0,477.53,408a12.92,12.92,0,0,0,.18,3.75A8.36,8.36,0,0,0,479.49,415.34Z"/><path class="cls-2" d="M536.52,404.07a4.3,4.3,0,0,0,.89-1.7,10.93,10.93,0,0,1,.54-1.69,110.21,110.21,0,0,1,4.11-14.21,68.38,68.38,0,0,1,6.44-13.14c.59-.84,1.19-1.64,1.78-2.42a22.78,22.78,0,0,1,2-2.23,10.86,10.86,0,0,1,10.73-3,7.3,7.3,0,0,1,5.72,5,16.61,16.61,0,0,1,1,3.48c.18,1.13.38,2.3.62,3.49a73,73,0,0,1,.54,8.76q0,4.29-.18,8.76c-.24,3.69-.44,7.35-.62,11s-.33,7.3-.45,11q-.18,4.13-.09,8t.09,7.95a17.66,17.66,0,0,0,.18,2.51,8.86,8.86,0,0,0,.89,2.68l1.25-1.25c.72-1.55,1.49-3.1,2.33-4.65a34.76,34.76,0,0,0,2.14-4.83,115.51,115.51,0,0,0,4.83-15c.24-1,.47-1.88.71-2.78s.48-1.81.72-2.77a17.15,17.15,0,0,1,2-3.57.55.55,0,0,1,.53-.36h.72a3.42,3.42,0,0,1,.89.89v2.33c-.24.95-.45,2-.62,3s-.39,2.08-.63,3c-.72,2.74-1.43,5.45-2.15,8.13s-1.43,5.39-2.14,8.13c-.6,1.67-1.22,3.37-1.88,5.1s-1.28,3.43-1.87,5.09q-1.44,4.47-4.65,5.46a16.59,16.59,0,0,1-6.62.62,8.45,8.45,0,0,1-6.43-4.65,39.64,39.64,0,0,1-3.58-9.65q-.7-3-1.16-6.08t-.8-6.08a77.78,77.78,0,0,1-.36-13q.36-6.53,1.25-13c.48-2.74.92-5.42,1.34-8s.86-5.24,1.34-7.87a19.55,19.55,0,0,0,.45-3.12,12.92,12.92,0,0,0-.27-3.31,12.81,12.81,0,0,0-1.43.54,15.56,15.56,0,0,0-3.31,3.21c-.89,1.2-1.82,2.45-2.77,3.76a56.64,56.64,0,0,0-4.11,7.5,65.77,65.77,0,0,0-3,8.05c-.95,3.1-1.79,6.14-2.5,9.12s-1.49,6-2.33,9.11q-.71,2.5-1.34,5.1c-.41,1.73-.8,3.42-1.16,5.09a3.27,3.27,0,0,1-2.32,2.68,8.63,8.63,0,0,1-5,.36,4.06,4.06,0,0,1-3.57-3.57q-.54-3-1.16-6a39.94,39.94,0,0,1-.81-6,98.25,98.25,0,0,1-.18-10.28,61.9,61.9,0,0,1,1.25-10.28,29,29,0,0,1,1.26-3.66,19.68,19.68,0,0,1,1.78-3.31,13.78,13.78,0,0,1,1.52-1.61,3.89,3.89,0,0,1,2.06-.89,5.33,5.33,0,0,1,3,.18,3.38,3.38,0,0,1,2.14,2.68,17.93,17.93,0,0,1,.9,6.43c0,2,0,4-.09,5.9s-.15,3.88-.27,5.9Z"/><path class="cls-2" d="M596.94,395c.59,0,1-.36,1.25-1.08q1.24-2.14,2.24-4.2t2.23-4.2a29.85,29.85,0,0,1,2.5-4.11c1-1.31,2-2.62,3-3.93a9.81,9.81,0,0,1,8.58-3,6.1,6.1,0,0,1,5.72,5A17.54,17.54,0,0,1,623,386a24.76,24.76,0,0,1-9.48,17,11.84,11.84,0,0,0-1.43,1.25l2.15,1.07a9.08,9.08,0,0,1,5,6.8,49.39,49.39,0,0,1,.36,13.23c-.24,1.55-.48,3.1-.71,4.64l-.72,4.65a7.48,7.48,0,0,0-.09,3,5.13,5.13,0,0,0,1.52,2.68,3.68,3.68,0,0,0,2.33-.71,10.66,10.66,0,0,0,1.61-1.61c.59-.72,1.16-1.46,1.69-2.24a11.11,11.11,0,0,0,1.34-2.59q2.5-5.54,4.83-12.15c1.19-2.74,2.32-5.55,3.4-8.41s2.14-5.66,3.21-8.4a7.15,7.15,0,0,0,.63-1.16,7.15,7.15,0,0,1,.63-1.16c0-.12.41-.3,1.25-.54a3.68,3.68,0,0,1-.18,1.43q-2.32,7-4.56,14t-4.74,13.85a16.66,16.66,0,0,1-1.43,3.4c-.59,1.07-1.19,2.2-1.78,3.39a2.09,2.09,0,0,1-.36.54,2.2,2.2,0,0,0-.36.53,10,10,0,0,1-3.75,3.4,10.58,10.58,0,0,1-8.67.45,10,10,0,0,1-3.49-2.24A19.42,19.42,0,0,1,605,428a26.81,26.81,0,0,1-.18-5.37c.12-1.78.3-3.57.54-5.36a45.5,45.5,0,0,0,.54-7.15,2.58,2.58,0,0,0-.72-2.68h-.53l-3,.36a24.84,24.84,0,0,0-2.95.53.37.37,0,0,0-.27.09.71.71,0,0,1-.45.09,3,3,0,0,0-.36,1.34,5.44,5.44,0,0,0,.18,1.34l.72,4.65c.24,1.55.47,3.1.71,4.65.24,1.19.42,2.32.54,3.4s.24,2.2.36,3.39a2.82,2.82,0,0,1-2.15,3.22,9.59,9.59,0,0,1-7.68,0,4.27,4.27,0,0,1-2.69-2.68,74.47,74.47,0,0,1-2.68-9.48,184.62,184.62,0,0,1-3-18.5,114.93,114.93,0,0,1-.44-18.68,184.82,184.82,0,0,1,3.84-28.06,140.2,140.2,0,0,1,8.67-26.64q1.42-3,2.95-5.81a38.1,38.1,0,0,1,3.48-5.27c1-1.08,1.91-2.09,2.87-3l2.85-2.86a11.44,11.44,0,0,1,8.94-2.5c3.46.35,5.42,2.14,5.9,5.36a38.75,38.75,0,0,1,.54,6.43,124.82,124.82,0,0,1-1.52,14.13,87,87,0,0,1-3.49,13.76q-2,5.73-4.29,11.44A106,106,0,0,1,607,369.39c-1.19,2.15-2.47,4.23-3.84,6.26a38.69,38.69,0,0,1-4.74,5.72,11.45,11.45,0,0,0-1.16,1.7,2.8,2.8,0,0,0-.27,1.88c0,1.55,0,3-.09,4.46s-.09,2.86-.09,4.29a2,2,0,0,0,.09.63A2,2,0,0,1,596.94,395Zm17.88-83.31a4.12,4.12,0,0,0-1.26,1.08,32.68,32.68,0,0,0-1.6,2.86c-.48,1-1,1.9-1.43,2.86A74.42,74.42,0,0,0,605.79,332q-1.71,7-3.31,14a147.71,147.71,0,0,0-2.77,14.92q-1,7.43-2.06,14.93a1.17,1.17,0,0,0,.09.53,1.25,1.25,0,0,1,.09.54,5.51,5.51,0,0,0,1.61-1.52c.36-.53.72-1.1,1.07-1.7a114.9,114.9,0,0,0,15.74-44.15,54.55,54.55,0,0,0,.35-12.34,22.6,22.6,0,0,0-.53-2.77A10.63,10.63,0,0,0,614.82,311.65Zm-.72,65.43a2.73,2.73,0,0,1-1.07.45,1.67,1.67,0,0,0-.9.44,19.9,19.9,0,0,0-3,2.86,28.66,28.66,0,0,0-2.41,3.4L600.34,395c-.48.83-.9,1.64-1.26,2.41s-.71,1.58-1.07,2.41c-.36.6-.36,1.08,0,1.43l.63-.27a3.62,3.62,0,0,0,.62-.26,36.23,36.23,0,0,0,14-17.16,29.56,29.56,0,0,0,1.07-4.29A4.9,4.9,0,0,0,614.1,377.08Z"/><path class="cls-2" d="M663.8,408.19c-.48,1.07-1,2.14-1.43,3.21s-1,2.15-1.43,3.22a27.69,27.69,0,0,1-2.15,4.11c-.83,1.31-1.73,2.63-2.68,3.93a7.58,7.58,0,0,1-5.72,3q-7.51.36-10.91-5.9a22.6,22.6,0,0,1-2.14-6.79q-.9-5.89-1.25-11.89a68.67,68.67,0,0,1,.35-12.06c.24-1.08.45-2.18.63-3.31a20.76,20.76,0,0,1,.81-3.31q1.07-3.57,5.18-4.11h1.79c3.57,0,5.72,1.73,6.43,5.19a23.6,23.6,0,0,1,.54,2.86,22.76,22.76,0,0,1,.18,2.86c.23,3.45.29,7,.18,10.54s-.3,7.15-.54,10.73a21.53,21.53,0,0,0-.18,2.68v2.68a5.87,5.87,0,0,0,.36,1.79c.36.24.59.3.71.18l.54-.54q1.6-2,3.13-4a22.48,22.48,0,0,0,2.59-4.56l5.9-13.41a6.38,6.38,0,0,0,.54-1.52c.11-.53.23-1.1.35-1.69s.45-1.43.63-2.15a7.61,7.61,0,0,1,.8-2,5.19,5.19,0,0,1,5.19-3.57,10,10,0,0,1,2.68,0,7,7,0,0,1,6.26,4.29,27.83,27.83,0,0,1,2.68,10.9c.11,1.55.18,3.07.18,4.56v4.56a9.72,9.72,0,0,0,.09,1.43,13.86,13.86,0,0,1,.08,1.43q.72.36,1,.09a2.35,2.35,0,0,1,.62-.45q2-1.79,4-3.48c1.36-1.13,2.71-2.24,4-3.31a18.93,18.93,0,0,1,4.11-2.14,4.52,4.52,0,0,1,1.7-.36,2,2,0,0,1,1.52.89,2.35,2.35,0,0,1-.63,1.61,8.72,8.72,0,0,1-1.34,1.25c-.83.72-1.67,1.4-2.5,2.06a25.85,25.85,0,0,0-2.33,2.05q-2.33,2-4.55,4.11T685.25,418a5.53,5.53,0,0,0-1.61,3.57l-1.07,11.8q-.9,7-2.15,13.94a134.84,134.84,0,0,1-3.22,13.77,52.62,52.62,0,0,1-6.7,14.84A70.67,70.67,0,0,1,660,488.27q-8.22,7.68-19.66,5.18a6.93,6.93,0,0,1-2.86-1.07,5.83,5.83,0,0,1-3.22-4.11,11.47,11.47,0,0,1-.18-5.36,40.92,40.92,0,0,1,5.19-16.63q3-5.36,6.34-10.46a97.88,97.88,0,0,1,7.24-9.74q2.5-2.85,4.83-5.72c1.55-1.9,3.15-3.81,4.82-5.72a5.67,5.67,0,0,0,1.43-3.57q.36-5.19.45-10.19t.27-10a9.31,9.31,0,0,0-.09-1.34,9.52,9.52,0,0,1-.09-1.34Zm-1.08,35.21c-.47-.12-.8,0-1,.27a3.84,3.84,0,0,1-.63.8q-4.11,5-7.86,10.37a105.51,105.51,0,0,0-6.79,11.09q-1.08,2.15-2,4.29c-.6,1.43-1.13,2.91-1.61,4.46a28.2,28.2,0,0,0-1.07,10,15.29,15.29,0,0,0,.53,2.6,3.22,3.22,0,0,0,1.79,1.87,4.31,4.31,0,0,0,2.06-1.25c.53-.6,1.1-1.19,1.7-1.78A66.46,66.46,0,0,0,655,475.67,52.18,52.18,0,0,0,659.51,464c.59-2.5,1.07-5,1.43-7.51s.77-5,1.25-7.51c.23-.95.44-1.87.62-2.77A6.21,6.21,0,0,0,662.72,443.4Z"/><path class="cls-2" d="M716.71,373.5a4.71,4.71,0,0,0,.44-1.25,2.79,2.79,0,0,1,.45-1.07q3.39-6.8,11.08-6.43,8.4,0,12.52,7.68A34,34,0,0,1,744.77,385a71.52,71.52,0,0,1,.18,8.75,29,29,0,0,1-1.61,8.41v1.07a6.74,6.74,0,0,0,2.15.36,12.88,12.88,0,0,0,2.14-.18c.84-.24,1.64-.45,2.42-.63s1.58-.38,2.41-.62a14.09,14.09,0,0,1,2.15-.54c.71-.12,1.48-.24,2.32-.36a2.85,2.85,0,0,1,.89.18,7,7,0,0,1,.9.36c.71.48.77,1,.18,1.61a4.79,4.79,0,0,0-.9.53,48.21,48.21,0,0,1-5.18,1.88,19.09,19.09,0,0,1-5.54.81h-5.55a6.33,6.33,0,0,0-.89,1.78,18.48,18.48,0,0,0-2,3.58,21.19,21.19,0,0,1-13.94,10.9,31.56,31.56,0,0,1-8,1.08,22.94,22.94,0,0,1-7.87-1.43q-11.09-4.11-12.16-15.91a28.75,28.75,0,0,1,.9-10.37q.88-2.86,1.88-5.45a34.72,34.72,0,0,1,2.41-5.1,25.33,25.33,0,0,1,12.51-11.44A11.24,11.24,0,0,0,716.71,373.5Zm2.14,18.06a.85.85,0,0,0-1.25.54q-.54,2.67-1.25,5.36c-.48,1.79-.89,3.64-1.25,5.54a35.73,35.73,0,0,0-.54,6.26,13.12,13.12,0,0,0,1.25,5.9c1.08,1.9,2.12,3,3.13,3.3a6.83,6.83,0,0,0,3.85-.26,10,10,0,0,0,6.43-4.12,58.93,58.93,0,0,0,4.83-7.33,1.55,1.55,0,0,0,.44-.8,4.94,4.94,0,0,1,.45-1.16c-1.67-.72-3.31-1.49-4.91-2.33a31.47,31.47,0,0,1-4.56-2.86A22.67,22.67,0,0,1,718.85,391.56Zm5.54-18.95c.6.24,1.14.48,1.61.72l1.43.71a1.34,1.34,0,0,1,.18,2.32,4.59,4.59,0,0,1-.89,1,4.6,4.6,0,0,0-.9,1c-.83,1-1.43,1.61-1.78,2a2.73,2.73,0,0,0-.72,1.07,2.51,2.51,0,0,0,0,1.34l.54,2.41a22.74,22.74,0,0,0,6.61,12.34,13.36,13.36,0,0,0,6.08,3.75,5.15,5.15,0,0,0,.54-1,7.64,7.64,0,0,1,.35-.8,43.32,43.32,0,0,0,2-12.7,24.22,24.22,0,0,0-1.16-7.5,36.71,36.71,0,0,0-3.13-7c-.36-.47-.72-.95-1.07-1.43a5.17,5.17,0,0,0-1.43-1.25,6.41,6.41,0,0,0-4.2-1.88c-1.25.07-2.42,1.11-3.49,3.13C724.69,371.54,724.51,372.14,724.39,372.61Z"/><path class="cls-2" d="M800.9,419.63a11.29,11.29,0,0,0,3-3.22c.84-1.31,1.58-2.59,2.24-3.85s1.4-2.53,2.23-3.84c.6-1,1.22-1.93,1.88-3s1.28-2,1.88-2.95l.18-.36a6.05,6.05,0,0,1,1.43-.35.58.58,0,0,1,.53.35.77.77,0,0,1,0,.72,17.38,17.38,0,0,0-.27,2,7,7,0,0,1-.44,2q-.9,2.68-2.06,5.28t-2.23,5.09a12.5,12.5,0,0,1-.9,1.79,10.12,10.12,0,0,1-13.76,3.93,19.25,19.25,0,0,1-4.47-3,12.28,12.28,0,0,1-3-4.29c-.36-.95-.72-1.9-1.07-2.86a25.53,25.53,0,0,1-.9-2.86,7.64,7.64,0,0,1-.35-.8,5.52,5.52,0,0,0-.54-1,20.87,20.87,0,0,0-1.43,3.13c-.36,1-.72,2-1.07,2.95q-.9,2.51-1.88,4.83a27.59,27.59,0,0,1-2.41,4.47,3.37,3.37,0,0,0-.63.89,10.57,10.57,0,0,1-.62,1.07l-.9.9a7.64,7.64,0,0,1-1.07.89,8.37,8.37,0,0,1-3.58,1.34,12.35,12.35,0,0,1-3.93-.09A12,12,0,0,1,763,427.4a8.64,8.64,0,0,1-2.86-2.41,35,35,0,0,1-2.77-5.19,16.35,16.35,0,0,1-1.34-5.72c-.12-.83-.21-1.63-.27-2.41a12.1,12.1,0,0,0-.45-2.41,44.61,44.61,0,0,1-.45-9.39q.27-4.72.63-9.38a40.86,40.86,0,0,1,3.22-12.87,23.61,23.61,0,0,1,3-5.55c2.14-3,5.12-4.11,8.93-3.39a5,5,0,0,1,2.51,1.07,3.84,3.84,0,0,1,.71,2.68,23,23,0,0,0-.18,2.86,12.1,12.1,0,0,1-.35,2.86c-.36,2.27-.75,4.47-1.17,6.62s-.8,4.35-1.16,6.61a118.07,118.07,0,0,0-1.61,14.3,71.42,71.42,0,0,0,.72,14.3,6.68,6.68,0,0,0,.53,2.15q.72.36,1,.09l.62-.63c.6-.95,1.16-1.87,1.7-2.77s1-1.81,1.52-2.77a67.2,67.2,0,0,0,4-8.4c1.13-2.86,2.24-5.72,3.31-8.58a7,7,0,0,0,.45-1.88,18.12,18.12,0,0,1,.26-1.88,36.61,36.61,0,0,1,1.79-11.62q1.78-5.54,7.69-5c3.22.12,5.12,1.85,5.72,5.18a21.06,21.06,0,0,1,.18,2.6v2.59q0,2-.18,4.11t-.18,4.29l-.36,6.08c-.12,2-.18,4-.18,6.07a27.29,27.29,0,0,0,.18,3,22.57,22.57,0,0,0,.54,3c.24.72.47,1.41.71,2.06A4.65,4.65,0,0,0,800.9,419.63Z"/></g></g></svg>
\ No newline at end of file
diff --git a/src/assets/imgs/ic_update.svg b/src/assets/imgs/ic_update.svg
new file mode 100644
index 000000000..981e04442
--- /dev/null
+++ b/src/assets/imgs/ic_update.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15px" height="20px" viewBox="0 0 15 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>3691E257-53A8-4FF7-80C1-9DA5285C9C3F</title>
+    <g id="Menu" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="menu-drawer-app-update" transform="translate(-48.000000, -598.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="Group-4" transform="translate(48.000000, 598.000000)">
+                <path d="M7.62896948,4.55186178 L7.62896948,7.28297885 L11.4434542,3.64148942 L7.62896948,-1.42552636e-12 L7.62896948,2.73111707 C3.41396384,2.73111707 7.2146733e-12,5.9902501 7.2146733e-12,10.0140959 C7.2146733e-12,11.4433805 0.438665745,12.7725242 1.18249027,13.8922822 L2.5747772,12.5631385 C2.14564767,11.8075295 1.90724237,10.933572 1.90724237,10.0140959 C1.90724237,7.00076342 4.47248336,4.55186178 7.62896948,4.55186178 Z M13.3629643,6.10771785 L11.9706773,7.43686149 C12.3902707,8.20157427 12.6382122,9.06642801 12.6382122,9.98590409 C12.6382122,12.9992366 10.0729712,15.4481382 6.91648506,15.4481382 L6.91648506,12.7170212 L3.10200032,16.3585106 L6.91648506,20 L6.91648506,17.2688829 C11.1314907,17.2688829 14.5454545,14.0097499 14.5454545,9.98590409 C14.5454545,8.55661949 14.1067888,7.22747585 13.3629643,6.10771785 L13.3629643,6.10771785 Z" id="Update"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/info.svg b/src/assets/imgs/info.svg
new file mode 100644
index 000000000..dbb49ed84
--- /dev/null
+++ b/src/assets/imgs/info.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>909DB988-8F2F-495A-B008-D162FFB6A6E9</title>
+    <g id="Final-layouts" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Home-page-01" transform="translate(-133.000000, -154.000000)" fill="#000000">
+            <g id="Group-11" transform="translate(16.000000, 146.000000)">
+                <g id="Info" transform="translate(117.000000, 8.000000)">
+                    <path d="M5.4,9 L6.6,9 L6.6,5.4 L5.4,5.4 L5.4,9 L5.4,9 Z M6,0 C2.688,0 0,2.688 0,6 C0,9.312 2.688,12 6,12 C9.312,12 12,9.312 12,6 C12,2.688 9.312,0 6,0 L6,0 Z M6,10.8 C3.354,10.8 1.2,8.646 1.2,6 C1.2,3.354 3.354,1.2 6,1.2 C8.646,1.2 10.8,3.354 10.8,6 C10.8,8.646 8.646,10.8 6,10.8 L6,10.8 Z M5.4,4.2 L6.6,4.2 L6.6,3 L5.4,3 L5.4,4.2 L5.4,4.2 Z" id="Mask"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/my-groups-popup.svg b/src/assets/imgs/my-groups-popup.svg
new file mode 100644
index 000000000..ae800bc90
--- /dev/null
+++ b/src/assets/imgs/my-groups-popup.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="329px" height="229px" viewBox="0 0 329 229" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>42BDAA16-B17E-4292-92D0-E1419DDDFA69@2x</title>
+    <defs>
+        <polygon id="path-1" points="0.323367071 0.129195122 54.2412735 0.129195122 54.2412735 52.2400999 0.323367071 52.2400999"></polygon>
+    </defs>
+    <g id="Page-3" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="My-group-popup" transform="translate(-550.000000, -317.000000)">
+            <g id="Groups" transform="translate(550.000000, 317.000000)">
+                <path d="M323.006809,218.454246 C323.006809,224.238565 252.256098,228.927845 164.981228,228.927845 C77.7063587,228.927845 6.95564717,224.238565 6.95564717,218.454246 C6.95564717,212.669927 77.7063587,207.980647 164.981228,207.980647 C252.256098,207.980647 323.006809,212.669927 323.006809,218.454246" id="Fill-1" fill="#000000" opacity="0.101911272"></path>
+                <path d="M275.902495,115.517426 C275.902495,115.517426 282.452254,116.124146 284.520734,121.370866 C286.589214,126.617585 294.970013,125.192945 296.467613,126.595185 C297.965852,127.996785 302.102812,136.163184 301.757852,140.526063 C301.412892,144.888943 302.102812,148.139502 307.274011,148.065262 C312.445211,147.991662 321.75273,145.582703 322.78697,153.681902 C323.821209,161.781101 320.71849,186.943978 310.721051,188.840937 C300.723612,190.739177 326.611609,196.595177 322.975769,205.043816 C319.33929,213.492455 279.005215,216.750694 279.005215,216.750694 L274.523295,119.372146 L275.902495,115.517426 Z" id="Fill-3" fill="#ABB4B7"></path>
+                <g id="Group-7" transform="translate(273.919967, 142.527983)">
+                    <mask id="mask-2" fill="white">
+                        <use xlink:href="#path-1"></use>
+                    </mask>
+                    <g id="Clip-6"></g>
+                    <path d="M11.2399987,31.2762843 C11.2399987,31.2762843 16.571198,31.6314842 16.571198,21.5022054 C16.571198,11.3722866 18.7036778,8.17356703 20.4809576,8.52876698 C22.2582373,8.88460694 23.1465572,22.1882854 24.5679971,19.8900456 C25.9900769,17.5924459 28.7151966,2.30860772 33.1279961,2.84172766 C37.5414355,3.3748476 31.0255963,15.6372461 33.1279961,14.9262062 C35.2310358,14.2158063 44.2940747,-2.66675168 49.8038341,0.531967937 C55.3123134,3.73068756 44.4719947,15.9930861 45.7161546,21.3242855 C46.9603144,26.6554848 52.6467137,21.1463655 54.0687936,23.8119652 C55.4902334,26.4782048 47.8486343,33.586044 41.806395,35.7185237 C35.7641557,37.8510035 43.4057548,41.938683 45.7161546,42.6497229 C48.0265543,43.3607628 45.7161546,50.468602 39.8518352,48.6919622 C33.9868759,46.9153224 31.6649562,48.8308422 13.3724784,51.7134018 C-14.6876782,56.1338813 11.2399987,31.2762843 11.2399987,31.2762843" id="Fill-5" fill="#E6EBED" mask="url(#mask-2)"></path>
+                </g>
+                <path d="M300.152476,184.349866 L315.283354,157.668269 C315.283354,157.668269 299.346716,194.162985 300.152476,184.349866" id="Fill-8" fill="#D5D9DB"></path>
+                <path d="M277.482463,188.884265 C277.482463,188.884265 289.296222,172.598187 296.763741,180.329387 C304.2319,188.060586 297.737821,186.610986 308.939739,189.670825 C320.141018,192.731945 315.758298,205.777703 308.128219,210.287783 C300.4975,214.797862 283.126622,218.562342 280.692063,218.451622 C278.256223,218.341542 277.482463,188.884265 277.482463,188.884265" id="Fill-10" fill="#C7D0D3"></path>
+                <path d="M12.6362225,140.291759 C12.6362225,140.291759 17.4426219,140.922159 23.8170212,157.123757 C30.1914204,173.324075 49.5290181,196.456233 79.8125345,203.044392 C79.8125345,203.044392 91.2787731,183.626794 73.0502953,173.062315 C54.8218175,162.498477 51.9078978,172.250795 35.9610197,156.755117 C20.0135016,141.260079 22.7399013,140.636719 12.6362225,140.291759" id="Fill-12" fill="#C7D0D3"></path>
+                <path d="M33.754364,178.208619 C33.754364,178.208619 -8.99827093,181.000938 4.32652748,206.559975 C17.6506859,232.118372 59.9598009,217.792614 59.9598009,217.792614 L33.754364,178.208619 Z" id="Fill-14" fill="#C7D0D3"></path>
+                <path d="M65.4172082,216.061158 C65.4172082,216.061158 51.0376899,220.599398 41.694331,220.472678 C32.3503321,220.345958 25.464573,220.073318 26.2402529,215.890278 C27.0159328,211.707239 41.1637711,210.940519 34.4322519,208.153319 C27.7007327,205.36612 1.46073583,208.381799 9.55609486,204.08036 C17.6520939,199.77892 30.8994523,199.17924 24.747133,197.8378 C18.5948138,196.497001 2.60761569,197.60548 2.82201566,191.973481 C3.03705564,186.341482 13.0165744,193.495401 13.0306544,187.590122 C13.0440944,181.684202 -0.986623882,183.024362 0.0552959934,174.455403 C1.09721587,165.887084 13.2194544,177.613163 18.0239339,176.719723 C22.8284133,175.826283 13.9656943,163.251565 17.8639339,162.492525 C21.7615334,161.733485 37.7935315,181.120362 39.6373713,177.671403 C41.4812111,174.221803 38.2005714,159.919085 42.118011,162.607725 C46.0354505,165.297644 47.7320903,189.455721 50.8738499,187.974122 C54.0156096,186.492522 58.578809,180.051563 60.6556088,179.976043 C62.7317685,179.900523 65.4172082,216.061158 65.4172082,216.061158" id="Fill-16" fill="#E6EBED"></path>
+                <path d="M65.4172082,216.061158 C88.2805655,227.431397 17.5029739,183.942122 17.5029739,183.942122 C17.5029739,183.942122 60.7868088,213.758439 65.4172082,216.061158" id="Fill-18" fill="#D5D9DB"></path>
+                <path d="M53.5990336,131.797424 C53.5990336,131.797424 56.7593532,140.163503 54.1571135,143.230383 C51.5542339,146.297903 45.7910345,142.487343 45.7910345,142.487343 C45.7910345,142.487343 41.5151951,142.859183 41.3295951,139.605423 C41.1433551,136.352304 43.4671948,138.397744 44.2108747,139.141423 L44.9545546,139.884463 L45.4275146,139.554863 C45.4275146,139.554863 43.6950348,136.723504 44.4137547,134.568624 C45.1318346,132.413744 49.0934341,128.604465 53.5990336,131.797424" id="Fill-20" fill="#F7AA66"></path>
+                <path d="M55.6959294,126.371121 C55.6959294,126.371121 57.2204092,129.904561 55.4847294,131.06168 C53.7490496,132.21816 49.8648901,131.01944 48.7660102,131.65304 C47.6671303,132.28664 49.1039301,133.51224 47.8789703,133.8508 C46.6533704,134.18872 44.4140107,134.56888 44.4140107,134.56888 C44.4140107,134.56888 44.0754507,137.94936 45.5122506,139.132079 L44.9541706,139.884079 C44.9541706,139.884079 42.8671309,136.78328 41.4008911,138.485679 C39.9346512,140.188719 36.1740117,132.11768 38.5823314,130.174 C38.5823314,130.174 37.1672916,128.568881 41.3189711,126.371121 C45.4700106,124.173361 53.6677696,123.201841 55.6959294,126.371121" id="Fill-22" fill="#2D3E50"></path>
+                <polygon id="Fill-24" fill="#F7AA66" points="53.5409216 142.428015 56.6257212 147.456494 53.5409216 149.273454 50.8279619 145.851375 49.0193222 143.569135"></polygon>
+                <path d="M54.2453055,144.423023 L57.8088251,149.393262 L57.5182651,144.842223 C57.5182651,144.842223 55.6270654,143.716463 54.2453055,144.423023" id="Fill-26" fill="#423077"></path>
+                <path d="M44.4334027,153.854254 C45.3786826,156.326573 61.7332406,180.89297 61.7332406,180.89297 L58.2420411,156.181933 L58.1242811,154.346414 L56.6241212,154.944814 L50.715642,145.867695 C50.261882,145.961135 48.6202822,146.498095 49.8849221,149.271854 C49.8849221,149.271854 43.4874828,151.385134 44.4334027,153.854254" id="Fill-28" fill="#423077"></path>
+                <path d="M57.0862652,155.866797 L50.715706,145.867439 C50.7854659,145.853359 50.8270659,145.850159 50.8270659,145.850159 C50.8270659,145.850159 52.8629057,145.133359 54.2453055,144.422959 L58.476985,150.043438 L57.0862652,155.866797 Z" id="Fill-30" fill="#ABEFFF"></path>
+                <path d="M294.156189,104.127412 L291.941789,105.516211 C291.020189,105.305651 290.271389,104.960051 289.682589,104.594612 L289.599389,103.455412 C290.917149,104.512052 292.581789,104.556212 294.156189,104.127412 L294.156189,104.127412 Z M305.580188,107.500851 L302.533788,102.930612 L302.091548,102.265652 L300.568988,102.367412 L297.425949,102.572212 L296.549149,102.629812 L295.570589,102.694452 L295.448989,102.706612 L290.373789,103.040052 L289.592349,103.340852 L289.496989,103.372212 L289.06179,103.538612 L288.56259,103.730612 L287.95459,103.961012 L287.16035,104.716212 C287.07139,104.690612 286.98179,104.672052 286.88579,104.652212 C284.18499,104.134452 278.462751,105.772211 278.462751,105.772211 L280.152351,124.383409 L281.03619,134.080048 L282.22019,132.992048 L287.35235,128.274609 L287.44899,128.178609 L293.803549,122.341809 L294.079389,122.086449 L299.422748,117.17061 L307.237147,109.983411 L305.580188,107.500851 Z" id="Fill-32" fill="#FFBF3A"></path>
+                <path d="M291.941853,105.516147 C291.020253,105.305587 290.271453,104.959987 289.682653,104.595188 L289.599453,103.455348 C290.917213,104.511988 292.581853,104.556148 294.156253,104.127348 L291.941853,105.516147 Z M294.245853,101.689588 L290.988253,101.094388 L290.130653,100.940788 L289.733853,101.900788 L289.330654,102.886388 L289.228254,103.129588 L289.061854,103.538548 L288.869214,104.006388 L287.640414,106.981747 L292.850653,106.981747 L293.618013,105.715187 L294.680413,103.974388 L294.847453,103.698548 L295.448413,102.706548 L295.493853,102.629748 L295.883613,101.989748 L294.245853,101.689588 Z" id="Fill-34" fill="#F7AA66"></path>
+                <polygon id="Fill-36" fill="#F7AA66" points="286.483102 209.870503 287.509022 213.791143 286.776222 217.711142 283.917982 218.786342 283.845022 209.870503"></polygon>
+                <path d="M317.291226,90.3523732 L304.045788,109.754611 L301.203548,104.548852 L314.994266,87.7712535 C314.994266,87.7712535 313.003867,84.182134 313.769307,84.5648539 C314.534747,84.9482139 315.224666,86.2493337 315.530586,85.5606938 C315.837146,84.8714139 316.984666,80.3542944 318.440026,81.9619742 C319.894106,83.569654 320.277466,84.7946139 319.205466,87.1683736 C318.133466,89.5414933 317.291226,90.3523732 317.291226,90.3523732" id="Fill-38" fill="#F7AA66"></path>
+                <polygon id="Fill-40" fill="#EDAB37" points="300.651868 102.297396 300.568668 102.367156 290.994909 111.046835 289.906269 106.981555 289.848669 106.821555 291.942109 105.515955 294.156509 104.127156 294.847709 103.698356 295.935069 103.020596 296.549469 102.630196 297.311069 102.155956 297.951068 102.181556"></polygon>
+                <polygon id="Fill-42" fill="#FEF6EF" points="289.848733 106.821747 289.419933 106.981747 286.463134 108.083187 286.885534 104.652148 287.160734 102.450548 288.472734 102.712948 288.933534 102.803188 289.330334 102.886388 289.560733 102.930548 289.592733 103.340788 289.599133 103.455348 289.682333 104.595188"></polygon>
+                <polygon id="Fill-44" fill="#EDAB37" points="289.419933 106.981747 286.213534 108.332147 286.885534 104.652148 286.463134 108.083187"></polygon>
+                <polygon id="Fill-46" fill="#FEF6EF" points="289.554333 106.438003 289.419933 106.982003 286.463134 108.082803 286.885534 104.652404 287.256734 102.770804 288.223134 102.962804 288.683934 103.052404 289.080734 103.135604 289.311134 103.180404 289.343134 103.590004 289.349534 103.705204 289.432733 104.844404"></polygon>
+                <polygon id="Fill-48" fill="#FEF6EF" points="300.651868 102.297396 300.568668 102.367156 291.083869 110.310195 289.906269 106.981555 289.848669 106.821555 291.942109 105.515955 294.156509 104.127156 294.847709 103.698356 295.935069 103.020596 296.549469 102.630196 297.311069 102.155956 297.951068 102.181556"></polygon>
+                <path d="M301.20246,126.521137 C301.20246,126.521137 301.06166,126.732337 300.81782,127.084337 C299.54486,128.914737 295.359261,134.610736 292.440861,135.052336 C292.184861,135.097136 291.941661,135.097136 291.717661,135.052336 C291.352221,134.981936 291.020061,134.802736 290.725661,134.482736 C289.842461,133.529136 289.163422,132.530736 288.657822,131.596336 L288.657822,131.589936 C288.645662,131.577136 288.645662,131.564336 288.639262,131.557936 C287.928862,130.240176 287.544862,129.049137 287.352222,128.274737 C287.205662,127.711537 287.160862,127.365937 287.160862,127.365937 C287.154462,127.360177 287.154462,127.360177 287.148062,127.353137 C287.000862,127.257137 285.823262,126.457137 285.823262,125.452337 C285.823262,125.157937 285.803422,124.857137 285.797662,124.556337 C285.784862,124.146737 285.791262,123.743537 285.887262,123.378737 L285.887262,123.372337 C285.976862,123.020337 286.149022,122.713137 286.463262,122.463537 C286.616862,122.341937 286.828062,122.214577 287.057822,122.098737 C287.090462,122.085937 287.122462,122.066737 287.160862,122.047537 C287.224862,122.015537 287.282462,121.989937 287.340062,121.970737 C287.410462,121.938737 287.480862,121.913137 287.544862,121.887537 L287.794462,121.810737 C287.852062,121.797937 287.909022,121.785777 287.960862,121.785777 C288.760862,121.631538 289.477661,121.932337 289.228062,123.506737 C289.228062,123.520177 289.228062,123.532337 289.221662,123.545777 C289.196062,123.705777 289.157662,123.884337 289.112222,124.069937 L289.592221,125.689137 C289.592221,125.689137 288.914462,120.396338 294.079261,122.085937 C294.373661,122.181937 294.693661,122.303537 295.032221,122.457137 C295.052061,122.463537 295.057821,122.463537 295.057821,122.463537 L301.20246,126.521137 Z" id="Fill-50" fill="#F7AA66"></path>
+                <path d="M302.911196,98.7961482 C302.584796,101.292148 299.275996,100.697588 299.275996,100.697588 C299.141596,101.075188 298.661596,101.625588 297.951196,102.181748 C297.791197,102.316148 297.611997,102.444148 297.426397,102.572148 C297.061597,102.828788 296.657757,103.077748 296.223197,103.301748 C295.736797,103.564148 295.217757,103.795188 294.680797,103.974388 C294.507997,104.031988 294.335197,104.083188 294.155997,104.127348 C292.581597,104.556148 290.917597,104.511988 289.599197,103.455348 C289.560797,103.436148 289.528797,103.404148 289.496797,103.372148 C289.407197,103.301748 289.317598,103.218548 289.227998,103.129588 C289.125598,103.026548 289.029598,102.917748 288.933598,102.803188 C288.863198,102.719988 288.799198,102.636148 288.735198,102.546548 C288.497758,102.226548 288.287198,101.861748 288.095198,101.439988 C285.727198,96.2297485 288.485598,90.4831892 289.432157,88.7743894 C289.611997,88.4473495 289.727197,88.2687895 289.727197,88.2687895 L300.683996,89.7343893 L299.327196,97.7663883 C299.327196,97.7663883 299.333596,97.7663883 299.339996,97.7599883 C299.346396,97.7529483 299.352156,97.7407883 299.365596,97.7343883 C299.544796,97.5673484 300.325596,96.8441485 300.927196,96.4729485 L300.933596,96.4729485 C301.029596,96.4031885 301.125596,96.3519885 301.221596,96.3199885 C301.259996,96.3007885 301.304796,96.2809485 301.349596,96.2809485 C301.387996,96.2687895 301.419996,96.2617485 301.457756,96.2553485 C301.739996,96.1977485 302.066396,96.2361485 302.341596,96.4409485 C302.367196,96.4665485 302.379996,96.4729485 302.379996,96.4729485 C302.789596,96.7929485 303.083996,97.4905484 302.911196,98.7961482" id="Fill-52" fill="#F7AA66"></path>
+                <path d="M295.060573,116.387378 C295.060573,116.387378 302.508252,116.113458 302.962012,121.745457 C303.415132,127.376817 301.510492,127.083697 300.386652,127.083697 C299.263452,127.083697 295.106653,124.146737 295.060573,122.464817 C295.060573,122.464817 289.837533,121.347378 289.593053,125.691697 C289.593053,125.691697 288.617054,124.343217 289.226974,123.540017 C289.226974,123.540017 289.415133,120.921778 287.159134,122.049457 C284.904414,123.175857 285.751774,125.547057 287.159134,127.365297 L288.658014,131.597616 L288.011614,135.186736 L282.218334,135.826096 L282.218334,122.688177 C282.218334,122.688177 285.685854,121.906737 286.906974,118.878898 C288.128094,115.850418 292.567133,113.359538 295.060573,116.387378" id="Fill-54" fill="#2D3E50"></path>
+                <path d="M288.128734,210.804263 L288.128734,160.919469 L274.263775,158.472109 L279.564895,212.571943 C279.564895,212.571943 286.361054,212.978983 288.128734,210.804263" id="Fill-56" fill="#423077"></path>
+                <path d="M299.113116,90.9292692 C299.113116,90.9292692 289.181598,91.0380691 288.042398,86.9139096 C286.903198,82.7891101 296.887837,83.92895 300.089756,84.6342299 C303.291676,85.3401498 304.648476,87.6191896 304.377116,89.6812693 C304.377116,89.6812693 307.103515,90.4953492 304.411036,93.6428688 L302.381596,96.4742285 C302.381596,96.4742285 301.641116,95.9590286 300.930716,96.4742285 C300.219676,96.9894284 299.330076,97.7676683 299.330076,97.7676683 C299.330076,97.7676683 298.315676,92.583669 299.113116,90.9292692" id="Fill-58" fill="#2D3E50"></path>
+                <path d="M287.508702,213.791143 C287.508702,213.791143 287.288542,216.611622 289.780701,217.271462 C292.271581,217.931302 293.444061,217.784102 293.371101,219.617062 L283.918302,219.617062 L283.918302,216.703782 C283.918302,216.703782 285.896542,217.821222 285.970142,216.703782 C286.043102,215.586342 285.896542,213.791143 285.896542,213.791143 L287.508702,213.791143 Z" id="Fill-60" fill="#423077"></path>
+                <path d="M291.653725,136.383664 L291.602525,137.394864 L291.602525,137.401264 L291.454685,140.415663 L287.192286,139.762863 L287.756126,136.614064 L288.012126,135.186864 L288.031326,135.097264 L288.396126,133.074864 C289.317726,134.342064 290.853725,136.287664 291.653725,136.383664" id="Fill-62" fill="#F7AA66"></path>
+                <path d="M291.762461,134.07992 L291.717661,135.05272 C291.352221,134.98168 291.020061,134.80312 290.725661,134.48312 C289.842461,133.52952 289.163422,132.53048 288.657822,131.59608 L288.657822,131.58968 L288.671262,131.53848 L288.831262,130.63608 L289.343262,131.23832 L291.762461,134.07992 Z" id="Fill-64" fill="#F7AA66"></path>
+                <path d="M297.483101,151.953646 C297.483101,151.953646 298.64598,144.087407 292.624221,138.319088 C286.602462,132.551408 282.217822,135.089008 282.217822,135.089008 L280.637663,162.310125 C280.637663,162.310125 284.660702,164.604524 289.105502,164.079724 L289.748701,153.460846 C289.748701,153.460846 293.419101,153.854446 297.483101,151.953646" id="Fill-66" fill="#88F9FF"></path>
+                <path d="M283.914974,148.348654 C283.914974,148.348654 285.554014,160.147693 290.338653,160.278253 C295.123933,160.409453 295.859933,157.240173 295.884893,152.597614 C295.884893,152.597614 291.452893,153.723374 289.748573,153.460974 C289.748573,153.460974 288.165214,149.724654 286.466014,147.430254 C284.766814,145.136495 288.044254,143.235695 287.192414,141.727855 C286.339934,140.220655 286.143454,138.516335 283.193694,139.237615 C280.244575,139.958255 282.734814,144.218735 283.193694,144.547055 L283.652574,144.874095 L283.914974,148.348654 Z" id="Fill-68" fill="#F7AA66"></path>
+                <path d="M291.602461,137.401136 C291.602461,137.401136 290.226461,139.500335 288.831262,138.386736 C287.436062,137.266736 287.589022,135.033136 287.589022,135.033136 C287.589022,135.033136 291.461661,135.423536 291.602461,137.401136" id="Fill-70" fill="#F7AA66"></path>
+                <path d="M289.105566,107.602995 C288.476446,109.063475 287.785246,110.491955 287.084446,111.914035 C286.390046,113.340594 285.651486,114.742834 284.912286,116.145714 C284.160286,117.540274 283.407006,118.935474 282.610206,120.306994 L281.412126,122.362673 C280.992927,123.036593 280.592287,123.722033 280.155807,124.386993 C280.464287,123.652913 280.809887,122.939313 281.135646,122.214833 L282.175646,120.074674 C282.870686,118.649394 283.608606,117.245874 284.347806,115.844274 C285.101086,114.449714 285.854366,113.055155 286.651806,111.683635 C287.442846,110.309555 288.242846,108.939955 289.105566,107.602995" id="Fill-72" fill="#D6874C"></path>
+                <path d="M294.156189,104.127412 L291.941789,105.516211 C291.020189,105.305651 290.271389,104.960051 289.682589,104.594612 L289.599389,103.455412 C290.917149,104.512052 292.581789,104.556212 294.156189,104.127412" id="Fill-74" fill="#E28F50"></path>
+                <path d="M291.602461,137.401136 C291.602461,137.401136 291.935261,138.340016 291.653661,138.397616 C291.372061,138.454575 291.314461,139.076015 291.057821,139.024815 C290.802461,138.966575 289.210142,139.371055 288.627742,139.544495 C288.044702,139.716655 287.731102,139.115695 287.731102,138.718895 C287.731102,138.321456 287.506462,137.554736 287.052062,137.273136 C286.597662,136.991536 287.275422,136.160176 286.801822,135.826736 C286.328862,135.487536 287.589022,135.033136 287.589022,135.033136 C287.589022,135.033136 287.436062,137.266736 288.831262,138.386736 C290.226461,139.500335 291.602461,137.401136 291.602461,137.401136" id="Fill-76" fill="#FFFFFF"></path>
+                <path d="M61.0106807,219.557414 C58.745721,219.557414 56.9095612,217.721254 56.9095612,215.455654 L56.9095612,78.3420707 C56.9095612,76.0771109 58.745721,74.2403111 61.0106807,74.2403111 L278.528095,74.2403111 C280.793695,74.2403111 282.629854,76.0771109 282.629854,78.3420707 L282.629854,215.455654 C282.629854,217.721254 280.793695,219.557414 278.528095,219.557414 L61.0106807,219.557414 Z" id="Fill-78" fill="#273DAD"></path>
+                <polygon id="Fill-80" fill="#F0F6FA" points="56.9094332 219.557094 282.629726 219.557094 282.629726 95.2620686 56.9094332 95.2620686"></polygon>
+                <path d="M68.3784238,84.6661659 C68.3784238,85.7266458 67.518904,86.5861657 66.4584241,86.5861657 C65.3979442,86.5861657 64.5384243,85.7266458 64.5384243,84.6661659 C64.5384243,83.605686 65.3979442,82.7461661 66.4584241,82.7461661 C67.518904,82.7461661 68.3784238,83.605686 68.3784238,84.6661659" id="Fill-82" fill="#EA3D6A"></path>
+                <path d="M76.8102948,84.6661659 C76.8102948,85.7266458 75.9507749,86.5861657 74.8902951,86.5861657 C73.8298152,86.5861657 72.9702953,85.7266458 72.9702953,84.6661659 C72.9702953,83.605686 73.8298152,82.7461661 74.8902951,82.7461661 C75.9507749,82.7461661 76.8102948,83.605686 76.8102948,84.6661659" id="Fill-83" fill="#FFC53C"></path>
+                <polygon id="Fill-84" fill="#FFFFFF" points="68.3782318 207.928295 271.089248 207.928295 271.089248 105.427187 68.3782318 105.427187"></polygon>
+                <path d="M84.8049819,84.6661659 C84.8049819,85.7266458 83.945462,86.5861657 82.8849821,86.5861657 C81.8245022,86.5861657 80.9649823,85.7266458 80.9649823,84.6661659 C80.9649823,83.605686 81.8245022,82.7461661 82.8849821,82.7461661 C83.945462,82.7461661 84.8049819,83.605686 84.8049819,84.6661659" id="Fill-85" fill="#ABFFA1"></path>
+                <path d="M291.717469,135.0524 L291.653469,136.3836 C290.853469,136.2876 289.31747,134.342 288.39651,133.0748 L288.65827,131.5964 C289.16387,132.5308 289.842269,133.5292 290.725469,134.4828 C291.019869,134.8028 291.352669,134.982 291.717469,135.0524" id="Fill-86" fill="#E28F50"></path>
+                <path d="M55.2815294,162.178029 C55.2815294,162.178029 56.0405693,160.867949 56.8680892,160.591469 C57.6949691,160.316269 58.316409,161.005549 57.9714491,162.178029 C57.6264891,163.350509 56.7170492,165.557228 56.1372093,165.488748 C55.5573694,165.418988 54.9365695,163.902188 55.2815294,162.178029" id="Fill-87" fill="#F7AA66"></path>
+                <path d="M32.9781081,126.250545 C32.9781081,126.250545 33.9918679,119.499826 26.1249889,120.565426 C18.2581098,121.630386 0.763071909,115.508786 6.77011119,98.6684682 C12.7765105,81.8294302 49.6289861,66.928952 52.4955457,89.6131093 C55.3614654,112.296627 38.5345874,101.388468 35.7563477,113.819826 L32.9781081,126.250545 Z" id="Fill-88" fill="#C6E9FF"></path>
+                <path d="M27.0790368,97.4268044 C26.6867168,96.7932045 26.4281568,96.0789645 26.3603169,95.3007246 C26.3315169,94.9116047 26.3641569,94.5090447 26.4691168,94.1103248 C26.5919968,93.7218448 26.7724768,93.3288849 27.0457568,93.0120849 C27.1129568,92.9320849 27.1795168,92.8495249 27.2499168,92.7714449 L27.4822367,92.566005 C27.6364767,92.425845 27.7996767,92.297205 27.9846367,92.189045 C28.3455966,91.966965 28.7756766,91.8018451 29.2345565,91.7538451 C29.6934365,91.7052051 30.1625564,91.7807251 30.5804764,91.930485 C30.9977563,92.080885 31.3843163,92.298485 31.7292762,92.582005 C32.4159961,93.1458449 32.9356761,93.9285648 33.172476,94.8098447 C33.287036,95.2508046 33.325436,95.7135246 33.276156,96.1698445 C33.221116,96.6428045 33.1014361,97.0236044 32.9446361,97.4159244 C32.8620761,97.6079244 32.7718361,97.7948043 32.6726361,97.9759243 L32.5158361,98.2408843 L32.3820761,98.4501643 C32.2111962,98.6805642 32.1196762,98.8968842 32.0543962,99.1138442 C32.0044762,99.3269642 32.0038362,99.5720841 32.1318362,99.8402441 C32.2515162,100.110964 32.4780761,100.381684 32.7423961,100.631284 L32.7513561,100.640244 C32.7897561,100.676084 32.7916761,100.737524 32.7551961,100.775924 C32.7359961,100.797044 32.7091161,100.806644 32.6828761,100.806034 C32.2745562,100.798964 31.8809562,100.665844 31.5071962,100.409844 C31.1449563,100.149364 30.8383963,99.6949641 30.7558363,99.1874442 C30.6598363,98.6863242 30.7443163,98.1762443 30.8985563,97.7640843 L30.9971163,97.4850444 L31.0700763,97.2604044 C31.1180763,97.1119244 31.1615963,96.9634444 31.1961563,96.8136845 C31.3516763,96.1896845 31.4239963,95.7077646 31.3766363,95.1650447 C31.3369563,94.6306447 31.1283163,94.0828048 30.7391963,93.6808848 C30.3526364,93.2808849 29.8137564,92.9884049 29.2998365,92.9820049 C29.0374365,92.9692049 28.7615966,93.0236049 28.4883166,93.1413649 C28.3494366,93.1964049 28.2156766,93.2744849 28.0902367,93.3608849 L27.8943967,93.4869649 L27.7254367,93.6380048 C27.4867167,93.8319248 27.3183967,94.0879248 27.1718368,94.3644048 C27.0451168,94.6498447 26.9606368,94.9660047 26.9305568,95.2994446 C26.8825568,95.9644046 26.9964768,96.6812045 27.2422368,97.3397644 L27.2441568,97.3461644 C27.2620768,97.3935244 27.2377568,97.4472844 27.1897568,97.4652044 C27.1481568,97.4805644 27.1020768,97.4639244 27.0790368,97.4268044" id="Fill-89" fill="#FFFFFF"></path>
+                <polygon id="Fill-90" fill="#B6BDC1" points="250.86685 26.0630369 241.883171 36.2403157 241.883171 16.0822381 254.48349 12.5519985"></polygon>
+                <path d="M34.2878039,101.765556 C34.2878039,102.098356 34.0190039,102.367156 33.686844,102.367156 C33.354684,102.367156 33.0852441,102.098356 33.0852441,101.765556 C33.0852441,101.433396 33.354684,101.164596 33.686844,101.164596 C34.0190039,101.164596 34.2878039,101.433396 34.2878039,101.765556" id="Fill-91" fill="#FFFFFF"></path>
+                <polygon id="Fill-92" fill="#F0F6FA" points="229.743077 6.76300719 241.883235 16.0826861 259.943393 9.69868684 245.279715 20.3841256 250.866914 32.0295642 279.223391 0.000127999985"></polygon>
+                <polygon id="Fill-93" fill="#DDE4E8" points="241.883107 16.0824301 241.883107 36.2405077 245.280227 20.3845096 263.851745 8.16499103"></polygon>
+                <path d="M242.835619,36.2405077 C242.835619,36.2405077 242.128419,36.8945876 240.918179,37.9345875" id="Stroke-94" stroke="#E6EBED" stroke-width="0.639999924"></path>
+                <path d="M236.997476,41.1605071 C230.870116,45.9848265 221.283558,52.5237057 215.090278,51.8273858 C205.38404,50.736186 207.507559,39.5509073 218.858598,37.9144275 C230.209637,36.2773077 227.155557,53.1918657 224.045157,57.2833852 C220.934118,61.3761847 210.567399,69.5598637 179.739883,57.2833852 C164.564844,51.2405059 159.913325,59.7301049 159.062125,69.1451438" id="Stroke-95" stroke="#E6EBED" stroke-width="0.639999924" stroke-dasharray="5.077119524650584,5.077119524650584"></path>
+                <path d="M158.919981,71.6805035 C158.900141,72.5400234 158.905901,73.3963433 158.933421,74.2405031" id="Stroke-96" stroke="#E6EBED" stroke-width="0.639999924"></path>
+                <line x1="117.71813" y1="137.321136" x2="120.04773" y2="138.383536" id="Stroke-97" stroke="#9BB9D3" stroke-width="0.639999924"></line>
+                <line x1="124.650609" y1="140.482991" x2="168.379244" y2="160.427949" id="Stroke-98" stroke="#9BB9D3" stroke-width="0.639999924" stroke-dasharray="5.059199603843695,5.059199603843695"></line>
+                <polyline id="Stroke-99" stroke="#9BB9D3" stroke-width="0.639999924" points="170.68126 161.477997 173.010859 162.539757 175.295659 161.385837"></polyline>
+                <line x1="179.712491" y1="159.154285" x2="221.677926" y2="137.956848" id="Stroke-100" stroke="#9BB9D3" stroke-width="0.639999924" stroke-dasharray="4.94911927288058,4.94911927288058"></line>
+                <line x1="223.886245" y1="136.841136" x2="226.171685" y2="135.686576" id="Stroke-101" stroke="#9BB9D3" stroke-width="0.639999924"></line>
+                <path d="M212.045607,159.353645 L212.045607,159.417645 C212.026407,159.417645 212.006567,159.411245 211.987367,159.411245 C212.006567,159.385645 212.026407,159.366445 212.045607,159.353645" id="Fill-102" fill="#F7AA66"></path>
+                <path d="M186.241834,162.273645 C186.241834,167.108844 183.702954,171.349484 179.888555,173.727723 C177.819435,175.028843 175.367595,175.778283 172.742315,175.778283 C170.682156,175.778283 168.733996,175.318763 166.988716,174.491883 C162.405037,172.335723 159.238317,167.673964 159.238317,162.273645 C159.238317,154.818286 165.281836,148.769006 172.742315,148.769006 C180.198315,148.769006 186.241834,154.818286 186.241834,162.273645" id="Fill-103" fill="#E4EBED"></path>
+                <path d="M184.385002,162.275501 C184.385002,166.08286 182.558442,169.46142 179.739243,171.5843 C179.467883,171.78398 179.193323,171.975979 178.904683,172.155819 C177.119723,173.277099 175.005803,173.919019 172.741483,173.919019 C170.964844,173.919019 169.284204,173.527339 167.778924,172.814379 C167.257324,172.567979 166.761324,172.288939 166.285804,171.967659 C163.153645,169.88702 161.093485,166.32094 161.093485,162.275501 C161.093485,155.844781 166.306284,150.628142 172.741483,150.628142 C179.171563,150.628142 184.385002,155.844781 184.385002,162.275501" id="Fill-104" fill="#E1F9FF"></path>
+                <path d="M170.942508,158.537389 C170.942508,158.537389 173.346987,161.563949 176.608427,159.646509 C176.608427,159.646509 175.527467,166.593068 172.249387,169.783468 C168.970668,172.974507 179.768107,174.446507 178.622507,168.393388 C177.477547,162.340269 180.056107,153.71499 172.867627,153.76491 C165.678508,153.81419 170.942508,158.537389 170.942508,158.537389" id="Fill-105" fill="#2D3E50"></path>
+                <path d="M169.17374,157.917421 C169.17374,157.917421 168.24894,164.7667 172.739819,164.7667 C177.230699,164.7667 176.408939,157.917421 176.408939,157.917421 C176.408939,157.917421 172.955499,153.780462 169.17374,157.917421" id="Fill-106" fill="#F7AA66"></path>
+                <path d="M179.739376,171.575532 L179.739376,171.584492 C179.468011,171.784172 179.192811,171.976171 178.904811,172.155371 C177.119851,173.277291 175.005931,173.919211 172.740971,173.919211 C170.964972,173.919211 169.284332,173.527531 167.779052,172.814571 C167.257452,172.568171 166.761452,172.288491 166.285932,171.967211 C166.285932,171.967211 165.972972,167.171692 170.793452,166.116972 C170.831212,166.104172 170.872812,166.095212 170.915052,166.087532 L170.915052,166.208492 C171.820012,166.896492 172.808171,167.814252 173.012331,168.655852 C173.012331,168.655852 173.579371,167.117292 174.726251,166.070252 C174.739051,166.070252 174.751211,166.074732 174.764011,166.074732 C179.780331,167.012972 179.739376,171.575532 179.739376,171.575532" id="Fill-107" fill="#F47E67"></path>
+                <path d="M174.763755,163.159917 L174.763755,166.032876 C174.750955,166.041836 174.738795,166.053996 174.725995,166.070636 C173.579115,167.117676 173.012715,168.656236 173.012715,168.656236 C172.807915,167.813996 171.819756,166.896876 170.914796,166.208876 L170.914796,163.159917 L174.763755,163.159917 Z" id="Fill-108" fill="#F7AA66"></path>
+                <path d="M174.763755,166.033004 C174.750955,166.041964 174.738795,166.054124 174.725995,166.070764 C173.579115,167.117164 173.012715,168.656364 173.012715,168.656364 C172.807915,167.814124 171.819756,166.897004 170.914796,166.208364" id="Stroke-109" stroke="#E06655" stroke-width="0.639999924"></path>
+                <path d="M174.763755,157.917421 C174.763755,157.917421 172.359915,160.943981 169.098476,159.026541 C169.098476,159.026541 170.178796,165.9731 173.457515,169.1635 C176.736235,172.355179 165.938796,173.827179 167.083756,167.77406 C168.229356,161.720941 165.650796,153.095662 172.839275,153.144942 C180.028395,153.194222 174.763755,157.917421 174.763755,157.917421" id="Fill-110" fill="#2D3E50"></path>
+                <path d="M174.763755,156.623021 C174.763755,156.623021 174.412395,159.878061 176.333675,160.925101 C178.255595,161.971501 178.045675,155.940141 176.622955,155.153582 C175.200235,154.367662 174.763755,156.623021 174.763755,156.623021" id="Fill-111" fill="#2D3E50"></path>
+                <path d="M131.259376,137.204912 C131.259376,142.040111 128.720497,146.280751 124.905457,148.65899 C122.836337,149.96011 120.385138,150.70955 117.759218,150.70955 C115.699698,150.70955 113.751538,150.25003 112.005619,149.42315 C107.422579,147.26699 104.25522,142.605231 104.25522,137.204912 C104.25522,129.749553 110.299379,123.700273 117.759218,123.700273 C125.215217,123.700273 131.259376,129.749553 131.259376,137.204912" id="Fill-112" fill="#E4EBED"></path>
+                <path d="M129.403121,137.204912 C129.403121,141.375791 127.213681,145.032111 123.922801,147.08459 C122.137841,148.20587 120.023922,148.85291 117.759602,148.85291 C115.982322,148.85291 114.301682,148.45675 112.796403,147.74379 C108.843123,145.883951 106.110963,141.862831 106.110963,137.204912 C106.110963,130.774192 111.324403,125.556913 117.759602,125.556913 C124.189681,125.556913 129.403121,130.774192 129.403121,137.204912" id="Fill-113" fill="#E1F9FF"></path>
+                <path d="M119.727474,141.754927 L119.727474,145.211567 L116.691954,145.211567 L116.691954,141.633967 C117.370994,141.909167 118.539634,142.217647 119.727474,141.754927" id="Fill-114" fill="#F7AA66"></path>
+                <path d="M120.911858,140.103023 C120.604018,140.578543 120.211058,140.970223 119.727218,141.229423 C119.331058,141.441903 118.872178,141.562863 118.342898,141.562863 C117.697138,141.562863 117.150578,141.383663 116.691698,141.079023 C116.266098,140.799983 115.912178,140.411503 115.619698,139.957103 C114.131058,137.659504 114.202098,133.718384 114.202098,133.718384 L122.205297,133.718384 C122.205297,133.718384 122.421617,137.834864 120.911858,140.103023" id="Fill-115" fill="#F7AA66"></path>
+                <path d="M121.17061,143.823023 C120.86597,144.523823 120.13253,145.512623 118.44741,145.512623 C116.60357,145.512623 115.93669,144.452783 115.70309,143.835823 C115.76197,143.802543 115.82405,143.769263 115.88677,143.744303 C116.22085,143.572783 116.57477,143.439663 116.94213,143.339183 L116.94597,143.339183 C117.42533,143.210543 117.93029,143.139503 118.44741,143.139503 C118.78469,143.139503 119.11877,143.168943 119.44453,143.226543 L119.45221,143.226543 L119.46053,143.231023 C119.99877,143.323183 120.51205,143.493423 120.98693,143.727663 C121.04965,143.760303 121.11237,143.789743 121.17061,143.823023" id="Fill-116" fill="#F7AA66"></path>
+                <path d="M123.923121,147.08427 C122.138161,148.20619 120.023602,148.85323 117.759282,148.85323 C115.982642,148.85323 114.302002,148.45707 112.796083,147.74347 C113.130163,146.121071 114.139442,144.749551 115.523762,143.939951 C115.582642,143.902191 115.640882,143.869551 115.702962,143.835631 C115.936562,144.453231 116.603442,145.512431 118.447282,145.512431 C120.132402,145.512431 120.866482,144.523631 121.170482,143.822831 C121.233202,143.856751 121.291442,143.890031 121.354162,143.931631 C121.783601,144.173551 122.179761,144.478191 122.529841,144.828911 C123.155761,145.453551 123.639601,146.220911 123.923121,147.08427" id="Fill-117" fill="#6796F4"></path>
+                <path d="M122.804337,136.992368 C122.804337,136.992368 126.203377,128.623729 118.360178,128.623729 C110.516339,128.623729 114.200818,137.921008 114.200818,137.921008 C117.069938,137.803248 117.757298,133.505648 117.757298,133.505648 C117.761138,134.872048 118.671218,135.898608 120.596978,135.715568 C122.523377,135.531888 122.804337,136.992368 122.804337,136.992368" id="Fill-118" fill="#2D3E50"></path>
+                <path d="M117.71813,137.321136 C117.71813,138.223536 116.98661,138.955055 116.08421,138.955055 C115.18181,138.955055 114.45029,138.223536 114.45029,137.321136 C114.45029,136.418736 115.18181,135.686576 116.08421,135.686576 C116.98661,135.686576 117.71813,136.418736 117.71813,137.321136" id="Fill-119" fill="#CCF5FF"></path>
+                <path d="M122.198705,137.553648 C122.198705,138.456047 121.466546,139.187567 120.564146,139.187567 C119.661746,139.187567 118.930866,138.456047 118.930866,137.553648 C118.930866,136.651248 119.661746,135.919088 120.564146,135.919088 C121.466546,135.919088 122.198705,136.651248 122.198705,137.553648" id="Fill-120" fill="#CCF5FF"></path>
+                <path d="M121.354354,143.931759 C121.258354,144.269039 120.707314,145.704559 118.447474,145.720559 L118.413554,145.720559 C116.233074,145.720559 115.619954,144.244079 115.523954,143.940079 C115.582194,143.902319 115.640434,143.869039 115.703154,143.835759 C115.762034,143.802479 115.824114,143.769199 115.886834,143.744239 C115.895154,143.757039 115.899634,143.769199 115.902834,143.781999 C115.924594,143.847919 116.332914,145.303919 118.413554,145.303919 L118.447474,145.303919 C120.636914,145.286639 120.953714,143.844079 120.966514,143.781999 C120.970354,143.760239 120.974194,143.744239 120.986994,143.727599 C121.049074,143.760239 121.112434,143.789679 121.170674,143.822959 C121.233394,143.856879 121.290994,143.890159 121.354354,143.931759" id="Fill-121" fill="#2260C4"></path>
+                <path d="M119.727474,141.229295 L119.727474,141.754735 C118.539634,142.217455 117.370994,141.908975 116.691954,141.633775 L116.691954,141.079535 C117.150834,141.383535 117.696754,141.562735 118.343154,141.562735 C118.872434,141.562735 119.331314,141.441775 119.727474,141.229295" id="Fill-122" fill="#D1854B"></path>
+                <path d="M238.991844,135.381744 C238.991844,140.216943 236.452964,144.457583 232.637924,146.835822 C230.568805,148.136942 228.117605,148.886382 225.491685,148.886382 C223.432165,148.886382 221.484006,148.426862 219.738086,147.599982 C215.155046,145.443823 211.987687,140.782063 211.987687,135.381744 C211.987687,127.926385 218.031846,121.877105 225.491685,121.877105 C232.947684,121.877105 238.991844,127.926385 238.991844,135.381744" id="Fill-123" fill="#E4EBED"></path>
+                <path d="M237.135588,135.381744 C237.135588,139.552623 234.946148,143.209583 231.655268,145.262063 C229.870309,146.382703 227.756389,147.029742 225.492069,147.029742 C223.714789,147.029742 222.03415,146.633583 220.52887,145.920623 C216.57559,144.060783 213.843431,140.039663 213.843431,135.381744 C213.843431,128.951025 219.05687,123.734385 225.492069,123.734385 C231.922148,123.734385 237.135588,128.951025 237.135588,135.381744" id="Fill-124" fill="#E1F9FF"></path>
+                <path d="M227.459941,139.931759 L227.459941,143.389039 L224.424421,143.389039 L224.424421,139.810799 C225.103461,140.085999 226.272101,140.395119 227.459941,139.931759" id="Fill-125" fill="#F7AA66"></path>
+                <path d="M228.644325,138.280496 C228.336485,138.755375 227.943525,139.147695 227.459685,139.406255 C227.063525,139.619375 226.604645,139.739695 226.075365,139.739695 C225.429605,139.739695 224.883045,139.560495 224.424165,139.255855 C223.998565,138.976815 223.644645,138.588335 223.352165,138.133936 C221.863526,135.836336 221.934566,131.895216 221.934566,131.895216 L229.937765,131.895216 C229.937765,131.895216 230.154085,136.011696 228.644325,138.280496" id="Fill-126" fill="#F7AA66"></path>
+                <path d="M228.903077,142.000495 C228.598437,142.701295 227.864997,143.689455 226.179877,143.689455 C224.336677,143.689455 223.669157,142.629615 223.435557,142.013295 C223.494437,141.979375 223.556517,141.946095 223.619237,141.921135 C223.953317,141.749615 224.307237,141.616495 224.674597,141.516655 L224.678437,141.516655 C225.157797,141.387375 225.662757,141.316335 226.179877,141.316335 C226.517157,141.316335 226.851237,141.345775 227.176997,141.403375 L227.184677,141.403375 L227.192997,141.407855 C227.731237,141.500015 228.244517,141.670255 228.719397,141.904495 C228.782757,141.937135 228.844837,141.966575 228.903077,142.000495" id="Fill-127" fill="#F7AA66"></path>
+                <path d="M231.655588,145.261743 C229.870629,146.383023 227.756069,147.030062 225.491749,147.030062 C223.715109,147.030062 222.03447,146.633903 220.52855,145.920303 C220.86263,144.297903 221.87191,142.926383 223.256229,142.116783 C223.315109,142.079023 223.373349,142.046383 223.435429,142.013103 C223.669029,142.630063 224.336549,143.689263 226.179749,143.689263 C227.864869,143.689263 228.598949,142.701103 228.902949,142.000303 C228.965669,142.033583 229.024549,142.066863 229.086629,142.108463 C229.516069,142.350383 229.912229,142.655023 230.262309,143.005743 C230.888228,143.631023 231.372068,144.397743 231.655588,145.261743" id="Fill-128" fill="#F28C68"></path>
+                <path d="M229.086821,142.108655 C228.990821,142.446575 228.439781,143.881455 226.179941,143.898095 L226.146021,143.898095 C223.965541,143.898095 223.352421,142.420975 223.256421,142.116975 C223.314661,142.079215 223.372901,142.045935 223.435621,142.013295 C223.494501,141.979375 223.556581,141.946095 223.619301,141.921135 C223.627621,141.933935 223.632101,141.946095 223.635941,141.958895 C223.657061,142.025455 224.065381,143.480815 226.146021,143.480815 L226.179941,143.480815 C228.369381,143.464175 228.686181,142.020975 228.698981,141.958895 C228.702821,141.937135 228.706661,141.921135 228.719461,141.904495 C228.782181,141.937135 228.844901,141.966575 228.903141,142.000495 C228.965861,142.033775 229.024101,142.067055 229.086821,142.108655" id="Fill-129" fill="#D15443"></path>
+                <path d="M227.459941,139.406127 L227.459941,139.931567 C226.272101,140.394927 225.103461,140.085807 224.424421,139.810607 L224.424421,139.256367 C224.883301,139.560367 225.429221,139.739567 226.075621,139.739567 C226.604901,139.739567 227.063781,139.619247 227.459941,139.406127" id="Fill-130" fill="#D1854B"></path>
+                <path d="M230.015589,130.678 C230.015589,130.678 229.399269,134.1724 222.14359,134.1212 C222.14359,134.1212 218.74263,132.07576 222.00151,130.08088 C225.259109,128.086641 230.057189,127.664881 230.015589,130.678" id="Fill-131" fill="#2D3E50"></path>
+                <path d="M228.243109,131.311152 C228.243109,131.311152 229.231909,135.657392 230.628389,134.493872 C232.024228,133.330352 230.964388,129.304113 229.807269,129.688753 C228.650149,130.072112 228.243109,131.311152 228.243109,131.311152" id="Fill-132" fill="#2D3E50"></path>
+                <polygon id="Fill-133" fill="#DAE1EE" points="122.870385 184.056938 222.607973 184.056938 222.607973 181.496938 122.870385 181.496938"></polygon>
+                <polygon id="Fill-134" fill="#DAE1EE" points="149.742062 189.023337 195.736937 189.023337 195.736937 186.463338 149.742062 186.463338"></polygon>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/my_group.svg b/src/assets/imgs/my_group.svg
new file mode 100644
index 000000000..54f82fc9f
--- /dev/null
+++ b/src/assets/imgs/my_group.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="18px" viewBox="0 0 20 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 63.1 (101010) - https://sketch.com -->
+    <title>2E7F952D-E82B-4780-8DA3-06CA040194F0mdpi/</title>
+    <desc>Created with sketchtool.</desc>
+    <g id="Schooling-@-home" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Menu" transform="translate(-18.000000, -155.000000)" fill="#024F9D" fill-rule="nonzero">
+            <g transform="translate(16.000000, 152.000000)" id="Users-and-Groups">
+                <g>
+                    <g id="My-Class" transform="translate(2.000000, 3.000000)">
+                        <path d="M2.50917914,1.96375167 C2.21331232,1.96375167 1.97346486,2.2090502 1.97346486,2.51164127 L1.97346486,15.4883587 C1.97346486,15.7909498 2.21331232,16.0362483 2.50917914,16.0362483 L17.4908209,16.0362483 C17.7866877,16.0362483 18.0265351,15.7909498 18.0265351,15.4883587 L18.0265351,2.51164127 C18.0265351,2.2090502 17.7866877,1.96375167 17.4908209,1.96375167 L2.50917914,1.96375167 Z M2.50917914,0.137452964 L17.4908209,0.137452964 C18.7729104,0.137452964 19.8122494,1.20041327 19.8122494,2.51164127 L19.8122494,15.4883587 C19.8122494,16.7995867 18.7729104,17.862547 17.4908209,17.862547 L2.50917914,17.862547 C1.22708955,17.862547 0.187750578,16.7995867 0.187750578,15.4883587 L0.187750578,2.51164127 C0.187750578,1.20041327 1.22708955,0.137452964 2.50917914,0.137452964 Z M11.9642857,14.8441559 L15.8928571,14.8441559 L15.8928571,15.7573052 L11.9642857,15.7573052 L11.9642857,14.8441559 Z M12.8569176,12.1960227 L7.14263192,12.1960227 L7.14263192,11.830763 C7.14263192,10.3178076 8.3418692,9.09131494 9.82120336,9.09131494 L10.1783462,9.09131494 C11.6576804,9.09131494 12.8569176,10.3178076 12.8569176,11.830763 L12.8569176,12.1960227 Z M9.99977478,8.7260552 C9.21079656,8.7260552 8.57120336,8.07192577 8.57120336,7.26501623 C8.57120336,6.4581067 9.21079656,5.80397727 9.99977478,5.80397727 C10.788753,5.80397727 11.4283462,6.4581067 11.4283462,7.26501623 C11.4283462,8.07192577 10.788753,8.7260552 9.99977478,8.7260552 Z M6.78548906,12.0133929 L3.86029752,12.0133929 L3.86029752,11.7351497 C3.86029752,10.5826286 4.77383814,9.64832568 5.90074764,9.64832568 L6.17280764,9.64832568 C6.61057304,9.64832568 7.01613992,9.78931704 7.34846314,10.0293218 C6.99401416,10.537309 6.78548906,11.1591307 6.78548906,11.830763 L6.78548906,12.0133929 Z M13.2140605,12.0133929 L13.2140605,11.830763 C13.2140605,11.1585176 13.0051545,10.5361737 12.6501153,10.0279308 C12.9823972,9.78877252 13.3876313,9.64832568 13.8249703,9.64832568 L14.0972918,9.64832568 C15.2252841,9.64832568 16.1397025,10.5826286 16.1397025,11.7351497 L16.1397025,12.0133929 L13.2140605,12.0133929 Z M6.03677764,9.37008248 C5.43575924,9.37008248 4.94853758,8.8717876 4.94853758,8.25710969 C4.94853758,7.6424318 5.43575924,7.1441369 6.03677764,7.1441369 C6.63779602,7.1441369 7.1250177,7.6424318 7.1250177,8.25710969 C7.1250177,8.8717876 6.63779602,9.37008248 6.03677764,9.37008248 Z M13.9611311,9.37008248 C13.3595352,9.37008248 12.8718453,8.8717876 12.8718453,8.25710969 C12.8718453,7.6424318 13.3595352,7.1441369 13.9611311,7.1441369 C14.5627269,7.1441369 15.0504168,7.6424318 15.0504168,8.25710969 C15.0504168,8.8717876 14.5627269,9.37008248 13.9611311,9.37008248 Z" id="Shape"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/no_activity.svg b/src/assets/imgs/no_activity.svg
new file mode 100644
index 000000000..e4e50c8d7
--- /dev/null
+++ b/src/assets/imgs/no_activity.svg
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="422px" height="229px" viewBox="0 0 422 229" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>99B4AAF3-8D2C-4D48-97CA-B9AEC20D2D2A@2x</title>
+    <defs>
+        <polygon id="path-1" points="0.323367071 0.129195122 54.2412735 0.129195122 54.2412735 52.2400999 0.323367071 52.2400999"></polygon>
+    </defs>
+    <g id="Page-3" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Specific-Group_-Empty-state" transform="translate(-354.000000, -437.000000)">
+            <g id="add-activity" transform="translate(354.000000, 438.000000)">
+                <g id="Group-135" transform="translate(0.000000, 65.000000)">
+                    <path d="M422,149 C422,156.731867 327.53175,163 211,163 C94.4682502,163 0,156.731867 0,149 C0,141.268133 94.4682502,135 211,135 C327.53175,135 422,141.268133 422,149" id="Fill-1" fill="#CBDAE5"></path>
+                    <path d="M316.902495,44.5174262 C316.902495,44.5174262 323.452254,45.1241462 325.520734,50.3708655 C327.589214,55.6175849 335.970013,54.1929451 337.467613,55.5951849 C338.965852,56.9967847 343.102812,65.1631838 342.757852,69.5260632 C342.412892,73.8889427 343.102812,77.1395023 348.274011,77.0652623 C353.445211,76.9916624 362.75273,74.5827026 363.78697,82.6819017 C364.821209,90.7811007 361.71849,115.943978 351.721051,117.840937 C341.723612,119.739177 367.611609,125.595177 363.975769,134.043816 C360.33929,142.492455 320.005215,145.750694 320.005215,145.750694 L315.523295,48.3721458 L316.902495,44.5174262 Z" id="Fill-3" fill="#ABB4B7"></path>
+                    <g id="Group-7" transform="translate(314.919967, 71.527983)">
+                        <mask id="mask-2" fill="white">
+                            <use xlink:href="#path-1"></use>
+                        </mask>
+                        <g id="Clip-6"></g>
+                        <path d="M11.2399987,31.2762843 C11.2399987,31.2762843 16.571198,31.6314842 16.571198,21.5022054 C16.571198,11.3722866 18.7036778,8.17356703 20.4809576,8.52876698 C22.2582373,8.88460694 23.1465572,22.1882854 24.5679971,19.8900456 C25.9900769,17.5924459 28.7151966,2.30860772 33.1279961,2.84172766 C37.5414355,3.3748476 31.0255963,15.6372461 33.1279961,14.9262062 C35.2310358,14.2158063 44.2940747,-2.66675168 49.8038341,0.531967937 C55.3123134,3.73068756 44.4719947,15.9930861 45.7161546,21.3242855 C46.9603144,26.6554848 52.6467137,21.1463655 54.0687936,23.8119652 C55.4902334,26.4782048 47.8486343,33.586044 41.806395,35.7185237 C35.7641557,37.8510035 43.4057548,41.938683 45.7161546,42.6497229 C48.0265543,43.3607628 45.7161546,50.468602 39.8518352,48.6919622 C33.9868759,46.9153224 31.6649562,48.8308422 13.3724784,51.7134018 C-14.6876782,56.1338813 11.2399987,31.2762843 11.2399987,31.2762843" id="Fill-5" fill="#FFFFFF" mask="url(#mask-2)"></path>
+                    </g>
+                    <path d="M341.152476,113.349866 L356.283354,86.6682692 C356.283354,86.6682692 340.346716,123.162985 341.152476,113.349866" id="Fill-8" fill="#D5D9DB"></path>
+                    <path d="M318.482463,117.884265 C318.482463,117.884265 330.296222,101.598187 337.763741,109.329387 C345.2319,117.060586 338.737821,115.610986 349.939739,118.670825 C361.141018,121.731945 356.758298,134.777703 349.128219,139.287783 C341.4975,143.797862 324.126622,147.562342 321.692063,147.451622 C319.256223,147.341542 318.482463,117.884265 318.482463,117.884265" id="Fill-10" fill="#C7D0D3"></path>
+                    <path d="M53.6362225,69.2917593 C53.6362225,69.2917593 58.4426219,69.9221592 64.8170212,86.1237573 C71.1914204,102.324075 90.5290181,125.456233 120.812534,132.044392 C120.812534,132.044392 132.278773,112.626794 114.050295,102.062315 C95.8218175,91.4984766 92.9078978,101.250795 76.9610197,85.7551173 C61.0135016,70.2600792 63.7399013,69.6367192 53.6362225,69.2917593" id="Fill-12" fill="#C7D0D3"></path>
+                    <path d="M74.754364,107.208619 C74.754364,107.208619 32.0017291,110.000938 45.3265275,135.559975 C58.6506859,161.118372 100.959801,146.792614 100.959801,146.792614 L74.754364,107.208619 Z" id="Fill-14" fill="#C7D0D3"></path>
+                    <path d="M106.417208,145.061158 C106.417208,145.061158 92.0376899,149.599398 82.694331,149.472678 C73.3503321,149.345958 66.464573,149.073318 67.2402529,144.890278 C68.0159328,140.707239 82.1637711,139.940519 75.4322519,137.153319 C68.7007327,134.36612 42.4607358,137.381799 50.5560949,133.08036 C58.6520939,128.77892 71.8994523,128.17924 65.747133,126.8378 C59.5948138,125.497001 43.6076157,126.60548 43.8220157,120.973481 C44.0370556,115.341482 54.0165744,122.495401 54.0306544,116.590122 C54.0440944,110.684202 40.0133761,112.024362 41.055296,103.455403 C42.0972159,94.8870842 54.2194544,106.613163 59.0239339,105.719723 C63.8284133,104.826283 54.9656943,92.2515645 58.8639339,91.4925246 C62.7615334,90.7334847 78.7935315,110.120362 80.6373713,106.671403 C82.4812111,103.221803 79.2005714,88.9190849 83.118011,91.6077246 C87.0354505,94.2976443 88.7320903,118.455721 91.8738499,116.974122 C95.0156096,115.492522 99.578809,109.051563 101.655609,108.976043 C103.731769,108.900523 106.417208,145.061158 106.417208,145.061158" id="Fill-16" fill="#FFFFFF"></path>
+                    <path d="M106.417208,145.061158 C129.280565,156.431397 58.5029739,112.942122 58.5029739,112.942122 C58.5029739,112.942122 101.786809,142.758439 106.417208,145.061158" id="Fill-18" fill="#D5D9DB"></path>
+                    <path d="M102.010681,148.557414 C99.745721,148.557414 97.9095612,146.721254 97.9095612,144.455654 L97.9095612,7.34207066 C97.9095612,5.07711093 99.745721,3.24031115 102.010681,3.24031115 L319.528095,3.24031115 C321.793695,3.24031115 323.629854,5.07711093 323.629854,7.34207066 L323.629854,144.455654 C323.629854,146.721254 321.793695,148.557414 319.528095,148.557414 L102.010681,148.557414 Z" id="Fill-78" fill="#273DAD"></path>
+                    <polygon id="Fill-80" fill="#F0F6FA" points="97.9094332 148.557094 323.629726 148.557094 323.629726 24.2620686 97.9094332 24.2620686"></polygon>
+                    <path d="M109.378424,13.6661659 C109.378424,14.7266458 108.518904,15.5861657 107.458424,15.5861657 C106.397944,15.5861657 105.538424,14.7266458 105.538424,13.6661659 C105.538424,12.605686 106.397944,11.7461661 107.458424,11.7461661 C108.518904,11.7461661 109.378424,12.605686 109.378424,13.6661659" id="Fill-82" fill="#EA3D6A"></path>
+                    <path d="M117.810295,13.6661659 C117.810295,14.7266458 116.950775,15.5861657 115.890295,15.5861657 C114.829815,15.5861657 113.970295,14.7266458 113.970295,13.6661659 C113.970295,12.605686 114.829815,11.7461661 115.890295,11.7461661 C116.950775,11.7461661 117.810295,12.605686 117.810295,13.6661659" id="Fill-83" fill="#FFC53C"></path>
+                    <polygon id="Fill-84" fill="#FFFFFF" points="109.378232 136.928295 312.089248 136.928295 312.089248 34.4271874 109.378232 34.4271874"></polygon>
+                    <path d="M301.53282,130 L119.46718,130 C117.552141,130 116,128.553263 116,126.769473 L116,48.2305266 C116,46.4456606 117.552141,45 119.46718,45 L301.53282,45 C303.447281,45 305,46.4456606 305,48.2305266 L305,126.769473 C305,128.553263 303.447281,130 301.53282,130 Z" id="Stroke-15" stroke="#9BB9D3" stroke-width="0.607999956" stroke-dasharray="4.863999649047855"></path>
+                    <path d="M125.804982,13.6661659 C125.804982,14.7266458 124.945462,15.5861657 123.884982,15.5861657 C122.824502,15.5861657 121.964982,14.7266458 121.964982,13.6661659 C121.964982,12.605686 122.824502,11.7461661 123.884982,11.7461661 C124.945462,11.7461661 125.804982,12.605686 125.804982,13.6661659" id="Fill-85" fill="#ABFFA1"></path>
+                    <path d="M199.919981,0.680503455 C199.900141,1.54002335 199.905901,2.39634325 199.933421,3.24050315" id="Stroke-96" stroke="#E6EBED" stroke-width="0.639999924"></path>
+                    <path d="M253.045607,88.353645 L253.045607,88.417645 C253.026407,88.417645 253.006567,88.411245 252.987367,88.411245 C253.006567,88.385645 253.026407,88.366445 253.045607,88.353645" id="Fill-102" fill="#F7AA66"></path>
+                </g>
+                <g id="Group-12" transform="translate(41.000000, 73.000000)">
+                    <path d="M37.5274196,138.865346 L37.5274196,142.611746 C37.5274196,142.611746 36.0794196,143.114146 31.7802199,146.409346 C30.8586199,147.115746 25.5690203,148.950145 25.2802203,148.518145 C24.9922203,148.086146 22.6466204,142.033346 26.2890202,142.178946 C32.9866198,142.446946 32.9170198,138.865346 32.9170198,138.865346 L37.5274196,138.865346 Z" id="Fill-26" fill="#2D2B37"></path>
+                    <polygon id="Fill-27" fill="#F7AA66" points="32.7590198 134.321586 32.9166198 138.865586 37.5270196 138.865586 38.5758195 132.953586"></polygon>
+                    <polygon id="Fill-28" fill="#F7AA66" points="57.6649384 135.198146 57.5073384 139.741346 52.8969386 139.741346 51.8481387 133.829346"></polygon>
+                    <path d="M57.9582983,137.741906 L52.4478987,137.883506 C50.7518988,136.747506 46.849499,107.964308 46.849499,107.964308 C46.849499,107.964308 47.9766989,103.725108 42.6014992,95.6363086 C37.2246996,87.5571091 36.3710996,74.5075099 36.3710996,74.5075099 C36.9390996,81.8667095 36.6910996,96.5371086 36.6910996,96.5371086 L39.3806994,136.974706 L39.1182995,137.063506 C36.8678996,137.825906 34.4422997,137.907506 32.1462999,137.297106 C31.8662999,135.305106 23.9447004,97.1539085 23.9447004,97.1539085 C21.5847005,87.3291091 23.3943004,78.6115097 22.6423004,71.4035101 C22.4823004,69.9235102 22.3551005,68.5475103 22.2503005,67.2755103 C22.2503005,67.2755103 36.6582996,71.3475101 45.4030991,64.4195105 C45.7302991,65.8835104 46.098299,67.4835103 46.491099,69.1795102 C48.6742989,78.6267097 51.7870987,86.9555092 54.6350985,94.2195087 C59.7302982,107.226708 57.9582983,137.741906 57.9582983,137.741906" id="Fill-30" fill="#9ABFC3"></path>
+                    <path d="M45.4027791,64.3950305 L45.4027791,64.4190305 C36.6587796,71.3470301 22.2507805,67.2758303 22.2507805,67.2758303 L22.0187805,63.8910305 C33.0667798,67.4510303 41.4827793,63.9790305 44.8907791,62.0910306 C45.0187805,62.0270306 45.1387791,61.9630306 45.2507791,61.8990306 L45.4027791,64.3950305 Z" id="Fill-31" fill="#2D2B37"></path>
+                    <path d="M72.6266175,44.2458317 L72.3786175,45.3018316 L72.3226175,45.5418316 L71.3146175,49.7970314 L71.1226175,50.5970313 L70.9946176,51.1258313 L70.7786176,52.0458312 C70.7786176,52.0458312 60.8746182,49.4058314 59.4826182,48.4778314 C58.0986183,47.5578315 47.6746189,40.1258319 47.6746189,40.1258319 L45.2506191,61.9018306 C45.1386191,61.9650306 45.0186191,62.0290306 44.8906191,62.0938306 C41.4826193,63.9818305 33.0666198,67.4538303 22.0186205,63.8938305 L21.7786205,60.4538307 L21.7466205,59.8938308 L20.4746206,37.4458321 L20.4746206,31.3018325 C20.4746206,31.3018325 27.4906201,21.4378331 44.8906191,23.6290329 C48.3866189,24.0778329 57.1386184,38.581832 62.5706181,40.2458319 C68.0026177,41.9178318 72.6266175,44.2458317 72.6266175,44.2458317" id="Fill-32" fill="#DF5F4D"></path>
+                    <path d="M91.5586163,29.0489526 L89.2706165,35.5129522 L85.7106167,45.5449516 L57.2786184,125.712947 L56.8626184,126.880947 L56.0946184,128.144947 L56.0866184,128.144947 L52.3986187,130.704947 L52.3986187,127.504947 L49.5506188,129.872947 L49.5506188,126.321747 L47.6786189,127.625747 L47.6786189,123.304947 L49.2546189,119.097747 L77.8306171,42.8089518 L81.8066169,32.1849524 L84.1666168,25.8809528 C85.3666167,22.672953 86.9666166,22.529753 90.0306164,24.1129529 C93.0946162,25.6977528 91.5586163,29.0489526 91.5586163,29.0489526" id="Fill-33" fill="#FF849E"></path>
+                    <polygon id="Fill-34" fill="#FFA944" points="56.0867784 128.145027 47.270779 142.601026 45.0467791 141.353826 47.6787789 123.305027 47.6787789 127.625827 49.5507788 126.321827 49.5507788 129.873027 52.3987787 127.505027 52.3987787 130.705027"></polygon>
+                    <path d="M89.2707765,35.5130322 L88.5747765,37.4730321 L88.2947765,38.2730321 L87.6147766,40.1850324 L87.3347766,40.9770319 L86.7907766,42.5050318 L86.5027766,43.3130318 L85.7107767,45.5450316 C84.2067768,44.4730317 81.7187769,43.2650318 77.8307771,42.8090318 L78.8227771,40.1538319 L79.1107771,39.385032 L79.678777,37.8578321 L79.974777,37.0810321 L80.766777,34.9690323 L81.054777,34.1850324 L81.8067769,32.1850324 C82.9507768,32.3050324 84.3267768,32.6898324 85.9507767,33.4970323 C87.3667766,34.2090323 88.4467765,34.8898323 89.2707765,35.5130322" id="Fill-35" fill="#E4DCEA"></path>
+                    <polygon id="Fill-36" fill="#131116" points="47.270779 142.601346 44.1027792 147.801346 45.0467791 141.353346"></polygon>
+                    <path d="M86.7906966,42.5051918 L86.5026966,43.3131918 C83.5186968,40.9371919 80.318697,40.3219919 78.8226971,40.1539919 L79.1106971,39.385192 C80.734697,39.577192 83.8146968,40.2331919 86.7906966,42.5051918" id="Fill-37" fill="#1C1C1C"></path>
+                    <path d="M87.6145366,40.1848719 L87.3345366,40.9768719 C84.3505368,38.633672 81.1665369,38.0168721 79.678537,37.8576721 L79.974537,37.0808721 C81.5985369,37.2728721 84.6545367,37.9368721 87.6145366,40.1848719" id="Fill-38" fill="#1C1C1C"></path>
+                    <path d="M88.5746965,37.4731921 L88.2946965,38.2731921 C85.4866967,35.9371922 82.4466969,35.2011922 80.766697,34.9691923 L81.054697,34.1851923 C82.8146969,34.4571923 85.766697,35.2171922 88.5746965,37.4731921" id="Fill-39" fill="#1C1C1C"></path>
+                    <line x1="79.678537" y1="44.2997517" x2="50.5665388" y2="122.637347" id="Stroke-40" stroke="#1C1C1C" stroke-width="0.799999952"></line>
+                    <line x1="83.5504568" y1="45.5450316" x2="54.0720586" y2="124.351427" id="Stroke-41" stroke="#1C1C1C" stroke-width="0.799999952"></line>
+                    <polygon id="Fill-43" fill="#F7AA66" points="76.2426172 47.0536715 74.1466174 52.6456712 72.1066175 51.2704713 73.2906174 45.9176716"></polygon>
+                    <path d="M84.6703767,48.4779114 C84.6703767,48.4779114 82.5199769,48.3011115 81.7431769,50.3771113 C80.966377,52.4531112 80.993577,55.759511 82.1047769,55.710711 C82.1047769,55.710711 85.7927767,55.462711 84.6703767,48.4779114" id="Fill-44" fill="#F7AA66"></path>
+                    <path d="M23.1946204,69.9974302 C23.1626208,70.7022301 22.9306204,70.9574301 22.5946204,70.9494301 C21.5946205,70.9254301 19.6906206,68.4614303 19.6906206,68.4614303 L16.1626208,66.3494304 L18.2426207,61.9022306 L20.4746206,64.4214305 C20.4746206,64.4214305 21.6426205,62.3342306 21.8746205,62.2854306 C21.8906205,62.2854306 21.8986205,62.2854306 21.9066205,62.3022306 L21.9066205,62.3102306 C21.9146205,62.3174306 21.9146205,62.3254306 21.9146205,62.3342306 C21.9546205,62.9174306 22.0106205,63.4462306 22.0746205,63.9102305 C22.2906205,65.5894304 22.6026204,66.5814304 22.8506204,67.4294303 C23.0826204,68.2462303 23.2426204,68.9342302 23.1946204,69.9974302" id="Fill-49" fill="#F7AA66"></path>
+                    <path d="M52.8965386,139.741186 L52.8965386,143.487586 C52.8965386,143.487586 54.3445385,143.990786 58.6437383,147.285186 C59.5653382,147.991586 64.8549379,149.826785 65.1437379,149.394785 C65.4309379,148.961985 67.7773377,142.909986 64.134938,143.055586 C57.4373384,143.323586 57.5069384,139.741186 57.5069384,139.741186 L52.8965386,139.741186 Z" id="Fill-51" fill="#2D2B37"></path>
+                    <path d="M39.3785394,23.6458329 L21.1065405,37.0778321 C21.1065405,37.0778321 20.8825405,37.3258321 20.4905406,37.7418321 C18.2985407,40.1418319 10.8585411,48.2458315 10.3865412,48.4458314 C9.8425412,48.6858314 19.1225406,60.6458307 19.1225406,60.6458307 L18.2425407,61.9018306 L18.2265407,61.9178306 L15.4185409,65.9018304 L15.2265409,66.1738304 L14.6585409,66.9738303 C14.6585409,66.9738303 4.04254155,53.7498311 0.450541761,49.1418314 C-3.14145803,44.5418317 15.8745408,25.3578328 17.5145407,24.4218329 C18.1785407,24.0458329 21.8745405,23.8458329 26.0505402,23.7418329 C29.0665401,23.6698329 32.3305399,23.6458329 34.8745397,23.6458329 C35.0105397,23.6378329 35.1465397,23.6378329 35.2745397,23.6378329 L35.2985397,23.6378329 C37.7065395,23.6290329 39.3785394,23.6458329 39.3785394,23.6458329" id="Fill-52" fill="#DF5F4D"></path>
+                    <polygon id="Fill-53" fill="#D18146" points="73.2906974 45.9177516 72.1066975 51.2697513 71.1226975 50.5977513 71.3146975 49.7977514 72.3226975 45.5417516"></polygon>
+                    <polygon id="Fill-54" fill="#A44133" points="20.5235006 38.3036721 20.3811006 33.3996723 18.5459007 39.867672"></polygon>
+                    <polygon id="Fill-55" fill="#C9804B" points="18.2426207 61.9020706 16.1626208 66.3500704 15.4186209 65.9020704 18.2266207 61.9180706"></polygon>
+                    <path d="M37.7076928,19.2079204 L37.7076928,23.2423754 C37.7076928,23.2423754 39.6430022,23.3100248 39.7063576,23.8522006 C39.7063576,23.8522006 40.9358484,28.8004131 34.1716695,27.887636 C27.4065007,26.9738785 28.9438591,24.08064 28.9438591,24.08064 C28.9438591,24.08064 30.404993,24.3090794 30.6346563,21.4923141 C30.8653095,18.6745684 31.2503916,17 31.2503916,17 L37.7076928,19.2079204 Z" id="Fill-45" fill="#F7AA66"></path>
+                    <path d="M43.7098844,7 C43.7098844,7 44.4653285,16.6383508 41.441605,18.682422 C38.4178815,20.7274335 33.4286403,20.7838476 31.0844271,16.0093334 L30.5558109,14.0827916 C30.5558109,14.0827916 28.9748299,14.5933393 28.8210153,12.549268 C28.6652536,10.5051967 29.1948433,10.5051967 29.9512609,10.6509332 C30.706705,10.7966696 30.706705,11.8196455 30.706705,11.8196455 L31.5390565,11.9653819 C31.5390565,11.9653819 31.1603609,10.1403855 31.5390565,9.92037045 C31.9167786,9.70223589 32.2945006,9.19074795 32.4453947,7 L43.7098844,7 Z" id="Fill-46" fill="#F7AA66"></path>
+                    <path d="M45.5443818,4.07028515 C45.5443818,4.07028515 47.5260484,5.45514435 46.4978876,6.30271386 C45.4706717,7.14830076 43.7829003,10.6139183 32.7018213,7.76489519 L33.0684816,10.4592741 C33.0684816,10.4592741 31.5725454,11.1868952 31.8220256,13 L31.01405,12.846347 C31.01405,12.846347 30.5708446,11.6072103 29.9121791,11.5586362 C29.2525685,11.510062 28.656273,12.339788 28.8216482,8.53514258 C28.9879683,4.72950589 28.8887432,4.52232223 30.1144092,4.07028515 C30.1144092,4.07028515 31.5725454,-0.103127317 38.433251,0.00195147655 C45.2939566,0.106038961 45.5443818,4.07028515 45.5443818,4.07028515" id="Fill-47" fill="#2D3E50"></path>
+                    <path d="M31.2680739,12 C31.2680739,12 33.4576853,16.0972834 35.2734606,16.719126 C37.088299,17.3409687 36.7013459,15.1724202 39.0624159,15.2477105 C41.424423,15.3230009 41.2548382,16.1827983 41.2548382,16.1827983 L42.8457497,13.5169615 L43.7873669,16.8315968 C43.7873669,16.8315968 44.1715093,20.5896088 38.9799659,21.7440611 C33.7884225,22.899443 30.3948527,19.9956514 30.8314633,15.9978257 L31.2680739,12 Z" id="Fill-50" fill="#2D3E50"></path>
+                </g>
+                <g id="Group-15" transform="translate(341.000000, 73.000000)">
+                    <path d="M1.30559984,10.3449598 L-8.8107294e-14,12.3039995 L7.83487907,16.2214391 C7.83487907,16.2214391 8.27007901,19.9206386 12.0787186,18.7238388 L23.7215972,26.0140779 L42.9823949,10.3449598 L38.1945554,6.97152018 L1.30559984,10.3449598 Z" id="Fill-56" fill="#273DAD"></path>
+                    <path d="M2.16556774,11.6099836 L0.979007883,8.38630401 L14.7722862,8.38630401 L40.2020432,8.38630401 L40.2020432,10.8970237 C40.2020432,10.8970237 31.0762843,15.4410232 24.840125,24.0387821 C24.840125,24.0387821 16.954686,14.8618232 10.6737267,17.5351029 C10.6737267,17.5351029 7.37772712,10.9859837 2.16556774,11.6099836" id="Fill-57" fill="#C3D2E4"></path>
+                    <path d="M0.979327883,8.38624001 C0.979327883,8.38624001 8.70540696,8.38624001 10.9902067,16.493119 C10.9902067,16.493119 18.3898858,14.6972793 24.2657251,19.8121586 L40.2023632,8.38624001 C40.2023632,8.38624001 33.406204,0.878400902 23.7217252,4.46880047 C23.7217252,4.46880047 22.4161253,-0.210238968 15.9956461,0.00736100601 L0.979327883,8.38624001 Z" id="Fill-58" fill="#FFFFFF"></path>
+                </g>
+                <g id="Group-19" transform="translate(181.000000, 0.000000)">
+                    <path d="M19.4568956,39.5598074 C19.4568956,39.5598074 19.7448956,36.5262075 18.3058556,34.8241275 C16.8658557,33.1230075 10.3570558,30.2602876 8.92665582,22.9729277 C7.49625585,15.6846079 11.0242558,10.038848 17.8008956,8.84748802 C24.5775355,7.65516804 31.0546554,11.323328 32.2786554,17.2945279 C33.5026553,23.2647677 29.2239354,28.6369276 28.3685754,32.1495676 C28.0085754,33.6308475 28.6229754,35.6247675 29.4552954,37.4353275 C30.5967354,39.9198074 19.4568956,39.5598074 19.4568956,39.5598074" id="Fill-59" fill="#FFD500"></path>
+                    <line x1="9.22127982" y1="2.37478415" x2="11.7969598" y2="6.80614406" id="Stroke-60" stroke="#170F4C" stroke-width="0.959999981"></line>
+                    <path d="M17.9591996,38.5567034 C17.9591996,38.5567034 24.4996795,40.6130234 28.6622394,36.6376635 C32.8238393,32.6613435 33.7867193,37.5573434 31.6545594,39.1010234 C31.6545594,39.1010234 33.6379193,39.7586234 32.1460794,42.0587834 C32.1460794,42.0587834 34.4606393,45.4850233 29.5982394,45.6424633 C29.5982394,45.6424633 29.8948794,49.6725432 26.0462395,50.7227832 C26.0462395,50.7227832 21.5006396,51.7135032 20.9102396,47.4127033 C20.9102396,47.4127033 17.0395197,47.8975032 16.4961597,44.7247033 C16.4961597,44.7247033 15.7684797,45.0165433 15.4574397,43.2674233 C15.1463997,41.5202234 15.7367997,41.6047034 15.7367997,41.6047034 C15.7367997,41.6047034 14.2478397,39.2306234 15.3268797,38.5125434 C16.4059197,37.7944634 16.1937597,37.3893435 17.9591996,38.5567034" id="Fill-62" fill="#170F4C"></path>
+                    <line x1="34.6617593" y1="13.7944639" x2="41.9126392" y2="12.031904" id="Stroke-64" stroke="#170F4C" stroke-width="0.959999981"></line>
+                    <line x1="35.3972153" y1="22.9809917" x2="42.1028152" y2="23.5982717" id="Stroke-65" stroke="#170F4C" stroke-width="0.959999981"></line>
+                    <line x1="34.3734713" y1="31.0969276" x2="40.4848312" y2="31.9647676" id="Stroke-66" stroke="#170F4C" stroke-width="0.959999981"></line>
+                    <line x1="4.49721591" y1="40.7167034" x2="10.1458558" y2="36.9880635" id="Stroke-67" stroke="#170F4C" stroke-width="0.959999981"></line>
+                    <line x1="0.109247998" y1="32.6860155" x2="5.50348789" y2="31.3746556" id="Stroke-68" stroke="#170F4C" stroke-width="0.959999981"></line>
+                    <line x1="0" y1="22.2235518" x2="4.66943991" y2="23.7105917" id="Stroke-69" stroke="#170F4C" stroke-width="0.959999981"></line>
+                    <line x1="0.612191988" y1="11.261312" x2="5.69731189" y2="14.8440319" id="Stroke-70" stroke="#170F4C" stroke-width="0.959999981"></line>
+                    <path d="M22.4339516,41.3045114 C22.4339516,41.3045114 19.6787516,24.5832317 17.2211517,25.2609917 C14.7635517,25.9377917 15.4787517,30.0725116 21.1053116,27.5803516 C26.7318715,25.0881917 29.3094714,23.3649917 26.4169915,23.0241917 C23.5245115,22.6843517 24.7917115,25.5825917 25.7776315,29.6395516 C26.7645115,33.6955515 27.2089915,40.1438714 27.2089915,40.1438714 L22.4339516,41.3045114 Z" id="Stroke-71" stroke="#170F4C" stroke-width="0.959999981"></path>
+                    <line x1="23.8432696" y1="5.64657016" x2="25.8550614" y2="0.131101576" id="Path-2" stroke="#170F4C" stroke-width="1.20000005"></line>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/no_member.svg b/src/assets/imgs/no_member.svg
new file mode 100644
index 000000000..17318bb11
--- /dev/null
+++ b/src/assets/imgs/no_member.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="198px" height="210px" viewBox="0 0 198 210" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>970DB3FB-7365-4066-8DDB-ED1761E181FF@2x</title>
+    <defs>
+        <path d="M32.2660767,16.1330383 C32.2660767,25.0437574 25.0427494,32.2660767 16.1330383,32.2660767 C7.22231926,32.2660767 5.1478819e-14,25.0437574 5.1478819e-14,16.1330383 C5.1478819e-14,7.22332726 7.22231926,3.35731428e-14 16.1330383,3.35731428e-14 C25.0427494,3.35731428e-14 32.2660767,7.22332726 32.2660767,16.1330383" id="path-1"></path>
+        <path d="M0.778922074,11.2512344 C3.51210364,2.73496045 12.6314788,-1.9542522 21.1487647,0.778929366 C29.6650387,3.51211093 34.3542513,12.6314861 31.6210698,21.1477601 C28.8878882,29.665046 19.7685131,34.3542586 11.2522391,31.6210771 C2.73495316,28.8878955 -1.95425949,19.7685204 0.778922074,11.2512344" id="path-3"></path>
+        <path d="M0.778922074,11.2512344 C3.51210364,2.73496045 12.6314788,-1.9542522 21.1487647,0.778929366 C29.6650387,3.51211093 34.3542513,12.6314861 31.6210698,21.1477601 C28.8878882,29.665046 19.7685131,34.3542586 11.2522391,31.6210771 C2.73495316,28.8878955 -1.95425949,19.7685204 0.778922074,11.2512344" id="path-5"></path>
+    </defs>
+    <g id="Page-3" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Specific-Group_-Empty-state" transform="translate(-1087.000000, -539.000000)">
+            <g id="add-member" transform="translate(1088.000000, 539.000000)">
+                <g id="Group-3" opacity="0.222353981" fill="#B5C9D1">
+                    <path d="M45.562546,136.149697 C45.562546,136.149697 62.0300784,92.5102314 38.1738088,91.7704687 C14.3172674,91.0309782 -11.9086718,85.1136934 5.82185074,52.9389161 C23.5518296,20.7641389 50.1327979,-17.3279232 88.7404447,8.55968783 C127.348092,34.447571 127.088208,39.6250932 153.259778,40.3645837 C179.431077,41.1043464 215.999889,76.2379021 185.341251,92.5102314 C154.682341,108.782561 165.141835,114.699573 153.447895,132.081547 C141.754226,149.46352 5.1474042,253.014781 45.562546,136.149697" id="Fill-1"></path>
+                </g>
+                <g id="Group-46" transform="translate(165.500000, 121.500000) scale(-1, 1) translate(-165.500000, -121.500000) translate(135.000000, 33.000000)">
+                    <path d="M60.7659562,170.147355 C60.7659562,173.746922 48.9189334,176.66609 34.3049509,176.66609 C19.6899604,176.66609 7.84293766,173.746922 7.84293766,170.147355 C7.84293766,166.547787 19.6899604,163.628619 34.3049509,163.628619 C48.9189334,163.628619 60.7659562,166.547787 60.7659562,170.147355" id="Fill-1" fill="#000000" opacity="0.100000001"></path>
+                    <path d="M47.7464076,82.0985675 L9.20859364,82.0985675 C4.54077873,82.0985675 0.757004617,78.2631279 0.757004617,73.5325844 L0.757004617,8.56598312 C0.757004617,3.8344316 4.54077873,0 9.20859364,0 L47.7464076,0 C52.4132281,0 56.1970022,3.8344316 56.1970022,8.56598312 L56.1970022,73.5325844 C56.1970022,78.2631279 52.4132281,82.0985675 47.7464076,82.0985675" id="Fill-11" fill="#628EB4"></path>
+                    <path d="M49.5913702,83.3585675 L10.5273422,83.3585675 C5.79579067,83.3585675 1.96035106,79.5231279 1.96035106,74.7925844 L1.96035106,9.82598306 C1.96035106,5.09443155 5.79579067,1.25999995 10.5273422,1.25999995 L49.5913702,1.25999995 C54.3219137,1.25999995 58.1573533,5.09443155 58.1573533,9.82598306 L58.1573533,74.7925844 C58.1573533,79.5231279 54.3219137,83.3585675 49.5913702,83.3585675" id="Fill-11-Copy" fill="#7EB1DC"></path>
+                    <g id="Fill-31" transform="translate(13.926217, 10.043207)">
+                        <mask id="mask-2" fill="white">
+                            <use xlink:href="#path-1"></use>
+                        </mask>
+                        <use id="Mask" fill="#5D99CC" xlink:href="#path-1"></use>
+                        <path d="M25.5240694,31.509976 C25.5240694,36.6961354 21.3197018,40.900503 16.1335423,40.900503 C10.9463749,40.900503 6.7420073,36.6961354 6.7420073,31.509976 C6.7420073,26.3228085 10.9463749,22.1194489 16.1335423,22.1194489 C21.3197018,22.1194489 25.5240694,26.3228085 25.5240694,31.509976" fill="#B8DEFF" mask="url(#mask-2)"></path>
+                    </g>
+                    <path d="M36.6556067,26.1762454 C36.6556067,29.819157 33.702167,32.7725967 30.0592554,32.7725967 C26.4163437,32.7725967 23.462904,29.819157 23.462904,26.1762454 C23.462904,22.5333338 26.4163437,19.5798941 30.0592554,19.5798941 C33.702167,19.5798941 36.6556067,22.5333338 36.6556067,26.1762454" id="Fill-30" fill="#B8DEFF"></path>
+                    <polygon id="Fill-32" fill="#B8DEFF" points="11.1696397 52.5196171 48.9484678 52.5196171 48.9484678 48.6035375 11.1696397 48.6035375"></polygon>
+                    <polygon id="Fill-33" fill="#B8DEFF" points="17.772039 58.6381764 42.3460685 58.6381764 42.3460685 54.7220968 17.772039 54.7220968"></polygon>
+                    <path d="M41.209347,166.019897 L41.128707,167.471417 L34.2138277,165.990665 C34.4053477,165.304218 34.5666277,164.830458 34.5666277,164.830458 L41.209347,166.019897 Z" id="Fill-13" fill="#F7AA66"></path>
+                    <path d="M38.0898897,70.2097089 C38.0203377,73.1429886 34.1788501,73.9695485 34.1788501,73.9695485 L34.1788501,75.3535324 L28.8969307,75.1892284 L28.8969307,70.2711969 C29.1086107,70.7842689 29.3716986,71.1481568 29.7335706,71.1874688 C31.1649305,71.3386688 35.98317,71.7922688 36.4367699,67.0445893 C36.8913779,62.3069897 37.4246098,63.6476296 38.2914897,62.2263498 C38.6442897,64.6354695 38.1402897,68.2844291 38.0898897,70.2097089" id="Fill-14" fill="#F7AA66"></path>
+                    <path d="M51.0472244,172.652638 C50.4928245,173.762445 36.5118659,171.958126 34.5059461,171.403726 C33.0645063,170.999518 33.7297862,167.763838 34.2136261,165.990766 L41.1285054,167.471518 L41.0881854,168.227518 C41.0881854,168.227518 51.6016243,171.543838 51.0472244,172.652638" id="Fill-15" fill="#2D2B37"></path>
+                    <path d="M42.6810269,167.169622 L34.3347877,165.587062 C34.9194277,159.397943 38.9816672,143.915065 38.9816672,142.171225 C38.9816672,140.436457 34.5263077,130.760666 34.5263077,130.760666 C34.4456677,130.739498 34.3751077,130.710266 34.3045477,130.690106 C28.9823083,128.986586 25.9583086,126.335546 24.3253488,123.482907 C21.966629,119.370267 22.4907889,114.844348 23.1459889,112.183228 C32.6010279,114.57118 39.5965472,111.598588 39.5965472,111.598588 L39.5360672,112.485628 C42.9935068,116.467227 48.7592662,132.282746 49.1725462,138.572665 C49.5959062,144.851496 42.6810269,167.169622 42.6810269,167.169622" id="Fill-16" fill="#9ABFC3"></path>
+                    <path d="M60.0256811,71.935304 C59.9158091,73.0824078 59.1275532,78.7745832 59.1275532,78.7745832 L55.5249615,77.1083594 L57.2274734,71.668184 C57.2274734,71.668184 56.4039374,68.2067123 57.2274734,66.8076085 C58.0510093,65.4074966 57.6488173,68.5766483 58.0600813,68.4123443 C58.0600813,68.4123443 58.0207693,67.6644084 58.1215693,66.3136885 L58.1215693,64.1394328 C58.1215693,64.1394328 60.920785,62.6133209 60.0256811,71.935304" id="Fill-17" fill="#F7AA66"></path>
+                    <path d="M59.7569483,78.1122265 L59.1309804,81.2571862 C58.4969484,84.4021459 57.1351406,86.9120656 54.7270288,87.0239536 C52.3169011,87.1237456 43.09471,86.7013936 43.09471,86.7013936 L39.7471424,109.542671 C34.022711,111.054671 27.3396716,110.419631 23.871144,109.915631 C23.881224,109.885391 23.892312,109.864223 23.892312,109.864223 L23.892312,103.483584 C23.892312,103.483584 21.5729042,104.642784 19.6375444,104.835312 C17.7021846,105.025824 16.9270327,108.322991 16.5429848,93.9993129 C16.1498648,79.6857144 22.7331121,79.4931864 26.0181838,77.7503546 C29.3042634,76.0055067 28.4787115,75.1900348 28.4787115,75.1900348 L33.759623,74.7051869 L34.2938629,74.6547869 L34.4057509,76.1264667 C34.4057509,76.1264667 40.3731103,76.8522266 42.992902,76.8522266 C45.6147098,76.8522266 52.2171091,80.1080663 52.941861,80.4205463 C53.6787089,80.7340342 55.4618607,76.1264667 55.4618607,76.1264667 L59.7569483,78.1122265 Z" id="Fill-18" fill="#DF5F4D"></path>
+                    <polygon id="Fill-19" fill="#302293" points="30.8064857 165.33476 27.349046 164.83076 30.8266457 164.83076"></polygon>
+                    <path d="M37.066165,170.022363 C37.066165,170.022363 27.520406,170.303595 25.3028063,170.022363 C23.7908064,169.839915 24.4964063,167.472123 25.0911263,166.000443 L30.7661657,166.352235 L30.6966137,168.087003 C39.2736848,169.054683 37.066165,170.022363 37.066165,170.022363" id="Fill-20" fill="#2D2B37"></path>
+                    <path d="M30.8064857,165.33476 L30.7661657,166.35284 L25.0911263,166.00004 C25.3733662,165.32468 25.6253662,164.83076 25.6253662,164.83076 L27.349046,164.83076 L30.8064857,165.33476 Z" id="Fill-21" fill="#F7AA66"></path>
+                    <path d="M38.2916913,62.2165722 L38.2916913,62.2266522 C37.4248114,63.647932 36.8905715,62.3072921 36.4369715,67.0448917 C35.9833716,71.7925712 31.1651321,71.3389712 29.7337722,71.1867632 C29.3708922,71.1474512 29.1088123,70.7845713 28.8971323,70.2704913 C28.3024123,68.7474035 28.1814524,65.8554518 27.3952124,65.6830838 C26.3368125,65.4623318 26.4174525,62.2165722 26.4174525,62.2165722 C28.8265723,57.6301726 33.8766518,57.9224926 35.8321716,57.7007326 C37.7876914,57.4789726 39.1484912,60.7852123 38.2916913,62.2165722" id="Fill-22" fill="#2D3E50"></path>
+                    <path d="M33.991967,133.371083 C33.367007,138.804203 32.3892471,147.392362 32.0969272,149.156362 C31.6735672,151.767081 31.6735672,166.0202 31.6735672,166.0202 L23.922048,165.396248 L24.284928,127.494444 C26.5025277,130.216044 29.7694554,133.018283 33.991967,133.371083" id="Fill-23" fill="#81A1A5"></path>
+                    <path d="M39.7475456,109.542369 L39.5973536,111.598689 C39.5973536,111.598689 32.6008263,114.57128 23.1457873,112.183329 C23.4481872,110.952561 23.7808272,110.115921 23.8715472,109.915329 C27.3390668,110.419329 34.0221062,111.054369 39.7475456,109.542369" id="Fill-24" fill="#2D2B37"></path>
+                    <path d="M36.2579507,68.042106 C36.2579507,68.042106 35.8880148,69.9683938 36.8939987,69.5077378 C37.8999826,69.0470818 38.1408945,69.1992898 38.1408945,69.1992898 C38.1408945,69.1992898 39.0954704,72.5670175 38.1408945,73.1113374 C37.1873266,73.6566654 34.1784469,73.9701533 34.1784469,73.9701533 L36.2579507,68.042106 Z" id="Fill-25" fill="#2D3E50"></path>
+                    <polygon id="Fill-26" fill="#A44133" points="23.8922112 103.483483 25.366915 87.1790848 23.1462913 87.1790848"></polygon>
+                    <path d="M34.3049509,130.689703 C34.2132229,131.425543 34.1134309,132.343831 33.991463,133.370982 C29.7689514,133.01919 26.5030317,130.215943 24.285432,127.494343 L24.325752,123.483511 C25.9587118,126.336151 28.9827115,128.987191 34.3049509,130.689703" id="Fill-27" fill="#537276"></path>
+                    <polygon id="Fill-28" fill="#251F77" points="30.8576921 165.344638 30.7659641 166.352638 30.8062841 165.334558"></polygon>
+                </g>
+                <g id="Group-6" transform="translate(0.000000, 14.000000)">
+                    <path d="M47.2935289,81.8999978 L8.50546873,81.8999978 C3.80834414,81.8999978 0,78.0738349 0,73.354733 L0,8.54526479 C0,3.82515736 3.80834414,0 8.50546873,0 L47.2935289,0 C51.9906535,0 55.7999985,3.82515736 55.7999985,8.54526479 L55.7999985,73.354733 C55.7999985,78.0738349 51.9906535,81.8999978 47.2935289,81.8999978" id="Fill-12" stroke="#A7BDCC" stroke-width="0.899999976" stroke-dasharray="3.599999904632568"></path>
+                    <g id="Fill-34-Copy-+-Fill-34-Copy-2-Mask" transform="translate(11.700000, 24.299999)">
+                        <mask id="mask-4" fill="white">
+                            <use xlink:href="#path-3"></use>
+                        </mask>
+                        <use id="Mask" fill="#FBFFFF" xlink:href="#path-3"></use>
+                        <path d="M10.4884892,10.8671246 C11.5007787,7.71294899 14.8783252,5.97620351 18.0328756,6.98849301 C21.1870512,8.0007825 22.9237967,11.3783289 21.9115072,14.5325046 C20.8992177,17.687055 17.5216713,19.4238005 14.3674956,18.411511 C11.2129452,17.3992215 9.47619974,14.021675 10.4884892,10.8671246" id="Fill-34-Copy" fill="#A7BDCC" mask="url(#mask-4)"></path>
+                        <path d="M1.92122373,29.1178106 C4.45194747,21.2323715 12.8958136,16.8905078 20.7821896,19.4212316 C28.6676287,21.9519553 33.0094924,30.3958214 30.4787687,38.2812605 C27.9480449,46.1676365 19.5041788,50.5095002 11.6187397,47.9787765 C3.73236368,45.4480527 -0.609500007,37.0041866 1.92122373,29.1178106" id="Fill-34-Copy-2" fill="#A7BDCC" mask="url(#mask-4)"></path>
+                    </g>
+                </g>
+                <g id="Group-6-Copy-2" transform="translate(67.000000, 14.000000)">
+                    <path d="M47.2935289,81.8999978 L8.50546873,81.8999978 C3.80834414,81.8999978 0,78.0738349 0,73.354733 L0,8.54526479 C0,3.82515736 3.80834414,0 8.50546873,0 L47.2935289,0 C51.9906535,0 55.7999985,3.82515736 55.7999985,8.54526479 L55.7999985,73.354733 C55.7999985,78.0738349 51.9906535,81.8999978 47.2935289,81.8999978" id="Fill-12" stroke="#A7BDCC" stroke-width="0.899999976" stroke-dasharray="3.599999904632568"></path>
+                    <g id="Fill-34-Copy-+-Fill-34-Copy-2-Mask" transform="translate(11.000000, 24.299999)">
+                        <mask id="mask-6" fill="white">
+                            <use xlink:href="#path-5"></use>
+                        </mask>
+                        <use id="Mask" fill="#FBFFFF" xlink:href="#path-5"></use>
+                        <path d="M10.4884892,10.8671246 C11.5007787,7.71294899 14.8783252,5.97620351 18.0328756,6.98849301 C21.1870512,8.0007825 22.9237967,11.3783289 21.9115072,14.5325046 C20.8992177,17.687055 17.5216713,19.4238005 14.3674956,18.411511 C11.2129452,17.3992215 9.47619974,14.021675 10.4884892,10.8671246" id="Fill-34-Copy" fill="#A7BDCC" mask="url(#mask-6)"></path>
+                        <path d="M1.92122373,29.1178106 C4.45194747,21.2323715 12.8958136,16.8905078 20.7821896,19.4212316 C28.6676287,21.9519553 33.0094924,30.3958214 30.4787687,38.2812605 C27.9480449,46.1676365 19.5041788,50.5095002 11.6187397,47.9787765 C3.73236368,45.4480527 -0.609500007,37.0041866 1.92122373,29.1178106" id="Fill-34-Copy-2" fill="#A7BDCC" mask="url(#mask-6)"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/notification.svg b/src/assets/imgs/notification.svg
index b9edea814..0b5193fb5 100644
--- a/src/assets/imgs/notification.svg
+++ b/src/assets/imgs/notification.svg
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="22px" height="24px" viewBox="0 0 22 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.1 (72631) - https://sketchapp.com -->
-    <title>noun_notification_1304328@1.5x</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Library" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Course--disable-toast" transform="translate(-285.000000, -37.000000)" fill="#024F9D" fill-rule="nonzero">
-            <g id="noun_notification_1304328" transform="translate(285.000000, 37.000000)">
+    <title>141BBA8A-0C56-463E-B29F-F5B153504A2C@1.5x</title>
+    <g id="Final-layouts" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Home-page-01" transform="translate(-314.000000, -37.000000)" fill="#333333" fill-rule="nonzero">
+            <g id="notification" transform="translate(314.000000, 37.000000)">
                 <path d="M14.8529507,20.4991544 C14.7465134,22.441652 13.1366177,23.9840107 11.1662447,23.9840107 C9.19587172,23.9840107 7.58597601,22.441652 7.47953876,20.4991544 L1.73139271,20.4991544 C1.05038352,20.4991544 0.499578059,19.9501093 0.499578059,19.2704228 L0.499578059,18.0392559 C0.499578059,16.6819445 1.6026197,15.5793574 2.96197268,15.5793574 C2.96037588,15.5793574 2.96111652,10.6592526 2.96111652,10.6592526 C2.96111652,7.19380602 5.12966889,4.15546825 8.29444985,2.97597782 L8.29444985,2.86793559 C8.29444985,1.28449567 9.58202196,0 11.1662447,0 C12.752167,0 14.0380396,1.28372269 14.0380396,2.86793559 L14.0380396,2.97604616 C17.2027425,4.15569362 19.3713729,7.19453591 19.3713729,10.6592526 L19.3713729,15.5786426 C20.7278416,15.5793574 21.8329114,16.6815167 21.8329114,18.0392559 L21.8329114,19.2704228 C21.8329114,19.9474169 21.2802967,20.4991544 20.6010967,20.4991544 L14.8529507,20.4991544 Z M19.5527844,18.2495772 L19.5527844,17.4876724 C19.5527844,17.0683239 19.2093236,16.7257677 18.7895762,16.7257677 C17.9470452,16.7257677 17.2655463,16.0450535 17.2655463,15.201294 L17.2655463,10.6302436 C17.2655463,7.89682029 15.449422,5.51956311 12.8609573,4.77335621 L12.3098638,4.61448604 L12.3098638,3.39062612 C12.3098638,2.760511 11.7980743,2.2495772 11.1662447,2.2495772 C10.5357493,2.2495772 10.0226257,2.76147484 10.0226257,3.39062612 L10.0226257,4.61447385 L9.47150247,4.7733284 C6.88292998,5.51945301 5.06694314,7.89615381 5.06694314,10.6302436 L5.06694314,15.201294 C5.06694314,16.0426372 4.38377726,16.7257677 3.54291328,16.7257677 C3.12204009,16.7257677 2.77970504,17.0679617 2.77970504,17.4876724 L2.77970504,18.2495772 L19.5527844,18.2495772 Z" id="Shape"></path>
             </g>
         </g>
diff --git a/src/assets/imgs/outline_delete.svg b/src/assets/imgs/outline_delete.svg
new file mode 100644
index 000000000..0fecccc2c
--- /dev/null
+++ b/src/assets/imgs/outline_delete.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="25px" height="25px" viewBox="0 0 25 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>350105B3-2A57-4BCE-A7B4-6F1F60B16F1A</title>
+    <g id="Textbook-TOC" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="Content-Play--icons" transform="translate(-45.000000, -445.000000)" stroke="#9A3713" stroke-width="1.5">
+            <g id="Group-10-Copy-4" transform="translate(32.000000, 445.000000)">
+                <g id="Group-9" transform="translate(13.000000, 0.000000)">
+                    <path d="M18.6013157,23.6824197 L5.89773913,23.6824197 C5.19652174,23.6824197 4.62814367,23.1140416 4.62814367,22.4117353 L4.62814367,4.62759924 L19.872,4.62759924 L19.872,22.4117353 C19.872,23.1140416 19.3025331,23.6824197 18.6013157,23.6824197 Z" id="Stroke-1"></path>
+                    <line x1="0.816635161" y1="4.62759924" x2="23.6824197" y2="4.62759924" id="Stroke-3"></line>
+                    <polygon id="Stroke-5" points="8.43856333 4.62759924 16.0604915 4.62759924 16.0604915 0.816635161 8.43856333 0.816635161"></polygon>
+                    <line x1="10.1957444" y1="8.43856333" x2="10.1957444" y2="19.8714556" id="Stroke-7"></line>
+                    <line x1="14.1550095" y1="8.43856333" x2="14.1550095" y2="19.8714556" id="Stroke-8"></line>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/outline_download.svg b/src/assets/imgs/outline_download.svg
new file mode 100644
index 000000000..8507c787d
--- /dev/null
+++ b/src/assets/imgs/outline_download.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>8DCA5DA7-099B-4850-B95D-3BE9194E01A2</title>
+    <g id="Textbook-TOC" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Content-Play-" transform="translate(-44.000000, -382.000000)">
+            <g id="Group-12-Copy-2" transform="translate(32.000000, 382.000000)">
+                <g id="outline-cloud_download-24px" transform="translate(12.000000, 0.000000)">
+                    <polygon id="Path" points="0 -2.13162821e-14 24 -2.13162821e-14 24 24 0 24"></polygon>
+                    <g id="Group-7" transform="translate(3.000000, 2.000000)" stroke="#024F9D" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5">
+                        <polyline id="Stroke-6" points="15.0532 9.75 9.7502 15.053 4.4472 9.75"></polyline>
+                        <polyline id="Stroke-1" points="0.75 14.25 0.75 18.75 18.75 18.75 18.75 14.25"></polyline>
+                        <line x1="9.75" y1="0.75" x2="9.75" y2="14.25" id="Stroke-3"></line>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/outline_print.svg b/src/assets/imgs/outline_print.svg
new file mode 100644
index 000000000..65d9dea16
--- /dev/null
+++ b/src/assets/imgs/outline_print.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="27px" height="26px" viewBox="0 0 27 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>5F06EC82-2B5C-4E5E-BC3A-68F3E4B6889C</title>
+    <g id="Textbook-TOC" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Content-Play--icons" transform="translate(-170.000000, -444.000000)">
+            <g id="Group-4" transform="translate(160.000000, 445.000000)">
+                <g id="Group" transform="translate(11.000000, 0.000000)">
+                    <rect id="Rectangle-Copy-2" stroke="#024F9D" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" x="3.42857143" y="13.7142857" width="18.2857143" height="10.2857143" rx="1"></rect>
+                    <path d="M21.7142857,19.4285714 L23.1428571,19.4285714 C24.2474266,19.4285714 25.1428571,18.5331409 25.1428571,17.4285714 L25.1428571,8.85714286 C25.1428571,7.75257336 24.2474266,6.85714286 23.1428571,6.85714286 L2,6.85714286 C0.8954305,6.85714286 -3.57315355e-16,7.75257336 0,8.85714286 L0,17.4285714 C1.3527075e-16,18.5331409 0.8954305,19.4285714 2,19.4285714 L3.42857143,19.4285714 L3.42857143,19.4285714" id="Path-2" stroke="#024F9D" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
+                    <path d="M21.7142857,6.85714286 L21.7142857,2 C21.7142857,0.8954305 20.8188552,-4.2495073e-16 19.7142857,0 L5.42857143,0 C4.32400193,-1.91384796e-17 3.42857143,0.8954305 3.42857143,2 L3.42857143,6.85714286 L3.42857143,6.85714286" id="Path-2-Copy" stroke="#024F9D" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
+                    <circle id="Oval" fill="#024F9D" cx="21.7142857" cy="10.2857143" r="1.14285714"></circle>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/outline_rate_star.svg b/src/assets/imgs/outline_rate_star.svg
new file mode 100644
index 000000000..55f41bb6f
--- /dev/null
+++ b/src/assets/imgs/outline_rate_star.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>6A726E10-8F01-4A12-A5BE-AD059B077A1E</title>
+    <g id="Textbook-TOC" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Content-Play-" transform="translate(-172.000000, -382.000000)">
+            <g id="Group-16-Copy" transform="translate(172.000000, 382.000000)">
+                <rect id="Rectangle" x="0" y="0" width="24" height="24"></rect>
+                <path d="M12.7492587,1.46725 L15.4982587,7.03725 C15.6202587,7.28425 15.8562587,7.45625 16.1292587,7.49525 L22.2752587,8.38825 C22.9632587,8.48825 23.2382587,9.33425 22.7402587,9.81925 L18.2922587,14.15425 C18.0952587,14.34625 18.0042587,14.62425 18.0512587,14.89625 L19.1012587,21.01825 C19.2192587,21.70325 18.5002587,22.22525 17.8852587,21.90225 L12.3872587,19.01125 C12.1432587,18.88325 11.8512587,18.88325 11.6072587,19.01125 L6.10925866,21.90225 C5.49425866,22.22525 4.77525866,21.70325 4.89325866,21.01825 L5.94325866,14.89625 C5.98925866,14.62425 5.89925866,14.34625 5.70225866,14.15425 L1.25425866,9.81925 C0.756258659,9.33425 1.03125866,8.48825 1.71925866,8.38825 L7.86525866,7.49525 C8.13825866,7.45625 8.37425866,7.28425 8.49725866,7.03725 L11.2452587,1.46725 C11.5532587,0.84425 12.4412587,0.84425 12.7492587,1.46725 Z" id="Stroke-1" stroke="#024F9D" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/outline_share.svg b/src/assets/imgs/outline_share.svg
new file mode 100644
index 000000000..38f441f3c
--- /dev/null
+++ b/src/assets/imgs/outline_share.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>3F51B9E9-122A-4F18-9001-ED773FAA581B</title>
+    <g id="Textbook-TOC" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Content-Play-" transform="translate(-109.000000, -382.000000)">
+            <g id="Group-10-Copy-2" transform="translate(107.000000, 382.000000)">
+                <g id="Group-16-Copy" transform="translate(2.000000, 0.000000)">
+                    <rect id="Rectangle" x="0" y="0" width="24" height="24"></rect>
+                    <g id="Group-11" transform="translate(3.000000, 3.000000)" stroke="#024F9D" stroke-linecap="round" stroke-width="1.5">
+                        <path d="M17.399999,16.199999 C17.399999,17.527999 16.327999,18.5999989 14.9999991,18.5999989 C13.6719992,18.5999989 12.5999992,17.527999 12.5999992,16.199999 C12.5999992,15.7519991 12.7279992,15.3279991 12.9439992,14.9679991 C13.3599992,14.2639991 14.1199992,13.7999992 14.9999991,13.7999992 C16.327999,13.7999992 17.399999,14.8719991 17.399999,16.199999 Z" id="Stroke-1"></path>
+                        <path d="M17.399999,2.99999982 C17.399999,4.32799974 16.327999,5.39999968 14.9999991,5.39999968 C14.0559992,5.39999968 13.2479992,4.86399971 12.8559992,4.07199976 C12.6959992,3.75199978 12.5999992,3.3839998 12.5999992,2.99999982 C12.5999992,1.6719999 13.6719992,0.599999964 14.9999991,0.599999964 C16.327999,0.599999964 17.399999,1.6719999 17.399999,2.99999982 Z" id="Stroke-3"></path>
+                        <path d="M5.39999968,8.99999946 C5.39999968,9.44799944 5.27199969,9.87199941 5.0559997,10.2319994 C4.63999972,10.9359993 3.87999977,11.3999993 2.99999982,11.3999993 C1.6719999,11.3999993 0.599999964,10.3279994 0.599999964,8.99999946 C0.599999964,7.67199954 1.6719999,6.59999961 2.99999982,6.59999961 C3.94399976,6.59999961 4.75199972,7.13599957 5.14399969,7.92799953 C5.30399968,8.24799951 5.39999968,8.61599949 5.39999968,8.99999946 Z" id="Stroke-5"></path>
+                        <line x1="12.9441592" y1="14.9679991" x2="5.0561597" y2="10.2319994" id="Stroke-7"></line>
+                        <line x1="12.8558392" y1="4.07183976" x2="5.14383969" y2="7.92783953" id="Stroke-9"></line>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/outline_update.svg b/src/assets/imgs/outline_update.svg
new file mode 100644
index 000000000..94b76de4a
--- /dev/null
+++ b/src/assets/imgs/outline_update.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="30px" height="30px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>3E996700-BB2F-4830-8772-717107CDD099</title>
+    <g id="Textbook-TOC" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="Content-Play--icons" transform="translate(-105.000000, -444.000000)" stroke="#024F9D" stroke-width="1.5">
+            <g id="Group-10-Copy-5" transform="translate(96.000000, 445.000000)">
+                <g id="Group-2" transform="translate(10.000000, 0.000000)">
+                    <path d="M14,24 C19.5228475,24 24,19.5228475 24,14 C24,8.4771525 19.5228475,4 14,4 C8.4771525,4 4,8.4771525 4,14 C4,16.7534474 5.11283136,19.2469791 6.91326807,21.0553691" id="Oval" transform="translate(14.000000, 14.000000) rotate(67.000000) translate(-14.000000, -14.000000) "></path>
+                    <polygon id="Path-3" transform="translate(4.857143, 12.714286) scale(1, -1) translate(-4.857143, -12.714286) " points="8.71428571 14.4285714 4.85714286 11 1 14.4285714"></polygon>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/profile_name_confirmation.png b/src/assets/imgs/profile_name_confirmation.png
new file mode 100644
index 000000000..ad12e5fa0
Binary files /dev/null and b/src/assets/imgs/profile_name_confirmation.png differ
diff --git a/src/assets/imgs/red_exclamation.svg b/src/assets/imgs/red_exclamation.svg
new file mode 100644
index 000000000..4d11353e7
--- /dev/null
+++ b/src/assets/imgs/red_exclamation.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>F7461929-9D59-4C06-97CD-845F9C506BE5</title>
+    <g id="Profile-Page" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Self-Declaration-Teacher-04-.1" transform="translate(-304.000000, -325.000000)" fill-rule="nonzero">
+            <g id="Group-3-Copy-6" transform="translate(16.000000, 290.000000)">
+                <g id="Red" transform="translate(288.000000, 35.000000)">
+                    <path d="M12,0 C18.627417,0 24,5.372583 24,12 C24,18.627417 18.627417,24 12,24 C5.372583,24 0,18.627417 0,12 C0,5.372583 5.372583,0 12,0 Z" id="Oval" fill="#E55A28"></path>
+                    <path d="M13,8.66891892 L13,7 L11,7 L11,8.66891892 L13,8.66891892 Z M13,17.3378378 L13,9.91891892 L11,9.91891892 L11,17.3378378 L13,17.3378378 Z" id="i" fill="#FFFFFF" transform="translate(12.000000, 12.168919) rotate(-180.000000) translate(-12.000000, -12.168919) "></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/reports-page/Note 1.svg b/src/assets/imgs/reports-page/Note 1.svg
new file mode 100644
index 000000000..f2642a157
--- /dev/null
+++ b/src/assets/imgs/reports-page/Note 1.svg	
@@ -0,0 +1,9 @@
+<svg id="Group_61" data-name="Group 61" xmlns="http://www.w3.org/2000/svg" width="17.77" height="21.426" viewBox="0 0 17.77 21.426">
+  <g id="Group_56" data-name="Group 56" transform="translate(0 0)">
+    <path id="Path_337" data-name="Path 337" d="M56.8,244.389a5.963,5.963,0,0,0-.018-.619,1.89,1.89,0,0,0-1.23-1.617,1.943,1.943,0,0,0-.635-.117c-.048,0-.1,0-.146,0s-.092,0-.139,0c-.615-.007-1.232,0-1.849,0-.116,0-.231-.016-.37-.028a1.574,1.574,0,0,0-1.045-1.772H44.512l-.027.011A1.574,1.574,0,0,0,43.468,242c-.153.011-.279.03-.405.03-.6,0-1.2-.005-1.8,0l-.139,0c-.066,0-.132,0-.2,0a1.938,1.938,0,0,0-1.027.311l-.048.032a1.616,1.616,0,0,0-.6.7l-.027.055c-.007.02-.016.041-.025.062a1.993,1.993,0,0,0-.144.571l-.005.069c-.016.181-.014.364-.014.549q0,5.8,0,11.6v3.237a4.078,4.078,0,0,0,.121,1.141c.183.6.6.926,1.456,1.287H55.23c.818-.345,1.232-.656,1.424-1.212a3.761,3.761,0,0,0,.146-1.216v-3.692Q56.8,249.961,56.8,244.389Zm-11.49-2.35h5.238v1.735H45.308Zm9.737,17.378c0,.357-.117.459-.482.455-1.891-.011-3.782-.009-5.674-.009H46.979c-1.9,0-3.8,0-5.7.009-.375,0-.485-.1-.483-.483v-.005q.008-3.087.009-6.177,0-4.477-.007-8.953a1.116,1.116,0,0,1,.012-.181v0a.3.3,0,0,1,.274-.286h.587a.044.044,0,0,1,.021,0c.453,0,.91,0,1.378,0h.393c.005.043.009.085.011.124a3.7,3.7,0,0,0,.005.4,1.352,1.352,0,0,0,.67,1.082c.028.016.057.032.085.044a.88.88,0,0,0,.085.037c.039.016.078.028.119.041a1,1,0,0,0,.126.028c.043.009.087.014.132.02s.089.005.135.005q3.1.011,6.211,0h.014a1.337,1.337,0,0,0,1.358-1.258c.014-.155,0-.313,0-.528h.364c.467,0,.924.005,1.379,0a.051.051,0,0,1,.023,0h.578c.233.036.288.188.288.471q-.005,3.471-.007,6.941v1.978q0,.672,0,1.342,0,1.1,0,2.2,0,1.338.005,2.675Z" transform="translate(-39.03 -240.23)" fill="#4791ff"/>
+    <path id="Path_338" data-name="Path 338" d="M66.145,301.559a.965.965,0,0,1-1.052,1.022c-.511,0-1.02.006-1.531.006-1.118,0-2.236,0-3.352-.006a.984.984,0,0,1-1.072-1.008.935.935,0,0,1,.757-.922,1.457,1.457,0,0,1,.3-.036c.823-.01,1.647,0,2.468,0,.805,0,1.609-.006,2.414,0C65.75,300.623,66.131,300.97,66.145,301.559Z" transform="translate(-55.809 -289.999)" fill="#4791ff"/>
+    <path id="Path_339" data-name="Path 339" d="M95.242,281.388c.006.625-.4,1-1.12,1.012-.625.012-1.25,0-1.875,0s-1.25.01-1.877,0a1.012,1.012,0,1,1,.026-2q1.848-.012,3.7,0C94.807,280.4,95.234,280.781,95.242,281.388Z" transform="translate(-80.793 -273.334)" fill="#4791ff"/>
+    <path id="Path_340" data-name="Path 340" d="M60.179,321.591a1.01,1.01,0,0,1-1.036.982q-.063.006-.126.006c-.625.006-1.252,0-1.875,0s-1.252.008-1.877,0a.975.975,0,0,1-1.094-.984,1,1,0,0,1,1.12-1.018q1.662-.012,3.326,0l.427,0A1.027,1.027,0,0,1,60.179,321.591Z" transform="translate(-51.625 -306.454)" fill="#4791ff"/>
+    <path id="Path_341" data-name="Path 341" d="M63.128,281.345a.949.949,0,0,1-.944,1.02c-.134.01-.266.014-.4.014-.088,0-.176,0-.264,0l-.058,0-.206,0c-.022,0-.046,0-.07,0h-.072l-.156,0c-.078,0-.156,0-.234,0-.144,0-.287,0-.431,0-.064,0-.13-.006-.2-.01a.984.984,0,0,1-.956-1.02.97.97,0,0,1,.954-.968c.7-.032,1.394-.03,2.09,0A.957.957,0,0,1,63.128,281.345Z" transform="translate(-55.677 -273.305)" fill="#4791ff"/>
+  </g>
+</svg>
diff --git a/src/assets/imgs/reports-page/Note 3.svg b/src/assets/imgs/reports-page/Note 3.svg
new file mode 100644
index 000000000..4b681f3fd
--- /dev/null
+++ b/src/assets/imgs/reports-page/Note 3.svg	
@@ -0,0 +1,11 @@
+<svg id="Group_3369" data-name="Group 3369" xmlns="http://www.w3.org/2000/svg" width="17.893" height="19.53" viewBox="0 0 17.893 19.53">
+  <g id="Group_59" data-name="Group 59" transform="translate(0 0)">
+    <path id="Path_355" data-name="Path 355" d="M373.547,251.577a1.112,1.112,0,0,1-.32-.841c.013-2.27.007-4.54.006-6.81a1.811,1.811,0,0,0-2.048-2.052H369.16a1.442,1.442,0,0,0-.952-1.642h-6.25a1.418,1.418,0,0,0-.922,1.61c-.153.012-.275.03-.4.031-.65,0-1.3-.008-1.951.005a1.723,1.723,0,0,0-1.707,1.581,5.587,5.587,0,0,0-.017.563q0,6.763,0,13.527c0,1.308.269,1.721,1.437,2.212h12.152a11.581,11.581,0,0,0,2.029-.791A4.816,4.816,0,0,0,373.547,251.577Zm-10.861-9.7H367.5v1.582h-4.814Zm3.584,16.209a2.829,2.829,0,0,1-.32.038c-2.314,0-4.628,0-6.941.009-.342,0-.442-.095-.441-.441q.017-6.9,0-13.8c0-.307.073-.448.409-.438.663.019,1.326.005,2.021.005.025.253.031.441.064.624a1.159,1.159,0,0,0,1.174,1.006q2.841.01,5.683,0a1.217,1.217,0,0,0,1.238-1.147c.014-.141,0-.286,0-.481.75,0,1.47,0,2.188,0,.3,0,.247.22.247.4q0,2.147,0,4.295v2.069c-2.554-.607-4.632.039-5.918,2.38A4.766,4.766,0,0,0,366.27,258.09Zm3.737.04a3.221,3.221,0,0,1-3.283-3.251,3.259,3.259,0,0,1,3.239-3.266,3.3,3.3,0,0,1,3.277,3.246A3.253,3.253,0,0,1,370.007,258.13Z" transform="translate(-356.963 -240.232)" fill="#ff2366"/>
+    <path id="Path_356" data-name="Path 356" d="M383.359,290.409h.127Zm-.537,0c.116,0,.231,0,.347,0C383.053,290.414,382.938,290.416,382.822,290.412Z" transform="translate(-378.632 -282.277)" fill="#ff2366"/>
+    <path id="Path_357" data-name="Path 357" d="M382.733,301.379a.779.779,0,0,1-.85.826q-1.974.012-3.949,0a.8.8,0,1,1-.008-1.59c.666-.009,1.331,0,2,0s1.3-.005,1.952,0C382.415,300.621,382.722,300.9,382.733,301.379Z" transform="translate(-373.809 -290.827)" fill="#ff2366"/>
+    <path id="Path_358" data-name="Path 358" d="M412.022,281.2c.005.507-.32.808-.906.819-.505.01-1.011,0-1.516,0s-1.011.007-1.517,0a.818.818,0,1,1,.02-1.621q1.5-.009,2.991,0C411.67,280.4,412.016,280.709,412.022,281.2Z" transform="translate(-399.026 -273.886)" fill="#ff2366"/>
+    <path id="Path_359" data-name="Path 359" d="M376.961,321.394a.839.839,0,0,1-.94.8c-.506.005-1.012,0-1.517,0s-1.012.007-1.517,0a.789.789,0,0,1-.885-.8.807.807,0,0,1,.905-.823q1.517-.01,3.035,0A.831.831,0,0,1,376.961,321.394Z" transform="translate(-369.649 -307.551)" fill="#ff2366"/>
+    <path id="Path_360" data-name="Path 360" d="M380.3,281.158a.766.766,0,0,1-.763.824c-.108.009-.215.011-.324.011l-.214,0h-.048l-.166,0h-.242l-.19,0c-.116,0-.232,0-.347,0-.053,0-.106,0-.159-.009a.793.793,0,0,1-.773-.824.783.783,0,0,1,.771-.782c.562-.026,1.127-.025,1.689,0A.772.772,0,0,1,380.3,281.158Z" transform="translate(-373.814 -273.855)" fill="#ff2366"/>
+    <path id="Path_361" data-name="Path 361" d="M425.524,328.51c.573,0,1.147,0,1.72,0a.453.453,0,0,0,.5-.443.447.447,0,0,0-.487-.457q-1.749,0-3.5,0a.589.589,0,0,0-.241.051.449.449,0,0,0,.207.846C424.326,328.513,424.925,328.51,425.524,328.51Z" transform="translate(-412.534 -313.45)" fill="#ff2366"/>
+  </g>
+</svg>
diff --git a/src/assets/imgs/reports-page/Note 4.svg b/src/assets/imgs/reports-page/Note 4.svg
new file mode 100644
index 000000000..2c8d01750
--- /dev/null
+++ b/src/assets/imgs/reports-page/Note 4.svg	
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="17.972" height="21.67" viewBox="0 0 17.972 21.67">
+  <g id="Group_60" data-name="Group 60" transform="translate(0)">
+    <g id="Group_57" data-name="Group 57" transform="translate(0 0)">
+      <path id="Path_342" data-name="Path 342" d="M221.09,282.384q-.944.971-1.916,1.915a1,1,0,0,1-1.529-.013c-.3-.287-.594-.583-.88-.882a1.029,1.029,0,0,1-.082-1.492,1.054,1.054,0,0,1,1.5.06c.067.059.132.12.266.244.423-.437.815-.861,1.228-1.266a.986.986,0,0,1,1.485-.061A1.026,1.026,0,0,1,221.09,282.384Z" transform="translate(-213.237 -273.511)" fill="#c79d03"/>
+      <path id="Path_343" data-name="Path 343" d="M221.09,314.384q-.944.971-1.916,1.915a1,1,0,0,1-1.529-.013c-.3-.287-.594-.583-.88-.882a1.029,1.029,0,0,1-.082-1.492,1.054,1.054,0,0,1,1.5.06c.067.059.132.12.266.244.423-.437.815-.861,1.228-1.266a.986.986,0,0,1,1.485-.061A1.026,1.026,0,0,1,221.09,314.384Z" transform="translate(-213.237 -299.904)" fill="#c79d03"/>
+      <path id="Path_344" data-name="Path 344" d="M216,244.437a6.025,6.025,0,0,0-.018-.626,1.912,1.912,0,0,0-1.244-1.636,1.965,1.965,0,0,0-.642-.119c-.049,0-.1,0-.147,0s-.093,0-.14,0c-.622-.007-1.246,0-1.87,0-.117,0-.234-.016-.374-.029a1.592,1.592,0,0,0-1.057-1.792h-6.934l-.027.011a1.592,1.592,0,0,0-1.028,1.78c-.155.011-.282.031-.41.031-.608,0-1.217-.005-1.825,0l-.14,0c-.067,0-.133,0-.2,0a1.96,1.96,0,0,0-1.039.315l-.049.032a1.634,1.634,0,0,0-.608.712l-.027.056c-.007.02-.016.041-.025.063a2.016,2.016,0,0,0-.146.577l-.005.07c-.016.183-.014.369-.014.556q0,5.865,0,11.734v3.274a4.124,4.124,0,0,0,.122,1.154c.185.611.6.937,1.472,1.3h14.79c.827-.349,1.246-.663,1.44-1.226a3.8,3.8,0,0,0,.147-1.23V255.71Q216,250.072,216,244.437ZM204.38,242.06h5.3v1.755h-5.3Zm9.848,17.577c0,.361-.119.464-.487.46-1.913-.011-3.826-.009-5.738-.009H206.07c-1.924,0-3.845,0-5.769.009-.379,0-.491-.1-.489-.489V259.6q.008-3.123.009-6.247,0-4.528-.007-9.055a1.132,1.132,0,0,1,.013-.183v0a.3.3,0,0,1,.277-.289h.593a.044.044,0,0,1,.022,0c.458,0,.92,0,1.393,0h.4c.005.043.009.086.011.126a3.745,3.745,0,0,0,.005.408,1.367,1.367,0,0,0,.678,1.095c.029.016.058.032.086.045a.889.889,0,0,0,.086.038c.04.016.079.029.12.041a1.014,1.014,0,0,0,.128.029c.043.009.088.014.133.02s.09.005.137.005q3.139.011,6.281,0h.014a1.352,1.352,0,0,0,1.373-1.273c.014-.156,0-.316,0-.534h.369c.473,0,.935.005,1.4,0a.051.051,0,0,1,.023,0h.584c.236.036.291.191.291.476q-.005,3.511-.007,7.02v2q0,.68,0,1.357,0,1.114,0,2.224,0,1.354.005,2.706Z" transform="translate(-198.03 -240.23)" fill="#c79d03"/>
+      <path id="Path_345" data-name="Path 345" d="M255.225,301.57a.976.976,0,0,1-1.064,1.033c-.517,0-1.031.006-1.548.006-1.131,0-2.261,0-3.39-.006a1,1,0,0,1-1.084-1.019.946.946,0,0,1,.766-.932,1.475,1.475,0,0,1,.308-.036c.833-.01,1.666,0,2.5,0,.815,0,1.627-.006,2.442,0C254.826,300.624,255.211,300.974,255.225,301.57Z" transform="translate(-240.27 -289.878)" fill="#c79d03"/>
+      <path id="Path_346" data-name="Path 346" d="M254.216,322.012a1.022,1.022,0,0,1-1.048.993q-.064.006-.128.006c-.632.006-1.267,0-1.9,0s-1.267.008-1.9,0a.986.986,0,0,1-1.106-.995,1.008,1.008,0,0,1,1.133-1.029q1.681-.012,3.364,0l.432,0A1.039,1.039,0,0,1,254.216,322.012Z" transform="translate(-239.621 -306.63)" fill="#c79d03"/>
+      <path id="Path_347" data-name="Path 347" d="M252.173,281.356a.96.96,0,0,1-.954,1.031c-.136.01-.27.014-.405.014-.089,0-.178,0-.267,0l-.059,0-.209,0c-.022,0-.047,0-.071,0h-.073l-.158,0c-.079,0-.158,0-.237,0-.146,0-.29,0-.436,0-.065,0-.132-.006-.2-.01a1,1,0,0,1-.967-1.031.981.981,0,0,1,.965-.979c.7-.032,1.41-.03,2.114,0A.968.968,0,0,1,252.173,281.356Z" transform="translate(-239.415 -273.224)" fill="#c79d03"/>
+    </g>
+  </g>
+</svg>
diff --git a/src/assets/imgs/reports-page/note.svg b/src/assets/imgs/reports-page/note.svg
new file mode 100644
index 000000000..e9220da77
--- /dev/null
+++ b/src/assets/imgs/reports-page/note.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="17.77" height="19.677" viewBox="0 0 17.77 19.677">
+  <g id="Group_3373" data-name="Group 3373" transform="translate(0 0)">
+    <path id="Path_348" data-name="Path 348" d="M495.041,251.662a1.13,1.13,0,0,1-.318-.847c.013-2.287.007-4.574.006-6.861a1.812,1.812,0,0,0-2.034-2.067h-2.009a1.455,1.455,0,0,0-.946-1.655h-6.207a1.431,1.431,0,0,0-.915,1.622c-.152.012-.273.031-.395.031-.646,0-1.292-.008-1.938.005a1.721,1.721,0,0,0-1.695,1.593,5.653,5.653,0,0,0-.017.568q0,6.813,0,13.629c0,1.318.267,1.734,1.427,2.229h12.069a11.408,11.408,0,0,0,2.015-.8A4.894,4.894,0,0,0,495.041,251.662Zm-10.786-9.769h4.781v1.593h-4.781Zm3.559,16.331a2.77,2.77,0,0,1-.317.039c-2.3,0-4.6,0-6.894.009-.34,0-.439-.1-.438-.444q.017-6.95,0-13.9c0-.31.072-.451.406-.442.659.019,1.317.005,2.007.005.025.255.031.444.064.629a1.156,1.156,0,0,0,1.166,1.014q2.821.011,5.644,0a1.216,1.216,0,0,0,1.229-1.155c.014-.143,0-.288,0-.485.745,0,1.459,0,2.173,0,.294,0,.246.221.246.406q0,2.163,0,4.327v2.084c-2.536-.611-4.6.039-5.878,2.4A4.856,4.856,0,0,0,487.814,258.225Zm3.711.04a3.222,3.222,0,0,1-3.26-3.275,3.261,3.261,0,0,1,3.216-3.291,3.3,3.3,0,0,1,3.254,3.271A3.256,3.256,0,0,1,491.525,258.265Z" transform="translate(-478.571 -240.232)" fill="#02bc77"/>
+    <path id="Path_350" data-name="Path 350" d="M504.3,301.385a.779.779,0,0,1-.844.833q-1.961.012-3.922,0a.8.8,0,0,1-.861-.822.789.789,0,0,1,.854-.78c.661-.009,1.321,0,1.983,0s1.292-.005,1.939,0A.756.756,0,0,1,504.3,301.385Z" transform="translate(-495.44 -290.754)" fill="#02bc77"/>
+    <path id="Path_351" data-name="Path 351" d="M533.6,281.2c.005.511-.318.814-.9.826-.5.01-1,0-1.506,0s-1,.007-1.507,0a.823.823,0,1,1,.02-1.633q1.486-.009,2.971,0C533.247,280.4,533.59,280.711,533.6,281.2Z" transform="translate(-520.689 -273.838)" fill="#02bc77"/>
+    <path id="Path_352" data-name="Path 352" d="M498.536,321.4a.838.838,0,0,1-.934.8c-.5.005-1.005,0-1.507,0s-1.005.007-1.507,0a.788.788,0,0,1-.878-.8.806.806,0,0,1,.9-.829q1.506-.01,3.014,0A.83.83,0,0,1,498.536,321.4Z" transform="translate(-491.274 -307.454)" fill="#02bc77"/>
+    <path id="Path_353" data-name="Path 353" d="M501.883,281.164a.768.768,0,0,1-.758.83c-.107.009-.214.011-.322.011l-.212,0h-.047l-.165,0h-.241l-.189,0c-.116,0-.23,0-.345,0-.053,0-.105,0-.158-.009a.794.794,0,0,1-.767-.83.783.783,0,0,1,.765-.788c.558-.026,1.119-.025,1.678,0A.772.772,0,0,1,501.883,281.164Z" transform="translate(-495.444 -273.806)" fill="#02bc77"/>
+    <path id="Path_354" data-name="Path 354" d="M552.662,322.034q-.75.782-1.521,1.543a.79.79,0,0,1-1.214-.01c-.24-.231-.472-.47-.7-.711a.838.838,0,0,1-.065-1.2.829.829,0,0,1,1.191.048c.053.047.1.1.211.2.336-.352.647-.693.975-1.02a.776.776,0,0,1,1.179-.049A.835.835,0,0,1,552.662,322.034Z" transform="translate(-537.615 -307.464)" fill="#02bc77"/>
+  </g>
+</svg>
diff --git a/src/assets/imgs/round_blue_profile.svg b/src/assets/imgs/round_blue_profile.svg
new file mode 100644
index 000000000..a141a9f72
--- /dev/null
+++ b/src/assets/imgs/round_blue_profile.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="88px" height="88px" viewBox="0 0 88 88" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 63.1 (101010) - https://sketch.com -->
+    <title>245F19EE-9055-4FEF-A27A-AE3886F343D5</title>
+    <desc>Created with sketchtool.</desc>
+    <defs>
+        <path d="M44,6 C23.024,6 6,23.024 6,44 C6,64.976 23.024,82 44,82 C64.976,82 82,64.976 82,44 C82,23.024 64.976,6 44,6 L44,6 Z M44.5,17 C50.8633333,17 56,22.1366667 56,28.5 C56,34.8633333 50.8633333,40 44.5,40 C38.1366667,40 33,34.8633333 33,28.5 C33,22.1366667 38.1366667,17 44.5,17 L44.5,17 Z M44,71 C34.4166667,71 25.945,66.1238095 21,58.7333333 C21.115,51.152381 36.3333333,47 44,47 C51.6283333,47 66.885,51.152381 67,58.7333333 C62.055,66.1238095 53.5833333,71 44,71 L44,71 Z" id="path-1"></path>
+    </defs>
+    <g id="Linked-Profile" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Linked-Profile---Add-user-02" transform="translate(-136.000000, -132.000000)">
+            <g id="Group-2" transform="translate(136.000000, 132.000000)">
+                <circle id="Oval-2" fill="#E5EDF5" cx="44" cy="44" r="44"></circle>
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <use id="Mask" fill="#92B4D5" xlink:href="#path-1"></use>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/search.svg b/src/assets/imgs/search.svg
new file mode 100644
index 000000000..0f2bbc49d
--- /dev/null
+++ b/src/assets/imgs/search.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>1E403C7F-F9D3-4E37-9A55-07C493856C06</title>
+    <g id="Search-page" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Search-page-01" transform="translate(-307.000000, -161.000000)">
+            <g id="Group-11" transform="translate(16.000000, 146.000000)">
+                <g id="Group-4-Copy" transform="translate(292.000000, 16.000000)">
+                    <rect id="Rectangle" x="0" y="0" width="20" height="20"></rect>
+                    <path d="M16.6666667,8.88888889 C16.6666667,13.1847924 13.1847924,16.6666667 8.88888889,16.6666667 C4.59298539,16.6666667 1.11111111,13.1847924 1.11111111,8.88888889 C1.11111111,4.59298539 4.59298539,1.11111111 8.88888889,1.11111111 C13.1847924,1.11111111 16.6666667,4.59298539 16.6666667,8.88888889 Z" id="Stroke-1" stroke="#0531FF" stroke-width="3" stroke-linecap="round"></path>
+                    <line x1="20" y1="20" x2="14.4444444" y2="14.4444444" id="Stroke-3" stroke="#0531FF" stroke-width="3" stroke-linecap="round"></line>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/sub_chemistry.svg b/src/assets/imgs/sub_chemistry.svg
new file mode 100644
index 000000000..7413e2412
--- /dev/null
+++ b/src/assets/imgs/sub_chemistry.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="27px" viewBox="0 0 21 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Group 10</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Colors" transform="translate(-261.000000, -510.000000)" stroke="#C4A23B" stroke-width="0.54">
+            <g id="Group-10" transform="translate(262.000000, 511.000000)">
+                <circle id="Oval" cx="5.58" cy="13.14" r="1.08"></circle>
+                <path d="M9.54,22.86 C13.4170389,22.86 16.56,19.7170389 16.56,15.84 C16.56,14.5517801 16.2130086,13.3446043 15.6073919,12.3068388 C12.830692,13.9956581 11.4543212,16.0934254 9.20064284,17.061058 C8.66862571,17.2894833 5.08336138,18.9181669 2.66622286,17.2722606 C3.32753104,20.4624354 6.15377491,22.86 9.54,22.86 Z" id="Oval"></path>
+                <rect id="Rectangle" x="3.6" y="0" width="11.88" height="2.16" rx="1.08"></rect>
+                <path d="M13.32,2.16 L13.3205222,7.07839653 C16.7088058,8.54237237 19.08,11.9142751 19.08,15.84 C19.08,21.1087965 14.8087965,25.38 9.54,25.38 C4.27120349,25.38 0,21.1087965 0,15.84 C0,11.9138918 2.37165727,8.54171393 5.76047028,7.07796777 L5.76,2.16 L13.32,2.16 Z" id="Combined-Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/sub_english.svg b/src/assets/imgs/sub_english.svg
new file mode 100644
index 000000000..d9a4728bf
--- /dev/null
+++ b/src/assets/imgs/sub_english.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="23px" viewBox="0 0 18 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>E</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Colors" transform="translate(-265.000000, -353.000000)" stroke="#84CB80" stroke-width="0.54">
+            <path d="M282,374.64 L282,371.683529 C282,371.484707 281.838823,371.323529 281.64,371.323529 L272.238345,371.323529 C272.039523,371.323529 271.878345,371.162352 271.878345,370.963529 L271.878345,366.271765 C271.878345,366.072942 272.039523,365.911765 272.238345,365.911765 L280.93927,365.911765 C281.138093,365.911765 281.29927,365.750587 281.29927,365.551765 L281.29927,362.624706 C281.29927,362.425883 281.138093,362.264706 280.93927,362.264706 L272.238345,362.264706 C272.039523,362.264706 271.878345,362.103528 271.878345,361.904706 L271.878345,358.007059 C271.878345,357.808236 272.039523,357.647059 272.238345,357.647059 L281.64,357.647059 C281.838823,357.647059 282,357.485881 282,357.287059 L282,354.36 C282,354.161177 281.838823,354 281.64,354 L266.36,354 C266.161177,354 266,354.161177 266,354.36 L266,374.64 C266,374.838823 266.161177,375 266.36,375 L281.64,375 C281.838823,375 282,374.838823 282,374.64 Z" id="E"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/sub_geography.svg b/src/assets/imgs/sub_geography.svg
new file mode 100644
index 000000000..b67f99e8d
--- /dev/null
+++ b/src/assets/imgs/sub_geography.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="25px" height="28px" viewBox="0 0 25 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>@0.5xGroup 15 Copy</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linejoin="round">
+        <g id="Colors" transform="translate(-257.000000, -591.000000)" stroke="#31AC99" stroke-width="0.54">
+            <g id="Group-15-Copy" transform="translate(257.000000, 592.000000)">
+                <g id="Group-2" transform="translate(0.680000, 0.861357)">
+                    <g id="Group">
+                        <circle id="Oval" cx="14.3526261" cy="10.038643" r="7.74"></circle>
+                        <path d="M7.68854872,21.9046503 C11.3031579,21.9046503 14.4677002,19.9776848 16.2109405,17.0949891 C17.1185401,15.594144 17.6408739,13.8342333 17.6408739,11.9523252 C17.6408739,6.45580775 13.1850661,2 7.68854872,2 C6.75692536,2 5.85519951,2.12800648 5,2.36739063" id="Oval" transform="translate(11.320437, 11.952325) rotate(145.000000) translate(-11.320437, -11.952325) "></path>
+                        <rect id="Rectangle" x="13.0926261" y="19.938643" width="2.34" height="2.16"></rect>
+                        <path d="M6.97262608,22.098643 L21.7326261,22.098643 C21.7326261,23.6892231 20.4432062,24.978643 18.8526261,24.978643 L9.85262608,24.978643 C8.262046,24.978643 6.97262608,23.6892231 6.97262608,22.098643 L6.97262608,22.098643 L6.97262608,22.098643 Z" id="Rectangle" transform="translate(14.352626, 23.538643) scale(1, -1) translate(-14.352626, -23.538643) "></path>
+                        <path d="M12.1926261,2.478643 C11.2447038,3.05539047 11.4436917,3.91596368 12.78959,5.06036264 C14.8084374,6.77696107 13.1192097,11.1612242 12.139849,11.1932984 C11.1604883,11.2253725 11.0787432,7.5345567 10.3533984,8.38832064 C9.62805364,9.24208458 7.44806209,9.39451754 6.77603556,9.18400626" id="Path-3"></path>
+                        <path d="M20.1006631,7.77884927 C19.7998787,6.9361597 19.024407,7.25652357 17.7742479,8.73994089 C15.8990092,10.9650669 14.4735595,12.3904352 15.714006,14.0109883 C16.5409703,15.091357 17.2277176,14.5109701 17.7742479,12.2698277 L18.5780868,13.3498277 L18.5780868,15.324436 L19.7603866,16.7860592" id="Path-4" transform="translate(17.674404, 12.053490) rotate(33.000000) translate(-17.674404, -12.053490) "></path>
+                    </g>
+                    <circle id="Oval" transform="translate(9.222626, 1.308643) scale(1, -1) translate(-9.222626, -1.308643) " cx="9.22262608" cy="1.308643" r="1"></circle>
+                    <circle id="Oval-Copy-4" transform="translate(22.542626, 15.348643) scale(1, -1) translate(-22.542626, -15.348643) " cx="22.5426261" cy="15.348643" r="1"></circle>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/sub_hindi.svg b/src/assets/imgs/sub_hindi.svg
new file mode 100644
index 000000000..b2f2cce1c
--- /dev/null
+++ b/src/assets/imgs/sub_hindi.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="26px" viewBox="0 0 21 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>हि</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Colors" transform="translate(-262.000000, -431.000000)" stroke="#5AA6B8" stroke-width="0.54">
+            <path d="M278.451132,456 L279.755234,453.480892 C275.158809,453.101911 274.111252,451.987261 274.111252,450.716561 C274.111252,449.601911 275.137431,448.799363 276.762213,448.799363 C277.403575,448.799363 277.831149,449.089172 277.831149,449.579618 C277.831149,450.203822 277.403575,450.716561 276.911864,451.229299 L279.349039,452.72293 C279.904885,452.031847 280.460732,451.095541 280.460732,449.847134 C280.460732,448.063694 279.178009,446.39172 276.762213,446.39172 C276.035337,446.39172 275.372596,446.480892 274.773992,446.659236 C274.154009,446.347134 273.854707,445.878981 273.854707,445.455414 C273.854707,445.009554 274.089873,444.697452 274.880886,444.697452 L279.648341,444.697452 L279.648341,440.929936 L282,440.929936 L282,438.5 L269.279661,438.5 L269.279661,440.929936 L276.740835,440.929936 L276.740835,442.267516 L274.154009,442.267516 C272.165788,442.267516 270.947201,443.315287 270.947201,444.853503 C270.947201,445.990446 271.460291,446.971338 272.657499,447.707006 C271.738214,448.464968 271.203746,449.490446 271.203746,450.605096 C271.203746,453.993631 274.560205,455.598726 278.451132,456 Z M268.292047,453.5 L268.292047,441.004654 L269.268103,441.004654 L269.260819,438.581179 L268.292047,438.581179 L268.292047,437.047053 C268.292047,435.468459 269.324641,434.668046 271.067145,434.668046 C273.992829,434.668046 275.885919,436.068769 277.026076,437.513961 L278.940678,435.624095 C278.05867,434.423475 275.412647,432 271.110169,432 C267.668188,432 265.258801,433.778697 265.258801,437.069286 L265.258801,438.581179 L263,438.581179 L263,441.004654 L265.258801,441.004654 L265.258801,453.5 L268.292047,453.5 Z" id="हि"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/sub_math.svg b/src/assets/imgs/sub_math.svg
new file mode 100644
index 000000000..c3e5acde2
--- /dev/null
+++ b/src/assets/imgs/sub_math.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="27px" height="26px" viewBox="0 0 27 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Group 8 Copy</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Colors" transform="translate(-256.000000, -107.000000)" stroke="#F17377" stroke-width="0.54">
+            <g id="Group-8-Copy" transform="translate(257.000000, 108.000000)">
+                <line x1="8.01" y1="4.23" x2="9.81" y2="4.23" id="Line" stroke-linecap="round"></line>
+                <line x1="8.01" y1="7.65" x2="9.81" y2="7.65" id="Line-Copy-4" stroke-linecap="round"></line>
+                <line x1="8.01" y1="5.94" x2="8.91" y2="5.94" id="Line-Copy-3" stroke-linecap="round"></line>
+                <line x1="8.01" y1="9.36" x2="8.91" y2="9.36" id="Line-Copy-5" stroke-linecap="round"></line>
+                <line x1="8.01" y1="11.07" x2="9.81" y2="11.07" id="Line-Copy-7" stroke-linecap="round"></line>
+                <line x1="8.01" y1="12.78" x2="8.91" y2="12.78" id="Line-Copy-6" stroke-linecap="round"></line>
+                <line x1="8.01" y1="14.49" x2="9.81" y2="14.49" id="Line-Copy-9" stroke-linecap="round"></line>
+                <line x1="8.01" y1="16.2" x2="8.91" y2="16.2" id="Line-Copy-8" stroke-linecap="round"></line>
+                <line x1="8.01" y1="17.91" x2="9.81" y2="17.91" id="Line-Copy-11" stroke-linecap="round"></line>
+                <line x1="8.01" y1="19.62" x2="8.91" y2="19.62" id="Line-Copy-10" stroke-linecap="round"></line>
+                <path d="M8.36987708,0.899324093 C8.76747117,0.60102244 9.33160614,0.681514868 9.62990779,1.07910896 L9.62990779,1.07910896 L24.6143173,21.0512166 C24.7312153,21.2070253 24.7944095,21.3965538 24.7944095,21.5913396 C24.7944095,22.0883958 24.3914658,22.4913396 23.8944095,22.4913396 L23.8944095,22.4913396 L8.91,22.4913396 C8.41294373,22.4913396 8.01,22.0883958 8.01,21.5913396 L8.01,21.5913396 L8.01,1.61923189 C8.01,1.33600439 8.1433241,1.06929928 8.36987708,0.899324093 Z M11.5423969,9.62566978 L11.5423969,18.2656698 L18.0223969,18.2656698 L11.5423969,9.62566978 Z" id="Combined-Shape"></path>
+                <rect id="Rectangle" stroke-linejoin="round" x="0" y="3.42" width="5.58" height="15.12"></rect>
+                <polygon id="Rectangle" stroke-linejoin="round" transform="translate(2.790000, 21.150000) scale(1, -1) translate(-2.790000, -21.150000) " points="2.79 18.54 5.58 23.76 0 23.76"></polygon>
+                <path d="M0,0.18 L5.58,0.18 L5.58,0.63 C5.58,2.17087445 4.33087445,3.42 2.79,3.42 C1.24912555,3.42 1.88702697e-16,2.17087445 0,0.63 L0,0.18 L0,0.18 Z" id="Rectangle" stroke-linejoin="round" transform="translate(2.790000, 1.800000) scale(1, -1) translate(-2.790000, -1.800000) "></path>
+                <line x1="0.0754054054" y1="5.31" x2="5.50459459" y2="5.31" id="Line-2" stroke-linecap="round" stroke-linejoin="round"></line>
+                <line x1="1.62" y1="20.97" x2="4.14" y2="20.97" id="Line-2-Copy" stroke-linecap="round" stroke-linejoin="round"></line>
+                <line x1="2.79" y1="5.29568182" x2="2.79" y2="18.4643182" id="Line-4" stroke-linecap="round" stroke-linejoin="round"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/sub_science.svg b/src/assets/imgs/sub_science.svg
new file mode 100644
index 000000000..0cc26741d
--- /dev/null
+++ b/src/assets/imgs/sub_science.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="29px" height="28px" viewBox="0 0 29 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>41C1B398-D15A-4DFF-A0A7-0D78846A0B48@3x</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="02LibraryMore-than-4-subjects-1" transform="translate(-315.000000, -278.000000)" stroke="#D87EAC" stroke-width="0.54">
+            <g id="Group-17-Copy-2" transform="translate(132.000000, 240.000000)">
+                <g id="Group-17-Copy">
+                    <g id="Group-13" transform="translate(184.000000, 39.000000)">
+                        <circle id="Oval" cx="13.7808" cy="12.96" r="1.26"></circle>
+                        <circle id="Oval-Copy-5" cx="13.7808" cy="1.26" r="1.26"></circle>
+                        <circle id="Oval-Copy-6" cx="23.3208" cy="17.1" r="1.26"></circle>
+                        <circle id="Oval-Copy-7" cx="3.8808" cy="17.1" r="1.26"></circle>
+                        <ellipse id="Oval" cx="13.6908" cy="12.96" rx="5.49" ry="11.7"></ellipse>
+                        <ellipse id="Oval" transform="translate(13.708743, 12.974400) rotate(-49.000000) translate(-13.708743, -12.974400) " cx="13.708743" cy="12.9744" rx="4.8024" ry="13.9896"></ellipse>
+                        <ellipse id="Oval" transform="translate(13.708743, 12.974400) rotate(-131.000000) translate(-13.708743, -12.974400) " cx="13.708743" cy="12.9744" rx="4.8024" ry="13.9896"></ellipse>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/sub_social.svg b/src/assets/imgs/sub_social.svg
new file mode 100644
index 000000000..48fa5837a
--- /dev/null
+++ b/src/assets/imgs/sub_social.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="25px" height="27px" viewBox="0 0 25 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>C43F02D3-89E9-45D7-945A-F8788493C188@3x</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linejoin="round">
+        <g id="01-Library---More-than-4-subjects" transform="translate(-195.000000, -360.000000)" stroke="#9B91DA" stroke-width="0.54">
+            <g id="Group-7" transform="translate(8.000000, 321.000000)">
+                <g id="Group-15-Copy" transform="translate(188.000000, 40.000000)">
+                    <circle id="Oval" cx="14.0326261" cy="9.9" r="7.74"></circle>
+                    <circle id="Oval" transform="translate(8.902626, 1.170000) scale(1, -1) translate(-8.902626, -1.170000) " cx="8.90262608" cy="1.17" r="1"></circle>
+                    <circle id="Oval-Copy-4" transform="translate(22.222626, 15.210000) scale(1, -1) translate(-22.222626, -15.210000) " cx="22.2226261" cy="15.21" r="1"></circle>
+                    <path d="M7.36854872,21.7660073 C10.9831579,21.7660073 14.1477002,19.8390418 15.8909405,16.9563461 C16.7985401,15.455501 17.3208739,13.6955904 17.3208739,11.8136822 C17.3208739,6.31716475 12.8650661,1.861357 7.36854872,1.861357 C6.43692536,1.861357 5.53519951,1.98936349 4.68,2.22874764" id="Oval" transform="translate(11.000437, 11.813682) rotate(145.000000) translate(-11.000437, -11.813682) "></path>
+                    <rect id="Rectangle" x="12.7726261" y="19.8" width="2.34" height="2.16"></rect>
+                    <path d="M6.65262608,21.96 L21.4126261,21.96 C21.4126261,23.5505801 20.1232062,24.84 18.5326261,24.84 L9.53262608,24.84 C7.942046,24.84 6.65262608,23.5505801 6.65262608,21.96 L6.65262608,21.96 L6.65262608,21.96 Z" id="Rectangle" transform="translate(14.032626, 23.400000) scale(1, -1) translate(-14.032626, -23.400000) "></path>
+                    <path d="M11.8726261,2.34 C10.9247038,2.91674747 11.1236917,3.77732069 12.46959,4.92171964 C14.4884374,6.63831808 12.7992097,11.0225812 11.819849,11.0546554 C10.8404883,11.0867295 10.7587432,7.3959137 10.0333984,8.24967764 C9.30805364,9.10344158 7.12806209,9.25587455 6.45603556,9.04536326" id="Path-3"></path>
+                    <path d="M19.7806631,7.64020627 C19.4798787,6.7975167 18.704407,7.11788057 17.4542479,8.60129789 C15.5790092,10.8264239 14.1535595,12.2517922 15.394006,13.8723453 C16.2209703,14.952714 16.9077176,14.3723271 17.4542479,12.1311848 L18.2580868,13.2111848 L18.2580868,15.185793 L19.4403866,16.6474162" id="Path-4" transform="translate(17.354404, 11.914847) rotate(33.000000) translate(-17.354404, -11.914847) "></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/subdirectory_arrow.png b/src/assets/imgs/subdirectory_arrow.png
new file mode 100644
index 000000000..2d5932274
Binary files /dev/null and b/src/assets/imgs/subdirectory_arrow.png differ
diff --git a/src/assets/imgs/submitted.svg b/src/assets/imgs/submitted.svg
new file mode 100644
index 000000000..277eff39e
--- /dev/null
+++ b/src/assets/imgs/submitted.svg
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 256 256" style="enable-background:new 0 0 256 256;" xml:space="preserve" width="512" height="512">
+<style type="text/css">
+	.st0{fill:#3A312A;}
+	.st1{fill:#D7E057;}
+	.st2{fill:#F16C7A;}
+	.st3{fill:#FCE8CB;}
+	.st4{fill:#87796F;}
+	.st5{fill:#8AC6DD;}
+	.st6{fill:#CE4E61;}
+	.st7{fill:#6CA8BF;}
+	.st8{fill:#B9C239;}
+	.st9{fill:#DECAAD;}
+	.st10{fill:#695B51;}
+	.st11{fill-rule:evenodd;clip-rule:evenodd;fill:#FCE8CB;}
+	.st12{fill:#F5978A;}
+	.st13{fill:#68A8BC;}
+	.st14{fill:#B9BC39;}
+	.st15{fill:#6B5B51;}
+	.st16{fill:#D34E5C;}
+	.st17{fill-rule:evenodd;clip-rule:evenodd;fill:#87796F;}
+	.st18{fill-rule:evenodd;clip-rule:evenodd;fill:#F16C7A;}
+</style>
+<g>
+	<g>
+		<g>
+			<path class="st3" d="M17.404,52.043v176.28c0,6.16,5,11.16,11.16,11.16h144.41c6.16,0,11.16-5,11.16-11.16V52.043H17.404z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st0" d="M184.133,50.544H17.403c-0.829,0-1.5,0.672-1.5,1.5v37.017c0,0.828,0.671,1.5,1.5,1.5s1.5-0.672,1.5-1.5     V53.544h163.73v174.779c0,5.326-4.333,9.66-9.66,9.66H28.564c-5.327,0-9.66-4.334-9.66-9.66v-124.63c0-0.828-0.671-1.5-1.5-1.5     s-1.5,0.672-1.5,1.5v124.63c0,6.98,5.679,12.66,12.66,12.66h144.41c6.981,0,12.66-5.68,12.66-12.66V52.044     C185.633,51.216,184.962,50.544,184.133,50.544z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st2" d="M172.969,16.604H28.567c-6.165,0-11.162,4.998-11.162,11.162v24.278h166.728V27.766     C184.132,21.601,179.134,16.604,172.969,16.604z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st0" d="M172.969,15.104h-50.655c-0.829,0-1.5,0.672-1.5,1.5s0.671,1.5,1.5,1.5h50.655     c5.328,0,9.663,4.334,9.663,9.662v22.778H18.904V27.766c0-5.328,4.335-9.662,9.663-9.662h79.573c0.829,0,1.5-0.672,1.5-1.5     s-0.671-1.5-1.5-1.5H28.567c-6.982,0-12.663,5.681-12.663,12.662v24.278c0,0.828,0.671,1.5,1.5,1.5h166.727     c0.829,0,1.5-0.672,1.5-1.5V27.766C185.632,20.784,179.952,15.104,172.969,15.104z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st0" d="M163.755,102.21H35.369c-0.829,0-1.5,0.672-1.5,1.5s0.671,1.5,1.5,1.5h128.386c0.829,0,1.5-0.672,1.5-1.5     S164.583,102.21,163.755,102.21z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st0" d="M163.755,127.71H35.369c-0.829,0-1.5,0.672-1.5,1.5s0.671,1.5,1.5,1.5h128.386c0.829,0,1.5-0.672,1.5-1.5     S164.583,127.71,163.755,127.71z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st0" d="M163.755,76.71H35.369c-0.829,0-1.5,0.672-1.5,1.5s0.671,1.5,1.5,1.5h128.386c0.829,0,1.5-0.672,1.5-1.5     S164.583,76.71,163.755,76.71z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st0" d="M163.755,153.21H35.369c-0.829,0-1.5,0.672-1.5,1.5s0.671,1.5,1.5,1.5h128.386c0.829,0,1.5-0.672,1.5-1.5     S164.583,153.21,163.755,153.21z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st0" d="M141.393,178.71H35.369c-0.829,0-1.5,0.672-1.5,1.5s0.671,1.5,1.5,1.5h106.024c0.829,0,1.5-0.672,1.5-1.5     S142.222,178.71,141.393,178.71z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st0" d="M109.369,204.21h-74c-0.829,0-1.5,0.672-1.5,1.5s0.671,1.5,1.5,1.5h74c0.829,0,1.5-0.672,1.5-1.5     S110.197,204.21,109.369,204.21z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st1" d="M221.778,26.28c-0.974,11.563-13.024,13.39-13.024,13.39c10.346,0.487,12.925,14.059,12.925,14.059     C221.9,44.052,235,39.526,235,39.526C225.187,38.939,221.778,26.28,221.778,26.28z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st0" d="M235.089,38.029c-8.604-0.515-11.832-12.024-11.863-12.141c-0.191-0.703-0.86-1.167-1.583-1.102     c-0.725,0.066-1.298,0.642-1.359,1.367c-0.86,10.215-11.313,11.964-11.754,12.032c-0.763,0.116-1.313,0.791-1.273,1.561     c0.04,0.771,0.657,1.385,1.427,1.421c9.028,0.426,11.498,12.718,11.523,12.843c0.137,0.711,0.759,1.217,1.472,1.217     c0.042,0,0.084-0.002,0.126-0.005c0.764-0.064,1.357-0.693,1.375-1.46c0.195-8.509,12.192-12.777,12.313-12.819     c0.675-0.234,1.092-0.914,0.994-1.622C236.387,38.612,235.803,38.071,235.089,38.029z M221.523,48.375     c-1.356-3.13-3.709-6.907-7.587-8.876c2.931-1.405,6.409-3.914,8.202-8.273c1.551,3.071,4.199,6.88,8.334,8.723     C227.465,41.588,223.55,44.354,221.523,48.375z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st1" d="M200.079,43.261c-0.689,8.179-9.212,9.471-9.212,9.471c7.318,0.344,9.142,9.944,9.142,9.944     c0.156-6.845,9.422-10.046,9.422-10.046C202.49,52.215,200.079,43.261,200.079,43.261z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st0" d="M209.521,51.133c-5.766-0.345-7.972-8.186-7.994-8.265c-0.19-0.701-0.852-1.171-1.582-1.102     c-0.726,0.065-1.299,0.643-1.36,1.368c-0.579,6.871-7.646,8.066-7.942,8.113c-0.763,0.116-1.313,0.791-1.273,1.561     c0.04,0.771,0.657,1.385,1.427,1.421c6.036,0.284,7.724,8.645,7.74,8.727c0.135,0.713,0.759,1.22,1.472,1.22     c0.042,0,0.083-0.002,0.125-0.005c0.765-0.063,1.358-0.693,1.376-1.461c0.13-5.709,8.331-8.634,8.412-8.662     c0.677-0.234,1.094-0.913,0.996-1.622C210.82,51.717,210.235,51.175,209.521,51.133z M199.937,57.928     c-0.924-1.885-2.34-3.947-4.447-5.279c1.855-1.041,3.697-2.63,4.871-4.917c1.057,1.874,2.654,3.955,4.941,5.224     C203.451,54.056,201.313,55.695,199.937,57.928z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st1" d="M200.079,16.604c-0.689,8.179-9.212,9.47-9.212,9.47c7.318,0.344,9.142,9.944,9.142,9.944     c0.156-6.845,9.422-10.045,9.422-10.045C202.49,25.557,200.079,16.604,200.079,16.604z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st0" d="M209.521,24.476c-5.766-0.345-7.972-8.186-7.994-8.265c-0.19-0.702-0.852-1.164-1.582-1.102     c-0.726,0.065-1.299,0.643-1.36,1.368c-0.579,6.87-7.646,8.066-7.942,8.113c-0.763,0.116-1.313,0.791-1.273,1.561     c0.04,0.771,0.657,1.385,1.428,1.421c6.035,0.284,7.724,8.644,7.739,8.726c0.135,0.713,0.759,1.22,1.472,1.22     c0.042,0,0.083-0.002,0.125-0.005c0.765-0.063,1.358-0.693,1.376-1.461c0.13-5.708,8.331-8.633,8.412-8.661     c0.677-0.234,1.094-0.913,0.996-1.622C210.82,25.06,210.235,24.518,209.521,24.476z M199.937,31.271     c-0.924-1.886-2.34-3.947-4.447-5.28c1.855-1.041,3.697-2.629,4.871-4.916c1.057,1.874,2.654,3.954,4.941,5.224     C203.451,27.398,201.313,29.038,199.937,31.271z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<circle class="st1" cx="196.388" cy="196.714" r="40.931"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st0" d="M196.389,154.283c-23.396,0-42.431,19.034-42.431,42.431s19.035,42.431,42.431,42.431     c23.397,0,42.431-19.034,42.431-42.431S219.785,154.283,196.389,154.283z M196.389,236.145     c-21.742,0-39.431-17.688-39.431-39.431s17.689-39.431,39.431-39.431c21.742,0,39.431,17.688,39.431,39.431     S218.131,236.145,196.389,236.145z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st4" d="M222.775,178.795c-1.85-2.05-5.012-2.214-7.063-0.363l-28.124,25.371l-9.793-13.828     c-1.597-2.254-4.718-2.786-6.97-1.191c-2.254,1.596-2.787,4.717-1.19,6.97l13.045,18.419c0.825,1.166,2.11,1.923,3.529,2.08     c0.185,0.02,0.368,0.03,0.551,0.03c1.23,0,2.426-0.455,3.35-1.288l32.302-29.14C224.461,184.007,224.625,180.845,222.775,178.795     z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st0" d="M223.889,177.79c-1.163-1.289-2.758-2.049-4.493-2.138c-1.728-0.088-3.399,0.502-4.688,1.666l-26.871,24.24     l-8.817-12.451c-1.004-1.417-2.499-2.358-4.211-2.65c-1.708-0.296-3.434,0.1-4.85,1.103c-1.417,1.004-2.359,2.499-2.651,4.211     c-0.292,1.711,0.099,3.435,1.103,4.851l13.045,18.419c1.072,1.515,2.744,2.5,4.596,2.705c0.237,0.025,0.474,0.039,0.708,0.039     c1.61,0,3.157-0.595,4.354-1.674l32.302-29.141c1.289-1.162,2.048-2.758,2.137-4.492     C225.643,180.744,225.052,179.079,223.889,177.79z M221.407,184.742l-32.301,29.14c-0.742,0.669-1.78,0.987-2.731,0.881     c-0.993-0.109-1.893-0.641-2.47-1.456l-13.045-18.42c-0.54-0.763-0.751-1.69-0.594-2.611c0.157-0.922,0.664-1.727,1.428-2.268     c0.598-0.423,1.296-0.645,2.015-0.645c0.198,0,0.397,0.018,0.596,0.051c0.922,0.157,1.727,0.665,2.268,1.428l9.793,13.828     c0.247,0.35,0.633,0.576,1.059,0.624c0.425,0.041,0.851-0.092,1.17-0.377l28.124-25.372c0.694-0.626,1.592-0.944,2.525-0.896     c0.934,0.048,1.792,0.457,2.419,1.151c0.626,0.693,0.944,1.59,0.897,2.523C222.509,183.258,222.101,184.116,221.407,184.742z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st9" d="M182.633,156.583V53.543h-15v103.04c-11.14,3.83-20.2,12.17-24.98,22.83c0.16,0.23,0.24,0.5,0.24,0.8     c0,0.72-0.5,1.32-1.18,1.46c-1.79,4.68-2.76,9.75-2.76,15.04c0,17.34,10.46,32.27,25.4,38.85c-1.71,1.5-3.94,2.42-6.38,2.42h15     c2.44,0,4.67-0.92,6.38-2.42c-14.94-6.58-25.4-21.51-25.4-38.85C153.953,178.133,165.973,162.313,182.633,156.583z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path class="st16" d="M172.973,18.104h-15c5.32,0,9.66,4.33,9.66,9.66v22.78h15v-22.78     C182.633,22.434,178.293,18.104,172.973,18.104z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/src/assets/imgs/survey-expired.svg b/src/assets/imgs/survey-expired.svg
new file mode 100644
index 000000000..404dd1b87
--- /dev/null
+++ b/src/assets/imgs/survey-expired.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" enable-background="new 0 0 256 256" height="512" viewBox="0 0 256 256" width="512" xmlns="http://www.w3.org/2000/svg"><g id="Layer_41"><g><path d="m178 40.9-18-18c-1-1-2.4-1.6-3.9-1.6h-75.3c-2.5 0-4.4 2-4.4 4.4v70.5l41.5 38.8c5.7 5.5 14.6 5.5 20.3 0l41.5-38.8v-51.4c-.1-1.5-.7-2.9-1.7-3.9z" fill="#edf4fc"/><path d="m92.4 52.6h71.3c1.1 0 2 .9 2 2v36.3c0 1.1-.9 2-2 2h-71.3c-1.1 0-2-.9-2-2v-36.3c0-1.1.9-2 2-2z" fill="#ef4460"/><path d="m233.5 36.6h-59.8l4.3 4.3c1 1 1.6 2.4 1.6 3.8v33.8h6.7c2.8 0 5.4 1.1 7.4 3.1s3.2 4.7 3.2 7.5v80.5c0 5.8-4.7 10.6-10.6 10.6h-116.6c-3.1 0-6.1-1.4-8.1-3.8-1.6-1.9-2.4-4.3-2.4-6.7v-80.5c0-2.8 1.1-5.5 3.2-7.5 2-1.9 4.7-3 7.4-3h6.7v-42h-54c-6.6 0-12 5.4-12 12v140 .9c.6 6.1 5.8 10.7 11.9 10.6h211.2c6.1.1 11.3-4.5 11.9-10.6 0-.3 0-.6 0-.9v-140c0-6.7-5.4-12.1-12-12.1z" fill="#3a70bf"/><path d="m233.5 46.6h-53.9v32h6.7c5.8 0 10.6 4.7 10.6 10.6v80.5c0 5.8-4.7 10.6-10.6 10.6h-116.6c-3.2 0-6.1-1.4-8.2-3.8-1.6-1.9-2.4-4.3-2.4-6.7v-80.6c0-5.8 4.7-10.6 10.6-10.6h6.7v-32h-53.9c-1.1 0-2 .9-2 2v140 .2c.2.8 1 1.4 1.9 1.3h211.2c.9.1 1.7-.5 1.9-1.4v-.1-140c0-1.1-.9-2-2-2z" fill="#9be5f9"/><g fill="#edf4fc"><path d="m248.6 200.1h-241.2c-2.7 0-4.9 2.2-4.9 4.9 0 7.8 6.3 14.1 14.1 14.1h222.8c7.8 0 14.1-6.3 14.1-14.1 0-2.7-2.2-4.9-4.9-4.9z"/><path d="m76.4 46.6h-53.9c-1.1 0-2 .9-2 2v8.5h55.9z"/><path d="m233.5 46.6h-53.9v10.5h55.9v-8.5c0-1.1-.9-2-2-2z"/></g><path d="m36 46.6h-13.5c-1.1 0-2 .9-2 2v8.5h15.5z" fill="#9be5f9"/><path d="m84 200.1v1.7c0 3.7 3 6.8 6.8 6.8h75.4c3.7 0 6.8-3 6.8-6.8v-1.7z" fill="#c7d7e5"/><path d="m50.8 21.1c-4-.7-7.1-3.8-7.9-7.7 0-.1-.1-.2-.2-.1-.1 0-.1.1-.1.1-.8 4-3.9 7-7.9 7.7-.1 0-.2.1-.1.2 0 .1.1.1.1.1 4 .7 7.1 3.8 7.9 7.7 0 .1.1.2.2.1.1 0 .1-.1.1-.1.8-4 3.9-7 7.9-7.7.1 0 .2-.1.1-.2.1-.1 0-.1-.1-.1z" fill="#f5c84c"/><circle cx="105.7" cy="233.5" fill="#ef4460" r="3"/><circle cx="68" cy="10.8" fill="#70d6f9" r="3"/><circle cx="202.7" cy="21.5" fill="#87d147" r="3"/><path d="m141.3 237.7h-2.1v-2.1c0-1.5-1.3-2.8-2.8-2.8s-2.8 1.3-2.8 2.8v2.1h-2.1c-1.5 0-2.8 1.3-2.8 2.8s1.3 2.8 2.8 2.8h2.1v2.1c0 1.5 1.3 2.8 2.8 2.8s2.8-1.3 2.8-2.8v-2.1h2.1c1.5 0 2.8-1.3 2.8-2.8s-1.3-2.8-2.8-2.8z" fill="#70d6f9"/><path d="m178 40.9-18-18c-.5-.5-1-.8-1.6-1.1v16.2c0 2.5 2 4.4 4.4 4.4h16.2c-.2-.5-.5-1-1-1.5z" fill="#c7d7e5"/><path d="m186.3 78.6h-6.7v17.7l-41.5 38.8c-5.7 5.5-14.6 5.5-20.3 0l-41.4-38.8v-17.7h-6.7c-5.8 0-10.6 4.7-10.6 10.6v80.5c0 5.8 4.7 10.6 10.6 10.6h116.6c5.8 0 10.6-4.7 10.6-10.6v-80.5c0-5.9-4.8-10.6-10.6-10.6z" fill="#f5c84c"/><path d="m194.4 176.4-52.4-44.9-3.9 3.6c-5.7 5.5-14.6 5.5-20.3 0l-3.9-3.6-52.4 44.9c2.1 2.4 5 3.8 8.2 3.8h116.6c3.1 0 6.1-1.4 8.1-3.8z" fill="#fcdd86"/><path d="m76.4 78.6h-6.7c-3.2 0-6.2 1.4-8.2 3.8l14.8 13.9z" fill="#edb311"/><path d="m179.6 96.3 14.8-13.9c-2-2.4-5-3.8-8.2-3.8h-6.7z" fill="#edb311"/><path d="m133.6 61.1-4.8 4.8c-.4.4-1.1.4-1.5 0l-4.8-4.8c-.4-.4-1.1-.4-1.5 0l-4.5 4.5c-.4.4-.4 1.1 0 1.5l4.8 4.8c.4.4.4 1.1 0 1.5l-4.8 4.8c-.4.4-.4 1.1 0 1.5l4.5 4.5c.4.4 1.1.4 1.5 0l4.8-4.8c.4-.4 1.1-.4 1.5 0l4.8 4.8c.4.4 1.1.4 1.5 0l4.5-4.5c.4-.4.4-1.1 0-1.5l-4.8-4.8c-.4-.4-.4-1.1 0-1.5l4.8-4.8c.4-.4.4-1.1 0-1.5l-4.5-4.5c-.4-.4-1.1-.4-1.5 0z" fill="#edf4fc"/><path d="m248.6 197.6h-4c1.9-2.2 3.1-5 3.3-7.9 0-.4 0-.7 0-1.1v-140c0-8-6.5-14.5-14.5-14.5h-58.8l-12.9-12.9c-1.5-1.5-3.5-2.3-5.6-2.3h-75.3c-3.8 0-6.9 3.1-6.9 6.9v8.3h-51.4c-8 0-14.5 6.5-14.5 14.5v140c0 3.3 1.2 6.5 3.4 9h-4c-4.1 0-7.4 3.3-7.4 7.4 0 9.2 7.4 16.6 16.6 16.6h222.8c9.2 0 16.6-7.4 16.6-16.6 0-4.1-3.3-7.4-7.4-7.4zm-87.7-170.2 11 11 1.7 1.7h-10.7c-1.1 0-1.9-.9-1.9-1.9v-10.8zm-82-1.6c0-1.1.9-1.9 1.9-1.9h75.1v14.2c0 3.8 3.1 6.9 6.9 6.9h14.2v50.2l-40.7 38.1c-4.7 4.6-12.2 4.5-16.8-.1l-40.6-38zm154.1 33.8v128h-210v-128h50.9v16.5h-4.2c-7.2 0-13.1 5.9-13.1 13.1v80.5c0 3.1 1.1 6.1 3.2 8.5 2.5 2.8 6.1 4.5 9.8 4.6h.1 116.6.1c7.2 0 13-5.9 13-13.1v-80.5c0-7.2-5.9-13.1-13.1-13.1h-4.2v-16.5zm-50.9-5v-5.5h50.9v5.5zm-159.1 0v-5.5h10.5v5.5zm15.5 0v-5.5h35.4v5.5zm35.4 26.5v9.5l-8.6-8.1c1.3-.9 2.9-1.3 4.5-1.4zm-8.5 95.3 48.5-41.6 2.2 2.1c6.6 6.4 17.1 6.5 23.8.1l2.3-2.1 48.6 41.6c-1.3.8-2.8 1.3-4.3 1.3h-116.8c-1.5-.1-3-.5-4.3-1.4zm120.9-95.3c1.6 0 3.1.5 4.5 1.4l-8.6 8.1v-9.5zm7.6 5.3c.3.9.5 1.8.5 2.8v80.5c0 1-.2 2-.6 2.9l-48-41.2zm-83.7 45-48 41.2c-.4-.9-.5-1.9-.5-2.9v-80.5c0-.9.2-1.9.5-2.8zm-97.2-82.8c0-5.2 4.3-9.5 9.5-9.5h51.4v5h-51.4c-2.5 0-4.5 2-4.5 4.5v140c.1 2.3 2.1 4.1 4.4 4h211.2c2.2.1 4.1-1.5 4.4-3.6 0-.1 0-.2 0-.4v-140c0-2.5-2-4.5-4.5-4.5h-51.4c-.2-1.8-.9-3.5-2.2-4.8 0 0-.1-.1-.1-.1l-.1-.1h53.8c5.2 0 9.5 4.3 9.5 9.5v140 .7c-.5 4.8-4.6 8.4-9.4 8.3h-211.2c-5.1.1-9.3-3.9-9.4-9zm157.4 154c-.4 2-2.2 3.5-4.2 3.5h-75.4c-2.1 0-3.8-1.5-4.2-3.5zm69 14h-222.8c-6.4 0-11.6-5.2-11.6-11.6 0-1.3 1.1-2.4 2.4-2.4h74.1c.4 4.8 4.4 8.5 9.2 8.5h75.4c4.8 0 8.8-3.7 9.2-8.5h73.1c1.3 0 2.4 1.1 2.4 2.4.2 6.4-5 11.6-11.4 11.6z"/><path d="m168.1 90.9v-36.3c0-2.5-2-4.5-4.5-4.5h-71.2c-2.5 0-4.5 2-4.5 4.5v36.3c0 2.5 2 4.5 4.5 4.5h71.3c2.4 0 4.4-2 4.4-4.5zm-5-.5h-70.2v-35.3h70.3z"/><path d="m143.5 104c0-1.4-1.1-2.5-2.5-2.5h-26c-1.4 0-2.5 1.1-2.5 2.5s1.1 2.5 2.5 2.5h26c1.4 0 2.5-1.1 2.5-2.5z"/><path d="m131.9 111.2h-7.8c-1.4 0-2.5 1.1-2.5 2.5s1.1 2.5 2.5 2.5h7.8c1.4 0 2.5-1.1 2.5-2.5s-1.1-2.5-2.5-2.5z"/><path d="m114.6 81.6 4.5 4.5c1.4 1.4 3.7 1.4 5.1 0l3.8-3.8 3.8 3.8c1.4 1.4 3.7 1.4 5.1 0l4.5-4.5c1.4-1.4 1.4-3.7 0-5.1l-3.8-3.8 3.8-3.8c1.4-1.4 1.4-3.7 0-5.1l-4.5-4.5c-1.4-1.4-3.7-1.4-5.1 0l-3.8 3.8-3.8-3.8c-1.4-1.4-3.7-1.4-5.1 0l-4.5 4.5c-1.4 1.4-1.4 3.7 0 5.1l3.8 3.8-3.8 3.8c-1.4 1.5-1.4 3.7 0 5.1zm8.3-11.4-3.8-3.8 2.5-2.5 3.8 3.8c1.4 1.4 3.7 1.4 5.1 0l3.8-3.8 2.5 2.5-3.8 3.8c-1.4 1.4-1.4 3.7 0 5.1l3.8 3.8-2.5 2.5-3.8-3.8c-1.4-1.4-3.7-1.4-5.1 0l-3.8 3.8-2.5-2.5 3.8-3.8c1.4-1.4 1.4-3.7 0-5.1z"/></g></g></svg>
\ No newline at end of file
diff --git a/src/assets/imgs/tab_course.svg b/src/assets/imgs/tab_course.svg
new file mode 100644
index 000000000..f9968bead
--- /dev/null
+++ b/src/assets/imgs/tab_course.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="23px" height="22px" viewBox="0 0 23 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>B1C2055E-93DA-4DB6-A334-41ADDF8F3D76@2x</title>
+    <defs>
+        <filter id="filter-1">
+            <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 0.000000 0 0 0 0 0.000000 0 0 0 0 0.000000 0 0 0 1.000000 0"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Bottom-Navigation-icons" transform="translate(-97.000000, -662.000000)">
+            <g id="Group-9-Copy-10" transform="translate(0.000000, 623.000000)">
+                <g id="Group-5" transform="translate(72.000000, 28.000000)">
+                    <g id="Group-Copy-2" transform="translate(25.000000, 11.000000)">
+                        <rect id="Rectangle" fill-rule="nonzero" x="0.780788172" y="0" width="21.8620688" height="21.8620688"></rect>
+                        <g filter="url(#filter-1)" id="outline-school-24px">
+                            <g transform="translate(0.000000, 0.260263)">
+                                <path d="M9.95974855,1.06012871 L0.79335088,6.15257186 C0.310567148,6.42078504 0.136623351,7.02958833 0.404836535,7.51237206 C0.495583865,7.67571726 0.630282931,7.81036867 0.793660225,7.90105819 L3.4780564,9.39114663 L3.4780564,9.39114663 L3.4780564,15.8977147 L9.95939518,19.5001731 C10.5636238,19.8360156 11.298445,19.8360156 11.9026736,19.5001731 L18.3840124,15.8977147 L18.3840124,15.8977147 L18.3840124,9.39114663 L20.5134347,8.20912009 L20.5134347,14.6378065 C20.5134347,15.2258303 20.9901221,15.7025177 21.5781459,15.7025177 C22.1661696,15.7025177 22.642857,15.2258303 22.642857,14.6378065 L22.642857,7.6154969 C22.642857,7.25232978 22.4459651,6.91770917 22.1284999,6.74133962 L11.9023203,1.06012871 C11.2982752,0.724548108 10.5637936,0.724548108 9.95974855,1.06012871 Z M18.7389161,7.15722491 L10.9310344,11.4515599 L3.12315269,7.15722491 L10.9310344,2.86288997 L18.7389161,7.15722491 Z M16.3965516,14.723607 L10.9310344,17.6978652 L5.46551721,14.723607 L5.46551721,10.6707717 L10.9310344,13.6450299 L16.3965516,10.6707717 L16.3965516,14.723607 Z" id="Shape" fill="#024F9D" fill-rule="nonzero"></path>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/tab_course_selected.svg b/src/assets/imgs/tab_course_selected.svg
new file mode 100644
index 000000000..f10cb4422
--- /dev/null
+++ b/src/assets/imgs/tab_course_selected.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="23px" height="22px" viewBox="0 0 23 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>9C3633D0-A1EB-4F92-8888-148303FE9943@2x</title>
+    <defs>
+        <filter id="filter-1">
+            <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1.000000 0 0 0 0 0.462745 0 0 0 0 0.282353 0 0 0 1.000000 0"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Bottom-Navigation-icons" transform="translate(-97.000000, -563.000000)">
+            <g id="Group-9-Copy-9" transform="translate(0.000000, 524.000000)">
+                <g id="Group-5" transform="translate(72.000000, 28.000000)">
+                    <g id="Group-Copy-2" transform="translate(25.000000, 11.000000)">
+                        <rect id="Rectangle" fill-rule="nonzero" x="0.780788172" y="0" width="21.8620688" height="21.8620688"></rect>
+                        <g filter="url(#filter-1)" id="outline-school-24px">
+                            <g transform="translate(0.000000, 0.260263)">
+                                <path d="M9.95974855,1.06012871 L0.79335088,6.15257186 C0.310567148,6.42078504 0.136623351,7.02958833 0.404836535,7.51237206 C0.495583865,7.67571726 0.630282931,7.81036867 0.793660225,7.90105819 L3.4780564,9.39114663 L3.4780564,9.39114663 L3.4780564,15.8977147 L9.95939518,19.5001731 C10.5636238,19.8360156 11.298445,19.8360156 11.9026736,19.5001731 L18.3840124,15.8977147 L18.3840124,15.8977147 L18.3840124,9.39114663 L20.5134347,8.20912009 L20.5134347,14.6378065 C20.5134347,15.2258303 20.9901221,15.7025177 21.5781459,15.7025177 C22.1661696,15.7025177 22.642857,15.2258303 22.642857,14.6378065 L22.642857,7.6154969 C22.642857,7.25232978 22.4459651,6.91770917 22.1284999,6.74133962 L11.9023203,1.06012871 C11.2982752,0.724548108 10.5637936,0.724548108 9.95974855,1.06012871 Z M18.7389161,7.15722491 L10.9310344,11.4515599 L3.12315269,7.15722491 L10.9310344,2.86288997 L18.7389161,7.15722491 Z M16.3965516,14.723607 L10.9310344,17.6978652 L5.46551721,14.723607 L5.46551721,10.6707717 L10.9310344,13.6450299 L16.3965516,10.6707717 L16.3965516,14.723607 Z" id="Shape" fill="#024F9D" fill-rule="nonzero"></path>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/tab_download.svg b/src/assets/imgs/tab_download.svg
new file mode 100644
index 000000000..57419f3df
--- /dev/null
+++ b/src/assets/imgs/tab_download.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>F3CFC8D2-2AD5-4E6F-B86C-A918D727403C</title>
+    <defs>
+        <path d="M17.54,2.23 L16.15,0.55 C15.88,0.21 15.47,0 15,0 L3,0 C2.53,0 2.12,0.21 1.84,0.55 L0.46,2.23 C0.17,2.57 0,3.02 0,3.5 L0,16 C0,17.1 0.9,18 2,18 L16,18 C17.1,18 18,17.1 18,16 L18,3.5 C18,3.02 17.83,2.57 17.54,2.23 L17.54,2.23 Z M9,14.5 L3.5,9 L7,9 L7,7 L11,7 L11,9 L14.5,9 L9,14.5 L9,14.5 Z M2.12,2 L2.93,1 L14.93,1 L15.87,2 L2.12,2 L2.12,2 Z" id="path-1"></path>
+    </defs>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Bottom-Navigation-icons" transform="translate(-242.000000, -169.000000)">
+            <g id="Group-5-Copy" transform="translate(0.000000, 114.000000)">
+                <g id="ic_archive" transform="translate(242.000000, 55.000000)">
+                    <mask id="mask-2" fill="white">
+                        <use xlink:href="#path-1"></use>
+                    </mask>
+                    <use id="Mask" fill="#000000" xlink:href="#path-1"></use>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/tab_download_selected.svg b/src/assets/imgs/tab_download_selected.svg
new file mode 100644
index 000000000..3782a4796
--- /dev/null
+++ b/src/assets/imgs/tab_download_selected.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>28C2F27F-C804-47A4-A27C-4F4FFC1AF0E5</title>
+    <defs>
+        <path d="M17.54,2.23 L16.15,0.55 C15.88,0.21 15.47,0 15,0 L3,0 C2.53,0 2.12,0.21 1.84,0.55 L0.46,2.23 C0.17,2.57 0,3.02 0,3.5 L0,16 C0,17.1 0.9,18 2,18 L16,18 C17.1,18 18,17.1 18,16 L18,3.5 C18,3.02 17.83,2.57 17.54,2.23 L17.54,2.23 Z M9,14.5 L3.5,9 L7,9 L7,7 L11,7 L11,9 L14.5,9 L9,14.5 L9,14.5 Z M2.12,2 L2.93,1 L14.93,1 L15.87,2 L2.12,2 L2.12,2 Z" id="path-1"></path>
+    </defs>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Bottom-Navigation-icons" transform="translate(-242.000000, -399.000000)">
+            <g id="Group-5-Copy-3" transform="translate(0.000000, 344.000000)">
+                <g id="ic_archive" transform="translate(242.000000, 55.000000)">
+                    <mask id="mask-2" fill="white">
+                        <use xlink:href="#path-1"></use>
+                    </mask>
+                    <use id="Mask" fill="#B620E0" xlink:href="#path-1"></use>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/tab_home.svg b/src/assets/imgs/tab_home.svg
new file mode 100644
index 000000000..11b83ef1a
--- /dev/null
+++ b/src/assets/imgs/tab_home.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="17px" viewBox="0 0 20 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>77FB7E94-B5E4-41C1-A296-C1869A322B29</title>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Bottom-Navigation-icons" transform="translate(-31.000000, -288.000000)" fill="#000000">
+            <g id="Group-5-Copy-2" transform="translate(0.000000, 233.000000)">
+                <polygon id="Mask" points="39 72 39 66 43 66 43 72 48 72 48 64 51 64 41 55 31 64 34 64 34 72"></polygon>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/tab_home_selected.svg b/src/assets/imgs/tab_home_selected.svg
new file mode 100644
index 000000000..d915edfe0
--- /dev/null
+++ b/src/assets/imgs/tab_home_selected.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="17px" viewBox="0 0 20 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>F703A5B7-9A9A-4A40-8176-3A7CAA69E48A</title>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Bottom-Navigation-icons" transform="translate(-31.000000, -169.000000)" fill="#0531FF">
+            <g id="Group-5-Copy" transform="translate(0.000000, 114.000000)">
+                <polygon id="Mask" points="39 72 39 66 43 66 43 72 48 72 48 64 51 64 41 55 31 64 34 64 34 72"></polygon>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/tab_library.svg b/src/assets/imgs/tab_library.svg
new file mode 100644
index 000000000..c67b2c1cb
--- /dev/null
+++ b/src/assets/imgs/tab_library.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="22px" viewBox="0 0 21 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>35AE2595-9E5C-47B3-9144-B795FA59E3AE@2x</title>
+    <defs>
+        <filter id="filter-1">
+            <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 0.000000 0 0 0 0 0.000000 0 0 0 0 0.000000 0 0 0 1.000000 0"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Bottom-Navigation-icons" transform="translate(-26.000000, -662.000000)">
+            <g id="Group-9-Copy-10" transform="translate(0.000000, 623.000000)">
+                <g id="Group-4" transform="translate(0.000000, 28.000000)">
+                    <g id="104-copy-5" transform="translate(26.000000, 11.000000)">
+                        <polygon id="Path" points="1.1 1.1 20.9 1.1 20.9 20.9 1.1 20.9"></polygon>
+                        <g filter="url(#filter-1)" id="outline-collections_bookmark-24px">
+                            <g transform="translate(0.628571, 0.569643)">
+                                <path d="M16.8339286,0.530357143 L2.80892857,0.530357143 C1.52330357,0.530357143 0.471428571,1.64410714 0.471428571,3.00535714 L0.471428571,17.8553571 C0.471428571,19.2166071 1.52330357,20.3303571 2.80892857,20.3303571 L16.8339286,20.3303571 C18.1195536,20.3303571 19.1714286,19.2166071 19.1714286,17.8553571 L19.1714286,3.00535714 C19.1714286,1.64410714 18.1195536,0.530357143 16.8339286,0.530357143 Z M13.3276786,3.00535714 L13.3276786,9.19285714 L12.1589286,8.26473214 L10.9901786,9.19285714 L10.9901786,3.00535714 L13.3276786,3.00535714 Z M16.8339286,17.8553571 L2.80892857,17.8553571 L2.80892857,3.00535714 L8.65267857,3.00535714 L8.65267857,14.1428571 L12.1589286,11.3584821 L15.6651786,14.1428571 L15.6651786,3.00535714 L16.8339286,3.00535714 L16.8339286,17.8553571 Z" id="Shape" fill="#024F9D" fill-rule="nonzero"></path>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/tab_library_selected.svg b/src/assets/imgs/tab_library_selected.svg
new file mode 100644
index 000000000..11849266a
--- /dev/null
+++ b/src/assets/imgs/tab_library_selected.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="22px" viewBox="0 0 21 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>AC4A705F-AEEC-4D3E-AED2-4B721CEA5E24@2x</title>
+    <defs>
+        <filter id="filter-1">
+            <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 0.019608 0 0 0 0 0.192157 0 0 0 0 1.000000 0 0 0 1.000000 0"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Bottom-Navigation-icons" transform="translate(-26.000000, -563.000000)">
+            <g id="Group-9-Copy-9" transform="translate(0.000000, 524.000000)">
+                <g id="Group-4" transform="translate(0.000000, 28.000000)">
+                    <g id="104-copy-5" transform="translate(26.000000, 11.000000)">
+                        <polygon id="Path" points="1.1 1.1 20.9 1.1 20.9 20.9 1.1 20.9"></polygon>
+                        <g filter="url(#filter-1)" id="outline-collections_bookmark-24px">
+                            <g transform="translate(0.628571, 0.569643)">
+                                <path d="M16.8339286,0.530357143 L2.80892857,0.530357143 C1.52330357,0.530357143 0.471428571,1.64410714 0.471428571,3.00535714 L0.471428571,17.8553571 C0.471428571,19.2166071 1.52330357,20.3303571 2.80892857,20.3303571 L16.8339286,20.3303571 C18.1195536,20.3303571 19.1714286,19.2166071 19.1714286,17.8553571 L19.1714286,3.00535714 C19.1714286,1.64410714 18.1195536,0.530357143 16.8339286,0.530357143 Z M13.3276786,3.00535714 L13.3276786,9.19285714 L12.1589286,8.26473214 L10.9901786,9.19285714 L10.9901786,3.00535714 L13.3276786,3.00535714 Z M16.8339286,17.8553571 L2.80892857,17.8553571 L2.80892857,3.00535714 L8.65267857,3.00535714 L8.65267857,14.1428571 L12.1589286,11.3584821 L15.6651786,14.1428571 L15.6651786,3.00535714 L16.8339286,3.00535714 L16.8339286,17.8553571 Z" id="Shape" fill="#024F9D" fill-rule="nonzero"></path>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/tab_profile.svg b/src/assets/imgs/tab_profile.svg
new file mode 100644
index 000000000..f9480f1f3
--- /dev/null
+++ b/src/assets/imgs/tab_profile.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>0A04BAE8-5AFD-44BE-818A-6F6484FC62BB</title>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Bottom-Navigation-icons" transform="translate(-310.000000, -170.000000)" fill="#000000">
+            <g id="Group-5-Copy" transform="translate(0.000000, 114.000000)">
+                <g id="ic_person" transform="translate(310.000000, 56.000000)">
+                    <path d="M8,8 C10.21,8 12,6.21 12,4 C12,1.79 10.21,0 8,0 C5.79,0 4,1.79 4,4 C4,6.21 5.79,8 8,8 L8,8 Z M8,10 C5.33,10 0,11.34 0,14 L0,16 L16,16 L16,14 C16,11.34 10.67,10 8,10 L8,10 Z" id="Mask"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/tab_profile_selected.svg b/src/assets/imgs/tab_profile_selected.svg
new file mode 100644
index 000000000..2384718b2
--- /dev/null
+++ b/src/assets/imgs/tab_profile_selected.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>D36C8139-EEC6-4F9C-BAD3-5401456583D5</title>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Bottom-Navigation-icons" transform="translate(-310.000000, -512.000000)" fill="#737EFD">
+            <g id="Group-5-Copy-5" transform="translate(0.000000, 456.000000)">
+                <g id="ic_person" transform="translate(310.000000, 56.000000)">
+                    <path d="M8,8 C10.21,8 12,6.21 12,4 C12,1.79 10.21,0 8,0 C5.79,0 4,1.79 4,4 C4,6.21 5.79,8 8,8 L8,8 Z M8,10 C5.33,10 0,11.34 0,14 L0,16 L16,16 L16,14 C16,11.34 10.67,10 8,10 L8,10 Z" id="Mask"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/tab_search.svg b/src/assets/imgs/tab_search.svg
new file mode 100644
index 000000000..32607bd21
--- /dev/null
+++ b/src/assets/imgs/tab_search.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="21px" viewBox="0 0 21 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>F31596F2-E58C-4345-B662-F7FCBFB48922</title>
+    <defs>
+        <filter id="filter-1">
+            <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 0.000000 0 0 0 0 0.000000 0 0 0 0 0.000000 0 0 0 1.000000 0"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Bottom-Navigation-icons" transform="translate(-90.000000, -168.000000)">
+            <g id="Group-4-Copy" transform="translate(0.000000, 114.000000)" filter="url(#filter-1)">
+                <g transform="translate(91.000000, 55.000000)">
+                    <rect id="Rectangle" x="0" y="0" width="18" height="18"></rect>
+                    <path d="M15,8 C15,11.8663131 11.8663131,15 8,15 C4.13368685,15 1,11.8663131 1,8 C1,4.13368685 4.13368685,1 8,1 C11.8663131,1 15,4.13368685 15,8 Z" id="Stroke-1" stroke="#FF7648" stroke-width="3" stroke-linecap="round"></path>
+                    <line x1="18" y1="18" x2="13" y2="13" id="Stroke-3" stroke="#FF7648" stroke-width="3" stroke-linecap="round"></line>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/tab_search_selected.svg b/src/assets/imgs/tab_search_selected.svg
new file mode 100644
index 000000000..6eb727ff3
--- /dev/null
+++ b/src/assets/imgs/tab_search_selected.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="21px" viewBox="0 0 21 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>52F51613-8012-45D4-9950-014D3E6A6D8D</title>
+    <g id="Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Bottom-Navigation-icons" transform="translate(-90.000000, -287.000000)">
+            <g id="Group-5-Copy-2" transform="translate(0.000000, 233.000000)">
+                <g id="Group-4-Copy" transform="translate(91.000000, 55.000000)">
+                    <rect id="Rectangle" x="0" y="0" width="18" height="18"></rect>
+                    <path d="M15,8 C15,11.8663131 11.8663131,15 8,15 C4.13368685,15 1,11.8663131 1,8 C1,4.13368685 4.13368685,1 8,1 C11.8663131,1 15,4.13368685 15,8 Z" id="Stroke-1" stroke="#FF7648" stroke-width="3" stroke-linecap="round"></path>
+                    <line x1="18" y1="18" x2="13" y2="13" id="Stroke-3" stroke="#FF7648" stroke-width="3" stroke-linecap="round"></line>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/textbook.svg b/src/assets/imgs/textbook.svg
new file mode 100644
index 000000000..118c43db6
--- /dev/null
+++ b/src/assets/imgs/textbook.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="21px" viewBox="0 0 24 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>BAE6FC20-0D24-4F56-A15B-935497954365</title>
+    <g id="Final-layouts" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="Home-page-your-preferences" transform="translate(-42.000000, -734.000000)" stroke="#0091FF" stroke-width="1.5">
+            <g id="Group-12" transform="translate(8.000000, 258.000000)">
+                <g id="Group-2" transform="translate(8.000000, 431.000000)">
+                    <g id="Group-15" transform="translate(27.000000, 46.000000)">
+                        <path d="M22,4.71428571 L22,18.8571429 L0,18.8571429 L0,4.71428571 L3.14285714,4.71428571 L3.14285714,15.7142857 L4.34761905,15.7142857 C6.65238095,15.7142857 8.93619048,16.2485714 11,17.2857143 C13.0638095,16.2485714 15.347619,15.7142857 17.652381,15.7142857 L18.8571429,15.7142857 L18.8571429,4.71428571 L22,4.71428571 Z" id="Stroke-1"></path>
+                        <path d="M11,4.71428571 L11,17.2857143 C8.93619048,16.2485714 6.65238095,15.7142857 4.34761905,15.7142857 L3.14285714,15.7142857 L3.14285714,0 C6.08666667,0 8.84190476,1.47714286 10.4761905,3.91809524 L11,4.71428571 Z" id="Stroke-3"></path>
+                        <path d="M18.8571429,0 L18.8571429,15.7142857 L17.652381,15.7142857 C15.347619,15.7142857 13.0638095,16.2485714 11,17.2857143 L11,4.71428571 L11.5238095,3.91809524 C13.1580952,1.47714286 15.9133333,0 18.8571429,0 Z" id="Stroke-5"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/timetable.png b/src/assets/imgs/timetable.png
new file mode 100644
index 000000000..f33f6ea1a
Binary files /dev/null and b/src/assets/imgs/timetable.png differ
diff --git a/src/assets/imgs/tutorial.svg b/src/assets/imgs/tutorial.svg
new file mode 100644
index 000000000..9933965c1
--- /dev/null
+++ b/src/assets/imgs/tutorial.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 967 846.63"><defs><style>.cls-1,.cls-7{fill:none;stroke-miterlimit:10;}.cls-1{stroke:#0c519b;stroke-dasharray:12 8;}.cls-10,.cls-2,.cls-9{fill:#0c519b;}.cls-3{fill:#cadcea;}.cls-4{fill:#a4b6c1;}.cls-14,.cls-5{fill:#e55a28;}.cls-6{fill:#ad4a2b;}.cls-7{stroke:#edf4f9;stroke-width:7px;opacity:0.48;}.cls-8{fill:#fff;}.cls-9{opacity:0.17;}.cls-10{opacity:0.2;}.cls-11{fill:#20c688;opacity:0.35;}.cls-12,.cls-13{fill:#20bb83;}.cls-13{opacity:0.32;}.cls-14{fill-rule:evenodd;}.cls-15{fill:#0c4477;}.cls-16{fill:#ebdbcd;}.cls-17{fill:#110580;}.cls-18{fill:#103d66;}.cls-19{fill:#d7e9f4;}.cls-20{fill:#66a896;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M889.4,104,148.2,237.07A95.76,95.76,0,0,0,72.92,357.85h0A95.77,95.77,0,0,0,180,425.93L782.42,330a95.76,95.76,0,0,1,110.75,91l2,53.47A95.77,95.77,0,0,1,825,570.37l-719.8,198.8"/><path class="cls-2" d="M967,522.73a25.82,25.82,0,0,0-2.72-12l-14.15-33.19a49.66,49.66,0,0,0-31.28-25.77l-66.77-18.49a49.59,49.59,0,0,0-40,6l-29.21,21.19a26,26,0,0,0-8.6,8.89c-3.78,6.64-7.14,17.11,2.47,25.52,12.29,10.77,40,5.17,54.39.29a26,26,0,0,1,15.32-.37L892,507.44c5.05,1.4,10,2.91,13.33,6.89,9.81,11.57,30.32,32,46.4,29.09C964.31,541.08,966.84,530.32,967,522.73Z"/><path class="cls-3" d="M911.43,460.45c3.17.88,6,.61,6.34-.61s-2-2.91-5.13-3.78-6-.61-6.34.61S908.26,459.58,911.43,460.45Z"/><path class="cls-4" d="M911.43,460.44c-3.17-.88-5.44-2.55-5.1-3.77l-.5,1.81c-.34,1.21,2,2.9,5.1,3.77s6,.6,6.31-.61l.51-1.82C917.42,461.06,914.6,461.32,911.43,460.44Z"/><path class="cls-3" d="M934.59,466.86c3.16.88,6,.61,6.34-.61s-2-2.9-5.13-3.78-6-.6-6.34.61S931.42,466,934.59,466.86Z"/><path class="cls-4" d="M934.59,466.85c-3.17-.87-5.44-2.55-5.1-3.76l-.5,1.8c-.34,1.21,1.94,2.9,5.1,3.78s6,.59,6.31-.62l.51-1.82C940.59,467.47,937.76,467.73,934.59,466.85Z"/><path class="cls-3" d="M924.37,458.75c3.17.88,6,.61,6.35-.61s-2-2.91-5.13-3.79-6-.6-6.35.61S921.2,457.87,924.37,458.75Z"/><path class="cls-4" d="M924.37,458.75c-3.17-.88-5.43-2.57-5.1-3.78l-.5,1.83c-.34,1.21,2,2.89,5.1,3.76s6,.61,6.31-.6l.51-1.83C930.37,459.35,927.52,459.62,924.37,458.75Z"/><path class="cls-3" d="M921.51,469.09c3.17.88,6,.6,6.35-.61s-2-2.91-5.13-3.79-6-.6-6.35.61S918.34,468.21,921.51,469.09Z"/><path class="cls-4" d="M921.51,469.09c-3.17-.88-5.44-2.57-5.1-3.78l-.5,1.81c-.34,1.21,2,2.91,5.1,3.78s6,.59,6.31-.62l.51-1.81C927.51,469.69,924.66,470,921.51,469.09Z"/><path class="cls-5" d="M846.57,442.59c5.95,1.65,11.28,1.13,11.91-1.15s-3.68-5.46-9.62-7.1-11.27-1.13-11.9,1.15S840.63,441,846.57,442.59Z"/><path class="cls-6" d="M846.57,442.59c-5.93-1.64-10.24-4.83-9.61-7.1l-1,3.41c-.63,2.28,3.68,5.46,9.62,7.1s11.25,1.14,11.89-1.15l.94-3.41C857.85,443.65,852.51,444.23,846.57,442.59Z"/><path class="cls-5" d="M898.25,473.85c6,1.65,11.27,1.14,11.91-1.14s-3.68-5.46-9.62-7.11-11.27-1.13-11.9,1.15S892.31,472.21,898.25,473.85Z"/><path class="cls-6" d="M898.27,473.86c-5.95-1.65-10.25-4.84-9.62-7.11l-.94,3.41c-.64,2.29,3.66,5.46,9.61,7.11s11.26,1.13,11.89-1.15l.95-3.41C909.51,475,904.19,475.5,898.27,473.86Z"/><path class="cls-3" d="M874.1,448.88c1.55.43,2.95.29,3.11-.31s-1-1.44-2.51-1.86-2.94-.3-3.11.3S872.55,448.45,874.1,448.88Z"/><path class="cls-4" d="M874.1,448.88c-1.55-.44-2.72-1.28-2.55-1.88l-.25.9c-.17.6,1,1.43,2.55,1.87s3,.31,3.16-.29l.24-.9C877.05,449.17,875.66,449.31,874.1,448.88Z"/><path class="cls-3" d="M892,453.83c1.55.43,3,.3,3.11-.3s-1-1.44-2.51-1.87-3-.29-3.11.31S890.46,453.4,892,453.83Z"/><path class="cls-4" d="M892,453.83c-1.55-.43-2.72-1.27-2.55-1.87l-.25.9c-.17.6,1,1.43,2.55,1.87s3,.31,3.16-.29l.25-.9C894.94,454.12,893.55,454.26,892,453.83Z"/><path class="cls-4" d="M871.7,463.17,866,461.59c-.76-.21-1.36-.64-1.27-1l.65-2.37c.09-.31-.45-.74-1.27-1l-5.7-1.58c-.76-.21-1.5-.14-1.59.17l-.66,2.37c-.08.32-.76.39-1.58.16l-5.71-1.58c-.75-.2-1.49-.13-1.58.18l-.83,3c-.09.32.45.74,1.26,1l5.71,1.58c.76.21,1.36.64,1.28.95L854,465.9c-.09.32.45.74,1.27,1l5.71,1.58c.75.21,1.49.14,1.58-.18l.66-2.37c.08-.31.76-.39,1.58-.16l5.71,1.58c.75.21,1.49.14,1.58-.18l.84-3C873,463.8,872.45,463.38,871.7,463.17Z"/><path class="cls-3" d="M872.47,460.38l-5.71-1.58c-.76-.21-1.36-.65-1.27-1l.66-2.37c.08-.31-.46-.72-1.27-.95l-5.71-1.58c-.76-.21-1.5-.15-1.59.16l-.65,2.37c-.09.32-.77.41-1.59.18l-5.71-1.58c-.75-.21-1.49-.15-1.58.16l-.83,3c-.09.32.46.74,1.27,1l5.71,1.58c.75.21,1.35.65,1.27,1l-.66,2.37c-.08.3.46.72,1.27.95l5.71,1.58c.76.21,1.5.14,1.58-.16l.66-2.37c.08-.32.77-.41,1.58-.18l5.71,1.58c.76.21,1.5.14,1.59-.17l.83-3C873.77,461,873.22,460.59,872.47,460.38Z"/><rect class="cls-7" x="297.2" y="50.66" width="372.37" height="774.98" rx="29.96"/><rect class="cls-2" x="283.1" y="32.19" width="398.14" height="811.92" rx="39.27"/><rect class="cls-8" x="293.33" y="44.07" width="377.67" height="788.16" rx="35.22"/><path class="cls-9" d="M326.1,44.07H638.23A32.77,32.77,0,0,1,671,76.84v99.73a0,0,0,0,1,0,0H293.33a0,0,0,0,1,0,0V76.84A32.77,32.77,0,0,1,326.1,44.07Z"/><rect class="cls-10" x="375.14" y="118.3" width="218.97" height="30.38" rx="9.53"/><rect class="cls-10" x="619.72" y="118.3" width="30.38" height="30.38" rx="9.53"/><rect class="cls-10" x="319.15" y="118.3" width="30.38" height="30.38" rx="9.53"/><rect class="cls-10" x="319.15" y="211.72" width="30.38" height="30.38" rx="9.53"/><rect class="cls-9" x="352.37" y="248.43" width="295.12" height="95.73" rx="5"/><path class="cls-10" d="M357.37,248.43h23.7a0,0,0,0,1,0,0v95.73a0,0,0,0,1,0,0h-23.7a5,5,0,0,1-5-5V253.43A5,5,0,0,1,357.37,248.43Z"/><rect class="cls-10" x="319.15" y="361.87" width="30.38" height="30.38" rx="9.53"/><rect class="cls-11" x="352.37" y="398.59" width="295.12" height="95.73" rx="5"/><path class="cls-12" d="M357.37,398.59h23.7a0,0,0,0,1,0,0v95.73a0,0,0,0,1,0,0h-23.7a5,5,0,0,1-5-5V403.59A5,5,0,0,1,357.37,398.59Z"/><rect class="cls-10" x="319.15" y="518.93" width="30.38" height="30.38" rx="9.53"/><rect class="cls-9" x="352.37" y="555.65" width="295.12" height="95.73" rx="5"/><path class="cls-10" d="M357.37,555.65h23.7a0,0,0,0,1,0,0v95.73a0,0,0,0,1,0,0h-23.7a5,5,0,0,1-5-5V560.65A5,5,0,0,1,357.37,555.65Z"/><rect class="cls-10" x="319.15" y="675.26" width="30.38" height="30.38" rx="9.53"/><rect class="cls-11" x="352.37" y="711.98" width="295.12" height="73.43" rx="5"/><path class="cls-12" d="M357.37,712h23.7a0,0,0,0,1,0,0v73.43a0,0,0,0,1,0,0h-23.7a5,5,0,0,1-5-5V717A5,5,0,0,1,357.37,712Z"/><path class="cls-10" d="M529,269.91H413.7a6.11,6.11,0,1,0,0,12.21H529a6.11,6.11,0,1,0,0-12.21Z"/><path class="cls-10" d="M480.54,294.48H413.7a6.11,6.11,0,1,0,0,12.21h66.84a6.11,6.11,0,1,0,0-12.21Z"/><path class="cls-13" d="M529,420.86H413.7a6.11,6.11,0,1,0,0,12.21H529a6.11,6.11,0,1,0,0-12.21Z"/><path class="cls-13" d="M480.54,445.43H413.7a6.11,6.11,0,1,0,0,12.21h66.84a6.11,6.11,0,1,0,0-12.21Z"/><path class="cls-10" d="M529,578.5H413.7a6.11,6.11,0,1,0,0,12.21H529a6.11,6.11,0,1,0,0-12.21Z"/><path class="cls-10" d="M480.54,603.07H413.7a6.11,6.11,0,1,0,0,12.21h66.84a6.11,6.11,0,1,0,0-12.21Z"/><path class="cls-13" d="M529,730.41H413.7a6.11,6.11,0,1,0,0,12.21H529a6.11,6.11,0,1,0,0-12.21Z"/><path class="cls-13" d="M480.54,755H413.7a6.11,6.11,0,1,0,0,12.21h66.84a6.11,6.11,0,1,0,0-12.21Z"/><path class="cls-3" d="M834.88,143.45a11.48,11.48,0,0,0,8.67,9.36A11.59,11.59,0,0,0,848,153l92.55-14.77a11.46,11.46,0,0,0,9.51-13.14L939.89,61.18a2.77,2.77,0,0,0-.36-1,2.9,2.9,0,0,0-.71-.77,2.68,2.68,0,0,0-.94-.43,2.61,2.61,0,0,0-1,0l-110,17.55a2.63,2.63,0,0,0-1,.36,2.67,2.67,0,0,0-1.19,1.65,2.61,2.61,0,0,0,0,1Z"/><path class="cls-2" d="M911.45,12.47,825,48.59a11.47,11.47,0,0,0-7.06,10.63,11.4,11.4,0,0,0,.89,4.39l5.07,11.89a2.67,2.67,0,0,0,1.44,1.44,2.63,2.63,0,0,0,2,0L930.09,34a2.68,2.68,0,0,0,1.42-1.41,2.71,2.71,0,0,0,0-2l-5.07-11.89A11.5,11.5,0,0,0,924,15a11.45,11.45,0,0,0-8.13-3.39A11.71,11.71,0,0,0,911.45,12.47Z"/><path class="cls-2" d="M939.47,58.55,824.27,76.93l4.26,26.72,115.2-18.38Z"/><path class="cls-14" d="M902.55,116.78l-12-4.59-12-4.6L882.59,133l10-8.1Z"/><path class="cls-15" d="M909.13,90.79l7.09-1.13,10.7-29.11-7.1,1.14Z"/><path class="cls-15" d="M874,96.4l7.08-1.13,10.7-29.11-7.09,1.13Z"/><path class="cls-15" d="M856.45,99.2l7.1-1.13L874.23,69l-7.09,1.13Z"/><path class="cls-15" d="M838.88,102l7.11-1.13,10.68-29.11-7.09,1.13Z"/><path class="cls-15" d="M889.7,21.58l6.62-2.77,24.39,19.13-6.62,2.77Z"/><path class="cls-15" d="M873.28,28.42l6.62-2.75L904.3,44.8l-6.64,2.77Z"/><path class="cls-15" d="M856.86,35.28l6.64-2.77,24.39,19.14-6.63,2.76Z"/><path class="cls-15" d="M840.45,42.14l6.64-2.77,24.39,19.12-6.63,2.78Z"/><path class="cls-15" d="M824,49l6.64-2.75,24.39,19.12-6.63,2.77Z"/><g id="planning-sheets-of-paper-coffee-by-oblik-studio"><path class="cls-2" d="M145.2,345.53,74,395.86a4.32,4.32,0,0,1-6.07-1.23L.8,295.18a4.54,4.54,0,0,1,1-6.24l71.21-50.33a4.32,4.32,0,0,1,6.07,1.23l67.12,99.46A4.56,4.56,0,0,1,145.2,345.53Z"/><path class="cls-3" d="M154.08,325.81,76.41,365a4.35,4.35,0,0,1-5.86-2.11l-53-107.94a4.49,4.49,0,0,1,1.89-6l77.65-39.17a4.35,4.35,0,0,1,5.86,2.11l53,108A4.46,4.46,0,0,1,154.08,325.81Z"/><path class="cls-8" d="M54.07,277.87a8.78,8.78,0,1,0-11.13-5.49A8.78,8.78,0,0,0,54.07,277.87Z"/><path class="cls-8" d="M67.1,304.08A8.78,8.78,0,1,0,56,298.59,8.77,8.77,0,0,0,67.1,304.08Z"/><path class="cls-8" d="M80.15,330.29A8.78,8.78,0,1,0,69,324.8,8.77,8.77,0,0,0,80.15,330.29Z"/><path class="cls-8" d="M100.33,243.31l-32.18,16a2.22,2.22,0,1,1-2-4l32.18-16a2.25,2.25,0,0,1,3,1A2.22,2.22,0,0,1,100.33,243.31Z"/><path class="cls-8" d="M92.6,255.76l-21,10.45a2.22,2.22,0,0,1-2-4l21-10.45a2.22,2.22,0,0,1,2,4Z"/><path class="cls-8" d="M126.43,295.75l-32.18,16a2.22,2.22,0,1,1-2-4l32.18-16a2.22,2.22,0,0,1,2,4Z"/><path class="cls-8" d="M118.69,308.18l-21,10.46a2.22,2.22,0,1,1-2-4l21-10.46a2.22,2.22,0,0,1,2,4Z"/><path class="cls-8" d="M113.37,269.52l-32.18,16a2.22,2.22,0,0,1-2-4l32.18-16a2.24,2.24,0,0,1,3,1A2.21,2.21,0,0,1,113.37,269.52Z"/><path class="cls-8" d="M105.64,282l-21,10.45a2.22,2.22,0,1,1-2-4l21-10.45a2.22,2.22,0,0,1,2,4Z"/><path class="cls-2" d="M49.77,250.76A122.85,122.85,0,0,0,48.89,264a6.27,6.27,0,0,0-5.21-1.14,2.88,2.88,0,0,0-2.19,1.93c-.05.17-.08.37-.12.55-.24,1.15.12,2.76,1.52,3a9.1,9.1,0,0,1,3,.78,17.7,17.7,0,0,1,3.75,3.2A2.81,2.81,0,0,0,54.47,270a181.38,181.38,0,0,1-1.54-19A1.58,1.58,0,0,0,49.77,250.76Z"/><path class="cls-2" d="M86.23,173.42l-3.6-1.54a2.42,2.42,0,0,0-3.17,1.26l-25,58.11,8,3.43,25-58.11A2.39,2.39,0,0,0,86.23,173.42Z"/><path class="cls-16" d="M62.47,234.7l-8-3.46L52.9,243.58l1.66.71Z"/><path class="cls-2" d="M54.74,238.16l1,1.12,1,.09,1.07.94-3.29,4-1.66-.71.63-5Z"/><path class="cls-2" d="M8.17,339.34a.4.4,0,0,1,.15,0l.64,0c1.47-.06,3-.12,4.61-.15a.43.43,0,0,1,0,.86c-1.6,0-3.11.07-4.57.14l-.64,0a.43.43,0,0,1-.45-.42A.42.42,0,0,1,8.17,339.34Zm10.45,0a.53.53,0,0,1,.19,0A38.74,38.74,0,0,1,24,340a.42.42,0,0,1,.33.51.42.42,0,0,1-.51.33,40.38,40.38,0,0,0-5.12-.69.45.45,0,0,1-.4-.46A.48.48,0,0,1,18.62,339.32Zm10.16,2.2a.4.4,0,0,1,.32,0,23.49,23.49,0,0,1,4.67,2.5.43.43,0,0,1,.12.58.46.46,0,0,1-.59.13,23.86,23.86,0,0,0-4.52-2.41.44.44,0,0,1-.23-.56A.4.4,0,0,1,28.78,341.52Zm8.56,5.83a.43.43,0,0,1,.48.09A23.58,23.58,0,0,1,41,351.66a.43.43,0,1,1-.73.46,23.85,23.85,0,0,0-3.11-4.07.45.45,0,0,1,0-.61A.22.22,0,0,1,37.34,347.35Zm-.44,6.18a23.38,23.38,0,0,1,2.75-.94.42.42,0,0,1,.53.3.43.43,0,0,1-.31.53,18.55,18.55,0,0,0-2.63.92,20,20,0,0,0-2.07,1,.42.42,0,0,1-.58-.14.43.43,0,0,1,.15-.59A16.29,16.29,0,0,1,36.9,353.53Zm7.83-1.72a.39.39,0,0,1,.16,0,49.55,49.55,0,0,1,5.25,0,.42.42,0,0,1,.42.44.43.43,0,0,1-.45.42c-2.08-.06-3.68-.07-5.18,0a.42.42,0,0,1-.45-.39A.46.46,0,0,1,44.73,351.81ZM30.83,358a.38.38,0,0,1,.42,0,.43.43,0,0,1,.07.62,10.6,10.6,0,0,0-1.38,2.27,8.66,8.66,0,0,0-.65,2.24.43.43,0,0,1-.85-.12,9.18,9.18,0,0,1,.71-2.46,12.39,12.39,0,0,1,1.48-2.45Zm11.79-1.75h.05a.42.42,0,0,1,.53.29,15.29,15.29,0,0,1,.64,5.29.44.44,0,0,1-.46.39.43.43,0,0,1-.4-.45,14.61,14.61,0,0,0-.6-5A.38.38,0,0,1,42.62,356.23ZM55.18,352a.38.38,0,0,1,.19,0c.61,0,1.22.05,1.82.05,1.19,0,2.29,0,3.35,0a.43.43,0,0,1,.45.42.42.42,0,0,1-.42.44c-1.08,0-2.19.06-3.41,0-.61,0-1.23,0-1.85-.07a.44.44,0,0,1-.42-.44A.45.45,0,0,1,55.18,352Zm23.55-8.23a.48.48,0,0,1,.42,0,.44.44,0,0,1,.11.61,17.49,17.49,0,0,1-3.7,3.85.41.41,0,0,1-.59-.08.42.42,0,0,1,.08-.6A15.73,15.73,0,0,0,78.54,344,.32.32,0,0,1,78.73,343.8Zm-13.15,7.73.09,0a24.78,24.78,0,0,0,4.94-1.39.41.41,0,0,1,.55.24.42.42,0,0,1-.24.55,25.15,25.15,0,0,1-5.11,1.42.41.41,0,0,1-.23-.79ZM29.44,367.78A.44.44,0,0,1,30,368a5.49,5.49,0,0,0,2.79,2.77,7.13,7.13,0,0,0,.78.26.47.47,0,0,1,.32.53.45.45,0,0,1-.52.32,5.63,5.63,0,0,1-.9-.31,6.39,6.39,0,0,1-3.23-3.19.43.43,0,0,1,.19-.57S29.44,367.78,29.44,367.78Zm12.42-1.38a.35.35,0,0,1,.37,0,.42.42,0,0,1,.15.58,10.46,10.46,0,0,1-3.72,3.89.45.45,0,0,1-.6-.16.42.42,0,0,1,.15-.58,9.83,9.83,0,0,0,3.42-3.59A1,1,0,0,1,41.86,366.4Z"/><path class="cls-5" d="M138.25,303.7a19.41,19.41,0,1,0,.6-27.29A19.31,19.31,0,0,0,138.25,303.7Z"/><path class="cls-5" d="M169.21,313.53l-14.83-15.3a4,4,0,0,1,.1-5.63l0,0a4,4,0,0,1,5.64.1L175,308a4,4,0,0,1-.09,5.64l0,0A4,4,0,0,1,169.21,313.53Z"/><path class="cls-8" d="M141.78,300.28a14.5,14.5,0,1,0,.46-20.37A14.41,14.41,0,0,0,141.78,300.28Z"/><path class="cls-16" d="M144.83,286.29a2.44,2.44,0,0,1,1.92-1.74c1-.11,1.58.58,1.95,1.41.74,1.67,1.22,4,3.38,4.3,1.92.32,3.32-1.23,4.43-2.55a3.86,3.86,0,0,1,2.14-1.63c1-.15,1.56.78,1.82,1.59.32,1.06,1.91.37,1.59-.69a3.37,3.37,0,0,0-4.83-2.23,9.93,9.93,0,0,0-2.62,2.55c-.58.66-1.57,1.58-2.53,1.14s-1.27-1.93-1.64-2.86a4.28,4.28,0,0,0-2.18-2.55c-2.14-.87-4.29.62-5,2.62A.87.87,0,0,0,144.83,286.29Z"/><path class="cls-16" d="M143.35,293.27c1.06-1.76,3.15.43,4,1.28,1.07,1.16,2.26,2.95,3.95,3.23,1.52.24,2.84-.78,3.84-1.79,1.21-1.19,2.47-2.12,4.21-1.41,1,.43,1.65-1.19.61-1.62a4.81,4.81,0,0,0-4.76.63c-1.11.84-2.69,3.34-4.32,2.15a17.86,17.86,0,0,1-2.1-2.16,11.52,11.52,0,0,0-2.18-2c-1.45-.92-3.64-1-4.61.66C141.4,293.19,142.77,294.22,143.35,293.27Z"/></g><path class="cls-2" d="M794.93.07a.66.66,0,0,1,.17.12l.53.63c1.24,1.46,2.54,3,3.85,4.61a.56.56,0,0,1,.09.4.57.57,0,0,1-.2.36.55.55,0,0,1-.39.12.53.53,0,0,1-.37-.18C797.3,4.51,796,3,794.78,1.55l-.54-.63a.55.55,0,0,1-.13-.41.56.56,0,0,1,.19-.38.61.61,0,0,1,.31-.13A.6.6,0,0,1,794.93.07Zm8.43,10.7a.45.45,0,0,1,.21.15,50.38,50.38,0,0,1,3.46,6,.55.55,0,0,1,0,.4.56.56,0,0,1-.68.34.6.6,0,0,1-.32-.24,50,50,0,0,0-3.4-5.78.5.5,0,0,1-.08-.2.54.54,0,0,1,0-.22.5.5,0,0,1,.08-.2.81.81,0,0,1,.16-.16.55.55,0,0,1,.28-.09.45.45,0,0,1,.28.06ZM809.23,23a.75.75,0,0,1,.17.14.72.72,0,0,1,.09.2,33.42,33.42,0,0,1,1.21,6.81.56.56,0,0,1-.14.41.58.58,0,0,1-.39.19.5.5,0,0,1-.4-.13.59.59,0,0,1-.2-.39,31.3,31.3,0,0,0-1.16-6.58.54.54,0,0,1,0-.22.83.83,0,0,1,.06-.21.57.57,0,0,1,.15-.16.5.5,0,0,1,.19-.1.56.56,0,0,1,.22,0A.52.52,0,0,1,809.23,23Zm.92,13.51a.59.59,0,0,1,.23.24.57.57,0,0,1,0,.34,31,31,0,0,1-1.75,6.7.62.62,0,0,1-.12.19.59.59,0,0,1-.18.13.52.52,0,0,1-.21,0,.56.56,0,0,1-.22,0,.59.59,0,0,1-.32-.72,30.26,30.26,0,0,0,1.68-6.46.55.55,0,0,1,.22-.37.57.57,0,0,1,.42-.11A.84.84,0,0,1,810.15,36.49ZM803.43,41a27.2,27.2,0,0,1,3.17,2.05.55.55,0,0,1,.22.37.51.51,0,0,1-.1.41.55.55,0,0,1-.37.22.5.5,0,0,1-.41-.1,27.84,27.84,0,0,0-3.05-2,24.25,24.25,0,0,0-2.73-1.28.42.42,0,0,1-.18-.11.46.46,0,0,1-.13-.18.54.54,0,0,1,0-.22.51.51,0,0,1,0-.21.76.76,0,0,1,.12-.19.83.83,0,0,1,.18-.13.78.78,0,0,1,.21,0,.57.57,0,0,1,.22,0A22.56,22.56,0,0,1,803.44,41Zm8.06,6.66a.72.72,0,0,1,.15.11,67.23,67.23,0,0,1,4.26,5.38.58.58,0,0,1-.18.69.66.66,0,0,1-.36.11.56.56,0,0,1-.35-.15,64.85,64.85,0,0,0-4.2-5.29.61.61,0,0,1-.15-.36.58.58,0,0,1,.13-.38.59.59,0,0,1,.33-.2.59.59,0,0,1,.39.07ZM794,38.41a.51.51,0,0,1,.29.48.58.58,0,0,1-.16.4.56.56,0,0,1-.4.17,14.36,14.36,0,0,0-3.46.4A10.59,10.59,0,0,0,787.43,41a.59.59,0,0,1-.43.05.56.56,0,0,1-.34-.26.59.59,0,0,1,0-.43.56.56,0,0,1,.26-.34,12.46,12.46,0,0,1,3.1-1.26,15.42,15.42,0,0,1,3.71-.43.53.53,0,0,1,.3.07Zm11.24,10.7,0,0a.57.57,0,0,1,.15.16.66.66,0,0,1,.08.21.55.55,0,0,1,0,.22.66.66,0,0,1-.09.19,20.55,20.55,0,0,1-4.94,5A.56.56,0,0,1,800,55a.61.61,0,0,1-.36-.23.56.56,0,0,1,.14-.78,19.55,19.55,0,0,0,4.71-4.72.58.58,0,0,1,.71-.15Zm14.43,9.49a.48.48,0,0,1,.2.15l1.4,1.93c.94,1.25,1.82,2.36,2.73,3.42a.61.61,0,0,1,.13.41.59.59,0,0,1-.2.38.52.52,0,0,1-.19.11.56.56,0,0,1-.22,0,.83.83,0,0,1-.21-.06.46.46,0,0,1-.17-.14c-.91-1.08-1.82-2.22-2.76-3.48-.48-.64-1-1.29-1.43-1.94a.57.57,0,0,1,0-.7.52.52,0,0,1,.32-.18.53.53,0,0,1,.37.06ZM847,76.13a.49.49,0,0,1,.29.45.42.42,0,0,1,0,.22.52.52,0,0,1-.11.19.7.7,0,0,1-.17.13.54.54,0,0,1-.21,0,22.17,22.17,0,0,1-6.93-.67.52.52,0,0,1-.2-.09.54.54,0,0,1-.14-.16.9.9,0,0,1-.08-.21.55.55,0,0,1,0-.22.59.59,0,0,1,.26-.34.52.52,0,0,1,.42-.06,21.46,21.46,0,0,0,6.58.63.6.6,0,0,1,.35.08Zm-18.5-7.27a.39.39,0,0,1,.1.08,33.6,33.6,0,0,0,5.39,4,.55.55,0,0,1,.22.32.59.59,0,0,1-.05.39.57.57,0,0,1-.29.26.58.58,0,0,1-.39,0,33.91,33.91,0,0,1-5.56-4.12.54.54,0,0,1-.19-.38.57.57,0,0,1,.14-.41.56.56,0,0,1,.68-.09Zm-45.78-24a.59.59,0,0,1,.28.32.56.56,0,0,1,0,.42,7.31,7.31,0,0,0-.61,5.11,7,7,0,0,0,.35,1,.5.5,0,0,1-.05.36.57.57,0,0,1-.26.25.53.53,0,0,1-.35,0,.61.61,0,0,1-.31-.18,9.53,9.53,0,0,1-.41-1.17,8.34,8.34,0,0,1,.69-5.9.51.51,0,0,1,.32-.27.51.51,0,0,1,.42,0Zm11.42,11.63a.52.52,0,0,1,.19.17.72.72,0,0,1,.1.24.55.55,0,0,1,0,.22.54.54,0,0,1-.1.2.57.57,0,0,1-.16.15.48.48,0,0,1-.21.07,13.92,13.92,0,0,1-7-.67.45.45,0,0,1-.19-.11.44.44,0,0,1-.12-.18.41.41,0,0,1-.05-.21.54.54,0,0,1,0-.22.52.52,0,0,1,.11-.19.57.57,0,0,1,.18-.12.54.54,0,0,1,.22,0,.51.51,0,0,1,.21,0,12.75,12.75,0,0,0,6.42.63.52.52,0,0,1,.37.05Z"/><path class="cls-17" d="M71.28,846.58a.74.74,0,0,1-.25-.21.62.62,0,0,1-.09-.32.58.58,0,0,1,.58-.59h2.85V842.6a.52.52,0,0,1,0-.25.63.63,0,0,1,.12-.21,1,1,0,0,1,.2-.14.49.49,0,0,1,.47,0,1,1,0,0,1,.2.14.88.88,0,0,1,.12.21.52.52,0,0,1,0,.25v4h-4A1,1,0,0,1,71.28,846.58Z"/><path class="cls-17" d="M12.71,846.54a.57.57,0,0,1-.25-.21.6.6,0,0,1-.1-.32.51.51,0,0,1,0-.22.46.46,0,0,1,.13-.2.67.67,0,0,1,.19-.14.59.59,0,0,1,.23,0h7.33a.58.58,0,0,1,.41.17.57.57,0,0,1,.17.42.43.43,0,0,1,0,.22.76.76,0,0,1-.13.2.7.7,0,0,1-.19.13.57.57,0,0,1-.22,0H13A1,1,0,0,1,12.71,846.54Zm14.64,0a.63.63,0,0,1-.28-.28.56.56,0,0,1-.05-.38.66.66,0,0,1,.2-.34.62.62,0,0,1,.37-.13h7.32a.56.56,0,0,1,.38.19.59.59,0,0,1,.15.4.56.56,0,0,1-.15.39.6.6,0,0,1-.38.19H27.59a.5.5,0,0,1-.24,0Zm14.65,0a.63.63,0,0,1-.28-.28.56.56,0,0,1,0-.38.55.55,0,0,1,.2-.34.59.59,0,0,1,.36-.13h7.32a.93.93,0,0,1,.24,0,.57.57,0,0,1,.21.13.56.56,0,0,1,.14.2.49.49,0,0,1,0,.24.46.46,0,0,1,0,.23.48.48,0,0,1-.14.2.72.72,0,0,1-.21.12.48.48,0,0,1-.24,0H42.23a.45.45,0,0,1-.23,0Zm14.64,0a.63.63,0,0,1-.28-.28.56.56,0,0,1,0-.38.66.66,0,0,1,.2-.34.64.64,0,0,1,.37-.13H64.2a.58.58,0,0,1,.41.17.58.58,0,0,1,0,.84.63.63,0,0,1-.41.17H56.88a.66.66,0,0,1-.24,0Z"/><path class="cls-17" d="M1.6,846.58v-4a.57.57,0,0,1,.17-.42.58.58,0,0,1,.41-.17.55.55,0,0,1,.41.17.58.58,0,0,1,.18.42v2.86H5.63a.58.58,0,0,1,.41.17.57.57,0,0,1,.17.42.53.53,0,0,1-.17.4.55.55,0,0,1-.41.18Z"/><path class="cls-17" d="M2,836.26a.64.64,0,0,1-.25-.21.6.6,0,0,1-.1-.31v-6.82a.55.55,0,0,1,.17-.41.56.56,0,0,1,.41-.19.6.6,0,0,1,.23.06.44.44,0,0,1,.19.12,1,1,0,0,1,.12.19.47.47,0,0,1,0,.23v6.82a.68.68,0,0,1-.07.27.64.64,0,0,1-.2.2.62.62,0,0,1-.27.09.55.55,0,0,1-.28,0ZM2,822.6a.51.51,0,0,1-.25-.21.63.63,0,0,1-.1-.3v-6.85a.66.66,0,0,1,.19-.38.63.63,0,0,1,.4-.14.62.62,0,0,1,.39.14.6.6,0,0,1,.19.38v6.84a.6.6,0,0,1-.17.41.59.59,0,0,1-.42.17A.49.49,0,0,1,2,822.6ZM2,809a.57.57,0,0,1-.34-.51V801.6a.58.58,0,0,1,.17-.41.54.54,0,0,1,.41-.17.55.55,0,0,1,.42.17.58.58,0,0,1,.17.41v6.85a.5.5,0,0,1-.08.26.55.55,0,0,1-.19.21.72.72,0,0,1-.27.09A.66.66,0,0,1,2,809Z"/><path class="cls-17" d="M2,795.32a.63.63,0,0,1-.25-.21.67.67,0,0,1-.1-.31v-4h4a.57.57,0,0,1,.22,0,.62.62,0,0,1,.32.32.57.57,0,0,1,0,.22.59.59,0,0,1,0,.23.5.5,0,0,1-.13.19.64.64,0,0,1-.19.13.57.57,0,0,1-.22,0H2.8v2.87a.57.57,0,0,1,0,.22.5.5,0,0,1-.13.19.46.46,0,0,1-.18.13.62.62,0,0,1-.23,0A.52.52,0,0,1,2,795.32Z"/><path class="cls-17" d="M12.74,791.88a.61.61,0,0,1-.28-.27.59.59,0,0,1-.05-.39.59.59,0,0,1,.2-.33.57.57,0,0,1,.37-.14H20.3a.6.6,0,0,1,.38.19.59.59,0,0,1,.15.4.58.58,0,0,1-.15.39.56.56,0,0,1-.38.19H13A.67.67,0,0,1,12.74,791.88Zm14.65,0a.61.61,0,0,1-.28-.27.59.59,0,0,1-.05-.39.6.6,0,0,1,.56-.47h7.32a.48.48,0,0,1,.24,0,.55.55,0,0,1,.21.12.75.75,0,0,1,.15.2.61.61,0,0,1,0,.24.59.59,0,0,1,0,.23.62.62,0,0,1-.15.2.57.57,0,0,1-.21.13.63.63,0,0,1-.24,0H27.62a.58.58,0,0,1-.23,0Zm14.64,0a.64.64,0,0,1-.25-.21.71.71,0,0,1-.1-.31.59.59,0,0,1,0-.23.59.59,0,0,1,.13-.19.41.41,0,0,1,.19-.12.54.54,0,0,1,.22-.05h7.32A.63.63,0,0,1,50,791a.59.59,0,0,1,.15.4.56.56,0,0,1-.15.39.58.58,0,0,1-.38.19H42.26a.45.45,0,0,1-.23,0Zm14.65,0a.67.67,0,0,1-.26-.21.71.71,0,0,1-.1-.31.6.6,0,0,1,.18-.42.57.57,0,0,1,.41-.17h7.32a.57.57,0,0,1,.41.17.57.57,0,0,1,0,.83.57.57,0,0,1-.41.17H56.91a.45.45,0,0,1-.23,0Z"/><path class="cls-17" d="M74.75,795.36a.55.55,0,0,1-.25-.2.63.63,0,0,1-.1-.32V792H71.54a.5.5,0,0,1-.24,0,.75.75,0,0,1-.21-.12.72.72,0,0,1-.14-.2.6.6,0,0,1,0-.24.61.61,0,0,1,.19-.43.57.57,0,0,1,.21-.12.5.5,0,0,1,.24,0h4v4a.6.6,0,0,1-.07.27.58.58,0,0,1-.2.21.62.62,0,0,1-.27.09.56.56,0,0,1-.28,0Z"/><path class="cls-17" d="M74.75,836.3a.57.57,0,0,1-.25-.21.63.63,0,0,1-.1-.31v-6.84a.62.62,0,0,1,.18-.42.58.58,0,0,1,.82,0,.62.62,0,0,1,.18.42v6.82a.65.65,0,0,1-.08.28.64.64,0,0,1-.19.21.53.53,0,0,1-.27.08.52.52,0,0,1-.28,0Zm0-13.64a.57.57,0,0,1-.25-.21.58.58,0,0,1-.1-.32v-6.81a.52.52,0,0,1,0-.25.5.5,0,0,1,.12-.21.94.94,0,0,1,.19-.14.6.6,0,0,1,.48,0l.2.14a.88.88,0,0,1,.12.21,1,1,0,0,1,0,.25v6.83a.6.6,0,0,1-.17.4.59.59,0,0,1-.42.17A.46.46,0,0,1,74.75,822.66Zm0-13.65a.64.64,0,0,1-.25-.21.71.71,0,0,1-.1-.31v-6.84a.66.66,0,0,1,.19-.38.57.57,0,0,1,.79,0,.56.56,0,0,1,.19.38v6.81a.67.67,0,0,1,0,.24.75.75,0,0,1-.13.18.5.5,0,0,1-.19.13.68.68,0,0,1-.46,0Z"/><path class="cls-2" d="M202.48,714.85H122.32A12.17,12.17,0,0,0,110.19,727h0A12.17,12.17,0,0,0,98,714.85H17.87a1.57,1.57,0,0,0-1.12.47,1.61,1.61,0,0,0-.47,1.13v101a1.61,1.61,0,0,0,.47,1.13,1.56,1.56,0,0,0,1.12.46h82.71a10.46,10.46,0,0,0,3.85,4,10.64,10.64,0,0,0,5.36,1.5h.8a10.59,10.59,0,0,0,9.22-5.51h82.67a1.62,1.62,0,0,0,1.13-.48,1.64,1.64,0,0,0,.46-1.13v-101a1.48,1.48,0,0,0-.11-.62,1.55,1.55,0,0,0-.34-.53,1.43,1.43,0,0,0-.52-.36A1.68,1.68,0,0,0,202.48,714.85Z"/><path class="cls-18" d="M196.46,719H121.15a11,11,0,0,0-11,11h0a11,11,0,0,0-3.21-7.77A11,11,0,0,0,99.21,719H23.91a1.29,1.29,0,0,0-.55.11,1.33,1.33,0,0,0-.47.31,1.44,1.44,0,0,0-.31.46,1.54,1.54,0,0,0-.1.56v91.24a1.31,1.31,0,0,0,.1.55,1.25,1.25,0,0,0,.31.47,1.14,1.14,0,0,0,.47.31,1.3,1.3,0,0,0,.55.12h77.6a9.5,9.5,0,0,0,8.3,5h.74a9.5,9.5,0,0,0,8.3-5h77.61a1.47,1.47,0,0,0,1-.42,1.45,1.45,0,0,0,.42-1V720.44a1.54,1.54,0,0,0-.1-.56,1.47,1.47,0,0,0-.32-.46,1.42,1.42,0,0,0-1-.42Z"/><path class="cls-19" d="M121.9,704.1h72.17a1.55,1.55,0,0,1,1.54,1.54v103.5a1.58,1.58,0,0,1-.45,1.09,1.54,1.54,0,0,1-1.09.45H116a5.66,5.66,0,0,1-2.23-.45,5.82,5.82,0,0,1-3.6-5.4v-89a11.71,11.71,0,0,1,11.7-11.74Z"/><path class="cls-3" d="M104.34,810.68h-78a1.51,1.51,0,0,1-1.08-.45,1.54,1.54,0,0,1-.45-1.09V705.64a1.5,1.5,0,0,1,.45-1.08,1.52,1.52,0,0,1,1.08-.46H98.49a11.73,11.73,0,0,1,11.7,11.74v89a5.74,5.74,0,0,1-.45,2.24,5.69,5.69,0,0,1-1.26,1.9,6.12,6.12,0,0,1-1.9,1.28A5.91,5.91,0,0,1,104.34,810.68Z"/><path class="cls-8" d="M41.75,755.23a6,6,0,1,0-5.94-6A6,6,0,0,0,41.75,755.23Z"/><path class="cls-8" d="M94.93,745.24H54.17a1.25,1.25,0,0,0,0,2.5H94.93a1.25,1.25,0,1,0,0-2.5Z"/><path class="cls-8" d="M82.31,751H54.17a1.25,1.25,0,0,0,0,2.5H82.31a1.25,1.25,0,0,0,0-2.5Z"/><path class="cls-8" d="M41.75,795.82a6,6,0,1,0-5.94-6A6,6,0,0,0,41.75,795.82Z"/><path class="cls-8" d="M94.93,791.59H54.17a1.25,1.25,0,0,0,0,2.5H94.93a1.25,1.25,0,0,0,0-2.5Z"/><path class="cls-8" d="M82.31,785.83H54.17a1.25,1.25,0,0,0,0,2.5H82.31a1.25,1.25,0,0,0,0-2.5Z"/><path class="cls-8" d="M41.75,775.53a6,6,0,1,0-5.94-6A6,6,0,0,0,41.75,775.53Z"/><path class="cls-8" d="M94.93,771.3H54.17a1.25,1.25,0,0,0,0,2.5H94.93a1.25,1.25,0,1,0,0-2.5Z"/><path class="cls-8" d="M88.62,765.54H54.17a1.25,1.25,0,0,0,0,2.49H88.62a1.25,1.25,0,0,0,0-2.49Z"/><path class="cls-8" d="M128.51,755.23a6,6,0,1,0-5.94-6A6,6,0,0,0,128.51,755.23Z"/><path class="cls-8" d="M181.7,771.34H140.94a1.26,1.26,0,0,0-1.25,1.26,1.24,1.24,0,0,0,1.25,1.24H181.7a1.24,1.24,0,0,0,1.24-1.24A1.26,1.26,0,0,0,181.7,771.34Z"/><path class="cls-8" d="M169.07,765.58H140.94a1.25,1.25,0,1,0,0,2.5h28.13a1.25,1.25,0,1,0,0-2.5Z"/><path class="cls-8" d="M128.51,795.82a6,6,0,1,0-5.94-6A6,6,0,0,0,128.51,795.82Z"/><path class="cls-8" d="M181.7,745.24H140.94a1.25,1.25,0,0,0,0,2.5H181.7a1.25,1.25,0,0,0,0-2.5Z"/><path class="cls-8" d="M169.07,751H140.94a1.25,1.25,0,0,0,0,2.5h28.13a1.25,1.25,0,0,0,0-2.5Z"/><path class="cls-8" d="M128.51,775.53a6,6,0,1,0-5.94-6A6,6,0,0,0,128.51,775.53Z"/><path class="cls-8" d="M181.7,785.93H140.94a1.25,1.25,0,1,0,0,2.49H181.7a1.25,1.25,0,0,0,0-2.49Z"/><path class="cls-8" d="M175.38,791.69H140.94a1.25,1.25,0,0,0,0,2.5h34.44a1.25,1.25,0,0,0,0-2.5Z"/><path class="cls-20" d="M73.68,714.26A105.42,105.42,0,0,0,65.53,725a8.74,8.74,0,0,0-5.4-3.45c-1.21-.21-2.78-.22-3.57.57-.14.12-.28.27-.43.4-.9.85-1.34,2.37.13,3.28a12.8,12.8,0,0,1,3.05,2.08,16.87,16.87,0,0,1,2.6,4.48c1.15,2.64,5.82,2.75,6.84.31a138.16,138.16,0,0,1,8.45-16.69C78.24,714.22,75.08,712.66,73.68,714.26Z"/><path class="cls-17" d="M95.88,692.27a.31.31,0,0,1-.19,0,.44.44,0,0,1-.28-.22.5.5,0,0,1,0-.34,12.8,12.8,0,0,1,1-2.61.49.49,0,0,1,.27-.22.47.47,0,0,1,.35,0,.46.46,0,0,1,.22.27.45.45,0,0,1,0,.34,11.69,11.69,0,0,0-1,2.41.37.37,0,0,1-.14.22A.41.41,0,0,1,95.88,692.27Z"/><path class="cls-17" d="M171.52,710.06a.49.49,0,0,1-.17,0l-.65-.15c-1.53-.35-3.11-.72-4.77-1.16a.43.43,0,0,1-.25-.21.42.42,0,0,1,0-.33.51.51,0,0,1,.19-.28.48.48,0,0,1,.33-.06c1.65.43,3.22.8,4.74,1.14l.66.16a.41.41,0,0,1,.28.2.43.43,0,0,1,.06.35.43.43,0,0,1-.14.23A.44.44,0,0,1,171.52,710.06Zm-10.73-2.92a.38.38,0,0,1-.21,0,40.51,40.51,0,0,1-5.16-2.22.46.46,0,0,1-.19-.26.47.47,0,0,1,0-.33.42.42,0,0,1,.25-.22.47.47,0,0,1,.33,0,40.33,40.33,0,0,0,5,2.13.56.56,0,0,1,.15.1.49.49,0,0,1,.11.14.39.39,0,0,1,0,.18.32.32,0,0,1,0,.17.48.48,0,0,1-.14.2.44.44,0,0,1-.22.1ZM151,702a.49.49,0,0,1-.17,0,.4.4,0,0,1-.16-.08,27,27,0,0,1-4.1-3.89.44.44,0,0,1-.11-.33.47.47,0,0,1,.16-.31.44.44,0,0,1,.33-.11.43.43,0,0,1,.31.16,26.52,26.52,0,0,0,4,3.75.49.49,0,0,1,.12.13.55.55,0,0,1,.06.18.49.49,0,0,1,0,.17.56.56,0,0,1-.09.17.47.47,0,0,1-.13.11A.49.49,0,0,1,151,702Zm-7.16-8.41a.5.5,0,0,1-.27-.05.52.52,0,0,1-.2-.19,25.59,25.59,0,0,1-2.1-5.25.55.55,0,0,1,0-.18.49.49,0,0,1,.06-.17.76.76,0,0,1,.11-.14.46.46,0,0,1,.16-.07.43.43,0,0,1,.35,0,.47.47,0,0,1,.21.27,25.19,25.19,0,0,0,2,5,.47.47,0,0,1,0,.35.49.49,0,0,1-.22.27Zm2.2-6.25a21.15,21.15,0,0,1-3.08.2.44.44,0,0,1-.46-.46.46.46,0,0,1,.13-.32.47.47,0,0,1,.33-.14,20.86,20.86,0,0,0,2.95-.18,19.79,19.79,0,0,0,2.41-.49.37.37,0,0,1,.18,0,.34.34,0,0,1,.17.05.37.37,0,0,1,.13.12.35.35,0,0,1,.08.16.55.55,0,0,1,0,.18.49.49,0,0,1-.06.17.47.47,0,0,1-.11.13.4.4,0,0,1-.16.08,18.45,18.45,0,0,1-2.54.52Zm-8.52-.45h-.15a55.47,55.47,0,0,1-5.41-1.46.45.45,0,0,1-.22-.54.44.44,0,0,1,.18-.24.47.47,0,0,1,.3-.08,54.26,54.26,0,0,0,5.33,1.43.52.52,0,0,1,.27.17.47.47,0,0,1,.1.3.53.53,0,0,1-.12.3.47.47,0,0,1-.29.14Zm16-2.42a.39.39,0,0,1-.24,0,.58.58,0,0,1-.19-.15.46.46,0,0,1,.09-.65,11.6,11.6,0,0,0,2.08-1.94,8.5,8.5,0,0,0,1.28-2.12.47.47,0,0,1,.26-.24.43.43,0,0,1,.35,0,.42.42,0,0,1,.24.25.47.47,0,0,1,0,.35,10.13,10.13,0,0,1-1.43,2.33,12.94,12.94,0,0,1-2.22,2.09.36.36,0,0,1-.23.09ZM141,682.89h-.06a.47.47,0,0,1-.17,0,.4.4,0,0,1-.15-.1.45.45,0,0,1-.1-.14.39.39,0,0,1,0-.18,16.89,16.89,0,0,1,.84-5.64.42.42,0,0,1,.23-.26.45.45,0,0,1,.34,0,.51.51,0,0,1,.27.23.47.47,0,0,1,0,.35,15.89,15.89,0,0,0-.79,5.38.5.5,0,0,1-.12.29.43.43,0,0,1-.28.15Zm-14.08.79a.34.34,0,0,1-.2,0c-.62-.2-1.24-.4-1.86-.58-1.21-.37-2.34-.67-3.44-.93a.46.46,0,0,1-.29-.2.53.53,0,0,1-.06-.35.48.48,0,0,1,.08-.16.37.37,0,0,1,.13-.12.33.33,0,0,1,.16-.07.55.55,0,0,1,.18,0c1.12.26,2.27.57,3.5.94l1.88.58a.46.46,0,0,1,.24.19.43.43,0,0,1,.08.29.45.45,0,0,1-.13.28.5.5,0,0,1-.27.14Zm-26.45,1.8a.58.58,0,0,1-.23,0,.49.49,0,0,1-.18-.14.46.46,0,0,1-.09-.15.55.55,0,0,1,0-.18.48.48,0,0,1,0-.17.53.53,0,0,1,.11-.14,18.58,18.58,0,0,1,4.87-2.93.51.51,0,0,1,.17,0l.18,0a.56.56,0,0,1,.15.1l.1.15a.48.48,0,0,1-.26.6,17.54,17.54,0,0,0-4.62,2.78.45.45,0,0,1-.27.12Zm15.66-4.23H116a27.57,27.57,0,0,0-5.45,0,.47.47,0,0,1-.3-.1.43.43,0,0,1-.15-.28.45.45,0,0,1,.06-.32.47.47,0,0,1,.25-.19,28.07,28.07,0,0,1,5.65,0,.47.47,0,0,1,.31.16.48.48,0,0,1,.1.33.43.43,0,0,1-.13.26.38.38,0,0,1-.26.13Zm41.66-6.51a.43.43,0,0,1-.33-.08.51.51,0,0,1-.19-.29,5.91,5.91,0,0,0-2.07-3.65,5.63,5.63,0,0,0-.72-.48.51.51,0,0,1-.14-.26.42.42,0,0,1,0-.29.41.41,0,0,1,.21-.2.42.42,0,0,1,.29,0,6.69,6.69,0,0,1,3.25,4.77.43.43,0,0,1-.08.33.44.44,0,0,1-.29.19Zm-13.14-2.08a.44.44,0,0,1-.2,0,.42.42,0,0,1-.18-.11.4.4,0,0,1-.1-.15.58.58,0,0,1,0-.18.47.47,0,0,1,0-.17.4.4,0,0,1,.1-.15,11.32,11.32,0,0,1,4.89-2.94.47.47,0,0,1,.17,0,.49.49,0,0,1,.17.06l.14.11a.89.89,0,0,1,.08.17.47.47,0,0,1,0,.17.84.84,0,0,1-.05.17.41.41,0,0,1-.12.14.35.35,0,0,1-.16.08,10.36,10.36,0,0,0-4.51,2.71.49.49,0,0,1-.27.15Z"/><path class="cls-17" d="M179.35,712.66a.44.44,0,0,1-.32-.07,9.6,9.6,0,0,0-2.31-1.1.34.34,0,0,1-.17-.08.53.53,0,0,1-.12-.14.41.41,0,0,1-.05-.18.4.4,0,0,1,0-.19.39.39,0,0,1,.1-.16.42.42,0,0,1,.15-.11.37.37,0,0,1,.18,0,.39.39,0,0,1,.18,0,10.3,10.3,0,0,1,2.54,1.18.37.37,0,0,1,.12.13.33.33,0,0,1,.07.16.54.54,0,0,1,0,.18.39.39,0,0,1-.07.16.5.5,0,0,1-.14.15A.4.4,0,0,1,179.35,712.66Z"/></g></g></svg>
\ No newline at end of file
diff --git a/src/assets/imgs/tv.svg b/src/assets/imgs/tv.svg
new file mode 100644
index 000000000..6550d2370
--- /dev/null
+++ b/src/assets/imgs/tv.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="23px" height="24px" viewBox="0 0 23 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>8222D3CB-8C6A-4834-9608-3BC140A83A20</title>
+    <g id="Final-layouts" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Home-page-your-preferences" transform="translate(-211.000000, -734.000000)">
+            <g id="Group-12" transform="translate(8.000000, 258.000000)">
+                <g id="Group-2" transform="translate(8.000000, 431.000000)">
+                    <g id="tv" transform="translate(196.000000, 46.000000)">
+                        <path d="M18.9456522,18.5625 L2.34469565,18.5625 C1.428,18.5625 0.684782609,17.8163333 0.684782609,16.896 L0.684782609,6.479 C0.684782609,5.55866667 1.428,4.8125 2.34469565,4.8125 L18.9456522,4.8125 C19.8623478,4.8125 20.6055652,5.55866667 20.6055652,6.479 L20.6055652,16.896 C20.6055652,17.8163333 19.8623478,18.5625 18.9456522,18.5625 Z" id="Stroke-1" stroke="#E7800B" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
+                        <polygon id="Stroke-3" stroke="#E7800B" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" points="3.42391304 15.8125 14.3804348 15.8125 14.3804348 7.5625 3.42391304 7.5625"></polygon>
+                        <path d="M17.1195652,9.625 C17.0273478,9.625 16.946087,9.60666667 16.8547826,9.57 C16.7726087,9.53333333 16.6995652,9.4875 16.6356522,9.42333333 C16.5078261,9.295 16.4347826,9.12083333 16.4347826,8.9375 C16.4347826,8.84583333 16.4530435,8.75416667 16.4895652,8.67166667 C16.5169565,8.58916667 16.5708261,8.51583333 16.6356522,8.45166667 C16.6995652,8.3875 16.7726087,8.34166667 16.8547826,8.305 C17.0191304,8.23166667 17.2108696,8.23166667 17.3843478,8.305 C17.4665217,8.34166667 17.5395652,8.3875 17.6034783,8.45166667 C17.6673913,8.51583333 17.7121304,8.58916667 17.7486522,8.67166667 C17.7851739,8.75416667 17.8043478,8.84583333 17.8043478,8.9375 C17.8043478,9.12083333 17.7313043,9.295 17.6034783,9.42333333 C17.5395652,9.4875 17.4665217,9.53333333 17.3843478,9.57 C17.3021739,9.60666667 17.2108696,9.625 17.1195652,9.625" id="Fill-5" fill="#E7800B"></path>
+                        <path d="M17.1195652,12.375 C17.0273478,12.375 16.946087,12.3566667 16.8547826,12.32 C16.7726087,12.2833333 16.6995652,12.2375 16.6356522,12.1733333 C16.5078261,12.045 16.4347826,11.8708333 16.4347826,11.6875 C16.4347826,11.5958333 16.4530435,11.5041667 16.4895652,11.4216667 C16.5169565,11.3391667 16.5708261,11.2658333 16.6356522,11.2016667 C16.6995652,11.1375 16.7726087,11.0916667 16.8547826,11.055 C17.0191304,10.9816667 17.2108696,10.9816667 17.3843478,11.055 C17.4665217,11.0916667 17.5395652,11.1375 17.6034783,11.2016667 C17.6673913,11.2658333 17.7121304,11.3391667 17.7486522,11.4216667 C17.7851739,11.5041667 17.8043478,11.5958333 17.8043478,11.6875 C17.8043478,11.8708333 17.7313043,12.045 17.6034783,12.1733333 C17.5395652,12.2375 17.4665217,12.2833333 17.3843478,12.32 C17.3021739,12.3566667 17.2108696,12.375 17.1195652,12.375" id="Fill-6" fill="#E7800B"></path>
+                        <line x1="6.16304348" y1="18.5625" x2="4.79347826" y2="21.3125" id="Stroke-7" stroke="#E7800B" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></line>
+                        <line x1="14.3804348" y1="18.5625" x2="15.75" y2="21.3125" id="Stroke-8" stroke="#E7800B" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></line>
+                        <line x1="7.5326087" y1="0.6875" x2="8.90217391" y2="4.8125" id="Stroke-9" stroke="#E7800B" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></line>
+                        <line x1="11.6413043" y1="4.8125" x2="13.0108696" y2="0.6875" id="Stroke-10" stroke="#E7800B" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></line>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/imgs/videos.svg b/src/assets/imgs/videos.svg
new file mode 100644
index 000000000..6e9421e2d
--- /dev/null
+++ b/src/assets/imgs/videos.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>7A73D8D9-D399-4E6A-903B-2ACF8FB26F69</title>
+    <g id="Search-page" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Search-page-01" transform="translate(-299.000000, -328.000000)">
+            <g id="Group-16" transform="translate(300.000000, 329.000000)">
+                <path d="M18,9 C18,13.971 13.971,18 9,18 C4.03,18 0,13.971 0,9 C0,4.029 4.03,0 9,0 C13.971,0 18,4.029 18,9" id="Combined-Shape" stroke="#6236FF"></path>
+                <path d="M8.1148,3.875 L13.0478,7.986 C13.6808,8.514 13.6808,9.486 13.0478,10.014 L8.1148,14.125 C7.2548,14.841 5.9498,14.23 5.9498,13.111 L5.9498,4.889 C5.9498,3.77 7.2548,3.159 8.1148,3.875" id="Fill-4" fill="#6E1CFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/styles/_helper.scss b/src/assets/styles/_helper.scss
index beaafb2f4..48b5c539c 100644
--- a/src/assets/styles/_helper.scss
+++ b/src/assets/styles/_helper.scss
@@ -123,3 +123,10 @@
 .bg-transparent {
   background: transparent;
 }
+.clearfix {
+  &::after {
+    clear: both;
+    content: "";
+    display: block;
+  }
+}
diff --git a/src/assets/styles/_variables.scss b/src/assets/styles/_variables.scss
index dff12247c..5e3a63a0a 100644
--- a/src/assets/styles/_variables.scss
+++ b/src/assets/styles/_variables.scss
@@ -15,43 +15,109 @@ $colors: (
   primary_black:   #333333,
   secondary_black: #484848,
   shadow_black:    #CBCBCB,
+  light_black:     #333333a1,
+  light_black_51:  #515151,
 
   dark_gray:       #979797,
   medium_gray:     #CCCCCC,
   light_gray:      #ECEFF0,
-  gray:            #D8D8D8,
+  light_silver:    #D8D8D8,
   text_gray:       #4A4A4A,
-
+  bright_gray :     #aaaaaa,
+  medium_light_gray: #D6D6D6,
+  gray_light:       #dedede,
+  gray_solid:      #a4a4a4,
+  light_gray_8c:   #eeeeee8c,
+  gray_white:      #efeff4,
+  gray_96:         #969696,
+  gray_3A:       	 #3A3A3A,
+  gray_79:         #797979,
+  gray_81 :        #818181,
+  gray_ba:         #bababa,
+  light_gray_dd:   #ddd,
+  light_gray-c3:   #c3c3c3,
+  light_gray_bd:   #bdbdbd,
+  dark_gray_61:    #616161,
+  gray_9b:         #9b9b9b,
 
   white:           #FFFFFF,
   white_f7:        #F7F7F7,
   white_f2:        #F2F2F2,
   white_f4:        #F4F4F4,
   white_f0:        #F0F0F0,
+  white_f1:        #f1f1f1,
+  white_fe:        #fdfefe,
+  white_f8:        #f8f8f8,
+  white_eb:        #EBEBE4,
+  white_e6:        #e6e6e6,
+  white_f3:        #F3F7FA,
+  white_e9:        #e9e9e9,
+  white_fa:        #fafafa,
+  white_e8:       #e8e7e7,
 
   green:           #27BC5C,
   dark_green:      #4CB5AB,
   success_green:   #7ED321,
   dirt_green:      #37474F,
 
+  dark_orange:     #FFA11D,
   orange:          #FF9F00,
   yellow:          #E3C31C,
   lemon_yellow:    #CCE310,
+  vivid_orange:    #F7B500,
+  ligth_yellow:    #FEEDD7,
 
   dark_violet:     #9012FE,
   medium_violet:   #F0E9FD,
   light_violet:    #F3E7FE,
+  vivid_purple:    #9017FF,
 
   red:             #D50000,
   light_red:       #FA8F9C,
+  bright_red :     #FF6979,
+  bright_red_e7:   #e76026,
+  pale_red:        #FBE7E0,
+  vivid_red:       #ff0000,
+  // danger_red: #f1453d,
 
   thick_blue:      #006DE5,
   primary_blue:    #007AFF,
   fade_blue:       #F2F8FF,
+  bright_blue: #0a5cad,
+  light_blue_color: #7EAEDE,
+  grayish_blue: #2e3f51,
+  brighter_blue: #074F9D,
+  deep_blue :    #024F90,
+  light_blue_f6: #87d8f6,
+  vivid_blue:    #2E92FF,
+  pale_blue:     #E5EDF5,
+  vived_blue_ff: #488aff,
+  vived_blue_fe : #0076fe,
+  light_blue_ee: #7AB4EE,
+  bright_blue_a0: #0a55a0,
+  bright_blue_9f: #08539f,
+  pale_blue_f6: #E5EDF6,
+  light_blue_f5:#71b3f5,
+  pale_blue_e0: #E0EFFF,
+  bright_blue_19: #196dab,
+  light_blue_80: #80a7ce,
+  pale_blue_f0: #d9e5f0,
+  dark_blue:  #0D7DFC,
+
   broadcast_greeting_navbar : #0b75fa,
-  textGrey:#666666,
+  granite_gray: #666666,
   office_green: #008000,
-  cornflower_blue:#467fb8
+  vivid_green: #00ba75,
+  light_grayish_green: #BFE1CF,
+  pale_green:          #d2eadd,
+  pale_green_e0: #E0F5EA,
+  strong_green: #0ec254,
+  cornflower_blue:#467fb8,
+  light_grayish_red: #EEE2E2,
+  bright_yellow : #f8e71c,
+  empty_color: #eee,
+  pale_cyan: #c6dbd8,
+  whitish_light_green: #e5f3eb
 );
 /* to be removed ends */
 
@@ -130,7 +196,7 @@ $gray-800:     #333333; // text color
 $blue:    #024f9d;
 $green:   #008840;
 $orange:  #e55a28;
-$red:     #DB4437;
+$red:     #ff4558;
 $white:   #ffffff;
 $indigo:  #6610f2;
 $purple:  #6f42c1;
diff --git a/src/assets/styles/base/_variables.scss b/src/assets/styles/base/_variables.scss
index c343f9ddb..8eeb3893a 100644
--- a/src/assets/styles/base/_variables.scss
+++ b/src/assets/styles/base/_variables.scss
@@ -62,7 +62,7 @@ sans-serif;
 // Base Colors
 $blue: #024f9d;
 $green: #008840;
-$orange: #e55a28;
+$orange: #e55a28; 
 $red: #ff4558;
 $white: #fff;
 $indigo: #6610f2;
diff --git a/src/assets/styles/component/_sb-buttons.scss b/src/assets/styles/component/_sb-buttons.scss
index e3c7d35cf..b9733d04d 100644
--- a/src/assets/styles/component/_sb-buttons.scss
+++ b/src/assets/styles/component/_sb-buttons.scss
@@ -48,9 +48,9 @@
     }
 }
 // button sizes
-.sb-btn-xs, .sb-btn-normal, .sb-btn-md {
-    @include padding(($base-block-space * 2));
-}
+// .sb-btn-xs, .sb-btn-normal, .sb-btn-md {
+//     @include padding(($base-block-space * 2));
+// }
 .sb-btn-xs {
     height:($base-block-space * 3);
     @include padding(($base-block-space * 1));
@@ -69,6 +69,7 @@
 .sb-btn-md {
     height:($base-block-space * 6);
     font-size:$font-size-md;
+    @include padding(($base-block-space * 2));
 }
 .sb-btn-lg {
   height:($base-block-space * 7);
diff --git a/src/assets/styles/component/_sb-card.scss b/src/assets/styles/component/_sb-card.scss
index 9f256e3a6..ef13a0c42 100644
--- a/src/assets/styles/component/_sb-card.scss
+++ b/src/assets/styles/component/_sb-card.scss
@@ -1,5 +1,5 @@
 /* card styles starts here */
-
+@import "src/assets/styles/_variables.scss";
 .sb-card-container {
     display: inline-flex;
     
@@ -139,17 +139,8 @@
           }
         }        
     }
-
-}
-
-.sb-card-recently-container{
-    flex-direction: row;
-    .sb-card.full .sb-card-details{
-      @include padding(null, null, null, 0);
-    }
 }
 
-
 .sb-card-textbook-container, .sb-card-view-all-container, .sb-card-download-container {
     flex-direction: column;
     box-shadow: 0px 3px 5px 2px rgba(0, 0, 0, 0.10);
@@ -242,9 +233,10 @@
 .sb-textbook-container {
   // margin-top: ($base-block-space * 3);
   @include padding(($base-block-space * 1));
-  width: 100%;
+  width: 98.5%;
   &:last-child{
       margin-bottom: ($base-block-space * 2);
+      margin-left: 3px;
   }
 
   .sb-textbook-items {
@@ -264,7 +256,7 @@
           }
           .textbook-title {
               height: ($base-block-space * 3);	
-              color: #024F9D;	
+              color: $blue;	
               font-size: 18px;	
               font-weight: bold;
               text-transform: capitalize;
@@ -308,30 +300,6 @@
   }
 }
 
-.sb-recently-viewed-container {
-  min-height: 135px;
-  .sb-recently-viewed-items{
-    background-color: #024f9d;
-    height: ($base-block-space * 11);
-    width: 100%;
-    position: relative;
-    @include padding(($base-block-space * 1), 0);
-    .sb-recenlty-viewed-title {
-      font-size: $font-size-md;
-      color: #ffffff;
-      font-family: "Noto Sans";	
-      overflow: auto;
-      margin-bottom: ($base-block-space * 2);
-    @include padding(0, ($base-block-space * 1));
-
-    }
-      .sb-card-scroll-container{
-      overflow-x: auto;
-      padding: 0 0 8px 0;
-    }
-  }
-}
-
 .sb-card-download-container {
   .sb-card {
     grid-template-columns: ($base-block-space * 4) ($base-block-space * 10) auto;
@@ -361,3 +329,27 @@
   }
 }
 
+.sb-recently-viewed-container {
+  min-height: 135px;
+  padding-top: 8px;
+  .sb-recently-viewed-items{
+    height: ($base-block-space * 11);
+    width: 100%;
+    position: relative;
+    @include padding(($base-block-space * 1), 0);
+    .sb-recenlty-viewed-title {
+      font-weight: 700;
+      font-size: 18px;
+      padding-top: 5px;
+      font-family: "Noto Sans";	
+      overflow: auto;
+      margin-bottom: ($base-block-space * 1.5);
+    @include padding(0, ($base-block-space * 1));
+
+    }
+      .sb-card-scroll-container{
+      overflow-x: auto;
+      padding: 0 0 8px 0;
+    }
+  }
+}
diff --git a/src/assets/styles/component/_sb-popover-download.scss b/src/assets/styles/component/_sb-popover-download.scss
index f477fde2f..6ee534724 100644
--- a/src/assets/styles/component/_sb-popover-download.scss
+++ b/src/assets/styles/component/_sb-popover-download.scss
@@ -1,3 +1,4 @@
+@import "src/assets/styles/_variables.scss";
 .sb-popover.sb-popover-download{
     .backdrop{
         background-color: rgba(0, 0, 0, 0.59);
@@ -62,7 +63,7 @@
         right: 0;
         bottom: 0;
         height: 72px;
-        background-color: #FFFFFF;
+        background-color: map-get($colors, white);
         box-shadow: 0 -4px 4px 1px rgba(0,0,0,0.22);
 
         .sb-popover-toolbar {
@@ -71,21 +72,21 @@
             padding: 16px;
             
             .toolbar-background {
-                background-color: #fff;
+                background-color: map-get($colors, white);
             }
             .toolbar-title{
-               color: #024F9D;
+               color: $blue;
                text-align: left;
                .meta-info{
                     display: block;
-                    color: #979797;
+                    color: map-get($colors, dark_gray);
                     font-size: 12px;
                     font-weight:normal;
                }
 
             }
             .sb-modal-close{
-                color: #eeeeee;
+                color: map-get($colors, empty_color);
                 font-weight: normal;
                 top: -24px;
               //  right: -16px;
diff --git a/src/assets/styles/component/_sb-popover.scss b/src/assets/styles/component/_sb-popover.scss
index a0aaba154..d7dab63bc 100644
--- a/src/assets/styles/component/_sb-popover.scss
+++ b/src/assets/styles/component/_sb-popover.scss
@@ -1,4 +1,5 @@
 /*Sb popover css*/
+@import "src/assets/styles/_variables.scss";
 .sb-popover {
   ion-backdrop {
     background-color: rgba(0, 0, 0, 0.59);
@@ -113,6 +114,20 @@
           font-weight: bold;
           text-align: center;
           @include padding(($base-block-space * 1), 0, 0, 0);
+          .sb-popover-download-content {
+            color: black !important;
+            font-size: 1.2rem !important;
+          }
+        }
+
+        .sb-popover-information {
+          color: $gray-800;
+          font-family: "Noto Sans";
+          font-weight: normal;
+          font-size: ($font-size-base + 6);
+          letter-spacing: 0;
+          line-height: 24px;
+          text-align: center;
         }
       }
     }
@@ -217,6 +232,29 @@
   }
 }
 
+.sb-popover.success {
+  .sb-popover-header {
+    background-color: #008840;
+    .sb-popover-toolbar .toolbar-background {
+      background-color: #008840;
+    }
+  }
+  .popover-content {
+    .sb-popover-items {
+      padding: 16px;
+      .icon-container {
+        ion-icon {
+          font-size: ($font-size-base * 2)+2;
+          color: #008840;
+        }
+      }
+    }
+  }
+  .sb-popover-footer .sb-popover-action-btn.popover-color {
+    background-color: #008840;
+  }
+}
+
 // For Permission Popup
 .sb-popover.sb-popover-permissions {
   .sb-popover-items {
@@ -252,36 +290,42 @@
     padding: 16px;
 
     .popover-button-cancel {
-      background-color: #fff;
+      background-color: map-get($colors, white);
       --background: white;
-      border: 1px solid #024f9d;
-      color: #024f9d !important;
+      border: 1px solid $blue;
+      color: $blue !important;
       width: 150px;
     }
     @media only screen and (max-width : 720px) {
     .popover-button-cancel-longlength { 
-      background-color: #fff;
+      background-color: map-get($colors, white);
       --background: white;
-      border: 1px solid #024f9d;
-      color: #024f9d !important;
+      border: 1px solid $blue;
+      color: $blue !important;
       width: 160px;
       padding: 8px;
     }
     }
     @media only screen and (min-width : 721px) and (max-width : 1025px) {
       .popover-button-cancel-longlength { 
-        background-color: #fff;
+        background-color: map-get($colors, white);
         --background: white;
-        border: 1px solid #024f9d;
-        color: #024f9d !important;
+        border: 1px solid $blue;
+        color: $blue !important;
         width: 150px;
     }
   }
     .popover-button-allow {
-      border: 1px solid #024f9d;
-      background-color: #024f9d;
+      border: 1px solid $blue;
+      background-color: $blue;
       width: 150px;
     }
+
+    .popover-button-information {
+      padding: 4px 72px;
+      height: 36px;
+      border-radius: 2px !important;
+    }
   }
 }
 
@@ -303,6 +347,13 @@
   }
 }
 
+.sb-popover.success {
+  .sb-popover-header,
+  .sb-popover-header .sb-popover-toolbar {
+    --background: #008840;
+  }
+}
+
 .sb-popover.danger {
   .sb-popover-header,
   .sb-popover-header .sb-popover-toolbar {
@@ -336,7 +387,7 @@
   --max-height: 100% !important;
   .popover-content{
     --max-height: 100% !important;
-    background: #fff !important;
+    background: map-get($colors, white) !important;
     .rating-full-height {
       height: 100vh !important;
     }
diff --git a/src/assets/styles/default-theme.scss b/src/assets/styles/default-theme.scss
new file mode 100644
index 000000000..11327afe7
--- /dev/null
+++ b/src/assets/styles/default-theme.scss
@@ -0,0 +1,84 @@
+html[data-theme="DEFAULT"]{
+
+  --app-primary:#006DE5;
+  --app-primary-medium:#007AFF;
+  --app-primary-light:#C6E7FF;
+  --app-primary-background:#EDF4F9;
+  --app-primary-header:#FFFFFF;
+  --app-primary-header-light:#FFFFFF;
+  --app-secondary-background:#EDF4F9;
+  --app-tertiary:#6236FF;
+  --app-tertiary-light:#E0E1FD;
+
+  --app-white:#FFFFFF;
+  --app-black:#000000; // remove
+  --app-dark-gray:#222222;
+  --app-gray:#333333;
+  --app-medium-gray:#666666;
+  --app-light-gray:#999999;
+
+  --app-shadow:rgba(0,0,0,0.1);
+  --button-style-shadow: 5px 5px 2px 0 var(--app-shadow);
+  --block-style-shadow: 0 2px 7px 0 var(--app-shadow);
+
+  app-profile{
+    .self-declare-btn{
+      ion-button{
+        --background: #{map-get($colors, dark_green)} !important;
+      }
+    }
+
+    .self-declare-teacher-details{
+      ion-button{
+        --background: #FFFFFF !important;
+      }
+    }
+  }
+
+  app-enrollment-details{
+    ion-item-group{
+      ion-item-divider{
+        background-color:map-get($colors, light_gray) !important;
+      }
+    }
+    .sb-btn-outline-info{
+      background-color: map-get($colors, primary) !important;
+      border-radius: 5px !important;
+      color: map-get($colors, white) !important;
+      border-color: map-get($colors, white) !important;
+    }
+  }
+
+  app-courses{
+    .enrolled-course-bg > sb-course-cards-hlist > .layout-course > .header > .title{
+      color: white !important;
+    }
+  }
+
+  app-course-batches{
+    .batch-list{
+      .flex-card-container{
+        .sb-btn-outline-info{
+          background-color: map-get($colors, thick_blue) !important;
+          border-radius: 5px !important;
+          color: white !important;
+          border-color: white !important;
+        }
+      }
+    }
+  }
+
+  app-qrcoderesult{
+    .qr-result-btn{
+      border-top-left-radius: 0px !important;
+      border-top-right-radius: 0px !important;
+    }
+  }
+
+  app-guest-edit{
+    ion-content{
+      --background: var(--app-white);
+    }
+  }
+}
+
diff --git a/src/assets/styles/details_page.scss b/src/assets/styles/details_page.scss
index 890444cfd..aa5ebc261 100644
--- a/src/assets/styles/details_page.scss
+++ b/src/assets/styles/details_page.scss
@@ -1,9 +1,11 @@
+@import "src/assets/styles/_variables.scss";
+
 .padding-10 {
     padding: 10px;
 }
 
 .background-gray {
-    background: #efeff4;
+    background: map-get($colors, gray_white);
     @include margin(0, -26px);
     @include padding(null, null, null, 25px !important);
 }
diff --git a/src/assets/styles/quml-styles/quml-carousel.css b/src/assets/styles/quml-styles/quml-carousel.css
new file mode 100644
index 000000000..b15b44697
--- /dev/null
+++ b/src/assets/styles/quml-styles/quml-carousel.css
@@ -0,0 +1,237 @@
+.carousel {
+    position: relative;
+  }
+  
+  .carousel-inner {
+    position: relative;
+    width: 100%;
+    overflow: hidden;
+  }
+  
+  .carousel-item {
+    position: relative;
+    display: none;
+    -ms-flex-align: center;
+    align-items: center;
+    width: 100%;
+    transition: -webkit-transform 0.6s ease;
+    transition: transform 0.6s ease;
+    transition: transform 0.6s ease, -webkit-transform 0.6s ease;
+    -webkit-backface-visibility: hidden;
+    backface-visibility: hidden;
+    -webkit-perspective: 1000px;
+    perspective: 1000px;
+  }
+  
+  @media screen and (prefers-reduced-motion: reduce) {
+    .carousel-item {
+      transition: none;
+    }
+  }
+  
+  .carousel-item.active,
+  .carousel-item-next,
+  .carousel-item-prev {
+    display: block;
+  }
+  
+  .carousel-item-next,
+  .carousel-item-prev {
+    position: absolute;
+    top: 0;
+  }
+  
+  .carousel-item-next.carousel-item-left,
+  .carousel-item-prev.carousel-item-right {
+    -webkit-transform: translateX(0);
+    transform: translateX(0);
+  }
+  
+  @supports ((-webkit-transform-style: preserve-3d) or (transform-style: preserve-3d)) {
+    .carousel-item-next.carousel-item-left,
+    .carousel-item-prev.carousel-item-right {
+      -webkit-transform: translate3d(0, 0, 0);
+      transform: translate3d(0, 0, 0);
+    }
+  }
+  
+  .carousel-item-next,
+  .active.carousel-item-right {
+    -webkit-transform: translateX(100%);
+    transform: translateX(100%);
+  }
+  
+  @supports ((-webkit-transform-style: preserve-3d) or (transform-style: preserve-3d)) {
+    .carousel-item-next,
+    .active.carousel-item-right {
+      -webkit-transform: translate3d(100%, 0, 0);
+      transform: translate3d(100%, 0, 0);
+    }
+  }
+  
+  .carousel-item-prev,
+  .active.carousel-item-left {
+    -webkit-transform: translateX(-100%);
+    transform: translateX(-100%);
+  }
+  
+  @supports ((-webkit-transform-style: preserve-3d) or (transform-style: preserve-3d)) {
+    .carousel-item-prev,
+    .active.carousel-item-left {
+      -webkit-transform: translate3d(-100%, 0, 0);
+      transform: translate3d(-100%, 0, 0);
+    }
+  }
+  
+  .carousel-fade .carousel-item {
+    opacity: 0;
+    transition-duration: .6s;
+    transition-property: opacity;
+  }
+  
+  .carousel-fade .carousel-item.active,
+  .carousel-fade .carousel-item-next.carousel-item-left,
+  .carousel-fade .carousel-item-prev.carousel-item-right {
+    opacity: 1;
+  }
+  
+  .carousel-fade .active.carousel-item-left,
+  .carousel-fade .active.carousel-item-right {
+    opacity: 0;
+  }
+  
+  .carousel-fade .carousel-item-next,
+  .carousel-fade .carousel-item-prev,
+  .carousel-fade .carousel-item.active,
+  .carousel-fade .active.carousel-item-left,
+  .carousel-fade .active.carousel-item-prev {
+    -webkit-transform: translateX(0);
+    transform: translateX(0);
+  }
+  
+  @supports ((-webkit-transform-style: preserve-3d) or (transform-style: preserve-3d)) {
+    .carousel-fade .carousel-item-next,
+    .carousel-fade .carousel-item-prev,
+    .carousel-fade .carousel-item.active,
+    .carousel-fade .active.carousel-item-left,
+    .carousel-fade .active.carousel-item-prev {
+      -webkit-transform: translate3d(0, 0, 0);
+      transform: translate3d(0, 0, 0);
+    }
+  }
+  
+  .carousel-control-prev,
+  .carousel-control-next {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    display: -ms-flexbox;
+    display: flex;
+    -ms-flex-align: center;
+    align-items: center;
+    -ms-flex-pack: center;
+    justify-content: center;
+    width: 15%;
+    color: #fff;
+    text-align: center;
+    opacity: 0.5;
+  }
+  
+  .carousel-control-prev:hover, .carousel-control-prev:focus,
+  .carousel-control-next:hover,
+  .carousel-control-next:focus {
+    color: #fff;
+    text-decoration: none;
+    outline: 0;
+    opacity: .9;
+  }
+  
+  .carousel-control-prev {
+    left: 0;
+  }
+  
+  .carousel-control-next {
+    right: 0;
+  }
+  
+  .carousel-control-prev-icon,
+  .carousel-control-next-icon {
+    display: inline-block;
+    width: 20px;
+    height: 20px;
+    background: transparent no-repeat center center;
+    background-size: 100% 100%;
+  }
+  
+  .carousel-control-prev-icon {
+    background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M5.25 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E");
+  }
+  
+  .carousel-control-next-icon {
+    background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M2.75 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E");
+  }
+  
+  .carousel-indicators {
+    position: absolute;
+    right: 0;
+    bottom: 10px;
+    left: 0;
+    z-index: 15;
+    display: -ms-flexbox;
+    display: flex;
+    -ms-flex-pack: center;
+    justify-content: center;
+    padding-left: 0;
+    margin-right: 15%;
+    margin-left: 15%;
+    list-style: none;
+  }
+  
+  .carousel-indicators li {
+    position: relative;
+    -ms-flex: 0 1 auto;
+    flex: 0 1 auto;
+    width: 30px;
+    height: 3px;
+    margin-right: 3px;
+    margin-left: 3px;
+    text-indent: -999px;
+    cursor: pointer;
+    background-color: rgba(255, 255, 255, 0.5);
+  }
+  
+  .carousel-indicators li::before {
+    position: absolute;
+    top: -10px;
+    left: 0;
+    display: inline-block;
+    width: 100%;
+    height: 10px;
+    content: "";
+  }
+  
+  .carousel-indicators li::after {
+    position: absolute;
+    bottom: -10px;
+    left: 0;
+    display: inline-block;
+    width: 100%;
+    height: 10px;
+    content: "";
+  }
+  
+  .carousel-indicators .active {
+    background-color: #fff;
+  }
+  
+  .carousel-caption {
+    position: absolute;
+    right: 15%;
+    bottom: 20px;
+    left: 15%;
+    z-index: 10;
+    padding-top: 20px;
+    padding-bottom: 20px;
+    color: #fff;
+    text-align: center;
+  }
\ No newline at end of file
diff --git a/src/assets/styles/themeable.scss b/src/assets/styles/themeable.scss
new file mode 100644
index 000000000..a84dbb2ee
--- /dev/null
+++ b/src/assets/styles/themeable.scss
@@ -0,0 +1,1642 @@
+@import "src/assets/styles/_variables.scss";
+@import '../../../node_modules/@project-sunbird/sb-themes/themes/themes-mobile.scss';
+
+html[data-theme="JOYFUL"]{
+
+  --app-primary:#024f9d;
+  --app-primary-medium:#007AFF;
+  --app-primary-light-2:#94CCF5;
+  --app-primary-light:#C6E7FF;
+  --app-primary-background:#F3F7FB;
+  --app-primary-header:#FFD954;
+  --app-primary-header-light:#FFE487;
+  --app-secondary-background:#F2F2EA;
+  --app-tertiary:#6236FF;
+  --app-tertiary-light:#E0E1FD;
+
+  --joyful-light-yellow:#F9FFBE; // take it out
+  --joyful-light-blue:#DAECFF; // take it out
+
+  --app-white:#FFFFFF;
+  --app-black:#000000; // remove
+  --app-dark-gray:#222222;
+  --app-gray:#333333;
+  --app-medium-gray:#666666;
+  --app-light-gray:#999999;
+  --app-lighter-gray:#cccccc;
+
+  --app-brown:#4F2C0D;
+  --app-green:#008840;
+  --app-light-green:#BFE1CF; // take it out
+
+  --app-shadow:rgba(0,0,0,0.1);
+  --button-style-shadow: 5px 5px 2px 0 var(--app-shadow);
+  --block-style-shadow: 0 2px 7px 0 var(--app-shadow);
+
+  ion-toolbar {
+    --background: var(--app-primary-header);
+    border-bottom-left-radius: 20px;
+    ion-buttons{
+      ion-button{
+        --background: var(--app-primary-header) !important;
+        --color: var(--app-primary) !important;
+        box-shadow: none !important;
+      }
+    }
+  }
+
+  ion-footer {
+    background: var(--app-primary-background) !important;
+  }
+
+  ion-button{
+    --background: var(--app-primary) !important;
+    --color: var(--app-white) !important;
+    --border-radius: 20px !important;
+    --border-color: var(--app-primary) !important;
+    button{
+      box-shadow: var(--button-style-shadow) !important;
+    }
+  }
+
+  ion-button.button-clear{
+    --background: transparent !important;
+    --color: var(--app-primary) !important;
+  }
+
+  button{
+    border-radius: 20px !important;
+    color: var(--app-white) !important;
+    // background-color: var(--app-primary) !important;
+  }
+
+  input, textarea, ion-input, ion-textarea {
+    border-radius: 16px !important;
+  }
+
+  ion-list{
+    background: var(--app-primary-background) !important;
+  }
+
+  ion-item {
+    --background: var(--app-primary-background);
+    ion-label{
+      color: var(--app-light-gray) !important;
+      font-weight: bold !important;
+    }
+    ion-select{
+      border: none !important;
+      border-bottom: 1px solid var(--app-light-gray) !important;
+      color: var(--app-gray) !important;
+      padding-left: 0 !important;
+      .select-text{
+        color: var(--app-white) !important;
+        --color: var(--app-white) !important;
+      }
+    }
+  }
+
+  ion-radio {
+    --color-checked: var(--app-primary) !important;
+  }
+
+  ion-card, button{
+    box-shadow: var(--button-style-shadow) !important;
+  }
+
+  ion-back-button{
+    box-shadow: none !important;
+    button{
+      box-shadow: none !important;
+    }
+  }
+
+  ion-alert{ // EXCEPTION
+    [aria-checked=true].sc-ion-alert-md .alert-checkbox-icon.sc-ion-alert-md{
+      border-color: var(--app-primary) !important;
+      background-color: var(--app-primary) !important;
+    }
+
+    [aria-checked=true].sc-ion-alert-md .alert-radio-icon.sc-ion-alert-md{
+      border-color: var(--app-primary) !important;
+      .alert-radio-inner.sc-ion-alert-md{
+        background-color: var(--app-primary) !important;
+      }
+    }
+    button {
+      background-color: var(--app-primary) !important;
+      color: var(--app-white) !important;
+    }
+  }
+
+  ion-card{
+    border-radius: 16px !important;
+    box-shadow: var(--button-style-shadow) !important;
+    background-color: var(--app-white);
+    &.selected {
+      border:3px solid var(--app-primary) !important;
+    }
+  }
+
+  ion-title{
+    color: var(--app-primary) !important;
+  }
+
+  // SelectBox popup multi select styles
+  .select-box.select-alert, .ftue-changes.select-alert {
+    .alert-button {
+      border-color: var(--app-primary) !important;
+      border-radius: 20px !important;
+    }
+    .alert-button:first-child:not(:only-child) {
+      background: transparent !important;
+      color: var(--app-primary) !important;
+    }
+    .alert-button:last-child:not(:only-child) {
+      background: var(--app-primary) !important;
+      color: var(--app-white) !important;
+    }
+    .alert-wrapper{
+      background-color: var(--app-secondary-background);
+      border-radius: 1rem 1rem 0 0;
+    }
+    .alert-tappable {
+      box-shadow: none !important;
+      background-color: transparent !important;
+    }
+  }
+
+  // Courses Filter
+  .resource-filter{
+    .popover-content{
+      border-radius: 16px 16px 0 0;
+      background-color: var(--app-secondary-background) !important;
+    }
+  }
+
+  // SB- button styles
+  .sb-btn {
+    border-radius: 20px !important;
+    background-color: var(--app-primary) !important;
+    color: var(--app-white) !important;
+  }
+
+  .sb-btn-primary-outline{
+    color: var(--app-primary) !important;
+    background-color: var(--app-white) !important;
+  }
+
+  .sb-btn-outline-secondary{  
+    background-color: var(--app-white) !important;
+    color: var(--app-primary) !important;
+  }
+
+  .sb--card{
+    box-shadow: var(--block-style-shadow) !important;
+  }
+
+  .sb--card__title{
+    color: var(--app-gray) !important;
+  }
+
+  .sb--card__img{
+    border-radius: 0.5rem;
+  }
+
+  // .sb--card--course{
+  //   margin: 0 0 1rem 0 !important;
+  // }
+
+  sb-course-cards-hlist, sb-library-cards-stack{
+    .title{
+      color: var(--app-gray) !important;
+    }
+  }
+
+  sb-course-cards-hlist{
+    .sb-btn-outline-secondary{
+      border: none !important;
+    }
+    .sb--card--container{
+      margin: 0 1rem 0 0 !important;
+    }
+  }
+
+  sb-library-cards-stack{
+    .header{
+      .title{
+        padding-left: 1rem;
+        font-weight: bold !important;
+      }
+      i{
+        display: none;
+      }
+    }
+    .body{
+      box-shadow: none !important;
+    }
+    .sbbtn{
+      border-radius: 3rem !important;
+      background-color: transparent !important;
+      color: var(--app-primary) !important;
+      border: 1px solid var(--app-primary-light-2) !important;
+      margin: 2%;
+      margin-bottom: 0;
+      width: 96% !important;
+      padding: 0.75rem !important;
+      box-shadow: none !important;
+    }
+  }
+
+  // sb-group-card
+  sb-group-card{
+    .sb-label-badge{
+      border-radius: 16px !important;
+      box-shadow: var(--button-style-shadow) !important;
+    }
+  }
+
+  sb-member-card{
+    .sb-members-list-item{
+      .status{
+        border-radius: 16px !important;
+        box-shadow: var(--button-style-shadow);
+      }
+    }
+    .sb-member__img{
+      box-shadow: var(--button-style-shadow) !important;
+    }
+  }
+
+  // application-header Component
+  app-application-header{
+    .sb-menu-list{
+      background-color: var(--app-white) !important;
+      border-radius: 16px 16px 0 0;
+    }
+    .sb-menu-item{
+      color: var(--app-primary);
+    }
+    .sb-menu-item-language{
+      color: var(--app-gray) !important;
+    }
+    ion-content{
+      --background: var(--app-white) !important;
+    }
+    ion-item{
+      --background: var(--app-white) !important;
+    }
+    .menu-section{
+      background-color: var(--app-primary-background) !important;
+      .menu-container{
+        --background: var(--app-primary-background) !important;
+        background-color: var(--app-primary-background) !important;
+        padding-bottom: 8px;
+        .user-container{
+          background-color: var(--app-primary-background) !important;
+        }
+        .another-user-title{
+          border-radius: 20px;
+          margin: 0 8px;
+          box-shadow: var(--button-style-shadow) !important;
+        }
+      }
+    }
+    .side-menu-footer{
+      border-radius: 16px 16px 0 0;
+    }
+
+  }
+
+  // language-settings page
+  page-language-settings{
+      .language-card {
+        &.selected {
+          .language-selection {
+            background-color: var(--app-primary) !important;
+          }
+          .label-text {
+            color: var(--app-white) !important;
+          }
+        }
+      }
+  }
+
+  // user-type-selection page
+  app-profile-settings{
+    .title{
+      color: var(--app-primary) !important;
+    }
+
+    .qr-btn{
+      background-color: var(--app-primary) !important;
+    }
+
+    .board-btn-text{
+      color: var(--app-primary) !important;
+    }
+
+    .ps-container {
+      .qr-container {
+        background-color: var(--app-primary-background) !important;
+      }
+    }
+
+    .board-select-dummy{
+      padding: 16px;
+      // ion-item{
+      //   --background: var(--app-white) !important;
+      // }
+      // ion-select{
+      //   border: 1px solid var(--app-primary) !important;
+      //   border-radius: 20px !important;
+      //   background-color: var(--app-primary) !important;
+      //   .select-text, .select-placeholder{
+      //     --color: var(--app-white) !important;
+      //     color: var(--app-white) !important;
+      //   }
+      // }
+
+      // ion-select::part(placeholder) { 
+      //   --color: red !important;
+      //   color: red !important;
+      //   opacity: 1;
+      // }
+      ion-item{
+        display: none !important;
+      }
+      .ps-board{
+        display: block !important;
+        .ps-board-label{
+          color: var(--app-primary);
+          padding: 0.5rem;
+        }
+      }
+    }
+  }
+
+  // District mapping
+  app-district-mapping{
+    .heading{
+      color: var(--app-primary) !important;
+    }
+
+    .block-button{
+      background-color: var(--app-primary) !important;
+      border-radius: 20px !important;
+    }
+
+    ion-item{
+      --border-width: 0 !important;
+    }
+
+    form{
+      padding-inline-start: 0 !important;
+      padding-inline-end: 0 !important;
+    }
+
+    .name{
+      .name-feild{
+        background-color: transparent;
+        border-radius: 0 !important;
+        padding-left: 0 !important;
+      }
+      .label{
+        padding-left: 0 !important;
+        color: var(--app-light-gray);
+        font-weight: bold;
+      }
+    }
+  }
+
+  // Resourses page
+  app-resources{
+    sb-library-filters{
+      .sb-pills-container{
+        background: transparent !important;
+      }
+
+      .sb-medium-pills-container, .sb-grade-pills-container {
+        .pill{
+          border-color: var(--app-white) !important;
+          color: var(--app-gray) !important;
+          box-shadow: var(--button-style-shadow) !important;
+          margin-right: 1rem !important;
+        }
+        .pill.active{
+          color: var(--app-white) !important;
+          background-color: var(--app-primary) !important;
+          border-color: var(--app-primary) !important;
+        }
+      }
+
+      .sb-medium-pills-container {
+        .pill{
+          border-radius: 4px !important;
+        }
+      }
+    }
+
+    .sb-textbook-container{
+      margin-bottom: 20px !important;
+    }
+
+    .sb-recenlty-viewed-title{
+      .sb-btn{
+        background-color: var(--app-white) !important;
+        color: var(--app-primary) !important;
+        border-color: var(--app-white) !important;
+      }
+    }
+  }
+
+  // Courses page
+  app-courses{
+    .course-grid-bg{
+      background-color: var(--app-secondary-background) !important;
+    }
+    .enrolled-course-bg{
+      background: transparent !important;
+      sb-course-cards-hlist > .layout-course > .header > .title{
+        color: var(--app-gray) !important;
+      }
+    }
+  }
+
+  // View-more-activity page
+  app-view-more-activity{
+    .view-more-course-bg{
+      // background: var(--app-primary-background) !important;
+      background: transparent !important;
+    }
+
+    .title, .count-text{
+      color: var(--app-gray) !important;
+    }
+  }
+
+  // Sign-in-card page
+  app-sign-in-card{
+    .sign-in-card-title{
+      color: var(--app-gray) !important;
+    }
+    .sign-in-block{
+      box-shadow: 0 20px 40px -10px #D8D8D8 !important;
+      border-radius: 12px !important;
+    }
+
+    ion-card{
+      text-align: center;
+    }
+    .sign-in-card-text{
+      font-weight: normal !important;
+    }
+  }
+
+  // enrolled-course-details page
+  app-enrolled-course-details-page{
+    .enrolled-course-card-button{
+      background-color: var(--app-primary) !important;
+      border-radius: 50px !important;
+    }
+    .view-credits{
+      strong{
+        color: var(--app-dark-gray) !important;
+      }
+    }
+    .sb-dt-card-actions{
+      .card-button{
+        box-shadow: none !important;
+      }
+      .sb-course-progress-container{
+        background-color: var(--joyful-light-yellow) !important;
+        border-radius: 1rem;
+      }
+    }
+    .enrolled-course-container{
+      ion-card{
+        background-color: var(--joyful-light-blue) !important;
+      }
+    }
+    .certificate-container{
+      border-radius: 0.5rem;
+      padding: 0.5rem;
+    }
+    .sb-course-complete-container, .sb-batch-end-container{
+      border-radius: 1rem;
+    }
+  }
+
+  // guest-profile page
+  app-guest-profile{
+    .profile-info{
+      background-color: transparent;
+      border-radius: 0 0 0 16px;
+      margin-top: 55px !important;
+    }
+    .details-container{
+      margin: 8px;
+      background-color: var(--app-white);
+      border-radius: 16px;
+    }
+    .signin-card-bg{
+      background-color: transparent !important;
+    }
+  }
+
+  // profile-page
+  app-profile{
+    .basic-profile-details{
+      background-color: transparent;
+      margin-top: 55px;
+      .profile-avatar{
+        background-color: var(--app-white);
+      }  
+    }
+    .roles-container{
+      .roles{
+        margin-bottom: 4px !important;
+        color: var(--app-primary) !important;
+        border: 1px solid var(--app-primary) !important;
+        box-shadow: var(--button-style-shadow) !important;
+      }
+    }
+    .self-declare-btn{
+      margin: 8px !important;
+      padding: 8px;
+      background-color: var(--app-light-green);
+      border-radius: 16px;
+      ion-button{
+        --background: var(--app-green) !important;
+      }
+    }
+    .contacts{
+      margin: 8px;
+      background-color: var(--app-white) !important;
+      border-radius: 16px;
+      .email ,.phone{
+        border: 1px solid var(--app-primary) !important;
+        box-shadow: var(--button-style-shadow) !important;
+        .icon{
+          color: var(--app-primary);
+        }
+        .value{
+          color: var(--app-gray);
+        }
+      }
+      .email.light ,.phone.light{
+        .icon{
+          color: var(--app-light-gray);
+        }
+        .value{
+          color: var(--app-light-gray);
+        }
+      }
+    }
+    .school-details{
+      margin: 8px;
+      border-radius: 16px;
+      background-color: var(--app-white) !important;
+    }
+    .self-declare-teacher-details{
+      margin: 8px;
+      border-radius: 16px;
+      background-color: var(--app-white) !important;
+      color: var(--app-gray) !important;
+      ion-button{
+        --color: var(--app-white) !important;
+        --background: var(--app-primary) !important;
+        border-radius: 1rem;
+        box-shadow: var(--button-style-shadow) !important;
+      }
+    }
+
+    .bottom-block{
+      margin: 0.5rem;
+      border-radius: 1rem;
+      padding-bottom: 0.5rem;
+      .trainings{
+        .heading{
+          border-radius: 1rem;
+        }
+        .content{
+          border-radius: 1rem !important;
+          .heading{
+            border-radius: 1rem 1rem 0 0 !important;
+          }
+        }
+      }
+    }
+  }
+
+  // collection-details-etb page
+  app-collection-detail-etb{
+    .sb-dt-card{
+      margin: 0 0 8px;
+      background-color: var(--app-white);
+      border-radius: 16px;
+      box-shadow: var(--button-style-shadow) !important;
+      .sb-btn-tile{
+        box-shadow: none !important;
+      }
+      .img-container{
+        border-radius: 8px !important;
+      }
+    }
+
+    .collection-etb-filter{
+      .sb-chapter-dd {
+        border-radius: 16px;
+        margin-bottom: 8px;
+        box-shadow: var(--button-style-shadow) !important;
+      }
+      .sb-slider-pills-container {
+        border-radius: 1.5rem;
+        // overflow: hidden !important;
+        margin-bottom: 8px;
+        background: var(--app-secondary-background) !important;
+        .sb-pills-container{
+          .pill{
+            box-shadow: var(--button-style-shadow) !important;
+            color: var(--app-dark-gray) !important;
+            .img-align{
+              margin-top: 0 !important;
+            }
+          }
+          .pill.active{
+            color: var(--app-white) !important;
+          }
+        }
+      }
+      .sticky-header-title-box {
+        --background: var(--app-secondary-background) !important;
+      }
+    }
+
+    .textbook-accordian{
+      background-color: transparent;
+      sb-accordion-header{
+        .sbaccordion__panel-header{
+          background-color: var(--app-secondary-background) !important;
+          box-shadow: var(--block-style-shadow) !important;
+        }
+      }
+      .accordion-item-header-expanded{
+        .sbaccordion__panel-header{
+          border-radius: 1.5rem 1.5rem 0 0 !important;
+        }
+      }
+      .accordion-item-header-collapsed{
+        .sbaccordion__panel-header{
+          border-radius: 1.5rem !important;
+        }
+      }
+      sb-accordion-body{
+        .sbaccordion__panel-content{
+          background-color: var(--app-secondary-background) !important;
+          border-radius: 0 0 1rem 1rem;
+        }
+      }
+      sb-toc-card{
+        .sbchapter__item{
+          border-radius: 1rem;
+          border-color: var(--app-white);
+          box-shadow: var(--block-style-shadow);
+          .d-inline-flex{
+            align-items: center;
+          }
+        }
+        .sbchapter__img{
+          border-radius: 0.5rem;
+          overflow: auto;
+        }
+      }
+      sb-accordion-item{
+        .sbaccordion{
+          box-shadow: none !important;
+        }
+      }
+      .sbchapter__play__btn{
+        color: var(--app-primary) !important;
+        margin-left: auto;
+      }
+    }
+
+    .credit-label-padding{
+      background-color: var(--app-secondary-background) !important;
+    }
+
+    .drop-arrow{
+      box-shadow: var(--button-style-shadow);
+    }
+    .sb-topic-text{
+      color: var(--app-brown) !important;
+    }
+    .sb-chapter-dd{
+      margin-top: 0.5rem;
+    }
+  }
+  // app-collection-child component
+  app-collection-child{
+    .etb-card-item-play-container{
+      ion-button{
+        --background: var(--app-white) !important;
+        height: 2.5rem;
+      }
+    }
+    .sticky-header-title-box{
+      .sb-ftue-design{
+        margin-bottom: 0.5rem !important;
+      }
+    }
+    .etb-card-item{
+      padding: 0 0 0 0.5rem !important;
+      border-radius: 2rem;
+      border-color: var(--app-secondary-background);
+      .image-position{
+        .content-icon{
+          border-radius: 0.5rem;
+        }
+      }
+    }
+  }
+
+  // header
+  ion-header::after{
+    background-image: none;
+  }
+  .ui-container {
+    &::part(scroll) {
+      z-index: auto;
+    }
+    &::after {
+      content: '';
+      width: 100%;
+      height: 172px;
+      display: block;
+      position: absolute;
+      z-index: 0;
+      top: 0;
+      border-bottom-left-radius: 20px;
+      background-color: var(--app-primary-header) !important;
+      background-image: url(/assets/imgs/header-background.svg);
+      background-repeat: no-repeat;
+      background-position: bottom center;
+    }
+  }
+  .backgrond-div::after{
+    top: -56px;
+  }
+  .ui-content{
+    z-index: 2;
+    position: relative;
+  }
+
+  .ps-container{
+    .back-btn-container {
+      z-index: 2;
+      &::after{
+        content: '';
+        background-color: var(--app-primary-header) !important;
+        width: 100vw;
+        height: 50px;
+        position: absolute;
+        z-index: -1;
+        border-bottom-left-radius: 20px;
+      }
+    }
+  }
+  .dm-header{
+    background-color: var(--app-primary-header);
+    border-bottom-left-radius: 20px;
+  }
+  .qr-content {
+    z-index: 2;
+  }
+
+  .sb-slider-pills-container{
+    .sb-grade-pills-container {
+      background: transparent !important;
+    }
+    .sb-medium-pills-container{
+      background: transparent !important;
+    }
+  }
+
+  // textbook-view-more component
+  app-textbook-view-more{
+    .sb-card-container{
+      box-shadow: none !important;
+    }
+  }
+
+  // page-fileter component
+  app-page-filter {
+    .filter-item {
+      border: 0.5px solid var(--app-light-gray);
+      border-radius: 30px;
+      color: var(--app-gray) !important;
+      font-weight: normal !important;
+    }
+  }
+
+  sb-toc-curriculum{
+    .sb-curiculum__border{
+      border-radius: 12px;
+      box-shadow: var(--button-style-shadow);
+    }
+    .sb-curiculum{
+      border: none !important;
+      border-radius: 12px !important;
+      .title{
+        color: var(--app-primary) !important;
+        font-weight: bold;
+      }
+      .sb-curiculum__chapter{
+        padding-top: 0.5rem !important;
+      }
+    }
+
+    sb-accordion-item{
+      .sbaccordion{
+        border-radius: 1rem !important;
+        overflow: hidden;
+        box-shadow: var(--block-style-shadow) !important;
+        .sbaccordion__panel{
+          margin-bottom: 0 !important;
+        }
+      }
+      .sbaccordion__panel-content{
+        background-color: var(--app-secondary-background) !important;
+        border-color: transparent !important;
+      }
+      .sbaccordion__panel-header{
+        border-color: transparent !important;
+      }
+    }
+    .sb-content__bar{
+      border-radius: 1rem;
+    }
+    .sbchapter__item{
+      border-radius: 1rem;
+      border-color: transparent !important;
+      background: var(--app-white) !important;
+      box-shadow: var(--button-style-shadow);
+    }
+
+    .disabled-toc-card {
+      background: var(--app-light-gray) !important;
+      border-color: var(--app-light-gray) !important;
+    }
+  }
+
+  // common-forms component
+  sb-form{
+    sb-multiple-dropdown{
+      .multi-select-section{
+        .placeholder{
+          color: var(--app-light-gray) !important;
+          margin-left: 0 !important;
+          font-size: 16px !important;
+        }
+      }
+      .multi-select-container{
+        sb-caret-down, sb-caret-up{
+          right: 0 !important;
+        }
+        ul{
+          padding-left: 0 !important;
+          margin-left: 0 !important;
+          span{
+            font-size: 16px !important;
+          }
+        }
+        .list-border{
+          position: relative;
+          padding: 0 !important;
+          border: none !important;
+          border-bottom: 0.5px solid var(--app-gray) !important;
+        }
+      }
+
+      .sb-modal{
+        background-color: var(--app-secondary-background) !important;
+        border-radius: 16px 16px 0 0;
+        .sb-form-button{
+          button{
+            border: 1px solid var(--app-primary) !important;
+            border-radius: 20px !important;
+          }
+          .sb-btn-primary-outline{
+            color: var(--app-primary) !important;
+            background-color: var(--app-white) !important;
+          }
+          .sb-btn-primary{
+            color: var(--app-white) !important;
+            background-color: var(--app-primary) !important;
+          }
+        }
+
+      }
+    }
+
+    sb-textbox {
+      .sb-input {
+        input {
+          background-color: transparent;
+          border: none !important;
+          border-bottom: 0.5px solid var(--app-gray) !important;
+          padding: 8px 16px 4px 0 !important;
+          border-radius: 0 !important;
+        }
+        input:focus{
+          outline: none !important;
+          border-bottom: 0.5px solid var(--app-green) !important;
+        }
+        input:blur{
+          outline: none !important;
+          border-bottom: 0.5px solid var(--app-gray) !important;
+        }
+        input::placeholder {
+          color: var(--app-light-gray);
+          margin-left: 0 !important;
+          font-size: 16px !important;
+          font-weight: normal !important;
+        }
+        input{
+          font-size: 16px !important;
+        }
+        .async-text{
+          border: none !important;
+          border-bottom: 0.5px solid var(--app-gray) !important;
+          input {
+            border: none !important;
+            padding-left: 0 !important;
+          }
+        }
+      }
+    }
+
+    sb-textarea{
+      textarea{
+        border-radius: 16px !important;
+      }
+      textarea::placeholder {
+        color: var(--app-light-gray);
+        font-size: 16px !important;
+        font-weight: normal !important;
+      }
+    }
+  }
+
+  // permission page
+  app-permission{
+    .permission-container{
+      margin-right: 16px;
+    }
+  }
+
+  // faq-help page
+  app-faq-help{
+    .info-msg{
+      background-color: transparent !important;
+    }
+    .panel{
+      .btn, .yesBtn{
+        border-radius: 16px !important;
+      }
+      .btn{
+        color: var(--app-primary) !important;
+      }
+      .yesBtn{
+        color: var(--app-green) !important;
+      }
+      
+      .panel-collapse{
+        background-color: var(--app-secondary-background) !important;
+        border-radius: 0 0 16px 16px;
+        margin: 0 8px 8px;
+        box-shadow: var(--button-style-shadow);
+      }
+    }
+    .send-email{
+      background-color: transparent !important;
+      .report-button{
+        border-radius: 20px !important;
+        box-shadow: var(--button-style-shadow) !important;
+        background-color: var(--app-white) !important;
+        color: var(--app-primary) !important;
+        border: none !important;
+        min-width: 60vw !important;
+      }
+    }
+  }
+
+  app-user-home, app-search, app-category-list-page, app-faq-help, app-faq-report-issue {
+    ion-content:first-child {
+      --offset-top: calc(-36px) !important;
+
+      .container-focus {
+        padding-top: 20px;
+      }
+    }
+  }
+
+  // faq-report-issue page
+  app-faq-report-issue{
+    .initiate-email-info-button{
+      background-color: var(--app-white) !important;
+      .submit-button{
+        border-radius: 20px !important;
+        background-color: var(--app-primary) !important;
+        box-shadow: var(--button-style-shadow) !important;
+      }
+      .invalid-btn{
+        opacity: 0.7;
+      }
+    }
+  }
+
+  // my-groups page
+  app-my-groups{
+    .my-cr-bg {
+      background: transparent !important;
+    }
+    .my-cr-title {
+      color: var(--app-primary) !important;
+    }
+    .my-cr-card{
+      border-radius: 16px;
+      background-color: var(--app-secondary-background);
+      box-shadow: var(--block-style-shadow) !important;
+    }
+  }
+
+  // my-groups-popover component
+  app-my-groups-popover{
+    .mg-popup-btn{
+      border-radius: 30px !important;
+    }
+  }
+
+  .tutorial-popover, .download-popover, .leave-training-popup, .cd-leave-training-popup {
+    .popover-content{
+      border-radius: 1rem !important;
+    }
+  }
+
+  .add-to-group-btn-container{
+    .open-btn {
+      color: var(--app-primary) !important;
+    }
+  }
+
+  // Group edit delete popup
+  .group-option-popover .popover-content{
+    border-radius: 1rem !important;
+    background-color: var(--app-primary-background) !important;
+  }
+
+  .enrollement-popover.popover-content{
+    border-radius: 1rem 1rem 0 0 !important;
+  }
+
+  app-group-details{
+    .gd-header{
+      padding: 0 8px 8px;
+      border-radius: 16px;
+      background-color: var(--app-secondary-background) !important;
+      .gd-tab-header{
+        background-color: var(--app-white) !important;
+        border-radius: 24px;
+        .gd-tab:first-child{
+          border-radius: 24px 0 0 24px;
+        }
+        .gd-tab:last-child{
+          border-radius: 0 24px 24px 0;
+        }
+      }
+    }
+
+    .gd-tab-member-container{
+      border-radius: 16px;
+      background-color: var(--app-secondary-background) !important;
+    }
+  }
+
+  app-add-member-to-group{
+    .sb-btn-large.inactive{
+      background-color: var(--app-light-gray) !important;
+    }
+  }
+
+  app-activity-details{
+    .ad-member-container{
+      border-radius: 16px;
+      background-color: var(--app-secondary-background);
+      .activity-toc{
+        border-radius: 16px 16px 0 0;
+        background-color: var(--app-primary) !important;
+      }
+    }
+  }
+
+  add-activity-to-group{
+    .add-activity-container{
+      margin: 0 8px;
+      padding: 16px 0 8px;
+      border-radius: 16px;
+      background-color: var(--app-secondary-background);
+      box-shadow: var(--block-style-shadow) !important;
+    }
+  }
+
+  .sb-popover{
+    .popover-content{
+      border-radius: 16px 16px 0 0;
+      box-shadow: var(--button-style-shadow);
+    }
+
+    ion-content{
+      --background: var(--app-secondary-background) !important;
+    }
+
+    ion-header{
+      ion-toolbar{
+        --background: var(--app-secondary-background) !important;
+        min-height: 60px !important;
+        max-height: 60px !important;
+      }
+    }
+
+    .sb-popover-title{
+      color: var(--app-dark-gray) !important;
+      padding: 0 16px !important;
+      font-size: 20px !important;
+      text-align: unset !important;
+      margin-top: 28px !important;
+      ion-icon{
+        height: 30px !important;
+        width: 60px !important;
+        top: -20px !important;
+      }
+    }
+
+    .sb-popover-footer{
+      background: var(--app-secondary-background) !important;
+      align-items: normal !important;
+      justify-content: flex-end !important;
+
+      .sb-btn-outline-info{
+        background-color: var(--app-white) !important;
+        color: var(--app-primary) !important;
+      }
+
+      .sb-popover-action-btn{
+        height: 40px !important;
+      }
+    }
+  }
+
+  app-manage-user-profiles{
+    .manage-user-section{
+      background-color: var(--app-secondary-background);
+      border-radius: 16px;
+      padding: 16px 8px;
+      box-shadow: var(--block-style-shadow);
+    }
+    .manage-user-item{
+      margin-bottom: 8px;
+    }
+    .mu-selected-user{
+      border-radius: 16px;
+    }
+    
+    sb-member-card{
+      .sb-members-list-item{
+        border-radius: 16px;
+        background-color: var(--app-primary-background);
+        box-shadow: var(--button-style-shadow);
+      }
+    }
+
+    .add-user{
+      .button-outline{
+        --border-color: transparent !important;
+      }
+    }
+  }
+
+  app-explore-books{
+    form{
+      .search-bar{
+        border-radius: 1rem !important;
+        button{
+          box-shadow: none !important;
+        }
+      }
+    }
+    .sb-slider-pills-container{
+      .pill{
+        box-shadow: var(--button-style-shadow);
+      }
+    }
+    .sb-medium-pills-container{
+      .pill{
+        border: none !important;
+        color: var(--app-primary) !important;
+      }
+      .pill.active{
+        background-color: var(--app-primary) !important;
+        color: var(--app-white) !important;
+      }
+    }
+    .explore-results-section{
+      margin: 1rem;
+      border-radius: 1rem;
+    }
+
+    ion-button{
+      border-radius: 1rem 1rem 0 0 !important;
+    }
+  }
+
+  app-create-edit-group{
+    ion-input, ion-textarea{
+      background-color: var(--app-white);
+    }
+  }
+
+  app-enrollment-details{
+    ion-item-group{
+      .subtitle{
+        background-color: var(--app-primary-background) !important;
+      }
+      .subtitle.buttontext{
+        --background: var(--app-white) !important;
+        color: var(--app-primary) !important;
+        box-shadow: var(--button-style-shadow);
+        border-radius: 1rem !important;
+      }
+    }
+  }
+
+  app-content-details{
+    .sb-detail-card-info{
+      button{
+        box-shadow: none !important;
+      }
+    }
+  }
+
+  app-course-batches{
+    ion-content{
+      --padding-start: 0 !important;
+      --padding-end: 0 !important;
+    }
+
+    .background-gray{
+      background: var(--app-primary-background) !important;
+    }
+
+    .batch-list{
+      margin: 0.5rem !important;
+      .flex-card-container{
+        background-color: var(--app-white);
+        border-radius: 1rem;
+        box-shadow: var(--block-style-shadow);
+      }
+    }
+  }
+
+  app-content-details{
+    .sb-dt-card{
+      border-radius: 0 0 1rem 1rem;
+      background-color: var(--app-white);
+      box-shadow: var(--button-style-shadow);
+    }
+    ion-card{
+      border-radius: 0 !important;
+      box-shadow: none !important;
+      background-color: transparent;
+    }
+  }
+
+  app-download-manager{
+    .sb-view-all-items{
+      border-radius: 0 0 1rem 1rem;
+    }
+
+    .sb-card-download-container{
+      border-radius: 1rem;
+      overflow: hidden;
+      .img-container{
+        border-radius: 0.5rem;
+      }
+      .check-container{
+        background-color: var(--app-secondary-background);
+      }
+    }
+  }
+
+  app-sb-share-popup{
+    ion-list{
+      background: var(--app-secondary-background) !important;
+    }
+    ion-item{
+      --background: var(--app-secondary-background) !important;
+    }
+  }
+
+  textbook-toc{
+    ion-card{
+      background-color: var(--app-secondary-background) !important;
+      margin: 8px !important;
+      width: auto !important;
+      box-shadow: var(--block-style-shadow);
+    }
+  }
+
+  app-rating-alert{
+    .sb-popover-items{
+      background-color: var(--app-secondary-background) !important;
+    }
+    .app-rate-btn{
+      background-color: transparent !important;
+      --box-shadow: var(--button-style-shadow) !important;
+    }
+    .app-rate-btn-outline{
+      --background: var(--app-white) !important;
+      --box-shadow: var(--button-style-shadow) !important;
+    }
+  }
+
+  app-content-rating-alert{
+    .popover-ratings{
+      padding: 0 1rem !important;
+    }
+  }
+
+  app-chapter-details{
+    .cd-header-container{
+      border-radius: 1rem;
+      background-color: var(--app-white);
+      padding: 0 !important;
+      .cd-title-container{
+        padding: 16px 16px 0 !important;
+      }
+      .new-div{
+        padding-left: 16px;
+        padding-right: 16px;
+        .enrolled-course-card-button{
+          border-radius: 2rem !important;
+          background-color: var(--app-primary) !important;
+        }
+      }
+      ion-card-content{
+        margin: 0 16px;
+        .sb-course-complete-container{
+          border-radius: 16px;
+        }
+        .sb-course-progress-container{
+          background-color: var(--joyful-light-yellow) !important;
+          border-radius: 1rem;
+        }
+      }
+      .cd-flex-container{
+        padding: 16px;
+        background-color: var(--joyful-light-blue);
+        border-radius: 1rem;
+        .cd-chapter-card-button{
+          border-radius: 2rem !important;
+          background-color: var(--app-primary) !important;
+        }
+      }
+    }
+  }
+
+  app-consent-pii-popup{
+    .consent-popover-info{
+      background: var(--app-secondary-background) !important;
+    }
+    .sb-popover-toolbar{
+      margin-left: -3px !important;
+    }
+    .save-changes-not-agree{
+      color: var(--app-primary) !important;
+    }
+    .btn-info{
+      text-align: right !important;
+      button{
+        padding: 11px 16px;
+        border: none !important;
+      }
+    }
+  }
+  
+  app-toast-navigation{
+    div{
+      color: var(--app-gray);
+    }
+  }
+
+  app-sb-progress-loader{
+    ion-content{
+      --background: var(--app-primary-header) !important;
+    }
+    ion-progress-bar{
+      --ion-color-base: var(--app-primary) !important;
+    }
+  }
+
+  .player-exit-popup{
+    .alert-wrapper{
+      background-color: var(--app-secondary-background);
+      border-radius: 1rem;
+    }
+    .alert-button {
+      border: 1px solid var(--app-primary) !important;
+      border-radius: 2rem !important;
+    }
+    .alert-button:first-child:not(:only-child) {
+      background: var(--app-primary) !important;
+      color: var(--app-white) !important;
+    }
+    .alert-button:last-child:not(:only-child) {
+      background: var(--app-white) !important;
+      color: var(--app-primary) !important;
+    }
+  }
+
+  app-qrcoderesult{
+    .download-info{
+      color:map-get($colors, dark_blue) !important;
+    }
+    .btn-space{
+      padding-right: 5px !important;
+    }
+    button{
+      box-shadow: none !important;
+    }
+    ion-card{
+      padding: 7px !important;
+    }
+  }
+
+  app-sb-download-popup{
+    .sb-modal-close{
+      color: var(--app-primary) !important;
+    }
+    .progress-highlight{
+      background: var(--app-white) !important;
+    }
+    .popover-progress-container{
+      background-color: var(--app-primary) !important;
+    }
+    .collapsed {
+      .sb-popover-title{
+        margin-top: 0 !important;
+      }
+    }
+  }
+
+  app-notification{
+    .sb-view-all-container{
+      .sb-view-all-items{
+        background: var(--app-secondary-background) !important;
+        border-radius: 20px !important;
+        width: 94% !important;
+        height: 55px !important;
+        left: 3% !important;
+        padding: 10px !important;
+        margin-bottom: 10px !important;
+        top: 8px !important;
+        .sb-view-all-title{
+          color: unset !important;
+          margin-left: 8px !important;
+        }
+      }
+    }
+    ion-item{
+      --background: var(--app-white) !important;
+      margin-left: 0.5rem;
+      margin-right: 0.5rem;
+      border-radius: 0.5rem !important;
+    }
+    ion-item-sliding{
+      box-shadow: var(--block-style-shadow) !important;
+    }
+    .oval-wrapper{
+      h4{
+        color: unset !important;
+      }
+    }
+  }
+
+  .file-download__action-btns .cancel-btn{
+   padding: 0.73em 2.5em !important;
+  }
+
+  ion-picker {
+      button{
+        color: var(--app-primary) !important;
+        background-color:transparent !important;
+        box-shadow: none !important;
+      }
+  }
+  .action-sheet-container{
+    button{
+      color: var(--app-primary) !important;
+      background-color:transparent !important;
+      box-shadow: none !important;
+    }
+  }
+
+  app-district-mapping{
+    .block-button-clear {
+      color: $blue !important;
+    }
+  }
+
+  // DiscussionForum
+
+  .discussion-forum {
+    .reply-btn {
+      background-color: var(--app-lighter-gray);
+    }
+    .df-reply-btn, .df-cancel-btn{
+      color:  map-get($colors, primary) !important;
+    }
+    .discussion-start-modal{
+      .discard-btn{
+        color: map-get($colors, primary) !important;
+      }
+    }
+    .openbtn{
+      color: map-get($colors, primary) !important;
+    }
+    .sb-btn-disabled{
+      background-color: map-get($colors, gray_ba) !important;
+    }
+    .sb-btn-outline-primary{
+      background: none !important;
+      border: 1px solid map-get($colors, gray_ba) !important;
+      color: map-get($colors, black) !important;
+    }
+  }
+  .df-btn-container{
+    .sb-left-icon{
+      color: map-get($colors, primary) !important;
+      background-color: map-get($colors, light_gray) !important;
+    }
+    .df-btn-close{
+      color: map-get($colors, black) !important;
+      background: var(--app-pink) !important;
+      padding: 0.5rem 1rem !important;
+    }
+  }
+  
+
+  app-search-filter{
+    sb-form{
+      sb-multiple-dropdown{
+        .input-label{
+          margin-bottom: 0.5rem;
+          font-weight: bold;
+        }
+        .multi-select-container{
+          border: 1px solid var(--app-primary-light-2);
+          border-radius: 3rem;
+          sb-caret-down{
+            right: 1rem !important;
+          }
+          ul{
+            padding-left: 1rem !important;
+          }
+          .list-border{
+            border: none !important;
+          }
+        }
+      }
+    }
+  }
+
+  app-category-list-page{
+    .filter-items{
+      --background: var(--app-white) !important;
+    }
+  }
+
+  sunbird-pdf-player .sunbird-pdf-palyer-container {
+    .sb-pdf-main-header{
+      .player-zoom-btns {
+        button{
+          border-radius: 0 !important;
+          box-shadow: none !important;
+          color: var(--sbt-language-dropdown-bg) !important;
+        }
+      }
+    }
+  }
+
+}
diff --git a/src/configuration/configuration.debug.ts b/src/configuration/configuration.debug.ts
new file mode 100644
index 000000000..009c87b07
--- /dev/null
+++ b/src/configuration/configuration.debug.ts
@@ -0,0 +1,5 @@
+export const configuration = {
+  production: false,
+  hmr: false,
+  debug: true
+};
diff --git a/src/configuration/configuration.hmr.ts b/src/configuration/configuration.hmr.ts
new file mode 100644
index 000000000..cbf53de84
--- /dev/null
+++ b/src/configuration/configuration.hmr.ts
@@ -0,0 +1,5 @@
+export const configuration = {
+    production: false,
+    hmr: true,
+    debug: false
+};
diff --git a/src/configuration/configuration.prod.ts b/src/configuration/configuration.prod.ts
new file mode 100644
index 000000000..5e09d68b3
--- /dev/null
+++ b/src/configuration/configuration.prod.ts
@@ -0,0 +1,5 @@
+export const configuration = {
+  production: true,
+  hmr: false,
+  debug: false
+};
diff --git a/src/environments/environment.ts b/src/configuration/configuration.ts
similarity index 91%
rename from src/environments/environment.ts
rename to src/configuration/configuration.ts
index 2494140ee..2aab94d95 100644
--- a/src/environments/environment.ts
+++ b/src/configuration/configuration.ts
@@ -2,9 +2,10 @@
 // `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
 // The list of file replacements can be found in `angular.json`.
 
-export const environment = {
+export const configuration = {
   production: false,
-  hmr: false
+  hmr: false,
+  debug: false
 };
 
 /*
diff --git a/src/directives/custom-ion-select/custom-ion-select.directive.ts b/src/directives/custom-ion-select/custom-ion-select.directive.ts
index 0f219bdd1..2d8b5a49a 100644
--- a/src/directives/custom-ion-select/custom-ion-select.directive.ts
+++ b/src/directives/custom-ion-select/custom-ion-select.directive.ts
@@ -1,5 +1,4 @@
-import { IonSelect } from '@ionic/angular';
-import { Directive, ElementRef, DoCheck } from '@angular/core';
+import { Directive, DoCheck, ElementRef } from '@angular/core';
 
 @Directive({
   selector: '[appCustomIonSelect]'
diff --git a/src/directives/hide-header-footer/hide-header-footer.ts b/src/directives/hide-header-footer/hide-header-footer.ts
index 735dc3a7e..65c11ca05 100644
--- a/src/directives/hide-header-footer/hide-header-footer.ts
+++ b/src/directives/hide-header-footer/hide-header-footer.ts
@@ -1,7 +1,7 @@
-import { Directive, ElementRef, Renderer2, Input } from '@angular/core';
-import { Events, IonContent } from '@ionic/angular';
-import { Subject, Observable, Subscription, defer, timer} from 'rxjs';
-import { takeUntil, finalize, tap, mergeMap, switchMap, take, startWith} from 'rxjs/operators';
+import { Directive, ElementRef, Renderer2 } from '@angular/core';
+import { Events } from '@app/util/events';
+import { defer, Subject, Subscription, timer } from 'rxjs';
+import { finalize, mergeMap, startWith, switchMap, take, takeUntil, tap } from 'rxjs/operators';
 
 @Directive({
   selector: '[hide-header-footer]', // Attribute
diff --git a/src/environments/environment.hmr.ts b/src/environments/environment.hmr.ts
deleted file mode 100644
index e11f20ec9..000000000
--- a/src/environments/environment.hmr.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const environment = {
-    production: true,
-    hmr: true
-};
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
deleted file mode 100644
index 0d7b86c80..000000000
--- a/src/environments/environment.prod.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const environment = {
-  production: true,
-  hmr: false
-};
diff --git a/src/global.scss b/src/global.scss
index 7e2f6fc4c..9ec3270b5 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -49,4 +49,33 @@
   .loading-wrapper.sc-ion-loading-md {
     border-radius: 2px;
   }
-}
\ No newline at end of file
+}
+
+.sb-course-container .header .title {
+  color: #000000 !important;
+  font-size: 18px !important;
+}
+
+.text-transform-free{
+  text-transform: none !important;
+}
+
+// Discussion Forum
+.discussion-forum{
+  background-color: map-get($colors, light_gray_8c);
+}
+.discuss-left-panel{
+  z-index: 3 !important;
+}
+.df-btn-container{
+  padding: 1rem !important;
+  .sb-left-icon{
+    color: map-get($colors, primary);
+    background-color: map-get($colors, light_gray);
+  }
+}
+
+.video-js {
+  padding-top: 50% !important; 
+}
+
diff --git a/src/guards/has-not-been-onboarded.guard.spec.ts b/src/guards/has-not-been-onboarded.guard.spec.ts
new file mode 100644
index 000000000..82da69477
--- /dev/null
+++ b/src/guards/has-not-been-onboarded.guard.spec.ts
@@ -0,0 +1,78 @@
+import { HasNotBeenOnboardedGuard } from './has-not-been-onboarded.guard';
+import { AppGlobalService, SplashScreenService } from '@app/services';
+import { AuthService, SharedPreferences } from '@project-sunbird/sunbird-sdk';
+import { Router } from '@angular/router';
+import { of } from 'rxjs';
+
+describe('HasNotBeenOnboardedGuard', () => {
+    let hasNotBeenOnboardedGuard: HasNotBeenOnboardedGuard;
+
+    const mockSharedPreference: Partial<SharedPreferences> = {
+        getString: jest.fn(() => of('false'))
+    };
+
+    const mockAuthService: Partial<AuthService> = {
+        getSession: jest.fn(() => of(undefined))
+    };
+
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+    };
+
+    const mockRouter: Partial<Router> = {
+        navigate: jest.fn()
+    };
+
+    const mockSplashScreenService: Partial<SplashScreenService> = {
+        handleSunbirdSplashScreenActions: jest.fn()
+    };
+
+
+
+    beforeAll(() => {
+        hasNotBeenOnboardedGuard = new HasNotBeenOnboardedGuard(
+            mockSharedPreference as SharedPreferences,
+            mockAuthService as AuthService,
+            mockAppGlobalService as AppGlobalService,
+            mockRouter as Router,
+            mockSplashScreenService as SplashScreenService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create instance of HasNotBeenOnboardedGuard', () => {
+        // arrange
+        // assert
+        expect(hasNotBeenOnboardedGuard).toBeTruthy();
+    });
+
+    describe('canLoad', () => {
+
+        it('should return true if onboarding is not complete and seesion is undefined', (done) => {
+            // arrange
+            // act
+            hasNotBeenOnboardedGuard.canLoad().then((respone) => {
+                // assert
+                expect(respone).toBeTruthy();
+                expect(mockAppGlobalService.isProfileSettingsCompleted).toBeFalsy();
+                done();
+            });
+        });
+
+        it('should return false if onboarding is complete and seesion is defined', (done) => {
+            // arrange
+            mockSharedPreference.getString = jest.fn(() => of('true'));
+            mockAuthService.getSession = jest.fn(() => of({} as any));
+            // act
+            hasNotBeenOnboardedGuard.canLoad().then((respone) => {
+                // assert
+                expect(respone).toBeFalsy();
+                expect(mockAppGlobalService.isProfileSettingsCompleted).toBeTruthy();
+                done();
+            });
+        });
+    });
+
+});
diff --git a/src/guards/has-not-selected-framework.guard.spec.ts b/src/guards/has-not-selected-framework.guard.spec.ts
new file mode 100644
index 000000000..08a21b3a5
--- /dev/null
+++ b/src/guards/has-not-selected-framework.guard.spec.ts
@@ -0,0 +1,97 @@
+import { HasNotSelectedFrameworkGuard } from './has-not-selected-framework.guard';
+import { AppGlobalService, SplashScreenService, UtilityService } from '@app/services';
+import { AuthService, ProfileService, SharedPreferences } from '@project-sunbird/sunbird-sdk';
+import { Router } from '@angular/router';
+import { of } from 'rxjs';
+
+describe('HasNotSelectedFrameworkGuard', () => {
+    let hasNotSelectedFrameworkGuard: HasNotSelectedFrameworkGuard;
+
+    const mockProfileService: Partial<ProfileService> = {
+        getActiveSessionProfile: jest.fn()
+    };
+
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+    };
+
+    const mockUtilityService: Partial<UtilityService> = {
+        getBuildConfigValue: jest.fn(() => Promise.resolve('true'))
+    };
+
+    const mockRouter: Partial<Router> = {
+        navigate: jest.fn()
+    };
+
+    const mockSplashScreenService: Partial<SplashScreenService> = {
+        handleSunbirdSplashScreenActions: jest.fn()
+    };
+
+
+
+    beforeAll(() => {
+        hasNotSelectedFrameworkGuard = new HasNotSelectedFrameworkGuard(
+            mockProfileService as ProfileService,
+            mockAppGlobalService as AppGlobalService,
+            mockUtilityService as UtilityService,
+            mockRouter as Router,
+            mockSplashScreenService as SplashScreenService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create instance of HasNotSelectedFrameworkGuard', () => {
+        // arrange
+        // assert
+        expect(hasNotSelectedFrameworkGuard).toBeTruthy();
+    });
+
+    describe('resolve', () => {
+
+        it('should return true if guard is already activated', () => {
+            // arrange
+            hasNotSelectedFrameworkGuard['guardActivated'] = true;
+            // act
+            const response = hasNotSelectedFrameworkGuard.resolve();
+            // assert
+            expect(response).toBeTruthy();
+        });
+
+        it('should navigate to tabs page if onboarding is complete', (done) => {
+            // arrange
+            hasNotSelectedFrameworkGuard['guardActivated'] = false;
+            mockProfileService.getActiveSessionProfile = jest.fn(() => of({
+                syllabus: ['od_k12'],
+                board: ['State(Odisha)'],
+                grade: ['Class1'],
+                medium: ['English']
+            } as any));
+            // act
+            hasNotSelectedFrameworkGuard.resolve();
+            // assert
+            setTimeout(() => {
+                expect(mockRouter.navigate).toBeCalledWith(['/', 'tabs']);
+                done();
+            }, 0);
+        });
+
+        it('should not navigate to tabs page if onboarding is not complete', (done) => {
+            // arrange
+            hasNotSelectedFrameworkGuard['guardActivated'] = false;
+            mockProfileService.getActiveSessionProfile = jest.fn(() => of({
+                syllabus: ['od_k12']
+            } as any));
+            // act
+            const response = hasNotSelectedFrameworkGuard.resolve();
+            setTimeout(() => {
+                // assert
+                expect(mockSplashScreenService.handleSunbirdSplashScreenActions).toHaveBeenCalled();
+                expect(mockRouter.navigate).not.toBeCalledWith(['/', 'tabs']);
+                done();
+            }, 0);
+        });
+    });
+
+});
diff --git a/src/guards/has-not-selected-language.guard.spec.ts b/src/guards/has-not-selected-language.guard.spec.ts
new file mode 100644
index 000000000..365299c48
--- /dev/null
+++ b/src/guards/has-not-selected-language.guard.spec.ts
@@ -0,0 +1,86 @@
+import { HasNotSelectedLanguageGuard } from './has-not-selected-language.guard';
+import { SplashScreenService } from '@app/services';
+import { SharedPreferences } from '@project-sunbird/sunbird-sdk';
+import { ActivatedRoute, Router } from '@angular/router';
+import { of } from 'rxjs';
+
+describe('HasNotSelectedLanguageGuard', () => {
+    let hasNotSelectedLanguageGuard: HasNotSelectedLanguageGuard;
+
+    const mockSharedPreference: Partial<SharedPreferences> = {
+        getString: jest.fn(() => of('teacher'))
+    };
+
+    const mockRouter: Partial<Router> = {
+        navigate: jest.fn()
+    };
+
+    const mockSplashScreenService: Partial<SplashScreenService> = {
+        handleSunbirdSplashScreenActions: jest.fn()
+    };
+
+
+
+    beforeAll(() => {
+        hasNotSelectedLanguageGuard = new HasNotSelectedLanguageGuard(
+            mockSharedPreference as SharedPreferences,
+            mockRouter as Router,
+            mockSplashScreenService as SplashScreenService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create instance of HasNotSelectedLanguageGuard', () => {
+        // arrange
+        // assert
+        expect(hasNotSelectedLanguageGuard).toBeTruthy();
+    });
+
+    describe('resolve', () => {
+
+        it('should return true if route has onReload property true', () => {
+            // arrange
+            // act
+            const response = hasNotSelectedLanguageGuard.resolve({ queryParams: { onReload: 'true' } } as any);
+            // assert
+            expect(response).toBeTruthy();
+            expect(hasNotSelectedLanguageGuard['guardActivated']).toBeTruthy();
+
+        });
+
+
+        it('should  navigate to user type selection page if selected user type is available', (done) => {
+            // arrange
+            hasNotSelectedLanguageGuard['guardActivated'] = false;
+            // act
+            hasNotSelectedLanguageGuard.resolve({ queryParams: { onReload: 'false' } } as any);
+            // assert
+            setTimeout(() => {
+                expect(mockRouter.navigate).toHaveBeenCalledWith(['/', 'user-type-selection'], {
+                    state: {
+                        forwardMigration: true
+                    }
+                });
+                done();
+            }, 0);
+        });
+
+        it('should return true if usertype is undefined', (done) => {
+            // arrange
+            hasNotSelectedLanguageGuard['guardActivated'] = false;
+            mockSharedPreference.getString = jest.fn(() => of(undefined));
+            // act
+            hasNotSelectedLanguageGuard.resolve({ queryParams: { onReload: 'false' } } as any);
+
+            setTimeout(() => {
+                // assert
+                expect(mockSplashScreenService.handleSunbirdSplashScreenActions).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+});
diff --git a/src/guards/has-not-selected-language.guard.ts b/src/guards/has-not-selected-language.guard.ts
index f8b7a8557..8b880e066 100644
--- a/src/guards/has-not-selected-language.guard.ts
+++ b/src/guards/has-not-selected-language.guard.ts
@@ -1,9 +1,8 @@
-import { Injectable, Inject } from '@angular/core';
-import { Router, Resolve, NavigationExtras, ActivatedRouteSnapshot } from '@angular/router';
-import { SharedPreferences } from 'sunbird-sdk';
+import { Inject, Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, NavigationExtras, Resolve, Router } from '@angular/router';
 import { PreferenceKey } from '@app/app/app.constant';
 import { SplashScreenService } from '@app/services/splash-screen.service';
-import { Events } from '@ionic/angular';
+import { SharedPreferences } from 'sunbird-sdk';
 
 @Injectable()
 export class HasNotSelectedLanguageGuard implements Resolve<any> {
@@ -12,7 +11,6 @@ export class HasNotSelectedLanguageGuard implements Resolve<any> {
         @Inject('SHARED_PREFERENCES') private sharedPreferences: SharedPreferences,
         private router: Router,
         private splashScreenService: SplashScreenService,
-        private events: Events,
     ) { }
 
     resolve(route: ActivatedRouteSnapshot): any {
diff --git a/src/guards/has-not-selected-user-type.guard.spec.ts b/src/guards/has-not-selected-user-type.guard.spec.ts
new file mode 100644
index 000000000..b59af0808
--- /dev/null
+++ b/src/guards/has-not-selected-user-type.guard.spec.ts
@@ -0,0 +1,104 @@
+import { HasNotSelectedUserTypeGuard } from './has-not-selected-user-type.guard';
+import { SplashScreenService } from '@app/services';
+import { SharedPreferences } from '@project-sunbird/sunbird-sdk';
+import { ActivatedRoute, Router } from '@angular/router';
+import { of } from 'rxjs';
+
+describe('HasNotSelectedUserTypeGuard', () => {
+    let hasNotSelectedUserTypeGuard: HasNotSelectedUserTypeGuard;
+
+    const mockSharedPreference: Partial<SharedPreferences> = {
+        getString: jest.fn(() => of('teacher'))
+    };
+
+    const mockActivatedRoute: Partial<ActivatedRoute> = {
+    };
+
+    const mockRouter: Partial<Router> = {
+        navigate: jest.fn()
+    };
+
+    const mockSplashScreenService: Partial<SplashScreenService> = {
+        handleSunbirdSplashScreenActions: jest.fn()
+    };
+
+
+
+    beforeAll(() => {
+        hasNotSelectedUserTypeGuard = new HasNotSelectedUserTypeGuard(
+            mockSharedPreference as SharedPreferences,
+            mockRouter as Router,
+            mockActivatedRoute as ActivatedRoute,
+            mockSplashScreenService as SplashScreenService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create instance of HasNotSelectedUserTypeGuard', () => {
+        // arrange
+        // assert
+        expect(hasNotSelectedUserTypeGuard).toBeTruthy();
+    });
+
+    describe('resolve', () => {
+
+        it('should return true if route has onReload property true', () => {
+            // arrange
+            mockActivatedRoute.snapshot = { params: { comingFrom: false } } as any;
+            // act
+            const response = hasNotSelectedUserTypeGuard.resolve({ queryParams: { onReload: 'true' } } as any);
+            // assert
+            expect(response).toBeTruthy();
+            expect(hasNotSelectedUserTypeGuard['guardActivated']).toBeTruthy();
+
+        });
+
+        it('should return true if route has comingFrom property UserTypeSelection', () => {
+            // arrange
+            mockActivatedRoute.snapshot = { params: { comingFrom: 'UserTypeSelection' } } as any;
+            hasNotSelectedUserTypeGuard['guardActivated'] = false;
+            // act
+            const response = hasNotSelectedUserTypeGuard.resolve({ queryParams: { onReload: 'false' } } as any);
+            // assert
+            expect(response).toBeTruthy();
+            expect(hasNotSelectedUserTypeGuard['guardActivated']).toBeTruthy();
+
+        });
+
+        it('should  navigate to profile settings page if selected user type is available', (done) => {
+            // arrange
+            mockActivatedRoute.snapshot = { params: { comingFrom: 'UserTypeSelection1' } } as any;
+            hasNotSelectedUserTypeGuard['guardActivated'] = false;
+            // act
+            hasNotSelectedUserTypeGuard.resolve({ queryParams: { onReload: 'false' } } as any);
+            // assert
+            setTimeout(() => {
+                expect(mockRouter.navigate).toHaveBeenCalledWith(['/', 'profile-settings'], {
+                    state: {
+                        forwardMigration: true
+                    }
+                });
+                done();
+            }, 0);
+        });
+
+        it('should return true if usertype is undefined', (done) => {
+            // arrange
+            mockActivatedRoute.snapshot = { params: { comingFrom: 'UserTypeSelection1' } } as any;
+            hasNotSelectedUserTypeGuard['guardActivated'] = false;
+            mockSharedPreference.getString = jest.fn(() => of(undefined));
+            // act
+            hasNotSelectedUserTypeGuard.resolve({ queryParams: { onReload: 'false' } } as any);
+
+            setTimeout(() => {
+                // assert
+                expect(mockSplashScreenService.handleSunbirdSplashScreenActions).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+
+});
diff --git a/src/guards/is-guest-user.guard.spec.ts b/src/guards/is-guest-user.guard.spec.ts
new file mode 100644
index 000000000..6a7c2f57d
--- /dev/null
+++ b/src/guards/is-guest-user.guard.spec.ts
@@ -0,0 +1,59 @@
+import { IsGuestUserGuard } from './is-guest-user.guard';
+import { AuthService } from '@project-sunbird/sunbird-sdk';
+import { Router } from '@angular/router';
+import { of } from 'rxjs';
+
+describe('IsGuestUserGuard', () => {
+    let isGuestUserGuard: IsGuestUserGuard;
+
+    const mockAuthService: Partial<AuthService> = {
+    };
+
+    const mockRouter: Partial<Router> = {
+        navigate: jest.fn()
+    };
+
+    beforeAll(() => {
+        isGuestUserGuard = new IsGuestUserGuard(
+            mockAuthService as AuthService,
+            mockRouter as Router
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create instance of IsGuestUserGuard', () => {
+        // arrange
+        // assert
+        expect(isGuestUserGuard).toBeTruthy();
+    });
+
+    describe('canLoad', () => {
+
+        it('should return true if seesion is undefined', (done) => {
+            // arrange
+            mockAuthService.getSession = jest.fn(() => of(undefined as any));
+            // act
+            isGuestUserGuard.canLoad().then((respone) => {
+                // assert
+                expect(respone).toBeTruthy();
+                done();
+            });
+        });
+
+        it('should return false if seesion is defined', (done) => {
+            // arrange
+            mockAuthService.getSession = jest.fn(() => of({} as any));
+            // act
+            isGuestUserGuard.canLoad().then((respone) => {
+                // assert
+                expect(respone).toBeFalsy();
+                expect(mockRouter.navigate).toHaveBeenCalledWith(['/', 'profile-settings']);
+                done();
+            });
+        });
+    });
+
+});
diff --git a/src/index.html b/src/index.html
index e6e5760cd..98179084a 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" dir="ltr">
+<html lang="en" dir="ltr" data-theme="DEFAULT">
 
 <head>
   <meta charset="utf-8" />
@@ -24,3 +24,8 @@
 </body>
 
 </html>
+<script>
+  if (global === undefined) {
+    var global = window;
+  }
+</script>
diff --git a/src/main.ts b/src/main.ts
index fdd0d3169..720457f79 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,20 +1,22 @@
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { AppModule } from './app/app.module';
-import { environment } from './environments/environment';
+import { configuration } from './configuration/configuration';
 import { hmrBootstrap } from './hmr';
 import 'reflect-metadata';
+import 'hammerjs';
 import * as dayjs from 'dayjs';
 
 window.dayjs = dayjs;
+window.dayjs.extend(require('dayjs/plugin/duration'));
 
-if (environment.production) {
+if (configuration.production) {
   enableProdMode();
 }
 
 const bootstrap = () => platformBrowserDynamic().bootstrapModule(AppModule);
 
-if (environment.hmr) {
+if (configuration.hmr) {
   if (module['hot']) {
     hmrBootstrap(module, bootstrap);
   } else {
@@ -23,4 +25,4 @@ if (environment.hmr) {
   }
 } else {
   bootstrap().catch(err => console.log(err));
-}
\ No newline at end of file
+}
diff --git a/src/pipes/alias-board-name/alias-board-name.spec.ts b/src/pipes/alias-board-name/alias-board-name.spec.ts
new file mode 100644
index 000000000..2d77ad0c1
--- /dev/null
+++ b/src/pipes/alias-board-name/alias-board-name.spec.ts
@@ -0,0 +1,40 @@
+import {AliasBoardName} from '@app/pipes/alias-board-name/alias-board-name';
+import {FormAndFrameworkUtilService} from '@app/services';
+
+describe('alias-board-name', () => {
+    let aliasBoardName: AliasBoardName;
+    const mockFromAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {
+        getBoardAliasName: (() => Promise.resolve([{
+            name: 'CBSE',
+            code: 'ekstep-ncert-12',
+            aliased: 'CBSE/NCERT'
+        }]))
+    };
+    beforeAll(() => {
+        aliasBoardName = new AliasBoardName(
+            mockFromAndFrameworkUtilService as FormAndFrameworkUtilService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should create instance of aliasBoardName', () => {
+        // assert
+        expect(aliasBoardName).toBeTruthy();
+    });
+
+    it('should take string and check in aliasedCached and find the value', () => {
+        // act
+        aliasBoardName.transform('CBSE');
+    });
+
+    it('should take string and check in aliasedCached and find the value', () => {
+        // act
+        aliasBoardName.transform('State(Andhra pradesh)');
+    });
+});
+
+
diff --git a/src/pipes/alias-board-name/alias-board-name.ts b/src/pipes/alias-board-name/alias-board-name.ts
new file mode 100644
index 000000000..a02abff70
--- /dev/null
+++ b/src/pipes/alias-board-name/alias-board-name.ts
@@ -0,0 +1,30 @@
+import {Pipe, PipeTransform} from '@angular/core';
+import {FormAndFrameworkUtilService} from '@app/services';
+
+@Pipe({
+    name: 'aliased',
+    pure: true
+})
+export class AliasBoardName implements PipeTransform {
+    private static cachedAliases: { name: string, code: string, alias: string }[];
+    constructor(
+        private formAndFrameworkUtilService: FormAndFrameworkUtilService
+    ) {
+        if (AliasBoardName.cachedAliases) {
+            return;
+        }
+        this.formAndFrameworkUtilService.getBoardAliasName().then((fields) => {
+            AliasBoardName.cachedAliases = fields;
+        });
+    }
+    transform(val: string): string {
+        if (!AliasBoardName.cachedAliases) {
+            return val;
+        }
+        const alias = AliasBoardName.cachedAliases.find(a => a.name === val);
+        if (alias) {
+            return alias.alias;
+        }
+        return val;
+    }
+}
diff --git a/src/pipes/category-key-translator/category-key-translator-pipe.spec.ts b/src/pipes/category-key-translator/category-key-translator-pipe.spec.ts
new file mode 100644
index 000000000..7fa233c63
--- /dev/null
+++ b/src/pipes/category-key-translator/category-key-translator-pipe.spec.ts
@@ -0,0 +1,118 @@
+import { CategoryKeyTranslator } from './category-key-translator-pipe';
+import {
+    CommonUtilService,
+} from '@app/services';
+
+describe('CategoryKeyTranslator', () => {
+    let categoryKeyTranslator: CategoryKeyTranslator;
+
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        translateMessage: jest.fn(() => 'sample_translation')
+    };
+
+
+    beforeAll(() => {
+        categoryKeyTranslator = new CategoryKeyTranslator(
+            mockCommonUtilService as CommonUtilService,
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create instance of CategoryKeyTranslator', () => {
+        // arrange
+        // assert
+        expect(categoryKeyTranslator).toBeTruthy();
+    });
+
+    describe('transform', () => {
+
+        it('should return empty string if content is undefined', () => {
+            // arrange
+            // act
+            const translatedKey = categoryKeyTranslator.transform('SAMPLE_KEY', undefined);
+            // assert
+            expect(translatedKey).toEqual('');
+        });
+
+        it('should return course trackable key if content is trackable', () => {
+            // arrange
+            const content = {
+                trackable: {
+                    enabled: 'Yes'
+                },
+                primaryCategory: 'Course'
+            };
+            // act
+            categoryKeyTranslator.transform('SAMPLE_KEY', content);
+            // assert
+            expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('CRS_TRK_SAMPLE_KEY', undefined);
+        });
+
+        it('should return course trackable key if content is trackable and trackable object is available in contentData', () => {
+            // arrange
+            const content = {
+                contentData: {
+                    trackable: {
+                        enabled: 'Yes'
+                    },
+                    primaryCategory: 'Course'
+                }
+            };
+            // act
+            categoryKeyTranslator.transform('SAMPLE_KEY', content);
+            // assert
+            expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('CRS_TRK_SAMPLE_KEY', undefined);
+        });
+
+        it('should return course non trackable key if content is non trackable', () => {
+            // arrange
+            const content = {
+                trackable: {
+                    enabled: 'No'
+                },
+                contentType: 'Course'
+            };
+            // act
+            categoryKeyTranslator.transform('SAMPLE_KEY', content);
+            // assert
+            expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('CRS_NONTRK_SAMPLE_KEY', undefined);
+        });
+
+        it('should return  non trackable key if trackable object is not there and primaryCategory is Textbook', () => {
+            // arrange
+            const content = {
+                contentType: 'Digital Textbook'
+            };
+            // act
+            categoryKeyTranslator.transform('SAMPLE_KEY', content);
+            // assert
+            expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('TBK_NONTRK_SAMPLE_KEY', undefined);
+        });
+
+        it('should return  trackable key if trackable object is not there and primaryCategory is Course', () => {
+            // arrange
+            const content = {
+                contentType: 'Course'
+            };
+            // act
+            categoryKeyTranslator.transform('SAMPLE_KEY', content);
+            // assert
+            expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('CRS_TRK_SAMPLE_KEY', undefined);
+        });
+
+        it('should return  trackable key if trackable object is not there and primaryCategory is other than Course and Textbook', () => {
+            // arrange
+            const content = {
+                contentType: 'TV Class'
+            };
+            // act
+            categoryKeyTranslator.transform('SAMPLE_KEY', content);
+            // assert
+            expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('DFLT__SAMPLE_KEY', undefined);
+        });
+    });
+
+});
diff --git a/src/pipes/category-key-translator/category-key-translator-pipe.ts b/src/pipes/category-key-translator/category-key-translator-pipe.ts
new file mode 100644
index 000000000..eebfa5a7f
--- /dev/null
+++ b/src/pipes/category-key-translator/category-key-translator-pipe.ts
@@ -0,0 +1,75 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { CommonUtilService } from '@app/services';
+import { Trackable } from '@project-sunbird/sunbird-sdk';
+import { CsContentType, CsPrimaryCategory } from '@project-sunbird/client-services/services/content';
+
+
+@Pipe({
+    name: 'categoryKeyTranslate',
+    pure: true
+})
+export class CategoryKeyTranslator implements PipeTransform {
+    constructor(
+        private commonUtilService: CommonUtilService
+    ) {
+    }
+
+    transform(
+        key: string,
+        content: any,
+        fields?: string | any): string {
+
+        if (!content) {
+            return '';
+        }
+        content = !content.trackable ? ((content.contentData && content.contentData.trackable) ? content.contentData : content) : content;
+        const trackable = content.trackable;
+        const primaryCategory = content.primaryCategory ? content.primaryCategory : content.contentType;
+        const translationKey = this.getTranslationKeyPrefix(trackable, primaryCategory).concat('_').concat(key);
+        return this.commonUtilService.translateMessage(translationKey, fields);
+    }
+
+    private getTranslationKeyPrefix(trackable: Trackable, primaryCategory: string): string {
+
+        let trackabilityPrefix = '';
+        if (trackable && trackable.enabled && trackable.enabled === 'Yes') {
+            trackabilityPrefix = 'TRK';
+        } else if (trackable && trackable.enabled && trackable.enabled === 'No') {
+            trackabilityPrefix = 'NONTRK';
+        } else {
+            trackabilityPrefix = this.getTrackablePrefix(primaryCategory);
+        }
+        return this.getContetPrefix(primaryCategory).concat('_').concat(trackabilityPrefix);
+    }
+
+    private getContetPrefix(primaryCategory: string) {
+        let prefix = 'DFLT';
+        switch (primaryCategory.toLowerCase()) {
+            case CsPrimaryCategory.COURSE.toLowerCase():
+                prefix = 'CRS';
+                break;
+            case CsPrimaryCategory.DIGITAL_TEXTBOOK.toLowerCase():
+                prefix = 'TBK';
+                break;
+            default:
+                prefix = 'DFLT';
+                break;
+        }
+        return prefix;
+    }
+
+    private getTrackablePrefix(primaryCategory: string): string {
+        let prefix = '';
+        switch (primaryCategory.toLowerCase()) {
+            case CsPrimaryCategory.COURSE.toLowerCase():
+                prefix = 'TRK';
+                break;
+            case CsPrimaryCategory.DIGITAL_TEXTBOOK.toLowerCase():
+            case CsContentType.COLLECTION.toLowerCase():
+            case CsContentType.TEXTBOOK.toLowerCase():
+                prefix = 'NONTRK';
+                break;
+        }
+        return prefix;
+    }
+}
diff --git a/src/pipes/date-ago/date-ago.pipe.spec.ts b/src/pipes/date-ago/date-ago.pipe.spec.ts
new file mode 100644
index 000000000..055d1ef26
--- /dev/null
+++ b/src/pipes/date-ago/date-ago.pipe.spec.ts
@@ -0,0 +1,80 @@
+import {DateAgoPipe} from '@app/pipes/date-ago/date-ago.pipe';
+import {DatePipe} from '@angular/common';
+import {CommonUtilService} from '@app/services';
+
+describe('DateAgoPipe', () => {
+    const mockCommonUtilsService: Partial<CommonUtilService> = {
+        translateMessage: (translationKey, param) => `${translationKey}-${param}`
+    };
+    const dateAgoPipe = new DateAgoPipe(
+        new DatePipe('en'),
+        mockCommonUtilsService
+    );
+
+    describe('when no interval limit is passed', () => {
+        it('should resolve appropriate string', () => {
+            const secondsAgoDate = new Date();
+            secondsAgoDate.setSeconds(secondsAgoDate.getSeconds() - 2);
+            expect(dateAgoPipe.transform(secondsAgoDate.toString())).toEqual('SECONDS_AGO-2');
+
+            const minutesAgoDate = new Date();
+            minutesAgoDate.setMinutes(minutesAgoDate.getMinutes() - 2);
+            expect(dateAgoPipe.transform(minutesAgoDate.getTime())).toEqual('MINUTES_AGO-2');
+
+            const hoursAgoDate = new Date();
+            hoursAgoDate.setHours(hoursAgoDate.getHours() - 2);
+            expect(dateAgoPipe.transform(hoursAgoDate.toString())).toEqual('HOURS_AGO-2');
+        });
+    });
+
+    describe('when limit is given and no default format passed', () => {
+        it('should resolve appropriate string upto limit', () => {
+            const secondsAgoDate = new Date();
+            secondsAgoDate.setSeconds(secondsAgoDate.getSeconds() - 2);
+            expect(dateAgoPipe.transform(secondsAgoDate.toString(), 'second')).toEqual('SECONDS_AGO-2');
+        });
+
+        it('should do nothing beyond limit', () => {
+            const minutesAgoDate = new Date();
+            minutesAgoDate.setMinutes(minutesAgoDate.getMinutes() - 2);
+            expect(dateAgoPipe.transform(minutesAgoDate.toString(), 'second')).toEqual(minutesAgoDate.toString());
+
+            const daysAgoDate = new Date();
+            daysAgoDate.setDate(daysAgoDate.getDate() - 2);
+            expect(dateAgoPipe.transform(daysAgoDate.toString(), 'minute')).toEqual(daysAgoDate.toString());
+        });
+    });
+
+    describe('when limit is given and default format passed', () => {
+        it('should resolve appropriate string upto limit', () => {
+            const secondsAgoDate = new Date();
+            secondsAgoDate.setSeconds(secondsAgoDate.getSeconds() - 2);
+            expect(dateAgoPipe.transform(secondsAgoDate.toString(), 'second')).toEqual('SECONDS_AGO-2');
+        });
+
+        it('should delegate to date pipe', () => {
+            const minutesAgoDate = new Date();
+            minutesAgoDate.setMinutes(minutesAgoDate.getMinutes() - 2);
+            expect(dateAgoPipe.transform(minutesAgoDate.toString(), 'second', 'M/d/yy')).toEqual(expect.stringMatching(/^\d*\/\d*\/\d*$/));
+
+            const daysAgoDate = new Date();
+            daysAgoDate.setDate(daysAgoDate.getDate() - 2);
+            expect(dateAgoPipe.transform(daysAgoDate.toString(), 'minute', 'M/d/yy')).toEqual(expect.stringMatching(/^\d*\/\d*\/\d*$/));
+        });
+    });
+
+    describe('when current date is given', () => {
+        it('should resolve with 0 seconds ago', () => {
+            const secondsAgoDate = new Date();
+            expect(dateAgoPipe.transform(secondsAgoDate.getTime(), 'minute')).toEqual('SECONDS_AGO-0');
+        });
+    });
+
+    describe('when future date is given', () => {
+        it('should resolve with 0 seconds ago', () => {
+            const secondsAgoDate = new Date();
+            secondsAgoDate.setSeconds(secondsAgoDate.getSeconds() + 1);
+            expect(dateAgoPipe.transform(secondsAgoDate.getTime(), 'minute')).toEqual('SECONDS_AGO-0');
+        });
+    });
+});
diff --git a/src/pipes/date-ago/date-ago.pipe.ts b/src/pipes/date-ago/date-ago.pipe.ts
new file mode 100644
index 000000000..2b29d269d
--- /dev/null
+++ b/src/pipes/date-ago/date-ago.pipe.ts
@@ -0,0 +1,73 @@
+import {Pipe, PipeTransform} from '@angular/core';
+import {DatePipe} from '@angular/common';
+import {CommonUtilService} from '@app/services';
+
+enum Interval {
+    YEAR = 'year',
+    MONTH = 'month',
+    WEEK = 'week',
+    DAY = 'day',
+    HOUR = 'hour',
+    MINUTE = 'minute',
+    SECOND = 'second'
+}
+
+@Pipe({
+    name: 'dateAgo',
+    pure: true
+})
+export class DateAgoPipe implements PipeTransform {
+    constructor(
+        private datePipe: DatePipe,
+        private commonUtilService: CommonUtilService
+    ) {
+    }
+
+    transform(
+        value: string,
+        limit?: Interval,
+        format?: string
+    ): any {
+        if (value) {
+            const seconds = Math.floor((+new Date() - +new Date(value)) / 1000);
+
+            if (seconds <= 0) {
+                return this.commonUtilService.translateMessage(`SECONDS_AGO`, 0);
+            }
+
+            const intervals = {
+                [Interval.YEAR]: {duration: 31536000},
+                [Interval.MONTH]: {duration: 2592000},
+                [Interval.WEEK]: {duration: 604800},
+                [Interval.DAY]: {duration: 86400},
+                [Interval.HOUR]: {duration: 3600},
+                [Interval.MINUTE]: {duration: 60},
+                [Interval.SECOND]: {duration: 1}
+            };
+            let counter;
+            // tslint:disable-next-line:forin
+            for (const i in intervals) {
+                counter = Math.floor(seconds / intervals[i].duration);
+                if (counter > 0) {
+                    if (
+                        limit && intervals[limit] &&
+                        intervals[i].duration > intervals[limit].duration
+                    ) {
+                        if (!format) {
+                            return value;
+                        }
+
+                        return this.datePipe.transform(new Date(value), format);
+                    }
+
+                    if (counter === 1) {
+                        return this.commonUtilService.translateMessage(`${i.toUpperCase()}_AGO`, counter);
+                    } else {
+                        return this.commonUtilService.translateMessage(`${i.toUpperCase()}S_AGO`, counter);
+                    }
+                }
+            }
+        }
+        return value;
+    }
+}
diff --git a/src/pipes/filter/filter.pipe.ts b/src/pipes/filter/filter.pipe.ts
index c687371ad..b79582f5a 100644
--- a/src/pipes/filter/filter.pipe.ts
+++ b/src/pipes/filter/filter.pipe.ts
@@ -6,17 +6,10 @@ import { Pipe, PipeTransform } from '@angular/core';
 })
 export class FilterPipe implements PipeTransform {
 
-  transform(list: any, searchKey: string): any {
-    if (!searchKey || !list) {
+  transform(list: any, searchKey: string, searchValue: string): any {
+    if (!searchKey || !searchValue || !list) {
       return list;
     }
-    const filteredList = [];
-    for (let item of list) {
-      if (item.name.toLowerCase().includes(searchKey.toLowerCase())) {
-        filteredList.push(item);
-      }
-    }
-
-    return filteredList;
+    return list.filter((item) => item[searchKey].toLowerCase().includes(searchValue.toLowerCase()));
   }
 }
diff --git a/src/pipes/initial/initial.ts b/src/pipes/initial/initial.ts
new file mode 100644
index 000000000..819898b77
--- /dev/null
+++ b/src/pipes/initial/initial.ts
@@ -0,0 +1,18 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import GraphemeSplitter from 'grapheme-splitter';
+
+@Pipe(
+    { name: 'initial' }
+)
+
+export class InitialPipe implements PipeTransform {
+  transform(value) {
+    let initial = '';
+    if (value) {
+      const splitter = new GraphemeSplitter();
+      const split: string[] = splitter.splitGraphemes(value.trim());
+      initial = split[0];
+    }
+    return initial;
+  }
+}
diff --git a/src/pipes/pipes.module.ts b/src/pipes/pipes.module.ts
index 375a5e9a4..8b5c3ddb8 100644
--- a/src/pipes/pipes.module.ts
+++ b/src/pipes/pipes.module.ts
@@ -4,9 +4,47 @@ import { NgModule } from '@angular/core';
 import { FileSizePipe } from './file-size/file-size';
 import { CSAPipe } from './csa/csa';
 import { FilterPipe } from './filter/filter.pipe';
+import { TranslateHtmlPipe } from './translate-html/translate-html';
+import { DateAgoPipe } from '@app/pipes/date-ago/date-ago.pipe';
+import { CommonModule, DatePipe } from '@angular/common';
+import { InitialPipe } from '@app/pipes/initial/initial';
+import { CategoryKeyTranslator } from './category-key-translator/category-key-translator-pipe';
+import {AliasBoardName} from './alias-board-name/alias-board-name';
+import { TranslateJsonPipe } from './translate-json/translate-json';
+import { RandomColorMapPipe } from './theme-icon-mapper/random-color-map.pipe';
+import { ThemeInputsSelectorPipe } from './theme-icon-mapper/theme-inputs-selector.pipe';
+
 @NgModule({
-  declarations: [FileSizePipe, CSAPipe, MimeTypePipe , FilterPipe, SortByPipe],
-  imports: [],
-  exports: [FileSizePipe, CSAPipe, MimeTypePipe , FilterPipe, SortByPipe]
+  declarations: [FileSizePipe,
+    CSAPipe,
+    MimeTypePipe,
+    FilterPipe,
+    SortByPipe,
+    TranslateHtmlPipe,
+    DateAgoPipe,
+    InitialPipe,
+    CategoryKeyTranslator,
+    AliasBoardName,
+    TranslateJsonPipe,
+    RandomColorMapPipe,
+    ThemeInputsSelectorPipe
+  ],
+  imports: [CommonModule],
+  exports: [FileSizePipe,
+    CSAPipe,
+    MimeTypePipe,
+    FilterPipe,
+    SortByPipe,
+    TranslateHtmlPipe,
+    DateAgoPipe,
+    InitialPipe,
+    CategoryKeyTranslator,
+    AliasBoardName,
+    TranslateJsonPipe,
+    RandomColorMapPipe,
+    ThemeInputsSelectorPipe
+  ],
+  providers: [DatePipe, CategoryKeyTranslator]
 })
-export class PipesModule {}
+export class PipesModule {
+}
diff --git a/src/pipes/theme-icon-mapper/random-color-map.pipe.ts b/src/pipes/theme-icon-mapper/random-color-map.pipe.ts
new file mode 100644
index 000000000..db42bf86a
--- /dev/null
+++ b/src/pipes/theme-icon-mapper/random-color-map.pipe.ts
@@ -0,0 +1,27 @@
+import {Pipe, PipeTransform} from '@angular/core';
+import {ColorMapping} from '@app/app/app.constant';
+
+@Pipe({
+    name: 'randomColorMapPipe',
+    pure: true
+})
+export class RandomColorMapPipe implements PipeTransform {
+    private static cache: {[key: string]: any} = {};
+
+    private colors = ColorMapping.map(({primary, secondary}) => ({
+        iconBgColor: primary,
+        pillBgColor: secondary
+    }));
+
+    transform(key: string, index?: number): any {
+        if (!RandomColorMapPipe.cache[key]) {
+            if (!index && index !== 0) {
+                RandomColorMapPipe.cache[key] = this.colors[Math.floor(Math.random() * this.colors.length)];
+            } else {
+                RandomColorMapPipe.cache[key] = this.colors[(index % this.colors.length)];
+            }
+        }
+
+        return RandomColorMapPipe.cache[key];
+    }
+}
diff --git a/src/pipes/theme-icon-mapper/theme-inputs-selector.pipe.ts b/src/pipes/theme-icon-mapper/theme-inputs-selector.pipe.ts
new file mode 100644
index 000000000..87f3a0b51
--- /dev/null
+++ b/src/pipes/theme-icon-mapper/theme-inputs-selector.pipe.ts
@@ -0,0 +1,74 @@
+import {Pipe, PipeTransform} from '@angular/core';
+
+interface Theme {
+    component: string;
+    inputs?: {
+        [attribute: string]: any;
+    };
+    inputsMap?: {
+        [attribute: string]: {
+            [matcher: string]: any;
+        } | undefined
+    };
+    children?: {
+        [component: string]: {
+            inputs?: {
+                [attribute: string]: any;
+            };
+            inputsMap?: {
+                [attribute: string]: {
+                    [matcher: string]: any;
+                } | undefined
+            }
+        }
+    };
+}
+
+@Pipe({
+    name: 'themeInputsSelector',
+    pure: true
+})
+export class ThemeInputsSelectorPipe implements PipeTransform {
+    transform(arg: {component: string, input: string}, theme?: Theme, matcher?: string): any {
+        if (matcher) {
+            matcher = matcher.toLowerCase().trim().replace(/\s/g, "");
+        }
+        const {component, input} = arg;
+
+        if (!theme) {
+            return undefined;
+        }
+
+        if (theme.component === component) {
+            if (
+                matcher &&
+                theme.inputsMap &&
+                theme.inputsMap[input] &&
+                theme.inputsMap[input][matcher]
+            ) {
+                return theme.inputsMap[input][matcher];
+            }
+
+            if (theme.inputs && theme.inputs[input]) {
+                return theme.inputs[input];
+            }
+        }
+
+        if (theme.children && theme.children[component]) {
+            if (
+                matcher &&
+                theme.children[component].inputsMap &&
+                theme.children[component].inputsMap[input] &&
+                theme.children[component].inputsMap[input][matcher]
+            ) {
+                return theme.children[component].inputsMap[input][matcher];
+            }
+
+            if (theme.children[component].inputs && theme.children[component].inputs[input]) {
+                return theme.children[component].inputs[input];
+            }
+        }
+
+        return undefined;
+    }
+}
diff --git a/src/pipes/translate-html/translate-html.ts b/src/pipes/translate-html/translate-html.ts
new file mode 100644
index 000000000..1aea7a778
--- /dev/null
+++ b/src/pipes/translate-html/translate-html.ts
@@ -0,0 +1,19 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { CommonUtilService } from '@app/services/common-util.service';
+
+@Pipe(
+    { name: 'translateHtml' }
+)
+
+export class TranslateHtmlPipe implements PipeTransform {
+
+  constructor(private commonUtilService: CommonUtilService) {}
+
+  transform(value: { contents: string, values: string[] }): string {
+
+    return Object.keys(value.values).reduce((acc, val) => {
+      return acc.replace(val, value.values[val] ? this.commonUtilService.translateMessage(value.values[val]) : '');
+    }, value.contents);
+
+  }
+}
diff --git a/src/pipes/translate-json/translate-json.ts b/src/pipes/translate-json/translate-json.ts
new file mode 100644
index 000000000..c6951f1c7
--- /dev/null
+++ b/src/pipes/translate-json/translate-json.ts
@@ -0,0 +1,29 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+
+@Pipe(
+    { name: 'translateJson' }
+)
+
+export class TranslateJsonPipe implements PipeTransform {
+
+  constructor(private translate: TranslateService) {}
+
+  transform(value: string, args?: {[key: string]: string}): string {
+    try {
+      const availableTranslation = JSON.parse(value);
+      let outputStr = '';
+      if (availableTranslation.hasOwnProperty(this.translate.currentLang)) {
+        outputStr = availableTranslation[this.translate.currentLang];
+      } else if (availableTranslation.hasOwnProperty(this.translate.defaultLang)) {
+        outputStr = availableTranslation[this.translate.defaultLang];
+      }
+      for (const key in args) {
+        outputStr = outputStr.replace(key, args[key]);
+      }
+      return outputStr;
+    } catch (e) {
+      return value;
+    }
+  }
+}
diff --git a/src/polyfills.ts b/src/polyfills.ts
index 14769a12b..5729a6a3d 100644
--- a/src/polyfills.ts
+++ b/src/polyfills.ts
@@ -59,7 +59,7 @@ import './zone-flags.ts';
  */
 
 import 'zone.js/dist/zone';  // Included with Angular CLI.
-
+(window as any).global = window;
 
 /***************************************************************************************************
  * APPLICATION IMPORTS
diff --git a/src/services/active-page/active-page-service.spec.ts b/src/services/active-page/active-page-service.spec.ts
index e0cf056aa..560afdc90 100644
--- a/src/services/active-page/active-page-service.spec.ts
+++ b/src/services/active-page/active-page-service.spec.ts
@@ -35,7 +35,7 @@ describe('ContentPlayerHandler', () => {
             expect(activePageService.computePageId(RouterLinks.ACTIVE_DOWNLOADS)).toEqual(PageId.ACTIVE_DOWNLOADS);
             expect(activePageService.computePageId(RouterLinks.COURSE_BATCHES)).toEqual(PageId.COURSE_BATCHES);
             expect(activePageService.computePageId(RouterLinks.DISTRICT_MAPPING)).toEqual(PageId.DISTRICT_MAPPING);
-            expect(activePageService.computePageId(RouterLinks.USER_AND_GROUPS)).toEqual(PageId.HOME);
+            expect(activePageService.computePageId(RouterLinks.PLAYER)).toEqual(PageId.HOME);
         });
     });
 });
diff --git a/src/services/active-page/active-page-service.ts b/src/services/active-page/active-page-service.ts
index 36ad244fc..881d2c3ee 100644
--- a/src/services/active-page/active-page-service.ts
+++ b/src/services/active-page/active-page-service.ts
@@ -17,6 +17,10 @@ export class ActivePageService {
       pageId = PageId.LIBRARY;
     } else if (routeUrl === RouterLinks.COURSE_TAB) {
       pageId = PageId.COURSES;
+    } else if (routeUrl === RouterLinks.HOME_TAB) {
+      pageId = PageId.HOME;
+    } else if (routeUrl === RouterLinks.SEARCH_TAB) {
+      pageId = PageId.SEARCH;
     } else if (routeUrl === RouterLinks.PROFILE_TAB) {
       pageId = PageId.PROFILE;
     } else if (routeUrl === RouterLinks.GUEST_PROFILE_TAB) {
diff --git a/src/services/android-permissions/android-permission.service.spec.ts b/src/services/android-permissions/android-permission.service.spec.ts
new file mode 100644
index 000000000..54549d2a4
--- /dev/null
+++ b/src/services/android-permissions/android-permission.service.spec.ts
@@ -0,0 +1,196 @@
+import { AndroidPermissionsService } from '../android-permissions/android-permissions.service';
+import { AndroidPermission, AndroidPermissionsStatus, PermissionAskedEnum } from '../android-permissions/android-permission';
+import { catchError } from 'rxjs/operators';
+import { of } from 'rxjs';
+declare const cordova;
+
+describe('AndroidPermissionsService', () => {
+    let androidPermissionsService: AndroidPermissionsService;
+    beforeAll(() => {
+        androidPermissionsService = new AndroidPermissionsService();
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should be create a instance of AndroidPermissionsService', () => {
+        expect(androidPermissionsService).toBeTruthy();
+    });
+
+    describe('checkPermissions()', () => {
+        it('should return required permission information', (done) => {
+            // arrange
+            cordova.plugins.permissions.checkPermission = jest.fn((_, success, error) => {
+                success({
+                    hasPermission: true,
+                    isPermissionAlwaysDenied: true
+                });
+            });
+
+            cordova.plugins.diagnostic.getPermissionAuthorizationStatus = jest.fn((success, error, _) => {
+                success('DENIED_ALWAYS');
+            });
+            // act n assert
+            androidPermissionsService.checkPermissions([
+                AndroidPermission.CAMERA,
+                AndroidPermission.WRITE_EXTERNAL_STORAGE,
+                AndroidPermission.RECORD_AUDIO
+            ]).subscribe((response) => {
+                expect(response).toEqual({
+                    'android.permission.CAMERA': {
+                        hasPermission: true,
+                        isPermissionAlwaysDenied: true
+                    },
+                    'android.permission.WRITE_EXTERNAL_STORAGE': {
+                        hasPermission: true,
+                        isPermissionAlwaysDenied: true
+                    },
+                    'android.permission.RECORD_AUDIO': {
+                        hasPermission: true,
+                        isPermissionAlwaysDenied: true
+                    }
+                });
+                done();
+            });
+        });
+
+        it('should throw error if the plugin error throws an error', (done) => {
+            // arrange
+            cordova.plugins.permissions.checkPermission = jest.fn((_, success, error) => {
+                error({
+                    hasPermission: true,
+                    isPermissionAlwaysDenied: true
+                });
+            });
+
+            cordova.plugins.diagnostic.getPermissionAuthorizationStatus = jest.fn((success, error, _) => {
+                success('DENIED_ALWAYS');
+            });
+            // act n assert
+            androidPermissionsService.checkPermissions([
+                AndroidPermission.CAMERA,
+                AndroidPermission.WRITE_EXTERNAL_STORAGE,
+                AndroidPermission.RECORD_AUDIO
+            ]).pipe(
+                catchError(() => {
+                    done();
+                    return of({});
+                })
+            ).subscribe((response) => {
+            });
+        });
+    });
+
+    describe('requestPermission()', () => {
+        it('should return required permission information for request permission', (done) => {
+            // arrange
+            cordova.plugins.permissions.requestPermissions = jest.fn((_, success, error) => {
+                success({
+                    hasPermission: true,
+                    isPermissionAlwaysDenied: true
+                });
+            });
+
+            cordova.plugins.diagnostic.getPermissionAuthorizationStatus = jest.fn((success, error, _) => {
+                success('NOT_REQUESTED');
+            });
+            // act n assert
+            androidPermissionsService.requestPermission(AndroidPermission.CAMERA).subscribe((response) => {
+                expect(response).toEqual(
+                    {
+                        hasPermission: true,
+                        isPermissionAlwaysDenied: false
+                    }
+                );
+                done();
+            });
+        });
+
+        it('should handle the error scenario when plugin throws an error', (done) => {
+            // arrange
+            cordova.plugins.permissions.requestPermissions = jest.fn((_, success, error) => {
+                error({
+                    hasPermission: true,
+                    isPermissionAlwaysDenied: true
+                });
+            });
+
+            cordova.plugins.diagnostic.getPermissionAuthorizationStatus = jest.fn((success, error, _) => {
+                success('NOT_REQUESTED');
+            });
+            // act n assert
+            androidPermissionsService.requestPermission(AndroidPermission.CAMERA).pipe(
+                catchError(() => {
+                    done();
+                    return of({});
+                })
+            ).subscribe((response) => {
+            });
+        });
+    });
+
+    describe('requestPermissions()', () => {
+        it('should return required permission information for request permissions', (done) => {
+            // arrange
+            cordova.plugins.permissions.requestPermissions = jest.fn((_, success, error) => {
+                success({
+                    hasPermission: true,
+                    isPermissionAlwaysDenied: true
+                });
+            });
+
+            cordova.plugins.diagnostic.getPermissionAuthorizationStatus = jest.fn((success, error, _) => {
+                success('NOT_REQUESTED');
+            });
+            // act n assert
+            androidPermissionsService.requestPermissions([AndroidPermission.CAMERA]).subscribe((response) => {
+                expect(response).toEqual(
+                    {
+                        hasPermission: true,
+                        isPermissionAlwaysDenied: true
+                    }
+                );
+                done();
+            });
+        });
+
+        it('should handle the error scenario when plugin throws an error', (done) => {
+            // arrange
+            cordova.plugins.permissions.requestPermissions = jest.fn((_, success, error) => {
+                error({
+                    hasPermission: true,
+                    isPermissionAlwaysDenied: true
+                });
+            });
+
+            cordova.plugins.diagnostic.getPermissionAuthorizationStatus = jest.fn((success, error, _) => {
+                error('NOT_REQUESTED');
+            });
+            // act n assert
+            androidPermissionsService.requestPermissions([AndroidPermission.CAMERA]).pipe(
+                catchError(() => {
+                    done();
+                    return of({});
+                })
+            ).subscribe((response) => {
+            });
+        });
+    });
+
+    describe('getAlwaysDeniedStatus()', () => {
+        it('should reject the result', (done) => {
+            // arrange
+            cordova.plugins.diagnostic.getPermissionAuthorizationStatus = jest.fn((success, error, _) => {
+                error('DENIED_ALWAYS');
+            });
+            // act n assert
+            androidPermissionsService['getAlwaysDeniedStatus'](
+                AndroidPermission.CAMERA
+               ).catch((response) => {
+                   done();
+            });
+        });
+
+    });
+});
diff --git a/src/services/android-permissions/android-permissions.service.ts b/src/services/android-permissions/android-permissions.service.ts
index 553bc8053..b70440cac 100644
--- a/src/services/android-permissions/android-permissions.service.ts
+++ b/src/services/android-permissions/android-permissions.service.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
 import { AndroidPermission, AndroidPermissionsStatus } from '@app/services/android-permissions/android-permission';
-import { defer } from 'rxjs';
+import { defer, Observable } from 'rxjs';
 
 declare const cordova;
 
diff --git a/src/services/app-global-service.service.spec.ts b/src/services/app-global-service.service.spec.ts
index 4cfdd4d60..3c867aa08 100644
--- a/src/services/app-global-service.service.spec.ts
+++ b/src/services/app-global-service.service.spec.ts
@@ -1,11 +1,12 @@
 import { AppGlobalService } from './app-global-service.service';
 import { ProfileService, AuthService, FrameworkService, SharedPreferences, ProfileType } from 'sunbird-sdk';
-import { Events, PopoverController } from '@ionic/angular';
+import { PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { TelemetryGeneratorService } from './telemetry-generator.service';
 import { UtilityService } from './utility-service';
 import { of, throwError } from 'rxjs';
 import { PreferenceKey, EventTopics } from '../app/app.constant';
-import { InteractSubtype, Environment, PageId, InteractType } from './telemetry-constants';
+import { InteractSubtype, Environment, PageId, InteractType, ImpressionType, ImpressionSubtype } from './telemetry-constants';
 import { AppVersion } from '@ionic-native/app-version/ngx';
 import { mockFrameworkData } from './app-global-service.service.spec.data';
 import { UpgradePopoverComponent } from '@app/app/components/popups';
@@ -52,7 +53,8 @@ describe('AppGlobalService', () => {
             mockPopoverCtrl as PopoverController,
             mockTelemetryGeneratorService as TelemetryGeneratorService,
             mockUtilityService as UtilityService,
-            mockAppVersion as AppVersion
+            mockAppVersion as AppVersion,
+            mockPopoverCtrl as PopoverController
         );
     });
 
@@ -520,7 +522,7 @@ describe('AppGlobalService', () => {
             // act
             appGlobalService.setOnBoardingCompleted().then(() => {
                 // assert
-                expect(appGlobalService.isOnBoardingCompleted).toEqual(true);
+                expect(appGlobalService.isOnBoardingCompleted).toEqual(false);
             });
         });
 
@@ -535,47 +537,71 @@ describe('AppGlobalService', () => {
         });
     });
 
-    // describe('showCouchMarkScreen()', () => {
-    //     it('should skip showig coachmark screen if "skipCoachScreenForDeeplink" is true', () => {
-    //         // arrange
-    //         appGlobalService.skipCoachScreenForDeeplink = true;
-    //         // act
-    //         appGlobalService.showCouchMarkScreen().then(() => {
-    //             // assert
-    //             expect(appGlobalService.skipCoachScreenForDeeplink).toEqual(false);
-    //         });
-    //     });
-    //
-    //     it('should save the onboarding completed flag if user is not logged in and display coach screen', (done) => {
-    //         // arrange
-    //         appGlobalService.skipCoachScreenForDeeplink = false;
-    //         mockPreferences.getBoolean = jest.fn(() => of(false));
-    //         mockAppVersion.getAppName = jest.fn(() => Promise.resolve('appname'));
-    //         mockEvent.publish = jest.fn();
-    //         mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
-    //         mockPreferences.putBoolean = jest.fn(() => of(undefined));
-    //         // act
-    //         appGlobalService.showCouchMarkScreen().then(() => {
-    //             // assert
-    //             expect(mockEvent.publish).toHaveBeenCalledWith(EventTopics.COACH_MARK_SEEN,
-    //                 { showWalkthroughBackDrop: true, appName: 'appname' });
-    //             expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalled();
-    //             expect(mockPreferences.putBoolean).toHaveBeenCalledWith(PreferenceKey.COACH_MARK_SEEN, true);
-    //             done();
-    //         });
-    //     });
-    //
-    //     it('should not show the coach mark screen if it is already shown', (done) => {
-    //         // arrange
-    //         appGlobalService.skipCoachScreenForDeeplink = false;
-    //         mockPreferences.getBoolean = jest.fn(() => of(true));
-    //         // act
-    //         appGlobalService.showCouchMarkScreen().then(() => {
-    //             // assert
-    //             done();
-    //         });
-    //     });
-    // });
+    describe('showTutorialWalkthrough()', () => {
+        it('should skip showing tutorialScreen screen if "skipCoachScreenForDeeplink" is true', () => {
+            // arrange
+            appGlobalService.skipCoachScreenForDeeplink = true;
+            // act
+            appGlobalService.showTutorialScreen().then(() => {
+                // assert
+                expect(appGlobalService.skipCoachScreenForDeeplink).toEqual(false);
+            });
+        });
+
+        it('should save the onboarding completed flag if user is not logged in and display coach screen', (done) => {
+            // arrange
+            appGlobalService.skipCoachScreenForDeeplink = false;
+            mockPreferences.getBoolean = jest.fn(() => of(false));
+            mockAppVersion.getAppName = jest.fn(() => Promise.resolve('appname'));
+            mockPreferences.putBoolean = jest.fn(() => of(undefined));
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { continueClicked: false } }))
+            } as any)));
+            // act
+            appGlobalService.showTutorialScreen().then(() => {
+                // assert
+                setTimeout(() => {
+                    expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                    done();
+
+                }, 0);
+                expect(mockPreferences.putBoolean).toHaveBeenCalledWith(PreferenceKey.COACH_MARK_SEEN, true);
+            });
+        });
+
+        it('should generate close clicked after user sees the walkthrough screen', (done) => {
+            // arrange
+            appGlobalService.skipCoachScreenForDeeplink = false;
+            mockPreferences.getBoolean = jest.fn(() => of(false));
+            mockAppVersion.getAppName = jest.fn(() => Promise.resolve('appname'));
+            mockPreferences.putBoolean = jest.fn(() => of(undefined));
+            mockPopoverCtrl.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: { continueClicked: true } }))
+            } as any)));
+            // act
+            appGlobalService.showTutorialScreen().then(() => {
+                // assert
+                setTimeout(() => {
+                    expect(mockPopoverCtrl.create).toHaveBeenCalled();
+                    done();
+                }, 0);
+                expect(mockPreferences.putBoolean).toHaveBeenCalledWith(PreferenceKey.COACH_MARK_SEEN, true);
+            });
+        });
+
+        it('should not show the coach mark screen if it is already shown', (done) => {
+            // arrange
+            appGlobalService.skipCoachScreenForDeeplink = false;
+            mockPreferences.getBoolean = jest.fn(() => of(true));
+            // act
+            appGlobalService.showTutorialScreen().then(() => {
+                // assert
+                done();
+            });
+        });
+    });
 
     describe('getSelectedUser()', () => {
         it('should return the selectedUser', () => {
@@ -696,6 +722,30 @@ describe('AppGlobalService', () => {
         });
     });
 
+    describe('setpdfPlayerConfiguration()', () => {
+        it('should set pdf player Config', () => {
+            appGlobalService.setpdfPlayerconfiguration(true);
+            expect(appGlobalService.pdfPlayerConfiguratiion).toEqual(true);
+        });
+    });
+
+    describe('getPdfPlayerConfiguration()', () => {
+        it('should return pdf player config', () => {
+            appGlobalService.getPdfPlayerConfiguration();
+            expect(appGlobalService.pdfPlayerConfiguratiion).toBeTruthy();
+        });
+    });
+
+    describe('RootOrganizations()', () => {
+        it('should return cached location config', () => {
+            // arrange
+            appGlobalService.setRootOrganizations([]);
+            // act
+            // assert
+            expect(appGlobalService.getCachedRootOrganizations()).toEqual([]);
+        });
+    });
+
     describe('getGuestUserInfo()', () => {
         it('should return  profileType STUDENT', (done) => {
             // arrange
@@ -856,11 +906,11 @@ describe('AppGlobalService', () => {
         it('should show force upgrade popup with shouldDismissAlert as false if type is force', () => {
             // arrange
             // act
-            appGlobalService.openPopover({type: 'force'});
+            appGlobalService.openPopover({ type: 'force' });
             // assert
             expect(mockPopoverCtrl.create).toHaveBeenCalledWith({
                 component: UpgradePopoverComponent,
-                componentProps: { upgrade: {type: 'force'} },
+                componentProps: { upgrade: { type: 'force' } },
                 cssClass: 'upgradePopover',
                 showBackdrop: true,
                 backdropDismiss: false
@@ -870,11 +920,11 @@ describe('AppGlobalService', () => {
         it('should show force upgrade popup with shouldDismissAlert as false if type is forced', () => {
             // arrange
             // act
-            appGlobalService.openPopover({type: 'forced'});
+            appGlobalService.openPopover({ type: 'forced' });
             // assert
             expect(mockPopoverCtrl.create).toHaveBeenCalledWith({
                 component: UpgradePopoverComponent,
-                componentProps: { upgrade: {type: 'forced'} },
+                componentProps: { upgrade: { type: 'forced' } },
                 cssClass: 'upgradePopover',
                 showBackdrop: true,
                 backdropDismiss: false
@@ -884,15 +934,64 @@ describe('AppGlobalService', () => {
         it('should show force upgrade popup with shouldDismissAlert as true if type is optional', () => {
             // arrange
             // act
-            appGlobalService.openPopover({type: 'optional'});
+            appGlobalService.openPopover({ type: 'optional' });
             // assert
             expect(mockPopoverCtrl.create).toHaveBeenCalledWith({
                 component: UpgradePopoverComponent,
-                componentProps: { upgrade: {type: 'optional'} },
+                componentProps: { upgrade: { type: 'optional' } },
                 cssClass: 'upgradePopover',
                 showBackdrop: true,
                 backdropDismiss: true
             });
         });
     });
+
+    describe('isNativePopupVisible', () => {
+        it('should return the isNativePopupVisible', () => {
+            // arrange
+            appGlobalService.isNativePopupVisible = true;
+
+            // act
+            // assert
+            expect(appGlobalService.isNativePopupVisible).toBeTruthy();
+
+        });
+    });
+
+    describe('isNativePopupVisible', () => {
+        it('should return the isNativePopupVisible', () => {
+            // arrange
+            appGlobalService.isNativePopupVisible = true;
+
+            // act
+            // assert
+            expect(appGlobalService.isNativePopupVisible).toBeTruthy();
+
+        });
+    });
+
+    describe('setNativePopupVisible', () => {
+        it('should setNativePopupVisible property to false', () => {
+            // arrange
+            // act
+            appGlobalService.setNativePopupVisible(false);
+            // assert
+            expect(appGlobalService.isNativePopupVisible).toBeFalsy();
+
+        });
+
+        it('should setNativePopupVisible property to true', () => {
+            // arrange
+            jest.useFakeTimers();
+            // act
+            appGlobalService.setNativePopupVisible(true, 1);
+            // assert
+            jest.advanceTimersByTime(20);
+            expect(appGlobalService.isNativePopupVisible).toBeTruthy();
+            jest.useRealTimers();
+            jest.clearAllTimers();
+
+        });
+
+    });
 });
diff --git a/src/services/app-global-service.service.ts b/src/services/app-global-service.service.ts
index cf041722d..a1608a6c7 100644
--- a/src/services/app-global-service.service.ts
+++ b/src/services/app-global-service.service.ts
@@ -1,18 +1,25 @@
 import { Inject, Injectable, OnDestroy } from '@angular/core';
-import { Environment, ID, InteractSubtype, InteractType, PageId, ImpressionType, ImpressionSubtype } from './telemetry-constants';
-import { Events, PopoverController } from '@ionic/angular';
-import { GenericAppConfig, PreferenceKey, EventTopics } from '../app/app.constant';
-import { TelemetryGeneratorService } from './telemetry-generator.service';
+import { animationGrowInTopRight } from '@app/app/animations/animation-grow-in-top-right';
+import { animationShrinkOutTopRight } from '@app/app/animations/animation-shrink-out-top-right';
+import { UpgradePopoverComponent } from '@app/app/components/popups';
+import { JoyfulThemePopupComponent } from '@app/app/components/popups/joyful-theme-popup/joyful-theme-popup.component';
+import { SbTutorialPopupComponent } from '@app/app/components/popups/sb-tutorial-popup/sb-tutorial-popup.component';
+import { NewExperiencePopupComponent } from '@app/app/components/popups/new-experience-popup/new-experience-popup.component';
+import { EventParams } from '@app/app/components/sign-in-card/event-params.interface';
+import { AppVersion } from '@ionic-native/app-version/ngx';
+import { PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { Observable, Observer } from 'rxjs';
 import {
     AuthService, Course, Framework, FrameworkCategoryCodesGroup, FrameworkDetailsRequest, FrameworkService,
-    OAuthSession, Profile, ProfileService, ProfileType, SharedPreferences
+    OAuthSession, Profile, ProfileService, ProfileSession, ProfileType, SharedPreferences
 } from 'sunbird-sdk';
-import { UtilityService } from './utility-service';
-import { ProfileConstants } from '../app/app.constant';
-import { Observable, Observer } from 'rxjs';
+import { AppThemes, GenericAppConfig, PreferenceKey, ProfileConstants } from '../app/app.constant';
 import { PermissionAsked } from './android-permissions/android-permission';
-import { UpgradePopoverComponent } from '@app/app/components/popups';
-import { AppVersion } from '@ionic-native/app-version/ngx';
+import { Environment, ID, InteractSubtype, InteractType, PageId } from './telemetry-constants';
+import { TelemetryGeneratorService } from './telemetry-generator.service';
+import { UtilityService } from './utility-service';
+import { YearOfBirthPopupComponent } from '@app/app/components/popups/year-of-birth-popup/year-of-birth-popup.component';
 
 @Injectable({
     providedIn: 'root'
@@ -56,6 +63,7 @@ export class AppGlobalService implements OnDestroy {
     courseFrameworkId: string;
 
     currentPageId: string;
+    pdfPlayerConfiguratiion: boolean;
 
     guestUserProfile: Profile;
     isGuestUser = false;
@@ -74,6 +82,15 @@ export class AppGlobalService implements OnDestroy {
     private isJoinTraningOnboarding: any;
     private _signinOnboardingLoader: any;
     private _skipCoachScreenForDeeplink = false;
+    private _preSignInData: any;
+    private _generateCourseCompleteTelemetry = false;
+    private _generateCourseUnitCompleteTelemetry = false;
+    private _showCourseCompletePopup = false;
+    private _formConfig: any;
+    private _selectedActivityCourseId: string;
+    private _redirectUrlAfterLogin: string;
+    private _isNativePopupVisible: boolean;
+    private _isDiscoverBackEnabled: boolean = false;
 
     constructor(
         @Inject('PROFILE_SERVICE') private profile: ProfileService,
@@ -147,6 +164,15 @@ export class AppGlobalService implements OnDestroy {
         return name;
     }
 
+
+    setpdfPlayerconfiguration(config) {
+        this.pdfPlayerConfiguratiion = config;
+    }
+
+    getPdfPlayerConfiguration() {
+        return this.pdfPlayerConfiguratiion;
+    }
+
     /**
      * This method stores the list of courses enrolled by user, and is updated every time
      * getEnrolledCourses is called.
@@ -194,7 +220,7 @@ export class AppGlobalService implements OnDestroy {
      * This method stores the location config, for a particular session of the app
      */
     setLocationConfig(locationConfig: Array<any>) {
-        this.courseFilterConfig = locationConfig;
+        this.locationConfig = locationConfig;
     }
 
     /**
@@ -322,10 +348,10 @@ export class AppGlobalService implements OnDestroy {
             });
         this.utilityService.getBuildConfigValue(GenericAppConfig.CONTENT_STREAMING_ENABLED)
             .then(response => {
-                this.CONTENT_STREAMING_ENABLED = response === 'true' ? true : false;
+                this.CONTENT_STREAMING_ENABLED =  true
             })
             .catch(error => {
-                this.CONTENT_STREAMING_ENABLED = false;
+                this.CONTENT_STREAMING_ENABLED = true;
             });
 
         this.utilityService.getBuildConfigValue(GenericAppConfig.DISPLAY_ONBOARDING_CATEGORY_PAGE)
@@ -359,55 +385,60 @@ export class AppGlobalService implements OnDestroy {
         }
     }
 
-    private initValues() {
+    private initValues(eventParams?: EventParams) {
         this.readConfig();
-
-        this.authService.getSession().toPromise().then((session) => {
-            if (!session) {
-                this.isGuestUser = true;
-                this.session = session;
-                this.getGuestUserInfo();
-            } else {
-                this.guestProfileType = undefined;
-                this.isGuestUser = false;
-                this.session = session;
-            }
-            this.getCurrentUserProfile();
-        });
-
+        /* to make sure there are no duplicate calls to getSession and profile setting
+         * from login flow only eventParams are received via events
+         */
+        if (!eventParams || (eventParams && !eventParams.skipSession)) {
+            this.authService.getSession().toPromise().then((session) => {
+                if (!session) {
+                    this.isGuestUser = true;
+                    this.session = session;
+                    this.getGuestUserInfo();
+                } else {
+                    this.guestProfileType = undefined;
+                    this.isGuestUser = false;
+                    this.session = session;
+                }
+                this.getCurrentUserProfile(eventParams);
+            });
+        }
         this.preferences.getString(PreferenceKey.IS_ONBOARDING_COMPLETED).toPromise()
             .then((result) => {
                 this.isOnBoardingCompleted = (result === 'true') ? true : false;
             });
     }
 
-    private getCurrentUserProfile() {
-        this.profile.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS }).toPromise()
-            .then((response: Profile) => {
-                this.guestUserProfile = response;
-                if (this.guestUserProfile.syllabus && this.guestUserProfile.syllabus.length > 0) {
-                    this.getFrameworkDetails(this.guestUserProfile.syllabus[0])
-                        .then((categories) => {
-                            categories.forEach(category => {
-                                this.frameworkData[category.code] = category;
+    private getCurrentUserProfile(eventParams?: EventParams) {
+        if (!eventParams || (eventParams && !eventParams.skipProfile)) {
+            this.profile.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS }).toPromise()
+                .then((response: Profile) => {
+                    this.guestUserProfile = response;
+                    if (this.guestUserProfile.syllabus && this.guestUserProfile.syllabus.length > 0) {
+                        this.getFrameworkDetails(this.guestUserProfile.syllabus[0])
+                            .then((categories) => {
+                                categories.forEach(category => {
+                                    this.frameworkData[category.code] = category;
+                                });
+
+                                this.event.publish(AppGlobalService.PROFILE_OBJ_CHANGED);
+                            }).catch(() => {
+                                this.frameworkData = [];
+                                this.event.publish(AppGlobalService.PROFILE_OBJ_CHANGED);
                             });
-
-                            this.event.publish(AppGlobalService.PROFILE_OBJ_CHANGED);
-                        }).catch(() => {
-                            this.frameworkData = [];
-                            this.event.publish(AppGlobalService.PROFILE_OBJ_CHANGED);
-                        });
-                    this.getProfileSettingsStatus();
-                } else {
-                    this.frameworkData = [];
+                        this.getProfileSettingsStatus();
+                    } else {
+                        this.frameworkData = [];
+                        this.event.publish(AppGlobalService.PROFILE_OBJ_CHANGED);
+                    }
+                })
+                .catch((error) => {
+                    console.error(error);
+                    this.guestUserProfile = undefined;
                     this.event.publish(AppGlobalService.PROFILE_OBJ_CHANGED);
-                }
-            })
-            .catch((error) => {
-                console.error(error);
-                this.guestUserProfile = undefined;
-                this.event.publish(AppGlobalService.PROFILE_OBJ_CHANGED);
-            });
+                });
+        }
     }
 
     // Remove this method after refactoring formandframeworkutil.service
@@ -438,6 +469,10 @@ export class AppGlobalService implements OnDestroy {
                             this.guestProfileType = ProfileType.TEACHER;
                         } else if (val === ProfileType.OTHER) {
                             this.guestProfileType = ProfileType.OTHER;
+                        } else if (val === ProfileType.ADMIN) {
+                            this.guestProfileType = ProfileType.ADMIN;
+                        } else if (val === ProfileType.PARENT) {
+                            this.guestProfileType = ProfileType.PARENT;
                         }
                         this.isGuestUser = true;
                         resolve(this.guestProfileType);
@@ -713,6 +748,86 @@ export class AppGlobalService implements OnDestroy {
         this._skipCoachScreenForDeeplink = value;
     }
 
+    get preSignInData() {
+        return this._preSignInData;
+    }
+    set preSignInData(value) {
+        this._preSignInData = value;
+    }
+
+    get generateCourseCompleteTelemetry() {
+        return this._generateCourseCompleteTelemetry;
+    }
+    set generateCourseCompleteTelemetry(value) {
+        this._generateCourseCompleteTelemetry = value;
+    }
+
+    get generateCourseUnitCompleteTelemetry() {
+        return this._generateCourseUnitCompleteTelemetry;
+    }
+    set generateCourseUnitCompleteTelemetry(value) {
+        this._generateCourseUnitCompleteTelemetry = value;
+    }
+
+    get showCourseCompletePopup() {
+        return this._showCourseCompletePopup;
+    }
+
+    set showCourseCompletePopup(value) {
+        this._showCourseCompletePopup = value;
+    }
+
+    get formConfig() {
+        return this._formConfig;
+    }
+
+    set formConfig(value) {
+        this._formConfig = value;
+    }
+
+    get selectedActivityCourseId() {
+        return this._selectedActivityCourseId;
+    }
+
+    set selectedActivityCourseId(value) {
+        this._selectedActivityCourseId = value;
+    }
+
+    get redirectUrlAfterLogin() {
+        return this._redirectUrlAfterLogin;
+    }
+
+    set redirectUrlAfterLogin(value) {
+        this._redirectUrlAfterLogin = value;
+    }
+
+    get isNativePopupVisible() {
+        return this._isNativePopupVisible;
+    }
+
+    set isNativePopupVisible(value) {
+        this._isNativePopupVisible = value;
+    }
+
+    get isDiscoverBackEnabled() {
+        return this._isDiscoverBackEnabled;
+    }
+
+    set isDiscoverBackEnabled(value) {
+        this._isDiscoverBackEnabled = value;
+    }
+
+    setNativePopupVisible(value, timeOut?) {
+        if (timeOut) {
+            setTimeout(() => {
+                this._isNativePopupVisible = value;
+            }, timeOut);
+        } else {
+            this._isNativePopupVisible = value;
+        }
+    }
+
+
     // This method is used to reset if any quiz content data is previously saved before Joining a Training
     // So it wont affect in the exterId verification page
     resetSavedQuizContent() {
@@ -726,23 +841,90 @@ export class AppGlobalService implements OnDestroy {
         }
     }
 
-    async showCouchMarkScreen() {
+    async showTutorialScreen() {
         if (this.skipCoachScreenForDeeplink) {
             this.skipCoachScreenForDeeplink = false;
         } else {
-            const coachMarkSeen = await this.preferences.getBoolean(PreferenceKey.COACH_MARK_SEEN).toPromise();
-            if (!coachMarkSeen) {
+            const tutorialScreen = await this.preferences.getBoolean(PreferenceKey.COACH_MARK_SEEN).toPromise();
+            if (!tutorialScreen) {
                 const appLabel = await this.appVersion.getAppName();
-                this.event.publish(EventTopics.COACH_MARK_SEEN, { showWalkthroughBackDrop: true, appName: appLabel });
-                this.telemetryGeneratorService.generateImpressionTelemetry(
-                    ImpressionType.VIEW,
-                    ImpressionSubtype.QR_SCAN_WALKTHROUGH,
-                    PageId.LIBRARY,
-                    Environment.ONBOARDING
-                );
+                const tutorialPopover = await this.popoverCtrl.create({
+                    component: SbTutorialPopupComponent,
+                    componentProps: { appLabel },
+                    showBackdrop: true,
+                    backdropDismiss: false,
+                    enterAnimation: animationGrowInTopRight,
+                    leaveAnimation: animationShrinkOutTopRight
+                });
+                tutorialPopover.present();
                 this.preferences.putBoolean(PreferenceKey.COACH_MARK_SEEN, true).toPromise().then();
             }
         }
     }
 
+    async showJoyfulPopup() {
+        if (this.skipCoachScreenForDeeplink) {
+            this.skipCoachScreenForDeeplink = false;
+        } else {
+            const isPopupDisplayed = await this.preferences.getBoolean(PreferenceKey.IS_JOYFUL_THEME_POPUP_DISPLAYED).toPromise();
+            if (!isPopupDisplayed) {
+                const appLabel = await this.appVersion.getAppName();
+                const newThemePopover = await this.popoverCtrl.create({
+                    component: JoyfulThemePopupComponent,
+                    componentProps: { appLabel },
+                    backdropDismiss: false,
+                    showBackdrop: true,
+                    cssClass: 'sb-new-theme-popup'
+                });
+                newThemePopover.present();
+                this.preferences.putBoolean(PreferenceKey.IS_JOYFUL_THEME_POPUP_DISPLAYED, true).toPromise().then();
+            }
+            this.preferences.putBoolean(PreferenceKey.COACH_MARK_SEEN, true).toPromise().then();
+        }
+    }
+
+    async showNewTabsSwitchPopup() {
+        const isPopupDisplayed = await this.preferences.getString(PreferenceKey.SELECTED_SWITCHABLE_TABS_CONFIG).toPromise();
+        if (!isPopupDisplayed) {
+            const appLabel = await this.appVersion.getAppName();
+            const newThemePopover = await this.popoverCtrl.create({
+                component: NewExperiencePopupComponent,
+                componentProps: { appLabel },
+                backdropDismiss: false,
+                showBackdrop: true,
+                cssClass: 'sb-switch-new-experience-popup'
+            });
+            newThemePopover.present();
+        }
+    }
+
+    async getActiveProfileUid() {
+        let userId = '';
+        try {
+            const activeProfileSession: ProfileSession = await this.profile.getActiveProfileSession().toPromise();
+
+            userId = activeProfileSession.uid;
+            if (activeProfileSession.managedSession) {
+                userId = activeProfileSession.managedSession.uid;
+            }
+        } catch (e) {
+            console.error(e);
+        }
+
+        return userId;
+    }
+
+    async showYearOfBirthPopup(userProfile) {
+        if (userProfile && !userProfile.managedBy && !userProfile.dob) {
+            const newThemePopover = await this.popoverCtrl.create({
+                component: YearOfBirthPopupComponent,
+                componentProps: {   },
+                backdropDismiss: false,
+                showBackdrop: true,
+                cssClass: 'year-of-birth-popup'
+            });
+            newThemePopover.present();
+        }
+    }
+
 }
diff --git a/src/services/app-header.service.spec.ts b/src/services/app-header.service.spec.ts
new file mode 100644
index 000000000..93f5ec2a5
--- /dev/null
+++ b/src/services/app-header.service.spec.ts
@@ -0,0 +1,144 @@
+import {AppHeaderService} from './app-header.service';
+import {MenuController} from '@ionic/angular';
+import {StatusBar} from '@ionic-native/status-bar/ngx';
+import {SharedPreferences} from 'sunbird-sdk';
+import {of} from 'rxjs';
+
+describe('AppHeaderService', () => {
+    let appHeaderService: AppHeaderService;
+
+    const mockMenuCtrl: Partial<MenuController> = {};
+    const mockStatusBar: Partial<StatusBar> = {};
+    const mockSharedPreferences: Partial<SharedPreferences> = {};
+
+    beforeAll(() => {
+        appHeaderService = new AppHeaderService(
+            mockMenuCtrl as MenuController,
+            mockStatusBar as StatusBar,
+            mockSharedPreferences as SharedPreferences
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should create instance of appHeaderService', () => {
+        // assert
+        expect(appHeaderService).toBeTruthy();
+    });
+
+    it('sidebarEvent', () => {
+        // act
+        appHeaderService.sidebarEvent('event_name');
+    });
+
+    it('sideMenuItemEvents', () => {
+        // act
+        appHeaderService.sideMenuItemEvents('some_event');
+    });
+
+    it('getDefaultPageConfig', () => {
+        // act
+        appHeaderService.getDefaultPageConfig();
+    });
+
+    it('hideHeader', () => {
+        // arrange
+        mockMenuCtrl.enable = jest.fn(() => (Promise.resolve(undefined)));
+
+        // act
+        appHeaderService.hideHeader();
+
+        // assert
+        expect(mockMenuCtrl.enable).toHaveBeenCalledWith(false);
+    });
+
+    describe('showHeaderWithBackButton', () => {
+        it('should called without iconList', () => {
+            // arrange
+            mockMenuCtrl.enable = jest.fn(() => (Promise.resolve(undefined)));
+
+            // act
+            appHeaderService.showHeaderWithBackButton();
+
+            // assert
+            expect(mockMenuCtrl.enable).toHaveBeenCalledWith(false);
+        });
+
+        it('should called with iconList', () => {
+            // arrange
+            mockMenuCtrl.enable = jest.fn(() => (Promise.resolve(undefined)));
+
+            // act
+            appHeaderService.showHeaderWithBackButton(['some_icon']);
+
+            // assert
+            expect(mockMenuCtrl.enable).toHaveBeenCalledWith(false);
+        });
+    });
+
+    describe('showHeaderWithHomeButton', () => {
+        it('should called without iconList', () => {
+            // arrange
+            mockMenuCtrl.enable = jest.fn(() => (Promise.resolve(undefined)));
+
+            // act
+            appHeaderService.showHeaderWithHomeButton();
+
+            // assert
+            expect(mockMenuCtrl.enable).toHaveBeenCalledWith(true);
+        });
+
+        it('should called with iconList', () => {
+            // arrange
+            mockMenuCtrl.enable = jest.fn(() => (Promise.resolve(undefined)));
+
+            // act
+            appHeaderService.showHeaderWithHomeButton(['some_icon']);
+
+            // assert
+            expect(mockMenuCtrl.enable).toHaveBeenCalledWith(true);
+        });
+    });
+
+    it('updatePageConfig', () => {
+        // act
+        const mockConfig = {
+            showHeader: true,
+            showBurgerMenu: true,
+            pageTitle: '',
+            actionButtons: ['search'],
+        };
+        appHeaderService.updatePageConfig(mockConfig);
+    });
+
+    it('should set background color of statusbar', (done) => {
+        mockStatusBar.backgroundColorByHexString = jest.fn();
+        mockSharedPreferences.getString = jest.fn(() => of('JOYFUL'));
+        const selectedTheme = getComputedStyle(document.querySelector('html')).getPropertyValue('--joyful-warning');
+
+        appHeaderService.showStatusBar().then(() => {
+            expect(mockStatusBar.backgroundColorByHexString).toHaveBeenCalledWith(selectedTheme);
+            done();
+        });
+
+    });
+
+    it('should theme is not joyful go to else part', () => {
+        mockStatusBar.backgroundColorByHexString = jest.fn();
+        mockSharedPreferences.getString = jest.fn(() => of('DEFAULT'));
+
+        appHeaderService.showStatusBar().then(() => {
+            expect(mockStatusBar.backgroundColorByHexString).not.toHaveBeenCalledWith('#FFD954');
+        });
+    });
+
+    it('should hide statusbar and set background color', () => {
+        mockStatusBar.backgroundColorByHexString = jest.fn();
+        appHeaderService.hideStatusBar();
+        expect(mockStatusBar.backgroundColorByHexString).toHaveBeenCalledWith('#BB000000');
+
+    });
+});
diff --git a/src/services/app-header.service.ts b/src/services/app-header.service.ts
index 49b29bb45..db5aaf940 100644
--- a/src/services/app-header.service.ts
+++ b/src/services/app-header.service.ts
@@ -1,11 +1,18 @@
-import { Injectable } from '@angular/core';
-import { Subject } from 'rxjs';
-import { MenuController } from '@ionic/angular';
+import {Inject, Injectable} from '@angular/core';
+import {Subject} from 'rxjs';
+import {MenuController} from '@ionic/angular';
+import {StatusBar} from '@ionic-native/status-bar/ngx';
+import {SharedPreferences} from 'sunbird-sdk';
+import {AppThemes, StatusBarTheme,AppMode} from '@app/app/app.constant';
 
 @Injectable()
 export class AppHeaderService {
 
-    constructor(private menuCtrl: MenuController) { }
+    constructor(private menuCtrl: MenuController,
+                private statusBar: StatusBar,
+                @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences
+    ) {
+    }
 
     private headerEvent = new Subject<any>();
     headerEventEmitted$ = this.headerEvent.asObservable();
@@ -29,6 +36,8 @@ export class AppHeaderService {
         const defaultConfig = {
             showHeader: true,
             showBurgerMenu: true,
+            showKebabMenu: false,
+            kebabMenuOptions: [],
             pageTitle: '',
             actionButtons: ['search'],
         };
@@ -66,4 +75,25 @@ export class AppHeaderService {
     updatePageConfig(config) {
         this.headerConfig.next(config);
     }
+
+    async showStatusBar() {
+        const theme = await this.preferences.getString('current_selected_theme').toPromise();
+        if (theme === 'JOYFUL') {
+            document.querySelector('html').setAttribute('data-theme', AppThemes.JOYFUL);
+            document.querySelector('html').setAttribute('device-accessable-theme','accessible' );
+            const themeColor = getComputedStyle(document.querySelector('html')).getPropertyValue('--app-primary-header');
+            this.statusBar.backgroundColorByHexString(themeColor);      
+        }
+        const mode = await this.preferences.getString('data-mode').toPromise();
+        if(mode===AppMode.DARKMODE){
+            document.querySelector('html').setAttribute('data-mode',AppMode.DARKMODE);
+        }else{
+            document.querySelector('html').setAttribute('data-mode',AppMode.DEFAULT);
+        }
+        
+    }
+
+    hideStatusBar() {
+        this.statusBar.backgroundColorByHexString(StatusBarTheme.SET_DEFAULT);
+    }
 }
diff --git a/src/services/app-rating.service.spec.ts b/src/services/app-rating.service.spec.ts
new file mode 100644
index 000000000..f2fc5ced9
--- /dev/null
+++ b/src/services/app-rating.service.spec.ts
@@ -0,0 +1,148 @@
+import { AppRatingService } from './app-rating.service';
+import { SharedPreferences } from 'sunbird-sdk';
+import { File } from '@ionic-native/file/ngx';
+import { PreferenceKey, StoreRating } from '../app/app.constant';
+import { of } from 'rxjs';
+
+describe('AppRatingService', () => {
+    let appRatingService: AppRatingService;
+
+    const mockSharedPreferences: Partial<SharedPreferences> = {};
+    const mockFile: Partial<File> = {};
+
+    beforeAll(() => {
+        appRatingService = new AppRatingService(
+            mockSharedPreferences as SharedPreferences,
+            mockFile as File
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should create instance of AppRatingService', () => {
+        // assert
+        expect(appRatingService).toBeTruthy();
+    });
+
+    describe('checkInitialDate', () => {
+        it('should set intitial date if not set', (done) => {
+            // arragne
+            mockSharedPreferences.getString = jest.fn((arg) => {
+                let value;
+                switch (arg) {
+                    case PreferenceKey.APP_RATING_DATE:
+                        value = undefined;
+                        break;
+                }
+                return of(value);
+            });
+            mockSharedPreferences.putString = jest.fn(() => of(undefined));
+
+            // act
+            appRatingService.checkInitialDate();
+
+            // assert
+            setTimeout(() => {
+                expect(mockSharedPreferences.getString).toHaveBeenCalledWith(PreferenceKey.APP_RATING_DATE);
+                // expect(mockSharedPreferences.putString).toBeCalledWith(PreferenceKey.APP_RATING_DATE, '');
+                done();
+            }, 0);
+        });
+
+        it('should not intitial date if already set', (done) => {
+            // arragne
+            mockSharedPreferences.getString = jest.fn((arg) => {
+                let value;
+                switch (arg) {
+                    case PreferenceKey.APP_RATING_DATE:
+                        value = 'some_date';
+                        break;
+                }
+                return of(value);
+            });
+
+            // act
+            appRatingService.checkInitialDate();
+
+            // assert
+            setTimeout(() => {
+                expect(mockSharedPreferences.getString).toHaveBeenCalledWith(PreferenceKey.APP_RATING_DATE);
+                done();
+            }, 0);
+        });
+    });
+
+    it('setEndStoreRate', (done) => {
+        // arrange
+        mockFile.createDir = jest.fn(() => (Promise.resolve(undefined)));
+        mockFile.writeFile = jest.fn(() => (Promise.resolve(undefined)));
+
+        // act
+        appRatingService.setEndStoreRate(1);
+
+        // assert
+        setTimeout(() => {
+            expect(mockFile.createDir).toHaveBeenCalledWith(undefined, StoreRating.FOLDER_NAME, true);
+            expect(mockFile.writeFile).toHaveBeenCalledWith(
+                undefined + '/' + StoreRating.FOLDER_NAME,
+                StoreRating.FILE_NAME, StoreRating.FILE_TEXT + ' = ' + 1,
+                { replace: true }
+            );
+            done();
+        }, 0);
+    });
+
+    describe('rateLaterClickedCount', () => {
+        it('should set increaseRateLaterClickedCount to 1 if not set', (done) => {
+            // arragne
+            mockSharedPreferences.getString = jest.fn((arg) => {
+                let value;
+                switch (arg) {
+                    case PreferenceKey.APP_RATE_LATER_CLICKED:
+                        value = undefined;
+                        break;
+                }
+                return of(value);
+            });
+            mockSharedPreferences.putString = jest.fn(() => of(undefined));
+
+            // act
+            appRatingService.rateLaterClickedCount();
+
+            // assert
+            setTimeout(() => {
+                expect(mockSharedPreferences.getString).toHaveBeenCalledWith(PreferenceKey.APP_RATE_LATER_CLICKED);
+                expect(mockSharedPreferences.putString).toBeCalledWith(PreferenceKey.APP_RATE_LATER_CLICKED, '1');
+                done();
+            }, 0);
+        });
+
+        it('should set increaseRateLaterClickedCount to +1 if set', (done) => {
+            // arragne
+            mockSharedPreferences.getString = jest.fn((arg) => {
+                let value;
+                switch (arg) {
+                    case PreferenceKey.APP_RATE_LATER_CLICKED:
+                        value = 2;
+                        break;
+                }
+                return of(value);
+            });
+            mockSharedPreferences.putString = jest.fn(() => of(undefined));
+
+            // act
+            appRatingService.rateLaterClickedCount();
+
+            // assert
+            setTimeout(() => {
+                expect(mockSharedPreferences.getString).toHaveBeenCalledWith(PreferenceKey.APP_RATE_LATER_CLICKED);
+                expect(mockSharedPreferences.putString).toBeCalledWith(PreferenceKey.APP_RATE_LATER_CLICKED, '3');
+                done();
+            }, 0);
+        });
+    });
+
+});
diff --git a/src/services/app-rating.service.ts b/src/services/app-rating.service.ts
index 05a8c0b2a..da8fe13c9 100644
--- a/src/services/app-rating.service.ts
+++ b/src/services/app-rating.service.ts
@@ -6,7 +6,6 @@ import { File } from '@ionic-native/file/ngx';
 @Injectable()
 export class AppRatingService {
 
-  private rateLaterClickCount = 0;
   constructor(
     @Inject('SHARED_PREFERENCES') private preference: SharedPreferences,
     private fileCtrl: File
@@ -20,7 +19,7 @@ export class AppRatingService {
     });
   }
 
-  setInitialDate() {
+  private setInitialDate() {
     const presentDate = window.dayjs().format();
     this.preference.putString(PreferenceKey.APP_RATING_DATE, String(presentDate)).toPromise().then();
   }
@@ -29,29 +28,23 @@ export class AppRatingService {
     this.createFolder(rate);
   }
 
-  createFolder(rate) {
+  private createFolder(rate) {
     this.fileCtrl.createDir(cordova.file.dataDirectory, StoreRating.FOLDER_NAME, true)
       .then(() => {
         this.writeFile(rate);
       });
   }
 
-  writeFile(rate) {
+  private writeFile(rate) {
     this.fileCtrl.writeFile(cordova.file.dataDirectory + '/' + StoreRating.FOLDER_NAME,
       StoreRating.FILE_NAME, StoreRating.FILE_TEXT + ' = ' + rate, { replace: true }).then(() => { });
   }
 
-  checkReadFile() {
-    return this.fileCtrl.readAsText(cordova.file.dataDirectory + '/' + StoreRating.FOLDER_NAME,
-      StoreRating.FILE_NAME).then(() => { return true; }).catch(() => { return false; });
-  }
   async rateLaterClickedCount() {
-    return this.rateLaterClickCount = await this.checkRateLaterCount();
-  }
-  async increaseRateLaterClickedCount(value) {
-    return this.preference.putString(PreferenceKey.APP_RATE_LATER_CLICKED, String(value)).toPromise().then(() => value);
+    return await this.checkRateLaterCount();
   }
-  async checkRateLaterCount() {
+
+  private async checkRateLaterCount() {
     return this.preference.getString(PreferenceKey.APP_RATE_LATER_CLICKED).toPromise().then(async (val) => {
       if (val) {
         const incrementValue = Number(val) + 1;
@@ -61,4 +54,8 @@ export class AppRatingService {
       return this.increaseRateLaterClickedCount(1);
     });
   }
+
+  private async increaseRateLaterClickedCount(value) {
+    return this.preference.putString(PreferenceKey.APP_RATE_LATER_CLICKED, String(value)).toPromise().then(() => value);
+  }
 }
diff --git a/src/services/canvas-player.service.spec.ts b/src/services/canvas-player.service.spec.ts
index 7d0533302..170580bde 100644
--- a/src/services/canvas-player.service.spec.ts
+++ b/src/services/canvas-player.service.spec.ts
@@ -1,6 +1,6 @@
 import {CanvasPlayerService} from '@app/services/canvas-player.service';
 import {HttpClient} from '@angular/common/http';
-import {Events} from '@ionic/angular';
+import {Events} from '@app/util/events';
 import {of} from 'rxjs';
 import {ContentFeedbackService, ContentService, ProfileService, SunbirdSdk, TelemetryService} from 'sunbird-sdk';
 
diff --git a/src/services/canvas-player.service.ts b/src/services/canvas-player.service.ts
index b249f03c7..e084aebb3 100644
--- a/src/services/canvas-player.service.ts
+++ b/src/services/canvas-player.service.ts
@@ -1,9 +1,11 @@
-import { Injectable } from '@angular/core';
-import { SunbirdSdk } from 'sunbird-sdk';
+import { Inject, Injectable } from '@angular/core';
+import { ContentStateResponse, GetContentStateRequest, SunbirdSdk, SharedPreferences } from 'sunbird-sdk';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import * as X2JS from 'x2js';
-import { ProfileConstants } from '@app/app/app.constant';
-import { Events } from '@ionic/angular';
+import {MaxAttempt, PreferenceKey, ProfileConstants} from '@app/app/app.constant';
+import { Events } from '@app/util/events';
+import { LocalCourseService } from './local-course.service';
+import { CommonUtilService } from './common-util.service';
 
 declare global {
     interface Window {
@@ -13,7 +15,14 @@ declare global {
 @Injectable()
 
 export class CanvasPlayerService {
-    constructor(private _http: HttpClient, private events: Events) { }
+    constructor(
+        private _http: HttpClient,
+        private events: Events,
+        @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
+        private localCourseService: LocalCourseService,
+        private commonUtilService: CommonUtilService,
+    ) { }
+
     /**
      * This is the globally available method used by player to communicate with mobile
      */
@@ -58,6 +67,38 @@ export class CanvasPlayerService {
                     break;
                 case 'send':
                     return SunbirdSdk.instance.telemetryService.saveTelemetry(params[0]).subscribe();
+                case 'checkMaxLimit':
+                    const content = params[0];
+                    return this.preferences.getString(PreferenceKey.CONTENT_CONTEXT).toPromise()
+                        .then(async (context: string) => {
+                            if (!context) {
+                                return {
+                                    isLastAttempt: false,
+                                    limitExceeded: false,
+                                    isCloseButtonClicked: false
+                                };
+                            }
+                            const courseContext = JSON.parse(context);
+                            let maxAttempt: MaxAttempt;
+                            if (courseContext.courseId && courseContext.batchId && courseContext.leafNodeIds) {
+                                const getContentStateRequest: GetContentStateRequest = {
+                                    userId: courseContext.userId,
+                                    courseId: courseContext.courseId,
+                                    contentIds: courseContext.leafNodeIds,
+                                    returnRefreshedContentStates: true,
+                                    batchId: courseContext.batchId,
+                                    fields: ['progress', 'score']
+                                };
+
+                                const contentStateResponse: ContentStateResponse = await SunbirdSdk.instance.courseService
+                                    .getContentState(getContentStateRequest).toPromise();
+
+                                const assessmentStatus = this.localCourseService.fetchAssessmentStatus(contentStateResponse, content);
+
+                                maxAttempt = await this.commonUtilService.handleAssessmentStatus(assessmentStatus);
+                            }
+                            return maxAttempt;
+                        });
                 default:
                     console.log('Please use valid method');
             }
diff --git a/src/services/collection.service.spec.ts b/src/services/collection.service.spec.ts
new file mode 100644
index 000000000..518e7818d
--- /dev/null
+++ b/src/services/collection.service.spec.ts
@@ -0,0 +1,80 @@
+import { of, throwError } from 'rxjs';
+import {
+  ContentService,
+} from 'sunbird-sdk';
+import { CollectionService,  } from './collection.service';
+import { CommonUtilService } from './common-util.service';
+
+
+describe('LocalCourseService', () => {
+  let collectionService: CollectionService;
+
+  const mockContentService: Partial<ContentService> = {};
+  const mockCommonUtilService: Partial<CommonUtilService> = {};
+
+  beforeAll(() => {
+    collectionService = new CollectionService(
+      mockContentService as ContentService,
+      mockCommonUtilService as CommonUtilService,
+    );
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should create an instance of collectionService', () => {
+    expect(collectionService).toBeTruthy();
+  });
+
+  describe('fetchCollectionData', () => {
+    it('should fetch content heirarchy if data not available locally', (done) => {
+        // arrange
+        mockCommonUtilService.networkInfo = {
+          isNetworkAvailable: false
+        };
+        const contentDetails = {
+            isAvailableLocally : false
+        };
+        const courseHeirarchy = {
+            name: 'name',
+            identifier: 'id'
+        };
+        mockContentService.getContentDetails = jest.fn(() => of(contentDetails));
+        mockContentService.getContentHeirarchy = jest.fn(() => of(courseHeirarchy));
+        // act
+        collectionService.fetchCollectionData('id').then((res) => {
+            expect(res).toEqual(courseHeirarchy);
+            done();
+        });
+        // assert
+    });
+    it('should fetch content locally if data available locally', (done) => {
+        // arrange
+        const contentDetails = {
+            isAvailableLocally : true
+        };
+        const collection = {
+            name: 'name',
+            identifier: 'id'
+        };
+        mockContentService.getContentDetails = jest.fn(() => of(contentDetails));
+        mockContentService.getChildContents = jest.fn(() => of(collection));
+        // act
+        collectionService.fetchCollectionData('id').then((res) => {
+            expect(res).toEqual(collection);
+            done();
+        });
+        // assert
+    });
+    it('should handle error scenario', (done) => {
+        // arrange
+        mockContentService.getContentDetails = jest.fn(() => throwError(''));
+        // act
+        collectionService.fetchCollectionData('id').catch((err) => {
+            done();
+        });
+    });
+  });
+
+});
diff --git a/src/services/collection.service.ts b/src/services/collection.service.ts
new file mode 100644
index 000000000..7c05e68b5
--- /dev/null
+++ b/src/services/collection.service.ts
@@ -0,0 +1,47 @@
+import { Inject, Injectable } from '@angular/core';
+import { CommonUtilService } from '@app/services';
+import { ChildContentRequest, Content, ContentDetailRequest, ContentService } from 'sunbird-sdk';
+
+@Injectable()
+export class CollectionService {
+
+  constructor(
+    @Inject('CONTENT_SERVICE') private contentService: ContentService,
+    private commonUtilService: CommonUtilService
+  ) {
+  }
+
+  async fetchCollectionData(id): Promise<Content> {
+    const option: ContentDetailRequest = {
+      contentId: id,
+      attachFeedback: true,
+      emitUpdateIfAny: true,
+      attachContentAccess: true
+    };
+
+    try {
+      const data = await this.contentService.getContentDetails(option).toPromise();
+      if (this.commonUtilService.networkInfo.isNetworkAvailable || !data.isAvailableLocally) {
+        return this.getCourseHierarchy(option);
+      } else {
+        return this.getChildContents(id);
+      }
+    } catch (e) {
+      console.error(e);
+      throw e;
+    }
+  }
+
+  private async getCourseHierarchy(request: ContentDetailRequest): Promise<Content> {
+    return this.contentService.getContentHeirarchy(request).toPromise();
+  }
+
+  private async getChildContents(id): Promise<Content> {
+    const option: ChildContentRequest = {
+      contentId: id,
+      hierarchyInfo: null
+    };
+    return this.contentService.getChildContents(option).toPromise();
+  }
+
+}
diff --git a/src/services/coming-soon-message.service.spec.ts b/src/services/coming-soon-message.service.spec.ts
new file mode 100644
index 000000000..2b533e84f
--- /dev/null
+++ b/src/services/coming-soon-message.service.spec.ts
@@ -0,0 +1,242 @@
+import { ComingSoonMessageService } from './coming-soon-message.service';
+import {
+    Content,
+    ContentService,
+    SharedPreferences,
+    SystemSettingsService
+} from 'sunbird-sdk';
+import { ContentConstants } from '../app/app.constant';
+import { of } from 'rxjs';
+
+describe('ComingSoonMessageService', () => {
+    let comingSoonMessageService: ComingSoonMessageService;
+    const mockSharedPreferences: SharedPreferences = {};
+    const mockSystemSettingsService: SystemSettingsService = {};
+    const mockContentService: ContentService = {};
+
+    beforeAll(() => {
+        comingSoonMessageService = new ComingSoonMessageService(
+            mockSharedPreferences as SharedPreferences,
+            mockSystemSettingsService as SystemSettingsService,
+            mockContentService as ContentService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('Should create instatance', () => {
+        expect(comingSoonMessageService).toBeTruthy();
+    });
+
+    describe('getComingSoonMessage', () => {
+        it('should return translated coming soon message from  root content if available', (done) => {
+            // arrange
+            const content: Content = {
+                contentData: {
+                    altMsg: [{
+                        key: ContentConstants.COMING_SOON_MSG,
+                        value: 'some_message',
+                        translations: JSON.stringify({ en: 'some_translated_message' })
+                    }]
+                }
+            };
+            mockSharedPreferences.getString = jest.fn(() => of('en'));
+            // act
+            comingSoonMessageService.getComingSoonMessage(content)
+                .then((comingSoonMessage) => {
+                    // assert
+                    expect(comingSoonMessage).toBe('some_translated_message');
+                    done();
+                });
+        });
+
+        it('should return default coming soon message from root content if selected language translation is not available', (done) => {
+            // arrange
+            const content: Content = {
+                contentData: {
+                    altMsg: [{
+                        key: ContentConstants.COMING_SOON_MSG,
+                        value: 'some_message',
+                        translations: JSON.stringify({ mr: 'some_translated_message' })
+                    }]
+                }
+            };
+            mockSharedPreferences.getString = jest.fn(() => of('en'));
+            // act
+            comingSoonMessageService.getComingSoonMessage(content)
+                .then((comingSoonMessage) => {
+                    // assert
+                    expect(comingSoonMessage).toBe('some_message');
+                    done();
+                });
+        });
+
+        it('should return undefined if channel and altMsg are not available in child content', (done) => {
+            // arrange
+            const content: Content = {
+                contentData: {
+                    identifier: 'some_do_id'
+                },
+                hierarchyInfo: [
+                    {
+                        identifier: 'some_do_id'
+                    }
+                ]
+            };
+            const childContent = {
+                contentData: {
+                    identifier: 'some_do_id'
+                }
+            };
+            mockContentService.getChildContents = jest.fn(() => of(childContent));
+            mockSharedPreferences.getString = jest.fn(() => of('en'));
+            // act
+            comingSoonMessageService.getComingSoonMessage(content)
+                .then((comingSoonMessage) => {
+                    // assert
+                    expect(comingSoonMessage).toBe(undefined);
+                    done();
+                });
+        });
+
+        it('should return coming soon msg if available in child content', (done) => {
+            // arrange
+            const content: Content = {
+                contentData: {
+                    identifier: 'some_do_id'
+                },
+                hierarchyInfo: [
+                    {
+                        identifier: 'some_do_id'
+                    }
+                ]
+            };
+            const childContent = {
+                contentData: {
+                    identifier: 'some_do_id',
+                    altMsg: [{
+                        key: ContentConstants.COMING_SOON_MSG,
+                        value: 'some_message',
+                        translations: JSON.stringify({ en: 'some_translated_message' })
+                    }]
+                }
+            };
+            mockContentService.getChildContents = jest.fn(() => of(childContent));
+            mockSharedPreferences.getString = jest.fn(() => of('en'));
+            // act
+            comingSoonMessageService.getComingSoonMessage(content)
+                .then((comingSoonMessage) => {
+                    // assert
+                    expect(comingSoonMessage).toBe('some_translated_message');
+                    done();
+                });
+        });
+
+        it('should return undefined if tenant specific message is not available in system setting config', (done) => {
+            // arrange
+            const content: Content = {
+                contentData: {
+                    identifier: 'some_do_id'
+                },
+                hierarchyInfo: [
+                    {
+                        identifier: 'some_do_id'
+                    }
+                ]
+            };
+            const childContent = {
+                contentData: {
+                    identifier: 'some_do_id',
+                    channel: 'some_channel'
+                }
+            };
+            mockContentService.getChildContents = jest.fn(() => of(childContent));
+            mockSharedPreferences.getString = jest.fn(() => of('en'));
+            mockSystemSettingsService.getSystemSettings = jest.fn(() => of({
+                value: JSON.stringify([{ rootOrgId: 'some_another_channel' }])
+            }));
+            // act
+            comingSoonMessageService.getComingSoonMessage(content)
+                .then((comingSoonMessage) => {
+                    // assert
+                    expect(comingSoonMessage).toBe(undefined);
+                    done();
+                });
+        });
+
+        it('should return translated coming soon message if tenant specific message is available in system setting config', (done) => {
+            // arrange
+            const content: Content = {
+                contentData: {
+                    identifier: 'some_do_id'
+                },
+                hierarchyInfo: [
+                    {
+                        identifier: 'some_do_id'
+                    }
+                ]
+            };
+            const childContent = {
+                contentData: {
+                    identifier: 'some_do_id',
+                    channel: 'some_channel'
+                }
+            };
+            mockContentService.getChildContents = jest.fn(() => of(childContent));
+            mockSharedPreferences.getString = jest.fn(() => of('en'));
+            mockSystemSettingsService.getSystemSettings = jest.fn(() => of({
+                value: JSON.stringify([{
+                    rootOrgId: 'some_channel',
+                    translations: JSON.stringify({ en: 'some_translated_message' })
+                }])
+            }));
+            // act
+            comingSoonMessageService.getComingSoonMessage(content)
+                .then((comingSoonMessage) => {
+                    // assert
+                    expect(comingSoonMessage).toBe('some_translated_message');
+                    done();
+                });
+        });
+
+        it('should return default coming soon message if tenant specific message is available in system setting config '
+            + 'and if selected language translation is not available', (done) => {
+                // arrange
+                const content: Content = {
+                    contentData: {
+                        identifier: 'some_do_id'
+                    },
+                    hierarchyInfo: [
+                        {
+                            identifier: 'some_do_id'
+                        }
+                    ]
+                };
+                const childContent = {
+                    contentData: {
+                        identifier: 'some_do_id',
+                        channel: 'some_channel'
+                    }
+                };
+                mockContentService.getChildContents = jest.fn(() => of(childContent));
+                mockSharedPreferences.getString = jest.fn(() => of('en'));
+                mockSystemSettingsService.getSystemSettings = jest.fn(() => of({
+                    value: JSON.stringify([{
+                        rootOrgId: 'some_channel',
+                        value: 'some_message',
+                        translations: JSON.stringify({ hi: 'some_translated_message' })
+                    }])
+                }));
+                // act
+                comingSoonMessageService.getComingSoonMessage(content)
+                    .then((comingSoonMessage) => {
+                        // assert
+                        expect(comingSoonMessage).toBe('some_message');
+                        done();
+                    });
+            });
+    });
+});
diff --git a/src/services/coming-soon-message.service.ts b/src/services/coming-soon-message.service.ts
index d624cd9d2..adf024f79 100644
--- a/src/services/coming-soon-message.service.ts
+++ b/src/services/coming-soon-message.service.ts
@@ -7,7 +7,6 @@ import {
   SystemSettingsService
 } from 'sunbird-sdk';
 import { PreferenceKey, SystemSettingsIds, ContentConstants } from '../app/app.constant';
-import { CommonUtilService } from './common-util.service';
 
 @Injectable()
 export class ComingSoonMessageService {
@@ -15,8 +14,7 @@ export class ComingSoonMessageService {
   constructor(
     @Inject('SHARED_PREFERENCES') private sharedPreferences: SharedPreferences,
     @Inject('SYSTEM_SETTINGS_SERVICE') private systemSettingsService: SystemSettingsService,
-    @Inject('CONTENT_SERVICE') private contentService: ContentService,
-    private commonUtilService: CommonUtilService
+    @Inject('CONTENT_SERVICE') private contentService: ContentService
   ) {
   }
 
@@ -59,7 +57,7 @@ export class ComingSoonMessageService {
           return tenantMessageTranslations[selectedLanguage] || tenantMessage.value;
         }
       }
-      return this.commonUtilService.translateMessage('CONTENT_IS_BEEING_ADDED', {content_name : content.contentData.name });
+      return undefined;
     }
   }
 }
diff --git a/src/services/common-form-config-builders/framework-common-form-config-builder.ts b/src/services/common-form-config-builders/framework-common-form-config-builder.ts
new file mode 100644
index 000000000..29f45feb2
--- /dev/null
+++ b/src/services/common-form-config-builders/framework-common-form-config-builder.ts
@@ -0,0 +1,275 @@
+import {Inject, Injectable} from '@angular/core';
+import {FormControl} from '@angular/forms';
+import {FieldConfigOption, FieldConfigOptionsBuilder} from 'common-form-elements';
+import {defer, EMPTY, of} from 'rxjs';
+import {catchError, distinctUntilChanged, switchMap, tap} from 'rxjs/operators';
+import {TranslateService} from '@ngx-translate/core';
+import {
+  CachedItemRequestSourceFrom,
+  FrameworkCategoryCode,
+  FrameworkCategoryCodesGroup,
+  FrameworkService,
+  FrameworkUtilService,
+  GetFrameworkCategoryTermsRequest,
+  GetSuggestedFrameworksRequest,
+  Profile
+} from '@project-sunbird/sunbird-sdk';
+import {AliasBoardName} from '@app/pipes/alias-board-name/alias-board-name';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class FrameworkCommonFormConfigBuilder {
+
+  constructor(
+    @Inject('FRAMEWORK_SERVICE') private frameworkService: FrameworkService,
+    @Inject('FRAMEWORK_UTIL_SERVICE') private frameworkUtilService: FrameworkUtilService,
+    private translate: TranslateService,
+    private alisaBoard: AliasBoardName
+  ) { }
+
+  getBoardConfigOptionsBuilder(profile?: Profile): FieldConfigOptionsBuilder<{ name: string, code: string, deafult?: any }> {
+     return ((control: FormControl, _, notifyLoading, notifyLoaded) => {
+      return defer(async () => {
+        notifyLoading();
+        const getSuggestedFrameworksRequest: GetSuggestedFrameworksRequest = {
+          from: CachedItemRequestSourceFrom.SERVER,
+          language: this.translate.currentLang,
+          requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
+        };
+
+        const list = await this.frameworkUtilService.getActiveChannelSuggestedFrameworkList(getSuggestedFrameworksRequest).toPromise();
+        const options: FieldConfigOption<{ name: string, code: string }>[] = [];
+        list.forEach(element => {
+          const value: FieldConfigOption<{ name: string, code: string }> = {
+            label: this.alisaBoard.transform(element.name),
+            value: {
+              name: element.name,
+              code: element.identifier
+            }
+          };
+          options.push(value);
+
+          // assign default value for board [optional]
+          if (profile && profile.syllabus && profile.syllabus.length
+            && profile.syllabus[0] === element.identifier) {
+            control.patchValue(value.value);
+          }
+        });
+        notifyLoaded();
+        return options;
+      }).pipe(
+        catchError((e) => {
+          console.error(e);
+          notifyLoaded();
+          return EMPTY;
+        })
+      );
+    });
+  }
+
+  getMediumConfigOptionsBuilder(profile?: Profile): FieldConfigOptionsBuilder<{ name: string, code: string, frameworkCode: string }> {
+    return ((control: FormControl, context: FormControl, notifyLoading, notifyLoaded) => {
+      if (!context) {
+        return of([]);
+      }
+      return context.valueChanges.pipe(
+        distinctUntilChanged((v1, v2) => {
+          return this.valueComparator(v1 && v1.code, v2 && v2.code);
+        }),
+        tap(notifyLoading),
+        switchMap((value) => {
+          if (!value) {
+            return of([]);
+          }
+          const userInput: { name: string, code: string } = value;
+          return defer(async () => {
+            const framework = await this.frameworkService.getFrameworkDetails({
+              from: CachedItemRequestSourceFrom.SERVER,
+              frameworkId: userInput.code,
+              requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
+            }).toPromise();
+
+            const boardCategoryTermsRequet: GetFrameworkCategoryTermsRequest = {
+              frameworkId: userInput.code,
+              requiredCategories: [FrameworkCategoryCode.BOARD],
+              currentCategoryCode: FrameworkCategoryCode.BOARD,
+              language: this.translate.currentLang
+            };
+
+            const boardTerm = (await this.frameworkUtilService.getFrameworkCategoryTerms(boardCategoryTermsRequet).toPromise()).
+              find(b => b.name === userInput.name);
+
+            const nextCategoryTermsRequet: GetFrameworkCategoryTermsRequest = {
+              frameworkId: framework.code,
+              requiredCategories: [FrameworkCategoryCode.MEDIUM],
+              prevCategoryCode: FrameworkCategoryCode.BOARD,
+              currentCategoryCode: FrameworkCategoryCode.MEDIUM,
+              language: this.translate.currentLang,
+              selectedTermsCodes: [boardTerm.code]
+            };
+
+            const list = await this.frameworkUtilService.getFrameworkCategoryTerms(nextCategoryTermsRequet).toPromise();
+            const options: FieldConfigOption<{ name: string, code: string, frameworkCode: string }>[] = [];
+            list.forEach(element => {
+              const value: FieldConfigOption<{ name: string, code: string, frameworkCode: string }> = {
+                label: element.name,
+                value: {
+                  name: element.name,
+                  code: element.code,
+                  frameworkCode: framework.code
+                }
+              };
+              options.push(value);
+
+              if (!context.dirty && profile && profile.medium && profile.medium.length
+                && profile.medium[0] === element.code) {
+                control.patchValue(value.value);
+              }
+            });
+            return options;
+          });
+        }),
+        tap(notifyLoaded),
+        catchError((e) => {
+          console.error(e);
+          notifyLoaded();
+          return EMPTY;
+        })
+      );
+    });
+  }
+
+  getGradeConfigOptionsBuilder(profile?: Profile): FieldConfigOptionsBuilder<{ name: string, code: string, frameworkCode: string }> {
+    return ((control: FormControl, context: FormControl, notifyLoading, notifyLoaded) => {
+      if (!context) {
+        return of([]);
+      }
+      return context.valueChanges.pipe(
+        distinctUntilChanged((v1, v2) => {
+          return this.valueComparator(v1 && v1.code, v2 && v2.code);
+        }),
+        tap(notifyLoading),
+        switchMap((value) => {
+          if (!value) {
+            return of([]);
+          }
+          const userInput: { name: string, code: string, frameworkCode: string } = value;
+          return defer(async () => {
+            const nextCategoryTermsRequet: GetFrameworkCategoryTermsRequest = {
+              frameworkId: userInput.frameworkCode,
+              requiredCategories: [FrameworkCategoryCode.GRADE_LEVEL],
+              prevCategoryCode: FrameworkCategoryCode.MEDIUM,
+              currentCategoryCode: FrameworkCategoryCode.GRADE_LEVEL,
+              language: this.translate.currentLang,
+              selectedTermsCodes: [context.value.code]
+            };
+
+            const list = (await this.frameworkUtilService.getFrameworkCategoryTerms(nextCategoryTermsRequet).toPromise());
+            const options: FieldConfigOption<{ name: string, code: string, frameworkCode: string }>[] = [];
+            list.forEach(element => {
+              const value: FieldConfigOption<{ name: string, code: string, frameworkCode: string }> = {
+                label: element.name,
+                value: {
+                  name: element.name,
+                  code: element.code,
+                  frameworkCode: userInput.frameworkCode
+                }
+              };
+              options.push(value);
+
+              if (!context.dirty && profile && profile.grade && profile.grade.length
+                && profile.grade[0] === element.code) {
+                control.patchValue(value.value);
+              }
+            });
+            return options;
+          });
+        }),
+        tap(notifyLoaded),
+        catchError((e) => {
+          console.error(e);
+          notifyLoaded();
+          return EMPTY;
+        })
+      );
+
+    });
+  }
+
+  getSubjectConfigOptionsBuilder(profile?: Profile, enableOtherAsOption?: boolean): FieldConfigOptionsBuilder<{ name: string, code: string, frameworkCode: string }> {
+    return ((control: FormControl, context: FormControl, notifyLoading, notifyLoaded) => {
+      if (!context) {
+        return of([]);
+      }
+      return context.valueChanges.pipe(
+          distinctUntilChanged((v1, v2) => {
+            return this.valueComparator(v1 && v1.code, v2 && v2.code);
+          }),
+          tap(notifyLoading),
+          switchMap((value) => {
+          if (!value) {
+            return of([]);
+          }
+          const userInput: { name: string, code: string, frameworkCode: string } = value;
+          return defer(async () => {
+            const nextCategoryTermsRequet: GetFrameworkCategoryTermsRequest = {
+              frameworkId: userInput.frameworkCode,
+              requiredCategories: [FrameworkCategoryCode.SUBJECT],
+              prevCategoryCode: FrameworkCategoryCode.GRADE_LEVEL,
+              currentCategoryCode: FrameworkCategoryCode.SUBJECT,
+              language: this.translate.currentLang,
+              selectedTermsCodes: [context.value.code]
+            };
+
+            const list = (await this.frameworkUtilService.getFrameworkCategoryTerms(nextCategoryTermsRequet).toPromise());
+            const options: FieldConfigOption<{ name: string, code: string, frameworkCode: string } | 'other'>[] = [];
+            list.forEach(element => {
+              const value: FieldConfigOption<{ name: string, code: string, frameworkCode: string }> = {
+                label: element.name,
+                value: {
+                  name: element.name,
+                  code: element.code,
+                  frameworkCode: userInput.frameworkCode
+                }
+              };
+              options.push(value);
+
+              if (!context.dirty && profile && profile.subject && profile.subject.length
+                  && profile.subject[0] === element.code) {
+                control.patchValue(value.value);
+              }
+            });
+
+            if (enableOtherAsOption) {
+              options.push({
+                label: 'Other',
+                value: 'other'
+              });
+            }
+
+            return options;
+          });
+        }),
+        tap(notifyLoaded),
+        catchError((e) => {
+          console.error(e);
+          notifyLoaded();
+          return EMPTY;
+        })
+      );
+    });
+  }
+
+  private valueComparator(v1: any, v2: any): boolean {
+    if (typeof v1 === 'object' && typeof v2 === 'object') {
+      return (JSON.stringify(v1) !== JSON.stringify(v2));
+    } else if (v1 === v2) {
+      return true;
+    } else if (!v1 && !v2) {
+      return true;
+    }
+    return false;
+  }
+
+}
diff --git a/src/services/common-util.service.spec.ts b/src/services/common-util.service.spec.ts
index e5a70987f..9c6fc91ea 100644
--- a/src/services/common-util.service.spec.ts
+++ b/src/services/common-util.service.spec.ts
@@ -17,9 +17,12 @@ import { Network } from '@ionic-native/network/ngx';
 import { NgZone } from '@angular/core';
 import { WebView } from '@ionic-native/ionic-webview/ngx';
 import { AppVersion } from '@ionic-native/app-version/ngx';
-import { of } from 'rxjs';
+import { of, throwError } from 'rxjs';
 import { Router } from '@angular/router';
-import { AndroidPermissionsService } from '.';
+import { AndroidPermissionsService, ComingSoonMessageService } from '.';
+import { TelemetryService } from '@project-sunbird/sunbird-sdk';
+
+declare const FCMPlugin;
 
 describe('CommonUtilService', () => {
   let commonUtilService: CommonUtilService;
@@ -28,6 +31,9 @@ describe('CommonUtilService', () => {
     putString: jest.fn(() => of(undefined)),
   };
   const mockProfileService: Partial<ProfileService> = {};
+  const mockTelemetryService: Partial<TelemetryService> = {
+    populateGlobalCorRelationData: jest.fn()
+  };
   const mockToastController: Partial<ToastController> = {
     create: jest.fn(() => (Promise.resolve({
       present: jest.fn(() => Promise.resolve({})),
@@ -55,7 +61,7 @@ describe('CommonUtilService', () => {
     } as any)))
   };
   const mockNetwork: Partial<Network> = {
-    onChange: jest.fn(() => of({ type: 'online' }))
+    onChange: jest.fn(() => of([{ type: 'online' }]))
   };
   const mockNgZone: Partial<NgZone> = {
     run: jest.fn((fn) => fn())
@@ -74,12 +80,14 @@ describe('CommonUtilService', () => {
   };
   const mockRouter: Partial<Router> = {};
   const mockPermissionService: Partial<AndroidPermissionsService> = {};
+  const mockComingSoonMessageService: Partial<ComingSoonMessageService> = {};
 
 
   beforeAll(() => {
     commonUtilService = new CommonUtilService(
       mockSharedPreferences as SharedPreferences,
       mockProfileService as ProfileService,
+      mockTelemetryService as TelemetryService,
       mockTranslateService as TranslateService,
       mockLoadingController as LoadingController,
       mockEvents as Events,
@@ -92,12 +100,14 @@ describe('CommonUtilService', () => {
       mockAppversion as AppVersion,
       mockRouter as Router,
       mockToastController as ToastController,
-      mockPermissionService as AndroidPermissionsService
+      mockPermissionService as AndroidPermissionsService,
+      mockComingSoonMessageService as ComingSoonMessageService
     );
   });
 
   beforeEach(() => {
     jest.clearAllMocks();
+    jest.restoreAllMocks();
   });
 
   it('should create an instance of CommonUtilService', () => {
@@ -195,46 +205,6 @@ describe('CommonUtilService', () => {
     });
   });
 
-  describe('showExitPopUp()', () => {
-
-    it('should show Exit Popup', (done) => {
-      // arrange
-      const createMock = jest.spyOn(mockPopoverController, 'create').mockResolvedValue({
-        present: jest.fn(() => Promise.resolve({})),
-        onDidDismiss: jest.fn(() => Promise.resolve({ data: undefined }))
-      } as any);
-      // act
-      commonUtilService.showExitPopUp('permission', 'home', false);
-      // assert
-      setTimeout(() => {
-        expect(mockPopoverController.create).toHaveBeenCalled();
-        expect(createMock.mock.calls[0][0]['component']).toEqual(SbGenericPopoverComponent);
-        createMock.mockReset();
-        done();
-      }, 0);
-    });
-
-    // it('should dismiss the popup when NO button is clicked', (done) => {
-    //   // arrange
-    //   const createMock = jest.spyOn(mockPopoverController, 'create').mockResolvedValue({
-    //     present: jest.fn(() => Promise.resolve({})),
-    //     onDidDismiss: jest.fn(() => Promise.resolve({ data: undefined })),
-    //     dismiss: jest.fn(() => Promise.resolve({}))
-    //   } as any);
-    //   // act
-    //   commonUtilService.showExitPopUp('library', 'home', false);
-    //   // assert
-    //   setTimeout(() => {
-    //     expect(mockPopoverController.create).toHaveBeenCalled();
-    //     expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.TOUCH,
-    //       InteractSubtype.NO_CLICKED,
-    //       'home',
-    //       'library');
-    //     done();
-    //   }, 0);
-    // });
-  });
-
   describe('afterOnBoardQRErrorAlert()', () => {
     it('should show Error alert popover', () => {
       // arrange
@@ -242,6 +212,7 @@ describe('CommonUtilService', () => {
         present: jest.fn(() => Promise.resolve({})),
         onDidDismiss: jest.fn(() => Promise.resolve({ data: undefined }))
       } as any);
+      mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
       // act
       commonUtilService.afterOnBoardQRErrorAlert('sample_heading', 'sample_message');
       // assert
@@ -250,57 +221,64 @@ describe('CommonUtilService', () => {
   });
 
   describe('showContentComingSoonAlert()', () => {
-    it('should show Coming soon alert popover', () => {
+    it('should show Coming soon alert popover', (done) => {
       // arrange
       const createMock = jest.spyOn(mockPopoverController, 'create').mockResolvedValue({
-            present: jest.fn(() => Promise.resolve({})),
-            onDidDismiss: jest.fn(() => Promise.resolve({ data: undefined })),
-            dismiss: jest.fn(() => Promise.resolve({}))
-          } as any);
-      // const createMock = jest.spyOn(mockPopoverController, 'create');
+        present: jest.fn(() => Promise.resolve({})),
+        onDidDismiss: jest.fn(() => Promise.resolve({ data: undefined })),
+        dismiss: jest.fn(() => Promise.resolve({}))
+      } as any);
+      mockComingSoonMessageService.getComingSoonMessage = jest.fn(() => Promise.resolve('comming soon msg'));
       // act
-      commonUtilService.showContentComingSoonAlert('permission');
+      commonUtilService.showContentComingSoonAlert('permission', {});
       // assert
-      expect(mockPopoverController.create).toHaveBeenCalled();
-      expect(createMock.mock.calls[0][0]['component']).toEqual(QRScannerAlert);
+      setTimeout(() => {
+        expect(mockComingSoonMessageService.getComingSoonMessage).toHaveBeenCalled();
+        expect(mockPopoverController.create).toHaveBeenCalled();
+        expect(createMock.mock.calls[0][0]['component']).toEqual(QRScannerAlert);
+        done();
+      }, 0);
     });
 
-    it('should generate INTERACT telemetry with given source', () => {
+    it('should generate INTERACT telemetry with given source', (done) => {
       // arrange
       const createMock = jest.spyOn(mockPopoverController, 'create').mockResolvedValue({
-            present: jest.fn(() => Promise.resolve({})),
-            onDidDismiss: jest.fn(() => Promise.resolve({ data: undefined })),
-            dismiss: jest.fn(() => Promise.resolve({}))
-          } as any);
+        present: jest.fn(() => Promise.resolve({})),
+        onDidDismiss: jest.fn(() => Promise.resolve({ data: undefined })),
+        dismiss: jest.fn(() => Promise.resolve({}))
+      } as any);
       // const createMock = jest.spyOn(mockPopoverController, 'create');
       // act
-      commonUtilService.showContentComingSoonAlert('permission');
-      // assert
-      expect(mockPopoverController.create).toHaveBeenCalled();
-      expect(createMock.mock.calls[0][0]['component']).toEqual(QRScannerAlert);
-      expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.OTHER,
-        InteractSubtype.QR_CODE_COMINGSOON,
-        Environment.HOME,
-       'permission');
+      commonUtilService.showContentComingSoonAlert('permission', 'dial_code').then(() => {
+        // assert
+        expect(mockPopoverController.create).toHaveBeenCalled();
+        expect(createMock.mock.calls[0][0]['component']).toEqual(QRScannerAlert);
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.OTHER,
+          InteractSubtype.QR_CODE_COMINGSOON,
+          Environment.HOME,
+          'permission');
+        done();
+      });
     });
 
-    it('should generate INTERACT telemetry if source is not provided', () => {
+    it('should generate INTERACT telemetry if source is not provided', (done) => {
       // arrange
       const createMock = jest.spyOn(mockPopoverController, 'create').mockResolvedValue({
-            present: jest.fn(() => Promise.resolve({})),
-            onDidDismiss: jest.fn(() => Promise.resolve({ data: undefined })),
-            dismiss: jest.fn(() => Promise.resolve({}))
-          } as any);
+        present: jest.fn(() => Promise.resolve({})),
+        onDidDismiss: jest.fn(() => Promise.resolve({ data: undefined })),
+        dismiss: jest.fn(() => Promise.resolve({}))
+      } as any);
       // const createMock = jest.spyOn(mockPopoverController, 'create');
       // act
-      commonUtilService.showContentComingSoonAlert(undefined);
-      // assert
-      expect(mockPopoverController.create).toHaveBeenCalled();
-      expect(createMock.mock.calls[0][0]['component']).toEqual(SbGenericPopoverComponent);
-      expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.OTHER,
-        InteractSubtype.QR_CODE_COMINGSOON,
-        Environment.HOME,
-        PageId.HOME);
+      commonUtilService.showContentComingSoonAlert(undefined).then(() => {
+        expect(mockPopoverController.create).toHaveBeenCalled();
+        expect(createMock.mock.calls[0][0]['component']).toEqual(SbGenericPopoverComponent);
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.OTHER,
+          InteractSubtype.QR_CODE_COMINGSOON,
+          Environment.HOME,
+          PageId.HOME);
+        done();
+      });
     });
   });
 
@@ -402,9 +380,7 @@ describe('CommonUtilService', () => {
       const profile = {
         userLocations: [
           { type: 'state', name: 'Odisha' },
-          { type: 'district', name: 'Cuttack' },
-          { type: 'block', name: 'Block-A' },
-          { type: 'sadar', name: 'Sadar' }
+          { type: 'district', name: 'Cuttack' }
         ]
       };
       // act
@@ -424,11 +400,24 @@ describe('CommonUtilService', () => {
         userLocations: [
           { type: 'state', name: 'Odisha' },
           { type: 'district', name: 'Cuttack' },
-        ]
+        ],
+        profileType: 'teacher'
       };
+      const locationConfig = [
+        {
+          code: 'persona',
+          children: {
+            teacher: [{
+              validations: [{
+                type: 'required'
+              }]
+            }]
+          }
+        }
+      ];
       // act
       // assert
-      expect(commonUtilService.isUserLocationAvalable(profile)).toBeTruthy();
+      expect(commonUtilService.isUserLocationAvalable(profile, locationConfig)).toBeFalsy();
     });
 
     it('should return false if user any of the state or distric is not available', () => {
@@ -440,7 +429,7 @@ describe('CommonUtilService', () => {
       };
       // act
       // assert
-      expect(commonUtilService.isUserLocationAvalable(profile)).toBeFalsy();
+      expect(commonUtilService.isUserLocationAvalable(profile, undefined)).toBeFalsy();
     });
   });
 
@@ -470,6 +459,7 @@ describe('CommonUtilService', () => {
     it('should return true if IP location is available', () => {
       // arrange
       mockSharedPreferences.getString = jest.fn(() => of({} as any));
+      mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
       // act
       // assert
       commonUtilService.isIpLocationAvailable().then((response) => {
@@ -491,26 +481,33 @@ describe('CommonUtilService', () => {
   describe('handleToTopicBasedNotification()', () => {
     it('should return true if IP location is available', (done) => {
       // arrange
-      const profile = {board: ['AP'], medium: ['English', 'Hindi', 'Bengali'], grade: ['class 8', 'class9', 'class10']} as any;
+      const profile = {
+        board: ['AP'], medium: ['English', 'Hindi', 'Bengali'],
+        grade: ['class 8', 'class9', 'class10'], profileType: 'teacher'
+      } as any;
       mockProfileService.getActiveSessionProfile = jest.fn(() => of(profile));
       mockSharedPreferences.getString = jest.fn((arg) => {
         let value;
         switch (arg) {
-            case PreferenceKey.DEVICE_LOCATION:
-                value = '{\"state\": \"Odisha\", \"district\": \"Cuttack\"}';
-                break;
-            case PreferenceKey.SUBSCRIBE_TOPICS:
-                value =  '[\"AP\", \"English\", \"Odisha\", \"Cuttack\"]';
+          case PreferenceKey.DEVICE_LOCATION:
+            value = '{\"state\": \"Odisha\", \"district\": \"Cuttack\"}';
+            break;
+          case PreferenceKey.SUBSCRIBE_TOPICS:
+            value = '[\"AP\", \"English\", \"Odisha\", \"Cuttack\"]';
         }
         return of(value);
       });
-      jest.spyOn(FCMPlugin, 'unsubscribeFromTopic');
-      jest.spyOn(FCMPlugin, 'subscribeToTopic');
+      FCMPlugin.unsubscribeFromTopic = jest.fn((_, resolve, reject) => resolve());
+      FCMPlugin.subscribeToTopic = jest.fn((_, resolve, reject) => resolve());
+      mockSharedPreferences.putString = jest.fn(() => of(undefined));
       // act
       commonUtilService.handleToTopicBasedNotification();
       // assert
       setTimeout(() => {
-        expect(FCMPlugin.unsubscribeFromTopic).toHaveBeenCalled();
+        expect(mockProfileService.getActiveSessionProfile).toHaveBeenCalled();
+        expect(mockSharedPreferences.getString).toHaveBeenNthCalledWith(1, PreferenceKey.DEVICE_LOCATION);
+        expect(mockSharedPreferences.getString).toHaveBeenNthCalledWith(2, PreferenceKey.SUBSCRIBE_TOPICS);
+        expect(mockSharedPreferences.putString).toHaveBeenCalled();
         done();
       }, 0);
     });
@@ -546,10 +543,10 @@ describe('CommonUtilService', () => {
       const message = 'Connect to the internet to view the content';
       mockToastController.create = jest.fn(() => {
         return Promise.resolve({
-            present: jest.fn(),
-            onDidDismiss: jest.fn((fn) => {
-                fn();
-            })
+          present: jest.fn(),
+          onDidDismiss: jest.fn((fn) => {
+            fn();
+          })
         });
       });
       jest.spyOn(commonUtilService, 'translateMessage').mockImplementation(() => {
@@ -561,4 +558,183 @@ describe('CommonUtilService', () => {
     });
   });
 
+  describe('getStateList', () => {
+    it('should return the state list', (done) => {
+      // arrange
+      mockProfileService.searchLocation = jest.fn(() => of([]));
+      // act
+      commonUtilService.getStateList().then((res) => {
+        // assert
+        expect(res).toEqual([]);
+        done();
+      });
+    });
+
+    it('should return empty state list', (done) => {
+      // arrange
+      mockProfileService.searchLocation = jest.fn(() => throwError(new Error()));
+      // act
+      commonUtilService.getStateList().then((res) => {
+        // assert
+        expect(res).toEqual([]);
+        done();
+      });
+    });
+  });
+
+  describe('getDistrictList', () => {
+    it('should return the district list with state id', (done) => {
+      // arrange
+      const id = 'state_id';
+      mockProfileService.searchLocation = jest.fn(() => of([]));
+      // act
+      commonUtilService.getDistrictList(id).then((res) => {
+        // assert
+        expect(res).toEqual([]);
+        done();
+      });
+    });
+
+    it('should return the district list with state code', (done) => {
+      // arrange
+      const code = 'state_code';
+      mockProfileService.searchLocation = jest.fn(() => of([]));
+      // act
+      commonUtilService.getDistrictList(code).then((res) => {
+        // assert
+        expect(res).toEqual([]);
+        done();
+      });
+    });
+
+    it('should return empty district list', (done) => {
+      // arrange
+      const id = 'state_id';
+      mockProfileService.searchLocation = jest.fn(() => throwError(new Error()));
+      // act
+      commonUtilService.getDistrictList(id).then((res) => {
+        // assert
+        expect(res).toEqual([]);
+        done();
+      });
+    });
+  });
+
+  describe('showExitPopUp()', () => {
+    it('should show Exit Popup', (done) => {
+      // arrange
+      mockPopoverController.create = jest.fn(() => Promise.resolve({
+        present: jest.fn(() => Promise.resolve({})),
+        onDidDismiss: jest.fn(() => Promise.resolve({ data: undefined })),
+        dismiss: jest.fn(() => Promise.resolve({}))
+      }) as any);
+      mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+      mockNetwork.onChange = jest.fn(() => of([{ type: 'online' }]));
+      // act
+      commonUtilService.showExitPopUp('permission', 'home', false);
+      // assert
+      setTimeout(() => {
+        expect(mockPopoverController.create).toHaveBeenCalled();
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+        done();
+      }, 0);
+    });
+
+    it('should return non-clicked telemetry', (done) => {
+      // arrange
+      commonUtilService = new CommonUtilService(
+        mockSharedPreferences as SharedPreferences,
+        mockProfileService as ProfileService,
+        mockTelemetryService as TelemetryService,
+        mockTranslateService as TranslateService,
+        mockLoadingController as LoadingController,
+        mockEvents as Events,
+        mockPopoverController as PopoverController,
+        mockNetwork as Network,
+        mockNgZone as NgZone,
+        mockPlatform as Platform,
+        mockTelemetryGeneratorService as TelemetryGeneratorService,
+        mockWebView as WebView,
+        mockAppversion as AppVersion,
+        mockRouter as Router,
+        mockToastController as ToastController,
+        mockPermissionService as AndroidPermissionsService,
+        mockComingSoonMessageService as ComingSoonMessageService
+      );
+      mockPopoverController.create = jest.fn(() => Promise.resolve({
+        present: jest.fn(() => Promise.resolve({})),
+        onDidDismiss: jest.fn(() => Promise.resolve({ data: {isLeftButtonClicked: false} })),
+        dismiss: jest.fn(() => Promise.resolve({}))
+      }) as any);
+      mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+      mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+      mockNetwork.onChange = jest.fn(() => of([{ type: 'online' }]));
+      // act
+      commonUtilService.showExitPopUp('library', 'home', false);
+      // assert
+      setTimeout(() => {
+         expect(mockPopoverController.create).toHaveBeenCalled();
+         expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.TOUCH,
+          InteractSubtype.NO_CLICKED,
+          'home',
+          'library');
+         expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalled();
+         done();
+      }, 0);
+    });
+  });
+
+  describe('handleAssessmentStatus()', () => {
+    it('should show assessment attempt exceeded toast message and return true', () => {
+      // arrange
+      const assessmentStatus = {
+        isContentDisabled: true,
+        isLastAttempt: false
+      }
+      commonUtilService.showToast = jest.fn();
+      // act
+      commonUtilService.handleAssessmentStatus(assessmentStatus);
+      // assert
+      expect(commonUtilService.showToast).toHaveBeenCalled();
+    });
+
+    it('should show last attempt available popup and on click of continue return false', () => {
+      // arrange
+      const assessmentStatus = {
+        isContentDisabled: false,
+        isLastAttempt: true
+      };
+      commonUtilService.showAssessmentLastAttemptPopup = jest.fn(() => Promise.resolve({
+        isLastAttempt: true,
+        limitExceeded: false,
+        isContentDisabled: false,
+      }));
+      // act
+      commonUtilService.handleAssessmentStatus(assessmentStatus);
+      // assert
+      expect(commonUtilService.showAssessmentLastAttemptPopup).toHaveBeenCalled();
+    });
+
+    it('should return false if the assessment is available to play directly', () => {
+      // arrange
+      const assessmentStatus = {
+        isContentDisabled: false,
+        isLastAttempt: false
+      };
+      commonUtilService.showAssessmentLastAttemptPopup = jest.fn(() => Promise.resolve({
+        isContentDisabled: false,
+        isLastAttempt: false,
+        limitExceeded: false,
+      }));
+      commonUtilService.showToast = jest.fn();
+      // act
+      commonUtilService.handleAssessmentStatus(assessmentStatus);
+      // assert
+      expect(commonUtilService.showAssessmentLastAttemptPopup).not.toHaveBeenCalled();
+      expect(commonUtilService.showToast).not.toHaveBeenCalled();
+
+    });
+
+  });
+
 });
diff --git a/src/services/common-util.service.ts b/src/services/common-util.service.ts
index 1d7100aac..6e342f994 100644
--- a/src/services/common-util.service.ts
+++ b/src/services/common-util.service.ts
@@ -2,20 +2,26 @@ import { Injectable, NgZone, Inject } from '@angular/core';
 import {
     ToastController,
     LoadingController,
-    Events,
     PopoverController,
     Platform,
 } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { TranslateService } from '@ngx-translate/core';
 import { Network } from '@ionic-native/network/ngx';
 import { WebView } from '@ionic-native/ionic-webview/ngx';
-import { SharedPreferences, ProfileService, Profile, ProfileType } from 'sunbird-sdk';
-
-import { PreferenceKey, ProfileConstants, RouterLinks } from '@app/app/app.constant';
-import { appLanguages } from '@app/app/app.constant';
-
+import {
+    SharedPreferences, ProfileService, Profile, ProfileType,
+    CorrelationData, CachedItemRequestSourceFrom, LocationSearchCriteria, TelemetryService
+} from 'sunbird-sdk';
+import {
+    PreferenceKey, ProfileConstants, RouterLinks,
+    appLanguages, Location as loc, MaxAttempt, SwitchableTabsConfig
+} from '@app/app/app.constant';
 import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import { InteractType, InteractSubtype, PageId, Environment, CorReleationDataType, ImpressionType } from '@app/services/telemetry-constants';
+import {
+    InteractType, InteractSubtype, PageId, Environment,
+    CorReleationDataType, ImpressionType, ObjectType
+} from '@app/services/telemetry-constants';
 import { SbGenericPopoverComponent } from '@app/app/components/popups/sb-generic-popover/sb-generic-popover.component';
 import { QRAlertCallBack, QRScannerAlert } from '@app/app/qrscanner-alert/qrscanner-alert.page';
 import { Observable, merge } from 'rxjs';
@@ -25,6 +31,8 @@ import { SbPopoverComponent } from '@app/app/components/popups';
 import { AndroidPermissionsStatus } from './android-permissions/android-permission';
 import { Router } from '@angular/router';
 import { AndroidPermissionsService } from './android-permissions/android-permissions.service';
+import GraphemeSplitter from 'grapheme-splitter';
+import { ComingSoonMessageService } from './coming-soon-message.service';
 
 declare const FCMPlugin;
 export interface NetworkInfo {
@@ -39,6 +47,7 @@ export class CommonUtilService {
     };
 
     private alert?: any;
+    googleCaptchaConfig = new Map();
     private _currentTabName: string;
     appName: any;
     private toast: any;
@@ -46,6 +55,7 @@ export class CommonUtilService {
     constructor(
         @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
         @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+        @Inject('TELEMETRY_SERVICE') private telemetryService: TelemetryService,
         private translate: TranslateService,
         private loadingCtrl: LoadingController,
         private events: Events,
@@ -58,7 +68,8 @@ export class CommonUtilService {
         private appVersion: AppVersion,
         private router: Router,
         private toastController: ToastController,
-        private permissionService: AndroidPermissionsService
+        private permissionService: AndroidPermissionsService,
+        private comingSoonMessageService: ComingSoonMessageService
     ) {
         this.networkAvailability$ = merge(
             this.network.onChange().pipe(
@@ -186,7 +197,11 @@ export class CommonUtilService {
      * Show popup with Try Again and Skip button.
      * @param source Page from alert got called
      */
-    async  showContentComingSoonAlert(source) {
+    async showContentComingSoonAlert(source, content?, dialCode?) {
+        let message;
+        if (content) {
+            message = await this.comingSoonMessageService.getComingSoonMessage(content);
+        }
         this.telemetryGeneratorService.generateInteractTelemetry(
             InteractType.OTHER,
             InteractSubtype.QR_CODE_COMINGSOON,
@@ -194,7 +209,8 @@ export class CommonUtilService {
             source ? source : PageId.HOME
         );
         if (source !== 'permission') {
-            this.afterOnBoardQRErrorAlert('ERROR_CONTENT_NOT_FOUND', 'CONTENT_IS_BEING_ADDED');
+            this.afterOnBoardQRErrorAlert('ERROR_CONTENT_NOT_FOUND', (message || 'CONTENT_IS_BEING_ADDED'), source,
+                (dialCode ? dialCode : ''));
             return;
         }
         let popOver: any;
@@ -226,7 +242,7 @@ export class CommonUtilService {
      * @param heading Alert heading
      * @param message Alert message
      */
-    async afterOnBoardQRErrorAlert(heading, message) {
+    async afterOnBoardQRErrorAlert(heading, message, source?, dialCode?) {
         const qrAlert = await this.popOverCtrl.create({
             component: SbGenericPopoverComponent,
             componentProps: {
@@ -243,6 +259,35 @@ export class CommonUtilService {
             cssClass: 'sb-popover warning',
         });
         await qrAlert.present();
+        const corRelationList: CorrelationData[] = [{
+            id: this.translateMessage(heading) === this.translateMessage('INVALID_QR') ?
+                InteractSubtype.QR_CODE_INVALID : InteractSubtype.QR_NOT_LINKED,
+            type: CorReleationDataType.CHILD_UI
+        }];
+        corRelationList.push({ id: (dialCode ? dialCode : ''), type: ObjectType.QR });
+        // generate impression telemetry
+        this.telemetryGeneratorService.generateImpressionTelemetry(
+            InteractType.POPUP_LOADED, '',
+            source === PageId.ONBOARDING_PROFILE_PREFERENCES ? PageId.SCAN_OR_MANUAL : source,
+            source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+            (dialCode ? dialCode : ''),
+            (dialCode ? ObjectType.QR : undefined),
+            undefined,
+            undefined,
+            corRelationList
+        );
+        const { data } = await qrAlert.onDidDismiss();
+        // generate interact telemetry for close popup
+        this.telemetryGeneratorService.generateInteractTelemetry(
+            InteractType.SELECT_CLOSE,
+            data ? (data.isLeftButtonClicked ? InteractSubtype.CTA : InteractSubtype.CLOSE_ICON) : InteractSubtype.OUTSIDE,
+            source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+            source === PageId.ONBOARDING_PROFILE_PREFERENCES ? PageId.SCAN_OR_MANUAL : PageId.HOME,
+            undefined,
+            undefined,
+            undefined,
+            corRelationList
+        );
     }
 
     /**
@@ -323,6 +368,7 @@ export class CommonUtilService {
         }
     }
 
+
     async getAppName() {
         return this.appVersion.getAppName();
     }
@@ -364,6 +410,14 @@ export class CommonUtilService {
         }
     }
 
+    setGoogleCaptchaConfig(key, isEnabled) {
+        this.googleCaptchaConfig.set('key', key);
+        this.googleCaptchaConfig.set('isEnabled', isEnabled);
+    }
+
+    getGoogleCaptchaConfig() {
+        return this.googleCaptchaConfig;
+    }
     // return org location details for logged in user
     getOrgLocation(organisation: any) {
         const location = { 'state': '', 'district': '', 'block': '' };
@@ -394,48 +448,44 @@ export class CommonUtilService {
 
 
     getUserLocation(profile: any) {
-        let userLocation = {
-            state: {},
-            district: {}
+        const userLocation = {
         };
         if (profile && profile.userLocations && profile.userLocations.length) {
-            for (let i = 0, len = profile.userLocations.length; i < len; i++) {
-                if (profile.userLocations[i].type === 'state') {
-                    userLocation.state = profile.userLocations[i];
-                } else if (profile.userLocations[i].type === 'district') {
-                    userLocation.district = profile.userLocations[i];
-                }
-            }
+            profile.userLocations.forEach((d) => {
+                userLocation[d.type] = d;
+            });
         }
 
         return userLocation;
     }
 
-    isUserLocationAvalable(profile: any): boolean {
-        const location = this.getUserLocation(profile);
-        if (location && location.state && location.state['name'] && location.district && location.district['name']) {
-            return true;
-        } else {
-            return false;
+    isUserLocationAvalable(profile: any, locationMappingConfig): boolean {
+        const location = this.getUserLocation(profile.serverProfile ? profile.serverProfile : profile);
+        let isAvailable = false;
+        if (locationMappingConfig && profile && profile.profileType !== ProfileType.NONE) {
+            const requiredFileds = this.findAllRequiredFields(locationMappingConfig, profile.profileType);
+            isAvailable = requiredFileds.every(key => Object.keys(location).includes(key));
         }
+        return isAvailable;
+    }
+
+    private findAllRequiredFields(locationMappingConfig, userType) {
+        return locationMappingConfig.find((m) => m.code === 'persona').children[userType].reduce((acc, config) => {
+            if (config.validations && config.validations.find((v) => v.type === 'required')) {
+                acc.push(config.code);
+            }
+            return acc;
+        }, []);
     }
 
     async isDeviceLocationAvailable(): Promise<boolean> {
         const deviceLoc = await this.preferences.getString(PreferenceKey.DEVICE_LOCATION).toPromise();
-        if (deviceLoc) {
-            return true;
-        } else {
-            return false;
-        }
+        return !!deviceLoc;
     }
 
     async isIpLocationAvailable(): Promise<boolean> {
         const deviceLoc = await this.preferences.getString(PreferenceKey.IP_LOCATION).toPromise();
-        if (deviceLoc) {
-            return true;
-        } else {
-            return false;
-        }
+        return !!deviceLoc;
     }
 
     handleToTopicBasedNotification() {
@@ -444,6 +494,7 @@ export class CommonUtilService {
                 const profile = response;
                 const subscribeTopic: Array<string> = [];
                 subscribeTopic.push(profile.board[0]);
+                subscribeTopic.push(profile.profileType.concat('-', profile.board[0]));
                 profile.medium.forEach((m) => {
                     subscribeTopic.push(profile.board[0].concat('-', m));
                     profile.grade.forEach((g) => {
@@ -452,8 +503,11 @@ export class CommonUtilService {
                     });
                 });
                 await this.preferences.getString(PreferenceKey.DEVICE_LOCATION).subscribe((data) => {
-                    subscribeTopic.push(JSON.parse(data).state.replace(/[^a-zA-Z0-9-_.~%]/gi, '-'));
-                    subscribeTopic.push(JSON.parse(data).district.replace(/[^a-zA-Z0-9-_.~%]/gi, '-'));
+                    if (data) {
+                        subscribeTopic.push(JSON.parse(data).state.replace(/[^a-zA-Z0-9-_.~%]/gi, '-'));
+                        subscribeTopic.push(profile.profileType.concat('-', JSON.parse(data).state.replace(/[^a-zA-Z0-9-_.~%]/gi, '-')));
+                        subscribeTopic.push(JSON.parse(data).district.replace(/[^a-zA-Z0-9-_.~%]/gi, '-'));
+                    }
                 });
                 await this.preferences.getString(PreferenceKey.SUBSCRIBE_TOPICS).toPromise().then(async (data) => {
                     const previuslySubscribeTopics = JSON.parse(data);
@@ -473,17 +527,6 @@ export class CommonUtilService {
             });
     }
 
-    generateUTMInfoTelemetry(scannedData, cData, object) {
-        const utmHashes = scannedData.slice(scannedData.indexOf('?') + 1).split('&');
-        const utmParams = {};
-        utmHashes.map(hash => {
-            const [key, val] = hash.split('=');
-            utmParams[key] = decodeURIComponent(val);
-        });
-        this.telemetryGeneratorService.generateUtmInfoTelemetry(utmParams,
-            (cData[0].id === CorReleationDataType.SCAN) ? PageId.QRCodeScanner : PageId.HOME, cData, object);
-    }
-
     getFormattedDate(date: string | Date) {
         const inputDate = new Date(date).toDateString();
         const [, month, day, year] = inputDate.split(' ');
@@ -498,7 +541,7 @@ export class CommonUtilService {
     }
 
     isAccessibleForNonStudentRole(profileType) {
-        return profileType === ProfileType.TEACHER || profileType === ProfileType.OTHER;
+        return profileType === ProfileType.TEACHER || profileType === ProfileType.OTHER || profileType === ProfileType.ADMIN;
     }
 
     public async getGivenPermissionStatus(permissions): Promise<AndroidPermissionsStatus> {
@@ -511,8 +554,13 @@ export class CommonUtilService {
         const toast = await this.toastController.create({
             message: this.translateMessage(description, appName),
             cssClass: 'permissionSettingToast',
-            showCloseButton: true,
-            closeButtonText: this.translateMessage('SETTINGS'),
+            buttons: [
+                {
+                    text: this.translateMessage('SETTINGS'),
+                    role: 'cancel',
+                    handler: () => { }
+                }
+            ],
             position: 'bottom',
             duration: 3000
         });
@@ -531,7 +579,8 @@ export class CommonUtilService {
         });
     }
 
-    public async buildPermissionPopover(handler: (selectedButton: string) => void,
+    public async buildPermissionPopover(
+        handler: (selectedButton: string) => void,
         appName: string, whichPermission: string,
         permissionDescription: string, pageId, isOnboardingCompleted): Promise<HTMLIonPopoverElement> {
         return this.popOverCtrl.create({
@@ -570,16 +619,118 @@ export class CommonUtilService {
 
     async presentToastForOffline(msg: string) {
         this.toast = await this.toastController.create({
-          duration: 3000,
-          message: this.translateMessage(msg),
-          showCloseButton: true,
-          position: 'top',
-          closeButtonText: 'X',
-          cssClass: ['toastHeader', 'offline']
+            duration: 3000,
+            message: this.translateMessage(msg),
+            buttons: [
+                {
+                    text: 'X',
+                    role: 'cancel',
+                    handler: () => { }
+                }
+            ],
+            position: 'top',
+            cssClass: ['toastHeader', 'offline']
         });
         await this.toast.present();
         this.toast.onDidDismiss(() => {
-          this.toast = undefined;
+            this.toast = undefined;
         });
+    }
+
+    extractInitial(name) {
+        let initial = '';
+        if (name) {
+            const splitter = new GraphemeSplitter();
+            const split: string[] = splitter.splitGraphemes(name.trim());
+            initial = split[0];
+        }
+        return initial;
+    }
+
+    async getStateList() {
+        const req: LocationSearchCriteria = {
+            from: CachedItemRequestSourceFrom.SERVER,
+            filters: {
+                type: loc.TYPE_STATE
+            }
+        };
+        try {
+            const stateList = await this.profileService.searchLocation(req).toPromise();
+            return stateList || [];
+        } catch {
+            return [];
+        }
+    }
+
+    async getDistrictList(id?: string, code?: string) {
+        const req: LocationSearchCriteria = {
+            from: CachedItemRequestSourceFrom.SERVER,
+            filters: {
+                type: loc.TYPE_DISTRICT,
+                parentId: id || undefined,
+                code: code || undefined
+            }
+        };
+        try {
+            const districtList = await this.profileService.searchLocation(req).toPromise();
+            return districtList || [];
+        } catch {
+            return [];
+        }
+    }
+
+    async handleAssessmentStatus(assessmentStatus) {
+        const maxAttempt: MaxAttempt = {
+            limitExceeded: false,
+            isCloseButtonClicked: false,
+            isLastAttempt: false
+        };
+        if (assessmentStatus && assessmentStatus.isContentDisabled) {
+            maxAttempt.limitExceeded = true;
+            this.showToast('FRMELMNTS_IMSG_LASTATTMPTEXCD');
+            return maxAttempt;
+        }
+        if (assessmentStatus && assessmentStatus.isLastAttempt) {
+            maxAttempt.isLastAttempt = true;
+            return await this.showAssessmentLastAttemptPopup(maxAttempt);
+        }
+        return maxAttempt;
+    }
+
+    async showAssessmentLastAttemptPopup(maxAttempt?: MaxAttempt) {
+        const confirm = await this.popOverCtrl.create({
+            component: SbPopoverComponent,
+            componentProps: {
+                sbPopoverMainTitle: this.translateMessage('ASSESSMENT_LAST_ATTEMPT_MESSAGE'),
+                showCloseBtn: true,
+                actionsButtons: [
+                    {
+                        btntext: this.translateMessage('CONTINUE'),
+                        btnClass: 'popover-color'
+                    },
+                ],
+            },
+            cssClass: 'sb-popover warning',
+            backdropDismiss: false
+        });
+        await confirm.present();
+        const { data } = await confirm.onDidDismiss();
+        if (data && data.canDelete) {
+            return maxAttempt;
+        } else {
+            maxAttempt.isCloseButtonClicked = true;
+            return maxAttempt;
+        }
+    }
+
+    public async populateGlobalCData() {
+        const currentSelectedTabs = await this.preferences.getString(PreferenceKey.SELECTED_SWITCHABLE_TABS_CONFIG).toPromise();
+        const correlationData: CorrelationData = {
+        type : 'Tabs',
+        id: (!currentSelectedTabs || currentSelectedTabs === SwitchableTabsConfig.RESOURCE_COURSE_TABS_CONFIG )?
+        'Library-Course' : 'Home-Discover'
+        };
+        this.telemetryService.populateGlobalCorRelationData([correlationData]);
       }
+
 }
diff --git a/src/services/consent-service.spec.ts b/src/services/consent-service.spec.ts
new file mode 100644
index 000000000..532850829
--- /dev/null
+++ b/src/services/consent-service.spec.ts
@@ -0,0 +1,212 @@
+import { PopoverController } from '@ionic/angular';
+import { Consent, ConsentStatus } from '@project-sunbird/client-services/models';
+import { of, throwError } from 'rxjs';
+import { CommonUtilService } from './common-util.service';
+import { ConsentService } from './consent-service';
+import { ProfileService } from 'sunbird-sdk';
+
+describe('ConsentService', () => {
+  let consentService: ConsentService;
+  const mockCommonUtilService: Partial<CommonUtilService> = {};
+  const mockPopoverController: Partial<PopoverController> = {};
+  const mockProfileService: Partial<ProfileService> = {};
+
+  beforeAll(() => {
+    consentService = new ConsentService(
+      mockProfileService as ProfileService,
+      mockPopoverController as PopoverController,
+      mockCommonUtilService as CommonUtilService
+    );
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.resetAllMocks();
+  });
+
+  describe('showConsentPopup', () => {
+    it('should update user consent', (done) => {
+      // arrange
+      const course = {
+        courseId: 'courseId',
+        channel: 'sample-channelId',
+        userId: 'sample-userId'
+      };
+      const request: Consent = {
+        status: ConsentStatus.REVOKED,
+        userId: course.userId,
+        consumerId: course.channel,
+        objectId: course.courseId,
+        objectType: 'Collection'
+      };
+      const presentFn = jest.fn(() => Promise.resolve());
+      mockPopoverController.create = jest.fn(() => Promise.resolve({
+        present: presentFn,
+        onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: true } }))
+      }) as any);
+      const dismissFn = jest.fn(() => Promise.resolve());
+      mockCommonUtilService.getLoader = jest.fn(() => ({
+        present: presentFn,
+        dismiss: dismissFn,
+      }));
+      mockProfileService.updateConsent = jest.fn(() => of({
+        message: 'success'
+      }));
+      mockCommonUtilService.showToast = jest.fn();
+      // act
+      consentService.showConsentPopup(course);
+      // assert
+      setTimeout(() => {
+        expect(mockPopoverController.create).toHaveBeenCalled();
+        expect(presentFn).toHaveBeenCalled();
+        expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+        expect(mockProfileService.updateConsent).toHaveBeenCalledWith(request);
+        expect(mockCommonUtilService.showToast).toHaveBeenCalled();
+        done();
+      }, 0);
+    });
+
+    it('should not update user consent for catch part', (done) => {
+      // arrange
+      const course = {
+        courseId: 'courseId',
+        channel: 'sample-channelId',
+        userId: 'sample-userId'
+      };
+      const request: Consent = {
+        status: ConsentStatus.REVOKED,
+        userId: course.userId,
+        consumerId: course.channel,
+        objectId: course.courseId,
+        objectType: 'Collection'
+      };
+      const presentFn = jest.fn(() => Promise.resolve());
+      mockPopoverController.create = jest.fn(() => Promise.resolve({
+        present: presentFn,
+        onDidDismiss: jest.fn(() => Promise.resolve({ data: { canDelete: true } }))
+      }) as any);
+      const dismissFn = jest.fn(() => Promise.resolve());
+      mockCommonUtilService.getLoader = jest.fn(() => ({
+        present: presentFn,
+        dismiss: dismissFn,
+      }));
+      mockProfileService.updateConsent = jest.fn(() => throwError({
+        code: 'NETWORK_ERROR'
+      }));
+      mockCommonUtilService.showToast = jest.fn();
+      // act
+      consentService.showConsentPopup(course);
+      // assert
+      setTimeout(() => {
+        expect(mockPopoverController.create).toHaveBeenCalled();
+        expect(presentFn).toHaveBeenCalled();
+        expect(mockCommonUtilService.getLoader).toHaveBeenCalled();
+        expect(mockProfileService.updateConsent).toHaveBeenCalledWith(request);
+        expect(mockCommonUtilService.showToast).toHaveBeenCalled();
+        done();
+      }, 0);
+    });
+  });
+
+  describe('getConsent', () => {
+    it('should return status for getConsent', (done) => {
+      const request: Consent = {
+        userId: 'sample-user-id',
+        consumerId: 'sample-rootOrgId',
+        objectId: 'sample-rootOrgId',
+        objectType: 'Organisation'
+      };
+      const userDetails = {
+        uid: 'sample-user-id',
+        serverProfile: {
+          rootOrg: {
+            rootOrgId: 'sample-rootOrgId'
+          }
+        }
+      };
+      mockProfileService.getConsent = jest.fn(() => of({}));
+      // act
+      consentService.getConsent(userDetails, true);
+      // assert
+      setTimeout(() => {
+        expect(mockProfileService.getConsent).toHaveBeenCalledWith(request);
+        done();
+      }, 0);
+    });
+
+    it('should should show consentPopup for getConsent catchPart', (done) => {
+      const request: Consent = {
+        userId: 'sample-user-id',
+        consumerId: 'sample-rootOrgId',
+        objectId: 'sample-rootOrgId',
+        objectType: 'Organisation'
+      };
+      const userDetails = {
+        uid: 'sample-user-id',
+        serverProfile: {
+          rootOrg: {
+            rootOrgId: 'sample-rootOrgId'
+          }
+        }
+      };
+      mockProfileService.getConsent = jest.fn(() => throwError({
+        response: {
+          body: {
+            params: {
+              err: 'USER_CONSENT_NOT_FOUND'
+            }
+          },
+          responseCode: 404
+        }
+      }));
+      jest.spyOn(consentService, 'showConsentPopup').mockImplementation(() => {
+        return Promise.resolve();
+      });
+      // act
+      consentService.getConsent(userDetails, true);
+      // assert
+      setTimeout(() => {
+        expect(mockProfileService.getConsent).toHaveBeenCalledWith(request);
+        done();
+      }, 0);
+    });
+
+    it('should return null for network error of getConsent catchPart', (done) => {
+      const request: Consent = {
+        userId: 'sample-user-id',
+        consumerId: 'sample-rootOrgId',
+        objectId: 'sample-rootOrgId',
+        objectType: 'Organisation'
+      };
+      const userDetails = {
+        uid: 'sample-user-id',
+        serverProfile: {
+          rootOrg: {
+            rootOrgId: 'sample-rootOrgId'
+          }
+        }
+      };
+      mockProfileService.getConsent = jest.fn(() => throwError({
+        response: {
+          body: {
+            params: {
+              err: 'USER_CONSENT'
+            }
+          },
+          responseCode: 500
+        },
+        code: 'NETWORK_ERRO'
+      }));
+      jest.spyOn(consentService, 'showConsentPopup').mockImplementation(() => {
+        return Promise.resolve();
+      });
+      // act
+      consentService.getConsent(userDetails, true);
+      // assert
+      setTimeout(() => {
+        expect(mockProfileService.getConsent).toHaveBeenCalledWith(request);
+        done();
+      }, 0);
+    });
+  });
+});
diff --git a/src/services/consent-service.ts b/src/services/consent-service.ts
new file mode 100644
index 000000000..be0497bb2
--- /dev/null
+++ b/src/services/consent-service.ts
@@ -0,0 +1,71 @@
+import { Inject, Injectable } from '@angular/core';
+import { Consent, ProfileService } from 'sunbird-sdk';
+import { ConsentPiiPopupComponent } from '@app/app/components/popups/consent-pii-popup/consent-pii-popup.component';
+import { PopoverController } from '@ionic/angular';
+import { ConsentStatus } from '@project-sunbird/client-services/models';
+import { CommonUtilService } from './common-util.service';
+
+@Injectable()
+export class ConsentService {
+    constructor(
+        @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+        private popoverCtrl: PopoverController,
+        private commonUtilService: CommonUtilService
+    ) { }
+
+    async showConsentPopup(userDetails, isOrgConsent?) {
+        const popover = await this.popoverCtrl.create({
+            component: ConsentPiiPopupComponent,
+            componentProps: {
+                isSSOUser: isOrgConsent
+            },
+            cssClass: 'sb-popover',
+            backdropDismiss: false
+        });
+        await popover.present();
+        const dismissResponse = await popover.onDidDismiss();
+        const request: Consent = {
+            status: isOrgConsent ? ConsentStatus.ACTIVE : (dismissResponse.data.data ? ConsentStatus.ACTIVE : ConsentStatus.REVOKED),
+            userId: isOrgConsent ? userDetails.uid : (userDetails.userId ? userDetails.userId : dismissResponse.data.userId),
+            consumerId: isOrgConsent ? userDetails.serverProfile.rootOrg.rootOrgId : (
+                userDetails.channel ? userDetails.channel : userDetails.content.channel),
+            objectId: isOrgConsent ? userDetails.serverProfile.rootOrg.rootOrgId : userDetails.courseId,
+            objectType: isOrgConsent ? 'Organisation' : 'Collection'
+        };
+        const loader = await this.commonUtilService.getLoader();
+        await loader.present();
+        await this.profileService.updateConsent(request).toPromise()
+            .then(async (data) => {
+                if (!isOrgConsent) {
+                    this.commonUtilService.showToast('FRMELEMNTS_MSG_DATA_SETTINGS_SUBMITED_SUCCESSFULLY');
+                }
+                await loader.dismiss();
+            })
+            .catch((e) => {
+                loader.dismiss();
+                if (e.code === 'NETWORK_ERROR') {
+                    this.commonUtilService.showToast('ERROR_NO_INTERNET_MESSAGE');
+                }
+            });
+    }
+
+    async getConsent(userDetails, isOrgConsent?) {
+        const request: Consent = {
+            userId: isOrgConsent ? userDetails.uid : userDetails.userId,
+            consumerId: isOrgConsent ? userDetails.serverProfile.rootOrg.rootOrgId : userDetails.channel,
+            objectId: isOrgConsent ? userDetails.serverProfile.rootOrg.rootOrgId :
+             (userDetails.courseId ? userDetails.courseId : userDetails.batch.courseId),
+             objectType: isOrgConsent ? 'Organisation' : undefined
+        };
+        await this.profileService.getConsent(request).toPromise()
+            .then((data) => {
+            })
+            .catch(async (e) => {
+                if (e.response.body.params.err === 'USER_CONSENT_NOT_FOUND' && e.response.responseCode === 404) {
+                    await this.showConsentPopup(userDetails, isOrgConsent);
+                } else if (e.code === 'NETWORK_ERROR') {
+                    this.commonUtilService.showToast('ERROR_NO_INTERNET_MESSAGE');
+                }
+            });
+    }
+}
diff --git a/src/services/content/content-aggregator-handler.service.spec.ts b/src/services/content/content-aggregator-handler.service.spec.ts
new file mode 100644
index 000000000..332207603
--- /dev/null
+++ b/src/services/content/content-aggregator-handler.service.spec.ts
@@ -0,0 +1,396 @@
+import {
+    CourseService, FormService, ProfileService, ContentService, ContentAggregatorRequest,
+    ContentSearchCriteria, FormRequest
+} from '@project-sunbird/sunbird-sdk';
+import { of, throwError } from 'rxjs';
+import { AppGlobalService } from '../app-global-service.service';
+import { CommonUtilService } from '../common-util.service';
+import { ContentAggregatorHandler } from './content-aggregator-handler.service';
+import { AggregatorPageType } from './content-aggregator-namespaces';
+
+describe('ContentAggregatorHandler', () => {
+    let contentAggregatorHandler: ContentAggregatorHandler;
+    const mockappGlobalService: Partial<AppGlobalService> = {};
+    const mockcommonUtilService: Partial<CommonUtilService> = {};
+    const mockcontentService: Partial<ContentService> = {};
+    const mockcourseService: Partial<CourseService> = {};
+    const mockformService: Partial<FormService> = {};
+    const mockprofileService: Partial<ProfileService> = {};
+
+    beforeAll(() => {
+        contentAggregatorHandler = new ContentAggregatorHandler(
+            mockcourseService as CourseService,
+            mockformService as FormService,
+            mockprofileService as ProfileService,
+            mockcontentService as ContentService,
+            mockcommonUtilService as CommonUtilService,
+            mockappGlobalService as AppGlobalService,
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.restoreAllMocks();
+    });
+
+    it('should create a instane of contentAggregatorHandler', () => {
+        expect(contentAggregatorHandler).toBeTruthy();
+    });
+
+    it('should return my course for loggedIn user', (done) => {
+        // arrange
+        const request: ContentAggregatorRequest = {
+            applyFirstAvailableCombination: {
+            },
+            interceptSearchCriteria: (contentSearchCriteria: ContentSearchCriteria) => {
+                return contentSearchCriteria;
+            }
+        };
+        const pageName = AggregatorPageType.COURSE;
+        const dataSrc = ['CONTENTS', 'TRACKABLE_COURSE_CONTENTS'];
+        const formRequest: FormRequest = {
+            type: 'config',
+            subType: AggregatorPageType.COURSE,
+            action: 'get',
+            component: 'app',
+        };
+        mockappGlobalService.isUserLoggedIn = jest.fn(() => true);
+        const data = jest.fn(() => of({
+            result: [{
+                theme: {orientation: 'horizontal'},
+                title: JSON.stringify({ en: 'sample-enrolled-course' }),
+                data: {
+                    sections: [{
+                        contents: [{
+                            appIcon: 'sample-icon',
+                            name: 'sample-name'
+                        }]
+                    }]
+                }
+            }, {
+                theme: {orientation: 'vertical'},
+                title: JSON.stringify({ en: 'sample-course' }),
+                data: {
+                    sections: [{
+                        contents: {
+                            appIcon: 'sample-icon',
+                            name: 'sample-name'
+                        }
+                    }]
+                }
+            }]
+        }));
+        mockcontentService.buildContentAggregator = jest.fn(() => ({
+            aggregate: data
+        })) as any;
+        mockcommonUtilService.getTranslatedValue = jest.fn(() => 'sample-course');
+        mockcommonUtilService.getContentImg = jest.fn(() => 'sample-image');
+        // act
+        contentAggregatorHandler.aggregate(request, pageName);
+        // assert
+        setTimeout(() => {
+            expect(mockappGlobalService.isUserLoggedIn).toHaveBeenCalled();
+            expect(mockcontentService.buildContentAggregator).toHaveBeenCalledWith(mockformService, mockcourseService, mockprofileService);
+            expect(mockcommonUtilService.getTranslatedValue).toHaveBeenNthCalledWith(1,
+                JSON.stringify({ en: 'sample-enrolled-course' }), 'sample-enrolled-course');
+            expect(mockcommonUtilService.getTranslatedValue).toHaveBeenNthCalledWith(2,
+                JSON.stringify({ en: 'sample-course' }), 'sample-course');
+            expect(data).toHaveBeenCalled();
+            expect(mockcommonUtilService.getContentImg).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
+    it('should return only vertical section for guest user', (done) => {
+        // arrange
+        const request: ContentAggregatorRequest = {
+            applyFirstAvailableCombination: {
+            },
+            interceptSearchCriteria: (contentSearchCriteria: ContentSearchCriteria) => {
+                return contentSearchCriteria;
+            }
+        };
+        const pageName = AggregatorPageType.COURSE;
+        const dataSrc = ['CONTENTS'];
+        const formRequest: FormRequest = {
+            type: 'config',
+            subType: AggregatorPageType.COURSE,
+            action: 'get',
+            component: 'app',
+        };
+        mockappGlobalService.isUserLoggedIn = jest.fn(() => false);
+        const data = jest.fn(() => of({
+            result: [{
+                theme: {orientation: 'vertical'},
+                title: JSON.stringify({ en: 'sample-course' }),
+                data: {
+                    sections: [{
+                        contents: [{
+                            appIcon: 'sample-icon',
+                            name: 'sample-name'
+                        }]
+                    }]
+                }
+            }]
+        }));
+        mockcontentService.buildContentAggregator = jest.fn(() => ({
+            aggregate: data
+        })) as any;
+        mockcommonUtilService.getTranslatedValue = jest.fn(() => 'sample-course');
+        mockcommonUtilService.getContentImg = jest.fn(() => 'sample-image');
+        // act
+        contentAggregatorHandler.aggregate(request, pageName);
+        // assert
+        setTimeout(() => {
+            expect(mockappGlobalService.isUserLoggedIn).toHaveBeenCalled();
+            expect(mockcontentService.buildContentAggregator).toHaveBeenCalledWith(mockformService, mockcourseService, mockprofileService);
+            expect(mockcommonUtilService.getTranslatedValue).toHaveBeenNthCalledWith(1,
+                JSON.stringify({ en: 'sample-course' }), 'sample-course');
+            expect(data).toHaveBeenCalled();
+            expect(mockcommonUtilService.getContentImg).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
+    it('should return my Learning section for loggedIn user', (done) => {
+        // arrange
+        const request: ContentAggregatorRequest = {
+            applyFirstAvailableCombination: {
+            },
+            interceptSearchCriteria: (contentSearchCriteria: ContentSearchCriteria) => {
+                return contentSearchCriteria;
+            }
+        };
+        const pageName = AggregatorPageType.LIBRARY;
+        const dataSrc = ['CONTENTS', 'TRACKABLE_CONTENTS'];
+        const formRequest: FormRequest = {
+            type: 'config',
+            subType: AggregatorPageType.LIBRARY,
+            action: 'get',
+            component: 'app',
+        };
+        mockappGlobalService.isUserLoggedIn = jest.fn(() => true);
+        const data = jest.fn(() => of({
+            result: [{
+                theme: {orientation: 'horizontal'},
+                title: JSON.stringify({ en: 'sample-learning-course' }),
+                data: {
+                    sections: [{
+                        contents: [{
+                            appIcon: 'sample-icon',
+                            name: 'sample-name'
+                        }]
+                    }]
+                }
+            }, {
+                theme: {orientation: 'vertical'},
+                title: JSON.stringify({ en: 'sample-textbook' }),
+                data: {
+                    sections: [{
+                        contents: {
+                            appIcon: 'sample-icon',
+                            name: 'sample-name'
+                        }
+                    }]
+                }
+            }]
+        }));
+        mockcontentService.buildContentAggregator = jest.fn(() => ({
+            aggregate: data
+        })) as any;
+        mockcommonUtilService.getTranslatedValue = jest.fn(() => 'sample-course');
+        mockcommonUtilService.getContentImg = jest.fn(() => 'sample-image');
+        // act
+        contentAggregatorHandler.aggregate(request, pageName);
+        // assert
+        setTimeout(() => {
+            expect(mockappGlobalService.isUserLoggedIn).toHaveBeenCalled();
+            expect(mockcontentService.buildContentAggregator).toHaveBeenCalledWith(mockformService, mockcourseService, mockprofileService);
+            expect(mockcommonUtilService.getTranslatedValue).toHaveBeenNthCalledWith(1,
+                JSON.stringify({ en: 'sample-learning-course' }), 'sample-learning-course');
+            expect(mockcommonUtilService.getTranslatedValue).toHaveBeenNthCalledWith(2,
+                JSON.stringify({ en: 'sample-textbook' }), 'sample-textbook');
+            expect(data).toHaveBeenCalled();
+            expect(mockcommonUtilService.getContentImg).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
+    it('should not return my Learning section for guest user', (done) => {
+        // arrange
+        const request: ContentAggregatorRequest = {
+            applyFirstAvailableCombination: {
+            },
+            interceptSearchCriteria: (contentSearchCriteria: ContentSearchCriteria) => {
+                return contentSearchCriteria;
+            }
+        };
+        const pageName = AggregatorPageType.LIBRARY;
+        const dataSrc = ['CONTENTS'];
+        const formRequest: FormRequest = {
+            type: 'config',
+            subType: AggregatorPageType.LIBRARY,
+            action: 'get',
+            component: 'app',
+        };
+        mockappGlobalService.isUserLoggedIn = jest.fn(() => false);
+        const data = jest.fn(() => of({
+            result: [{
+                theme: {orientation: 'horizontal'},
+                title: JSON.stringify({ en: 'sample-learning-course' }),
+                data: {
+                    sections: [{
+                        contents: [{
+                            appIcon: 'sample-icon',
+                            name: 'sample-name'
+                        }]
+                    }]
+                }
+            }, {
+                theme: {orientation: 'vertical'},
+                title: JSON.stringify({ en: 'sample-textbook' }),
+                data: {
+                    sections: [{
+                        contents: {
+                            appIcon: 'sample-icon',
+                            name: 'sample-name'
+                        }
+                    }]
+                }
+            }]
+        }));
+        mockcontentService.buildContentAggregator = jest.fn(() => ({
+            aggregate: data
+        })) as any;
+        mockcommonUtilService.getTranslatedValue = jest.fn(() => 'sample-course');
+        mockcommonUtilService.getContentImg = jest.fn(() => 'sample-image');
+        // act
+        contentAggregatorHandler.aggregate(request, pageName);
+        // assert
+        setTimeout(() => {
+            expect(mockappGlobalService.isUserLoggedIn).toHaveBeenCalled();
+            expect(mockcontentService.buildContentAggregator).toHaveBeenCalledWith(mockformService, mockcourseService, mockprofileService);
+            expect(mockcommonUtilService.getTranslatedValue).toHaveBeenNthCalledWith(1,
+                JSON.stringify({ en: 'sample-learning-course' }), 'sample-learning-course');
+            expect(mockcommonUtilService.getTranslatedValue).toHaveBeenNthCalledWith(2,
+                JSON.stringify({ en: 'sample-textbook' }), 'sample-textbook');
+            expect(data).toHaveBeenCalled();
+            expect(mockcommonUtilService.getContentImg).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
+    it('should return null if orientation is undefined', (done) => {
+        // arrange
+        const request: ContentAggregatorRequest = {
+            applyFirstAvailableCombination: {
+            },
+            interceptSearchCriteria: (contentSearchCriteria: ContentSearchCriteria) => {
+                return contentSearchCriteria;
+            }
+        };
+        const pageName = AggregatorPageType.LIBRARY;
+        const dataSrc = ['CONTENTS'];
+        const formRequest: FormRequest = {
+            type: 'config',
+            subType: AggregatorPageType.LIBRARY,
+            action: 'get',
+            component: 'app',
+        };
+        mockcommonUtilService.getTranslatedValue = jest.fn();
+        mockappGlobalService.isUserLoggedIn = jest.fn(() => false);
+        const data = jest.fn(() => of({
+            result: [{
+                theme: { orientation: undefined},
+                title: JSON.stringify({ en: 'sample-textbook' }),
+                data: {
+                    sections: [{
+                        contents: {
+                            appIcon: 'sample-icon',
+                            name: 'sample-name'
+                        }
+                    }]
+                }
+            }]
+        }));
+        mockcontentService.buildContentAggregator = jest.fn(() => ({
+            aggregate: data
+        })) as any;
+        // act
+        contentAggregatorHandler.aggregate(request, pageName);
+        // assert
+        setTimeout(() => {
+            expect(mockappGlobalService.isUserLoggedIn).toHaveBeenCalled();
+            expect(mockcontentService.buildContentAggregator).toHaveBeenCalledWith(mockformService, mockcourseService, mockprofileService);
+            expect(data).toHaveBeenCalled();
+            expect(mockcommonUtilService.getTranslatedValue).toHaveBeenCalledWith('{\"en\":\"sample-textbook\"}', 'sample-textbook');
+            done();
+        }, 0);
+    });
+
+    it('should return nill if list is empty', (done) => {
+        // arrange
+        const request: ContentAggregatorRequest = {
+            applyFirstAvailableCombination: {
+            },
+            interceptSearchCriteria: (contentSearchCriteria: ContentSearchCriteria) => {
+                return contentSearchCriteria;
+            }
+        };
+        const pageName = AggregatorPageType.LIBRARY;
+        const dataSrc = ['CONTENTS'];
+        const formRequest: FormRequest = {
+            type: 'config',
+            subType: AggregatorPageType.LIBRARY,
+            action: 'get',
+            component: 'app',
+        };
+        mockappGlobalService.isUserLoggedIn = jest.fn(() => false);
+        const data = jest.fn(() => of({}));
+        mockcontentService.buildContentAggregator = jest.fn(() => ({
+            aggregate: data
+        })) as any;
+        // act
+        contentAggregatorHandler.aggregate(request, pageName);
+        // assert
+        setTimeout(() => {
+            expect(mockappGlobalService.isUserLoggedIn).toHaveBeenCalled();
+            expect(mockcontentService.buildContentAggregator).toHaveBeenCalledWith(mockformService, mockcourseService, mockprofileService);
+            expect(data).toHaveBeenCalled();
+            done();
+        }, 0);
+    });
+
+    it('should return error for cath part', (done) => {
+        // arrange
+        const request: ContentAggregatorRequest = {
+            applyFirstAvailableCombination: {
+            },
+            interceptSearchCriteria: (contentSearchCriteria: ContentSearchCriteria) => {
+                return contentSearchCriteria;
+            }
+        };
+        const pageName = AggregatorPageType.LIBRARY;
+        const dataSrc = ['CONTENTS'];
+        const formRequest: FormRequest = {
+            type: 'config',
+            subType: AggregatorPageType.LIBRARY,
+            action: 'get',
+            component: 'app',
+        };
+        mockappGlobalService.isUserLoggedIn = jest.fn(() => false);
+        const data = jest.fn(() => throwError({
+            result: []
+        }));
+        mockcontentService.buildContentAggregator = jest.fn(() => ({
+            aggregate: data
+        })) as any;
+        // act
+        contentAggregatorHandler.aggregate(request, pageName).catch(() => {
+            expect(mockappGlobalService.isUserLoggedIn).toHaveBeenCalled();
+            expect(mockcontentService.buildContentAggregator).toHaveBeenCalledWith(mockformService, mockcourseService, mockprofileService);
+            expect(data).toHaveBeenCalled();
+            done();
+        });
+    });
+});
diff --git a/src/services/content/content-aggregator-handler.service.ts b/src/services/content/content-aggregator-handler.service.ts
new file mode 100644
index 000000000..0c417d69b
--- /dev/null
+++ b/src/services/content/content-aggregator-handler.service.ts
@@ -0,0 +1,123 @@
+import { Inject, Injectable } from '@angular/core';
+import {
+    CachedItemRequestSourceFrom,
+    ContentAggregatorResponse, ContentService, CourseService, FormRequest,
+    FormService, ProfileService
+} from '@project-sunbird/sunbird-sdk';
+import { DataSourceType } from '@project-sunbird/sunbird-sdk/content/handlers/content-aggregator';
+import { AppGlobalService } from '../app-global-service.service';
+import { CommonUtilService } from '../common-util.service';
+import { AggregatorPageType, Orientation } from './content-aggregator-namespaces';
+
+@Injectable()
+
+export class ContentAggregatorHandler {
+    aggregatorResponse: any;
+    private iconMap = {
+        program: 'assets/imgs/ic_program.svg',
+        project: 'assets/imgs/ic_project.svg',
+        observation: 'assets/imgs/ic_observation.svg',
+        survey: 'assets/imgs/ic_survey.svg',
+        report: 'assets/imgs/ic_report.svg',
+        course: 'assets/imgs/ic_course_admin.svg'
+    };
+    constructor(
+        @Inject('COURSE_SERVICE') private courseService: CourseService,
+        @Inject('FORM_SERVICE') private formService: FormService,
+        @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+        @Inject('CONTENT_SERVICE') private contentService: ContentService,
+        public commonUtilService: CommonUtilService,
+        private appGlobalService: AppGlobalService,
+    ) { }
+
+    async aggregate(request, pageName): Promise<any> {
+        let dataSrc: DataSourceType[] = ['TRACKABLE_COLLECTIONS'];
+
+        if (this.appGlobalService.isUserLoggedIn()) {
+            dataSrc = [];
+        }
+        const formRequest: FormRequest = {
+            type: 'config',
+            subType: pageName,
+            action: 'get',
+            component: 'app',
+        };
+        try {
+            this.aggregatorResponse = await this.aggregateContent(request, dataSrc, formRequest);
+            if (this.aggregatorResponse && this.aggregatorResponse.result) {
+                this.aggregatorResponse.result.forEach((val) => {
+                    val['name'] = this.commonUtilService.getTranslatedValue(val.title, JSON.parse(val.title)['en']);
+                    if (val.theme.orientation === Orientation.HORIZONTAL && val.data.sections.length
+                        && val.data.sections[0].contents && val.data.sections[0].contents.length) {
+                        for (let count = 0; count < val.data.sections[0].contents.length; count++) {
+                            val.data.sections[0].contents[count]['cardImg'] =
+                                this.commonUtilService.getContentImg(val.data.sections[0].contents[count]);
+                        }
+                    } else if (val.theme.orientation === Orientation.VERTICAL) {
+                        for (let i = 0; i < val.data.sections.length; i++) {
+                            if (val.data.sections[i].contents && val.data.sections[i].contents.length) {
+                                for (let count = 0; count < val.data.sections[i].contents.length; count++) {
+                                    val.data.sections[i].contents[count]['cardImg'] =
+                                        this.commonUtilService.getContentImg(val.data.sections[i].contents[count]);
+                                }
+                            }
+                        }
+                    }
+                });
+            }
+            return this.aggregatorResponse.result;
+        } catch (e) {
+            console.error(e);
+            throw e;
+        }
+    }
+
+
+    async newAggregate(request, pageName: AggregatorPageType): Promise<any> {
+        let dataSrc: DataSourceType[] = ['TRACKABLE_COLLECTIONS'];
+
+        if (this.appGlobalService.isUserLoggedIn()) {
+            dataSrc = [];
+        }
+
+        const formRequest: FormRequest = {
+            type: 'config',
+            subType: pageName,
+            action: 'get',
+            component: 'app',
+        };
+        try {
+            this.aggregatorResponse = await this.aggregateContent(request, dataSrc, formRequest);
+            return this.aggregatorResponse.result;
+        } catch (e) {
+            console.error(e);
+            throw e;
+        }
+    }
+
+    private async aggregateContent(request, dataSrc, formRequest): Promise<ContentAggregatorResponse> {
+        return this.contentService.buildContentAggregator(this.formService, this.courseService, this.profileService)
+            .aggregate(request, dataSrc, formRequest, undefined, true).toPromise();
+    }
+
+    public populateIcons(aggregatorResponse) {
+        if (!aggregatorResponse) {
+            return aggregatorResponse;
+        }
+        aggregatorResponse.forEach((displaySection) => {
+            if (displaySection.dataSrc.type === 'CONTENT_FACETS' && displaySection.data && displaySection.data.length) {
+                displaySection.data.forEach((element) => {
+                    element['icon'] = this.iconMap[element.code];
+                });
+            } else if (displaySection.dataSrc.type === 'TRACKABLE_COLLECTIONS' &&
+            displaySection.data.sections.length && displaySection.data.sections[0].contents) {
+                displaySection.data.sections[0].contents.forEach((value, index) => {
+                    value['cardImg'] = value['courseLogoUrl'] || (value.content && value.content['appIcon']) ||
+                    'assets/imgs/ic_launcher.png';
+                    value = value.content;
+                });
+            }
+        });
+        return aggregatorResponse;
+    }
+}
diff --git a/src/services/content/content-aggregator-namespaces.ts b/src/services/content/content-aggregator-namespaces.ts
new file mode 100644
index 000000000..16eb59438
--- /dev/null
+++ b/src/services/content/content-aggregator-namespaces.ts
@@ -0,0 +1,13 @@
+export enum AggregatorPageType {
+    COURSE = 'course_v3',
+    LIBRARY = 'library_v4',
+    HOME = 'home_v2',
+    DISCOVER = 'discover',
+    SEARCH = 'search',
+    ADMIN_HOME = 'adminHome_v2'
+}
+
+export enum Orientation {
+    HORIZONTAL = 'horizontal',
+    VERTICAL = 'vertical'
+}
diff --git a/src/services/content/content-delete-handler.spec.ts b/src/services/content/content-delete-handler.spec.ts
index 46ef833b0..9175e6a5d 100644
--- a/src/services/content/content-delete-handler.spec.ts
+++ b/src/services/content/content-delete-handler.spec.ts
@@ -4,7 +4,8 @@ import { InteractSubtype, Environment, PageId, ImpressionType, InteractType } fr
 import { FileSizePipe } from '../../pipes/file-size/file-size';
 import { of, throwError } from 'rxjs';
 import { ContentService, Content, TelemetryObject } from 'sunbird-sdk';
-import { PopoverController, Events } from '@ionic/angular';
+import { PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { ContentInfo } from './content-info';
 describe('ContentDeleteHandler', () => {
     let contentDeleteHandler: ContentDeleteHandler;
@@ -94,6 +95,7 @@ describe('ContentDeleteHandler', () => {
             }), 0);
         });
 
+
         it('should  show CONTENT_DELETE_FAILED TOAST if content not found', (done) => {
             // arrange
             mockContentService.deleteContent = jest.fn(() => of({ status: -1 } as any));
@@ -151,5 +153,40 @@ describe('ContentDeleteHandler', () => {
                 done();
             }, 0);
         });
+
+        it('should show Delete Popup if sizeOnDevice is available', () => {
+            // arrange
+            content['sizeOnDevice'] = 1000;
+            jest.spyOn(contentDeleteHandler, 'deleteContent').mockImplementation();
+            // act
+            contentDeleteHandler.showContentDeletePopup(content, true, { telemetryObject } as ContentInfo, 'content-detail');
+            // assert
+            expect(mockPopoverController.create).toHaveBeenCalled();
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(ImpressionType.VIEW, 'content-detail',
+                PageId.SINGLE_DELETE_CONFIRMATION_POPUP,
+                Environment.HOME,
+                telemetryObject.id,
+                telemetryObject.type,
+                telemetryObject.version,
+                undefined,
+                undefined);
+        });
+
+        it('should not invoke deleteCOntent if popup doesnot send canDelete', () => {
+            // arrange
+            content['sizeOnDevice'] = 1000;
+            mockPopoverController.create = jest.fn(() => (Promise.resolve({
+                present: jest.fn(() => Promise.resolve({})),
+                onDidDismiss: jest.fn(() => Promise.resolve({ data: {} }))
+            } as any)));
+            const deleteContentMock = jest.spyOn(contentDeleteHandler, 'deleteContent');
+            deleteContentMock .mockImplementation();
+            // act
+            contentDeleteHandler.showContentDeletePopup(content, true, { telemetryObject } as ContentInfo, 'content-detail');
+            // assert
+            expect(mockPopoverController.create).toHaveBeenCalled();
+            expect(deleteContentMock).not.toHaveBeenCalled();
+        });
+
     });
 });
diff --git a/src/services/content/content-delete-handler.ts b/src/services/content/content-delete-handler.ts
index 55009b694..4be116802 100644
--- a/src/services/content/content-delete-handler.ts
+++ b/src/services/content/content-delete-handler.ts
@@ -1,5 +1,6 @@
 import { Injectable, Inject } from '@angular/core';
-import { PopoverController, Events } from '@ionic/angular';
+import { PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { Subject } from 'rxjs';
 import { ContentService, InteractType, Content, ContentDeleteStatus } from 'sunbird-sdk';
 
diff --git a/src/services/content/content-share-handler.service.spec.ts b/src/services/content/content-share-handler.service.spec.ts
index 0cad6951a..2af3f0c93 100644
--- a/src/services/content/content-share-handler.service.spec.ts
+++ b/src/services/content/content-share-handler.service.spec.ts
@@ -1,260 +1,658 @@
-import { of } from 'rxjs';
+import { of, throwError } from 'rxjs';
 import { SocialSharing } from '@ionic-native/social-sharing/ngx';
-import { ContentService, StorageService, Content, ContentData, DeviceInfo, ContentExportResponse, ContentExportRequest } from 'sunbird-sdk';
-import { ContentShareHandlerService, CommonUtilService, TelemetryGeneratorService } from '../../services';
+import {
+    ContentService, StorageService, Content
+} from 'sunbird-sdk';
+import {
+    ContentShareHandlerService, CommonUtilService,
+    TelemetryGeneratorService
+} from '../../services';
 import { AppVersion } from '@ionic-native/app-version/ngx';
+import {
+    InteractType, InteractSubtype,
+    Environment, PageId
+} from '../telemetry-constants';
+import { CsContentType } from '@project-sunbird/client-services/services/content';
+import { AppGlobalService } from '../app-global-service.service';
+
 describe('ContentShareHandlerService', () => {
+
     let contentShareHandlerService: ContentShareHandlerService;
-    const mockContentService: Partial<ContentService> = {
-        exportContent: jest.fn(() => of({ exportedFilePath: 'sample_path'} as any))
-    };
-    const mockStorageService: Partial<StorageService> = {
-        getStorageDestinationDirectoryPath: jest.fn(() => 'dirpath')
-    };
-    const mockDeviceInfo: Partial<DeviceInfo> = {
-        getDeviceID: jest.fn(() => 'device_id')
-    };
+
+    const mockContentService: Partial<ContentService> = {};
+    const mockStorageService: Partial<StorageService> = {};
     const mockCommonUtilService: Partial<CommonUtilService> = {
-        showToast: jest.fn(),
-        getAppName: jest.fn(() => Promise.resolve('resolved')),
-        translateMessage: jest.fn(() => 'Try this: ')
-    };
-    const mockSocialSharing: Partial<SocialSharing> = {
-        share: jest.fn()
+        getAppName: jest.fn(() => Promise.resolve('app_name'))
     };
-    const mockAppVersion: Partial<AppVersion> = {
-        getPackageName: jest.fn(() => Promise.resolve('org.sunbird.app'))
+    const mockSocialSharing: Partial<SocialSharing> = {};
+    const mockAppVersion: Partial<AppVersion> = {};
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        setNativePopupVisible: jest.fn()
     };
-    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
-        generateImpressionTelemetry: jest.fn(),
-        generateInteractTelemetry: jest.fn(),
-        generateBackClickedTelemetry: jest.fn()
-    };
-    const dismissFn = jest.fn(() => Promise.resolve());
-    const presentFn = jest.fn(() => Promise.resolve());
-    mockCommonUtilService.getLoader = jest.fn(() => ({
-        present: presentFn,
-        dismiss: dismissFn,
-    }));
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
 
     beforeAll(() => {
         contentShareHandlerService = new ContentShareHandlerService(
-        mockContentService as ContentService,
-        mockStorageService as StorageService,
-        mockDeviceInfo as DeviceInfo,
-        mockCommonUtilService as CommonUtilService,
-        mockSocialSharing as SocialSharing,
-        mockTelemetryGeneratorService as TelemetryGeneratorService,
-        mockAppVersion as AppVersion
+            mockContentService as ContentService,
+            mockStorageService as StorageService,
+            mockCommonUtilService as CommonUtilService,
+            mockSocialSharing as SocialSharing,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockAppVersion as AppVersion,
+            mockAppGlobalService as AppGlobalService
         );
     });
 
     beforeEach(() => {
         jest.clearAllMocks();
+        jest.resetAllMocks();
     });
 
     it('should create a instance of sbSharePopupComponent', () => {
         expect(contentShareHandlerService).toBeTruthy();
     });
 
-    describe('exportContent()', () => {
-        it('should export the content', (done) => {
+    describe('shareContent', () => {
+        it('should go to catch block if throws error', (done) => {
             // arrange
             const shareParams = {
                 byFile: true
             };
-            const content = {
-                identifier: 'id',
+            const content: Partial<Content> = {
+                identifier: 'do_id',
+                contentType: 'contentType',
+                primaryCategory: 'primaryCategory',
                 contentData: {
                     contentType: 'contentType',
-                    pkgVersion: '1',
-                    name : 'Sample_name'
-                } as ContentData,
-                contentType: 'contentType',
-            } as Content;
+                    primaryCategory: 'primaryCategory',
+                }
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockStorageService.getStorageDestinationDirectoryPath = jest.fn(() => ('dirpath'));
+            mockContentService.exportContent = jest.fn(() => throwError({ error: 'error' }));
+            const values = new Map();
+            values['ContentType'] = content.contentData.contentType;
+            mockCommonUtilService.showToast = jest.fn();
+
             // act
-            contentShareHandlerService.exportContent({
-                destinationFolder: 'destination_folder'
-            } as any, shareParams, content);
+            contentShareHandlerService.shareContent(shareParams, content as Content, undefined, [], [], { l1: 'do_id' }, 'content-detail');
+
             // assert
             setTimeout(() => {
-                expect(mockSocialSharing.share).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH, InteractSubtype.SHARE_CONTENT_INITIATED,
+                    Environment.HOME, PageId.CONTENT_DETAIL,
+                    {
+                        id: 'do_id', type: 'primaryCategory', version: ''
+                    },
+                    values, { l1: 'do_id' }, []);
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockStorageService.getStorageDestinationDirectoryPath).toHaveBeenCalled();
+                expect(mockContentService.exportContent).toHaveBeenCalledWith(
+                    { contentIds: ['do_id'], destinationFolder: 'dirpath', subContentIds: [] }
+                );
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('SHARE_CONTENT_FAILED');
                 done();
             }, 0);
+        });
+
+        it('should share content file', (done) => {
+            // arrange
+            const shareParams = {
+                byFile: true
+            };
+            const content: Partial<Content> = {
+                identifier: 'do_id',
+                contentType: 'contentType',
+                contentData: {
+                    contentType: 'contentType',
+                    primaryCategory: 'primaryCategory',
+                }
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            const contentExportResponse = {
+                exportedFilePath: 'samplepath'
+            };
+            mockStorageService.getStorageDestinationDirectoryPath = jest.fn(() => ('dirpath'));
+            mockContentService.exportContent = jest.fn(() => of(contentExportResponse));
+            mockAppVersion.getPackageName = jest.fn(() => Promise.resolve('org.sunbird.app'));
+            mockCommonUtilService.translateMessage = jest.fn((key, fields) => {
+                switch (key) {
+                    case 'SHARE_CONTENT_FILE':
+                        return 'SHARE_CONTENT_FILE';
+                }
+            });
+            mockSocialSharing.share = jest.fn();
+            const values = new Map();
+            values['ContentType'] = content.contentData.contentType;
+            // mockCommonUtilService.showToast = jest.fn();
+
+            // act
+            contentShareHandlerService.shareContent(shareParams, content as Content, undefined, [], [], { l1: 'do_id' },
+                PageId.CONTENT_DETAIL);
 
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH, InteractSubtype.SHARE_CONTENT_INITIATED,
+                    Environment.HOME, PageId.CONTENT_DETAIL,
+                    {
+                        id: 'do_id', type: 'primaryCategory', version: ''
+                    },
+                    values, { l1: 'do_id' }, []);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.OTHER, InteractSubtype.SHARE_CONTENT_SUCCESS,
+                    Environment.HOME, PageId.CONTENT_DETAIL,
+                    {
+                        id: 'do_id', type: 'primaryCategory', version: ''
+                    },
+                    values, { l1: 'do_id' }, []);
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockStorageService.getStorageDestinationDirectoryPath).toHaveBeenCalled();
+                expect(mockContentService.exportContent).toHaveBeenCalledWith(
+                    { contentIds: ['do_id'], destinationFolder: 'dirpath', subContentIds: [] }
+                );
+                expect(mockAppVersion.getPackageName).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('SHARE_CONTENT_FILE', {
+                    app_name: 'app_name',
+                    content_name: content.contentData.name,
+                    play_store_url: 'https://play.google.com/store/apps/details?id=org.sunbird.app&referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_app'
+                });
+                // expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('COURSE_ENROLLED');
+                expect(mockSocialSharing.share).toHaveBeenCalledWith('SHARE_CONTENT_FILE', '', '' + 'samplepath', '');
+                done();
+            }, 0);
         });
 
-        it('should show FILE_SAVED TOAST while saving the content', (done) => {
+        it('should share textbook with selected child content', (done) => {
             // arrange
             const shareParams = {
-                saveFile: true
+                byFile: true
             };
-            const content = {
-                identifier: 'id',
+            const content: Partial<Content> = {
+                identifier: 'do_id',
+                contentType: 'contentType',
                 contentData: {
                     contentType: 'contentType',
-                    pkgVersion: '1',
-                    name : 'Sample_name'
-                } as ContentData,
+                    primaryCategory: 'primaryCategory',
+                }
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            const contentExportResponse = {
+                exportedFilePath: 'samplepath'
+            };
+            mockStorageService.getStorageDestinationDirectoryPath = jest.fn(() => ('dirpath'));
+            mockContentService.exportContent = jest.fn(() => of(contentExportResponse));
+            mockAppVersion.getPackageName = jest.fn(() => Promise.resolve('org.sunbird.app'));
+            mockCommonUtilService.translateMessage = jest.fn((key, fields) => {
+                switch (key) {
+                    case 'SHARE_CONTENT_FILE':
+                        return 'SHARE_CONTENT_FILE';
+                }
+            });
+            mockSocialSharing.share = jest.fn();
+            const values = new Map();
+            values['ContentType'] = content.contentData.contentType;
+            // mockCommonUtilService.showToast = jest.fn();
+
+            // act
+            contentShareHandlerService.shareContent(shareParams, content as Content,
+                undefined, ['child_do_id'], [], { l1: 'textbook_do_id' }, PageId.CONTENT_DETAIL);
+
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH, InteractSubtype.SHARE_CONTENT_INITIATED,
+                    Environment.HOME, PageId.CONTENT_DETAIL,
+                    {
+                        id: 'do_id', type: 'primaryCategory', version: ''
+                    },
+                    values, { l1: 'textbook_do_id' }, []);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.OTHER, InteractSubtype.SHARE_CONTENT_SUCCESS,
+                    Environment.HOME, PageId.CONTENT_DETAIL,
+                    {
+                        id: 'do_id', type: 'primaryCategory', version: ''
+                    },
+                    values, { l1: 'textbook_do_id' }, []);
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockStorageService.getStorageDestinationDirectoryPath).toHaveBeenCalled();
+                expect(mockContentService.exportContent).toHaveBeenCalledWith(
+                    { contentIds: ['textbook_do_id'], destinationFolder: 'dirpath', subContentIds: ['child_do_id'] }
+                );
+                expect(mockAppVersion.getPackageName).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('SHARE_CONTENT_FILE', {
+                    app_name: 'app_name',
+                    content_name: content.contentData.name,
+                    play_store_url: 'https://play.google.com/store/apps/details?id=org.sunbird.app&referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_app'
+                });
+                // expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('COURSE_ENROLLED');
+                expect(mockSocialSharing.share).toHaveBeenCalledWith('SHARE_CONTENT_FILE', '', '' + 'samplepath', '');
+                done();
+            }, 0);
+        });
+
+        it('should share content link', (done) => {
+            // arrange
+            const shareParams = {
+                byLink: true,
+                link: 'shareUrl'
+            };
+            const content: Partial<Content> = {
+                identifier: 'do_id',
                 contentType: 'contentType',
-            } as Content;
+                contentData: {
+                    contentType: 'contentType',
+                    primaryCategory: 'primaryCategory',
+                }
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockAppVersion.getPackageName = jest.fn(() => Promise.resolve('org.sunbird.app'));
+            mockCommonUtilService.translateMessage = jest.fn((key, fields) => {
+                switch (key) {
+                    case 'SHARE_CONTENT_LINK':
+                        return 'SHARE_CONTENT_LINK';
+                }
+            });
+            mockSocialSharing.share = jest.fn();
+            const values = new Map();
+            values['ContentType'] = content.contentData.contentType;
+
             // act
-            contentShareHandlerService.exportContent({
-                destinationFolder: 'destination_folder'
-            } as any, shareParams, content);
+            contentShareHandlerService.shareContent(shareParams, content as Content, undefined, [], [], { l1: 'do_id' },
+             PageId.CONTENT_DETAIL);
+
             // assert
             setTimeout(() => {
-                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('FILE_SAVED', '', 'green-toast');
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH, InteractSubtype.SHARE_CONTENT_INITIATED,
+                    Environment.HOME, PageId.CONTENT_DETAIL,
+                    {
+                        id: 'do_id', type: 'primaryCategory', version: ''
+                    },
+                    values, { l1: 'do_id' }, []);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.OTHER, InteractSubtype.SHARE_CONTENT_SUCCESS,
+                    Environment.HOME, PageId.CONTENT_DETAIL,
+                    {
+                        id: 'do_id', type: 'primaryCategory', version: ''
+                    },
+                    values, { l1: 'do_id' }, []);
+                expect(mockAppVersion.getPackageName).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('SHARE_CONTENT_LINK', {
+                    app_name: 'app_name',
+                    content_link: 'shareUrl?referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_content',
+                    content_name: content.contentData.name,
+                    play_store_url: 'https://play.google.com/store/apps/details?id=org.sunbird.app&referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_app'
+                });
+                expect(mockSocialSharing.share).toHaveBeenCalledWith(null, null, null, 'SHARE_CONTENT_LINK');
                 done();
             }, 0);
+        });
 
+        it('should share course link', (done) => {
+            // arrange
+            const shareParams = {
+                byLink: true,
+                link: 'shareUrl'
+            };
+            const content: Partial<Content> = {
+                identifier: 'do_id',
+                contentData: {
+                    contentType: CsContentType.COURSE,
+                    primaryCategory: 'Course',
+                }
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockAppVersion.getPackageName = jest.fn(() => Promise.resolve('org.sunbird.app'));
+            mockCommonUtilService.translateMessage = jest.fn((key, fields) => {
+                switch (key) {
+                    case 'SHARE_CONTENT_LINK':
+                        return 'SHARE_CONTENT_LINK';
+                }
+            });
+            mockSocialSharing.share = jest.fn();
+            const values = new Map();
+            values['ContentType'] = content.contentData.contentType;
+
+            // act
+            contentShareHandlerService.shareContent(shareParams, content as Content, undefined, [], [], { l1: 'do_id' },
+            PageId.COURSE_DETAIL);
+
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH, InteractSubtype.SHARE_CONTENT_INITIATED,
+                    Environment.HOME, PageId.COURSE_DETAIL,
+                    {
+                        id: 'do_id', type: 'Course', version: ''
+                    },
+                    values, { l1: 'do_id' }, []);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.OTHER, InteractSubtype.SHARE_CONTENT_SUCCESS,
+                    Environment.HOME, PageId.COURSE_DETAIL,
+                    {
+                        id: 'do_id', type: CsContentType.COURSE, version: ''
+                    },
+                    values, { l1: 'do_id' }, []);
+                expect(mockAppVersion.getPackageName).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('SHARE_CONTENT_LINK', {
+                    app_name: 'app_name',
+                    content_link: 'shareUrl?referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_content',
+                    content_name: content.contentData.name,
+                    play_store_url: 'https://play.google.com/store/apps/details?id=org.sunbird.app&referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_app'
+                });
+                expect(mockSocialSharing.share).toHaveBeenCalledWith(null, null, null, 'SHARE_CONTENT_LINK');
+                done();
+            }, 0);
         });
-    });
 
-    it('should call export content', (done) => {
-        // arrange
-        const exportContentRequest = {
-            destinationFolder: 'destinationFolder',
-            contentIds: ['id1']
-        };
-        const contentExportResponse = {
-            exportedFilePath: 'samplepath'
-        };
-        const shareParams = {
-            byFile: true
-        };
-        const content: Partial<Content> = {
-            identifier: 'id',
-            contentType: 'contentType',
-        };
-        contentShareHandlerService.generateShareInteractEvents = jest.fn();
-        mockContentService.exportContent = jest.fn(() => of(contentExportResponse));
-        // act
-        contentShareHandlerService.exportContent(exportContentRequest, shareParams, content as Content);
-        // assert
-        setTimeout(() => {
-            // expect(mockSocialSharing.share).toHaveBeenCalled();
-            done();
-        }, 100);
-    });
+        it('should share course module link', (done) => {
+            // arrange
+            const shareParams = {
+                byLink: true,
+                link: 'shareUrl'
+            };
+            const content: Partial<Content> = {
+                identifier: 'do_id',
+                contentData: {
+                    contentType: CsContentType.COURSE,
+                    primaryCategory: 'Course',
+                }
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockAppVersion.getPackageName = jest.fn(() => Promise.resolve('org.sunbird.app'));
+            mockCommonUtilService.translateMessage = jest.fn((key, fields) => {
+                switch (key) {
+                    case 'SHARE_CONTENT_LINK':
+                        return 'SHARE_CONTENT_LINK';
+                }
+            });
+            mockSocialSharing.share = jest.fn();
+            const values = new Map();
+            values['ContentType'] = content.contentData.contentType;
 
-    it('should share link', (done) => {
-        // arrange
-        contentShareHandlerService.exportContent = jest.fn();
-        contentShareHandlerService.generateShareInteractEvents = jest.fn();
-        const shareParams = {
-            byLink: true,
-            link: 'link'
-        };
-        const contentData: Partial<ContentData> = {
-            contentType: 'dummyType'
-        };
-        const content: Partial<Content> = {
-            identifier: 'id',
-            contentType: 'contentType',
-            contentData: contentData as ContentData
-        };
-        // act
-        contentShareHandlerService.shareContent(shareParams, content as Content);
-        // assert
-        setTimeout(() => {
-            expect(mockSocialSharing.share).toHaveBeenCalled();
-            done();
-        }, 0);
-    });
+            // act
+            contentShareHandlerService.shareContent(shareParams, content as Content, 'module_do_id', [], [], { l1: 'do_id' },
+            PageId.COURSE_DETAIL);
 
-    it('should fetch roo content if heirararchyinfo is there', (done) => {
-        // arrange
-        contentShareHandlerService.exportContent = jest.fn();
-        const shareParams = {
-            byFile: true
-        };
-        const content = {
-            identifier: 'id',
-            contentData: {
-                contentType: 'contentType',
-                pkgVersion: '1',
-                name : 'Sample_name'
-            } as ContentData,
-            contentType: 'contentType',
-            hierarchyInfo: [{identifier: 'id1'}, {identifier: 'id2'}] as any
-        } as Content;
-        const contentResp = {
-            identifier: 'id',
-            contentData: {
-                contentType: 'contentType',
-                pkgVersion: '1',
-                name : 'Sample_name'
-            } as ContentData,
-            contentType: 'contentType',
-        } as Content;
-        mockContentService.getContentDetails = jest.fn(() => of(contentResp as any));
-        // act
-        contentShareHandlerService.shareContent(shareParams, content as Content);
-        // assert
-        expect(mockContentService.getContentDetails).toBeCalled();
-        setTimeout(() => {
-            expect(contentShareHandlerService.exportContent).toBeCalled();
-            done();
-        }, 0);
-    });
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH, InteractSubtype.SHARE_CONTENT_INITIATED,
+                    Environment.HOME, PageId.COURSE_DETAIL,
+                    {
+                        id: 'do_id', type: 'Course', version: ''
+                    },
+                    values, { l1: 'do_id' }, []);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.OTHER, InteractSubtype.SHARE_CONTENT_SUCCESS,
+                    Environment.HOME, PageId.COURSE_DETAIL,
+                    {
+                        id: 'do_id', type: CsContentType.COURSE, version: ''
+                    },
+                    values, { l1: 'do_id' }, []);
+                expect(mockAppVersion.getPackageName).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('SHARE_CONTENT_LINK', {
+                    app_name: 'app_name',
+                    content_link: 'shareUrl?referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_content&moduleId=module_do_id',
+                    content_name: content.contentData.name,
+                    play_store_url: 'https://play.google.com/store/apps/details?id=org.sunbird.app&referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_app'
+                });
+                expect(mockSocialSharing.share).toHaveBeenCalledWith(null, null, null, 'SHARE_CONTENT_LINK');
+                done();
+            }, 0);
+        });
 
-    it('should share file', () => {
-        // arrange
-        contentShareHandlerService.exportContent = jest.fn();
-        const shareParams = {
-            byFile: true
-        };
-        const content = {
-            identifier: 'id',
-            contentData: {
-                contentType: 'contentType',
-                pkgVersion: '1'
-            } as ContentData,
-            contentType: 'contentType',
-        };
-        // act
-        contentShareHandlerService.shareContent(shareParams, content as Content);
-        // assert
-        expect(contentShareHandlerService.exportContent).toBeCalled();
-    });
+        it('should share textbook link', (done) => {
+            // arrange
+            const shareParams = {
+                byLink: true,
+                link: 'shareUrl'
+            };
+            const content: Partial<Content> = {
+                identifier: 'do_id',
+                contentData: {
+                    contentType: CsContentType.TEXTBOOK,
+                    primaryCategory: 'Digital Textbook',
+                }
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockAppVersion.getPackageName = jest.fn(() => Promise.resolve('org.sunbird.app'));
+            mockCommonUtilService.translateMessage = jest.fn((key, fields) => {
+                switch (key) {
+                    case 'SHARE_CONTENT_LINK':
+                        return 'SHARE_CONTENT_LINK';
+                }
+            });
+            mockSocialSharing.share = jest.fn();
+            const values = new Map();
+            values['ContentType'] = content.contentData.contentType;
+
+            // act
+            contentShareHandlerService.shareContent(shareParams, content as Content, undefined, [], [], { l1: 'do_id' },
+            PageId.COLLECTION_DETAIL);
+
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH, InteractSubtype.SHARE_CONTENT_INITIATED,
+                    Environment.HOME, PageId.COLLECTION_DETAIL,
+                    {
+                        id: 'do_id', type: 'Digital Textbook', version: ''
+                    },
+                    values, { l1: 'do_id' }, []);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.OTHER, InteractSubtype.SHARE_CONTENT_SUCCESS,
+                    Environment.HOME, PageId.COLLECTION_DETAIL,
+                    {
+                        id: 'do_id', type: 'Digital Textbook', version: ''
+                    },
+                    values, { l1: 'do_id' }, []);
+                expect(mockAppVersion.getPackageName).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('SHARE_CONTENT_LINK', {
+                    app_name: 'app_name',
+                    content_link: 'shareUrl?referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_content',
+                    content_name: content.contentData.name,
+                    play_store_url: 'https://play.google.com/store/apps/details?id=org.sunbird.app&referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_app'
+                });
+                expect(mockSocialSharing.share).toHaveBeenCalledWith(null, null, null, 'SHARE_CONTENT_LINK');
+                done();
+            }, 0);
+        });
+
+        it('should share link of content of textbook', (done) => {
+            // arrange
+            const shareParams = {
+                byLink: true,
+                link: 'shareUrl'
+            };
+            const content: Partial<Content> = {
+                identifier: 'content_do_id',
+                contentData: {
+                    contentType: CsContentType.TEXTBOOK,
+                    primaryCategory: 'Digital Textbook',
+                }
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockAppVersion.getPackageName = jest.fn(() => Promise.resolve('org.sunbird.app'));
+            mockCommonUtilService.translateMessage = jest.fn((key, fields) => {
+                switch (key) {
+                    case 'SHARE_CONTENT_LINK':
+                        return 'SHARE_CONTENT_LINK';
+                }
+            });
+            mockSocialSharing.share = jest.fn();
+            const values = new Map();
+            values['ContentType'] = content.contentData.contentType;
+
+            // act
+            contentShareHandlerService.shareContent(shareParams, content as Content, undefined, [], [], { l1: 'do_id' },
+            PageId.COLLECTION_DETAIL);
+
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH, InteractSubtype.SHARE_CONTENT_INITIATED,
+                    Environment.HOME, PageId.COLLECTION_DETAIL,
+                    {
+                        id: 'content_do_id', type: 'Digital Textbook', version: ''
+                    },
+                    values, { l1: 'do_id' }, []);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.OTHER, InteractSubtype.SHARE_CONTENT_SUCCESS,
+                    Environment.HOME, PageId.COLLECTION_DETAIL,
+                    {
+                        id: 'content_do_id', type: 'Digital Textbook', version: ''
+                    },
+                    values, { l1: 'do_id' }, []);
+                expect(mockAppVersion.getPackageName).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('SHARE_CONTENT_LINK', {
+                    app_name: 'app_name',
+                    content_link: 'shareUrl?referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_content&contentId=content_do_id',
+                    content_name: content.contentData.name,
+                    play_store_url: 'https://play.google.com/store/apps/details?id=org.sunbird.app&referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_app'
+                });
+                expect(mockSocialSharing.share).toHaveBeenCalledWith(null, null, null, 'SHARE_CONTENT_LINK');
+                done();
+            }, 0);
+        });
+
+        it('should share collection link', (done) => {
+            // arrange
+            const shareParams = {
+                byLink: true,
+                link: 'shareUrl'
+            };
+            const content: Partial<Content> = {
+                identifier: 'do_id',
+                contentData: {
+                    contentType: CsContentType.COLLECTION,
+                    primaryCategory: 'Content Playlist',
+                }
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockAppVersion.getPackageName = jest.fn(() => Promise.resolve('org.sunbird.app'));
+            mockCommonUtilService.translateMessage = jest.fn((key, fields) => {
+                switch (key) {
+                    case 'SHARE_CONTENT_LINK':
+                        return 'SHARE_CONTENT_LINK';
+                }
+            });
+            mockSocialSharing.share = jest.fn();
+            const values = new Map();
+            values['ContentType'] = content.contentData.contentType;
+
+            // act
+            contentShareHandlerService.shareContent(shareParams, content as Content, undefined, [], [], { l1: 'do_id' },
+            PageId.COLLECTION_DETAIL);
+
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH, InteractSubtype.SHARE_CONTENT_INITIATED,
+                    Environment.HOME, PageId.COLLECTION_DETAIL,
+                    {
+                        id: 'do_id', type: 'Content Playlist', version: ''
+                    },
+                    values, { l1: 'do_id' }, []);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.OTHER, InteractSubtype.SHARE_CONTENT_SUCCESS,
+                    Environment.HOME, PageId.COLLECTION_DETAIL,
+                    {
+                        id: 'do_id', type: 'Content Playlist', version: ''
+                    },
+                    values, { l1: 'do_id' }, []);
+                expect(mockAppVersion.getPackageName).toHaveBeenCalled();
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('SHARE_CONTENT_LINK', {
+                    app_name: 'app_name',
+                    content_link: 'shareUrl?referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_content',
+                    content_name: content.contentData.name,
+                    play_store_url: 'https://play.google.com/store/apps/details?id=org.sunbird.app&referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_app'
+                });
+                expect(mockSocialSharing.share).toHaveBeenCalledWith(null, null, null, 'SHARE_CONTENT_LINK');
+                done();
+            }, 0);
+        });
 
-    it('should save file on device', () => {
-        // arrange
-        contentShareHandlerService.exportContent = jest.fn();
-        const shareParams = {
-            saveFile: true
-        };
-        const content = {
-            identifier: 'id',
-            contentData: {
+        it('should save content file on device', (done) => {
+            // arrange
+            const shareParams = {
+                saveFile: true
+            };
+            const content: Partial<Content> = {
+                identifier: 'do_id',
                 contentType: 'contentType',
-                pkgVersion: '1'
-            } as ContentData,
-            contentType: 'contentType',
-        };
-        // act
-        contentShareHandlerService.shareContent(shareParams, content as Content);
-        // assert
-        expect(contentShareHandlerService.exportContent).toBeCalled();
-    });
+                contentData: {
+                    contentType: 'contentType',
+                    primaryCategory: 'primaryCategory',
+                }
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            const contentExportResponse = {
+                exportedFilePath: 'samplepath'
+            };
+            mockContentService.exportContent = jest.fn(() => of(contentExportResponse));
+            const values = new Map();
+            values['ContentType'] = content.contentData.contentType;
+            mockCommonUtilService.showToast = jest.fn();
 
-    it('should return expected playstire URL without UTM', () => {
-        // arrange
-        // act
-        // assert
-        expect( contentShareHandlerService.getPackageNameWithUTM(false)).resolves.toEqual(
-            'https://play.google.com/store/apps/details?id=org.sunbird.app&hl=en_IN'
-        );
-    });
+            // act
+            contentShareHandlerService.shareContent(shareParams, content as Content, undefined, [], [], { l1: 'do_id' },
+            PageId.CONTENT_DETAIL);
 
-    it('should return expected pageID', () => {
-        // arrange
-        // act
-        // assert
-        expect( contentShareHandlerService['getPageId']('Course')).toEqual('course-detail');
-        expect( contentShareHandlerService['getPageId']('TextBook')).toEqual('collection-detail');
-        expect( contentShareHandlerService['getPageId']('Collection')).toEqual('collection-detail');
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH, InteractSubtype.SHARE_CONTENT_INITIATED,
+                    Environment.HOME, PageId.CONTENT_DETAIL,
+                    {
+                        id: 'do_id', type: 'primaryCategory', version: ''
+                    },
+                    values, { l1: 'do_id' }, []);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.OTHER, InteractSubtype.SHARE_CONTENT_SUCCESS,
+                    Environment.HOME, PageId.CONTENT_DETAIL,
+                    {
+                        id: 'do_id', type: 'primaryCategory', version: ''
+                    },
+                    values, { l1: 'do_id' }, []);
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockContentService.exportContent).toHaveBeenCalledWith(
+                    { contentIds: ['do_id'], destinationFolder: '/pathDownload/', saveLocally: true, subContentIds: [] }
+                );
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('FILE_SAVED', '', 'green-toast');
+                done();
+            }, 0);
+        });
     });
 
 });
diff --git a/src/services/content/content-share-handler.service.ts b/src/services/content/content-share-handler.service.ts
index 91eee14d6..0f53141d4 100644
--- a/src/services/content/content-share-handler.service.ts
+++ b/src/services/content/content-share-handler.service.ts
@@ -1,82 +1,104 @@
 import { Injectable, Inject } from '@angular/core';
 import {
-  ContentService, StorageService, ContentExportRequest, ContentExportResponse,
-  Content, Rollup, CorrelationData, ContentDetailRequest, TelemetryObject, DeviceInfo,
+  ContentService, StorageService, ContentExportRequest,
+  ContentExportResponse, Content, Rollup,
+  CorrelationData, TelemetryObject,
 } from 'sunbird-sdk';
 import { CommonUtilService } from '../common-util.service';
-import { InteractSubtype, InteractType, Environment, PageId } from '../telemetry-constants';
+import { InteractSubtype, InteractType, Environment } from '../telemetry-constants';
 import { SocialSharing } from '@ionic-native/social-sharing/ngx';
 import { TelemetryGeneratorService } from '../telemetry-generator.service';
-import { ShareUrl, ContentType } from '../../app/app.constant';
-import { UtilityService } from '../utility-service';
 import { ContentUtil } from '@app/util/content-util';
 import { AppVersion } from '@ionic-native/app-version/ngx';
+import { AppGlobalService } from '../app-global-service.service';
 
 @Injectable({
   providedIn: 'root'
 })
 
 export class ContentShareHandlerService {
-  public telemetryObject: TelemetryObject;
-  appName: string;
-  shareUrl: string;
-  shareUTMUrl: string;
+
+  private telemetryObject: TelemetryObject;
+  private appName: string;
 
   constructor(
     @Inject('CONTENT_SERVICE') private contentService: ContentService,
     @Inject('STORAGE_SERVICE') private storageService: StorageService,
-    @Inject('DEVICE_INFO') private deviceInfo: DeviceInfo,
     private commonUtilService: CommonUtilService,
     private social: SocialSharing,
     private telemetryGeneratorService: TelemetryGeneratorService,
-    private appVersion: AppVersion) {
+    private appVersion: AppVersion,
+    private appGlobalService: AppGlobalService) {
     this.commonUtilService.getAppName().then((res) => { this.appName = res; });
   }
 
-  public async shareContent(shareParams: any, content: Content, corRelationList?: CorrelationData[], rollup?: Rollup) {
+  public async shareContent(
+    shareParams: any, content: Content, moduleId: string,
+    subContentIds: Array<string>, corRelationList?: CorrelationData[], rollup?: Rollup, pageId?: string
+  ) {
     this.telemetryObject = ContentUtil.getTelemetryObject(content);
     this.generateShareInteractEvents(InteractType.TOUCH,
       InteractSubtype.SHARE_CONTENT_INITIATED,
-      content.contentData.contentType, corRelationList, rollup);
-    if (content.hierarchyInfo && content.hierarchyInfo.length > 0) {
-      const contentDetailRequest: ContentDetailRequest = {
-        contentId: content.hierarchyInfo[0].identifier,
-        attachFeedback: false,
-        attachContentAccess: false,
-        emitUpdateIfAny: false
-      };
-      await this.contentService.getContentDetails(contentDetailRequest).toPromise()
-        .then((contentDetail: Content) => {
-          content = contentDetail;
-        });
+      this.getPrimaryCategory(content),
+      corRelationList, rollup, pageId);
+
+    let contentId;
+    if (rollup && rollup.l1 && rollup.l1 !== content.identifier) {
+      contentId = content.identifier;
+      if (!(subContentIds && subContentIds.length > 0)) {
+        subContentIds = [];
+        subContentIds.push(contentId);
+      }
+    }
+
+    let rootContentIdentifier = content.identifier;
+    if (rollup && rollup.l1 && rollup.l1 !== content.identifier) {
+      rootContentIdentifier = rollup.l1;
     }
+
     let exportContentRequest: ContentExportRequest;
     if (shareParams && shareParams.byFile) {
       exportContentRequest = {
-        contentIds: [content.identifier],
+        contentIds: [rootContentIdentifier],
+        subContentIds,
         destinationFolder: this.storageService.getStorageDestinationDirectoryPath()
       };
-      this.exportContent(exportContentRequest, shareParams, content, corRelationList, rollup);
+      this.exportContent(exportContentRequest, shareParams, content, corRelationList, rollup, pageId);
     } else if (shareParams && shareParams.byLink && shareParams.link) {
       this.generateShareInteractEvents(InteractType.OTHER,
         InteractSubtype.SHARE_CONTENT_SUCCESS,
-        content.contentData.contentType, corRelationList, rollup);
-      const shareLink = this.commonUtilService.translateMessage('SHARE_CONTENT_LINK', {app_name: this.appName,
-         content_name: content.contentData.name, content_link: this.getContentUtm(shareParams.link, content),
-           play_store_url: await this.getPackageNameWithUTM(true)});
+        this.getPrimaryCategory(content), corRelationList, rollup, pageId);
+
+      let contentLink = this.getContentUtm(shareParams.link);
+      if (moduleId) {
+        contentLink = contentLink + `&moduleId=${moduleId}`;
+      }
+      if (contentId && !moduleId) {
+        contentLink = contentLink + `&contentId=${contentId}`;
+      }
+      const shareLink = this.commonUtilService.translateMessage('SHARE_CONTENT_LINK', {
+        app_name: this.appName,
+        content_name: content.contentData.name,
+        content_link: contentLink,
+        play_store_url: await this.getPackageNameWithUTM()
+      });
+      this.appGlobalService.isNativePopupVisible = true;
       this.social.share(null, null, null, shareLink);
+      this.appGlobalService.setNativePopupVisible(false, 2000);
     } else if (shareParams && shareParams.saveFile) {
       exportContentRequest = {
-        contentIds: [content.identifier],
+        contentIds: [rootContentIdentifier],
+        subContentIds,
         destinationFolder: cordova.file.externalRootDirectory + 'Download/',
         saveLocally: true
       };
-      this.exportContent(exportContentRequest, shareParams, content, corRelationList, rollup);
+      this.exportContent(exportContentRequest, shareParams, content, corRelationList, rollup, pageId);
     }
   }
 
   private async exportContent(
-    exportContentRequest: ContentExportRequest, shareParams, content: Content, corRelationList?: CorrelationData[], rollup?: Rollup
+    exportContentRequest: ContentExportRequest, shareParams, content: Content,
+    corRelationList?: CorrelationData[], rollup?: Rollup, pageId?: string
   ) {
     const loader = await this.commonUtilService.getLoader();
     await loader.present();
@@ -87,61 +109,50 @@ export class ContentShareHandlerService {
           this.commonUtilService.showToast('FILE_SAVED', '', 'green-toast');
         } else if (shareParams.byFile) {
           const shareLink = this.commonUtilService.translateMessage('SHARE_CONTENT_FILE', {
-            app_name: this.appName, content_name: content.contentData.name, play_store_url: await this.getPackageNameWithUTM(true)
+            app_name: this.appName,
+            content_name: content.contentData.name,
+            play_store_url: await this.getPackageNameWithUTM()
           });
+          this.appGlobalService.isNativePopupVisible = true;
           this.social.share(shareLink, '', '' + response.exportedFilePath, '');
+          this.appGlobalService.setNativePopupVisible(false, 2000);
         }
         this.generateShareInteractEvents(InteractType.OTHER,
-          InteractSubtype.SHARE_CONTENT_SUCCESS, content.contentData.contentType, corRelationList, rollup);
+          InteractSubtype.SHARE_CONTENT_SUCCESS, this.getPrimaryCategory(content), corRelationList, rollup, pageId);
       }).catch(async (err) => {
+        console.error('ContentShareHandlerService - exportContent', err);
+
         await loader.dismiss();
         this.commonUtilService.showToast('SHARE_CONTENT_FAILED');
       });
   }
 
-  async getPackageNameWithUTM(utm: boolean): Promise<string> {
+  private async getPackageNameWithUTM(): Promise<string> {
     const pkg = await this.appVersion.getPackageName();
-    if (utm) {
-      const utmParams = `&referrer=utm_source%3D${this.deviceInfo.getDeviceID()}%26utm_campaign%3Dshare_app`;
-      const shareUTMUrl = `https://play.google.com/store/apps/details?id=${pkg}${utmParams}`;
-      return shareUTMUrl;
-    } else {
-      return `https://play.google.com/store/apps/details?id=${pkg}&hl=en_IN`;
-    }
+    const utmParams = `&referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_app`;
+    const shareUTMUrl = `https://play.google.com/store/apps/details?id=${pkg}${utmParams}`;
+    return shareUTMUrl;
   }
 
-  getContentUtm(contentLink: string, content: Content): string {
-    const contentUTM =
-      `referrer=utm_source%3D${this.appName.toLocaleLowerCase()}_mobile%26utm_content%3D${content.identifier}%26utm_campaign%3Dshare_content`;
+  private getContentUtm(contentLink: string): string {
+    const contentUTM = `referrer=utm_source%3Dmobile%26utm_campaign%3Dshare_content`;
     return contentLink + '?' + contentUTM;
   }
 
-  generateShareInteractEvents(interactType, subType, contentType, corRelationList, rollup) {
+  private generateShareInteractEvents(interactType, subType, primaryCategory, corRelationList, rollup, pageId) {
     const values = new Map();
-    values['ContentType'] = contentType;
+    values['category'] = primaryCategory;
     this.telemetryGeneratorService.generateInteractTelemetry(interactType,
       subType,
       Environment.HOME,
-      this.getPageId(contentType),
+      pageId,
       this.telemetryObject,
       values,
       rollup,
       corRelationList);
   }
 
-  private getPageId(contentType): string {
-    let pageId = PageId.CONTENT_DETAIL;
-    switch (contentType) {
-      case ContentType.COURSE:
-        pageId = PageId.COURSE_DETAIL;
-        break;
-      case ContentType.TEXTBOOK:
-        pageId = PageId.COLLECTION_DETAIL;
-        break;
-      case ContentType.COLLECTION:
-        pageId = PageId.COLLECTION_DETAIL;
-        break;
-    }
-    return pageId;
+  private getPrimaryCategory(content: Content) {
+    return content.contentData.primaryCategory ? content.contentData.primaryCategory : content.contentData.contentType;
   }
 }
diff --git a/src/services/content/player/content-player-handler.spec.ts b/src/services/content/player/content-player-handler.spec.ts
index 467b6460e..6353e6e80 100644
--- a/src/services/content/player/content-player-handler.spec.ts
+++ b/src/services/content/player/content-player-handler.spec.ts
@@ -1,5 +1,5 @@
 import { ContentPlayerHandler } from '../../../services/content/player/content-player-handler';
-import { TelemetryGeneratorService, CommonUtilService } from '../../../services';
+import { TelemetryGeneratorService, CommonUtilService, AppHeaderService } from '../../../services';
 import { PlayerService, CourseService } from 'sunbird-sdk';
 import { File } from '@ionic-native/file/ngx';
 import { CanvasPlayerService } from '../../canvas-player.service';
@@ -7,6 +7,7 @@ import { Router } from '@angular/router';
 import { of, identity } from 'rxjs';
 import { mockPlayerConfigData, mockContent } from './content.player-handler.spec.data';
 import { ContentInfo } from '../content-info';
+import { ContentUtil } from '@app/util/content-util';
 
 describe('ContentPlayerHandler', () => {
     let contentPlayerHandler: ContentPlayerHandler;
@@ -38,6 +39,7 @@ describe('ContentPlayerHandler', () => {
         batchId: 'sample_batch_id'
     } as any;
 
+    const mockAppHeaderService: Partial<AppHeaderService> = {};
 
     beforeAll(() => {
         contentPlayerHandler = new ContentPlayerHandler(
@@ -47,7 +49,8 @@ describe('ContentPlayerHandler', () => {
             mockFile as File,
             mockTelemetryGeneratorService as TelemetryGeneratorService,
             mockRouter as Router,
-            mockCommonUtilService as CommonUtilService
+            mockCommonUtilService as CommonUtilService,
+            mockAppHeaderService as AppHeaderService
         );
     });
 
@@ -82,7 +85,7 @@ describe('ContentPlayerHandler', () => {
             contentPlayerHandler.launchContentPlayer(mockContent, true, true, { course: mockCourse } as any, true);
             // assert
             expect(mockRouter.navigate).toHaveBeenCalledWith(['player'],
-                { state: { config: mockPlayerConfigData, course: mockCourse } });
+                { state: { config: mockPlayerConfigData, course: mockCourse, isCourse: true } });
         });
 
         it('should disbale the user switcher if content is being played from course', () => {
@@ -112,7 +115,7 @@ describe('ContentPlayerHandler', () => {
             // assert
             setTimeout(() => {
                 expect(mockRouter.navigate).toHaveBeenCalledWith(['player'],
-                { state: { config: mockPlayerConfigData, course: mockCourse } });
+                { state: { config: mockPlayerConfigData, course: mockCourse, isCourse: false } });
                 done();
             }, 0);
         });
@@ -125,7 +128,7 @@ describe('ContentPlayerHandler', () => {
             // assert
             setTimeout(() => {
                 expect(mockRouter.navigate).not.toHaveBeenCalledWith(['player'],
-                { state: { config: mockPlayerConfigData, course: mockCourse } });
+                { state: { config: mockPlayerConfigData, course: mockCourse, isCourse: false } });
                 done();
             }, 0);
         });
@@ -138,7 +141,7 @@ describe('ContentPlayerHandler', () => {
             // assert
             setTimeout(() => {
                 expect(mockRouter.navigate).toHaveBeenCalledWith(['player'],
-                { state: { config: mockPlayerConfigData, course: mockCourse } });
+                { state: { config: mockPlayerConfigData, course: mockCourse, isCourse: false } });
                 done();
             }, 0);
         });
@@ -152,7 +155,7 @@ describe('ContentPlayerHandler', () => {
             // assert
             setTimeout(() => {
                 expect(mockRouter.navigate).not.toHaveBeenCalledWith(['player'],
-                { state: { config: mockPlayerConfigData, course: mockCourse } });
+                { state: { config: mockPlayerConfigData, course: mockCourse, isCourse: false } });
                 done();
             }, 0);
         });
@@ -166,10 +169,171 @@ describe('ContentPlayerHandler', () => {
             // assert
             setTimeout(() => {
                 expect(mockRouter.navigate).toHaveBeenCalledWith(['player'],
-                { state: { config: mockPlayerConfigData, course: mockCourse } });
+                { state: {  contentToPlay : mockContent, config: mockPlayerConfigData, course: mockCourse, isCourse: false } });
                 done();
             }, 0);
         });
     });
 
+    describe('playContent', () => {
+        it('should play the content from the Streaming url if the url is present and user is online ', () => {
+            // arrange
+            const content = {
+                identifier: 'identifier',
+                hierarchyInfo: [{ identifier: 'identifier1' }, { identifier: 'identifier1' }],
+                contentType: 'contentType',
+                pkgVersion: 'pkgVersion',
+                contentData: {
+                    streamingUrl: 'streamingUrl'
+                },
+                mimeType: ''
+            };
+            const navExtras = {};
+            const telemetryDetails = {
+                pageId: 'id',
+                corRelationList: []
+            };
+            mockAppHeaderService.hideHeader = jest.fn();
+            jest.spyOn(ContentUtil, 'getTelemetryObject').mockReturnThis();
+            jest.spyOn(ContentUtil, 'generateRollUp').mockReturnThis();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            contentPlayerHandler.launchContentPlayer = jest.fn();
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+
+            // act
+            contentPlayerHandler.playContent(content, navExtras, telemetryDetails, true);
+
+            // assert
+            expect(mockAppHeaderService.hideHeader).toHaveBeenCalled();
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+            expect(contentPlayerHandler.launchContentPlayer).toHaveBeenCalled();
+        });
+
+        it('should play the content from the local, if the user is offline and content locally available', () => {
+            // arrange
+            const content = {
+                identifier: 'identifier',
+                hierarchyInfo: [{ identifier: 'identifier1' }, { identifier: 'identifier1' }],
+                contentType: 'contentType',
+                pkgVersion: 'pkgVersion',
+                contentData: {
+                    streamingUrl: 'streamingUrl'
+                },
+                mimeType: '',
+                isAvailableLocally: true
+            };
+            const navExtras = {};
+            const telemetryDetails = {
+                pageId: 'id',
+                corRelationList: []
+            };
+            mockAppHeaderService.hideHeader = jest.fn();
+            jest.spyOn(ContentUtil, 'getTelemetryObject').mockReturnThis();
+            jest.spyOn(ContentUtil, 'generateRollUp').mockReturnThis();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            contentPlayerHandler.launchContentPlayer = jest.fn();
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: false };
+
+            // act
+            contentPlayerHandler.playContent(content, navExtras, telemetryDetails, true);
+
+            // assert
+            expect(mockAppHeaderService.hideHeader).toHaveBeenCalled();
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+            expect(contentPlayerHandler.launchContentPlayer).toHaveBeenCalled();
+        });
+
+        it('should play the content from the local, if the user is online and content locally available', () => {
+            // arrange
+            const content = {
+                identifier: 'identifier',
+                hierarchyInfo: [{ identifier: 'identifier1' }, { identifier: 'identifier1' }],
+                contentType: 'contentType',
+                pkgVersion: 'pkgVersion',
+                contentData: {
+                },
+                mimeType: '',
+                isAvailableLocally: true
+            };
+            const navExtras = {};
+            const telemetryDetails = {
+                pageId: 'id',
+                corRelationList: []
+            };
+            mockAppHeaderService.hideHeader = jest.fn();
+            jest.spyOn(ContentUtil, 'getTelemetryObject').mockReturnThis();
+            jest.spyOn(ContentUtil, 'generateRollUp').mockReturnThis();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            contentPlayerHandler.launchContentPlayer = jest.fn();
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+
+            // act
+            contentPlayerHandler.playContent(content, navExtras, telemetryDetails, true);
+
+            // assert
+            expect(mockAppHeaderService.hideHeader).toHaveBeenCalled();
+            expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+            expect(contentPlayerHandler.launchContentPlayer).toHaveBeenCalled();
+        });
+
+        it('should navigate to content details page if the above conditions fail', () => {
+            // arrange
+            const content = {
+                identifier: 'identifier',
+                hierarchyInfo: [{ identifier: 'identifier1' }, { identifier: 'identifier1' }],
+                contentType: 'contentType',
+                pkgVersion: 'pkgVersion',
+                contentData: {
+                },
+                mimeType: '',
+                isAvailableLocally: false
+            };
+            const navExtras = {};
+            const telemetryDetails = {
+                pageId: 'id',
+                corRelationList: []
+            };
+            mockAppHeaderService.hideHeader = jest.fn();
+            jest.spyOn(ContentUtil, 'getTelemetryObject').mockReturnThis();
+            jest.spyOn(ContentUtil, 'generateRollUp').mockReturnThis();
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+
+            // act
+            contentPlayerHandler.playContent(content, navExtras, telemetryDetails, true, false, false);
+
+            // assert
+            expect(mockRouter.navigate).toHaveBeenCalled();
+        });
+
+        it('should navigate to content details page if the above conditions fail', () => {
+            // arrange
+            const content = {
+                identifier: 'identifier',
+                hierarchyInfo: [{ identifier: 'identifier1' }, { identifier: 'identifier1' }],
+                contentType: 'contentType',
+                pkgVersion: 'pkgVersion',
+                contentData: {
+                },
+                mimeType: '',
+                isAvailableLocally: false
+            };
+            const navExtras = { state: { course: {} } };
+            const telemetryDetails = {
+                pageId: 'id',
+                corRelationList: []
+            };
+            mockAppHeaderService.hideHeader = jest.fn();
+            jest.spyOn(ContentUtil, 'getTelemetryObject').mockReturnThis();
+            jest.spyOn(ContentUtil, 'generateRollUp').mockReturnThis();
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+
+            // act
+            contentPlayerHandler.playContent(content, navExtras, telemetryDetails, true, false, false);
+
+            // assert
+            expect(mockRouter.navigate).toHaveBeenCalled();
+        });
+    });
 });
diff --git a/src/services/content/player/content-player-handler.ts b/src/services/content/player/content-player-handler.ts
index 4b00effd6..dc01f0014 100644
--- a/src/services/content/player/content-player-handler.ts
+++ b/src/services/content/player/content-player-handler.ts
@@ -1,16 +1,16 @@
-import { Injectable, Inject } from '@angular/core';
-import { PlayerService, InteractType, Content, CorrelationData } from 'sunbird-sdk';
-import { CanvasPlayerService } from '@app/services/canvas-player.service';
+import { Inject, Injectable } from '@angular/core';
+import { NavigationExtras, Router } from '@angular/router';
+import { ContentFilterConfig, RouterLinks } from '@app/app/app.constant';
 import { AppGlobalService } from '@app/services/app-global-service.service';
-import { File } from '@ionic-native/file/ngx';
-import { InteractSubtype, Environment, PageId } from '@app/services/telemetry-constants';
+import { AppHeaderService } from '@app/services/app-header.service';
+import { CanvasPlayerService } from '@app/services/canvas-player.service';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { Environment, InteractSubtype } from '@app/services/telemetry-constants';
 import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import { ContentUtil } from '@app/util/content-util';
+import { File } from '@ionic-native/file/ngx';
+import { Content, CorrelationData, CourseService, InteractType, PlayerService } from 'sunbird-sdk';
 import { ContentInfo } from '../content-info';
-import { RouterLinks, ContentType, ContentFilterConfig } from '@app/app/app.constant';
-import { Router } from '@angular/router';
-import { CommonUtilService } from '@app/services/common-util.service';
-import { Course, CourseService } from 'sunbird-sdk';
-
 
 @Injectable({
     providedIn: 'root'
@@ -25,7 +25,8 @@ export class ContentPlayerHandler {
         private file: File,
         private telemetryGeneratorService: TelemetryGeneratorService,
         private router: Router,
-        private commonUtilService: CommonUtilService
+        private commonUtilService: CommonUtilService,
+        private appHeaderService: AppHeaderService
     ) { }
 
     /**
@@ -33,22 +34,13 @@ export class ContentPlayerHandler {
      */
     public launchContentPlayer(
         content: Content, isStreaming: boolean, shouldDownloadnPlay: boolean, contentInfo: ContentInfo, isCourse: boolean,
-        isFromTextbookTOC?: boolean) {
+        navigateBackToContentDetails?: boolean , isChildContent?: boolean) {
         if (!AppGlobalService.isPlayerLaunched) {
             AppGlobalService.isPlayerLaunched = true;
         }
         const values = new Map();
         values['autoAfterDownload'] = shouldDownloadnPlay;
         values['isStreaming'] = isStreaming;
-        this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
-            InteractSubtype.CONTENT_PLAY,
-            Environment.HOME,
-            PageId.CONTENT_DETAIL,
-            contentInfo.telemetryObject,
-            values,
-            contentInfo.rollUp,
-            contentInfo.correlationList);
-
         if (isStreaming) {
             const extraInfoMap = { hierarchyInfo: [] };
             extraInfoMap.hierarchyInfo = contentInfo.hierachyInfo;
@@ -61,7 +53,7 @@ export class ContentPlayerHandler {
         if (isCourse && content.contentData['totalQuestions']) {
             const correlationData: CorrelationData = {
                 id: this.courseService.generateAssessmentAttemptId({
-                    courseId: contentInfo.course!.identifier,
+                    courseId: contentInfo.course.identifier,
                     batchId: contentInfo.course.batchId,
                     contentId: content.identifier,
                     userId: contentInfo.course.userId
@@ -93,7 +85,7 @@ export class ContentPlayerHandler {
                         this.canvasPlayerService.xmlToJSon(`${filePath}/index.ecml`).then((json) => {
                             data['data'] = JSON.stringify(json);
                             this.router.navigate([RouterLinks.PLAYER],
-                                { state: { config: data,  course : contentInfo.course, isFromTOC: isFromTextbookTOC } });
+                                { state: { config: data,  course : contentInfo.course, navigateBackToContentDetails, isCourse } });
 
                         }).catch((error) => {
                             console.error('error1', error);
@@ -103,8 +95,8 @@ export class ContentPlayerHandler {
                         this.canvasPlayerService.readJSON(`${filePath}/index.json`).then((json) => {
                             data['data'] = json;
                             this.router.navigate([RouterLinks.PLAYER],
-                                { state: { config: data,  course : contentInfo.course, isFromTOC: isFromTextbookTOC,
-                                        corRelation: contentInfo.correlationList } });
+                                { state: { config: data,  course : contentInfo.course, navigateBackToContentDetails,
+                                        corRelation: contentInfo.correlationList, isCourse } });
 
                         }).catch((e) => {
                             console.error('readJSON error', e);
@@ -112,14 +104,14 @@ export class ContentPlayerHandler {
                     });
                 } else {
                     this.router.navigate([RouterLinks.PLAYER],
-                        { state: { config: data, course : contentInfo.course, isFromTOC: isFromTextbookTOC,
-                                corRelation: contentInfo.correlationList } });
+                        { state: { config: data, course : contentInfo.course, navigateBackToContentDetails,
+                                corRelation: contentInfo.correlationList, isCourse } });
                 }
 
             } else {
                 this.router.navigate([RouterLinks.PLAYER],
-                    { state: { config: data,  course : contentInfo.course, isFromTOC: isFromTextbookTOC,
-                            corRelation: contentInfo.correlationList } });
+                    { state: { contentToPlay : content , config: data,  course : contentInfo.course, navigateBackToContentDetails,
+                            corRelation: contentInfo.correlationList, isCourse , childContent: isChildContent } });
             }
         });
     }
@@ -138,4 +130,59 @@ export class ContentPlayerHandler {
     public setLastPlayedContentId(contentId: string) {
         this.lastPlayedContentId = contentId;
     }
+
+    playContent(content: Content, navExtras: NavigationExtras, telemetryDetails, isCourse: boolean,
+                navigateBackToContentDetails: boolean = true, hideHeaders: boolean = true) {
+        if (hideHeaders) {
+            this.appHeaderService.hideHeader();
+        }
+        const playingContent = content;
+
+        const contentInfo: ContentInfo = {
+            telemetryObject: ContentUtil.getTelemetryObject(playingContent),
+            rollUp: ContentUtil.generateRollUp(playingContent.hierarchyInfo, playingContent.identifier),
+            correlationList: telemetryDetails.corRelationList,
+            hierachyInfo: playingContent.hierarchyInfo
+        };
+        if (navExtras.state && navExtras.state.course && isCourse) {
+            contentInfo['course'] = navExtras.state.course;
+        } else {
+            isCourse = false;
+        }
+        let isStreaming: boolean;
+        let shouldDownloadAndPlay: boolean;
+        if (playingContent.contentData.streamingUrl && this.commonUtilService.networkInfo.isNetworkAvailable &&
+            !(playingContent.mimeType === 'application/vnd.ekstep.h5p-archive')) { // 1
+            isStreaming = true;
+            shouldDownloadAndPlay = false;
+        } else if (!this.commonUtilService.networkInfo.isNetworkAvailable && playingContent.isAvailableLocally) { // 2
+            isStreaming = false;
+            shouldDownloadAndPlay = false;
+        } else if (this.commonUtilService.networkInfo.isNetworkAvailable && playingContent.isAvailableLocally) { // 3
+            isStreaming = false;
+            shouldDownloadAndPlay = true;
+        } else {
+            this.router.navigate([RouterLinks.CONTENT_DETAILS], navExtras);
+            return;
+        }
+
+        // Executes only if the conditions are passed else skip
+        this.generateInteractTelemetry(isStreaming, telemetryDetails.pageId, contentInfo);
+        this.launchContentPlayer(playingContent, isStreaming, shouldDownloadAndPlay, contentInfo, isCourse, navigateBackToContentDetails);
+    }
+
+    private generateInteractTelemetry(isStreaming: boolean, pageId: string, contentInfo) {
+        const subType: string = isStreaming ? InteractSubtype.PLAY_ONLINE : InteractSubtype.PLAY_FROM_DEVICE;
+        this.telemetryGeneratorService.generateInteractTelemetry(
+            InteractType.TOUCH,
+            subType,
+            Environment.HOME,
+            pageId,
+            contentInfo.telemetryObject || undefined,
+            undefined,
+            contentInfo.rollup || undefined,
+            contentInfo.corRelationList || undefined
+        );
+    }
+
 }
diff --git a/src/services/discussion/discussion-telemetry.service.spec.ts b/src/services/discussion/discussion-telemetry.service.spec.ts
new file mode 100644
index 000000000..cd5aba37c
--- /dev/null
+++ b/src/services/discussion/discussion-telemetry.service.spec.ts
@@ -0,0 +1,91 @@
+import { DiscussionTelemetryService } from './discussion-telemetry.service';
+import { TelemetryGeneratorService } from '..';
+import { Environment } from '../telemetry-constants';
+
+describe('GroupHandlerService', () => {
+    let discussionTelemetryService: DiscussionTelemetryService;
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {
+        generateImpressionTelemetry: jest.fn(),
+        generateInteractTelemetry: jest.fn()
+    };
+
+    beforeAll(() => {
+        discussionTelemetryService = new DiscussionTelemetryService(
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('Should create instatance', () => {
+        expect(discussionTelemetryService).toBeTruthy();
+    });
+
+    describe('logTelemetryEvent', () => {
+        it('Should call telemetrygenarator service with proper params', () => {
+            // arrange
+            const event = {
+                eid: 'IMPRESSION',
+                edata: {
+                    type: 'some_type',
+                    id: 'some_id',
+                    pageid: 'some_pageid'
+                }
+            }
+            const cData = {
+                type: 'Course',
+                id: 'some_id'
+            }
+            discussionTelemetryService.contextCdata = [cData];
+            // act
+            discussionTelemetryService.logTelemetryEvent(event)
+            // assert
+           expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+               'some_type',
+               'some_id',
+               'some_pageid',
+               Environment.DISCUSSION,
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                [cData]
+           )
+        });
+
+        it('Should call telemetrygenarator service with proper params', () => {
+             // arrange
+             const event = {
+                eid: 'INTERACT',
+                edata: {
+                    type: 'some_type',
+                    id: 'some_id',
+                    pageid: 'some_pageid'
+                }
+            }
+            const cData = {
+                type: 'Course',
+                id: 'some_id'
+            }
+            discussionTelemetryService.contextCdata = [cData];
+            // act
+            discussionTelemetryService.logTelemetryEvent(event)
+            // assert
+           expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+               'some_type',
+               'some_id',
+                Environment.DISCUSSION,
+               'some_pageid',
+                undefined,
+                undefined,
+                undefined,
+                [cData]
+           )
+            
+        });
+
+    });
+});
diff --git a/src/services/discussion/discussion-telemetry.service.ts b/src/services/discussion/discussion-telemetry.service.ts
new file mode 100644
index 000000000..d49c65674
--- /dev/null
+++ b/src/services/discussion/discussion-telemetry.service.ts
@@ -0,0 +1,58 @@
+import { Injectable } from '@angular/core';
+import { CorrelationData } from '@project-sunbird/sunbird-sdk';
+import { Environment } from '../telemetry-constants';
+import { TelemetryGeneratorService } from '../telemetry-generator.service';
+
+
+@Injectable({
+  providedIn: 'root'
+})
+export class DiscussionTelemetryService {
+
+    constructor(
+        private telemetryService: TelemetryGeneratorService
+    ) { }
+
+    private _contextCdata: Array<CorrelationData>;
+    logTelemetryEvent(event) {
+        let cData = this.contextCdata;
+        if (event && event.context && event.context.cdata) {
+            cData = event.context.cdata.concat(this.contextCdata);
+        }
+        switch (event.eid) {
+        case 'IMPRESSION':
+            this.telemetryService.generateImpressionTelemetry(
+                event.edata.type,
+                event.edata.id,
+                event.edata.pageid,
+                Environment.DISCUSSION,
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                cData);
+            break;
+        case 'INTERACT':
+            this.telemetryService.generateInteractTelemetry(
+                event.edata.type,
+                event.edata.id,
+                Environment.DISCUSSION,
+                event.edata.pageid,
+                undefined,
+                undefined,
+                undefined,
+                cData
+            );
+            break;
+        }
+        console.log('event from DF', event);
+    }
+
+    set contextCdata(objectData: Array<CorrelationData>) {
+        this._contextCdata = objectData;
+    }
+
+    get contextCdata() {
+        return this._contextCdata;
+    }
+}
diff --git a/src/services/download-pdf/download-pdf.data.ts b/src/services/download-pdf/download-pdf.data.ts
new file mode 100644
index 000000000..10041b2e2
--- /dev/null
+++ b/src/services/download-pdf/download-pdf.data.ts
@@ -0,0 +1,42 @@
+export const content = {
+    identifier: '123456',
+    name: 'content name',
+    contentData: {},
+    mimeType: 'application/pdf',
+    basePath: './app',
+    contentType: 'content',
+    referenceCount: '12',
+    lastUpdatedTime: '45-8-2020',
+    isAvailableLocally: true,
+    isUpdateAvailable: true,
+    children: [],
+    hierarchyInfo: [],
+    sizeOnDevice: 123456,
+    lastUsedTime: 12345,
+    rollup: '',
+    contentFeedback: [],
+    contentAccess: [],
+    contentMarker: [],
+    primaryCategory: 'abcd'
+}
+
+
+export const checkedStatusFalse = {
+    hasPermission: false
+};
+export const requestedStatusTrue = {
+    hasPermission: true
+};
+export const downloadrequested = {
+    uri: 'https://downloadContent',
+    title: '',
+    description: 'content description',
+    mimeType: 'application/pdf',
+    visibleInDownloadsUi: true,
+    notificationVisibility: 1,
+    destinationInExternalPublicDir: {
+        dirType: 'Download',
+        subPath: 'download/subpath'
+    },
+    headers: []
+};
diff --git a/src/services/download-pdf/download-pdf.service.spec.ts b/src/services/download-pdf/download-pdf.service.spec.ts
new file mode 100644
index 000000000..5165ac0c3
--- /dev/null
+++ b/src/services/download-pdf/download-pdf.service.spec.ts
@@ -0,0 +1,94 @@
+import { TestBed } from '@angular/core/testing';
+import { DownloadPdfService } from './download-pdf.service';
+import { Injectable } from '@angular/core';
+import { AndroidPermissionsService } from '../android-permissions/android-permissions.service';
+import { AndroidPermission } from '@app/services/android-permissions/android-permission';
+import { of } from 'rxjs';
+import { content, checkedStatusFalse, requestedStatusTrue, downloadrequested } from './download-pdf.data';
+import { Content } from '@project-sunbird/sunbird-sdk';
+
+describe('DownloadPdfService', () => {
+  let downloadPdfService: DownloadPdfService;
+  const mockPermissionService: Partial<AndroidPermissionsService> = {
+    checkPermissions: jest.fn(() => of(Boolean)),
+    requestPermissions: jest.fn(() => of(Boolean))
+  };
+
+  beforeAll(() => {
+    downloadPdfService = new DownloadPdfService(
+      mockPermissionService as AndroidPermissionsService
+    );
+    spyOn(mockPermissionService, 'checkPermissions')
+    spyOn(mockPermissionService, 'requestPermissions')
+    spyOn(window['downloadManager'], 'enqueue')
+  });
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    jest.restoreAllMocks();
+  });
+
+
+  it('should be created', () => {
+    expect(downloadPdfService).toBeTruthy();
+  });
+  describe('if permission is always denied', () => {
+    beforeAll(() => {
+      mockPermissionService['checkPermissions'].and.returnValue(of({ isPermissionAlwaysDenied: true }));
+    })
+    it('it should reject', async (done) => {
+      try {
+        await downloadPdfService.downloadPdf(content as any as Content);
+        fail();
+      } catch (e) {
+        expect(e).toEqual({ reason: 'device-permission-denied' });
+        done();
+      }
+    });
+  });
+
+  describe('if permission is not always denied', () => {
+    beforeAll(() => {
+      mockPermissionService['checkPermissions'].and.returnValue(of({ isPermissionAlwaysDenied: false }));
+    });
+
+    describe('if permission is not allowed', () => {
+
+      describe('if permission granted', () => {
+        beforeAll(() => {
+          mockPermissionService['checkPermissions'].and.returnValue(of({ isPermissionAlwaysDenied: false, hasPermission: false }));
+          mockPermissionService['requestPermissions'].and.returnValue(of({ isPermissionAlwaysDenied: false, hasPermission: true }));
+          window['downloadManager']['enqueue'].and.callFake((downloadRequest, callback) => {
+            callback(null, 'sampleid');
+          });
+
+        })
+        it('should download pdf', async (done) => {
+          try {
+            await downloadPdfService.downloadPdf(content as any as Content);
+            expect(window['downloadManager'].enqueue).toHaveBeenCalled();
+            done();
+          } catch (e) {
+            fail(e);
+          }
+        });
+      });
+
+      describe('if permission not granted', () => {
+        beforeAll(() => {
+          mockPermissionService['checkPermissions'].and.returnValue(of({ isPermissionAlwaysDenied: false, hasPermission: false }));
+          mockPermissionService['requestPermissions'].and.returnValue(of({ isPermissionAlwaysDenied: false, hasPermission: false }));
+        })
+        it('should reject ', async (done) => {
+          try {
+            await downloadPdfService.downloadPdf(content as any as Content);
+            fail();
+          } catch (e) {
+            expect(e).toEqual({ reason: 'user-permission-denied' });
+            done();
+          }
+        });
+      });
+    });
+  });
+});
diff --git a/src/services/download-pdf/download-pdf.service.ts b/src/services/download-pdf/download-pdf.service.ts
new file mode 100644
index 000000000..1bd7e5b68
--- /dev/null
+++ b/src/services/download-pdf/download-pdf.service.ts
@@ -0,0 +1,56 @@
+import { Injectable } from '@angular/core';
+import { AndroidPermissionsService } from '../android-permissions/android-permissions.service';
+import { AndroidPermission } from '@app/services/android-permissions/android-permission';
+import { Content } from '@project-sunbird/sunbird-sdk';
+
+
+@Injectable({
+  providedIn: 'root'
+})
+export class DownloadPdfService {
+  
+  constructor(
+    private permissionService: AndroidPermissionsService,
+  ) { }
+
+
+  async downloadPdf(content: Content) {
+    return new Promise(async (resolve, reject) => {
+      const checkedStatus = await this.permissionService.checkPermissions([AndroidPermission.WRITE_EXTERNAL_STORAGE]).toPromise();
+      if (checkedStatus.isPermissionAlwaysDenied) {
+        reject({ reason: 'device-permission-denied' });
+
+        return;
+      }
+      if (!checkedStatus.hasPermission) {
+        const requestedStatus = await this.permissionService.requestPermissions([AndroidPermission.WRITE_EXTERNAL_STORAGE]).toPromise();
+        if (requestedStatus.hasPermission) {
+          const fileUri = content.contentData.downloadUrl;
+          const fileName = content.name;
+          const displayDescription = content.contentData.description;
+          const downloadRequest: EnqueueRequest = {
+            uri: fileUri,
+            title: '',
+            description: displayDescription,
+            mimeType: 'application/pdf',
+            visibleInDownloadsUi: true,
+            notificationVisibility: 1,
+            destinationInExternalPublicDir: {
+              dirType: 'Download',
+              subPath: `/${fileName}`
+            },
+            headers: []
+          };
+          downloadManager.enqueue(downloadRequest, (err, id: string) => {
+            if (err) {
+              reject({ reason: 'download-failed' });
+            }
+            resolve(id);
+          });
+        } else {
+            reject({ reason: 'user-permission-denied' });
+        }
+      }
+    });
+  }
+}
diff --git a/src/services/externalid-verification.service.spec.ts b/src/services/externalid-verification.service.spec.ts
index 7a3cb19ef..7743e51ef 100644
--- a/src/services/externalid-verification.service.spec.ts
+++ b/src/services/externalid-verification.service.spec.ts
@@ -1,3 +1,4 @@
+import { Router } from '@angular/router';
 import { ExternalIdVerificationService } from './externalid-verification.service';
 import { ProfileService, AuthService } from '@project-sunbird/sunbird-sdk';
 import {
@@ -43,6 +44,9 @@ describe('ExternalIdVerificationService', () => {
   const mockLocalCourseService: Partial<LocalCourseService> = {
     checkCourseRedirect: jest.fn()
   };
+  const mockRouter: Partial<Router> = {
+    navigate: jest.fn()
+  };
   beforeAll(() => {
     externalIdVerificationService = new ExternalIdVerificationService(
       mockProfileService as ProfileService,
@@ -51,7 +55,8 @@ describe('ExternalIdVerificationService', () => {
       mockFormnFrameworkUtilService as FormAndFrameworkUtilService,
       mockSplaschreenDeeplinkActionHandlerDelegate as SplaschreenDeeplinkActionHandlerDelegate,
       mockCommonUtilService as CommonUtilService,
-      mockLocalCourseService as LocalCourseService
+      mockLocalCourseService as LocalCourseService,
+      mockRouter as Router
     );
   });
 
@@ -107,14 +112,22 @@ describe('ExternalIdVerificationService', () => {
 
     it('shouldn\'t show Ext Verification popup if its Quiz content redirection flow', () => {
       // arrange
+      mockAppGlobalService.redirectUrlAfterLogin = 'url';
       mockCommonUtilService.networkInfo = {
         isNetworkAvailable: false
       };
       externalIdVerificationService.checkQuizContent = jest.fn(() => Promise.resolve(false));
+      mockProfileService.getActiveProfileSession = jest.fn(() => of({
+        managedSession: {}
+      })) as any;
       // act
       externalIdVerificationService.showExternalIdVerificationPopup();
       // assert
       expect(mockPopOverController.create).not.toHaveBeenCalled();
+      expect(mockRouter.navigate).toHaveBeenCalledWith(
+        ['url'],
+        expect.anything()
+      );
     });
 
     it('shouldn\'t show Ext Verification popup if network is not available', () => {
@@ -190,6 +203,9 @@ describe('ExternalIdVerificationService', () => {
       }] as any));
       const mockCreate = jest.spyOn(mockPopOverController, 'create');
       mockFormnFrameworkUtilService.getTenantSpecificMessages = jest.fn(() => Promise.resolve([{ range: [{}] }]));
+      mockProfileService.getActiveProfileSession = jest.fn(() => of({
+        managedSession: undefined
+      })) as any;
       // act
       externalIdVerificationService.showExternalIdVerificationPopup();
       // assert
@@ -210,6 +226,7 @@ describe('ExternalIdVerificationService', () => {
           category: 'OrgMigrationAction'
         });
         expect(mockCreate.mock.calls[0][0]['componentProps']['tenantMessages']).toEqual({});
+        expect(mockProfileService.getActiveProfileSession).toHaveBeenCalled();
         done();
       }, 0);
     });
@@ -233,6 +250,9 @@ describe('ExternalIdVerificationService', () => {
       }] as any));
       const mockCreate = jest.spyOn(mockPopOverController, 'create');
       mockFormnFrameworkUtilService.getTenantSpecificMessages = jest.fn(() => Promise.resolve([{ range: [{}] }]));
+      mockProfileService.getActiveProfileSession = jest.fn(() => of({
+        managedSession: undefined
+      })) as any;
       // act
       externalIdVerificationService.showExternalIdVerificationPopup();
       // assert
@@ -250,6 +270,7 @@ describe('ExternalIdVerificationService', () => {
           category: 'OrgMigrationAction'
         });
         expect(mockCreate.mock.calls[0][0]['componentProps']['tenantMessages']).toEqual({});
+        expect(mockProfileService.getActiveProfileSession).toHaveBeenCalled();
         done();
       }, 0);
     });
diff --git a/src/services/externalid-verification.service.ts b/src/services/externalid-verification.service.ts
index 1a5156766..a38b24b6c 100644
--- a/src/services/externalid-verification.service.ts
+++ b/src/services/externalid-verification.service.ts
@@ -1,5 +1,6 @@
+import { Router } from '@angular/router';
 import { Injectable, Inject } from '@angular/core';
-import { ProfileService, UserFeed } from 'sunbird-sdk';
+import { ProfileService } from 'sunbird-sdk';
 import { AppGlobalService } from './app-global-service.service';
 import { Observable } from 'rxjs';
 import { PopoverController } from '@ionic/angular';
@@ -24,7 +25,8 @@ export class ExternalIdVerificationService {
         private formAndFrameworkUtilService: FormAndFrameworkUtilService,
         private splaschreenDeeplinkActionHandlerDelegate: SplaschreenDeeplinkActionHandlerDelegate,
         private commonUtilService: CommonUtilService,
-        private localCourseService: LocalCourseService
+        private localCourseService: LocalCourseService,
+        private router: Router
     ) {
         this.isCustodianUser$ = this.profileService.isDefaultChannelProfile().pipe(
             map((isDefaultChannelProfile) => isDefaultChannelProfile) as any
@@ -33,9 +35,25 @@ export class ExternalIdVerificationService {
 
     async showExternalIdVerificationPopup() {
         this.appGlobalService.closeSigninOnboardingLoader();
+        if (this.appGlobalService.redirectUrlAfterLogin) {
+            this.router.navigate(
+                [this.appGlobalService.redirectUrlAfterLogin],
+                {
+                    state: {
+                        fromRegistrationFlow: true
+                    },
+                    replaceUrl: true
+                }
+            );
+            this.appGlobalService.redirectUrlAfterLogin = '';
+        }
         if (await this.checkQuizContent()) {
             return;
         }
+        const profileSession = await this.profileService.getActiveProfileSession().toPromise();
+        if (profileSession.managedSession) {
+            return;
+        }
         const session = await this.appGlobalService.authService.getSession().toPromise();
         if (!this.commonUtilService.networkInfo.isNetworkAvailable || !session) {
             return;
diff --git a/src/services/form-location-factory/form-location-factory.ts b/src/services/form-location-factory/form-location-factory.ts
new file mode 100644
index 000000000..598b35325
--- /dev/null
+++ b/src/services/form-location-factory/form-location-factory.ts
@@ -0,0 +1,130 @@
+import { Inject, Injectable } from '@angular/core';
+import { FormControl } from '@angular/forms';
+import { Location as LocationType } from '@app/app/app.constant';
+import { CommonUtilService, TelemetryGeneratorService } from '@app/services';
+import { Location } from '@project-sunbird/client-services/models/location';
+import { CachedItemRequestSourceFrom, LocationSearchCriteria, ProfileService } from '@project-sunbird/sunbird-sdk';
+import { FieldConfig, FieldConfigOptionsBuilder } from 'common-form-elements';
+import { concat, defer, iif, of } from 'rxjs';
+import { distinctUntilChanged, switchMap } from 'rxjs/operators';
+
+@Injectable({ providedIn: 'root' })
+export class FormLocationFactory {
+  private userLocationCache: { [request: string]: Location[] | undefined } = {};
+  constructor(
+    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+    private commonUtilService: CommonUtilService,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+  ) { }
+  buildStateListClosure(config: FieldConfig<any>, initial = false): FieldConfigOptionsBuilder<Location> {
+    return (formControl: FormControl, _: FormControl, notifyLoading, notifyLoaded) => {
+      return defer(async () => {
+        const req: LocationSearchCriteria = {
+          from: CachedItemRequestSourceFrom.SERVER,
+          filters: {
+            type: LocationType.TYPE_STATE
+          }
+        };
+        notifyLoading();
+        return this.fetchUserLocation(req)
+          .then((stateLocationList: Location[]) => {
+            notifyLoaded();
+            const list = stateLocationList.map((s) => ({ label: s.name, value: s }));
+            if (config.default && initial) {
+              const option = list.find((o) => o.value.id === config.default.id || o.label === config.default.name);
+              formControl.patchValue(option ? option.value : null, { emitModelToViewChange: false });
+              formControl.markAsPristine();
+              config.default['code'] = option ? option.value['code'] : config.default['code'];
+            }
+            initial = false;
+            return list;
+          })
+          .catch((e) => {
+            notifyLoaded();
+            this.commonUtilService.showToast('NO_DATA_FOUND');
+            console.error(e);
+            return [];
+          });
+      });
+    };
+  }
+  buildLocationListClosure(config: FieldConfig<any>, initial = false): FieldConfigOptionsBuilder<Location> {
+    const locationType = config.templateOptions['dataSrc']['params']['id'];
+    return (formControl: FormControl, contextFormControl: FormControl, notifyLoading, notifyLoaded) => {
+      if (!contextFormControl) {
+        return of([]);
+      }
+      return iif(
+        () => initial,
+        contextFormControl.valueChanges,
+        concat(
+          of(contextFormControl.value),
+          contextFormControl.valueChanges
+        )
+      ).pipe(
+        distinctUntilChanged((a: Location, b: Location) => {
+          return !!(!a && !b ||
+            !a && b ||
+            !b && a ||
+            a.code === b.code);
+        }),
+        switchMap(async (value) => {
+          if (!value) {
+            return [];
+          }
+          const req: LocationSearchCriteria = {
+            from: CachedItemRequestSourceFrom.SERVER,
+            filters: {
+              type: locationType,
+              parentId: (contextFormControl.value as Location).id
+            }
+          };
+          notifyLoading();
+          return await this.fetchUserLocation(req).then((locationList: Location[]) => {
+            notifyLoaded();
+            const list = locationList.map((s) => ({ label: s.name, value: s }));
+            if (config.default && initial && !formControl.value) {
+              const option = list.find((o) => o.value.id === config.default.id);
+              formControl.patchValue(option ? option.value : null);
+              formControl.markAsPristine();
+              config.default['code'] = option ? option.value['code'] : config.default['code'];
+            }
+            initial = false;
+            return list;
+          })
+            .catch((e) => {
+              notifyLoaded();
+              this.commonUtilService.showToast('NO_DATA_FOUND');
+              console.error(e);
+              return [];
+            });
+        })
+      );
+    };
+  }
+
+  private async fetchUserLocation(request: any): Promise<Location[]> {
+    const serialized = JSON.stringify(request);
+    if (this.userLocationCache[serialized]) {
+      return this.userLocationCache[serialized];
+    }
+    return this.profileService.searchLocation(request).toPromise()
+      .then((response) => {
+        this.userLocationCache[serialized] = response;
+        return response;
+      });
+  }
+  // private generateTelemetryInteract(telemetryData) {
+  //   this.telemetryGeneratorService.generateInteractTelemetry(
+  //     telemetryData.type,
+  //     telemetryData.subType,
+  //     telemetryData.env,
+  //     telemetryData.pageId,
+  //     undefined,
+  //     undefined,
+  //     undefined,
+  //     undefined,
+  //     telemetryData.id
+  //   );
+  // }
+}
diff --git a/src/services/form-validation-async-factory/form-validation-async-factory.ts b/src/services/form-validation-async-factory/form-validation-async-factory.ts
new file mode 100644
index 000000000..4a50663dc
--- /dev/null
+++ b/src/services/form-validation-async-factory/form-validation-async-factory.ts
@@ -0,0 +1,186 @@
+import { Inject, Injectable } from '@angular/core';
+import { FormControl, ValidationErrors } from '@angular/forms';
+import { ProfileConstants } from '@app/app/app.constant';
+import { EditContactVerifyPopupComponent } from '@app/app/components/popups/edit-contact-verify-popup/edit-contact-verify-popup.component';
+import { PopoverController } from '@ionic/angular';
+import { GenerateOtpRequest, ProfileService, ServerProfile } from '@project-sunbird/sunbird-sdk';
+import { FieldConfig } from 'common-form-elements';
+import { CommonUtilService } from '../common-util.service';
+import { TelemetryGeneratorService } from '../telemetry-generator.service';
+
+@Injectable({ providedIn: 'root' })
+export class FormValidationAsyncFactory {
+
+  constructor(
+    @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+    private commonUtilService: CommonUtilService,
+    private popoverCtrl: PopoverController,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+  ) { }
+
+  mobileVerificationAsyncFactory(formElement: FieldConfig<any>, profile: ServerProfile, initialMobileVal, telemetryData?): any {
+    return (marker: string, trigger: HTMLElement) => {
+      if (marker === 'MOBILE_OTP_VALIDATION') {
+        return async (control: FormControl) => {
+          if ((control && !control.value) || (initialMobileVal && initialMobileVal === control.value)) {
+            return null;
+          }
+          return new Promise<ValidationErrors | null>(resolve => {
+            if (trigger) {
+              const that = this;
+              trigger.onclick = (async () => {
+                if (telemetryData) {
+                  this.generateTelemetryInteract(telemetryData);
+                }
+                try {
+                  const isOtpVerified: boolean = await that.generateAndVerifyOTP(profile, control, ProfileConstants.CONTACT_TYPE_PHONE);
+                  if (isOtpVerified) {
+                    resolve(null);
+                  } else {
+                    resolve({ asyncValidation: 'error' });
+                  }
+                } catch (e) {
+                  console.log(e);
+                }
+              }).bind(this);
+              return;
+            }
+            resolve(null);
+          });
+        };
+      }
+      return async () => null;
+    };
+  }
+
+  emailVerificationAsyncFactory(formElement: FieldConfig<any>, profile: ServerProfile, initialEmailVal, telemetryData?): any {
+    return (marker: string, trigger: HTMLElement) => {
+      if (marker === 'EMAIL_OTP_VALIDATION') {
+        return async (control: FormControl) => {
+          if ((control && !control.value) || (initialEmailVal && initialEmailVal === control.value)) {
+            return null;
+          }
+          return new Promise<ValidationErrors | null>(resolve => {
+            if (trigger) {
+              const that = this;
+              trigger.onclick = (async () => {
+                if (telemetryData) {
+                  this.generateTelemetryInteract(telemetryData);
+                }
+                try {
+                  const isOtpVerified: boolean = await that.generateAndVerifyOTP(profile, control, ProfileConstants.CONTACT_TYPE_EMAIL);
+                  if (isOtpVerified) {
+                    resolve(null);
+                  } else {
+                    resolve({ asyncValidation: 'error' });
+                  }
+                } catch (e) {
+                  console.error(e);
+                }
+              }).bind(this);
+              return;
+            }
+            resolve(null);
+          });
+        };
+      }
+      return async () => null;
+    };
+  }
+
+  private async generateAndVerifyOTP(profile, control, type): Promise<boolean> {
+    const loader = await this.commonUtilService.getLoader();
+    try {
+      const req: GenerateOtpRequest = {
+        key: control.value,
+        type
+      };
+
+      await loader.present();
+      await this.profileService.generateOTP(req).toPromise();
+
+      await loader.dismiss();
+
+      const isOtpVerified = await this.checkOtpVerification(profile, type, control.value);
+      if (isOtpVerified) {
+        return true;
+      } else {
+        return false;
+      }
+    } catch (e) {
+      if (e && e.response && e.response.body && e.response.body.params && e.response.body.params.err &&
+        e.response.body.params.err === 'ERROR_RATE_LIMIT_EXCEEDED') {
+        this.commonUtilService.showToast('ERROR_OTP_LIMIT_EXCEEDED');
+      } else if (e.message !== 'CANCEL') {
+        this.commonUtilService.showToast('SOMETHING_WENT_WRONG');
+      }
+      throw e;
+      return false;
+    } finally {
+      if (loader) {
+        await loader.dismiss();
+      }
+    }
+  }
+
+  private async checkOtpVerification(profile, type: string, key: any): Promise<boolean> {
+    if (type === ProfileConstants.CONTACT_TYPE_PHONE) {
+      const componentProps = {
+        key,
+        phone: profile.phone,
+        title: this.commonUtilService.translateMessage('VERIFY_PHONE_OTP_TITLE'),
+        description: this.commonUtilService.translateMessage('VERIFY_PHONE_OTP_DESCRIPTION'),
+        type: ProfileConstants.CONTACT_TYPE_PHONE,
+        userId: profile.userId
+      };
+
+      const data = await this.openContactVerifyPopup(EditContactVerifyPopupComponent, componentProps, 'popover-alert input-focus');
+      if (data && data.OTPSuccess) {
+        return true;
+      } else if (!data || !data.OTPSuccess) {
+        throw new Error('CANCEL');
+      }
+      return false;
+    } else {
+      const componentProps = {
+        key,
+        phone: profile.email,
+        title: this.commonUtilService.translateMessage('VERIFY_EMAIL_OTP_TITLE'),
+        description: this.commonUtilService.translateMessage('VERIFY_EMAIL_OTP_DESCRIPTION'),
+        type: ProfileConstants.CONTACT_TYPE_EMAIL,
+        userId: profile.userId
+      };
+
+      const data = await this.openContactVerifyPopup(EditContactVerifyPopupComponent, componentProps, 'popover-alert input-focus');
+      if (data && data.OTPSuccess) {
+        return true;
+      } else if (!data || !data.OTPSuccess) {
+        throw new Error('CANCEL');
+      }
+      return false;
+    }
+  }
+
+  private async openContactVerifyPopup(component, componentProps, cssClass) {
+    const popover = await this.popoverCtrl.create({ component, componentProps, cssClass });
+    await popover.present();
+    const { data } = await popover.onDidDismiss();
+
+    return data;
+  }
+
+  private generateTelemetryInteract(telemetryData) {
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      telemetryData.type,
+      telemetryData.subType,
+      telemetryData.env,
+      telemetryData.pageId,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      telemetryData.id
+    );
+  }
+
+}
diff --git a/src/services/formandframeworkutil.service.spec.data.ts b/src/services/formandframeworkutil.service.spec.data.ts
index 0a6d444d7..8258c1cf7 100644
--- a/src/services/formandframeworkutil.service.spec.data.ts
+++ b/src/services/formandframeworkutil.service.spec.data.ts
@@ -289,52 +289,92 @@ export const mockLocationConfigResponse =
  }
 } as any;
 
+
+export const mockPdfPlayerConfigurationResponse =
+{
+  form : {
+    type :  'config' ,
+    subtype :  'pdfPlayer' ,
+    action :  'get' ,
+    data : {
+      action :  'get' ,
+      fields : [
+        {
+          name: 'pdfPlayer',
+          code: 'pdf',
+          values: [
+            {
+              isEnabled: true
+             }
+          ]
+        }
+     ]
+   }
+ }
+} as any;
+
 export const mockContentConfigResponse =
 {
   form : {
     type :  'config' ,
-    subtype :  'content' ,
+    subtype :  'content_v2' ,
     action :  'filter' ,
     data : {
       action :  'filter' ,
       fields : [
        {
           name :  'library' ,
-          code :  'contentType' ,
+          code :  'primaryCategory' ,
           values : [
-            'Resource' ,
-            'Collection' ,
-            'TextBook' ,
-            'LessonPlan' ,
-            'Course'
-         ]
+            'Course',
+            'Learning Resource',
+            'Explanation Content',
+            'Teacher Resource',
+            'Content Playlist',
+            'Digital Textbook',
+            'Practice Question Set',
+            'eTextbook',
+            'Course Assessment'
+          ]
        },
        {
           name :  'course' ,
-          code :  'contentType' ,
+          code :  'primaryCategory' ,
           values : [
-            'Course'
-         ]
+            'Course',
+            'Learning Resource',
+            'Explanation Content',
+            'Teacher Resource',
+            'Content Playlist',
+            'Digital Textbook',
+            'Practice Question Set',
+            'eTextbook',
+            'Course Assessment'
+          ]
        },
        {
           name :  'downloads' ,
-          code :  'contentType' ,
+          code :  'primaryCategory' ,
           values : [
-            'Resource' ,
-            'Collection' ,
-            'TextBook' ,
-            'LessonPlan' ,
-            'Course'
-         ]
+            'Course',
+            'Learning Resource',
+            'Explanation Content',
+            'Teacher Resource',
+            'Content Playlist',
+            'Digital Textbook',
+            'Practice Question Set',
+            'eTextbook',
+            'Course Assessment'
+          ]
        },
        {
           name :  'dialcode' ,
-          code :  'contentType' ,
+          code :  'primaryCategory' ,
           values : [
-            'TextBook' ,
-            'TextBookUnit' ,
-            'Course'
-         ]
+            'Course',
+            'Digital Textbook',
+            'Textbook Unit'
+          ]
        }
      ]
    }
@@ -475,3 +515,233 @@ export const mockCategoryTermsResponse =
   }
 ] as any;
 
+export const mockTenantPersonaInfoForm = [
+  {
+    code: 'persona',
+    type: 'select',
+    templateOptions: {
+      label: 'I am a',
+      placeHolder: 'Select persona',
+      options: [
+        {
+          value: 'teacher',
+          label: 'Teacher'
+        },
+        {
+          value: 'other',
+          label: 'Other'
+        }
+      ]
+    },
+    validations: [
+      {
+        type: 'required',
+        value: true,
+        message: 'Persona is required'
+      }
+    ]
+  },
+  {
+    code: 'tenant',
+    type: 'select',
+    templateOptions: {
+      label: 'with',
+      placeHolder: 'Select State/ Institution',
+      options: [
+        {
+          label: 'Andhra Pradesh',
+          value: '012320771042492416102'
+        }
+      ],
+      validations: [
+        {
+          type: 'required',
+          value: true,
+          message: 'Persona is required'
+        }
+      ]
+    }
+  }
+];
+
+export const mockSelfDeclarationForm = [
+  {
+    code: 'name',
+    type: 'label',
+    templateOptions: {
+      labelHtml: {
+        contents: '<p>$0:&nbsp;$1</p>',
+        values: {
+          $0: 'NAME',
+          $1: ''
+        }
+      }
+    }
+  },
+  {
+    code: 'state',
+    type: 'label',
+    templateOptions: {
+      labelHtml: {
+        contents: '<p>$0:&nbsp;$1</p>',
+        values: {
+          $0: 'STATE',
+          $1: ''
+        }
+      }
+    }
+  },
+  {
+    code: 'district',
+    type: 'label',
+    templateOptions: {
+      labelHtml: {
+        contents: '<p>$0:&nbsp;$1</p>',
+        values: {
+          $0: 'DISTRICT',
+          $1: ''
+        }
+      }
+    }
+  },
+  {
+    code: 'externalIds',
+    type: 'nested_group',
+    children: [
+      {
+        code: 'declared-phone',
+        fieldName: 'Mobile Number',
+        type: 'input',
+        templateOptinputions: {
+          labelHtml: {
+            contents: '<span>$0&nbsp;<span class=\required-asterisk\>*</span></span>',
+            values: {
+              $0: 'PHONE_PLACEHOLDER'
+            }
+          },
+          placeHolder: 'ENTER_PHONE_POPUP_TITLE',
+          prefix: '+91 -'
+        },
+        validations: [
+          {
+            type: 'required',
+            value: true,
+            message: 'ERROR_PHONE_REQUIRED'
+          },
+          {
+            type: 'pattern',
+            value: '^[6-9*][0-9*]{9}$',
+            message: 'ERROR_PHONE_INVALID'
+          }
+        ],
+        asyncValidation: {
+          marker: 'MOBILE_OTP_VALIDATION',
+          message: 'PLEASE_VALIDATE_YOUR_MOBILE_NUMBER',
+          trigger: 'validate'
+        }
+      },
+      {
+        code: 'declared-email',
+        fieldName: 'Email Address',
+        type: 'input',
+        templateOptions: {
+          placeHolder: 'EMAIL_PLACEHOLDER',
+          label: 'EMAIL_ID_PLACEHOLDER'
+        },
+        validations: [
+          {
+            type: 'pattern',
+            value: '^[A-Za-z0-9._*%+-]+@[A-Za-z0-9.-]+\\.[a-z]{2,}$',
+            message: 'ERROR_EMAIL_INVALID'
+          }
+        ],
+        asyncValidation: {
+          marker: 'EMAIL_OTP_VALIDATION',
+          message: 'PLEASE_VALIDATE_YOUR_EMAIL_ADDRESS',
+          trigger: 'validate'
+        }
+      },
+      {
+        code: 'declared-school-name',
+        fieldName: 'School/Organization name',
+        type: 'input',
+        templateOptions: {
+          label: 'SCHOOL_OR_ORG_NAME',
+          placeHolder: 'ENTER_SCHOOL_NAME'
+        },
+        validations: [
+          {
+            type: 'pattern',
+            value: '^[^\',(\\r\\n|\\r|\\n)]*$',
+            message: 'Special characters not allowed'
+          }
+        ]
+      },
+      {
+        code: 'declared-school-udise-code',
+        fieldName: 'School UDISE ID/Org ID',
+        type: 'input',
+        templateOptions: {
+          label: 'SCHOOL_UDISE_ID_OR_ORG_ID',
+          placeHolder: 'ENTER_UDISE_ID'
+        },
+        validations: [
+          {
+            type: 'pattern',
+            value: '^[^\',(\\r\\n|\\r|\\n)]*$',
+            message: 'Special characters not allowed'
+          }
+        ]
+      },
+      {
+        code: 'declared-ext-id',
+        fieldName: 'Your ID from State/Board/Org',
+        type: 'input',
+        templateOptions: {
+          labelHtml: {
+            contents: '<span>$0&nbsp;<span class=\required-asterisk\>*</span></span>',
+            values: {
+              $0: 'ENTER_ID_AS_REQUESTED_BY_STATE_BOARD_ORG'
+            }
+          },
+          placeHolder: 'ENTER_ID'
+        },
+        validations: [
+          {
+            type: 'required',
+            value: true,
+            message: 'ID_IS_REQUIRED'
+          },
+          {
+            type: 'pattern',
+            value: '^[^\',(\\r\\n|\\r|\\n)]*$',
+            message: 'Special characters not allowed'
+          }
+        ]
+      }
+    ],
+    templateOptions: {}
+  },
+  {
+    code: 'tnc',
+    type: 'checkbox',
+    templateOptions: {
+      labelHtml: {
+        contents: '<span>$tnc <u><a href=\$url\>$0</a></u></span>',
+        values: {
+          $tnc: 'SELF_DECLARE_TEACHER_TNC',
+          $url: 'url',
+          $0: 'PRIVACY_POLICY'
+        }
+      }
+    },
+    validations: [
+      {
+        type: 'required',
+        value: true,
+        message: ''
+      }
+    ]
+  }
+];
+
diff --git a/src/services/formandframeworkutil.service.spec.ts b/src/services/formandframeworkutil.service.spec.ts
index 0a953a065..4caccebe9 100644
--- a/src/services/formandframeworkutil.service.spec.ts
+++ b/src/services/formandframeworkutil.service.spec.ts
@@ -12,7 +12,7 @@ import {
 import { AppGlobalService } from './app-global-service.service';
 import { AppVersion } from '@ionic-native/app-version/ngx';
 import { TranslateService } from '@ngx-translate/core';
-import { Events } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { of, throwError } from 'rxjs';
 import {
   mockWebviewFormResponse,
@@ -28,8 +28,11 @@ import {
   mockLocationConfigResponse,
   mockContentConfigResponse,
   mockforceUpgradeFormAPIResponse,
-  mockCategoryTermsResponse
+  mockCategoryTermsResponse,
+  mockPdfPlayerConfigurationResponse,
+  mockSelfDeclarationForm
 } from './formandframeworkutil.service.spec.data';
+import { FormConstants } from '../app/form.constants';
 
 
 describe('FormAndFrameworkUtilService', () => {
@@ -477,6 +480,46 @@ describe('FormAndFrameworkUtilService', () => {
     });
   });
 
+  describe('invokePdfPlayerConfiguration()', () => {
+    it('should invoke form api to get pdf player configuration' , (done) => {
+      mockFormService.getForm = jest.fn(() => of(mockPdfPlayerConfigurationResponse));
+      const resolve = jest.fn(() => Promise.resolve());
+      const reject = jest.fn(() => Promise.reject());
+      jest.spyOn<any, any>(formAndFrameworkUtilService, 'invokePdfPlayerConfiguration');
+      formAndFrameworkUtilService.invokePdfPlayerConfiguration(undefined, resolve , reject).then((res) => {
+        done();
+      });
+    });
+  });
+
+  describe('getPdfPlayerConfiguration()', () => {
+    it('should not invoke pdf player configuration , if config is available locally', (done) => {
+      mockFormService.getForm = jest.fn(() => of({}));
+      mockAppGlobalService.getPdfPlayerConfiguration = jest.fn(() => true);
+      formAndFrameworkUtilService.getPdfPlayerConfiguration().then((response) => {
+        expect(response).toEqual(true);
+        done();
+      });
+    });
+
+    it('should invoke pdf player configuration, if config is not available locally' , (done) => {
+      mockFormService.getForm = jest.fn(() => of({}));
+      jest.spyOn(formAndFrameworkUtilService, 'invokePdfPlayerConfiguration').mockImplementation(() => {
+        return Promise.resolve();
+      });
+      mockAppGlobalService.getPdfPlayerConfiguration = jest.fn(() => undefined);
+      formAndFrameworkUtilService.getPdfPlayerConfiguration();
+      setTimeout(() => {
+        expect(formAndFrameworkUtilService.invokePdfPlayerConfiguration).toHaveBeenCalled();
+        done();
+      }, 0);
+      // then((response) => {
+        // expect(formAndFrameworkUtilService.invokePdfPlayerConfiguration).toHaveBeenCalled();
+        // done();
+      // });
+    });
+  });
+
   describe('getCourseFilterConfig()', () => {
 
     it('should invoke invokeCourseFilterConfigFormApi if cached response is not available', (done) => {
@@ -643,7 +686,7 @@ describe('FormAndFrameworkUtilService', () => {
       // act
       // assert
       formAndFrameworkUtilService.invokeContentFilterConfigFormApi().then((response) => {
-        expect(response[0].values.length).toEqual(5);
+        expect(response[0].values.length).toEqual(9);
         done();
       });
     });
@@ -670,7 +713,17 @@ describe('FormAndFrameworkUtilService', () => {
       // act
       // assert
       formAndFrameworkUtilService.getSupportedContentFilterConfig('library').then((response) => {
-        expect(response).toEqual(['Resource', 'Collection', 'TextBook', 'LessonPlan', 'Course']);
+        expect(response).toEqual(expect.arrayContaining([
+          'Course',
+          'Teacher Resource',
+          'Learning Resource',
+          'Explanation Content',
+          'Content Playlist',
+          'Digital Textbook',
+          'Practice Question Set',
+          'eTextbook',
+          'Course Assessment'
+        ]));
         done();
       });
     });
@@ -679,13 +732,21 @@ describe('FormAndFrameworkUtilService', () => {
       // arrange
       formAndFrameworkUtilService['getCachedContentFilterConfig'] = jest.fn(() => undefined);
       formAndFrameworkUtilService['invokeContentFilterConfigFormApi'] = jest.fn(() =>
-        Promise.resolve([]));
+        Promise.resolve(Promise.resolve(mockContentConfigResponse.form.data.fields)));
       // act
       // assert
       formAndFrameworkUtilService.getSupportedContentFilterConfig('library').then((response) => {
-        expect(response).toEqual(['Story', 'Worksheet', 'Game', 'Resource', 'Collection', 'TextBook', 'eTextBook',
-          'LessonPlan', 'FocusSpot', 'LearningOutcomeDefinition', 'PracticeQuestionSet', 'CuriosityQuestions',
-          'MarkingSchemeRubric', 'ExplanationResource', 'ExperientialResource']);
+        expect(response).toEqual(expect.arrayContaining([
+          'Course',
+          'Teacher Resource',
+          'Learning Resource',
+          'Explanation Content',
+          'Content Playlist',
+          'Digital Textbook',
+          'Practice Question Set',
+          'eTextbook',
+          'Course Assessment'
+        ]));
         done();
       });
     });
@@ -694,11 +755,19 @@ describe('FormAndFrameworkUtilService', () => {
       // arrange
       formAndFrameworkUtilService['getCachedContentFilterConfig'] = jest.fn(() => undefined);
       formAndFrameworkUtilService['invokeContentFilterConfigFormApi'] = jest.fn(() =>
-        Promise.resolve([]));
+        Promise.resolve(mockContentConfigResponse.form.data.fields));
       // act
       // assert
       formAndFrameworkUtilService.getSupportedContentFilterConfig('course').then((response) => {
-        expect(response).toEqual(['Course']);
+        expect(response).toContain('Course');
+        expect(response).toContain('Teacher Resource');
+        expect(response).toContain('Learning Resource');
+        expect(response).toContain('Explanation Content');
+        expect(response).toContain('Content Playlist');
+        expect(response).toContain('Digital Textbook');
+        expect(response).toContain('Practice Question Set');
+        expect(response).toContain('eTextbook');
+        expect(response).toContain('Course Assessment');
         done();
       });
     });
@@ -707,14 +776,20 @@ describe('FormAndFrameworkUtilService', () => {
       // arrange
       formAndFrameworkUtilService['getCachedContentFilterConfig'] = jest.fn(() => undefined);
       formAndFrameworkUtilService['invokeContentFilterConfigFormApi'] = jest.fn(() =>
-        Promise.resolve([]));
+        Promise.resolve(Promise.resolve(mockContentConfigResponse.form.data.fields)));
       // act
       // assert
       formAndFrameworkUtilService.getSupportedContentFilterConfig('downloads').then((response) => {
-        expect(response).toEqual(['Story', 'Worksheet', 'Game', 'Resource', 'Collection', 'TextBook', 'eTextBook',
-          'LessonPlan', 'FocusSpot', 'LearningOutcomeDefinition', 'PracticeQuestionSet', 'CuriosityQuestions',
-          'MarkingSchemeRubric', 'ExplanationResource', 'ExperientialResource',
-          'Course']);
+        expect(response).toContain('Course');
+        expect(response).toContain('Teacher Resource');
+        expect(response).toContain('Learning Resource');
+        expect(response).toContain('Explanation Content');
+        expect(response).toContain('Content Playlist');
+        expect(response).toContain('Digital Textbook');
+        expect(response).toContain('Practice Question Set');
+        expect(response).toContain('eTextbook');
+        expect(response).toContain('Course Assessment');
+
         done();
       });
     });
@@ -727,7 +802,11 @@ describe('FormAndFrameworkUtilService', () => {
       // act
       // assert
       formAndFrameworkUtilService.getSupportedContentFilterConfig('dialcode').then((response) => {
-        expect(response).toEqual(['TextBook', 'TextBookUnit', 'Course']);
+        expect(response).toEqual(expect.arrayContaining([
+          'Digital Textbook',
+          'Textbook Unit',
+          'Course'
+        ]));
         expect(formAndFrameworkUtilService['getCachedContentFilterConfig']()).toBeUndefined();
         done();
       });
@@ -809,7 +888,7 @@ describe('FormAndFrameworkUtilService', () => {
       // act
       // assert
       formAndFrameworkUtilService.updateProfileInfo(profile, profileData).then((response) => {
-        expect(mockEvents.publish).toHaveBeenCalledWith('refresh:loggedInProfile');
+        expect(mockEvents.publish).toHaveBeenCalledWith('refresh:loggedInProfile', undefined);
         expect(response).toEqual({ status: true });
         done();
       });
@@ -823,7 +902,7 @@ describe('FormAndFrameworkUtilService', () => {
       // act
       // assert
       formAndFrameworkUtilService.updateProfileInfo(profile, profileData).then((response) => {
-        expect(mockEvents.publish).toHaveBeenCalledWith('refresh:loggedInProfile');
+        expect(mockEvents.publish).toHaveBeenCalledWith('refresh:loggedInProfile', undefined);
         expect(response).toEqual({ status: false, profile: { grade: ['class1'] } });
         done();
       });
@@ -996,4 +1075,138 @@ describe('FormAndFrameworkUtilService', () => {
     });
   });
 
+  describe('getContentRequestFormConfig()', () => {
+    it('should return the formConfig for reuest content', (done) => {
+      // arrange
+      mockFormService.getForm = jest.fn(() => of({
+        form: {
+          data: {
+            fields: []
+          }
+        }
+      }));
+      // act
+      formAndFrameworkUtilService.getContentRequestFormConfig().then(() => {
+        // assert
+        expect(mockFormService.getForm).toHaveBeenCalled();
+        done();
+      });
+      // assert
+
+    });
+  });
+
+  it('should get formConfig and return data with fields', (done) => {
+    // arrange
+    mockFormService.getForm = jest.fn(() => of({
+      form: {
+        data: {
+          fields: []
+        }
+      }
+    }));
+    // act
+    formAndFrameworkUtilService.getFormConfig().then(() => {
+      // assert
+      expect(mockFormService.getForm).toHaveBeenCalled();
+      done();
+    });
+  });
+
+  it('should get form getStateContactList and return data with fields', (done) => {
+    // arrange
+    mockFormService.getForm = jest.fn(() => of({
+      form: {
+        data: {
+          fields: []
+        }
+      }
+    }));
+    // act
+    formAndFrameworkUtilService.getStateContactList().then(() => {
+      // assert
+      expect(mockFormService.getForm).toHaveBeenCalled();
+      done();
+    });
+  });
+
+  it('should get form for getConsentFormConfig and return data with fields', (done) => {
+    // arrange
+    mockFormService.getForm = jest.fn(() => of({
+      form: {
+        data: {
+          fields: []
+        }
+      }
+    }));
+    // act
+    formAndFrameworkUtilService.getConsentFormConfig().then(() => {
+      expect(mockFormService.getForm).toHaveBeenCalled();
+      done();
+    });
+  });
+
+  it('should get form for notificationConfig and return data with fields', (done) => {
+    // arrange
+    mockFormService.getForm = jest.fn(() => of({
+      form: {
+        data: {
+          fields: []
+        }
+      }
+    }));
+    // act
+    formAndFrameworkUtilService.getNotificationFormConfig().then(() => {
+      expect(mockFormService.getForm).toHaveBeenCalled();
+      done();
+    });
+  });
+
+  it('should get form with board alias and return data with fields', (done) => {
+    // arrange
+    mockFormService.getForm = jest.fn(() => of({
+      form: {
+        data: {
+          fields: []
+        }
+      }
+    }));
+    // act
+    formAndFrameworkUtilService.getBoardAliasName().then(() => {
+      // assert
+      expect(mockFormService.getForm).toHaveBeenCalled();
+      done();
+    });
+  });
+
+  describe('getFormFields()', () => {
+    it('should return the field data in the response', () => {
+      mockFormService.getForm = jest.fn(() => of({
+        form: {
+          data: {
+            fields: mockSelfDeclarationForm
+          }
+        }
+      }));
+
+      formAndFrameworkUtilService.getFormFields(FormConstants.SELF_DECLARATION).then((response) => {
+        expect(response).toEqual(mockSelfDeclarationForm);
+      });
+    });
+
+    it('should return the empty response', () => {
+      mockFormService.getForm = jest.fn(() => of({
+        form: {
+          data: {
+          }
+        }
+      }));
+
+      formAndFrameworkUtilService.getFormFields(FormConstants.SELF_DECLARATION, '12345678').then((response) => {
+        expect(response).toEqual([]);
+      });
+    });
+
+  });
+
 });
diff --git a/src/services/formandframeworkutil.service.ts b/src/services/formandframeworkutil.service.ts
index 8c737755b..f77d4fc2e 100644
--- a/src/services/formandframeworkutil.service.ts
+++ b/src/services/formandframeworkutil.service.ts
@@ -2,7 +2,7 @@ import { Inject, Injectable } from '@angular/core';
 import { AppGlobalService } from '@app/services/app-global-service.service';
 import { AppVersion } from '@ionic-native/app-version/ngx';
 import { TranslateService } from '@ngx-translate/core';
-import { Events } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import {
     CachedItemRequestSourceFrom,
     CategoryTerm,
@@ -21,11 +21,14 @@ import {
     SystemSettingsService,
     WebviewSessionProviderConfig,
     SignInError,
-    FrameworkCategoryCode
+    FrameworkCategoryCode,
+    ProfileType
 } from 'sunbird-sdk';
 
-import { ContentFilterConfig, ContentType, PreferenceKey, SystemSettingsIds } from '@app/app/app.constant';
+import { ContentFilterConfig, PreferenceKey, SystemSettingsIds, PrimaryCategory, FormConstant } from '@app/app/app.constant';
 import { map } from 'rxjs/operators';
+import { EventParams } from '@app/app/components/sign-in-card/event-params.interface';
+import { Observable } from 'rxjs';
 
 @Injectable()
 export class FormAndFrameworkUtilService {
@@ -325,6 +328,44 @@ export class FormAndFrameworkUtilService {
             });
     }
 
+    async getPdfPlayerConfiguration() {
+        return new Promise((resolve, reject) => {
+            let pdfPlayerConfig;
+            // get cached pdfplayer config
+            pdfPlayerConfig = this.appGlobalService.getPdfPlayerConfiguration();
+
+            if (pdfPlayerConfig === undefined) {
+                pdfPlayerConfig = this.invokePdfPlayerConfiguration(pdfPlayerConfig, resolve, reject);
+            } else {
+                resolve(pdfPlayerConfig);
+            }
+        });
+    }
+
+
+
+
+    // get pdf player enable or disable configuration
+    async invokePdfPlayerConfiguration(
+        pdfPlayerConfig: any,
+        resolve: (value?: any) => void,
+        reject: (reason?: any) => void) {
+        const req: FormRequest = {
+            type: 'config',
+            subType: 'pdfPlayer_v2',
+            action: 'get',
+        };
+        let currentConfiguration;
+        this.formService.getForm(req).toPromise()
+            .then((res: any) => {
+                currentConfiguration = res.form.data; 
+                this.appGlobalService.setpdfPlayerconfiguration(currentConfiguration);
+                resolve(currentConfiguration);
+            }).catch((error: any) => {
+                console.log('Error - ' + error);
+            });
+    }
+
     private setContentFilterConfig(contentFilterConfig: Array<any>) {
         this.contentFilterConfig = contentFilterConfig;
     }
@@ -336,7 +377,7 @@ export class FormAndFrameworkUtilService {
     public async invokeContentFilterConfigFormApi(): Promise<any> {
         const req: FormRequest = {
             type: 'config',
-            subType: 'content',
+            subType: 'content_v2',
             action: 'filter',
         };
 
@@ -351,6 +392,7 @@ export class FormAndFrameworkUtilService {
             });
     }
 
+
     async getSupportedContentFilterConfig(name): Promise<Array<string>> {
         // get cached library config
         let contentFilterConfig: any = this.getCachedContentFilterConfig();
@@ -368,21 +410,21 @@ export class FormAndFrameworkUtilService {
         if (contentFilterConfig === undefined || contentFilterConfig.length === 0) {
             switch (name) {
                 case ContentFilterConfig.NAME_LIBRARY:
-                    libraryTabContentTypes = ContentType.FOR_LIBRARY_TAB;
+                    libraryTabContentTypes = PrimaryCategory.FOR_LIBRARY_TAB;
                     break;
                 case ContentFilterConfig.NAME_COURSE:
-                    libraryTabContentTypes = ContentType.FOR_COURSE_TAB;
+                    libraryTabContentTypes = PrimaryCategory.FOR_COURSE_TAB;
                     break;
                 case ContentFilterConfig.NAME_DOWNLOADS:
-                    libraryTabContentTypes = ContentType.FOR_DOWNLOADED_TAB;
+                    libraryTabContentTypes = PrimaryCategory.FOR_DOWNLOADED_TAB;
                     break;
                 case ContentFilterConfig.NAME_DIALCODE:
-                    libraryTabContentTypes = ContentType.FOR_DIAL_CODE_SEARCH;
+                    libraryTabContentTypes = PrimaryCategory.FOR_DIAL_CODE_SEARCH;
                     break;
             }
         } else {
             for (const field of contentFilterConfig) {
-                if (field.name === name && field.code === ContentFilterConfig.CODE_CONTENT_TYPE) {
+                if (field.name === name && field.code === ContentFilterConfig.CODE_PRIMARY_CATEGORY) {
                     libraryTabContentTypes = field.values;
                     break;
                 }
@@ -399,7 +441,7 @@ export class FormAndFrameworkUtilService {
      * @param profileRes : profile details of logged in user which can be obtained using userProfileService.getUserProfileDetails
      * @param profileData : Local profile of current user
      */
-    updateLoggedInUser(profileRes, profileData) {
+    updateLoggedInUser(profileRes, profileData, eventParams?: EventParams) {
         return new Promise(async (resolve, reject) => {
             const profile = {
                 board: [],
@@ -412,10 +454,12 @@ export class FormAndFrameworkUtilService {
             if (profileRes.framework && Object.keys(profileRes.framework).length) {
                 const categoryKeysLen = Object.keys(profileRes.framework).length;
                 let keysLength = 0;
-                profile.syllabus = [profileRes.framework.id[0]];
+                if (profileRes.framework.id && profileRes.framework.id.length) {
+                    profile.syllabus = [profileRes.framework.id[0]];
+                }
                 for (const categoryKey in profileRes.framework) {
                     if (profileRes.framework[categoryKey].length
-                    && FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES.includes(categoryKey as FrameworkCategoryCode)) {
+                        && FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES.includes(categoryKey as FrameworkCategoryCode)) {
                         const request: GetFrameworkCategoryTermsRequest = {
                             currentCategoryCode: categoryKey,
                             language: this.translate.currentLang,
@@ -440,7 +484,7 @@ export class FormAndFrameworkUtilService {
                                     }
                                 });
                                 if (categoryKeysLen === keysLength) {
-                                    this.updateProfileInfo(profile, profileData)
+                                    this.updateProfileInfo(profile, profileData, eventParams)
                                         .then((response) => {
                                             resolve(response);
                                         });
@@ -449,7 +493,7 @@ export class FormAndFrameworkUtilService {
                             .catch(err => {
                                 keysLength++;
                                 if (categoryKeysLen === keysLength) {
-                                    this.updateProfileInfo(profile, profileData)
+                                    this.updateProfileInfo(profile, profileData, eventParams)
                                         .then((response) => {
                                             resolve(response);
                                         });
@@ -457,6 +501,12 @@ export class FormAndFrameworkUtilService {
                             });
                     } else {
                         keysLength++;
+                        if (categoryKeysLen === keysLength) {
+                            this.updateProfileInfo(profile, profileData, eventParams)
+                                .then((response) => {
+                                    resolve(response);
+                                });
+                        }
                     }
                 }
             } else {
@@ -465,7 +515,7 @@ export class FormAndFrameworkUtilService {
         });
     }
 
-    updateProfileInfo(profile, profileData) {
+    updateProfileInfo(profile, profileData, eventParams?: EventParams) {
         return new Promise((resolve, reject) => {
             const req: Profile = {
                 syllabus: profile.syllabus,
@@ -487,7 +537,7 @@ export class FormAndFrameworkUtilService {
             this.profileService.updateProfile(req).toPromise()
                 .then((res: any) => {
                     const updateProfileRes = res;
-                    this.events.publish('refresh:loggedInProfile');
+                    this.events.publish('refresh:loggedInProfile', eventParams);
                     if (updateProfileRes.grade && updateProfileRes.medium &&
                         updateProfileRes.grade.length && updateProfileRes.medium.length
                     ) {
@@ -643,4 +693,150 @@ export class FormAndFrameworkUtilService {
                 });
         });
     }
+
+    async getFormConfig() {
+        const req: FormRequest = {
+            type: 'dynamicform',
+            subType: 'support_v2',
+            action: 'get',
+            component: 'app'
+        };
+        return (await this.formService.getForm(req).toPromise() as any).form.data.fields;
+    }
+
+    async getStateContactList() {
+        const req: FormRequest = {
+            type: 'form',
+            subType: 'boardContactInfo',
+            action: 'get',
+            component: 'app'
+        };
+        return (await this.formService.getForm(req).toPromise() as any).form.data.fields;
+    }
+
+    async getContentRequestFormConfig() {
+        const req: FormRequest = {
+            type: 'dynamicForm',
+            subType: 'contentRequest',
+            action: 'submit',
+            component: 'app'
+        };
+        return (await this.formService.getForm(req).toPromise() as any).form.data.fields;
+    }
+
+    async getConsentFormConfig() {
+        const req: FormRequest = {
+            type: 'dynamicForm',
+            subType: 'consentDeclaration_v2',
+            action: 'submit',
+            component: 'app'
+        };
+        return (await this.formService.getForm(req).toPromise() as any).form.data.fields;
+    }
+
+    async getNotificationFormConfig() {
+        const req: FormRequest = {
+            type: 'config',
+            subType: 'notification',
+            action: 'get',
+            component: 'app'
+        };
+        return (await this.formService.getForm(req).toPromise() as any).form.data.fields;
+    }
+
+    async getBoardAliasName() {
+        const formRequest: FormRequest = {
+            type: 'config',
+            subType: 'boardAlias',
+            action: 'get',
+            component: 'app'
+        };
+        return (await this.formService.getForm(formRequest).toPromise() as any).form.data.fields;
+    }
+
+    async getFormFields(formRequest: FormRequest, rootOrgId?: string) {
+        formRequest.rootOrgId = rootOrgId || '*' ;
+        const formData  = await this.formService.getForm(formRequest).toPromise() as any;
+        return  (formData && formData.form && formData.form.data && formData.form.data.fields) || [];
+    }
+
+    async getSegmentationCommands() {
+
+        const formRequest: FormRequest = {
+            type: 'config',
+            subType: 'segmentation',
+            action: 'get',
+            component: 'app'
+        };
+        return (await this.formService.getForm(formRequest).toPromise() as any).form.data.fields;
+    }
+
+    public getOrganizationList(channelFacetFilter): Observable<{ orgName: string; rootOrgId: string; }[]> {
+        const channelList = channelFacetFilter.values
+            .reduce((acc, facet) => {
+                acc.push(facet.name);
+                return acc;
+            }, []);
+        const searchOrganizationReq: OrganizationSearchCriteria<{ orgName: string; rootOrgId: string; }> = {
+            filters: {
+                isRootOrg: true
+            },
+            fields: ['orgName', 'rootOrgId']
+        };
+        searchOrganizationReq.filters['rootOrgId'] = channelList;
+        return this.frameworkService.searchOrganization(searchOrganizationReq).pipe(
+            map((res) => res.content)
+        );
+    }
+
+    async changeChannelIdToName(filterCriteria) {
+        const channelFacet = filterCriteria.facetFilters.find((facetFilter) => facetFilter.name === 'channel');
+
+        if (!channelFacet) {
+            return filterCriteria;
+        }
+
+        let organizationList;
+        try {
+            organizationList = await this.getOrganizationList(channelFacet).toPromise();
+        } catch (e) {
+            console.error(e);
+            return filterCriteria;
+        }
+
+        filterCriteria.facetFilters = filterCriteria.facetFilters.map(filter => {
+            if (filter.name === 'channel') {
+                const filterValues = []
+                for (let i = 0; i < filter.values.length; i++) {
+                    const channelData = organizationList.find(channel => channel.rootOrgId === filter.values[i].name);
+                    if (channelData) {
+                        filterValues.push({
+                            ...filter.values[i],
+                            name: channelData && channelData.orgName ? channelData.orgName : filter.values[i].name,
+                            rootOrgId: channelData && channelData.rootOrgId ? channelData.rootOrgId : filter.values[i].name
+                        })
+                    }
+                }
+                filter.values = filterValues;
+            }
+            return filter;
+        });
+
+        return filterCriteria;
+    }
+
+    changeChannelNameToId(filterCriteria) {
+        filterCriteria.facetFilters = filterCriteria.facetFilters.map(filter => {
+            if (filter.name === 'channel') {
+                filter.values = filter.values.map(val => {
+                    val.name = val.rootOrgId || val.name;
+                    return val;
+                });
+            }
+            return filter;
+        });
+
+        return filterCriteria;
+    }
+
 }
diff --git a/src/services/group/group-handler.service.spec.ts b/src/services/group/group-handler.service.spec.ts
new file mode 100644
index 000000000..a0020d188
--- /dev/null
+++ b/src/services/group/group-handler.service.spec.ts
@@ -0,0 +1,289 @@
+import { GroupHandlerService } from './group-handler.service';
+import { CommonUtilService, TelemetryGeneratorService } from '..';
+import { Location } from '@angular/common';
+import {
+    GroupService
+} from 'sunbird-sdk';
+import { of, throwError } from 'rxjs';
+import { InteractType, InteractSubtype, Environment, ID } from '../telemetry-constants';
+
+describe('GroupHandlerService', () => {
+    let groupHandlerService: GroupHandlerService;
+    const mockGroupService: GroupService = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockLocation: Partial<Location> = {};
+
+    beforeAll(() => {
+        groupHandlerService = new GroupHandlerService(
+            mockGroupService as GroupService,
+            mockCommonUtilService as CommonUtilService,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockLocation as Location
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('Should create instatance', () => {
+        expect(groupHandlerService).toBeTruthy();
+    });
+
+    describe('addActivityToGroup', () => {
+        it('Should not add activity to group if user is offline', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: false
+            };
+            mockCommonUtilService.presentToastForOffline = jest.fn(() => Promise.resolve());
+            // act
+            groupHandlerService.addActivityToGroup('group_id', 'activity_id', 'activity_type', '', []);
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.presentToastForOffline).toHaveBeenCalledWith('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+                done();
+            }, 0);
+        });
+
+        it('Should add activity to group if user is online', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockGroupService.addActivities = jest.fn(() => of({}));
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            groupHandlerService.addActivityToGroup('group_id', 'activity_id', 'activity_type', 'some_page_id', []);
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.SELECT_ACTIVITY,
+                    InteractSubtype.ADD_TO_GROUP_CLICKED,
+                    Environment.GROUP,
+                    'some_page_id',
+                    undefined, undefined, undefined, [], ID.SELECT_ACTIVITY);
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.INITIATED,
+                    '',
+                    Environment.GROUP,
+                    'some_page_id',
+                    undefined,
+                    undefined,
+                    undefined,
+                    [],
+                    ID.ADD_ACTIVITY_TO_GROUP);
+                expect(mockGroupService.addActivities).toHaveBeenCalledWith({
+                    groupId: 'group_id',
+                    addActivitiesRequest: {
+                        activities: [
+                            {
+                                id: 'activity_id',
+                                type: 'activity_type'
+                            }
+                        ]
+                    }
+                });
+                expect(mockCommonUtilService.showToast).toHaveBeenLastCalledWith('ADD_ACTIVITY_SUCCESS_MSG');
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(3,
+                    InteractType.SUCCESS,
+                    '',
+                    Environment.GROUP,
+                    'some_page_id',
+                    undefined,
+                    undefined,
+                    undefined,
+                    [],
+                    ID.ADD_ACTIVITY_TO_GROUP);
+                done();
+            }, 0);
+        });
+
+        it('Should return error', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockGroupService.addActivities = jest.fn(() => of({
+                error: {
+                    activities: [{
+                        errorCode: 'EXCEEDED_ACTIVITY_MAX_LIMIT'
+                    }]
+                }
+            }));
+            mockCommonUtilService.showToast = jest.fn();
+            mockLocation.back = jest.fn();
+            // act
+            groupHandlerService.addActivityToGroup('group_id', 'activity_id', 'activity_type', 'some_page_id', []);
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.SELECT_ACTIVITY,
+                    InteractSubtype.ADD_TO_GROUP_CLICKED,
+                    Environment.GROUP,
+                    'some_page_id',
+                    undefined, undefined, undefined, [], ID.SELECT_ACTIVITY);
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.INITIATED,
+                    '',
+                    Environment.GROUP,
+                    'some_page_id',
+                    undefined,
+                    undefined,
+                    undefined,
+                    [],
+                    ID.ADD_ACTIVITY_TO_GROUP);
+                expect(mockGroupService.addActivities).toHaveBeenCalledWith({
+                    groupId: 'group_id',
+                    addActivitiesRequest: {
+                        activities: [
+                            {
+                                id: 'activity_id',
+                                type: 'activity_type'
+                            }
+                        ]
+                    }
+                });
+                expect(mockCommonUtilService.showToast).toHaveBeenLastCalledWith('ERROR_MAXIMUM_ACTIVITY_COUNT_EXCEEDS');
+                expect(mockLocation.back).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('Should return error', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockGroupService.addActivities = jest.fn(() => of({
+                error: {
+                    activities: [{
+                        errorCode: 'Err'
+                    }]
+                }
+            }));
+            mockCommonUtilService.showToast = jest.fn();
+            mockLocation.back = jest.fn();
+            // act
+            groupHandlerService.addActivityToGroup('group_id', 'activity_id', 'activity_type', 'some_page_id', []);
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.SELECT_ACTIVITY,
+                    InteractSubtype.ADD_TO_GROUP_CLICKED,
+                    Environment.GROUP,
+                    'some_page_id',
+                    undefined, undefined, undefined, [], ID.SELECT_ACTIVITY);
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.INITIATED,
+                    '',
+                    Environment.GROUP,
+                    'some_page_id',
+                    undefined,
+                    undefined,
+                    undefined,
+                    [],
+                    ID.ADD_ACTIVITY_TO_GROUP);
+                expect(mockGroupService.addActivities).toHaveBeenCalledWith({
+                    groupId: 'group_id',
+                    addActivitiesRequest: {
+                        activities: [
+                            {
+                                id: 'activity_id',
+                                type: 'activity_type'
+                            }
+                        ]
+                    }
+                });
+                expect(mockCommonUtilService.showToast).toHaveBeenLastCalledWith('ADD_ACTIVITY_ERROR_MSG');
+                expect(mockLocation.back).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('Should navigate to previous page for catch', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockGroupService.addActivities = jest.fn(() => throwError({
+                error: 'some_error'
+            }));
+            mockCommonUtilService.showToast = jest.fn();
+            mockLocation.back = jest.fn();
+            // act
+            groupHandlerService.addActivityToGroup('group_id', 'activity_id', 'activity_type', 'some_page_id', []);
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.SELECT_ACTIVITY,
+                    InteractSubtype.ADD_TO_GROUP_CLICKED,
+                    Environment.GROUP,
+                    'some_page_id',
+                    undefined, undefined, undefined, [], ID.SELECT_ACTIVITY);
+                expect(presentFn).toHaveBeenCalled();
+                expect(dismissFn).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.INITIATED,
+                    '',
+                    Environment.GROUP,
+                    'some_page_id',
+                    undefined,
+                    undefined,
+                    undefined,
+                    [],
+                    ID.ADD_ACTIVITY_TO_GROUP);
+                expect(mockGroupService.addActivities).toHaveBeenCalledWith({
+                    groupId: 'group_id',
+                    addActivitiesRequest: {
+                        activities: [
+                            {
+                                id: 'activity_id',
+                                type: 'activity_type'
+                            }
+                        ]
+                    }
+                });
+                expect(mockCommonUtilService.showToast).toHaveBeenLastCalledWith('ADD_ACTIVITY_ERROR_MSG');
+                expect(mockLocation.back).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+    });
+});
diff --git a/src/services/group/group-handler.service.ts b/src/services/group/group-handler.service.ts
new file mode 100644
index 000000000..0ae1f1170
--- /dev/null
+++ b/src/services/group/group-handler.service.ts
@@ -0,0 +1,104 @@
+import { Inject, Injectable } from '@angular/core';
+import { Location } from '@angular/common';
+import {
+  AddActivitiesRequest, GroupService
+} from 'sunbird-sdk';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import { CommonUtilService } from '@app/services/common-util.service';
+import {
+  Environment, InteractSubtype, InteractType, ID
+} from '../telemetry-constants';
+import { GroupErrorCodes } from '@app/app/app.constant';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class GroupHandlerService {
+  constructor(
+    @Inject('GROUP_SERVICE') private groupService: GroupService,
+    private commonUtilService: CommonUtilService,
+    private telemetryGeneratorService: TelemetryGeneratorService,
+    private location: Location,
+  ) {
+  }
+
+  public async addActivityToGroup(
+    groupId: string,
+    activityId: string,
+    activityType,
+    pageId,
+    corRelationList,
+    noOfPagesToRevertOnSuccess?: number
+  ) {
+    if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
+      this.commonUtilService.presentToastForOffline('YOU_ARE_NOT_CONNECTED_TO_THE_INTERNET');
+      return;
+    }
+
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.SELECT_ACTIVITY,
+      InteractSubtype.ADD_TO_GROUP_CLICKED,
+      Environment.GROUP,
+      pageId,
+      undefined, undefined, undefined, corRelationList, ID.SELECT_ACTIVITY);
+
+    const loader = await this.commonUtilService.getLoader();
+    await loader.present();
+    this.telemetryGeneratorService.generateInteractTelemetry(
+      InteractType.INITIATED,
+      '',
+      Environment.GROUP,
+      pageId,
+      undefined,
+      undefined,
+      undefined,
+      corRelationList,
+      ID.ADD_ACTIVITY_TO_GROUP);
+    const addActivitiesRequest: AddActivitiesRequest = {
+      groupId,
+      addActivitiesRequest: {
+        activities: [
+          {
+            id: activityId,
+            type: activityType
+          }
+        ]
+      }
+    };
+
+    try {
+      const addActivityResponse = await this.groupService.addActivities(addActivitiesRequest).toPromise();
+
+      await loader.dismiss();
+      if (addActivityResponse.error
+        && addActivityResponse.error.activities
+        && addActivityResponse.error.activities.length) {
+        if (addActivityResponse.error.activities[0].errorCode === GroupErrorCodes.EXCEEDED_ACTIVITY_MAX_LIMIT) {
+          this.commonUtilService.showToast('ERROR_MAXIMUM_ACTIVITY_COUNT_EXCEEDS');
+        } else {
+          this.commonUtilService.showToast('ADD_ACTIVITY_ERROR_MSG');
+        }
+        this.location.back();
+      } else {
+        this.commonUtilService.showToast('ADD_ACTIVITY_SUCCESS_MSG');
+        this.telemetryGeneratorService.generateInteractTelemetry(
+          InteractType.SUCCESS,
+          '',
+          Environment.GROUP,
+          pageId,
+          undefined,
+          undefined,
+          undefined,
+          corRelationList,
+          ID.ADD_ACTIVITY_TO_GROUP
+        );
+        window.history.go(noOfPagesToRevertOnSuccess || -2);
+      }
+    } catch (e) {
+      console.error(e);
+      await loader.dismiss();
+      this.commonUtilService.showToast('ADD_ACTIVITY_ERROR_MSG');
+      this.location.back();
+    }
+  }
+}
diff --git a/src/services/handlers/logout-handler.service.spec.ts b/src/services/handlers/logout-handler.service.spec.ts
index 85fdfe766..c9c2273d9 100644
--- a/src/services/handlers/logout-handler.service.spec.ts
+++ b/src/services/handlers/logout-handler.service.spec.ts
@@ -2,18 +2,20 @@ import { LogoutHandlerService } from './logout-handler.service';
 import {
     AuthService, ProfileService, SharedPreferences, ProfileType, InteractType
 } from 'sunbird-sdk';
-import { Events } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { ContainerService } from '../container.services';
 import { Router } from '@angular/router';
 import { CommonUtilService, AppGlobalService, TelemetryGeneratorService } from '../../services';
 import { of, from } from 'rxjs';
 import { InteractSubtype, Environment, PageId } from '../telemetry-constants';
 import { PreferenceKey, RouterLinks } from '../../app/app.constant';
+import { SegmentationTagService } from '../segmentation-tag/segmentation-tag.service';
 
 describe('LogoutHandlerService', () => {
     let logoutHandlerService: LogoutHandlerService;
     const mockProfileService: Partial<ProfileService> = {
-        setActiveSessionForProfile: jest.fn(() => of(true))
+        setActiveSessionForProfile: jest.fn(() => of(true)),
+        getAllProfiles: jest.fn(() => of([]))
     };
     const mockAuthService: Partial<AuthService> = {
         resignSession: jest.fn(() => from(new Promise<void>((resolve) => {
@@ -21,15 +23,6 @@ describe('LogoutHandlerService', () => {
         })))
     };
     const mockSharedPreferences: Partial<SharedPreferences> = {
-        // getString: jest.fn((arg) => {
-        //     let value;
-        //     switch (arg) {
-        //         case PreferenceKey.GUEST_USER_ID_BEFORE_LOGIN:
-        //             value = '0123456789';
-        //             break;
-        //     }
-        //     return of(value);
-        // })
         getString: jest.fn(),
         putString: jest.fn(() => of(undefined))
     };
@@ -54,6 +47,10 @@ describe('LogoutHandlerService', () => {
     const mockRoute: Partial<Router> = {
         navigate: jest.fn()
     };
+    const mockSegmentationTagService: Partial<SegmentationTagService> = {
+        persistSegmentation: jest.fn(),
+        getPersistedSegmentaion: jest.fn()
+    };
 
     beforeAll(() => {
         logoutHandlerService = new LogoutHandlerService(
@@ -65,7 +62,8 @@ describe('LogoutHandlerService', () => {
             mockAppGlobalService as AppGlobalService,
             mockContainerService as ContainerService,
             mockTelemetryGeneratorService as TelemetryGeneratorService,
-            mockRoute as Router
+            mockRoute as Router,
+            mockSegmentationTagService as SegmentationTagService
         );
     });
 
@@ -116,7 +114,7 @@ describe('LogoutHandlerService', () => {
             // act
             logoutHandlerService.onLogout();
             // assert
-            expect(splashscreen.clearPrefs).toHaveBeenCalled();
+           // expect(splashscreen.clearPrefs).toHaveBeenCalled();
         });
 
         it('should resign previuos session', () => {
@@ -141,6 +139,7 @@ describe('LogoutHandlerService', () => {
             if (mockCommonUtilService.networkInfo.isNetworkAvailable) {
                 mockCommonUtilService.isAccessibleForNonStudentRole = jest.fn(() => true);
             }
+            mockProfileService.getAllProfiles = jest.fn(() => of([]));
             // act
             logoutHandlerService.onLogout();
             // assert
@@ -215,5 +214,41 @@ describe('LogoutHandlerService', () => {
                 done();
             }, 0);
         });
+
+        it('should navigate to profile-settings page  for profile types other than student and teacher', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = {
+                isNetworkAvailable: true
+            };
+            mockCommonUtilService.isAccessibleForNonStudentRole = jest.fn(() => false);
+            jest.spyOn(mockSharedPreferences, 'getString').mockImplementation((arg) => {
+                let value;
+                switch (arg) {
+                    case PreferenceKey.SELECTED_USER_TYPE:
+                        value = 'other';
+                        break;
+                    case PreferenceKey.IS_ONBOARDING_COMPLETED:
+                        value = 'false';
+                        break;
+                    case PreferenceKey.GUEST_USER_ID_BEFORE_LOGIN:
+                        value = undefined;
+                        break;
+                }
+                return of(value);
+            });
+            // act
+            logoutHandlerService.onLogout();
+            // assert
+            setTimeout(() => {
+                expect(mockRoute.navigate).toHaveBeenCalledWith([`/${RouterLinks.PROFILE_SETTINGS}`], { queryParams: { reOnboard: true } });
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.OTHER,
+                    InteractSubtype.LOGOUT_SUCCESS,
+                    Environment.HOME,
+                    PageId.LOGOUT,
+                    undefined,
+                    { UID: '' });
+                done();
+            }, 0);
+        });
     });
 });
diff --git a/src/services/handlers/logout-handler.service.ts b/src/services/handlers/logout-handler.service.ts
index 24087bfcc..23f2868c8 100644
--- a/src/services/handlers/logout-handler.service.ts
+++ b/src/services/handlers/logout-handler.service.ts
@@ -1,20 +1,21 @@
 import { Inject, Injectable } from '@angular/core';
-import { Events } from '@ionic/angular';
-import { Router, NavigationExtras } from '@angular/router';
+import { NavigationExtras, Router } from '@angular/router';
+import { GUEST_STUDENT_TABS, GUEST_TEACHER_TABS, initTabs } from '@app/app/module.service';
+import { AppGlobalService } from '@app/services/app-global-service.service';
+import { CommonUtilService } from '@app/services/common-util.service';
+import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
+import { Events } from '@app/util/events';
+import { mergeMap, tap } from 'rxjs/operators';
 import {
   AuthService, ProfileService, ProfileType, SharedPreferences
 } from 'sunbird-sdk';
 import { PreferenceKey, RouterLinks } from '../../app/app.constant';
-import { AppGlobalService } from '@app/services/app-global-service.service';
-import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
-import { CommonUtilService } from '@app/services/common-util.service';
+import { ContainerService } from '../container.services';
+import { SegmentationTagService } from '../segmentation-tag/segmentation-tag.service';
 import {
   Environment, InteractSubtype, InteractType, PageId
 } from '../telemetry-constants';
-import { ContainerService } from '../container.services';
-import { GUEST_STUDENT_TABS, GUEST_TEACHER_TABS, initTabs } from '@app/app/module.service';
-import { Observable } from 'rxjs';
-import { mergeMap, tap } from 'rxjs/operators';
+
 @Injectable({
   providedIn: 'root'
 })
@@ -28,7 +29,8 @@ export class LogoutHandlerService {
     private appGlobalService: AppGlobalService,
     private containerService: ContainerService,
     private telemetryGeneratorService: TelemetryGeneratorService,
-    private router: Router
+    private router: Router,
+    private segmentationTagService: SegmentationTagService
   ) {
   }
 
@@ -37,6 +39,8 @@ export class LogoutHandlerService {
       return this.commonUtilService.showToast('NEED_INTERNET_TO_CHANGE');
     }
 
+    this.segmentationTagService.persistSegmentation();
+
     this.generateLogoutInteractTelemetry(InteractType.TOUCH,
       InteractSubtype.LOGOUT_INITIATE, '');
 
@@ -44,6 +48,11 @@ export class LogoutHandlerService {
       tap(async (guestUserId: string) => {
         if (!guestUserId) {
           await this.preferences.putString(PreferenceKey.SELECTED_USER_TYPE, ProfileType.TEACHER).toPromise();
+        } else {
+          const allProfileDetais = await this.profileService.getAllProfiles().toPromise();
+          const currentProfile = allProfileDetais.find(ele => ele.uid === guestUserId);
+          const guestProfileType = (currentProfile && currentProfile.profileType) ? currentProfile.profileType : ProfileType.NONE;
+          await this.preferences.putString(PreferenceKey.SELECTED_USER_TYPE, guestProfileType).toPromise();
         }
 
         splashscreen.clearPrefs();
@@ -58,6 +67,7 @@ export class LogoutHandlerService {
         await this.navigateToAptPage();
         this.events.publish(AppGlobalService.USER_INFO_UPDATED);
         this.appGlobalService.setEnrolledCourseList([]);
+        this.segmentationTagService.getPersistedSegmentaion();
       })
     ).subscribe();
   }
@@ -77,7 +87,9 @@ export class LogoutHandlerService {
 
     const isOnboardingCompleted = (await this.preferences.getString(PreferenceKey.IS_ONBOARDING_COMPLETED).toPromise() === 'true') ?
       true : false;
-    if (isOnboardingCompleted) {
+    if (selectedUserType === ProfileType.ADMIN) {
+      this.router.navigate([RouterLinks.USER_TYPE_SELECTION_LOGGEDIN]);
+    } else if (isOnboardingCompleted) {
       const navigationExtras: NavigationExtras = { state: { loginMode: 'guest' } };
       this.router.navigate([`/${RouterLinks.TABS}`], navigationExtras);
     } else {
diff --git a/src/services/handlers/tnc-update-handler.service.spec.ts b/src/services/handlers/tnc-update-handler.service.spec.ts
index 9a0069a68..f1fd7ca55 100644
--- a/src/services/handlers/tnc-update-handler.service.spec.ts
+++ b/src/services/handlers/tnc-update-handler.service.spec.ts
@@ -5,12 +5,16 @@ import {
 } from 'sunbird-sdk';
 import { CommonUtilService } from '../common-util.service';
 import { FormAndFrameworkUtilService } from '../formandframeworkutil.service';
-import { ModalController } from '@ionic/angular';
+import { ModalController, PopoverController } from '@ionic/angular';
 import { Router } from '@angular/router';
 import { ExternalIdVerificationService } from '../externalid-verification.service';
 import { AppGlobalService } from '../app-global-service.service';
-import { of } from 'rxjs';
+import { of, throwError } from 'rxjs';
 import { ProfileConstants } from '../../app/app.constant';
+import { ConsentStatus } from '@project-sunbird/client-services/models';
+import { ConsentService } from '../consent-service';
+import { SharedPreferences } from '@project-sunbird/sunbird-sdk';
+import { SbProgressLoader } from '../sb-progress-loader.service';
 
 describe('TncUpdateHandlerService', () => {
   let tncUpdateHandlerService: TncUpdateHandlerService;
@@ -34,6 +38,12 @@ describe('TncUpdateHandlerService', () => {
     closeSigninOnboardingLoader: jest.fn()
   };
 
+  const mockConsentService: Partial<ConsentService> = {};
+  const mockSharedPreferences: Partial<SharedPreferences> = {};
+  const mockSbProgressLoader: Partial<SbProgressLoader> = {
+    hide: jest.fn()
+};
+
   beforeAll(() => {
     tncUpdateHandlerService = new TncUpdateHandlerService(
       mockProfileService as ProfileService,
@@ -43,7 +53,8 @@ describe('TncUpdateHandlerService', () => {
       mockModalCtrl as ModalController,
       mockRouter as Router,
       mockExternalIdVerificationService as ExternalIdVerificationService,
-      mockAppGlobalService as AppGlobalService
+      mockAppGlobalService as AppGlobalService,
+      mockConsentService as ConsentService
     );
   });
 
@@ -98,7 +109,8 @@ describe('TncUpdateHandlerService', () => {
         promptTnC: false,
         tncLatestVersionUrl: 'sample_tncLatestVersionUrl',
         id: 'sample_id',
-        avatar: 'sample_avatar'
+        avatar: 'sample_avatar',
+        declarations: [{name: 'sample-name'}]
       };
       const ProfileData: Profile = {
         uid: 'sample_uid',
@@ -163,7 +175,8 @@ describe('TncUpdateHandlerService', () => {
         promptTnC: false,
         tncLatestVersionUrl: 'sample_tncLatestVersionUrl',
         id: 'sample_id',
-        avatar: 'sample_avatar'
+        avatar: 'sample_avatar',
+        declarations: [{name: 'sample-name'}]
       };
       const ProfileData: Profile = {
         uid: 'sample_uid',
@@ -250,16 +263,195 @@ describe('TncUpdateHandlerService', () => {
       mockAppGlobalService.getCurrentUser = jest.fn(() => profileData);
       mockProfileService.getActiveSessionProfile = jest.fn(() => of(profileData));
       mockFormAndFrameworkUtilService.updateLoggedInUser = jest.fn(() => Promise.resolve({ value: { profile: {} } }));
+      jest.spyOn(tncUpdateHandlerService, 'isSSOUser').mockImplementation(() => {
+        return Promise.resolve(false);
+      });
+      const dismissFn = jest.fn(() => Promise.resolve());
+      const presentFn = jest.fn(() => Promise.resolve());
+      mockCommonUtilService.getLoader = jest.fn(() => ({
+        present: presentFn,
+        dismiss: dismissFn,
+      }));
+      mockConsentService.getConsent = jest.fn(() => Promise.resolve());
+      mockProfileService.getConsent = jest.fn(() => of({ status: ConsentStatus.ACTIVE }));
       // act
       tncUpdateHandlerService.checkForTncUpdate();
       // assert
       setTimeout(() => {
         expect(mockAuthService.getSession).toHaveBeenCalled();
         expect(mockProfileService.getServerProfilesDetails).toHaveBeenCalledWith(profileReq);
-        expect(mockProfileService.getActiveProfileSession).toHaveBeenCalled();
         expect(mockFormAndFrameworkUtilService.updateLoggedInUser).toHaveBeenCalled();
+        expect(presentFn).toHaveBeenCalled();
+        expect(dismissFn).toHaveBeenCalled();
+        expect(mockConsentService.getConsent).toHaveBeenCalled();
       }, 0);
+    });
+
+    it('should navigate to BMC page if BMC details are not filled and open global consent popup', () => {
+      // arrange
+      const sessionData: OAuthSession = {
+        access_token: 'sample_access_token',
+        refresh_token: 'sample_refresh_token',
+        userToken: 'sample_userToken'
+      };
+
+      const profileReq: ServerProfileDetailsRequest = {
+        userId: 'sample_userId',
+        requiredFields: ProfileConstants.REQUIRED_FIELDS,
+        from: CachedItemRequestSourceFrom.SERVER
+      };
+
+      const rootOrgData: RootOrg = {
+        rootOrgId: 'sample_rootOrgId',
+        orgName: 'sample_orgName',
+        slug: 'sample_slug',
+        hashTagId: 'sample_hashTagId'
+      };
+
+      const serverProfileData: ServerProfile = {
+        userId: 'sample_userId',
+        identifier: 'sample_identifier',
+        firstName: 'sample_firstName',
+        lastName: 'sample_lastName',
+        rootOrg: rootOrgData,
+        tncAcceptedVersion: 'sample_tncAcceptedVersion',
+        tncAcceptedOn: 'sample_tncAcceptedOn',
+        tncLatestVersion: 'sample_tncLatestVersion',
+        promptTnC: false,
+        tncLatestVersionUrl: 'sample_tncLatestVersionUrl',
+        id: 'sample_id',
+        avatar: 'sample_avatar'
+      };
+      const profileData: Profile = {
+        uid: 'sample_uid',
+        handle: 'sample_handle',
+        createdAt: 0,
+        medium: [],
+        board: ['sample_board'],
+        subject: ['sample_subject1', 'sample_subject2'],
+        profileType: ProfileType.STUDENT,
+        grade: [],
+        syllabus: [],
+        source: ProfileSource.LOCAL,
+        serverProfile: serverProfileData
+      };
 
+      mockAuthService.getSession = jest.fn(() => of(sessionData));
+      mockProfileService.getServerProfilesDetails = jest.fn(() => of(serverProfileData));
+      mockAppGlobalService.getCurrentUser = jest.fn(() => profileData);
+      mockProfileService.getActiveSessionProfile = jest.fn(() => of(profileData));
+      mockFormAndFrameworkUtilService.updateLoggedInUser = jest.fn(() => Promise.resolve({ value: { profile: {} } }));
+      jest.spyOn(tncUpdateHandlerService, 'isSSOUser').mockImplementation(() => {
+        return Promise.resolve(true);
+      });
+      const dismissFn = jest.fn(() => Promise.resolve());
+      const presentFn = jest.fn(() => Promise.resolve());
+      mockCommonUtilService.getLoader = jest.fn(() => ({
+        present: presentFn,
+        dismiss: dismissFn,
+      }));
+      mockConsentService.getConsent = jest.fn(() => Promise.resolve());
+
+      mockProfileService.getConsent = jest.fn(() => throwError({
+        response: {
+          responseCode: 404
+        }
+      }));
+      mockProfileService.updateConsent = jest.fn(() => of({}));
+      // act
+      tncUpdateHandlerService.checkForTncUpdate();
+      // assert
+      setTimeout(() => {
+        expect(mockAuthService.getSession).toHaveBeenCalled();
+        expect(mockProfileService.getServerProfilesDetails).toHaveBeenCalledWith(profileReq);
+        expect(mockFormAndFrameworkUtilService.updateLoggedInUser).toHaveBeenCalled();
+        expect(presentFn).toHaveBeenCalled();
+        expect(dismissFn).toHaveBeenCalled();
+        expect(mockConsentService.getConsent).toHaveBeenCalled();
+      }, 0);
+    });
+
+    it('should navigate to BMC page if BMC details are not filled and open global consent popup for network error', () => {
+      // arrange
+      const sessionData: OAuthSession = {
+        access_token: 'sample_access_token',
+        refresh_token: 'sample_refresh_token',
+        userToken: 'sample_userToken'
+      };
+
+      const profileReq: ServerProfileDetailsRequest = {
+        userId: 'sample_userId',
+        requiredFields: ProfileConstants.REQUIRED_FIELDS,
+        from: CachedItemRequestSourceFrom.SERVER
+      };
+
+      const rootOrgData: RootOrg = {
+        rootOrgId: 'sample_rootOrgId',
+        orgName: 'sample_orgName',
+        slug: 'sample_slug',
+        hashTagId: 'sample_hashTagId'
+      };
+
+      const serverProfileData: ServerProfile = {
+        userId: 'sample_userId',
+        identifier: 'sample_identifier',
+        firstName: 'sample_firstName',
+        lastName: 'sample_lastName',
+        rootOrg: rootOrgData,
+        tncAcceptedVersion: 'sample_tncAcceptedVersion',
+        tncAcceptedOn: 'sample_tncAcceptedOn',
+        tncLatestVersion: 'sample_tncLatestVersion',
+        promptTnC: false,
+        tncLatestVersionUrl: 'sample_tncLatestVersionUrl',
+        id: 'sample_id',
+        avatar: 'sample_avatar'
+      };
+      const profileData: Profile = {
+        uid: 'sample_uid',
+        handle: 'sample_handle',
+        createdAt: 0,
+        medium: [],
+        board: ['sample_board'],
+        subject: ['sample_subject1', 'sample_subject2'],
+        profileType: ProfileType.STUDENT,
+        grade: [],
+        syllabus: [],
+        source: ProfileSource.LOCAL,
+        serverProfile: serverProfileData
+      };
+
+      mockAuthService.getSession = jest.fn(() => of(sessionData));
+      mockProfileService.getServerProfilesDetails = jest.fn(() => of(serverProfileData));
+      mockAppGlobalService.getCurrentUser = jest.fn(() => profileData);
+      mockProfileService.getActiveSessionProfile = jest.fn(() => of(profileData));
+      mockFormAndFrameworkUtilService.updateLoggedInUser = jest.fn(() => Promise.resolve({ value: { profile: {} } }));
+      jest.spyOn(tncUpdateHandlerService, 'isSSOUser').mockImplementation(() => {
+        return Promise.resolve(true);
+      });
+      const dismissFn = jest.fn(() => Promise.resolve());
+      const presentFn = jest.fn(() => Promise.resolve());
+      mockCommonUtilService.getLoader = jest.fn(() => ({
+        present: presentFn,
+        dismiss: dismissFn,
+      }));
+      mockConsentService.getConsent = jest.fn(() => Promise.resolve());
+
+      mockProfileService.getConsent = jest.fn(() => throwError({
+        response: {
+          responseCode: 404
+        }
+      }));
+      mockProfileService.updateConsent = jest.fn(() => throwError({code: 'NETWORK_ERROR'}));
+      mockCommonUtilService.showToast = jest.fn();
+      // act
+      tncUpdateHandlerService.checkForTncUpdate();
+      // assert
+      setTimeout(() => {
+        expect(mockAuthService.getSession).toHaveBeenCalled();
+        expect(mockProfileService.getServerProfilesDetails).toHaveBeenCalledWith(profileReq);
+        expect(mockFormAndFrameworkUtilService.updateLoggedInUser).toHaveBeenCalled();
+        expect(mockConsentService.getConsent).toHaveBeenCalled();
+      }, 0);
     });
 
     it('should display terms&conditions page if an update is available', () => {
diff --git a/src/services/handlers/tnc-update-handler.service.ts b/src/services/handlers/tnc-update-handler.service.ts
index 5e62f6ef8..8a2d71c7f 100644
--- a/src/services/handlers/tnc-update-handler.service.ts
+++ b/src/services/handlers/tnc-update-handler.service.ts
@@ -1,16 +1,20 @@
 import { Inject, Injectable } from '@angular/core';
+import { NavigationExtras, Router } from '@angular/router';
+import { ProfileConstants, RouterLinks } from '@app/app/app.constant';
+import { FieldConfig } from '@app/app/components/common-forms/field-config';
+import { FormConstants } from '@app/app/form.constants';
+import { TermsAndConditionsPage } from '@app/app/terms-and-conditions/terms-and-conditions.page';
 import { ModalController } from '@ionic/angular';
 import {
-  AuthService, ProfileService,
-  ServerProfile, ServerProfileDetailsRequest, CachedItemRequestSourceFrom, Profile, UserFeed
+  AuthService,
+  CachedItemRequestSourceFrom, Profile, ProfileService,
+  ProfileType, ServerProfile, ServerProfileDetailsRequest
 } from 'sunbird-sdk';
-import { ProfileConstants, RouterLinks } from '@app/app/app.constant';
-import { TermsAndConditionsPage } from '@app/app/terms-and-conditions/terms-and-conditions.page';
-import { Router, NavigationExtras } from '@angular/router';
+import { AppGlobalService } from '../app-global-service.service';
 import { CommonUtilService } from '../common-util.service';
-import { FormAndFrameworkUtilService } from '../formandframeworkutil.service';
+import { ConsentService } from '../consent-service';
 import { ExternalIdVerificationService } from '../externalid-verification.service';
-import { AppGlobalService } from '../app-global-service.service';
+import { FormAndFrameworkUtilService } from '../formandframeworkutil.service';
 
 @Injectable({
   providedIn: 'root'
@@ -28,6 +32,7 @@ export class TncUpdateHandlerService {
     private router: Router,
     private externalIdVerificationService: ExternalIdVerificationService,
     private appGlobalService: AppGlobalService,
+    private consentService: ConsentService
   ) { }
 
   public async checkForTncUpdate() {
@@ -41,14 +46,13 @@ export class TncUpdateHandlerService {
       requiredFields: ProfileConstants.REQUIRED_FIELDS,
       from: CachedItemRequestSourceFrom.SERVER
     };
-
     this.profileService.getServerProfilesDetails(request).toPromise()
       .then((profile) => {
-        if (!this.hasProfileTncUpdated(profile)) {
+        if (this.hasProfileTncUpdated(profile)) {
+          this.presentTncPage({ profile });
+        } else {
           this.checkBmc(profile);
-          return;
         }
-        this.presentTncPage({ profile });
       }).catch(e => {
         this.appGlobalService.closeSigninOnboardingLoader();
       });
@@ -73,16 +77,22 @@ export class TncUpdateHandlerService {
   }
 
   private async checkBmc(profile) {
-    const userDetails = await this.appGlobalService.getCurrentUser();
-    if (userDetails && userDetails.grade && userDetails.medium && userDetails.syllabus &&
-      !userDetails.grade.length && !userDetails.medium.length && !userDetails.syllabus.length) {
-      this.preRequirementToBmcNavigation(profile.userId);
-    } else {
-      this.checkDistrictMapping(profile);
+    const locationMappingConfig: FieldConfig<any>[] = await this.formAndFrameworkUtilService.getFormFields(FormConstants.LOCATION_MAPPING);
+    const userDetails = await this.profileService.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS }).toPromise();
+    if (await this.isSSOUser(userDetails)) {
+      await this.consentService.getConsent(userDetails, true);
+    }
+    if ((userDetails && userDetails.grade && userDetails.medium && userDetails.syllabus &&
+        !userDetails.grade.length && !userDetails.medium.length && !userDetails.syllabus.length)
+        || (userDetails.profileType === ProfileType.NONE || userDetails.profileType === ProfileType.OTHER.toUpperCase()
+            || userDetails.serverProfile.profileUserType.type === ProfileType.OTHER.toUpperCase())) {
+        this.preRequirementToBmcNavigation(profile.userId, locationMappingConfig);
+      } else {
+        this.checkDistrictMapping(profile, locationMappingConfig, userDetails);
+      }
     }
-  }
 
-  private async preRequirementToBmcNavigation(userId) {
+  private async preRequirementToBmcNavigation(userId, locationMappingConfig) {
     const serverProfile = await this.profileService.getServerProfilesDetails({
       userId,
       requiredFields: ProfileConstants.REQUIRED_FIELDS,
@@ -93,20 +103,39 @@ export class TncUpdateHandlerService {
       requiredFields: ProfileConstants.REQUIRED_FIELDS
     }).toPromise();
 
-    this.navigateToBmc(serverProfile, userprofile);
+    this.navigateToBmc(serverProfile, userprofile, locationMappingConfig);
   }
 
-  private async navigateToBmc(serverProfile, userprofile) {
+  private async navigateToBmc(serverProfile, userprofile, locationMappingConfig) {
     this.formAndFrameworkUtilService.updateLoggedInUser(serverProfile, userprofile)
       .then((value) => {
-        this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.CATEGORIES_EDIT}`], {
-          state: {
-            hasFilledLocation: this.commonUtilService.isUserLocationAvalable(serverProfile),
-            showOnlyMandatoryFields: true,
-            profile: value['profile'],
-            isRootPage: true
-          }
-        });
+        const categoriesProfileData = {
+          hasFilledLocation: this.commonUtilService.isUserLocationAvalable(userprofile, locationMappingConfig),
+          showOnlyMandatoryFields: true,
+          profile: value['profile'],
+          isRootPage: true
+        };
+        if (userprofile && userprofile.grade && userprofile.medium && userprofile.syllabus &&
+          !userprofile.grade.length && !userprofile.medium.length && !userprofile.syllabus.length &&
+          (userprofile.profileType === ProfileType.NONE || userprofile.profileType === ProfileType.OTHER.toUpperCase()
+              || serverProfile.userType === ProfileType.OTHER.toUpperCase())) {
+          this.router.navigate([RouterLinks.USER_TYPE_SELECTION_LOGGEDIN], {
+            state: { categoriesProfileData }
+          });
+        } else if (userprofile.profileType === ProfileType.NONE ||
+            userprofile.profileType === ProfileType.OTHER.toUpperCase()
+            || serverProfile.userType === ProfileType.OTHER.toUpperCase()) {
+          categoriesProfileData['status'] = true;
+          categoriesProfileData['isUserLocationAvalable'] =
+          this.commonUtilService.isUserLocationAvalable(userprofile, locationMappingConfig);
+          this.router.navigate([RouterLinks.USER_TYPE_SELECTION_LOGGEDIN], {
+            state: { categoriesProfileData }
+          });
+        } else {
+          this.router.navigate([`/${RouterLinks.PROFILE}/${RouterLinks.CATEGORIES_EDIT}`], {
+            state: categoriesProfileData
+          });
+        }
       });
   }
 
@@ -120,14 +149,16 @@ export class TncUpdateHandlerService {
     }
   }
 
-  private checkDistrictMapping(profile) {
+  private checkDistrictMapping(profile, locationMappingConfig, userDetails) {
     this.formAndFrameworkUtilService.getCustodianOrgId()
-      .then((custodianOrgId: string) => {
+      .then(async (custodianOrgId: string) => {
         const isCustodianOrgId = profile.rootOrg.rootOrgId === custodianOrgId;
-        if (isCustodianOrgId
-          && !this.commonUtilService.isUserLocationAvalable(profile)) {
+        if (isCustodianOrgId && !this.commonUtilService.isUserLocationAvalable(userDetails, locationMappingConfig)) {
           this.navigateToDistrictMapping();
         } else {
+          if (!(await this.isSSOUser(userDetails))) {
+            this.appGlobalService.showYearOfBirthPopup(userDetails.serverProfile);
+          }
           this.externalIdVerificationService.showExternalIdVerificationPopup();
         }
       })
@@ -145,5 +176,4 @@ export class TncUpdateHandlerService {
     };
     this.router.navigate(['/', RouterLinks.DISTRICT_MAPPING], navigationExtras);
   }
-
 }
diff --git a/src/services/index.ts b/src/services/index.ts
index c4bb86e1a..85f32117f 100644
--- a/src/services/index.ts
+++ b/src/services/index.ts
@@ -21,3 +21,6 @@ export { ContentShareHandlerService } from './content/content-share-handler.serv
 export { CanvasPlayerService } from './canvas-player.service';
 export { SplashScreenService } from './splash-screen.service';
 export { LocalCourseService } from './local-course.service';
+export { GroupHandlerService } from './group/group-handler.service';
+export { CollectionService } from './collection.service';
+export {ContentAggregatorHandler} from './content/content-aggregator-handler.service';
diff --git a/src/services/local-course.service.spec.ts b/src/services/local-course.service.spec.ts
index ae90793f6..672bb4a4c 100644
--- a/src/services/local-course.service.spec.ts
+++ b/src/services/local-course.service.spec.ts
@@ -1,7 +1,15 @@
 import { LocalCourseService } from './local-course.service';
-import { ContentService, SharedPreferences, CourseService, AuthService, Batch, NetworkError, HttpClientError } from 'sunbird-sdk';
+import {
+  ContentService,
+  SharedPreferences,
+  CourseService,
+  Batch,
+  NetworkError,
+  HttpClientError,
+  HttpServerError
+} from 'sunbird-sdk';
 import { CommonUtilService } from './common-util.service';
-import { Events } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { AppGlobalService } from './app-global-service.service';
 import { TelemetryGeneratorService } from './telemetry-generator.service';
 import { NgZone } from '@angular/core';
@@ -9,14 +17,16 @@ import { AppVersion } from '@ionic-native/app-version/ngx';
 import { of, throwError } from 'rxjs';
 import { PreferenceKey } from '../app/app.constant';
 import { Router } from '@angular/router';
-import { Location } from '@angular/common';
-
+import { Location, DatePipe } from '@angular/common';
+import { SbProgressLoader } from '@app/services/sb-progress-loader.service';
+import { CategoryKeyTranslator } from '@app/pipes/category-key-translator/category-key-translator-pipe';
+import { UserConsent } from '@project-sunbird/client-services/models';
+import { ConsentService } from './consent-service';
 
 describe('LocalCourseService', () => {
   let localCourseService: LocalCourseService;
 
   const mockCourseService: Partial<CourseService> = {};
-  const mockAuthService: Partial<AuthService> = {};
   const mockPreferences: Partial<ContentService> = {};
   const mockAppGlobalService: Partial<AppGlobalService> = {};
   const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
@@ -30,11 +40,19 @@ describe('LocalCourseService', () => {
   const mockLocation: Partial<Location> = {
     back: jest.fn()
   };
+  const mockSbProgressLoader: Partial<SbProgressLoader> = {
+    hide: jest.fn()
+  };
+  const mockConsentService: Partial<ConsentService> = {};
+  const mockDatePipe: Partial<DatePipe> = {};
+
+  const mockCategoryKeyTranslator: Partial<CategoryKeyTranslator> = {
+    transform: jest.fn(() => 'sample-message')
+  };
 
   beforeAll(() => {
     localCourseService = new LocalCourseService(
       mockCourseService as CourseService,
-      mockAuthService as AuthService,
       mockPreferences as SharedPreferences,
       mockAppGlobalService as AppGlobalService,
       mockTelemetryGeneratorService as TelemetryGeneratorService,
@@ -43,26 +61,41 @@ describe('LocalCourseService', () => {
       mockNgZone as NgZone,
       mockAppVersion as AppVersion,
       mockRouter as Router,
-      mockLocation as Location
+      mockLocation as Location,
+      mockSbProgressLoader as SbProgressLoader,
+      new DatePipe('en'),
+      mockCategoryKeyTranslator as CategoryKeyTranslator,
+      mockConsentService as ConsentService
     );
   });
 
   beforeEach(() => {
     jest.clearAllMocks();
+    jest.resetAllMocks();
   });
 
   it('should create an instance of LocalCourseService', () => {
     expect(localCourseService).toBeTruthy();
   });
 
+  it('should return reqestMap Value', () => {
+    const course = {
+      courseId: 'courseId',
+      channel: 'sample-channelId',
+      userId: 'sample-userId'
+    };
+    const data = localCourseService.prepareRequestValue(course);
+    expect(data).toBeTruthy();
+  });
+
   describe('enrollIntoBatch', () => {
-    it('should Enrol into batch, and when the return is true', (done) => {
+    it('should Enrol into batch, and when the return is true', async (done) => {
       // arrange
       const enrollCourse = {
         userId: 'sample_userid',
         batch: {
           id: '',
-          courseId: '',
+          courseId: 'sample-do-ID',
           status: 0
         },
         courseId: 'sample_courseid',
@@ -70,13 +103,61 @@ describe('LocalCourseService', () => {
         telemetryObject: {},
         objRollup: {},
         corRelationList: [],
+        channel: 'sample-channel',
+        userConsent: 'Yes'
       };
+      mockSbProgressLoader.hide = jest.fn(() => Promise.resolve());
       mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
       mockCourseService.enrollCourse = jest.fn(() => of(true));
-
+      jest.spyOn(localCourseService, 'prepareRequestValue').mockImplementation();
+      const dismissFn = jest.fn(() => Promise.resolve());
+      const presentFn = jest.fn(() => Promise.resolve());
+      mockCommonUtilService.getLoader = jest.fn(() => ({
+        present: presentFn,
+        dismiss: dismissFn,
+      }));
+      mockConsentService.showConsentPopup = jest.fn(() => Promise.resolve());
       // act
       localCourseService.enrollIntoBatch(enrollCourse).subscribe(() => {
         expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+        expect(mockCourseService.enrollCourse).toHaveBeenCalled();
+        expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({ id: 'login' });
+        done();
+      });
+    });
+
+    it('should Enrol into batch, and when the return is true for updateConsent catchPart', async (done) => {
+      // arrange
+      const enrollCourse = {
+        userId: 'sample_userid',
+        batch: {
+          id: '',
+          courseId: 'sample-do-ID',
+          status: 0
+        },
+        courseId: 'sample_courseid',
+        pageId: 'sample_pageid',
+        telemetryObject: {},
+        objRollup: {},
+        corRelationList: [],
+        channel: 'sample-channel',
+        userConsent: 'Yes'
+      };
+      mockSbProgressLoader.hide = jest.fn(() => Promise.resolve());
+      mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+      mockCourseService.enrollCourse = jest.fn(() => of(true));
+      const dismissFn = jest.fn(() => Promise.resolve());
+      const presentFn = jest.fn(() => Promise.resolve());
+      mockCommonUtilService.getLoader = jest.fn(() => ({
+        present: presentFn,
+        dismiss: dismissFn,
+      }));
+      mockCommonUtilService.showToast = jest.fn();
+      // act
+      await localCourseService.enrollIntoBatch(enrollCourse).subscribe(() => {
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+        expect(mockCourseService.enrollCourse).toHaveBeenCalled();
+        expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({ id: 'login' });
         done();
       });
     });
@@ -122,9 +203,12 @@ describe('LocalCourseService', () => {
         corRelationList: [],
       };
       mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
-
-      mockCourseService.enrollCourse = jest.fn(() => throwError(''));
-
+      const map = new Map();
+      map.set('data', 'sample-data');
+      jest.spyOn(localCourseService, 'prepareRequestValue').mockImplementation(() => {
+        return map;
+      });
+      mockCourseService.enrollCourse = jest.fn(() => throwError({}));
       // act
       localCourseService.enrollIntoBatch(enrollCourse).toPromise().catch(() => {
         // assert
@@ -150,16 +234,15 @@ describe('LocalCourseService', () => {
         corRelationList: [],
       };
       mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
-      const networkError = new NetworkError({code: 'samp'});
+      const networkError = new NetworkError({ code: 'samp' });
       mockCourseService.enrollCourse = jest.fn(() => throwError(networkError));
-      mockCommonUtilService.translateMessage = jest.fn();
+      mockCommonUtilService.translateMessage = jest.fn(() => 'enrolled');
       mockCommonUtilService.showToast = jest.fn();
 
       // act
       localCourseService.enrollIntoBatch(enrollCourse).toPromise().catch(() => {
         // assert
-        expect(mockCommonUtilService.showToast).toHaveBeenCalled();
-        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+        // expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
         done();
       });
 
@@ -179,22 +262,63 @@ describe('LocalCourseService', () => {
         telemetryObject: {},
         objRollup: {},
         corRelationList: [],
+        userConsent: UserConsent.YES
       };
       mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
       const httpClientError = new HttpClientError('http_clicnt_error', { body: { params: { status: 'USER_ALREADY_ENROLLED_COURSE' } } });
 
       mockCourseService.enrollCourse = jest.fn(() => throwError(httpClientError));
-      mockCommonUtilService.translateMessage = jest.fn();
+      mockCommonUtilService.translateMessage = jest.fn(() => 'enrolled');
       mockCommonUtilService.showToast = jest.fn();
-
+      const value = new Map();
+      value.set('error', {});
+      jest.spyOn(localCourseService, 'prepareRequestValue').mockImplementation(() => {
+        return value;
+      });
       // act
       localCourseService.enrollIntoBatch(enrollCourse).toPromise().catch(() => {
         // assert
+        expect(mockCommonUtilService.translateMessage).toHaveBeenCalled();
         expect(mockCommonUtilService.showToast).toHaveBeenCalled();
-        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
         done();
       });
+    });
 
+
+    it('should raise a telemetry event when HttpClient error is thrown and already enrolled and network error', (done) => {
+      // arrange
+      const enrollCourse = {
+        userId: 'sample_userid',
+        batch: {
+          id: '',
+          courseId: '',
+          status: 0
+        },
+        courseId: 'sample_courseid',
+        pageId: 'sample_pageid',
+        telemetryObject: {},
+        objRollup: {},
+        corRelationList: [],
+        userConsent: UserConsent.YES
+      };
+      mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+      const httpClientError = new HttpClientError('http_clicnt_error', { body: { params: { status: 'USER_ALREADY_ENROLLED_COURSE' } } });
+
+      mockCourseService.enrollCourse = jest.fn(() => throwError(httpClientError));
+      mockCommonUtilService.translateMessage = jest.fn(() => 'enrolled');
+      mockCommonUtilService.showToast = jest.fn();
+      const value = new Map();
+      value.set('error', {});
+      jest.spyOn(localCourseService, 'prepareRequestValue').mockImplementation(() => {
+        return value;
+      });
+      // act
+      localCourseService.enrollIntoBatch(enrollCourse).toPromise().catch(() => {
+        // assert
+        expect(mockCommonUtilService.translateMessage).toHaveBeenCalled();
+        expect(mockCommonUtilService.showToast).toHaveBeenCalled();
+        done();
+      });
     });
 
     it('should raise a telemetry event when Httpclient error is thrown but not already enrolled', (done) => {
@@ -216,7 +340,7 @@ describe('LocalCourseService', () => {
       const httpClientError = new HttpClientError('http_clicnt_error', { body: {} });
 
       mockCourseService.enrollCourse = jest.fn(() => throwError(httpClientError));
-      mockCommonUtilService.translateMessage = jest.fn();
+      mockCommonUtilService.translateMessage = jest.fn(() => 'enrolled');
       mockCommonUtilService.showToast = jest.fn();
 
       // act
@@ -226,17 +350,11 @@ describe('LocalCourseService', () => {
         expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
         done();
       });
-
     });
 
   });
 
   describe('checkCourseRedirect', () => {
-    const authSession = {
-      access_token: 'access_token',
-      refresh_token: 'refresh_token',
-      userToken: 'userId'
-    };
     const courseAndBatchData: Batch = `{
       "identifier":"string",
       "id":"string",
@@ -263,11 +381,13 @@ describe('LocalCourseService', () => {
     it('should restrict the enrolling flow, if the user is not logged in.', (done) => {
       // arrange
       mockAppGlobalService.isSignInOnboardingCompleted = false;
-      mockAuthService.getSession = jest.fn(() => of(authSession));
+      mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
       // action
       localCourseService.checkCourseRedirect();
+      jest.spyOn(localCourseService, 'enrollIntoBatch').mockImplementation();
       // assert
       setTimeout(() => {
+        expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
         expect(mockAppGlobalService.isJoinTraningOnboardingFlow).toEqual(true);
         done();
       }, 0);
@@ -275,42 +395,50 @@ describe('LocalCourseService', () => {
 
     it('should restrict the enrolling flow if batchId and course details are not saved in the preference.', (done) => {
       // arrange
-      authSession['userToken'] = 'other_userId';
       mockAppGlobalService.isSignInOnboardingCompleted = true;
-      mockAuthService.getSession = jest.fn(() => of(authSession));
+      mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
       mockPreferences.getString = jest.fn(() => of(undefined));
+      jest.spyOn(localCourseService, 'enrollIntoBatch').mockImplementation();
       // action
       localCourseService.checkCourseRedirect();
       // assert
       setTimeout(() => {
+        // expect(mockAppGlobalService.getActiveProfileUid).not.toHaveBeenCalled();
         done();
       }, 0);
     });
 
     it('should restrict the enrolling flow if session details is empty.', (done) => {
       // arrange
-      authSession['userToken'] = 'other_userId';
       mockAppGlobalService.isSignInOnboardingCompleted = true;
-      mockAuthService.getSession = jest.fn(() => of(undefined));
+      mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+      mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('sample-uid'));
       mockPreferences.getString = jest.fn(() => of(courseAndBatchData));
+      mockPreferences.putString = jest.fn(() => of(undefined));
       // action
       localCourseService.checkCourseRedirect();
       // assert
       setTimeout(() => {
+        expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+        expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
+        expect(mockPreferences.putString).toHaveBeenCalledWith(PreferenceKey.BATCH_DETAIL_KEY, '');
         done();
       }, 0);
     });
 
     it('should restrict the enrolling flow if created id and the userId are same.', (done) => {
       // arrange
-      authSession['userToken'] = 'other_userId';
       mockAppGlobalService.isSignInOnboardingCompleted = true;
-      mockAuthService.getSession = jest.fn(() => of(authSession));
+      mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+      mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('other_userId'));
       mockPreferences.getString = jest.fn(() => of(courseAndBatchData));
+      mockPreferences.putString = jest.fn(() => of(undefined));
       // action
       localCourseService.checkCourseRedirect();
       // assert
       setTimeout(() => {
+        expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+        expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
         expect(mockEvents.publish).toHaveBeenCalledWith(expect.any(String));
         expect(mockPreferences.putString).toHaveBeenCalledWith(PreferenceKey.BATCH_DETAIL_KEY, expect.any(String));
         done();
@@ -319,9 +447,9 @@ describe('LocalCourseService', () => {
 
     it('should allow the enrolling flow if created id and the userId are saved in the preference.', (done) => {
       // arrange
-      authSession['userToken'] = 'userId';
       mockAppGlobalService.isSignInOnboardingCompleted = true;
-      mockAuthService.getSession = jest.fn(() => of(authSession));
+      mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+      mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('sample-uid'));
       mockPreferences.getString = jest.fn(() => of(courseAndBatchData));
       const dismissFn = jest.fn(() => Promise.resolve());
       const presentFn = jest.fn(() => Promise.resolve());
@@ -338,21 +466,25 @@ describe('LocalCourseService', () => {
       mockCourseService.getEnrolledCourses = jest.fn(() => of([{ courseId: 1 }, { courseId: 2 }]));
       mockAppGlobalService.setEnrolledCourseList = jest.fn();
       mockPreferences.putString = jest.fn(() => of(undefined));
+      mockSbProgressLoader.hide = jest.fn();
       // action
       localCourseService.checkCourseRedirect();
       // assert
       setTimeout(() => {
-        expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('COURSE_ENROLLED');
+        expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+        expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
+        expect(mockCategoryKeyTranslator.transform).toBeCalledWith('FRMELEMNTS_MSG_COURSE_ENROLLED', expect.anything());
         expect(mockAppGlobalService.setEnrolledCourseList).toHaveBeenCalled();
+        expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({ id: 'login' });
         done();
       }, 0);
     });
 
     it('should allow the enrolling flow if created id and the userId are saved in the preference, but enrolledCourse is null.', (done) => {
       // arrange
-      authSession['userToken'] = 'userId';
       mockAppGlobalService.isSignInOnboardingCompleted = true;
-      mockAuthService.getSession = jest.fn(() => of(authSession));
+      mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+      mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('sample-uid'));
       mockPreferences.getString = jest.fn(() => of(courseAndBatchData));
       const dismissFn = jest.fn(() => Promise.resolve());
       const presentFn = jest.fn(() => Promise.resolve());
@@ -362,27 +494,31 @@ describe('LocalCourseService', () => {
       })) as any;
       mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
       jest.spyOn(localCourseService, 'enrollIntoBatch').mockReturnValue(of(undefined));
-      mockNgZone.run = jest.fn((fn) => fn()); 
+      mockNgZone.run = jest.fn((fn) => fn());
       mockCommonUtilService.translateMessage = jest.fn(() => 'some_string');
       mockCommonUtilService.showToast = jest.fn();
       mockAppVersion.getAppName = jest.fn(() => Promise.resolve('some_string'));
       mockCourseService.getEnrolledCourses = jest.fn(() => of(undefined));
       mockAppGlobalService.setEnrolledCourseList = jest.fn();
       mockPreferences.putString = jest.fn(() => of(undefined));
+      mockSbProgressLoader.hide = jest.fn();
       // action
       localCourseService.checkCourseRedirect();
       // assert
       setTimeout(() => {
-        expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('COURSE_ENROLLED');
+        expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+        expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
+        expect(mockCategoryKeyTranslator.transform).toBeCalledWith('FRMELEMNTS_MSG_COURSE_ENROLLED', expect.anything());
+        expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({ id: 'login' });
         done();
       }, 0);
     });
 
     it('should allow the enrolling flow if created id and the userId are saved in the preference, but enrolledCourse is [].', (done) => {
       // arrange
-      authSession['userToken'] = 'userId';
       mockAppGlobalService.isSignInOnboardingCompleted = true;
-      mockAuthService.getSession = jest.fn(() => of(authSession));
+      mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+      mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('sample-uid'));
       mockPreferences.getString = jest.fn(() => of(courseAndBatchData));
       const dismissFn = jest.fn(() => Promise.resolve());
       const presentFn = jest.fn(() => Promise.resolve());
@@ -399,21 +535,37 @@ describe('LocalCourseService', () => {
       mockCourseService.getEnrolledCourses = jest.fn(() => of([]));
       mockAppGlobalService.setEnrolledCourseList = jest.fn();
       mockPreferences.putString = jest.fn(() => of(undefined));
+      mockSbProgressLoader.hide = jest.fn();
       // action
       localCourseService.checkCourseRedirect();
       // assert
       setTimeout(() => {
-        expect(mockCommonUtilService.translateMessage).toHaveBeenCalledWith('COURSE_ENROLLED');
+        expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+        expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
+        expect(mockCategoryKeyTranslator.transform).toBeCalledWith('FRMELEMNTS_MSG_COURSE_ENROLLED', expect.anything());
+        expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({ id: 'login' });
         done();
       }, 0);
     });
 
     it('should handle Network error when getEnrolled Courses is called.', (done) => {
       // arrange
-      authSession['userToken'] = 'userId';
       mockAppGlobalService.isSignInOnboardingCompleted = true;
-      mockAuthService.getSession = jest.fn(() => of(authSession));
-      mockPreferences.getString = jest.fn(() => of(courseAndBatchData));
+      mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+      mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('sample-uid'));
+      mockNgZone.run = jest.fn((cb) => {
+        cb();
+      }) as any;
+      mockPreferences.getString = jest.fn((key) => {
+        switch (key) {
+          case PreferenceKey.BATCH_DETAIL_KEY:
+            return of(courseAndBatchData);
+          case PreferenceKey.COURSE_DATA_KEY:
+            return of(courseAndBatchData);
+          case PreferenceKey.CDATA_KEY:
+            return of(undefined);
+        }
+      });
       const dismissFn = jest.fn(() => Promise.resolve());
       const presentFn = jest.fn(() => Promise.resolve());
       mockCommonUtilService.getLoader = jest.fn(() => ({
@@ -424,21 +576,23 @@ describe('LocalCourseService', () => {
       mockCommonUtilService.translateMessage = jest.fn(() => 'some_string');
       mockCommonUtilService.showToast = jest.fn();
       mockAppVersion.getAppName = jest.fn(() => Promise.resolve('some_string'));
-      mockCourseService.getEnrolledCourses = jest.fn(() => of([]));
+      mockCourseService.getEnrolledCourses = jest.fn(() => throwError({}));
       mockAppGlobalService.setEnrolledCourseList = jest.fn();
       mockPreferences.putString = jest.fn(() => of(undefined));
       const networkError = new NetworkError('sample_error');
       jest.spyOn(localCourseService, 'enrollIntoBatch').mockReturnValue(throwError(networkError));
+      mockSbProgressLoader.hide = jest.fn();
       // act
       localCourseService.checkCourseRedirect();
       // assert
       setTimeout(() => {
+        expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+        expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
         expect(mockNgZone.run).toHaveBeenCalled();
         expect(mockPreferences.putString).toHaveBeenCalled();
-        expect(dismissFn).toHaveBeenCalled();
-        expect(mockAuthService.getSession).toHaveBeenCalled();
         expect(mockPreferences.getString).toHaveBeenCalled();
         expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+        expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({ id: 'login' });
 
         done();
       }, 0);
@@ -446,16 +600,10 @@ describe('LocalCourseService', () => {
 
     it('should handle HttpClient error when course is already enrolled.', (done) => {
       // arrange
-      authSession['userToken'] = 'userId';
       mockAppGlobalService.isSignInOnboardingCompleted = true;
-      mockAuthService.getSession = jest.fn(() => of(authSession));
+      mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+      mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('sample-uid'));
       mockPreferences.getString = jest.fn(() => of(courseAndBatchData));
-      const dismissFn = jest.fn(() => Promise.resolve());
-      const presentFn = jest.fn(() => Promise.resolve());
-      mockCommonUtilService.getLoader = jest.fn(() => ({
-        present: presentFn,
-        dismiss: dismissFn,
-      })) as any;
       mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
       mockPreferences.putString = jest.fn(() => of(undefined));
       const httpClientError = new HttpClientError('http_clicnt_error', { body: { params: { status: 'USER_ALREADY_ENROLLED_COURSE' } } });
@@ -463,27 +611,28 @@ describe('LocalCourseService', () => {
       mockNgZone.run = jest.fn((cb) => {
         cb();
       }) as any;
+      mockSbProgressLoader.hide = jest.fn();
       // act
       localCourseService.checkCourseRedirect();
       // assert
       setTimeout(() => {
+        expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+        expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
         expect(mockEvents.publish).toHaveBeenCalled();
         expect(mockNgZone.run).toHaveBeenCalled();
         expect(mockPreferences.putString).toHaveBeenCalled();
-        expect(dismissFn).toHaveBeenCalled();
-        expect(mockAuthService.getSession).toHaveBeenCalled();
         expect(mockPreferences.getString).toHaveBeenCalled();
         expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
-
+        expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({ id: 'login' });
         done();
       }, 0);
     });
 
     it('should handle HttpClient error when course is already enrolled.', (done) => {
       // arrange
-      authSession['userToken'] = 'userId';
       mockAppGlobalService.isSignInOnboardingCompleted = true;
-      mockAuthService.getSession = jest.fn(() => of(authSession));
+      mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+      mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('sample-uid'));
       mockPreferences.getString = jest.fn(() => of(courseAndBatchData));
       const dismissFn = jest.fn(() => Promise.resolve());
       const presentFn = jest.fn(() => Promise.resolve());
@@ -503,11 +652,11 @@ describe('LocalCourseService', () => {
       localCourseService.checkCourseRedirect();
       // assert
       setTimeout(() => {
+        expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+        expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
         expect(mockCommonUtilService.showToast).toHaveBeenCalled();
         expect(mockNgZone.run).toHaveBeenCalled();
         expect(mockPreferences.putString).toHaveBeenCalled();
-        expect(dismissFn).toHaveBeenCalled();
-        expect(mockAuthService.getSession).toHaveBeenCalled();
         expect(mockPreferences.getString).toHaveBeenCalled();
         expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
 
@@ -515,6 +664,37 @@ describe('LocalCourseService', () => {
       }, 0);
     });
 
+    it('should handle error other than HttpClient error when course is already enrolled.', (done) => {
+      // arrange
+      mockAppGlobalService.isSignInOnboardingCompleted = true;
+      mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+      mockAppGlobalService.getActiveProfileUid = jest.fn(() => Promise.resolve('sample-uid'));
+      mockPreferences.getString = jest.fn(() => of(courseAndBatchData));
+      const dismissFn = jest.fn(() => Promise.resolve());
+      const presentFn = jest.fn(() => Promise.resolve());
+      mockCommonUtilService.getLoader = jest.fn(() => ({
+        present: presentFn,
+        dismiss: dismissFn,
+      })) as any;
+      mockCommonUtilService.showToast = jest.fn();
+      mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+      mockPreferences.putString = jest.fn(() => of(undefined));
+      const httpClientError = new HttpServerError('http_server_error', { body: {} });
+      jest.spyOn(localCourseService, 'enrollIntoBatch').mockReturnValue(throwError(httpClientError));
+      mockNgZone.run = jest.fn((cb) => {
+        cb();
+      }) as any;
+      // act
+      localCourseService.checkCourseRedirect();
+      // assert
+      setTimeout(() => {
+        expect(mockAppGlobalService.isUserLoggedIn).toHaveBeenCalled();
+        expect(mockAppGlobalService.getActiveProfileUid).toHaveBeenCalled();
+        expect(mockSbProgressLoader.hide).toHaveBeenCalled();
+        done();
+      }, 0);
+    });
+
   });
 
   describe('navigateTocourseDetails()', () => {
@@ -537,4 +717,164 @@ describe('LocalCourseService', () => {
     });
   });
 
+  describe('getCourseProgress', () => {
+    it('should calculate and return course progress', (done) => {
+      // arrange
+      mockAppGlobalService.getUserId = jest.fn(() => 'user');
+      const context = {
+        userId: 'userid', courseId: 'courseid', batchId: 'batchid', isCertified: false, leafNodeIds: ['id1'], batchStatus: 2
+      };
+      const contentStatus = {
+        contentList: [{ contentId: 'id1', status: 2 }]
+      };
+      mockCourseService.getContentState = jest.fn(() => of(contentStatus));
+      // act
+      localCourseService.getCourseProgress(context).then((res: any) => {
+        expect(res.progress).toBe(100);
+        done();
+      });
+    });
+
+    it('should return 0 progress in case of failure ', (done) => {
+      // arrange
+      mockAppGlobalService.getUserId = jest.fn(() => 'user');
+      const context = {
+        userId: 'userid', courseId: 'courseid', batchId: 'batchid', isCertified: false, leafNodeIds: ['id1'], batchStatus: 2
+      };
+      mockCourseService.getContentState = jest.fn(() => throwError(''));
+      // act
+      localCourseService.getCourseProgress(context).then((res: any) => {
+        expect(res.progress).toBe(0);
+        done();
+      });
+    });
+
+    it('should return 0 progress if getContentState return empty response', (done) => {
+      // arrange
+      mockAppGlobalService.getUserId = jest.fn(() => 'user');
+      const context = {
+        userId: 'userid', courseId: 'courseid', batchId: 'batchid', isCertified: false, leafNodeIds: ['id1'], batchStatus: 2
+      };
+      mockCourseService.getContentState = jest.fn(() => of(undefined));
+      // act
+      localCourseService.getCourseProgress(context).then((res: any) => {
+        expect(res.progress).toBe(0);
+        done();
+      });
+    });
+
+    it('should return 0 progress if getContentState return wrong data', (done) => {
+      // arrange
+      mockAppGlobalService.getUserId = jest.fn(() => 'user');
+      const context = {
+        userId: 'userid', courseId: 'courseid', batchId: 'batchid', isCertified: false, leafNodeIds: ['id1'], batchStatus: 2
+      };
+      mockCourseService.getContentState = jest.fn(() => of({ contentList: [{ contentId: 'do_1234' }] }));
+      // act
+      localCourseService.getCourseProgress(context).then((res: any) => {
+        expect(res.progress).toBe(0);
+        done();
+      });
+    });
+  });
+
+  describe('isEnrollable', () => {
+    it('should return unEnrolled and invoked showFutureBatchMessage', () => {
+      const batches = [{
+        enrollmentEndDate: '01/01/01',
+        startDate: '01/01/01'
+      }];
+      mockCommonUtilService.showToast = jest.fn();
+      mockDatePipe.transform = jest.fn(() => '01-01-01');
+      mockCategoryKeyTranslator.transform = jest.fn(() => 'batches avilable');
+      // act
+      const data = localCourseService.isEnrollable(batches, {});
+      // assert
+      expect(mockCommonUtilService.showToast).toHaveBeenCalled();
+      expect(data).toBeFalsy();
+    });
+
+    it('should show toast message if batches is empty', (done) => {
+          // arrnge
+          mockCommonUtilService.showToast = jest.fn();
+          // act
+          const data = localCourseService.isEnrollable([], {});
+          // assert
+          setTimeout(() => {
+              expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('NO_BATCHES_AVAILABLE');
+              done();
+          }, 0);
+      });
+
+    it('should return is enrolled', () => {
+      const batches = [{
+        enrollmentEndDate: undefined,
+        startDate: '01/01/01'
+      }];
+      mockCommonUtilService.showToast = jest.fn();
+      mockDatePipe.transform = jest.fn(() => '01-01-01');
+      mockCategoryKeyTranslator.transform = jest.fn(() => 'batches avilable');
+      // act
+      const data = localCourseService.isEnrollable(batches, {});
+      // arrange
+      expect(data).toBeTruthy();
+    });
+
+    it('should return is enrolled', () => {
+      const batches = [{
+        enrollmentEndDate: undefined,
+        startDate: 1800863414000
+      }, {
+        enrollmentEndDate: undefined,
+        startDate: '02/02/02'
+      }, {
+        startDate: 1800863614000
+      }];
+      mockCommonUtilService.showToast = jest.fn();
+      mockDatePipe.transform = jest.fn(() => '01-01-01');
+      mockCategoryKeyTranslator.transform = jest.fn(() => 'batches avilable');
+      // act
+      const data = localCourseService.isEnrollable(batches, {});
+      // assert
+      expect(data).toBeTruthy();
+    });
+  });
+
+  describe('fetchAssessmentStatus()', () => {
+
+    it('return default assessment status data', () => {
+      // arrange
+      const contentStatusData = null;
+      // act
+      const data = localCourseService.fetchAssessmentStatus(contentStatusData, 'do_id');
+      // assert
+      expect(data.isLastAttempt).toEqual(false);
+      expect(data.isContentDisabled).toEqual(false);
+    });
+
+    it('return assessment status isLastAttempt as true if its the final attempt', () => {
+      // arrange
+      const contentStatusData = {
+        contentList: [{ contentId: 'do_id', bestScore: {}, score: [1, 2] }]
+      };
+      // act
+      const data = localCourseService.fetchAssessmentStatus(contentStatusData, { identifier: 'do_id', contentData: { maxAttempts: 3 } });
+      // assert
+      expect(data.isLastAttempt).toEqual(true);
+      expect(data.isContentDisabled).toEqual(false);
+    });
+
+    it('return assessment status isContentDisabled as true if the user has exceeded the number of attempts', () => {
+      // arrange
+      const contentStatusData = {
+        contentList: [{ contentId: 'do_id', bestScore: {}, score: [1, 2, 3] }]
+      };
+      // act
+      const data = localCourseService.fetchAssessmentStatus(contentStatusData, { identifier: 'do_id', maxAttempts: 2 });
+      // assert
+      expect(data.isLastAttempt).toEqual(false);
+      expect(data.isContentDisabled).toEqual(true);
+    });
+  });
+
 });
diff --git a/src/services/local-course.service.ts b/src/services/local-course.service.ts
index 13e6cb988..9d7abb110 100644
--- a/src/services/local-course.service.ts
+++ b/src/services/local-course.service.ts
@@ -1,8 +1,9 @@
 import { Injectable, Inject, NgZone } from '@angular/core';
 import {
   Batch, Course, CourseService, EnrollCourseRequest,
-  InteractType, AuthService, SharedPreferences, OAuthSession,
-  FetchEnrolledCourseRequest, TelemetryObject, HttpClientError, NetworkError
+  InteractType, SharedPreferences,
+  FetchEnrolledCourseRequest, TelemetryObject, HttpClientError,
+  NetworkError, GetContentStateRequest, ContentStateResponse
 } from 'sunbird-sdk';
 import { Observable } from 'rxjs';
 import { AppGlobalService } from './app-global-service.service';
@@ -12,21 +13,32 @@ import { Map } from '@app/app/telemetryutil';
 import { CommonUtilService } from './common-util.service';
 import { EnrollCourse } from './../app/enrolled-course-details-page/course.interface';
 import { map, catchError } from 'rxjs/operators';
-import { PreferenceKey, EventTopics, RouterLinks } from '@app/app/app.constant';
-import { Events } from '@ionic/angular';
+import { PreferenceKey, EventTopics, RouterLinks, AssessmentConstant } from '@app/app/app.constant';
+import { Events } from '@app/util/events';
 import { AppVersion } from '@ionic-native/app-version/ngx';
 import { ContentUtil } from '@app/util/content-util';
-import { Location } from '@angular/common';
+import { DatePipe, Location } from '@angular/common';
 import { Router } from '@angular/router';
+import { SbProgressLoader } from '@app/services/sb-progress-loader.service';
+import { UserConsent } from '@project-sunbird/client-services/models';
+import { CategoryKeyTranslator } from '@app/pipes/category-key-translator/category-key-translator-pipe';
+import { ConsentService } from './consent-service';
+import { FormAndFrameworkUtilService } from './formandframeworkutil.service';
+import { FormConstants } from '@app/app/form.constants';
+
+export interface ConsentPopoverActionsDelegate {
+  onConsentPopoverShow(): void;
+  onConsentPopoverDismiss(): void;
+}
 
 
 @Injectable()
 export class LocalCourseService {
   private userId: string;
+  private isConsentPopupDisplayed: boolean;
 
   constructor(
     @Inject('COURSE_SERVICE') private courseService: CourseService,
-    @Inject('AUTH_SERVICE') private authService: AuthService,
     @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
     private appGlobalService: AppGlobalService,
     private telemetryGeneratorService: TelemetryGeneratorService,
@@ -35,15 +47,20 @@ export class LocalCourseService {
     private zone: NgZone,
     private appVersion: AppVersion,
     private router: Router,
-    private location: Location
+    private location: Location,
+    private sbProgressLoader: SbProgressLoader,
+    private datePipe: DatePipe,
+    private categoryKeyTranslator: CategoryKeyTranslator,
+    private consentService: ConsentService,
+    public formAndFrameworkUtilService: FormAndFrameworkUtilService
   ) {
   }
 
-  enrollIntoBatch(enrollCourse: EnrollCourse): Observable<any> {
+  enrollIntoBatch(enrollCourse: EnrollCourse, consentPopoverActionsDelegate?: ConsentPopoverActionsDelegate): Observable<any> {
     const enrollCourseRequest: EnrollCourseRequest = this.prepareEnrollCourseRequest(
       enrollCourse.userId, enrollCourse.batch, enrollCourse.courseId);
     return this.courseService.enrollCourse(enrollCourseRequest).pipe(
-      map((data: boolean) => {
+      map(async (data: boolean) => {
         if (data) {
           this.telemetryGeneratorService.generateInteractTelemetry(
             InteractType.OTHER,
@@ -54,6 +71,20 @@ export class LocalCourseService {
             enrollCourse.objRollup,
             enrollCourse.corRelationList
           );
+          if (enrollCourse.userConsent === UserConsent.YES) {
+            if (consentPopoverActionsDelegate) {
+              consentPopoverActionsDelegate.onConsentPopoverShow();
+            }
+            await this.sbProgressLoader.hide({ id: 'login' });
+            this.isConsentPopupDisplayed = true;
+            await this.consentService.showConsentPopup(enrollCourse);
+           // this.preferences.putString(PreferenceKey.IS_CONSENT_POPUP_DISPLAY, 'true').toPromise();
+
+            if (consentPopoverActionsDelegate) {
+              consentPopoverActionsDelegate.onConsentPopoverDismiss();
+              this.isConsentPopupDisplayed = false;
+            }
+          }
         } else {
           this.telemetryGeneratorService.generateInteractTelemetry(
             InteractType.OTHER,
@@ -67,15 +98,19 @@ export class LocalCourseService {
         }
         return data;
       }),
-      catchError(err => {
+      catchError(async (err) => {
         const requestValue = this.prepareRequestValue(enrollCourseRequest);
-        if (err instanceof NetworkError) {
+        if (NetworkError.isInstance(err)) {
           requestValue.error = err.code;
           this.commonUtilService.showToast(this.commonUtilService.translateMessage('ERROR_NO_INTERNET_MESSAGE'));
-        } else if (err instanceof HttpClientError) {
+        } else if (HttpClientError.isInstance(err)) {
           if (err.response.body && err.response.body.params && err.response.body.params.status === 'USER_ALREADY_ENROLLED_COURSE') {
             requestValue.error = err.response.body.params.status;
             this.commonUtilService.showToast(this.commonUtilService.translateMessage('ALREADY_ENROLLED_COURSE'));
+            if (enrollCourse.userConsent === UserConsent.YES) {
+              await this.sbProgressLoader.hide({ id: 'login' });
+              await this.consentService.getConsent(enrollCourse);
+            }
           } else {
             this.commonUtilService.showToast('ERROR_WHILE_ENROLLING_COURSE');
           }
@@ -103,6 +138,7 @@ export class LocalCourseService {
     };
     return enrollCourseRequest;
   }
+
   prepareRequestValue(enrollCourseRequest): Map {
     const reqvalues = new Map();
     reqvalues['enrollReq'] = enrollCourseRequest;
@@ -112,23 +148,18 @@ export class LocalCourseService {
   // This method is called when the user login immediately after pressing JOIN TRAINING from app-components
   // And after filling signinOnboarding completely from externalId service.
   async checkCourseRedirect() {
-    const isloggedInUser = await this.authService.getSession().toPromise();
-    if (!this.appGlobalService.isSignInOnboardingCompleted && isloggedInUser) {
+    const isLoggedInUser = this.appGlobalService.isUserLoggedIn();
+    if (!this.appGlobalService.isSignInOnboardingCompleted && isLoggedInUser) {
       this.appGlobalService.isJoinTraningOnboardingFlow = true;
       return;
     }
+
     const batchDetails = await this.preferences.getString(PreferenceKey.BATCH_DETAIL_KEY).toPromise();
     const courseDetail = await this.preferences.getString(PreferenceKey.COURSE_DATA_KEY).toPromise();
     if (batchDetails && courseDetail) {
-      const session: OAuthSession = await this.authService.getSession().toPromise();
-      let isGuestUser;
-      if (!session) {
-        isGuestUser = true;
-      } else {
-        isGuestUser = false;
-        this.userId = session.userToken;
-      }
-      if (JSON.parse(courseDetail).createdBy !== this.userId && !isGuestUser) {
+      this.userId = await this.appGlobalService.getActiveProfileUid();
+
+      if (JSON.parse(courseDetail).createdBy !== this.userId && isLoggedInUser) {
         this.enrollBatchAfterlogin(JSON.parse(batchDetails), JSON.parse(courseDetail));
       } else {
         this.events.publish('return_course');
@@ -139,8 +170,6 @@ export class LocalCourseService {
 
   private async enrollBatchAfterlogin(batch: Batch, course: any) {
     const enrollCourseRequest = this.prepareEnrollCourseRequest(this.userId, batch);
-    const loader = await this.commonUtilService.getLoader();
-    await loader.present();
     const telemetryObject: TelemetryObject = ContentUtil.getTelemetryObject(course);
     const corRelationList = await this.preferences.getString(PreferenceKey.CDATA_KEY).toPromise();
     this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
@@ -157,13 +186,14 @@ export class LocalCourseService {
       pageId: PageId.COURSE_BATCHES,
       telemetryObject,
       objRollup: ContentUtil.generateRollUp(undefined, telemetryObject.id),
-      corRelationList: corRelationList ? JSON.parse(corRelationList) : []
+      corRelationList: corRelationList ? JSON.parse(corRelationList) : [],
+      channel: course.channel,
+      userConsent: course.userConsent
     };
     this.enrollIntoBatch(enrollCourse).toPromise()
       .then(() => {
         this.zone.run(async () => {
-          await loader.dismiss();
-          this.commonUtilService.showToast(this.commonUtilService.translateMessage('COURSE_ENROLLED'));
+          this.commonUtilService.showToast(this.categoryKeyTranslator.transform('FRMELEMNTS_MSG_COURSE_ENROLLED', course));
           this.events.publish(EventTopics.ENROL_COURSE_SUCCESS, {
             batchId: batch.id,
             courseId: batch.courseId
@@ -173,15 +203,15 @@ export class LocalCourseService {
           await this.preferences.putString(PreferenceKey.CDATA_KEY, '').toPromise();
           this.getEnrolledCourses();
           this.navigateTocourseDetails();
+          await this.sbProgressLoader.hide({ id: 'login' });
         });
       }, (err) => {
         this.zone.run(async () => {
-          await loader.dismiss();
           await this.preferences.putString(PreferenceKey.CDATA_KEY, '').toPromise();
-          if (err instanceof NetworkError) {
+          if (NetworkError.isInstance(err)) {
             this.commonUtilService.showToast(this.commonUtilService.translateMessage('ERROR_NO_INTERNET_MESSAGE'));
             this.getEnrolledCourses();
-          } else if (err instanceof HttpClientError) {
+          } else if (HttpClientError.isInstance(err)) {
             if (err.response.body && err.response.body.params && err.response.body.params.status === 'USER_ALREADY_ENROLLED_COURSE') {
               this.events.publish(EventTopics.ENROL_COURSE_SUCCESS, {
                 batchId: batch.id,
@@ -192,6 +222,7 @@ export class LocalCourseService {
             }
           }
           this.navigateTocourseDetails();
+          await this.sbProgressLoader.hide({ id: 'login' });
         });
       });
   }
@@ -204,18 +235,14 @@ export class LocalCourseService {
   }
 
   private async getEnrolledCourses(returnRefreshedCourses: boolean = false) {
-    const loader = await this.commonUtilService.getLoader();
-    await loader.present();
     const option: FetchEnrolledCourseRequest = {
       userId: this.userId,
       returnFreshCourses: returnRefreshedCourses
     };
     this.courseService.getEnrolledCourses(option).toPromise()
       .then(async (enrolledCourses) => {
-        await loader.dismiss();
         if (enrolledCourses) {
           this.zone.run(() => {
-            enrolledCourses = enrolledCourses || [];
             if (enrolledCourses.length > 0) {
               const courseList: Array<Course> = [];
               for (const course of enrolledCourses) {
@@ -227,8 +254,131 @@ export class LocalCourseService {
           });
         }
       }, async (err) => {
-        await loader.dismiss();
       });
   }
 
+  async getCourseProgress(courseContext) {
+    return new Promise(async (resolve, reject) => {
+      const request: GetContentStateRequest = {
+        userId: this.appGlobalService.getUserId(),
+        courseId: courseContext.courseId,
+        contentIds: courseContext.leafNodeIds,
+        returnRefreshedContentStates: false,
+        batchId: courseContext.batchId,
+        fields: ['progress', 'score']
+      };
+      let progress = 0;
+      try {
+        const contentStatusData: ContentStateResponse = await this.courseService.getContentState(request).toPromise();
+        if (contentStatusData && contentStatusData.contentList) {
+          const viewedContents = [];
+          for (const contentId of courseContext.leafNodeIds) {
+            if (contentStatusData.contentList.find((c) => c.contentId === contentId && c.status === 2)) {
+              viewedContents.push(contentId);
+            }
+          }
+          progress = Math.round((viewedContents.length / courseContext.leafNodeIds.length) * 100);
+
+        }
+        resolve({ progress, contentStatusData });
+      } catch (err) {
+        resolve({ progress });
+      }
+    });
+  }
+
+  isEnrollable(batches, course) {
+    if (!batches || !batches.length) {
+      this.commonUtilService.showToast('NO_BATCHES_AVAILABLE');
+      return false;
+    }
+
+    let latestBatch = batches[0];
+    const showEnrollmentEndedMessage = () => {
+      this.commonUtilService.showToast(
+        'ENROLLMENT_ENDED_ON',
+        null, null, null, null,
+        this.datePipe.transform(latestBatch.enrollmentEndDate)
+      );
+    };
+    const showFutureBatchMessage = () => {
+      this.commonUtilService.showToast(
+        this.categoryKeyTranslator.transform('FRMELEMNTS_MSG_BATCH_AVAILABILITY_DATE', course,
+          { 'batch_start_date': this.datePipe.transform(latestBatch.startDate) }
+        )
+      );
+    };
+    for (let i = 0; i < batches.length; i++) {
+      if (batches.length > 1 && !batches[i].enrollmentEndDate &&
+        batches[i].startDate && (new Date(batches[i].startDate).setHours(0, 0, 0, 0) <= new Date().setHours(0, 0, 0, 0))) {
+        return true;
+      }
+      if (batches[i].startDate &&
+        (new Date(batches[i].startDate) > new Date(latestBatch.startDate))) {
+        latestBatch = batches[i];
+      }
+    }
+    // start date is not passed, then check show message
+    // start date is passed, then check for enrollmentenddate
+    // enrollmentenddate is passed then show message
+
+    if (latestBatch.startDate && (new Date(latestBatch.startDate).setHours(0, 0, 0, 0) > new Date().setHours(0, 0, 0, 0))) {
+      showFutureBatchMessage();
+      return false;
+    } else if (latestBatch.enrollmentEndDate &&
+      (new Date(latestBatch.enrollmentEndDate).setHours(0, 0, 0, 0) < new Date().setHours(0, 0, 0, 0))) {
+      showEnrollmentEndedMessage();
+      return false;
+    }
+    return true;
+  }
+
+  fetchAssessmentStatus(contentStatusData, content) {
+    let maxAttempts = content.contentData ? content.contentData.maxAttempts : content.maxAttempts;
+    if (!maxAttempts) {
+      maxAttempts = AssessmentConstant.MAX_ATTEMPTS;
+    }
+    const assesmentsStatus: { isLastAttempt: boolean, isContentDisabled: boolean } = {
+      isLastAttempt: false,
+      isContentDisabled: false
+    };
+    if (contentStatusData && contentStatusData.contentList) {
+      contentStatusData.contentList.forEach((item) => {
+        if (item.contentId === content.identifier && item.score) {
+          if (maxAttempts - item.score.length === 1) {
+            assesmentsStatus.isLastAttempt = true;
+          }
+          if (maxAttempts <= item.score.length) {
+            assesmentsStatus.isContentDisabled = true;
+          }
+        }
+      });
+    }
+    return assesmentsStatus;
+  }
+
+  async getTimeRemaining(endDate) {
+    const utilityConfigFields = await this.formAndFrameworkUtilService.getFormFields(FormConstants.UTILITY_CONFIG);
+    const batchEnrollmentEndDateDisplayThreshold: number = Number(utilityConfigFields
+        .find((config) => config.code === 'batchEndTimerConfig')['config']['batchEndDateTimer']);
+    const today = window.dayjs();
+    const enrollmentEndDate = (window.dayjs(endDate)).add(1, 'days');
+    if (enrollmentEndDate.diff(today, 'day') > batchEnrollmentEndDateDisplayThreshold) {
+      return undefined;
+    }
+    if (today.diff(endDate) > 0) {
+      return undefined;
+    }
+    const duration = window.dayjs.duration(enrollmentEndDate.diff(today));
+    return duration.format('D [day(s)] H [h] m [m]');
+  }
+
+  isConsentPopupVisible(): boolean {
+    return this.isConsentPopupDisplayed;
+  }
+
+  setConsentPopupVisibility(status: boolean) {
+    this.isConsentPopupDisplayed = status;
+  }
+
 }
diff --git a/src/services/location-handler.spec.ts b/src/services/location-handler.spec.ts
new file mode 100644
index 000000000..5c4116f74
--- /dev/null
+++ b/src/services/location-handler.spec.ts
@@ -0,0 +1,164 @@
+import { LocationHandler } from './location-handler';
+import { of } from 'rxjs';
+import { ProfileService, SharedPreferences } from '@project-sunbird/sunbird-sdk';
+import { PreferenceKey } from '../app/app.constant';
+
+describe('LocationHandler', () => {
+    let locationHandler: LocationHandler;
+
+    const mockSharedPreference: Partial<SharedPreferences> = {
+    };
+
+    const mockProfile = {
+        userLocations: [{
+            type: 'state',
+            code: 'sample_code',
+            name: 'sample_state',
+            id: 'sample_id'
+        },
+            {
+                type: 'district',
+                code: 'sample_code',
+                name: 'sample_district',
+                id: 'sample_id'
+            }]
+    };
+    const mockProfileService: Partial<ProfileService> = {
+        searchLocation: jest.fn(() => of(mockProfile.userLocations))
+    };
+
+
+    beforeAll(() => {
+        locationHandler = new LocationHandler(
+            mockSharedPreference as SharedPreferences,
+            mockProfileService as ProfileService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create instance of LocationHandler', () => {
+        // arrange
+        // act
+        // assert
+        expect(locationHandler).toBeTruthy();
+    });
+
+    describe('getAvailableLocation', () => {
+        it('should return location results from profile userLocation', (done) => {
+            // arrange
+            // act
+            locationHandler.getAvailableLocation(mockProfile).then((response) => {
+                // assert
+                expect(response).toEqual(mockProfile.userLocations);
+                done();
+            });
+        });
+
+        it('should return location results if device location is available with stateId and districtId', (done) => {
+            // arrange
+            mockSharedPreference.getString = jest.fn((arg) => {
+                let value;
+                switch (arg) {
+                    case PreferenceKey.DEVICE_LOCATION:
+                        value = '{\"district\":\"sample_district\",\"districtId\":\"sample_id\",\"state\":\"sample_state\",\"stateId\":\"sample_id\"}'
+                        break;
+                }
+                return of(value);
+            });
+            // act
+            locationHandler.getAvailableLocation().then((response) => {
+                // assert
+                expect(response).toEqual([{
+                    type: 'state',
+                    code: 'sample_id',
+                    name: 'sample_state',
+                    id: 'sample_id'
+                },
+                    {
+                        type: 'district',
+                        code: 'sample_id',
+                        name: 'sample_district',
+                        id: 'sample_id'
+                    }]);
+                done();
+            });
+        });
+
+
+        it('should return location results if device location is available without stateId and districtId', (done) => {
+            // arrange
+            mockSharedPreference.getString = jest.fn((arg) => {
+                let value;
+                switch (arg) {
+                    case PreferenceKey.DEVICE_LOCATION:
+                        value = '{\"district\":\"sample_district\",\"state\":\"sample_state\"}';
+                        break;
+                }
+                return of(value);
+            });
+            // act
+            locationHandler.getAvailableLocation().then((response) => {
+                // assert
+                expect(response).toEqual([{
+                    type: 'state',
+                    code: 'sample_code',
+                    name: 'sample_state',
+                    id: 'sample_id'
+                },
+                    {
+                        type: 'district',
+                        code: 'sample_code',
+                        name: 'sample_district',
+                        id: 'sample_id'
+                    }]);
+                done();
+            });
+        });
+
+        it('should return location results if IP location is available', (done) => {
+            // arrange
+            mockSharedPreference.getString = jest.fn((arg) => {
+                let value;
+                switch (arg) {
+                    case PreferenceKey.DEVICE_LOCATION:
+                        value = undefined;
+                        break;
+                    case PreferenceKey.IP_LOCATION:
+                        value = '{\"district\":\"sample_district\",\"state\":\"sample_state\"}';
+                        break;
+                }
+                return of(value);
+            });
+            // act
+            locationHandler.getAvailableLocation().then((response) => {
+                // assert
+                expect(response).toEqual([{
+                    type: 'state',
+                    code: 'sample_code',
+                    name: 'sample_state',
+                    id: 'sample_id'
+                },
+                    {
+                        type: 'district',
+                        code: 'sample_code',
+                        name: 'sample_district',
+                        id: 'sample_id'
+                    }]);
+                done();
+            });
+        });
+
+    });
+
+    describe('isUserLocationAvalable', () => {
+        it('should return true if userLocation is available', () => {
+            // arrange
+            // act
+            expect(locationHandler.isUserLocationAvalable(mockProfile)).toBeTruthy();
+        });
+    });
+
+});
diff --git a/src/services/location-handler.ts b/src/services/location-handler.ts
new file mode 100644
index 000000000..c694ca960
--- /dev/null
+++ b/src/services/location-handler.ts
@@ -0,0 +1,175 @@
+import { Inject, Injectable } from '@angular/core';
+import {
+    CachedItemRequestSourceFrom,
+    FrameworkService,
+    LocationSearchCriteria,
+    LocationSearchResult,
+    Organization,
+    ProfileService,
+    SharedPreferences
+} from '@project-sunbird/sunbird-sdk';
+import { Location, PreferenceKey } from '../app/app.constant';
+
+@Injectable()
+export class LocationHandler {
+    constructor(
+        @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
+        @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+        @Inject('FRAMEWORK_SERVICE') private frameworkService: FrameworkService
+    ) { }
+
+    public async getAvailableLocation(profile?): Promise<LocationSearchResult[]> {
+        let locationResult: LocationSearchResult[] = [];
+        if (profile && profile['userLocations'] && profile['userLocations'].length) {
+            for (const userLocation of profile['userLocations']) {
+                locationResult.push(userLocation);
+            }
+        } else if (await this.isDeviceLocationAvailable()) {
+            locationResult = await this.getLocation(PreferenceKey.DEVICE_LOCATION);
+        } else if (await this.isIpLocationAvailable()) {
+            locationResult = await this.getLocation(PreferenceKey.IP_LOCATION);
+        }
+
+        return locationResult;
+
+    }
+
+    private async getLocation(preferenceKey: string) {
+        const locationResult: LocationSearchResult[] = [];
+        const location = JSON.parse(await this.preferences.getString(preferenceKey).toPromise());
+        if (location && location.stateId && location.districtId) {
+            locationResult.push({
+                name: location.state,
+                code: location.stateId,
+                id: location.stateId,
+                type: Location.TYPE_STATE
+            });
+
+            locationResult.push({
+                name: location.district,
+                code: location.districtId,
+                id: location.districtId,
+                type: Location.TYPE_DISTRICT
+            });
+
+            if (location.blockId) {
+                locationResult.push({
+                    name: location.block,
+                    code: location.blockId,
+                    id: location.blockId,
+                    type: Location.TYPE_BLOCK
+                });
+            }
+
+            if (location.clusterId) {
+                locationResult.push({
+                    name: location.cluster,
+                    code: location.clusterId,
+                    id: location.clusterId,
+                    type: Location.TYPE_CLUSTER
+                });
+            }
+
+            if (location.schoolId) {
+                locationResult.push({
+                    name: location.school,
+                    code: location.schoolId,
+                    id: location.schoolId,
+                    type: Location.TYPE_SCHOOL
+                });
+            }
+
+        } else {
+            const state = await this.getLocationDetails(Location.TYPE_STATE, location.state);
+            const district = await this.getLocationDetails(Location.TYPE_DISTRICT, location.district, state.id);
+            locationResult.push(state);
+            locationResult.push(district);
+            let block, cluster, school;
+            if (location.block) {
+                block = await this.getLocationDetails(Location.TYPE_BLOCK, location.block, district.id);
+                locationResult.push(block);
+            }
+
+            if (location.block && location.cluster) {
+                cluster = await this.getLocationDetails(Location.TYPE_CLUSTER, location.cluster, block.id);
+                locationResult.push(cluster);
+            }
+
+            if (location.block && location.cluster && location.school) {
+                school = await this.getLocationDetails(Location.TYPE_SCHOOL, location.school, cluster.id);
+                locationResult.push(school);
+            }
+        }
+        return locationResult;
+    }
+
+    public async getLocationDetails(locationType: string, locationValue: string, parentLocationId?: string):
+        Promise<LocationSearchResult> {
+        const locationFilter = {
+            type: locationType,
+            ...((parentLocationId) ? { parentId: parentLocationId } : {})
+        };
+        let locations: LocationSearchResult[];
+        if (locationType === Location.TYPE_SCHOOL) {
+            const orgSearchRequest = {
+                filters: {
+                  'orgLocation.id': parentLocationId,
+                  isSchool: true
+                }
+              };
+            let schoolDetails = [];
+            await this.frameworkService.searchOrganization(orgSearchRequest).toPromise().then((data) => {
+                schoolDetails = data.content.map((org: Organization) => {
+                    if (org && org.externalId) {
+                        return {code: org.externalId, name: (org.orgName || locationValue), type: Location.TYPE_SCHOOL, id: org.externalId};
+                    }
+                });
+            });
+            locations = schoolDetails;
+        } else {
+            const req: LocationSearchCriteria = {
+                from: CachedItemRequestSourceFrom.CACHE,
+                filters: locationFilter
+            };
+            locations = await this.profileService.searchLocation(req).toPromise();
+        }
+        if (!locations || !Object.keys(locations).length) {
+            return undefined;
+        }
+        return locations.find(s => (s.name === locationValue));
+
+    }
+
+    getUserLocation(profile: any) {
+        const userLocation = {
+            state: {},
+            district: {}
+        };
+        if (profile && profile.userLocations && profile.userLocations.length) {
+            for (let i = 0, len = profile.userLocations.length; i < len; i++) {
+                if (profile.userLocations[i].type === 'state') {
+                    userLocation.state = profile.userLocations[i];
+                } else if (profile.userLocations[i].type === 'district') {
+                    userLocation.district = profile.userLocations[i];
+                }
+            }
+        }
+
+        return userLocation;
+    }
+
+    isUserLocationAvalable(profile: any): boolean {
+        const location = this.getUserLocation(profile);
+        return !!(location && location.state && location.state['name'] && location.district && location.district['name']);
+    }
+
+    async isDeviceLocationAvailable(): Promise<boolean> {
+        const deviceLoc = await this.preferences.getString(PreferenceKey.DEVICE_LOCATION).toPromise();
+        return !!deviceLoc;
+    }
+
+    async isIpLocationAvailable(): Promise<boolean> {
+        const deviceLoc = await this.preferences.getString(PreferenceKey.IP_LOCATION).toPromise();
+        return !!deviceLoc;
+    }
+}
diff --git a/src/services/login-handler.service.spec.ts b/src/services/login-handler.service.spec.ts
index ec6e14138..e7b21852e 100644
--- a/src/services/login-handler.service.spec.ts
+++ b/src/services/login-handler.service.spec.ts
@@ -1,30 +1,36 @@
-import { LoginHandlerService } from './login-handler.service';
-import { AppGlobalService } from './app-global-service.service';
-import { Events, NavController } from '@ionic/angular';
-import { Router } from '@angular/router';
-import { TelemetryGeneratorService } from './telemetry-generator.service';
-import { AppVersion } from '@ionic-native/app-version/ngx';
-import { NgZone } from '@angular/core';
-import { ContainerService } from './../services/container.services';
-import { CommonUtilService } from './../services/common-util.service';
-import { FormAndFrameworkUtilService } from './../services/formandframeworkutil.service';
+import {LoginHandlerService} from './login-handler.service';
+import {AppGlobalService} from './app-global-service.service';
+import {NavController} from '@ionic/angular';
+import {Events} from '@app/util/events';
+import {Router} from '@angular/router';
+import {TelemetryGeneratorService} from './telemetry-generator.service';
+import {AppVersion} from '@ionic-native/app-version/ngx';
+import {NgZone} from '@angular/core';
+import {ContainerService} from './../services/container.services';
+import {CommonUtilService} from './../services/common-util.service';
+import {FormAndFrameworkUtilService} from './../services/formandframeworkutil.service';
 import {
-    ProfileService,
-    AuthService,
     ApiService,
+    AuthService,
+    Profile,
+    ProfileService,
+    ProfileSource,
+    ProfileType,
     SdkConfig,
     SharedPreferences,
-    ProfileType,
-    ProfileSource,
+    SignInError,
 } from 'sunbird-sdk';
-import { isRegExp } from 'util';
-import { of } from 'rxjs';
+import {of, throwError} from 'rxjs';
+import {SbProgressLoader} from '@app/services/sb-progress-loader.service';
+import {ProfileConstants} from '@app/app/app.constant';
+import {Environment, InteractSubtype, InteractType, PageId} from '@app/services/telemetry-constants';
 
 jest.mock('sunbird-sdk', () => {
     const actual = require.requireActual('sunbird-sdk');
     return {
         ...actual,
-        WebviewLoginSessionProvider: function () {}
+        WebviewLoginSessionProvider() {
+        }
     };
 });
 
@@ -32,7 +38,8 @@ jest.mock('@app/app/module.service', () => {
     const actual = require.requireActual('@app/app/module.service');
     return {
         ...actual,
-        initTabs: jest.fn().mockImplementation(() => { })
+        initTabs: jest.fn().mockImplementation(() => {
+        })
     };
 });
 
@@ -80,6 +87,9 @@ describe('LoginHandlerService', () => {
     const mockAppGlobalService: Partial<AppGlobalService> = {
         getCurrentUser: jest.fn()
     };
+    const mockSbProgressLoader: Partial<SbProgressLoader> = {
+        hide: jest.fn()
+    };
 
     beforeAll(() => {
         loginHandlerService = new LoginHandlerService(
@@ -97,7 +107,8 @@ describe('LoginHandlerService', () => {
             mockTelemetryGeneratorService as TelemetryGeneratorService,
             mockRouter as Router,
             mockEvents as Events,
-            mockAppGlobalService as AppGlobalService
+            mockAppGlobalService as AppGlobalService,
+            mockSbProgressLoader as SbProgressLoader
         );
     });
 
@@ -115,7 +126,7 @@ describe('LoginHandlerService', () => {
     describe('signIn()', () => {
         it('should in-memory preference skipCoachScreenForDeeplink if limitedShareQuizContent', (done) => {
             // arrange
-            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
             const dismissFn = jest.fn(() => Promise.resolve());
             const presentFn = jest.fn(() => Promise.resolve());
             mockCommonUtilService.getLoader = jest.fn(() => ({
@@ -127,13 +138,18 @@ describe('LoginHandlerService', () => {
                 refresh_token: 'SOME_REFRESH_TOKEN',
                 userToken: 'SOME_USER_TOKEN'
             }));
+            mockNgZone.run = jest.fn((cb) => {
+                cb();
+            }) as any;
+            mockSbProgressLoader.show = jest.fn();
             jest.spyOn(mockAuthService, 'setSession').mockImplementation(() => of(undefined));
             mockSharedPreferences.getString = jest.fn(() => of('false'));
+            mockSharedPreferences.putString = jest.fn(() => of(undefined));
             jest.spyOn(loginHandlerService, 'setDefaultProfileDetails').mockImplementation(() => {
                 return Promise.resolve('profile');
             });
             jest.spyOn(loginHandlerService, 'refreshProfileData').mockImplementation(() => {
-                return Promise.resolve({ slug: 'SOME_SLUG', title: 'SOME_TITLE' });
+                return Promise.resolve({slug: 'SOME_SLUG', title: 'SOME_TITLE'});
             });
             jest.spyOn(loginHandlerService, 'refreshTenantData').mockImplementation(() => {
                 return Promise.resolve(undefined);
@@ -145,14 +161,14 @@ describe('LoginHandlerService', () => {
                 expect(dismissFn).toHaveBeenCalled();
                 expect(presentFn).toHaveBeenCalled();
                 expect(mockAuthService.setSession).toHaveBeenCalled();
-                expect(mockAppGlobalService.limitedShareQuizContent).toEqual("limit");
+                expect(mockAppGlobalService.limitedShareQuizContent).toEqual('limit');
                 done();
             });
         });
 
         it('should in-memory preference showCoachScreenForDeeplink if nolimitedShareQuizContent', (done) => {
             // arrange
-            mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
             const dismissFn = jest.fn(() => Promise.resolve());
             const presentFn = jest.fn(() => Promise.resolve());
             mockCommonUtilService.getLoader = jest.fn(() => ({
@@ -164,13 +180,17 @@ describe('LoginHandlerService', () => {
                 refresh_token: 'SOME_REFRESH_TOKEN',
                 userToken: 'SOME_USER_TOKEN'
             }));
+            mockNgZone.run = jest.fn((cb) => {
+                cb();
+            }) as any;
             jest.spyOn(mockAuthService, 'setSession').mockImplementation(() => of(undefined));
             mockSharedPreferences.getString = jest.fn(() => of('false'));
+            mockSharedPreferences.putString = jest.fn(() => of(undefined));
             jest.spyOn(loginHandlerService, 'setDefaultProfileDetails').mockImplementation(() => {
                 return Promise.resolve('profile');
             });
             jest.spyOn(loginHandlerService, 'refreshProfileData').mockImplementation(() => {
-                return Promise.resolve({ slug: 'SOME_SLUG', title: 'SOME_TITLE' });
+                return Promise.resolve({slug: 'SOME_SLUG', title: 'SOME_TITLE'});
             });
             jest.spyOn(loginHandlerService, 'refreshTenantData').mockImplementation(() => {
                 return Promise.resolve(undefined);
@@ -186,12 +206,200 @@ describe('LoginHandlerService', () => {
                 done();
             });
         });
+
+        it('should go to catch block if getWebviewSessionProviderConfig returns and error', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockFormAndFrameworkUtilService.getWebviewSessionProviderConfig = jest.fn(() => Promise.reject('error'));
+            mockSbProgressLoader.hide = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            loginHandlerService.signIn().then(() => {
+                // assert
+                expect(dismissFn).toHaveBeenCalled();
+                expect(presentFn).toHaveBeenCalled();
+                expect(mockFormAndFrameworkUtilService.getWebviewSessionProviderConfig).toHaveBeenCalledWith('login');
+                expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({id: 'login'});
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_WHILE_LOGIN');
+                done();
+            });
+        });
+
+        it('should call setSession and call sharedPreferences returns true after onboarding ' +
+            'checks for skipNavigation in parameter to redirect', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockFormAndFrameworkUtilService.getWebviewSessionProviderConfig = jest.fn(() => Promise.resolve({
+                access_token: 'SOME_ACCESS_TOKEN',
+                refresh_token: 'SOME_REFRESH_TOKEN',
+                userToken: 'SOME_USER_TOKEN'
+            }));
+            jest.spyOn(mockAuthService, 'setSession').mockImplementation(() => of(undefined));
+            mockSbProgressLoader.show = jest.fn();
+            mockSharedPreferences.getString = jest.fn(() => of('true'));
+            mockAuthService.getSession = jest.fn(() => of({
+                access_token: 'SOME_ACCESS_TOKEN',
+                refresh_token: 'SOME_REFRESH_TOKEN',
+                userToken: 'SOME_USER_TOKEN'
+            }));
+            const mockProfileData: Profile = {
+                uid: 'sample_id',
+                handle: 'sample_name',
+                profileType: ProfileType.TEACHER,
+                source: ProfileSource.SERVER,
+                profileUserType: {
+                    type: 'OTHER'
+                },
+                serverProfile: {
+                    uid: 'sample_id',
+                    handle: 'sample_name',
+                    profileType: ProfileType.TEACHER,
+                    source: ProfileSource.SERVER
+                },
+                rootOrg: {
+                    slug: 'sample_slug',
+                    orgName: 'sample_orgName'
+                }
+            };
+            const valuesMap = new Map();
+            valuesMap['UID'] = 'sample_id';
+            mockProfileService.getServerProfilesDetails = jest.fn(() => of(mockProfileData));
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockProfileService.getAllProfiles = jest.fn(() => of([]));
+            mockProfileService.createProfile = jest.fn(() => of(mockProfileData));
+            mockProfileService.setActiveSessionForProfile = jest.fn(() => of(true));
+            mockFormAndFrameworkUtilService.updateLoggedInUser = jest.fn(() => Promise.resolve({}));
+            mockProfileService.getTenantInfo = jest.fn(() => of({
+                title: 'sample_title',
+                logo: 'sample_logo',
+            }));
+            mockProfileService.isDefaultChannelProfile = jest.fn(() => of(true));
+            mockAppVersion.getAppName = jest.fn(() => Promise.resolve('sample_app_name'));
+            mockSharedPreferences.putString = jest.fn(() => of(undefined));
+            jest.spyOn(global.splashscreen, 'setContent').mockImplementation();
+            // act
+            loginHandlerService.signIn({redirectUrlAfterLogin: true, componentData: 'sample_data'});
+
+            setTimeout(() => {
+                // assert
+                expect(mockAuthService.getSession).toHaveBeenCalled();
+                expect(mockProfileService.getServerProfilesDetails).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalled();
+                expect(mockProfileService.createProfile).toHaveBeenCalled();
+                // expect(mockProfileService.setActiveSessionForProfile).toHaveBeenCalled();
+               // expect(mockFormAndFrameworkUtilService.updateLoggedInUser).toHaveBeenCalled();
+              //  expect(global.splashscreen.setContent).toHaveBeenCalled();
+                done();
+            });
+        });
+
+        it('should go to catch part if refresh profile data and profileData returns error', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockFormAndFrameworkUtilService.getWebviewSessionProviderConfig = jest.fn(() => Promise.resolve({
+                access_token: 'SOME_ACCESS_TOKEN',
+                refresh_token: 'SOME_REFRESH_TOKEN',
+                userToken: 'SOME_USER_TOKEN'
+            }));
+            const signInError = new SignInError('error');
+            jest.spyOn(mockAuthService, 'setSession').mockImplementation(() => throwError(signInError));
+            mockSbProgressLoader.hide = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            loginHandlerService.signIn();
+            setTimeout(() => {
+                // assert
+                expect(mockAuthService.setSession).toHaveBeenCalled();
+                expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({id: 'login'});
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith(signInError.message);
+                done();
+            }, 0);
+        });
+
+        it('should go to catch part if refresh profile data and profileData returns error other in signin error', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockFormAndFrameworkUtilService.getWebviewSessionProviderConfig = jest.fn(() => Promise.resolve({
+                access_token: 'SOME_ACCESS_TOKEN',
+                refresh_token: 'SOME_REFRESH_TOKEN',
+                userToken: 'SOME_USER_TOKEN'
+            }));
+            jest.spyOn(mockAuthService, 'setSession').mockImplementation(() => throwError());
+            mockSbProgressLoader.hide = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            loginHandlerService.signIn();
+            setTimeout(() => {
+                // assert
+                expect(mockAuthService.setSession).toHaveBeenCalled();
+                expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({id: 'login'});
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_WHILE_LOGIN');
+                done();
+            }, 0);
+        });
+
+        it('should go to catch block if getSession returns undefined', (done) => {
+            // arrange
+            mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            const dismissFn = jest.fn(() => Promise.resolve());
+            const presentFn = jest.fn(() => Promise.resolve());
+            mockCommonUtilService.getLoader = jest.fn(() => ({
+                present: presentFn,
+                dismiss: dismissFn,
+            }));
+            mockFormAndFrameworkUtilService.getWebviewSessionProviderConfig = jest.fn(() => Promise.resolve({
+                access_token: 'SOME_ACCESS_TOKEN',
+                refresh_token: 'SOME_REFRESH_TOKEN',
+                userToken: 'SOME_USER_TOKEN'
+            }));
+            jest.spyOn(mockAuthService, 'setSession').mockImplementation(() => of(undefined));
+            mockSbProgressLoader.show = jest.fn();
+            mockSharedPreferences.getString = jest.fn(() => of('true'));
+            mockAuthService.getSession = jest.fn(() => of(throwError('error')));
+            mockProfileService.getServerProfilesDetails = jest.fn(() => of());
+            mockSbProgressLoader.hide = jest.fn();
+            mockCommonUtilService.showToast = jest.fn();
+            // act
+            loginHandlerService.signIn();
+
+            setTimeout(() => {
+                expect(mockAuthService.getSession).toHaveBeenCalled();
+                expect(mockSbProgressLoader.hide).toHaveBeenCalledWith({id: 'login'});
+                expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('ERROR_WHILE_LOGIN');
+                done();
+            }, 0);
+        });
     });
 
     describe('getDefaultProfileRequest()', () => {
         it('should return profile', () => {
             // arrange
-            jest.spyOn(mockAppGlobalService, 'getCurrentUser').mockReturnValue({ uid: 'uid' });
+            jest.spyOn(mockAppGlobalService, 'getCurrentUser').mockReturnValue({uid: 'uid'});
             // act
             const response = loginHandlerService.getDefaultProfileRequest();
             // assert
@@ -212,10 +420,10 @@ describe('LoginHandlerService', () => {
     describe('setDefaultProfileDetails()', () => {
         it('should call publish and putString methods', (done) => {
             // arrange
-            jest.spyOn(loginHandlerService, 'getDefaultProfileRequest').mockReturnValue({ uid: 'uid' });
+            jest.spyOn(loginHandlerService, 'getDefaultProfileRequest').mockReturnValue({uid: 'uid'});
             jest.spyOn(mockProfileService, 'updateProfile').mockReturnValue(of({}));
             jest.spyOn(mockProfileService, 'setActiveSessionForProfile').mockReturnValue(of({}));
-            jest.spyOn(mockProfileService, 'getActiveSessionProfile').mockReturnValue(of(Promise.resolve({ uid: 'uid' })));
+            jest.spyOn(mockProfileService, 'getActiveSessionProfile').mockReturnValue(of(Promise.resolve({uid: 'uid'})));
             jest.spyOn(mockEvents, 'publish');
             jest.spyOn(mockSharedPreferences, 'putString');
 
@@ -230,10 +438,10 @@ describe('LoginHandlerService', () => {
 
         it('should call publish, not putString', (done) => {
             // arrange
-            jest.spyOn(loginHandlerService, 'getDefaultProfileRequest').mockReturnValue({ uid: 'uid' });
+            jest.spyOn(loginHandlerService, 'getDefaultProfileRequest').mockReturnValue({uid: 'uid'});
             jest.spyOn(mockProfileService, 'updateProfile').mockReturnValue(of({}));
             jest.spyOn(mockProfileService, 'setActiveSessionForProfile').mockReturnValue(of({}));
-            jest.spyOn(mockProfileService, 'getActiveSessionProfile').mockReturnValue(of({ uid: 'null' }));
+            jest.spyOn(mockProfileService, 'getActiveSessionProfile').mockReturnValue(of({uid: 'null'}));
             jest.spyOn(mockEvents, 'publish');
             jest.spyOn(mockSharedPreferences, 'putString');
 
diff --git a/src/services/login-handler.service.ts b/src/services/login-handler.service.ts
index f18df01a6..2dfac8851 100644
--- a/src/services/login-handler.service.ts
+++ b/src/services/login-handler.service.ts
@@ -1,5 +1,6 @@
 import { Inject, NgZone, Injectable } from '@angular/core';
-import { NavController, Events } from '@ionic/angular';
+import { NavController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { AppVersion } from '@ionic-native/app-version/ngx';
 import {
   ApiService,
@@ -18,7 +19,7 @@ import {
 } from 'sunbird-sdk';
 
 import { initTabs, LOGIN_TEACHER_TABS } from '@app/app/module.service';
-import { ProfileConstants, PreferenceKey, RouterLinks, EventTopics } from '@app/app/app.constant';
+import {ProfileConstants, PreferenceKey, RouterLinks, EventTopics, IgnoreTelemetryPatters} from '@app/app/app.constant';
 import { FormAndFrameworkUtilService } from '@app/services/formandframeworkutil.service';
 import { CommonUtilService } from '@app/services/common-util.service';
 import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
@@ -31,16 +32,11 @@ import {
 import { ContainerService } from '@app/services/container.services';
 import { Router } from '@angular/router';
 import { AppGlobalService } from './app-global-service.service';
+import {Context as SbProgressLoaderContext, SbProgressLoader} from '@app/services/sb-progress-loader.service';
 
 @Injectable()
 export class LoginHandlerService {
 
-//   appName = '';
-//   @Input() source = '';
-//   @Input() title = 'OVERLAY_LABEL_COMMON';
-//   @Input() description = 'OVERLAY_INFO_TEXT_COMMON';
-//   @Output() valueChange = new EventEmitter();
-
   constructor(
     @Inject('PROFILE_SERVICE') private profileService: ProfileService,
     @Inject('AUTH_SERVICE') private authService: AuthService,
@@ -56,7 +52,8 @@ export class LoginHandlerService {
     private telemetryGeneratorService: TelemetryGeneratorService,
     private router: Router,
     private events: Events,
-    private appGlobalService: AppGlobalService
+    private appGlobalService: AppGlobalService,
+    private sbProgressLoader: SbProgressLoader
   ) {
 
     this.appVersion.getAppName()
@@ -65,22 +62,13 @@ export class LoginHandlerService {
       });
   }
 
-  async signIn() {
+  async signIn(skipNavigation?) {
 
     if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
-    //   this.valueChange.emit(true);
     } else {
-    //   this.telemetryGeneratorService.generateInteractTelemetry(
-    //     InteractType.TOUCH,
-    //     InteractSubtype.SIGNIN_OVERLAY_CLICKED,
-    //     Environment.HOME,
-    //     this.source, null
-    //   );
-
       this.generateLoginInteractTelemetry(InteractType.TOUCH, InteractSubtype.LOGIN_INITIATE, '');
 
       const that = this;
-      const loader = await this.commonUtilService.getLoader();
       const webviewSessionProviderConfigloader = await this.commonUtilService.getLoader();
 
       let webviewLoginSessionProviderConfig: WebviewSessionProviderConfig;
@@ -92,6 +80,7 @@ export class LoginHandlerService {
         webviewMigrateSessionProviderConfig = await this.formAndFrameworkUtilService.getWebviewSessionProviderConfig('migrate');
         await webviewSessionProviderConfigloader.dismiss();
       } catch (e) {
+        this.sbProgressLoader.hide({id: 'login'});
         await webviewSessionProviderConfigloader.dismiss();
         this.commonUtilService.showToast('ERROR_WHILE_LOGIN');
         return;
@@ -105,10 +94,10 @@ export class LoginHandlerService {
       )
         .toPromise()
         .then(async () => {
-          await loader.present();
+          await this.sbProgressLoader.show(this.generateIgnoreTelemetryContext());
+          const selectedUserType = await this.preferences.getString(PreferenceKey.SELECTED_USER_TYPE).toPromise();
           // set default guest user for Quiz deeplink
-          const isOnboardingCompleted = (await this.preferences.getString(PreferenceKey.IS_ONBOARDING_COMPLETED).toPromise() === 'true')
-            ? true : false;
+          const isOnboardingCompleted = (await this.preferences.getString(PreferenceKey.IS_ONBOARDING_COMPLETED).toPromise() === 'true');
           if (!isOnboardingCompleted) {
             await this.setDefaultProfileDetails();
 
@@ -117,7 +106,10 @@ export class LoginHandlerService {
               this.appGlobalService.skipCoachScreenForDeeplink = true;
             }
           }
-
+          if (skipNavigation && skipNavigation.redirectUrlAfterLogin) {
+            this.appGlobalService.redirectUrlAfterLogin = skipNavigation.redirectUrlAfterLogin;
+          }
+          this.appGlobalService.preSignInData = (skipNavigation && skipNavigation.componentData) || null;
           initTabs(that.container, LOGIN_TEACHER_TABS);
           return that.refreshProfileData();
         })
@@ -125,33 +117,24 @@ export class LoginHandlerService {
           return that.refreshTenantData(value.slug, value.title);
         })
         .then(async () => {
-          await loader.dismiss();
-          if (!this.appGlobalService.signinOnboardingLoader) {
-            this.appGlobalService.signinOnboardingLoader = await this.commonUtilService.getLoader();
-            await this.appGlobalService.signinOnboardingLoader.present();
-          }
           that.ngZone.run(() => {
             that.preferences.putString('SHOW_WELCOME_TOAST', 'true').toPromise().then();
-            // this.events.publish('UPDATE_TABS');
-            // this.router.navigate([RouterLinks.TABS]);
-            // window.location.reload();
-            this.events.publish(EventTopics.SIGN_IN_RELOAD);
+            this.events.publish(EventTopics.SIGN_IN_RELOAD, skipNavigation);
+            this.sbProgressLoader.hide({id: 'login'});
           });
         })
         .catch(async (err) => {
-          console.error(err);
-
+          this.sbProgressLoader.hide({id: 'login'});
           if (err instanceof SignInError) {
             this.commonUtilService.showToast(err.message);
           } else {
             this.commonUtilService.showToast('ERROR_WHILE_LOGIN');
           }
-          return await loader.dismiss();
         });
     }
   }
 
-  refreshProfileData() {
+  private refreshProfileData() {
     const that = this;
 
     return new Promise<any>((resolve, reject) => {
@@ -163,18 +146,32 @@ export class LoginHandlerService {
               requiredFields: ProfileConstants.REQUIRED_FIELDS
             };
             that.profileService.getServerProfilesDetails(req).toPromise()
-              .then((success) => {
+              .then(async (success: any) => {
+                const selectedUserType = await this.preferences.getString(PreferenceKey.SELECTED_USER_TYPE).toPromise();
+                const currentProfileType = (() => {
+                  if (selectedUserType === ProfileType.ADMIN) {
+                    return selectedUserType;
+                  } else if (
+                    (success.profileUserType.type === ProfileType.OTHER.toUpperCase()) ||
+                    (!success.profileUserType.type)
+                  ) {
+                    return ProfileType.NONE;
+                  }
+
+                  return success.profileUserType.type.toLowerCase();
+                })();
                 that.generateLoginInteractTelemetry(InteractType.OTHER, InteractSubtype.LOGIN_SUCCESS, success.id);
                 const profile: Profile = {
                   uid: success.id,
                   handle: success.id,
-                  profileType: ProfileType.TEACHER,
+                  profileType: currentProfileType,
                   source: ProfileSource.SERVER,
                   serverProfile: success
                 };
                 this.profileService.createProfile(profile, ProfileSource.SERVER)
                   .toPromise()
-                  .then(() => {
+                  .then(async () => {
+                    await this.preferences.putString(PreferenceKey.SELECTED_USER_TYPE, currentProfileType).toPromise();
                     that.profileService.setActiveSessionForProfile(profile.uid).toPromise()
                       .then(() => {
                         that.formAndFrameworkUtilService.updateLoggedInUser(success, profile)
@@ -201,7 +198,7 @@ export class LoginHandlerService {
     });
   }
 
-  refreshTenantData(slug: string, title: string) {
+  private refreshTenantData(slug: string, title: string) {
     return new Promise((resolve, reject) => {
       this.profileService.getTenantInfo({ slug: '' }).toPromise()
         .then(async (res) => {
@@ -219,7 +216,7 @@ export class LoginHandlerService {
     });
   }
 
-  generateLoginInteractTelemetry(interactType, interactSubtype, uid) {
+  private generateLoginInteractTelemetry(interactType, interactSubtype, uid) {
     const valuesMap = new Map();
     valuesMap['UID'] = uid;
     this.telemetryGeneratorService.generateInteractTelemetry(
@@ -249,7 +246,7 @@ export class LoginHandlerService {
     });
   }
 
-  getDefaultProfileRequest() {
+  private getDefaultProfileRequest() {
     const profile = this.appGlobalService.getCurrentUser();
     const profileRequest: Profile = {
       uid: profile.uid,
@@ -264,4 +261,16 @@ export class LoginHandlerService {
     };
     return profileRequest;
   }
+
+  private generateIgnoreTelemetryContext(): SbProgressLoaderContext {
+    return {
+      id: 'login',
+      ignoreTelemetry: {
+        when: {
+          interact: IgnoreTelemetryPatters.IGNORE_SIGN_IN_PAGE_ID_EVENTS,
+          impression: IgnoreTelemetryPatters.IGNORE_CHANNEL_IMPRESSION_EVENTS
+        }
+      }
+    };
+  }
 }
diff --git a/src/services/navigation-handler.service.spec.ts b/src/services/navigation-handler.service.spec.ts
new file mode 100644
index 000000000..41bc51fe3
--- /dev/null
+++ b/src/services/navigation-handler.service.spec.ts
@@ -0,0 +1,204 @@
+import { NavigationService } from './navigation-handler.service';
+import { RouterLinks } from '@app/app/app.constant';
+import { Router } from '@angular/router';
+import { CommonUtilService, TelemetryGeneratorService } from '@app/services';
+import { Environment, InteractSubtype, InteractType, PageId } from './telemetry-constants';
+import { mockProfileData } from '../app/profile/profile.page.spec.data';
+
+describe('NavigationService', () => {
+  let navigationService: NavigationService;
+
+  const mockRouter: Partial<Router> = {
+    navigate: jest.fn()
+  };
+
+  const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+  const mockCommonUtilService: Partial<CommonUtilService> = {};
+
+  beforeAll(() => {
+    navigationService = new NavigationService(
+      mockRouter as Router,
+      mockTelemetryGeneratorService as TelemetryGeneratorService,
+      mockCommonUtilService as CommonUtilService,
+    );
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should create an instance of NavigationService', () => {
+    expect(navigationService).toBeTruthy();
+  });
+
+  describe('navigateToDetailPage', () => {
+
+    it('should navigate to enrolled course detail page', () => {
+      // arrange
+      const content = {
+        trackable: {
+          enabled: 'Yes'
+        },
+        primaryCategory: 'Course'
+      };
+      // act
+      navigationService.navigateToDetailPage(content, {});
+      // assert
+      expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.ENROLLED_COURSE_DETAILS], {
+        state: {}
+      });
+    });
+
+    it('should navigate to collection detail page', () => {
+      // arrange
+      const content = {
+        trackable: {
+          enabled: 'No'
+        },
+        primaryCategory: 'Course',
+        mimeType: 'application/vnd.ekstep.content-collection'
+      };
+      // act
+      navigationService.navigateToDetailPage(content, {});
+      // assert
+      expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.COLLECTION_DETAIL_ETB], {
+        state: {}
+      });
+    });
+
+    it('should navigate to content detail page', () => {
+      // arrange
+      const content = {
+        contentData: {
+          trackable: {
+            enabled: 'No'
+          },
+          primaryCategory: 'Resource',
+          mimeType: 'application/pdf'
+        }
+      };
+      // act
+      navigationService.navigateToDetailPage(content, {});
+      // assert
+      expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.CONTENT_DETAILS], {
+        state: {}
+      });
+    });
+
+    it('should navigate to enrolled course detail page if trackable object is not available', () => {
+      // arrange
+      const content = {
+        contentType: 'Course'
+      };
+      // act
+      navigationService.navigateToDetailPage(content, {});
+      // assert
+      expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.ENROLLED_COURSE_DETAILS], {
+        state: {}
+      });
+    });
+
+    it('should navigate to collection detail page if trackable object is not available', () => {
+      // arrange
+      const content = {
+        contentType: 'Collection',
+        mimeType: 'application/vnd.ekstep.content-collection'
+      };
+      // act
+      navigationService.navigateToDetailPage(content, {});
+      // assert
+      expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.COLLECTION_DETAIL_ETB], {
+        state: {}
+      });
+    });
+
+    it('should navigate to content detail page if trackable object is not available', () => {
+      // arrange
+      const content = {
+        contentData: {
+          trackable: {
+          },
+          contentType: 'Resource',
+          mimeType: 'application/pdf'
+        }
+      };
+      // act
+      navigationService.navigateToDetailPage(content, {});
+      // assert
+      expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.CONTENT_DETAILS], {
+        state: {}
+      });
+    });
+
+    it('should navigate to content detail page if trackable object is not available', () => {
+      // arrange
+      // act
+      navigationService.navigateTo([RouterLinks.CONTENT_DETAILS], {});
+      // assert
+      expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.CONTENT_DETAILS], {
+        state: {}
+      });
+    });
+  });
+
+  describe('navigateToEditPersonalDetails  test-suites', () => {
+    it('should generate telemetry and navigate to district mapping if network is available', () => {
+        // arrange
+        mockCommonUtilService.networkInfo = {isNetworkAvailable: true};
+        mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+        mockRouter.navigate = jest.fn();
+        // act
+        navigationService.navigateToEditPersonalDetails(mockProfileData, 'some-page-id');
+        // assert
+        expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeTruthy();
+        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+            InteractType.TOUCH,
+            InteractSubtype.EDIT_CLICKED,
+            Environment.HOME,
+            'some-page-id', null
+        );
+        expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.DISTRICT_MAPPING],
+            {
+                state: {
+                    profile: mockProfileData,
+                    isShowBackButton: true,
+                    source: 'some-page-id'
+                }
+            });
+    });
+
+    it('should call showToast when network is not available', () => {
+        // arrange
+        mockCommonUtilService.networkInfo = {isNetworkAvailable: false};
+        mockCommonUtilService.showToast = jest.fn();
+        // act
+        navigationService.navigateToEditPersonalDetails(undefined, 'some-page-id');
+        // assert
+        expect(mockCommonUtilService.networkInfo.isNetworkAvailable).toBeFalsy();
+        expect(mockCommonUtilService.showToast).toHaveBeenCalledWith('NEED_INTERNET_TO_CHANGE');
+    });
+  });
+
+  describe('setNavigationUrl', () => {
+    it('should set navigation url', () => {
+      // arrange
+      const previousUrl = 'some-url';
+      // act
+      navigationService.setNavigationUrl(previousUrl);
+      // assert
+      expect(navigationService.previousNavigationUrl).toEqual(previousUrl)
+    })
+  })
+
+  describe('navigateToLastUrl', () => {
+    it('should redirect to navigation url', () => {
+      // arrange
+      navigationService.previousNavigationUrl = 'some-url';
+      // act
+      navigationService.navigateToLastUrl();
+      // assert
+      expect(mockRouter.navigate).toHaveBeenCalled();
+    })
+  })
+
+});
diff --git a/src/services/navigation-handler.service.ts b/src/services/navigation-handler.service.ts
new file mode 100644
index 000000000..a5e5f26f8
--- /dev/null
+++ b/src/services/navigation-handler.service.ts
@@ -0,0 +1,101 @@
+import { Injectable } from '@angular/core';
+import { NavigationExtras, Router } from '@angular/router';
+import { RouterLinks, MimeType } from '@app/app/app.constant';
+import { TrackingEnabled } from '@project-sunbird/client-services/models';
+import { CsContentType } from '@project-sunbird/client-services/services/content';
+import { CommonUtilService } from './common-util.service';
+import { Environment, InteractSubtype, InteractType } from './telemetry-constants';
+import { TelemetryGeneratorService } from './telemetry-generator.service';
+@Injectable()
+export class NavigationService {
+
+    previousNavigationUrl;
+
+    constructor(
+        private router: Router,
+        private telemetryGeneratorService: TelemetryGeneratorService,
+        private commonUtilService: CommonUtilService
+    ) { }
+
+    navigateToDetailPage(content, navExtras) {
+        content = !content.trackable ? ((content.contentData && content.contentData.trackable) ? content.contentData : content) : content;
+        if (content.trackable && content.trackable.enabled) {
+            if (content.trackable.enabled === TrackingEnabled.YES) {
+                // Trackable
+                this.navigateToTrackableCollection(navExtras);
+            } else if (content.mimeType === MimeType.COLLECTION) {
+                // Collection
+                this.navigateToCollection(navExtras);
+            } else {
+                // Content
+                this.navigateToContent(navExtras);
+            }
+        } else {
+            // for backward compatibility, remove once not requried
+            if (content.contentType.toLowerCase() === CsContentType.COURSE.toLowerCase()) {
+                // Trackable
+                this.navigateToTrackableCollection(navExtras);
+            } else if (content.mimeType === MimeType.COLLECTION) {
+                // Collection
+                this.navigateToCollection(navExtras);
+            } else {
+                // Content
+                this.navigateToContent(navExtras);
+            }
+        }
+    }
+
+    navigateToTrackableCollection(navExtras) {
+        this.router.navigate([RouterLinks.ENROLLED_COURSE_DETAILS], {
+            state: navExtras
+        });
+    }
+
+    navigateToCollection(navExtras) {
+        this.router.navigate([RouterLinks.COLLECTION_DETAIL_ETB], {
+            state: navExtras
+        });
+    }
+
+    navigateToContent(navExtras) {
+        this.router.navigate([RouterLinks.CONTENT_DETAILS], {
+            state: navExtras
+        });
+    }
+
+    navigateTo(path, navExtras) {
+        this.router.navigate(path, {
+            state: navExtras
+        });
+    }
+
+    navigateToEditPersonalDetails(profile, pageId) {
+        if (this.commonUtilService.networkInfo.isNetworkAvailable) {
+            this.telemetryGeneratorService.generateInteractTelemetry(
+                InteractType.TOUCH,
+                InteractSubtype.EDIT_CLICKED,
+                Environment.HOME,
+                pageId, null);
+
+            const navigationExtras: NavigationExtras = {
+                state: {
+                    profile,
+                    isShowBackButton: true,
+                    source: pageId
+                }
+            };
+            this.router.navigate([RouterLinks.DISTRICT_MAPPING], navigationExtras);
+        } else {
+            this.commonUtilService.showToast('NEED_INTERNET_TO_CHANGE');
+        }
+    }
+
+    setNavigationUrl(navigationUrl: string) {
+        this.previousNavigationUrl = navigationUrl;
+    }
+
+    navigateToLastUrl(){
+        this.router.navigate([this.previousNavigationUrl]);
+    }
+
+}
diff --git a/src/services/notification.service.spec.ts b/src/services/notification.service.spec.ts
index f885b11cb..efb36b802 100644
--- a/src/services/notification.service.spec.ts
+++ b/src/services/notification.service.spec.ts
@@ -3,21 +3,35 @@ import { UtilityService } from './utility-service';
 import { AppVersion } from '@ionic-native/app-version/ngx';
 import { LocalNotifications } from '@ionic-native/local-notifications/ngx';
 import { SplaschreenDeeplinkActionHandlerDelegate } from './sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate';
+import { FormAndFrameworkUtilService } from './formandframeworkutil.service';
+import { TelemetryService } from '@project-sunbird/sunbird-sdk';
+import { Events } from '@app/util/events';
 
 describe('LocalCourseService', () => {
   let notificationService: NotificationService;
-
+  const mockTelemetryService: Partial<TelemetryService> = {
+    updateCampaignParameters: jest.fn()
+  };
   const mockUtilityService: Partial<UtilityService> = {};
-  const mockAppVersion: Partial<AppVersion> = {};
+  const mockFormnFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {};
+  const mockAppVersion: Partial<AppVersion> = {
+    getAppName: jest.fn(() => Promise.resolve('sunbird'))
+  };
   const mockLocalNotifications: Partial<LocalNotifications> = {};
   const mockSplaschreenDeeplinkActionHandlerDelegate: Partial<SplaschreenDeeplinkActionHandlerDelegate> = {};
+  const mockEvents: Partial<Events> = {
+    publish: jest.fn()
+  };
 
   beforeAll(() => {
     notificationService = new NotificationService(
+      mockTelemetryService as TelemetryService,
       mockUtilityService as UtilityService,
+      mockFormnFrameworkUtilService as FormAndFrameworkUtilService,
       mockAppVersion as AppVersion,
       mockLocalNotifications as LocalNotifications,
       mockSplaschreenDeeplinkActionHandlerDelegate as SplaschreenDeeplinkActionHandlerDelegate,
+      mockEvents as Events
     );
   });
 
@@ -29,12 +43,95 @@ describe('LocalCourseService', () => {
     expect(notificationService).toBeTruthy();
   });
 
-  describe('setNotificationDetails', () => {
+  describe('setupLocalNotification', () => {
+    it('should disabled localNotification', (done) => {
+      // arrange
+      const language = 'en';
+      mockLocalNotifications.cancelAll = jest.fn(() => Promise.resolve({}));
+      mockFormnFrameworkUtilService.getNotificationFormConfig = jest.fn(() => Promise.resolve([{
+        code: 'localNotification',
+        config: [{
+          isEnabled: false,
+          id: 1
+        }]
+      }]));
+      mockLocalNotifications.getScheduledIds = jest.fn(() => Promise.resolve([1, 2, 3]));
+      mockLocalNotifications.cancel = jest.fn(() => Promise.resolve({id: 1}));
+      // act
+      notificationService.setupLocalNotification(language);
+      // assert
+      setTimeout(() => {
+        expect(mockLocalNotifications.cancelAll).toHaveBeenCalled();
+        expect(mockFormnFrameworkUtilService.getNotificationFormConfig).toHaveBeenCalled();
+        expect(mockLocalNotifications.getScheduledIds).toHaveBeenCalled();
+        expect(mockLocalNotifications.cancel).toHaveBeenCalledWith(1);
+        done();
+      }, 0);
+    });
+
+    it('should invoked setLocalNotification() for ids', (done) => {
+      // arrange
+      const language = 'en';
+      mockLocalNotifications.cancelAll = jest.fn(() => Promise.resolve({}));
+      mockFormnFrameworkUtilService.getNotificationFormConfig = jest.fn(() => Promise.resolve([{
+        code: 'localNotification',
+        config: [{
+          isEnabled: true,
+          id: 2,
+          title: JSON.stringify('hindi'),
+          msg: JSON.stringify('hindi'),
+          start: 'sample start'
+        }]
+      }]));
+      mockLocalNotifications.getScheduledIds = jest.fn(() => Promise.resolve([3]));
+      mockLocalNotifications.schedule = jest.fn();
+      // act
+      notificationService.setupLocalNotification(language);
+      // assert
+      setTimeout(() => {
+        expect(mockLocalNotifications.cancelAll).toHaveBeenCalled();
+        expect(mockFormnFrameworkUtilService.getNotificationFormConfig).toHaveBeenCalled();
+        expect(mockLocalNotifications.getScheduledIds).toHaveBeenCalled();
+        expect(mockLocalNotifications.schedule).toHaveBeenCalled();
+        done();
+      }, 0);
+    });
+
+    it('should invoked setLocalNotification() for ids is empty', (done) => {
+      // arrange
+      const language = 'en';
+      mockLocalNotifications.cancelAll = jest.fn(() => Promise.resolve({}));
+      mockFormnFrameworkUtilService.getNotificationFormConfig = jest.fn(() => Promise.resolve([{
+        code: 'localNotification',
+        config: [{
+          isEnabled: true,
+          id: 2,
+          title: JSON.stringify('hindi'),
+          msg: JSON.stringify('hindi'),
+          start: 'dd/mm/yy 19:42:28 GMT+0530'
+        }]
+      }]));
+      mockLocalNotifications.getScheduledIds = jest.fn(() => Promise.resolve([]));
+      mockLocalNotifications.schedule = jest.fn();
+      // act
+      notificationService.setupLocalNotification(language);
+      // assert
+      setTimeout(() => {
+        expect(mockLocalNotifications.cancelAll).toHaveBeenCalled();
+        expect(mockFormnFrameworkUtilService.getNotificationFormConfig).toHaveBeenCalled();
+        expect(mockLocalNotifications.getScheduledIds).toHaveBeenCalled();
+        expect(mockLocalNotifications.schedule).toHaveBeenCalled();
+        done();
+      }, 0);
+    });
+  });
+
+  describe('setNotificationParams', () => {
     it('should set the External Url when notification type is ExternalId', (done) => {
       // arrange
       const data = { actionData: { actionType: 'extURL', deepLink: 'someLink' } };
       // act
-      notificationService.setNotificationDetails(data);
+      notificationService.setNotificationParams(data);
       // asset
       done();
     });
@@ -44,7 +141,7 @@ describe('LocalCourseService', () => {
       const data = { actionData: { actionType: 'updateApp' } };
       mockUtilityService.getBuildConfigValue = jest.fn(() => Promise.resolve('app_id'));
       // act
-      notificationService.setNotificationDetails(data);
+      notificationService.setNotificationParams(data);
       // asset
       done();
     });
@@ -53,7 +150,7 @@ describe('LocalCourseService', () => {
       // arrange
       const data = { actionData: { actionType: 'courseUpdate', identifier: 'courseId' } };
       // act
-      notificationService.setNotificationDetails(data);
+      notificationService.setNotificationParams(data);
       // asset
       done();
     });
@@ -62,7 +159,7 @@ describe('LocalCourseService', () => {
       // arrange
       const data = { actionData: { actionType: 'contentUpdate', identifier: 'contentId' } };
       // act
-      notificationService.setNotificationDetails(data);
+      notificationService.setNotificationParams(data);
       // asset
       done();
     });
@@ -71,7 +168,7 @@ describe('LocalCourseService', () => {
       // arrange
       const data = { actionData: { actionType: 'bookUpdate', identifier: 'bookId' } };
       // act
-      notificationService.setNotificationDetails(data);
+      notificationService.setNotificationParams(data);
       // asset
       done();
     });
@@ -83,7 +180,7 @@ describe('LocalCourseService', () => {
       const data = { actionData: { actionType: 'contentUpdate', identifier: 'contentId' } };
       mockSplaschreenDeeplinkActionHandlerDelegate.navigateContent = jest.fn();
       // act
-      notificationService.setNotificationDetails(data);
+      notificationService.setNotificationParams(data);
       notificationService.handleNotification();
       // assert
       expect(mockSplaschreenDeeplinkActionHandlerDelegate.navigateContent).toHaveBeenCalled();
@@ -94,7 +191,7 @@ describe('LocalCourseService', () => {
       const data = { actionData: { actionType: 'updateApp' } };
       mockUtilityService.openPlayStore = jest.fn(() => Promise.resolve(undefined));
       // act
-      notificationService.setNotificationDetails(data);
+      notificationService.setNotificationParams(data);
       notificationService.handleNotification();
       // assert
       expect(mockUtilityService.openPlayStore).toHaveBeenCalled();
@@ -105,7 +202,7 @@ describe('LocalCourseService', () => {
       const data = { actionData: { actionType: 'extURL', deepLink: 'someLink' } };
       spyOn(window, 'open').and.stub();
       // act
-      notificationService.setNotificationDetails(data);
+      notificationService.setNotificationParams(data);
       notificationService.handleNotification();
       // assert
       expect(window.open).toHaveBeenCalledWith('someLink');
diff --git a/src/services/notification.service.ts b/src/services/notification.service.ts
index ba0c1a1ae..7af01a584 100644
--- a/src/services/notification.service.ts
+++ b/src/services/notification.service.ts
@@ -1,9 +1,13 @@
-import { Injectable, Inject } from '@angular/core';
+import { Inject, Injectable } from '@angular/core';
 import { AppVersion } from '@ionic-native/app-version/ngx';
 import { LocalNotifications } from '@ionic-native/local-notifications/ngx';
 import { UtilityService } from './utility-service';
 import { ActionType } from '@app/app/app.constant';
 import { SplaschreenDeeplinkActionHandlerDelegate } from './sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate';
+import { CorReleationDataType } from '.';
+import { FormAndFrameworkUtilService } from './formandframeworkutil.service';
+import { CorrelationData, TelemetryService } from '@project-sunbird/sunbird-sdk';
+import { Events } from '@app/util/events';
 
 declare const cordova;
 
@@ -11,38 +15,82 @@ declare const cordova;
 export class NotificationService {
 
     private selectedLanguage: string;
-    configData: any;
+    private configData: any;
     private appName: any;
     private identifier: any;
     private externalUrl: any;
     private appId: any;
+    private _notificationId: string;
+    private contentUrl: string;
+    private _notificationPaylod: any;
 
     constructor(
+        @Inject('TELEMETRY_SERVICE') private telemetryService: TelemetryService,
         private utilityService: UtilityService,
+        private formnFrameworkUtilService: FormAndFrameworkUtilService,
         private appVersion: AppVersion,
         private localNotifications: LocalNotifications,
-        private splaschreenDeeplinkActionHandlerDelegate: SplaschreenDeeplinkActionHandlerDelegate
+        private splaschreenDeeplinkActionHandlerDelegate: SplaschreenDeeplinkActionHandlerDelegate,
+        private event: Events
     ) {
         this.getAppName();
     }
 
-    setupLocalNotification(language?: string): any {
+    get notificationId(): string {
+        return this._notificationId;
+    }
+
+    set notificationId(id) {
+        this._notificationId = id;
+    }
+    
+    get notificationPayload() {
+      return this._notificationPaylod;
+    }
+
+    set notificationPayload(payload) {
+      this._notificationPaylod = payload;
+    }
+
+    setupLocalNotification(language?: string, payLoad?: any): any {
         if (language) {
             this.selectedLanguage = language;
             this.localNotifications.cancelAll();
         }
-        this.utilityService.readFileFromAssets('www/assets/data/local_notofocation_config.json').then(data => {
-            this.configData = JSON.parse(data);
-            this.localNotifications.getScheduledIds().then((val) => {
-                if (this.configData.id !== val[val.length - 1]) {
-                    this.setLocalNotification();
-                }
+        if (payLoad) {
+            this.setTrigerConfig(payLoad);
+        } else {
+            this.formnFrameworkUtilService.getNotificationFormConfig().then(fields => {
+            this.setTrigerConfig(fields);
+            });
+        }
+    }
+
+    setTrigerConfig(fields) {
+        if (fields && fields.length) {
+            this.configData = (fields.find(field => field.code === 'localNotification')).config;
+            this.configData.forEach(element => {
+                this.localNotifications.getScheduledIds().then((ids) => {
+                    if (ids.length) {
+                        if (!element.isEnabled && ids.findIndex(ele => ele === element.id) !== -1) {
+                            this.localNotifications.cancel(element.id).then(resp => {
+                                console.log('Local Notification Disabled for:' + element.id, resp);
+                            });
+                        } else if (element.isEnabled && ids.findIndex(ele => ele === element.id) === -1) {
+                            this.setLocalNotification(element);
+                        }
+                    } else {
+                        if (element.isEnabled) {
+                            this.setLocalNotification(element);
+                        }
+                    }
+                });
             });
-        });
+        }
     }
 
-    private triggerConfig() {
-        let tempDate = this.configData.data.start;
+    private triggerConfig(triggerConfig) {
+        let tempDate = triggerConfig.start;
         tempDate = tempDate.split(' ');
         const hour = +tempDate[1].split(':')[0];
         const minute = +tempDate[1].split(':')[1];
@@ -55,63 +103,97 @@ export class NotificationService {
                 minute: '',
                 hour: ''
             };
-            if (!isNaN(+this.configData.data.interval) && typeof (+this.configData.data.interval) === 'number') {
-                every.day = +this.configData.data.interval;
-            } else if (typeof (this.configData.data.interval) === 'string') {
-                every[this.configData.data.interval] = +tempDate[0];
+            if (!isNaN(+triggerConfig.interval) && typeof (+triggerConfig.interval) === 'number') {
+                every.day = +triggerConfig.interval;
+            } else if (typeof (triggerConfig.interval) === 'string') {
+                every[triggerConfig.interval] = +tempDate[0];
             }
             every.hour = hour;
             every.minute = minute;
             trigger.every = every;
         } else if (tempDate.length === 3) {
-            trigger.firstAt = new Date(this.configData.data.start);
-            trigger.every = this.configData.data.interval;
-            if (this.configData.data.occurance) {
-                trigger.count = this.configData.data.occurance;
+            trigger.firstAt = new Date(triggerConfig.start);
+            trigger.every = triggerConfig.interval;
+            if (triggerConfig.occurance) {
+                trigger.count = triggerConfig.occurance;
             }
         }
         return trigger;
     }
 
-    private setLocalNotification() {
-        const trigger = this.triggerConfig();
-        const translate = this.configData.data.translations[this.selectedLanguage] || this.configData.data.translations['default'];
-        this.localNotifications.schedule({
-            id: this.configData.id,
-            title: translate.title.replace('{{%s}}', this.appName),
-            text: translate.msg.replace('{{%s}}', this.appName),
-            icon: 'res://icon',
-            smallIcon: 'res://n_icon',
-            trigger
-        });
+    private setLocalNotification(triggerConfig) {
+        try {
+            let title;
+            let message;
+            try {
+                title = JSON.parse(triggerConfig.title);
+                message = JSON.parse(triggerConfig.msg);
+            } catch (e) {
+                title = triggerConfig.title;
+                message = triggerConfig.msg;
+                console.log('Not a JSON valid string');
+            }
+            if (triggerConfig.start) {
+                const trigger = this.triggerConfig(triggerConfig);
+                this.localNotifications.schedule({
+                    id: triggerConfig.id,
+                    title: title[this.selectedLanguage] || title['en'],
+                    text:  message[this.selectedLanguage] || message['en'],
+                    icon: 'res://icon',
+                    smallIcon: 'res://n_icon',
+                    trigger
+                });
+            } else {
+                this.localNotifications.schedule({
+                    id: triggerConfig.id,
+                    title: triggerConfig.title,
+                    text: triggerConfig.msg,
+                    foreground: true
+                });
+            }
+        } catch (e) {
+            console.log('Error', e);
+        }
     }
 
     private async getAppName() {
         this.appName = await this.appVersion.getAppName();
     }
 
-    setNotificationDetails(data) {
-        switch (data.actionData.actionType) {
+    setNotificationParams(data) {
+        this.notificationPayload = data;
+        switch (this.notificationPayload.actionData.actionType) {
             case ActionType.EXT_URL:
                 this.externalUrl = data.actionData.deepLink;
                 break;
             case ActionType.UPDATE_APP:
                 this.utilityService.getBuildConfigValue('APPLICATION_ID')
-                .then(value => {
-                    this.appId = value;
-                });
+                    .then(value => {
+                        this.appId = value;
+                    });
                 break;
             case ActionType.COURSE_UPDATE:
             case ActionType.CONTENT_UPDATE:
             case ActionType.BOOK_UPDATE:
                 this.identifier = data.actionData.identifier;
                 break;
+            case ActionType.CONTENT_URL:
+                this.contentUrl = data.actionData.contentURL;
+                this.telemetryService.updateCampaignParameters([{ type: CorReleationDataType.NOTIFICATION_ID, id: this.notificationId }] as Array<CorrelationData>);
+                break;
         }
     }
 
     async handleNotification() {
+        let corRelationList: Array<CorrelationData> = [];
+        if (this.notificationId) {
+            corRelationList.push({
+                id: this.notificationId,
+                type: CorReleationDataType.NOTIFICATION_ID
+            });
+        }
         if (this.identifier) {
-            this.splaschreenDeeplinkActionHandlerDelegate.navigateContent(this.identifier);
+            this.splaschreenDeeplinkActionHandlerDelegate.navigateContent(this.identifier, false, null, null, null, corRelationList);
             this.identifier = null;
         } else if (this.appId) {
             await this.utilityService.openPlayStore(this.appId);
@@ -119,7 +201,13 @@ export class NotificationService {
         } else if (this.externalUrl) {
             open(this.externalUrl);
             this.externalUrl = null;
+        } else if (this.contentUrl) {
+            this.splaschreenDeeplinkActionHandlerDelegate.onAction({ url: this.contentUrl }, this);
+            this.contentUrl = null;
+        } else if (this.notificationPayload && this.notificationPayload.actionData.actionType === ActionType.CERTIFICATE) {
+            this.event.publish('to_profile');
         }
+        this.notificationId = undefined;
     }
 
 
diff --git a/src/services/print-pdf/print-pdf.service.spec.ts b/src/services/print-pdf/print-pdf.service.spec.ts
new file mode 100644
index 000000000..e4b7ca996
--- /dev/null
+++ b/src/services/print-pdf/print-pdf.service.spec.ts
@@ -0,0 +1,66 @@
+import { TestBed } from '@angular/core/testing';
+import { CommonUtilService } from '../common-util.service';
+
+import { PrintPdfService } from './print-pdf.service';
+import { FileTransfer, FileTransferObject } from '@ionic-native/file-transfer/ngx';
+
+
+describe('PrintPdfService', () => {
+  let printPdfService: PrintPdfService;
+  const mockCommonUtilService: Partial<CommonUtilService> = {};
+  const mockTransfer: Partial<FileTransfer> = {};
+
+  beforeAll(() => {
+    printPdfService = new PrintPdfService(
+      mockCommonUtilService as CommonUtilService,
+      mockTransfer as FileTransfer
+    );
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.resetAllMocks();
+  });
+
+
+  it('should be created', () => {
+    expect(printPdfService).toBeTruthy();
+  });
+
+  it('should print pdf', (done) => {
+    // arrange
+    //    const content: Partial<Content> = {
+    //     contentData: {
+    //         itemSetPreviewUrl: 'http://some_domain.com/som_path.some_extension'
+    //     }
+    // };
+    const url = 'downloadUrl';
+    const mockPresent = jest.fn(() => Promise.resolve());
+    const mockDismiss = jest.fn(() => Promise.resolve());
+    const mockDownload = jest.fn(() => Promise.resolve({
+      toURL: () => 'SOME_TEMP_URL'
+    }));
+    mockCommonUtilService.getLoader = jest.fn(() => {
+      return Promise.resolve({
+        present: mockPresent,
+        dismiss: mockDismiss
+      });
+    });
+    mockCommonUtilService.showToast = jest.fn(() => { });
+    mockTransfer.create = jest.fn(() => ({ 
+      // // return {
+        download: mockDownload
+      // };
+    })) as any;
+    window.cordova.plugins.printer.canPrintItem = jest.fn((_, cb) => { cb(true); });
+    window.cordova.plugins.printer.print = jest.fn();
+    // act
+    printPdfService.printPdf(url);
+    setTimeout(() => {
+      expect(mockTransfer.create).toHaveBeenCalled();
+      // expect(mockDownload).toHaveBeenCalledWith(content.contentData.itemSetPreviewUrl, expect.any(String));
+      expect(window.cordova.plugins.printer.print).toHaveBeenCalledWith('SOME_TEMP_URL');
+      done()
+    }, 0)
+  })
+});
diff --git a/src/services/print-pdf/print-pdf.service.ts b/src/services/print-pdf/print-pdf.service.ts
new file mode 100644
index 000000000..e0876ffdf
--- /dev/null
+++ b/src/services/print-pdf/print-pdf.service.ts
@@ -0,0 +1,44 @@
+import { Injectable } from '@angular/core';
+import { FileTransfer, FileTransferObject } from '@ionic-native/file-transfer/ngx';
+import { Content } from 'sunbird-sdk';
+import { CommonUtilService } from '../common-util.service';
+import { Components } from '@ionic/core/dist/types/components';
+import { ContentUtil } from '@app/util/content-util';
+
+declare const window;
+@Injectable({
+  providedIn: 'root'
+})
+export class PrintPdfService {
+  fileTransfer: FileTransferObject;
+
+
+  constructor(
+    private commonUtilService: CommonUtilService,
+    private transfer: FileTransfer,
+  ) { }
+
+  async printPdf(url) {
+    const loader: Components.IonLoading = await this.commonUtilService.getLoader();
+    await loader.present();
+    try {
+      this.fileTransfer = this.transfer.create();
+      const entry = await this.fileTransfer
+        .download(url, cordova.file.cacheDirectory + url.substring(url.lastIndexOf('/') + 1));
+      url = entry.toURL();
+
+      window.cordova.plugins.printer.canPrintItem(url, (canPrint: boolean) => {
+        console.log(url);
+        if (canPrint) {
+          window.cordova.plugins.printer.print(url);
+        } else {
+          this.commonUtilService.showToast('ERROR_COULD_NOT_OPEN_FILE');
+        }
+      });
+    } catch (e) {
+      this.commonUtilService.showToast('ERROR_COULD_NOT_OPEN_FILE');
+    } finally {
+      await loader.dismiss();
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/services/profile-handler.spec.data.ts b/src/services/profile-handler.spec.data.ts
new file mode 100644
index 000000000..de7dd9cbe
--- /dev/null
+++ b/src/services/profile-handler.spec.data.ts
@@ -0,0 +1,60 @@
+export const mockSupportedUserTypeConfig = [
+   {
+       code: 'student',
+       name: 'Student',
+       searchFilter: [
+           'Student',
+           'Learner'
+       ],
+       ambiguousFilters: [
+        'learner',
+        'student'
+      ],
+       attributes: {
+           mandatory: [
+               'board',
+               'medium',
+               'gradeLevel'
+           ],
+           optional: [
+               'subject'
+           ]
+       }
+   },
+   {
+       code: 'teacher',
+       name: 'Teacher',
+       searchFilter: [
+           'Teacher',
+           'Instructor'
+       ],
+       ambiguousFilters: [
+        'teacher',
+        'instructor'
+      ],
+       attributes: {
+           mandatory: [
+               'board',
+               'medium',
+               'gradeLevel'
+           ],
+           optional: [
+               'subject'
+           ]
+       }
+   },
+   {
+       code: 'administrator',
+       name: 'Admin',
+       searchFilter: [
+           'Administrator'
+       ],
+       ambiguousFilters: [],
+       attributes: {
+           mandatory: [
+               'board'
+           ],
+           optional: []
+       }
+   }
+];
diff --git a/src/services/profile-handler.spec.ts b/src/services/profile-handler.spec.ts
new file mode 100644
index 000000000..db46e168c
--- /dev/null
+++ b/src/services/profile-handler.spec.ts
@@ -0,0 +1,111 @@
+import { ProfileHandler } from './profile-handler';
+import { FormAndFrameworkUtilService } from './formandframeworkutil.service';
+import { of } from 'rxjs';
+import { SharedPreferences } from '@project-sunbird/sunbird-sdk';
+import { PreferenceKey } from '@app/app/app.constant';
+import { mockSupportedUserTypeConfig } from './profile-handler.spec.data';
+import { CommonUtilService } from './common-util.service';
+
+describe('ProfileHandler', () => {
+    let profileHandler: ProfileHandler;
+
+    const mockSharedPreference: Partial<SharedPreferences> = {
+        getString: jest.fn(() => of('student'))
+    };
+    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {
+        getFormFields: jest.fn(() => Promise.resolve(mockSupportedUserTypeConfig))
+    };
+
+    const mockCommonUtilService: Partial<CommonUtilService> = {
+        getTranslatedValue: jest.fn(() => 'Student')
+    };
+
+    beforeAll(() => {
+        profileHandler = new ProfileHandler(
+            mockSharedPreference as SharedPreferences,
+            mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
+            mockCommonUtilService as CommonUtilService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create instance of ProfileHandler', () => {
+        // arrange
+        // act
+        // assert
+        expect(profileHandler).toBeTruthy();
+    });
+
+    describe('getSupportedProfileAttributes', () => {
+        it('should return categories map if userType is not available', (done) => {
+            // arrange
+            // act
+            profileHandler.getSupportedProfileAttributes().then((response) => {
+                // assert
+                expect(mockSharedPreference.getString).toHaveBeenCalledWith(PreferenceKey.SELECTED_USER_TYPE);
+                expect(response).toEqual({
+                    board: 'board',
+                    medium: 'medium',
+                    gradeLevel: 'gradeLevel'
+                });
+                done();
+            });
+        });
+
+        it('should return categories map if userType is  available', (done) => {
+            // arrange
+            // act
+            profileHandler.getSupportedProfileAttributes(false, 'student').then((response) => {
+                // assert
+                expect(response).toEqual({
+                    board: 'board',
+                    medium: 'medium',
+                    gradeLevel: 'gradeLevel'
+                });
+                done();
+            });
+        });
+
+        it('should return categories map  along with option category if showOPtionAttributes parameter is true', (done) => {
+            // arrange
+            // act
+            profileHandler.getSupportedProfileAttributes(true, 'student').then((response) => {
+                // assert
+                expect(response).toEqual({
+                    board: 'board',
+                    medium: 'medium',
+                    gradeLevel: 'gradeLevel',
+                    subject: 'subject'
+                });
+                done();
+            });
+        });
+    });
+
+    describe('getAudience', () => {
+        it('should return supported audience of given userType', (done) => {
+            // arrange
+            // act
+            profileHandler.getAudience('student').then((response) => {
+                // assert
+                expect(response).toEqual(['Student', 'Learner']);
+                done();
+            });
+        });
+    });
+    describe('getSupportedUserTypes', () => {
+        it('should return supporteduserType Config', (done) => {
+            // arrange
+            // act
+            profileHandler.getSupportedUserTypes().then((response) => {
+                // assert
+                expect(response.length).toEqual(3);
+                done();
+            });
+        });
+    });
+
+});
diff --git a/src/services/profile-handler.ts b/src/services/profile-handler.ts
new file mode 100644
index 000000000..1ce44b916
--- /dev/null
+++ b/src/services/profile-handler.ts
@@ -0,0 +1,106 @@
+import { Inject, Injectable } from '@angular/core';
+import { FormConfigCategories, PreferenceKey } from '@app/app/app.constant';
+import { FieldConfig, FieldConfigOption } from '@app/app/components/common-forms/field-config';
+import { FormConstants } from '@app/app/form.constants';
+import { SharedPreferences } from 'sunbird-sdk';
+import { CommonUtilService } from './common-util.service';
+import { FormAndFrameworkUtilService } from './formandframeworkutil.service';
+import { LocationHandler } from './location-handler';
+
+@Injectable()
+export class ProfileHandler {
+    private formFields: PersonaConfig[];
+    constructor(
+        @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
+        private formAndFrameworkUtilService: FormAndFrameworkUtilService,
+        private commonUtilService: CommonUtilService,
+        private locationHandler: LocationHandler
+    ) { }
+    private async getFormFields(): Promise<PersonaConfig[]> {
+        if (!this.formFields) {
+            this.formFields = await this.formAndFrameworkUtilService.getFormFields(FormConstants.SUPPORTED_USER_TYPES);
+        }
+        return this.formFields;
+    }
+    public async getSupportedProfileAttributes(showOptionalCategories?: boolean, userType?: string): Promise<{ [key: string]: string }> {
+        const formFields = await this.getFormFields();
+        if (!userType) {
+            userType = await this.preferences.getString(PreferenceKey.SELECTED_USER_TYPE).toPromise();
+        }
+        const userTypeSpecificConfig = formFields.find(config => config.code === userType);
+        if (!userTypeSpecificConfig) {
+            return {};
+        }
+        let supportedAttribute = userTypeSpecificConfig['attributes']['mandatory'];
+        const supportedOptionalAttribute = userTypeSpecificConfig['attributes']['optional'];
+        if (showOptionalCategories) {
+            supportedAttribute = supportedAttribute.concat(supportedOptionalAttribute);
+        }
+        return supportedAttribute.reduce((map, item) => {
+            map[item] = item;
+            return map;
+        }, {});
+    }
+    public async getSupportedUserTypes(): Promise<Array<PersonaConfig>> {
+        const supportedUserTypes = await this.getFormFields();
+        return supportedUserTypes.map((element) => {
+            element.name = element.translations ?
+                this.commonUtilService.getTranslatedValue(element.translations, element.name) : element.name;
+            return element;
+        });
+    }
+    public async getPersonaConfig(persona: string): Promise<PersonaConfig> {
+        const formFields = await this.getFormFields();
+        return formFields.find(config => config.code === persona);
+    }
+    public async getAudience(userType: string): Promise<string[]> {
+        const formFields = await this.getFormFields();
+        const userTypeConfig = formFields.find(formField => formField.code === userType);
+        return userTypeConfig ? userTypeConfig['searchFilter'] : [];
+    }
+
+    public async getSubPersona(subPersonaCode: string, persona: string, userLocation: any): Promise<string> {
+        if (!subPersonaCode || !persona) {
+            return undefined;
+        }
+        let formFields;
+        try {
+            // const state = await this.locationHandler.getLocationDetails(Location.TYPE_STATE, userLocation.name);
+            const state = userLocation.state;
+            formFields = await this.getProfileFormConfig(state && state.code ? state.code : 'default');
+        } catch (e) {
+            formFields = await this.getProfileFormConfig('default');
+        }
+
+        const personaConfig: FormConfigCategories = formFields.find(formField => formField.code === 'persona');
+
+        const personaChildrenConfig: FieldConfig<any>[] = personaConfig['children'][persona];
+        const subPersonaConfig = personaChildrenConfig.find(formField => formField.code === 'subPersona');
+        if (!subPersonaConfig) {
+            return undefined;
+         }
+        const subPersonaFieldConfigOption = (subPersonaConfig.templateOptions.options as FieldConfigOption<any>[]).
+                    find(option => option.value === subPersonaCode);
+        return subPersonaFieldConfigOption ? subPersonaFieldConfigOption.label : undefined;
+    }
+
+    private async getProfileFormConfig(subType: string): Promise<FieldConfig<any>[]> {
+        return await this.formAndFrameworkUtilService.getFormFields({
+            ...FormConstants.LOCATION_MAPPING,
+            subType,
+        });
+    }
+}
+
+export interface PersonaConfig {
+    code: string;
+    name: string;
+    translations: string;
+    image: string;
+    ambiguousFilters: string[];
+    searchFilter: string[];
+    attributes: {
+        mandatory: string[];
+        optional: string[];
+    };
+}
diff --git a/src/services/qrscanresulthandler-service.spec.ts b/src/services/qrscanresulthandler-service.spec.ts
index 8f251a7ac..3b3879594 100644
--- a/src/services/qrscanresulthandler-service.spec.ts
+++ b/src/services/qrscanresulthandler-service.spec.ts
@@ -1,16 +1,19 @@
 import { QRScannerResultHandler } from './qrscanresulthandler.service';
-import { TelemetryService, TelemetryObject, Mode, ContentService, FrameworkService, PageAssembleService } from 'sunbird-sdk';
+import { TelemetryService, Mode, ContentService,
+   FrameworkService, PageAssembleService } from 'sunbird-sdk';
 import {
   Environment, ImpressionSubtype, ImpressionType, InteractSubtype, InteractType, ObjectType, PageId,
-  LogLevel
+  CorReleationDataType, CorrelationData
 } from '@app/services/telemetry-constants';
 import { of, throwError } from 'rxjs';
 import { CommonUtilService } from './common-util.service';
 import { TelemetryGeneratorService } from './telemetry-generator.service';
 import { Router } from '@angular/router';
-import { NavController, Events } from '@ionic/angular';
+import { NavController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { AppGlobalService } from './app-global-service.service';
 import { FormAndFrameworkUtilService } from './formandframeworkutil.service';
+import { NavigationService } from '../services/navigation-handler.service';
 
 declare const cordova;
 
@@ -20,7 +23,8 @@ describe('QRScannerResultHandler', () => {
     getContentDetails: jest.fn()
   };
   const mockTelemetryService: Partial<TelemetryService> = {
-    buildContext: jest.fn()
+    buildContext: jest.fn(),
+    updateUtmParameters: jest.fn()
   };
   const mockCommonUtilService: Partial<CommonUtilService> = {
     showToast: jest.fn()
@@ -52,6 +56,9 @@ describe('QRScannerResultHandler', () => {
 
   const mockPageAssembleService: Partial<PageAssembleService> = {};
   const mockFrameworkService: Partial<FrameworkService> = {};
+  const mockNavigationService: Partial<NavigationService> = {
+    navigateToDetailPage: jest.fn()
+  };
 
 
   beforeAll(() => {
@@ -66,7 +73,8 @@ describe('QRScannerResultHandler', () => {
       mockNavController as NavController,
       mockEvents as Events,
       mockAppglobalService as AppGlobalService,
-      mockFormAndFrameworkUtilService as FormAndFrameworkUtilService
+      mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
+      mockNavigationService as NavigationService
     );
   });
 
@@ -150,19 +158,26 @@ describe('QRScannerResultHandler', () => {
   describe('handleDialCode()', () => {
     it('should navigate to Search page if the scanned data is a dialocde link', () => {
       // arrange
+      const scannData =  'https://sunbirded.org/get/dial/ABCDEF?channel=igot&role=other';
       mockTelemetryGeneratorService.generateUtmInfoTelemetry = jest.fn();
+      const params = {channel: 'igot', role: 'other'};
+      mockTelemetryService.updateCampaignParameters = jest.fn();
+      jest.spyOn(qRScannerResultHandler, 'generateQRScanSuccessInteractEvent').mockImplementation(() => {
+        return;
+      });
+      const corRelationData: CorrelationData[] = [{
+        id: CorReleationDataType.SCAN,
+        type: CorReleationDataType.ACCESS_TYPE
+      }];
       // act
-      qRScannerResultHandler.handleDialCode('profile-settings',
-        'https://sunbirded.org/get/dial/ABCDEF?utm_source=google-play&channel=igot', 'ABCDEF');
+      qRScannerResultHandler.handleDialCode('profile-settings', scannData, 'ABCDEF');
       // assert
+      expect(mockTelemetryService.updateCampaignParameters).toHaveBeenCalled();
       expect(mockNavController.navigateForward).toHaveBeenCalledWith(['/search'], {
         state: {
           dialCode: 'ABCDEF',
           corRelation: [{ id: 'ABCDEF', type: 'qr' },
-           {id: 'https://sunbirded.org', type: 'Source'},
-           {id: 'Scan', type: 'AccessType'},
-           {id: 'igot', type: 'Source'},
-            {id: 'google-play', type: 'UtmSource'}],
+           {id: 'https://sunbirded.org', type: 'Source'}],
           source: 'profile-settings',
           shouldGenerateEndTelemetry: true
         }
@@ -172,100 +187,116 @@ describe('QRScannerResultHandler', () => {
       values['scannedData'] = 'https://sunbirded.org/get/dial/ABCDEF';
       values['action'] = 'SearchResult';
 
-      expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.OTHER,
-        InteractSubtype.QRCodeScanSuccess,
-        Environment.HOME,
-        PageId.QRCodeScanner, { id: 'ABCDEF', type: 'qr', version: undefined },
-        values,
-        undefined,
-        [{id: 'https://sunbirded.org', type: 'Source'}]);
+      expect(mockTelemetryGeneratorService.generateUtmInfoTelemetry).toHaveBeenCalledWith(
+        params,
+        PageId.QRCodeScanner, { id: 'ABCDEF', type: 'qr', version: ' ' },
+        corRelationData);
     });
   });
 
   describe('handleContentId()', () => {
     it('should navigate to ContentDetails page if the scanned data is a content deeplink', (done) => {
       // arrange
-      const content = { identifier: 'do_12345', contentData: { contentType: 'Resource' } } as any;
+      const scannData =  'https://sunbirded.org/get/dial/ABCDEF?channel=igot&role=other';
+      const content = { identifier: 'do_12345', contentData: { contentType: 'Resource', primaryCategory: 'Learning Resource' } } as any;
       mockContentService.getContentDetails = jest.fn(() => of(content));
+      mockTelemetryService.updateCampaignParameters = jest.fn();
+      jest.spyOn(qRScannerResultHandler, 'generateQRScanSuccessInteractEvent').mockImplementation(() => {
+        return;
+      });
+      const params = {channel: 'igot', role: 'other'};
+      mockTelemetryGeneratorService.generateUtmInfoTelemetry = jest.fn();
       // act
-      qRScannerResultHandler.handleContentId('profile-settings',
-        'https://sunbirded.org/resources/play/content/do_12345?utm_source=google-play&channel=igot');
+      qRScannerResultHandler.handleContentId('profile-settings', scannData);
       // assert
       const values = new Map();
       values['networkAvailable'] = 'Y';
       values['scannedData'] = 'https://sunbirded.org/resources/play/content/do_12345';
       values['action'] = 'ContentDetail';
+      const corRelationData: CorrelationData[] = [{
+        id: CorReleationDataType.SCAN,
+        type: CorReleationDataType.ACCESS_TYPE
+      }];
       setTimeout(() => {
-        expect(mockRouter.navigate).toHaveBeenCalledWith(['/content-details'], {
-          state: {
+        expect(mockNavigationService.navigateToDetailPage).toHaveBeenCalledWith(
+          content,
+          {
             content,
             corRelation: [{ id: 'do_12345', type: 'qr' },
-            {id: 'https://sunbirded.org', type: 'Source'},
-            {id: 'Scan', type: 'AccessType'},
-            {id: 'igot', type: 'Source'},
-            {id: 'google-play', type: 'UtmSource'}],
+            {id: 'https://sunbirded.org', type: 'Source'}],
             source: 'profile-settings',
             shouldGenerateEndTelemetry: true
           }
-        });
-
-        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.OTHER,
-          InteractSubtype.QRCodeScanSuccess,
-          Environment.HOME,
-          PageId.QRCodeScanner, { id: 'do_12345?utm_source=google-play&channel=igot', type: 'qr', version: undefined },
-          values,
-          undefined,
-          [{id: 'https://sunbirded.org', type: 'Source'}]);
+        );
+        expect(mockTelemetryService.updateCampaignParameters).toHaveBeenCalledWith([{
+          id: 'igot', type: 'Source'
+        }, {
+          id: 'other', type: 'Role'
+        }]);
+
+        expect(mockTelemetryGeneratorService.generateUtmInfoTelemetry).toHaveBeenCalledWith(
+          params,
+          PageId.QRCodeScanner, { id: 'do_12345', type: 'Learning Resource', version: '' },
+          corRelationData);
         expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
           ImpressionType.VIEW, ImpressionSubtype.QR_CODE_VALID,
           PageId.QRCodeScanner,
           Environment.HOME,
-          'do_12345?utm_source=google-play&channel=igot', ObjectType.QR, '');
+          'ABCDEF?channel=igot&role=other', ObjectType.QR, '');
         done();
       });
     });
 
     it('should navigate to CollectionDetails page if the scanned data is a Collection deeplink', (done) => {
       // arrange
+      const scannData =  'https://sunbirded.org/get/dial/ABCDEF?channel=igot&role=other';
       const content = {
         identifier: 'do_12345', mimeType: 'application/vnd.ekstep.content-collection',
-        contentData: { contentType: 'Resource' }
+        contentData: { contentType: 'Resource', primaryCategory: 'Learning Resource' }
       } as any;
       mockContentService.getContentDetails = jest.fn(() => of(content));
+      mockTelemetryService.updateCampaignParameters = jest.fn();
+      jest.spyOn(qRScannerResultHandler, 'generateQRScanSuccessInteractEvent').mockImplementation(() => {
+        return;
+      });
+      mockTelemetryGeneratorService.generateUtmInfoTelemetry = jest.fn();
+      const params = {channel: 'igot', role: 'other'};
       // act
-      qRScannerResultHandler.handleContentId('profile-settings',
-        'https://sunbirded.org/resources/play/collection/do_12345?utm_source=google-play&channel=igot');
+      qRScannerResultHandler.handleContentId('profile-settings', scannData);
       // assert
       const values = new Map();
       values['networkAvailable'] = 'Y';
       values['scannedData'] = 'https://sunbirded.org/resources/play/collection/do_12345';
       values['action'] = 'ContentDetail';
+      const corRelationData: CorrelationData[] = [{
+        id: CorReleationDataType.SCAN,
+        type: CorReleationDataType.ACCESS_TYPE
+      }];
       setTimeout(() => {
-        expect(mockRouter.navigate).toHaveBeenCalledWith(['/collection-detail-etb'], {
-          state: {
+        expect(mockNavigationService.navigateToDetailPage).toHaveBeenCalledWith(
+          content,
+          {
             content,
             corRelation: [{ id: 'do_12345', type: 'qr' },
-            {id: 'https://sunbirded.org', type: 'Source'},
-            {id: 'Scan', type: 'AccessType'},
-            {id: 'igot', type: 'Source'},
-            {id: 'google-play', type: 'UtmSource'}],
+            {id: 'https://sunbirded.org', type: 'Source'}],
             source: 'profile-settings',
             shouldGenerateEndTelemetry: true
           }
-        });
-
-        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.OTHER,
-          InteractSubtype.QRCodeScanSuccess,
-          Environment.HOME,
-          PageId.QRCodeScanner, { id: 'do_12345?utm_source=google-play&channel=igot', type: 'qr', version: undefined },
-          values,
-          undefined,
-          [{id: 'https://sunbirded.org', type: 'Source'}]);
+        );
+        expect(mockTelemetryService.updateCampaignParameters).toHaveBeenCalledWith([
+          {id: 'igot', type: 'Source'},
+          {id: 'other', type: 'Role'}
+        ]);
+
+        expect(mockTelemetryGeneratorService.generateUtmInfoTelemetry).toHaveBeenCalledWith(
+          params,
+          PageId.QRCodeScanner, { id: 'do_12345', type: 'Learning Resource', version: '' },
+          corRelationData);
         expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
           ImpressionType.VIEW, ImpressionSubtype.QR_CODE_VALID,
           PageId.QRCodeScanner,
           Environment.HOME,
-          'do_12345?utm_source=google-play&channel=igot', ObjectType.QR, '');
+          'ABCDEF?channel=igot&role=other', ObjectType.QR, '');
         done();
       });
     });
@@ -274,43 +305,37 @@ describe('QRScannerResultHandler', () => {
       // arrange
       const content = {
         identifier: 'do_12345',
-        contentData: { contentType: 'Course' }
+        contentData: { contentType: 'Course', primaryCategory: 'Course' }
       } as any;
       mockContentService.getContentDetails = jest.fn(() => of(content));
+      mockTelemetryService.updateCampaignParameters = jest.fn();
+      jest.spyOn(qRScannerResultHandler, 'generateQRScanSuccessInteractEvent').mockImplementation(() => {
+        return;
+      });
       // act
       qRScannerResultHandler.handleContentId('profile-settings',
-        'https://sunbirded.org/learn/course/do_12345?utm_source=google-play&channel=igot');
+        'https://sunbirded.org/learn/course/do_12345');
       // assert
       const values = new Map();
       values['networkAvailable'] = 'Y';
       values['scannedData'] = 'https://sunbirded.org/learn/course/do_12345';
       values['action'] = 'ContentDetail';
       setTimeout(() => {
-        expect(mockRouter.navigate).toHaveBeenCalledWith(['/enrolled-course-details'], {
-          state: {
+        expect(mockNavigationService.navigateToDetailPage).toHaveBeenCalledWith(
+          content,
+          {
             content,
             corRelation: [{ id: 'do_12345', type: 'qr' },
-            {id: 'https://sunbirded.org', type: 'Source'},
-            {id: 'Scan', type: 'AccessType'},
-            {id: 'igot', type: 'Source'},
-            {id: 'google-play', type: 'UtmSource'}],
+            {id: 'https://sunbirded.org', type: 'Source'}],
             source: 'profile-settings',
             shouldGenerateEndTelemetry: true
           }
-        });
-
-        expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(InteractType.OTHER,
-          InteractSubtype.QRCodeScanSuccess,
-          Environment.HOME,
-          PageId.QRCodeScanner, { id: 'do_12345?utm_source=google-play&channel=igot', type: 'qr', version: undefined },
-          values,
-          undefined,
-          [{id: 'https://sunbirded.org', type: 'Source'}]);
+        );
         expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
           ImpressionType.VIEW, ImpressionSubtype.QR_CODE_VALID,
           PageId.QRCodeScanner,
           Environment.HOME,
-          'do_12345?utm_source=google-play&channel=igot', ObjectType.QR, '');
+          'do_12345', ObjectType.QR, '');
         done();
       });
     });
@@ -319,6 +344,9 @@ describe('QRScannerResultHandler', () => {
       // arrange
       mockCommonUtilService.networkInfo = { isNetworkAvailable: false };
       mockContentService.getContentDetails = jest.fn(() => throwError({ errror: 'API_ERROR' }));
+      jest.spyOn(qRScannerResultHandler, 'generateQRScanSuccessInteractEvent').mockImplementation(() => {
+        return;
+      });
       // act
       qRScannerResultHandler.handleContentId('profile-settings',
         'https://sunbirded.org/learn/course/do_12345');
@@ -333,6 +361,10 @@ describe('QRScannerResultHandler', () => {
       // arrange
       mockCommonUtilService.networkInfo = { isNetworkAvailable: true };
       mockContentService.getContentDetails = jest.fn(() => throwError({ errror: 'API_ERROR' }));
+      mockTelemetryService.updateCampaignParameters = jest.fn();
+      jest.spyOn(qRScannerResultHandler, 'generateQRScanSuccessInteractEvent').mockImplementation(() => {
+        return;
+      });
       // act
       qRScannerResultHandler.handleContentId('profile-settings',
         'https://sunbirded.org/learn/course/do_12345');
@@ -351,6 +383,22 @@ describe('QRScannerResultHandler', () => {
   });
 
   describe('handleInvalidQRCode()', () => {
+    beforeAll(() => {
+      qRScannerResultHandler = new QRScannerResultHandler(
+        mockContentService as ContentService,
+        mockTelemetryService as TelemetryService,
+        mockPageAssembleService as PageAssembleService,
+        mockFrameworkService as FrameworkService,
+        mockCommonUtilService as CommonUtilService,
+        mockTelemetryGeneratorService as TelemetryGeneratorService,
+        mockRouter as Router,
+        mockNavController as NavController,
+        mockEvents as Events,
+        mockAppglobalService as AppGlobalService,
+        mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
+        mockNavigationService as NavigationService
+      );
+    });
     it('should generate INTERACT and END event in case of invalid dialcode', () => {
       // arrange
       // act
diff --git a/src/services/qrscanresulthandler.service.ts b/src/services/qrscanresulthandler.service.ts
index 80771c10f..a8ec54a27 100644
--- a/src/services/qrscanresulthandler.service.ts
+++ b/src/services/qrscanresulthandler.service.ts
@@ -8,9 +8,9 @@ import {
   ContentService,
   CorrelationData,
   TelemetryObject,
-  TelemetryService
+  TelemetryService,
 } from 'sunbird-sdk';
-import { ContentType, EventTopics, MimeType, RouterLinks } from '../app/app.constant';
+import { EventTopics, RouterLinks } from '../app/app.constant';
 
 import { CommonUtilService } from './common-util.service';
 import {
@@ -25,11 +25,13 @@ import {
   CorReleationDataType,
 } from './telemetry-constants';
 import { NavigationExtras, Router } from '@angular/router';
-import { NavController, Events } from '@ionic/angular';
+import { NavController } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { AppGlobalService } from './app-global-service.service';
 import { FormAndFrameworkUtilService } from './formandframeworkutil.service';
 import { ContentUtil } from '@app/util/content-util';
 import * as qs from 'qs';
+import { NavigationService } from './navigation-handler.service';
 
 declare var cordova;
 
@@ -51,7 +53,8 @@ export class QRScannerResultHandler {
     private navCtrl: NavController,
     private events: Events,
     private appGlobalService: AppGlobalService,
-    private formFrameWorkUtilService: FormAndFrameworkUtilService
+    private formFrameWorkUtilService: FormAndFrameworkUtilService,
+    private navService: NavigationService
   ) {
   }
 
@@ -74,7 +77,7 @@ export class QRScannerResultHandler {
 
             if (org) {
               this.pageAssembleService.setPageAssembleChannel({
-                channelId: org.identifier
+                channelId: org.id
               });
 
               setTimeout(() => {
@@ -109,24 +112,30 @@ export class QRScannerResultHandler {
     const telemetryObject = new TelemetryObject(dialCode, 'qr', ' ');
     const utmUrl = scannedData.slice(scannedData.indexOf('?') + 1);
     const params: {[param: string]: string} = qs.parse(utmUrl);
-    const cData: CorrelationData[] = [{
+    const cData: Array<CorrelationData> = [];
+
+    if (utmUrl !== scannedData) {
+      ContentUtil.genrateUTMCData(params).forEach((element) => {
+        cData.push(element);
+      });
+    }
+    const corRelationData: CorrelationData[] = [{
       id: CorReleationDataType.SCAN,
       type: CorReleationDataType.ACCESS_TYPE
     }];
-
-    ContentUtil.genrateUTMCData(params).forEach((element) => {
-      cData.push(element);
-    });
-    this.telemetryGeneratorService.generateUtmInfoTelemetry(params, PageId.QRCodeScanner, cData, telemetryObject);
+    if (cData && cData.length) {
+      this.telemetryService.updateCampaignParameters(cData);
+      this.telemetryGeneratorService.generateUtmInfoTelemetry(params, PageId.QRCodeScanner, telemetryObject, corRelationData);
+    }
     const navigationExtras: NavigationExtras = {
       state: {
         dialCode,
-        corRelation: this.getCorRelationList(dialCode, QRScannerResultHandler.CORRELATION_TYPE, scannedData, cData),
+        corRelation: this.getCorRelationList(dialCode, QRScannerResultHandler.CORRELATION_TYPE, scannedData),
         source: this.source,
         shouldGenerateEndTelemetry: true
       }
     };
-
+    this.generateImpressionEvent(this.source, dialCode);
     this.navCtrl.navigateForward([`/${RouterLinks.SEARCH}`], navigationExtras);
   }
 
@@ -137,24 +146,30 @@ export class QRScannerResultHandler {
     this.generateQRScanSuccessInteractEvent(scannedData, 'ContentDetail', contentId);
     const utmUrl = scannedData.slice(scannedData.indexOf('?') + 1);
     const params: {[param: string]: string} = qs.parse(utmUrl);
-    const cData: CorrelationData[] = [{
-      id: CorReleationDataType.SCAN,
-      type: CorReleationDataType.ACCESS_TYPE
-    }];
+    const cData: CorrelationData[] = [];
 
-    ContentUtil.genrateUTMCData(params).forEach((element) => {
-      cData.push(element);
-    });
+    if (utmUrl !== scannedData) {
+      ContentUtil.genrateUTMCData(params).forEach((element) => {
+       cData.push(element);
+     });
+   }
     const request: ContentDetailRequest = {
       contentId
     };
     this.contentService.getContentDetails(request).toPromise()
       .then((content: Content) => {
-        const telemetryObject = new TelemetryObject(content.identifier, content.contentData.contentType, content.contentData.pkgVersion);
-        this.telemetryGeneratorService.generateUtmInfoTelemetry(params, PageId.QRCodeScanner, cData, telemetryObject);
+        const corRelationData: CorrelationData[] = [{
+          id: CorReleationDataType.SCAN,
+          type: CorReleationDataType.ACCESS_TYPE
+        }];
+        if (cData && cData.length) {
+          this.telemetryService.updateCampaignParameters(cData);
+          this.telemetryGeneratorService.generateUtmInfoTelemetry(params,
+            PageId.QRCodeScanner, ContentUtil.getTelemetryObject(content), corRelationData);
+        }
 
         this.navigateToDetailsPage(content,
-          this.getCorRelationList(content.identifier, QRScannerResultHandler.CORRELATION_TYPE, scannedData, cData));
+          this.getCorRelationList(content.identifier, QRScannerResultHandler.CORRELATION_TYPE, scannedData));
         this.telemetryGeneratorService.generateImpressionTelemetry(
           ImpressionType.VIEW, ImpressionSubtype.QR_CODE_VALID,
           PageId.QRCodeScanner,
@@ -200,21 +215,13 @@ export class QRScannerResultHandler {
     this.generateEndEvent(this.source, scannedData);
   }
 
-  getCorRelationList(identifier: string, type: string, scannedData, cData): Array<CorrelationData> {
+  getCorRelationList(identifier: string, type: string, scannedData): Array<CorrelationData> {
     const corRelationList: Array<CorrelationData> = new Array<CorrelationData>();
-    const corRelation: CorrelationData = new CorrelationData();
-    corRelation.id = identifier;
-    corRelation.type = type;
-    corRelationList.push(corRelation);
+    corRelationList.push({id: identifier, type});
     corRelationList.push({
       id: ContentUtil.extractBaseUrl(scannedData),
       type: CorReleationDataType.SOURCE
     });
-    if (cData) {
-     cData.forEach(element => {
-       corRelationList.push(element);
-     });
-    }
     return corRelationList;
   }
 
@@ -228,13 +235,10 @@ export class QRScannerResultHandler {
       }
     };
 
-    if (content.contentData.contentType === ContentType.COURSE) {
-      this.router.navigate([`/${RouterLinks.ENROLLED_COURSE_DETAILS}`], navigationExtras);
-    } else if (content.mimeType === MimeType.COLLECTION) {
-      this.router.navigate([`/${RouterLinks.COLLECTION_DETAIL_ETB}`], navigationExtras);
-    } else {
-      this.router.navigate([`/${RouterLinks.CONTENT_DETAILS}`], navigationExtras);
-    }
+    this.navService.navigateToDetailPage(
+      content,
+      navigationExtras.state
+    );
   }
 
   generateQRScanSuccessInteractEvent(scannedData, action, dialCode?, certificate?:
@@ -286,4 +290,15 @@ export class QRScannerResultHandler {
       );
     }
   }
+
+  private generateImpressionEvent(source, dialCode) {
+    const corRelationList: Array<CorrelationData> = [];
+    corRelationList.push({id: dialCode, type: CorReleationDataType.QR});
+    this.telemetryGeneratorService.generateImpressionTelemetry(
+      ImpressionType.PAGE_REQUEST, '',
+      PageId.QR_BOOK_RESULT,
+      source ? Environment.ONBOARDING : Environment.HOME, '', '', '',
+      undefined,
+      corRelationList);
+  }
 }
diff --git a/src/services/quml-player/quml-player.service.spec.ts b/src/services/quml-player/quml-player.service.spec.ts
new file mode 100644
index 000000000..e586ffe49
--- /dev/null
+++ b/src/services/quml-player/quml-player.service.spec.ts
@@ -0,0 +1,39 @@
+import { TestBed } from '@angular/core/testing';
+import { ContentService, TelemetryObject } from '@project-sunbird/sunbird-sdk';
+
+import { QumlPlayerService } from './quml-player.service';
+
+describe('PrintPdfService', () => {
+    let qumlPlayerService: QumlPlayerService;
+    const mockContentService: Partial<ContentService> = {
+        getQuestionList : jest.fn()
+    };
+  
+    beforeAll(() => {
+      qumlPlayerService = new QumlPlayerService(
+        mockContentService as ContentService,
+      );
+    });
+  
+    beforeEach(() => {
+      jest.clearAllMocks();
+      jest.resetAllMocks();
+    });
+
+    it('should be created', () => {
+        expect(qumlPlayerService).toBeTruthy();
+      });
+
+    it('should get questions', () => {
+        const questionIds = ['1','2','3','4','5','6'];
+        const questions = qumlPlayerService.getQuestions(questionIds);
+        expect(questions).toBe(undefined);
+    })
+
+    it('should get questions', () => {
+        const questionId = '1';
+        const questions = qumlPlayerService.getQuestion(questionId);
+        expect(questions).toBe(undefined);
+    })
+
+});
diff --git a/src/services/quml-player/quml-player.service.ts b/src/services/quml-player/quml-player.service.ts
new file mode 100644
index 000000000..5d72a4ff7
--- /dev/null
+++ b/src/services/quml-player/quml-player.service.ts
@@ -0,0 +1,30 @@
+import { Inject, Injectable } from '@angular/core';
+import { CsModule } from '@project-sunbird/client-services';
+import { QuestionCursor } from '@project-sunbird/sunbird-quml-player-v8';
+import { ContentService } from '@project-sunbird/sunbird-sdk';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class QumlPlayerService implements QuestionCursor {
+  
+  constructor(
+    @Inject('CONTENT_SERVICE') private contentService: ContentService,
+  ) {}
+
+  getQuestion(questionId: string): Observable<any> {
+    return this.contentService.getQuestionList([questionId]);
+  }
+
+  getQuestions(questionIds: string[]): Observable<any> {
+    return this.contentService.getQuestionList(questionIds);
+  }
+
+  getQuestionSetHierarchy(data) {
+    return this.contentService.getQuestionSetHierarchy(data);
+  }
+}
+
+
diff --git a/src/services/rating/rating-handler.ts b/src/services/rating/rating-handler.ts
index c390256d5..36552d3a2 100644
--- a/src/services/rating/rating-handler.ts
+++ b/src/services/rating/rating-handler.ts
@@ -22,6 +22,7 @@ export class RatingHandler {
     private userComment: string;
     public telemetryObject: TelemetryObject;
     public useNewComments = false;
+    private courseContext: any;
     constructor(
         @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
         private popoverCtrl: PopoverController,
@@ -38,7 +39,8 @@ export class RatingHandler {
         popupType: string,
         corRelationList: CorrelationData[],
         rollUp: Rollup,
-        shouldNavigateBack?: boolean
+        shouldNavigateBack?: boolean,
+        onDidDismiss?: () => void
     ) {
         const paramsMap = new Map();
         const contentFeedback: any = content.contentFeedback;
@@ -57,15 +59,15 @@ export class RatingHandler {
                             this.showAppRatingPopup();
                         } else {
                             paramsMap['isPlayed'] = 'Y';
-                            this.showContentRatingPopup(content, popupType, shouldNavigateBack);
+                            this.showContentRatingPopup(content, popupType, shouldNavigateBack, onDidDismiss);
                         }
                     }).catch(err => {
                         paramsMap['isPlayed'] = 'Y';
-                        this.showContentRatingPopup(content, popupType, shouldNavigateBack);
+                        this.showContentRatingPopup(content, popupType, shouldNavigateBack, onDidDismiss);
                     });
                 } else {
                     paramsMap['isPlayed'] = 'Y';
-                    this.showContentRatingPopup(content, popupType, shouldNavigateBack);
+                    this.showContentRatingPopup(content, popupType, shouldNavigateBack, onDidDismiss);
                 }
             } else if (popupType === 'manual') {
                 paramsMap['isPlayed'] = 'Y';
@@ -88,7 +90,7 @@ export class RatingHandler {
 
     }
 
-    async showContentRatingPopup(content: Content, popupType: string, shouldNavigateBack?: boolean) {
+    async showContentRatingPopup(content: Content, popupType: string, shouldNavigateBack?: boolean, onDidDismiss?: () => void) {
         const contentFeedback: any = content.contentFeedback;
         if (contentFeedback && contentFeedback.length) {
             this.userRating = this.userRating ? this.userRating : contentFeedback[0].rating;
@@ -113,6 +115,9 @@ export class RatingHandler {
             this.userRating = data.rating;
             this.userComment = data.comment;
         }
+        if (onDidDismiss) {
+            onDidDismiss();
+        }
     }
 
     public resetRating() {
@@ -171,4 +176,5 @@ export class RatingHandler {
                 return false;
             });
     }
+
 }
diff --git a/src/services/sb-progress-loader.service.ts b/src/services/sb-progress-loader.service.ts
new file mode 100644
index 000000000..c9934ada6
--- /dev/null
+++ b/src/services/sb-progress-loader.service.ts
@@ -0,0 +1,79 @@
+import {Injectable} from '@angular/core';
+import {ModalController} from '@ionic/angular';
+import {SbProgressLoaderPage} from '../app/components/popups/sb-progress-loader/sb-progress-loader.page';
+import {BehaviorSubject} from 'rxjs';
+
+export interface Context {
+    id: string;
+    ignoreTelemetry?: {
+        when: {
+            interact?: RegExp;
+            impression?: RegExp;
+        };
+    };
+}
+
+@Injectable({
+    providedIn: 'root'
+})
+export class SbProgressLoader {
+    private modal?: HTMLIonModalElement;
+    private progress: BehaviorSubject<number> = new BehaviorSubject(0);
+
+    readonly contexts = new Map<string, Context>();
+
+    constructor(
+        private modalCtrl: ModalController,
+    ) {
+    }
+
+    async show(context: Context = {id: 'DEFAULT'}) {
+        this.contexts.set(context.id, context);
+
+        if (this.modal) {
+            return;
+        }
+
+        this.progress.next(0);
+
+        this.modal = await this.modalCtrl.create({
+            component: SbProgressLoaderPage,
+            componentProps: {
+                progress: this.progress.asObservable(),
+            },
+            cssClass: 'sb-progress-loader'
+        });
+
+        await this.modal.present();
+
+        setTimeout(() => {
+            this.hide(context);
+        }, 30 * 1000);
+    }
+
+    updateProgress(progress: number) {
+        if (!this.modal) {
+            return;
+        }
+        this.progress.next(progress);
+    }
+
+    async hide(context: Context = {id: 'DEFAULT'}) {
+        if (!this.contexts.has(context.id)) {
+            return;
+        }
+
+        this.contexts.delete(context.id);
+
+        if (!this.modal || this.contexts.size) {
+            return;
+        }
+
+        this.progress.next(100);
+
+        setTimeout(() => {
+            this.modal.dismiss();
+            this.modal = undefined;
+        }, 500);
+    }
+}
diff --git a/src/services/scroll-to.service.spec.ts b/src/services/scroll-to.service.spec.ts
new file mode 100644
index 000000000..92441b2ea
--- /dev/null
+++ b/src/services/scroll-to.service.spec.ts
@@ -0,0 +1,46 @@
+import {ScrollToService} from '@app/services/scroll-to.service';
+
+describe('Scroll-to-service', () => {
+    let scrollToService: ScrollToService;
+
+    scrollToService = new ScrollToService();
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should create instance of scroll-to-service', () => {
+        expect(scrollToService).toBeTruthy();
+    });
+
+    describe('scroll-to test cases', () => {
+        it('should scroll-to element returns null ', () => {
+            // arrange
+            const element = document.getElementById('sample-element-id');
+            // act
+            scrollToService.scrollTo('sample-element-id');
+            // assert
+            expect(element).toBe(null);
+        });
+
+        it('should return element by smooth position ', () => {
+            // arrange
+            const data = jest.fn();
+            jest.spyOn(document, 'getElementById').mockReturnValue({data: 'element', scrollIntoView: data});
+            // act
+            scrollToService.scrollTo('element');
+            // assert
+            expect(data).toHaveBeenCalledWith({behavior: 'smooth'});
+        });
+    });
+
+    it('should call scrollToWithinContent  when called upon ion-content', () => {
+        // arrange
+        const sampleFn = {scrollToPoint: jest.fn(() => Promise.resolve())};
+        jest.spyOn(document, 'getElementById').mockReturnValue({data: 'element', scrollToPoint: sampleFn, offsetTop: {}});
+        // act
+        scrollToService.scrollToWithinContent(sampleFn, 'element');
+        // assert
+        expect(sampleFn.scrollToPoint).toHaveBeenCalled();
+    });
+});
diff --git a/src/services/scroll-to.service.ts b/src/services/scroll-to.service.ts
new file mode 100644
index 000000000..fec5dae0c
--- /dev/null
+++ b/src/services/scroll-to.service.ts
@@ -0,0 +1,26 @@
+import {Injectable} from '@angular/core';
+import {IonContent} from '@ionic/angular';
+
+@Injectable({
+    providedIn: 'root'
+})
+export class ScrollToService {
+
+    constructor() {
+    }
+
+    scrollTo(elementId: string, options?: boolean | ScrollIntoViewOptions): void {
+        const element = document.getElementById(elementId);
+        if (!element) {
+            return;
+        }
+        element.scrollIntoView(options || {
+            behavior: 'smooth'
+        });
+    }
+
+    scrollToWithinContent(content: IonContent, elementId: string): void {
+        const y = document.getElementById(elementId).offsetTop;
+        content.scrollToPoint(0, y, 500).then();
+    }
+}
diff --git a/src/services/segmentation-tag/segmentation-tag.service.spec.data.ts b/src/services/segmentation-tag/segmentation-tag.service.spec.data.ts
new file mode 100644
index 000000000..0aa77cf26
--- /dev/null
+++ b/src/services/segmentation-tag/segmentation-tag.service.spec.data.ts
@@ -0,0 +1,33 @@
+export const cmdList = [
+    {
+        commandId: 1618943400000,
+        commandType: "SEGMENT_COMMAND",
+        controlFunction: "LOCAL_NOTIF",
+        controlFunctionPayload: [{
+            id: 'payload_data'
+        }],
+        expiresAfter: 1619202600000,
+        tagCriteria: "AND",
+        tagFilterUpto: "",
+        tagFilters: ["UA_English"],
+        targetDeviceIds: "",
+        targetVersion: ""
+    }
+]
+
+export const validCmdList = [
+    {
+        commandId: 1618943400000,
+        commandType: "SEGMENT_COMMAND",
+        controlFunction: "LOCAL_NOTIF",
+        controlFunctionPayload: [{
+            id: 'payload_data'
+        }],
+        expiresAfter: 1619202600000,
+        tagCriteria: "AND",
+        tagFilterUpto: "",
+        tagFilters: ["UA_English"],
+        targetDeviceIds: "",
+        targetVersion: ""
+    }
+]
\ No newline at end of file
diff --git a/src/services/segmentation-tag/segmentation-tag.service.spec.ts b/src/services/segmentation-tag/segmentation-tag.service.spec.ts
new file mode 100644
index 000000000..68526c599
--- /dev/null
+++ b/src/services/segmentation-tag/segmentation-tag.service.spec.ts
@@ -0,0 +1,132 @@
+import { AuthService, Profile, ProfileService, SegmentationService, SharedPreferences } from '@project-sunbird/sunbird-sdk';
+import { of } from 'rxjs';
+import { AppGlobalService } from '../app-global-service.service';
+import { FormAndFrameworkUtilService } from '../formandframeworkutil.service';
+import { SegmentationTagService } from './segmentation-tag.service';
+import { NotificationService } from '@app/services/notification.service';
+import { cmdList, validCmdList } from './segmentation-tag.service.spec.data';
+import { SplaschreenDeeplinkActionHandlerDelegate } from '../sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate';
+
+describe('SegmentationTagService ', () => {
+    let segmentationTagService: SegmentationTagService;
+
+    const mockSegmentationService: Partial<SegmentationService> = {
+        getTags: jest.fn(),
+        saveTags:jest.fn(() => of(true)),
+        getCommand: jest.fn(),
+        saveCommandList: jest.fn(() => of())
+    };
+    const mockProfileService: Partial<ProfileService> = {
+        getActiveSessionProfile: jest.fn(() => of({ uid: 'user_id' } as Profile))
+    };
+    const mockAuthService: Partial<AuthService> = {};
+    const mockNotificationSrc: Partial<NotificationService> = {
+        setupLocalNotification: jest.fn()
+    };
+    const mockAppGlobalService: Partial<AppGlobalService> = {};
+    const mockFormAndFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {
+        getSegmentationCommands: jest.fn(() => Promise.resolve(cmdList))
+    };
+    const mockSharedPreferences: Partial<SharedPreferences> = {
+        getString: jest.fn(() => of('key_value'))
+    };
+    const mockSplaschreenDeeplinkActionHandlerDelegate: Partial<SplaschreenDeeplinkActionHandlerDelegate> = {
+        onAction: jest.fn()
+    };
+
+    global.window.segmentation = {
+        init: jest.fn(),
+        SBTagService: {
+            pushTag: jest.fn(),
+            removeAllTags: jest.fn(),
+            restoreTags: jest.fn()
+        },
+        SBActionCriteriaService: {
+            evaluateCriteria: jest.fn(() => validCmdList)
+        }
+    };
+
+    beforeAll(() => {
+        segmentationTagService = new SegmentationTagService(
+            mockSegmentationService as SegmentationService,
+            mockProfileService as ProfileService,
+            mockAuthService as AuthService,
+            mockSharedPreferences as SharedPreferences,
+            mockNotificationSrc as NotificationService,
+            mockAppGlobalService as AppGlobalService,
+            mockFormAndFrameworkUtilService as FormAndFrameworkUtilService,
+            mockSplaschreenDeeplinkActionHandlerDelegate as SplaschreenDeeplinkActionHandlerDelegate
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should initialize LogoutHandlerService', () => {
+        expect(segmentationTagService).toBeDefined();
+    });
+
+    describe('presistTags', () => {
+        it('tags should be saved in db', (done) => {
+            // arrnage
+            jest.spyOn(mockSegmentationService, 'saveTags');
+            // act
+            segmentationTagService.persistSegmentation();
+            // assert
+            setTimeout(() => {
+                expect(mockSegmentationService.saveTags).toBeCalled();
+                done();
+            }, 100);
+        })
+    });
+
+    describe('getPersistedSegmentaion', () => {
+        it('get all tags and commands stored in db and and trigger the Local notification command', (done) => {
+            // arrnage
+            const tagsStored = {
+                __tagList: ['UA_English'],
+                __tagObj: [{ name: 'Tags' }],
+                __tagSnapShot: {
+                    prifix_: { name: 'Tags' }
+                }
+            };
+            const cmdStored = [
+                {
+                    cmommandId: 12387182678
+                }
+            ];
+            jest.spyOn(mockSegmentationService, 'getTags').mockReturnValue(of(JSON.stringify(tagsStored)));
+            jest.spyOn(mockSegmentationService, 'getCommand').mockReturnValue(of(JSON.stringify(cmdStored)));
+            jest.spyOn(segmentationTagService, 'getSegmentCommand');
+            // act
+            segmentationTagService.getPersistedSegmentaion();
+            // assert
+            setTimeout(() => {
+                expect(mockSegmentationService.getTags).toBeCalled();
+                expect(mockSegmentationService.getCommand).toBeCalled();
+                expect(mockNotificationSrc.setupLocalNotification).toBeCalled();
+                done();
+            }, 100);
+        });
+    });
+
+    describe('handleLocalNotificationTap', () => {
+        it('handle actionable local notification', () => {
+            // arrange
+            segmentationTagService.localNotificationId = 14;
+            segmentationTagService.exeCommands = [{
+                controlFunctionPayload: [{
+                    config: [{
+                        id: 14
+                    }]
+                }]
+            }];
+            // act
+            segmentationTagService.handleLocalNotificationTap();
+            // assert
+            expect(mockSplaschreenDeeplinkActionHandlerDelegate.onAction).toBeCalled();
+            expect(segmentationTagService.localNotificationId).toBe(null);
+        });
+    });
+});
diff --git a/src/services/segmentation-tag/segmentation-tag.service.ts b/src/services/segmentation-tag/segmentation-tag.service.ts
new file mode 100644
index 000000000..20871789d
--- /dev/null
+++ b/src/services/segmentation-tag/segmentation-tag.service.ts
@@ -0,0 +1,142 @@
+import { Inject, Injectable } from "@angular/core";
+import { PreferenceKey, ProfileConstants } from "@app/app/app.constant";
+import { AuthService, Profile, ProfileService, SegmentationService, SharedPreferences } from 'sunbird-sdk';
+import { AppGlobalService } from "../app-global-service.service";
+import { NotificationService } from '@app/services/notification.service';
+import * as _ from "dayjs/locale/*";
+import { FormAndFrameworkUtilService } from "../formandframeworkutil.service";
+import { SplaschreenDeeplinkActionHandlerDelegate } from "../sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate";
+export class TagPrefixConstants {
+    static readonly DEVICE_CONFIG = 'DEVCONFIG_';
+    static readonly USER_ATRIBUTE = 'USERFRAMEWORK_';
+    static readonly USER_LOCATION = 'USERLOCATION_';
+    static readonly CONTENT_ID = 'CONTENT_';
+    static readonly USER_LANG = 'USERLANG_';
+}
+
+export class CommandFunctions {
+    static readonly LOCAL_NOTIFICATION = 'LOCAL_NOTIF';
+}
+
+@Injectable()
+export class SegmentationTagService {
+
+    private _localNotificationId: number;
+    public exeCommands = [];
+
+    private comdList = [];
+
+    set localNotificationId(id) {
+        this._localNotificationId = id;
+    }
+
+    get localNotificationId() {
+        return this._localNotificationId;
+    }
+
+    constructor(
+        @Inject('SEGMENTATION_SERVICE') private segmentationService: SegmentationService,
+        @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+        @Inject('AUTH_SERVICE') private authService: AuthService,
+        @Inject('SHARED_PREFERENCES') private preferences: SharedPreferences,
+        private notificationSrc: NotificationService,
+        private appGlobalService: AppGlobalService,
+        private formAndFrameworkUtilService: FormAndFrameworkUtilService,
+        private splaschreenDeeplinkActionHandlerDelegate: SplaschreenDeeplinkActionHandlerDelegate
+    ) {
+    }
+
+    persistSegmentation() {
+        this.profileService.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS }).toPromise()
+        .then((userProfile: Profile) => {
+            if (userProfile && userProfile.uid) {
+                console.log(this);
+
+                this.segmentationService.saveTags(JSON.stringify(window['segmentation'].SBTagService), userProfile.uid)
+                .subscribe(response => {
+                    console.log(response);
+                    response ? window['segmentation'].SBTagService.removeAllTags() : null;
+                });
+                this.segmentationService.saveCommandList(JSON.stringify(this.exeCommands), userProfile.uid).subscribe(response => {
+                    console.log(response);
+                    response ? this.exeCommands = [] : null;
+                });
+            }
+        });
+    }
+
+    getPersistedSegmentaion() {
+        this.profileService.getActiveSessionProfile({ requiredFields: ProfileConstants.REQUIRED_FIELDS }).toPromise()
+        .then((userProfile: Profile) => {
+            if (userProfile && userProfile.uid) {
+                console.log(userProfile.uid);
+                this.segmentationService.getTags(userProfile.uid)
+                .subscribe(response => {
+                    if (response) {
+                        window['segmentation'].SBTagService.restoreTags(response);
+                    }
+                });
+
+                this.segmentationService.getCommand(userProfile.uid)
+                .subscribe(cmdList => {
+                    if (cmdList) {
+                        this.exeCommands = JSON.parse(cmdList);
+                    }
+                    this.getSegmentCommand();
+                });
+            }
+        });
+    }
+
+    getSegmentCommand() {
+        // FormConfig for Segment
+        this.formAndFrameworkUtilService.getSegmentationCommands()
+        .then(cmdList => {
+            if(cmdList && cmdList.length) {
+                this.comdList = cmdList;
+                this.evalCriteria();
+            }
+        });
+    }
+
+    evalCriteria() {
+        const validCommand = window['segmentation'].SBActionCriteriaService.evaluateCriteria(
+            window['segmentation'].SBTagService.__tagList,
+            this.comdList
+        );
+        this.executeCommand(validCommand);
+    }
+
+    async executeCommand(validCmdList) {
+        /*
+        ** check if command already exist in command list
+        ** check if command already executed, then do nothing
+        ** if new command then execute command and store it in executedCommandList
+        */
+        const selectedLanguage = await this.preferences.getString(PreferenceKey.SELECTED_LANGUAGE_CODE).toPromise();
+        validCmdList.forEach(cmdCriteria => {
+            if (!this.exeCommands.find(ele => ele.commandId === cmdCriteria.commandId)) {
+                switch(cmdCriteria.controlFunction) {
+                    case CommandFunctions.LOCAL_NOTIFICATION:
+                        this.notificationSrc.setupLocalNotification(selectedLanguage, cmdCriteria.controlFunctionPayload);
+                        this.exeCommands.push(cmdCriteria);
+                        break;
+                    default:
+                        break;
+                }
+            }
+        });
+        this.handleLocalNotificationTap();
+    }
+
+    handleLocalNotificationTap() {
+        let payloadData;
+        if (this._localNotificationId) {
+            payloadData = this.exeCommands.find((ele) => {
+                return ele.controlFunctionPayload[0].config[0].id === this._localNotificationId;
+            }).controlFunctionPayload[0].config;
+            this.splaschreenDeeplinkActionHandlerDelegate.onAction(payloadData[0]);
+            this.localNotificationId = null;
+        }
+    }
+}
diff --git a/src/services/sunbird-splashscreen/external-channel-override-interface.ts b/src/services/sunbird-splashscreen/external-channel-override-interface.ts
deleted file mode 100644
index 41f05e9b0..000000000
--- a/src/services/sunbird-splashscreen/external-channel-override-interface.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export interface ExternalChannelOverrideListener {
-  onChannelDetected(
-    event: {
-      url: string,
-      courseId: string;
-      channelId: string,
-      extras: {
-        profile?: {
-          userType?: string,
-          langCode?: string
-        }
-      };
-    },
-    callback: () => {}): void;
-}
diff --git a/src/services/sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate.spec.ts b/src/services/sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate.spec.ts
new file mode 100644
index 000000000..134f5bd34
--- /dev/null
+++ b/src/services/sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate.spec.ts
@@ -0,0 +1,559 @@
+import {SplaschreenDeeplinkActionHandlerDelegate} from './splaschreen-deeplink-action-handler-delegate';
+import {MimeType, RouterLinks} from '../../app/app.constant';
+import {Router} from '@angular/router';
+import {Events} from '@app/util/events';
+import {of} from 'rxjs';
+import {
+    AuthService,
+    ContentService,
+    CourseService,
+    FrameworkService,
+    FrameworkUtilService,
+    PageAssembleService,
+    ProfileService,
+    SharedPreferences,
+    StorageService,
+    TelemetryService
+} from 'sunbird-sdk';
+import {AppGlobalService} from '../app-global-service.service';
+import {TelemetryGeneratorService} from '../../services/telemetry-generator.service';
+import {CommonUtilService} from '../../services/common-util.service';
+import {AppVersion} from '@ionic-native/app-version/ngx';
+import {UtilityService} from '../utility-service';
+import {LoginHandlerService} from '../login-handler.service';
+import {TranslateService} from '@ngx-translate/core';
+import {QRScannerResultHandler} from '../qrscanresulthandler.service';
+import {SbProgressLoader} from '../sb-progress-loader.service';
+import {Location} from '@angular/common';
+import {NavigationService} from '../navigation-handler.service';
+import {ContentPlayerHandler} from '../content/player/content-player-handler';
+import {PageId} from '../telemetry-constants';
+import {FormAndFrameworkUtilService} from '../formandframeworkutil.service';
+import {mockDeeplinkConfig} from './splashscreen-deeplink-action-handler-delegate.spec.data';
+import {UpdateProfileService} from '../update-profile-service';
+import {mockContentData} from '../../app/content-details/content-details.page.spec.data';
+import {jest} from '@jest/globals';
+
+
+describe('SplaschreenDeeplinkActionHandlerDelegate', () => {
+    let splaschreenDeeplinkActionHandlerDelegate: SplaschreenDeeplinkActionHandlerDelegate;
+
+    const mockContentService: Partial<ContentService> = {};
+    const mockSharedPreferences: Partial<SharedPreferences> = {};
+    const mockAuthService: Partial<AuthService> = {};
+    const mockProfileService: Partial<ProfileService> = {};
+    const mockPageAssembleService: Partial<PageAssembleService> = {};
+    const mockFrameworkService: Partial<FrameworkService> = {};
+    const mockFrameworkUtilService: Partial<FrameworkUtilService> = {};
+    const mockTelemetryService: Partial<TelemetryService> = {};
+    const mockStorageService: Partial<StorageService> = {};
+    const mockCourseService: Partial<CourseService> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+    const mockAppGlobalService: Partial<AppGlobalService> = {};
+    const mockEvents: Partial<Events> = {
+        publish: jest.fn(),
+        subscribe: jest.fn()
+    };
+    const mockRouter: Partial<Router> = {};
+    const mockAppVersion: Partial<AppVersion> = {};
+    const mockUtilityService: Partial<UtilityService> = {};
+    const mockLoginHandlerService: Partial<LoginHandlerService> = {};
+    const mockTranslateService: Partial<TranslateService> = {};
+    const mockQRScannerResultHandler: Partial<QRScannerResultHandler> = {};
+    const mockSbProgressLoader: Partial<SbProgressLoader> = {};
+    const mockLocation: Partial<Location> = {};
+    const mockNavigationService: Partial<NavigationService> = {};
+    const mockContentPlayerHandler: Partial<ContentPlayerHandler> = {};
+    const mockFormnFrameworkUtilService: Partial<FormAndFrameworkUtilService> = {
+        getFormFields: jest.fn(() => Promise.resolve([]))
+    };
+    const mockUpdateProfileService: Partial<UpdateProfileService> = {};
+
+    beforeAll(() => {
+        splaschreenDeeplinkActionHandlerDelegate = new SplaschreenDeeplinkActionHandlerDelegate(
+            mockContentService as ContentService,
+            mockSharedPreferences as SharedPreferences,
+            mockAuthService as AuthService,
+            mockProfileService as ProfileService,
+            mockPageAssembleService as PageAssembleService,
+            mockFrameworkService as FrameworkService,
+            mockFrameworkUtilService as FrameworkUtilService,
+            mockTelemetryService as TelemetryService,
+            mockStorageService as StorageService,
+            mockCourseService as CourseService,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockCommonUtilService as CommonUtilService,
+            mockAppGlobalService as AppGlobalService,
+            mockEvents as Events,
+            mockRouter as Router,
+            mockAppVersion as AppVersion,
+            mockUtilityService as UtilityService,
+            mockLoginHandlerService as LoginHandlerService,
+            mockTranslateService as TranslateService,
+            mockQRScannerResultHandler as QRScannerResultHandler,
+            mockSbProgressLoader as SbProgressLoader,
+            mockLocation as Location,
+            mockNavigationService as NavigationService,
+            mockContentPlayerHandler as ContentPlayerHandler,
+            mockFormnFrameworkUtilService as FormAndFrameworkUtilService,
+            mockUpdateProfileService as UpdateProfileService
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should create an instance of SplaschreenDeeplinkActionHandlerDelegate', () => {
+        expect(splaschreenDeeplinkActionHandlerDelegate).toBeTruthy();
+    });
+
+    describe('onAction()', () => {
+        it('should navigate to the Profile page if user is logged in', (done) => {
+            // arrange
+            const payload = {
+                url: 'https://staging.sunbirded.org/profile'
+            };
+            mockQRScannerResultHandler.parseDialCode = jest.fn(() => Promise.resolve(undefined));
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => true);
+            mockSbProgressLoader.show = jest.fn();
+            mockSbProgressLoader.hide = jest.fn();
+            mockSharedPreferences.getString = jest.fn(() => of('true'));
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            mockFormnFrameworkUtilService.getFormFields = jest.fn(() => Promise.resolve(mockDeeplinkConfig));
+            // act
+            splaschreenDeeplinkActionHandlerDelegate.onAction(payload);
+            // assert
+            setTimeout(() => {
+                expect(mockQRScannerResultHandler.parseDialCode).toHaveBeenCalledWith(payload.url);
+                done();
+            }, 0);
+        });
+
+        it('should navigate to the Guest-Profile page if user is not logged in', (done) => {
+            // arrange
+            const payload = {
+                url: 'https://staging.sunbirded.org/profile'
+            };
+            mockQRScannerResultHandler.parseDialCode = jest.fn(() => Promise.resolve(undefined));
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+            mockSbProgressLoader.show = jest.fn();
+            mockSbProgressLoader.hide = jest.fn();
+            mockSharedPreferences.getString = jest.fn(() => of('true'));
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            mockFormnFrameworkUtilService.getFormFields = jest.fn(() => Promise.resolve(mockDeeplinkConfig));
+            // act
+            splaschreenDeeplinkActionHandlerDelegate.onAction(payload);
+            // assert
+            setTimeout(() => {
+                expect(mockQRScannerResultHandler.parseDialCode).toHaveBeenCalledWith(payload.url);
+                done();
+            }, 0);
+        });
+
+        it('should navigate to the library page if content ID is changed', (done) => {
+            // arrange
+            const payload = {
+                url: 'https://staging.sunbirded.org/learn/course/do_21312548637480550413399?contentId=asdsd'
+            };
+            mockQRScannerResultHandler.parseDialCode = jest.fn(() => Promise.resolve(undefined));
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+            mockSbProgressLoader.show = jest.fn();
+            mockSbProgressLoader.hide = jest.fn();
+            mockSharedPreferences.getString = jest.fn(() => of('true'));
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            mockTelemetryService.updateCampaignParameters = jest.fn();
+            mockTelemetryGeneratorService.generateUtmInfoTelemetry = jest.fn();
+            const content = {
+                identifier: 'do_212911645382959104165',
+                primaryCategory: 'Digital Textbook',
+                contentData: {primaryCategory: 'Digital Textbook', licenseDetails: undefined, attributions: ['sample-3', 'sample-1']},
+                isAvailableLocally: false,
+                children: {identifier: 'do_212911645382959104166'}
+            };
+            mockContentService.getContentDetails = jest.fn(() => of(content));
+            mockFormnFrameworkUtilService.getFormFields = jest.fn(() => Promise.resolve(mockDeeplinkConfig));
+            // act
+            splaschreenDeeplinkActionHandlerDelegate.onAction(payload);
+            // assert
+            setTimeout(() => {
+                expect(mockQRScannerResultHandler.parseDialCode).toHaveBeenCalledWith(payload.url);
+                expect(mockTelemetryService.updateCampaignParameters).toHaveBeenCalledWith([{id: 'asdsd', type: 'ContentId'}]);
+                expect(mockTelemetryGeneratorService.generateUtmInfoTelemetry).toHaveBeenCalledWith(
+                    {contentId: 'asdsd'},
+                    PageId.HOME,
+                    {id: 'do_21312548637480550413399', type: 'Content', version: undefined},
+                    [{id: 'Deeplink', type: 'AccessType'}]);
+                expect(mockContentService.getContentDetails).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should navigate to the search page if selectedTab is available in the deeplink', (done) => {
+            // arrange
+            const payload = {
+                url: 'https://staging.sunbirded.org/explore?medium=Hindi&medium=English&gradeLevel=Class%201&' +
+                    'gradeLevel=Class%2010&&&publisher=NCERT&channel=01283607456185548825093&board=CBSE&mediaType=video&selectedTab=textbook'
+            };
+            mockQRScannerResultHandler.parseDialCode = jest.fn(() => Promise.resolve(undefined));
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+            mockSbProgressLoader.show = jest.fn();
+            mockSbProgressLoader.hide = jest.fn();
+            mockSharedPreferences.getString = jest.fn(() => of('true'));
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            mockFormnFrameworkUtilService.getFormFields = jest.fn(() => Promise.resolve(mockDeeplinkConfig));
+            mockTelemetryService.updateCampaignParameters = jest.fn();
+            mockTelemetryGeneratorService.generateUtmInfoTelemetry = jest.fn();
+            // act
+            splaschreenDeeplinkActionHandlerDelegate.onAction(payload);
+            // assert
+            setTimeout(() => {
+                expect(mockRouter.navigate).toHaveBeenCalledWith([
+                        'search'
+                    ],
+                    {
+                        state: {
+                            preAppliedFilter: {
+                                filters: {
+                                    board: [
+                                        'CBSE'
+                                    ],
+                                    channel: [
+                                        '01283607456185548825093'
+                                    ],
+                                    gradeLevel: [
+                                        'Class 1',
+                                        'Class 10'
+                                    ],
+                                    medium: [
+                                        'Hindi',
+                                        'English'
+                                    ],
+                                    mimeType: [],
+                                    objectType: [
+                                        'Content'
+                                    ],
+                                    primaryCategory: [
+                                        'Digital Textbook',
+                                        'eTextbook'
+                                    ],
+                                    status: [
+                                        'Live'
+                                    ]
+                                },
+                                query: ''
+                            },
+                            source: 'splash'
+                        }
+                    });
+                done();
+            }, 0);
+        });
+
+        it('should navigate to the search page with mimeType in filter if selectedTab is available in the deeplink', (done) => {
+            // arrange
+            const payload = {
+                url: 'https://staging.sunbirded.org/search/explore/1?medium=Hindi&medium=English&gradeL' +
+                    'evel=Class%201&gradeLevel=Class%2010&&&publisher=NCERT&channel' +
+                    '=01283607456185548825093&board=CBSE&mediaType=video&selectedTab=all'
+            };
+            mockQRScannerResultHandler.parseDialCode = jest.fn(() => Promise.resolve(undefined));
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+            mockSbProgressLoader.show = jest.fn();
+            mockSbProgressLoader.hide = jest.fn();
+            mockSharedPreferences.getString = jest.fn(() => of('true'));
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            mockFormnFrameworkUtilService.getFormFields = jest.fn(() => Promise.resolve(mockDeeplinkConfig));
+            // act
+            splaschreenDeeplinkActionHandlerDelegate.onAction(payload);
+            // assert
+            setTimeout(() => {
+                expect(mockQRScannerResultHandler.parseDialCode).toHaveBeenCalledWith(payload.url);
+                done();
+            }, 0);
+        });
+
+        it('should check for payload and action if its search navigate to SearchPage', (done) => {
+            // arrange
+            mockRouter.navigate = jest.fn();
+            mockSbProgressLoader.show = jest.fn();
+            mockSbProgressLoader.hide = jest.fn();
+            // act
+            splaschreenDeeplinkActionHandlerDelegate.onAction({action: 'ACTION_SEARCH', data: {request: 'sample'}});
+            // assert
+            setTimeout(() => {
+                expect(mockRouter.navigate).toHaveBeenCalledWith([RouterLinks.SEARCH], {state: {preAppliedFilter: 'sample'}});
+                done();
+            }, 0);
+        });
+
+        describe('action_GOTO', () => {
+            it('should handle payload and action navigation goTO', (done) => {
+                // arrange
+                mockRouter.navigate = jest.fn();
+                mockSbProgressLoader.show = jest.fn();
+                mockSbProgressLoader.hide = jest.fn();
+                // act
+                splaschreenDeeplinkActionHandlerDelegate.onAction({
+                    action: 'ACTION_GOTO',
+                    data: {request: {params: 'sample', route: 'sample'}}
+                });
+                // assert
+                setTimeout(() => {
+                    expect(mockRouter.navigate).toHaveBeenCalledWith(['sample'], {state: {params: 'sample'}});
+                    done();
+                }, 0);
+            });
+
+            it('should handle and navigate if there is no data request', (done) => {
+                // arrange
+                mockRouter.navigate = jest.fn();
+                mockSbProgressLoader.show = jest.fn();
+                mockSbProgressLoader.hide = jest.fn();
+                // act
+                splaschreenDeeplinkActionHandlerDelegate.onAction({action: 'ACTION_GOTO', data: {request: {route: 'sample'}}});
+                // assert
+                setTimeout(() => {
+                    expect(mockRouter.navigate).toHaveBeenCalledWith(['sample']);
+                    done();
+                }, 0);
+            });
+        });
+
+        it('should look for ACTION_SETPROFILE and if matches update profile according to the data', (done) => {
+            // arrange
+            mockUpdateProfileService.checkProfileData = jest.fn();
+            mockAppGlobalService.getCurrentUser = jest.fn();
+            mockSbProgressLoader.show = jest.fn();
+            // act
+            splaschreenDeeplinkActionHandlerDelegate.onAction({
+                action: 'ACTION_SETPROFILE',
+                data: {request: {board: ['CBSE'], medium: ['English'], grade: ['Class 10']}}
+            });
+            // assert
+            setTimeout(() => {
+                expect(mockUpdateProfileService.checkProfileData).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should navigate to details page if ACTION_PLAY is set', (done) => {
+            // arrange
+            mockContentService.getContentDetails = jest.fn(() => of(mockContentData));
+            mockAppGlobalService.resetSavedQuizContent = jest.fn();
+            mockRouter.navigate = jest.fn();
+            // act
+            splaschreenDeeplinkActionHandlerDelegate.onAction({action: 'ACTION_PLAY', data: {request: {objectId: 'do-123'}}});
+            // assert
+            setTimeout(() => {
+                expect(mockContentService.getContentDetails).toHaveBeenCalled();
+                expect(mockRouter.navigate).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should handle normal deeplink it ACTION_DEEPLINK is set', (done) => {
+            // arrange
+            mockAppGlobalService.resetSavedQuizContent = jest.fn();
+            mockQRScannerResultHandler.parseDialCode = jest.fn(() => Promise.resolve(undefined));
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+            mockSbProgressLoader.show = jest.fn();
+            mockSbProgressLoader.hide = jest.fn();
+            mockSharedPreferences.getString = jest.fn(() => of('true'));
+            mockRouter.navigate = jest.fn(() => Promise.resolve(true));
+            mockTelemetryService.updateCampaignParameters = jest.fn();
+            mockTelemetryGeneratorService.generateUtmInfoTelemetry = jest.fn();
+            const content = {
+                identifier: 'do_212911645382959104165',
+                primaryCategory: 'Digital Textbook',
+                contentData: {primaryCategory: 'Digital Textbook', licenseDetails: undefined, attributions: ['sample-3', 'sample-1']},
+                isAvailableLocally: false,
+                children: {identifier: 'do_212911645382959104166'}
+            };
+            mockContentService.getContentDetails = jest.fn(() => of(content));
+            mockFormnFrameworkUtilService.getFormFields = jest.fn(() => Promise.resolve(mockDeeplinkConfig));
+            mockTelemetryGeneratorService.generateAppLaunchTelemetry = jest.fn();
+            // act
+            splaschreenDeeplinkActionHandlerDelegate.onAction({
+                action: 'ACTION_DEEPLINK',
+                data: {request: {url: 'https://staging.sunbirded.org/learn/course/do_21312548637480550413399?contentId=asdsd'}}
+            });
+            // assert
+            setTimeout(() => {
+                expect(mockContentService.getContentDetails).toHaveBeenCalled();
+                expect(mockFormnFrameworkUtilService.getFormFields).toHaveBeenCalled();
+                expect(mockSbProgressLoader.show).toHaveBeenCalled();
+                expect(mockSharedPreferences.getString).toHaveBeenCalled();
+                expect(mockRouter.navigate).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should check for onboardingCompleted set to false and set profile data to the app', (done) => {
+            // arrange
+            mockAppGlobalService.resetSavedQuizContent = jest.fn();
+            mockQRScannerResultHandler.parseDialCode = jest.fn(() => Promise.resolve(undefined));
+            mockAppGlobalService.isUserLoggedIn = jest.fn(() => false);
+            mockSbProgressLoader.show = jest.fn();
+            mockSbProgressLoader.hide = jest.fn();
+            mockFormnFrameworkUtilService.getFormFields = jest.fn(() => Promise.resolve(mockDeeplinkConfig));
+            mockSharedPreferences.getString = jest.fn(() => of('false'));
+            mockFrameworkService.searchOrganization = jest.fn(() => of({
+                count: 10,
+                content: [{
+                    id: 'sample_id'
+                }]
+            }));
+            mockProfileService.updateProfile = jest.fn(() => of({
+                uid: 'sample_uid',
+                handle: 'sample_handle',
+                board: ['cbse']
+            }));
+            mockFrameworkService.getChannelDetails = jest.fn(() => of({
+                defaultFramework: ''
+            }));
+            mockFrameworkUtilService.getFrameworkCategoryTerms = jest.fn(() => of([{
+                    code: 'sample_code'
+                }]
+            ));
+            mockRouter.navigate = jest.fn();
+            mockLocation.replaceState = jest.fn();
+            mockRouter.serializeUrl = jest.fn(() => 'sample_serialize_url');
+            mockRouter.createUrlTree = jest.fn();
+            mockTelemetryService.updateCampaignParameters = jest.fn();
+            mockTelemetryGeneratorService.generateUtmInfoTelemetry = jest.fn();
+            mockPageAssembleService.setPageAssembleChannel = jest.fn();
+            // act
+            splaschreenDeeplinkActionHandlerDelegate.onAction({
+                url: 'https://staging.sunbirded.org/profile?cha' +
+                    'nnel=01283607456185548825093'
+            });
+            // assert
+            setTimeout(() => {
+                expect(mockFormnFrameworkUtilService.getFormFields).toHaveBeenCalled();
+                expect(mockSharedPreferences.getString).toHaveBeenCalled();
+                expect(mockRouter.navigate).toHaveBeenCalled();
+                expect(mockLocation.replaceState).toHaveBeenCalled();
+                expect(mockRouter.serializeUrl).toHaveBeenCalled();
+                expect(mockRouter.createUrlTree).toHaveBeenCalled();
+                expect(mockTelemetryService.updateCampaignParameters).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateUtmInfoTelemetry).toHaveBeenCalled();
+                expect(mockPageAssembleService.setPageAssembleChannel).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should navigate to content-details page if link has quiz content', (done) => {
+            // arrange
+            mockQRScannerResultHandler.parseDialCode = jest.fn(() => Promise.resolve(undefined));
+            mockFormnFrameworkUtilService.getFormFields = jest.fn(() => Promise.resolve(mockDeeplinkConfig));
+            mockSbProgressLoader.show = jest.fn();
+            mockTelemetryService.updateCampaignParameters = jest.fn();
+            mockTelemetryGeneratorService.generateUtmInfoTelemetry = jest.fn();
+            mockSbProgressLoader.hide = jest.fn();
+            mockSharedPreferences.getString = jest.fn(() => of('true'));
+            mockContentService.getContentDetails = jest.fn(() => of({
+                contentData: {
+                    status: 'Unlisted'
+                },
+                mimeType: MimeType.COLLECTION
+            }));
+            mockAppGlobalService.resetSavedQuizContent = jest.fn();
+            mockTelemetryGeneratorService.generateAppLaunchTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockRouter.navigate = jest.fn();
+            // act
+            splaschreenDeeplinkActionHandlerDelegate.onAction({url: 'https://staging.ntp.net.in/play/collection/do_21271706502665830417247?contentId=do_21271701994615603217195'});
+            // assert
+            setTimeout(() => {
+                expect(mockQRScannerResultHandler.parseDialCode).toHaveBeenCalled();
+                expect(mockFormnFrameworkUtilService.getFormFields).toHaveBeenCalled();
+                expect(mockSbProgressLoader.show).toHaveBeenCalled();
+                expect(mockTelemetryService.updateCampaignParameters).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateUtmInfoTelemetry).toHaveBeenCalled();
+                expect(mockSharedPreferences.getString).toHaveBeenCalled();
+                expect(mockContentService.getContentDetails).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        describe('navigation content', () => {
+            it('should navigate to collection if content id matches mimeType', (done) => {
+                // arrange
+                mockQRScannerResultHandler.parseDialCode = jest.fn(() => Promise.resolve(undefined));
+                mockFormnFrameworkUtilService.getFormFields = jest.fn(() => Promise.resolve(mockDeeplinkConfig));
+                mockSbProgressLoader.show = jest.fn();
+                mockTelemetryService.updateCampaignParameters = jest.fn();
+                mockTelemetryGeneratorService.generateUtmInfoTelemetry = jest.fn();
+                mockSbProgressLoader.hide = jest.fn();
+                mockSharedPreferences.getString = jest.fn(() => of('true'));
+                mockContentService.getContentDetails = jest.fn(() => of({
+                    mimeType: MimeType.COLLECTION,
+                    isAvailableLocally: true
+                }));
+                mockAppGlobalService.resetSavedQuizContent = jest.fn();
+                mockTelemetryGeneratorService.generateAppLaunchTelemetry = jest.fn();
+                mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+                mockRouter.navigate = jest.fn();
+                mockContentService.getChildContents = jest.fn(() => of());
+                mockNavigationService.navigateToCollection = jest.fn();
+                // act
+                splaschreenDeeplinkActionHandlerDelegate.onAction({
+                    url: 'https://staging.ntp.net.in/play/' +
+                        'collection/do_21271706502665830417247?contentId=do_21271701994615603217195'
+                });
+                // assert
+                setTimeout(() => {
+                    expect(mockQRScannerResultHandler.parseDialCode).toHaveBeenCalled();
+                    expect(mockFormnFrameworkUtilService.getFormFields).toHaveBeenCalled();
+                    expect(mockSbProgressLoader.show).toHaveBeenCalled();
+                    expect(mockTelemetryService.updateCampaignParameters).toHaveBeenCalled();
+                    expect(mockTelemetryGeneratorService.generateUtmInfoTelemetry).toHaveBeenCalled();
+                    expect(mockSharedPreferences.getString).toHaveBeenCalled();
+                    expect(mockContentService.getContentDetails).toHaveBeenCalled();
+                    done();
+                }, 0);
+            });
+
+            it('should import collection if content is not available locally', (done) => {
+                // arrange
+                mockQRScannerResultHandler.parseDialCode = jest.fn(() => Promise.resolve(undefined));
+                mockFormnFrameworkUtilService.getFormFields = jest.fn(() => Promise.resolve(mockDeeplinkConfig));
+                mockSbProgressLoader.show = jest.fn();
+                mockTelemetryService.updateCampaignParameters = jest.fn();
+                mockTelemetryGeneratorService.generateUtmInfoTelemetry = jest.fn();
+                mockSbProgressLoader.hide = jest.fn();
+                mockSharedPreferences.getString = jest.fn(() => of('true'));
+                mockContentService.getContentDetails = jest.fn(() => of({
+                    mimeType: MimeType.COLLECTION,
+                    isAvailableLocally: false
+                }));
+                mockAppGlobalService.resetSavedQuizContent = jest.fn();
+                mockTelemetryGeneratorService.generateAppLaunchTelemetry = jest.fn();
+                mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+                mockRouter.navigate = jest.fn();
+                mockContentService.importContent = jest.fn(() => of());
+                mockContentService.getContentHeirarchy = jest.fn(() => of({
+                    identifier: 'do_123',
+                }));
+                mockStorageService.getStorageDestinationDirectoryPath = jest.fn(() => 'file://');
+                mockNavigationService.navigateToCollection = jest.fn();
+                // act
+                splaschreenDeeplinkActionHandlerDelegate.onAction({
+                    url: 'https://staging.ntp.net.in/play/' +
+                        'collection/do_21271706502665830417247?contentId=do_21271701994615603217195'
+                });
+                // assert
+                setTimeout(() => {
+                    expect(mockContentService.getContentDetails).toHaveBeenCalled();
+                    expect(mockContentService.importContent).toHaveBeenCalled();
+                    expect(mockContentService.getContentHeirarchy).toHaveBeenCalled();
+                    done();
+                }, 0);
+            });
+
+        });
+    });
+});
diff --git a/src/services/sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate.ts b/src/services/sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate.ts
index 8431c4776..142618f11 100644
--- a/src/services/sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate.ts
+++ b/src/services/sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate.ts
@@ -1,7 +1,14 @@
-import { ContentFilterConfig, PreferenceKey, ProfileConstants, appLanguages } from '@app/app/app.constant';
+import {
+  ContentFilterConfig,
+  PreferenceKey,
+  ProfileConstants,
+  appLanguages,
+  ProgressPopupContext,
+  IgnoreTelemetryPatters
+} from '@app/app/app.constant';
 import { Inject, Injectable } from '@angular/core';
-import { Router } from '@angular/router';
-import { Events, PopoverController } from '@ionic/angular';
+import { Router, NavigationExtras } from '@angular/router';
+import { Events } from '@app/util/events';
 import { Observable, of } from 'rxjs';
 import {
   PageAssembleService,
@@ -20,42 +27,57 @@ import {
   FrameworkCategoryCodesGroup,
   ProfileSource,
   CorrelationData,
-  TelemetryObject
- } from 'sunbird-sdk';
+  TelemetryObject,
+  TelemetryService,
+  ContentDetailRequest,
+  ChildContentRequest,
+  ContentImportRequest,
+  StorageService,
+  ContentImport,
+  Rollup,
+  FetchEnrolledCourseRequest,
+  CourseService, GetSuggestedFrameworksRequest, Framework, FrameworkDetailsRequest
+} from 'sunbird-sdk';
 import { SplashscreenActionHandlerDelegate } from './splashscreen-action-handler-delegate';
-import { ContentType, MimeType, EventTopics, RouterLinks, LaunchType } from '../../app/app.constant';
+import { MimeType, EventTopics, RouterLinks, LaunchType } from '../../app/app.constant';
 import { AppGlobalService } from '../app-global-service.service';
 import { TelemetryGeneratorService } from '@app/services/telemetry-generator.service';
 import { CommonUtilService } from '@app/services/common-util.service';
 import { PageId, InteractType, Environment, ID, CorReleationDataType } from '../telemetry-constants';
 import { AppVersion } from '@ionic-native/app-version/ngx';
 import { UtilityService } from '../utility-service';
-import { SbPopoverComponent } from '@app/app/components/popups/sb-popover/sb-popover.component';
 import { LoginHandlerService } from '../login-handler.service';
 import { TranslateService } from '@ngx-translate/core';
-import { FormAndFrameworkUtilService } from '../formandframeworkutil.service';
 import { QRScannerResultHandler } from '../qrscanresulthandler.service';
-import { ExternalChannelOverrideListener } from './external-channel-override-interface';
-import { initTabs, GUEST_TEACHER_TABS } from '@app/app/module.service';
-import { ContainerService } from '../container.services';
 import { ContentUtil } from '@app/util/content-util';
 import * as qs from 'qs';
+import { SbProgressLoader, Context as SbProgressLoaderContext } from '../sb-progress-loader.service';
+import { Location } from '@angular/common';
+import { NavigationService } from '../navigation-handler.service';
+import { CsPrimaryCategory } from '@project-sunbird/client-services/services/content';
+import { ContentInfo } from '../content/content-info';
+import { ContentPlayerHandler } from '../content/player/content-player-handler';
+import { FormAndFrameworkUtilService } from '../formandframeworkutil.service';
+import { FormConstants } from '@app/app/form.constants';
+import {UpdateProfileService} from '@app/services/update-profile-service';
 
 @Injectable()
-export class SplaschreenDeeplinkActionHandlerDelegate implements SplashscreenActionHandlerDelegate, ExternalChannelOverrideListener {
-  private savedUrl: any;
+export class SplaschreenDeeplinkActionHandlerDelegate implements SplashscreenActionHandlerDelegate {
+  private savedPayloadUrl: any;
 
-  private _isDelegateReady = false;
   private isOnboardingCompleted = false;
-  private loginPopup: any;
   private currentAppVersionCode: number;
+  private progressLoaderId: string;
+  private childContent;
+  private isChildContentFound;
+  private enableRootNavigation = false;
+  private _context: any;
 
   // should delay the deeplinks until tabs is loaded- gets triggered from Resource components
   set isDelegateReady(val: boolean) {
-    this._isDelegateReady = val;
-    if (val && this.savedUrl) {
-      this.checkDeeplinkMatch(this.savedUrl);
-      this.savedUrl = null;
+    if (val && this.savedPayloadUrl) {
+      this.handleDeeplink(this.savedPayloadUrl);
+      this.savedPayloadUrl = null;
     }
   }
 
@@ -67,6 +89,9 @@ export class SplaschreenDeeplinkActionHandlerDelegate implements SplashscreenAct
     @Inject('PAGE_ASSEMBLE_SERVICE') private pageAssembleService: PageAssembleService,
     @Inject('FRAMEWORK_SERVICE') private frameworkService: FrameworkService,
     @Inject('FRAMEWORK_UTIL_SERVICE') private frameworkUtilService: FrameworkUtilService,
+    @Inject('TELEMETRY_SERVICE') private telemetryService: TelemetryService,
+    @Inject('STORAGE_SERVICE') private storageService: StorageService,
+    @Inject('COURSE_SERVICE') private courseService: CourseService,
     private telemetryGeneratorService: TelemetryGeneratorService,
     private commonUtilService: CommonUtilService,
     private appGlobalServices: AppGlobalService,
@@ -74,79 +99,201 @@ export class SplaschreenDeeplinkActionHandlerDelegate implements SplashscreenAct
     private router: Router,
     private appVersion: AppVersion,
     private utilityService: UtilityService,
-    private popoverCtrl: PopoverController,
     private loginHandlerService: LoginHandlerService,
     public translateService: TranslateService,
-    private formFrameWorkUtilService: FormAndFrameworkUtilService,
     private qrScannerResultHandler: QRScannerResultHandler,
-    private container: ContainerService
+    private sbProgressLoader: SbProgressLoader,
+    private location: Location,
+    private navService: NavigationService,
+    private contentPlayerHandler: ContentPlayerHandler,
+    private formnFrameworkUtilService: FormAndFrameworkUtilService,
+    private updateProfileService: UpdateProfileService
   ) {
     this.eventToSetDefaultOnboardingData();
-   }
+  }
+
+  set context(context) {
+    this._context = context;
+  }
 
-  onAction(payload: any): Observable<undefined> {
+  get context() {
+    return this._context;
+  }
+
+  onAction(payload: any, context?): Observable<undefined> {
+    if (context) {
+      this.context = context;
+    }
     if (payload && payload.url) {
-      this.checkDeeplinkMatch(payload.url);
+      this.handleDeeplink(payload.url);
+    } else if (payload && payload.action) {
+      this.handleVendorAppAction(payload);
     }
     return of(undefined);
   }
 
-  private async checkDeeplinkMatch(url: string) {
-    const dialCode = await this.qrScannerResultHandler.parseDialCode(url);
-    const urlRegex = new RegExp(await this.formFrameWorkUtilService.getDeeplinkRegexFormApi());
-    const urlMatch = url.match(urlRegex);
+  // This method is called only when the user redirects directly from the Playstore
+  checkUtmContent(utmVal: string): void {
+    const utmRegex = new RegExp(String.raw`(?:utm_content=(?<utm_content>[^&]*))`);
+    const res = utmRegex.exec(utmVal);
+    if (res && res.groups && res.groups.utm_content && res.groups.utm_content.length) {
+      const payload = { url: res.groups.utm_content };
+      this.onAction(payload);
+    }
+  }
+
+  private async handleDeeplink(payloadUrl: string) {
+    const dialCode = await this.qrScannerResultHandler.parseDialCode(payloadUrl);
+
+    // const urlRegex = new RegExp(await this.formFrameWorkUtilService.getDeeplinkRegexFormApi());
+    // const urlMatch = payloadUrl.match(urlRegex);
+
+    // TODO: Is supported URL or not.
+    // Assumptions priority cannot have value as 0 and two simiar urls should not have same priority level;
 
-    const payload = { url };
+    const deepLinkUrlConfig: { name: string, code: string, pattern: string, route: string, priority?: number, params?: {} }[] =
+        await this.formnFrameworkUtilService.getFormFields(FormConstants.DEEPLINK_CONFIG);
 
-    const cData: CorrelationData[] = this.generateUtmTelemetryEvent(urlMatch, dialCode, url);
+    let matchedDeeplinkConfig: { name: string, code: string, pattern: string, route: string, priority?: number } = null;
+    let urlMatch;
+
+    deepLinkUrlConfig.forEach(config => {
+      const urlRegexMatch = payloadUrl.match(new RegExp(config.pattern));
+      if (!!urlRegexMatch && (!matchedDeeplinkConfig || this.validateDeeplinkPriority(matchedDeeplinkConfig, config))) {
+        if (config.code === 'profile' && !this.appGlobalServices.isUserLoggedIn()) {
+          config.route = 'tabs/guest-profile';
+        }
+        matchedDeeplinkConfig = config;
+        urlMatch = urlRegexMatch;
+      }
+    });
 
-    // checks if the channel slug is present, else the normal deeplink flow executes
-    if (await this.checkCourseChannelSlug(payload, urlMatch, cData)) {
+    if (!matchedDeeplinkConfig) {
+      // TODO, toast message
       return;
     }
 
-    if ((urlMatch && urlMatch.groups) || dialCode) {
-      this.checkIfOnboardingComplete(urlMatch, dialCode, url, cData);
+    let identifier;
+    if (urlMatch && urlMatch.groups && Object.keys(urlMatch.groups).length) {
+      identifier = urlMatch.groups.quizId || urlMatch.groups.content_id || urlMatch.groups.course_id;
     }
-  }
 
-  private async checkIfOnboardingComplete(urlMatch, dialCode, inputUrl, cData?) {
-    if (!this.isOnboardingCompleted) {
+    await this.sbProgressLoader.show(this.generateProgressLoaderContext(payloadUrl, identifier, dialCode));
+
+    this.generateUtmTelemetryEvent(identifier, dialCode, payloadUrl);
+
+    // Read version code from deeplink.
+    const requiredVersionCode = this.getQueryParamValue(payloadUrl, 'vCode');
+    // Check if deelink is compatible with the current app.
+    if (requiredVersionCode && !(await this.isAppCompatible(requiredVersionCode))) {
+      this.closeProgressLoader();
+      this.upgradeAppPopover(requiredVersionCode);
+    } else {
       this.isOnboardingCompleted =
         (await this.preferences.getString(PreferenceKey.IS_ONBOARDING_COMPLETED).toPromise() === 'true') ? true : false;
+
+      // const session = await this.authService.getSession().toPromise();
+
+      // If onboarding not completed
+      if (!this.isOnboardingCompleted) {  // && !session
+        // skip info popup
+        this.appGlobalServices.skipCoachScreenForDeeplink = true;
+        this.enableRootNavigation = true;
+
+        // Set onboarding data if available in query params. e.g. channel, role, lang
+        await this.setOnboradingData(payloadUrl);
+      }
+      const attributeConfig = deepLinkUrlConfig.find(config => config.code === 'attributes');
+      this.handleNavigation(payloadUrl, identifier, dialCode, matchedDeeplinkConfig, attributeConfig.params['attributes'], urlMatch.groups);
     }
-    const session = await this.authService.getSession().toPromise();
+  }
 
-    const url = new URL(inputUrl);
-    // Read version code from deeplink.
-    const requiredVersionCode = url.searchParams.get('vCode');
-    let content = null;
+  // Lesser the value higher the priority
+  private validateDeeplinkPriority(matchedDeeplinkConfig, config) {
+    return (matchedDeeplinkConfig && !matchedDeeplinkConfig.priority && config.priority) ||
+      (matchedDeeplinkConfig && matchedDeeplinkConfig.priority
+        && config.priority && matchedDeeplinkConfig.priority > config.priority);
+  }
 
-    // checking only for quizId or content Id, since only contents can be considered as quiz.
-    if (urlMatch && urlMatch.groups && (urlMatch.groups.quizId || urlMatch.groups.contentId || urlMatch.groups.courseId)) {
-      content = await this.getContentData(urlMatch.groups.quizId || urlMatch.groups.contentId || urlMatch.groups.courseId);
-      if (!content && !dialCode) { return; }
+  private generateProgressLoaderContext(url, identifier, dialCode): SbProgressLoaderContext {
+    if (this.progressLoaderId) {
+      this.closeProgressLoader();
     }
-    if (requiredVersionCode && !(await this.isAppCompatible(requiredVersionCode))) {
-      this.upgradeAppPopover(requiredVersionCode);
-    } else if (this.isOnboardingCompleted || session) {
-      this.handleNavigation(urlMatch, content, dialCode, inputUrl, cData);
-    } else if (content && content.contentType === ContentType.COURSE.toLowerCase()) {
-      const params = {
-        userType: ProfileType.OTHER
+    this.progressLoaderId = dialCode || identifier || ProgressPopupContext.DEEPLINK;
+    const deeplinkUrl: URL = new URL(url);
+    const channelSlug = deeplinkUrl.searchParams.get('channel');
+    if (channelSlug) {
+      return {
+        id: this.progressLoaderId,
+        ignoreTelemetry: {
+          when: {
+            interact: IgnoreTelemetryPatters.IGNORE_DEEPLINK_PAGE_ID_EVENTS,
+            impression: IgnoreTelemetryPatters.IGNORE_CHANNEL_IMPRESSION_EVENTS
+          }
+        }
       };
-      this.setDefaultOnboardingData(params);
-      this.router.navigate([RouterLinks.ENROLLED_COURSE_DETAILS],
-        {
-          state: {
-            content,
-            isOnboardingSkipped: true,
-            corRelation: this.getCorrelationList(urlMatch.input, cData)
+    } else if (dialCode) {
+      return {
+        id: this.progressLoaderId,
+        ignoreTelemetry: {
+          when: {
+            interact: IgnoreTelemetryPatters.IGNORE_DIAL_CODE_PAGE_ID_EVENTS,
+            impression: IgnoreTelemetryPatters.IGNORE_DEEPLINK_PAGE_ID_EVENTS
           }
-        });
-    } else {
-      this.checkForDeeplinkWithoutOnboarding(content, inputUrl);
+        }
+      };
+    } else if (identifier) {
+      return {
+        id: this.progressLoaderId,
+        ignoreTelemetry: {
+          when: {
+            interact: IgnoreTelemetryPatters.IGNORE_DEEPLINK_PAGE_ID_EVENTS,
+            impression: IgnoreTelemetryPatters.IGNORE_DEEPLINK_PAGE_ID_EVENTS
+          }
+        }
+      };
     }
+    return {
+      id: this.progressLoaderId
+    };
+  }
+
+  private closeProgressLoader() {
+    this.sbProgressLoader.hide({
+      id: this.progressLoaderId
+    });
+    this.progressLoaderId = undefined;
+  }
+
+  private generateUtmTelemetryEvent(identifier, dialCode, url) {
+    // TODO: Here identifier and dialcode both could be undefined.
+    // TODO: What needs to pass if deeplink in not having neither identifier nor dialcode.
+    const telemetryObject = new TelemetryObject(identifier ? identifier : dialCode, identifier ? 'Content' : 'qr', undefined);
+    const utmUrl = url.slice(url.indexOf('?') + 1);
+    const params: { [param: string]: string } = qs.parse(utmUrl);
+    const utmcData: CorrelationData[] = [];
+
+    if (utmUrl !== url) {
+      ContentUtil.genrateUTMCData(params).forEach((element) => {
+        utmcData.push(element);
+      });
+    }
+
+    const corRelationData: CorrelationData[] = [{
+      id: CorReleationDataType.DEEPLINK,
+      type: CorReleationDataType.ACCESS_TYPE
+    }];
+    if (utmcData && utmcData.length) {
+      this.telemetryService.updateCampaignParameters(utmcData);
+      this.telemetryGeneratorService.generateUtmInfoTelemetry(params, PageId.HOME, telemetryObject, corRelationData);
+    }
+
+    return utmcData;
+  }
+
+  private getQueryParamValue(payloadUrl: string, queryParam: string): string {
+    const url = new URL(payloadUrl);
+    return url.searchParams.get(queryParam);
   }
 
   private async isAppCompatible(requiredVersionCode) {
@@ -158,7 +305,90 @@ export class SplaschreenDeeplinkActionHandlerDelegate implements SplashscreenAct
       && this.currentAppVersionCode >= requiredVersionCode);
   }
 
-  private async upgradeAppPopover(requiredVersionCode) {
+  private getRequest(payloadUrl: string, matchedDeeplinkConfig, attributeList) {
+    if (!matchedDeeplinkConfig.params || !Object.keys(matchedDeeplinkConfig.params).length) {
+      return undefined;
+    }
+
+    const url = new URL(payloadUrl);
+    const request: {
+      query?: string;
+      filters?: {};
+    } = {};
+    const filters = this.getDefaultFilter(matchedDeeplinkConfig.params);
+    const queryParamFilters = {};
+    const urlAttributeList = [];
+    request.query = url.searchParams.get(matchedDeeplinkConfig.params.key) || '';
+    if (url.searchParams.has('se_mediums')) {
+      url.searchParams.set('medium', url.searchParams.get('se_mediums'));
+    }
+    if (url.searchParams.has('se_boards')) {
+      url.searchParams.set('board', url.searchParams.get('se_boards'));
+    }
+    if (url.searchParams.has('se_gradeLevels')) {
+      url.searchParams.set('gradeLevel', url.searchParams.get('se_gradeLevels'));
+    }
+    if (url.searchParams.has('se_subjects')) {
+      url.searchParams.set('subject', url.searchParams.get('se_subjects'));
+    }
+    url.searchParams.forEach((value, key) => {
+      urlAttributeList.push(key);
+    });
+
+    attributeList = attributeList.filter((attribute) =>  urlAttributeList.indexOf(attribute.code) >= 0
+          || urlAttributeList.indexOf(attribute.proxyCode) >= 0);
+    attributeList.forEach((attribute) => {
+      let values ;
+      if (attribute.type === 'Array') {
+         values = url.searchParams.getAll(attribute.proxyCode ? attribute.proxyCode : attribute.code);
+      } else if (attribute.type === 'String') {
+         values = url.searchParams.get(attribute.proxyCode ? attribute.proxyCode : attribute.code);
+      }
+
+      if (values && values.length) {
+        if (attribute.filter === 'custom') {
+          queryParamFilters[attribute.code] =
+                  this.getCustomFilterValues(matchedDeeplinkConfig.params, values, attribute);
+        } else {
+          queryParamFilters[attribute.code] = values;
+        }
+      }
+    });
+    request.filters = { ...filters, ...queryParamFilters };
+    return request;
+  }
+
+  private getDefaultFilter(deeplinkParams) {
+    if (!deeplinkParams || !deeplinkParams.data ||  !deeplinkParams.data.length) {
+      return {};
+    }
+    const defaultFilter = deeplinkParams.data.filter((param) => param.type === 'default');
+    return defaultFilter.reduce((acc, item) => {
+      acc[item.code] = item.values;
+      return acc;
+    }, {});
+  }
+
+  private getCustomFilterValues(deeplinkParams, values, attribute) {
+    if (!deeplinkParams || !deeplinkParams.data || !deeplinkParams.data.length) {
+      return [];
+    }
+    const customFilterData = deeplinkParams.data.find((param) => param.type === 'custom' && param.code === attribute.code);
+    console.log('deeplinkParams', deeplinkParams);
+    console.log('customFilterData', customFilterData);
+    console.log('attribute', attribute);
+
+    let customFilterOptions = [];
+    if (customFilterData && customFilterData.values) {
+      values.forEach((v) => {
+          const customFilterValues = customFilterData.values.find(m => m.name === v);
+          customFilterOptions = customFilterOptions.concat(customFilterValues ? customFilterValues.options : []);
+      });
+    }
+    return customFilterOptions;
+    }
+
+private async upgradeAppPopover(requiredVersionCode) {
     const packageName = await this.appVersion.getPackageName();
     const playStoreLink = `https://play.google.com/store/apps/details?id=${packageName}`;
     const result: any = {
@@ -179,114 +409,292 @@ export class SplaschreenDeeplinkActionHandlerDelegate implements SplashscreenAct
     await this.appGlobalServices.openPopover(result);
   }
 
-  private async checkForDeeplinkWithoutOnboarding(content: any, inputUrl: string): Promise<void> {
-    this.savedUrl = null;
-    if (this.loginPopup) {
-      await this.loginPopup.dismiss();
+  private async setOnboradingData(payloadUrl) {
+    const lang = this.getQueryParamValue(payloadUrl, 'lang');
+    this.setAppLanguage(lang);
+
+    const userType = this.getQueryParamValue(payloadUrl, 'role');
+    this.setUserType(userType);
+
+    const channelSlug = this.getQueryParamValue(payloadUrl, 'channel');
+    if (channelSlug) {
+      const orgSearchRequest = {
+        filters: {
+          slug: channelSlug,
+          isRootOrg: true
+        }
+      };
+
+      try {
+        const result = await this.frameworkService.searchOrganization(orgSearchRequest).toPromise();
+        const org: any = result.content && result.content[0];
+        if (org) {
+          const channelId = org.id;
+          this.setProfileData(channelId, payloadUrl);
+
+          // Set the channel for page assemble and load the channel specifc course page is available.
+          this.pageAssembleService.setPageAssembleChannel({ channelId });
+
+          setTimeout(() => {
+            this.events.publish(EventTopics.COURSE_PAGE_ASSEMBLE_CHANNEL_CHANGE);
+          }, 500);
+        }
+      } catch (e) {
+        console.error(e);
+      }
+    }
+
+    // initTabs(this.container, GUEST_TEACHER_TABS);
+    // this.events.publish('refresh:profile');
+  }
+
+  private async setAppLanguage(langCode: string) {
+    const selctedLangCode = await this.preferences.getString(PreferenceKey.SELECTED_LANGUAGE_CODE).toPromise();
+    const selectedLangLabel = await this.preferences.getString(PreferenceKey.SELECTED_LANGUAGE).toPromise();
+    if (!selctedLangCode && !selectedLangLabel) {
+      let languageDetail;
+      if (!langCode) {
+        // Set the default to english if not available.
+        langCode = 'en';
+      }
+      const LangList = appLanguages;
+      languageDetail = LangList.find(i => i.code === langCode);
+
+      await this.preferences.putString(PreferenceKey.SELECTED_LANGUAGE_CODE, languageDetail.code).toPromise();
+      this.translateService.use(languageDetail.code);
+
+      await this.preferences.putString(PreferenceKey.SELECTED_LANGUAGE, languageDetail.name).toPromise();
+    }
+  }
+
+  private async setUserType(userType) {
+    if (!(userType && Object.values(ProfileType).includes(userType))) {
+      userType = ProfileType.TEACHER;
     }
-    if (content && content.contentData && content.contentData.status === ContentFilterConfig.CONTENT_STATUS_UNLISTED &&
-      content.contentType !== ContentType.COURSE.toLowerCase() && content.mimeType !== MimeType.COLLECTION) {
-        this.showLoginWithoutOnboardingPopup(content.identifier || content.contentId);
-    } else {
-      this.savedUrl = inputUrl;
+    const selectedUserType = await this.preferences.getString(PreferenceKey.SELECTED_USER_TYPE).toPromise();
+    if (!selectedUserType) {
+      await this.preferences.putString(PreferenceKey.SELECTED_USER_TYPE, userType).toPromise();
     }
   }
 
-  private handleNavigation(urlMatch: any, content?: Content | null, dialCode?, inputUrl?, cData?): void {
-    if (this._isDelegateReady) {
-      if (dialCode) {
-        this.appGlobalServices.skipCoachScreenForDeeplink = true;
-        // TODO check urlMatch.input
-        this.telemetryGeneratorService.generateAppLaunchTelemetry(LaunchType.DEEPLINK, inputUrl);
-        this.router.navigate([RouterLinks.SEARCH],
-          {
+  private async setProfileData(channelId: string, payloadUrl) {
+    try {
+      const channelDetails: Channel = await this.frameworkService.getChannelDetails({ channelId }).toPromise();
+      const frameworkId = channelDetails.defaultFramework;
+
+      const categories = [
+        { code: FrameworkCategoryCode.BOARD, prevCode: null },
+        { code: FrameworkCategoryCode.MEDIUM, prevCode: FrameworkCategoryCode.BOARD },
+        { code: FrameworkCategoryCode.GRADE_LEVEL, prevCode: FrameworkCategoryCode.MEDIUM }
+      ];
+      const categoryData: any = {};
+      for (const category of categories) {
+        const boardCategoryTermsRequet: GetFrameworkCategoryTermsRequest = {
+          from: category.code === FrameworkCategoryCode.BOARD ? CachedItemRequestSourceFrom.SERVER : null,
+          frameworkId,
+          requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES,
+          currentCategoryCode: category.code,
+          language: this.translateService.currentLang,
+          selectedTermsCodes: category.prevCode ? [category.prevCode] : null
+        };
+        const terms = await this.frameworkUtilService.getFrameworkCategoryTerms(boardCategoryTermsRequet).toPromise();
+        categoryData[category.code] = terms[0].code;
+      }
+
+      // Get the active profile
+      const activeSessionProfile = await this.profileService.getActiveSessionProfile({
+        requiredFields: ProfileConstants.REQUIRED_FIELDS
+      }).toPromise();
+
+      const userType = await this.preferences.getString(PreferenceKey.SELECTED_USER_TYPE).toPromise();
+      const updateProfileRequest: Profile = {
+        ...activeSessionProfile,
+        syllabus: [frameworkId],
+        board: [categoryData[FrameworkCategoryCode.BOARD]],
+        medium: [categoryData[FrameworkCategoryCode.MEDIUM]],
+        grade: [categoryData[FrameworkCategoryCode.GRADE_LEVEL]],
+        handle: 'Guest1',
+        profileType: userType as any,
+        source: ProfileSource.LOCAL
+      };
+      const profile: Profile = await this.profileService.updateProfile(updateProfileRequest).toPromise();
+
+      // TODO: need to revisit below section
+      // initTabs(this.container, GUEST_TEACHER_TABS);
+      // this.events.publish('refresh:profile');
+      this.appGlobalServices.guestUserProfile = profile;
+
+      this.commonUtilService.handleToTopicBasedNotification();
+
+      setTimeout(async () => {
+        this.appGlobalServices.setOnBoardingCompleted();
+        // this.navigateToCourse(payload.courseId, payloadUrl);
+        this.loginHandlerService.setDefaultProfileDetails();
+      }, 1000);
+
+      this.events.publish('onboarding-card:completed', { isOnBoardingCardCompleted: true });
+      this.events.publish('refresh:profile');
+      this.appGlobalServices.guestUserProfile = profile;
+      this.telemetryGeneratorService.generateProfilePopulatedTelemetry(
+        PageId.HOME, profile, 'auto', Environment.ONBOARDING, ContentUtil.extractBaseUrl(payloadUrl)
+      );
+
+      this.isOnboardingCompleted = true;
+    } catch (e) {
+      this.closeProgressLoader();
+    }
+  }
+
+  private async handleNavigation(payloadUrl, identifier, dialCode, matchedDeeplinkConfig, attributeList, urlMatchGroup) {
+    const route = matchedDeeplinkConfig.route;
+    if (dialCode) {
+      this.telemetryGeneratorService.generateAppLaunchTelemetry(LaunchType.DEEPLINK, payloadUrl);
+      this.setTabsRoot();
+      this.router.navigate([route],
+        {
+          state: {
+            dialCode,
+            source: PageId.HOME,
+            corRelation: this.getCorrelationList(payloadUrl)
+          }
+        });
+    } else if (identifier) {
+      const content = await this.getContentData(identifier);
+      if (!content) {
+        this.closeProgressLoader();
+      } else {
+        this.navigateContent(identifier, true, content, payloadUrl, route);
+      }
+    } else {
+      let extras = {};
+      const request = this.getRequest(payloadUrl, matchedDeeplinkConfig, attributeList);
+      if (request && (request.query || request.filters && Object.keys(request.filters).length)) {
+        extras = {
+          state: {
+            source: PageId.SPLASH_SCREEN,
+            preAppliedFilter: {
+              query: request.query || '',
+              filters: {
+                status: ['Live'],
+                objectType: ['Content'],
+                ...request.filters
+              }
+            }
+          }
+        };
+      } else if (matchedDeeplinkConfig &&
+        matchedDeeplinkConfig.pattern && matchedDeeplinkConfig.pattern.includes('manage-learn')) {
+          extras = {
             state: {
-              dialCode,
-              source: PageId.HOME,
-              corRelation: this.getCorrelationList(inputUrl)
+              data: urlMatchGroup
             }
-          });
-      } else if (urlMatch && urlMatch.groups && (urlMatch.groups.quizId || urlMatch.groups.contentId || urlMatch.groups.courseId)) {
-        this.navigateContent(urlMatch.groups.quizId || urlMatch.groups.contentId || urlMatch.groups.courseId, true,
-          content, inputUrl, cData);
+          };
       }
-    } else {
-      this.savedUrl = inputUrl;
+      this.setTabsRoot();
+      // TODO: Needs to check route exists or not before navigating
+      this.router.navigate([route], extras);
+      this.closeProgressLoader();
     }
   }
 
-  async navigateContent(identifier, isFromLink = false, content?: Content | null, source?: string, cData?) {
+  /////////////////////////////////////////////////
+
+  async navigateContent(
+    identifier, isFromLink = false, content?: Content | null,
+    payloadUrl?: string, route?: string, coreRelationList?: Array<CorrelationData>
+  ) {
     try {
+      // TODO not required resetSavedQuizContent
       this.appGlobalServices.resetSavedQuizContent();
       if (!content) {
         content = await this.getContentData(identifier);
       }
 
       if (isFromLink) {
-        this.telemetryGeneratorService.generateAppLaunchTelemetry(LaunchType.DEEPLINK, source);
+        this.telemetryGeneratorService.generateAppLaunchTelemetry(LaunchType.DEEPLINK, payloadUrl);
       }
 
-      this.appGlobalServices.skipCoachScreenForDeeplink = true;
-      if (content.contentType === ContentType.COURSE.toLowerCase()) {
-        this.router.navigate([RouterLinks.ENROLLED_COURSE_DETAILS],
-          {
-            state: {
-              content,
-              corRelation: this.getCorrelationList(source, cData)
-            }
-          });
-      } else if (content.mimeType === MimeType.COLLECTION) {
-        if (this.router.url && this.router.url.indexOf(RouterLinks.COLLECTION_DETAIL_ETB) !== -1) {
-          this.events.publish(EventTopics.DEEPLINK_COLLECTION_PAGE_OPEN, { content });
-          return;
+      if (content && content.contentData &&
+        content.contentData.status === ContentFilterConfig.CONTENT_STATUS_UNLISTED) {
+        this.navigateQuizContent(identifier, content, isFromLink, payloadUrl, coreRelationList);
+      } else if (content) {
+        if (!route) {
+          route = this.getRouterPath(content);
+        }
+        if (content.mimeType === MimeType.COLLECTION) {
+          this.navigateToCollection(identifier, content, payloadUrl, route, false, false, coreRelationList);
+        } else {
+          this.setTabsRoot();
+          if (this.context && this.context.notificationPayload && this.context.notificationPayload.actionData.openPlayer) {
+            const contentInfo: ContentInfo = {
+              telemetryObject: undefined,
+              rollUp: undefined,
+              correlationList: coreRelationList,
+              hierachyInfo: undefined,
+              course: undefined
+            };
+            const navExtras = {
+              state: {
+                content: content,
+              }
+            };
+            const telemetryObject = {
+              corRelationList: []
+            };
+            this.contentPlayerHandler.playContent(content, navExtras, telemetryObject, false, false);
+            this.closeProgressLoader();
+          } else {
+            await this.router.navigate([route],
+              {
+                state: {
+                  content,
+                  corRelation: this.getCorrelationList(payloadUrl)
+                }
+              });
+          }
         }
-        this.router.navigate([RouterLinks.COLLECTION_DETAIL_ETB],
-          {
-            state: {
-              content,
-              corRelation: this.getCorrelationList(source, cData)
-            }
-          });
       } else {
         if (!this.commonUtilService.networkInfo.isNetworkAvailable) {
           this.commonUtilService.showToast('NEED_INTERNET_FOR_DEEPLINK_CONTENT');
           this.appGlobalServices.skipCoachScreenForDeeplink = false;
+          this.closeProgressLoader();
           return;
         }
-        if (content && content.contentData && content.contentData.status === ContentFilterConfig.CONTENT_STATUS_UNLISTED) {
-          this.navigateQuizContent(identifier, content, isFromLink, source, cData);
-        } else {
-          await this.router.navigate([RouterLinks.CONTENT_DETAILS],
-            {
-              state: {
-                content,
-                corRelation: this.getCorrelationList(source, cData)
-              }
-            });
-        }
       }
     } catch (err) {
+      this.closeProgressLoader();
       console.log(err);
     }
   }
 
-  private async navigateQuizContent(identifier, content, isFromLink, source, cData?) {
+  private getRouterPath(content) {
+    let route;
+    if (content.primaryCategory === CsPrimaryCategory.COURSE.toLowerCase()) {
+      route = RouterLinks.ENROLLED_COURSE_DETAILS;
+    } else if (content.mimeType === MimeType.COLLECTION) {
+      route = RouterLinks.COLLECTION_DETAIL_ETB;
+    } else {
+      route = RouterLinks.CONTENT_DETAILS;
+    }
+    return route;
+  }
+
+  private async navigateQuizContent(identifier, content, isFromLink, payloadUrl, corRelationList) {
     this.appGlobalServices.limitedShareQuizContent = identifier;
     if (isFromLink) {
       this.limitedSharingContentLinkClickedTelemery();
     }
-    if (!this.appGlobalServices.isSignInOnboardingCompleted && this.appGlobalServices.isUserLoggedIn()) {
-      return;
-    }
     if (this.router.url && this.router.url.indexOf(RouterLinks.CONTENT_DETAILS) !== -1) {
       this.events.publish(EventTopics.DEEPLINK_CONTENT_PAGE_OPEN, { content, autoPlayQuizContent: true });
+      this.closeProgressLoader();
       return;
     }
+    this.setTabsRoot();
     await this.router.navigate([RouterLinks.CONTENT_DETAILS],
       {
         state: {
           content, autoPlayQuizContent: true,
-          corRelation: this.getCorrelationList(source, cData)
+          corRelation: this.getCorrelationList(payloadUrl, corRelationList)
         }
       });
   }
@@ -295,9 +703,9 @@ export class SplaschreenDeeplinkActionHandlerDelegate implements SplashscreenAct
     return new Promise(async resolve => {
       const content = await this.contentService.getContentDetails({ contentId }).toPromise()
         .catch(e => {
-          if (e instanceof HttpServerError) {
+          if (HttpServerError.isInstance(e)) {
             this.commonUtilService.showToast('ERROR_FETCHING_DATA');
-          } else if (e instanceof NetworkError) {
+          } else if (NetworkError.isInstance(e)) {
             this.commonUtilService.showToast('NEED_INTERNET_FOR_DEEPLINK_CONTENT');
           } else {
             this.commonUtilService.showToast('ERROR_CONTENT_NOT_AVAILABLE');
@@ -324,306 +732,289 @@ export class SplaschreenDeeplinkActionHandlerDelegate implements SplashscreenAct
     );
   }
 
-  // This method is called only when the user redirects directly from the Playstore
-  checkUtmContent(utmVal: string): void {
-    const utmRegex = new RegExp(String.raw`(?:utm_content=(?<utm_content>[^&]*))`);
-    const res = utmRegex.exec(utmVal);
-    if (res && res.groups && res.groups.utm_content && res.groups.utm_content.length) {
-      const payload = { url: res.groups.utm_content};
-      this.onAction(payload);
-    }
-  }
-
-  private async showLoginWithoutOnboardingPopup(quizId) {
-    this.appGlobalServices.resetSavedQuizContent();
-    this.loginPopup = await this.popoverCtrl.create({
-      component: SbPopoverComponent,
-      componentProps: {
-        sbPopoverMainTitle: this.commonUtilService.translateMessage('YOU_MUST_LOGIN_TO_ACCESS_QUIZ_CONTENT'),
-        metaInfo: this.commonUtilService.translateMessage('QUIZ_CONTENTS_ONLY_REGISTERED_USERS'),
-        sbPopoverHeading: this.commonUtilService.translateMessage('OVERLAY_SIGN_IN'),
-        isNotShowCloseIcon: true,
-        actionsButtons: [
-          {
-            btntext: this.commonUtilService.translateMessage('OVERLAY_SIGN_IN'),
-            btnClass: 'popover-color',
-            isInternetNeededMessage: 'NEED_INTERNET_FOR_DEEPLINK_CONTENT'
-          }
-        ]
-      },
-      cssClass: 'sb-popover info',
-    });
-    await this.loginPopup.present();
-
-    const { data } = await this.loginPopup.onDidDismiss();
-    if (data && data.canDelete) {
-      this.loginHandlerService.signIn();
-      this.appGlobalServices.limitedShareQuizContent = quizId;
-    }
-    this.loginPopup = null;
-  }
-
   // This method is called only when a deeplink is clicked before Onboarding is not completed
   eventToSetDefaultOnboardingData(): void {
     this.events.subscribe(EventTopics.SIGN_IN_RELOAD, () => {
-      this.setDefaultOnboardingData();
+      if (!this.isOnboardingCompleted) {
+        this.setAppLanguage(undefined);
+        this.setUserType(undefined);
+      }
     });
   }
 
-  private async setDefaultOnboardingData(params?) {
-    this.isOnboardingCompleted =
-      (await this.preferences.getString(PreferenceKey.IS_ONBOARDING_COMPLETED).toPromise() === 'true') ? true : false;
-    if (!this.isOnboardingCompleted) {
-      this.setDefaultLanguageAndUserType(params);
-    }
-  }
-
-  private async setDefaultLanguageAndUserType(params?) {
-    let selectedLanguage;
-    if (params && params.langCode) {
-      const LangList = appLanguages;
-      selectedLanguage = LangList.find(i => i.code === params.langCode);
-    }
-
-    const langCode = await this.preferences.getString(PreferenceKey.SELECTED_LANGUAGE_CODE).toPromise();
-    if (!langCode) {
-      await this.preferences.putString(PreferenceKey.SELECTED_LANGUAGE_CODE,
-        (selectedLanguage && selectedLanguage.code) || 'en').toPromise();
-      this.translateService.use('en');
-    }
-
-    const langLabel = await this.preferences.getString(PreferenceKey.SELECTED_LANGUAGE).toPromise();
-    if (!langLabel) {
-      await this.preferences.putString(PreferenceKey.SELECTED_LANGUAGE,
-        (selectedLanguage && selectedLanguage.name) || 'English').toPromise();
+  async navigateToCollection(
+    identifier, content: Content | null, payloadUrl: string, route?: string,
+    isOnboardingSkipped = false, isFromChannelDeeplink = false, corRelationList?: Array<CorrelationData>
+  ) {
+    let childContentId;
+    if (payloadUrl) {
+      childContentId = this.getQueryParamValue(payloadUrl, 'moduleId');
     }
-
-    // usertyoe == "TEACHER" for Quiz-link | "OTHER" for course link
-    const userType = await this.preferences.getString(PreferenceKey.SELECTED_USER_TYPE).toPromise();
-    if (!userType) {
-      await this.preferences.putString(PreferenceKey.SELECTED_USER_TYPE, (params && params.userType) || ProfileType.TEACHER).toPromise();
+    if (!childContentId && payloadUrl) {
+      childContentId = this.getQueryParamValue(payloadUrl, 'contentId');
     }
-  }
 
-  private generateUtmTelemetryEvent(urlMatch, dialCode, url) {
-    let identifier;
-    if (urlMatch && urlMatch.groups) {
-      identifier = urlMatch.groups.contentId ? urlMatch.groups.contentId : urlMatch.groups.courseId;
-    }
+    this.isChildContentFound = false;
+    this.childContent = undefined;
 
-    const telemetryObject = new TelemetryObject(identifier ? identifier : dialCode, identifier ? 'Content' : 'qr', undefined);
-    const utmUrl = url.slice(url.indexOf('?') + 1);
-    const params: {[param: string]: string} = qs.parse(utmUrl);
-    const utmcData: CorrelationData[] = [{
-      id: CorReleationDataType.DEEPLINK,
-      type: CorReleationDataType.ACCESS_TYPE
-    }];
-
-    ContentUtil.genrateUTMCData(params).forEach((element) => {
-      utmcData.push(element);
-    });
-    this.telemetryGeneratorService.generateUtmInfoTelemetry(params, PageId.HOME, utmcData, telemetryObject);
-
-    return utmcData;
-  }
-
-  private async checkCourseChannelSlug(payload, urlMatch, cData?) {
-    if (!this.isOnboardingCompleted) {
-      this.isOnboardingCompleted =
-        (await this.preferences.getString(PreferenceKey.IS_ONBOARDING_COMPLETED).toPromise() === 'true') ? true : false;
+    if (childContentId) {
+      try {
+        if (content && content.isAvailableLocally) {
+          this.childContent = await this.getChildContents(childContentId);
+        } else {
+          this.importContent([identifier], false);
+          content = await this.getContentHeirarchy(identifier);
+          await this.getChildContent(content, childContentId);
+        }
+      } catch (e) {
+        console.error(e);
+      }
     }
-
-    try {
-      const url: URL = new URL(payload.url);
-      const overrideChannelSlug = url.searchParams.get('channel');
-
-      if (overrideChannelSlug) {
-        const filters = {
-          slug: overrideChannelSlug,
-          isRootOrg: true
-        };
-        const result = await this.frameworkService.searchOrganization({ filters }).toPromise();
-        const org: any = result.content && result.content[0];
-        if (org) {
-          this.pageAssembleService.setPageAssembleChannel({
-            channelId: org.identifier
-          });
-
-          setTimeout(() => {
-            this.events.publish(EventTopics.COURSE_PAGE_ASSEMBLE_CHANNEL_CHANGE);
-          }, 500);
-          let courseId;
-          if (urlMatch && urlMatch.groups && urlMatch.groups.courseId) {
-            courseId = urlMatch.groups.courseId;
+    if (this.childContent) {
+      switch (ContentUtil.isTrackable(this.childContent)) {
+        case 0:
+          switch (ContentUtil.isTrackable(content)) {
+            case 1:
+              const chapterParams: NavigationExtras = {
+                state: {
+                  courseContent: content,
+                  chapterData: this.childContent,
+                  isOnboardingSkipped,
+                  isFromDeeplink: true
+                }
+              };
+              this.closeProgressLoader();
+              this.setTabsRoot();
+              this.router.navigate([`/${RouterLinks.CURRICULUM_COURSES}/${RouterLinks.CHAPTER_DETAILS}`],
+                chapterParams);
+              break;
+            case 0:
+              this.navService.navigateToCollection({
+                content,
+                corRelation: this.getCorrelationList(payloadUrl, corRelationList)
+              });
+              this.closeProgressLoader();
+              break;
           }
-          const event = {
-            url: payload.url,
-            courseId,
-            avb: '',
-            channelId: org.identifier,
-            extras: {
-              profile: {
-                userType: url.searchParams.get('role'),
-                langCode: url.searchParams.get('lang')
+          break;
+        case -1:
+        case 1:
+          switch (ContentUtil.isTrackable(content)) {
+            case 1:
+              if (this.appGlobalServices.isGuestUser) { // guest user
+                this.setTabsRoot();
+                this.navService.navigateToTrackableCollection({
+                  content,
+                  isFromChannelDeeplink,
+                  corRelation: this.getCorrelationList(payloadUrl, corRelationList)
+                });
+                this.closeProgressLoader();
+              } else {
+                const fetchEnrolledCourseRequest: FetchEnrolledCourseRequest = {
+                  userId: await this.appGlobalServices.getActiveProfileUid(),
+                };
+                const enrolledCourses = await this.courseService.getEnrolledCourses(fetchEnrolledCourseRequest).toPromise();
+                let isCourseEnrolled;
+                if (enrolledCourses && enrolledCourses.length > 0) {
+                  isCourseEnrolled = enrolledCourses.find(course => {
+                    return course.contentId === childContentId;
+                  });
+                }
+                if (isCourseEnrolled) { // already enrolled
+                  this.setTabsRoot();
+                  this.navService.navigateToContent({
+                    content: this.childContent,
+                    depth: 1,
+                    isChildContent: true,
+                    isCourse: content.primaryCategory.toLowerCase() === CsPrimaryCategory.COURSE.toLowerCase(),
+                    isOnboardingSkipped,
+                    corRelation: this.getCorrelationList(payloadUrl, corRelationList)
+                  });
+                  this.closeProgressLoader();
+                } else { // not enrolled in batch
+                  this.setTabsRoot();
+                  this.navService.navigateToTrackableCollection({
+                    content,
+                    isFromChannelDeeplink,
+                    corRelation: this.getCorrelationList(payloadUrl, corRelationList)
+                  });
+                  this.closeProgressLoader();
+                }
               }
-            }
-          };
-          const isUrlTypeCourse = (new RegExp(String.raw`explore-course`)).test(event.url);
-          if (isUrlTypeCourse) {
-            const loader = await this.commonUtilService.getLoader(null, 'Initilizing profile...');
-            await loader.present();
-            const isChannelDetected = await this.onChannelDetected(event, cData);
-            await loader.dismiss();
-            if (isChannelDetected) {
-              return true;
-            }
+              break;
+            case -1:
+            case 0:
+              this.setTabsRoot();
+              this.navService.navigateToContent({
+                content: this.childContent,
+                depth: 1,
+                isChildContent: true,
+                corRelation: this.getCorrelationList(payloadUrl, corRelationList),
+                isCourse: content.primaryCategory.toLowerCase() === CsPrimaryCategory.COURSE.toLowerCase(),
+                isOnboardingSkipped
+              });
+              this.sbProgressLoader.hide({ id: content.identifier });
+              break;
           }
-        }
+          break;
+      }
+    } else {
+      this.setTabsRoot();
+      switch (ContentUtil.isTrackable(content)) {
+        case 1:
+          this.navService.navigateToTrackableCollection({
+            content,
+            isOnboardingSkipped,
+            isFromChannelDeeplink,
+            corRelation: this.getCorrelationList(payloadUrl, corRelationList)
+          });
+          this.closeProgressLoader();
+          break;
+        case 0:
+          this.navService.navigateToCollection({
+            content,
+            corRelation: this.getCorrelationList(payloadUrl, corRelationList)
+          });
+          this.closeProgressLoader();
+          break;
       }
-    } catch (e) {
-      return false;
     }
-    return false;
   }
 
-  async onChannelDetected(event, cData?): Promise<boolean> {
-    if (!this.isOnboardingCompleted) {
-      this.isOnboardingCompleted =
-        (await this.preferences.getString(PreferenceKey.IS_ONBOARDING_COMPLETED).toPromise() === 'true') ? true : false;
+  private getCorrelationList(payloadUrl, corRelation?: Array<CorrelationData>) {
+    if (!corRelation) {
+      corRelation = [];
     }
-    if (this.isOnboardingCompleted) {
-      this.navigateToCourse(event.courseId, event.url, cData);
-      return true;
+    if (payloadUrl) {
+      corRelation.push({
+        id: ContentUtil.extractBaseUrl(payloadUrl),
+        type: CorReleationDataType.SOURCE
+      });
     }
+    return corRelation;
+  }
 
-    const params = {
-      userType: (Object.values(ProfileType).includes(event.extras.profile.userType)) ? event.extras.profile.userType : undefined,
-      langCode: event.extras.profile.langCode || undefined
+  async getChildContents(identifier) {
+    const childContentRequest: ChildContentRequest = {
+      contentId: identifier,
+      hierarchyInfo: null
     };
-    this.setDefaultLanguageAndUserType(params);
+    return this.contentService.getChildContents(childContentRequest).toPromise();
+  }
 
-    if (await this.setCourseOnboardingFlow(event)) {
-      this.appGlobalServices.skipCoachScreenForDeeplink = true;
-      return true;
-    }
-    return false;
+  async getContentHeirarchy(identifier: string) {
+    const request: ContentDetailRequest = {
+      contentId: identifier
+    };
+
+    return this.contentService.getContentHeirarchy(request).toPromise();
   }
 
-  async navigateToCourse(courseId, payloadUrl, cData?) {
-    if (courseId) {
-      const content: any = await this.getContentData(courseId);
-      if (content && content.contentType === ContentType.COURSE.toLowerCase()) {
-        this.router.navigate([RouterLinks.ENROLLED_COURSE_DETAILS],
-          {
-            state: {
-              content, isFromChannelDeeplink: true,
-              corRelation: this.getCorrelationList(payloadUrl, cData)
-            }
-          });
-      }
-    } else {
-      this.router.navigateByUrl(RouterLinks.TABS_COURSE);
+  async getChildContent(content, childContentId) {
+    if (content.identifier === childContentId) {
+      this.childContent = content;
+      this.isChildContentFound = true;
+    } else if (!this.isChildContentFound && content && content.children) {
+      content.children.forEach((ele) => {
+        if (!this.isChildContentFound) {
+          this.getChildContent(ele, childContentId);
+        }
+      });
     }
+    return (this.childContent);
   }
 
-  setCourseOnboardingFlow(event) {
+  private importContent(identifiers: Array<string>, isChild: boolean) {
+    const contentImportRequest: ContentImportRequest = {
+      contentImportArray: this.getImportContentRequestBody(identifiers, isChild),
+      contentStatusArray: ['Live'],
+      fields: ['appIcon', 'name', 'subject', 'size', 'gradeLevel'],
+    };
+    // // Call content service
+    this.contentService.importContent(contentImportRequest).toPromise();
+  }
 
-    return new Promise(async resolve => {
-      try {
-        const channelDetails: Channel = await this.frameworkService.getChannelDetails({ channelId: event.channelId }).toPromise();
-        const frameworkId = channelDetails.defaultFramework;
-        const syllabus = frameworkId;
-
-        const categories = [
-          { code: FrameworkCategoryCode.BOARD, prevCode: null },
-          { code: FrameworkCategoryCode.MEDIUM, prevCode: FrameworkCategoryCode.BOARD },
-          { code: FrameworkCategoryCode.GRADE_LEVEL, prevCode: FrameworkCategoryCode.MEDIUM }
-        ];
-        const categoryData: any = {};
-        for (const category of categories) {
-          const boardCategoryTermsRequet: GetFrameworkCategoryTermsRequest = {
-            from: category.code === FrameworkCategoryCode.BOARD ? CachedItemRequestSourceFrom.SERVER : null,
-            frameworkId,
-            requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES,
-            currentCategoryCode: category.code,
-            language: this.translateService.currentLang,
-            selectedTermsCodes: category.prevCode ? [category.prevCode] : null
-          };
-          const terms = (await this.frameworkUtilService.getFrameworkCategoryTerms(boardCategoryTermsRequet).toPromise());
-          categoryData[category.code] = terms[0].code;
-        }
+  private getImportContentRequestBody(identifiers: Array<string>, isChild: boolean): Array<ContentImport> {
+    const rollUpMap: { [key: string]: Rollup } = {};
+    const requestParams: ContentImport[] = [];
+    identifiers.forEach((value) => {
+      requestParams.push({
+        isChildContent: isChild,
+        destinationFolder: this.storageService.getStorageDestinationDirectoryPath(),
+        contentId: value,
+        correlationData: [],
+        rollUp: rollUpMap[value]
+      });
+    });
 
-        const payload = {
-          syllabus,
-          board: categoryData[FrameworkCategoryCode.BOARD],
-          medium: categoryData[FrameworkCategoryCode.MEDIUM],
-          grade: categoryData[FrameworkCategoryCode.GRADE_LEVEL],
-          courseId: event.courseId
-        };
-        await this.submitProfileSettings(payload, event.url);
-        resolve(true);
+    return requestParams;
+  }
+
+  // this only sets the Root for the Tabs.
+  private setTabsRoot() {
+    if (this.enableRootNavigation) {
+      try {
+        this.location.replaceState(this.router.serializeUrl(this.router.createUrlTree([RouterLinks.TABS])));
       } catch (e) {
-        resolve(false);
         console.log(e);
       }
-    });
+      this.enableRootNavigation = false;
+    }
   }
 
-  private async submitProfileSettings(payload, payloadUrl) {
-    try {
-      const activeSessionProfile = await this.profileService.getActiveSessionProfile({
-        requiredFields: ProfileConstants.REQUIRED_FIELDS
-      }).toPromise();
-      const userType = await this.preferences.getString(PreferenceKey.SELECTED_USER_TYPE).toPromise();
-
-      const updateProfileRequest: Profile = {
-        ...activeSessionProfile,
-        syllabus: [payload.syllabus],
-        board: [payload.board],
-        medium: [payload.medium],
-        grade: [payload.grade],
-        handle: 'Guest1',
-        profileType: userType as any,
-        source: ProfileSource.LOCAL
-      };
-
-      const profile: Profile = await this.profileService.updateProfile(updateProfileRequest).toPromise();
-      initTabs(this.container, GUEST_TEACHER_TABS);
-      this.events.publish('refresh:profile');
-      this.appGlobalServices.guestUserProfile = profile;
-
-      this.commonUtilService.handleToTopicBasedNotification();
-
-      setTimeout(async () => {
-        this.appGlobalServices.setOnBoardingCompleted();
-        this.navigateToCourse(payload.courseId, payloadUrl);
-        this.loginHandlerService.setDefaultProfileDetails();
-      }, 1000);
+  private async updateProfile(payloadProfileAttribute) {
+    const currentProfile = this.appGlobalServices.getCurrentUser();
+    this.updateProfileService.checkProfileData(payloadProfileAttribute.request, currentProfile);
+  }
 
-      this.events.publish('onboarding-card:completed', { isOnBoardingCardCompleted: true });
-      this.events.publish('refresh:profile');
-      this.appGlobalServices.guestUserProfile = profile;
-      this.telemetryGeneratorService.generateProfilePopulatedTelemetry(
-          PageId.HOME, profile, 'auto', Environment.ONBOARDING, ContentUtil.extractBaseUrl(payloadUrl)
-      );
+  private async handleSearch(payload) {
+    this.closeProgressLoader();
+    const extras: NavigationExtras = {
+      state: {
+        preAppliedFilter: payload.request
+      }
+    };
+    this.router.navigate([RouterLinks.SEARCH], extras);
+  }
 
-    } catch (e) {
-      console.log(e);
+  private async navigateToDetailsPage(payload) {
+    if (payload.request.objectId || payload.request.collection) {
+      const content = await this.getContentData(payload.request.objectId || payload.request.collection);
+      await this.navigateContent(payload.objectId, false, content, null, null, null);
     }
-    return;
   }
 
-  private getCorrelationList(source, cData?): Array<CorrelationData> {
-    const corRelationList: Array<CorrelationData> = [{
-      id: ContentUtil.extractBaseUrl(source),
-      type: CorReleationDataType.SOURCE
-    }];
-    if (cData) {
-      cData.forEach(element => {
-        corRelationList.push(element);
-      });
+  private async handleVendorAppAction(payload) {
+    this.progressLoaderId = 'DEFAULT';
+    await this.sbProgressLoader.show();
+    switch (payload.action) {
+      case 'ACTION_SEARCH':
+        await this.handleSearch(payload.data);
+        break;
+      case 'ACTION_GOTO':
+        this.closeProgressLoader();
+        if (payload.data && payload.data.request.params) {
+          const navigationExtras: NavigationExtras = {
+            state: {
+              params: payload.data.request.params
+            }
+          };
+          await this.router.navigate([payload.data.request.route], navigationExtras);
+        } else {
+          await this.router.navigate([payload.data.request.route]);
+        }
+        break;
+      case 'ACTION_SETPROFILE':
+        await this.updateProfile(payload.data);
+        break;
+      case 'ACTION_PLAY':
+        await this.navigateToDetailsPage(payload.data);
+        break;
+      case 'ACTION_DEEPLINK':
+        await this.handleDeeplink(payload.data.request.url);
+        break;
+      default:
+        return of (undefined);
     }
-    return corRelationList;
   }
-
 }
diff --git a/src/services/sunbird-splashscreen/splashcreen-telemetry-action-handler-delegate.spec.ts b/src/services/sunbird-splashscreen/splashcreen-telemetry-action-handler-delegate.spec.ts
index 81f40fa4e..3e4d3a3a4 100644
--- a/src/services/sunbird-splashscreen/splashcreen-telemetry-action-handler-delegate.spec.ts
+++ b/src/services/sunbird-splashscreen/splashcreen-telemetry-action-handler-delegate.spec.ts
@@ -34,13 +34,37 @@ describe('SplaschreenDeeplinkActionHandlerDelegate', () => {
     it('should generate an impression event', () => {
       // arrange
       const payload: TelemetryActionPayload = {
-        eid: 'IMPRESSION'
+        eid: 'IMPRESSION',
+        extraInfo: {
+          isFirstTime: true
+        }
+      };
+      const telemetryData = {
+        env: Environment.HOME,
+        type: ImpressionType.VIEW,
+        pageId: PageId.SPLASH
+      };
+      mockTelemetryService.impression = jest.fn(() => {
+        return of(undefined);
+      });
+      // act
+      splashcreenTelemetryActionHandlerDelegate.onAction(payload);
+      // assert
+      expect(mockTelemetryService.impression).toHaveBeenCalledWith(telemetryData);
+    });
+
+    it('should generate an impression event if is firstTime is false', () => {
+      // arrange
+      const payload: TelemetryActionPayload = {
+        eid: 'IMPRESSION',
+        extraInfo: {
+        }
       };
       const telemetryData = {
         env: Environment.HOME,
         type: ImpressionType.VIEW,
         pageId: PageId.SPLASH
-      }
+      };
       mockTelemetryService.impression = jest.fn(() => {
         return of(undefined);
       });
@@ -65,7 +89,7 @@ describe('SplaschreenDeeplinkActionHandlerDelegate', () => {
         valueMap: {
           ...payload.extraInfo
         }
-      }
+      };
       mockTelemetryService.interact = jest.fn(() => {
         return of(undefined);
       });
@@ -75,6 +99,7 @@ describe('SplaschreenDeeplinkActionHandlerDelegate', () => {
       expect(mockTelemetryService.interact).toHaveBeenCalledWith(telemetryData);
     });
 
+
     it('should not generate any event', (done) => {
       // arrange
       const payload: any = {
diff --git a/src/services/sunbird-splashscreen/splashcreen-telemetry-action-handler-delegate.ts b/src/services/sunbird-splashscreen/splashcreen-telemetry-action-handler-delegate.ts
index c3751f24a..31c24486e 100644
--- a/src/services/sunbird-splashscreen/splashcreen-telemetry-action-handler-delegate.ts
+++ b/src/services/sunbird-splashscreen/splashcreen-telemetry-action-handler-delegate.ts
@@ -1,8 +1,8 @@
 import { SplashscreenActionHandlerDelegate } from './splashscreen-action-handler-delegate';
 import { Observable, of } from 'rxjs';
 import { Inject, Injectable } from '@angular/core';
-import { TelemetryService, InteractType } from 'sunbird-sdk';
-import { Environment, ImpressionType, PageId } from '@app/services/telemetry-constants';
+import { TelemetryService, InteractType, CorrelationData } from 'sunbird-sdk';
+import { Environment, ImpressionType, PageId, CorReleationDataType } from '@app/services/telemetry-constants';
 import { mapTo } from 'rxjs/operators';
 
 interface TelemetryActionPayload {
@@ -20,6 +20,17 @@ export class SplashcreenTelemetryActionHandlerDelegate implements SplashscreenAc
   onAction(payload: TelemetryActionPayload): Observable<undefined> {
     switch (payload.eid) {
       case 'IMPRESSION': {
+        /* New Telemetry */
+        const correlationList: Array<CorrelationData> = [];
+        
+        correlationList.push({id:  payload.extraInfo && payload.extraInfo.isFirstTime ? 'true' : 'false', type: CorReleationDataType.FIRST_TIME_USER});
+
+        this.telemetryService.impression({
+          env: Environment.ONBOARDING,
+          type: ImpressionType.PAGE_LOADED,
+          pageId: PageId.SPLASH,
+          correlationData: correlationList
+        }).toPromise();
         return this.telemetryService.impression({
           env: Environment.HOME,
           type: ImpressionType.VIEW,
diff --git a/src/services/sunbird-splashscreen/splashscreen-deeplink-action-handler-delegate.spec.data.ts b/src/services/sunbird-splashscreen/splashscreen-deeplink-action-handler-delegate.spec.data.ts
new file mode 100644
index 000000000..3d9087441
--- /dev/null
+++ b/src/services/sunbird-splashscreen/splashscreen-deeplink-action-handler-delegate.spec.data.ts
@@ -0,0 +1,405 @@
+export const mockDeeplinkConfig = [
+   {
+     name: 'Dialcode parser',
+     code: 'dialcode',
+     pattern: '(\\/dial\\/(?<sunbird>[a-zA-Z0-9]+)|(\\/QR\\/\\?id=(?<epathshala>[a-zA-Z0-9]+)))',
+     route: 'search'
+   },
+   {
+     name: 'content deatil',
+     code: 'contentDetail',
+     pattern: '(?:\\/(?:resources\\/play\\/content|play\\/content|play\\/quiz)\\/(?<quizId>\\w+))',
+     route: 'content-details'
+   },
+   {
+     name: 'Textbook detail',
+     code: 'textbookDetail',
+     pattern: '(?:\\/play\\/(?:collection)\\/(?<content_id>\\w+))',
+     route: 'collection-detail-etb',
+     priority: 2
+   },
+   {
+     name: 'Textbook content detail',
+     code: 'textbookContentDetail',
+     pattern: '(?:\\/play\\/(?:collection)\\/(?<content_id>\\w+)\\?(?=.*\\bcontentId\\b=(?<contentId>([^&]*)).*))',
+     route: 'collection-detail-etb',
+     priority: 1
+   },
+   {
+     name: 'Course Detail',
+     code: 'courseDetail',
+     pattern: '(?:\\/(?:explore-course|learn)\\/course\\/(?<course_id>\\w+))',
+     route: 'enrolled-course-details',
+     priority: 3
+   },
+   {
+     name: 'Module Detail',
+     code: 'moduleDetail',
+     pattern: '(?:\\/(?:explore-course|learn)\\/course\\/(?<course_id>\\w+)\\?(?=.*\\bmoduleId\\b=(?<moduleId>([^&]*)).*))',
+     route: 'module-details',
+     priority: 1
+   },
+   {
+     name: 'Course Content Detail',
+     code: 'courseContentDetail',
+     pattern: '(?:\\/(?:explore-course|learn)\\/course\\/(?<course_id>\\w+)\\?(?=.*\\bcontentId\\b=(?<contentId>([^&]*)).*))',
+     route: 'course-content-details',
+     priority: 2
+   },
+   {
+     name: 'Library',
+     code: 'library',
+     pattern: '\\/(resources|explore)$',
+     route: 'tabs/resources'
+   },
+   {
+     name: 'TakeSurvey',
+     code: 'takeSurvey',
+     pattern: '\\/manage-learn\\/take-survey\\/(?<survey_id>\\w+)',
+     route: 'survey'
+   },
+   {
+     name: 'Create Observation',
+     code: 'createObservation',
+     pattern: '\\/manage-learn\\/create-observation\\/(?<create_observation_id>\\w+)',
+     route: 'deeplink-redirect/observationLink'
+   },
+   {
+     name: 'Observation',
+     code: 'observation',
+     pattern: '\\/manage-learn\\/observation\\/(?<observation_id>\\w+)',
+     route: 'content-details',
+     priority: 6
+   },
+   {
+     name: 'Reports',
+     code: 'report',
+     pattern: '\\/manage-learn\\/observation\\/reports\\/(?<report_id>\\w+)',
+     route: 'content-details',
+     priority: 5
+   },
+   {
+     name: 'Profile',
+     code: 'profile',
+     pattern: '\\/(profile)$',
+     route: 'tabs/profile'
+   },
+   {
+     name: 'FAQ',
+     code: 'faq',
+     pattern: '\\/(faq)$',
+     route: 'faq-help'
+   },
+   {
+     name: 'Content attributes',
+     code: 'attributes',
+     pattern: '',
+     route: '',
+     params: {
+       attributes: [
+         {
+           code: 'attributions',
+           type: 'Array'
+         },
+         {
+           code: 'author',
+           type: 'String'
+         },
+         {
+           code: 'compatibilityLevel',
+           type: 'String'
+         },
+         {
+           code: 'contentDisposition',
+           type: 'String'
+         },
+         {
+           code: 'contentEncoding',
+           type: 'String'
+         },
+         {
+           code: 'createdBy',
+           type: 'String'
+         },
+         {
+           code: 'createdFor',
+           type: 'Array'
+         },
+         {
+           code: 'dialcodes',
+           type: 'String'
+         },
+         {
+           code: 'language',
+           type: 'Array'
+         },
+         {
+           code: 'organisation',
+           type: 'Array'
+         },
+         {
+           code: 'organization',
+           type: 'Array'
+         },
+         {
+           code: 'rating',
+           type: 'String'
+         },
+         {
+           code: 'resourceType',
+           type: 'Array'
+         },
+         {
+           code: 'targetFWIds',
+           type: 'Array'
+         },
+         {
+           code: 'targetBoardIds',
+           type: 'Array'
+         },
+         {
+           code: 'targetGradeLevelIds',
+           type: 'Array'
+         },
+         {
+           code: 'targetMediumIds',
+           type: 'Array'
+         },
+         {
+           code: 'targetSubjectIds',
+           type: 'Array'
+         },
+         {
+           code: 'targetTopicIds',
+           type: 'Array'
+         },
+         {
+           code: 'userConsent',
+           type: 'String'
+         },
+         {
+           code: 'visibility',
+           type: 'Array'
+         },
+         {
+           code: 'medium',
+           type: 'Array'
+         },
+         {
+           code: 'gradeLevel',
+           type: 'Array'
+         },
+         {
+           code: 'board',
+           type: 'Array'
+         },
+         {
+           code: 'subject',
+           type: 'Array'
+         },
+         {
+           code: 'primaryCategory',
+           type: 'Array'
+         },
+         {
+           code: 'audience',
+           type: 'Array'
+         },
+         {
+           code: 'channel',
+           type: 'Array'
+         },
+         {
+           code: 'mimeType',
+           type: 'Array',
+           proxyCode: 'mediaType',
+           filter: 'custom'
+         }
+       ]
+     }
+   },
+   {
+     name: 'Search Course',
+     code: 'searchCourse',
+     pattern: '\\/(explore-course|learn)(\\?.*|$)',
+     route: 'tabs/search',
+     priority: 4,
+     params: {
+       key: 'key',
+       data: [
+         {
+           code: 'primaryCategory',
+           values: [
+             'Course',
+             'Course Assessment'
+           ],
+           type: 'default'
+         }
+       ]
+     }
+   },
+   {
+     name: 'Search Textbook',
+     code: 'searchTextbook',
+     pattern: '\\/(resources|explore)(\\?.*selectedTab=textbook|$)',
+     route: 'search',
+     priority: 2,
+     params: {
+       key: 'key',
+       data: [
+         {
+           code: 'primaryCategory',
+           values: [
+             'Digital Textbook',
+             'eTextbook'
+           ],
+           type: 'default'
+         }
+       ]
+     }
+   },
+   {
+     name: 'Search TV Program',
+     code: 'searchTvProgram',
+     pattern: '\\/(resources|explore)\\?.*selectedTab=tvProgram',
+     route: 'search',
+     priority: 2,
+     params: {
+       key: 'key',
+       data: [
+         {
+           code: 'primaryCategory',
+           values: [
+             'TVLesson'
+           ],
+           type: 'default'
+         }
+       ]
+     }
+   },
+   {
+     name: 'Search',
+     code: 'searchAll',
+     pattern: '\\/(search\\/Library|explore)\\/1(\\?.*|$)',
+     route: 'search',
+     priority: 1,
+     params: {
+       key: 'key',
+       data: [
+         {
+           code: 'primaryCategory',
+           values: [
+             'Collection',
+             'Resource',
+             'Content Playlist',
+             'Course',
+             'Course Assessment',
+             'Digital Textbook',
+             'eTextbook',
+             'Explanation Content',
+             'Learning Resource',
+             'Practice Question Set',
+             'Teacher Resource',
+             'LessonPlan',
+             'FocusSpot',
+             'Learning Outcome Definition',
+             'Curiosity Questions',
+             'MarkingSchemeRubric',
+             'ExplanationResource',
+             'ExperientialResource',
+             'Practice Resource',
+             'TVLesson'
+           ],
+           type: 'default'
+         },
+         {
+           code: 'mimeType',
+           values: [
+             {
+               name: 'all',
+               options: [
+                 'application/vnd.ekstep.ecml-archive',
+                 'application/vnd.ekstep.html-archive',
+                 'application/vnd.android.package-archive',
+                 'application/vnd.ekstep.content-archive',
+                 'application/vnd.ekstep.content-collection',
+                 'application/vnd.ekstep.plugin-archive',
+                 'application/vnd.ekstep.h5p-archive',
+                 'application/epub',
+                 'text/x-url',
+                 'video/x-youtube',
+                 'application/octet-stream',
+                 'application/msword',
+                 'application/pdf',
+                 'image/jpeg',
+                 'image/jpg',
+                 'image/png',
+                 'image/tiff',
+                 'image/bmp',
+                 'image/gif',
+                 'image/svg+xml',
+                 'video/avi',
+                 'video/mpeg',
+                 'video/quicktime',
+                 'video/3gpp',
+                 'video/mpeg',
+                 'video/mp4',
+                 'video/ogg',
+                 'video/webm',
+                 'audio/mp3',
+                 'audio/mp4',
+                 'audio/mpeg',
+                 'audio/ogg',
+                 'audio/webm',
+                 'audio/x-wav',
+                 'audio/wav'
+               ]
+             },
+             {
+               name: 'video',
+               options: [
+                 'video/avi',
+                 'video/mpeg',
+                 'video/quicktime',
+                 'video/3gpp',
+                 'video/mpeg',
+                 'video/mp4',
+                 'video/ogg',
+                 'video/webm'
+               ]
+             },
+             {
+               name: 'documents',
+               options: [
+                 'application/pdf',
+                 'application/epub',
+                 'application/msword'
+               ]
+             },
+             {
+               name: 'interactive',
+               options: [
+                 'application/vnd.ekstep.ecml-archive',
+                 'application/vnd.ekstep.h5p-archive',
+                 'application/vnd.ekstep.html-archive'
+               ]
+             },
+             {
+               name: 'audio',
+               options: [
+                 'audio/mp3',
+                 'audio/mp4',
+                 'audio/mpeg',
+                 'audio/ogg',
+                 'audio/webm',
+                 'audio/x-wav',
+                 'audio/wav'
+               ]
+             }
+           ],
+           type: 'custom'
+         }
+       ]
+     }
+   }
+ ]
diff --git a/src/services/sunbird-splashscreen/splashscreen-import-action-handler-delegate.ts b/src/services/sunbird-splashscreen/splashscreen-import-action-handler-delegate.ts
index 0134cbf4c..074eb901e 100644
--- a/src/services/sunbird-splashscreen/splashscreen-import-action-handler-delegate.ts
+++ b/src/services/sunbird-splashscreen/splashscreen-import-action-handler-delegate.ts
@@ -1,7 +1,14 @@
-import { SplashscreenActionHandlerDelegate } from './splashscreen-action-handler-delegate';
-import { defer, Observable, of } from 'rxjs';
+import { Inject, Injectable } from '@angular/core';
+import { ImportPopoverComponent } from '@app/app/components/popups/import-popover/import-popover.component';
+import { UtilityService } from '@app/services';
+import { SplaschreenDeeplinkActionHandlerDelegate } from '@app/services/sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate';
+import { PopoverController } from '@ionic/angular';
+import { Events } from '@app/util/events';
+import { defer, from, Observable, of } from 'rxjs';
+import { catchError, concatMap, filter, map, mapTo, reduce, takeUntil, tap } from 'rxjs/operators';
+import { CommonUtilService } from 'services/common-util.service';
 import {
-  ContentEvent,
+  ArchiveObjectType, ArchiveService, ContentEvent,
   ContentEventType,
   ContentImportResponse,
   ContentImportStatus,
@@ -12,17 +19,9 @@ import {
   SunbirdSdk,
   TelemetryErrorRequest,
   TelemetryService,
-  ArchiveService,
-  ArchiveObjectType
+  StorageService
 } from 'sunbird-sdk';
-import { Inject, Injectable } from '@angular/core';
-import { CommonUtilService } from 'services/common-util.service';
-import { Events, PopoverController } from '@ionic/angular';
-import { from } from 'rxjs';
-import { catchError, concatMap, filter, map, mapTo, reduce, takeUntil, tap } from 'rxjs/operators';
-import { SplaschreenDeeplinkActionHandlerDelegate } from '@app/services/sunbird-splashscreen/splaschreen-deeplink-action-handler-delegate';
-import { ImportPopoverComponent } from '@app/app/components/popups/import-popover/import-popover.component';
-import { UtilityService } from '@app/services';
+import { SplashscreenActionHandlerDelegate } from './splashscreen-action-handler-delegate';
 
 @Injectable()
 export class SplashscreenImportActionHandlerDelegate implements SplashscreenActionHandlerDelegate {
@@ -32,6 +31,7 @@ export class SplashscreenImportActionHandlerDelegate implements SplashscreenActi
     @Inject('PROFILE_SERVICE') private profileService: ProfileService,
     @Inject('TELEMETRY_SERVICE') private telemetryService: TelemetryService,
     @Inject('ARCHIVE_SERVICE') private archiveService: ArchiveService,
+    @Inject('STORAGE_SERVICE') private storageService: StorageService,
     private splashscreenDeeplinkActionHandlerDelegate: SplaschreenDeeplinkActionHandlerDelegate,
     private events: Events,
     private commonUtilService: CommonUtilService,
@@ -71,7 +71,7 @@ export class SplashscreenImportActionHandlerDelegate implements SplashscreenActi
               takeUntil(
                 this.contentService.importEcar({
                   isChildContent: false,
-                  destinationFolder: cordova.file.externalDataDirectory,
+                  destinationFolder: this.storageService.getStorageDestinationDirectoryPath(),
                   sourceFilePath: filePath,
                   correlationData: []
                 }).pipe(
diff --git a/src/services/sunbirdqrscanner.service.spec.ts b/src/services/sunbirdqrscanner.service.spec.ts
index 76fe8bfd7..5325952c5 100644
--- a/src/services/sunbirdqrscanner.service.spec.ts
+++ b/src/services/sunbirdqrscanner.service.spec.ts
@@ -1,74 +1,554 @@
-import { SunbirdQRScanner } from './sunbirdqrscanner.service';
-import { TranslateService, LangChangeEvent } from '@ngx-translate/core';
-import { Platform, PopoverController, ToastController } from '@ionic/angular';
-import { Router } from '@angular/router';
-import { AppVersion } from '@ionic-native/app-version/ngx';
-import { CommonUtilService } from './common-util.service';
-import { AndroidPermissionsService } from './android-permissions/android-permissions.service';
-import { ContainerService } from './container.services';
-import { AppGlobalService } from './app-global-service.service';
-import { TelemetryGeneratorService } from './telemetry-generator.service';
-import { QRScannerResultHandler } from './qrscanresulthandler.service';
-import { of } from 'rxjs';
-import { EventEmitter } from 'events';
+import {SunbirdQRScanner} from './sunbirdqrscanner.service';
+import {TranslateService} from '@ngx-translate/core';
+import {Platform, ToastController} from '@ionic/angular';
+import {Router} from '@angular/router';
+import {AppVersion} from '@ionic-native/app-version/ngx';
+import {CommonUtilService} from './common-util.service';
+import {AndroidPermissionsService} from './android-permissions/android-permissions.service';
+import {ContainerService} from './container.services';
+import {AppGlobalService} from './app-global-service.service';
+import {TelemetryGeneratorService} from './telemetry-generator.service';
+import {QRScannerResultHandler} from './qrscanresulthandler.service';
+import {of} from 'rxjs';
+import {
+    CorReleationDataType,
+    Environment,
+    ImpressionSubtype,
+    ImpressionType,
+    InteractSubtype,
+    InteractType, Mode,
+    PageId
+} from './telemetry-constants';
+import {AndroidPermission, PermissionAskedEnum} from '@app/services/android-permissions/android-permission';
+import {Profile, ProfileType} from 'sunbird-sdk';
 
 describe('SunbirdQRScanner', () => {
-  let sunbirdQRScanner: SunbirdQRScanner;
-
-  const mockTranslateService: Partial<TranslateService> = {
-    get: jest.fn(() => of('sample_translation')),
-    instant: jest.fn(() => 'sample_translation'),
-  };
-  mockTranslateService.onLangChange = {
-    subscribe: jest.fn((fn) => {
-      return fn({});
-  })
-  } as any;
-  const mockPlatform: Partial<Platform> = {};
-  const mockQRScannerResultHandler: Partial<QRScannerResultHandler> = {};
-  const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
-  const mockAppGlobalService: Partial<AppGlobalService> = {};
-  const mockContainerService: Partial<ContainerService> = {};
-  const mockAndroidPermissionsService: Partial<AndroidPermissionsService> = {};
-  const mockCommonUtilService: Partial<CommonUtilService> = {};
-  const mockAppVersion: Partial<AppVersion> = {
-    getAppName: jest.fn(() => Promise.resolve('sunbird'))
-  };
-  const mockToastController: Partial<ToastController> = {};
-  const mockPopoverController: Partial<PopoverController> = {};
-  const mockRouter: Partial<Router> = {};
-
-  beforeAll(() => {
-    sunbirdQRScanner = new SunbirdQRScanner(
-      mockTranslateService as TranslateService,
-      mockPlatform as Platform,
-      mockQRScannerResultHandler as QRScannerResultHandler,
-      mockTelemetryGeneratorService as TelemetryGeneratorService,
-      mockAppGlobalService as AppGlobalService,
-      mockContainerService as ContainerService,
-      mockAndroidPermissionsService as AndroidPermissionsService,
-      mockCommonUtilService as CommonUtilService,
-      mockAppVersion as AppVersion,
-      mockToastController as ToastController,
-      mockPopoverController as PopoverController,
-      mockRouter as Router,
-    );
-  });
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('should create an instance of SunbirdQRScanner', () => {
-    expect(sunbirdQRScanner).toBeTruthy();
-  });
-
-  // describe('checkQuizContent()', () => {
-  //   it('should navigate to contentdetails page if its a Quiztype content', (done) => {
-  //     // arrange
-  //     // act
-  //     // assert
-  //   });
-  // });
+    let sunbirdQRScanner: SunbirdQRScanner;
 
+    const mockTranslateService: Partial<TranslateService> = {
+        get: jest.fn(() => of('sample_translation')),
+        instant: jest.fn(() => 'sample_translation'),
+    };
+    mockTranslateService.onLangChange = {
+        subscribe: jest.fn((fn) => {
+            return fn({});
+        })
+    } as any;
+    const mockPlatform: Partial<Platform> = {};
+    const mockQRScannerResultHandler: Partial<QRScannerResultHandler> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockAppGlobalService: Partial<AppGlobalService> = {
+        setNativePopupVisible: jest.fn()
+    };
+    const mockContainerService: Partial<ContainerService> = {};
+    const mockAndroidPermissionsService: Partial<AndroidPermissionsService> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+    const mockAppVersion: Partial<AppVersion> = {
+        getAppName: jest.fn(() => Promise.resolve('sunbird'))
+    };
+    const mockToastController: Partial<ToastController> = {};
+    const mockRouter: Partial<Router> = {};
+
+    const instantiateSunbirdQrScannerService = () => {
+        mockTranslateService.onLangChange = {
+            subscribe: jest.fn((fn) => {
+                return fn({});
+            })
+        } as any;
+        mockAppVersion.getAppName = jest.fn(() => Promise.resolve('sunbird'));
+        mockTranslateService.get = jest.fn(() => of('sample_translation'));
+        mockTranslateService.instant = jest.fn(() => 'sample_translation');
+        sunbirdQRScanner = new SunbirdQRScanner(
+            mockTranslateService as TranslateService,
+            mockPlatform as Platform,
+            mockQRScannerResultHandler as QRScannerResultHandler,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockAppGlobalService as AppGlobalService,
+            mockContainerService as ContainerService,
+            mockAndroidPermissionsService as AndroidPermissionsService,
+            mockCommonUtilService as CommonUtilService,
+            mockAppVersion as AppVersion,
+            mockToastController as ToastController,
+            mockRouter as Router,
+        );
+    };
+    beforeAll(() => {
+        instantiateSunbirdQrScannerService();
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetAllMocks();
+    });
+
+    it('should create an instance of SunbirdQRScanner', () => {
+        expect(sunbirdQRScanner).toBeTruthy();
+    });
+
+    describe('startScanner test cases', () => {
+
+        it('should check for permission if hasPermission if false then show popover for permission will be called', (done) => {
+            // arrange
+            mockPlatform.pause = of(1, 2) as any;
+            mockAppGlobalService.isOnBoardingCompleted = true;
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateStartTelemetry = jest.fn();
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() =>
+                Promise.resolve({hasPermission: false, isPermissionAlwaysDenied: false}));
+            mockCommonUtilService.translateMessage = jest.fn(v => v);
+            mockCommonUtilService.buildPermissionPopover = jest.fn(async (callback) => {
+                await callback(mockCommonUtilService.translateMessage('ALLOW'));
+                return {
+                    present: jest.fn(() => Promise.resolve())
+                };
+            });
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockAppGlobalService.setIsPermissionAsked = jest.fn(() => true);
+            mockAndroidPermissionsService.requestPermissions = jest.fn(() => of({hasPermission: false}));
+            mockCommonUtilService.showSettingsPageToast = jest.fn();
+            // act
+            sunbirdQRScanner.startScanner(PageId.COURSES, true);
+            // assert
+            expect(mockTelemetryGeneratorService.generatePageLoadedTelemetry).toHaveBeenCalledWith(
+                PageId.SCAN, Environment.HOME);
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                ImpressionType.VIEW,
+                ImpressionSubtype.QRCodeScanInitiate, 'courses', Environment.HOME);
+            expect(mockTelemetryGeneratorService.generateStartTelemetry).toHaveBeenCalledWith(
+                PageId.QRCodeScanner, {id: '', type: 'qr', version: undefined});
+            setTimeout(() => {
+                expect(mockCommonUtilService.getGivenPermissionStatus).toHaveBeenCalledWith(AndroidPermission.CAMERA);
+                expect(mockCommonUtilService.buildPermissionPopover).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.ALLOW_CLICKED, Environment.HOME, PageId.PERMISSION_POPUP);
+                expect(mockAppGlobalService.setIsPermissionAsked).toHaveBeenCalledWith(PermissionAskedEnum.isCameraAsked, true);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.DENY_CLICKED, Environment.HOME, PageId.APP_PERMISSION_POPUP);
+                expect(mockCommonUtilService.showSettingsPageToast).toHaveBeenCalledWith(
+                    'CAMERA_PERMISSION_DESCRIPTION', 'sunbird', PageId.QRCodeScanner, true);
+                expect(mockCommonUtilService.translateMessage).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should check for permission and if not then call for popup and then click allow ', (done) => {
+            // arrange
+            mockPlatform.pause = of(1, 2) as any;
+            mockAppGlobalService.isOnBoardingCompleted = false;
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateStartTelemetry = jest.fn();
+            const permissionStatusStack = [{hasPermission: true}, {hasPermission: false, isPermissionAlwaysDenied: false}];
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() =>
+                Promise.resolve(permissionStatusStack.pop()));
+            mockCommonUtilService.translateMessage = jest.fn(v => v);
+            mockCommonUtilService.buildPermissionPopover = jest.fn(async (callback) => {
+                await callback(mockCommonUtilService.translateMessage('ALLOW'));
+                return {
+                    present: jest.fn(() => Promise.resolve())
+                };
+            });
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockAppGlobalService.setIsPermissionAsked = jest.fn(() => true);
+            mockAndroidPermissionsService.requestPermissions = jest.fn(() => of({hasPermission: true}));
+            jest.spyOn(global.qrScanner, 'startScanner').mockImplementation((_, __, ___, ____, _____, ______, cb) => {
+                cb('some_data');
+            });
+            mockQRScannerResultHandler.parseDialCode = jest.fn(() => Promise.resolve('some_data'));
+            mockQRScannerResultHandler.handleDialCode = jest.fn();
+            jest.spyOn(sunbirdQRScanner, 'stopScanner').mockImplementation();
+            // act
+            sunbirdQRScanner.startScanner(PageId.ONBOARDING_PROFILE_PREFERENCES, true);
+            // assert
+            expect(mockTelemetryGeneratorService.generatePageLoadedTelemetry).toHaveBeenCalledWith(
+                PageId.SCAN, Environment.ONBOARDING);
+            expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                ImpressionType.VIEW,
+                ImpressionSubtype.QRCodeScanInitiate, PageId.ONBOARDING_PROFILE_PREFERENCES, Environment.ONBOARDING);
+            expect(mockTelemetryGeneratorService.generateStartTelemetry).toHaveBeenCalledWith(
+                PageId.QRCodeScanner, {id: '', type: 'qr', version: undefined});
+            setTimeout(() => {
+                expect(mockCommonUtilService.getGivenPermissionStatus).toHaveBeenCalledWith(AndroidPermission.CAMERA);
+                expect(mockCommonUtilService.buildPermissionPopover).toHaveBeenCalled();
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(1,
+                    InteractType.TOUCH,
+                    InteractSubtype.ALLOW_CLICKED, Environment.ONBOARDING, PageId.PERMISSION_POPUP);
+                expect(mockAppGlobalService.setIsPermissionAsked).toHaveBeenCalledWith(PermissionAskedEnum.isCameraAsked, true);
+                expect(mockAndroidPermissionsService.requestPermissions).toHaveBeenCalledWith([AndroidPermission.CAMERA]);
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(2,
+                    InteractType.TOUCH,
+                    InteractSubtype.ALLOW_CLICKED,
+                    Environment.ONBOARDING,
+                    PageId.APP_PERMISSION_POPUP);
+                expect(global.qrScanner.startScanner).toHaveBeenCalled();
+                expect(mockQRScannerResultHandler.parseDialCode).toHaveBeenCalledWith('some_data');
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenNthCalledWith(3,
+                    InteractType.QR_CAPTURED,
+                    '', Environment.ONBOARDING, PageId.SCAN,
+                    undefined,
+                    undefined,
+                    undefined,
+                    [{id: 'some_data', type: CorReleationDataType.QR}]
+                );
+                expect(mockTelemetryGeneratorService.generateImpressionTelemetry).toHaveBeenCalledWith(
+                    ImpressionType.QR_REQUEST, '',
+                    PageId.SCAN, Environment.ONBOARDING, '', '', '',
+                    undefined,
+                    [{id: 'some_data', type: CorReleationDataType.QR}]
+                );
+                done();
+            }, 0);
+        });
+
+        it('should check for permission and popover comes and user clicks on not now', (done) => {
+            // arrange
+            mockPlatform.pause = of(1, 2) as any;
+            mockAppGlobalService.isOnBoardingCompleted = true;
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateStartTelemetry = jest.fn();
+            const permissionStatusStack = [{hasPermission: true}, {hasPermission: false, isPermissionAlwaysDenied: false}];
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() =>
+                Promise.resolve(permissionStatusStack.pop()));
+            mockCommonUtilService.translateMessage = jest.fn(v => v);
+            mockCommonUtilService.buildPermissionPopover = jest.fn(async (callback) => {
+                await callback(mockCommonUtilService.translateMessage('NOT_NOW'));
+                return {
+                    present: jest.fn(() => Promise.resolve())
+                };
+            });
+            mockCommonUtilService.showSettingsPageToast = jest.fn();
+            // act
+            sunbirdQRScanner.startScanner('courses', false);
+            // assert
+            setTimeout(() => {
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.NOT_NOW_CLICKED,
+                    Environment.HOME,
+                    PageId.PERMISSION_POPUP
+                );
+                expect(mockCommonUtilService.showSettingsPageToast).toHaveBeenCalledWith(
+                    'CAMERA_PERMISSION_DESCRIPTION', 'sunbird', PageId.QRCodeScanner, true);
+                done();
+            }, 0);
+        });
+
+        it('should show settings toast if isPermissionAlwaysDenied always sets true', (done) => {
+            // arrange
+            mockPlatform.pause = of(1, 2) as any;
+            mockAppGlobalService.isOnBoardingCompleted = true;
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateStartTelemetry = jest.fn();
+            const permissionStatusStack = {hasPermission: false, isPermissionAlwaysDenied: true};
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() =>
+                Promise.resolve(permissionStatusStack));
+            mockCommonUtilService.showSettingsPageToast = jest.fn();
+            // act
+            sunbirdQRScanner.startScanner('profile-settings', true);
+            // assert
+            setTimeout(() => {
+                expect(mockCommonUtilService.showSettingsPageToast).toHaveBeenCalledWith
+                ('CAMERA_PERMISSION_DESCRIPTION', 'sunbird', PageId.QRCodeScanner, false);
+                done();
+            }, 0);
+        });
+    });
+
+    describe('skip qr code test cases', () => {
+
+        beforeEach(() => {
+            instantiateSunbirdQrScannerService();
+        });
+
+        it('should start qrScanner and get Scanned results equals skip', (done) => {
+            // arrange
+            const profile: Profile = {
+                uid: '1234',
+                handle: 'sample_name',
+                profileType: ProfileType.TEACHER,
+            };
+            mockPlatform.pause = of(1, 2) as any;
+            mockAppGlobalService.isOnBoardingCompleted = true;
+            mockAppGlobalService.DISPLAY_ONBOARDING_CATEGORY_PAGE = false;
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateStartTelemetry = jest.fn();
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() =>
+                Promise.resolve({hasPermission: true}));
+            jest.spyOn(global.qrScanner, 'startScanner').mockImplementation((_, __, ___, ____, _____, ______, cb) => {
+                cb('skip');
+            });
+            mockAppGlobalService.getCurrentUser = jest.fn(() => profile);
+            mockCommonUtilService.isAccessibleForNonStudentRole = jest.fn(() => true);
+            jest.spyOn(sunbirdQRScanner, 'stopScanner').mockImplementation();
+            mockRouter.navigate = jest.fn();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateEndTelemetry = jest.fn();
+            mockContainerService.removeAllTabs = jest.fn();
+            mockContainerService.addTab = jest.fn();
+            // act
+            sunbirdQRScanner.startScanner(PageId.PROFILE_SETTINGS, true);
+            // assert
+            setTimeout(() => {
+                expect(global.qrScanner.startScanner).toHaveBeenCalled();
+                expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalled();
+                expect(mockRouter.navigate).toHaveBeenCalledWith(['/tabs'], {state: {loginMode: 'guest'}});
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.NO_QR_CODE_CLICKED,
+                    Environment.ONBOARDING,
+                    PageId.QRCodeScanner);
+                expect(mockTelemetryGeneratorService.generateEndTelemetry).toHaveBeenCalledWith(
+                    'qr',
+                    Mode.PLAY,
+                    PageId.QRCodeScanner,
+                    Environment.HOME,
+                    {id: '', type: 'qr', version: undefined}
+                );
+                done();
+            }, 0);
+        });
+
+        it('should create student tabs if current profileType is student after clicking skip', (done) => {
+            // arrange
+            const profile: Profile = {
+                uid: '1234',
+                handle: 'sample_name',
+                profileType: ProfileType.STUDENT,
+            };
+            mockPlatform.pause = of(1, 2) as any;
+            mockAppGlobalService.isOnBoardingCompleted = true;
+            mockAppGlobalService.DISPLAY_ONBOARDING_CATEGORY_PAGE = false;
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateStartTelemetry = jest.fn();
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() =>
+                Promise.resolve({hasPermission: true}));
+            jest.spyOn(global.qrScanner, 'startScanner').mockImplementation((_, __, ___, ____, _____, ______, cb) => {
+                cb('skip');
+            });
+            mockAppGlobalService.getCurrentUser = jest.fn(() => profile);
+            mockCommonUtilService.isAccessibleForNonStudentRole = jest.fn(() => false);
+            jest.spyOn(global.qrScanner, 'stopScanner').mockImplementation();
+            mockRouter.navigate = jest.fn();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateEndTelemetry = jest.fn();
+            mockContainerService.removeAllTabs = jest.fn();
+            mockContainerService.addTab = jest.fn();
+            // act
+            sunbirdQRScanner.startScanner(undefined, true);
+            setTimeout(() => {
+                expect(global.qrScanner.startScanner).toHaveBeenCalled();
+                expect(mockAppGlobalService.getCurrentUser).toHaveBeenCalled();
+                expect(mockRouter.navigate).toHaveBeenCalledWith(['/tabs'], {state: {loginMode: 'guest'}});
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.TOUCH,
+                    InteractSubtype.NO_QR_CODE_CLICKED,
+                    Environment.ONBOARDING,
+                    PageId.QRCodeScanner);
+                done();
+            }, 0);
+        });
+
+        it('should call stop scanner when display category page returns true', (done) => {
+            // arrange
+            mockPlatform.pause = of(1, 2) as any;
+            mockAppGlobalService.isOnBoardingCompleted = true;
+            mockAppGlobalService.DISPLAY_ONBOARDING_CATEGORY_PAGE = true;
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateStartTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateEndTelemetry = jest.fn();
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() =>
+                Promise.resolve({hasPermission: true}));
+            jest.spyOn(global.qrScanner, 'startScanner').mockImplementation((_, __, ___, ____, _____, ______, cb) => {
+                cb('skip');
+            });
+            jest.spyOn(sunbirdQRScanner, 'stopScanner').mockImplementation();
+            // act
+            sunbirdQRScanner.startScanner('profile', true);
+            // assert
+            setTimeout(() => {
+                expect(sunbirdQRScanner.stopScanner).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+    });
+
+
+    describe('cancel telemetry test cases', () => {
+        beforeEach(() => {
+            instantiateSunbirdQrScannerService();
+        });
+        it('should check for scanned Data if it is cancel navback then generate telemetry', (done) => {
+
+
+            mockPlatform.pause = of(1, 2) as any;
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateStartTelemetry = jest.fn();
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve({hasPermission: true}));
+
+            jest.spyOn(global.qrScanner, 'startScanner').mockImplementation((_, __, ___, ____, _____, ______, cb) => {
+                cb('cancel_nav_back');
+            });
+            mockQRScannerResultHandler.parseDialCode = jest.fn(() => Promise.resolve('cancel_nav_back'));
+            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateBackClickedNewTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateEndTelemetry = jest.fn();
+            // act
+            sunbirdQRScanner.startScanner(PageId.COURSES, false).then(() => {
+                expect(global.qrScanner.startScanner).toHaveBeenCalled();
+                expect(mockQRScannerResultHandler.parseDialCode).toHaveBeenCalledWith('cancel_nav_back');
+                expect(mockTelemetryGeneratorService.generateBackClickedTelemetry).toHaveBeenCalledWith(
+                    PageId.SCAN,
+                    Environment.HOME,
+                    true
+                );
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    InteractSubtype.QRCodeScanCancelled,
+                    Environment.HOME,
+                    PageId.QRCodeScanner
+                );
+                expect(mockTelemetryGeneratorService.generateEndTelemetry).toHaveBeenCalledWith(
+                    'qr',
+                    Mode.PLAY,
+                    PageId.QRCodeScanner,
+                    Environment.HOME,
+                    {id: '', type: 'qr', version: undefined}
+                );
+                done();
+            });
+        });
+
+        it('should check for scanned Data if it is cancel hwback then generate telemetry', (done) => {
+
+            mockPlatform.pause = of(1, 2) as any;
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateStartTelemetry = jest.fn();
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() => Promise.resolve({hasPermission: true}));
+
+            jest.spyOn(global.qrScanner, 'startScanner').mockImplementation((_, __, ___, ____, _____, ______, cb) => {
+                cb('cancel_hw_back');
+            });
+            mockQRScannerResultHandler.parseDialCode = jest.fn(() => Promise.resolve('cancel_hw_back'));
+            mockTelemetryGeneratorService.generateBackClickedTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateBackClickedNewTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateEndTelemetry = jest.fn();
+            // act
+            sunbirdQRScanner.startScanner(undefined, false).then(() => {
+                expect(global.qrScanner.startScanner).toHaveBeenCalled();
+                expect(mockQRScannerResultHandler.parseDialCode).toHaveBeenCalledWith('cancel_hw_back');
+                expect(mockTelemetryGeneratorService.generateBackClickedNewTelemetry).toHaveBeenCalledWith(
+                    true,
+                    Environment.HOME,
+                    PageId.SCAN
+                );
+                expect(mockTelemetryGeneratorService.generateInteractTelemetry).toHaveBeenCalledWith(
+                    InteractType.OTHER,
+                    InteractSubtype.QRCodeScanCancelled,
+                    Environment.HOME,
+                    PageId.QRCodeScanner
+                );
+                done();
+            });
+        });
+    });
+
+    describe('scanned data conditions result handler', () => {
+        beforeEach(() => {
+            instantiateSunbirdQrScannerService();
+        });
+        it('should check if it has contentId then call handleContentId()', (done) => {
+            // arrange
+            mockPlatform.pause = of(1, 2) as any;
+            mockAppGlobalService.isOnBoardingCompleted = true;
+            mockAppGlobalService.DISPLAY_ONBOARDING_CATEGORY_PAGE = false;
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateStartTelemetry = jest.fn();
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() =>
+                Promise.resolve({hasPermission: true}));
+            jest.spyOn(global.qrScanner, 'startScanner').mockImplementation((_, __, ___, ____, _____, ______, cb) => {
+                cb('sample_content_id');
+            });
+            mockQRScannerResultHandler.parseDialCode = jest.fn();
+            mockQRScannerResultHandler.isContentId = jest.fn(() => true);
+            mockQRScannerResultHandler.handleContentId = jest.fn();
+            // act
+            sunbirdQRScanner.startScanner('resources', false);
+            // assert
+            setTimeout(() => {
+                expect(mockQRScannerResultHandler.isContentId).toHaveBeenCalledWith('sample_content_id');
+                expect(mockQRScannerResultHandler.handleContentId).toHaveBeenCalledWith('resources', 'sample_content_id');
+                done();
+            }, 0);
+        });
+
+        it('should check scanned data has certificate linked to it', (done) => {
+            // arrange
+            mockPlatform.pause = of(1, 2) as any;
+            mockAppGlobalService.isOnBoardingCompleted = true;
+            mockAppGlobalService.DISPLAY_ONBOARDING_CATEGORY_PAGE = false;
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateStartTelemetry = jest.fn();
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() =>
+                Promise.resolve({hasPermission: true}));
+            jest.spyOn(global.qrScanner, 'startScanner').mockImplementation((_, __, ___, ____, _____, ______, cb) => {
+                cb('/certs/sample_content_id');
+            });
+            mockQRScannerResultHandler.isContentId = jest.fn();
+            mockQRScannerResultHandler.parseDialCode = jest.fn();
+            mockQRScannerResultHandler.handleCertsQR = jest.fn();
+            // act
+            sunbirdQRScanner.startScanner('courses', false);
+            // assert
+            setTimeout(() => {
+                expect(mockQRScannerResultHandler.handleCertsQR).toHaveBeenCalledWith('courses', '/certs/sample_content_id');
+                done();
+            }, 0);
+        });
+
+        it('should check if it has invalid QRCODE()', (done) => {
+            // arrange
+            mockPlatform.pause = of(1, 2) as any;
+            mockAppGlobalService.isOnBoardingCompleted = true;
+            mockAppGlobalService.DISPLAY_ONBOARDING_CATEGORY_PAGE = false;
+            mockTelemetryGeneratorService.generateImpressionTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generatePageLoadedTelemetry = jest.fn();
+            mockTelemetryGeneratorService.generateStartTelemetry = jest.fn();
+            mockCommonUtilService.getGivenPermissionStatus = jest.fn(() =>
+                Promise.resolve({hasPermission: true}));
+            jest.spyOn(global.qrScanner, 'startScanner').mockImplementation((_, __, ___, ____, _____, ______, cb) => {
+                cb('invalid');
+            });
+            mockTelemetryGeneratorService.generateInteractTelemetry = jest.fn();
+            mockQRScannerResultHandler.isContentId = jest.fn();
+            mockQRScannerResultHandler.parseDialCode = jest.fn();
+            mockQRScannerResultHandler.handleInvalidQRCode = jest.fn();
+            mockCommonUtilService.afterOnBoardQRErrorAlert = jest.fn();
+            // act
+            sunbirdQRScanner.startScanner('resources', false);
+            // assert
+            setTimeout(() => {
+                expect(mockQRScannerResultHandler.handleInvalidQRCode).toHaveBeenCalledWith('resources', 'invalid');
+                expect(mockCommonUtilService.afterOnBoardQRErrorAlert)
+                    .toHaveBeenCalledWith('INVALID_QR', 'UNKNOWN_QR', 'resources', 'invalid');
+                done();
+            }, 0);
+        });
+    });
 });
diff --git a/src/services/sunbirdqrscanner.service.ts b/src/services/sunbirdqrscanner.service.ts
index bff3641e4..5ddc5a27c 100644
--- a/src/services/sunbirdqrscanner.service.ts
+++ b/src/services/sunbirdqrscanner.service.ts
@@ -1,9 +1,17 @@
 import { Injectable } from '@angular/core';
+import { NavigationExtras, Router } from '@angular/router';
+import { GUEST_STUDENT_TABS, GUEST_TEACHER_TABS, initTabs } from '@app/app/module.service';
+import { AppGlobalService, CommonUtilService, QRScannerResultHandler, TelemetryGeneratorService } from '@app/services/';
+import { AndroidPermissionsService } from '@app/services/android-permissions/android-permissions.service';
+import { ContainerService } from '@app/services/container.services';
+import { AppVersion } from '@ionic-native/app-version/ngx';
+import { Platform, ToastController } from '@ionic/angular';
 import { TranslateService } from '@ngx-translate/core';
-import { Subscription, Observable, Observer } from 'rxjs';
-import { Profile, ProfileType, TelemetryObject } from 'sunbird-sdk';
+import { take } from 'rxjs/operators';
+import { CorrelationData, Profile, ProfileType, TelemetryObject } from 'sunbird-sdk';
+import { AndroidPermission, AndroidPermissionsStatus, PermissionAskedEnum } from './android-permissions/android-permission';
 import {
-  Environment,
+  CorReleationDataType, Environment,
   ImpressionSubtype,
   ImpressionType,
   InteractSubtype,
@@ -11,22 +19,9 @@ import {
   Mode,
   PageId
 } from './telemetry-constants';
-import { ContainerService } from '@app/services/container.services';
-import { AndroidPermissionsService } from '@app/services/android-permissions/android-permissions.service';
-import { AndroidPermissionsStatus, AndroidPermission, PermissionAskedEnum } from './android-permissions/android-permission';
-import { QRScannerResultHandler, AppGlobalService } from '@app/services/';
-import { TelemetryGeneratorService } from '@app/services/';
-import { CommonUtilService } from '@app/services/';
-import { Platform, ToastController, PopoverController } from '@ionic/angular';
-import { AppVersion } from '@ionic-native/app-version/ngx';
-import { initTabs, GUEST_TEACHER_TABS, GUEST_STUDENT_TABS } from '@app/app/module.service';
-import { NavigationExtras, Router } from '@angular/router';
-import { SbPopoverComponent } from '@app/app/components/popups/sb-popover/sb-popover.component';
-import { QRScannerAlert, QRAlertCallBack } from '@app/app/qrscanner-alert/qrscanner-alert.page';
-import { RouterLinks } from '@app/app/app.constant';
-import { mergeMap, take } from 'rxjs/operators';
 
 declare const cordova;
+
 @Injectable()
 export class SunbirdQRScanner {
   profile: Profile;
@@ -55,7 +50,6 @@ export class SunbirdQRScanner {
     private commonUtilService: CommonUtilService,
     private appVersion: AppVersion,
     private toastController: ToastController,
-    private popCtrl: PopoverController,
     private router: Router
   ) {
     const that = this;
@@ -95,12 +89,18 @@ export class SunbirdQRScanner {
       } else if (permissionStatus.isPermissionAlwaysDenied) {
         await this.commonUtilService.showSettingsPageToast('CAMERA_PERMISSION_DESCRIPTION', this.appName, PageId.QRCodeScanner, false);
       } else {
-        resolve(this.showPopover(source));
+        this.showPopover(source).then((result) => {
+          if (result) {
+              resolve(result);
+          } else {
+           resolve(undefined);
+          }
+        });
       }
     });
   }
 
-  async showPopover(pageId: string): Promise<string | undefined> {
+  private async showPopover(pageId: string): Promise<string | undefined> {
     return new Promise<string | undefined>(async (resolve, reject) => {
       const confirm = await this.commonUtilService.buildPermissionPopover(
         async (whichBtnClicked: string) => {
@@ -112,7 +112,6 @@ export class SunbirdQRScanner {
                 PageId.PERMISSION_POPUP);
             await this.commonUtilService.showSettingsPageToast
             ('CAMERA_PERMISSION_DESCRIPTION', this.appName, PageId.QRCodeScanner, this.appGlobalService.isOnBoardingCompleted);
-            resolve(undefined);
           } else {
             this.telemetryGeneratorService.generateInteractTelemetry(
                 InteractType.TOUCH,
@@ -120,13 +119,33 @@ export class SunbirdQRScanner {
                 pageId === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
                 PageId.PERMISSION_POPUP);
             this.appGlobalService.setIsPermissionAsked(PermissionAskedEnum.isCameraAsked, true);
+            this.appGlobalService.isNativePopupVisible = true;
             this.permission.requestPermissions([AndroidPermission.CAMERA]).subscribe((status: AndroidPermissionsStatus) => {
               if (status && status.hasPermission) {
-                resolve(this.startScanner(this.source, this.showButton));
+                  this.telemetryGeneratorService.generateInteractTelemetry(
+                      InteractType.TOUCH,
+                      InteractSubtype.ALLOW_CLICKED,
+                      pageId === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+                      PageId.APP_PERMISSION_POPUP
+                  );
+                  this.startScanner(this.source, this.showButton).then((result) => {
+                    if (result) {
+                      resolve(result);
+                    } else {
+                      resolve(undefined);
+                    }
+                    this.appGlobalService.isNativePopupVisible = false;
+                  });
               } else {
-                this.commonUtilService.showSettingsPageToast
+                  this.telemetryGeneratorService.generateInteractTelemetry(
+                      InteractType.TOUCH,
+                      InteractSubtype.DENY_CLICKED,
+                      pageId === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+                      PageId.APP_PERMISSION_POPUP
+                  );
+                  this.commonUtilService.showSettingsPageToast
                 ('CAMERA_PERMISSION_DESCRIPTION', this.appName, PageId.QRCodeScanner, this.appGlobalService.isOnBoardingCompleted);
-                resolve(undefined);
+                  this.appGlobalService.setNativePopupVisible(false, 1000);
               }
             }, (e) => { reject(e); });
           }
@@ -149,7 +168,7 @@ export class SunbirdQRScanner {
     }, 100);
   }
 
-getProfileSettingConfig() {
+private getProfileSettingConfig() {
     this.profile = this.appGlobalService.getCurrentUser();
     if (this.commonUtilService.isAccessibleForNonStudentRole(this.profile.profileType)) {
       initTabs(this.container, GUEST_TEACHER_TABS);
@@ -189,9 +208,14 @@ getProfileSettingConfig() {
             if (scannedData === 'cancel' ||
               scannedData === 'cancel_hw_back' ||
               scannedData === 'cancel_nav_back') {
-              this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.QRCodeScanner,
+              this.telemetryGeneratorService.generateBackClickedTelemetry(PageId.SCAN,
                 source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
                 scannedData === 'cancel_nav_back');
+              this.telemetryGeneratorService.generateBackClickedNewTelemetry(
+                scannedData === 'cancel_hw_back',
+                this.appGlobalService.isOnBoardingCompleted ? Environment.HOME : Environment.ONBOARDING,
+                PageId.SCAN
+               );
               this.telemetryGeneratorService.generateInteractTelemetry(
                 InteractType.OTHER,
                 InteractSubtype.QRCodeScanCancelled,
@@ -199,6 +223,18 @@ getProfileSettingConfig() {
                 PageId.QRCodeScanner);
               this.generateEndEvent(source, '');
             } else if (dialCode) {
+              const corRelationList: Array<CorrelationData> = [];
+              corRelationList.push({id: dialCode, type: CorReleationDataType.QR});
+              this.telemetryGeneratorService.generateInteractTelemetry(
+                InteractType.QR_CAPTURED,
+                '',
+                source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+                PageId.SCAN,
+                undefined,
+                undefined,
+                undefined,
+                corRelationList);
+              this.generateImpressionTelemetry(source, dialCode);
               this.qrScannerResultHandler.handleDialCode(source, scannedData, dialCode);
             } else if (this.qrScannerResultHandler.isContentId(scannedData)) {
               this.qrScannerResultHandler.handleContentId(source, scannedData);
@@ -206,7 +242,7 @@ getProfileSettingConfig() {
               this.qrScannerResultHandler.handleCertsQR(source, scannedData);
             } else {
               this.qrScannerResultHandler.handleInvalidQRCode(source, scannedData);
-              this.showInvalidCodeAlert();
+              this.showInvalidCodeAlert(scannedData);
             }
             this.stopScanner();
           }
@@ -218,22 +254,37 @@ getProfileSettingConfig() {
     });
   }
 
-generateImpressionTelemetry(source) {
-    this.telemetryGeneratorService.generateImpressionTelemetry(
-      ImpressionType.VIEW,
-      ImpressionSubtype.QRCodeScanInitiate,
-      source,
-      source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME);
+private generateImpressionTelemetry(source, dialCode?) {
+    if (dialCode) {
+     const corRelationList: Array<CorrelationData> = [];
+     corRelationList.push({id: dialCode, type: CorReleationDataType.QR});
+     this.telemetryGeneratorService.generateImpressionTelemetry(
+      ImpressionType.QR_REQUEST, '',
+      PageId.SCAN,
+      source ? Environment.ONBOARDING : Environment.HOME, '', '', '',
+      undefined,
+      corRelationList);
+     } else {
+      this.telemetryGeneratorService.generatePageLoadedTelemetry(
+        PageId.SCAN,
+        source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME
+     );
+      this.telemetryGeneratorService.generateImpressionTelemetry(
+        ImpressionType.VIEW,
+        ImpressionSubtype.QRCodeScanInitiate,
+        source,
+        source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME);
+     }
   }
 
-generateStartEvent(pageId: string) {
+private generateStartEvent(pageId: string) {
     const telemetryObject = new TelemetryObject('', 'qr', undefined);
     this.telemetryGeneratorService.generateStartTelemetry(
       PageId.QRCodeScanner,
       telemetryObject);
   }
 
-generateEndEvent(pageId: string, qrData: string) {
+private generateEndEvent(pageId: string, qrData: string) {
     if (pageId) {
       const telemetryObject: TelemetryObject = new TelemetryObject(qrData, 'qr', undefined);
 
@@ -247,7 +298,7 @@ generateEndEvent(pageId: string, qrData: string) {
     }
   }
 
-  async showInvalidCodeAlert() {
+  private async showInvalidCodeAlert(scannedData) {
     this.telemetryGeneratorService.generateInteractTelemetry(
       InteractType.OTHER,
       InteractSubtype.QR_CODE_INVALID,
@@ -255,49 +306,25 @@ generateEndEvent(pageId: string, qrData: string) {
       this.source
     );
     if (this.source !== 'permission') {
-      this.commonUtilService.afterOnBoardQRErrorAlert('INVALID_QR', 'UNKNOWN_QR');
+      const corRelationList: CorrelationData[] = [{
+        id: PageId.SCAN,
+        type: CorReleationDataType.CHILD_UI
+      }];
+      this.telemetryGeneratorService.generateImpressionTelemetry(
+          InteractSubtype.QR_CODE_INVALID, '',
+          this.source === PageId.ONBOARDING_PROFILE_PREFERENCES ? PageId.SCAN_OR_MANUAL : this.source,
+          this.source === PageId.ONBOARDING_PROFILE_PREFERENCES ? Environment.ONBOARDING : Environment.HOME,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          corRelationList
+      );
+      this.commonUtilService.afterOnBoardQRErrorAlert('INVALID_QR', 'UNKNOWN_QR', this.source, scannedData);
       return;
     }
-    let popUp;
-    const self = this;
-    const callback: QRAlertCallBack = {
-      tryAgain() {
-        popUp.dismiss().then(() => {
-          this.pauseSubscription.unsubscribe();
-        });
-        self.startScanner(self.source, self.showButton);
-      },
-      cancel() {
-        popUp.dismiss().then(() => {
-          this.pauseSubscription.unsubscribe();
-        });
-
-        if (self.showButton) {
-          if (this.appGlobalService.DISPLAY_ONBOARDING_CATEGORY_PAGE) {
-            const navigationExtras: NavigationExtras = { state: { stopScanner: true } };
-            self.router.navigate([`/${RouterLinks.PROFILE_SETTINGS}`], navigationExtras);
-          } else {
-            this.getProfileSettingConfig();
-          }
-        }
-      }
-    };
-
-    popUp = await this.popCtrl.create({
-      component: QRScannerAlert,
-      componentProps: {
-        callback,
-        invalidContent: true,
-        messageKey: 'UNKNOWN_QR',
-        tryAgainKey: 'TRY_DIFF_QR'
-      },
-      cssClass: 'qr-alert-invalid'
-    });
-
-    await popUp.present();
   }
 }
-
 export interface QRResultCallback {
   dialcode(scanResult: string, code: string);
 
diff --git a/src/services/telemetry-constants.ts b/src/services/telemetry-constants.ts
index 9d4afab76..cf46ecc0e 100644
--- a/src/services/telemetry-constants.ts
+++ b/src/services/telemetry-constants.ts
@@ -6,7 +6,12 @@ export enum Environment {
     USER = 'user',
     SETTINGS = 'settings',
     ONBOARDING = 'onboarding',
-    NOTIFICATION = 'notification'
+    NOTIFICATION = 'notification',
+    GROUP = 'group',
+    PLAYER = 'player',
+    DISCUSSION = 'discussion',
+    FAQ = 'faq',
+    SEARCH = 'search'
 }
 
 export enum ErrorCode {
@@ -23,11 +28,16 @@ export enum ObjectType {
     GROUP = 'Group',
     CONTENT = 'Content',
     QUESTION = 'Question',
-    QR = 'Qr'
+    QR = 'Qr',
+    TEXTBOOK = ' TextBook'
 }
+
 export enum Mode {
-    PLAY = 'play'
+    PLAY = 'play',
+    ONLINE = 'online',
+    OFFLINE = 'offline'
 }
+
 export enum PageId {
     SPLASH_SCREEN = 'splash',
     LOGIN = 'login',
@@ -66,23 +76,12 @@ export enum PageId {
     SETTINGS_DEVICE_TAGS = 'settings-device-tags',
     SETTINGS_SUPPORTS = 'settings-supports',
     SETTINGS_ABOUT_US = 'settings-about-us',
-    USERS_GROUPS = 'users-groups',
     CREATE_USER = 'create-profile',
     CREATE_GROUP = 'create-group',
-    CREATE_GROUP_SYLLABUS_CLASS = 'create-group-syllabusclass',
-    CREATE_GROUP_USER_SELECTION = 'create-group-userselection',
     GROUP_DETAIL = 'group-detail',
     GUEST_PROFILE = 'guest-profile',
     EDIT_USER = 'edit-user',
     EDIT_GROUP = 'edit-group',
-    ADD_GROUP_SYLLABUS_CLASS = 'add-group-syllabusclass',
-    ADD_GROUP_USER_SELECTION = 'add-group-userselection',
-    REMOVE_USERS_FROM_GROUP = 'remove-users-from-group',
-    SHARE_USER_GROUP = 'share-user-group',
-    REPORTS_USER_GROUP = 'reports-users-group',
-    REPORTS_ASSESMENT_CONTENT_LIST = 'assesment-content-list',
-    REPORTS_USER_ASSESMENT_DETAILS = 'user-assesment-details',
-    REPORTS_GROUP_ASSESMENT_DETAILS = 'group-assesment-details',
     ONBOARDING_LANGUAGE_SETTING = 'onboarding-language-setting',
     VIEW_MORE = 'view-more',
     DIAL_CODE_SCAN_RESULT = 'dial-code-scan-result',
@@ -125,11 +124,55 @@ export enum PageId {
     IMPORT_CONTENT_POPUP = 'import-content-popup',
     DOWNLOAD_ALL_CONFIRMATION_POPUP = 'download-all-confirmation-popup',
     PERMISSION_POPUP = 'permission-popup',
-    STORAGE_SETTINGS = 'storage-settings'
+    PLAYER_PAGE = 'player-page',
+    /* New Telemetry */
+    LANGUAGE = 'language',
+    USER_TYPE = 'usertype',
+    SCAN_OR_MANUAL = 'scan-or-manual',
+    PROFILE_SETTINGS = 'profile-settings',
+    POPUP_CATEGORY = 'popup-category',
+    APP_PERMISSION_POPUP = 'app-permission-popup',
+    STORAGE_SETTINGS = 'storage-settings',
+    CREATE_MANAGED_USER = 'create-managed-user',
+    MANAGE_USERS = 'manage-users',
+    CHAPTER_DETAILS = 'chapter-details',
+    TEACHER_SELF_DECLARATION = 'teacher-self-declaration',
+    COURSE_LIST = 'course-list',
+    MANUAL_PROFILE = 'manual-profile',
+    SCAN = 'scan',
+    APP_TUTORIAL_POPUP = 'app-tutorial-popup',
+    COURSE_SEARCH_FILTER = 'course-search-filter',
+    QR_BOOK_RESULT = 'qr-book-result',
+    QR_CONTENT_RESULT = 'qr-content-result',
+    LOCATION = 'location',
+    MANUAL = 'manual',
+    COURSE_COMPLETION_POPUP = 'course-completion-popup',
+    PROFILE_NAME_CONFIRMATION_POPUP = 'profile-name-confirmation-popup',
+    MY_GROUP = 'groups-list',
+    ADD_MEMBER = 'add-member',
+    ACTIVITY_DETAIL = 'activity-detail',
+    TEXTBOOK_IMPORT = 'textbookimport',
+    ACTIVITY_TOC = 'activity-toc',
+    ADD_ACTIVITY_TO_GROUP = 'add-activity-to-group',
+    PLANNED_MAINTENANCE_BANNER = 'planned-maintenance-banner',
+    FRAMEWORK_SELECTION = 'framework-selection',
+    RELEVANT_CONTENTS = 'relevant-contents',
+    PLAYER = 'player',
+    ADMIN_HOME = 'admin-home',
+    CATEGORY_RESULTS = 'category-results',
+    BOARD_RESULTS = 'board-results',
+    SUBJECT_RESULTS = 'subject-results',
+    AUDIENCE_RESULTS = 'audience-results',
+    NEW_EXPERIENCE_POPUP = 'new-experience-popup',
+    MENU = 'menu',
+    CERTIFICATE_VIEW = 'certificate-view',
 }
+
 export enum LogType {
     NOTIFICATION = 'notification'
 }
+
+
 export enum LogLevel {
     TRACE = 'TRACE',
     DEBUG = 'DEBUG',
@@ -148,22 +191,37 @@ export enum ImpressionType {
     WORKFLOW = 'workflow',
     DISTRICT_MAPPING = 'district-mapping',
     CAMERA = 'camera',
-    FILE_MANAGEMENT = 'file-management'
+    FILE_MANAGEMENT = 'file-management',
+    /* New Telemetry */
+    PAGE_LOADED = 'page-loaded',
+    PAGE_REQUEST = 'page-request',
+    SET_LANGUAGE = 'set-language',
+    QR_REQUEST = 'qr-request',
+    POP_UP_CATEGORY = 'pop-up-category'
 }
+
 export enum ImpressionSubtype {
     QRCodeScanInitiate = 'qr-code-scan-initiate',
     RATING_POPUP = 'rating-popup',
     QR_CODE_VALID = 'qr-code-valid',
     INVALID_QR_CODE = 'invalid-qr-code',
     APP_RATING_POPUP = 'app-rating-popup',
-    QR_SCAN_WALKTHROUGH = 'qr-scan-walkthrough',
+    TUTORIAL_WALKTHROUGH = 'tutorial-walkthrough',
     COMINGSOON_POPUP = 'coming-soon-popup',
     EXPLORE_MORE_CONTENT = 'explore-more-content',
     RECOVERY_ACCOUNT_POPUP = 'recovery-account-popup',
     DISTRICT_LOCATION_MAPPING = 'district-location-mapping',
     UPGRADE_POPUP = 'upgrade-popup',
-    DEEPLINK = 'deeplink'
+    DEEPLINK = 'deeplink',
+    CREATE_GROUP_FORM = 'create-group-form',
+    DISPLAY_DIKSHA_ID_TUTORIAL = 'display-diksha-id-tutorial',
+    GROUP_TUTORIAL = 'my-group-tutorial-popup',
+    OFFLINE_MODE = 'offline-mode',
+    AUTO = 'auto',
+    LOCATION = 'location',
+    HOME = 'home'
 }
+
 export enum InteractType {
     TOUCH = 'TOUCH',
     OTHER = 'OTHER',
@@ -182,10 +240,58 @@ export enum InteractType {
     LOCAL = 'local',
     FCM = 'fcm',
     WITHOUT_CONTENT = 'without-content',
-    WITH_CONTENT = 'with-content'
+    WITH_CONTENT = 'with-content',
+    /* New Telemetry */
+    SELECT_LANGUAGE = 'select-language',
+    SELECT_CONTINUE = 'select-continue',
+    SELECT_USERTYPE = 'select-usertype',
+    SELECT_BACK = 'select-back',
+    SELECT_QRSCANER = 'select-qrscanner',
+    SELECT_CATEGORY = 'select-category',
+    SELECT_ATTRIBUTE = 'select-attribute',
+    SELECT_AUDIENCE = 'select-audience',
+    SELECT_SUBMIT = 'select-submit',
+    SELECT_CANCEL = 'select-cancel',
+    SELECT_ADD = 'select-add',
+    SELECT_MORE = 'select-more',
+    SUBMISSION_INITIATED = 'submission-initiated',
+    SUBMISSION_SUCCESS = 'submission-success',
+    SUBMISSION_FAILURE = 'submission-failure',
+    CREATE_SUCCESS = 'create-success',
+    CREATE_FAILURE = 'create-failure',
+    SWITCH_SUCCESS = 'switch-success',
+    SWITCH_FAILURE = 'switch-failure',
+    QR_CAPTURED = 'qr-captured',
+    PLAY = 'play',
+    DOWNLOAD = 'download',
+    SELECT_CLOSE = 'select-close',
+    DOWNLOAD_COMPLETE = 'download-complete',
+    POPUP_LOADED = 'popup-loaded',
+    INITIATED = 'initiated',
+    SUCCESS = 'success',
+    FAILURE = 'failure',
+    SUPPORT = 'support',
+    SELECT_BOOK = 'select-book',
+    SELECT_CARD = 'select-card',
+    SELECT_SUBJECT = 'select-subject',
+    SELECT_VIEW_ALL = 'select-view-all',
+    SELECT_CONTENT = 'select-content',
+    SELECT_BOARD = 'select-board',
+    NEW_EXPERIENCE = 'new-experience',
+    SELECT_CREATE_GROUP = 'select-create-group',
+    CREATE_GROUP = 'create-group',
+    SELECT_GROUP = 'select-group',
+    ADD_MEMBER = 'add-member',
+    VERIFY_USER = 'verify-user',
+    ADD_ACTIVITY = 'add-activity',
+    VIEW_ACTIVITY = 'view-activity',
+    SELECT_ACTIVITY = 'select-activity',
+    UPDATE_GROUP = 'update-group',
+    SELECT_DEACTIVATE = 'select-deactivate',
+    SELECT_DELETE = 'select-delete',
+    DOWNLOAD_CLICKED = 'download-clicked'
 }
 
-
 export enum InteractSubtype {
     PRINT_PDF_CLICKED = 'print-pdf-clicked',
     MERGE_ACCOUNT_INITIATED = 'merge-account-initiated',
@@ -210,7 +316,6 @@ export enum InteractSubtype {
     FILTER_BUTTON_CLICKED = 'filter-button-clicked',
     VIEWALL_CLICKED = 'view-all-clicked',
     BOOK_LIST_END_REACHED = 'book-list-end-reached',
-    RECENTLY_VIEWED_END_REACHED = 'recently-viewed-end-reached',
     SHARE_COURSE_INITIATED = 'share-course-initiated',
     SHARE_CONTENT_INITIATED = 'share-content-initiated',
     SHARE_COURSE_SUCCESS = 'share-course-success',
@@ -218,7 +323,6 @@ export enum InteractSubtype {
     FLAG_INITIATE = 'flag-initiated',
     FLAG_SUCCESS = 'flag-success',
     FLAG_FAILED = 'flag-failed',
-    CONTENT_PLAY = 'content-play',
     QRCodeScanClicked = 'qr-code-scanner-clicked',
     QRCodeScanSuccess = 'qr-code-scan-success',
     QRCodeScanCancelled = 'qr-code-scan-cancelled',
@@ -243,48 +347,23 @@ export enum InteractSubtype {
     DATA_SYNC_TYPE = 'data-sync-type-clicked',
     RATING_CLICKED = 'rating-clicked',
     RATING_SUBMITTED = 'rating-submitted',
-    CREATE_USER_CLICKED = 'create-user-clicked',
     CREATE_USER_INITIATED = 'create-user-initated',
     EDIT_USER_INITIATED = 'edit-user-initated',
     CREATE_USER_SUCCESS = 'create-user-success',
     EDIT_USER_SUCCESS = 'edit-user-success',
     CREATE_GROUP_CLICKED = 'create-group-clicked',
-    CREATE_GROUP_INITIATED = 'create-group-initated',
-    CREATE_GROUP_SUCCESS = 'create-group-success',
-    EDIT_GROUP_INITIATED = 'edit-group-initated',
     EDIT_GROUP_SUCCESS = 'edit-group-success',
-    SWITCH_USER_CLICKED = 'switch-user-clicked',
-    SWITCH_USER_INITIATE = 'switch-user-initiate',
-    SWITCH_USER_SUCCESS = 'switch-user-success',
-    DELETE_USER_INITIATE = 'delete-user-initiate',
-    DELETE_GROUP_INITIATE = 'delete-group-initiate',
-    DELETE_ALL_CLICKED = 'delete-from-device-button-clicked',
-    SHARE_USER_GROUP_INITIATE = 'share-usergroup-initiate',
-    SHARE_USER_GROUP_SUCCESS = 'share-usergroup-success',
-    USER_GROUP_CLICKED = 'users-groups-clicked',
-    REPORTS_CLICKED = 'reports-clicked',
-    USERS_TAB_CLICKED = 'users-tab-clicked',
-    GROUPS_TAB_CLICKED = 'groups-tab-clicked',
+    MY_GROUPS_CLICKED = 'my-groups-clicked',
     SUBMIT_CLICKED = 'submit-clicked',
     LOCATION_CAPTURED = 'location-captured',
     USER_CLICKED = 'user-clicked',
-    GROUP_CLICKED = 'group-clicked',
     CLASS_CLICKED = 'class-clicked',
     MEDIUM_CLICKED = 'medium-clicked',
-    REPORTS_BY_USER_CLICKED = 'byuser-tab-clicked',
-    REPORTS_BY_QUESTION_CLICKED = 'byquestion-tab-clicked',
-    REPORTS_SORTBY_QUESTION_CLICKED = 'sortby-question-clicked',
-    REPORTS_SORTBY_TIME_CLICKED = 'sortby-time-clicked',
-    REPORTS_SORTBY_RESULT_CLICKED = 'sortby-result-clicked',
-    REPORTS_SORTBY_USER_CLICKED = 'sortby-users-clicked',
-    REPORTS_SORTBY_SCORE_CLICKED = 'sortby-score-clicked',
-    REPORTS_SORTBY_MARKS_CLICKED = 'sortby-marks-clicked',
-    REPORTS_SORTBY_ACCURACY_CLICKED = 'sortby-accuracy-clicked',
-    QUESTION_CLICKED = 'question-clicked',
+    REFRESH_CLICKED = 'refresh-clicked',
     INITIAL_CONFIG = 'initial-config',
     FILTER_CONFIG = 'filter-config',
     APPLY_FILTER_CLICKED = 'apply-filter-clicked',
-    PROFILE_ATTRIBUTE_CHANGED = 'profile_attribute_changed',
+    PROFILE_ATTRIBUTE_CHANGED = 'profile-attribute-changed',
     SAVE_CLICKED = 'save-clicked',
     FINISH_CLICKED = 'finish-clicked',
     DEVICE_BACK_CLICKED = 'device-back-clicked',
@@ -305,7 +384,6 @@ export enum InteractSubtype {
     READ_MORE_CLICKED = 'read-more-clicked',
     READ_LESS_CLICKED = 'read-less-clicked',
     DOWNLOAD_PLAY_CLICKED = 'download-play-clicked',
-    DOWNLOAD_REPORT_CLICKED = 'download-report-clicked',
     PLAY_CLICKED = 'play-clicked',
     EXTRA_INFO = 'extra-info',
     PROFILE_ATTRIBUTE_POPULATION = 'profile-attribute-population',
@@ -331,11 +409,11 @@ export enum InteractSubtype {
     SORT_OPTION_SELECTED = 'sort-options-selected',
     ACTION_BUTTON_CLICKED = 'action-button-clicked',
     OUTSIDE_POPUP_AREA_CLICKED = 'outside-popup-area-clicked',
-    POPUP_DISMISSED= 'popup-dismissed',
+    POPUP_DISMISSED = 'popup-dismissed',
     DOWNLOAD_CANCEL_ALL_CLICKED = 'download-cancel-all-clicked',
     DOWNLOAD_CERTIFICATE_CLICKED = 'download-certificate-clicked',
     DOWNLOAD_CANCEL_CLICKED = 'download-cancel-clicked',
-    DOWNLOAD_CLICKED = 'download-from-device-button-clicked',
+    DOWNLOAD_CLICKED = 'download-clicked',
     RATE_LATER_CLICKED = 'rate-later-clicked',
     PLAY_STORE_BUTTON_CLICKED = 'play-store-button-clicked',
     HELP_SECTION_CLICKED = 'help-section-clicked',
@@ -403,7 +481,66 @@ export enum InteractSubtype {
     FORCE_UPGRADE_INFO = 'force-upgrade-info',
     OPTIONAL_UPGRADE = 'optional-upgrade',
     DEEPLINK_UPGRADE = 'deep-link-upgrade',
-    NO_QR_CODE_CLICKED = 'no-qr-code-clicked'
+    NO_QR_CODE_CLICKED = 'no-qr-code-clicked',
+    /* New Telemetry */
+    SUCCESS = 'success',
+    FAIL = 'fail',
+    UI = 'ui',
+    DEVICE = 'device',
+    DENY_CLICKED = 'deny-clicked',
+    NEW = 'new',
+    EXISTING = 'existing',
+    SUBJECT_CARD_CLICKED = 'subject-card-clicked',
+    INFORMATION_ICON_CLICKED = 'information-icon-clicked',
+    TUTORIAL_CONTINUE_CLICKED = 'tutorial-continue-clicked',
+    SYNC_NOW_CLICKED = 'sync-now-clicked',
+    DOWNLOAD_REQUEST = 'download-request',
+    DOWLOAD_POPUP = 'download-popup',
+    DOWNLOAD = 'download',
+    CTA = 'cta',
+    CLOSE_ICON = 'close-icon',
+    OUTSIDE = 'outside',
+    QR_NOT_LINKED = 'qr-not-linked',
+    GROUP_CLICKED = 'group-clicked',
+    ADD_MEMBER_CLICKED = 'add-member-clicked',
+    ADD_ACTIVITY_CLICKED = 'add-activity-clicked',
+    ACTIVITY_TYPE_CLICKED = 'activity-type-clicked',
+    SELECT_NESTED_ACTIVITY_CLICKED = 'select-nested-activity-clicked',
+    DELETE_GROUP_CLICKED = 'delete-group-clicked',
+    LEAVE_GROUP_CLICKED = 'leave-group-clicked',
+    MAKE_GROUP_ADMIN_CLICKED = 'make-group-admin-clicked',
+    DISMISS_GROUP_ADMIN_CLICKED = 'dismiss-group-admin-clicked',
+    REMOVE_MEMBER_CLICKED = 'remove-member-clicked',
+    REMOVE_ACTIVITY_CLICKED = 'remove-activity-clicked',
+    VERIFY_CLICKED = 'verify-clicked',
+    ADD_MEMBER_TO_GROUP_CLICKED = 'add-member-to-group-clicked',
+    ADD_TO_GROUP_CLICKED = 'add-to-group-clicked',
+    ACTIVITY_TAB_CLICKED = 'activity-tab-clicked',
+    MEMBER_TAB_CLICKED = 'member-tab-clicked',
+    EDIT_GROUP_CLICKED = 'edit-group-clicked',
+    LET_US_KNOW_CLICKED = 'let-us-know-clicked',
+    DOWNLOAD_PDF_CLICKED = 'download-pdf-clicked',
+    DEACTIVATE_GROUP_CLICKED = 'deactivate-group-clicked',
+    REACTIVATE_GROUP_CLICKED = 'reactivate-group-clicked',
+    ENABLE_DISCUSSIONS_CLICKED = 'enable-discussions-clicked',
+    DISABLE_DISCUSSIONS_CLICKED = 'disable-discussions-clicked',
+    SYNC_PROGRESS_CLICKED = 'sync-progress-clicked',
+    SYNC_PROGRESS_INITIATE = 'sync-progress-initiated',
+    SYNC_PROGRESS_SUCCESS = 'sync-progress-success',
+    SYNC_PROGRESS_FAILED = 'sync-progress-failed',
+    OPEN_WITH_PLAYER_CLICKED = 'open-with-player-clicked',
+    SELECT_CONTENT = 'select-content',
+    SELECT_BELL = 'select-bell',
+    OPTED_IN = 'opted-in',
+    OPTED_OUT = 'opted-out',
+    GROUP_KEBAB_MENU_CLICKED = 'group-kebab-menu-clicked',
+    FORUM_ICON_CLICKED = 'forum-icon-clicked',
+    OBSERVATION_TILE_CLICKED ='observation-tile-clicked',
+    PROGRAM_TILE_CLICKED ='program-tile-clicked',
+    PROJECT_TILE_CLICKED ='project-tile-clicked',
+    SURVEY_TILE_CLICKED ='survey-tile-clicked',
+    REPORTS_TILE_CLICKED ='reports-tile-clicked',
+    COURSE_TILE_CLICKED ='course-tile-clicked'
 }
 
 export enum ID {
@@ -425,7 +562,47 @@ export enum ID {
     BACKDROP_CLICKED = 'backdrop-clicked',
     CANCEL_CLICKED = 'cancel-clicked',
     NOTIFICATION_CLICKED = 'notification-clicked',
-    SEE_MORE_CONTENT_BUTTON_CLICKED = 'see-more-content-button-clicked'
+    NOTIFICATION_RECEIVED = 'notification-received',
+    SEE_MORE_CONTENT_BUTTON_CLICKED = 'see-more-content-button-clicked',
+    BTN_CANCEL = 'btn-cancel',
+    BTN_ADD = 'btn-add',
+    BTN_SWITCH = 'btn-switch',
+    BTN_MORE = 'btn-more',
+    BTN_UPDATE = 'btn-update',
+    BTN_I_AM_A_TEACHER = 'btn-i-am-a-teacher',
+    TEACHER_DECLARATION = 'teacher-declaration',
+    MUA_USER_CREATION = 'mua-user-creation',
+    DATA_SHARING = 'data-sharing',
+    VALIDATE_EMAIL = 'validate-email',
+    VALIDATE_MOBILE = 'validate-mobile',
+    CREATE_GROUP = 'create-group',
+    DELETE_GROUP = 'delete-group',
+    LEAVE_GROUP = 'leave-group',
+    MAKE_GROUP_ADMIN = 'make-group-admin',
+    DISMISS_GROUP_ADMIN = 'dismiss-group-admin',
+    REMOVE_MEMBER = 'remove-member',
+    REMOVE_ACTIVITY = 'remove-activity',
+    VERIFY_MEMBER = 'verify-member',
+    ADD_MEMBER_TO_GROUP = 'add-member-to-group',
+    ADD_ACTIVITY_TO_GROUP = 'add-activity-to-group',
+    NOTIFICATION_REQUEST = 'notification-request',
+    DEACTIVATE_GROUP= 'deactivate-group',
+    REACTIVATE_GROUP= 'reactivate-group',
+    ACCEPT_GROUP_GUIDELINES= 'accept-group-guidelines',
+    ENABLE_DISCUSSIONS = 'enable-discussions',
+    DISABLE_DISCUSSIONS = 'disable-discussions',
+    SWITCH_CLICKED = 'switch-clicked',
+    SELECT_CREATE_GROUP = 'select-create-group',
+    SELECT_GROUP = 'select-group',
+    ADD_MEMBER = 'add-member',
+    VERIFY_USER = 'verify-user',
+    ADD_ACTIVITY = 'add-activity',
+    SELECT_CATEGORY = 'select-category',
+    VIEW_ACTIVITY = 'view-activity',
+    SELECT_ACTIVITY = 'select-activity',
+    UPDATE_GROUP = 'update-group',
+    SELECT_DEACTIVATE = 'select-deactivate',
+    SELECT_DELETE = 'select-delete'
 }
 
 export enum ActionButtonType {
@@ -450,7 +627,64 @@ export enum CorReleationDataType {
     ACCESS_TYPE = 'AccessType',
     SCAN = 'Scan',
     SOURCE = 'Source',
-    NOTIFICATION_ID = 'NotificationID'
+    NOTIFICATION_ID = 'NotificationId',
+    NOTIFICATION_RECEIVED_AT = 'NotificationReceivedAt',
+    GROUP_ID = 'GroupId',
+    CONTENT_TYPE = 'ContentType',
+    ACTIVITY_TYPE = 'ActivityType',
+    /* New Telemetry for Telemetry Structure change
+    * for old telemetry structure please add in above
+    */
+    BOARD_COUNT = 'CountBoard',
+    MEDIUM_COUNT = 'CountMedium',
+    CLASS_COUNT = 'CountClass',
+    FIRST_TIME_USER = 'FirstTimeUser',
+    NAME = 'Name',
+    TNC_VERSION = 'TncVersion',
+    LIUA = 'Liua',
+    SWITCHED_USER = 'SwitchedUser',
+    NEW_VALUE = 'NewValue',
+    OLD_VALUE = 'OldValue',
+    COURSE_COUNT = 'CourseCount',
+    CHILD_UI = 'ChildUi',
+    QR = 'QR',
+    COUNT_BOOK = 'CountBook',
+    COUNT_CONTENT = 'ContentCount',
+    FROM_PAGE = 'FromPage',
+    LANGUAGE = 'Language',
+    MODE = 'Mode',
+    TYPE = 'Type',
+    STATE = 'State',
+    DISTRICT = 'District',
+    FILL_MODE = 'FillMode',
+    CATEGORY = 'Category',
+    SUBCATEGORY = 'Subcategory',
+    COUNT_NODE = 'CountNode',
+    CONTENT_NAME = 'ContentName',
+    CONTENT = 'Content',
+    BATCH = 'Batch',
+    NEW_NOTIFICATION = 'new-notification',
+    FORM_PAGE = 'form-page',
+    SUBJECT_LIST = 'subject-list',
+    CATEGORY_NAME = 'category-name',
+    CATEGORY_LIST = 'CategoryList',
+    OTHER_BOARDS = 'OtherBoards',
+    ROOT_SECTION = 'RootSection',
+    AUDIENCE_LIST = 'AudienceList',
+    AUDIENCE = 'Audience'
 }
 
+export enum AuditProps {
+    LANGUAGE = 'language',
+    PROFILE_TYPE = 'profile_type'
+}
 
+export enum AuditType {
+    SET_LANGUAGE = 'set-language',
+    SELECT_USERTYPE = 'set-usertype',
+    SET_PROFILE = 'set-profile',
+    UNIT_PROGRESS = 'unit-progress',
+    COURSE_PROGRESS = 'course-progress',
+    TOAST_SEEN = 'toast-seen',
+    TNC_DATA_SHARING = 'tnc-data-sharing'
+}
diff --git a/src/services/telemetry-generator.service.spec.ts b/src/services/telemetry-generator.service.spec.ts
index df21231f1..d535a2407 100644
--- a/src/services/telemetry-generator.service.spec.ts
+++ b/src/services/telemetry-generator.service.spec.ts
@@ -5,6 +5,7 @@ import {
   LogLevel
 } from '@app/services/telemetry-constants';
 import { of } from 'rxjs';
+import {Context, SbProgressLoader} from '@app/services/sb-progress-loader.service';
 
 describe('TelemetryGeneratorService', () => {
   let telemetryGeneratorService: TelemetryGeneratorService;
@@ -18,7 +19,7 @@ describe('TelemetryGeneratorService', () => {
     error: jest.fn(() => of({} as any)),
   };
 
-  const telemetryObject = new TelemetryObject('do_12345', 'Resource', '1');
+  const telemetryObject = new TelemetryObject('do_12345', 'Learning Resource', '1');
   const rollUp = { l1: 'do_1', l2: 'do_12', l3: 'do_123', l4: 'do_1234' };
   const corRelationList = [{ id: 'SearchResult', type: 'Section' }];
   const values = new Map();
@@ -30,13 +31,16 @@ describe('TelemetryGeneratorService', () => {
     pkgVersion: '1',
     contentData: {
       contentType: 'Resource',
-      pkgVersion: '1'
+      pkgVersion: '1',
+      primaryCategory: 'Learning Resource'
     }
   } as any;
+  const mockSbProgressLoader: Partial<SbProgressLoader> = {};
 
   beforeAll(() => {
     telemetryGeneratorService = new TelemetryGeneratorService(
-      mockTelemetryService as TelemetryService
+      mockTelemetryService as TelemetryService,
+      mockSbProgressLoader as SbProgressLoader
     );
   });
 
@@ -50,6 +54,15 @@ describe('TelemetryGeneratorService', () => {
 
   it('should invoke interact() with proper arguments', () => {
     // arrange
+    mockSbProgressLoader.contexts = new Map<string, Context>();
+    mockSbProgressLoader.contexts.set('SAMPLE_ID', {
+      id: 'SAMPLE_ID',
+      ignoreTelemetry: {
+        when: {
+          interact: /{“pageid”:“collection-detail”}/
+        }
+      }
+    });
     // act
     telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
       InteractSubtype.UNIT_CLICKED,
@@ -74,6 +87,15 @@ describe('TelemetryGeneratorService', () => {
 
   it('should invoke impression() with proper arguments', () => {
     // arrange
+    mockSbProgressLoader.contexts = new Map<string, Context>();
+    mockSbProgressLoader.contexts.set('SAMPLE_ID', {
+      id: 'SAMPLE_ID',
+      ignoreTelemetry: {
+        when: {
+          impression: /{“pageid”:“collection-detail”}/
+        }
+      }
+    });
     // act
     telemetryGeneratorService.generateImpressionTelemetry(ImpressionType.DETAIL, '',
       PageId.COLLECTION_DETAIL,
@@ -434,24 +456,19 @@ describe('TelemetryGeneratorService', () => {
           utm_term: 'ABCDEF'
         }
       ];
-      const cData = [{
-        id: 'scan',
-        type: 'accessType'
-      }];
       const object = {
         id: 'sample-id',
         type: 'sample-type',
         version: 'sample-version'
       };
       // act
-      telemetryGeneratorService.generateUtmInfoTelemetry(value, 'sample-pageId', cData, object);
+      telemetryGeneratorService.generateUtmInfoTelemetry(value, 'sample-pageId', object);
       // assert
       const mockInteract = jest.spyOn(mockTelemetryService, 'interact');
       expect(mockInteract.mock.calls[0][0]['type']).toEqual('OTHER');
       expect(mockInteract.mock.calls[0][0]['subType']).toEqual('utm-info');
       expect(mockInteract.mock.calls[0][0]['env']).toEqual(Environment.HOME);
       expect(mockInteract.mock.calls[0][0]['pageId']).toEqual('sample-pageId');
-      expect(mockInteract.mock.calls[0][0]['correlationData']).toEqual(cData);
     });
   });
 
diff --git a/src/services/telemetry-generator.service.ts b/src/services/telemetry-generator.service.ts
index 6b5239cb7..9672cfacd 100644
--- a/src/services/telemetry-generator.service.ts
+++ b/src/services/telemetry-generator.service.ts
@@ -1,4 +1,4 @@
-import { Inject, Injectable } from '@angular/core';
+import {Inject, Injectable} from '@angular/core';
 import {
     CorrelationData,
     Rollup,
@@ -6,25 +6,65 @@ import {
     TelemetryErrorRequest,
     TelemetryImpressionRequest,
     TelemetryInteractRequest,
+    TelemetryAuditRequest,
     TelemetryLogRequest,
     TelemetryObject,
     TelemetryService,
     TelemetryStartRequest,
     TelemetryInterruptRequest,
-    DeviceSpecification
+    DeviceSpecification,
+    Actor,
+    AuditState,
+    TelemetrySummaryRequest
 } from 'sunbird-sdk';
-import { Map } from '../app/telemetryutil';
-import { Environment, ImpressionType, InteractSubtype, InteractType, Mode, PageId, CorReleationDataType, ID } from './telemetry-constants';
-import { MimeType } from '../app/app.constant';
-import { ContentUtil } from '@app/util/content-util';
+import {Map} from '../app/telemetryutil';
+import {
+    Environment, ImpressionType, InteractSubtype, InteractType,
+    Mode, PageId, CorReleationDataType, ID, ImpressionSubtype
+} from './telemetry-constants';
+import {MimeType} from '../app/app.constant';
+import {ContentUtil} from '@app/util/content-util';
+import {SbProgressLoader} from '../services/sb-progress-loader.service';
 
 @Injectable()
 export class TelemetryGeneratorService {
-    constructor(@Inject('TELEMETRY_SERVICE') private telemetryService: TelemetryService) {
+    constructor(
+        @Inject('TELEMETRY_SERVICE') private telemetryService: TelemetryService,
+        private sbProgressLoader: SbProgressLoader,
+    ) {
+    }
+
+    generateAuditTelemetry(env, currentSate?, updatedProperties?, type?, objId?, objType?, objVer?, correlationData?, objRollup?) {
+        const telemetryAuditRequest: TelemetryAuditRequest = {
+            env: env ? env : undefined,
+            currentState: currentSate ? currentSate : undefined,
+            updatedProperties: updatedProperties ? updatedProperties : undefined,
+            type: type ? type : undefined,
+            objId: objId ? objId : undefined,
+            objType: objType ? objType : undefined,
+            objVer: objVer ? objVer : undefined,
+            rollUp: objRollup || {},
+            correlationData: correlationData ? correlationData : undefined,
+            actor: new Actor()
+        };
+        this.telemetryService.audit(telemetryAuditRequest).subscribe();
     }
 
     generateInteractTelemetry(interactType, interactSubtype, env, pageId, object?: TelemetryObject, values?: Map,
                               rollup?: Rollup, corRelationList?: Array<CorrelationData>, id?: string) {
+        const hash: string =
+            JSON.stringify({ pageId: pageId || undefined });
+        if (
+            Array.from(this.sbProgressLoader.contexts.entries()).some(([_, context]) => {
+                if (context.ignoreTelemetry && context.ignoreTelemetry.when && context.ignoreTelemetry.when.interact) {
+                    return !!hash.match(context.ignoreTelemetry.when.interact);
+                }
+                return false;
+            })
+        ) {
+            return;
+        }
+
         const telemetryInteractRequest = new TelemetryInteractRequest();
         telemetryInteractRequest.type = interactType;
         telemetryInteractRequest.subType = interactSubtype;
@@ -55,12 +95,25 @@ export class TelemetryGeneratorService {
         this.telemetryService.interact(telemetryInteractRequest).subscribe();
     }
 
-    generateImpressionTelemetry(type, subtype, pageid, env, objectId?: string, objectType?: string,
-        objectVersion?: string, rollup?: Rollup, corRelationList?: Array<CorrelationData>) {
+    generateImpressionTelemetry(type, subtype, pageId, env, objectId?: string, objectType?: string,
+                                objectVersion?: string, rollup?: Rollup, corRelationList?: Array<CorrelationData>) {
+        const hash: string =
+            JSON.stringify({ pageId: pageId || undefined });
+        if (
+            Array.from(this.sbProgressLoader.contexts.entries()).some(([_, context]) => {
+                if (context.ignoreTelemetry && context.ignoreTelemetry.when && context.ignoreTelemetry.when.impression) {
+                    return !!hash.match(context.ignoreTelemetry.when.impression);
+                }
+                return false;
+            })
+        ) {
+            return;
+        }
+
         const telemetryImpressionRequest = new TelemetryImpressionRequest();
         telemetryImpressionRequest.type = type;
         telemetryImpressionRequest.subType = subtype;
-        telemetryImpressionRequest.pageId = pageid || PageId.HOME;
+        telemetryImpressionRequest.pageId = pageId || PageId.HOME;
         telemetryImpressionRequest.env = env;
         telemetryImpressionRequest.objId = objectId ? objectId : '';
         telemetryImpressionRequest.objType = objectType ? objectType : '';
@@ -127,6 +180,37 @@ export class TelemetryGeneratorService {
         this.telemetryService.start(telemetryStartRequest).subscribe();
     }
 
+    generateSummaryTelemetry(type, starttime, endtime, timpespent,
+                             pageviews, interactions, env, object?: TelemetryObject,
+                             rollup?: Rollup, corRelationList?: Array<CorrelationData>) {
+        const telemetrySummaryRequest = new TelemetrySummaryRequest();
+        telemetrySummaryRequest.type = type;
+        telemetrySummaryRequest.starttime = starttime;
+        telemetrySummaryRequest.endtime = endtime;
+        telemetrySummaryRequest.timespent = timpespent;
+        telemetrySummaryRequest.pageviews = pageviews;
+        telemetrySummaryRequest.interactions = interactions;
+        telemetrySummaryRequest.mode = Mode.PLAY;
+        if (object && object.id) {
+            telemetrySummaryRequest.objId = object.id;
+        }
+
+        if (object && object.type) {
+            telemetrySummaryRequest.objType = object.type;
+        }
+
+        if (object && object.version) {
+            telemetrySummaryRequest.objVer = object.version + '';
+        }
+        if (rollup !== undefined) {
+            telemetrySummaryRequest.rollup = rollup;
+        }
+        if (corRelationList !== undefined) {
+            telemetrySummaryRequest.correlationData = corRelationList;
+        }
+        this.telemetryService.summary(telemetrySummaryRequest).subscribe();
+    }
+
     generateLogEvent(logLevel, message, env, type, params: Array<any>) {
         const telemetryLogRequest = new TelemetryLogRequest();
         telemetryLogRequest.level = logLevel;
@@ -136,6 +220,7 @@ export class TelemetryGeneratorService {
         telemetryLogRequest.params = params;
         this.telemetryService.log(telemetryLogRequest).subscribe();
     }
+
     genererateAppStartTelemetry(deviceSpec: DeviceSpecification) {
         const telemetryStartRequest = new TelemetryStartRequest();
         telemetryStartRequest.type = 'app';
@@ -175,7 +260,6 @@ export class TelemetryGeneratorService {
             values,
             objRollup,
             corRelationList);
-
     }
 
     generatePageViewTelemetry(pageId, env, subType?) {
@@ -188,8 +272,7 @@ export class TelemetryGeneratorService {
         const values = new Map();
         values['isFirstTime'] = isFirstTime;
         values['size'] = content.size;
-        const telemetryObject = new TelemetryObject(content.identifier || content.contentId,
-            content.contentData ? content.contentData.contentType : content.contentType, content.contentData.pkgVersion);
+        const telemetryObject = ContentUtil.getTelemetryObject(content);
         this.generateInteractTelemetry(
             InteractType.OTHER,
             InteractSubtype.LOADING_SPINE,
@@ -202,13 +285,12 @@ export class TelemetryGeneratorService {
 
     generateCancelDownloadTelemetry(content: any) {
         const values = new Map();
-        const telemetryObject = new TelemetryObject(content.identifier || content.contentId, content.contentType, content.pkgVersion);
         this.generateInteractTelemetry(
             InteractType.TOUCH,
             InteractSubtype.CANCEL_CLICKED,
             Environment.HOME,
             PageId.DOWNLOAD_SPINE,
-            telemetryObject,
+            ContentUtil.getTelemetryObject(content),
             values);
     }
 
@@ -216,13 +298,12 @@ export class TelemetryGeneratorService {
         const values = new Map();
         values['downloadingIdentifers'] = downloadingIdentifier;
         values['childrenCount'] = childrenCount;
-        const telemetryObject = new TelemetryObject(content.identifier || content.contentId, content.contentType, content.pkgVersion);
         this.generateInteractTelemetry(
             InteractType.TOUCH,
             InteractSubtype.DOWNLOAD_ALL_CLICKED,
             Environment.HOME,
             pageId,
-            telemetryObject,
+            ContentUtil.getTelemetryObject(content),
             values,
             rollup, corelationList);
     }
@@ -311,13 +392,12 @@ export class TelemetryGeneratorService {
             const kbsofar = (content.size / 100) * Number(downloadProgress);
             values['downloadedSoFar'] = this.transform(kbsofar);
         }
-        const telemetryObject = new TelemetryObject(content.identifier || content.contentId, content.contentType, content.pkgVersion);
         this.generateInteractTelemetry(
             InteractType.TOUCH,
             InteractSubtype.CANCEL_CLICKED,
             Environment.HOME,
             PageId.CONTENT_DETAIL,
-            telemetryObject,
+            ContentUtil.getTelemetryObject(content),
             values);
     }
 
@@ -349,7 +429,7 @@ export class TelemetryGeneratorService {
         return mimeType === MimeType.COLLECTION;
     }
 
-    generateUtmInfoTelemetry(values: Map, pageId, cData: CorrelationData[], object?: TelemetryObject) {
+    generateUtmInfoTelemetry(values: Map, pageId, object?: TelemetryObject, corRelationData?) {
         this.generateInteractTelemetry(
             InteractType.OTHER,
             InteractSubtype.UTM_INFO,
@@ -358,7 +438,7 @@ export class TelemetryGeneratorService {
             object,
             values,
             undefined,
-            cData);
+            corRelationData);
     }
 
     /* Fast loading telemetry generator */
@@ -388,4 +468,52 @@ export class TelemetryGeneratorService {
             ID.NOTIFICATION_CLICKED
         );
     }
+
+
+    /* New Telemetry */
+    generateBackClickedNewTelemetry(isDeviceBack, env, pageId) {
+        this.generateInteractTelemetry(
+            InteractType.SELECT_BACK,
+            isDeviceBack ? InteractSubtype.DEVICE : InteractSubtype.UI,
+            env,
+            pageId
+        );
+    }
+
+    generatePageLoadedTelemetry(pageId, env, objId?, objType?, objversion?, rollup?, correlationList?) {
+        this.generateImpressionTelemetry(
+            ImpressionType.PAGE_LOADED,
+            pageId === PageId.LOCATION ? ImpressionSubtype.AUTO : '',
+            pageId,
+            env,
+            objId,
+            objType,
+            objversion,
+            rollup,
+            correlationList
+        );
+    }
+
+    generateNewExprienceSwitchTelemetry(pageId, subType, corRelationInfo) {
+        const corRelationList: Array<CorrelationData> = [];
+        corRelationList.push({
+            type: CorReleationDataType.FIRST_TIME_USER,
+            id: corRelationInfo['isNewUser'] + ''
+        });
+        corRelationList.push({
+            type: CorReleationDataType.USERTYPE,
+            id:  corRelationInfo['userType']
+        });
+        this.generateInteractTelemetry(
+            InteractType.NEW_EXPERIENCE,
+            subType,
+            Environment.HOME,
+            pageId,
+            undefined,
+            undefined,
+            undefined,
+            corRelationList,
+            ID.SWITCH_CLICKED
+          );
+    }
 }
diff --git a/src/services/update-profile-service.spec.ts b/src/services/update-profile-service.spec.ts
new file mode 100644
index 000000000..beb32fda3
--- /dev/null
+++ b/src/services/update-profile-service.spec.ts
@@ -0,0 +1,384 @@
+import {UpdateProfileService} from '@app/services/update-profile-service';
+import {ProfileService} from '@project-sunbird/sunbird-sdk';
+import {FrameworkCategoryCodesGroup, FrameworkService, FrameworkUtilService} from 'sunbird-sdk';
+import {TranslateService} from '@ngx-translate/core';
+import {CommonUtilService} from '@app/services/common-util.service';
+import {TelemetryGeneratorService} from '@app/services/telemetry-generator.service';
+import {Events} from '@app/util/events';
+import {AppGlobalService} from '@app/services/app-global-service.service';
+import {of, throwError} from 'rxjs';
+import {SbProgressLoader} from '@app/services/sb-progress-loader.service';
+
+describe('UpdateProfileService', () => {
+    let updateProfileService: UpdateProfileService;
+
+    const mockProfileService: Partial<ProfileService> = {};
+    const mockFrameworkService: Partial<FrameworkService> = {};
+    const mockFrameworkUtilService: Partial<FrameworkUtilService> = {};
+    const mockTranslateService: Partial<TranslateService> = {};
+    const mockCommonUtilService: Partial<CommonUtilService> = {};
+    const mockTelemetryGeneratorService: Partial<TelemetryGeneratorService> = {};
+    const mockEvents: Partial<Events> = {};
+    const mockAppGlobalService: Partial<AppGlobalService> = {};
+    const mockSbProgressLoader: Partial<SbProgressLoader> = {};
+
+    beforeAll(() => {
+        updateProfileService = new UpdateProfileService(
+            mockProfileService as ProfileService,
+            mockFrameworkService as FrameworkService,
+            mockFrameworkUtilService as FrameworkUtilService,
+            mockTranslateService as TranslateService,
+            mockCommonUtilService as CommonUtilService,
+            mockTelemetryGeneratorService as TelemetryGeneratorService,
+            mockEvents as Events,
+            mockAppGlobalService as AppGlobalService,
+            mockSbProgressLoader as SbProgressLoader
+        );
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.restoreAllMocks();
+    });
+
+    describe('checkProfileData', () => {
+        it('should set profile data accordingly and getActiveSuggestedFrameworkList', () => {
+            // arrange
+            const data = {
+                board: ['fm']
+            };
+            const profile = {
+                syllabus: ['framework1']
+            };
+            mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList = jest.fn(() => of([{identifier: 'fm', name: 'fm'}]));
+            mockTranslateService.currentLang = 'en';
+            // act
+            updateProfileService.checkProfileData(data, profile);
+            // assert
+            expect(mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList).toHaveBeenCalledWith(
+                {
+                    language: 'en',
+                    requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
+                }
+            );
+        });
+
+        it('should set profile data accordingly and getFrameworkDetails', (done) => {
+            // arrange
+            const data = {
+                board: ['framework1'],
+                contentType: 'Resource'
+            };
+            const profile = {
+                syllabus: ['framework1']
+            };
+            const getActiveChannelSuggestedFrameworkListResp = [{identifier: 'framework1', name: 'framework1'}];
+            mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList = jest.fn(() => of(getActiveChannelSuggestedFrameworkListResp));
+            mockFrameworkService.getFrameworkDetails = jest.fn(() => throwError('err' as any));
+            // act
+            updateProfileService.checkProfileData(data, profile);
+            // assert
+            setTimeout(() => {
+                expect(updateProfileService.isProfileUpdated).toEqual(true);
+                expect(mockFrameworkService.getFrameworkDetails).toHaveBeenCalled();
+                done();
+            }, 0);
+        });
+
+        it('should set profile data accordingly and check for boardList data', (done) => {
+            // arrange
+            const data = {
+                board: ['framework1'],
+                medium: ['medium1'],
+                gradeLevel: ['grade1'],
+                contentType: 'Resource'
+            };
+            const profile = {
+                syllabus: ['framework']
+            };
+            const getActiveChannelSuggestedFrameworkListResp = [{identifier: 'framework1', name: 'framework1'}];
+            const getFrameworkDetailsResp = {
+                categories: [
+                    {
+                        code: 'board',
+                        terms: [
+                            {code: 'boardcode', name: 'framework1'}
+                        ]
+                    },
+                    {
+                        code: 'medium',
+                        terms: [
+                            {code: 'medium1code', name: 'medium1'}
+                        ]
+                    },
+                    {
+                        code: 'gradeLevel',
+                        terms: [
+                            {code: 'grade1code', name: 'grade1'}
+                        ]
+                    }
+                ]
+            };
+            mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList = jest.fn(() => of(getActiveChannelSuggestedFrameworkListResp));
+            mockFrameworkService.getFrameworkDetails = jest.fn(() => of(getFrameworkDetailsResp));
+            mockProfileService.updateProfile = jest.fn(() => of({
+                syllabus: ['ekstep_k12'],
+                board: ['cbse'],
+                grade: ['grade1', 'grade2'],
+                medium: ['medium1', 'medium2']
+            }));
+            mockEvents.publish = jest.fn();
+            mockAppGlobalService.setOnBoardingCompleted = jest.fn();
+            mockCommonUtilService.handleToTopicBasedNotification = jest.fn();
+            mockTelemetryGeneratorService.generateProfilePopulatedTelemetry = jest.fn();
+            mockSbProgressLoader.hide = jest.fn();
+            // act
+            updateProfileService.checkProfileData(data, profile);
+            // assert
+            setTimeout(() => {
+                expect(updateProfileService.isProfileUpdated).toEqual(true);
+                expect(mockFrameworkService.getFrameworkDetails).toHaveBeenCalled();
+                expect(updateProfileService.boardList).toEqual(getFrameworkDetailsResp.categories[0].terms);
+                done();
+            }, 0);
+        });
+
+        it('should set profile data accordingly and getFrameworkDetails', (done) => {
+            // arrange
+            const data = {
+                board: ['framework1'],
+                medium: ['medium1'],
+                gradeLevel: ['grade1'],
+                contentType: 'Resource'
+            };
+            const profile = {
+                syllabus: ['framework1'],
+                board: ['boardcode']
+            };
+            const getActiveChannelSuggestedFrameworkListResp = [{identifier: 'framework1', name: 'framework1'}];
+            const getFrameworkDetailsResp = {
+                categories: [
+                    {
+                        code: 'board',
+                        terms: [
+                            {code: 'boardcode', name: 'framework1'}
+                        ]
+                    },
+                    {
+                        code: 'medium',
+                        terms: [
+                            {code: 'medium1code', name: 'medium1'}
+                        ]
+                    },
+                    {
+                        code: 'gradeLevel',
+                        terms: [
+                            {code: 'grade1code', name: 'grade1'}
+                        ]
+                    }
+                ]
+            };
+            mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList = jest.fn(() => of(getActiveChannelSuggestedFrameworkListResp));
+            mockFrameworkService.getFrameworkDetails = jest.fn(() => of(getFrameworkDetailsResp));
+            mockProfileService.updateProfile = jest.fn(() => of({
+                syllabus: ['ekstep_k12'],
+                board: ['cbse'],
+                grade: ['grade1', 'grade2'],
+                medium: ['medium1', 'medium2']
+            }));
+            mockEvents.publish = jest.fn();
+            mockAppGlobalService.setOnBoardingCompleted = jest.fn();
+            mockCommonUtilService.handleToTopicBasedNotification = jest.fn();
+            mockTelemetryGeneratorService.generateProfilePopulatedTelemetry = jest.fn();
+            // act
+            updateProfileService.checkProfileData(data, profile);
+            // assert
+            setTimeout(() => {
+                expect(updateProfileService.isProfileUpdated).toEqual(true);
+                expect(mockFrameworkService.getFrameworkDetails).toHaveBeenCalled();
+                expect(updateProfileService.boardList).toEqual(getFrameworkDetailsResp.categories[0].terms);
+                done();
+            }, 0);
+        });
+
+        it('should set profile data accordingly equal to categoryTerms', (done) => {
+            // arrange
+            const data = {
+                board: ['framework1'],
+                medium: ['medium1'],
+                gradeLevel: ['grade1', 'grade2'],
+                contentType: 'Resource'
+            };
+            const profile = {
+                syllabus: ['framework1'],
+                board: ['boardcode']
+            };
+            const getActiveChannelSuggestedFrameworkListResp = [{identifier: 'framework1', name: 'framework1'}];
+            const getFrameworkDetailsResp = {
+                categories: [
+                    {
+                        code: 'board',
+                        terms: [
+                            {code: 'boardcode', name: 'framework1'}
+                        ]
+                    },
+                    {
+                        code: 'medium',
+                        terms: [
+                            {code: 'medium1code', name: 'medium1'}
+                        ]
+                    },
+                    {
+                        code: 'gradeLevel',
+                        terms: [
+                            {code: 'grade1code', name: 'grade1'}
+                        ]
+                    }
+                ]
+            };
+            mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList = jest.fn(() => of(getActiveChannelSuggestedFrameworkListResp));
+            mockFrameworkService.getFrameworkDetails = jest.fn(() => of(getFrameworkDetailsResp));
+            mockProfileService.updateProfile = jest.fn(() => of({
+                syllabus: ['ekstep_k12'],
+                board: ['cbse'],
+                grade: ['grade1', 'grade2'],
+                medium: ['medium1', 'medium2']
+            }));
+            mockEvents.publish = jest.fn();
+            mockAppGlobalService.setOnBoardingCompleted = jest.fn();
+            mockCommonUtilService.handleToTopicBasedNotification = jest.fn();
+            mockTelemetryGeneratorService.generateProfilePopulatedTelemetry = jest.fn();
+            // act
+            updateProfileService.checkProfileData(data, profile);
+            // assert
+            setTimeout(() => {
+                expect(updateProfileService.isProfileUpdated).toEqual(true);
+                expect(mockFrameworkService.getFrameworkDetails).toHaveBeenCalled();
+                expect(updateProfileService.boardList).toEqual(getFrameworkDetailsResp.categories[0].terms);
+                done();
+            }, 0);
+        });
+
+        it('should set profile data accordingly and frameworkData', (done) => {
+            // arrange
+            const data = {
+                board: ['framework1'],
+                medium: ['medium1', 'medium2'],
+                gradeLevel: ['grade1'],
+                contentType: 'Resource'
+            };
+            const profile = {
+                syllabus: ['framework1'],
+                board: ['boardcode'],
+                medium: ['medium1'],
+                grade: ['grade1']
+            };
+            const getActiveChannelSuggestedFrameworkListResp = [{identifier: 'framework1', name: 'framework1'}];
+            const getFrameworkDetailsResp = {
+                name: '',
+                identifier: '',
+                categories: [
+                    {
+                        code: 'board',
+                        terms: [
+                            {code: 'boardcode', name: 'framework1'}
+                        ]
+                    },
+                    {
+                        code: 'medium',
+                        terms: [
+                            {code: 'medium1', name: 'medium1'}
+                        ]
+                    },
+                    {
+                        code: 'gradeLevel',
+                        terms: [
+                            {code: 'grade1', name: 'grade1'}
+                        ]
+                    }
+                ]
+            };
+            mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList = jest.fn(() => of(getActiveChannelSuggestedFrameworkListResp));
+            mockFrameworkService.getFrameworkDetails = jest.fn(() => of(getFrameworkDetailsResp));
+            mockProfileService.updateProfile = jest.fn(() => of({
+                syllabus: ['ekstep_k12'],
+                board: ['cbse'],
+                grade: ['grade1', 'grade2'],
+                medium: ['medium1', 'medium2']
+            }));
+            mockEvents.publish = jest.fn();
+            mockAppGlobalService.setOnBoardingCompleted = jest.fn();
+            mockCommonUtilService.handleToTopicBasedNotification = jest.fn();
+            mockTelemetryGeneratorService.generateProfilePopulatedTelemetry = jest.fn();
+            mockSbProgressLoader.hide = jest.fn();
+            // act
+            updateProfileService.checkProfileData(data, profile);
+            // assert
+            setTimeout(() => {
+                expect(updateProfileService.isProfileUpdated).toEqual(true);
+                expect(mockFrameworkService.getFrameworkDetails).toHaveBeenCalled();
+                expect(updateProfileService.boardList).toEqual(getFrameworkDetailsResp.categories[0].terms);
+                done();
+            }, 10);
+        });
+
+        it('should set profile data accordingly if board length is higher', (done) => {
+            // arrange
+            const data = {
+                board: ['framework1'],
+                medium: ['medium1'],
+                gradeLevel: ['grade1'],
+                contentType: 'Resource'
+            };
+            const profile = {
+                syllabus: ['framework1'],
+                board: ['boardcode', 'b2']
+            };
+            const getActiveChannelSuggestedFrameworkListResp = [{identifier: 'framework1', name: 'framework1'}];
+            const getFrameworkDetailsResp = {
+                categories: [
+                    {
+                        code: 'board',
+                        terms: [
+                            {code: 'boardcode', name: 'framework1'}
+                        ]
+                    },
+                    {
+                        code: 'medium',
+                        terms: [
+                            {code: 'medium1code', name: 'medium1'}
+                        ]
+                    },
+                    {
+                        code: 'gradeLevel',
+                        terms: [
+                            {code: 'grade1code', name: 'grade1'}
+                        ]
+                    }
+                ]
+            };
+            mockFrameworkUtilService.getActiveChannelSuggestedFrameworkList = jest.fn(() => of(getActiveChannelSuggestedFrameworkListResp));
+            mockFrameworkService.getFrameworkDetails = jest.fn(() => of(getFrameworkDetailsResp));
+            mockProfileService.updateProfile = jest.fn(() => of({
+                syllabus: ['ekstep_k12'],
+                board: ['cbse'],
+                grade: ['grade1', 'grade2'],
+                medium: ['medium1', 'medium2']
+            }));
+            mockEvents.publish = jest.fn();
+            mockAppGlobalService.setOnBoardingCompleted = jest.fn();
+            mockCommonUtilService.handleToTopicBasedNotification = jest.fn();
+            mockTelemetryGeneratorService.generateProfilePopulatedTelemetry = jest.fn();
+            mockSbProgressLoader.hide = jest.fn();
+            // act
+            updateProfileService.checkProfileData(data, profile);
+            // assert
+            setTimeout(() => {
+                expect(updateProfileService.isProfileUpdated).toEqual(true);
+                expect(mockFrameworkService.getFrameworkDetails).toHaveBeenCalled();
+                expect(updateProfileService.boardList).toEqual(getFrameworkDetailsResp.categories[0].terms);
+                done();
+            }, 0);
+        });
+    });
+});
diff --git a/src/services/update-profile-service.ts b/src/services/update-profile-service.ts
new file mode 100644
index 000000000..290e8f8c2
--- /dev/null
+++ b/src/services/update-profile-service.ts
@@ -0,0 +1,257 @@
+import {
+    Framework,
+    FrameworkCategoryCodesGroup,
+    FrameworkDetailsRequest, FrameworkService, FrameworkUtilService,
+    GetSuggestedFrameworksRequest,
+    NetworkError,
+    Profile, ProfileService
+} from 'sunbird-sdk';
+import {AppGlobalService} from '@app/services/app-global-service.service';
+import {PageId} from '@app/services/telemetry-constants';
+import {Inject, Injectable} from '@angular/core';
+import {TranslateService} from '@ngx-translate/core';
+import each from 'lodash/each';
+import find from 'lodash/find';
+import map from 'lodash/map';
+import {CommonUtilService} from '@app/services/common-util.service';
+import {TelemetryGeneratorService} from '@app/services/telemetry-generator.service';
+import {Events} from '@app/util/events';
+import {SbProgressLoader} from '@app/services/sb-progress-loader.service';
+
+@Injectable()
+
+export class UpdateProfileService {
+    profile: Profile;
+    isProfileUpdated: boolean;
+    categories: Array<any> = [];
+    boardList: Array<any> = [];
+    mediumList: Array<any> = [];
+    gradeList: Array<any> = [];
+
+    constructor(
+        @Inject('PROFILE_SERVICE') private profileService: ProfileService,
+        @Inject('FRAMEWORK_SERVICE') private frameworkService: FrameworkService,
+        @Inject('FRAMEWORK_UTIL_SERVICE') private frameworkUtilService: FrameworkUtilService,
+        private translate: TranslateService,
+        public commonUtilService: CommonUtilService,
+        private telemetryGeneratorService: TelemetryGeneratorService,
+        private events: Events,
+        private appGlobalService: AppGlobalService,
+        private sbProgressLoader: SbProgressLoader
+    ) {
+    }
+
+    private setCurrentProfile(index, data) {
+        if (!this.profile.medium || !this.profile.medium.length) {
+            this.profile.medium = [];
+        }
+        switch (index) {
+            case 0:
+                this.profile.syllabus = [data.framework];
+                this.profile.board = [data.board];
+                this.setMedium(true, data.medium);
+                // this.profile.subject = [data.subject];
+                this.profile.subject = [];
+                this.setGrade(true, data.gradeLevel);
+                break;
+            case 1:
+                this.profile.board = [data.board];
+                this.setMedium(true, data.medium);
+                // this.profile.subject = [data.subject];
+                this.profile.subject = [];
+                this.setGrade(true, data.gradeLevel);
+                break;
+            case 2:
+                this.setMedium(false, data.medium);
+                break;
+            case 3:
+                this.setGrade(false, data.gradeLevel);
+                break;
+        }
+        this.editProfile();
+    }
+
+    checkProfileData(data, profile) {
+        this.profile = profile;
+        if (data) {
+            const getSuggestedFrameworksRequest: GetSuggestedFrameworksRequest = {
+                language: this.translate.currentLang,
+                requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
+            };
+            // Auto update the profile if that board/framework is listed in custodian framework list.
+            this.frameworkUtilService.getActiveChannelSuggestedFrameworkList(getSuggestedFrameworksRequest).toPromise()
+                .then((res: Framework[]) => {
+                    this.isProfileUpdated = false;
+                    res.forEach(element => {
+                        // checking whether content data framework Id exists/valid in syllabus list
+                        if (data.board[0] === element.name || data.board.indexOf(element.name) !== -1) {
+                            data.framework = element.identifier;
+                            this.isProfileUpdated = true;
+                            const frameworkDetailsRequest: FrameworkDetailsRequest = {
+                                frameworkId: element.identifier,
+                                requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
+                            };
+                            this.frameworkService.getFrameworkDetails(frameworkDetailsRequest).toPromise()
+                                .then((framework: Framework) => {
+                                    this.categories = framework.categories;
+                                    this.boardList = find(this.categories, (category) => category.code === 'board').terms;
+                                    this.mediumList = find(this.categories, (category) => category.code === 'medium').terms;
+                                    this.gradeList = find(this.categories, (category) => category.code === 'gradeLevel').terms;
+                                    // this.subjectList = find(this.categories, (category) => category.code === 'subject').terms;
+                                    if (data.board) {
+                                        data.board = this.findCode(this.boardList, data.board[0], 'board');
+                                    }
+                                    if (data.medium) {
+                                        if (typeof data.medium === 'string') {
+                                            data.medium = [this.findCode(this.mediumList, data.medium, 'medium')];
+                                        } else {
+                                            data.medium = map(data.medium, (dataMedium) => {
+                                                return find(this.mediumList, (medium) => medium.name === dataMedium).code;
+                                            });
+                                        }
+                                    }
+                                    if (data.gradeLevel && data.gradeLevel.length) {
+                                        data.gradeLevel = map(data.gradeLevel, (dataGrade) => {
+                                            return find(this.gradeList, (grade) => grade.name === dataGrade).code;
+                                        });
+                                    }
+                                    if (profile && profile.syllabus && profile.syllabus[0] && data.framework === profile.syllabus[0]) {
+                                        if (data.board) {
+                                            if (profile.board && !(profile.board.length > 1) && data.board === profile.board[0]) {
+                                                if (data.medium) {
+                                                    let existingMedium = false;
+                                                    for (let i = 0; i < data.medium.length; i++) {
+                                                        const mediumExists = find(profile.medium, (medium) => {
+                                                            return medium === data.medium[i];
+                                                        });
+                                                        if (!mediumExists) {
+                                                            continue;
+                                                        }
+                                                        existingMedium = true;
+                                                    }
+                                                    if (!existingMedium) {
+                                                        this.setCurrentProfile(2, data);
+                                                    }
+                                                    if (data.gradeLevel && data.gradeLevel.length) {
+                                                        let existingGrade = false;
+                                                        for (let i = 0; i < data.gradeLevel.length; i++) {
+                                                            const gradeExists = find(profile.grade, (grade) => {
+                                                                return grade === data.gradeLevel[i];
+                                                            });
+                                                            if (!gradeExists) {
+                                                                break;
+                                                            }
+                                                            existingGrade = true;
+                                                        }
+                                                        if (!existingGrade) {
+                                                            this.setCurrentProfile(3, data);
+                                                        }
+                                                    }
+                                                }
+                                            } else {
+                                                this.setCurrentProfile(1, data);
+                                            }
+                                        }
+                                    } else {
+                                        this.setCurrentProfile(0, data);
+                                    }
+                                }).catch((err) => {
+                                if (NetworkError.isInstance(err)) {
+                                    this.commonUtilService.showToast('ERROR_OFFLINE_MODE');
+                                }
+                            });
+
+                            return;
+                        }
+                    });
+                })
+                .catch((err) => {
+                    if (NetworkError.isInstance(err)) {
+                        this.commonUtilService.showToast('ERROR_OFFLINE_MODE');
+                    }
+                });
+        }
+    }
+
+    private setGrade(reset, grades) {
+        if (reset) {
+            this.profile.grade = [];
+            this.profile.gradeValue = {};
+        }
+        each(grades, (grade) => {
+            if (grade && this.profile.grade.indexOf(grade) === -1) {
+                if (this.profile.grade && this.profile.grade.length) {
+                    this.profile.grade.push(grade);
+                } else {
+                    this.profile.grade = [grade];
+                }
+            }
+        });
+    }
+
+    private setMedium(reset, mediums) {
+        if (reset) {
+            this.profile.medium = [];
+        }
+        each(mediums, (medium) => {
+            if (medium && this.profile.medium.indexOf(medium) === -1) {
+                if (this.profile.medium && this.profile.medium.length) {
+                    this.profile.medium.push(medium);
+                } else {
+                    this.profile.medium = [medium];
+                }
+            }
+        });
+    }
+
+    private editProfile() {
+        const req: Profile = {
+            board: this.profile.board,
+            grade: this.profile.grade,
+            medium: this.profile.medium,
+            subject: this.profile.subject,
+            uid: this.profile.uid,
+            handle: this.profile.handle,
+            profileType: this.profile.profileType,
+            source: this.profile.source,
+            createdAt: this.profile.createdAt,
+            syllabus: this.profile.syllabus
+        };
+        if (this.profile.grade && this.profile.grade.length > 0) {
+            this.profile.grade.forEach(gradeCode => {
+                for (let i = 0; i < this.gradeList.length; i++) {
+                    if (this.gradeList[i].code === gradeCode) {
+                        req.gradeValue = this.profile.gradeValue;
+                        req.gradeValue[this.gradeList[i].code] = this.gradeList[i].name;
+                        break;
+                    }
+                }
+            });
+        }
+        this.profileService.updateProfile(req).toPromise()
+            .then((res: any) => {
+                if (res.syllabus && res.syllabus.length && res.board && res.board.length
+                    && res.grade && res.grade.length && res.medium && res.medium.length) {
+                    this.events.publish(AppGlobalService.USER_INFO_UPDATED);
+                    this.events.publish('refresh:profile');
+                    this.appGlobalService.setOnBoardingCompleted();
+                }
+                this.commonUtilService.handleToTopicBasedNotification();
+                this.appGlobalService.guestUserProfile = res;
+                this.telemetryGeneratorService.generateProfilePopulatedTelemetry(PageId.DIAL_CODE_SCAN_RESULT,
+                    req, 'auto');
+                this.sbProgressLoader.hide({id: 'DEFAULT'});
+            })
+            .catch(() => {
+                this.sbProgressLoader.hide({id: 'DEFAULT'});
+            });
+    }
+
+    private findCode(categoryList: Array<any>, data, categoryType) {
+        if (find(categoryList, (category) => category.name === data)) {
+            return find(categoryList, (category) => category.name === data).code;
+        } else {
+            return undefined;
+        }
+    }
+}
diff --git a/src/services/user-groups/profile-switch-handler.ts b/src/services/user-groups/profile-switch-handler.ts
index 885b2d5a6..d0a91bde0 100644
--- a/src/services/user-groups/profile-switch-handler.ts
+++ b/src/services/user-groups/profile-switch-handler.ts
@@ -1,6 +1,6 @@
 import { Router } from '@angular/router';
 import { Injectable, Inject } from '@angular/core';
-import { Events } from '@ionic/angular';
+import { Events } from '@app/util/events';
 import { ProfileType, SharedPreferences, AuthService } from 'sunbird-sdk';
 
 import { PreferenceKey, RouterLinks } from '@app/app/app.constant';
diff --git a/src/services/utility-service.ts b/src/services/utility-service.ts
index 59acb8b84..e65d223e7 100644
--- a/src/services/utility-service.ts
+++ b/src/services/utility-service.ts
@@ -1,6 +1,6 @@
-import { Injectable } from '@angular/core';
-import { DeviceSpecification } from 'sunbird-sdk';
-import { GenericAppConfig } from '@app/app/app.constant';
+import {Injectable} from '@angular/core';
+import {DeviceSpecification} from 'sunbird-sdk';
+import {GenericAppConfig} from '@app/app/app.constant';
 
 declare const sbutility;
 
@@ -196,7 +196,7 @@ export class UtilityService {
 
     getMetaData(filePath: string): Promise<string> {
         return new Promise((resolve, reject) => {
-            sbutility.getMetaData([{ path: filePath, identifier: 'ecar' }], (data) => {
+            sbutility.getMetaData([{path: filePath, identifier: 'ecar'}], (data) => {
                 resolve(data.ecar.size);
             }, err => {
                 reject(err);
@@ -226,4 +226,44 @@ export class UtilityService {
                 });
         });
     }
+
+    verifyCaptcha(apiKey: string): Promise<string> {
+        return new Promise((resolve, reject) => {
+            sbutility.verifyCaptcha(apiKey, (data) => {
+                resolve(data);
+            }, err => {
+                reject(err);
+            });
+        });
+    }
+
+    checkAvailableAppList(packageIds: Array<string>): Promise<{[packageId: string]: boolean}> {
+        return new Promise((resolve, reject) => {
+            sbutility.getAppAvailabilityStatus(packageIds, (data) => {
+                resolve(data);
+            }, err => {
+                reject(err);
+            });
+        });
+    }
+
+    startActivityForResult(params: {}): Promise<string> {
+        return new Promise((resolve, reject) => {
+            sbutility.startActivityForResult(params, (data) => {
+                resolve(data);
+            }, err => {
+                reject(err);
+            });
+        });
+    }
+
+    openFileManager(): Promise<any> {
+        return new Promise((resolve, reject) => {
+            sbutility.openFileManager((res) => {
+                resolve(res);
+            }, err => {
+                reject(err);
+            });
+        });
+    }
 }
diff --git a/src/util/content-util.spec.ts b/src/util/content-util.spec.ts
index 35b2aaa10..e4f00c13d 100644
--- a/src/util/content-util.spec.ts
+++ b/src/util/content-util.spec.ts
@@ -1,5 +1,6 @@
 import { Content } from 'sunbird-sdk';
 import { ContentUtil } from '@app/util/content-util';
+import { mockSupportedUserTypeConfig } from '../services/profile-handler.spec.data';
 
 describe('ContentUtil', () => {
     describe('resolvePDFPreview()', () => {
@@ -87,6 +88,13 @@ describe('ContentUtil', () => {
             expect(ContentUtil.getAppIcon('content/sample_aap_icon.png', 'sample_basepath', false)).toEqual(
                 'sample_basepath/content/sample_aap_icon.png');
         });
+
+        it('should return  app icon if none of the condition satisfies', () => {
+            // arrange
+            // act / assert
+            expect(ContentUtil.getAppIcon('/content/sample_aap_icon.png', '', false)).toEqual(
+                '/content/sample_aap_icon.png');
+        });
     });
 
     describe('genrateUTMCData', () => {
@@ -134,27 +142,65 @@ describe('ContentUtil', () => {
                 type: 'UtmMedium'
             }]);
         });
-        it('should return utm parameter for channel', () => {
+
+        it('should not add to the cdata if url has duplicate campaign parameters', () => {
             // arrange
             const value = {
-                utm_source: 'https://sunbirded.org/learn/course/do_12345',
-                utm_medium: 'playstore',
-                channel: 'igot'
+                utm_campaign: ['whatsapp', 'testprep'],
             };
 
             // act
             // assert
-            expect(ContentUtil.genrateUTMCData(value)).toEqual([{
-                id: 'igot',
-                type: 'Source'
-            },
-            {
-                id: 'https://sunbirded.org/learn/course/do_12345',
-                type: 'UtmSource'
-            }, {
-                id: 'playstore',
-                type: 'UtmMedium'
-            }]);
+            expect(ContentUtil.genrateUTMCData(value).length).toEqual(0);
+        });
+
+        it('should not add to the cdata if url has duplicate campaign parameters', () => {
+            // arrange
+            const value = {
+                utm_medium: ['whatsapp', 'testprep']
+            };
+
+            // act
+            // assert
+            expect(ContentUtil.genrateUTMCData(value).length).toEqual(0);
+        });
+    });
+
+    describe('mergeProperties()', () => {
+        it('should return undefined if contentData is empty', () => {
+            // arrange
+            // act / assert
+            expect(ContentUtil.mergeProperties({}, ['author', 'ceator'])).toBeUndefined();
+        });
+    });
+
+    describe('getAudienceFilter()', () => {
+        it('should return undefined if contentData is empty', () => {
+            // arrange
+            const facetFilter = {
+                name: 'audience',
+                values: [
+                    {
+                        name: 'student',
+                        apply: true
+                    },
+                    {
+                        name: 'teacher',
+                        apply: true
+                    },
+                    {
+                        name: 'new_user_type',
+                        apply: true
+                    }
+                ]
+            };
+            // act / assert
+            expect(ContentUtil.getAudienceFilter(facetFilter, mockSupportedUserTypeConfig)).toEqual(
+                [{ apply: true, count: 0, name: 'Student' },
+                { apply: true, count: 0, name: 'Learner' },
+                { apply: true, count: 0, name: 'Teacher' },
+                { apply: true, count: 0, name: 'Instructor' },
+                { apply: true, name: 'new_user_type' }]);
         });
     });
 });
diff --git a/src/util/content-util.ts b/src/util/content-util.ts
index 4bc8cc28d..c363afb3c 100644
--- a/src/util/content-util.ts
+++ b/src/util/content-util.ts
@@ -1,5 +1,8 @@
-import { Rollup, Content, ContentData, TelemetryObject, CorrelationData } from 'sunbird-sdk';
+import { Rollup, Content, ContentData, TelemetryObject, CorrelationData, FilterValue, ContentSearchFilter } from 'sunbird-sdk';
 import { CorReleationDataType } from '@app/services/telemetry-constants';
+import { TrackingEnabled } from '@project-sunbird/client-services/models';
+import { MimeType } from '@app/app/app.constant';
+import { CsContentType } from '@project-sunbird/client-services/services/content';
 export class ContentUtil {
 
 
@@ -12,7 +15,7 @@ export class ContentUtil {
 
   public static mergeProperties(contentData: ContentData, properties: string[]): string {
     let displayStr: string;
-    properties.forEach( ele => {
+    properties.forEach(ele => {
       if (contentData[ele]) {
         contentData[ele] = this.arrayEmptyStringCheck(contentData[ele]);
         if (displayStr) {
@@ -37,12 +40,12 @@ export class ContentUtil {
     }
   }
 
-    /**
-     * Returns rollup
-     * @param HierarchyInfo[] hierarchyInfoList
-     * @param string identifier
-     * @returns Rollup
-     */
+  /**
+   * Returns rollup
+   * @param HierarchyInfo[] hierarchyInfoList
+   * @param string identifier
+   * @returns Rollup
+   */
   public static generateRollUp(hierarchyInfoList, identifier): Rollup {
     const rollUp = new Rollup();
     if (!hierarchyInfoList) {
@@ -56,13 +59,13 @@ export class ContentUtil {
     return rollUp;
   }
 
-    /**
-     * Returns apt app icon
-     * @param string appIcon
-     * @param string basePath
-     * @param boolean isNetworkAvailable
-     * @returns string
-     */
+  /**
+   * Returns apt app icon
+   * @param string appIcon
+   * @param string basePath
+   * @param boolean isNetworkAvailable
+   * @returns string
+   */
   public static getAppIcon(appIcon: string, basePath: string, isNetworkAvailable: boolean): string {
     if (appIcon) {
       if (appIcon.startsWith('http')) {
@@ -92,34 +95,37 @@ export class ContentUtil {
     return pdf;
   }
 
-    /**
-     * Returns TelemetryObject
-     * @param any content
-     * @returns TelemetryObject
-     */
-    public static getTelemetryObject(content): TelemetryObject {
-      const identifier = content.identifier;
-      const contentType = content.contentData ? content.contentData.contentType : content.contentType;
-      const pkgVersion = content.contentData ? content.contentData.pkgVersion : content.pkgVersion;
-      return new TelemetryObject(identifier, contentType, pkgVersion);
+  /**
+   * Returns TelemetryObject
+   * @param any content
+   * @returns TelemetryObject
+   */
+  public static getTelemetryObject(content): TelemetryObject {
+    const identifier = content.identifier || content.contentId;
+    let primaryCategory = content.contentData ? content.contentData.primaryCategory : content.primaryCategory;
+    if (!primaryCategory) {
+      primaryCategory = content.contentData ? content.contentData.contentType : content.contentType;
     }
+    const pkgVersion = content.contentData ? content.contentData.pkgVersion : content.pkgVersion;
+    return new TelemetryObject(identifier, primaryCategory, pkgVersion || '');
+  }
 
-    public static extractBaseUrl(url: string): string {
-      if (url) {
-          const pathArray = url.split('/');
-          const protocol = pathArray[0];
-          const host = pathArray[2];
-          if (protocol && host) {
-              return protocol + '//' + host;
-          } else {
-              return '';
-          }
+  public static extractBaseUrl(url: string): string {
+    if (url) {
+      const pathArray = url.split('/');
+      const protocol = pathArray[0];
+      const host = pathArray[2];
+      if (protocol && host) {
+        return protocol + '//' + host;
+      } else {
+        return '';
       }
-      return '';
+    }
+    return '';
   }
 
 
-  public static genrateUTMCData(params: { [param: string]: string }): CorrelationData[] {
+  public static genrateUTMCData(params: { [param: string]: any }): CorrelationData[] {
     const utmParams = {};
     const cData: CorrelationData[] = [];
     Object.entries(params).forEach(([key, value]) => {
@@ -133,26 +139,86 @@ export class ContentUtil {
           });
         }
       } catch (e) {
-        console.error(e);
       }
       if ((key === 'utm_campaign') || (key === 'channel')) {
-        cData.push({ id: params[key], type: CorReleationDataType.SOURCE });
+        if (params[key] && !Array.isArray(params[key])) {
+          cData.push({ id: params[key], type: CorReleationDataType.SOURCE });
+        } else {
+          // should generate error telemetry for duplicate campaign parameter
+        }
       } else {
         const chengeKeyUpperCase = key.split('_').map((elem) => {
           return (elem.charAt(0).toUpperCase() + elem.slice(1));
         });
-
-        utmParams[chengeKeyUpperCase.join('')] = decodeURIComponent(value);
+        utmParams[chengeKeyUpperCase.join('')] = value;
       }
     });
-    if (Object.keys(utmParams)) {
+
+    if (Object.keys(utmParams).length) {
       Object.keys(utmParams).map((key) => {
-        if (utmParams[key] !== undefined) {
+        if (utmParams[key] && !Array.isArray(utmParams[key])) {
           cData.push({ id: utmParams[key], type: key });
+        } else {
+          // should generate error telemetry for duplicate campaign parameter
         }
       });
     }
-
     return cData;
   }
+
+  public static isTrackable(content) {
+    content = !content.trackable ? ((content.contentData && content.contentData.trackable) ? content.contentData : content) : content;
+    // -1 - content, 0 - collection, 1 - enrolled (Trackable)
+    if (content.trackable && content.trackable.enabled) {
+      if (content.trackable.enabled === TrackingEnabled.YES) {
+        // Trackable
+        // if istrackable is defined, and true
+        return 1;
+      } else if (content.mimeType === MimeType.COLLECTION) {
+        // Collection
+        return 0;
+      } else {
+        // Content
+        return -1;
+      }
+    } else {
+      if (content.contentType && content.contentType.toLowerCase() === CsContentType.COURSE.toLowerCase()) {
+        // Trackable
+        return 1;
+      } else if (content.mimeType === MimeType.COLLECTION) {
+        // Collection
+        return 0;
+      } else {
+        // Content
+        return -1;
+      }
+    }
+  }
+
+  public static getAudienceFilter(searchFilter: ContentSearchFilter, supportedUserTypesConfig: Array<any>): FilterValue[] {
+    let audienceFilter = [];
+    searchFilter.values.forEach((element) => {
+      if (element.apply) {
+        const userTypeConfig = supportedUserTypesConfig.find(supportedUserType => supportedUserType.code === element.name);
+        if (userTypeConfig && userTypeConfig['searchFilter']) {
+          audienceFilter = audienceFilter.concat(this.createAudienceFilter(userTypeConfig['searchFilter']));
+        } else {
+          audienceFilter.push(element);
+        }
+      }
+    });
+    return audienceFilter;
+  }
+
+  private static createAudienceFilter(audienceSearchFilter: string[]): FilterValue[] {
+    const audienceFilter: FilterValue[] = [];
+    audienceSearchFilter.forEach((element) => {
+      audienceFilter.push({
+        name: element,
+        count: 0,
+        apply: true
+      });
+    });
+    return audienceFilter;
+  }
 }
diff --git a/src/util/events.ts b/src/util/events.ts
new file mode 100644
index 000000000..03a677af9
--- /dev/null
+++ b/src/util/events.ts
@@ -0,0 +1,57 @@
+import { Injectable } from '@angular/core';
+
+export type EventHandler = (...args: any[]) => any;
+
+@Injectable({
+    providedIn: 'root',
+})
+export class Events {
+    private c = new Map<string, EventHandler[]>();
+
+    constructor() {}
+
+    subscribe(topic: string, ...handlers: EventHandler[]) {
+        let topics = this.c.get(topic);
+        if (!topics) {
+            this.c.set(topic, topics = []);
+        }
+        topics.push(...handlers);
+    }
+
+    unsubscribe(topic: string, handler?: EventHandler): boolean {
+        if (!handler) {
+            return this.c.delete(topic);
+        }
+
+        const topics = this.c.get(topic);
+        if (!topics) {
+            return false;
+        }
+
+        const index = topics.indexOf(handler);
+
+        if (index < 0) {
+            return false;
+        }
+        topics.splice(index, 1);
+        if (topics.length === 0) {
+            this.c.delete(topic);
+        }
+        return true;
+    }
+
+    publish(topic: string, ...args: any[]): any[] | null {
+        const topics = this.c.get(topic);
+        if (!topics) {
+            return null;
+        }
+        return topics.map(handler => {
+            try {
+                return handler(...args);
+            } catch (e) {
+                console.error(e);
+                return null;
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/util/object.util.ts b/src/util/object.util.ts
new file mode 100644
index 000000000..af517580b
--- /dev/null
+++ b/src/util/object.util.ts
@@ -0,0 +1,11 @@
+export class ObjectUtil {
+
+    public static isJSON(input): boolean {
+        try {
+            JSON.parse(input);
+            return true;
+        } catch (e) {
+            return false;
+        }
+    }
+}
diff --git a/tsconfig.json b/tsconfig.json
index 356c08e7b..b885668b7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -27,7 +27,12 @@
     "paths": {
       "@app/*": ["*"],
       "sunbird-sdk": ["../node_modules/@project-sunbird/sunbird-sdk"],
-      "sunbird-sdk/*": ["../node_modules/@project-sunbird/sunbird-sdk/*"]
+      "sunbird-sdk/*": ["../node_modules/@project-sunbird/sunbird-sdk/*"],
+      "@project-sunbird/sunbird-player-sdk-v8": ["../node_modules/@project-sunbird/sunbird-video-player-v8/node_modules/@project-sunbird/sunbird-player-sdk-v8"],
+      "@project-sunbird/sunbird-player-sdk-v8/*": ["../node_modules/@project-sunbird/sunbird-video-player-v8/node_modules/@project-sunbird/sunbird-player-sdk-v8/*"],
+      "@project-sunbird/common-consumption": ["../node_modules/@project-sunbird/common-consumption-v8"],
+      "@project-sunbird/common-consumption/*": ["../node_modules/@project-sunbird/common-consumption-v8/*"],
+      "crypto": ["../node_modules/crypto-js"]
     }
   },
   "include": [
diff --git a/typings/sb-cordova-plugin-sync.d.ts b/typings/sb-cordova-plugin-sync.d.ts
new file mode 100644
index 000000000..37491bf86
--- /dev/null
+++ b/typings/sb-cordova-plugin-sync.d.ts
@@ -0,0 +1,8 @@
+// @ts-ignore
+declare var sbsync: {
+
+    sync: (success:
+      (callbackUrl: any) => void, error: (error: string) => void) => void;
+  
+      onSyncSucces: (sucess: (data: any) => void, error?: (error: any) => void) => void;
+  };
\ No newline at end of file
diff --git a/typings/sb-cordova-plugin-utility.d.ts b/typings/sb-cordova-plugin-utility.d.ts
index 26edab5f2..469f91ed3 100644
--- a/typings/sb-cordova-plugin-utility.d.ts
+++ b/typings/sb-cordova-plugin-utility.d.ts
@@ -19,5 +19,9 @@ declare var sbutility: {
     onSuccess: () => void, onError: (error: any) => void) => void;
 
   getMetaData: (fileMapList: any[], success:
-    (callbackUrl: any) => void, error: (error: string) => void) => void;  
+    (callbackUrl: any) => void, error: (error: string) => void) => void;
+
+  verifyCaptcha: (apiKey: string, success:
+    (callbackUrl: any) => void, error: (error: string) => void) => void;
+
 };